From daeccff5d8a54130589564af68fe187ad2a144e2 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 16 Dec 2019 13:04:38 +0100
Subject: [PATCH 001/665] 3.x: Fix Observable.window (size & time) cancellation
 and abandonment (#6761)

---
 .../operators/flowable/FlowableWindow.java    |  10 +-
 ... => FlowableWindowSubscribeIntercept.java} |   4 +-
 .../flowable/FlowableWindowTimed.java         |  27 +-
 .../observable/ObservableWindow.java          |  20 +-
 .../ObservableWindowSubscribeIntercept.java   |  46 +
 .../observable/ObservableWindowTimed.java     | 830 ++++++++----------
 .../ObservableWindowWithSizeTest.java         | 166 +++-
 .../ObservableWindowWithTimeTest.java         | 150 ++++
 8 files changed, 774 insertions(+), 479 deletions(-)
 rename src/main/java/io/reactivex/rxjava3/internal/operators/flowable/{WindowSubscribeIntercept.java => FlowableWindowSubscribeIntercept.java} (90%)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowSubscribeIntercept.java

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
index f66d38169e..ae027e2d04 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
@@ -92,14 +92,14 @@ public void onNext(T t) {
             long i = index;
 
             UnicastProcessor<T> w = window;
-            WindowSubscribeIntercept<T> intercept = null;
+            FlowableWindowSubscribeIntercept<T> intercept = null;
             if (i == 0) {
                 getAndIncrement();
 
                 w = UnicastProcessor.<T>create(bufferSize, this);
                 window = w;
 
-                intercept = new WindowSubscribeIntercept<T>(w);
+                intercept = new FlowableWindowSubscribeIntercept<T>(w);
                 downstream.onNext(intercept);
             }
 
@@ -211,7 +211,7 @@ public void onSubscribe(Subscription s) {
         public void onNext(T t) {
             long i = index;
 
-            WindowSubscribeIntercept<T> intercept = null;
+            FlowableWindowSubscribeIntercept<T> intercept = null;
             UnicastProcessor<T> w = window;
             if (i == 0) {
                 getAndIncrement();
@@ -219,7 +219,7 @@ public void onNext(T t) {
                 w = UnicastProcessor.<T>create(bufferSize, this);
                 window = w;
 
-                intercept = new WindowSubscribeIntercept<T>(w);
+                intercept = new FlowableWindowSubscribeIntercept<T>(w);
                 downstream.onNext(intercept);
             }
 
@@ -477,7 +477,7 @@ void drain() {
                             break;
                         }
 
-                        WindowSubscribeIntercept<T> intercept = new WindowSubscribeIntercept<T>(t);
+                        FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(t);
                         a.onNext(intercept);
 
                         if (intercept.tryAbandon()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/WindowSubscribeIntercept.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowSubscribeIntercept.java
similarity index 90%
rename from src/main/java/io/reactivex/rxjava3/internal/operators/flowable/WindowSubscribeIntercept.java
rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowSubscribeIntercept.java
index 4fcbdee225..8f6cf0a2da 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/WindowSubscribeIntercept.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowSubscribeIntercept.java
@@ -25,13 +25,13 @@
  * @param <T> the element type of the flow.
  * @since 3.0.0
  */
-final class WindowSubscribeIntercept<T> extends Flowable<T> {
+final class FlowableWindowSubscribeIntercept<T> extends Flowable<T> {
 
     final FlowableProcessor<T> window;
 
     final AtomicBoolean once;
 
-    WindowSubscribeIntercept(FlowableProcessor<T> source) {
+    FlowableWindowSubscribeIntercept(FlowableProcessor<T> source) {
         this.window = source;
         this.once = new AtomicBoolean();
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
index c340c0e0db..0dfec4e4af 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
@@ -28,7 +28,6 @@
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
-import io.reactivex.rxjava3.subscribers.SerializedSubscriber;
 
 public final class FlowableWindowTimed<T> extends AbstractFlowableWithUpstream<T, Flowable<T>> {
     final long timespan;
@@ -53,23 +52,21 @@ public FlowableWindowTimed(Flowable<T> source,
     }
 
     @Override
-    protected void subscribeActual(Subscriber<? super Flowable<T>> s) {
-        SerializedSubscriber<Flowable<T>> actual = new SerializedSubscriber<Flowable<T>>(s);
-
+    protected void subscribeActual(Subscriber<? super Flowable<T>> downstream) {
         if (timespan == timeskip) {
             if (maxSize == Long.MAX_VALUE) {
                 source.subscribe(new WindowExactUnboundedSubscriber<T>(
-                        actual,
+                        downstream,
                         timespan, unit, scheduler, bufferSize));
                 return;
             }
             source.subscribe(new WindowExactBoundedSubscriber<T>(
-                        actual,
+                        downstream,
                         timespan, unit, scheduler,
                         bufferSize, maxSize, restartTimerOnMaxSize));
             return;
         }
-        source.subscribe(new WindowSkipSubscriber<T>(actual,
+        source.subscribe(new WindowSkipSubscriber<T>(downstream,
                 timespan, timeskip, unit, scheduler.createWorker(), bufferSize));
     }
 
@@ -100,8 +97,8 @@ abstract static class AbstractWindowSubscriber<T>
 
         final AtomicInteger windowCount;
 
-        AbstractWindowSubscriber(Subscriber<? super Flowable<T>> actual, long timespan, TimeUnit unit, int bufferSize) {
-            this.downstream = actual;
+        AbstractWindowSubscriber(Subscriber<? super Flowable<T>> downstream, long timespan, TimeUnit unit, int bufferSize) {
+            this.downstream = downstream;
             this.queue = new MpscLinkedQueue<Object>();
             this.timespan = timespan;
             this.unit = unit;
@@ -204,7 +201,7 @@ void createFirstWindow() {
 
                     emitted = 1;
 
-                    WindowSubscribeIntercept<T> intercept = new WindowSubscribeIntercept<T>(window);
+                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
                     downstream.onNext(intercept);
 
                     timer.replace(scheduler.schedulePeriodicallyDirect(this, timespan, timespan, unit));
@@ -293,7 +290,7 @@ else if (!isEmpty) {
                                     window = UnicastProcessor.create(bufferSize, windowRunnable);
                                     this.window = window;
 
-                                    WindowSubscribeIntercept<T> intercept = new WindowSubscribeIntercept<T>(window);
+                                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
                                     downstream.onNext(intercept);
 
                                     if (intercept.tryAbandon()) {
@@ -372,7 +369,7 @@ void createFirstWindow() {
                     windowCount.getAndIncrement();
                     window = UnicastProcessor.create(bufferSize, this);
 
-                    WindowSubscribeIntercept<T> intercept = new WindowSubscribeIntercept<T>(window);
+                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
                     downstream.onNext(intercept);
 
                     Runnable boundaryTask = new WindowBoundaryRunnable(this, 1L);
@@ -510,7 +507,7 @@ UnicastProcessor<T> createNewWindow(UnicastProcessor<T> window) {
                     window = UnicastProcessor.create(bufferSize, this);
                     this.window = window;
 
-                    WindowSubscribeIntercept<T> intercept = new WindowSubscribeIntercept<T>(window);
+                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
                     downstream.onNext(intercept);
 
                     if (restartTimerOnMaxSize) {
@@ -573,7 +570,7 @@ void createFirstWindow() {
                     UnicastProcessor<T> window = UnicastProcessor.create(bufferSize, this);
                     windows.add(window);
 
-                    WindowSubscribeIntercept<T> intercept = new WindowSubscribeIntercept<T>(window);
+                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
                     downstream.onNext(intercept);
 
                     worker.schedule(new WindowBoundaryRunnable(this, false), timespan, unit);
@@ -647,7 +644,7 @@ void drain() {
                                     UnicastProcessor<T> window = UnicastProcessor.create(bufferSize, this);
                                     windows.add(window);
 
-                                    WindowSubscribeIntercept<T> intercept = new WindowSubscribeIntercept<T>(window);
+                                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
                                     downstream.onNext(intercept);
 
                                     worker.schedule(new WindowBoundaryRunnable(this, false), timespan, unit);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
index 08eb0327a6..3f11f3952a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
@@ -77,14 +77,17 @@ public void onSubscribe(Disposable d) {
         @Override
         public void onNext(T t) {
             UnicastSubject<T> w = window;
+            ObservableWindowSubscribeIntercept<T> intercept = null;
             if (w == null && !cancelled) {
                 w = UnicastSubject.create(capacityHint, this);
                 window = w;
-                downstream.onNext(w);
+                intercept = new ObservableWindowSubscribeIntercept<T>(w);
+                downstream.onNext(intercept);
             }
 
             if (w != null) {
                 w.onNext(t);
+
                 if (++size >= count) {
                     size = 0;
                     window = null;
@@ -93,6 +96,12 @@ public void onNext(T t) {
                         upstream.dispose();
                     }
                 }
+
+                if (intercept != null && intercept.tryAbandon()) {
+                    w.onComplete();
+                    w = null;
+                    window = null;
+                }
             }
         }
 
@@ -180,11 +189,14 @@ public void onNext(T t) {
 
             long s = skip;
 
+            ObservableWindowSubscribeIntercept<T> intercept = null;
+
             if (i % s == 0 && !cancelled) {
                 wip.getAndIncrement();
                 UnicastSubject<T> w = UnicastSubject.create(capacityHint, this);
+                intercept = new ObservableWindowSubscribeIntercept<T>(w);
                 ws.offer(w);
-                downstream.onNext(w);
+                downstream.onNext(intercept);
             }
 
             long c = firstEmission + 1;
@@ -205,6 +217,10 @@ public void onNext(T t) {
             }
 
             index = i + 1;
+
+            if (intercept != null && intercept.tryAbandon()) {
+                intercept.window.onComplete();
+            }
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowSubscribeIntercept.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowSubscribeIntercept.java
new file mode 100644
index 0000000000..da6f96f2a3
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowSubscribeIntercept.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.subjects.Subject;
+
+/**
+ * Wrapper for a Subject that detects an incoming subscriber.
+ * @param <T> the element type of the flow.
+ * @since 3.0.0
+ */
+final class ObservableWindowSubscribeIntercept<T> extends Observable<T> {
+
+    final Subject<T> window;
+
+    final AtomicBoolean once;
+
+    ObservableWindowSubscribeIntercept(Subject<T> source) {
+        this.window = source;
+        this.once = new AtomicBoolean();
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super T> s) {
+        window.subscribe(s);
+        once.set(true);
+    }
+
+    boolean tryAbandon() {
+        return !once.get() && once.compareAndSet(false, true);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
index cdd64cd6ae..3913bf2911 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
@@ -15,17 +15,16 @@
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.*;
 
-import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.observers.QueueDrainObserver;
+import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
-import io.reactivex.rxjava3.internal.util.NotificationLite;
-import io.reactivex.rxjava3.observers.SerializedObserver;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 
 public final class ObservableWindowTimed<T> extends AbstractObservableWithUpstream<T, Observable<T>> {
@@ -37,8 +36,7 @@ public final class ObservableWindowTimed<T> extends AbstractObservableWithUpstre
     final int bufferSize;
     final boolean restartTimerOnMaxSize;
 
-    public ObservableWindowTimed(
-            ObservableSource<T> source,
+    public ObservableWindowTimed(Observable<T> source,
             long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, long maxSize,
             int bufferSize, boolean restartTimerOnMaxSize) {
         super(source);
@@ -52,223 +50,282 @@ public ObservableWindowTimed(
     }
 
     @Override
-    public void subscribeActual(Observer<? super Observable<T>> t) {
-        SerializedObserver<Observable<T>> actual = new SerializedObserver<Observable<T>>(t);
-
+    protected void subscribeActual(Observer<? super Observable<T>> downstream) {
         if (timespan == timeskip) {
             if (maxSize == Long.MAX_VALUE) {
                 source.subscribe(new WindowExactUnboundedObserver<T>(
-                        actual,
+                        downstream,
                         timespan, unit, scheduler, bufferSize));
                 return;
             }
             source.subscribe(new WindowExactBoundedObserver<T>(
-                        actual,
+                        downstream,
                         timespan, unit, scheduler,
                         bufferSize, maxSize, restartTimerOnMaxSize));
             return;
         }
-        source.subscribe(new WindowSkipObserver<T>(actual,
+        source.subscribe(new WindowSkipObserver<T>(downstream,
                 timespan, timeskip, unit, scheduler.createWorker(), bufferSize));
     }
 
-    static final class WindowExactUnboundedObserver<T>
-            extends QueueDrainObserver<T, Object, Observable<T>>
-            implements Observer<T>, Disposable, Runnable {
+    abstract static class AbstractWindowObserver<T>
+    extends AtomicInteger
+    implements Observer<T>, Disposable {
+        private static final long serialVersionUID = 5724293814035355511L;
+
+        final Observer<? super Observable<T>> downstream;
+
+        final SimplePlainQueue<Object> queue;
+
         final long timespan;
         final TimeUnit unit;
-        final Scheduler scheduler;
         final int bufferSize;
 
-        Disposable upstream;
+        long emitted;
 
-        UnicastSubject<T> window;
+        volatile boolean done;
+        Throwable error;
 
-        final SequentialDisposable timer = new SequentialDisposable();
+        Disposable upstream;
 
-        static final Object NEXT = new Object();
+        final AtomicBoolean downstreamCancelled;
 
-        volatile boolean terminated;
+        volatile boolean upstreamCancelled;
 
-        WindowExactUnboundedObserver(Observer<? super Observable<T>> actual, long timespan, TimeUnit unit,
-                Scheduler scheduler, int bufferSize) {
-            super(actual, new MpscLinkedQueue<Object>());
+        final AtomicInteger windowCount;
+
+        AbstractWindowObserver(Observer<? super Observable<T>> downstream, long timespan, TimeUnit unit, int bufferSize) {
+            this.downstream = downstream;
+            this.queue = new MpscLinkedQueue<Object>();
             this.timespan = timespan;
             this.unit = unit;
-            this.scheduler = scheduler;
             this.bufferSize = bufferSize;
+            this.downstreamCancelled = new AtomicBoolean();
+            this.windowCount = new AtomicInteger(1);
         }
 
         @Override
-        public void onSubscribe(Disposable d) {
+        public final void onSubscribe(Disposable d) {
             if (DisposableHelper.validate(this.upstream, d)) {
                 this.upstream = d;
 
-                window = UnicastSubject.<T>create(bufferSize);
-
-                Observer<? super Observable<T>> a = downstream;
-                a.onSubscribe(this);
-
-                a.onNext(window);
+                downstream.onSubscribe(this);
 
-                if (!cancelled) {
-                    Disposable task = scheduler.schedulePeriodicallyDirect(this, timespan, timespan, unit);
-                    timer.replace(task);
-                }
+                createFirstWindow();
             }
         }
 
+        abstract void createFirstWindow();
+
         @Override
-        public void onNext(T t) {
-            if (terminated) {
-                return;
-            }
-            if (fastEnter()) {
-                window.onNext(t);
-                if (leave(-1) == 0) {
-                    return;
-                }
-            } else {
-                queue.offer(NotificationLite.next(t));
-                if (!enter()) {
-                    return;
-                }
-            }
-            drainLoop();
+        public final void onNext(T t) {
+            queue.offer(t);
+            drain();
         }
 
         @Override
-        public void onError(Throwable t) {
+        public final void onError(Throwable t) {
             error = t;
             done = true;
-            if (enter()) {
-                drainLoop();
-            }
-
-            downstream.onError(t);
+            drain();
         }
 
         @Override
-        public void onComplete() {
+        public final void onComplete() {
             done = true;
-            if (enter()) {
-                drainLoop();
-            }
+            drain();
+        }
 
-            downstream.onComplete();
+        @Override
+        public final void dispose() {
+            if (downstreamCancelled.compareAndSet(false, true)) {
+                windowDone();
+            }
         }
 
         @Override
-        public void dispose() {
-            cancelled = true;
+        public final boolean isDisposed() {
+            return downstreamCancelled.get();
+        }
+
+        final void windowDone() {
+            if (windowCount.decrementAndGet() == 0) {
+                cleanupResources();
+                upstream.dispose();
+                upstreamCancelled = true;
+                drain();
+            }
+        }
+
+        abstract void cleanupResources();
+
+        abstract void drain();
+    }
+
+    static final class WindowExactUnboundedObserver<T>
+            extends AbstractWindowObserver<T>
+            implements Runnable {
+
+        private static final long serialVersionUID = 1155822639622580836L;
+
+        final Scheduler scheduler;
+
+        UnicastSubject<T> window;
+
+        final SequentialDisposable timer;
+
+        static final Object NEXT_WINDOW = new Object();
+
+        final Runnable windowRunnable;
+
+        WindowExactUnboundedObserver(Observer<? super Observable<T>> actual, long timespan, TimeUnit unit,
+                Scheduler scheduler, int bufferSize) {
+            super(actual, timespan, unit, bufferSize);
+            this.scheduler = scheduler;
+            this.timer = new SequentialDisposable();
+            this.windowRunnable = new WindowRunnable();
         }
 
         @Override
-        public boolean isDisposed() {
-            return cancelled;
+        void createFirstWindow() {
+            if (!downstreamCancelled.get()) {
+                windowCount.getAndIncrement();
+                window = UnicastSubject.create(bufferSize, windowRunnable);
+
+                emitted = 1;
+
+                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                downstream.onNext(intercept);
+
+                timer.replace(scheduler.schedulePeriodicallyDirect(this, timespan, timespan, unit));
+
+                if (intercept.tryAbandon()) {
+                    window.onComplete();
+                }
+            }
         }
 
         @Override
         public void run() {
-            if (cancelled) {
-                terminated = true;
-            }
-            queue.offer(NEXT);
-            if (enter()) {
-                drainLoop();
-            }
+            queue.offer(NEXT_WINDOW);
+            drain();
         }
 
-        void drainLoop() {
+        @Override
+        void drain() {
+            if (getAndIncrement() != 0) {
+                return;
+            }
 
-            final MpscLinkedQueue<Object> q = (MpscLinkedQueue<Object>)queue;
-            final Observer<? super Observable<T>> a = downstream;
-            UnicastSubject<T> w = window;
+            final SimplePlainQueue<Object> queue = this.queue;
+            final Observer<? super Observable<T>> downstream = this.downstream;
+            UnicastSubject<T> window = this.window;
 
             int missed = 1;
             for (;;) {
 
-                for (;;) {
-                    boolean term = terminated; // NOPMD
-
-                    boolean d = done;
-
-                    Object o = q.poll();
-
-                    if (d && (o == null || o == NEXT)) {
-                        window = null;
-                        q.clear();
-                        Throwable err = error;
-                        if (err != null) {
-                            w.onError(err);
+                if (upstreamCancelled) {
+                    queue.clear();
+                    window = null;
+                    this.window = null;
+                } else {
+                    boolean isDone = done;
+                    Object o = queue.poll();
+                    boolean isEmpty = o == null;
+
+                    if (isDone && isEmpty) {
+                        Throwable ex = error;
+                        if (ex != null) {
+                            if (window != null) {
+                                window.onError(ex);
+                            }
+                            downstream.onError(ex);
                         } else {
-                            w.onComplete();
+                            if (window != null) {
+                                window.onComplete();
+                            }
+                            downstream.onComplete();
                         }
-                        timer.dispose();
-                        return;
+                        cleanupResources();
+                        upstreamCancelled = true;
+                        continue;
                     }
+                    else if (!isEmpty) {
 
-                    if (o == null) {
-                        break;
-                    }
+                        if (o == NEXT_WINDOW) {
+                            if (window != null) {
+                                window.onComplete();
+                                window = null;
+                                this.window = null;
+                            }
+                            if (downstreamCancelled.get()) {
+                                timer.dispose();
+                            } else {
+                                emitted++;
 
-                    if (o == NEXT) {
-                        w.onComplete();
-                        if (!term) {
-                            w = UnicastSubject.create(bufferSize);
-                            window = w;
+                                windowCount.getAndIncrement();
+                                window = UnicastSubject.create(bufferSize, windowRunnable);
+                                this.window = window;
 
-                            a.onNext(w);
-                        } else {
-                            upstream.dispose();
+                                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                                downstream.onNext(intercept);
+
+                                if (intercept.tryAbandon()) {
+                                    window.onComplete();
+                                }
+                            }
+                        } else if (window != null) {
+                            @SuppressWarnings("unchecked")
+                            T item = (T)o;
+                            window.onNext(item);
                         }
+
                         continue;
                     }
-
-                    w.onNext(NotificationLite.<T>getValue(o));
                 }
 
-                missed = leave(-missed);
+                missed = addAndGet(-missed);
                 if (missed == 0) {
                     break;
                 }
             }
         }
+
+        @Override
+        void cleanupResources() {
+            timer.dispose();
+        }
+
+        final class WindowRunnable implements Runnable {
+            @Override
+            public void run() {
+                windowDone();
+            }
+        }
     }
 
     static final class WindowExactBoundedObserver<T>
-    extends QueueDrainObserver<T, Object, Observable<T>>
-    implements Disposable {
-        final long timespan;
-        final TimeUnit unit;
+    extends AbstractWindowObserver<T>
+    implements Runnable {
+        private static final long serialVersionUID = -6130475889925953722L;
+
         final Scheduler scheduler;
-        final int bufferSize;
         final boolean restartTimerOnMaxSize;
         final long maxSize;
-
         final Scheduler.Worker worker;
 
         long count;
 
-        long producerIndex;
-
-        Disposable upstream;
-
         UnicastSubject<T> window;
 
-        volatile boolean terminated;
-
-        final SequentialDisposable timer = new SequentialDisposable();
+        final SequentialDisposable timer;
 
         WindowExactBoundedObserver(
                 Observer<? super Observable<T>> actual,
                 long timespan, TimeUnit unit, Scheduler scheduler,
                 int bufferSize, long maxSize, boolean restartTimerOnMaxSize) {
-            super(actual, new MpscLinkedQueue<Object>());
-            this.timespan = timespan;
-            this.unit = unit;
+            super(actual, timespan, unit, bufferSize);
             this.scheduler = scheduler;
-            this.bufferSize = bufferSize;
             this.maxSize = maxSize;
             this.restartTimerOnMaxSize = restartTimerOnMaxSize;
             if (restartTimerOnMaxSize) {
@@ -276,415 +333,288 @@ static final class WindowExactBoundedObserver<T>
             } else {
                 worker = null;
             }
+            this.timer = new SequentialDisposable();
         }
 
         @Override
-        public void onSubscribe(Disposable d) {
-            if (DisposableHelper.validate(this.upstream, d)) {
-                this.upstream = d;
-
-                Observer<? super Observable<T>> a = downstream;
-
-                a.onSubscribe(this);
-
-                if (cancelled) {
-                    return;
-                }
+        void createFirstWindow() {
+            if (!downstreamCancelled.get()) {
+                emitted = 1;
 
-                UnicastSubject<T> w = UnicastSubject.create(bufferSize);
-                window = w;
+                windowCount.getAndIncrement();
+                window = UnicastSubject.create(bufferSize, this);
 
-                a.onNext(w);
+                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                downstream.onNext(intercept);
 
-                Disposable task;
-                ConsumerIndexHolder consumerIndexHolder = new ConsumerIndexHolder(producerIndex, this);
+                Runnable boundaryTask = new WindowBoundaryRunnable(this, 1L);
                 if (restartTimerOnMaxSize) {
-                    task = worker.schedulePeriodically(consumerIndexHolder, timespan, timespan, unit);
+                    timer.replace(worker.schedulePeriodically(boundaryTask, timespan, timespan, unit));
                 } else {
-                    task = scheduler.schedulePeriodicallyDirect(consumerIndexHolder, timespan, timespan, unit);
+                    timer.replace(scheduler.schedulePeriodicallyDirect(boundaryTask, timespan, timespan, unit));
                 }
 
-                timer.replace(task);
-            }
-        }
-
-        @Override
-        public void onNext(T t) {
-            if (terminated) {
-                return;
-            }
-
-            if (fastEnter()) {
-                UnicastSubject<T> w = window;
-                w.onNext(t);
-
-                long c = count + 1;
-
-                if (c >= maxSize) {
-                    producerIndex++;
-                    count = 0;
-
-                    w.onComplete();
-
-                    w = UnicastSubject.create(bufferSize);
-                    window = w;
-                    downstream.onNext(w);
-                    if (restartTimerOnMaxSize) {
-                        Disposable tm = timer.get();
-                        tm.dispose();
-                        Disposable task = worker.schedulePeriodically(
-                                new ConsumerIndexHolder(producerIndex, this), timespan, timespan, unit);
-
-                        DisposableHelper.replace(timer, task);
-                    }
-                } else {
-                    count = c;
-                }
-
-                if (leave(-1) == 0) {
-                    return;
-                }
-            } else {
-                queue.offer(NotificationLite.next(t));
-                if (!enter()) {
-                    return;
+                if (intercept.tryAbandon()) {
+                    window.onComplete();
                 }
             }
-            drainLoop();
         }
 
         @Override
-        public void onError(Throwable t) {
-            error = t;
-            done = true;
-            if (enter()) {
-                drainLoop();
-            }
-
-            downstream.onError(t);
+        public void run() {
+            windowDone();
         }
 
         @Override
-        public void onComplete() {
-            done = true;
-            if (enter()) {
-                drainLoop();
+        void cleanupResources() {
+            timer.dispose();
+            Worker w = worker;
+            if (w != null) {
+                w.dispose();
             }
-
-            downstream.onComplete();
         }
 
-        @Override
-        public void dispose() {
-            cancelled = true;
+        void boundary(WindowBoundaryRunnable sender) {
+            queue.offer(sender);
+            drain();
         }
 
         @Override
-        public boolean isDisposed() {
-            return cancelled;
-        }
-
-        void disposeTimer() {
-            DisposableHelper.dispose(timer);
-            Worker w = worker;
-            if (w != null) {
-                w.dispose();
+        void drain() {
+            if (getAndIncrement() != 0) {
+                return;
             }
-        }
-
-        void drainLoop() {
-            final MpscLinkedQueue<Object> q = (MpscLinkedQueue<Object>)queue;
-            final Observer<? super Observable<T>> a = downstream;
-            UnicastSubject<T> w = window;
 
             int missed = 1;
-            for (;;) {
+            final SimplePlainQueue<Object> queue = this.queue;
+            final Observer<? super Observable<T>> downstream = this.downstream;
+            UnicastSubject<T> window = this.window;
 
-                for (;;) {
-                    if (terminated) {
-                        upstream.dispose();
-                        q.clear();
-                        disposeTimer();
-                        return;
-                    }
-
-                    boolean d = done;
+            for (;;) {
 
-                    Object o = q.poll();
+                if (upstreamCancelled) {
+                    queue.clear();
+                    window = null;
+                    this.window = null;
+                } else {
 
-                    boolean empty = o == null;
-                    boolean isHolder = o instanceof ConsumerIndexHolder;
+                    boolean isDone = done;
+                    Object o = queue.poll();
+                    boolean isEmpty = o == null;
 
-                    if (d && (empty || isHolder)) {
-                        window = null;
-                        q.clear();
-                        Throwable err = error;
-                        if (err != null) {
-                            w.onError(err);
+                    if (isDone && isEmpty) {
+                        Throwable ex = error;
+                        if (ex != null) {
+                            if (window != null) {
+                                window.onError(ex);
+                            }
+                            downstream.onError(ex);
                         } else {
-                            w.onComplete();
+                            if (window != null) {
+                                window.onComplete();
+                            }
+                            downstream.onComplete();
                         }
-                        disposeTimer();
-                        return;
-                    }
-
-                    if (empty) {
-                        break;
-                    }
-
-                    if (isHolder) {
-                        ConsumerIndexHolder consumerIndexHolder = (ConsumerIndexHolder) o;
-                        if (!restartTimerOnMaxSize || producerIndex == consumerIndexHolder.index) {
-                            w.onComplete();
-                            count = 0;
-                            w = UnicastSubject.create(bufferSize);
-                            window = w;
-
-                            a.onNext(w);
+                        cleanupResources();
+                        upstreamCancelled = true;
+                        continue;
+                    } else if (!isEmpty) {
+                        if (o instanceof WindowBoundaryRunnable) {
+                            WindowBoundaryRunnable boundary = (WindowBoundaryRunnable) o;
+                            if (boundary.index == emitted || !restartTimerOnMaxSize) {
+                                this.count = 0;
+                                window = createNewWindow(window);
+                            }
+                        } else if (window != null) {
+                            @SuppressWarnings("unchecked")
+                            T item = (T)o;
+                            window.onNext(item);
+
+                            long count = this.count + 1;
+                            if (count == maxSize) {
+                                this.count = 0;
+                                window = createNewWindow(window);
+                            } else {
+                                this.count = count;
+                            }
                         }
+
                         continue;
                     }
+                }
 
-                    w.onNext(NotificationLite.<T>getValue(o));
-                    long c = count + 1;
-
-                    if (c >= maxSize) {
-                        producerIndex++;
-                        count = 0;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    break;
+                }
+            }
+        }
 
-                        w.onComplete();
+        UnicastSubject<T> createNewWindow(UnicastSubject<T> window) {
+            if (window != null) {
+                window.onComplete();
+                window = null;
+            }
 
-                        w = UnicastSubject.create(bufferSize);
-                        window = w;
-                        downstream.onNext(w);
+            if (downstreamCancelled.get()) {
+                cleanupResources();
+            } else {
+                long emitted = this.emitted;
+                this.emitted = ++emitted;
 
-                        if (restartTimerOnMaxSize) {
-                            Disposable tm = timer.get();
-                            tm.dispose();
+                windowCount.getAndIncrement();
+                window = UnicastSubject.create(bufferSize, this);
+                this.window = window;
 
-                            Disposable task = worker.schedulePeriodically(
-                                    new ConsumerIndexHolder(producerIndex, this), timespan, timespan, unit);
-                            if (!timer.compareAndSet(tm, task)) {
-                                task.dispose();
-                            }
-                        }
+                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                downstream.onNext(intercept);
 
-                    } else {
-                        count = c;
-                    }
+                if (restartTimerOnMaxSize) {
+                    timer.update(worker.schedulePeriodically(new WindowBoundaryRunnable(this, emitted), timespan, timespan, unit));
                 }
 
-                missed = leave(-missed);
-                if (missed == 0) {
-                    break;
+                if (intercept.tryAbandon()) {
+                    window.onComplete();
                 }
             }
+
+            return window;
         }
 
-        static final class ConsumerIndexHolder implements Runnable {
-            final long index;
+        static final class WindowBoundaryRunnable implements Runnable {
+
             final WindowExactBoundedObserver<?> parent;
-            ConsumerIndexHolder(long index, WindowExactBoundedObserver<?> parent) {
-                this.index = index;
+
+            final long index;
+
+            WindowBoundaryRunnable(WindowExactBoundedObserver<?> parent, long index) {
                 this.parent = parent;
+                this.index = index;
             }
 
             @Override
             public void run() {
-                WindowExactBoundedObserver<?> p = parent;
-
-                if (!p.cancelled) {
-                    p.queue.offer(this);
-                } else {
-                    p.terminated = true;
-                }
-                if (p.enter()) {
-                    p.drainLoop();
-                }
+                parent.boundary(this);
             }
         }
     }
 
     static final class WindowSkipObserver<T>
-    extends QueueDrainObserver<T, Object, Observable<T>>
-    implements Disposable, Runnable {
-        final long timespan;
+    extends AbstractWindowObserver<T>
+    implements Runnable {
+        private static final long serialVersionUID = -7852870764194095894L;
+
         final long timeskip;
-        final TimeUnit unit;
         final Scheduler.Worker worker;
-        final int bufferSize;
 
         final List<UnicastSubject<T>> windows;
 
-        Disposable upstream;
-
-        volatile boolean terminated;
-
         WindowSkipObserver(Observer<? super Observable<T>> actual,
                 long timespan, long timeskip, TimeUnit unit,
                 Worker worker, int bufferSize) {
-            super(actual, new MpscLinkedQueue<Object>());
-            this.timespan = timespan;
+            super(actual, timespan, unit, bufferSize);
             this.timeskip = timeskip;
-            this.unit = unit;
             this.worker = worker;
-            this.bufferSize = bufferSize;
             this.windows = new LinkedList<UnicastSubject<T>>();
         }
 
         @Override
-        public void onSubscribe(Disposable d) {
-            if (DisposableHelper.validate(this.upstream, d)) {
-                this.upstream = d;
-
-                downstream.onSubscribe(this);
-
-                if (cancelled) {
-                    return;
-                }
-
-                final UnicastSubject<T> w = UnicastSubject.create(bufferSize);
-                windows.add(w);
+        void createFirstWindow() {
+            if (!downstreamCancelled.get()) {
+                emitted = 1;
 
-                downstream.onNext(w);
-                worker.schedule(new CompletionTask(w), timespan, unit);
+                windowCount.getAndIncrement();
+                UnicastSubject<T> window = UnicastSubject.create(bufferSize, this);
+                windows.add(window);
 
-                worker.schedulePeriodically(this, timeskip, timeskip, unit);
-            }
+                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                downstream.onNext(intercept);
 
-        }
+                worker.schedule(new WindowBoundaryRunnable(this, false), timespan, unit);
+                worker.schedulePeriodically(new WindowBoundaryRunnable(this, true), timeskip, timeskip, unit);
 
-        @Override
-        public void onNext(T t) {
-            if (fastEnter()) {
-                for (UnicastSubject<T> w : windows) {
-                    w.onNext(t);
-                }
-                if (leave(-1) == 0) {
-                    return;
+                if (intercept.tryAbandon()) {
+                    window.onComplete();
+                    windows.remove(window);
                 }
-            } else {
-                queue.offer(t);
-                if (!enter()) {
-                    return;
-                }
-            }
-            drainLoop();
-        }
-
-        @Override
-        public void onError(Throwable t) {
-            error = t;
-            done = true;
-            if (enter()) {
-                drainLoop();
             }
-
-            downstream.onError(t);
-        }
-
-        @Override
-        public void onComplete() {
-            done = true;
-            if (enter()) {
-                drainLoop();
-            }
-
-            downstream.onComplete();
         }
 
         @Override
-        public void dispose() {
-            cancelled = true;
+        void cleanupResources() {
+            worker.dispose();
         }
 
         @Override
-        public boolean isDisposed() {
-            return cancelled;
-        }
-
-        void complete(UnicastSubject<T> w) {
-            queue.offer(new SubjectWork<T>(w, false));
-            if (enter()) {
-                drainLoop();
+        void drain() {
+            if (getAndIncrement() != 0) {
+                return;
             }
-        }
-
-        @SuppressWarnings("unchecked")
-        void drainLoop() {
-            final MpscLinkedQueue<Object> q = (MpscLinkedQueue<Object>)queue;
-            final Observer<? super Observable<T>> a = downstream;
-            final List<UnicastSubject<T>> ws = windows;
 
             int missed = 1;
+            final SimplePlainQueue<Object> queue = this.queue;
+            final Observer<? super Observable<T>> downstream = this.downstream;
+            final List<UnicastSubject<T>> windows = this.windows;
 
             for (;;) {
-
-                for (;;) {
-                    if (terminated) {
-                        upstream.dispose();
-                        q.clear();
-                        ws.clear();
-                        worker.dispose();
-                        return;
-                    }
-
-                    boolean d = done;
-
-                    Object v = q.poll();
-
-                    boolean empty = v == null;
-                    boolean sw = v instanceof SubjectWork;
-
-                    if (d && (empty || sw)) {
-                        q.clear();
-                        Throwable e = error;
-                        if (e != null) {
-                            for (UnicastSubject<T> w : ws) {
-                                w.onError(e);
+                if (upstreamCancelled) {
+                    queue.clear();
+                    windows.clear();
+                } else {
+                    boolean isDone = done;
+                    Object o = queue.poll();
+                    boolean isEmpty = o == null;
+
+                    if (isDone && isEmpty) {
+                        Throwable ex = error;
+                        if (ex != null) {
+                            for (UnicastSubject<T> window : windows) {
+                                window.onError(ex);
                             }
+                            downstream.onError(ex);
                         } else {
-                            for (UnicastSubject<T> w : ws) {
-                                w.onComplete();
+                            for (UnicastSubject<T> window : windows) {
+                                window.onComplete();
                             }
+                            downstream.onComplete();
                         }
-                        ws.clear();
-                        worker.dispose();
-                        return;
-                    }
+                        cleanupResources();
+                        upstreamCancelled = true;
+                        continue;
+                    } else if (!isEmpty) {
+                        if (o == WINDOW_OPEN) {
+                            if (!downstreamCancelled.get()) {
+                                long emitted = this.emitted;
+                                this.emitted = ++emitted;
 
-                    if (empty) {
-                        break;
-                    }
+                                windowCount.getAndIncrement();
+                                UnicastSubject<T> window = UnicastSubject.create(bufferSize, this);
+                                windows.add(window);
 
-                    if (sw) {
-                        SubjectWork<T> work = (SubjectWork<T>)v;
+                                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                                downstream.onNext(intercept);
 
-                        if (work.open) {
-                            if (cancelled) {
-                                continue;
-                            }
+                                worker.schedule(new WindowBoundaryRunnable(this, false), timespan, unit);
 
-                            final UnicastSubject<T> w = UnicastSubject.create(bufferSize);
-                            ws.add(w);
-                            a.onNext(w);
-
-                            worker.schedule(new CompletionTask(w), timespan, unit);
+                                if (intercept.tryAbandon()) {
+                                    window.onComplete();
+                                }
+                            }
+                        } else if (o == WINDOW_CLOSE) {
+                            if (!windows.isEmpty()) {
+                                windows.remove(0).onComplete();
+                            }
                         } else {
-                            ws.remove(work.w);
-                            work.w.onComplete();
-                            if (ws.isEmpty() && cancelled) {
-                                terminated = true;
+                            @SuppressWarnings("unchecked")
+                            T item = (T)o;
+                            for (UnicastSubject<T> window : windows) {
+                                window.onNext(item);
                             }
                         }
-                    } else {
-                        for (UnicastSubject<T> w : ws) {
-                            w.onNext((T)v);
-                        }
+                        continue;
                     }
                 }
-
-                missed = leave(-missed);
+                missed = addAndGet(-missed);
                 if (missed == 0) {
                     break;
                 }
@@ -693,37 +623,31 @@ void drainLoop() {
 
         @Override
         public void run() {
-
-            UnicastSubject<T> w = UnicastSubject.create(bufferSize);
-
-            SubjectWork<T> sw = new SubjectWork<T>(w, true);
-            if (!cancelled) {
-                queue.offer(sw);
-            }
-            if (enter()) {
-                drainLoop();
-            }
+            windowDone();
         }
 
-        static final class SubjectWork<T> {
-            final UnicastSubject<T> w;
-            final boolean open;
-            SubjectWork(UnicastSubject<T> w, boolean open) {
-                this.w = w;
-                this.open = open;
-            }
+        void boundary(boolean isOpen) {
+            queue.offer(isOpen ? WINDOW_OPEN : WINDOW_CLOSE);
+            drain();
         }
 
-        final class CompletionTask implements Runnable {
-            private final UnicastSubject<T> w;
+        static final Object WINDOW_OPEN = new Object();
+        static final Object WINDOW_CLOSE = new Object();
+
+        static final class WindowBoundaryRunnable implements Runnable {
 
-            CompletionTask(UnicastSubject<T> w) {
-                this.w = w;
+            final WindowSkipObserver<?> parent;
+
+            final boolean isOpen;
+
+            WindowBoundaryRunnable(WindowSkipObserver<?> parent, boolean isOpen) {
+                this.parent = parent;
+                this.isOpen = isOpen;
             }
 
             @Override
             public void run() {
-                complete(w);
+                parent.boundary(isOpen);
             }
         }
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
index e90d46bd36..8053b0f532 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
@@ -17,7 +17,7 @@
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.*;
 
 import org.junit.Test;
 
@@ -37,7 +37,7 @@ public class ObservableWindowWithSizeTest extends RxJavaTest {
     private static <T> List<List<T>> toLists(Observable<Observable<T>> observables) {
 
         final List<List<T>> lists = new ArrayList<List<T>>();
-        Observable.concat(observables.map(new Function<Observable<T>, Observable<List<T>>>() {
+        Observable.concatEager(observables.map(new Function<Observable<T>, Observable<List<T>>>() {
             @Override
             public Observable<List<T>> apply(Observable<T> xs) {
                 return xs.toList().toObservable();
@@ -376,4 +376,166 @@ public void accept(Observable<Integer> w) throws Exception {
 
         to[0].assertFailure(TestException.class, 1);
     }
+
+    @Test
+    public void cancellingWindowCancelsUpstreamSize() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.window(10)
+        .take(1)
+        .flatMap(new Function<Observable<Integer>, Observable<Integer>>() {
+            @Override
+            public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertResult(1);
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstreamSize() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+
+        TestObserver<Observable<Integer>> to = ps.window(10)
+        .take(1)
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+
+        inner.get().test().assertResult(1);
+    }
+
+    @Test
+    public void cancellingWindowCancelsUpstreamSkip() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.window(5, 10)
+        .take(1)
+        .flatMap(new Function<Observable<Integer>, Observable<Integer>>() {
+            @Override
+            public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertResult(1);
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstreamSkip() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+
+        TestObserver<Observable<Integer>> to = ps.window(5, 10)
+        .take(1)
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+
+        inner.get().test().assertResult(1);
+    }
+
+    @Test
+    public void cancellingWindowCancelsUpstreamOverlap() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.window(5, 3)
+        .take(1)
+        .flatMap(new Function<Observable<Integer>, Observable<Integer>>() {
+            @Override
+            public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertResult(1);
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstreamOverlap() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+
+        TestObserver<Observable<Integer>> to = ps.window(5, 3)
+        .take(1)
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+
+        inner.get().test().assertResult(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
index ba9544eb9c..271cde0208 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
@@ -949,4 +949,154 @@ public void accept(Observable<Integer> v) throws Exception {
 
         assertFalse("The doOnNext got interrupted!", isInterrupted.get());
     }
+
+    @Test
+    public void cancellingWindowCancelsUpstreamExactTime() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.window(10, TimeUnit.MINUTES)
+        .take(1)
+        .flatMap(new Function<Observable<Integer>, Observable<Integer>>() {
+            @Override
+            public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertResult(1);
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstreamExactTime() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+
+        TestObserver<Observable<Integer>> to = ps.window(10, TimeUnit.MINUTES)
+        .take(1)
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+
+        to
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+
+        inner.get().test().assertResult();
+    }
+
+    @Test
+    public void cancellingWindowCancelsUpstreamExactTimeAndSize() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.window(10, TimeUnit.MINUTES, 100)
+        .take(1)
+        .flatMap(new Function<Observable<Integer>, Observable<Integer>>() {
+            @Override
+            public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertResult(1);
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstreamExactTimeAndSize() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+
+        TestObserver<Observable<Integer>> to = ps.window(10, TimeUnit.MINUTES, 100)
+        .take(1)
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+
+        to
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+
+        inner.get().test().assertResult();
+    }
+
+    @Test
+    public void cancellingWindowCancelsUpstreamExactTimeSkip() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.window(10, 15, TimeUnit.MINUTES)
+        .take(1)
+        .flatMap(new Function<Observable<Integer>, Observable<Integer>>() {
+            @Override
+            public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertResult(1);
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstreamExactTimeSkip() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+
+        TestObserver<Observable<Integer>> to = ps.window(10, 15, TimeUnit.MINUTES)
+        .take(1)
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertFalse("Subject still has subscribers!", ps.hasObservers());
+
+        to
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+
+        inner.get().test().assertResult();
+    }
 }

From df30aa19034619d9e501aca19f501c9a450091e0 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2019 08:51:21 +0100
Subject: [PATCH 002/665] Bump mockito-core from 3.2.0 to 3.2.4 (#6764)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.0 to 3.2.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.2.0...v3.2.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index aaef86c824..439a0c5680 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.12"
   ext.testNgVersion = "7.0.0"
-  ext.mockitoVersion = "3.2.0"
+  ext.mockitoVersion = "3.2.4"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "28.1-jre"

From f96821f14c91752d323877a7874f480fd6b02f12 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 17 Dec 2019 10:19:08 +0100
Subject: [PATCH 003/665] 3.x: Fix window (boundary, start/end) cancel and
 abandonment (#6762)

---
 .../io/reactivex/rxjava3/core/Flowable.java   |  20 +
 .../io/reactivex/rxjava3/core/Observable.java |  70 +++
 .../flowable/FlowableWindowBoundary.java      |   6 +-
 .../FlowableWindowBoundarySelector.java       | 526 ++++++++++--------
 .../observable/ObservableWindowBoundary.java  |   6 +-
 .../ObservableWindowBoundarySelector.java     | 488 +++++++++-------
 .../FlowableWindowWithFlowableTest.java       |  69 ++-
 ...lowableWindowWithStartEndFlowableTest.java | 131 ++++-
 .../ObservableWindowWithObservableTest.java   |  69 ++-
 .../ObservableWindowWithSizeTest.java         |  12 +-
 ...vableWindowWithStartEndObservableTest.java | 129 ++++-
 .../ObservableWindowWithTimeTest.java         |  12 +-
 12 files changed, 1056 insertions(+), 482 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 5cb5ebd7ed..23e666896d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -17965,6 +17965,11 @@ public final Flowable<Flowable<T>> window(
      * Publisher.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The outer Publisher of this operator does not support backpressure as it uses a {@code boundary} Publisher to control data
@@ -17995,6 +18000,11 @@ public final <B> Flowable<Flowable<T>> window(Publisher<B> boundaryIndicator) {
      * Publisher.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The outer Publisher of this operator does not support backpressure as it uses a {@code boundary} Publisher to control data
@@ -18031,6 +18041,11 @@ public final <B> Flowable<Flowable<T>> window(Publisher<B> boundaryIndicator, in
      * {@code closingSelector} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The outer Publisher of this operator doesn't support backpressure because the emission of new
@@ -18068,6 +18083,11 @@ public final <U, V> Flowable<Flowable<T>> window(
      * {@code closingSelector} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The outer Publisher of this operator doesn't support backpressure because the emission of new
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 505513c160..ce0815477f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -14536,6 +14536,11 @@ public final Observable<Observable<T>> window(long count, long skip, int bufferS
      * current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -14564,6 +14569,11 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, Time
      * current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -14594,6 +14604,11 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, Time
      * current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -14630,6 +14645,11 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, Time
      * ObservableSource emits the current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -14658,6 +14678,11 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit) {
      * emits the current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -14690,6 +14715,11 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      * emits the current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -14723,6 +14753,11 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      * ObservableSource emits the current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.s.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -14754,6 +14789,11 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      * current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -14788,6 +14828,11 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      * current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -14824,6 +14869,11 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      * current window and propagates the notification from the source ObservableSource.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -14865,6 +14915,11 @@ public final Observable<Observable<T>> window(
      * ObservableSource.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14891,6 +14946,11 @@ public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary)
      * ObservableSource.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14922,6 +14982,11 @@ public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary,
      * {@code closingIndicator} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14953,6 +15018,11 @@ public final <U, V> Observable<Observable<T>> window(
      * {@code closingIndicator} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
+     * <p>
+     * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
+     * so-called window abandonment where a window may not contain any elements. In this case, subsequent
+     * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
+     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
index ba43da6d84..2e07d3eec8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
@@ -240,7 +240,11 @@ void drain() {
 
                         if (emitted != requested.get()) {
                             emitted++;
-                            downstream.onNext(w);
+                            FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(w);
+                            downstream.onNext(intercept);
+                            if (intercept.tryAbandon()) {
+                                w.onComplete();
+                            }
                         } else {
                             SubscriptionHelper.cancel(upstream);
                             boundarySubscriber.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
index 573f0257e9..63ee8ccf3c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
@@ -18,70 +18,85 @@
 
 import org.reactivestreams.*;
 
-import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.*;
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
-import io.reactivex.rxjava3.internal.subscribers.QueueDrainSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.rxjava3.internal.util.NotificationLite;
+import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
-import io.reactivex.rxjava3.subscribers.*;
 
 public final class FlowableWindowBoundarySelector<T, B, V> extends AbstractFlowableWithUpstream<T, Flowable<T>> {
     final Publisher<B> open;
-    final Function<? super B, ? extends Publisher<V>> close;
+    final Function<? super B, ? extends Publisher<V>> closingIndicator;
     final int bufferSize;
 
     public FlowableWindowBoundarySelector(
             Flowable<T> source,
-            Publisher<B> open, Function<? super B, ? extends Publisher<V>> close,
+            Publisher<B> open, Function<? super B, ? extends Publisher<V>> closingIndicator,
             int bufferSize) {
         super(source);
         this.open = open;
-        this.close = close;
+        this.closingIndicator = closingIndicator;
         this.bufferSize = bufferSize;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super Flowable<T>> s) {
         source.subscribe(new WindowBoundaryMainSubscriber<T, B, V>(
-                new SerializedSubscriber<Flowable<T>>(s),
-                open, close, bufferSize));
+                s, open, closingIndicator, bufferSize));
     }
 
     static final class WindowBoundaryMainSubscriber<T, B, V>
-    extends QueueDrainSubscriber<T, Object, Flowable<T>>
-    implements Subscription {
+    extends AtomicInteger
+    implements FlowableSubscriber<T>, Subscription, Runnable {
+        private static final long serialVersionUID = 8646217640096099753L;
+
+        final Subscriber<? super Flowable<T>> downstream;
         final Publisher<B> open;
-        final Function<? super B, ? extends Publisher<V>> close;
+        final Function<? super B, ? extends Publisher<V>> closingIndicator;
         final int bufferSize;
         final CompositeDisposable resources;
 
-        Subscription upstream;
+        final WindowStartSubscriber<B> startSubscriber;
+
+        final List<UnicastProcessor<T>> windows;
+
+        final SimplePlainQueue<Object> queue;
+
+        final AtomicLong windowCount;
 
-        final AtomicReference<Disposable> boundary = new AtomicReference<Disposable>();
+        final AtomicBoolean downstreamCancelled;
 
-        final List<UnicastProcessor<T>> ws;
+        final AtomicLong requested;
+        long emitted;
 
-        final AtomicLong windows = new AtomicLong();
+        volatile boolean upstreamCanceled;
 
-        final AtomicBoolean stopWindows = new AtomicBoolean();
+        volatile boolean upstreamDone;
+        volatile boolean openDone;
+        final AtomicThrowable error;
+
+        Subscription upstream;
 
         WindowBoundaryMainSubscriber(Subscriber<? super Flowable<T>> actual,
-                Publisher<B> open, Function<? super B, ? extends Publisher<V>> close, int bufferSize) {
-            super(actual, new MpscLinkedQueue<Object>());
+                Publisher<B> open, Function<? super B, ? extends Publisher<V>> closingIndicator, int bufferSize) {
+            this.downstream = actual;
+            this.queue = new MpscLinkedQueue<Object>();
             this.open = open;
-            this.close = close;
+            this.closingIndicator = closingIndicator;
             this.bufferSize = bufferSize;
             this.resources = new CompositeDisposable();
-            this.ws = new ArrayList<UnicastProcessor<T>>();
-            windows.lazySet(1);
+            this.windows = new ArrayList<UnicastProcessor<T>>();
+            this.windowCount = new AtomicLong(1L);
+            this.downstreamCancelled = new AtomicBoolean();
+            this.error = new AtomicThrowable();
+            this.startSubscriber = new WindowStartSubscriber<B>(this);
+            this.requested = new AtomicLong();
         }
 
         @Override
@@ -91,297 +106,340 @@ public void onSubscribe(Subscription s) {
 
                 downstream.onSubscribe(this);
 
-                if (stopWindows.get()) {
-                    return;
-                }
-
-                OperatorWindowBoundaryOpenSubscriber<T, B> os = new OperatorWindowBoundaryOpenSubscriber<T, B>(this);
+                open.subscribe(startSubscriber);
 
-                if (boundary.compareAndSet(null, os)) {
-                    s.request(Long.MAX_VALUE);
-                    open.subscribe(os);
-                }
+                s.request(Long.MAX_VALUE);
             }
         }
 
         @Override
         public void onNext(T t) {
-            if (done) {
-                return;
-            }
-            if (fastEnter()) {
-                for (UnicastProcessor<T> w : ws) {
-                    w.onNext(t);
-                }
-                if (leave(-1) == 0) {
-                    return;
-                }
-            } else {
-                queue.offer(NotificationLite.next(t));
-                if (!enter()) {
-                    return;
-                }
-            }
-            drainLoop();
+            queue.offer(t);
+            drain();
         }
 
         @Override
         public void onError(Throwable t) {
-            if (done) {
-                RxJavaPlugins.onError(t);
-                return;
-            }
-            error = t;
-            done = true;
-
-            if (enter()) {
-                drainLoop();
-            }
-
-            if (windows.decrementAndGet() == 0) {
-                resources.dispose();
+            startSubscriber.cancel();
+            resources.dispose();
+            if (error.tryAddThrowableOrReport(t)) {
+                upstreamDone = true;
+                drain();
             }
-
-            downstream.onError(t);
         }
 
         @Override
         public void onComplete() {
-            if (done) {
-                return;
+            startSubscriber.cancel();
+            resources.dispose();
+            upstreamDone = true;
+            drain();
+        }
+
+        @Override
+        public void request(long n) {
+            if (SubscriptionHelper.validate(n)) {
+                BackpressureHelper.add(requested, n);
             }
-            done = true;
+        }
 
-            if (enter()) {
-                drainLoop();
+        @Override
+        public void cancel() {
+            if (downstreamCancelled.compareAndSet(false, true)) {
+                if (windowCount.decrementAndGet() == 0) {
+                    upstream.cancel();
+                    startSubscriber.cancel();
+                    resources.dispose();
+                    error.tryTerminateAndReport();
+                    upstreamCanceled = true;
+                    drain();
+                } else {
+                    startSubscriber.cancel();
+                }
             }
+        }
 
-            if (windows.decrementAndGet() == 0) {
+        @Override
+        public void run() {
+            if (windowCount.decrementAndGet() == 0) {
+                upstream.cancel();
+                startSubscriber.cancel();
                 resources.dispose();
+                error.tryTerminateAndReport();
+                upstreamCanceled = true;
+                drain();
             }
+        }
 
-            downstream.onComplete();
+        void open(B startValue) {
+            queue.offer(new WindowStartItem<B>(startValue));
+            drain();
         }
 
-        void error(Throwable t) {
+        void openError(Throwable t) {
             upstream.cancel();
             resources.dispose();
-            DisposableHelper.dispose(boundary);
-
-            downstream.onError(t);
+            if (error.tryAddThrowableOrReport(t)) {
+                upstreamDone = true;
+                drain();
+            }
         }
 
-        @Override
-        public void request(long n) {
-            requested(n);
+        void openComplete() {
+            openDone = true;
+            drain();
         }
 
-        @Override
-        public void cancel() {
-            if (stopWindows.compareAndSet(false, true)) {
-                DisposableHelper.dispose(boundary);
-                if (windows.decrementAndGet() == 0) {
-                    upstream.cancel();
-                }
-            }
+        void close(WindowEndSubscriberIntercept<T, V> what) {
+            queue.offer(what);
+            drain();
         }
 
-        void dispose() {
+        void closeError(Throwable t) {
+            upstream.cancel();
+            startSubscriber.cancel();
             resources.dispose();
-            DisposableHelper.dispose(boundary);
+            if (error.tryAddThrowableOrReport(t)) {
+                upstreamDone = true;
+                drain();
+            }
         }
 
-        void drainLoop() {
-            final SimplePlainQueue<Object> q = queue;
-            final Subscriber<? super Flowable<T>> a = downstream;
-            final List<UnicastProcessor<T>> ws = this.ws;
+        void drain() {
+            if (getAndIncrement() != 0) {
+                return;
+            }
+
             int missed = 1;
+            final Subscriber<? super Flowable<T>> downstream = this.downstream;
+            final SimplePlainQueue<Object> queue = this.queue;
+            final List<UnicastProcessor<T>> windows = this.windows;
 
             for (;;) {
-
-                for (;;) {
-                    boolean d = done;
-                    Object o = q.poll();
-
-                    boolean empty = o == null;
-
-                    if (d && empty) {
-                        dispose();
-                        Throwable e = error;
-                        if (e != null) {
-                            for (UnicastProcessor<T> w : ws) {
-                                w.onError(e);
-                            }
-                        } else {
-                            for (UnicastProcessor<T> w : ws) {
-                                w.onComplete();
-                            }
+                if (upstreamCanceled) {
+                    queue.clear();
+                    windows.clear();
+                } else {
+                    boolean isDone = upstreamDone;
+                    Object o = queue.poll();
+                    boolean isEmpty = o == null;
+
+                    if (isDone) {
+                        if (isEmpty || error.get() != null) {
+                            terminateDownstream(downstream);
+                            upstreamCanceled = true;
+                            continue;
                         }
-                        ws.clear();
-                        return;
-                    }
-
-                    if (empty) {
-                        break;
                     }
 
-                    if (o instanceof WindowOperation) {
-                        @SuppressWarnings("unchecked")
-                        WindowOperation<T, B> wo = (WindowOperation<T, B>) o;
-
-                        UnicastProcessor<T> w = wo.w;
-                        if (w != null) {
-                            if (ws.remove(wo.w)) {
-                                wo.w.onComplete();
-
-                                if (windows.decrementAndGet() == 0) {
-                                    dispose();
-                                    return;
+                    if (!isEmpty) {
+                        if (o instanceof WindowStartItem) {
+                            if (!downstreamCancelled.get()) {
+                                long emitted = this.emitted;
+                                if (requested.get() != emitted) {
+                                    this.emitted = ++emitted;
+
+                                    @SuppressWarnings("unchecked")
+                                    B startItem = ((WindowStartItem<B>)o).item;
+
+                                    Publisher<V> endSource;
+                                    try {
+                                        endSource = ObjectHelper.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null Publisher");
+                                    } catch (Throwable ex) {
+                                        upstream.cancel();
+                                        startSubscriber.cancel();
+                                        resources.dispose();
+                                        Exceptions.throwIfFatal(ex);
+                                        error.tryAddThrowableOrReport(ex);
+                                        upstreamDone = true;
+                                        continue;
+                                    }
+
+                                    windowCount.getAndIncrement();
+                                    UnicastProcessor<T> newWindow = UnicastProcessor.create(bufferSize, this);
+                                    WindowEndSubscriberIntercept<T, V> endSubscriber = new WindowEndSubscriberIntercept<T, V>(this, newWindow);
+
+                                    downstream.onNext(endSubscriber);
+
+                                    if (endSubscriber.tryAbandon()) {
+                                        newWindow.onComplete();
+                                    } else {
+                                        windows.add(newWindow);
+                                        resources.add(endSubscriber);
+                                        endSource.subscribe(endSubscriber);
+                                    }
+                                } else {
+                                    upstream.cancel();
+                                    startSubscriber.cancel();
+                                    resources.dispose();
+                                    error.tryAddThrowableOrReport(new MissingBackpressureException(FlowableWindowTimed.missingBackpressureMessage(emitted)));
+                                    upstreamDone = true;
                                 }
                             }
-                            continue;
-                        }
-
-                        if (stopWindows.get()) {
-                            continue;
                         }
+                        else if (o instanceof WindowEndSubscriberIntercept) {
+                            @SuppressWarnings("unchecked")
+                            UnicastProcessor<T> w = ((WindowEndSubscriberIntercept<T, V>)o).window;
 
-                        w = UnicastProcessor.<T>create(bufferSize);
-
-                        long r = requested();
-                        if (r != 0L) {
-                            ws.add(w);
-                            a.onNext(w);
-                            if (r != Long.MAX_VALUE) {
-                                produced(1);
-                            }
+                            windows.remove(w);
+                            resources.delete((Disposable)o);
+                            w.onComplete();
                         } else {
-                            cancel();
-                            a.onError(new MissingBackpressureException("Could not deliver new window due to lack of requests"));
-                            continue;
-                        }
-
-                        Publisher<V> p;
+                            @SuppressWarnings("unchecked")
+                            T item = (T)o;
 
-                        try {
-                            p = ObjectHelper.requireNonNull(close.apply(wo.open), "The publisher supplied is null");
-                        } catch (Throwable e) {
-                            cancel();
-                            a.onError(e);
-                            continue;
-                        }
-
-                        OperatorWindowBoundaryCloseSubscriber<T, V> cl = new OperatorWindowBoundaryCloseSubscriber<T, V>(this, w);
-
-                        if (resources.add(cl)) {
-                            windows.getAndIncrement();
-
-                            p.subscribe(cl);
+                            for (UnicastProcessor<T> w : windows) {
+                                w.onNext(item);
+                            }
                         }
 
                         continue;
                     }
-
-                    for (UnicastProcessor<T> w : ws) {
-                        w.onNext(NotificationLite.<T>getValue(o));
+                    else if (openDone && windows.size() == 0) {
+                        upstream.cancel();
+                        startSubscriber.cancel();
+                        resources.dispose();
+                        terminateDownstream(downstream);
+                        upstreamCanceled = true;
+                        continue;
                     }
                 }
 
-                missed = leave(-missed);
+                missed = addAndGet(-missed);
                 if (missed == 0) {
                     break;
                 }
             }
         }
 
-        @Override
-        public boolean accept(Subscriber<? super Flowable<T>> a, Object v) {
-            // not used by this operator
-            return false;
+        void terminateDownstream(Subscriber<?> downstream) {
+            Throwable ex = error.terminate();
+            if (ex == null) {
+                for (UnicastProcessor<T> w : windows) {
+                    w.onComplete();
+                }
+                downstream.onComplete();
+            } else if (ex != ExceptionHelper.TERMINATED) {
+                for (UnicastProcessor<T> w : windows) {
+                    w.onError(ex);
+                }
+                downstream.onError(ex);
+            }
         }
 
-        void open(B b) {
-            queue.offer(new WindowOperation<T, B>(null, b));
-            if (enter()) {
-                drainLoop();
+        static final class WindowStartItem<B> {
+
+            final B item;
+
+            WindowStartItem(B item) {
+                this.item = item;
             }
         }
 
-        void close(OperatorWindowBoundaryCloseSubscriber<T, V> w) {
-            resources.delete(w);
-            queue.offer(new WindowOperation<T, B>(w.w, null));
-            if (enter()) {
-                drainLoop();
+        static final class WindowStartSubscriber<B> extends AtomicReference<Subscription>
+        implements FlowableSubscriber<B> {
+
+            private static final long serialVersionUID = -3326496781427702834L;
+
+            final WindowBoundaryMainSubscriber<?, B, ?> parent;
+
+            WindowStartSubscriber(WindowBoundaryMainSubscriber<?, B, ?> parent) {
+                this.parent = parent;
             }
-        }
-    }
 
-    static final class WindowOperation<T, B> {
-        final UnicastProcessor<T> w;
-        final B open;
-        WindowOperation(UnicastProcessor<T> w, B open) {
-            this.w = w;
-            this.open = open;
-        }
-    }
+            @Override
+            public void onSubscribe(Subscription s) {
+                if (SubscriptionHelper.setOnce(this, s)) {
+                    s.request(Long.MAX_VALUE);
+                }
+            }
 
-    static final class OperatorWindowBoundaryOpenSubscriber<T, B> extends DisposableSubscriber<B> {
-        final WindowBoundaryMainSubscriber<T, B, ?> parent;
+            @Override
+            public void onNext(B t) {
+                parent.open(t);
+            }
 
-        OperatorWindowBoundaryOpenSubscriber(WindowBoundaryMainSubscriber<T, B, ?> parent) {
-            this.parent = parent;
-        }
+            @Override
+            public void onError(Throwable t) {
+                parent.openError(t);
+            }
 
-        @Override
-        public void onNext(B t) {
-            parent.open(t);
-        }
+            @Override
+            public void onComplete() {
+                parent.openComplete();
+            }
 
-        @Override
-        public void onError(Throwable t) {
-            parent.error(t);
+            void cancel() {
+                SubscriptionHelper.cancel(this);
+            }
         }
 
-        @Override
-        public void onComplete() {
-            parent.onComplete();
-        }
-    }
+        static final class WindowEndSubscriberIntercept<T, V> extends Flowable<T>
+        implements FlowableSubscriber<V>, Disposable {
 
-    static final class OperatorWindowBoundaryCloseSubscriber<T, V> extends DisposableSubscriber<V> {
-        final WindowBoundaryMainSubscriber<T, ?, V> parent;
-        final UnicastProcessor<T> w;
+            final WindowBoundaryMainSubscriber<T, ?, V> parent;
 
-        boolean done;
+            final UnicastProcessor<T> window;
 
-        OperatorWindowBoundaryCloseSubscriber(WindowBoundaryMainSubscriber<T, ?, V> parent, UnicastProcessor<T> w) {
-            this.parent = parent;
-            this.w = w;
-        }
+            final AtomicReference<Subscription> upstream;
 
-        @Override
-        public void onNext(V t) {
-            cancel();
-            onComplete();
-        }
+            final AtomicBoolean once;
 
-        @Override
-        public void onError(Throwable t) {
-            if (done) {
-                RxJavaPlugins.onError(t);
-                return;
+            WindowEndSubscriberIntercept(WindowBoundaryMainSubscriber<T, ?, V> parent, UnicastProcessor<T> window) {
+                this.parent = parent;
+                this.window = window;
+                this.upstream = new AtomicReference<Subscription>();
+                this.once = new AtomicBoolean();
             }
-            done = true;
-            parent.error(t);
-        }
 
-        @Override
-        public void onComplete() {
-            if (done) {
-                return;
+            @Override
+            public void onSubscribe(Subscription s) {
+                if (SubscriptionHelper.setOnce(upstream, s)) {
+                    s.request(Long.MAX_VALUE);
+                }
+            }
+
+            @Override
+            public void onNext(V t) {
+                if (SubscriptionHelper.cancel(upstream)) {
+                    parent.close(this);
+                }
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                if (isDisposed()) {
+                    RxJavaPlugins.onError(t);
+                } else {
+                    parent.closeError(t);
+                }
+            }
+
+            @Override
+            public void onComplete() {
+                parent.close(this);
+            }
+
+            @Override
+            public void dispose() {
+                SubscriptionHelper.cancel(upstream);
+            }
+
+            @Override
+            public boolean isDisposed() {
+                return upstream.get() == SubscriptionHelper.CANCELLED;
+            }
+
+            @Override
+            protected void subscribeActual(Subscriber<? super T> s) {
+                window.subscribe(s);
+                once.set(true);
+            }
+
+            boolean tryAbandon() {
+                return !once.get() && once.compareAndSet(false, true);
             }
-            done = true;
-            parent.close(this);
         }
     }
+
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java
index cbcdfc3c91..48de711a04 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java
@@ -230,7 +230,11 @@ void drain() {
                         window = w;
                         windows.getAndIncrement();
 
-                        downstream.onNext(w);
+                        ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(w);
+                        downstream.onNext(intercept);
+                        if (intercept.tryAbandon()) {
+                            w.onComplete();
+                        }
                     }
                 }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
index 35e92c3fec..037c7d0773 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
@@ -24,62 +24,79 @@
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 import io.reactivex.rxjava3.internal.functions.ObjectHelper;
-import io.reactivex.rxjava3.internal.observers.QueueDrainObserver;
+import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
-import io.reactivex.rxjava3.internal.util.NotificationLite;
-import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 
 public final class ObservableWindowBoundarySelector<T, B, V> extends AbstractObservableWithUpstream<T, Observable<T>> {
     final ObservableSource<B> open;
-    final Function<? super B, ? extends ObservableSource<V>> close;
+    final Function<? super B, ? extends ObservableSource<V>> closingIndicator;
     final int bufferSize;
 
     public ObservableWindowBoundarySelector(
             ObservableSource<T> source,
-            ObservableSource<B> open, Function<? super B, ? extends ObservableSource<V>> close,
+            ObservableSource<B> open, Function<? super B, ? extends ObservableSource<V>> closingIndicator,
             int bufferSize) {
         super(source);
         this.open = open;
-        this.close = close;
+        this.closingIndicator = closingIndicator;
         this.bufferSize = bufferSize;
     }
 
     @Override
     public void subscribeActual(Observer<? super Observable<T>> t) {
         source.subscribe(new WindowBoundaryMainObserver<T, B, V>(
-                new SerializedObserver<Observable<T>>(t),
-                open, close, bufferSize));
+                t, open, closingIndicator, bufferSize));
     }
 
     static final class WindowBoundaryMainObserver<T, B, V>
-    extends QueueDrainObserver<T, Object, Observable<T>>
-    implements Disposable {
+    extends AtomicInteger
+    implements Observer<T>, Disposable, Runnable {
+        private static final long serialVersionUID = 8646217640096099753L;
+
+        final Observer<? super Observable<T>> downstream;
         final ObservableSource<B> open;
-        final Function<? super B, ? extends ObservableSource<V>> close;
+        final Function<? super B, ? extends ObservableSource<V>> closingIndicator;
         final int bufferSize;
         final CompositeDisposable resources;
 
-        Disposable upstream;
+        final WindowStartObserver<B> startObserver;
+
+        final List<UnicastSubject<T>> windows;
+
+        final SimplePlainQueue<Object> queue;
+
+        final AtomicLong windowCount;
 
-        final AtomicReference<Disposable> boundary = new AtomicReference<Disposable>();
+        final AtomicBoolean downstreamDisposed;
 
-        final List<UnicastSubject<T>> ws;
+        final AtomicLong requested;
+        long emitted;
 
-        final AtomicLong windows = new AtomicLong();
+        volatile boolean upstreamCanceled;
 
-        final AtomicBoolean stopWindows = new AtomicBoolean();
+        volatile boolean upstreamDone;
+        volatile boolean openDone;
+        final AtomicThrowable error;
 
-        WindowBoundaryMainObserver(Observer<? super Observable<T>> actual,
-                                            ObservableSource<B> open, Function<? super B, ? extends ObservableSource<V>> close, int bufferSize) {
-            super(actual, new MpscLinkedQueue<Object>());
+        Disposable upstream;
+
+        WindowBoundaryMainObserver(Observer<? super Observable<T>> downstream,
+                ObservableSource<B> open, Function<? super B, ? extends ObservableSource<V>> closingIndicator, int bufferSize) {
+            this.downstream = downstream;
+            this.queue = new MpscLinkedQueue<Object>();
             this.open = open;
-            this.close = close;
+            this.closingIndicator = closingIndicator;
             this.bufferSize = bufferSize;
             this.resources = new CompositeDisposable();
-            this.ws = new ArrayList<UnicastSubject<T>>();
-            windows.lazySet(1);
+            this.windows = new ArrayList<UnicastSubject<T>>();
+            this.windowCount = new AtomicLong(1L);
+            this.downstreamDisposed = new AtomicBoolean();
+            this.error = new AtomicThrowable();
+            this.startObserver = new WindowStartObserver<B>(this);
+            this.requested = new AtomicLong();
         }
 
         @Override
@@ -89,281 +106,320 @@ public void onSubscribe(Disposable d) {
 
                 downstream.onSubscribe(this);
 
-                if (stopWindows.get()) {
-                    return;
-                }
-
-                OperatorWindowBoundaryOpenObserver<T, B> os = new OperatorWindowBoundaryOpenObserver<T, B>(this);
-
-                if (boundary.compareAndSet(null, os)) {
-                    open.subscribe(os);
-                }
+                open.subscribe(startObserver);
             }
         }
 
         @Override
         public void onNext(T t) {
-            if (fastEnter()) {
-                for (UnicastSubject<T> w : ws) {
-                    w.onNext(t);
-                }
-                if (leave(-1) == 0) {
-                    return;
-                }
-            } else {
-                queue.offer(NotificationLite.next(t));
-                if (!enter()) {
-                    return;
-                }
-            }
-            drainLoop();
+            queue.offer(t);
+            drain();
         }
 
         @Override
         public void onError(Throwable t) {
-            if (done) {
-                RxJavaPlugins.onError(t);
-                return;
-            }
-            error = t;
-            done = true;
-
-            if (enter()) {
-                drainLoop();
-            }
-
-            if (windows.decrementAndGet() == 0) {
-                resources.dispose();
+            startObserver.dispose();
+            resources.dispose();
+            if (error.tryAddThrowableOrReport(t)) {
+                upstreamDone = true;
+                drain();
             }
-
-            downstream.onError(t);
         }
 
         @Override
         public void onComplete() {
-            if (done) {
-                return;
-            }
-            done = true;
-
-            if (enter()) {
-                drainLoop();
-            }
-
-            if (windows.decrementAndGet() == 0) {
-                resources.dispose();
-            }
-
-            downstream.onComplete();
-        }
-
-        void error(Throwable t) {
-            upstream.dispose();
+            startObserver.dispose();
             resources.dispose();
-            onError(t);
+            upstreamDone = true;
+            drain();
         }
 
         @Override
         public void dispose() {
-            if (stopWindows.compareAndSet(false, true)) {
-                DisposableHelper.dispose(boundary);
-                if (windows.decrementAndGet() == 0) {
+            if (downstreamDisposed.compareAndSet(false, true)) {
+                if (windowCount.decrementAndGet() == 0) {
                     upstream.dispose();
+                    startObserver.dispose();
+                    resources.dispose();
+                    error.tryTerminateAndReport();
+                    upstreamCanceled = true;
+                    drain();
+                } else {
+                    startObserver.dispose();
                 }
             }
         }
 
         @Override
         public boolean isDisposed() {
-            return stopWindows.get();
+            return downstreamDisposed.get();
+        }
+
+        @Override
+        public void run() {
+            if (windowCount.decrementAndGet() == 0) {
+                upstream.dispose();
+                startObserver.dispose();
+                resources.dispose();
+                error.tryTerminateAndReport();
+                upstreamCanceled = true;
+                drain();
+            }
+        }
+
+        void open(B startValue) {
+            queue.offer(new WindowStartItem<B>(startValue));
+            drain();
         }
 
-        void disposeBoundary() {
+        void openError(Throwable t) {
+            upstream.dispose();
             resources.dispose();
-            DisposableHelper.dispose(boundary);
+            if (error.tryAddThrowableOrReport(t)) {
+                upstreamDone = true;
+                drain();
+            }
         }
 
-        void drainLoop() {
-            final MpscLinkedQueue<Object> q = (MpscLinkedQueue<Object>)queue;
-            final Observer<? super Observable<T>> a = downstream;
-            final List<UnicastSubject<T>> ws = this.ws;
-            int missed = 1;
+        void openComplete() {
+            openDone = true;
+            drain();
+        }
 
-            for (;;) {
+        void close(WindowEndObserverIntercept<T, V> what) {
+            queue.offer(what);
+            drain();
+        }
 
-                for (;;) {
-                    boolean d = done;
+        void closeError(Throwable t) {
+            upstream.dispose();
+            startObserver.dispose();
+            resources.dispose();
+            if (error.tryAddThrowableOrReport(t)) {
+                upstreamDone = true;
+                drain();
+            }
+        }
 
-                    Object o = q.poll();
+        void drain() {
+            if (getAndIncrement() != 0) {
+                return;
+            }
 
-                    boolean empty = o == null;
+            int missed = 1;
+            final Observer<? super Observable<T>> downstream = this.downstream;
+            final SimplePlainQueue<Object> queue = this.queue;
+            final List<UnicastSubject<T>> windows = this.windows;
 
-                    if (d && empty) {
-                        disposeBoundary();
-                        Throwable e = error;
-                        if (e != null) {
-                            for (UnicastSubject<T> w : ws) {
-                                w.onError(e);
-                            }
-                        } else {
-                            for (UnicastSubject<T> w : ws) {
-                                w.onComplete();
-                            }
+            for (;;) {
+                if (upstreamCanceled) {
+                    queue.clear();
+                    windows.clear();
+                } else {
+                    boolean isDone = upstreamDone;
+                    Object o = queue.poll();
+                    boolean isEmpty = o == null;
+
+                    if (isDone) {
+                        if (isEmpty || error.get() != null) {
+                            terminateDownstream(downstream);
+                            upstreamCanceled = true;
+                            continue;
                         }
-                        ws.clear();
-                        return;
                     }
 
-                    if (empty) {
-                        break;
-                    }
+                    if (!isEmpty) {
+                        if (o instanceof WindowStartItem) {
+                            if (!downstreamDisposed.get()) {
+                                @SuppressWarnings("unchecked")
+                                B startItem = ((WindowStartItem<B>)o).item;
+
+                                ObservableSource<V> endSource;
+                                try {
+                                    endSource = ObjectHelper.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null ObservableSource");
+                                } catch (Throwable ex) {
+                                    upstream.dispose();
+                                    startObserver.dispose();
+                                    resources.dispose();
+                                    Exceptions.throwIfFatal(ex);
+                                    error.tryAddThrowableOrReport(ex);
+                                    upstreamDone = true;
+                                    continue;
+                                }
 
-                    if (o instanceof WindowOperation) {
-                        @SuppressWarnings("unchecked")
-                        WindowOperation<T, B> wo = (WindowOperation<T, B>) o;
+                                windowCount.getAndIncrement();
+                                UnicastSubject<T> newWindow = UnicastSubject.create(bufferSize, this);
+                                WindowEndObserverIntercept<T, V> endObserver = new WindowEndObserverIntercept<T, V>(this, newWindow);
 
-                        UnicastSubject<T> w = wo.w;
-                        if (w != null) {
-                            if (ws.remove(wo.w)) {
-                                wo.w.onComplete();
+                                downstream.onNext(endObserver);
 
-                                if (windows.decrementAndGet() == 0) {
-                                    disposeBoundary();
-                                    return;
+                                if (endObserver.tryAbandon()) {
+                                    newWindow.onComplete();
+                                } else {
+                                    windows.add(newWindow);
+                                    resources.add(endObserver);
+                                    endSource.subscribe(endObserver);
                                 }
                             }
-                            continue;
-                        }
-
-                        if (stopWindows.get()) {
-                            continue;
                         }
+                        else if (o instanceof WindowEndObserverIntercept) {
+                            @SuppressWarnings("unchecked")
+                            UnicastSubject<T> w = ((WindowEndObserverIntercept<T, V>)o).window;
 
-                        w = UnicastSubject.create(bufferSize);
-
-                        ws.add(w);
-                        a.onNext(w);
-
-                        ObservableSource<V> p;
-
-                        try {
-                            p = ObjectHelper.requireNonNull(close.apply(wo.open), "The ObservableSource supplied is null");
-                        } catch (Throwable e) {
-                            Exceptions.throwIfFatal(e);
-                            stopWindows.set(true);
-                            a.onError(e);
-                            continue;
-                        }
-
-                        OperatorWindowBoundaryCloseObserver<T, V> cl = new OperatorWindowBoundaryCloseObserver<T, V>(this, w);
-
-                        if (resources.add(cl)) {
-                            windows.getAndIncrement();
+                            windows.remove(w);
+                            resources.delete((Disposable)o);
+                            w.onComplete();
+                        } else {
+                            @SuppressWarnings("unchecked")
+                            T item = (T)o;
 
-                            p.subscribe(cl);
+                            for (UnicastSubject<T> w : windows) {
+                                w.onNext(item);
+                            }
                         }
 
                         continue;
                     }
-
-                    for (UnicastSubject<T> w : ws) {
-                        w.onNext(NotificationLite.<T>getValue(o));
+                    else if (openDone && windows.size() == 0) {
+                        upstream.dispose();
+                        startObserver.dispose();
+                        resources.dispose();
+                        terminateDownstream(downstream);
+                        upstreamCanceled = true;
+                        continue;
                     }
                 }
 
-                missed = leave(-missed);
+                missed = addAndGet(-missed);
                 if (missed == 0) {
                     break;
                 }
             }
         }
 
-        @Override
-        public void accept(Observer<? super Observable<T>> a, Object v) {
+        void terminateDownstream(Observer<?> downstream) {
+            Throwable ex = error.terminate();
+            if (ex == null) {
+                for (UnicastSubject<T> w : windows) {
+                    w.onComplete();
+                }
+                downstream.onComplete();
+            } else if (ex != ExceptionHelper.TERMINATED) {
+                for (UnicastSubject<T> w : windows) {
+                    w.onError(ex);
+                }
+                downstream.onError(ex);
+            }
         }
 
-        void open(B b) {
-            queue.offer(new WindowOperation<Object, B>(null, b));
-            if (enter()) {
-                drainLoop();
+        static final class WindowStartItem<B> {
+
+            final B item;
+
+            WindowStartItem(B item) {
+                this.item = item;
             }
         }
 
-        void close(OperatorWindowBoundaryCloseObserver<T, V> w) {
-            resources.delete(w);
-            queue.offer(new WindowOperation<T, Object>(w.w, null));
-            if (enter()) {
-                drainLoop();
+        static final class WindowStartObserver<B> extends AtomicReference<Disposable>
+        implements Observer<B> {
+
+            private static final long serialVersionUID = -3326496781427702834L;
+
+            final WindowBoundaryMainObserver<?, B, ?> parent;
+
+            WindowStartObserver(WindowBoundaryMainObserver<?, B, ?> parent) {
+                this.parent = parent;
             }
-        }
-    }
 
-    static final class WindowOperation<T, B> {
-        final UnicastSubject<T> w;
-        final B open;
-        WindowOperation(UnicastSubject<T> w, B open) {
-            this.w = w;
-            this.open = open;
-        }
-    }
+            @Override
+            public void onSubscribe(Disposable d) {
+                DisposableHelper.setOnce(this, d);
+            }
 
-    static final class OperatorWindowBoundaryOpenObserver<T, B> extends DisposableObserver<B> {
-        final WindowBoundaryMainObserver<T, B, ?> parent;
+            @Override
+            public void onNext(B t) {
+                parent.open(t);
+            }
 
-        OperatorWindowBoundaryOpenObserver(WindowBoundaryMainObserver<T, B, ?> parent) {
-            this.parent = parent;
-        }
+            @Override
+            public void onError(Throwable t) {
+                parent.openError(t);
+            }
 
-        @Override
-        public void onNext(B t) {
-            parent.open(t);
-        }
+            @Override
+            public void onComplete() {
+                parent.openComplete();
+            }
 
-        @Override
-        public void onError(Throwable t) {
-            parent.error(t);
+            void dispose() {
+                DisposableHelper.dispose(this);
+            }
         }
 
-        @Override
-        public void onComplete() {
-            parent.onComplete();
-        }
-    }
+        static final class WindowEndObserverIntercept<T, V> extends Observable<T>
+        implements Observer<V>, Disposable {
 
-    static final class OperatorWindowBoundaryCloseObserver<T, V> extends DisposableObserver<V> {
-        final WindowBoundaryMainObserver<T, ?, V> parent;
-        final UnicastSubject<T> w;
+            final WindowBoundaryMainObserver<T, ?, V> parent;
 
-        boolean done;
+            final UnicastSubject<T> window;
 
-        OperatorWindowBoundaryCloseObserver(WindowBoundaryMainObserver<T, ?, V> parent, UnicastSubject<T> w) {
-            this.parent = parent;
-            this.w = w;
-        }
+            final AtomicReference<Disposable> upstream;
 
-        @Override
-        public void onNext(V t) {
-            dispose();
-            onComplete();
-        }
+            final AtomicBoolean once;
 
-        @Override
-        public void onError(Throwable t) {
-            if (done) {
-                RxJavaPlugins.onError(t);
-                return;
+            WindowEndObserverIntercept(WindowBoundaryMainObserver<T, ?, V> parent, UnicastSubject<T> window) {
+                this.parent = parent;
+                this.window = window;
+                this.upstream = new AtomicReference<Disposable>();
+                this.once = new AtomicBoolean();
             }
-            done = true;
-            parent.error(t);
-        }
 
-        @Override
-        public void onComplete() {
-            if (done) {
-                return;
+            @Override
+            public void onSubscribe(Disposable d) {
+                DisposableHelper.setOnce(upstream, d);
+            }
+
+            @Override
+            public void onNext(V t) {
+                if (DisposableHelper.dispose(upstream)) {
+                    parent.close(this);
+                }
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                if (isDisposed()) {
+                    RxJavaPlugins.onError(t);
+                } else {
+                    parent.closeError(t);
+                }
+            }
+
+            @Override
+            public void onComplete() {
+                parent.close(this);
+            }
+
+            @Override
+            public void dispose() {
+                DisposableHelper.dispose(upstream);
+            }
+
+            @Override
+            public boolean isDisposed() {
+                return upstream.get() == DisposableHelper.DISPOSED;
+            }
+
+            @Override
+            protected void subscribeActual(Observer<? super T> o) {
+                window.subscribe(o);
+                once.set(true);
+            }
+
+            boolean tryAbandon() {
+                return !once.get() && once.compareAndSet(false, true);
             }
-            done = true;
-            parent.close(this);
         }
     }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
index fcd2390f7e..8b001803c0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
@@ -26,7 +26,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -418,6 +418,12 @@ protected void subscribeActual(Subscriber<? super Object> subscriber) {
                     ref.set(subscriber);
                 }
             })
+            .doOnNext(new Consumer<Flowable<Object>>() {
+                @Override
+                public void accept(Flowable<Object> w) throws Throwable {
+                    w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+                }
+            })
             .to(TestHelper.<Flowable<Object>>testConsumer());
 
             ts
@@ -674,4 +680,65 @@ public void run() {
             TestHelper.race(r1, r2);
         }
     }
+
+    @Test
+    public void cancellingWindowCancelsUpstream() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp.window(Flowable.just(1).concatWith(Flowable.<Integer>never()))
+        .take(1)
+        .flatMap(new Function<Flowable<Integer>, Publisher<Integer>>() {
+            @Override
+            public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        pp.onNext(1);
+
+        ts
+        .assertResult(1);
+
+        assertFalse("Processor still has subscribers!", pp.hasSubscribers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstream() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+
+        TestSubscriber<Flowable<Integer>> ts = pp.window(Flowable.<Integer>never())
+        .doOnNext(new Consumer<Flowable<Integer>>() {
+            @Override
+            public void accept(Flowable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        ts
+        .assertValueCount(1)
+        ;
+
+        pp.onNext(1);
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.cancel();
+
+        ts
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertNotComplete();
+
+        assertFalse("Processor still has subscribers!", pp.hasSubscribers());
+
+        inner.get().test().assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
index 3a76a4c7a8..9420794dc5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
@@ -17,7 +17,7 @@
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.*;
 
 import org.junit.*;
 import org.reactivestreams.*;
@@ -160,7 +160,14 @@ public void noUnsubscribeAndNoLeak() {
             public Flowable<Integer> apply(Integer t) {
                 return close;
             }
-        }).subscribe(ts);
+        })
+        .doOnNext(new Consumer<Flowable<Integer>>() {
+            @Override
+            public void accept(Flowable<Integer> w) throws Throwable {
+                w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+            }
+        })
+        .subscribe(ts);
 
         open.onNext(1);
         source.onNext(1);
@@ -197,7 +204,14 @@ public void unsubscribeAll() {
             public Flowable<Integer> apply(Integer t) {
                 return close;
             }
-        }).subscribe(ts);
+        })
+        .doOnNext(new Consumer<Flowable<Integer>>() {
+            @Override
+            public void accept(Flowable<Integer> w) throws Throwable {
+                w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+            }
+        })
+        .subscribe(ts);
 
         open.onNext(1);
 
@@ -248,16 +262,6 @@ public Flowable<Integer> apply(Flowable<Integer> v) throws Exception {
         .assertResult(1, 2);
     }
 
-    @Test
-    public void badSourceCallable() {
-        TestHelper.checkBadSourceFlowable(new Function<Flowable<Object>, Object>() {
-            @Override
-            public Object apply(Flowable<Object> f) throws Exception {
-                return f.window(Flowable.just(1), Functions.justFunction(Flowable.never()));
-            }
-        }, false, 1, 1, (Object[])null);
-    }
-
     @Test
     public void boundarySelectorNormal() {
         PublishProcessor<Integer> source = PublishProcessor.create();
@@ -372,6 +376,12 @@ protected void subscribeActual(
                     };
                 }
             })
+            .doOnNext(new Consumer<Flowable<Integer>>() {
+                @Override
+                public void accept(Flowable<Integer> w) throws Throwable {
+                    w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+                }
+            })
             .test()
             .assertValueCount(1)
             .assertNoErrors()
@@ -406,6 +416,12 @@ public Flowable<Integer> apply(Integer v) throws Exception {
                 return flowableDisposed(closeDisposed);
             }
         })
+        .doOnNext(new Consumer<Flowable<Integer>>() {
+            @Override
+            public void accept(Flowable<Integer> w) throws Throwable {
+                w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+            }
+        })
         .to(TestHelper.<Flowable<Integer>>testConsumer())
         .assertSubscribed()
         .assertNoErrors()
@@ -436,4 +452,93 @@ public void mainWindowMissingBackpressure() {
         assertFalse(source.hasSubscribers());
         assertFalse(boundary.hasSubscribers());
     }
+
+    @Test
+    public void cancellingWindowCancelsUpstream() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp.window(Flowable.just(1).concatWith(Flowable.<Integer>never()), Functions.justFunction(Flowable.never()))
+        .take(1)
+        .flatMap(new Function<Flowable<Integer>, Publisher<Integer>>() {
+            @Override
+            public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        pp.onNext(1);
+
+        ts
+        .assertResult(1);
+
+        assertFalse("Processor still has subscribers!", pp.hasSubscribers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstream() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+
+        TestSubscriber<Flowable<Integer>> ts = pp.window(Flowable.<Integer>just(1).concatWith(Flowable.<Integer>never()),
+                Functions.justFunction(Flowable.never()))
+        .doOnNext(new Consumer<Flowable<Integer>>() {
+            @Override
+            public void accept(Flowable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        ts
+        .assertValueCount(1)
+        ;
+
+        pp.onNext(1);
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.cancel();
+
+        ts
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertNotComplete();
+
+        assertFalse("Processor still has subscribers!", pp.hasSubscribers());
+
+        inner.get().test().assertResult();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void closingIndicatorFunctionCrash() {
+
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        PublishProcessor<Integer> boundary = PublishProcessor.create();
+
+        TestSubscriber<Flowable<Integer>> ts = source.window(boundary, new Function<Integer, Publisher<Object>>() {
+            @Override
+            public Publisher<Object> apply(Integer end) throws Throwable {
+                throw new TestException();
+            }
+        })
+        .test()
+        ;
+
+        ts.assertEmpty();
+
+        boundary.onNext(1);
+
+        ts.assertFailure(TestException.class);
+
+        assertFalse(source.hasSubscribers());
+        assertFalse(boundary.hasSubscribers());
+
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
index 1ac8c7209b..e6804ddcab 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
@@ -28,7 +28,7 @@
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.observers.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -378,6 +378,12 @@ protected void subscribeActual(Observer<? super Object> observer) {
                     ref.set(observer);
                 }
             })
+            .doOnNext(new Consumer<Observable<Object>>() {
+                @Override
+                public void accept(Observable<Object> w) throws Throwable {
+                    w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+                }
+            })
             .to(TestHelper.<Observable<Object>>testConsumer());
 
             to
@@ -636,4 +642,65 @@ public void run() {
             TestHelper.race(r1, r2);
         }
     }
+
+    @Test
+    public void cancellingWindowCancelsUpstream() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.window(Observable.<Integer>never())
+        .take(1)
+        .flatMap(new Function<Observable<Integer>, Observable<Integer>>() {
+            @Override
+            public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertResult(1);
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstream() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+
+        TestObserver<Observable<Integer>> to = ps.window(Observable.<Integer>never())
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        to
+        .assertValueCount(1)
+        ;
+
+        ps.onNext(1);
+
+        assertTrue(ps.hasObservers());
+
+        to.dispose();
+
+        to
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertNotComplete();
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+
+        inner.get().test().assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
index 8053b0f532..b7ef436399 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
@@ -398,7 +398,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
         to
         .assertResult(1);
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
     }
 
     @Test
@@ -426,7 +426,7 @@ public void accept(Observable<Integer> v) throws Throwable {
         .assertNoErrors()
         .assertComplete();
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
 
         inner.get().test().assertResult(1);
     }
@@ -452,7 +452,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
         to
         .assertResult(1);
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
     }
 
     @Test
@@ -480,7 +480,7 @@ public void accept(Observable<Integer> v) throws Throwable {
         .assertNoErrors()
         .assertComplete();
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
 
         inner.get().test().assertResult(1);
     }
@@ -506,7 +506,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
         to
         .assertResult(1);
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
     }
 
     @Test
@@ -534,7 +534,7 @@ public void accept(Observable<Integer> v) throws Throwable {
         .assertNoErrors()
         .assertComplete();
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
 
         inner.get().test().assertResult(1);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
index 90732ddf1e..da02116cd9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
@@ -17,7 +17,7 @@
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.*;
 
 import org.junit.*;
 
@@ -161,7 +161,14 @@ public void noUnsubscribeAndNoLeak() {
             public Observable<Integer> apply(Integer t) {
                 return close;
             }
-        }).subscribe(to);
+        })
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> w) throws Throwable {
+                w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+            }
+        })
+        .subscribe(to);
 
         open.onNext(1);
         source.onNext(1);
@@ -199,7 +206,14 @@ public void unsubscribeAll() {
             public Observable<Integer> apply(Integer t) {
                 return close;
             }
-        }).subscribe(to);
+        })
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> w) throws Throwable {
+                w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+            }
+        })
+        .subscribe(to);
 
         open.onNext(1);
 
@@ -365,6 +379,12 @@ protected void subscribeActual(
                     };
                 }
             })
+            .doOnNext(new Consumer<Observable<Integer>>() {
+                @Override
+                public void accept(Observable<Integer> w) throws Throwable {
+                    w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+                }
+            })
             .test()
             .assertValueCount(1)
             .assertNoErrors()
@@ -399,6 +419,12 @@ public ObservableSource<Integer> apply(Integer v) throws Exception {
                 return observableDisposed(closeDisposed);
             }
         })
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> w) throws Throwable {
+                w.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer()); // avoid abandonment
+            }
+        })
         .to(TestHelper.<Observable<Integer>>testConsumer())
         .assertSubscribed()
         .assertNoErrors()
@@ -409,4 +435,101 @@ public ObservableSource<Integer> apply(Integer v) throws Exception {
         assertTrue(openDisposed.get());
         assertTrue(closeDisposed.get());
     }
+
+    @Test
+    public void cancellingWindowCancelsUpstream() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.window(Observable.just(1).concatWith(Observable.<Integer>never()), Functions.justFunction(Observable.never()))
+        .take(1)
+        .flatMap(new Function<Observable<Integer>, Observable<Integer>>() {
+            @Override
+            public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
+                return w.take(1);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to
+        .assertResult(1);
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+    }
+
+    @Test
+    public void windowAbandonmentCancelsUpstream() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+
+        TestObserver<Observable<Integer>> to = ps.window(Observable.<Integer>just(1).concatWith(Observable.<Integer>never()),
+                Functions.justFunction(Observable.never()))
+        .doOnNext(new Consumer<Observable<Integer>>() {
+            @Override
+            public void accept(Observable<Integer> v) throws Throwable {
+                inner.set(v);
+            }
+        })
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        to
+        .assertValueCount(1)
+        ;
+
+        ps.onNext(1);
+
+        assertTrue(ps.hasObservers());
+
+        to.dispose();
+
+        to
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertNotComplete();
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+
+        inner.get().test().assertResult();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void closingIndicatorFunctionCrash() {
+
+        PublishSubject<Integer> source = PublishSubject.create();
+        PublishSubject<Integer> boundary = PublishSubject.create();
+
+        TestObserver<Observable<Integer>> to = source.window(boundary, new Function<Integer, Observable<Object>>() {
+            @Override
+            public Observable<Object> apply(Integer end) throws Throwable {
+                throw new TestException();
+            }
+        })
+        .test()
+        ;
+
+        to.assertEmpty();
+
+        boundary.onNext(1);
+
+        to.assertFailure(TestException.class);
+
+        assertFalse(source.hasObservers());
+        assertFalse(boundary.hasObservers());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void mainError() {
+        Observable.error(new TestException())
+        .window(Observable.never(), Functions.justFunction(Observable.never()))
+        .test()
+        .assertFailure(TestException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
index 271cde0208..8eaebf5991 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
@@ -971,7 +971,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
         to
         .assertResult(1);
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
     }
 
     @Test
@@ -990,7 +990,7 @@ public void accept(Observable<Integer> v) throws Throwable {
         })
         .test();
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
 
         to
         .assertValueCount(1)
@@ -1021,7 +1021,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
         to
         .assertResult(1);
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
     }
 
     @Test
@@ -1040,7 +1040,7 @@ public void accept(Observable<Integer> v) throws Throwable {
         })
         .test();
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
 
         to
         .assertValueCount(1)
@@ -1071,7 +1071,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
         to
         .assertResult(1);
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
     }
 
     @Test
@@ -1090,7 +1090,7 @@ public void accept(Observable<Integer> v) throws Throwable {
         })
         .test();
 
-        assertFalse("Subject still has subscribers!", ps.hasObservers());
+        assertFalse("Subject still has observers!", ps.hasObservers());
 
         to
         .assertValueCount(1)

From 735add2c25cb08f175ab3fc5af0270587fada083 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 17 Dec 2019 17:28:01 +0100
Subject: [PATCH 004/665] 3.x: [Java 8] Upgrade to Java 8, add Flowable.fromX
 operators (#6765)

* 3.x: [Java 8] Upgrade to Java 8, add Flowable.fromX operators

* Add NonNull annotation to the new fromX methods

* Annotate return type argument to Flowable<@NonNull T>
---
 build.gradle                                  |  13 +-
 .../rxjava3/annotations/NonNull.java          |   4 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 175 +++++-
 .../jdk8/FlowableFromCompletionStage.java     |  94 ++++
 .../internal/jdk8/FlowableFromStream.java     | 299 ++++++++++
 .../rxjava3/observers/BaseTestConsumer.java   |   5 +-
 .../io/reactivex/rxjava3/flowable/Burst.java  |   2 +-
 .../jdk8/FlowableFromCompletionStageTest.java |  65 +++
 .../jdk8/FlowableFromOptionalTest.java        |  38 ++
 .../internal/jdk8/FlowableFromStreamTest.java | 515 ++++++++++++++++++
 .../jdk8/FromCompletionStageTckTest.java      |  48 ++
 .../internal/jdk8/FromOptional0TckTest.java   |  42 ++
 .../internal/jdk8/FromOptional1TckTest.java   |  42 ++
 .../internal/jdk8/FromStreamTckTest.java      |  44 ++
 .../internal/operators/observable/Burst.java  |   2 +-
 .../rxjava3/testsupport/TestHelper.java       | 106 ++--
 .../ParamValidationCheckerTest.java           |  10 +
 17 files changed, 1419 insertions(+), 85 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStage.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStageTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromOptionalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FromCompletionStageTckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional0TckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional1TckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FromStreamTckTest.java

diff --git a/build.gradle b/build.gradle
index 439a0c5680..4dcead40c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,15 +66,15 @@ apply plugin: "com.jfrog.bintray"
 apply plugin: "com.jfrog.artifactory"
 apply plugin: "eclipse"
 
-sourceCompatibility = JavaVersion.VERSION_1_6
-targetCompatibility = JavaVersion.VERSION_1_6
+sourceCompatibility = JavaVersion.VERSION_1_8
+targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
   mavenCentral()
 }
 
 dependencies {
-    signature "org.codehaus.mojo.signature:java16:1.1@signature"
+    signature "org.codehaus.mojo.signature:java18:1.0@signature"
 
     api "org.reactivestreams:reactive-streams:$reactiveStreamsVersion"
     jmh "org.reactivestreams:reactive-streams:$reactiveStreamsVersion"
@@ -103,14 +103,9 @@ javadoc {
     options.stylesheetFile = new File(projectDir, "gradle/stylesheet.css");
 
     options.links(
-        "https://docs.oracle.com/javase/7/docs/api/",
+        "https://docs.oracle.com/javase/8/docs/api/",
         "http://www.reactive-streams.org/reactive-streams-${reactiveStreamsVersion}-javadoc/"
     )
-
-    if (JavaVersion.current().isJava7()) {
-        // "./gradle/stylesheet.css" only supports Java 7
-        options.addStringOption("stylesheetfile", rootProject.file("./gradle/stylesheet.css").toString())
-    }
 }
 
 animalsniffer {
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java b/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java
index 06f1d4ee8b..03e5180588 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java
@@ -19,10 +19,10 @@
 import java.lang.annotation.*;
 
 /**
- * Indicates that a field/parameter/variable/return type is never null.
+ * Indicates that a field/parameter/variable/type parameter/return type is never null.
  */
 @Documented
-@Target(value = {FIELD, METHOD, PARAMETER, LOCAL_VARIABLE})
+@Target(value = {FIELD, METHOD, PARAMETER, LOCAL_VARIABLE, TYPE_PARAMETER, TYPE_USE})
 @Retention(value = CLASS)
 public @interface NonNull { }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 23e666896d..3fed4742e2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -14,6 +14,7 @@
 
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.stream.*;
 
 import org.reactivestreams.*;
 
@@ -24,6 +25,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableFromPublisher;
@@ -211,6 +213,7 @@ public static <T> Flowable<T> amb(Iterable<? extends Publisher<? extends T>> sou
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T> Flowable<T> ambArray(Publisher<? extends T>... sources) {
         ObjectHelper.requireNonNull(sources, "sources is null");
         int len = sources.length;
@@ -1224,7 +1227,6 @@ public static <T> Flowable<T> concat(Publisher<? extends Publisher<? extends T>>
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1261,7 +1263,6 @@ public static <T> Flowable<T> concat(Publisher<? extends T> source1, Publisher<?
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1303,7 +1304,6 @@ public static <T> Flowable<T> concat(
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1341,6 +1341,7 @@ public static <T> Flowable<T> concat(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T> Flowable<T> concatArray(Publisher<? extends T>... sources) {
         if (sources.length == 0) {
             return empty();
@@ -1373,6 +1374,7 @@ public static <T> Flowable<T> concatArray(Publisher<? extends T>... sources) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T> Flowable<T> concatArrayDelayError(Publisher<? extends T>... sources) {
         if (sources.length == 0) {
             return empty();
@@ -1408,6 +1410,7 @@ public static <T> Flowable<T> concatArrayDelayError(Publisher<? extends T>... so
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T> Flowable<T> concatArrayEager(Publisher<? extends T>... sources) {
         return concatArrayEager(bufferSize(), bufferSize(), sources);
     }
@@ -1475,6 +1478,7 @@ public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
+    @SafeVarargs
     public static <T> Flowable<T> concatArrayEagerDelayError(Publisher<? extends T>... sources) {
         return concatArrayEagerDelayError(bufferSize(), bufferSize(), sources);
     }
@@ -1914,6 +1918,7 @@ public static <T> Flowable<T> error(final Throwable throwable) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T> Flowable<T> fromArray(T... items) {
         ObjectHelper.requireNonNull(items, "items is null");
         if (items.length == 0) {
@@ -1977,6 +1982,10 @@ public static <T> Flowable<T> fromCallable(Callable<? extends T> supplier) {
      * <p>
      * <em>Important note:</em> This Publisher is blocking on the thread it gets subscribed on; you cannot cancel it.
      * <p>
+     * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
+     * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
+     * operator to convert and consume such sources in a non-blocking fashion instead.
+     * <p>
      * Unlike 1.x, canceling the Flowable won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
      * <dl>
@@ -1993,6 +2002,7 @@ public static <T> Flowable<T> fromCallable(Callable<? extends T> supplier) {
      *            the resulting Publisher
      * @return a Flowable that emits the item from the source {@link Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromCompletionStage(CompletionStage)
      */
     @CheckReturnValue
     @NonNull
@@ -2016,6 +2026,10 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future) {
      * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
      * <p>
      * <em>Important note:</em> This Publisher is blocking on the thread it gets subscribed on; you cannot cancel it.
+     * <p>
+     * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
+     * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
+     * operator to convert and consume such sources in a non-blocking fashion instead.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -2034,6 +2048,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future) {
      *            the resulting Publisher
      * @return a Flowable that emits the item from the source {@link Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromCompletionStage(CompletionStage)
      */
     @CheckReturnValue
     @NonNull
@@ -2058,6 +2073,10 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeou
      * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
      * <p>
      * <em>Important note:</em> This Publisher is blocking; you cannot cancel it.
+     * <p>
+     * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
+     * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
+     * operator to convert and consume such sources in a non-blocking fashion instead.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -2079,8 +2098,9 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeou
      *            the resulting Publisher
      * @return a Flowable that emits the item from the source {@link Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromCompletionStage(CompletionStage)
      */
-    @SuppressWarnings({ "unchecked", "cast" })
+    @SuppressWarnings({ "unchecked" })
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2119,7 +2139,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeou
      * @return a Flowable that emits the item from the source {@link Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
-    @SuppressWarnings({ "cast", "unchecked" })
+    @SuppressWarnings({ "unchecked" })
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2148,6 +2168,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, Scheduler s
      *            resulting Publisher
      * @return a Flowable that emits each item in the source {@link Iterable} sequence
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromStream(Stream)
      */
     @CheckReturnValue
     @NonNull
@@ -2656,7 +2677,6 @@ public static <T> Flowable<T> just(T item) {
      * @return a Flowable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2690,7 +2710,6 @@ public static <T> Flowable<T> just(T item1, T item2) {
      * @return a Flowable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2727,7 +2746,6 @@ public static <T> Flowable<T> just(T item1, T item2, T item3) {
      * @return a Flowable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2767,7 +2785,6 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4) {
      * @return a Flowable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2810,7 +2827,6 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5)
      * @return a Flowable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2856,7 +2872,6 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
      * @return a Flowable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2905,7 +2920,6 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
      * @return a Flowable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2957,7 +2971,6 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
      * @return a Flowable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3012,7 +3025,6 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
      * @return a Flowable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4655,7 +4667,6 @@ public static <T, R> Flowable<R> zip(Iterable<? extends Publisher<? extends T>>
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4717,7 +4728,6 @@ public static <T1, T2, R> Flowable<R> zip(
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4780,7 +4790,6 @@ public static <T1, T2, R> Flowable<R> zip(
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4845,7 +4854,6 @@ public static <T1, T2, R> Flowable<R> zip(
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4914,7 +4922,6 @@ public static <T1, T2, T3, R> Flowable<R> zip(
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4988,7 +4995,6 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -5065,7 +5071,6 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -5146,7 +5151,6 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -5232,7 +5236,6 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -5322,7 +5325,6 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
      * @return a Flowable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -5398,6 +5400,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T, R> Flowable<R> zipArray(Function<? super Object[], ? extends R> zipper,
             boolean delayError, int bufferSize, Publisher<? extends T>... sources) {
         if (sources.length == 0) {
@@ -5460,7 +5463,6 @@ public final Single<Boolean> all(Predicate<? super T> predicate) {
      *         emitted an item or sent a termination notification
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -14548,7 +14550,6 @@ public final Flowable<T> sorted(Comparator<? super T> sortFunction) {
      * @see #startWithItem(Object)
      * @since 3.0.0
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -14576,7 +14577,6 @@ public final Flowable<T> startWithIterable(Iterable<? extends T> items) {
      *         emitted by the source Publisher
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -14609,7 +14609,6 @@ public final Flowable<T> startWith(Publisher<? extends T> other) {
      * @see #startWithIterable(Iterable)
      * @since 3.0.0
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
@@ -18620,4 +18619,124 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
         return ts;
     }
 
+    // -------------------------------------------------------------------------
+    // JDK 8 Support
+    // -------------------------------------------------------------------------
+
+    /**
+     * Converts the existing value of the provided optional into a {@link #just(Object)}
+     * or an empty optional into an {@link #empty()} {@code Flowable} instance.
+     * <p>
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromOptional.f.png" alt="">
+     * <p>
+     * Note that the operator takes an already instantiated optional reference and does not
+     * by any means create this original optional. If the optional is to be created per
+     * consumer upon subscription, use {@link #defer(Supplier)} around {@code fromOptional}:
+     * <pre><code>
+     * Flowable.defer(() -&gt; Flowable.fromOptional(createOptional()));
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} supports backpressure.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromOptional} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the optional value
+     * @param optional the optional value to convert into a {@code Flowable}
+     * @return the new Flowable instance
+     * @see #just(Object)
+     * @see #empty()
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
+        ObjectHelper.requireNonNull(optional, "optional is null");
+        return optional.map(Flowable::just).orElseGet(Flowable::empty);
+    }
+
+    /**
+     * Signals the completion value or error of the given (hot) {@link CompletionStage}-based asynchronous calculation.
+     * <p>
+     * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.f.png" alt="">
+     * <p>
+     * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
+     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * around {@code fromCompletionStage}:
+     * <pre><code>
+     * Flowable.defer(() -&gt; Flowable.fromCompletionStage(createCompletionStage()));
+     * </code></pre>
+     * <p>
+     * If the {@code CompletionStage} completes with {@code null}, a {@link NullPointerException} is signaled.
+     * <p>
+     * Canceling the flow can't cancel the execution of the {@code CompletionStage} because {@code CompletionStage}
+     * itself doesn't support cancellation. Instead, the operator detaches from the {@code CompletionStage}.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} supports backpressure and caches the completion value until the
+     *  downstream is ready to receive it.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the CompletionStage
+     * @param stage the CompletionStage to convert to Flowable and signal its terminal value or error
+     * @return the new Flowable instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
+        ObjectHelper.requireNonNull(stage, "stage is null");
+        return RxJavaPlugins.onAssembly(new FlowableFromCompletionStage<>(stage));
+    }
+
+    /**
+     * Converts a {@link Stream} into a finite {@code Flowable} and emits its items in the sequence.
+     * <p>
+     * <img width="640" height="347" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromStream.f.png" alt="">
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #fromIterable(Iterable)}:
+     * <pre><code>
+     * Stream&lt;T&gt; stream = ...
+     * Flowable.fromIterable(stream::iterator);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * IntStream intStream = IntStream.rangeClosed(1, 10);
+     * Flowable.fromStream(intStream.boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream and iterates the given {@code Stream}
+     *  on demand (i.e., when requested).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the source {@code Stream}
+     * @param stream the {@code Stream} of values to emit
+     * @return the new Flowable instance
+     * @since 3.0.0
+     * @see #fromIterable(Iterable)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<@NonNull T> fromStream(@NonNull Stream<T> stream) {
+        ObjectHelper.requireNonNull(stream, "stream is null");
+        return RxJavaPlugins.onAssembly(new FlowableFromStream<>(stream));
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStage.java
new file mode 100644
index 0000000000..f864cdd96d
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStage.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription;
+
+/**
+ * Wrap a CompletionStage and signal its outcome.
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class FlowableFromCompletionStage<T> extends Flowable<T> {
+
+    final CompletionStage<T> stage;
+
+    public FlowableFromCompletionStage(CompletionStage<T> stage) {
+        this.stage = stage;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super T> s) {
+        // We need an indirection because one can't detach from a whenComplete
+        // and cancellation should not hold onto the stage.
+        BiConsumerAtomicReference<T> whenReference = new BiConsumerAtomicReference<>();
+        CompletionStageHandler<T> handler = new CompletionStageHandler<>(s, whenReference);
+        whenReference.lazySet(handler);
+
+        s.onSubscribe(handler);
+        stage.whenComplete(whenReference);
+    }
+
+    static final class CompletionStageHandler<T>
+    extends DeferredScalarSubscription<T>
+    implements BiConsumer<T, Throwable> {
+
+        private static final long serialVersionUID = 4665335664328839859L;
+
+        final BiConsumerAtomicReference<T> whenReference;
+
+        CompletionStageHandler(Subscriber<? super T> downstream, BiConsumerAtomicReference<T> whenReference) {
+            super(downstream);
+            this.whenReference = whenReference;
+        }
+
+        @Override
+        public void accept(T item, Throwable error) {
+            if (error != null) {
+                downstream.onError(error);
+            }
+            else if (item != null) {
+                complete(item);
+            } else {
+                downstream.onError(new NullPointerException("The CompletionStage terminated with null."));
+            }
+        }
+
+        @Override
+        public void cancel() {
+            super.cancel();
+            whenReference.set(null);
+        }
+    }
+
+    static final class BiConsumerAtomicReference<T> extends AtomicReference<BiConsumer<T, Throwable>>
+    implements BiConsumer<T, Throwable> {
+
+        private static final long serialVersionUID = 45838553147237545L;
+
+        @Override
+        public void accept(T t, Throwable u) {
+            BiConsumer<T, Throwable> biConsumer = get();
+            if (biConsumer != null) {
+                biConsumer.accept(t, u);
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
new file mode 100644
index 0000000000..db34238b7a
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
@@ -0,0 +1,299 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Stream;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Wraps a {@link Stream} and emits its values as a Flowable sequence.
+ * @param <T> the element type of the Stream
+ * @since 3.0.0
+ */
+public final class FlowableFromStream<T> extends Flowable<T> {
+
+    final Stream<T> stream;
+
+    public FlowableFromStream(Stream<T> stream) {
+        this.stream = stream;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super T> s) {
+        Iterator<T> iterator;
+        try {
+            iterator = stream.iterator();
+
+            if (!iterator.hasNext()) {
+                EmptySubscription.complete(s);
+                closeSafely(stream);
+                return;
+            }
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            EmptySubscription.error(ex, s);
+            closeSafely(stream);
+            return;
+        }
+
+        if (s instanceof ConditionalSubscriber) {
+            s.onSubscribe(new StreamConditionalSubscription<T>((ConditionalSubscriber<? super T>)s, iterator, stream));
+        } else {
+            s.onSubscribe(new StreamSubscription<>(s, iterator, stream));
+        }
+    }
+
+    static void closeSafely(AutoCloseable c) {
+        try {
+            c.close();
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            RxJavaPlugins.onError(ex);
+        }
+    }
+
+    abstract static class AbstractStreamSubscription<T> extends AtomicLong implements QueueSubscription<T> {
+
+        private static final long serialVersionUID = -9082954702547571853L;
+
+        Iterator<T> iterator;
+
+        AutoCloseable closeable;
+
+        volatile boolean cancelled;
+
+        boolean once;
+
+        AbstractStreamSubscription(Iterator<T> iterator, AutoCloseable closeable) {
+            this.iterator = iterator;
+            this.closeable = closeable;
+        }
+
+        @Override
+        public void request(long n) {
+            if (SubscriptionHelper.validate(n)) {
+                if (BackpressureHelper.add(this, n) == 0L) {
+                    run(n);
+                }
+            }
+        }
+
+        abstract void run(long n);
+
+        @Override
+        public void cancel() {
+            cancelled = true;
+            request(1L);
+        }
+
+        @Override
+        public int requestFusion(int mode) {
+            if ((mode & SYNC) != 0) {
+                lazySet(Long.MAX_VALUE);
+                return SYNC;
+            }
+            return NONE;
+        }
+
+        @Override
+        public boolean offer(@NonNull T value) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean offer(@NonNull T v1, @NonNull T v2) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Nullable
+        @Override
+        public T poll() {
+            if (iterator == null) {
+                return null;
+            }
+            if (!once) {
+                once = true;
+            } else {
+                if (!iterator.hasNext()) {
+                    return null;
+                }
+            }
+            return ObjectHelper.requireNonNull(iterator.next(), "Iterator.next() returned a null value");
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return iterator == null || !iterator.hasNext();
+        }
+
+        @Override
+        public void clear() {
+            iterator = null;
+            AutoCloseable c = closeable;
+            closeable = null;
+            if (c != null) {
+                closeSafely(c);
+            }
+        }
+    }
+
+    static final class StreamSubscription<T> extends AbstractStreamSubscription<T> {
+
+        private static final long serialVersionUID = -9082954702547571853L;
+
+        final Subscriber<? super T> downstream;
+
+        StreamSubscription(Subscriber<? super T> downstream, Iterator<T> iterator, AutoCloseable closeable) {
+            super(iterator, closeable);
+            this.downstream = downstream;
+        }
+
+        @Override
+        public void run(long n) {
+            long emitted = 0L;
+            Iterator<T> iterator = this.iterator;
+            Subscriber<? super T> downstream = this.downstream;
+
+            for (;;) {
+
+                if (cancelled) {
+                    clear();
+                    break;
+                } else {
+                    T next;
+                    try {
+                        next = ObjectHelper.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value");
+                    } catch (Throwable ex) {
+                        Exceptions.throwIfFatal(ex);
+                        downstream.onError(ex);
+                        cancelled = true;
+                        continue;
+                    }
+
+                    downstream.onNext(next);
+
+                    if (cancelled) {
+                        continue;
+                    }
+
+                    try {
+                        if (!iterator.hasNext()) {
+                            downstream.onComplete();
+                            cancelled = true;
+                            continue;
+                        }
+                    } catch (Throwable ex) {
+                        Exceptions.throwIfFatal(ex);
+                        downstream.onError(ex);
+                        cancelled = true;
+                        continue;
+                    }
+
+                    if (++emitted != n) {
+                        continue;
+                    }
+                }
+
+                n = get();
+                if (emitted == n) {
+                    if (compareAndSet(n, 0L)) {
+                        break;
+                    }
+                    n = get();
+                }
+            }
+        }
+    }
+
+    static final class StreamConditionalSubscription<T> extends AbstractStreamSubscription<T> {
+
+        private static final long serialVersionUID = -9082954702547571853L;
+
+        final ConditionalSubscriber<? super T> downstream;
+
+        StreamConditionalSubscription(ConditionalSubscriber<? super T> downstream, Iterator<T> iterator, AutoCloseable closeable) {
+            super(iterator, closeable);
+            this.downstream = downstream;
+        }
+
+        @Override
+        public void run(long n) {
+            long emitted = 0L;
+            Iterator<T> iterator = this.iterator;
+            ConditionalSubscriber<? super T> downstream = this.downstream;
+
+            for (;;) {
+
+                if (cancelled) {
+                    clear();
+                    break;
+                } else {
+                    T next;
+                    try {
+                        next = ObjectHelper.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value");
+                    } catch (Throwable ex) {
+                        Exceptions.throwIfFatal(ex);
+                        downstream.onError(ex);
+                        cancelled = true;
+                        continue;
+                    }
+
+                    if (downstream.tryOnNext(next)) {
+                        emitted++;
+                    }
+
+                    if (cancelled) {
+                        continue;
+                    }
+
+                    try {
+                        if (!iterator.hasNext()) {
+                            downstream.onComplete();
+                            cancelled = true;
+                            continue;
+                        }
+                    } catch (Throwable ex) {
+                        Exceptions.throwIfFatal(ex);
+                        downstream.onError(ex);
+                        cancelled = true;
+                        continue;
+                    }
+
+                    if (emitted != n) {
+                        continue;
+                    }
+                }
+
+                n = get();
+                if (emitted == n) {
+                    if (compareAndSet(n, 0L)) {
+                        break;
+                    }
+                    n = get();
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
index ee2dcf1853..59aa62e796 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
@@ -228,7 +228,7 @@ public final U assertError(Throwable error) {
      * @param errorClass the error class to expect
      * @return this
      */
-    @SuppressWarnings({ "unchecked", "rawtypes", "cast" })
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     public final U assertError(Class<? extends Throwable> errorClass) {
         return (U)assertError((Predicate)Functions.isInstanceOf(errorClass));
     }
@@ -435,6 +435,7 @@ public final U assertValues(T... values) {
      * @return this
      * @since 2.2
      */
+    @SafeVarargs
     public final U assertValuesOnly(T... values) {
         return assertSubscribed()
                 .assertValues(values)
@@ -493,6 +494,7 @@ public final U assertValueSequence(Iterable<? extends T> sequence) {
      * @return this
      * @see #assertFailure(Class, Object...)
      */
+    @SafeVarargs
     public final U assertResult(T... values) {
         return assertSubscribed()
                 .assertValues(values)
@@ -507,6 +509,7 @@ public final U assertResult(T... values) {
      * @param values the expected values, asserted in order
      * @return this
      */
+    @SafeVarargs
     public final U assertFailure(Class<? extends Throwable> error, T... values) {
         return assertSubscribed()
                 .assertValues(values)
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/Burst.java b/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
index 8acf477242..1e6c255a30 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
@@ -52,11 +52,11 @@ protected void subscribeActual(final Subscriber<? super T> subscriber) {
 
     }
 
-    @SuppressWarnings("unchecked")
     public static <T> Builder<T> item(T item) {
         return items(item);
     }
 
+    @SafeVarargs
     public static <T> Builder<T> items(T... items) {
         return new Builder<T>(Arrays.asList(items));
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStageTest.java
new file mode 100644
index 0000000000..8a71bbd9b3
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStageTest.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+
+public class FlowableFromCompletionStageTest extends RxJavaTest {
+
+    @Test
+    public void syncSuccess() {
+        Flowable.fromCompletionStage(CompletableFuture.completedFuture(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void syncFailure() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+        cf.completeExceptionally(new TestException());
+
+        Flowable.fromCompletionStage(cf)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void syncNull() {
+        Flowable.fromCompletionStage(CompletableFuture.<Integer>completedFuture(null))
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void cancel() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+
+        TestSubscriber<Integer> ts = Flowable.fromCompletionStage(cf)
+        .test();
+
+        ts.assertEmpty();
+
+        ts.cancel();
+
+        cf.complete(1);
+
+        ts.assertEmpty();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromOptionalTest.java
new file mode 100644
index 0000000000..6676bcee61
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromOptionalTest.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+
+public class FlowableFromOptionalTest extends RxJavaTest {
+
+    @Test
+    public void hasValue() {
+        Flowable.fromOptional(Optional.of(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void empty() {
+        Flowable.fromOptional(Optional.empty())
+        .test()
+        .assertResult();
+    }
+
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
new file mode 100644
index 0000000000..940ac95c4d
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
@@ -0,0 +1,515 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
+import java.util.stream.*;
+
+import org.junit.Test;
+import org.reactivestreams.Subscription;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class FlowableFromStreamTest extends RxJavaTest {
+
+    @Test
+    public void empty() {
+        Flowable.fromStream(Stream.<Integer>of())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void just() {
+        Flowable.fromStream(Stream.<Integer>of(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void many() {
+        Flowable.fromStream(Stream.<Integer>of(1, 2, 3, 4, 5))
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void manyBackpressured() {
+        Flowable.fromStream(Stream.<Integer>of(1, 2, 3, 4, 5))
+        .test(0L)
+        .assertEmpty()
+        .requestMore(1)
+        .assertValuesOnly(1)
+        .requestMore(2)
+        .assertValuesOnly(1, 2, 3)
+        .requestMore(2)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void noReuse() {
+        Flowable<Integer> source = Flowable.fromStream(Stream.<Integer>of(1, 2, 3, 4, 5));
+
+        source
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+
+        source
+        .test()
+        .assertFailure(IllegalStateException.class);
+    }
+
+    @Test
+    public void take() {
+        Flowable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .take(5)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void emptyConditional() {
+        Flowable.fromStream(Stream.<Integer>of())
+        .filter(v -> true)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void justConditional() {
+        Flowable.fromStream(Stream.<Integer>of(1))
+        .filter(v -> true)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void manyConditional() {
+        Flowable.fromStream(Stream.<Integer>of(1, 2, 3, 4, 5))
+        .filter(v -> true)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void manyBackpressuredConditional() {
+        Flowable.fromStream(Stream.<Integer>of(1, 2, 3, 4, 5))
+        .filter(v -> true)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(1)
+        .assertValuesOnly(1)
+        .requestMore(2)
+        .assertValuesOnly(1, 2, 3)
+        .requestMore(2)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void manyConditionalSkip() {
+        Flowable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .filter(v -> v % 2 == 0)
+        .test()
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void takeConditional() {
+        Flowable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .filter(v -> true)
+        .take(5)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void noOfferNoCrashAfterClear() throws Throwable {
+        AtomicReference<SimpleQueue<?>> queue = new AtomicReference<>();
+
+        Flowable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .subscribe(new FlowableSubscriber<Integer>() {
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                queue.set((SimpleQueue<?>)s);
+            }
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        });
+
+        SimpleQueue<?> q = queue.get();
+        TestHelper.assertNoOffer(q);
+
+        assertFalse(q.isEmpty());
+
+        q.clear();
+
+        assertNull(q.poll());
+
+        assertTrue(q.isEmpty());
+
+        q.clear();
+
+        assertNull(q.poll());
+
+        assertTrue(q.isEmpty());
+    }
+
+    @Test
+    public void streamOfNull() {
+        Flowable.fromStream(Stream.of((Integer)null))
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void streamOfNullConditional() {
+        Flowable.fromStream(Stream.of((Integer)null))
+        .filter(v -> true)
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void syncFusionSupport() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Flowable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .subscribeWith(ts)
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void asyncFusionNotSupported() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Flowable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .subscribeWith(ts)
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void fusedForParallel() {
+        Flowable.fromStream(IntStream.rangeClosed(1, 1000).boxed())
+        .parallel()
+        .runOn(Schedulers.computation(), 1)
+        .map(v -> v + 1)
+        .sequential()
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertValueCount(1000)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void runToEndCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Stream<Integer> stream = Stream.of(1, 2, 3, 4, 5).onClose(() -> { throw new TestException(); });
+
+            Flowable.fromStream(stream)
+            .test()
+            .assertResult(1, 2, 3, 4, 5);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void takeCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Stream<Integer> stream = Stream.of(1, 2, 3, 4, 5).onClose(() -> { throw new TestException(); });
+
+            Flowable.fromStream(stream)
+            .take(3)
+            .test()
+            .assertResult(1, 2, 3);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void hasNextCrash() {
+        AtomicInteger v = new AtomicInteger();
+        Flowable.fromStream(Stream.<Integer>generate(() -> {
+            int value = v.getAndIncrement();
+            if (value == 1) {
+                throw new TestException();
+            }
+            return value;
+        }))
+        .test()
+        .assertFailure(TestException.class, 0);
+    }
+
+    @Test
+    public void hasNextCrashConditional() {
+        AtomicInteger counter = new AtomicInteger();
+        Flowable.fromStream(Stream.<Integer>generate(() -> {
+            int value = counter.getAndIncrement();
+            if (value == 1) {
+                throw new TestException();
+            }
+            return value;
+        }))
+        .filter(v -> true)
+        .test()
+        .assertFailure(TestException.class, 0);
+    }
+
+    void requestOneByOneBase(boolean conditional) {
+        List<Object> list = new ArrayList<>();
+
+        Flowable<Integer> source = Flowable.fromStream(IntStream.rangeClosed(1, 10).boxed());
+        if (conditional) {
+            source = source.filter(v -> true);
+        }
+
+        source.subscribe(new FlowableSubscriber<Integer>() {
+
+            @NonNull Subscription upstream;
+
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                this.upstream = s;
+                s.request(1);
+            }
+
+            @Override
+            public void onNext(Integer t) {
+                list.add(t);
+                upstream.request(1);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                list.add(t);
+            }
+
+            @Override
+            public void onComplete() {
+                list.add(100);
+            }
+        });
+
+        assertEquals(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 100), list);
+    }
+
+    @Test
+    public void requestOneByOne() {
+        requestOneByOneBase(false);
+    }
+
+    @Test
+    public void requestOneByOneConditional() {
+        requestOneByOneBase(true);
+    }
+
+    void requestRaceBase(boolean conditional) throws Exception {
+        ExecutorService exec = Executors.newCachedThreadPool();
+        try {
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+
+                AtomicInteger counter = new AtomicInteger();
+
+                int max = 100;
+
+                Flowable<Integer> source = Flowable.fromStream(IntStream.rangeClosed(1, max).boxed());
+                if (conditional) {
+                    source = source.filter(v -> true);
+                }
+
+                CountDownLatch cdl = new CountDownLatch(1);
+
+                source
+                .subscribe(new FlowableSubscriber<Integer>() {
+
+                    @NonNull Subscription upstream;
+
+                    @Override
+                    public void onSubscribe(@NonNull Subscription s) {
+
+                        this.upstream = s;
+                        s.request(1);
+
+                    }
+
+                    @Override
+                    public void onNext(Integer t) {
+                        counter.getAndIncrement();
+
+                        AtomicInteger sync = new AtomicInteger(2);
+                        exec.submit(() -> {
+                            if (sync.decrementAndGet() != 0) {
+                                while (sync.get() != 0) { }
+                            }
+                            upstream.request(1);
+                        });
+
+                        if (sync.decrementAndGet() != 0) {
+                            while (sync.get() != 0) { }
+                        }
+                    }
+
+                    @Override
+                    public void onError(Throwable t) {
+                        t.printStackTrace();
+                        cdl.countDown();
+                    }
+
+                    @Override
+                    public void onComplete() {
+                        counter.getAndIncrement();
+                        cdl.countDown();
+                    }
+                });
+
+                assertTrue(cdl.await(60, TimeUnit.SECONDS));
+
+                assertEquals(max + 1, counter.get());
+            }
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void requestRace() throws Exception {
+        requestRaceBase(false);
+    }
+
+    @Test
+    public void requestRaceConditional() throws Exception {
+        requestRaceBase(true);
+    }
+
+    @Test
+    public void closeCalledOnEmpty() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Flowable.fromStream(Stream.of().onClose(() -> calls.getAndIncrement()))
+        .test()
+        .assertResult();
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledAfterItems() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Flowable.fromStream(Stream.of(1, 2, 3, 4, 5).onClose(() -> calls.getAndIncrement()))
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledOnCancel() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Flowable.fromStream(Stream.of(1, 2, 3, 4, 5).onClose(() -> calls.getAndIncrement()))
+        .take(3)
+        .test()
+        .assertResult(1, 2, 3);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledOnItemCrash() {
+        AtomicInteger calls = new AtomicInteger();
+        AtomicInteger counter = new AtomicInteger();
+        Flowable.fromStream(Stream.<Integer>generate(() -> {
+            int value = counter.getAndIncrement();
+            if (value == 1) {
+                throw new TestException();
+            }
+            return value;
+        }).onClose(() -> calls.getAndIncrement()))
+        .test()
+        .assertFailure(TestException.class, 0);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledAfterItemsConditional() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Flowable.fromStream(Stream.of(1, 2, 3, 4, 5).onClose(() -> calls.getAndIncrement()))
+        .filter(v -> true)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledOnCancelConditional() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Flowable.fromStream(Stream.of(1, 2, 3, 4, 5).onClose(() -> calls.getAndIncrement()))
+        .filter(v -> true)
+        .take(3)
+        .test()
+        .assertResult(1, 2, 3);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledOnItemCrashConditional() {
+        AtomicInteger calls = new AtomicInteger();
+        AtomicInteger counter = new AtomicInteger();
+        Flowable.fromStream(Stream.<Integer>generate(() -> {
+            int value = counter.getAndIncrement();
+            if (value == 1) {
+                throw new TestException();
+            }
+            return value;
+        }).onClose(() -> calls.getAndIncrement()))
+        .filter(v -> true)
+        .test()
+        .assertFailure(TestException.class, 0);
+
+        assertEquals(1, calls.get());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromCompletionStageTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromCompletionStageTckTest.java
new file mode 100644
index 0000000000..2c48611cd9
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromCompletionStageTckTest.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class FromCompletionStageTckTest extends BaseTck<Long> {
+
+    @Override
+    public Publisher<Long> createPublisher(final long elements) {
+        return
+                Flowable.fromCompletionStage(CompletableFuture.completedFuture(1L))
+            ;
+    }
+
+    @Override
+    public Publisher<Long> createFailedPublisher() {
+        CompletableFuture<Long> cf = new CompletableFuture<>();
+        cf.completeExceptionally(new TestException());
+        return
+                Flowable.fromCompletionStage(cf)
+            ;
+    }
+
+    @Override
+    public long maxElementsFromPublisher() {
+        return 1;
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional0TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional0TckTest.java
new file mode 100644
index 0000000000..76c1246eb3
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional0TckTest.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Optional;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+/**
+ * Test Optional.empty() wrapping.
+ * @see FromOptional1TckTest
+ */
+@Test
+public class FromOptional0TckTest extends BaseTck<Long> {
+
+    @Override
+    public Publisher<Long> createPublisher(final long elements) {
+        return
+                Flowable.fromOptional(Optional.empty())
+            ;
+    }
+
+    @Override
+    public long maxElementsFromPublisher() {
+        return 0;
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional1TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional1TckTest.java
new file mode 100644
index 0000000000..27e596d708
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional1TckTest.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Optional;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+/**
+ * Test Optional.of wrapping.
+ * @see FromOptional0TckTest
+ */
+@Test
+public class FromOptional1TckTest extends BaseTck<Long> {
+
+    @Override
+    public Publisher<Long> createPublisher(final long elements) {
+        return
+                Flowable.fromOptional(Optional.of(1L))
+            ;
+    }
+
+    @Override
+    public long maxElementsFromPublisher() {
+        return 1;
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromStreamTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromStreamTckTest.java
new file mode 100644
index 0000000000..06f3b02b97
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromStreamTckTest.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+/**
+ * Test Optional.of wrapping.
+ * @see FromOptional0TckTest
+ */
+@Test
+public class FromStreamTckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        return
+                Flowable.fromStream(IntStream.rangeClosed(1, (int)elements).boxed())
+            ;
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        Stream<Integer> stream = Stream.of(1);
+        stream.forEach(v -> { });
+        return Flowable.fromStream(stream);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
index 4fa76d1628..a7aca59ada 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
@@ -47,11 +47,11 @@ protected void subscribeActual(final Observer<? super T> observer) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     public static <T> Builder<T> item(T item) {
         return items(item);
     }
 
+    @SafeVarargs
     public static <T> Builder<T> items(T... items) {
         return new Builder<T>(Arrays.asList(items));
     }
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 9037d203f6..1f2a834650 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -624,7 +624,7 @@ public static void doubleOnSubscribe(MaybeObserver<?> observer) {
      * @param source the source to test
      */
     public static <T> void checkDisposed(Flowable<T> source) {
-        final TestSubscriber<Object> ts = new TestSubscriber<Object>(0L);
+        final TestSubscriber<Object> ts = new TestSubscriber<>(0L);
         source.subscribe(new FlowableSubscriber<Object>() {
             @Override
             public void onSubscribe(Subscription s) {
@@ -2123,10 +2123,10 @@ protected void subscribeActual(CompletableObserver observer) {
     public static <T, U> void checkDisposedMaybe(Function<Maybe<T>, ? extends MaybeSource<U>> composer) {
         PublishProcessor<T> pp = PublishProcessor.create();
 
-        TestSubscriber<U> ts = new TestSubscriber<U>();
+        TestSubscriber<U> ts = new TestSubscriber<>();
 
         try {
-            new MaybeToFlowable<U>(composer.apply(pp.singleElement())).subscribe(ts);
+            new MaybeToFlowable<>(composer.apply(pp.singleElement())).subscribe(ts);
         } catch (Throwable ex) {
             throw ExceptionHelper.wrapOrThrow(ex);
         }
@@ -2145,7 +2145,7 @@ public static <T, U> void checkDisposedMaybe(Function<Maybe<T>, ? extends MaybeS
     public static void checkDisposedCompletable(Function<Completable, ? extends CompletableSource> composer) {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         try {
             new CompletableToFlowable<Integer>(composer.apply(pp.ignoreElements())).subscribe(ts);
@@ -2169,10 +2169,10 @@ public static void checkDisposedCompletable(Function<Completable, ? extends Comp
     public static <T, U> void checkDisposedMaybeToSingle(Function<Maybe<T>, ? extends SingleSource<U>> composer) {
         PublishProcessor<T> pp = PublishProcessor.create();
 
-        TestSubscriber<U> ts = new TestSubscriber<U>();
+        TestSubscriber<U> ts = new TestSubscriber<>();
 
         try {
-            new SingleToFlowable<U>(composer.apply(pp.singleElement())).subscribe(ts);
+            new SingleToFlowable<>(composer.apply(pp.singleElement())).subscribe(ts);
         } catch (Throwable ex) {
             throw ExceptionHelper.wrapOrThrow(ex);
         }
@@ -2190,6 +2190,7 @@ public static <T, U> void checkDisposedMaybeToSingle(Function<Maybe<T>, ? extend
      * @param ts the TestSubscriber instance
      * @param classes the array of expected Throwables inside the Composite
      */
+    @SafeVarargs
     public static void assertCompositeExceptions(TestSubscriberEx<?> ts, Class<? extends Throwable>... classes) {
         ts
         .assertSubscribed()
@@ -2234,6 +2235,7 @@ public static void assertCompositeExceptions(TestSubscriberEx<?> ts, Object... c
      * @param to the TestSubscriber instance
      * @param classes the array of expected Throwables inside the Composite
      */
+    @SafeVarargs
     public static void assertCompositeExceptions(TestObserverEx<?> to, Class<? extends Throwable>... classes) {
         to
         .assertSubscribed()
@@ -2278,6 +2280,7 @@ public static void assertCompositeExceptions(TestObserverEx<?> to, Object... cla
      * @param p the target processor
      * @param values the values to emit
      */
+    @SafeVarargs
     public static <T> void emit(Processor<T, ?> p, T... values) {
         for (T v : values) {
             p.onNext(v);
@@ -2291,6 +2294,7 @@ public static <T> void emit(Processor<T, ?> p, T... values) {
      * @param p the target subject
      * @param values the values to emit
      */
+    @SafeVarargs
     public static <T> void emit(Subject<T> p, T... values) {
         for (T v : values) {
             p.onNext(v);
@@ -2495,7 +2499,7 @@ protected void subscribeActual(Observer<? super T> observer) {
 
             if (o instanceof ObservableSource) {
                 ObservableSource<?> os = (ObservableSource<?>) o;
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
 
                 os.subscribe(to);
 
@@ -2517,7 +2521,7 @@ protected void subscribeActual(Observer<? super T> observer) {
 
             if (o instanceof Publisher) {
                 Publisher<?> os = (Publisher<?>) o;
-                TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+                TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
 
                 os.subscribe(ts);
 
@@ -2539,7 +2543,7 @@ protected void subscribeActual(Observer<? super T> observer) {
 
             if (o instanceof SingleSource) {
                 SingleSource<?> os = (SingleSource<?>) o;
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
 
                 os.subscribe(to);
 
@@ -2561,7 +2565,7 @@ protected void subscribeActual(Observer<? super T> observer) {
 
             if (o instanceof MaybeSource) {
                 MaybeSource<?> os = (MaybeSource<?>) o;
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
 
                 os.subscribe(to);
 
@@ -2583,7 +2587,7 @@ protected void subscribeActual(Observer<? super T> observer) {
 
             if (o instanceof CompletableSource) {
                 CompletableSource os = (CompletableSource) o;
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
 
                 os.subscribe(to);
 
@@ -2654,7 +2658,7 @@ protected void subscribeActual(Subscriber<? super T> subscriber) {
 
             if (o instanceof ObservableSource) {
                 ObservableSource<?> os = (ObservableSource<?>) o;
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
 
                 os.subscribe(to);
 
@@ -2676,7 +2680,7 @@ protected void subscribeActual(Subscriber<? super T> subscriber) {
 
             if (o instanceof Publisher) {
                 Publisher<?> os = (Publisher<?>) o;
-                TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+                TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
 
                 os.subscribe(ts);
 
@@ -2698,7 +2702,7 @@ protected void subscribeActual(Subscriber<? super T> subscriber) {
 
             if (o instanceof SingleSource) {
                 SingleSource<?> os = (SingleSource<?>) o;
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
 
                 os.subscribe(to);
 
@@ -2720,7 +2724,7 @@ protected void subscribeActual(Subscriber<? super T> subscriber) {
 
             if (o instanceof MaybeSource) {
                 MaybeSource<?> os = (MaybeSource<?>) o;
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
 
                 os.subscribe(to);
 
@@ -2742,7 +2746,7 @@ protected void subscribeActual(Subscriber<? super T> subscriber) {
 
             if (o instanceof CompletableSource) {
                 CompletableSource os = (CompletableSource) o;
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
 
                 os.subscribe(to);
 
@@ -2778,7 +2782,7 @@ public static <T> void checkInvalidParallelSubscribers(ParallelFlowable<T> sourc
         @SuppressWarnings("unchecked")
         TestSubscriber<Object>[] tss = new TestSubscriber[n + 1];
         for (int i = 0; i <= n; i++) {
-            tss[i] = new TestSubscriber<Object>().withTag("" + i);
+            tss[i] = new TestSubscriber<>().withTag("" + i);
         }
 
         source.subscribe(tss);
@@ -2893,7 +2897,7 @@ static final class FlowableStripBoundary<T> extends Flowable<T> implements Flowa
 
         @Override
         public Flowable<T> apply(Flowable<T> upstream) {
-            return new FlowableStripBoundary<T>(upstream);
+            return new FlowableStripBoundary<>(upstream);
         }
 
         @Override
@@ -2985,7 +2989,7 @@ public void cancel() {
     }
 
     public static <T> FlowableTransformer<T, T> flowableStripBoundary() {
-        return new FlowableStripBoundary<T>(null);
+        return new FlowableStripBoundary<>(null);
     }
 
     static final class ObservableStripBoundary<T> extends Observable<T> implements ObservableTransformer<T, T> {
@@ -2998,7 +3002,7 @@ static final class ObservableStripBoundary<T> extends Observable<T> implements O
 
         @Override
         public Observable<T> apply(Observable<T> upstream) {
-            return new ObservableStripBoundary<T>(upstream);
+            return new ObservableStripBoundary<>(upstream);
         }
 
         @Override
@@ -3090,23 +3094,23 @@ public boolean isDisposed() {
     }
 
     public static <T> ObservableTransformer<T, T> observableStripBoundary() {
-        return new ObservableStripBoundary<T>(null);
+        return new ObservableStripBoundary<>(null);
     }
 
     public static <T> TestConsumerExConverters<T> testConsumer() {
-        return new TestConsumerExConverters<T>(false, 0);
+        return new TestConsumerExConverters<>(false, 0);
     }
 
     public static <T> TestConsumerExConverters<T> testConsumer(boolean cancelled) {
-        return new TestConsumerExConverters<T>(cancelled, 0);
+        return new TestConsumerExConverters<>(cancelled, 0);
     }
 
     public static <T> TestConsumerExConverters<T> testConsumer(final int fusionMode, final boolean cancelled) {
-        return new TestConsumerExConverters<T>(cancelled, fusionMode);
+        return new TestConsumerExConverters<>(cancelled, fusionMode);
     }
 
     public static <T> TestConsumerExConverters<T> testConsumer(final boolean cancelled, final int fusionMode) {
-        return new TestConsumerExConverters<T>(cancelled, fusionMode);
+        return new TestConsumerExConverters<>(cancelled, fusionMode);
     }
 
     public static <T> FlowableConverter<T, TestSubscriberEx<T>> testSubscriber(final long initialRequest) {
@@ -3125,7 +3129,7 @@ public static <T> FlowableConverter<T, TestSubscriberEx<T>> testSubscriber(final
         return new FlowableConverter<T, TestSubscriberEx<T>>() {
             @Override
             public TestSubscriberEx<T> apply(Flowable<T> f) {
-                TestSubscriberEx<T> tse = new TestSubscriberEx<T>(initialRequest);
+                TestSubscriberEx<T> tse = new TestSubscriberEx<>(initialRequest);
                 if (cancelled) {
                     tse.cancel();
                 }
@@ -3153,7 +3157,7 @@ public static final class TestConsumerExConverters<T> implements
 
         @Override
         public TestObserverEx<Void> apply(Completable upstream) {
-            TestObserverEx<Void> toe = new TestObserverEx<Void>();
+            TestObserverEx<Void> toe = new TestObserverEx<>();
             if (cancelled) {
                 toe.dispose();
             }
@@ -3163,7 +3167,7 @@ public TestObserverEx<Void> apply(Completable upstream) {
 
         @Override
         public TestObserverEx<T> apply(Maybe<T> upstream) {
-            TestObserverEx<T> toe = new TestObserverEx<T>();
+            TestObserverEx<T> toe = new TestObserverEx<>();
             if (cancelled) {
                 toe.dispose();
             }
@@ -3173,7 +3177,7 @@ public TestObserverEx<T> apply(Maybe<T> upstream) {
 
         @Override
         public TestObserverEx<T> apply(Single<T> upstream) {
-            TestObserverEx<T> toe = new TestObserverEx<T>();
+            TestObserverEx<T> toe = new TestObserverEx<>();
             if (cancelled) {
                 toe.dispose();
             }
@@ -3183,7 +3187,7 @@ public TestObserverEx<T> apply(Single<T> upstream) {
 
         @Override
         public TestObserverEx<T> apply(Observable<T> upstream) {
-            TestObserverEx<T> toe = new TestObserverEx<T>();
+            TestObserverEx<T> toe = new TestObserverEx<>();
             if (cancelled) {
                 toe.dispose();
             }
@@ -3193,7 +3197,7 @@ public TestObserverEx<T> apply(Observable<T> upstream) {
 
         @Override
         public TestSubscriberEx<T> apply(Flowable<T> upstream) {
-            TestSubscriberEx<T> tse = new TestSubscriberEx<T>();
+            TestSubscriberEx<T> tse = new TestSubscriberEx<>();
             if (cancelled) {
                 tse.dispose();
             }
@@ -3202,8 +3206,9 @@ public TestSubscriberEx<T> apply(Flowable<T> upstream) {
         }
     }
 
+    @SafeVarargs
     public static <T> TestSubscriberEx<T> assertValueSet(TestSubscriberEx<T> ts, T... values) {
-        Set<T> expectedSet = new HashSet<T>(Arrays.asList(values));
+        Set<T> expectedSet = new HashSet<>(Arrays.asList(values));
         for (T t : ts.values()) {
             if (!expectedSet.contains(t)) {
                 throw ts.failWith("Item not in the set: " + BaseTestConsumer.valueAndClass(t));
@@ -3212,8 +3217,9 @@ public static <T> TestSubscriberEx<T> assertValueSet(TestSubscriberEx<T> ts, T..
         return ts;
     }
 
+    @SafeVarargs
     public static <T> TestObserverEx<T> assertValueSet(TestObserverEx<T> to, T... values) {
-        Set<T> expectedSet = new HashSet<T>(Arrays.asList(values));
+        Set<T> expectedSet = new HashSet<>(Arrays.asList(values));
         for (T t : to.values()) {
             if (!expectedSet.contains(t)) {
                 throw to.failWith("Item not in the set: " + BaseTestConsumer.valueAndClass(t));
@@ -3280,35 +3286,35 @@ public Integer apply(Integer v) throws Throwable {
             .to(transform);
 
             if (result instanceof MaybeSource) {
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
                 disposable.set(to);
 
                 ((MaybeSource<?>)result)
                 .subscribe(to);
                 to.assertEmpty();
             } else if (result instanceof SingleSource) {
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
                 disposable.set(to);
 
                 ((SingleSource<?>)result)
                 .subscribe(to);
                 to.assertEmpty();
             } else if (result instanceof CompletableSource) {
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
                 disposable.set(to);
 
                 ((CompletableSource)result)
                 .subscribe(to);
                 to.assertEmpty();
             } else if (result instanceof ObservableSource) {
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
                 disposable.set(to);
 
                 ((ObservableSource<?>)result)
                 .subscribe(to);
                 to.assertEmpty();
             } else if (result instanceof Publisher) {
-                TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+                TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
                 disposable.set(Disposables.fromSubscription(ts));
 
                 ((Publisher<?>)result)
@@ -3348,35 +3354,35 @@ public Integer apply(Integer v) throws Throwable {
             .to(transform);
 
             if (result instanceof MaybeSource) {
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
                 disposable.set(to);
 
                 ((MaybeSource<?>)result)
                 .subscribe(to);
                 to.assertEmpty();
             } else if (result instanceof SingleSource) {
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
                 disposable.set(to);
 
                 ((SingleSource<?>)result)
                 .subscribe(to);
                 to.assertEmpty();
             } else if (result instanceof CompletableSource) {
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
                 disposable.set(to);
 
                 ((CompletableSource)result)
                 .subscribe(to);
                 to.assertEmpty();
             } else if (result instanceof ObservableSource) {
-                TestObserverEx<Object> to = new TestObserverEx<Object>();
+                TestObserverEx<Object> to = new TestObserverEx<>();
                 disposable.set(to);
 
                 ((ObservableSource<?>)result)
                 .subscribe(to);
                 to.assertEmpty();
             } else if (result instanceof Publisher) {
-                TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+                TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
                 disposable.set(Disposables.fromSubscription(ts));
 
                 ((Publisher<?>)result)
@@ -3419,4 +3425,18 @@ public static long awaitGC(long oneSleep, int maxLoop, long expectedMemoryUsage)
         }
         return bean.getHeapMemoryUsage().getUsed();
     }
+
+    /**
+     * Enable thracking of the global errors for the duration of the action.
+     * @param action the action to run with a list of errors encountered
+     * @throws Throwable the exception rethrown from the action
+     */
+    public static void withErrorTracking(Consumer<List<Throwable>> action) throws Throwable {
+        List<Throwable> errors = trackPluginErrors();
+        try {
+            action.accept(errors);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index d8b5d14f7e..2d4387d543 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -14,8 +14,10 @@
 package io.reactivex.rxjava3.validators;
 
 import java.lang.reflect.*;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.stream.*;
 
 import org.junit.Test;
 import org.reactivestreams.*;
@@ -584,6 +586,14 @@ public void checkParallelFlowable() {
 
         defaultValues.put(ParallelFailureHandling.class, ParallelFailureHandling.ERROR);
 
+        // JDK 8 types
+
+        defaultValues.put(Optional.class, Optional.of(1));
+        defaultValues.put(CompletionStage.class, CompletableFuture.completedFuture(1));
+        defaultValues.put(Stream.class, Stream.of(1, 2, 3));
+        defaultValues.put(Duration.class, Duration.ofSeconds(1));
+        defaultValues.put(Collector.class, Collectors.toList());
+
         @SuppressWarnings("rawtypes")
         class MixedConverters implements FlowableConverter, ObservableConverter, SingleConverter,
         MaybeConverter, CompletableConverter, ParallelFlowableConverter {

From 2392349ccae27a0916d594c115f356c9040c3b98 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jakew@google.com>
Date: Tue, 17 Dec 2019 11:48:50 -0500
Subject: [PATCH 005/665] Remove deprecated method from 2.x (#6769)

---
 .../rxjava3/internal/functions/ObjectHelper.java    | 13 -------------
 .../internal/functions/ObjectHelperTest.java        |  6 ------
 2 files changed, 19 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
index c13b1850f2..981d697ec8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
@@ -128,17 +128,4 @@ public boolean test(Object o1, Object o2) {
             return ObjectHelper.equals(o1, o2);
         }
     }
-
-    /**
-     * Trap null-check attempts on primitives.
-     * @param value the value to check
-     * @param message the message to print
-     * @return the value
-     * @deprecated this method should not be used as there is no need
-     * to check primitives for nullness.
-     */
-    @Deprecated
-    public static long requireNonNull(long value, String message) {
-        throw new InternalError("Null check on a primitive: " + message);
-    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
index c4ae28f883..75c78f4746 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
@@ -67,10 +67,4 @@ public void compareLong() {
         assertEquals(0, ObjectHelper.compare(0L, 0L));
         assertEquals(1, ObjectHelper.compare(2L, 0L));
     }
-
-    @SuppressWarnings("deprecation")
-    @Test(expected = InternalError.class)
-    public void requireNonNullPrimitive() {
-        ObjectHelper.requireNonNull(0, "value");
-    }
 }

From 652f2a1e54bb011553c627cf3e93335f0032f034 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jakew@google.com>
Date: Tue, 17 Dec 2019 12:20:06 -0500
Subject: [PATCH 006/665] Replace some ObjecsHelpers methods with Java 8 APIs
 (#6770)

---
 .../reactivex/rxjava3/core/Notification.java  |  3 +-
 .../rxjava3/internal/functions/Functions.java |  2 +-
 .../internal/functions/ObjectHelper.java      | 42 +------------------
 .../operators/maybe/MaybeContains.java        |  4 +-
 .../operators/single/SingleEquals.java        |  4 +-
 .../schedulers/TrampolineScheduler.java       |  5 +--
 .../internal/util/NotificationLite.java       |  4 +-
 .../rxjava3/observers/BaseTestConsumer.java   |  8 ++--
 .../rxjava3/schedulers/TestScheduler.java     |  5 +--
 .../reactivex/rxjava3/schedulers/Timed.java   |  5 ++-
 .../internal/functions/ObjectHelperTest.java  | 21 ----------
 .../testsupport/BaseTestConsumerEx.java       |  6 +--
 .../rxjava3/testsupport/TestHelper.java       |  5 +--
 13 files changed, 27 insertions(+), 87 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Notification.java b/src/main/java/io/reactivex/rxjava3/core/Notification.java
index 23139896cb..b3270483a7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Notification.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Notification.java
@@ -16,6 +16,7 @@
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.NotificationLite;
+import java.util.Objects;
 
 /**
  * Represents the reactive signal types: onNext, onError and onComplete and
@@ -95,7 +96,7 @@ public Throwable getError() {
     public boolean equals(Object obj) {
         if (obj instanceof Notification) {
             Notification<?> n = (Notification<?>) obj;
-            return ObjectHelper.equals(value, n.value);
+            return Objects.equals(value, n.value);
         }
         return false;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
index 87aae2e1e8..2e44b86d04 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
@@ -275,7 +275,7 @@ static final class EqualsPredicate<T> implements Predicate<T> {
 
         @Override
         public boolean test(T t) throws Exception {
-            return ObjectHelper.equals(t, value);
+            return Objects.equals(t, value);
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
index 981d697ec8..65f5a70c82 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
@@ -13,6 +13,7 @@
 package io.reactivex.rxjava3.internal.functions;
 
 import io.reactivex.rxjava3.functions.BiPredicate;
+import java.util.Objects;
 
 /**
  * Utility methods containing the backport of Java 7's Objects utility class.
@@ -41,45 +42,6 @@ public static <T> T requireNonNull(T object, String message) {
         return object;
     }
 
-    /**
-     * Compares two potentially null objects with each other using Object.equals.
-     * @param o1 the first object
-     * @param o2 the second object
-     * @return the comparison result
-     */
-    public static boolean equals(Object o1, Object o2) { // NOPMD
-        return o1 == o2 || (o1 != null && o1.equals(o2));
-    }
-
-    /**
-     * Returns the hashCode of a non-null object or zero for a null object.
-     * @param o the object to get the hashCode for.
-     * @return the hashCode
-     */
-    public static int hashCode(Object o) {
-        return o != null ? o.hashCode() : 0;
-    }
-
-    /**
-     * Compares two integer values similar to Integer.compare.
-     * @param v1 the first value
-     * @param v2 the second value
-     * @return the comparison result
-     */
-    public static int compare(int v1, int v2) {
-        return v1 < v2 ? -1 : (v1 > v2 ? 1 : 0);
-    }
-
-    /**
-     * Compares two long values similar to Long.compare.
-     * @param v1 the first value
-     * @param v2 the second value
-     * @return the comparison result
-     */
-    public static int compare(long v1, long v2) {
-        return v1 < v2 ? -1 : (v1 > v2 ? 1 : 0);
-    }
-
     static final BiPredicate<Object, Object> EQUALS = new BiObjectPredicate();
 
     /**
@@ -125,7 +87,7 @@ public static long verifyPositive(long value, String paramName) {
     static final class BiObjectPredicate implements BiPredicate<Object, Object> {
         @Override
         public boolean test(Object o1, Object o2) {
-            return ObjectHelper.equals(o1, o2);
+            return Objects.equals(o1, o2);
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java
index 55b68fec3d..8737c6ae37 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java
@@ -16,8 +16,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.HasUpstreamMaybeSource;
+import java.util.Objects;
 
 /**
  * Signals true if the source signals a value that is object-equals with the provided
@@ -81,7 +81,7 @@ public void onSubscribe(Disposable d) {
         @Override
         public void onSuccess(Object value) {
             upstream = DisposableHelper.DISPOSED;
-            downstream.onSuccess(ObjectHelper.equals(value, this.value));
+            downstream.onSuccess(Objects.equals(value, this.value));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
index 8a9f62473f..0a839ab747 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
@@ -13,11 +13,11 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class SingleEquals<T> extends Single<Boolean> {
@@ -68,7 +68,7 @@ public void onSuccess(T value) {
             values[index] = value;
 
             if (count.incrementAndGet() == 2) {
-                downstream.onSuccess(ObjectHelper.equals(values[0], values[1]));
+                downstream.onSuccess(Objects.equals(values[0], values[1]));
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
index cc61d797e9..71c054258b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
@@ -23,7 +23,6 @@
 import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
@@ -165,9 +164,9 @@ static final class TimedRunnable implements Comparable<TimedRunnable> {
 
         @Override
         public int compareTo(TimedRunnable that) {
-            int result = ObjectHelper.compare(execTime, that.execTime);
+            int result = Long.compare(execTime, that.execTime);
             if (result == 0) {
-                return ObjectHelper.compare(count, that.count);
+                return Integer.compare(count, that.count);
             }
             return result;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java b/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java
index dbc54c788a..c37aa71da2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java
@@ -14,11 +14,11 @@
 
 import java.io.Serializable;
 
+import java.util.Objects;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Lightweight notification handling utility class.
@@ -52,7 +52,7 @@ public int hashCode() {
         public boolean equals(Object obj) {
             if (obj instanceof ErrorNotification) {
                 ErrorNotification n = (ErrorNotification) obj;
-                return ObjectHelper.equals(e, n.e);
+                return Objects.equals(e, n.e);
             }
             return false;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
index 59aa62e796..f8a0356a75 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
@@ -284,7 +284,7 @@ public final U assertValue(T value) {
             throw fail("expected: " + valueAndClass(value) + " but was: " + values);
         }
         T v = values.get(0);
-        if (!ObjectHelper.equals(value, v)) {
+        if (!Objects.equals(value, v)) {
             throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v));
         }
         return (U)this;
@@ -330,7 +330,7 @@ public final U assertValueAt(int index, T value) {
         }
 
         T v = values.get(index);
-        if (!ObjectHelper.equals(value, v)) {
+        if (!Objects.equals(value, v)) {
             throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v));
         }
         return (U)this;
@@ -421,7 +421,7 @@ public final U assertValues(T... values) {
         for (int i = 0; i < s; i++) {
             T v = this.values.get(i);
             T u = values[i];
-            if (!ObjectHelper.equals(u, v)) {
+            if (!Objects.equals(u, v)) {
                 throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));
             }
         }
@@ -466,7 +466,7 @@ public final U assertValueSequence(Iterable<? extends T> sequence) {
             T u = expectedIterator.next();
             T v = actualIterator.next();
 
-            if (!ObjectHelper.equals(u, v)) {
+            if (!Objects.equals(u, v)) {
                 throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));
             }
             i++;
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
index 33a5b943e1..8b70760236 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
@@ -20,7 +20,6 @@
 import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * A special, non thread-safe scheduler for testing operators that require
@@ -76,9 +75,9 @@ public String toString() {
         @Override
         public int compareTo(TimedRunnable o) {
             if (time == o.time) {
-                return ObjectHelper.compare(count, o.count);
+                return Long.compare(count, o.count);
             }
-            return ObjectHelper.compare(time, o.time);
+            return Long.compare(time, o.time);
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
index b7ac9c828f..fff21ad682 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.schedulers;
 
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.annotations.NonNull;
@@ -80,9 +81,9 @@ public long time(@NonNull TimeUnit unit) {
     public boolean equals(Object other) {
         if (other instanceof Timed) {
             Timed<?> o = (Timed<?>) other;
-            return ObjectHelper.equals(value, o.value)
+            return Objects.equals(value, o.value)
                     && time == o.time
-                    && ObjectHelper.equals(unit, o.unit);
+                    && Objects.equals(unit, o.unit);
         }
         return false;
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
index 75c78f4746..16c182061d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
@@ -27,13 +27,6 @@ public void utilityClass() {
         TestHelper.checkUtilityClass(ObjectHelper.class);
     }
 
-    @Test
-    public void hashCodeOf() {
-        assertEquals(0, ObjectHelper.hashCode(null));
-
-        assertEquals(((Integer)1).hashCode(), ObjectHelper.hashCode(1));
-    }
-
     @Test
     public void verifyPositiveInt() throws Exception {
         assertEquals(1, ObjectHelper.verifyPositive(1, "param"));
@@ -53,18 +46,4 @@ public void verifyPositiveIntFail() throws Exception {
     public void verifyPositiveLongFail() throws Exception {
         assertEquals(-1L, ObjectHelper.verifyPositive(-1L, "param"));
     }
-
-    @Test
-    public void compare() {
-        assertEquals(-1, ObjectHelper.compare(0, 2));
-        assertEquals(0, ObjectHelper.compare(0, 0));
-        assertEquals(1, ObjectHelper.compare(2, 0));
-    }
-
-    @Test
-    public void compareLong() {
-        assertEquals(-1, ObjectHelper.compare(0L, 2L));
-        assertEquals(0, ObjectHelper.compare(0L, 0L));
-        assertEquals(1, ObjectHelper.compare(2L, 0L));
-    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
index d997a065ba..2c68b0151a 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
@@ -16,10 +16,10 @@
 import java.util.List;
 
 import io.reactivex.rxjava3.functions.Predicate;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.observers.BaseTestConsumer;
+import java.util.Objects;
 
 /**
  * Base class with shared infrastructure to support TestSubscriber and TestObserver.
@@ -74,7 +74,7 @@ public final U assertNever(T value) {
 
         for (int i = 0; i < s; i++) {
             T v = this.values.get(i);
-            if (ObjectHelper.equals(v, value)) {
+            if (Objects.equals(v, value)) {
                 throw fail("Value at position " + i + " is equal to " + valueAndClass(value) + "; Expected them to be different");
             }
         }
@@ -158,7 +158,7 @@ public final U assertErrorMessage(String message) {
         if (s == 1) {
             Throwable e = errors.get(0);
             String errorMessage = e.getMessage();
-            if (!ObjectHelper.equals(message, errorMessage)) {
+            if (!Objects.equals(message, errorMessage)) {
                 throw fail("Error message differs; exptected: " + message + " but was: " + errorMessage);
             }
         } else {
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 1f2a834650..1ce53f01ae 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -36,7 +36,6 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.completable.CompletableToFlowable;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable;
@@ -196,7 +195,7 @@ public static void assertError(List<Throwable> list, int index, Class<? extends
             err.initCause(ex);
             throw err;
         }
-        if (!ObjectHelper.equals(message, ex.getMessage())) {
+        if (!Objects.equals(message, ex.getMessage())) {
             AssertionError err = new AssertionError("Message " + message + " expected but got " + ex.getMessage());
             err.initCause(ex);
             throw err;
@@ -216,7 +215,7 @@ public static void assertUndeliverable(List<Throwable> list, int index, Class<?
             err.initCause(list.get(index));
             throw err;
         }
-        if (!ObjectHelper.equals(message, ex.getMessage())) {
+        if (!Objects.equals(message, ex.getMessage())) {
             AssertionError err = new AssertionError("Message " + message + " expected but got " + ex.getMessage());
             err.initCause(ex);
             throw err;

From 6ba932c9a3752c6d85d65bd2292c3a47cab64fd6 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jakew@google.com>
Date: Tue, 17 Dec 2019 14:06:44 -0500
Subject: [PATCH 007/665] Replace ObjectHelper.requireNonNull with
 Objects.requireNonNull (#6771)

---
 .../reactivex/rxjava3/core/Completable.java   | 145 +--
 .../io/reactivex/rxjava3/core/Flowable.java   | 954 +++++++++---------
 .../java/io/reactivex/rxjava3/core/Maybe.java | 355 +++----
 .../reactivex/rxjava3/core/Notification.java  |   5 +-
 .../io/reactivex/rxjava3/core/Observable.java | 950 ++++++++---------
 .../io/reactivex/rxjava3/core/Single.java     | 301 +++---
 .../disposables/CompositeDisposable.java      |  17 +-
 .../rxjava3/disposables/Disposables.java      |  11 +-
 .../disposables/ReferenceDisposable.java      |   4 +-
 .../flowables/ConnectableFlowable.java        |   5 +-
 .../disposables/DisposableHelper.java         |   4 +-
 .../disposables/ListCompositeDisposable.java  |  17 +-
 .../rxjava3/internal/functions/Functions.java |  16 +-
 .../internal/functions/ObjectHelper.java      |  16 -
 .../internal/jdk8/FlowableFromStream.java     |   8 +-
 .../CompletableConcatIterable.java            |   6 +-
 .../completable/CompletableDefer.java         |   5 +-
 .../completable/CompletableErrorSupplier.java |   5 +-
 .../CompletableMergeDelayErrorIterable.java   |   6 +-
 .../completable/CompletableMergeIterable.java |   6 +-
 .../completable/CompletableResumeNext.java    |   4 +-
 .../completable/CompletableUsing.java         |   4 +-
 .../AbstractFlowableWithUpstream.java         |   5 +-
 .../flowable/FlowableBlockingSubscribe.java   |  13 +-
 .../operators/flowable/FlowableBuffer.java    |   7 +-
 .../flowable/FlowableBufferBoundary.java      |   5 +-
 .../flowable/FlowableBufferExactBoundary.java |   6 +-
 .../flowable/FlowableBufferTimed.java         |  15 +-
 .../operators/flowable/FlowableCollect.java   |   5 +-
 .../flowable/FlowableCollectSingle.java       |   5 +-
 .../flowable/FlowableCombineLatest.java       |  10 +-
 .../operators/flowable/FlowableConcatMap.java |   6 +-
 .../flowable/FlowableConcatMapEager.java      |   4 +-
 .../flowable/FlowableConcatMapScheduler.java  |   6 +-
 .../operators/flowable/FlowableDebounce.java  |   4 +-
 .../operators/flowable/FlowableDefer.java     |   5 +-
 .../flowable/FlowableDematerialize.java       |   5 +-
 .../operators/flowable/FlowableDistinct.java  |   6 +-
 .../operators/flowable/FlowableFlatMap.java   |   4 +-
 .../flowable/FlowableFlatMapCompletable.java  |   4 +-
 ...FlowableFlatMapCompletableCompletable.java |   4 +-
 .../flowable/FlowableFlatMapMaybe.java        |   4 +-
 .../flowable/FlowableFlatMapSingle.java       |   4 +-
 .../flowable/FlowableFlattenIterable.java     |   6 +-
 .../operators/flowable/FlowableFromArray.java |   5 +-
 .../flowable/FlowableFromCallable.java        |   6 +-
 .../flowable/FlowableFromIterable.java        |   4 +-
 .../flowable/FlowableFromSupplier.java        |   7 +-
 .../operators/flowable/FlowableGroupJoin.java |   7 +-
 .../flowable/FlowableInternalHelper.java      |   7 +-
 .../operators/flowable/FlowableJoin.java      |   9 +-
 .../operators/flowable/FlowableMap.java       |  13 +-
 .../flowable/FlowableMapNotification.java     |   9 +-
 .../flowable/FlowableOnErrorNext.java         |   5 +-
 .../flowable/FlowableOnErrorReturn.java       |   5 +-
 .../flowable/FlowablePublishMulticast.java    |   4 +-
 .../operators/flowable/FlowableReduce.java    |   5 +-
 .../flowable/FlowableReduceMaybe.java         |   5 +-
 .../flowable/FlowableReduceSeedSingle.java    |   5 +-
 .../flowable/FlowableReduceWithSingle.java    |   5 +-
 .../flowable/FlowableRepeatWhen.java          |   4 +-
 .../operators/flowable/FlowableRetryWhen.java |   5 +-
 .../flowable/FlowableScalarXMap.java          |   7 +-
 .../operators/flowable/FlowableScan.java      |   5 +-
 .../operators/flowable/FlowableScanSeed.java  |   6 +-
 .../operators/flowable/FlowableSwitchMap.java |   4 +-
 .../operators/flowable/FlowableTimeout.java   |   6 +-
 .../operators/flowable/FlowableUsing.java     |   4 +-
 .../FlowableWindowBoundarySelector.java       |   3 +-
 .../flowable/FlowableWithLatestFrom.java      |   4 +-
 .../flowable/FlowableWithLatestFromMany.java  |   6 +-
 .../operators/flowable/FlowableZip.java       |   4 +-
 .../flowable/FlowableZipIterable.java         |   8 +-
 .../operators/maybe/MaybeConcatIterable.java  |   6 +-
 .../internal/operators/maybe/MaybeDefer.java  |   5 +-
 .../maybe/MaybeFlatMapBiSelector.java         |   8 +-
 .../maybe/MaybeFlatMapCompletable.java        |   4 +-
 .../maybe/MaybeFlatMapIterableFlowable.java   |   6 +-
 .../maybe/MaybeFlatMapIterableObservable.java |   4 +-
 .../maybe/MaybeFlatMapNotification.java       |   8 +-
 .../operators/maybe/MaybeFlatMapSingle.java   |   4 +-
 .../maybe/MaybeFlatMapSingleElement.java      |   4 +-
 .../operators/maybe/MaybeFlatten.java         |   4 +-
 .../internal/operators/maybe/MaybeLift.java   |   5 +-
 .../internal/operators/maybe/MaybeMap.java    |   5 +-
 .../operators/maybe/MaybeMergeArray.java      |   4 +-
 .../operators/maybe/MaybeOnErrorNext.java     |   6 +-
 .../operators/maybe/MaybeOnErrorReturn.java   |   5 +-
 .../internal/operators/maybe/MaybeUsing.java  |   4 +-
 .../operators/maybe/MaybeZipArray.java        |   6 +-
 .../operators/maybe/MaybeZipIterable.java     |   4 +-
 .../mixed/FlowableConcatMapCompletable.java   |   4 +-
 .../mixed/FlowableConcatMapMaybe.java         |   4 +-
 .../mixed/FlowableConcatMapSingle.java        |   4 +-
 .../mixed/FlowableSwitchMapCompletable.java   |   4 +-
 .../mixed/FlowableSwitchMapMaybe.java         |   4 +-
 .../mixed/FlowableSwitchMapSingle.java        |   4 +-
 .../mixed/MaybeFlatMapObservable.java         |   6 +-
 .../mixed/MaybeFlatMapPublisher.java          |   6 +-
 .../mixed/ObservableConcatMapCompletable.java |   4 +-
 .../mixed/ObservableConcatMapMaybe.java       |   4 +-
 .../mixed/ObservableConcatMapSingle.java      |   4 +-
 .../mixed/ObservableSwitchMapCompletable.java |   4 +-
 .../mixed/ObservableSwitchMapMaybe.java       |   4 +-
 .../mixed/ObservableSwitchMapSingle.java      |   4 +-
 .../operators/mixed/ScalarXMapZHelper.java    |   9 +-
 .../mixed/SingleFlatMapObservable.java        |   6 +-
 .../ObservableBlockingSubscribe.java          |   7 +-
 .../observable/ObservableBuffer.java          |   3 +-
 .../observable/ObservableBufferBoundary.java  |   5 +-
 .../ObservableBufferExactBoundary.java        |   6 +-
 .../observable/ObservableBufferTimed.java     |  15 +-
 .../observable/ObservableCollect.java         |   5 +-
 .../observable/ObservableCollectSingle.java   |   5 +-
 .../observable/ObservableCombineLatest.java   |   4 +-
 .../observable/ObservableConcatMap.java       |   6 +-
 .../observable/ObservableConcatMapEager.java  |   4 +-
 .../ObservableConcatMapScheduler.java         |   6 +-
 .../observable/ObservableDebounce.java        |   4 +-
 .../operators/observable/ObservableDefer.java |   5 +-
 .../observable/ObservableDematerialize.java   |   5 +-
 .../observable/ObservableDistinct.java        |   6 +-
 .../observable/ObservableFlatMap.java         |   3 +-
 .../ObservableFlatMapCompletable.java         |   4 +-
 ...servableFlatMapCompletableCompletable.java |   4 +-
 .../observable/ObservableFlatMapMaybe.java    |   4 +-
 .../observable/ObservableFlatMapSingle.java   |   4 +-
 .../observable/ObservableFlattenIterable.java |   4 +-
 .../observable/ObservableFromArray.java       |   5 +-
 .../observable/ObservableFromIterable.java    |   6 +-
 .../observable/ObservableGroupBy.java         |   3 +-
 .../observable/ObservableGroupJoin.java       |   7 +-
 .../observable/ObservableInternalHelper.java  |   7 +-
 .../operators/observable/ObservableJoin.java  |   9 +-
 .../operators/observable/ObservableLift.java  |   5 +-
 .../operators/observable/ObservableMap.java   |   7 +-
 .../observable/ObservableMapNotification.java |   9 +-
 .../observable/ObservablePublishSelector.java |   4 +-
 .../observable/ObservableReduceMaybe.java     |   5 +-
 .../ObservableReduceSeedSingle.java           |   5 +-
 .../ObservableReduceWithSingle.java           |   5 +-
 .../observable/ObservableRepeatWhen.java      |   4 +-
 .../observable/ObservableReplay.java          |   5 +-
 .../observable/ObservableRetryWhen.java       |   4 +-
 .../observable/ObservableScalarXMap.java      |   6 +-
 .../operators/observable/ObservableScan.java  |   5 +-
 .../observable/ObservableScanSeed.java        |   7 +-
 .../observable/ObservableSwitchMap.java       |   4 +-
 .../observable/ObservableTimeout.java         |   6 +-
 .../operators/observable/ObservableUsing.java |   4 +-
 .../ObservableWindowBoundarySelector.java     |   3 +-
 .../observable/ObservableWithLatestFrom.java  |   4 +-
 .../ObservableWithLatestFromMany.java         |   6 +-
 .../operators/observable/ObservableZip.java   |   4 +-
 .../observable/ObservableZipIterable.java     |   8 +-
 .../operators/parallel/ParallelCollect.java   |   5 +-
 .../operators/parallel/ParallelConcatMap.java |   7 +-
 .../parallel/ParallelDoOnNextTry.java         |   7 +-
 .../operators/parallel/ParallelFilterTry.java |   7 +-
 .../operators/parallel/ParallelMap.java       |   9 +-
 .../operators/parallel/ParallelMapTry.java    |  11 +-
 .../operators/parallel/ParallelPeek.java      |  19 +-
 .../operators/parallel/ParallelReduce.java    |   7 +-
 .../parallel/ParallelReduceFull.java          |   6 +-
 .../operators/single/SingleDefer.java         |   5 +-
 .../operators/single/SingleDematerialize.java |   5 +-
 .../operators/single/SingleFlatMap.java       |   4 +-
 .../single/SingleFlatMapCompletable.java      |   4 +-
 .../single/SingleFlatMapIterableFlowable.java |   6 +-
 .../SingleFlatMapIterableObservable.java      |   4 +-
 .../operators/single/SingleFlatMapMaybe.java  |   4 +-
 .../single/SingleFlatMapPublisher.java        |   4 +-
 .../operators/single/SingleFromCallable.java  |   4 +-
 .../operators/single/SingleFromSupplier.java  |   5 +-
 .../internal/operators/single/SingleLift.java |   5 +-
 .../internal/operators/single/SingleMap.java  |   5 +-
 .../operators/single/SingleResumeNext.java    |   4 +-
 .../operators/single/SingleUsing.java         |   4 +-
 .../operators/single/SingleZipArray.java      |   6 +-
 .../operators/single/SingleZipIterable.java   |   3 +-
 .../subscriptions/SubscriptionArbiter.java    |   4 +-
 .../subscriptions/SubscriptionHelper.java     |   4 +-
 .../internal/util/EndConsumerHelper.java      |  10 +-
 .../internal/util/ExceptionHelper.java        |   2 +-
 .../observables/ConnectableObservable.java    |   5 +-
 .../ResourceCompletableObserver.java          |   4 +-
 .../observers/ResourceMaybeObserver.java      |   4 +-
 .../rxjava3/observers/ResourceObserver.java   |   4 +-
 .../observers/ResourceSingleObserver.java     |   4 +-
 .../rxjava3/parallel/ParallelFlowable.java    |  72 +-
 .../rxjava3/plugins/RxJavaPlugins.java        |  24 +-
 .../rxjava3/processors/BehaviorProcessor.java |   6 +-
 .../rxjava3/processors/ReplayProcessor.java   |   4 +-
 .../rxjava3/processors/UnicastProcessor.java  |   5 +-
 .../reactivex/rxjava3/schedulers/Timed.java   |   3 +-
 .../rxjava3/subjects/BehaviorSubject.java     |   4 +-
 .../rxjava3/subjects/ReplaySubject.java       |   4 +-
 .../rxjava3/subjects/UnicastSubject.java      |   3 +-
 .../subscribers/ResourceSubscriber.java       |   4 +-
 199 files changed, 1957 insertions(+), 1930 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 06183c66db..f25320d66b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -12,6 +12,7 @@
  */
 package io.reactivex.rxjava3.core;
 
+import java.util.Objects;
 import java.util.concurrent.*;
 
 import org.reactivestreams.Publisher;
@@ -120,7 +121,7 @@ public abstract class Completable implements CompletableSource {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable ambArray(final CompletableSource... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return complete();
         }
@@ -149,7 +150,7 @@ public static Completable ambArray(final CompletableSource... sources) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable amb(final Iterable<? extends CompletableSource> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
 
         return RxJavaPlugins.onAssembly(new CompletableAmb(null, sources));
     }
@@ -187,7 +188,7 @@ public static Completable complete() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable concatArray(CompletableSource... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return complete();
         } else
@@ -213,7 +214,7 @@ public static Completable concatArray(CompletableSource... sources) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable concat(Iterable<? extends CompletableSource> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
 
         return RxJavaPlugins.onAssembly(new CompletableConcatIterable(sources));
     }
@@ -261,7 +262,7 @@ public static Completable concat(Publisher<? extends CompletableSource> sources)
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     public static Completable concat(Publisher<? extends CompletableSource> sources, int prefetch) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new CompletableConcat(sources, prefetch));
     }
@@ -311,7 +312,7 @@ public static Completable concat(Publisher<? extends CompletableSource> sources,
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable create(CompletableOnSubscribe source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new CompletableCreate(source));
     }
 
@@ -334,7 +335,7 @@ public static Completable create(CompletableOnSubscribe source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable unsafeCreate(CompletableSource source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         if (source instanceof Completable) {
             throw new IllegalArgumentException("Use of unsafeCreate(Completable)!");
         }
@@ -356,7 +357,7 @@ public static Completable unsafeCreate(CompletableSource source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable defer(final Supplier<? extends CompletableSource> completableSupplier) {
-        ObjectHelper.requireNonNull(completableSupplier, "completableSupplier");
+        Objects.requireNonNull(completableSupplier, "completableSupplier");
         return RxJavaPlugins.onAssembly(new CompletableDefer(completableSupplier));
     }
 
@@ -380,7 +381,7 @@ public static Completable defer(final Supplier<? extends CompletableSource> comp
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable error(final Supplier<? extends Throwable> errorSupplier) {
-        ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null");
+        Objects.requireNonNull(errorSupplier, "errorSupplier is null");
         return RxJavaPlugins.onAssembly(new CompletableErrorSupplier(errorSupplier));
     }
 
@@ -400,7 +401,7 @@ public static Completable error(final Supplier<? extends Throwable> errorSupplie
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable error(final Throwable error) {
-        ObjectHelper.requireNonNull(error, "error is null");
+        Objects.requireNonNull(error, "error is null");
         return RxJavaPlugins.onAssembly(new CompletableError(error));
     }
 
@@ -428,7 +429,7 @@ public static Completable error(final Throwable error) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable fromAction(final Action run) {
-        ObjectHelper.requireNonNull(run, "run is null");
+        Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new CompletableFromAction(run));
     }
 
@@ -457,7 +458,7 @@ public static Completable fromAction(final Action run) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable fromCallable(final Callable<?> callable) {
-        ObjectHelper.requireNonNull(callable, "callable is null");
+        Objects.requireNonNull(callable, "callable is null");
         return RxJavaPlugins.onAssembly(new CompletableFromCallable(callable));
     }
 
@@ -478,7 +479,7 @@ public static Completable fromCallable(final Callable<?> callable) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable fromFuture(final Future<?> future) {
-        ObjectHelper.requireNonNull(future, "future is null");
+        Objects.requireNonNull(future, "future is null");
         return fromAction(Functions.futureAction(future));
     }
 
@@ -503,7 +504,7 @@ public static Completable fromFuture(final Future<?> future) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Completable fromMaybe(final MaybeSource<T> maybe) {
-        ObjectHelper.requireNonNull(maybe, "maybe is null");
+        Objects.requireNonNull(maybe, "maybe is null");
         return RxJavaPlugins.onAssembly(new MaybeIgnoreElementCompletable<T>(maybe));
     }
 
@@ -531,7 +532,7 @@ public static <T> Completable fromMaybe(final MaybeSource<T> maybe) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable fromRunnable(final Runnable run) {
-        ObjectHelper.requireNonNull(run, "run is null");
+        Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new CompletableFromRunnable(run));
     }
 
@@ -553,7 +554,7 @@ public static Completable fromRunnable(final Runnable run) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Completable fromObservable(final ObservableSource<T> observable) {
-        ObjectHelper.requireNonNull(observable, "observable is null");
+        Objects.requireNonNull(observable, "observable is null");
         return RxJavaPlugins.onAssembly(new CompletableFromObservable<T>(observable));
     }
 
@@ -591,7 +592,7 @@ public static <T> Completable fromObservable(final ObservableSource<T> observabl
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Completable fromPublisher(final Publisher<T> publisher) {
-        ObjectHelper.requireNonNull(publisher, "publisher is null");
+        Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new CompletableFromPublisher<T>(publisher));
     }
 
@@ -613,7 +614,7 @@ public static <T> Completable fromPublisher(final Publisher<T> publisher) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Completable fromSingle(final SingleSource<T> single) {
-        ObjectHelper.requireNonNull(single, "single is null");
+        Objects.requireNonNull(single, "single is null");
         return RxJavaPlugins.onAssembly(new CompletableFromSingle<T>(single));
     }
 
@@ -643,7 +644,7 @@ public static <T> Completable fromSingle(final SingleSource<T> single) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable fromSupplier(final Supplier<?> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new CompletableFromSupplier(supplier));
     }
 
@@ -678,7 +679,7 @@ public static Completable fromSupplier(final Supplier<?> supplier) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable mergeArray(CompletableSource... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return complete();
         } else
@@ -719,7 +720,7 @@ public static Completable mergeArray(CompletableSource... sources) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable merge(Iterable<? extends CompletableSource> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new CompletableMergeIterable(sources));
     }
 
@@ -822,7 +823,7 @@ public static Completable merge(Publisher<? extends CompletableSource> sources,
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     private static Completable merge0(Publisher<? extends CompletableSource> sources, int maxConcurrency, boolean delayErrors) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new CompletableMerge(sources, maxConcurrency, delayErrors));
     }
@@ -845,7 +846,7 @@ private static Completable merge0(Publisher<? extends CompletableSource> sources
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable mergeArrayDelayError(CompletableSource... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new CompletableMergeDelayErrorArray(sources));
     }
 
@@ -867,7 +868,7 @@ public static Completable mergeArrayDelayError(CompletableSource... sources) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable mergeDelayError(Iterable<? extends CompletableSource> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new CompletableMergeDelayErrorIterable(sources));
     }
 
@@ -973,8 +974,8 @@ public static Completable timer(long delay, TimeUnit unit) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static Completable timer(final long delay, final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new CompletableTimer(delay, unit, scheduler));
     }
 
@@ -1047,9 +1048,9 @@ public static <R> Completable using(
             final Function<? super R, ? extends CompletableSource> completableFunction,
             final Consumer<? super R> disposer,
             final boolean eager) {
-        ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null");
-        ObjectHelper.requireNonNull(completableFunction, "completableFunction is null");
-        ObjectHelper.requireNonNull(disposer, "disposer is null");
+        Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
+        Objects.requireNonNull(completableFunction, "completableFunction is null");
+        Objects.requireNonNull(disposer, "disposer is null");
 
         return RxJavaPlugins.onAssembly(new CompletableUsing<R>(resourceSupplier, completableFunction, disposer, eager));
     }
@@ -1071,7 +1072,7 @@ public static <R> Completable using(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable wrap(CompletableSource source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         if (source instanceof Completable) {
             return RxJavaPlugins.onAssembly((Completable)source);
         }
@@ -1096,7 +1097,7 @@ public static Completable wrap(CompletableSource source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable ambWith(CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
 
@@ -1120,7 +1121,7 @@ public final Completable ambWith(CompletableSource other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T> Observable<T> andThen(ObservableSource<T> next) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         return RxJavaPlugins.onAssembly(new CompletableAndThenObservable<T>(this, next));
     }
 
@@ -1148,7 +1149,7 @@ public final <T> Observable<T> andThen(ObservableSource<T> next) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T> Flowable<T> andThen(Publisher<T> next) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         return RxJavaPlugins.onAssembly(new CompletableAndThenPublisher<T>(this, next));
     }
 
@@ -1172,7 +1173,7 @@ public final <T> Flowable<T> andThen(Publisher<T> next) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T> Single<T> andThen(SingleSource<T> next) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable<T>(next, this));
     }
 
@@ -1196,7 +1197,7 @@ public final <T> Single<T> andThen(SingleSource<T> next) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T> Maybe<T> andThen(MaybeSource<T> next) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         return RxJavaPlugins.onAssembly(new MaybeDelayWithCompletable<T>(next, this));
     }
 
@@ -1218,7 +1219,7 @@ public final <T> Maybe<T> andThen(MaybeSource<T> next) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable andThen(CompletableSource next) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         return RxJavaPlugins.onAssembly(new CompletableAndThenCompletable(this, next));
     }
 
@@ -1267,7 +1268,7 @@ public final void blockingAwait() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final boolean blockingAwait(long timeout, TimeUnit unit) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(unit, "unit is null");
         BlockingMultiObserver<Void> observer = new BlockingMultiObserver<Void>();
         subscribe(observer);
         return observer.blockingAwait(timeout, unit);
@@ -1312,7 +1313,7 @@ public final Completable cache() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable compose(CompletableTransformer transformer) {
-        return wrap(ObjectHelper.requireNonNull(transformer, "transformer is null").apply(this));
+        return wrap(Objects.requireNonNull(transformer, "transformer is null").apply(this));
     }
 
     /**
@@ -1335,7 +1336,7 @@ public final Completable compose(CompletableTransformer transformer) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable concatWith(CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new CompletableAndThenCompletable(this, other));
     }
 
@@ -1399,8 +1400,8 @@ public final Completable delay(long delay, TimeUnit unit, Scheduler scheduler) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Completable delay(final long delay, final TimeUnit unit, final Scheduler scheduler, final boolean delayError) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new CompletableDelay(this, delay, unit, scheduler, delayError));
     }
 
@@ -1530,7 +1531,7 @@ public final Completable doOnError(Consumer<? super Throwable> onError) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable doOnEvent(final Consumer<? super Throwable> onEvent) {
-        ObjectHelper.requireNonNull(onEvent, "onEvent is null");
+        Objects.requireNonNull(onEvent, "onEvent is null");
         return RxJavaPlugins.onAssembly(new CompletableDoOnEvent(this, onEvent));
     }
 
@@ -1558,12 +1559,12 @@ private Completable doOnLifecycle(
             final Action onTerminate,
             final Action onAfterTerminate,
             final Action onDispose) {
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
-        ObjectHelper.requireNonNull(onTerminate, "onTerminate is null");
-        ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
-        ObjectHelper.requireNonNull(onDispose, "onDispose is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onTerminate, "onTerminate is null");
+        Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
+        Objects.requireNonNull(onDispose, "onDispose is null");
         return RxJavaPlugins.onAssembly(new CompletablePeek(this, onSubscribe, onError, onComplete, onTerminate, onAfterTerminate, onDispose));
     }
 
@@ -1657,7 +1658,7 @@ public final Completable doAfterTerminate(final Action onAfterTerminate) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable doFinally(Action onFinally) {
-        ObjectHelper.requireNonNull(onFinally, "onFinally is null");
+        Objects.requireNonNull(onFinally, "onFinally is null");
         return RxJavaPlugins.onAssembly(new CompletableDoFinally(this, onFinally));
     }
 
@@ -1795,7 +1796,7 @@ public final Completable doFinally(Action onFinally) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable lift(final CompletableOperator onLift) {
-        ObjectHelper.requireNonNull(onLift, "onLift is null");
+        Objects.requireNonNull(onLift, "onLift is null");
         return RxJavaPlugins.onAssembly(new CompletableLift(this, onLift));
     }
 
@@ -1837,7 +1838,7 @@ public final <T> Single<Notification<T>> materialize() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable mergeWith(CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return mergeArray(this, other);
     }
 
@@ -1857,7 +1858,7 @@ public final Completable mergeWith(CompletableSource other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Completable observeOn(final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new CompletableObserveOn(this, scheduler));
     }
 
@@ -1895,7 +1896,7 @@ public final Completable onErrorComplete() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable onErrorComplete(final Predicate<? super Throwable> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
 
         return RxJavaPlugins.onAssembly(new CompletableOnErrorComplete(this, predicate));
     }
@@ -1918,7 +1919,7 @@ public final Completable onErrorComplete(final Predicate<? super Throwable> pred
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable onErrorResumeNext(final Function<? super Throwable, ? extends CompletableSource> errorMapper) {
-        ObjectHelper.requireNonNull(errorMapper, "errorMapper is null");
+        Objects.requireNonNull(errorMapper, "errorMapper is null");
         return RxJavaPlugins.onAssembly(new CompletableResumeNext(this, errorMapper));
     }
 
@@ -2177,7 +2178,7 @@ public final Completable retryWhen(Function<? super Flowable<Throwable>, ? exten
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable startWith(CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return concatArray(other, this);
     }
 
@@ -2199,7 +2200,7 @@ public final Completable startWith(CompletableSource other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T> Observable<T> startWith(Observable<T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return other.concatWith(this.<T>toObservable());
     }
     /**
@@ -2224,7 +2225,7 @@ public final <T> Observable<T> startWith(Observable<T> other) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T> Flowable<T> startWith(Publisher<T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return this.<T>toFlowable().startWith(other);
     }
 
@@ -2269,12 +2270,12 @@ public final Disposable subscribe() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
     public final void subscribe(CompletableObserver observer) {
-        ObjectHelper.requireNonNull(observer, "observer is null");
+        Objects.requireNonNull(observer, "observer is null");
         try {
 
             observer = RxJavaPlugins.onSubscribe(this, observer);
 
-            ObjectHelper.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null CompletableObserver. Please check the handler provided to RxJavaPlugins.setOnCompletableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
+            Objects.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null CompletableObserver. Please check the handler provided to RxJavaPlugins.setOnCompletableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
 
             subscribeActual(observer);
         } catch (NullPointerException ex) { // NOPMD
@@ -2346,8 +2347,8 @@ public final <E extends CompletableObserver> E subscribeWith(E observer) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable subscribe(final Action onComplete, final Consumer<? super Throwable> onError) {
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
 
         CallbackCompletableObserver observer = new CallbackCompletableObserver(onError, onComplete);
         subscribe(observer);
@@ -2374,7 +2375,7 @@ public final Disposable subscribe(final Action onComplete, final Consumer<? supe
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable subscribe(final Action onComplete) {
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
 
         CallbackCompletableObserver observer = new CallbackCompletableObserver(onComplete);
         subscribe(observer);
@@ -2398,7 +2399,7 @@ public final Disposable subscribe(final Action onComplete) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Completable subscribeOn(final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new CompletableSubscribeOn(this, scheduler));
     }
@@ -2425,7 +2426,7 @@ public final Completable subscribeOn(final Scheduler scheduler) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable takeUntil(CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
 
         return RxJavaPlugins.onAssembly(new CompletableTakeUntilCompletable(this, other));
     }
@@ -2470,7 +2471,7 @@ public final Completable timeout(long timeout, TimeUnit unit) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     public final Completable timeout(long timeout, TimeUnit unit, CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, Schedulers.computation(), other);
     }
 
@@ -2518,7 +2519,7 @@ public final Completable timeout(long timeout, TimeUnit unit, Scheduler schedule
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Completable timeout(long timeout, TimeUnit unit, Scheduler scheduler, CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, scheduler, other);
     }
 
@@ -2542,8 +2543,8 @@ public final Completable timeout(long timeout, TimeUnit unit, Scheduler schedule
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     private Completable timeout0(long timeout, TimeUnit unit, Scheduler scheduler, CompletableSource other) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new CompletableTimeout(this, timeout, unit, scheduler, other));
     }
 
@@ -2567,7 +2568,7 @@ private Completable timeout0(long timeout, TimeUnit unit, Scheduler scheduler, C
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> R to(@NonNull CompletableConverter<? extends R> converter) {
-        return ObjectHelper.requireNonNull(converter, "converter is null").apply(this);
+        return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
 
     /**
@@ -2658,7 +2659,7 @@ public final <T> Observable<T> toObservable() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T> Single<T> toSingle(final Supplier<? extends T> completionValueSupplier) {
-        ObjectHelper.requireNonNull(completionValueSupplier, "completionValueSupplier is null");
+        Objects.requireNonNull(completionValueSupplier, "completionValueSupplier is null");
         return RxJavaPlugins.onAssembly(new CompletableToSingle<T>(this, completionValueSupplier, null));
     }
 
@@ -2680,7 +2681,7 @@ public final <T> Single<T> toSingle(final Supplier<? extends T> completionValueS
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T> Single<T> toSingleDefault(final T completionValue) {
-        ObjectHelper.requireNonNull(completionValue, "completionValue is null");
+        Objects.requireNonNull(completionValue, "completionValue is null");
         return RxJavaPlugins.onAssembly(new CompletableToSingle<T>(this, null, completionValue));
     }
 
@@ -2701,7 +2702,7 @@ public final <T> Single<T> toSingleDefault(final T completionValue) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Completable unsubscribeOn(final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new CompletableDisposeOn(this, scheduler));
     }
     // -------------------------------------------------------------------------
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 3fed4742e2..514845efbc 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -184,7 +184,7 @@ public abstract class Flowable<T> implements Publisher<T> {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> amb(Iterable<? extends Publisher<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableAmb<T>(null, sources));
     }
 
@@ -215,7 +215,7 @@ public static <T> Flowable<T> amb(Iterable<? extends Publisher<? extends T>> sou
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T> Flowable<T> ambArray(Publisher<? extends T>... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         int len = sources.length;
         if (len == 0) {
             return empty();
@@ -324,11 +324,11 @@ public static <T, R> Flowable<R> combineLatestArray(Publisher<? extends T>[] sou
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     public static <T, R> Flowable<R> combineLatestArray(Publisher<? extends T>[] sources, Function<? super Object[], ? extends R> combiner, int bufferSize) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         }
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableCombineLatest<T, R>(sources, combiner, bufferSize, false));
     }
@@ -423,8 +423,8 @@ public static <T, R> Flowable<R> combineLatest(Iterable<? extends Publisher<? ex
     @BackpressureSupport(BackpressureKind.FULL)
     public static <T, R> Flowable<R> combineLatest(Iterable<? extends Publisher<? extends T>> sources,
             Function<? super Object[], ? extends R> combiner, int bufferSize) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableCombineLatest<T, R>(sources, combiner, bufferSize, false));
     }
@@ -520,8 +520,8 @@ public static <T, R> Flowable<R> combineLatestDelayError(Publisher<? extends T>[
     @BackpressureSupport(BackpressureKind.FULL)
     public static <T, R> Flowable<R> combineLatestDelayError(Publisher<? extends T>[] sources,
             Function<? super Object[], ? extends R> combiner, int bufferSize) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (sources.length == 0) {
             return empty();
@@ -620,8 +620,8 @@ public static <T, R> Flowable<R> combineLatestDelayError(Iterable<? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     public static <T, R> Flowable<R> combineLatestDelayError(Iterable<? extends Publisher<? extends T>> sources,
             Function<? super Object[], ? extends R> combiner, int bufferSize) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableCombineLatest<T, R>(sources, combiner, bufferSize, true));
     }
@@ -665,8 +665,8 @@ public static <T, R> Flowable<R> combineLatestDelayError(Iterable<? extends Publ
     public static <T1, T2, R> Flowable<R> combineLatest(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return combineLatestArray(new Publisher[] { source1, source2 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -714,9 +714,9 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2,
             Publisher<? extends T3> source3,
             Function3<? super T1, ? super T2, ? super T3, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -767,10 +767,10 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2,
             Publisher<? extends T3> source3, Publisher<? extends T4> source4,
             Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -825,11 +825,11 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
             Publisher<? extends T3> source3, Publisher<? extends T4> source4,
             Publisher<? extends T5> source5,
             Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -887,12 +887,12 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
             Publisher<? extends T3> source3, Publisher<? extends T4> source4,
             Publisher<? extends T5> source5, Publisher<? extends T6> source6,
             Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -954,13 +954,13 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
             Publisher<? extends T5> source5, Publisher<? extends T6> source6,
             Publisher<? extends T7> source7,
             Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -1025,14 +1025,14 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
             Publisher<? extends T5> source5, Publisher<? extends T6> source6,
             Publisher<? extends T7> source7, Publisher<? extends T8> source8,
             Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -1101,15 +1101,15 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
             Publisher<? extends T7> source7, Publisher<? extends T8> source8,
             Publisher<? extends T9> source9,
             Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
-        ObjectHelper.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source9, "source9 is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -1137,7 +1137,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concat(Iterable<? extends Publisher<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         // unlike general sources, fromIterable can only throw on a boundary because it is consumed only there
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, 2);
     }
@@ -1232,8 +1232,8 @@ public static <T> Flowable<T> concat(Publisher<? extends Publisher<? extends T>>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concat(Publisher<? extends T> source1, Publisher<? extends T> source2) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
     }
 
@@ -1270,9 +1270,9 @@ public static <T> Flowable<T> concat(Publisher<? extends T> source1, Publisher<?
     public static <T> Flowable<T> concat(
             Publisher<? extends T> source1, Publisher<? extends T> source2,
             Publisher<? extends T> source3) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return concatArray(source1, source2, source3);
     }
 
@@ -1311,10 +1311,10 @@ public static <T> Flowable<T> concat(
     public static <T> Flowable<T> concat(
             Publisher<? extends T> source1, Publisher<? extends T> source2,
             Publisher<? extends T> source3, Publisher<? extends T> source4) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return concatArray(source1, source2, source3, source4);
     }
 
@@ -1446,7 +1446,7 @@ public static <T> Flowable<T> concatArrayEager(Publisher<? extends T>... sources
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch, Publisher<? extends T>... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapEager(new FlowableFromArray(sources), Functions.identity(), maxConcurrency, prefetch, ErrorMode.IMMEDIATE));
@@ -1541,7 +1541,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concatDelayError(Iterable<? extends Publisher<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity());
     }
 
@@ -1647,7 +1647,7 @@ public static <T> Flowable<T> concatEager(Publisher<? extends Publisher<? extend
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public static <T> Flowable<T> concatEager(Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapEagerPublisher(sources, Functions.identity(), maxConcurrency, prefetch, ErrorMode.IMMEDIATE));
@@ -1707,7 +1707,7 @@ public static <T> Flowable<T> concatEager(Iterable<? extends Publisher<? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public static <T> Flowable<T> concatEager(Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapEager(new FlowableFromIterable(sources), Functions.identity(), maxConcurrency, prefetch, ErrorMode.IMMEDIATE));
@@ -1770,8 +1770,8 @@ public static <T> Flowable<T> concatEager(Iterable<? extends Publisher<? extends
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> create(FlowableOnSubscribe<T> source, BackpressureStrategy mode) {
-        ObjectHelper.requireNonNull(source, "source is null");
-        ObjectHelper.requireNonNull(mode, "mode is null");
+        Objects.requireNonNull(source, "source is null");
+        Objects.requireNonNull(mode, "mode is null");
         return RxJavaPlugins.onAssembly(new FlowableCreate<T>(source, mode));
     }
 
@@ -1807,7 +1807,7 @@ public static <T> Flowable<T> create(FlowableOnSubscribe<T> source, Backpressure
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> defer(Supplier<? extends Publisher<? extends T>> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableDefer<T>(supplier));
     }
 
@@ -1862,7 +1862,7 @@ public static <T> Flowable<T> empty() {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> error(Supplier<? extends Throwable> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableError<T>(supplier));
     }
 
@@ -1891,7 +1891,7 @@ public static <T> Flowable<T> error(Supplier<? extends Throwable> supplier) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> error(final Throwable throwable) {
-        ObjectHelper.requireNonNull(throwable, "throwable is null");
+        Objects.requireNonNull(throwable, "throwable is null");
         return error(Functions.justSupplier(throwable));
     }
 
@@ -1920,7 +1920,7 @@ public static <T> Flowable<T> error(final Throwable throwable) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T> Flowable<T> fromArray(T... items) {
-        ObjectHelper.requireNonNull(items, "items is null");
+        Objects.requireNonNull(items, "items is null");
         if (items.length == 0) {
             return empty();
         }
@@ -1967,7 +1967,7 @@ public static <T> Flowable<T> fromArray(T... items) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> fromCallable(Callable<? extends T> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableFromCallable<T>(supplier));
     }
 
@@ -2009,7 +2009,7 @@ public static <T> Flowable<T> fromCallable(Callable<? extends T> supplier) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> fromFuture(Future<? extends T> future) {
-        ObjectHelper.requireNonNull(future, "future is null");
+        Objects.requireNonNull(future, "future is null");
         return RxJavaPlugins.onAssembly(new FlowableFromFuture<T>(future, 0L, null));
     }
 
@@ -2055,8 +2055,8 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit) {
-        ObjectHelper.requireNonNull(future, "future is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(future, "future is null");
+        Objects.requireNonNull(unit, "unit is null");
         return RxJavaPlugins.onAssembly(new FlowableFromFuture<T>(future, timeout, unit));
     }
 
@@ -2106,7 +2106,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeou
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return fromFuture((Future<T>)future, timeout, unit).subscribeOn(scheduler);
     }
 
@@ -2145,7 +2145,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeou
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static <T> Flowable<T> fromFuture(Future<? extends T> future, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return fromFuture((Future<T>)future).subscribeOn(scheduler);
     }
 
@@ -2175,7 +2175,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, Scheduler s
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> fromIterable(Iterable<? extends T> source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new FlowableFromIterable<T>(source));
     }
 
@@ -2215,7 +2215,7 @@ public static <T> Flowable<T> fromPublisher(final Publisher<? extends T> source)
         if (source instanceof Flowable) {
             return RxJavaPlugins.onAssembly((Flowable<T>)source);
         }
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
 
         return RxJavaPlugins.onAssembly(new FlowableFromPublisher<T>(source));
     }
@@ -2257,7 +2257,7 @@ public static <T> Flowable<T> fromPublisher(final Publisher<? extends T> source)
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> fromSupplier(Supplier<? extends T> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableFromSupplier<T>(supplier));
     }
 
@@ -2287,7 +2287,7 @@ public static <T> Flowable<T> fromSupplier(Supplier<? extends T> supplier) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> generate(final Consumer<Emitter<T>> generator) {
-        ObjectHelper.requireNonNull(generator, "generator is null");
+        Objects.requireNonNull(generator, "generator is null");
         return generate(Functions.nullSupplier(),
                 FlowableInternalHelper.<T, Object>simpleGenerator(generator),
                 Functions.emptyConsumer());
@@ -2321,7 +2321,7 @@ public static <T> Flowable<T> generate(final Consumer<Emitter<T>> generator) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, S> Flowable<T> generate(Supplier<S> initialState, final BiConsumer<S, Emitter<T>> generator) {
-        ObjectHelper.requireNonNull(generator, "generator is null");
+        Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, FlowableInternalHelper.<T, S>simpleBiGenerator(generator),
                 Functions.emptyConsumer());
     }
@@ -2357,7 +2357,7 @@ public static <T, S> Flowable<T> generate(Supplier<S> initialState, final BiCons
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, S> Flowable<T> generate(Supplier<S> initialState, final BiConsumer<S, Emitter<T>> generator,
             Consumer<? super S> disposeState) {
-        ObjectHelper.requireNonNull(generator, "generator is null");
+        Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, FlowableInternalHelper.<T, S>simpleBiGenerator(generator), disposeState);
     }
 
@@ -2423,9 +2423,9 @@ public static <T, S> Flowable<T> generate(Supplier<S> initialState, BiFunction<S
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, S> Flowable<T> generate(Supplier<S> initialState, BiFunction<S, Emitter<T>, S> generator, Consumer<? super S> disposeState) {
-        ObjectHelper.requireNonNull(initialState, "initialState is null");
-        ObjectHelper.requireNonNull(generator, "generator is null");
-        ObjectHelper.requireNonNull(disposeState, "disposeState is null");
+        Objects.requireNonNull(initialState, "initialState is null");
+        Objects.requireNonNull(generator, "generator is null");
+        Objects.requireNonNull(disposeState, "disposeState is null");
         return RxJavaPlugins.onAssembly(new FlowableGenerate<T, S>(initialState, generator, disposeState));
     }
 
@@ -2493,8 +2493,8 @@ public static Flowable<Long> interval(long initialDelay, long period, TimeUnit u
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static Flowable<Long> interval(long initialDelay, long period, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableInterval(Math.max(0L, initialDelay), Math.max(0L, period), unit, scheduler));
     }
 
@@ -2612,8 +2612,8 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
         if (start > 0 && end < 0) {
             throw new IllegalArgumentException("Overflow! start + count is bigger than Long.MAX_VALUE");
         }
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new FlowableIntervalRange(start, end, Math.max(0L, initialDelay), Math.max(0L, period), unit, scheduler));
     }
@@ -2653,7 +2653,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return RxJavaPlugins.onAssembly(new FlowableJust<T>(item));
     }
 
@@ -2682,8 +2682,8 @@ public static <T> Flowable<T> just(T item) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item1, T item2) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
 
         return fromArray(item1, item2);
     }
@@ -2715,9 +2715,9 @@ public static <T> Flowable<T> just(T item1, T item2) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item1, T item2, T item3) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
 
         return fromArray(item1, item2, item3);
     }
@@ -2751,10 +2751,10 @@ public static <T> Flowable<T> just(T item1, T item2, T item3) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item1, T item2, T item3, T item4) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
 
         return fromArray(item1, item2, item3, item4);
     }
@@ -2790,11 +2790,11 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
 
         return fromArray(item1, item2, item3, item4, item5);
     }
@@ -2832,12 +2832,12 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5)
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6);
     }
@@ -2877,13 +2877,13 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
-        ObjectHelper.requireNonNull(item7, "item7 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item7, "item7 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6, item7);
     }
@@ -2925,14 +2925,14 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
-        ObjectHelper.requireNonNull(item7, "item7 is null");
-        ObjectHelper.requireNonNull(item8, "item8 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item7, "item7 is null");
+        Objects.requireNonNull(item8, "item8 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6, item7, item8);
     }
@@ -2976,15 +2976,15 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
-        ObjectHelper.requireNonNull(item7, "item7 is null");
-        ObjectHelper.requireNonNull(item8, "item8 is null");
-        ObjectHelper.requireNonNull(item9, "item9 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item7, "item7 is null");
+        Objects.requireNonNull(item8, "item8 is null");
+        Objects.requireNonNull(item9, "item9 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9);
     }
@@ -3030,16 +3030,16 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9, T item10) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
-        ObjectHelper.requireNonNull(item7, "item7 is null");
-        ObjectHelper.requireNonNull(item8, "item8 is null");
-        ObjectHelper.requireNonNull(item9, "item9 is null");
-        ObjectHelper.requireNonNull(item10, "item10 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item7, "item7 is null");
+        Objects.requireNonNull(item8, "item8 is null");
+        Objects.requireNonNull(item9, "item9 is null");
+        Objects.requireNonNull(item10, "item10 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9, item10);
     }
@@ -3421,8 +3421,8 @@ public static <T> Flowable<T> mergeArray(Publisher<? extends T>... sources) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> merge(Publisher<? extends T> source1, Publisher<? extends T> source2) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), false, 2);
     }
 
@@ -3471,9 +3471,9 @@ public static <T> Flowable<T> merge(Publisher<? extends T> source1, Publisher<?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> merge(Publisher<? extends T> source1, Publisher<? extends T> source2, Publisher<? extends T> source3) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return fromArray(source1, source2, source3).flatMap((Function)Functions.identity(), false, 3);
     }
 
@@ -3526,10 +3526,10 @@ public static <T> Flowable<T> merge(Publisher<? extends T> source1, Publisher<?
     public static <T> Flowable<T> merge(
             Publisher<? extends T> source1, Publisher<? extends T> source2,
             Publisher<? extends T> source3, Publisher<? extends T> source4) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return fromArray(source1, source2, source3, source4).flatMap((Function)Functions.identity(), false, 4);
     }
 
@@ -3834,8 +3834,8 @@ public static <T> Flowable<T> mergeArrayDelayError(Publisher<? extends T>... sou
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(Publisher<? extends T> source1, Publisher<? extends T> source2) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), true, 2);
     }
 
@@ -3877,9 +3877,9 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends T> source1, Pu
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(Publisher<? extends T> source1, Publisher<? extends T> source2, Publisher<? extends T> source3) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return fromArray(source1, source2, source3).flatMap((Function)Functions.identity(), true, 3);
     }
 
@@ -3925,10 +3925,10 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends T> source1, Pu
     public static <T> Flowable<T> mergeDelayError(
             Publisher<? extends T> source1, Publisher<? extends T> source2,
             Publisher<? extends T> source3, Publisher<? extends T> source4) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return fromArray(source1, source2, source3, source4).flatMap((Function)Functions.identity(), true, 4);
     }
 
@@ -4140,9 +4140,9 @@ public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1,
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1, Publisher<? extends T> source2,
             BiPredicate<? super T, ? super T> isEqual, int bufferSize) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(isEqual, "isEqual is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(isEqual, "isEqual is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableSequenceEqualSingle<T>(source1, source2, isEqual, bufferSize));
     }
@@ -4390,8 +4390,8 @@ public static Flowable<Long> timer(long delay, TimeUnit unit) {
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static Flowable<Long> timer(long delay, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new FlowableTimer(Math.max(0L, delay), unit, scheduler));
     }
@@ -4419,7 +4419,7 @@ public static Flowable<Long> timer(long delay, TimeUnit unit, Scheduler schedule
     @BackpressureSupport(BackpressureKind.NONE)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> unsafeCreate(Publisher<T> onSubscribe) {
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         if (onSubscribe instanceof Flowable) {
             throw new IllegalArgumentException("unsafeCreate(Flowable) should be upgraded");
         }
@@ -4497,9 +4497,9 @@ public static <T, D> Flowable<T> using(Supplier<? extends D> resourceSupplier,
     public static <T, D> Flowable<T> using(Supplier<? extends D> resourceSupplier,
             Function<? super D, ? extends Publisher<? extends T>> sourceSupplier,
                     Consumer<? super D> resourceDisposer, boolean eager) {
-        ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null");
-        ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null");
-        ObjectHelper.requireNonNull(resourceDisposer, "resourceDisposer is null");
+        Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
+        Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
+        Objects.requireNonNull(resourceDisposer, "resourceDisposer is null");
         return RxJavaPlugins.onAssembly(new FlowableUsing<T, D>(resourceSupplier, sourceSupplier, resourceDisposer, eager));
     }
 
@@ -4552,8 +4552,8 @@ public static <T, D> Flowable<T> using(Supplier<? extends D> resourceSupplier,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Flowable<R> zip(Iterable<? extends Publisher<? extends T>> sources, Function<? super Object[], ? extends R> zipper) {
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableZip<T, R>(null, sources, zipper, bufferSize(), false));
     }
 
@@ -4613,8 +4613,8 @@ public static <T, R> Flowable<R> zip(Iterable<? extends Publisher<? extends T>>
     public static <T, R> Flowable<R> zip(Iterable<? extends Publisher<? extends T>> sources,
             Function<? super Object[], ? extends R> zipper, boolean delayError,
             int bufferSize) {
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableZip<T, R>(null, sources, zipper, bufferSize, delayError));
     }
@@ -4674,8 +4674,8 @@ public static <T, R> Flowable<R> zip(Iterable<? extends Publisher<? extends T>>
     public static <T1, T2, R> Flowable<R> zip(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2);
     }
 
@@ -4735,8 +4735,8 @@ public static <T1, T2, R> Flowable<R> zip(
     public static <T1, T2, R> Flowable<R> zip(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize(), source1, source2);
     }
 
@@ -4797,8 +4797,8 @@ public static <T1, T2, R> Flowable<R> zip(
     public static <T1, T2, R> Flowable<R> zip(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize, source1, source2);
     }
 
@@ -4861,9 +4861,9 @@ public static <T1, T2, R> Flowable<R> zip(
     public static <T1, T2, T3, R> Flowable<R> zip(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
             Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3);
     }
 
@@ -4930,10 +4930,10 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
             Publisher<? extends T4> source4,
             Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4);
     }
 
@@ -5003,11 +5003,11 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
             Publisher<? extends T4> source4, Publisher<? extends T5> source5,
             Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5);
     }
 
@@ -5079,12 +5079,12 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
             Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
             Publisher<? extends T4> source4, Publisher<? extends T5> source5, Publisher<? extends T6> source6,
             Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6);
     }
 
@@ -5160,13 +5160,13 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
             Publisher<? extends T4> source4, Publisher<? extends T5> source5, Publisher<? extends T6> source6,
             Publisher<? extends T7> source7,
             Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7);
     }
 
@@ -5245,14 +5245,14 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
             Publisher<? extends T4> source4, Publisher<? extends T5> source5, Publisher<? extends T6> source6,
             Publisher<? extends T7> source7, Publisher<? extends T8> source8,
             Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8);
     }
 
@@ -5335,15 +5335,15 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
             Publisher<? extends T7> source7, Publisher<? extends T8> source8, Publisher<? extends T9> source9,
             Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
 
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
-        ObjectHelper.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source9, "source9 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8, source9);
     }
 
@@ -5406,7 +5406,7 @@ public static <T, R> Flowable<R> zipArray(Function<? super Object[], ? extends R
         if (sources.length == 0) {
             return empty();
         }
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableZip<T, R>(sources, null, zipper, bufferSize, delayError));
     }
@@ -5439,7 +5439,7 @@ public static <T, R> Flowable<R> zipArray(Function<? super Object[], ? extends R
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> all(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new FlowableAllSingle<T>(this, predicate));
     }
 
@@ -5468,7 +5468,7 @@ public final Single<Boolean> all(Predicate<? super T> predicate) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> ambWith(Publisher<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
 
@@ -5500,7 +5500,7 @@ public final Flowable<T> ambWith(Publisher<? extends T> other) {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> any(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new FlowableAnySingle<T>(this, predicate));
     }
 
@@ -6209,7 +6209,7 @@ public final Flowable<List<T>> buffer(int count, int skip) {
     public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int skip, Supplier<U> bufferSupplier) {
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(skip, "skip");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableBuffer<T, U>(this, count, skip, bufferSupplier));
     }
 
@@ -6358,9 +6358,9 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, TimeUnit uni
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan, long timeskip, TimeUnit unit,
             Scheduler scheduler, Supplier<U> bufferSupplier) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableBufferTimed<T, U>(this, timespan, timeskip, unit, scheduler, bufferSupplier, Integer.MAX_VALUE, false));
     }
 
@@ -6518,9 +6518,9 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
             Scheduler scheduler, int count,
             Supplier<U> bufferSupplier,
             boolean restartTimerOnMaxSize) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         ObjectHelper.verifyPositive(count, "count");
         return RxJavaPlugins.onAssembly(new FlowableBufferTimed<T, U>(this, timespan, timespan, unit, scheduler, bufferSupplier, count, restartTimerOnMaxSize));
     }
@@ -6634,9 +6634,9 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
             Flowable<? extends TOpening> openingIndicator,
             Function<? super TOpening, ? extends Publisher<? extends TClosing>> closingIndicator,
             Supplier<U> bufferSupplier) {
-        ObjectHelper.requireNonNull(openingIndicator, "openingIndicator is null");
-        ObjectHelper.requireNonNull(closingIndicator, "closingIndicator is null");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(openingIndicator, "openingIndicator is null");
+        Objects.requireNonNull(closingIndicator, "closingIndicator is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableBufferBoundary<T, U, TOpening, TClosing>(this, openingIndicator, closingIndicator, bufferSupplier));
     }
 
@@ -6746,8 +6746,8 @@ public final <B> Flowable<List<T>> buffer(Publisher<B> boundaryIndicator, final
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <B, U extends Collection<? super T>> Flowable<U> buffer(Publisher<B> boundaryIndicator, Supplier<U> bufferSupplier) {
-        ObjectHelper.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableBufferExactBoundary<T, U, B>(this, boundaryIndicator, bufferSupplier));
     }
 
@@ -6898,7 +6898,7 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<U> cast(final Class<U> clazz) {
-        ObjectHelper.requireNonNull(clazz, "clazz is null");
+        Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
 
@@ -6936,8 +6936,8 @@ public final <U> Flowable<U> cast(final Class<U> clazz) {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Single<U> collect(Supplier<? extends U> initialItemSupplier, BiConsumer<? super U, ? super T> collector) {
-        ObjectHelper.requireNonNull(initialItemSupplier, "initialItemSupplier is null");
-        ObjectHelper.requireNonNull(collector, "collector is null");
+        Objects.requireNonNull(initialItemSupplier, "initialItemSupplier is null");
+        Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new FlowableCollectSingle<T, U>(this, initialItemSupplier, collector));
     }
 
@@ -6975,7 +6975,7 @@ public final <U> Single<U> collect(Supplier<? extends U> initialItemSupplier, Bi
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Single<U> collectInto(final U initialItem, BiConsumer<? super U, ? super T> collector) {
-        ObjectHelper.requireNonNull(initialItem, "initialItem is null");
+        Objects.requireNonNull(initialItem, "initialItem is null");
         return collect(Functions.justSupplier(initialItem), collector);
     }
 
@@ -7006,7 +7006,7 @@ public final <U> Single<U> collectInto(final U initialItem, BiConsumer<? super U
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> compose(FlowableTransformer<? super T, ? extends R> composer) {
-        return fromPublisher(((FlowableTransformer<T, R>) ObjectHelper.requireNonNull(composer, "composer is null")).apply(this));
+        return fromPublisher(((FlowableTransformer<T, R>) Objects.requireNonNull(composer, "composer is null")).apply(this));
     }
 
     /**
@@ -7082,7 +7082,7 @@ public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<? extends R>> mapper, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         if (this instanceof ScalarSupplier) {
             @SuppressWarnings("unchecked")
@@ -7135,9 +7135,9 @@ public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<? extends R>> mapper, int prefetch, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        ObjectHelper.requireNonNull(scheduler, "scheduler");
+        Objects.requireNonNull(scheduler, "scheduler");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapScheduler<T, R>(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler));
     }
 
@@ -7197,7 +7197,7 @@ public final Completable concatMapCompletable(Function<? super T, ? extends Comp
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     public final Completable concatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapCompletable<T>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
@@ -7300,7 +7300,7 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     public final Completable concatMapCompletableDelayError(Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapCompletable<T>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
@@ -7374,7 +7374,7 @@ public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends P
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         if (this instanceof ScalarSupplier) {
             @SuppressWarnings("unchecked")
@@ -7426,9 +7426,9 @@ public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends P
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd, int prefetch, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapScheduler<T, R>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler));
     }
 
@@ -7487,7 +7487,7 @@ public final <R> Flowable<R> concatMapEager(Function<? super T, ? extends Publis
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> concatMapEager(Function<? super T, ? extends Publisher<? extends R>> mapper,
             int maxConcurrency, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapEager<T, R>(this, mapper, maxConcurrency, prefetch, ErrorMode.IMMEDIATE));
@@ -7557,7 +7557,7 @@ public final <R> Flowable<R> concatMapEagerDelayError(Function<? super T, ? exte
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> concatMapEagerDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd, int maxConcurrency, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapEager<T, R>(this, mapper, maxConcurrency, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
@@ -7621,7 +7621,7 @@ public final <U> Flowable<U> concatMapIterable(Function<? super T, ? extends Ite
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<U> concatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<T, U>(this, mapper, prefetch));
     }
@@ -7690,7 +7690,7 @@ public final <R> Flowable<R> concatMapMaybe(Function<? super T, ? extends MaybeS
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> concatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe<T, R>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
@@ -7801,7 +7801,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(Function<? super T, ? exte
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> concatMapMaybeDelayError(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
@@ -7870,7 +7870,7 @@ public final <R> Flowable<R> concatMapSingle(Function<? super T, ? extends Singl
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> concatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle<T, R>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
@@ -7981,7 +7981,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(Function<? super T, ? ext
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> concatMapSingleDelayError(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
@@ -8011,7 +8011,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(Function<? super T, ? ext
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> concatWith(Publisher<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return concat(this, other);
     }
 
@@ -8036,7 +8036,7 @@ public final Flowable<T> concatWith(Publisher<? extends T> other) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableConcatWithSingle<T>(this, other));
     }
 
@@ -8061,7 +8061,7 @@ public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableConcatWithMaybe<T>(this, other));
     }
 
@@ -8088,7 +8088,7 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> concatWith(@NonNull CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableConcatWithCompletable<T>(this, other));
     }
 
@@ -8116,7 +8116,7 @@ public final Flowable<T> concatWith(@NonNull CompletableSource other) {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> contains(final Object item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return any(Functions.equalsWith(item));
     }
 
@@ -8179,7 +8179,7 @@ public final Single<Long> count() {
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<T> debounce(Function<? super T, ? extends Publisher<U>> debounceIndicator) {
-        ObjectHelper.requireNonNull(debounceIndicator, "debounceIndicator is null");
+        Objects.requireNonNull(debounceIndicator, "debounceIndicator is null");
         return RxJavaPlugins.onAssembly(new FlowableDebounce<T, U>(this, debounceIndicator));
     }
 
@@ -8267,8 +8267,8 @@ public final Flowable<T> debounce(long timeout, TimeUnit unit) {
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> debounce(long timeout, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableDebounceTimed<T>(this, timeout, unit, scheduler));
     }
 
@@ -8298,7 +8298,7 @@ public final Flowable<T> debounce(long timeout, TimeUnit unit, Scheduler schedul
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> defaultIfEmpty(T defaultItem) {
-        ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         return switchIfEmpty(just(defaultItem));
     }
 
@@ -8334,7 +8334,7 @@ public final Flowable<T> defaultIfEmpty(T defaultItem) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<T> delay(final Function<? super T, ? extends Publisher<U>> itemDelayIndicator) {
-        ObjectHelper.requireNonNull(itemDelayIndicator, "itemDelayIndicator is null");
+        Objects.requireNonNull(itemDelayIndicator, "itemDelayIndicator is null");
         return flatMap(FlowableInternalHelper.itemDelay(itemDelayIndicator));
     }
 
@@ -8450,8 +8450,8 @@ public final Flowable<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> delay(long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new FlowableDelay<T>(this, Math.max(0L, delay), unit, scheduler, delayError));
     }
@@ -8519,7 +8519,7 @@ public final <U, V> Flowable<T> delay(Publisher<U> subscriptionIndicator,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<T> delaySubscription(Publisher<U> subscriptionIndicator) {
-        ObjectHelper.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
+        Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
         return RxJavaPlugins.onAssembly(new FlowableDelaySubscriptionOther<T, U>(this, subscriptionIndicator));
     }
 
@@ -8632,7 +8632,7 @@ public final Flowable<T> delaySubscription(long delay, TimeUnit unit, Scheduler
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> Flowable<R> dematerialize(Function<? super T, Notification<R>> selector) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         return RxJavaPlugins.onAssembly(new FlowableDematerialize<T, R>(this, selector));
     }
 
@@ -8752,8 +8752,8 @@ public final <K> Flowable<T> distinct(Function<? super T, K> keySelector) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K> Flowable<T> distinct(Function<? super T, K> keySelector,
             Supplier<? extends Collection<? super K>> collectionSupplier) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableDistinct<T, K>(this, keySelector, collectionSupplier));
     }
 
@@ -8841,7 +8841,7 @@ public final Flowable<T> distinctUntilChanged() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K> Flowable<T> distinctUntilChanged(Function<? super T, K> keySelector) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
         return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged<T, K>(this, keySelector, ObjectHelper.equalsPredicate()));
     }
 
@@ -8879,7 +8879,7 @@ public final <K> Flowable<T> distinctUntilChanged(Function<? super T, K> keySele
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> distinctUntilChanged(BiPredicate<? super T, ? super T> comparer) {
-        ObjectHelper.requireNonNull(comparer, "comparer is null");
+        Objects.requireNonNull(comparer, "comparer is null");
         return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged<T, T>(this, Functions.<T>identity(), comparer));
     }
 
@@ -8909,7 +8909,7 @@ public final Flowable<T> distinctUntilChanged(BiPredicate<? super T, ? super T>
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> doFinally(Action onFinally) {
-        ObjectHelper.requireNonNull(onFinally, "onFinally is null");
+        Objects.requireNonNull(onFinally, "onFinally is null");
         return RxJavaPlugins.onAssembly(new FlowableDoFinally<T>(this, onFinally));
     }
 
@@ -8936,7 +8936,7 @@ public final Flowable<T> doFinally(Action onFinally) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> doAfterNext(Consumer<? super T> onAfterNext) {
-        ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null");
+        Objects.requireNonNull(onAfterNext, "onAfterNext is null");
         return RxJavaPlugins.onAssembly(new FlowableDoAfterNext<T>(this, onAfterNext));
     }
 
@@ -9047,10 +9047,10 @@ public final Flowable<T> doOnComplete(Action onComplete) {
     @SchedulerSupport(SchedulerSupport.NONE)
     private Flowable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Throwable> onError,
             Action onComplete, Action onAfterTerminate) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
-        ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
         return RxJavaPlugins.onAssembly(new FlowableDoOnEach<T>(this, onNext, onError, onComplete, onAfterTerminate));
     }
 
@@ -9076,7 +9076,7 @@ private Flowable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Throwa
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> doOnEach(final Consumer<? super Notification<T>> onNotification) {
-        ObjectHelper.requireNonNull(onNotification, "onNotification is null");
+        Objects.requireNonNull(onNotification, "onNotification is null");
         return doOnEach(
                 Functions.notificationOnNext(onNotification),
                 Functions.notificationOnError(onNotification),
@@ -9113,7 +9113,7 @@ public final Flowable<T> doOnEach(final Consumer<? super Notification<T>> onNoti
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> doOnEach(final Subscriber<? super T> subscriber) {
-        ObjectHelper.requireNonNull(subscriber, "subscriber is null");
+        Objects.requireNonNull(subscriber, "subscriber is null");
         return doOnEach(
                 FlowableInternalHelper.subscriberOnNext(subscriber),
                 FlowableInternalHelper.subscriberOnError(subscriber),
@@ -9177,9 +9177,9 @@ public final Flowable<T> doOnError(Consumer<? super Throwable> onError) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> doOnLifecycle(final Consumer<? super Subscription> onSubscribe,
             final LongConsumer onRequest, final Action onCancel) {
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
-        ObjectHelper.requireNonNull(onRequest, "onRequest is null");
-        ObjectHelper.requireNonNull(onCancel, "onCancel is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onRequest, "onRequest is null");
+        Objects.requireNonNull(onCancel, "onCancel is null");
         return RxJavaPlugins.onAssembly(new FlowableDoOnLifecycle<T>(this, onSubscribe, onRequest, onCancel));
     }
 
@@ -9352,7 +9352,7 @@ public final Single<T> elementAt(long index, T defaultItem) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
         }
-        ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new FlowableElementAtSingle<T>(this, index, defaultItem));
     }
 
@@ -9410,7 +9410,7 @@ public final Single<T> elementAtOrError(long index) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> filter(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new FlowableFilter<T>(this, predicate));
     }
 
@@ -9665,7 +9665,7 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean delayErrors, int maxConcurrency, int bufferSize) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
@@ -9716,9 +9716,9 @@ public final <R> Flowable<R> flatMap(
             Function<? super T, ? extends Publisher<? extends R>> onNextMapper,
             Function<? super Throwable, ? extends Publisher<? extends R>> onErrorMapper,
             Supplier<? extends Publisher<? extends R>> onCompleteSupplier) {
-        ObjectHelper.requireNonNull(onNextMapper, "onNextMapper is null");
-        ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null");
-        ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
+        Objects.requireNonNull(onNextMapper, "onNextMapper is null");
+        Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
+        Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
         return merge(new FlowableMapNotification<T, Publisher<? extends R>>(this, onNextMapper, onErrorMapper, onCompleteSupplier));
     }
 
@@ -9764,9 +9764,9 @@ public final <R> Flowable<R> flatMap(
             Function<Throwable, ? extends Publisher<? extends R>> onErrorMapper,
             Supplier<? extends Publisher<? extends R>> onCompleteSupplier,
             int maxConcurrency) {
-        ObjectHelper.requireNonNull(onNextMapper, "onNextMapper is null");
-        ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null");
-        ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
+        Objects.requireNonNull(onNextMapper, "onNextMapper is null");
+        Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
+        Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
         return merge(new FlowableMapNotification<T, Publisher<? extends R>>(
                 this, onNextMapper, onErrorMapper, onCompleteSupplier), maxConcurrency);
     }
@@ -9932,8 +9932,8 @@ public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Flowable<R> flatMap(final Function<? super T, ? extends Publisher<? extends U>> mapper,
             final BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency, int bufferSize) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return flatMap(FlowableInternalHelper.flatMapWithCombiner(mapper, combiner), delayErrors, maxConcurrency, bufferSize);
@@ -10020,7 +10020,7 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable flatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, boolean delayErrors, int maxConcurrency) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapCompletableCompletable<T>(this, mapper, delayErrors, maxConcurrency));
     }
@@ -10085,7 +10085,7 @@ public final <U> Flowable<U> flatMapIterable(final Function<? super T, ? extends
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<U> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper, int bufferSize) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<T, U>(this, mapper, bufferSize));
     }
@@ -10123,8 +10123,8 @@ public final <U> Flowable<U> flatMapIterable(final Function<? super T, ? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, V> Flowable<V> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper,
             final BiFunction<? super T, ? super U, ? extends V> resultSelector) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.requireNonNull(resultSelector, "resultSelector is null");
+        Objects.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(resultSelector, "resultSelector is null");
         return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), bufferSize());
     }
 
@@ -10166,8 +10166,8 @@ public final <U, V> Flowable<V> flatMapIterable(final Function<? super T, ? exte
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, V> Flowable<V> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper,
             final BiFunction<? super T, ? super U, ? extends V> resultSelector, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.requireNonNull(resultSelector, "resultSelector is null");
+        Objects.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(resultSelector, "resultSelector is null");
         return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), prefetch);
     }
 
@@ -10215,7 +10215,7 @@ public final <R> Flowable<R> flatMapMaybe(Function<? super T, ? extends MaybeSou
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> flatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapMaybe<T, R>(this, mapper, delayErrors, maxConcurrency));
     }
@@ -10264,7 +10264,7 @@ public final <R> Flowable<R> flatMapSingle(Function<? super T, ? extends SingleS
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> flatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapSingle<T, R>(this, mapper, delayErrors, maxConcurrency));
     }
@@ -10386,9 +10386,9 @@ public final Disposable forEachWhile(Predicate<? super T> onNext, Consumer<? sup
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable forEachWhile(final Predicate<? super T> onNext, final Consumer<? super Throwable> onError,
             final Action onComplete) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
 
         ForEachWhileSubscriber<T> s = new ForEachWhileSubscriber<T>(onNext, onError, onComplete);
         subscribe(s);
@@ -10706,8 +10706,8 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T,
     public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T, ? extends K> keySelector,
             Function<? super T, ? extends V> valueSelector,
             boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(valueSelector, "valueSelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(valueSelector, "valueSelector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
 
         return RxJavaPlugins.onAssembly(new FlowableGroupBy<T, K, V>(this, keySelector, valueSelector, bufferSize, delayError, null));
@@ -10828,10 +10828,10 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T,
             Function<? super T, ? extends V> valueSelector,
             boolean delayError, int bufferSize,
             Function<? super Consumer<Object>, ? extends Map<K, Object>> evictingMapFactory) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(valueSelector, "valueSelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(valueSelector, "valueSelector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(evictingMapFactory, "evictingMapFactory is null");
+        Objects.requireNonNull(evictingMapFactory, "evictingMapFactory is null");
 
         return RxJavaPlugins.onAssembly(new FlowableGroupBy<T, K, V>(this, keySelector, valueSelector, bufferSize, delayError, evictingMapFactory));
     }
@@ -10879,10 +10879,10 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> groupJoin(
             Function<? super T, ? extends Publisher<TLeftEnd>> leftEnd,
             Function<? super TRight, ? extends Publisher<TRightEnd>> rightEnd,
             BiFunction<? super T, ? super Flowable<TRight>, ? extends R> resultSelector) {
-        ObjectHelper.requireNonNull(other, "other is null");
-        ObjectHelper.requireNonNull(leftEnd, "leftEnd is null");
-        ObjectHelper.requireNonNull(rightEnd, "rightEnd is null");
-        ObjectHelper.requireNonNull(resultSelector, "resultSelector is null");
+        Objects.requireNonNull(other, "other is null");
+        Objects.requireNonNull(leftEnd, "leftEnd is null");
+        Objects.requireNonNull(rightEnd, "rightEnd is null");
+        Objects.requireNonNull(resultSelector, "resultSelector is null");
         return RxJavaPlugins.onAssembly(new FlowableGroupJoin<T, TRight, TLeftEnd, TRightEnd, R>(
                 this, other, leftEnd, rightEnd, resultSelector));
     }
@@ -11001,10 +11001,10 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
             Function<? super T, ? extends Publisher<TLeftEnd>> leftEnd,
             Function<? super TRight, ? extends Publisher<TRightEnd>> rightEnd,
             BiFunction<? super T, ? super TRight, ? extends R> resultSelector) {
-        ObjectHelper.requireNonNull(other, "other is null");
-        ObjectHelper.requireNonNull(leftEnd, "leftEnd is null");
-        ObjectHelper.requireNonNull(rightEnd, "rightEnd is null");
-        ObjectHelper.requireNonNull(resultSelector, "resultSelector is null");
+        Objects.requireNonNull(other, "other is null");
+        Objects.requireNonNull(leftEnd, "leftEnd is null");
+        Objects.requireNonNull(rightEnd, "rightEnd is null");
+        Objects.requireNonNull(resultSelector, "resultSelector is null");
         return RxJavaPlugins.onAssembly(new FlowableJoin<T, TRight, TLeftEnd, TRightEnd, R>(
                 this, other, leftEnd, rightEnd, resultSelector));
     }
@@ -11055,7 +11055,7 @@ public final Maybe<T> lastElement() {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> last(T defaultItem) {
-        ObjectHelper.requireNonNull(defaultItem, "defaultItem");
+        Objects.requireNonNull(defaultItem, "defaultItem");
         return RxJavaPlugins.onAssembly(new FlowableLastSingle<T>(this, defaultItem));
     }
 
@@ -11233,7 +11233,7 @@ public final Single<T> lastOrError() {
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> lift(FlowableOperator<? extends R, ? super T> lifter) {
-        ObjectHelper.requireNonNull(lifter, "lifter is null");
+        Objects.requireNonNull(lifter, "lifter is null");
         return RxJavaPlugins.onAssembly(new FlowableLift<R, T>(this, lifter));
     }
 
@@ -11262,7 +11262,7 @@ public final <R> Flowable<R> lift(FlowableOperator<? extends R, ? super T> lifte
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> map(Function<? super T, ? extends R> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableMap<T, R>(this, mapper));
     }
 
@@ -11316,7 +11316,7 @@ public final Flowable<Notification<T>> materialize() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> mergeWith(Publisher<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return merge(this, other);
     }
 
@@ -11344,7 +11344,7 @@ public final Flowable<T> mergeWith(Publisher<? extends T> other) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableMergeWithSingle<T>(this, other));
     }
 
@@ -11373,7 +11373,7 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableMergeWithMaybe<T>(this, other));
     }
 
@@ -11399,7 +11399,7 @@ public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableMergeWithCompletable<T>(this, other));
     }
 
@@ -11554,7 +11554,7 @@ public final Flowable<T> observeOn(Scheduler scheduler, boolean delayError) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> observeOn(Scheduler scheduler, boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableObserveOn<T>(this, scheduler, delayError, bufferSize));
     }
@@ -11582,7 +11582,7 @@ public final Flowable<T> observeOn(Scheduler scheduler, boolean delayError, int
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<U> ofType(final Class<U> clazz) {
-        ObjectHelper.requireNonNull(clazz, "clazz is null");
+        Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
 
@@ -11760,7 +11760,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError, boolean unbounded,
             Action onOverflow) {
-        ObjectHelper.requireNonNull(onOverflow, "onOverflow is null");
+        Objects.requireNonNull(onOverflow, "onOverflow is null");
         ObjectHelper.verifyPositive(capacity, "capacity");
         return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<T>(this, capacity, unbounded, delayError, onOverflow));
     }
@@ -11831,7 +11831,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, Action onOverflow) {
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> onBackpressureBuffer(long capacity, Action onOverflow, BackpressureOverflowStrategy overflowStrategy) {
-        ObjectHelper.requireNonNull(overflowStrategy, "overflowStrategy is null");
+        Objects.requireNonNull(overflowStrategy, "overflowStrategy is null");
         ObjectHelper.verifyPositive(capacity, "capacity");
         return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBufferStrategy<T>(this, capacity, onOverflow, overflowStrategy));
     }
@@ -11888,7 +11888,7 @@ public final Flowable<T> onBackpressureDrop() {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> onBackpressureDrop(Consumer<? super T> onDrop) {
-        ObjectHelper.requireNonNull(onDrop, "onDrop is null");
+        Objects.requireNonNull(onDrop, "onDrop is null");
         return RxJavaPlugins.onAssembly(new FlowableOnBackpressureDrop<T>(this, onDrop));
     }
 
@@ -11964,7 +11964,7 @@ public final Flowable<T> onBackpressureLatest() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> onErrorResumeNext(Function<? super Throwable, ? extends Publisher<? extends T>> resumeFunction) {
-        ObjectHelper.requireNonNull(resumeFunction, "resumeFunction is null");
+        Objects.requireNonNull(resumeFunction, "resumeFunction is null");
         return RxJavaPlugins.onAssembly(new FlowableOnErrorNext<T>(this, resumeFunction));
     }
 
@@ -12008,7 +12008,7 @@ public final Flowable<T> onErrorResumeNext(Function<? super Throwable, ? extends
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> onErrorResumeWith(final Publisher<? extends T> next) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         return onErrorResumeNext(Functions.justFunction(next));
     }
 
@@ -12048,7 +12048,7 @@ public final Flowable<T> onErrorResumeWith(final Publisher<? extends T> next) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> onErrorReturn(Function<? super Throwable, ? extends T> valueSupplier) {
-        ObjectHelper.requireNonNull(valueSupplier, "valueSupplier is null");
+        Objects.requireNonNull(valueSupplier, "valueSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableOnErrorReturn<T>(this, valueSupplier));
     }
 
@@ -12088,7 +12088,7 @@ public final Flowable<T> onErrorReturn(Function<? super Throwable, ? extends T>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> onErrorReturnItem(final T item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return onErrorReturn(Functions.justFunction(item));
     }
 
@@ -12297,7 +12297,7 @@ public final <R> Flowable<R> publish(Function<? super Flowable<T>, ? extends Pub
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> publish(Function<? super Flowable<T>, ? extends Publisher<? extends R>> selector, int prefetch) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowablePublishMulticast<T, R>(this, selector, prefetch, false));
     }
@@ -12392,7 +12392,7 @@ public final Flowable<T> rebatchRequests(int n) {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
-        ObjectHelper.requireNonNull(reducer, "reducer is null");
+        Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new FlowableReduceMaybe<T>(this, reducer));
     }
 
@@ -12454,8 +12454,8 @@ public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
-        ObjectHelper.requireNonNull(seed, "seed is null");
-        ObjectHelper.requireNonNull(reducer, "reducer is null");
+        Objects.requireNonNull(seed, "seed is null");
+        Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new FlowableReduceSeedSingle<T, R>(this, seed, reducer));
     }
 
@@ -12499,8 +12499,8 @@ public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> reduceWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> reducer) {
-        ObjectHelper.requireNonNull(seedSupplier, "seedSupplier is null");
-        ObjectHelper.requireNonNull(reducer, "reducer is null");
+        Objects.requireNonNull(seedSupplier, "seedSupplier is null");
+        Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new FlowableReduceWithSingle<T, R>(this, seedSupplier, reducer));
     }
 
@@ -12587,7 +12587,7 @@ public final Flowable<T> repeat(long times) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> repeatUntil(BooleanSupplier stop) {
-        ObjectHelper.requireNonNull(stop, "stop is null");
+        Objects.requireNonNull(stop, "stop is null");
         return RxJavaPlugins.onAssembly(new FlowableRepeatUntil<T>(this, stop));
     }
 
@@ -12618,7 +12618,7 @@ public final Flowable<T> repeatUntil(BooleanSupplier stop) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> repeatWhen(final Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
-        ObjectHelper.requireNonNull(handler, "handler is null");
+        Objects.requireNonNull(handler, "handler is null");
         return RxJavaPlugins.onAssembly(new FlowableRepeatWhen<T>(this, handler));
     }
 
@@ -12677,7 +12677,7 @@ public final ConnectableFlowable<T> replay() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this), selector);
     }
 
@@ -12717,7 +12717,7 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, false), selector);
     }
@@ -12760,7 +12760,7 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize, boolean eagerTruncate) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, eagerTruncate), selector);
     }
@@ -12852,10 +12852,10 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return FlowableReplay.multicastSelector(
                 FlowableInternalHelper.replaySupplier(this, bufferSize, time, unit, scheduler, false), selector);
     }
@@ -12907,10 +12907,10 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return FlowableReplay.multicastSelector(
                 FlowableInternalHelper.replaySupplier(this, bufferSize, time, unit, scheduler, eagerTruncate), selector);
     }
@@ -12988,9 +12988,9 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final long time, final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, time, unit, scheduler, false), selector);
     }
 
@@ -13033,9 +13033,9 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, time, unit, scheduler, eagerTruncate), selector);
     }
 
@@ -13194,8 +13194,8 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, TimeUnit u
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ConnectableFlowable<T> replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.create(this, time, unit, scheduler, bufferSize, false);
     }
@@ -13244,8 +13244,8 @@ public final ConnectableFlowable<T> replay(final int bufferSize, final long time
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ConnectableFlowable<T> replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.create(this, time, unit, scheduler, bufferSize, eagerTruncate);
     }
@@ -13318,8 +13318,8 @@ public final ConnectableFlowable<T> replay(long time, TimeUnit unit) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ConnectableFlowable<T> replay(final long time, final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return FlowableReplay.create(this, time, unit, scheduler, false);
     }
 
@@ -13359,8 +13359,8 @@ public final ConnectableFlowable<T> replay(final long time, final TimeUnit unit,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ConnectableFlowable<T> replay(final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return FlowableReplay.create(this, time, unit, scheduler, eagerTruncate);
     }
 
@@ -13420,7 +13420,7 @@ public final Flowable<T> retry() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> retry(BiPredicate<? super Integer, ? super Throwable> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
 
         return RxJavaPlugins.onAssembly(new FlowableRetryBiPredicate<T>(this, predicate));
     }
@@ -13481,7 +13481,7 @@ public final Flowable<T> retry(long times, Predicate<? super Throwable> predicat
         if (times < 0) {
             throw new IllegalArgumentException("times >= 0 required but it was " + times);
         }
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
 
         return RxJavaPlugins.onAssembly(new FlowableRetryPredicate<T>(this, times, predicate));
     }
@@ -13523,7 +13523,7 @@ public final Flowable<T> retry(Predicate<? super Throwable> predicate) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> retryUntil(final BooleanSupplier stop) {
-        ObjectHelper.requireNonNull(stop, "stop is null");
+        Objects.requireNonNull(stop, "stop is null");
         return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop));
     }
 
@@ -13610,7 +13610,7 @@ public final Flowable<T> retryUntil(final BooleanSupplier stop) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> retryWhen(
             final Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
-        ObjectHelper.requireNonNull(handler, "handler is null");
+        Objects.requireNonNull(handler, "handler is null");
 
         return RxJavaPlugins.onAssembly(new FlowableRetryWhen<T>(this, handler));
     }
@@ -13632,7 +13632,7 @@ public final Flowable<T> retryWhen(
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void safeSubscribe(Subscriber<? super T> s) {
-        ObjectHelper.requireNonNull(s, "s is null");
+        Objects.requireNonNull(s, "s is null");
         if (s instanceof SafeSubscriber) {
             subscribe((SafeSubscriber<? super T>)s);
         } else {
@@ -13733,8 +13733,8 @@ public final Flowable<T> sample(long period, TimeUnit unit, boolean emitLast) {
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> sample(long period, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableSampleTimed<T>(this, period, unit, scheduler, false));
     }
 
@@ -13774,8 +13774,8 @@ public final Flowable<T> sample(long period, TimeUnit unit, Scheduler scheduler)
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> sample(long period, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableSampleTimed<T>(this, period, unit, scheduler, emitLast));
     }
 
@@ -13806,7 +13806,7 @@ public final Flowable<T> sample(long period, TimeUnit unit, Scheduler scheduler,
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<T> sample(Publisher<U> sampler) {
-        ObjectHelper.requireNonNull(sampler, "sampler is null");
+        Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new FlowableSamplePublisher<T>(this, sampler, false));
     }
 
@@ -13844,7 +13844,7 @@ public final <U> Flowable<T> sample(Publisher<U> sampler) {
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<T> sample(Publisher<U> sampler, boolean emitLast) {
-        ObjectHelper.requireNonNull(sampler, "sampler is null");
+        Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new FlowableSamplePublisher<T>(this, sampler, emitLast));
     }
 
@@ -13877,7 +13877,7 @@ public final <U> Flowable<T> sample(Publisher<U> sampler, boolean emitLast) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> scan(BiFunction<T, T, T> accumulator) {
-        ObjectHelper.requireNonNull(accumulator, "accumulator is null");
+        Objects.requireNonNull(accumulator, "accumulator is null");
         return RxJavaPlugins.onAssembly(new FlowableScan<T>(this, accumulator));
     }
 
@@ -13931,7 +13931,7 @@ public final Flowable<T> scan(BiFunction<T, T, T> accumulator) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> scan(final R initialValue, BiFunction<R, ? super T, R> accumulator) {
-        ObjectHelper.requireNonNull(initialValue, "initialValue is null");
+        Objects.requireNonNull(initialValue, "initialValue is null");
         return scanWith(Functions.justSupplier(initialValue), accumulator);
     }
 
@@ -13971,8 +13971,8 @@ public final <R> Flowable<R> scan(final R initialValue, BiFunction<R, ? super T,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> scanWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> accumulator) {
-        ObjectHelper.requireNonNull(seedSupplier, "seedSupplier is null");
-        ObjectHelper.requireNonNull(accumulator, "accumulator is null");
+        Objects.requireNonNull(seedSupplier, "seedSupplier is null");
+        Objects.requireNonNull(accumulator, "accumulator is null");
         return RxJavaPlugins.onAssembly(new FlowableScanSeed<T, R>(this, seedSupplier, accumulator));
     }
 
@@ -14083,7 +14083,7 @@ public final Maybe<T> singleElement() {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> single(T defaultItem) {
-        ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new FlowableSingleSingle<T>(this, defaultItem));
     }
 
@@ -14405,8 +14405,8 @@ public final Flowable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler,
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         // the internal buffer holds pairs of (timestamp, value) so double the default buffer size
         int s = bufferSize << 1;
@@ -14439,7 +14439,7 @@ public final Flowable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<T> skipUntil(Publisher<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableSkipUntil<T, U>(this, other));
     }
 
@@ -14467,7 +14467,7 @@ public final <U> Flowable<T> skipUntil(Publisher<U> other) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> skipWhile(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new FlowableSkipWhile<T>(this, predicate));
     }
     /**
@@ -14523,7 +14523,7 @@ public final Flowable<T> sorted() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> sorted(Comparator<? super T> sortFunction) {
-        ObjectHelper.requireNonNull(sortFunction, "sortFunction");
+        Objects.requireNonNull(sortFunction, "sortFunction");
         return toList().toFlowable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.<List<T>>identity());
     }
 
@@ -14582,7 +14582,7 @@ public final Flowable<T> startWithIterable(Iterable<? extends T> items) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> startWith(Publisher<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return concatArray(other, this);
     }
 
@@ -14614,7 +14614,7 @@ public final Flowable<T> startWith(Publisher<? extends T> other) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> startWithItem(T item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return concatArray(just(item), this);
     }
 
@@ -14767,9 +14767,9 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError,
             Action onComplete) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
 
         LambdaSubscriber<T> ls = new LambdaSubscriber<T>(onNext, onError, onComplete, FlowableInternalHelper.RequestMax.INSTANCE);
 
@@ -14785,7 +14785,7 @@ public final void subscribe(Subscriber<? super T> s) {
         if (s instanceof FlowableSubscriber) {
             subscribe((FlowableSubscriber<? super T>)s);
         } else {
-            ObjectHelper.requireNonNull(s, "s is null");
+            Objects.requireNonNull(s, "s is null");
             subscribe(new StrictSubscriber<T>(s));
         }
     }
@@ -14830,11 +14830,11 @@ public final void subscribe(Subscriber<? super T> s) {
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void subscribe(FlowableSubscriber<? super T> s) {
-        ObjectHelper.requireNonNull(s, "s is null");
+        Objects.requireNonNull(s, "s is null");
         try {
             Subscriber<? super T> z = RxJavaPlugins.onSubscribe(this, s);
 
-            ObjectHelper.requireNonNull(z, "The RxJavaPlugins.onSubscribe hook returned a null FlowableSubscriber. Please check the handler provided to RxJavaPlugins.setOnFlowableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
+            Objects.requireNonNull(z, "The RxJavaPlugins.onSubscribe hook returned a null FlowableSubscriber. Please check the handler provided to RxJavaPlugins.setOnFlowableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
 
             subscribeActual(z);
         } catch (NullPointerException e) { // NOPMD
@@ -14926,7 +14926,7 @@ public final <E extends Subscriber<? super T>> E subscribeWith(E subscriber) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return subscribeOn(scheduler, !(this instanceof FlowableCreate));
     }
 
@@ -14964,7 +14964,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean requestOn) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableSubscribeOn<T>(this, scheduler, requestOn));
     }
 
@@ -14995,7 +14995,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> switchIfEmpty(Publisher<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchIfEmpty<T>(this, other));
     }
 
@@ -15111,7 +15111,7 @@ public final <R> Flowable<R> switchMap(Function<? super T, ? extends Publisher<?
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable switchMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletable<T>(this, mapper, false));
     }
 
@@ -15158,7 +15158,7 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable switchMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletable<T>(this, mapper, true));
     }
 
@@ -15237,7 +15237,7 @@ public final <R> Flowable<R> switchMapDelayError(Function<? super T, ? extends P
     }
 
     <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<? extends R>> mapper, int bufferSize, boolean delayError) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
             @SuppressWarnings("unchecked")
@@ -15287,7 +15287,7 @@ <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<? extends R>>
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe<T, R>(this, mapper, false));
     }
 
@@ -15318,7 +15318,7 @@ public final <R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? exten
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe<T, R>(this, mapper, true));
     }
 
@@ -15359,7 +15359,7 @@ public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle<T, R>(this, mapper, false));
     }
 
@@ -15390,7 +15390,7 @@ public final <R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? exte
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle<T, R>(this, mapper, true));
     }
 
@@ -15650,8 +15650,8 @@ public final Flowable<T> takeLast(long count, long time, TimeUnit unit, Schedule
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> takeLast(long count, long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (count < 0) {
             throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
@@ -15862,7 +15862,7 @@ public final Flowable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler,
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> takeUntil(Predicate<? super T> stopPredicate) {
-        ObjectHelper.requireNonNull(stopPredicate, "stopPredicate is null");
+        Objects.requireNonNull(stopPredicate, "stopPredicate is null");
         return RxJavaPlugins.onAssembly(new FlowableTakeUntilPredicate<T>(this, stopPredicate));
     }
 
@@ -15892,7 +15892,7 @@ public final Flowable<T> takeUntil(Predicate<? super T> stopPredicate) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<T> takeUntil(Publisher<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableTakeUntil<T, U>(this, other));
     }
 
@@ -15921,7 +15921,7 @@ public final <U> Flowable<T> takeUntil(Publisher<U> other) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> takeWhile(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new FlowableTakeWhile<T>(this, predicate));
     }
 
@@ -15986,8 +15986,8 @@ public final Flowable<T> throttleFirst(long windowDuration, TimeUnit unit) {
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> throttleFirst(long skipDuration, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableThrottleFirstTimed<T>(this, skipDuration, unit, scheduler));
     }
 
@@ -16206,8 +16206,8 @@ public final Flowable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler s
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableThrottleLatest<T>(this, timeout, unit, scheduler, emitLast));
     }
 
@@ -16383,8 +16383,8 @@ public final Flowable<Timed<T>> timeInterval(TimeUnit unit) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
     public final Flowable<Timed<T>> timeInterval(TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableTimeInterval<T>(this, unit, scheduler));
     }
 
@@ -16460,7 +16460,7 @@ public final <V> Flowable<T> timeout(Function<? super T, ? extends Publisher<V>>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <V> Flowable<T> timeout(Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator, Flowable<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(null, itemTimeoutIndicator, other);
     }
 
@@ -16523,7 +16523,7 @@ public final Flowable<T> timeout(long timeout, TimeUnit timeUnit) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Publisher<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, timeUnit, other, Schedulers.computation());
     }
 
@@ -16561,7 +16561,7 @@ public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Publisher<? ex
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler, Publisher<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, timeUnit, other, scheduler);
     }
 
@@ -16634,7 +16634,7 @@ public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler sche
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, V> Flowable<T> timeout(Publisher<U> firstTimeoutIndicator,
             Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator) {
-        ObjectHelper.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
+        Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, null);
     }
 
@@ -16682,15 +16682,15 @@ public final <U, V> Flowable<T> timeout(
             Publisher<U> firstTimeoutIndicator,
             Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
                     Publisher<? extends T> other) {
-        ObjectHelper.requireNonNull(firstTimeoutIndicator, "firstTimeoutSelector is null");
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutSelector is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other);
     }
 
     private Flowable<T> timeout0(long timeout, TimeUnit timeUnit, Publisher<? extends T> other,
             Scheduler scheduler) {
-        ObjectHelper.requireNonNull(timeUnit, "timeUnit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(timeUnit, "timeUnit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableTimeoutTimed<T>(this, timeout, timeUnit, scheduler, other));
     }
 
@@ -16698,7 +16698,7 @@ private <U, V> Flowable<T> timeout0(
             Publisher<U> firstTimeoutIndicator,
             Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
                     Publisher<? extends T> other) {
-        ObjectHelper.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
+        Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
         return RxJavaPlugins.onAssembly(new FlowableTimeout<T, U, V>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
     }
 
@@ -16804,8 +16804,8 @@ public final Flowable<Timed<T>> timestamp(TimeUnit unit) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
     public final Flowable<Timed<T>> timestamp(final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return map(Functions.<T>timestampWith(unit, scheduler));
     }
 
@@ -16830,7 +16830,7 @@ public final Flowable<Timed<T>> timestamp(final TimeUnit unit, final Scheduler s
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
-        return ObjectHelper.requireNonNull(converter, "converter is null").apply(this);
+        return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
 
     /**
@@ -16938,7 +16938,7 @@ public final Single<List<T>> toList(final int capacityHint) {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U extends Collection<? super T>> Single<U> toList(Supplier<U> collectionSupplier) {
-        ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null");
+        Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableToListSingle<T, U>(this, collectionSupplier));
     }
 
@@ -16973,7 +16973,7 @@ public final <U extends Collection<? super T>> Single<U> toList(Supplier<U> coll
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K> Single<Map<K, T>> toMap(final Function<? super T, ? extends K> keySelector) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
         return collect(HashMapSupplier.<K, T>asSupplier(), Functions.toMapKeySelector(keySelector));
     }
 
@@ -17012,8 +17012,8 @@ public final <K> Single<Map<K, T>> toMap(final Function<? super T, ? extends K>
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K, V> Single<Map<K, V>> toMap(final Function<? super T, ? extends K> keySelector, final Function<? super T, ? extends V> valueSelector) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(valueSelector, "valueSelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(valueSelector, "valueSelector is null");
         return collect(HashMapSupplier.<K, V>asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector));
     }
 
@@ -17053,8 +17053,8 @@ public final <K, V> Single<Map<K, V>> toMap(final Function<? super T, ? extends
     public final <K, V> Single<Map<K, V>> toMap(final Function<? super T, ? extends K> keySelector,
             final Function<? super T, ? extends V> valueSelector,
             final Supplier<? extends Map<K, V>> mapSupplier) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(valueSelector, "valueSelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(valueSelector, "valueSelector is null");
         return collect(mapSupplier, Functions.toMapKeyValueSelector(keySelector, valueSelector));
     }
 
@@ -17169,10 +17169,10 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
             final Function<? super T, ? extends V> valueSelector,
             final Supplier<? extends Map<K, Collection<V>>> mapSupplier,
             final Function<? super K, ? extends Collection<? super V>> collectionFactory) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(valueSelector, "valueSelector is null");
-        ObjectHelper.requireNonNull(mapSupplier, "mapSupplier is null");
-        ObjectHelper.requireNonNull(collectionFactory, "collectionFactory is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(valueSelector, "valueSelector is null");
+        Objects.requireNonNull(mapSupplier, "mapSupplier is null");
+        Objects.requireNonNull(collectionFactory, "collectionFactory is null");
         return collect(mapSupplier, Functions.toMultimapKeyValueSelector(keySelector, valueSelector, collectionFactory));
     }
 
@@ -17297,7 +17297,7 @@ public final Single<List<T>> toSortedList() {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<List<T>> toSortedList(final Comparator<? super T> comparator) {
-        ObjectHelper.requireNonNull(comparator, "comparator is null");
+        Objects.requireNonNull(comparator, "comparator is null");
         return toList().map(Functions.listSorter(comparator));
     }
 
@@ -17333,7 +17333,7 @@ public final Single<List<T>> toSortedList(final Comparator<? super T> comparator
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<List<T>> toSortedList(final Comparator<? super T> comparator, int capacityHint) {
-        ObjectHelper.requireNonNull(comparator, "comparator is null");
+        Objects.requireNonNull(comparator, "comparator is null");
         return toList(capacityHint).map(Functions.listSorter(comparator));
     }
 
@@ -17395,7 +17395,7 @@ public final Single<List<T>> toSortedList(int capacityHint) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> unsubscribeOn(Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableUnsubscribeOn<T>(this, scheduler));
     }
 
@@ -17638,8 +17638,8 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, TimeUnit
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         ObjectHelper.verifyPositive(timespan, "timespan");
         ObjectHelper.verifyPositive(timeskip, "timeskip");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
         return RxJavaPlugins.onAssembly(new FlowableWindowTimed<T>(this, timespan, timeskip, unit, scheduler, Long.MAX_VALUE, bufferSize, false));
     }
 
@@ -17952,8 +17952,8 @@ public final Flowable<Flowable<T>> window(
             long timespan, TimeUnit unit, Scheduler scheduler,
             long count, boolean restart, int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(count, "count");
         return RxJavaPlugins.onAssembly(new FlowableWindowTimed<T>(this, timespan, timespan, unit, scheduler, count, bufferSize, restart));
     }
@@ -18028,7 +18028,7 @@ public final <B> Flowable<Flowable<T>> window(Publisher<B> boundaryIndicator) {
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <B> Flowable<Flowable<T>> window(Publisher<B> boundaryIndicator, int bufferSize) {
-        ObjectHelper.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
+        Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableWindowBoundary<T, B>(this, boundaryIndicator, bufferSize));
     }
@@ -18117,8 +18117,8 @@ public final <U, V> Flowable<Flowable<T>> window(
     public final <U, V> Flowable<Flowable<T>> window(
             Publisher<U> openingIndicator,
             Function<? super U, ? extends Publisher<V>> closingIndicator, int bufferSize) {
-        ObjectHelper.requireNonNull(openingIndicator, "openingIndicator is null");
-        ObjectHelper.requireNonNull(closingIndicator, "closingIndicator is null");
+        Objects.requireNonNull(openingIndicator, "openingIndicator is null");
+        Objects.requireNonNull(closingIndicator, "closingIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableWindowBoundarySelector<T, U, V>(this, openingIndicator, closingIndicator, bufferSize));
     }
@@ -18157,8 +18157,8 @@ public final <U, V> Flowable<Flowable<T>> window(
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Flowable<R> withLatestFrom(Publisher<? extends U> other,
             BiFunction<? super T, ? super U, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(other, "other is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(other, "other is null");
+        Objects.requireNonNull(combiner, "combiner is null");
 
         return RxJavaPlugins.onAssembly(new FlowableWithLatestFrom<T, U, R>(this, combiner, other));
     }
@@ -18195,8 +18195,8 @@ public final <U, R> Flowable<R> withLatestFrom(Publisher<? extends U> other,
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T1, T2, R> Flowable<R> withLatestFrom(Publisher<T1> source1, Publisher<T2> source2,
             Function3<? super T, ? super T1, ? super T2, R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
         return withLatestFrom(new Publisher[] { source1, source2 }, f);
     }
@@ -18237,9 +18237,9 @@ public final <T1, T2, T3, R> Flowable<R> withLatestFrom(
             Publisher<T1> source1, Publisher<T2> source2,
             Publisher<T3> source3,
             Function4<? super T, ? super T1, ? super T2, ? super T3, R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
         return withLatestFrom(new Publisher[] { source1, source2, source3 }, f);
     }
@@ -18282,10 +18282,10 @@ public final <T1, T2, T3, T4, R> Flowable<R> withLatestFrom(
             Publisher<T1> source1, Publisher<T2> source2,
             Publisher<T3> source3, Publisher<T4> source4,
             Function5<? super T, ? super T1, ? super T2, ? super T3, ? super T4, R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
         return withLatestFrom(new Publisher[] { source1, source2, source3, source4 }, f);
     }
@@ -18318,8 +18318,8 @@ public final <T1, T2, T3, T4, R> Flowable<R> withLatestFrom(
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> withLatestFrom(Publisher<?>[] others, Function<? super Object[], R> combiner) {
-        ObjectHelper.requireNonNull(others, "others is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(others, "others is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany<T, R>(this, others, combiner));
     }
 
@@ -18351,8 +18351,8 @@ public final <R> Flowable<R> withLatestFrom(Publisher<?>[] others, Function<? su
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> withLatestFrom(Iterable<? extends Publisher<?>> others, Function<? super Object[], R> combiner) {
-        ObjectHelper.requireNonNull(others, "others is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(others, "others is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany<T, R>(this, others, combiner));
     }
 
@@ -18391,8 +18391,8 @@ public final <R> Flowable<R> withLatestFrom(Iterable<? extends Publisher<?>> oth
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Flowable<R> zipWith(Iterable<U> other,  BiFunction<? super T, ? super U, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(other, "other is null");
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(other, "other is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return RxJavaPlugins.onAssembly(new FlowableZipIterable<T, U, R>(this, other, zipper));
     }
 
@@ -18440,7 +18440,7 @@ public final <U, R> Flowable<R> zipWith(Iterable<U> other,  BiFunction<? super T
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Flowable<R> zipWith(Publisher<? extends U> other, BiFunction<? super T, ? super U, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
     }
 
@@ -18653,7 +18653,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T> Flowable<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
-        ObjectHelper.requireNonNull(optional, "optional is null");
+        Objects.requireNonNull(optional, "optional is null");
         return optional.map(Flowable::just).orElseGet(Flowable::empty);
     }
 
@@ -18690,7 +18690,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T> Flowable<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
-        ObjectHelper.requireNonNull(stage, "stage is null");
+        Objects.requireNonNull(stage, "stage is null");
         return RxJavaPlugins.onAssembly(new FlowableFromCompletionStage<>(stage));
     }
 
@@ -18736,7 +18736,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T> Flowable<@NonNull T> fromStream(@NonNull Stream<T> stream) {
-        ObjectHelper.requireNonNull(stream, "stream is null");
+        Objects.requireNonNull(stream, "stream is null");
         return RxJavaPlugins.onAssembly(new FlowableFromStream<>(stream));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 9bcf753e85..e3f4641ad3 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.core;
 
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.concurrent.*;
 
 import org.reactivestreams.*;
@@ -127,7 +128,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> amb(final Iterable<? extends MaybeSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeAmb<T>(null, sources));
     }
 
@@ -178,7 +179,7 @@ public static <T> Maybe<T> ambArray(final MaybeSource<? extends T>... sources) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concat(Iterable<? extends MaybeSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeConcatIterable<T>(sources));
     }
 
@@ -207,8 +208,8 @@ public static <T> Flowable<T> concat(Iterable<? extends MaybeSource<? extends T>
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     public static <T> Flowable<T> concat(MaybeSource<? extends T> source1, MaybeSource<? extends T> source2) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
     }
 
@@ -240,9 +241,9 @@ public static <T> Flowable<T> concat(MaybeSource<? extends T> source1, MaybeSour
     @SuppressWarnings("unchecked")
     public static <T> Flowable<T> concat(
             MaybeSource<? extends T> source1, MaybeSource<? extends T> source2, MaybeSource<? extends T> source3) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return concatArray(source1, source2, source3);
     }
 
@@ -276,10 +277,10 @@ public static <T> Flowable<T> concat(
     @SuppressWarnings("unchecked")
     public static <T> Flowable<T> concat(
             MaybeSource<? extends T> source1, MaybeSource<? extends T> source2, MaybeSource<? extends T> source3, MaybeSource<? extends T> source4) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return concatArray(source1, source2, source3, source4);
     }
 
@@ -331,7 +332,7 @@ public static <T> Flowable<T> concat(Publisher<? extends MaybeSource<? extends T
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> concat(Publisher<? extends MaybeSource<? extends T>> sources, int prefetch) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, MaybeToPublisher.instance(), prefetch, ErrorMode.IMMEDIATE));
     }
@@ -356,7 +357,7 @@ public static <T> Flowable<T> concat(Publisher<? extends MaybeSource<? extends T
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     public static <T> Flowable<T> concatArray(MaybeSource<? extends T>... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return Flowable.empty();
         }
@@ -444,7 +445,7 @@ public static <T> Flowable<T> concatArrayEager(MaybeSource<? extends T>... sourc
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concatDelayError(Iterable<? extends MaybeSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return Flowable.fromIterable(sources).concatMapDelayError((Function)MaybeToPublisher.instance());
     }
 
@@ -574,7 +575,7 @@ public static <T> Flowable<T> concatEager(Publisher<? extends MaybeSource<? exte
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> create(MaybeOnSubscribe<T> onSubscribe) {
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         return RxJavaPlugins.onAssembly(new MaybeCreate<T>(onSubscribe));
     }
 
@@ -594,7 +595,7 @@ public static <T> Maybe<T> create(MaybeOnSubscribe<T> onSubscribe) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> defer(final Supplier<? extends MaybeSource<? extends T>> maybeSupplier) {
-        ObjectHelper.requireNonNull(maybeSupplier, "maybeSupplier is null");
+        Objects.requireNonNull(maybeSupplier, "maybeSupplier is null");
         return RxJavaPlugins.onAssembly(new MaybeDefer<T>(maybeSupplier));
     }
 
@@ -639,7 +640,7 @@ public static <T> Maybe<T> empty() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> error(Throwable exception) {
-        ObjectHelper.requireNonNull(exception, "exception is null");
+        Objects.requireNonNull(exception, "exception is null");
         return RxJavaPlugins.onAssembly(new MaybeError<T>(exception));
     }
 
@@ -665,7 +666,7 @@ public static <T> Maybe<T> error(Throwable exception) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> error(Supplier<? extends Throwable> supplier) {
-        ObjectHelper.requireNonNull(supplier, "errorSupplier is null");
+        Objects.requireNonNull(supplier, "errorSupplier is null");
         return RxJavaPlugins.onAssembly(new MaybeErrorCallable<T>(supplier));
     }
 
@@ -692,7 +693,7 @@ public static <T> Maybe<T> error(Supplier<? extends Throwable> supplier) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromAction(final Action run) {
-        ObjectHelper.requireNonNull(run, "run is null");
+        Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new MaybeFromAction<T>(run));
     }
 
@@ -712,7 +713,7 @@ public static <T> Maybe<T> fromAction(final Action run) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromCompletable(CompletableSource completableSource) {
-        ObjectHelper.requireNonNull(completableSource, "completableSource is null");
+        Objects.requireNonNull(completableSource, "completableSource is null");
         return RxJavaPlugins.onAssembly(new MaybeFromCompletable<T>(completableSource));
     }
 
@@ -732,7 +733,7 @@ public static <T> Maybe<T> fromCompletable(CompletableSource completableSource)
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromSingle(SingleSource<T> singleSource) {
-        ObjectHelper.requireNonNull(singleSource, "singleSource is null");
+        Objects.requireNonNull(singleSource, "singleSource is null");
         return RxJavaPlugins.onAssembly(new MaybeFromSingle<T>(singleSource));
     }
 
@@ -776,7 +777,7 @@ public static <T> Maybe<T> fromSingle(SingleSource<T> singleSource) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromCallable(@NonNull final Callable<? extends T> callable) {
-        ObjectHelper.requireNonNull(callable, "callable is null");
+        Objects.requireNonNull(callable, "callable is null");
         return RxJavaPlugins.onAssembly(new MaybeFromCallable<T>(callable));
     }
 
@@ -810,7 +811,7 @@ public static <T> Maybe<T> fromCallable(@NonNull final Callable<? extends T> cal
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromFuture(Future<? extends T> future) {
-        ObjectHelper.requireNonNull(future, "future is null");
+        Objects.requireNonNull(future, "future is null");
         return RxJavaPlugins.onAssembly(new MaybeFromFuture<T>(future, 0L, null));
     }
 
@@ -848,8 +849,8 @@ public static <T> Maybe<T> fromFuture(Future<? extends T> future) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit) {
-        ObjectHelper.requireNonNull(future, "future is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(future, "future is null");
+        Objects.requireNonNull(unit, "unit is null");
         return RxJavaPlugins.onAssembly(new MaybeFromFuture<T>(future, timeout, unit));
     }
 
@@ -869,7 +870,7 @@ public static <T> Maybe<T> fromFuture(Future<? extends T> future, long timeout,
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromRunnable(final Runnable run) {
-        ObjectHelper.requireNonNull(run, "run is null");
+        Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new MaybeFromRunnable<T>(run));
     }
 
@@ -916,7 +917,7 @@ public static <T> Maybe<T> fromRunnable(final Runnable run) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromSupplier(@NonNull final Supplier<? extends T> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new MaybeFromSupplier<T>(supplier));
     }
 
@@ -943,7 +944,7 @@ public static <T> Maybe<T> fromSupplier(@NonNull final Supplier<? extends T> sup
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> just(T item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return RxJavaPlugins.onAssembly(new MaybeJust<T>(item));
     }
 
@@ -1049,7 +1050,7 @@ public static <T> Flowable<T> merge(Publisher<? extends MaybeSource<? extends T>
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> merge(Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
-        ObjectHelper.requireNonNull(sources, "source is null");
+        Objects.requireNonNull(sources, "source is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), false, maxConcurrency, 1));
     }
@@ -1082,7 +1083,7 @@ public static <T> Flowable<T> merge(Publisher<? extends MaybeSource<? extends T>
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Maybe<T> merge(MaybeSource<? extends MaybeSource<? extends T>> source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatten(source, Functions.identity()));
     }
 
@@ -1130,8 +1131,8 @@ public static <T> Maybe<T> merge(MaybeSource<? extends MaybeSource<? extends T>>
     public static <T> Flowable<T> merge(
             MaybeSource<? extends T> source1, MaybeSource<? extends T> source2
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return mergeArray(source1, source2);
     }
 
@@ -1182,9 +1183,9 @@ public static <T> Flowable<T> merge(
             MaybeSource<? extends T> source1, MaybeSource<? extends T> source2,
             MaybeSource<? extends T> source3
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return mergeArray(source1, source2, source3);
     }
 
@@ -1237,10 +1238,10 @@ public static <T> Flowable<T> merge(
             MaybeSource<? extends T> source1, MaybeSource<? extends T> source2,
             MaybeSource<? extends T> source3, MaybeSource<? extends T> source4
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return mergeArray(source1, source2, source3, source4);
     }
 
@@ -1277,7 +1278,7 @@ public static <T> Flowable<T> merge(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return Flowable.empty();
         }
@@ -1431,7 +1432,7 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends MaybeSource<?
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
-        ObjectHelper.requireNonNull(sources, "source is null");
+        Objects.requireNonNull(sources, "source is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), true, maxConcurrency, 1));
     }
@@ -1470,8 +1471,8 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends MaybeSource<?
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(MaybeSource<? extends T> source1, MaybeSource<? extends T> source2) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return mergeArrayDelayError(source1, source2);
     }
 
@@ -1513,9 +1514,9 @@ public static <T> Flowable<T> mergeDelayError(MaybeSource<? extends T> source1,
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(MaybeSource<? extends T> source1,
             MaybeSource<? extends T> source2, MaybeSource<? extends T> source3) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return mergeArrayDelayError(source1, source2, source3);
     }
 
@@ -1560,10 +1561,10 @@ public static <T> Flowable<T> mergeDelayError(MaybeSource<? extends T> source1,
     public static <T> Flowable<T> mergeDelayError(
             MaybeSource<? extends T> source1, MaybeSource<? extends T> source2,
             MaybeSource<? extends T> source3, MaybeSource<? extends T> source4) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return mergeArrayDelayError(source1, source2, source3, source4);
     }
 
@@ -1643,9 +1644,9 @@ public static <T> Single<Boolean> sequenceEqual(MaybeSource<? extends T> source1
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<Boolean> sequenceEqual(MaybeSource<? extends T> source1, MaybeSource<? extends T> source2,
             BiPredicate<? super T, ? super T> isEqual) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(isEqual, "isEqual is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(isEqual, "isEqual is null");
         return RxJavaPlugins.onAssembly(new MaybeEqualSingle<T>(source1, source2, isEqual));
     }
 
@@ -1693,8 +1694,8 @@ public static Maybe<Long> timer(long delay, TimeUnit unit) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static Maybe<Long> timer(long delay, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new MaybeTimer(Math.max(0L, delay), unit, scheduler));
     }
@@ -1717,7 +1718,7 @@ public static <T> Maybe<T> unsafeCreate(MaybeSource<T> onSubscribe) {
         if (onSubscribe instanceof Maybe) {
             throw new IllegalArgumentException("unsafeCreate(Maybe) should be upgraded");
         }
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         return RxJavaPlugins.onAssembly(new MaybeUnsafeCreate<T>(onSubscribe));
     }
 
@@ -1785,9 +1786,9 @@ public static <T, D> Maybe<T> using(Supplier<? extends D> resourceSupplier,
     public static <T, D> Maybe<T> using(Supplier<? extends D> resourceSupplier,
             Function<? super D, ? extends MaybeSource<? extends T>> sourceSupplier,
                     Consumer<? super D> resourceDisposer, boolean eager) {
-        ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null");
-        ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null");
-        ObjectHelper.requireNonNull(resourceDisposer, "disposer is null");
+        Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
+        Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
+        Objects.requireNonNull(resourceDisposer, "disposer is null");
         return RxJavaPlugins.onAssembly(new MaybeUsing<T, D>(resourceSupplier, sourceSupplier, resourceDisposer, eager));
     }
 
@@ -1809,7 +1810,7 @@ public static <T> Maybe<T> wrap(MaybeSource<T> source) {
         if (source instanceof Maybe) {
             return RxJavaPlugins.onAssembly((Maybe<T>)source);
         }
-        ObjectHelper.requireNonNull(source, "onSubscribe is null");
+        Objects.requireNonNull(source, "onSubscribe is null");
         return RxJavaPlugins.onAssembly(new MaybeUnsafeCreate<T>(source));
     }
 
@@ -1844,8 +1845,8 @@ public static <T> Maybe<T> wrap(MaybeSource<T> source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Maybe<R> zip(Iterable<? extends MaybeSource<? extends T>> sources, Function<? super Object[], ? extends R> zipper) {
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeZipIterable<T, R>(sources, zipper));
     }
 
@@ -1882,8 +1883,8 @@ public static <T, R> Maybe<R> zip(Iterable<? extends MaybeSource<? extends T>> s
     public static <T1, T2, R> Maybe<R> zip(
             MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2);
     }
 
@@ -1923,9 +1924,9 @@ public static <T1, T2, R> Maybe<R> zip(
     public static <T1, T2, T3, R> Maybe<R> zip(
             MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
             Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3);
     }
 
@@ -1969,10 +1970,10 @@ public static <T1, T2, T3, T4, R> Maybe<R> zip(
             MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
             MaybeSource<? extends T4> source4,
             Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4);
     }
 
@@ -2019,11 +2020,11 @@ public static <T1, T2, T3, T4, T5, R> Maybe<R> zip(
             MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
             MaybeSource<? extends T4> source4, MaybeSource<? extends T5> source5,
             Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5);
     }
 
@@ -2073,12 +2074,12 @@ public static <T1, T2, T3, T4, T5, T6, R> Maybe<R> zip(
             MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
             MaybeSource<? extends T4> source4, MaybeSource<? extends T5> source5, MaybeSource<? extends T6> source6,
             Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6);
     }
 
@@ -2132,13 +2133,13 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Maybe<R> zip(
             MaybeSource<? extends T4> source4, MaybeSource<? extends T5> source5, MaybeSource<? extends T6> source6,
             MaybeSource<? extends T7> source7,
             Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7);
     }
 
@@ -2195,14 +2196,14 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Maybe<R> zip(
             MaybeSource<? extends T4> source4, MaybeSource<? extends T5> source5, MaybeSource<? extends T6> source6,
             MaybeSource<? extends T7> source7, MaybeSource<? extends T8> source8,
             Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8);
     }
 
@@ -2262,15 +2263,15 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
             MaybeSource<? extends T7> source7, MaybeSource<? extends T8> source8, MaybeSource<? extends T9> source9,
             Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
 
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
-        ObjectHelper.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source9, "source9 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8, source9);
     }
 
@@ -2306,11 +2307,11 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Maybe<R> zipArray(Function<? super Object[], ? extends R> zipper,
             MaybeSource<? extends T>... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         }
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return RxJavaPlugins.onAssembly(new MaybeZipArray<T, R>(sources, zipper));
     }
 
@@ -2339,7 +2340,7 @@ public static <T, R> Maybe<R> zipArray(Function<? super Object[], ? extends R> z
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> ambWith(MaybeSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
 
@@ -2381,7 +2382,7 @@ public final T blockingGet() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final T blockingGet(T defaultValue) {
-        ObjectHelper.requireNonNull(defaultValue, "defaultValue is null");
+        Objects.requireNonNull(defaultValue, "defaultValue is null");
         BlockingMultiObserver<T> observer = new BlockingMultiObserver<T>();
         subscribe(observer);
         return observer.blockingGet(defaultValue);
@@ -2429,7 +2430,7 @@ public final Maybe<T> cache() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Maybe<U> cast(final Class<? extends U> clazz) {
-        ObjectHelper.requireNonNull(clazz, "clazz is null");
+        Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
 
@@ -2455,7 +2456,7 @@ public final <U> Maybe<U> cast(final Class<? extends U> clazz) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> compose(MaybeTransformer<? super T, ? extends R> transformer) {
-        return wrap(((MaybeTransformer<T, R>) ObjectHelper.requireNonNull(transformer, "transformer is null")).apply(this));
+        return wrap(((MaybeTransformer<T, R>) Objects.requireNonNull(transformer, "transformer is null")).apply(this));
     }
 
     /**
@@ -2478,7 +2479,7 @@ public final <R> Maybe<R> compose(MaybeTransformer<? super T, ? extends R> trans
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> concatMap(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatten<T, R>(this, mapper));
     }
 
@@ -2505,7 +2506,7 @@ public final <R> Maybe<R> concatMap(Function<? super T, ? extends MaybeSource<?
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> concatWith(MaybeSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return concat(this, other);
     }
 
@@ -2529,7 +2530,7 @@ public final Flowable<T> concatWith(MaybeSource<? extends T> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> contains(final Object item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return RxJavaPlugins.onAssembly(new MaybeContains<T>(this, item));
     }
 
@@ -2573,7 +2574,7 @@ public final Single<Long> count() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> defaultIfEmpty(T defaultItem) {
-        ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new MaybeToSingle<T>(this, defaultItem));
     }
 
@@ -2624,8 +2625,8 @@ public final Maybe<T> delay(long delay, TimeUnit unit) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Maybe<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new MaybeDelay<T>(this, Math.max(0L, delay), unit, scheduler));
     }
 
@@ -2656,7 +2657,7 @@ public final Maybe<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     public final <U, V> Maybe<T> delay(Publisher<U> delayIndicator) {
-        ObjectHelper.requireNonNull(delayIndicator, "delayIndicator is null");
+        Objects.requireNonNull(delayIndicator, "delayIndicator is null");
         return RxJavaPlugins.onAssembly(new MaybeDelayOtherPublisher<T, U>(this, delayIndicator));
     }
 
@@ -2683,7 +2684,7 @@ public final <U, V> Maybe<T> delay(Publisher<U> delayIndicator) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Maybe<T> delaySubscription(Publisher<U> subscriptionIndicator) {
-        ObjectHelper.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
+        Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
         return RxJavaPlugins.onAssembly(new MaybeDelaySubscriptionOtherPublisher<T, U>(this, subscriptionIndicator));
     }
 
@@ -2753,7 +2754,7 @@ public final Maybe<T> delaySubscription(long delay, TimeUnit unit, Scheduler sch
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> doAfterSuccess(Consumer<? super T> onAfterSuccess) {
-        ObjectHelper.requireNonNull(onAfterSuccess, "onAfterSuccess is null");
+        Objects.requireNonNull(onAfterSuccess, "onAfterSuccess is null");
         return RxJavaPlugins.onAssembly(new MaybeDoAfterSuccess<T>(this, onAfterSuccess));
     }
 
@@ -2783,7 +2784,7 @@ public final Maybe<T> doAfterTerminate(Action onAfterTerminate) {
                 Functions.emptyConsumer(), // onSuccess
                 Functions.emptyConsumer(), // onError
                 Functions.EMPTY_ACTION,    // onComplete
-                ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null"),
+                Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null"),
                 Functions.EMPTY_ACTION     // dispose
         ));
     }
@@ -2808,7 +2809,7 @@ public final Maybe<T> doAfterTerminate(Action onAfterTerminate) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> doFinally(Action onFinally) {
-        ObjectHelper.requireNonNull(onFinally, "onFinally is null");
+        Objects.requireNonNull(onFinally, "onFinally is null");
         return RxJavaPlugins.onAssembly(new MaybeDoFinally<T>(this, onFinally));
     }
 
@@ -2833,7 +2834,7 @@ public final Maybe<T> doOnDispose(Action onDispose) {
                 Functions.emptyConsumer(), // onError
                 Functions.EMPTY_ACTION,    // onComplete
                 Functions.EMPTY_ACTION,    // (onSuccess | onError | onComplete) after
-                ObjectHelper.requireNonNull(onDispose, "onDispose is null")
+                Objects.requireNonNull(onDispose, "onDispose is null")
         ));
     }
 
@@ -2859,7 +2860,7 @@ public final Maybe<T> doOnComplete(Action onComplete) {
                 Functions.emptyConsumer(), // onSubscribe
                 Functions.emptyConsumer(), // onSuccess
                 Functions.emptyConsumer(), // onError
-                ObjectHelper.requireNonNull(onComplete, "onComplete is null"),
+                Objects.requireNonNull(onComplete, "onComplete is null"),
                 Functions.EMPTY_ACTION,    // (onSuccess | onError | onComplete)
                 Functions.EMPTY_ACTION     // dispose
         ));
@@ -2884,7 +2885,7 @@ public final Maybe<T> doOnError(Consumer<? super Throwable> onError) {
         return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
                 Functions.emptyConsumer(), // onSubscribe
                 Functions.emptyConsumer(), // onSuccess
-                ObjectHelper.requireNonNull(onError, "onError is null"),
+                Objects.requireNonNull(onError, "onError is null"),
                 Functions.EMPTY_ACTION,    // onComplete
                 Functions.EMPTY_ACTION,    // (onSuccess | onError | onComplete)
                 Functions.EMPTY_ACTION     // dispose
@@ -2910,7 +2911,7 @@ public final Maybe<T> doOnError(Consumer<? super Throwable> onError) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> doOnEvent(BiConsumer<? super T, ? super Throwable> onEvent) {
-        ObjectHelper.requireNonNull(onEvent, "onEvent is null");
+        Objects.requireNonNull(onEvent, "onEvent is null");
         return RxJavaPlugins.onAssembly(new MaybeDoOnEvent<T>(this, onEvent));
     }
 
@@ -2929,7 +2930,7 @@ public final Maybe<T> doOnEvent(BiConsumer<? super T, ? super Throwable> onEvent
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> doOnSubscribe(Consumer<? super Disposable> onSubscribe) {
         return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
-                ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null"),
+                Objects.requireNonNull(onSubscribe, "onSubscribe is null"),
                 Functions.emptyConsumer(), // onSuccess
                 Functions.emptyConsumer(), // onError
                 Functions.EMPTY_ACTION,    // onComplete
@@ -2961,7 +2962,7 @@ public final Maybe<T> doOnSubscribe(Consumer<? super Disposable> onSubscribe) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> doOnTerminate(final Action onTerminate) {
-        ObjectHelper.requireNonNull(onTerminate, "onTerminate is null");
+        Objects.requireNonNull(onTerminate, "onTerminate is null");
         return RxJavaPlugins.onAssembly(new MaybeDoOnTerminate<T>(this, onTerminate));
     }
 
@@ -2983,7 +2984,7 @@ public final Maybe<T> doOnTerminate(final Action onTerminate) {
     public final Maybe<T> doOnSuccess(Consumer<? super T> onSuccess) {
         return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
                 Functions.emptyConsumer(), // onSubscribe
-                ObjectHelper.requireNonNull(onSuccess, "onSuccess is null"),
+                Objects.requireNonNull(onSuccess, "onSuccess is null"),
                 Functions.emptyConsumer(), // onError
                 Functions.EMPTY_ACTION,    // onComplete
                 Functions.EMPTY_ACTION,    // (onSuccess | onError | onComplete)
@@ -3012,7 +3013,7 @@ public final Maybe<T> doOnSuccess(Consumer<? super T> onSuccess) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> filter(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new MaybeFilter<T>(this, predicate));
     }
 
@@ -3037,7 +3038,7 @@ public final Maybe<T> filter(Predicate<? super T> predicate) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> flatMap(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatten<T, R>(this, mapper));
     }
 
@@ -3069,9 +3070,9 @@ public final <R> Maybe<R> flatMap(
             Function<? super T, ? extends MaybeSource<? extends R>> onSuccessMapper,
             Function<? super Throwable, ? extends MaybeSource<? extends R>> onErrorMapper,
             Supplier<? extends MaybeSource<? extends R>> onCompleteSupplier) {
-        ObjectHelper.requireNonNull(onSuccessMapper, "onSuccessMapper is null");
-        ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null");
-        ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
+        Objects.requireNonNull(onSuccessMapper, "onSuccessMapper is null");
+        Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
+        Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapNotification<T, R>(this, onSuccessMapper, onErrorMapper, onCompleteSupplier));
     }
 
@@ -3102,8 +3103,8 @@ public final <R> Maybe<R> flatMap(
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Maybe<R> flatMap(Function<? super T, ? extends MaybeSource<? extends U>> mapper,
             BiFunction<? super T, ? super U, ? extends R> resultSelector) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.requireNonNull(resultSelector, "resultSelector is null");
+        Objects.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(resultSelector, "resultSelector is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapBiSelector<T, U, R>(this, mapper, resultSelector));
     }
 
@@ -3132,7 +3133,7 @@ public final <U, R> Maybe<R> flatMap(Function<? super T, ? extends MaybeSource<?
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableFlowable<T, U>(this, mapper));
     }
 
@@ -3158,7 +3159,7 @@ public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? exten
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableObservable<T, U>(this, mapper));
     }
 
@@ -3182,7 +3183,7 @@ public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? e
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> flatMapObservable(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapObservable<T, R>(this, mapper));
     }
 
@@ -3210,7 +3211,7 @@ public final <R> Observable<R> flatMapObservable(Function<? super T, ? extends O
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> flatMapPublisher(Function<? super T, ? extends Publisher<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapPublisher<T, R>(this, mapper));
     }
 
@@ -3236,7 +3237,7 @@ public final <R> Flowable<R> flatMapPublisher(Function<? super T, ? extends Publ
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> flatMapSingle(final Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapSingle<T, R>(this, mapper));
     }
 
@@ -3264,7 +3265,7 @@ public final <R> Single<R> flatMapSingle(final Function<? super T, ? extends Sin
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> flatMapSingleElement(final Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapSingleElement<T, R>(this, mapper));
     }
 
@@ -3288,7 +3289,7 @@ public final <R> Maybe<R> flatMapSingleElement(final Function<? super T, ? exten
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable flatMapCompletable(final Function<? super T, ? extends CompletableSource> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapCompletable<T>(this, mapper));
     }
 
@@ -3500,7 +3501,7 @@ public final Single<Boolean> isEmpty() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> lift(final MaybeOperator<? extends R, ? super T> lift) {
-        ObjectHelper.requireNonNull(lift, "lift is null");
+        Objects.requireNonNull(lift, "lift is null");
         return RxJavaPlugins.onAssembly(new MaybeLift<T, R>(this, lift));
     }
 
@@ -3524,7 +3525,7 @@ public final <R> Maybe<R> lift(final MaybeOperator<? extends R, ? super T> lift)
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> map(Function<? super T, ? extends R> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeMap<T, R>(this, mapper));
     }
 
@@ -3572,7 +3573,7 @@ public final Single<Notification<T>> materialize() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> mergeWith(MaybeSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return merge(this, other);
     }
 
@@ -3598,7 +3599,7 @@ public final Flowable<T> mergeWith(MaybeSource<? extends T> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Maybe<T> observeOn(final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new MaybeObserveOn<T>(this, scheduler));
     }
 
@@ -3622,7 +3623,7 @@ public final Maybe<T> observeOn(final Scheduler scheduler) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Maybe<U> ofType(final Class<U> clazz) {
-        ObjectHelper.requireNonNull(clazz, "clazz is null");
+        Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
 
@@ -3644,7 +3645,7 @@ public final <U> Maybe<U> ofType(final Class<U> clazz) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> R to(@NonNull MaybeConverter<T, ? extends R> converter) {
-        return ObjectHelper.requireNonNull(converter, "converter is null").apply(this);
+        return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
 
     /**
@@ -3733,7 +3734,7 @@ public final Maybe<T> onErrorComplete() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> onErrorComplete(final Predicate<? super Throwable> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
 
         return RxJavaPlugins.onAssembly(new MaybeOnErrorComplete<T>(this, predicate));
     }
@@ -3761,7 +3762,7 @@ public final Maybe<T> onErrorComplete(final Predicate<? super Throwable> predica
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> onErrorResumeWith(final MaybeSource<? extends T> next) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         return onErrorResumeNext(Functions.justFunction(next));
     }
 
@@ -3788,7 +3789,7 @@ public final Maybe<T> onErrorResumeWith(final MaybeSource<? extends T> next) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> onErrorResumeNext(Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction) {
-        ObjectHelper.requireNonNull(resumeFunction, "resumeFunction is null");
+        Objects.requireNonNull(resumeFunction, "resumeFunction is null");
         return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<T>(this, resumeFunction, true));
     }
 
@@ -3815,7 +3816,7 @@ public final Maybe<T> onErrorResumeNext(Function<? super Throwable, ? extends Ma
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> onErrorReturn(Function<? super Throwable, ? extends T> valueSupplier) {
-        ObjectHelper.requireNonNull(valueSupplier, "valueSupplier is null");
+        Objects.requireNonNull(valueSupplier, "valueSupplier is null");
         return RxJavaPlugins.onAssembly(new MaybeOnErrorReturn<T>(this, valueSupplier));
     }
 
@@ -3841,7 +3842,7 @@ public final Maybe<T> onErrorReturn(Function<? super Throwable, ? extends T> val
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> onErrorReturnItem(final T item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return onErrorReturn(Functions.justFunction(item));
     }
 
@@ -3871,7 +3872,7 @@ public final Maybe<T> onErrorReturnItem(final T item) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> onExceptionResumeNext(final MaybeSource<? extends T> next) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<T>(this, Functions.justFunction(next), false));
     }
 
@@ -4114,7 +4115,7 @@ public final Maybe<T> retry(Predicate<? super Throwable> predicate) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> retryUntil(final BooleanSupplier stop) {
-        ObjectHelper.requireNonNull(stop, "stop is null");
+        Objects.requireNonNull(stop, "stop is null");
         return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop));
     }
 
@@ -4298,20 +4299,20 @@ public final Disposable subscribe(Consumer<? super T> onSuccess, Consumer<? supe
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable subscribe(Consumer<? super T> onSuccess, Consumer<? super Throwable> onError,
             Action onComplete) {
-        ObjectHelper.requireNonNull(onSuccess, "onSuccess is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onSuccess, "onSuccess is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
         return subscribeWith(new MaybeCallbackObserver<T>(onSuccess, onError, onComplete));
     }
 
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
     public final void subscribe(MaybeObserver<? super T> observer) {
-        ObjectHelper.requireNonNull(observer, "observer is null");
+        Objects.requireNonNull(observer, "observer is null");
 
         observer = RxJavaPlugins.onSubscribe(this, observer);
 
-        ObjectHelper.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null MaybeObserver. Please check the handler provided to RxJavaPlugins.setOnMaybeSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
+        Objects.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null MaybeObserver. Please check the handler provided to RxJavaPlugins.setOnMaybeSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
 
         try {
             subscribeActual(observer);
@@ -4354,7 +4355,7 @@ public final void subscribe(MaybeObserver<? super T> observer) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Maybe<T> subscribeOn(Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new MaybeSubscribeOn<T>(this, scheduler));
     }
 
@@ -4407,7 +4408,7 @@ public final <E extends MaybeObserver<? super T>> E subscribeWith(E observer) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> switchIfEmpty(MaybeSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new MaybeSwitchIfEmpty<T>(this, other));
     }
 
@@ -4431,7 +4432,7 @@ public final Maybe<T> switchIfEmpty(MaybeSource<? extends T> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> switchIfEmpty(SingleSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new MaybeSwitchIfEmptySingle<T>(this, other));
     }
 
@@ -4457,7 +4458,7 @@ public final Single<T> switchIfEmpty(SingleSource<? extends T> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Maybe<T> takeUntil(MaybeSource<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new MaybeTakeUntilMaybe<T, U>(this, other));
     }
 
@@ -4487,7 +4488,7 @@ public final <U> Maybe<T> takeUntil(MaybeSource<U> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Maybe<T> takeUntil(Publisher<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new MaybeTakeUntilPublisher<T, U>(this, other));
     }
 
@@ -4539,7 +4540,7 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, MaybeSource<? extends T> fallback) {
-        ObjectHelper.requireNonNull(fallback, "fallback is null");
+        Objects.requireNonNull(fallback, "fallback is null");
         return timeout(timeout, timeUnit, Schedulers.computation(), fallback);
     }
 
@@ -4570,7 +4571,7 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, MaybeSource<? ext
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler, MaybeSource<? extends T> fallback) {
-        ObjectHelper.requireNonNull(fallback, "fallback is null");
+        Objects.requireNonNull(fallback, "fallback is null");
         return timeout(timer(timeout, timeUnit, scheduler), fallback);
     }
 
@@ -4617,7 +4618,7 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, Scheduler schedul
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Maybe<T> timeout(MaybeSource<U> timeoutIndicator) {
-        ObjectHelper.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
+        Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
         return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe<T, U>(this, timeoutIndicator, null));
     }
 
@@ -4639,8 +4640,8 @@ public final <U> Maybe<T> timeout(MaybeSource<U> timeoutIndicator) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Maybe<T> timeout(MaybeSource<U> timeoutIndicator, MaybeSource<? extends T> fallback) {
-        ObjectHelper.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
-        ObjectHelper.requireNonNull(fallback, "fallback is null");
+        Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
+        Objects.requireNonNull(fallback, "fallback is null");
         return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe<T, U>(this, timeoutIndicator, fallback));
     }
 
@@ -4664,7 +4665,7 @@ public final <U> Maybe<T> timeout(MaybeSource<U> timeoutIndicator, MaybeSource<?
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Maybe<T> timeout(Publisher<U> timeoutIndicator) {
-        ObjectHelper.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
+        Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
         return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher<T, U>(this, timeoutIndicator, null));
     }
 
@@ -4690,8 +4691,8 @@ public final <U> Maybe<T> timeout(Publisher<U> timeoutIndicator) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Maybe<T> timeout(Publisher<U> timeoutIndicator, MaybeSource<? extends T> fallback) {
-        ObjectHelper.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
-        ObjectHelper.requireNonNull(fallback, "fallback is null");
+        Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
+        Objects.requireNonNull(fallback, "fallback is null");
         return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher<T, U>(this, timeoutIndicator, fallback));
     }
 
@@ -4712,7 +4713,7 @@ public final <U> Maybe<T> timeout(Publisher<U> timeoutIndicator, MaybeSource<? e
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Maybe<T> unsubscribeOn(final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new MaybeUnsubscribeOn<T>(this, scheduler));
     }
 
@@ -4746,7 +4747,7 @@ public final Maybe<T> unsubscribeOn(final Scheduler scheduler) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Maybe<R> zipWith(MaybeSource<? extends U> other, BiFunction<? super T, ? super U, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Notification.java b/src/main/java/io/reactivex/rxjava3/core/Notification.java
index b3270483a7..8f8ae5c4d8 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Notification.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Notification.java
@@ -14,7 +14,6 @@
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.NotificationLite;
 import java.util.Objects;
 
@@ -128,7 +127,7 @@ public String toString() {
      */
     @NonNull
     public static <T> Notification<T> createOnNext(@NonNull T value) {
-        ObjectHelper.requireNonNull(value, "value is null");
+        Objects.requireNonNull(value, "value is null");
         return new Notification<T>(value);
     }
 
@@ -141,7 +140,7 @@ public static <T> Notification<T> createOnNext(@NonNull T value) {
      */
     @NonNull
     public static <T> Notification<T> createOnError(@NonNull Throwable error) {
-        ObjectHelper.requireNonNull(error, "error is null");
+        Objects.requireNonNull(error, "error is null");
         return new Notification<T>(NotificationLite.error(error));
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index ce0815477f..63406824ba 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -119,7 +119,7 @@ public abstract class Observable<T> implements ObservableSource<T> {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> amb(Iterable<? extends ObservableSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableAmb<T>(null, sources));
     }
 
@@ -146,7 +146,7 @@ public static <T> Observable<T> amb(Iterable<? extends ObservableSource<? extend
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> ambArray(ObservableSource<? extends T>... sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         int len = sources.length;
         if (len == 0) {
             return empty();
@@ -252,8 +252,8 @@ public static <T, R> Observable<R> combineLatest(Iterable<? extends ObservableSo
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Observable<R> combineLatest(Iterable<? extends ObservableSource<? extends T>> sources,
             Function<? super Object[], ? extends R> combiner, int bufferSize) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
 
         // the queue holds a pair of values so we need to double the capacity
@@ -345,11 +345,11 @@ public static <T, R> Observable<R> combineLatestArray(ObservableSource<? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Observable<R> combineLatestArray(ObservableSource<? extends T>[] sources,
             Function<? super Object[], ? extends R> combiner, int bufferSize) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         }
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
 
         // the queue holds a pair of values so we need to double the capacity
@@ -392,8 +392,8 @@ public static <T, R> Observable<R> combineLatestArray(ObservableSource<? extends
     public static <T1, T2, R> Observable<R> combineLatest(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return combineLatestArray(new ObservableSource[] { source1, source2 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -436,9 +436,9 @@ public static <T1, T2, T3, R> Observable<R> combineLatest(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
             ObservableSource<? extends T3> source3,
             Function3<? super T1, ? super T2, ? super T3, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -484,10 +484,10 @@ public static <T1, T2, T3, T4, R> Observable<R> combineLatest(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
             ObservableSource<? extends T3> source3, ObservableSource<? extends T4> source4,
             Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -537,11 +537,11 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(
             ObservableSource<? extends T3> source3, ObservableSource<? extends T4> source4,
             ObservableSource<? extends T5> source5,
             Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -594,12 +594,12 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(
             ObservableSource<? extends T3> source3, ObservableSource<? extends T4> source4,
             ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
             Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -656,13 +656,13 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
             ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
             ObservableSource<? extends T7> source7,
             Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -722,14 +722,14 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
             ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
             ObservableSource<? extends T7> source7, ObservableSource<? extends T8> source8,
             Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -793,15 +793,15 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
             ObservableSource<? extends T7> source7, ObservableSource<? extends T8> source8,
             ObservableSource<? extends T9> source9,
             Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
-        ObjectHelper.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source9, "source9 is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -891,7 +891,7 @@ public static <T, R> Observable<R> combineLatestDelayError(ObservableSource<? ex
     public static <T, R> Observable<R> combineLatestDelayError(ObservableSource<? extends T>[] sources,
             Function<? super Object[], ? extends R> combiner, int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         if (sources.length == 0) {
             return empty();
         }
@@ -986,8 +986,8 @@ public static <T, R> Observable<R> combineLatestDelayError(Iterable<? extends Ob
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Observable<R> combineLatestDelayError(Iterable<? extends ObservableSource<? extends T>> sources,
             Function<? super Object[], ? extends R> combiner, int bufferSize) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
 
         // the queue holds a pair of values so we need to double the capacity
@@ -1013,7 +1013,7 @@ public static <T, R> Observable<R> combineLatestDelayError(Iterable<? extends Ob
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> concat(Iterable<? extends ObservableSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, bufferSize());
     }
 
@@ -1064,7 +1064,7 @@ public static <T> Observable<T> concat(ObservableSource<? extends ObservableSour
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> concat(ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), prefetch, ErrorMode.IMMEDIATE));
     }
@@ -1093,8 +1093,8 @@ public static <T> Observable<T> concat(ObservableSource<? extends ObservableSour
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> concat(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
     }
 
@@ -1126,9 +1126,9 @@ public static <T> Observable<T> concat(ObservableSource<? extends T> source1, Ob
     public static <T> Observable<T> concat(
             ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
             ObservableSource<? extends T> source3) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return concatArray(source1, source2, source3);
     }
 
@@ -1162,10 +1162,10 @@ public static <T> Observable<T> concat(
     public static <T> Observable<T> concat(
             ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
             ObservableSource<? extends T> source3, ObservableSource<? extends T> source4) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return concatArray(source1, source2, source3, source4);
     }
 
@@ -1344,7 +1344,7 @@ public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, i
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> concatDelayError(Iterable<? extends ObservableSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return concatDelayError(fromIterable(sources));
     }
 
@@ -1390,7 +1390,7 @@ public static <T> Observable<T> concatDelayError(ObservableSource<? extends Obse
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> concatDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch, boolean tillTheEnd) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
     }
@@ -1549,7 +1549,7 @@ public static <T> Observable<T> concatEager(Iterable<? extends ObservableSource<
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> create(ObservableOnSubscribe<T> source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new ObservableCreate<T>(source));
     }
 
@@ -1581,7 +1581,7 @@ public static <T> Observable<T> create(ObservableOnSubscribe<T> source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> defer(Supplier<? extends ObservableSource<? extends T>> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableDefer<T>(supplier));
     }
 
@@ -1630,7 +1630,7 @@ public static <T> Observable<T> empty() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> error(Supplier<? extends Throwable> errorSupplier) {
-        ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null");
+        Objects.requireNonNull(errorSupplier, "errorSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableError<T>(errorSupplier));
     }
 
@@ -1656,7 +1656,7 @@ public static <T> Observable<T> error(Supplier<? extends Throwable> errorSupplie
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> error(final Throwable exception) {
-        ObjectHelper.requireNonNull(exception, "exception is null");
+        Objects.requireNonNull(exception, "exception is null");
         return error(Functions.justSupplier(exception));
     }
 
@@ -1680,7 +1680,7 @@ public static <T> Observable<T> error(final Throwable exception) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T> Observable<T> fromArray(T... items) {
-        ObjectHelper.requireNonNull(items, "items is null");
+        Objects.requireNonNull(items, "items is null");
         if (items.length == 0) {
             return empty();
         }
@@ -1723,7 +1723,7 @@ public static <T> Observable<T> fromArray(T... items) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromCallable(Callable<? extends T> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableFromCallable<T>(supplier));
     }
 
@@ -1757,7 +1757,7 @@ public static <T> Observable<T> fromCallable(Callable<? extends T> supplier) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromFuture(Future<? extends T> future) {
-        ObjectHelper.requireNonNull(future, "future is null");
+        Objects.requireNonNull(future, "future is null");
         return RxJavaPlugins.onAssembly(new ObservableFromFuture<T>(future, 0L, null));
     }
 
@@ -1795,8 +1795,8 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit) {
-        ObjectHelper.requireNonNull(future, "future is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(future, "future is null");
+        Objects.requireNonNull(unit, "unit is null");
         return RxJavaPlugins.onAssembly(new ObservableFromFuture<T>(future, timeout, unit));
     }
 
@@ -1837,7 +1837,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, long time
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static <T> Observable<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         Observable<T> o = fromFuture(future, timeout, unit);
         return o.subscribeOn(scheduler);
     }
@@ -1873,7 +1873,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, long time
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static <T> Observable<T> fromFuture(Future<? extends T> future, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         Observable<T> o = fromFuture(future);
         return o.subscribeOn(scheduler);
     }
@@ -1899,7 +1899,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, Scheduler
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromIterable(Iterable<? extends T> source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new ObservableFromIterable<T>(source));
     }
 
@@ -1936,7 +1936,7 @@ public static <T> Observable<T> fromIterable(Iterable<? extends T> source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromPublisher(Publisher<? extends T> publisher) {
-        ObjectHelper.requireNonNull(publisher, "publisher is null");
+        Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new ObservableFromPublisher<T>(publisher));
     }
 
@@ -1973,7 +1973,7 @@ public static <T> Observable<T> fromPublisher(Publisher<? extends T> publisher)
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromSupplier(Supplier<? extends T> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableFromSupplier<T>(supplier));
     }
 
@@ -2002,7 +2002,7 @@ public static <T> Observable<T> fromSupplier(Supplier<? extends T> supplier) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> generate(final Consumer<Emitter<T>> generator) {
-        ObjectHelper.requireNonNull(generator, "generator is null");
+        Objects.requireNonNull(generator, "generator is null");
         return generate(Functions.<Object>nullSupplier(),
                 ObservableInternalHelper.simpleGenerator(generator), Functions.<Object>emptyConsumer());
     }
@@ -2034,7 +2034,7 @@ public static <T> Observable<T> generate(final Consumer<Emitter<T>> generator) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, S> Observable<T> generate(Supplier<S> initialState, final BiConsumer<S, Emitter<T>> generator) {
-        ObjectHelper.requireNonNull(generator, "generator is null");
+        Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, ObservableInternalHelper.simpleBiGenerator(generator), Functions.emptyConsumer());
     }
 
@@ -2070,7 +2070,7 @@ public static <T, S> Observable<T> generate(
             final Supplier<S> initialState,
             final BiConsumer<S, Emitter<T>> generator,
             Consumer<? super S> disposeState) {
-        ObjectHelper.requireNonNull(generator, "generator is null");
+        Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, ObservableInternalHelper.simpleBiGenerator(generator), disposeState);
     }
 
@@ -2135,9 +2135,9 @@ public static <T, S> Observable<T> generate(Supplier<S> initialState, BiFunction
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, S> Observable<T> generate(Supplier<S> initialState, BiFunction<S, Emitter<T>, S> generator,
             Consumer<? super S> disposeState) {
-        ObjectHelper.requireNonNull(initialState, "initialState is null");
-        ObjectHelper.requireNonNull(generator, "generator is null");
-        ObjectHelper.requireNonNull(disposeState, "disposeState is null");
+        Objects.requireNonNull(initialState, "initialState is null");
+        Objects.requireNonNull(generator, "generator is null");
+        Objects.requireNonNull(disposeState, "disposeState is null");
         return RxJavaPlugins.onAssembly(new ObservableGenerate<T, S>(initialState, generator, disposeState));
     }
 
@@ -2195,8 +2195,8 @@ public static Observable<Long> interval(long initialDelay, long period, TimeUnit
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static Observable<Long> interval(long initialDelay, long period, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new ObservableInterval(Math.max(0L, initialDelay), Math.max(0L, period), unit, scheduler));
     }
@@ -2304,8 +2304,8 @@ public static Observable<Long> intervalRange(long start, long count, long initia
         if (start > 0 && end < 0) {
             throw new IllegalArgumentException("Overflow! start + count is bigger than Long.MAX_VALUE");
         }
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new ObservableIntervalRange(start, end, Math.max(0L, initialDelay), Math.max(0L, period), unit, scheduler));
     }
@@ -2342,7 +2342,7 @@ public static Observable<Long> intervalRange(long start, long count, long initia
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return RxJavaPlugins.onAssembly(new ObservableJust<T>(item));
     }
 
@@ -2369,8 +2369,8 @@ public static <T> Observable<T> just(T item) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item1, T item2) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
 
         return fromArray(item1, item2);
     }
@@ -2400,9 +2400,9 @@ public static <T> Observable<T> just(T item1, T item2) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item1, T item2, T item3) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
 
         return fromArray(item1, item2, item3);
     }
@@ -2434,10 +2434,10 @@ public static <T> Observable<T> just(T item1, T item2, T item3) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item1, T item2, T item3, T item4) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
 
         return fromArray(item1, item2, item3, item4);
     }
@@ -2471,11 +2471,11 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
 
         return fromArray(item1, item2, item3, item4, item5);
     }
@@ -2511,12 +2511,12 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6);
     }
@@ -2554,13 +2554,13 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
-        ObjectHelper.requireNonNull(item7, "item7 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item7, "item7 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6, item7);
     }
@@ -2600,14 +2600,14 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
-        ObjectHelper.requireNonNull(item7, "item7 is null");
-        ObjectHelper.requireNonNull(item8, "item8 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item7, "item7 is null");
+        Objects.requireNonNull(item8, "item8 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6, item7, item8);
     }
@@ -2649,15 +2649,15 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
-        ObjectHelper.requireNonNull(item7, "item7 is null");
-        ObjectHelper.requireNonNull(item8, "item8 is null");
-        ObjectHelper.requireNonNull(item9, "item9 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item7, "item7 is null");
+        Objects.requireNonNull(item8, "item8 is null");
+        Objects.requireNonNull(item9, "item9 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9);
     }
@@ -2701,16 +2701,16 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9, T item10) {
-        ObjectHelper.requireNonNull(item1, "item1 is null");
-        ObjectHelper.requireNonNull(item2, "item2 is null");
-        ObjectHelper.requireNonNull(item3, "item3 is null");
-        ObjectHelper.requireNonNull(item4, "item4 is null");
-        ObjectHelper.requireNonNull(item5, "item5 is null");
-        ObjectHelper.requireNonNull(item6, "item6 is null");
-        ObjectHelper.requireNonNull(item7, "item7 is null");
-        ObjectHelper.requireNonNull(item8, "item8 is null");
-        ObjectHelper.requireNonNull(item9, "item9 is null");
-        ObjectHelper.requireNonNull(item10, "item10 is null");
+        Objects.requireNonNull(item1, "item1 is null");
+        Objects.requireNonNull(item2, "item2 is null");
+        Objects.requireNonNull(item3, "item3 is null");
+        Objects.requireNonNull(item4, "item4 is null");
+        Objects.requireNonNull(item5, "item5 is null");
+        Objects.requireNonNull(item6, "item6 is null");
+        Objects.requireNonNull(item7, "item7 is null");
+        Objects.requireNonNull(item8, "item8 is null");
+        Objects.requireNonNull(item9, "item9 is null");
+        Objects.requireNonNull(item10, "item10 is null");
 
         return fromArray(item1, item2, item3, item4, item5, item6, item7, item8, item9, item10);
     }
@@ -2932,7 +2932,7 @@ public static <T> Observable<T> merge(Iterable<? extends ObservableSource<? exte
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Observable<T> merge(ObservableSource<? extends ObservableSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), false, Integer.MAX_VALUE, bufferSize()));
     }
 
@@ -2980,7 +2980,7 @@ public static <T> Observable<T> merge(ObservableSource<? extends ObservableSourc
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> merge(ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), false, maxConcurrency, bufferSize()));
     }
@@ -3023,8 +3023,8 @@ public static <T> Observable<T> merge(ObservableSource<? extends ObservableSourc
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> merge(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), false, 2);
     }
 
@@ -3068,9 +3068,9 @@ public static <T> Observable<T> merge(ObservableSource<? extends T> source1, Obs
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> merge(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2, ObservableSource<? extends T> source3) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return fromArray(source1, source2, source3).flatMap((Function)Functions.identity(), false, 3);
     }
 
@@ -3118,10 +3118,10 @@ public static <T> Observable<T> merge(ObservableSource<? extends T> source1, Obs
     public static <T> Observable<T> merge(
             ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
             ObservableSource<? extends T> source3, ObservableSource<? extends T> source4) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return fromArray(source1, source2, source3, source4).flatMap((Function)Functions.identity(), false, 4);
     }
 
@@ -3331,7 +3331,7 @@ public static <T> Observable<T> mergeDelayError(Iterable<? extends ObservableSou
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Observable<T> mergeDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), true, Integer.MAX_VALUE, bufferSize()));
     }
 
@@ -3368,7 +3368,7 @@ public static <T> Observable<T> mergeDelayError(ObservableSource<? extends Obser
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> mergeDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), true, maxConcurrency, bufferSize()));
     }
@@ -3403,8 +3403,8 @@ public static <T> Observable<T> mergeDelayError(ObservableSource<? extends Obser
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> mergeDelayError(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), true, 2);
     }
 
@@ -3441,9 +3441,9 @@ public static <T> Observable<T> mergeDelayError(ObservableSource<? extends T> so
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> mergeDelayError(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2, ObservableSource<? extends T> source3) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return fromArray(source1, source2, source3).flatMap((Function)Functions.identity(), true, 3);
     }
 
@@ -3484,10 +3484,10 @@ public static <T> Observable<T> mergeDelayError(ObservableSource<? extends T> so
     public static <T> Observable<T> mergeDelayError(
             ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
             ObservableSource<? extends T> source3, ObservableSource<? extends T> source4) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return fromArray(source1, source2, source3, source4).flatMap((Function)Functions.identity(), true, 4);
     }
 
@@ -3709,9 +3709,9 @@ public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> so
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
             BiPredicate<? super T, ? super T> isEqual, int bufferSize) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(isEqual, "isEqual is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(isEqual, "isEqual is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableSequenceEqualSingle<T>(source1, source2, isEqual, bufferSize));
     }
@@ -3775,7 +3775,7 @@ public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> so
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> switchOnNext(ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), bufferSize, false));
     }
@@ -3877,7 +3877,7 @@ public static <T> Observable<T> switchOnNextDelayError(ObservableSource<? extend
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> switchOnNextDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), prefetch, true));
     }
@@ -3930,8 +3930,8 @@ public static Observable<Long> timer(long delay, TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static Observable<Long> timer(long delay, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new ObservableTimer(Math.max(delay, 0L), unit, scheduler));
     }
@@ -3951,7 +3951,7 @@ public static Observable<Long> timer(long delay, TimeUnit unit, Scheduler schedu
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> unsafeCreate(ObservableSource<T> onSubscribe) {
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         if (onSubscribe instanceof Observable) {
             throw new IllegalArgumentException("unsafeCreate(Observable) should be upgraded");
         }
@@ -4018,9 +4018,9 @@ public static <T, D> Observable<T> using(Supplier<? extends D> resourceSupplier,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, D> Observable<T> using(Supplier<? extends D> resourceSupplier, Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier, Consumer<? super D> disposer, boolean eager) {
-        ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null");
-        ObjectHelper.requireNonNull(sourceSupplier, "sourceSupplier is null");
-        ObjectHelper.requireNonNull(disposer, "disposer is null");
+        Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
+        Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
+        Objects.requireNonNull(disposer, "disposer is null");
         return RxJavaPlugins.onAssembly(new ObservableUsing<T, D>(resourceSupplier, sourceSupplier, disposer, eager));
     }
 
@@ -4040,7 +4040,7 @@ public static <T, D> Observable<T> using(Supplier<? extends D> resourceSupplier,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> wrap(ObservableSource<T> source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         if (source instanceof Observable) {
             return RxJavaPlugins.onAssembly((Observable<T>)source);
         }
@@ -4095,8 +4095,8 @@ public static <T> Observable<T> wrap(ObservableSource<T> source) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Observable<R> zip(Iterable<? extends ObservableSource<? extends T>> sources, Function<? super Object[], ? extends R> zipper) {
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableZip<T, R>(null, sources, zipper, bufferSize(), false));
     }
 
@@ -4155,8 +4155,8 @@ public static <T, R> Observable<R> zip(Iterable<? extends ObservableSource<? ext
     public static <T, R> Observable<R> zip(Iterable<? extends ObservableSource<? extends T>> sources,
             Function<? super Object[], ? extends R> zipper, boolean delayError,
             int bufferSize) {
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableZip<T, R>(null, sources, zipper, bufferSize, delayError));
     }
@@ -4211,8 +4211,8 @@ public static <T, R> Observable<R> zip(Iterable<? extends ObservableSource<? ext
     public static <T1, T2, R> Observable<R> zip(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2);
     }
 
@@ -4267,8 +4267,8 @@ public static <T1, T2, R> Observable<R> zip(
     public static <T1, T2, R> Observable<R> zip(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize(), source1, source2);
     }
 
@@ -4324,8 +4324,8 @@ public static <T1, T2, R> Observable<R> zip(
     public static <T1, T2, R> Observable<R> zip(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize, source1, source2);
     }
 
@@ -4383,9 +4383,9 @@ public static <T1, T2, R> Observable<R> zip(
     public static <T1, T2, T3, R> Observable<R> zip(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
             Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3);
     }
 
@@ -4447,10 +4447,10 @@ public static <T1, T2, T3, T4, R> Observable<R> zip(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
             ObservableSource<? extends T4> source4,
             Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4);
     }
 
@@ -4515,11 +4515,11 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
             ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5,
             Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5);
     }
 
@@ -4586,12 +4586,12 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
             ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
             ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
             Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6);
     }
 
@@ -4662,13 +4662,13 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
             ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
             ObservableSource<? extends T7> source7,
             Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7);
     }
 
@@ -4742,14 +4742,14 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
             ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
             ObservableSource<? extends T7> source7, ObservableSource<? extends T8> source8,
             Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8);
     }
 
@@ -4826,15 +4826,15 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
             ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
             ObservableSource<? extends T7> source7, ObservableSource<? extends T8> source8, ObservableSource<? extends T9> source9,
             Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
-        ObjectHelper.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source9, "source9 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8, source9);
     }
 
@@ -4895,7 +4895,7 @@ public static <T, R> Observable<R> zipArray(Function<? super Object[], ? extends
         if (sources.length == 0) {
             return empty();
         }
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableZip<T, R>(sources, null, zipper, bufferSize, delayError));
     }
@@ -4923,7 +4923,7 @@ public static <T, R> Observable<R> zipArray(Function<? super Object[], ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> all(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableAllSingle<T>(this, predicate));
     }
 
@@ -4948,7 +4948,7 @@ public final Single<Boolean> all(Predicate<? super T> predicate) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> ambWith(ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
 
@@ -4975,7 +4975,7 @@ public final Observable<T> ambWith(ObservableSource<? extends T> other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> any(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableAnySingle<T>(this, predicate));
     }
 
@@ -5520,7 +5520,7 @@ public final Observable<List<T>> buffer(int count, int skip) {
     public final <U extends Collection<? super T>> Observable<U> buffer(int count, int skip, Supplier<U> bufferSupplier) {
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(skip, "skip");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableBuffer<T, U>(this, count, skip, bufferSupplier));
     }
 
@@ -5650,9 +5650,9 @@ public final Observable<List<T>> buffer(long timespan, long timeskip, TimeUnit u
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <U extends Collection<? super T>> Observable<U> buffer(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, Supplier<U> bufferSupplier) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableBufferTimed<T, U>(this, timespan, timeskip, unit, scheduler, bufferSupplier, Integer.MAX_VALUE, false));
     }
 
@@ -5795,9 +5795,9 @@ public final <U extends Collection<? super T>> Observable<U> buffer(
             Scheduler scheduler, int count,
             Supplier<U> bufferSupplier,
             boolean restartTimerOnMaxSize) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         ObjectHelper.verifyPositive(count, "count");
         return RxJavaPlugins.onAssembly(new ObservableBufferTimed<T, U>(this, timespan, timespan, unit, scheduler, bufferSupplier, count, restartTimerOnMaxSize));
     }
@@ -5899,9 +5899,9 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Observable<U>
             ObservableSource<? extends TOpening> openingIndicator,
             Function<? super TOpening, ? extends ObservableSource<? extends TClosing>> closingIndicator,
             Supplier<U> bufferSupplier) {
-        ObjectHelper.requireNonNull(openingIndicator, "openingIndicator is null");
-        ObjectHelper.requireNonNull(closingIndicator, "closingIndicator is null");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(openingIndicator, "openingIndicator is null");
+        Objects.requireNonNull(closingIndicator, "closingIndicator is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableBufferBoundary<T, U, TOpening, TClosing>(this, openingIndicator, closingIndicator, bufferSupplier));
     }
 
@@ -5999,8 +5999,8 @@ public final <B> Observable<List<T>> buffer(ObservableSource<B> boundary, final
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <B, U extends Collection<? super T>> Observable<U> buffer(ObservableSource<B> boundary, Supplier<U> bufferSupplier) {
-        ObjectHelper.requireNonNull(boundary, "boundary is null");
-        ObjectHelper.requireNonNull(bufferSupplier, "bufferSupplier is null");
+        Objects.requireNonNull(boundary, "boundary is null");
+        Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableBufferExactBoundary<T, U, B>(this, boundary, bufferSupplier));
     }
 
@@ -6138,7 +6138,7 @@ public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<U> cast(final Class<U> clazz) {
-        ObjectHelper.requireNonNull(clazz, "clazz is null");
+        Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
 
@@ -6171,8 +6171,8 @@ public final <U> Observable<U> cast(final Class<U> clazz) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Single<U> collect(Supplier<? extends U> initialValueSupplier, BiConsumer<? super U, ? super T> collector) {
-        ObjectHelper.requireNonNull(initialValueSupplier, "initialValueSupplier is null");
-        ObjectHelper.requireNonNull(collector, "collector is null");
+        Objects.requireNonNull(initialValueSupplier, "initialValueSupplier is null");
+        Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ObservableCollectSingle<T, U>(this, initialValueSupplier, collector));
     }
 
@@ -6205,7 +6205,7 @@ public final <U> Single<U> collect(Supplier<? extends U> initialValueSupplier, B
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Single<U> collectInto(final U initialValue, BiConsumer<? super U, ? super T> collector) {
-        ObjectHelper.requireNonNull(initialValue, "initialValue is null");
+        Objects.requireNonNull(initialValue, "initialValue is null");
         return collect(Functions.justSupplier(initialValue), collector);
     }
 
@@ -6232,7 +6232,7 @@ public final <U> Single<U> collectInto(final U initialValue, BiConsumer<? super
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> compose(ObservableTransformer<? super T, ? extends R> composer) {
-        return wrap(((ObservableTransformer<T, R>) ObjectHelper.requireNonNull(composer, "composer is null")).apply(this));
+        return wrap(((ObservableTransformer<T, R>) Objects.requireNonNull(composer, "composer is null")).apply(this));
     }
 
     /**
@@ -6294,7 +6294,7 @@ public final <R> Observable<R> concatMap(Function<? super T, ? extends Observabl
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> concatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         if (this instanceof ScalarSupplier) {
             @SuppressWarnings("unchecked")
@@ -6336,9 +6336,9 @@ public final <R> Observable<R> concatMap(Function<? super T, ? extends Observabl
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Observable<R> concatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper, int prefetch, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<T, R>(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler));
     }
 
@@ -6399,7 +6399,7 @@ public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         if (this instanceof ScalarSupplier) {
             @SuppressWarnings("unchecked")
@@ -6441,9 +6441,9 @@ public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd, int prefetch, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<T, R>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler));
     }
 
@@ -6497,7 +6497,7 @@ public final <R> Observable<R> concatMapEager(Function<? super T, ? extends Obse
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> concatMapEager(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             int maxConcurrency, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<T, R>(this, mapper, ErrorMode.IMMEDIATE, maxConcurrency, prefetch));
@@ -6562,7 +6562,7 @@ public final <R> Observable<R> concatMapEagerDelayError(Function<? super T, ? ex
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> concatMapEagerDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd, int maxConcurrency, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, maxConcurrency, prefetch));
@@ -6611,7 +6611,7 @@ public final Completable concatMapCompletable(Function<? super T, ? extends Comp
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable concatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, int capacityHint) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<T>(this, mapper, ErrorMode.IMMEDIATE, capacityHint));
     }
@@ -6701,7 +6701,7 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable concatMapCompletableDelayError(Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<T>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
@@ -6729,7 +6729,7 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<U> concatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<T, U>(this, mapper));
     }
 
@@ -6758,7 +6758,7 @@ public final <U> Observable<U> concatMapIterable(final Function<? super T, ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<U> concatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return concatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), prefetch);
     }
@@ -6816,7 +6816,7 @@ public final <R> Observable<R> concatMapMaybe(Function<? super T, ? extends Mayb
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> concatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<T, R>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
@@ -6911,7 +6911,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
@@ -6969,7 +6969,7 @@ public final <R> Observable<R> concatMapSingle(Function<? super T, ? extends Sin
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> concatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<T, R>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
@@ -7064,7 +7064,7 @@ public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? e
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
@@ -7088,7 +7088,7 @@ public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? e
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> concatWith(ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return concat(this, other);
     }
 
@@ -7109,7 +7109,7 @@ public final Observable<T> concatWith(ObservableSource<? extends T> other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> concatWith(@NonNull SingleSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatWithSingle<T>(this, other));
     }
 
@@ -7130,7 +7130,7 @@ public final Observable<T> concatWith(@NonNull SingleSource<? extends T> other)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatWithMaybe<T>(this, other));
     }
 
@@ -7151,7 +7151,7 @@ public final Observable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> concatWith(@NonNull CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatWithCompletable<T>(this, other));
     }
 
@@ -7174,7 +7174,7 @@ public final Observable<T> concatWith(@NonNull CompletableSource other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> contains(final Object element) {
-        ObjectHelper.requireNonNull(element, "element is null");
+        Objects.requireNonNull(element, "element is null");
         return any(Functions.equalsWith(element));
     }
 
@@ -7227,7 +7227,7 @@ public final Single<Long> count() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> debounce(Function<? super T, ? extends ObservableSource<U>> debounceSelector) {
-        ObjectHelper.requireNonNull(debounceSelector, "debounceSelector is null");
+        Objects.requireNonNull(debounceSelector, "debounceSelector is null");
         return RxJavaPlugins.onAssembly(new ObservableDebounce<T, U>(this, debounceSelector));
     }
 
@@ -7306,8 +7306,8 @@ public final Observable<T> debounce(long timeout, TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> debounce(long timeout, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableDebounceTimed<T>(this, timeout, unit, scheduler));
     }
 
@@ -7330,7 +7330,7 @@ public final Observable<T> debounce(long timeout, TimeUnit unit, Scheduler sched
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> defaultIfEmpty(T defaultItem) {
-        ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         return switchIfEmpty(just(defaultItem));
     }
 
@@ -7360,7 +7360,7 @@ public final Observable<T> defaultIfEmpty(T defaultItem) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> delay(final Function<? super T, ? extends ObservableSource<U>> itemDelay) {
-        ObjectHelper.requireNonNull(itemDelay, "itemDelay is null");
+        Objects.requireNonNull(itemDelay, "itemDelay is null");
         return flatMap(ObservableInternalHelper.itemDelay(itemDelay));
     }
 
@@ -7463,8 +7463,8 @@ public final Observable<T> delay(long delay, TimeUnit unit, Scheduler scheduler)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> delay(long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new ObservableDelay<T>(this, delay, unit, scheduler, delayError));
     }
@@ -7524,7 +7524,7 @@ public final <U, V> Observable<T> delay(ObservableSource<U> subscriptionDelay,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> delaySubscription(ObservableSource<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableDelaySubscriptionOther<T, U>(this, other));
     }
 
@@ -7626,7 +7626,7 @@ public final Observable<T> delaySubscription(long delay, TimeUnit unit, Schedule
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> dematerialize(Function<? super T, Notification<R>> selector) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         return RxJavaPlugins.onAssembly(new ObservableDematerialize<T, R>(this, selector));
     }
 
@@ -7735,8 +7735,8 @@ public final <K> Observable<T> distinct(Function<? super T, K> keySelector) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K> Observable<T> distinct(Function<? super T, K> keySelector, Supplier<? extends Collection<? super K>> collectionSupplier) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableDistinct<T, K>(this, keySelector, collectionSupplier));
     }
 
@@ -7816,7 +7816,7 @@ public final Observable<T> distinctUntilChanged() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K> Observable<T> distinctUntilChanged(Function<? super T, K> keySelector) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
         return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<T, K>(this, keySelector, ObjectHelper.equalsPredicate()));
     }
 
@@ -7850,7 +7850,7 @@ public final <K> Observable<T> distinctUntilChanged(Function<? super T, K> keySe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> distinctUntilChanged(BiPredicate<? super T, ? super T> comparer) {
-        ObjectHelper.requireNonNull(comparer, "comparer is null");
+        Objects.requireNonNull(comparer, "comparer is null");
         return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<T, T>(this, Functions.<T>identity(), comparer));
     }
 
@@ -7874,7 +7874,7 @@ public final Observable<T> distinctUntilChanged(BiPredicate<? super T, ? super T
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> doAfterNext(Consumer<? super T> onAfterNext) {
-        ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null");
+        Objects.requireNonNull(onAfterNext, "onAfterNext is null");
         return RxJavaPlugins.onAssembly(new ObservableDoAfterNext<T>(this, onAfterNext));
     }
 
@@ -7898,7 +7898,7 @@ public final Observable<T> doAfterNext(Consumer<? super T> onAfterNext) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> doAfterTerminate(Action onFinally) {
-        ObjectHelper.requireNonNull(onFinally, "onFinally is null");
+        Objects.requireNonNull(onFinally, "onFinally is null");
         return doOnEach(Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.EMPTY_ACTION, onFinally);
     }
 
@@ -7925,7 +7925,7 @@ public final Observable<T> doAfterTerminate(Action onFinally) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> doFinally(Action onFinally) {
-        ObjectHelper.requireNonNull(onFinally, "onFinally is null");
+        Objects.requireNonNull(onFinally, "onFinally is null");
         return RxJavaPlugins.onAssembly(new ObservableDoFinally<T>(this, onFinally));
     }
 
@@ -7992,10 +7992,10 @@ public final Observable<T> doOnComplete(Action onComplete) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     private Observable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Throwable> onError, Action onComplete, Action onAfterTerminate) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
-        ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
         return RxJavaPlugins.onAssembly(new ObservableDoOnEach<T>(this, onNext, onError, onComplete, onAfterTerminate));
     }
 
@@ -8016,7 +8016,7 @@ private Observable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Thro
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> doOnEach(final Consumer<? super Notification<T>> onNotification) {
-        ObjectHelper.requireNonNull(onNotification, "onNotification is null");
+        Objects.requireNonNull(onNotification, "onNotification is null");
         return doOnEach(
                 Functions.notificationOnNext(onNotification),
                 Functions.notificationOnError(onNotification),
@@ -8048,7 +8048,7 @@ public final Observable<T> doOnEach(final Consumer<? super Notification<T>> onNo
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> doOnEach(final Observer<? super T> observer) {
-        ObjectHelper.requireNonNull(observer, "observer is null");
+        Objects.requireNonNull(observer, "observer is null");
         return doOnEach(
                 ObservableInternalHelper.observerOnNext(observer),
                 ObservableInternalHelper.observerOnError(observer),
@@ -8099,8 +8099,8 @@ public final Observable<T> doOnError(Consumer<? super Throwable> onError) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> doOnLifecycle(final Consumer<? super Disposable> onSubscribe, final Action onDispose) {
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
-        ObjectHelper.requireNonNull(onDispose, "onDispose is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onDispose, "onDispose is null");
         return RxJavaPlugins.onAssembly(new ObservableDoOnLifecycle<T>(this, onSubscribe, onDispose));
     }
 
@@ -8169,7 +8169,7 @@ public final Observable<T> doOnSubscribe(Consumer<? super Disposable> onSubscrib
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> doOnTerminate(final Action onTerminate) {
-        ObjectHelper.requireNonNull(onTerminate, "onTerminate is null");
+        Objects.requireNonNull(onTerminate, "onTerminate is null");
         return doOnEach(Functions.emptyConsumer(),
                 Functions.actionConsumer(onTerminate), onTerminate,
                 Functions.EMPTY_ACTION);
@@ -8228,7 +8228,7 @@ public final Single<T> elementAt(long index, T defaultItem) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
         }
-        ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new ObservableElementAtSingle<T>(this, index, defaultItem));
     }
 
@@ -8278,7 +8278,7 @@ public final Single<T> elementAtOrError(long index) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> filter(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableFilter<T>(this, predicate));
     }
 
@@ -8462,7 +8462,7 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean delayErrors, int maxConcurrency, int bufferSize) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
@@ -8506,9 +8506,9 @@ public final <R> Observable<R> flatMap(
             Function<? super T, ? extends ObservableSource<? extends R>> onNextMapper,
             Function<? super Throwable, ? extends ObservableSource<? extends R>> onErrorMapper,
             Supplier<? extends ObservableSource<? extends R>> onCompleteSupplier) {
-        ObjectHelper.requireNonNull(onNextMapper, "onNextMapper is null");
-        ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null");
-        ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
+        Objects.requireNonNull(onNextMapper, "onNextMapper is null");
+        Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
+        Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
         return merge(new ObservableMapNotification<T, R>(this, onNextMapper, onErrorMapper, onCompleteSupplier));
     }
 
@@ -8547,9 +8547,9 @@ public final <R> Observable<R> flatMap(
             Function<Throwable, ? extends ObservableSource<? extends R>> onErrorMapper,
             Supplier<? extends ObservableSource<? extends R>> onCompleteSupplier,
             int maxConcurrency) {
-        ObjectHelper.requireNonNull(onNextMapper, "onNextMapper is null");
-        ObjectHelper.requireNonNull(onErrorMapper, "onErrorMapper is null");
-        ObjectHelper.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
+        Objects.requireNonNull(onNextMapper, "onNextMapper is null");
+        Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
+        Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
         return merge(new ObservableMapNotification<T, R>(this, onNextMapper, onErrorMapper, onCompleteSupplier), maxConcurrency);
     }
 
@@ -8719,8 +8719,8 @@ public final <U, R> Observable<R> flatMap(Function<? super T, ? extends Observab
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Observable<R> flatMap(final Function<? super T, ? extends ObservableSource<? extends U>> mapper,
             final BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency, int bufferSize) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return flatMap(ObservableInternalHelper.flatMapWithCombiner(mapper, combiner), delayErrors, maxConcurrency, bufferSize);
     }
 
@@ -8793,7 +8793,7 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable flatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, boolean delayErrors) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapCompletableCompletable<T>(this, mapper, delayErrors));
     }
 
@@ -8819,7 +8819,7 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<U> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<T, U>(this, mapper));
     }
 
@@ -8851,8 +8851,8 @@ public final <U> Observable<U> flatMapIterable(final Function<? super T, ? exten
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, V> Observable<V> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper,
             BiFunction<? super T, ? super U, ? extends V> resultSelector) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.requireNonNull(resultSelector, "resultSelector is null");
+        Objects.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(resultSelector, "resultSelector is null");
         return flatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), bufferSize());
     }
 
@@ -8894,7 +8894,7 @@ public final <R> Observable<R> flatMapMaybe(Function<? super T, ? extends MaybeS
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> flatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapMaybe<T, R>(this, mapper, delayErrors));
     }
 
@@ -8936,7 +8936,7 @@ public final <R> Observable<R> flatMapSingle(Function<? super T, ? extends Singl
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> flatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapSingle<T, R>(this, mapper, delayErrors));
     }
 
@@ -9044,9 +9044,9 @@ public final Disposable forEachWhile(Predicate<? super T> onNext, Consumer<? sup
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable forEachWhile(final Predicate<? super T> onNext, Consumer<? super Throwable> onError,
             final Action onComplete) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
 
         ForEachWhileObserver<T> o = new ForEachWhileObserver<T>(onNext, onError, onComplete);
         subscribe(o);
@@ -9274,8 +9274,8 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(Function<? super
     public final <K, V> Observable<GroupedObservable<K, V>> groupBy(Function<? super T, ? extends K> keySelector,
             Function<? super T, ? extends V> valueSelector,
             boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(valueSelector, "valueSelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(valueSelector, "valueSelector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
 
         return RxJavaPlugins.onAssembly(new ObservableGroupBy<T, K, V>(this, keySelector, valueSelector, bufferSize, delayError));
@@ -9320,10 +9320,10 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> groupJoin(
             Function<? super TRight, ? extends ObservableSource<TRightEnd>> rightEnd,
             BiFunction<? super T, ? super Observable<TRight>, ? extends R> resultSelector
                     ) {
-        ObjectHelper.requireNonNull(other, "other is null");
-        ObjectHelper.requireNonNull(leftEnd, "leftEnd is null");
-        ObjectHelper.requireNonNull(rightEnd, "rightEnd is null");
-        ObjectHelper.requireNonNull(resultSelector, "resultSelector is null");
+        Objects.requireNonNull(other, "other is null");
+        Objects.requireNonNull(leftEnd, "leftEnd is null");
+        Objects.requireNonNull(rightEnd, "rightEnd is null");
+        Objects.requireNonNull(resultSelector, "resultSelector is null");
         return RxJavaPlugins.onAssembly(new ObservableGroupJoin<T, TRight, TLeftEnd, TRightEnd, R>(
                 this, other, leftEnd, rightEnd, resultSelector));
     }
@@ -9427,10 +9427,10 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> join(
             Function<? super TRight, ? extends ObservableSource<TRightEnd>> rightEnd,
             BiFunction<? super T, ? super TRight, ? extends R> resultSelector
                     ) {
-        ObjectHelper.requireNonNull(other, "other is null");
-        ObjectHelper.requireNonNull(leftEnd, "leftEnd is null");
-        ObjectHelper.requireNonNull(rightEnd, "rightEnd is null");
-        ObjectHelper.requireNonNull(resultSelector, "resultSelector is null");
+        Objects.requireNonNull(other, "other is null");
+        Objects.requireNonNull(leftEnd, "leftEnd is null");
+        Objects.requireNonNull(rightEnd, "rightEnd is null");
+        Objects.requireNonNull(resultSelector, "resultSelector is null");
         return RxJavaPlugins.onAssembly(new ObservableJoin<T, TRight, TLeftEnd, TRightEnd, R>(
                 this, other, leftEnd, rightEnd, resultSelector));
     }
@@ -9474,7 +9474,7 @@ public final Maybe<T> lastElement() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> last(T defaultItem) {
-        ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new ObservableLastSingle<T>(this, defaultItem));
     }
 
@@ -9643,7 +9643,7 @@ public final Single<T> lastOrError() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> lift(ObservableOperator<? extends R, ? super T> lifter) {
-        ObjectHelper.requireNonNull(lifter, "lifter is null");
+        Objects.requireNonNull(lifter, "lifter is null");
         return RxJavaPlugins.onAssembly(new ObservableLift<R, T>(this, lifter));
     }
 
@@ -9667,7 +9667,7 @@ public final <R> Observable<R> lift(ObservableOperator<? extends R, ? super T> l
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> map(Function<? super T, ? extends R> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableMap<T, R>(this, mapper));
     }
 
@@ -9712,7 +9712,7 @@ public final Observable<Notification<T>> materialize() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> mergeWith(ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return merge(this, other);
     }
 
@@ -9735,7 +9735,7 @@ public final Observable<T> mergeWith(ObservableSource<? extends T> other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableMergeWithSingle<T>(this, other));
     }
 
@@ -9759,7 +9759,7 @@ public final Observable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableMergeWithMaybe<T>(this, other));
     }
 
@@ -9780,7 +9780,7 @@ public final Observable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> mergeWith(@NonNull CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableMergeWithCompletable<T>(this, other));
     }
 
@@ -9895,7 +9895,7 @@ public final Observable<T> observeOn(Scheduler scheduler, boolean delayError) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> observeOn(Scheduler scheduler, boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableObserveOn<T>(this, scheduler, delayError, bufferSize));
     }
@@ -9918,7 +9918,7 @@ public final Observable<T> observeOn(Scheduler scheduler, boolean delayError, in
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<U> ofType(final Class<U> clazz) {
-        ObjectHelper.requireNonNull(clazz, "clazz is null");
+        Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
 
@@ -9954,7 +9954,7 @@ public final <U> Observable<U> ofType(final Class<U> clazz) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> onErrorResumeNext(Function<? super Throwable, ? extends ObservableSource<? extends T>> resumeFunction) {
-        ObjectHelper.requireNonNull(resumeFunction, "resumeFunction is null");
+        Objects.requireNonNull(resumeFunction, "resumeFunction is null");
         return RxJavaPlugins.onAssembly(new ObservableOnErrorNext<T>(this, resumeFunction));
     }
 
@@ -9990,7 +9990,7 @@ public final Observable<T> onErrorResumeNext(Function<? super Throwable, ? exten
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> onErrorResumeWith(final ObservableSource<? extends T> next) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         return onErrorResumeNext(Functions.justFunction(next));
     }
 
@@ -10023,7 +10023,7 @@ public final Observable<T> onErrorResumeWith(final ObservableSource<? extends T>
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> onErrorReturn(Function<? super Throwable, ? extends T> valueSupplier) {
-        ObjectHelper.requireNonNull(valueSupplier, "valueSupplier is null");
+        Objects.requireNonNull(valueSupplier, "valueSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableOnErrorReturn<T>(this, valueSupplier));
     }
 
@@ -10056,7 +10056,7 @@ public final Observable<T> onErrorReturn(Function<? super Throwable, ? extends T
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> onErrorReturnItem(final T item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return onErrorReturn(Functions.justFunction(item));
     }
 
@@ -10122,7 +10122,7 @@ public final ConnectableObservable<T> publish() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> publish(Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         return RxJavaPlugins.onAssembly(new ObservablePublishSelector<T, R>(this, selector));
     }
 
@@ -10157,7 +10157,7 @@ public final <R> Observable<R> publish(Function<? super Observable<T>, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
-        ObjectHelper.requireNonNull(reducer, "reducer is null");
+        Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new ObservableReduceMaybe<T>(this, reducer));
     }
 
@@ -10214,8 +10214,8 @@ public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
-        ObjectHelper.requireNonNull(seed, "seed is null");
-        ObjectHelper.requireNonNull(reducer, "reducer is null");
+        Objects.requireNonNull(seed, "seed is null");
+        Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new ObservableReduceSeedSingle<T, R>(this, seed, reducer));
     }
 
@@ -10254,8 +10254,8 @@ public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> reduceWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> reducer) {
-        ObjectHelper.requireNonNull(seedSupplier, "seedSupplier is null");
-        ObjectHelper.requireNonNull(reducer, "reducer is null");
+        Objects.requireNonNull(seedSupplier, "seedSupplier is null");
+        Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new ObservableReduceWithSingle<T, R>(this, seedSupplier, reducer));
     }
 
@@ -10330,7 +10330,7 @@ public final Observable<T> repeat(long times) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> repeatUntil(BooleanSupplier stop) {
-        ObjectHelper.requireNonNull(stop, "stop is null");
+        Objects.requireNonNull(stop, "stop is null");
         return RxJavaPlugins.onAssembly(new ObservableRepeatUntil<T>(this, stop));
     }
 
@@ -10356,7 +10356,7 @@ public final Observable<T> repeatUntil(BooleanSupplier stop) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> repeatWhen(final Function<? super Observable<Object>, ? extends ObservableSource<?>> handler) {
-        ObjectHelper.requireNonNull(handler, "handler is null");
+        Objects.requireNonNull(handler, "handler is null");
         return RxJavaPlugins.onAssembly(new ObservableRepeatWhen<T>(this, handler));
     }
 
@@ -10404,7 +10404,7 @@ public final ConnectableObservable<T> replay() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this), selector);
     }
 
@@ -10438,7 +10438,7 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final int bufferSize) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, bufferSize, false), selector);
     }
@@ -10475,7 +10475,7 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final int bufferSize, boolean eagerTruncate) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, bufferSize, eagerTruncate), selector);
     }
@@ -10556,10 +10556,10 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.multicastSelector(
                 ObservableInternalHelper.replaySupplier(this, bufferSize, time, unit, scheduler, false), selector);
     }
@@ -10604,10 +10604,10 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.multicastSelector(
                 ObservableInternalHelper.replaySupplier(this, bufferSize, time, unit, scheduler, eagerTruncate), selector);
     }
@@ -10674,9 +10674,9 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final long time, final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, time, unit, scheduler, false), selector);
     }
 
@@ -10713,9 +10713,9 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, time, unit, scheduler, eagerTruncate), selector);
     }
 
@@ -10854,8 +10854,8 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, TimeUnit
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ConnectableObservable<T> replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.create(this, time, unit, scheduler, bufferSize, false);
     }
 
@@ -10898,8 +10898,8 @@ public final ConnectableObservable<T> replay(final int bufferSize, final long ti
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ConnectableObservable<T> replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.create(this, time, unit, scheduler, bufferSize, eagerTruncate);
     }
 
@@ -10958,8 +10958,8 @@ public final ConnectableObservable<T> replay(long time, TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ConnectableObservable<T> replay(final long time, final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.create(this, time, unit, scheduler, false);
     }
 
@@ -10994,8 +10994,8 @@ public final ConnectableObservable<T> replay(final long time, final TimeUnit uni
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ConnectableObservable<T> replay(final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.create(this, time, unit, scheduler, eagerTruncate);
     }
 
@@ -11046,7 +11046,7 @@ public final Observable<T> retry() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> retry(BiPredicate<? super Integer, ? super Throwable> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
 
         return RxJavaPlugins.onAssembly(new ObservableRetryBiPredicate<T>(this, predicate));
     }
@@ -11099,7 +11099,7 @@ public final Observable<T> retry(long times, Predicate<? super Throwable> predic
         if (times < 0) {
             throw new IllegalArgumentException("times >= 0 required but it was " + times);
         }
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
 
         return RxJavaPlugins.onAssembly(new ObservableRetryPredicate<T>(this, times, predicate));
     }
@@ -11136,7 +11136,7 @@ public final Observable<T> retry(Predicate<? super Throwable> predicate) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> retryUntil(final BooleanSupplier stop) {
-        ObjectHelper.requireNonNull(stop, "stop is null");
+        Objects.requireNonNull(stop, "stop is null");
         return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop));
     }
 
@@ -11217,7 +11217,7 @@ public final Observable<T> retryUntil(final BooleanSupplier stop) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> retryWhen(
             final Function<? super Observable<Throwable>, ? extends ObservableSource<?>> handler) {
-        ObjectHelper.requireNonNull(handler, "handler is null");
+        Objects.requireNonNull(handler, "handler is null");
         return RxJavaPlugins.onAssembly(new ObservableRetryWhen<T>(this, handler));
     }
 
@@ -11235,7 +11235,7 @@ public final Observable<T> retryWhen(
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void safeSubscribe(Observer<? super T> observer) {
-        ObjectHelper.requireNonNull(observer, "observer is null");
+        Objects.requireNonNull(observer, "observer is null");
         if (observer instanceof SafeObserver) {
             subscribe(observer);
         } else {
@@ -11323,8 +11323,8 @@ public final Observable<T> sample(long period, TimeUnit unit, boolean emitLast)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> sample(long period, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleTimed<T>(this, period, unit, scheduler, false));
     }
 
@@ -11359,8 +11359,8 @@ public final Observable<T> sample(long period, TimeUnit unit, Scheduler schedule
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> sample(long period, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleTimed<T>(this, period, unit, scheduler, emitLast));
     }
 
@@ -11385,7 +11385,7 @@ public final Observable<T> sample(long period, TimeUnit unit, Scheduler schedule
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> sample(ObservableSource<U> sampler) {
-        ObjectHelper.requireNonNull(sampler, "sampler is null");
+        Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<T>(this, sampler, false));
     }
 
@@ -11417,7 +11417,7 @@ public final <U> Observable<T> sample(ObservableSource<U> sampler) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> sample(ObservableSource<U> sampler, boolean emitLast) {
-        ObjectHelper.requireNonNull(sampler, "sampler is null");
+        Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<T>(this, sampler, emitLast));
     }
 
@@ -11445,7 +11445,7 @@ public final <U> Observable<T> sample(ObservableSource<U> sampler, boolean emitL
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> scan(BiFunction<T, T, T> accumulator) {
-        ObjectHelper.requireNonNull(accumulator, "accumulator is null");
+        Objects.requireNonNull(accumulator, "accumulator is null");
         return RxJavaPlugins.onAssembly(new ObservableScan<T>(this, accumulator));
     }
 
@@ -11494,7 +11494,7 @@ public final Observable<T> scan(BiFunction<T, T, T> accumulator) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> scan(final R initialValue, BiFunction<R, ? super T, R> accumulator) {
-        ObjectHelper.requireNonNull(initialValue, "initialValue is null");
+        Objects.requireNonNull(initialValue, "initialValue is null");
         return scanWith(Functions.justSupplier(initialValue), accumulator);
     }
 
@@ -11529,8 +11529,8 @@ public final <R> Observable<R> scan(final R initialValue, BiFunction<R, ? super
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> scanWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> accumulator) {
-        ObjectHelper.requireNonNull(seedSupplier, "seedSupplier is null");
-        ObjectHelper.requireNonNull(accumulator, "accumulator is null");
+        Objects.requireNonNull(seedSupplier, "seedSupplier is null");
+        Objects.requireNonNull(accumulator, "accumulator is null");
         return RxJavaPlugins.onAssembly(new ObservableScanSeed<T, R>(this, seedSupplier, accumulator));
     }
 
@@ -11621,7 +11621,7 @@ public final Maybe<T> singleElement() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> single(T defaultItem) {
-        ObjectHelper.requireNonNull(defaultItem, "defaultItem is null");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new ObservableSingleSingle<T>(this, defaultItem));
     }
 
@@ -11902,8 +11902,8 @@ public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler schedule
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         // the internal buffer holds pairs of (timestamp, value) so double the default buffer size
         int s = bufferSize << 1;
@@ -11931,7 +11931,7 @@ public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler schedule
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> skipUntil(ObservableSource<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableSkipUntil<T, U>(this, other));
     }
 
@@ -11954,7 +11954,7 @@ public final <U> Observable<T> skipUntil(ObservableSource<U> other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> skipWhile(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableSkipWhile<T>(this, predicate));
     }
 
@@ -12004,7 +12004,7 @@ public final Observable<T> sorted() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> sorted(Comparator<? super T> sortFunction) {
-        ObjectHelper.requireNonNull(sortFunction, "sortFunction is null");
+        Objects.requireNonNull(sortFunction, "sortFunction is null");
         return toList().toObservable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.<List<T>>identity());
     }
 
@@ -12054,7 +12054,7 @@ public final Observable<T> startWithIterable(Iterable<? extends T> items) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> startWith(ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return concatArray(other, this);
     }
 
@@ -12081,7 +12081,7 @@ public final Observable<T> startWith(ObservableSource<? extends T> other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> startWithItem(T item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return concatArray(just(item), this);
     }
 
@@ -12213,9 +12213,9 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError,
             Action onComplete) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
 
         LambdaObserver<T> ls = new LambdaObserver<T>(onNext, onError, onComplete, Functions.emptyConsumer());
 
@@ -12227,11 +12227,11 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
     public final void subscribe(Observer<? super T> observer) {
-        ObjectHelper.requireNonNull(observer, "observer is null");
+        Objects.requireNonNull(observer, "observer is null");
         try {
             observer = RxJavaPlugins.onSubscribe(this, observer);
 
-            ObjectHelper.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null Observer. Please change the handler provided to RxJavaPlugins.setOnObservableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
+            Objects.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null Observer. Please change the handler provided to RxJavaPlugins.setOnObservableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
 
             subscribeActual(observer);
         } catch (NullPointerException e) { // NOPMD
@@ -12309,7 +12309,7 @@ public final <E extends Observer<? super T>> E subscribeWith(E observer) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> subscribeOn(Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableSubscribeOn<T>(this, scheduler));
     }
 
@@ -12332,7 +12332,7 @@ public final Observable<T> subscribeOn(Scheduler scheduler) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> switchIfEmpty(ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchIfEmpty<T>(this, other));
     }
 
@@ -12391,7 +12391,7 @@ public final <R> Observable<R> switchMap(Function<? super T, ? extends Observabl
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> switchMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
             @SuppressWarnings("unchecked")
@@ -12441,7 +12441,7 @@ public final <R> Observable<R> switchMap(Function<? super T, ? extends Observabl
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable switchMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable<T>(this, mapper, false));
     }
 
@@ -12483,7 +12483,7 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable switchMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable<T>(this, mapper, true));
     }
 
@@ -12519,7 +12519,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<T, R>(this, mapper, false));
     }
 
@@ -12545,7 +12545,7 @@ public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<T, R>(this, mapper, true));
     }
 
@@ -12576,7 +12576,7 @@ public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? supe
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle<T, R>(this, mapper, false));
     }
 
@@ -12608,7 +12608,7 @@ public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? ex
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle<T, R>(this, mapper, true));
     }
 
@@ -12671,7 +12671,7 @@ public final <R> Observable<R> switchMapDelayError(Function<? super T, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> switchMapDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
             @SuppressWarnings("unchecked")
@@ -12894,8 +12894,8 @@ public final Observable<T> takeLast(long count, long time, TimeUnit unit, Schedu
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> takeLast(long count, long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (count < 0) {
             throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
@@ -13067,7 +13067,7 @@ public final Observable<T> takeLast(long time, TimeUnit unit, Scheduler schedule
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> takeUntil(ObservableSource<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableTakeUntil<T, U>(this, other));
     }
 
@@ -13096,7 +13096,7 @@ public final <U> Observable<T> takeUntil(ObservableSource<U> other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> takeUntil(Predicate<? super T> stopPredicate) {
-        ObjectHelper.requireNonNull(stopPredicate, "stopPredicate is null");
+        Objects.requireNonNull(stopPredicate, "stopPredicate is null");
         return RxJavaPlugins.onAssembly(new ObservableTakeUntilPredicate<T>(this, stopPredicate));
     }
 
@@ -13120,7 +13120,7 @@ public final Observable<T> takeUntil(Predicate<? super T> stopPredicate) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> takeWhile(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableTakeWhile<T>(this, predicate));
     }
 
@@ -13176,8 +13176,8 @@ public final Observable<T> throttleFirst(long windowDuration, TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> throttleFirst(long skipDuration, TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableThrottleFirstTimed<T>(this, skipDuration, unit, scheduler));
     }
 
@@ -13363,8 +13363,8 @@ public final Observable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableThrottleLatest<T>(this, timeout, unit, scheduler, emitLast));
     }
 
@@ -13516,8 +13516,8 @@ public final Observable<Timed<T>> timeInterval(TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
     public final Observable<Timed<T>> timeInterval(TimeUnit unit, Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableTimeInterval<T>(this, unit, scheduler));
     }
 
@@ -13581,7 +13581,7 @@ public final <V> Observable<T> timeout(Function<? super T, ? extends ObservableS
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <V> Observable<T> timeout(Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
             ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(null, itemTimeoutIndicator, other);
     }
 
@@ -13634,7 +13634,7 @@ public final Observable<T> timeout(long timeout, TimeUnit timeUnit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     public final Observable<T> timeout(long timeout, TimeUnit timeUnit, ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, timeUnit, other, Schedulers.computation());
     }
 
@@ -13665,7 +13665,7 @@ public final Observable<T> timeout(long timeout, TimeUnit timeUnit, ObservableSo
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler, ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, timeUnit, other, scheduler);
     }
 
@@ -13728,7 +13728,7 @@ public final Observable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler sc
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, V> Observable<T> timeout(ObservableSource<U> firstTimeoutIndicator,
             Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator) {
-        ObjectHelper.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
+        Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, null);
     }
 
@@ -13770,15 +13770,15 @@ public final <U, V> Observable<T> timeout(
             ObservableSource<U> firstTimeoutIndicator,
             Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
                     ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other);
     }
 
     private Observable<T> timeout0(long timeout, TimeUnit timeUnit, ObservableSource<? extends T> other,
             Scheduler scheduler) {
-        ObjectHelper.requireNonNull(timeUnit, "timeUnit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(timeUnit, "timeUnit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableTimeoutTimed<T>(this, timeout, timeUnit, scheduler, other));
     }
 
@@ -13786,7 +13786,7 @@ private <U, V> Observable<T> timeout0(
             ObservableSource<U> firstTimeoutIndicator,
             Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
                     ObservableSource<? extends T> other) {
-        ObjectHelper.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
+        Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
         return RxJavaPlugins.onAssembly(new ObservableTimeout<T, U, V>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
     }
 
@@ -13875,8 +13875,8 @@ public final Observable<Timed<T>> timestamp(TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
     public final Observable<Timed<T>> timestamp(final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return map(Functions.<T>timestampWith(unit, scheduler));
     }
 
@@ -13898,7 +13898,7 @@ public final Observable<Timed<T>> timestamp(final TimeUnit unit, final Scheduler
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
-        return ObjectHelper.requireNonNull(converter, "converter is null").apply(this);
+        return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
 
     /**
@@ -13994,7 +13994,7 @@ public final Single<List<T>> toList(final int capacityHint) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U extends Collection<? super T>> Single<U> toList(Supplier<U> collectionSupplier) {
-        ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null");
+        Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableToListSingle<T, U>(this, collectionSupplier));
     }
 
@@ -14025,7 +14025,7 @@ public final <U extends Collection<? super T>> Single<U> toList(Supplier<U> coll
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K> Single<Map<K, T>> toMap(final Function<? super T, ? extends K> keySelector) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
         return collect(HashMapSupplier.<K, T>asSupplier(), Functions.toMapKeySelector(keySelector));
     }
 
@@ -14061,8 +14061,8 @@ public final <K> Single<Map<K, T>> toMap(final Function<? super T, ? extends K>
     public final <K, V> Single<Map<K, V>> toMap(
             final Function<? super T, ? extends K> keySelector,
             final Function<? super T, ? extends V> valueSelector) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(valueSelector, "valueSelector is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(valueSelector, "valueSelector is null");
         return collect(HashMapSupplier.<K, V>asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector));
     }
 
@@ -14098,9 +14098,9 @@ public final <K, V> Single<Map<K, V>> toMap(
             final Function<? super T, ? extends K> keySelector,
             final Function<? super T, ? extends V> valueSelector,
             Supplier<? extends Map<K, V>> mapSupplier) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(valueSelector, "valueSelector is null");
-        ObjectHelper.requireNonNull(mapSupplier, "mapSupplier is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(valueSelector, "valueSelector is null");
+        Objects.requireNonNull(mapSupplier, "mapSupplier is null");
         return collect(mapSupplier, Functions.toMapKeyValueSelector(keySelector, valueSelector));
     }
 
@@ -14200,10 +14200,10 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
             final Function<? super T, ? extends V> valueSelector,
             final Supplier<? extends Map<K, Collection<V>>> mapSupplier,
             final Function<? super K, ? extends Collection<? super V>> collectionFactory) {
-        ObjectHelper.requireNonNull(keySelector, "keySelector is null");
-        ObjectHelper.requireNonNull(valueSelector, "valueSelector is null");
-        ObjectHelper.requireNonNull(mapSupplier, "mapSupplier is null");
-        ObjectHelper.requireNonNull(collectionFactory, "collectionFactory is null");
+        Objects.requireNonNull(keySelector, "keySelector is null");
+        Objects.requireNonNull(valueSelector, "valueSelector is null");
+        Objects.requireNonNull(mapSupplier, "mapSupplier is null");
+        Objects.requireNonNull(collectionFactory, "collectionFactory is null");
         return collect(mapSupplier, Functions.toMultimapKeyValueSelector(keySelector, valueSelector, collectionFactory));
     }
 
@@ -14352,7 +14352,7 @@ public final Single<List<T>> toSortedList() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<List<T>> toSortedList(final Comparator<? super T> comparator) {
-        ObjectHelper.requireNonNull(comparator, "comparator is null");
+        Objects.requireNonNull(comparator, "comparator is null");
         return toList().map(Functions.listSorter(comparator));
     }
 
@@ -14383,7 +14383,7 @@ public final Single<List<T>> toSortedList(final Comparator<? super T> comparator
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<List<T>> toSortedList(final Comparator<? super T> comparator, int capacityHint) {
-        ObjectHelper.requireNonNull(comparator, "comparator is null");
+        Objects.requireNonNull(comparator, "comparator is null");
         return toList(capacityHint).map(Functions.listSorter(comparator));
     }
 
@@ -14438,7 +14438,7 @@ public final Single<List<T>> toSortedList(int capacityHint) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> unsubscribeOn(Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableUnsubscribeOn<T>(this, scheduler));
     }
 
@@ -14633,8 +14633,8 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, Time
         ObjectHelper.verifyPositive(timespan, "timespan");
         ObjectHelper.verifyPositive(timeskip, "timeskip");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
         return RxJavaPlugins.onAssembly(new ObservableWindowTimed<T>(this, timespan, timeskip, unit, scheduler, Long.MAX_VALUE, bufferSize, false));
     }
 
@@ -14903,8 +14903,8 @@ public final Observable<Observable<T>> window(
             long timespan, TimeUnit unit, Scheduler scheduler,
             long count, boolean restart, int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
-        ObjectHelper.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(count, "count");
         return RxJavaPlugins.onAssembly(new ObservableWindowTimed<T>(this, timespan, timespan, unit, scheduler, count, bufferSize, restart));
     }
@@ -14970,7 +14970,7 @@ public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary, int bufferSize) {
-        ObjectHelper.requireNonNull(boundary, "boundary is null");
+        Objects.requireNonNull(boundary, "boundary is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableWindowBoundary<T, B>(this, boundary, bufferSize));
     }
@@ -15046,8 +15046,8 @@ public final <U, V> Observable<Observable<T>> window(
     public final <U, V> Observable<Observable<T>> window(
             ObservableSource<U> openingIndicator,
             Function<? super U, ? extends ObservableSource<V>> closingIndicator, int bufferSize) {
-        ObjectHelper.requireNonNull(openingIndicator, "openingIndicator is null");
-        ObjectHelper.requireNonNull(closingIndicator, "closingIndicator is null");
+        Objects.requireNonNull(openingIndicator, "openingIndicator is null");
+        Objects.requireNonNull(closingIndicator, "closingIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableWindowBoundarySelector<T, U, V>(this, openingIndicator, closingIndicator, bufferSize));
     }
@@ -15079,8 +15079,8 @@ public final <U, V> Observable<Observable<T>> window(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Observable<R> withLatestFrom(ObservableSource<? extends U> other, BiFunction<? super T, ? super U, ? extends R> combiner) {
-        ObjectHelper.requireNonNull(other, "other is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(other, "other is null");
+        Objects.requireNonNull(combiner, "combiner is null");
 
         return RxJavaPlugins.onAssembly(new ObservableWithLatestFrom<T, U, R>(this, combiner, other));
     }
@@ -15114,9 +15114,9 @@ public final <U, R> Observable<R> withLatestFrom(ObservableSource<? extends U> o
     public final <T1, T2, R> Observable<R> withLatestFrom(
             ObservableSource<T1> o1, ObservableSource<T2> o2,
             Function3<? super T, ? super T1, ? super T2, R> combiner) {
-        ObjectHelper.requireNonNull(o1, "o1 is null");
-        ObjectHelper.requireNonNull(o2, "o2 is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(o1, "o1 is null");
+        Objects.requireNonNull(o2, "o2 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
         return withLatestFrom(new ObservableSource[] { o1, o2 }, f);
     }
@@ -15153,10 +15153,10 @@ public final <T1, T2, T3, R> Observable<R> withLatestFrom(
             ObservableSource<T1> o1, ObservableSource<T2> o2,
             ObservableSource<T3> o3,
             Function4<? super T, ? super T1, ? super T2, ? super T3, R> combiner) {
-        ObjectHelper.requireNonNull(o1, "o1 is null");
-        ObjectHelper.requireNonNull(o2, "o2 is null");
-        ObjectHelper.requireNonNull(o3, "o3 is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(o1, "o1 is null");
+        Objects.requireNonNull(o2, "o2 is null");
+        Objects.requireNonNull(o3, "o3 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
         return withLatestFrom(new ObservableSource[] { o1, o2, o3 }, f);
     }
@@ -15195,11 +15195,11 @@ public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
             ObservableSource<T1> o1, ObservableSource<T2> o2,
             ObservableSource<T3> o3, ObservableSource<T4> o4,
             Function5<? super T, ? super T1, ? super T2, ? super T3, ? super T4, R> combiner) {
-        ObjectHelper.requireNonNull(o1, "o1 is null");
-        ObjectHelper.requireNonNull(o2, "o2 is null");
-        ObjectHelper.requireNonNull(o3, "o3 is null");
-        ObjectHelper.requireNonNull(o4, "o4 is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(o1, "o1 is null");
+        Objects.requireNonNull(o2, "o2 is null");
+        Objects.requireNonNull(o3, "o3 is null");
+        Objects.requireNonNull(o4, "o4 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
         return withLatestFrom(new ObservableSource[] { o1, o2, o3, o4 }, f);
     }
@@ -15228,8 +15228,8 @@ public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> withLatestFrom(ObservableSource<?>[] others, Function<? super Object[], R> combiner) {
-        ObjectHelper.requireNonNull(others, "others is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(others, "others is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<T, R>(this, others, combiner));
     }
 
@@ -15257,8 +15257,8 @@ public final <R> Observable<R> withLatestFrom(ObservableSource<?>[] others, Func
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> withLatestFrom(Iterable<? extends ObservableSource<?>> others, Function<? super Object[], R> combiner) {
-        ObjectHelper.requireNonNull(others, "others is null");
-        ObjectHelper.requireNonNull(combiner, "combiner is null");
+        Objects.requireNonNull(others, "others is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<T, R>(this, others, combiner));
     }
 
@@ -15291,8 +15291,8 @@ public final <R> Observable<R> withLatestFrom(Iterable<? extends ObservableSourc
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Observable<R> zipWith(Iterable<U> other,  BiFunction<? super T, ? super U, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(other, "other is null");
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(other, "other is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return RxJavaPlugins.onAssembly(new ObservableZipIterable<T, U, R>(this, other, zipper));
     }
 
@@ -15335,7 +15335,7 @@ public final <U, R> Observable<R> zipWith(Iterable<U> other,  BiFunction<? super
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Observable<R> zipWith(ObservableSource<? extends U> other,
             BiFunction<? super T, ? super U, ? extends R> zipper) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 3cffa8dfad..27fad6d53e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.core;
 
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.concurrent.*;
 
 import org.reactivestreams.Publisher;
@@ -132,7 +133,7 @@ public abstract class Single<T> implements SingleSource<T> {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> amb(final Iterable<? extends SingleSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new SingleAmb<T>(null, sources));
     }
 
@@ -207,7 +208,7 @@ public static <T> Flowable<T> concat(Iterable<? extends SingleSource<? extends T
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Observable<T> concat(ObservableSource<? extends SingleSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, SingleInternalHelper.toObservable(), 2, ErrorMode.IMMEDIATE));
     }
 
@@ -260,7 +261,7 @@ public static <T> Flowable<T> concat(Publisher<? extends SingleSource<? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> concat(Publisher<? extends SingleSource<? extends T>> sources, int prefetch) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, SingleInternalHelper.toFlowable(), prefetch, ErrorMode.IMMEDIATE));
     }
@@ -292,8 +293,8 @@ public static <T> Flowable<T> concat(Publisher<? extends SingleSource<? extends
     public static <T> Flowable<T> concat(
             SingleSource<? extends T> source1, SingleSource<? extends T> source2
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return concat(Flowable.fromArray(source1, source2));
     }
 
@@ -327,9 +328,9 @@ public static <T> Flowable<T> concat(
             SingleSource<? extends T> source1, SingleSource<? extends T> source2,
             SingleSource<? extends T> source3
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return concat(Flowable.fromArray(source1, source2, source3));
     }
 
@@ -365,10 +366,10 @@ public static <T> Flowable<T> concat(
             SingleSource<? extends T> source1, SingleSource<? extends T> source2,
             SingleSource<? extends T> source3, SingleSource<? extends T> source4
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return concat(Flowable.fromArray(source1, source2, source3, source4));
     }
 
@@ -523,7 +524,7 @@ public static <T> Flowable<T> concatEager(Iterable<? extends SingleSource<? exte
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> create(SingleOnSubscribe<T> source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new SingleCreate<T>(source));
     }
 
@@ -545,7 +546,7 @@ public static <T> Single<T> create(SingleOnSubscribe<T> source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> defer(final Supplier<? extends SingleSource<? extends T>> singleSupplier) {
-        ObjectHelper.requireNonNull(singleSupplier, "singleSupplier is null");
+        Objects.requireNonNull(singleSupplier, "singleSupplier is null");
         return RxJavaPlugins.onAssembly(new SingleDefer<T>(singleSupplier));
     }
 
@@ -566,7 +567,7 @@ public static <T> Single<T> defer(final Supplier<? extends SingleSource<? extend
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> error(final Supplier<? extends Throwable> errorSupplier) {
-        ObjectHelper.requireNonNull(errorSupplier, "errorSupplier is null");
+        Objects.requireNonNull(errorSupplier, "errorSupplier is null");
         return RxJavaPlugins.onAssembly(new SingleError<T>(errorSupplier));
     }
 
@@ -592,7 +593,7 @@ public static <T> Single<T> error(final Supplier<? extends Throwable> errorSuppl
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> error(final Throwable exception) {
-        ObjectHelper.requireNonNull(exception, "exception is null");
+        Objects.requireNonNull(exception, "exception is null");
         return error(Functions.justSupplier(exception));
     }
 
@@ -628,7 +629,7 @@ public static <T> Single<T> error(final Throwable exception) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> fromCallable(final Callable<? extends T> callable) {
-        ObjectHelper.requireNonNull(callable, "callable is null");
+        Objects.requireNonNull(callable, "callable is null");
         return RxJavaPlugins.onAssembly(new SingleFromCallable<T>(callable));
     }
 
@@ -793,7 +794,7 @@ public static <T> Single<T> fromFuture(Future<? extends T> future, Scheduler sch
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> fromPublisher(final Publisher<? extends T> publisher) {
-        ObjectHelper.requireNonNull(publisher, "publisher is null");
+        Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new SingleFromPublisher<T>(publisher));
     }
 
@@ -817,7 +818,7 @@ public static <T> Single<T> fromPublisher(final Publisher<? extends T> publisher
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> fromObservable(ObservableSource<? extends T> observableSource) {
-        ObjectHelper.requireNonNull(observableSource, "observableSource is null");
+        Objects.requireNonNull(observableSource, "observableSource is null");
         return RxJavaPlugins.onAssembly(new ObservableSingleSingle<T>(observableSource, null));
     }
 
@@ -855,7 +856,7 @@ public static <T> Single<T> fromObservable(ObservableSource<? extends T> observa
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> fromSupplier(final Supplier<? extends T> supplier) {
-        ObjectHelper.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new SingleFromSupplier<T>(supplier));
     }
 
@@ -882,7 +883,7 @@ public static <T> Single<T> fromSupplier(final Supplier<? extends T> supplier) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T> Single<T> just(final T item) {
-        ObjectHelper.requireNonNull(item, "item is null");
+        Objects.requireNonNull(item, "item is null");
         return RxJavaPlugins.onAssembly(new SingleJust<T>(item));
     }
 
@@ -960,7 +961,7 @@ public static <T> Flowable<T> merge(Iterable<? extends SingleSource<? extends T>
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> merge(Publisher<? extends SingleSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), false, Integer.MAX_VALUE, Flowable.bufferSize()));
     }
 
@@ -991,7 +992,7 @@ public static <T> Flowable<T> merge(Publisher<? extends SingleSource<? extends T
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Single<T> merge(SingleSource<? extends SingleSource<? extends T>> source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMap<SingleSource<? extends T>, T>(source, (Function)Functions.identity()));
     }
 
@@ -1039,8 +1040,8 @@ public static <T> Single<T> merge(SingleSource<? extends SingleSource<? extends
     public static <T> Flowable<T> merge(
             SingleSource<? extends T> source1, SingleSource<? extends T> source2
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return merge(Flowable.fromArray(source1, source2));
     }
 
@@ -1091,9 +1092,9 @@ public static <T> Flowable<T> merge(
             SingleSource<? extends T> source1, SingleSource<? extends T> source2,
             SingleSource<? extends T> source3
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return merge(Flowable.fromArray(source1, source2, source3));
     }
 
@@ -1146,10 +1147,10 @@ public static <T> Flowable<T> merge(
             SingleSource<? extends T> source1, SingleSource<? extends T> source2,
             SingleSource<? extends T> source3, SingleSource<? extends T> source4
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return merge(Flowable.fromArray(source1, source2, source3, source4));
     }
 
@@ -1203,7 +1204,7 @@ public static <T> Flowable<T> mergeDelayError(Iterable<? extends SingleSource<?
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> mergeDelayError(Publisher<? extends SingleSource<? extends T>> sources) {
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), true, Integer.MAX_VALUE, Flowable.bufferSize()));
     }
 
@@ -1240,8 +1241,8 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends SingleSource<?
     public static <T> Flowable<T> mergeDelayError(
             SingleSource<? extends T> source1, SingleSource<? extends T> source2
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return mergeDelayError(Flowable.fromArray(source1, source2));
     }
 
@@ -1281,9 +1282,9 @@ public static <T> Flowable<T> mergeDelayError(
             SingleSource<? extends T> source1, SingleSource<? extends T> source2,
             SingleSource<? extends T> source3
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return mergeDelayError(Flowable.fromArray(source1, source2, source3));
     }
 
@@ -1325,10 +1326,10 @@ public static <T> Flowable<T> mergeDelayError(
             SingleSource<? extends T> source1, SingleSource<? extends T> source2,
             SingleSource<? extends T> source3, SingleSource<? extends T> source4
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return mergeDelayError(Flowable.fromArray(source1, source2, source3, source4));
     }
 
@@ -1391,8 +1392,8 @@ public static Single<Long> timer(long delay, TimeUnit unit) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public static Single<Long> timer(final long delay, final TimeUnit unit, final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new SingleTimer(delay, unit, scheduler));
     }
 
@@ -1414,8 +1415,8 @@ public static Single<Long> timer(final long delay, final TimeUnit unit, final Sc
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<Boolean> equals(final SingleSource<? extends T> first, final SingleSource<? extends T> second) { // NOPMD
-        ObjectHelper.requireNonNull(first, "first is null");
-        ObjectHelper.requireNonNull(second, "second is null");
+        Objects.requireNonNull(first, "first is null");
+        Objects.requireNonNull(second, "second is null");
         return RxJavaPlugins.onAssembly(new SingleEquals<T>(first, second));
     }
 
@@ -1440,7 +1441,7 @@ public static <T> Single<Boolean> equals(final SingleSource<? extends T> first,
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> unsafeCreate(SingleSource<T> onSubscribe) {
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         if (onSubscribe instanceof Single) {
             throw new IllegalArgumentException("unsafeCreate(Single) should be upgraded");
         }
@@ -1510,9 +1511,9 @@ public static <T, U> Single<T> using(
             final Function<? super U, ? extends SingleSource<? extends T>> singleFunction,
             final Consumer<? super U> disposer,
             final boolean eager) {
-        ObjectHelper.requireNonNull(resourceSupplier, "resourceSupplier is null");
-        ObjectHelper.requireNonNull(singleFunction, "singleFunction is null");
-        ObjectHelper.requireNonNull(disposer, "disposer is null");
+        Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
+        Objects.requireNonNull(singleFunction, "singleFunction is null");
+        Objects.requireNonNull(disposer, "disposer is null");
 
         return RxJavaPlugins.onAssembly(new SingleUsing<T, U>(resourceSupplier, singleFunction, disposer, eager));
     }
@@ -1534,7 +1535,7 @@ public static <T, U> Single<T> using(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> wrap(SingleSource<T> source) {
-        ObjectHelper.requireNonNull(source, "source is null");
+        Objects.requireNonNull(source, "source is null");
         if (source instanceof Single) {
             return RxJavaPlugins.onAssembly((Single<T>)source);
         }
@@ -1574,8 +1575,8 @@ public static <T> Single<T> wrap(SingleSource<T> source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Single<R> zip(final Iterable<? extends SingleSource<? extends T>> sources, Function<? super Object[], ? extends R> zipper) {
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new SingleZipIterable<T, R>(sources, zipper));
     }
 
@@ -1610,8 +1611,8 @@ public static <T1, T2, R> Single<R> zip(
             SingleSource<? extends T1> source1, SingleSource<? extends T2> source2,
             BiFunction<? super T1, ? super T2, ? extends R> zipper
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2);
     }
 
@@ -1650,9 +1651,9 @@ public static <T1, T2, T3, R> Single<R> zip(
             SingleSource<? extends T3> source3,
             Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3);
     }
 
@@ -1694,10 +1695,10 @@ public static <T1, T2, T3, T4, R> Single<R> zip(
             SingleSource<? extends T3> source3, SingleSource<? extends T4> source4,
             Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4);
     }
 
@@ -1743,11 +1744,11 @@ public static <T1, T2, T3, T4, T5, R> Single<R> zip(
             SingleSource<? extends T5> source5,
             Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5);
     }
 
@@ -1796,12 +1797,12 @@ public static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(
             SingleSource<? extends T5> source5, SingleSource<? extends T6> source6,
             Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6);
     }
 
@@ -1854,13 +1855,13 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(
             SingleSource<? extends T7> source7,
             Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7);
     }
 
@@ -1916,14 +1917,14 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(
             SingleSource<? extends T7> source7, SingleSource<? extends T8> source8,
             Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8);
     }
 
@@ -1983,15 +1984,15 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(
             SingleSource<? extends T9> source9,
             Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper
      ) {
-        ObjectHelper.requireNonNull(source1, "source1 is null");
-        ObjectHelper.requireNonNull(source2, "source2 is null");
-        ObjectHelper.requireNonNull(source3, "source3 is null");
-        ObjectHelper.requireNonNull(source4, "source4 is null");
-        ObjectHelper.requireNonNull(source5, "source5 is null");
-        ObjectHelper.requireNonNull(source6, "source6 is null");
-        ObjectHelper.requireNonNull(source7, "source7 is null");
-        ObjectHelper.requireNonNull(source8, "source8 is null");
-        ObjectHelper.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(source9, "source9 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8, source9);
     }
 
@@ -2027,8 +2028,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Single<R> zipArray(Function<? super Object[], ? extends R> zipper, SingleSource<? extends T>... sources) {
-        ObjectHelper.requireNonNull(zipper, "zipper is null");
-        ObjectHelper.requireNonNull(sources, "sources is null");
+        Objects.requireNonNull(zipper, "zipper is null");
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return error(new NoSuchElementException());
         }
@@ -2053,7 +2054,7 @@ public static <T, R> Single<R> zipArray(Function<? super Object[], ? extends R>
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     public final Single<T> ambWith(SingleSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
 
@@ -2099,7 +2100,7 @@ public final Single<T> hide() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> compose(SingleTransformer<? super T, ? extends R> transformer) {
-        return wrap(((SingleTransformer<T, R>) ObjectHelper.requireNonNull(transformer, "transformer is null")).apply(this));
+        return wrap(((SingleTransformer<T, R>) Objects.requireNonNull(transformer, "transformer is null")).apply(this));
     }
 
     /**
@@ -2140,7 +2141,7 @@ public final Single<T> cache() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Single<U> cast(final Class<? extends U> clazz) {
-        ObjectHelper.requireNonNull(clazz, "clazz is null");
+        Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
 
@@ -2259,8 +2260,8 @@ public final Single<T> delay(final long time, final TimeUnit unit, final Schedul
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Single<T> delay(final long time, final TimeUnit unit, final Scheduler scheduler, boolean delayError) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new SingleDelay<T>(this, time, unit, scheduler, delayError));
     }
 
@@ -2284,7 +2285,7 @@ public final Single<T> delay(final long time, final TimeUnit unit, final Schedul
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> delaySubscription(CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable<T>(this, other));
     }
 
@@ -2309,7 +2310,7 @@ public final Single<T> delaySubscription(CompletableSource other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Single<T> delaySubscription(SingleSource<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new SingleDelayWithSingle<T, U>(this, other));
     }
 
@@ -2334,7 +2335,7 @@ public final <U> Single<T> delaySubscription(SingleSource<U> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Single<T> delaySubscription(ObservableSource<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new SingleDelayWithObservable<T, U>(this, other));
     }
 
@@ -2364,7 +2365,7 @@ public final <U> Single<T> delaySubscription(ObservableSource<U> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Single<T> delaySubscription(Publisher<U> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new SingleDelayWithPublisher<T, U>(this, other));
     }
 
@@ -2445,7 +2446,7 @@ public final Single<T> delaySubscription(long time, TimeUnit unit, Scheduler sch
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> dematerialize(Function<? super T, Notification<R>> selector) {
-        ObjectHelper.requireNonNull(selector, "selector is null");
+        Objects.requireNonNull(selector, "selector is null");
         return RxJavaPlugins.onAssembly(new SingleDematerialize<T, R>(this, selector));
     }
 
@@ -2469,7 +2470,7 @@ public final <R> Maybe<R> dematerialize(Function<? super T, Notification<R>> sel
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> doAfterSuccess(Consumer<? super T> onAfterSuccess) {
-        ObjectHelper.requireNonNull(onAfterSuccess, "onAfterSuccess is null");
+        Objects.requireNonNull(onAfterSuccess, "onAfterSuccess is null");
         return RxJavaPlugins.onAssembly(new SingleDoAfterSuccess<T>(this, onAfterSuccess));
     }
 
@@ -2498,7 +2499,7 @@ public final Single<T> doAfterSuccess(Consumer<? super T> onAfterSuccess) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> doAfterTerminate(Action onAfterTerminate) {
-        ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
+        Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
         return RxJavaPlugins.onAssembly(new SingleDoAfterTerminate<T>(this, onAfterTerminate));
     }
 
@@ -2525,7 +2526,7 @@ public final Single<T> doAfterTerminate(Action onAfterTerminate) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> doFinally(Action onFinally) {
-        ObjectHelper.requireNonNull(onFinally, "onFinally is null");
+        Objects.requireNonNull(onFinally, "onFinally is null");
         return RxJavaPlugins.onAssembly(new SingleDoFinally<T>(this, onFinally));
     }
 
@@ -2547,7 +2548,7 @@ public final Single<T> doFinally(Action onFinally) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> doOnSubscribe(final Consumer<? super Disposable> onSubscribe) {
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         return RxJavaPlugins.onAssembly(new SingleDoOnSubscribe<T>(this, onSubscribe));
     }
 
@@ -2574,7 +2575,7 @@ public final Single<T> doOnSubscribe(final Consumer<? super Disposable> onSubscr
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> doOnTerminate(final Action onTerminate) {
-        ObjectHelper.requireNonNull(onTerminate, "onTerminate is null");
+        Objects.requireNonNull(onTerminate, "onTerminate is null");
         return RxJavaPlugins.onAssembly(new SingleDoOnTerminate<T>(this, onTerminate));
     }
 
@@ -2596,7 +2597,7 @@ public final Single<T> doOnTerminate(final Action onTerminate) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> doOnSuccess(final Consumer<? super T> onSuccess) {
-        ObjectHelper.requireNonNull(onSuccess, "onSuccess is null");
+        Objects.requireNonNull(onSuccess, "onSuccess is null");
         return RxJavaPlugins.onAssembly(new SingleDoOnSuccess<T>(this, onSuccess));
     }
 
@@ -2617,7 +2618,7 @@ public final Single<T> doOnSuccess(final Consumer<? super T> onSuccess) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> doOnEvent(final BiConsumer<? super T, ? super Throwable> onEvent) {
-        ObjectHelper.requireNonNull(onEvent, "onEvent is null");
+        Objects.requireNonNull(onEvent, "onEvent is null");
         return RxJavaPlugins.onAssembly(new SingleDoOnEvent<T>(this, onEvent));
     }
 
@@ -2639,7 +2640,7 @@ public final Single<T> doOnEvent(final BiConsumer<? super T, ? super Throwable>
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> doOnError(final Consumer<? super Throwable> onError) {
-        ObjectHelper.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onError, "onError is null");
         return RxJavaPlugins.onAssembly(new SingleDoOnError<T>(this, onError));
     }
 
@@ -2662,7 +2663,7 @@ public final Single<T> doOnError(final Consumer<? super Throwable> onError) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> doOnDispose(final Action onDispose) {
-        ObjectHelper.requireNonNull(onDispose, "onDispose is null");
+        Objects.requireNonNull(onDispose, "onDispose is null");
         return RxJavaPlugins.onAssembly(new SingleDoOnDispose<T>(this, onDispose));
     }
 
@@ -2687,7 +2688,7 @@ public final Single<T> doOnDispose(final Action onDispose) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> filter(Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate is null");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new MaybeFilterSingle<T>(this, predicate));
     }
 
@@ -2711,7 +2712,7 @@ public final Maybe<T> filter(Predicate<? super T> predicate) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> flatMap(Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMap<T, R>(this, mapper));
     }
 
@@ -2735,7 +2736,7 @@ public final <R> Single<R> flatMap(Function<? super T, ? extends SingleSource<?
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> flatMapMaybe(final Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapMaybe<T, R>(this, mapper));
     }
 
@@ -2764,7 +2765,7 @@ public final <R> Maybe<R> flatMapMaybe(final Function<? super T, ? extends Maybe
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> flatMapPublisher(Function<? super T, ? extends Publisher<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapPublisher<T, R>(this, mapper));
     }
 
@@ -2793,7 +2794,7 @@ public final <R> Flowable<R> flatMapPublisher(Function<? super T, ? extends Publ
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapIterableFlowable<T, U>(this, mapper));
     }
 
@@ -2819,7 +2820,7 @@ public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? exten
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapIterableObservable<T, U>(this, mapper));
     }
 
@@ -2843,7 +2844,7 @@ public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? e
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> flatMapObservable(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapObservable<T, R>(this, mapper));
     }
 
@@ -2868,7 +2869,7 @@ public final <R> Observable<R> flatMapObservable(Function<? super T, ? extends O
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable flatMapCompletable(final Function<? super T, ? extends CompletableSource> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapCompletable<T>(this, mapper));
     }
 
@@ -3042,7 +3043,7 @@ public final T blockingGet() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> lift(final SingleOperator<? extends R, ? super T> lift) {
-        ObjectHelper.requireNonNull(lift, "lift is null");
+        Objects.requireNonNull(lift, "lift is null");
         return RxJavaPlugins.onAssembly(new SingleLift<T, R>(this, lift));
     }
 
@@ -3066,7 +3067,7 @@ public final <R> Single<R> lift(final SingleOperator<? extends R, ? super T> lif
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> map(Function<? super T, ? extends R> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleMap<T, R>(this, mapper));
     }
 
@@ -3130,8 +3131,8 @@ public final Single<Boolean> contains(Object value) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> contains(final Object value, final BiPredicate<Object, Object> comparer) {
-        ObjectHelper.requireNonNull(value, "value is null");
-        ObjectHelper.requireNonNull(comparer, "comparer is null");
+        Objects.requireNonNull(value, "value is null");
+        Objects.requireNonNull(comparer, "comparer is null");
         return RxJavaPlugins.onAssembly(new SingleContains<T>(this, value, comparer));
     }
 
@@ -3184,7 +3185,7 @@ public final Flowable<T> mergeWith(SingleSource<? extends T> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Single<T> observeOn(final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new SingleObserveOn<T>(this, scheduler));
     }
 
@@ -3218,7 +3219,7 @@ public final Single<T> observeOn(final Scheduler scheduler) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> onErrorReturn(final Function<Throwable, ? extends T> resumeFunction) {
-        ObjectHelper.requireNonNull(resumeFunction, "resumeFunction is null");
+        Objects.requireNonNull(resumeFunction, "resumeFunction is null");
         return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<T>(this, resumeFunction, null));
     }
 
@@ -3238,7 +3239,7 @@ public final Single<T> onErrorReturn(final Function<Throwable, ? extends T> resu
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> onErrorReturnItem(final T value) {
-        ObjectHelper.requireNonNull(value, "value is null");
+        Objects.requireNonNull(value, "value is null");
         return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<T>(this, null, value));
     }
 
@@ -3273,7 +3274,7 @@ public final Single<T> onErrorReturnItem(final T value) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> onErrorResumeWith(final SingleSource<? extends T> resumeSingleInCaseOfError) {
-        ObjectHelper.requireNonNull(resumeSingleInCaseOfError, "resumeSingleInCaseOfError is null");
+        Objects.requireNonNull(resumeSingleInCaseOfError, "resumeSingleInCaseOfError is null");
         return onErrorResumeNext(Functions.justFunction(resumeSingleInCaseOfError));
     }
 
@@ -3310,7 +3311,7 @@ public final Single<T> onErrorResumeWith(final SingleSource<? extends T> resumeS
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> onErrorResumeNext(
             final Function<? super Throwable, ? extends SingleSource<? extends T>> resumeFunctionInCaseOfError) {
-        ObjectHelper.requireNonNull(resumeFunctionInCaseOfError, "resumeFunctionInCaseOfError is null");
+        Objects.requireNonNull(resumeFunctionInCaseOfError, "resumeFunctionInCaseOfError is null");
         return RxJavaPlugins.onAssembly(new SingleResumeNext<T>(this, resumeFunctionInCaseOfError));
     }
 
@@ -3614,7 +3615,7 @@ public final Disposable subscribe() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable subscribe(final BiConsumer<? super T, ? super Throwable> onCallback) {
-        ObjectHelper.requireNonNull(onCallback, "onCallback is null");
+        Objects.requireNonNull(onCallback, "onCallback is null");
 
         BiConsumerSingleObserver<T> observer = new BiConsumerSingleObserver<T>(onCallback);
         subscribe(observer);
@@ -3672,8 +3673,8 @@ public final Disposable subscribe(Consumer<? super T> onSuccess) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable subscribe(final Consumer<? super T> onSuccess, final Consumer<? super Throwable> onError) {
-        ObjectHelper.requireNonNull(onSuccess, "onSuccess is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onSuccess, "onSuccess is null");
+        Objects.requireNonNull(onError, "onError is null");
 
         ConsumerSingleObserver<T> observer = new ConsumerSingleObserver<T>(onSuccess, onError);
         subscribe(observer);
@@ -3683,11 +3684,11 @@ public final Disposable subscribe(final Consumer<? super T> onSuccess, final Con
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
     public final void subscribe(SingleObserver<? super T> observer) {
-        ObjectHelper.requireNonNull(observer, "observer is null");
+        Objects.requireNonNull(observer, "observer is null");
 
         observer = RxJavaPlugins.onSubscribe(this, observer);
 
-        ObjectHelper.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null SingleObserver. Please check the handler provided to RxJavaPlugins.setOnSingleSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
+        Objects.requireNonNull(observer, "The RxJavaPlugins.onSubscribe hook returned a null SingleObserver. Please check the handler provided to RxJavaPlugins.setOnSingleSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
 
         try {
             subscribeActual(observer);
@@ -3763,7 +3764,7 @@ public final <E extends SingleObserver<? super T>> E subscribeWith(E observer) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Single<T> subscribeOn(final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new SingleSubscribeOn<T>(this, scheduler));
     }
 
@@ -3788,7 +3789,7 @@ public final Single<T> subscribeOn(final Scheduler scheduler) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> takeUntil(final CompletableSource other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return takeUntil(new CompletableToFlowable<T>(other));
     }
 
@@ -3820,7 +3821,7 @@ public final Single<T> takeUntil(final CompletableSource other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <E> Single<T> takeUntil(final Publisher<E> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new SingleTakeUntil<T, E>(this, other));
     }
 
@@ -3846,7 +3847,7 @@ public final <E> Single<T> takeUntil(final Publisher<E> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <E> Single<T> takeUntil(final SingleSource<? extends E> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return takeUntil(new SingleToFlowable<E>(other));
     }
 
@@ -3912,7 +3913,7 @@ public final Single<T> timeout(long timeout, TimeUnit unit, Scheduler scheduler)
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Single<T> timeout(long timeout, TimeUnit unit, Scheduler scheduler, SingleSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, scheduler, other);
     }
 
@@ -3940,13 +3941,13 @@ public final Single<T> timeout(long timeout, TimeUnit unit, Scheduler scheduler,
     @NonNull
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     public final Single<T> timeout(long timeout, TimeUnit unit, SingleSource<? extends T> other) {
-        ObjectHelper.requireNonNull(other, "other is null");
+        Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, Schedulers.computation(), other);
     }
 
     private Single<T> timeout0(final long timeout, final TimeUnit unit, final Scheduler scheduler, final SingleSource<? extends T> other) {
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new SingleTimeout<T>(this, timeout, unit, scheduler, other));
     }
 
@@ -3970,7 +3971,7 @@ private Single<T> timeout0(final long timeout, final TimeUnit unit, final Schedu
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> R to(@NonNull SingleConverter<T, ? extends R> converter) {
-        return ObjectHelper.requireNonNull(converter, "converter is null").apply(this);
+        return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
 
     /**
@@ -4095,7 +4096,7 @@ public final Observable<T> toObservable() {
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Single<T> unsubscribeOn(final Scheduler scheduler) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new SingleUnsubscribeOn<T>(this, scheduler));
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
index 245c41305b..c9c0a8988c 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
@@ -16,7 +16,6 @@
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.*;
 
 /**
@@ -41,10 +40,10 @@ public CompositeDisposable() {
      * @throws NullPointerException if {@code disposables} or any of its array items is null
      */
     public CompositeDisposable(@NonNull Disposable... disposables) {
-        ObjectHelper.requireNonNull(disposables, "disposables is null");
+        Objects.requireNonNull(disposables, "disposables is null");
         this.resources = new OpenHashSet<Disposable>(disposables.length + 1);
         for (Disposable d : disposables) {
-            ObjectHelper.requireNonNull(d, "A Disposable in the disposables array is null");
+            Objects.requireNonNull(d, "A Disposable in the disposables array is null");
             this.resources.add(d);
         }
     }
@@ -55,10 +54,10 @@ public CompositeDisposable(@NonNull Disposable... disposables) {
      * @throws NullPointerException if {@code disposables} or any of its items is null
      */
     public CompositeDisposable(@NonNull Iterable<? extends Disposable> disposables) {
-        ObjectHelper.requireNonNull(disposables, "disposables is null");
+        Objects.requireNonNull(disposables, "disposables is null");
         this.resources = new OpenHashSet<Disposable>();
         for (Disposable d : disposables) {
-            ObjectHelper.requireNonNull(d, "A Disposable item in the disposables sequence is null");
+            Objects.requireNonNull(d, "A Disposable item in the disposables sequence is null");
             this.resources.add(d);
         }
     }
@@ -95,7 +94,7 @@ public boolean isDisposed() {
      */
     @Override
     public boolean add(@NonNull Disposable disposable) {
-        ObjectHelper.requireNonNull(disposable, "disposable is null");
+        Objects.requireNonNull(disposable, "disposable is null");
         if (!disposed) {
             synchronized (this) {
                 if (!disposed) {
@@ -121,7 +120,7 @@ public boolean add(@NonNull Disposable disposable) {
      * @throws NullPointerException if {@code disposables} or any of its array items is null
      */
     public boolean addAll(@NonNull Disposable... disposables) {
-        ObjectHelper.requireNonNull(disposables, "disposables is null");
+        Objects.requireNonNull(disposables, "disposables is null");
         if (!disposed) {
             synchronized (this) {
                 if (!disposed) {
@@ -131,7 +130,7 @@ public boolean addAll(@NonNull Disposable... disposables) {
                         resources = set;
                     }
                     for (Disposable d : disposables) {
-                        ObjectHelper.requireNonNull(d, "A Disposable in the disposables array is null");
+                        Objects.requireNonNull(d, "A Disposable in the disposables array is null");
                         set.add(d);
                     }
                     return true;
@@ -168,7 +167,7 @@ public boolean remove(@NonNull Disposable disposable) {
      */
     @Override
     public boolean delete(@NonNull Disposable disposable) {
-        ObjectHelper.requireNonNull(disposable, "disposables is null");
+        Objects.requireNonNull(disposable, "disposables is null");
         if (disposed) {
             return false;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
index d566b744f4..2ff83d64ff 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.disposables;
 
+import java.util.Objects;
 import java.util.concurrent.Future;
 
 import org.reactivestreams.Subscription;
@@ -41,7 +42,7 @@ private Disposables() {
      */
     @NonNull
     public static Disposable fromRunnable(@NonNull Runnable run) {
-        ObjectHelper.requireNonNull(run, "run is null");
+        Objects.requireNonNull(run, "run is null");
         return new RunnableDisposable(run);
     }
 
@@ -53,7 +54,7 @@ public static Disposable fromRunnable(@NonNull Runnable run) {
      */
     @NonNull
     public static Disposable fromAction(@NonNull Action run) {
-        ObjectHelper.requireNonNull(run, "run is null");
+        Objects.requireNonNull(run, "run is null");
         return new ActionDisposable(run);
     }
 
@@ -65,7 +66,7 @@ public static Disposable fromAction(@NonNull Action run) {
      */
     @NonNull
     public static Disposable fromFuture(@NonNull Future<?> future) {
-        ObjectHelper.requireNonNull(future, "future is null");
+        Objects.requireNonNull(future, "future is null");
         return fromFuture(future, true);
     }
 
@@ -78,7 +79,7 @@ public static Disposable fromFuture(@NonNull Future<?> future) {
      */
     @NonNull
     public static Disposable fromFuture(@NonNull Future<?> future, boolean allowInterrupt) {
-        ObjectHelper.requireNonNull(future, "future is null");
+        Objects.requireNonNull(future, "future is null");
         return new FutureDisposable(future, allowInterrupt);
     }
 
@@ -90,7 +91,7 @@ public static Disposable fromFuture(@NonNull Future<?> future, boolean allowInte
      */
     @NonNull
     public static Disposable fromSubscription(@NonNull Subscription subscription) {
-        ObjectHelper.requireNonNull(subscription, "subscription is null");
+        Objects.requireNonNull(subscription, "subscription is null");
         return new SubscriptionDisposable(subscription);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java
index e5032d694b..eea584ab0b 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java
@@ -13,10 +13,10 @@
 
 package io.reactivex.rxjava3.disposables;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Base class for Disposable containers that manage some other type that
@@ -29,7 +29,7 @@ abstract class ReferenceDisposable<T> extends AtomicReference<T> implements Disp
     private static final long serialVersionUID = 6537757548749041217L;
 
     ReferenceDisposable(T value) {
-        super(ObjectHelper.requireNonNull(value, "value is null"));
+        super(Objects.requireNonNull(value, "value is null"));
     }
 
     protected abstract void onDisposed(@NonNull T value);
diff --git a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
index 8b09993ac2..6916d219bf 100644
--- a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.flowables;
 
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.Subscriber;
@@ -235,8 +236,8 @@ public final Flowable<T> refCount(int subscriberCount, long timeout, TimeUnit un
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final Flowable<T> refCount(int subscriberCount, long timeout, TimeUnit unit, Scheduler scheduler) {
         ObjectHelper.verifyPositive(subscriberCount, "subscriberCount");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableRefCount<T>(this, subscriberCount, timeout, unit, scheduler));
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java
index 3a8c5d7029..1f2d2122d1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java
@@ -13,11 +13,11 @@
 
 package io.reactivex.rxjava3.internal.disposables;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.ProtocolViolationException;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
@@ -75,7 +75,7 @@ public static boolean set(AtomicReference<Disposable> field, Disposable d) {
      * @return true if the operation succeeded, false
      */
     public static boolean setOnce(AtomicReference<Disposable> field, Disposable d) {
-        ObjectHelper.requireNonNull(d, "d is null");
+        Objects.requireNonNull(d, "d is null");
         if (!field.compareAndSet(null, d)) {
             d.dispose();
             if (field.get() != DISPOSED) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
index f3afcbf2c0..90928b64c6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
@@ -16,7 +16,6 @@
 
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 
 /**
@@ -32,19 +31,19 @@ public ListCompositeDisposable() {
     }
 
     public ListCompositeDisposable(Disposable... resources) {
-        ObjectHelper.requireNonNull(resources, "resources is null");
+        Objects.requireNonNull(resources, "resources is null");
         this.resources = new LinkedList<Disposable>();
         for (Disposable d : resources) {
-            ObjectHelper.requireNonNull(d, "Disposable item is null");
+            Objects.requireNonNull(d, "Disposable item is null");
             this.resources.add(d);
         }
     }
 
     public ListCompositeDisposable(Iterable<? extends Disposable> resources) {
-        ObjectHelper.requireNonNull(resources, "resources is null");
+        Objects.requireNonNull(resources, "resources is null");
         this.resources = new LinkedList<Disposable>();
         for (Disposable d : resources) {
-            ObjectHelper.requireNonNull(d, "Disposable item is null");
+            Objects.requireNonNull(d, "Disposable item is null");
             this.resources.add(d);
         }
     }
@@ -74,7 +73,7 @@ public boolean isDisposed() {
 
     @Override
     public boolean add(Disposable d) {
-        ObjectHelper.requireNonNull(d, "d is null");
+        Objects.requireNonNull(d, "d is null");
         if (!disposed) {
             synchronized (this) {
                 if (!disposed) {
@@ -93,7 +92,7 @@ public boolean add(Disposable d) {
     }
 
     public boolean addAll(Disposable... ds) {
-        ObjectHelper.requireNonNull(ds, "ds is null");
+        Objects.requireNonNull(ds, "ds is null");
         if (!disposed) {
             synchronized (this) {
                 if (!disposed) {
@@ -103,7 +102,7 @@ public boolean addAll(Disposable... ds) {
                         resources = set;
                     }
                     for (Disposable d : ds) {
-                        ObjectHelper.requireNonNull(d, "d is null");
+                        Objects.requireNonNull(d, "d is null");
                         set.add(d);
                     }
                     return true;
@@ -127,7 +126,7 @@ public boolean remove(Disposable d) {
 
     @Override
     public boolean delete(Disposable d) {
-        ObjectHelper.requireNonNull(d, "Disposable item is null");
+        Objects.requireNonNull(d, "Disposable item is null");
         if (disposed) {
             return false;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
index 2e44b86d04..2dcbbdea50 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
@@ -34,46 +34,46 @@ private Functions() {
     }
 
     public static <T1, T2, R> Function<Object[], R> toFunction(final BiFunction<? super T1, ? super T2, ? extends R> f) {
-        ObjectHelper.requireNonNull(f, "f is null");
+        Objects.requireNonNull(f, "f is null");
         return new Array2Func<T1, T2, R>(f);
     }
 
     public static <T1, T2, T3, R> Function<Object[], R> toFunction(final Function3<T1, T2, T3, R> f) {
-        ObjectHelper.requireNonNull(f, "f is null");
+        Objects.requireNonNull(f, "f is null");
         return new Array3Func<T1, T2, T3, R>(f);
     }
 
     public static <T1, T2, T3, T4, R> Function<Object[], R> toFunction(final Function4<T1, T2, T3, T4, R> f) {
-        ObjectHelper.requireNonNull(f, "f is null");
+        Objects.requireNonNull(f, "f is null");
         return new Array4Func<T1, T2, T3, T4, R>(f);
     }
 
     public static <T1, T2, T3, T4, T5, R> Function<Object[], R> toFunction(final Function5<T1, T2, T3, T4, T5, R> f) {
-        ObjectHelper.requireNonNull(f, "f is null");
+        Objects.requireNonNull(f, "f is null");
         return new Array5Func<T1, T2, T3, T4, T5, R>(f);
     }
 
     public static <T1, T2, T3, T4, T5, T6, R> Function<Object[], R> toFunction(
             final Function6<T1, T2, T3, T4, T5, T6, R> f) {
-        ObjectHelper.requireNonNull(f, "f is null");
+        Objects.requireNonNull(f, "f is null");
         return new Array6Func<T1, T2, T3, T4, T5, T6, R>(f);
     }
 
     public static <T1, T2, T3, T4, T5, T6, T7, R> Function<Object[], R> toFunction(
             final Function7<T1, T2, T3, T4, T5, T6, T7, R> f) {
-        ObjectHelper.requireNonNull(f, "f is null");
+        Objects.requireNonNull(f, "f is null");
         return new Array7Func<T1, T2, T3, T4, T5, T6, T7, R>(f);
     }
 
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Function<Object[], R> toFunction(
             final Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> f) {
-        ObjectHelper.requireNonNull(f, "f is null");
+        Objects.requireNonNull(f, "f is null");
         return new Array8Func<T1, T2, T3, T4, T5, T6, T7, T8, R>(f);
     }
 
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Function<Object[], R> toFunction(
             final Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> f) {
-        ObjectHelper.requireNonNull(f, "f is null");
+        Objects.requireNonNull(f, "f is null");
         return new Array9Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, R>(f);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
index 65f5a70c82..05bceafa1d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
@@ -26,22 +26,6 @@ private ObjectHelper() {
         throw new IllegalStateException("No instances!");
     }
 
-    /**
-     * Verifies if the object is not null and returns it or throws a NullPointerException
-     * with the given message.
-     * @param <T> the value type
-     * @param object the object to verify
-     * @param message the message to use with the NullPointerException
-     * @return the object itself
-     * @throws NullPointerException if object is null
-     */
-    public static <T> T requireNonNull(T object, String message) {
-        if (object == null) {
-            throw new NullPointerException(message);
-        }
-        return object;
-    }
-
     static final BiPredicate<Object, Object> EQUALS = new BiObjectPredicate();
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
index db34238b7a..0f4e4b16ba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
@@ -13,6 +13,7 @@
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.stream.Stream;
 
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
@@ -140,7 +140,7 @@ public T poll() {
                     return null;
                 }
             }
-            return ObjectHelper.requireNonNull(iterator.next(), "Iterator.next() returned a null value");
+            return Objects.requireNonNull(iterator.next(), "Iterator.next() returned a null value");
         }
 
         @Override
@@ -184,7 +184,7 @@ public void run(long n) {
                 } else {
                     T next;
                     try {
-                        next = ObjectHelper.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value");
+                        next = Objects.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
                         downstream.onError(ex);
@@ -252,7 +252,7 @@ public void run(long n) {
                 } else {
                     T next;
                     try {
-                        next = ObjectHelper.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value");
+                        next = Objects.requireNonNull(iterator.next(), "The Stream's Iterator returned a null value");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
                         downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java
index c36f546c16..ef801a1646 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java
@@ -14,13 +14,13 @@
 package io.reactivex.rxjava3.internal.operators.completable;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 public final class CompletableConcatIterable extends Completable {
     final Iterable<? extends CompletableSource> sources;
@@ -35,7 +35,7 @@ public void subscribeActual(CompletableObserver observer) {
         Iterator<? extends CompletableSource> it;
 
         try {
-            it = ObjectHelper.requireNonNull(sources.iterator(), "The iterator returned is null");
+            it = Objects.requireNonNull(sources.iterator(), "The iterator returned is null");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             EmptyDisposable.error(e, observer);
@@ -109,7 +109,7 @@ void next() {
                 CompletableSource c;
 
                 try {
-                    c = ObjectHelper.requireNonNull(a.next(), "The CompletableSource returned is null");
+                    c = Objects.requireNonNull(a.next(), "The CompletableSource returned is null");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java
index 0e28d0d28f..c451413f49 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java
@@ -17,7 +17,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 public final class CompletableDefer extends Completable {
 
@@ -32,7 +33,7 @@ protected void subscribeActual(CompletableObserver observer) {
         CompletableSource c;
 
         try {
-            c = ObjectHelper.requireNonNull(completableSupplier.get(), "The completableSupplier returned a null CompletableSource");
+            c = Objects.requireNonNull(completableSupplier.get(), "The completableSupplier returned a null CompletableSource");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             EmptyDisposable.error(e, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java
index 12b39277db..bd4250c447 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java
@@ -17,7 +17,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 public final class CompletableErrorSupplier extends Completable {
 
@@ -32,7 +33,7 @@ protected void subscribeActual(CompletableObserver observer) {
         Throwable error;
 
         try {
-            error = ObjectHelper.requireNonNull(errorSupplier.get(), "The error returned is null");
+            error = Objects.requireNonNull(errorSupplier.get(), "The error returned is null");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             error = e;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java
index 6d420cf044..55efbd8915 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java
@@ -14,12 +14,12 @@
 package io.reactivex.rxjava3.internal.operators.completable;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.completable.CompletableMergeDelayErrorArray.*;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 
@@ -40,7 +40,7 @@ public void subscribeActual(final CompletableObserver observer) {
         Iterator<? extends CompletableSource> iterator;
 
         try {
-            iterator = ObjectHelper.requireNonNull(sources.iterator(), "The source iterator returned is null");
+            iterator = Objects.requireNonNull(sources.iterator(), "The source iterator returned is null");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             observer.onError(e);
@@ -77,7 +77,7 @@ public void subscribeActual(final CompletableObserver observer) {
             CompletableSource c;
 
             try {
-                c = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null CompletableSource");
+                c = Objects.requireNonNull(iterator.next(), "The iterator returned a null CompletableSource");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 errors.tryAddThrowableOrReport(e);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java
index 86c08d359c..b0e5b87bf7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java
@@ -14,12 +14,12 @@
 package io.reactivex.rxjava3.internal.operators.completable;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class CompletableMergeIterable extends Completable {
@@ -41,7 +41,7 @@ public void subscribeActual(final CompletableObserver observer) {
         Iterator<? extends CompletableSource> iterator;
 
         try {
-            iterator = ObjectHelper.requireNonNull(sources.iterator(), "The source iterator returned is null");
+            iterator = Objects.requireNonNull(sources.iterator(), "The source iterator returned is null");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             observer.onError(e);
@@ -74,7 +74,7 @@ public void subscribeActual(final CompletableObserver observer) {
             CompletableSource c;
 
             try {
-                c = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null CompletableSource");
+                c = Objects.requireNonNull(iterator.next(), "The iterator returned a null CompletableSource");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 set.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java
index 63227fb391..1d3bd7a3a0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.completable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 public final class CompletableResumeNext extends Completable {
 
@@ -79,7 +79,7 @@ public void onError(Throwable e) {
             CompletableSource c;
 
             try {
-                c = ObjectHelper.requireNonNull(errorMapper.apply(e), "The errorMapper returned a null CompletableSource");
+                c = Objects.requireNonNull(errorMapper.apply(e), "The errorMapper returned a null CompletableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(new CompositeException(e, ex));
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java
index ab29ce4ae8..7a4e99b332 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.completable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class CompletableUsing<R> extends Completable {
@@ -54,7 +54,7 @@ protected void subscribeActual(CompletableObserver observer) {
         CompletableSource source;
 
         try {
-            source = ObjectHelper.requireNonNull(completableFunction.apply(resource), "The completableFunction returned a null CompletableSource");
+            source = Objects.requireNonNull(completableFunction.apply(resource), "The completableFunction returned a null CompletableSource");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             if (eager) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java
index 76a68d37b3..d83f65c347 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java
@@ -16,9 +16,10 @@
 import org.reactivestreams.Publisher;
 
 import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher;
 
+import java.util.Objects;
+
 /**
  * Abstract base class for operators that take an upstream
  * source {@link Publisher}.
@@ -39,7 +40,7 @@ abstract class AbstractFlowableWithUpstream<T, R> extends Flowable<R> implements
      * @param source the source (upstream) Publisher instance, not null (verified)
      */
     AbstractFlowableWithUpstream(Flowable<T> source) {
-        this.source = ObjectHelper.requireNonNull(source, "source is null");
+        this.source = Objects.requireNonNull(source, "source is null");
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
index 899ae6c21c..14654d35ee 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.*;
 
 import org.reactivestreams.*;
@@ -103,9 +104,9 @@ public static <T> void subscribe(Publisher<? extends T> o) {
      */
     public static <T> void subscribe(Publisher<? extends T> o, final Consumer<? super T> onNext,
             final Consumer<? super Throwable> onError, final Action onComplete) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
         subscribe(o, new LambdaSubscriber<T>(onNext, onError, onComplete, Functions.REQUEST_MAX));
     }
 
@@ -120,9 +121,9 @@ public static <T> void subscribe(Publisher<? extends T> o, final Consumer<? supe
      */
     public static <T> void subscribe(Publisher<? extends T> o, final Consumer<? super T> onNext,
         final Consumer<? super Throwable> onError, final Action onComplete, int bufferSize) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
         ObjectHelper.verifyPositive(bufferSize, "number > 0 required");
         subscribe(o, new BoundedSubscriber<T>(onNext, onError, onComplete, Functions.boundedConsumer(bufferSize),
                 bufferSize));
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
index 0da3aea64e..08f89e99e2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
@@ -21,7 +21,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -105,7 +104,7 @@ public void onNext(T t) {
             if (b == null) {
 
                 try {
-                    b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
+                    b = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     cancel();
@@ -227,7 +226,7 @@ public void onNext(T t) {
 
             if (i++ == 0) {
                 try {
-                    b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
+                    b = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     cancel();
@@ -378,7 +377,7 @@ public void onNext(T t) {
                 C b;
 
                 try {
-                    b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
+                    b = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
index 4e8103e1a6..47f6e6bf06 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
@@ -22,7 +22,6 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
@@ -181,8 +180,8 @@ void open(Open token) {
             Publisher<? extends Close> p;
             C buf;
             try {
-                buf = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null Collection");
-                p = ObjectHelper.requireNonNull(bufferClose.apply(token), "The bufferClose returned a null Publisher");
+                buf = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null Collection");
+                p = Objects.requireNonNull(bufferClose.apply(token), "The bufferClose returned a null Publisher");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 SubscriptionHelper.cancel(upstream);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
index 22d139eb89..a1ca188b13 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Collection;
+import java.util.Objects;
 
 import org.reactivestreams.*;
 
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 import io.reactivex.rxjava3.internal.subscribers.QueueDrainSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
@@ -73,7 +73,7 @@ public void onSubscribe(Subscription s) {
             U b;
 
             try {
-                b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
+                b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 cancelled = true;
@@ -153,7 +153,7 @@ void next() {
             U next;
 
             try {
-                next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
+                next = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java
index 4057a06abb..0b3faed1c5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java
@@ -25,7 +25,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 import io.reactivex.rxjava3.internal.subscribers.QueueDrainSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
@@ -110,7 +109,7 @@ public void onSubscribe(Subscription s) {
                 U b;
 
                 try {
-                    b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
+                    b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     cancel();
@@ -187,7 +186,7 @@ public void run() {
             U next;
 
             try {
-                next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
+                next = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 cancel();
@@ -258,7 +257,7 @@ public void onSubscribe(Subscription s) {
             final U b; // NOPMD
 
             try {
-                b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
+                b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 w.dispose();
@@ -339,7 +338,7 @@ public void run() {
             final U b; // NOPMD
 
             try {
-                b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
+                b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 cancel();
@@ -424,7 +423,7 @@ public void onSubscribe(Subscription s) {
             U b;
 
             try {
-                b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
+                b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 w.dispose();
@@ -468,7 +467,7 @@ public void onNext(T t) {
             fastPathOrderedEmitMax(b, false, this);
 
             try {
-                b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
+                b = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 cancel();
@@ -550,7 +549,7 @@ public void run() {
             U next;
 
             try {
-                next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
+                next = Objects.requireNonNull(bufferSupplier.get(), "The supplied buffer is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
index d5b4dd8233..80345f2f3b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
@@ -17,10 +17,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class FlowableCollect<T, U> extends AbstractFlowableWithUpstream<T, U> {
 
     final Supplier<? extends U> initialSupplier;
@@ -36,7 +37,7 @@ public FlowableCollect(Flowable<T> source, Supplier<? extends U> initialSupplier
     protected void subscribeActual(Subscriber<? super U> s) {
         U u;
         try {
-            u = ObjectHelper.requireNonNull(initialSupplier.get(), "The initial value supplied is null");
+            u = Objects.requireNonNull(initialSupplier.get(), "The initial value supplied is null");
         } catch (Throwable e) {
             EmptySubscription.error(e, s);
             return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
index b48f4d11fc..fcb5590b49 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
@@ -19,11 +19,12 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class FlowableCollectSingle<T, U> extends Single<U> implements FuseToFlowable<U> {
 
     final Flowable<T> source;
@@ -41,7 +42,7 @@ public FlowableCollectSingle(Flowable<T> source, Supplier<? extends U> initialSu
     protected void subscribeActual(SingleObserver<? super U> observer) {
         U u;
         try {
-            u = ObjectHelper.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
+            u = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
         } catch (Throwable e) {
             EmptyDisposable.error(e, observer);
             return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
index 70f7f313bc..24306072bc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableMap.MapSubscriber;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
@@ -82,7 +82,7 @@ public void subscribeActual(Subscriber<? super R> s) {
             Iterator<? extends Publisher<? extends T>> it;
 
             try {
-                it = ObjectHelper.requireNonNull(iterable.iterator(), "The iterator returned is null");
+                it = Objects.requireNonNull(iterable.iterator(), "The iterator returned is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 EmptySubscription.error(e, s);
@@ -108,7 +108,7 @@ public void subscribeActual(Subscriber<? super R> s) {
                 Publisher<? extends T> p;
 
                 try {
-                    p = ObjectHelper.requireNonNull(it.next(), "The publisher returned by the iterator is null");
+                    p = Objects.requireNonNull(it.next(), "The publisher returned by the iterator is null");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     EmptySubscription.error(e, s);
@@ -359,7 +359,7 @@ void drainAsync() {
                     R w;
 
                     try {
-                        w = ObjectHelper.requireNonNull(combiner.apply(va), "The combiner returned a null value");
+                        w = Objects.requireNonNull(combiner.apply(va), "The combiner returned a null value");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
 
@@ -472,7 +472,7 @@ public R poll() throws Throwable {
                 return null;
             }
             T[] a = (T[])queue.poll();
-            R r = ObjectHelper.requireNonNull(combiner.apply(a), "The combiner returned a null value");
+            R r = Objects.requireNonNull(combiner.apply(a), "The combiner returned a null value");
             ((CombineLatestInnerSubscriber<T>)e).requestOne();
             return r;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
index a11f206dde..f757fb5f3b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
@@ -12,6 +12,7 @@
  */
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.reactivestreams.*;
@@ -19,7 +20,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
@@ -277,7 +277,7 @@ void drain() {
                             Publisher<? extends R> p;
 
                             try {
-                                p = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher");
+                                p = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher");
                             } catch (Throwable e) {
                                 Exceptions.throwIfFatal(e);
 
@@ -479,7 +479,7 @@ void drain() {
                             Publisher<? extends R> p;
 
                             try {
-                                p = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher");
+                                p = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher");
                             } catch (Throwable e) {
                                 Exceptions.throwIfFatal(e);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
index 29c2077226..9aee3eaebb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscribers.*;
@@ -115,7 +115,7 @@ public void onNext(T t) {
             Publisher<? extends R> p;
 
             try {
-                p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
+                p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
index 828bb5a5fa..05c984b533 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
@@ -12,6 +12,7 @@
  */
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.reactivestreams.*;
@@ -19,7 +20,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.*;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
@@ -287,7 +287,7 @@ public void run() {
                         Publisher<? extends R> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher");
+                            p = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher");
                         } catch (Throwable e) {
                             Exceptions.throwIfFatal(e);
 
@@ -474,7 +474,7 @@ public void run() {
                         Publisher<? extends R> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher");
+                            p = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null Publisher");
                         } catch (Throwable e) {
                             Exceptions.throwIfFatal(e);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
index 53f3c4e833..ab86164622 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -88,7 +88,7 @@ public void onNext(T t) {
             Publisher<U> p;
 
             try {
-                p = ObjectHelper.requireNonNull(debounceSelector.apply(t), "The publisher supplied is null");
+                p = Objects.requireNonNull(debounceSelector.apply(t), "The publisher supplied is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java
index 6117d56f92..6c3d8f9008 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java
@@ -18,9 +18,10 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
 
+import java.util.Objects;
+
 public final class FlowableDefer<T> extends Flowable<T> {
     final Supplier<? extends Publisher<? extends T>> supplier;
     public FlowableDefer(Supplier<? extends Publisher<? extends T>> supplier) {
@@ -31,7 +32,7 @@ public FlowableDefer(Supplier<? extends Publisher<? extends T>> supplier) {
     public void subscribeActual(Subscriber<? super T> s) {
         Publisher<? extends T> pub;
         try {
-            pub = ObjectHelper.requireNonNull(supplier.get(), "The publisher supplied is null");
+            pub = Objects.requireNonNull(supplier.get(), "The publisher supplied is null");
         } catch (Throwable t) {
             Exceptions.throwIfFatal(t);
             EmptySubscription.error(t, s);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java
index d19bf4f037..d5e46e6d23 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java
@@ -18,10 +18,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class FlowableDematerialize<T, R> extends AbstractFlowableWithUpstream<T, R> {
 
     final Function<? super T, ? extends Notification<R>> selector;
@@ -74,7 +75,7 @@ public void onNext(T item) {
             Notification<R> notification;
 
             try {
-                notification = ObjectHelper.requireNonNull(selector.apply(item), "The selector returned a null Notification");
+                notification = Objects.requireNonNull(selector.apply(item), "The selector returned a null Notification");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
index 870710bd87..1cd4be2458 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Collection;
+import java.util.Objects;
 
 import org.reactivestreams.Subscriber;
 
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
@@ -77,7 +77,7 @@ public void onNext(T value) {
                 boolean b;
 
                 try {
-                    key = ObjectHelper.requireNonNull(keySelector.apply(value), "The keySelector returned a null key");
+                    key = Objects.requireNonNull(keySelector.apply(value), "The keySelector returned a null key");
                     b = collection.add(key);
                 } catch (Throwable ex) {
                     fail(ex);
@@ -125,7 +125,7 @@ public T poll() throws Throwable {
             for (;;) {
                 T v = qs.poll();
 
-                if (v == null || collection.add(ObjectHelper.requireNonNull(keySelector.apply(v), "The keySelector returned a null key"))) {
+                if (v == null || collection.add(Objects.requireNonNull(keySelector.apply(v), "The keySelector returned a null key"))) {
                     return v;
                 } else {
                     if (sourceMode == QueueFuseable.ASYNC) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
index de53c5d5b8..1c14ea54af 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
@@ -128,7 +128,7 @@ public void onNext(T t) {
             }
             Publisher<? extends U> p;
             try {
-                p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
+                p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
index 5c20e9d75a..5c544add23 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.reactivestreams.*;
@@ -23,7 +24,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 
@@ -106,7 +106,7 @@ public void onNext(T value) {
             CompletableSource cs;
 
             try {
-                cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
+                cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
index 52a719ca44..94f0fa8653 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.Subscription;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
@@ -114,7 +114,7 @@ public void onNext(T value) {
             CompletableSource cs;
 
             try {
-                cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
+                cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
index f6cb69c84a..18c2e21f63 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
@@ -115,7 +115,7 @@ public void onNext(T t) {
             MaybeSource<? extends R> ms;
 
             try {
-                ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource");
+                ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
index b1ba1fed12..366b48be09 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
@@ -115,7 +115,7 @@ public void onNext(T t) {
             SingleSource<? extends R> ms;
 
             try {
-                ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource");
+                ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
index 808d964798..de7221cb38 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
@@ -297,7 +297,7 @@ void drain() {
                         R v;
 
                         try {
-                            v = ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value");
+                            v = Objects.requireNonNull(it.next(), "The iterator returned a null value");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             current = null;
@@ -432,7 +432,7 @@ public R poll() throws Throwable {
                     current = it;
                 }
 
-                R r = ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value");
+                R r = Objects.requireNonNull(it.next(), "The iterator returned a null value");
 
                 if (!it.hasNext()) {
                     current = null;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
index 0b49186290..83371ab447 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
@@ -17,11 +17,12 @@
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 
+import java.util.Objects;
+
 public final class FlowableFromArray<T> extends Flowable<T> {
     final T[] array;
 
@@ -67,7 +68,7 @@ public final T poll() {
             }
 
             index = i + 1;
-            return ObjectHelper.requireNonNull(arr[i], "array element is null");
+            return Objects.requireNonNull(arr[i], "array element is null");
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java
index 7f918c5c51..80afc65910 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.Callable;
 
 import org.reactivestreams.Subscriber;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -37,7 +37,7 @@ public void subscribeActual(Subscriber<? super T> s) {
 
         T t;
         try {
-            t = ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value");
+            t = Objects.requireNonNull(callable.call(), "The callable returned a null value");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             if (deferred.isCancelled()) {
@@ -53,6 +53,6 @@ public void subscribeActual(Subscriber<? super T> s) {
 
     @Override
     public T get() throws Throwable {
-        return ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value");
+        return Objects.requireNonNull(callable.call(), "The callable returned a null value");
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
index c8dc87c0c3..7ae3f3e7d1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
@@ -14,13 +14,13 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Iterator;
+import java.util.Objects;
 
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
@@ -101,7 +101,7 @@ public final T poll() {
                     return null;
                 }
             }
-            return ObjectHelper.requireNonNull(it.next(), "Iterator.next() returned a null value");
+            return Objects.requireNonNull(it.next(), "Iterator.next() returned a null value");
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java
index bd714ee6c0..7be86d618b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java
@@ -18,10 +18,11 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.DeferredScalarSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Call a Supplier for each incoming Subscriber and signal the returned value or the thrown exception.
  * @param <T> the value type and element type returned by the supplier and the flow
@@ -42,7 +43,7 @@ public void subscribeActual(Subscriber<? super T> s) {
 
         T t;
         try {
-            t = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value");
+            t = Objects.requireNonNull(supplier.get(), "The supplier returned a null value");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             if (deferred.isCancelled()) {
@@ -58,6 +59,6 @@ public void subscribeActual(Subscriber<? super T> s) {
 
     @Override
     public T get() throws Throwable {
-        return ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value");
+        return Objects.requireNonNull(supplier.get(), "The supplier returned a null value");
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
index 213073c672..ccd80c53d9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
@@ -25,7 +25,6 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
@@ -247,7 +246,7 @@ void drain() {
                         Publisher<TLeftEnd> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher");
+                            p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
@@ -269,7 +268,7 @@ void drain() {
                         R w;
 
                         try {
-                            w = ObjectHelper.requireNonNull(resultSelector.apply(left, up), "The resultSelector returned a null value");
+                            w = Objects.requireNonNull(resultSelector.apply(left, up), "The resultSelector returned a null value");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
@@ -299,7 +298,7 @@ else if (mode == RIGHT_VALUE) {
                         Publisher<TRightEnd> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher");
+                            p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java
index 243d58b9b8..f8f97191fd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java
@@ -12,6 +12,7 @@
  */
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import org.reactivestreams.*;
@@ -76,7 +77,7 @@ static final class ItemDelayFunction<T, U> implements Function<T, Publisher<T>>
 
         @Override
         public Publisher<T> apply(final T v) throws Throwable {
-            Publisher<U> p = ObjectHelper.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null Publisher");
+            Publisher<U> p = Objects.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null Publisher");
             return new FlowableTakePublisher<U>(p, 1).map(Functions.justFunction(v)).defaultIfEmpty(v);
         }
     }
@@ -164,7 +165,7 @@ static final class FlatMapWithCombinerOuter<T, R, U> implements Function<T, Publ
         @Override
         public Publisher<R> apply(final T t) throws Throwable {
             @SuppressWarnings("unchecked")
-            Publisher<U> u = (Publisher<U>)ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
+            Publisher<U> u = (Publisher<U>)Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
             return new FlowableMapPublisher<U, R>(u, new FlatMapWithCombinerInner<U, R, T>(combiner, t));
         }
     }
@@ -184,7 +185,7 @@ static final class FlatMapIntoIterable<T, U> implements Function<T, Publisher<U>
 
         @Override
         public Publisher<U> apply(T t) throws Throwable {
-            return new FlowableFromIterable<U>(ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable"));
+            return new FlowableFromIterable<U>(Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable"));
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
index 591cdb159a..df8eff7049 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
@@ -22,7 +22,6 @@
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableGroupJoin.*;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
@@ -223,7 +222,7 @@ void drain() {
                         Publisher<TLeftEnd> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher");
+                            p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null Publisher");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
@@ -250,7 +249,7 @@ void drain() {
                             R w;
 
                             try {
-                                w = ObjectHelper.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value");
+                                w = Objects.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value");
                             } catch (Throwable exc) {
                                 fail(exc, a, q);
                                 return;
@@ -284,7 +283,7 @@ else if (mode == RIGHT_VALUE) {
                         Publisher<TRightEnd> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher");
+                            p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null Publisher");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
@@ -311,7 +310,7 @@ else if (mode == RIGHT_VALUE) {
                             R w;
 
                             try {
-                                w = ObjectHelper.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value");
+                                w = Objects.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value");
                             } catch (Throwable exc) {
                                 fail(exc, a, q);
                                 return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
index cec093d278..208baca0b2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
@@ -18,10 +18,11 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscribers.*;
 
+import java.util.Objects;
+
 public final class FlowableMap<T, U> extends AbstractFlowableWithUpstream<T, U> {
     final Function<? super T, ? extends U> mapper;
     public FlowableMap(Flowable<T> source, Function<? super T, ? extends U> mapper) {
@@ -60,7 +61,7 @@ public void onNext(T t) {
             U v;
 
             try {
-                v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value.");
+                v = Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.");
             } catch (Throwable ex) {
                 fail(ex);
                 return;
@@ -77,7 +78,7 @@ public int requestFusion(int mode) {
         @Override
         public U poll() throws Throwable {
             T t = qs.poll();
-            return t != null ? ObjectHelper.<U>requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null;
+            return t != null ? Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null;
         }
     }
 
@@ -103,7 +104,7 @@ public void onNext(T t) {
             U v;
 
             try {
-                v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value.");
+                v = Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.");
             } catch (Throwable ex) {
                 fail(ex);
                 return;
@@ -120,7 +121,7 @@ public boolean tryOnNext(T t) {
             U v;
 
             try {
-                v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value.");
+                v = Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.");
             } catch (Throwable ex) {
                 fail(ex);
                 return true;
@@ -137,7 +138,7 @@ public int requestFusion(int mode) {
         @Override
         public U poll() throws Throwable {
             T t = qs.poll();
-            return t != null ? ObjectHelper.<U>requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null;
+            return t != null ? Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null;
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java
index 9998bee06b..cdfb0b0bb5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java
@@ -18,9 +18,10 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscribers.SinglePostCompleteSubscriber;
 
+import java.util.Objects;
+
 public final class FlowableMapNotification<T, R> extends AbstractFlowableWithUpstream<T, R> {
 
     final Function<? super T, ? extends R> onNextMapper;
@@ -66,7 +67,7 @@ public void onNext(T t) {
             R p;
 
             try {
-                p = ObjectHelper.requireNonNull(onNextMapper.apply(t), "The onNext publisher returned is null");
+                p = Objects.requireNonNull(onNextMapper.apply(t), "The onNext publisher returned is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(e);
@@ -82,7 +83,7 @@ public void onError(Throwable t) {
             R p;
 
             try {
-                p = ObjectHelper.requireNonNull(onErrorMapper.apply(t), "The onError publisher returned is null");
+                p = Objects.requireNonNull(onErrorMapper.apply(t), "The onError publisher returned is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(new CompositeException(t, e));
@@ -97,7 +98,7 @@ public void onComplete() {
             R p;
 
             try {
-                p = ObjectHelper.requireNonNull(onCompleteSupplier.get(), "The onComplete publisher returned is null");
+                p = Objects.requireNonNull(onCompleteSupplier.get(), "The onComplete publisher returned is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(e);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java
index 7a186cdec0..1d939022b4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java
@@ -18,10 +18,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionArbiter;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class FlowableOnErrorNext<T> extends AbstractFlowableWithUpstream<T, T> {
     final Function<? super Throwable, ? extends Publisher<? extends T>> nextSupplier;
 
@@ -90,7 +91,7 @@ public void onError(Throwable t) {
             Publisher<? extends T> p;
 
             try {
-                p = ObjectHelper.requireNonNull(nextSupplier.apply(t), "The nextSupplier returned a null Publisher");
+                p = Objects.requireNonNull(nextSupplier.apply(t), "The nextSupplier returned a null Publisher");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(new CompositeException(t, e));
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java
index df57dd5c00..4a908cc113 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java
@@ -18,9 +18,10 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscribers.SinglePostCompleteSubscriber;
 
+import java.util.Objects;
+
 public final class FlowableOnErrorReturn<T> extends AbstractFlowableWithUpstream<T, T> {
     final Function<? super Throwable, ? extends T> valueSupplier;
     public FlowableOnErrorReturn(Flowable<T> source, Function<? super Throwable, ? extends T> valueSupplier) {
@@ -54,7 +55,7 @@ public void onNext(T t) {
         public void onError(Throwable t) {
             T v;
             try {
-                v = ObjectHelper.requireNonNull(valueSupplier.apply(t), "The valueSupplier returned a null value");
+                v = Objects.requireNonNull(valueSupplier.apply(t), "The valueSupplier returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(new CompositeException(t, ex));
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
index cc36e86821..702955bf02 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
@@ -16,6 +16,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -24,7 +25,6 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
@@ -60,7 +60,7 @@ protected void subscribeActual(Subscriber<? super R> s) {
         Publisher<? extends R> other;
 
         try {
-            other = ObjectHelper.requireNonNull(selector.apply(mp), "selector returned a null Publisher");
+            other = Objects.requireNonNull(selector.apply(mp), "selector returned a null Publisher");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptySubscription.error(ex, s);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java
index 4da1d68d99..9d3d3f4794 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java
@@ -18,10 +18,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Reduces a sequence via a function into a single value or signals NoSuchElementException for
  * an empty source.
@@ -77,7 +78,7 @@ public void onNext(T t) {
                 value = t;
             } else {
                 try {
-                    value = ObjectHelper.requireNonNull(reducer.apply(v, t), "The reducer returned a null value");
+                    value = Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java
index 72b4f1ac28..2de3b633fe 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java
@@ -19,11 +19,12 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Reduce a Flowable into a single value exposed as Single or signal NoSuchElementException.
  *
@@ -105,7 +106,7 @@ public void onNext(T t) {
                 value = t;
             } else {
                 try {
-                    value = ObjectHelper.requireNonNull(reducer.apply(v, t), "The reducer returned a null value");
+                    value = Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java
index cf489963ed..ec570639c6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java
@@ -19,10 +19,11 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Reduce a sequence of values, starting from a seed value and by using
  * an accumulator function and return the last accumulated value.
@@ -81,7 +82,7 @@ public void onNext(T value) {
             R v = this.value;
             if (v != null) {
                 try {
-                    this.value = ObjectHelper.requireNonNull(reducer.apply(v, value), "The reducer returned a null value");
+                    this.value = Objects.requireNonNull(reducer.apply(v, value), "The reducer returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java
index ca8be6779e..343d72c4e3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java
@@ -19,9 +19,10 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableReduceSeedSingle.ReduceSeedObserver;
 
+import java.util.Objects;
+
 /**
  * Reduce a sequence of values, starting from a generated seed value and by using
  * an accumulator function and return the last accumulated value.
@@ -48,7 +49,7 @@ protected void subscribeActual(SingleObserver<? super R> observer) {
         R seed;
 
         try {
-            seed = ObjectHelper.requireNonNull(seedSupplier.get(), "The seedSupplier returned a null value");
+            seed = Objects.requireNonNull(seedSupplier.get(), "The seedSupplier returned a null value");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptyDisposable.error(ex, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java
index 021b4dd387..dcd807aa2a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.subscribers.SerializedSubscriber;
@@ -44,7 +44,7 @@ public void subscribeActual(Subscriber<? super T> s) {
         Publisher<?> when;
 
         try {
-            when = ObjectHelper.requireNonNull(handler.apply(processor), "handler returned a null Publisher");
+            when = Objects.requireNonNull(handler.apply(processor), "handler returned a null Publisher");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptySubscription.error(ex, s);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java
index ff7ddb84af..7307664353 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java
@@ -18,12 +18,13 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableRepeatWhen.*;
 import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.subscribers.SerializedSubscriber;
 
+import java.util.Objects;
+
 public final class FlowableRetryWhen<T> extends AbstractFlowableWithUpstream<T, T> {
     final Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler;
 
@@ -42,7 +43,7 @@ public void subscribeActual(Subscriber<? super T> s) {
         Publisher<?> when;
 
         try {
-            when = ObjectHelper.requireNonNull(handler.apply(processor), "handler returned a null Publisher");
+            when = Objects.requireNonNull(handler.apply(processor), "handler returned a null Publisher");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptySubscription.error(ex, s);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
index 999cf48a51..2ef89c0023 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
@@ -18,10 +18,11 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Utility classes to work with scalar-sourced XMap operators (where X == { flat, concat, switch }).
  */
@@ -64,7 +65,7 @@ public static <T, R> boolean tryScalarXMapSubscribe(Publisher<T> source,
             Publisher<? extends R> r;
 
             try {
-                r = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
+                r = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 EmptySubscription.error(ex, subscriber);
@@ -133,7 +134,7 @@ static final class ScalarXMapFlowable<T, R> extends Flowable<R> {
         public void subscribeActual(Subscriber<? super R> s) {
             Publisher<? extends R> other;
             try {
-                other = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null Publisher");
+                other = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null Publisher");
             } catch (Throwable e) {
                 EmptySubscription.error(e, s);
                 return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java
index 3dadb2968b..2fab24a484 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java
@@ -18,10 +18,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class FlowableScan<T> extends AbstractFlowableWithUpstream<T, T> {
     final BiFunction<T, T, T> accumulator;
     public FlowableScan(Flowable<T> source, BiFunction<T, T, T> accumulator) {
@@ -71,7 +72,7 @@ public void onNext(T t) {
                 T u;
 
                 try {
-                    u = ObjectHelper.requireNonNull(accumulator.apply(v, t), "The value returned by the accumulator is null");
+                    u = Objects.requireNonNull(accumulator.apply(v, t), "The value returned by the accumulator is null");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
index c1875f3070..da0b1870da 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
@@ -12,6 +12,7 @@
  */
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -19,7 +20,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
@@ -41,7 +41,7 @@ protected void subscribeActual(Subscriber<? super R> s) {
         R r;
 
         try {
-            r = ObjectHelper.requireNonNull(seedSupplier.get(), "The seed supplied is null");
+            r = Objects.requireNonNull(seedSupplier.get(), "The seed supplied is null");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             EmptySubscription.error(e, s);
@@ -109,7 +109,7 @@ public void onNext(T t) {
 
             R v = value;
             try {
-                v = ObjectHelper.requireNonNull(accumulator.apply(v, t), "The accumulator returned a null value");
+                v = Objects.requireNonNull(accumulator.apply(v, t), "The accumulator returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
index e77110b6a0..c618a0252b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
@@ -110,7 +110,7 @@ public void onNext(T t) {
 
             Publisher<? extends R> p;
             try {
-                p = ObjectHelper.requireNonNull(mapper.apply(t), "The publisher returned is null");
+                p = Objects.requireNonNull(mapper.apply(t), "The publisher returned is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java
index b45755fc30..c5879c2e74 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.*;
 
@@ -23,7 +24,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.SequentialDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableTimeoutTimed.TimeoutSupport;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -108,7 +108,7 @@ public void onNext(T t) {
             Publisher<?> itemTimeoutPublisher;
 
             try {
-                itemTimeoutPublisher = ObjectHelper.requireNonNull(
+                itemTimeoutPublisher = Objects.requireNonNull(
                         itemTimeoutIndicator.apply(t),
                         "The itemTimeoutIndicator returned a null Publisher.");
             } catch (Throwable ex) {
@@ -243,7 +243,7 @@ public void onNext(T t) {
             Publisher<?> itemTimeoutPublisher;
 
             try {
-                itemTimeoutPublisher = ObjectHelper.requireNonNull(
+                itemTimeoutPublisher = Objects.requireNonNull(
                         itemTimeoutIndicator.apply(t),
                         "The itemTimeoutIndicator returned a null Publisher.");
             } catch (Throwable ex) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
index 9c0dc74d4c..7e2e91c672 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.reactivestreams.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -54,7 +54,7 @@ public void subscribeActual(Subscriber<? super T> s) {
 
         Publisher<? extends T> source;
         try {
-            source = ObjectHelper.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Publisher");
+            source = Objects.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null Publisher");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             try {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
index 63ee8ccf3c..4e38351ef7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
@@ -22,7 +22,6 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
@@ -244,7 +243,7 @@ void drain() {
 
                                     Publisher<V> endSource;
                                     try {
-                                        endSource = ObjectHelper.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null Publisher");
+                                        endSource = Objects.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null Publisher");
                                     } catch (Throwable ex) {
                                         upstream.cancel();
                                         startSubscriber.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
index c3ec3ab5f9..049befd1f4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.subscribers.SerializedSubscriber;
@@ -84,7 +84,7 @@ public boolean tryOnNext(T t) {
             if (u != null) {
                 R r;
                 try {
-                    r = ObjectHelper.requireNonNull(combiner.apply(t, u), "The combiner returned a null value");
+                    r = Objects.requireNonNull(combiner.apply(t, u), "The combiner returned a null value");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
index 7c3b06ed8c..1d1be81e05 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
@@ -13,6 +13,7 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
@@ -174,7 +174,7 @@ public boolean tryOnNext(T t) {
             R v;
 
             try {
-                v = ObjectHelper.requireNonNull(combiner.apply(objects), "The combiner returned a null value");
+                v = Objects.requireNonNull(combiner.apply(objects), "The combiner returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 cancel();
@@ -297,7 +297,7 @@ void dispose() {
     final class SingletonArrayFunc implements Function<T, R> {
         @Override
         public R apply(T t) throws Throwable {
-            return ObjectHelper.requireNonNull(combiner.apply(new Object[] { t }), "The combiner returned a null value");
+            return Objects.requireNonNull(combiner.apply(new Object[] { t }), "The combiner returned a null value");
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
index 09f1a59a7f..27f1f8e2dc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
@@ -229,7 +229,7 @@ void drain() {
                     R v;
 
                     try {
-                        v = ObjectHelper.requireNonNull(zipper.apply(values.clone()), "The zipper returned a null value");
+                        v = Objects.requireNonNull(zipper.apply(values.clone()), "The zipper returned a null value");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
                         cancelAll();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java
index fad3df6e8e..a41c591fe2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java
@@ -14,13 +14,13 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Iterator;
+import java.util.Objects;
 
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -41,7 +41,7 @@ public void subscribeActual(Subscriber<? super V> t) {
         Iterator<U> it;
 
         try {
-            it = ObjectHelper.requireNonNull(other.iterator(), "The iterator returned by other is null");
+            it = Objects.requireNonNull(other.iterator(), "The iterator returned by other is null");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             EmptySubscription.error(e, t);
@@ -99,7 +99,7 @@ public void onNext(T t) {
             U u;
 
             try {
-                u = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value");
+                u = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
             } catch (Throwable e) {
                 error(e);
                 return;
@@ -107,7 +107,7 @@ public void onNext(T t) {
 
             V v;
             try {
-                v = ObjectHelper.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value");
+                v = Objects.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value");
             } catch (Throwable e) {
                 error(e);
                 return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java
index b01b58c6a0..f3abd7ddb8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.disposables.SequentialDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
 
@@ -45,7 +45,7 @@ protected void subscribeActual(Subscriber<? super T> s) {
         Iterator<? extends MaybeSource<? extends T>> it;
 
         try {
-            it = ObjectHelper.requireNonNull(sources.iterator(), "The sources Iterable returned a null Iterator");
+            it = Objects.requireNonNull(sources.iterator(), "The sources Iterable returned a null Iterator");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptySubscription.error(ex, s);
@@ -169,7 +169,7 @@ void drain() {
                             MaybeSource<? extends T> source;
 
                             try {
-                                source = ObjectHelper.requireNonNull(sources.next(), "The source Iterator returned a null MaybeSource");
+                                source = Objects.requireNonNull(sources.next(), "The source Iterator returned a null MaybeSource");
                             } catch (Throwable ex) {
                                 Exceptions.throwIfFatal(ex);
                                 a.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java
index 3146b4781d..ccba4e0041 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java
@@ -17,7 +17,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 /**
  * Defers the creation of the actual Maybe the incoming MaybeObserver is subscribed to.
@@ -37,7 +38,7 @@ protected void subscribeActual(MaybeObserver<? super T> observer) {
         MaybeSource<? extends T> source;
 
         try {
-            source = ObjectHelper.requireNonNull(maybeSupplier.get(), "The maybeSupplier returned a null MaybeSource");
+            source = Objects.requireNonNull(maybeSupplier.get(), "The maybeSupplier returned a null MaybeSource");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptyDisposable.error(ex, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java
index c463567227..afb27373c5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,12 +21,11 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Maps a source item to another MaybeSource then calls a BiFunction with the
  * original item and the secondary item to generate the final result.
- * 
+ *
  * @param <T> the main value type
  * @param <U> the second value type
  * @param <R> the result value type
@@ -85,7 +85,7 @@ public void onSuccess(T value) {
             MaybeSource<? extends U> next;
 
             try {
-                next = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource");
+                next = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 inner.downstream.onError(ex);
@@ -139,7 +139,7 @@ public void onSuccess(U value) {
                 R r;
 
                 try {
-                    r = ObjectHelper.requireNonNull(resultSelector.apply(t, value), "The resultSelector returned a null value");
+                    r = Objects.requireNonNull(resultSelector.apply(t, value), "The resultSelector returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java
index 7ad1008421..fb8bb9d9f1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Maps the success value of the source MaybeSource into a Completable.
@@ -80,7 +80,7 @@ public void onSuccess(T value) {
             CompletableSource cs;
 
             try {
-                cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
+                cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java
index 9c8aef2ba9..8460405dc9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.reactivestreams.Subscriber;
@@ -24,7 +25,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 
@@ -211,7 +211,7 @@ void drain() {
                         R v;
 
                         try {
-                            v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value");
+                            v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             a.onError(ex);
@@ -283,7 +283,7 @@ public R poll() throws Exception {
             Iterator<? extends R> iterator = it;
 
             if (iterator != null) {
-                R v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value");
+                R v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
                 if (!iterator.hasNext()) {
                     it = null;
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java
index 8c2b4816c9..afbb56f8e9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.Iterator;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable;
 
 /**
@@ -193,7 +193,7 @@ public R poll() throws Exception {
             Iterator<? extends R> iterator = it;
 
             if (iterator != null) {
-                R v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value");
+                R v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
                 if (!iterator.hasNext()) {
                     it = null;
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
index 39007e5117..2f50f8cd7d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Maps a value into a MaybeSource and relays its signal.
@@ -102,7 +102,7 @@ public void onSuccess(T value) {
             MaybeSource<? extends R> source;
 
             try {
-                source = ObjectHelper.requireNonNull(onSuccessMapper.apply(value), "The onSuccessMapper returned a null MaybeSource");
+                source = Objects.requireNonNull(onSuccessMapper.apply(value), "The onSuccessMapper returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(ex);
@@ -117,7 +117,7 @@ public void onError(Throwable e) {
             MaybeSource<? extends R> source;
 
             try {
-                source = ObjectHelper.requireNonNull(onErrorMapper.apply(e), "The onErrorMapper returned a null MaybeSource");
+                source = Objects.requireNonNull(onErrorMapper.apply(e), "The onErrorMapper returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(new CompositeException(e, ex));
@@ -132,7 +132,7 @@ public void onComplete() {
             MaybeSource<? extends R> source;
 
             try {
-                source = ObjectHelper.requireNonNull(onCompleteSupplier.get(), "The onCompleteSupplier returned a null MaybeSource");
+                source = Objects.requireNonNull(onCompleteSupplier.get(), "The onCompleteSupplier returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
index 011cbd9ab7..38ec9417d9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Maps the success value of the source MaybeSource into a Single.
@@ -81,7 +81,7 @@ public void onSuccess(T value) {
             SingleSource<? extends R> ss;
 
             try {
-                ss = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null SingleSource");
+                ss = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null SingleSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java
index e823b06936..b917a5885e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Maps the success value of the source MaybeSource into a Single.
@@ -82,7 +82,7 @@ public void onSuccess(T value) {
             SingleSource<? extends R> ss;
 
             try {
-                ss = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null SingleSource");
+                ss = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null SingleSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java
index 837ba675ef..325c4db2ea 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Maps a value into a MaybeSource and relays its signal.
@@ -85,7 +85,7 @@ public void onSuccess(T value) {
             MaybeSource<? extends R> source;
 
             try {
-                source = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource");
+                source = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java
index 38cb73972c..8e40bbd45d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java
@@ -16,7 +16,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 /**
  * Calls a MaybeOperator for the incoming MaybeObserver.
@@ -38,7 +39,7 @@ protected void subscribeActual(MaybeObserver<? super R> observer) {
         MaybeObserver<? super T> lifted;
 
         try {
-            lifted = ObjectHelper.requireNonNull(operator.apply(observer), "The operator returned a null MaybeObserver");
+            lifted = Objects.requireNonNull(operator.apply(observer), "The operator returned a null MaybeObserver");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptyDisposable.error(ex, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java
index c2a14f994d..167e21d7fb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java
@@ -18,7 +18,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 /**
  * Maps the upstream success value into some other value.
@@ -79,7 +80,7 @@ public void onSuccess(T value) {
             R v;
 
             try {
-                v = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null item");
+                v = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null item");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
index d5e5069d22..2910a2e803 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Objects;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.*;
 
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
@@ -327,7 +327,7 @@ static final class MpscFillOnceSimpleQueue<T>
 
         @Override
         public boolean offer(T value) {
-            ObjectHelper.requireNonNull(value, "value is null");
+            Objects.requireNonNull(value, "value is null");
             int idx = producerIndex.getAndIncrement();
             if (idx < length()) {
                 lazySet(idx, value);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
index 15ec49c3a9..901016f39a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,11 +21,10 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Subscribes to the MaybeSource returned by a function if the main source signals an onError.
- * 
+ *
  * @param <T> the value type
  */
 public final class MaybeOnErrorNext<T> extends AbstractMaybeWithUpstream<T, T> {
@@ -97,7 +97,7 @@ public void onError(Throwable e) {
             MaybeSource<? extends T> m;
 
             try {
-                m = ObjectHelper.requireNonNull(resumeFunction.apply(e), "The resumeFunction returned a null MaybeSource");
+                m = Objects.requireNonNull(resumeFunction.apply(e), "The resumeFunction returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(new CompositeException(e, ex));
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
index 5c61179678..c7ab7b8524 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
@@ -18,7 +18,8 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 /**
  * Returns a value generated via a function if the main source signals an onError.
@@ -82,7 +83,7 @@ public void onError(Throwable e) {
             T v;
 
             try {
-                v = ObjectHelper.requireNonNull(valueSupplier.apply(e), "The valueSupplier returned a null value");
+                v = Objects.requireNonNull(valueSupplier.apply(e), "The valueSupplier returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(new CompositeException(e, ex));
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java
index 628c4dda23..0e490d6f40 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
@@ -65,7 +65,7 @@ protected void subscribeActual(MaybeObserver<? super T> observer) {
         MaybeSource<? extends T> source;
 
         try {
-            source = ObjectHelper.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null MaybeSource");
+            source = Objects.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null MaybeSource");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             if (eager) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
index 9d83976966..d4bf3b0a77 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class MaybeZipArray<T, R> extends Maybe<R> {
@@ -108,7 +108,7 @@ void innerSuccess(T value, int index) {
                 R v;
 
                 try {
-                    v = ObjectHelper.requireNonNull(zipper.apply(values), "The zipper returned a null value");
+                    v = Objects.requireNonNull(zipper.apply(values), "The zipper returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     downstream.onError(ex);
@@ -190,7 +190,7 @@ public void onComplete() {
     final class SingletonArrayFunc implements Function<T, R> {
         @Override
         public R apply(T t) throws Throwable {
-            return ObjectHelper.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value");
+            return Objects.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value");
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java
index efcd10b136..7c2d85c97b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java
@@ -14,12 +14,12 @@
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.Arrays;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeZipArray.ZipCoordinator;
 
 public final class MaybeZipIterable<T, R> extends Maybe<R> {
@@ -82,7 +82,7 @@ protected void subscribeActual(MaybeObserver<? super R> observer) {
     final class SingletonArrayFunc implements Function<T, R> {
         @Override
         public R apply(T t) throws Throwable {
-            return ObjectHelper.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value");
+            return Objects.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value");
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
index 6e16c9b6a9..986af99049 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.Subscription;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
@@ -223,7 +223,7 @@ void drain() {
                         CompletableSource cs;
 
                         try {
-                            cs = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null CompletableSource");
+                            cs = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null CompletableSource");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             queue.clear();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
index 39fa04b174..cd8b9fa77f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
@@ -251,7 +251,7 @@ void drain() {
                         MaybeSource<? extends R> ms;
 
                         try {
-                            ms = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null MaybeSource");
+                            ms = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null MaybeSource");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
index cd5e857274..78334d4a1f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
@@ -246,7 +246,7 @@ void drain() {
                         SingleSource<? extends R> ss;
 
                         try {
-                            ss = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null SingleSource");
+                            ss = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null SingleSource");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java
index f354d8f057..a2d66067ab 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.reactivestreams.Subscription;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -96,7 +96,7 @@ public void onNext(T t) {
             CompletableSource c;
 
             try {
-                c = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null CompletableSource");
+                c = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null CompletableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java
index 56858d5d22..11ea0a4c77 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -116,7 +116,7 @@ public void onNext(T t) {
             MaybeSource<? extends R> ms;
 
             try {
-                ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource");
+                ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java
index ac0880082b..c41b52f6e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -116,7 +116,7 @@ public void onNext(T t) {
             SingleSource<? extends R> ss;
 
             try {
-                ss = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource");
+                ss = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
index a4dde1242f..891c2a0f33 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,12 +21,11 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Maps the success value of a Maybe onto an ObservableSource and
  * relays its signals to the downstream observer.
- * 
+ *
  * @param <T> the success value type of the Maybe source
  * @param <R> the result type of the ObservableSource and this operator
  * @since 2.1.15
@@ -99,7 +99,7 @@ public void onSuccess(T t) {
             ObservableSource<? extends R> o;
 
             try {
-                o = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
+                o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
index 66a446f3f3..1ac179bcca 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -22,13 +23,12 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 
 /**
  * Maps the success value of a Maybe onto a Publisher and
  * relays its signals to the downstream subscriber.
- * 
+ *
  * @param <T> the success value type of the Maybe source
  * @param <R> the result type of the Publisher and this operator
  * @since 2.1.15
@@ -109,7 +109,7 @@ public void onSuccess(T t) {
             Publisher<? extends R> p;
 
             try {
-                p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
+                p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
index 4921722b5d..44f322e39d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
@@ -224,7 +224,7 @@ void drain() {
                     try {
                         T v = queue.poll();
                         if (v != null) {
-                            cs = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null CompletableSource");
+                            cs = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null CompletableSource");
                             empty = false;
                         }
                     } catch (Throwable ex) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
index 17e4de9050..c76b0115cb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
@@ -224,7 +224,7 @@ void drain() {
                         MaybeSource<? extends R> ms;
 
                         try {
-                            ms = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null MaybeSource");
+                            ms = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null MaybeSource");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
index 91428a80db..34d7d04734 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
@@ -219,7 +219,7 @@ void drain() {
                         SingleSource<? extends R> ss;
 
                         try {
-                            ss = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null SingleSource");
+                            ss = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null SingleSource");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java
index 06a09676d0..a7a6a7fd99 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -94,7 +94,7 @@ public void onNext(T t) {
             CompletableSource c;
 
             try {
-                c = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null CompletableSource");
+                c = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null CompletableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java
index b85bc0e2c2..bf3c9f43c2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -109,7 +109,7 @@ public void onNext(T t) {
             MaybeSource<? extends R> ms;
 
             try {
-                ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource");
+                ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java
index 3343f93d97..bc19c88b55 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -109,7 +109,7 @@ public void onNext(T t) {
             SingleSource<? extends R> ss;
 
             try {
-                ss = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource");
+                ss = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java
index 24f231e45c..d7fe0e3445 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java
@@ -17,10 +17,11 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeToObservable;
 import io.reactivex.rxjava3.internal.operators.single.SingleToObservable;
 
+import java.util.Objects;
+
 /**
  * Utility class to extract a value from a scalar source reactive type,
  * map it to a 0-1 type then subscribe the output type's consumer to it,
@@ -55,7 +56,7 @@ static <T> boolean tryAsCompletable(Object source,
             try {
                 T item = supplier.get();
                 if (item != null) {
-                    cs = ObjectHelper.requireNonNull(mapper.apply(item), "The mapper returned a null CompletableSource");
+                    cs = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null CompletableSource");
                 }
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
@@ -94,7 +95,7 @@ static <T, R> boolean tryAsMaybe(Object source,
             try {
                 T item = supplier.get();
                 if (item != null) {
-                    cs = ObjectHelper.requireNonNull(mapper.apply(item), "The mapper returned a null MaybeSource");
+                    cs = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null MaybeSource");
                 }
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
@@ -133,7 +134,7 @@ static <T, R> boolean tryAsSingle(Object source,
             try {
                 T item = supplier.get();
                 if (item != null) {
-                    cs = ObjectHelper.requireNonNull(mapper.apply(item), "The mapper returned a null SingleSource");
+                    cs = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null SingleSource");
                 }
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
index 9591783a8e..bfb466bac1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.mixed;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,12 +21,11 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Maps the success value of a Single onto an ObservableSource and
  * relays its signals to the downstream observer.
- * 
+ *
  * @param <T> the success value type of the Single source
  * @param <R> the result type of the ObservableSource and this operator
  * @since 2.1.15
@@ -99,7 +99,7 @@ public void onSuccess(T t) {
             ObservableSource<? extends R> o;
 
             try {
-                o = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
+                o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
index c35f927c0b..c02bcfca88 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -97,9 +98,9 @@ public static <T> void subscribe(ObservableSource<? extends T> o) {
      */
     public static <T> void subscribe(ObservableSource<? extends T> o, final Consumer<? super T> onNext,
             final Consumer<? super Throwable> onError, final Action onComplete) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(onError, "onError is null");
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
         subscribe(o, new LambdaObserver<T>(onNext, onError, onComplete, Functions.emptyConsumer()));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
index d0ae0b89cc..2b09748a61 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
@@ -22,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 
 public final class ObservableBuffer<T, U extends Collection<? super T>> extends AbstractObservableWithUpstream<T, U> {
@@ -68,7 +67,7 @@ static final class BufferExactObserver<T, U extends Collection<? super T>> imple
         boolean createBuffer() {
             U b;
             try {
-                b = ObjectHelper.requireNonNull(bufferSupplier.get(), "Empty buffer supplied");
+                b = Objects.requireNonNull(bufferSupplier.get(), "Empty buffer supplied");
             } catch (Throwable t) {
                 Exceptions.throwIfFatal(t);
                 buffer = null;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
index 961c6cd374..cef9ef41d8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
@@ -22,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -172,8 +171,8 @@ void open(Open token) {
             ObservableSource<? extends Close> p;
             C buf;
             try {
-                buf = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null Collection");
-                p = ObjectHelper.requireNonNull(bufferClose.apply(token), "The bufferClose returned a null ObservableSource");
+                buf = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null Collection");
+                p = Objects.requireNonNull(bufferClose.apply(token), "The bufferClose returned a null ObservableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 DisposableHelper.dispose(upstream);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
index 474e993653..7d76354cf9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
@@ -14,13 +14,13 @@
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Collection;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.QueueDrainObserver;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 import io.reactivex.rxjava3.internal.util.QueueDrainHelper;
@@ -69,7 +69,7 @@ public void onSubscribe(Disposable d) {
                 U b;
 
                 try {
-                    b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
+                    b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     cancelled = true;
@@ -148,7 +148,7 @@ void next() {
             U next;
 
             try {
-                next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
+                next = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
index 107b011b2d..3b12c3d0f5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
@@ -24,7 +24,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.QueueDrainObserver;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 import io.reactivex.rxjava3.internal.util.QueueDrainHelper;
@@ -110,7 +109,7 @@ public void onSubscribe(Disposable d) {
                 U b;
 
                 try {
-                    b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
+                    b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     dispose();
@@ -184,7 +183,7 @@ public void run() {
             U next;
 
             try {
-                next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
+                next = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(e);
@@ -246,7 +245,7 @@ public void onSubscribe(Disposable d) {
                 final U b; // NOPMD
 
                 try {
-                    b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
+                    b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     d.dispose();
@@ -328,7 +327,7 @@ public void run() {
             final U b; // NOPMD
 
             try {
-                b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
+                b = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(e);
@@ -427,7 +426,7 @@ public void onSubscribe(Disposable d) {
                 U b;
 
                 try {
-                    b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
+                    b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     d.dispose();
@@ -469,7 +468,7 @@ public void onNext(T t) {
             fastPathOrderedEmit(b, false, this);
 
             try {
-                b = ObjectHelper.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
+                b = Objects.requireNonNull(bufferSupplier.get(), "The buffer supplied is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(e);
@@ -541,7 +540,7 @@ public void run() {
             U next;
 
             try {
-                next = ObjectHelper.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
+                next = Objects.requireNonNull(bufferSupplier.get(), "The bufferSupplier returned a null buffer");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
index 3b81a32ad9..6471d7538c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
@@ -16,9 +16,10 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class ObservableCollect<T, U> extends AbstractObservableWithUpstream<T, U> {
     final Supplier<? extends U> initialSupplier;
     final BiConsumer<? super U, ? super T> collector;
@@ -34,7 +35,7 @@ public ObservableCollect(ObservableSource<T> source,
     protected void subscribeActual(Observer<? super U> t) {
         U u;
         try {
-            u = ObjectHelper.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
+            u = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
         } catch (Throwable e) {
             EmptyDisposable.error(e, t);
             return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
index a63812a9ab..09c86cb24a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
@@ -16,10 +16,11 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.FuseToObservable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class ObservableCollectSingle<T, U> extends Single<U> implements FuseToObservable<U> {
 
     final ObservableSource<T> source;
@@ -38,7 +39,7 @@ public ObservableCollectSingle(ObservableSource<T> source,
     protected void subscribeActual(SingleObserver<? super U> t) {
         U u;
         try {
-            u = ObjectHelper.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
+            u = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
         } catch (Throwable e) {
             EmptyDisposable.error(e, t);
             return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
index 6a379d142c..0cc8e3e45e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 
@@ -188,7 +188,7 @@ void drain() {
                     R v;
 
                     try {
-                        v = ObjectHelper.requireNonNull(combiner.apply(s), "The combiner returned a null value");
+                        v = Objects.requireNonNull(combiner.apply(s), "The combiner returned a null value");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
                         errors.tryAddThrowableOrReport(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
index 665306db95..b96b1ec8a0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
@@ -12,6 +12,7 @@
  */
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -19,7 +20,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
@@ -208,7 +208,7 @@ void drain() {
                         ObservableSource<? extends U> o;
 
                         try {
-                            o = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
+                            o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             dispose();
@@ -436,7 +436,7 @@ void drain() {
                         ObservableSource<? extends R> o;
 
                         try {
-                            o = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource");
+                            o = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             cancelled = true;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
index 47c4099b83..fe2bed8c8c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.ArrayDeque;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.reactivex.rxjava3.core.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.observers.*;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
@@ -271,7 +271,7 @@ public void drain() {
                             break;
                         }
 
-                        source = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource");
+                        source = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
                         upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
index efe4b79fc6..f45dd92f1f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
@@ -12,6 +12,7 @@
  */
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -19,7 +20,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
@@ -218,7 +218,7 @@ public void run() {
                         ObservableSource<? extends U> o;
 
                         try {
-                            o = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
+                            o = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             dispose();
@@ -459,7 +459,7 @@ public void run() {
                         ObservableSource<? extends R> o;
 
                         try {
-                            o = ObjectHelper.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource");
+                            o = Objects.requireNonNull(mapper.apply(v), "The mapper returned a null ObservableSource");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             cancelled = true;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java
index d2e1f8cf18..20f98731c1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.observers.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -81,7 +81,7 @@ public void onNext(T t) {
             ObservableSource<U> p;
 
             try {
-                p = ObjectHelper.requireNonNull(debounceSelector.apply(t), "The ObservableSource supplied is null");
+                p = Objects.requireNonNull(debounceSelector.apply(t), "The ObservableSource supplied is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java
index c1f8dc41ab..15b3394af7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java
@@ -17,7 +17,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 public final class ObservableDefer<T> extends Observable<T> {
     final Supplier<? extends ObservableSource<? extends T>> supplier;
@@ -29,7 +30,7 @@ public ObservableDefer(Supplier<? extends ObservableSource<? extends T>> supplie
     public void subscribeActual(Observer<? super T> observer) {
         ObservableSource<? extends T> pub;
         try {
-            pub = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null ObservableSource");
+            pub = Objects.requireNonNull(supplier.get(), "The supplier returned a null ObservableSource");
         } catch (Throwable t) {
             Exceptions.throwIfFatal(t);
             EmptyDisposable.error(t, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java
index 59da21cd47..45b42e1ecc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java
@@ -18,9 +18,10 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class ObservableDematerialize<T, R> extends AbstractObservableWithUpstream<T, R> {
 
     final Function<? super T, ? extends Notification<R>> selector;
@@ -83,7 +84,7 @@ public void onNext(T item) {
             Notification<R> notification;
 
             try {
-                notification = ObjectHelper.requireNonNull(selector.apply(item), "The selector returned a null Notification");
+                notification = Objects.requireNonNull(selector.apply(item), "The selector returned a null Notification");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java
index 98c197156c..aadeafb2b1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java
@@ -14,13 +14,13 @@
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Collection;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -74,7 +74,7 @@ public void onNext(T value) {
                 boolean b;
 
                 try {
-                    key = ObjectHelper.requireNonNull(keySelector.apply(value), "The keySelector returned a null key");
+                    key = Objects.requireNonNull(keySelector.apply(value), "The keySelector returned a null key");
                     b = collection.add(key);
                 } catch (Throwable ex) {
                     fail(ex);
@@ -120,7 +120,7 @@ public T poll() throws Throwable {
             for (;;) {
                 T v = qd.poll();
 
-                if (v == null || collection.add(ObjectHelper.requireNonNull(keySelector.apply(v), "The keySelector returned a null key"))) {
+                if (v == null || collection.add(Objects.requireNonNull(keySelector.apply(v), "The keySelector returned a null key"))) {
                     return v;
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
index 596719176e..7e01d7cbc1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
@@ -22,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.*;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
@@ -117,7 +116,7 @@ public void onNext(T t) {
             }
             ObservableSource<? extends U> p;
             try {
-                p = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
+                p = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
index 26f0505a14..75fc80ac61 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.annotations.Nullable;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 
@@ -88,7 +88,7 @@ public void onNext(T value) {
             CompletableSource cs;
 
             try {
-                cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
+                cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
index b9a9213769..ddf9602a05 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.FuseToObservable;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -94,7 +94,7 @@ public void onNext(T value) {
             CompletableSource cs;
 
             try {
-                cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
+                cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
index 9e323ec346..ac951a571c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 
@@ -96,7 +96,7 @@ public void onNext(T t) {
             MaybeSource<? extends R> ms;
 
             try {
-                ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource");
+                ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
index 4ca080a73f..6d5dd3da63 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 
@@ -96,7 +96,7 @@ public void onNext(T t) {
             SingleSource<? extends R> ms;
 
             try {
-                ms = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource");
+                ms = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null SingleSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java
index c6704398a1..3f90f31acd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java
@@ -14,13 +14,13 @@
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Iterator;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
@@ -100,7 +100,7 @@ public void onNext(T value) {
                     R v;
 
                     try {
-                        v = ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value");
+                        v = Objects.requireNonNull(it.next(), "The iterator returned a null value");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
                         upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java
index 7c4b09ba62..fb4beaaf21 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java
@@ -15,9 +15,10 @@
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable;
 
+import java.util.Objects;
+
 public final class ObservableFromArray<T> extends Observable<T> {
     final T[] array;
     public ObservableFromArray(T[] array) {
@@ -70,7 +71,7 @@ public T poll() {
             T[] a = array;
             if (i != a.length) {
                 index = i + 1;
-                return ObjectHelper.requireNonNull(a[i], "The array element is null");
+                return Objects.requireNonNull(a[i], "The array element is null");
             }
             return null;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java
index 91811b3c4a..9edf260931 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java
@@ -14,12 +14,12 @@
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Iterator;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable;
 
 public final class ObservableFromIterable<T> extends Observable<T> {
@@ -88,7 +88,7 @@ void run() {
                 T v;
 
                 try {
-                    v = ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value");
+                    v = Objects.requireNonNull(it.next(), "The iterator returned a null value");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     downstream.onError(e);
@@ -138,7 +138,7 @@ public T poll() {
                 checkNext = true;
             }
 
-            return ObjectHelper.requireNonNull(it.next(), "The iterator returned a null value");
+            return Objects.requireNonNull(it.next(), "The iterator returned a null value");
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
index 821d2e81e1..78edf33cea 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
@@ -23,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.observables.GroupedObservable;
 
@@ -115,7 +114,7 @@ public void onNext(T t) {
 
             V v;
             try {
-                v = ObjectHelper.requireNonNull(valueSelector.apply(t), "The value supplied is null");
+                v = Objects.requireNonNull(valueSelector.apply(t), "The value supplied is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
index b6c9f811f4..7b12579966 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
@@ -26,7 +26,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -243,7 +242,7 @@ void drain() {
                         ObservableSource<TLeftEnd> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null ObservableSource");
+                            p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null ObservableSource");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
@@ -265,7 +264,7 @@ void drain() {
                         R w;
 
                         try {
-                            w = ObjectHelper.requireNonNull(resultSelector.apply(left, up), "The resultSelector returned a null value");
+                            w = Objects.requireNonNull(resultSelector.apply(left, up), "The resultSelector returned a null value");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
@@ -288,7 +287,7 @@ else if (mode == RIGHT_VALUE) {
                         ObservableSource<TRightEnd> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null ObservableSource");
+                            p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null ObservableSource");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java
index 1665b99014..fcd5f57fa5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java
@@ -12,6 +12,7 @@
  */
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.core.*;
@@ -73,7 +74,7 @@ static final class ItemDelayFunction<T, U> implements Function<T, ObservableSour
 
         @Override
         public ObservableSource<T> apply(final T v) throws Throwable {
-            ObservableSource<U> o = ObjectHelper.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null ObservableSource");
+            ObservableSource<U> o = Objects.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null ObservableSource");
             return new ObservableTake<U>(o, 1).map(Functions.justFunction(v)).defaultIfEmpty(v);
         }
     }
@@ -161,7 +162,7 @@ static final class FlatMapWithCombinerOuter<T, R, U> implements Function<T, Obse
         @Override
         public ObservableSource<R> apply(final T t) throws Throwable {
             @SuppressWarnings("unchecked")
-            ObservableSource<U> u = (ObservableSource<U>)ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
+            ObservableSource<U> u = (ObservableSource<U>)Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
             return new ObservableMap<U, R>(u, new FlatMapWithCombinerInner<U, R, T>(combiner, t));
         }
     }
@@ -181,7 +182,7 @@ static final class FlatMapIntoIterable<T, U> implements Function<T, ObservableSo
 
         @Override
         public ObservableSource<U> apply(T t) throws Throwable {
-            return new ObservableFromIterable<U>(ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable"));
+            return new ObservableFromIterable<U>(Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable"));
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
index cf98732637..6660d342f3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
@@ -24,7 +24,6 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableGroupJoin.*;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
@@ -219,7 +218,7 @@ void drain() {
                         ObservableSource<TLeftEnd> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null ObservableSource");
+                            p = Objects.requireNonNull(leftEnd.apply(left), "The leftEnd returned a null ObservableSource");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
@@ -243,7 +242,7 @@ void drain() {
                             R w;
 
                             try {
-                                w = ObjectHelper.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value");
+                                w = Objects.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value");
                             } catch (Throwable exc) {
                                 fail(exc, a, q);
                                 return;
@@ -263,7 +262,7 @@ else if (mode == RIGHT_VALUE) {
                         ObservableSource<TRightEnd> p;
 
                         try {
-                            p = ObjectHelper.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null ObservableSource");
+                            p = Objects.requireNonNull(rightEnd.apply(right), "The rightEnd returned a null ObservableSource");
                         } catch (Throwable exc) {
                             fail(exc, a, q);
                             return;
@@ -287,7 +286,7 @@ else if (mode == RIGHT_VALUE) {
                             R w;
 
                             try {
-                                w = ObjectHelper.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value");
+                                w = Objects.requireNonNull(resultSelector.apply(left, right), "The resultSelector returned a null value");
                             } catch (Throwable exc) {
                                 fail(exc, a, q);
                                 return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java
index f38ac66bd3..4aa45683ff 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java
@@ -15,9 +15,10 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Allows lifting operators into a chain of Observables.
  *
@@ -40,7 +41,7 @@ public ObservableLift(ObservableSource<T> source, ObservableOperator<? extends R
     public void subscribeActual(Observer<? super R> observer) {
         Observer<? super T> liftedObserver;
         try {
-            liftedObserver = ObjectHelper.requireNonNull(operator.apply(observer), "Operator " + operator + " returned a null Observer");
+            liftedObserver = Objects.requireNonNull(operator.apply(observer), "Operator " + operator + " returned a null Observer");
         } catch (NullPointerException e) { // NOPMD
             throw e;
         } catch (Throwable e) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java
index 9bff5de703..4361016ec6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java
@@ -16,9 +16,10 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver;
 
+import java.util.Objects;
+
 public final class ObservableMap<T, U> extends AbstractObservableWithUpstream<T, U> {
     final Function<? super T, ? extends U> function;
 
@@ -54,7 +55,7 @@ public void onNext(T t) {
             U v;
 
             try {
-                v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper function returned a null value.");
+                v = Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.");
             } catch (Throwable ex) {
                 fail(ex);
                 return;
@@ -71,7 +72,7 @@ public int requestFusion(int mode) {
         @Override
         public U poll() throws Throwable {
             T t = qd.poll();
-            return t != null ? ObjectHelper.<U>requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null;
+            return t != null ? Objects.requireNonNull(mapper.apply(t), "The mapper function returned a null value.") : null;
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java
index 8ef5a5395d..147c21ae37 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java
@@ -18,7 +18,8 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 public final class ObservableMapNotification<T, R> extends AbstractObservableWithUpstream<T, ObservableSource<? extends R>> {
 
@@ -84,7 +85,7 @@ public void onNext(T t) {
             ObservableSource<? extends R> p;
 
             try {
-                p = ObjectHelper.requireNonNull(onNextMapper.apply(t), "The onNext ObservableSource returned is null");
+                p = Objects.requireNonNull(onNextMapper.apply(t), "The onNext ObservableSource returned is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(e);
@@ -99,7 +100,7 @@ public void onError(Throwable t) {
             ObservableSource<? extends R> p;
 
             try {
-                p = ObjectHelper.requireNonNull(onErrorMapper.apply(t), "The onError ObservableSource returned is null");
+                p = Objects.requireNonNull(onErrorMapper.apply(t), "The onError ObservableSource returned is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(new CompositeException(t, e));
@@ -115,7 +116,7 @@ public void onComplete() {
             ObservableSource<? extends R> p;
 
             try {
-                p = ObjectHelper.requireNonNull(onCompleteSupplier.get(), "The onComplete ObservableSource returned is null");
+                p = Objects.requireNonNull(onCompleteSupplier.get(), "The onComplete ObservableSource returned is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(e);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java
index ef7d2367fc..8247a6abfc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.subjects.PublishSubject;
 
 /**
@@ -45,7 +45,7 @@ protected void subscribeActual(Observer<? super R> observer) {
         ObservableSource<? extends R> target;
 
         try {
-            target = ObjectHelper.requireNonNull(selector.apply(subject), "The selector returned a null ObservableSource");
+            target = Objects.requireNonNull(selector.apply(subject), "The selector returned a null ObservableSource");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptyDisposable.error(ex, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java
index 24d5e5d568..bab7bbb065 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java
@@ -18,9 +18,10 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Reduce a sequence of values into a single value via an aggregator function and emit the final value or complete
  * if the source is empty.
@@ -78,7 +79,7 @@ public void onNext(T value) {
                     this.value = value;
                 } else {
                     try {
-                        this.value = ObjectHelper.requireNonNull(reducer.apply(v, value), "The reducer returned a null value");
+                        this.value = Objects.requireNonNull(reducer.apply(v, value), "The reducer returned a null value");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
                         upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java
index 4ec8ac8bcc..e6b0d1d0ef 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java
@@ -18,9 +18,10 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Reduce a sequence of values, starting from a seed value and by using
  * an accumulator function and return the last accumulated value.
@@ -77,7 +78,7 @@ public void onNext(T value) {
             R v = this.value;
             if (v != null) {
                 try {
-                    this.value = ObjectHelper.requireNonNull(reducer.apply(v, value), "The reducer returned a null value");
+                    this.value = Objects.requireNonNull(reducer.apply(v, value), "The reducer returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java
index e7b1b16813..956d7bf7c9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java
@@ -17,9 +17,10 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableReduceSeedSingle.ReduceSeedObserver;
 
+import java.util.Objects;
+
 /**
  * Reduce a sequence of values, starting from a generated seed value and by using
  * an accumulator function and return the last accumulated value.
@@ -46,7 +47,7 @@ protected void subscribeActual(SingleObserver<? super R> observer) {
         R seed;
 
         try {
-            seed = ObjectHelper.requireNonNull(seedSupplier.get(), "The seedSupplier returned a null value");
+            seed = Objects.requireNonNull(seedSupplier.get(), "The seedSupplier returned a null value");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptyDisposable.error(ex, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java
index abdf42b872..eff1e248ac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.subjects.*;
 
@@ -45,7 +45,7 @@ protected void subscribeActual(Observer<? super T> observer) {
         ObservableSource<?> other;
 
         try {
-            other = ObjectHelper.requireNonNull(handler.apply(signaller), "The handler returned a null ObservableSource");
+            other = Objects.requireNonNull(handler.apply(signaller), "The handler returned a null ObservableSource");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptyDisposable.error(ex, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
index 1bb4f344d4..ba0811b85c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
@@ -24,7 +24,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.HasUpstreamObservableSource;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.observables.ConnectableObservable;
@@ -1054,8 +1053,8 @@ protected void subscribeActual(Observer<? super R> child) {
             ConnectableObservable<U> co;
             ObservableSource<R> observable;
             try {
-                co = ObjectHelper.requireNonNull(connectableFactory.get(), "The connectableFactory returned a null ConnectableObservable");
-                observable = ObjectHelper.requireNonNull(selector.apply(co), "The selector returned a null ObservableSource");
+                co = Objects.requireNonNull(connectableFactory.get(), "The connectableFactory returned a null ConnectableObservable");
+                observable = Objects.requireNonNull(selector.apply(co), "The selector returned a null ObservableSource");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 EmptyDisposable.error(e, child);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java
index 054887adab..0eb5fbb5b7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.subjects.*;
 
@@ -45,7 +45,7 @@ protected void subscribeActual(Observer<? super T> observer) {
         ObservableSource<?> other;
 
         try {
-            other = ObjectHelper.requireNonNull(handler.apply(signaller), "The handler returned a null ObservableSource");
+            other = Objects.requireNonNull(handler.apply(signaller), "The handler returned a null ObservableSource");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptyDisposable.error(ex, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
index 85c13e27e7..128d327e2b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.reactivex.rxjava3.annotations.Nullable;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -66,7 +66,7 @@ public static <T, R> boolean tryScalarXMapSubscribe(ObservableSource<T> source,
             ObservableSource<? extends R> r;
 
             try {
-                r = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
+                r = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 EmptyDisposable.error(ex, observer);
@@ -138,7 +138,7 @@ static final class ScalarXMapObservable<T, R> extends Observable<R> {
         public void subscribeActual(Observer<? super R> observer) {
             ObservableSource<? extends R> other;
             try {
-                other = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null ObservableSource");
+                other = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null ObservableSource");
             } catch (Throwable e) {
                 EmptyDisposable.error(e, observer);
                 return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java
index 026b3ac5eb..94918b6c39 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java
@@ -18,9 +18,10 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class ObservableScan<T> extends AbstractObservableWithUpstream<T, T> {
     final BiFunction<T, T, T> accumulator;
     public ObservableScan(ObservableSource<T> source, BiFunction<T, T, T> accumulator) {
@@ -80,7 +81,7 @@ public void onNext(T t) {
                 T u;
 
                 try {
-                    u = ObjectHelper.requireNonNull(accumulator.apply(v, t), "The value returned by the accumulator is null");
+                    u = Objects.requireNonNull(accumulator.apply(v, t), "The value returned by the accumulator is null");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java
index e13c6fe189..24e4b580ad 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java
@@ -17,9 +17,10 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 public final class ObservableScanSeed<T, R> extends AbstractObservableWithUpstream<T, R> {
     final BiFunction<R, ? super T, R> accumulator;
     final Supplier<R> seedSupplier;
@@ -35,7 +36,7 @@ public void subscribeActual(Observer<? super R> t) {
         R r;
 
         try {
-            r = ObjectHelper.requireNonNull(seedSupplier.get(), "The seed supplied is null");
+            r = Objects.requireNonNull(seedSupplier.get(), "The seed supplied is null");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             EmptyDisposable.error(e, t);
@@ -93,7 +94,7 @@ public void onNext(T t) {
             R u;
 
             try {
-                u = ObjectHelper.requireNonNull(accumulator.apply(v, t), "The accumulator returned a null value");
+                u = Objects.requireNonNull(accumulator.apply(v, t), "The accumulator returned a null value");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
index d9d50fc032..bca0f1beeb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
@@ -108,7 +108,7 @@ public void onNext(T t) {
 
             ObservableSource<? extends R> p;
             try {
-                p = ObjectHelper.requireNonNull(mapper.apply(t), "The ObservableSource returned is null");
+                p = Objects.requireNonNull(mapper.apply(t), "The ObservableSource returned is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 upstream.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java
index 4fe72feadd..a9ada29730 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.*;
 
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableTimeoutTimed.TimeoutSupport;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -102,7 +102,7 @@ public void onNext(T t) {
             ObservableSource<?> itemTimeoutObservableSource;
 
             try {
-                itemTimeoutObservableSource = ObjectHelper.requireNonNull(
+                itemTimeoutObservableSource = Objects.requireNonNull(
                         itemTimeoutIndicator.apply(t),
                         "The itemTimeoutIndicator returned a null ObservableSource.");
             } catch (Throwable ex) {
@@ -231,7 +231,7 @@ public void onNext(T t) {
             ObservableSource<?> itemTimeoutObservableSource;
 
             try {
-                itemTimeoutObservableSource = ObjectHelper.requireNonNull(
+                itemTimeoutObservableSource = Objects.requireNonNull(
                         itemTimeoutIndicator.apply(t),
                         "The itemTimeoutIndicator returned a null ObservableSource.");
             } catch (Throwable ex) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
index 3a4e5d81e2..60fad9e740 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableUsing<T, D> extends Observable<T> {
@@ -53,7 +53,7 @@ public void subscribeActual(Observer<? super T> observer) {
 
         ObservableSource<? extends T> source;
         try {
-            source = ObjectHelper.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null ObservableSource");
+            source = Objects.requireNonNull(sourceSupplier.apply(resource), "The sourceSupplier returned a null ObservableSource");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             try {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
index 037c7d0773..5ea42da118 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
@@ -23,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 import io.reactivex.rxjava3.internal.util.*;
@@ -236,7 +235,7 @@ void drain() {
 
                                 ObservableSource<V> endSource;
                                 try {
-                                    endSource = ObjectHelper.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null ObservableSource");
+                                    endSource = Objects.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null ObservableSource");
                                 } catch (Throwable ex) {
                                     upstream.dispose();
                                     startObserver.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java
index 91b4b0266d..6ac680db30 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.observers.SerializedObserver;
 
 public final class ObservableWithLatestFrom<T, U, R> extends AbstractObservableWithUpstream<T, R> {
@@ -73,7 +73,7 @@ public void onNext(T t) {
             if (u != null) {
                 R r;
                 try {
-                    r = ObjectHelper.requireNonNull(combiner.apply(t, u), "The combiner returned a null value");
+                    r = Objects.requireNonNull(combiner.apply(t, u), "The combiner returned a null value");
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java
index fc64adc42f..73d28032fc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java
@@ -13,6 +13,7 @@
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.annotations.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -164,7 +164,7 @@ public void onNext(T t) {
             R v;
 
             try {
-                v = ObjectHelper.requireNonNull(combiner.apply(objects), "combiner returned a null value");
+                v = Objects.requireNonNull(combiner.apply(objects), "combiner returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 dispose();
@@ -285,7 +285,7 @@ public void dispose() {
     final class SingletonArrayFunc implements Function<T, R> {
         @Override
         public R apply(T t) throws Throwable {
-            return ObjectHelper.requireNonNull(combiner.apply(new Object[] { t }), "The combiner returned a null value");
+            return Objects.requireNonNull(combiner.apply(new Object[] { t }), "The combiner returned a null value");
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
index b3d40dc2ed..80ae9b174b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Arrays;
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 
 public final class ObservableZip<T, R> extends Observable<R> {
@@ -195,7 +195,7 @@ public void drain() {
 
                     R v;
                     try {
-                        v = ObjectHelper.requireNonNull(zipper.apply(os.clone()), "The zipper returned a null value");
+                        v = Objects.requireNonNull(zipper.apply(os.clone()), "The zipper returned a null value");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
                         cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
index d86b90395d..d775c58515 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
@@ -14,13 +14,13 @@
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Iterator;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableZipIterable<T, U, V> extends Observable<V> {
@@ -41,7 +41,7 @@ public void subscribeActual(Observer<? super V> t) {
         Iterator<U> it;
 
         try {
-            it = ObjectHelper.requireNonNull(other.iterator(), "The iterator returned by other is null");
+            it = Objects.requireNonNull(other.iterator(), "The iterator returned by other is null");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             EmptyDisposable.error(e, t);
@@ -109,7 +109,7 @@ public void onNext(T t) {
             U u;
 
             try {
-                u = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value");
+                u = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 error(e);
@@ -118,7 +118,7 @@ public void onNext(T t) {
 
             V v;
             try {
-                v = ObjectHelper.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value");
+                v = Objects.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 error(e);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
index d37bcfa1b3..e1da1b76b7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
@@ -17,12 +17,13 @@
 
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Reduce the sequence of values in each 'rail' to a single value.
  *
@@ -59,7 +60,7 @@ public void subscribe(Subscriber<? super C>[] subscribers) {
             C initialValue;
 
             try {
-                initialValue = ObjectHelper.requireNonNull(initialCollection.get(), "The initialSupplier returned a null value");
+                initialValue = Objects.requireNonNull(initialCollection.get(), "The initialSupplier returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 reportError(subscribers, ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java
index 5b7d3ef5c4..1ff745ecba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java
@@ -16,11 +16,12 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap;
 import io.reactivex.rxjava3.internal.util.ErrorMode;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 
+import java.util.Objects;
+
 /**
  * Concatenates the generated Publishers on each rail.
  *
@@ -42,9 +43,9 @@ public ParallelConcatMap(
             Function<? super T, ? extends Publisher<? extends R>> mapper,
                     int prefetch, ErrorMode errorMode) {
         this.source = source;
-        this.mapper = ObjectHelper.requireNonNull(mapper, "mapper");
+        this.mapper = Objects.requireNonNull(mapper, "mapper");
         this.prefetch = prefetch;
-        this.errorMode = ObjectHelper.requireNonNull(errorMode, "errorMode");
+        this.errorMode = Objects.requireNonNull(errorMode, "errorMode");
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
index 0e93abcccb..557d5282c4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
@@ -17,12 +17,13 @@
 
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.parallel.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Calls a Consumer for each upstream value passing by
  * and handles any failure with a handler function.
@@ -133,7 +134,7 @@ public boolean tryOnNext(T t) {
                     ParallelFailureHandling h;
 
                     try {
-                        h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
                     } catch (Throwable exc) {
                         Exceptions.throwIfFatal(exc);
                         cancel();
@@ -244,7 +245,7 @@ public boolean tryOnNext(T t) {
                     ParallelFailureHandling h;
 
                     try {
-                        h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
                     } catch (Throwable exc) {
                         Exceptions.throwIfFatal(exc);
                         cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
index 12366c30fa..f6eff78249 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
@@ -17,12 +17,13 @@
 
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.parallel.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Filters each 'rail' of the source ParallelFlowable with a predicate function.
  *
@@ -136,7 +137,7 @@ public boolean tryOnNext(T t) {
                         ParallelFailureHandling h;
 
                         try {
-                            h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                            h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
                         } catch (Throwable exc) {
                             Exceptions.throwIfFatal(exc);
                             cancel();
@@ -225,7 +226,7 @@ public boolean tryOnNext(T t) {
                         ParallelFailureHandling h;
 
                         try {
-                            h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                            h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
                         } catch (Throwable exc) {
                             Exceptions.throwIfFatal(exc);
                             cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
index b262bfa240..c941887853 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
@@ -18,12 +18,13 @@
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Maps each 'rail' of the source ParallelFlowable with a mapper function.
  *
@@ -110,7 +111,7 @@ public void onNext(T t) {
             R v;
 
             try {
-                v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value");
+                v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 cancel();
@@ -183,7 +184,7 @@ public void onNext(T t) {
             R v;
 
             try {
-                v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value");
+                v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 cancel();
@@ -202,7 +203,7 @@ public boolean tryOnNext(T t) {
             R v;
 
             try {
-                v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value");
+                v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
index 8096116ea5..ff8da40c62 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
@@ -17,12 +17,13 @@
 
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.parallel.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Maps each 'rail' of the source ParallelFlowable with a mapper function
  * and handle any failure based on a handler function.
@@ -129,14 +130,14 @@ public boolean tryOnNext(T t) {
                 R v;
 
                 try {
-                    v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value");
+                    v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
 
                     ParallelFailureHandling h;
 
                     try {
-                        h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
                     } catch (Throwable exc) {
                         Exceptions.throwIfFatal(exc);
                         cancel();
@@ -242,14 +243,14 @@ public boolean tryOnNext(T t) {
                 R v;
 
                 try {
-                    v = ObjectHelper.requireNonNull(mapper.apply(t), "The mapper returned a null value");
+                    v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
 
                     ParallelFailureHandling h;
 
                     try {
-                        h = ObjectHelper.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
                     } catch (Throwable exc) {
                         Exceptions.throwIfFatal(exc);
                         cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
index 4c15e207d4..50f04d46ec 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
@@ -18,11 +18,12 @@
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Execute a Consumer in each 'rail' for the current element passing through.
  *
@@ -53,14 +54,14 @@ public ParallelPeek(ParallelFlowable<T> source,
     ) {
         this.source = source;
 
-        this.onNext = ObjectHelper.requireNonNull(onNext, "onNext is null");
-        this.onAfterNext = ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null");
-        this.onError = ObjectHelper.requireNonNull(onError, "onError is null");
-        this.onComplete = ObjectHelper.requireNonNull(onComplete, "onComplete is null");
-        this.onAfterTerminated = ObjectHelper.requireNonNull(onAfterTerminated, "onAfterTerminated is null");
-        this.onSubscribe = ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
-        this.onRequest = ObjectHelper.requireNonNull(onRequest, "onRequest is null");
-        this.onCancel = ObjectHelper.requireNonNull(onCancel, "onCancel is null");
+        this.onNext = Objects.requireNonNull(onNext, "onNext is null");
+        this.onAfterNext = Objects.requireNonNull(onAfterNext, "onAfterNext is null");
+        this.onError = Objects.requireNonNull(onError, "onError is null");
+        this.onComplete = Objects.requireNonNull(onComplete, "onComplete is null");
+        this.onAfterTerminated = Objects.requireNonNull(onAfterTerminated, "onAfterTerminated is null");
+        this.onSubscribe = Objects.requireNonNull(onSubscribe, "onSubscribe is null");
+        this.onRequest = Objects.requireNonNull(onRequest, "onRequest is null");
+        this.onCancel = Objects.requireNonNull(onCancel, "onCancel is null");
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
index f813149407..87c02c8922 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
@@ -17,12 +17,13 @@
 
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscribers.DeferredScalarSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Reduce the sequence of values in each 'rail' to a single value.
  *
@@ -58,7 +59,7 @@ public void subscribe(Subscriber<? super R>[] subscribers) {
             R initialValue;
 
             try {
-                initialValue = ObjectHelper.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
+                initialValue = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 reportError(subscribers, ex);
@@ -115,7 +116,7 @@ public void onNext(T t) {
                 R v;
 
                 try {
-                    v = ObjectHelper.requireNonNull(reducer.apply(accumulator, t), "The reducer returned a null value");
+                    v = Objects.requireNonNull(reducer.apply(accumulator, t), "The reducer returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java
index 3a8cfa2290..e376c352cb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.parallel;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -132,7 +132,7 @@ void innerComplete(T value) {
                     if (sp != null) {
 
                         try {
-                            value = ObjectHelper.requireNonNull(reducer.apply(sp.first, sp.second), "The reducer returned a null value");
+                            value = Objects.requireNonNull(reducer.apply(sp.first, sp.second), "The reducer returned a null value");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             innerError(ex);
@@ -192,7 +192,7 @@ public void onNext(T t) {
                 } else {
 
                     try {
-                        v = ObjectHelper.requireNonNull(reducer.apply(v, t), "The reducer returned a null value");
+                        v = Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value");
                     } catch (Throwable ex) {
                         Exceptions.throwIfFatal(ex);
                         get().cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java
index fff2ca8d58..24a35fbdee 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java
@@ -17,7 +17,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 public final class SingleDefer<T> extends Single<T> {
 
@@ -32,7 +33,7 @@ protected void subscribeActual(SingleObserver<? super T> observer) {
         SingleSource<? extends T> next;
 
         try {
-            next = ObjectHelper.requireNonNull(singleSupplier.get(), "The singleSupplier returned a null SingleSource");
+            next = Objects.requireNonNull(singleSupplier.get(), "The singleSupplier returned a null SingleSource");
         } catch (Throwable e) {
             Exceptions.throwIfFatal(e);
             EmptyDisposable.error(e, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java
index 15f57b631b..4582e4d4da 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java
@@ -18,7 +18,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 /**
  * Maps the success value of the source to a Notification, then
@@ -81,7 +82,7 @@ public void onSuccess(T t) {
             Notification<R> notification;
 
             try {
-                notification = ObjectHelper.requireNonNull(selector.apply(t), "The selector returned a null Notification");
+                notification = Objects.requireNonNull(selector.apply(t), "The selector returned a null Notification");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java
index 3128c93e5a..d622f83fae 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 public final class SingleFlatMap<T, R> extends Single<R> {
     final SingleSource<? extends T> source;
@@ -74,7 +74,7 @@ public void onSuccess(T value) {
             SingleSource<? extends R> o;
 
             try {
-                o = ObjectHelper.requireNonNull(mapper.apply(value), "The single returned by the mapper is null");
+                o = Objects.requireNonNull(mapper.apply(value), "The single returned by the mapper is null");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(e);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java
index 03edadb83b..d4a9f54737 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Maps the success value of the source SingleSource into a Completable.
@@ -80,7 +80,7 @@ public void onSuccess(T value) {
             CompletableSource cs;
 
             try {
-                cs = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
+                cs = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null CompletableSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
index cc7f2740b9..0d9e4aee0f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.single;
 
 import java.util.Iterator;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.reactivestreams.Subscriber;
@@ -24,7 +25,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 
@@ -166,7 +166,7 @@ void drain() {
                         R v;
 
                         try {
-                            v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value");
+                            v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
                         } catch (Throwable ex) {
                             Exceptions.throwIfFatal(ex);
                             a.onError(ex);
@@ -277,7 +277,7 @@ public R poll() throws Exception {
             Iterator<? extends R> iterator = it;
 
             if (iterator != null) {
-                R v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value");
+                R v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
                 if (!iterator.hasNext()) {
                     it = null;
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java
index d742a06e1c..795f60a3ca 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.single;
 
 import java.util.Iterator;
+import java.util.Objects;
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable;
 
 /**
@@ -187,7 +187,7 @@ public R poll() throws Exception {
             Iterator<? extends R> iterator = it;
 
             if (iterator != null) {
-                R v = ObjectHelper.requireNonNull(iterator.next(), "The iterator returned a null value");
+                R v = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
                 if (!iterator.hasNext()) {
                     it = null;
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java
index 20e60ab476..d810f8f5c3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 public final class SingleFlatMapMaybe<T, R> extends Maybe<R> {
 
@@ -75,7 +75,7 @@ public void onSuccess(T value) {
             MaybeSource<? extends R> ms;
 
             try {
-                ms = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource");
+                ms = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
index 0fb91438c8..4a636ba337 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -21,7 +22,6 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 
 /**
@@ -86,7 +86,7 @@ public void onSubscribe(Disposable d) {
         public void onSuccess(S value) {
             Publisher<? extends T> f;
             try {
-                f = ObjectHelper.requireNonNull(mapper.apply(value), "the mapper returned a null Publisher");
+                f = Objects.requireNonNull(mapper.apply(value), "the mapper returned a null Publisher");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 downstream.onError(e);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java
index 562032f01e..5300d968b0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java
@@ -13,12 +13,12 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.Callable;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class SingleFromCallable<T> extends Single<T> {
@@ -40,7 +40,7 @@ protected void subscribeActual(SingleObserver<? super T> observer) {
         T value;
 
         try {
-            value = ObjectHelper.requireNonNull(callable.call(), "The callable returned a null value");
+            value = Objects.requireNonNull(callable.call(), "The callable returned a null value");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             if (!d.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java
index 04d6ca72cf..88dcd7dc94 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java
@@ -17,9 +17,10 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
+import java.util.Objects;
+
 /**
  * Calls a supplier and emits its value or exception to the incoming SingleObserver.
  * @param <T> the value type returned
@@ -44,7 +45,7 @@ protected void subscribeActual(SingleObserver<? super T> observer) {
         T value;
 
         try {
-            value = ObjectHelper.requireNonNull(supplier.get(), "The supplier returned a null value");
+            value = Objects.requireNonNull(supplier.get(), "The supplier returned a null value");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             if (!d.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java
index af5f969157..8382b2f1b8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java
@@ -16,7 +16,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 public final class SingleLift<T, R> extends Single<R> {
 
@@ -34,7 +35,7 @@ protected void subscribeActual(SingleObserver<? super R> observer) {
         SingleObserver<? super T> sr;
 
         try {
-            sr = ObjectHelper.requireNonNull(onLift.apply(observer), "The onLift returned a null SingleObserver");
+            sr = Objects.requireNonNull(onLift.apply(observer), "The onLift returned a null SingleObserver");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
             EmptyDisposable.error(ex, observer);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java
index d6ee948d5a..534b41495c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java
@@ -17,7 +17,8 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+
+import java.util.Objects;
 
 public final class SingleMap<T, R> extends Single<R> {
     final SingleSource<? extends T> source;
@@ -54,7 +55,7 @@ public void onSubscribe(Disposable d) {
         public void onSuccess(T value) {
             R v;
             try {
-                v = ObjectHelper.requireNonNull(mapper.apply(value), "The mapper function returned a null value.");
+                v = Objects.requireNonNull(mapper.apply(value), "The mapper function returned a null value.");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
                 onError(e);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java
index 71ccfdc035..6f768591e8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.observers.ResumeSingleObserver;
 
 public final class SingleResumeNext<T> extends Single<T> {
@@ -70,7 +70,7 @@ public void onError(Throwable e) {
             SingleSource<? extends T> source;
 
             try {
-                source = ObjectHelper.requireNonNull(nextFunction.apply(e), "The nextFunction returned a null SingleSource.");
+                source = Objects.requireNonNull(nextFunction.apply(e), "The nextFunction returned a null SingleSource.");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(new CompositeException(e, ex));
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java
index a0cb1d84d9..57f9daf263 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class SingleUsing<T, U> extends Single<T> {
@@ -56,7 +56,7 @@ protected void subscribeActual(final SingleObserver<? super T> observer) {
         SingleSource<? extends T> source;
 
         try {
-            source = ObjectHelper.requireNonNull(singleFunction.apply(resource), "The singleFunction returned a null SingleSource");
+            source = Objects.requireNonNull(singleFunction.apply(resource), "The singleFunction returned a null SingleSource");
         } catch (Throwable ex) {
             Exceptions.throwIfFatal(ex);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
index 9633e94bc7..b207476c95 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class SingleZipArray<T, R> extends Single<R> {
@@ -109,7 +109,7 @@ void innerSuccess(T value, int index) {
                 R v;
 
                 try {
-                    v = ObjectHelper.requireNonNull(zipper.apply(values), "The zipper returned a null value");
+                    v = Objects.requireNonNull(zipper.apply(values), "The zipper returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     downstream.onError(ex);
@@ -179,7 +179,7 @@ public void onError(Throwable e) {
     final class SingletonArrayFunc implements Function<T, R> {
         @Override
         public R apply(T t) throws Throwable {
-            return ObjectHelper.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value");
+            return Objects.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value");
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java
index 215f19a58e..b41538aeb4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java
@@ -19,7 +19,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.operators.single.SingleZipArray.ZipCoordinator;
 
 public final class SingleZipIterable<T, R> extends Single<R> {
@@ -82,7 +81,7 @@ protected void subscribeActual(SingleObserver<? super R> observer) {
     final class SingletonArrayFunc implements Function<T, R> {
         @Override
         public R apply(T t) throws Throwable {
-            return ObjectHelper.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value");
+            return Objects.requireNonNull(zipper.apply(new Object[] { t }), "The zipper returned a null value");
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java
index c3fb7955fa..6a50ab07dc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java
@@ -25,11 +25,11 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.Subscription;
 
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 
 /**
@@ -78,7 +78,7 @@ public final void setSubscription(Subscription s) {
             return;
         }
 
-        ObjectHelper.requireNonNull(s, "s is null");
+        Objects.requireNonNull(s, "s is null");
 
         if (get() == 0 && compareAndSet(0, 1)) {
             Subscription a = actual;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java
index 7080b3472c..8cfc3f5a7c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java
@@ -13,12 +13,12 @@
 
 package io.reactivex.rxjava3.internal.subscriptions;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.exceptions.ProtocolViolationException;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -129,7 +129,7 @@ public static boolean set(AtomicReference<Subscription> field, Subscription s) {
      * @return true if the operation succeeded, false if the target field was not null.
      */
     public static boolean setOnce(AtomicReference<Subscription> field, Subscription s) {
-        ObjectHelper.requireNonNull(s, "s is null");
+        Objects.requireNonNull(s, "s is null");
         if (!field.compareAndSet(null, s)) {
             s.cancel();
             if (field.get() != CANCELLED) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java
index 1e051a636c..01b95a0a11 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.util;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import org.reactivestreams.Subscription;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.ProtocolViolationException;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -50,7 +50,7 @@ private EndConsumerHelper() {
      * @return true if successful, false if the upstream was non null
      */
     public static boolean validate(Disposable upstream, Disposable next, Class<?> observer) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         if (upstream != null) {
             next.dispose();
             if (upstream != DisposableHelper.DISPOSED) {
@@ -72,7 +72,7 @@ public static boolean validate(Disposable upstream, Disposable next, Class<?> ob
      * @return true if successful, false if the content of the AtomicReference was non null
      */
     public static boolean setOnce(AtomicReference<Disposable> upstream, Disposable next, Class<?> observer) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         if (!upstream.compareAndSet(null, next)) {
             next.dispose();
             if (upstream.get() != DisposableHelper.DISPOSED) {
@@ -95,7 +95,7 @@ public static boolean setOnce(AtomicReference<Disposable> upstream, Disposable n
      * @return true if successful, false if the upstream was non null
      */
     public static boolean validate(Subscription upstream, Subscription next, Class<?> subscriber) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         if (upstream != null) {
             next.cancel();
             if (upstream != SubscriptionHelper.CANCELLED) {
@@ -117,7 +117,7 @@ public static boolean validate(Subscription upstream, Subscription next, Class<?
      * @return true if successful, false if the content of the AtomicReference was non null
      */
     public static boolean setOnce(AtomicReference<Subscription> upstream, Subscription next, Class<?> subscriber) {
-        ObjectHelper.requireNonNull(next, "next is null");
+        Objects.requireNonNull(next, "next is null");
         if (!upstream.compareAndSet(null, next)) {
             next.cancel();
             if (upstream.get() != SubscriptionHelper.CANCELLED) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java
index 606368d041..c4aaadb343 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java
@@ -165,7 +165,7 @@ public static NullPointerException createNullPointerException(String prefix) {
     }
 
     /**
-     * Similar to ObjectHelper.requireNonNull but composes the error message via
+     * Similar to Objects.requireNonNull but composes the error message via
      * {@link #nullWarning(String)}.
      * @param <T> the value type
      * @param value the value to check
diff --git a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
index 135f183ceb..1a9b942011 100644
--- a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.observables;
 
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.annotations.*;
@@ -209,8 +210,8 @@ public final Observable<T> refCount(int subscriberCount, long timeout, TimeUnit
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> refCount(int subscriberCount, long timeout, TimeUnit unit, Scheduler scheduler) {
         ObjectHelper.verifyPositive(subscriberCount, "subscriberCount");
-        ObjectHelper.requireNonNull(unit, "unit is null");
-        ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableRefCount<T>(this, subscriberCount, timeout, unit, scheduler));
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
index 3a7ab322a6..b57d77f6f5 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
@@ -13,13 +13,13 @@
 
 package io.reactivex.rxjava3.observers;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.CompletableObserver;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
@@ -87,7 +87,7 @@ public abstract class ResourceCompletableObserver implements CompletableObserver
      * @throws NullPointerException if resource is null
      */
     public final void add(@NonNull Disposable resource) {
-        ObjectHelper.requireNonNull(resource, "resource is null");
+        Objects.requireNonNull(resource, "resource is null");
         resources.add(resource);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
index f824d3c97a..cb42a70fbd 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
@@ -13,13 +13,13 @@
 
 package io.reactivex.rxjava3.observers;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.MaybeObserver;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
@@ -97,7 +97,7 @@ public abstract class ResourceMaybeObserver<T> implements MaybeObserver<T>, Disp
      * @throws NullPointerException if resource is null
      */
     public final void add(@NonNull Disposable resource) {
-        ObjectHelper.requireNonNull(resource, "resource is null");
+        Objects.requireNonNull(resource, "resource is null");
         resources.add(resource);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
index 04f2959595..b6d77a0d5f 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
@@ -13,13 +13,13 @@
 
 package io.reactivex.rxjava3.observers;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
@@ -95,7 +95,7 @@ public abstract class ResourceObserver<T> implements Observer<T>, Disposable {
      * @throws NullPointerException if resource is null
      */
     public final void add(@NonNull Disposable resource) {
-        ObjectHelper.requireNonNull(resource, "resource is null");
+        Objects.requireNonNull(resource, "resource is null");
         resources.add(resource);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
index fe8075f75a..af723bf789 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
@@ -13,13 +13,13 @@
 
 package io.reactivex.rxjava3.observers;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.SingleObserver;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
@@ -90,7 +90,7 @@ public abstract class ResourceSingleObserver<T> implements SingleObserver<T>, Di
      * @throws NullPointerException if resource is null
      */
     public final void add(@NonNull Disposable resource) {
-        ObjectHelper.requireNonNull(resource, "resource is null");
+        Objects.requireNonNull(resource, "resource is null");
         resources.add(resource);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index 38d3505337..afa2eddcf0 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -113,7 +113,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     @NonNull
     public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source,
             int parallelism, int prefetch) {
-        ObjectHelper.requireNonNull(source, "source");
+        Objects.requireNonNull(source, "source");
         ObjectHelper.verifyPositive(parallelism, "parallelism");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
 
@@ -131,7 +131,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     @CheckReturnValue
     @NonNull
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
-        ObjectHelper.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(mapper, "mapper");
         return RxJavaPlugins.onAssembly(new ParallelMap<T, R>(this, mapper));
     }
 
@@ -151,8 +151,8 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @NonNull
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull ParallelFailureHandling errorHandler) {
-        ObjectHelper.requireNonNull(mapper, "mapper");
-        ObjectHelper.requireNonNull(errorHandler, "errorHandler is null");
+        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTry<T, R>(this, mapper, errorHandler));
     }
 
@@ -173,8 +173,8 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @NonNull
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
-        ObjectHelper.requireNonNull(mapper, "mapper");
-        ObjectHelper.requireNonNull(errorHandler, "errorHandler is null");
+        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTry<T, R>(this, mapper, errorHandler));
     }
 
@@ -187,7 +187,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      */
     @CheckReturnValue
     public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate) {
-        ObjectHelper.requireNonNull(predicate, "predicate");
+        Objects.requireNonNull(predicate, "predicate");
         return RxJavaPlugins.onAssembly(new ParallelFilter<T>(this, predicate));
     }
 
@@ -205,8 +205,8 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate)
      */
     @CheckReturnValue
     public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate, @NonNull ParallelFailureHandling errorHandler) {
-        ObjectHelper.requireNonNull(predicate, "predicate");
-        ObjectHelper.requireNonNull(errorHandler, "errorHandler is null");
+        Objects.requireNonNull(predicate, "predicate");
+        Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelFilterTry<T>(this, predicate, errorHandler));
     }
 
@@ -225,8 +225,8 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate,
      */
     @CheckReturnValue
     public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
-        ObjectHelper.requireNonNull(predicate, "predicate");
-        ObjectHelper.requireNonNull(errorHandler, "errorHandler is null");
+        Objects.requireNonNull(predicate, "predicate");
+        Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelFilterTry<T>(this, predicate, errorHandler));
     }
 
@@ -279,7 +279,7 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler) {
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler, int prefetch) {
-        ObjectHelper.requireNonNull(scheduler, "scheduler");
+        Objects.requireNonNull(scheduler, "scheduler");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ParallelRunOn<T>(this, scheduler, prefetch));
     }
@@ -295,7 +295,7 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler, int prefetc
     @CheckReturnValue
     @NonNull
     public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
-        ObjectHelper.requireNonNull(reducer, "reducer");
+        Objects.requireNonNull(reducer, "reducer");
         return RxJavaPlugins.onAssembly(new ParallelReduceFull<T>(this, reducer));
     }
 
@@ -313,8 +313,8 @@ public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     @CheckReturnValue
     @NonNull
     public final <R> ParallelFlowable<R> reduce(@NonNull Supplier<R> initialSupplier, @NonNull BiFunction<R, ? super T, R> reducer) {
-        ObjectHelper.requireNonNull(initialSupplier, "initialSupplier");
-        ObjectHelper.requireNonNull(reducer, "reducer");
+        Objects.requireNonNull(initialSupplier, "initialSupplier");
+        Objects.requireNonNull(reducer, "reducer");
         return RxJavaPlugins.onAssembly(new ParallelReduce<T, R>(this, initialSupplier, reducer));
     }
 
@@ -449,7 +449,7 @@ public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator) {
     @CheckReturnValue
     @NonNull
     public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator, int capacityHint) {
-        ObjectHelper.requireNonNull(comparator, "comparator is null");
+        Objects.requireNonNull(comparator, "comparator is null");
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         int ch = capacityHint / parallelism() + 1;
         ParallelFlowable<List<T>> railReduced = reduce(Functions.<T>createArrayList(ch), ListAddBiConsumer.<T>instance());
@@ -483,7 +483,7 @@ public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> compa
     @CheckReturnValue
     @NonNull
     public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> comparator, int capacityHint) {
-        ObjectHelper.requireNonNull(comparator, "comparator is null");
+        Objects.requireNonNull(comparator, "comparator is null");
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
 
         int ch = capacityHint / parallelism() + 1;
@@ -504,7 +504,7 @@ public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> compa
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onNext, "onNext is null");
         return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
                 onNext,
                 Functions.emptyConsumer(),
@@ -530,8 +530,8 @@ public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext, @NonNull ParallelFailureHandling errorHandler) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(errorHandler, "errorHandler is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelDoOnNextTry<T>(this, onNext, errorHandler));
     }
 
@@ -549,8 +549,8 @@ public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext, @
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
-        ObjectHelper.requireNonNull(onNext, "onNext is null");
-        ObjectHelper.requireNonNull(errorHandler, "errorHandler is null");
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelDoOnNextTry<T>(this, onNext, errorHandler));
     }
 
@@ -564,7 +564,7 @@ public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext, @
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext) {
-        ObjectHelper.requireNonNull(onAfterNext, "onAfterNext is null");
+        Objects.requireNonNull(onAfterNext, "onAfterNext is null");
         return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
                 Functions.emptyConsumer(),
                 onAfterNext,
@@ -586,7 +586,7 @@ public final ParallelFlowable<T> doAfterNext(@NonNull Consumer<? super T> onAfte
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doOnError(@NonNull Consumer<Throwable> onError) {
-        ObjectHelper.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onError, "onError is null");
         return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -608,7 +608,7 @@ public final ParallelFlowable<T> doOnError(@NonNull Consumer<Throwable> onError)
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doOnComplete(@NonNull Action onComplete) {
-        ObjectHelper.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
         return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -630,7 +630,7 @@ public final ParallelFlowable<T> doOnComplete(@NonNull Action onComplete) {
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doAfterTerminated(@NonNull Action onAfterTerminate) {
-        ObjectHelper.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
+        Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
         return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -652,7 +652,7 @@ public final ParallelFlowable<T> doAfterTerminated(@NonNull Action onAfterTermin
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> onSubscribe) {
-        ObjectHelper.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -674,7 +674,7 @@ public final ParallelFlowable<T> doOnSubscribe(@NonNull Consumer<? super Subscri
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
-        ObjectHelper.requireNonNull(onRequest, "onRequest is null");
+        Objects.requireNonNull(onRequest, "onRequest is null");
         return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -696,7 +696,7 @@ public final ParallelFlowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doOnCancel(@NonNull Action onCancel) {
-        ObjectHelper.requireNonNull(onCancel, "onCancel is null");
+        Objects.requireNonNull(onCancel, "onCancel is null");
         return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -721,8 +721,8 @@ public final ParallelFlowable<T> doOnCancel(@NonNull Action onCancel) {
     @CheckReturnValue
     @NonNull
     public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> collectionSupplier, @NonNull BiConsumer<? super C, ? super T> collector) {
-        ObjectHelper.requireNonNull(collectionSupplier, "collectionSupplier is null");
-        ObjectHelper.requireNonNull(collector, "collector is null");
+        Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
+        Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ParallelCollect<T, C>(this, collectionSupplier, collector));
     }
 
@@ -757,7 +757,7 @@ public static <T> ParallelFlowable<T> fromArray(@NonNull Publisher<T>... publish
     @CheckReturnValue
     @NonNull
     public final <R> R to(@NonNull ParallelFlowableConverter<T, R> converter) {
-        return ObjectHelper.requireNonNull(converter, "converter is null").apply(this);
+        return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
 
     /**
@@ -771,7 +771,7 @@ public final <R> R to(@NonNull ParallelFlowableConverter<T, R> converter) {
     @CheckReturnValue
     @NonNull
     public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U> composer) {
-        return RxJavaPlugins.onAssembly(ObjectHelper.requireNonNull(composer, "composer is null").apply(this));
+        return RxJavaPlugins.onAssembly(Objects.requireNonNull(composer, "composer is null").apply(this));
     }
 
     /**
@@ -842,7 +842,7 @@ public final <R> ParallelFlowable<R> flatMap(
     public final <R> ParallelFlowable<R> flatMap(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean delayError, int maxConcurrency, int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ParallelFlatMap<T, R>(this, mapper, delayError, maxConcurrency, prefetch));
@@ -879,7 +879,7 @@ public final <R> ParallelFlowable<R> concatMap(
     public final <R> ParallelFlowable<R> concatMap(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
                     int prefetch) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ParallelConcatMap<T, R>(this, mapper, prefetch, ErrorMode.IMMEDIATE));
     }
@@ -919,7 +919,7 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
     public final <R> ParallelFlowable<R> concatMapDelayError(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
                     int prefetch, boolean tillTheEnd) {
-        ObjectHelper.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ParallelConcatMap<T, R>(
                 this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
diff --git a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
index 976289c542..9012e36f12 100644
--- a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
@@ -13,6 +13,7 @@
 package io.reactivex.rxjava3.plugins;
 
 import java.lang.Thread.UncaughtExceptionHandler;
+import java.util.Objects;
 import java.util.concurrent.ThreadFactory;
 
 import org.reactivestreams.Subscriber;
@@ -22,7 +23,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.flowables.ConnectableFlowable;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.schedulers.*;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.observables.ConnectableObservable;
@@ -266,7 +266,7 @@ public static Consumer<? super Throwable> getErrorHandler() {
      */
     @NonNull
     public static Scheduler initComputationScheduler(@NonNull Supplier<Scheduler> defaultScheduler) {
-        ObjectHelper.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null");
+        Objects.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null");
         Function<? super Supplier<Scheduler>, ? extends Scheduler> f = onInitComputationHandler;
         if (f == null) {
             return callRequireNonNull(defaultScheduler);
@@ -282,7 +282,7 @@ public static Scheduler initComputationScheduler(@NonNull Supplier<Scheduler> de
      */
     @NonNull
     public static Scheduler initIoScheduler(@NonNull Supplier<Scheduler> defaultScheduler) {
-        ObjectHelper.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null");
+        Objects.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null");
         Function<? super Supplier<Scheduler>, ? extends Scheduler> f = onInitIoHandler;
         if (f == null) {
             return callRequireNonNull(defaultScheduler);
@@ -298,7 +298,7 @@ public static Scheduler initIoScheduler(@NonNull Supplier<Scheduler> defaultSche
      */
     @NonNull
     public static Scheduler initNewThreadScheduler(@NonNull Supplier<Scheduler> defaultScheduler) {
-        ObjectHelper.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null");
+        Objects.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null");
         Function<? super Supplier<Scheduler>, ? extends Scheduler> f = onInitNewThreadHandler;
         if (f == null) {
             return callRequireNonNull(defaultScheduler);
@@ -314,7 +314,7 @@ public static Scheduler initNewThreadScheduler(@NonNull Supplier<Scheduler> defa
      */
     @NonNull
     public static Scheduler initSingleScheduler(@NonNull Supplier<Scheduler> defaultScheduler) {
-        ObjectHelper.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null");
+        Objects.requireNonNull(defaultScheduler, "Scheduler Supplier can't be null");
         Function<? super Supplier<Scheduler>, ? extends Scheduler> f = onInitSingleHandler;
         if (f == null) {
             return callRequireNonNull(defaultScheduler);
@@ -464,7 +464,7 @@ public static Scheduler onNewThreadScheduler(@NonNull Scheduler defaultScheduler
      */
     @NonNull
     public static Runnable onSchedule(@NonNull Runnable run) {
-        ObjectHelper.requireNonNull(run, "run is null");
+        Objects.requireNonNull(run, "run is null");
 
         Function<? super Runnable, ? extends Runnable> f = onScheduleHandler;
         if (f == null) {
@@ -1208,7 +1208,7 @@ public static BooleanSupplier getOnBeforeBlocking() {
      */
     @NonNull
     public static Scheduler createComputationScheduler(@NonNull ThreadFactory threadFactory) {
-        return new ComputationScheduler(ObjectHelper.requireNonNull(threadFactory, "threadFactory is null"));
+        return new ComputationScheduler(Objects.requireNonNull(threadFactory, "threadFactory is null"));
     }
 
     /**
@@ -1222,7 +1222,7 @@ public static Scheduler createComputationScheduler(@NonNull ThreadFactory thread
      */
     @NonNull
     public static Scheduler createIoScheduler(@NonNull ThreadFactory threadFactory) {
-        return new IoScheduler(ObjectHelper.requireNonNull(threadFactory, "threadFactory is null"));
+        return new IoScheduler(Objects.requireNonNull(threadFactory, "threadFactory is null"));
     }
 
     /**
@@ -1236,7 +1236,7 @@ public static Scheduler createIoScheduler(@NonNull ThreadFactory threadFactory)
      */
     @NonNull
     public static Scheduler createNewThreadScheduler(@NonNull ThreadFactory threadFactory) {
-        return new NewThreadScheduler(ObjectHelper.requireNonNull(threadFactory, "threadFactory is null"));
+        return new NewThreadScheduler(Objects.requireNonNull(threadFactory, "threadFactory is null"));
     }
 
     /**
@@ -1250,7 +1250,7 @@ public static Scheduler createNewThreadScheduler(@NonNull ThreadFactory threadFa
      */
     @NonNull
     public static Scheduler createSingleScheduler(@NonNull ThreadFactory threadFactory) {
-        return new SingleScheduler(ObjectHelper.requireNonNull(threadFactory, "threadFactory is null"));
+        return new SingleScheduler(Objects.requireNonNull(threadFactory, "threadFactory is null"));
     }
 
     /**
@@ -1301,7 +1301,7 @@ static <T, U, R> R apply(@NonNull BiFunction<T, U, R> f, @NonNull T t, @NonNull
     @NonNull
     static Scheduler callRequireNonNull(@NonNull Supplier<Scheduler> s) {
         try {
-            return ObjectHelper.requireNonNull(s.get(), "Scheduler Supplier result can't be null");
+            return Objects.requireNonNull(s.get(), "Scheduler Supplier result can't be null");
         } catch (Throwable ex) {
             throw ExceptionHelper.wrapOrThrow(ex);
         }
@@ -1317,7 +1317,7 @@ static Scheduler callRequireNonNull(@NonNull Supplier<Scheduler> s) {
      */
     @NonNull
     static Scheduler applyRequireNonNull(@NonNull Function<? super Supplier<Scheduler>, ? extends Scheduler> f, Supplier<Scheduler> s) {
-        return ObjectHelper.requireNonNull(apply(f, s), "Scheduler Supplier result can't be null");
+        return Objects.requireNonNull(apply(f, s), "Scheduler Supplier result can't be null");
     }
 
     /** Helper class, no instances. */
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index 5ac1d1d607..eaf47ecae3 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.processors;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 import java.util.concurrent.locks.*;
 
@@ -20,7 +21,6 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
@@ -208,7 +208,7 @@ public static <T> BehaviorProcessor<T> create() {
     @CheckReturnValue
     @NonNull
     public static <T> BehaviorProcessor<T> createDefault(T defaultValue) {
-        ObjectHelper.requireNonNull(defaultValue, "defaultValue is null");
+        Objects.requireNonNull(defaultValue, "defaultValue is null");
         return new BehaviorProcessor<T>(defaultValue);
     }
 
@@ -234,7 +234,7 @@ public static <T> BehaviorProcessor<T> createDefault(T defaultValue) {
      */
     BehaviorProcessor(T defaultValue) {
         this();
-        this.value.lazySet(ObjectHelper.requireNonNull(defaultValue, "defaultValue is null"));
+        this.value.lazySet(Objects.requireNonNull(defaultValue, "defaultValue is null"));
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index 1ab964a6dd..fcd2cb913f 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -1052,8 +1052,8 @@ static final class SizeAndTimeBoundReplayBuffer<T>
         SizeAndTimeBoundReplayBuffer(int maxSize, long maxAge, TimeUnit unit, Scheduler scheduler) {
             this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize");
             this.maxAge = ObjectHelper.verifyPositive(maxAge, "maxAge");
-            this.unit = ObjectHelper.requireNonNull(unit, "unit is null");
-            this.scheduler = ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+            this.unit = Objects.requireNonNull(unit, "unit is null");
+            this.scheduler = Objects.requireNonNull(scheduler, "scheduler is null");
             TimedNode<T> h = new TimedNode<T>(null, 0L);
             this.tail = h;
             this.head = h;
diff --git a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
index a3715103d5..4a1862a95f 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.processors;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -222,7 +223,7 @@ public static <T> UnicastProcessor<T> create(boolean delayError) {
     @CheckReturnValue
     @NonNull
     public static <T> UnicastProcessor<T> create(int capacityHint, Runnable onCancelled) {
-        ObjectHelper.requireNonNull(onCancelled, "onTerminate");
+        Objects.requireNonNull(onCancelled, "onTerminate");
         return new UnicastProcessor<T>(capacityHint, onCancelled);
     }
 
@@ -243,7 +244,7 @@ public static <T> UnicastProcessor<T> create(int capacityHint, Runnable onCancel
     @CheckReturnValue
     @NonNull
     public static <T> UnicastProcessor<T> create(int capacityHint, Runnable onCancelled, boolean delayError) {
-        ObjectHelper.requireNonNull(onCancelled, "onTerminate");
+        Objects.requireNonNull(onCancelled, "onTerminate");
         return new UnicastProcessor<T>(capacityHint, onCancelled, delayError);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
index fff21ad682..845273ff22 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
@@ -17,7 +17,6 @@
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 
 /**
  * Holds onto a value along with time information.
@@ -39,7 +38,7 @@ public final class Timed<T> {
     public Timed(@NonNull T value, long time, @NonNull TimeUnit unit) {
         this.value = value;
         this.time = time;
-        this.unit = ObjectHelper.requireNonNull(unit, "unit is null");
+        this.unit = Objects.requireNonNull(unit, "unit is null");
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
index 45ddb72a51..68efd5bf8f 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
@@ -13,13 +13,13 @@
 
 package io.reactivex.rxjava3.subjects;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.*;
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.internal.util.AppendOnlyLinkedArrayList.NonThrowingPredicate;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -218,7 +218,7 @@ public static <T> BehaviorSubject<T> createDefault(T defaultValue) {
      */
     BehaviorSubject(T defaultValue) {
         this();
-        this.value.lazySet(ObjectHelper.requireNonNull(defaultValue, "defaultValue is null"));
+        this.value.lazySet(Objects.requireNonNull(defaultValue, "defaultValue is null"));
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
index 2d9dbe779a..aad2092429 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
@@ -1053,8 +1053,8 @@ static final class SizeAndTimeBoundReplayBuffer<T>
         SizeAndTimeBoundReplayBuffer(int maxSize, long maxAge, TimeUnit unit, Scheduler scheduler) {
             this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize");
             this.maxAge = ObjectHelper.verifyPositive(maxAge, "maxAge");
-            this.unit = ObjectHelper.requireNonNull(unit, "unit is null");
-            this.scheduler = ObjectHelper.requireNonNull(scheduler, "scheduler is null");
+            this.unit = Objects.requireNonNull(unit, "unit is null");
+            this.scheduler = Objects.requireNonNull(scheduler, "scheduler is null");
             TimedNode<Object> h = new TimedNode<Object>(null, 0L);
             this.tail = h;
             this.head = h;
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
index be824a7708..c522343aed 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.subjects;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.annotations.*;
@@ -288,7 +289,7 @@ public static <T> UnicastSubject<T> create(boolean delayError) {
      */
     UnicastSubject(int capacityHint, Runnable onTerminate, boolean delayError) {
         this.queue = new SpscLinkedArrayQueue<T>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
-        this.onTerminate = new AtomicReference<Runnable>(ObjectHelper.requireNonNull(onTerminate, "onTerminate"));
+        this.onTerminate = new AtomicReference<Runnable>(Objects.requireNonNull(onTerminate, "onTerminate"));
         this.delayError = delayError;
         this.downstream = new AtomicReference<Observer<? super T>>();
         this.once = new AtomicBoolean();
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
index 71bdeb0121..1990939311 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.subscribers;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.Subscription;
@@ -20,7 +21,6 @@
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.ListCompositeDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
@@ -110,7 +110,7 @@ public abstract class ResourceSubscriber<T> implements FlowableSubscriber<T>, Di
      * @throws NullPointerException if resource is null
      */
     public final void add(Disposable resource) {
-        ObjectHelper.requireNonNull(resource, "resource is null");
+        Objects.requireNonNull(resource, "resource is null");
         resources.add(resource);
     }
 

From 0fba7c5530b092d13d29681298545ad98d22249a Mon Sep 17 00:00:00 2001
From: kerr <hepin1989@gmail.com>
Date: Wed, 18 Dec 2019 07:06:38 +0800
Subject: [PATCH 008/665] Add FunctionalInterface annotations. (#6773)

---
 .../java/io/reactivex/rxjava3/core/CompletableConverter.java     | 1 +
 .../java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java   | 1 +
 src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java | 1 +
 src/main/java/io/reactivex/rxjava3/core/CompletableSource.java   | 1 +
 .../java/io/reactivex/rxjava3/core/CompletableTransformer.java   | 1 +
 src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java   | 1 +
 src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java | 1 +
 src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java    | 1 +
 src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java | 1 +
 src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java      | 1 +
 src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java    | 1 +
 src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java       | 1 +
 src/main/java/io/reactivex/rxjava3/core/MaybeSource.java         | 1 +
 src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java    | 1 +
 src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java | 1 +
 .../java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java    | 1 +
 src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java  | 1 +
 src/main/java/io/reactivex/rxjava3/core/ObservableSource.java    | 1 +
 .../java/io/reactivex/rxjava3/core/ObservableTransformer.java    | 1 +
 src/main/java/io/reactivex/rxjava3/core/SingleConverter.java     | 1 +
 src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java   | 1 +
 src/main/java/io/reactivex/rxjava3/core/SingleOperator.java      | 1 +
 src/main/java/io/reactivex/rxjava3/core/SingleSource.java        | 1 +
 src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java   | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Action.java         | 1 +
 src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java     | 1 +
 src/main/java/io/reactivex/rxjava3/functions/BiFunction.java     | 1 +
 src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java    | 1 +
 .../java/io/reactivex/rxjava3/functions/BooleanSupplier.java     | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Cancellable.java    | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Consumer.java       | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Function.java       | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Function3.java      | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Function4.java      | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Function5.java      | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Function6.java      | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Function7.java      | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Function8.java      | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Function9.java      | 1 +
 src/main/java/io/reactivex/rxjava3/functions/IntFunction.java    | 1 +
 src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java   | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Predicate.java      | 1 +
 src/main/java/io/reactivex/rxjava3/functions/Supplier.java       | 1 +
 .../io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java   | 1 +
 .../io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java | 1 +
 .../java/io/reactivex/rxjava3/parallel/ParallelTransformer.java  | 1 +
 46 files changed, 46 insertions(+)

diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java b/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java
index 6ef04e2608..bcc00f088b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java
@@ -22,6 +22,7 @@
  * @param <R> the output type
  * @since 2.2
  */
+@FunctionalInterface
 public interface CompletableConverter<R> {
     /**
      * Applies a function to the upstream Completable and returns a converted value of type {@code R}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
index 8dc2531997..6aea056be7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
@@ -19,6 +19,7 @@
  * an instance of a {@link CompletableEmitter} instance that allows pushing
  * an event in a cancellation-safe manner.
  */
+@FunctionalInterface
 public interface CompletableOnSubscribe {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java b/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java
index 3a45c9085f..763cd670c6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java
@@ -18,6 +18,7 @@
 /**
  * Interface to map/wrap a downstream observer to an upstream observer.
  */
+@FunctionalInterface
 public interface CompletableOperator {
     /**
      * Applies a function to the child CompletableObserver and returns a new parent CompletableObserver.
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java b/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java
index 390be60b2e..9b754a698a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java
@@ -20,6 +20,7 @@
  *
  * @since 2.0
  */
+@FunctionalInterface
 public interface CompletableSource {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java
index b6acc252b0..91e1a361ba 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java
@@ -19,6 +19,7 @@
  * Convenience interface and callback used by the compose operator to turn a Completable into another
  * Completable fluently.
  */
+@FunctionalInterface
 public interface CompletableTransformer {
     /**
      * Applies a function to the upstream Completable and returns a CompletableSource.
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
index 0736dc189d..abc89eec4a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
@@ -23,6 +23,7 @@
  * @param <R> the output type
  * @since 2.2
  */
+@FunctionalInterface
 public interface FlowableConverter<T, R> {
     /**
      * Applies a function to the upstream Flowable and returns a converted value of type {@code R}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
index 93d125de2f..2bbc8b57a3 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
@@ -21,6 +21,7 @@
  *
  * @param <T> the value type pushed
  */
+@FunctionalInterface
 public interface FlowableOnSubscribe<T> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
index 8ce0ab8f7d..6d241f7498 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
@@ -23,6 +23,7 @@
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
  */
+@FunctionalInterface
 public interface FlowableOperator<Downstream, Upstream> {
     /**
      * Applies a function to the child Subscriber and returns a new parent Subscriber.
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
index ecee751040..877ad1916a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
@@ -23,6 +23,7 @@
  * @param <Upstream> the upstream value type
  * @param <Downstream> the downstream value type
  */
+@FunctionalInterface
 public interface FlowableTransformer<Upstream, Downstream> {
     /**
      * Applies a function to the upstream Flowable and returns a Publisher with
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
index de70b81814..a8e6790e5f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
@@ -23,6 +23,7 @@
  * @param <R> the output type
  * @since 2.2
  */
+@FunctionalInterface
 public interface MaybeConverter<T, R> {
     /**
      * Applies a function to the upstream Maybe and returns a converted value of type {@code R}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
index dbccf870f9..2dde118757 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
@@ -21,6 +21,7 @@
  *
  * @param <T> the value type pushed
  */
+@FunctionalInterface
 public interface MaybeOnSubscribe<T> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
index b3173eb833..48039a9bd0 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
@@ -20,6 +20,7 @@
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
  */
+@FunctionalInterface
 public interface MaybeOperator<Downstream, Upstream> {
     /**
      * Applies a function to the child MaybeObserver and returns a new parent MaybeObserver.
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
index dd037cc864..17e2b7f694 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
@@ -24,6 +24,7 @@
  * @param <T> the element type
  * @since 2.0
  */
+@FunctionalInterface
 public interface MaybeSource<T> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
index d53bfda71d..b5a94bce79 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
@@ -21,6 +21,7 @@
  * @param <Upstream> the upstream value type
  * @param <Downstream> the downstream value type
  */
+@FunctionalInterface
 public interface MaybeTransformer<Upstream, Downstream> {
     /**
      * Applies a function to the upstream Maybe and returns a MaybeSource with
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
index 744c0ef48e..40b432cfea 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
@@ -23,6 +23,7 @@
  * @param <R> the output type
  * @since 2.2
  */
+@FunctionalInterface
 public interface ObservableConverter<T, R> {
     /**
      * Applies a function to the upstream Observable and returns a converted value of type {@code R}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
index 1f98911285..43d6252849 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
@@ -21,6 +21,7 @@
  *
  * @param <T> the value type pushed
  */
+@FunctionalInterface
 public interface ObservableOnSubscribe<T> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
index f7335b6221..76ec06e295 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
@@ -21,6 +21,7 @@
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
  */
+@FunctionalInterface
 public interface ObservableOperator<Downstream, Upstream> {
     /**
      * Applies a function to the child Observer and returns a new parent Observer.
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
index a48011e438..ad5d5c79c3 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
@@ -21,6 +21,7 @@
  * @param <T> the element type
  * @since 2.0
  */
+@FunctionalInterface
 public interface ObservableSource<T> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
index 63dc87ca8b..259deefa85 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
@@ -21,6 +21,7 @@
  * @param <Upstream> the upstream value type
  * @param <Downstream> the downstream value type
  */
+@FunctionalInterface
 public interface ObservableTransformer<Upstream, Downstream> {
     /**
      * Applies a function to the upstream Observable and returns an ObservableSource with
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
index 5309dbc160..4adc22b8c5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
@@ -23,6 +23,7 @@
  * @param <R> the output type
  * @since 2.2
  */
+@FunctionalInterface
 public interface SingleConverter<T, R> {
     /**
      * Applies a function to the upstream Single and returns a converted value of type {@code R}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
index 157a8e42dc..46cc6a6f56 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
@@ -21,6 +21,7 @@
  *
  * @param <T> the value type pushed
  */
+@FunctionalInterface
 public interface SingleOnSubscribe<T> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
index 58ea9d338e..2fc2d80ab6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
@@ -21,6 +21,7 @@
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
  */
+@FunctionalInterface
 public interface SingleOperator<Downstream, Upstream> {
     /**
      * Applies a function to the child SingleObserver and returns a new parent SingleObserver.
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleSource.java b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
index 1a3780c3f6..496462d0e1 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
@@ -24,6 +24,7 @@
  * @param <T> the element type
  * @since 2.0
  */
+@FunctionalInterface
 public interface SingleSource<T> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
index 080a2d7af1..08f9408cdb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
@@ -21,6 +21,7 @@
  * @param <Upstream> the upstream value type
  * @param <Downstream> the downstream value type
  */
+@FunctionalInterface
 public interface SingleTransformer<Upstream, Downstream> {
     /**
      * Applies a function to the upstream Single and returns a SingleSource with
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Action.java b/src/main/java/io/reactivex/rxjava3/functions/Action.java
index 153eff9375..da0e76e0a6 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Action.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Action.java
@@ -16,6 +16,7 @@
 /**
  * A functional interface similar to Runnable but allows throwing a checked exception.
  */
+@FunctionalInterface
 public interface Action {
     /**
      * Runs the action and optionally throws a checked exception.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java b/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java
index c060c38331..7fa60ef4c7 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java
@@ -18,6 +18,7 @@
  * @param <T1> the first value type
  * @param <T2> the second value type
  */
+@FunctionalInterface
 public interface BiConsumer<T1, T2> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java b/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java
index f7e1174c6e..174cc3c6d9 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java
@@ -21,6 +21,7 @@
  * @param <T2> the second value type
  * @param <R> the result type
  */
+@FunctionalInterface
 public interface BiFunction<T1, T2, R> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java b/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java
index 4793e1d086..fc41682ef5 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java
@@ -20,6 +20,7 @@
  * @param <T1> the first value
  * @param <T2> the second value
  */
+@FunctionalInterface
 public interface BiPredicate<T1, T2> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java b/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java
index dc801e5180..b30087fbd7 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java
@@ -16,6 +16,7 @@
 /**
  * A functional interface (callback) that returns a boolean value.
  */
+@FunctionalInterface
 public interface BooleanSupplier {
     /**
      * Returns a boolean value.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java b/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java
index 47683eafdc..b9f3420c1b 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java
@@ -17,6 +17,7 @@
  * A functional interface that has a single cancel method
  * that can throw.
  */
+@FunctionalInterface
 public interface Cancellable {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Consumer.java b/src/main/java/io/reactivex/rxjava3/functions/Consumer.java
index 08d94eb928..788622c170 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Consumer.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Consumer.java
@@ -17,6 +17,7 @@
  * A functional interface (callback) that accepts a single value.
  * @param <T> the value type
  */
+@FunctionalInterface
 public interface Consumer<T> {
     /**
      * Consume the given value.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function.java b/src/main/java/io/reactivex/rxjava3/functions/Function.java
index 23d06b041b..d81a2dec52 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function.java
@@ -22,6 +22,7 @@
  * @param <T> the input value type
  * @param <R> the output value type
  */
+@FunctionalInterface
 public interface Function<T, R> {
     /**
      * Apply some calculation to the input value and return some other value.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function3.java b/src/main/java/io/reactivex/rxjava3/functions/Function3.java
index bdc1b4af2b..cdc65112e7 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function3.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function3.java
@@ -22,6 +22,7 @@
  * @param <T3> the third value type
  * @param <R> the result type
  */
+@FunctionalInterface
 public interface Function3<T1, T2, T3, R> {
     /**
      * Calculate a value based on the input values.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function4.java b/src/main/java/io/reactivex/rxjava3/functions/Function4.java
index 907f742907..84c3ab1449 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function4.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function4.java
@@ -23,6 +23,7 @@
  * @param <T4> the fourth value type
  * @param <R> the result type
  */
+@FunctionalInterface
 public interface Function4<T1, T2, T3, T4, R> {
     /**
      * Calculate a value based on the input values.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function5.java b/src/main/java/io/reactivex/rxjava3/functions/Function5.java
index a8468844b7..77f2ff7220 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function5.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function5.java
@@ -24,6 +24,7 @@
  * @param <T5> the fifth value type
  * @param <R> the result type
  */
+@FunctionalInterface
 public interface Function5<T1, T2, T3, T4, T5, R> {
     /**
      * Calculate a value based on the input values.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function6.java b/src/main/java/io/reactivex/rxjava3/functions/Function6.java
index 6bc5caec1f..50c25f3df9 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function6.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function6.java
@@ -25,6 +25,7 @@
  * @param <T6> the sixth value type
  * @param <R> the result type
  */
+@FunctionalInterface
 public interface Function6<T1, T2, T3, T4, T5, T6, R> {
     /**
      * Calculate a value based on the input values.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function7.java b/src/main/java/io/reactivex/rxjava3/functions/Function7.java
index 32d5a08e41..613800a4c1 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function7.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function7.java
@@ -26,6 +26,7 @@
  * @param <T7> the seventh value type
  * @param <R> the result type
  */
+@FunctionalInterface
 public interface Function7<T1, T2, T3, T4, T5, T6, T7, R> {
     /**
      * Calculate a value based on the input values.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function8.java b/src/main/java/io/reactivex/rxjava3/functions/Function8.java
index 8a7a88f9e8..2fda54ea40 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function8.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function8.java
@@ -27,6 +27,7 @@
  * @param <T8> the eighth value type
  * @param <R> the result type
  */
+@FunctionalInterface
 public interface Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> {
     /**
      * Calculate a value based on the input values.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function9.java b/src/main/java/io/reactivex/rxjava3/functions/Function9.java
index 28319eac14..3eb0779e30 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function9.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function9.java
@@ -28,6 +28,7 @@
  * @param <T9> the ninth value type
  * @param <R> the result type
  */
+@FunctionalInterface
 public interface Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> {
     /**
      * Calculate a value based on the input values.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java b/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java
index 8a135ad491..e01cc13ab5 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java
@@ -18,6 +18,7 @@
  * A functional interface (callback) that takes a primitive value and return value of type T.
  * @param <T> the returned value type
  */
+@FunctionalInterface
 public interface IntFunction<T> {
     /**
      * Calculates a value based on a primitive integer input.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java b/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java
index 6b5b72101c..9af7de4f47 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java
@@ -15,6 +15,7 @@
 /**
  * A functional interface (callback) that consumes a primitive long value.
  */
+@FunctionalInterface
 public interface LongConsumer {
     /**
      * Consume a primitive long input.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Predicate.java b/src/main/java/io/reactivex/rxjava3/functions/Predicate.java
index 3197114158..99450f865b 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Predicate.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Predicate.java
@@ -19,6 +19,7 @@
  * A functional interface (callback) that returns true or false for the given input value.
  * @param <T> the first value
  */
+@FunctionalInterface
 public interface Predicate<T> {
     /**
      * Test the given input value and return a boolean.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Supplier.java b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
index 95ef2e88a1..af5052ab83 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
@@ -22,6 +22,7 @@
  * @param <T> the value type returned
  * @since 3.0.0
  */
+@FunctionalInterface
 public interface Supplier<T> {
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
index 039d730be6..fc0d12323f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
@@ -29,6 +29,7 @@
  * <p>
  * @param <T> the scalar value type held by the implementing reactive type
  */
+@FunctionalInterface
 public interface ScalarSupplier<T> extends Supplier<T> {
 
     // overridden to remove the throws Throwable
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java
index ea2d07502a..7033261e65 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java
@@ -23,6 +23,7 @@
  * @param <R> the output type
  * @since 2.2
  */
+@FunctionalInterface
 public interface ParallelFlowableConverter<T, R> {
     /**
      * Applies a function to the upstream ParallelFlowable and returns a converted value of type {@code R}.
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
index 1a918f0835..7e6a7734d0 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
@@ -22,6 +22,7 @@
  * @param <Downstream> the downstream value type
  * @since 2.2
  */
+@FunctionalInterface
 public interface ParallelTransformer<Upstream, Downstream> {
     /**
      * Applies a function to the upstream ParallelFlowable and returns a ParallelFlowable with

From 2f2cef5b2eae258dce76675be3fd83f1f0c322b6 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 18 Dec 2019 16:59:38 +0100
Subject: [PATCH 009/665] 3.x: Javadocs package-info made nicer, update README
 regarding Java 8 (#6778)

---
 README.md                                     | 23 ++++------
 .../rxjava3/annotations/Nullable.java         |  4 +-
 .../rxjava3/annotations/package-info.java     |  4 +-
 .../rxjava3/disposables/package-info.java     |  6 +--
 .../rxjava3/exceptions/package-info.java      |  7 +++-
 .../rxjava3/observers/package-info.java       | 42 +++++++++++++++++--
 .../rxjava3/subjects/package-info.java        |  2 +-
 .../rxjava3/subscribers/package-info.java     |  9 ++--
 8 files changed, 64 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index 7c120db700..698aa96f40 100644
--- a/README.md
+++ b/README.md
@@ -11,10 +11,10 @@ It extends the [observer pattern](http://en.wikipedia.org/wiki/Observer_pattern)
 #### Version 3.x ([Javadoc](http://reactivex.io/RxJava/3.x/javadoc/))
 
 - single dependency: [Reactive-Streams](https://github.com/reactive-streams/reactive-streams-jvm)  
-- continued support for Java 6+ & [Android](https://github.com/ReactiveX/RxAndroid) 2.3+
+- Java 8+ ([Android](https://github.com/ReactiveX/RxAndroid) desugar friendly)
+- Java 8 lambda-friendly API
 - fixed API mistakes and many limits of RxJava 2
 - intended to be a replacement for RxJava 2 with relatively few binary incompatible changes
-- Java 8 lambda-friendly API
 - non-opinionated about the source of concurrency (threads, pools, event loops, fibers, actors, etc.)
 - async or synchronous execution
 - virtual time and schedulers for parameterized concurrency
@@ -60,19 +60,6 @@ public class HelloWorld {
 }
 ```
 
-If your platform doesn't support Java 8 lambdas (yet), you have to create an inner class of `Consumer` manually:
-
-```java
-import io.reactivex.rxjava3.functions.Consumer;
-
-Flowable.just("Hello world")
-  .subscribe(new Consumer<String>() {
-      @Override public void accept(String s) {
-          System.out.println(s);
-      }
-  });
-```
-
 Note that RxJava 3 components now live under `io.reactivex.rxjava3` and the base classes and interfaces live under `io.reactivex.rxjava3.core`.
 
 ### Base classes
@@ -557,7 +544,7 @@ Binaries and dependency information for Maven, Ivy, Gradle and others can be fou
 Example for Gradle:
 
 ```groovy
-compile 'io.reactivex.rxjava3:rxjava:x.y.z'
+implementation 'io.reactivex.rxjava3:rxjava:x.y.z'
 ```
 
 and for Maven:
@@ -575,6 +562,8 @@ and for Ivy:
 <dependency org="io.reactivex.rxjava3" name="rxjava" rev="x.y.z" />
 ```
 
+### Snapshots
+
 Snapshots are available via https://oss.jfrog.org/libs-snapshot/io/reactivex/rxjava3/rxjava/
 
 ```groovy
@@ -587,6 +576,8 @@ dependencies {
 }
 ```
 
+JavaDoc snapshots are available at http://reactivex.io/RxJava/3.x/javadoc/snapshot
+
 ## Build
 
 To build:
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java b/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java
index c94cef974b..c95ef4a35c 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java
@@ -19,10 +19,10 @@
 import java.lang.annotation.*;
 
 /**
- * Indicates that a field/parameter/variable/return type may be null.
+ * Indicates that a field/parameter/variable/type parameter/return type may be null.
  */
 @Documented
-@Target(value = {FIELD, METHOD, PARAMETER, LOCAL_VARIABLE})
+@Target(value = {FIELD, METHOD, PARAMETER, LOCAL_VARIABLE, TYPE_PARAMETER, TYPE_USE})
 @Retention(value = CLASS)
 public @interface Nullable { }
 
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/package-info.java b/src/main/java/io/reactivex/rxjava3/annotations/package-info.java
index 1f84d214c7..8fa44fd553 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/package-info.java
@@ -15,6 +15,8 @@
  */
 
 /**
- * Annotations for indicating experimental and beta operators, classes, methods, types or fields.
+ * Annotations for indicating operator behavior, API stability
+ * ({@link io.reactivex.rxjava3.annotations.Experimental @Experimental} and {@link io.reactivex.rxjava3.annotations.Beta @Beta}) and
+ * nullability indicators ({@link io.reactivex.rxjava3.annotations.Nullable Nullable} and {@link io.reactivex.rxjava3.annotations.NonNull NonNull}).
  */
 package io.reactivex.rxjava3.annotations;
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/package-info.java b/src/main/java/io/reactivex/rxjava3/disposables/package-info.java
index fc3c4221b9..21b276e132 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/package-info.java
@@ -15,8 +15,8 @@
  */
 
 /**
- * Default implementations for Disposable-based resource management
- * (Disposable container types) and utility classes to construct
- * Disposables from callbacks and other types.
+ * Default implementations for {@link io.reactivex.rxjava3.disposables.Disposable Disposable}-based resource management
+ * ({@code Disposable} container types) and utility classes to construct
+ * {@link io.reactivex.rxjava3.disposables.Disposables Disposables} from callbacks and other types.
  */
 package io.reactivex.rxjava3.disposables;
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java b/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java
index 1b3340e414..34557ce302 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java
@@ -15,7 +15,10 @@
  */
 
 /**
- * Exception handling utilities, safe subscriber exception classes,
- * lifecycle exception classes.
+ * Exception handling utilities ({@link io.reactivex.rxjava3.exceptions.Exceptions Exceptions}),
+ * composite exception container ({@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}) and
+ * various lifecycle-reladed ({@link io.reactivex.rxjava3.exceptions.MissingBackpressureException UndeliverableException})
+ * and behavior-violation exception types ({@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException},
+ * {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException}).
  */
 package io.reactivex.rxjava3.exceptions;
diff --git a/src/main/java/io/reactivex/rxjava3/observers/package-info.java b/src/main/java/io/reactivex/rxjava3/observers/package-info.java
index 89596573d4..dbf39cbef2 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/package-info.java
@@ -15,10 +15,44 @@
  */
 
 /**
- * Default wrappers and implementations for Observer-based consumer classes and interfaces,
+ * Default wrappers and implementations for observer-based consumer classes and interfaces,
  * including disposable and resource-tracking variants and
- * the {@link io.reactivex.rxjava3.observers.TestObserver} that allows unit testing
- * {@link io.reactivex.rxjava3.core.Observable}-, {@link io.reactivex.rxjava3.core.Single}-, {@link io.reactivex.rxjava3.core.Maybe}-
- * and {@link io.reactivex.rxjava3.core.Completable}-based flows.
+ * the {@link io.reactivex.rxjava3.observers.TestObserver TestObserver} that allows unit testing
+ * {@link io.reactivex.rxjava3.core.Observable Observable}-, {@link io.reactivex.rxjava3.core.Single Single}-,
+ * {@link io.reactivex.rxjava3.core.Maybe Maybe}- and {@link io.reactivex.rxjava3.core.Completable Completable}-based flows.
+ * <p>
+ * Available observer variants
+ * <br>
+ * <table border="1" style="border-collapse: collapse;" summary="The available observer types.">
+ * <tr><td><b>Reactive type</b></td><td><b>Base interface</b></td><td><b>Simple</b></td><td><b>Disposable</b></td><td><b>Resource</b></td></tr>
+ * <tr>
+ *     <td>{@link io.reactivex.rxjava3.core.Observable Observable}</td>
+ *     <td>{@link io.reactivex.rxjava3.core.Observer Observer}</td>
+ *     <td>{@link io.reactivex.rxjava3.observers.DefaultObserver DefaultObserver}</td>
+ *     <td>{@link io.reactivex.rxjava3.observers.DisposableObserver DisposableObserver}</td>
+ *     <td>{@link io.reactivex.rxjava3.observers.ResourceObserver DisposableObserver}</td>
+ * </tr>
+ * <tr>
+ *     <td>{@link io.reactivex.rxjava3.core.Maybe Maybe}</td>
+ *     <td>{@link io.reactivex.rxjava3.core.MaybeObserver MaybeObserver}</td>
+ *     <td>N/A</td>
+ *     <td>{@link io.reactivex.rxjava3.observers.DisposableMaybeObserver DisposableMaybeObserver}</td>
+ *     <td>{@link io.reactivex.rxjava3.observers.ResourceMaybeObserver DisposableMaybeObserver}</td>
+ * </tr>
+ * <tr>
+ *     <td>{@link io.reactivex.rxjava3.core.Single Single}</td>
+ *     <td>{@link io.reactivex.rxjava3.core.SingleObserver SingleObserver}</td>
+ *     <td>N/A</td>
+ *     <td>{@link io.reactivex.rxjava3.observers.DisposableSingleObserver DisposableSingleObserver}</td>
+ *     <td>{@link io.reactivex.rxjava3.observers.ResourceSingleObserver DisposableSingleObserver}</td>
+ * </tr>
+ * <tr>
+ *     <td>{@link io.reactivex.rxjava3.core.Completable Completable}</td>
+ *     <td>{@link io.reactivex.rxjava3.core.CompletableObserver CompletableObserver}</td>
+ *     <td>N/A</td>
+ *     <td>{@link io.reactivex.rxjava3.observers.DisposableCompletableObserver DisposableCompletableObserver}</td>
+ *     <td>{@link io.reactivex.rxjava3.observers.ResourceCompletableObserver DisposableCompletableObserver}</td>
+ * </tr>
+ * </table>
  */
 package io.reactivex.rxjava3.observers;
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/package-info.java b/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
index 2980d499bb..88fde8391d 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * Classes representing so-called hot sources, aka subjects, that implement a base reactive class and
+ * Classes representing so-called hot sources, aka <strong>subjects</strong>, that implement a base reactive class and
  * the respective consumer type at once to allow forms of multicasting events to multiple
  * consumers as well as consuming another base reactive type of their kind.
  * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java b/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java
index 1792e0e460..348792062a 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java
@@ -15,9 +15,10 @@
  */
 
 /**
- * Default wrappers and implementations for Subscriber-based consumer classes and interfaces,
- * including disposable and resource-tracking variants and
- * the {@link io.reactivex.rxjava3.subscribers.TestSubscriber} that allows unit testing
- * {@link io.reactivex.rxjava3.core.Flowable}-based flows.
+ * Default wrappers and implementations for {@link org.reactivestreams.Subscriber Subscriber}-based consumer classes and interfaces,
+ * including disposable ({@link io.reactivex.rxjava3.subscribers.DisposableSubscriber DisposableSubscriber}) and resource-tracking
+ * ({@link io.reactivex.rxjava3.subscribers.ResourceSubscriber ResourceSubscriber})
+ * variants and the {@link io.reactivex.rxjava3.subscribers.TestSubscriber TestSubscriber} that allows unit testing
+ * {@link io.reactivex.rxjava3.core.Flowable Flowable}-based flows.
  */
 package io.reactivex.rxjava3.subscribers;

From 8d41cc5801eecac4acc38eee7adcee642de24385 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 19 Dec 2019 09:58:58 +0100
Subject: [PATCH 010/665] 3.x: [Java 8] Implement mapOptional, collector,
 first/last/single stage (#6775)

* 3.x: [Java 8] Implement mapOptional, collector, first/last/single stage

* Upgrade the Checkstyle plugin
---
 build.gradle                                  |   2 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 260 +++++++++-
 .../jdk8/FlowableCollectWithCollector.java    | 153 ++++++
 .../FlowableCollectWithCollectorSingle.java   | 164 ++++++
 .../jdk8/FlowableFirstStageSubscriber.java    |  59 +++
 .../jdk8/FlowableLastStageSubscriber.java     |  62 +++
 .../internal/jdk8/FlowableMapOptional.java    | 179 +++++++
 .../jdk8/FlowableSingleStageSubscriber.java   |  68 +++
 .../jdk8/FlowableStageSubscriber.java         |  80 +++
 .../jdk8/CollectWithCollectorTckTest.java     |  45 ++
 .../FlowableCollectWithCollectorTest.java     | 420 ++++++++++++++++
 .../jdk8/FlowableMapOptionalTest.java         | 470 +++++++++++++++++
 .../FlowableStageSubscriberOrDefaultTest.java | 476 ++++++++++++++++++
 .../FlowableStageSubscriberOrErrorTest.java   | 470 +++++++++++++++++
 .../internal/jdk8/MapOptionalTckTest.java     |  38 ++
 .../rxjava3/testsupport/TestHelper.java       |  17 +
 .../ParamValidationCheckerTest.java           |   6 +
 17 files changed, 2967 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFirstStageSubscriber.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableLastStageSubscriber.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableSingleStageSubscriber.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriber.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/CollectWithCollectorTckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrErrorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/MapOptionalTckTest.java

diff --git a/build.gradle b/build.gradle
index 4dcead40c4..f0406bd3f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
   ext.bintrayVersion = "1.8.4"
   ext.jfrogExtractorVersion = "4.11.0"
   ext.bndVersion = "4.3.1"
-  ext.checkstyleVersion = "6.19"
+  ext.checkstyleVersion = "8.26"
 
   // --------------------------------------
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 514845efbc..4177a2d9e6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -6930,6 +6930,7 @@ public final <U> Flowable<U> cast(final Class<U> clazz) {
      * @return a Single that emits the result of collecting the values emitted by the source Publisher
      *         into a single mutable data structure
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
+     * @see #collect(Collector)
      */
     @CheckReturnValue
     @NonNull
@@ -11256,12 +11257,13 @@ public final <R> Flowable<R> lift(FlowableOperator<? extends R, ? super T> lifte
      * @return a Flowable that emits the items from the source Publisher, transformed by the specified
      *         function
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
+     * @see #mapOptional(Function)
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> map(Function<? super T, ? extends R> mapper) {
+    public final <@NonNull R> Flowable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableMap<T, R>(this, mapper));
     }
@@ -18739,4 +18741,260 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
         Objects.requireNonNull(stream, "stream is null");
         return RxJavaPlugins.onAssembly(new FlowableFromStream<>(stream));
     }
+
+    /**
+     * Maps each upstream value into an {@link Optional} and emits the contained item if not empty.
+     * <p>
+     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mapOptional.f.png" alt="">
+     *
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for downstream requests but issues {@code request(1)} whenever the
+     *  mapped {@code Optional} is empty.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the non-null output type
+     * @param mapper the function that receives the upstream item and should return a <em>non-empty</em> {@code Optional}
+     * to emit as the output or an <em>empty</em> {@code Optional} to skip to the next upstream value
+     * @return the new Flowable instance
+     * @since 3.0.0
+     * @see #map(Function)
+     * @see #filter(Predicate)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Flowable<R> mapOptional(@NonNull Function<? super T, @NonNull Optional<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new FlowableMapOptional<>(this, mapper));
+    }
+
+    /**
+     * Collects the finite upstream's values into a container via a Stream {@link Collector} callback set and emits
+     * it as the success result.
+     * <p>
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collector.f.png" alt="">
+     *
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator consumes the upstream in an unbounded manner.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code collect} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the non-null result type
+     * @param <A> the intermediate container type used for the accumulation
+     * @param collector the interface defining the container supplier, accumulator and finisher functions;
+     * see {@link Collectors} for some standard implementations
+     * @return the new Single instance
+     * @since 3.0.0
+     * @see Collectors
+     * @see #collect(Supplier, BiConsumer)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R, A> Single<R> collect(@NonNull Collector<T, A, R> collector) {
+        Objects.requireNonNull(collector, "collector is null");
+        return RxJavaPlugins.onAssembly(new FlowableCollectWithCollectorSingle<>(this, collector));
+    }
+
+    /**
+     * Signals the first upstream item (or the default item if the upstream is empty) via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstStage.f.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <p>
+     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
+     * <pre><code>
+     * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).firstStage(Optional.empty());
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator requests one item from upstream and then when received, cancels the upstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code firstStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param defaultItem the item to signal if the upstream is empty
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #firstOrErrorStage()
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> firstStage(@Nullable T defaultItem) {
+        return subscribeWith(new FlowableFirstStageSubscriber<>(true, defaultItem));
+    }
+
+    /**
+     * Signals the only expected upstream item (or the default item if the upstream is empty)
+     * or signals {@link IllegalArgumentException} if the upstream has more than one item
+     * via a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="229" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleStage.f.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <p>
+     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
+     * <pre><code>
+     * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).singleStage(Optional.empty());
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator requests two items from upstream and then when more than one item is received, cancels the upstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code singleStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param defaultItem the item to signal if the upstream is empty
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #singleOrErrorStage()
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> singleStage(@Nullable T defaultItem) {
+        return subscribeWith(new FlowableSingleStageSubscriber<>(true, defaultItem));
+    }
+
+    /**
+     * Signals the last upstream item (or the default item if the upstream is empty) via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastStage.f.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <p>
+     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
+     * <pre><code>
+     * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).lastStage(Optional.empty());
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator requests an unbounded number of items from the upstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code lastStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param defaultItem the item to signal if the upstream is empty
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #lastOrErrorStage()
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> lastStage(@Nullable T defaultItem) {
+        return subscribeWith(new FlowableLastStageSubscriber<>(true, defaultItem));
+    }
+
+    /**
+     * Signals the first upstream item or a {@link NoSuchElementException} if the upstream is empty via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="338" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrErrorStage.f.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator requests one item from upstream and then when received, cancels the upstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code firstOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #firstStage(Object)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> firstOrErrorStage() {
+        return subscribeWith(new FlowableFirstStageSubscriber<>(false, null));
+    }
+
+    /**
+     * Signals the only expected upstream item, a {@link NoSuchElementException} if the upstream is empty
+     * or signals {@link IllegalArgumentException} if the upstream has more than one item
+     * via a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="229" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrErrorStage.f.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator requests two items from upstream and then when more than one item is received, cancels the upstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code singleOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #singleStage(Object)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> singleOrErrorStage() {
+        return subscribeWith(new FlowableSingleStageSubscriber<>(false, null));
+    }
+
+    /**
+     * Signals the last upstream item or a {@link NoSuchElementException} if the upstream is empty via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="346" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrErrorStage.f.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator requests an unbounded number of items from the upstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code lastOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #lastStage(Object)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> lastOrErrorStage() {
+        return subscribeWith(new FlowableLastStageSubscriber<>(false, null));
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
new file mode 100644
index 0000000000..bc408db304
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Objects;
+import java.util.function.*;
+import java.util.stream.Collector;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Collect items into a container defined by a Stream {@link Collector} callback set.
+ *
+ * @param <T> the upstream value type
+ * @param <A> the intermediate accumulator type
+ * @param <R> the result type
+ * @since 3.0.0
+ */
+public final class FlowableCollectWithCollector<T, A, R> extends Flowable<R> {
+
+    final Flowable<T> source;
+
+    final Collector<T, A, R> collector;
+
+    public FlowableCollectWithCollector(Flowable<T> source, Collector<T, A, R> collector) {
+        this.source = source;
+        this.collector = collector;
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull Subscriber<? super R> s) {
+        A container;
+        BiConsumer<A, T> accumulator;
+        Function<A, R> finisher;
+
+        try {
+            container = collector.supplier().get();
+            accumulator = collector.accumulator();
+            finisher = collector.finisher();
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            EmptySubscription.error(ex, s);
+            return;
+        }
+
+        source.subscribe(new CollectorSubscriber<>(s, container, accumulator, finisher));
+    }
+
+    static final class CollectorSubscriber<T, A, R>
+    extends DeferredScalarSubscription<R>
+    implements FlowableSubscriber<T> {
+
+        private static final long serialVersionUID = -229544830565448758L;
+
+        final BiConsumer<A, T> accumulator;
+
+        final Function<A, R> finisher;
+
+        Subscription upstream;
+
+        boolean done;
+
+        A container;
+
+        CollectorSubscriber(Subscriber<? super R> downstream, A container, BiConsumer<A, T> accumulator, Function<A, R> finisher) {
+            super(downstream);
+            this.container = container;
+            this.accumulator = accumulator;
+            this.finisher = finisher;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Subscription s) {
+            if (SubscriptionHelper.validate(this.upstream, s)) {
+                this.upstream = s;
+
+                downstream.onSubscribe(this);
+
+                s.request(Long.MAX_VALUE);
+            }
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (done) {
+                return;
+            }
+            try {
+                accumulator.accept(container, t);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                upstream.cancel();
+                onError(ex);
+            }
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (done) {
+                RxJavaPlugins.onError(t);
+            } else {
+                done = true;
+                upstream = SubscriptionHelper.CANCELLED;
+                this.container = null;
+                downstream.onError(t);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            if (done) {
+                return;
+            }
+
+            done = true;
+            upstream = SubscriptionHelper.CANCELLED;
+            A container = this.container;
+            this.container = null;
+            R result;
+            try {
+                result = Objects.requireNonNull(finisher.apply(container), "The finisher returned a null value");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+
+            complete(result);
+        }
+
+        @Override
+        public void cancel() {
+            super.cancel();
+            upstream.cancel();
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
new file mode 100644
index 0000000000..134de68415
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
@@ -0,0 +1,164 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Objects;
+import java.util.function.*;
+import java.util.stream.Collector;
+
+import org.reactivestreams.Subscription;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.fuseable.FuseToFlowable;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Collect items into a container defined by a Stream {@link Collector} callback set.
+ *
+ * @param <T> the upstream value type
+ * @param <A> the intermediate accumulator type
+ * @param <R> the result type
+ * @since 3.0.0
+ */
+public final class FlowableCollectWithCollectorSingle<T, A, R> extends Single<R> implements FuseToFlowable<R> {
+
+    final Flowable<T> source;
+
+    final Collector<T, A, R> collector;
+
+    public FlowableCollectWithCollectorSingle(Flowable<T> source, Collector<T, A, R> collector) {
+        this.source = source;
+        this.collector = collector;
+    }
+
+    @Override
+    public Flowable<R> fuseToFlowable() {
+        return new FlowableCollectWithCollector<>(source, collector);
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull SingleObserver<? super R> observer) {
+        A container;
+        BiConsumer<A, T> accumulator;
+        Function<A, R> finisher;
+
+        try {
+            container = collector.supplier().get();
+            accumulator = collector.accumulator();
+            finisher = collector.finisher();
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            EmptyDisposable.error(ex, observer);
+            return;
+        }
+
+        source.subscribe(new CollectorSingleObserver<>(observer, container, accumulator, finisher));
+    }
+
+    static final class CollectorSingleObserver<T, A, R> implements FlowableSubscriber<T>, Disposable {
+
+        final SingleObserver<? super R> downstream;
+
+        final BiConsumer<A, T> accumulator;
+
+        final Function<A, R> finisher;
+
+        Subscription upstream;
+
+        boolean done;
+
+        A container;
+
+        CollectorSingleObserver(SingleObserver<? super R> downstream, A container, BiConsumer<A, T> accumulator, Function<A, R> finisher) {
+            this.downstream = downstream;
+            this.container = container;
+            this.accumulator = accumulator;
+            this.finisher = finisher;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Subscription s) {
+            if (SubscriptionHelper.validate(this.upstream, s)) {
+                this.upstream = s;
+
+                downstream.onSubscribe(this);
+
+                s.request(Long.MAX_VALUE);
+            }
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (done) {
+                return;
+            }
+            try {
+                accumulator.accept(container, t);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                upstream.cancel();
+                onError(ex);
+            }
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (done) {
+                RxJavaPlugins.onError(t);
+            } else {
+                done = true;
+                upstream = SubscriptionHelper.CANCELLED;
+                this.container = null;
+                downstream.onError(t);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            if (done) {
+                return;
+            }
+
+            done = true;
+            upstream = SubscriptionHelper.CANCELLED;
+            A container = this.container;
+            this.container = null;
+            R result;
+            try {
+                result = Objects.requireNonNull(finisher.apply(container), "The finisher returned a null value");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+
+            downstream.onSuccess(result);
+        }
+
+        @Override
+        public void dispose() {
+            upstream.cancel();
+            upstream = SubscriptionHelper.CANCELLED;
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream == SubscriptionHelper.CANCELLED;
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFirstStageSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFirstStageSubscriber.java
new file mode 100644
index 0000000000..5af6cc5aac
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFirstStageSubscriber.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.NoSuchElementException;
+
+import org.reactivestreams.Subscription;
+
+/**
+ * Signals the first element of the source via the underlying CompletableFuture,
+ * signals the a default item if the upstream is empty or signals {@link NoSuchElementException}.
+ *
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class FlowableFirstStageSubscriber<T> extends FlowableStageSubscriber<T> {
+
+    final boolean hasDefault;
+
+    final T defaultItem;
+
+    public FlowableFirstStageSubscriber(boolean hasDefault, T defaultItem) {
+        this.hasDefault = hasDefault;
+        this.defaultItem = defaultItem;
+    }
+
+    @Override
+    public void onNext(T t) {
+        complete(t);
+    }
+
+    @Override
+    public void onComplete() {
+        if (!isDone()) {
+            clear();
+            if (hasDefault) {
+                complete(defaultItem);
+            } else {
+                completeExceptionally(new NoSuchElementException());
+            }
+        }
+    }
+
+    @Override
+    protected void afterSubscribe(Subscription s) {
+        s.request(1);
+    }
+
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableLastStageSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableLastStageSubscriber.java
new file mode 100644
index 0000000000..c9a93eeb0e
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableLastStageSubscriber.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.NoSuchElementException;
+
+import org.reactivestreams.Subscription;
+
+/**
+ * Signals the last element of the source via the underlying CompletableFuture,
+ * signals the a default item if the upstream is empty or signals {@link NoSuchElementException}.
+ *
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class FlowableLastStageSubscriber<T> extends FlowableStageSubscriber<T> {
+
+    final boolean hasDefault;
+
+    final T defaultItem;
+
+    public FlowableLastStageSubscriber(boolean hasDefault, T defaultItem) {
+        this.hasDefault = hasDefault;
+        this.defaultItem = defaultItem;
+    }
+
+    @Override
+    public void onNext(T t) {
+        value = t;
+    }
+
+    @Override
+    public void onComplete() {
+        if (!isDone()) {
+            T v = value;
+            clear();
+            if (v != null) {
+                complete(v);
+            } else if (hasDefault) {
+                complete(defaultItem);
+            } else {
+                completeExceptionally(new NoSuchElementException());
+            }
+        }
+    }
+
+    @Override
+    protected void afterSubscribe(Subscription s) {
+        s.request(Long.MAX_VALUE);
+    }
+
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java
new file mode 100644
index 0000000000..3fdcd40a4f
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java
@@ -0,0 +1,179 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
+import io.reactivex.rxjava3.internal.subscribers.*;
+
+/**
+ * Map the upstream values into an Optional and emit its value if any.
+ * @param <T> the upstream element type
+ * @param <R> the output element type
+ * @since 3.0.0
+ */
+public final class FlowableMapOptional<T, R> extends Flowable<R> {
+
+    final Flowable<T> source;
+
+    final Function<? super T, Optional<? extends R>> mapper;
+
+    public FlowableMapOptional(Flowable<T> source, Function<? super T, Optional<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super R> s) {
+        if (s instanceof ConditionalSubscriber) {
+            source.subscribe(new MapOptionalConditionalSubscriber<>((ConditionalSubscriber<? super R>)s, mapper));
+        } else {
+            source.subscribe(new MapOptionalSubscriber<>(s, mapper));
+        }
+    }
+
+    static final class MapOptionalSubscriber<T, R> extends BasicFuseableSubscriber<T, R>
+    implements ConditionalSubscriber<T> {
+
+        final Function<? super T, Optional<? extends R>> mapper;
+
+        MapOptionalSubscriber(Subscriber<? super R> downstream, Function<? super T, Optional<? extends R>> mapper) {
+            super(downstream);
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (!tryOnNext(t)) {
+                upstream.request(1);
+            }
+        }
+
+        @Override
+        public boolean tryOnNext(T t) {
+            if (done) {
+                return true;
+            }
+
+            if (sourceMode != NONE) {
+                downstream.onNext(null);
+                return true;
+            }
+
+            Optional<? extends R> result;
+            try {
+                result = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Optional");
+            } catch (Throwable ex) {
+                fail(ex);
+                return true;
+            }
+
+            if (result.isPresent()) {
+                downstream.onNext(result.get());
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public int requestFusion(int mode) {
+            return transitiveBoundaryFusion(mode);
+        }
+
+        @Override
+        public R poll() throws Throwable {
+            for (;;) {
+                T item = qs.poll();
+                if (item == null) {
+                    return null;
+                }
+                Optional<? extends R> result = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null Optional");
+                if (result.isPresent()) {
+                    return result.get();
+                }
+                if (sourceMode == ASYNC) {
+                    qs.request(1);
+                }
+            }
+        }
+    }
+
+    static final class MapOptionalConditionalSubscriber<T, R> extends BasicFuseableConditionalSubscriber<T, R> {
+
+        final Function<? super T, Optional<? extends R>> mapper;
+
+        MapOptionalConditionalSubscriber(ConditionalSubscriber<? super R> downstream, Function<? super T, Optional<? extends R>> mapper) {
+            super(downstream);
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (!tryOnNext(t)) {
+                upstream.request(1);
+            }
+        }
+
+        @Override
+        public boolean tryOnNext(T t) {
+            if (done) {
+                return true;
+            }
+
+            if (sourceMode != NONE) {
+                downstream.onNext(null);
+                return true;
+            }
+
+            Optional<? extends R> result;
+            try {
+                result = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Optional");
+            } catch (Throwable ex) {
+                fail(ex);
+                return true;
+            }
+
+            if (result.isPresent()) {
+                return downstream.tryOnNext(result.get());
+            }
+            return false;
+        }
+
+        @Override
+        public int requestFusion(int mode) {
+            return transitiveBoundaryFusion(mode);
+        }
+
+        @Override
+        public R poll() throws Throwable {
+            for (;;) {
+                T item = qs.poll();
+                if (item == null) {
+                    return null;
+                }
+                Optional<? extends R> result = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null Optional");
+                if (result.isPresent()) {
+                    return result.get();
+                }
+                if (sourceMode == ASYNC) {
+                    qs.request(1);
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableSingleStageSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableSingleStageSubscriber.java
new file mode 100644
index 0000000000..8040ec6f5d
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableSingleStageSubscriber.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.NoSuchElementException;
+
+import org.reactivestreams.Subscription;
+
+/**
+ * Signals the only element of the source via the underlying CompletableFuture,
+ * signals the a default item if the upstream is empty or signals {@link IllegalArgumentException}
+ * if the upstream has more than one item.
+ *
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class FlowableSingleStageSubscriber<T> extends FlowableStageSubscriber<T> {
+
+    final boolean hasDefault;
+
+    final T defaultItem;
+
+    public FlowableSingleStageSubscriber(boolean hasDefault, T defaultItem) {
+        this.hasDefault = hasDefault;
+        this.defaultItem = defaultItem;
+    }
+
+    @Override
+    public void onNext(T t) {
+        if (value != null) {
+            value = null;
+            completeExceptionally(new IllegalArgumentException("Sequence contains more than one element!"));
+        } else {
+            value = t;
+        }
+    }
+
+    @Override
+    public void onComplete() {
+        if (!isDone()) {
+            T v = value;
+            clear();
+            if (v != null) {
+                complete(v);
+            } else if (hasDefault) {
+                complete(defaultItem);
+            } else {
+                completeExceptionally(new NoSuchElementException());
+            }
+        }
+    }
+
+    @Override
+    protected void afterSubscribe(Subscription s) {
+        s.request(2);
+    }
+
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriber.java
new file mode 100644
index 0000000000..6594b7ba5c
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriber.java
@@ -0,0 +1,80 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.reactivestreams.Subscription;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Base class that extends CompletableFuture and provides basic infrastructure
+ * to notify watchers upon upstream signals.
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+abstract class FlowableStageSubscriber<T> extends CompletableFuture<T> implements FlowableSubscriber<T> {
+
+    final AtomicReference<Subscription> upstream = new AtomicReference<>();
+
+    T value;
+
+    @Override
+    public final void onSubscribe(@NonNull Subscription s) {
+        if (SubscriptionHelper.setOnce(upstream, s)) {
+            afterSubscribe(s);
+        }
+    }
+
+    protected abstract void afterSubscribe(Subscription s);
+
+    @Override
+    public final void onError(Throwable t) {
+        clear();
+        if (!completeExceptionally(t)) {
+            RxJavaPlugins.onError(t);
+        }
+    }
+
+    protected final void cancelUpstream() {
+        SubscriptionHelper.cancel(upstream);
+    }
+
+    protected final void clear() {
+        value = null;
+        upstream.lazySet(SubscriptionHelper.CANCELLED);
+    }
+
+    @Override
+    public final boolean cancel(boolean mayInterruptIfRunning) {
+        cancelUpstream();
+        return super.cancel(mayInterruptIfRunning);
+    }
+
+    @Override
+    public final boolean complete(T value) {
+        cancelUpstream();
+        return super.complete(value);
+    }
+
+    @Override
+    public final boolean completeExceptionally(Throwable ex) {
+        cancelUpstream();
+        return super.completeExceptionally(ex);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/CollectWithCollectorTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CollectWithCollectorTckTest.java
new file mode 100644
index 0000000000..99fb2dcff9
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CollectWithCollectorTckTest.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class CollectWithCollectorTckTest extends BaseTck<List<Integer>> {
+
+    @Override
+    public Publisher<List<Integer>> createPublisher(final long elements) {
+        return
+                Flowable.range(0, (int)elements).collect(Collectors.toList()).toFlowable()
+            ;
+    }
+
+    @Override
+    public Publisher<List<Integer>> createFailedPublisher() {
+        return Flowable.<Integer>error(new TestException()).collect(Collectors.toList()).toFlowable();
+    }
+
+    @Override
+    public long maxElementsFromPublisher() {
+        return 1;
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorTest.java
new file mode 100644
index 0000000000..ecef7665e0
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorTest.java
@@ -0,0 +1,420 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
+
+import org.junit.Test;
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class FlowableCollectWithCollectorTest extends RxJavaTest {
+
+    @Test
+    public void basic() {
+        Flowable.range(1, 5)
+        .collect(Collectors.toList())
+        .test()
+        .assertResult(Arrays.asList(1, 2, 3, 4, 5));
+    }
+
+    @Test
+    public void empty() {
+        Flowable.empty()
+        .collect(Collectors.toList())
+        .test()
+        .assertResult(Collections.emptyList());
+    }
+
+    @Test
+    public void error() {
+        Flowable.error(new TestException())
+        .collect(Collectors.toList())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorSupplierCrash() {
+        Flowable.range(1, 5)
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                throw new TestException();
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorAccumulatorCrash() {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        source
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { throw new TestException(); };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void collectorFinisherCrash() {
+        Flowable.range(1, 5)
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> {  };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> { throw new TestException(); };
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorAccumulatorDropSignals() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable<Integer> source = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onNext(2);
+                    s.onError(new IOException());
+                    s.onComplete();
+                }
+            };
+
+            source
+            .collect(new Collector<Integer, Integer, Integer>() {
+
+                @Override
+                public Supplier<Integer> supplier() {
+                    return () -> 1;
+                }
+
+                @Override
+                public BiConsumer<Integer, Integer> accumulator() {
+                    return (a, b) -> { throw new TestException(); };
+                }
+
+                @Override
+                public BinaryOperator<Integer> combiner() {
+                    return (a, b) -> a + b;
+                }
+
+                @Override
+                public Function<Integer, Integer> finisher() {
+                    return a -> a;
+                }
+
+                @Override
+                public Set<Characteristics> characteristics() {
+                    return Collections.emptySet();
+                }
+            })
+            .test()
+            .assertFailure(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        });
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(PublishProcessor.create()
+                .collect(Collectors.toList()));
+    }
+
+    @Test
+    public void onSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowableToSingle(f -> f.collect(Collectors.toList()));
+    }
+
+    @Test
+    public void basicToFlowable() {
+        Flowable.range(1, 5)
+        .collect(Collectors.toList())
+        .toFlowable()
+        .test()
+        .assertResult(Arrays.asList(1, 2, 3, 4, 5));
+    }
+
+    @Test
+    public void emptyToFlowable() {
+        Flowable.empty()
+        .collect(Collectors.toList())
+        .toFlowable()
+        .test()
+        .assertResult(Collections.emptyList());
+    }
+
+    @Test
+    public void errorToFlowable() {
+        Flowable.error(new TestException())
+        .collect(Collectors.toList())
+        .toFlowable()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorSupplierCrashToFlowable() {
+        Flowable.range(1, 5)
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                throw new TestException();
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .toFlowable()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorAccumulatorCrashToFlowable() {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        source
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { throw new TestException(); };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .toFlowable()
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void collectorFinisherCrashToFlowable() {
+        Flowable.range(1, 5)
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> {  };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> { throw new TestException(); };
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .toFlowable()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorAccumulatorDropSignalsToFlowable() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable<Integer> source = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onNext(2);
+                    s.onError(new IOException());
+                    s.onComplete();
+                }
+            };
+
+            source
+            .collect(new Collector<Integer, Integer, Integer>() {
+
+                @Override
+                public Supplier<Integer> supplier() {
+                    return () -> 1;
+                }
+
+                @Override
+                public BiConsumer<Integer, Integer> accumulator() {
+                    return (a, b) -> { throw new TestException(); };
+                }
+
+                @Override
+                public BinaryOperator<Integer> combiner() {
+                    return (a, b) -> a + b;
+                }
+
+                @Override
+                public Function<Integer, Integer> finisher() {
+                    return a -> a;
+                }
+
+                @Override
+                public Set<Characteristics> characteristics() {
+                    return Collections.emptySet();
+                }
+            })
+            .toFlowable()
+            .test()
+            .assertFailure(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        });
+    }
+
+    @Test
+    public void disposeToFlowable() {
+        TestHelper.checkDisposed(PublishProcessor.create()
+                .collect(Collectors.toList()).toFlowable());
+    }
+
+    @Test
+    public void onSubscribeToFlowable() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.collect(Collectors.toList()).toFlowable());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
new file mode 100644
index 0000000000..85fc8d75be
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
@@ -0,0 +1,470 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.assertFalse;
+
+import java.util.Optional;
+
+import org.junit.Test;
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class FlowableMapOptionalTest extends RxJavaTest {
+
+    static final Function<? super Integer, Optional<? extends Integer>> MODULO = v -> v % 2 == 0 ? Optional.of(v) : Optional.<Integer>empty();
+
+    @Test
+    public void allPresent() {
+        Flowable.range(1, 5)
+        .mapOptional(Optional::of)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void allEmpty() {
+        Flowable.range(1, 5)
+        .mapOptional(v -> Optional.<Integer>empty())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void mixed() {
+        Flowable.range(1, 10)
+        .mapOptional(MODULO)
+        .test()
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void mapperChash() {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        source
+        .mapOptional(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void mapperNull() {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        source
+        .mapOptional(v -> null)
+        .test()
+        .assertFailure(NullPointerException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void crashDropsOnNexts() {
+        Flowable<Integer> source = new Flowable<Integer>() {
+            @Override
+            protected void subscribeActual(Subscriber<? super Integer> s) {
+                s.onSubscribe(new BooleanSubscription());
+                s.onNext(1);
+                s.onNext(2);
+            }
+        };
+
+        source
+        .mapOptional(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void backpressureAll() {
+        Flowable.range(1, 5)
+        .mapOptional(Optional::of)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(2)
+        .assertValuesOnly(1, 2)
+        .requestMore(2)
+        .assertValuesOnly(1, 2, 3, 4)
+        .requestMore(1)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void backpressureNone() {
+        Flowable.range(1, 5)
+        .mapOptional(v -> Optional.empty())
+        .test(1L)
+        .assertResult();
+    }
+
+    @Test
+    public void backpressureMixed() {
+        Flowable.range(1, 10)
+        .mapOptional(MODULO)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(2)
+        .assertValuesOnly(2, 4)
+        .requestMore(2)
+        .assertValuesOnly(2, 4, 6, 8)
+        .requestMore(1)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void syncFusedAll() {
+        Flowable.range(1, 5)
+        .mapOptional(Optional::of)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void asyncFusedAll() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .mapOptional(Optional::of)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void boundaryFusedAll() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .mapOptional(Optional::of)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void syncFusedNone() {
+        Flowable.range(1, 5)
+        .mapOptional(v -> Optional.empty())
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void asyncFusedNone() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .mapOptional(v -> Optional.empty())
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void boundaryFusedNone() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .mapOptional(v -> Optional.empty())
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+    }
+
+    @Test
+    public void syncFusedMixed() {
+        Flowable.range(1, 10)
+        .mapOptional(MODULO)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void asyncFusedMixed() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        up
+        .mapOptional(MODULO)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void boundaryFusedMixed() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        up
+        .mapOptional(MODULO)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void allPresentConditional() {
+        Flowable.range(1, 5)
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void allEmptyConditional() {
+        Flowable.range(1, 5)
+        .mapOptional(v -> Optional.<Integer>empty())
+        .filter(v -> true)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void mixedConditional() {
+        Flowable.range(1, 10)
+        .mapOptional(MODULO)
+        .filter(v -> true)
+        .test()
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void mapperChashConditional() {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        source
+        .mapOptional(v -> { throw new TestException(); })
+        .filter(v -> true)
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void mapperNullConditional() {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        source
+        .mapOptional(v -> null)
+        .filter(v -> true)
+        .test()
+        .assertFailure(NullPointerException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void crashDropsOnNextsConditional() {
+        Flowable<Integer> source = new Flowable<Integer>() {
+            @Override
+            protected void subscribeActual(Subscriber<? super Integer> s) {
+                s.onSubscribe(new BooleanSubscription());
+                s.onNext(1);
+                s.onNext(2);
+            }
+        };
+
+        source
+        .mapOptional(v -> { throw new TestException(); })
+        .filter(v -> true)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void backpressureAllConditional() {
+        Flowable.range(1, 5)
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(2)
+        .assertValuesOnly(1, 2)
+        .requestMore(2)
+        .assertValuesOnly(1, 2, 3, 4)
+        .requestMore(1)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void backpressureNoneConditional() {
+        Flowable.range(1, 5)
+        .mapOptional(v -> Optional.empty())
+        .filter(v -> true)
+        .test(1L)
+        .assertResult();
+    }
+
+    @Test
+    public void backpressureMixedConditional() {
+        Flowable.range(1, 10)
+        .mapOptional(MODULO)
+        .filter(v -> true)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(2)
+        .assertValuesOnly(2, 4)
+        .requestMore(2)
+        .assertValuesOnly(2, 4, 6, 8)
+        .requestMore(1)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void syncFusedAllConditional() {
+        Flowable.range(1, 5)
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void asyncFusedAllConditional() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void boundaryFusedAllConditiona() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void syncFusedNoneConditional() {
+        Flowable.range(1, 5)
+        .mapOptional(v -> Optional.empty())
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void asyncFusedNoneConditional() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .mapOptional(v -> Optional.empty())
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void boundaryFusedNoneConditional() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .mapOptional(v -> Optional.empty())
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+    }
+
+    @Test
+    public void syncFusedMixedConditional() {
+        Flowable.range(1, 10)
+        .mapOptional(MODULO)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void asyncFusedMixedConditional() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        up
+        .mapOptional(MODULO)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void boundaryFusedMixedConditional() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        up
+        .mapOptional(MODULO)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java
new file mode 100644
index 0000000000..882fd83dfb
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java
@@ -0,0 +1,476 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.concurrent.*;
+
+import org.junit.Test;
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class FlowableStageSubscriberOrDefaultTest extends RxJavaTest {
+
+    @Test
+    public void firstJust() throws Exception {
+        Integer v = Flowable.just(1)
+                .firstStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void firstEmpty() throws Exception {
+        Integer v = Flowable.<Integer>empty()
+                .firstStage(2)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)2, v);
+    }
+
+    @Test
+    public void firstCancels() throws Exception {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        Integer v = source
+                .firstStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void firstCompletableFutureCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void firstCompletableManualCompleteCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void firstCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void firstError() throws Exception {
+        CompletableFuture<Integer> cf = Flowable.<Integer>error(new TestException())
+                .firstStage(null)
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void firstSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onError(new TestException());
+                    s.onComplete();
+                }
+            }
+            .firstStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void firstDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                }
+            }
+            .firstStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+
+    @Test
+    public void singleJust() throws Exception {
+        Integer v = Flowable.just(1)
+                .singleStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void singleEmpty() throws Exception {
+        Integer v = Flowable.<Integer>empty()
+                .singleStage(2)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)2, v);
+    }
+
+    @Test
+    public void singleTooManyCancels() throws Exception {
+        ReplayProcessor<Integer> source = ReplayProcessor.create();
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(source
+                .singleStage(null)
+                .toCompletableFuture(), IllegalArgumentException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void singleCompletableFutureCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void singleCompletableManualCompleteCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void singleCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void singleError() throws Exception {
+        CompletableFuture<Integer> cf = Flowable.<Integer>error(new TestException())
+                .singleStage(null)
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void singleSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onComplete();
+                    s.onError(new TestException());
+                    s.onComplete();
+                }
+            }
+            .singleStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void singleDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onComplete();
+                }
+            }
+            .singleStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+
+    @Test
+    public void lastJust() throws Exception {
+        Integer v = Flowable.just(1)
+                .lastStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void lastRange() throws Exception {
+        Integer v = Flowable.range(1, 5)
+                .lastStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)5, v);
+    }
+
+    @Test
+    public void lastEmpty() throws Exception {
+        Integer v = Flowable.<Integer>empty()
+                .lastStage(2)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)2, v);
+    }
+
+    @Test
+    public void lastCompletableFutureCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void lastCompletableManualCompleteCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void lastCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void lastError() throws Exception {
+        CompletableFuture<Integer> cf = Flowable.<Integer>error(new TestException())
+                .lastStage(null)
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void lastSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onComplete();
+                    s.onError(new TestException());
+                    s.onComplete();
+                }
+            }
+            .lastStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void lastDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onComplete();
+                }
+            }
+            .lastStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrErrorTest.java
new file mode 100644
index 0000000000..c34e4739fa
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrErrorTest.java
@@ -0,0 +1,470 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.NoSuchElementException;
+import java.util.concurrent.*;
+
+import org.junit.Test;
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class FlowableStageSubscriberOrErrorTest extends RxJavaTest {
+
+    @Test
+    public void firstJust() throws Exception {
+        Integer v = Flowable.just(1)
+                .firstOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void firstEmpty() throws Exception {
+        TestHelper.assertError(
+                Flowable.<Integer>empty()
+                .firstOrErrorStage()
+                .toCompletableFuture(), NoSuchElementException.class);
+    }
+
+    @Test
+    public void firstCancels() throws Exception {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        Integer v = source
+                .firstOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void firstCompletableFutureCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void firstCompletableManualCompleteCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void firstCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void firstError() throws Exception {
+        CompletableFuture<Integer> cf = Flowable.<Integer>error(new TestException())
+                .firstOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void firstSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onError(new TestException());
+                    s.onComplete();
+                }
+            }
+            .firstOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void firstDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                }
+            }
+            .firstOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+
+    @Test
+    public void singleJust() throws Exception {
+        Integer v = Flowable.just(1)
+                .singleOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void singleEmpty() throws Exception {
+        TestHelper.assertError(
+                Flowable.<Integer>empty()
+                .singleOrErrorStage()
+                .toCompletableFuture(), NoSuchElementException.class);
+    }
+
+    @Test
+    public void singleTooManyCancels() throws Exception {
+        ReplayProcessor<Integer> source = ReplayProcessor.create();
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(source
+            .singleOrErrorStage()
+            .toCompletableFuture(), IllegalArgumentException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void singleCompletableFutureCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void singleCompletableManualCompleteCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void singleCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void singleError() throws Exception {
+        CompletableFuture<Integer> cf = Flowable.<Integer>error(new TestException())
+                .singleOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void singleSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onComplete();
+                    s.onError(new TestException());
+                    s.onComplete();
+                }
+            }
+            .singleOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void singleDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onComplete();
+                }
+            }
+            .singleOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+
+    @Test
+    public void lastJust() throws Exception {
+        Integer v = Flowable.just(1)
+                .lastOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void lastRange() throws Exception {
+        Integer v = Flowable.range(1, 5)
+                .lastOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)5, v);
+    }
+
+    @Test
+    public void lastEmpty() throws Exception {
+        TestHelper.assertError(Flowable.<Integer>empty()
+                .lastOrErrorStage()
+                .toCompletableFuture(), NoSuchElementException.class);
+    }
+
+    @Test
+    public void lastCompletableFutureCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void lastCompletableManualCompleteCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void lastCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasSubscribers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasSubscribers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void lastError() throws Exception {
+        CompletableFuture<Integer> cf = Flowable.<Integer>error(new TestException())
+                .lastOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void lastSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onComplete();
+                    s.onError(new TestException());
+                    s.onComplete();
+                }
+            }
+            .lastOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void lastDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onComplete();
+                }
+            }
+            .lastOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MapOptionalTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MapOptionalTckTest.java
new file mode 100644
index 0000000000..b7cb4d9725
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MapOptionalTckTest.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Optional;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class MapOptionalTckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        return
+                Flowable.range(0, (int)(2 * elements)).mapOptional(v -> v % 2 == 0 ? Optional.of(v) : Optional.empty())
+            ;
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        return Flowable.just(1).<Integer>mapOptional(v -> null).onBackpressureDrop();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 1ce53f01ae..865b31a082 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -3438,4 +3438,21 @@ public static void withErrorTracking(Consumer<List<Throwable>> action) throws Th
             RxJavaPlugins.reset();
         }
     }
+
+    /**
+     * Assert if the given CompletableFuture fails with a specified error inside an ExecutionException.
+     * @param cf the CompletableFuture to test
+     * @param error the error class expected
+     */
+    public static void assertError(CompletableFuture<?> cf, Class<? extends Throwable> error) {
+        try {
+            cf.get();
+            fail("Should have thrown!");
+        } catch (Throwable ex) {
+            if (!error.isInstance(ex.getCause())) {
+                ex.printStackTrace();
+                fail("Wrong cause: " + ex.getCause());
+            }
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 2d4387d543..99f6783b4a 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -503,6 +503,12 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "window", Long.TYPE, TimeUnit.class, Scheduler.class, Long.TYPE, Boolean.TYPE));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "window", Long.TYPE, TimeUnit.class, Scheduler.class, Long.TYPE, Boolean.TYPE, Integer.TYPE));
 
+        // null value allowed
+
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "firstStage", Object.class));
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "singleStage", Object.class));
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "lastStage", Object.class));
+
         // -----------------------------------------------------------------------------------
 
         ignores = new HashMap<String, List<ParamIgnore>>();

From 3d25617651a764b2df7d3817932153fd651bcad3 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 19 Dec 2019 18:18:05 +0100
Subject: [PATCH 011/665] 3.x: [Java 8] Add AutoCloseable <-> Disposable
 conversions, nicen docs (#6780)

---
 .../rxjava3/disposables/ActionDisposable.java |   7 +-
 .../disposables/AutoCloseableDisposable.java  |  45 +++++++
 .../rxjava3/disposables/Disposables.java      |  58 ++++++---
 .../rxjava3/disposables/FutureDisposable.java |   2 +-
 .../disposables/RunnableDisposable.java       |   2 +-
 .../rxjava3/disposables/DisposablesTest.java  | 111 +++++++++++++++---
 6 files changed, 191 insertions(+), 34 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java

diff --git a/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java
index dd74d600c6..32ad478656 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java
@@ -17,7 +17,7 @@
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 
 /**
- * A Disposable container that manages an Action instance.
+ * A Disposable container that manages an {@link Action} instance.
  */
 final class ActionDisposable extends ReferenceDisposable<Action> {
 
@@ -35,4 +35,9 @@ protected void onDisposed(@NonNull Action value) {
             throw ExceptionHelper.wrapOrThrow(ex);
         }
     }
+
+    @Override
+    public String toString() {
+        return "ActionDisposable(disposed=" + isDisposed() + ", " + get() + ")";
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java
new file mode 100644
index 0000000000..8c0f2be2dc
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.disposables;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * A disposable container that manages an {@link AutoCloseable} instance.
+ * @since 3.0.0
+ */
+final class AutoCloseableDisposable extends ReferenceDisposable<AutoCloseable> {
+
+    private static final long serialVersionUID = -6646144244598696847L;
+
+    AutoCloseableDisposable(AutoCloseable value) {
+        super(value);
+    }
+
+    @Override
+    protected void onDisposed(@NonNull AutoCloseable value) {
+        try {
+            value.close();
+        } catch (Throwable ex) {
+            RxJavaPlugins.onError(ex);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "AutoCloseableDisposable(disposed=" + isDisposed() + ", " + get() + ")";
+    }
+
+}
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
index 2ff83d64ff..39b1b76b25 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
@@ -35,8 +35,8 @@ private Disposables() {
     }
 
     /**
-     * Construct a Disposable by wrapping a Runnable that is
-     * executed exactly once when the Disposable is disposed.
+     * Construct a {@code Disposable} by wrapping a {@link Runnable} that is
+     * executed exactly once when the {@code Disposable} is disposed.
      * @param run the Runnable to wrap
      * @return the new Disposable instance
      */
@@ -47,8 +47,8 @@ public static Disposable fromRunnable(@NonNull Runnable run) {
     }
 
     /**
-     * Construct a Disposable by wrapping a Action that is
-     * executed exactly once when the Disposable is disposed.
+     * Construct a {@code Disposable} by wrapping a {@link Action} that is
+     * executed exactly once when the {@code Disposable} is disposed.
      * @param run the Action to wrap
      * @return the new Disposable instance
      */
@@ -59,10 +59,13 @@ public static Disposable fromAction(@NonNull Action run) {
     }
 
     /**
-     * Construct a Disposable by wrapping a Future that is
-     * cancelled exactly once when the Disposable is disposed.
+     * Construct a {@code Disposable} by wrapping a {@link Future} that is
+     * cancelled exactly once when the {@code Disposable} is disposed.
+     * <p>
+     * The {@code Future} is cancelled with {@code mayInterruptIfRunning == true}.
      * @param future the Future to wrap
      * @return the new Disposable instance
+     * @see #fromFuture(Future, boolean)
      */
     @NonNull
     public static Disposable fromFuture(@NonNull Future<?> future) {
@@ -71,10 +74,10 @@ public static Disposable fromFuture(@NonNull Future<?> future) {
     }
 
     /**
-     * Construct a Disposable by wrapping a Future that is
-     * cancelled exactly once when the Disposable is disposed.
+     * Construct a {@code Disposable} by wrapping a {@link Future} that is
+     * cancelled exactly once when the {@code Disposable} is disposed.
      * @param future the Future to wrap
-     * @param allowInterrupt if true, the future cancel happens via Future.cancel(true)
+     * @param allowInterrupt if true, the future cancel happens via {@code Future.cancel(true)}
      * @return the new Disposable instance
      */
     @NonNull
@@ -84,8 +87,8 @@ public static Disposable fromFuture(@NonNull Future<?> future, boolean allowInte
     }
 
     /**
-     * Construct a Disposable by wrapping a Subscription that is
-     * cancelled exactly once when the Disposable is disposed.
+     * Construct a {@code Disposable} by wrapping a {@link Subscription} that is
+     * cancelled exactly once when the {@code Disposable} is disposed.
      * @param subscription the Runnable to wrap
      * @return the new Disposable instance
      */
@@ -96,8 +99,33 @@ public static Disposable fromSubscription(@NonNull Subscription subscription) {
     }
 
     /**
-     * Returns a new, non-disposed Disposable instance.
-     * @return a new, non-disposed Disposable instance
+     * Construct a {@code Disposable} by wrapping an {@link AutoCloseable} that is
+     * closed exactly once when the {@code Disposable} is disposed.
+     * @param autoCloseable the AutoCloseable to wrap
+     * @return the new Disposable instance
+     * @since 3.0.0
+     */
+    @NonNull
+    public static Disposable fromAutoCloseable(@NonNull AutoCloseable autoCloseable) {
+        Objects.requireNonNull(autoCloseable, "autoCloseable is null");
+        return new AutoCloseableDisposable(autoCloseable);
+    }
+
+    /**
+     * Construct an {@link AutoCloseable} by wrapping a {@code Disposable} that is
+     * disposed when the returned {@code AutoCloseable} is closed.
+     * @param disposable the Disposable instance
+     * @return the new AutoCloseable instance
+     * @since 3.0.0
+     */
+    @NonNull
+    public static AutoCloseable toAutoCloseable(@NonNull Disposable disposable) {
+        return disposable::dispose;
+    }
+
+    /**
+     * Returns a new, non-disposed {@code Disposable} instance.
+     * @return a new, non-disposed {@code Disposable} instance
      */
     @NonNull
     public static Disposable empty() {
@@ -105,8 +133,8 @@ public static Disposable empty() {
     }
 
     /**
-     * Returns a disposed Disposable instance.
-     * @return a disposed Disposable instance
+     * Returns a shared, disposed {@code Disposable} instance.
+     * @return a shared, disposed {@code Disposable} instance
      */
     @NonNull
     public static Disposable disposed() {
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java
index 0a900f6ed1..9649bcd7d3 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java
@@ -16,7 +16,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
- * A Disposable container that cancels a Future instance.
+ * A Disposable container that cancels a {@link Future} instance.
  */
 final class FutureDisposable extends AtomicReference<Future<?>> implements Disposable {
 
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java
index 43eee3105c..34203e86a9 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java
@@ -15,7 +15,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * A disposable container that manages a Runnable instance.
+ * A disposable container that manages a {@link Runnable} instance.
  */
 final class RunnableDisposable extends ReferenceDisposable<Runnable> {
 
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java b/src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java
index d5ea5d0d49..244ca873f0 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java
@@ -25,6 +25,7 @@
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Action;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -34,11 +35,19 @@ public class DisposablesTest extends RxJavaTest {
 
     @Test
     public void unsubscribeOnlyOnce() {
-        Runnable dispose = mock(Runnable.class);
-        Disposable subscription = Disposables.fromRunnable(dispose);
-        subscription.dispose();
-        subscription.dispose();
-        verify(dispose, times(1)).run();
+        Runnable run = mock(Runnable.class);
+
+        Disposable d = Disposables.fromRunnable(run);
+
+        assertTrue(d.toString(), d.toString().contains("RunnableDisposable(disposed=false, "));
+
+        d.dispose();
+        assertTrue(d.toString(), d.toString().contains("RunnableDisposable(disposed=true, "));
+
+        d.dispose();
+        assertTrue(d.toString(), d.toString().contains("RunnableDisposable(disposed=true, "));
+
+        verify(run, times(1)).run();
     }
 
     @Test
@@ -61,22 +70,20 @@ public void utilityClass() {
     }
 
     @Test
-    public void fromAction() {
-        class AtomicAction extends AtomicBoolean implements Action {
+    public void fromAction() throws Throwable {
+        Action action = mock(Action.class);
 
-            private static final long serialVersionUID = -1517510584253657229L;
+        Disposable d = Disposables.fromAction(action);
 
-            @Override
-            public void run() throws Exception {
-                set(true);
-            }
-        }
+        assertTrue(d.toString(), d.toString().contains("ActionDisposable(disposed=false, "));
 
-        AtomicAction aa = new AtomicAction();
+        d.dispose();
+        assertTrue(d.toString(), d.toString().contains("ActionDisposable(disposed=true, "));
 
-        Disposables.fromAction(aa).dispose();
+        d.dispose();
+        assertTrue(d.toString(), d.toString().contains("ActionDisposable(disposed=true, "));
 
-        assertTrue(aa.get());
+        verify(action, times(1)).run();
     }
 
     @Test
@@ -174,4 +181,76 @@ public void setOnceTwice() {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void fromAutoCloseable() {
+        AtomicInteger counter = new AtomicInteger();
+
+        AutoCloseable ac = () -> counter.getAndIncrement();
+
+        Disposable d = Disposables.fromAutoCloseable(ac);
+
+        assertFalse(d.isDisposed());
+        assertEquals(0, counter.get());
+        assertTrue(d.toString(), d.toString().contains("AutoCloseableDisposable(disposed=false, "));
+
+        d.dispose();
+
+        assertTrue(d.isDisposed());
+        assertEquals(1, counter.get());
+        assertTrue(d.toString(), d.toString().contains("AutoCloseableDisposable(disposed=true, "));
+
+        d.dispose();
+
+        assertTrue(d.isDisposed());
+        assertEquals(1, counter.get());
+        assertTrue(d.toString(), d.toString().contains("AutoCloseableDisposable(disposed=true, "));
+    }
+
+    @Test
+    public void fromAutoCloseableThrows() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            AutoCloseable ac = () -> { throw new TestException(); };
+
+            Disposable d = Disposables.fromAutoCloseable(ac);
+
+            assertFalse(d.isDisposed());
+
+            assertTrue(errors.isEmpty());
+
+            d.dispose();
+
+            assertTrue(d.isDisposed());
+            assertEquals(1, errors.size());
+
+            d.dispose();
+
+            assertTrue(d.isDisposed());
+            assertEquals(1, errors.size());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void toAutoCloseable() throws Exception {
+        AtomicInteger counter = new AtomicInteger();
+
+        Disposable d = Disposables.fromAction(() -> counter.getAndIncrement());
+
+        AutoCloseable ac = Disposables.toAutoCloseable(d);
+
+        assertFalse(d.isDisposed());
+        assertEquals(0, counter.get());
+
+        ac.close();
+
+        assertTrue(d.isDisposed());
+        assertEquals(1, counter.get());
+
+        ac.close();
+
+        assertTrue(d.isDisposed());
+        assertEquals(1, counter.get());
+    }
 }

From a249f4f1241f1c0ebe8e03dc80bdd16e29962c53 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 19 Dec 2019 18:37:58 +0100
Subject: [PATCH 012/665] 3.x: [Java 8] Add blockingStream & flatMapStream to
 Flowable (#6779)

---
 .../io/reactivex/rxjava3/core/Flowable.java   | 285 +++++++++++
 .../internal/jdk8/FlowableFlatMapStream.java  | 332 +++++++++++++
 .../internal/jdk8/FlowableFromStream.java     |  10 +
 .../internal/jdk8/FlatMapStream0HTckTest.java |  40 ++
 .../internal/jdk8/FlatMapStream0TckTest.java  |  40 ++
 .../internal/jdk8/FlatMapStream1HTckTest.java |  40 ++
 .../internal/jdk8/FlatMapStream1TckTest.java  |  40 ++
 .../internal/jdk8/FlatMapStream2HTckTest.java |  47 ++
 .../internal/jdk8/FlatMapStream2TckTest.java  |  47 ++
 .../jdk8/FlowableBlockingStreamTest.java      | 107 +++++
 .../jdk8/FlowableFlatMapStreamTest.java       | 451 ++++++++++++++++++
 .../rxjava3/testsupport/TestHelper.java       |  22 +
 12 files changed, 1461 insertions(+)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0HTckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0TckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1HTckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1TckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2HTckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2TckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableBlockingStreamTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 4177a2d9e6..09cb859b83 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -18997,4 +18997,289 @@ public final CompletionStage<T> singleOrErrorStage() {
     public final CompletionStage<T> lastOrErrorStage() {
         return subscribeWith(new FlowableLastStageSubscriber<>(false, null));
     }
+
+    /**
+     * Creates a sequential {@link Stream} to consume or process this {@code Flowable} in a blocking manner via
+     * the Java {@code Stream} API.
+     * <p>
+     * <img width="640" height="446" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingStream.f.png" alt="">
+     * <p>
+     * Cancellation of the upstream is done via {@link Stream#close()}, therefore, it is strongly recommended the
+     * consumption is performed within a try-with-resources construct:
+     * <pre><code>
+     * Flowable&lt;Integer&gt; source = Flowable.range(1, 10)
+     *        .subscribeOn(Schedulers.computation());
+     *
+     * try (Stream&lt;Integer&gt; stream = source.blockingStream()) {
+     *     stream.limit(3).forEach(System.out::println);
+     * }
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator requests {@link #bufferSize()} amount upfront and 75% of it after each 75% of the amount received.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @return the new Stream instance
+     * @since 3.0.0
+     * @see #blockingStream(int)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Stream<T> blockingStream() {
+        return blockingStream(bufferSize());
+    }
+
+    /**
+     * Creates a sequential {@link Stream} to consume or process this {@code Flowable} in a blocking manner via
+     * the Java {@code Stream} API.
+     * <p>
+     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingStream.fi.png" alt="">
+     * <p>
+     * Cancellation of the upstream is done via {@link Stream#close()}, therefore, it is strongly recommended the
+     * consumption is performed within a try-with-resources construct:
+     * <pre><code>
+     * Flowable&lt;Integer&gt; source = Flowable.range(1, 10)
+     *        .subscribeOn(Schedulers.computation());
+     *
+     * try (Stream&lt;Integer&gt; stream = source.blockingStream(4)) {
+     *     stream.limit(3).forEach(System.out::println);
+     * }
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator requests the given {@code prefetch} amount upfront and 75% of it after each 75% of the amount received.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param prefetch the number of items to request from the upstream to limit the number of
+     * in-flight items and item generation.
+     * @return the new Stream instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Stream<T> blockingStream(int prefetch) {
+        Iterator<T> iterator = blockingIterable(prefetch).iterator();
+        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, 0), false)
+                .onClose(() -> ((Disposable)iterator).dispose());
+    }
+
+    /**
+     * Maps each upstream item into a {@link Stream} and emits the {@code Stream}'s items to the downstream in a sequential fashion.
+     * <p>
+     * <img width="640" height="327" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapStream.f.png" alt="">
+     * <p>
+     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
+     * {@code concatMapStream} are identical operators and are provided as aliases.
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #concatMapIterable(Function)}:
+     * <pre><code>
+     * source.concatMapIterable(v -&gt; createStream(v)::iterator);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.concatMapStream(v -&gt; IntStream.rangeClosed(v + 1, v + 10).boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the downstream backpressure and consumes the inner stream only on demand. The operator
+     *  prefetches {@link #bufferSize} items of the upstream (then 75% of it after the 75% received)
+     *  and caches them until they are ready to be mapped into {@code Stream}s
+     *  after the current {@code Stream} has been consumed.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatMapStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the element type of the {@code Stream}s and the result
+     * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
+     * will be emitted to the downstream
+     * @return the new Flowable instance
+     * @see #concatMap(Function)
+     * @see #concatMapIterable(Function)
+     * @see #concatMapStream(Function, int)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+        return flatMapStream(mapper, bufferSize());
+    }
+
+    /**
+     * Maps each upstream item into a {@link Stream} and emits the {@code Stream}'s items to the downstream in a sequential fashion.
+     * <p>
+     * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapStream.fi.png" alt="">
+     * <p>
+     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
+     * {@code concatMapStream} are identical operators and are provided as aliases.
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #concatMapIterable(Function, int)}:
+     * <pre><code>
+     * source.concatMapIterable(v -&gt; createStream(v)::iterator, 32);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.concatMapStream(v -&gt; IntStream.rangeClosed(v + 1, v + 10).boxed(), 32);
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the downstream backpressure and consumes the inner stream only on demand. The operator
+     *  prefetches the given amount of upstream items and caches them until they are ready to be mapped into {@code Stream}s
+     *  after the current {@code Stream} has been consumed.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatMapStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the element type of the {@code Stream}s and the result
+     * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
+     * will be emitted to the downstream
+     * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
+     * @return the new Flowable instance
+     * @see #concatMap(Function, int)
+     * @see #concatMapIterable(Function, int)
+     * @see #flatMapStream(Function, int)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper, int prefetch) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        ObjectHelper.verifyPositive(prefetch, "prefetch");
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapStream<>(this, mapper, prefetch));
+    }
+
+    /**
+     * Maps each upstream item into a {@link Stream} and emits the {@code Stream}'s items to the downstream in a sequential fashion.
+     * <p>
+     * <img width="640" height="328" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.f.png" alt="">
+     * <p>
+     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
+     * {@code concatMapStream} are identical operators and are provided as aliases.
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function)}:
+     * <pre><code>
+     * source.flatMapIterable(v -&gt; createStream(v)::iterator);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.flatMapStream(v -&gt; IntStream.rangeClosed(v + 1, v + 10).boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the downstream backpressure and consumes the inner stream only on demand. The operator
+     *  prefetches {@link #bufferSize} items of the upstream (then 75% of it after the 75% received)
+     *  and caches them until they are ready to be mapped into {@code Stream}s
+     *  after the current {@code Stream} has been consumed.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMapStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the element type of the {@code Stream}s and the result
+     * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
+     * will be emitted to the downstream
+     * @return the new Flowable instance
+     * @see #flatMap(Function)
+     * @see #flatMapIterable(Function)
+     * @see #flatMapStream(Function, int)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+        return flatMapStream(mapper, bufferSize());
+    }
+
+    /**
+     * Maps each upstream item into a {@link Stream} and emits the {@code Stream}'s items to the downstream in a sequential fashion.
+     * <p>
+     * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.fi.png" alt="">
+     * <p>
+     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
+     * {@code concatMapStream} are identical operators and are provided as aliases.
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function, int)}:
+     * <pre><code>
+     * source.flatMapIterable(v -&gt; createStream(v)::iterator, 32);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.flatMapStream(v -&gt; IntStream.rangeClosed(v + 1, v + 10).boxed(), 32);
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the downstream backpressure and consumes the inner stream only on demand. The operator
+     *  prefetches the given amount of upstream items and caches them until they are ready to be mapped into {@code Stream}s
+     *  after the current {@code Stream} has been consumed.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMapStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the element type of the {@code Stream}s and the result
+     * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
+     * will be emitted to the downstream
+     * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
+     * @return the new Flowable instance
+     * @see #flatMap(Function, int)
+     * @see #flatMapIterable(Function, int)
+     * @see #concatMapStream(Function, int)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper, int prefetch) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        ObjectHelper.verifyPositive(prefetch, "prefetch");
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapStream<>(this, mapper, prefetch));
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
new file mode 100644
index 0000000000..ad1b3ad140
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
@@ -0,0 +1,332 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+import java.util.concurrent.atomic.*;
+import java.util.stream.Stream;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Maps the upstream values onto {@link Stream}s and emits their items in order to the downstream.
+ *
+ * @param <T> the upstream element type
+ * @param <R> the inner {@code Stream} and result element type
+ * @since 3.0.0
+ */
+public final class FlowableFlatMapStream<T, R> extends Flowable<R> {
+
+    final Flowable<T> source;
+
+    final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+    final int prefetch;
+
+    public FlowableFlatMapStream(Flowable<T> source, Function<? super T, ? extends Stream<? extends R>> mapper, int prefetch) {
+        this.source = source;
+        this.mapper = mapper;
+        this.prefetch = prefetch;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super R> s) {
+        if (source instanceof Supplier) {
+            Stream<? extends R> stream = null;
+            try {
+                @SuppressWarnings("unchecked")
+                T t = ((Supplier<T>)source).get();
+                if (t != null) {
+                    stream = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Stream");
+                }
+            } catch (Throwable ex) {
+                EmptySubscription.error(ex, s);
+                return;
+            }
+
+            if (stream != null) {
+                FlowableFromStream.subscribeStream(s, stream);
+            } else {
+                EmptySubscription.complete(s);
+            }
+        } else {
+            source.subscribe(new FlatMapStreamSubscriber<>(s, mapper, prefetch));
+        }
+    }
+
+    static final class FlatMapStreamSubscriber<T, R> extends AtomicInteger
+    implements FlowableSubscriber<T>, Subscription {
+
+        private static final long serialVersionUID = -5127032662980523968L;
+
+        final Subscriber<? super R> downstream;
+
+        final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+        final int prefetch;
+
+        final AtomicLong requested;
+
+        SimpleQueue<T> queue;
+
+        Subscription upstream;
+
+        Iterator<? extends R> currentIterator;
+
+        AutoCloseable currentCloseable;
+
+        volatile boolean cancelled;
+
+        volatile boolean upstreamDone;
+        final AtomicThrowable error;
+
+        long emitted;
+
+        int consumed;
+
+        int sourceMode;
+
+        FlatMapStreamSubscriber(Subscriber<? super R> downstream, Function<? super T, ? extends Stream<? extends R>> mapper, int prefetch) {
+            this.downstream = downstream;
+            this.mapper = mapper;
+            this.prefetch = prefetch;
+            this.requested = new AtomicLong();
+            this.error = new AtomicThrowable();
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Subscription s) {
+            if (SubscriptionHelper.validate(this.upstream, s)) {
+                this.upstream = s;
+
+                if (s instanceof QueueSubscription) {
+
+                    @SuppressWarnings("unchecked")
+                    QueueSubscription<T> qs = (QueueSubscription<T>)s;
+
+                    int m = qs.requestFusion(QueueFuseable.ANY | QueueFuseable.BOUNDARY);
+                    if (m == QueueFuseable.SYNC) {
+                        sourceMode = m;
+                        queue = qs;
+                        upstreamDone = true;
+
+                        downstream.onSubscribe(this);
+                        return;
+                    }
+                    else if (m == QueueFuseable.ASYNC) {
+                        sourceMode = m;
+                        queue = qs;
+
+                        downstream.onSubscribe(this);
+
+                        s.request(prefetch);
+                        return;
+                    }
+                }
+
+                queue = new SpscArrayQueue<>(prefetch);
+
+                downstream.onSubscribe(this);
+
+                s.request(prefetch);
+            }
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (sourceMode != QueueFuseable.ASYNC) {
+                if (!queue.offer(t)) {
+                    upstream.cancel();
+                    onError(new MissingBackpressureException("Queue full?!"));
+                    return;
+                }
+            }
+            drain();
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (error.compareAndSet(null, t)) {
+                upstreamDone = true;
+                drain();
+            } else {
+                RxJavaPlugins.onError(t);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            upstreamDone = true;
+            drain();
+        }
+
+        @Override
+        public void request(long n) {
+            if (SubscriptionHelper.validate(n)) {
+                BackpressureHelper.add(requested, n);
+                drain();
+            }
+        }
+
+        @Override
+        public void cancel() {
+            cancelled = true;
+            upstream.cancel();
+            drain();
+        }
+
+        void drain() {
+            if (getAndIncrement() != 0) {
+                return;
+            }
+
+            int missed = 1;
+
+            final Subscriber<? super R> downstream = this.downstream;
+            final SimpleQueue<T> queue = this.queue;
+            final AtomicThrowable error = this.error;
+            Iterator<? extends R> iterator = this.currentIterator;
+            long requested = this.requested.get();
+            long emitted = this.emitted;
+            final int limit = prefetch - (prefetch >> 2);
+            boolean canRequest = sourceMode != QueueFuseable.SYNC;
+
+            for (;;) {
+                if (cancelled) {
+                    queue.clear();
+                    clearCurrentSuppressCloseError();
+                } else {
+                    boolean isDone = upstreamDone;
+                    if (error.get() != null) {
+                        downstream.onError(error.get());
+                        cancelled = true;
+                        continue;
+                    }
+
+                    if (iterator == null) {
+                        T t;
+
+                        try {
+                            t = queue.poll();
+                        } catch (Throwable ex) {
+                            trySignalError(downstream, ex);
+                            continue;
+                        }
+
+                        boolean isEmpty = t == null;
+
+                        if (isDone && isEmpty) {
+                            downstream.onComplete();
+                            cancelled = true;
+                        }
+                        else if (!isEmpty) {
+                            if (canRequest && ++consumed == limit) {
+                                consumed = 0;
+                                upstream.request(limit);
+                            }
+
+                            Stream<? extends R> stream;
+                            try {
+                                stream = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Stream");
+                                iterator = stream.iterator();
+
+                                if (iterator.hasNext()) {
+                                    currentIterator = iterator;
+                                    currentCloseable = stream;
+                                } else {
+                                    iterator = null;
+                                }
+                            } catch (Throwable ex) {
+                                trySignalError(downstream, ex);
+                            }
+                            continue;
+                        }
+                    }
+                    if (iterator != null && emitted != requested) {
+                        R item;
+
+                        try {
+                            item = Objects.requireNonNull(iterator.next(), "The Stream.Iterator returned a null value");
+                        } catch (Throwable ex) {
+                            trySignalError(downstream, ex);
+                            continue;
+                        }
+
+                        if (!cancelled) {
+                            downstream.onNext(item);
+                            emitted++;
+
+                            if (!cancelled) {
+                                try {
+                                    if (!iterator.hasNext()) {
+                                        iterator = null;
+                                        clearCurrentRethrowCloseError();
+                                    }
+                                } catch (Throwable ex) {
+                                    trySignalError(downstream, ex);
+                                }
+                            }
+                        }
+
+                        continue;
+                    }
+                }
+
+                this.emitted = emitted;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    break;
+                }
+                requested = this.requested.get();
+            }
+        }
+
+        void clearCurrentRethrowCloseError() throws Throwable {
+            currentIterator = null;
+            AutoCloseable ac = currentCloseable;
+            currentCloseable = null;
+            if (ac != null) {
+                ac.close();
+            }
+        }
+
+        void clearCurrentSuppressCloseError() {
+            try {
+                clearCurrentRethrowCloseError();
+            } catch (Throwable ex) {
+                RxJavaPlugins.onError(ex);
+            }
+        }
+
+        void trySignalError(Subscriber<?> downstream, Throwable ex) {
+            if (error.compareAndSet(null, ex)) {
+                upstream.cancel();
+                cancelled = true;
+                downstream.onError(ex);
+            } else {
+                RxJavaPlugins.onError(ex);
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
index 0f4e4b16ba..ecc18fb154 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
@@ -42,6 +42,16 @@ public FlowableFromStream(Stream<T> stream) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
+        subscribeStream(s, stream);
+    }
+
+    /**
+     * Subscribes to the Stream by picking the normal or conditional stream Subscription implementation.
+     * @param <T> the element type of the flow
+     * @param s the subscriber to drive
+     * @param stream the sequence to consume
+     */
+    public static <T> void subscribeStream(Subscriber<? super T> s, Stream<T> stream) {
         Iterator<T> iterator;
         try {
             iterator = stream.iterator();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0HTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0HTckTest.java
new file mode 100644
index 0000000000..57365f5857
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0HTckTest.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class FlatMapStream0HTckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        return
+                Flowable.just(1).hide().flatMapStream(v -> IntStream.range(0, (int)elements).boxed())
+            ;
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        Stream<Integer> stream = Stream.of(1);
+        stream.forEach(v -> { });
+        return Flowable.just(1).hide().flatMapStream(v -> stream);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0TckTest.java
new file mode 100644
index 0000000000..232ded7321
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0TckTest.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class FlatMapStream0TckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        return
+                Flowable.just(1).flatMapStream(v -> IntStream.range(0, (int)elements).boxed())
+            ;
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        Stream<Integer> stream = Stream.of(1);
+        stream.forEach(v -> { });
+        return Flowable.just(1).flatMapStream(v -> stream);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1HTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1HTckTest.java
new file mode 100644
index 0000000000..aa65a19ca7
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1HTckTest.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class FlatMapStream1HTckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        return
+                Flowable.range(1, (int)elements).hide().flatMapStream(v -> Stream.of(v))
+            ;
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        Stream<Integer> stream = Stream.of(1);
+        stream.forEach(v -> { });
+        return Flowable.just(1).hide().flatMapStream(v -> stream);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1TckTest.java
new file mode 100644
index 0000000000..20e99b1ec1
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1TckTest.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class FlatMapStream1TckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        return
+                Flowable.range(1, (int)elements).flatMapStream(v -> Stream.of(v))
+            ;
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        Stream<Integer> stream = Stream.of(1);
+        stream.forEach(v -> { });
+        return Flowable.just(1).flatMapStream(v -> stream);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2HTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2HTckTest.java
new file mode 100644
index 0000000000..0c06e4de40
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2HTckTest.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class FlatMapStream2HTckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        if (elements % 2 == 0) {
+            return Flowable.range(0, (int)elements / 2).hide().flatMapStream(v -> Stream.of(v, v + 1));
+        }
+        return
+                Flowable.range(-1, 1 + (int)elements / 2).hide().flatMapStream(v -> {
+                    if (v != -1) {
+                        return Stream.of(v, v + 1);
+                    }
+                    return Stream.of(v);
+                });
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        Stream<Integer> stream = Stream.of(1);
+        stream.forEach(v -> { });
+        return Flowable.just(1).hide().flatMapStream(v -> stream);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2TckTest.java
new file mode 100644
index 0000000000..d799a720c9
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2TckTest.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class FlatMapStream2TckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        if (elements % 2 == 0) {
+            return Flowable.range(0, (int)elements / 2).flatMapStream(v -> Stream.of(v, v + 1));
+        }
+        return
+                Flowable.range(-1, 1 + (int)elements / 2).flatMapStream(v -> {
+                    if (v != -1) {
+                        return Stream.of(v, v + 1);
+                    }
+                    return Stream.of(v);
+                });
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        Stream<Integer> stream = Stream.of(1);
+        stream.forEach(v -> { });
+        return Flowable.just(1).flatMapStream(v -> stream);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableBlockingStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableBlockingStreamTest.java
new file mode 100644
index 0000000000..2cf932f40e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableBlockingStreamTest.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.List;
+import java.util.stream.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
+public class FlowableBlockingStreamTest extends RxJavaTest {
+
+    @Test
+    public void empty() {
+        try (Stream<Integer> stream = Flowable.<Integer>empty().blockingStream()) {
+            assertEquals(0, stream.toArray().length);
+        }
+    }
+
+    @Test
+    public void just() {
+        try (Stream<Integer> stream = Flowable.just(1).blockingStream()) {
+            assertArrayEquals(new Integer[] { 1 }, stream.toArray(Integer[]::new));
+        }
+    }
+
+    @Test
+    public void range() {
+        try (Stream<Integer> stream = Flowable.range(1, 5).blockingStream()) {
+            assertArrayEquals(new Integer[] { 1, 2, 3, 4, 5 }, stream.toArray(Integer[]::new));
+        }
+    }
+
+    @Test
+    public void rangeBackpressured() {
+        try (Stream<Integer> stream = Flowable.range(1, 5).blockingStream(1)) {
+            assertArrayEquals(new Integer[] { 1, 2, 3, 4, 5 }, stream.toArray(Integer[]::new));
+        }
+    }
+
+    @Test
+    public void rangeAsyncBackpressured() {
+        try (Stream<Integer> stream = Flowable.range(1, 1000).subscribeOn(Schedulers.computation()).blockingStream()) {
+            List<Integer> list = stream.collect(Collectors.toList());
+
+            assertEquals(1000, list.size());
+            for (int i = 1; i <= 1000; i++) {
+                assertEquals(i, list.get(i - 1).intValue());
+            }
+        }
+    }
+
+    @Test
+    public void rangeAsyncBackpressured1() {
+        try (Stream<Integer> stream = Flowable.range(1, 1000).subscribeOn(Schedulers.computation()).blockingStream(1)) {
+            List<Integer> list = stream.collect(Collectors.toList());
+
+            assertEquals(1000, list.size());
+            for (int i = 1; i <= 1000; i++) {
+                assertEquals(i, list.get(i - 1).intValue());
+            }
+        }
+    }
+
+    @Test
+    public void error() {
+        try (Stream<Integer> stream = Flowable.<Integer>error(new TestException()).blockingStream()) {
+            stream.toArray(Integer[]::new);
+            fail("Should have thrown!");
+        } catch (TestException expected) {
+            // expected
+        }
+    }
+
+    @Test
+    public void close() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        up.onNext(1);
+        up.onNext(2);
+        up.onNext(3);
+        up.onNext(4);
+        up.onNext(5);
+
+        try (Stream<Integer> stream = up.blockingStream()) {
+            assertArrayEquals(new Integer[] { 1, 2, 3 }, stream.limit(3).toArray(Integer[]::new));
+        }
+
+        assertFalse(up.hasSubscribers());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java
new file mode 100644
index 0000000000..548a66a709
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java
@@ -0,0 +1,451 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.*;
+
+import org.junit.Test;
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class FlowableFlatMapStreamTest extends RxJavaTest {
+
+    @Test
+    public void empty() {
+        Flowable.empty()
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void emptyHidden() {
+        Flowable.empty()
+        .hide()
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void just() {
+        Flowable.just(1)
+        .flatMapStream(v -> Stream.of(v + 1, v + 2, v + 3, v + 4, v + 5))
+        .test()
+        .assertResult(2, 3, 4, 5, 6);
+    }
+
+    @Test
+    public void justHidden() {
+        Flowable.just(1).hide()
+        .flatMapStream(v -> Stream.of(v + 1, v + 2, v + 3, v + 4, v + 5))
+        .test()
+        .assertResult(2, 3, 4, 5, 6);
+    }
+
+    @Test
+    public void error() {
+        Flowable.error(new TestException())
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void supplierFusedError() {
+        Flowable.fromCallable(() -> { throw new TestException(); })
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void errorHidden() {
+        Flowable.error(new TestException())
+        .hide()
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void range() {
+        Flowable.range(1, 5)
+        .flatMapStream(v -> IntStream.range(v * 10, v * 10 + 5).boxed())
+        .test()
+        .assertResult(
+                10, 11, 12, 13, 14,
+                20, 21, 22, 23, 24,
+                30, 31, 32, 33, 34,
+                40, 41, 42, 43, 44,
+                50, 51, 52, 53, 54
+        );
+    }
+
+    @Test
+    public void rangeHidden() {
+        Flowable.range(1, 5)
+        .hide()
+        .flatMapStream(v -> IntStream.range(v * 10, v * 10 + 5).boxed())
+        .test()
+        .assertResult(
+                10, 11, 12, 13, 14,
+                20, 21, 22, 23, 24,
+                30, 31, 32, 33, 34,
+                40, 41, 42, 43, 44,
+                50, 51, 52, 53, 54
+        );
+    }
+
+    @Test
+    public void rangeToEmpty() {
+        Flowable.range(1, 5)
+        .flatMapStream(v -> Stream.of())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void rangeTake() {
+        Flowable.range(1, 5)
+        .flatMapStream(v -> IntStream.range(v * 10, v * 10 + 5).boxed())
+        .take(12)
+        .test()
+        .assertResult(
+                10, 11, 12, 13, 14,
+                20, 21, 22, 23, 24,
+                30, 31
+        );
+    }
+
+    @Test
+    public void rangeTakeHidden() {
+        Flowable.range(1, 5)
+        .hide()
+        .flatMapStream(v -> IntStream.range(v * 10, v * 10 + 5).boxed())
+        .take(12)
+        .test()
+        .assertResult(
+                10, 11, 12, 13, 14,
+                20, 21, 22, 23, 24,
+                30, 31
+        );
+    }
+
+    @Test
+    public void upstreamCancelled() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        AtomicInteger calls = new AtomicInteger();
+
+        TestSubscriber<Integer> ts = pp
+                .flatMapStream(v -> Stream.of(v + 1, v + 2).onClose(() -> calls.getAndIncrement()))
+                .test(1);
+
+        assertTrue(pp.hasSubscribers());
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(2);
+        ts.cancel();
+
+        assertFalse(pp.hasSubscribers());
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void upstreamCancelledCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            PublishProcessor<Integer> pp = PublishProcessor.create();
+
+            TestSubscriber<Integer> ts = pp
+                    .flatMapStream(v -> Stream.of(v + 1, v + 2).onClose(() -> { throw new TestException(); }))
+                    .test(1);
+
+            assertTrue(pp.hasSubscribers());
+
+            pp.onNext(1);
+
+            ts.assertValuesOnly(2);
+            ts.cancel();
+
+            assertFalse(pp.hasSubscribers());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void crossMap() {
+        Flowable.range(1, 1000)
+        .flatMapStream(v -> IntStream.range(v * 1000, v * 1000 + 1000).boxed())
+        .test()
+        .assertValueCount(1_000_000)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void crossMapHidden() {
+        Flowable.range(1, 1000)
+        .hide()
+        .flatMapStream(v -> IntStream.range(v * 1000, v * 1000 + 1000).boxed())
+        .test()
+        .assertValueCount(1_000_000)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void crossMapBackpressured() {
+        for (int n = 1; n < 2048; n *= 2) {
+            Flowable.range(1, 1000)
+            .flatMapStream(v -> IntStream.range(v * 1000, v * 1000 + 1000).boxed())
+            .rebatchRequests(n)
+            .test()
+            .withTag("rebatch: " + n)
+            .assertValueCount(1_000_000)
+            .assertNoErrors()
+            .assertComplete();
+        }
+    }
+
+    @Test
+    public void crossMapBackpressuredHidden() {
+        for (int n = 1; n < 2048; n *= 2) {
+            Flowable.range(1, 1000)
+            .hide()
+            .flatMapStream(v -> IntStream.range(v * 1000, v * 1000 + 1000).boxed())
+            .rebatchRequests(n)
+            .test()
+            .withTag("rebatch: " + n)
+            .assertValueCount(1_000_000)
+            .assertNoErrors()
+            .assertComplete();
+        }
+    }
+
+    @Test
+    public void onSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.flatMapStream(v -> Stream.of(1, 2)));
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(UnicastProcessor.create().flatMapStream(v -> Stream.of(1, 2)));
+    }
+
+    @Test
+    public void queueOverflow() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(Subscriber<? super Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onNext(2);
+                    s.onNext(3);
+                    s.onError(new TestException());
+                }
+            }
+            .flatMapStream(v -> Stream.of(1, 2), 1)
+            .test(0)
+            .assertFailure(MissingBackpressureException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void mapperThrows() {
+        Flowable.just(1).hide()
+        .concatMapStream(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mapperNull() {
+        Flowable.just(1).hide()
+        .concatMapStream(v -> null)
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void streamNull() {
+        Flowable.just(1).hide()
+        .concatMapStream(v -> Stream.of(1, null))
+        .test()
+        .assertFailure(NullPointerException.class, 1);
+    }
+
+    @Test
+    public void hasNextThrows() {
+        Flowable.just(1).hide()
+        .concatMapStream(v -> Stream.generate(() -> { throw new TestException(); }))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void hasNextThrowsLater() {
+        AtomicInteger counter = new AtomicInteger();
+        Flowable.just(1).hide()
+        .concatMapStream(v -> Stream.generate(() -> {
+            if (counter.getAndIncrement() == 0) {
+                return 1;
+            }
+            throw new TestException();
+        }))
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void mapperThrowsWhenUpstreamErrors() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            PublishProcessor<Integer> pp = PublishProcessor.create();
+
+            AtomicInteger counter = new AtomicInteger();
+
+            TestSubscriber<Integer> ts = pp.hide()
+            .concatMapStream(v -> {
+                if (counter.getAndIncrement() == 0) {
+                    return Stream.of(1, 2);
+                }
+                pp.onError(new IOException());
+                throw new TestException();
+            })
+            .test();
+
+            pp.onNext(1);
+            pp.onNext(2);
+
+            ts
+            .assertFailure(IOException.class, 1, 2);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void rangeBackpressured() {
+        Flowable.range(1, 5)
+        .hide()
+        .concatMapStream(v -> Stream.of(v), 1)
+        .test(0)
+        .assertEmpty()
+        .requestMore(5)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void cancelAfterIteratorNext() throws Exception {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                ts.cancel();
+                return 1;
+            }
+        });
+
+        Flowable.just(1)
+        .hide()
+        .concatMapStream(v -> stream)
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
+
+    @Test
+    public void asyncUpstreamFused() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+
+        TestSubscriber<Integer> ts = up.flatMapStream(v -> Stream.of(1, 2))
+        .test();
+
+        assertTrue(up.hasSubscribers());
+
+        up.onNext(1);
+
+        ts.assertValuesOnly(1, 2);
+
+        up.onComplete();
+
+        ts.assertResult(1, 2);
+    }
+
+    @Test
+    public void asyncUpstreamFusionBoundary() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+
+        TestSubscriber<Integer> ts = up
+                .map(v -> v + 1)
+                .flatMapStream(v -> Stream.of(1, 2))
+        .test();
+
+        assertTrue(up.hasSubscribers());
+
+        up.onNext(1);
+
+        ts.assertValuesOnly(1, 2);
+
+        up.onComplete();
+
+        ts.assertResult(1, 2);
+    }
+
+    @Test
+    public void fusedPollCrash() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+
+        TestSubscriber<Integer> ts = up
+                .map(v -> { throw new TestException(); })
+                .compose(TestHelper.flowableStripBoundary())
+                .flatMapStream(v -> Stream.of(1, 2))
+        .test();
+
+        assertTrue(up.hasSubscribers());
+
+        up.onNext(1);
+
+        assertFalse(up.hasSubscribers());
+
+        ts.assertFailure(TestException.class);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 865b31a082..f31475ae58 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -2987,6 +2987,17 @@ public void cancel() {
         }
     }
 
+    /**
+     * Strips the {@link QueueFuseable#BOUNDARY} mode flag when the downstream calls {@link QueueSubscription#requestFusion(int)}.
+     * <p>
+     * By default, many operators use {@link QueueFuseable#BOUNDARY} to indicate upstream side-effects
+     * should not leak over a fused boundary. However, some tests want to verify if {@link QueueSubscription#poll()} crashes
+     * are handled correctly and the most convenient way is to crash {@link Flowable#map} that won't fuse with {@code BOUNDARY}
+     * flag. This transformer strips this flag and thus allows the function of {@code map} to be executed as part of the
+     * {@code poll()} chain.
+     * @param <T> the element type of the flow
+     * @return the new Transformer instance
+     */
     public static <T> FlowableTransformer<T, T> flowableStripBoundary() {
         return new FlowableStripBoundary<>(null);
     }
@@ -3092,6 +3103,17 @@ public boolean isDisposed() {
         }
     }
 
+    /**
+     * Strips the {@link QueueFuseable#BOUNDARY} mode flag when the downstream calls {@link QueueDisposable#requestFusion(int)}.
+     * <p>
+     * By default, many operators use {@link QueueFuseable#BOUNDARY} to indicate upstream side-effects
+     * should not leak over a fused boundary. However, some tests want to verify if {@link QueueDisposable#poll()} crashes
+     * are handled correctly and the most convenient way is to crash {@link Observable#map} that won't fuse with {@code BOUNDARY}
+     * flag. This transformer strips this flag and thus allows the function of {@code map} to be executed as part of the
+     * {@code poll()} chain.
+     * @param <T> the element type of the flow
+     * @return the new Transformer instance
+     */
     public static <T> ObservableTransformer<T, T> observableStripBoundary() {
         return new ObservableStripBoundary<>(null);
     }

From 166c529eb165b473c9bff11e8fedbde6c471b005 Mon Sep 17 00:00:00 2001
From: Jake Wharton <jakew@google.com>
Date: Thu, 19 Dec 2019 13:39:40 -0500
Subject: [PATCH 013/665] Migrate Disposables static factories to Disposable
 interface (#6781)

---
 .../io/reactivex/rxjava3/core/Scheduler.java  |   4 +-
 .../rxjava3/disposables/Disposable.java       | 123 +++++++++++++++
 .../rxjava3/disposables/Disposables.java      | 143 ------------------
 .../rxjava3/disposables/SerialDisposable.java |   2 +-
 .../rxjava3/disposables/package-info.java     |   2 +-
 .../completable/CompletableFromAction.java    |   2 +-
 .../completable/CompletableFromCallable.java  |   2 +-
 .../completable/CompletableFromRunnable.java  |   2 +-
 .../completable/CompletableFromSupplier.java  |   2 +-
 .../internal/operators/maybe/MaybeError.java  |   4 +-
 .../operators/maybe/MaybeErrorCallable.java   |   4 +-
 .../operators/maybe/MaybeFromAction.java      |   2 +-
 .../operators/maybe/MaybeFromCallable.java    |   2 +-
 .../operators/maybe/MaybeFromFuture.java      |   2 +-
 .../operators/maybe/MaybeFromRunnable.java    |   2 +-
 .../operators/maybe/MaybeFromSupplier.java    |   2 +-
 .../internal/operators/maybe/MaybeJust.java   |   4 +-
 .../operators/single/SingleFromCallable.java  |   2 +-
 .../operators/single/SingleFromSupplier.java  |   2 +-
 .../internal/operators/single/SingleJust.java |   4 +-
 .../schedulers/ImmediateThinScheduler.java    |   2 +-
 .../internal/schedulers/SchedulerWhen.java    |  16 +-
 .../schedulers/TrampolineScheduler.java       |   2 +-
 .../rxjava3/schedulers/TestScheduler.java     |   4 +-
 .../rxjava3/completable/CompletableTest.java  |   2 +-
 .../disposables/CompositeDisposableTest.java  | 102 ++++++-------
 ...sposablesTest.java => DisposableTest.java} |  39 +++--
 .../disposables/FutureDisposableTest.java     |   4 +-
 .../disposables/SequentialDisposableTest.java |   2 +-
 .../disposables/SerialDisposableTests.java    |   4 +-
 .../ArrayCompositeDisposableTest.java         |  16 +-
 .../disposables/DisposableHelperTest.java     |  12 +-
 .../ListCompositeDisposableTest.java          |  42 ++---
 .../observers/BasicFuseableObserverTest.java  |   4 +-
 .../observers/BlockingFirstObserverTest.java  |   2 +-
 .../observers/BlockingMultiObserverTest.java  |   2 +-
 .../observers/DeferredScalarObserverTest.java |  36 ++---
 .../DisposableLambdaObserverTest.java         |   4 +-
 .../observers/FutureObserverTest.java         |   4 +-
 .../observers/LambdaObserverTest.java         |   6 +-
 .../observers/QueueDrainObserverTest.java     |  20 +--
 .../completable/CompletableAmbTest.java       |   4 +-
 .../completable/CompletableConcatTest.java    |   6 +-
 .../completable/CompletableCreateTest.java    |  12 +-
 .../completable/CompletableDetachTest.java    |   6 +-
 .../completable/CompletableDoOnTest.java      |   2 +-
 .../completable/CompletableMergeTest.java     |  10 +-
 .../completable/CompletableTakeUntilTest.java |  10 +-
 .../completable/CompletableTimeoutTest.java   |   2 +-
 .../CompletableToObservableTest.java          |   2 +-
 .../completable/CompletableUnsafeTest.java    |   4 +-
 .../completable/CompletableUsingTest.java     |   4 +-
 .../flowable/FlowableConcatTest.java          |   2 +-
 .../flowable/FlowableCreateTest.java          |  16 +-
 .../flowable/FlowableDoOnUnsubscribeTest.java |   4 +-
 .../flowable/FlowableElementAtTest.java       |   4 +-
 .../FlowableFlatMapCompletableTest.java       |   4 +-
 .../flowable/FlowableFlatMapMaybeTest.java    |   4 +-
 .../flowable/FlowableFlatMapSingleTest.java   |   4 +-
 .../flowable/FlowableObserveOnTest.java       |   2 +-
 .../flowable/FlowableRefCountTest.java        |  12 +-
 .../operators/flowable/FlowableUsingTest.java |   2 +-
 .../flowable/NotificationLiteTest.java        |   4 +-
 .../operators/maybe/MaybeAmbTest.java         |   4 +-
 .../maybe/MaybeCallbackObserverTest.java      |   8 +-
 .../operators/maybe/MaybeConcatArrayTest.java |   4 +-
 .../operators/maybe/MaybeCreateTest.java      |   6 +-
 .../operators/maybe/MaybeDetachTest.java      |   8 +-
 .../operators/maybe/MaybeDoOnEventTest.java   |   2 +-
 .../operators/maybe/MaybeMergeArrayTest.java  |   4 +-
 .../operators/maybe/MaybePeekTest.java        |   6 +-
 .../operators/maybe/MaybeUsingTest.java       |   4 +-
 .../mixed/FlowableConcatMapMaybeTest.java     |   4 +-
 .../mixed/FlowableConcatMapSingleTest.java    |   4 +-
 .../mixed/FlowableSwitchMapMaybeTest.java     |   4 +-
 .../mixed/FlowableSwitchMapSingleTest.java    |   4 +-
 .../mixed/ObservableConcatMapMaybeTest.java   |   8 +-
 .../mixed/ObservableConcatMapSingleTest.java  |   8 +-
 .../ObservableSwitchMapCompletableTest.java   |   4 +-
 .../mixed/ObservableSwitchMapMaybeTest.java   |   8 +-
 .../mixed/ObservableSwitchMapSingleTest.java  |   8 +-
 .../BlockingObservableNextTest.java           |   2 +-
 .../BlockingObservableToFutureTest.java       |   4 +-
 .../BlockingObservableToIteratorTest.java     |   2 +-
 .../internal/operators/observable/Burst.java  |   4 +-
 .../observable/ObservableAllTest.java         |   4 +-
 .../observable/ObservableAnyTest.java         |   6 +-
 .../observable/ObservableBlockingTest.java    |   4 +-
 .../observable/ObservableBufferTest.java      |  36 ++---
 .../observable/ObservableCacheTest.java       |   6 +-
 .../ObservableConcatMapCompletableTest.java   |   4 +-
 .../ObservableConcatMapSchedulerTest.java     |   6 +-
 .../observable/ObservableConcatMapTest.java   |   6 +-
 .../observable/ObservableConcatTest.java      |   8 +-
 .../ObservableConcatWithCompletableTest.java  |   6 +-
 .../ObservableConcatWithMaybeTest.java        |  10 +-
 .../ObservableConcatWithSingleTest.java       |  10 +-
 .../observable/ObservableCreateTest.java      |  20 +--
 .../observable/ObservableDebounceTest.java    |  16 +-
 .../ObservableDematerializeTest.java          |   6 +-
 .../observable/ObservableDistinctTest.java    |   2 +-
 .../ObservableDistinctUntilChangedTest.java   |   4 +-
 .../observable/ObservableDoOnEachTest.java    |  18 +--
 .../ObservableDoOnSubscribeTest.java          |   4 +-
 .../observable/ObservableElementAtTest.java   |   8 +-
 .../ObservableFlatMapCompletableTest.java     |   4 +-
 .../ObservableFlatMapMaybeTest.java           |   6 +-
 .../ObservableFlatMapSingleTest.java          |   6 +-
 .../observable/ObservableFlatMapTest.java     |   2 +-
 .../observable/ObservableGroupByTest.java     |  16 +-
 .../observable/ObservableJoinTest.java        |   6 +-
 .../ObservableMapNotificationTest.java        |   4 +-
 .../observable/ObservableMaterializeTest.java |   4 +-
 .../ObservableMergeDelayErrorTest.java        |  16 +-
 .../ObservableMergeMaxConcurrentTest.java     |   4 +-
 .../observable/ObservableMergeTest.java       |  18 +--
 .../ObservableMergeWithCompletableTest.java   |   2 +-
 .../ObservableMergeWithMaybeTest.java         |   4 +-
 .../ObservableMergeWithSingleTest.java        |   4 +-
 .../observable/ObservableObserveOnTest.java   |   4 +-
 .../ObservableOnErrorResumeNextTest.java      |   6 +-
 .../ObservableOnErrorReturnTest.java          |   4 +-
 .../observable/ObservablePublishTest.java     |   8 +-
 .../observable/ObservableReduceTest.java      |   6 +-
 .../observable/ObservableRefCountTest.java    |  30 ++--
 .../observable/ObservableRepeatTest.java      |   2 +-
 .../ObservableReplayEagerTruncateTest.java    |   8 +-
 .../observable/ObservableReplayTest.java      |   8 +-
 .../ObservableResourceWrapperTest.java        |   6 +-
 .../observable/ObservableRetryTest.java       |  16 +-
 .../ObservableRetryWithPredicateTest.java     |   8 +-
 .../observable/ObservableSampleTest.java      |   2 +-
 .../observable/ObservableScanTest.java        |   6 +-
 .../observable/ObservableSerializeTest.java   |   6 +-
 .../observable/ObservableSubscribeOnTest.java |   6 +-
 .../ObservableSwitchIfEmptyTest.java          |   4 +-
 .../observable/ObservableSwitchTest.java      |  56 +++----
 .../observable/ObservableTakeTest.java        |   8 +-
 .../ObservableTakeUntilPredicateTest.java     |   4 +-
 .../observable/ObservableTakeWhileTest.java   |   4 +-
 .../ObservableThrottleFirstTest.java          |   8 +-
 .../observable/ObservableTimeoutTests.java    |   6 +-
 .../ObservableTimeoutWithSelectorTest.java    |  18 +--
 .../observable/ObservableTimerTest.java       |   4 +-
 .../ObservableUnsubscribeOnTest.java          |   2 +-
 .../observable/ObservableUsingTest.java       |   6 +-
 .../ObservableWindowWithObservableTest.java   |  18 +--
 .../ObservableWindowWithSizeTest.java         |   2 +-
 ...vableWindowWithStartEndObservableTest.java |  10 +-
 .../ObservableWindowWithTimeTest.java         |   6 +-
 .../ObservableWithLatestFromTest.java         |   4 +-
 .../observable/ObservableZipIterableTest.java |   4 +-
 .../observable/ObservableZipTest.java         |   6 +-
 .../operators/single/SingleCreateTest.java    |  12 +-
 .../operators/single/SingleDelayTest.java     |   4 +-
 .../operators/single/SingleDetachTest.java    |   6 +-
 .../operators/single/SingleDoOnTest.java      |   2 +-
 .../operators/single/SingleMiscTest.java      |   4 +-
 .../operators/single/SingleUsingTest.java     |  26 ++--
 .../schedulers/DisposeOnCancelTest.java       |   2 +-
 .../schedulers/SchedulerWhenTest.java         |   8 +-
 .../schedulers/SingleSchedulerTest.java       |  12 +-
 .../subscribers/EmptyComponentTest.java       |   2 +-
 .../subscribers/QueueDrainSubscriberTest.java |  24 +--
 .../SubscriberResourceWrapperTest.java        |   6 +-
 .../internal/util/AtomicThrowableTest.java    |  32 ++--
 .../internal/util/BlockingHelperTest.java     |   4 +-
 .../internal/util/EndConsumerHelperTest.java  |  38 ++---
 .../util/HalfSerializerObserverTest.java      |  12 +-
 .../internal/util/NotificationLiteTest.java   |   2 +-
 .../internal/util/QueueDrainHelperTest.java   |  18 +--
 .../rxjava3/maybe/MaybeCreateTest.java        |  10 +-
 .../io/reactivex/rxjava3/maybe/MaybeTest.java |  10 +-
 .../rxjava3/observable/ObservableTest.java    |   8 +-
 .../DisposableCompletableObserverTest.java    |   6 +-
 .../DisposableMaybeObserverTest.java          |   6 +-
 .../observers/DisposableObserverTest.java     |   6 +-
 .../DisposableSingleObserverTest.java         |   6 +-
 .../ResourceCompletableObserverTest.java      |  12 +-
 .../observers/ResourceMaybeObserverTest.java  |  14 +-
 .../observers/ResourceObserverTest.java       |  12 +-
 .../observers/ResourceSingleObserverTest.java |  12 +-
 .../rxjava3/observers/SafeObserverTest.java   |  10 +-
 .../observers/SerializedObserverTest.java     |  32 ++--
 .../rxjava3/observers/TestObserverTest.java   |  52 +++----
 .../rxjava3/plugins/RxJavaPluginsTest.java    |   2 +-
 .../schedulers/CachedThreadSchedulerTest.java |   6 +-
 .../schedulers/ComputationSchedulerTests.java |  14 +-
 .../schedulers/NewThreadSchedulerTest.java    |   6 +-
 .../reactivex/rxjava3/single/SingleTest.java  |  16 +-
 .../rxjava3/subjects/AsyncSubjectTest.java    |   4 +-
 .../rxjava3/subjects/BehaviorSubjectTest.java |   4 +-
 .../subjects/CompletableSubjectTest.java      |   4 +-
 .../rxjava3/subjects/MaybeSubjectTest.java    |   4 +-
 .../ReplaySubjectBoundedConcurrencyTest.java  |   6 +-
 .../ReplaySubjectConcurrencyTest.java         |   6 +-
 .../rxjava3/subjects/ReplaySubjectTest.java   |   2 +-
 .../subjects/SerializedSubjectTest.java       |  10 +-
 .../rxjava3/subjects/SingleSubjectTest.java   |   4 +-
 .../rxjava3/subjects/UnicastSubjectTest.java  |   4 +-
 .../subscribers/ResourceSubscriberTest.java   |   6 +-
 .../rxjava3/testsupport/TestHelper.java       |  94 ++++++------
 .../testsupport/TestObserverExTest.java       |  52 +++----
 .../testsupport/TimesteppingScheduler.java    |   2 +-
 204 files changed, 1037 insertions(+), 1062 deletions(-)
 delete mode 100644 src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
 rename src/test/java/io/reactivex/rxjava3/disposables/{DisposablesTest.java => DisposableTest.java} (86%)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
index a300cb02ce..80eda093c4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
@@ -81,7 +81,7 @@
  * underlying task-execution scheme supports stopping and restarting itself.
  * <p>
  * If the {@code Scheduler} is shut down or a {@code Worker} is disposed, the {@code schedule} methods
- * should return the {@link io.reactivex.rxjava3.disposables.Disposables#disposed()} singleton instance indicating the shut down/disposed
+ * should return the {@link Disposable#disposed()} singleton instance indicating the shut down/disposed
  * state to the caller. Since the shutdown or dispose can happen from any thread, the {@code schedule} implementations
  * should make best effort to cancel tasks immediately after those tasks have been submitted to the
  * underlying task-execution scheme if the shutdown/dispose was detected after this submission.
@@ -349,7 +349,7 @@ public <S extends Scheduler & Disposable> S when(@NonNull Function<Flowable<Flow
      * re-adjust the absolute/relative time calculation accordingly.
      * <p>
      * If the {@code Worker} is disposed, the {@code schedule} methods
-     * should return the {@link io.reactivex.rxjava3.disposables.Disposables#disposed()} singleton instance indicating the disposed
+     * should return the {@link Disposable#disposed()} singleton instance indicating the disposed
      * state to the caller. Since the {@link #dispose()} call can happen on any thread, the {@code schedule} implementations
      * should make best effort to cancel tasks immediately after those tasks have been submitted to the
      * underlying task-execution scheme if the dispose was detected after this submission.
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
index 2fab6e83ed..0b77c28c84 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
@@ -12,6 +12,15 @@
  */
 package io.reactivex.rxjava3.disposables;
 
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import org.reactivestreams.Subscription;
+
+import java.util.Objects;
+import java.util.concurrent.Future;
+
 /**
  * Represents a disposable resource.
  */
@@ -26,4 +35,118 @@ public interface Disposable {
      * @return true if this resource has been disposed
      */
     boolean isDisposed();
+
+    /**
+     * Construct a {@code Disposable} by wrapping a {@link Runnable} that is
+     * executed exactly once when the {@code Disposable} is disposed.
+     * @param run the Runnable to wrap
+     * @return the new Disposable instance
+     * @since 3.0.0
+     */
+    @NonNull
+    static Disposable fromRunnable(@NonNull Runnable run) {
+        Objects.requireNonNull(run, "run is null");
+        return new RunnableDisposable(run);
+    }
+
+    /**
+     * Construct a {@code Disposable} by wrapping a {@link Action} that is
+     * executed exactly once when the {@code Disposable} is disposed.
+     * @param run the Action to wrap
+     * @return the new Disposable instance
+     * @since 3.0.0
+     */
+    @NonNull
+    static Disposable fromAction(@NonNull Action run) {
+        Objects.requireNonNull(run, "run is null");
+        return new ActionDisposable(run);
+    }
+
+    /**
+     * Construct a {@code Disposable} by wrapping a {@link Future} that is
+     * cancelled exactly once when the {@code Disposable} is disposed.
+     * <p>
+     * The {@code Future} is cancelled with {@code mayInterruptIfRunning == true}.
+     * @param future the Future to wrap
+     * @return the new Disposable instance
+     * @see #fromFuture(Future, boolean)
+     * @since 3.0.0
+     */
+    @NonNull
+    static Disposable fromFuture(@NonNull Future<?> future) {
+        Objects.requireNonNull(future, "future is null");
+        return fromFuture(future, true);
+    }
+
+    /**
+     * Construct a {@code Disposable} by wrapping a {@link Future} that is
+     * cancelled exactly once when the {@code Disposable} is disposed.
+     * @param future the Future to wrap
+     * @param allowInterrupt if true, the future cancel happens via {@code Future.cancel(true)}
+     * @return the new Disposable instance
+     * @since 3.0.0
+     */
+    @NonNull
+    static Disposable fromFuture(@NonNull Future<?> future, boolean allowInterrupt) {
+        Objects.requireNonNull(future, "future is null");
+        return new FutureDisposable(future, allowInterrupt);
+    }
+
+    /**
+     * Construct a {@code Disposable} by wrapping a {@link Subscription} that is
+     * cancelled exactly once when the {@code Disposable} is disposed.
+     * @param subscription the Runnable to wrap
+     * @return the new Disposable instance
+     * @since 3.0.0
+     */
+    @NonNull
+    static Disposable fromSubscription(@NonNull Subscription subscription) {
+        Objects.requireNonNull(subscription, "subscription is null");
+        return new SubscriptionDisposable(subscription);
+    }
+
+    /**
+     * Construct a {@code Disposable} by wrapping an {@link AutoCloseable} that is
+     * closed exactly once when the {@code Disposable} is disposed.
+     * @param autoCloseable the AutoCloseable to wrap
+     * @return the new Disposable instance
+     * @since 3.0.0
+     */
+    @NonNull
+    static Disposable fromAutoCloseable(@NonNull AutoCloseable autoCloseable) {
+        Objects.requireNonNull(autoCloseable, "autoCloseable is null");
+        return new AutoCloseableDisposable(autoCloseable);
+    }
+
+    /**
+     * Construct an {@link AutoCloseable} by wrapping a {@code Disposable} that is
+     * disposed when the returned {@code AutoCloseable} is closed.
+     * @param disposable the Disposable instance
+     * @return the new AutoCloseable instance
+     * @since 3.0.0
+     */
+    @NonNull
+    static AutoCloseable toAutoCloseable(@NonNull Disposable disposable) {
+        return disposable::dispose;
+    }
+
+    /**
+     * Returns a new, non-disposed {@code Disposable} instance.
+     * @return a new, non-disposed {@code Disposable} instance
+     * @since 3.0.0
+     */
+    @NonNull
+    static Disposable empty() {
+        return fromRunnable(Functions.EMPTY_RUNNABLE);
+    }
+
+    /**
+     * Returns a shared, disposed {@code Disposable} instance.
+     * @return a shared, disposed {@code Disposable} instance
+     * @since 3.0.0
+     */
+    @NonNull
+    static Disposable disposed() {
+        return EmptyDisposable.INSTANCE;
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
deleted file mode 100644
index 39b1b76b25..0000000000
--- a/src/main/java/io/reactivex/rxjava3/disposables/Disposables.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * Copyright (c) 2016-present, RxJava Contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
- * the License for the specific language governing permissions and limitations under the License.
- */
-
-package io.reactivex.rxjava3.disposables;
-
-import java.util.Objects;
-import java.util.concurrent.Future;
-
-import org.reactivestreams.Subscription;
-
-import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.functions.Action;
-import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.*;
-
-/**
- * Utility class to help create disposables by wrapping
- * other types.
- * @since 2.0
- */
-public final class Disposables {
-    /** Utility class. */
-    private Disposables() {
-        throw new IllegalStateException("No instances!");
-    }
-
-    /**
-     * Construct a {@code Disposable} by wrapping a {@link Runnable} that is
-     * executed exactly once when the {@code Disposable} is disposed.
-     * @param run the Runnable to wrap
-     * @return the new Disposable instance
-     */
-    @NonNull
-    public static Disposable fromRunnable(@NonNull Runnable run) {
-        Objects.requireNonNull(run, "run is null");
-        return new RunnableDisposable(run);
-    }
-
-    /**
-     * Construct a {@code Disposable} by wrapping a {@link Action} that is
-     * executed exactly once when the {@code Disposable} is disposed.
-     * @param run the Action to wrap
-     * @return the new Disposable instance
-     */
-    @NonNull
-    public static Disposable fromAction(@NonNull Action run) {
-        Objects.requireNonNull(run, "run is null");
-        return new ActionDisposable(run);
-    }
-
-    /**
-     * Construct a {@code Disposable} by wrapping a {@link Future} that is
-     * cancelled exactly once when the {@code Disposable} is disposed.
-     * <p>
-     * The {@code Future} is cancelled with {@code mayInterruptIfRunning == true}.
-     * @param future the Future to wrap
-     * @return the new Disposable instance
-     * @see #fromFuture(Future, boolean)
-     */
-    @NonNull
-    public static Disposable fromFuture(@NonNull Future<?> future) {
-        Objects.requireNonNull(future, "future is null");
-        return fromFuture(future, true);
-    }
-
-    /**
-     * Construct a {@code Disposable} by wrapping a {@link Future} that is
-     * cancelled exactly once when the {@code Disposable} is disposed.
-     * @param future the Future to wrap
-     * @param allowInterrupt if true, the future cancel happens via {@code Future.cancel(true)}
-     * @return the new Disposable instance
-     */
-    @NonNull
-    public static Disposable fromFuture(@NonNull Future<?> future, boolean allowInterrupt) {
-        Objects.requireNonNull(future, "future is null");
-        return new FutureDisposable(future, allowInterrupt);
-    }
-
-    /**
-     * Construct a {@code Disposable} by wrapping a {@link Subscription} that is
-     * cancelled exactly once when the {@code Disposable} is disposed.
-     * @param subscription the Runnable to wrap
-     * @return the new Disposable instance
-     */
-    @NonNull
-    public static Disposable fromSubscription(@NonNull Subscription subscription) {
-        Objects.requireNonNull(subscription, "subscription is null");
-        return new SubscriptionDisposable(subscription);
-    }
-
-    /**
-     * Construct a {@code Disposable} by wrapping an {@link AutoCloseable} that is
-     * closed exactly once when the {@code Disposable} is disposed.
-     * @param autoCloseable the AutoCloseable to wrap
-     * @return the new Disposable instance
-     * @since 3.0.0
-     */
-    @NonNull
-    public static Disposable fromAutoCloseable(@NonNull AutoCloseable autoCloseable) {
-        Objects.requireNonNull(autoCloseable, "autoCloseable is null");
-        return new AutoCloseableDisposable(autoCloseable);
-    }
-
-    /**
-     * Construct an {@link AutoCloseable} by wrapping a {@code Disposable} that is
-     * disposed when the returned {@code AutoCloseable} is closed.
-     * @param disposable the Disposable instance
-     * @return the new AutoCloseable instance
-     * @since 3.0.0
-     */
-    @NonNull
-    public static AutoCloseable toAutoCloseable(@NonNull Disposable disposable) {
-        return disposable::dispose;
-    }
-
-    /**
-     * Returns a new, non-disposed {@code Disposable} instance.
-     * @return a new, non-disposed {@code Disposable} instance
-     */
-    @NonNull
-    public static Disposable empty() {
-        return fromRunnable(Functions.EMPTY_RUNNABLE);
-    }
-
-    /**
-     * Returns a shared, disposed {@code Disposable} instance.
-     * @return a shared, disposed {@code Disposable} instance
-     */
-    @NonNull
-    public static Disposable disposed() {
-        return EmptyDisposable.INSTANCE;
-    }
-}
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java
index 187a94b1e5..d2c7ddee4b 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java
@@ -71,7 +71,7 @@ public boolean replace(@Nullable Disposable next) {
     public Disposable get() {
         Disposable d = resource.get();
         if (d == DisposableHelper.DISPOSED) {
-            return Disposables.disposed();
+            return Disposable.disposed();
         }
         return d;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/package-info.java b/src/main/java/io/reactivex/rxjava3/disposables/package-info.java
index 21b276e132..29812d0ab7 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/package-info.java
@@ -17,6 +17,6 @@
 /**
  * Default implementations for {@link io.reactivex.rxjava3.disposables.Disposable Disposable}-based resource management
  * ({@code Disposable} container types) and utility classes to construct
- * {@link io.reactivex.rxjava3.disposables.Disposables Disposables} from callbacks and other types.
+ * {@link io.reactivex.rxjava3.disposables.Disposable Disposables} from callbacks and other types.
  */
 package io.reactivex.rxjava3.disposables;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java
index 5ce4d43547..4cd7fb479c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java
@@ -29,7 +29,7 @@ public CompletableFromAction(Action run) {
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
         try {
             run.run();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java
index ac2c94c921..57764950df 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java
@@ -30,7 +30,7 @@ public CompletableFromCallable(Callable<?> callable) {
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
         try {
             callable.call();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java
index 3dc275e0e1..e94d650310 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java
@@ -28,7 +28,7 @@ public CompletableFromRunnable(Runnable runnable) {
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
         try {
             runnable.run();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java
index 5c6054306a..e3e29188a0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java
@@ -33,7 +33,7 @@ public CompletableFromSupplier(Supplier<?> supplier) {
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
         try {
             supplier.get();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java
index a850a27b6d..fc2f50066e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java
@@ -14,7 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * Signals a constant Throwable.
@@ -31,7 +31,7 @@ public MaybeError(Throwable error) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        observer.onSubscribe(Disposables.disposed());
+        observer.onSubscribe(Disposable.disposed());
         observer.onError(error);
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java
index f3b631ba36..20bb1e03a8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java
@@ -14,7 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
@@ -34,7 +34,7 @@ public MaybeErrorCallable(Supplier<? extends Throwable> errorSupplier) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        observer.onSubscribe(Disposables.disposed());
+        observer.onSubscribe(Disposable.disposed());
         Throwable ex;
 
         try {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java
index 8c29290deb..5bdf86f904 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java
@@ -34,7 +34,7 @@ public MaybeFromAction(Action action) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
 
         if (!d.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java
index 4d218eb1ad..088f2e14f0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java
@@ -36,7 +36,7 @@ public MaybeFromCallable(Callable<? extends T> callable) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
 
         if (!d.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java
index db6c87518e..5d4dbc0f0b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java
@@ -41,7 +41,7 @@ public MaybeFromFuture(Future<? extends T> future, long timeout, TimeUnit unit)
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
         if (!d.isDisposed()) {
             T v;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java
index 672bd4edf5..2b7b658390 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java
@@ -34,7 +34,7 @@ public MaybeFromRunnable(Runnable runnable) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
 
         if (!d.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java
index 52aba416d9..38f0afdb62 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java
@@ -35,7 +35,7 @@ public MaybeFromSupplier(Supplier<? extends T> supplier) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
 
         if (!d.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java
index a2c70740a6..54dacb3c7d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java
@@ -14,7 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
 
 /**
@@ -32,7 +32,7 @@ public MaybeJust(T value) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        observer.onSubscribe(Disposables.disposed());
+        observer.onSubscribe(Disposable.disposed());
         observer.onSuccess(value);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java
index 5300d968b0..a78dde3e36 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java
@@ -31,7 +31,7 @@ public SingleFromCallable(Callable<? extends T> callable) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
 
         if (d.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java
index 88dcd7dc94..e6fd32603f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java
@@ -36,7 +36,7 @@ public SingleFromSupplier(Supplier<? extends T> supplier) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         observer.onSubscribe(d);
 
         if (d.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java
index 8495f931db..4fd2387f96 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java
@@ -14,7 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.single;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 public final class SingleJust<T> extends Single<T> {
 
@@ -26,7 +26,7 @@ public SingleJust(T value) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        observer.onSubscribe(Disposables.disposed());
+        observer.onSubscribe(Disposable.disposed());
         observer.onSuccess(value);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java
index b1e47267b9..21fbbead83 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java
@@ -38,7 +38,7 @@ public final class ImmediateThinScheduler extends Scheduler {
     static final Disposable DISPOSED;
 
     static {
-        DISPOSED = Disposables.empty();
+        DISPOSED = Disposable.empty();
         DISPOSED.dispose();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
index 5a15e61223..ddff75388b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
@@ -1,12 +1,12 @@
 /**
  * Copyright (c) 2016-present, RxJava Contributors.
- * 
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,7 +51,7 @@
  * <p>
  * Limit the amount concurrency two at a time without creating a new fix size
  * thread pool:
- * 
+ *
  * <pre>
  * Scheduler limitScheduler = Schedulers.computation().when(workers -> {
  *  // use merge max concurrent to limit the number of concurrent
@@ -69,7 +69,7 @@
  * {@link Flowable#zip(org.reactivestreams.Publisher, org.reactivestreams.Publisher, io.reactivex.rxjava3.functions.BiFunction)} where
  * subscribing to the first {@link Observable} could deadlock the subscription
  * to the second.
- * 
+ *
  * <pre>
  * Scheduler limitScheduler = Schedulers.computation().when(workers -> {
  *  // use merge max concurrent to limit the number of concurrent
@@ -77,12 +77,12 @@
  *  return Completable.merge(Observable.merge(workers, 2));
  * });
  * </pre>
- * 
+ *
  * Slowing down the rate to no more than than 1 a second. This suffers from the
  * same problem as the one above I could find an {@link Observable} operator
  * that limits the rate without dropping the values (aka leaky bucket
  * algorithm).
- * 
+ *
  * <pre>
  * Scheduler slowScheduler = Schedulers.computation().when(workers -> {
  *  // use concatenate to make each worker happen one at a time.
@@ -145,7 +145,7 @@ public Worker createWorker() {
 
     static final Disposable SUBSCRIBED = new SubscribedDisposable();
 
-    static final Disposable DISPOSED = Disposables.disposed();
+    static final Disposable DISPOSED = Disposable.disposed();
 
     @SuppressWarnings("serial")
     abstract static class ScheduledAction extends AtomicReference<Disposable> implements Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
index 71c054258b..b8a164f9e1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
@@ -120,7 +120,7 @@ Disposable enqueue(Runnable action, long execTime) {
                 return EmptyDisposable.INSTANCE;
             } else {
                 // queue wasn't empty, a parent is already processing so we just add to the end of the queue
-                return Disposables.fromRunnable(new AppendToQueueTask(timedRunnable));
+                return Disposable.fromRunnable(new AppendToQueueTask(timedRunnable));
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
index 8b70760236..d9247acee2 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
@@ -166,7 +166,7 @@ public Disposable schedule(@NonNull Runnable run, long delayTime, @NonNull TimeU
             final TimedRunnable timedAction = new TimedRunnable(this, time + unit.toNanos(delayTime), run, counter++);
             queue.add(timedAction);
 
-            return Disposables.fromRunnable(new QueueRemove(timedAction));
+            return Disposable.fromRunnable(new QueueRemove(timedAction));
         }
 
         @NonNull
@@ -177,7 +177,7 @@ public Disposable schedule(@NonNull Runnable run) {
             }
             final TimedRunnable timedAction = new TimedRunnable(this, 0, run, counter++);
             queue.add(timedAction);
-            return Disposables.fromRunnable(new QueueRemove(timedAction));
+            return Disposable.fromRunnable(new QueueRemove(timedAction));
         }
 
         @Override
diff --git a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
index ebe1303bd2..e18d884f54 100644
--- a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
@@ -4257,7 +4257,7 @@ public void andThenError() {
         Completable.unsafeCreate(new CompletableSource() {
                 @Override
                 public void subscribe(CompletableObserver co) {
-                    co.onSubscribe(Disposables.empty());
+                    co.onSubscribe(Disposable.empty());
                     co.onError(e);
                 }
             })
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
index 2d6fec394b..b219e8f9d7 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
@@ -33,7 +33,7 @@ public class CompositeDisposableTest extends RxJavaTest {
     public void success() {
         final AtomicInteger counter = new AtomicInteger();
         CompositeDisposable cd = new CompositeDisposable();
-        cd.add(Disposables.fromRunnable(new Runnable() {
+        cd.add(Disposable.fromRunnable(new Runnable() {
 
             @Override
             public void run() {
@@ -42,7 +42,7 @@ public void run() {
 
         }));
 
-        cd.add(Disposables.fromRunnable(new Runnable() {
+        cd.add(Disposable.fromRunnable(new Runnable() {
 
             @Override
             public void run() {
@@ -63,7 +63,7 @@ public void shouldUnsubscribeAll() throws InterruptedException {
         final int count = 10;
         final CountDownLatch start = new CountDownLatch(1);
         for (int i = 0; i < count; i++) {
-            cd.add(Disposables.fromRunnable(new Runnable() {
+            cd.add(Disposable.fromRunnable(new Runnable() {
 
                 @Override
                 public void run() {
@@ -101,7 +101,7 @@ public void run() {
     public void exception() {
         final AtomicInteger counter = new AtomicInteger();
         CompositeDisposable cd = new CompositeDisposable();
-        cd.add(Disposables.fromRunnable(new Runnable() {
+        cd.add(Disposable.fromRunnable(new Runnable() {
 
             @Override
             public void run() {
@@ -110,7 +110,7 @@ public void run() {
 
         }));
 
-        cd.add(Disposables.fromRunnable(new Runnable() {
+        cd.add(Disposable.fromRunnable(new Runnable() {
 
             @Override
             public void run() {
@@ -135,7 +135,7 @@ public void run() {
     public void compositeException() {
         final AtomicInteger counter = new AtomicInteger();
         CompositeDisposable cd = new CompositeDisposable();
-        cd.add(Disposables.fromRunnable(new Runnable() {
+        cd.add(Disposable.fromRunnable(new Runnable() {
 
             @Override
             public void run() {
@@ -144,7 +144,7 @@ public void run() {
 
         }));
 
-        cd.add(Disposables.fromRunnable(new Runnable() {
+        cd.add(Disposable.fromRunnable(new Runnable() {
 
             @Override
             public void run() {
@@ -152,7 +152,7 @@ public void run() {
             }
         }));
 
-        cd.add(Disposables.fromRunnable(new Runnable() {
+        cd.add(Disposable.fromRunnable(new Runnable() {
 
             @Override
             public void run() {
@@ -175,8 +175,8 @@ public void run() {
 
     @Test
     public void removeUnsubscribes() {
-        Disposable d1 = Disposables.empty();
-        Disposable d2 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
+        Disposable d2 = Disposable.empty();
 
         CompositeDisposable cd = new CompositeDisposable();
         cd.add(d1);
@@ -190,8 +190,8 @@ public void removeUnsubscribes() {
 
     @Test
     public void clear() {
-        Disposable d1 = Disposables.empty();
-        Disposable d2 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
+        Disposable d2 = Disposable.empty();
 
         CompositeDisposable cd = new CompositeDisposable();
         cd.add(d1);
@@ -206,7 +206,7 @@ public void clear() {
         assertTrue(d2.isDisposed());
         assertFalse(cd.isDisposed());
 
-        Disposable d3 = Disposables.empty();
+        Disposable d3 = Disposable.empty();
 
         cd.add(d3);
         cd.dispose();
@@ -219,7 +219,7 @@ public void clear() {
     public void unsubscribeIdempotence() {
         final AtomicInteger counter = new AtomicInteger();
         CompositeDisposable cd = new CompositeDisposable();
-        cd.add(Disposables.fromRunnable(new Runnable() {
+        cd.add(Disposable.fromRunnable(new Runnable() {
 
             @Override
             public void run() {
@@ -244,7 +244,7 @@ public void unsubscribeIdempotenceConcurrently()
 
         final int count = 10;
         final CountDownLatch start = new CountDownLatch(1);
-        cd.add(Disposables.fromRunnable(new Runnable() {
+        cd.add(Disposable.fromRunnable(new Runnable() {
 
             @Override
             public void run() {
@@ -301,8 +301,8 @@ public void addingNullDisposableIllegal() {
 
     @Test
     public void initializeVarargs() {
-        Disposable d1 = Disposables.empty();
-        Disposable d2 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
+        Disposable d2 = Disposable.empty();
 
         CompositeDisposable cd = new CompositeDisposable(d1, d2);
 
@@ -315,8 +315,8 @@ public void initializeVarargs() {
         assertTrue(d1.isDisposed());
         assertTrue(d2.isDisposed());
 
-        Disposable d3 = Disposables.empty();
-        Disposable d4 = Disposables.empty();
+        Disposable d3 = Disposable.empty();
+        Disposable d4 = Disposable.empty();
 
         cd = new CompositeDisposable(d3, d4);
 
@@ -330,8 +330,8 @@ public void initializeVarargs() {
 
     @Test
     public void initializeIterable() {
-        Disposable d1 = Disposables.empty();
-        Disposable d2 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
+        Disposable d2 = Disposable.empty();
 
         CompositeDisposable cd = new CompositeDisposable(Arrays.asList(d1, d2));
 
@@ -344,8 +344,8 @@ public void initializeIterable() {
         assertTrue(d1.isDisposed());
         assertTrue(d2.isDisposed());
 
-        Disposable d3 = Disposables.empty();
-        Disposable d4 = Disposables.empty();
+        Disposable d3 = Disposable.empty();
+        Disposable d4 = Disposable.empty();
 
         cd = new CompositeDisposable(Arrays.asList(d3, d4));
 
@@ -363,9 +363,9 @@ public void initializeIterable() {
     public void addAll() {
         CompositeDisposable cd = new CompositeDisposable();
 
-        Disposable d1 = Disposables.empty();
-        Disposable d2 = Disposables.empty();
-        Disposable d3 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
+        Disposable d2 = Disposable.empty();
+        Disposable d3 = Disposable.empty();
 
         cd.addAll(d1, d2);
         cd.addAll(d3);
@@ -379,8 +379,8 @@ public void addAll() {
         assertTrue(d1.isDisposed());
         assertTrue(d2.isDisposed());
 
-        d1 = Disposables.empty();
-        d2 = Disposables.empty();
+        d1 = Disposable.empty();
+        d2 = Disposable.empty();
 
         cd = new CompositeDisposable();
 
@@ -406,14 +406,14 @@ public void addAfterDisposed() {
         CompositeDisposable cd = new CompositeDisposable();
         cd.dispose();
 
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         assertFalse(cd.add(d1));
 
         assertTrue(d1.isDisposed());
 
-        d1 = Disposables.empty();
-        Disposable d2 = Disposables.empty();
+        d1 = Disposable.empty();
+        Disposable d2 = Disposable.empty();
 
         assertFalse(cd.addAll(d1, d2));
 
@@ -427,11 +427,11 @@ public void delete() {
 
         CompositeDisposable cd = new CompositeDisposable();
 
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         assertFalse(cd.delete(d1));
 
-        Disposable d2 = Disposables.empty();
+        Disposable d2 = Disposable.empty();
 
         cd.add(d2);
 
@@ -466,7 +466,7 @@ public void addRace() {
             Runnable run = new Runnable() {
                 @Override
                 public void run() {
-                    cd.add(Disposables.empty());
+                    cd.add(Disposable.empty());
                 }
             };
 
@@ -482,7 +482,7 @@ public void addAllRace() {
             Runnable run = new Runnable() {
                 @Override
                 public void run() {
-                    cd.addAll(Disposables.empty());
+                    cd.addAll(Disposable.empty());
                 }
             };
 
@@ -495,7 +495,7 @@ public void removeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final CompositeDisposable cd = new CompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -515,7 +515,7 @@ public void deleteRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final CompositeDisposable cd = new CompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -535,7 +535,7 @@ public void clearRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final CompositeDisposable cd = new CompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -565,7 +565,7 @@ public void run() {
             Runnable run2 = new Runnable() {
                 @Override
                 public void run() {
-                    cd.add(Disposables.empty());
+                    cd.add(Disposable.empty());
                 }
             };
 
@@ -588,7 +588,7 @@ public void run() {
             Runnable run2 = new Runnable() {
                 @Override
                 public void run() {
-                    cd.addAll(Disposables.empty());
+                    cd.addAll(Disposable.empty());
                 }
             };
 
@@ -601,7 +601,7 @@ public void removeDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final CompositeDisposable cd = new CompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -628,7 +628,7 @@ public void deleteDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final CompositeDisposable cd = new CompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -655,7 +655,7 @@ public void clearDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final CompositeDisposable cd = new CompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -682,7 +682,7 @@ public void sizeDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final CompositeDisposable cd = new CompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -708,14 +708,14 @@ public void run() {
     public void disposeThrowsIAE() {
         CompositeDisposable cd = new CompositeDisposable();
 
-        cd.add(Disposables.fromAction(new Action() {
+        cd.add(Disposable.fromAction(new Action() {
             @Override
             public void run() throws Exception {
                 throw new IllegalArgumentException();
             }
         }));
 
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         cd.add(d1);
 
@@ -733,14 +733,14 @@ public void run() throws Exception {
     public void disposeThrowsError() {
         CompositeDisposable cd = new CompositeDisposable();
 
-        cd.add(Disposables.fromAction(new Action() {
+        cd.add(Disposable.fromAction(new Action() {
             @Override
             public void run() throws Exception {
                 throw new AssertionError();
             }
         }));
 
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         cd.add(d1);
 
@@ -758,14 +758,14 @@ public void run() throws Exception {
     public void disposeThrowsCheckedException() {
         CompositeDisposable cd = new CompositeDisposable();
 
-        cd.add(Disposables.fromAction(new Action() {
+        cd.add(Disposable.fromAction(new Action() {
             @Override
             public void run() throws Exception {
                 throw new IOException();
             }
         }));
 
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         cd.add(d1);
 
@@ -804,7 +804,7 @@ public boolean isDisposed() {
             }
         });
 
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         cd.add(d1);
 
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java b/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
similarity index 86%
rename from src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java
rename to src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
index 244ca873f0..69bd6a8cc2 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/DisposablesTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
@@ -31,13 +31,13 @@
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
-public class DisposablesTest extends RxJavaTest {
+public class DisposableTest extends RxJavaTest {
 
     @Test
     public void unsubscribeOnlyOnce() {
         Runnable run = mock(Runnable.class);
 
-        Disposable d = Disposables.fromRunnable(run);
+        Disposable d = Disposable.fromRunnable(run);
 
         assertTrue(d.toString(), d.toString().contains("RunnableDisposable(disposed=false, "));
 
@@ -52,7 +52,7 @@ public void unsubscribeOnlyOnce() {
 
     @Test
     public void empty() {
-        Disposable empty = Disposables.empty();
+        Disposable empty = Disposable.empty();
         assertFalse(empty.isDisposed());
         empty.dispose();
         assertTrue(empty.isDisposed());
@@ -60,20 +60,15 @@ public void empty() {
 
     @Test
     public void unsubscribed() {
-        Disposable disposed = Disposables.disposed();
+        Disposable disposed = Disposable.disposed();
         assertTrue(disposed.isDisposed());
     }
 
-    @Test
-    public void utilityClass() {
-        TestHelper.checkUtilityClass(Disposables.class);
-    }
-
     @Test
     public void fromAction() throws Throwable {
         Action action = mock(Action.class);
 
-        Disposable d = Disposables.fromAction(action);
+        Disposable d = Disposable.fromAction(action);
 
         assertTrue(d.toString(), d.toString().contains("ActionDisposable(disposed=false, "));
 
@@ -89,7 +84,7 @@ public void fromAction() throws Throwable {
     @Test
     public void fromActionThrows() {
         try {
-            Disposables.fromAction(new Action() {
+            Disposable.fromAction(new Action() {
                 @Override
                 public void run() throws Exception {
                     throw new IllegalArgumentException();
@@ -101,7 +96,7 @@ public void run() throws Exception {
         }
 
         try {
-            Disposables.fromAction(new Action() {
+            Disposable.fromAction(new Action() {
                 @Override
                 public void run() throws Exception {
                     throw new InternalError();
@@ -113,7 +108,7 @@ public void run() throws Exception {
         }
 
         try {
-            Disposables.fromAction(new Action() {
+            Disposable.fromAction(new Action() {
                 @Override
                 public void run() throws Exception {
                     throw new IOException();
@@ -132,7 +127,7 @@ public void run() throws Exception {
     @Test
     public void disposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Runnable r = new Runnable() {
                 @Override
@@ -147,14 +142,14 @@ public void run() {
 
     @Test(expected = NullPointerException.class)
     public void fromSubscriptionNull() {
-        Disposables.fromSubscription(null);
+        Disposable.fromSubscription(null);
     }
 
     @Test
     public void fromSubscription() {
         Subscription s = mock(Subscription.class);
 
-        Disposables.fromSubscription(s).dispose();
+        Disposable.fromSubscription(s).dispose();
 
         verify(s).cancel();
         verify(s, never()).request(anyInt());
@@ -166,11 +161,11 @@ public void setOnceTwice() {
         try {
 
             AtomicReference<Disposable> target = new AtomicReference<Disposable>();
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             DisposableHelper.setOnce(target, d);
 
-            Disposable d1 = Disposables.empty();
+            Disposable d1 = Disposable.empty();
 
             DisposableHelper.setOnce(target, d1);
 
@@ -188,7 +183,7 @@ public void fromAutoCloseable() {
 
         AutoCloseable ac = () -> counter.getAndIncrement();
 
-        Disposable d = Disposables.fromAutoCloseable(ac);
+        Disposable d = Disposable.fromAutoCloseable(ac);
 
         assertFalse(d.isDisposed());
         assertEquals(0, counter.get());
@@ -212,7 +207,7 @@ public void fromAutoCloseableThrows() throws Throwable {
         TestHelper.withErrorTracking(errors -> {
             AutoCloseable ac = () -> { throw new TestException(); };
 
-            Disposable d = Disposables.fromAutoCloseable(ac);
+            Disposable d = Disposable.fromAutoCloseable(ac);
 
             assertFalse(d.isDisposed());
 
@@ -236,9 +231,9 @@ public void fromAutoCloseableThrows() throws Throwable {
     public void toAutoCloseable() throws Exception {
         AtomicInteger counter = new AtomicInteger();
 
-        Disposable d = Disposables.fromAction(() -> counter.getAndIncrement());
+        Disposable d = Disposable.fromAction(() -> counter.getAndIncrement());
 
-        AutoCloseable ac = Disposables.toAutoCloseable(d);
+        AutoCloseable ac = Disposable.toAutoCloseable(d);
 
         assertFalse(d.isDisposed());
         assertEquals(0, counter.get());
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
index 7cb13de5a8..a15f018c9b 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
@@ -27,7 +27,7 @@ public class FutureDisposableTest extends RxJavaTest {
     @Test
     public void normal() {
         FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
-        Disposable d = Disposables.fromFuture(ft);
+        Disposable d = Disposable.fromFuture(ft);
         assertFalse(d.isDisposed());
 
         d.dispose();
@@ -44,7 +44,7 @@ public void normal() {
     @Test
     public void interruptible() {
         FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
-        Disposable d = Disposables.fromFuture(ft, true);
+        Disposable d = Disposable.fromFuture(ft, true);
         assertFalse(d.isDisposed());
 
         d.dispose();
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
index 05f544bfa3..dc92b1f1d3 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
@@ -56,7 +56,7 @@ public void notDisposedWhenReplaced() {
         final Disposable underlying = mock(Disposable.class);
         serialDisposable.update(underlying);
 
-        serialDisposable.replace(Disposables.empty());
+        serialDisposable.replace(Disposable.empty());
         serialDisposable.dispose();
 
         verify(underlying, never()).dispose();
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
index 9ab98dae94..0205d6a85d 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
@@ -56,7 +56,7 @@ public void notDisposedWhenReplaced() {
         final Disposable underlying = mock(Disposable.class);
         serialDisposable.set(underlying);
 
-        serialDisposable.replace(Disposables.empty());
+        serialDisposable.replace(Disposable.empty());
         serialDisposable.dispose();
 
         verify(underlying, never()).dispose();
@@ -206,7 +206,7 @@ public void run() {
 
     @Test
     public void disposeState() {
-        Disposable empty = Disposables.empty();
+        Disposable empty = Disposable.empty();
         SerialDisposable d = new SerialDisposable(empty);
 
         assertFalse(d.isDisposed());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java
index c5edd75477..8871cc4e50 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java
@@ -27,14 +27,14 @@ public class ArrayCompositeDisposableTest extends RxJavaTest {
     public void normal() {
         ArrayCompositeDisposable acd = new ArrayCompositeDisposable(2);
 
-        Disposable d1 = Disposables.empty();
-        Disposable d2 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
+        Disposable d2 = Disposable.empty();
 
         assertTrue(acd.setResource(0, d1));
         assertTrue(acd.setResource(1, d2));
 
-        Disposable d3 = Disposables.empty();
-        Disposable d4 = Disposables.empty();
+        Disposable d3 = Disposable.empty();
+        Disposable d4 = Disposable.empty();
 
         acd.replaceResource(0, d3);
         acd.replaceResource(1, d4);
@@ -58,8 +58,8 @@ public void normal() {
         assertTrue(d1.isDisposed());
         assertTrue(d2.isDisposed());
 
-        Disposable d5 = Disposables.empty();
-        Disposable d6 = Disposables.empty();
+        Disposable d5 = Disposable.empty();
+        Disposable d6 = Disposable.empty();
 
         assertFalse(acd.setResource(0, d5));
         acd.replaceResource(1, d6);
@@ -92,7 +92,7 @@ public void replaceRace() {
             Runnable r = new Runnable() {
                 @Override
                 public void run() {
-                    acd.replaceResource(0, Disposables.empty());
+                    acd.replaceResource(0, Disposable.empty());
                 }
             };
 
@@ -108,7 +108,7 @@ public void setRace() {
             Runnable r = new Runnable() {
                 @Override
                 public void run() {
-                    acd.setResource(0, Disposables.empty());
+                    acd.setResource(0, Disposable.empty());
                 }
             };
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
index ea0c4ea89b..24c8dd784f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
@@ -75,7 +75,7 @@ public void setReplace() {
             Runnable r = new Runnable() {
                 @Override
                 public void run() {
-                    DisposableHelper.replace(d, Disposables.empty());
+                    DisposableHelper.replace(d, Disposable.empty());
                 }
             };
 
@@ -91,7 +91,7 @@ public void setRace() {
             Runnable r = new Runnable() {
                 @Override
                 public void run() {
-                    DisposableHelper.set(d, Disposables.empty());
+                    DisposableHelper.set(d, Disposable.empty());
                 }
             };
 
@@ -111,7 +111,7 @@ public void setReplaceNull() {
 
     @Test
     public void dispose() {
-        Disposable u = Disposables.empty();
+        Disposable u = Disposable.empty();
         final AtomicReference<Disposable> d = new AtomicReference<Disposable>(u);
 
         DisposableHelper.dispose(d);
@@ -123,11 +123,11 @@ public void dispose() {
     public void trySet() {
         AtomicReference<Disposable> ref = new AtomicReference<Disposable>();
 
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         assertTrue(DisposableHelper.trySet(ref, d1));
 
-        Disposable d2 = Disposables.empty();
+        Disposable d2 = Disposable.empty();
 
         assertFalse(DisposableHelper.trySet(ref, d2));
 
@@ -137,7 +137,7 @@ public void trySet() {
 
         DisposableHelper.dispose(ref);
 
-        Disposable d3 = Disposables.empty();
+        Disposable d3 = Disposable.empty();
 
         assertFalse(DisposableHelper.trySet(ref, d3));
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java
index 280cb1c28e..0325d00500 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java
@@ -28,8 +28,8 @@ public class ListCompositeDisposableTest extends RxJavaTest {
 
     @Test
     public void constructorAndAddVarargs() {
-        Disposable d1 = Disposables.empty();
-        Disposable d2 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
+        Disposable d2 = Disposable.empty();
 
         ListCompositeDisposable lcd = new ListCompositeDisposable(d1, d2);
 
@@ -40,8 +40,8 @@ public void constructorAndAddVarargs() {
         assertTrue(d1.isDisposed());
         assertTrue(d2.isDisposed());
 
-        d1 = Disposables.empty();
-        d2 = Disposables.empty();
+        d1 = Disposable.empty();
+        d2 = Disposable.empty();
 
         lcd.addAll(d1, d2);
 
@@ -54,8 +54,8 @@ public void constructorAndAddVarargs() {
 
     @Test
     public void constructorIterable() {
-        Disposable d1 = Disposables.empty();
-        Disposable d2 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
+        Disposable d2 = Disposable.empty();
 
         ListCompositeDisposable lcd = new ListCompositeDisposable(Arrays.asList(d1, d2));
 
@@ -66,8 +66,8 @@ public void constructorIterable() {
         assertTrue(d1.isDisposed());
         assertTrue(d2.isDisposed());
 
-        d1 = Disposables.empty();
-        d2 = Disposables.empty();
+        d1 = Disposable.empty();
+        d2 = Disposable.empty();
 
         lcd.add(d1);
         lcd.addAll(d2);
@@ -103,11 +103,11 @@ public void afterDispose() {
         ListCompositeDisposable lcd = new ListCompositeDisposable();
         lcd.dispose();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         assertFalse(lcd.add(d));
         assertTrue(d.isDisposed());
 
-        d = Disposables.empty();
+        d = Disposable.empty();
         assertFalse(lcd.addAll(d));
         assertTrue(d.isDisposed());
     }
@@ -152,7 +152,7 @@ public boolean isDisposed() {
     @Test
     public void remove() {
         ListCompositeDisposable lcd = new ListCompositeDisposable();
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         lcd.add(d);
 
@@ -201,7 +201,7 @@ public void addRace() {
             Runnable run = new Runnable() {
                 @Override
                 public void run() {
-                    cd.add(Disposables.empty());
+                    cd.add(Disposable.empty());
                 }
             };
 
@@ -217,7 +217,7 @@ public void addAllRace() {
             Runnable run = new Runnable() {
                 @Override
                 public void run() {
-                    cd.addAll(Disposables.empty());
+                    cd.addAll(Disposable.empty());
                 }
             };
 
@@ -230,7 +230,7 @@ public void removeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ListCompositeDisposable cd = new ListCompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -250,7 +250,7 @@ public void deleteRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ListCompositeDisposable cd = new ListCompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -270,7 +270,7 @@ public void clearRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ListCompositeDisposable cd = new ListCompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -300,7 +300,7 @@ public void run() {
             Runnable run2 = new Runnable() {
                 @Override
                 public void run() {
-                    cd.add(Disposables.empty());
+                    cd.add(Disposable.empty());
                 }
             };
 
@@ -323,7 +323,7 @@ public void run() {
             Runnable run2 = new Runnable() {
                 @Override
                 public void run() {
-                    cd.addAll(Disposables.empty());
+                    cd.addAll(Disposable.empty());
                 }
             };
 
@@ -336,7 +336,7 @@ public void removeDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ListCompositeDisposable cd = new ListCompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -363,7 +363,7 @@ public void deleteDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ListCompositeDisposable cd = new ListCompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
@@ -390,7 +390,7 @@ public void clearDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ListCompositeDisposable cd = new ListCompositeDisposable();
 
-            final Disposable d1 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
 
             cd.add(d1);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
index c62f59f831..a63283b938 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
@@ -13,11 +13,11 @@
 
 package io.reactivex.rxjava3.internal.observers;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.testsupport.TestObserverEx;
 
@@ -48,7 +48,7 @@ protected boolean beforeDownstream() {
             }
         };
 
-        o.onSubscribe(Disposables.disposed());
+        o.onSubscribe(Disposable.disposed());
 
         to.assertNotSubscribed();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
index e871ec9639..845817379a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
@@ -26,7 +26,7 @@ public class BlockingFirstObserverTest extends RxJavaTest {
     @Test
     public void firstValueOnly() {
         BlockingFirstObserver<Integer> bf = new BlockingFirstObserver<Integer>();
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         bf.onSubscribe(d);
 
         bf.onNext(1);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
index dddbb1e962..399b5506e3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
@@ -30,7 +30,7 @@ public void dispose() {
         BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
         bmo.dispose();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         bmo.onSubscribe(d);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
index 139d6fa0fc..f6ebd39d1f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
@@ -54,9 +54,9 @@ public void normal() {
 
             TakeFirst source = new TakeFirst(to);
 
-            source.onSubscribe(Disposables.empty());
+            source.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
             source.onSubscribe(d);
 
             assertTrue(d.isDisposed());
@@ -77,7 +77,7 @@ public void error() {
 
         TakeFirst source = new TakeFirst(to);
 
-        source.onSubscribe(Disposables.empty());
+        source.onSubscribe(Disposable.empty());
         source.onError(new TestException());
 
         to.assertFailure(TestException.class);
@@ -89,7 +89,7 @@ public void complete() {
 
         TakeFirst source = new TakeFirst(to);
 
-        source.onSubscribe(Disposables.empty());
+        source.onSubscribe(Disposable.empty());
         source.onComplete();
 
         to.assertResult();
@@ -101,7 +101,7 @@ public void dispose() {
 
         TakeFirst source = new TakeFirst(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         source.onSubscribe(d);
 
@@ -122,7 +122,7 @@ public void fused() {
 
             TakeFirst source = new TakeFirst(to);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             source.onSubscribe(d);
 
@@ -152,7 +152,7 @@ public void fusedReject() {
 
             TakeFirst source = new TakeFirst(to);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             source.onSubscribe(d);
 
@@ -197,7 +197,7 @@ public void nonfusedTerminateMore() {
 
             TakeLast source = new TakeLast(to);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             source.onSubscribe(d);
 
@@ -222,7 +222,7 @@ public void nonfusedError() {
 
             TakeLast source = new TakeLast(to);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             source.onSubscribe(d);
 
@@ -247,7 +247,7 @@ public void fusedTerminateMore() {
 
             TakeLast source = new TakeLast(to);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             source.onSubscribe(d);
 
@@ -272,7 +272,7 @@ public void fusedError() {
 
             TakeLast source = new TakeLast(to);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             source.onSubscribe(d);
 
@@ -295,7 +295,7 @@ public void disposed() {
 
         TakeLast source = new TakeLast(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         source.onSubscribe(d);
 
@@ -337,7 +337,7 @@ public void onComplete() {
             }
         });
 
-        source.onSubscribe(Disposables.empty());
+        source.onSubscribe(Disposable.empty());
         source.onNext(1);
         source.onComplete();
 
@@ -350,7 +350,7 @@ public void fusedEmpty() {
 
         TakeLast source = new TakeLast(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         source.onSubscribe(d);
 
@@ -365,7 +365,7 @@ public void nonfusedEmpty() {
 
         TakeLast source = new TakeLast(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         source.onSubscribe(d);
 
@@ -417,7 +417,7 @@ public void onComplete() {
             }
         });
 
-        source.onSubscribe(Disposables.empty());
+        source.onSubscribe(Disposable.empty());
         source.onNext(1);
         source.onComplete();
 
@@ -456,7 +456,7 @@ public void onComplete() {
             }
         });
 
-        source.onSubscribe(Disposables.empty());
+        source.onSubscribe(Disposable.empty());
         source.onNext(1);
         source.onComplete();
 
@@ -503,7 +503,7 @@ public void onComplete() {
             }
         });
 
-        source.onSubscribe(Disposables.empty());
+        source.onSubscribe(Disposable.empty());
         source.onNext(1);
 
         to.assertNoValues().assertNoErrors().assertComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
index 0de5f0dcaa..cc84102c30 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
@@ -17,10 +17,10 @@
 
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Action;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -51,7 +51,7 @@ public void run() throws Exception {
                     }
             );
 
-            o.onSubscribe(Disposables.empty());
+            o.onSubscribe(Disposable.empty());
 
             assertFalse(o.isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
index 1edecae92c..f9caa33808 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
@@ -137,11 +137,11 @@ public void onSubscribe() throws Exception {
 
         try {
 
-            Disposable d1 = Disposables.empty();
+            Disposable d1 = Disposable.empty();
 
             fo.onSubscribe(d1);
 
-            Disposable d2 = Disposables.empty();
+            Disposable d2 = Disposable.empty();
 
             fo.onSubscribe(d2);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
index 7cfd46352a..937e11441d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
@@ -202,9 +202,9 @@ public void badSourceOnSubscribe() {
             Observable<Integer> source = new Observable<Integer>() {
                 @Override
                 public void subscribeActual(Observer<? super Integer> observer) {
-                    Disposable d1 = Disposables.empty();
+                    Disposable d1 = Disposable.empty();
                     observer.onSubscribe(d1);
-                    Disposable d2 = Disposables.empty();
+                    Disposable d2 = Disposable.empty();
                     observer.onSubscribe(d2);
 
                     assertFalse(d1.isDisposed());
@@ -256,7 +256,7 @@ public void badSourceEmitAfterDone() {
             Observable<Integer> source = new Observable<Integer>() {
                 @Override
                 public void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
index b8d82a3ed3..c8823563e0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
@@ -80,9 +80,9 @@ public void accept(Observer<? super Integer> a, Integer v) {
     @Test
     public void unorderedSlowPath() {
         TestObserver<Integer> to = new TestObserver<Integer>();
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainObserver<Integer, Integer, Integer> qd = createUnordered(to, d);
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         qd.enter();
         qd.onNext(1);
@@ -93,9 +93,9 @@ public void unorderedSlowPath() {
     @Test
     public void orderedSlowPath() {
         TestObserver<Integer> to = new TestObserver<Integer>();
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainObserver<Integer, Integer, Integer> qd = createOrdered(to, d);
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         qd.enter();
         qd.onNext(1);
@@ -106,9 +106,9 @@ public void orderedSlowPath() {
     @Test
     public void orderedSlowPathNonEmptyQueue() {
         TestObserver<Integer> to = new TestObserver<Integer>();
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainObserver<Integer, Integer, Integer> qd = createOrdered(to, d);
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         qd.queue.offer(0);
         qd.onNext(1);
@@ -121,9 +121,9 @@ public void unorderedOnNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
             TestObserver<Integer> to = new TestObserver<Integer>();
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
             final QueueDrainObserver<Integer, Integer, Integer> qd = createUnordered(to, d);
-            to.onSubscribe(Disposables.empty());
+            to.onSubscribe(Disposable.empty());
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -143,9 +143,9 @@ public void orderedOnNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
             TestObserver<Integer> to = new TestObserver<Integer>();
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
             final QueueDrainObserver<Integer, Integer, Integer> qd = createOrdered(to, d);
-            to.onSubscribe(Disposables.empty());
+            to.onSubscribe(Disposable.empty());
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
index 643ae8a880..8192f338da 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
@@ -173,12 +173,12 @@ public void ambArrayOrder() {
     @Test
     public void ambRace() {
         TestObserver<Void> to = new TestObserver<Void>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         CompositeDisposable cd = new CompositeDisposable();
         AtomicBoolean once = new AtomicBoolean();
         Amb a = new Amb(once, cd, to);
-        a.onSubscribe(Disposables.empty());
+        a.onSubscribe(Disposable.empty());
 
         a.onComplete();
         a.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
index 19cff53d90..3180f0b71a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
@@ -18,11 +18,11 @@
 import java.util.*;
 import java.util.concurrent.CountDownLatch;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
@@ -172,7 +172,7 @@ public void arrayFirstCancels() {
         Completable.concatArray(new Completable() {
             @Override
             protected void subscribeActual(CompletableObserver observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 to.dispose();
                 observer.onComplete();
             }
@@ -196,7 +196,7 @@ public void iterableFirstCancels() {
         Completable.concat(Arrays.asList(new Completable() {
             @Override
             protected void subscribeActual(CompletableObserver observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 to.dispose();
                 observer.onComplete();
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
index 8b7993609f..2ee2550872 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
@@ -38,7 +38,7 @@ public void nullArgument() {
     public void basic() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Completable.create(new CompletableOnSubscribe() {
                 @Override
@@ -65,8 +65,8 @@ public void subscribe(CompletableEmitter e) throws Exception {
     public void basicWithCancellable() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d1 = Disposables.empty();
-            final Disposable d2 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
+            final Disposable d2 = Disposable.empty();
 
             Completable.create(new CompletableOnSubscribe() {
                 @Override
@@ -100,7 +100,7 @@ public void cancel() throws Exception {
     public void basicWithError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Completable.create(new CompletableOnSubscribe() {
                 @Override
@@ -162,7 +162,7 @@ public void onErrorThrows() {
         Completable.create(new CompletableOnSubscribe() {
             @Override
             public void subscribe(CompletableEmitter e) throws Exception {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 e.setDisposable(d);
 
                 try {
@@ -199,7 +199,7 @@ public void onCompleteThrows() {
         Completable.create(new CompletableOnSubscribe() {
             @Override
             public void subscribe(CompletableEmitter e) throws Exception {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 e.setDisposable(d);
 
                 try {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
index 5225359554..b2dfd16c32 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
@@ -64,7 +64,7 @@ public void onComplete() {
 
     @Test
     public void cancelDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Void> to = new Completable() {
@@ -90,7 +90,7 @@ protected void subscribeActual(CompletableObserver observer) {
 
     @Test
     public void completeDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Void> to = new Completable() {
@@ -116,7 +116,7 @@ protected void subscribeActual(CompletableObserver observer) {
 
     @Test
     public void errorDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Void> to = new Completable() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java
index fea4bcb84e..c2bf494837 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java
@@ -82,7 +82,7 @@ public void run() throws Exception {
     public void onSubscribeCrash() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable bs = Disposables.empty();
+            final Disposable bs = Disposable.empty();
 
             new Completable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
index 6a7c9aa70d..c1cc06f3c6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
@@ -48,7 +48,7 @@ public void cancelAfterFirst() {
         Completable.mergeArray(new Completable() {
             @Override
             protected void subscribeActual(CompletableObserver observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onComplete();
                 to.dispose();
             }
@@ -65,7 +65,7 @@ public void cancelAfterFirstDelayError() {
         Completable.mergeArrayDelayError(new Completable() {
             @Override
             protected void subscribeActual(CompletableObserver observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onComplete();
                 to.dispose();
             }
@@ -84,7 +84,7 @@ public void onErrorAfterComplete() {
             Completable.mergeArrayDelayError(Completable.complete(), new Completable() {
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                     co[0] = observer;
                 }
@@ -410,7 +410,7 @@ public void innerDoubleOnError() {
             Completable.mergeDelayError(Flowable.just(new Completable() {
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     o[0] = observer;
                 }
@@ -433,7 +433,7 @@ public void innerIsDisposed() {
         Completable.mergeDelayError(Flowable.just(new Completable() {
             @Override
             protected void subscribeActual(CompletableObserver observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 assertFalse(((Disposable)observer).isDisposed());
 
                 to.dispose();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
index b8b48fe9c0..1b4bb17263 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
@@ -18,10 +18,10 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -145,7 +145,7 @@ public void mainErrorLate() {
             new Completable() {
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException());
                 }
             }.takeUntil(Completable.complete())
@@ -167,7 +167,7 @@ public void mainCompleteLate() {
             new Completable() {
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                 }
             }.takeUntil(Completable.complete())
@@ -192,7 +192,7 @@ public void otherErrorLate() {
             .takeUntil(new Completable() {
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     ref.set(observer);
                 }
             })
@@ -219,7 +219,7 @@ public void otherCompleteLate() {
             .takeUntil(new Completable() {
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     ref.set(observer);
                 }
             })
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
index 9261562220..0b176d808e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
@@ -156,7 +156,7 @@ public void run() {
     @Test
     public void ambRace() {
         TestObserver<Void> to = new TestObserver<Void>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         CompositeDisposable cd = new CompositeDisposable();
         AtomicBoolean once = new AtomicBoolean();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
index d94a4ba097..4d5b99cb90 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
@@ -43,7 +43,7 @@ public void fusion() throws Exception {
 
         ObserverCompletableObserver co = new ObserverCompletableObserver(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         co.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java
index 7cad5802b6..4581a8944d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java
@@ -17,10 +17,10 @@
 
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
@@ -42,7 +42,7 @@ public void wrapCustomCompletable() {
         Completable.wrap(new CompletableSource() {
             @Override
             public void subscribe(CompletableObserver observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onComplete();
             }
         })
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java
index ca4634c7f5..6a7ddd564b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java
@@ -411,11 +411,11 @@ public CompletableSource apply(Object v) throws Exception {
                     return Completable.wrap(new CompletableSource() {
                         @Override
                         public void subscribe(CompletableObserver observer) {
-                            Disposable d1 = Disposables.empty();
+                            Disposable d1 = Disposable.empty();
 
                             observer.onSubscribe(d1);
 
-                            Disposable d2 = Disposables.empty();
+                            Disposable d2 = Disposable.empty();
 
                             observer.onSubscribe(d2);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
index eddc091c77..a0b14ead5a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
@@ -163,7 +163,7 @@ public void nestedAsyncConcat() throws InterruptedException {
 
             @Override
             public void subscribe(final Subscriber<? super Flowable<String>> subscriber) {
-                final Disposable d = Disposables.empty();
+                final Disposable d = Disposable.empty();
                 subscriber.onSubscribe(new Subscription() {
                     @Override
                     public void request(long n) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
index 023f5b5a25..e6470fe6c9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
@@ -48,7 +48,7 @@ public void subscribe(FlowableEmitter<Object> s) throws Exception { }
     public void basic() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Flowable.<Integer>create(new FlowableOnSubscribe<Integer>() {
                 @Override
@@ -81,8 +81,8 @@ public void subscribe(FlowableEmitter<Integer> e) throws Exception {
     public void basicWithCancellable() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d1 = Disposables.empty();
-            final Disposable d2 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
+            final Disposable d2 = Disposable.empty();
 
             Flowable.<Integer>create(new FlowableOnSubscribe<Integer>() {
                 @Override
@@ -122,7 +122,7 @@ public void cancel() throws Exception {
     public void basicWithError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Flowable.<Integer>create(new FlowableOnSubscribe<Integer>() {
                 @Override
@@ -153,7 +153,7 @@ public void subscribe(FlowableEmitter<Integer> e) throws Exception {
     public void basicSerialized() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Flowable.<Integer>create(new FlowableOnSubscribe<Integer>() {
                 @Override
@@ -188,7 +188,7 @@ public void subscribe(FlowableEmitter<Integer> e) throws Exception {
     public void basicWithErrorSerialized() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Flowable.<Integer>create(new FlowableOnSubscribe<Integer>() {
                 @Override
@@ -778,7 +778,7 @@ public void onErrorCrash() {
             Flowable.create(new FlowableOnSubscribe<Object>() {
                 @Override
                 public void subscribe(FlowableEmitter<Object> e) throws Exception {
-                    Disposable d = Disposables.empty();
+                    Disposable d = Disposable.empty();
                     e.setDisposable(d);
                     try {
                         e.onError(new IOException());
@@ -816,7 +816,7 @@ public void onCompleteCrash() {
             Flowable.create(new FlowableOnSubscribe<Object>() {
                 @Override
                 public void subscribe(FlowableEmitter<Object> e) throws Exception {
-                    Disposable d = Disposables.empty();
+                    Disposable d = Disposable.empty();
                     e.setDisposable(d);
                     try {
                         e.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
index 340b3f22d9..0a37faae1e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
@@ -72,7 +72,7 @@ public void run() {
 
         for (int i = 0; i < subCount; ++i) {
             TestSubscriber<Long> subscriber = new TestSubscriber<Long>();
-            subscriptions.add(Disposables.fromSubscription(subscriber));
+            subscriptions.add(Disposable.fromSubscription(subscriber));
             longs.subscribe(subscriber);
             subscribers.add(subscriber);
         }
@@ -134,7 +134,7 @@ public void run() {
         for (int i = 0; i < subCount; ++i) {
             TestSubscriber<Long> subscriber = new TestSubscriber<Long>();
             longs.subscribe(subscriber);
-            subscriptions.add(Disposables.fromSubscription(subscriber));
+            subscriptions.add(Disposable.fromSubscription(subscriber));
             subscribers.add(subscriber);
         }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
index f4701665cb..596e7b3867 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
@@ -17,13 +17,13 @@
 
 import java.util.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
@@ -344,7 +344,7 @@ public void badSourceObservable() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onNext(2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
index 592756d85e..1c87d6f3b3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
@@ -455,7 +455,7 @@ public CompletableSource apply(Integer v) throws Exception {
                 return new Completable() {
                     @Override
                     protected void subscribeActual(CompletableObserver observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
 
                         assertFalse(((Disposable)observer).isDisposed());
 
@@ -494,7 +494,7 @@ public CompletableSource apply(Integer v) throws Exception {
                 return new Completable() {
                     @Override
                     protected void subscribeActual(CompletableObserver observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
 
                         assertFalse(((Disposable)observer).isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
index 332d906952..d425ce8372 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
@@ -442,7 +442,7 @@ public void badInnerSource() {
             .flatMapMaybe(Functions.justFunction(new Maybe<Integer>() {
                 @Override
                 protected void subscribeActual(MaybeObserver<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onError(new TestException("Second"));
                 }
@@ -531,7 +531,7 @@ public MaybeSource<Object> apply(Integer v) throws Exception {
                 return new Maybe<Object>() {
                     @Override
                     protected void subscribeActual(MaybeObserver<? super Object> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
 
                         assertFalse(((Disposable)observer).isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
index e207dc57a1..2d3699e8e2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
@@ -361,7 +361,7 @@ public void badInnerSource() {
             .flatMapSingle(Functions.justFunction(new Single<Integer>() {
                 @Override
                 protected void subscribeActual(SingleObserver<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onError(new TestException("Second"));
                 }
@@ -416,7 +416,7 @@ public SingleSource<Object> apply(Integer v) throws Exception {
                 return new Single<Object>() {
                     @Override
                     protected void subscribeActual(SingleObserver<? super Object> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
 
                         assertFalse(((Disposable)observer).isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
index 624ecee97a..994926b237 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
@@ -1806,7 +1806,7 @@ public boolean isDisposed() {
             public Disposable schedule(Runnable run, long delay,
                     TimeUnit unit) {
                 run.run();
-                return Disposables.empty();
+                return Disposable.empty();
             }
         }
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
index c70429b381..975740cfe3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
@@ -805,7 +805,7 @@ static final class BadFlowableSubscribe extends ConnectableFlowable<Object> {
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -827,7 +827,7 @@ static final class BadFlowableDispose extends ConnectableFlowable<Object> {
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -922,7 +922,7 @@ static final class BadFlowableSubscribe2 extends ConnectableFlowable<Object> {
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -969,7 +969,7 @@ static final class BadFlowableConnect2 extends ConnectableFlowable<Object> {
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -1214,7 +1214,7 @@ static final class BadFlowableDoubleOnX extends ConnectableFlowable<Object>
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -1392,7 +1392,7 @@ public void timeoutResetsSource() {
         FlowableRefCount<Object> o = (FlowableRefCount<Object>)tcf.refCount();
 
         RefConnection rc = new RefConnection(o);
-        rc.set(Disposables.empty());
+        rc.set(Disposable.empty());
         o.connection = rc;
 
         o.timeout(rc);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
index 0422a24db2..37d9195175 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
@@ -210,7 +210,7 @@ private void performTestUsingWithFlowableFactoryError(boolean disposeEagerly) {
         Supplier<Disposable> resourceFactory = new Supplier<Disposable>() {
             @Override
             public Disposable get() {
-                return Disposables.fromRunnable(unsubscribe);
+                return Disposable.fromRunnable(unsubscribe);
             }
         };
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
index 1df91fbe4d..3a5ff0dc57 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
@@ -15,10 +15,10 @@
 
 import static org.junit.Assert.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.internal.util.NotificationLite;
@@ -80,7 +80,7 @@ public void completeNotification() {
 
     @Test
     public void disposableNotification() {
-        Object o = NotificationLite.disposable(Disposables.empty());
+        Object o = NotificationLite.disposable(Disposable.empty());
 
         assertEquals("NotificationLite.Disposable[RunnableDisposable(disposed=false, EmptyRunnable)]", o.toString());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
index 36addaab95..50b76aa424 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
@@ -19,10 +19,10 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -124,7 +124,7 @@ public void disposeNoFurtherSignals() {
             @Override
             protected void subscribeActual(
                     MaybeObserver<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onSuccess(1);
                 observer.onSuccess(2);
                 observer.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
index 4419d5e8c3..9ebf939b52 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
@@ -33,7 +33,7 @@ public class MaybeCallbackObserverTest extends RxJavaTest {
     public void dispose() {
         MaybeCallbackObserver<Object> mo = new MaybeCallbackObserver<Object>(Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.EMPTY_ACTION);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         mo.onSubscribe(d);
 
@@ -60,7 +60,7 @@ public void accept(Object v) throws Exception {
                     Functions.emptyConsumer(),
                     Functions.EMPTY_ACTION);
 
-            mo.onSubscribe(Disposables.empty());
+            mo.onSubscribe(Disposable.empty());
 
             mo.onSuccess(1);
 
@@ -84,7 +84,7 @@ public void accept(Object v) throws Exception {
                     },
                     Functions.EMPTY_ACTION);
 
-            mo.onSubscribe(Disposables.empty());
+            mo.onSubscribe(Disposable.empty());
 
             mo.onError(new TestException("Outer"));
 
@@ -113,7 +113,7 @@ public void run() throws Exception {
                         }
                     });
 
-            mo.onSubscribe(Disposables.empty());
+            mo.onSubscribe(Disposable.empty());
 
             mo.onComplete();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
index 68ccd8434b..3fa9235fbd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
@@ -18,10 +18,10 @@
 import java.io.IOException;
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
@@ -142,7 +142,7 @@ public void errorAfterTermination() {
             new Maybe<Integer>() {
                 @Override
                 protected void subscribeActual(MaybeObserver<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onSuccess(2);
                     o[0] = observer;
                 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java
index b9ffc12ee8..b0857c432f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java
@@ -79,7 +79,7 @@ public void onSuccessThrows() {
         Maybe.create(new MaybeOnSubscribe<Object>() {
             @Override
             public void subscribe(MaybeEmitter<Object> e) throws Exception {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 e.setDisposable(d);
 
                 try {
@@ -121,7 +121,7 @@ public void onErrorThrows() {
         Maybe.create(new MaybeOnSubscribe<Object>() {
             @Override
             public void subscribe(MaybeEmitter<Object> e) throws Exception {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 e.setDisposable(d);
 
                 try {
@@ -163,7 +163,7 @@ public void onCompleteThrows() {
         Maybe.create(new MaybeOnSubscribe<Object>() {
             @Override
             public void subscribe(MaybeEmitter<Object> e) throws Exception {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 e.setDisposable(d);
 
                 try {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
index 25c2ce742a..ba720a02f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
@@ -64,7 +64,7 @@ public void onComplete() {
 
     @Test
     public void cancelDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Object> to = new Maybe<Object>() {
@@ -90,7 +90,7 @@ protected void subscribeActual(MaybeObserver<? super Object> observer) {
 
     @Test
     public void completeDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Integer> to = new Maybe<Integer>() {
@@ -116,7 +116,7 @@ protected void subscribeActual(MaybeObserver<? super Integer> observer) {
 
     @Test
     public void errorDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Integer> to = new Maybe<Integer>() {
@@ -142,7 +142,7 @@ protected void subscribeActual(MaybeObserver<? super Integer> observer) {
 
     @Test
     public void successDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Integer> to = new Maybe<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java
index 989599f2c6..abe91714e7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java
@@ -58,7 +58,7 @@ public void accept(Integer v, Throwable e) throws Exception {
     public void onSubscribeCrash() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable bs = Disposables.empty();
+            final Disposable bs = Disposable.empty();
 
             new Maybe<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
index 5d74906294..2212d50eed 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
@@ -17,11 +17,11 @@
 
 import java.util.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeMergeArray.MergeMaybeObserver;
@@ -178,7 +178,7 @@ public void mergeBadSource() {
         Maybe.mergeArray(new Maybe<Integer>() {
             @Override
             protected void subscribeActual(MaybeObserver<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onSuccess(1);
                 observer.onSuccess(2);
                 observer.onSuccess(3);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java
index 2dce4c4524..cbf4d60b34 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java
@@ -17,10 +17,10 @@
 
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -56,7 +56,7 @@ public void doubleError() {
             TestObserverEx<Integer> to = new Maybe<Integer>() {
                 @Override
                 protected void subscribeActual(MaybeObserver<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onError(new TestException("Second"));
                 }
@@ -87,7 +87,7 @@ public void doubleComplete() {
         TestObserver<Integer> to = new Maybe<Integer>() {
             @Override
             protected void subscribeActual(MaybeObserver<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onComplete();
                 observer.onComplete();
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
index 79c81bf9a5..c9ff65e09a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
@@ -411,11 +411,11 @@ public MaybeSource<Integer> apply(Object v) throws Exception {
                     return Maybe.wrap(new MaybeSource<Integer>() {
                         @Override
                         public void subscribe(MaybeObserver<? super Integer> observer) {
-                            Disposable d1 = Disposables.empty();
+                            Disposable d1 = Disposable.empty();
 
                             observer.onSubscribe(d1);
 
-                            Disposable d2 = Disposables.empty();
+                            Disposable d2 = Disposable.empty();
 
                             observer.onSubscribe(d2);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
index 488a803172..47dd3d1284 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
@@ -19,11 +19,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -302,7 +302,7 @@ public MaybeSource<Integer> apply(Integer v)
                                     @Override
                                     protected void subscribeActual(
                                             MaybeObserver<? super Integer> observer) {
-                                        observer.onSubscribe(Disposables.empty());
+                                        observer.onSubscribe(Disposable.empty());
                                         obs.set(observer);
                                     }
                             };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
index 359053cdb5..5da39ff395 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
@@ -18,11 +18,11 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -220,7 +220,7 @@ public SingleSource<Integer> apply(Integer v)
                                     @Override
                                     protected void subscribeActual(
                                             SingleObserver<? super Integer> observer) {
-                                        observer.onSubscribe(Disposables.empty());
+                                        observer.onSubscribe(Disposable.empty());
                                         obs.set(observer);
                                     }
                             };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
index 1eea34f3fa..b7b66c3ca4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
@@ -18,11 +18,11 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -422,7 +422,7 @@ public MaybeSource<Integer> apply(Integer v)
                         @Override
                         protected void subscribeActual(
                                 MaybeObserver<? super Integer> observer) {
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
                             moRef.set(observer);
                         }
                     };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
index a834f327f9..ca1cb6d919 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
@@ -18,11 +18,11 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -370,7 +370,7 @@ public SingleSource<Integer> apply(Integer v)
                         @Override
                         protected void subscribeActual(
                                 SingleObserver<? super Integer> observer) {
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
                             moRef.set(observer);
                         }
                     };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
index 30f78c41a9..21b9936292 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
@@ -19,10 +19,10 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -239,7 +239,7 @@ public void mainErrorAfterInnerError() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onError(new TestException("outer"));
                 }
@@ -273,7 +273,7 @@ public MaybeSource<Integer> apply(Integer v)
                                     @Override
                                     protected void subscribeActual(
                                             MaybeObserver<? super Integer> observer) {
-                                        observer.onSubscribe(Disposables.empty());
+                                        observer.onSubscribe(Disposable.empty());
                                         obs.set(observer);
                                     }
                             };
@@ -378,7 +378,7 @@ public void cancelNoConcurrentClean() {
                 new ConcatMapMaybeMainObserver<Integer, Integer>(
                         to, Functions.justFunction(Maybe.<Integer>never()), 16, ErrorMode.IMMEDIATE);
 
-        operator.onSubscribe(Disposables.empty());
+        operator.onSubscribe(Disposable.empty());
 
         operator.queue.offer(1);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
index 2d4b46f187..8f24b87bbb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
@@ -18,10 +18,10 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -157,7 +157,7 @@ public void mainErrorAfterInnerError() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onError(new TestException("outer"));
                 }
@@ -191,7 +191,7 @@ public SingleSource<Integer> apply(Integer v)
                                     @Override
                                     protected void subscribeActual(
                                             SingleObserver<? super Integer> observer) {
-                                        observer.onSubscribe(Disposables.empty());
+                                        observer.onSubscribe(Disposable.empty());
                                         obs.set(observer);
                                     }
                             };
@@ -318,7 +318,7 @@ public void cancelNoConcurrentClean() {
                 new ConcatMapSingleMainObserver<Integer, Integer>(
                         to, Functions.justFunction(Single.<Integer>never()), 16, ErrorMode.IMMEDIATE);
 
-        operator.onSubscribe(Disposables.empty());
+        operator.onSubscribe(Disposable.empty());
 
         operator.queue.offer(1);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
index b308119424..b060b9d03d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
@@ -17,10 +17,10 @@
 
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -314,7 +314,7 @@ public void innerErrorThenMainError() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onError(new TestException("main"));
                 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
index c9a1f9a0dd..7f877089b5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
@@ -18,10 +18,10 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -355,7 +355,7 @@ public void mainErrorAfterTermination() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onError(new TestException("outer"));
                 }
@@ -385,7 +385,7 @@ public void innerErrorAfterTermination() {
             TestObserverEx<Integer> to = new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onError(new TestException("outer"));
                 }
@@ -398,7 +398,7 @@ public MaybeSource<Integer> apply(Integer v)
                         @Override
                         protected void subscribeActual(
                                 MaybeObserver<? super Integer> observer) {
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
                             moRef.set(observer);
                         }
                     };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
index a59e9954ec..957c20ba0e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
@@ -18,10 +18,10 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -324,7 +324,7 @@ public void mainErrorAfterTermination() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onError(new TestException("outer"));
                 }
@@ -354,7 +354,7 @@ public void innerErrorAfterTermination() {
             TestObserverEx<Integer> to = new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onError(new TestException("outer"));
                 }
@@ -367,7 +367,7 @@ public SingleSource<Integer> apply(Integer v)
                         @Override
                         protected void subscribeActual(
                                 SingleObserver<? super Integer> observer) {
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
                             moRef.set(observer);
                         }
                     };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
index 194619b8bc..0fcec3a172 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
@@ -247,7 +247,7 @@ public void noBufferingOrBlockingOfSequence() throws Throwable {
 
                     @Override
                     public void subscribe(final Observer<? super Integer> o) {
-                        o.onSubscribe(Disposables.empty());
+                        o.onSubscribe(Disposable.empty());
                         task.replace(Schedulers.single().scheduleDirect(new Runnable() {
 
                             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java
index 756f0b4eb3..bca24503c1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java
@@ -20,12 +20,12 @@
 import java.util.*;
 import java.util.concurrent.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 
 public class BlockingObservableToFutureTest extends RxJavaTest {
@@ -65,7 +65,7 @@ public void toFutureWithException() {
 
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext("one");
                 observer.onError(new TestException());
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
index 3a98208d70..3658c24b97 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
@@ -56,7 +56,7 @@ public void toIteratorWithException() {
 
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext("one");
                 observer.onError(new TestException());
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
index a7aca59ada..7e3dfbf8bf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
@@ -16,7 +16,7 @@
 
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
+import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
  * Creates {@link Observable} of a number of items followed by either an error or
@@ -36,7 +36,7 @@ public final class Burst<T> extends Observable<T> {
 
     @Override
     protected void subscribeActual(final Observer<? super T> observer) {
-        observer.onSubscribe(Disposables.empty());
+        observer.onSubscribe(Disposable.empty());
         for (T item: items) {
             observer.onNext(item);
         }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
index 5934706a4d..38be122378 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
@@ -311,7 +311,7 @@ public void predicateThrowsObservable() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onNext(2);
@@ -342,7 +342,7 @@ public void predicateThrows() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onNext(2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
index a79479067a..6ce9410340 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
@@ -21,10 +21,10 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -517,7 +517,7 @@ public void predicateThrowsSuppressOthers() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onNext(2);
@@ -548,7 +548,7 @@ public void badSourceSingle() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
 
                     observer.onNext(1);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
index d1c6c6fc51..c8454452b4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
@@ -257,7 +257,7 @@ public void run() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 s[0] = observer;
             }
         }.blockingSubscribe(to);
@@ -294,7 +294,7 @@ public void blockingCancelUpfront() {
         o.dispose();
         assertTrue(o.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         o.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
index 03c437dad9..34ae5ed780 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
@@ -70,7 +70,7 @@ public void skipAndCountOverlappingBuffers() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext("one");
                 observer.onNext("two");
                 observer.onNext("three");
@@ -126,7 +126,7 @@ public void timedAndCount() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 push(observer, "one", 10);
                 push(observer, "two", 90);
                 push(observer, "three", 110);
@@ -158,7 +158,7 @@ public void timed() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 push(observer, "one", 97);
                 push(observer, "two", 98);
                 /**
@@ -192,7 +192,7 @@ public void observableBasedOpenerAndCloser() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 push(observer, "one", 10);
                 push(observer, "two", 60);
                 push(observer, "three", 110);
@@ -205,7 +205,7 @@ public void subscribe(Observer<? super String> observer) {
         Observable<Object> openings = Observable.unsafeCreate(new ObservableSource<Object>() {
             @Override
             public void subscribe(Observer<Object> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 push(observer, new Object(), 50);
                 push(observer, new Object(), 200);
                 complete(observer, 250);
@@ -218,7 +218,7 @@ public Observable<Object> apply(Object opening) {
                 return Observable.unsafeCreate(new ObservableSource<Object>() {
                     @Override
                     public void subscribe(Observer<? super Object> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         push(observer, new Object(), 100);
                         complete(observer, 101);
                     }
@@ -1360,8 +1360,8 @@ public void openClosebadSource() {
             new Observable<Object>() {
                 @Override
                 protected void subscribeActual(Observer<? super Object> observer) {
-                    Disposable bs1 = Disposables.empty();
-                    Disposable bs2 = Disposables.empty();
+                    Disposable bs1 = Disposable.empty();
+                    Disposable bs2 = Disposable.empty();
 
                     observer.onSubscribe(bs1);
 
@@ -1484,8 +1484,8 @@ protected void subscribeActual(Observer<? super Object> observer) {
 
                     assertFalse(((Disposable)observer).isDisposed());
 
-                    Disposable bs1 = Disposables.empty();
-                    Disposable bs2 = Disposables.empty();
+                    Disposable bs1 = Disposable.empty();
+                    Disposable bs2 = Disposable.empty();
 
                     observer.onSubscribe(bs1);
 
@@ -1529,8 +1529,8 @@ protected void subscribeActual(Observer<? super Object> observer) {
 
                     assertFalse(((Disposable)observer).isDisposed());
 
-                    Disposable bs1 = Disposables.empty();
-                    Disposable bs2 = Disposables.empty();
+                    Disposable bs1 = Disposable.empty();
+                    Disposable bs2 = Disposable.empty();
 
                     observer.onSubscribe(bs1);
 
@@ -1602,7 +1602,7 @@ public void bufferExactBoundaryBadSource() {
         Observable<Integer> ps = new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onComplete();
                 observer.onNext(1);
                 observer.onComplete();
@@ -1613,7 +1613,7 @@ protected void subscribeActual(Observer<? super Integer> observer) {
         Observable<Integer> b = new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 ref.set(observer);
             }
         };
@@ -1658,7 +1658,7 @@ public void timedInternalState() {
         BufferExactUnboundedObserver<Integer, List<Integer>> sub = new BufferExactUnboundedObserver<Integer, List<Integer>>(
                 to, Functions.justSupplier((List<Integer>)new ArrayList<Integer>()), 1, TimeUnit.SECONDS, sch);
 
-        sub.onSubscribe(Disposables.empty());
+        sub.onSubscribe(Disposable.empty());
 
         assertFalse(sub.isDisposed());
 
@@ -1708,7 +1708,7 @@ public void timedSkipInternalState() {
         BufferSkipBoundedObserver<Integer, List<Integer>> sub = new BufferSkipBoundedObserver<Integer, List<Integer>>(
                 to, Functions.justSupplier((List<Integer>)new ArrayList<Integer>()), 1, 1, TimeUnit.SECONDS, sch.createWorker());
 
-        sub.onSubscribe(Disposables.empty());
+        sub.onSubscribe(Disposable.empty());
 
         sub.enter();
         sub.onComplete();
@@ -1736,7 +1736,7 @@ public List<Integer> get() throws Exception {
                     }
                 }, 1, 1, TimeUnit.SECONDS, sch.createWorker());
 
-        sub.onSubscribe(Disposables.empty());
+        sub.onSubscribe(Disposable.empty());
 
         sub.run();
 
@@ -1755,7 +1755,7 @@ public void timedSizeBufferAlreadyCleared() {
                         1, TimeUnit.SECONDS, 1, false, sch.createWorker())
         ;
 
-        Disposable bs = Disposables.empty();
+        Disposable bs = Disposable.empty();
 
         sub.onSubscribe(bs);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
index c3695b24d6..20c4fde308 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
@@ -20,12 +20,12 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.observers.TestObserver;
@@ -64,7 +64,7 @@ public void cache() throws InterruptedException {
 
             @Override
             public void subscribe(final Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 new Thread(new Runnable() {
 
                     @Override
@@ -198,7 +198,7 @@ public void noMissingBackpressureException() {
         Observable<Integer> firehose = Observable.unsafeCreate(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> t) {
-                t.onSubscribe(Disposables.empty());
+                t.onSubscribe(Disposable.empty());
                 for (int i = 0; i < m; i++) {
                     t.onNext(i);
                 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java
index a3cd0dcdb5..55b880a9f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java
@@ -85,7 +85,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onComplete();
@@ -248,4 +248,4 @@ public CompletableSource apply(Integer v) throws Exception {
             }
         };
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
index ace3f55493..fa72be7ac6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
@@ -20,12 +20,12 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -663,7 +663,7 @@ public void badInnerSource() {
             @Override
             protected void subscribeActual(Observer<? super Integer> o) {
                 ts0[0] = o;
-                o.onSubscribe(Disposables.empty());
+                o.onSubscribe(Disposable.empty());
                 o.onError(new TestException("First"));
             }
         }), 2, ImmediateThinScheduler.INSTANCE)
@@ -689,7 +689,7 @@ public void badInnerSourceDelayError() {
             @Override
             protected void subscribeActual(Observer<? super Integer> o) {
                 ts0[0] = o;
-                o.onSubscribe(Disposables.empty());
+                o.onSubscribe(Disposable.empty());
                 o.onError(new TestException("First"));
             }
         }), true, 2, ImmediateThinScheduler.INSTANCE)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
index 61b1f1579b..769f42f984 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
@@ -150,7 +150,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onComplete();
@@ -181,7 +181,7 @@ public void badSourceDelayError() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onComplete();
@@ -355,7 +355,7 @@ public ObservableSource<Integer> apply(Integer v) throws Exception {
                         @Override
                         protected void subscribeActual(Observer<? super Integer> observer) {
                             o[0] = observer;
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
                             observer.onComplete();
                         }
                     };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
index 0e8c64b92d..354c2afc27 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
@@ -86,7 +86,7 @@ public void concatObservableOfObservables() {
 
             @Override
             public void subscribe(Observer<? super Observable<String>> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 // simulate what would happen in an Observable
                 observer.onNext(odds);
                 observer.onNext(even);
@@ -161,7 +161,7 @@ public void nestedAsyncConcat() throws InterruptedException {
 
             @Override
             public void subscribe(final Observer<? super Observable<String>> observer) {
-                final Disposable d = Disposables.empty();
+                final Disposable d = Disposable.empty();
                 observer.onSubscribe(d);
                 parent.set(new Thread(new Runnable() {
 
@@ -348,7 +348,7 @@ public void concatNonBlockingObservables() {
 
             @Override
             public void subscribe(Observer<? super Observable<String>> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 // simulate what would happen in an Observable
                 observer.onNext(Observable.unsafeCreate(w1));
                 observer.onNext(Observable.unsafeCreate(w2));
@@ -666,7 +666,7 @@ public void concatWithNonCompliantSourceDoubleOnComplete() {
 
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext("hello");
                 observer.onComplete();
                 observer.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
index 65d85f20d5..4ca6d1bb7b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
@@ -106,10 +106,10 @@ public void badSource() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                Disposable bs1 = Disposables.empty();
+                Disposable bs1 = Disposable.empty();
                 observer.onSubscribe(bs1);
 
-                Disposable bs2 = Disposables.empty();
+                Disposable bs2 = Disposable.empty();
                 observer.onSubscribe(bs2);
 
                 assertFalse(bs1.isDisposed());
@@ -127,7 +127,7 @@ public void consumerDisposed() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                Disposable bs1 = Disposables.empty();
+                Disposable bs1 = Disposable.empty();
                 observer.onSubscribe(bs1);
 
                 assertFalse(((Disposable)observer).isDisposed());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
index 4d4f94954a..cd35a91ad1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
@@ -117,7 +117,7 @@ public void consumerDisposed() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                Disposable bs1 = Disposables.empty();
+                Disposable bs1 = Disposable.empty();
                 observer.onSubscribe(bs1);
 
                 assertFalse(((Disposable)observer).isDisposed());
@@ -138,10 +138,10 @@ public void badSource() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                Disposable bs1 = Disposables.empty();
+                Disposable bs1 = Disposable.empty();
                 observer.onSubscribe(bs1);
 
-                Disposable bs2 = Disposables.empty();
+                Disposable bs2 = Disposable.empty();
                 observer.onSubscribe(bs2);
 
                 assertFalse(bs1.isDisposed());
@@ -159,10 +159,10 @@ public void badSource2() {
         Flowable.empty().concatWith(new Maybe<Integer>() {
             @Override
             protected void subscribeActual(MaybeObserver<? super Integer> observer) {
-                Disposable bs1 = Disposables.empty();
+                Disposable bs1 = Disposable.empty();
                 observer.onSubscribe(bs1);
 
-                Disposable bs2 = Disposables.empty();
+                Disposable bs2 = Disposable.empty();
                 observer.onSubscribe(bs2);
 
                 assertFalse(bs1.isDisposed());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
index 73a0ff3c0d..45c0b6f269 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
@@ -90,7 +90,7 @@ public void consumerDisposed() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                Disposable bs1 = Disposables.empty();
+                Disposable bs1 = Disposable.empty();
                 observer.onSubscribe(bs1);
 
                 assertFalse(((Disposable)observer).isDisposed());
@@ -111,10 +111,10 @@ public void badSource() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                Disposable bs1 = Disposables.empty();
+                Disposable bs1 = Disposable.empty();
                 observer.onSubscribe(bs1);
 
-                Disposable bs2 = Disposables.empty();
+                Disposable bs2 = Disposable.empty();
                 observer.onSubscribe(bs2);
 
                 assertFalse(bs1.isDisposed());
@@ -132,10 +132,10 @@ public void badSource2() {
         Flowable.empty().concatWith(new Single<Integer>() {
             @Override
             protected void subscribeActual(SingleObserver<? super Integer> observer) {
-                Disposable bs1 = Disposables.empty();
+                Disposable bs1 = Disposable.empty();
                 observer.onSubscribe(bs1);
 
-                Disposable bs2 = Disposables.empty();
+                Disposable bs2 = Disposable.empty();
                 observer.onSubscribe(bs2);
 
                 assertFalse(bs1.isDisposed());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
index 4a22746c54..f5be343b40 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
@@ -36,7 +36,7 @@ public void nullArgument() {
 
     @Test
     public void basic() {
-        final Disposable d = Disposables.empty();
+        final Disposable d = Disposable.empty();
 
         Observable.<Integer>create(new ObservableOnSubscribe<Integer>() {
             @Override
@@ -61,8 +61,8 @@ public void subscribe(ObservableEmitter<Integer> e) throws Exception {
 
     @Test
     public void basicWithCancellable() {
-        final Disposable d1 = Disposables.empty();
-        final Disposable d2 = Disposables.empty();
+        final Disposable d1 = Disposable.empty();
+        final Disposable d2 = Disposable.empty();
 
         Observable.<Integer>create(new ObservableOnSubscribe<Integer>() {
             @Override
@@ -94,7 +94,7 @@ public void cancel() throws Exception {
 
     @Test
     public void basicWithError() {
-        final Disposable d = Disposables.empty();
+        final Disposable d = Disposable.empty();
 
         Observable.<Integer>create(new ObservableOnSubscribe<Integer>() {
             @Override
@@ -118,7 +118,7 @@ public void subscribe(ObservableEmitter<Integer> e) throws Exception {
 
     @Test
     public void basicSerialized() {
-        final Disposable d = Disposables.empty();
+        final Disposable d = Disposable.empty();
 
         Observable.<Integer>create(new ObservableOnSubscribe<Integer>() {
             @Override
@@ -145,7 +145,7 @@ public void subscribe(ObservableEmitter<Integer> e) throws Exception {
 
     @Test
     public void basicWithErrorSerialized() {
-        final Disposable d = Disposables.empty();
+        final Disposable d = Disposable.empty();
 
         Observable.<Integer>create(new ObservableOnSubscribe<Integer>() {
             @Override
@@ -174,7 +174,7 @@ public void wrap() {
         Observable.wrap(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext(1);
                 observer.onNext(2);
                 observer.onNext(3);
@@ -192,7 +192,7 @@ public void unsafe() {
         Observable.unsafeCreate(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext(1);
                 observer.onNext(2);
                 observer.onNext(3);
@@ -322,7 +322,7 @@ public void onErrorCrash() {
         Observable.create(new ObservableOnSubscribe<Object>() {
             @Override
             public void subscribe(ObservableEmitter<Object> e) throws Exception {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 e.setDisposable(d);
                 try {
                     e.onError(new IOException());
@@ -358,7 +358,7 @@ public void onCompleteCrash() {
         Observable.create(new ObservableOnSubscribe<Object>() {
             @Override
             public void subscribe(ObservableEmitter<Object> e) throws Exception {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 e.setDisposable(d);
                 try {
                     e.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
index d66de923f8..af60b93018 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
@@ -55,7 +55,7 @@ public void debounceWithCompleted() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 publishNext(observer, 100, "one");    // Should be skipped since "two" will arrive before the timeout expires.
                 publishNext(observer, 400, "two");    // Should be published since "three" will arrive after the timeout expires.
                 publishNext(observer, 900, "three");   // Should be skipped since onComplete will arrive before the timeout expires.
@@ -81,7 +81,7 @@ public void debounceNeverEmits() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 // all should be skipped since they are happening faster than the 200ms timeout
                 publishNext(observer, 100, "a");    // Should be skipped
                 publishNext(observer, 200, "b");    // Should be skipped
@@ -111,7 +111,7 @@ public void debounceWithError() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 Exception error = new TestException();
                 publishNext(observer, 100, "one");    // Should be published since "two" will arrive after the timeout expires.
                 publishNext(observer, 600, "two");    // Should be skipped since onError will arrive before the timeout expires.
@@ -332,7 +332,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                     observer.onNext(1);
                     observer.onError(new TestException());
@@ -418,7 +418,7 @@ public void disposedInOnComplete() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 to.dispose();
                 observer.onComplete();
             }
@@ -442,7 +442,7 @@ public ObservableSource<Integer> apply(Integer o) throws Exception {
                 return new Observable<Integer>() {
                     @Override
                     protected void subscribeActual(Observer<? super Integer> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         ref.set(observer);
                     }
                 };
@@ -475,7 +475,7 @@ public void timedDisposedIgnoredBySource() {
             @Override
             protected void subscribeActual(
                     Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 to.dispose();
                 observer.onNext(1);
                 observer.onComplete();
@@ -491,7 +491,7 @@ public void timedLateEmit() {
         DebounceTimedObserver<Integer> sub = new DebounceTimedObserver<Integer>(
                 to, 1, TimeUnit.SECONDS, new TestScheduler().createWorker());
 
-        sub.onSubscribe(Disposables.empty());
+        sub.onSubscribe(Disposable.empty());
 
         DebounceEmitter<Integer> de = new DebounceEmitter<Integer>(1, 50, sub);
         de.run();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
index 84a6b06b06..5d3e2b6be1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
@@ -18,10 +18,10 @@
 
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -202,7 +202,7 @@ public void eventsAfterDematerializedTerminal() {
             new Observable<Notification<Object>>() {
                 @Override
                 protected void subscribeActual(Observer<? super Notification<Object>> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(Notification.createOnComplete());
                     observer.onNext(Notification.<Object>createOnNext(1));
                     observer.onNext(Notification.createOnError(new TestException("First")));
@@ -225,7 +225,7 @@ public void nonNotificationInstanceAfterDispose() {
         new Observable<Notification<Object>>() {
             @Override
             protected void subscribeActual(Observer<? super Notification<Object>> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext(Notification.createOnComplete());
                 observer.onNext(Notification.<Object>createOnNext(1));
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
index 2a9d889ba2..888a39cb89 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
@@ -205,7 +205,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
index f28a9fb18b..13122988cf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
@@ -19,11 +19,11 @@
 import java.io.IOException;
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 import org.mockito.InOrder;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
@@ -196,7 +196,7 @@ public void ignoreCancel() {
             Observable.wrap(new ObservableSource<Integer>() {
                 @Override
                 public void subscribe(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onNext(2);
                     observer.onNext(3);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
index 4205fad5e2..30f0cb2d6f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
@@ -21,10 +21,10 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -232,7 +232,7 @@ public void ignoreCancel() {
             Observable.wrap(new ObservableSource<Object>() {
                 @Override
                 public void subscribe(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onNext(2);
                     observer.onError(new IOException());
@@ -262,7 +262,7 @@ public void onErrorAfterCrash() {
             Observable.wrap(new ObservableSource<Object>() {
                 @Override
                 public void subscribe(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException());
                 }
             })
@@ -289,7 +289,7 @@ public void onCompleteAfterCrash() {
             Observable.wrap(new ObservableSource<Object>() {
                 @Override
                 public void subscribe(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                 }
             })
@@ -313,7 +313,7 @@ public void onCompleteCrash() {
         Observable.wrap(new ObservableSource<Object>() {
             @Override
             public void subscribe(Observer<? super Object> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onComplete();
             }
         })
@@ -335,7 +335,7 @@ public void ignoreCancelConditional() {
             Observable.wrap(new ObservableSource<Object>() {
                 @Override
                 public void subscribe(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onNext(2);
                     observer.onError(new IOException());
@@ -366,7 +366,7 @@ public void onErrorAfterCrashConditional() {
             Observable.wrap(new ObservableSource<Object>() {
                 @Override
                 public void subscribe(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException());
                 }
             })
@@ -410,7 +410,7 @@ public void onCompleteAfterCrashConditional() {
             Observable.wrap(new ObservableSource<Object>() {
                 @Override
                 public void subscribe(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                 }
             })
@@ -435,7 +435,7 @@ public void onCompleteCrashConditional() {
         Observable.wrap(new ObservableSource<Object>() {
             @Override
             public void subscribe(Observer<? super Object> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onComplete();
             }
         })
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
index ef57c50225..26cd2b340b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
@@ -74,7 +74,7 @@ public void doOnUnSubscribeWorksWithRefCount() throws Exception {
 
             @Override
             public void subscribe(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 onSubscribed.incrementAndGet();
                 sref.set(observer);
             }
@@ -111,7 +111,7 @@ public void accept(Disposable d) {
     public void onSubscribeCrash() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable bs = Disposables.empty();
+            final Disposable bs = Disposable.empty();
 
             new Observable<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java
index a11255abf2..679915dc51 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java
@@ -17,12 +17,12 @@
 
 import java.util.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -233,7 +233,7 @@ public void badSourceObservable() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onNext(2);
@@ -259,7 +259,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onNext(2);
@@ -284,7 +284,7 @@ public void badSource2() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onNext(2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
index b07a13a6de..f5bf13b231 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
@@ -372,7 +372,7 @@ public CompletableSource apply(Integer v) throws Exception {
                 return new Completable() {
                     @Override
                     protected void subscribeActual(CompletableObserver observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
 
                         assertFalse(((Disposable)observer).isDisposed());
 
@@ -447,7 +447,7 @@ public CompletableSource apply(Integer v) throws Exception {
                 return new Completable() {
                     @Override
                     protected void subscribeActual(CompletableObserver observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
 
                         assertFalse(((Disposable)observer).isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
index fbd55ae32a..e1133ee311 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
@@ -325,7 +325,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onError(new TestException("Second"));
                 }
@@ -348,7 +348,7 @@ public void badInnerSource() {
             .flatMapMaybe(Functions.justFunction(new Maybe<Integer>() {
                 @Override
                 protected void subscribeActual(MaybeObserver<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onError(new TestException("Second"));
                 }
@@ -437,7 +437,7 @@ public MaybeSource<Object> apply(Integer v) throws Exception {
                 return new Maybe<Object>() {
                     @Override
                     protected void subscribeActual(MaybeObserver<? super Object> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
 
                         assertFalse(((Disposable)observer).isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
index 77db13d5a1..b8c7b351be 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
@@ -274,7 +274,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onError(new TestException("Second"));
                 }
@@ -297,7 +297,7 @@ public void badInnerSource() {
             .flatMapSingle(Functions.justFunction(new Single<Integer>() {
                 @Override
                 protected void subscribeActual(SingleObserver<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onError(new TestException("Second"));
                 }
@@ -352,7 +352,7 @@ public SingleSource<Object> apply(Integer v) throws Exception {
                 return new Single<Object>() {
                     @Override
                     protected void subscribeActual(SingleObserver<? super Object> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
 
                         assertFalse(((Disposable)observer).isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
index cf31f26c3a..38defaf049 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
@@ -992,7 +992,7 @@ public Integer apply(Integer v)
                     }
                 }, true, Integer.MAX_VALUE, 128);
 
-        merger.onSubscribe(Disposables.empty());
+        merger.onSubscribe(Disposable.empty());
         merger.getAndIncrement();
 
         merger.onNext(0);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
index 14ff56a665..1eaf76cda8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
@@ -188,7 +188,7 @@ public void groupedEventStream() throws Throwable {
 
             @Override
             public void subscribe(final Observer<? super Event> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 System.out.println("*** Subscribing to EventStream ***");
                 subscribeCounter.incrementAndGet();
                 new Thread(new Runnable() {
@@ -602,7 +602,7 @@ public void firstGroupsCompleteAndParentSlowToThenEmitFinalGroupsAndThenComplete
 
             @Override
             public void subscribe(Observer<? super Integer> sub) {
-                sub.onSubscribe(Disposables.empty());
+                sub.onSubscribe(Disposable.empty());
                 sub.onNext(1);
                 sub.onNext(2);
                 sub.onNext(1);
@@ -681,7 +681,7 @@ public void firstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenSubscr
 
             @Override
             public void subscribe(Observer<? super Integer> sub) {
-                sub.onSubscribe(Disposables.empty());
+                sub.onSubscribe(Disposable.empty());
                 sub.onNext(1);
                 sub.onNext(2);
                 sub.onNext(1);
@@ -773,7 +773,7 @@ public void firstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenObserv
 
             @Override
             public void subscribe(Observer<? super Integer> sub) {
-                sub.onSubscribe(Disposables.empty());
+                sub.onSubscribe(Disposable.empty());
                 sub.onNext(1);
                 sub.onNext(2);
                 sub.onNext(1);
@@ -850,7 +850,7 @@ public void groupsWithNestedSubscribeOn() throws InterruptedException {
 
             @Override
             public void subscribe(Observer<? super Integer> sub) {
-                sub.onSubscribe(Disposables.empty());
+                sub.onSubscribe(Disposable.empty());
                 sub.onNext(1);
                 sub.onNext(2);
                 sub.onNext(1);
@@ -907,7 +907,7 @@ public void groupsWithNestedObserveOn() throws InterruptedException {
 
             @Override
             public void subscribe(Observer<? super Integer> sub) {
-                sub.onSubscribe(Disposables.empty());
+                sub.onSubscribe(Disposable.empty());
                 sub.onNext(1);
                 sub.onNext(2);
                 sub.onNext(1);
@@ -968,7 +968,7 @@ Observable<Event> SYNC_INFINITE_OBSERVABLE_OF_EVENT(final int numGroups, final A
 
             @Override
             public void subscribe(final Observer<? super Event> op) {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 op.onSubscribe(d);
                 subscribeCounter.incrementAndGet();
                 int i = 0;
@@ -1427,7 +1427,7 @@ public void onNext(GroupedObservable<Integer, Integer> o) {
                 new ObservableSource<Integer>() {
                     @Override
                     public void subscribe(Observer<? super Integer> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         observer.onNext(0);
                         observer.onNext(1);
                         observer.onError(e);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
index f10e62016d..aa17361026 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
@@ -20,11 +20,11 @@
 
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 import org.mockito.MockitoAnnotations;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -387,7 +387,7 @@ public void badOuterSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onError(new TestException("Second"));
                 }
@@ -424,7 +424,7 @@ public void badEndSource() {
                         @Override
                         protected void subscribeActual(Observer<? super Integer> observer) {
                             o[0] = observer;
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
                             observer.onError(new TestException("First"));
                         }
                     }),
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
index ee8931853f..7a84d0c981 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
@@ -13,10 +13,10 @@
 
 package io.reactivex.rxjava3.internal.operators.observable;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -67,7 +67,7 @@ protected void subscribeActual(Observer<? super Integer> observer) {
                         Functions.justFunction(Observable.just(2)),
                         Functions.justSupplier(Observable.just(3))
                 );
-                mn.onSubscribe(Disposables.empty());
+                mn.onSubscribe(Disposable.empty());
             }
         });
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
index 4549f6c514..daf82d84ee 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
@@ -18,12 +18,12 @@
 import java.util.*;
 import java.util.concurrent.ExecutionException;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.observers.DefaultObserver;
 import io.reactivex.rxjava3.testsupport.*;
@@ -150,7 +150,7 @@ private static class TestAsyncErrorObservable implements ObservableSource<String
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             t = new Thread(new Runnable() {
 
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
index 82fd2e28fa..877b75b70a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
@@ -20,12 +20,12 @@
 import java.util.*;
 import java.util.concurrent.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.observers.DefaultObserver;
 import io.reactivex.rxjava3.testsupport.*;
@@ -219,7 +219,7 @@ public void mergeObservableOfObservables() {
 
             @Override
             public void subscribe(Observer<? super Observable<String>> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 // simulate what would happen in an Observable
                 observer.onNext(o1);
                 observer.onNext(o2);
@@ -317,7 +317,7 @@ private static class TestSynchronousObservable implements ObservableSource<Strin
 
         @Override
         public void subscribe(Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             observer.onNext("hello");
             observer.onComplete();
         }
@@ -328,7 +328,7 @@ private static class TestASynchronousObservable implements ObservableSource<Stri
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             t = new Thread(new Runnable() {
 
                 @Override
@@ -352,7 +352,7 @@ private static class TestErrorObservable implements ObservableSource<String> {
 
         @Override
         public void subscribe(Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             boolean errorThrown = false;
             for (String s : valuesToReturn) {
                 if (s == null) {
@@ -383,7 +383,7 @@ private static class TestAsyncErrorObservable implements ObservableSource<String
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             t = new Thread(new Runnable() {
 
                 @Override
@@ -453,7 +453,7 @@ public void errorInParentObservableDelayed() throws Exception {
             Observable<Observable<String>> parentObservable = Observable.unsafeCreate(new ObservableSource<Observable<String>>() {
                 @Override
                 public void subscribe(Observer<? super Observable<String>> op) {
-                    op.onSubscribe(Disposables.empty());
+                    op.onSubscribe(Disposable.empty());
                     op.onNext(Observable.unsafeCreate(o1));
                     op.onNext(Observable.unsafeCreate(o2));
                     op.onError(new NullPointerException("throwing exception in parent"));
@@ -480,7 +480,7 @@ private static class TestASynchronous1sDelayedObservable implements ObservableSo
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             t = new Thread(new Runnable() {
 
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
index 8132fbe229..ac69ffbaa7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
@@ -19,12 +19,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.internal.schedulers.IoScheduler;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -99,7 +99,7 @@ private static class SubscriptionCheckObservable implements ObservableSource<Str
 
         @Override
         public void subscribe(final Observer<? super String> t1) {
-            t1.onSubscribe(Disposables.empty());
+            t1.onSubscribe(Disposable.empty());
             new Thread(new Runnable() {
 
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
index 8736bd4ae3..c198ff83f0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
@@ -79,7 +79,7 @@ public void mergeObservableOfObservables() {
 
             @Override
             public void subscribe(Observer<? super Observable<String>> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 // simulate what would happen in an Observable
                 observer.onNext(o1);
                 observer.onNext(o2);
@@ -135,7 +135,7 @@ public void unSubscribeObservableOfObservables() throws InterruptedException {
             @Override
             public void subscribe(final Observer<? super Observable<Long>> observer) {
                 // verbose on purpose so I can track the inside of it
-                final Disposable upstream = Disposables.fromRunnable(new Runnable() {
+                final Disposable upstream = Disposable.fromRunnable(new Runnable() {
                     @Override
                     public void run() {
                         System.out.println("*** unsubscribed");
@@ -342,7 +342,7 @@ private static class TestSynchronousObservable implements ObservableSource<Strin
 
         @Override
         public void subscribe(Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             observer.onNext("hello");
             observer.onComplete();
         }
@@ -354,7 +354,7 @@ private static class TestASynchronousObservable implements ObservableSource<Stri
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             t = new Thread(new Runnable() {
 
                 @Override
@@ -385,7 +385,7 @@ private static class TestErrorObservable implements ObservableSource<String> {
 
         @Override
         public void subscribe(Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             for (String s : valuesToReturn) {
                 if (s == null) {
                     System.out.println("throwing exception");
@@ -486,7 +486,7 @@ public void subscribe(final Observer<? super Long> child) {
                 .subscribe(new Observer<Long>() {
                     @Override
                     public void onSubscribe(final Disposable d) {
-                        child.onSubscribe(Disposables.fromRunnable(new Runnable() {
+                        child.onSubscribe(Disposable.fromRunnable(new Runnable() {
                             @Override
                             public void run() {
                                 unsubscribed.set(true);
@@ -545,7 +545,7 @@ public void concurrencyWithSleeping() {
             public void subscribe(final Observer<? super Integer> observer) {
                 Worker inner = Schedulers.newThread().createWorker();
                 final CompositeDisposable as = new CompositeDisposable();
-                as.add(Disposables.empty());
+                as.add(Disposable.empty());
                 as.add(inner);
 
                 observer.onSubscribe(as);
@@ -595,7 +595,7 @@ public void concurrencyWithBrokenOnCompleteContract() {
             public void subscribe(final Observer<? super Integer> observer) {
                 Worker inner = Schedulers.newThread().createWorker();
                 final CompositeDisposable as = new CompositeDisposable();
-                as.add(Disposables.empty());
+                as.add(Disposable.empty());
                 as.add(inner);
 
                 observer.onSubscribe(as);
@@ -966,7 +966,7 @@ public Observable<Integer> apply(final Integer i) {
 
                     @Override
                     public void subscribe(Observer<? super Integer> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         if (i < 500) {
                             try {
                                 Thread.sleep(1);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
index 8cdb78df76..e5414dfe7f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
@@ -123,7 +123,7 @@ public void isDisposed() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
 
                 assertFalse(((Disposable)observer).isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
index 5fd7763825..4949ad2081 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
@@ -182,7 +182,7 @@ public void onErrorMainOverflow() {
             TestObserver<Integer> to = new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observerRef.set(observer);
                 }
             }
@@ -234,7 +234,7 @@ public void isDisposed() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
 
                 assertFalse(((Disposable)observer).isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
index a4e38c0936..28c6099d4c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
@@ -174,7 +174,7 @@ public void onErrorMainOverflow() {
             TestObserver<Integer> to = new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observerRef.set(observer);
                 }
             }
@@ -226,7 +226,7 @@ public void isDisposed() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
 
                 assertFalse(((Disposable)observer).isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
index 0602249ceb..286d115edf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
@@ -495,7 +495,7 @@ public void badSource() {
             TestObserver<Integer> to = new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                     observer.onNext(1);
                     observer.onError(new TestException());
@@ -675,7 +675,7 @@ public void nonFusedPollThrows() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
 
                 @SuppressWarnings("unchecked")
                 ObserveOnObserver<Integer> oo = (ObserveOnObserver<Integer>)observer;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
index 2761a6c14b..69a9b0f7cd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
@@ -21,12 +21,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.observers.TestObserver;
@@ -42,7 +42,7 @@ public void resumeNextWithSynchronousExecution() {
 
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext("one");
                 observer.onError(new Throwable("injected failure"));
                 observer.onNext("two");
@@ -199,7 +199,7 @@ static class TestObservable implements ObservableSource<String> {
         @Override
         public void subscribe(final Observer<? super String> observer) {
             System.out.println("TestObservable subscribed to ...");
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             t = new Thread(new Runnable() {
 
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
index 3f20a8a7db..d9520fe6d2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
@@ -20,11 +20,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.mockito.Mockito;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.observers.TestObserver;
@@ -188,7 +188,7 @@ private static class TestObservable implements ObservableSource<String> {
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             System.out.println("TestObservable subscribed to ...");
             t = new Thread(new Runnable() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
index 38f0140e5d..ee80dc2cab 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
@@ -45,7 +45,7 @@ public void publish() throws InterruptedException {
 
             @Override
             public void subscribe(final Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 new Thread(new Runnable() {
 
                     @Override
@@ -354,7 +354,7 @@ public void connectIsIdempotent() {
         Observable<Integer> source = Observable.unsafeCreate(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> t) {
-                t.onSubscribe(Disposables.empty());
+                t.onSubscribe(Disposable.empty());
                 calls.getAndIncrement();
             }
         });
@@ -589,7 +589,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onComplete();
                     observer.onNext(2);
@@ -715,7 +715,7 @@ protected void subscribeActual(Observer<? super Integer> observer) {
         .connect()
         .dispose();
 
-        Disposable bs = Disposables.empty();
+        Disposable bs = Disposable.empty();
 
         sub[0].onSubscribe(bs);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java
index f05e007068..d997e9899f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java
@@ -19,10 +19,10 @@
 
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -291,7 +291,7 @@ public void reduceMaybeBadSource() {
             new Observable<Object>() {
                 @Override
                 protected void subscribeActual(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                     observer.onNext(1);
                     observer.onError(new TestException());
@@ -345,7 +345,7 @@ public void seedBadSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                     observer.onNext(1);
                     observer.onError(new TestException());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
index d5bcf0440e..7e862e1ad2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
@@ -310,7 +310,7 @@ private Observable<Long> synchronousInterval() {
             @Override
             public void subscribe(Observer<? super Long> observer) {
                 final AtomicBoolean cancel = new AtomicBoolean();
-                observer.onSubscribe(Disposables.fromRunnable(new Runnable() {
+                observer.onSubscribe(Disposable.fromRunnable(new Runnable() {
                     @Override
                     public void run() {
                         cancel.set(true);
@@ -338,7 +338,7 @@ public void onlyFirstShouldSubscribeAndLastUnsubscribe() {
             @Override
             public void subscribe(Observer<? super Integer> observer) {
                 subscriptionCount.incrementAndGet();
-                observer.onSubscribe(Disposables.fromRunnable(new Runnable() {
+                observer.onSubscribe(Disposable.fromRunnable(new Runnable() {
                     @Override
                     public void run() {
                             unsubscriptionCount.incrementAndGet();
@@ -623,7 +623,7 @@ public void reset() {
 
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.disposed());
+                observer.onSubscribe(Disposable.disposed());
             }
         }.refCount();
 
@@ -779,7 +779,7 @@ static final class BadObservableSubscribe extends ConnectableObservable<Object>
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -806,7 +806,7 @@ public void reset() {
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -814,7 +814,7 @@ public void connect(Consumer<? super Disposable> connection) {
 
         @Override
         protected void subscribeActual(Observer<? super Object> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
         }
     }
 
@@ -832,7 +832,7 @@ public void reset() {
 
         @Override
         protected void subscribeActual(Observer<? super Object> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
         }
     }
 
@@ -882,7 +882,7 @@ static final class BadObservableSubscribe2 extends ConnectableObservable<Object>
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -896,7 +896,7 @@ public void reset() {
         @Override
         protected void subscribeActual(Observer<? super Object> observer) {
             if (++count == 1) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
             } else {
                 throw new TestException("subscribeActual");
             }
@@ -922,7 +922,7 @@ static final class BadObservableConnect2 extends ConnectableObservable<Object> {
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -935,7 +935,7 @@ public void reset() {
 
         @Override
         protected void subscribeActual(Observer<? super Object> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             observer.onComplete();
         }
     }
@@ -1163,7 +1163,7 @@ static final class BadObservableDoubleOnX extends ConnectableObservable<Object>
         @Override
         public void connect(Consumer<? super Disposable> connection) {
             try {
-                connection.accept(Disposables.empty());
+                connection.accept(Disposable.empty());
             } catch (Throwable ex) {
                 throw ExceptionHelper.wrapOrThrow(ex);
             }
@@ -1176,8 +1176,8 @@ public void reset() {
 
         @Override
         protected void subscribeActual(Observer<? super Object> observer) {
-            observer.onSubscribe(Disposables.empty());
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
+            observer.onSubscribe(Disposable.empty());
             observer.onComplete();
             observer.onComplete();
             observer.onError(new TestException());
@@ -1341,7 +1341,7 @@ public void timeoutResetsSource() {
         ObservableRefCount<Object> o = (ObservableRefCount<Object>)tco.refCount();
 
         RefConnection rc = new RefConnection(o);
-        rc.set(Disposables.empty());
+        rc.set(Disposable.empty());
         o.connection = rc;
 
         o.timeout(rc);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
index 55906d1214..f7b1d93b0b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
@@ -74,7 +74,7 @@ public void repeatTakeWithSubscribeOn() throws InterruptedException {
 
             @Override
             public void subscribe(Observer<? super Integer> sub) {
-                sub.onSubscribe(Disposables.empty());
+                sub.onSubscribe(Disposable.empty());
                 counter.incrementAndGet();
                 sub.onNext(1);
                 sub.onNext(2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
index e1c0bf6f8c..ba3a7d6974 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
@@ -892,7 +892,7 @@ public void cache() throws InterruptedException {
 
             @Override
             public void subscribe(final Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 new Thread(new Runnable() {
 
                     @Override
@@ -1028,7 +1028,7 @@ public void noMissingBackpressureException() {
         Observable<Integer> firehose = Observable.unsafeCreate(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> t) {
-                t.onSubscribe(Disposables.empty());
+                t.onSubscribe(Disposable.empty());
                 for (int i = 0; i < m; i++) {
                     t.onNext(i);
                 }
@@ -1232,7 +1232,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onNext(1);
                     observer.onError(new TestException("Second"));
@@ -1438,7 +1438,7 @@ protected void subscribeActual(Observer<? super Integer> observer) {
         .connect()
         .dispose();
 
-        Disposable bs = Disposables.empty();
+        Disposable bs = Disposable.empty();
 
         sub[0].onSubscribe(bs);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
index 5ef40f340c..e55d5ff716 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
@@ -892,7 +892,7 @@ public void cache() throws InterruptedException {
 
             @Override
             public void subscribe(final Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 new Thread(new Runnable() {
 
                     @Override
@@ -1028,7 +1028,7 @@ public void noMissingBackpressureException() {
         Observable<Integer> firehose = Observable.unsafeCreate(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> t) {
-                t.onSubscribe(Disposables.empty());
+                t.onSubscribe(Disposable.empty());
                 for (int i = 0; i < m; i++) {
                     t.onNext(i);
                 }
@@ -1232,7 +1232,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onNext(1);
                     observer.onError(new TestException("Second"));
@@ -1438,7 +1438,7 @@ protected void subscribeActual(Observer<? super Integer> observer) {
         .connect()
         .dispose();
 
-        Disposable bs = Disposables.empty();
+        Disposable bs = Disposable.empty();
 
         sub[0].onSubscribe(bs);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
index 9143762a5a..d5a70e0e47 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
@@ -30,7 +30,7 @@ public void disposed() {
         TestObserver<Object> to = new TestObserver<Object>();
         ObserverResourceWrapper<Object> orw = new ObserverResourceWrapper<Object>(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         orw.onSubscribe(d);
 
@@ -54,8 +54,8 @@ public void onErrorDisposes() {
         TestObserver<Object> to = new TestObserver<Object>();
         ObserverResourceWrapper<Object> orw = new ObserverResourceWrapper<Object>(to);
 
-        Disposable d = Disposables.empty();
-        Disposable d1 = Disposables.empty();
+        Disposable d = Disposable.empty();
+        Disposable d1 = Disposable.empty();
 
         orw.setResource(d1);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
index 26377c742c..82d96dc5d7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
@@ -52,7 +52,7 @@ public void iterativeBackoff() {
 
             @Override
             public void subscribe(Observer<? super String> t1) {
-                t1.onSubscribe(Disposables.empty());
+                t1.onSubscribe(Disposable.empty());
                 System.out.println(count.get() + " @ " + String.valueOf(last - System.currentTimeMillis()));
                 last = System.currentTimeMillis();
                 if (count.getAndDecrement() == 0) {
@@ -248,7 +248,7 @@ public void singleSubscriptionOnFirst() throws Exception {
         ObservableSource<Integer> onSubscribe = new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 final int emit = inc.incrementAndGet();
                 observer.onNext(emit);
                 observer.onComplete();
@@ -397,7 +397,7 @@ public static class FuncWithErrors implements ObservableSource<String> {
 
         @Override
         public void subscribe(final Observer<? super String> o) {
-            o.onSubscribe(Disposables.empty());
+            o.onSubscribe(Disposable.empty());
             o.onNext("beginningEveryTime");
             int i = count.getAndIncrement();
             if (i < numFailures) {
@@ -432,7 +432,7 @@ public void retryAllowsSubscriptionAfterAllSubscriptionsUnsubscribed() throws In
             @Override
             public void subscribe(Observer<? super String> observer) {
                 subsCount.incrementAndGet();
-                observer.onSubscribe(Disposables.fromRunnable(new Runnable() {
+                observer.onSubscribe(Disposable.fromRunnable(new Runnable() {
                     @Override
                     public void run() {
                             subsCount.decrementAndGet();
@@ -491,7 +491,7 @@ public void sourceObservableRetry1() throws InterruptedException {
         ObservableSource<String> onSubscribe = new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 subsCount.incrementAndGet();
                 observer.onError(new RuntimeException("failed"));
             }
@@ -510,7 +510,7 @@ public void sourceObservableRetry0() throws InterruptedException {
         ObservableSource<String> onSubscribe = new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 subsCount.incrementAndGet();
                 observer.onError(new RuntimeException("failed"));
             }
@@ -539,7 +539,7 @@ static final class SlowObservable implements ObservableSource<Long> {
         @Override
         public void subscribe(final Observer<? super Long> observer) {
             final AtomicBoolean terminate = new AtomicBoolean(false);
-            observer.onSubscribe(Disposables.fromRunnable(new Runnable() {
+            observer.onSubscribe(Disposable.fromRunnable(new Runnable() {
                 @Override
                 public void run() {
                         terminate.set(true);
@@ -840,7 +840,7 @@ public void issue1900SourceNotSupportingBackpressure() {
 
             @Override
             public void subscribe(Observer<? super String> o) {
-                o.onSubscribe(Disposables.empty());
+                o.onSubscribe(Disposable.empty());
                 for (int i = 0; i < NUM_MSG; i++) {
                     o.onNext("msg:" + count.incrementAndGet());
                 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
index 38f293cb4a..d7d20c1347 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
@@ -77,7 +77,7 @@ public void retryTwice() {
             int count;
             @Override
             public void subscribe(Observer<? super Integer> t1) {
-                t1.onSubscribe(Disposables.empty());
+                t1.onSubscribe(Disposable.empty());
                 count++;
                 t1.onNext(0);
                 t1.onNext(1);
@@ -112,7 +112,7 @@ public void retryTwiceAndGiveUp() {
         Observable<Integer> source = Observable.unsafeCreate(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> t1) {
-                t1.onSubscribe(Disposables.empty());
+                t1.onSubscribe(Disposable.empty());
                 t1.onNext(0);
                 t1.onNext(1);
                 t1.onError(new TestException());
@@ -141,7 +141,7 @@ public void retryOnSpecificException() {
             int count;
             @Override
             public void subscribe(Observer<? super Integer> t1) {
-                t1.onSubscribe(Disposables.empty());
+                t1.onSubscribe(Disposable.empty());
                 count++;
                 t1.onNext(0);
                 t1.onNext(1);
@@ -178,7 +178,7 @@ public void retryOnSpecificExceptionAndNotOther() {
             int count;
             @Override
             public void subscribe(Observer<? super Integer> t1) {
-                t1.onSubscribe(Disposables.empty());
+                t1.onSubscribe(Disposable.empty());
                 count++;
                 t1.onNext(0);
                 t1.onNext(1);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
index 5335a75475..0861fc2596 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
@@ -50,7 +50,7 @@ public void sample() {
         Observable<Long> source = Observable.unsafeCreate(new ObservableSource<Long>() {
             @Override
             public void subscribe(final Observer<? super Long> observer1) {
-                observer1.onSubscribe(Disposables.empty());
+                observer1.onSubscribe(Disposable.empty());
                 innerScheduler.schedule(new Runnable() {
                     @Override
                     public void run() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
index 5a7d312ede..590273ce60 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
@@ -321,7 +321,7 @@ public void accept(Throwable t) throws Exception {
             Observable.unsafeCreate(new ObservableSource<Integer>() {
                 @Override
                 public void subscribe(Observer<? super Integer> o) {
-                    Disposable d = Disposables.empty();
+                    Disposable d = Disposable.empty();
                     o.onSubscribe(d);
                     o.onNext(1);
                     o.onNext(2);
@@ -346,7 +346,7 @@ public void scanFunctionThrowsAndUpstreamCompletesDoesNotResultInTwoTerminalEven
         Observable.unsafeCreate(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> o) {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 o.onSubscribe(d);
                 o.onNext(1);
                 o.onNext(2);
@@ -369,7 +369,7 @@ public void scanFunctionThrowsAndUpstreamEmitsOnNextResultsInScanFunctionBeingCa
         Observable.unsafeCreate(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> o) {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 o.onSubscribe(d);
                 o.onNext(1);
                 o.onNext(2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
index b0023e2989..2a2b7dff0d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
@@ -20,10 +20,10 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.observers.DefaultObserver;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
@@ -221,7 +221,7 @@ static class TestSingleThreadedObservable implements ObservableSource<String> {
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             System.out.println("TestSingleThreadedObservable subscribed to ...");
             t = new Thread(new Runnable() {
 
@@ -272,7 +272,7 @@ private static class TestMultiThreadedObservable implements ObservableSource<Str
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             System.out.println("TestMultiThreadedObservable subscribed to ...");
             final NullPointerException npe = new NullPointerException();
             t = new Thread(new Runnable() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
index 8d2a1706ba..26ffe95a71 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
@@ -43,7 +43,7 @@ public void issue813() throws InterruptedException {
             @Override
             public void subscribe(
                     final Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 scheduled.countDown();
                 try {
                     try {
@@ -79,7 +79,7 @@ public void onError() {
 
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onError(new RuntimeException("fail"));
             }
 
@@ -153,7 +153,7 @@ public void unsubscribeInfiniteStream() throws InterruptedException {
 
             @Override
             public void subscribe(Observer<? super Integer> sub) {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 sub.onSubscribe(d);
                 for (int i = 1; !d.isDisposed(); i++) {
                     count.incrementAndGet();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java
index 00948a6e7f..34e24d81cb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java
@@ -54,7 +54,7 @@ public void switchWhenEmpty() throws Exception {
     @Test
     public void switchTriggerUnsubscribe() throws Exception {
 
-        final Disposable d = Disposables.empty();
+        final Disposable d = Disposable.empty();
 
         Observable<Long> withProducer = Observable.unsafeCreate(new ObservableSource<Long>() {
             @Override
@@ -96,7 +96,7 @@ public void onNext(Long aLong) {
 
     @Test
     public void switchShouldTriggerUnsubscribe() {
-        final Disposable d = Disposables.empty();
+        final Disposable d = Disposable.empty();
 
         Observable.unsafeCreate(new ObservableSource<Long>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
index dadabeeea3..5eb40104fc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
@@ -57,11 +57,11 @@ public void switchWhenOuterCompleteBeforeInner() {
         Observable<Observable<String>> source = Observable.unsafeCreate(new ObservableSource<Observable<String>>() {
             @Override
             public void subscribe(Observer<? super Observable<String>> outerObserver) {
-                outerObserver.onSubscribe(Disposables.empty());
+                outerObserver.onSubscribe(Disposable.empty());
                 publishNext(outerObserver, 50, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 70, "one");
                         publishNext(innerObserver, 100, "two");
                         publishCompleted(innerObserver, 200);
@@ -86,11 +86,11 @@ public void switchWhenInnerCompleteBeforeOuter() {
         Observable<Observable<String>> source = Observable.unsafeCreate(new ObservableSource<Observable<String>>() {
             @Override
             public void subscribe(Observer<? super Observable<String>> outerObserver) {
-                outerObserver.onSubscribe(Disposables.empty());
+                outerObserver.onSubscribe(Disposable.empty());
                 publishNext(outerObserver, 10, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 0, "one");
                         publishNext(innerObserver, 10, "two");
                         publishCompleted(innerObserver, 20);
@@ -100,7 +100,7 @@ public void subscribe(Observer<? super String> innerObserver) {
                 publishNext(outerObserver, 100, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 0, "three");
                         publishNext(innerObserver, 10, "four");
                         publishCompleted(innerObserver, 20);
@@ -132,11 +132,11 @@ public void switchWithComplete() {
         Observable<Observable<String>> source = Observable.unsafeCreate(new ObservableSource<Observable<String>>() {
             @Override
             public void subscribe(Observer<? super Observable<String>> outerObserver) {
-                outerObserver.onSubscribe(Disposables.empty());
+                outerObserver.onSubscribe(Disposable.empty());
                 publishNext(outerObserver, 50, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(final Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 60, "one");
                         publishNext(innerObserver, 100, "two");
                     }
@@ -145,7 +145,7 @@ public void subscribe(final Observer<? super String> innerObserver) {
                 publishNext(outerObserver, 200, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(final Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 0, "three");
                         publishNext(innerObserver, 100, "four");
                     }
@@ -191,11 +191,11 @@ public void switchWithError() {
         Observable<Observable<String>> source = Observable.unsafeCreate(new ObservableSource<Observable<String>>() {
             @Override
             public void subscribe(Observer<? super Observable<String>> outerObserver) {
-                outerObserver.onSubscribe(Disposables.empty());
+                outerObserver.onSubscribe(Disposable.empty());
                 publishNext(outerObserver, 50, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(final Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 50, "one");
                         publishNext(innerObserver, 100, "two");
                     }
@@ -204,7 +204,7 @@ public void subscribe(final Observer<? super String> innerObserver) {
                 publishNext(outerObserver, 200, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 0, "three");
                         publishNext(innerObserver, 100, "four");
                     }
@@ -250,11 +250,11 @@ public void switchWithSubsequenceComplete() {
         Observable<Observable<String>> source = Observable.unsafeCreate(new ObservableSource<Observable<String>>() {
             @Override
             public void subscribe(Observer<? super Observable<String>> outerObserver) {
-                outerObserver.onSubscribe(Disposables.empty());
+                outerObserver.onSubscribe(Disposable.empty());
                 publishNext(outerObserver, 50, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 50, "one");
                         publishNext(innerObserver, 100, "two");
                     }
@@ -263,7 +263,7 @@ public void subscribe(Observer<? super String> innerObserver) {
                 publishNext(outerObserver, 130, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishCompleted(innerObserver, 0);
                     }
                 }));
@@ -271,7 +271,7 @@ public void subscribe(Observer<? super String> innerObserver) {
                 publishNext(outerObserver, 150, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 50, "three");
                     }
                 }));
@@ -304,11 +304,11 @@ public void switchWithSubsequenceError() {
         Observable<Observable<String>> source = Observable.unsafeCreate(new ObservableSource<Observable<String>>() {
             @Override
             public void subscribe(Observer<? super Observable<String>> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 publishNext(observer, 50, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         publishNext(observer, 50, "one");
                         publishNext(observer, 100, "two");
                     }
@@ -317,7 +317,7 @@ public void subscribe(Observer<? super String> observer) {
                 publishNext(observer, 130, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         publishError(observer, 0, new TestException());
                     }
                 }));
@@ -325,7 +325,7 @@ public void subscribe(Observer<? super String> observer) {
                 publishNext(observer, 150, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         publishNext(observer, 50, "three");
                     }
                 }));
@@ -387,11 +387,11 @@ public void switchIssue737() {
         Observable<Observable<String>> source = Observable.unsafeCreate(new ObservableSource<Observable<String>>() {
             @Override
             public void subscribe(Observer<? super Observable<String>> outerObserver) {
-                outerObserver.onSubscribe(Disposables.empty());
+                outerObserver.onSubscribe(Disposable.empty());
                 publishNext(outerObserver, 0, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 10, "1-one");
                         publishNext(innerObserver, 20, "1-two");
                         // The following events will be ignored
@@ -402,7 +402,7 @@ public void subscribe(Observer<? super String> innerObserver) {
                 publishNext(outerObserver, 25, Observable.unsafeCreate(new ObservableSource<String>() {
                     @Override
                     public void subscribe(Observer<? super String> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         publishNext(innerObserver, 10, "2-one");
                         publishNext(innerObserver, 20, "2-two");
                         publishNext(innerObserver, 30, "2-three");
@@ -435,7 +435,7 @@ public void unsubscribe() {
                 Observable.unsafeCreate(new ObservableSource<Observable<Integer>>() {
                     @Override
                     public void subscribe(final Observer<? super Observable<Integer>> observer) {
-                        Disposable bs = Disposables.empty();
+                        Disposable bs = Disposable.empty();
                         observer.onSubscribe(bs);
                         observer.onNext(Observable.just(1));
                         isUnsubscribed.set(bs.isDisposed());
@@ -666,7 +666,7 @@ public SingleSource<Integer> apply(Object v) throws Exception {
                 return new SingleSource<Integer>() {
                     @Override
                     public void subscribe(SingleObserver<? super Integer> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         observer.onSuccess(1);
                     }
                 };
@@ -870,7 +870,7 @@ public void badMainSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                     observer.onError(new TestException());
                     observer.onComplete();
@@ -910,7 +910,7 @@ public void badInnerSource() {
             .switchMap(Functions.justFunction(new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException());
                     observer.onComplete();
                     observer.onError(new TestException());
@@ -1023,10 +1023,10 @@ public ObservableSource<Integer> apply(Integer v) throws Exception {
                 })
                 .test();
 
-                obs1.get().onSubscribe(Disposables.empty());
+                obs1.get().onSubscribe(Disposable.empty());
                 obs1.get().onNext(1);
 
-                obs2.get().onSubscribe(Disposables.empty());
+                obs2.get().onSubscribe(Disposable.empty());
 
                 final TestException ex1 = new TestException();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
index 73e2cc33c7..2225f3022b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
@@ -115,7 +115,7 @@ public void takeDoesntLeakErrors() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext("one");
                 observer.onError(new Throwable("test failed"));
             }
@@ -181,7 +181,7 @@ public void multiTake() {
 
             @Override
             public void subscribe(Observer<? super Integer> observer) {
-                Disposable bs = Disposables.empty();
+                Disposable bs = Disposable.empty();
                 observer.onSubscribe(bs);
                 for (int i = 0; !bs.isDisposed(); i++) {
                     System.out.println("Emit: " + i);
@@ -214,7 +214,7 @@ static class TestObservableFunc implements ObservableSource<String> {
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             System.out.println("TestObservable subscribed to ...");
             t = new Thread(new Runnable() {
 
@@ -243,7 +243,7 @@ public void run() {
 
         @Override
         public void subscribe(Observer<? super Long> op) {
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
             op.onSubscribe(d);
             long l = 1;
             while (!d.isDisposed()) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
index b197d0bd89..9566d64c9a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
@@ -18,10 +18,10 @@
 
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -180,7 +180,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onComplete();
                     observer.onNext(1);
                     observer.onError(new TestException());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
index 7c30166bb3..b348cda2ce 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
@@ -104,7 +104,7 @@ public void takeWhileDoesntLeakErrors() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext("one");
                 observer.onError(new Throwable("test failed"));
             }
@@ -271,7 +271,7 @@ public void badSource() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onComplete();
                 observer.onComplete();
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
index 416c248f6a..c8eedc72bd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
@@ -19,11 +19,11 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 import org.mockito.InOrder;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.TestScheduler;
@@ -48,7 +48,7 @@ public void throttlingWithCompleted() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> innerObserver) {
-                innerObserver.onSubscribe(Disposables.empty());
+                innerObserver.onSubscribe(Disposable.empty());
                 publishNext(innerObserver, 100, "one");    // publish as it's first
                 publishNext(innerObserver, 300, "two");    // skip as it's last within the first 400
                 publishNext(innerObserver, 900, "three");   // publish
@@ -76,7 +76,7 @@ public void throttlingWithError() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> innerObserver) {
-                innerObserver.onSubscribe(Disposables.empty());
+                innerObserver.onSubscribe(Disposable.empty());
                 Exception error = new TestException();
                 publishNext(innerObserver, 100, "one");    // Should be published since it is first
                 publishNext(innerObserver, 200, "two");    // Should be skipped since onError will arrive before the timeout expires
@@ -173,7 +173,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onNext(2);
                     observer.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
index f1bb9e7bfe..f0001ab276 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
@@ -241,7 +241,7 @@ public void run() {
 
                     @Override
                     public void subscribe(Observer<? super String> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         try {
                             timeoutSetuped.countDown();
                             exit.await();
@@ -360,7 +360,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onComplete();
@@ -386,7 +386,7 @@ public void badSourceOther() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     observer.onNext(1);
                     observer.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
index e590ec1663..9e6540e0b3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
@@ -283,7 +283,7 @@ public Observable<Integer> apply(Integer t1) {
                     return Observable.unsafeCreate(new ObservableSource<Integer>() {
                         @Override
                         public void subscribe(Observer<? super Integer> observer) {
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
                             enteredTimeoutOne.countDown();
                             // force the timeout message be sent after observer.onNext(2)
                             while (true) {
@@ -436,7 +436,7 @@ public void badInnerSource() {
             .timeout(Functions.justFunction(new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onNext(2);
                     observer.onError(new TestException("Second"));
@@ -465,7 +465,7 @@ public void badInnerSourceOther() {
             .timeout(Functions.justFunction(new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onNext(2);
                     observer.onError(new TestException("Second"));
@@ -497,7 +497,7 @@ public void badSourceTimeout() {
         new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onNext(1);
                 observer.onNext(2);
                 observer.onError(new TestException("First"));
@@ -564,7 +564,7 @@ public void lateOnTimeoutError() {
                     @Override
                     protected void subscribeActual(
                             Observer<? super Integer> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         sub[count++] = observer;
                     }
                 };
@@ -619,7 +619,7 @@ public void lateOnTimeoutFallbackRace() {
                     protected void subscribeActual(
                             Observer<? super Integer> observer) {
                         assertFalse(((Disposable)observer).isDisposed());
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         sub[count++] = observer;
                     }
                 };
@@ -674,7 +674,7 @@ public void onErrorOnTimeoutRace() {
                     protected void subscribeActual(
                             Observer<? super Integer> observer) {
                         assertFalse(((Disposable)observer).isDisposed());
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         sub[count++] = observer;
                     }
                 };
@@ -729,7 +729,7 @@ public void onCompleteOnTimeoutRace() {
                     protected void subscribeActual(
                             Observer<? super Integer> observer) {
                         assertFalse(((Disposable)observer).isDisposed());
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         sub[count++] = observer;
                     }
                 };
@@ -782,7 +782,7 @@ public void onCompleteOnTimeoutRaceFallback() {
                     protected void subscribeActual(
                             Observer<? super Integer> observer) {
                         assertFalse(((Disposable)observer).isDisposed());
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         sub[count++] = observer;
                     }
                 };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
index ae1d856b0b..d77ee456db 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
@@ -21,11 +21,11 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 import org.mockito.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableTimer.TimerObserver;
@@ -349,7 +349,7 @@ public Long apply(Long v) throws Exception {
     @Test
     public void cancelledAndRun() {
         TestObserver<Long> to = new TestObserver<Long>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
         TimerObserver tm = new TimerObserver(to);
 
         tm.dispose();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
index ce8eee9b50..8a4ac039b7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
@@ -248,7 +248,7 @@ public void signalAfterDispose() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onNext(2);
                     observer.onError(new TestException());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
index 62e8986292..6312ed7d42 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
@@ -209,7 +209,7 @@ private void performTestUsingWithObservableFactoryError(boolean disposeEagerly)
         Supplier<Disposable> resourceFactory = new Supplier<Disposable>() {
             @Override
             public Disposable get() {
-                return Disposables.fromRunnable(unsubscribe);
+                return Disposable.fromRunnable(unsubscribe);
             }
         };
 
@@ -538,7 +538,7 @@ public void eagerDisposedOnComplete() {
         Observable.using(Functions.justSupplier(1), Functions.justFunction(new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 to.dispose();
                 observer.onComplete();
             }
@@ -553,7 +553,7 @@ public void eagerDisposedOnError() {
         Observable.using(Functions.justSupplier(1), Functions.justFunction(new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 to.dispose();
                 observer.onError(new TestException());
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
index e6804ddcab..63bb37eafa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
@@ -374,7 +374,7 @@ public void mainAndBoundaryBothError() {
             .window(new Observable<Object>() {
                 @Override
                 protected void subscribeActual(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     ref.set(observer);
                 }
             })
@@ -413,14 +413,14 @@ public void mainCompleteBoundaryErrorRace() {
                 TestObserverEx<Observable<Object>> to = new Observable<Object>() {
                     @Override
                     protected void subscribeActual(Observer<? super Object> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         refMain.set(observer);
                     }
                 }
                 .window(new Observable<Object>() {
                     @Override
                     protected void subscribeActual(Observer<? super Object> observer) {
-                        observer.onSubscribe(Disposables.empty());
+                        observer.onSubscribe(Disposable.empty());
                         ref.set(observer);
                     }
                 })
@@ -463,14 +463,14 @@ public void mainNextBoundaryNextRace() {
             TestObserver<Observable<Object>> to = new Observable<Object>() {
                 @Override
                 protected void subscribeActual(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     refMain.set(observer);
                 }
             }
             .window(new Observable<Object>() {
                 @Override
                 protected void subscribeActual(Observer<? super Object> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     ref.set(observer);
                 }
             })
@@ -506,14 +506,14 @@ public void takeOneAnotherBoundary() {
         TestObserverEx<Observable<Object>> to = new Observable<Object>() {
             @Override
             protected void subscribeActual(Observer<? super Object> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 refMain.set(observer);
             }
         }
         .window(new Observable<Object>() {
             @Override
             protected void subscribeActual(Observer<? super Object> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 ref.set(observer);
             }
         })
@@ -538,7 +538,7 @@ public void disposeMainBoundaryCompleteRace() {
             final TestObserver<Observable<Object>> to = new Observable<Object>() {
                  @Override
                  protected void subscribeActual(Observer<? super Object> observer) {
-                     observer.onSubscribe(Disposables.empty());
+                     observer.onSubscribe(Disposable.empty());
                      refMain.set(observer);
                  }
              }
@@ -596,7 +596,7 @@ public void disposeMainBoundaryErrorRace() {
            final TestObserver<Observable<Object>> to = new Observable<Object>() {
                @Override
                protected void subscribeActual(Observer<? super Object> observer) {
-                   observer.onSubscribe(Disposables.empty());
+                   observer.onSubscribe(Disposable.empty());
                    refMain.set(observer);
                }
            }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
index b7ef436399..274c9712a7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
@@ -219,7 +219,7 @@ public static Observable<Integer> hotStream() {
         return Observable.unsafeCreate(new ObservableSource<Integer>() {
             @Override
             public void subscribe(Observer<? super Integer> observer) {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 observer.onSubscribe(d);
                 while (!d.isDisposed()) {
                     // burst some number of items
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
index da02116cd9..d3466c7eb4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
@@ -19,12 +19,12 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -53,7 +53,7 @@ public void observableBasedOpenerAndCloser() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> innerObserver) {
-                innerObserver.onSubscribe(Disposables.empty());
+                innerObserver.onSubscribe(Disposable.empty());
                 push(innerObserver, "one", 10);
                 push(innerObserver, "two", 60);
                 push(innerObserver, "three", 110);
@@ -66,7 +66,7 @@ public void subscribe(Observer<? super String> innerObserver) {
         Observable<Object> openings = Observable.unsafeCreate(new ObservableSource<Object>() {
             @Override
             public void subscribe(Observer<? super Object> innerObserver) {
-                innerObserver.onSubscribe(Disposables.empty());
+                innerObserver.onSubscribe(Disposable.empty());
                 push(innerObserver, new Object(), 50);
                 push(innerObserver, new Object(), 200);
                 complete(innerObserver, 250);
@@ -79,7 +79,7 @@ public Observable<Object> apply(Object opening) {
                 return Observable.unsafeCreate(new ObservableSource<Object>() {
                     @Override
                     public void subscribe(Observer<? super Object> innerObserver) {
-                        innerObserver.onSubscribe(Disposables.empty());
+                        innerObserver.onSubscribe(Disposable.empty());
                         push(innerObserver, new Object(), 100);
                         complete(innerObserver, 101);
                     }
@@ -371,7 +371,7 @@ public Observable<Integer> apply(Integer f) throws Exception {
                         @Override
                         protected void subscribeActual(
                                 Observer<? super Integer> observer) {
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
                             observer.onNext(1);
                             observer.onNext(2);
                             observer.onError(new TestException());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
index 8eaebf5991..51591516a6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
@@ -19,12 +19,12 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -52,7 +52,7 @@ public void timedAndCount() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 push(observer, "one", 10);
                 push(observer, "two", 90);
                 push(observer, "three", 110);
@@ -88,7 +88,7 @@ public void timed() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 push(observer, "one", 98);
                 push(observer, "two", 99);
                 push(observer, "three", 99); // FIXME happens after the window is open
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
index f87491e0e0..00b4e73f18 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
@@ -19,13 +19,13 @@
 
 import java.util.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.mockito.InOrder;
 
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -545,7 +545,7 @@ public void manyErrors() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onError(new TestException("First"));
                     observer.onNext(1);
                     observer.onError(new TestException("Second"));
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java
index 53fd62d50d..a4ce20c33c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java
@@ -20,13 +20,13 @@
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 import org.mockito.InOrder;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.util.CrashingIterable;
@@ -409,7 +409,7 @@ public void badSource() {
             new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onComplete();
                     observer.onNext(2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
index e185dea68d..b52b90183d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
@@ -624,7 +624,7 @@ private static class TestObservable implements ObservableSource<String> {
         public void subscribe(Observer<? super String> observer) {
             // just store the variable where it can be accessed so we can manually trigger it
             this.observer = observer;
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
         }
 
     }
@@ -1024,7 +1024,7 @@ Observable<Integer> OBSERVABLE_OF_5_INTEGERS(final AtomicInteger numEmitted) {
 
             @Override
             public void subscribe(final Observer<? super Integer> o) {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 o.onSubscribe(d);
                 for (int i = 1; i <= 5; i++) {
                     if (d.isDisposed()) {
@@ -1045,7 +1045,7 @@ Observable<Integer> ASYNC_OBSERVABLE_OF_INFINITE_INTEGERS(final CountDownLatch l
 
             @Override
             public void subscribe(final Observer<? super Integer> o) {
-                final Disposable d = Disposables.empty();
+                final Disposable d = Disposable.empty();
                 o.onSubscribe(d);
                 Thread t = new Thread(new Runnable() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
index 98c0a67903..489744b708 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
@@ -36,7 +36,7 @@ public void nullArgument() {
 
     @Test
     public void basic() {
-        final Disposable d = Disposables.empty();
+        final Disposable d = Disposable.empty();
 
         Single.<Integer>create(new SingleOnSubscribe<Integer>() {
             @Override
@@ -57,8 +57,8 @@ public void subscribe(SingleEmitter<Integer> e) throws Exception {
 
     @Test
     public void basicWithCancellable() {
-        final Disposable d1 = Disposables.empty();
-        final Disposable d2 = Disposables.empty();
+        final Disposable d1 = Disposable.empty();
+        final Disposable d2 = Disposable.empty();
 
         Single.<Integer>create(new SingleOnSubscribe<Integer>() {
             @Override
@@ -86,7 +86,7 @@ public void cancel() throws Exception {
 
     @Test
     public void basicWithError() {
-        final Disposable d = Disposables.empty();
+        final Disposable d = Disposable.empty();
 
         Single.<Integer>create(new SingleOnSubscribe<Integer>() {
             @Override
@@ -193,7 +193,7 @@ public void createConsumerThrowsResource() {
         Single.create(new SingleOnSubscribe<Object>() {
             @Override
             public void subscribe(SingleEmitter<Object> s) throws Exception {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 s.setDisposable(d);
                 try {
                     s.onSuccess(1);
@@ -257,7 +257,7 @@ public void createConsumerThrowsResourceOnError() {
         Single.create(new SingleOnSubscribe<Object>() {
             @Override
             public void subscribe(SingleEmitter<Object> s) throws Exception {
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
                 s.setDisposable(d);
                 try {
                     s.onError(new IOException());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
index 4f97e5c6bf..1eaf426511 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
@@ -19,11 +19,11 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
@@ -215,7 +215,7 @@ public void withObservableError2() {
             .delaySubscription(new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     observer.onNext(1);
                     observer.onError(new TestException());
                 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
index 1b7f5e7a34..d582339cd0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
@@ -64,7 +64,7 @@ public void onSuccess() {
 
     @Test
     public void cancelDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Object> to = new Single<Object>() {
@@ -90,7 +90,7 @@ protected void subscribeActual(SingleObserver<? super Object> observer) {
 
     @Test
     public void errorDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Integer> to = new Single<Integer>() {
@@ -116,7 +116,7 @@ protected void subscribeActual(SingleObserver<? super Integer> observer) {
 
     @Test
     public void successDetaches() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
 
         TestObserver<Integer> to = new Single<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java
index 9bea6e178c..cf67202641 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java
@@ -332,7 +332,7 @@ public void accept(Integer v) throws Exception {
     public void onSubscribeCrash() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable bs = Disposables.empty();
+            final Disposable bs = Disposable.empty();
 
             new Single<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
index bf6e4fa8cf..ca2ccacdc2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
@@ -18,10 +18,10 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -51,7 +51,7 @@ public void wrap() {
         Single.wrap(new SingleSource<Object>() {
             @Override
             public void subscribe(SingleObserver<? super Object> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onSuccess(1);
             }
         })
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
index c1463923cf..28f268f423 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
@@ -101,7 +101,7 @@ public void errorNonEager() {
 
     @Test
     public void eagerMapperThrowsDisposerThrows() {
-        TestObserverEx<Integer> to = Single.using(Functions.justSupplier(Disposables.empty()), mapperThrows, disposerThrows)
+        TestObserverEx<Integer> to = Single.using(Functions.justSupplier(Disposable.empty()), mapperThrows, disposerThrows)
         .to(TestHelper.<Integer>testConsumer())
         .assertFailure(CompositeException.class);
 
@@ -116,7 +116,7 @@ public void noneagerMapperThrowsDisposerThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
 
         try {
-            Single.using(Functions.justSupplier(Disposables.empty()), mapperThrows, disposerThrows, false)
+            Single.using(Functions.justSupplier(Disposable.empty()), mapperThrows, disposerThrows, false)
             .to(TestHelper.<Integer>testConsumer())
             .assertFailureAndMessage(TestException.class, "Mapper");
 
@@ -128,7 +128,7 @@ public void noneagerMapperThrowsDisposerThrows() {
 
     @Test
     public void resourceDisposedIfMapperCrashes() {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         Single.using(Functions.justSupplier(d), mapperThrows, disposer)
         .test()
@@ -139,7 +139,7 @@ public void resourceDisposedIfMapperCrashes() {
 
     @Test
     public void resourceDisposedIfMapperCrashesNonEager() {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         Single.using(Functions.justSupplier(d), mapperThrows, disposer, false)
         .test()
@@ -150,7 +150,7 @@ public void resourceDisposedIfMapperCrashesNonEager() {
 
     @Test
     public void dispose() {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         Single.using(Functions.justSupplier(d), mapper, disposer, false)
         .test(true);
@@ -160,7 +160,7 @@ public void dispose() {
 
     @Test
     public void disposerThrowsEager() {
-        Single.using(Functions.justSupplier(Disposables.empty()), mapper, disposerThrows)
+        Single.using(Functions.justSupplier(Disposable.empty()), mapper, disposerThrows)
         .test()
         .assertFailure(TestException.class);
     }
@@ -171,7 +171,7 @@ public void disposerThrowsNonEager() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
 
         try {
-            Single.using(Functions.justSupplier(Disposables.empty()), mapper, disposerThrows, false)
+            Single.using(Functions.justSupplier(Disposable.empty()), mapper, disposerThrows, false)
             .test()
             .assertResult(1);
             TestHelper.assertUndeliverable(errors, 0, TestException.class, "Disposer");
@@ -182,7 +182,7 @@ public void disposerThrowsNonEager() {
 
     @Test
     public void errorAndDisposerThrowsEager() {
-        TestObserverEx<Integer> to = Single.using(Functions.justSupplier(Disposables.empty()),
+        TestObserverEx<Integer> to = Single.using(Functions.justSupplier(Disposable.empty()),
         new Function<Disposable, SingleSource<Integer>>() {
             @Override
             public SingleSource<Integer> apply(Disposable v) throws Exception {
@@ -202,7 +202,7 @@ public void errorAndDisposerThrowsNonEager() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
 
         try {
-            Single.using(Functions.justSupplier(Disposables.empty()),
+            Single.using(Functions.justSupplier(Disposable.empty()),
             new Function<Disposable, SingleSource<Integer>>() {
                 @Override
                 public SingleSource<Integer> apply(Disposable v) throws Exception {
@@ -222,7 +222,7 @@ public void successDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             final TestObserver<Integer> to = Single.using(Functions.justSupplier(d), new Function<Disposable, SingleSource<Integer>>() {
                 @Override
@@ -264,11 +264,11 @@ public SingleSource<Integer> apply(Integer v) throws Exception {
                     return new Single<Integer>() {
                         @Override
                         protected void subscribeActual(SingleObserver<? super Integer> observer) {
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
 
                             assertFalse(((Disposable)observer).isDisposed());
 
-                            Disposable d = Disposables.empty();
+                            Disposable d = Disposable.empty();
                             observer.onSubscribe(d);
 
                             assertTrue(d.isDisposed());
@@ -297,7 +297,7 @@ public void errorDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             final TestObserver<Integer> to = Single.using(Functions.justSupplier(d), new Function<Disposable, SingleSource<Integer>>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java
index 19a68d0818..8018806a37 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java
@@ -26,7 +26,7 @@ public class DisposeOnCancelTest extends RxJavaTest {
 
     @Test
     public void basicCoverage() throws Exception {
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         DisposeOnCancel doc = new DisposeOnCancel(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java
index 8225fd4e06..d48228d20c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java
@@ -268,7 +268,7 @@ public void scheduledActiondisposedSetRace() {
                 @Override
                 protected Disposable callActual(Worker actualWorker,
                         CompletableObserver actionCompletable) {
-                    return Disposables.empty();
+                    return Disposable.empty();
                 }
 
             };
@@ -299,7 +299,7 @@ public void scheduledActionStates() {
             protected Disposable callActual(Worker actualWorker,
                     CompletableObserver actionCompletable) {
                 count.incrementAndGet();
-                return Disposables.empty();
+                return Disposable.empty();
             }
 
         };
@@ -320,7 +320,7 @@ protected Disposable callActual(Worker actualWorker,
         assertEquals(0, count.get());
 
         // should not run when already scheduled
-        sa.set(Disposables.empty());
+        sa.set(Disposable.empty());
 
         sa.call(Schedulers.single().createWorker(), null);
 
@@ -336,7 +336,7 @@ protected Disposable callActual(Worker actualWorker,
                     CompletableObserver actionCompletable) {
                 count.incrementAndGet();
                 dispose();
-                return Disposables.empty();
+                return Disposable.empty();
             }
 
         };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
index 82f66ceff6..f6dfe5e455 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
@@ -43,20 +43,20 @@ public void run() {
         Scheduler s = new SingleScheduler();
         s.shutdown();
 
-        assertEquals(Disposables.disposed(), s.scheduleDirect(r));
+        assertEquals(Disposable.disposed(), s.scheduleDirect(r));
 
-        assertEquals(Disposables.disposed(), s.scheduleDirect(r, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), s.scheduleDirect(r, 1, TimeUnit.SECONDS));
 
-        assertEquals(Disposables.disposed(), s.schedulePeriodicallyDirect(r, 1, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), s.schedulePeriodicallyDirect(r, 1, 1, TimeUnit.SECONDS));
 
         Worker w = s.createWorker();
         ((ScheduledWorker)w).executor.shutdownNow();
 
-        assertEquals(Disposables.disposed(), w.schedule(r));
+        assertEquals(Disposable.disposed(), w.schedule(r));
 
-        assertEquals(Disposables.disposed(), w.schedule(r, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), w.schedule(r, 1, TimeUnit.SECONDS));
 
-        assertEquals(Disposables.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS));
 
         assertEquals(0, calls[0]);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java
index d2d9b91163..60da2b7a29 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java
@@ -44,7 +44,7 @@ public void normal() {
 
             c.request(-10);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             c.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
index 74bfb0c626..41d3178384 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
@@ -146,7 +146,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
     @Test
     public void unorderedFastPathNoRequest() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
@@ -160,7 +160,7 @@ public void unorderedFastPathNoRequest() {
     @Test
     public void orderedFastPathNoRequest() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
@@ -174,7 +174,7 @@ public void orderedFastPathNoRequest() {
     @Test
     public void acceptBadRequest() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
@@ -192,7 +192,7 @@ public void acceptBadRequest() {
     @Test
     public void unorderedFastPathRequest1() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
@@ -206,7 +206,7 @@ public void unorderedFastPathRequest1() {
     @Test
     public void orderedFastPathRequest1() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
@@ -220,7 +220,7 @@ public void orderedFastPathRequest1() {
     @Test
     public void unorderedSlowPath() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
@@ -233,7 +233,7 @@ public void unorderedSlowPath() {
     @Test
     public void orderedSlowPath() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
@@ -246,7 +246,7 @@ public void orderedSlowPath() {
     @Test
     public void orderedSlowPathNonEmptyQueue() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
@@ -262,7 +262,7 @@ public void unorderedOnNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
             TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
             final QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
             ts.onSubscribe(new BooleanSubscription());
 
@@ -285,7 +285,7 @@ public void orderedOnNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
             TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
             final QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
             ts.onSubscribe(new BooleanSubscription());
 
@@ -306,7 +306,7 @@ public void run() {
     @Test
     public void unorderedFastPathReject() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnorderedReject(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
@@ -322,7 +322,7 @@ public void unorderedFastPathReject() {
     @Test
     public void orderedFastPathReject() {
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrderedReject(ts, d);
         ts.onSubscribe(new BooleanSubscription());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
index 76ed844842..dc7c82893d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
@@ -35,7 +35,7 @@ public class SubscriberResourceWrapperTest extends RxJavaTest {
     @Test
     public void cancel() {
         BooleanSubscription bs = new BooleanSubscription();
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         s.setResource(d);
 
@@ -54,7 +54,7 @@ public void cancel() {
     @Test
     public void error() {
         BooleanSubscription bs = new BooleanSubscription();
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         s.setResource(d);
 
@@ -71,7 +71,7 @@ public void error() {
     @Test
     public void complete() {
         BooleanSubscription bs = new BooleanSubscription();
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         s.setResource(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
index 86f823e22e..9b033bffdd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
@@ -17,10 +17,10 @@
 
 import java.util.List;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.observers.TestObserver;
@@ -124,7 +124,7 @@ public void tryTerminateConsumerSubscriberTerminated() {
     @Test
     public void tryTerminateConsumerObserverNoError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.tryTerminateConsumer((Observer<Object>)to);
@@ -134,7 +134,7 @@ public void tryTerminateConsumerObserverNoError() {
     @Test
     public void tryTerminateConsumerObserverError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.set(new TestException());
@@ -145,7 +145,7 @@ public void tryTerminateConsumerObserverError() {
     @Test
     public void tryTerminateConsumerObserverTerminated() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.terminate();
@@ -156,7 +156,7 @@ public void tryTerminateConsumerObserverTerminated() {
     @Test
     public void tryTerminateConsumerMaybeObserverNoError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.tryTerminateConsumer((MaybeObserver<Object>)to);
@@ -166,7 +166,7 @@ public void tryTerminateConsumerMaybeObserverNoError() {
     @Test
     public void tryTerminateConsumerMaybeObserverError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.set(new TestException());
@@ -177,7 +177,7 @@ public void tryTerminateConsumerMaybeObserverError() {
     @Test
     public void tryTerminateConsumerMaybeObserverTerminated() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.terminate();
@@ -188,7 +188,7 @@ public void tryTerminateConsumerMaybeObserverTerminated() {
     @Test
     public void tryTerminateConsumerSingleNoError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.tryTerminateConsumer((SingleObserver<Object>)to);
@@ -198,7 +198,7 @@ public void tryTerminateConsumerSingleNoError() {
     @Test
     public void tryTerminateConsumerSingleError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.set(new TestException());
@@ -209,7 +209,7 @@ public void tryTerminateConsumerSingleError() {
     @Test
     public void tryTerminateConsumerSingleTerminated() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.terminate();
@@ -220,7 +220,7 @@ public void tryTerminateConsumerSingleTerminated() {
     @Test
     public void tryTerminateConsumerCompletableObserverNoError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.tryTerminateConsumer((CompletableObserver)to);
@@ -230,7 +230,7 @@ public void tryTerminateConsumerCompletableObserverNoError() {
     @Test
     public void tryTerminateConsumerCompletableObserverError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.set(new TestException());
@@ -241,7 +241,7 @@ public void tryTerminateConsumerCompletableObserverError() {
     @Test
     public void tryTerminateConsumerCompletableObserverTerminated() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.terminate();
@@ -271,7 +271,7 @@ public void onComplete() {
     @Test
     public void tryTerminateConsumerEmitterNoError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.tryTerminateConsumer(wrapToEmitter(to));
@@ -281,7 +281,7 @@ public void tryTerminateConsumerEmitterNoError() {
     @Test
     public void tryTerminateConsumerEmitterError() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.set(new TestException());
@@ -292,7 +292,7 @@ public void tryTerminateConsumerEmitterError() {
     @Test
     public void tryTerminateConsumerEmitterTerminated() {
         TestObserver<Object> to = new TestObserver<Object>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
         ex.terminate();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java
index 7d4e07dab4..419febcaee 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java
@@ -34,7 +34,7 @@ public void emptyEnum() {
     @Test
     public void interrupted() {
         CountDownLatch cdl = new CountDownLatch(1);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         Thread.currentThread().interrupt();
 
@@ -50,7 +50,7 @@ public void interrupted() {
     @Test
     public void unblock() {
         final CountDownLatch cdl = new CountDownLatch(1);
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         Schedulers.computation().scheduleDirect(new Runnable() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java
index 0ff03f24c2..1cb96e732f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java
@@ -209,13 +209,13 @@ public void onComplete() {
             }
         };
 
-        Disposable sub1 = Disposables.empty();
+        Disposable sub1 = Disposable.empty();
 
         consumer.onSubscribe(sub1);
 
         assertFalse(sub1.isDisposed());
 
-        Disposable sub2 = Disposables.empty();
+        Disposable sub2 = Disposable.empty();
 
         consumer.onSubscribe(sub2);
 
@@ -244,13 +244,13 @@ public void onComplete() {
             }
         };
 
-        Disposable sub1 = Disposables.empty();
+        Disposable sub1 = Disposable.empty();
 
         consumer.onSubscribe(sub1);
 
         assertFalse(sub1.isDisposed());
 
-        Disposable sub2 = Disposables.empty();
+        Disposable sub2 = Disposable.empty();
 
         consumer.onSubscribe(sub2);
 
@@ -279,13 +279,13 @@ public void onComplete() {
             }
         };
 
-        Disposable sub1 = Disposables.empty();
+        Disposable sub1 = Disposable.empty();
 
         consumer.onSubscribe(sub1);
 
         assertFalse(sub1.isDisposed());
 
-        Disposable sub2 = Disposables.empty();
+        Disposable sub2 = Disposable.empty();
 
         consumer.onSubscribe(sub2);
 
@@ -310,13 +310,13 @@ public void onError(Throwable t) {
             }
         };
 
-        Disposable sub1 = Disposables.empty();
+        Disposable sub1 = Disposable.empty();
 
         consumer.onSubscribe(sub1);
 
         assertFalse(sub1.isDisposed());
 
-        Disposable sub2 = Disposables.empty();
+        Disposable sub2 = Disposable.empty();
 
         consumer.onSubscribe(sub2);
 
@@ -341,13 +341,13 @@ public void onError(Throwable t) {
             }
         };
 
-        Disposable sub1 = Disposables.empty();
+        Disposable sub1 = Disposable.empty();
 
         consumer.onSubscribe(sub1);
 
         assertFalse(sub1.isDisposed());
 
-        Disposable sub2 = Disposables.empty();
+        Disposable sub2 = Disposable.empty();
 
         consumer.onSubscribe(sub2);
 
@@ -376,13 +376,13 @@ public void onComplete() {
             }
         };
 
-        Disposable sub1 = Disposables.empty();
+        Disposable sub1 = Disposable.empty();
 
         consumer.onSubscribe(sub1);
 
         assertFalse(sub1.isDisposed());
 
-        Disposable sub2 = Disposables.empty();
+        Disposable sub2 = Disposable.empty();
 
         consumer.onSubscribe(sub2);
 
@@ -411,13 +411,13 @@ public void onComplete() {
             }
         };
 
-        Disposable sub1 = Disposables.empty();
+        Disposable sub1 = Disposable.empty();
 
         consumer.onSubscribe(sub1);
 
         assertFalse(sub1.isDisposed());
 
-        Disposable sub2 = Disposables.empty();
+        Disposable sub2 = Disposable.empty();
 
         consumer.onSubscribe(sub2);
 
@@ -442,13 +442,13 @@ public void onComplete() {
             }
         };
 
-        Disposable sub1 = Disposables.empty();
+        Disposable sub1 = Disposable.empty();
 
         consumer.onSubscribe(sub1);
 
         assertFalse(sub1.isDisposed());
 
-        Disposable sub2 = Disposables.empty();
+        Disposable sub2 = Disposable.empty();
 
         consumer.onSubscribe(sub2);
 
@@ -473,13 +473,13 @@ public void onComplete() {
             }
         };
 
-        Disposable sub1 = Disposables.empty();
+        Disposable sub1 = Disposable.empty();
 
         consumer.onSubscribe(sub1);
 
         assertFalse(sub1.isDisposed());
 
-        Disposable sub2 = Disposables.empty();
+        Disposable sub2 = Disposable.empty();
 
         consumer.onSubscribe(sub2);
 
@@ -494,7 +494,7 @@ public void onComplete() {
 
     @Test
     public void validateDisposable() {
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         assertFalse(EndConsumerHelper.validate(DisposableHelper.DISPOSED, d1, getClass()));
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
index 2171fadc2d..050e58dc64 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
@@ -64,7 +64,7 @@ public void onComplete() {
 
         a[0] = observer;
 
-        observer.onSubscribe(Disposables.empty());
+        observer.onSubscribe(Disposable.empty());
 
         HalfSerializer.onNext(observer, 1, wip, error);
 
@@ -108,7 +108,7 @@ public void onComplete() {
 
         a[0] = observer;
 
-        observer.onSubscribe(Disposables.empty());
+        observer.onSubscribe(Disposable.empty());
 
         HalfSerializer.onNext(observer, 1, wip, error);
 
@@ -152,7 +152,7 @@ public void onComplete() {
 
         a[0] = observer;
 
-        observer.onSubscribe(Disposables.empty());
+        observer.onSubscribe(Disposable.empty());
 
         HalfSerializer.onNext(observer, 1, wip, error);
 
@@ -194,7 +194,7 @@ public void onComplete() {
 
         a[0] = observer;
 
-        observer.onSubscribe(Disposables.empty());
+        observer.onSubscribe(Disposable.empty());
 
         HalfSerializer.onError(observer, new TestException(), wip, error);
 
@@ -209,7 +209,7 @@ public void onNextOnCompleteRace() {
             final AtomicThrowable error = new AtomicThrowable();
 
             final TestObserver<Integer> to = new TestObserver<Integer>();
-            to.onSubscribe(Disposables.empty());
+            to.onSubscribe(Disposable.empty());
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -242,7 +242,7 @@ public void onErrorOnCompleteRace() {
 
             final TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-            to.onSubscribe(Disposables.empty());
+            to.onSubscribe(Disposable.empty());
 
             final TestException ex = new TestException();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
index 0149b14f4e..6fafc2d5db 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
@@ -28,7 +28,7 @@ public class NotificationLiteTest extends RxJavaTest {
     public void acceptFullObserver() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         assertFalse(NotificationLite.acceptFull(NotificationLite.disposable(d), to));
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
index 9060e85c45..f2ace8d235 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
@@ -317,7 +317,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
         SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
         q.offer(1);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         QueueDrainHelper.drainMaxLoop(q, ts, false, d, qd);
 
@@ -600,7 +600,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
     @Test
     public void observerCheckTerminatedDelayErrorEmpty() {
         TestObserver<Integer> to = new TestObserver<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
             @Override
@@ -643,7 +643,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
     @Test
     public void observerCheckTerminatedDelayErrorEmptyResource() {
         TestObserver<Integer> to = new TestObserver<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
             @Override
@@ -678,7 +678,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
 
         SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         QueueDrainHelper.checkTerminated(true, true, to, true, q, d, qd);
 
@@ -690,7 +690,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
     @Test
     public void observerCheckTerminatedDelayErrorNonEmpty() {
         TestObserver<Integer> to = new TestObserver<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
             @Override
@@ -733,7 +733,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
     @Test
     public void observerCheckTerminatedDelayErrorEmptyError() {
         TestObserver<Integer> to = new TestObserver<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
             @Override
@@ -776,7 +776,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
     @Test
     public void observerCheckTerminatedNonDelayErrorError() {
         TestObserver<Integer> to = new TestObserver<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
             @Override
@@ -819,7 +819,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
     @Test
     public void observerCheckTerminatedNonDelayErrorErrorResource() {
         TestObserver<Integer> to = new TestObserver<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
             @Override
@@ -854,7 +854,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
 
         SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         QueueDrainHelper.checkTerminated(true, false, to, false, q, d, qd);
 
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
index d681c85c0c..ee97e25015 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
@@ -36,7 +36,7 @@ public void nullArgument() {
     public void basic() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Maybe.<Integer>create(new MaybeOnSubscribe<Integer>() {
                 @Override
@@ -61,8 +61,8 @@ public void subscribe(MaybeEmitter<Integer> e) throws Exception {
     public void basicWithCancellable() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d1 = Disposables.empty();
-            final Disposable d2 = Disposables.empty();
+            final Disposable d1 = Disposable.empty();
+            final Disposable d2 = Disposable.empty();
 
             Maybe.<Integer>create(new MaybeOnSubscribe<Integer>() {
                 @Override
@@ -95,7 +95,7 @@ public void cancel() throws Exception {
     public void basicWithError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Maybe.<Integer>create(new MaybeOnSubscribe<Integer>() {
                 @Override
@@ -120,7 +120,7 @@ public void subscribe(MaybeEmitter<Integer> e) throws Exception {
     public void basicWithCompletion() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Maybe.<Integer>create(new MaybeOnSubscribe<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index 3796f365c0..69ea889363 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -230,7 +230,7 @@ public void wrapCustom() {
         Maybe.wrap(new MaybeSource<Integer>() {
             @Override
             public void subscribe(MaybeObserver<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onSuccess(1);
             }
         })
@@ -356,7 +356,7 @@ public void unsafeCreate() {
         Maybe.unsafeCreate(new MaybeSource<Integer>() {
             @Override
             public void subscribe(MaybeObserver<? super Integer> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onSuccess(1);
             }
         })
@@ -1503,7 +1503,7 @@ public void nullArgument() {
     public void basic() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Maybe.<Integer>create(new MaybeOnSubscribe<Integer>() {
                 @Override
@@ -1533,7 +1533,7 @@ public void subscribe(MaybeEmitter<Integer> e) throws Exception {
     public void basicWithError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Maybe.<Integer>create(new MaybeOnSubscribe<Integer>() {
                 @Override
@@ -1561,7 +1561,7 @@ public void subscribe(MaybeEmitter<Integer> e) throws Exception {
     public void basicWithComplete() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final Disposable d = Disposables.empty();
+            final Disposable d = Disposable.empty();
 
             Maybe.<Integer>create(new MaybeOnSubscribe<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
index 4d26afe20d..a3d79a426c 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
@@ -500,7 +500,7 @@ public void publishLast() throws InterruptedException {
         ConnectableObservable<String> connectable = Observable.<String>unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(final Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 count.incrementAndGet();
                 new Thread(new Runnable() {
                     @Override
@@ -538,7 +538,7 @@ public void replay() throws InterruptedException {
         ConnectableObservable<String> o = Observable.<String>unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(final Observer<? super String> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     new Thread(new Runnable() {
 
                         @Override
@@ -591,7 +591,7 @@ public void cache() throws InterruptedException {
         Observable<String> o = Observable.<String>unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(final Observer<? super String> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
                     new Thread(new Runnable() {
                         @Override
                         public void run() {
@@ -636,7 +636,7 @@ public void cacheWithCapacity() throws InterruptedException {
         Observable<String> o = Observable.<String>unsafeCreate(new ObservableSource<String>() {
             @Override
             public void subscribe(final Observer<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 new Thread(new Runnable() {
                     @Override
                     public void run() {
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
index 45d4b82172..84db3819ae 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
@@ -79,9 +79,9 @@ public void startOnce() {
         try {
             TestCompletable tc = new TestCompletable();
 
-            tc.onSubscribe(Disposables.empty());
+            tc.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             tc.onSubscribe(d);
 
@@ -102,7 +102,7 @@ public void dispose() {
 
         assertTrue(tc.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         tc.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
index 812e40ca3a..42cbd25c5d 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
@@ -87,9 +87,9 @@ public void startOnce() {
         try {
             TestMaybe<Integer> tc = new TestMaybe<Integer>();
 
-            tc.onSubscribe(Disposables.empty());
+            tc.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             tc.onSubscribe(d);
 
@@ -110,7 +110,7 @@ public void dispose() {
 
         assertTrue(tc.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         tc.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
index 6a2b332293..b223e47b48 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
@@ -86,9 +86,9 @@ public void startOnce() {
         try {
             TestDisposableObserver<Integer> tc = new TestDisposableObserver<Integer>();
 
-            tc.onSubscribe(Disposables.empty());
+            tc.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             tc.onSubscribe(d);
 
@@ -112,7 +112,7 @@ public void dispose() {
 
         assertTrue(tc.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         tc.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
index 983a8dc847..6bf84e21d3 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
@@ -79,9 +79,9 @@ public void startOnce() {
         try {
             TestSingle<Integer> tc = new TestSingle<Integer>();
 
-            tc.onSubscribe(Disposables.empty());
+            tc.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             tc.onSubscribe(d);
 
@@ -102,7 +102,7 @@ public void dispose() {
 
         assertTrue(tc.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         tc.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
index 487f42352a..6564ae4d16 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
@@ -68,7 +68,7 @@ public void addResources() {
 
         assertFalse(rco.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rco.add(d);
 
@@ -93,7 +93,7 @@ public void onCompleteCleansUp() {
 
         assertFalse(rco.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rco.add(d);
 
@@ -112,7 +112,7 @@ public void onErrorCleansUp() {
 
         assertFalse(rco.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rco.add(d);
 
@@ -167,9 +167,9 @@ public void startOnce() {
         try {
             TestResourceCompletableObserver rco = new TestResourceCompletableObserver();
 
-            rco.onSubscribe(Disposables.empty());
+            rco.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             rco.onSubscribe(d);
 
@@ -188,7 +188,7 @@ public void dispose() {
         TestResourceCompletableObserver rco = new TestResourceCompletableObserver();
         rco.dispose();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rco.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
index 92370a3203..04a093d753 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
@@ -77,7 +77,7 @@ public void addResources() {
 
         assertFalse(rmo.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rmo.add(d);
 
@@ -102,7 +102,7 @@ public void onCompleteCleansUp() {
 
         assertFalse(rmo.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rmo.add(d);
 
@@ -121,7 +121,7 @@ public void onSuccessCleansUp() {
 
         assertFalse(rmo.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rmo.add(d);
 
@@ -140,7 +140,7 @@ public void onErrorCleansUp() {
 
         assertFalse(rmo.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rmo.add(d);
 
@@ -217,9 +217,9 @@ public void startOnce() {
         try {
             TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
 
-            rmo.onSubscribe(Disposables.empty());
+            rmo.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             rmo.onSubscribe(d);
 
@@ -238,7 +238,7 @@ public void dispose() {
         TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
         rmo.dispose();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rmo.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
index d81b7fbe88..e0ff866e75 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
@@ -77,7 +77,7 @@ public void addResources() {
 
         assertFalse(ro.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         ro.add(d);
 
@@ -102,7 +102,7 @@ public void onCompleteCleansUp() {
 
         assertFalse(ro.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         ro.add(d);
 
@@ -121,7 +121,7 @@ public void onErrorCleansUp() {
 
         assertFalse(ro.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         ro.add(d);
 
@@ -178,9 +178,9 @@ public void startOnce() {
         try {
             TestResourceObserver<Integer> tc = new TestResourceObserver<Integer>();
 
-            tc.onSubscribe(Disposables.empty());
+            tc.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             tc.onSubscribe(d);
 
@@ -199,7 +199,7 @@ public void dispose() {
         TestResourceObserver<Integer> tc = new TestResourceObserver<Integer>();
         tc.dispose();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         tc.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
index 1add001b63..054f189bc5 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
@@ -68,7 +68,7 @@ public void addResources() {
 
         assertFalse(rso.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rso.add(d);
 
@@ -93,7 +93,7 @@ public void onSuccessCleansUp() {
 
         assertFalse(rso.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rso.add(d);
 
@@ -112,7 +112,7 @@ public void onErrorCleansUp() {
 
         assertFalse(rso.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rso.add(d);
 
@@ -169,9 +169,9 @@ public void startOnce() {
         try {
             TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
 
-            rso.onSubscribe(Disposables.empty());
+            rso.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             rso.onSubscribe(d);
 
@@ -190,7 +190,7 @@ public void dispose() {
         TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
         rso.dispose();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         rso.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
index 876bcffbe4..446dfe20df 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
@@ -46,7 +46,7 @@ public void onNextFailureSafe() {
         AtomicReference<Throwable> onError = new AtomicReference<Throwable>();
         try {
             SafeObserver<String> safeObserver = new SafeObserver<String>(OBSERVER_ONNEXT_FAIL(onError));
-            safeObserver.onSubscribe(Disposables.empty());
+            safeObserver.onSubscribe(Disposable.empty());
             safeObserver.onNext("one");
             assertNotNull(onError.get());
             assertTrue(onError.get() instanceof SafeObserverTestException);
@@ -209,7 +209,7 @@ public void dispose() {
 
         SafeObserver<Integer> so = new SafeObserver<Integer>(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         so.onSubscribe(d);
 
@@ -226,7 +226,7 @@ public void onNextAfterComplete() {
 
         SafeObserver<Integer> so = new SafeObserver<Integer>(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         so.onSubscribe(d);
 
@@ -247,7 +247,7 @@ public void onNextNull() {
 
         SafeObserver<Integer> so = new SafeObserver<Integer>(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         so.onSubscribe(d);
 
@@ -298,7 +298,7 @@ public void onNextNormal() {
 
         SafeObserver<Integer> so = new SafeObserver<Integer>(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         so.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
index 1d467242f5..84fa434879 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
@@ -220,7 +220,7 @@ public void runConcurrencyTest() {
             TestConcurrencySubscriber tw = new TestConcurrencySubscriber();
             // we need Synchronized + SafeObserver to handle synchronization plus life-cycle
             Observer<String> w = serializedObserver(new SafeObserver<String>(tw));
-            w.onSubscribe(Disposables.empty());
+            w.onSubscribe(Disposable.empty());
 
             Future<?> f1 = tp.submit(new OnNextThread(w, 12000));
             Future<?> f2 = tp.submit(new OnNextThread(w, 5000));
@@ -383,7 +383,7 @@ public void onNext(String t) {
         AtomicInteger p1 = new AtomicInteger();
         AtomicInteger p2 = new AtomicInteger();
 
-        o.onSubscribe(Disposables.empty());
+        o.onSubscribe(Disposable.empty());
         DisposableObserver<String> as1 = new DisposableObserver<String>() {
             @Override
             public void onNext(String t) {
@@ -446,7 +446,7 @@ private static Observable<String> infinite(final AtomicInteger produced) {
 
             @Override
             public void subscribe(Observer<? super String> observer) {
-                Disposable bs = Disposables.empty();
+                Disposable bs = Disposable.empty();
                 observer.onSubscribe(bs);
                 while (!bs.isDisposed()) {
                     observer.onNext("onNext");
@@ -651,7 +651,7 @@ private static class TestSingleThreadedObservable implements ObservableSource<St
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             System.out.println("TestSingleThreadedObservable subscribed to ...");
             t = new Thread(new Runnable() {
 
@@ -703,7 +703,7 @@ private static class TestMultiThreadedObservable implements ObservableSource<Str
 
         @Override
         public void subscribe(final Observer<? super String> observer) {
-            observer.onSubscribe(Disposables.empty());
+            observer.onSubscribe(Disposable.empty());
             final NullPointerException npe = new NullPointerException();
             System.out.println("TestMultiThreadedObservable subscribed to ...");
             t = new Thread(new Runnable() {
@@ -859,7 +859,7 @@ public void onNext(Integer v) {
                 }
             };
             SerializedObserver<Integer> sobs = new SerializedObserver<Integer>(to);
-            sobs.onSubscribe(Disposables.empty());
+            sobs.onSubscribe(Disposable.empty());
             serial.set(sobs);
 
             sobs.onNext(1);
@@ -886,7 +886,7 @@ public void onNext(Integer v) {
             }
         };
         SerializedObserver<Integer> sobs = new SerializedObserver<Integer>(to);
-        sobs.onSubscribe(Disposables.empty());
+        sobs.onSubscribe(Disposable.empty());
         serial.set(sobs);
 
         sobs.onNext(1);
@@ -902,7 +902,7 @@ public void dispose() {
 
         SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         so.onSubscribe(d);
 
@@ -922,7 +922,7 @@ public void onCompleteRace() {
 
             final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             so.onSubscribe(d);
 
@@ -948,7 +948,7 @@ public void onNextOnCompleteRace() {
 
             final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             so.onSubscribe(d);
 
@@ -984,7 +984,7 @@ public void onNextOnErrorRace() {
 
             final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             so.onSubscribe(d);
 
@@ -1022,7 +1022,7 @@ public void onNextOnErrorRaceDelayError() {
 
             final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to, true);
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             so.onSubscribe(d);
 
@@ -1063,9 +1063,9 @@ public void startOnce() {
 
             final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
 
-            so.onSubscribe(Disposables.empty());
+            so.onSubscribe(Disposable.empty());
 
-            Disposable d = Disposables.empty();
+            Disposable d = Disposable.empty();
 
             so.onSubscribe(d);
 
@@ -1087,7 +1087,7 @@ public void onCompleteOnErrorRace() {
 
                 final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
 
-                Disposable d = Disposables.empty();
+                Disposable d = Disposable.empty();
 
                 so.onSubscribe(d);
 
@@ -1134,7 +1134,7 @@ public void nullOnNext() {
 
         final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         so.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
index 1468dc9cb5..581aa0b0b1 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
@@ -171,7 +171,7 @@ public void createDelegate() {
 
         assertFalse(to.hasSubscription());
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         assertTrue(to.hasSubscription());
 
@@ -243,7 +243,7 @@ public void assertError() {
             // expected
         }
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.assertSubscribed();
 
@@ -315,7 +315,7 @@ public void valueAndClass() {
     public void assertFailure() {
         TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onError(new TestException("Forced failure"));
 
@@ -330,7 +330,7 @@ public void assertFailure() {
     public void assertFuseable() {
         TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to = TestObserver.create();
 
@@ -341,7 +341,7 @@ public void assertFuseable() {
     public void assertResult() {
         TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onComplete();
 
@@ -378,7 +378,7 @@ public void assertResult() {
     public void await() throws Exception {
         TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         assertFalse(to.await(100, TimeUnit.MILLISECONDS));
 
@@ -406,7 +406,7 @@ public void await() throws Exception {
 
         final TestObserver<Integer> to1 = TestObserver.create();
 
-        to1.onSubscribe(Disposables.empty());
+        to1.onSubscribe(Disposable.empty());
 
         Schedulers.single().scheduleDirect(new Runnable() {
             @Override
@@ -422,7 +422,7 @@ public void run() {
     public void onNext() {
         TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         assertEquals(0, to.values().size());
 
@@ -445,7 +445,7 @@ public void onNext() {
     public void multipleTerminals() {
         TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.assertNotComplete();
 
@@ -479,7 +479,7 @@ public void multipleTerminals() {
     public void assertValue() {
         TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         try {
             to.assertValue(1);
@@ -519,7 +519,7 @@ public void onNextMisbehave() {
 
         to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onNext(null);
 
@@ -530,7 +530,7 @@ public void onNextMisbehave() {
     public void awaitTerminalEventInterrupt() {
         final TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         Thread.currentThread().interrupt();
 
@@ -559,7 +559,7 @@ public void awaitTerminalEventInterrupt() {
     public void assertTerminated2() {
         TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onError(new TestException());
         to.onError(new IOException());
@@ -573,7 +573,7 @@ public void assertTerminated2() {
 
         to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onError(new TestException());
         to.onComplete();
@@ -589,9 +589,9 @@ public void onSubscribe() {
 
         to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         to.onSubscribe(d1);
 
@@ -602,7 +602,7 @@ public void onSubscribe() {
         to = TestObserver.create();
         to.dispose();
 
-        d1 = Disposables.empty();
+        d1 = Disposable.empty();
 
         to.onSubscribe(d1);
 
@@ -614,7 +614,7 @@ public void onSubscribe() {
     public void assertValueSequence() {
         TestObserver<Integer> to = TestObserver.create();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onNext(1);
         to.onNext(2);
@@ -654,7 +654,7 @@ public void assertEmpty() {
             // expected
         }
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.assertEmpty();
 
@@ -731,7 +731,7 @@ public boolean test(Throwable throwable) throws Exception {
     public void assertComplete() {
         TestObserver<Integer> to = new TestObserver<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         try {
             to.assertComplete();
@@ -789,7 +789,7 @@ public void onComplete() {
 
         });
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         try {
             to.onComplete();
@@ -825,7 +825,7 @@ public void onComplete() {
 
         });
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         try {
             to.onError(new IOException());
@@ -1028,7 +1028,7 @@ public void withTag() {
     @Test
     public void assertValuesOnly() {
         TestObserver<Integer> to = TestObserver.create();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
         to.assertValuesOnly();
 
         to.onNext(5);
@@ -1041,7 +1041,7 @@ public void assertValuesOnly() {
     @Test
     public void assertValuesOnlyThrowsOnUnexpectedValue() {
         TestObserver<Integer> to = TestObserver.create();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
         to.assertValuesOnly();
 
         to.onNext(5);
@@ -1060,7 +1060,7 @@ public void assertValuesOnlyThrowsOnUnexpectedValue() {
     @Test
     public void assertValuesOnlyThrowsWhenCompleted() {
         TestObserver<Integer> to = TestObserver.create();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onComplete();
 
@@ -1075,7 +1075,7 @@ public void assertValuesOnlyThrowsWhenCompleted() {
     @Test
     public void assertValuesOnlyThrowsWhenErrored() {
         TestObserver<Integer> to = TestObserver.create();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onError(new TestException());
 
diff --git a/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
index 5e0b5ab207..090ff6b766 100644
--- a/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
@@ -1261,7 +1261,7 @@ public void reset() {
                         @SuppressWarnings("unchecked")
                         @Override
                         protected void subscribeActual(Observer observer) {
-                            observer.onSubscribe(Disposables.empty());
+                            observer.onSubscribe(Disposable.empty());
                             observer.onNext(10);
                             observer.onComplete();
                         }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
index 35be875a9a..8782142035 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
@@ -114,11 +114,11 @@ public void run() {
         Worker w = s.createWorker();
         w.dispose();
 
-        assertEquals(Disposables.disposed(), w.schedule(r));
+        assertEquals(Disposable.disposed(), w.schedule(r));
 
-        assertEquals(Disposables.disposed(), w.schedule(r, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), w.schedule(r, 1, TimeUnit.SECONDS));
 
-        assertEquals(Disposables.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS));
 
         assertEquals(0, calls[0]);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
index 6d2aec07c9..a963f24665 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
@@ -18,11 +18,11 @@
 import java.util.HashMap;
 import java.util.concurrent.*;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.schedulers.ComputationScheduler;
 
@@ -173,22 +173,22 @@ public void run() {
         s.shutdown();
         s.shutdown();
 
-        assertEquals(Disposables.disposed(), s.scheduleDirect(r));
+        assertEquals(Disposable.disposed(), s.scheduleDirect(r));
 
-        assertEquals(Disposables.disposed(), s.scheduleDirect(r, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), s.scheduleDirect(r, 1, TimeUnit.SECONDS));
 
-        assertEquals(Disposables.disposed(), s.schedulePeriodicallyDirect(r, 1, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), s.schedulePeriodicallyDirect(r, 1, 1, TimeUnit.SECONDS));
 
         Worker w = s.createWorker();
         w.dispose();
 
         assertTrue(w.isDisposed());
 
-        assertEquals(Disposables.disposed(), w.schedule(r));
+        assertEquals(Disposable.disposed(), w.schedule(r));
 
-        assertEquals(Disposables.disposed(), w.schedule(r, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), w.schedule(r, 1, TimeUnit.SECONDS));
 
-        assertEquals(Disposables.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS));
 
         assertEquals(0, calls[0]);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
index df114d23e8..352e13333c 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
@@ -53,11 +53,11 @@ public void run() {
 
         assertTrue(w.isDisposed());
 
-        assertEquals(Disposables.disposed(), w.schedule(r));
+        assertEquals(Disposable.disposed(), w.schedule(r));
 
-        assertEquals(Disposables.disposed(), w.schedule(r, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), w.schedule(r, 1, TimeUnit.SECONDS));
 
-        assertEquals(Disposables.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS));
+        assertEquals(Disposable.disposed(), w.schedulePeriodically(r, 1, 1, TimeUnit.SECONDS));
 
         NewThreadWorker actual = (NewThreadWorker)w;
 
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
index 0e99b0b26d..81b5038719 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
@@ -133,7 +133,7 @@ public void createSuccess() {
         Single.unsafeCreate(new SingleSource<Object>() {
             @Override
             public void subscribe(SingleObserver<? super Object> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onSuccess("Hello");
             }
         }).toFlowable().subscribe(ts);
@@ -147,7 +147,7 @@ public void createError() {
         Single.unsafeCreate(new SingleSource<Object>() {
             @Override
             public void subscribe(SingleObserver<? super Object> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 observer.onError(new RuntimeException("fail"));
             }
         }).toFlowable().subscribe(ts);
@@ -204,7 +204,7 @@ public void timeout() {
         Single<String> s1 = Single.<String>unsafeCreate(new SingleSource<String>() {
             @Override
             public void subscribe(SingleObserver<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                 try {
                     Thread.sleep(5000);
                 } catch (InterruptedException e) {
@@ -226,7 +226,7 @@ public void timeoutWithFallback() {
         Single<String> s1 = Single.<String>unsafeCreate(new SingleSource<String>() {
             @Override
             public void subscribe(SingleObserver<? super String> observer) {
-                observer.onSubscribe(Disposables.empty());
+                observer.onSubscribe(Disposable.empty());
                     try {
                         Thread.sleep(5000);
                     } catch (InterruptedException e) {
@@ -269,7 +269,7 @@ public void run() {
                     }
 
                 });
-                sd.replace(Disposables.fromRunnable(new Runnable() {
+                sd.replace(Disposable.fromRunnable(new Runnable() {
                     @Override
                     public void run() {
                         unsubscribed.set(true);
@@ -343,7 +343,7 @@ public void run() {
                     }
 
                 });
-                sd.replace(Disposables.fromRunnable(new Runnable() {
+                sd.replace(Disposable.fromRunnable(new Runnable() {
                     @Override
                     public void run() {
                         unsubscribed.set(true);
@@ -399,7 +399,7 @@ public void run() {
                     }
 
                 });
-                sd.replace(Disposables.fromRunnable(new Runnable() {
+                sd.replace(Disposable.fromRunnable(new Runnable() {
                     @Override
                     public void run() {
                         unsubscribed.set(true);
@@ -431,7 +431,7 @@ public void backpressureAsObservable() {
         Single<String> s = Single.unsafeCreate(new SingleSource<String>() {
             @Override
             public void subscribe(SingleObserver<? super String> t) {
-                t.onSubscribe(Disposables.empty());
+                t.onSubscribe(Disposable.empty());
                 t.onSuccess("hello");
             }
         });
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
index 7a7e381bf9..e6f8245d22 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
@@ -362,14 +362,14 @@ public void fusionOfflie() {
     public void onSubscribeAfterDone() {
         AsyncSubject<Object> p = AsyncSubject.create();
 
-        Disposable bs = Disposables.empty();
+        Disposable bs = Disposable.empty();
         p.onSubscribe(bs);
 
         assertFalse(bs.isDisposed());
 
         p.onComplete();
 
-        bs = Disposables.empty();
+        bs = Disposable.empty();
         p.onSubscribe(bs);
 
         assertTrue(bs.isDisposed());
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
index af73a522aa..0d14802814 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
@@ -542,7 +542,7 @@ public void cancelOnArrival() {
     public void onSubscribe() {
         BehaviorSubject<Object> p = BehaviorSubject.create();
 
-        Disposable bs = Disposables.empty();
+        Disposable bs = Disposable.empty();
 
         p.onSubscribe(bs);
 
@@ -550,7 +550,7 @@ public void onSubscribe() {
 
         p.onComplete();
 
-        bs = Disposables.empty();
+        bs = Disposable.empty();
 
         p.onSubscribe(bs);
 
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java
index 34aaff3831..02ac92b064 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java
@@ -189,7 +189,7 @@ public void onComplete() {
     public void onSubscribeDispose() {
         CompletableSubject cs = CompletableSubject.create();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         cs.onSubscribe(d);
 
@@ -197,7 +197,7 @@ public void onSubscribeDispose() {
 
         cs.onComplete();
 
-        d = Disposables.empty();
+        d = Disposable.empty();
 
         cs.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java
index 8ff3f7b1b5..31742e10a9 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java
@@ -234,7 +234,7 @@ public void onComplete() {
     public void onSubscribeDispose() {
         MaybeSubject<Integer> ms = MaybeSubject.create();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         ms.onSubscribe(d);
 
@@ -242,7 +242,7 @@ public void onSubscribeDispose() {
 
         ms.onComplete();
 
-        d = Disposables.empty();
+        d = Disposable.empty();
 
         ms.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
index 45520ebffa..c1cef763fe 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
@@ -19,12 +19,12 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.observers.DefaultObserver;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -43,7 +43,7 @@ public void run() {
 
                     @Override
                     public void subscribe(Observer<? super Long> o) {
-                        o.onSubscribe(Disposables.empty());
+                        o.onSubscribe(Disposable.empty());
                         System.out.println("********* Start Source Data ***********");
                         for (long l = 1; l <= 10000; l++) {
                             o.onNext(l);
@@ -153,7 +153,7 @@ public void run() {
 
                     @Override
                     public void subscribe(Observer<? super Long> o) {
-                        o.onSubscribe(Disposables.empty());
+                        o.onSubscribe(Disposable.empty());
                         System.out.println("********* Start Source Data ***********");
                         for (long l = 1; l <= 10000; l++) {
                             o.onNext(l);
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
index b0d2e55aad..c608875071 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
@@ -19,12 +19,12 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposables;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.observers.DefaultObserver;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -43,7 +43,7 @@ public void run() {
 
                     @Override
                     public void subscribe(Observer<? super Long> o) {
-                        o.onSubscribe(Disposables.empty());
+                        o.onSubscribe(Disposable.empty());
                         System.out.println("********* Start Source Data ***********");
                         for (long l = 1; l <= 10000; l++) {
                             o.onNext(l);
@@ -153,7 +153,7 @@ public void run() {
 
                     @Override
                     public void subscribe(Observer<? super Long> o) {
-                        o.onSubscribe(Disposables.empty());
+                        o.onSubscribe(Disposable.empty());
                         System.out.println("********* Start Source Data ***********");
                         for (long l = 1; l <= 10000; l++) {
                             o.onNext(l);
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
index 1993112789..e8d36a8c62 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
@@ -967,7 +967,7 @@ public void subscribeAfterDone() {
         ReplaySubject<Integer> rp = ReplaySubject.create();
         rp.onComplete();
 
-        Disposable bs = Disposables.empty();
+        Disposable bs = Disposable.empty();
 
         rp.onSubscribe(bs);
 
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
index 9355d77d29..2d9999380b 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
@@ -410,7 +410,7 @@ public void normal() {
         }
         s.onComplete();
 
-        Disposable bs = Disposables.empty();
+        Disposable bs = Disposable.empty();
         s.onSubscribe(bs);
         assertTrue(bs.isDisposed());
     }
@@ -522,7 +522,7 @@ public void onNextOnSubscribeRace() {
 
             TestObserver<Integer> to = s.test();
 
-            final Disposable bs = Disposables.empty();
+            final Disposable bs = Disposable.empty();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -551,7 +551,7 @@ public void onCompleteOnSubscribeRace() {
 
             TestObserver<Integer> to = s.test();
 
-            final Disposable bs = Disposables.empty();
+            final Disposable bs = Disposable.empty();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -643,8 +643,8 @@ public void onSubscribeOnSubscribeRace() {
 
             TestObserver<Integer> to = s.test();
 
-            final Disposable bs1 = Disposables.empty();
-            final Disposable bs2 = Disposables.empty();
+            final Disposable bs1 = Disposable.empty();
+            final Disposable bs2 = Disposable.empty();
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java
index 7c07b63f0a..521fb77fe4 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java
@@ -209,7 +209,7 @@ public void onError(Throwable e) {
     public void onSubscribeDispose() {
         SingleSubject<Integer> ss = SingleSubject.create();
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         ss.onSubscribe(d);
 
@@ -217,7 +217,7 @@ public void onSubscribeDispose() {
 
         ss.onSuccess(1);
 
-        d = Disposables.empty();
+        d = Disposable.empty();
 
         ss.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
index ba2deb2c91..a65544532b 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
@@ -262,7 +262,7 @@ public void afterDone() {
         UnicastSubject<Object> p = UnicastSubject.create();
         p.onComplete();
 
-        Disposable bs = Disposables.empty();
+        Disposable bs = Disposable.empty();
         p.onSubscribe(bs);
 
         p.onNext(1);
@@ -381,7 +381,7 @@ public void dispose() {
             RxJavaPlugins.reset();
         }
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         us.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
index 190fe0e836..5a444ee9a9 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
@@ -81,7 +81,7 @@ public void addResources() {
 
         assertFalse(ro.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         ro.add(d);
 
@@ -106,7 +106,7 @@ public void onCompleteCleansUp() {
 
         assertFalse(ro.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         ro.add(d);
 
@@ -125,7 +125,7 @@ public void onErrorCleansUp() {
 
         assertFalse(ro.isDisposed());
 
-        Disposable d = Disposables.empty();
+        Disposable d = Disposable.empty();
 
         ro.add(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index f31475ae58..3faefd13a5 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -520,11 +520,11 @@ public static void doubleOnSubscribe(Subscriber<?> subscriber) {
     public static void doubleOnSubscribe(Observer<?> observer) {
         List<Throwable> errors = trackPluginErrors();
         try {
-            Disposable d1 = Disposables.empty();
+            Disposable d1 = Disposable.empty();
 
             observer.onSubscribe(d1);
 
-            Disposable d2 = Disposables.empty();
+            Disposable d2 = Disposable.empty();
 
             observer.onSubscribe(d2);
 
@@ -546,11 +546,11 @@ public static void doubleOnSubscribe(Observer<?> observer) {
     public static void doubleOnSubscribe(SingleObserver<?> observer) {
         List<Throwable> errors = trackPluginErrors();
         try {
-            Disposable d1 = Disposables.empty();
+            Disposable d1 = Disposable.empty();
 
             observer.onSubscribe(d1);
 
-            Disposable d2 = Disposables.empty();
+            Disposable d2 = Disposable.empty();
 
             observer.onSubscribe(d2);
 
@@ -572,11 +572,11 @@ public static void doubleOnSubscribe(SingleObserver<?> observer) {
     public static void doubleOnSubscribe(CompletableObserver observer) {
         List<Throwable> errors = trackPluginErrors();
         try {
-            Disposable d1 = Disposables.empty();
+            Disposable d1 = Disposable.empty();
 
             observer.onSubscribe(d1);
 
-            Disposable d2 = Disposables.empty();
+            Disposable d2 = Disposable.empty();
 
             observer.onSubscribe(d2);
 
@@ -598,11 +598,11 @@ public static void doubleOnSubscribe(CompletableObserver observer) {
     public static void doubleOnSubscribe(MaybeObserver<?> observer) {
         List<Throwable> errors = trackPluginErrors();
         try {
-            Disposable d1 = Disposables.empty();
+            Disposable d1 = Disposable.empty();
 
             observer.onSubscribe(d1);
 
-            Disposable d2 = Disposables.empty();
+            Disposable d2 = Disposable.empty();
 
             observer.onSubscribe(d2);
 
@@ -899,11 +899,11 @@ public static <T, R> void checkDoubleOnSubscribeMaybe(Function<Maybe<T>, ? exten
                 @Override
                 protected void subscribeActual(MaybeObserver<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -953,11 +953,11 @@ public static <T, R> void checkDoubleOnSubscribeMaybeToSingle(Function<Maybe<T>,
                 @Override
                 protected void subscribeActual(MaybeObserver<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1007,11 +1007,11 @@ public static <T, R> void checkDoubleOnSubscribeMaybeToObservable(Function<Maybe
                 @Override
                 protected void subscribeActual(MaybeObserver<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1061,11 +1061,11 @@ public static <T, R> void checkDoubleOnSubscribeMaybeToFlowable(Function<Maybe<T
                 @Override
                 protected void subscribeActual(MaybeObserver<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1115,11 +1115,11 @@ public static <T, R> void checkDoubleOnSubscribeSingleToMaybe(Function<Single<T>
                 @Override
                 protected void subscribeActual(SingleObserver<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1169,11 +1169,11 @@ public static <T, R> void checkDoubleOnSubscribeSingleToObservable(Function<Sing
                 @Override
                 protected void subscribeActual(SingleObserver<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1223,11 +1223,11 @@ public static <T, R> void checkDoubleOnSubscribeSingleToFlowable(Function<Single
                 @Override
                 protected void subscribeActual(SingleObserver<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1276,11 +1276,11 @@ public static <T> void checkDoubleOnSubscribeMaybeToCompletable(Function<Maybe<T
                 @Override
                 protected void subscribeActual(MaybeObserver<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1330,11 +1330,11 @@ public static <T, R> void checkDoubleOnSubscribeSingle(Function<Single<T>, ? ext
                 @Override
                 protected void subscribeActual(SingleObserver<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1438,11 +1438,11 @@ public static <T, R> void checkDoubleOnSubscribeObservable(Function<Observable<T
                 @Override
                 protected void subscribeActual(Observer<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1492,11 +1492,11 @@ public static <T, R> void checkDoubleOnSubscribeObservableToSingle(Function<Obse
                 @Override
                 protected void subscribeActual(Observer<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1546,11 +1546,11 @@ public static <T, R> void checkDoubleOnSubscribeObservableToMaybe(Function<Obser
                 @Override
                 protected void subscribeActual(Observer<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1599,11 +1599,11 @@ public static <T> void checkDoubleOnSubscribeObservableToCompletable(Function<Ob
                 @Override
                 protected void subscribeActual(Observer<? super T> observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1866,11 +1866,11 @@ public static void checkDoubleOnSubscribeCompletable(Function<Completable, ? ext
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1919,11 +1919,11 @@ public static <T> void checkDoubleOnSubscribeCompletableToMaybe(Function<Complet
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -1972,11 +1972,11 @@ public static <T> void checkDoubleOnSubscribeCompletableToSingle(Function<Comple
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -2024,11 +2024,11 @@ public static void checkDoubleOnSubscribeCompletableToFlowable(Function<Completa
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -2076,11 +2076,11 @@ public static void checkDoubleOnSubscribeCompletableToObservable(Function<Comple
                 @Override
                 protected void subscribeActual(CompletableObserver observer) {
                     try {
-                        Disposable d1 = Disposables.empty();
+                        Disposable d1 = Disposable.empty();
 
                         observer.onSubscribe(d1);
 
-                        Disposable d2 = Disposables.empty();
+                        Disposable d2 = Disposable.empty();
 
                         observer.onSubscribe(d2);
 
@@ -2469,7 +2469,7 @@ public static <T> void checkBadSourceObservable(Function<Observable<T>, Object>
                 boolean once;
                 @Override
                 protected void subscribeActual(Observer<? super T> observer) {
-                    observer.onSubscribe(Disposables.empty());
+                    observer.onSubscribe(Disposable.empty());
 
                     if (once) {
                         return;
@@ -3336,7 +3336,7 @@ public Integer apply(Integer v) throws Throwable {
                 to.assertEmpty();
             } else if (result instanceof Publisher) {
                 TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
-                disposable.set(Disposables.fromSubscription(ts));
+                disposable.set(Disposable.fromSubscription(ts));
 
                 ((Publisher<?>)result)
                 .subscribe(ts);
@@ -3404,7 +3404,7 @@ public Integer apply(Integer v) throws Throwable {
                 to.assertEmpty();
             } else if (result instanceof Publisher) {
                 TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
-                disposable.set(Disposables.fromSubscription(ts));
+                disposable.set(Disposable.fromSubscription(ts));
 
                 ((Publisher<?>)result)
                 .subscribe(ts);
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
index 6f8d3e25cc..e374aa67a2 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
@@ -275,7 +275,7 @@ public void createDelegate() {
 
         assertFalse(to.hasSubscription());
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         try {
             to.assertNotSubscribed();
@@ -370,7 +370,7 @@ public void assertError() {
             // expected
         }
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.assertSubscribed();
 
@@ -453,7 +453,7 @@ public void valueAndClass() {
     public void assertFailure() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onError(new TestException("Forced failure"));
 
@@ -476,7 +476,7 @@ public void assertFailure() {
     public void assertFuseable() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.assertNotFuseable();
 
@@ -539,7 +539,7 @@ public void assertTerminated() {
     public void assertResult() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onComplete();
 
@@ -576,7 +576,7 @@ public void assertResult() {
     public void await() throws Exception {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         assertFalse(to.await(100, TimeUnit.MILLISECONDS));
 
@@ -598,7 +598,7 @@ public void await() throws Exception {
 
         final TestObserverEx<Integer> to1 = new TestObserverEx<Integer>();
 
-        to1.onSubscribe(Disposables.empty());
+        to1.onSubscribe(Disposable.empty());
 
         Schedulers.single().scheduleDirect(new Runnable() {
             @Override
@@ -614,7 +614,7 @@ public void run() {
     public void errors() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         assertEquals(0, to.errors().size());
 
@@ -629,7 +629,7 @@ public void errors() {
     public void onNext() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.assertValueCount(0);
 
@@ -660,7 +660,7 @@ public void fusionModeToString() {
     public void multipleTerminals() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.assertNotComplete();
 
@@ -703,7 +703,7 @@ public void multipleTerminals() {
     public void assertValue() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         try {
             to.assertValue(1);
@@ -743,7 +743,7 @@ public void onNextMisbehave() {
 
         to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onNext(null);
 
@@ -754,7 +754,7 @@ public void onNextMisbehave() {
     public void assertTerminated2() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.assertNotTerminated();
 
@@ -780,7 +780,7 @@ public void assertTerminated2() {
 
         to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onError(new TestException());
         to.onComplete();
@@ -803,9 +803,9 @@ public void onSubscribe() {
 
         to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
-        Disposable d1 = Disposables.empty();
+        Disposable d1 = Disposable.empty();
 
         to.onSubscribe(d1);
 
@@ -816,7 +816,7 @@ public void onSubscribe() {
         to = new TestObserverEx<Integer>();
         to.dispose();
 
-        d1 = Disposables.empty();
+        d1 = Disposable.empty();
 
         to.onSubscribe(d1);
 
@@ -828,7 +828,7 @@ public void onSubscribe() {
     public void assertValueSequence() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onNext(1);
         to.onNext(2);
@@ -868,7 +868,7 @@ public void assertEmpty() {
             // expected
         }
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.assertEmpty();
 
@@ -967,7 +967,7 @@ public boolean test(Throwable throwable) throws Exception {
     public void assertComplete() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         try {
             to.assertComplete();
@@ -1025,7 +1025,7 @@ public void onComplete() {
 
         });
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         try {
             to.onComplete();
@@ -1061,7 +1061,7 @@ public void onComplete() {
 
         });
 
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         try {
             to.onError(new IOException());
@@ -1323,7 +1323,7 @@ public void withTag() {
     @Test
     public void assertValuesOnly() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
         to.assertValuesOnly();
 
         to.onNext(5);
@@ -1336,7 +1336,7 @@ public void assertValuesOnly() {
     @Test
     public void assertValuesOnlyThrowsOnUnexpectedValue() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
         to.assertValuesOnly();
 
         to.onNext(5);
@@ -1355,7 +1355,7 @@ public void assertValuesOnlyThrowsOnUnexpectedValue() {
     @Test
     public void assertValuesOnlyThrowsWhenCompleted() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onComplete();
 
@@ -1370,7 +1370,7 @@ public void assertValuesOnlyThrowsWhenCompleted() {
     @Test
     public void assertValuesOnlyThrowsWhenErrored() {
         TestObserverEx<Integer> to = new TestObserverEx<Integer>();
-        to.onSubscribe(Disposables.empty());
+        to.onSubscribe(Disposable.empty());
 
         to.onError(new TestException());
 
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java b/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java
index cb9a81eca0..2615a3fbe5 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java
@@ -37,7 +37,7 @@ public boolean isDisposed() {
         @Override
         public Disposable schedule(Runnable run, long delay, TimeUnit unit) {
             run.run();
-            return Disposables.disposed();
+            return Disposable.disposed();
         }
 
         @Override

From 747f59eaaa66af6ce8eb06d779cd72909ec9ed05 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 21 Dec 2019 11:08:18 +0100
Subject: [PATCH 014/665] 3.x: [Java 8] Add fromOpt/Stage, mapOptional,
 toCompletionStage to M/S/C (#6783)

---
 .../reactivex/rxjava3/core/Completable.java   |  70 ++++++-
 .../java/io/reactivex/rxjava3/core/Maybe.java | 162 +++++++++++++++-
 .../io/reactivex/rxjava3/core/Single.java     |  91 ++++++++-
 .../jdk8/CompletableFromCompletionStage.java  |  78 ++++++++
 .../jdk8/CompletionStageConsumer.java         |  99 ++++++++++
 .../jdk8/MaybeFromCompletionStage.java        |  81 ++++++++
 .../internal/jdk8/MaybeMapOptional.java       | 110 +++++++++++
 .../jdk8/SingleFromCompletionStage.java       |  81 ++++++++
 .../internal/jdk8/SingleMapOptional.java      | 105 +++++++++++
 .../CompletableFromCompletionStageTest.java   |  78 ++++++++
 .../CompletableToCompletionStageTest.java     | 154 ++++++++++++++++
 .../jdk8/MaybeFromCompletionStageTest.java    |  71 +++++++
 .../internal/jdk8/MaybeFromOptionalTest.java  |  38 ++++
 .../internal/jdk8/MaybeMapOptionalTest.java   |  89 +++++++++
 .../jdk8/MaybeToCompletionStageTest.java      | 174 ++++++++++++++++++
 .../jdk8/SingleFromCompletionStageTest.java   |  71 +++++++
 .../internal/jdk8/SingleMapOptionalTest.java  |  76 ++++++++
 .../jdk8/SingleToCompletionStageTest.java     | 153 +++++++++++++++
 .../ParamValidationCheckerTest.java           |   3 +
 19 files changed, 1779 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStage.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletionStageConsumer.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStage.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptional.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStage.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptional.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStageTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableToCompletionStageTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStageTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromOptionalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptionalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeToCompletionStageTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStageTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptionalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleToCompletionStageTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index f25320d66b..d9991a913e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -12,7 +12,7 @@
  */
 package io.reactivex.rxjava3.core;
 
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.*;
 
 import org.reactivestreams.Publisher;
@@ -23,6 +23,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.observers.*;
 import io.reactivex.rxjava3.internal.operators.completable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.*;
@@ -2753,4 +2754,71 @@ public final TestObserver<Void> test(boolean dispose) {
         subscribe(to);
         return to;
     }
+
+    // -------------------------------------------------------------------------
+    // JDK 8 Support
+    // -------------------------------------------------------------------------
+
+    /**
+     * Signals completion (or error) when the {@link CompletionStage} terminates.
+     * <p>
+     * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.c.png" alt="">
+     * <p>
+     * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
+     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * around {@code fromCompletionStage}:
+     * <pre><code>
+     * Maybe.defer(() -&gt; Completable.fromCompletionStage(createCompletionStage()));
+     * </code></pre>
+     * <p>
+     * Canceling the flow can't cancel the execution of the {@code CompletionStage} because {@code CompletionStage}
+     * itself doesn't support cancellation. Instead, the operator detaches from the {@code CompletionStage}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param stage the CompletionStage to convert to Maybe and signal its terminal value or error
+     * @return the new Completable instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static Completable fromCompletionStage(@NonNull CompletionStage<?> stage) {
+        Objects.requireNonNull(stage, "stage is null");
+        return RxJavaPlugins.onAssembly(new CompletableFromCompletionStage<>(stage));
+    }
+
+    /**
+     * Signals the given default item when the upstream completes or signals the upstream error via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="323" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toCompletionStage.c.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <p>
+     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
+     * <pre><code>
+     * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).toCompletionStage(Optional.empty());
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code toCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the type of the default item to signal upon completion
+     * @param defaultItem the item to signal if the upstream is empty
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <T> CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
+        return subscribeWith(new CompletionStageConsumer<>(true, defaultItem));
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index e3f4641ad3..35484ebef4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -13,8 +13,7 @@
 
 package io.reactivex.rxjava3.core;
 
-import java.util.NoSuchElementException;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.*;
 
 import org.reactivestreams.*;
@@ -25,6 +24,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.observers.BlockingMultiObserver;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.*;
@@ -4794,4 +4794,162 @@ public final TestObserver<T> test(boolean dispose) {
         subscribe(to);
         return to;
     }
+
+    // -------------------------------------------------------------------------
+    // JDK 8 Support
+    // -------------------------------------------------------------------------
+
+    /**
+     * Converts the existing value of the provided optional into a {@link #just(Object)}
+     * or an empty optional into an {@link #empty()} {@code Maybe} instance.
+     * <p>
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromOptional.m.png" alt="">
+     * <p>
+     * Note that the operator takes an already instantiated optional reference and does not
+     * by any means create this original optional. If the optional is to be created per
+     * consumer upon subscription, use {@link #defer(Supplier)} around {@code fromOptional}:
+     * <pre><code>
+     * Maybe.defer(() -&gt; Maybe.fromOptional(createOptional()));
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromOptional} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the optional value
+     * @param optional the optional value to convert into a {@code Maybe}
+     * @return the new Maybe instance
+     * @see #just(Object)
+     * @see #empty()
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Maybe<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
+        Objects.requireNonNull(optional, "optional is null");
+        return optional.map(Maybe::just).orElseGet(Maybe::empty);
+    }
+
+    /**
+     * Signals the completion value or error of the given (hot) {@link CompletionStage}-based asynchronous calculation.
+     * <p>
+     * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.s.png" alt="">
+     * <p>
+     * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
+     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * around {@code fromCompletionStage}:
+     * <pre><code>
+     * Maybe.defer(() -&gt; Maybe.fromCompletionStage(createCompletionStage()));
+     * </code></pre>
+     * <p>
+     * If the {@code CompletionStage} completes with {@code null}, the resulting {@code Maybe} is completed via {@code onComplete}.
+     * <p>
+     * Canceling the flow can't cancel the execution of the {@code CompletionStage} because {@code CompletionStage}
+     * itself doesn't support cancellation. Instead, the operator detaches from the {@code CompletionStage}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the CompletionStage
+     * @param stage the CompletionStage to convert to Maybe and signal its terminal value or error
+     * @return the new Maybe instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Maybe<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
+        Objects.requireNonNull(stage, "stage is null");
+        return RxJavaPlugins.onAssembly(new MaybeFromCompletionStage<>(stage));
+    }
+
+    /**
+     * Maps the upstream success value into an {@link Optional} and emits the contained item if not empty.
+     * <p>
+     * <img width="640" height="323" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mapOptional.m.png" alt="">
+     *
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the non-null output type
+     * @param mapper the function that receives the upstream success iteem and should return a <em>non-empty</em> {@code Optional}
+     * to emit as the success output or an <em>empty</em> {@code Optional} to complete the {@code Maybe}
+     * @return the new Maybe instance
+     * @since 3.0.0
+     * @see #map(Function)
+     * @see #filter(Predicate)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Maybe<R> mapOptional(@NonNull Function<? super T, @NonNull Optional<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new MaybeMapOptional<>(this, mapper));
+    }
+
+    /**
+     * Signals the upstream success item (or a {@link NoSuchElementException} if the upstream is empty) via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="349" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toCompletionStage.m.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <p>
+     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * {@link #toCompletionStage(Object)} with {@code null} or turn the upstrea into a sequence of {@link Optional}s and
+     * default to {@link Optional#empty()}:
+     * <pre><code>
+     * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).toCompletionStage(Optional.empty());
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code toCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #toCompletionStage(Object)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> toCompletionStage() {
+        return subscribeWith(new CompletionStageConsumer<>(false, null));
+    }
+
+    /**
+     * Signals the upstream success item (or the default item if the upstream is empty) via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="323" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toCompletionStage.mv.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <p>
+     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
+     * <pre><code>
+     * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).toCompletionStage(Optional.empty());
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code toCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param defaultItem the item to signal if the upstream is empty
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
+        return subscribeWith(new CompletionStageConsumer<>(true, defaultItem));
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 27fad6d53e..ae2b04fc7d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -13,8 +13,7 @@
 
 package io.reactivex.rxjava3.core;
 
-import java.util.NoSuchElementException;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.*;
 
 import org.reactivestreams.Publisher;
@@ -25,6 +24,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.observers.*;
 import io.reactivex.rxjava3.internal.operators.completable.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
@@ -4181,4 +4181,91 @@ public final TestObserver<T> test(boolean dispose) {
     private static <T> Single<T> toSingle(Flowable<T> source) {
         return RxJavaPlugins.onAssembly(new FlowableSingleSingle<T>(source, null));
     }
+
+    // -------------------------------------------------------------------------
+    // JDK 8 Support
+    // -------------------------------------------------------------------------
+
+    /**
+     * Signals the completion value or error of the given (hot) {@link CompletionStage}-based asynchronous calculation.
+     * <p>
+     * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.s.png" alt="">
+     * <p>
+     * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
+     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * around {@code fromCompletionStage}:
+     * <pre><code>
+     * Single.defer(() -&gt; Single.fromCompletionStage(createCompletionStage()));
+     * </code></pre>
+     * <p>
+     * If the {@code CompletionStage} completes with {@code null}, the resulting {@code Single} is terminated with
+     * a {@link NullPointerException}.
+     * <p>
+     * Canceling the flow can't cancel the execution of the {@code CompletionStage} because {@code CompletionStage}
+     * itself doesn't support cancellation. Instead, the operator detaches from the {@code CompletionStage}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the CompletionStage
+     * @param stage the CompletionStage to convert to Single and signal its success value or error
+     * @return the new Single instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Single<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
+        Objects.requireNonNull(stage, "stage is null");
+        return RxJavaPlugins.onAssembly(new SingleFromCompletionStage<>(stage));
+    }
+
+    /**
+     * Maps the upstream success value into an {@link Optional} and emits the contained item if not empty.
+     * <p>
+     * <img width="640" height="323" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mapOptional.s.png" alt="">
+     *
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the non-null output type
+     * @param mapper the function that receives the upstream success iteem and should return a <em>non-empty</em> {@code Optional}
+     * to emit as the success output or an <em>empty</em> {@code Optional} to complete the {@code Maybe}
+     * @return the new Maybe instance
+     * @since 3.0.0
+     * @see #map(Function)
+     * @see #filter(Predicate)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Maybe<R> mapOptional(@NonNull Function<? super T, @NonNull Optional<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new SingleMapOptional<>(this, mapper));
+    }
+
+    /**
+     * Signals the upstream success item (or error) via a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="321" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toCompletionStage.s.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code toCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> toCompletionStage() {
+        return subscribeWith(new CompletionStageConsumer<>(false, null));
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStage.java
new file mode 100644
index 0000000000..44f539bf4b
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStage.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletionStage;
+import java.util.function.BiConsumer;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.jdk8.FlowableFromCompletionStage.BiConsumerAtomicReference;
+
+/**
+ * Wrap a CompletionStage and signal its outcome.
+ * @param <T> the element type of the CompletionsStage
+ * @since 3.0.0
+ */
+public final class CompletableFromCompletionStage<T> extends Completable {
+
+    final CompletionStage<T> stage;
+
+    public CompletableFromCompletionStage(CompletionStage<T> stage) {
+        this.stage = stage;
+    }
+
+    @Override
+    protected void subscribeActual(CompletableObserver observer) {
+        // We need an indirection because one can't detach from a whenComplete
+        // and cancellation should not hold onto the stage.
+        BiConsumerAtomicReference<Object> whenReference = new BiConsumerAtomicReference<>();
+        CompletionStageHandler<Object> handler = new CompletionStageHandler<>(observer, whenReference);
+        whenReference.lazySet(handler);
+
+        observer.onSubscribe(handler);
+        stage.whenComplete(whenReference);
+    }
+
+    static final class CompletionStageHandler<T>
+    implements Disposable, BiConsumer<T, Throwable> {
+
+        final CompletableObserver downstream;
+
+        final BiConsumerAtomicReference<T> whenReference;
+
+        CompletionStageHandler(CompletableObserver downstream, BiConsumerAtomicReference<T> whenReference) {
+            this.downstream = downstream;
+            this.whenReference = whenReference;
+        }
+
+        @Override
+        public void accept(T item, Throwable error) {
+            if (error != null) {
+                downstream.onError(error);
+            } else {
+                downstream.onComplete();
+            }
+        }
+
+        @Override
+        public void dispose() {
+            whenReference.set(null);
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return whenReference.get() == null;
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletionStageConsumer.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletionStageConsumer.java
new file mode 100644
index 0000000000..d92e56041e
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletionStageConsumer.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.NoSuchElementException;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Class that extends CompletableFuture and converts multiple types of reactive consumers
+ * and their signals into completion signals.
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class CompletionStageConsumer<T> extends CompletableFuture<T>
+implements MaybeObserver<T>, SingleObserver<T>, CompletableObserver {
+
+    final AtomicReference<Disposable> upstream;
+
+    final boolean hasDefault;
+
+    final T defaultItem;
+
+    public CompletionStageConsumer(boolean hasDefault, T defaultItem) {
+        this.hasDefault = hasDefault;
+        this.defaultItem = defaultItem;
+        this.upstream = new AtomicReference<>();
+    }
+
+    @Override
+    public void onSubscribe(@NonNull Disposable d) {
+        DisposableHelper.setOnce(upstream, d);
+    }
+
+    @Override
+    public void onSuccess(@NonNull T t) {
+        clear();
+        complete(t);
+    }
+
+    @Override
+    public void onError(Throwable t) {
+        clear();
+        if (!completeExceptionally(t)) {
+            RxJavaPlugins.onError(t);
+        }
+    }
+
+    @Override
+    public void onComplete() {
+        if (hasDefault) {
+            complete(defaultItem);
+        } else {
+            completeExceptionally(new NoSuchElementException("The source was empty"));
+        }
+    }
+
+    void cancelUpstream() {
+        DisposableHelper.dispose(upstream);
+    }
+
+    void clear() {
+        upstream.lazySet(DisposableHelper.DISPOSED);
+    }
+
+    @Override
+    public boolean cancel(boolean mayInterruptIfRunning) {
+        cancelUpstream();
+        return super.cancel(mayInterruptIfRunning);
+    }
+
+    @Override
+    public boolean complete(T value) {
+        cancelUpstream();
+        return super.complete(value);
+    }
+
+    @Override
+    public boolean completeExceptionally(Throwable ex) {
+        cancelUpstream();
+        return super.completeExceptionally(ex);
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStage.java
new file mode 100644
index 0000000000..d8523b8ead
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStage.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletionStage;
+import java.util.function.BiConsumer;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.jdk8.FlowableFromCompletionStage.BiConsumerAtomicReference;
+
+/**
+ * Wrap a CompletionStage and signal its outcome.
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class MaybeFromCompletionStage<T> extends Maybe<T> {
+
+    final CompletionStage<T> stage;
+
+    public MaybeFromCompletionStage(CompletionStage<T> stage) {
+        this.stage = stage;
+    }
+
+    @Override
+    protected void subscribeActual(MaybeObserver<? super T> observer) {
+        // We need an indirection because one can't detach from a whenComplete
+        // and cancellation should not hold onto the stage.
+        BiConsumerAtomicReference<T> whenReference = new BiConsumerAtomicReference<>();
+        CompletionStageHandler<T> handler = new CompletionStageHandler<>(observer, whenReference);
+        whenReference.lazySet(handler);
+
+        observer.onSubscribe(handler);
+        stage.whenComplete(whenReference);
+    }
+
+    static final class CompletionStageHandler<T>
+    implements Disposable, BiConsumer<T, Throwable> {
+
+        final MaybeObserver<? super T> downstream;
+
+        final BiConsumerAtomicReference<T> whenReference;
+
+        CompletionStageHandler(MaybeObserver<? super T> downstream, BiConsumerAtomicReference<T> whenReference) {
+            this.downstream = downstream;
+            this.whenReference = whenReference;
+        }
+
+        @Override
+        public void accept(T item, Throwable error) {
+            if (error != null) {
+                downstream.onError(error);
+            }
+            else if (item != null) {
+                downstream.onSuccess(item);
+            } else {
+                downstream.onComplete();
+            }
+        }
+
+        @Override
+        public void dispose() {
+            whenReference.set(null);
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return whenReference.get() == null;
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptional.java
new file mode 100644
index 0000000000..8330d5249a
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptional.java
@@ -0,0 +1,110 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+
+/**
+ * Maps the success value to an {@link Optional} and emits its non-empty value or completes.
+ *
+ * @param <T> the upstream success value type
+ * @param <R> the result value type
+ * @since 3.0.0
+ */
+public final class MaybeMapOptional<T, R> extends Maybe<R> {
+
+    final Maybe<T> source;
+
+    final Function<? super T, Optional<? extends R>> mapper;
+
+    public MaybeMapOptional(Maybe<T> source, Function<? super T, Optional<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void subscribeActual(MaybeObserver<? super R> observer) {
+        source.subscribe(new MapOptionalMaybeObserver<>(observer, mapper));
+    }
+
+    static final class MapOptionalMaybeObserver<T, R> implements MaybeObserver<T>, Disposable {
+
+        final MaybeObserver<? super R> downstream;
+
+        final Function<? super T, Optional<? extends R>> mapper;
+
+        Disposable upstream;
+
+        MapOptionalMaybeObserver(MaybeObserver<? super R> downstream, Function<? super T, Optional<? extends R>> mapper) {
+            this.downstream = downstream;
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void dispose() {
+            Disposable d = this.upstream;
+            this.upstream = DisposableHelper.DISPOSED;
+            d.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(T value) {
+            Optional<? extends R> v;
+
+            try {
+                v = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null item");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+
+            if (v.isPresent()) {
+                downstream.onSuccess(v.get());
+            } else {
+                downstream.onComplete();
+            }
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            downstream.onError(e);
+        }
+
+        @Override
+        public void onComplete() {
+            downstream.onComplete();
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStage.java
new file mode 100644
index 0000000000..f1be64375e
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStage.java
@@ -0,0 +1,81 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletionStage;
+import java.util.function.BiConsumer;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.jdk8.FlowableFromCompletionStage.BiConsumerAtomicReference;
+
+/**
+ * Wrap a CompletionStage and signal its outcome.
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class SingleFromCompletionStage<T> extends Single<T> {
+
+    final CompletionStage<T> stage;
+
+    public SingleFromCompletionStage(CompletionStage<T> stage) {
+        this.stage = stage;
+    }
+
+    @Override
+    protected void subscribeActual(SingleObserver<? super T> observer) {
+        // We need an indirection because one can't detach from a whenComplete
+        // and cancellation should not hold onto the stage.
+        BiConsumerAtomicReference<T> whenReference = new BiConsumerAtomicReference<>();
+        CompletionStageHandler<T> handler = new CompletionStageHandler<>(observer, whenReference);
+        whenReference.lazySet(handler);
+
+        observer.onSubscribe(handler);
+        stage.whenComplete(whenReference);
+    }
+
+    static final class CompletionStageHandler<T>
+    implements Disposable, BiConsumer<T, Throwable> {
+
+        final SingleObserver<? super T> downstream;
+
+        final BiConsumerAtomicReference<T> whenReference;
+
+        CompletionStageHandler(SingleObserver<? super T> downstream, BiConsumerAtomicReference<T> whenReference) {
+            this.downstream = downstream;
+            this.whenReference = whenReference;
+        }
+
+        @Override
+        public void accept(T item, Throwable error) {
+            if (error != null) {
+                downstream.onError(error);
+            }
+            else if (item != null) {
+                downstream.onSuccess(item);
+            } else {
+                downstream.onError(new NullPointerException("The CompletionStage terminated with null."));
+            }
+        }
+
+        @Override
+        public void dispose() {
+            whenReference.set(null);
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return whenReference.get() == null;
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptional.java
new file mode 100644
index 0000000000..9ee9a6f803
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptional.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+
+/**
+ * Maps the success value to an {@link Optional} and emits its non-empty value or completes.
+ *
+ * @param <T> the upstream success value type
+ * @param <R> the result value type
+ * @since 3.0.0
+ */
+public final class SingleMapOptional<T, R> extends Maybe<R> {
+
+    final Single<T> source;
+
+    final Function<? super T, Optional<? extends R>> mapper;
+
+    public SingleMapOptional(Single<T> source, Function<? super T, Optional<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void subscribeActual(MaybeObserver<? super R> observer) {
+        source.subscribe(new MapOptionalSingleObserver<>(observer, mapper));
+    }
+
+    static final class MapOptionalSingleObserver<T, R> implements SingleObserver<T>, Disposable {
+
+        final MaybeObserver<? super R> downstream;
+
+        final Function<? super T, Optional<? extends R>> mapper;
+
+        Disposable upstream;
+
+        MapOptionalSingleObserver(MaybeObserver<? super R> downstream, Function<? super T, Optional<? extends R>> mapper) {
+            this.downstream = downstream;
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void dispose() {
+            Disposable d = this.upstream;
+            this.upstream = DisposableHelper.DISPOSED;
+            d.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(T value) {
+            Optional<? extends R> v;
+
+            try {
+                v = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null item");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+
+            if (v.isPresent()) {
+                downstream.onSuccess(v.get());
+            } else {
+                downstream.onComplete();
+            }
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            downstream.onError(e);
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStageTest.java
new file mode 100644
index 0000000000..3519cc5454
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStageTest.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class CompletableFromCompletionStageTest extends RxJavaTest {
+
+    @Test
+    public void syncSuccess() {
+        Completable.fromCompletionStage(CompletableFuture.completedFuture(1))
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void syncSuccessNull() {
+        Completable.fromCompletionStage(CompletableFuture.completedFuture(null))
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void syncFailure() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+        cf.completeExceptionally(new TestException());
+
+        Completable.fromCompletionStage(cf)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void syncNull() {
+        Completable.fromCompletionStage(CompletableFuture.<Integer>completedFuture(null))
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void dispose() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+
+        TestObserver<Void> to = Completable.fromCompletionStage(cf)
+        .test();
+
+        to.assertEmpty();
+
+        to.dispose();
+
+        cf.complete(1);
+
+        to.assertEmpty();
+    }
+
+    @Test
+    public void dispose2() {
+        TestHelper.checkDisposed(Completable.fromCompletionStage(new CompletableFuture<>()));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableToCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableToCompletionStageTest.java
new file mode 100644
index 0000000000..91fdfb9cde
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableToCompletionStageTest.java
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class CompletableToCompletionStageTest extends RxJavaTest {
+
+    @Test
+    public void complete() throws Exception {
+        Object v = Completable.complete()
+                .toCompletionStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertNull(v);
+    }
+
+    @Test
+    public void completableFutureCancels() throws Exception {
+        CompletableSubject source = CompletableSubject.create();
+
+        CompletableFuture<Object> cf = source
+                .toCompletionStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void completableManualCompleteCancels() throws Exception {
+        CompletableSubject source = CompletableSubject.create();
+
+        CompletableFuture<Object> cf = source
+                .toCompletionStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        assertEquals(1, cf.get());
+    }
+
+    @Test
+    public void completableManualCompleteExceptionallyCancels() throws Exception {
+        CompletableSubject source = CompletableSubject.create();
+
+        CompletableFuture<Object> cf = source
+                .toCompletionStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void error() throws Exception {
+        CompletableFuture<Object> cf = Completable.error(new TestException())
+                .toCompletionStage(null)
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void sourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Object v = new Completable() {
+                @Override
+                protected void subscribeActual(CompletableObserver observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onComplete();
+                    observer.onError(new TestException());
+                    observer.onComplete();
+                }
+            }
+            .toCompletionStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertNull(v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void doubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Object v = new Completable() {
+                @Override
+                protected void subscribeActual(CompletableObserver observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onComplete();
+                }
+            }
+            .toCompletionStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertNull(v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStageTest.java
new file mode 100644
index 0000000000..90ad2bc626
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStageTest.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeFromCompletionStageTest extends RxJavaTest {
+
+    @Test
+    public void syncSuccess() {
+        Maybe.fromCompletionStage(CompletableFuture.completedFuture(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void syncFailure() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+        cf.completeExceptionally(new TestException());
+
+        Maybe.fromCompletionStage(cf)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void syncNull() {
+        Maybe.fromCompletionStage(CompletableFuture.<Integer>completedFuture(null))
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void dispose() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+
+        TestObserver<Integer> to = Maybe.fromCompletionStage(cf)
+        .test();
+
+        to.assertEmpty();
+
+        to.dispose();
+
+        cf.complete(1);
+
+        to.assertEmpty();
+    }
+
+    @Test
+    public void dispose2() {
+        TestHelper.checkDisposed(Maybe.fromCompletionStage(new CompletableFuture<>()));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromOptionalTest.java
new file mode 100644
index 0000000000..4e09fea0b1
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromOptionalTest.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+
+public class MaybeFromOptionalTest extends RxJavaTest {
+
+    @Test
+    public void hasValue() {
+        Maybe.fromOptional(Optional.of(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void empty() {
+        Maybe.fromOptional(Optional.empty())
+        .test()
+        .assertResult();
+    }
+
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptionalTest.java
new file mode 100644
index 0000000000..e8b9f2aac3
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptionalTest.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeMapOptionalTest extends RxJavaTest {
+
+    @Test
+    public void successSuccess() {
+        Maybe.just(1)
+        .mapOptional(Optional::of)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void successEmpty() {
+        Maybe.just(1)
+        .mapOptional(v -> Optional.empty())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void empty() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<? super Integer, Optional<? extends Integer>> f = mock(Function.class);
+
+        Maybe.<Integer>empty()
+        .mapOptional(f)
+        .test()
+        .assertResult();
+
+        verify(f, never()).apply(any());
+    }
+
+    @Test
+    public void error() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<? super Integer, Optional<? extends Integer>> f = mock(Function.class);
+
+        Maybe.<Integer>error(new TestException())
+        .mapOptional(f)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(f, never()).apply(any());
+    }
+
+    @Test
+    public void mapperCrash() {
+        Maybe.just(1)
+        .mapOptional(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Maybe.never().mapOptional(Optional::of));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybe(m -> m.mapOptional(Optional::of));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeToCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeToCompletionStageTest.java
new file mode 100644
index 0000000000..c6c83e68a3
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeToCompletionStageTest.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.NoSuchElementException;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeToCompletionStageTest extends RxJavaTest {
+
+    @Test
+    public void just() throws Exception {
+        Integer v = Maybe.just(1)
+                .toCompletionStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void empty() throws Exception {
+        Integer v = Maybe.<Integer>empty()
+                .toCompletionStage(2)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)2, v);
+    }
+
+    @Test
+    public void emptyError() throws Exception {
+        CompletableFuture<Integer> cf = Maybe.<Integer>empty()
+                .toCompletionStage()
+                .toCompletableFuture();
+
+        TestHelper.assertError(cf, NoSuchElementException.class);
+    }
+
+    @Test
+    public void completableFutureCancels() throws Exception {
+        MaybeSubject<Integer> source = MaybeSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .toCompletionStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void completableManualCompleteCancels() throws Exception {
+        MaybeSubject<Integer> source = MaybeSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .toCompletionStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void completableManualCompleteExceptionallyCancels() throws Exception {
+        MaybeSubject<Integer> source = MaybeSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .toCompletionStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void error() throws Exception {
+        CompletableFuture<Integer> cf = Maybe.<Integer>error(new TestException())
+                .toCompletionStage(null)
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void sourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Maybe<Integer>() {
+                @Override
+                protected void subscribeActual(MaybeObserver<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSuccess(1);
+                    observer.onError(new TestException());
+                    observer.onComplete();
+                }
+            }
+            .toCompletionStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void doubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Maybe<Integer>() {
+                @Override
+                protected void subscribeActual(MaybeObserver<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSuccess(1);
+                }
+            }
+            .toCompletionStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStageTest.java
new file mode 100644
index 0000000000..7adb3664be
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStageTest.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleFromCompletionStageTest extends RxJavaTest {
+
+    @Test
+    public void syncSuccess() {
+        Single.fromCompletionStage(CompletableFuture.completedFuture(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void syncFailure() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+        cf.completeExceptionally(new TestException());
+
+        Single.fromCompletionStage(cf)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void syncNull() {
+        Single.fromCompletionStage(CompletableFuture.<Integer>completedFuture(null))
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void dispose() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+
+        TestObserver<Integer> to = Single.fromCompletionStage(cf)
+        .test();
+
+        to.assertEmpty();
+
+        to.dispose();
+
+        cf.complete(1);
+
+        to.assertEmpty();
+    }
+
+    @Test
+    public void dispose2() {
+        TestHelper.checkDisposed(Single.fromCompletionStage(new CompletableFuture<>()));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptionalTest.java
new file mode 100644
index 0000000000..b8ab17a17c
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptionalTest.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleMapOptionalTest extends RxJavaTest {
+
+    @Test
+    public void successSuccess() {
+        Single.just(1)
+        .mapOptional(Optional::of)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void successEmpty() {
+        Single.just(1)
+        .mapOptional(v -> Optional.empty())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void error() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<? super Integer, Optional<? extends Integer>> f = mock(Function.class);
+
+        Single.<Integer>error(new TestException())
+        .mapOptional(f)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(f, never()).apply(any());
+    }
+
+    @Test
+    public void mapperCrash() {
+        Single.just(1)
+        .mapOptional(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Single.never().mapOptional(Optional::of));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingleToMaybe(m -> m.mapOptional(Optional::of));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleToCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleToCompletionStageTest.java
new file mode 100644
index 0000000000..2560c68ed8
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleToCompletionStageTest.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleToCompletionStageTest extends RxJavaTest {
+
+    @Test
+    public void just() throws Exception {
+        Integer v = Single.just(1)
+                .toCompletionStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void completableFutureCancels() throws Exception {
+        SingleSubject<Integer> source = SingleSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .toCompletionStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void completableManualCompleteCancels() throws Exception {
+        SingleSubject<Integer> source = SingleSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .toCompletionStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void completableManualCompleteExceptionallyCancels() throws Exception {
+        SingleSubject<Integer> source = SingleSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .toCompletionStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void error() throws Exception {
+        CompletableFuture<Integer> cf = Single.<Integer>error(new TestException())
+                .toCompletionStage()
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void sourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Single<Integer>() {
+                @Override
+                protected void subscribeActual(SingleObserver<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSuccess(1);
+                    observer.onError(new TestException());
+                }
+            }
+            .toCompletionStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void doubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Single<Integer>() {
+                @Override
+                protected void subscribeActual(SingleObserver<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSuccess(1);
+                }
+            }
+            .toCompletionStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 99f6783b4a..b796904cdb 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -509,6 +509,9 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "singleStage", Object.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "lastStage", Object.class));
 
+        addOverride(new ParamOverride(Maybe.class, 0, ParamMode.ANY, "toCompletionStage", Object.class));
+        addOverride(new ParamOverride(Completable.class, 0, ParamMode.ANY, "toCompletionStage", Object.class));
+
         // -----------------------------------------------------------------------------------
 
         ignores = new HashMap<String, List<ParamIgnore>>();

From dba670554c69d6c09d28643505880c1a468af3db Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 21 Dec 2019 11:08:34 +0100
Subject: [PATCH 015/665] 3.x: Cleanup and prettify Javadocs, widen XOperator
 throws (#6785)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 3.x: Cleanup and prettify Javadocs, widen XOperator throws

* Fix encoding of § in javadoc

* Fix a wrong tag name
---
 .../rxjava3/annotations/BackpressureKind.java |   6 +-
 .../core/BackpressureOverflowStrategy.java    |   5 +-
 .../rxjava3/core/BackpressureStrategy.java    |  11 +-
 .../rxjava3/core/CompletableEmitter.java      |   6 +-
 .../rxjava3/core/CompletableObserver.java     |   6 +-
 .../rxjava3/core/CompletableOnSubscribe.java  |   4 +-
 .../rxjava3/core/CompletableOperator.java     |  10 +-
 .../rxjava3/core/CompletableSource.java       |   8 +-
 .../rxjava3/core/CompletableTransformer.java  |  10 +-
 .../io/reactivex/rxjava3/core/Emitter.java    |   6 +-
 .../io/reactivex/rxjava3/core/Flowable.java   |  72 ++++----
 .../rxjava3/core/FlowableConverter.java       |   6 +-
 .../rxjava3/core/FlowableEmitter.java         |  20 +-
 .../rxjava3/core/FlowableOnSubscribe.java     |   4 +-
 .../rxjava3/core/FlowableOperator.java        |  12 +-
 .../rxjava3/core/FlowableSubscriber.java      |   2 +-
 .../rxjava3/core/FlowableTransformer.java     |   8 +-
 .../rxjava3/core/MaybeConverter.java          |   6 +-
 .../reactivex/rxjava3/core/MaybeEmitter.java  |  22 ++-
 .../reactivex/rxjava3/core/MaybeObserver.java |  14 +-
 .../rxjava3/core/MaybeOnSubscribe.java        |   4 +-
 .../reactivex/rxjava3/core/MaybeOperator.java |  12 +-
 .../reactivex/rxjava3/core/MaybeSource.java   |   6 +-
 .../rxjava3/core/MaybeTransformer.java        |   8 +-
 .../reactivex/rxjava3/core/Notification.java  |  42 ++---
 .../io/reactivex/rxjava3/core/Observable.java |  12 +-
 .../rxjava3/core/ObservableConverter.java     |   6 +-
 .../rxjava3/core/ObservableEmitter.java       |  24 +--
 .../rxjava3/core/ObservableOnSubscribe.java   |   4 +-
 .../rxjava3/core/ObservableOperator.java      |  12 +-
 .../rxjava3/core/ObservableSource.java        |   6 +-
 .../rxjava3/core/ObservableTransformer.java   |   8 +-
 .../io/reactivex/rxjava3/core/Observer.java   |  16 +-
 .../io/reactivex/rxjava3/core/Single.java     |   2 +-
 .../rxjava3/core/SingleConverter.java         |   6 +-
 .../reactivex/rxjava3/core/SingleEmitter.java |  18 +-
 .../rxjava3/core/SingleObserver.java          |  14 +-
 .../rxjava3/core/SingleOnSubscribe.java       |   4 +-
 .../rxjava3/core/SingleOperator.java          |  12 +-
 .../reactivex/rxjava3/core/SingleSource.java  |   6 +-
 .../rxjava3/core/SingleTransformer.java       |   8 +-
 .../disposables/CompositeDisposable.java      |  10 +-
 .../exceptions/UndeliverableException.java    |   2 +-
 .../internal/util/BackpressureHelper.java     |  35 ++--
 .../internal/util/QueueDrainHelper.java       |   4 +-
 .../rxjava3/observers/BaseTestConsumer.java   | 171 +++++++++++-------
 .../DisposableCompletableObserver.java        |   4 +-
 .../observers/DisposableMaybeObserver.java    |   6 +-
 .../rxjava3/observers/DisposableObserver.java |   4 +-
 .../observers/DisposableSingleObserver.java   |   6 +-
 .../LambdaConsumerIntrospection.java          |   4 +-
 .../ResourceCompletableObserver.java          |  18 +-
 .../observers/ResourceMaybeObserver.java      |  18 +-
 .../rxjava3/observers/ResourceObserver.java   |  18 +-
 .../observers/ResourceSingleObserver.java     |  18 +-
 .../rxjava3/observers/SafeObserver.java       |   6 +-
 .../rxjava3/observers/SerializedObserver.java |  23 +--
 .../rxjava3/observers/TestObserver.java       |  56 +++---
 .../rxjava3/processors/AsyncProcessor.java    |   2 +-
 .../rxjava3/processors/BehaviorProcessor.java |   4 +-
 .../rxjava3/processors/PublishProcessor.java  |   2 +-
 .../rxjava3/processors/ReplayProcessor.java   |   4 +-
 .../rxjava3/processors/UnicastProcessor.java  |   4 +-
 .../reactivex/rxjava3/schedulers/Timed.java   |   6 +-
 .../rxjava3/subjects/BehaviorSubject.java     |   2 +-
 .../subscribers/DefaultSubscriber.java        |   6 +-
 .../subscribers/DisposableSubscriber.java     |  20 +-
 .../subscribers/ResourceSubscriber.java       |  24 +--
 .../rxjava3/subscribers/SafeSubscriber.java   |  15 +-
 .../subscribers/SerializedSubscriber.java     |  30 +--
 .../rxjava3/subscribers/TestSubscriber.java   |  77 ++++----
 .../flowable/FlowableSubscriberTest.java      |   6 +-
 .../io/reactivex/rxjava3/tck/BaseTck.java     |   4 +-
 .../rxjava3/testsupport/TestHelper.java       |   2 +-
 .../rxjava3/testsupport/TestSubscriberEx.java |   2 +-
 75 files changed, 570 insertions(+), 511 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java
index aa20e5f78e..fd53c196b3 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java
@@ -32,13 +32,13 @@ public enum BackpressureKind {
      */
     SPECIAL,
     /**
-     * The operator requests Long.MAX_VALUE from upstream but respects the backpressure
+     * The operator requests {@link Long#MAX_VALUE} from upstream but respects the backpressure
      * of the downstream.
      */
     UNBOUNDED_IN,
     /**
-     * The operator will emit a MissingBackpressureException if the downstream didn't request
-     * enough or in time.
+     * The operator will emit a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException}
+     * if the downstream didn't request enough or in time.
      */
     ERROR,
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java b/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java
index 5ee8ecca1d..750a1308f2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java
+++ b/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java
@@ -19,7 +19,10 @@
  * Options to deal with buffer overflow when using onBackpressureBuffer.
  */
 public enum BackpressureOverflowStrategy {
-    /** Signal a MissingBackpressureException and terminate the sequence. */
+    /**
+     * Signal a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException}
+     * and terminate the sequence.
+     */
     ERROR,
     /** Drop the oldest value from the buffer. */
     DROP_OLDEST,
diff --git a/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java b/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java
index c0831d7759..4a26072650 100644
--- a/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java
+++ b/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java
@@ -18,25 +18,26 @@
  */
 public enum BackpressureStrategy {
     /**
-     * OnNext events are written without any buffering or dropping.
+     * The {@code onNext} events are written without any buffering or dropping.
      * Downstream has to deal with any overflow.
      * <p>Useful when one applies one of the custom-parameter onBackpressureXXX operators.
      */
     MISSING,
     /**
-     * Signals a MissingBackpressureException in case the downstream can't keep up.
+     * Signals a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException}
+     * in case the downstream can't keep up.
      */
     ERROR,
     /**
-     * Buffers <em>all</em> onNext values until the downstream consumes it.
+     * Buffers <em>all</em> {@code onNext} values until the downstream consumes it.
      */
     BUFFER,
     /**
-     * Drops the most recent onNext value if the downstream can't keep up.
+     * Drops the most recent {@code onNext} value if the downstream can't keep up.
      */
     DROP,
     /**
-     * Keeps only the latest onNext value, overwriting any previous value if the
+     * Keeps only the latest {@code onNext} value, overwriting any previous value if the
      * downstream can't keep up.
      */
     LATEST
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java
index 51c9780f73..5ebb4e1877 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java
@@ -82,12 +82,12 @@ public interface CompletableEmitter {
     boolean isDisposed();
 
     /**
-     * Attempts to emit the specified {@code Throwable} error if the downstream
+     * Attempts to emit the specified {@link Throwable} error if the downstream
      * hasn't cancelled the sequence or is otherwise terminated, returning false
      * if the emission is not allowed to happen due to lifecycle restrictions.
      * <p>
-     * Unlike {@link #onError(Throwable)}, the {@code RxJavaPlugins.onError} is not called
-     * if the error could not be delivered.
+     * Unlike {@link #onError(Throwable)}, the {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable) RxjavaPlugins.onError}
+     * is not called if the error could not be delivered.
      * <p>History: 2.1.1 - experimental
      * @param t the throwable error to signal if possible
      * @return true if successful, false if the downstream is not able to accept further
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java b/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java
index af0a017d66..7c01ebfee1 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java
@@ -49,9 +49,9 @@
  */
 public interface CompletableObserver {
     /**
-     * Called once by the Completable to set a Disposable on this instance which
+     * Called once by the {@link Completable} to set a {@link Disposable} on this instance which
      * then can be used to cancel the subscription at any time.
-     * @param d the Disposable instance to call dispose on for cancellation, not null
+     * @param d the {@code Disposable} instance to call dispose on for cancellation, not null
      */
     void onSubscribe(@NonNull Disposable d);
 
@@ -62,7 +62,7 @@ public interface CompletableObserver {
 
     /**
      * Called once if the deferred computation 'throws' an exception.
-     * @param e the exception, not null.
+     * @param e the exception, not {@code null}.
      */
     void onError(@NonNull Throwable e);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
index 6aea056be7..70d79e62b6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
@@ -23,8 +23,8 @@
 public interface CompletableOnSubscribe {
 
     /**
-     * Called for each CompletableObserver that subscribes.
-     * @param emitter the safe emitter instance, never null
+     * Called for each {@link CompletableObserver} that subscribes.
+     * @param emitter the safe emitter instance, never {@code null}
      * @throws Throwable on error
      */
     void subscribe(@NonNull CompletableEmitter emitter) throws Throwable;
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java b/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java
index 763cd670c6..e9b1df83cb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java
@@ -21,11 +21,11 @@
 @FunctionalInterface
 public interface CompletableOperator {
     /**
-     * Applies a function to the child CompletableObserver and returns a new parent CompletableObserver.
-     * @param observer the child CompletableObservable instance
-     * @return the parent CompletableObserver instance
-     * @throws Exception on failure
+     * Applies a function to the child {@link CompletableObserver} and returns a new parent {@code CompletableObserver}.
+     * @param observer the child {@code CompletableObserver} instance
+     * @return the parent {@code CompletableObserver} instance
+     * @throws Throwable on failure
      */
     @NonNull
-    CompletableObserver apply(@NonNull CompletableObserver observer) throws Exception;
+    CompletableObserver apply(@NonNull CompletableObserver observer) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java b/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java
index 9b754a698a..58edf9471c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java
@@ -24,9 +24,9 @@
 public interface CompletableSource {
 
     /**
-     * Subscribes the given CompletableObserver to this CompletableSource instance.
-     * @param co the CompletableObserver, not null
-     * @throws NullPointerException if {@code co} is null
+     * Subscribes the given {@link CompletableObserver} to this {@code CompletableSource} instance.
+     * @param observer the {@code CompletableObserver}, not {@code null}
+     * @throws NullPointerException if {@code observer} is {@code null}
      */
-    void subscribe(@NonNull CompletableObserver co);
+    void subscribe(@NonNull CompletableObserver observer);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java
index 91e1a361ba..98a9e2aa19 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java
@@ -16,15 +16,15 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Convenience interface and callback used by the compose operator to turn a Completable into another
- * Completable fluently.
+ * Convenience interface and callback used by the compose operator to turn a {@link Completable} into another
+ * {@code Completable} fluently.
  */
 @FunctionalInterface
 public interface CompletableTransformer {
     /**
-     * Applies a function to the upstream Completable and returns a CompletableSource.
-     * @param upstream the upstream Completable instance
-     * @return the transformed CompletableSource instance
+     * Applies a function to the upstream {@link Completable} and returns a {@link CompletableSource}.
+     * @param upstream the upstream {@code Completable} instance
+     * @return the transformed {@code CompletableSource} instance
      */
     @NonNull
     CompletableSource apply(@NonNull Completable upstream);
diff --git a/src/main/java/io/reactivex/rxjava3/core/Emitter.java b/src/main/java/io/reactivex/rxjava3/core/Emitter.java
index e222f9c44f..0fc2b47c0d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Emitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Emitter.java
@@ -29,13 +29,13 @@ public interface Emitter<T> {
 
     /**
      * Signal a normal value.
-     * @param value the value to signal, not null
+     * @param value the value to signal, not {@code null}
      */
     void onNext(@NonNull T value);
 
     /**
-     * Signal a Throwable exception.
-     * @param error the Throwable to signal, not null
+     * Signal a {@link Throwable} exception.
+     * @param error the {@code Throwable} to signal, not {@code null}
      */
     void onError(@NonNull Throwable error);
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 09cb859b83..0b2e9197cb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -1434,7 +1434,7 @@ public static <T> Flowable<T> concatArrayEager(Publisher<? extends T>... sources
      * </dl>
      * @param <T> the value type
      * @param sources an array of Publishers that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrent subscriptions at a time, Integer.MAX_VALUE
+     * @param maxConcurrency the maximum number of concurrent subscriptions at a time, {@link Integer#MAX_VALUE}
      *                       is interpreted as an indication to subscribe to all sources at once
      * @param prefetch the number of elements to prefetch from each Publisher source
      * @return the new Publisher instance with the specified concatenation behavior
@@ -1503,7 +1503,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(Publisher<? extends T>.
      * </dl>
      * @param <T> the value type
      * @param sources an array of {@code Publisher}s that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrent subscriptions at a time, Integer.MAX_VALUE
+     * @param maxConcurrency the maximum number of concurrent subscriptions at a time, {@link Integer#MAX_VALUE}
      *                       is interpreted as indication to subscribe to all sources at once
      * @param prefetch the number of elements to prefetch from each {@code Publisher} source
      * @return the new Flowable instance with the specified concatenation behavior
@@ -1635,7 +1635,7 @@ public static <T> Flowable<T> concatEager(Publisher<? extends Publisher<? extend
      * </dl>
      * @param <T> the value type
      * @param sources a sequence of Publishers that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrently running inner Publishers; Integer.MAX_VALUE
+     * @param maxConcurrency the maximum number of concurrently running inner Publishers; {@link Integer#MAX_VALUE}
      *                       is interpreted as all inner Publishers can be active at the same time
      * @param prefetch the number of elements to prefetch from each inner Publisher source
      * @return the new Publisher instance with the specified concatenation behavior
@@ -1695,7 +1695,7 @@ public static <T> Flowable<T> concatEager(Iterable<? extends Publisher<? extends
      * </dl>
      * @param <T> the value type
      * @param sources a sequence of Publishers that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrently running inner Publishers; Integer.MAX_VALUE
+     * @param maxConcurrency the maximum number of concurrently running inner Publishers; {@link Integer#MAX_VALUE}
      *                       is interpreted as all inner Publishers can be active at the same time
      * @param prefetch the number of elements to prefetch from each inner Publisher source
      * @return the new Publisher instance with the specified concatenation behavior
@@ -3976,7 +3976,7 @@ public static <T> Flowable<T> never() {
      * @return a Flowable that emits a range of sequential Integers
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
-     *             {@code Integer.MAX_VALUE}
+     *             {@link Integer#MAX_VALUE}
      * @see <a href="http://reactivex.io/documentation/operators/range.html">ReactiveX operators documentation: Range</a>
      */
     @CheckReturnValue
@@ -4016,7 +4016,7 @@ public static Flowable<Integer> range(int start, int count) {
      * @return a Flowable that emits a range of sequential Longs
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
-     *             {@code Long.MAX_VALUE}
+     *             {@link Long#MAX_VALUE}
      * @see <a href="http://reactivex.io/documentation/operators/range.html">ReactiveX operators documentation: Range</a>
      */
     @CheckReturnValue
@@ -6258,7 +6258,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, Sup
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it uses time. It requests {@code Long.MAX_VALUE}
+     *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
      *      upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -6293,7 +6293,7 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, TimeUnit uni
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it uses time. It requests {@code Long.MAX_VALUE}
+     *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
      *      upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6330,7 +6330,7 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, TimeUnit uni
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it uses time. It requests {@code Long.MAX_VALUE}
+     *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
      *      upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6375,7 +6375,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan,
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it uses time. It requests {@code Long.MAX_VALUE}
+     *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
      *      upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -6408,7 +6408,7 @@ public final Flowable<List<T>> buffer(long timespan, TimeUnit unit) {
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it uses time. It requests {@code Long.MAX_VALUE}
+     *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
      *      upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -6445,7 +6445,7 @@ public final Flowable<List<T>> buffer(long timespan, TimeUnit unit, int count) {
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it uses time. It requests {@code Long.MAX_VALUE}
+     *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
      *      upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6484,7 +6484,7 @@ public final Flowable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler sc
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it uses time. It requests {@code Long.MAX_VALUE}
+     *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
      *      upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6536,7 +6536,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it uses time. It requests {@code Long.MAX_VALUE}
+     *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
      *      upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6571,7 +6571,7 @@ public final Flowable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler sc
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it is instead controlled by the given Publishers and
-     *      buffers data. It requests {@code Long.MAX_VALUE} upstream and does not obey downstream requests.</dd>
+     *      buffers data. It requests {@link Long#MAX_VALUE} upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -6607,7 +6607,7 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it is instead controlled by the given Publishers and
-     *      buffers data. It requests {@code Long.MAX_VALUE} upstream and does not obey downstream requests.</dd>
+     *      buffers data. It requests {@link Long#MAX_VALUE} upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -6652,7 +6652,7 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it is instead controlled by the {@code Publisher}
-     *      {@code boundary} and buffers data. It requests {@code Long.MAX_VALUE} upstream and does not obey
+     *      {@code boundary} and buffers data. It requests {@link Long#MAX_VALUE} upstream and does not obey
      *      downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6686,7 +6686,7 @@ public final <B> Flowable<List<T>> buffer(Publisher<B> boundaryIndicator) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it is instead controlled by the {@code Publisher}
-     *      {@code boundary} and buffers data. It requests {@code Long.MAX_VALUE} upstream and does not obey
+     *      {@code boundary} and buffers data. It requests {@link Long#MAX_VALUE} upstream and does not obey
      *      downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6723,7 +6723,7 @@ public final <B> Flowable<List<T>> buffer(Publisher<B> boundaryIndicator, final
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it is instead controlled by the {@code Publisher}
-     *      {@code boundary} and buffers data. It requests {@code Long.MAX_VALUE} upstream and does not obey
+     *      {@code boundary} and buffers data. It requests {@link Long#MAX_VALUE} upstream and does not obey
      *      downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8503,7 +8503,7 @@ public final <U, V> Flowable<T> delay(Publisher<U> subscriptionIndicator,
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator forwards the backpressure requests to this Publisher once
-     *  the subscription happens and requests Long.MAX_VALUE from the other Publisher</dd>
+     *  the subscription happens and requests {@link Long#MAX_VALUE} from the other Publisher</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -10004,9 +10004,9 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
      * waits until the upstream and all CompletableSources complete, optionally delaying all errors.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>If {@code maxConcurrency == Integer.MAX_VALUE} the operator consumes the upstream in an unbounded manner.
+     *  <dd>If {@code maxConcurrency == }{@link Integer#MAX_VALUE} the operator consumes the upstream in an unbounded manner.
      *  Otherwise, the operator expects the upstream to honor backpressure. If the upstream doesn't support backpressure
-     *  the operator behaves as if {@code maxConcurrency == Integer.MAX_VALUE} was used.</dd>
+     *  the operator behaves as if {@code maxConcurrency == }{@link Integer#MAX_VALUE} was used.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -10198,9 +10198,9 @@ public final <R> Flowable<R> flatMapMaybe(Function<? super T, ? extends MaybeSou
      * in no particular order, into a single Flowable sequence, optionally delaying all errors.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>If {@code maxConcurrency == Integer.MAX_VALUE} the operator consumes the upstream in an unbounded manner.
+     *  <dd>If {@code maxConcurrency == }{@link Integer#MAX_VALUE} the operator consumes the upstream in an unbounded manner.
      *  Otherwise, the operator expects the upstream to honor backpressure. If the upstream doesn't support backpressure
-     *  the operator behaves as if {@code maxConcurrency == Integer.MAX_VALUE} was used.</dd>
+     *  the operator behaves as if {@code maxConcurrency == }{@link Integer#MAX_VALUE} was used.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -10247,9 +10247,9 @@ public final <R> Flowable<R> flatMapSingle(Function<? super T, ? extends SingleS
      * in no particular order, into a single Flowable sequence, optionally delaying all errors.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>If {@code maxConcurrency == Integer.MAX_VALUE} the operator consumes the upstream in an unbounded manner.
+     *  <dd>If {@code maxConcurrency == }{@link Integer#MAX_VALUE} the operator consumes the upstream in an unbounded manner.
      *  Otherwise, the operator expects the upstream to honor backpressure. If the upstream doesn't support backpressure
-     *  the operator behaves as if {@code maxConcurrency == Integer.MAX_VALUE} was used.</dd>
+     *  the operator behaves as if {@code maxConcurrency == }{@link Integer#MAX_VALUE} was used.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -10415,7 +10415,7 @@ public final Disposable forEachWhile(final Predicate<? super T> onNext, final Co
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
      * value to be greater or equal to the expected number of groups, possibly using
-     * {@code Integer.MAX_VALUE} if the number of expected groups is unknown.
+     * {@link Integer#MAX_VALUE} if the number of expected groups is unknown.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
@@ -10473,7 +10473,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(Function<? super T, ? e
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
      * value to be greater or equal to the expected number of groups, possibly using
-     * {@code Integer.MAX_VALUE} if the number of expected groups is unknown.
+     * {@link Integer#MAX_VALUE} if the number of expected groups is unknown.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
@@ -10532,7 +10532,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(Function<? super T, ? e
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
      * value to be greater or equal to the expected number of groups, possibly using
-     * {@code Integer.MAX_VALUE} if the number of expected groups is unknown.
+     * {@link Integer#MAX_VALUE} if the number of expected groups is unknown.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
@@ -10596,7 +10596,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T,
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
      * value to be greater or equal to the expected number of groups, possibly using
-     * {@code Integer.MAX_VALUE} if the number of expected groups is unknown.
+     * {@link Integer#MAX_VALUE} if the number of expected groups is unknown.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
@@ -10661,7 +10661,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T,
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
      * value to be greater or equal to the expected number of groups, possibly using
-     * {@code Integer.MAX_VALUE} if the number of expected groups is unknown.
+     * {@link Integer#MAX_VALUE} if the number of expected groups is unknown.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
@@ -10774,7 +10774,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T,
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
      * value to be greater or equal to the expected number of groups, possibly using
-     * {@code Integer.MAX_VALUE} if the number of expected groups is unknown.
+     * {@link Integer#MAX_VALUE} if the number of expected groups is unknown.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
@@ -12337,7 +12337,7 @@ public final ConnectableFlowable<T> publish(int bufferSize) {
      * Requests {@code n} initially from the upstream and then 75% of {@code n} subsequently
      * after 75% of {@code n} values have been emitted to the downstream.
      *
-     * <p>This operator allows preventing the downstream to trigger unbounded mode via {@code request(Long.MAX_VALUE)}
+     * <p>This operator allows preventing the downstream to trigger unbounded mode via {@code request(}{@link Long#MAX_VALUE}{@code )}
      * or compensate for the per-item overhead of small and frequent requests.
      *
      * <dl>
@@ -17224,7 +17224,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>Observables don't support backpressure thus the current Flowable is consumed in an unbounded
-     *  manner (by requesting Long.MAX_VALUE).</dd>
+     *  manner (by requesting {@link Long#MAX_VALUE}).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toObservable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -18552,8 +18552,8 @@ public final <U, R> Flowable<R> zipWith(Publisher<? extends U> other,
     // Fluent test support, super handy and reduces test preparation boilerplate
     // -------------------------------------------------------------------------
     /**
-     * Creates a TestSubscriber that requests Long.MAX_VALUE and subscribes
-     * it to this Flowable.
+     * Creates a {@link TestSubscriber} that requests {@link Long#MAX_VALUE} and subscribes
+     * it to this {@code Flowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned TestSubscriber consumes this Flowable in an unbounded fashion.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
index abc89eec4a..92733c3c1e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
@@ -16,7 +16,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Convenience interface and callback used by the {@link Flowable#to} operator to turn a Flowable into another
+ * Convenience interface and callback used by the {@link Flowable#to} operator to turn a {@link Flowable} into another
  * value fluently.
  * <p>History: 2.1.7 - experimental
  * @param <T> the upstream type
@@ -26,9 +26,9 @@
 @FunctionalInterface
 public interface FlowableConverter<T, R> {
     /**
-     * Applies a function to the upstream Flowable and returns a converted value of type {@code R}.
+     * Applies a function to the upstream {@link Flowable} and returns a converted value of type {@code R}.
      *
-     * @param upstream the upstream Flowable instance
+     * @param upstream the upstream {@code Flowable} instance
      * @return the converted value
      */
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java
index 8f66b7bbee..1221721f29 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java
@@ -53,14 +53,16 @@ public interface FlowableEmitter<T> extends Emitter<T> {
     /**
      * Sets a Disposable on this emitter; any previous {@link Disposable}
      * or {@link Cancellable} will be disposed/cancelled.
-     * @param d the disposable, null is allowed
+     * <p>This method is thread-safe.
+     * @param d the disposable, {@code null} is allowed
      */
     void setDisposable(@Nullable Disposable d);
 
     /**
-     * Sets a Cancellable on this emitter; any previous {@link Disposable}
-     * or {@link Cancellable} will be disposed/cancelled.
-     * @param c the cancellable resource, null is allowed
+     * Sets a {@link Cancellable} on this emitter; any previous {@link Disposable}
+     * or {@code Cancellable} will be disposed/cancelled.
+     * <p>This method is thread-safe.
+     * @param c the {@code Cancellable} resource, {@code null} is allowed
      */
     void setCancellable(@Nullable Cancellable c);
 
@@ -81,19 +83,19 @@ public interface FlowableEmitter<T> extends Emitter<T> {
     boolean isCancelled();
 
     /**
-     * Ensures that calls to onNext, onError and onComplete are properly serialized.
-     * @return the serialized FlowableEmitter
+     * Ensures that calls to {@code onNext}, {@code onError} and {@code onComplete} are properly serialized.
+     * @return the serialized {@link FlowableEmitter}
      */
     @NonNull
     FlowableEmitter<T> serialize();
 
     /**
-     * Attempts to emit the specified {@code Throwable} error if the downstream
+     * Attempts to emit the specified {@link Throwable} error if the downstream
      * hasn't cancelled the sequence or is otherwise terminated, returning false
      * if the emission is not allowed to happen due to lifecycle restrictions.
      * <p>
-     * Unlike {@link #onError(Throwable)}, the {@code RxJavaPlugins.onError} is not called
-     * if the error could not be delivered.
+     * Unlike {@link #onError(Throwable)}, the {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable) RxjavaPlugins.onError}
+     * is not called if the error could not be delivered.
      * <p>History: 2.1.1 - experimental
      * @param t the throwable error to signal if possible
      * @return true if successful, false if the downstream is not able to accept further
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
index 2bbc8b57a3..156b9f2dc7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
@@ -25,8 +25,8 @@
 public interface FlowableOnSubscribe<T> {
 
     /**
-     * Called for each Subscriber that subscribes.
-     * @param emitter the safe emitter instance, never null
+     * Called for each {@link org.reactivestreams.Subscriber Subscriber} that subscribes.
+     * @param emitter the safe emitter instance, never {@code null}
      * @throws Throwable on error
      */
     void subscribe(@NonNull FlowableEmitter<T> emitter) throws Throwable;
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
index 6d241f7498..5b5855ea2f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
@@ -18,7 +18,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Interface to map/wrap a downstream subscriber to an upstream subscriber.
+ * Interface to map/wrap a downstream {@link Subscriber} to an upstream {@code Subscriber}.
  *
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
@@ -26,11 +26,11 @@
 @FunctionalInterface
 public interface FlowableOperator<Downstream, Upstream> {
     /**
-     * Applies a function to the child Subscriber and returns a new parent Subscriber.
-     * @param subscriber the child Subscriber instance
-     * @return the parent Subscriber instance
-     * @throws Exception on failure
+     * Applies a function to the child {@link Subscriber} and returns a new parent {@code Subscriber}.
+     * @param subscriber the child {@code Subscriber} instance
+     * @return the parent {@code Subscriber} instance
+     * @throws Throwable on failure
      */
     @NonNull
-    Subscriber<? super Upstream> apply(@NonNull Subscriber<? super Downstream> subscriber) throws Exception;
+    Subscriber<? super Upstream> apply(@NonNull Subscriber<? super Downstream> subscriber) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
index 3b0a80cf9a..23449fbedc 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
@@ -18,7 +18,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Represents a Reactive-Streams inspired Subscriber that is RxJava 2 only
+ * Represents a Reactive-Streams inspired {@link Subscriber} that is RxJava 2 only
  * and weakens rules §1.3 and §3.9 of the specification for gaining performance.
  *
  * <p>History: 2.0.7 - experimental; 2.1 - beta
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
index 877ad1916a..3b98a97dad 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
@@ -18,7 +18,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Interface to compose Flowables.
+ * Interface to compose {@link Flowable}s.
  *
  * @param <Upstream> the upstream value type
  * @param <Downstream> the downstream value type
@@ -26,10 +26,10 @@
 @FunctionalInterface
 public interface FlowableTransformer<Upstream, Downstream> {
     /**
-     * Applies a function to the upstream Flowable and returns a Publisher with
+     * Applies a function to the upstream {@link Flowable} and returns a {@link Publisher} with
      * optionally different element type.
-     * @param upstream the upstream Flowable instance
-     * @return the transformed Publisher instance
+     * @param upstream the upstream {@code Flowable} instance
+     * @return the transformed {@code Publisher} instance
      */
     @NonNull
     Publisher<Downstream> apply(@NonNull Flowable<Upstream> upstream);
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
index a8e6790e5f..eefe8c0973 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
@@ -16,7 +16,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Convenience interface and callback used by the {@link Maybe#to} operator to turn a Maybe into another
+ * Convenience interface and callback used by the {@link Maybe#to} operator to turn a {@link Maybe} into another
  * value fluently.
  * <p>History: 2.1.7 - experimental
  * @param <T> the upstream type
@@ -26,9 +26,9 @@
 @FunctionalInterface
 public interface MaybeConverter<T, R> {
     /**
-     * Applies a function to the upstream Maybe and returns a converted value of type {@code R}.
+     * Applies a function to the upstream {@link Maybe} and returns a converted value of type {@code R}.
      *
-     * @param upstream the upstream Maybe instance
+     * @param upstream the upstream {@code Maybe} instance
      * @return the converted value
      */
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java b/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java
index dfc8671073..7757e4b72a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java
@@ -57,7 +57,7 @@ public interface MaybeEmitter<T> {
 
     /**
      * Signal an exception.
-     * @param t the exception, not null
+     * @param t the exception, not {@code null}
      */
     void onError(@NonNull Throwable t);
 
@@ -67,16 +67,18 @@ public interface MaybeEmitter<T> {
     void onComplete();
 
     /**
-     * Sets a Disposable on this emitter; any previous {@link Disposable}
+     * Sets a {@link Disposable} on this emitter; any previous {@code Disposable}
      * or {@link Cancellable} will be disposed/cancelled.
-     * @param d the disposable, null is allowed
+     * <p>This method is thread-safe.
+     * @param d the disposable, {@code null} is allowed
      */
     void setDisposable(@Nullable Disposable d);
 
     /**
-     * Sets a Cancellable on this emitter; any previous {@link Disposable}
-     * or {@link Cancellable} will be disposed/cancelled.
-     * @param c the cancellable resource, null is allowed
+     * Sets a {@link Cancellable} on this emitter; any previous {@link Disposable}
+     * or {@code Cancellable} will be disposed/cancelled.
+     * <p>This method is thread-safe.
+     * @param c the {@code Cancellable} resource, {@code null} is allowed
      */
     void setCancellable(@Nullable Cancellable c);
 
@@ -91,14 +93,14 @@ public interface MaybeEmitter<T> {
     boolean isDisposed();
 
     /**
-     * Attempts to emit the specified {@code Throwable} error if the downstream
+     * Attempts to emit the specified {@link Throwable} error if the downstream
      * hasn't cancelled the sequence or is otherwise terminated, returning false
      * if the emission is not allowed to happen due to lifecycle restrictions.
      * <p>
-     * Unlike {@link #onError(Throwable)}, the {@code RxJavaPlugins.onError} is not called
-     * if the error could not be delivered.
+     * Unlike {@link #onError(Throwable)}, the {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable) RxjavaPlugins.onError}
+     * is not called if the error could not be delivered.
      * <p>History: 2.1.1 - experimental
-     * @param t the throwable error to signal if possible
+     * @param t the {@code Throwable} error to signal if possible
      * @return true if successful, false if the downstream is not able to accept further
      * events
      * @since 2.2
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java b/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java
index 7b7eb1a0d4..52bee5923a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java
@@ -56,32 +56,32 @@
 public interface MaybeObserver<T> {
 
     /**
-     * Provides the MaybeObserver with the means of cancelling (disposing) the
-     * connection (channel) with the Maybe in both
+     * Provides the {@link MaybeObserver} with the means of cancelling (disposing) the
+     * connection (channel) with the {@link Maybe} in both
      * synchronous (from within {@code onSubscribe(Disposable)} itself) and asynchronous manner.
-     * @param d the Disposable instance whose {@link Disposable#dispose()} can
+     * @param d the {@link Disposable} instance whose {@link Disposable#dispose()} can
      * be called anytime to cancel the connection
      */
     void onSubscribe(@NonNull Disposable d);
 
     /**
-     * Notifies the MaybeObserver with one item and that the {@link Maybe} has finished sending
+     * Notifies the {@link MaybeObserver} with one item and that the {@link Maybe} has finished sending
      * push-based notifications.
      * <p>
      * The {@link Maybe} will not call this method if it calls {@link #onError}.
      *
      * @param t
-     *          the item emitted by the Maybe
+     *          the item emitted by the {@code Maybe}
      */
     void onSuccess(@NonNull T t);
 
     /**
-     * Notifies the MaybeObserver that the {@link Maybe} has experienced an error condition.
+     * Notifies the {@link MaybeObserver} that the {@link Maybe} has experienced an error condition.
      * <p>
      * If the {@link Maybe} calls this method, it will not thereafter call {@link #onSuccess}.
      *
      * @param e
-     *          the exception encountered by the Maybe
+     *          the exception encountered by the {@code Maybe}
      */
     void onError(@NonNull Throwable e);
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
index 2dde118757..350d17af5d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
@@ -25,8 +25,8 @@
 public interface MaybeOnSubscribe<T> {
 
     /**
-     * Called for each MaybeObserver that subscribes.
-     * @param emitter the safe emitter instance, never null
+     * Called for each {@link MaybeObserver} that subscribes.
+     * @param emitter the safe emitter instance, never {@code null}
      * @throws Throwable on error
      */
     void subscribe(@NonNull MaybeEmitter<T> emitter) throws Throwable;
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
index 48039a9bd0..30da3286b6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
@@ -15,7 +15,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Interface to map/wrap a downstream observer to an upstream observer.
+ * Interface to map/wrap a downstream {@link MaybeObserver} to an upstream {@code MaybeObserver}.
  *
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
@@ -23,11 +23,11 @@
 @FunctionalInterface
 public interface MaybeOperator<Downstream, Upstream> {
     /**
-     * Applies a function to the child MaybeObserver and returns a new parent MaybeObserver.
-     * @param observer the child MaybeObserver instance
-     * @return the parent MaybeObserver instance
-     * @throws Exception on failure
+     * Applies a function to the child {@link MaybeObserver} and returns a new parent {@code MaybeObserver}.
+     * @param observer the child {@code MaybeObserver} instance
+     * @return the parent {@code MaybeObserver} instance
+     * @throws Throwable on failure
      */
     @NonNull
-    MaybeObserver<? super Upstream> apply(@NonNull MaybeObserver<? super Downstream> observer) throws Exception;
+    MaybeObserver<? super Upstream> apply(@NonNull MaybeObserver<? super Downstream> observer) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
index 17e2b7f694..f066e5d32e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
@@ -28,9 +28,9 @@
 public interface MaybeSource<T> {
 
     /**
-     * Subscribes the given MaybeObserver to this MaybeSource instance.
-     * @param observer the MaybeObserver, not null
-     * @throws NullPointerException if {@code observer} is null
+     * Subscribes the given {@link MaybeObserver} to this {@link MaybeSource} instance.
+     * @param observer the {@code MaybeObserver}, not {@code null}
+     * @throws NullPointerException if {@code observer} is {@code null}
      */
     void subscribe(@NonNull MaybeObserver<? super T> observer);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
index b5a94bce79..aebcb8353f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
@@ -16,7 +16,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Interface to compose Maybes.
+ * Interface to compose {@link Maybe}s.
  *
  * @param <Upstream> the upstream value type
  * @param <Downstream> the downstream value type
@@ -24,10 +24,10 @@
 @FunctionalInterface
 public interface MaybeTransformer<Upstream, Downstream> {
     /**
-     * Applies a function to the upstream Maybe and returns a MaybeSource with
+     * Applies a function to the upstream {@link Maybe} and returns a {@link MaybeSource} with
      * optionally different element type.
-     * @param upstream the upstream Maybe instance
-     * @return the transformed MaybeSource instance
+     * @param upstream the upstream {@code Maybe} instance
+     * @return the transformed {@code MaybeSource} instance
      */
     @NonNull
     MaybeSource<Downstream> apply(@NonNull Maybe<Upstream> upstream);
diff --git a/src/main/java/io/reactivex/rxjava3/core/Notification.java b/src/main/java/io/reactivex/rxjava3/core/Notification.java
index 8f8ae5c4d8..bb1c35c3f1 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Notification.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Notification.java
@@ -18,8 +18,8 @@
 import java.util.Objects;
 
 /**
- * Represents the reactive signal types: onNext, onError and onComplete and
- * holds their parameter values (a value, a Throwable, nothing).
+ * Represents the reactive signal types: {@code onNext}, {@code onError} and {@code onComplete} and
+ * holds their parameter values (a value, a {@link Throwable}, nothing).
  * @param <T> the value type
  */
 public final class Notification<T> {
@@ -32,17 +32,17 @@ private Notification(Object value) {
     }
 
     /**
-     * Returns true if this notification is an onComplete signal.
-     * @return true if this notification is an onComplete signal
+     * Returns true if this notification is an {@code onComplete} signal.
+     * @return true if this notification is an {@code onComplete} signal
      */
     public boolean isOnComplete() {
         return value == null;
     }
 
     /**
-     * Returns true if this notification is an onError signal and
-     * {@link #getError()} returns the contained Throwable.
-     * @return true if this notification is an onError signal
+     * Returns true if this notification is an {@code onError} signal and
+     * {@link #getError()} returns the contained {@link Throwable}.
+     * @return true if this notification is an {@code onError} signal
      * @see #getError()
      */
     public boolean isOnError() {
@@ -50,9 +50,9 @@ public boolean isOnError() {
     }
 
     /**
-     * Returns true if this notification is an onNext signal and
+     * Returns true if this notification is an {@code onNext} signal and
      * {@link #getValue()} returns the contained value.
-     * @return true if this notification is an onNext signal
+     * @return true if this notification is an {@code onNext} signal
      * @see #getValue()
      */
     public boolean isOnNext() {
@@ -61,7 +61,7 @@ public boolean isOnNext() {
     }
 
     /**
-     * Returns the contained value if this notification is an onNext
+     * Returns the contained value if this notification is an {@code onNext}
      * signal, null otherwise.
      * @return the value contained or null
      * @see #isOnNext()
@@ -77,9 +77,9 @@ public T getValue() {
     }
 
     /**
-     * Returns the container Throwable error if this notification is an onError
+     * Returns the container {@link Throwable} error if this notification is an {@code onError}
      * signal, null otherwise.
-     * @return the Throwable error contained or null
+     * @return the {@code Throwable} error contained or {@code null}
      * @see #isOnError()
      */
     @Nullable
@@ -121,14 +121,14 @@ public String toString() {
     /**
      * Constructs an onNext notification containing the given value.
      * @param <T> the value type
-     * @param value the value to carry around in the notification, not null
+     * @param value the value to carry around in the notification, not {@code null}
      * @return the new Notification instance
-     * @throws NullPointerException if value is null
+     * @throws NullPointerException if value is {@code null}
      */
     @NonNull
-    public static <T> Notification<T> createOnNext(@NonNull T value) {
+    public static <@NonNull T> Notification<T> createOnNext(T value) {
         Objects.requireNonNull(value, "value is null");
-        return new Notification<T>(value);
+        return new Notification<>(value);
     }
 
     /**
@@ -136,19 +136,19 @@ public static <T> Notification<T> createOnNext(@NonNull T value) {
      * @param <T> the value type
      * @param error the error Throwable to carry around in the notification, not null
      * @return the new Notification instance
-     * @throws NullPointerException if error is null
+     * @throws NullPointerException if error is {@code null}
      */
     @NonNull
     public static <T> Notification<T> createOnError(@NonNull Throwable error) {
         Objects.requireNonNull(error, "error is null");
-        return new Notification<T>(NotificationLite.error(error));
+        return new Notification<>(NotificationLite.error(error));
     }
 
     /**
      * Returns the empty and stateless shared instance of a notification representing
-     * an onComplete signal.
+     * an {@code onComplete} signal.
      * @param <T> the target value type
-     * @return the shared Notification instance representing an onComplete signal
+     * @return the shared Notification instance representing an {@code onComplete} signal
      */
     @SuppressWarnings("unchecked")
     @NonNull
@@ -157,5 +157,5 @@ public static <T> Notification<T> createOnComplete() {
     }
 
     /** The singleton instance for createOnComplete. */
-    static final Notification<Object> COMPLETE = new Notification<Object>(null);
+    static final Notification<Object> COMPLETE = new Notification<>(null);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 63406824ba..0e2ff9dec1 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -1261,7 +1261,7 @@ public static <T> Observable<T> concatArrayEager(ObservableSource<? extends T>..
      * </dl>
      * @param <T> the value type
      * @param sources an array of ObservableSources that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrent subscriptions at a time, Integer.MAX_VALUE
+     * @param maxConcurrency the maximum number of concurrent subscriptions at a time, {@link Integer#MAX_VALUE}
      *                       is interpreted as indication to subscribe to all sources at once
      * @param prefetch the number of elements to prefetch from each ObservableSource source
      * @return the new ObservableSource instance with the specified concatenation behavior
@@ -1313,7 +1313,7 @@ public static <T> Observable<T> concatArrayEagerDelayError(ObservableSource<? ex
      * </dl>
      * @param <T> the value type
      * @param sources an array of {@code ObservableSource}s that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrent subscriptions at a time, Integer.MAX_VALUE
+     * @param maxConcurrency the maximum number of concurrent subscriptions at a time, {@link Integer#MAX_VALUE}
      *                       is interpreted as indication to subscribe to all sources at once
      * @param prefetch the number of elements to prefetch from each {@code ObservableSource} source
      * @return the new Observable instance with the specified concatenation behavior
@@ -1432,7 +1432,7 @@ public static <T> Observable<T> concatEager(ObservableSource<? extends Observabl
      * </dl>
      * @param <T> the value type
      * @param sources a sequence of ObservableSources that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrently running inner ObservableSources; Integer.MAX_VALUE
+     * @param maxConcurrency the maximum number of concurrently running inner ObservableSources; {@link Integer#MAX_VALUE}
      *                       is interpreted as all inner ObservableSources can be active at the same time
      * @param prefetch the number of elements to prefetch from each inner ObservableSource source
      * @return the new ObservableSource instance with the specified concatenation behavior
@@ -1482,7 +1482,7 @@ public static <T> Observable<T> concatEager(Iterable<? extends ObservableSource<
      * </dl>
      * @param <T> the value type
      * @param sources a sequence of ObservableSources that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrently running inner ObservableSources; Integer.MAX_VALUE
+     * @param maxConcurrency the maximum number of concurrently running inner ObservableSources; {@link Integer#MAX_VALUE}
      *                       is interpreted as all inner ObservableSources can be active at the same time
      * @param prefetch the number of elements to prefetch from each inner ObservableSource source
      * @return the new ObservableSource instance with the specified concatenation behavior
@@ -3562,7 +3562,7 @@ public static <T> Observable<T> never() {
      * @return an Observable that emits a range of sequential Integers
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
-     *             {@code Integer.MAX_VALUE}
+     *             {@link Integer#MAX_VALUE}
      * @see <a href="http://reactivex.io/documentation/operators/range.html">ReactiveX operators documentation: Range</a>
      */
     @CheckReturnValue
@@ -3599,7 +3599,7 @@ public static Observable<Integer> range(final int start, final int count) {
      * @return an Observable that emits a range of sequential Longs
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
-     *             {@code Long.MAX_VALUE}
+     *             {@link Long#MAX_VALUE}
      * @see <a href="http://reactivex.io/documentation/operators/range.html">ReactiveX operators documentation: Range</a>
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
index 40b432cfea..acdde63b29 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
@@ -16,7 +16,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Convenience interface and callback used by the {@link Observable#to} operator to turn an Observable into another
+ * Convenience interface and callback used by the {@link Observable#to} operator to turn an {@link Observable} into another
  * value fluently.
  * <p>History: 2.1.7 - experimental
  * @param <T> the upstream type
@@ -26,9 +26,9 @@
 @FunctionalInterface
 public interface ObservableConverter<T, R> {
     /**
-     * Applies a function to the upstream Observable and returns a converted value of type {@code R}.
+     * Applies a function to the upstream {@link Observable} and returns a converted value of type {@code R}.
      *
-     * @param upstream the upstream Observable instance
+     * @param upstream the upstream {@code Observable} instance
      * @return the converted value
      */
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java
index f4f7ef6bb0..776d6963d9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java
@@ -50,16 +50,18 @@
 public interface ObservableEmitter<T> extends Emitter<T> {
 
     /**
-     * Sets a Disposable on this emitter; any previous {@link Disposable}
+     * Sets a {@link Disposable} on this emitter; any previous {@code Disposable}
      * or {@link Cancellable} will be disposed/cancelled.
-     * @param d the disposable, null is allowed
+     * <p>This method is thread-safe.
+     * @param d the {@code Disposable}, {@code null} is allowed
      */
     void setDisposable(@Nullable Disposable d);
 
     /**
-     * Sets a Cancellable on this emitter; any previous {@link Disposable}
-     * or {@link Cancellable} will be disposed/cancelled.
-     * @param c the cancellable resource, null is allowed
+     * Sets a {@link Cancellable} on this emitter; any previous {@link Disposable}
+     * or {@code Cancellable} will be disposed/cancelled.
+     * <p>This method is thread-safe.
+     * @param c the {@code Cancellable} resource, {@code null} is allowed
      */
     void setCancellable(@Nullable Cancellable c);
 
@@ -73,21 +75,21 @@ public interface ObservableEmitter<T> extends Emitter<T> {
     boolean isDisposed();
 
     /**
-     * Ensures that calls to onNext, onError and onComplete are properly serialized.
-     * @return the serialized ObservableEmitter
+     * Ensures that calls to {@code onNext}, {@code onError} and {@code onComplete} are properly serialized.
+     * @return the serialized {@link ObservableEmitter}
      */
     @NonNull
     ObservableEmitter<T> serialize();
 
     /**
-     * Attempts to emit the specified {@code Throwable} error if the downstream
+     * Attempts to emit the specified {@link Throwable} error if the downstream
      * hasn't cancelled the sequence or is otherwise terminated, returning false
      * if the emission is not allowed to happen due to lifecycle restrictions.
      * <p>
-     * Unlike {@link #onError(Throwable)}, the {@code RxJavaPlugins.onError} is not called
-     * if the error could not be delivered.
+     * Unlike {@link #onError(Throwable)}, the {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable) RxjavaPlugins.onError}
+     * is not called if the error could not be delivered.
      * <p>History: 2.1.1 - experimental
-     * @param t the throwable error to signal if possible
+     * @param t the {@code Throwable} error to signal if possible
      * @return true if successful, false if the downstream is not able to accept further
      * events
      * @since 2.2
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
index 43d6252849..bcde496462 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
@@ -25,8 +25,8 @@
 public interface ObservableOnSubscribe<T> {
 
     /**
-     * Called for each Observer that subscribes.
-     * @param emitter the safe emitter instance, never null
+     * Called for each {@link Observer} that subscribes.
+     * @param emitter the safe emitter instance, never {@code null}
      * @throws Throwable on error
      */
     void subscribe(@NonNull ObservableEmitter<T> emitter) throws Throwable;
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
index 76ec06e295..ff9dbc5852 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
@@ -16,7 +16,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Interface to map/wrap a downstream observer to an upstream observer.
+ * Interface to map/wrap a downstream {@link Observer} to an upstream {@code Observer}.
  *
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
@@ -24,11 +24,11 @@
 @FunctionalInterface
 public interface ObservableOperator<Downstream, Upstream> {
     /**
-     * Applies a function to the child Observer and returns a new parent Observer.
-     * @param observer the child Observer instance
-     * @return the parent Observer instance
-     * @throws Exception on failure
+     * Applies a function to the child {@link Observer} and returns a new parent {@code Observer}.
+     * @param observer the child {@code Observer} instance
+     * @return the parent {@code Observer} instance
+     * @throws Throwable on failure
      */
     @NonNull
-    Observer<? super Upstream> apply(@NonNull Observer<? super Downstream> observer) throws Exception;
+    Observer<? super Upstream> apply(@NonNull Observer<? super Downstream> observer) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
index ad5d5c79c3..c2309e5b8d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
@@ -25,9 +25,9 @@
 public interface ObservableSource<T> {
 
     /**
-     * Subscribes the given Observer to this ObservableSource instance.
-     * @param observer the Observer, not null
-     * @throws NullPointerException if {@code observer} is null
+     * Subscribes the given {@link Observer} to this {@link ObservableSource} instance.
+     * @param observer the {@code Observer}, not {@code null}
+     * @throws NullPointerException if {@code observer} is {@code null}
      */
     void subscribe(@NonNull Observer<? super T> observer);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
index 259deefa85..18ce5e02c9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
@@ -16,7 +16,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Interface to compose Observables.
+ * Interface to compose {@link Observable}s.
  *
  * @param <Upstream> the upstream value type
  * @param <Downstream> the downstream value type
@@ -24,10 +24,10 @@
 @FunctionalInterface
 public interface ObservableTransformer<Upstream, Downstream> {
     /**
-     * Applies a function to the upstream Observable and returns an ObservableSource with
+     * Applies a function to the upstream {@link Observable} and returns an {@link ObservableSource} with
      * optionally different element type.
-     * @param upstream the upstream Observable instance
-     * @return the transformed ObservableSource instance
+     * @param upstream the upstream {@code Observable} instance
+     * @return the transformed {@code ObservableSource} instance
      */
     @NonNull
     ObservableSource<Downstream> apply(@NonNull Observable<Upstream> upstream);
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observer.java b/src/main/java/io/reactivex/rxjava3/core/Observer.java
index ef95e18034..de02f8ac88 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observer.java
@@ -76,17 +76,17 @@
 public interface Observer<T> {
 
     /**
-     * Provides the Observer with the means of cancelling (disposing) the
-     * connection (channel) with the Observable in both
+     * Provides the {@link Observer} with the means of cancelling (disposing) the
+     * connection (channel) with the {@link Observable} in both
      * synchronous (from within {@link #onNext(Object)}) and asynchronous manner.
-     * @param d the Disposable instance whose {@link Disposable#dispose()} can
+     * @param d the {@link Disposable} instance whose {@link Disposable#dispose()} can
      * be called anytime to cancel the connection
      * @since 2.0
      */
     void onSubscribe(@NonNull Disposable d);
 
     /**
-     * Provides the Observer with a new item to observe.
+     * Provides the {@link Observer} with a new item to observe.
      * <p>
      * The {@link Observable} may call this method 0 or more times.
      * <p>
@@ -99,9 +99,9 @@ public interface Observer<T> {
     void onNext(@NonNull T t);
 
     /**
-     * Notifies the Observer that the {@link Observable} has experienced an error condition.
+     * Notifies the {@link Observer} that the {@link Observable} has experienced an error condition.
      * <p>
-     * If the {@link Observable} calls this method, it will not thereafter call {@link #onNext} or
+     * If the {@code Observable} calls this method, it will not thereafter call {@link #onNext} or
      * {@link #onComplete}.
      *
      * @param e
@@ -110,9 +110,9 @@ public interface Observer<T> {
     void onError(@NonNull Throwable e);
 
     /**
-     * Notifies the Observer that the {@link Observable} has finished sending push-based notifications.
+     * Notifies the {@link Observer} that the {@link Observable} has finished sending push-based notifications.
      * <p>
-     * The {@link Observable} will not call this method if it calls {@link #onError}.
+     * The {@code Observable} will not call this method if it calls {@link #onError}.
      */
     void onComplete();
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index ae2b04fc7d..bb742d4a03 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -2346,7 +2346,7 @@ public final <U> Single<T> delaySubscription(ObservableSource<U> other) {
      * <img width="640" height="214" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delaySubscription.p.png" alt="">
      * <p>If the delaying source signals an error, that error is re-emitted and no subscription
      * to the current Single happens.
-     * <p>The other source is consumed in an unbounded manner (requesting Long.MAX_VALUE from it).
+     * <p>The other source is consumed in an unbounded manner (requesting {@link Long#MAX_VALUE} from it).
      * <dl>
      * <dt><b>Backpressure:</b></dt>
      * <dd>The {@code other} publisher is consumed in an unbounded fashion but will be
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
index 4adc22b8c5..eb100b6c87 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
@@ -16,7 +16,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Convenience interface and callback used by the {@link Single#to} operator to turn a Single into another
+ * Convenience interface and callback used by the {@link Single#to} operator to turn a {@link Single} into another
  * value fluently.
  * <p>History: 2.1.7 - experimental
  * @param <T> the upstream type
@@ -26,9 +26,9 @@
 @FunctionalInterface
 public interface SingleConverter<T, R> {
     /**
-     * Applies a function to the upstream Single and returns a converted value of type {@code R}.
+     * Applies a function to the upstream {@link Single} and returns a converted value of type {@code R}.
      *
-     * @param upstream the upstream Single instance
+     * @param upstream the upstream {@code Single} instance
      * @return the converted value
      */
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java b/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java
index a2302c5f4c..bb3768243d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java
@@ -57,21 +57,23 @@ public interface SingleEmitter<T> {
 
     /**
      * Signal an exception.
-     * @param t the exception, not null
+     * @param t the exception, not {@code null}
      */
     void onError(@NonNull Throwable t);
 
     /**
-     * Sets a Disposable on this emitter; any previous Disposable
-     * or Cancellable will be disposed/cancelled.
-     * @param d the disposable, null is allowed
+     * Sets a {@link Disposable} on this emitter; any previous {@code Disposable}
+     * or {@link Cancellable} will be disposed/cancelled.
+     * <p>This method is thread-safe.
+     * @param d the {@code Disposable}, {@code null} is allowed
      */
     void setDisposable(@Nullable Disposable d);
 
     /**
      * Sets a Cancellable on this emitter; any previous {@link Disposable}
      * or {@link Cancellable} will be disposed/cancelled.
-     * @param c the cancellable resource, null is allowed
+     * <p>This method is thread-safe.
+     * @param c the {@code Cancellable} resource, {@code null} is allowed
      */
     void setCancellable(@Nullable Cancellable c);
 
@@ -85,12 +87,12 @@ public interface SingleEmitter<T> {
     boolean isDisposed();
 
     /**
-     * Attempts to emit the specified {@code Throwable} error if the downstream
+     * Attempts to emit the specified {@link Throwable} error if the downstream
      * hasn't cancelled the sequence or is otherwise terminated, returning false
      * if the emission is not allowed to happen due to lifecycle restrictions.
      * <p>
-     * Unlike {@link #onError(Throwable)}, the {@code RxJavaPlugins.onError} is not called
-     * if the error could not be delivered.
+     * Unlike {@link #onError(Throwable)}, the {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable) RxjavaPlugins.onError}
+     * is not called if the error could not be delivered.
      * <p>History: 2.1.1 - experimental
      * @param t the throwable error to signal if possible
      * @return true if successful, false if the downstream is not able to accept further
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java b/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java
index 778d6feabc..d2d788d38f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java
@@ -53,7 +53,7 @@
 public interface SingleObserver<T> {
 
     /**
-     * Provides the SingleObserver with the means of cancelling (disposing) the
+     * Provides the {@link SingleObserver} with the means of cancelling (disposing) the
      * connection (channel) with the Single in both
      * synchronous (from within {@code onSubscribe(Disposable)} itself) and asynchronous manner.
      * @param d the Disposable instance whose {@link Disposable#dispose()} can
@@ -63,23 +63,23 @@ public interface SingleObserver<T> {
     void onSubscribe(@NonNull Disposable d);
 
     /**
-     * Notifies the SingleObserver with a single item and that the {@link Single} has finished sending
+     * Notifies the {@link SingleObserver} with a single item and that the {@link Single} has finished sending
      * push-based notifications.
      * <p>
-     * The {@link Single} will not call this method if it calls {@link #onError}.
+     * The {@code Single} will not call this method if it calls {@link #onError}.
      *
      * @param t
-     *          the item emitted by the Single
+     *          the item emitted by the {@code Single}
      */
     void onSuccess(@NonNull T t);
 
     /**
-     * Notifies the SingleObserver that the {@link Single} has experienced an error condition.
+     * Notifies the {@link SingleObserver} that the {@link Single} has experienced an error condition.
      * <p>
-     * If the {@link Single} calls this method, it will not thereafter call {@link #onSuccess}.
+     * If the {@code Single} calls this method, it will not thereafter call {@link #onSuccess}.
      *
      * @param e
-     *          the exception encountered by the Single
+     *          the exception encountered by the {@code Single}
      */
     void onError(@NonNull Throwable e);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
index 46cc6a6f56..7a6a5adf68 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
@@ -25,8 +25,8 @@
 public interface SingleOnSubscribe<T> {
 
     /**
-     * Called for each SingleObserver that subscribes.
-     * @param emitter the safe emitter instance, never null
+     * Called for each {@link SingleObserver} that subscribes.
+     * @param emitter the safe emitter instance, never {@code null}
      * @throws Throwable on error
      */
     void subscribe(@NonNull SingleEmitter<T> emitter) throws Throwable;
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
index 2fc2d80ab6..de2f38f23d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
@@ -16,7 +16,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Interface to map/wrap a downstream observer to an upstream observer.
+ * Interface to map/wrap a downstream {@link SingleObserver} to an upstream {@code SingleObserver}.
  *
  * @param <Downstream> the value type of the downstream
  * @param <Upstream> the value type of the upstream
@@ -24,11 +24,11 @@
 @FunctionalInterface
 public interface SingleOperator<Downstream, Upstream> {
     /**
-     * Applies a function to the child SingleObserver and returns a new parent SingleObserver.
-     * @param observer the child SingleObserver instance
-     * @return the parent SingleObserver instance
-     * @throws Exception on failure
+     * Applies a function to the child {@link SingleObserver} and returns a new parent {@code SingleObserver}.
+     * @param observer the child {@code SingleObserver} instance
+     * @return the parent {@code SingleObserver} instance
+     * @throws Throwable on failure
      */
     @NonNull
-    SingleObserver<? super Upstream> apply(@NonNull SingleObserver<? super Downstream> observer) throws Exception;
+    SingleObserver<? super Upstream> apply(@NonNull SingleObserver<? super Downstream> observer) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleSource.java b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
index 496462d0e1..b4c923905d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
@@ -28,9 +28,9 @@
 public interface SingleSource<T> {
 
     /**
-     * Subscribes the given SingleObserver to this SingleSource instance.
-     * @param observer the SingleObserver, not null
-     * @throws NullPointerException if {@code observer} is null
+     * Subscribes the given {@link SingleObserver} to this {@link SingleSource} instance.
+     * @param observer the {@code SingleObserver}, not {@code null}
+     * @throws NullPointerException if {@code observer} is {@code null}
      */
     void subscribe(@NonNull SingleObserver<? super T> observer);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
index 08f9408cdb..1f0d478a0e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
@@ -16,7 +16,7 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Interface to compose Singles.
+ * Interface to compose {@link Single}s.
  *
  * @param <Upstream> the upstream value type
  * @param <Downstream> the downstream value type
@@ -24,10 +24,10 @@
 @FunctionalInterface
 public interface SingleTransformer<Upstream, Downstream> {
     /**
-     * Applies a function to the upstream Single and returns a SingleSource with
+     * Applies a function to the upstream {@link Single} and returns a {@link SingleSource} with
      * optionally different element type.
-     * @param upstream the upstream Single instance
-     * @return the transformed SingleSource instance
+     * @param upstream the upstream {@code Single} instance
+     * @return the transformed {@code SingleSource} instance
      */
     @NonNull
     SingleSource<Downstream> apply(@NonNull Single<Upstream> upstream);
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
index c9c0a8988c..3a75ac5f3e 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
@@ -37,7 +37,7 @@ public CompositeDisposable() {
     /**
      * Creates a CompositeDisposables with the given array of initial elements.
      * @param disposables the array of Disposables to start with
-     * @throws NullPointerException if {@code disposables} or any of its array items is null
+     * @throws NullPointerException if {@code disposables} or any of its array items is {@code null}
      */
     public CompositeDisposable(@NonNull Disposable... disposables) {
         Objects.requireNonNull(disposables, "disposables is null");
@@ -51,7 +51,7 @@ public CompositeDisposable(@NonNull Disposable... disposables) {
     /**
      * Creates a CompositeDisposables with the given Iterable sequence of initial elements.
      * @param disposables the Iterable sequence of Disposables to start with
-     * @throws NullPointerException if {@code disposables} or any of its items is null
+     * @throws NullPointerException if {@code disposables} or any of its items is {@code null}
      */
     public CompositeDisposable(@NonNull Iterable<? extends Disposable> disposables) {
         Objects.requireNonNull(disposables, "disposables is null");
@@ -90,7 +90,7 @@ public boolean isDisposed() {
      * container has been disposed.
      * @param disposable the disposable to add, not null
      * @return true if successful, false if this container has been disposed
-     * @throws NullPointerException if {@code disposable} is null
+     * @throws NullPointerException if {@code disposable} is {@code null}
      */
     @Override
     public boolean add(@NonNull Disposable disposable) {
@@ -117,7 +117,7 @@ public boolean add(@NonNull Disposable disposable) {
      * disposes them all if the container has been disposed.
      * @param disposables the array of Disposables
      * @return true if the operation was successful, false if the container has been disposed
-     * @throws NullPointerException if {@code disposables} or any of its array items is null
+     * @throws NullPointerException if {@code disposables} or any of its array items is {@code null}
      */
     public boolean addAll(@NonNull Disposable... disposables) {
         Objects.requireNonNull(disposables, "disposables is null");
@@ -163,7 +163,7 @@ public boolean remove(@NonNull Disposable disposable) {
      * container.
      * @param disposable the disposable to remove, not null
      * @return true if the operation was successful
-     * @throws NullPointerException if {@code disposable} is null
+     * @throws NullPointerException if {@code disposable} is {@code null}
      */
     @Override
     public boolean delete(@NonNull Disposable disposable) {
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java b/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java
index 6c84920e74..08f926e9b3 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java
@@ -14,7 +14,7 @@
 package io.reactivex.rxjava3.exceptions;
 
 /**
- * Wrapper for Throwable errors that are sent to `RxJavaPlugins.onError`.
+ * Wrapper for Throwable errors that are sent to {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable) RxJavaPlugins.onError}.
  * <p>History: 2.0.6 - experimental; 2.1 - beta
  * @since 2.2
  */
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java
index 9237c11a18..4ccfe67845 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java
@@ -14,6 +14,7 @@
 
 import java.util.concurrent.atomic.AtomicLong;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
@@ -26,10 +27,10 @@ private BackpressureHelper() {
     }
 
     /**
-     * Adds two long values and caps the sum at Long.MAX_VALUE.
+     * Adds two long values and caps the sum at {@link Long#MAX_VALUE}.
      * @param a the first value
      * @param b the second value
-     * @return the sum capped at Long.MAX_VALUE
+     * @return the sum capped at {@link Long#MAX_VALUE}
      */
     public static long addCap(long a, long b) {
         long u = a + b;
@@ -40,10 +41,10 @@ public static long addCap(long a, long b) {
     }
 
     /**
-     * Multiplies two long values and caps the product at Long.MAX_VALUE.
+     * Multiplies two long values and caps the product at {@link Long#MAX_VALUE}.
      * @param a the first value
      * @param b the second value
-     * @return the product capped at Long.MAX_VALUE
+     * @return the product capped at {@link Long#MAX_VALUE}
      */
     public static long multiplyCap(long a, long b) {
         long u = a * b;
@@ -56,13 +57,13 @@ public static long multiplyCap(long a, long b) {
     }
 
     /**
-     * Atomically adds the positive value n to the requested value in the AtomicLong and
-     * caps the result at Long.MAX_VALUE and returns the previous value.
-     * @param requested the AtomicLong holding the current requested value
+     * Atomically adds the positive value n to the requested value in the {@link AtomicLong} and
+     * caps the result at {@link Long#MAX_VALUE} and returns the previous value.
+     * @param requested the {@code AtomicLong} holding the current requested value
      * @param n the value to add, must be positive (not verified)
      * @return the original value before the add
      */
-    public static long add(AtomicLong requested, long n) {
+    public static long add(@NonNull AtomicLong requested, long n) {
         for (;;) {
             long r = requested.get();
             if (r == Long.MAX_VALUE) {
@@ -76,14 +77,14 @@ public static long add(AtomicLong requested, long n) {
     }
 
     /**
-     * Atomically adds the positive value n to the requested value in the AtomicLong and
-     * caps the result at Long.MAX_VALUE and returns the previous value and
-     * considers Long.MIN_VALUE as a cancel indication (no addition then).
-     * @param requested the AtomicLong holding the current requested value
+     * Atomically adds the positive value n to the requested value in the {@link AtomicLong} and
+     * caps the result at {@link Long#MAX_VALUE} and returns the previous value and
+     * considers {@link Long#MIN_VALUE} as a cancel indication (no addition then).
+     * @param requested the {@code AtomicLong} holding the current requested value
      * @param n the value to add, must be positive (not verified)
      * @return the original value before the add
      */
-    public static long addCancel(AtomicLong requested, long n) {
+    public static long addCancel(@NonNull AtomicLong requested, long n) {
         for (;;) {
             long r = requested.get();
             if (r == Long.MIN_VALUE) {
@@ -100,12 +101,12 @@ public static long addCancel(AtomicLong requested, long n) {
     }
 
     /**
-     * Atomically subtract the given number (positive, not validated) from the target field unless it contains Long.MAX_VALUE.
+     * Atomically subtract the given number (positive, not validated) from the target field unless it contains {@link Long#MAX_VALUE}.
      * @param requested the target field holding the current requested amount
      * @param n the produced element count, positive (not validated)
      * @return the new amount
      */
-    public static long produced(AtomicLong requested, long n) {
+    public static long produced(@NonNull AtomicLong requested, long n) {
         for (;;) {
             long current = requested.get();
             if (current == Long.MAX_VALUE) {
@@ -124,12 +125,12 @@ public static long produced(AtomicLong requested, long n) {
 
     /**
      * Atomically subtract the given number (positive, not validated) from the target field if
-     * it doesn't contain Long.MIN_VALUE (indicating some cancelled state) or Long.MAX_VALUE (unbounded mode).
+     * it doesn't contain {@link Long#MIN_VALUE} (indicating some cancelled state) or {@link Long#MAX_VALUE} (unbounded mode).
      * @param requested the target field holding the current requested amount
      * @param n the produced element count, positive (not validated)
      * @return the new amount
      */
-    public static long producedCancel(AtomicLong requested, long n) {
+    public static long producedCancel(@NonNull AtomicLong requested, long n) {
         for (;;) {
             long current = requested.get();
             if (current == Long.MIN_VALUE) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
index 41906b9cf7..9cdfab07ce 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
@@ -218,7 +218,7 @@ public static <T> SimpleQueue<T> createQueue(int capacityHint) {
     }
 
     /**
-     * Requests Long.MAX_VALUE if prefetch is negative or the exact
+     * Requests {@link Long#MAX_VALUE} if prefetch is negative or the exact
      * amount if prefetch is positive.
      * @param s the Subscription to request from
      * @param prefetch the prefetch value
@@ -383,7 +383,7 @@ static <T> boolean postCompleteDrain(long n,
      * in completed mode, requests no-longer reach the upstream but help in draining the queue.
      * <p>
      * The algorithm utilizes the most significant bit (bit 63) of a long value (AtomicLong) since
-     * request amount only goes up to Long.MAX_VALUE (bits 0-62) and negative values aren't
+     * request amount only goes up to {@link Long#MAX_VALUE} (bits 0-62) and negative values aren't
      * allowed.
      *
      * @param <T> the value type emitted
diff --git a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
index f8a0356a75..458325c280 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
@@ -16,15 +16,17 @@
 import java.util.*;
 import java.util.concurrent.*;
 
+import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.exceptions.CompositeException;
 import io.reactivex.rxjava3.functions.Predicate;
-import io.reactivex.rxjava3.internal.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.util.*;
 
 /**
- * Base class with shared infrastructure to support TestSubscriber and TestObserver.
+ * Base class with shared infrastructure to support
+ * {@link io.reactivex.rxjava3.subscribers.TestSubscriber TestSubscriber} and {@link TestObserver}.
  * @param <T> the value type consumed
- * @param <U> the subclass of this BaseTestConsumer
+ * @param <U> the subclass of this {@code BaseTestConsumer}
  */
 public abstract class BaseTestConsumer<T, U extends BaseTestConsumer<T, U>> {
     /** The latch that indicates an onError or onComplete has been called. */
@@ -47,26 +49,26 @@ public abstract class BaseTestConsumer<T, U extends BaseTestConsumer<T, U>> {
     protected CharSequence tag;
 
     /**
-     * Indicates that one of the awaitX method has timed out.
+     * Indicates that one of the {@code awaitX} method has timed out.
      * @since 2.0.7
      */
     protected boolean timeout;
 
     public BaseTestConsumer() {
-        this.values = new VolatileSizeArrayList<T>();
-        this.errors = new VolatileSizeArrayList<Throwable>();
+        this.values = new VolatileSizeArrayList<>();
+        this.errors = new VolatileSizeArrayList<>();
         this.done = new CountDownLatch(1);
     }
 
     /**
-     * Returns a shared list of received onNext values.
+     * Returns a shared list of received {@code onNext} values or the single {@code onSuccess} value.
      * <p>
      * Note that accessing the items via certain methods of the {@link List}
      * interface while the upstream is still actively emitting
      * more items may result in a {@code ConcurrentModificationException}.
      * <p>
      * The {@link List#size()} method will return the number of items
-     * already received by this TestObserver/TestSubscriber in a thread-safe
+     * already received by this {@code TestObserver}/{@code TestSubscriber} in a thread-safe
      * manner that can be read via {@link List#get(int)}) method
      * (index range of 0 to {@code List.size() - 1}).
      * <p>
@@ -76,6 +78,7 @@ public BaseTestConsumer() {
      * {@code ConcurrentModificationException}.
      * @return a list of received onNext values
      */
+    @NonNull
     public final List<T> values() {
         return values;
     }
@@ -89,7 +92,8 @@ public final List<T> values() {
      * @param message the message to use
      * @return AssertionError the prepared AssertionError instance
      */
-    protected final AssertionError fail(String message) {
+    @NonNull
+    protected final AssertionError fail(@NonNull String message) {
         StringBuilder b = new StringBuilder(64 + message.length());
         b.append(message);
 
@@ -131,11 +135,12 @@ protected final AssertionError fail(String message) {
     }
 
     /**
-     * Awaits until this TestObserver/TestSubscriber receives an onError or onComplete events.
+     * Awaits until this {@code TestObserver}/{@code TestSubscriber} receives an {@code onError} or {@code onComplete} events.
      * @return this
      * @throws InterruptedException if the current thread is interrupted while waiting
      */
     @SuppressWarnings("unchecked")
+    @NonNull
     public final U await() throws InterruptedException {
         if (done.getCount() == 0) {
             return (U)this;
@@ -146,14 +151,14 @@ public final U await() throws InterruptedException {
     }
 
     /**
-     * Awaits the specified amount of time or until this TestObserver/TestSubscriber
-     * receives an onError or onComplete events, whichever happens first.
+     * Awaits the specified amount of time or until this {@code TestObserver}/{@code TestSubscriber}
+     * receives an {@code onError} or {@code onComplete} events, whichever happens first.
      * @param time the waiting time
      * @param unit the time unit of the waiting time
-     * @return true if the TestObserver/TestSubscriber terminated, false if timeout happened
+     * @return true if the {@code TestObserver}/{@code TestSubscriber} terminated, false if timeout happened
      * @throws InterruptedException if the current thread is interrupted while waiting
      */
-    public final boolean await(long time, TimeUnit unit) throws InterruptedException {
+    public final boolean await(long time, @NonNull TimeUnit unit) throws InterruptedException {
         boolean d = done.getCount() == 0 || (done.await(time, unit));
         timeout = !d;
         return d;
@@ -162,10 +167,11 @@ public final boolean await(long time, TimeUnit unit) throws InterruptedException
     // assertion methods
 
     /**
-     * Assert that this TestObserver/TestSubscriber received exactly one onComplete event.
+     * Assert that this {@code TestObserver}/{@code TestSubscriber} received exactly one {@code onComplete} event.
      * @return this
      */
     @SuppressWarnings("unchecked")
+    @NonNull
     public final U assertComplete() {
         long c = completions;
         if (c == 0) {
@@ -178,10 +184,11 @@ public final U assertComplete() {
     }
 
     /**
-     * Assert that this TestObserver/TestSubscriber has not received any onComplete event.
+     * Assert that this {@code TestObserver}/{@code TestSubscriber} has not received an {@code onComplete} event.
      * @return this
      */
     @SuppressWarnings("unchecked")
+    @NonNull
     public final U assertNotComplete() {
         long c = completions;
         if (c == 1) {
@@ -194,10 +201,11 @@ public final U assertNotComplete() {
     }
 
     /**
-     * Assert that this TestObserver/TestSubscriber has not received any onError event.
+     * Assert that this {@code TestObserver}/{@code TestSubscriber} has not received an {@code onError} event.
      * @return this
      */
     @SuppressWarnings("unchecked")
+    @NonNull
     public final U assertNoErrors() {
         int s = errors.size();
         if (s != 0) {
@@ -207,9 +215,9 @@ public final U assertNoErrors() {
     }
 
     /**
-     * Assert that this TestObserver/TestSubscriber received exactly the specified onError event value.
+     * Assert that this {@code TestObserver}/{@code TestSubscriber} received exactly the specified {@code onError} event value.
      *
-     * <p>The comparison is performed via Objects.equals(); since most exceptions don't
+     * <p>The comparison is performed via {@link Objects#equals(Object, Object)}; since most exceptions don't
      * implement equals(), this assertion may fail. Use the {@link #assertError(Class)}
      * overload to test against the class of an error instead of an instance of an error
      * or {@link #assertError(Predicate)} to test with different condition.
@@ -218,31 +226,34 @@ public final U assertNoErrors() {
      * @see #assertError(Class)
      * @see #assertError(Predicate)
      */
-    public final U assertError(Throwable error) {
+    @NonNull
+    public final U assertError(@NonNull Throwable error) {
         return assertError(Functions.equalsWith(error));
     }
 
     /**
-     * Asserts that this TestObserver/TestSubscriber received exactly one onError event which is an
-     * instance of the specified errorClass class.
-     * @param errorClass the error class to expect
+     * Asserts that this {@code TestObserver}/{@code TestSubscriber} received exactly one {@code onError} event which is an
+     * instance of the specified {@code errorClass} {@link Class}.
+     * @param errorClass the error {@code Class} to expect
      * @return this
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public final U assertError(Class<? extends Throwable> errorClass) {
+    @NonNull
+    public final U assertError(@NonNull Class<? extends Throwable> errorClass) {
         return (U)assertError((Predicate)Functions.isInstanceOf(errorClass));
     }
 
     /**
-     * Asserts that this TestObserver/TestSubscriber received exactly one onError event for which
-     * the provided predicate returns true.
+     * Asserts that this {@code TestObserver}/{@code TestSubscriber} received exactly one {@code onError} event for which
+     * the provided predicate returns {@code true}.
      * @param errorPredicate
-     *            the predicate that receives the error Throwable
-     *            and should return true for expected errors.
+     *            the predicate that receives the error {@link Throwable}
+     *            and should return {@code true} for expected errors.
      * @return this
      */
     @SuppressWarnings("unchecked")
-    public final U assertError(Predicate<Throwable> errorPredicate) {
+    @NonNull
+    public final U assertError(@NonNull Predicate<Throwable> errorPredicate) {
         int s = errors.size();
         if (s == 0) {
             throw fail("No errors");
@@ -272,13 +283,14 @@ public final U assertError(Predicate<Throwable> errorPredicate) {
     }
 
     /**
-     * Assert that this TestObserver/TestSubscriber received exactly one onNext value which is equal to
-     * the given value with respect to Objects.equals.
+     * Assert that this {@code TestObserver}/{@code TestSubscriber} received exactly one {@code onNext} value which is equal to
+     * the given value with respect to {@link Objects#equals(Object, Object)}.
      * @param value the value to expect
      * @return this
      */
     @SuppressWarnings("unchecked")
-    public final U assertValue(T value) {
+    @NonNull
+    public final U assertValue(@NonNull T value) {
         int s = values.size();
         if (s != 1) {
             throw fail("expected: " + valueAndClass(value) + " but was: " + values);
@@ -291,15 +303,16 @@ public final U assertValue(T value) {
     }
 
     /**
-     * Asserts that this TestObserver/TestSubscriber received exactly one onNext value for which
-     * the provided predicate returns true.
+     * Asserts that this {@code TestObserver}/{@code TestSubscriber} received exactly one {@code onNext} value for which
+     * the provided predicate returns {@code true}.
      * @param valuePredicate
-     *            the predicate that receives the onNext value
-     *            and should return true for the expected value.
+     *            the predicate that receives the {@code onNext} value
+     *            and should return {@code true} for the expected value.
      * @return this
      */
     @SuppressWarnings("unchecked")
-    public final U assertValue(Predicate<T> valuePredicate) {
+    @NonNull
+    public final U assertValue(@NonNull Predicate<T> valuePredicate) {
         assertValueAt(0, valuePredicate);
 
         if (values.size() > 1) {
@@ -310,8 +323,8 @@ public final U assertValue(Predicate<T> valuePredicate) {
     }
 
     /**
-     * Asserts that this TestObserver/TestSubscriber received an onNext value at the given index
-     * which is equal to the given value with respect to null-safe Object.equals.
+     * Asserts that this {@code TestObserver}/{@code TestSubscriber} received an {@code onNext} value at the given index
+     * which is equal to the given value with respect to {@code null}-safe {@link Objects#equals(Object, Object)}.
      * <p>History: 2.1.3 - experimental
      * @param index the position to assert on
      * @param value the value to expect
@@ -319,7 +332,8 @@ public final U assertValue(Predicate<T> valuePredicate) {
      * @since 2.2
      */
     @SuppressWarnings("unchecked")
-    public final U assertValueAt(int index, T value) {
+    @NonNull
+    public final U assertValueAt(int index, @NonNull T value) {
         int s = values.size();
         if (s == 0) {
             throw fail("No values");
@@ -337,16 +351,17 @@ public final U assertValueAt(int index, T value) {
     }
 
     /**
-     * Asserts that this TestObserver/TestSubscriber received an onNext value at the given index
-     * for the provided predicate returns true.
+     * Asserts that this {@code TestObserver}/{@code TestSubscriber} received an {@code onNext} value at the given index
+     * for the provided predicate returns {@code true}.
      * @param index the position to assert on
      * @param valuePredicate
-     *            the predicate that receives the onNext value
-     *            and should return true for the expected value.
+     *            the predicate that receives the {@code onNext} value
+     *            and should return {@code true} for the expected value.
      * @return this
      */
     @SuppressWarnings("unchecked")
-    public final U assertValueAt(int index, Predicate<T> valuePredicate) {
+    @NonNull
+    public final U assertValueAt(int index, @NonNull Predicate<T> valuePredicate) {
         int s = values.size();
         if (s == 0) {
             throw fail("No values");
@@ -373,11 +388,12 @@ public final U assertValueAt(int index, Predicate<T> valuePredicate) {
     }
 
     /**
-     * Appends the class name to a non-null value.
+     * Appends the class name to a non-{@code null} value or returns {@code "null"}.
      * @param o the object
      * @return the string representation
      */
-    public static String valueAndClass(Object o) {
+    @NonNull
+    public static String valueAndClass(@Nullable Object o) {
         if (o != null) {
             return o + " (class: " + o.getClass().getSimpleName() + ")";
         }
@@ -385,11 +401,12 @@ public static String valueAndClass(Object o) {
     }
 
     /**
-     * Assert that this TestObserver/TestSubscriber received the specified number onNext events.
-     * @param count the expected number of onNext events
+     * Assert that this {@code TestObserver}/{@code TestSubscriber} received the specified number {@code onNext} events.
+     * @param count the expected number of {@code onNext} events
      * @return this
      */
     @SuppressWarnings("unchecked")
+    @NonNull
     public final U assertValueCount(int count) {
         int s = values.size();
         if (s != count) {
@@ -399,20 +416,23 @@ public final U assertValueCount(int count) {
     }
 
     /**
-     * Assert that this TestObserver/TestSubscriber has not received any onNext events.
+     * Assert that this {@code TestObserver}/{@code TestSubscriber} has not received any {@code onNext} events.
      * @return this
      */
+    @NonNull
     public final U assertNoValues() {
         return assertValueCount(0);
     }
 
     /**
-     * Assert that the TestObserver/TestSubscriber received only the specified values in the specified order.
+     * Assert that the {@code TestObserver}/{@code TestSubscriber} received only the specified values in the specified order.
      * @param values the values expected
      * @return this
      */
     @SuppressWarnings("unchecked")
-    public final U assertValues(T... values) {
+    @SafeVarargs
+    @NonNull
+    public final U assertValues(@NonNull T... values) {
         int s = this.values.size();
         if (s != values.length) {
             throw fail("Value count differs; expected: " + values.length + " " + Arrays.toString(values)
@@ -429,14 +449,15 @@ public final U assertValues(T... values) {
     }
 
     /**
-     * Assert that the TestObserver/TestSubscriber received only the specified values in the specified order without terminating.
+     * Assert that the {@code TestObserver}/{@code TestSubscriber} received only the specified values in the specified order without terminating.
      * <p>History: 2.1.4 - experimental
      * @param values the values expected
      * @return this
      * @since 2.2
      */
     @SafeVarargs
-    public final U assertValuesOnly(T... values) {
+    @NonNull
+    public final U assertValuesOnly(@NonNull T... values) {
         return assertSubscribed()
                 .assertValues(values)
                 .assertNoErrors()
@@ -444,12 +465,13 @@ public final U assertValuesOnly(T... values) {
     }
 
     /**
-     * Assert that the TestObserver/TestSubscriber received only the specified sequence of values in the same order.
+     * Assert that the {@code TestObserver}/{@code TestSubscriber} received only the specified sequence of values in the same order.
      * @param sequence the sequence of expected values in order
      * @return this
      */
     @SuppressWarnings("unchecked")
-    public final U assertValueSequence(Iterable<? extends T> sequence) {
+    @NonNull
+    public final U assertValueSequence(@NonNull Iterable<? extends T> sequence) {
         int i = 0;
         Iterator<T> actualIterator = values.iterator();
         Iterator<? extends T> expectedIterator = sequence.iterator();
@@ -482,20 +504,22 @@ public final U assertValueSequence(Iterable<? extends T> sequence) {
     }
 
     /**
-     * Assert that the onSubscribe method was called exactly once.
+     * Assert that the {@code onSubscribe} method was called exactly once.
      * @return this
      */
+    @NonNull
     protected abstract U assertSubscribed();
 
     /**
-     * Assert that the upstream signalled the specified values in order and
+     * Assert that the upstream signaled the specified values in order and
      * completed normally.
      * @param values the expected values, asserted in order
      * @return this
      * @see #assertFailure(Class, Object...)
      */
     @SafeVarargs
-    public final U assertResult(T... values) {
+    @NonNull
+    public final U assertResult(@NonNull T... values) {
         return assertSubscribed()
                 .assertValues(values)
                 .assertNoErrors()
@@ -503,14 +527,15 @@ public final U assertResult(T... values) {
     }
 
     /**
-     * Assert that the upstream signalled the specified values in order
-     * and then failed with a specific class or subclass of Throwable.
-     * @param error the expected exception (parent) class
+     * Assert that the upstream signaled the specified values in order
+     * and then failed with a specific class or subclass of {@link Throwable}.
+     * @param error the expected exception (parent) {@link Class}
      * @param values the expected values, asserted in order
      * @return this
      */
     @SafeVarargs
-    public final U assertFailure(Class<? extends Throwable> error, T... values) {
+    @NonNull
+    public final U assertFailure(@NonNull Class<? extends Throwable> error, @NonNull T... values) {
         return assertSubscribed()
                 .assertValues(values)
                 .assertError(error)
@@ -519,14 +544,15 @@ public final U assertFailure(Class<? extends Throwable> error, T... values) {
 
     /**
      * Awaits until the internal latch is counted down.
-     * <p>If the wait times out or gets interrupted, the TestObserver/TestSubscriber is cancelled.
+     * <p>If the wait times out or gets interrupted, the {@code TestObserver}/{@code TestSubscriber} is cancelled.
      * @param time the waiting time
      * @param unit the time unit of the waiting time
      * @return this
-     * @throws RuntimeException wrapping an InterruptedException if the wait is interrupted
+     * @throws RuntimeException wrapping an {@link InterruptedException} if the wait is interrupted
      */
     @SuppressWarnings("unchecked")
-    public final U awaitDone(long time, TimeUnit unit) {
+    @NonNull
+    public final U awaitDone(long time, @NonNull TimeUnit unit) {
         try {
             if (!done.await(time, unit)) {
                 timeout = true;
@@ -540,9 +566,12 @@ public final U awaitDone(long time, TimeUnit unit) {
     }
 
     /**
-     * Assert that the TestObserver/TestSubscriber has received a Disposable but no other events.
+     * Assert that the {@code TestObserver}/{@code TestSubscriber} has received a
+     * {@link io.reactivex.rxjava3.disposables.Disposable Disposable}/{@link org.reactivestreams.Subscription Subscription}
+     * via {@code onSubscribe} but no other events.
      * @return this
      */
+    @NonNull
     public final U assertEmpty() {
         return assertSubscribed()
                 .assertNoValues()
@@ -554,18 +583,19 @@ public final U assertEmpty() {
      * Set the tag displayed along with an assertion failure's
      * other state information.
      * <p>History: 2.0.7 - experimental
-     * @param tag the string to display (null won't print any tag)
+     * @param tag the string to display ({@code null} won't print any tag)
      * @return this
      * @since 2.1
      */
     @SuppressWarnings("unchecked")
-    public final U withTag(CharSequence tag) {
+    @NonNull
+    public final U withTag(@Nullable CharSequence tag) {
         this.tag = tag;
         return (U)this;
     }
 
     /**
-     * Await until the TestObserver/TestSubscriber receives the given
+     * Await until the {@code TestObserver}/{@code TestSubscriber} receives the given
      * number of items or terminates by sleeping 10 milliseconds at a time
      * up to 5000 milliseconds of timeout.
      * <p>History: 2.0.7 - experimental
@@ -574,6 +604,7 @@ public final U withTag(CharSequence tag) {
      * @since 2.1
      */
     @SuppressWarnings("unchecked")
+    @NonNull
     public final U awaitCount(int atLeast) {
         long start = System.currentTimeMillis();
         long timeoutMillis = 5000;
diff --git a/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java
index 25926663d5..940654b622 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java
@@ -53,7 +53,7 @@
  */
 public abstract class DisposableCompletableObserver implements CompletableObserver, Disposable {
 
-    final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     @Override
     public final void onSubscribe(@NonNull Disposable d) {
@@ -63,7 +63,7 @@ public final void onSubscribe(@NonNull Disposable d) {
     }
 
     /**
-     * Called once the single upstream Disposable is set via onSubscribe.
+     * Called once the single upstream {@link Disposable} is set via {@link #onSubscribe(Disposable)}.
      */
     protected void onStart() {
     }
diff --git a/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java
index 66ac6a8620..092994e818 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java
@@ -22,7 +22,7 @@
 import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
- * An abstract {@link MaybeObserver} that allows asynchronous cancellation by implementing Disposable.
+ * An abstract {@link MaybeObserver} that allows asynchronous cancellation by implementing {@link Disposable}.
  *
  * <p>All pre-implemented final methods are thread-safe.
  *
@@ -62,7 +62,7 @@
  */
 public abstract class DisposableMaybeObserver<T> implements MaybeObserver<T>, Disposable {
 
-    final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     @Override
     public final void onSubscribe(@NonNull Disposable d) {
@@ -72,7 +72,7 @@ public final void onSubscribe(@NonNull Disposable d) {
     }
 
     /**
-     * Called once the single upstream Disposable is set via onSubscribe.
+     * Called once the single upstream {@link Disposable} is set via {@link #onSubscribe(Disposable)}.
      */
     protected void onStart() {
     }
diff --git a/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java
index a15587317c..ff2eba7758 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java
@@ -22,7 +22,7 @@
 import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
- * An abstract {@link Observer} that allows asynchronous cancellation by implementing Disposable.
+ * An abstract {@link Observer} that allows asynchronous cancellation by implementing {@link Disposable}.
  *
  * <p>All pre-implemented final methods are thread-safe.
  *
@@ -66,7 +66,7 @@
  */
 public abstract class DisposableObserver<T> implements Observer<T>, Disposable {
 
-    final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     @Override
     public final void onSubscribe(@NonNull Disposable d) {
diff --git a/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java
index 6d8ce73fb0..56e5c543b7 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java
@@ -22,7 +22,7 @@
 import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
- * An abstract {@link SingleObserver} that allows asynchronous cancellation by implementing Disposable.
+ * An abstract {@link SingleObserver} that allows asynchronous cancellation by implementing {@link Disposable}.
  *
  * <p>All pre-implemented final methods are thread-safe.
  *
@@ -55,7 +55,7 @@
  */
 public abstract class DisposableSingleObserver<T> implements SingleObserver<T>, Disposable {
 
-    final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     @Override
     public final void onSubscribe(@NonNull Disposable d) {
@@ -65,7 +65,7 @@ public final void onSubscribe(@NonNull Disposable d) {
     }
 
     /**
-     * Called once the single upstream Disposable is set via onSubscribe.
+     * Called once the single upstream {@link Disposable} is set via {@link #onSubscribe(Disposable)}.
      */
     protected void onStart() {
     }
diff --git a/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java b/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java
index 5d74ac5e8c..e3f5c46cfe 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java
@@ -24,8 +24,8 @@
 public interface LambdaConsumerIntrospection {
 
     /**
-     * Returns true or false if a custom onError consumer has been provided.
-     * @return {@code true} if a custom onError consumer implementation was supplied. Returns {@code false} if the
+     * Returns {@code true} or {@code false} if a custom {@code onError} consumer has been provided.
+     * @return {@code true} if a custom {@code onError} consumer implementation was supplied. Returns {@code false} if the
      * implementation is missing an error consumer and thus using a throwing default implementation.
      */
     boolean hasCustomOnError();
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
index b57d77f6f5..df05fe0169 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
@@ -74,17 +74,17 @@
  */
 public abstract class ResourceCompletableObserver implements CompletableObserver, Disposable {
     /** The active subscription. */
-    private final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    private final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     /** The resource composite, can never be null. */
     private final ListCompositeDisposable resources = new ListCompositeDisposable();
 
     /**
-     * Adds a resource to this ResourceObserver.
+     * Adds a resource to this {@code ResourceCompletableObserver}.
      *
      * @param resource the resource to add
      *
-     * @throws NullPointerException if resource is null
+     * @throws NullPointerException if resource is {@code null}
      */
     public final void add(@NonNull Disposable resource) {
         Objects.requireNonNull(resource, "resource is null");
@@ -99,7 +99,7 @@ public final void onSubscribe(@NonNull Disposable d) {
     }
 
     /**
-     * Called once the upstream sets a Subscription on this ResourceObserver.
+     * Called once the upstream sets a {@link Disposable} on this {@code ResourceCompletableObserver}.
      *
      * <p>You can perform initialization at this moment. The default
      * implementation does nothing.
@@ -109,10 +109,10 @@ protected void onStart() {
 
     /**
      * Cancels the main disposable (if any) and disposes the resources associated with
-     * this ResourceObserver (if any).
+     * this {@code ResourceCompletableObserver} (if any).
      *
-     * <p>This method can be called before the upstream calls onSubscribe at which
-     * case the main Disposable will be immediately disposed.
+     * <p>This method can be called before the upstream calls {@link #onSubscribe(Disposable)} at which
+     * case the main {@link Disposable} will be immediately disposed.
      */
     @Override
     public final void dispose() {
@@ -122,8 +122,8 @@ public final void dispose() {
     }
 
     /**
-     * Returns true if this ResourceObserver has been disposed/cancelled.
-     * @return true if this ResourceObserver has been disposed/cancelled
+     * Returns true if this {@code ResourceCompletableObserver} has been disposed/cancelled.
+     * @return true if this {@code ResourceCompletableObserver} has been disposed/cancelled
      */
     @Override
     public final boolean isDisposed() {
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
index cb42a70fbd..22345e60ce 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
@@ -84,17 +84,17 @@
  */
 public abstract class ResourceMaybeObserver<T> implements MaybeObserver<T>, Disposable {
     /** The active subscription. */
-    private final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    private final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     /** The resource composite, can never be null. */
     private final ListCompositeDisposable resources = new ListCompositeDisposable();
 
     /**
-     * Adds a resource to this ResourceObserver.
+     * Adds a resource to this {@code ResourceMaybeObserver}.
      *
      * @param resource the resource to add
      *
-     * @throws NullPointerException if resource is null
+     * @throws NullPointerException if resource is {@code null}
      */
     public final void add(@NonNull Disposable resource) {
         Objects.requireNonNull(resource, "resource is null");
@@ -109,7 +109,7 @@ public final void onSubscribe(@NonNull Disposable d) {
     }
 
     /**
-     * Called once the upstream sets a Subscription on this ResourceObserver.
+     * Called once the upstream sets a {@link Disposable} on this {@code ResourceMaybeObserver}.
      *
      * <p>You can perform initialization at this moment. The default
      * implementation does nothing.
@@ -119,10 +119,10 @@ protected void onStart() {
 
     /**
      * Cancels the main disposable (if any) and disposes the resources associated with
-     * this ResourceObserver (if any).
+     * this {@code ResourceMaybeObserver} (if any).
      *
-     * <p>This method can be called before the upstream calls onSubscribe at which
-     * case the main Disposable will be immediately disposed.
+     * <p>This method can be called before the upstream calls {@link #onSubscribe(Disposable)} at which
+     * case the main {@link Disposable} will be immediately disposed.
      */
     @Override
     public final void dispose() {
@@ -132,8 +132,8 @@ public final void dispose() {
     }
 
     /**
-     * Returns true if this ResourceObserver has been disposed/cancelled.
-     * @return true if this ResourceObserver has been disposed/cancelled
+     * Returns true if this {@code ResourceMaybeObserver} has been disposed/cancelled.
+     * @return true if this {@code ResourceMaybeObserver} has been disposed/cancelled
      */
     @Override
     public final boolean isDisposed() {
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
index b6d77a0d5f..f0810f4c5e 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
@@ -82,17 +82,17 @@
  */
 public abstract class ResourceObserver<T> implements Observer<T>, Disposable {
     /** The active subscription. */
-    private final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    private final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     /** The resource composite, can never be null. */
     private final ListCompositeDisposable resources = new ListCompositeDisposable();
 
     /**
-     * Adds a resource to this ResourceObserver.
+     * Adds a resource to this {@code ResourceObserver}.
      *
      * @param resource the resource to add
      *
-     * @throws NullPointerException if resource is null
+     * @throws NullPointerException if resource is {@code null}
      */
     public final void add(@NonNull Disposable resource) {
         Objects.requireNonNull(resource, "resource is null");
@@ -107,7 +107,7 @@ public final void onSubscribe(Disposable d) {
     }
 
     /**
-     * Called once the upstream sets a Subscription on this ResourceObserver.
+     * Called once the upstream sets a {@link Disposable} on this {@code ResourceObserver}.
      *
      * <p>You can perform initialization at this moment. The default
      * implementation does nothing.
@@ -117,10 +117,10 @@ protected void onStart() {
 
     /**
      * Cancels the main disposable (if any) and disposes the resources associated with
-     * this ResourceObserver (if any).
+     * this {@code ResourceObserver} (if any).
      *
-     * <p>This method can be called before the upstream calls onSubscribe at which
-     * case the main Disposable will be immediately disposed.
+     * <p>This method can be called before the upstream calls {@link #onSubscribe(Disposable)} at which
+     * case the main {@link Disposable} will be immediately disposed.
      */
     @Override
     public final void dispose() {
@@ -130,8 +130,8 @@ public final void dispose() {
     }
 
     /**
-     * Returns true if this ResourceObserver has been disposed/cancelled.
-     * @return true if this ResourceObserver has been disposed/cancelled
+     * Returns true if this {@code ResourceObserver} has been disposed/cancelled.
+     * @return true if this {@code ResourceObserver} has been disposed/cancelled
      */
     @Override
     public final boolean isDisposed() {
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
index af723bf789..efebfaa85c 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
@@ -77,17 +77,17 @@
  */
 public abstract class ResourceSingleObserver<T> implements SingleObserver<T>, Disposable {
     /** The active subscription. */
-    private final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    private final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     /** The resource composite, can never be null. */
     private final ListCompositeDisposable resources = new ListCompositeDisposable();
 
     /**
-     * Adds a resource to this ResourceObserver.
+     * Adds a resource to this {@code ResourceSingleObserver}.
      *
      * @param resource the resource to add
      *
-     * @throws NullPointerException if resource is null
+     * @throws NullPointerException if resource is {@code null}
      */
     public final void add(@NonNull Disposable resource) {
         Objects.requireNonNull(resource, "resource is null");
@@ -102,7 +102,7 @@ public final void onSubscribe(@NonNull Disposable d) {
     }
 
     /**
-     * Called once the upstream sets a Subscription on this ResourceObserver.
+     * Called once the upstream sets a {@link Disposable} on this {@code ResourceSingleObserver}.
      *
      * <p>You can perform initialization at this moment. The default
      * implementation does nothing.
@@ -112,10 +112,10 @@ protected void onStart() {
 
     /**
      * Cancels the main disposable (if any) and disposes the resources associated with
-     * this ResourceObserver (if any).
+     * this {@code ResourceSingleObserver} (if any).
      *
-     * <p>This method can be called before the upstream calls onSubscribe at which
-     * case the main Disposable will be immediately disposed.
+     * <p>This method can be called before the upstream calls {@link #onSubscribe(Disposable)} at which
+     * case the main {@link Disposable} will be immediately disposed.
      */
     @Override
     public final void dispose() {
@@ -125,8 +125,8 @@ public final void dispose() {
     }
 
     /**
-     * Returns true if this ResourceObserver has been disposed/cancelled.
-     * @return true if this ResourceObserver has been disposed/cancelled
+     * Returns true if this {@code ResourceSingleObserver} has been disposed/cancelled.
+     * @return true if this {@code ResourceSingleObserver} has been disposed/cancelled
      */
     @Override
     public final boolean isDisposed() {
diff --git a/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java
index f7612378e2..c3935e79dc 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java
@@ -21,7 +21,7 @@
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
- * Wraps another Subscriber and ensures all onXXX methods conform the protocol
+ * Wraps another {@link Observer} and ensures all {@code onXXX} methods conform the protocol
  * (except the requirement for serialized access).
  *
  * @param <T> the value type
@@ -35,8 +35,8 @@ public final class SafeObserver<T> implements Observer<T>, Disposable {
     boolean done;
 
     /**
-     * Constructs a SafeObserver by wrapping the given actual Observer.
-     * @param downstream the actual Observer to wrap, not null (not validated)
+     * Constructs a {@code SafeObserver} by wrapping the given actual {@link Observer}.
+     * @param downstream the actual {@code Observer} to wrap, not {@code null} (not validated)
      */
     public SafeObserver(@NonNull Observer<? super T> downstream) {
         this.downstream = downstream;
diff --git a/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java b/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java
index a0ffe75cce..e0d32fbd7a 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java
@@ -20,13 +20,14 @@
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
- * Serializes access to the onNext, onError and onComplete methods of another Observer.
+ * Serializes access to the {@link Observer#onNext(Object)}, {@link Observer#onError(Throwable)} and
+ * {@link Observer#onComplete()} methods of another {@link Observer}.
  *
  * <p>Note that {@link #onSubscribe(Disposable)} is not serialized in respect of the other methods so
- * make sure the {@code onSubscribe()} is called with a non-null {@code Disposable}
+ * make sure the {@code onSubscribe()} is called with a non-null {@link Disposable}
  * before any of the other methods are called.
  *
- * <p>The implementation assumes that the actual Observer's methods don't throw.
+ * <p>The implementation assumes that the actual {@code Observer}'s methods don't throw.
  *
  * @param <T> the value type
  */
@@ -44,19 +45,19 @@ public final class SerializedObserver<T> implements Observer<T>, Disposable {
     volatile boolean done;
 
     /**
-     * Construct a SerializedObserver by wrapping the given actual Observer.
-     * @param downstream the actual Observer, not null (not verified)
+     * Construct a {@code SerializedObserver} by wrapping the given actual {@link Observer}.
+     * @param downstream the actual {@code Observer}, not {@code null} (not verified)
      */
     public SerializedObserver(@NonNull Observer<? super T> downstream) {
         this(downstream, false);
     }
 
     /**
-     * Construct a SerializedObserver by wrapping the given actual Observer and
+     * Construct a SerializedObserver by wrapping the given actual {@link Observer} and
      * optionally delaying the errors till all regular values have been emitted
      * from the internal buffer.
-     * @param actual the actual Observer, not null (not verified)
-     * @param delayError if true, errors are emitted after regular values have been emitted
+     * @param actual the actual {@code Observer}, not {@code null} (not verified)
+     * @param delayError if {@code true}, errors are emitted after regular values have been emitted
      */
     public SerializedObserver(@NonNull Observer<? super T> actual, boolean delayError) {
         this.downstream = actual;
@@ -100,7 +101,7 @@ public void onNext(@NonNull T t) {
             if (emitting) {
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(QUEUE_LINK_SIZE);
+                    q = new AppendOnlyLinkedArrayList<>(QUEUE_LINK_SIZE);
                     queue = q;
                 }
                 q.add(NotificationLite.next(t));
@@ -129,7 +130,7 @@ public void onError(@NonNull Throwable t) {
                 done = true;
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(QUEUE_LINK_SIZE);
+                    q = new AppendOnlyLinkedArrayList<>(QUEUE_LINK_SIZE);
                     queue = q;
                 }
                 Object err = NotificationLite.error(t);
@@ -167,7 +168,7 @@ public void onComplete() {
             if (emitting) {
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(QUEUE_LINK_SIZE);
+                    q = new AppendOnlyLinkedArrayList<>(QUEUE_LINK_SIZE);
                     queue = q;
                 }
                 q.add(NotificationLite.complete());
diff --git a/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java b/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java
index eae4fe113e..44b129fdab 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java
@@ -14,19 +14,24 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 
 /**
- * An Observer that records events and allows making assertions about them.
+ * An {@link Observer}, {@link MaybeObserver}, {@link SingleObserver} and
+ * {@link CompletableObserver} composite that can record events from
+ * {@link Observable}s, {@link Maybe}s, {@link Single}s and {@link Completable}s
+ *  and allows making assertions about them.
  *
- * <p>You can override the onSubscribe, onNext, onError, onComplete, onSuccess and
- * cancel methods but not the others (this is by design).
+ * <p>You can override the {@link #onSubscribe(Disposable)}, {@link #onNext(Object)}, {@link #onError(Throwable)},
+ * {@link #onComplete()} and {@link #onSuccess(Object)} methods but not the others (this is by design).
  *
- * <p>The TestObserver implements Disposable for convenience where dispose calls cancel.
+ * <p>The {@code TestObserver} implements {@link Disposable} for convenience where dispose calls cancel.
  *
  * @param <T> the value type
+ * @see io.reactivex.rxjava3.subscribers.TestSubscriber
  */
 public class TestObserver<T>
 extends BaseTestConsumer<T, TestObserver<T>>
@@ -35,25 +40,27 @@ public class TestObserver<T>
     private final Observer<? super T> downstream;
 
     /** Holds the current subscription if any. */
-    private final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    private final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     /**
-     * Constructs a non-forwarding TestObserver.
+     * Constructs a non-forwarding {@code TestObserver}.
      * @param <T> the value type received
-     * @return the new TestObserver instance
+     * @return the new {@code TestObserver} instance
      */
+    @NonNull
     public static <T> TestObserver<T> create() {
-        return new TestObserver<T>();
+        return new TestObserver<>();
     }
 
     /**
-     * Constructs a forwarding TestObserver.
+     * Constructs a forwarding {@code TestObserver}.
      * @param <T> the value type received
-     * @param delegate the actual Observer to forward events to
-     * @return the new TestObserver instance
+     * @param delegate the actual {@link Observer} to forward events to
+     * @return the new {@code TestObserver} instance
      */
-    public static <T> TestObserver<T> create(Observer<? super T> delegate) {
-        return new TestObserver<T>(delegate);
+    @NonNull
+    public static <T> TestObserver<T> create(@NonNull Observer<? super T> delegate) {
+        return new TestObserver<>(delegate);
     }
 
     /**
@@ -64,15 +71,15 @@ public TestObserver() {
     }
 
     /**
-     * Constructs a forwarding TestObserver.
-     * @param downstream the actual Observer to forward events to
+     * Constructs a forwarding {@code TestObserver}.
+     * @param downstream the actual {@link Observer} to forward events to
      */
-    public TestObserver(Observer<? super T> downstream) {
+    public TestObserver(@NonNull Observer<? super T> downstream) {
         this.downstream = downstream;
     }
 
     @Override
-    public void onSubscribe(Disposable d) {
+    public void onSubscribe(@NonNull Disposable d) {
         lastThread = Thread.currentThread();
 
         if (d == null) {
@@ -91,7 +98,7 @@ public void onSubscribe(Disposable d) {
     }
 
     @Override
-    public void onNext(T t) {
+    public void onNext(@NonNull T t) {
         if (!checkSubscriptionOnce) {
             checkSubscriptionOnce = true;
             if (upstream.get() == null) {
@@ -111,7 +118,7 @@ public void onNext(T t) {
     }
 
     @Override
-    public void onError(Throwable t) {
+    public void onError(@NonNull Throwable t) {
         if (!checkSubscriptionOnce) {
             checkSubscriptionOnce = true;
             if (upstream.get() == null) {
@@ -164,18 +171,19 @@ public final boolean isDisposed() {
 
     // state retrieval methods
     /**
-     * Returns true if this TestObserver received a subscription.
-     * @return true if this TestObserver received a subscription
+     * Returns true if this {@code TestObserver} received a subscription.
+     * @return true if this {@code TestObserver} received a subscription
      */
     public final boolean hasSubscription() {
         return upstream.get() != null;
     }
 
     /**
-     * Assert that the onSubscribe method was called exactly once.
-     * @return this;
+     * Assert that the {@link #onSubscribe(Disposable)} method was called exactly once.
+     * @return this
      */
     @Override
+    @NonNull
     protected final TestObserver<T> assertSubscribed() {
         if (upstream.get() == null) {
             throw fail("Not subscribed!");
@@ -184,7 +192,7 @@ protected final TestObserver<T> assertSubscribed() {
     }
 
     @Override
-    public void onSuccess(T value) {
+    public void onSuccess(@NonNull T value) {
         onNext(value);
         onComplete();
     }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
index 9a75a1f4ca..9491773080 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
@@ -68,7 +68,7 @@
  *  <dd>The {@code AsyncProcessor} honors the backpressure of the downstream {@code Subscriber}s and won't emit
  *  its single value to a particular {@code Subscriber} until that {@code Subscriber} has requested an item.
  *  When the {@code AsyncProcessor} is subscribed to a {@link io.reactivex.rxjava3.core.Flowable}, the processor consumes this
- *  {@code Flowable} in an unbounded manner (requesting `Long.MAX_VALUE`) as only the very last upstream item is
+ *  {@code Flowable} in an unbounded manner (requesting {@link Long#MAX_VALUE}) as only the very last upstream item is
  *  retained by it.
  *  </dd>
  *  <dt><b>Scheduler:</b></dt>
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index eaf47ecae3..4b85ff5ab0 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -108,7 +108,7 @@
  *  that returns true if any of the {@code Subscriber}s is not ready to receive {@code onNext} events. If
  *  there are no {@code Subscriber}s to the processor, {@code offer()} always succeeds.
  *  If the {@code BehaviorProcessor} is (optionally) subscribed to another {@code Publisher}, this upstream
- *  {@code Publisher} is consumed in an unbounded fashion (requesting {@code Long.MAX_VALUE}).</dd>
+ *  {@code Publisher} is consumed in an unbounded fashion (requesting {@link Long#MAX_VALUE}).</dd>
  *  <dt><b>Scheduler:</b></dt>
  *  <dd>{@code BehaviorProcessor} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the {@code Subscriber}s get notified on the thread the respective {@code onXXX} methods were invoked.</dd>
@@ -229,7 +229,7 @@ public static <T> BehaviorProcessor<T> createDefault(T defaultValue) {
     /**
      * Constructs a BehaviorProcessor with the given initial value.
      * @param defaultValue the initial value, not null (verified)
-     * @throws NullPointerException if {@code defaultValue} is null
+     * @throws NullPointerException if {@code defaultValue} is {@code null}
      * @since 2.0
      */
     BehaviorProcessor(T defaultValue) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
index 2d44f60f05..4dc9bc9371 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
@@ -71,7 +71,7 @@
  * <dl>
  *  <dt><b>Backpressure:</b></dt>
  *  <dd>The processor does not coordinate backpressure for its subscribers and implements a weaker {@code onSubscribe} which
- *  calls requests Long.MAX_VALUE from the incoming Subscriptions. This makes it possible to subscribe the {@code PublishProcessor}
+ *  calls requests {@link Long#MAX_VALUE} from the incoming Subscriptions. This makes it possible to subscribe the {@code PublishProcessor}
  *  to multiple sources (note on serialization though) unlike the standard {@code Subscriber} contract. Child subscribers, however, are not overflown but receive an
  *  {@link IllegalStateException} in case their requested amount is zero.</dd>
  *  <dt><b>Scheduler:</b></dt>
diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index fcd2cb913f..04de41a77f 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -66,7 +66,7 @@
  * <p>
  * This {@code ReplayProcessor} respects the individual backpressure behavior of its {@code Subscriber}s but
  * does not coordinate their request amounts towards the upstream (because there might not be any) and
- * consumes the upstream in an unbounded manner (requesting {@code Long.MAX_VALUE}).
+ * consumes the upstream in an unbounded manner (requesting {@link Long#MAX_VALUE}).
  * Note that {@code Subscriber}s receive a continuous sequence of values after they subscribed even
  * if an individual item gets delayed due to backpressure.
  * Due to concurrency requirements, a size-bounded {@code ReplayProcessor} may hold strong references to more source
@@ -104,7 +104,7 @@
  *  <dt><b>Backpressure:</b></dt>
  *  <dd>This {@code ReplayProcessor} respects the individual backpressure behavior of its {@code Subscriber}s but
  *  does not coordinate their request amounts towards the upstream (because there might not be any) and
- *  consumes the upstream in an unbounded manner (requesting {@code Long.MAX_VALUE}).
+ *  consumes the upstream in an unbounded manner (requesting {@link Long#MAX_VALUE}).
  *  Note that {@code Subscriber}s receive a continuous sequence of values after they subscribed even
  *  if an individual item gets delayed due to backpressure.</dd>
  *  <dt><b>Scheduler:</b></dt>
diff --git a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
index 4a1862a95f..ee93a5ac9c 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
@@ -67,7 +67,7 @@
  * {@link NullPointerException} being thrown and the processor's state is not changed.
  * <p>
  * Since a {@code UnicastProcessor} is a {@link io.reactivex.rxjava3.core.Flowable} as well as a {@link FlowableProcessor}, it
- * honors the downstream backpressure but consumes an upstream source in an unbounded manner (requesting {@code Long.MAX_VALUE}).
+ * honors the downstream backpressure but consumes an upstream source in an unbounded manner (requesting {@link Long#MAX_VALUE}).
  * <p>
  * When this {@code UnicastProcessor} is terminated via {@link #onError(Throwable)} the current or late single {@code Subscriber}
  * may receive the {@code Throwable} before any available items could be emitted. To make sure an {@code onError} event is delivered
@@ -91,7 +91,7 @@
  * <dl>
  *  <dt><b>Backpressure:</b></dt>
  *  <dd>{@code UnicastProcessor} honors the downstream backpressure but consumes an upstream source
- *  (if any) in an unbounded manner (requesting {@code Long.MAX_VALUE}).</dd>
+ *  (if any) in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
  *  <dt><b>Scheduler:</b></dt>
  *  <dd>{@code UnicastProcessor} does not operate by default on a particular {@link io.reactivex.rxjava3.core.Scheduler} and
  *  the single {@code Subscriber} gets notified on the thread the respective {@code onXXX} methods were invoked.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
index 845273ff22..814b223dcf 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
@@ -29,11 +29,11 @@ public final class Timed<T> {
     final TimeUnit unit;
 
     /**
-     * Constructs a Timed instance with the given value and time information.
+     * Constructs a {@code Timed} instance with the given value and time information.
      * @param value the value to hold
      * @param time the time to hold
      * @param unit the time unit, not null
-     * @throws NullPointerException if unit is null
+     * @throws NullPointerException if unit is {@code null}
      */
     public Timed(@NonNull T value, long time, @NonNull TimeUnit unit) {
         this.value = value;
@@ -69,7 +69,7 @@ public long time() {
 
     /**
      * Returns the contained time value in the time unit specified.
-     * @param unit the time unt
+     * @param unit the time unit
      * @return the converted time
      */
     public long time(@NonNull TimeUnit unit) {
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
index 68efd5bf8f..b3b212eea4 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
@@ -213,7 +213,7 @@ public static <T> BehaviorSubject<T> createDefault(T defaultValue) {
     /**
      * Constructs a BehaviorSubject with the given initial value.
      * @param defaultValue the initial value, not null (verified)
-     * @throws NullPointerException if {@code defaultValue} is null
+     * @throws NullPointerException if {@code defaultValue} is {@code null}
      * @since 2.0
      */
     BehaviorSubject(T defaultValue) {
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java
index 3e674a16b0..6a936eb8d9 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java
@@ -27,7 +27,7 @@
  *
  * <p>All pre-implemented final methods are thread-safe.
  *
- * <p>The default {@link #onStart()} requests Long.MAX_VALUE by default. Override
+ * <p>The default {@link #onStart()} requests {@link Long#MAX_VALUE} by default. Override
  * the method to request a custom <em>positive</em> amount.
  *
  * <p>Note that calling {@link #request(long)} from {@link #onStart()} may trigger
@@ -85,7 +85,7 @@ public final void onSubscribe(Subscription s) {
     }
 
     /**
-     * Requests from the upstream Subscription.
+     * Requests from the upstream {@link Subscription}.
      * @param n the request amount, positive
      */
     protected final void request(long n) {
@@ -96,7 +96,7 @@ protected final void request(long n) {
     }
 
     /**
-     * Cancels the upstream's Subscription.
+     * Cancels the upstream's {@link Subscription}.
      */
     protected final void cancel() {
         Subscription s = this.upstream;
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java
index 2c6c126f8d..566b0097f7 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java
@@ -23,11 +23,11 @@
 import io.reactivex.rxjava3.internal.util.EndConsumerHelper;
 
 /**
- * An abstract Subscriber that allows asynchronous, external cancellation by implementing Disposable.
+ * An abstract Subscriber that allows asynchronous, external cancellation by implementing {@link Disposable}.
  *
  * <p>All pre-implemented final methods are thread-safe.
  *
- * <p>The default {@link #onStart()} requests Long.MAX_VALUE by default. Override
+ * <p>The default {@link #onStart()} requests {@link Long#MAX_VALUE} by default. Override
  * the method to request a custom <em>positive</em> amount. Use the protected {@link #request(long)}
  * to request more items and {@link #cancel()} to cancel the sequence from within an
  * {@code onNext} implementation.
@@ -74,7 +74,7 @@
  * @param <T> the received value type.
  */
 public abstract class DisposableSubscriber<T> implements FlowableSubscriber<T>, Disposable {
-    final AtomicReference<Subscription> upstream = new AtomicReference<Subscription>();
+    final AtomicReference<Subscription> upstream = new AtomicReference<>();
 
     @Override
     public final void onSubscribe(Subscription s) {
@@ -84,18 +84,18 @@ public final void onSubscribe(Subscription s) {
     }
 
     /**
-     * Called once the single upstream Subscription is set via onSubscribe.
+     * Called once the single upstream {@link Subscription} is set via {@link #onSubscribe(Subscription)}.
      */
     protected void onStart() {
         upstream.get().request(Long.MAX_VALUE);
     }
 
     /**
-     * Requests the specified amount from the upstream if its Subscription is set via
+     * Requests the specified amount from the upstream if its {@link Subscription} is set via
      * onSubscribe already.
-     * <p>Note that calling this method before a Subscription is set via onSubscribe
-     * leads to NullPointerException and meant to be called from inside onStart or
-     * onNext.
+     * <p>Note that calling this method before a {@link Subscription} is set via {@link #onSubscribe(Subscription)}
+     * leads to {@link NullPointerException} and meant to be called from inside {@link #onStart()} or
+     * {@link #onNext(Object)}.
      * @param n the request amount, positive
      */
     protected final void request(long n) {
@@ -103,8 +103,8 @@ protected final void request(long n) {
     }
 
     /**
-     * Cancels the Subscription set via onSubscribe or makes sure a
-     * Subscription set asynchronously (later) is cancelled immediately.
+     * Cancels the Subscription set via {@link #onSubscribe(Subscription)} or makes sure a
+     * {@link Subscription} set asynchronously (later) is cancelled immediately.
      * <p>This method is thread-safe and can be exposed as a public API.
      */
     protected final void cancel() {
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
index 1990939311..7d9411048a 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
@@ -40,7 +40,7 @@
  * {@code ResourceSubscriber} and then add/remove resources to/from the {@code CompositeDisposable}
  * freely.
  *
- * <p>The default {@link #onStart()} requests Long.MAX_VALUE by default. Override
+ * <p>The default {@link #onStart()} requests {@link Long#MAX_VALUE} by default. Override
  * the method to request a custom <em>positive</em> amount. Use the protected {@link #request(long)}
  * to request more items and {@link #dispose()} to cancel the sequence from within an
  * {@code onNext} implementation.
@@ -94,7 +94,7 @@
  */
 public abstract class ResourceSubscriber<T> implements FlowableSubscriber<T>, Disposable {
     /** The active subscription. */
-    private final AtomicReference<Subscription> upstream = new AtomicReference<Subscription>();
+    private final AtomicReference<Subscription> upstream = new AtomicReference<>();
 
     /** The resource composite, can never be null. */
     private final ListCompositeDisposable resources = new ListCompositeDisposable();
@@ -103,11 +103,11 @@ public abstract class ResourceSubscriber<T> implements FlowableSubscriber<T>, Di
     private final AtomicLong missedRequested = new AtomicLong();
 
     /**
-     * Adds a resource to this AsyncObserver.
+     * Adds a resource to this {@code ResourceSubscriber}.
      *
      * @param resource the resource to add
      *
-     * @throws NullPointerException if resource is null
+     * @throws NullPointerException if {@code resource} is {@code null}
      */
     public final void add(Disposable resource) {
         Objects.requireNonNull(resource, "resource is null");
@@ -126,10 +126,10 @@ public final void onSubscribe(Subscription s) {
     }
 
     /**
-     * Called once the upstream sets a Subscription on this AsyncObserver.
+     * Called once the upstream sets a {@link Subscription} on this {@code ResourceSubscriber}.
      *
      * <p>You can perform initialization at this moment. The default
-     * implementation requests Long.MAX_VALUE from upstream.
+     * implementation requests {@link Long#MAX_VALUE} from upstream.
      */
     protected void onStart() {
         request(Long.MAX_VALUE);
@@ -138,7 +138,7 @@ protected void onStart() {
     /**
      * Request the specified amount of elements from upstream.
      *
-     * <p>This method can be called before the upstream calls onSubscribe().
+     * <p>This method can be called before the upstream calls {@link #onSubscribe(Subscription)}.
      * When the subscription happens, all missed requests are requested.
      *
      * @param n the request amount, must be positive
@@ -149,10 +149,10 @@ protected final void request(long n) {
 
     /**
      * Cancels the subscription (if any) and disposes the resources associated with
-     * this AsyncObserver (if any).
+     * this {@code ResourceSubscriber} (if any).
      *
-     * <p>This method can be called before the upstream calls onSubscribe at which
-     * case the Subscription will be immediately cancelled.
+     * <p>This method can be called before the upstream calls {@link #onSubscribe(Subscription)} at which
+     * case the {@link Subscription} will be immediately cancelled.
      */
     @Override
     public final void dispose() {
@@ -162,8 +162,8 @@ public final void dispose() {
     }
 
     /**
-     * Returns true if this AsyncObserver has been disposed/cancelled.
-     * @return true if this AsyncObserver has been disposed/cancelled
+     * Returns true if this {@code ResourceSubscriber} has been disposed/cancelled.
+     * @return true if this {@code ResourceSubscriber} has been disposed/cancelled
      */
     @Override
     public final boolean isDisposed() {
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
index 096a99e623..0db19796fa 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
@@ -14,6 +14,7 @@
 
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
@@ -21,7 +22,7 @@
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
- * Wraps another Subscriber and ensures all onXXX methods conform the protocol
+ * Wraps another {@link Subscriber} and ensures all {@code onXXX} methods conform the protocol
  * (except the requirement for serialized access).
  *
  * @param <T> the value type
@@ -35,15 +36,15 @@ public final class SafeSubscriber<T> implements FlowableSubscriber<T>, Subscript
     boolean done;
 
     /**
-     * Constructs a SafeSubscriber by wrapping the given actual Subscriber.
-     * @param downstream the actual Subscriber to wrap, not null (not validated)
+     * Constructs a {@code SafeSubscriber} by wrapping the given actual {@link Subscriber}.
+     * @param downstream the actual {@code Subscriber} to wrap, not {@code null} (not validated)
      */
-    public SafeSubscriber(Subscriber<? super T> downstream) {
+    public SafeSubscriber(@NonNull Subscriber<? super T> downstream) {
         this.downstream = downstream;
     }
 
     @Override
-    public void onSubscribe(Subscription s) {
+    public void onSubscribe(@NonNull Subscription s) {
         if (SubscriptionHelper.validate(this.upstream, s)) {
             this.upstream = s;
             try {
@@ -65,7 +66,7 @@ public void onSubscribe(Subscription s) {
     }
 
     @Override
-    public void onNext(T t) {
+    public void onNext(@NonNull T t) {
         if (done) {
             return;
         }
@@ -124,7 +125,7 @@ void onNextNoSubscription() {
     }
 
     @Override
-    public void onError(Throwable t) {
+    public void onError(@NonNull Throwable t) {
         if (done) {
             RxJavaPlugins.onError(t);
             return;
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java
index 92ecbbe6d0..9698d97e21 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java
@@ -14,19 +14,21 @@
 
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
- * Serializes access to the onNext, onError and onComplete methods of another Subscriber.
+ * Serializes access to the {@link Subscriber#onNext(Object)}, {@link Subscriber#onError(Throwable)} and
+ * {@link Subscriber#onComplete()} methods of another {@link Subscriber}.
  *
  * <p>Note that {@link #onSubscribe(Subscription)} is not serialized in respect of the other methods so
- * make sure the {@code onSubscribe} is called with a non-null {@code Subscription}
+ * make sure the {@code onSubscribe} is called with a non-{@code null} {@link Subscription}
  * before any of the other methods are called.
  *
- * <p>The implementation assumes that the actual Subscriber's methods don't throw.
+ * <p>The implementation assumes that the actual {@code Subscriber}'s methods don't throw.
  *
  * @param <T> the value type
  */
@@ -44,27 +46,27 @@ public final class SerializedSubscriber<T> implements FlowableSubscriber<T>, Sub
     volatile boolean done;
 
     /**
-     * Construct a SerializedSubscriber by wrapping the given actual Subscriber.
-     * @param downstream the actual Subscriber, not null (not verified)
+     * Construct a {@code SerializedSubscriber} by wrapping the given actual {@link Subscriber}.
+     * @param downstream the actual {@code Subscriber}, not null (not verified)
      */
     public SerializedSubscriber(Subscriber<? super T> downstream) {
         this(downstream, false);
     }
 
     /**
-     * Construct a SerializedSubscriber by wrapping the given actual Observer and
+     * Construct a {@code SerializedSubscriber} by wrapping the given actual {@link Subscriber} and
      * optionally delaying the errors till all regular values have been emitted
      * from the internal buffer.
-     * @param actual the actual Subscriber, not null (not verified)
-     * @param delayError if true, errors are emitted after regular values have been emitted
+     * @param actual the actual {@code Subscriber}, not {@code null} (not verified)
+     * @param delayError if {@code true}, errors are emitted after regular values have been emitted
      */
-    public SerializedSubscriber(Subscriber<? super T> actual, boolean delayError) {
+    public SerializedSubscriber(@NonNull Subscriber<? super T> actual, boolean delayError) {
         this.downstream = actual;
         this.delayError = delayError;
     }
 
     @Override
-    public void onSubscribe(Subscription s) {
+    public void onSubscribe(@NonNull Subscription s) {
         if (SubscriptionHelper.validate(this.upstream, s)) {
             this.upstream = s;
             downstream.onSubscribe(this);
@@ -72,7 +74,7 @@ public void onSubscribe(Subscription s) {
     }
 
     @Override
-    public void onNext(T t) {
+    public void onNext(@NonNull T t) {
         if (done) {
             return;
         }
@@ -88,7 +90,7 @@ public void onNext(T t) {
             if (emitting) {
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(QUEUE_LINK_SIZE);
+                    q = new AppendOnlyLinkedArrayList<>(QUEUE_LINK_SIZE);
                     queue = q;
                 }
                 q.add(NotificationLite.next(t));
@@ -117,7 +119,7 @@ public void onError(Throwable t) {
                 done = true;
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(QUEUE_LINK_SIZE);
+                    q = new AppendOnlyLinkedArrayList<>(QUEUE_LINK_SIZE);
                     queue = q;
                 }
                 Object err = NotificationLite.error(t);
@@ -155,7 +157,7 @@ public void onComplete() {
             if (emitting) {
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(QUEUE_LINK_SIZE);
+                    q = new AppendOnlyLinkedArrayList<>(QUEUE_LINK_SIZE);
                     queue = q;
                 }
                 q.add(NotificationLite.complete());
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
index 3607337b36..cbc9d10320 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
@@ -16,20 +16,19 @@
 
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.observers.BaseTestConsumer;
 
 /**
- * A subscriber that records events and allows making assertions about them.
+ * A {@link Subscriber} implementation that records events and allows making assertions about them.
  *
- * <p>You can override the onSubscribe, onNext, onError, onComplete, request and
- * cancel methods but not the others (this is by design).
- *
- * <p>The TestSubscriber implements Disposable for convenience where dispose calls cancel.
+ * <p>You can override the {@link #onSubscribe(Subscription)}, {@link #onNext(Object)}, {@link #onError(Throwable)} and
+ * {@link #onComplete()} methods but not the others (this is by design).
  *
  * <p>When calling the default request method, you are requesting on behalf of the
- * wrapped actual subscriber.
+ * wrapped actual {@link Subscriber} if any.
  *
  * @param <T> the value type
  */
@@ -49,78 +48,82 @@ public class TestSubscriber<T>
     private final AtomicLong missedRequested;
 
     /**
-     * Creates a TestSubscriber with Long.MAX_VALUE initial request.
+     * Creates a {@code TestSubscriber} with {@link Long#MAX_VALUE} initial request amount.
      * @param <T> the value type
-     * @return the new TestSubscriber instance.
+     * @return the new {@code TestSubscriber} instance.
+     * @see #create(long)
      */
+    @NonNull
     public static <T> TestSubscriber<T> create() {
-        return new TestSubscriber<T>();
+        return new TestSubscriber<>();
     }
 
     /**
-     * Creates a TestSubscriber with the given initial request.
+     * Creates a {@code TestSubscriber} with the given initial request amount.
      * @param <T> the value type
      * @param initialRequested the initial requested amount
-     * @return the new TestSubscriber instance.
+     * @return the new {@code TestSubscriber} instance.
      */
+    @NonNull
     public static <T> TestSubscriber<T> create(long initialRequested) {
-        return new TestSubscriber<T>(initialRequested);
+        return new TestSubscriber<>(initialRequested);
     }
 
     /**
-     * Constructs a forwarding TestSubscriber.
+     * Constructs a forwarding {@code TestSubscriber}.
      * @param <T> the value type received
-     * @param delegate the actual Subscriber to forward events to
+     * @param delegate the actual {@link Subscriber} to forward events to
      * @return the new TestObserver instance
      */
-    public static <T> TestSubscriber<T> create(Subscriber<? super T> delegate) {
-        return new TestSubscriber<T>(delegate);
+    public static <T> TestSubscriber<T> create(@NonNull Subscriber<? super T> delegate) {
+        return new TestSubscriber<>(delegate);
     }
 
     /**
-     * Constructs a non-forwarding TestSubscriber with an initial request value of Long.MAX_VALUE.
+     * Constructs a non-forwarding {@code TestSubscriber} with an initial request value of {@link Long#MAX_VALUE}.
      */
     public TestSubscriber() {
         this(EmptySubscriber.INSTANCE, Long.MAX_VALUE);
     }
 
     /**
-     * Constructs a non-forwarding TestSubscriber with the specified initial request value.
-     * <p>The TestSubscriber doesn't validate the initialRequest value so one can
+     * Constructs a non-forwarding {@code TestSubscriber} with the specified initial request value.
+     * <p>The {@code TestSubscriber} doesn't validate the {@code initialRequest} amount so one can
      * test sources with invalid values as well.
-     * @param initialRequest the initial request value
+     * @param initialRequest the initial request amount
      */
     public TestSubscriber(long initialRequest) {
         this(EmptySubscriber.INSTANCE, initialRequest);
     }
 
     /**
-     * Constructs a forwarding TestSubscriber but leaves the requesting to the wrapped subscriber.
-     * @param downstream the actual Subscriber to forward events to
+     * Constructs a forwarding {@code TestSubscriber} but leaves the requesting to the wrapped {@link Subscriber}.
+     * @param downstream the actual {@code Subscriber} to forward events to
      */
-    public TestSubscriber(Subscriber<? super T> downstream) {
+    public TestSubscriber(@NonNull Subscriber<? super T> downstream) {
         this(downstream, Long.MAX_VALUE);
     }
 
     /**
-     * Constructs a forwarding TestSubscriber with the specified initial request value.
-     * <p>The TestSubscriber doesn't validate the initialRequest value so one can
+     * Constructs a forwarding {@code TestSubscriber} with the specified initial request amount
+     * and an actual {@link Subscriber} to forward events to.
+     * <p>The {@code TestSubscriber} doesn't validate the initialRequest value so one can
      * test sources with invalid values as well.
-     * @param actual the actual Subscriber to forward events to
-     * @param initialRequest the initial request value
+     * @param actual the actual {@code Subscriber} to forward events to
+     * @param initialRequest the initial request amount
      */
-    public TestSubscriber(Subscriber<? super T> actual, long initialRequest) {
+    public TestSubscriber(@NonNull Subscriber<? super T> actual, long initialRequest) {
         super();
         if (initialRequest < 0) {
             throw new IllegalArgumentException("Negative initial request not allowed");
         }
         this.downstream = actual;
-        this.upstream = new AtomicReference<Subscription>();
+        this.upstream = new AtomicReference<>();
         this.missedRequested = new AtomicLong(initialRequest);
     }
 
     @Override
-    public void onSubscribe(Subscription s) {
+    public void onSubscribe(@NonNull Subscription s) {
         lastThread = Thread.currentThread();
 
         if (s == null) {
@@ -153,7 +156,7 @@ protected void onStart() {
     }
 
     @Override
-    public void onNext(T t) {
+    public void onNext(@NonNull T t) {
         if (!checkSubscriptionOnce) {
             checkSubscriptionOnce = true;
             if (upstream.get() == null) {
@@ -172,7 +175,7 @@ public void onNext(T t) {
     }
 
     @Override
-    public void onError(Throwable t) {
+    public void onError(@NonNull Throwable t) {
         if (!checkSubscriptionOnce) {
             checkSubscriptionOnce = true;
             if (upstream.get() == null) {
@@ -225,8 +228,8 @@ public final void cancel() {
     }
 
     /**
-     * Returns true if this TestSubscriber has been cancelled.
-     * @return true if this TestSubscriber has been cancelled
+     * Returns true if this {@code TestSubscriber} has been cancelled.
+     * @return true if this {@code TestSubscriber} has been cancelled
      */
     public final boolean isCancelled() {
         return cancelled;
@@ -245,8 +248,8 @@ protected final boolean isDisposed() {
     // state retrieval methods
 
     /**
-     * Returns true if this TestSubscriber received a subscription.
-     * @return true if this TestSubscriber received a subscription
+     * Returns true if this {@code TestSubscriber} received a {@link Subscription} via {@link #onSubscribe(Subscription)}.
+     * @return true if this {@code TestSubscriber} received a {@link Subscription} via {@link #onSubscribe(Subscription)}
      */
     public final boolean hasSubscription() {
         return upstream.get() != null;
@@ -255,7 +258,7 @@ public final boolean hasSubscription() {
     // assertion methods
 
     /**
-     * Assert that the onSubscribe method was called exactly once.
+     * Assert that the {@link #onSubscribe(Subscription)} method was called exactly once.
      * @return this
      */
     @Override
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
index 32c954f42b..2a94f73b8e 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
@@ -83,7 +83,7 @@ public void cancel() {
     }
 
     @Test
-    public void requestFromChainedOperator() throws Exception {
+    public void requestFromChainedOperator() throws Throwable {
         TestSubscriber<String> s = new TestSubscriber<String>(10L);
         FlowableOperator<String, String> o = new FlowableOperator<String, String>() {
             @Override
@@ -135,7 +135,7 @@ public void cancel() {
     }
 
     @Test
-    public void requestFromDecoupledOperator() throws Exception {
+    public void requestFromDecoupledOperator() throws Throwable {
         TestSubscriber<String> s = new TestSubscriber<String>(0L);
         FlowableOperator<String, String> o = new FlowableOperator<String, String>() {
             @Override
@@ -188,7 +188,7 @@ public void cancel() {
     }
 
     @Test
-    public void requestFromDecoupledOperatorThatRequestsN() throws Exception {
+    public void requestFromDecoupledOperatorThatRequestsN() throws Throwable {
         TestSubscriber<String> s = new TestSubscriber<String>(10L);
         final AtomicLong innerR = new AtomicLong();
         FlowableOperator<String, String> o = new FlowableOperator<String, String>() {
diff --git a/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java b/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
index d14aac229f..82c25e9591 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
@@ -51,8 +51,8 @@ public long maxElementsFromPublisher() {
 
     /**
      * Creates an Iterable with the specified number of elements or an infinite one if
-     * elements > Integer.MAX_VALUE.
-     * @param elements the number of elements to return, Integer.MAX_VALUE means an infinite sequence
+     * elements > {@link Integer#MAX_VALUE}.
+     * @param elements the number of elements to return, {@link Integer#MAX_VALUE} means an infinite sequence
      * @return the Iterable
      */
     protected Iterable<Long> iterate(long elements) {
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 3faefd13a5..886728709d 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -69,7 +69,7 @@ public enum TestHelper {
     public static final int RACE_LONG_LOOPS = 10000;
 
     /**
-     * Mocks a subscriber and prepares it to request Long.MAX_VALUE.
+     * Mocks a subscriber and prepares it to request {@link Long#MAX_VALUE}.
      * @param <T> the value type
      * @return the mocked subscriber
      */
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
index bdc1a6a1da..23297689b8 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
@@ -51,7 +51,7 @@ public class TestSubscriberEx<T>
     private QueueSubscription<T> qs;
 
     /**
-     * Constructs a non-forwarding TestSubscriber with an initial request value of Long.MAX_VALUE.
+     * Constructs a non-forwarding TestSubscriber with an initial request value of {@link Long#MAX_VALUE}.
      */
     public TestSubscriberEx() {
         this(EmptySubscriber.INSTANCE, Long.MAX_VALUE);

From e162d664d86639b97c214054aca346fc2ba37e33 Mon Sep 17 00:00:00 2001
From: Dmitry Volkov <42734936+dvolkovv@users.noreply.github.com>
Date: Sun, 22 Dec 2019 13:39:23 +0300
Subject: [PATCH 016/665] diamond operators in unit tests, flowable package
 (#6787)

---
 .../flowable/BlockingFlowableNextTest.java    |  6 +-
 .../BlockingFlowableToIteratorTest.java       |  8 +-
 .../operators/flowable/FlowableAllTest.java   | 10 +-
 .../operators/flowable/FlowableAmbTest.java   | 20 ++--
 .../operators/flowable/FlowableAnyTest.java   | 10 +-
 .../flowable/FlowableBlockingTest.java        | 38 ++++----
 .../flowable/FlowableBufferTest.java          | 89 ++++++++---------
 .../operators/flowable/FlowableCacheTest.java | 40 ++++----
 .../flowable/FlowableCombineLatestTest.java   | 18 ++--
 .../FlowableConcatDelayErrorTest.java         |  4 +-
 .../flowable/FlowableConcatMapEagerTest.java  | 12 +--
 .../FlowableConcatMapSchedulerTest.java       |  2 +-
 .../flowable/FlowableConcatMapTest.java       |  4 +-
 .../flowable/FlowableConcatTest.java          | 52 +++++-----
 .../FlowableConcatWithCompletableTest.java    |  8 +-
 .../flowable/FlowableConcatWithMaybeTest.java | 10 +-
 .../FlowableConcatWithSingleTest.java         |  8 +-
 .../flowable/FlowableCreateTest.java          |  2 +-
 .../flowable/FlowableDebounceTest.java        | 20 ++--
 .../flowable/FlowableDefaultIfEmptyTest.java  |  4 +-
 .../FlowableDelaySubscriptionOtherTest.java   | 16 ++--
 .../operators/flowable/FlowableDelayTest.java | 28 +++---
 .../flowable/FlowableDematerializeTest.java   |  2 +-
 .../flowable/FlowableDetachTest.java          | 22 ++---
 .../flowable/FlowableDoAfterNextTest.java     |  2 +-
 .../FlowableDoAfterTerminateTest.java         |  2 +-
 .../flowable/FlowableDoFinallyTest.java       |  4 +-
 .../flowable/FlowableDoOnEachTest.java        | 14 +--
 .../flowable/FlowableDoOnRequestTest.java     |  2 +-
 .../flowable/FlowableDoOnSubscribeTest.java   |  2 +-
 .../flowable/FlowableDoOnUnsubscribeTest.java | 12 +--
 .../flowable/FlowableElementAtTest.java       |  4 +-
 .../flowable/FlowableFilterTest.java          |  2 +-
 .../flowable/FlowableFlatMapMaybeTest.java    |  2 +-
 .../flowable/FlowableFlatMapSingleTest.java   |  2 +-
 .../flowable/FlowableFlatMapTest.java         | 18 ++--
 .../flowable/FlowableFlattenIterableTest.java | 58 +++++------
 .../flowable/FlowableForEachTest.java         |  4 +-
 .../flowable/FlowableFromArrayTest.java       |  2 +-
 .../flowable/FlowableFromCallableTest.java    |  4 +-
 .../flowable/FlowableFromIterableTest.java    | 38 ++++----
 .../flowable/FlowableFromSourceTest.java      |  2 +-
 .../flowable/FlowableFromSupplierTest.java    |  4 +-
 .../flowable/FlowableGroupByTest.java         | 95 ++++++++++---------
 .../flowable/FlowableIgnoreElementsTest.java  |  8 +-
 .../flowable/FlowableIntervalTest.java        |  2 +-
 .../flowable/FlowableMapNotificationTest.java |  6 +-
 .../operators/flowable/FlowableMapTest.java   |  6 +-
 .../flowable/FlowableMaterializeTest.java     | 16 ++--
 .../flowable/FlowableMergeDelayErrorTest.java | 14 +--
 .../FlowableMergeMaxConcurrentTest.java       | 48 +++++-----
 .../operators/flowable/FlowableMergeTest.java | 68 ++++++-------
 .../FlowableMergeWithCompletableTest.java     |  4 +-
 .../flowable/FlowableMergeWithMaybeTest.java  |  4 +-
 .../flowable/FlowableMergeWithSingleTest.java |  6 +-
 .../flowable/FlowableObserveOnTest.java       | 30 +++---
 ...wableOnBackpressureBufferStrategyTest.java |  2 +-
 .../FlowableOnBackpressureBufferTest.java     | 12 ++-
 .../FlowableOnBackpressureDropTest.java       |  6 +-
 .../FlowableOnBackpressureErrorTest.java      |  4 +-
 .../FlowableOnBackpressureLatestTest.java     |  8 +-
 ...wableOnErrorResumeNextViaFlowableTest.java |  2 +-
 ...wableOnErrorResumeNextViaFunctionTest.java |  8 +-
 .../flowable/FlowableOnErrorReturnTest.java   |  8 +-
 .../flowable/FlowablePublishFunctionTest.java | 12 +--
 .../FlowablePublishMulticastTest.java         | 38 ++++----
 .../flowable/FlowablePublishTest.java         | 66 ++++++-------
 .../flowable/FlowableRangeLongTest.java       | 22 ++---
 .../operators/flowable/FlowableRangeTest.java | 22 ++---
 .../flowable/FlowableRefCountTest.java        | 22 ++---
 .../flowable/FlowableRepeatTest.java          |  6 +-
 .../FlowableReplayEagerTruncateTest.java      | 88 ++++++++---------
 .../flowable/FlowableReplayTest.java          | 88 ++++++++---------
 .../operators/flowable/FlowableRetryTest.java | 30 +++---
 .../FlowableRetryWithPredicateTest.java       | 14 +--
 .../flowable/FlowableScalarXMapTest.java      | 24 ++---
 .../operators/flowable/FlowableScanTest.java  | 16 ++--
 .../flowable/FlowableSequenceEqualTest.java   |  4 +-
 .../flowable/FlowableSingleTest.java          |  8 +-
 .../flowable/FlowableSkipLastTest.java        |  2 +-
 .../operators/flowable/FlowableSkipTest.java  |  4 +-
 .../flowable/FlowableSubscribeOnTest.java     | 14 +--
 .../flowable/FlowableSwitchIfEmptyTest.java   |  8 +-
 .../flowable/FlowableSwitchTest.java          | 18 ++--
 .../flowable/FlowableTakeLastOneTest.java     | 10 +-
 .../flowable/FlowableTakeLastTest.java        |  6 +-
 .../flowable/FlowableTakeLastTimedTest.java   |  2 +-
 .../operators/flowable/FlowableTakeTest.java  | 12 +--
 .../operators/flowable/FlowableTakeTest2.java |  2 +-
 .../FlowableTakeUntilPredicateTest.java       |  4 +-
 .../flowable/FlowableTakeUntilTest.java       |  8 +-
 .../flowable/FlowableTakeWhileTest.java       |  6 +-
 .../flowable/FlowableTimeIntervalTest.java    |  6 +-
 .../flowable/FlowableTimeoutTests.java        | 26 ++---
 .../FlowableTimeoutWithSelectorTest.java      |  2 +-
 .../operators/flowable/FlowableTimerTest.java | 18 ++--
 .../flowable/FlowableTimestampTest.java       | 12 +--
 .../flowable/FlowableToCompletableTest.java   |  2 +-
 .../flowable/FlowableToFutureTest.java        | 20 ++--
 .../flowable/FlowableToListTest.java          |  2 +-
 .../operators/flowable/FlowableToMapTest.java | 24 ++---
 .../flowable/FlowableToMultimapTest.java      | 60 ++++++------
 .../flowable/FlowableToSortedListTest.java    |  2 +-
 .../flowable/FlowableUnsubscribeOnTest.java   |  8 +-
 .../operators/flowable/FlowableUsingTest.java | 12 +--
 .../FlowableWindowWithFlowableTest.java       | 32 +++----
 .../flowable/FlowableWindowWithSizeTest.java  | 22 ++---
 ...lowableWindowWithStartEndFlowableTest.java | 14 +--
 .../flowable/FlowableWindowWithTimeTest.java  | 26 ++---
 .../flowable/FlowableWithLatestFromTest.java  | 50 +++++-----
 .../operators/flowable/FlowableZipTest.java   | 30 +++---
 111 files changed, 948 insertions(+), 944 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
index 8bc31fa85e..35c1501ae0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
@@ -352,7 +352,7 @@ public void interrupt() {
 
     @Test
     public void nextObserverError() {
-        NextSubscriber<Integer> no = new NextSubscriber<Integer>();
+        NextSubscriber<Integer> no = new NextSubscriber<>();
 
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -366,7 +366,7 @@ public void nextObserverError() {
 
     @Test
     public void nextObserverOnNext() throws Exception {
-        NextSubscriber<Integer> no = new NextSubscriber<Integer>();
+        NextSubscriber<Integer> no = new NextSubscriber<>();
 
         no.setWaiting();
         no.onNext(Notification.createOnNext(1));
@@ -379,7 +379,7 @@ public void nextObserverOnNext() throws Exception {
 
     @Test
     public void nextObserverOnCompleteOnNext() throws Exception {
-        NextSubscriber<Integer> no = new NextSubscriber<Integer>();
+        NextSubscriber<Integer> no = new NextSubscriber<>();
 
         no.setWaiting();
         no.onNext(Notification.<Integer>createOnComplete());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
index 20bfcf9962..64b22b1785 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
@@ -117,13 +117,13 @@ public void remove() {
 
     @Test(expected = UnsupportedOperationException.class)
     public void remove() {
-        BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<Integer>(128);
+        BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<>(128);
         it.remove();
     }
 
     @Test
     public void dispose() {
-        BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<Integer>(128);
+        BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<>(128);
 
         assertFalse(it.isDisposed());
 
@@ -134,7 +134,7 @@ public void dispose() {
 
     @Test
     public void interruptWait() {
-        BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<Integer>(128);
+        BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<>(128);
 
         try {
             Thread.currentThread().interrupt();
@@ -147,7 +147,7 @@ public void interruptWait() {
 
     @Test(expected = NoSuchElementException.class)
     public void emptyThrowsNoSuch() {
-        BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<Integer>(128);
+        BlockingFlowableIterator<Integer> it = new BlockingFlowableIterator<>(128);
         it.onComplete();
         it.next();
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java
index 7515b66cb0..387a2017dd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java
@@ -146,7 +146,7 @@ public Publisher<Integer> apply(Boolean t1) {
 
     @Test
     public void backpressureIfOneRequestedOneShouldBeDelivered() {
-        TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
+        TestObserverEx<Boolean> to = new TestObserverEx<>();
 
         Flowable.empty().all(new Predicate<Object>() {
             @Override
@@ -164,7 +164,7 @@ public boolean test(Object t) {
 
     @Test
     public void predicateThrowsExceptionAndValueInCauseMessage() {
-        TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
+        TestObserverEx<Boolean> to = new TestObserverEx<>();
 
         final IllegalArgumentException ex = new IllegalArgumentException();
 
@@ -306,7 +306,7 @@ public Publisher<Integer> apply(Boolean t1) {
 
     @Test
     public void backpressureIfNoneRequestedNoneShouldBeDeliveredFlowable() {
-        TestSubscriber<Boolean> ts = new TestSubscriber<Boolean>(0L);
+        TestSubscriber<Boolean> ts = new TestSubscriber<>(0L);
         Flowable.empty().all(new Predicate<Object>() {
             @Override
             public boolean test(Object t1) {
@@ -323,7 +323,7 @@ public boolean test(Object t1) {
 
     @Test
     public void backpressureIfOneRequestedOneShouldBeDeliveredFlowable() {
-        TestSubscriberEx<Boolean> ts = new TestSubscriberEx<Boolean>(1L);
+        TestSubscriberEx<Boolean> ts = new TestSubscriberEx<>(1L);
 
         Flowable.empty().all(new Predicate<Object>() {
             @Override
@@ -343,7 +343,7 @@ public boolean test(Object t) {
 
     @Test
     public void predicateThrowsExceptionAndValueInCauseMessageFlowable() {
-        TestSubscriberEx<Boolean> ts = new TestSubscriberEx<Boolean>();
+        TestSubscriberEx<Boolean> ts = new TestSubscriberEx<>();
 
         final IllegalArgumentException ex = new IllegalArgumentException();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
index 72073f3150..42cba044db 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
@@ -174,7 +174,7 @@ public void amb3() {
     @SuppressWarnings("unchecked")
     @Test
     public void producerRequestThroughAmb() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
         ts.request(3);
         final AtomicLong requested1 = new AtomicLong();
         final AtomicLong requested2 = new AtomicLong();
@@ -225,7 +225,7 @@ public void cancel() {
 
     @Test
     public void backpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(0, Flowable.bufferSize() * 2)
                 .ambWith(Flowable.range(0, Flowable.bufferSize() * 2))
                 .observeOn(Schedulers.computation()) // observeOn has a backpressured RxRingBuffer
@@ -254,7 +254,7 @@ public void accept(Subscription s) {
         //this stream emits second
         Flowable<Integer> f2 = Flowable.just(1).doOnSubscribe(incrementer)
                 .delay(100, TimeUnit.MILLISECONDS).subscribeOn(Schedulers.computation());
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.ambArray(f1, f2).subscribe(ts);
         ts.request(1);
         ts.awaitDone(5, TimeUnit.SECONDS);
@@ -271,7 +271,7 @@ public void secondaryRequestsPropagatedToChildren() throws InterruptedException
         //this stream emits second
         Flowable<Integer> f2 = Flowable.fromArray(4, 5, 6)
                 .delay(200, TimeUnit.MILLISECONDS).subscribeOn(Schedulers.computation());
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1L);
 
         Flowable.ambArray(f1, f2).subscribe(ts);
         // before first emission request 20 more
@@ -309,7 +309,7 @@ public void ambCancelsOthers() {
         PublishProcessor<Integer> source2 = PublishProcessor.create();
         PublishProcessor<Integer> source3 = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.ambArray(source1, source2, source3).subscribe(ts);
 
@@ -327,8 +327,8 @@ public void ambCancelsOthers() {
 
     @Test
     public void multipleUse() {
-        TestSubscriber<Long> ts1 = new TestSubscriber<Long>();
-        TestSubscriber<Long> ts2 = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts1 = new TestSubscriber<>();
+        TestSubscriber<Long> ts2 = new TestSubscriber<>();
 
         Flowable<Long> amb = Flowable.timer(100, TimeUnit.MILLISECONDS).ambWith(Flowable.timer(200, TimeUnit.MILLISECONDS));
 
@@ -541,7 +541,7 @@ public void nullIterableElement() {
 
     @Test
     public void iteratorThrows() {
-        Flowable.amb(new CrashingMappedIterable<Flowable<Integer>>(1, 100, 100, new Function<Integer, Flowable<Integer>>() {
+        Flowable.amb(new CrashingMappedIterable<>(1, 100, 100, new Function<Integer, Flowable<Integer>>() {
             @Override
             public Flowable<Integer> apply(Integer v) throws Exception {
                 return Flowable.never();
@@ -550,7 +550,7 @@ public Flowable<Integer> apply(Integer v) throws Exception {
         .to(TestHelper.<Integer>testConsumer())
         .assertFailureAndMessage(TestException.class, "iterator()");
 
-        Flowable.amb(new CrashingMappedIterable<Flowable<Integer>>(100, 1, 100, new Function<Integer, Flowable<Integer>>() {
+        Flowable.amb(new CrashingMappedIterable<>(100, 1, 100, new Function<Integer, Flowable<Integer>>() {
             @Override
             public Flowable<Integer> apply(Integer v) throws Exception {
                 return Flowable.never();
@@ -559,7 +559,7 @@ public Flowable<Integer> apply(Integer v) throws Exception {
         .to(TestHelper.<Integer>testConsumer())
         .assertFailureAndMessage(TestException.class, "hasNext()");
 
-        Flowable.amb(new CrashingMappedIterable<Flowable<Integer>>(100, 100, 1, new Function<Integer, Flowable<Integer>>() {
+        Flowable.amb(new CrashingMappedIterable<>(100, 100, 1, new Function<Integer, Flowable<Integer>>() {
             @Override
             public Flowable<Integer> apply(Integer v) throws Exception {
                 return Flowable.never();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java
index 936d74f5e0..e121cbc924 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java
@@ -239,7 +239,7 @@ public Publisher<Integer> apply(Boolean t1) {
 
     @Test
     public void backpressureIfOneRequestedOneShouldBeDelivered() {
-        TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
+        TestObserverEx<Boolean> to = new TestObserverEx<>();
         Flowable.just(1).any(new Predicate<Integer>() {
             @Override
             public boolean test(Integer v) {
@@ -255,7 +255,7 @@ public boolean test(Integer v) {
 
     @Test
     public void predicateThrowsExceptionAndValueInCauseMessage() {
-        TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
+        TestObserverEx<Boolean> to = new TestObserverEx<>();
         final IllegalArgumentException ex = new IllegalArgumentException();
 
         Flowable.just("Boo!").any(new Predicate<String>() {
@@ -488,7 +488,7 @@ public Publisher<Integer> apply(Boolean t1) {
 
     @Test
     public void backpressureIfNoneRequestedNoneShouldBeDeliveredFlowable() {
-        TestSubscriber<Boolean> ts = new TestSubscriber<Boolean>(0L);
+        TestSubscriber<Boolean> ts = new TestSubscriber<>(0L);
 
         Flowable.just(1).any(new Predicate<Integer>() {
             @Override
@@ -505,7 +505,7 @@ public boolean test(Integer t) {
 
     @Test
     public void backpressureIfOneRequestedOneShouldBeDeliveredFlowable() {
-        TestSubscriberEx<Boolean> ts = new TestSubscriberEx<Boolean>(1L);
+        TestSubscriberEx<Boolean> ts = new TestSubscriberEx<>(1L);
         Flowable.just(1).any(new Predicate<Integer>() {
             @Override
             public boolean test(Integer v) {
@@ -521,7 +521,7 @@ public boolean test(Integer v) {
 
     @Test
     public void predicateThrowsExceptionAndValueInCauseMessageFlowable() {
-        TestSubscriberEx<Boolean> ts = new TestSubscriberEx<Boolean>();
+        TestSubscriberEx<Boolean> ts = new TestSubscriberEx<>();
         final IllegalArgumentException ex = new IllegalArgumentException();
 
         Flowable.just("Boo!").any(new Predicate<String>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java
index cb767ef718..db560e0327 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java
@@ -49,7 +49,7 @@ public void blockingFirstDefault() {
 
     @Test
     public void blockingSubscribeConsumer() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Flowable.range(1, 5)
         .subscribeOn(Schedulers.computation())
@@ -65,7 +65,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void boundedBlockingSubscribeConsumer() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Flowable.range(1, 5)
                 .subscribeOn(Schedulers.computation())
@@ -81,7 +81,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void boundedBlockingSubscribeConsumerBufferExceed() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Flowable.range(1, 5)
                 .subscribeOn(Schedulers.computation())
@@ -97,7 +97,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void blockingSubscribeConsumerConsumer() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Flowable.range(1, 5)
         .subscribeOn(Schedulers.computation())
@@ -113,7 +113,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void boundedBlockingSubscribeConsumerConsumer() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Flowable.range(1, 5)
                 .subscribeOn(Schedulers.computation())
@@ -129,7 +129,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void boundedBlockingSubscribeConsumerConsumerBufferExceed() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Flowable.range(1, 5)
                 .subscribeOn(Schedulers.computation())
@@ -145,7 +145,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void blockingSubscribeConsumerConsumerError() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         TestException ex = new TestException();
 
@@ -165,7 +165,7 @@ public void accept(Object v) throws Exception {
 
     @Test
     public void boundedBlockingSubscribeConsumerConsumerError() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         TestException ex = new TestException();
 
@@ -185,7 +185,7 @@ public void accept(Object v) throws Exception {
 
     @Test
     public void blockingSubscribeConsumerConsumerAction() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Consumer<Object> cons = new Consumer<Object>() {
             @Override
@@ -208,7 +208,7 @@ public void run() throws Exception {
 
     @Test
     public void boundedBlockingSubscribeConsumerConsumerAction() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Consumer<Object> cons = new Consumer<Object>() {
             @Override
@@ -233,7 +233,7 @@ public void run() throws Exception {
 
     @Test
     public void boundedBlockingSubscribeConsumerConsumerActionBufferExceed() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Consumer<Object> cons = new Consumer<Object>() {
             @Override
@@ -258,7 +258,7 @@ public void run() throws Exception {
 
     @Test
     public void boundedBlockingSubscribeConsumerConsumerActionBufferExceedMillionItem() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Consumer<Object> cons = new Consumer<Object>() {
             @Override
@@ -283,7 +283,7 @@ public void run() throws Exception {
 
     @Test
     public void blockingSubscribeObserver() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Flowable.range(1, 5)
         .subscribeOn(Schedulers.computation())
@@ -316,7 +316,7 @@ public void onComplete() {
 
     @Test
     public void blockingSubscribeObserverError() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         final TestException ex = new TestException();
 
@@ -430,7 +430,7 @@ public void subscribe(Subscriber<? super Integer> s) {
 
     @Test
     public void interrupt() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Thread.currentThread().interrupt();
 
@@ -451,7 +451,7 @@ public void blockingSingleEmpty() {
 
     @Test
     public void onCompleteDelayed() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.empty().delay(100, TimeUnit.MILLISECONDS)
         .blockingSubscribe(ts);
@@ -466,7 +466,7 @@ public void utilityClass() {
 
     @Test
     public void disposeUpFront() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         ts.cancel();
         Flowable.just(1).blockingSubscribe(ts);
 
@@ -476,7 +476,7 @@ public void disposeUpFront() {
     @SuppressWarnings("rawtypes")
     @Test
     public void delayed() throws Exception {
-        final TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        final TestSubscriber<Object> ts = new TestSubscriber<>();
         final Subscriber[] s = { null };
 
         Schedulers.single().scheduleDirect(new Runnable() {
@@ -506,7 +506,7 @@ protected void subscribeActual(Subscriber<? super Integer> subscriber) {
     @Test
     public void blockinsSubscribeCancelAsync() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
index 781de93fb0..707d98e0d4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
@@ -272,7 +272,7 @@ public void accept(List<Integer> t1) {
     }
 
     private List<String> list(String... args) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (String arg : args) {
             list.add(arg);
         }
@@ -302,7 +302,7 @@ public void bufferStopsWhenUnsubscribed1() {
         Flowable<Integer> source = Flowable.never();
 
         Subscriber<List<Integer>> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>(subscriber, 0L);
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>(subscriber, 0L);
 
         source.buffer(100, 200, TimeUnit.MILLISECONDS, scheduler)
         .doOnNext(new Consumer<List<Integer>>() {
@@ -730,7 +730,7 @@ public Flowable<Integer> apply(Integer t1) {
 
     @Test
     public void producerRequestThroughBufferWithSize1() {
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>(3L);
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>(3L);
 
         final AtomicLong requested = new AtomicLong();
         Flowable.unsafeCreate(new Publisher<Integer>() {
@@ -761,7 +761,7 @@ public void cancel() {
 
     @Test
     public void producerRequestThroughBufferWithSize2() {
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
         final AtomicLong requested = new AtomicLong();
 
         Flowable.unsafeCreate(new Publisher<Integer>() {
@@ -789,7 +789,7 @@ public void cancel() {
 
     @Test
     public void producerRequestThroughBufferWithSize3() {
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>(3L);
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>(3L);
         final AtomicLong requested = new AtomicLong();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
@@ -818,7 +818,7 @@ public void cancel() {
 
     @Test
     public void producerRequestThroughBufferWithSize4() {
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
         final AtomicLong requested = new AtomicLong();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
@@ -845,7 +845,7 @@ public void cancel() {
 
     @Test
     public void producerRequestOverflowThroughBufferWithSize1() {
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>(Long.MAX_VALUE >> 1);
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>(Long.MAX_VALUE >> 1);
 
         final AtomicLong requested = new AtomicLong();
 
@@ -874,7 +874,7 @@ public void cancel() {
 
     @Test
     public void producerRequestOverflowThroughBufferWithSize2() {
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>(Long.MAX_VALUE >> 1);
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>(Long.MAX_VALUE >> 1);
 
         final AtomicLong requested = new AtomicLong();
 
@@ -1249,7 +1249,7 @@ public void bufferBoundaryHint() {
     }
 
     static HashSet<Integer> set(Integer... values) {
-        return new HashSet<Integer>(Arrays.asList(values));
+        return new HashSet<>(Arrays.asList(values));
     }
 
     @SuppressWarnings("unchecked")
@@ -1259,7 +1259,7 @@ public void bufferIntoCustomCollection() {
         .buffer(3, new Supplier<Collection<Integer>>() {
             @Override
             public Collection<Integer> get() throws Exception {
-                return new HashSet<Integer>();
+                return new HashSet<>();
             }
         })
         .test()
@@ -1273,7 +1273,7 @@ public void bufferSkipIntoCustomCollection() {
         .buffer(3, 3, new Supplier<Collection<Integer>>() {
             @Override
             public Collection<Integer> get() throws Exception {
-                return new HashSet<Integer>();
+                return new HashSet<>();
             }
         })
         .test()
@@ -1317,7 +1317,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     return null;
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         }, false)
@@ -1337,7 +1337,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     return null;
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         }, false)
@@ -1357,7 +1357,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     return null;
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         })
@@ -1419,7 +1419,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     throw new TestException();
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         }, false)
@@ -1439,7 +1439,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     throw new TestException();
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         }, false)
@@ -1459,7 +1459,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     throw new TestException();
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         })
@@ -1497,7 +1497,7 @@ public List<Integer> get() throws Exception {
                 if (++calls == 2) {
                     throw new TestException();
                 }
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         })
         .test()
@@ -1515,7 +1515,7 @@ public List<Integer> get() throws Exception {
                 if (++calls == 1) {
                     throw new TestException();
                 }
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         })
         .test()
@@ -1533,7 +1533,7 @@ public List<Integer> get() throws Exception {
                 if (++calls == 2) {
                     throw new TestException();
                 }
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         })
         .test()
@@ -1624,7 +1624,7 @@ public List<Integer> get() throws Exception {
                 if (++calls == 2) {
                     throw new TestException();
                 }
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, true)
         .test();
@@ -2204,7 +2204,7 @@ public List<Integer> get() throws Exception {
                 if (++calls == 2) {
                     throw new TestException();
                 }
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }).test();
 
@@ -2226,7 +2226,7 @@ protected void subscribeActual(Subscriber<? super Integer> subscriber) {
             }
         };
 
-        final AtomicReference<Subscriber<? super Integer>> ref = new AtomicReference<Subscriber<? super Integer>>();
+        final AtomicReference<Subscriber<? super Integer>> ref = new AtomicReference<>();
         Flowable<Integer> b = new Flowable<Integer>() {
             @Override
             protected void subscribeActual(Subscriber<? super Integer> subscriber) {
@@ -2303,10 +2303,10 @@ public void timedCancelledUpfront() {
     public void timedInternalState() {
         TestScheduler sch = new TestScheduler();
 
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
-        BufferExactUnboundedSubscriber<Integer, List<Integer>> sub = new BufferExactUnboundedSubscriber<Integer, List<Integer>>(
-                ts, Functions.justSupplier((List<Integer>)new ArrayList<Integer>()), 1, TimeUnit.SECONDS, sch);
+        BufferExactUnboundedSubscriber<Integer, List<Integer>> sub = new BufferExactUnboundedSubscriber<>(
+                ts, Functions.justSupplier((List<Integer>) new ArrayList<Integer>()), 1, TimeUnit.SECONDS, sch);
 
         sub.onSubscribe(new BooleanSubscription());
 
@@ -2322,7 +2322,7 @@ public void timedInternalState() {
 
         assertTrue(sub.isDisposed());
 
-        sub.buffer = new ArrayList<Integer>();
+        sub.buffer = new ArrayList<>();
         sub.enter();
         sub.onComplete();
     }
@@ -2353,10 +2353,10 @@ public Publisher<List<Object>> apply(Flowable<Object> f)
     public void timedSkipInternalState() {
         TestScheduler sch = new TestScheduler();
 
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
-        BufferSkipBoundedSubscriber<Integer, List<Integer>> sub = new BufferSkipBoundedSubscriber<Integer, List<Integer>>(
-                ts, Functions.justSupplier((List<Integer>)new ArrayList<Integer>()), 1, 1, TimeUnit.SECONDS, sch.createWorker());
+        BufferSkipBoundedSubscriber<Integer, List<Integer>> sub = new BufferSkipBoundedSubscriber<>(
+                ts, Functions.justSupplier((List<Integer>) new ArrayList<Integer>()), 1, 1, TimeUnit.SECONDS, sch.createWorker());
 
         sub.onSubscribe(new BooleanSubscription());
 
@@ -2372,19 +2372,20 @@ public void timedSkipInternalState() {
     public void timedSkipCancelWhenSecondBuffer() {
         TestScheduler sch = new TestScheduler();
 
-        final TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        final TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
-        BufferSkipBoundedSubscriber<Integer, List<Integer>> sub = new BufferSkipBoundedSubscriber<Integer, List<Integer>>(
+        BufferSkipBoundedSubscriber<Integer, List<Integer>> sub = new BufferSkipBoundedSubscriber<>(
                 ts, new Supplier<List<Integer>>() {
-                    int calls;
-                    @Override
-                    public List<Integer> get() throws Exception {
-                        if (++calls == 2) {
-                            ts.cancel();
-                        }
-                        return new ArrayList<Integer>();
-                    }
-                }, 1, 1, TimeUnit.SECONDS, sch.createWorker());
+            int calls;
+
+            @Override
+            public List<Integer> get() throws Exception {
+                if (++calls == 2) {
+                    ts.cancel();
+                }
+                return new ArrayList<>();
+            }
+        }, 1, 1, TimeUnit.SECONDS, sch.createWorker());
 
         sub.onSubscribe(new BooleanSubscription());
 
@@ -2397,11 +2398,11 @@ public List<Integer> get() throws Exception {
     public void timedSizeBufferAlreadyCleared() {
         TestScheduler sch = new TestScheduler();
 
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
         BufferExactBoundedSubscriber<Integer, List<Integer>> sub =
-                new BufferExactBoundedSubscriber<Integer, List<Integer>>(
-                        ts, Functions.justSupplier((List<Integer>)new ArrayList<Integer>()),
+                new BufferExactBoundedSubscriber<>(
+                        ts, Functions.justSupplier((List<Integer>) new ArrayList<Integer>()),
                         1, TimeUnit.SECONDS, 1, false, sch.createWorker())
         ;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
index e13ef40f0c..a317055889 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
@@ -35,11 +35,11 @@
 public class FlowableCacheTest extends RxJavaTest {
     @Test
     public void coldReplayNoBackpressure() {
-        FlowableCache<Integer> source = new FlowableCache<Integer>(Flowable.range(0, 1000), 16);
+        FlowableCache<Integer> source = new FlowableCache<>(Flowable.range(0, 1000), 16);
 
         assertFalse("Source is connected!", source.isConnected());
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         source.subscribe(ts);
 
@@ -58,11 +58,11 @@ public void coldReplayNoBackpressure() {
 
     @Test
     public void coldReplayBackpressure() {
-        FlowableCache<Integer> source = new FlowableCache<Integer>(Flowable.range(0, 1000), 16);
+        FlowableCache<Integer> source = new FlowableCache<>(Flowable.range(0, 1000), 16);
 
         assertFalse("Source is connected!", source.isConnected());
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
         ts.request(10);
 
         source.subscribe(ts);
@@ -145,9 +145,9 @@ public void unsubscribeSource() throws Throwable {
 
     @Test
     public void take() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        FlowableCache<Integer> cached = new FlowableCache<Integer>(Flowable.range(1, 100), 16);
+        FlowableCache<Integer> cached = new FlowableCache<>(Flowable.range(1, 100), 16);
         cached.take(10).subscribe(ts);
 
         ts.assertNoErrors();
@@ -160,9 +160,9 @@ public void take() {
     public void async() {
         Flowable<Integer> source = Flowable.range(1, 10000);
         for (int i = 0; i < 100; i++) {
-            TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
-            FlowableCache<Integer> cached = new FlowableCache<Integer>(source, 16);
+            FlowableCache<Integer> cached = new FlowableCache<>(source, 16);
 
             cached.observeOn(Schedulers.computation()).subscribe(ts1);
 
@@ -171,7 +171,7 @@ public void async() {
             ts1.assertComplete();
             assertEquals(10000, ts1.values().size());
 
-            TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts2 = new TestSubscriber<>();
             cached.observeOn(Schedulers.computation()).subscribe(ts2);
 
             ts2.awaitDone(2, TimeUnit.SECONDS);
@@ -186,18 +186,18 @@ public void asyncComeAndGo() {
         Flowable<Long> source = Flowable.interval(1, 1, TimeUnit.MILLISECONDS)
                 .take(1000)
                 .subscribeOn(Schedulers.io());
-        FlowableCache<Long> cached = new FlowableCache<Long>(source, 16);
+        FlowableCache<Long> cached = new FlowableCache<>(source, 16);
 
         Flowable<Long> output = cached.observeOn(Schedulers.computation());
 
-        List<TestSubscriber<Long>> list = new ArrayList<TestSubscriber<Long>>(100);
+        List<TestSubscriber<Long>> list = new ArrayList<>(100);
         for (int i = 0; i < 100; i++) {
-            TestSubscriber<Long> ts = new TestSubscriber<Long>();
+            TestSubscriber<Long> ts = new TestSubscriber<>();
             list.add(ts);
             output.skip(i * 10).take(10).subscribe(ts);
         }
 
-        List<Long> expected = new ArrayList<Long>();
+        List<Long> expected = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
             expected.add((long)(i - 10));
         }
@@ -231,7 +231,7 @@ public void subscribe(Subscriber<? super Integer> t) {
             }
         });
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         firehose.cache().observeOn(Schedulers.computation()).takeLast(100).subscribe(ts);
 
         ts.awaitDone(3, TimeUnit.SECONDS);
@@ -247,14 +247,14 @@ public void valuesAndThenError() {
                 .concatWith(Flowable.<Integer>error(new TestException()))
                 .cache();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         source.subscribe(ts);
 
         ts.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
         ts.assertNotComplete();
         ts.assertError(TestException.class);
 
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>();
         source.subscribe(ts2);
 
         ts2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
@@ -294,7 +294,7 @@ public void subscribeEmitRace() {
 
             cache.test();
 
-            final TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            final TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -432,8 +432,8 @@ public void subscribeSubscribeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final Flowable<Integer> cache = Flowable.range(1, 500).cache();
 
-            final TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
-            final TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>();
+            final TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
+            final TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -476,7 +476,7 @@ public void subscribeCompleteRace() {
 
             cache.test();
 
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
index 836fd8a4c3..8ed8197138 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
@@ -437,8 +437,8 @@ public List<Object> apply(Object[] args) {
         };
         for (int i = 1; i <= n; i++) {
             System.out.println("test1ToNSources: " + i + " sources");
-            List<Flowable<Integer>> sources = new ArrayList<Flowable<Integer>>();
-            List<Object> values = new ArrayList<Object>();
+            List<Flowable<Integer>> sources = new ArrayList<>();
+            List<Object> values = new ArrayList<>();
             for (int j = 0; j < i; j++) {
                 sources.add(Flowable.just(j));
                 values.add(j);
@@ -468,8 +468,8 @@ public List<Object> apply(Object[] args) {
         };
         for (int i = 1; i <= n; i++) {
             System.out.println("test1ToNSourcesScheduled: " + i + " sources");
-            List<Flowable<Integer>> sources = new ArrayList<Flowable<Integer>>();
-            List<Object> values = new ArrayList<Object>();
+            List<Flowable<Integer>> sources = new ArrayList<>();
+            List<Object> values = new ArrayList<>();
             for (int j = 0; j < i; j++) {
                 sources.add(Flowable.just(j).subscribeOn(Schedulers.io()));
                 values.add(j);
@@ -749,7 +749,7 @@ public void backpressure() {
         BiFunction<String, Integer, String> combineLatestFunction = getConcatStringIntegerCombineLatestFunction();
 
         int num = Flowable.bufferSize() * 4;
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Flowable.combineLatest(
                 Flowable.just("one", "two"),
                 Flowable.range(2, num),
@@ -784,7 +784,7 @@ public void accept(Notification<Long> n) {
                     }
                 }).take(SIZE);
 
-        TestSubscriber<Long> ts = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts = new TestSubscriber<>();
 
         Flowable.combineLatest(timer, Flowable.<Integer> never(), new BiFunction<Long, Integer, Long>() {
             @Override
@@ -889,7 +889,7 @@ public Integer apply(Object[] args) {
     public void combineMany() {
         int n = Flowable.bufferSize() * 3;
 
-        List<Flowable<Integer>> sources = new ArrayList<Flowable<Integer>>();
+        List<Flowable<Integer>> sources = new ArrayList<>();
 
         StringBuilder expected = new StringBuilder(n * 2);
 
@@ -1066,7 +1066,7 @@ public void combineLatestArrayNSources() {
         for (int i = 1; i < 100; i++) {
             Flowable<Integer>[] sources = new Flowable[i];
             Arrays.fill(sources, Flowable.just(1));
-            List<Object> expected = new ArrayList<Object>(i);
+            List<Object> expected = new ArrayList<>(i);
             for (int j = 1; j <= i; j++) {
                 expected.add(1);
             }
@@ -1207,7 +1207,7 @@ public Object apply(Object a, Object b) throws Exception {
 
     @Test
     public void cancelWhileSubscribing() {
-        final TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        final TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.combineLatest(
                 Flowable.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
index e5ce3766ea..0543eb1b0f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
@@ -232,7 +232,7 @@ public void concatDelayErrorFlowable() {
 
     @Test
     public void concatDelayErrorFlowableError() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.concatDelayError(
                 withError(Flowable.just(withError(Flowable.just(1)), withError(Flowable.just(2)))))
@@ -269,7 +269,7 @@ public void concatDelayErrorIterable() {
     @SuppressWarnings("unchecked")
     @Test
     public void concatDelayErrorIterableError() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.concatDelayError(
                 Arrays.asList(withError(Flowable.just(1)), withError(Flowable.just(2))))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
index 5f41cce3dc..5c052d616c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
@@ -276,8 +276,8 @@ public Flowable<Integer> apply(Integer t) {
 
     @Before
     public void before() {
-        ts = new TestSubscriber<Object>();
-        tsBp = new TestSubscriber<Object>(0L);
+        ts = new TestSubscriber<>();
+        tsBp = new TestSubscriber<>(0L);
     }
 
     @Test
@@ -642,7 +642,7 @@ public void accept(Integer t) {
 
     @Test
     public void maxConcurrent5() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
         Flowable.range(1, 100).doOnRequest(new LongConsumer() {
             @Override
             public void accept(long reqCount) {
@@ -955,7 +955,7 @@ public void run() {
 
     @Test
     public void mapperCancels() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1).hide()
         .concatMapEager(new Function<Integer, Flowable<Integer>>() {
@@ -1097,7 +1097,7 @@ public void drainCancelRaceOnEmpty() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
             Flowable.just(1)
             .concatMapEager(Functions.justFunction(pp))
@@ -1157,7 +1157,7 @@ public Flowable<Integer> apply(Integer i) throws Exception {
     public void maxConcurrencyOf2() {
         List<Integer>[] list = new ArrayList[100];
         for (int i = 0; i < 100; i++) {
-            List<Integer> lst = new ArrayList<Integer>();
+            List<Integer> lst = new ArrayList<>();
             list[i] = lst;
             for (int k = 1; k <= 10; k++) {
                 lst.add((i) * 10 + k);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
index fc8d665559..0cd7562199 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
@@ -366,7 +366,7 @@ public void concatMapRangeAsyncLoopIssue2876() {
             if (i % 1000 == 0) {
                 System.out.println("concatMapRangeAsyncLoop > " + i);
             }
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
             Flowable.range(0, 1000)
             .concatMap(new Function<Integer, Flowable<Integer>>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
index 74394b122e..e815c3675e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
@@ -33,8 +33,8 @@ public class FlowableConcatMapTest extends RxJavaTest {
 
     @Test
     public void weakSubscriptionRequest() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
-        WeakScalarSubscription<Integer> ws = new WeakScalarSubscription<Integer>(1, ts);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
+        WeakScalarSubscription<Integer> ws = new WeakScalarSubscription<>(1, ts);
         ts.onSubscribe(ws);
 
         ws.request(0);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
index a0b14ead5a..67451d6097 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
@@ -65,7 +65,7 @@ public void concatWithList() {
 
         final Flowable<String> odds = Flowable.fromArray(o);
         final Flowable<String> even = Flowable.fromArray(e);
-        final List<Flowable<String>> list = new ArrayList<Flowable<String>>();
+        final List<Flowable<String>> list = new ArrayList<>();
         list.add(odds);
         list.add(even);
         Flowable<String> concat = Flowable.concat(Flowable.fromIterable(list));
@@ -110,8 +110,8 @@ public void subscribe(Subscriber<? super Flowable<String>> subscriber) {
     public void simpleAsyncConcat() {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
 
-        TestObservable<String> o1 = new TestObservable<String>("one", "two", "three");
-        TestObservable<String> o2 = new TestObservable<String>("four", "five", "six");
+        TestObservable<String> o1 = new TestObservable<>("one", "two", "three");
+        TestObservable<String> o2 = new TestObservable<>("four", "five", "six");
 
         Flowable.concat(Flowable.unsafeCreate(o1), Flowable.unsafeCreate(o2)).subscribe(subscriber);
 
@@ -150,12 +150,12 @@ public void nestedAsyncConcatLoop() throws Throwable {
     public void nestedAsyncConcat() throws InterruptedException {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
 
-        final TestObservable<String> o1 = new TestObservable<String>("one", "two", "three");
-        final TestObservable<String> o2 = new TestObservable<String>("four", "five", "six");
-        final TestObservable<String> o3 = new TestObservable<String>("seven", "eight", "nine");
+        final TestObservable<String> o1 = new TestObservable<>("one", "two", "three");
+        final TestObservable<String> o2 = new TestObservable<>("four", "five", "six");
+        final TestObservable<String> o3 = new TestObservable<>("seven", "eight", "nine");
         final CountDownLatch allowThird = new CountDownLatch(1);
 
-        final AtomicReference<Thread> parent = new AtomicReference<Thread>();
+        final AtomicReference<Thread> parent = new AtomicReference<>();
         final CountDownLatch parentHasStarted = new CountDownLatch(1);
         final CountDownLatch parentHasFinished = new CountDownLatch(1);
 
@@ -284,7 +284,7 @@ public void blockedObservableOfObservables() {
         final CountDownLatch callOnce = new CountDownLatch(1);
         final CountDownLatch okToContinue = new CountDownLatch(1);
         @SuppressWarnings("unchecked")
-        TestObservable<Flowable<String>> observableOfObservables = new TestObservable<Flowable<String>>(callOnce, okToContinue, odds, even);
+        TestObservable<Flowable<String>> observableOfObservables = new TestObservable<>(callOnce, okToContinue, odds, even);
         Flowable<String> concatF = Flowable.concat(Flowable.unsafeCreate(observableOfObservables));
         concatF.subscribe(subscriber);
         try {
@@ -316,14 +316,14 @@ public void blockedObservableOfObservables() {
 
     @Test
     public void concatConcurrentWithInfinity() {
-        final TestObservable<String> w1 = new TestObservable<String>("one", "two", "three");
+        final TestObservable<String> w1 = new TestObservable<>("one", "two", "three");
         //This observable will send "hello" MAX_VALUE time.
-        final TestObservable<String> w2 = new TestObservable<String>("hello", Integer.MAX_VALUE);
+        final TestObservable<String> w2 = new TestObservable<>("hello", Integer.MAX_VALUE);
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
 
         @SuppressWarnings("unchecked")
-        TestObservable<Flowable<String>> observableOfObservables = new TestObservable<Flowable<String>>(Flowable.unsafeCreate(w1), Flowable.unsafeCreate(w2));
+        TestObservable<Flowable<String>> observableOfObservables = new TestObservable<>(Flowable.unsafeCreate(w1), Flowable.unsafeCreate(w2));
         Flowable<String> concatF = Flowable.concat(Flowable.unsafeCreate(observableOfObservables));
 
         concatF.take(50).subscribe(subscriber);
@@ -351,8 +351,8 @@ public void concatNonBlockingObservables() {
         final CountDownLatch okToContinueW1 = new CountDownLatch(1);
         final CountDownLatch okToContinueW2 = new CountDownLatch(1);
 
-        final TestObservable<String> w1 = new TestObservable<String>(null, okToContinueW1, "one", "two", "three");
-        final TestObservable<String> w2 = new TestObservable<String>(null, okToContinueW2, "four", "five", "six");
+        final TestObservable<String> w1 = new TestObservable<>(null, okToContinueW1, "one", "two", "three");
+        final TestObservable<String> w2 = new TestObservable<>(null, okToContinueW2, "four", "five", "six");
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
 
@@ -402,11 +402,11 @@ public void subscribe(Subscriber<? super Flowable<String>> subscriber) {
     public void concatUnsubscribe() {
         final CountDownLatch callOnce = new CountDownLatch(1);
         final CountDownLatch okToContinue = new CountDownLatch(1);
-        final TestObservable<String> w1 = new TestObservable<String>("one", "two", "three");
-        final TestObservable<String> w2 = new TestObservable<String>(callOnce, okToContinue, "four", "five", "six");
+        final TestObservable<String> w1 = new TestObservable<>("one", "two", "three");
+        final TestObservable<String> w2 = new TestObservable<>(callOnce, okToContinue, "four", "five", "six");
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber, 0L);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber, 0L);
 
         final Flowable<String> concat = Flowable.concat(Flowable.unsafeCreate(w1), Flowable.unsafeCreate(w2));
 
@@ -444,14 +444,14 @@ public void concatUnsubscribe() {
     public void concatUnsubscribeConcurrent() {
         final CountDownLatch callOnce = new CountDownLatch(1);
         final CountDownLatch okToContinue = new CountDownLatch(1);
-        final TestObservable<String> w1 = new TestObservable<String>("one", "two", "three");
-        final TestObservable<String> w2 = new TestObservable<String>(callOnce, okToContinue, "four", "five", "six");
+        final TestObservable<String> w1 = new TestObservable<>("one", "two", "three");
+        final TestObservable<String> w2 = new TestObservable<>(callOnce, okToContinue, "four", "five", "six");
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber, 0L);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber, 0L);
 
         @SuppressWarnings("unchecked")
-        TestObservable<Flowable<String>> observableOfObservables = new TestObservable<Flowable<String>>(Flowable.unsafeCreate(w1), Flowable.unsafeCreate(w2));
+        TestObservable<Flowable<String>> observableOfObservables = new TestObservable<>(Flowable.unsafeCreate(w1), Flowable.unsafeCreate(w2));
         Flowable<String> concatF = Flowable.concat(Flowable.unsafeCreate(observableOfObservables));
 
         concatF.subscribe(ts);
@@ -630,7 +630,7 @@ public Flowable<Integer> apply(Integer v) {
 
         result.subscribe(o);
 
-        List<Integer> list = new ArrayList<Integer>(n);
+        List<Integer> list = new ArrayList<>(n);
         for (int i = 0; i < n; i++) {
             list.add(i);
         }
@@ -655,7 +655,7 @@ public Flowable<Integer> apply(Integer v) {
 
         result.subscribe(o);
 
-        List<Integer> list = new ArrayList<Integer>(n);
+        List<Integer> list = new ArrayList<>(n);
         for (int i = 0; i < n / 2; i++) {
             list.add(i);
         }
@@ -674,7 +674,7 @@ public void concatOuterBackpressure() {
 
     @Test
     public void innerBackpressureWithAlignedBoundaries() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(0, Flowable.bufferSize() * 2)
                 .concatWith(Flowable.range(0, Flowable.bufferSize() * 2))
                 .observeOn(Schedulers.computation()) // observeOn has a backpressured RxRingBuffer
@@ -693,7 +693,7 @@ public void innerBackpressureWithAlignedBoundaries() {
      */
     @Test
     public void innerBackpressureWithoutAlignedBoundaries() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(0, (Flowable.bufferSize() * 2) + 10)
                 .concatWith(Flowable.range(0, (Flowable.bufferSize() * 2) + 10))
                 .observeOn(Schedulers.computation()) // observeOn has a backpressured RxRingBuffer
@@ -719,7 +719,7 @@ public void subscribe(Subscriber<? super String> s) {
 
         });
 
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>();
         Flowable.concat(f, f).subscribe(ts);
         ts.awaitDone(500, TimeUnit.MILLISECONDS);
         ts.assertTerminated();
@@ -815,7 +815,7 @@ public void concatMapRangeAsyncLoopIssue2876() {
             if (i % 1000 == 0) {
                 System.out.println("concatMapRangeAsyncLoop > " + i);
             }
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
             Flowable.range(0, 1000)
             .concatMap(new Function<Integer, Flowable<Integer>>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java
index a89897090a..fcf199dfd0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java
@@ -33,7 +33,7 @@ public class FlowableConcatWithCompletableTest extends RxJavaTest {
 
     @Test
     public void normal() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Completable.fromAction(new Action() {
@@ -49,7 +49,7 @@ public void run() throws Exception {
 
     @Test
     public void mainError() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.<Integer>error(new TestException())
         .concatWith(Completable.fromAction(new Action() {
@@ -65,7 +65,7 @@ public void run() throws Exception {
 
     @Test
     public void otherError() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Completable.error(new TestException()))
@@ -76,7 +76,7 @@ public void otherError() {
 
     @Test
     public void takeMain() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Completable.fromAction(new Action() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java
index ea9e8f2330..a855c09c26 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java
@@ -27,7 +27,7 @@ public class FlowableConcatWithMaybeTest extends RxJavaTest {
 
     @Test
     public void normalEmpty() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Maybe.<Integer>fromAction(new Action() {
@@ -43,7 +43,7 @@ public void run() throws Exception {
 
     @Test
     public void normalNonEmpty() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Maybe.just(100))
@@ -68,7 +68,7 @@ public void backpressure() {
 
     @Test
     public void mainError() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.<Integer>error(new TestException())
         .concatWith(Maybe.<Integer>fromAction(new Action() {
@@ -84,7 +84,7 @@ public void run() throws Exception {
 
     @Test
     public void otherError() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Maybe.<Integer>error(new TestException()))
@@ -95,7 +95,7 @@ public void otherError() {
 
     @Test
     public void takeMain() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Maybe.<Integer>fromAction(new Action() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java
index c846a2f5d5..4301746a86 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java
@@ -26,7 +26,7 @@ public class FlowableConcatWithSingleTest extends RxJavaTest {
 
     @Test
     public void normal() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Single.just(100))
@@ -51,7 +51,7 @@ public void backpressure() {
 
     @Test
     public void mainError() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.<Integer>error(new TestException())
         .concatWith(Single.just(100))
@@ -62,7 +62,7 @@ public void mainError() {
 
     @Test
     public void otherError() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Single.<Integer>error(new TestException()))
@@ -73,7 +73,7 @@ public void otherError() {
 
     @Test
     public void takeMain() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5)
         .concatWith(Single.just(100))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
index e6470fe6c9..d0c0adfb70 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
@@ -1063,7 +1063,7 @@ public void subscribe(FlowableEmitter<Object> e) throws Exception {
     @Test
     public void emittersHasToString() {
         Map<BackpressureStrategy, Class<? extends FlowableEmitter>> emitterMap =
-                new HashMap<BackpressureStrategy, Class<? extends FlowableEmitter>>();
+                new HashMap<>();
 
         emitterMap.put(BackpressureStrategy.MISSING, FlowableCreate.MissingEmitter.class);
         emitterMap.put(BackpressureStrategy.ERROR, FlowableCreate.ErrorAsyncEmitter.class);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
index 17ae8ef654..bfb33f0e8e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
@@ -289,7 +289,7 @@ public Flowable<Integer> apply(Integer t1) {
     @Test
     public void debounceWithTimeBackpressure() throws InterruptedException {
         TestScheduler scheduler = new TestScheduler();
-        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<>();
         Flowable.merge(
                 Flowable.just(1),
                 Flowable.just(2).delay(10, TimeUnit.MILLISECONDS, scheduler)
@@ -305,7 +305,7 @@ public void debounceWithTimeBackpressure() throws InterruptedException {
     @Test
     public void debounceDefaultScheduler() throws Exception {
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 1000).debounce(1, TimeUnit.SECONDS).subscribe(ts);
 
@@ -330,7 +330,7 @@ public void dispose() {
 
         TestHelper.checkDisposed(PublishProcessor.create().debounce(Functions.justFunction(Flowable.never())));
 
-        Disposable d = new FlowableDebounceTimed.DebounceEmitter<Integer>(1, 1, null);
+        Disposable d = new FlowableDebounceTimed.DebounceEmitter<>(1, 1, null);
         assertFalse(d.isDisposed());
 
         d.dispose();
@@ -426,7 +426,7 @@ public Flowable<Object> apply(Flowable<Object> f) throws Exception {
 
     @Test
     public void disposeInOnNext() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         BehaviorProcessor.createDefault(1)
         .debounce(new Function<Integer, Flowable<Object>>() {
@@ -444,7 +444,7 @@ public Flowable<Object> apply(Integer o) throws Exception {
 
     @Test
     public void disposedInOnComplete() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         new Flowable<Integer>() {
             @Override
@@ -461,7 +461,7 @@ protected void subscribeActual(Subscriber<? super Integer> subscriber) {
 
     @Test
     public void emitLate() {
-        final AtomicReference<Subscriber<? super Integer>> ref = new AtomicReference<Subscriber<? super Integer>>();
+        final AtomicReference<Subscriber<? super Integer>> ref = new AtomicReference<>();
 
         TestSubscriber<Integer> ts = Flowable.range(1, 2)
         .debounce(new Function<Integer, Flowable<Integer>>() {
@@ -505,7 +505,7 @@ public Publisher<Object> apply(Flowable<Object> f)
 
     @Test
     public void timedDisposedIgnoredBySource() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         new Flowable<Integer>() {
             @Override
@@ -528,13 +528,13 @@ public void timedBadRequest() {
 
     @Test
     public void timedLateEmit() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-        DebounceTimedSubscriber<Integer> sub = new DebounceTimedSubscriber<Integer>(
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        DebounceTimedSubscriber<Integer> sub = new DebounceTimedSubscriber<>(
                 ts, 1, TimeUnit.SECONDS, new TestScheduler().createWorker());
 
         sub.onSubscribe(new BooleanSubscription());
 
-        DebounceEmitter<Integer> de = new DebounceEmitter<Integer>(1, 50, sub);
+        DebounceEmitter<Integer> de = new DebounceEmitter<>(1, 50, sub);
         de.emit();
         de.emit();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
index ff99ca80e1..dadec04fbe 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
@@ -57,7 +57,7 @@ public void defaultIfEmptyWithEmpty() {
 
     @Test
     public void backpressureEmpty() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
         Flowable.<Integer>empty().defaultIfEmpty(1).subscribe(ts);
         ts.assertNoValues();
         ts.assertNotTerminated();
@@ -69,7 +69,7 @@ public void backpressureEmpty() {
 
     @Test
     public void backpressureNonEmpty() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
         Flowable.just(1, 2, 3).defaultIfEmpty(1).subscribe(ts);
         ts.assertNoValues();
         ts.assertNotTerminated();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
index 9ac97e12ab..fde11b5ea1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
@@ -31,7 +31,7 @@ public class FlowableDelaySubscriptionOtherTest extends RxJavaTest {
     public void noPrematureSubscription() {
         PublishProcessor<Object> other = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -64,7 +64,7 @@ public void accept(Subscription s) {
     public void noMultipleSubscriptions() {
         PublishProcessor<Object> other = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -98,7 +98,7 @@ public void accept(Subscription s) {
     public void completeTriggersSubscription() {
         PublishProcessor<Object> other = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -131,7 +131,7 @@ public void accept(Subscription s) {
     public void noPrematureSubscriptionToError() {
         PublishProcessor<Object> other = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -164,7 +164,7 @@ public void accept(Subscription s) {
     public void noSubscriptionIfOtherErrors() {
         PublishProcessor<Object> other = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -198,7 +198,7 @@ public void backpressurePassesThrough() {
 
         PublishProcessor<Object> other = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -249,7 +249,7 @@ public void unsubscriptionPropagatesBeforeSubscribe() {
         PublishProcessor<Integer> source = PublishProcessor.create();
         PublishProcessor<Integer> other = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         source.delaySubscription(other).subscribe(ts);
 
@@ -267,7 +267,7 @@ public void unsubscriptionPropagatesAfterSubscribe() {
         PublishProcessor<Integer> source = PublishProcessor.create();
         PublishProcessor<Integer> other = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         source.delaySubscription(other).subscribe(ts);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
index c5167f4fcd..79740ee44c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
@@ -218,7 +218,7 @@ public void delaySubscriptionCancelBeforeTime() {
         Flowable<Integer> result = Flowable.just(1, 2, 3).delaySubscription(100, TimeUnit.MILLISECONDS, scheduler);
 
         Subscriber<Object> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(subscriber);
+        TestSubscriber<Object> ts = new TestSubscriber<>(subscriber);
 
         result.subscribe(ts);
         ts.cancel();
@@ -232,7 +232,7 @@ public void delaySubscriptionCancelBeforeTime() {
     @Test
     public void delayWithFlowableNormal1() {
         PublishProcessor<Integer> source = PublishProcessor.create();
-        final List<PublishProcessor<Integer>> delays = new ArrayList<PublishProcessor<Integer>>();
+        final List<PublishProcessor<Integer>> delays = new ArrayList<>();
         final int n = 10;
         for (int i = 0; i < n; i++) {
             PublishProcessor<Integer> delay = PublishProcessor.create();
@@ -577,7 +577,7 @@ public void delayWithFlowableReorder() {
         int n = 3;
 
         PublishProcessor<Integer> source = PublishProcessor.create();
-        final List<PublishProcessor<Integer>> subjects = new ArrayList<PublishProcessor<Integer>>();
+        final List<PublishProcessor<Integer>> subjects = new ArrayList<>();
         for (int i = 0; i < n; i++) {
             subjects.add(PublishProcessor.<Integer> create());
         }
@@ -625,7 +625,7 @@ public void accept(Notification<Integer> t1) {
             }
 
         });
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         delayed.subscribe(ts);
         // all will be delivered after 500ms since range does not delay between them
         scheduler.advanceTimeBy(500L, TimeUnit.MILLISECONDS);
@@ -634,7 +634,7 @@ public void accept(Notification<Integer> t1) {
 
     @Test
     public void backpressureWithTimedDelay() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(1, Flowable.bufferSize() * 2)
                 .delay(100, TimeUnit.MILLISECONDS)
                 .observeOn(Schedulers.computation())
@@ -662,7 +662,7 @@ public Integer apply(Integer t) {
 
     @Test
     public void backpressureWithSubscriptionTimedDelay() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(1, Flowable.bufferSize() * 2)
                 .delaySubscription(100, TimeUnit.MILLISECONDS)
                 .delay(100, TimeUnit.MILLISECONDS)
@@ -691,7 +691,7 @@ public Integer apply(Integer t) {
 
     @Test
     public void backpressureWithSelectorDelay() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(1, Flowable.bufferSize() * 2)
                 .delay(new Function<Integer, Flowable<Long>>() {
 
@@ -726,7 +726,7 @@ public Integer apply(Integer t) {
 
     @Test
     public void backpressureWithSelectorDelayAndSubscriptionDelay() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(1, Flowable.bufferSize() * 2)
                 .delay(Flowable.defer(new Supplier<Flowable<Long>>() {
 
@@ -771,7 +771,7 @@ public void errorRunsBeforeOnNext() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         pp.delay(1, TimeUnit.SECONDS, test).subscribe(ts);
 
@@ -794,7 +794,7 @@ public void delaySupplierSimple() {
 
         Flowable<Integer> source = Flowable.range(1, 5);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         source.delaySubscription(Flowable.defer(new Supplier<Publisher<Integer>>() {
             @Override
@@ -820,7 +820,7 @@ public void delaySupplierCompletes() {
 
         Flowable<Integer> source = Flowable.range(1, 5);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         source.delaySubscription(Flowable.defer(new Supplier<Publisher<Integer>>() {
             @Override
@@ -847,7 +847,7 @@ public void delaySupplierErrors() {
 
         Flowable<Integer> source = Flowable.range(1, 5);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         source.delaySubscription(Flowable.defer(new Supplier<Publisher<Integer>>() {
             @Override
@@ -904,7 +904,7 @@ public void delaySubscriptionDisposeBeforeTime() {
         Flowable<Integer> result = Flowable.just(1, 2, 3).delaySubscription(100, TimeUnit.MILLISECONDS, scheduler);
 
         Subscriber<Object> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(subscriber);
+        TestSubscriber<Object> ts = new TestSubscriber<>(subscriber);
 
         result.subscribe(ts);
         ts.cancel();
@@ -918,7 +918,7 @@ public void delaySubscriptionDisposeBeforeTime() {
     @Test
     public void onErrorCalledOnScheduler() throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Thread> thread = new AtomicReference<Thread>();
+        final AtomicReference<Thread> thread = new AtomicReference<>();
 
         Flowable.<String>error(new Exception())
                 .delay(0, TimeUnit.MILLISECONDS, Schedulers.newThread())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
index 75a05cbd23..d4578db529 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
@@ -141,7 +141,7 @@ public void completePassThru() {
 
         Subscriber<Integer> subscriber = TestHelper.mockSubscriber();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(subscriber);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(subscriber);
         dematerialize.subscribe(ts);
 
         System.out.println(ts.errors());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java
index c328565218..3c87bfeb9a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java
@@ -35,9 +35,9 @@ public class FlowableDetachTest extends RxJavaTest {
     public void just() throws Exception {
         o = new Object();
 
-        WeakReference<Object> wr = new WeakReference<Object>(o);
+        WeakReference<Object> wr = new WeakReference<>(o);
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.just(o).count().toFlowable().onTerminateDetach().subscribe(ts);
 
@@ -56,7 +56,7 @@ public void just() throws Exception {
 
     @Test
     public void error() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.error(new TestException()).onTerminateDetach().subscribe(ts);
 
@@ -67,7 +67,7 @@ public void error() {
 
     @Test
     public void empty() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.empty().onTerminateDetach().subscribe(ts);
 
@@ -78,7 +78,7 @@ public void empty() {
 
     @Test
     public void range() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.range(1, 1000).onTerminateDetach().subscribe(ts);
 
@@ -91,9 +91,9 @@ public void range() {
     public void backpressured() throws Exception {
         o = new Object();
 
-        WeakReference<Object> wr = new WeakReference<Object>(o);
+        WeakReference<Object> wr = new WeakReference<>(o);
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(0L);
+        TestSubscriber<Object> ts = new TestSubscriber<>(0L);
 
         Flowable.just(o).count().toFlowable().onTerminateDetach().subscribe(ts);
 
@@ -117,9 +117,9 @@ public void backpressured() throws Exception {
     public void justUnsubscribed() throws Exception {
         o = new Object();
 
-        WeakReference<Object> wr = new WeakReference<Object>(o);
+        WeakReference<Object> wr = new WeakReference<>(o);
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(0);
+        TestSubscriber<Object> ts = new TestSubscriber<>(0);
 
         Flowable.just(o).count().toFlowable().onTerminateDetach().subscribe(ts);
 
@@ -135,9 +135,9 @@ public void justUnsubscribed() throws Exception {
 
     @Test
     public void deferredUpstreamProducer() {
-        final AtomicReference<Subscriber<? super Object>> subscriber = new AtomicReference<Subscriber<? super Object>>();
+        final AtomicReference<Subscriber<? super Object>> subscriber = new AtomicReference<>();
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(0);
+        TestSubscriber<Object> ts = new TestSubscriber<>(0);
 
         Flowable.unsafeCreate(new Publisher<Object>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
index 51b27abad1..47f0d74e0b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
@@ -30,7 +30,7 @@
 
 public class FlowableDoAfterNextTest extends RxJavaTest {
 
-    final List<Integer> values = new ArrayList<Integer>();
+    final List<Integer> values = new ArrayList<>();
 
     final Consumer<Integer> afterNext = new Consumer<Integer>() {
         @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java
index 210ed3879b..cee677cf41 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java
@@ -91,7 +91,7 @@ public void ifFinallyActionThrowsExceptionShouldNotBeSwallowedAndActionShouldBeC
             Action finallyAction = Mockito.mock(Action.class);
             doThrow(new IllegalStateException()).when(finallyAction).run();
 
-            TestSubscriber<String> testSubscriber = new TestSubscriber<String>();
+            TestSubscriber<String> testSubscriber = new TestSubscriber<>();
 
             Flowable
                     .just("value")
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
index 7662162d22..8249383dca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
@@ -440,7 +440,7 @@ public void onComplete() {
 
     @Test
     public void eventOrdering() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
 
         Flowable.error(new TestException())
         .doOnCancel(new Action() {
@@ -480,7 +480,7 @@ public void run() throws Exception {
 
     @Test
     public void eventOrdering2() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
 
         Flowable.just(1)
         .doOnCancel(new Action() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
index deea77ea70..fc346086b6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
@@ -173,7 +173,7 @@ public void accept(List<Boolean> booleans) {
 
     @Test
     public void onErrorThrows() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
 
         Flowable.error(new TestException())
         .doOnError(new Consumer<Throwable>() {
@@ -691,7 +691,7 @@ public void run() throws Exception {
 
     @Test
     public void dispose() {
-        TestHelper.checkDisposed(Flowable.just(1).doOnEach(new TestSubscriber<Integer>()));
+        TestHelper.checkDisposed(Flowable.just(1).doOnEach(new TestSubscriber<>()));
     }
 
     @Test
@@ -699,7 +699,7 @@ public void doubleOnSubscribe() {
         TestHelper.checkDoubleOnSubscribeFlowable(new Function<Flowable<Object>, Flowable<Object>>() {
             @Override
             public Flowable<Object> apply(Flowable<Object> f) throws Exception {
-                return f.doOnEach(new TestSubscriber<Object>());
+                return f.doOnEach(new TestSubscriber<>());
             }
         });
     }
@@ -736,7 +736,7 @@ public void doOnNextDoOnErrorCombinedFused() {
                 .compose(new FlowableTransformer<Integer, Integer>() {
                     @Override
                     public Publisher<Integer> apply(Flowable<Integer> v) {
-                        return new FlowableDoOnEach<Integer>(v,
+                        return new FlowableDoOnEach<>(v,
                                 new Consumer<Integer>() {
                                     @Override
                                     public void accept(Integer v) throws Exception {
@@ -752,7 +752,7 @@ public void accept(Throwable e) throws Exception {
                                 Functions.EMPTY_ACTION
                                 ,
                                 Functions.EMPTY_ACTION
-                                );
+                        );
                     }
                 })
         .publish();
@@ -866,7 +866,7 @@ public void doOnNextDoOnErrorCombinedFusedConditional() {
                 .compose(new FlowableTransformer<Integer, Integer>() {
                     @Override
                     public Publisher<Integer> apply(Flowable<Integer> v) {
-                        return new FlowableDoOnEach<Integer>(v,
+                        return new FlowableDoOnEach<>(v,
                                 new Consumer<Integer>() {
                                     @Override
                                     public void accept(Integer v) throws Exception {
@@ -882,7 +882,7 @@ public void accept(Throwable e) throws Exception {
                                 Functions.EMPTY_ACTION
                                 ,
                                 Functions.EMPTY_ACTION
-                                );
+                        );
                     }
                 })
         .filter(Functions.alwaysTrue())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java
index e4eb8543f6..b07470a398 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java
@@ -51,7 +51,7 @@ public void accept(long n) {
 
     @Test
     public void doRequest() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
         Flowable.range(1, 5)
         //
                 .doOnRequest(new LongConsumer() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java
index f300d0427f..c9ea4359d1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java
@@ -66,7 +66,7 @@ public void doOnUnSubscribeWorksWithRefCount() throws Exception {
         final AtomicInteger onSubscribed = new AtomicInteger();
         final AtomicInteger countBefore = new AtomicInteger();
         final AtomicInteger countAfter = new AtomicInteger();
-        final AtomicReference<Subscriber<? super Integer>> sref = new AtomicReference<Subscriber<? super Integer>>();
+        final AtomicReference<Subscriber<? super Integer>> sref = new AtomicReference<>();
         Flowable<Integer> f = Flowable.unsafeCreate(new Publisher<Integer>() {
 
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
index 0a37faae1e..eab0324ba8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
@@ -67,11 +67,11 @@ public void run() {
                     }
                 });
 
-        List<Disposable> subscriptions = new ArrayList<Disposable>();
-        List<TestSubscriber<Long>> subscribers = new ArrayList<TestSubscriber<Long>>();
+        List<Disposable> subscriptions = new ArrayList<>();
+        List<TestSubscriber<Long>> subscribers = new ArrayList<>();
 
         for (int i = 0; i < subCount; ++i) {
-            TestSubscriber<Long> subscriber = new TestSubscriber<Long>();
+            TestSubscriber<Long> subscriber = new TestSubscriber<>();
             subscriptions.add(Disposable.fromSubscription(subscriber));
             longs.subscribe(subscriber);
             subscribers.add(subscriber);
@@ -128,11 +128,11 @@ public void run() {
                 .publish()
                 .refCount();
 
-        List<Disposable> subscriptions = new ArrayList<Disposable>();
-        List<TestSubscriber<Long>> subscribers = new ArrayList<TestSubscriber<Long>>();
+        List<Disposable> subscriptions = new ArrayList<>();
+        List<TestSubscriber<Long>> subscribers = new ArrayList<>();
 
         for (int i = 0; i < subCount; ++i) {
-            TestSubscriber<Long> subscriber = new TestSubscriber<Long>();
+            TestSubscriber<Long> subscriber = new TestSubscriber<>();
             longs.subscribe(subscriber);
             subscriptions.add(Disposable.fromSubscription(subscriber));
             subscribers.add(subscriber);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
index 596e7b3867..56297cbe05 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
@@ -72,7 +72,7 @@ public void elementAt() {
 
     @Test
     public void elementAtConstrainsUpstreamRequests() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
         Flowable.fromArray(1, 2, 3, 4)
             .doOnRequest(new LongConsumer() {
                 @Override
@@ -88,7 +88,7 @@ public void accept(long n) throws Throwable {
 
     @Test
     public void elementAtWithDefaultConstrainsUpstreamRequests() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
         Flowable.fromArray(1, 2, 3, 4)
             .doOnRequest(new LongConsumer() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
index 38e94571c2..86ad5aa874 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
@@ -158,7 +158,7 @@ public void functionCrashUnsubscribes() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         pp.filter(new Predicate<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
index d425ce8372..8faad86fef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
@@ -523,7 +523,7 @@ public MaybeSource<Integer> apply(PublishProcessor<Integer> v) throws Exception
 
     @Test
     public void disposeInner() {
-        final TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        final TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.just(1).flatMapMaybe(new Function<Integer, MaybeSource<Object>>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
index 2d3699e8e2..1a0cd3854f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
@@ -408,7 +408,7 @@ public SingleSource<Integer> apply(PublishProcessor<Integer> v) throws Exception
 
     @Test
     public void disposeInner() {
-        final TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        final TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.just(1).flatMapSingle(new Function<Integer, SingleSource<Object>>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
index 483d92062a..068f652db0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
@@ -343,13 +343,13 @@ public Flowable<Integer> apply(Integer t1) {
             }
         }, m);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         source.subscribe(ts);
 
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
-        Set<Integer> expected = new HashSet<Integer>(Arrays.asList(
+        Set<Integer> expected = new HashSet<>(Arrays.asList(
                 10, 11, 20, 21, 30, 31, 40, 41, 50, 51, 60, 61, 70, 71, 80, 81, 90, 91, 100, 101
         ));
         Assert.assertEquals(expected.size(), ts.values().size());
@@ -374,13 +374,13 @@ public Integer apply(Integer t1, Integer t2) {
             }
         }, m);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         source.subscribe(ts);
 
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
-        Set<Integer> expected = new HashSet<Integer>(Arrays.asList(
+        Set<Integer> expected = new HashSet<>(Arrays.asList(
                 1010, 1011, 2020, 2021, 3030, 3031, 4040, 4041, 5050, 5051,
                 6060, 6061, 7070, 7071, 8080, 8081, 9090, 9091, 10100, 10101
         ));
@@ -420,7 +420,7 @@ public void flatMapTransformsMaxConcurrentNormal() {
         Flowable<Integer> source = Flowable.fromIterable(Arrays.asList(10, 20, 30));
 
         Subscriber<Object> subscriber = TestHelper.mockSubscriber();
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>(subscriber);
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>(subscriber);
 
         Function<Integer, Flowable<Integer>> just = just(onNext);
         Function<Throwable, Flowable<Integer>> just2 = just(onError);
@@ -447,7 +447,7 @@ public void flatMapRangeMixedAsyncLoop() {
             if (i % 10 == 0) {
                 System.out.println("flatMapRangeAsyncLoop > " + i);
             }
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
             Flowable.range(0, 1000)
             .flatMap(new Function<Integer, Flowable<Integer>>() {
                 final Random rnd = new Random();
@@ -471,7 +471,7 @@ public Flowable<Integer> apply(Integer t) {
             ts.assertNoErrors();
             List<Integer> list = ts.values();
             if (list.size() < 1000) {
-                Set<Integer> set = new HashSet<Integer>(list);
+                Set<Integer> set = new HashSet<>(list);
                 for (int j = 0; j < 1000; j++) {
                     if (!set.contains(j)) {
                         System.out.println(j + " missing");
@@ -485,7 +485,7 @@ public Flowable<Integer> apply(Integer t) {
     @Test
     public void flatMapIntPassthruAsync() {
         for (int i = 0; i < 1000; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Flowable.range(1, 1000).flatMap(new Function<Integer, Flowable<Integer>>() {
                 @Override
@@ -504,7 +504,7 @@ public Flowable<Integer> apply(Integer t) {
     @Test
     public void flatMapTwoNestedSync() {
         for (final int n : new int[] { 1, 1000, 1000000 }) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Flowable.just(1, 2).flatMap(new Function<Integer, Flowable<Integer>>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
index e9e25c8af2..c65cf4b5b4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
@@ -40,7 +40,7 @@ public class FlowableFlattenIterableTest extends RxJavaTest {
     @Test
     public void normal0() {
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 2)
         .reduce(new BiFunction<Integer, Integer, Integer>() {
@@ -72,7 +72,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void normal() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5).concatMapIterable(mapper)
         .subscribe(ts);
@@ -84,7 +84,7 @@ public void normal() {
 
     @Test
     public void normalViaFlatMap() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5).flatMapIterable(mapper)
         .subscribe(ts);
@@ -96,7 +96,7 @@ public void normalViaFlatMap() {
 
     @Test
     public void normalBackpressured() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
 
         Flowable.range(1, 5).concatMapIterable(mapper)
         .subscribe(ts);
@@ -126,7 +126,7 @@ public void normalBackpressured() {
 
     @Test
     public void longRunning() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         int n = 1000 * 1000;
 
@@ -140,7 +140,7 @@ public void longRunning() {
 
     @Test
     public void asIntermediate() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         int n = 1000 * 1000;
 
@@ -159,7 +159,7 @@ public Flowable<Integer> apply(Integer v) {
 
     @Test
     public void just() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1).concatMapIterable(mapper)
         .subscribe(ts);
@@ -171,7 +171,7 @@ public void just() {
 
     @Test
     public void justHidden() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1).hide().concatMapIterable(mapper)
         .subscribe(ts);
@@ -183,7 +183,7 @@ public void justHidden() {
 
     @Test
     public void empty() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.<Integer>empty().concatMapIterable(mapper)
         .subscribe(ts);
@@ -195,7 +195,7 @@ public void empty() {
 
     @Test
     public void error() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.<Integer>just(1).concatWith(Flowable.<Integer>error(new TestException()))
         .concatMapIterable(mapper)
@@ -208,7 +208,7 @@ public void error() {
 
     @Test
     public void iteratorHasNextThrowsImmediately() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final Iterable<Integer> it = new Iterable<Integer>() {
             @Override
@@ -248,7 +248,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void iteratorHasNextThrowsImmediatelyJust() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final Iterable<Integer> it = new Iterable<Integer>() {
             @Override
@@ -288,7 +288,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void iteratorHasNextThrowsSecondCall() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final Iterable<Integer> it = new Iterable<Integer>() {
             @Override
@@ -332,7 +332,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void iteratorNextThrows() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final Iterable<Integer> it = new Iterable<Integer>() {
             @Override
@@ -372,7 +372,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void iteratorNextThrowsAndUnsubscribes() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final Iterable<Integer> it = new Iterable<Integer>() {
             @Override
@@ -418,7 +418,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void mixture() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(0, 1000)
         .concatMapIterable(new Function<Integer, Iterable<Integer>>() {
@@ -436,7 +436,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void emptyInnerThenSingleBackpressured() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1);
 
         Flowable.range(1, 2)
         .concatMapIterable(new Function<Integer, Iterable<Integer>>() {
@@ -454,7 +454,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void manyEmptyInnerThenSingleBackpressured() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1);
 
         Flowable.range(1, 1000)
         .concatMapIterable(new Function<Integer, Iterable<Integer>>() {
@@ -472,7 +472,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void hasNextIsNotCalledAfterChildUnsubscribedOnNext() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final AtomicInteger counter = new AtomicInteger();
 
@@ -523,7 +523,7 @@ public Iterable<Integer> apply(Integer v) {
 
     @Test
     public void normalPrefetchViaFlatMap() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5).flatMapIterable(mapper, 2)
         .subscribe(ts);
@@ -827,7 +827,7 @@ public void oneByOne() {
 
     @Test
     public void cancelAfterHasNext() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 3).hide()
         .flatMapIterable(new Function<Integer, Iterable<Integer>>() {
@@ -974,8 +974,8 @@ public Publisher<Object> apply(Flowable<Object> f)
 
     @Test
     public void upstreamFusionRejected() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-        FlattenIterableSubscriber<Integer, Integer> f = new FlattenIterableSubscriber<Integer, Integer>(ts,
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        FlattenIterableSubscriber<Integer, Integer> f = new FlattenIterableSubscriber<>(ts,
                 Functions.justFunction(Collections.<Integer>emptyList()), 128);
 
         final AtomicLong requested = new AtomicLong();
@@ -1031,8 +1031,8 @@ public void cancel() {
     public void onErrorLate() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
-            FlattenIterableSubscriber<Integer, Integer> f = new FlattenIterableSubscriber<Integer, Integer>(ts,
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+            FlattenIterableSubscriber<Integer, Integer> f = new FlattenIterableSubscriber<>(ts,
                     Functions.justFunction(Collections.<Integer>emptyList()), 128);
 
             f.onSubscribe(new BooleanSubscription());
@@ -1059,8 +1059,8 @@ public void badRequest() {
 
     @Test
     public void fusedCurrentIteratorEmpty() throws Throwable {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
-        FlattenIterableSubscriber<Integer, Integer> f = new FlattenIterableSubscriber<Integer, Integer>(ts,
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
+        FlattenIterableSubscriber<Integer, Integer> f = new FlattenIterableSubscriber<>(ts,
                 Functions.justFunction(Arrays.<Integer>asList(1, 2)), 128);
 
         f.onSubscribe(new BooleanSubscription());
@@ -1080,8 +1080,8 @@ public void fusedCurrentIteratorEmpty() throws Throwable {
 
     @Test
     public void fusionRequestedState() throws Exception {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
-        FlattenIterableSubscriber<Integer, Integer> f = new FlattenIterableSubscriber<Integer, Integer>(ts,
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
+        FlattenIterableSubscriber<Integer, Integer> f = new FlattenIterableSubscriber<>(ts,
                 Functions.justFunction(Arrays.<Integer>asList(1, 2)), 128);
 
         f.onSubscribe(new BooleanSubscription());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
index c643c0652b..d9ff63257c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
@@ -27,7 +27,7 @@ public class FlowableForEachTest extends RxJavaTest {
 
     @Test
     public void forEachWile() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Flowable.range(1, 5)
         .doOnNext(new Consumer<Integer>() {
@@ -48,7 +48,7 @@ public boolean test(Integer v) throws Exception {
 
     @Test
     public void forEachWileWithError() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Flowable.range(1, 5).concatWith(Flowable.<Integer>error(new TestException()))
         .doOnNext(new Consumer<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
index 62607299d6..d4dda81754 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
@@ -37,7 +37,7 @@ Flowable<Integer> create(int n) {
 
     @Test
     public void simple() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         create(1000).subscribe(ts);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java
index cc4b1b64bb..f8f3ed670c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java
@@ -121,7 +121,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
 
-        TestSubscriber<String> outer = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> outer = new TestSubscriber<>(subscriber);
 
         fromCallableFlowable
                 .subscribeOn(Schedulers.computation())
@@ -248,7 +248,7 @@ public Object call() throws Exception {
     public void undeliverableUponCancellation() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Flowable.fromCallable(new Callable<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
index 1b21baf610..6385d58d95 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
@@ -119,13 +119,13 @@ public void observableFromIterable() {
 
     @Test
     public void backpressureViaRequest() {
-        ArrayList<Integer> list = new ArrayList<Integer>(Flowable.bufferSize());
+        ArrayList<Integer> list = new ArrayList<>(Flowable.bufferSize());
         for (int i = 1; i <= Flowable.bufferSize() + 1; i++) {
             list.add(i);
         }
         Flowable<Integer> f = Flowable.fromIterable(list);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
 
         ts.assertNoValues();
         ts.request(1);
@@ -145,7 +145,7 @@ public void backpressureViaRequest() {
     public void noBackpressure() {
         Flowable<Integer> f = Flowable.fromIterable(Arrays.asList(1, 2, 3, 4, 5));
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
 
         ts.assertNoValues();
         ts.request(Long.MAX_VALUE); // infinite
@@ -161,7 +161,7 @@ public void subscribeMultipleTimes() {
         Flowable<Integer> f = Flowable.fromIterable(Arrays.asList(1, 2, 3));
 
         for (int i = 0; i < 10; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             f.subscribe(ts);
 
@@ -333,7 +333,7 @@ public Iterator<Integer> iterator() {
             }
         };
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.fromIterable(it).subscribe(ts);
 
@@ -366,7 +366,7 @@ public void remove() {
             }
         };
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.fromIterable(it).subscribe(ts);
 
@@ -403,7 +403,7 @@ public void remove() {
             }
         };
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.fromIterable(it).subscribe(ts);
 
@@ -440,7 +440,7 @@ public void remove() {
             }
         };
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(5);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(5);
 
         Flowable.fromIterable(it).subscribe(ts);
 
@@ -473,7 +473,7 @@ public void remove() {
             }
         };
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.fromIterable(it).subscribe(ts);
 
@@ -506,7 +506,7 @@ public void remove() {
             }
         };
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(5);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(5);
 
         Flowable.fromIterable(it).subscribe(ts);
 
@@ -539,7 +539,7 @@ public void remove() {
             }
         };
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(5);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(5);
         ts.cancel();
 
         Flowable.fromIterable(it).subscribe(ts);
@@ -552,7 +552,7 @@ public void remove() {
 
     @Test
     public void fusionWithConcatMap() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.fromIterable(Arrays.asList(1, 2, 3, 4)).concatMap(
         new Function<Integer, Flowable  <Integer>>() {
@@ -724,7 +724,7 @@ public void normalConditionalLong2() {
     @Test
     public void requestRaceConditional() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
             Runnable r = new Runnable() {
                 @Override
@@ -744,7 +744,7 @@ public void run() {
     @Test
     public void requestRaceConditional2() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
             Runnable r = new Runnable() {
                 @Override
@@ -764,7 +764,7 @@ public void run() {
     @Test
     public void requestCancelConditionalRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -791,7 +791,7 @@ public void run() {
     @Test
     public void requestCancelConditionalRace2() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -818,7 +818,7 @@ public void run() {
     @Test
     public void requestCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -844,7 +844,7 @@ public void run() {
     @Test
     public void requestCancelRace2() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -933,7 +933,7 @@ public void hasNext2Throws() {
 
     @Test
     public void hasNextCancels() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.fromIterable(new Iterable<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
index 76fff6cb82..fefbf1533e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
@@ -38,7 +38,7 @@ public class FlowableFromSourceTest extends RxJavaTest {
     public void before() {
         source = new PublishAsyncEmitter();
         sourceNoCancel = new PublishAsyncEmitterNoCancel();
-        ts = new TestSubscriberEx<Integer>(0L);
+        ts = new TestSubscriberEx<>(0L);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java
index c44954bce3..5753e8ff66 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java
@@ -121,7 +121,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
 
-        TestSubscriber<String> outer = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> outer = new TestSubscriber<>(subscriber);
 
         fromSupplierFlowable
                 .subscribeOn(Schedulers.computation())
@@ -248,7 +248,7 @@ public Object get() throws Exception {
     public void undeliverableUponCancellation() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Flowable.fromSupplier(new Supplier<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index 5dae57500f..a14372b959 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -111,7 +111,7 @@ public void error() {
 
         final AtomicInteger groupCounter = new AtomicInteger();
         final AtomicInteger eventCounter = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         grouped.flatMap(new Function<GroupedFlowable<Integer, String>, Flowable<String>>() {
 
@@ -156,13 +156,13 @@ public void onNext(String v) {
 
     private static <K, V> Map<K, Collection<V>> toMap(Flowable<GroupedFlowable<K, V>> flowable) {
 
-        final ConcurrentHashMap<K, Collection<V>> result = new ConcurrentHashMap<K, Collection<V>>();
+        final ConcurrentHashMap<K, Collection<V>> result = new ConcurrentHashMap<>();
 
         flowable.doOnNext(new Consumer<GroupedFlowable<K, V>>() {
 
             @Override
             public void accept(final GroupedFlowable<K, V> f) {
-                result.put(f.getKey(), new ConcurrentLinkedQueue<V>());
+                result.put(f.getKey(), new ConcurrentLinkedQueue<>());
                 f.subscribe(new Consumer<V>() {
 
                     @Override
@@ -605,7 +605,7 @@ public void accept(String s) {
     @Test
     public void firstGroupsCompleteAndParentSlowToThenEmitFinalGroupsAndThenComplete() throws InterruptedException {
         final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
             @Override
@@ -684,7 +684,7 @@ public void accept(String s) {
     public void firstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenSubscribesOnAndDelaysAndThenCompletes() throws InterruptedException {
         System.err.println("----------------------------------------------------------------------------------------------");
         final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
             @Override
@@ -776,7 +776,7 @@ public void accept(String s) {
     @Test
     public void firstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenObservesOnAndDelaysAndThenCompletes() throws InterruptedException {
         final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
             @Override
@@ -853,7 +853,7 @@ public void accept(String s) {
 
     @Test
     public void groupsWithNestedSubscribeOn() throws InterruptedException {
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
             @Override
@@ -910,7 +910,7 @@ public void accept(String s) {
 
     @Test
     public void groupsWithNestedObserveOn() throws InterruptedException {
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
             @Override
@@ -1035,7 +1035,7 @@ public Boolean apply(Integer n) {
     @Test
     public void groupByBackpressure() throws InterruptedException {
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
 
         Flowable.range(1, 4000)
                 .groupBy(IS_EVEN2)
@@ -1162,7 +1162,7 @@ public String apply(String v) {
             }
         });
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         m.subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         System.out.println("ts .get " + ts.values());
@@ -1178,7 +1178,7 @@ public void keySelectorThrows() {
 
         Flowable<Integer> m = source.groupBy(fail(0), dbl).flatMap(FLATTEN_INTEGER);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         m.subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         assertEquals(1, ts.errors().size());
@@ -1190,7 +1190,7 @@ public void valueSelectorThrows() {
         Flowable<Integer> source = Flowable.just(0, 1, 2, 3, 4, 5, 6);
 
         Flowable<Integer> m = source.groupBy(identity, fail(0)).flatMap(FLATTEN_INTEGER);
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         m.subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         assertEquals(1, ts.errors().size());
@@ -1204,7 +1204,7 @@ public void innerEscapeCompleted() {
 
         Flowable<Integer> m = source.groupBy(identity, dbl).flatMap(FLATTEN_INTEGER);
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         m.subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -1218,7 +1218,7 @@ public void innerEscapeCompleted() {
     public void exceptionIfSubscribeToChildMoreThanOnce() {
         Flowable<Integer> source = Flowable.just(0);
 
-        final AtomicReference<GroupedFlowable<Integer, Integer>> inner = new AtomicReference<GroupedFlowable<Integer, Integer>>();
+        final AtomicReference<GroupedFlowable<Integer, Integer>> inner = new AtomicReference<>();
 
         Flowable<GroupedFlowable<Integer, Integer>> m = source.groupBy(identity, dbl);
 
@@ -1247,7 +1247,7 @@ public void error2() {
 
         Flowable<Integer> m = source.groupBy(identity, dbl).flatMap(FLATTEN_INTEGER);
 
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
         m.subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         assertEquals(1, ts.errors().size());
@@ -1256,7 +1256,7 @@ public void error2() {
 
     @Test
     public void groupByBackpressure3() throws InterruptedException {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
 
         Flowable.range(1, 4000).groupBy(IS_EVEN2).flatMap(new Function<GroupedFlowable<Boolean, Integer>, Flowable<String>>() {
 
@@ -1313,7 +1313,7 @@ public void accept(Notification<String> t1) {
     @Test
     public void groupByBackpressure2() throws InterruptedException {
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
 
         Flowable.range(1, 4000)
             .doOnNext(new Consumer<Integer>() {
@@ -1362,7 +1362,7 @@ public Flowable<Integer> apply(GroupedFlowable<Integer, Integer> t) {
     @Test
     public void groupByWithNullKey() {
         final String[] key = new String[]{"uninitialized"};
-        final List<String> values = new ArrayList<String>();
+        final List<String> values = new ArrayList<>();
         Flowable.just("a", "b", "c").groupBy(new Function<String, String>() {
 
             @Override
@@ -1398,7 +1398,7 @@ public void subscribe(Subscriber<? super Integer> subscriber) {
                     }
                 }
         );
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         f.groupBy(new Function<Integer, Integer>() {
 
@@ -1416,11 +1416,11 @@ public Integer apply(Integer integer) {
     @Test
     public void groupByShouldPropagateError() {
         final Throwable e = new RuntimeException("Oops");
-        final TestSubscriberEx<Integer> inner1 = new TestSubscriberEx<Integer>();
-        final TestSubscriberEx<Integer> inner2 = new TestSubscriberEx<Integer>();
+        final TestSubscriberEx<Integer> inner1 = new TestSubscriberEx<>();
+        final TestSubscriberEx<Integer> inner2 = new TestSubscriberEx<>();
 
         final TestSubscriberEx<GroupedFlowable<Integer, Integer>> outer
-                = new TestSubscriberEx<GroupedFlowable<Integer, Integer>>(new DefaultSubscriber<GroupedFlowable<Integer, Integer>>() {
+                = new TestSubscriberEx<>(new DefaultSubscriber<GroupedFlowable<Integer, Integer>>() {
 
             @Override
             public void onComplete() {
@@ -1557,7 +1557,7 @@ public Object apply(Integer i) {
      */
     @Test
     public void backpressureInnerDoesntOverflowOuter() {
-        TestSubscriber<GroupedFlowable<Integer, Integer>> ts = new TestSubscriber<GroupedFlowable<Integer, Integer>>(0L);
+        TestSubscriber<GroupedFlowable<Integer, Integer>> ts = new TestSubscriber<>(0L);
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -1586,7 +1586,7 @@ public void accept(GroupedFlowable<Integer, Integer> g) {
 
     @Test
     public void backpressureInnerDoesntOverflowOuterMissingBackpressure() {
-        TestSubscriber<GroupedFlowable<Integer, Integer>> ts = new TestSubscriber<GroupedFlowable<Integer, Integer>>(1);
+        TestSubscriber<GroupedFlowable<Integer, Integer>> ts = new TestSubscriber<>(1);
 
         Flowable.fromArray(1, 2)
                 .groupBy(new Function<Integer, Integer>() {
@@ -1611,9 +1611,9 @@ public void accept(GroupedFlowable<Integer, Integer> g) {
     @Test
     public void oneGroupInnerRequestsTwiceBuffer() {
         // FIXME: delayed requesting in groupBy results in group abandonment
-        TestSubscriber<Object> ts1 = new TestSubscriber<Object>(1L);
+        TestSubscriber<Object> ts1 = new TestSubscriber<>(1L);
 
-        final TestSubscriber<Object> ts2 = new TestSubscriber<Object>(0L);
+        final TestSubscriber<Object> ts2 = new TestSubscriber<>(0L);
 
         Flowable.range(1, Flowable.bufferSize() * 2)
         .groupBy(new Function<Integer, Object>() {
@@ -1886,7 +1886,7 @@ public Map<Integer, Object> apply(final Consumer<Object> notify) throws Exceptio
 
     @Test
     public void mapFactoryExpiryCompletesGroupedFlowable() {
-        final List<Integer> completed = new CopyOnWriteArrayList<Integer>();
+        final List<Integer> completed = new CopyOnWriteArrayList<>();
         Function<Consumer<Object>, Map<Integer, Object>> evictingMapFactory = createEvictingMapFactorySynchronousOnly(1);
         PublishSubject<Integer> subject = PublishSubject.create();
         TestSubscriberEx<Integer> ts = subject.toFlowable(BackpressureStrategy.BUFFER)
@@ -1916,7 +1916,7 @@ public Integer apply(Integer n) throws Exception {
     @Test
     public void mapFactoryWithExpiringGuavaCacheDemonstrationCodeForUseInJavadoc() {
         //javadoc will be a version of this using lambdas and without assertions
-        final List<Integer> completed = new CopyOnWriteArrayList<Integer>();
+        final List<Integer> completed = new CopyOnWriteArrayList<>();
         //size should be less than 5 to notice the effect
         Function<Consumer<Object>, Map<Integer, Object>> evictingMapFactory = createEvictingMapFactoryGuava(3);
         int numValues = 1000;
@@ -1999,7 +1999,7 @@ public void onRemoval(RemovalNotification<Object, Object> notification) {
             }
         };
 
-        final List<String> list = new CopyOnWriteArrayList<String>();
+        final List<String> list = new CopyOnWriteArrayList<>();
         Flowable<Integer> stream = source //
                 .doOnCancel(new Action() {
                     @Override
@@ -2091,8 +2091,8 @@ public Publisher<? extends Object> apply(GroupedFlowable<Integer, Integer> g) th
     //not thread safe
     private static final class SingleThreadEvictingHashMap<K, V> implements Map<K, V> {
 
-        private final List<K> list = new ArrayList<K>();
-        private final Map<K, V> map = new HashMap<K, V>();
+        private final List<K> list = new ArrayList<>();
+        private final Map<K, V> map = new HashMap<>();
         private final int maxSize;
         private final Consumer<V> evictedListener;
 
@@ -2214,15 +2214,16 @@ private static Function<Consumer<Object>, Map<Integer, Object>> createEvictingMa
 
                     @Override
                     public Map<Integer, Object> apply(final Consumer<Object> notify) throws Exception {
-                        return new SingleThreadEvictingHashMap<Integer, Object>(maxSize, new Consumer<Object>() {
-                                    @Override
-                                    public void accept(Object object) {
-                                        try {
-                                            notify.accept(object);
-                                        } catch (Throwable e) {
-                                            throw new RuntimeException(e);
-                                        }
-                                    }});
+                        return new SingleThreadEvictingHashMap<>(maxSize, new Consumer<Object>() {
+                            @Override
+                            public void accept(Object object) {
+                                try {
+                                    notify.accept(object);
+                                } catch (Throwable e) {
+                                    throw new RuntimeException(e);
+                                }
+                            }
+                        });
                     }};
         return evictingMapFactory;
     }
@@ -2231,7 +2232,7 @@ public void accept(Object object) {
     public void cancelOverFlatmapRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -2274,7 +2275,7 @@ public void run() {
 
     @Test
     public void abandonedGroupsNoDataloss() {
-        final List<GroupedFlowable<Integer, Integer>> groups = new ArrayList<GroupedFlowable<Integer, Integer>>();
+        final List<GroupedFlowable<Integer, Integer>> groups = new ArrayList<>();
 
         Flowable.range(1, 1000)
         .groupBy(new Function<Integer, Integer>() {
@@ -2303,8 +2304,8 @@ public void accept(GroupedFlowable<Integer, Integer> v) throws Throwable {
 
     @Test
     public void newGroupValueSelectorFails() {
-        TestSubscriber<Object> ts1 = new TestSubscriber<Object>();
-        final TestSubscriber<Object> ts2 = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts1 = new TestSubscriber<>();
+        final TestSubscriber<Object> ts2 = new TestSubscriber<>();
 
         Flowable.just(1)
         .groupBy(Functions.<Integer>identity(), new Function<Integer, Object>() {
@@ -2330,8 +2331,8 @@ public void accept(GroupedFlowable<Integer, Object> g) throws Throwable {
 
     @Test
     public void existingGroupValueSelectorFails() {
-        TestSubscriber<Object> ts1 = new TestSubscriber<Object>();
-        final TestSubscriber<Object> ts2 = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts1 = new TestSubscriber<>();
+        final TestSubscriber<Object> ts2 = new TestSubscriber<>();
 
         Flowable.just(1, 2)
         .groupBy(Functions.justFunction(1), new Function<Integer, Object>() {
@@ -2399,7 +2400,7 @@ public Integer apply(Integer t) throws Throwable {
                 throw new TestException();
             }
         })
-        .subscribeWith(new TestSubscriberEx<GroupedFlowable<Integer, Integer>>(0L));
+        .subscribeWith(new TestSubscriberEx<>(0L));
 
         assertTrue(pp.offer(1));
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
index e88319a1dd..2558b4a433 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
@@ -61,7 +61,7 @@ public void accept(Integer t) {
 
     @Test
     public void completedOkFlowable() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
         Flowable.range(1, 10).ignoreElements().toFlowable().subscribe(ts);
         ts.assertNoErrors();
         ts.assertNoValues();
@@ -70,7 +70,7 @@ public void completedOkFlowable() {
 
     @Test
     public void errorReceivedFlowable() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
         TestException ex = new TestException("boo");
         Flowable.error(ex).ignoreElements().toFlowable().subscribe(ts);
         ts.assertNoValues();
@@ -173,7 +173,7 @@ public void accept(Integer t) {
 
     @Test
     public void completedOk() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         Flowable.range(1, 10).ignoreElements().subscribe(to);
         to.assertNoErrors();
         to.assertNoValues();
@@ -182,7 +182,7 @@ public void completedOk() {
 
     @Test
     public void errorReceived() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         TestException ex = new TestException("boo");
         Flowable.error(ex).ignoreElements().subscribe(to);
         to.assertNoValues();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java
index a5ec88c154..68b8bd59fd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java
@@ -40,7 +40,7 @@ public void badRequest() {
 
     @Test
     public void cancelledOnRun() {
-        TestSubscriber<Long> ts = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts = new TestSubscriber<>();
         IntervalSubscriber is = new IntervalSubscriber(ts);
         ts.onSubscribe(is);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java
index 3ec6b8f771..0deec9376b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java
@@ -29,7 +29,7 @@
 public class FlowableMapNotificationTest extends RxJavaTest {
     @Test
     public void just() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         Flowable.just(1)
         .flatMap(
                 new Function<Integer, Flowable<Object>>() {
@@ -61,7 +61,7 @@ public Flowable<Object> get() {
     public void backpressure() {
         TestSubscriber<Object> ts = TestSubscriber.create(0L);
 
-        new FlowableMapNotification<Integer, Integer>(Flowable.range(1, 3),
+        new FlowableMapNotification<>(Flowable.range(1, 3),
                 new Function<Integer, Integer>() {
                     @Override
                     public Integer apply(Integer item) {
@@ -105,7 +105,7 @@ public void noBackpressure() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        new FlowableMapNotification<Integer, Integer>(pp,
+        new FlowableMapNotification<>(pp,
                 new Function<Integer, Integer>() {
                     @Override
                     public Integer apply(Integer item) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
index 35dba45e2b..c12aafa21d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
@@ -155,7 +155,7 @@ public String apply(Map<String, String> map) {
 
     @Test
     public void mapWithError() {
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         Flowable<String> w = Flowable.just("one", "fail", "two", "three", "fail");
         Flowable<String> m = w.map(new Function<String, String>() {
@@ -261,7 +261,7 @@ public Integer apply(Integer i) {
     }
 
     private static Map<String, String> getMap(String prefix) {
-        Map<String, String> m = new HashMap<String, String>();
+        Map<String, String> m = new HashMap<>();
         m.put("firstName", prefix + "First");
         m.put("lastName", prefix + "Last");
         return m;
@@ -272,7 +272,7 @@ public void functionCrashUnsubscribes() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         pp.map(new Function<Integer, Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java
index a6f63f3cf2..1d798e6272 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java
@@ -102,7 +102,7 @@ public void multipleSubscribes() throws InterruptedException, ExecutionException
 
     @Test
     public void backpressureOnEmptyStream() {
-        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<Notification<Integer>>(0L);
+        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<>(0L);
         Flowable.<Integer> empty().materialize().subscribe(ts);
         ts.assertNoValues();
         ts.request(1);
@@ -113,7 +113,7 @@ public void backpressureOnEmptyStream() {
 
     @Test
     public void backpressureNoError() {
-        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<Notification<Integer>>(0L);
+        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<>(0L);
         Flowable.just(1, 2, 3).materialize().subscribe(ts);
         ts.assertNoValues();
         ts.request(1);
@@ -127,7 +127,7 @@ public void backpressureNoError() {
 
     @Test
     public void backpressureNoErrorAsync() throws InterruptedException {
-        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<Notification<Integer>>(0L);
+        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<>(0L);
         Flowable.just(1, 2, 3)
             .materialize()
             .subscribeOn(Schedulers.computation())
@@ -148,7 +148,7 @@ public void backpressureNoErrorAsync() throws InterruptedException {
 
     @Test
     public void backpressureWithError() {
-        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<Notification<Integer>>(0L);
+        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<>(0L);
         Flowable.<Integer> error(new IllegalArgumentException()).materialize().subscribe(ts);
         ts.assertNoValues();
         ts.request(1);
@@ -158,7 +158,7 @@ public void backpressureWithError() {
 
     @Test
     public void backpressureWithEmissionThenError() {
-        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<Notification<Integer>>(0L);
+        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<>(0L);
         IllegalArgumentException ex = new IllegalArgumentException();
         Flowable.fromIterable(Arrays.asList(1)).concatWith(Flowable.<Integer> error(ex)).materialize()
                 .subscribe(ts);
@@ -175,7 +175,7 @@ public void backpressureWithEmissionThenError() {
 
     @Test
     public void withCompletionCausingError() {
-        TestSubscriberEx<Notification<Integer>> ts = new TestSubscriberEx<Notification<Integer>>();
+        TestSubscriberEx<Notification<Integer>> ts = new TestSubscriberEx<>();
         final RuntimeException ex = new RuntimeException("boo");
         Flowable.<Integer>empty().materialize().doOnNext(new Consumer<Object>() {
             @Override
@@ -190,7 +190,7 @@ public void accept(Object t) {
 
     @Test
     public void unsubscribeJustBeforeCompletionNotificationShouldPreventThatNotificationArriving() {
-        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<Notification<Integer>>(0L);
+        TestSubscriber<Notification<Integer>> ts = new TestSubscriber<>(0L);
 
         Flowable.<Integer>empty().materialize()
                 .subscribe(ts);
@@ -204,7 +204,7 @@ private static class TestNotificationSubscriber extends DefaultSubscriber<Notifi
 
         boolean onComplete;
         boolean onError;
-        List<Notification<String>> notifications = new Vector<Notification<String>>();
+        List<Notification<String>> notifications = new Vector<>();
 
         @Override
         public void onComplete() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
index f80323abdd..7a528e8cb2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
@@ -257,7 +257,7 @@ public void mergeArray() {
     public void mergeList() {
         final Flowable<String> f1 = Flowable.unsafeCreate(new TestSynchronousFlowable());
         final Flowable<String> f2 = Flowable.unsafeCreate(new TestSynchronousFlowable());
-        List<Flowable<String>> listOfFlowables = new ArrayList<Flowable<String>>();
+        List<Flowable<String>> listOfFlowables = new ArrayList<>();
         listOfFlowables.add(f1);
         listOfFlowables.add(f2);
 
@@ -438,7 +438,7 @@ public void onNext(String args) {
 
     @Test
     public void errorInParentFlowable() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         Flowable.mergeDelayError(
                 Flowable.just(Flowable.just(1), Flowable.just(2))
                         .startWithItem(Flowable.<Integer> error(new RuntimeException()))
@@ -467,7 +467,7 @@ public void subscribe(Subscriber<? super Flowable<String>> op) {
 
             stringSubscriber = TestHelper.mockSubscriber();
 
-            TestSubscriberEx<String> ts = new TestSubscriberEx<String>(stringSubscriber);
+            TestSubscriberEx<String> ts = new TestSubscriberEx<>(stringSubscriber);
             Flowable<String> m = Flowable.mergeDelayError(parentFlowable);
             m.subscribe(ts);
             System.out.println("testErrorInParentFlowableDelayed | " + i);
@@ -506,7 +506,7 @@ public void run() {
 
     @Test
     public void delayErrorMaxConcurrent() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
         Flowable<Integer> source = Flowable.mergeDelayError(Flowable.just(
                 Flowable.just(1).hide(),
                 Flowable.<Integer>error(new TestException()))
@@ -517,7 +517,7 @@ public void accept(long t1) {
                     }
                 }), 1);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         source.subscribe(ts);
 
@@ -532,7 +532,7 @@ public void accept(long t1) {
     public void mergeIterable() {
         final Flowable<String> f1 = Flowable.unsafeCreate(new TestSynchronousFlowable());
         final Flowable<String> f2 = Flowable.unsafeCreate(new TestSynchronousFlowable());
-        List<Flowable<String>> listOfFlowables = new ArrayList<Flowable<String>>();
+        List<Flowable<String>> listOfFlowables = new ArrayList<>();
         listOfFlowables.add(f1);
         listOfFlowables.add(f2);
 
@@ -574,7 +574,7 @@ public void iterableMaxConcurrent() {
     @SuppressWarnings("unchecked")
     @Test
     public void iterableMaxConcurrentError() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
         PublishProcessor<Integer> pp2 = PublishProcessor.create();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
index 979c29a9aa..b2582430bb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
@@ -34,14 +34,14 @@ public class FlowableMergeMaxConcurrentTest extends RxJavaTest {
     @Test
     public void whenMaxConcurrentIsOne() {
         for (int i = 0; i < 100; i++) {
-            List<Flowable<String>> os = new ArrayList<Flowable<String>>();
+            List<Flowable<String>> os = new ArrayList<>();
             os.add(Flowable.just("one", "two", "three", "four", "five").subscribeOn(Schedulers.newThread()));
             os.add(Flowable.just("one", "two", "three", "four", "five").subscribeOn(Schedulers.newThread()));
             os.add(Flowable.just("one", "two", "three", "four", "five").subscribeOn(Schedulers.newThread()));
 
             List<String> expected = Arrays.asList("one", "two", "three", "four", "five", "one", "two", "three", "four", "five", "one", "two", "three", "four", "five");
             Iterator<String> iter = Flowable.merge(os, 1).blockingIterable().iterator();
-            List<String> actual = new ArrayList<String>();
+            List<String> actual = new ArrayList<>();
             while (iter.hasNext()) {
                 actual.add(iter.next());
             }
@@ -57,8 +57,8 @@ public void maxConcurrent() {
             int maxConcurrent = 2 + (times % 10);
             AtomicInteger subscriptionCount = new AtomicInteger(0);
 
-            List<Flowable<String>> os = new ArrayList<Flowable<String>>();
-            List<SubscriptionCheckObservable> scos = new ArrayList<SubscriptionCheckObservable>();
+            List<Flowable<String>> os = new ArrayList<>();
+            List<SubscriptionCheckObservable> scos = new ArrayList<>();
             for (int i = 0; i < observableCount; i++) {
                 SubscriptionCheckObservable sco = new SubscriptionCheckObservable(subscriptionCount, maxConcurrent);
                 scos.add(sco);
@@ -66,7 +66,7 @@ public void maxConcurrent() {
             }
 
             Iterator<String> iter = Flowable.merge(os, maxConcurrent).blockingIterable().iterator();
-            List<String> actual = new ArrayList<String>();
+            List<String> actual = new ArrayList<>();
             while (iter.hasNext()) {
                 actual.add(iter.next());
             }
@@ -118,7 +118,7 @@ public void run() {
     @Test
     public void mergeALotOfSourcesOneByOneSynchronously() {
         int n = 10000;
-        List<Flowable<Integer>> sourceList = new ArrayList<Flowable<Integer>>(n);
+        List<Flowable<Integer>> sourceList = new ArrayList<>(n);
         for (int i = 0; i < n; i++) {
             sourceList.add(Flowable.just(i));
         }
@@ -134,7 +134,7 @@ public void mergeALotOfSourcesOneByOneSynchronously() {
     @Test
     public void mergeALotOfSourcesOneByOneSynchronouslyTakeHalf() {
         int n = 10000;
-        List<Flowable<Integer>> sourceList = new ArrayList<Flowable<Integer>>(n);
+        List<Flowable<Integer>> sourceList = new ArrayList<>(n);
         for (int i = 0; i < n; i++) {
             sourceList.add(Flowable.just(i));
         }
@@ -150,9 +150,9 @@ public void mergeALotOfSourcesOneByOneSynchronouslyTakeHalf() {
     @Test
     public void simple() {
         for (int i = 1; i < 100; i++) {
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
-            List<Flowable<Integer>> sourceList = new ArrayList<Flowable<Integer>>(i);
-            List<Integer> result = new ArrayList<Integer>(i);
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+            List<Flowable<Integer>> sourceList = new ArrayList<>(i);
+            List<Integer> result = new ArrayList<>(i);
             for (int j = 1; j <= i; j++) {
                 sourceList.add(Flowable.just(j));
                 result.add(j);
@@ -169,9 +169,9 @@ public void simple() {
     @Test
     public void simpleOneLess() {
         for (int i = 2; i < 100; i++) {
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
-            List<Flowable<Integer>> sourceList = new ArrayList<Flowable<Integer>>(i);
-            List<Integer> result = new ArrayList<Integer>(i);
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+            List<Flowable<Integer>> sourceList = new ArrayList<>(i);
+            List<Integer> result = new ArrayList<>(i);
             for (int j = 1; j <= i; j++) {
                 sourceList.add(Flowable.just(j));
                 result.add(j);
@@ -201,9 +201,9 @@ public void simpleAsyncLoop() {
     @Test
     public void simpleAsync() {
         for (int i = 1; i < 50; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-            List<Flowable<Integer>> sourceList = new ArrayList<Flowable<Integer>>(i);
-            Set<Integer> expected = new HashSet<Integer>(i);
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+            List<Flowable<Integer>> sourceList = new ArrayList<>(i);
+            Set<Integer> expected = new HashSet<>(i);
             for (int j = 1; j <= i; j++) {
                 sourceList.add(Flowable.just(j).subscribeOn(Schedulers.io()));
                 expected.add(j);
@@ -213,7 +213,7 @@ public void simpleAsync() {
 
             ts.awaitDone(1, TimeUnit.SECONDS);
             ts.assertNoErrors();
-            Set<Integer> actual = new HashSet<Integer>(ts.values());
+            Set<Integer> actual = new HashSet<>(ts.values());
 
             assertEquals(expected, actual);
         }
@@ -233,9 +233,9 @@ public void simpleOneLessAsync() {
             if (System.currentTimeMillis() - t > TimeUnit.SECONDS.toMillis(9)) {
                 break;
             }
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-            List<Flowable<Integer>> sourceList = new ArrayList<Flowable<Integer>>(i);
-            Set<Integer> expected = new HashSet<Integer>(i);
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+            List<Flowable<Integer>> sourceList = new ArrayList<>(i);
+            Set<Integer> expected = new HashSet<>(i);
             for (int j = 1; j <= i; j++) {
                 sourceList.add(Flowable.just(j).subscribeOn(Schedulers.io()));
                 expected.add(j);
@@ -245,7 +245,7 @@ public void simpleOneLessAsync() {
 
             ts.awaitDone(1, TimeUnit.SECONDS);
             ts.assertNoErrors();
-            Set<Integer> actual = new HashSet<Integer>(ts.values());
+            Set<Integer> actual = new HashSet<>(ts.values());
 
             assertEquals(expected, actual);
         }
@@ -253,7 +253,7 @@ public void simpleOneLessAsync() {
 
     @Test
     public void backpressureHonored() throws Exception {
-        List<Flowable<Integer>> sourceList = new ArrayList<Flowable<Integer>>(3);
+        List<Flowable<Integer>> sourceList = new ArrayList<>(3);
 
         sourceList.add(Flowable.range(0, 100000).subscribeOn(Schedulers.io()));
         sourceList.add(Flowable.range(0, 100000).subscribeOn(Schedulers.io()));
@@ -284,13 +284,13 @@ public void onNext(Integer t) {
 
     @Test
     public void take() throws Exception {
-        List<Flowable<Integer>> sourceList = new ArrayList<Flowable<Integer>>(3);
+        List<Flowable<Integer>> sourceList = new ArrayList<>(3);
 
         sourceList.add(Flowable.range(0, 100000).subscribeOn(Schedulers.io()));
         sourceList.add(Flowable.range(0, 100000).subscribeOn(Schedulers.io()));
         sourceList.add(Flowable.range(0, 100000).subscribeOn(Schedulers.io()));
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.merge(sourceList, 2).take(5).subscribe(ts);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
index 22526d1922..6b3f72e2f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
@@ -115,7 +115,7 @@ public void mergeArray() {
     public void mergeList() {
         final Flowable<String> f1 = Flowable.unsafeCreate(new TestSynchronousFlowable());
         final Flowable<String> f2 = Flowable.unsafeCreate(new TestSynchronousFlowable());
-        List<Flowable<String>> listOfFlowables = new ArrayList<Flowable<String>>();
+        List<Flowable<String>> listOfFlowables = new ArrayList<>();
         listOfFlowables.add(f1);
         listOfFlowables.add(f2);
 
@@ -201,7 +201,7 @@ public void mergeArrayWithThreading() {
         final TestASynchronousFlowable f2 = new TestASynchronousFlowable();
 
         Flowable<String> m = Flowable.merge(Flowable.unsafeCreate(f1), Flowable.unsafeCreate(f2));
-        TestSubscriber<String> ts = new TestSubscriber<String>(stringSubscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(stringSubscriber);
         m.subscribe(ts);
 
         ts.awaitDone(5, TimeUnit.SECONDS);
@@ -231,7 +231,7 @@ public void synchronizationOfMultipleSequences() throws Throwable {
         final AtomicInteger concurrentCounter = new AtomicInteger();
         final AtomicInteger totalCounter = new AtomicInteger();
 
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         Flowable<String> m = Flowable.merge(Flowable.unsafeCreate(f1), Flowable.unsafeCreate(f2));
         m.subscribe(new DefaultSubscriber<String>() {
@@ -424,7 +424,7 @@ public void unsubscribeAsFlowablesComplete() {
         AtomicBoolean os2 = new AtomicBoolean(false);
         Flowable<Long> f2 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);
 
-        TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>();
+        TestSubscriberEx<Long> ts = new TestSubscriberEx<>();
         Flowable.merge(f1, f2).subscribe(ts);
 
         // we haven't incremented time so nothing should be received yet
@@ -466,7 +466,7 @@ public void earlyUnsubscribe() {
             AtomicBoolean os2 = new AtomicBoolean(false);
             Flowable<Long> f2 = createFlowableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);
 
-            TestSubscriber<Long> ts = new TestSubscriber<Long>();
+            TestSubscriber<Long> ts = new TestSubscriber<>();
             Flowable.merge(f1, f2).subscribe(ts);
 
             // we haven't incremented time so nothing should be received yet
@@ -542,7 +542,7 @@ public void concurrency() {
 
         for (int i = 0; i < 10; i++) {
             Flowable<Integer> merge = Flowable.merge(f.onBackpressureBuffer(), f.onBackpressureBuffer(), f.onBackpressureBuffer());
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
             merge.subscribe(ts);
 
             ts.awaitDone(3, TimeUnit.SECONDS);
@@ -595,7 +595,7 @@ public void run() {
 
         for (int i = 0; i < 10; i++) {
             Flowable<Integer> merge = Flowable.merge(f, f, f);
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
             merge.subscribe(ts);
 
             ts.awaitDone(5, TimeUnit.SECONDS);
@@ -642,7 +642,7 @@ public void run() {
 
         for (int i = 0; i < 10; i++) {
             Flowable<Integer> merge = Flowable.merge(f.onBackpressureBuffer(), f.onBackpressureBuffer(), f.onBackpressureBuffer());
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
             merge.subscribe(ts);
 
             ts.awaitDone(5, TimeUnit.SECONDS);
@@ -866,7 +866,7 @@ public void onNext(Integer t) {
 
     @Test
     public void merge1AsyncStreamOf1() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(1, 1).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -875,7 +875,7 @@ public void merge1AsyncStreamOf1() {
 
     @Test
     public void merge1AsyncStreamOf1000() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(1, 1000).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -884,7 +884,7 @@ public void merge1AsyncStreamOf1000() {
 
     @Test
     public void merge10AsyncStreamOf1000() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(10, 1000).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -893,7 +893,7 @@ public void merge10AsyncStreamOf1000() {
 
     @Test
     public void merge1000AsyncStreamOf1000() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(1000, 1000).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -902,7 +902,7 @@ public void merge1000AsyncStreamOf1000() {
 
     @Test
     public void merge2000AsyncStreamOf100() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(2000, 100).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -911,7 +911,7 @@ public void merge2000AsyncStreamOf100() {
 
     @Test
     public void merge100AsyncStreamOf1() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(100, 1).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -933,7 +933,7 @@ public Flowable<Integer> apply(Integer i) {
 
     @Test
     public void merge1SyncStreamOf1() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(1, 1).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -942,7 +942,7 @@ public void merge1SyncStreamOf1() {
 
     @Test
     public void merge1SyncStreamOf1000000() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(1, 1000000).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -951,7 +951,7 @@ public void merge1SyncStreamOf1000000() {
 
     @Test
     public void merge1000SyncStreamOf1000() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(1000, 1000).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -960,7 +960,7 @@ public void merge1000SyncStreamOf1000() {
 
     @Test
     public void merge10000SyncStreamOf10() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(10000, 10).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -969,7 +969,7 @@ public void merge10000SyncStreamOf10() {
 
     @Test
     public void merge1000000SyncStreamOf1() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(1000000, 1).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -1016,7 +1016,7 @@ public boolean hasNext() {
 
     @Test
     public void mergeManyAsyncSingle() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable<Flowable<Integer>> os = Flowable.range(1, 10000)
         .map(new Function<Integer, Flowable<Integer>>() {
 
@@ -1051,7 +1051,7 @@ public void subscribe(Subscriber<? super Integer> s) {
     @Test
     public void shouldCompleteAfterApplyingBackpressure_NormalPath() {
         Flowable<Integer> source = Flowable.mergeDelayError(Flowable.just(Flowable.range(1, 2)));
-        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<>(0L);
         source.subscribe(subscriber);
         subscriber.request(3); // 1, 2, <complete> - with request(2) we get the 1 and 2 but not the <complete>
         subscriber.assertValues(1, 2);
@@ -1061,7 +1061,7 @@ public void shouldCompleteAfterApplyingBackpressure_NormalPath() {
     @Test
     public void shouldCompleteAfterApplyingBackpressure_FastPath() {
         Flowable<Integer> source = Flowable.mergeDelayError(Flowable.just(Flowable.just(1)));
-        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<>(0L);
         source.subscribe(subscriber);
         subscriber.request(2); // 1, <complete> - should work as per .._NormalPath above
         subscriber.assertValue(1);
@@ -1072,7 +1072,7 @@ public void shouldCompleteAfterApplyingBackpressure_FastPath() {
     public void shouldNotCompleteIfThereArePendingScalarSynchronousEmissionsWhenTheLastInnerSubscriberCompletes() {
         TestScheduler scheduler = new TestScheduler();
         Flowable<Long> source = Flowable.mergeDelayError(Flowable.just(1L), Flowable.timer(1, TimeUnit.SECONDS, scheduler).skip(1));
-        TestSubscriberEx<Long> subscriber = new TestSubscriberEx<Long>(0L);
+        TestSubscriberEx<Long> subscriber = new TestSubscriberEx<>(0L);
         source.subscribe(subscriber);
         scheduler.advanceTimeBy(1, TimeUnit.SECONDS);
         subscriber.assertNoValues();
@@ -1089,7 +1089,7 @@ public void shouldNotCompleteIfThereArePendingScalarSynchronousEmissionsWhenTheL
     public void delayedErrorsShouldBeEmittedWhenCompleteAfterApplyingBackpressure_NormalPath() {
         Throwable exception = new Throwable();
         Flowable<Integer> source = Flowable.mergeDelayError(Flowable.range(1, 2), Flowable.<Integer>error(exception));
-        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<>(0L);
         source.subscribe(subscriber);
         subscriber.request(3); // 1, 2, <error>
         subscriber.assertValues(1, 2);
@@ -1101,7 +1101,7 @@ public void delayedErrorsShouldBeEmittedWhenCompleteAfterApplyingBackpressure_No
     public void delayedErrorsShouldBeEmittedWhenCompleteAfterApplyingBackpressure_FastPath() {
         Throwable exception = new Throwable();
         Flowable<Integer> source = Flowable.mergeDelayError(Flowable.just(1), Flowable.<Integer>error(exception));
-        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<>(0L);
         source.subscribe(subscriber);
         subscriber.request(2); // 1, <error>
         subscriber.assertValue(1);
@@ -1112,7 +1112,7 @@ public void delayedErrorsShouldBeEmittedWhenCompleteAfterApplyingBackpressure_Fa
     @Test
     public void shouldNotCompleteWhileThereAreStillScalarSynchronousEmissionsInTheQueue() {
         Flowable<Integer> source = Flowable.merge(Flowable.just(1), Flowable.just(2));
-        TestSubscriber<Integer> subscriber = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> subscriber = new TestSubscriber<>(1L);
         source.subscribe(subscriber);
         subscriber.assertValue(1);
         subscriber.request(1);
@@ -1123,7 +1123,7 @@ public void shouldNotCompleteWhileThereAreStillScalarSynchronousEmissionsInTheQu
     public void shouldNotReceivedDelayedErrorWhileThereAreStillScalarSynchronousEmissionsInTheQueue() {
         Throwable exception = new Throwable();
         Flowable<Integer> source = Flowable.mergeDelayError(Flowable.just(1), Flowable.just(2), Flowable.<Integer>error(exception));
-        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<>(0L);
         subscriber.request(1);
         source.subscribe(subscriber);
         subscriber.assertValue(1);
@@ -1137,7 +1137,7 @@ public void shouldNotReceivedDelayedErrorWhileThereAreStillScalarSynchronousEmis
     public void shouldNotReceivedDelayedErrorWhileThereAreStillNormalEmissionsInTheQueue() {
         Throwable exception = new Throwable();
         Flowable<Integer> source = Flowable.mergeDelayError(Flowable.range(1, 2), Flowable.range(3, 2), Flowable.<Integer>error(exception));
-        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<>(0L);
         subscriber.request(3);
         source.subscribe(subscriber);
         subscriber.assertValues(1, 2, 3);
@@ -1152,7 +1152,7 @@ public void mergeKeepsRequesting() throws InterruptedException {
         //for (int i = 0; i < 5000; i++) {
             //System.out.println(i + ".......................................................................");
             final CountDownLatch latch = new CountDownLatch(1);
-            final ConcurrentLinkedQueue<String> messages = new ConcurrentLinkedQueue<String>();
+            final ConcurrentLinkedQueue<String> messages = new ConcurrentLinkedQueue<>();
 
             Flowable.range(1, 2)
                     // produce many integers per second
@@ -1280,7 +1280,7 @@ public Flowable<Integer> apply(Integer t) {
     ;
 
     void runMerge(Function<Integer, Flowable<Integer>> func, TestSubscriberEx<Integer> ts) {
-        List<Integer> list = new ArrayList<Integer>();
+        List<Integer> list = new ArrayList<>();
         for (int i = 0; i < 1000; i++) {
             list.add(i);
         }
@@ -1298,12 +1298,12 @@ void runMerge(Function<Integer, Flowable<Integer>> func, TestSubscriberEx<Intege
 
     @Test
     public void fastMergeFullScalar() {
-        runMerge(toScalar, new TestSubscriberEx<Integer>());
+        runMerge(toScalar, new TestSubscriberEx<>());
     }
 
     @Test
     public void fastMergeHiddenScalar() {
-        runMerge(toHiddenScalar, new TestSubscriberEx<Integer>());
+        runMerge(toHiddenScalar, new TestSubscriberEx<>());
     }
 
     @Test
@@ -1466,7 +1466,7 @@ public void flatMapMaxConcurrentJustRange() {
     public void noInnerReordering() {
         TestSubscriber<Integer> ts = TestSubscriber.create(0);
         FlowableFlatMap.MergeSubscriber<Publisher<Integer>, Integer> ms =
-                new FlowableFlatMap.MergeSubscriber<Publisher<Integer>, Integer>(ts, Functions.<Publisher<Integer>>identity(), false, 128, 128);
+                new FlowableFlatMap.MergeSubscriber<>(ts, Functions.<Publisher<Integer>>identity(), false, 128, 128);
         ms.onSubscribe(new BooleanSubscription());
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
@@ -1488,7 +1488,7 @@ public void noInnerReordering() {
     public void noOuterScalarReordering() {
         TestSubscriber<Integer> ts = TestSubscriber.create(0);
         FlowableFlatMap.MergeSubscriber<Publisher<Integer>, Integer> ms =
-                new FlowableFlatMap.MergeSubscriber<Publisher<Integer>, Integer>(ts, Functions.<Publisher<Integer>>identity(), false, 128, 128);
+                new FlowableFlatMap.MergeSubscriber<>(ts, Functions.<Publisher<Integer>>identity(), false, 128, 128);
         ms.onSubscribe(new BooleanSubscription());
 
         ms.onNext(Flowable.just(1));
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java
index 9008168d48..c074796be6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java
@@ -29,7 +29,7 @@ public class FlowableMergeWithCompletableTest extends RxJavaTest {
 
     @Test
     public void normal() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 5).mergeWith(
                 Completable.fromAction(new Action() {
@@ -71,7 +71,7 @@ public void cancel() {
 
     @Test
     public void normalBackpressured() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Flowable.range(1, 5).mergeWith(
                 Completable.fromAction(new Action() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
index 604daa4950..e5ef48a426 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
@@ -230,7 +230,7 @@ public void onSuccessFastPathBackpressuredRace() {
             final PublishProcessor<Integer> pp = PublishProcessor.create();
             final MaybeSubject<Integer> cs = MaybeSubject.create();
 
-            final TestSubscriber<Integer> ts = pp.mergeWith(cs).subscribeWith(new TestSubscriber<Integer>(0));
+            final TestSubscriber<Integer> ts = pp.mergeWith(cs).subscribeWith(new TestSubscriber<>(0));
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -259,7 +259,7 @@ public void run() {
     public void onErrorMainOverflow() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<Subscriber<?>> subscriber = new AtomicReference<Subscriber<?>>();
+            final AtomicReference<Subscriber<?>> subscriber = new AtomicReference<>();
             TestSubscriber<Integer> ts = new Flowable<Integer>() {
                 @Override
                 protected void subscribeActual(Subscriber<? super Integer> s) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
index 4c5cd09d5b..a48ee16fef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
@@ -87,7 +87,7 @@ public void cancel() {
 
     @Test
     public void normalBackpressured() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Flowable.range(1, 5).mergeWith(
                 Single.just(100)
@@ -226,7 +226,7 @@ public void onSuccessFastPathBackpressuredRace() {
             final PublishProcessor<Integer> pp = PublishProcessor.create();
             final SingleSubject<Integer> cs = SingleSubject.create();
 
-            final TestSubscriber<Integer> ts = pp.mergeWith(cs).subscribeWith(new TestSubscriber<Integer>(0));
+            final TestSubscriber<Integer> ts = pp.mergeWith(cs).subscribeWith(new TestSubscriber<>(0));
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -255,7 +255,7 @@ public void run() {
     public void onErrorMainOverflow() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<Subscriber<?>> subscriber = new AtomicReference<Subscriber<?>>();
+            final AtomicReference<Subscriber<?>> subscriber = new AtomicReference<>();
             TestSubscriber<Integer> ts = new Flowable<Integer>() {
                 @Override
                 protected void subscribeActual(Subscriber<? super Integer> s) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
index 994926b237..73efdfc426 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
@@ -65,7 +65,7 @@ public void ordering() throws InterruptedException {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
 
         InOrder inOrder = inOrder(subscriber);
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>(subscriber);
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>(subscriber);
 
         obs.observeOn(Schedulers.computation()).subscribe(ts);
 
@@ -384,7 +384,7 @@ public void afterUnsubscribeCalledThenObserverOnNextNeverCalled() {
         final TestScheduler testScheduler = new TestScheduler();
 
         final Subscriber<Integer> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(subscriber);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(subscriber);
 
         Flowable.just(1, 2, 3)
                 .observeOn(testScheduler)
@@ -519,7 +519,7 @@ public boolean hasNext() {
             }
         });
 
-        TestSubscriber<Integer> testSubscriber = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> testSubscriber = new TestSubscriber<>();
         flowable
                 .take(7)
                 .observeOn(Schedulers.newThread())
@@ -547,7 +547,7 @@ public void subscribe(Subscriber<? super Integer> subscriber) {
 
         });
 
-        TestSubscriberEx<Integer> testSubscriber = new TestSubscriberEx<Integer>(new DefaultSubscriber<Integer>() {
+        TestSubscriberEx<Integer> testSubscriber = new TestSubscriberEx<>(new DefaultSubscriber<Integer>() {
 
             @Override
             public void onComplete() {
@@ -590,7 +590,7 @@ public void onNext(Integer t) {
 
     @Test
     public void asyncChild() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(0, 100000).observeOn(Schedulers.newThread()).observeOn(Schedulers.newThread()).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -602,7 +602,7 @@ public void onErrorCutsAheadOfOnNext() {
             final PublishProcessor<Long> processor = PublishProcessor.create();
 
             final AtomicLong counter = new AtomicLong();
-            TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>(new DefaultSubscriber<Long>() {
+            TestSubscriberEx<Long> ts = new TestSubscriberEx<>(new DefaultSubscriber<Long>() {
 
                 @Override
                 public void onComplete() {
@@ -649,7 +649,7 @@ public void onNext(Long t) {
      */
     @Test
     public void hotOperatorBackpressure() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>();
         Flowable.interval(0, 1, TimeUnit.MICROSECONDS)
                 .observeOn(Schedulers.computation())
                 .map(new Function<Long, String>() {
@@ -697,7 +697,7 @@ public void accept(Notification<Long> n) {
 
                 });
 
-        TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>();
+        TestSubscriberEx<Long> ts = new TestSubscriberEx<>();
 
         Flowable.combineLatest(timer, Flowable.<Integer> never(), new BiFunction<Long, Integer, Long>() {
 
@@ -757,7 +757,7 @@ public void onNext(Integer t) {
     @Test
     public void noMoreRequestsAfterUnsubscribe() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
-        final List<Long> requests = Collections.synchronizedList(new ArrayList<Long>());
+        final List<Long> requests = Collections.synchronizedList(new ArrayList<>());
         Flowable.range(1, 1000000)
                 .doOnRequest(new LongConsumer() {
 
@@ -873,7 +873,7 @@ public void fixedReplenishPattern() {
 
         TestScheduler test = new TestScheduler();
 
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
 
         Flowable.range(1, 100)
         .doOnRequest(new LongConsumer() {
@@ -918,9 +918,9 @@ public void bufferSizesWork() {
 
     @Test
     public void synchronousRebatching() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 50)
         .doOnRequest(new LongConsumer() {
@@ -1594,7 +1594,7 @@ public void onNext(Integer t) {
 
     @Test
     public void syncFusedCancelAfterRequest2() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(2L);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(2L);
 
         Flowable.range(1, 2)
         .observeOn(Schedulers.single())
@@ -1630,7 +1630,7 @@ public void onNext(Integer t) {
 
     @Test
     public void syncFusedCancelAfterRequestConditional2() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(2L);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(2L);
 
         Flowable.range(1, 2)
         .observeOn(Schedulers.single())
@@ -1644,7 +1644,7 @@ public void syncFusedCancelAfterRequestConditional2() {
 
     @Test
     public void nonFusedCancelAfterRequestConditional2() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(2L);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(2L);
 
         Flowable.range(1, 2).hide()
         .observeOn(Schedulers.single())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
index 91a2b3b7c5..327078ad60 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
@@ -58,7 +58,7 @@ public void run() throws Exception {
     }
 
     private TestSubscriber<Long> createTestSubscriber() {
-        return new TestSubscriber<Long>(new DefaultSubscriber<Long>() {
+        return new TestSubscriber<>(new DefaultSubscriber<Long>() {
 
             @Override
             protected void onStart() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
index 3d32d2c808..a877b1a390 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
@@ -39,7 +39,7 @@ public class FlowableOnBackpressureBufferTest extends RxJavaTest {
 
     @Test
     public void noBackpressureSupport() {
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(0L);
+        TestSubscriber<Long> ts = new TestSubscriber<>(0L);
         // this will be ignored
         ts.request(100);
         // we take 500 so it unsubscribes
@@ -53,7 +53,7 @@ public void noBackpressureSupport() {
     public void fixBackpressureWithBuffer() throws InterruptedException {
         final CountDownLatch l1 = new CountDownLatch(100);
         final CountDownLatch l2 = new CountDownLatch(150);
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(new DefaultSubscriber<Long>() {
+        TestSubscriber<Long> ts = new TestSubscriber<>(new DefaultSubscriber<Long>() {
 
             @Override
             protected void onStart() {
@@ -110,17 +110,19 @@ public void fixBackpressureBufferZeroCapacity() throws InterruptedException {
     public void fixBackpressureBoundedBuffer() throws InterruptedException {
         final CountDownLatch l1 = new CountDownLatch(100);
         final CountDownLatch backpressureCallback = new CountDownLatch(1);
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(new DefaultSubscriber<Long>() {
+        TestSubscriber<Long> ts = new TestSubscriber<>(new DefaultSubscriber<Long>() {
 
             @Override
             protected void onStart() {
             }
 
             @Override
-            public void onComplete() { }
+            public void onComplete() {
+            }
 
             @Override
-            public void onError(Throwable e) { }
+            public void onError(Throwable e) {
+            }
 
             @Override
             public void onNext(Long t) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java
index dabf934ce3..811e27f766 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java
@@ -32,7 +32,7 @@ public class FlowableOnBackpressureDropTest extends RxJavaTest {
 
     @Test
     public void noBackpressureSupport() {
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(0L);
+        TestSubscriber<Long> ts = new TestSubscriber<>(0L);
         // this will be ignored
         ts.request(100);
         // we take 500 so it unsubscribes
@@ -44,7 +44,7 @@ public void noBackpressureSupport() {
 
     @Test
     public void withObserveOn() throws InterruptedException {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(0, Flowable.bufferSize() * 10).onBackpressureDrop().observeOn(Schedulers.io()).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
     }
@@ -53,7 +53,7 @@ public void withObserveOn() throws InterruptedException {
     public void fixBackpressureWithBuffer() throws InterruptedException {
         final CountDownLatch l1 = new CountDownLatch(100);
         final CountDownLatch l2 = new CountDownLatch(150);
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(new DefaultSubscriber<Long>() {
+        TestSubscriber<Long> ts = new TestSubscriber<>(new DefaultSubscriber<Long>() {
 
             @Override
             protected void onStart() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
index a2288abcb1..76fad7bf49 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
@@ -37,7 +37,7 @@ public void doubleOnSubscribe() {
         TestHelper.checkDoubleOnSubscribeFlowable(new Function<Flowable<Object>, Publisher<Object>>() {
             @Override
             public Publisher<Object> apply(Flowable<Object> f) throws Exception {
-                return new FlowableOnBackpressureError<Object>(f);
+                return new FlowableOnBackpressureError<>(f);
             }
         });
     }
@@ -47,7 +47,7 @@ public void badSource() {
         TestHelper.<Integer>checkBadSourceFlowable(new Function<Flowable<Integer>, Object>() {
             @Override
             public Object apply(Flowable<Integer> f) throws Exception {
-                return new FlowableOnBackpressureError<Integer>(f);
+                return new FlowableOnBackpressureError<>(f);
             }
         }, false, 1, 1, 1);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
index bb52136b0e..438ebb1415 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
@@ -30,7 +30,7 @@
 public class FlowableOnBackpressureLatestTest extends RxJavaTest {
     @Test
     public void simple() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.range(1, 5).onBackpressureLatest().subscribe(ts);
 
@@ -41,7 +41,7 @@ public void simple() {
 
     @Test
     public void simpleError() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.range(1, 5).concatWith(Flowable.<Integer>error(new TestException()))
         .onBackpressureLatest().subscribe(ts);
@@ -53,7 +53,7 @@ public void simpleError() {
 
     @Test
     public void simpleBackpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(2L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(2L);
 
         Flowable.range(1, 5).onBackpressureLatest().subscribe(ts);
 
@@ -65,7 +65,7 @@ public void simpleBackpressure() {
     @Test
     public void synchronousDrop() {
         PublishProcessor<Integer> source = PublishProcessor.create();
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
 
         source.onBackpressureLatest().subscribe(ts);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
index 742b1e5853..b8829893fa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
@@ -148,7 +148,7 @@ public void run() {
 
     @Test
     public void backpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(0, 100000)
                 .onErrorResumeWith(Flowable.just(1))
                 .observeOn(Schedulers.computation())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
index 72a0bf0161..51de11ae7b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
@@ -39,7 +39,7 @@ public class FlowableOnErrorResumeNextViaFunctionTest extends RxJavaTest {
 
     @Test
     public void resumeNextWithSynchronousExecution() {
-        final AtomicReference<Throwable> receivedException = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> receivedException = new AtomicReference<>();
         Flowable<String> w = Flowable.unsafeCreate(new Publisher<String>() {
 
             @Override
@@ -79,7 +79,7 @@ public Flowable<String> apply(Throwable t1) {
 
     @Test
     public void resumeNextWithAsyncExecution() {
-        final AtomicReference<Throwable> receivedException = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> receivedException = new AtomicReference<>();
         Subscription s = mock(Subscription.class);
         TestFlowable w = new TestFlowable(s, "one");
         Function<Throwable, Flowable<String>> resume = new Function<Throwable, Flowable<String>>() {
@@ -176,7 +176,7 @@ public Flowable<String> apply(Throwable t1) {
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
 
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber, Long.MAX_VALUE);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber, Long.MAX_VALUE);
         flowable.subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
 
@@ -228,7 +228,7 @@ public void run() {
 
     @Test
     public void backpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(0, 100000)
                 .onErrorResumeNext(new Function<Throwable, Flowable<Integer>>() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java
index 324cfe0eec..ecde026f95 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java
@@ -39,7 +39,7 @@ public class FlowableOnErrorReturnTest extends RxJavaTest {
     public void resumeNext() {
         TestFlowable f = new TestFlowable("one");
         Flowable<String> w = Flowable.unsafeCreate(f);
-        final AtomicReference<Throwable> capturedException = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> capturedException = new AtomicReference<>();
 
         Flowable<String> flowable = w.onErrorReturn(new Function<Throwable, String>() {
 
@@ -74,7 +74,7 @@ public String apply(Throwable e) {
     public void functionThrowsError() {
         TestFlowable f = new TestFlowable("one");
         Flowable<String> w = Flowable.unsafeCreate(f);
-        final AtomicReference<Throwable> capturedException = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> capturedException = new AtomicReference<>();
 
         Flowable<String> flowable = w.onErrorReturn(new Function<Throwable, String>() {
 
@@ -132,7 +132,7 @@ public String apply(Throwable t1) {
         });
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber, Long.MAX_VALUE);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber, Long.MAX_VALUE);
         flowable.subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
 
@@ -146,7 +146,7 @@ public String apply(Throwable t1) {
 
     @Test
     public void backpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(0, 100000)
                 .onErrorReturn(new Function<Throwable, Integer>() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
index f62616097e..a660eb7429 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
@@ -37,7 +37,7 @@
 public class FlowablePublishFunctionTest extends RxJavaTest {
     @Test
     public void concatTakeFirstLastCompletes() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 3).publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
             @Override
@@ -210,7 +210,7 @@ public Flowable<Integer> apply(Flowable<Integer> f) {
 
     @Test
     public void overflowMissingBackpressureException() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0);
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -236,11 +236,11 @@ public Flowable<Integer> apply(Flowable<Integer> f) {
 
     @Test
     public void overflowMissingBackpressureExceptionDelayed() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0);
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        new FlowablePublishMulticast<Integer, Integer>(pp, new Function<Flowable<Integer>, Flowable<Integer>>() {
+        new FlowablePublishMulticast<>(pp, new Function<Flowable<Integer>, Flowable<Integer>>() {
             @Override
             public Flowable<Integer> apply(Flowable<Integer> f) {
                 return f;
@@ -349,7 +349,7 @@ public Integer apply(Integer v) throws Exception {
 
     @Test
     public void error() {
-        new FlowablePublishMulticast<Integer, Integer>(Flowable.just(1).concatWith(Flowable.<Integer>error(new TestException())),
+        new FlowablePublishMulticast<>(Flowable.just(1).concatWith(Flowable.<Integer>error(new TestException())),
                 Functions.<Flowable<Integer>>identity(), 16, true)
         .test()
         .assertFailure(TestException.class, 1);
@@ -428,7 +428,7 @@ public void inputOutputSubscribeRace2() {
     @Test
     public void sourceSubscriptionDelayed() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>(0L);
 
             Flowable.just(1)
             .publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
index 186285e1f2..0fb61a84c5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
@@ -32,7 +32,7 @@ public class FlowablePublishMulticastTest extends RxJavaTest {
 
     @Test
     public void asyncFusedInput() {
-        MulticastProcessor<Integer> mp = new MulticastProcessor<Integer>(128, true);
+        MulticastProcessor<Integer> mp = new MulticastProcessor<>(128, true);
 
         UnicastProcessor<Integer> up = UnicastProcessor.create();
 
@@ -51,7 +51,7 @@ public void asyncFusedInput() {
 
     @Test
     public void fusionRejectedInput() {
-        MulticastProcessor<Integer> mp = new MulticastProcessor<Integer>(128, true);
+        MulticastProcessor<Integer> mp = new MulticastProcessor<>(128, true);
 
         mp.onSubscribe(new QueueSubscription<Integer>() {
 
@@ -106,10 +106,10 @@ public void cancel() {
     public void addRemoveRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
-            final MulticastProcessor<Integer> mp = new MulticastProcessor<Integer>(128, true);
+            final MulticastProcessor<Integer> mp = new MulticastProcessor<>(128, true);
 
-            final MulticastSubscription<Integer> ms1 = new MulticastSubscription<Integer>(null, mp);
-            final MulticastSubscription<Integer> ms2 = new MulticastSubscription<Integer>(null, mp);
+            final MulticastSubscription<Integer> ms1 = new MulticastSubscription<>(null, mp);
+            final MulticastSubscription<Integer> ms2 = new MulticastSubscription<>(null, mp);
 
             assertTrue(mp.add(ms1));
 
@@ -133,9 +133,9 @@ public void run() {
 
     @Test
     public void removeNotFound() {
-        MulticastProcessor<Integer> mp = new MulticastProcessor<Integer>(128, true);
+        MulticastProcessor<Integer> mp = new MulticastProcessor<>(128, true);
 
-        MulticastSubscription<Integer> ms1 = new MulticastSubscription<Integer>(null, mp);
+        MulticastSubscription<Integer> ms1 = new MulticastSubscription<>(null, mp);
         assertTrue(mp.add(ms1));
 
         mp.remove(null);
@@ -143,9 +143,9 @@ public void removeNotFound() {
 
     @Test
     public void errorAllCancelled() {
-        MulticastProcessor<Integer> mp = new MulticastProcessor<Integer>(128, true);
+        MulticastProcessor<Integer> mp = new MulticastProcessor<>(128, true);
 
-        MulticastSubscription<Integer> ms1 = new MulticastSubscription<Integer>(null, mp);
+        MulticastSubscription<Integer> ms1 = new MulticastSubscription<>(null, mp);
         assertTrue(mp.add(ms1));
 
         ms1.set(Long.MIN_VALUE);
@@ -155,9 +155,9 @@ public void errorAllCancelled() {
 
     @Test
     public void completeAllCancelled() {
-        MulticastProcessor<Integer> mp = new MulticastProcessor<Integer>(128, true);
+        MulticastProcessor<Integer> mp = new MulticastProcessor<>(128, true);
 
-        MulticastSubscription<Integer> ms1 = new MulticastSubscription<Integer>(null, mp);
+        MulticastSubscription<Integer> ms1 = new MulticastSubscription<>(null, mp);
         assertTrue(mp.add(ms1));
 
         ms1.set(Long.MIN_VALUE);
@@ -167,9 +167,9 @@ public void completeAllCancelled() {
 
     @Test
     public void cancelledWhileFindingRequests() {
-        final MulticastProcessor<Integer> mp = new MulticastProcessor<Integer>(128, true);
+        final MulticastProcessor<Integer> mp = new MulticastProcessor<>(128, true);
 
-        final MulticastSubscription<Integer> ms1 = new MulticastSubscription<Integer>(null, mp);
+        final MulticastSubscription<Integer> ms1 = new MulticastSubscription<>(null, mp);
 
         assertTrue(mp.add(ms1));
 
@@ -182,9 +182,9 @@ public void cancelledWhileFindingRequests() {
 
     @Test
     public void negativeRequest() {
-        final MulticastProcessor<Integer> mp = new MulticastProcessor<Integer>(128, true);
+        final MulticastProcessor<Integer> mp = new MulticastProcessor<>(128, true);
 
-        final MulticastSubscription<Integer> ms1 = new MulticastSubscription<Integer>(null, mp);
+        final MulticastSubscription<Integer> ms1 = new MulticastSubscription<>(null, mp);
 
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -198,19 +198,19 @@ public void negativeRequest() {
 
     @Test
     public void outputCancellerDoubleOnSubscribe() {
-        TestHelper.doubleOnSubscribe(new OutputCanceller<Object>(new TestSubscriber<Object>(), null));
+        TestHelper.doubleOnSubscribe(new OutputCanceller<>(new TestSubscriber<>(), null));
     }
 
     @Test
     public void dontDropItemsWhenNoReadyConsumers() {
-        final MulticastProcessor<Integer> mp = new MulticastProcessor<Integer>(128, true);
+        final MulticastProcessor<Integer> mp = new MulticastProcessor<>(128, true);
 
         mp.onSubscribe(new BooleanSubscription());
 
         mp.onNext(1);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-        final MulticastSubscription<Integer> ms1 = new MulticastSubscription<Integer>(ts, mp);
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        final MulticastSubscription<Integer> ms1 = new MulticastSubscription<>(ts, mp);
         ts.onSubscribe(ms1);
 
         assertTrue(mp.add(ms1));
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
index 0ecba3926f..ec7c88da09 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
@@ -128,7 +128,7 @@ public void run() {
 
         });
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.merge(fast, slow).subscribe(ts);
         is.connect();
         ts.awaitDone(5, TimeUnit.SECONDS);
@@ -148,7 +148,7 @@ public void accept(Integer t1) {
             }
 
         });
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         xs.publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
 
             @Override
@@ -175,7 +175,7 @@ public boolean test(Integer i) {
     @Test
     public void takeUntilWithPublishedStream() {
         Flowable<Integer> xs = Flowable.range(0, Flowable.bufferSize() * 2);
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ConnectableFlowable<Integer> xsp = xs.publish();
         xsp.takeUntil(xsp.skipWhile(new Predicate<Integer>() {
 
@@ -211,7 +211,7 @@ public void run() {
         final AtomicBoolean child1Unsubscribed = new AtomicBoolean();
         final AtomicBoolean child2Unsubscribed = new AtomicBoolean();
 
-        final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts2 = new TestSubscriber<>();
 
         final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>() {
             @Override
@@ -259,7 +259,7 @@ public void connectWithNoSubscriber() {
         cf.connect();
         // Emit 0
         scheduler.advanceTimeBy(15, TimeUnit.MILLISECONDS);
-        TestSubscriber<Long> subscriber = new TestSubscriber<Long>();
+        TestSubscriber<Long> subscriber = new TestSubscriber<>();
         cf.subscribe(subscriber);
         // Emit 1 and 2
         scheduler.advanceTimeBy(50, TimeUnit.MILLISECONDS);
@@ -271,7 +271,7 @@ public void connectWithNoSubscriber() {
     public void subscribeAfterDisconnectThenConnect() {
         ConnectableFlowable<Integer> source = Flowable.just(1).publish();
 
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
 
         source.subscribe(ts1);
 
@@ -283,7 +283,7 @@ public void subscribeAfterDisconnectThenConnect() {
 
         source.reset();
 
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>();
 
         source.subscribe(ts2);
 
@@ -301,7 +301,7 @@ public void subscribeAfterDisconnectThenConnect() {
     public void noSubscriberRetentionOnCompleted() {
         FlowablePublish<Integer> source = (FlowablePublish<Integer>)Flowable.just(1).publish();
 
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
 
         source.subscribe(ts1);
 
@@ -353,7 +353,7 @@ static boolean checkPublishDisposed(Disposable d) {
     public void zeroRequested() {
         ConnectableFlowable<Integer> source = Flowable.just(1).publish();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
 
         source.subscribe(ts);
 
@@ -408,9 +408,9 @@ public void syncFusedObserveOn() {
         Flowable<Integer> obs = cf.observeOn(Schedulers.computation());
         for (int i = 0; i < 1000; i++) {
             for (int j = 1; j < 6; j++) {
-                List<TestSubscriberEx<Integer>> tss = new ArrayList<TestSubscriberEx<Integer>>();
+                List<TestSubscriberEx<Integer>> tss = new ArrayList<>();
                 for (int k = 1; k < j; k++) {
-                    TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+                    TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
                     tss.add(ts);
                     obs.subscribe(ts);
                 }
@@ -435,9 +435,9 @@ public void syncFusedObserveOn2() {
         Flowable<Integer> obs = cf.observeOn(ImmediateThinScheduler.INSTANCE);
         for (int i = 0; i < 1000; i++) {
             for (int j = 1; j < 6; j++) {
-                List<TestSubscriberEx<Integer>> tss = new ArrayList<TestSubscriberEx<Integer>>();
+                List<TestSubscriberEx<Integer>> tss = new ArrayList<>();
                 for (int k = 1; k < j; k++) {
-                    TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+                    TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
                     tss.add(ts);
                     obs.subscribe(ts);
                 }
@@ -461,9 +461,9 @@ public void asyncFusedObserveOn() {
         ConnectableFlowable<Integer> cf = Flowable.range(0, 1000).observeOn(ImmediateThinScheduler.INSTANCE).publish();
         for (int i = 0; i < 1000; i++) {
             for (int j = 1; j < 6; j++) {
-                List<TestSubscriberEx<Integer>> tss = new ArrayList<TestSubscriberEx<Integer>>();
+                List<TestSubscriberEx<Integer>> tss = new ArrayList<>();
                 for (int k = 1; k < j; k++) {
-                    TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+                    TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
                     tss.add(ts);
                     cf.subscribe(ts);
                 }
@@ -488,9 +488,9 @@ public void observeOn() {
         Flowable<Integer> obs = cf.observeOn(Schedulers.computation());
         for (int i = 0; i < 1000; i++) {
             for (int j = 1; j < 6; j++) {
-                List<TestSubscriberEx<Integer>> tss = new ArrayList<TestSubscriberEx<Integer>>();
+                List<TestSubscriberEx<Integer>> tss = new ArrayList<>();
                 for (int k = 1; k < j; k++) {
-                    TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+                    TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
                     tss.add(ts);
                     obs.subscribe(ts);
                 }
@@ -539,7 +539,7 @@ public void addRemoveRace() {
 
             final TestSubscriber<Integer> ts = cf.test();
 
-            final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts2 = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -694,7 +694,7 @@ public void subscribeDisconnectRace() {
             final ConnectableFlowable<Integer> cf = pp.publish();
 
             final Disposable d = cf.connect();
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -938,7 +938,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
     public void disposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
 
-            final AtomicReference<Disposable> ref = new AtomicReference<Disposable>();
+            final AtomicReference<Disposable> ref = new AtomicReference<>();
 
             final ConnectableFlowable<Integer> cf = new Flowable<Integer>() {
                 @Override
@@ -963,7 +963,7 @@ public void run() {
 
     @Test
     public void removeNotPresent() {
-        final AtomicReference<PublishConnection<Integer>> ref = new AtomicReference<PublishConnection<Integer>>();
+        final AtomicReference<PublishConnection<Integer>> ref = new AtomicReference<>();
 
         final ConnectableFlowable<Integer> cf = new Flowable<Integer>() {
             @Override
@@ -976,7 +976,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
 
         cf.connect();
 
-        ref.get().add(new InnerSubscription<Integer>(new TestSubscriber<Integer>(), ref.get()));
+        ref.get().add(new InnerSubscription<>(new TestSubscriber<>(), ref.get()));
         ref.get().remove(null);
     }
 
@@ -999,7 +999,7 @@ public void onNext(Integer t) {
 
         ts1.assertResult(1);
 
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(0);
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(0);
         cf.subscribe(ts2);
 
         ts2
@@ -1012,7 +1012,7 @@ public void onNext(Integer t) {
     public void subscriberLiveSwap() {
         final ConnectableFlowable<Integer> cf = Flowable.range(1, 5).publish();
 
-        final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(0);
+        final TestSubscriber<Integer> ts2 = new TestSubscriber<>(0);
 
         TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>() {
             @Override
@@ -1038,7 +1038,7 @@ public void onNext(Integer t) {
 
     @Test
     public void selectorSubscriberSwap() {
-        final AtomicReference<Flowable<Integer>> ref = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> ref = new AtomicReference<>();
 
         Flowable.range(1, 5).publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
             @Override
@@ -1061,7 +1061,7 @@ public Publisher<Integer> apply(Flowable<Integer> f) throws Exception {
 
     @Test
     public void leavingSubscriberOverrequests() {
-        final AtomicReference<Flowable<Integer>> ref = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> ref = new AtomicReference<>();
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -1205,7 +1205,7 @@ public Publisher<? extends Integer> apply(Integer first)
 
     @Test
     public void publishFunctionCancelOuterAfterOneInner() {
-        final AtomicReference<Flowable<Integer>> ref = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> ref = new AtomicReference<>();
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -1231,7 +1231,7 @@ public void onNext(Integer t) {
 
     @Test
     public void publishFunctionCancelOuterAfterOneInnerBackpressured() {
-        final AtomicReference<Flowable<Integer>> ref = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> ref = new AtomicReference<>();
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -1261,7 +1261,7 @@ public void publishCancelOneAsync() {
 
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
-            final AtomicReference<Flowable<Integer>> ref = new AtomicReference<Flowable<Integer>>();
+            final AtomicReference<Flowable<Integer>> ref = new AtomicReference<>();
 
             pp.publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
                 @Override
@@ -1300,9 +1300,9 @@ public void publishCancelOneAsync2() {
 
         ConnectableFlowable<Integer> cf = pp.publish();
 
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
-        final AtomicReference<InnerSubscription<Integer>> ref = new AtomicReference<InnerSubscription<Integer>>();
+        final AtomicReference<InnerSubscription<Integer>> ref = new AtomicReference<>();
 
         cf.subscribe(new FlowableSubscriber<Integer>() {
             @SuppressWarnings("unchecked")
@@ -1500,7 +1500,7 @@ public boolean test(List<Integer> v) throws Exception {
     @Test
     public void altConnectCrash() {
         try {
-            new FlowablePublish<Integer>(Flowable.<Integer>empty(), 128)
+            new FlowablePublish<>(Flowable.<Integer>empty(), 128)
             .connect(new Consumer<Disposable>() {
                 @Override
                 public void accept(Disposable t) throws Exception {
@@ -1517,7 +1517,7 @@ public void accept(Disposable t) throws Exception {
     public void altConnectRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
             final ConnectableFlowable<Integer> cf =
-                    new FlowablePublish<Integer>(Flowable.<Integer>never(), 128);
+                    new FlowablePublish<>(Flowable.<Integer>never(), 128);
 
             Runnable r = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
index afc677aefe..96401918ef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
@@ -98,7 +98,7 @@ public void rangeWithOverflow5() {
     public void backpressureViaRequest() {
         Flowable<Long> f = Flowable.rangeLong(1, Flowable.bufferSize());
 
-        TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>(0L);
+        TestSubscriberEx<Long> ts = new TestSubscriberEx<>(0L);
 
         ts.assertNoValues();
         ts.request(1);
@@ -119,14 +119,14 @@ public void backpressureViaRequest() {
 
     @Test
     public void noBackpressure() {
-        ArrayList<Long> list = new ArrayList<Long>(Flowable.bufferSize() * 2);
+        ArrayList<Long> list = new ArrayList<>(Flowable.bufferSize() * 2);
         for (long i = 1; i <= Flowable.bufferSize() * 2 + 1; i++) {
             list.add(i);
         }
 
         Flowable<Long> f = Flowable.rangeLong(1, list.size());
 
-        TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>(0L);
+        TestSubscriberEx<Long> ts = new TestSubscriberEx<>(0L);
 
         ts.assertNoValues();
         ts.request(Long.MAX_VALUE); // infinite
@@ -139,11 +139,11 @@ public void noBackpressure() {
     void withBackpressureOneByOne(long start) {
         Flowable<Long> source = Flowable.rangeLong(start, 100);
 
-        TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>(0L);
+        TestSubscriberEx<Long> ts = new TestSubscriberEx<>(0L);
         ts.request(1);
         source.subscribe(ts);
 
-        List<Long> list = new ArrayList<Long>(100);
+        List<Long> list = new ArrayList<>(100);
         for (long i = 0; i < 100; i++) {
             list.add(i + start);
             ts.request(1);
@@ -154,11 +154,11 @@ void withBackpressureOneByOne(long start) {
     void withBackpressureAllAtOnce(long start) {
         Flowable<Long> source = Flowable.rangeLong(start, 100);
 
-        TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>(0L);
+        TestSubscriberEx<Long> ts = new TestSubscriberEx<>(0L);
         ts.request(100);
         source.subscribe(ts);
 
-        List<Long> list = new ArrayList<Long>(100);
+        List<Long> list = new ArrayList<>(100);
         for (long i = 0; i < 100; i++) {
             list.add(i + start);
         }
@@ -184,11 +184,11 @@ public void withBackpressureAllAtOnce() {
     public void withBackpressureRequestWayMore() {
         Flowable<Long> source = Flowable.rangeLong(50, 100);
 
-        TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>(0L);
+        TestSubscriberEx<Long> ts = new TestSubscriberEx<>(0L);
         ts.request(150);
         source.subscribe(ts);
 
-        List<Long> list = new ArrayList<Long>(100);
+        List<Long> list = new ArrayList<>(100);
         for (long i = 0; i < 100; i++) {
             list.add(i + 50);
         }
@@ -257,7 +257,7 @@ public void onNext(Long t) {
 
     @Test
     public void nearMaxValueWithoutBackpressure() {
-        TestSubscriber<Long> ts = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts = new TestSubscriber<>();
         Flowable.rangeLong(Long.MAX_VALUE - 1L, 2L).subscribe(ts);
 
         ts.assertComplete();
@@ -267,7 +267,7 @@ public void nearMaxValueWithoutBackpressure() {
 
     @Test
     public void nearMaxValueWithBackpressure() {
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(3L);
+        TestSubscriber<Long> ts = new TestSubscriber<>(3L);
         Flowable.rangeLong(Long.MAX_VALUE - 1L, 2L).subscribe(ts);
 
         ts.assertComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
index a8d42213c9..39ab84ad63 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
@@ -98,7 +98,7 @@ public void rangeWithOverflow5() {
     public void backpressureViaRequest() {
         Flowable<Integer> f = Flowable.range(1, Flowable.bufferSize());
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
 
         ts.assertNoValues();
         ts.request(1);
@@ -119,14 +119,14 @@ public void backpressureViaRequest() {
 
     @Test
     public void noBackpressure() {
-        ArrayList<Integer> list = new ArrayList<Integer>(Flowable.bufferSize() * 2);
+        ArrayList<Integer> list = new ArrayList<>(Flowable.bufferSize() * 2);
         for (int i = 1; i <= Flowable.bufferSize() * 2 + 1; i++) {
             list.add(i);
         }
 
         Flowable<Integer> f = Flowable.range(1, list.size());
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
 
         ts.assertNoValues();
         ts.request(Long.MAX_VALUE); // infinite
@@ -139,11 +139,11 @@ public void noBackpressure() {
     void withBackpressureOneByOne(int start) {
         Flowable<Integer> source = Flowable.range(start, 100);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
         ts.request(1);
         source.subscribe(ts);
 
-        List<Integer> list = new ArrayList<Integer>(100);
+        List<Integer> list = new ArrayList<>(100);
         for (int i = 0; i < 100; i++) {
             list.add(i + start);
             ts.request(1);
@@ -154,11 +154,11 @@ void withBackpressureOneByOne(int start) {
     void withBackpressureAllAtOnce(int start) {
         Flowable<Integer> source = Flowable.range(start, 100);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
         ts.request(100);
         source.subscribe(ts);
 
-        List<Integer> list = new ArrayList<Integer>(100);
+        List<Integer> list = new ArrayList<>(100);
         for (int i = 0; i < 100; i++) {
             list.add(i + start);
         }
@@ -184,11 +184,11 @@ public void withBackpressureAllAtOnce() {
     public void withBackpressureRequestWayMore() {
         Flowable<Integer> source = Flowable.range(50, 100);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
         ts.request(150);
         source.subscribe(ts);
 
-        List<Integer> list = new ArrayList<Integer>(100);
+        List<Integer> list = new ArrayList<>(100);
         for (int i = 0; i < 100; i++) {
             list.add(i + 50);
         }
@@ -257,7 +257,7 @@ public void onNext(Integer t) {
 
     @Test
     public void nearMaxValueWithoutBackpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(Integer.MAX_VALUE - 1, 2).subscribe(ts);
 
         ts.assertComplete();
@@ -267,7 +267,7 @@ public void nearMaxValueWithoutBackpressure() {
 
     @Test
     public void nearMaxValueWithBackpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(3L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(3L);
         Flowable.range(Integer.MAX_VALUE - 1, 2).subscribe(ts);
 
         ts.assertComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
index 975740cfe3..169409ed1b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
@@ -205,8 +205,8 @@ public void run() {
                 .publish().refCount();
 
         for (int i = 0; i < 10; i++) {
-            TestSubscriber<Long> ts1 = new TestSubscriber<Long>();
-            TestSubscriber<Long> ts2 = new TestSubscriber<Long>();
+            TestSubscriber<Long> ts1 = new TestSubscriber<>();
+            TestSubscriber<Long> ts2 = new TestSubscriber<>();
             r.subscribe(ts1);
             r.subscribe(ts2);
             try {
@@ -248,7 +248,7 @@ public void run() {
                     }
                 });
 
-        TestSubscriberEx<Long> s = new TestSubscriberEx<Long>();
+        TestSubscriberEx<Long> s = new TestSubscriberEx<>();
         f.publish().refCount().subscribeOn(Schedulers.newThread()).subscribe(s);
         System.out.println("send unsubscribe");
         // wait until connected
@@ -293,7 +293,7 @@ public void accept(Subscription s) {
                     }
                 });
 
-        TestSubscriberEx<Long> s = new TestSubscriberEx<Long>();
+        TestSubscriberEx<Long> s = new TestSubscriberEx<>();
 
         f.publish().refCount().subscribeOn(Schedulers.computation()).subscribe(s);
         System.out.println("send unsubscribe");
@@ -386,7 +386,7 @@ public void refCount() {
         Flowable<Long> interval = Flowable.interval(100, TimeUnit.MILLISECONDS, s).publish().refCount();
 
         // subscribe list1
-        final List<Long> list1 = new ArrayList<Long>();
+        final List<Long> list1 = new ArrayList<>();
         Disposable d1 = interval.subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long t1) {
@@ -401,7 +401,7 @@ public void accept(Long t1) {
         assertEquals(1L, list1.get(1).longValue());
 
         // subscribe list2
-        final List<Long> list2 = new ArrayList<Long>();
+        final List<Long> list2 = new ArrayList<>();
         Disposable d2 = interval.subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long t1) {
@@ -446,7 +446,7 @@ public void accept(Long t1) {
 
         // subscribing a new one should start over because the source should have been unsubscribed
         // subscribe list3
-        final List<Long> list3 = new ArrayList<Long>();
+        final List<Long> list3 = new ArrayList<>();
         interval.subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long t1) {
@@ -517,8 +517,8 @@ public Integer apply(Integer t1, Integer t2) {
         })
         .publish().refCount();
 
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>();
 
         combined.subscribe(ts1);
         combined.subscribe(ts2);
@@ -1184,7 +1184,7 @@ public void unsubscribeSubscribeRace() {
 
             final TestSubscriber<Integer> ts1 = source.test(0);
 
-            final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(0);
+            final TestSubscriber<Integer> ts2 = new TestSubscriber<>(0);
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1388,7 +1388,7 @@ protected void subscribeActual(Subscriber<? super T> subscriber) {
 
     @Test
     public void timeoutResetsSource() {
-        TestConnectableFlowable<Object> tcf = new TestConnectableFlowable<Object>();
+        TestConnectableFlowable<Object> tcf = new TestConnectableFlowable<>();
         FlowableRefCount<Object> o = (FlowableRefCount<Object>)tcf.refCount();
 
         RefConnection rc = new RefConnection(o);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java
index c99e09a45a..29959688ad 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java
@@ -164,7 +164,7 @@ public void repeatAndDistinctUnbounded() {
                 .repeat(3)
                 .distinct();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         src.subscribe(ts);
 
@@ -176,8 +176,8 @@ public void repeatAndDistinctUnbounded() {
     /** Issue #2844: wrong target of request. */
     @Test
     public void repeatRetarget() {
-        final List<Integer> concatBase = new ArrayList<Integer>();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final List<Integer> concatBase = new ArrayList<>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.just(1, 2)
         .repeat(5)
         .concatMap(new Function<Integer, Flowable<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
index d17526e47b..f263b98f66 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
@@ -732,14 +732,14 @@ public boolean isDisposed() {
 
     @Test
     public void boundedReplayBuffer() {
-        BoundedReplayBuffer<Integer> buf = new BoundedReplayBuffer<Integer>(true);
+        BoundedReplayBuffer<Integer> buf = new BoundedReplayBuffer<>(true);
         buf.addLast(new Node(1, 0));
         buf.addLast(new Node(2, 1));
         buf.addLast(new Node(3, 2));
         buf.addLast(new Node(4, 3));
         buf.addLast(new Node(5, 4));
 
-        List<Integer> values = new ArrayList<Integer>();
+        List<Integer> values = new ArrayList<>();
         buf.collect(values);
 
         Assert.assertEquals(Arrays.asList(1, 2, 3, 4, 5), values);
@@ -762,8 +762,8 @@ public void boundedReplayBuffer() {
     @Test
     public void timedAndSizedTruncation() {
         TestScheduler test = new TestScheduler();
-        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test, true);
-        List<Integer> values = new ArrayList<Integer>();
+        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, true);
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         test.advanceTimeBy(1, TimeUnit.SECONDS);
@@ -808,8 +808,8 @@ public void accept(long t) {
                 });
         ConnectableFlowable<Integer> cf = source.replay();
 
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>(10L);
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>(90L);
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>(10L);
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>(90L);
 
         cf.subscribe(ts1);
         cf.subscribe(ts2);
@@ -839,8 +839,8 @@ public void accept(long t) {
                 });
         ConnectableFlowable<Integer> cf = source.replay(50, true);
 
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>(10L);
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>(90L);
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>(10L);
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>(90L);
 
         cf.subscribe(ts1);
         cf.subscribe(ts2);
@@ -862,7 +862,7 @@ public void accept(long t) {
     public void coldReplayNoBackpressure() {
         Flowable<Integer> source = Flowable.range(0, 1000).replay().autoConnect();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         source.subscribe(ts);
 
@@ -880,7 +880,7 @@ public void coldReplayNoBackpressure() {
     public void coldReplayBackpressure() {
         Flowable<Integer> source = Flowable.range(0, 1000).replay().autoConnect();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
         ts.request(10);
 
         source.subscribe(ts);
@@ -961,7 +961,7 @@ public void unsubscribeSource() throws Throwable {
 
     @Test
     public void take() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable<Integer> cached = Flowable.range(1, 100).replay().autoConnect();
         cached.take(10).subscribe(ts);
@@ -975,7 +975,7 @@ public void take() {
     public void async() {
         Flowable<Integer> source = Flowable.range(1, 10000);
         for (int i = 0; i < 100; i++) {
-            TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
 
             Flowable<Integer> cached = source.replay().autoConnect();
 
@@ -986,7 +986,7 @@ public void async() {
             ts1.assertTerminated();
             assertEquals(10000, ts1.values().size());
 
-            TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>();
             cached.observeOn(Schedulers.computation()).subscribe(ts2);
 
             ts2.awaitDone(2, TimeUnit.SECONDS);
@@ -1005,14 +1005,14 @@ public void asyncComeAndGo() {
 
         Flowable<Long> output = cached.observeOn(Schedulers.computation(), false, 1024);
 
-        List<TestSubscriberEx<Long>> list = new ArrayList<TestSubscriberEx<Long>>(100);
+        List<TestSubscriberEx<Long>> list = new ArrayList<>(100);
         for (int i = 0; i < 100; i++) {
-            TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>();
+            TestSubscriberEx<Long> ts = new TestSubscriberEx<>();
             list.add(ts);
             output.skip(i * 10).take(10).subscribe(ts);
         }
 
-        List<Long> expected = new ArrayList<Long>();
+        List<Long> expected = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
             expected.add((long)(i - 10));
         }
@@ -1046,7 +1046,7 @@ public void subscribe(Subscriber<? super Integer> t) {
             }
         });
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         firehose.replay().autoConnect().observeOn(Schedulers.computation()).takeLast(100).subscribe(ts);
 
         ts.awaitDone(3, TimeUnit.SECONDS);
@@ -1062,14 +1062,14 @@ public void valuesAndThenError() {
                 .concatWith(Flowable.<Integer>error(new TestException()))
                 .replay().autoConnect();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         source.subscribe(ts);
 
         ts.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
         ts.assertNotComplete();
         Assert.assertEquals(1, ts.errors().size());
 
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>();
         source.subscribe(ts2);
 
         ts2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
@@ -1110,7 +1110,7 @@ public void onNext(Integer t) {
     public void unboundedLeavesEarly() {
         PublishProcessor<Integer> source = PublishProcessor.create();
 
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
 
         Flowable<Integer> out = source
                 .doOnRequest(new LongConsumer() {
@@ -1120,8 +1120,8 @@ public void accept(long t) {
                     }
                 }).replay().autoConnect();
 
-        TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>(5L);
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(10L);
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>(5L);
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(10L);
 
         out.subscribe(ts1);
         out.subscribe(ts2);
@@ -1135,7 +1135,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ConnectableFlowable<Integer> source = Flowable.range(1, 10).replay(1, true);
         source.connect();
 
-        TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>(2L);
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>(2L);
 
         source.subscribe(ts1);
 
@@ -1143,7 +1143,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ts1.assertNoErrors();
         ts1.cancel();
 
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(2L);
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(2L);
 
         source.subscribe(ts2);
 
@@ -1151,7 +1151,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ts2.assertNoErrors();
         ts2.cancel();
 
-        TestSubscriber<Integer> ts21 = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts21 = new TestSubscriber<>(1L);
 
         source.subscribe(ts21);
 
@@ -1159,7 +1159,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ts21.assertNoErrors();
         ts21.cancel();
 
-        TestSubscriber<Integer> ts22 = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts22 = new TestSubscriber<>(1L);
 
         source.subscribe(ts22);
 
@@ -1167,7 +1167,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ts22.assertNoErrors();
         ts22.cancel();
 
-        TestSubscriber<Integer> ts3 = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts3 = new TestSubscriber<>();
 
         source.subscribe(ts3);
 
@@ -1182,7 +1182,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ConnectableFlowable<Integer> source = Flowable.range(1, 10).replay(2, true);
         source.connect();
 
-        TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>(2L);
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>(2L);
 
         source.subscribe(ts1);
 
@@ -1190,7 +1190,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts1.assertNoErrors();
         ts1.cancel();
 
-        TestSubscriber<Integer> ts11 = new TestSubscriber<Integer>(2L);
+        TestSubscriber<Integer> ts11 = new TestSubscriber<>(2L);
 
         source.subscribe(ts11);
 
@@ -1198,7 +1198,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts11.assertNoErrors();
         ts11.cancel();
 
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(3L);
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(3L);
 
         source.subscribe(ts2);
 
@@ -1206,7 +1206,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts2.assertNoErrors();
         ts2.cancel();
 
-        TestSubscriber<Integer> ts21 = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts21 = new TestSubscriber<>(1L);
 
         source.subscribe(ts21);
 
@@ -1214,7 +1214,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts21.assertNoErrors();
         ts21.cancel();
 
-        TestSubscriber<Integer> ts22 = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts22 = new TestSubscriber<>(1L);
 
         source.subscribe(ts22);
 
@@ -1222,7 +1222,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts22.assertNoErrors();
         ts22.cancel();
 
-        TestSubscriber<Integer> ts3 = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts3 = new TestSubscriber<>();
 
         source.subscribe(ts3);
 
@@ -1286,8 +1286,8 @@ public void subscribeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableFlowable<Integer> cf = Flowable.range(1, 3).replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
-            final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
+            final TestSubscriber<Integer> ts2 = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1312,8 +1312,8 @@ public void addRemoveRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableFlowable<Integer> cf = Flowable.range(1, 3).replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
-            final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
+            final TestSubscriber<Integer> ts2 = new TestSubscriber<>();
 
             cf.subscribe(ts1);
 
@@ -1412,7 +1412,7 @@ public void subscribeOnNextRace() {
 
             final ConnectableFlowable<Integer> cf = pp.replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1441,7 +1441,7 @@ public void unsubscribeOnNextRace() {
 
             final ConnectableFlowable<Integer> cf = pp.replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
             cf.subscribe(ts1);
 
@@ -1470,7 +1470,7 @@ public void unsubscribeReplayRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableFlowable<Integer> cf = Flowable.range(1, 1000).replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
             cf.connect();
 
@@ -1592,12 +1592,12 @@ public void replayMaxInt() {
     @Test
     public void timedAndSizedTruncationError() {
         TestScheduler test = new TestScheduler();
-        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test, true);
+        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, true);
 
         Assert.assertFalse(buf.hasCompleted());
         Assert.assertFalse(buf.hasError());
 
-        List<Integer> values = new ArrayList<Integer>();
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         test.advanceTimeBy(1, TimeUnit.SECONDS);
@@ -1635,8 +1635,8 @@ public void timedAndSizedTruncationError() {
 
     @Test
     public void sizedTruncation() {
-        SizeBoundReplayBuffer<Integer> buf = new SizeBoundReplayBuffer<Integer>(2, true);
-        List<Integer> values = new ArrayList<Integer>();
+        SizeBoundReplayBuffer<Integer> buf = new SizeBoundReplayBuffer<>(2, true);
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         buf.next(2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
index b8a7ba3e9d..67763fce0b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
@@ -732,14 +732,14 @@ public boolean isDisposed() {
 
     @Test
     public void boundedReplayBuffer() {
-        BoundedReplayBuffer<Integer> buf = new BoundedReplayBuffer<Integer>(false);
+        BoundedReplayBuffer<Integer> buf = new BoundedReplayBuffer<>(false);
         buf.addLast(new Node(1, 0));
         buf.addLast(new Node(2, 1));
         buf.addLast(new Node(3, 2));
         buf.addLast(new Node(4, 3));
         buf.addLast(new Node(5, 4));
 
-        List<Integer> values = new ArrayList<Integer>();
+        List<Integer> values = new ArrayList<>();
         buf.collect(values);
 
         Assert.assertEquals(Arrays.asList(1, 2, 3, 4, 5), values);
@@ -763,8 +763,8 @@ public void boundedReplayBuffer() {
     @Test
     public void timedAndSizedTruncation() {
         TestScheduler test = new TestScheduler();
-        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test, false);
-        List<Integer> values = new ArrayList<Integer>();
+        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, false);
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         test.advanceTimeBy(1, TimeUnit.SECONDS);
@@ -809,8 +809,8 @@ public void accept(long t) {
                 });
         ConnectableFlowable<Integer> cf = source.replay();
 
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>(10L);
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>(90L);
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>(10L);
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>(90L);
 
         cf.subscribe(ts1);
         cf.subscribe(ts2);
@@ -840,8 +840,8 @@ public void accept(long t) {
                 });
         ConnectableFlowable<Integer> cf = source.replay(50);
 
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>(10L);
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>(90L);
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>(10L);
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>(90L);
 
         cf.subscribe(ts1);
         cf.subscribe(ts2);
@@ -863,7 +863,7 @@ public void accept(long t) {
     public void coldReplayNoBackpressure() {
         Flowable<Integer> source = Flowable.range(0, 1000).replay().autoConnect();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         source.subscribe(ts);
 
@@ -881,7 +881,7 @@ public void coldReplayNoBackpressure() {
     public void coldReplayBackpressure() {
         Flowable<Integer> source = Flowable.range(0, 1000).replay().autoConnect();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
         ts.request(10);
 
         source.subscribe(ts);
@@ -962,7 +962,7 @@ public void unsubscribeSource() throws Throwable {
 
     @Test
     public void take() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable<Integer> cached = Flowable.range(1, 100).replay().autoConnect();
         cached.take(10).subscribe(ts);
@@ -976,7 +976,7 @@ public void take() {
     public void async() {
         Flowable<Integer> source = Flowable.range(1, 10000);
         for (int i = 0; i < 100; i++) {
-            TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
 
             Flowable<Integer> cached = source.replay().autoConnect();
 
@@ -987,7 +987,7 @@ public void async() {
             ts1.assertTerminated();
             assertEquals(10000, ts1.values().size());
 
-            TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>();
             cached.observeOn(Schedulers.computation()).subscribe(ts2);
 
             ts2.awaitDone(2, TimeUnit.SECONDS);
@@ -1006,14 +1006,14 @@ public void asyncComeAndGo() {
 
         Flowable<Long> output = cached.observeOn(Schedulers.computation(), false, 1024);
 
-        List<TestSubscriberEx<Long>> list = new ArrayList<TestSubscriberEx<Long>>(100);
+        List<TestSubscriberEx<Long>> list = new ArrayList<>(100);
         for (int i = 0; i < 100; i++) {
-            TestSubscriberEx<Long> ts = new TestSubscriberEx<Long>();
+            TestSubscriberEx<Long> ts = new TestSubscriberEx<>();
             list.add(ts);
             output.skip(i * 10).take(10).subscribe(ts);
         }
 
-        List<Long> expected = new ArrayList<Long>();
+        List<Long> expected = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
             expected.add((long)(i - 10));
         }
@@ -1047,7 +1047,7 @@ public void subscribe(Subscriber<? super Integer> t) {
             }
         });
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         firehose.replay().autoConnect().observeOn(Schedulers.computation()).takeLast(100).subscribe(ts);
 
         ts.awaitDone(3, TimeUnit.SECONDS);
@@ -1063,14 +1063,14 @@ public void valuesAndThenError() {
                 .concatWith(Flowable.<Integer>error(new TestException()))
                 .replay().autoConnect();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         source.subscribe(ts);
 
         ts.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
         ts.assertNotComplete();
         Assert.assertEquals(1, ts.errors().size());
 
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>();
         source.subscribe(ts2);
 
         ts2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
@@ -1111,7 +1111,7 @@ public void onNext(Integer t) {
     public void unboundedLeavesEarly() {
         PublishProcessor<Integer> source = PublishProcessor.create();
 
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
 
         Flowable<Integer> out = source
                 .doOnRequest(new LongConsumer() {
@@ -1121,8 +1121,8 @@ public void accept(long t) {
                     }
                 }).replay().autoConnect();
 
-        TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>(5L);
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(10L);
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>(5L);
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(10L);
 
         out.subscribe(ts1);
         out.subscribe(ts2);
@@ -1136,7 +1136,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ConnectableFlowable<Integer> source = Flowable.range(1, 10).replay(1);
         source.connect();
 
-        TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>(2L);
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>(2L);
 
         source.subscribe(ts1);
 
@@ -1144,7 +1144,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ts1.assertNoErrors();
         ts1.cancel();
 
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(2L);
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(2L);
 
         source.subscribe(ts2);
 
@@ -1152,7 +1152,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ts2.assertNoErrors();
         ts2.cancel();
 
-        TestSubscriber<Integer> ts21 = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts21 = new TestSubscriber<>(1L);
 
         source.subscribe(ts21);
 
@@ -1160,7 +1160,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ts21.assertNoErrors();
         ts21.cancel();
 
-        TestSubscriber<Integer> ts22 = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts22 = new TestSubscriber<>(1L);
 
         source.subscribe(ts22);
 
@@ -1168,7 +1168,7 @@ public void subscribersComeAndGoAtRequestBoundaries() {
         ts22.assertNoErrors();
         ts22.cancel();
 
-        TestSubscriber<Integer> ts3 = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts3 = new TestSubscriber<>();
 
         source.subscribe(ts3);
 
@@ -1183,7 +1183,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ConnectableFlowable<Integer> source = Flowable.range(1, 10).replay(2);
         source.connect();
 
-        TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>(2L);
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>(2L);
 
         source.subscribe(ts1);
 
@@ -1191,7 +1191,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts1.assertNoErrors();
         ts1.cancel();
 
-        TestSubscriber<Integer> ts11 = new TestSubscriber<Integer>(2L);
+        TestSubscriber<Integer> ts11 = new TestSubscriber<>(2L);
 
         source.subscribe(ts11);
 
@@ -1199,7 +1199,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts11.assertNoErrors();
         ts11.cancel();
 
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(3L);
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(3L);
 
         source.subscribe(ts2);
 
@@ -1207,7 +1207,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts2.assertNoErrors();
         ts2.cancel();
 
-        TestSubscriber<Integer> ts21 = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts21 = new TestSubscriber<>(1L);
 
         source.subscribe(ts21);
 
@@ -1215,7 +1215,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts21.assertNoErrors();
         ts21.cancel();
 
-        TestSubscriber<Integer> ts22 = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts22 = new TestSubscriber<>(1L);
 
         source.subscribe(ts22);
 
@@ -1223,7 +1223,7 @@ public void subscribersComeAndGoAtRequestBoundaries2() {
         ts22.assertNoErrors();
         ts22.cancel();
 
-        TestSubscriber<Integer> ts3 = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts3 = new TestSubscriber<>();
 
         source.subscribe(ts3);
 
@@ -1287,8 +1287,8 @@ public void subscribeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableFlowable<Integer> cf = Flowable.range(1, 3).replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
-            final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
+            final TestSubscriber<Integer> ts2 = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1313,8 +1313,8 @@ public void addRemoveRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableFlowable<Integer> cf = Flowable.range(1, 3).replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
-            final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
+            final TestSubscriber<Integer> ts2 = new TestSubscriber<>();
 
             cf.subscribe(ts1);
 
@@ -1413,7 +1413,7 @@ public void subscribeOnNextRace() {
 
             final ConnectableFlowable<Integer> cf = pp.replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1442,7 +1442,7 @@ public void unsubscribeOnNextRace() {
 
             final ConnectableFlowable<Integer> cf = pp.replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
             cf.subscribe(ts1);
 
@@ -1471,7 +1471,7 @@ public void unsubscribeReplayRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableFlowable<Integer> cf = Flowable.range(1, 1000).replay();
 
-            final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
             cf.connect();
 
@@ -1593,12 +1593,12 @@ public void replayMaxInt() {
     @Test
     public void timedAndSizedTruncationError() {
         TestScheduler test = new TestScheduler();
-        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test, false);
+        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, false);
 
         Assert.assertFalse(buf.hasCompleted());
         Assert.assertFalse(buf.hasError());
 
-        List<Integer> values = new ArrayList<Integer>();
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         test.advanceTimeBy(1, TimeUnit.SECONDS);
@@ -1636,8 +1636,8 @@ public void timedAndSizedTruncationError() {
 
     @Test
     public void sizedTruncation() {
-        SizeBoundReplayBuffer<Integer> buf = new SizeBoundReplayBuffer<Integer>(2, false);
-        List<Integer> values = new ArrayList<Integer>();
+        SizeBoundReplayBuffer<Integer> buf = new SizeBoundReplayBuffer<>(2, false);
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         buf.next(2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
index e2db70633a..4de1cfb8b0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
@@ -63,7 +63,7 @@ public void subscribe(Subscriber<? super String> t1) {
             }
 
         });
-        TestSubscriber<String> ts = new TestSubscriber<String>(consumer);
+        TestSubscriber<String> ts = new TestSubscriber<>(consumer);
         producer.retryWhen(new Function<Flowable<? extends Throwable>, Flowable<Object>>() {
 
             @Override
@@ -117,7 +117,7 @@ public void retryIndefinitely() {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
         int numRetries = 20;
         Flowable<String> origin = Flowable.unsafeCreate(new FuncWithErrors(numRetries));
-        origin.retry().subscribe(new TestSubscriber<String>(subscriber));
+        origin.retry().subscribe(new TestSubscriber<>(subscriber));
 
         InOrder inOrder = inOrder(subscriber);
         // should show 3 attempts
@@ -136,7 +136,7 @@ public void schedulingNotificationHandler() {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
         int numRetries = 2;
         Flowable<String> origin = Flowable.unsafeCreate(new FuncWithErrors(numRetries));
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         origin.retryWhen(new Function<Flowable<? extends Throwable>, Flowable<Object>>() {
             @Override
             public Flowable<Object> apply(Flowable<? extends Throwable> t1) {
@@ -203,7 +203,7 @@ public Integer apply(Throwable t1) {
     public void onCompletedFromNotificationHandler() {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
         Flowable<String> origin = Flowable.unsafeCreate(new FuncWithErrors(1));
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         origin.retryWhen(new Function<Flowable<? extends Throwable>, Flowable<Object>>() {
             @Override
             public Flowable<Object> apply(Flowable<? extends Throwable> t1) {
@@ -498,7 +498,7 @@ public void cancel() {
     public void sourceFlowableCallsUnsubscribe() throws InterruptedException {
         final AtomicInteger subsCount = new AtomicInteger(0);
 
-        final TestSubscriber<String> ts = new TestSubscriber<String>();
+        final TestSubscriber<String> ts = new TestSubscriber<>();
 
         Publisher<String> onSubscribe = new Publisher<String>() {
             @Override
@@ -529,7 +529,7 @@ public void subscribe(Subscriber<? super String> s) {
     public void sourceFlowableRetry1() throws InterruptedException {
         final AtomicInteger subsCount = new AtomicInteger(0);
 
-        final TestSubscriber<String> ts = new TestSubscriber<String>();
+        final TestSubscriber<String> ts = new TestSubscriber<>();
 
         Publisher<String> onSubscribe = new Publisher<String>() {
             @Override
@@ -548,7 +548,7 @@ public void subscribe(Subscriber<? super String> s) {
     public void sourceFlowableRetry0() throws InterruptedException {
         final AtomicInteger subsCount = new AtomicInteger(0);
 
-        final TestSubscriber<String> ts = new TestSubscriber<String>();
+        final TestSubscriber<String> ts = new TestSubscriber<>();
 
         Publisher<String> onSubscribe = new Publisher<String>() {
             @Override
@@ -674,7 +674,7 @@ public void unsubscribeAfterError() {
         SlowFlowable so = new SlowFlowable(100, 0, "testUnsubscribeAfterError");
         Flowable<Long> f = Flowable.unsafeCreate(so).retry(5);
 
-        AsyncSubscriber<Long> async = new AsyncSubscriber<Long>(subscriber);
+        AsyncSubscriber<Long> async = new AsyncSubscriber<>(subscriber);
 
         f.subscribe(async);
 
@@ -698,7 +698,7 @@ public void timeoutWithRetry() {
         SlowFlowable sf = new SlowFlowable(100, 10, "testTimeoutWithRetry");
         Flowable<Long> f = Flowable.unsafeCreate(sf).timeout(80, TimeUnit.MILLISECONDS).retry(5);
 
-        AsyncSubscriber<Long> async = new AsyncSubscriber<Long>(subscriber);
+        AsyncSubscriber<Long> async = new AsyncSubscriber<>(subscriber);
 
         f.subscribe(async);
 
@@ -720,7 +720,7 @@ public void retryWithBackpressure() throws InterruptedException {
             for (int i = 0; i < 400; i++) {
                 Subscriber<String> subscriber = TestHelper.mockSubscriber();
                 Flowable<String> origin = Flowable.unsafeCreate(new FuncWithErrors(numRetries));
-                TestSubscriberEx<String> ts = new TestSubscriberEx<String>(subscriber);
+                TestSubscriberEx<String> ts = new TestSubscriberEx<>(subscriber);
                 origin.retry().observeOn(Schedulers.computation()).subscribe(ts);
                 ts.awaitDone(5, TimeUnit.SECONDS);
 
@@ -751,7 +751,7 @@ public void retryWithBackpressureParallel() throws InterruptedException {
                 }
 
                 final AtomicInteger timeouts = new AtomicInteger();
-                final Map<Integer, List<String>> data = new ConcurrentHashMap<Integer, List<String>>();
+                final Map<Integer, List<String>> data = new ConcurrentHashMap<>();
 
                 int m = 5000;
                 final CountDownLatch cdl = new CountDownLatch(m);
@@ -763,11 +763,11 @@ public void run() {
                             final AtomicInteger nexts = new AtomicInteger();
                             try {
                                 Flowable<String> origin = Flowable.unsafeCreate(new FuncWithErrors(numRetries));
-                                TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+                                TestSubscriberEx<String> ts = new TestSubscriberEx<>();
                                 origin.retry()
                                 .observeOn(Schedulers.computation()).subscribe(ts);
                                 ts.awaitDone(2500, TimeUnit.MILLISECONDS);
-                                List<String> onNextEvents = new ArrayList<String>(ts.values());
+                                List<String> onNextEvents = new ArrayList<>(ts.values());
                                 if (onNextEvents.size() != numRetries + 2) {
                                     for (Throwable t : ts.errors()) {
                                         onNextEvents.add(t.toString());
@@ -865,7 +865,7 @@ public Flowable<String> apply(GroupedFlowable<String, String> t1) {
                 return t1.take(1);
             }
         }, NUM_MSG) // Must request as many groups as groupBy produces to avoid MBE
-        .subscribe(new TestSubscriber<String>(subscriber));
+        .subscribe(new TestSubscriber<>(subscriber));
 
         InOrder inOrder = inOrder(subscriber);
         // should show 3 attempts
@@ -910,7 +910,7 @@ public Flowable<String> apply(GroupedFlowable<String, String> t1) {
                 return t1.take(1);
             }
         })
-        .subscribe(new TestSubscriber<String>(subscriber));
+        .subscribe(new TestSubscriber<>(subscriber));
 
         InOrder inOrder = inOrder(subscriber);
         // should show 3 attempts
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java
index 9a69dd3ede..b70b742201 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java
@@ -236,7 +236,7 @@ public void unsubscribeAfterError() {
                 .unsafeCreate(so)
                 .retry(retry5);
 
-        FlowableRetryTest.AsyncSubscriber<Long> async = new FlowableRetryTest.AsyncSubscriber<Long>(subscriber);
+        FlowableRetryTest.AsyncSubscriber<Long> async = new FlowableRetryTest.AsyncSubscriber<>(subscriber);
 
         f.subscribe(async);
 
@@ -263,7 +263,7 @@ public void timeoutWithRetry() {
                 .timeout(80, TimeUnit.MILLISECONDS)
                 .retry(retry5);
 
-        FlowableRetryTest.AsyncSubscriber<Long> async = new FlowableRetryTest.AsyncSubscriber<Long>(subscriber);
+        FlowableRetryTest.AsyncSubscriber<Long> async = new FlowableRetryTest.AsyncSubscriber<>(subscriber);
 
         f.subscribe(async);
 
@@ -279,7 +279,7 @@ public void timeoutWithRetry() {
 
     @Test
     public void issue2826() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         final RuntimeException e = new RuntimeException("You shall not pass");
         final AtomicInteger c = new AtomicInteger();
         Flowable.just(1).map(new Function<Integer, Integer>() {
@@ -313,7 +313,7 @@ public Integer apply(Integer t1) {
 
     @Test
     public void issue3008RetryWithPredicate() {
-        final List<Long> list = new CopyOnWriteArrayList<Long>();
+        final List<Long> list = new CopyOnWriteArrayList<>();
         final AtomicBoolean isFirst = new AtomicBoolean(true);
         Flowable.<Long> just(1L, 2L, 3L).map(new Function<Long, Long>() {
             @Override
@@ -341,7 +341,7 @@ public void accept(Long t) {
 
     @Test
     public void issue3008RetryInfinite() {
-        final List<Long> list = new CopyOnWriteArrayList<Long>();
+        final List<Long> list = new CopyOnWriteArrayList<>();
         final AtomicBoolean isFirst = new AtomicBoolean(true);
         Flowable.<Long> just(1L, 2L, 3L).map(new Function<Long, Long>() {
             @Override
@@ -365,7 +365,7 @@ public void accept(Long t) {
 
     @Test
     public void backpressure() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
 
         Flowable<Integer> source = Flowable
                 .just(1)
@@ -377,7 +377,7 @@ public void accept(long t) {
                     }
                 });
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(3L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(3L);
         source
         .retry(new BiPredicate<Integer, Throwable>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
index 60ddbbff52..a4abfce00c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
@@ -59,7 +59,7 @@ public Integer get() throws Exception {
     static final class OneCallablePublisher implements Publisher<Integer>, Supplier<Integer> {
         @Override
         public void subscribe(Subscriber<? super Integer> s) {
-            s.onSubscribe(new ScalarSubscription<Integer>(s, 1));
+            s.onSubscribe(new ScalarSubscription<>(s, 1));
         }
 
         @Override
@@ -70,7 +70,7 @@ public Integer get() throws Exception {
 
     @Test
     public void tryScalarXMap() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         assertTrue(FlowableScalarXMap.tryScalarXMapSubscribe(new CallablePublisher(), ts, new Function<Integer, Publisher<Integer>>() {
             @Override
             public Publisher<Integer> apply(Integer f) throws Exception {
@@ -83,7 +83,7 @@ public Publisher<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void emptyXMap() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         assertTrue(FlowableScalarXMap.tryScalarXMapSubscribe(new EmptyCallablePublisher(), ts, new Function<Integer, Publisher<Integer>>() {
             @Override
@@ -97,7 +97,7 @@ public Publisher<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void mapperCrashes() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         assertTrue(FlowableScalarXMap.tryScalarXMapSubscribe(new OneCallablePublisher(), ts, new Function<Integer, Publisher<Integer>>() {
             @Override
@@ -111,7 +111,7 @@ public Publisher<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void mapperToJust() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         assertTrue(FlowableScalarXMap.tryScalarXMapSubscribe(new OneCallablePublisher(), ts, new Function<Integer, Publisher<Integer>>() {
             @Override
@@ -125,7 +125,7 @@ public Publisher<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void mapperToEmpty() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         assertTrue(FlowableScalarXMap.tryScalarXMapSubscribe(new OneCallablePublisher(), ts, new Function<Integer, Publisher<Integer>>() {
             @Override
@@ -139,7 +139,7 @@ public Publisher<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void mapperToCrashingCallable() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         assertTrue(FlowableScalarXMap.tryScalarXMapSubscribe(new OneCallablePublisher(), ts, new Function<Integer, Publisher<Integer>>() {
             @Override
@@ -177,8 +177,8 @@ public Publisher<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void scalarDisposableStateCheck() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-        ScalarSubscription<Integer> sd = new ScalarSubscription<Integer>(ts, 1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        ScalarSubscription<Integer> sd = new ScalarSubscription<>(ts, 1);
         ts.onSubscribe(sd);
 
         assertFalse(sd.isCancelled());
@@ -211,8 +211,8 @@ public void scalarDisposableStateCheck() {
     @Test
     public void scalarDisposableRunDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-            final ScalarSubscription<Integer> sd = new ScalarSubscription<Integer>(ts, 1);
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+            final ScalarSubscription<Integer> sd = new ScalarSubscription<>(ts, 1);
             ts.onSubscribe(sd);
 
             Runnable r1 = new Runnable() {
@@ -235,7 +235,7 @@ public void run() {
 
     @Test
     public void cancelled() {
-        ScalarSubscription<Integer> scalar = new ScalarSubscription<Integer>(new TestSubscriber<Integer>(), 1);
+        ScalarSubscription<Integer> scalar = new ScalarSubscription<>(new TestSubscriber<>(), 1);
 
         assertFalse(scalar.isCancelled());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
index f918d152be..2988da7570 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
@@ -114,7 +114,7 @@ public Integer apply(Integer t1, Integer t2) {
 
     @Test
     public void shouldNotEmitUntilAfterSubscription() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(1, 100).scan(0, new BiFunction<Integer, Integer, Integer>() {
 
             @Override
@@ -263,7 +263,7 @@ public void seedFactory() {
 
                     @Override
                     public List<Integer> get() {
-                        return new ArrayList<Integer>();
+                        return new ArrayList<>();
                     }
 
                 }, new BiConsumer<List<Integer>, Integer>() {
@@ -289,7 +289,7 @@ public void seedFactoryFlowable() {
 
                     @Override
                     public List<Integer> get() {
-                        return new ArrayList<Integer>();
+                        return new ArrayList<>();
                     }
 
                 }, new BiConsumer<List<Integer>, Integer>() {
@@ -315,7 +315,7 @@ public Integer apply(Integer t1, Integer t2) {
             }
 
         }).take(1);
-        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> subscriber = new TestSubscriberEx<>();
         f.subscribe(subscriber);
         subscriber.assertValue(0);
         subscriber.assertTerminated();
@@ -324,7 +324,7 @@ public Integer apply(Integer t1, Integer t2) {
 
     @Test
     public void scanShouldNotRequestZero() {
-        final AtomicReference<Subscription> producer = new AtomicReference<Subscription>();
+        final AtomicReference<Subscription> producer = new AtomicReference<>();
         Flowable<Integer> f = Flowable.unsafeCreate(new Publisher<Integer>() {
             @Override
             public void subscribe(final Subscriber<? super Integer> subscriber) {
@@ -445,7 +445,7 @@ public Integer apply(Integer a, Integer b) throws Exception {
     public void unsubscribeScan() {
 
         FlowableEventStream.getEventStream("HTTP-ClusterB", 20)
-        .scan(new HashMap<String, String>(), new BiFunction<HashMap<String, String>, Event, HashMap<String, String>>() {
+        .scan(new HashMap<>(), new BiFunction<HashMap<String, String>, Event, HashMap<String, String>>() {
             @Override
             public HashMap<String, String> apply(HashMap<String, String> accum, Event perInstanceEvent) {
                 accum.put("instance", perInstanceEvent.instanceId);
@@ -463,7 +463,7 @@ public void accept(HashMap<String, String> v) {
 
     @Test
     public void scanWithSeedDoesNotEmitErrorTwiceIfScanFunctionThrows() {
-        final List<Throwable> list = new CopyOnWriteArrayList<Throwable>();
+        final List<Throwable> list = new CopyOnWriteArrayList<>();
         Consumer<Throwable> errorConsumer = new Consumer<Throwable>() {
             @Override
             public void accept(Throwable t) throws Exception {
@@ -543,7 +543,7 @@ public void scanNoSeed() {
 
     @Test
     public void scanNoSeedDoesNotEmitErrorTwiceIfScanFunctionThrows() {
-        final List<Throwable> list = new CopyOnWriteArrayList<Throwable>();
+        final List<Throwable> list = new CopyOnWriteArrayList<>();
         Consumer<Throwable> errorConsumer = new Consumer<Throwable>() {
             @Override
             public void accept(Throwable t) throws Exception {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
index e94bf06167..e5e74e8227 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
@@ -384,7 +384,7 @@ protected void subscribeActual(Subscriber<? super Object> s) {
         };
 
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Boolean> ts = new TestSubscriber<Boolean>();
+            final TestSubscriber<Boolean> ts = new TestSubscriber<>();
 
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -487,7 +487,7 @@ protected void subscribeActual(Subscriber<? super Object> s) {
         };
 
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestObserver<Boolean> to = new TestObserver<Boolean>();
+            final TestObserver<Boolean> to = new TestObserver<>();
 
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
index 3e2fdae2a0..099f63f049 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
@@ -74,7 +74,7 @@ public void singleWithEmptyFlowable() {
 
     @Test
     public void singleDoesNotRequestMoreThanItNeedsIf1Then2RequestedFlowable() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
         Flowable.just(1)
         //
                 .doOnRequest(new LongConsumer() {
@@ -115,7 +115,7 @@ public void onNext(Integer t) {
 
     @Test
     public void singleDoesNotRequestMoreThanItNeedsIf3RequestedFlowable() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
         Flowable.just(1)
         //
                 .doOnRequest(new LongConsumer() {
@@ -155,7 +155,7 @@ public void onNext(Integer t) {
 
     @Test
     public void singleRequestsExactlyWhatItNeedsIf1RequestedFlowable() {
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
         Flowable.just(1)
         //
                 .doOnRequest(new LongConsumer() {
@@ -705,7 +705,7 @@ public Integer apply(Integer i1, Integer i2) {
     @Test
     public void singleElementOperatorDoNotSwallowExceptionWhenDone() {
         final Throwable exception = new RuntimeException("some error");
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         try {
             RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
index be4230486a..53e4e24a93 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
@@ -89,7 +89,7 @@ public void skipLastWithZeroCount() {
     @Test
     public void skipLastWithBackpressure() {
         Flowable<Integer> f = Flowable.range(0, Flowable.bufferSize() * 2).skipLast(Flowable.bufferSize() + 10);
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         f.observeOn(Schedulers.computation()).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
index 26128e5889..deb672124a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
@@ -143,7 +143,7 @@ public void skipError() {
     @Test
     public void backpressureMultipleSmallAsyncRequests() throws InterruptedException {
         final AtomicLong requests = new AtomicLong(0);
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(0L);
+        TestSubscriber<Long> ts = new TestSubscriber<>(0L);
         Flowable.interval(100, TimeUnit.MILLISECONDS)
                 .doOnRequest(new LongConsumer() {
                     @Override
@@ -162,7 +162,7 @@ public void accept(long n) {
 
     @Test
     public void requestOverflowDoesNotOccur() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(Long.MAX_VALUE - 1);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(Long.MAX_VALUE - 1);
         Flowable.range(1, 10).skip(5).subscribe(ts);
         ts.assertTerminated();
         ts.assertComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
index a10283358e..a9f66d733e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
@@ -41,7 +41,7 @@ public void issue813() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
         final CountDownLatch doneLatch = new CountDownLatch(1);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable
         .unsafeCreate(new Publisher<Integer>() {
@@ -79,7 +79,7 @@ public void subscribe(
 
     @Test
     public void onError() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>();
         Flowable.unsafeCreate(new Publisher<String>() {
 
             @Override
@@ -152,7 +152,7 @@ public Disposable schedule(@NonNull final Runnable action, final long delayTime,
 
     @Test
     public void unsubscribeInfiniteStream() throws InterruptedException {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         final AtomicInteger count = new AtomicInteger();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
@@ -178,7 +178,7 @@ public void subscribe(Subscriber<? super Integer> sub) {
     @Test
     public void backpressureReschedulesCorrectly() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(10);
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(new DefaultSubscriber<Integer>() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(new DefaultSubscriber<Integer>() {
 
             @Override
             public void onComplete() {
@@ -208,7 +208,7 @@ public void onNext(Integer t) {
 
     @Test
     public void setProducerSynchronousRequest() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.just(1, 2, 3).lift(new FlowableOperator<Integer, Integer>() {
 
             @Override
@@ -283,11 +283,11 @@ public void dispose() {
     public void deferredRequestRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
 
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
             Worker w = Schedulers.computation().createWorker();
 
-            final SubscribeOnSubscriber<Integer> so = new SubscribeOnSubscriber<Integer>(ts, w, Flowable.<Integer>never(), true);
+            final SubscribeOnSubscriber<Integer> so = new SubscribeOnSubscriber<>(ts, w, Flowable.<Integer>never(), true);
             ts.onSubscribe(so);
 
             final BooleanSubscription bs = new BooleanSubscription();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
index 9ee55f4dfa..de348ee6a0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
@@ -142,7 +142,7 @@ public void subscribe(final Subscriber<? super Long> subscriber) {
     @Test
     public void switchRequestAlternativeObservableWithBackpressure() {
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1L);
 
         Flowable.<Integer>empty().switchIfEmpty(Flowable.just(1, 2, 3)).subscribe(ts);
 
@@ -156,7 +156,7 @@ public void switchRequestAlternativeObservableWithBackpressure() {
 
     @Test
     public void backpressureNoRequest() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
         Flowable.<Integer>empty().switchIfEmpty(Flowable.just(1, 2, 3)).subscribe(ts);
         ts.assertNoValues();
         ts.assertNoErrors();
@@ -164,7 +164,7 @@ public void backpressureNoRequest() {
 
     @Test
     public void backpressureOnFirstObservable() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
         Flowable.just(1, 2, 3).switchIfEmpty(Flowable.just(4, 5, 6)).subscribe(ts);
         ts.assertNotComplete();
         ts.assertNoErrors();
@@ -173,7 +173,7 @@ public void backpressureOnFirstObservable() {
 
     @Test
     public void requestsNotLost() throws InterruptedException {
-        final TestSubscriber<Long> ts = new TestSubscriber<Long>(0L);
+        final TestSubscriber<Long> ts = new TestSubscriber<>(0L);
         Flowable.unsafeCreate(new Publisher<Long>() {
 
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
index fa83213599..fb571c1109 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
@@ -450,7 +450,7 @@ public void backpressure() {
         publishCompleted(o2, 50);
         publishCompleted(o3, 55);
 
-        final TestSubscriberEx<String> testSubscriber = new TestSubscriberEx<String>();
+        final TestSubscriberEx<String> testSubscriber = new TestSubscriberEx<>();
         Flowable.switchOnNext(o).subscribe(new DefaultSubscriber<String>() {
 
             private int requested;
@@ -549,7 +549,7 @@ public void onNext(String t) {
 
     @Test
     public void initialRequestsAreAdditive() {
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(0L);
+        TestSubscriber<Long> ts = new TestSubscriber<>(0L);
         Flowable.switchOnNext(
                 Flowable.interval(100, TimeUnit.MILLISECONDS)
                           .map(
@@ -568,7 +568,7 @@ public Flowable<Long> apply(Long t) {
 
     @Test
     public void initialRequestsDontOverflow() {
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(0L);
+        TestSubscriber<Long> ts = new TestSubscriber<>(0L);
         Flowable.switchOnNext(
                 Flowable.interval(100, TimeUnit.MILLISECONDS)
                         .map(new Function<Long, Flowable<Long>>() {
@@ -585,7 +585,7 @@ public Flowable<Long> apply(Long t) {
 
     @Test
     public void secondaryRequestsDontOverflow() throws InterruptedException {
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(0L);
+        TestSubscriber<Long> ts = new TestSubscriber<>(0L);
         Flowable.switchOnNext(
                 Flowable.interval(100, TimeUnit.MILLISECONDS)
                         .map(new Function<Long, Flowable<Long>>() {
@@ -639,7 +639,7 @@ public void delayErrors() {
 
     @Test
     public void switchOnNextPrefetch() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Flowable<Integer> source = Flowable.range(1, 10).hide().doOnNext(new Consumer<Integer>() {
             @Override
@@ -656,7 +656,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void switchOnNextDelayError() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Flowable<Integer> source = Flowable.range(1, 10).hide().doOnNext(new Consumer<Integer>() {
             @Override
@@ -673,7 +673,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void switchOnNextDelayErrorPrefetch() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Flowable<Integer> source = Flowable.range(1, 10).hide().doOnNext(new Consumer<Integer>() {
             @Override
@@ -1082,7 +1082,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
     @Test
     public void drainCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -1176,7 +1176,7 @@ public Object apply(Integer w) throws Exception {
     public void undeliverableUponCancel() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            final TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
             Flowable.just(1)
             .map(new Function<Integer, Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java
index 8acf9c3026..373fe4fbe4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java
@@ -30,7 +30,7 @@ public class FlowableTakeLastOneTest extends RxJavaTest {
 
     @Test
     public void lastOfManyReturnsLast() {
-        TestSubscriberEx<Integer> s = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> s = new TestSubscriberEx<>();
         Flowable.range(1, 10).takeLast(1).subscribe(s);
         s.assertValue(10);
         s.assertNoErrors();
@@ -41,7 +41,7 @@ public void lastOfManyReturnsLast() {
 
     @Test
     public void lastOfEmptyReturnsEmpty() {
-        TestSubscriberEx<Object> s = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> s = new TestSubscriberEx<>();
         Flowable.empty().takeLast(1).subscribe(s);
         s.assertNoValues();
         s.assertNoErrors();
@@ -52,7 +52,7 @@ public void lastOfEmptyReturnsEmpty() {
 
     @Test
     public void lastOfOneReturnsLast() {
-        TestSubscriberEx<Integer> s = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> s = new TestSubscriberEx<>();
         Flowable.just(1).takeLast(1).subscribe(s);
         s.assertValue(1);
         s.assertNoErrors();
@@ -81,7 +81,7 @@ public void run() {
 
     @Test
     public void lastWithBackpressure() {
-        MySubscriber<Integer> s = new MySubscriber<Integer>(0);
+        MySubscriber<Integer> s = new MySubscriber<>(0);
         Flowable.just(1).takeLast(1).subscribe(s);
         assertEquals(0, s.list.size());
         s.requestMore(1);
@@ -111,7 +111,7 @@ private static class MySubscriber<T> extends DefaultSubscriber<T> {
             this.initialRequest = initialRequest;
         }
 
-        final List<T> list = new ArrayList<T>();
+        final List<T> list = new ArrayList<>();
 
         public void requestMore(long n) {
             request(n);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
index 764e932405..c62ff85db0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
@@ -96,7 +96,7 @@ public void takeLastWithNegativeCount() {
 
     @Test
     public void backpressure1() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(1, 100000).takeLast(1)
         .observeOn(Schedulers.newThread())
         .map(newSlowProcessor()).subscribe(ts);
@@ -107,7 +107,7 @@ public void backpressure1() {
 
     @Test
     public void backpressure2() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.range(1, 100000).takeLast(Flowable.bufferSize() * 4)
         .observeOn(Schedulers.newThread()).map(newSlowProcessor()).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
@@ -283,7 +283,7 @@ public void onNext(Integer integer) {
 
     @Test
     public void requestOverflow() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
         Flowable.range(1, 100).takeLast(50).subscribe(new DefaultSubscriber<Integer>() {
 
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
index 745cdf01dd..3f8c22a47f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
@@ -208,7 +208,7 @@ public void takeLastTimedWithZeroCapacity() {
     public void continuousDelivery() {
         TestScheduler scheduler = new TestScheduler();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java
index 3174c62721..fa9ea0725d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java
@@ -290,7 +290,7 @@ public void subscribe(Subscriber<? super Long> op) {
     @Test
     public void takeObserveOn() {
         Subscriber<Object> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(subscriber);
+        TestSubscriber<Object> ts = new TestSubscriber<>(subscriber);
 
         INFINITE_OBSERVABLE.onBackpressureDrop()
         .observeOn(Schedulers.newThread()).take(1).subscribe(ts);
@@ -305,7 +305,7 @@ public void takeObserveOn() {
 
     @Test
     public void producerRequestThroughTake() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(3);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(3);
         final AtomicLong requested = new AtomicLong();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
@@ -331,7 +331,7 @@ public void cancel() {
 
     @Test
     public void producerRequestThroughTakeIsModified() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(3);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(3);
         final AtomicLong requested = new AtomicLong();
         Flowable.unsafeCreate(new Publisher<Integer>() {
 
@@ -358,7 +358,7 @@ public void cancel() {
 
     @Test
     public void interrupt() throws InterruptedException {
-        final AtomicReference<Object> exception = new AtomicReference<Object>();
+        final AtomicReference<Object> exception = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(1);
         Flowable.just(1).subscribeOn(Schedulers.computation()).take(1)
         .subscribe(new Consumer<Integer>() {
@@ -384,7 +384,7 @@ public void accept(Integer t1) {
     @Test
     public void doesntRequestMoreThanNeededFromUpstream() throws InterruptedException {
         final AtomicLong requests = new AtomicLong();
-        TestSubscriber<Long> ts = new TestSubscriber<Long>(0L);
+        TestSubscriber<Long> ts = new TestSubscriber<>(0L);
         Flowable.interval(100, TimeUnit.MILLISECONDS)
             //
             .doOnRequest(new LongConsumer() {
@@ -429,7 +429,7 @@ public void onNext(Integer t) {
     public void reentrantTake() {
         final PublishProcessor<Integer> source = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         source.take(1).doOnNext(new Consumer<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest2.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest2.java
index 14987ce16a..089c148099 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest2.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest2.java
@@ -32,7 +32,7 @@
 // moved tests from FlowableLimitTest to here (limit removed as operator)
 public class FlowableTakeTest2 extends RxJavaTest implements LongConsumer, Action {
 
-    final List<Long> requests = new ArrayList<Long>();
+    final List<Long> requests = new ArrayList<>();
 
     static final Long CANCELLED = -100L;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
index 4bdda03eb1..4019ec4fd9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
@@ -142,7 +142,7 @@ public boolean test(Integer v) {
 
     @Test
     public void backpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(5L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(5L);
 
         Flowable.range(1, 1000).takeUntil(new Predicate<Integer>() {
             @Override
@@ -158,7 +158,7 @@ public boolean test(Integer v) {
 
     @Test
     public void errorIncludesLastValueAsCause() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>();
         final TestException e = new TestException("Forced failure");
         Predicate<String> predicate = new Predicate<String>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java
index 7db84c13d8..150143ba6f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java
@@ -190,7 +190,7 @@ public void untilFires() {
         PublishProcessor<Integer> source = PublishProcessor.create();
         PublishProcessor<Integer> until = PublishProcessor.create();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         source.takeUntil(until).subscribe(ts);
 
@@ -216,7 +216,7 @@ public void mainCompletes() {
         PublishProcessor<Integer> source = PublishProcessor.create();
         PublishProcessor<Integer> until = PublishProcessor.create();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         source.takeUntil(until).subscribe(ts);
 
@@ -240,7 +240,7 @@ public void downstreamUnsubscribes() {
         PublishProcessor<Integer> source = PublishProcessor.create();
         PublishProcessor<Integer> until = PublishProcessor.create();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         source.takeUntil(until).take(1).subscribe(ts);
 
@@ -262,7 +262,7 @@ public void downstreamUnsubscribes() {
     public void backpressure() {
         PublishProcessor<Integer> until = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Flowable.range(1, 10).takeUntil(until).subscribe(ts);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java
index 90f9cc4a59..f2c964cf28 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java
@@ -236,7 +236,7 @@ public boolean test(Integer t1) {
                 return t1 < 100;
             }
         });
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(5L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(5L);
 
         source.subscribe(ts);
 
@@ -257,7 +257,7 @@ public boolean test(Integer t1) {
                 return t1 < 2;
             }
         });
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         source.subscribe(ts);
 
@@ -269,7 +269,7 @@ public boolean test(Integer t1) {
 
     @Test
     public void errorCauseIncludesLastValue() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>();
         Flowable.just("abc").takeWhile(new Predicate<String>() {
             @Override
             public boolean test(String t1) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
index ac517661cb..496bce4a38 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
@@ -61,11 +61,11 @@ public void timeInterval() {
         processor.onComplete();
 
         inOrder.verify(subscriber, times(1)).onNext(
-                new Timed<Integer>(1, 1000, TIME_UNIT));
+                new Timed<>(1, 1000, TIME_UNIT));
         inOrder.verify(subscriber, times(1)).onNext(
-                new Timed<Integer>(2, 2000, TIME_UNIT));
+                new Timed<>(2, 2000, TIME_UNIT));
         inOrder.verify(subscriber, times(1)).onNext(
-                new Timed<Integer>(3, 3000, TIME_UNIT));
+                new Timed<>(3, 3000, TIME_UNIT));
         inOrder.verify(subscriber, times(1)).onComplete();
         inOrder.verifyNoMoreInteractions();
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
index 144d0da6a8..88a3bc2253 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
@@ -52,7 +52,7 @@ public void setUp() {
     @Test
     public void shouldNotTimeoutIfOnNextWithinTimeout() {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
 
         withTimeout.subscribe(ts);
 
@@ -67,7 +67,7 @@ public void shouldNotTimeoutIfOnNextWithinTimeout() {
     @Test
     public void shouldNotTimeoutIfSecondOnNextWithinTimeout() {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
 
         withTimeout.subscribe(ts);
 
@@ -83,7 +83,7 @@ public void shouldNotTimeoutIfSecondOnNextWithinTimeout() {
 
     @Test
     public void shouldTimeoutIfOnNextNotWithinTimeout() {
-        TestSubscriberEx<String> subscriber = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> subscriber = new TestSubscriberEx<>();
 
         withTimeout.subscribe(subscriber);
 
@@ -93,8 +93,8 @@ public void shouldTimeoutIfOnNextNotWithinTimeout() {
 
     @Test
     public void shouldTimeoutIfSecondOnNextNotWithinTimeout() {
-        TestSubscriberEx<String> subscriber = new TestSubscriberEx<String>();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriberEx<String> subscriber = new TestSubscriberEx<>();
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         withTimeout.subscribe(subscriber);
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
         underlyingSubject.onNext("One");
@@ -107,7 +107,7 @@ public void shouldTimeoutIfSecondOnNextNotWithinTimeout() {
     @Test
     public void shouldCompleteIfUnderlyingComletes() {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         withTimeout.subscribe(subscriber);
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
         underlyingSubject.onComplete();
@@ -120,7 +120,7 @@ public void shouldCompleteIfUnderlyingComletes() {
     @Test
     public void shouldErrorIfUnderlyingErrors() {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         withTimeout.subscribe(subscriber);
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
         underlyingSubject.onError(new UnsupportedOperationException());
@@ -135,7 +135,7 @@ public void shouldSwitchToOtherIfOnNextNotWithinTimeout() {
         Flowable<String> source = underlyingSubject.timeout(TIMEOUT, TIME_UNIT, testScheduler, other);
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         source.subscribe(ts);
 
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
@@ -158,7 +158,7 @@ public void shouldSwitchToOtherIfOnErrorNotWithinTimeout() {
         Flowable<String> source = underlyingSubject.timeout(TIMEOUT, TIME_UNIT, testScheduler, other);
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         source.subscribe(ts);
 
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
@@ -181,7 +181,7 @@ public void shouldSwitchToOtherIfOnCompletedNotWithinTimeout() {
         Flowable<String> source = underlyingSubject.timeout(TIMEOUT, TIME_UNIT, testScheduler, other);
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         source.subscribe(ts);
 
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
@@ -204,7 +204,7 @@ public void shouldSwitchToOtherAndCanBeUnsubscribedIfOnNextNotWithinTimeout() {
         Flowable<String> source = underlyingSubject.timeout(TIMEOUT, TIME_UNIT, testScheduler, other);
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         source.subscribe(ts);
 
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
@@ -234,7 +234,7 @@ public void shouldTimeoutIfSynchronizedFlowableEmitFirstOnNextNotWithinTimeout()
         final CountDownLatch exit = new CountDownLatch(1);
         final CountDownLatch timeoutSetuped = new CountDownLatch(1);
 
-        final TestSubscriberEx<String> subscriber = new TestSubscriberEx<String>();
+        final TestSubscriberEx<String> subscriber = new TestSubscriberEx<>();
 
         new Thread(new Runnable() {
 
@@ -283,7 +283,7 @@ public void subscribe(Subscriber<? super String> subscriber) {
         TestScheduler testScheduler = new TestScheduler();
         Flowable<String> observableWithTimeout = never.timeout(1000, TimeUnit.MILLISECONDS, testScheduler);
 
-        TestSubscriberEx<String> subscriber = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> subscriber = new TestSubscriberEx<>();
         observableWithTimeout.subscribe(subscriber);
 
         testScheduler.advanceTimeBy(2000, TimeUnit.MILLISECONDS);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
index ff0b91113a..7e55fa0d77 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
@@ -329,7 +329,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
 
         }).when(subscriber).onComplete();
 
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(subscriber);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(subscriber);
 
         new Thread(new Runnable() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
index bc8b67d737..e23228f943 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
@@ -63,7 +63,7 @@ public void timerOnce() {
 
     @Test
     public void timerPeriodically() {
-        TestSubscriber<Long> ts = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts = new TestSubscriber<>();
 
         Flowable.interval(100, 100, TimeUnit.MILLISECONDS, scheduler).subscribe(ts);
 
@@ -91,7 +91,7 @@ public void timerPeriodically() {
     @Test
     public void interval() {
         Flowable<Long> w = Flowable.interval(1, TimeUnit.SECONDS, scheduler);
-        TestSubscriber<Long> ts = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts = new TestSubscriber<>();
         w.subscribe(ts);
 
         ts.assertNoValues();
@@ -116,8 +116,8 @@ public void interval() {
     public void withMultipleSubscribersStartingAtSameTime() {
         Flowable<Long> w = Flowable.interval(1, TimeUnit.SECONDS, scheduler);
 
-        TestSubscriber<Long> ts1 = new TestSubscriber<Long>();
-        TestSubscriber<Long> ts2 = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts1 = new TestSubscriber<>();
+        TestSubscriber<Long> ts2 = new TestSubscriber<>();
 
         w.subscribe(ts1);
         w.subscribe(ts2);
@@ -153,7 +153,7 @@ public void withMultipleSubscribersStartingAtSameTime() {
     public void withMultipleStaggeredSubscribers() {
         Flowable<Long> w = Flowable.interval(1, TimeUnit.SECONDS, scheduler);
 
-        TestSubscriber<Long> ts1 = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts1 = new TestSubscriber<>();
 
         w.subscribe(ts1);
 
@@ -161,7 +161,7 @@ public void withMultipleStaggeredSubscribers() {
 
         scheduler.advanceTimeTo(2, TimeUnit.SECONDS);
 
-        TestSubscriber<Long> ts2 = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts2 = new TestSubscriber<>();
 
         w.subscribe(ts2);
 
@@ -193,7 +193,7 @@ public void withMultipleStaggeredSubscribers() {
     public void withMultipleStaggeredSubscribersAndPublish() {
         ConnectableFlowable<Long> w = Flowable.interval(1, TimeUnit.SECONDS, scheduler).publish();
 
-        TestSubscriber<Long> ts1 = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts1 = new TestSubscriber<>();
 
         w.subscribe(ts1);
         w.connect();
@@ -202,7 +202,7 @@ public void withMultipleStaggeredSubscribersAndPublish() {
 
         scheduler.advanceTimeTo(2, TimeUnit.SECONDS);
 
-        TestSubscriber<Long> ts2 = new TestSubscriber<Long>();
+        TestSubscriber<Long> ts2 = new TestSubscriber<>();
         w.subscribe(ts2);
 
         ts1.assertValues(0L, 1L);
@@ -309,7 +309,7 @@ public void backpressureNotReady() {
     @Test
     public void timerCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Long> ts = new TestSubscriber<Long>();
+            final TestSubscriber<Long> ts = new TestSubscriber<>();
 
             final TestScheduler scheduler = new TestScheduler();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java
index 08bbcdc50f..05274da619 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java
@@ -53,9 +53,9 @@ public void timestampWithScheduler() {
 
         InOrder inOrder = inOrder(subscriber);
 
-        inOrder.verify(subscriber, times(1)).onNext(new Timed<Integer>(1, 0, TimeUnit.MILLISECONDS));
-        inOrder.verify(subscriber, times(1)).onNext(new Timed<Integer>(2, 100, TimeUnit.MILLISECONDS));
-        inOrder.verify(subscriber, times(1)).onNext(new Timed<Integer>(3, 200, TimeUnit.MILLISECONDS));
+        inOrder.verify(subscriber, times(1)).onNext(new Timed<>(1, 0, TimeUnit.MILLISECONDS));
+        inOrder.verify(subscriber, times(1)).onNext(new Timed<>(2, 100, TimeUnit.MILLISECONDS));
+        inOrder.verify(subscriber, times(1)).onNext(new Timed<>(3, 200, TimeUnit.MILLISECONDS));
 
         verify(subscriber, never()).onError(any(Throwable.class));
         verify(subscriber, never()).onComplete();
@@ -77,9 +77,9 @@ public void timestampWithScheduler2() {
 
         InOrder inOrder = inOrder(subscriber);
 
-        inOrder.verify(subscriber, times(1)).onNext(new Timed<Integer>(1, 0, TimeUnit.MILLISECONDS));
-        inOrder.verify(subscriber, times(1)).onNext(new Timed<Integer>(2, 0, TimeUnit.MILLISECONDS));
-        inOrder.verify(subscriber, times(1)).onNext(new Timed<Integer>(3, 200, TimeUnit.MILLISECONDS));
+        inOrder.verify(subscriber, times(1)).onNext(new Timed<>(1, 0, TimeUnit.MILLISECONDS));
+        inOrder.verify(subscriber, times(1)).onNext(new Timed<>(2, 0, TimeUnit.MILLISECONDS));
+        inOrder.verify(subscriber, times(1)).onNext(new Timed<>(3, 200, TimeUnit.MILLISECONDS));
 
         verify(subscriber, never()).onError(any(Throwable.class));
         verify(subscriber, never()).onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java
index 84c52ab2c3..cac1fa61b7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java
@@ -73,7 +73,7 @@ public void emptyObservable() {
 
     @Test
     public void neverObservable() {
-        TestSubscriberEx<String> subscriber = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> subscriber = new TestSubscriberEx<>();
         Completable cmp = Flowable.<String>never().ignoreElements();
         cmp.<String>toFlowable().subscribe(subscriber);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
index 28a61aa223..524a7216e1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
@@ -38,7 +38,7 @@ public void success() throws Exception {
 
         Subscriber<Object> subscriber = TestHelper.mockSubscriber();
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(subscriber);
+        TestSubscriber<Object> ts = new TestSubscriber<>(subscriber);
 
         Flowable.fromFuture(future).subscribe(ts);
 
@@ -60,7 +60,7 @@ public void successOperatesOnSuppliedScheduler() throws Exception {
         Subscriber<Object> subscriber = TestHelper.mockSubscriber();
 
         TestScheduler scheduler = new TestScheduler();
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(subscriber);
+        TestSubscriber<Object> ts = new TestSubscriber<>(subscriber);
 
         Flowable.fromFuture(future, scheduler).subscribe(ts);
 
@@ -80,7 +80,7 @@ public void failure() throws Exception {
 
         Subscriber<Object> subscriber = TestHelper.mockSubscriber();
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(subscriber);
+        TestSubscriber<Object> ts = new TestSubscriber<>(subscriber);
 
         Flowable.fromFuture(future).subscribe(ts);
 
@@ -101,7 +101,7 @@ public void cancelledBeforeSubscribe() throws Exception {
 
         Subscriber<Object> subscriber = TestHelper.mockSubscriber();
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(subscriber);
+        TestSubscriber<Object> ts = new TestSubscriber<>(subscriber);
         ts.cancel();
 
         Flowable.fromFuture(future).subscribe(ts);
@@ -147,7 +147,7 @@ public Object get(long timeout, TimeUnit unit) throws InterruptedException, Exec
 
         Subscriber<Object> subscriber = TestHelper.mockSubscriber();
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(subscriber);
+        TestSubscriber<Object> ts = new TestSubscriber<>(subscriber);
         Flowable<Object> futureObservable = Flowable.fromFuture(future);
 
         futureObservable.subscribeOn(Schedulers.computation()).subscribe(ts);
@@ -163,9 +163,9 @@ public Object get(long timeout, TimeUnit unit) throws InterruptedException, Exec
 
     @Test
     public void backpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
 
-        FutureTask<Integer> f = new FutureTask<Integer>(new Runnable() {
+        FutureTask<Integer> f = new FutureTask<>(new Runnable() {
             @Override
             public void run() {
 
@@ -187,7 +187,7 @@ public void run() {
 
     @Test
     public void withTimeoutNoTimeout() {
-        FutureTask<Integer> task = new FutureTask<Integer>(new Runnable() {
+        FutureTask<Integer> task = new FutureTask<>(new Runnable() {
             @Override
             public void run() {
 
@@ -207,7 +207,7 @@ public void run() {
 
     @Test
     public void withTimeoutTimeout() {
-        FutureTask<Integer> task = new FutureTask<Integer>(new Runnable() {
+        FutureTask<Integer> task = new FutureTask<>(new Runnable() {
             @Override
             public void run() {
 
@@ -225,7 +225,7 @@ public void run() {
 
     @Test
     public void withTimeoutNoTimeoutScheduler() {
-        FutureTask<Integer> task = new FutureTask<Integer>(new Runnable() {
+        FutureTask<Integer> task = new FutureTask<>(new Runnable() {
             @Override
             public void run() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
index 66d2164b70..73d1455d5b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
@@ -92,7 +92,7 @@ public void listWithBlockingFirstFlowable() {
     @Test
     public void backpressureHonoredFlowable() {
         Flowable<List<Integer>> w = Flowable.just(1, 2, 3, 4, 5).toList().toFlowable();
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>(0L);
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>(0L);
 
         w.subscribe(ts);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java
index 8635158cc3..149a3f893c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java
@@ -54,7 +54,7 @@ public void toMapFlowable() {
 
         Flowable<Map<Integer, String>> mapped = source.toMap(lengthFunc).toFlowable();
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "a");
         expected.put(2, "bb");
         expected.put(3, "ccc");
@@ -73,7 +73,7 @@ public void toMapWithValueSelectorFlowable() {
 
         Flowable<Map<Integer, String>> mapped = source.toMap(lengthFunc, duplicate).toFlowable();
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "aa");
         expected.put(2, "bbbb");
         expected.put(3, "cccccc");
@@ -101,7 +101,7 @@ public Integer apply(String t1) {
         };
         Flowable<Map<Integer, String>> mapped = source.toMap(lengthFuncErr).toFlowable();
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "a");
         expected.put(2, "bb");
         expected.put(3, "ccc");
@@ -131,7 +131,7 @@ public String apply(String t1) {
 
         Flowable<Map<Integer, String>> mapped = source.toMap(lengthFunc, duplicateErr).toFlowable();
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "aa");
         expected.put(2, "bbbb");
         expected.put(3, "cccccc");
@@ -177,7 +177,7 @@ public String apply(String v) {
             }
         }, mapFactory).toFlowable();
 
-        Map<Integer, String> expected = new LinkedHashMap<Integer, String>();
+        Map<Integer, String> expected = new LinkedHashMap<>();
         expected.put(2, "bb");
         expected.put(3, "ccc");
         expected.put(4, "dddd");
@@ -213,7 +213,7 @@ public String apply(String v) {
             }
         }, mapFactory).toFlowable();
 
-        Map<Integer, String> expected = new LinkedHashMap<Integer, String>();
+        Map<Integer, String> expected = new LinkedHashMap<>();
         expected.put(2, "bb");
         expected.put(3, "ccc");
         expected.put(4, "dddd");
@@ -231,7 +231,7 @@ public void toMap() {
 
         Single<Map<Integer, String>> mapped = source.toMap(lengthFunc);
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "a");
         expected.put(2, "bb");
         expected.put(3, "ccc");
@@ -249,7 +249,7 @@ public void toMapWithValueSelector() {
 
         Single<Map<Integer, String>> mapped = source.toMap(lengthFunc, duplicate);
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "aa");
         expected.put(2, "bbbb");
         expected.put(3, "cccccc");
@@ -276,7 +276,7 @@ public Integer apply(String t1) {
         };
         Single<Map<Integer, String>> mapped = source.toMap(lengthFuncErr);
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "a");
         expected.put(2, "bb");
         expected.put(3, "ccc");
@@ -305,7 +305,7 @@ public String apply(String t1) {
 
         Single<Map<Integer, String>> mapped = source.toMap(lengthFunc, duplicateErr);
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "aa");
         expected.put(2, "bbbb");
         expected.put(3, "cccccc");
@@ -350,7 +350,7 @@ public String apply(String v) {
             }
         }, mapFactory);
 
-        Map<Integer, String> expected = new LinkedHashMap<Integer, String>();
+        Map<Integer, String> expected = new LinkedHashMap<>();
         expected.put(2, "bb");
         expected.put(3, "ccc");
         expected.put(4, "dddd");
@@ -385,7 +385,7 @@ public String apply(String v) {
             }
         }, mapFactory);
 
-        Map<Integer, String> expected = new LinkedHashMap<Integer, String>();
+        Map<Integer, String> expected = new LinkedHashMap<>();
         expected.put(2, "bb");
         expected.put(3, "ccc");
         expected.put(4, "dddd");
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java
index 2413ed6afe..06e71d6beb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java
@@ -55,7 +55,7 @@ public void toMultimapFlowable() {
 
         Flowable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc).toFlowable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("a", "b"));
         expected.put(2, Arrays.asList("cc", "dd"));
 
@@ -72,7 +72,7 @@ public void toMultimapWithValueSelectorFlowable() {
 
         Flowable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc, duplicate).toFlowable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("aa", "bb"));
         expected.put(2, Arrays.asList("cccc", "dddd"));
 
@@ -114,11 +114,11 @@ public String apply(String v) {
                 mapFactory, new Function<Integer, Collection<String>>() {
                     @Override
                     public Collection<String> apply(Integer e) {
-                        return new ArrayList<String>();
+                        return new ArrayList<>();
                     }
                 }).toFlowable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Arrays.asList("eee", "fff"));
 
@@ -137,9 +137,9 @@ public void toMultimapWithCollectionFactoryFlowable() {
             @Override
             public Collection<String> apply(Integer t1) {
                 if (t1 == 2) {
-                    return new ArrayList<String>();
+                    return new ArrayList<>();
                 } else {
-                    return new HashSet<String>();
+                    return new HashSet<>();
                 }
             }
         };
@@ -153,16 +153,16 @@ public String apply(String v) {
         Supplier<Map<Integer, Collection<String>>> mapSupplier = new Supplier<Map<Integer, Collection<String>>>() {
             @Override
             public Map<Integer, Collection<String>> get() {
-                return new HashMap<Integer, Collection<String>>();
+                return new HashMap<>();
             }
         };
 
         Flowable<Map<Integer, Collection<String>>> mapped = source
                 .toMultimap(lengthFunc, identity, mapSupplier, collectionFactory).toFlowable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
-        expected.put(3, new HashSet<String>(Arrays.asList("eee")));
+        expected.put(3, new HashSet<>(Arrays.asList("eee")));
 
         mapped.subscribe(objectSubscriber);
 
@@ -187,7 +187,7 @@ public Integer apply(String t1) {
 
         Flowable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFuncErr).toFlowable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("a", "b"));
         expected.put(2, Arrays.asList("cc", "dd"));
 
@@ -214,7 +214,7 @@ public String apply(String t1) {
 
         Flowable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc, duplicateErr).toFlowable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("aa", "bb"));
         expected.put(2, Arrays.asList("cccc", "dddd"));
 
@@ -244,7 +244,7 @@ public String apply(String v) {
                     }
                 }, mapFactory).toFlowable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Arrays.asList("eee", "fff"));
 
@@ -265,7 +265,7 @@ public Collection<String> apply(Integer t1) {
                 if (t1 == 2) {
                     throw new RuntimeException("Forced failure");
                 } else {
-                    return new HashSet<String>();
+                    return new HashSet<>();
                 }
             }
         };
@@ -279,14 +279,14 @@ public String apply(String v) {
         Supplier<Map<Integer, Collection<String>>> mapSupplier = new Supplier<Map<Integer, Collection<String>>>() {
             @Override
             public Map<Integer, Collection<String>> get() {
-                return new HashMap<Integer, Collection<String>>();
+                return new HashMap<>();
             }
         };
 
         Flowable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc,
                 identity, mapSupplier, collectionFactory).toFlowable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Collections.singleton("eee"));
 
@@ -303,7 +303,7 @@ public void toMultimap() {
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("a", "b"));
         expected.put(2, Arrays.asList("cc", "dd"));
 
@@ -319,7 +319,7 @@ public void toMultimapWithValueSelector() {
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc, duplicate);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("aa", "bb"));
         expected.put(2, Arrays.asList("cccc", "dddd"));
 
@@ -360,11 +360,11 @@ public String apply(String v) {
                 mapFactory, new Function<Integer, Collection<String>>() {
                     @Override
                     public Collection<String> apply(Integer e) {
-                        return new ArrayList<String>();
+                        return new ArrayList<>();
                     }
                 });
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Arrays.asList("eee", "fff"));
 
@@ -382,9 +382,9 @@ public void toMultimapWithCollectionFactory() {
             @Override
             public Collection<String> apply(Integer t1) {
                 if (t1 == 2) {
-                    return new ArrayList<String>();
+                    return new ArrayList<>();
                 } else {
-                    return new HashSet<String>();
+                    return new HashSet<>();
                 }
             }
         };
@@ -398,16 +398,16 @@ public String apply(String v) {
         Supplier<Map<Integer, Collection<String>>> mapSupplier = new Supplier<Map<Integer, Collection<String>>>() {
             @Override
             public Map<Integer, Collection<String>> get() {
-                return new HashMap<Integer, Collection<String>>();
+                return new HashMap<>();
             }
         };
 
         Single<Map<Integer, Collection<String>>> mapped = source
                 .toMultimap(lengthFunc, identity, mapSupplier, collectionFactory);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
-        expected.put(3, new HashSet<String>(Arrays.asList("eee")));
+        expected.put(3, new HashSet<>(Arrays.asList("eee")));
 
         mapped.subscribe(singleObserver);
 
@@ -431,7 +431,7 @@ public Integer apply(String t1) {
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFuncErr);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("a", "b"));
         expected.put(2, Arrays.asList("cc", "dd"));
 
@@ -457,7 +457,7 @@ public String apply(String t1) {
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc, duplicateErr);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("aa", "bb"));
         expected.put(2, Arrays.asList("cccc", "dddd"));
 
@@ -486,7 +486,7 @@ public String apply(String v) {
                     }
                 }, mapFactory);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Arrays.asList("eee", "fff"));
 
@@ -506,7 +506,7 @@ public Collection<String> apply(Integer t1) {
                 if (t1 == 2) {
                     throw new RuntimeException("Forced failure");
                 } else {
-                    return new HashSet<String>();
+                    return new HashSet<>();
                 }
             }
         };
@@ -520,14 +520,14 @@ public String apply(String v) {
         Supplier<Map<Integer, Collection<String>>> mapSupplier = new Supplier<Map<Integer, Collection<String>>>() {
             @Override
             public Map<Integer, Collection<String>> get() {
-                return new HashMap<Integer, Collection<String>>();
+                return new HashMap<>();
             }
         };
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc,
                 identity, mapSupplier, collectionFactory);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Collections.singleton("eee"));
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
index 96ec70ef69..6012db0add 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
@@ -72,7 +72,7 @@ public void withFollowingFirstFlowable() {
     @Test
     public void backpressureHonoredFlowable() {
         Flowable<List<Integer>> w = Flowable.just(1, 3, 2, 5, 4).toSortedList().toFlowable();
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>(0L);
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>(0L);
 
         w.subscribe(ts);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
index 6457f5ae26..1f37dbddce 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
@@ -38,7 +38,7 @@ public void unsubscribeWhenSubscribeOnAndUnsubscribeOnAreOnSameThread() throws I
         UIEventLoopScheduler uiEventLoop = new UIEventLoopScheduler();
         try {
             final ThreadSubscription subscription = new ThreadSubscription();
-            final AtomicReference<Thread> subscribeThread = new AtomicReference<Thread>();
+            final AtomicReference<Thread> subscribeThread = new AtomicReference<>();
             Flowable<Integer> w = Flowable.unsafeCreate(new Publisher<Integer>() {
 
                 @Override
@@ -54,7 +54,7 @@ public void subscribe(Subscriber<? super Integer> t1) {
                 }
             });
 
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
             w.subscribeOn(uiEventLoop).observeOn(Schedulers.computation())
             .unsubscribeOn(uiEventLoop)
             .take(2)
@@ -87,7 +87,7 @@ public void unsubscribeWhenSubscribeOnAndUnsubscribeOnAreOnDifferentThreads() th
         UIEventLoopScheduler uiEventLoop = new UIEventLoopScheduler();
         try {
             final ThreadSubscription subscription = new ThreadSubscription();
-            final AtomicReference<Thread> subscribeThread = new AtomicReference<Thread>();
+            final AtomicReference<Thread> subscribeThread = new AtomicReference<>();
             Flowable<Integer> w = Flowable.unsafeCreate(new Publisher<Integer>() {
 
                 @Override
@@ -103,7 +103,7 @@ public void subscribe(Subscriber<? super Integer> t1) {
                 }
             });
 
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
             w.subscribeOn(Schedulers.newThread()).observeOn(Schedulers.computation())
             .unsubscribeOn(uiEventLoop)
             .take(2)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
index 37d9195175..f32b599df4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
@@ -233,7 +233,7 @@ public Flowable<Integer> apply(Disposable subscription) {
 
     @Test
     public void usingDisposesEagerlyBeforeCompletion() {
-        final List<String> events = new ArrayList<String>();
+        final List<String> events = new ArrayList<>();
         Supplier<Resource> resourceFactory = createResourceFactory(events);
         final Action completion = createOnCompletedAction(events);
         final Action unsub = createUnsubAction(events);
@@ -260,7 +260,7 @@ public Flowable<String> apply(Resource resource) {
 
     @Test
     public void usingDoesNotDisposesEagerlyBeforeCompletion() {
-        final List<String> events = new ArrayList<String>();
+        final List<String> events = new ArrayList<>();
         Supplier<Resource> resourceFactory = createResourceFactory(events);
         final Action completion = createOnCompletedAction(events);
         final Action unsub = createUnsubAction(events);
@@ -287,7 +287,7 @@ public Flowable<String> apply(Resource resource) {
 
     @Test
     public void usingDisposesEagerlyBeforeError() {
-        final List<String> events = new ArrayList<String>();
+        final List<String> events = new ArrayList<>();
         Supplier<Resource> resourceFactory = createResourceFactory(events);
         final Consumer<Throwable> onError = createOnErrorAction(events);
         final Action unsub = createUnsubAction(events);
@@ -315,7 +315,7 @@ public Flowable<String> apply(Resource resource) {
 
     @Test
     public void usingDoesNotDisposesEagerlyBeforeError() {
-        final List<String> events = new ArrayList<String>();
+        final List<String> events = new ArrayList<>();
         final Supplier<Resource> resourceFactory = createResourceFactory(events);
         final Consumer<Throwable> onError = createOnErrorAction(events);
         final Action unsub = createUnsubAction(events);
@@ -604,7 +604,7 @@ public Flowable<Object> apply(Flowable<Object> f)
 
     @Test
     public void eagerDisposedOnComplete() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.using(Functions.justSupplier(1), Functions.justFunction(new Flowable<Integer>() {
             @Override
@@ -619,7 +619,7 @@ protected void subscribeActual(Subscriber<? super Integer> subscriber) {
 
     @Test
     public void eagerDisposedOnError() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.using(Functions.justSupplier(1), Functions.justFunction(new Flowable<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
index 8b001803c0..c17e2ccfae 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
@@ -43,7 +43,7 @@ public void windowViaFlowableNormal1() {
 
         final Subscriber<Object> subscriber = TestHelper.mockSubscriber();
 
-        final List<Subscriber<Object>> values = new ArrayList<Subscriber<Object>>();
+        final List<Subscriber<Object>> values = new ArrayList<>();
 
         Subscriber<Flowable<Integer>> wo = new DefaultSubscriber<Flowable<Integer>>() {
             @Override
@@ -100,7 +100,7 @@ public void windowViaFlowableBoundaryCompletes() {
 
         final Subscriber<Object> subscriber = TestHelper.mockSubscriber();
 
-        final List<Subscriber<Object>> values = new ArrayList<Subscriber<Object>>();
+        final List<Subscriber<Object>> values = new ArrayList<>();
 
         Subscriber<Flowable<Integer>> wo = new DefaultSubscriber<Flowable<Integer>>() {
             @Override
@@ -156,7 +156,7 @@ public void windowViaFlowableBoundaryThrows() {
 
         final Subscriber<Object> subscriber = TestHelper.mockSubscriber();
 
-        final List<Subscriber<Object>> values = new ArrayList<Subscriber<Object>>();
+        final List<Subscriber<Object>> values = new ArrayList<>();
 
         Subscriber<Flowable<Integer>> wo = new DefaultSubscriber<Flowable<Integer>>() {
             @Override
@@ -206,7 +206,7 @@ public void windowViaFlowableThrows() {
 
         final Subscriber<Object> subscriber = TestHelper.mockSubscriber();
 
-        final List<Subscriber<Object>> values = new ArrayList<Subscriber<Object>>();
+        final List<Subscriber<Object>> values = new ArrayList<>();
 
         Subscriber<Flowable<Integer>> wo = new DefaultSubscriber<Flowable<Integer>>() {
             @Override
@@ -408,7 +408,7 @@ public Flowable<Integer> apply(
     public void mainAndBoundaryBothError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<Subscriber<? super Object>>();
+            final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<>();
 
             TestSubscriberEx<Flowable<Object>> ts = Flowable.error(new TestException("main"))
             .window(new Flowable<Object>() {
@@ -447,8 +447,8 @@ public void mainCompleteBoundaryErrorRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
             List<Throwable> errors = TestHelper.trackPluginErrors();
             try {
-                final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<Subscriber<? super Object>>();
-                final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<Subscriber<? super Object>>();
+                final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<>();
+                final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<>();
 
                 TestSubscriberEx<Flowable<Object>> ts = new Flowable<Object>() {
                     @Override
@@ -497,8 +497,8 @@ public void run() {
     @Test
     public void mainNextBoundaryNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
-            final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<Subscriber<? super Object>>();
-            final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<Subscriber<? super Object>>();
+            final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<>();
+            final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<>();
 
             TestSubscriber<Flowable<Object>> ts = new Flowable<Object>() {
                 @Override
@@ -540,8 +540,8 @@ public void run() {
 
     @Test
     public void takeOneAnotherBoundary() {
-        final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<Subscriber<? super Object>>();
-        final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<Subscriber<? super Object>>();
+        final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<>();
+        final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<>();
 
         TestSubscriberEx<Flowable<Object>> ts = new Flowable<Object>() {
             @Override
@@ -572,8 +572,8 @@ protected void subscribeActual(Subscriber<? super Object> subscriber) {
     @Test
     public void disposeMainBoundaryCompleteRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
-            final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<Subscriber<? super Object>>();
-            final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<Subscriber<? super Object>>();
+            final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<>();
+            final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<>();
 
             final TestSubscriber<Flowable<Object>> ts = new Flowable<Object>() {
                  @Override
@@ -629,8 +629,8 @@ public void disposeMainBoundaryErrorRace() {
         final TestException ex = new TestException();
 
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
-           final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<Subscriber<? super Object>>();
-           final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<Subscriber<? super Object>>();
+           final AtomicReference<Subscriber<? super Object>> refMain = new AtomicReference<>();
+           final AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<>();
 
            final TestSubscriber<Flowable<Object>> ts = new Flowable<Object>() {
                @Override
@@ -709,7 +709,7 @@ public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstream() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<>();
 
         TestSubscriber<Flowable<Integer>> ts = pp.window(Flowable.<Integer>never())
         .doOnNext(new Consumer<Flowable<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
index 4536d7a8e4..e9a7c77518 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
@@ -99,7 +99,7 @@ public void skipAndCountWindowsWithGaps() {
 
     @Test
     public void windowUnsubscribeNonOverlapping() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         final AtomicInteger count = new AtomicInteger();
         Flowable.merge(Flowable.range(1, 10000).doOnNext(new Consumer<Integer>() {
@@ -121,7 +121,7 @@ public void accept(Integer t1) {
 
     @Test
     public void windowUnsubscribeNonOverlappingAsyncSource() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         final AtomicInteger count = new AtomicInteger();
         Flowable.merge(Flowable.range(1, 100000)
                 .doOnNext(new Consumer<Integer>() {
@@ -145,7 +145,7 @@ public void accept(Integer t1) {
 
     @Test
     public void windowUnsubscribeOverlapping() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         final AtomicInteger count = new AtomicInteger();
         Flowable.merge(Flowable.range(1, 10000).doOnNext(new Consumer<Integer>() {
 
@@ -164,7 +164,7 @@ public void accept(Integer t1) {
 
     @Test
     public void windowUnsubscribeOverlappingAsyncSource() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         final AtomicInteger count = new AtomicInteger();
         Flowable.merge(Flowable.range(1, 100000)
                 .doOnNext(new Consumer<Integer>() {
@@ -187,7 +187,7 @@ public void accept(Integer t1) {
     }
 
     private List<String> list(String... args) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (String arg : args) {
             list.add(arg);
         }
@@ -198,7 +198,7 @@ private List<String> list(String... args) {
     public void backpressureOuter() {
         Flowable<Flowable<Integer>> source = Flowable.range(1, 10).window(3);
 
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         final Subscriber<Integer> subscriber = TestHelper.mockSubscriber();
 
@@ -271,7 +271,7 @@ public void subscribe(Subscriber<? super Integer> s) {
 
     @Test
     public void takeFlatMapCompletes() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final int indicator = 999999999;
 
@@ -293,7 +293,7 @@ public Flowable<Integer> apply(Flowable<Integer> w) {
     @SuppressWarnings("unchecked")
     @Test
     public void backpressureOuterInexact() {
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>(0L);
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>(0L);
 
         Flowable.range(1, 5)
         .window(2, 1)
@@ -476,7 +476,7 @@ public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamSize() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<>();
 
         TestSubscriber<Flowable<Integer>> ts = pp.window(10)
         .take(1)
@@ -530,7 +530,7 @@ public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamSkip() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<>();
 
         TestSubscriber<Flowable<Integer>> ts = pp.window(5, 10)
         .take(1)
@@ -584,7 +584,7 @@ public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamOverlap() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<>();
 
         TestSubscriber<Flowable<Integer>> ts = pp.window(5, 3)
         .take(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
index 9420794dc5..55db25f654 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
@@ -46,8 +46,8 @@ public void before() {
 
     @Test
     public void flowableBasedOpenerAndCloser() {
-        final List<String> list = new ArrayList<String>();
-        final List<List<String>> lists = new ArrayList<List<String>>();
+        final List<String> list = new ArrayList<>();
+        final List<List<String>> lists = new ArrayList<>();
 
         Flowable<String> source = Flowable.unsafeCreate(new Publisher<String>() {
             @Override
@@ -96,7 +96,7 @@ public void subscribe(Subscriber<? super Object> subscriber) {
     }
 
     private List<String> list(String... args) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (String arg : args) {
             list.add(arg);
         }
@@ -128,7 +128,7 @@ public void accept(Flowable<String> stringFlowable) {
                 stringFlowable.subscribe(new DefaultSubscriber<String>() {
                     @Override
                     public void onComplete() {
-                        lists.add(new ArrayList<String>(list));
+                        lists.add(new ArrayList<>(list));
                         list.clear();
                     }
 
@@ -153,7 +153,7 @@ public void noUnsubscribeAndNoLeak() {
         PublishProcessor<Integer> open = PublishProcessor.create();
         final PublishProcessor<Integer> close = PublishProcessor.create();
 
-        TestSubscriber<Flowable<Integer>> ts = new TestSubscriber<Flowable<Integer>>();
+        TestSubscriber<Flowable<Integer>> ts = new TestSubscriber<>();
 
         source.window(open, new Function<Integer, Flowable<Integer>>() {
             @Override
@@ -197,7 +197,7 @@ public void unsubscribeAll() {
         PublishProcessor<Integer> open = PublishProcessor.create();
         final PublishProcessor<Integer> close = PublishProcessor.create();
 
-        TestSubscriber<Flowable<Integer>> ts = new TestSubscriber<Flowable<Integer>>();
+        TestSubscriber<Flowable<Integer>> ts = new TestSubscriber<>();
 
         source.window(open, new Function<Integer, Flowable<Integer>>() {
             @Override
@@ -481,7 +481,7 @@ public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstream() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<>();
 
         TestSubscriber<Flowable<Integer>> ts = pp.window(Flowable.<Integer>just(1).concatWith(Flowable.<Integer>never()),
                 Functions.justFunction(Flowable.never()))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
index eb72dab5f7..86da1bb09c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
@@ -46,8 +46,8 @@ public void before() {
 
     @Test
     public void timedAndCount() {
-        final List<String> list = new ArrayList<String>();
-        final List<List<String>> lists = new ArrayList<List<String>>();
+        final List<String> list = new ArrayList<>();
+        final List<List<String>> lists = new ArrayList<>();
 
         Flowable<String> source = Flowable.unsafeCreate(new Publisher<String>() {
             @Override
@@ -82,8 +82,8 @@ public void subscribe(Subscriber<? super String> subscriber) {
 
     @Test
     public void timed() {
-        final List<String> list = new ArrayList<String>();
-        final List<List<String>> lists = new ArrayList<List<String>>();
+        final List<String> list = new ArrayList<>();
+        final List<List<String>> lists = new ArrayList<>();
 
         Flowable<String> source = Flowable.unsafeCreate(new Publisher<String>() {
             @Override
@@ -111,7 +111,7 @@ public void subscribe(Subscriber<? super String> subscriber) {
     }
 
     private List<String> list(String... args) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (String arg : args) {
             list.add(arg);
         }
@@ -143,7 +143,7 @@ public void accept(Flowable<T> stringFlowable) {
                 stringFlowable.subscribe(new DefaultSubscriber<T>() {
                     @Override
                     public void onComplete() {
-                        lists.add(new ArrayList<T>(list));
+                        lists.add(new ArrayList<>(list));
                         list.clear();
                     }
 
@@ -166,8 +166,8 @@ public void exactWindowSize() {
         Flowable<Flowable<Integer>> source = Flowable.range(1, 10)
                 .window(1, TimeUnit.MINUTES, scheduler, 3);
 
-        final List<Integer> list = new ArrayList<Integer>();
-        final List<List<Integer>> lists = new ArrayList<List<Integer>>();
+        final List<Integer> list = new ArrayList<>();
+        final List<List<Integer>> lists = new ArrayList<>();
 
         source.subscribe(observeWindow(list, lists));
 
@@ -184,7 +184,7 @@ public void exactWindowSize() {
 
     @Test
     public void takeFlatMapCompletes() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final AtomicInteger wip = new AtomicInteger();
 
@@ -514,7 +514,7 @@ public void overlapBackpressure2() {
 
             PublishProcessor<Integer> pp = PublishProcessor.create();
 
-            final TestSubscriber<Integer> tsInner = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> tsInner = new TestSubscriber<>();
 
             TestSubscriber<Flowable<Integer>> ts = pp.window(2, 1, TimeUnit.SECONDS, scheduler)
             .doOnNext(new Consumer<Flowable<Integer>>() {
@@ -1204,7 +1204,7 @@ public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamExactTime() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<>();
 
         TestSubscriber<Flowable<Integer>> ts = pp.window(10, TimeUnit.MINUTES)
         .take(1)
@@ -1254,7 +1254,7 @@ public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamExactTimeAndSize() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<>();
 
         TestSubscriber<Flowable<Integer>> ts = pp.window(10, TimeUnit.MINUTES, 100)
         .take(1)
@@ -1304,7 +1304,7 @@ public Publisher<Integer> apply(Flowable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamExactTimeSkip() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<Flowable<Integer>>();
+        final AtomicReference<Flowable<Integer>> inner = new AtomicReference<>();
 
         TestSubscriber<Flowable<Integer>> ts = pp.window(10, 15, TimeUnit.MINUTES)
         .take(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
index 20814684da..544ca11bc6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
@@ -90,7 +90,7 @@ public void emptySource() {
 
         Flowable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         result.subscribe(ts);
 
@@ -116,7 +116,7 @@ public void emptyOther() {
 
         Flowable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         result.subscribe(ts);
 
@@ -142,7 +142,7 @@ public void unsubscription() {
 
         Flowable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         result.subscribe(ts);
 
@@ -169,7 +169,7 @@ public void sourceThrows() {
 
         Flowable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         result.subscribe(ts);
 
@@ -197,7 +197,7 @@ public void otherThrows() {
 
         Flowable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         result.subscribe(ts);
 
@@ -225,7 +225,7 @@ public void functionThrows() {
 
         Flowable<Integer> result = source.withLatestFrom(other, COMBINER_ERROR);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         result.subscribe(ts);
 
@@ -251,7 +251,7 @@ public void noDownstreamUnsubscribe() {
 
         Flowable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         result.subscribe(ts);
 
@@ -267,7 +267,7 @@ public void backpressure() {
 
         Flowable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         result.subscribe(ts);
 
@@ -319,7 +319,7 @@ public void manySources() {
         PublishProcessor<String> pp3 = PublishProcessor.create();
         PublishProcessor<String> main = PublishProcessor.create();
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
 
         main.withLatestFrom(new Flowable[] { pp1, pp2, pp3 }, toArray)
         .subscribe(ts);
@@ -366,7 +366,7 @@ public void manySourcesIterable() {
         PublishProcessor<String> pp3 = PublishProcessor.create();
         PublishProcessor<String> main = PublishProcessor.create();
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
 
         main.withLatestFrom(Arrays.<Flowable<?>>asList(pp1, pp2, pp3), toArray)
         .subscribe(ts);
@@ -411,8 +411,8 @@ public void manySourcesIterableSweep() {
         for (String val : new String[] { "1" /*, null*/ }) {
             int n = 35;
             for (int i = 0; i < n; i++) {
-                List<Flowable<?>> sources = new ArrayList<Flowable<?>>();
-                List<String> expected = new ArrayList<String>();
+                List<Flowable<?>> sources = new ArrayList<>();
+                List<String> expected = new ArrayList<>();
                 expected.add(val);
 
                 for (int j = 0; j < i; j++) {
@@ -420,7 +420,7 @@ public void manySourcesIterableSweep() {
                     expected.add(String.valueOf(val));
                 }
 
-                TestSubscriber<String> ts = new TestSubscriber<String>();
+                TestSubscriber<String> ts = new TestSubscriber<>();
 
                 PublishProcessor<String> main = PublishProcessor.create();
 
@@ -443,7 +443,7 @@ public void backpressureNoSignal() {
         PublishProcessor<String> pp1 = PublishProcessor.create();
         PublishProcessor<String> pp2 = PublishProcessor.create();
 
-        TestSubscriber<String> ts = new TestSubscriber<String>(0);
+        TestSubscriber<String> ts = new TestSubscriber<>(0);
 
         Flowable.range(1, 10).withLatestFrom(new Flowable<?>[] { pp1, pp2 }, toArray)
         .subscribe(ts);
@@ -465,7 +465,7 @@ public void backpressureWithSignal() {
         PublishProcessor<String> pp1 = PublishProcessor.create();
         PublishProcessor<String> pp2 = PublishProcessor.create();
 
-        TestSubscriber<String> ts = new TestSubscriber<String>(0);
+        TestSubscriber<String> ts = new TestSubscriber<>(0);
 
         Flowable.range(1, 3).withLatestFrom(new Flowable<?>[] { pp1, pp2 }, toArray)
         .subscribe(ts);
@@ -495,7 +495,7 @@ public void backpressureWithSignal() {
 
     @Test
     public void withEmpty() {
-        TestSubscriber<String> ts = new TestSubscriber<String>(0);
+        TestSubscriber<String> ts = new TestSubscriber<>(0);
 
         Flowable.range(1, 3).withLatestFrom(
                 new Flowable<?>[] { Flowable.just(1), Flowable.empty() }, toArray)
@@ -508,7 +508,7 @@ public void withEmpty() {
 
     @Test
     public void withError() {
-        TestSubscriber<String> ts = new TestSubscriber<String>(0);
+        TestSubscriber<String> ts = new TestSubscriber<>(0);
 
         Flowable.range(1, 3).withLatestFrom(
                 new Flowable<?>[] { Flowable.just(1), Flowable.error(new TestException()) }, toArray)
@@ -521,7 +521,7 @@ public void withError() {
 
     @Test
     public void withMainError() {
-        TestSubscriber<String> ts = new TestSubscriber<String>(0);
+        TestSubscriber<String> ts = new TestSubscriber<>(0);
 
         Flowable.error(new TestException()).withLatestFrom(
                 new Flowable<?>[] { Flowable.just(1), Flowable.just(1) }, toArray)
@@ -536,7 +536,7 @@ public void withMainError() {
     public void with2Others() {
         Flowable<Integer> just = Flowable.just(1);
 
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
         just.withLatestFrom(just, just, new Function3<Integer, Integer, Integer, List<Integer>>() {
             @Override
@@ -555,7 +555,7 @@ public List<Integer> apply(Integer a, Integer b, Integer c) {
     public void with3Others() {
         Flowable<Integer> just = Flowable.just(1);
 
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
         just.withLatestFrom(just, just, just, new Function4<Integer, Integer, Integer, Integer, List<Integer>>() {
             @Override
@@ -574,7 +574,7 @@ public List<Integer> apply(Integer a, Integer b, Integer c, Integer d) {
     public void with4Others() {
         Flowable<Integer> just = Flowable.just(1);
 
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
         just.withLatestFrom(just, just, just, just, new Function5<Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
             @Override
@@ -609,7 +609,7 @@ public Object apply(Integer a, Integer b, Integer c) throws Exception {
     @Test
     public void manyIteratorThrows() {
         Flowable.just(1)
-        .withLatestFrom(new CrashingMappedIterable<Flowable<Integer>>(1, 100, 100, new Function<Integer, Flowable<Integer>>() {
+        .withLatestFrom(new CrashingMappedIterable<>(1, 100, 100, new Function<Integer, Flowable<Integer>>() {
             @Override
             public Flowable<Integer> apply(Integer v) throws Exception {
                 return Flowable.just(2);
@@ -733,7 +733,7 @@ public void singleRequestNotForgottenWhenNoData() {
 
         Flowable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         result.subscribe(ts);
 
@@ -794,7 +794,7 @@ public Object apply(Object a, Integer b, Integer c, Integer d)
                 }
             });
 
-            final TestSubscriber<Object> ts = new TestSubscriber<Object>();
+            final TestSubscriber<Object> ts = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -837,7 +837,7 @@ public Object apply(Object a, Integer b, Integer c, Integer d)
                 }
             });
 
-            final TestSubscriber<Object> ts = new TestSubscriber<Object>();
+            final TestSubscriber<Object> ts = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
index d6921bfd91..d40b3908c9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
@@ -352,7 +352,7 @@ public void aggregatorUnsubscribe() {
         PublishProcessor<String> r2 = PublishProcessor.create();
         /* define a Subscriber to receive aggregated events */
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
 
         Flowable.zip(r1, r2, zipr2).subscribe(ts);
 
@@ -770,7 +770,7 @@ public String apply(Integer a, Integer b) {
                     }
                 });
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
         os.subscribe(new Consumer<String>() {
 
             @Override
@@ -797,7 +797,7 @@ public String apply(Integer a, Integer b) {
                     }
                 }).take(5);
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         os.subscribe(ts);
 
         ts.awaitDone(5, TimeUnit.SECONDS);
@@ -822,7 +822,7 @@ public String apply(Integer a, Integer b) {
                     }
                 });
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
         os.subscribe(new DefaultSubscriber<String>() {
 
             @Override
@@ -886,7 +886,7 @@ public String apply(Notification<Integer> t1, Notification<String> t2) {
 
         });
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
         f.subscribe(new Consumer<String>() {
 
             @Override
@@ -915,7 +915,7 @@ public String apply(Integer t1, String t2) {
 
         });
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
         f.subscribe(new Consumer<String>() {
 
             @Override
@@ -942,7 +942,7 @@ public Object apply(final Object[] args) {
             }
         });
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         f.subscribe(ts);
         ts.awaitDone(200, TimeUnit.MILLISECONDS);
         ts.assertNoValues();
@@ -976,7 +976,7 @@ public void backpressureSync() {
         Flowable<Integer> f1 = createInfiniteFlowable(generatedA);
         Flowable<Integer> f2 = createInfiniteFlowable(generatedB);
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Flowable.zip(f1, f2, new BiFunction<Integer, Integer, String>() {
 
             @Override
@@ -1000,7 +1000,7 @@ public void backpressureAsync() {
         Flowable<Integer> f1 = createInfiniteFlowable(generatedA).subscribeOn(Schedulers.computation());
         Flowable<Integer> f2 = createInfiniteFlowable(generatedB).subscribeOn(Schedulers.computation());
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Flowable.zip(f1, f2, new BiFunction<Integer, Integer, String>() {
 
             @Override
@@ -1024,7 +1024,7 @@ public void downstreamBackpressureRequestsWithFiniteSyncFlowables() {
         Flowable<Integer> f1 = createInfiniteFlowable(generatedA).take(Flowable.bufferSize() * 2);
         Flowable<Integer> f2 = createInfiniteFlowable(generatedB).take(Flowable.bufferSize() * 2);
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Flowable.zip(f1, f2, new BiFunction<Integer, Integer, String>() {
 
             @Override
@@ -1049,7 +1049,7 @@ public void downstreamBackpressureRequestsWithInfiniteAsyncFlowables() {
         Flowable<Integer> f1 = createInfiniteFlowable(generatedA).subscribeOn(Schedulers.computation());
         Flowable<Integer> f2 = createInfiniteFlowable(generatedB).subscribeOn(Schedulers.computation());
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Flowable.zip(f1, f2, new BiFunction<Integer, Integer, String>() {
 
             @Override
@@ -1074,7 +1074,7 @@ public void downstreamBackpressureRequestsWithInfiniteSyncFlowables() {
         Flowable<Integer> f1 = createInfiniteFlowable(generatedA);
         Flowable<Integer> f2 = createInfiniteFlowable(generatedB);
 
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Flowable.zip(f1, f2, new BiFunction<Integer, Integer, String>() {
 
             @Override
@@ -1189,7 +1189,7 @@ public Integer apply(Integer i1, Integer i2) {
                         return i1 + i2;
                     }
                 });
-        List<Integer> expected = new ArrayList<Integer>();
+        List<Integer> expected = new ArrayList<>();
         for (int i = 0; i < 1026; i++) {
             expected.add(i * 3);
         }
@@ -1247,7 +1247,7 @@ public Integer apply(Integer t1, Integer t2) {
     @Test
     public void zipRequest1() {
         Flowable<Integer> src = Flowable.just(1).subscribeOn(Schedulers.computation());
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1L);
 
         Flowable.zip(src, src, new BiFunction<Integer, Integer, Integer>() {
             @Override
@@ -1871,7 +1871,7 @@ public Integer apply(Integer a, Integer b) throws Exception {
     public void firstErrorPreventsSecondSubscription() {
         final AtomicInteger counter = new AtomicInteger();
 
-        List<Flowable<?>> flowableList = new ArrayList<Flowable<?>>();
+        List<Flowable<?>> flowableList = new ArrayList<>();
         flowableList.add(Flowable.create(new FlowableOnSubscribe<Object>() {
             @Override
             public void subscribe(FlowableEmitter<Object> e)

From d6d698213b6c4091f4d5a0fb47f0922d0d0618e3 Mon Sep 17 00:00:00 2001
From: Dmitry Volkov <42734936+dvolkovv@users.noreply.github.com>
Date: Sun, 22 Dec 2019 13:59:44 +0300
Subject: [PATCH 017/665] diamond operators in unit tests, observable package
 (#6786)

---
 .../BlockingObservableNextTest.java           |  8 +-
 .../BlockingObservableToIteratorTest.java     |  8 +-
 .../internal/operators/observable/Burst.java  |  4 +-
 .../observable/ObservableAllTest.java         |  4 +-
 .../observable/ObservableAmbTest.java         |  4 +-
 .../observable/ObservableAnyTest.java         |  4 +-
 .../observable/ObservableBlockingTest.java    | 22 ++---
 .../observable/ObservableBufferTest.java      | 81 ++++++++++---------
 .../observable/ObservableCacheTest.java       | 30 +++----
 .../observable/ObservableCollectTest.java     | 26 +++---
 .../ObservableCombineLatestTest.java          | 12 +--
 .../ObservableConcatMapEagerTest.java         |  6 +-
 .../ObservableConcatMapSchedulerTest.java     |  2 +-
 .../observable/ObservableConcatTest.java      | 48 +++++------
 .../ObservableConcatWithCompletableTest.java  |  8 +-
 .../ObservableConcatWithMaybeTest.java        | 10 +--
 .../ObservableConcatWithSingleTest.java       |  8 +-
 .../observable/ObservableDebounceTest.java    | 18 ++---
 .../ObservableDelaySubscriptionOtherTest.java | 10 +--
 .../observable/ObservableDelayTest.java       | 26 +++---
 .../ObservableDematerializeTest.java          |  2 +-
 .../observable/ObservableDetachTest.java      | 12 +--
 .../observable/ObservableDistinctTest.java    |  4 +-
 .../ObservableDistinctUntilChangedTest.java   |  4 +-
 .../observable/ObservableDoAfterNextTest.java | 14 ++--
 .../observable/ObservableDoFinallyTest.java   | 24 +++---
 .../observable/ObservableDoOnEachTest.java    | 20 ++---
 .../ObservableDoOnSubscribeTest.java          |  2 +-
 .../ObservableDoOnUnsubscribeTest.java        | 12 +--
 .../observable/ObservableFilterTest.java      |  6 +-
 .../ObservableFlatMapCompletableTest.java     |  4 +-
 .../ObservableFlatMapMaybeTest.java           |  2 +-
 .../ObservableFlatMapSingleTest.java          |  2 +-
 .../observable/ObservableFlatMapTest.java     | 26 +++---
 .../observable/ObservableForEachTest.java     |  4 +-
 .../ObservableFromCallableTest.java           |  6 +-
 .../ObservableFromIterableTest.java           | 10 +--
 .../ObservableFromSupplierTest.java           |  6 +-
 .../observable/ObservableFromTest.java        |  2 +-
 .../observable/ObservableGroupByTest.java     | 56 ++++++-------
 .../ObservableIgnoreElementsTest.java         |  8 +-
 .../observable/ObservableIntervalTest.java    |  2 +-
 .../ObservableMapNotificationTest.java        |  2 +-
 .../observable/ObservableMapTest.java         |  8 +-
 .../observable/ObservableMaterializeTest.java |  4 +-
 .../ObservableMergeDelayErrorTest.java        |  6 +-
 .../ObservableMergeMaxConcurrentTest.java     | 46 +++++------
 .../observable/ObservableMergeTest.java       | 44 +++++-----
 .../ObservableMergeWithCompletableTest.java   |  4 +-
 .../ObservableMergeWithMaybeTest.java         |  2 +-
 .../ObservableMergeWithSingleTest.java        |  2 +-
 .../observable/ObservableObserveOnTest.java   | 16 ++--
 .../ObservableOnErrorResumeNextTest.java      |  8 +-
 .../ObservableOnErrorResumeWithTest.java      |  2 +-
 .../ObservableOnErrorReturnTest.java          |  8 +-
 .../observable/ObservablePublishTest.java     | 28 +++----
 .../observable/ObservableRangeLongTest.java   | 10 +--
 .../observable/ObservableRangeTest.java       |  8 +-
 .../observable/ObservableRedoTest.java        |  2 +-
 .../observable/ObservableRefCountTest.java    | 22 ++---
 .../observable/ObservableRepeatTest.java      |  6 +-
 .../ObservableReplayEagerTruncateTest.java    | 48 +++++------
 .../observable/ObservableReplayTest.java      | 48 +++++------
 .../ObservableResourceWrapperTest.java        | 12 +--
 .../observable/ObservableRetryTest.java       | 30 +++----
 .../ObservableRetryWithPredicateTest.java     | 10 +--
 .../observable/ObservableScalarXMapTest.java  | 22 ++---
 .../observable/ObservableScanTest.java        | 10 +--
 .../observable/ObservableSingleTest.java      |  2 +-
 .../observable/ObservableSkipLastTest.java    |  2 +-
 .../observable/ObservableSkipTest.java        |  2 +-
 .../observable/ObservableSubscribeOnTest.java |  8 +-
 .../observable/ObservableSwitchTest.java      |  6 +-
 .../observable/ObservableTakeLastOneTest.java |  6 +-
 .../observable/ObservableTakeLastTest.java    |  4 +-
 .../observable/ObservableTakeTest.java        |  6 +-
 .../ObservableTakeUntilPredicateTest.java     |  2 +-
 .../observable/ObservableTakeUntilTest.java   |  6 +-
 .../observable/ObservableTakeWhileTest.java   |  4 +-
 .../ObservableTimeIntervalTest.java           |  6 +-
 .../observable/ObservableTimeoutTests.java    | 24 +++---
 .../ObservableTimeoutWithSelectorTest.java    |  2 +-
 .../observable/ObservableTimerTest.java       | 18 ++---
 .../observable/ObservableTimestampTest.java   | 12 +--
 .../observable/ObservableToFutureTest.java    | 10 +--
 .../observable/ObservableToMapTest.java       | 24 +++---
 .../observable/ObservableToMultimapTest.java  | 60 +++++++-------
 .../ObservableUnsubscribeOnTest.java          |  8 +-
 .../observable/ObservableUsingTest.java       | 12 +--
 .../ObservableWindowWithObservableTest.java   | 32 ++++----
 .../ObservableWindowWithSizeTest.java         | 20 ++---
 ...vableWindowWithStartEndObservableTest.java | 14 ++--
 .../ObservableWindowWithTimeTest.java         | 24 +++---
 .../ObservableWithLatestFromTest.java         | 38 ++++-----
 .../observable/ObservableZipTest.java         | 20 ++---
 95 files changed, 675 insertions(+), 672 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
index 0fcec3a172..357d512e9b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
@@ -63,7 +63,7 @@ public void run() {
     }
 
     static <T> Iterable<T> next(ObservableSource<T> source) {
-        return new BlockingObservableNext<T>(source);
+        return new BlockingObservableNext<>(source);
     }
 
     @Test
@@ -356,7 +356,7 @@ public void remove() {
 
     @Test
     public void nextObserverError() {
-        NextObserver<Integer> no = new NextObserver<Integer>();
+        NextObserver<Integer> no = new NextObserver<>();
 
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -370,7 +370,7 @@ public void nextObserverError() {
 
     @Test
     public void nextObserverOnNext() throws Exception {
-        NextObserver<Integer> no = new NextObserver<Integer>();
+        NextObserver<Integer> no = new NextObserver<>();
 
         no.setWaiting();
         no.onNext(Notification.createOnNext(1));
@@ -383,7 +383,7 @@ public void nextObserverOnNext() throws Exception {
 
     @Test
     public void nextObserverOnCompleteOnNext() throws Exception {
-        NextObserver<Integer> no = new NextObserver<Integer>();
+        NextObserver<Integer> no = new NextObserver<>();
 
         no.setWaiting();
         no.onNext(Notification.<Integer>createOnComplete());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
index 3658c24b97..4b6e2bc5cd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
@@ -73,7 +73,7 @@ public void subscribe(Observer<? super String> observer) {
 
     @Test
     public void dispose() {
-        BlockingObservableIterator<Integer> it = new BlockingObservableIterator<Integer>(128);
+        BlockingObservableIterator<Integer> it = new BlockingObservableIterator<>(128);
 
         assertFalse(it.isDisposed());
 
@@ -84,7 +84,7 @@ public void dispose() {
 
     @Test
     public void interruptWait() {
-        BlockingObservableIterator<Integer> it = new BlockingObservableIterator<Integer>(128);
+        BlockingObservableIterator<Integer> it = new BlockingObservableIterator<>(128);
 
         try {
             Thread.currentThread().interrupt();
@@ -97,14 +97,14 @@ public void interruptWait() {
 
     @Test(expected = NoSuchElementException.class)
     public void emptyThrowsNoSuch() {
-        BlockingObservableIterator<Integer> it = new BlockingObservableIterator<Integer>(128);
+        BlockingObservableIterator<Integer> it = new BlockingObservableIterator<>(128);
         it.onComplete();
         it.next();
     }
 
     @Test(expected = UnsupportedOperationException.class)
     public void remove() {
-        BlockingObservableIterator<Integer> it = new BlockingObservableIterator<Integer>(128);
+        BlockingObservableIterator<Integer> it = new BlockingObservableIterator<>(128);
         it.remove();
     }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
index 7e3dfbf8bf..2bed435879 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
@@ -53,7 +53,7 @@ public static <T> Builder<T> item(T item) {
 
     @SafeVarargs
     public static <T> Builder<T> items(T... items) {
-        return new Builder<T>(Arrays.asList(items));
+        return new Builder<>(Arrays.asList(items));
     }
 
     public static final class Builder<T> {
@@ -71,7 +71,7 @@ public Observable<T> error(Throwable e) {
         }
 
         public Observable<T> create() {
-            return new Burst<T>(error, items);
+            return new Burst<>(error, items);
         }
 
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
index 38be122378..293607d66b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
@@ -146,7 +146,7 @@ public Observable<Integer> apply(Boolean t1) {
 
     @Test
     public void predicateThrowsExceptionAndValueInCauseMessageObservable() {
-        TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
+        TestObserverEx<Boolean> to = new TestObserverEx<>();
 
         final IllegalArgumentException ex = new IllegalArgumentException();
 
@@ -277,7 +277,7 @@ public Observable<Integer> apply(Boolean t1) {
 
     @Test
     public void predicateThrowsExceptionAndValueInCauseMessage() {
-        TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
+        TestObserverEx<Boolean> to = new TestObserverEx<>();
 
         final IllegalArgumentException ex = new IllegalArgumentException();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
index 14c720257a..239d8339ea 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
@@ -178,7 +178,7 @@ public void accept(Disposable d) {
         //this stream emits second
         Observable<Integer> o2 = Observable.just(1).doOnSubscribe(incrementer)
                 .delay(100, TimeUnit.MILLISECONDS).subscribeOn(Schedulers.computation());
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.ambArray(o1, o2).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -212,7 +212,7 @@ public void ambCancelsOthers() {
         PublishSubject<Integer> source2 = PublishSubject.create();
         PublishSubject<Integer> source3 = PublishSubject.create();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable.ambArray(source1, source2, source3).subscribe(to);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
index 6ce9410340..35faf30c19 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
@@ -247,7 +247,7 @@ public Observable<Integer> apply(Boolean t1) {
 
     @Test
     public void predicateThrowsExceptionAndValueInCauseMessageObservable() {
-        TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
+        TestObserverEx<Boolean> to = new TestObserverEx<>();
         final IllegalArgumentException ex = new IllegalArgumentException();
 
         Observable.just("Boo!").any(new Predicate<String>() {
@@ -469,7 +469,7 @@ public Observable<Integer> apply(Boolean t1) {
 
     @Test
     public void predicateThrowsExceptionAndValueInCauseMessage() {
-        TestObserverEx<Boolean> to = new TestObserverEx<Boolean>();
+        TestObserverEx<Boolean> to = new TestObserverEx<>();
         final IllegalArgumentException ex = new IllegalArgumentException();
 
         Observable.just("Boo!").any(new Predicate<String>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
index c8454452b4..a2d9854569 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
@@ -48,7 +48,7 @@ public void blockingFirstDefault() {
 
     @Test
     public void blockingSubscribeConsumer() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Observable.range(1, 5)
         .subscribeOn(Schedulers.computation())
@@ -64,7 +64,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void blockingSubscribeConsumerConsumer() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Observable.range(1, 5)
         .subscribeOn(Schedulers.computation())
@@ -80,7 +80,7 @@ public void accept(Integer v) throws Exception {
 
     @Test
     public void blockingSubscribeConsumerConsumerError() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         TestException ex = new TestException();
 
@@ -100,7 +100,7 @@ public void accept(Object v) throws Exception {
 
     @Test
     public void blockingSubscribeConsumerConsumerAction() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Consumer<Object> cons = new Consumer<Object>() {
             @Override
@@ -123,7 +123,7 @@ public void run() throws Exception {
 
     @Test
     public void blockingSubscribeObserver() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Observable.range(1, 5)
         .subscribeOn(Schedulers.computation())
@@ -156,7 +156,7 @@ public void onComplete() {
 
     @Test
     public void blockingSubscribeObserverError() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         final TestException ex = new TestException();
 
@@ -232,7 +232,7 @@ public void utilityClass() {
 
     @Test
     public void disposeUpFront() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.dispose();
         Observable.just(1).blockingSubscribe(to);
 
@@ -242,7 +242,7 @@ public void disposeUpFront() {
     @SuppressWarnings("rawtypes")
     @Test
     public void delayed() throws Exception {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
         final Observer[] s = { null };
 
         Schedulers.single().scheduleDirect(new Runnable() {
@@ -271,14 +271,14 @@ protected void subscribeActual(Observer<? super Integer> observer) {
 
     @Test
     public void interrupt() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         Thread.currentThread().interrupt();
         Observable.never().blockingSubscribe(to);
     }
 
     @Test
     public void onCompleteDelayed() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         Observable.empty().delay(100, TimeUnit.MILLISECONDS)
         .blockingSubscribe(to);
@@ -288,7 +288,7 @@ public void onCompleteDelayed() {
 
     @Test
     public void blockingCancelUpfront() {
-        BlockingFirstObserver<Integer> o = new BlockingFirstObserver<Integer>();
+        BlockingFirstObserver<Integer> o = new BlockingFirstObserver<>();
 
         assertFalse(o.isDisposed());
         o.dispose();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
index 34ae5ed780..eeee099b0d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
@@ -273,7 +273,7 @@ public void accept(List<Integer> t1) {
     }
 
     private List<String> list(String... args) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (String arg : args) {
             list.add(arg);
         }
@@ -303,7 +303,7 @@ public void bufferStopsWhenUnsubscribed1() {
         Observable<Integer> source = Observable.never();
 
         Observer<List<Integer>> o = TestHelper.mockObserver();
-        TestObserver<List<Integer>> to = new TestObserver<List<Integer>>(o);
+        TestObserver<List<Integer>> to = new TestObserver<>(o);
 
         source.buffer(100, 200, TimeUnit.MILLISECONDS, scheduler)
         .doOnNext(new Consumer<List<Integer>>() {
@@ -781,7 +781,7 @@ public void bufferBoundaryHint() {
     }
 
     static HashSet<Integer> set(Integer... values) {
-        return new HashSet<Integer>(Arrays.asList(values));
+        return new HashSet<>(Arrays.asList(values));
     }
 
     @SuppressWarnings("unchecked")
@@ -791,7 +791,7 @@ public void bufferIntoCustomCollection() {
         .buffer(3, new Supplier<Collection<Integer>>() {
             @Override
             public Collection<Integer> get() throws Exception {
-                return new HashSet<Integer>();
+                return new HashSet<>();
             }
         })
         .test()
@@ -805,7 +805,7 @@ public void bufferSkipIntoCustomCollection() {
         .buffer(3, 3, new Supplier<Collection<Integer>>() {
             @Override
             public Collection<Integer> get() throws Exception {
-                return new HashSet<Integer>();
+                return new HashSet<>();
             }
         })
         .test()
@@ -865,7 +865,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     throw new TestException();
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         }, false)
@@ -885,7 +885,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     throw new TestException();
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         }, false)
@@ -905,7 +905,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     throw new TestException();
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         })
@@ -925,7 +925,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     return null;
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         }, false)
@@ -945,7 +945,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     return null;
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         }, false)
@@ -965,7 +965,7 @@ public Collection<Integer> get() throws Exception {
                 if (count++ == 1) {
                     return null;
                 } else {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             }
         })
@@ -1016,7 +1016,7 @@ public List<Integer> get() throws Exception {
                 if (++calls == 2) {
                     throw new TestException();
                 }
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         })
         .test()
@@ -1034,7 +1034,7 @@ public List<Integer> get() throws Exception {
                 if (++calls == 2) {
                     throw new TestException();
                 }
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         })
         .test()
@@ -1134,7 +1134,7 @@ public List<Integer> get() throws Exception {
                 if (++calls == 2) {
                     throw new TestException();
                 }
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, true)
         .test();
@@ -1587,7 +1587,7 @@ public List<Integer> get() throws Exception {
                 if (++calls == 2) {
                     throw new TestException();
                 }
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }).test();
 
@@ -1609,7 +1609,7 @@ protected void subscribeActual(Observer<? super Integer> observer) {
             }
         };
 
-        final AtomicReference<Observer<? super Integer>> ref = new AtomicReference<Observer<? super Integer>>();
+        final AtomicReference<Observer<? super Integer>> ref = new AtomicReference<>();
         Observable<Integer> b = new Observable<Integer>() {
             @Override
             protected void subscribeActual(Observer<? super Integer> observer) {
@@ -1653,10 +1653,10 @@ public void timedCancelledUpfront() {
     public void timedInternalState() {
         TestScheduler sch = new TestScheduler();
 
-        TestObserver<List<Integer>> to = new TestObserver<List<Integer>>();
+        TestObserver<List<Integer>> to = new TestObserver<>();
 
-        BufferExactUnboundedObserver<Integer, List<Integer>> sub = new BufferExactUnboundedObserver<Integer, List<Integer>>(
-                to, Functions.justSupplier((List<Integer>)new ArrayList<Integer>()), 1, TimeUnit.SECONDS, sch);
+        BufferExactUnboundedObserver<Integer, List<Integer>> sub = new BufferExactUnboundedObserver<>(
+                to, Functions.justSupplier((List<Integer>) new ArrayList<Integer>()), 1, TimeUnit.SECONDS, sch);
 
         sub.onSubscribe(Disposable.empty());
 
@@ -1672,7 +1672,7 @@ public void timedInternalState() {
 
         assertTrue(sub.isDisposed());
 
-        sub.buffer = new ArrayList<Integer>();
+        sub.buffer = new ArrayList<>();
         sub.enter();
         sub.onComplete();
     }
@@ -1703,10 +1703,10 @@ public Observable<List<Object>> apply(Observable<Object> f)
     public void timedSkipInternalState() {
         TestScheduler sch = new TestScheduler();
 
-        TestObserver<List<Integer>> to = new TestObserver<List<Integer>>();
+        TestObserver<List<Integer>> to = new TestObserver<>();
 
-        BufferSkipBoundedObserver<Integer, List<Integer>> sub = new BufferSkipBoundedObserver<Integer, List<Integer>>(
-                to, Functions.justSupplier((List<Integer>)new ArrayList<Integer>()), 1, 1, TimeUnit.SECONDS, sch.createWorker());
+        BufferSkipBoundedObserver<Integer, List<Integer>> sub = new BufferSkipBoundedObserver<>(
+                to, Functions.justSupplier((List<Integer>) new ArrayList<Integer>()), 1, 1, TimeUnit.SECONDS, sch.createWorker());
 
         sub.onSubscribe(Disposable.empty());
 
@@ -1722,19 +1722,20 @@ public void timedSkipInternalState() {
     public void timedSkipCancelWhenSecondBuffer() {
         TestScheduler sch = new TestScheduler();
 
-        final TestObserver<List<Integer>> to = new TestObserver<List<Integer>>();
+        final TestObserver<List<Integer>> to = new TestObserver<>();
 
-        BufferSkipBoundedObserver<Integer, List<Integer>> sub = new BufferSkipBoundedObserver<Integer, List<Integer>>(
+        BufferSkipBoundedObserver<Integer, List<Integer>> sub = new BufferSkipBoundedObserver<>(
                 to, new Supplier<List<Integer>>() {
-                    int calls;
-                    @Override
-                    public List<Integer> get() throws Exception {
-                        if (++calls == 2) {
-                            to.dispose();
-                        }
-                        return new ArrayList<Integer>();
-                    }
-                }, 1, 1, TimeUnit.SECONDS, sch.createWorker());
+            int calls;
+
+            @Override
+            public List<Integer> get() throws Exception {
+                if (++calls == 2) {
+                    to.dispose();
+                }
+                return new ArrayList<>();
+            }
+        }, 1, 1, TimeUnit.SECONDS, sch.createWorker());
 
         sub.onSubscribe(Disposable.empty());
 
@@ -1747,11 +1748,11 @@ public List<Integer> get() throws Exception {
     public void timedSizeBufferAlreadyCleared() {
         TestScheduler sch = new TestScheduler();
 
-        TestObserver<List<Integer>> to = new TestObserver<List<Integer>>();
+        TestObserver<List<Integer>> to = new TestObserver<>();
 
         BufferExactBoundedObserver<Integer, List<Integer>> sub =
-                new BufferExactBoundedObserver<Integer, List<Integer>>(
-                        to, Functions.justSupplier((List<Integer>)new ArrayList<Integer>()),
+                new BufferExactBoundedObserver<>(
+                        to, Functions.justSupplier((List<Integer>) new ArrayList<Integer>()),
                         1, TimeUnit.SECONDS, 1, false, sch.createWorker())
         ;
 
@@ -1790,10 +1791,10 @@ public ObservableSource<List<Object>> apply(Observable<Object> o)
 
     @Test
     public void bufferExactState() {
-        TestObserver<List<Integer>> to = new TestObserver<List<Integer>>();
+        TestObserver<List<Integer>> to = new TestObserver<>();
 
-        BufferExactObserver<Integer, List<Integer>> sub = new BufferExactObserver<Integer, List<Integer>>(
-                to, 1, Functions.justSupplier((List<Integer>)new ArrayList<Integer>())
+        BufferExactObserver<Integer, List<Integer>> sub = new BufferExactObserver<>(
+                to, 1, Functions.justSupplier((List<Integer>) new ArrayList<Integer>())
         );
 
         sub.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
index 20c4fde308..8f4440e41b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
@@ -36,11 +36,11 @@
 public class ObservableCacheTest extends RxJavaTest {
     @Test
     public void coldReplayNoBackpressure() {
-        ObservableCache<Integer> source = new ObservableCache<Integer>(Observable.range(0, 1000), 16);
+        ObservableCache<Integer> source = new ObservableCache<>(Observable.range(0, 1000), 16);
 
         assertFalse("Source is connected!", source.isConnected());
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         source.subscribe(to);
 
@@ -119,9 +119,9 @@ public void unsubscribeSource() throws Throwable {
 
     @Test
     public void take() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
-        ObservableCache<Integer> cached = new ObservableCache<Integer>(Observable.range(1, 1000), 16);
+        ObservableCache<Integer> cached = new ObservableCache<>(Observable.range(1, 1000), 16);
         cached.take(10).subscribe(to);
 
         to.assertNoErrors();
@@ -135,9 +135,9 @@ public void take() {
     public void async() {
         Observable<Integer> source = Observable.range(1, 10000);
         for (int i = 0; i < 100; i++) {
-            TestObserver<Integer> to1 = new TestObserver<Integer>();
+            TestObserver<Integer> to1 = new TestObserver<>();
 
-            ObservableCache<Integer> cached = new ObservableCache<Integer>(source, 16);
+            ObservableCache<Integer> cached = new ObservableCache<>(source, 16);
 
             cached.observeOn(Schedulers.computation()).subscribe(to1);
 
@@ -146,7 +146,7 @@ public void async() {
             to1.assertComplete();
             assertEquals(10000, to1.values().size());
 
-            TestObserver<Integer> to2 = new TestObserver<Integer>();
+            TestObserver<Integer> to2 = new TestObserver<>();
             cached.observeOn(Schedulers.computation()).subscribe(to2);
 
             to2.awaitDone(2, TimeUnit.SECONDS);
@@ -161,18 +161,18 @@ public void asyncComeAndGo() {
         Observable<Long> source = Observable.interval(1, 1, TimeUnit.MILLISECONDS)
                 .take(1000)
                 .subscribeOn(Schedulers.io());
-        ObservableCache<Long> cached = new ObservableCache<Long>(source, 16);
+        ObservableCache<Long> cached = new ObservableCache<>(source, 16);
 
         Observable<Long> output = cached.observeOn(Schedulers.computation());
 
-        List<TestObserver<Long>> list = new ArrayList<TestObserver<Long>>(100);
+        List<TestObserver<Long>> list = new ArrayList<>(100);
         for (int i = 0; i < 100; i++) {
-            TestObserver<Long> to = new TestObserver<Long>();
+            TestObserver<Long> to = new TestObserver<>();
             list.add(to);
             output.skip(i * 10).take(10).subscribe(to);
         }
 
-        List<Long> expected = new ArrayList<Long>();
+        List<Long> expected = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
             expected.add((long)(i - 10));
         }
@@ -206,7 +206,7 @@ public void subscribe(Observer<? super Integer> t) {
             }
         });
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         firehose.cache().observeOn(Schedulers.computation()).takeLast(100).subscribe(to);
 
         to.awaitDone(3, TimeUnit.SECONDS);
@@ -222,14 +222,14 @@ public void valuesAndThenError() {
                 .concatWith(Observable.<Integer>error(new TestException()))
                 .cache();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         source.subscribe(to);
 
         to.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
         to.assertNotComplete();
         to.assertError(TestException.class);
 
-        TestObserver<Integer> to2 = new TestObserver<Integer>();
+        TestObserver<Integer> to2 = new TestObserver<>();
         source.subscribe(to2);
 
         to2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
@@ -296,7 +296,7 @@ public void subscribeEmitRace() {
 
             cache.test();
 
-            final TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+            final TestObserverEx<Integer> to = new TestObserverEx<>();
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
index e31a2299be..d28bd20e97 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
@@ -36,7 +36,7 @@ public void collectToListObservable() {
         .collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -85,7 +85,7 @@ public void accept(StringBuilder sb, Integer v) {
     @Test
     public void collectorFailureDoesNotResultInTwoErrorEmissionsObservable() {
         try {
-            final List<Throwable> list = new CopyOnWriteArrayList<Throwable>();
+            final List<Throwable> list = new CopyOnWriteArrayList<>();
             RxJavaPlugins.setErrorHandler(addToList(list));
             final RuntimeException e1 = new RuntimeException();
             final RuntimeException e2 = new RuntimeException();
@@ -146,14 +146,14 @@ public void accept(Object o, Integer t) {
     @Test
     public void collectIntoObservable() {
         Observable.just(1, 1, 1, 1, 2)
-        .collectInto(new HashSet<Integer>(), new BiConsumer<HashSet<Integer>, Integer>() {
+        .collectInto(new HashSet<>(), new BiConsumer<HashSet<Integer>, Integer>() {
             @Override
             public void accept(HashSet<Integer> s, Integer v) throws Exception {
                 s.add(v);
             }
         }).toObservable()
         .test()
-        .assertResult(new HashSet<Integer>(Arrays.asList(1, 2)));
+        .assertResult(new HashSet<>(Arrays.asList(1, 2)));
     }
 
     @Test
@@ -162,7 +162,7 @@ public void collectToList() {
         .collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -211,7 +211,7 @@ public void accept(StringBuilder sb, Integer v) {
     @Test
     public void collectorFailureDoesNotResultInTwoErrorEmissions() {
         try {
-            final List<Throwable> list = new CopyOnWriteArrayList<Throwable>();
+            final List<Throwable> list = new CopyOnWriteArrayList<>();
             RxJavaPlugins.setErrorHandler(addToList(list));
             final RuntimeException e1 = new RuntimeException();
             final RuntimeException e2 = new RuntimeException();
@@ -270,14 +270,14 @@ public void accept(Object o, Integer t) {
     @Test
     public void collectInto() {
         Observable.just(1, 1, 1, 1, 2)
-        .collectInto(new HashSet<Integer>(), new BiConsumer<HashSet<Integer>, Integer>() {
+        .collectInto(new HashSet<>(), new BiConsumer<HashSet<Integer>, Integer>() {
             @Override
             public void accept(HashSet<Integer> s, Integer v) throws Exception {
                 s.add(v);
             }
         })
         .test()
-        .assertResult(new HashSet<Integer>(Arrays.asList(1, 2)));
+        .assertResult(new HashSet<>(Arrays.asList(1, 2)));
     }
 
     @Test
@@ -285,7 +285,7 @@ public void dispose() {
         TestHelper.checkDisposed(Observable.range(1, 3).collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -297,7 +297,7 @@ public void accept(List<Integer> a, Integer b) throws Exception {
         TestHelper.checkDisposed(Observable.range(1, 3).collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -315,7 +315,7 @@ public SingleSource<List<Integer>> apply(Observable<Integer> o) throws Exception
                 return o.collect(new Supplier<List<Integer>>() {
                     @Override
                     public List<Integer> get() throws Exception {
-                        return new ArrayList<Integer>();
+                        return new ArrayList<>();
                     }
                 }, new BiConsumer<List<Integer>, Integer>() {
                     @Override
@@ -332,7 +332,7 @@ public ObservableSource<List<Integer>> apply(Observable<Integer> o) throws Excep
                 return o.collect(new Supplier<List<Integer>>() {
                     @Override
                     public List<Integer> get() throws Exception {
-                        return new ArrayList<Integer>();
+                        return new ArrayList<>();
                     }
                 }, new BiConsumer<List<Integer>, Integer>() {
                     @Override
@@ -352,7 +352,7 @@ public Object apply(Observable<Integer> o) throws Exception {
                 return o.collect(new Supplier<List<Integer>>() {
                     @Override
                     public List<Integer> get() throws Exception {
-                        return new ArrayList<Integer>();
+                        return new ArrayList<>();
                     }
                 }, new BiConsumer<List<Integer>, Integer>() {
                     @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
index 4dca384928..c5f93d4222 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
@@ -436,8 +436,8 @@ public List<Object> apply(Object[] args) {
         };
         for (int i = 1; i <= n; i++) {
             System.out.println("test1ToNSources: " + i + " sources");
-            List<Observable<Integer>> sources = new ArrayList<Observable<Integer>>();
-            List<Object> values = new ArrayList<Object>();
+            List<Observable<Integer>> sources = new ArrayList<>();
+            List<Object> values = new ArrayList<>();
             for (int j = 0; j < i; j++) {
                 sources.add(Observable.just(j));
                 values.add(j);
@@ -467,8 +467,8 @@ public List<Object> apply(Object[] args) {
         };
         for (int i = 1; i <= n; i++) {
             System.out.println("test1ToNSourcesScheduled: " + i + " sources");
-            List<Observable<Integer>> sources = new ArrayList<Observable<Integer>>();
-            List<Object> values = new ArrayList<Object>();
+            List<Observable<Integer>> sources = new ArrayList<>();
+            List<Object> values = new ArrayList<>();
             for (int j = 0; j < i; j++) {
                 sources.add(Observable.just(j).subscribeOn(Schedulers.io()));
                 values.add(j);
@@ -753,7 +753,7 @@ public void accept(Notification<Long> n) {
                     }
                 }).take(SIZE);
 
-        TestObserver<Long> to = new TestObserver<Long>();
+        TestObserver<Long> to = new TestObserver<>();
 
         Observable.combineLatest(timer, Observable.<Integer> never(), new BiFunction<Long, Integer, Long>() {
             @Override
@@ -873,7 +873,7 @@ public Object apply(Object a, Object b) throws Exception {
 
     @Test
     public void cancelWhileSubscribing() {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
 
         Observable.combineLatest(
                 Observable.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
index 4e9a2b0d1f..fe1cafe56b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
@@ -197,7 +197,7 @@ public Observable<Integer> apply(Integer t) {
 
     @Before
     public void before() {
-        to = new TestObserver<Object>();
+        to = new TestObserver<>();
     }
 
     @Test
@@ -723,7 +723,7 @@ public void run() {
 
     @Test
     public void mapperCancels() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1).hide()
         .concatMapEager(new Function<Integer, ObservableSource<Integer>>() {
@@ -837,7 +837,7 @@ public ObservableSource<Integer> apply(Integer i) throws Exception {
     public void maxConcurrencyOf2() {
         List<Integer>[] list = new ArrayList[100];
         for (int i = 0; i < 100; i++) {
-            List<Integer> lst = new ArrayList<Integer>();
+            List<Integer> lst = new ArrayList<>();
             list[i] = lst;
             for (int k = 1; k <= 10; k++) {
                 lst.add((i) * 10 + k);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
index fa72be7ac6..a82553b9a4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
@@ -367,7 +367,7 @@ public void concatMapRangeAsyncLoopIssue2876() {
             if (i % 1000 == 0) {
                 System.out.println("concatMapRangeAsyncLoop > " + i);
             }
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to = new TestObserverEx<>();
             Observable.range(0, 1000)
             .concatMap(new Function<Integer, Observable<Integer>>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
index 354c2afc27..c5b00fdf7c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
@@ -63,7 +63,7 @@ public void concatWithList() {
 
         final Observable<String> odds = Observable.fromArray(o);
         final Observable<String> even = Observable.fromArray(e);
-        final List<Observable<String>> list = new ArrayList<Observable<String>>();
+        final List<Observable<String>> list = new ArrayList<>();
         list.add(odds);
         list.add(even);
         Observable<String> concat = Observable.concat(Observable.fromIterable(list));
@@ -108,8 +108,8 @@ public void subscribe(Observer<? super Observable<String>> observer) {
     public void simpleAsyncConcat() {
         Observer<String> observer = TestHelper.mockObserver();
 
-        TestObservable<String> o1 = new TestObservable<String>("one", "two", "three");
-        TestObservable<String> o2 = new TestObservable<String>("four", "five", "six");
+        TestObservable<String> o1 = new TestObservable<>("one", "two", "three");
+        TestObservable<String> o2 = new TestObservable<>("four", "five", "six");
 
         Observable.concat(Observable.unsafeCreate(o1), Observable.unsafeCreate(o2)).subscribe(observer);
 
@@ -148,12 +148,12 @@ public void nestedAsyncConcatLoop() throws Throwable {
     public void nestedAsyncConcat() throws InterruptedException {
         Observer<String> observer = TestHelper.mockObserver();
 
-        final TestObservable<String> o1 = new TestObservable<String>("one", "two", "three");
-        final TestObservable<String> o2 = new TestObservable<String>("four", "five", "six");
-        final TestObservable<String> o3 = new TestObservable<String>("seven", "eight", "nine");
+        final TestObservable<String> o1 = new TestObservable<>("one", "two", "three");
+        final TestObservable<String> o2 = new TestObservable<>("four", "five", "six");
+        final TestObservable<String> o3 = new TestObservable<>("seven", "eight", "nine");
         final CountDownLatch allowThird = new CountDownLatch(1);
 
-        final AtomicReference<Thread> parent = new AtomicReference<Thread>();
+        final AtomicReference<Thread> parent = new AtomicReference<>();
         final CountDownLatch parentHasStarted = new CountDownLatch(1);
         final CountDownLatch parentHasFinished = new CountDownLatch(1);
 
@@ -272,7 +272,7 @@ public void blockedObservableOfObservables() {
         final CountDownLatch callOnce = new CountDownLatch(1);
         final CountDownLatch okToContinue = new CountDownLatch(1);
         @SuppressWarnings("unchecked")
-        TestObservable<Observable<String>> observableOfObservables = new TestObservable<Observable<String>>(callOnce, okToContinue, odds, even);
+        TestObservable<Observable<String>> observableOfObservables = new TestObservable<>(callOnce, okToContinue, odds, even);
         Observable<String> concatF = Observable.concat(Observable.unsafeCreate(observableOfObservables));
         concatF.subscribe(observer);
         try {
@@ -304,14 +304,14 @@ public void blockedObservableOfObservables() {
 
     @Test
     public void concatConcurrentWithInfinity() {
-        final TestObservable<String> w1 = new TestObservable<String>("one", "two", "three");
+        final TestObservable<String> w1 = new TestObservable<>("one", "two", "three");
         //This Observable will send "hello" MAX_VALUE time.
-        final TestObservable<String> w2 = new TestObservable<String>("hello", Integer.MAX_VALUE);
+        final TestObservable<String> w2 = new TestObservable<>("hello", Integer.MAX_VALUE);
 
         Observer<String> observer = TestHelper.mockObserver();
 
         @SuppressWarnings("unchecked")
-        TestObservable<Observable<String>> observableOfObservables = new TestObservable<Observable<String>>(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2));
+        TestObservable<Observable<String>> observableOfObservables = new TestObservable<>(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2));
         Observable<String> concatF = Observable.concat(Observable.unsafeCreate(observableOfObservables));
 
         concatF.take(50).subscribe(observer);
@@ -339,8 +339,8 @@ public void concatNonBlockingObservables() {
         final CountDownLatch okToContinueW1 = new CountDownLatch(1);
         final CountDownLatch okToContinueW2 = new CountDownLatch(1);
 
-        final TestObservable<String> w1 = new TestObservable<String>(null, okToContinueW1, "one", "two", "three");
-        final TestObservable<String> w2 = new TestObservable<String>(null, okToContinueW2, "four", "five", "six");
+        final TestObservable<String> w1 = new TestObservable<>(null, okToContinueW1, "one", "two", "three");
+        final TestObservable<String> w2 = new TestObservable<>(null, okToContinueW2, "four", "five", "six");
 
         Observer<String> observer = TestHelper.mockObserver();
 
@@ -390,11 +390,11 @@ public void subscribe(Observer<? super Observable<String>> observer) {
     public void concatUnsubscribe() {
         final CountDownLatch callOnce = new CountDownLatch(1);
         final CountDownLatch okToContinue = new CountDownLatch(1);
-        final TestObservable<String> w1 = new TestObservable<String>("one", "two", "three");
-        final TestObservable<String> w2 = new TestObservable<String>(callOnce, okToContinue, "four", "five", "six");
+        final TestObservable<String> w1 = new TestObservable<>("one", "two", "three");
+        final TestObservable<String> w2 = new TestObservable<>(callOnce, okToContinue, "four", "five", "six");
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
 
         final Observable<String> concat = Observable.concat(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2));
 
@@ -432,14 +432,14 @@ public void concatUnsubscribe() {
     public void concatUnsubscribeConcurrent() {
         final CountDownLatch callOnce = new CountDownLatch(1);
         final CountDownLatch okToContinue = new CountDownLatch(1);
-        final TestObservable<String> w1 = new TestObservable<String>("one", "two", "three");
-        final TestObservable<String> w2 = new TestObservable<String>(callOnce, okToContinue, "four", "five", "six");
+        final TestObservable<String> w1 = new TestObservable<>("one", "two", "three");
+        final TestObservable<String> w2 = new TestObservable<>(callOnce, okToContinue, "four", "five", "six");
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
 
         @SuppressWarnings("unchecked")
-        TestObservable<Observable<String>> observableOfObservables = new TestObservable<Observable<String>>(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2));
+        TestObservable<Observable<String>> observableOfObservables = new TestObservable<>(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2));
         Observable<String> concatF = Observable.concat(Observable.unsafeCreate(observableOfObservables));
 
         concatF.subscribe(to);
@@ -617,7 +617,7 @@ public Observable<Integer> apply(Integer v) {
 
         result.subscribe(o);
 
-        List<Integer> list = new ArrayList<Integer>(n);
+        List<Integer> list = new ArrayList<>(n);
         for (int i = 0; i < n; i++) {
             list.add(i);
         }
@@ -642,7 +642,7 @@ public Observable<Integer> apply(Integer v) {
 
         result.subscribe(o);
 
-        List<Integer> list = new ArrayList<Integer>(n);
+        List<Integer> list = new ArrayList<>(n);
         for (int i = 0; i < n / 2; i++) {
             list.add(i);
         }
@@ -674,7 +674,7 @@ public void subscribe(Observer<? super String> observer) {
 
         });
 
-        TestObserverEx<String> to = new TestObserverEx<String>();
+        TestObserverEx<String> to = new TestObserverEx<>();
         Observable.concat(o, o).subscribe(to);
         to.awaitDone(500, TimeUnit.MILLISECONDS);
         to.assertTerminated();
@@ -745,7 +745,7 @@ public void concatMapRangeAsyncLoopIssue2876() {
             if (i % 1000 == 0) {
                 System.out.println("concatMapRangeAsyncLoop > " + i);
             }
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to = new TestObserverEx<>();
 
             Observable.range(0, 1000)
             .concatMap(new Function<Integer, Observable<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
index 4ca6d1bb7b..fc2a8b8531 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
@@ -28,7 +28,7 @@ public class ObservableConcatWithCompletableTest extends RxJavaTest {
 
     @Test
     public void normal() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Completable.fromAction(new Action() {
@@ -44,7 +44,7 @@ public void run() throws Exception {
 
     @Test
     public void mainError() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.<Integer>error(new TestException())
         .concatWith(Completable.fromAction(new Action() {
@@ -60,7 +60,7 @@ public void run() throws Exception {
 
     @Test
     public void otherError() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Completable.error(new TestException()))
@@ -71,7 +71,7 @@ public void otherError() {
 
     @Test
     public void takeMain() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Completable.fromAction(new Action() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
index cd35a91ad1..16ba059b8b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
@@ -28,7 +28,7 @@ public class ObservableConcatWithMaybeTest extends RxJavaTest {
 
     @Test
     public void normalEmpty() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Maybe.<Integer>fromAction(new Action() {
@@ -44,7 +44,7 @@ public void run() throws Exception {
 
     @Test
     public void normalNonEmpty() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Maybe.just(100))
@@ -55,7 +55,7 @@ public void normalNonEmpty() {
 
     @Test
     public void mainError() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.<Integer>error(new TestException())
         .concatWith(Maybe.<Integer>fromAction(new Action() {
@@ -71,7 +71,7 @@ public void run() throws Exception {
 
     @Test
     public void otherError() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Maybe.<Integer>error(new TestException()))
@@ -82,7 +82,7 @@ public void otherError() {
 
     @Test
     public void takeMain() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Maybe.<Integer>fromAction(new Action() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
index 45c0b6f269..2d05b58c2d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
@@ -27,7 +27,7 @@ public class ObservableConcatWithSingleTest extends RxJavaTest {
 
     @Test
     public void normal() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Single.just(100))
@@ -38,7 +38,7 @@ public void normal() {
 
     @Test
     public void mainError() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.<Integer>error(new TestException())
         .concatWith(Single.just(100))
@@ -49,7 +49,7 @@ public void mainError() {
 
     @Test
     public void otherError() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Single.<Integer>error(new TestException()))
@@ -60,7 +60,7 @@ public void otherError() {
 
     @Test
     public void takeMain() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5)
         .concatWith(Single.just(100))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
index af60b93018..d59431a677 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
@@ -288,7 +288,7 @@ public Observable<Integer> apply(Integer t1) {
     @Test
     public void debounceWithTimeBackpressure() throws InterruptedException {
         TestScheduler scheduler = new TestScheduler();
-        TestObserverEx<Integer> observer = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> observer = new TestObserverEx<>();
 
         Observable.merge(
                 Observable.just(1),
@@ -317,7 +317,7 @@ public void dispose() {
 
         TestHelper.checkDisposed(PublishSubject.create().debounce(Functions.justFunction(Observable.never())));
 
-        Disposable d = new ObservableDebounceTimed.DebounceEmitter<Integer>(1, 1, null);
+        Disposable d = new ObservableDebounceTimed.DebounceEmitter<>(1, 1, null);
         assertFalse(d.isDisposed());
 
         d.dispose();
@@ -395,7 +395,7 @@ public Observable<Object> apply(Observable<Object> o) throws Exception {
 
     @Test
     public void disposeInOnNext() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         BehaviorSubject.createDefault(1)
         .debounce(new Function<Integer, ObservableSource<Object>>() {
@@ -413,7 +413,7 @@ public ObservableSource<Object> apply(Integer o) throws Exception {
 
     @Test
     public void disposedInOnComplete() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         new Observable<Integer>() {
             @Override
@@ -430,7 +430,7 @@ protected void subscribeActual(Observer<? super Integer> observer) {
 
     @Test
     public void emitLate() {
-        final AtomicReference<Observer<? super Integer>> ref = new AtomicReference<Observer<? super Integer>>();
+        final AtomicReference<Observer<? super Integer>> ref = new AtomicReference<>();
 
         TestObserver<Integer> to = Observable.range(1, 2)
         .debounce(new Function<Integer, ObservableSource<Integer>>() {
@@ -469,7 +469,7 @@ public Publisher<Object> apply(Flowable<Object> f)
 
     @Test
     public void timedDisposedIgnoredBySource() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         new Observable<Integer>() {
             @Override
@@ -487,13 +487,13 @@ protected void subscribeActual(
 
     @Test
     public void timedLateEmit() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
-        DebounceTimedObserver<Integer> sub = new DebounceTimedObserver<Integer>(
+        TestObserver<Integer> to = new TestObserver<>();
+        DebounceTimedObserver<Integer> sub = new DebounceTimedObserver<>(
                 to, 1, TimeUnit.SECONDS, new TestScheduler().createWorker());
 
         sub.onSubscribe(Disposable.empty());
 
-        DebounceEmitter<Integer> de = new DebounceEmitter<Integer>(1, 50, sub);
+        DebounceEmitter<Integer> de = new DebounceEmitter<>(1, 50, sub);
         de.run();
         de.run();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
index 604321a714..93b09456dd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
@@ -32,7 +32,7 @@ public class ObservableDelaySubscriptionOtherTest extends RxJavaTest {
     public void noPrematureSubscription() {
         PublishSubject<Object> other = PublishSubject.create();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -65,7 +65,7 @@ public void accept(Disposable d) {
     public void noMultipleSubscriptions() {
         PublishSubject<Object> other = PublishSubject.create();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -99,7 +99,7 @@ public void accept(Disposable d) {
     public void completeTriggersSubscription() {
         PublishSubject<Object> other = PublishSubject.create();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -132,7 +132,7 @@ public void accept(Disposable d) {
     public void noPrematureSubscriptionToError() {
         PublishSubject<Object> other = PublishSubject.create();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
@@ -165,7 +165,7 @@ public void accept(Disposable d) {
     public void noSubscriptionIfOtherErrors() {
         PublishSubject<Object> other = PublishSubject.create();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         final AtomicInteger subscribed = new AtomicInteger();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
index cc93594bb8..82b60d4701 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
@@ -219,7 +219,7 @@ public void delaySubscriptionDisposeBeforeTime() {
         Observable<Integer> result = Observable.just(1, 2, 3).delaySubscription(100, TimeUnit.MILLISECONDS, scheduler);
 
         Observer<Object> o = TestHelper.mockObserver();
-        TestObserver<Object> to = new TestObserver<Object>(o);
+        TestObserver<Object> to = new TestObserver<>(o);
 
         result.subscribe(to);
         to.dispose();
@@ -233,7 +233,7 @@ public void delaySubscriptionDisposeBeforeTime() {
     @Test
     public void delayWithObservableNormal1() {
         PublishSubject<Integer> source = PublishSubject.create();
-        final List<PublishSubject<Integer>> delays = new ArrayList<PublishSubject<Integer>>();
+        final List<PublishSubject<Integer>> delays = new ArrayList<>();
         final int n = 10;
         for (int i = 0; i < n; i++) {
             PublishSubject<Integer> delay = PublishSubject.create();
@@ -584,7 +584,7 @@ public void delayWithObservableReorder() {
         int n = 3;
 
         PublishSubject<Integer> source = PublishSubject.create();
-        final List<PublishSubject<Integer>> subjects = new ArrayList<PublishSubject<Integer>>();
+        final List<PublishSubject<Integer>> subjects = new ArrayList<>();
         for (int i = 0; i < n; i++) {
             subjects.add(PublishSubject.<Integer> create());
         }
@@ -632,7 +632,7 @@ public void accept(Notification<Integer> t1) {
             }
 
         });
-        TestObserver<Integer> observer = new TestObserver<Integer>();
+        TestObserver<Integer> observer = new TestObserver<>();
         delayed.subscribe(observer);
         // all will be delivered after 500ms since range does not delay between them
         scheduler.advanceTimeBy(500L, TimeUnit.MILLISECONDS);
@@ -641,7 +641,7 @@ public void accept(Notification<Integer> t1) {
 
     @Test
     public void backpressureWithTimedDelay() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(1, Flowable.bufferSize() * 2)
                 .delay(100, TimeUnit.MILLISECONDS)
                 .observeOn(Schedulers.computation())
@@ -669,7 +669,7 @@ public Integer apply(Integer t) {
 
     @Test
     public void backpressureWithSubscriptionTimedDelay() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(1, Flowable.bufferSize() * 2)
                 .delaySubscription(100, TimeUnit.MILLISECONDS)
                 .delay(100, TimeUnit.MILLISECONDS)
@@ -698,7 +698,7 @@ public Integer apply(Integer t) {
 
     @Test
     public void backpressureWithSelectorDelay() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(1, Flowable.bufferSize() * 2)
                 .delay(new Function<Integer, Observable<Long>>() {
 
@@ -733,7 +733,7 @@ public Integer apply(Integer t) {
 
     @Test
     public void backpressureWithSelectorDelayAndSubscriptionDelay() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(1, Flowable.bufferSize() * 2)
                 .delay(Observable.timer(500, TimeUnit.MILLISECONDS)
                 , new Function<Integer, Observable<Long>>() {
@@ -773,7 +773,7 @@ public void errorRunsBeforeOnNext() {
 
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         ps.delay(1, TimeUnit.SECONDS, test).subscribe(to);
 
@@ -796,7 +796,7 @@ public void delaySupplierSimple() {
 
         Observable<Integer> source = Observable.range(1, 5);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         source.delaySubscription(ps).subscribe(to);
 
@@ -817,7 +817,7 @@ public void delaySupplierCompletes() {
 
         Observable<Integer> source = Observable.range(1, 5);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         source.delaySubscription(ps).subscribe(to);
 
@@ -839,7 +839,7 @@ public void delaySupplierErrors() {
 
         Observable<Integer> source = Observable.range(1, 5);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         source.delaySubscription(ps).subscribe(to);
 
@@ -866,7 +866,7 @@ public void delayWithTimeDelayError() throws Exception {
     @Test
     public void onErrorCalledOnScheduler() throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Thread> thread = new AtomicReference<Thread>();
+        final AtomicReference<Thread> thread = new AtomicReference<>();
 
         Observable.<String>error(new Exception())
                 .delay(0, TimeUnit.MILLISECONDS, Schedulers.newThread())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
index 5d3e2b6be1..8c7b6017ab 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
@@ -140,7 +140,7 @@ public void completePassThru() {
 
         Observer<Integer> observer = TestHelper.mockObserver();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(observer);
+        TestObserverEx<Integer> to = new TestObserverEx<>(observer);
         dematerialize.subscribe(to);
 
         System.out.println(to.errors());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java
index ef67be319e..95cbf96f76 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java
@@ -33,9 +33,9 @@ public class ObservableDetachTest extends RxJavaTest {
     public void just() throws Exception {
         o = new Object();
 
-        WeakReference<Object> wr = new WeakReference<Object>(o);
+        WeakReference<Object> wr = new WeakReference<>(o);
 
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         Observable.just(o).count().toObservable().onTerminateDetach().subscribe(to);
 
@@ -54,7 +54,7 @@ public void just() throws Exception {
 
     @Test
     public void error() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         Observable.error(new TestException()).onTerminateDetach().subscribe(to);
 
@@ -65,7 +65,7 @@ public void error() {
 
     @Test
     public void empty() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         Observable.empty().onTerminateDetach().subscribe(to);
 
@@ -76,7 +76,7 @@ public void empty() {
 
     @Test
     public void range() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         Observable.range(1, 1000).onTerminateDetach().subscribe(to);
 
@@ -89,7 +89,7 @@ public void range() {
     public void justUnsubscribed() throws Exception {
         o = new Object();
 
-        WeakReference<Object> wr = new WeakReference<Object>(o);
+        WeakReference<Object> wr = new WeakReference<>(o);
 
         TestObserver<Long> to = Observable.just(o).count().toObservable().onTerminateDetach().test();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
index 888a39cb89..1f2614f284 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
@@ -115,7 +115,7 @@ public void error() {
 
     @Test
     public void fusedSync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Observable.just(1, 1, 2, 1, 3, 2, 4, 5, 4)
         .distinct()
@@ -127,7 +127,7 @@ public void fusedSync() {
 
     @Test
     public void fusedAsync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         UnicastSubject<Integer> us = UnicastSubject.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
index 13122988cf..da1d67e819 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
@@ -148,7 +148,7 @@ public boolean test(String a, String b) {
 
     @Test
     public void fused() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Observable.just(1, 2, 2, 3, 3, 4, 5)
         .distinctUntilChanged(new BiPredicate<Integer, Integer>() {
@@ -167,7 +167,7 @@ public boolean test(Integer a, Integer b) throws Exception {
 
     @Test
     public void fusedAsync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         UnicastSubject<Integer> up = UnicastSubject.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
index f5f2e8feb6..5b6cd18987 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
@@ -31,7 +31,7 @@
 
 public class ObservableDoAfterNextTest extends RxJavaTest {
 
-    final List<Integer> values = new ArrayList<Integer>();
+    final List<Integer> values = new ArrayList<>();
 
     final Consumer<Integer> afterNext = new Consumer<Integer>() {
         @Override
@@ -101,7 +101,7 @@ public void empty() {
 
     @Test
     public void syncFused() {
-        TestObserverEx<Integer> to0 = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+        TestObserverEx<Integer> to0 = new TestObserverEx<>(QueueFuseable.SYNC);
 
         Observable.range(1, 5)
         .doAfterNext(afterNext)
@@ -115,7 +115,7 @@ public void syncFused() {
 
     @Test
     public void asyncFusedRejected() {
-        TestObserverEx<Integer> to0 = new TestObserverEx<Integer>(QueueFuseable.ASYNC);
+        TestObserverEx<Integer> to0 = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         Observable.range(1, 5)
         .doAfterNext(afterNext)
@@ -129,7 +129,7 @@ public void asyncFusedRejected() {
 
     @Test
     public void asyncFused() {
-        TestObserverEx<Integer> to0 = new TestObserverEx<Integer>(QueueFuseable.ASYNC);
+        TestObserverEx<Integer> to0 = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         UnicastSubject<Integer> up = UnicastSubject.create();
 
@@ -196,7 +196,7 @@ public void emptyConditional() {
 
     @Test
     public void syncFusedConditional() {
-        TestObserverEx<Integer> to0 = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+        TestObserverEx<Integer> to0 = new TestObserverEx<>(QueueFuseable.SYNC);
 
         Observable.range(1, 5)
         .doAfterNext(afterNext)
@@ -211,7 +211,7 @@ public void syncFusedConditional() {
 
     @Test
     public void asyncFusedRejectedConditional() {
-        TestObserverEx<Integer> to0 = new TestObserverEx<Integer>(QueueFuseable.ASYNC);
+        TestObserverEx<Integer> to0 = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         Observable.range(1, 5)
         .doAfterNext(afterNext)
@@ -226,7 +226,7 @@ public void asyncFusedRejectedConditional() {
 
     @Test
     public void asyncFusedConditional() {
-        TestObserverEx<Integer> to0 = new TestObserverEx<Integer>(QueueFuseable.ASYNC);
+        TestObserverEx<Integer> to0 = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         UnicastSubject<Integer> up = UnicastSubject.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
index 9fd860816a..a0eeccb405 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
@@ -99,7 +99,7 @@ public Observable<Object> apply(Observable<Object> f) throws Exception {
 
     @Test
     public void syncFused() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC);
 
         Observable.range(1, 5)
         .doFinally(this)
@@ -113,7 +113,7 @@ public void syncFused() {
 
     @Test
     public void syncFusedBoundary() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC | QueueFuseable.BOUNDARY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC | QueueFuseable.BOUNDARY);
 
         Observable.range(1, 5)
         .doFinally(this)
@@ -127,7 +127,7 @@ public void syncFusedBoundary() {
 
     @Test
     public void asyncFused() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ASYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         UnicastSubject<Integer> up = UnicastSubject.create();
         TestHelper.emit(up, 1, 2, 3, 4, 5);
@@ -144,7 +144,7 @@ public void asyncFused() {
 
     @Test
     public void asyncFusedBoundary() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ASYNC | QueueFuseable.BOUNDARY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC | QueueFuseable.BOUNDARY);
 
         UnicastSubject<Integer> up = UnicastSubject.create();
         TestHelper.emit(up, 1, 2, 3, 4, 5);
@@ -206,7 +206,7 @@ public void normalTakeConditional() {
 
     @Test
     public void syncFusedConditional() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC);
 
         Observable.range(1, 5)
         .doFinally(this)
@@ -221,7 +221,7 @@ public void syncFusedConditional() {
 
     @Test
     public void nonFused() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC);
 
         Observable.range(1, 5).hide()
         .doFinally(this)
@@ -235,7 +235,7 @@ public void nonFused() {
 
     @Test
     public void nonFusedConditional() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC);
 
         Observable.range(1, 5).hide()
         .doFinally(this)
@@ -250,7 +250,7 @@ public void nonFusedConditional() {
 
     @Test
     public void syncFusedBoundaryConditional() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC | QueueFuseable.BOUNDARY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC | QueueFuseable.BOUNDARY);
 
         Observable.range(1, 5)
         .doFinally(this)
@@ -265,7 +265,7 @@ public void syncFusedBoundaryConditional() {
 
     @Test
     public void asyncFusedConditional() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ASYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         UnicastSubject<Integer> up = UnicastSubject.create();
         TestHelper.emit(up, 1, 2, 3, 4, 5);
@@ -283,7 +283,7 @@ public void asyncFusedConditional() {
 
     @Test
     public void asyncFusedBoundaryConditional() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ASYNC | QueueFuseable.BOUNDARY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC | QueueFuseable.BOUNDARY);
 
         UnicastSubject<Integer> up = UnicastSubject.create();
         TestHelper.emit(up, 1, 2, 3, 4, 5);
@@ -446,7 +446,7 @@ public void onComplete() {
 
     @Test
     public void eventOrdering() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
 
         Observable.error(new TestException())
         .doOnDispose(new Action() {
@@ -486,7 +486,7 @@ public void run() throws Exception {
 
     @Test
     public void eventOrdering2() {
-        final List<String> list = new ArrayList<String>();
+        final List<String> list = new ArrayList<>();
 
         Observable.just(1)
         .doOnDispose(new Action() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
index 30f0cb2d6f..0482d23906 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
@@ -202,7 +202,7 @@ public void accept(List<Boolean> booleans) {
 
     @Test
     public void onErrorThrows() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
 
         Observable.error(new TestException())
         .doOnError(new Consumer<Throwable>() {
@@ -472,7 +472,7 @@ public void accept(Throwable e) throws Exception {
     @Test
     @Ignore("Fusion not supported yet") // TODO decide/implement fusion
     public void fused() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         final int[] call = { 0, 0 };
 
@@ -502,7 +502,7 @@ public void run() throws Exception {
     @Test
     @Ignore("Fusion not supported yet") // TODO decide/implement fusion
     public void fusedOnErrorCrash() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         final int[] call = { 0 };
 
@@ -531,7 +531,7 @@ public void run() throws Exception {
     @Test
     @Ignore("Fusion not supported yet") // TODO decide/implement fusion
     public void fusedConditional() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         final int[] call = { 0, 0 };
 
@@ -562,7 +562,7 @@ public void run() throws Exception {
     @Test
     @Ignore("Fusion not supported yet") // TODO decide/implement fusion
     public void fusedOnErrorCrashConditional() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         final int[] call = { 0 };
 
@@ -592,7 +592,7 @@ public void run() throws Exception {
     @Test
     @Ignore("Fusion not supported yet") // TODO decide/implement fusion
     public void fusedAsync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         final int[] call = { 0, 0 };
 
@@ -626,7 +626,7 @@ public void run() throws Exception {
     @Test
     @Ignore("Fusion not supported yet") // TODO decide/implement fusion
     public void fusedAsyncConditional() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         final int[] call = { 0, 0 };
 
@@ -661,7 +661,7 @@ public void run() throws Exception {
     @Test
     @Ignore("Fusion not supported yet") // TODO decide/implement fusion
     public void fusedAsyncConditional2() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         final int[] call = { 0, 0 };
 
@@ -695,7 +695,7 @@ public void run() throws Exception {
 
     @Test
     public void dispose() {
-        TestHelper.checkDisposed(Observable.just(1).doOnEach(new TestObserver<Integer>()));
+        TestHelper.checkDisposed(Observable.just(1).doOnEach(new TestObserver<>()));
     }
 
     @Test
@@ -703,7 +703,7 @@ public void doubleOnSubscribe() {
         TestHelper.checkDoubleOnSubscribeObservable(new Function<Observable<Object>, ObservableSource<Object>>() {
             @Override
             public ObservableSource<Object> apply(Observable<Object> o) throws Exception {
-                return o.doOnEach(new TestObserver<Object>());
+                return o.doOnEach(new TestObserver<>());
             }
         });
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
index 26cd2b340b..5a16beda68 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
@@ -69,7 +69,7 @@ public void doOnUnSubscribeWorksWithRefCount() throws Exception {
         final AtomicInteger onSubscribed = new AtomicInteger();
         final AtomicInteger countBefore = new AtomicInteger();
         final AtomicInteger countAfter = new AtomicInteger();
-        final AtomicReference<Observer<? super Integer>> sref = new AtomicReference<Observer<? super Integer>>();
+        final AtomicReference<Observer<? super Integer>> sref = new AtomicReference<>();
         Observable<Integer> o = Observable.unsafeCreate(new ObservableSource<Integer>() {
 
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
index c90105fb04..a95f372d18 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
@@ -68,11 +68,11 @@ public void run() {
                     }
                 });
 
-        List<Disposable> subscriptions = new ArrayList<Disposable>();
-        List<TestObserver<Long>> subscribers = new ArrayList<TestObserver<Long>>();
+        List<Disposable> subscriptions = new ArrayList<>();
+        List<TestObserver<Long>> subscribers = new ArrayList<>();
 
         for (int i = 0; i < subCount; ++i) {
-            TestObserver<Long> observer = new TestObserver<Long>();
+            TestObserver<Long> observer = new TestObserver<>();
             subscriptions.add(observer);
             longs.subscribe(observer);
             subscribers.add(observer);
@@ -131,11 +131,11 @@ public void run() {
                 .publish()
                 .refCount();
 
-        List<Disposable> subscriptions = new ArrayList<Disposable>();
-        List<TestObserver<Long>> subscribers = new ArrayList<TestObserver<Long>>();
+        List<Disposable> subscriptions = new ArrayList<>();
+        List<TestObserver<Long>> subscribers = new ArrayList<>();
 
         for (int i = 0; i < subCount; ++i) {
-            TestObserver<Long> observer = new TestObserver<Long>();
+            TestObserver<Long> observer = new TestObserver<>();
             longs.subscribe(observer);
             subscriptions.add(observer);
             subscribers.add(observer);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
index 22cd6c060a..6bbb838da5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
@@ -68,7 +68,7 @@ public ObservableSource<Object> apply(Observable<Object> o) throws Exception {
 
     @Test
     public void fusedSync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Observable.range(1, 5)
         .filter(new Predicate<Integer>() {
@@ -85,7 +85,7 @@ public boolean test(Integer v) throws Exception {
 
     @Test
     public void fusedAsync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         UnicastSubject<Integer> us = UnicastSubject.create();
 
@@ -106,7 +106,7 @@ public boolean test(Integer v) throws Exception {
 
     @Test
     public void fusedReject() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY | QueueFuseable.BOUNDARY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY | QueueFuseable.BOUNDARY);
 
         Observable.range(1, 5)
         .filter(new Predicate<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
index f5bf13b231..95baba1448 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
@@ -169,7 +169,7 @@ public CompletableSource apply(Integer v) throws Exception {
 
     @Test
     public void fusedObservable() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Observable.range(1, 10)
         .flatMapCompletable(new Function<Integer, CompletableSource>() {
@@ -334,7 +334,7 @@ public CompletableSource apply(Integer v) throws Exception {
 
     @Test
     public void fused() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Observable.range(1, 10)
         .flatMapCompletable(new Function<Integer, CompletableSource>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
index e1133ee311..a1540dcfca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
@@ -429,7 +429,7 @@ public MaybeSource<Integer> apply(PublishSubject<Integer> v) throws Exception {
 
     @Test
     public void disposeInner() {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
 
         Observable.just(1).flatMapMaybe(new Function<Integer, MaybeSource<Object>>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
index b8c7b351be..b990bd407c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
@@ -344,7 +344,7 @@ public SingleSource<Integer> apply(PublishSubject<Integer> v) throws Exception {
 
     @Test
     public void disposeInner() {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
 
         Observable.just(1).flatMapSingle(new Function<Integer, SingleSource<Object>>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
index 38defaf049..00f2523a33 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
@@ -338,13 +338,13 @@ public Observable<Integer> apply(Integer t1) {
             }
         }, m);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         source.subscribe(to);
 
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
-        Set<Integer> expected = new HashSet<Integer>(Arrays.asList(
+        Set<Integer> expected = new HashSet<>(Arrays.asList(
                 10, 11, 20, 21, 30, 31, 40, 41, 50, 51, 60, 61, 70, 71, 80, 81, 90, 91, 100, 101
         ));
         Assert.assertEquals(expected.size(), to.values().size());
@@ -369,13 +369,13 @@ public Integer apply(Integer t1, Integer t2) {
             }
         }, m);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         source.subscribe(to);
 
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
-        Set<Integer> expected = new HashSet<Integer>(Arrays.asList(
+        Set<Integer> expected = new HashSet<>(Arrays.asList(
                 1010, 1011, 2020, 2021, 3030, 3031, 4040, 4041, 5050, 5051,
                 6060, 6061, 7070, 7071, 8080, 8081, 9090, 9091, 10100, 10101
         ));
@@ -415,7 +415,7 @@ public void flatMapTransformsMaxConcurrentNormal() {
         Observable<Integer> source = Observable.fromIterable(Arrays.asList(10, 20, 30));
 
         Observer<Object> o = TestHelper.mockObserver();
-        TestObserverEx<Object> to = new TestObserverEx<Object>(o);
+        TestObserverEx<Object> to = new TestObserverEx<>(o);
 
         Function<Throwable, Observable<Integer>> just = just(onError);
         source.flatMap(just(onNext), just, just0(onComplete), m).subscribe(to);
@@ -440,7 +440,7 @@ public void flatMapRangeMixedAsyncLoop() {
             if (i % 10 == 0) {
                 System.out.println("flatMapRangeAsyncLoop > " + i);
             }
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to = new TestObserverEx<>();
             Observable.range(0, 1000)
             .flatMap(new Function<Integer, Observable<Integer>>() {
                 final Random rnd = new Random();
@@ -464,7 +464,7 @@ public Observable<Integer> apply(Integer t) {
             to.assertNoErrors();
             List<Integer> list = to.values();
             if (list.size() < 1000) {
-                Set<Integer> set = new HashSet<Integer>(list);
+                Set<Integer> set = new HashSet<>(list);
                 for (int j = 0; j < 1000; j++) {
                     if (!set.contains(j)) {
                         System.out.println(j + " missing");
@@ -478,7 +478,7 @@ public Observable<Integer> apply(Integer t) {
     @Test
     public void flatMapIntPassthruAsync() {
         for (int i = 0; i < 1000; i++) {
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
             Observable.range(1, 1000).flatMap(new Function<Integer, Observable<Integer>>() {
                 @Override
@@ -497,7 +497,7 @@ public Observable<Integer> apply(Integer t) {
     @Test
     public void flatMapTwoNestedSync() {
         for (final int n : new int[] { 1, 1000, 1000000 }) {
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
             Observable.just(1, 2).flatMap(new Function<Integer, Observable<Integer>>() {
                 @Override
@@ -972,10 +972,10 @@ public void onNext(Integer t) {
     @Test
     public void fusedSourceCrashResumeWithNextSource() {
         final UnicastSubject<Integer> fusedSource = UnicastSubject.create();
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         ObservableFlatMap.MergeObserver<Integer, Integer> merger =
-                new ObservableFlatMap.MergeObserver<Integer, Integer>(to, new Function<Integer, Observable<Integer>>() {
+                new ObservableFlatMap.MergeObserver<>(to, new Function<Integer, Observable<Integer>>() {
                     @Override
                     public Observable<Integer> apply(Integer t)
                             throws Exception {
@@ -984,7 +984,9 @@ public Observable<Integer> apply(Integer t)
                                     .map(new Function<Integer, Integer>() {
                                         @Override
                                         public Integer apply(Integer v)
-                                                throws Exception { throw new TestException(); }
+                                                throws Exception {
+                                            throw new TestException();
+                                        }
                                     })
                                     .compose(TestHelper.<Integer>observableStripBoundary());
                         }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java
index cd7273a282..677b78414f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java
@@ -33,7 +33,7 @@ public class ObservableForEachTest extends RxJavaTest {
 
     @Test
     public void forEachWile() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Observable.range(1, 5)
         .doOnNext(new Consumer<Integer>() {
@@ -54,7 +54,7 @@ public boolean test(Integer v) throws Exception {
 
     @Test
     public void forEachWileWithError() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         Observable.range(1, 5).concatWith(Observable.<Integer>error(new TestException()))
         .doOnNext(new Consumer<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java
index 060a871855..43b1d96fef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java
@@ -121,7 +121,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Observer<Object> observer = TestHelper.mockObserver();
 
-        TestObserver<String> outer = new TestObserver<String>(observer);
+        TestObserver<String> outer = new TestObserver<>(observer);
 
         fromCallableObservable
                 .subscribeOn(Schedulers.computation())
@@ -262,7 +262,7 @@ public Object call() throws Exception {
 
     @Test
     public void disposedOnCall() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.fromCallable(new Callable<Integer>() {
             @Override
@@ -280,7 +280,7 @@ public Integer call() throws Exception {
     public void disposedOnCallThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final TestObserver<Integer> to = new TestObserver<Integer>();
+            final TestObserver<Integer> to = new TestObserver<>();
 
             Observable.fromCallable(new Callable<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
index 4cd33b78e9..d744472b66 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
@@ -119,7 +119,7 @@ public void observableFromIterable() {
     public void noBackpressure() {
         Observable<Integer> o = Observable.fromIterable(Arrays.asList(1, 2, 3, 4, 5));
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         o.subscribe(to);
 
@@ -132,7 +132,7 @@ public void subscribeMultipleTimes() {
         Observable<Integer> o = Observable.fromIterable(Arrays.asList(1, 2, 3));
 
         for (int i = 0; i < 10; i++) {
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
             o.subscribe(to);
 
@@ -235,7 +235,7 @@ public void onNext(Integer t) {
 
     @Test
     public void fusionWithConcatMap() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable.fromIterable(Arrays.asList(1, 2, 3, 4)).concatMap(
         new Function<Integer, ObservableSource<Integer>>() {
@@ -266,7 +266,7 @@ public void hasNext2Throws() {
 
     @Test
     public void hasNextCancels() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.fromIterable(new Iterable<Integer>() {
             @Override
@@ -303,7 +303,7 @@ public void remove() {
 
     @Test
     public void fusionRejected() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ASYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         Observable.fromIterable(Arrays.asList(1, 2, 3))
         .subscribe(to);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java
index bf6e9d4e3b..2b181a56fe 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java
@@ -121,7 +121,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Observer<Object> observer = TestHelper.mockObserver();
 
-        TestObserver<String> outer = new TestObserver<String>(observer);
+        TestObserver<String> outer = new TestObserver<>(observer);
 
         fromSupplierObservable
                 .subscribeOn(Schedulers.computation())
@@ -262,7 +262,7 @@ public Object get() throws Exception {
 
     @Test
     public void disposedOnCall() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.fromSupplier(new Supplier<Integer>() {
             @Override
@@ -280,7 +280,7 @@ public Integer get() throws Exception {
     public void disposedOnCallThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final TestObserver<Integer> to = new TestObserver<Integer>();
+            final TestObserver<Integer> to = new TestObserver<>();
 
             Observable.fromSupplier(new Supplier<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
index 778520fa4f..0bc7a09997 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
@@ -77,7 +77,7 @@ public ObservableSource<Object> apply(Flowable<Object> f) throws Exception {
 
     @Test
     public void fusionRejected() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ASYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         Observable.fromArray(1, 2, 3)
         .subscribe(to);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
index 1eaf76cda8..28d3f2d643 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
@@ -105,7 +105,7 @@ public void error() {
 
         final AtomicInteger groupCounter = new AtomicInteger();
         final AtomicInteger eventCounter = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         grouped.flatMap(new Function<GroupedObservable<Integer, String>, Observable<String>>() {
 
@@ -148,13 +148,13 @@ public void onNext(String v) {
 
     private static <K, V> Map<K, Collection<V>> toMap(Observable<GroupedObservable<K, V>> observable) {
 
-        final ConcurrentHashMap<K, Collection<V>> result = new ConcurrentHashMap<K, Collection<V>>();
+        final ConcurrentHashMap<K, Collection<V>> result = new ConcurrentHashMap<>();
 
         observable.doOnNext(new Consumer<GroupedObservable<K, V>>() {
 
             @Override
             public void accept(final GroupedObservable<K, V> o) {
-                result.put(o.getKey(), new ConcurrentLinkedQueue<V>());
+                result.put(o.getKey(), new ConcurrentLinkedQueue<>());
                 o.subscribe(new Consumer<V>() {
 
                     @Override
@@ -597,7 +597,7 @@ public void accept(String s) {
     @Test
     public void firstGroupsCompleteAndParentSlowToThenEmitFinalGroupsAndThenComplete() throws InterruptedException {
         final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Observable.unsafeCreate(new ObservableSource<Integer>() {
 
             @Override
@@ -676,7 +676,7 @@ public void accept(String s) {
     public void firstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenSubscribesOnAndDelaysAndThenCompletes() throws InterruptedException {
         System.err.println("----------------------------------------------------------------------------------------------");
         final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Observable.unsafeCreate(new ObservableSource<Integer>() {
 
             @Override
@@ -768,7 +768,7 @@ public void accept(String s) {
     @Test
     public void firstGroupsCompleteAndParentSlowToThenEmitFinalGroupsWhichThenObservesOnAndDelaysAndThenCompletes() throws InterruptedException {
         final CountDownLatch first = new CountDownLatch(2); // there are two groups to first complete
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Observable.unsafeCreate(new ObservableSource<Integer>() {
 
             @Override
@@ -845,7 +845,7 @@ public void accept(String s) {
 
     @Test
     public void groupsWithNestedSubscribeOn() throws InterruptedException {
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Observable.unsafeCreate(new ObservableSource<Integer>() {
 
             @Override
@@ -902,7 +902,7 @@ public void accept(String s) {
 
     @Test
     public void groupsWithNestedObserveOn() throws InterruptedException {
-        final ArrayList<String> results = new ArrayList<String>();
+        final ArrayList<String> results = new ArrayList<>();
         Observable.unsafeCreate(new ObservableSource<Integer>() {
 
             @Override
@@ -1027,7 +1027,7 @@ public Boolean apply(Integer n) {
     @Test
     public void groupByBackpressure() throws InterruptedException {
 
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         Observable.range(1, 4000)
                 .groupBy(IS_EVEN2)
@@ -1154,7 +1154,7 @@ public String apply(String v) {
             }
         });
 
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
         m.subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         System.out.println("ts .get " + to.values());
@@ -1170,7 +1170,7 @@ public void keySelectorThrows() {
 
         Observable<Integer> m = source.groupBy(fail(0), dbl).flatMap(FLATTEN_INTEGER);
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         m.subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         assertEquals(1, to.errors().size());
@@ -1182,7 +1182,7 @@ public void valueSelectorThrows() {
         Observable<Integer> source = Observable.just(0, 1, 2, 3, 4, 5, 6);
 
         Observable<Integer> m = source.groupBy(identity, fail(0)).flatMap(FLATTEN_INTEGER);
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         m.subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         assertEquals(1, to.errors().size());
@@ -1196,7 +1196,7 @@ public void innerEscapeCompleted() {
 
         Observable<Integer> m = source.groupBy(identity, dbl).flatMap(FLATTEN_INTEGER);
 
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         m.subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -1210,7 +1210,7 @@ public void innerEscapeCompleted() {
     public void exceptionIfSubscribeToChildMoreThanOnce() {
         Observable<Integer> source = Observable.just(0);
 
-        final AtomicReference<GroupedObservable<Integer, Integer>> inner = new AtomicReference<GroupedObservable<Integer, Integer>>();
+        final AtomicReference<GroupedObservable<Integer, Integer>> inner = new AtomicReference<>();
 
         Observable<GroupedObservable<Integer, Integer>> m = source.groupBy(identity, dbl);
 
@@ -1239,7 +1239,7 @@ public void error2() {
 
         Observable<Integer> m = source.groupBy(identity, dbl).flatMap(FLATTEN_INTEGER);
 
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         m.subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         assertEquals(1, to.errors().size());
@@ -1248,7 +1248,7 @@ public void error2() {
 
     @Test
     public void groupByBackpressure3() throws InterruptedException {
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         Observable.range(1, 4000).groupBy(IS_EVEN2).flatMap(new Function<GroupedObservable<Boolean, Integer>, Observable<String>>() {
 
@@ -1305,7 +1305,7 @@ public void accept(Notification<String> t1) {
     @Test
     public void groupByBackpressure2() throws InterruptedException {
 
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         Observable.range(1, 4000).groupBy(IS_EVEN2).flatMap(new Function<GroupedObservable<Boolean, Integer>, Observable<String>>() {
 
@@ -1346,7 +1346,7 @@ public Observable<Integer> apply(GroupedObservable<Integer, Integer> t) {
     @Test
     public void groupByWithNullKey() {
         final String[] key = new String[]{"uninitialized"};
-        final List<String> values = new ArrayList<String>();
+        final List<String> values = new ArrayList<>();
         Observable.just("a", "b", "c").groupBy(new Function<String, String>() {
 
             @Override
@@ -1382,7 +1382,7 @@ public void subscribe(Observer<? super Integer> observer) {
                     }
                 }
         );
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         o.groupBy(new Function<Integer, Integer>() {
 
@@ -1400,11 +1400,11 @@ public Integer apply(Integer integer) {
     @Test
     public void groupByShouldPropagateError() {
         final Throwable e = new RuntimeException("Oops");
-        final TestObserverEx<Integer> inner1 = new TestObserverEx<Integer>();
-        final TestObserverEx<Integer> inner2 = new TestObserverEx<Integer>();
+        final TestObserverEx<Integer> inner1 = new TestObserverEx<>();
+        final TestObserverEx<Integer> inner2 = new TestObserverEx<>();
 
         final TestObserverEx<GroupedObservable<Integer, Integer>> outer
-                = new TestObserverEx<GroupedObservable<Integer, Integer>>(new DefaultObserver<GroupedObservable<Integer, Integer>>() {
+                = new TestObserverEx<>(new DefaultObserver<GroupedObservable<Integer, Integer>>() {
 
             @Override
             public void onComplete() {
@@ -1546,7 +1546,7 @@ public void delayErrorSimpleComplete() {
     public void cancelOverFlatmapRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
-            final TestObserver<Integer> to = new TestObserver<Integer>();
+            final TestObserver<Integer> to = new TestObserver<>();
 
             final PublishSubject<Integer> ps = PublishSubject.create();
 
@@ -1589,7 +1589,7 @@ public void run() {
 
     @Test
     public void abandonedGroupsNoDataloss() {
-        final List<GroupedObservable<Integer, Integer>> groups = new ArrayList<GroupedObservable<Integer, Integer>>();
+        final List<GroupedObservable<Integer, Integer>> groups = new ArrayList<>();
 
         Observable.range(1, 1000)
         .groupBy(new Function<Integer, Integer>() {
@@ -1618,8 +1618,8 @@ public void accept(GroupedObservable<Integer, Integer> v) throws Throwable {
 
     @Test
     public void newGroupValueSelectorFails() {
-        TestObserver<Object> to1 = new TestObserver<Object>();
-        final TestObserver<Object> to2 = new TestObserver<Object>();
+        TestObserver<Object> to1 = new TestObserver<>();
+        final TestObserver<Object> to2 = new TestObserver<>();
 
         Observable.just(1)
         .groupBy(Functions.<Integer>identity(), new Function<Integer, Object>() {
@@ -1645,8 +1645,8 @@ public void accept(GroupedObservable<Integer, Object> g) throws Throwable {
 
     @Test
     public void existingGroupValueSelectorFails() {
-        TestObserver<Object> to1 = new TestObserver<Object>();
-        final TestObserver<Object> to2 = new TestObserver<Object>();
+        TestObserver<Object> to1 = new TestObserver<>();
+        final TestObserver<Object> to2 = new TestObserver<>();
 
         Observable.just(1, 2)
         .groupBy(Functions.justFunction(1), new Function<Integer, Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java
index e5704dfd46..43af8631e9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java
@@ -58,7 +58,7 @@ public void accept(Integer t) {
 
     @Test
     public void completedOkObservable() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         Observable.range(1, 10).ignoreElements().toObservable().subscribe(to);
         to.assertNoErrors();
         to.assertNoValues();
@@ -67,7 +67,7 @@ public void completedOkObservable() {
 
     @Test
     public void errorReceivedObservable() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         TestException ex = new TestException("boo");
         Observable.error(ex).ignoreElements().toObservable().subscribe(to);
         to.assertNoValues();
@@ -120,7 +120,7 @@ public void accept(Integer t) {
 
     @Test
     public void completedOk() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         Observable.range(1, 10).ignoreElements().subscribe(to);
         to.assertNoErrors();
         to.assertNoValues();
@@ -129,7 +129,7 @@ public void completedOk() {
 
     @Test
     public void errorReceived() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         TestException ex = new TestException("boo");
         Observable.error(ex).ignoreElements().subscribe(to);
         to.assertNoValues();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java
index 11fe98a669..4f188093c5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java
@@ -40,7 +40,7 @@ public void cancel() {
 
     @Test
     public void cancelledOnRun() {
-        TestObserver<Long> to = new TestObserver<Long>();
+        TestObserver<Long> to = new TestObserver<>();
         IntervalObserver is = new IntervalObserver(to);
         to.onSubscribe(is);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
index 7a84d0c981..81b470ff99 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
@@ -27,7 +27,7 @@
 public class ObservableMapNotificationTest extends RxJavaTest {
     @Test
     public void just() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         Observable.just(1)
         .flatMap(
                 new Function<Integer, Observable<Object>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
index da5651214f..538feaaa7f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
@@ -306,7 +306,7 @@ public Integer apply(Integer i) {
 //    }
 
     private static Map<String, String> getMap(String prefix) {
-        Map<String, String> m = new HashMap<String, String>();
+        Map<String, String> m = new HashMap<>();
         m.put("firstName", prefix + "First");
         m.put("lastName", prefix + "Last");
         return m;
@@ -350,7 +350,7 @@ public ObservableSource<Object> apply(Observable<Object> o) throws Exception {
 
     @Test
     public void fusedSync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Observable.range(1, 5)
         .map(Functions.<Integer>identity())
@@ -362,7 +362,7 @@ public void fusedSync() {
 
     @Test
     public void fusedAsync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         UnicastSubject<Integer> us = UnicastSubject.create();
 
@@ -378,7 +378,7 @@ public void fusedAsync() {
 
     @Test
     public void fusedReject() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY | QueueFuseable.BOUNDARY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY | QueueFuseable.BOUNDARY);
 
         Observable.range(1, 5)
         .map(Functions.<Integer>identity())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
index daf82d84ee..0e1df287bc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
@@ -102,7 +102,7 @@ public void multipleSubscribes() throws InterruptedException, ExecutionException
 
     @Test
     public void withCompletionCausingError() {
-        TestObserverEx<Notification<Integer>> to = new TestObserverEx<Notification<Integer>>();
+        TestObserverEx<Notification<Integer>> to = new TestObserverEx<>();
         final RuntimeException ex = new RuntimeException("boo");
         Observable.<Integer>empty().materialize().doOnNext(new Consumer<Object>() {
             @Override
@@ -119,7 +119,7 @@ private static class TestLocalObserver extends DefaultObserver<Notification<Stri
 
         boolean onComplete;
         boolean onError;
-        List<Notification<String>> notifications = new Vector<Notification<String>>();
+        List<Notification<String>> notifications = new Vector<>();
 
         @Override
         public void onComplete() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
index 877b75b70a..db6450d097 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
@@ -252,7 +252,7 @@ public void mergeArray() {
     public void mergeList() {
         final Observable<String> o1 = Observable.unsafeCreate(new TestSynchronousObservable());
         final Observable<String> o2 = Observable.unsafeCreate(new TestSynchronousObservable());
-        List<Observable<String>> listOfObservables = new ArrayList<Observable<String>>();
+        List<Observable<String>> listOfObservables = new ArrayList<>();
         listOfObservables.add(o1);
         listOfObservables.add(o2);
 
@@ -433,7 +433,7 @@ public void onNext(String args) {
 
     @Test
     public void errorInParentObservable() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         Observable.mergeDelayError(
                 Observable.just(Observable.just(1), Observable.just(2))
                         .startWithItem(Observable.<Integer> error(new RuntimeException()))
@@ -462,7 +462,7 @@ public void subscribe(Observer<? super Observable<String>> op) {
 
             Observer<String> stringObserver = TestHelper.mockObserver();
 
-            TestObserverEx<String> to = new TestObserverEx<String>(stringObserver);
+            TestObserverEx<String> to = new TestObserverEx<>(stringObserver);
             Observable<String> m = Observable.mergeDelayError(parentObservable);
             m.subscribe(to);
             System.out.println("testErrorInParentObservableDelayed | " + i);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
index ac69ffbaa7..9ab92edc12 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
@@ -42,14 +42,14 @@ public void before() {
     @Test
     public void whenMaxConcurrentIsOne() {
         for (int i = 0; i < 100; i++) {
-            List<Observable<String>> os = new ArrayList<Observable<String>>();
+            List<Observable<String>> os = new ArrayList<>();
             os.add(Observable.just("one", "two", "three", "four", "five").subscribeOn(Schedulers.newThread()));
             os.add(Observable.just("one", "two", "three", "four", "five").subscribeOn(Schedulers.newThread()));
             os.add(Observable.just("one", "two", "three", "four", "five").subscribeOn(Schedulers.newThread()));
 
             List<String> expected = Arrays.asList("one", "two", "three", "four", "five", "one", "two", "three", "four", "five", "one", "two", "three", "four", "five");
             Iterator<String> iter = Observable.merge(os, 1).blockingIterable().iterator();
-            List<String> actual = new ArrayList<String>();
+            List<String> actual = new ArrayList<>();
             while (iter.hasNext()) {
                 actual.add(iter.next());
             }
@@ -65,8 +65,8 @@ public void maxConcurrent() {
             int maxConcurrent = 2 + (times % 10);
             AtomicInteger subscriptionCount = new AtomicInteger(0);
 
-            List<Observable<String>> os = new ArrayList<Observable<String>>();
-            List<SubscriptionCheckObservable> scos = new ArrayList<SubscriptionCheckObservable>();
+            List<Observable<String>> os = new ArrayList<>();
+            List<SubscriptionCheckObservable> scos = new ArrayList<>();
             for (int i = 0; i < observableCount; i++) {
                 SubscriptionCheckObservable sco = new SubscriptionCheckObservable(subscriptionCount, maxConcurrent);
                 scos.add(sco);
@@ -74,7 +74,7 @@ public void maxConcurrent() {
             }
 
             Iterator<String> iter = Observable.merge(os, maxConcurrent).blockingIterable().iterator();
-            List<String> actual = new ArrayList<String>();
+            List<String> actual = new ArrayList<>();
             while (iter.hasNext()) {
                 actual.add(iter.next());
             }
@@ -126,7 +126,7 @@ public void run() {
     @Test
     public void mergeALotOfSourcesOneByOneSynchronously() {
         int n = 10000;
-        List<Observable<Integer>> sourceList = new ArrayList<Observable<Integer>>(n);
+        List<Observable<Integer>> sourceList = new ArrayList<>(n);
         for (int i = 0; i < n; i++) {
             sourceList.add(Observable.just(i));
         }
@@ -142,7 +142,7 @@ public void mergeALotOfSourcesOneByOneSynchronously() {
     @Test
     public void mergeALotOfSourcesOneByOneSynchronouslyTakeHalf() {
         int n = 10000;
-        List<Observable<Integer>> sourceList = new ArrayList<Observable<Integer>>(n);
+        List<Observable<Integer>> sourceList = new ArrayList<>(n);
         for (int i = 0; i < n; i++) {
             sourceList.add(Observable.just(i));
         }
@@ -158,9 +158,9 @@ public void mergeALotOfSourcesOneByOneSynchronouslyTakeHalf() {
     @Test
     public void simple() {
         for (int i = 1; i < 100; i++) {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>();
-            List<Observable<Integer>> sourceList = new ArrayList<Observable<Integer>>(i);
-            List<Integer> result = new ArrayList<Integer>(i);
+            TestObserverEx<Integer> to = new TestObserverEx<>();
+            List<Observable<Integer>> sourceList = new ArrayList<>(i);
+            List<Integer> result = new ArrayList<>(i);
             for (int j = 1; j <= i; j++) {
                 sourceList.add(Observable.just(j));
                 result.add(j);
@@ -177,9 +177,9 @@ public void simple() {
     @Test
     public void simpleOneLess() {
         for (int i = 2; i < 100; i++) {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>();
-            List<Observable<Integer>> sourceList = new ArrayList<Observable<Integer>>(i);
-            List<Integer> result = new ArrayList<Integer>(i);
+            TestObserverEx<Integer> to = new TestObserverEx<>();
+            List<Observable<Integer>> sourceList = new ArrayList<>(i);
+            List<Integer> result = new ArrayList<>(i);
             for (int j = 1; j <= i; j++) {
                 sourceList.add(Observable.just(j));
                 result.add(j);
@@ -209,9 +209,9 @@ public void simpleAsyncLoop() {
     @Test
     public void simpleAsync() {
         for (int i = 1; i < 50; i++) {
-            TestObserver<Integer> to = new TestObserver<Integer>();
-            List<Observable<Integer>> sourceList = new ArrayList<Observable<Integer>>(i);
-            Set<Integer> expected = new HashSet<Integer>(i);
+            TestObserver<Integer> to = new TestObserver<>();
+            List<Observable<Integer>> sourceList = new ArrayList<>(i);
+            Set<Integer> expected = new HashSet<>(i);
             for (int j = 1; j <= i; j++) {
                 sourceList.add(Observable.just(j).subscribeOn(Schedulers.io()));
                 expected.add(j);
@@ -221,7 +221,7 @@ public void simpleAsync() {
 
             to.awaitDone(1, TimeUnit.SECONDS);
             to.assertNoErrors();
-            Set<Integer> actual = new HashSet<Integer>(to.values());
+            Set<Integer> actual = new HashSet<>(to.values());
 
             assertEquals(expected, actual);
         }
@@ -241,9 +241,9 @@ public void simpleOneLessAsync() {
             if (System.currentTimeMillis() - t > TimeUnit.SECONDS.toMillis(9)) {
                 break;
             }
-            TestObserver<Integer> to = new TestObserver<Integer>();
-            List<Observable<Integer>> sourceList = new ArrayList<Observable<Integer>>(i);
-            Set<Integer> expected = new HashSet<Integer>(i);
+            TestObserver<Integer> to = new TestObserver<>();
+            List<Observable<Integer>> sourceList = new ArrayList<>(i);
+            Set<Integer> expected = new HashSet<>(i);
             for (int j = 1; j <= i; j++) {
                 sourceList.add(Observable.just(j).subscribeOn(Schedulers.io()));
                 expected.add(j);
@@ -253,7 +253,7 @@ public void simpleOneLessAsync() {
 
             to.awaitDone(1, TimeUnit.SECONDS);
             to.assertNoErrors();
-            Set<Integer> actual = new HashSet<Integer>(to.values());
+            Set<Integer> actual = new HashSet<>(to.values());
 
             assertEquals(expected, actual);
         }
@@ -261,13 +261,13 @@ public void simpleOneLessAsync() {
 
     @Test
     public void take() throws Exception {
-        List<Observable<Integer>> sourceList = new ArrayList<Observable<Integer>>(3);
+        List<Observable<Integer>> sourceList = new ArrayList<>(3);
 
         sourceList.add(Observable.range(0, 100000).subscribeOn(Schedulers.io()));
         sourceList.add(Observable.range(0, 100000).subscribeOn(Schedulers.io()));
         sourceList.add(Observable.range(0, 100000).subscribeOn(Schedulers.io()));
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable.merge(sourceList, 2).take(5).subscribe(to);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
index c198ff83f0..92d30f8a85 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
@@ -112,7 +112,7 @@ public void mergeArray() {
     public void mergeList() {
         final Observable<String> o1 = Observable.unsafeCreate(new TestSynchronousObservable());
         final Observable<String> o2 = Observable.unsafeCreate(new TestSynchronousObservable());
-        List<Observable<String>> listOfObservables = new ArrayList<Observable<String>>();
+        List<Observable<String>> listOfObservables = new ArrayList<>();
         listOfObservables.add(o1);
         listOfObservables.add(o2);
 
@@ -191,7 +191,7 @@ public void mergeArrayWithThreading() {
         final TestASynchronousObservable o2 = new TestASynchronousObservable();
 
         Observable<String> m = Observable.merge(Observable.unsafeCreate(o1), Observable.unsafeCreate(o2));
-        TestObserver<String> to = new TestObserver<String>(stringObserver);
+        TestObserver<String> to = new TestObserver<>(stringObserver);
         m.subscribe(to);
 
         to.awaitDone(5, TimeUnit.SECONDS);
@@ -408,7 +408,7 @@ public void unsubscribeAsObservablesComplete() {
         AtomicBoolean os2 = new AtomicBoolean(false);
         Observable<Long> o2 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);
 
-        TestObserverEx<Long> to = new TestObserverEx<Long>();
+        TestObserverEx<Long> to = new TestObserverEx<>();
         Observable.merge(o1, o2).subscribe(to);
 
         // we haven't incremented time so nothing should be received yet
@@ -450,7 +450,7 @@ public void earlyUnsubscribe() {
             AtomicBoolean os2 = new AtomicBoolean(false);
             Observable<Long> o2 = createObservableOf5IntervalsOf1SecondIncrementsWithSubscriptionHook(scheduler2, os2);
 
-            TestObserver<Long> to = new TestObserver<Long>();
+            TestObserver<Long> to = new TestObserver<>();
             Observable.merge(o1, o2).subscribe(to);
 
             // we haven't incremented time so nothing should be received yet
@@ -523,7 +523,7 @@ public void concurrency() {
 
         for (int i = 0; i < 10; i++) {
             Observable<Integer> merge = Observable.merge(o, o, o);
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to = new TestObserverEx<>();
             merge.subscribe(to);
 
             to.awaitDone(3, TimeUnit.SECONDS);
@@ -576,7 +576,7 @@ public void run() {
 
         for (int i = 0; i < 10; i++) {
             Observable<Integer> merge = Observable.merge(o, o, o);
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
             merge.subscribe(to);
 
             to.awaitDone(5, TimeUnit.SECONDS);
@@ -623,7 +623,7 @@ public void run() {
 
         for (int i = 0; i < 10; i++) {
             Observable<Integer> merge = Observable.merge(o, o, o);
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
             merge.subscribe(to);
 
             to.awaitDone(5, TimeUnit.SECONDS);
@@ -806,7 +806,7 @@ public void onNext(Integer t) {
 
     @Test
     public void merge1AsyncStreamOf1() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNAsyncStreamsOfN(1, 1).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -815,7 +815,7 @@ public void merge1AsyncStreamOf1() {
 
     @Test
     public void merge1AsyncStreamOf1000() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNAsyncStreamsOfN(1, 1000).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -824,7 +824,7 @@ public void merge1AsyncStreamOf1000() {
 
     @Test
     public void merge10AsyncStreamOf1000() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNAsyncStreamsOfN(10, 1000).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -833,7 +833,7 @@ public void merge10AsyncStreamOf1000() {
 
     @Test
     public void merge1000AsyncStreamOf1000() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNAsyncStreamsOfN(1000, 1000).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -842,7 +842,7 @@ public void merge1000AsyncStreamOf1000() {
 
     @Test
     public void merge2000AsyncStreamOf100() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNAsyncStreamsOfN(2000, 100).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -851,7 +851,7 @@ public void merge2000AsyncStreamOf100() {
 
     @Test
     public void merge100AsyncStreamOf1() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNAsyncStreamsOfN(100, 1).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -873,7 +873,7 @@ public Observable<Integer> apply(Integer i) {
 
     @Test
     public void merge1SyncStreamOf1() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNSyncStreamsOfN(1, 1).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -882,7 +882,7 @@ public void merge1SyncStreamOf1() {
 
     @Test
     public void merge1SyncStreamOf1000000() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNSyncStreamsOfN(1, 1000000).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -891,7 +891,7 @@ public void merge1SyncStreamOf1000000() {
 
     @Test
     public void merge1000SyncStreamOf1000() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNSyncStreamsOfN(1000, 1000).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -900,7 +900,7 @@ public void merge1000SyncStreamOf1000() {
 
     @Test
     public void merge10000SyncStreamOf10() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNSyncStreamsOfN(10000, 10).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -909,7 +909,7 @@ public void merge10000SyncStreamOf10() {
 
     @Test
     public void merge1000000SyncStreamOf1() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         mergeNSyncStreamsOfN(1000000, 1).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -956,7 +956,7 @@ public boolean hasNext() {
 
     @Test
     public void mergeManyAsyncSingle() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable<Observable<Integer>> os = Observable.range(1, 10000)
         .map(new Function<Integer, Observable<Integer>>() {
 
@@ -1004,7 +1004,7 @@ public Observable<Integer> apply(Integer t) {
     ;
 
     void runMerge(Function<Integer, Observable<Integer>> func, TestObserverEx<Integer> to) {
-        List<Integer> list = new ArrayList<Integer>();
+        List<Integer> list = new ArrayList<>();
         for (int i = 0; i < 1000; i++) {
             list.add(i);
         }
@@ -1022,12 +1022,12 @@ void runMerge(Function<Integer, Observable<Integer>> func, TestObserverEx<Intege
 
     @Test
     public void fastMergeFullScalar() {
-        runMerge(toScalar, new TestObserverEx<Integer>());
+        runMerge(toScalar, new TestObserverEx<>());
     }
 
     @Test
     public void fastMergeHiddenScalar() {
-        runMerge(toHiddenScalar, new TestObserverEx<Integer>());
+        runMerge(toHiddenScalar, new TestObserverEx<>());
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
index e5414dfe7f..e561eaac1e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
@@ -29,7 +29,7 @@ public class ObservableMergeWithCompletableTest extends RxJavaTest {
 
     @Test
     public void normal() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5).mergeWith(
                 Completable.fromAction(new Action() {
@@ -46,7 +46,7 @@ public void run() throws Exception {
 
     @Test
     public void take() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.range(1, 5).mergeWith(
                 Completable.complete()
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
index 4949ad2081..43f0a7fff7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
@@ -178,7 +178,7 @@ public void onNext(Integer t) {
     public void onErrorMainOverflow() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<Observer<?>> observerRef = new AtomicReference<Observer<?>>();
+            final AtomicReference<Observer<?>> observerRef = new AtomicReference<>();
             TestObserver<Integer> to = new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
index 28c6099d4c..c6b083f41d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
@@ -170,7 +170,7 @@ public void onNext(Integer t) {
     public void onErrorMainOverflow() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<Observer<?>> observerRef = new AtomicReference<Observer<?>>();
+            final AtomicReference<Observer<?>> observerRef = new AtomicReference<>();
             TestObserver<Integer> to = new Observable<Integer>() {
                 @Override
                 protected void subscribeActual(Observer<? super Integer> observer) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
index 286d115edf..579b713313 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
@@ -66,7 +66,7 @@ public void ordering() throws InterruptedException {
         Observer<String> observer = TestHelper.mockObserver();
 
         InOrder inOrder = inOrder(observer);
-        TestObserverEx<String> to = new TestObserverEx<String>(observer);
+        TestObserverEx<String> to = new TestObserverEx<>(observer);
 
         obs.observeOn(Schedulers.computation()).subscribe(to);
 
@@ -387,7 +387,7 @@ public void afterUnsubscribeCalledThenObserverOnNextNeverCalled() {
         final TestScheduler testScheduler = new TestScheduler();
 
         final Observer<Integer> observer = TestHelper.mockObserver();
-        TestObserver<Integer> to = new TestObserver<Integer>(observer);
+        TestObserver<Integer> to = new TestObserver<>(observer);
 
         Observable.just(1, 2, 3)
                 .observeOn(testScheduler)
@@ -428,7 +428,7 @@ public boolean hasNext() {
             }
         });
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         o
                 .take(7)
                 .observeOn(Schedulers.newThread())
@@ -441,7 +441,7 @@ public boolean hasNext() {
 
     @Test
     public void asyncChild() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(0, 100000).observeOn(Schedulers.newThread()).observeOn(Schedulers.newThread()).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
@@ -565,7 +565,7 @@ public void inputAsyncFusedErrorDelayed() {
 
     @Test
     public void outputFused() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Observable.range(1, 5).hide()
         .observeOn(Schedulers.single())
@@ -578,7 +578,7 @@ public void outputFused() {
 
     @Test
     public void outputFusedReject() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC);
 
         Observable.range(1, 5).hide()
         .observeOn(Schedulers.single())
@@ -591,7 +591,7 @@ public void outputFusedReject() {
 
     @Test
     public void inputOutputAsyncFusedError() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         UnicastSubject<Integer> us = UnicastSubject.create();
 
@@ -611,7 +611,7 @@ public void inputOutputAsyncFusedError() {
 
     @Test
     public void inputOutputAsyncFusedErrorDelayed() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         UnicastSubject<Integer> us = UnicastSubject.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
index 69a9b0f7cd..386b6c96a1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
@@ -37,7 +37,7 @@ public class ObservableOnErrorResumeNextTest extends RxJavaTest {
 
     @Test
     public void resumeNextWithSynchronousExecution() {
-        final AtomicReference<Throwable> receivedException = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> receivedException = new AtomicReference<>();
         Observable<String> w = Observable.unsafeCreate(new ObservableSource<String>() {
 
             @Override
@@ -77,7 +77,7 @@ public Observable<String> apply(Throwable t1) {
 
     @Test
     public void resumeNextWithAsyncExecution() {
-        final AtomicReference<Throwable> receivedException = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> receivedException = new AtomicReference<>();
         Subscription s = mock(Subscription.class);
         TestObservable w = new TestObservable(s, "one");
         Function<Throwable, Observable<String>> resume = new Function<Throwable, Observable<String>>() {
@@ -174,7 +174,7 @@ public Observable<String> apply(Throwable t1) {
 
         Observer<String> observer = TestHelper.mockObserver();
 
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         o.subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
 
@@ -226,7 +226,7 @@ public void run() {
 
     @Test
     public void backpressure() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(0, 100000)
                 .onErrorResumeNext(new Function<Throwable, Observable<Integer>>() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java
index 217335ec08..f60ea43a25 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java
@@ -146,7 +146,7 @@ public void run() {
 
     @Test
     public void backpressure() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(0, 100000)
                 .onErrorResumeWith(Observable.just(1))
                 .observeOn(Schedulers.computation())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
index d9520fe6d2..69c6c6889c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
@@ -37,7 +37,7 @@ public class ObservableOnErrorReturnTest extends RxJavaTest {
     public void resumeNext() {
         TestObservable f = new TestObservable("one");
         Observable<String> w = Observable.unsafeCreate(f);
-        final AtomicReference<Throwable> capturedException = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> capturedException = new AtomicReference<>();
 
         Observable<String> observable = w.onErrorReturn(new Function<Throwable, String>() {
 
@@ -72,7 +72,7 @@ public String apply(Throwable e) {
     public void functionThrowsError() {
         TestObservable f = new TestObservable("one");
         Observable<String> w = Observable.unsafeCreate(f);
-        final AtomicReference<Throwable> capturedException = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> capturedException = new AtomicReference<>();
 
         Observable<String> observable = w.onErrorReturn(new Function<Throwable, String>() {
 
@@ -130,7 +130,7 @@ public String apply(Throwable t1) {
         });
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         observable.subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
 
@@ -144,7 +144,7 @@ public String apply(Throwable t1) {
 
     @Test
     public void backpressure() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(0, 100000)
                 .onErrorReturn(new Function<Throwable, Integer>() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
index ee80dc2cab..16cb03d00e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
@@ -126,7 +126,7 @@ public void run() {
 
         });
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.merge(fast, slow).subscribe(to);
         is.connect();
         to.awaitDone(5, TimeUnit.SECONDS);
@@ -146,7 +146,7 @@ public void accept(Integer t1) {
             }
 
         });
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         xs.publish(new Function<Observable<Integer>, Observable<Integer>>() {
 
             @Override
@@ -173,7 +173,7 @@ public boolean test(Integer i) {
     @Test
     public void takeUntilWithPublishedStream() {
         Observable<Integer> xs = Observable.range(0, Flowable.bufferSize() * 2);
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         ConnectableObservable<Integer> xsp = xs.publish();
         xsp.takeUntil(xsp.skipWhile(new Predicate<Integer>() {
 
@@ -209,7 +209,7 @@ public void run() {
         final AtomicBoolean child1Unsubscribed = new AtomicBoolean();
         final AtomicBoolean child2Unsubscribed = new AtomicBoolean();
 
-        final TestObserver<Integer> to2 = new TestObserver<Integer>();
+        final TestObserver<Integer> to2 = new TestObserver<>();
 
         final TestObserver<Integer> to1 = new TestObserver<Integer>() {
             @Override
@@ -257,7 +257,7 @@ public void connectWithNoSubscriber() {
         co.connect();
         // Emit 0
         scheduler.advanceTimeBy(15, TimeUnit.MILLISECONDS);
-        TestObserverEx<Long> to = new TestObserverEx<Long>();
+        TestObserverEx<Long> to = new TestObserverEx<>();
         co.subscribe(to);
         // Emit 1 and 2
         scheduler.advanceTimeBy(50, TimeUnit.MILLISECONDS);
@@ -270,7 +270,7 @@ public void connectWithNoSubscriber() {
     public void subscribeAfterDisconnectThenConnect() {
         ConnectableObservable<Integer> source = Observable.just(1).publish();
 
-        TestObserverEx<Integer> to1 = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to1 = new TestObserverEx<>();
 
         source.subscribe(to1);
 
@@ -282,7 +282,7 @@ public void subscribeAfterDisconnectThenConnect() {
 
         source.reset();
 
-        TestObserverEx<Integer> to2 = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to2 = new TestObserverEx<>();
 
         source.subscribe(to2);
 
@@ -300,7 +300,7 @@ public void subscribeAfterDisconnectThenConnect() {
     public void noSubscriberRetentionOnCompleted() {
         ObservablePublish<Integer> source = (ObservablePublish<Integer>)Observable.just(1).publish();
 
-        TestObserverEx<Integer> to1 = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to1 = new TestObserverEx<>();
 
         source.subscribe(to1);
 
@@ -382,9 +382,9 @@ public void observeOn() {
         Observable<Integer> obs = co.observeOn(Schedulers.computation());
         for (int i = 0; i < 1000; i++) {
             for (int j = 1; j < 6; j++) {
-                List<TestObserverEx<Integer>> tos = new ArrayList<TestObserverEx<Integer>>();
+                List<TestObserverEx<Integer>> tos = new ArrayList<>();
                 for (int k = 1; k < j; k++) {
-                    TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+                    TestObserverEx<Integer> to = new TestObserverEx<>();
                     tos.add(to);
                     obs.subscribe(to);
                 }
@@ -480,7 +480,7 @@ public void addRemoveRace() {
 
             final TestObserver<Integer> to = co.test();
 
-            final TestObserver<Integer> to2 = new TestObserver<Integer>();
+            final TestObserver<Integer> to2 = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -628,7 +628,7 @@ public void subscribeDisconnectRace() {
             final ConnectableObservable<Integer> co = ps.publish();
 
             final Disposable d = co.connect();
-            final TestObserver<Integer> to = new TestObserver<Integer>();
+            final TestObserver<Integer> to = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -762,7 +762,7 @@ public void disposedUpfront() {
     @Test
     public void altConnectCrash() {
         try {
-            new ObservablePublish<Integer>(Observable.<Integer>empty())
+            new ObservablePublish<>(Observable.<Integer>empty())
             .connect(new Consumer<Disposable>() {
                 @Override
                 public void accept(Disposable t) throws Exception {
@@ -779,7 +779,7 @@ public void accept(Disposable t) throws Exception {
     public void altConnectRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
             final ConnectableObservable<Integer> co =
-                    new ObservablePublish<Integer>(Observable.<Integer>never());
+                    new ObservablePublish<>(Observable.<Integer>never());
 
             Runnable r = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
index e25cb17b8a..7a58572d2f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
@@ -93,14 +93,14 @@ public void rangeWithOverflow5() {
 
     @Test
     public void noBackpressure() {
-        ArrayList<Long> list = new ArrayList<Long>(Flowable.bufferSize() * 2);
+        ArrayList<Long> list = new ArrayList<>(Flowable.bufferSize() * 2);
         for (long i = 1; i <= Flowable.bufferSize() * 2 + 1; i++) {
             list.add(i);
         }
 
         Observable<Long> o = Observable.rangeLong(1, list.size());
 
-        TestObserverEx<Long> to = new TestObserverEx<Long>();
+        TestObserverEx<Long> to = new TestObserverEx<>();
 
         o.subscribe(to);
 
@@ -137,7 +137,7 @@ public void onNext(Long t) {
 
     @Test
     public void nearMaxValueWithoutBackpressure() {
-        TestObserver<Long> to = new TestObserver<Long>();
+        TestObserver<Long> to = new TestObserver<>();
         Observable.rangeLong(Long.MAX_VALUE - 1L, 2L).subscribe(to);
 
         to.assertComplete();
@@ -171,7 +171,7 @@ public void noOverflow() {
 
     @Test
     public void fused() {
-        TestObserverEx<Long> to = new TestObserverEx<Long>(QueueFuseable.ANY);
+        TestObserverEx<Long> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Observable.rangeLong(1, 2).subscribe(to);
 
@@ -181,7 +181,7 @@ public void fused() {
 
     @Test
     public void fusedReject() {
-        TestObserverEx<Long> to = new TestObserverEx<Long>(QueueFuseable.ASYNC);
+        TestObserverEx<Long> to = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         Observable.rangeLong(1, 2).subscribe(to);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
index 2f9374ad5a..e789b55093 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
@@ -94,14 +94,14 @@ public void rangeWithOverflow5() {
 
     @Test
     public void noBackpressure() {
-        ArrayList<Integer> list = new ArrayList<Integer>(Flowable.bufferSize() * 2);
+        ArrayList<Integer> list = new ArrayList<>(Flowable.bufferSize() * 2);
         for (int i = 1; i <= Flowable.bufferSize() * 2 + 1; i++) {
             list.add(i);
         }
 
         Observable<Integer> o = Observable.range(1, list.size());
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         o.subscribe(to);
 
@@ -138,7 +138,7 @@ public void onNext(Integer t) {
 
     @Test
     public void nearMaxValueWithoutBackpressure() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(Integer.MAX_VALUE - 1, 2).subscribe(to);
 
         to.assertComplete();
@@ -158,7 +158,7 @@ public void negativeCount() {
 
     @Test
     public void requestWrongFusion() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ASYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC);
 
         Observable.range(1, 5)
         .subscribe(to);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java
index cac0b75d1a..2dc15f230e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java
@@ -24,7 +24,7 @@ public class ObservableRedoTest extends RxJavaTest {
 
     @Test
     public void redoCancel() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1)
         .repeatWhen(new Function<Observable<Object>, ObservableSource<Object>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
index 7e862e1ad2..d9b98de8f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
@@ -190,8 +190,8 @@ public void run() {
                 .publish().refCount();
 
         for (int i = 0; i < 10; i++) {
-            TestObserver<Long> to1 = new TestObserver<Long>();
-            TestObserver<Long> to2 = new TestObserver<Long>();
+            TestObserver<Long> to1 = new TestObserver<>();
+            TestObserver<Long> to2 = new TestObserver<>();
             r.subscribe(to1);
             r.subscribe(to2);
             try {
@@ -233,7 +233,7 @@ public void run() {
                     }
                 });
 
-        TestObserverEx<Long> observer = new TestObserverEx<Long>();
+        TestObserverEx<Long> observer = new TestObserverEx<>();
         o.publish().refCount().subscribeOn(Schedulers.newThread()).subscribe(observer);
         System.out.println("send unsubscribe");
         // wait until connected
@@ -278,7 +278,7 @@ public void accept(Disposable d) {
                     }
                 });
 
-        TestObserverEx<Long> observer = new TestObserverEx<Long>();
+        TestObserverEx<Long> observer = new TestObserverEx<>();
 
         o.publish().refCount().subscribeOn(Schedulers.computation()).subscribe(observer);
         System.out.println("send unsubscribe");
@@ -367,7 +367,7 @@ public void refCount() {
         Observable<Long> interval = Observable.interval(100, TimeUnit.MILLISECONDS, s).publish().refCount();
 
         // subscribe list1
-        final List<Long> list1 = new ArrayList<Long>();
+        final List<Long> list1 = new ArrayList<>();
         Disposable d1 = interval.subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long t1) {
@@ -382,7 +382,7 @@ public void accept(Long t1) {
         assertEquals(1L, list1.get(1).longValue());
 
         // subscribe list2
-        final List<Long> list2 = new ArrayList<Long>();
+        final List<Long> list2 = new ArrayList<>();
         Disposable d2 = interval.subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long t1) {
@@ -427,7 +427,7 @@ public void accept(Long t1) {
 
         // subscribing a new one should start over because the source should have been unsubscribed
         // subscribe list3
-        final List<Long> list3 = new ArrayList<Long>();
+        final List<Long> list3 = new ArrayList<>();
         interval.subscribe(new Consumer<Long>() {
             @Override
             public void accept(Long t1) {
@@ -498,8 +498,8 @@ public Integer apply(Integer t1, Integer t2) {
         })
         .publish().refCount();
 
-        TestObserverEx<Integer> to1 = new TestObserverEx<Integer>();
-        TestObserverEx<Integer> to2 = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to1 = new TestObserverEx<>();
+        TestObserverEx<Integer> to2 = new TestObserverEx<>();
 
         combined.subscribe(to1);
         combined.subscribe(to2);
@@ -1133,7 +1133,7 @@ public void unsubscribeSubscribeRace() {
 
             final TestObserver<Integer> to1 = source.test();
 
-            final TestObserver<Integer> to2 = new TestObserver<Integer>();
+            final TestObserver<Integer> to2 = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1337,7 +1337,7 @@ protected void subscribeActual(Observer<? super T> observer) {
 
     @Test
     public void timeoutResetsSource() {
-        TestConnectableObservable<Object> tco = new TestConnectableObservable<Object>();
+        TestConnectableObservable<Object> tco = new TestConnectableObservable<>();
         ObservableRefCount<Object> o = (ObservableRefCount<Object>)tco.refCount();
 
         RefConnection rc = new RefConnection(o);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
index f7b1d93b0b..78c793f1b4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
@@ -164,7 +164,7 @@ public void repeatAndDistinctUnbounded() {
                 .repeat(3)
                 .distinct();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         src.subscribe(to);
 
@@ -176,8 +176,8 @@ public void repeatAndDistinctUnbounded() {
     /** Issue #2844: wrong target of request. */
     @Test
     public void repeatRetarget() {
-        final List<Integer> concatBase = new ArrayList<Integer>();
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        final List<Integer> concatBase = new ArrayList<>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.just(1, 2)
         .repeat(5)
         .concatMap(new Function<Integer, Observable<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
index ba3a7d6974..fe2c59d088 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
@@ -729,7 +729,7 @@ void truncate() {
         buf.addLast(new Node(4));
         buf.addLast(new Node(5));
 
-        List<Integer> values = new ArrayList<Integer>();
+        List<Integer> values = new ArrayList<>();
         buf.collect(values);
 
         Assert.assertEquals(Arrays.asList(1, 2, 3, 4, 5), values);
@@ -753,8 +753,8 @@ void truncate() {
     @Test
     public void timedAndSizedTruncation() {
         TestScheduler test = new TestScheduler();
-        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test, false);
-        List<Integer> values = new ArrayList<Integer>();
+        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, false);
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         test.advanceTimeBy(1, TimeUnit.SECONDS);
@@ -792,12 +792,12 @@ public void timedAndSizedTruncation() {
     @Test
     public void timedAndSizedTruncationError() {
         TestScheduler test = new TestScheduler();
-        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test, false);
+        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, false);
 
         Assert.assertFalse(buf.hasCompleted());
         Assert.assertFalse(buf.hasError());
 
-        List<Integer> values = new ArrayList<Integer>();
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         test.advanceTimeBy(1, TimeUnit.SECONDS);
@@ -835,8 +835,8 @@ public void timedAndSizedTruncationError() {
 
     @Test
     public void sizedTruncation() {
-        SizeBoundReplayBuffer<Integer> buf = new SizeBoundReplayBuffer<Integer>(2, false);
-        List<Integer> values = new ArrayList<Integer>();
+        SizeBoundReplayBuffer<Integer> buf = new SizeBoundReplayBuffer<>(2, false);
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         buf.next(2);
@@ -871,7 +871,7 @@ public void sizedTruncation() {
     public void coldReplayNoBackpressure() {
         Observable<Integer> source = Observable.range(0, 1000).replay().autoConnect();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         source.subscribe(to);
 
@@ -949,7 +949,7 @@ public void unsubscribeSource() throws Throwable {
 
     @Test
     public void take() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable<Integer> cached = Observable.range(1, 100).replay().autoConnect();
         cached.take(10).subscribe(to);
@@ -965,7 +965,7 @@ public void take() {
     public void async() {
         Observable<Integer> source = Observable.range(1, 10000);
         for (int i = 0; i < 100; i++) {
-            TestObserverEx<Integer> to1 = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to1 = new TestObserverEx<>();
 
             Observable<Integer> cached = source.replay().autoConnect();
 
@@ -976,7 +976,7 @@ public void async() {
             to1.assertTerminated();
             assertEquals(10000, to1.values().size());
 
-            TestObserverEx<Integer> to2 = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to2 = new TestObserverEx<>();
             cached.observeOn(Schedulers.computation()).subscribe(to2);
 
             to2.awaitDone(2, TimeUnit.SECONDS);
@@ -995,14 +995,14 @@ public void asyncComeAndGo() {
 
         Observable<Long> output = cached.observeOn(Schedulers.computation());
 
-        List<TestObserverEx<Long>> list = new ArrayList<TestObserverEx<Long>>(100);
+        List<TestObserverEx<Long>> list = new ArrayList<>(100);
         for (int i = 0; i < 100; i++) {
-            TestObserverEx<Long> to = new TestObserverEx<Long>();
+            TestObserverEx<Long> to = new TestObserverEx<>();
             list.add(to);
             output.skip(i * 10).take(10).subscribe(to);
         }
 
-        List<Long> expected = new ArrayList<Long>();
+        List<Long> expected = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
             expected.add((long)(i - 10));
         }
@@ -1036,7 +1036,7 @@ public void subscribe(Observer<? super Integer> t) {
             }
         });
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         firehose.replay().autoConnect().observeOn(Schedulers.computation()).takeLast(100).subscribe(to);
 
         to.awaitDone(3, TimeUnit.SECONDS);
@@ -1052,14 +1052,14 @@ public void valuesAndThenError() {
                 .concatWith(Observable.<Integer>error(new TestException()))
                 .replay().autoConnect();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         source.subscribe(to);
 
         to.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
         to.assertNotComplete();
         Assert.assertEquals(1, to.errors().size());
 
-        TestObserverEx<Integer> to2 = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to2 = new TestObserverEx<>();
         source.subscribe(to2);
 
         to2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
@@ -1130,8 +1130,8 @@ public void subscribeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableObservable<Integer> co = Observable.range(1, 3).replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
-            final TestObserver<Integer> to2 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
+            final TestObserver<Integer> to2 = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1156,8 +1156,8 @@ public void addRemoveRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableObservable<Integer> co = Observable.range(1, 3).replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
-            final TestObserver<Integer> to2 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
+            final TestObserver<Integer> to2 = new TestObserver<>();
 
             co.subscribe(to1);
 
@@ -1256,7 +1256,7 @@ public void subscribeOnNextRace() {
 
             final ConnectableObservable<Integer> co = ps.replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1285,7 +1285,7 @@ public void unsubscribeOnNextRace() {
 
             final ConnectableObservable<Integer> co = ps.replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
 
             co.subscribe(to1);
 
@@ -1314,7 +1314,7 @@ public void unsubscribeReplayRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableObservable<Integer> co = Observable.range(1, 1000).replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
 
             co.connect();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
index e55d5ff716..9b31f51e8d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
@@ -729,7 +729,7 @@ void truncate() {
         buf.addLast(new Node(4));
         buf.addLast(new Node(5));
 
-        List<Integer> values = new ArrayList<Integer>();
+        List<Integer> values = new ArrayList<>();
         buf.collect(values);
 
         Assert.assertEquals(Arrays.asList(1, 2, 3, 4, 5), values);
@@ -753,8 +753,8 @@ void truncate() {
     @Test
     public void timedAndSizedTruncation() {
         TestScheduler test = new TestScheduler();
-        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test, false);
-        List<Integer> values = new ArrayList<Integer>();
+        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, false);
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         test.advanceTimeBy(1, TimeUnit.SECONDS);
@@ -792,12 +792,12 @@ public void timedAndSizedTruncation() {
     @Test
     public void timedAndSizedTruncationError() {
         TestScheduler test = new TestScheduler();
-        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<Integer>(2, 2000, TimeUnit.MILLISECONDS, test, false);
+        SizeAndTimeBoundReplayBuffer<Integer> buf = new SizeAndTimeBoundReplayBuffer<>(2, 2000, TimeUnit.MILLISECONDS, test, false);
 
         Assert.assertFalse(buf.hasCompleted());
         Assert.assertFalse(buf.hasError());
 
-        List<Integer> values = new ArrayList<Integer>();
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         test.advanceTimeBy(1, TimeUnit.SECONDS);
@@ -835,8 +835,8 @@ public void timedAndSizedTruncationError() {
 
     @Test
     public void sizedTruncation() {
-        SizeBoundReplayBuffer<Integer> buf = new SizeBoundReplayBuffer<Integer>(2, false);
-        List<Integer> values = new ArrayList<Integer>();
+        SizeBoundReplayBuffer<Integer> buf = new SizeBoundReplayBuffer<>(2, false);
+        List<Integer> values = new ArrayList<>();
 
         buf.next(1);
         buf.next(2);
@@ -871,7 +871,7 @@ public void sizedTruncation() {
     public void coldReplayNoBackpressure() {
         Observable<Integer> source = Observable.range(0, 1000).replay().autoConnect();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         source.subscribe(to);
 
@@ -949,7 +949,7 @@ public void unsubscribeSource() throws Throwable {
 
     @Test
     public void take() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable<Integer> cached = Observable.range(1, 100).replay().autoConnect();
         cached.take(10).subscribe(to);
@@ -965,7 +965,7 @@ public void take() {
     public void async() {
         Observable<Integer> source = Observable.range(1, 10000);
         for (int i = 0; i < 100; i++) {
-            TestObserverEx<Integer> to1 = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to1 = new TestObserverEx<>();
 
             Observable<Integer> cached = source.replay().autoConnect();
 
@@ -976,7 +976,7 @@ public void async() {
             to1.assertTerminated();
             assertEquals(10000, to1.values().size());
 
-            TestObserverEx<Integer> to2 = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to2 = new TestObserverEx<>();
             cached.observeOn(Schedulers.computation()).subscribe(to2);
 
             to2.awaitDone(2, TimeUnit.SECONDS);
@@ -995,14 +995,14 @@ public void asyncComeAndGo() {
 
         Observable<Long> output = cached.observeOn(Schedulers.computation());
 
-        List<TestObserverEx<Long>> list = new ArrayList<TestObserverEx<Long>>(100);
+        List<TestObserverEx<Long>> list = new ArrayList<>(100);
         for (int i = 0; i < 100; i++) {
-            TestObserverEx<Long> to = new TestObserverEx<Long>();
+            TestObserverEx<Long> to = new TestObserverEx<>();
             list.add(to);
             output.skip(i * 10).take(10).subscribe(to);
         }
 
-        List<Long> expected = new ArrayList<Long>();
+        List<Long> expected = new ArrayList<>();
         for (int i = 0; i < 10; i++) {
             expected.add((long)(i - 10));
         }
@@ -1036,7 +1036,7 @@ public void subscribe(Observer<? super Integer> t) {
             }
         });
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         firehose.replay().autoConnect().observeOn(Schedulers.computation()).takeLast(100).subscribe(to);
 
         to.awaitDone(3, TimeUnit.SECONDS);
@@ -1052,14 +1052,14 @@ public void valuesAndThenError() {
                 .concatWith(Observable.<Integer>error(new TestException()))
                 .replay().autoConnect();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         source.subscribe(to);
 
         to.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
         to.assertNotComplete();
         Assert.assertEquals(1, to.errors().size());
 
-        TestObserverEx<Integer> to2 = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to2 = new TestObserverEx<>();
         source.subscribe(to2);
 
         to2.assertValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
@@ -1130,8 +1130,8 @@ public void subscribeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableObservable<Integer> co = Observable.range(1, 3).replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
-            final TestObserver<Integer> to2 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
+            final TestObserver<Integer> to2 = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1156,8 +1156,8 @@ public void addRemoveRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableObservable<Integer> co = Observable.range(1, 3).replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
-            final TestObserver<Integer> to2 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
+            final TestObserver<Integer> to2 = new TestObserver<>();
 
             co.subscribe(to1);
 
@@ -1256,7 +1256,7 @@ public void subscribeOnNextRace() {
 
             final ConnectableObservable<Integer> co = ps.replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -1285,7 +1285,7 @@ public void unsubscribeOnNextRace() {
 
             final ConnectableObservable<Integer> co = ps.replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
 
             co.subscribe(to1);
 
@@ -1314,7 +1314,7 @@ public void unsubscribeReplayRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final ConnectableObservable<Integer> co = Observable.range(1, 1000).replay();
 
-            final TestObserver<Integer> to1 = new TestObserver<Integer>();
+            final TestObserver<Integer> to1 = new TestObserver<>();
 
             co.connect();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
index d5a70e0e47..228725c0a0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
@@ -27,8 +27,8 @@ public class ObservableResourceWrapperTest extends RxJavaTest {
 
     @Test
     public void disposed() {
-        TestObserver<Object> to = new TestObserver<Object>();
-        ObserverResourceWrapper<Object> orw = new ObserverResourceWrapper<Object>(to);
+        TestObserver<Object> to = new TestObserver<>();
+        ObserverResourceWrapper<Object> orw = new ObserverResourceWrapper<>(to);
 
         Disposable d = Disposable.empty();
 
@@ -43,16 +43,16 @@ public void disposed() {
 
     @Test
     public void doubleOnSubscribe() {
-        TestObserver<Object> to = new TestObserver<Object>();
-        ObserverResourceWrapper<Object> orw = new ObserverResourceWrapper<Object>(to);
+        TestObserver<Object> to = new TestObserver<>();
+        ObserverResourceWrapper<Object> orw = new ObserverResourceWrapper<>(to);
 
         TestHelper.doubleOnSubscribe(orw);
     }
 
     @Test
     public void onErrorDisposes() {
-        TestObserver<Object> to = new TestObserver<Object>();
-        ObserverResourceWrapper<Object> orw = new ObserverResourceWrapper<Object>(to);
+        TestObserver<Object> to = new TestObserver<>();
+        ObserverResourceWrapper<Object> orw = new ObserverResourceWrapper<>(to);
 
         Disposable d = Disposable.empty();
         Disposable d1 = Disposable.empty();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
index 82d96dc5d7..381ee0a790 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
@@ -64,7 +64,7 @@ public void subscribe(Observer<? super String> t1) {
             }
 
         });
-        TestObserver<String> to = new TestObserver<String>(consumer);
+        TestObserver<String> to = new TestObserver<>(consumer);
         producer.retryWhen(new Function<Observable<? extends Throwable>, Observable<Object>>() {
 
             @Override
@@ -117,7 +117,7 @@ public void retryIndefinitely() {
         Observer<String> observer = TestHelper.mockObserver();
         int numRetries = 20;
         Observable<String> origin = Observable.unsafeCreate(new FuncWithErrors(numRetries));
-        origin.retry().subscribe(new TestObserver<String>(observer));
+        origin.retry().subscribe(new TestObserver<>(observer));
 
         InOrder inOrder = inOrder(observer);
         // should show 3 attempts
@@ -136,7 +136,7 @@ public void schedulingNotificationHandler() {
         Observer<String> observer = TestHelper.mockObserver();
         int numRetries = 2;
         Observable<String> origin = Observable.unsafeCreate(new FuncWithErrors(numRetries));
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         origin.retryWhen(new Function<Observable<? extends Throwable>, Observable<Object>>() {
             @Override
             public Observable<Object> apply(Observable<? extends Throwable> t1) {
@@ -205,7 +205,7 @@ public Integer apply(Throwable t1) {
     public void onCompletedFromNotificationHandler() {
         Observer<String> observer = TestHelper.mockObserver();
         Observable<String> origin = Observable.unsafeCreate(new FuncWithErrors(1));
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         origin.retryWhen(new Function<Observable<? extends Throwable>, Observable<?>>() {
             @Override
             public Observable<?> apply(Observable<? extends Throwable> t1) {
@@ -455,7 +455,7 @@ public void run() {
     public void sourceObservableCallsUnsubscribe() throws InterruptedException {
         final AtomicInteger subsCount = new AtomicInteger(0);
 
-        final TestObserver<String> to = new TestObserver<String>();
+        final TestObserver<String> to = new TestObserver<>();
 
         ObservableSource<String> onSubscribe = new ObservableSource<String>() {
             @Override
@@ -486,7 +486,7 @@ public void subscribe(Observer<? super String> observer) {
     public void sourceObservableRetry1() throws InterruptedException {
         final AtomicInteger subsCount = new AtomicInteger(0);
 
-        final TestObserver<String> to = new TestObserver<String>();
+        final TestObserver<String> to = new TestObserver<>();
 
         ObservableSource<String> onSubscribe = new ObservableSource<String>() {
             @Override
@@ -505,7 +505,7 @@ public void subscribe(Observer<? super String> observer) {
     public void sourceObservableRetry0() throws InterruptedException {
         final AtomicInteger subsCount = new AtomicInteger(0);
 
-        final TestObserver<String> to = new TestObserver<String>();
+        final TestObserver<String> to = new TestObserver<>();
 
         ObservableSource<String> onSubscribe = new ObservableSource<String>() {
             @Override
@@ -625,7 +625,7 @@ public void unsubscribeAfterError() {
         SlowObservable so = new SlowObservable(100, 0, "testUnsubscribeAfterError");
         Observable<Long> o = Observable.unsafeCreate(so).retry(5);
 
-        AsyncObserver<Long> async = new AsyncObserver<Long>(observer);
+        AsyncObserver<Long> async = new AsyncObserver<>(observer);
 
         o.subscribe(async);
 
@@ -649,7 +649,7 @@ public void timeoutWithRetry() {
         SlowObservable so = new SlowObservable(100, 10, "testTimeoutWithRetry");
         Observable<Long> o = Observable.unsafeCreate(so).timeout(80, TimeUnit.MILLISECONDS).retry(5);
 
-        AsyncObserver<Long> async = new AsyncObserver<Long>(observer);
+        AsyncObserver<Long> async = new AsyncObserver<>(observer);
 
         o.subscribe(async);
 
@@ -671,7 +671,7 @@ public void retryWithBackpressure() throws InterruptedException {
             for (int i = 0; i < 400; i++) {
                 Observer<String> observer = TestHelper.mockObserver();
                 Observable<String> origin = Observable.unsafeCreate(new FuncWithErrors(NUM_RETRIES));
-                TestObserver<String> to = new TestObserver<String>(observer);
+                TestObserver<String> to = new TestObserver<>(observer);
                 origin.retry().observeOn(Schedulers.computation()).subscribe(to);
                 to.awaitDone(5, TimeUnit.SECONDS);
 
@@ -702,7 +702,7 @@ public void retryWithBackpressureParallel() throws InterruptedException {
                 }
 
                 final AtomicInteger timeouts = new AtomicInteger();
-                final Map<Integer, List<String>> data = new ConcurrentHashMap<Integer, List<String>>();
+                final Map<Integer, List<String>> data = new ConcurrentHashMap<>();
 
                 int m = 5000;
                 final CountDownLatch cdl = new CountDownLatch(m);
@@ -714,11 +714,11 @@ public void run() {
                             final AtomicInteger nexts = new AtomicInteger();
                             try {
                                 Observable<String> origin = Observable.unsafeCreate(new FuncWithErrors(NUM_RETRIES));
-                                TestObserverEx<String> to = new TestObserverEx<String>();
+                                TestObserverEx<String> to = new TestObserverEx<>();
                                 origin.retry()
                                 .observeOn(Schedulers.computation()).subscribe(to);
                                 to.awaitDone(2500, TimeUnit.MILLISECONDS);
-                                List<String> onNextEvents = new ArrayList<String>(to.values());
+                                List<String> onNextEvents = new ArrayList<>(to.values());
                                 if (onNextEvents.size() != NUM_RETRIES + 2) {
                                     for (Throwable t : to.errors()) {
                                         onNextEvents.add(t.toString());
@@ -816,7 +816,7 @@ public Observable<String> apply(GroupedObservable<String, String> t1) {
                 return t1.take(1);
             }
         })
-        .subscribe(new TestObserver<String>(observer));
+        .subscribe(new TestObserver<>(observer));
 
         InOrder inOrder = inOrder(observer);
         // should show 3 attempts
@@ -861,7 +861,7 @@ public Observable<String> apply(GroupedObservable<String, String> t1) {
                 return t1.take(1);
             }
         })
-        .subscribe(new TestObserver<String>(observer));
+        .subscribe(new TestObserver<>(observer));
 
         InOrder inOrder = inOrder(observer);
         // should show 3 attempts
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
index d7d20c1347..3b57f6c2e1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
@@ -235,7 +235,7 @@ public void unsubscribeAfterError() {
                 .unsafeCreate(so)
                 .retry(retry5);
 
-        ObservableRetryTest.AsyncObserver<Long> async = new ObservableRetryTest.AsyncObserver<Long>(observer);
+        ObservableRetryTest.AsyncObserver<Long> async = new ObservableRetryTest.AsyncObserver<>(observer);
 
         o.subscribe(async);
 
@@ -262,7 +262,7 @@ public void timeoutWithRetry() {
                 .timeout(80, TimeUnit.MILLISECONDS)
                 .retry(retry5);
 
-        ObservableRetryTest.AsyncObserver<Long> async = new ObservableRetryTest.AsyncObserver<Long>(observer);
+        ObservableRetryTest.AsyncObserver<Long> async = new ObservableRetryTest.AsyncObserver<>(observer);
 
         o.subscribe(async);
 
@@ -278,7 +278,7 @@ public void timeoutWithRetry() {
 
     @Test
     public void issue2826() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         final RuntimeException e = new RuntimeException("You shall not pass");
         final AtomicInteger c = new AtomicInteger();
         Observable.just(1).map(new Function<Integer, Integer>() {
@@ -312,7 +312,7 @@ public Integer apply(Integer t1) {
 
     @Test
     public void issue3008RetryWithPredicate() {
-        final List<Long> list = new CopyOnWriteArrayList<Long>();
+        final List<Long> list = new CopyOnWriteArrayList<>();
         final AtomicBoolean isFirst = new AtomicBoolean(true);
         Observable.<Long> just(1L, 2L, 3L).map(new Function<Long, Long>() {
             @Override
@@ -340,7 +340,7 @@ public void accept(Long t) {
 
     @Test
     public void issue3008RetryInfinite() {
-        final List<Long> list = new CopyOnWriteArrayList<Long>();
+        final List<Long> list = new CopyOnWriteArrayList<>();
         final AtomicBoolean isFirst = new AtomicBoolean(true);
         Observable.<Long> just(1L, 2L, 3L).map(new Function<Long, Long>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
index 13b01e6888..bffd568b70 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
@@ -59,7 +59,7 @@ public Integer get() throws Exception {
     static final class OneCallablePublisher implements ObservableSource<Integer>, Supplier<Integer> {
         @Override
         public void subscribe(Observer<? super Integer> observer) {
-            ScalarDisposable<Integer> sd = new ScalarDisposable<Integer>(observer, 1);
+            ScalarDisposable<Integer> sd = new ScalarDisposable<>(observer, 1);
             observer.onSubscribe(sd);
             sd.run();
         }
@@ -72,7 +72,7 @@ public Integer get() throws Exception {
 
     @Test
     public void tryScalarXMap() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         assertTrue(ObservableScalarXMap.tryScalarXMapSubscribe(new CallablePublisher(), to, new Function<Integer, ObservableSource<Integer>>() {
             @Override
             public ObservableSource<Integer> apply(Integer f) throws Exception {
@@ -85,7 +85,7 @@ public ObservableSource<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void emptyXMap() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         assertTrue(ObservableScalarXMap.tryScalarXMapSubscribe(new EmptyCallablePublisher(), to, new Function<Integer, ObservableSource<Integer>>() {
             @Override
@@ -99,7 +99,7 @@ public ObservableSource<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void mapperCrashes() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         assertTrue(ObservableScalarXMap.tryScalarXMapSubscribe(new OneCallablePublisher(), to, new Function<Integer, ObservableSource<Integer>>() {
             @Override
@@ -113,7 +113,7 @@ public ObservableSource<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void mapperToJust() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         assertTrue(ObservableScalarXMap.tryScalarXMapSubscribe(new OneCallablePublisher(), to, new Function<Integer, ObservableSource<Integer>>() {
             @Override
@@ -127,7 +127,7 @@ public ObservableSource<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void mapperToEmpty() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         assertTrue(ObservableScalarXMap.tryScalarXMapSubscribe(new OneCallablePublisher(), to, new Function<Integer, ObservableSource<Integer>>() {
             @Override
@@ -141,7 +141,7 @@ public ObservableSource<Integer> apply(Integer f) throws Exception {
 
     @Test
     public void mapperToCrashingCallable() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         assertTrue(ObservableScalarXMap.tryScalarXMapSubscribe(new OneCallablePublisher(), to, new Function<Integer, ObservableSource<Integer>>() {
             @Override
@@ -179,8 +179,8 @@ public ObservableSource<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void scalarDisposableStateCheck() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
-        ScalarDisposable<Integer> sd = new ScalarDisposable<Integer>(to, 1);
+        TestObserver<Integer> to = new TestObserver<>();
+        ScalarDisposable<Integer> sd = new ScalarDisposable<>(to, 1);
         to.onSubscribe(sd);
 
         assertFalse(sd.isDisposed());
@@ -213,8 +213,8 @@ public void scalarDisposableStateCheck() {
     @Test
     public void scalarDisposableRunDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestObserver<Integer> to = new TestObserver<Integer>();
-            final ScalarDisposable<Integer> sd = new ScalarDisposable<Integer>(to, 1);
+            TestObserver<Integer> to = new TestObserver<>();
+            final ScalarDisposable<Integer> sd = new ScalarDisposable<>(to, 1);
             to.onSubscribe(sd);
 
             Runnable r1 = new Runnable() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
index 590273ce60..c482d121be 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
@@ -114,7 +114,7 @@ public Integer apply(Integer t1, Integer t2) {
 
     @Test
     public void shouldNotEmitUntilAfterSubscription() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(1, 100).scan(0, new BiFunction<Integer, Integer, Integer>() {
 
             @Override
@@ -181,7 +181,7 @@ public void seedFactory() {
 
                     @Override
                     public List<Integer> get() {
-                        return new ArrayList<Integer>();
+                        return new ArrayList<>();
                     }
 
                 }, new BiConsumer<List<Integer>, Integer>() {
@@ -208,7 +208,7 @@ public Integer apply(Integer t1, Integer t2) {
 
         }).take(1);
 
-        TestObserverEx<Integer> observer = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> observer = new TestObserverEx<>();
 
         o.subscribe(observer);
         observer.assertValue(0);
@@ -220,7 +220,7 @@ public Integer apply(Integer t1, Integer t2) {
     public void initialValueEmittedNoProducer() {
         PublishSubject<Integer> source = PublishSubject.create();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         source.scan(0, new BiFunction<Integer, Integer, Integer>() {
             @Override
@@ -310,7 +310,7 @@ public Object apply(Object a, Object b) throws Exception {
     public void scanFunctionThrowsAndUpstreamErrorsDoesNotResultInTwoTerminalEvents() {
         final RuntimeException err = new RuntimeException();
         final RuntimeException err2 = new RuntimeException();
-        final List<Throwable> list = new CopyOnWriteArrayList<Throwable>();
+        final List<Throwable> list = new CopyOnWriteArrayList<>();
         final Consumer<Throwable> errorConsumer = new Consumer<Throwable>() {
             @Override
             public void accept(Throwable t) throws Exception {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java
index 4c7faeaf3e..2290c645ca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java
@@ -465,7 +465,7 @@ public Integer apply(Integer i1, Integer i2) {
     @Test
     public void singleElementOperatorDoNotSwallowExceptionWhenDone() {
         final Throwable exception = new RuntimeException("some error");
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         try {
             RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
index 7b87b3e329..8edf026fe1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
@@ -84,7 +84,7 @@ public void skipLastWithZeroCount() {
     @Test
     public void skipLastWithBackpressure() {
         Observable<Integer> o = Observable.range(0, Flowable.bufferSize() * 2).skipLast(Flowable.bufferSize() + 10);
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         o.observeOn(Schedulers.computation()).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
         to.assertNoErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
index d122e23399..fbd5572246 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
@@ -138,7 +138,7 @@ public void skipError() {
 
     @Test
     public void requestOverflowDoesNotOccur() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.range(1, 10).skip(5).subscribe(to);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
index 26ffe95a71..53ccf2b3a6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
@@ -36,7 +36,7 @@ public void issue813() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
         final CountDownLatch doneLatch = new CountDownLatch(1);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable
         .unsafeCreate(new ObservableSource<Integer>() {
@@ -74,7 +74,7 @@ public void subscribe(
 
     @Test
     public void onError() {
-        TestObserverEx<String> to = new TestObserverEx<String>();
+        TestObserverEx<String> to = new TestObserverEx<>();
         Observable.unsafeCreate(new ObservableSource<String>() {
 
             @Override
@@ -147,7 +147,7 @@ public Disposable schedule(@NonNull final Runnable action, final long delayTime,
 
     @Test
     public void unsubscribeInfiniteStream() throws InterruptedException {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         final AtomicInteger count = new AtomicInteger();
         Observable.unsafeCreate(new ObservableSource<Integer>() {
 
@@ -174,7 +174,7 @@ public void subscribe(Observer<? super Integer> sub) {
     public void cancelBeforeActualSubscribe() {
         TestScheduler test = new TestScheduler();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.just(1).hide()
                 .subscribeOn(test).subscribe(to);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
index 5eb40104fc..88f43e7452 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
@@ -995,7 +995,7 @@ public void outerInnerErrorRaceIgnoreDispose() {
             List<Throwable> errors = TestHelper.trackPluginErrors();
             try {
 
-                final AtomicReference<Observer<? super Integer>> obs1 = new AtomicReference<Observer<? super Integer>>();
+                final AtomicReference<Observer<? super Integer>> obs1 = new AtomicReference<>();
                 final Observable<Integer> ps1 = new Observable<Integer>() {
                     @Override
                     protected void subscribeActual(
@@ -1003,7 +1003,7 @@ protected void subscribeActual(
                         obs1.set(observer);
                     }
                 };
-                final AtomicReference<Observer<? super Integer>> obs2 = new AtomicReference<Observer<? super Integer>>();
+                final AtomicReference<Observer<? super Integer>> obs2 = new AtomicReference<>();
                 final Observable<Integer> ps2 = new Observable<Integer>() {
                     @Override
                     protected void subscribeActual(
@@ -1203,7 +1203,7 @@ public Object apply(Integer w) throws Exception {
     public void undeliverableUponCancel() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+            final TestObserverEx<Integer> to = new TestObserverEx<>();
 
             Observable.just(1)
             .map(new Function<Integer, Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java
index 63161e7fb8..92536eb95e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java
@@ -28,7 +28,7 @@ public class ObservableTakeLastOneTest extends RxJavaTest {
 
     @Test
     public void lastOfManyReturnsLast() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         Observable.range(1, 10).takeLast(1).subscribe(to);
         to.assertValue(10);
         to.assertNoErrors();
@@ -37,7 +37,7 @@ public void lastOfManyReturnsLast() {
 
     @Test
     public void lastOfEmptyReturnsEmpty() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         Observable.empty().takeLast(1).subscribe(to);
         to.assertNoValues();
         to.assertNoErrors();
@@ -46,7 +46,7 @@ public void lastOfEmptyReturnsEmpty() {
 
     @Test
     public void lastOfOneReturnsLast() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         Observable.just(1).takeLast(1).subscribe(to);
         to.assertValue(1);
         to.assertNoErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
index 90429038e6..2aa9e37985 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
@@ -90,7 +90,7 @@ public void takeLastWithNegativeCount() {
 
     @Test
     public void backpressure1() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(1, 100000).takeLast(1)
         .observeOn(Schedulers.newThread())
         .map(newSlowProcessor()).subscribe(to);
@@ -101,7 +101,7 @@ public void backpressure1() {
 
     @Test
     public void backpressure2() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.range(1, 100000).takeLast(Flowable.bufferSize() * 4)
         .observeOn(Schedulers.newThread()).map(newSlowProcessor()).subscribe(to);
         to.awaitDone(5, TimeUnit.SECONDS);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
index 2225f3022b..f83fb8595d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
@@ -257,7 +257,7 @@ public void subscribe(Observer<? super Long> op) {
     @Test
     public void takeObserveOn() {
         Observer<Object> o = TestHelper.mockObserver();
-        TestObserver<Object> to = new TestObserver<Object>(o);
+        TestObserver<Object> to = new TestObserver<>(o);
 
         INFINITE_OBSERVABLE
         .observeOn(Schedulers.newThread()).take(1).subscribe(to);
@@ -272,7 +272,7 @@ public void takeObserveOn() {
 
     @Test
     public void interrupt() throws InterruptedException {
-        final AtomicReference<Object> exception = new AtomicReference<Object>();
+        final AtomicReference<Object> exception = new AtomicReference<>();
         final CountDownLatch latch = new CountDownLatch(1);
         Observable.just(1).subscribeOn(Schedulers.computation()).take(1)
         .subscribe(new Consumer<Integer>() {
@@ -317,7 +317,7 @@ public void onNext(Integer t) {
     public void reentrantTake() {
         final PublishSubject<Integer> source = PublishSubject.create();
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         source.take(1).doOnNext(new Consumer<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
index 9566d64c9a..143fe9d3ca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
@@ -141,7 +141,7 @@ public boolean test(Integer v) {
 
     @Test
     public void errorIncludesLastValueAsCause() {
-        TestObserverEx<String> to = new TestObserverEx<String>();
+        TestObserverEx<String> to = new TestObserverEx<>();
         final TestException e = new TestException("Forced failure");
         Predicate<String> predicate = (new Predicate<String>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java
index 790af0c882..5e831b03b3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java
@@ -190,7 +190,7 @@ public void untilFires() {
         PublishSubject<Integer> source = PublishSubject.create();
         PublishSubject<Integer> until = PublishSubject.create();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         source.takeUntil(until).subscribe(to);
 
@@ -217,7 +217,7 @@ public void mainCompletes() {
         PublishSubject<Integer> source = PublishSubject.create();
         PublishSubject<Integer> until = PublishSubject.create();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         source.takeUntil(until).subscribe(to);
 
@@ -242,7 +242,7 @@ public void downstreamUnsubscribes() {
         PublishSubject<Integer> source = PublishSubject.create();
         PublishSubject<Integer> until = PublishSubject.create();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         source.takeUntil(until).take(1).subscribe(to);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
index b348cda2ce..134e1f93f6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
@@ -223,7 +223,7 @@ public boolean test(Integer t1) {
                 return t1 < 2;
             }
         });
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         source.subscribe(to);
 
@@ -236,7 +236,7 @@ public boolean test(Integer t1) {
 
     @Test
     public void errorCauseIncludesLastValue() {
-        TestObserverEx<String> to = new TestObserverEx<String>();
+        TestObserverEx<String> to = new TestObserverEx<>();
         Observable.just("abc").takeWhile(new Predicate<String>() {
             @Override
             public boolean test(String t1) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
index 7eecc75fb5..3b849ab978 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
@@ -60,11 +60,11 @@ public void timeInterval() {
         subject.onComplete();
 
         inOrder.verify(observer, times(1)).onNext(
-                new Timed<Integer>(1, 1000, TIME_UNIT));
+                new Timed<>(1, 1000, TIME_UNIT));
         inOrder.verify(observer, times(1)).onNext(
-                new Timed<Integer>(2, 2000, TIME_UNIT));
+                new Timed<>(2, 2000, TIME_UNIT));
         inOrder.verify(observer, times(1)).onNext(
-                new Timed<Integer>(3, 3000, TIME_UNIT));
+                new Timed<>(3, 3000, TIME_UNIT));
         inOrder.verify(observer, times(1)).onComplete();
         inOrder.verifyNoMoreInteractions();
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
index f0001ab276..fe7b2cd370 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
@@ -51,7 +51,7 @@ public void setUp() {
     @Test
     public void shouldNotTimeoutIfOnNextWithinTimeout() {
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
 
         withTimeout.subscribe(to);
 
@@ -66,7 +66,7 @@ public void shouldNotTimeoutIfOnNextWithinTimeout() {
     @Test
     public void shouldNotTimeoutIfSecondOnNextWithinTimeout() {
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
 
         withTimeout.subscribe(to);
 
@@ -82,7 +82,7 @@ public void shouldNotTimeoutIfSecondOnNextWithinTimeout() {
 
     @Test
     public void shouldTimeoutIfOnNextNotWithinTimeout() {
-        TestObserverEx<String> observer = new TestObserverEx<String>();
+        TestObserverEx<String> observer = new TestObserverEx<>();
 
         withTimeout.subscribe(observer);
 
@@ -92,7 +92,7 @@ public void shouldTimeoutIfOnNextNotWithinTimeout() {
 
     @Test
     public void shouldTimeoutIfSecondOnNextNotWithinTimeout() {
-        TestObserverEx<String> observer = new TestObserverEx<String>();
+        TestObserverEx<String> observer = new TestObserverEx<>();
         withTimeout.subscribe(observer);
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
         underlyingSubject.onNext("One");
@@ -104,7 +104,7 @@ public void shouldTimeoutIfSecondOnNextNotWithinTimeout() {
     @Test
     public void shouldCompleteIfUnderlyingComletes() {
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         withTimeout.subscribe(observer);
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
         underlyingSubject.onComplete();
@@ -117,7 +117,7 @@ public void shouldCompleteIfUnderlyingComletes() {
     @Test
     public void shouldErrorIfUnderlyingErrors() {
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         withTimeout.subscribe(observer);
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
         underlyingSubject.onError(new UnsupportedOperationException());
@@ -132,7 +132,7 @@ public void shouldSwitchToOtherIfOnNextNotWithinTimeout() {
         Observable<String> source = underlyingSubject.timeout(TIMEOUT, TIME_UNIT, testScheduler, other);
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         source.subscribe(to);
 
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
@@ -155,7 +155,7 @@ public void shouldSwitchToOtherIfOnErrorNotWithinTimeout() {
         Observable<String> source = underlyingSubject.timeout(TIMEOUT, TIME_UNIT, testScheduler, other);
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         source.subscribe(to);
 
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
@@ -178,7 +178,7 @@ public void shouldSwitchToOtherIfOnCompletedNotWithinTimeout() {
         Observable<String> source = underlyingSubject.timeout(TIMEOUT, TIME_UNIT, testScheduler, other);
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         source.subscribe(to);
 
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
@@ -201,7 +201,7 @@ public void shouldSwitchToOtherAndCanBeUnsubscribedIfOnNextNotWithinTimeout() {
         Observable<String> source = underlyingSubject.timeout(TIMEOUT, TIME_UNIT, testScheduler, other);
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         source.subscribe(to);
 
         testScheduler.advanceTimeBy(2, TimeUnit.SECONDS);
@@ -231,7 +231,7 @@ public void shouldTimeoutIfSynchronizedObservableEmitFirstOnNextNotWithinTimeout
         final CountDownLatch exit = new CountDownLatch(1);
         final CountDownLatch timeoutSetuped = new CountDownLatch(1);
 
-        final TestObserverEx<String> observer = new TestObserverEx<String>();
+        final TestObserverEx<String> observer = new TestObserverEx<>();
 
         new Thread(new Runnable() {
 
@@ -280,7 +280,7 @@ public void subscribe(Observer<? super String> observer) {
         TestScheduler testScheduler = new TestScheduler();
         Observable<String> observableWithTimeout = never.timeout(1000, TimeUnit.MILLISECONDS, testScheduler);
 
-        TestObserverEx<String> observer = new TestObserverEx<String>();
+        TestObserverEx<String> observer = new TestObserverEx<>();
         observableWithTimeout.subscribe(observer);
 
         testScheduler.advanceTimeBy(2000, TimeUnit.MILLISECONDS);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
index 9e6540e0b3..60cb5a8b92 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
@@ -329,7 +329,7 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
 
         }).when(o).onComplete();
 
-        final TestObserver<Integer> to = new TestObserver<Integer>(o);
+        final TestObserver<Integer> to = new TestObserver<>(o);
 
         new Thread(new Runnable() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
index d77ee456db..8eddbce491 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
@@ -64,7 +64,7 @@ public void timerOnce() {
 
     @Test
     public void timerPeriodically() {
-        TestObserver<Long> to = new TestObserver<Long>();
+        TestObserver<Long> to = new TestObserver<>();
 
         Observable.interval(100, 100, TimeUnit.MILLISECONDS, scheduler).subscribe(to);
 
@@ -92,7 +92,7 @@ public void timerPeriodically() {
     @Test
     public void interval() {
         Observable<Long> w = Observable.interval(1, TimeUnit.SECONDS, scheduler);
-        TestObserver<Long> to = new TestObserver<Long>();
+        TestObserver<Long> to = new TestObserver<>();
         w.subscribe(to);
 
         to.assertNoValues();
@@ -117,8 +117,8 @@ public void interval() {
     public void withMultipleSubscribersStartingAtSameTime() {
         Observable<Long> w = Observable.interval(1, TimeUnit.SECONDS, scheduler);
 
-        TestObserver<Long> to1 = new TestObserver<Long>();
-        TestObserver<Long> to2 = new TestObserver<Long>();
+        TestObserver<Long> to1 = new TestObserver<>();
+        TestObserver<Long> to2 = new TestObserver<>();
 
         w.subscribe(to1);
         w.subscribe(to2);
@@ -154,7 +154,7 @@ public void withMultipleSubscribersStartingAtSameTime() {
     public void withMultipleStaggeredSubscribers() {
         Observable<Long> w = Observable.interval(1, TimeUnit.SECONDS, scheduler);
 
-        TestObserver<Long> to1 = new TestObserver<Long>();
+        TestObserver<Long> to1 = new TestObserver<>();
 
         w.subscribe(to1);
 
@@ -162,7 +162,7 @@ public void withMultipleStaggeredSubscribers() {
 
         scheduler.advanceTimeTo(2, TimeUnit.SECONDS);
 
-        TestObserver<Long> to2 = new TestObserver<Long>();
+        TestObserver<Long> to2 = new TestObserver<>();
 
         w.subscribe(to2);
 
@@ -194,7 +194,7 @@ public void withMultipleStaggeredSubscribers() {
     public void withMultipleStaggeredSubscribersAndPublish() {
         ConnectableObservable<Long> w = Observable.interval(1, TimeUnit.SECONDS, scheduler).publish();
 
-        TestObserver<Long> to1 = new TestObserver<Long>();
+        TestObserver<Long> to1 = new TestObserver<>();
 
         w.subscribe(to1);
         w.connect();
@@ -203,7 +203,7 @@ public void withMultipleStaggeredSubscribersAndPublish() {
 
         scheduler.advanceTimeTo(2, TimeUnit.SECONDS);
 
-        TestObserver<Long> to2 = new TestObserver<Long>();
+        TestObserver<Long> to2 = new TestObserver<>();
         w.subscribe(to2);
 
         to1.assertValues(0L, 1L);
@@ -348,7 +348,7 @@ public Long apply(Long v) throws Exception {
 
     @Test
     public void cancelledAndRun() {
-        TestObserver<Long> to = new TestObserver<Long>();
+        TestObserver<Long> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
         TimerObserver tm = new TimerObserver(to);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java
index 7148a44a4a..597333ea66 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java
@@ -52,9 +52,9 @@ public void timestampWithScheduler() {
 
         InOrder inOrder = inOrder(observer);
 
-        inOrder.verify(observer, times(1)).onNext(new Timed<Integer>(1, 0, TimeUnit.MILLISECONDS));
-        inOrder.verify(observer, times(1)).onNext(new Timed<Integer>(2, 100, TimeUnit.MILLISECONDS));
-        inOrder.verify(observer, times(1)).onNext(new Timed<Integer>(3, 200, TimeUnit.MILLISECONDS));
+        inOrder.verify(observer, times(1)).onNext(new Timed<>(1, 0, TimeUnit.MILLISECONDS));
+        inOrder.verify(observer, times(1)).onNext(new Timed<>(2, 100, TimeUnit.MILLISECONDS));
+        inOrder.verify(observer, times(1)).onNext(new Timed<>(3, 200, TimeUnit.MILLISECONDS));
 
         verify(observer, never()).onError(any(Throwable.class));
         verify(observer, never()).onComplete();
@@ -76,9 +76,9 @@ public void timestampWithScheduler2() {
 
         InOrder inOrder = inOrder(observer);
 
-        inOrder.verify(observer, times(1)).onNext(new Timed<Integer>(1, 0, TimeUnit.MILLISECONDS));
-        inOrder.verify(observer, times(1)).onNext(new Timed<Integer>(2, 0, TimeUnit.MILLISECONDS));
-        inOrder.verify(observer, times(1)).onNext(new Timed<Integer>(3, 200, TimeUnit.MILLISECONDS));
+        inOrder.verify(observer, times(1)).onNext(new Timed<>(1, 0, TimeUnit.MILLISECONDS));
+        inOrder.verify(observer, times(1)).onNext(new Timed<>(2, 0, TimeUnit.MILLISECONDS));
+        inOrder.verify(observer, times(1)).onNext(new Timed<>(3, 200, TimeUnit.MILLISECONDS));
 
         verify(observer, never()).onError(any(Throwable.class));
         verify(observer, never()).onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
index 481fd8ae65..164d7f6fd6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
@@ -37,7 +37,7 @@ public void success() throws Exception {
 
         Observer<Object> o = TestHelper.mockObserver();
 
-        TestObserver<Object> to = new TestObserver<Object>(o);
+        TestObserver<Object> to = new TestObserver<>(o);
 
         Observable.fromFuture(future).subscribe(to);
 
@@ -59,7 +59,7 @@ public void successOperatesOnSuppliedScheduler() throws Exception {
         Observer<Object> o = TestHelper.mockObserver();
 
         TestScheduler scheduler = new TestScheduler();
-        TestObserver<Object> to = new TestObserver<Object>(o);
+        TestObserver<Object> to = new TestObserver<>(o);
 
         Observable.fromFuture(future, scheduler).subscribe(to);
 
@@ -79,7 +79,7 @@ public void failure() throws Exception {
 
         Observer<Object> o = TestHelper.mockObserver();
 
-        TestObserver<Object> to = new TestObserver<Object>(o);
+        TestObserver<Object> to = new TestObserver<>(o);
 
         Observable.fromFuture(future).subscribe(to);
 
@@ -100,7 +100,7 @@ public void cancelledBeforeSubscribe() throws Exception {
 
         Observer<Object> o = TestHelper.mockObserver();
 
-        TestObserver<Object> to = new TestObserver<Object>(o);
+        TestObserver<Object> to = new TestObserver<>(o);
         to.dispose();
 
         Observable.fromFuture(future).subscribe(to);
@@ -146,7 +146,7 @@ public Object get(long timeout, TimeUnit unit) throws InterruptedException, Exec
 
         Observer<Object> o = TestHelper.mockObserver();
 
-        TestObserver<Object> to = new TestObserver<Object>(o);
+        TestObserver<Object> to = new TestObserver<>(o);
         Observable<Object> futureObservable = Observable.fromFuture(future);
 
         futureObservable.subscribeOn(Schedulers.computation()).subscribe(to);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java
index 25136fcd9d..8838ff4b5a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java
@@ -55,7 +55,7 @@ public void toMapObservable() {
 
         Observable<Map<Integer, String>> mapped = source.toMap(lengthFunc).toObservable();
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "a");
         expected.put(2, "bb");
         expected.put(3, "ccc");
@@ -74,7 +74,7 @@ public void toMapWithValueSelectorObservable() {
 
         Observable<Map<Integer, String>> mapped = source.toMap(lengthFunc, duplicate).toObservable();
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "aa");
         expected.put(2, "bbbb");
         expected.put(3, "cccccc");
@@ -102,7 +102,7 @@ public Integer apply(String t1) {
         };
         Observable<Map<Integer, String>> mapped = source.toMap(lengthFuncErr).toObservable();
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "a");
         expected.put(2, "bb");
         expected.put(3, "ccc");
@@ -132,7 +132,7 @@ public String apply(String t1) {
 
         Observable<Map<Integer, String>> mapped = source.toMap(lengthFunc, duplicateErr).toObservable();
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "aa");
         expected.put(2, "bbbb");
         expected.put(3, "cccccc");
@@ -178,7 +178,7 @@ public String apply(String v) {
             }
         }, mapFactory).toObservable();
 
-        Map<Integer, String> expected = new LinkedHashMap<Integer, String>();
+        Map<Integer, String> expected = new LinkedHashMap<>();
         expected.put(2, "bb");
         expected.put(3, "ccc");
         expected.put(4, "dddd");
@@ -214,7 +214,7 @@ public String apply(String v) {
             }
         }, mapFactory).toObservable();
 
-        Map<Integer, String> expected = new LinkedHashMap<Integer, String>();
+        Map<Integer, String> expected = new LinkedHashMap<>();
         expected.put(2, "bb");
         expected.put(3, "ccc");
         expected.put(4, "dddd");
@@ -232,7 +232,7 @@ public void toMap() {
 
         Single<Map<Integer, String>> mapped = source.toMap(lengthFunc);
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "a");
         expected.put(2, "bb");
         expected.put(3, "ccc");
@@ -250,7 +250,7 @@ public void toMapWithValueSelector() {
 
         Single<Map<Integer, String>> mapped = source.toMap(lengthFunc, duplicate);
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "aa");
         expected.put(2, "bbbb");
         expected.put(3, "cccccc");
@@ -277,7 +277,7 @@ public Integer apply(String t1) {
         };
         Single<Map<Integer, String>> mapped = source.toMap(lengthFuncErr);
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "a");
         expected.put(2, "bb");
         expected.put(3, "ccc");
@@ -306,7 +306,7 @@ public String apply(String t1) {
 
         Single<Map<Integer, String>> mapped = source.toMap(lengthFunc, duplicateErr);
 
-        Map<Integer, String> expected = new HashMap<Integer, String>();
+        Map<Integer, String> expected = new HashMap<>();
         expected.put(1, "aa");
         expected.put(2, "bbbb");
         expected.put(3, "cccccc");
@@ -351,7 +351,7 @@ public String apply(String v) {
             }
         }, mapFactory);
 
-        Map<Integer, String> expected = new LinkedHashMap<Integer, String>();
+        Map<Integer, String> expected = new LinkedHashMap<>();
         expected.put(2, "bb");
         expected.put(3, "ccc");
         expected.put(4, "dddd");
@@ -386,7 +386,7 @@ public String apply(String v) {
             }
         }, mapFactory);
 
-        Map<Integer, String> expected = new LinkedHashMap<Integer, String>();
+        Map<Integer, String> expected = new LinkedHashMap<>();
         expected.put(2, "bb");
         expected.put(3, "ccc");
         expected.put(4, "dddd");
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java
index ef7f0feec4..0853b0acad 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java
@@ -55,7 +55,7 @@ public void toMultimapObservable() {
 
         Observable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc).toObservable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("a", "b"));
         expected.put(2, Arrays.asList("cc", "dd"));
 
@@ -72,7 +72,7 @@ public void toMultimapWithValueSelectorObservable() {
 
         Observable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc, duplicate).toObservable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("aa", "bb"));
         expected.put(2, Arrays.asList("cccc", "dddd"));
 
@@ -114,11 +114,11 @@ public String apply(String v) {
                 mapFactory, new Function<Integer, Collection<String>>() {
                     @Override
                     public Collection<String> apply(Integer v) {
-                        return new ArrayList<String>();
+                        return new ArrayList<>();
                     }
                 }).toObservable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Arrays.asList("eee", "fff"));
 
@@ -137,9 +137,9 @@ public void toMultimapWithCollectionFactoryObservable() {
             @Override
             public Collection<String> apply(Integer t1) {
                 if (t1 == 2) {
-                    return new ArrayList<String>();
+                    return new ArrayList<>();
                 } else {
-                    return new HashSet<String>();
+                    return new HashSet<>();
                 }
             }
         };
@@ -153,16 +153,16 @@ public String apply(String v) {
         Supplier<Map<Integer, Collection<String>>> mapSupplier = new Supplier<Map<Integer, Collection<String>>>() {
             @Override
             public Map<Integer, Collection<String>> get() {
-                return new HashMap<Integer, Collection<String>>();
+                return new HashMap<>();
             }
         };
 
         Observable<Map<Integer, Collection<String>>> mapped = source
                 .toMultimap(lengthFunc, identity, mapSupplier, collectionFactory).toObservable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
-        expected.put(3, new HashSet<String>(Arrays.asList("eee")));
+        expected.put(3, new HashSet<>(Arrays.asList("eee")));
 
         mapped.subscribe(objectObserver);
 
@@ -187,7 +187,7 @@ public Integer apply(String t1) {
 
         Observable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFuncErr).toObservable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("a", "b"));
         expected.put(2, Arrays.asList("cc", "dd"));
 
@@ -214,7 +214,7 @@ public String apply(String t1) {
 
         Observable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc, duplicateErr).toObservable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("aa", "bb"));
         expected.put(2, Arrays.asList("cccc", "dddd"));
 
@@ -244,7 +244,7 @@ public String apply(String v) {
                     }
                 }, mapFactory).toObservable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Arrays.asList("eee", "fff"));
 
@@ -265,7 +265,7 @@ public Collection<String> apply(Integer t1) {
                 if (t1 == 2) {
                     throw new RuntimeException("Forced failure");
                 } else {
-                    return new HashSet<String>();
+                    return new HashSet<>();
                 }
             }
         };
@@ -279,14 +279,14 @@ public String apply(String v) {
         Supplier<Map<Integer, Collection<String>>> mapSupplier = new Supplier<Map<Integer, Collection<String>>>() {
             @Override
             public Map<Integer, Collection<String>> get() {
-                return new HashMap<Integer, Collection<String>>();
+                return new HashMap<>();
             }
         };
 
         Observable<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc,
                 identity, mapSupplier, collectionFactory).toObservable();
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Collections.singleton("eee"));
 
@@ -303,7 +303,7 @@ public void toMultimap() {
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("a", "b"));
         expected.put(2, Arrays.asList("cc", "dd"));
 
@@ -319,7 +319,7 @@ public void toMultimapWithValueSelector() {
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc, duplicate);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("aa", "bb"));
         expected.put(2, Arrays.asList("cccc", "dddd"));
 
@@ -360,11 +360,11 @@ public String apply(String v) {
                 mapFactory, new Function<Integer, Collection<String>>() {
                     @Override
                     public Collection<String> apply(Integer v) {
-                        return new ArrayList<String>();
+                        return new ArrayList<>();
                     }
                 });
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Arrays.asList("eee", "fff"));
 
@@ -382,9 +382,9 @@ public void toMultimapWithCollectionFactory() {
             @Override
             public Collection<String> apply(Integer t1) {
                 if (t1 == 2) {
-                    return new ArrayList<String>();
+                    return new ArrayList<>();
                 } else {
-                    return new HashSet<String>();
+                    return new HashSet<>();
                 }
             }
         };
@@ -398,16 +398,16 @@ public String apply(String v) {
         Supplier<Map<Integer, Collection<String>>> mapSupplier = new Supplier<Map<Integer, Collection<String>>>() {
             @Override
             public Map<Integer, Collection<String>> get() {
-                return new HashMap<Integer, Collection<String>>();
+                return new HashMap<>();
             }
         };
 
         Single<Map<Integer, Collection<String>>> mapped = source
                 .toMultimap(lengthFunc, identity, mapSupplier, collectionFactory);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
-        expected.put(3, new HashSet<String>(Arrays.asList("eee")));
+        expected.put(3, new HashSet<>(Arrays.asList("eee")));
 
         mapped.subscribe(singleObserver);
 
@@ -431,7 +431,7 @@ public Integer apply(String t1) {
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFuncErr);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("a", "b"));
         expected.put(2, Arrays.asList("cc", "dd"));
 
@@ -457,7 +457,7 @@ public String apply(String t1) {
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc, duplicateErr);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(1, Arrays.asList("aa", "bb"));
         expected.put(2, Arrays.asList("cccc", "dddd"));
 
@@ -486,7 +486,7 @@ public String apply(String v) {
                     }
                 }, mapFactory);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Arrays.asList("eee", "fff"));
 
@@ -506,7 +506,7 @@ public Collection<String> apply(Integer t1) {
                 if (t1 == 2) {
                     throw new RuntimeException("Forced failure");
                 } else {
-                    return new HashSet<String>();
+                    return new HashSet<>();
                 }
             }
         };
@@ -520,14 +520,14 @@ public String apply(String v) {
         Supplier<Map<Integer, Collection<String>>> mapSupplier = new Supplier<Map<Integer, Collection<String>>>() {
             @Override
             public Map<Integer, Collection<String>> get() {
-                return new HashMap<Integer, Collection<String>>();
+                return new HashMap<>();
             }
         };
 
         Single<Map<Integer, Collection<String>>> mapped = source.toMultimap(lengthFunc,
                 identity, mapSupplier, collectionFactory);
 
-        Map<Integer, Collection<String>> expected = new HashMap<Integer, Collection<String>>();
+        Map<Integer, Collection<String>> expected = new HashMap<>();
         expected.put(2, Arrays.asList("cc", "dd"));
         expected.put(3, Collections.singleton("eee"));
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
index 8a4ac039b7..da58ffdb2a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
@@ -37,7 +37,7 @@ public void unsubscribeWhenSubscribeOnAndUnsubscribeOnAreOnSameThread() throws I
         UIEventLoopScheduler uiEventLoop = new UIEventLoopScheduler();
         try {
             final ThreadSubscription subscription = new ThreadSubscription();
-            final AtomicReference<Thread> subscribeThread = new AtomicReference<Thread>();
+            final AtomicReference<Thread> subscribeThread = new AtomicReference<>();
             Observable<Integer> w = Observable.unsafeCreate(new ObservableSource<Integer>() {
 
                 @Override
@@ -53,7 +53,7 @@ public void subscribe(Observer<? super Integer> t1) {
                 }
             });
 
-            TestObserverEx<Integer> observer = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> observer = new TestObserverEx<>();
 
             w.subscribeOn(uiEventLoop).observeOn(Schedulers.computation())
             .unsubscribeOn(uiEventLoop)
@@ -87,7 +87,7 @@ public void unsubscribeWhenSubscribeOnAndUnsubscribeOnAreOnDifferentThreads() th
         UIEventLoopScheduler uiEventLoop = new UIEventLoopScheduler();
         try {
             final ThreadSubscription subscription = new ThreadSubscription();
-            final AtomicReference<Thread> subscribeThread = new AtomicReference<Thread>();
+            final AtomicReference<Thread> subscribeThread = new AtomicReference<>();
             Observable<Integer> w = Observable.unsafeCreate(new ObservableSource<Integer>() {
 
                 @Override
@@ -103,7 +103,7 @@ public void subscribe(Observer<? super Integer> t1) {
                 }
             });
 
-            TestObserverEx<Integer> observer = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> observer = new TestObserverEx<>();
 
             w.subscribeOn(Schedulers.newThread()).observeOn(Schedulers.computation())
             .unsubscribeOn(uiEventLoop)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
index 6312ed7d42..143524319d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
@@ -232,7 +232,7 @@ public Observable<Integer> apply(Disposable subscription) {
 
     @Test
     public void usingDisposesEagerlyBeforeCompletion() {
-        final List<String> events = new ArrayList<String>();
+        final List<String> events = new ArrayList<>();
         Supplier<Resource> resourceFactory = createResourceFactory(events);
         final Action completion = createOnCompletedAction(events);
         final Action unsub = createUnsubAction(events);
@@ -259,7 +259,7 @@ public Observable<String> apply(Resource resource) {
 
     @Test
     public void usingDoesNotDisposesEagerlyBeforeCompletion() {
-        final List<String> events = new ArrayList<String>();
+        final List<String> events = new ArrayList<>();
         Supplier<Resource> resourceFactory = createResourceFactory(events);
         final Action completion = createOnCompletedAction(events);
         final Action unsub = createUnsubAction(events);
@@ -286,7 +286,7 @@ public Observable<String> apply(Resource resource) {
 
     @Test
     public void usingDisposesEagerlyBeforeError() {
-        final List<String> events = new ArrayList<String>();
+        final List<String> events = new ArrayList<>();
         Supplier<Resource> resourceFactory = createResourceFactory(events);
         final Consumer<Throwable> onError = createOnErrorAction(events);
         final Action unsub = createUnsubAction(events);
@@ -314,7 +314,7 @@ public Observable<String> apply(Resource resource) {
 
     @Test
     public void usingDoesNotDisposesEagerlyBeforeError() {
-        final List<String> events = new ArrayList<String>();
+        final List<String> events = new ArrayList<>();
         final Supplier<Resource> resourceFactory = createResourceFactory(events);
         final Consumer<Throwable> onError = createOnErrorAction(events);
         final Action unsub = createUnsubAction(events);
@@ -533,7 +533,7 @@ public ObservableSource<Object> apply(Observable<Object> o)
 
     @Test
     public void eagerDisposedOnComplete() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.using(Functions.justSupplier(1), Functions.justFunction(new Observable<Integer>() {
             @Override
@@ -548,7 +548,7 @@ protected void subscribeActual(Observer<? super Integer> observer) {
 
     @Test
     public void eagerDisposedOnError() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.using(Functions.justSupplier(1), Functions.justFunction(new Observable<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
index 63bb37eafa..bfb972626b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
@@ -44,7 +44,7 @@ public void windowViaObservableNormal1() {
 
         final Observer<Object> o = TestHelper.mockObserver();
 
-        final List<Observer<Object>> values = new ArrayList<Observer<Object>>();
+        final List<Observer<Object>> values = new ArrayList<>();
 
         Observer<Observable<Integer>> wo = new DefaultObserver<Observable<Integer>>() {
             @Override
@@ -101,7 +101,7 @@ public void windowViaObservableBoundaryCompletes() {
 
         final Observer<Object> o = TestHelper.mockObserver();
 
-        final List<Observer<Object>> values = new ArrayList<Observer<Object>>();
+        final List<Observer<Object>> values = new ArrayList<>();
 
         Observer<Observable<Integer>> wo = new DefaultObserver<Observable<Integer>>() {
             @Override
@@ -157,7 +157,7 @@ public void windowViaObservableBoundaryThrows() {
 
         final Observer<Object> o = TestHelper.mockObserver();
 
-        final List<Observer<Object>> values = new ArrayList<Observer<Object>>();
+        final List<Observer<Object>> values = new ArrayList<>();
 
         Observer<Observable<Integer>> wo = new DefaultObserver<Observable<Integer>>() {
             @Override
@@ -207,7 +207,7 @@ public void windowViaObservableSourceThrows() {
 
         final Observer<Object> o = TestHelper.mockObserver();
 
-        final List<Observer<Object>> values = new ArrayList<Observer<Object>>();
+        final List<Observer<Object>> values = new ArrayList<>();
 
         Observer<Observable<Integer>> wo = new DefaultObserver<Observable<Integer>>() {
             @Override
@@ -368,7 +368,7 @@ public ObservableSource<Integer> apply(
     public void mainAndBoundaryBothError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<Observer<? super Object>> ref = new AtomicReference<Observer<? super Object>>();
+            final AtomicReference<Observer<? super Object>> ref = new AtomicReference<>();
 
             TestObserverEx<Observable<Object>> to = Observable.error(new TestException("main"))
             .window(new Observable<Object>() {
@@ -407,8 +407,8 @@ public void mainCompleteBoundaryErrorRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
             List<Throwable> errors = TestHelper.trackPluginErrors();
             try {
-                final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<Observer<? super Object>>();
-                final AtomicReference<Observer<? super Object>> ref = new AtomicReference<Observer<? super Object>>();
+                final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<>();
+                final AtomicReference<Observer<? super Object>> ref = new AtomicReference<>();
 
                 TestObserverEx<Observable<Object>> to = new Observable<Object>() {
                     @Override
@@ -457,8 +457,8 @@ public void run() {
     @Test
     public void mainNextBoundaryNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
-            final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<Observer<? super Object>>();
-            final AtomicReference<Observer<? super Object>> ref = new AtomicReference<Observer<? super Object>>();
+            final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<>();
+            final AtomicReference<Observer<? super Object>> ref = new AtomicReference<>();
 
             TestObserver<Observable<Object>> to = new Observable<Object>() {
                 @Override
@@ -500,8 +500,8 @@ public void run() {
 
     @Test
     public void takeOneAnotherBoundary() {
-        final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<Observer<? super Object>>();
-        final AtomicReference<Observer<? super Object>> ref = new AtomicReference<Observer<? super Object>>();
+        final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<>();
+        final AtomicReference<Observer<? super Object>> ref = new AtomicReference<>();
 
         TestObserverEx<Observable<Object>> to = new Observable<Object>() {
             @Override
@@ -532,8 +532,8 @@ protected void subscribeActual(Observer<? super Object> observer) {
     @Test
     public void disposeMainBoundaryCompleteRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
-            final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<Observer<? super Object>>();
-            final AtomicReference<Observer<? super Object>> ref = new AtomicReference<Observer<? super Object>>();
+            final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<>();
+            final AtomicReference<Observer<? super Object>> ref = new AtomicReference<>();
 
             final TestObserver<Observable<Object>> to = new Observable<Object>() {
                  @Override
@@ -590,8 +590,8 @@ public void disposeMainBoundaryErrorRace() {
         final TestException ex = new TestException();
 
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
-           final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<Observer<? super Object>>();
-           final AtomicReference<Observer<? super Object>> ref = new AtomicReference<Observer<? super Object>>();
+           final AtomicReference<Observer<? super Object>> refMain = new AtomicReference<>();
+           final AtomicReference<Observer<? super Object>> ref = new AtomicReference<>();
 
            final TestObserver<Observable<Object>> to = new Observable<Object>() {
                @Override
@@ -671,7 +671,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstream() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<>();
 
         TestObserver<Observable<Integer>> to = ps.window(Observable.<Integer>never())
         .doOnNext(new Consumer<Observable<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
index 274c9712a7..a897430ab7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
@@ -36,7 +36,7 @@ public class ObservableWindowWithSizeTest extends RxJavaTest {
 
     private static <T> List<List<T>> toLists(Observable<Observable<T>> observables) {
 
-        final List<List<T>> lists = new ArrayList<List<T>>();
+        final List<List<T>> lists = new ArrayList<>();
         Observable.concatEager(observables.map(new Function<Observable<T>, Observable<List<T>>>() {
             @Override
             public Observable<List<T>> apply(Observable<T> xs) {
@@ -106,7 +106,7 @@ public void skipAndCountWindowsWithGaps() {
 
     @Test
     public void windowUnsubscribeNonOverlapping() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         final AtomicInteger count = new AtomicInteger();
         Observable.merge(Observable.range(1, 10000).doOnNext(new Consumer<Integer>() {
@@ -128,7 +128,7 @@ public void accept(Integer t1) {
 
     @Test
     public void windowUnsubscribeNonOverlappingAsyncSource() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         final AtomicInteger count = new AtomicInteger();
         Observable.merge(Observable.range(1, 100000)
@@ -161,7 +161,7 @@ public void accept(Integer t1) {
 
     @Test
     public void windowUnsubscribeOverlapping() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         final AtomicInteger count = new AtomicInteger();
         Observable.merge(Observable.range(1, 10000).doOnNext(new Consumer<Integer>() {
@@ -183,7 +183,7 @@ public void accept(Integer t1) {
 
     @Test
     public void windowUnsubscribeOverlappingAsyncSource() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         final AtomicInteger count = new AtomicInteger();
         Observable.merge(Observable.range(1, 100000)
@@ -208,7 +208,7 @@ public void accept(Integer t1) {
     }
 
     private List<String> list(String... args) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (String arg : args) {
             list.add(arg);
         }
@@ -241,7 +241,7 @@ public void subscribe(Observer<? super Integer> observer) {
 
     @Test
     public void takeFlatMapCompletes() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         final int indicator = 999999999;
 
@@ -405,7 +405,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamSize() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<>();
 
         TestObserver<Observable<Integer>> to = ps.window(10)
         .take(1)
@@ -459,7 +459,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamSkip() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<>();
 
         TestObserver<Observable<Integer>> to = ps.window(5, 10)
         .take(1)
@@ -513,7 +513,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamOverlap() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<>();
 
         TestObserver<Observable<Integer>> to = ps.window(5, 3)
         .take(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
index d3466c7eb4..0c7dc8056b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
@@ -47,8 +47,8 @@ public void before() {
 
     @Test
     public void observableBasedOpenerAndCloser() {
-        final List<String> list = new ArrayList<String>();
-        final List<List<String>> lists = new ArrayList<List<String>>();
+        final List<String> list = new ArrayList<>();
+        final List<List<String>> lists = new ArrayList<>();
 
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
@@ -97,7 +97,7 @@ public void subscribe(Observer<? super Object> innerObserver) {
     }
 
     private List<String> list(String... args) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (String arg : args) {
             list.add(arg);
         }
@@ -129,7 +129,7 @@ public void accept(Observable<String> stringObservable) {
                 stringObservable.subscribe(new DefaultObserver<String>() {
                     @Override
                     public void onComplete() {
-                        lists.add(new ArrayList<String>(list));
+                        lists.add(new ArrayList<>(list));
                         list.clear();
                     }
 
@@ -154,7 +154,7 @@ public void noUnsubscribeAndNoLeak() {
         PublishSubject<Integer> open = PublishSubject.create();
         final PublishSubject<Integer> close = PublishSubject.create();
 
-        TestObserver<Observable<Integer>> to = new TestObserver<Observable<Integer>>();
+        TestObserver<Observable<Integer>> to = new TestObserver<>();
 
         source.window(open, new Function<Integer, Observable<Integer>>() {
             @Override
@@ -199,7 +199,7 @@ public void unsubscribeAll() {
         PublishSubject<Integer> open = PublishSubject.create();
         final PublishSubject<Integer> close = PublishSubject.create();
 
-        TestObserver<Observable<Integer>> to = new TestObserver<Observable<Integer>>();
+        TestObserver<Observable<Integer>> to = new TestObserver<>();
 
         source.window(open, new Function<Integer, Observable<Integer>>() {
             @Override
@@ -464,7 +464,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstream() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<>();
 
         TestObserver<Observable<Integer>> to = ps.window(Observable.<Integer>just(1).concatWith(Observable.<Integer>never()),
                 Functions.justFunction(Observable.never()))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
index 51591516a6..13f662c88e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
@@ -46,8 +46,8 @@ public void before() {
 
     @Test
     public void timedAndCount() {
-        final List<String> list = new ArrayList<String>();
-        final List<List<String>> lists = new ArrayList<List<String>>();
+        final List<String> list = new ArrayList<>();
+        final List<List<String>> lists = new ArrayList<>();
 
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
@@ -82,8 +82,8 @@ public void subscribe(Observer<? super String> observer) {
 
     @Test
     public void timed() {
-        final List<String> list = new ArrayList<String>();
-        final List<List<String>> lists = new ArrayList<List<String>>();
+        final List<String> list = new ArrayList<>();
+        final List<List<String>> lists = new ArrayList<>();
 
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
@@ -111,7 +111,7 @@ public void subscribe(Observer<? super String> observer) {
     }
 
     private List<String> list(String... args) {
-        List<String> list = new ArrayList<String>();
+        List<String> list = new ArrayList<>();
         for (String arg : args) {
             list.add(arg);
         }
@@ -143,7 +143,7 @@ public void accept(Observable<T> stringObservable) {
                 stringObservable.subscribe(new DefaultObserver<T>() {
                     @Override
                     public void onComplete() {
-                        lists.add(new ArrayList<T>(list));
+                        lists.add(new ArrayList<>(list));
                         list.clear();
                     }
 
@@ -166,8 +166,8 @@ public void exactWindowSize() {
         Observable<Observable<Integer>> source = Observable.range(1, 10)
                 .window(1, TimeUnit.MINUTES, scheduler, 3);
 
-        final List<Integer> list = new ArrayList<Integer>();
-        final List<List<Integer>> lists = new ArrayList<List<Integer>>();
+        final List<Integer> list = new ArrayList<>();
+        final List<List<Integer>> lists = new ArrayList<>();
 
         source.subscribe(observeWindow(list, lists));
 
@@ -184,7 +184,7 @@ public void exactWindowSize() {
 
     @Test
     public void takeFlatMapCompletes() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         final AtomicInteger wip = new AtomicInteger();
 
@@ -978,7 +978,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamExactTime() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<>();
 
         TestObserver<Observable<Integer>> to = ps.window(10, TimeUnit.MINUTES)
         .take(1)
@@ -1028,7 +1028,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamExactTimeAndSize() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<>();
 
         TestObserver<Observable<Integer>> to = ps.window(10, TimeUnit.MINUTES, 100)
         .take(1)
@@ -1078,7 +1078,7 @@ public Observable<Integer> apply(Observable<Integer> w) throws Throwable {
     public void windowAbandonmentCancelsUpstreamExactTimeSkip() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final AtomicReference<Observable<Integer>> inner = new AtomicReference<Observable<Integer>>();
+        final AtomicReference<Observable<Integer>> inner = new AtomicReference<>();
 
         TestObserver<Observable<Integer>> to = ps.window(10, 15, TimeUnit.MINUTES)
         .take(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
index 00b4e73f18..a754b21b8c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
@@ -91,7 +91,7 @@ public void emptySource() {
 
         Observable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         result.subscribe(to);
 
@@ -117,7 +117,7 @@ public void emptyOther() {
 
         Observable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         result.subscribe(to);
 
@@ -143,7 +143,7 @@ public void unsubscription() {
 
         Observable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         result.subscribe(to);
 
@@ -170,7 +170,7 @@ public void sourceThrows() {
 
         Observable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         result.subscribe(to);
 
@@ -198,7 +198,7 @@ public void otherThrows() {
 
         Observable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         result.subscribe(to);
 
@@ -226,7 +226,7 @@ public void functionThrows() {
 
         Observable<Integer> result = source.withLatestFrom(other, COMBINER_ERROR);
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         result.subscribe(to);
 
@@ -252,7 +252,7 @@ public void noDownstreamUnsubscribe() {
 
         Observable<Integer> result = source.withLatestFrom(other, COMBINER);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         result.subscribe(to);
 
@@ -276,7 +276,7 @@ public void manySources() {
         PublishSubject<String> ps3 = PublishSubject.create();
         PublishSubject<String> main = PublishSubject.create();
 
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         main.withLatestFrom(new Observable[] { ps1, ps2, ps3 }, toArray)
         .subscribe(to);
@@ -323,7 +323,7 @@ public void manySourcesIterable() {
         PublishSubject<String> ps3 = PublishSubject.create();
         PublishSubject<String> main = PublishSubject.create();
 
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         main.withLatestFrom(Arrays.<Observable<?>>asList(ps1, ps2, ps3), toArray)
         .subscribe(to);
@@ -368,8 +368,8 @@ public void manySourcesIterableSweep() {
         for (String val : new String[] { "1" /*, null*/ }) {
             int n = 35;
             for (int i = 0; i < n; i++) {
-                List<Observable<?>> sources = new ArrayList<Observable<?>>();
-                List<String> expected = new ArrayList<String>();
+                List<Observable<?>> sources = new ArrayList<>();
+                List<String> expected = new ArrayList<>();
                 expected.add(val);
 
                 for (int j = 0; j < i; j++) {
@@ -377,7 +377,7 @@ public void manySourcesIterableSweep() {
                     expected.add(String.valueOf(val));
                 }
 
-                TestObserver<String> to = new TestObserver<String>();
+                TestObserver<String> to = new TestObserver<>();
 
                 PublishSubject<String> main = PublishSubject.create();
 
@@ -397,7 +397,7 @@ public void manySourcesIterableSweep() {
 
     @Test
     public void withEmpty() {
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         Observable.range(1, 3).withLatestFrom(
                 new Observable<?>[] { Observable.just(1), Observable.empty() }, toArray)
@@ -410,7 +410,7 @@ public void withEmpty() {
 
     @Test
     public void withError() {
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         Observable.range(1, 3).withLatestFrom(
                 new Observable<?>[] { Observable.just(1), Observable.error(new TestException()) }, toArray)
@@ -423,7 +423,7 @@ public void withError() {
 
     @Test
     public void withMainError() {
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         Observable.error(new TestException()).withLatestFrom(
                 new Observable<?>[] { Observable.just(1), Observable.just(1) }, toArray)
@@ -438,7 +438,7 @@ public void withMainError() {
     public void with2Others() {
         Observable<Integer> just = Observable.just(1);
 
-        TestObserver<List<Integer>> to = new TestObserver<List<Integer>>();
+        TestObserver<List<Integer>> to = new TestObserver<>();
 
         just.withLatestFrom(just, just, new Function3<Integer, Integer, Integer, List<Integer>>() {
             @Override
@@ -457,7 +457,7 @@ public List<Integer> apply(Integer a, Integer b, Integer c) {
     public void with3Others() {
         Observable<Integer> just = Observable.just(1);
 
-        TestObserver<List<Integer>> to = new TestObserver<List<Integer>>();
+        TestObserver<List<Integer>> to = new TestObserver<>();
 
         just.withLatestFrom(just, just, just, new Function4<Integer, Integer, Integer, Integer, List<Integer>>() {
             @Override
@@ -476,7 +476,7 @@ public List<Integer> apply(Integer a, Integer b, Integer c, Integer d) {
     public void with4Others() {
         Observable<Integer> just = Observable.just(1);
 
-        TestObserver<List<Integer>> to = new TestObserver<List<Integer>>();
+        TestObserver<List<Integer>> to = new TestObserver<>();
 
         just.withLatestFrom(just, just, just, just, new Function5<Integer, Integer, Integer, Integer, Integer, List<Integer>>() {
             @Override
@@ -511,7 +511,7 @@ public Object apply(Integer a, Integer b, Integer c) throws Exception {
     @Test
     public void manyIteratorThrows() {
         Observable.just(1)
-        .withLatestFrom(new CrashingMappedIterable<Observable<Integer>>(1, 100, 100, new Function<Integer, Observable<Integer>>() {
+        .withLatestFrom(new CrashingMappedIterable<>(1, 100, 100, new Function<Integer, Observable<Integer>>() {
             @Override
             public Observable<Integer> apply(Integer v) throws Exception {
                 return Observable.just(2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
index b52b90183d..d8c153a285 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
@@ -350,7 +350,7 @@ public void aggregatorUnsubscribe() {
         PublishSubject<String> r2 = PublishSubject.create();
         /* define an Observer to receive aggregated events */
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
 
         Observable.zip(r1, r2, zipr2).subscribe(to);
 
@@ -768,7 +768,7 @@ public String apply(Integer a, Integer b) {
                     }
                 });
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
         os.subscribe(new Consumer<String>() {
 
             @Override
@@ -795,7 +795,7 @@ public String apply(Integer a, Integer b) {
                     }
                 }).take(5);
 
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
         os.subscribe(to);
 
         to.awaitDone(5, TimeUnit.SECONDS);
@@ -820,7 +820,7 @@ public String apply(Integer a, Integer b) {
                     }
                 });
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
         os.subscribe(new DefaultObserver<String>() {
 
             @Override
@@ -884,7 +884,7 @@ public String apply(Notification<Integer> t1, Notification<String> t2) {
 
         });
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
         o.subscribe(new Consumer<String>() {
 
             @Override
@@ -913,7 +913,7 @@ public String apply(Integer t1, String t2) {
 
         });
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
         o.subscribe(new Consumer<String>() {
 
             @Override
@@ -940,7 +940,7 @@ public Object apply(final Object[] args) {
             }
         });
 
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         o.subscribe(to);
         to.awaitDone(200, TimeUnit.MILLISECONDS);
         to.assertNoValues();
@@ -974,7 +974,7 @@ public void downstreamBackpressureRequestsWithFiniteSyncObservables() {
         Observable<Integer> o1 = createInfiniteObservable(generatedA).take(Observable.bufferSize() * 2);
         Observable<Integer> o2 = createInfiniteObservable(generatedB).take(Observable.bufferSize() * 2);
 
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
         Observable.zip(o1, o2, new BiFunction<Integer, Integer, String>() {
 
             @Override
@@ -1089,7 +1089,7 @@ public Integer apply(Integer i1, Integer i2) {
                         return i1 + i2;
                     }
                 });
-        List<Integer> expected = new ArrayList<Integer>();
+        List<Integer> expected = new ArrayList<>();
         for (int i = 0; i < 1026; i++) {
             expected.add(i * 3);
         }
@@ -1404,7 +1404,7 @@ public Integer apply(Integer t1, Integer t2) throws Exception {
     public void firstErrorPreventsSecondSubscription() {
         final AtomicInteger counter = new AtomicInteger();
 
-        List<Observable<?>> observableList = new ArrayList<Observable<?>>();
+        List<Observable<?>> observableList = new ArrayList<>();
         observableList.add(Observable.create(new ObservableOnSubscribe<Object>() {
             @Override
             public void subscribe(ObservableEmitter<Object> e)

From 75da4b504a52466b455a49a342747514fa0dffab Mon Sep 17 00:00:00 2001
From: Dmitry Volkov <42734936+dvolkovv@users.noreply.github.com>
Date: Sun, 22 Dec 2019 14:17:23 +0300
Subject: [PATCH 018/665] Diamond operators in tests (#6788)

* diamond operators in unit tests, small packages in internal/

* diamond operators in unit tests, small packages in internal/operators
---
 .../rxjava3/internal/SubscribeWithTest.java   |   4 +-
 .../disposables/DisposableHelperTest.java     |  12 +-
 .../observers/BasicFuseableObserverTest.java  |   4 +-
 .../observers/BlockingFirstObserverTest.java  |   2 +-
 .../observers/BlockingMultiObserverTest.java  |   8 +-
 .../observers/BlockingObserverTest.java       |   4 +-
 .../observers/ConsumerSingleObserverTest.java |   4 +-
 .../observers/DeferredScalarObserverTest.java |  36 +++---
 .../DisposableLambdaObserverTest.java         |   8 +-
 .../observers/FutureObserverTest.java         |   8 +-
 .../observers/LambdaObserverTest.java         | 110 +++++++++---------
 .../observers/QueueDrainObserverTest.java     |  14 +--
 .../completable/CompletableAmbTest.java       |   4 +-
 .../CompletableAndThenCompletableabTest.java  |   4 +-
 .../completable/CompletableCacheTest.java     |  12 +-
 .../completable/CompletableConcatTest.java    |   8 +-
 .../completable/CompletableDelayTest.java     |   2 +-
 .../completable/CompletableDetachTest.java    |   6 +-
 .../CompletableFromCallableTest.java          |   2 +-
 .../CompletableFromSupplierTest.java          |   2 +-
 .../CompletableMergeIterableTest.java         |   4 +-
 .../completable/CompletableMergeTest.java     |  10 +-
 .../completable/CompletableTakeUntilTest.java |   4 +-
 .../completable/CompletableTimeoutTest.java   |   2 +-
 .../CompletableToObservableTest.java          |   2 +-
 .../operators/maybe/MaybeAmbTest.java         |   2 +-
 .../operators/maybe/MaybeCacheTest.java       |   6 +-
 .../maybe/MaybeCallbackObserverTest.java      |  12 +-
 .../maybe/MaybeConcatIterableTest.java        |   6 +-
 .../operators/maybe/MaybeDetachTest.java      |   8 +-
 .../maybe/MaybeDoAfterSuccessTest.java        |   2 +-
 .../maybe/MaybeFlatMapBiSelectorTest.java     |   2 +-
 .../MaybeFlatMapIterableFlowableTest.java     |   4 +-
 .../MaybeFlatMapIterableObservableTest.java   |   4 +-
 .../operators/maybe/MaybeFromActionTest.java  |   2 +-
 .../maybe/MaybeFromCallableTest.java          |   2 +-
 .../operators/maybe/MaybeFromFutureTest.java  |  18 +--
 .../maybe/MaybeFromRunnableTest.java          |   2 +-
 .../maybe/MaybeFromSupplierTest.java          |   2 +-
 .../operators/maybe/MaybeMergeArrayTest.java  |   4 +-
 .../operators/maybe/MaybeZipIterableTest.java |   6 +-
 .../mixed/FlowableConcatMapMaybeTest.java     |   6 +-
 .../mixed/FlowableConcatMapSingleTest.java    |   6 +-
 .../FlowableSwitchMapCompletableTest.java     |   2 +-
 .../mixed/FlowableSwitchMapMaybeTest.java     |   6 +-
 .../mixed/FlowableSwitchMapSingleTest.java    |   6 +-
 .../mixed/ObservableConcatMapMaybeTest.java   |   6 +-
 .../mixed/ObservableConcatMapSingleTest.java  |   6 +-
 .../ObservableSwitchMapCompletableTest.java   |   2 +-
 .../mixed/ObservableSwitchMapMaybeTest.java   |   6 +-
 .../mixed/ObservableSwitchMapSingleTest.java  |   6 +-
 .../operators/single/SingleDelayTest.java     |   2 +-
 .../operators/single/SingleDetachTest.java    |   6 +-
 .../single/SingleDoAfterSuccessTest.java      |   2 +-
 .../single/SingleDoAfterTerminateTest.java    |   2 +-
 .../SingleFlatMapIterableFlowableTest.java    |   4 +-
 .../SingleFlatMapIterableObservableTest.java  |   4 +-
 .../single/SingleFromCallableTest.java        |   4 +-
 .../single/SingleFromSupplierTest.java        |   4 +-
 .../single/SingleZipIterableTest.java         |   6 +-
 .../internal/queue/SimpleQueueTest.java       |  20 ++--
 .../schedulers/InstantPeriodicTaskTest.java   |  12 +-
 .../schedulers/ScheduledRunnableTest.java     |   8 +-
 .../SchedulerMultiWorkerSupportTest.java      |  12 +-
 ...asicFuseableConditionalSubscriberTest.java |   2 +-
 .../BasicFuseableSubscriberTest.java          |   4 +-
 .../subscribers/BlockingSubscriberTest.java   |  12 +-
 .../subscribers/BoundedSubscriberTest.java    |  36 +++---
 .../DeferredScalarSubscriberTest.java         |   2 +-
 .../subscribers/FutureSubscriberTest.java     |   8 +-
 .../InnerQueuedSubscriberTest.java            |   4 +-
 .../subscribers/LambdaSubscriberTest.java     | 106 ++++++++---------
 .../subscribers/QueueDrainSubscriberTest.java |  32 ++---
 .../SinglePostCompleteSubscriberTest.java     |   2 +-
 .../subscribers/StrictSubscriberTest.java     |  28 ++---
 .../SubscriberResourceWrapperTest.java        |   8 +-
 .../DeferredScalarSubscriptionTest.java       |  16 +--
 .../subscriptions/ScalarSubscriptionTest.java |   8 +-
 .../subscriptions/SubscriptionHelperTest.java |  18 +--
 .../internal/util/AtomicThrowableTest.java    |  36 +++---
 .../internal/util/CrashingMappedIterable.java |   2 +-
 .../internal/util/ExceptionHelperTest.java    |   2 +-
 .../util/HalfSerializerObserverTest.java      |   4 +-
 .../util/HalfSerializerSubscriberTest.java    |   4 +-
 .../internal/util/MergerBiFunctionTest.java   |  10 +-
 .../rxjava3/internal/util/MiscUtilTest.java   |  36 +++---
 .../internal/util/NotificationLiteTest.java   |   2 +-
 .../util/ObservableToFlowabeTestSync.java     |   4 +-
 .../internal/util/OpenHashSetTest.java        |   2 +-
 .../internal/util/QueueDrainHelperTest.java   |  74 ++++++------
 .../rxjava3/internal/util/TestingHelper.java  |   2 +-
 .../util/VolatileSizeArrayListTest.java       |   8 +-
 92 files changed, 484 insertions(+), 484 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java
index 15a7c1190d..e1b858507a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java
@@ -27,14 +27,14 @@ public class SubscribeWithTest extends RxJavaTest {
     @Test
     public void withFlowable() {
         Flowable.range(1, 10)
-        .subscribeWith(new TestSubscriber<Integer>())
+        .subscribeWith(new TestSubscriber<>())
         .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
     }
 
     @Test
     public void withObservable() {
         Observable.range(1, 10)
-        .subscribeWith(new TestObserver<Integer>())
+        .subscribeWith(new TestObserver<>())
         .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
     }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
index 24c8dd784f..0332b02556 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
@@ -54,7 +54,7 @@ public void validationNull() {
     @Test
     public void disposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
+            final AtomicReference<Disposable> d = new AtomicReference<>();
 
             Runnable r = new Runnable() {
                 @Override
@@ -70,7 +70,7 @@ public void run() {
     @Test
     public void setReplace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
+            final AtomicReference<Disposable> d = new AtomicReference<>();
 
             Runnable r = new Runnable() {
                 @Override
@@ -86,7 +86,7 @@ public void run() {
     @Test
     public void setRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
+            final AtomicReference<Disposable> d = new AtomicReference<>();
 
             Runnable r = new Runnable() {
                 @Override
@@ -101,7 +101,7 @@ public void run() {
 
     @Test
     public void setReplaceNull() {
-        final AtomicReference<Disposable> d = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> d = new AtomicReference<>();
 
         DisposableHelper.dispose(d);
 
@@ -112,7 +112,7 @@ public void setReplaceNull() {
     @Test
     public void dispose() {
         Disposable u = Disposable.empty();
-        final AtomicReference<Disposable> d = new AtomicReference<Disposable>(u);
+        final AtomicReference<Disposable> d = new AtomicReference<>(u);
 
         DisposableHelper.dispose(d);
 
@@ -121,7 +121,7 @@ public void dispose() {
 
     @Test
     public void trySet() {
-        AtomicReference<Disposable> ref = new AtomicReference<Disposable>();
+        AtomicReference<Disposable> ref = new AtomicReference<>();
 
         Disposable d1 = Disposable.empty();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
index a63283b938..1764ea6a47 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
@@ -25,7 +25,7 @@ public class BasicFuseableObserverTest extends RxJavaTest {
 
     @Test(expected = UnsupportedOperationException.class)
     public void offer() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         BasicFuseableObserver<Integer, Integer> o = new BasicFuseableObserver<Integer, Integer>(to) {
             @Nullable
             @Override
@@ -57,7 +57,7 @@ protected boolean beforeDownstream() {
 
     @Test(expected = UnsupportedOperationException.class)
     public void offer2() {
-        BasicFuseableObserver<Integer, Integer> o = new BasicFuseableObserver<Integer, Integer>(new TestObserver<Integer>()) {
+        BasicFuseableObserver<Integer, Integer> o = new BasicFuseableObserver<Integer, Integer>(new TestObserver<>()) {
             @Nullable
             @Override
             public Integer poll() throws Exception {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
index 845817379a..0b33e6ddff 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
@@ -25,7 +25,7 @@ public class BlockingFirstObserverTest extends RxJavaTest {
 
     @Test
     public void firstValueOnly() {
-        BlockingFirstObserver<Integer> bf = new BlockingFirstObserver<Integer>();
+        BlockingFirstObserver<Integer> bf = new BlockingFirstObserver<>();
         Disposable d = Disposable.empty();
         bf.onSubscribe(d);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
index 399b5506e3..b9ec5d276b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
@@ -27,7 +27,7 @@ public class BlockingMultiObserverTest extends RxJavaTest {
 
     @Test
     public void dispose() {
-        BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
+        BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();
         bmo.dispose();
 
         Disposable d = Disposable.empty();
@@ -37,7 +37,7 @@ public void dispose() {
 
     @Test
     public void blockingGetDefault() {
-        final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
+        final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();
 
         Schedulers.single().scheduleDirect(new Runnable() {
             @Override
@@ -51,7 +51,7 @@ public void run() {
 
     @Test
     public void blockingAwait() {
-        final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
+        final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();
 
         Schedulers.single().scheduleDirect(new Runnable() {
             @Override
@@ -65,7 +65,7 @@ public void run() {
 
     @Test
     public void blockingGetDefaultInterrupt() {
-        final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<Integer>();
+        final BlockingMultiObserver<Integer> bmo = new BlockingMultiObserver<>();
 
         Thread.currentThread().interrupt();
         try {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java
index f5d8fb6117..1a07bdf907 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java
@@ -25,9 +25,9 @@ public class BlockingObserverTest extends RxJavaTest {
 
     @Test
     public void dispose() {
-        Queue<Object> q = new ArrayDeque<Object>();
+        Queue<Object> q = new ArrayDeque<>();
 
-        BlockingObserver<Object> bo = new BlockingObserver<Object>(q);
+        BlockingObserver<Object> bo = new BlockingObserver<>(q);
 
         bo.dispose();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java
index aa2e6e22e3..5e264bc4d7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java
@@ -24,7 +24,7 @@ public final class ConsumerSingleObserverTest extends RxJavaTest {
 
     @Test
     public void onErrorMissingShouldReportNoCustomOnError() {
-        ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<Integer>(Functions.<Integer>emptyConsumer(),
+        ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<>(Functions.<Integer>emptyConsumer(),
                 Functions.ON_ERROR_MISSING);
 
         assertFalse(o.hasCustomOnError());
@@ -32,7 +32,7 @@ public void onErrorMissingShouldReportNoCustomOnError() {
 
     @Test
     public void customOnErrorShouldReportCustomOnError() {
-        ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<Integer>(Functions.<Integer>emptyConsumer(),
+        ConsumerSingleObserver<Integer> o = new ConsumerSingleObserver<>(Functions.<Integer>emptyConsumer(),
                 Functions.<Throwable>emptyConsumer());
 
         assertTrue(o.hasCustomOnError());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
index f6ebd39d1f..e9668c81ce 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
@@ -50,7 +50,7 @@ public void onNext(Integer value) {
     public void normal() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
             TakeFirst source = new TakeFirst(to);
 
@@ -73,7 +73,7 @@ public void normal() {
 
     @Test
     public void error() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         TakeFirst source = new TakeFirst(to);
 
@@ -85,7 +85,7 @@ public void error() {
 
     @Test
     public void complete() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         TakeFirst source = new TakeFirst(to);
 
@@ -97,7 +97,7 @@ public void complete() {
 
     @Test
     public void dispose() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         TakeFirst source = new TakeFirst(to);
 
@@ -118,7 +118,7 @@ public void dispose() {
     public void fused() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+            TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
             TakeFirst source = new TakeFirst(to);
 
@@ -148,7 +148,7 @@ public void fused() {
     public void fusedReject() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+            TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC);
 
             TakeFirst source = new TakeFirst(to);
 
@@ -193,7 +193,7 @@ public void onNext(Integer value) {
     public void nonfusedTerminateMore() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
+            TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
 
             TakeLast source = new TakeLast(to);
 
@@ -218,7 +218,7 @@ public void nonfusedTerminateMore() {
     public void nonfusedError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
+            TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
 
             TakeLast source = new TakeLast(to);
 
@@ -243,7 +243,7 @@ public void nonfusedError() {
     public void fusedTerminateMore() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+            TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
             TakeLast source = new TakeLast(to);
 
@@ -268,7 +268,7 @@ public void fusedTerminateMore() {
     public void fusedError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+            TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
             TakeLast source = new TakeLast(to);
 
@@ -291,7 +291,7 @@ public void fusedError() {
 
     @Test
     public void disposed() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
 
         TakeLast source = new TakeLast(to);
 
@@ -309,7 +309,7 @@ public void disposed() {
 
     @Test
     public void disposedAfterOnNext() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         TakeLast source = new TakeLast(new Observer<Integer>() {
             Disposable upstream;
@@ -346,7 +346,7 @@ public void onComplete() {
 
     @Test
     public void fusedEmpty() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         TakeLast source = new TakeLast(to);
 
@@ -361,7 +361,7 @@ public void fusedEmpty() {
 
     @Test
     public void nonfusedEmpty() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
 
         TakeLast source = new TakeLast(to);
 
@@ -376,7 +376,7 @@ public void nonfusedEmpty() {
 
     @Test
     public void customFusion() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         TakeLast source = new TakeLast(new Observer<Integer>() {
             QueueDisposable<Integer> d;
@@ -426,7 +426,7 @@ public void onComplete() {
 
     @Test
     public void customFusionClear() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         TakeLast source = new TakeLast(new Observer<Integer>() {
             QueueDisposable<Integer> d;
@@ -465,7 +465,7 @@ public void onComplete() {
 
     @Test
     public void offerThrow() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.NONE);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.NONE);
 
         TakeLast source = new TakeLast(to);
 
@@ -474,7 +474,7 @@ public void offerThrow() {
 
     @Test
     public void customFusionDontConsume() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         TakeFirst source = new TakeFirst(new Observer<Integer>() {
             QueueDisposable<Integer> d;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
index cc84102c30..964301f6e4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
@@ -32,8 +32,8 @@ public class DisposableLambdaObserverTest extends RxJavaTest {
 
     @Test
     public void doubleOnSubscribe() {
-        TestHelper.doubleOnSubscribe(new DisposableLambdaObserver<Integer>(
-                new TestObserver<Integer>(), Functions.emptyConsumer(), Functions.EMPTY_ACTION
+        TestHelper.doubleOnSubscribe(new DisposableLambdaObserver<>(
+                new TestObserver<>(), Functions.emptyConsumer(), Functions.EMPTY_ACTION
         ));
     }
 
@@ -41,8 +41,8 @@ public void doubleOnSubscribe() {
     public void disposeCrash() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            DisposableLambdaObserver<Integer> o = new DisposableLambdaObserver<Integer>(
-                    new TestObserver<Integer>(), Functions.emptyConsumer(),
+            DisposableLambdaObserver<Integer> o = new DisposableLambdaObserver<>(
+                    new TestObserver<>(), Functions.emptyConsumer(),
                     new Action() {
                         @Override
                         public void run() throws Exception {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
index f9caa33808..a4a8f353c2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
@@ -36,7 +36,7 @@ public class FutureObserverTest extends RxJavaTest {
 
     @Before
     public void before() {
-        fo = new FutureObserver<Integer>();
+        fo = new FutureObserver<>();
     }
 
     @Test
@@ -157,7 +157,7 @@ public void onSubscribe() throws Exception {
     @Test
     public void cancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final FutureSubscriber<Integer> fo = new FutureSubscriber<Integer>();
+            final FutureSubscriber<Integer> fo = new FutureSubscriber<>();
 
             Runnable r = new Runnable() {
                 @Override
@@ -188,7 +188,7 @@ public void onErrorCancelRace() {
         RxJavaPlugins.setErrorHandler(Functions.emptyConsumer());
         try {
             for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-                final FutureSubscriber<Integer> fo = new FutureSubscriber<Integer>();
+                final FutureSubscriber<Integer> fo = new FutureSubscriber<>();
 
                 final TestException ex = new TestException();
 
@@ -218,7 +218,7 @@ public void onCompleteCancelRace() {
         RxJavaPlugins.setErrorHandler(Functions.emptyConsumer());
         try {
             for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-                final FutureSubscriber<Integer> fo = new FutureSubscriber<Integer>();
+                final FutureSubscriber<Integer> fo = new FutureSubscriber<>();
 
                 if (i % 3 == 0) {
                     fo.onSubscribe(new BooleanSubscription());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
index 937e11441d..c19b6ff2db 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
@@ -35,20 +35,20 @@ public class LambdaObserverTest extends RxJavaTest {
 
     @Test
     public void onSubscribeThrows() {
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        LambdaObserver<Object> o = new LambdaObserver<Object>(new Consumer<Object>() {
+        LambdaObserver<Object> o = new LambdaObserver<>(new Consumer<Object>() {
             @Override
             public void accept(Object v) throws Exception {
                 received.add(v);
             }
         },
-        new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable e) throws Exception {
-                received.add(e);
-            }
-        }, new Action() {
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable e) throws Exception {
+                        received.add(e);
+                    }
+                }, new Action() {
             @Override
             public void run() throws Exception {
                 received.add(100);
@@ -72,20 +72,20 @@ public void accept(Disposable d) throws Exception {
 
     @Test
     public void onNextThrows() {
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        LambdaObserver<Object> o = new LambdaObserver<Object>(new Consumer<Object>() {
+        LambdaObserver<Object> o = new LambdaObserver<>(new Consumer<Object>() {
             @Override
             public void accept(Object v) throws Exception {
                 throw new TestException();
             }
         },
-        new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable e) throws Exception {
-                received.add(e);
-            }
-        }, new Action() {
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable e) throws Exception {
+                        received.add(e);
+                    }
+                }, new Action() {
             @Override
             public void run() throws Exception {
                 received.add(100);
@@ -111,20 +111,20 @@ public void onErrorThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
 
         try {
-            final List<Object> received = new ArrayList<Object>();
+            final List<Object> received = new ArrayList<>();
 
-            LambdaObserver<Object> o = new LambdaObserver<Object>(new Consumer<Object>() {
+            LambdaObserver<Object> o = new LambdaObserver<>(new Consumer<Object>() {
                 @Override
                 public void accept(Object v) throws Exception {
                     received.add(v);
                 }
             },
-            new Consumer<Throwable>() {
-                @Override
-                public void accept(Throwable e) throws Exception {
-                    throw new TestException("Inner");
-                }
-            }, new Action() {
+                    new Consumer<Throwable>() {
+                        @Override
+                        public void accept(Throwable e) throws Exception {
+                            throw new TestException("Inner");
+                        }
+                    }, new Action() {
                 @Override
                 public void run() throws Exception {
                     received.add(100);
@@ -157,20 +157,20 @@ public void onCompleteThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
 
         try {
-            final List<Object> received = new ArrayList<Object>();
+            final List<Object> received = new ArrayList<>();
 
-            LambdaObserver<Object> o = new LambdaObserver<Object>(new Consumer<Object>() {
+            LambdaObserver<Object> o = new LambdaObserver<>(new Consumer<Object>() {
                 @Override
                 public void accept(Object v) throws Exception {
                     received.add(v);
                 }
             },
-            new Consumer<Throwable>() {
-                @Override
-                public void accept(Throwable e) throws Exception {
-                    received.add(e);
-                }
-            }, new Action() {
+                    new Consumer<Throwable>() {
+                        @Override
+                        public void accept(Throwable e) throws Exception {
+                            received.add(e);
+                        }
+                    }, new Action() {
                 @Override
                 public void run() throws Exception {
                     throw new TestException();
@@ -215,20 +215,20 @@ public void subscribeActual(Observer<? super Integer> observer) {
                 }
             };
 
-            final List<Object> received = new ArrayList<Object>();
+            final List<Object> received = new ArrayList<>();
 
-            LambdaObserver<Object> o = new LambdaObserver<Object>(new Consumer<Object>() {
+            LambdaObserver<Object> o = new LambdaObserver<>(new Consumer<Object>() {
                 @Override
                 public void accept(Object v) throws Exception {
                     received.add(v);
                 }
             },
-            new Consumer<Throwable>() {
-                @Override
-                public void accept(Throwable e) throws Exception {
-                    received.add(e);
-                }
-            }, new Action() {
+                    new Consumer<Throwable>() {
+                        @Override
+                        public void accept(Throwable e) throws Exception {
+                            received.add(e);
+                        }
+                    }, new Action() {
                 @Override
                 public void run() throws Exception {
                     received.add(100);
@@ -266,20 +266,20 @@ public void subscribeActual(Observer<? super Integer> observer) {
                 }
             };
 
-            final List<Object> received = new ArrayList<Object>();
+            final List<Object> received = new ArrayList<>();
 
-            LambdaObserver<Object> o = new LambdaObserver<Object>(new Consumer<Object>() {
+            LambdaObserver<Object> o = new LambdaObserver<>(new Consumer<Object>() {
                 @Override
                 public void accept(Object v) throws Exception {
                     received.add(v);
                 }
             },
-            new Consumer<Throwable>() {
-                @Override
-                public void accept(Throwable e) throws Exception {
-                    received.add(e);
-                }
-            }, new Action() {
+                    new Consumer<Throwable>() {
+                        @Override
+                        public void accept(Throwable e) throws Exception {
+                            received.add(e);
+                        }
+                    }, new Action() {
                 @Override
                 public void run() throws Exception {
                     received.add(100);
@@ -304,7 +304,7 @@ public void accept(Disposable d) throws Exception {
     public void onNextThrowsCancelsUpstream() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         ps.subscribe(new Consumer<Integer>() {
             @Override
@@ -333,9 +333,9 @@ public void accept(Throwable e) throws Exception {
     public void onSubscribeThrowsCancelsUpstream() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
-        ps.subscribe(new LambdaObserver<Integer>(new Consumer<Integer>() {
+        ps.subscribe(new LambdaObserver<>(new Consumer<Integer>() {
             @Override
             public void accept(Integer v) throws Exception {
             }
@@ -363,7 +363,7 @@ public void accept(Disposable d) throws Exception {
 
     @Test
     public void onErrorMissingShouldReportNoCustomOnError() {
-        LambdaObserver<Integer> o = new LambdaObserver<Integer>(Functions.<Integer>emptyConsumer(),
+        LambdaObserver<Integer> o = new LambdaObserver<>(Functions.<Integer>emptyConsumer(),
                 Functions.ON_ERROR_MISSING,
                 Functions.EMPTY_ACTION,
                 Functions.<Disposable>emptyConsumer());
@@ -373,7 +373,7 @@ public void onErrorMissingShouldReportNoCustomOnError() {
 
     @Test
     public void customOnErrorShouldReportCustomOnError() {
-        LambdaObserver<Integer> o = new LambdaObserver<Integer>(Functions.<Integer>emptyConsumer(),
+        LambdaObserver<Integer> o = new LambdaObserver<>(Functions.<Integer>emptyConsumer(),
                 Functions.<Throwable>emptyConsumer(),
                 Functions.EMPTY_ACTION,
                 Functions.<Disposable>emptyConsumer());
@@ -385,9 +385,9 @@ public void customOnErrorShouldReportCustomOnError() {
     public void disposedObserverShouldReportErrorOnGlobalErrorHandler() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final List<Throwable> observerErrors = Collections.synchronizedList(new ArrayList<Throwable>());
+            final List<Throwable> observerErrors = Collections.synchronizedList(new ArrayList<>());
 
-            LambdaObserver<Integer> o = new LambdaObserver<Integer>(Functions.<Integer>emptyConsumer(),
+            LambdaObserver<Integer> o = new LambdaObserver<>(Functions.<Integer>emptyConsumer(),
                     new Consumer<Throwable>() {
                         @Override
                         public void accept(Throwable t) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
index c8823563e0..9afd31e95f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
@@ -24,7 +24,7 @@
 public class QueueDrainObserverTest extends RxJavaTest {
 
     static final QueueDrainObserver<Integer, Integer, Integer> createUnordered(TestObserver<Integer> to, final Disposable d) {
-        return new QueueDrainObserver<Integer, Integer, Integer>(to, new SpscArrayQueue<Integer>(4)) {
+        return new QueueDrainObserver<Integer, Integer, Integer>(to, new SpscArrayQueue<>(4)) {
             @Override
             public void onNext(Integer t) {
                 fastPathEmit(t, false, d);
@@ -51,7 +51,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
     }
 
     static final QueueDrainObserver<Integer, Integer, Integer> createOrdered(TestObserver<Integer> to, final Disposable d) {
-        return new QueueDrainObserver<Integer, Integer, Integer>(to, new SpscArrayQueue<Integer>(4)) {
+        return new QueueDrainObserver<Integer, Integer, Integer>(to, new SpscArrayQueue<>(4)) {
             @Override
             public void onNext(Integer t) {
                 fastPathOrderedEmit(t, false, d);
@@ -79,7 +79,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
 
     @Test
     public void unorderedSlowPath() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Disposable d = Disposable.empty();
         QueueDrainObserver<Integer, Integer, Integer> qd = createUnordered(to, d);
         to.onSubscribe(Disposable.empty());
@@ -92,7 +92,7 @@ public void unorderedSlowPath() {
 
     @Test
     public void orderedSlowPath() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Disposable d = Disposable.empty();
         QueueDrainObserver<Integer, Integer, Integer> qd = createOrdered(to, d);
         to.onSubscribe(Disposable.empty());
@@ -105,7 +105,7 @@ public void orderedSlowPath() {
 
     @Test
     public void orderedSlowPathNonEmptyQueue() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Disposable d = Disposable.empty();
         QueueDrainObserver<Integer, Integer, Integer> qd = createOrdered(to, d);
         to.onSubscribe(Disposable.empty());
@@ -120,7 +120,7 @@ public void orderedSlowPathNonEmptyQueue() {
     public void unorderedOnNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
             Disposable d = Disposable.empty();
             final QueueDrainObserver<Integer, Integer, Integer> qd = createUnordered(to, d);
             to.onSubscribe(Disposable.empty());
@@ -142,7 +142,7 @@ public void run() {
     public void orderedOnNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
             Disposable d = Disposable.empty();
             final QueueDrainObserver<Integer, Integer, Integer> qd = createOrdered(to, d);
             to.onSubscribe(Disposable.empty());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
index 8192f338da..60c69b5f20 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
@@ -38,7 +38,7 @@ public class CompletableAmbTest extends RxJavaTest {
 
     @Test
     public void ambLots() {
-        List<Completable> ms = new ArrayList<Completable>();
+        List<Completable> ms = new ArrayList<>();
 
         for (int i = 0; i < 32; i++) {
             ms.add(Completable.never());
@@ -172,7 +172,7 @@ public void ambArrayOrder() {
 
     @Test
     public void ambRace() {
-        TestObserver<Void> to = new TestObserver<Void>();
+        TestObserver<Void> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         CompositeDisposable cd = new CompositeDisposable();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
index 1137804fe2..c6b201be51 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
@@ -113,7 +113,7 @@ public void run() {
 
     @Test
     public void andThenFirstCancels() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
         Completable.fromRunnable(new Runnable() {
             @Override
             public void run() {
@@ -129,7 +129,7 @@ public void run() {
 
     @Test
     public void andThenSecondCancels() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
         Completable.complete()
                 .andThen(Completable.fromRunnable(new Runnable() {
                     @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java
index 08c93ae7d6..fd286681c8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java
@@ -86,7 +86,7 @@ public void error() {
     public void crossDispose() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final TestObserver<Void> to1 = new TestObserver<Void>();
+        final TestObserver<Void> to1 = new TestObserver<>();
 
         final TestObserver<Void> to2 = new TestObserver<Void>() {
             @Override
@@ -111,7 +111,7 @@ public void onComplete() {
     public void crossDisposeOnError() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final TestObserver<Void> to1 = new TestObserver<Void>();
+        final TestObserver<Void> to1 = new TestObserver<>();
 
         final TestObserver<Void> to2 = new TestObserver<Void>() {
             @Override
@@ -174,9 +174,9 @@ public void subscribeRace() {
 
             final Completable c = ps.ignoreElements().cache();
 
-            final TestObserver<Void> to1 = new TestObserver<Void>();
+            final TestObserver<Void> to1 = new TestObserver<>();
 
-            final TestObserver<Void> to2 = new TestObserver<Void>();
+            final TestObserver<Void> to2 = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -209,7 +209,7 @@ public void subscribeDisposeRace() {
 
             final TestObserver<Void> to1 = c.test();
 
-            final TestObserver<Void> to2 = new TestObserver<Void>();
+            final TestObserver<Void> to2 = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -237,7 +237,7 @@ public void run() {
     public void doubleDispose() {
         PublishSubject<Integer> ps = PublishSubject.create();
 
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         ps.ignoreElements().cache()
         .subscribe(new CompletableObserver() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
index 3180f0b71a..b41086ce3b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
@@ -167,7 +167,7 @@ public void arrayCancelled() {
 
     @Test
     public void arrayFirstCancels() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Completable.concatArray(new Completable() {
             @Override
@@ -191,7 +191,7 @@ public void iterableCancelled() {
 
     @Test
     public void iterableFirstCancels() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Completable.concat(Arrays.asList(new Completable() {
             @Override
@@ -215,7 +215,7 @@ public void arrayCancelRace() {
 
             final Completable c = Completable.concatArray(a);
 
-            final TestObserver<Void> to = new TestObserver<Void>();
+            final TestObserver<Void> to = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -244,7 +244,7 @@ public void iterableCancelRace() {
 
             final Completable c = Completable.concat(Arrays.asList(a));
 
-            final TestObserver<Void> to = new TestObserver<Void>();
+            final TestObserver<Void> to = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java
index 117bdb0bcf..94e34fe728 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java
@@ -41,7 +41,7 @@ public void delayCustomScheduler() {
     @Test
     public void onErrorCalledOnScheduler() throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Thread> thread = new AtomicReference<Thread>();
+        final AtomicReference<Thread> thread = new AtomicReference<>();
 
         Completable.error(new Exception())
                 .delay(0, TimeUnit.MILLISECONDS, Schedulers.newThread())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
index b2dfd16c32..b5b52b67c2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
@@ -65,7 +65,7 @@ public void onComplete() {
     @Test
     public void cancelDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Void> to = new Completable() {
             @Override
@@ -91,7 +91,7 @@ protected void subscribeActual(CompletableObserver observer) {
     @Test
     public void completeDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Void> to = new Completable() {
             @Override
@@ -117,7 +117,7 @@ protected void subscribeActual(CompletableObserver observer) {
     @Test
     public void errorDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Void> to = new Completable() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
index da082c514d..6cf88ce667 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
@@ -142,7 +142,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Observer<Object> observer = TestHelper.mockObserver();
 
-        TestObserver<String> outer = new TestObserver<String>(observer);
+        TestObserver<String> outer = new TestObserver<>(observer);
 
         fromCallableObservable
                 .subscribeOn(Schedulers.computation())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
index c7943de244..73dda447c8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
@@ -144,7 +144,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Observer<Object> observer = TestHelper.mockObserver();
 
-        TestObserver<String> outer = new TestObserver<String>(observer);
+        TestObserver<String> outer = new TestObserver<>(observer);
 
         fromSupplierObservable
                 .subscribeOn(Schedulers.computation())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
index 67253bceb0..bacfc8521a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
@@ -67,7 +67,7 @@ public void run() {
 
     @Test
     public void cancelAfterHasNext() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Completable.merge(new Iterable<Completable>() {
             @Override
@@ -97,7 +97,7 @@ public void remove() {
 
     @Test
     public void cancelAfterNext() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Completable.merge(new Iterable<Completable>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
index c1cc06f3c6..3482a53409 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
@@ -43,7 +43,7 @@ public void invalidPrefetch() {
 
     @Test
     public void cancelAfterFirst() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Completable.mergeArray(new Completable() {
             @Override
@@ -60,7 +60,7 @@ protected void subscribeActual(CompletableObserver observer) {
 
     @Test
     public void cancelAfterFirstDelayError() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Completable.mergeArrayDelayError(new Completable() {
             @Override
@@ -428,7 +428,7 @@ protected void subscribeActual(CompletableObserver observer) {
 
     @Test
     public void innerIsDisposed() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Completable.mergeDelayError(Flowable.just(new Completable() {
             @Override
@@ -494,7 +494,7 @@ public void delayErrorIterableCancel() {
 
     @Test
     public void delayErrorIterableCancelAfterHasNext() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Completable.mergeDelayError(new Iterable<Completable>() {
             @Override
@@ -525,7 +525,7 @@ public void remove() {
 
     @Test
     public void delayErrorIterableCancelAfterNext() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Completable.mergeDelayError(new Iterable<Completable>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
index 1b4bb17263..3458ef9772 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
@@ -186,7 +186,7 @@ public void otherErrorLate() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
 
-            final AtomicReference<CompletableObserver> ref = new AtomicReference<CompletableObserver>();
+            final AtomicReference<CompletableObserver> ref = new AtomicReference<>();
 
             Completable.complete()
             .takeUntil(new Completable() {
@@ -213,7 +213,7 @@ public void otherCompleteLate() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
 
-            final AtomicReference<CompletableObserver> ref = new AtomicReference<CompletableObserver>();
+            final AtomicReference<CompletableObserver> ref = new AtomicReference<>();
 
             Completable.complete()
             .takeUntil(new Completable() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
index 0b176d808e..a2f0771ab4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
@@ -155,7 +155,7 @@ public void run() {
 
     @Test
     public void ambRace() {
-        TestObserver<Void> to = new TestObserver<Void>();
+        TestObserver<Void> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         CompositeDisposable cd = new CompositeDisposable();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
index 4d5b99cb90..f1bbda0353 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
@@ -39,7 +39,7 @@ public Observable<?> apply(Completable c) throws Exception {
 
     @Test
     public void fusion() throws Exception {
-        TestObserver<Void> to = new TestObserver<Void>();
+        TestObserver<Void> to = new TestObserver<>();
 
         ObserverCompletableObserver co = new ObserverCompletableObserver(to);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
index 50b76aa424..af49d5353b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
@@ -37,7 +37,7 @@ public class MaybeAmbTest extends RxJavaTest {
 
     @Test
     public void ambLots() {
-        List<Maybe<Integer>> ms = new ArrayList<Maybe<Integer>>();
+        List<Maybe<Integer>> ms = new ArrayList<>();
 
         for (int i = 0; i < 32; i++) {
             ms.add(Maybe.<Integer>never());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java
index 41c6d485eb..a8d42ef603 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java
@@ -154,7 +154,7 @@ public void onlineComplete() {
     @Test
     public void crossCancelOnSuccess() {
 
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -178,7 +178,7 @@ public void accept(Integer v) throws Exception {
     @Test
     public void crossCancelOnError() {
 
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
@@ -201,7 +201,7 @@ public void accept(Object v) throws Exception {
     @Test
     public void crossCancelOnComplete() {
 
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
index 9ebf939b52..e65b01e070 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
@@ -31,7 +31,7 @@ public class MaybeCallbackObserverTest extends RxJavaTest {
 
     @Test
     public void dispose() {
-        MaybeCallbackObserver<Object> mo = new MaybeCallbackObserver<Object>(Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.EMPTY_ACTION);
+        MaybeCallbackObserver<Object> mo = new MaybeCallbackObserver<>(Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.EMPTY_ACTION);
 
         Disposable d = Disposable.empty();
 
@@ -50,7 +50,7 @@ public void dispose() {
     public void onSuccessCrashes() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            MaybeCallbackObserver<Object> mo = new MaybeCallbackObserver<Object>(
+            MaybeCallbackObserver<Object> mo = new MaybeCallbackObserver<>(
                     new Consumer<Object>() {
                         @Override
                         public void accept(Object v) throws Exception {
@@ -74,7 +74,7 @@ public void accept(Object v) throws Exception {
     public void onErrorCrashes() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            MaybeCallbackObserver<Object> mo = new MaybeCallbackObserver<Object>(
+            MaybeCallbackObserver<Object> mo = new MaybeCallbackObserver<>(
                     Functions.emptyConsumer(),
                     new Consumer<Object>() {
                         @Override
@@ -103,7 +103,7 @@ public void accept(Object v) throws Exception {
     public void onCompleteCrashes() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            MaybeCallbackObserver<Object> mo = new MaybeCallbackObserver<Object>(
+            MaybeCallbackObserver<Object> mo = new MaybeCallbackObserver<>(
                     Functions.emptyConsumer(),
                     Functions.emptyConsumer(),
                     new Action() {
@@ -125,7 +125,7 @@ public void run() throws Exception {
 
     @Test
     public void onErrorMissingShouldReportNoCustomOnError() {
-        MaybeCallbackObserver<Integer> o = new MaybeCallbackObserver<Integer>(Functions.<Integer>emptyConsumer(),
+        MaybeCallbackObserver<Integer> o = new MaybeCallbackObserver<>(Functions.<Integer>emptyConsumer(),
                 Functions.ON_ERROR_MISSING,
                 Functions.EMPTY_ACTION);
 
@@ -134,7 +134,7 @@ public void onErrorMissingShouldReportNoCustomOnError() {
 
     @Test
     public void customOnErrorShouldReportCustomOnError() {
-        MaybeCallbackObserver<Integer> o = new MaybeCallbackObserver<Integer>(Functions.<Integer>emptyConsumer(),
+        MaybeCallbackObserver<Integer> o = new MaybeCallbackObserver<>(Functions.<Integer>emptyConsumer(),
                 Functions.<Throwable>emptyConsumer(),
                 Functions.EMPTY_ACTION);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
index 4ceb82f1e6..c693e0296a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
@@ -90,7 +90,7 @@ public void run() {
 
     @Test
     public void hasNextThrows() {
-        Maybe.concat(new CrashingMappedIterable<Maybe<Integer>>(100, 1, 100, new Function<Integer, Maybe<Integer>>() {
+        Maybe.concat(new CrashingMappedIterable<>(100, 1, 100, new Function<Integer, Maybe<Integer>>() {
             @Override
             public Maybe<Integer> apply(Integer v) throws Exception {
                 return Maybe.just(1);
@@ -102,7 +102,7 @@ public Maybe<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void nextThrows() {
-        Maybe.concat(new CrashingMappedIterable<Maybe<Integer>>(100, 100, 1, new Function<Integer, Maybe<Integer>>() {
+        Maybe.concat(new CrashingMappedIterable<>(100, 100, 1, new Function<Integer, Maybe<Integer>>() {
             @Override
             public Maybe<Integer> apply(Integer v) throws Exception {
                 return Maybe.just(1);
@@ -114,7 +114,7 @@ public Maybe<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void nextReturnsNull() {
-        Maybe.concat(new CrashingMappedIterable<Maybe<Integer>>(100, 100, 100, new Function<Integer, Maybe<Integer>>() {
+        Maybe.concat(new CrashingMappedIterable<>(100, 100, 100, new Function<Integer, Maybe<Integer>>() {
             @Override
             public Maybe<Integer> apply(Integer v) throws Exception {
                 return null;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
index ba720a02f9..2c96cbfe88 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
@@ -65,7 +65,7 @@ public void onComplete() {
     @Test
     public void cancelDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Object> to = new Maybe<Object>() {
             @Override
@@ -91,7 +91,7 @@ protected void subscribeActual(MaybeObserver<? super Object> observer) {
     @Test
     public void completeDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Integer> to = new Maybe<Integer>() {
             @Override
@@ -117,7 +117,7 @@ protected void subscribeActual(MaybeObserver<? super Integer> observer) {
     @Test
     public void errorDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Integer> to = new Maybe<Integer>() {
             @Override
@@ -143,7 +143,7 @@ protected void subscribeActual(MaybeObserver<? super Integer> observer) {
     @Test
     public void successDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Integer> to = new Maybe<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
index b754c5150f..d772193241 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
@@ -30,7 +30,7 @@
 
 public class MaybeDoAfterSuccessTest extends RxJavaTest {
 
-    final List<Integer> values = new ArrayList<Integer>();
+    final List<Integer> values = new ArrayList<>();
 
     final Consumer<Integer> afterSuccess = new Consumer<Integer>() {
         @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
index 513eb8eee4..f0db482a62 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
@@ -215,7 +215,7 @@ public Object apply(Integer a, Integer b) throws Exception {
 
     @Test
     public void mapperCancels() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Maybe.just(1)
         .flatMap(new Function<Integer, MaybeSource<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
index a702ac234d..1c840a2295 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
@@ -480,7 +480,7 @@ public void slowPathCancelAfterHasNext() {
         final Integer[] a = new Integer[1000];
         Arrays.fill(a, 1);
 
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Maybe.just(1)
         .flattenAsFlowable(new Function<Integer, Iterable<Integer>>() {
@@ -524,7 +524,7 @@ public void fastPathCancelAfterHasNext() {
         final Integer[] a = new Integer[1000];
         Arrays.fill(a, 1);
 
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Maybe.just(1)
         .flattenAsFlowable(new Function<Integer, Iterable<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
index e9d955386a..601da820a7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
@@ -99,7 +99,7 @@ public Iterable<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void fused() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Maybe.just(1).flattenAsObservable(new Function<Integer, Iterable<Integer>>() {
             @Override
@@ -117,7 +117,7 @@ public Iterable<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void fusedNoSync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC);
 
         Maybe.just(1).flattenAsObservable(new Function<Integer, Iterable<Integer>>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
index c797e81d8d..ccd87877cd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
@@ -170,7 +170,7 @@ public void disposedUpfront() throws Throwable {
 
     @Test
     public void cancelWhileRunning() {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
 
         Maybe.fromAction(new Action() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
index eb551defcd..b934f98fdf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
@@ -196,7 +196,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Observer<Object> observer = TestHelper.mockObserver();
 
-        TestObserver<String> outer = new TestObserver<String>(observer);
+        TestObserver<String> outer = new TestObserver<>(observer);
 
         fromCallableObservable
                 .subscribeOn(Schedulers.computation())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java
index 82ed2f9b35..98ea62255e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java
@@ -29,7 +29,7 @@ public class MaybeFromFutureTest extends RxJavaTest {
 
     @Test
     public void cancelImmediately() {
-        FutureTask<Integer> ft = new FutureTask<Integer>(Functions.justCallable(1));
+        FutureTask<Integer> ft = new FutureTask<>(Functions.justCallable(1));
 
         Maybe.fromFuture(ft).test(true)
         .assertEmpty();
@@ -37,7 +37,7 @@ public void cancelImmediately() {
 
     @Test
     public void timeout() {
-        FutureTask<Integer> ft = new FutureTask<Integer>(Functions.justCallable(1));
+        FutureTask<Integer> ft = new FutureTask<>(Functions.justCallable(1));
 
         Maybe.fromFuture(ft, 1, TimeUnit.MILLISECONDS).test()
         .awaitDone(5, TimeUnit.SECONDS)
@@ -46,7 +46,7 @@ public void timeout() {
 
     @Test
     public void timedWait() {
-        FutureTask<Integer> ft = new FutureTask<Integer>(Functions.justCallable(1));
+        FutureTask<Integer> ft = new FutureTask<>(Functions.justCallable(1));
         ft.run();
 
         Maybe.fromFuture(ft, 1, TimeUnit.MILLISECONDS).test()
@@ -56,7 +56,7 @@ public void timedWait() {
 
     @Test
     public void interrupt() {
-        FutureTask<Integer> ft = new FutureTask<Integer>(Functions.justCallable(1));
+        FutureTask<Integer> ft = new FutureTask<>(Functions.justCallable(1));
 
         Thread.currentThread().interrupt();
 
@@ -66,9 +66,9 @@ public void interrupt() {
 
     @Test
     public void cancelWhileRunning() {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
 
-        FutureTask<Object> ft = new FutureTask<Object>(new Runnable() {
+        FutureTask<Object> ft = new FutureTask<>(new Runnable() {
             @Override
             public void run() {
                 to.dispose();
@@ -86,9 +86,9 @@ public void run() {
 
     @Test
     public void cancelAndCrashWhileRunning() {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
 
-        FutureTask<Object> ft = new FutureTask<Object>(new Runnable() {
+        FutureTask<Object> ft = new FutureTask<>(new Runnable() {
             @Override
             public void run() {
                 to.dispose();
@@ -107,7 +107,7 @@ public void run() {
 
     @Test
     public void futureNull() {
-        FutureTask<Object> ft = new FutureTask<Object>(new Runnable() {
+        FutureTask<Object> ft = new FutureTask<>(new Runnable() {
             @Override
             public void run() {
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
index 6c59ecca27..b5bc8d9727 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
@@ -175,7 +175,7 @@ public void disposedUpfront() {
 
     @Test
     public void cancelWhileRunning() {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
 
         Maybe.fromRunnable(new Runnable() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
index 9e90177fae..b8196e3917 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
@@ -197,7 +197,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Observer<Object> observer = TestHelper.mockObserver();
 
-        TestObserver<String> outer = new TestObserver<String>(observer);
+        TestObserver<String> outer = new TestObserver<>(observer);
 
         fromSupplierObservable
                 .subscribeOn(Schedulers.computation())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
index 2212d50eed..86261efc4f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
@@ -95,7 +95,7 @@ public void onComplete() {
     @SuppressWarnings("unchecked")
     @Test
     public void cancel() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Maybe.mergeArray(Maybe.just(1), Maybe.<Integer>empty(), Maybe.just(2))
         .subscribe(ts);
@@ -109,7 +109,7 @@ public void cancel() {
     @SuppressWarnings("unchecked")
     @Test
     public void firstErrors() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Maybe.mergeArray(Maybe.<Integer>error(new TestException()), Maybe.<Integer>empty(), Maybe.just(2))
         .subscribe(ts);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
index 9ce40cee25..f06be6be57 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
@@ -156,7 +156,7 @@ public void run() {
 
     @Test
     public void iteratorThrows() {
-        Maybe.zip(new CrashingMappedIterable<Maybe<Integer>>(1, 100, 100, new Function<Integer, Maybe<Integer>>() {
+        Maybe.zip(new CrashingMappedIterable<>(1, 100, 100, new Function<Integer, Maybe<Integer>>() {
             @Override
             public Maybe<Integer> apply(Integer v) throws Exception {
                 return Maybe.just(v);
@@ -168,7 +168,7 @@ public Maybe<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void hasNextThrows() {
-        Maybe.zip(new CrashingMappedIterable<Maybe<Integer>>(100, 20, 100, new Function<Integer, Maybe<Integer>>() {
+        Maybe.zip(new CrashingMappedIterable<>(100, 20, 100, new Function<Integer, Maybe<Integer>>() {
             @Override
             public Maybe<Integer> apply(Integer v) throws Exception {
                 return Maybe.just(v);
@@ -180,7 +180,7 @@ public Maybe<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void nextThrows() {
-        Maybe.zip(new CrashingMappedIterable<Maybe<Integer>>(100, 100, 5, new Function<Integer, Maybe<Integer>>() {
+        Maybe.zip(new CrashingMappedIterable<>(100, 100, 5, new Function<Integer, Maybe<Integer>>() {
             @Override
             public Maybe<Integer> apply(Integer v) throws Exception {
                 return Maybe.just(v);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
index 47dd3d1284..8a60f6c367 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
@@ -291,7 +291,7 @@ public void innerErrorAfterMainError() {
         try {
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
-            final AtomicReference<MaybeObserver<? super Integer>> obs = new AtomicReference<MaybeObserver<? super Integer>>();
+            final AtomicReference<MaybeObserver<? super Integer>> obs = new AtomicReference<>();
 
             TestSubscriberEx<Integer> ts = pp.concatMapMaybe(
                     new Function<Integer, MaybeSource<Integer>>() {
@@ -368,9 +368,9 @@ public MaybeSource<? extends Object> apply(Integer v)
 
     @Test
     public void cancelNoConcurrentClean() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ConcatMapMaybeSubscriber<Integer, Integer> operator =
-                new ConcatMapMaybeSubscriber<Integer, Integer>(
+                new ConcatMapMaybeSubscriber<>(
                         ts, Functions.justFunction(Maybe.<Integer>never()), 16, ErrorMode.IMMEDIATE);
 
         operator.onSubscribe(new BooleanSubscription());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
index 5da39ff395..a2e5d73c09 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
@@ -209,7 +209,7 @@ public void innerErrorAfterMainError() {
         try {
             final PublishProcessor<Integer> pp = PublishProcessor.create();
 
-            final AtomicReference<SingleObserver<? super Integer>> obs = new AtomicReference<SingleObserver<? super Integer>>();
+            final AtomicReference<SingleObserver<? super Integer>> obs = new AtomicReference<>();
 
             TestSubscriberEx<Integer> ts = pp.concatMapSingle(
                     new Function<Integer, SingleSource<Integer>>() {
@@ -286,9 +286,9 @@ public SingleSource<? extends Object> apply(Integer v)
 
     @Test
     public void cancelNoConcurrentClean() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ConcatMapSingleSubscriber<Integer, Integer> operator =
-                new ConcatMapSingleSubscriber<Integer, Integer>(
+                new ConcatMapSingleSubscriber<>(
                         ts, Functions.justFunction(Single.<Integer>never()), 16, ErrorMode.IMMEDIATE);
 
         operator.onSubscribe(new BooleanSubscription());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
index 5cd60792a7..bf18f90b05 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
@@ -174,7 +174,7 @@ public CompletableSource apply(Integer f) throws Exception {
 
     @Test
     public void mapperCancels() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Flowable.range(1, 5).switchMapCompletable(new Function<Integer, CompletableSource>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
index b7b66c3ca4..8fd4b55d6f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
@@ -307,7 +307,7 @@ public MaybeSource<? extends Object> apply(Integer v)
 
     @Test
     public void disposeBeforeSwitchInOnNext() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1)
         .switchMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
@@ -324,7 +324,7 @@ public MaybeSource<Integer> apply(Integer v)
 
     @Test
     public void disposeOnNextAfterFirst() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1, 2)
         .switchMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
@@ -404,7 +404,7 @@ public MaybeSource<Integer> apply(Integer v)
     public void innerErrorAfterTermination() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<MaybeObserver<? super Integer>> moRef = new AtomicReference<MaybeObserver<? super Integer>>();
+            final AtomicReference<MaybeObserver<? super Integer>> moRef = new AtomicReference<>();
 
             TestSubscriberEx<Integer> ts = new Flowable<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
index ca1cb6d919..a28413ab42 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
@@ -255,7 +255,7 @@ public SingleSource<? extends Object> apply(Integer v)
 
     @Test
     public void disposeBeforeSwitchInOnNext() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1)
         .switchMapSingle(new Function<Integer, SingleSource<Integer>>() {
@@ -272,7 +272,7 @@ public SingleSource<Integer> apply(Integer v)
 
     @Test
     public void disposeOnNextAfterFirst() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1, 2)
         .switchMapSingle(new Function<Integer, SingleSource<Integer>>() {
@@ -352,7 +352,7 @@ public SingleSource<Integer> apply(Integer v)
     public void innerErrorAfterTermination() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<SingleObserver<? super Integer>> moRef = new AtomicReference<SingleObserver<? super Integer>>();
+            final AtomicReference<SingleObserver<? super Integer>> moRef = new AtomicReference<>();
 
             TestSubscriberEx<Integer> ts = new Flowable<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
index 21b9936292..4764b3e50e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
@@ -262,7 +262,7 @@ public void innerErrorAfterMainError() {
         try {
             final PublishSubject<Integer> ps = PublishSubject.create();
 
-            final AtomicReference<MaybeObserver<? super Integer>> obs = new AtomicReference<MaybeObserver<? super Integer>>();
+            final AtomicReference<MaybeObserver<? super Integer>> obs = new AtomicReference<>();
 
             TestObserverEx<Integer> to = ps.concatMapMaybe(
                     new Function<Integer, MaybeSource<Integer>>() {
@@ -373,9 +373,9 @@ public void scalarEmptySource() {
 
     @Test
     public void cancelNoConcurrentClean() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         ConcatMapMaybeMainObserver<Integer, Integer> operator =
-                new ConcatMapMaybeMainObserver<Integer, Integer>(
+                new ConcatMapMaybeMainObserver<>(
                         to, Functions.justFunction(Maybe.<Integer>never()), 16, ErrorMode.IMMEDIATE);
 
         operator.onSubscribe(Disposable.empty());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
index 8f24b87bbb..41659020e5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
@@ -180,7 +180,7 @@ public void innerErrorAfterMainError() {
         try {
             final PublishSubject<Integer> ps = PublishSubject.create();
 
-            final AtomicReference<SingleObserver<? super Integer>> obs = new AtomicReference<SingleObserver<? super Integer>>();
+            final AtomicReference<SingleObserver<? super Integer>> obs = new AtomicReference<>();
 
             TestObserverEx<Integer> to = ps.concatMapSingle(
                     new Function<Integer, SingleSource<Integer>>() {
@@ -313,9 +313,9 @@ public void scalarEmptySource() {
 
     @Test
     public void cancelNoConcurrentClean() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         ConcatMapSingleMainObserver<Integer, Integer> operator =
-                new ConcatMapSingleMainObserver<Integer, Integer>(
+                new ConcatMapSingleMainObserver<>(
                         to, Functions.justFunction(Single.<Integer>never()), 16, ErrorMode.IMMEDIATE);
 
         operator.onSubscribe(Disposable.empty());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
index b060b9d03d..33ce7c27da 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
@@ -172,7 +172,7 @@ public CompletableSource apply(Integer f) throws Exception {
 
     @Test
     public void mapperCancels() {
-        final TestObserver<Void> to = new TestObserver<Void>();
+        final TestObserver<Void> to = new TestObserver<>();
 
         Observable.range(1, 5).switchMapCompletable(new Function<Integer, CompletableSource>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
index 7f877089b5..865544b22a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
@@ -283,7 +283,7 @@ public MaybeSource<? extends Object> apply(Integer v)
 
     @Test
     public void disposeBeforeSwitchInOnNext() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1)
         .switchMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
@@ -300,7 +300,7 @@ public MaybeSource<Integer> apply(Integer v)
 
     @Test
     public void disposeOnNextAfterFirst() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1, 2)
         .switchMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
@@ -380,7 +380,7 @@ public MaybeSource<Integer> apply(Integer v)
     public void innerErrorAfterTermination() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<MaybeObserver<? super Integer>> moRef = new AtomicReference<MaybeObserver<? super Integer>>();
+            final AtomicReference<MaybeObserver<? super Integer>> moRef = new AtomicReference<>();
 
             TestObserverEx<Integer> to = new Observable<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
index 957c20ba0e..d5de085a1e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
@@ -252,7 +252,7 @@ public SingleSource<? extends Object> apply(Integer v)
 
     @Test
     public void disposeBeforeSwitchInOnNext() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1).hide()
         .switchMapSingle(new Function<Integer, SingleSource<Integer>>() {
@@ -269,7 +269,7 @@ public SingleSource<Integer> apply(Integer v)
 
     @Test
     public void disposeOnNextAfterFirst() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1, 2)
         .switchMapSingle(new Function<Integer, SingleSource<Integer>>() {
@@ -349,7 +349,7 @@ public SingleSource<Integer> apply(Integer v)
     public void innerErrorAfterTermination() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<SingleObserver<? super Integer>> moRef = new AtomicReference<SingleObserver<? super Integer>>();
+            final AtomicReference<SingleObserver<? super Integer>> moRef = new AtomicReference<>();
 
             TestObserverEx<Integer> to = new Observable<Integer>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
index 1eaf426511..555b53e30a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
@@ -138,7 +138,7 @@ public void delaySubscriptionTimeCustomScheduler() throws Exception {
     @Test
     public void onErrorCalledOnScheduler() throws Exception {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Thread> thread = new AtomicReference<Thread>();
+        final AtomicReference<Thread> thread = new AtomicReference<>();
 
         Single.<String>error(new Exception())
                 .delay(0, TimeUnit.MILLISECONDS, Schedulers.newThread())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
index d582339cd0..ae13a0d9c0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
@@ -65,7 +65,7 @@ public void onSuccess() {
     @Test
     public void cancelDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Object> to = new Single<Object>() {
             @Override
@@ -91,7 +91,7 @@ protected void subscribeActual(SingleObserver<? super Object> observer) {
     @Test
     public void errorDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Integer> to = new Single<Integer>() {
             @Override
@@ -117,7 +117,7 @@ protected void subscribeActual(SingleObserver<? super Integer> observer) {
     @Test
     public void successDetaches() throws Exception {
         Disposable d = Disposable.empty();
-        final WeakReference<Disposable> wr = new WeakReference<Disposable>(d);
+        final WeakReference<Disposable> wr = new WeakReference<>(d);
 
         TestObserver<Integer> to = new Single<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
index 679eac1e64..2090015950 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
@@ -30,7 +30,7 @@
 
 public class SingleDoAfterSuccessTest extends RxJavaTest {
 
-    final List<Integer> values = new ArrayList<Integer>();
+    final List<Integer> values = new ArrayList<>();
 
     final Consumer<Integer> afterSuccess = new Consumer<Integer>() {
         @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
index 3096263c88..b4c8c1e7ca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
@@ -39,7 +39,7 @@ public void run() throws Exception {
         }
     };
 
-    private final TestObserver<Integer> to = new TestObserver<Integer>();
+    private final TestObserver<Integer> to = new TestObserver<>();
 
     @Test
     public void just() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
index 3fa9a2b462..4643d61303 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
@@ -467,7 +467,7 @@ public void slowPathCancelAfterHasNext() {
         final Integer[] a = new Integer[1000];
         Arrays.fill(a, 1);
 
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Single.just(1)
         .flattenAsFlowable(new Function<Integer, Iterable<Integer>>() {
@@ -511,7 +511,7 @@ public void fastPathCancelAfterHasNext() {
         final Integer[] a = new Integer[1000];
         Arrays.fill(a, 1);
 
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         Single.just(1)
         .flattenAsFlowable(new Function<Integer, Iterable<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
index 00fc69fdd9..5d2bafc9c9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
@@ -86,7 +86,7 @@ public Iterable<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void fused() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         Single.just(1).flattenAsObservable(new Function<Integer, Iterable<Integer>>() {
             @Override
@@ -104,7 +104,7 @@ public Iterable<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void fusedNoSync() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.SYNC);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.SYNC);
 
         Single.just(1).flattenAsObservable(new Function<Integer, Iterable<Integer>>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java
index b7c4ebf331..8a97b8a2d6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java
@@ -169,7 +169,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Observer<Object> observer = TestHelper.mockObserver();
 
-        TestObserver<String> outer = new TestObserver<String>(observer);
+        TestObserver<String> outer = new TestObserver<>(observer);
 
         fromCallableObservable
                 .subscribeOn(Schedulers.computation())
@@ -230,7 +230,7 @@ public Object call() throws Exception {
 
     @Test
     public void disposedOnCall() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Single.fromCallable(new Callable<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java
index 479999d8f3..dd259f209b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java
@@ -170,7 +170,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
 
         Observer<Object> observer = TestHelper.mockObserver();
 
-        TestObserver<String> outer = new TestObserver<String>(observer);
+        TestObserver<String> outer = new TestObserver<>(observer);
 
         fromSupplierObservable
                 .subscribeOn(Schedulers.computation())
@@ -231,7 +231,7 @@ public Object get() throws Exception {
 
     @Test
     public void disposedOnCall() {
-        final TestObserver<Integer> to = new TestObserver<Integer>();
+        final TestObserver<Integer> to = new TestObserver<>();
 
         Single.fromSupplier(new Supplier<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
index 1a94e23257..948972dbcb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
@@ -156,7 +156,7 @@ public void run() {
 
     @Test
     public void iteratorThrows() {
-        Single.zip(new CrashingMappedIterable<Single<Integer>>(1, 100, 100, new Function<Integer, Single<Integer>>() {
+        Single.zip(new CrashingMappedIterable<>(1, 100, 100, new Function<Integer, Single<Integer>>() {
             @Override
             public Single<Integer> apply(Integer v) throws Exception {
                 return Single.just(v);
@@ -168,7 +168,7 @@ public Single<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void hasNextThrows() {
-        Single.zip(new CrashingMappedIterable<Single<Integer>>(100, 20, 100, new Function<Integer, Single<Integer>>() {
+        Single.zip(new CrashingMappedIterable<>(100, 20, 100, new Function<Integer, Single<Integer>>() {
             @Override
             public Single<Integer> apply(Integer v) throws Exception {
                 return Single.just(v);
@@ -180,7 +180,7 @@ public Single<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void nextThrows() {
-        Single.zip(new CrashingMappedIterable<Single<Integer>>(100, 100, 5, new Function<Integer, Single<Integer>>() {
+        Single.zip(new CrashingMappedIterable<>(100, 100, 5, new Function<Integer, Single<Integer>>() {
             @Override
             public Single<Integer> apply(Integer v) throws Exception {
                 return Single.just(v);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java b/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
index d58918d04d..e5673b49bc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
@@ -30,25 +30,25 @@ public class SimpleQueueTest extends RxJavaTest {
 
     @Test(expected = NullPointerException.class)
     public void spscArrayQueueNull() {
-        SpscArrayQueue<Object> q = new SpscArrayQueue<Object>(16);
+        SpscArrayQueue<Object> q = new SpscArrayQueue<>(16);
         q.offer(null);
     }
 
     @Test(expected = NullPointerException.class)
     public void spscLinkedArrayQueueNull() {
-        SpscLinkedArrayQueue<Object> q = new SpscLinkedArrayQueue<Object>(16);
+        SpscLinkedArrayQueue<Object> q = new SpscLinkedArrayQueue<>(16);
         q.offer(null);
     }
 
     @Test(expected = NullPointerException.class)
     public void mpscLinkedQueueNull() {
-        MpscLinkedQueue<Object> q = new MpscLinkedQueue<Object>();
+        MpscLinkedQueue<Object> q = new MpscLinkedQueue<>();
         q.offer(null);
     }
 
     @Test
     public void spscArrayQueueBiOffer() {
-        SpscArrayQueue<Object> q = new SpscArrayQueue<Object>(16);
+        SpscArrayQueue<Object> q = new SpscArrayQueue<>(16);
         q.offer(1, 2);
 
         assertEquals(1, q.poll());
@@ -58,7 +58,7 @@ public void spscArrayQueueBiOffer() {
 
     @Test
     public void spscLinkedArrayQueueBiOffer() {
-        SpscLinkedArrayQueue<Object> q = new SpscLinkedArrayQueue<Object>(16);
+        SpscLinkedArrayQueue<Object> q = new SpscLinkedArrayQueue<>(16);
         q.offer(1, 2);
 
         assertEquals(1, q.poll());
@@ -68,7 +68,7 @@ public void spscLinkedArrayQueueBiOffer() {
 
     @Test
     public void mpscLinkedQueueBiOffer() {
-        MpscLinkedQueue<Object> q = new MpscLinkedQueue<Object>();
+        MpscLinkedQueue<Object> q = new MpscLinkedQueue<>();
         q.offer(1, 2);
 
         assertEquals(1, q.poll());
@@ -78,7 +78,7 @@ public void mpscLinkedQueueBiOffer() {
 
     @Test
     public void spscBiOfferCapacity() {
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(8);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(8);
         assertTrue(q.offer(1, 2));
         assertTrue(q.offer(3, 4));
         assertTrue(q.offer(5, 6));
@@ -90,7 +90,7 @@ public void spscBiOfferCapacity() {
 
     @Test
     public void spscLinkedNewBufferPeek() {
-        SpscLinkedArrayQueue<Integer> q = new SpscLinkedArrayQueue<Integer>(8);
+        SpscLinkedArrayQueue<Integer> q = new SpscLinkedArrayQueue<>(8);
         assertTrue(q.offer(1, 2));
         assertTrue(q.offer(3, 4));
         assertTrue(q.offer(5, 6));
@@ -107,7 +107,7 @@ public void spscLinkedNewBufferPeek() {
 
     @Test
     public void mpscOfferPollRace() throws Exception {
-        final MpscLinkedQueue<Integer> q = new MpscLinkedQueue<Integer>();
+        final MpscLinkedQueue<Integer> q = new MpscLinkedQueue<>();
 
         final AtomicInteger c = new AtomicInteger(3);
 
@@ -160,7 +160,7 @@ public void run() {
 
     @Test
     public void spscLinkedArrayQueueNoNepotism() {
-        SpscLinkedArrayQueue<Integer> q = new SpscLinkedArrayQueue<Integer>(16);
+        SpscLinkedArrayQueue<Integer> q = new SpscLinkedArrayQueue<>(16);
 
         AtomicReferenceArray<Object> ara = q.producerBuffer;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
index 577aa468de..7b7299f309 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
@@ -156,12 +156,12 @@ public void run() {
 
             task.dispose();
 
-            FutureTask<Void> f1 = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+            FutureTask<Void> f1 = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
             task.setFirst(f1);
 
             assertTrue(f1.isCancelled());
 
-            FutureTask<Void> f2 = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+            FutureTask<Void> f2 = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
             task.setRest(f2);
 
             assertTrue(f2.isCancelled());
@@ -187,12 +187,12 @@ public void run() {
 
             task.dispose();
 
-            FutureTask<Void> f1 = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+            FutureTask<Void> f1 = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
             task.setFirst(f1);
 
             assertTrue(f1.isCancelled());
 
-            FutureTask<Void> f2 = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+            FutureTask<Void> f2 = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
             task.setRest(f2);
 
             assertTrue(f2.isCancelled());
@@ -214,7 +214,7 @@ public void run() {
                     }
                 }, exec);
 
-                final FutureTask<Void> f1 = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+                final FutureTask<Void> f1 = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
                 Runnable r1 = new Runnable() {
                     @Override
                     public void run() {
@@ -251,7 +251,7 @@ public void run() {
                     }
                 }, exec);
 
-                final FutureTask<Void> f1 = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+                final FutureTask<Void> f1 = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
                 Runnable r1 = new Runnable() {
                     @Override
                     public void run() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
index 58305b7e9e..a8920fbd93 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
@@ -65,7 +65,7 @@ public void setFutureCancelRace() {
             final ScheduledRunnable run = new ScheduledRunnable(Functions.EMPTY_RUNNABLE, set);
             set.add(run);
 
-            final FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, 0);
+            final FutureTask<Object> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 0);
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -94,7 +94,7 @@ public void setFutureRunRace() {
             final ScheduledRunnable run = new ScheduledRunnable(Functions.EMPTY_RUNNABLE, set);
             set.add(run);
 
-            final FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, 0);
+            final FutureTask<Object> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, 0);
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -266,7 +266,7 @@ public void runFuture() {
             final ScheduledRunnable run = new ScheduledRunnable(Functions.EMPTY_RUNNABLE, set);
             set.add(run);
 
-            final FutureTask<Void> ft = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+            final FutureTask<Void> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -316,7 +316,7 @@ public void run() {
             final ScheduledRunnable run = new ScheduledRunnable(r0, set);
             set.add(run);
 
-            final FutureTask<Void> ft = new FutureTask<Void>(run, null);
+            final FutureTask<Void> ft = new FutureTask<>(run, null);
 
             Runnable r2 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java
index 332a115604..21b4514be1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java
@@ -33,7 +33,7 @@ public class SchedulerMultiWorkerSupportTest extends RxJavaTest {
 
     @Test
     public void moreThanMaxWorkers() {
-        final List<Worker> list = new ArrayList<Worker>();
+        final List<Worker> list = new ArrayList<>();
 
         SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)Schedulers.computation();
 
@@ -49,7 +49,7 @@ public void onWorker(int i, Worker w) {
 
     @Test
     public void getShutdownWorkers() {
-        final List<Worker> list = new ArrayList<Worker>();
+        final List<Worker> list = new ArrayList<>();
 
         ComputationScheduler.NONE.createWorkers(max * 2, new WorkerCallback() {
             @Override
@@ -74,14 +74,14 @@ public void distinctThreads() throws Exception {
             try {
                 final CountDownLatch cdl = new CountDownLatch(max * 2);
 
-                final Set<String> threads1 = Collections.synchronizedSet(new HashSet<String>());
+                final Set<String> threads1 = Collections.synchronizedSet(new HashSet<>());
 
-                final Set<String> threads2 = Collections.synchronizedSet(new HashSet<String>());
+                final Set<String> threads2 = Collections.synchronizedSet(new HashSet<>());
 
                 Runnable parallel1 = new Runnable() {
                     @Override
                     public void run() {
-                        final List<Worker> list1 = new ArrayList<Worker>();
+                        final List<Worker> list1 = new ArrayList<>();
 
                         SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)Schedulers.computation();
 
@@ -110,7 +110,7 @@ public void run() {
                 Runnable parallel2 = new Runnable() {
                     @Override
                     public void run() {
-                        final List<Worker> list2 = new ArrayList<Worker>();
+                        final List<Worker> list2 = new ArrayList<>();
 
                         SchedulerMultiWorkerSupport mws = (SchedulerMultiWorkerSupport)Schedulers.computation();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
index 0bcfd2d12a..c84e380701 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
@@ -75,7 +75,7 @@ public Integer poll() throws Exception {
             }
         };
 
-        fcs.onSubscribe(new ScalarSubscription<Integer>(fcs, 1));
+        fcs.onSubscribe(new ScalarSubscription<>(fcs, 1));
 
         TestHelper.assertNoOffer(fcs);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
index b3543ad7d3..87ccd91b92 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
@@ -27,7 +27,7 @@ public class BasicFuseableSubscriberTest extends RxJavaTest {
 
     @Test
     public void offerThrows() {
-        BasicFuseableSubscriber<Integer, Integer> fcs = new BasicFuseableSubscriber<Integer, Integer>(new TestSubscriber<Integer>(0L)) {
+        BasicFuseableSubscriber<Integer, Integer> fcs = new BasicFuseableSubscriber<Integer, Integer>(new TestSubscriber<>(0L)) {
 
             @Override
             public void onNext(Integer t) {
@@ -45,7 +45,7 @@ public Integer poll() throws Exception {
             }
         };
 
-        fcs.onSubscribe(new ScalarSubscription<Integer>(fcs, 1));
+        fcs.onSubscribe(new ScalarSubscription<>(fcs, 1));
 
         TestHelper.assertNoOffer(fcs);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java
index f127e60c44..563a52a984 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java
@@ -29,12 +29,12 @@ public class BlockingSubscriberTest extends RxJavaTest {
 
     @Test
     public void doubleOnSubscribe() {
-        TestHelper.doubleOnSubscribe(new BlockingSubscriber<Integer>(new ArrayDeque<Object>()));
+        TestHelper.doubleOnSubscribe(new BlockingSubscriber<Integer>(new ArrayDeque<>()));
     }
 
     @Test
     public void cancel() {
-        BlockingSubscriber<Integer> bq = new BlockingSubscriber<Integer>(new ArrayDeque<Object>());
+        BlockingSubscriber<Integer> bq = new BlockingSubscriber<>(new ArrayDeque<>());
 
         assertFalse(bq.isCancelled());
 
@@ -54,7 +54,7 @@ public void blockingFirstDoubleOnSubscribe() {
 
     @Test
     public void blockingFirstTimeout() {
-        BlockingFirstSubscriber<Integer> bf = new BlockingFirstSubscriber<Integer>();
+        BlockingFirstSubscriber<Integer> bf = new BlockingFirstSubscriber<>();
 
         Thread.currentThread().interrupt();
 
@@ -68,7 +68,7 @@ public void blockingFirstTimeout() {
 
     @Test
     public void blockingFirstTimeout2() {
-        BlockingFirstSubscriber<Integer> bf = new BlockingFirstSubscriber<Integer>();
+        BlockingFirstSubscriber<Integer> bf = new BlockingFirstSubscriber<>();
 
         bf.onSubscribe(new BooleanSubscription());
 
@@ -85,7 +85,7 @@ public void blockingFirstTimeout2() {
     @Test
     public void cancelOnRequest() {
 
-        final BlockingFirstSubscriber<Integer> bf = new BlockingFirstSubscriber<Integer>();
+        final BlockingFirstSubscriber<Integer> bf = new BlockingFirstSubscriber<>();
 
         final AtomicBoolean b = new AtomicBoolean();
 
@@ -109,7 +109,7 @@ public void cancel() {
     @Test
     public void cancelUpfront() {
 
-        final BlockingFirstSubscriber<Integer> bf = new BlockingFirstSubscriber<Integer>();
+        final BlockingFirstSubscriber<Integer> bf = new BlockingFirstSubscriber<>();
 
         final AtomicBoolean b = new AtomicBoolean();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
index c2d843fb23..d6b80cc873 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
@@ -33,9 +33,9 @@ public class BoundedSubscriberTest extends RxJavaTest {
 
     @Test
     public void onSubscribeThrows() {
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        BoundedSubscriber<Object> subscriber = new BoundedSubscriber<Object>(new Consumer<Object>() {
+        BoundedSubscriber<Object> subscriber = new BoundedSubscriber<>(new Consumer<Object>() {
             @Override
             public void accept(Object o) throws Exception {
                 received.add(o);
@@ -69,9 +69,9 @@ public void accept(Subscription subscription) throws Exception {
 
     @Test
     public void onNextThrows() {
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        BoundedSubscriber<Object> subscriber = new BoundedSubscriber<Object>(new Consumer<Object>() {
+        BoundedSubscriber<Object> subscriber = new BoundedSubscriber<>(new Consumer<Object>() {
             @Override
             public void accept(Object o) throws Exception {
                 throw new TestException();
@@ -108,9 +108,9 @@ public void onErrorThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
 
         try {
-            final List<Object> received = new ArrayList<Object>();
+            final List<Object> received = new ArrayList<>();
 
-            BoundedSubscriber<Object> subscriber = new BoundedSubscriber<Object>(new Consumer<Object>() {
+            BoundedSubscriber<Object> subscriber = new BoundedSubscriber<>(new Consumer<Object>() {
                 @Override
                 public void accept(Object o) throws Exception {
                     received.add(o);
@@ -154,9 +154,9 @@ public void onCompleteThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
 
         try {
-            final List<Object> received = new ArrayList<Object>();
+            final List<Object> received = new ArrayList<>();
 
-            BoundedSubscriber<Object> subscriber = new BoundedSubscriber<Object>(new Consumer<Object>() {
+            BoundedSubscriber<Object> subscriber = new BoundedSubscriber<>(new Consumer<Object>() {
                 @Override
                 public void accept(Object o) throws Exception {
                     received.add(o);
@@ -196,9 +196,9 @@ public void accept(Subscription subscription) throws Exception {
     public void onNextThrowsCancelsUpstream() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
-        BoundedSubscriber<Integer> s = new BoundedSubscriber<Integer>(new Consumer<Integer>() {
+        BoundedSubscriber<Integer> s = new BoundedSubscriber<>(new Consumer<Integer>() {
             @Override
             public void accept(Integer v) throws Exception {
                 throw new TestException();
@@ -237,9 +237,9 @@ public void accept(Subscription subscription) throws Exception {
     public void onSubscribeThrowsCancelsUpstream() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
-        BoundedSubscriber<Integer> s = new BoundedSubscriber<Integer>(new Consumer<Integer>() {
+        BoundedSubscriber<Integer> s = new BoundedSubscriber<>(new Consumer<Integer>() {
             @Override
             public void accept(Integer v) throws Exception {
             }
@@ -285,9 +285,9 @@ public void subscribe(Subscriber<? super Integer> s) {
             }
         });
 
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        BoundedSubscriber<Object> subscriber = new BoundedSubscriber<Object>(new Consumer<Object>() {
+        BoundedSubscriber<Object> subscriber = new BoundedSubscriber<>(new Consumer<Object>() {
             @Override
             public void accept(Object v) throws Exception {
                 received.add(v);
@@ -330,9 +330,9 @@ public void subscribe(Subscriber<? super Integer> s) {
             }
         });
 
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        BoundedSubscriber<Object> subscriber = new BoundedSubscriber<Object>(new Consumer<Object>() {
+        BoundedSubscriber<Object> subscriber = new BoundedSubscriber<>(new Consumer<Object>() {
             @Override
             public void accept(Object v) throws Exception {
                 received.add(v);
@@ -361,7 +361,7 @@ public void accept(Subscription s) throws Exception {
 
     @Test
     public void onErrorMissingShouldReportNoCustomOnError() {
-        BoundedSubscriber<Integer> subscriber = new BoundedSubscriber<Integer>(Functions.<Integer>emptyConsumer(),
+        BoundedSubscriber<Integer> subscriber = new BoundedSubscriber<>(Functions.<Integer>emptyConsumer(),
                 Functions.ON_ERROR_MISSING,
                 Functions.EMPTY_ACTION,
                 Functions.<Subscription>boundedConsumer(128), 128);
@@ -371,7 +371,7 @@ public void onErrorMissingShouldReportNoCustomOnError() {
 
     @Test
     public void customOnErrorShouldReportCustomOnError() {
-        BoundedSubscriber<Integer> subscriber = new BoundedSubscriber<Integer>(Functions.<Integer>emptyConsumer(),
+        BoundedSubscriber<Integer> subscriber = new BoundedSubscriber<>(Functions.<Integer>emptyConsumer(),
                 Functions.<Throwable>emptyConsumer(),
                 Functions.EMPTY_ACTION,
                 Functions.<Subscription>boundedConsumer(128), 128);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java
index fcc3a2f8ea..698fcc18ac 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java
@@ -427,7 +427,7 @@ public void downstreamRequest(long n) {
 
     @Test
     public void doubleOnSubscribe() {
-        TestHelper.doubleOnSubscribe(new DeferredScalarSubscriber<Integer, Integer>(new TestSubscriber<Integer>()) {
+        TestHelper.doubleOnSubscribe(new DeferredScalarSubscriber<Integer, Integer>(new TestSubscriber<>()) {
             private static final long serialVersionUID = -4445381578878059054L;
 
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
index fb75eb46b0..69450f2ad0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
@@ -34,7 +34,7 @@ public class FutureSubscriberTest extends RxJavaTest {
 
     @Before
     public void before() {
-        fs = new FutureSubscriber<Integer>();
+        fs = new FutureSubscriber<>();
     }
 
     @Test
@@ -128,7 +128,7 @@ public void onSubscribe() throws Exception {
     @Test
     public void cancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final FutureSubscriber<Integer> fs = new FutureSubscriber<Integer>();
+            final FutureSubscriber<Integer> fs = new FutureSubscriber<>();
 
             Runnable r = new Runnable() {
                 @Override
@@ -157,7 +157,7 @@ public void run() {
     @Test
     public void onErrorCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final FutureSubscriber<Integer> fs = new FutureSubscriber<Integer>();
+            final FutureSubscriber<Integer> fs = new FutureSubscriber<>();
 
             final TestException ex = new TestException();
 
@@ -182,7 +182,7 @@ public void run() {
     @Test
     public void onCompleteCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final FutureSubscriber<Integer> fs = new FutureSubscriber<Integer>();
+            final FutureSubscriber<Integer> fs = new FutureSubscriber<>();
 
             if (i % 3 == 0) {
                 fs.onSubscribe(new BooleanSubscription());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java
index f613bada98..e6533166ce 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java
@@ -44,9 +44,9 @@ public void drain() {
             }
         };
 
-        InnerQueuedSubscriber<Integer> inner = new InnerQueuedSubscriber<Integer>(support, 4);
+        InnerQueuedSubscriber<Integer> inner = new InnerQueuedSubscriber<>(support, 4);
 
-        final List<Long> requests = new ArrayList<Long>();
+        final List<Long> requests = new ArrayList<>();
 
         inner.onSubscribe(new Subscription() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
index 18cde98c75..17e4fb2fc9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
@@ -34,20 +34,20 @@ public class LambdaSubscriberTest extends RxJavaTest {
 
     @Test
     public void onSubscribeThrows() {
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        LambdaSubscriber<Object> subscriber = new LambdaSubscriber<Object>(new Consumer<Object>() {
+        LambdaSubscriber<Object> subscriber = new LambdaSubscriber<>(new Consumer<Object>() {
             @Override
             public void accept(Object v) throws Exception {
                 received.add(v);
             }
         },
-        new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable e) throws Exception {
-                received.add(e);
-            }
-        }, new Action() {
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable e) throws Exception {
+                        received.add(e);
+                    }
+                }, new Action() {
             @Override
             public void run() throws Exception {
                 received.add(100);
@@ -71,20 +71,20 @@ public void accept(Subscription s) throws Exception {
 
     @Test
     public void onNextThrows() {
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        LambdaSubscriber<Object> subscriber = new LambdaSubscriber<Object>(new Consumer<Object>() {
+        LambdaSubscriber<Object> subscriber = new LambdaSubscriber<>(new Consumer<Object>() {
             @Override
             public void accept(Object v) throws Exception {
                 throw new TestException();
             }
         },
-        new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable e) throws Exception {
-                received.add(e);
-            }
-        }, new Action() {
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable e) throws Exception {
+                        received.add(e);
+                    }
+                }, new Action() {
             @Override
             public void run() throws Exception {
                 received.add(100);
@@ -111,20 +111,20 @@ public void onErrorThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
 
         try {
-            final List<Object> received = new ArrayList<Object>();
+            final List<Object> received = new ArrayList<>();
 
-            LambdaSubscriber<Object> subscriber = new LambdaSubscriber<Object>(new Consumer<Object>() {
+            LambdaSubscriber<Object> subscriber = new LambdaSubscriber<>(new Consumer<Object>() {
                 @Override
                 public void accept(Object v) throws Exception {
                     received.add(v);
                 }
             },
-            new Consumer<Throwable>() {
-                @Override
-                public void accept(Throwable e) throws Exception {
-                    throw new TestException("Inner");
-                }
-            }, new Action() {
+                    new Consumer<Throwable>() {
+                        @Override
+                        public void accept(Throwable e) throws Exception {
+                            throw new TestException("Inner");
+                        }
+                    }, new Action() {
                 @Override
                 public void run() throws Exception {
                     received.add(100);
@@ -158,20 +158,20 @@ public void onCompleteThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
 
         try {
-            final List<Object> received = new ArrayList<Object>();
+            final List<Object> received = new ArrayList<>();
 
-            LambdaSubscriber<Object> subscriber = new LambdaSubscriber<Object>(new Consumer<Object>() {
+            LambdaSubscriber<Object> subscriber = new LambdaSubscriber<>(new Consumer<Object>() {
                 @Override
                 public void accept(Object v) throws Exception {
                     received.add(v);
                 }
             },
-            new Consumer<Throwable>() {
-                @Override
-                public void accept(Throwable e) throws Exception {
-                    received.add(e);
-                }
-            }, new Action() {
+                    new Consumer<Throwable>() {
+                        @Override
+                        public void accept(Throwable e) throws Exception {
+                            received.add(e);
+                        }
+                    }, new Action() {
                 @Override
                 public void run() throws Exception {
                     throw new TestException();
@@ -215,20 +215,20 @@ public void subscribe(Subscriber<? super Integer> s) {
             }
         });
 
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        LambdaSubscriber<Object> subscriber = new LambdaSubscriber<Object>(new Consumer<Object>() {
+        LambdaSubscriber<Object> subscriber = new LambdaSubscriber<>(new Consumer<Object>() {
             @Override
             public void accept(Object v) throws Exception {
                 received.add(v);
             }
         },
-        new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable e) throws Exception {
-                received.add(e);
-            }
-        }, new Action() {
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable e) throws Exception {
+                        received.add(e);
+                    }
+                }, new Action() {
             @Override
             public void run() throws Exception {
                 received.add(100);
@@ -261,20 +261,20 @@ public void subscribe(Subscriber<? super Integer> s) {
             }
         });
 
-        final List<Object> received = new ArrayList<Object>();
+        final List<Object> received = new ArrayList<>();
 
-        LambdaSubscriber<Object> subscriber = new LambdaSubscriber<Object>(new Consumer<Object>() {
+        LambdaSubscriber<Object> subscriber = new LambdaSubscriber<>(new Consumer<Object>() {
             @Override
             public void accept(Object v) throws Exception {
                 received.add(v);
             }
         },
-        new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable e) throws Exception {
-                received.add(e);
-            }
-        }, new Action() {
+                new Consumer<Throwable>() {
+                    @Override
+                    public void accept(Throwable e) throws Exception {
+                        received.add(e);
+                    }
+                }, new Action() {
             @Override
             public void run() throws Exception {
                 received.add(100);
@@ -295,7 +295,7 @@ public void accept(Subscription s) throws Exception {
     public void onNextThrowsCancelsUpstream() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         pp.subscribe(new Consumer<Integer>() {
             @Override
@@ -324,9 +324,9 @@ public void accept(Throwable e) throws Exception {
     public void onSubscribeThrowsCancelsUpstream() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
-        pp.subscribe(new LambdaSubscriber<Integer>(new Consumer<Integer>() {
+        pp.subscribe(new LambdaSubscriber<>(new Consumer<Integer>() {
             @Override
             public void accept(Integer v) throws Exception {
             }
@@ -354,7 +354,7 @@ public void accept(Subscription s) throws Exception {
 
     @Test
     public void onErrorMissingShouldReportNoCustomOnError() {
-        LambdaSubscriber<Integer> subscriber = new LambdaSubscriber<Integer>(Functions.<Integer>emptyConsumer(),
+        LambdaSubscriber<Integer> subscriber = new LambdaSubscriber<>(Functions.<Integer>emptyConsumer(),
                 Functions.ON_ERROR_MISSING,
                 Functions.EMPTY_ACTION,
                 FlowableInternalHelper.RequestMax.INSTANCE);
@@ -364,7 +364,7 @@ public void onErrorMissingShouldReportNoCustomOnError() {
 
     @Test
     public void customOnErrorShouldReportCustomOnError() {
-        LambdaSubscriber<Integer> subscriber = new LambdaSubscriber<Integer>(Functions.<Integer>emptyConsumer(),
+        LambdaSubscriber<Integer> subscriber = new LambdaSubscriber<>(Functions.<Integer>emptyConsumer(),
                 Functions.<Throwable>emptyConsumer(),
                 Functions.EMPTY_ACTION,
                 FlowableInternalHelper.RequestMax.INSTANCE);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
index 41d3178384..6d09484d55 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
@@ -32,7 +32,7 @@
 public class QueueDrainSubscriberTest extends RxJavaTest {
 
     static final QueueDrainSubscriber<Integer, Integer, Integer> createUnordered(TestSubscriber<Integer> ts, final Disposable d) {
-        return new QueueDrainSubscriber<Integer, Integer, Integer>(ts, new SpscArrayQueue<Integer>(4)) {
+        return new QueueDrainSubscriber<Integer, Integer, Integer>(ts, new SpscArrayQueue<>(4)) {
             @Override
             public void onNext(Integer t) {
                 fastPathEmitMax(t, false, d);
@@ -60,7 +60,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
     }
 
     static final QueueDrainSubscriber<Integer, Integer, Integer> createOrdered(TestSubscriber<Integer> ts, final Disposable d) {
-        return new QueueDrainSubscriber<Integer, Integer, Integer>(ts, new SpscArrayQueue<Integer>(4)) {
+        return new QueueDrainSubscriber<Integer, Integer, Integer>(ts, new SpscArrayQueue<>(4)) {
             @Override
             public void onNext(Integer t) {
                 fastPathOrderedEmitMax(t, false, d);
@@ -88,7 +88,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
     }
 
     static final QueueDrainSubscriber<Integer, Integer, Integer> createUnorderedReject(TestSubscriber<Integer> ts, final Disposable d) {
-        return new QueueDrainSubscriber<Integer, Integer, Integer>(ts, new SpscArrayQueue<Integer>(4)) {
+        return new QueueDrainSubscriber<Integer, Integer, Integer>(ts, new SpscArrayQueue<>(4)) {
             @Override
             public void onNext(Integer t) {
                 fastPathEmitMax(t, false, d);
@@ -116,7 +116,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
     }
 
     static final QueueDrainSubscriber<Integer, Integer, Integer> createOrderedReject(TestSubscriber<Integer> ts, final Disposable d) {
-        return new QueueDrainSubscriber<Integer, Integer, Integer>(ts, new SpscArrayQueue<Integer>(4)) {
+        return new QueueDrainSubscriber<Integer, Integer, Integer>(ts, new SpscArrayQueue<>(4)) {
             @Override
             public void onNext(Integer t) {
                 fastPathOrderedEmitMax(t, false, d);
@@ -145,7 +145,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
 
     @Test
     public void unorderedFastPathNoRequest() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
@@ -159,7 +159,7 @@ public void unorderedFastPathNoRequest() {
 
     @Test
     public void orderedFastPathNoRequest() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
@@ -173,7 +173,7 @@ public void orderedFastPathNoRequest() {
 
     @Test
     public void acceptBadRequest() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
@@ -191,7 +191,7 @@ public void acceptBadRequest() {
 
     @Test
     public void unorderedFastPathRequest1() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
@@ -205,7 +205,7 @@ public void unorderedFastPathRequest1() {
 
     @Test
     public void orderedFastPathRequest1() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
@@ -219,7 +219,7 @@ public void orderedFastPathRequest1() {
 
     @Test
     public void unorderedSlowPath() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
@@ -232,7 +232,7 @@ public void unorderedSlowPath() {
 
     @Test
     public void orderedSlowPath() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
@@ -245,7 +245,7 @@ public void orderedSlowPath() {
 
     @Test
     public void orderedSlowPathNonEmptyQueue() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
         ts.onSubscribe(new BooleanSubscription());
@@ -261,7 +261,7 @@ public void orderedSlowPathNonEmptyQueue() {
     public void unorderedOnNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+            TestSubscriber<Integer> ts = new TestSubscriber<>(1);
             Disposable d = Disposable.empty();
             final QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnordered(ts, d);
             ts.onSubscribe(new BooleanSubscription());
@@ -284,7 +284,7 @@ public void run() {
     public void orderedOnNextRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
 
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+            TestSubscriber<Integer> ts = new TestSubscriber<>(1);
             Disposable d = Disposable.empty();
             final QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrdered(ts, d);
             ts.onSubscribe(new BooleanSubscription());
@@ -305,7 +305,7 @@ public void run() {
 
     @Test
     public void unorderedFastPathReject() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createUnorderedReject(ts, d);
         ts.onSubscribe(new BooleanSubscription());
@@ -321,7 +321,7 @@ public void unorderedFastPathReject() {
 
     @Test
     public void orderedFastPathReject() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(1);
         Disposable d = Disposable.empty();
         QueueDrainSubscriber<Integer, Integer, Integer> qd = createOrderedReject(ts, d);
         ts.onSubscribe(new BooleanSubscription());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java
index c60ccf8920..1a9bb1310b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java
@@ -25,7 +25,7 @@ public class SinglePostCompleteSubscriberTest extends RxJavaTest {
     @Test
     public void requestCompleteRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            final TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
             final SinglePostCompleteSubscriber<Integer, Integer> spc = new SinglePostCompleteSubscriber<Integer, Integer>(ts) {
                 private static final long serialVersionUID = -2848918821531562637L;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java
index a94b034166..1b36462c47 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java
@@ -29,7 +29,7 @@ public class StrictSubscriberTest extends RxJavaTest {
 
     @Test
     public void strictMode() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         Subscriber<Object> sub = new Subscriber<Object>() {
 
             @Override
@@ -94,8 +94,8 @@ public void onComplete() {
 
     @Test
     public void normalOnNext() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
-        SubscriberWrapper<Integer> wrapper = new SubscriberWrapper<Integer>(ts);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        SubscriberWrapper<Integer> wrapper = new SubscriberWrapper<>(ts);
 
         Flowable.range(1, 5).subscribe(wrapper);
 
@@ -104,8 +104,8 @@ public void normalOnNext() {
 
     @Test
     public void normalOnNextBackpressured() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(0);
-        SubscriberWrapper<Integer> wrapper = new SubscriberWrapper<Integer>(ts);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0);
+        SubscriberWrapper<Integer> wrapper = new SubscriberWrapper<>(ts);
 
         Flowable.range(1, 5).subscribe(wrapper);
 
@@ -120,8 +120,8 @@ public void normalOnNextBackpressured() {
 
     @Test
     public void normalOnError() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
-        SubscriberWrapper<Integer> wrapper = new SubscriberWrapper<Integer>(ts);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        SubscriberWrapper<Integer> wrapper = new SubscriberWrapper<>(ts);
 
         Flowable.range(1, 5).concatWith(Flowable.<Integer>error(new TestException()))
         .subscribe(wrapper);
@@ -131,7 +131,7 @@ public void normalOnError() {
 
     @Test
     public void deferredRequest() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         Subscriber<Object> sub = new Subscriber<Object>() {
 
             @Override
@@ -163,7 +163,7 @@ public void onComplete() {
 
     @Test
     public void requestZero() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         Subscriber<Object> sub = new Subscriber<Object>() {
 
             @Override
@@ -195,7 +195,7 @@ public void onComplete() {
 
     @Test
     public void requestNegative() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         Subscriber<Object> sub = new Subscriber<Object>() {
 
             @Override
@@ -227,7 +227,7 @@ public void onComplete() {
 
     @Test
     public void cancelAfterOnComplete() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         Subscriber<Object> sub = new Subscriber<Object>() {
 
             Subscription upstream;
@@ -269,7 +269,7 @@ protected void subscribeActual(Subscriber<? super Object> s) {
 
     @Test
     public void cancelAfterOnError() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
         Subscriber<Object> sub = new Subscriber<Object>() {
 
             Subscription upstream;
@@ -311,8 +311,8 @@ protected void subscribeActual(Subscriber<? super Object> s) {
 
     @Test
     public void doubleOnSubscribe() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
-        SubscriberWrapper<Integer> wrapper = new SubscriberWrapper<Integer>(ts);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        SubscriberWrapper<Integer> wrapper = new SubscriberWrapper<>(ts);
 
         new Flowable<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
index dc7c82893d..bafc579b63 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
@@ -28,9 +28,9 @@
 
 public class SubscriberResourceWrapperTest extends RxJavaTest {
 
-    TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+    TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-    SubscriberResourceWrapper<Integer> s = new SubscriberResourceWrapper<Integer>(ts);
+    SubscriberResourceWrapper<Integer> s = new SubscriberResourceWrapper<>(ts);
 
     @Test
     public void cancel() {
@@ -94,7 +94,7 @@ public Flowable<Object> apply(Flowable<Object> f) throws Exception {
                     @Override
                     public Subscriber<? super Object> apply(
                             Subscriber<? super Object> s) throws Exception {
-                        return new SubscriberResourceWrapper<Object>(s);
+                        return new SubscriberResourceWrapper<>(s);
                     }
                 });
             }
@@ -107,7 +107,7 @@ public void badRequest() {
             @Override
             public Subscriber<? super Object> apply(
                     Subscriber<? super Object> s) throws Exception {
-                return new SubscriberResourceWrapper<Object>(s);
+                return new SubscriberResourceWrapper<>(s);
             }
         }));
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
index 0f42ba85b6..dfe9e83f89 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
@@ -26,14 +26,14 @@ public class DeferredScalarSubscriptionTest extends RxJavaTest {
 
     @Test
     public void queueSubscriptionSyncRejected() {
-        DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<Integer>(new TestSubscriber<Integer>());
+        DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<>(new TestSubscriber<>());
 
         assertEquals(QueueFuseable.NONE, ds.requestFusion(QueueFuseable.SYNC));
     }
 
     @Test
     public void clear() {
-        DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<Integer>(new TestSubscriber<Integer>());
+        DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<>(new TestSubscriber<>());
 
         ds.value = 1;
 
@@ -45,7 +45,7 @@ public void clear() {
 
     @Test
     public void cancel() {
-        DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<Integer>(new TestSubscriber<Integer>());
+        DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<>(new TestSubscriber<>());
 
         assertTrue(ds.tryCancel());
 
@@ -55,7 +55,7 @@ public void cancel() {
     @Test
     public void completeCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<Integer>(new TestSubscriber<Integer>());
+            final DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<>(new TestSubscriber<>());
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -78,9 +78,9 @@ public void run() {
     @Test
     public void requestClearRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
-            final DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<Integer>(ts);
+            final DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<>(ts);
             ts.onSubscribe(ds);
             ds.complete(1);
 
@@ -109,9 +109,9 @@ public void run() {
     @Test
     public void requestCancelRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+            TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
-            final DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<Integer>(ts);
+            final DeferredScalarSubscription<Integer> ds = new DeferredScalarSubscription<>(ts);
             ts.onSubscribe(ds);
             ds.complete(1);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java
index 275b15f73c..55a564280c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java
@@ -26,9 +26,9 @@ public class ScalarSubscriptionTest extends RxJavaTest {
 
     @Test
     public void badRequest() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
-        ScalarSubscription<Integer> sc = new ScalarSubscription<Integer>(ts, 1);
+        ScalarSubscription<Integer> sc = new ScalarSubscription<>(ts, 1);
 
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -42,9 +42,9 @@ public void badRequest() {
 
     @Test
     public void noOffer() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
-        ScalarSubscription<Integer> sc = new ScalarSubscription<Integer>(ts, 1);
+        ScalarSubscription<Integer> sc = new ScalarSubscription<>(ts, 1);
 
         TestHelper.assertNoOffer(sc);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java
index a28a2dd4e5..13a2dc61aa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java
@@ -54,7 +54,7 @@ public void cancelNoOp() {
 
     @Test
     public void set() {
-        AtomicReference<Subscription> atomicSubscription = new AtomicReference<Subscription>();
+        AtomicReference<Subscription> atomicSubscription = new AtomicReference<>();
 
         BooleanSubscription bs1 = new BooleanSubscription();
 
@@ -71,7 +71,7 @@ public void set() {
 
     @Test
     public void replace() {
-        AtomicReference<Subscription> atomicSubscription = new AtomicReference<Subscription>();
+        AtomicReference<Subscription> atomicSubscription = new AtomicReference<>();
 
         BooleanSubscription bs1 = new BooleanSubscription();
 
@@ -89,7 +89,7 @@ public void replace() {
     @Test
     public void cancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final AtomicReference<Subscription> atomicSubscription = new AtomicReference<Subscription>();
+            final AtomicReference<Subscription> atomicSubscription = new AtomicReference<>();
 
             Runnable r = new Runnable() {
                 @Override
@@ -105,7 +105,7 @@ public void run() {
     @Test
     public void setRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final AtomicReference<Subscription> atomicSubscription = new AtomicReference<Subscription>();
+            final AtomicReference<Subscription> atomicSubscription = new AtomicReference<>();
 
             final BooleanSubscription bs1 = new BooleanSubscription();
             final BooleanSubscription bs2 = new BooleanSubscription();
@@ -133,7 +133,7 @@ public void run() {
     @Test
     public void replaceRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final AtomicReference<Subscription> atomicSubscription = new AtomicReference<Subscription>();
+            final AtomicReference<Subscription> atomicSubscription = new AtomicReference<>();
 
             final BooleanSubscription bs1 = new BooleanSubscription();
             final BooleanSubscription bs2 = new BooleanSubscription();
@@ -161,7 +161,7 @@ public void run() {
 
     @Test
     public void cancelAndChange() {
-        AtomicReference<Subscription> atomicSubscription = new AtomicReference<Subscription>();
+        AtomicReference<Subscription> atomicSubscription = new AtomicReference<>();
 
         SubscriptionHelper.cancel(atomicSubscription);
 
@@ -180,7 +180,7 @@ public void cancelAndChange() {
 
     @Test
     public void invalidDeferredRequest() {
-        AtomicReference<Subscription> atomicSubscription = new AtomicReference<Subscription>();
+        AtomicReference<Subscription> atomicSubscription = new AtomicReference<>();
         AtomicLong r = new AtomicLong();
 
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -196,7 +196,7 @@ public void invalidDeferredRequest() {
     @Test
     public void deferredRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final AtomicReference<Subscription> atomicSubscription = new AtomicReference<Subscription>();
+            final AtomicReference<Subscription> atomicSubscription = new AtomicReference<>();
             final AtomicLong r = new AtomicLong();
 
             final AtomicLong q = new AtomicLong();
@@ -237,7 +237,7 @@ public void run() {
 
     @Test
     public void setOnceAndRequest() {
-        AtomicReference<Subscription> ref = new AtomicReference<Subscription>();
+        AtomicReference<Subscription> ref = new AtomicReference<>();
 
         Subscription sub = mock(Subscription.class);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
index 9b033bffdd..efe3b5c7b2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
@@ -91,7 +91,7 @@ public void tryTerminateAndReportHasError() {
 
     @Test
     public void tryTerminateConsumerSubscriberNoError() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -101,7 +101,7 @@ public void tryTerminateConsumerSubscriberNoError() {
 
     @Test
     public void tryTerminateConsumerSubscriberError() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -112,7 +112,7 @@ public void tryTerminateConsumerSubscriberError() {
 
     @Test
     public void tryTerminateConsumerSubscriberTerminated() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -123,7 +123,7 @@ public void tryTerminateConsumerSubscriberTerminated() {
 
     @Test
     public void tryTerminateConsumerObserverNoError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -133,7 +133,7 @@ public void tryTerminateConsumerObserverNoError() {
 
     @Test
     public void tryTerminateConsumerObserverError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -144,7 +144,7 @@ public void tryTerminateConsumerObserverError() {
 
     @Test
     public void tryTerminateConsumerObserverTerminated() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -155,7 +155,7 @@ public void tryTerminateConsumerObserverTerminated() {
 
     @Test
     public void tryTerminateConsumerMaybeObserverNoError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -165,7 +165,7 @@ public void tryTerminateConsumerMaybeObserverNoError() {
 
     @Test
     public void tryTerminateConsumerMaybeObserverError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -176,7 +176,7 @@ public void tryTerminateConsumerMaybeObserverError() {
 
     @Test
     public void tryTerminateConsumerMaybeObserverTerminated() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -187,7 +187,7 @@ public void tryTerminateConsumerMaybeObserverTerminated() {
 
     @Test
     public void tryTerminateConsumerSingleNoError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -197,7 +197,7 @@ public void tryTerminateConsumerSingleNoError() {
 
     @Test
     public void tryTerminateConsumerSingleError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -208,7 +208,7 @@ public void tryTerminateConsumerSingleError() {
 
     @Test
     public void tryTerminateConsumerSingleTerminated() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -219,7 +219,7 @@ public void tryTerminateConsumerSingleTerminated() {
 
     @Test
     public void tryTerminateConsumerCompletableObserverNoError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -229,7 +229,7 @@ public void tryTerminateConsumerCompletableObserverNoError() {
 
     @Test
     public void tryTerminateConsumerCompletableObserverError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -240,7 +240,7 @@ public void tryTerminateConsumerCompletableObserverError() {
 
     @Test
     public void tryTerminateConsumerCompletableObserverTerminated() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -270,7 +270,7 @@ public void onComplete() {
 
     @Test
     public void tryTerminateConsumerEmitterNoError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -280,7 +280,7 @@ public void tryTerminateConsumerEmitterNoError() {
 
     @Test
     public void tryTerminateConsumerEmitterError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
@@ -291,7 +291,7 @@ public void tryTerminateConsumerEmitterError() {
 
     @Test
     public void tryTerminateConsumerEmitterTerminated() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         AtomicThrowable ex = new AtomicThrowable();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java
index 53089322ea..caf09b372e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java
@@ -45,7 +45,7 @@ public Iterator<T> iterator() {
         if (--crashOnIterator <= 0) {
             throw new TestException("iterator()");
         }
-        return new CrashingMapperIterator<T>(crashOnHasNext, crashOnNext, mapper);
+        return new CrashingMapperIterator<>(crashOnHasNext, crashOnNext, mapper);
     }
 
     static final class CrashingMapperIterator<T> implements Iterator<T> {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java
index 666718a1f5..70b70aea1f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java
@@ -33,7 +33,7 @@ public void utilityClass() {
     public void addRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
 
-            final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+            final AtomicReference<Throwable> error = new AtomicReference<>();
 
             final TestException ex = new TestException();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
index 050e58dc64..cbb66e6425 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
@@ -208,7 +208,7 @@ public void onNextOnCompleteRace() {
             final AtomicInteger wip = new AtomicInteger();
             final AtomicThrowable error = new AtomicThrowable();
 
-            final TestObserver<Integer> to = new TestObserver<Integer>();
+            final TestObserver<Integer> to = new TestObserver<>();
             to.onSubscribe(Disposable.empty());
 
             Runnable r1 = new Runnable() {
@@ -240,7 +240,7 @@ public void onErrorOnCompleteRace() {
             final AtomicInteger wip = new AtomicInteger();
             final AtomicThrowable error = new AtomicThrowable();
 
-            final TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+            final TestObserverEx<Integer> to = new TestObserverEx<>();
 
             to.onSubscribe(Disposable.empty());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
index d7c472e660..44eea4907c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
@@ -214,7 +214,7 @@ public void onNextOnCompleteRace() {
             final AtomicInteger wip = new AtomicInteger();
             final AtomicThrowable error = new AtomicThrowable();
 
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
             ts.onSubscribe(new BooleanSubscription());
 
             Runnable r1 = new Runnable() {
@@ -246,7 +246,7 @@ public void onErrorOnCompleteRace() {
             final AtomicInteger wip = new AtomicInteger();
             final AtomicThrowable error = new AtomicThrowable();
 
-            final TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            final TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
             ts.onSubscribe(new BooleanSubscription());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java
index c8a0968729..dce15c4b28 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java
@@ -25,7 +25,7 @@ public class MergerBiFunctionTest extends RxJavaTest {
 
     @Test
     public void firstEmpty() throws Exception {
-        MergerBiFunction<Integer> merger = new MergerBiFunction<Integer>(new Comparator<Integer>() {
+        MergerBiFunction<Integer> merger = new MergerBiFunction<>(new Comparator<Integer>() {
             @Override
             public int compare(Integer o1, Integer o2) {
                 return o1.compareTo(o2);
@@ -38,7 +38,7 @@ public int compare(Integer o1, Integer o2) {
 
     @Test
     public void bothEmpty() throws Exception {
-        MergerBiFunction<Integer> merger = new MergerBiFunction<Integer>(new Comparator<Integer>() {
+        MergerBiFunction<Integer> merger = new MergerBiFunction<>(new Comparator<Integer>() {
             @Override
             public int compare(Integer o1, Integer o2) {
                 return o1.compareTo(o2);
@@ -51,7 +51,7 @@ public int compare(Integer o1, Integer o2) {
 
     @Test
     public void secondEmpty() throws Exception {
-        MergerBiFunction<Integer> merger = new MergerBiFunction<Integer>(new Comparator<Integer>() {
+        MergerBiFunction<Integer> merger = new MergerBiFunction<>(new Comparator<Integer>() {
             @Override
             public int compare(Integer o1, Integer o2) {
                 return o1.compareTo(o2);
@@ -64,7 +64,7 @@ public int compare(Integer o1, Integer o2) {
 
     @Test
     public void sameSize() throws Exception {
-        MergerBiFunction<Integer> merger = new MergerBiFunction<Integer>(new Comparator<Integer>() {
+        MergerBiFunction<Integer> merger = new MergerBiFunction<>(new Comparator<Integer>() {
             @Override
             public int compare(Integer o1, Integer o2) {
                 return o1.compareTo(o2);
@@ -77,7 +77,7 @@ public int compare(Integer o1, Integer o2) {
 
     @Test
     public void sameSizeReverse() throws Exception {
-        MergerBiFunction<Integer> merger = new MergerBiFunction<Integer>(new Comparator<Integer>() {
+        MergerBiFunction<Integer> merger = new MergerBiFunction<>(new Comparator<Integer>() {
             @Override
             public int compare(Integer o1, Integer o2) {
                 return o1.compareTo(o2);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
index d0b627afaa..b27279eb43 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
@@ -68,13 +68,13 @@ public void linkedArrayList() {
 
     @Test
     public void appendOnlyLinkedArrayListForEachWhile() throws Exception {
-        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<Integer>(2);
+        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<>(2);
 
         list.add(1);
         list.add(2);
         list.add(3);
 
-        final List<Integer> out = new ArrayList<Integer>();
+        final List<Integer> out = new ArrayList<>();
 
         list.forEachWhile(new NonThrowingPredicate<Integer>() {
             @Override
@@ -89,13 +89,13 @@ public boolean test(Integer t2) {
 
     @Test
     public void appendOnlyLinkedArrayListForEachWhileBi() throws Throwable {
-        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<Integer>(2);
+        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<>(2);
 
         list.add(1);
         list.add(2);
         list.add(3);
 
-        final List<Integer> out = new ArrayList<Integer>();
+        final List<Integer> out = new ArrayList<>();
 
         list.forEachWhile(2, new BiPredicate<Integer, Integer>() {
             @Override
@@ -110,13 +110,13 @@ public boolean test(Integer t1, Integer t2) throws Throwable {
 
     @Test
     public void appendOnlyLinkedArrayListForEachWhilePreGrow() throws Exception {
-        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<Integer>(12);
+        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<>(12);
 
         list.add(1);
         list.add(2);
         list.add(3);
 
-        final List<Integer> out = new ArrayList<Integer>();
+        final List<Integer> out = new ArrayList<>();
 
         list.forEachWhile(new NonThrowingPredicate<Integer>() {
             @Override
@@ -131,13 +131,13 @@ public boolean test(Integer t2) {
 
     @Test
     public void appendOnlyLinkedArrayListForEachWhileExact() throws Exception {
-        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<Integer>(3);
+        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<>(3);
 
         list.add(1);
         list.add(2);
         list.add(3);
 
-        final List<Integer> out = new ArrayList<Integer>();
+        final List<Integer> out = new ArrayList<>();
 
         list.forEachWhile(new NonThrowingPredicate<Integer>() {
             @Override
@@ -152,13 +152,13 @@ public boolean test(Integer t2) {
 
     @Test
     public void appendOnlyLinkedArrayListForEachWhileAll() throws Exception {
-        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<Integer>(2);
+        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<>(2);
 
         list.add(1);
         list.add(2);
         list.add(3);
 
-        final List<Integer> out = new ArrayList<Integer>();
+        final List<Integer> out = new ArrayList<>();
 
         list.forEachWhile(new NonThrowingPredicate<Integer>() {
             @Override
@@ -173,13 +173,13 @@ public boolean test(Integer t2) {
 
     @Test
     public void appendOnlyLinkedArrayListForEachWhileBigger() throws Exception {
-        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<Integer>(4);
+        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<>(4);
 
         list.add(1);
         list.add(2);
         list.add(3);
 
-        final List<Integer> out = new ArrayList<Integer>();
+        final List<Integer> out = new ArrayList<>();
 
         list.forEachWhile(new NonThrowingPredicate<Integer>() {
             @Override
@@ -194,13 +194,13 @@ public boolean test(Integer t2) {
 
     @Test
     public void appendOnlyLinkedArrayListForEachWhileBiPreGrow() throws Throwable {
-        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<Integer>(12);
+        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<>(12);
 
         list.add(1);
         list.add(2);
         list.add(3);
 
-        final List<Integer> out = new ArrayList<Integer>();
+        final List<Integer> out = new ArrayList<>();
 
         list.forEachWhile(2, new BiPredicate<Integer, Integer>() {
             @Override
@@ -215,13 +215,13 @@ public boolean test(Integer t1, Integer t2) throws Throwable {
 
     @Test
     public void appendOnlyLinkedArrayListForEachWhileBiExact() throws Throwable {
-        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<Integer>(3);
+        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<>(3);
 
         list.add(1);
         list.add(2);
         list.add(3);
 
-        final List<Integer> out = new ArrayList<Integer>();
+        final List<Integer> out = new ArrayList<>();
 
         list.forEachWhile(2, new BiPredicate<Integer, Integer>() {
             @Override
@@ -236,13 +236,13 @@ public boolean test(Integer t1, Integer t2) throws Exception {
 
     @Test
     public void appendOnlyLinkedArrayListForEachWhileBiAll() throws Throwable {
-        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<Integer>(2);
+        AppendOnlyLinkedArrayList<Integer> list = new AppendOnlyLinkedArrayList<>(2);
 
         list.add(1);
         list.add(2);
         list.add(3);
 
-        final List<Integer> out = new ArrayList<Integer>();
+        final List<Integer> out = new ArrayList<>();
 
         list.forEachWhile(3, new BiPredicate<Integer, Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
index 6fafc2d5db..7e701ff5b9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
@@ -26,7 +26,7 @@ public class NotificationLiteTest extends RxJavaTest {
 
     @Test
     public void acceptFullObserver() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Disposable d = Disposable.empty();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java b/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java
index 02b64e2772..fbe13a185e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java
@@ -26,7 +26,7 @@ private ObservableToFlowabeTestSync() {
     }
 
     static List<String> readAllLines(File f) {
-        List<String> result = new ArrayList<String>();
+        List<String> result = new ArrayList<>();
         try {
             BufferedReader in = new BufferedReader(new FileReader(f));
             try {
@@ -65,7 +65,7 @@ static void list(String basepath, String basepackage) throws Exception {
 
             Class<?> clazz2 = Class.forName(basepackage + "flowable." + cn);
 
-            Set<String> methods2 = new HashSet<String>();
+            Set<String> methods2 = new HashSet<>();
 
             for (Method m : clazz2.getMethods()) {
                 methods2.add(m.getName());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java
index e424298e46..c87bd13192 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java
@@ -39,7 +39,7 @@ public void addRemoveCollision() {
         Value v1 = new Value();
         Value v2 = new Value();
 
-        OpenHashSet<Value> set = new OpenHashSet<Value>();
+        OpenHashSet<Value> set = new OpenHashSet<>();
 
         assertTrue(set.add(v1));
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
index f2ace8d235..5fac86182a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
@@ -89,8 +89,8 @@ public void cancel() {
 
     @Test
     public void postCompleteEmpty() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-        ArrayDeque<Integer> queue = new ArrayDeque<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        ArrayDeque<Integer> queue = new ArrayDeque<>();
         AtomicLong state = new AtomicLong();
         BooleanSupplier isCancelled = new BooleanSupplier() {
             @Override
@@ -108,8 +108,8 @@ public boolean getAsBoolean() throws Exception {
 
     @Test
     public void postCompleteWithRequest() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-        ArrayDeque<Integer> queue = new ArrayDeque<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        ArrayDeque<Integer> queue = new ArrayDeque<>();
         AtomicLong state = new AtomicLong();
         BooleanSupplier isCancelled = new BooleanSupplier() {
             @Override
@@ -130,8 +130,8 @@ public boolean getAsBoolean() throws Exception {
     @Test
     public void completeRequestRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-            final ArrayDeque<Integer> queue = new ArrayDeque<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
+            final ArrayDeque<Integer> queue = new ArrayDeque<>();
             final AtomicLong state = new AtomicLong();
             final BooleanSupplier isCancelled = new BooleanSupplier() {
                 @Override
@@ -165,8 +165,8 @@ public void run() {
 
     @Test
     public void postCompleteCancelled() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-        ArrayDeque<Integer> queue = new ArrayDeque<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
+        ArrayDeque<Integer> queue = new ArrayDeque<>();
         AtomicLong state = new AtomicLong();
         BooleanSupplier isCancelled = new BooleanSupplier() {
             @Override
@@ -194,7 +194,7 @@ public void onNext(Integer t) {
                 cancel();
             }
         };
-        ArrayDeque<Integer> queue = new ArrayDeque<Integer>();
+        ArrayDeque<Integer> queue = new ArrayDeque<>();
         AtomicLong state = new AtomicLong();
         BooleanSupplier isCancelled = new BooleanSupplier() {
             @Override
@@ -214,7 +214,7 @@ public boolean getAsBoolean() throws Exception {
 
     @Test
     public void drainMaxLoopMissingBackpressure() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         QueueDrain<Integer, Integer> qd = new QueueDrain<Integer, Integer>() {
@@ -259,7 +259,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
         q.offer(1);
 
         QueueDrainHelper.drainMaxLoop(q, ts, false, null, qd);
@@ -269,7 +269,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
 
     @Test
     public void drainMaxLoopMissingBackpressureWithResource() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         QueueDrain<Integer, Integer> qd = new QueueDrain<Integer, Integer>() {
@@ -314,7 +314,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
         q.offer(1);
 
         Disposable d = Disposable.empty();
@@ -328,7 +328,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
 
     @Test
     public void drainMaxLoopDontAccept() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         QueueDrain<Integer, Integer> qd = new QueueDrain<Integer, Integer>() {
@@ -373,7 +373,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
         q.offer(1);
 
         QueueDrainHelper.drainMaxLoop(q, ts, false, null, qd);
@@ -383,7 +383,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
 
     @Test
     public void checkTerminatedDelayErrorEmpty() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         QueueDrain<Integer, Integer> qd = new QueueDrain<Integer, Integer>() {
@@ -428,7 +428,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         QueueDrainHelper.checkTerminated(true, true, ts, true, q, qd);
 
@@ -437,7 +437,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
 
     @Test
     public void checkTerminatedDelayErrorNonEmpty() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         QueueDrain<Integer, Integer> qd = new QueueDrain<Integer, Integer>() {
@@ -482,7 +482,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         QueueDrainHelper.checkTerminated(true, false, ts, true, q, qd);
 
@@ -491,7 +491,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
 
     @Test
     public void checkTerminatedDelayErrorEmptyError() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         QueueDrain<Integer, Integer> qd = new QueueDrain<Integer, Integer>() {
@@ -536,7 +536,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         QueueDrainHelper.checkTerminated(true, true, ts, true, q, qd);
 
@@ -545,7 +545,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
 
     @Test
     public void checkTerminatedNonDelayErrorError() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
         QueueDrain<Integer, Integer> qd = new QueueDrain<Integer, Integer>() {
@@ -590,7 +590,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         QueueDrainHelper.checkTerminated(true, false, ts, false, q, qd);
 
@@ -599,7 +599,7 @@ public boolean accept(Subscriber<? super Integer> a, Integer v) {
 
     @Test
     public void observerCheckTerminatedDelayErrorEmpty() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
@@ -633,7 +633,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         QueueDrainHelper.checkTerminated(true, true, to, true, q, null, qd);
 
@@ -642,7 +642,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
 
     @Test
     public void observerCheckTerminatedDelayErrorEmptyResource() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
@@ -676,7 +676,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         Disposable d = Disposable.empty();
 
@@ -689,7 +689,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
 
     @Test
     public void observerCheckTerminatedDelayErrorNonEmpty() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
@@ -723,7 +723,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         QueueDrainHelper.checkTerminated(true, false, to, true, q, null, qd);
 
@@ -732,7 +732,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
 
     @Test
     public void observerCheckTerminatedDelayErrorEmptyError() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
@@ -766,7 +766,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         QueueDrainHelper.checkTerminated(true, true, to, true, q, null, qd);
 
@@ -775,7 +775,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
 
     @Test
     public void observerCheckTerminatedNonDelayErrorError() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
@@ -809,7 +809,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         QueueDrainHelper.checkTerminated(true, false, to, false, q, null, qd);
 
@@ -818,7 +818,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
 
     @Test
     public void observerCheckTerminatedNonDelayErrorErrorResource() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         to.onSubscribe(Disposable.empty());
 
         ObservableQueueDrain<Integer, Integer> qd = new ObservableQueueDrain<Integer, Integer>() {
@@ -852,7 +852,7 @@ public void accept(Observer<? super Integer> a, Integer v) {
             }
         };
 
-        SpscArrayQueue<Integer> q = new SpscArrayQueue<Integer>(32);
+        SpscArrayQueue<Integer> q = new SpscArrayQueue<>(32);
 
         Disposable d = Disposable.empty();
 
@@ -866,9 +866,9 @@ public void accept(Observer<? super Integer> a, Integer v) {
     @Test
     public void postCompleteAlreadyComplete() {
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        Queue<Integer> q = new ArrayDeque<Integer>();
+        Queue<Integer> q = new ArrayDeque<>();
         q.offer(1);
 
         AtomicLong state = new AtomicLong(QueueDrainHelper.COMPLETED_MASK);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java b/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java
index 867f518d60..976757acd7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java
@@ -40,7 +40,7 @@ public static <T> Supplier<List<T>> supplierListCreator() {
 
             @Override
             public List<T> get() {
-                return new ArrayList<T>();
+                return new ArrayList<>();
             }
         };
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java
index e087542ff3..c59537c988 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java
@@ -25,14 +25,14 @@ public class VolatileSizeArrayListTest extends RxJavaTest {
 
     @Test
     public void normal() {
-        List<Integer> list = new VolatileSizeArrayList<Integer>();
+        List<Integer> list = new VolatileSizeArrayList<>();
 
         assertTrue(list.isEmpty());
         assertEquals(0, list.size());
         assertFalse(list.contains(1));
         assertFalse(list.remove((Integer)1));
 
-        list = new VolatileSizeArrayList<Integer>(16);
+        list = new VolatileSizeArrayList<>(16);
         assertTrue(list.add(1));
         assertTrue(list.addAll(Arrays.asList(3, 4, 7)));
         list.add(1, 2);
@@ -81,7 +81,7 @@ public void normal() {
 
         assertEquals(Arrays.asList(3, 4, 5), list.subList(2, 5));
 
-        VolatileSizeArrayList<Integer> list2 = new VolatileSizeArrayList<Integer>();
+        VolatileSizeArrayList<Integer> list2 = new VolatileSizeArrayList<>();
         list2.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));
 
         assertNotEquals(list2, list);
@@ -91,7 +91,7 @@ public void normal() {
         assertEquals(list2, list);
         assertEquals(list, list2);
 
-        List<Integer> list3 = new ArrayList<Integer>();
+        List<Integer> list3 = new ArrayList<>();
         list3.addAll(Arrays.asList(1, 2, 3, 4, 5, 6));
 
         assertNotEquals(list3, list);

From 0bd2a0152b64723ac3daf3e2fbad3d59c7f3bbb8 Mon Sep 17 00:00:00 2001
From: Dmitry Volkov <42734936+dvolkovv@users.noreply.github.com>
Date: Sun, 22 Dec 2019 14:17:37 +0300
Subject: [PATCH 019/665] diamond operators in unit tests, small packages
 (#6789)

---
 .../rxjava3/completable/CompletableTest.java  | 104 +++++-----
 .../disposables/CompositeDisposableTest.java  |   4 +-
 .../rxjava3/disposables/DisposableTest.java   |   2 +-
 .../disposables/FutureDisposableTest.java     |   6 +-
 .../disposables/SequentialDisposableTest.java |   6 +-
 .../disposables/SerialDisposableTests.java    |   6 +-
 .../exceptions/CompositeExceptionTest.java    |   6 +-
 .../io/reactivex/rxjava3/flowable/Burst.java  |   6 +-
 .../flowable/FlowableBackpressureTests.java   |  36 ++--
 .../rxjava3/flowable/FlowableCollectTest.java |  24 +--
 .../flowable/FlowableConversionTest.java      |  18 +-
 .../flowable/FlowableCovarianceTest.java      |   8 +-
 .../rxjava3/flowable/FlowableDoOnTest.java    |   4 +-
 .../flowable/FlowableErrorHandlingTests.java  |   4 +-
 .../rxjava3/flowable/FlowableEventStream.java |   2 +-
 .../rxjava3/flowable/FlowableNullTests.java   |  16 +-
 .../flowable/FlowableStartWithTests.java      |   4 +-
 .../flowable/FlowableSubscriberTest.java      |  46 ++---
 .../rxjava3/flowable/FlowableTests.java       |  26 +--
 .../rxjava3/flowable/FlowableWindowTests.java |   2 +-
 .../rxjava3/flowable/FlowableZipTests.java    |   2 +-
 .../io/reactivex/rxjava3/maybe/MaybeTest.java |  14 +-
 .../observable/ObservableCovarianceTest.java  |   8 +-
 .../observable/ObservableDoOnTest.java        |   4 +-
 .../ObservableErrorHandlingTests.java         |   4 +-
 .../observable/ObservableEventStream.java     |   2 +-
 .../observable/ObservableNullTests.java       |  16 +-
 .../observable/ObservableScanTests.java       |   2 +-
 .../observable/ObservableStartWithTests.java  |   4 +-
 .../observable/ObservableSubscriberTest.java  |   8 +-
 .../rxjava3/observable/ObservableTest.java    |  26 +--
 .../observable/ObservableWindowTests.java     |   2 +-
 .../observable/ObservableZipTests.java        |   2 +-
 .../DisposableCompletableObserverTest.java    |   2 +-
 .../DisposableMaybeObserverTest.java          |  10 +-
 .../observers/DisposableObserverTest.java     |  10 +-
 .../DisposableSingleObserverTest.java         |  10 +-
 .../ResourceCompletableObserverTest.java      |   2 +-
 .../observers/ResourceMaybeObserverTest.java  |  22 +-
 .../observers/ResourceObserverTest.java       |  20 +-
 .../observers/ResourceSingleObserverTest.java |  18 +-
 .../rxjava3/observers/SafeObserverTest.java   |  40 ++--
 .../observers/SerializedObserverTest.java     |  52 ++---
 .../rxjava3/observers/TestObserverTest.java   |  60 +++---
 .../rxjava3/parallel/ParallelCollectTest.java |  10 +-
 .../parallel/ParallelFlowableTest.java        |  72 +++----
 .../parallel/ParallelFromPublisherTest.java   |  12 +-
 .../rxjava3/parallel/ParallelReduceTest.java  |  10 +-
 .../rxjava3/parallel/ParallelRunOnTest.java   |   4 +-
 .../rxjava3/plugins/RxJavaPluginsTest.java    |  16 +-
 .../processors/AsyncProcessorTest.java        |  16 +-
 .../processors/BehaviorProcessorTest.java     |  28 +--
 .../processors/MulticastProcessorTest.java    |  14 +-
 .../processors/PublishProcessorTest.java      |  16 +-
 ...ReplayProcessorBoundedConcurrencyTest.java |  14 +-
 .../ReplayProcessorConcurrencyTest.java       |  14 +-
 .../processors/ReplayProcessorTest.java       |  16 +-
 .../processors/SerializedProcessorTest.java   |   8 +-
 .../processors/UnicastProcessorTest.java      |   8 +-
 .../schedulers/AbstractSchedulerTests.java    |  10 +-
 .../schedulers/ComputationSchedulerTests.java |   2 +-
 .../schedulers/ExecutorSchedulerFairTest.java |   2 +-
 .../ExecutorSchedulerInterruptibleTest.java   |   2 +-
 .../schedulers/ExecutorSchedulerTest.java     |   2 +-
 .../schedulers/SchedulerLifecycleTest.java    |   6 +-
 .../schedulers/SchedulerTestHelper.java       |   2 +-
 .../schedulers/SchedulerWorkerTest.java       |   4 +-
 .../rxjava3/schedulers/TimedTest.java         |  20 +-
 .../schedulers/TrampolineSchedulerTest.java   |   4 +-
 .../rxjava3/single/SingleCacheTest.java       |   4 +-
 .../rxjava3/single/SingleNullTests.java       |  10 +-
 .../reactivex/rxjava3/single/SingleTest.java  |  32 +--
 .../rxjava3/subjects/AsyncSubjectTest.java    |  16 +-
 .../rxjava3/subjects/BehaviorSubjectTest.java |  24 +--
 .../rxjava3/subjects/PublishSubjectTest.java  |  18 +-
 .../ReplaySubjectBoundedConcurrencyTest.java  |  14 +-
 .../ReplaySubjectConcurrencyTest.java         |  14 +-
 .../rxjava3/subjects/ReplaySubjectTest.java   |  10 +-
 .../subjects/SerializedSubjectTest.java       |   8 +-
 .../rxjava3/subjects/UnicastSubjectTest.java  |  22 +-
 .../subscribers/DefaultSubscriberTest.java    |   2 +-
 .../subscribers/DisposableSubscriberTest.java |  10 +-
 .../subscribers/ResourceSubscriberTest.java   |  20 +-
 .../subscribers/SafeSubscriberTest.java       |  48 ++---
 .../subscribers/SerializedSubscriberTest.java |  52 ++---
 .../subscribers/TestSubscriberTest.java       | 126 ++++++------
 .../rxjava3/tck/FromFutureTckTest.java        |   2 +-
 .../tck/MulticastProcessorTckTest.java        |   2 +-
 .../rxjava3/tck/RefCountProcessor.java        |   4 +-
 .../rxjava3/tck/UnicastProcessorTckTest.java  |   2 +-
 .../rxjava3/testsupport/TestHelper.java       |   6 +-
 .../rxjava3/testsupport/TestObserverEx.java   |   2 +-
 .../testsupport/TestObserverExTest.java       | 134 ++++++------
 .../rxjava3/testsupport/TestSubscriberEx.java |   2 +-
 .../testsupport/TestSubscriberExTest.java     | 194 +++++++++---------
 .../rxjava3/validators/BaseTypeParser.java    |   2 +-
 .../CheckLocalVariablesInTests.java           |   2 +-
 .../rxjava3/validators/FixLicenseHeaders.java |   4 +-
 .../validators/InternalWrongNaming.java       |   2 +-
 .../JavadocFindUnescapedAngleBrackets.java    |   2 +-
 .../validators/NewLinesBeforeAnnotation.java  |   4 +-
 .../NoAnonymousInnerClassesTest.java          |   2 +-
 .../ParamValidationCheckerTest.java           |  18 +-
 .../validators/TestPrefixInMethodName.java    |   4 +-
 .../rxjava3/validators/TextualAorAn.java      |   4 +-
 .../validators/TooManyEmptyNewLines.java      |   4 +-
 106 files changed, 905 insertions(+), 903 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
index e18d884f54..d319e48861 100644
--- a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
@@ -349,7 +349,7 @@ public void concatObservableManyOneThrows() {
 
     @Test
     public void concatObservablePrefetch() {
-        final List<Long> requested = new ArrayList<Long>();
+        final List<Long> requested = new ArrayList<>();
         Flowable<Completable> cs = Flowable
                 .just(normal.completable)
                 .repeat(10)
@@ -859,7 +859,7 @@ public void mergeObservableManyOneThrows() {
 
     @Test
     public void mergeObservableMaxConcurrent() {
-        final List<Long> requested = new ArrayList<Long>();
+        final List<Long> requested = new ArrayList<>();
         Flowable<Completable> cs = Flowable
                 .just(normal.completable)
                 .repeat(10)
@@ -1079,7 +1079,7 @@ public void mergeDelayErrorObservableManyOneThrows() {
 
     @Test
     public void mergeDelayErrorObservableMaxConcurrent() {
-        final List<Long> requested = new ArrayList<Long>();
+        final List<Long> requested = new ArrayList<>();
         Flowable<Completable> cs = Flowable
                 .just(normal.completable)
                 .repeat(10)
@@ -1236,7 +1236,7 @@ public void accept(Integer d) {
         });
 
         final AtomicBoolean disposedFirst = new AtomicBoolean();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         c.subscribe(new CompletableObserver() {
             @Override
@@ -1282,7 +1282,7 @@ public void accept(Integer d) {
         }, false);
 
         final AtomicBoolean disposedFirst = new AtomicBoolean();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         c.subscribe(new CompletableObserver() {
             @Override
@@ -1571,7 +1571,7 @@ public void delayNormal() throws InterruptedException {
         Completable c = normal.completable.delay(250, TimeUnit.MILLISECONDS);
 
         final AtomicBoolean done = new AtomicBoolean();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         c.subscribe(new CompletableObserver() {
             @Override
@@ -1611,7 +1611,7 @@ public void delayErrorImmediately() throws InterruptedException {
         final Completable c = error.completable.delay(250, TimeUnit.MILLISECONDS, scheduler);
 
         final AtomicBoolean done = new AtomicBoolean();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         c.subscribe(new CompletableObserver() {
             @Override
@@ -1645,7 +1645,7 @@ public void delayErrorToo() throws InterruptedException {
         Completable c = error.completable.delay(250, TimeUnit.MILLISECONDS, Schedulers.computation(), true);
 
         final AtomicBoolean done = new AtomicBoolean();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         c.subscribe(new CompletableObserver() {
             @Override
@@ -1833,7 +1833,7 @@ public void onComplete() {
 
     @Test
     public void doOnErrorNoError() {
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         Completable c = normal.completable.doOnError(new Consumer<Throwable>() {
             @Override
@@ -1849,7 +1849,7 @@ public void accept(Throwable e) {
 
     @Test
     public void doOnErrorHasError() {
-        final AtomicReference<Throwable> err = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> err = new AtomicReference<>();
 
         Completable c = error.completable.doOnError(new Consumer<Throwable>() {
             @Override
@@ -2036,8 +2036,8 @@ public void observeOnNull() {
 
     @Test
     public void observeOnNormal() throws InterruptedException {
-        final AtomicReference<String> name = new AtomicReference<String>();
-        final AtomicReference<Throwable> err = new AtomicReference<Throwable>();
+        final AtomicReference<String> name = new AtomicReference<>();
+        final AtomicReference<Throwable> err = new AtomicReference<>();
         final CountDownLatch cdl = new CountDownLatch(1);
 
         Completable c = normal.completable.observeOn(Schedulers.computation());
@@ -2069,8 +2069,8 @@ public void onError(Throwable e) {
 
     @Test
     public void observeOnError() throws InterruptedException {
-        final AtomicReference<String> name = new AtomicReference<String>();
-        final AtomicReference<Throwable> err = new AtomicReference<Throwable>();
+        final AtomicReference<String> name = new AtomicReference<>();
+        final AtomicReference<Throwable> err = new AtomicReference<>();
         final CountDownLatch cdl = new CountDownLatch(1);
 
         Completable c = error.completable.observeOn(Schedulers.computation());
@@ -2195,7 +2195,7 @@ public Completable apply(Throwable v) {
 
     @Test
     public void repeatNormal() {
-        final AtomicReference<Throwable> err = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> err = new AtomicReference<>();
         final AtomicInteger calls = new AtomicInteger();
 
         Completable c = Completable.fromCallable(new Callable<Object>() {
@@ -2500,7 +2500,7 @@ public void run() {
 
     @Test
     public void subscribeTwoCallbacksNormal() {
-        final AtomicReference<Throwable> err = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> err = new AtomicReference<>();
         final AtomicBoolean complete = new AtomicBoolean();
         normal.completable.subscribe(new Action() {
             @Override
@@ -2520,7 +2520,7 @@ public void accept(Throwable e) {
 
     @Test
     public void subscribeTwoCallbacksError() {
-        final AtomicReference<Throwable> err = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> err = new AtomicReference<>();
         final AtomicBoolean complete = new AtomicBoolean();
         error.completable.subscribe(new Action() {
             @Override
@@ -2558,7 +2558,7 @@ public void run() { }
     public void subscribeTwoCallbacksCompleteThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<Throwable> err = new AtomicReference<Throwable>();
+            final AtomicReference<Throwable> err = new AtomicReference<>();
             normal.completable.subscribe(new Action() {
                 @Override
                 public void run() { throw new TestException(); }
@@ -2596,7 +2596,7 @@ public void run() { }
 
     @Test
     public void subscribeObserverNormal() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         normal.completable.toObservable().subscribe(to);
 
@@ -2607,7 +2607,7 @@ public void subscribeObserverNormal() {
 
     @Test
     public void subscribeObserverError() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         error.completable.toObservable().subscribe(to);
 
@@ -2673,7 +2673,7 @@ public void subscribeCompletableSubscriberNull() {
 
     @Test
     public void subscribeSubscriberNormal() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         normal.completable.toFlowable().subscribe(ts);
 
@@ -2684,7 +2684,7 @@ public void subscribeSubscriberNormal() {
 
     @Test
     public void subscribeSubscriberError() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         error.completable.toFlowable().subscribe(ts);
 
@@ -2700,7 +2700,7 @@ public void subscribeOnNull() {
 
     @Test
     public void subscribeOnNormal() {
-        final AtomicReference<String> name = new  AtomicReference<String>();
+        final AtomicReference<String> name = new AtomicReference<>();
 
         Completable c = Completable.unsafeCreate(new CompletableSource() {
             @Override
@@ -2717,7 +2717,7 @@ public void subscribe(CompletableObserver observer) {
 
     @Test
     public void subscribeOnError() {
-        final AtomicReference<String> name = new  AtomicReference<String>();
+        final AtomicReference<String> name = new AtomicReference<>();
 
         Completable c = Completable.unsafeCreate(new CompletableSource() {
             @Override
@@ -2903,7 +2903,7 @@ public void toSingleDefaultNull() {
 
     @Test
     public void unsubscribeOnNormal() throws InterruptedException {
-        final AtomicReference<String> name = new AtomicReference<String>();
+        final AtomicReference<String> name = new AtomicReference<>();
         final CountDownLatch cdl = new CountDownLatch(1);
 
         normal.completable.delay(1, TimeUnit.SECONDS)
@@ -3010,7 +3010,7 @@ public void ambArrayOneFiresError() {
 
         Completable c = Completable.ambArray(c1, c2);
 
-        final AtomicReference<Throwable> complete = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> complete = new AtomicReference<>();
 
         c.subscribe(Functions.EMPTY_ACTION, new Consumer<Throwable>() {
             @Override
@@ -3072,7 +3072,7 @@ public void ambArraySecondFiresError() {
 
         Completable c = Completable.ambArray(c1, c2);
 
-        final AtomicReference<Throwable> complete = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> complete = new AtomicReference<>();
 
         c.subscribe(Functions.EMPTY_ACTION, new Consumer<Throwable>() {
             @Override
@@ -3231,7 +3231,7 @@ public void ambWithArrayOneFiresError() {
 
         Completable c = c1.ambWith(c2);
 
-        final AtomicReference<Throwable> complete = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> complete = new AtomicReference<>();
 
         c.subscribe(Functions.EMPTY_ACTION, new Consumer<Throwable>() {
             @Override
@@ -3293,7 +3293,7 @@ public void ambWithArraySecondFiresError() {
 
         Completable c = c1.ambWith(c2);
 
-        final AtomicReference<Throwable> complete = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> complete = new AtomicReference<>();
 
         c.subscribe(Functions.EMPTY_ACTION, new Consumer<Throwable>() {
             @Override
@@ -3356,7 +3356,7 @@ public Object call() throws Exception {
                     }
                 }));
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         c.subscribe(ts);
 
@@ -3373,7 +3373,7 @@ public void startWithFlowableError() {
         Flowable<Object> c = normal.completable
                 .startWith(Flowable.error(new TestException()));
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         c.subscribe(ts);
 
@@ -3396,7 +3396,7 @@ public Object call() throws Exception {
                     }
                 }));
 
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         o.subscribe(to);
 
@@ -3413,7 +3413,7 @@ public void startWithObservableError() {
         Observable<Object> o = normal.completable
                 .startWith(Observable.error(new TestException()));
 
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         o.subscribe(to);
 
@@ -3441,14 +3441,14 @@ public void startWithObservableNull() {
 
     @Test
     public void andThen() {
-        TestSubscriber<String> ts = new TestSubscriber<String>(0);
+        TestSubscriber<String> ts = new TestSubscriber<>(0);
         Completable.complete().andThen(Flowable.just("foo")).subscribe(ts);
         ts.request(1);
         ts.assertValue("foo");
         ts.assertComplete();
         ts.assertNoErrors();
 
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
         Completable.complete().andThen(Observable.just("foo")).subscribe(to);
         to.assertValue("foo");
         to.assertComplete();
@@ -3543,7 +3543,7 @@ public void accept(Integer t) {
             }
         };
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Completable.using(new Supplier<Integer>() {
             @Override
@@ -3613,7 +3613,7 @@ public void subscribeActionReportsUnsubscribedAfter() {
         PublishSubject<String> stringSubject = PublishSubject.create();
         Completable completable = stringSubject.ignoreElements();
 
-        final AtomicReference<Disposable> disposableRef = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> disposableRef = new AtomicReference<>();
         Disposable completableSubscription = completable.subscribe(new Action() {
             @Override
             public void run() {
@@ -3695,7 +3695,7 @@ public void accept(Throwable e) { }
 
     @Test
     public void andThenSubscribeOn() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>(0);
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>(0);
         TestScheduler scheduler = new TestScheduler();
         Completable.complete().andThen(Flowable.just("foo").delay(1, TimeUnit.SECONDS, scheduler)).subscribe(ts);
 
@@ -3712,7 +3712,7 @@ public void andThenSubscribeOn() {
 
     @Test
     public void andThenSingleNever() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>(0);
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>(0);
         Completable.never().andThen(Single.just("foo")).toFlowable().subscribe(ts);
         ts.request(1);
         ts.assertNoValues();
@@ -3721,7 +3721,7 @@ public void andThenSingleNever() {
 
     @Test
     public void andThenSingleError() {
-        TestSubscriber<String> ts = new TestSubscriber<String>(0);
+        TestSubscriber<String> ts = new TestSubscriber<>(0);
         final AtomicBoolean hasRun = new AtomicBoolean(false);
         final Exception e = new Exception();
         Completable.error(e)
@@ -3740,7 +3740,7 @@ public void subscribeActual(SingleObserver<? super String> observer) {
 
     @Test
     public void andThenSingleSubscribeOn() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>(0);
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>(0);
         TestScheduler scheduler = new TestScheduler();
         Completable.complete().andThen(Single.just("foo").delay(1, TimeUnit.SECONDS, scheduler)).toFlowable().subscribe(ts);
 
@@ -3992,7 +3992,7 @@ public Object call() throws Exception {
                     }
                 }));
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         c.subscribe(ts);
 
@@ -4009,7 +4009,7 @@ public void andThenFlowableError() {
         Flowable<Object> c = normal.completable
                 .andThen(Flowable.error(new TestException()));
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         c.subscribe(ts);
 
@@ -4025,7 +4025,7 @@ public void usingFactoryThrows() throws Throwable {
         @SuppressWarnings("unchecked")
         Consumer<Integer> onDispose = mock(Consumer.class);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Completable.using(new Supplier<Integer>() {
             @Override
@@ -4056,7 +4056,7 @@ public void accept(Integer t) {
             }
         };
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Completable.using(new Supplier<Integer>() {
             @Override
@@ -4126,7 +4126,7 @@ public void subscribeReportsUnsubscribed() {
 
     @Test
     public void hookSubscribeStart() throws Throwable {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
 
         Completable completable = Completable.unsafeCreate(new CompletableSource() {
             @Override public void subscribe(CompletableObserver observer) {
@@ -4156,7 +4156,7 @@ public void onStart() {
 
     @Test
     public void onErrorCompleteFunctionThrows() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>();
 
         error.completable.onErrorComplete(new Predicate<Throwable>() {
             @Override
@@ -4185,7 +4185,7 @@ public void subscribeAction2ReportsUnsubscribedAfter() {
         PublishSubject<String> stringSubject = PublishSubject.create();
         Completable completable = stringSubject.ignoreElements();
 
-        final AtomicReference<Disposable> disposableRef = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> disposableRef = new AtomicReference<>();
         Disposable completableSubscription = completable.subscribe(new Action() {
             @Override
             public void run() {
@@ -4207,7 +4207,7 @@ public void subscribeAction2ReportsUnsubscribedOnErrorAfter() {
         PublishSubject<String> stringSubject = PublishSubject.create();
         Completable completable = stringSubject.ignoreElements();
 
-        final AtomicReference<Disposable> disposableRef = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> disposableRef = new AtomicReference<>();
         Disposable completableSubscription = completable.subscribe(Functions.EMPTY_ACTION,
         new Consumer<Throwable>() {
             @Override
@@ -4242,7 +4242,7 @@ public void accept(Integer integer) {
 
     @Test
     public void andThenNever() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>(0);
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>(0);
         Completable.never().andThen(Flowable.just("foo")).subscribe(ts);
         ts.request(1);
         ts.assertNoValues();
@@ -4251,7 +4251,7 @@ public void andThenNever() {
 
     @Test
     public void andThenError() {
-        TestSubscriber<String> ts = new TestSubscriber<String>(0);
+        TestSubscriber<String> ts = new TestSubscriber<>(0);
         final AtomicBoolean hasRun = new AtomicBoolean(false);
         final Exception e = new Exception();
         Completable.unsafeCreate(new CompletableSource() {
@@ -4278,7 +4278,7 @@ public void subscribe(Subscriber<? super String> s) {
 
     @Test
     public void andThenSingle() {
-        TestSubscriber<String> ts = new TestSubscriber<String>(0);
+        TestSubscriber<String> ts = new TestSubscriber<>(0);
         Completable.complete().andThen(Single.just("foo")).toFlowable().subscribe(ts);
         ts.request(1);
         ts.assertValue("foo");
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
index b219e8f9d7..73d605c2cc 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
@@ -72,7 +72,7 @@ public void run() {
             }));
         }
 
-        final List<Thread> threads = new ArrayList<Thread>();
+        final List<Thread> threads = new ArrayList<>();
         for (int i = 0; i < count; i++) {
             final Thread t = new Thread() {
                 @Override
@@ -253,7 +253,7 @@ public void run() {
 
         }));
 
-        final List<Thread> threads = new ArrayList<Thread>();
+        final List<Thread> threads = new ArrayList<>();
         for (int i = 0; i < count; i++) {
             final Thread t = new Thread() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
index 69bd6a8cc2..66abc6a280 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
@@ -160,7 +160,7 @@ public void setOnceTwice() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
 
-            AtomicReference<Disposable> target = new AtomicReference<Disposable>();
+            AtomicReference<Disposable> target = new AtomicReference<>();
             Disposable d = Disposable.empty();
 
             DisposableHelper.setOnce(target, d);
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
index a15f018c9b..3ae97dd306 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
@@ -26,7 +26,7 @@ public class FutureDisposableTest extends RxJavaTest {
 
     @Test
     public void normal() {
-        FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+        FutureTask<Object> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         Disposable d = Disposable.fromFuture(ft);
         assertFalse(d.isDisposed());
 
@@ -43,7 +43,7 @@ public void normal() {
 
     @Test
     public void interruptible() {
-        FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+        FutureTask<Object> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         Disposable d = Disposable.fromFuture(ft, true);
         assertFalse(d.isDisposed());
 
@@ -60,7 +60,7 @@ public void interruptible() {
 
     @Test
     public void normalDone() {
-        FutureTask<Object> ft = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+        FutureTask<Object> ft = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         FutureDisposable d = new FutureDisposable(ft, false);
         assertFalse(d.isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
index dc92b1f1d3..62248db45e 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
@@ -129,7 +129,7 @@ public void settingUnderlyingWhenUnsubscribedCausesImmediateUnsubscriptionConcur
         final int count = 10;
         final CountDownLatch end = new CountDownLatch(count);
 
-        final List<Thread> threads = new ArrayList<Thread>();
+        final List<Thread> threads = new ArrayList<>();
         for (int i = 0; i < count; i++) {
             final Thread t = new Thread() {
                 @Override
@@ -164,12 +164,12 @@ public void run() {
     public void concurrentSetDisposableShouldNotInterleave()
             throws InterruptedException {
         final int count = 10;
-        final List<Disposable> subscriptions = new ArrayList<Disposable>();
+        final List<Disposable> subscriptions = new ArrayList<>();
 
         final CountDownLatch start = new CountDownLatch(1);
         final CountDownLatch end = new CountDownLatch(count);
 
-        final List<Thread> threads = new ArrayList<Thread>();
+        final List<Thread> threads = new ArrayList<>();
         for (int i = 0; i < count; i++) {
             final Disposable subscription = mock(Disposable.class);
             subscriptions.add(subscription);
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
index 0205d6a85d..aa53f2ecb0 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
@@ -129,7 +129,7 @@ public void settingUnderlyingWhenUnsubscribedCausesImmediateUnsubscriptionConcur
         final int count = 10;
         final CountDownLatch end = new CountDownLatch(count);
 
-        final List<Thread> threads = new ArrayList<Thread>();
+        final List<Thread> threads = new ArrayList<>();
         for (int i = 0; i < count; i++) {
             final Thread t = new Thread() {
                 @Override
@@ -164,12 +164,12 @@ public void run() {
     public void concurrentSetDisposableShouldNotInterleave()
             throws InterruptedException {
         final int count = 10;
-        final List<Disposable> subscriptions = new ArrayList<Disposable>();
+        final List<Disposable> subscriptions = new ArrayList<>();
 
         final CountDownLatch start = new CountDownLatch(1);
         final CountDownLatch end = new CountDownLatch(count);
 
-        final List<Thread> threads = new ArrayList<Thread>();
+        final List<Thread> threads = new ArrayList<>();
         for (int i = 0; i < count; i++) {
             final Disposable subscription = mock(Disposable.class);
             subscriptions.add(subscription);
diff --git a/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java b/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
index 6f8ab6ff55..331a7dce9c 100644
--- a/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
@@ -31,7 +31,7 @@ public class CompositeExceptionTest extends RxJavaTest {
     private final Throwable ex3 = new Throwable("Ex3", ex2);
 
     private CompositeException getNewCompositeExceptionWithEx123() {
-        List<Throwable> throwables = new ArrayList<Throwable>();
+        List<Throwable> throwables = new ArrayList<>();
         throwables.add(ex1);
         throwables.add(ex2);
         throwables.add(ex3);
@@ -65,7 +65,7 @@ public void emptyErrors() {
             assertEquals("errors is empty", e.getMessage());
         }
         try {
-            new CompositeException(new ArrayList<Throwable>());
+            new CompositeException(new ArrayList<>());
             fail("CompositeException should fail if errors is empty");
         } catch (IllegalArgumentException e) {
             assertEquals("errors is empty", e.getMessage());
@@ -134,7 +134,7 @@ public void compositeExceptionFromCompositeAndChild() {
 
     @Test
     public void compositeExceptionFromTwoDuplicateComposites() {
-        List<Throwable> exs = new ArrayList<Throwable>();
+        List<Throwable> exs = new ArrayList<>();
         exs.add(getNewCompositeExceptionWithEx123());
         exs.add(getNewCompositeExceptionWithEx123());
         CompositeException cex = new CompositeException(exs);
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/Burst.java b/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
index 1e6c255a30..791ec79a2f 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
@@ -58,12 +58,12 @@ public static <T> Builder<T> item(T item) {
 
     @SafeVarargs
     public static <T> Builder<T> items(T... items) {
-        return new Builder<T>(Arrays.asList(items));
+        return new Builder<>(Arrays.asList(items));
     }
 
     final class BurstSubscription implements Subscription {
         private final Subscriber<? super T> subscriber;
-        final Queue<T> q = new ConcurrentLinkedQueue<T>(items);
+        final Queue<T> q = new ConcurrentLinkedQueue<>(items);
         final AtomicLong requested = new AtomicLong();
         volatile boolean cancelled;
 
@@ -121,7 +121,7 @@ public Flowable<T> error(Throwable e) {
         }
 
         public Flowable<T> create() {
-            return new Burst<T>(error, items);
+            return new Burst<>(error, items);
         }
 
     }
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
index e110b410c2..7d0687dd72 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
@@ -82,7 +82,7 @@ public void doAfterTest() {
     public void observeOn() {
         int num = (int) (Flowable.bufferSize() * 2.1);
         AtomicInteger c = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         incrementingIntegers(c).observeOn(Schedulers.computation()).take(num).subscribe(ts);
         ts.awaitDone(5, TimeUnit.SECONDS);
         ts.assertNoErrors();
@@ -95,7 +95,7 @@ public void observeOn() {
     public void observeOnWithSlowConsumer() {
         int num = (int) (Flowable.bufferSize() * 0.2);
         AtomicInteger c = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         incrementingIntegers(c).observeOn(Schedulers.computation()).map(
             new Function<Integer, Integer>() {
                 @Override
@@ -121,7 +121,7 @@ public void mergeSync() {
         int num = (int) (Flowable.bufferSize() * 4.1);
         AtomicInteger c1 = new AtomicInteger();
         AtomicInteger c2 = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable<Integer> merged = Flowable.merge(incrementingIntegers(c1), incrementingIntegers(c2));
 
         merged.take(num).subscribe(ts);
@@ -142,7 +142,7 @@ public void mergeAsync() {
         int num = (int) (Flowable.bufferSize() * 4.1);
         AtomicInteger c1 = new AtomicInteger();
         AtomicInteger c2 = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable<Integer> merged = Flowable.merge(
                 incrementingIntegers(c1).subscribeOn(Schedulers.computation()),
                 incrementingIntegers(c2).subscribeOn(Schedulers.computation()));
@@ -171,7 +171,7 @@ public void mergeAsyncThenObserveOnLoop() {
             AtomicInteger c1 = new AtomicInteger();
             AtomicInteger c2 = new AtomicInteger();
 
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
             Flowable<Integer> merged = Flowable.merge(
                     incrementingIntegers(c1).subscribeOn(Schedulers.computation()),
                     incrementingIntegers(c2).subscribeOn(Schedulers.computation()));
@@ -194,7 +194,7 @@ public void mergeAsyncThenObserveOn() {
         int num = (int) (Flowable.bufferSize() * 4.1);
         AtomicInteger c1 = new AtomicInteger();
         AtomicInteger c2 = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable<Integer> merged = Flowable.merge(
                 incrementingIntegers(c1).subscribeOn(Schedulers.computation()),
                 incrementingIntegers(c2).subscribeOn(Schedulers.computation()));
@@ -216,7 +216,7 @@ public void mergeAsyncThenObserveOn() {
     public void flatMapSync() {
         int num = (int) (Flowable.bufferSize() * 2.1);
         AtomicInteger c = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         incrementingIntegers(c)
         .flatMap(new Function<Integer, Publisher<Integer>>() {
@@ -240,7 +240,7 @@ public void zipSync() {
         int num = (int) (Flowable.bufferSize() * 4.1);
         AtomicInteger c1 = new AtomicInteger();
         AtomicInteger c2 = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable<Integer> zipped = Flowable.zip(
                 incrementingIntegers(c1),
@@ -268,7 +268,7 @@ public void zipAsync() {
         int num = (int) (Flowable.bufferSize() * 2.1);
         AtomicInteger c1 = new AtomicInteger();
         AtomicInteger c2 = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable<Integer> zipped = Flowable.zip(
                 incrementingIntegers(c1).subscribeOn(Schedulers.computation()),
                 incrementingIntegers(c2).subscribeOn(Schedulers.computation()),
@@ -295,8 +295,8 @@ public void subscribeOnScheduling() {
         for (int i = 0; i < 100; i++) {
             int num = (int) (Flowable.bufferSize() * 2.1);
             AtomicInteger c = new AtomicInteger();
-            ConcurrentLinkedQueue<Thread> threads = new ConcurrentLinkedQueue<Thread>();
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            ConcurrentLinkedQueue<Thread> threads = new ConcurrentLinkedQueue<>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
             // observeOn is there to make it async and need backpressure
             incrementingIntegers(c, threads).subscribeOn(Schedulers.computation()).observeOn(Schedulers.computation()).take(num).subscribe(ts);
             ts.awaitDone(5, TimeUnit.SECONDS);
@@ -325,7 +325,7 @@ public void subscribeOnScheduling() {
     public void takeFilterSkipChainAsync() {
         int num = (int) (Flowable.bufferSize() * 2.1);
         AtomicInteger c = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         incrementingIntegers(c).observeOn(Schedulers.computation())
                 .skip(10000)
                 .filter(new Predicate<Integer>() {
@@ -452,7 +452,7 @@ public void onNext(Integer t) {
     @Test
     public void firehoseFailsAsExpected() {
         AtomicInteger c = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         firehose(c).observeOn(Schedulers.computation())
         .map(new Function<Integer, Integer>() {
@@ -496,7 +496,7 @@ public void onBackpressureDrop() {
             }
             int num = (int) (Flowable.bufferSize() * 1.1); // > 1 so that take doesn't prevent buffer overflow
             AtomicInteger c = new AtomicInteger();
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
             firehose(c).onBackpressureDrop()
             .observeOn(Schedulers.computation())
             .map(SLOW_PASS_THRU).take(num).subscribe(ts);
@@ -521,7 +521,7 @@ public void onBackpressureDropWithAction() {
             final AtomicInteger dropCount = new AtomicInteger();
             final AtomicInteger passCount = new AtomicInteger();
             final int num = Flowable.bufferSize() * 3; // > 1 so that take doesn't prevent buffer overflow
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             firehose(emitCount)
             .onBackpressureDrop(new Consumer<Integer>() {
@@ -561,7 +561,7 @@ public void onBackpressureDropSynchronous() {
         for (int i = 0; i < 100; i++) {
             int num = (int) (Flowable.bufferSize() * 1.1); // > 1 so that take doesn't prevent buffer overflow
             AtomicInteger c = new AtomicInteger();
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
             firehose(c).onBackpressureDrop()
             .map(SLOW_PASS_THRU).take(num).subscribe(ts);
             ts.awaitDone(5, TimeUnit.SECONDS);
@@ -584,7 +584,7 @@ public void onBackpressureDropSynchronousWithAction() {
             final AtomicInteger dropCount = new AtomicInteger();
             int num = (int) (Flowable.bufferSize() * 1.1); // > 1 so that take doesn't prevent buffer overflow
             AtomicInteger c = new AtomicInteger();
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
             firehose(c).onBackpressureDrop(new Consumer<Integer>() {
                 @Override
                 public void accept(Integer j) {
@@ -613,7 +613,7 @@ public void accept(Integer j) {
     public void onBackpressureBuffer() {
         int num = (int) (Flowable.bufferSize() * 1.1); // > 1 so that take doesn't prevent buffer overflow
         AtomicInteger c = new AtomicInteger();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         firehose(c).takeWhile(new Predicate<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
index f0f93c6453..ae3cd0c906 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
@@ -36,7 +36,7 @@ public void collectToListFlowable() {
         .collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -109,7 +109,7 @@ public void accept(List<Integer> list, Integer t) {
     @Test
     public void collectorFailureDoesNotResultInTwoErrorEmissionsFlowable() {
         try {
-            final List<Throwable> list = new CopyOnWriteArrayList<Throwable>();
+            final List<Throwable> list = new CopyOnWriteArrayList<>();
             RxJavaPlugins.setErrorHandler(addToList(list));
             final RuntimeException e1 = new RuntimeException();
             final RuntimeException e2 = new RuntimeException();
@@ -171,7 +171,7 @@ public void accept(Object o, Integer t) {
     @Test
     public void collectIntoFlowable() {
         Flowable.just(1, 1, 1, 1, 2)
-        .collectInto(new HashSet<Integer>(), new BiConsumer<HashSet<Integer>, Integer>() {
+        .collectInto(new HashSet<>(), new BiConsumer<HashSet<Integer>, Integer>() {
             @Override
             public void accept(HashSet<Integer> s, Integer v) throws Exception {
                 s.add(v);
@@ -179,7 +179,7 @@ public void accept(HashSet<Integer> s, Integer v) throws Exception {
         })
         .toFlowable()
         .test()
-        .assertResult(new HashSet<Integer>(Arrays.asList(1, 2)));
+        .assertResult(new HashSet<>(Arrays.asList(1, 2)));
     }
 
     @Test
@@ -188,7 +188,7 @@ public void collectToList() {
         .collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -261,7 +261,7 @@ public void accept(List<Integer> list, Integer t) {
     @Test
     public void collectorFailureDoesNotResultInTwoErrorEmissions() {
         try {
-            final List<Throwable> list = new CopyOnWriteArrayList<Throwable>();
+            final List<Throwable> list = new CopyOnWriteArrayList<>();
             RxJavaPlugins.setErrorHandler(addToList(list));
             final RuntimeException e1 = new RuntimeException();
             final RuntimeException e2 = new RuntimeException();
@@ -320,20 +320,20 @@ public void accept(Object o, Integer t) {
     @Test
     public void collectInto() {
         Flowable.just(1, 1, 1, 1, 2)
-        .collectInto(new HashSet<Integer>(), new BiConsumer<HashSet<Integer>, Integer>() {
+        .collectInto(new HashSet<>(), new BiConsumer<HashSet<Integer>, Integer>() {
             @Override
             public void accept(HashSet<Integer> s, Integer v) throws Exception {
                 s.add(v);
             }
         })
         .test()
-        .assertResult(new HashSet<Integer>(Arrays.asList(1, 2)));
+        .assertResult(new HashSet<>(Arrays.asList(1, 2)));
     }
 
     @Test
     public void dispose() {
         TestHelper.checkDisposed(Flowable.just(1, 2)
-            .collect(Functions.justSupplier(new ArrayList<Integer>()), new BiConsumer<ArrayList<Integer>, Integer>() {
+            .collect(Functions.justSupplier(new ArrayList<>()), new BiConsumer<ArrayList<Integer>, Integer>() {
                 @Override
                 public void accept(ArrayList<Integer> a, Integer b) throws Exception {
                     a.add(b);
@@ -341,7 +341,7 @@ public void accept(ArrayList<Integer> a, Integer b) throws Exception {
             }));
 
         TestHelper.checkDisposed(Flowable.just(1, 2)
-                .collect(Functions.justSupplier(new ArrayList<Integer>()), new BiConsumer<ArrayList<Integer>, Integer>() {
+                .collect(Functions.justSupplier(new ArrayList<>()), new BiConsumer<ArrayList<Integer>, Integer>() {
                     @Override
                     public void accept(ArrayList<Integer> a, Integer b) throws Exception {
                         a.add(b);
@@ -354,7 +354,7 @@ public void doubleOnSubscribe() {
         TestHelper.checkDoubleOnSubscribeFlowable(new Function<Flowable<Integer>, Flowable<ArrayList<Integer>>>() {
             @Override
             public Flowable<ArrayList<Integer>> apply(Flowable<Integer> f) throws Exception {
-                return f.collect(Functions.justSupplier(new ArrayList<Integer>()),
+                return f.collect(Functions.justSupplier(new ArrayList<>()),
                         new BiConsumer<ArrayList<Integer>, Integer>() {
                             @Override
                             public void accept(ArrayList<Integer> a, Integer b) throws Exception {
@@ -366,7 +366,7 @@ public void accept(ArrayList<Integer> a, Integer b) throws Exception {
         TestHelper.checkDoubleOnSubscribeFlowableToSingle(new Function<Flowable<Integer>, Single<ArrayList<Integer>>>() {
             @Override
             public Single<ArrayList<Integer>> apply(Flowable<Integer> f) throws Exception {
-                return f.collect(Functions.justSupplier(new ArrayList<Integer>()),
+                return f.collect(Functions.justSupplier(new ArrayList<>()),
                         new BiConsumer<ArrayList<Integer>, Integer>() {
                             @Override
                             public void accept(ArrayList<Integer> a, Integer b) throws Exception {
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
index 23b484e369..c5b75a9b39 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
@@ -44,7 +44,7 @@ public static class CylonDetectorObservable<T> {
         protected Publisher<T> onSubscribe;
 
         public static <T> CylonDetectorObservable<T> create(Publisher<T> onSubscribe) {
-            return new CylonDetectorObservable<T>(onSubscribe);
+            return new CylonDetectorObservable<>(onSubscribe);
         }
 
         protected CylonDetectorObservable(Publisher<T> onSubscribe) {
@@ -56,7 +56,7 @@ public void subscribe(Subscriber<T> subscriber) {
         }
 
         public <R> CylonDetectorObservable<R> lift(FlowableOperator<? extends R, ? super T> operator) {
-            return x(new RobotConversionFunc<T, R>(operator));
+            return x(new RobotConversionFunc<>(operator));
         }
 
         public <R, O> O x(Function<Publisher<T>, O> operator) {
@@ -76,11 +76,11 @@ public <R> CylonDetectorObservable<? extends R> compose(Function<CylonDetectorOb
         }
 
         public final CylonDetectorObservable<T> beep(Predicate<? super T> predicate) {
-            return new CylonDetectorObservable<T>(new FlowableFilter<T>(Flowable.fromPublisher(onSubscribe), predicate));
+            return new CylonDetectorObservable<>(new FlowableFilter<>(Flowable.fromPublisher(onSubscribe), predicate));
         }
 
         public final <R> CylonDetectorObservable<R> boop(Function<? super T, ? extends R> func) {
-            return new CylonDetectorObservable<R>(new FlowableMap<T, R>(Flowable.fromPublisher(onSubscribe), func));
+            return new CylonDetectorObservable<>(new FlowableMap<>(Flowable.fromPublisher(onSubscribe), func));
         }
 
         public CylonDetectorObservable<String> DESTROY() {
@@ -147,7 +147,7 @@ public Flowable<T> apply(final Publisher<T> onSubscribe) {
 
     @Test
     public void conversionBetweenObservableClasses() {
-        final TestObserver<String> to = new TestObserver<String>(new DefaultObserver<String>() {
+        final TestObserver<String> to = new TestObserver<>(new DefaultObserver<String>() {
 
             @Override
             public void onComplete() {
@@ -175,7 +175,7 @@ public void accept(Object pv) {
                     System.out.println(pv);
                 }
             })
-            .to(new ConvertToCylonDetector<Object>())
+            .to(new ConvertToCylonDetector<>())
             .beep(new Predicate<Object>() {
                 @Override
                 public boolean test(Object t) {
@@ -189,7 +189,7 @@ public Object apply(Object cylon) {
                 }
             })
             .DESTROY()
-            .x(new ConvertToObservable<String>())
+            .x(new ConvertToObservable<>())
             .reduce("Cylon Detector finished. Report:\n", new BiFunction<String, String, String>() {
                 @Override
                 public String apply(String a, String n) {
@@ -204,7 +204,7 @@ public String apply(String a, String n) {
 
     @Test
     public void convertToConcurrentQueue() {
-        final AtomicReference<Throwable> thrown = new AtomicReference<Throwable>(null);
+        final AtomicReference<Throwable> thrown = new AtomicReference<>(null);
         final AtomicBoolean isFinished = new AtomicBoolean(false);
         ConcurrentLinkedQueue<? extends Integer> queue = Flowable.range(0, 5)
                 .flatMap(new Function<Integer, Publisher<Integer>>() {
@@ -228,7 +228,7 @@ public Integer apply(Integer k) {
                     .to(new FlowableConverter<Integer, ConcurrentLinkedQueue<Integer>>() {
                         @Override
                         public ConcurrentLinkedQueue<Integer> apply(Flowable<Integer> onSubscribe) {
-                            final ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<Integer>();
+                            final ConcurrentLinkedQueue<Integer> q = new ConcurrentLinkedQueue<>();
                             onSubscribe.subscribe(new DefaultSubscriber<Integer>() {
                                 @Override
                                 public void onComplete() {
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java
index a14462e905..ae50092ce9 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java
@@ -66,7 +66,7 @@ public int compare(Media t1, Media t2) {
     @Test
     public void groupByCompose() {
         Flowable<Movie> movies = Flowable.just(new HorrorMovie(), new ActionMovie(), new Movie());
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>();
 
         movies
         .groupBy(new Function<Movie, Object>() {
@@ -188,9 +188,9 @@ public Flowable<Movie> apply(List<List<Movie>> listOfLists) {
             } else {
                 // diff the two
                 List<Movie> newList = listOfLists.get(1);
-                List<Movie> oldList = new ArrayList<Movie>(listOfLists.get(0));
+                List<Movie> oldList = new ArrayList<>(listOfLists.get(0));
 
-                Set<Movie> delta = new LinkedHashSet<Movie>();
+                Set<Movie> delta = new LinkedHashSet<>();
                 delta.addAll(newList);
                 // remove all that match in old
                 delta.removeAll(oldList);
@@ -212,7 +212,7 @@ public Flowable<Movie> apply(List<List<Movie>> listOfLists) {
         @Override
         public Publisher<Movie> apply(Flowable<List<Movie>> movieList) {
             return movieList
-                .startWithItem(new ArrayList<Movie>())
+                .startWithItem(new ArrayList<>())
                 .buffer(2, 1)
                 .skip(1)
                 .flatMap(calculateDelta);
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java
index 2655f8c4fd..b1b12c5577 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java
@@ -27,7 +27,7 @@ public class FlowableDoOnTest extends RxJavaTest {
 
     @Test
     public void doOnEach() {
-        final AtomicReference<String> r = new AtomicReference<String>();
+        final AtomicReference<String> r = new AtomicReference<>();
         String output = Flowable.just("one").doOnNext(new Consumer<String>() {
             @Override
             public void accept(String v) {
@@ -41,7 +41,7 @@ public void accept(String v) {
 
     @Test
     public void doOnError() {
-        final AtomicReference<Throwable> r = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> r = new AtomicReference<>();
         Throwable t = null;
         try {
             Flowable.<String> error(new RuntimeException("an error"))
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java
index 694dedded4..df123ee304 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java
@@ -35,7 +35,7 @@ public class FlowableErrorHandlingTests extends RxJavaTest {
     @Test
     public void onNextError() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Throwable> caughtError = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> caughtError = new AtomicReference<>();
         Flowable<Long> f = Flowable.interval(50, TimeUnit.MILLISECONDS);
         Subscriber<Long> subscriber = new DefaultSubscriber<Long>() {
 
@@ -72,7 +72,7 @@ public void onNext(Long args) {
     @Test
     public void onNextErrorAcrossThread() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Throwable> caughtError = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> caughtError = new AtomicReference<>();
         Flowable<Long> f = Flowable.interval(50, TimeUnit.MILLISECONDS);
         Subscriber<Long> subscriber = new DefaultSubscriber<Long>() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java
index 7c64da9ada..861d67c68d 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java
@@ -33,7 +33,7 @@ public static Flowable<Event> getEventStream(final String type, final int numIns
     }
 
     public static Event randomEvent(String type, int numInstances) {
-        Map<String, Object> values = new LinkedHashMap<String, Object>();
+        Map<String, Object> values = new LinkedHashMap<>();
         values.put("count200", randomIntFrom0to(4000));
         values.put("count4xx", randomIntFrom0to(300));
         values.put("count5xx", randomIntFrom0to(500));
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
index ed520c494c..0e85aa8a40 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
@@ -239,10 +239,10 @@ public void fromFutureNull() {
 
     @Test
     public void fromFutureReturnsNull() {
-        FutureTask<Object> f = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+        FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         f.run();
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         Flowable.fromFuture(f).subscribe(ts);
         ts.assertNoValues();
         ts.assertNotComplete();
@@ -256,24 +256,24 @@ public void fromFutureTimedFutureNull() {
 
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedUnitNull() {
-        Flowable.fromFuture(new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null), 1, null);
+        Flowable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, null);
     }
 
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedSchedulerNull() {
-        Flowable.fromFuture(new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null), 1, TimeUnit.SECONDS, null);
+        Flowable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, TimeUnit.SECONDS, null);
     }
 
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedReturnsNull() {
-      FutureTask<Object> f = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+      FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         f.run();
         Flowable.fromFuture(f, 1, TimeUnit.SECONDS).blockingLast();
     }
 
     @Test(expected = NullPointerException.class)
     public void fromFutureSchedulerNull() {
-        Flowable.fromFuture(new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null), null);
+        Flowable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), null);
     }
 
     @Test(expected = NullPointerException.class)
@@ -2392,7 +2392,7 @@ public Integer apply(Integer v) {
         }, new Supplier<Map<Integer, Collection<Integer>>>() {
             @Override
             public Map<Integer, Collection<Integer>> get() {
-                return new HashMap<Integer, Collection<Integer>>();
+                return new HashMap<>();
             }
         }, null);
     }
@@ -2412,7 +2412,7 @@ public Integer apply(Integer v) {
         }, new Supplier<Map<Integer, Collection<Integer>>>() {
             @Override
             public Map<Integer, Collection<Integer>> get() {
-                return new HashMap<Integer, Collection<Integer>>();
+                return new HashMap<>();
             }
         }, new Function<Integer, Collection<Integer>>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java
index e4ea973b5b..7ac13a4bd6 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java
@@ -34,7 +34,7 @@ public void startWith1() {
 
     @Test
     public void startWithIterable() {
-        List<String> li = new ArrayList<String>();
+        List<String> li = new ArrayList<>();
         li.add("alpha");
         li.add("beta");
         List<String> values = Flowable.just("one", "two").startWithIterable(li).toList().blockingGet();
@@ -47,7 +47,7 @@ public void startWithIterable() {
 
     @Test
     public void startWithObservable() {
-        List<String> li = new ArrayList<String>();
+        List<String> li = new ArrayList<>();
         li.add("alpha");
         li.add("beta");
         List<String> values = Flowable.just("one", "two")
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
index 2a94f73b8e..2a27aaada0 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
@@ -40,7 +40,7 @@ public class FlowableSubscriberTest {
      */
     @Test
     public void requestFromFinalSubscribeWithRequestValue() {
-        TestSubscriber<String> s = new TestSubscriber<String>(0L);
+        TestSubscriber<String> s = new TestSubscriber<>(0L);
         s.request(10);
         final AtomicLong r = new AtomicLong();
         s.onSubscribe(new Subscription() {
@@ -64,7 +64,7 @@ public void cancel() {
      */
     @Test
     public void requestFromFinalSubscribeWithoutRequestValue() {
-        TestSubscriber<String> s = new TestSubscriber<String>();
+        TestSubscriber<String> s = new TestSubscriber<>();
         final AtomicLong r = new AtomicLong();
         s.onSubscribe(new Subscription() {
 
@@ -84,7 +84,7 @@ public void cancel() {
 
     @Test
     public void requestFromChainedOperator() throws Throwable {
-        TestSubscriber<String> s = new TestSubscriber<String>(10L);
+        TestSubscriber<String> s = new TestSubscriber<>(10L);
         FlowableOperator<String, String> o = new FlowableOperator<String, String>() {
             @Override
             public Subscriber<? super String> apply(final Subscriber<? super String> s1) {
@@ -136,7 +136,7 @@ public void cancel() {
 
     @Test
     public void requestFromDecoupledOperator() throws Throwable {
-        TestSubscriber<String> s = new TestSubscriber<String>(0L);
+        TestSubscriber<String> s = new TestSubscriber<>(0L);
         FlowableOperator<String, String> o = new FlowableOperator<String, String>() {
             @Override
             public Subscriber<? super String> apply(final Subscriber<? super String> s1) {
@@ -189,7 +189,7 @@ public void cancel() {
 
     @Test
     public void requestFromDecoupledOperatorThatRequestsN() throws Throwable {
-        TestSubscriber<String> s = new TestSubscriber<String>(10L);
+        TestSubscriber<String> s = new TestSubscriber<>(10L);
         final AtomicLong innerR = new AtomicLong();
         FlowableOperator<String, String> o = new FlowableOperator<String, String>() {
             @Override
@@ -260,7 +260,7 @@ public void cancel() {
 
     @Test
     public void requestToFlowable() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(3L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(3L);
         final AtomicLong requested = new AtomicLong();
         Flowable.<Integer>unsafeCreate(new Publisher<Integer>() {
             @Override
@@ -284,7 +284,7 @@ public void cancel() {
 
     @Test
     public void requestThroughMap() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
         ts.request(3);
         final AtomicLong requested = new AtomicLong();
         Flowable.<Integer>unsafeCreate(new Publisher<Integer>() {
@@ -309,7 +309,7 @@ public void cancel() {
 
     @Test
     public void requestThroughTakeThatReducesRequest() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
         ts.request(3);
         final AtomicLong requested = new AtomicLong();
         Flowable.<Integer>unsafeCreate(new Publisher<Integer>() {
@@ -336,7 +336,7 @@ public void cancel() {
 
     @Test
     public void requestThroughTakeWhereRequestIsSmallerThanTake() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
         ts.request(3);
         final AtomicLong requested = new AtomicLong();
         Flowable.<Integer>unsafeCreate(new Publisher<Integer>() {
@@ -463,7 +463,7 @@ public void onNext(Integer t) {
 
     @Test
     public void onStartRequestsAreAdditive() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
         Flowable.just(1, 2, 3, 4, 5)
         .subscribe(new DefaultSubscriber<Integer>() {
             @Override
@@ -491,7 +491,7 @@ public void onNext(Integer t) {
 
     @Test
     public void onStartRequestsAreAdditiveAndOverflowBecomesMaxValue() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
         Flowable.just(1, 2, 3, 4, 5).subscribe(new DefaultSubscriber<Integer>() {
             @Override
             public void onStart() {
@@ -520,7 +520,7 @@ public void onNext(Integer t) {
     public void forEachWhile() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Disposable d = pp.forEachWhile(new Predicate<Integer>() {
             @Override
@@ -543,7 +543,7 @@ public boolean test(Integer v) throws Exception {
 
     @Test
     public void doubleSubscribe() {
-        ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<Integer>(new Predicate<Integer>() {
+        ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<>(new Predicate<Integer>() {
             @Override
             public boolean test(Integer v) throws Exception {
                 return true;
@@ -570,10 +570,10 @@ public boolean test(Integer v) throws Exception {
     public void suppressAfterCompleteEvents() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
             ts.onSubscribe(new BooleanSubscription());
 
-            ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<Integer>(new Predicate<Integer>() {
+            ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<>(new Predicate<Integer>() {
                 @Override
                 public boolean test(Integer v) throws Exception {
                     ts.onNext(v);
@@ -606,10 +606,10 @@ public void run() throws Exception {
 
     @Test
     public void onNextCrashes() {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(new BooleanSubscription());
 
-        ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<Integer>(new Predicate<Integer>() {
+        ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<>(new Predicate<Integer>() {
             @Override
             public boolean test(Integer v) throws Exception {
                 throw new TestException();
@@ -637,7 +637,7 @@ public void run() throws Exception {
 
     @Test
     public void onErrorThrows() {
-        ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<Integer>(new Predicate<Integer>() {
+        ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<>(new Predicate<Integer>() {
             @Override
             public boolean test(Integer v) throws Exception {
                 return true;
@@ -672,7 +672,7 @@ public void run() throws Exception {
 
     @Test
     public void onCompleteThrows() {
-        ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<Integer>(new Predicate<Integer>() {
+        ForEachWhileSubscriber<Integer> s = new ForEachWhileSubscriber<>(new Predicate<Integer>() {
             @Override
             public boolean test(Integer v) throws Exception {
                 return true;
@@ -703,7 +703,7 @@ public void run() throws Exception {
 
     @Test
     public void subscribeConsumerConsumerWithError() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Flowable.<Integer>error(new TestException()).subscribe(new Consumer<Integer>() {
             @Override
@@ -731,8 +731,8 @@ public void methodTestCancelled() {
 
     @Test
     public void safeSubscriberAlreadySafe() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
-        Flowable.just(1).safeSubscribe(new SafeSubscriber<Integer>(ts));
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        Flowable.just(1).safeSubscribe(new SafeSubscriber<>(ts));
 
         ts.assertResult(1);
     }
@@ -748,7 +748,7 @@ public void methodTestNoCancel() {
 
     @Test
     public void subscribeConsumerConsumer() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Flowable.just(1).subscribe(new Consumer<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
index e61e106f1a..616140c6b9 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
@@ -71,7 +71,7 @@ public void fromArray() {
 
     @Test
     public void fromIterable() {
-        ArrayList<String> items = new ArrayList<String>();
+        ArrayList<String> items = new ArrayList<>();
         items.add("one");
         items.add("two");
         items.add("three");
@@ -350,7 +350,7 @@ public void materializeDematerializeChaining() {
     public void customObservableWithErrorInObserverAsynchronous() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
         final AtomicInteger count = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         // FIXME custom built???
         Flowable.just("1", "2", "three", "4")
@@ -398,7 +398,7 @@ public void onNext(String v) {
     @Test
     public void customObservableWithErrorInObserverSynchronous() {
         final AtomicInteger count = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         // FIXME custom built???
         Flowable.just("1", "2", "three", "4")
@@ -440,7 +440,7 @@ public void onNext(String v) {
     @Test
     public void customObservableWithErrorInObservableSynchronous() {
         final AtomicInteger count = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         // FIXME custom built???
         Flowable.just("1", "2").concatWith(Flowable.<String>error(new Supplier<Throwable>() {
             @Override
@@ -660,7 +660,7 @@ public void accept(String v) {
     @Test
     public void takeWithErrorInObserver() {
         final AtomicInteger count = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         Flowable.just("1", "2", "three", "4").take(3)
         .safeSubscribe(new DefaultSubscriber<String>() {
 
@@ -710,9 +710,9 @@ public void ofType() {
 
     @Test
     public void ofTypeWithPolymorphism() {
-        ArrayList<Integer> l1 = new ArrayList<Integer>();
+        ArrayList<Integer> l1 = new ArrayList<>();
         l1.add(1);
-        LinkedList<Integer> l2 = new LinkedList<Integer>();
+        LinkedList<Integer> l2 = new LinkedList<>();
         l2.add(2);
 
         @SuppressWarnings("rawtypes")
@@ -898,21 +898,21 @@ public void rangeWithScheduler() {
 
     @Test
     public void mergeWith() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.just(1).mergeWith(Flowable.just(2)).subscribe(ts);
         ts.assertValues(1, 2);
     }
 
     @Test
     public void concatWith() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.just(1).concatWith(Flowable.just(2)).subscribe(ts);
         ts.assertValues(1, 2);
     }
 
     @Test
     public void ambWith() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         Flowable.just(1).ambWith(Flowable.just(2)).subscribe(ts);
         ts.assertValue(1);
     }
@@ -944,7 +944,7 @@ public void accept(List<Boolean> booleans) {
 
     @Test
     public void compose() {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>();
         Flowable.just(1, 2, 3).compose(new FlowableTransformer<Integer, String>() {
             @Override
             public Publisher<String> apply(Flowable<Integer> t1) {
@@ -1008,7 +1008,7 @@ public void forEachWithNull() {
 
     @Test
     public void extend() {
-        final TestSubscriber<Object> subscriber = new TestSubscriber<Object>();
+        final TestSubscriber<Object> subscriber = new TestSubscriber<>();
         final Object value = new Object();
         Object returned = Flowable.just(value).to(new FlowableConverter<Object, Object>() {
             @Override
@@ -1025,7 +1025,7 @@ public Object apply(Flowable<Object> onSubscribe) {
 
     @Test
     public void asExtend() {
-        final TestSubscriber<Object> subscriber = new TestSubscriber<Object>();
+        final TestSubscriber<Object> subscriber = new TestSubscriber<>();
         final Object value = new Object();
         Object returned = Flowable.just(value).to(new FlowableConverter<Object, Object>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java
index d43b96f17f..f96a010728 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java
@@ -30,7 +30,7 @@ public class FlowableWindowTests extends RxJavaTest {
 
     @Test
     public void window() {
-        final ArrayList<List<Integer>> lists = new ArrayList<List<Integer>>();
+        final ArrayList<List<Integer>> lists = new ArrayList<>();
 
         Flowable.concat(
             Flowable.just(1, 2, 3, 4, 5, 6)
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java
index e022e02c82..e1b2e2809b 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java
@@ -41,7 +41,7 @@ public String apply(Event e) {
                 .flatMap(new Function<GroupedFlowable<String, Event>, Publisher<HashMap<String, String>>>() {
                     @Override
                     public Publisher<HashMap<String, String>> apply(final GroupedFlowable<String, Event> ge) {
-                            return ge.scan(new HashMap<String, String>(), new BiFunction<HashMap<String, String>, Event, HashMap<String, String>>() {
+                            return ge.scan(new HashMap<>(), new BiFunction<HashMap<String, String>, Event, HashMap<String, String>>() {
                                 @Override
                                 public HashMap<String, String> apply(HashMap<String, String> accum,
                                         Event perInstanceEvent) {
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index 69ea889363..e4d64764d8 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -896,7 +896,7 @@ public void run() throws Exception {
 
     @Test
     public void observeOnDispose() throws Exception {
-        final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final CountDownLatch cdl = new CountDownLatch(1);
 
@@ -2282,7 +2282,7 @@ public void subscribeZeroError() {
 
     @Test
     public void subscribeToOnSuccess() {
-        final List<Integer> values = new ArrayList<Integer>();
+        final List<Integer> values = new ArrayList<>();
 
         Consumer<Integer> onSuccess = new Consumer<Integer>() {
             @Override
@@ -2302,7 +2302,7 @@ public void accept(Integer e) throws Exception {
 
     @Test
     public void subscribeToOnError() {
-        final List<Throwable> values = new ArrayList<Throwable>();
+        final List<Throwable> values = new ArrayList<>();
 
         Consumer<Throwable> onError = new Consumer<Throwable>() {
             @Override
@@ -2323,7 +2323,7 @@ public void accept(Throwable e) throws Exception {
 
     @Test
     public void subscribeToOnComplete() {
-        final List<Integer> values = new ArrayList<Integer>();
+        final List<Integer> values = new ArrayList<>();
 
         Action onComplete = new Action() {
             @Override
@@ -2370,7 +2370,7 @@ public void onComplete() {
 
     @Test
     public void doOnEventSuccess() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         assertTrue(Maybe.just(1)
         .doOnEvent(new BiConsumer<Integer, Throwable>() {
@@ -2389,7 +2389,7 @@ public void accept(Integer v, Throwable e) throws Exception {
     public void doOnEventError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final List<Object> list = new ArrayList<Object>();
+            final List<Object> list = new ArrayList<>();
 
             TestException ex = new TestException();
 
@@ -2413,7 +2413,7 @@ public void accept(Integer v, Throwable e) throws Exception {
 
     @Test
     public void doOnEventComplete() {
-        final List<Object> list = new ArrayList<Object>();
+        final List<Object> list = new ArrayList<>();
 
         assertTrue(Maybe.<Integer>empty()
         .doOnEvent(new BiConsumer<Integer, Throwable>() {
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java
index 904af1d8a4..e7e3302fd8 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java
@@ -66,7 +66,7 @@ public int compare(Media t1, Media t2) {
     @Test
     public void groupByCompose() {
         Observable<Movie> movies = Observable.just(new HorrorMovie(), new ActionMovie(), new Movie());
-        TestObserverEx<String> to = new TestObserverEx<String>();
+        TestObserverEx<String> to = new TestObserverEx<>();
         movies
         .groupBy(new Function<Movie, Object>() {
             @Override
@@ -187,9 +187,9 @@ public Observable<Movie> apply(List<List<Movie>> listOfLists) {
             } else {
                 // diff the two
                 List<Movie> newList = listOfLists.get(1);
-                List<Movie> oldList = new ArrayList<Movie>(listOfLists.get(0));
+                List<Movie> oldList = new ArrayList<>(listOfLists.get(0));
 
-                Set<Movie> delta = new LinkedHashSet<Movie>();
+                Set<Movie> delta = new LinkedHashSet<>();
                 delta.addAll(newList);
                 // remove all that match in old
                 delta.removeAll(oldList);
@@ -211,7 +211,7 @@ public Observable<Movie> apply(List<List<Movie>> listOfLists) {
         @Override
         public Observable<Movie> apply(Observable<List<Movie>> movieList) {
             return movieList
-                .startWithItem(new ArrayList<Movie>())
+                .startWithItem(new ArrayList<>())
                 .buffer(2, 1)
                 .skip(1)
                 .flatMap(calculateDelta);
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java
index 1e28d19b24..6c3b5f54ab 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java
@@ -27,7 +27,7 @@ public class ObservableDoOnTest extends RxJavaTest {
 
     @Test
     public void doOnEach() {
-        final AtomicReference<String> r = new AtomicReference<String>();
+        final AtomicReference<String> r = new AtomicReference<>();
         String output = Observable.just("one").doOnNext(new Consumer<String>() {
             @Override
             public void accept(String v) {
@@ -41,7 +41,7 @@ public void accept(String v) {
 
     @Test
     public void doOnError() {
-        final AtomicReference<Throwable> r = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> r = new AtomicReference<>();
         Throwable t = null;
         try {
             Observable.<String> error(new RuntimeException("an error"))
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java
index bbbc80daed..c524261032 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java
@@ -33,7 +33,7 @@ public class ObservableErrorHandlingTests extends RxJavaTest {
     @Test
     public void onNextError() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Throwable> caughtError = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> caughtError = new AtomicReference<>();
         Observable<Long> o = Observable.interval(50, TimeUnit.MILLISECONDS);
         Observer<Long> observer = new DefaultObserver<Long>() {
 
@@ -69,7 +69,7 @@ public void onNext(Long args) {
     @Test
     public void onNextErrorAcrossThread() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
-        final AtomicReference<Throwable> caughtError = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> caughtError = new AtomicReference<>();
         Observable<Long> o = Observable.interval(50, TimeUnit.MILLISECONDS);
         Observer<Long> observer = new DefaultObserver<Long>() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java
index c60f694209..6b161dcb0a 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java
@@ -33,7 +33,7 @@ public static Observable<Event> getEventStream(final String type, final int numI
     }
 
     public static Event randomEvent(String type, int numInstances) {
-        Map<String, Object> values = new LinkedHashMap<String, Object>();
+        Map<String, Object> values = new LinkedHashMap<>();
         values.put("count200", randomIntFrom0to(4000));
         values.put("count4xx", randomIntFrom0to(300));
         values.put("count5xx", randomIntFrom0to(500));
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
index 211053b0c7..5e02ecc3e7 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
@@ -289,10 +289,10 @@ public void fromFutureNull() {
 
     @Test
     public void fromFutureReturnsNull() {
-        FutureTask<Object> f = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+        FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         f.run();
 
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         Observable.fromFuture(f).subscribe(to);
         to.assertNoValues();
         to.assertNotComplete();
@@ -306,24 +306,24 @@ public void fromFutureTimedFutureNull() {
 
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedUnitNull() {
-        Observable.fromFuture(new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null), 1, null);
+        Observable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, null);
     }
 
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedSchedulerNull() {
-        Observable.fromFuture(new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null), 1, TimeUnit.SECONDS, null);
+        Observable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, TimeUnit.SECONDS, null);
     }
 
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedReturnsNull() {
-        FutureTask<Object> f = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+        FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         f.run();
         Observable.fromFuture(f, 1, TimeUnit.SECONDS).blockingLast();
     }
 
     @Test(expected = NullPointerException.class)
     public void fromFutureSchedulerNull() {
-        FutureTask<Object> f = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+        FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         Observable.fromFuture(f, null);
     }
 
@@ -2385,7 +2385,7 @@ public Integer apply(Integer v) {
         }, new Supplier<Map<Integer, Collection<Integer>>>() {
             @Override
             public Map<Integer, Collection<Integer>> get() {
-                return new HashMap<Integer, Collection<Integer>>();
+                return new HashMap<>();
             }
         }, null);
     }
@@ -2405,7 +2405,7 @@ public Integer apply(Integer v) {
         }, new Supplier<Map<Integer, Collection<Integer>>>() {
             @Override
             public Map<Integer, Collection<Integer>> get() {
-                return new HashMap<Integer, Collection<Integer>>();
+                return new HashMap<>();
             }
         }, new Function<Integer, Collection<Integer>>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java
index 195c7d5865..bc73a886b2 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java
@@ -27,7 +27,7 @@ public class ObservableScanTests extends RxJavaTest {
     public void unsubscribeScan() throws Exception {
 
         ObservableEventStream.getEventStream("HTTP-ClusterB", 20)
-        .scan(new HashMap<String, String>(), new BiFunction<HashMap<String, String>, Event, HashMap<String, String>>() {
+        .scan(new HashMap<>(), new BiFunction<HashMap<String, String>, Event, HashMap<String, String>>() {
             @Override
             public HashMap<String, String> apply(HashMap<String, String> accum, Event perInstanceEvent) {
                 accum.put("instance", perInstanceEvent.instanceId);
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java
index c8a195d826..9c9261273c 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java
@@ -35,7 +35,7 @@ public void startWith1() {
 
     @Test
     public void startWithIterable() {
-        List<String> li = new ArrayList<String>();
+        List<String> li = new ArrayList<>();
         li.add("alpha");
         li.add("beta");
         List<String> values = Observable.just("one", "two").startWithIterable(li).toList().blockingGet();
@@ -48,7 +48,7 @@ public void startWithIterable() {
 
     @Test
     public void startWithObservable() {
-        List<String> li = new ArrayList<String>();
+        List<String> li = new ArrayList<>();
         li.add("alpha");
         li.add("beta");
         List<String> values = Observable.just("one", "two")
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java
index 6fc73f4468..60e8470ca4 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java
@@ -128,7 +128,7 @@ public void onNext(Integer t) {
 
     @Test
     public void subscribeConsumerConsumer() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Observable.just(1).subscribe(new Consumer<Integer>() {
             @Override
@@ -147,7 +147,7 @@ public void accept(Throwable e) throws Exception {
 
     @Test
     public void subscribeConsumerConsumerWithError() {
-        final List<Integer> list = new ArrayList<Integer>();
+        final List<Integer> list = new ArrayList<>();
 
         Observable.<Integer>error(new TestException()).subscribe(new Consumer<Integer>() {
             @Override
@@ -175,8 +175,8 @@ public void methodTestCancelled() {
 
     @Test
     public void safeSubscriberAlreadySafe() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
-        Observable.just(1).safeSubscribe(new SafeObserver<Integer>(to));
+        TestObserver<Integer> to = new TestObserver<>();
+        Observable.just(1).safeSubscribe(new SafeObserver<>(to));
 
         to.assertResult(1);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
index a3d79a426c..4b888d4ed5 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
@@ -66,7 +66,7 @@ public void fromArray() {
 
     @Test
     public void fromIterable() {
-        ArrayList<String> items = new ArrayList<String>();
+        ArrayList<String> items = new ArrayList<>();
         items.add("one");
         items.add("two");
         items.add("three");
@@ -367,7 +367,7 @@ public void materializeDematerializeChaining() {
     public void customObservableWithErrorInObserverAsynchronous() throws InterruptedException {
         final CountDownLatch latch = new CountDownLatch(1);
         final AtomicInteger count = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         // FIXME custom built???
         Observable.just("1", "2", "three", "4")
@@ -415,7 +415,7 @@ public void onNext(String v) {
     @Test
     public void customObservableWithErrorInObserverSynchronous() {
         final AtomicInteger count = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         // FIXME custom built???
         Observable.just("1", "2", "three", "4")
@@ -458,7 +458,7 @@ public void onNext(String v) {
     @Test
     public void customObservableWithErrorInObservableSynchronous() {
         final AtomicInteger count = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         // FIXME custom built???
         Observable.just("1", "2").concatWith(Observable.<String>error(new Supplier<Throwable>() {
             @Override
@@ -678,7 +678,7 @@ public void accept(String v) {
     @Test
     public void takeWithErrorInObserver() {
         final AtomicInteger count = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         Observable.just("1", "2", "three", "4").take(3)
         .safeSubscribe(new DefaultObserver<String>() {
 
@@ -729,9 +729,9 @@ public void ofType() {
 
     @Test
     public void ofTypeWithPolymorphism() {
-        ArrayList<Integer> l1 = new ArrayList<Integer>();
+        ArrayList<Integer> l1 = new ArrayList<>();
         l1.add(1);
-        LinkedList<Integer> l2 = new LinkedList<Integer>();
+        LinkedList<Integer> l2 = new LinkedList<>();
         l2.add(2);
 
         @SuppressWarnings("rawtypes")
@@ -921,21 +921,21 @@ public void rangeWithScheduler() {
 
     @Test
     public void mergeWith() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.just(1).mergeWith(Observable.just(2)).subscribe(to);
         to.assertValues(1, 2);
     }
 
     @Test
     public void concatWith() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.just(1).concatWith(Observable.just(2)).subscribe(to);
         to.assertValues(1, 2);
     }
 
     @Test
     public void ambWith() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
         Observable.just(1).ambWith(Observable.just(2)).subscribe(to);
         to.assertValue(1);
     }
@@ -967,7 +967,7 @@ public void accept(List<Boolean> booleans) {
 
     @Test
     public void compose() {
-        TestObserverEx<String> to = new TestObserverEx<String>();
+        TestObserverEx<String> to = new TestObserverEx<>();
 
         Observable.just(1, 2, 3).compose(new ObservableTransformer<Integer, String>() {
             @Override
@@ -1048,7 +1048,7 @@ public void forEachWithNull() {
 
     @Test
     public void extend() {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
         final Object value = new Object();
         Object returned = Observable.just(value).to(new ObservableConverter<Object, Object>() {
             @Override
@@ -1065,7 +1065,7 @@ public Object apply(Observable<Object> onSubscribe) {
 
     @Test
     public void asExtend() {
-        final TestObserver<Object> to = new TestObserver<Object>();
+        final TestObserver<Object> to = new TestObserver<>();
         final Object value = new Object();
         Object returned = Observable.just(value).to(new ObservableConverter<Object, Object>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java
index 1d4a62f7f3..9e1076017a 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java
@@ -31,7 +31,7 @@ public class ObservableWindowTests extends RxJavaTest {
 
     @Test
     public void window() {
-        final ArrayList<List<Integer>> lists = new ArrayList<List<Integer>>();
+        final ArrayList<List<Integer>> lists = new ArrayList<>();
 
         Observable.concat(
             Observable.just(1, 2, 3, 4, 5, 6)
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java
index b630807758..1f67113348 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java
@@ -41,7 +41,7 @@ public String apply(Event e) {
                 .flatMap(new Function<GroupedObservable<String, Event>, Observable<HashMap<String, String>>>() {
                     @Override
                     public Observable<HashMap<String, String>> apply(final GroupedObservable<String, Event> ge) {
-                            return ge.scan(new HashMap<String, String>(), new BiFunction<HashMap<String, String>, Event, HashMap<String, String>>() {
+                            return ge.scan(new HashMap<>(), new BiFunction<HashMap<String, String>, Event, HashMap<String, String>>() {
                                 @Override
                                 public HashMap<String, String> apply(HashMap<String, String> accum,
                                         Event perInstanceEvent) {
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
index 84db3819ae..19ee3e7f06 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
@@ -33,7 +33,7 @@ static final class TestCompletable extends DisposableCompletableObserver {
 
         int complete;
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         @Override
         protected void onStart() {
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
index 42cbd25c5d..36dc6a6d3b 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
@@ -31,9 +31,9 @@ static final class TestMaybe<T> extends DisposableMaybeObserver<T> {
 
         int start;
 
-        final List<T> values = new ArrayList<T>();
+        final List<T> values = new ArrayList<>();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         int complete;
 
@@ -62,7 +62,7 @@ public void onComplete() {
 
     @Test
     public void normal() {
-        TestMaybe<Integer> tc = new TestMaybe<Integer>();
+        TestMaybe<Integer> tc = new TestMaybe<>();
 
         assertFalse(tc.isDisposed());
         assertEquals(0, tc.start);
@@ -85,7 +85,7 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestMaybe<Integer> tc = new TestMaybe<Integer>();
+            TestMaybe<Integer> tc = new TestMaybe<>();
 
             tc.onSubscribe(Disposable.empty());
 
@@ -105,7 +105,7 @@ public void startOnce() {
 
     @Test
     public void dispose() {
-        TestMaybe<Integer> tc = new TestMaybe<Integer>();
+        TestMaybe<Integer> tc = new TestMaybe<>();
         tc.dispose();
 
         assertTrue(tc.isDisposed());
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
index b223e47b48..c2b766e761 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
@@ -32,9 +32,9 @@ static final class TestDisposableObserver<T> extends DisposableObserver<T> {
 
         int start;
 
-        final List<T> values = new ArrayList<T>();
+        final List<T> values = new ArrayList<>();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         int completions;
 
@@ -63,7 +63,7 @@ public void onComplete() {
 
     @Test
     public void normal() {
-        TestDisposableObserver<Integer> tc = new TestDisposableObserver<Integer>();
+        TestDisposableObserver<Integer> tc = new TestDisposableObserver<>();
 
         assertFalse(tc.isDisposed());
         assertEquals(0, tc.start);
@@ -84,7 +84,7 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestDisposableObserver<Integer> tc = new TestDisposableObserver<Integer>();
+            TestDisposableObserver<Integer> tc = new TestDisposableObserver<>();
 
             tc.onSubscribe(Disposable.empty());
 
@@ -104,7 +104,7 @@ public void startOnce() {
 
     @Test
     public void dispose() {
-        TestDisposableObserver<Integer> tc = new TestDisposableObserver<Integer>();
+        TestDisposableObserver<Integer> tc = new TestDisposableObserver<>();
 
         assertFalse(tc.isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
index 6bf84e21d3..b6239d65ee 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
@@ -31,9 +31,9 @@ static final class TestSingle<T> extends DisposableSingleObserver<T> {
 
         int start;
 
-        final List<T> values = new ArrayList<T>();
+        final List<T> values = new ArrayList<>();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         @Override
         protected void onStart() {
@@ -56,7 +56,7 @@ public void onError(Throwable e) {
 
     @Test
     public void normal() {
-        TestSingle<Integer> tc = new TestSingle<Integer>();
+        TestSingle<Integer> tc = new TestSingle<>();
 
         assertFalse(tc.isDisposed());
         assertEquals(0, tc.start);
@@ -77,7 +77,7 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestSingle<Integer> tc = new TestSingle<Integer>();
+            TestSingle<Integer> tc = new TestSingle<>();
 
             tc.onSubscribe(Disposable.empty());
 
@@ -97,7 +97,7 @@ public void startOnce() {
 
     @Test
     public void dispose() {
-        TestSingle<Integer> tc = new TestSingle<Integer>();
+        TestSingle<Integer> tc = new TestSingle<>();
         tc.dispose();
 
         assertTrue(tc.isDisposed());
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
index 6564ae4d16..f007940592 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
@@ -28,7 +28,7 @@
 
 public class ResourceCompletableObserverTest extends RxJavaTest {
     static final class TestResourceCompletableObserver extends ResourceCompletableObserver {
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         int complete;
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
index 04a093d753..08d06044e7 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
@@ -30,7 +30,7 @@ public class ResourceMaybeObserverTest extends RxJavaTest {
     static final class TestResourceMaybeObserver<T> extends ResourceMaybeObserver<T> {
         T value;
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         int complete;
 
@@ -67,13 +67,13 @@ public void onError(Throwable e) {
 
     @Test(expected = NullPointerException.class)
     public void nullResource() {
-        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
         rmo.add(null);
     }
 
     @Test
     public void addResources() {
-        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
 
         assertFalse(rmo.isDisposed());
 
@@ -98,7 +98,7 @@ public void addResources() {
 
     @Test
     public void onCompleteCleansUp() {
-        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
 
         assertFalse(rmo.isDisposed());
 
@@ -117,7 +117,7 @@ public void onCompleteCleansUp() {
 
     @Test
     public void onSuccessCleansUp() {
-        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
 
         assertFalse(rmo.isDisposed());
 
@@ -136,7 +136,7 @@ public void onSuccessCleansUp() {
 
     @Test
     public void onErrorCleansUp() {
-        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
 
         assertFalse(rmo.isDisposed());
 
@@ -155,7 +155,7 @@ public void onErrorCleansUp() {
 
     @Test
     public void normal() {
-        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
 
         assertFalse(rmo.isDisposed());
         assertEquals(0, rmo.start);
@@ -173,7 +173,7 @@ public void normal() {
 
     @Test
     public void empty() {
-        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
 
         assertFalse(rmo.isDisposed());
         assertEquals(0, rmo.start);
@@ -191,7 +191,7 @@ public void empty() {
 
     @Test
     public void error() {
-        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
 
         assertFalse(rmo.isDisposed());
         assertEquals(0, rmo.start);
@@ -215,7 +215,7 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+            TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
 
             rmo.onSubscribe(Disposable.empty());
 
@@ -235,7 +235,7 @@ public void startOnce() {
 
     @Test
     public void dispose() {
-        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<Integer>();
+        TestResourceMaybeObserver<Integer> rmo = new TestResourceMaybeObserver<>();
         rmo.dispose();
 
         Disposable d = Disposable.empty();
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
index e0ff866e75..94934d82df 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
@@ -30,9 +30,9 @@
 public class ResourceObserverTest extends RxJavaTest {
 
     static final class TestResourceObserver<T> extends ResourceObserver<T> {
-        final List<T> values = new ArrayList<T>();
+        final List<T> values = new ArrayList<>();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         int complete;
 
@@ -67,13 +67,13 @@ public void onComplete() {
 
     @Test(expected = NullPointerException.class)
     public void nullResource() {
-        TestResourceObserver<Integer> ro = new TestResourceObserver<Integer>();
+        TestResourceObserver<Integer> ro = new TestResourceObserver<>();
         ro.add(null);
     }
 
     @Test
     public void addResources() {
-        TestResourceObserver<Integer> ro = new TestResourceObserver<Integer>();
+        TestResourceObserver<Integer> ro = new TestResourceObserver<>();
 
         assertFalse(ro.isDisposed());
 
@@ -98,7 +98,7 @@ public void addResources() {
 
     @Test
     public void onCompleteCleansUp() {
-        TestResourceObserver<Integer> ro = new TestResourceObserver<Integer>();
+        TestResourceObserver<Integer> ro = new TestResourceObserver<>();
 
         assertFalse(ro.isDisposed());
 
@@ -117,7 +117,7 @@ public void onCompleteCleansUp() {
 
     @Test
     public void onErrorCleansUp() {
-        TestResourceObserver<Integer> ro = new TestResourceObserver<Integer>();
+        TestResourceObserver<Integer> ro = new TestResourceObserver<>();
 
         assertFalse(ro.isDisposed());
 
@@ -136,7 +136,7 @@ public void onErrorCleansUp() {
 
     @Test
     public void normal() {
-        TestResourceObserver<Integer> tc = new TestResourceObserver<Integer>();
+        TestResourceObserver<Integer> tc = new TestResourceObserver<>();
 
         assertFalse(tc.isDisposed());
         assertEquals(0, tc.start);
@@ -153,7 +153,7 @@ public void normal() {
 
     @Test
     public void error() {
-        TestResourceObserver<Integer> tc = new TestResourceObserver<Integer>();
+        TestResourceObserver<Integer> tc = new TestResourceObserver<>();
 
         assertFalse(tc.isDisposed());
         assertEquals(0, tc.start);
@@ -176,7 +176,7 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestResourceObserver<Integer> tc = new TestResourceObserver<Integer>();
+            TestResourceObserver<Integer> tc = new TestResourceObserver<>();
 
             tc.onSubscribe(Disposable.empty());
 
@@ -196,7 +196,7 @@ public void startOnce() {
 
     @Test
     public void dispose() {
-        TestResourceObserver<Integer> tc = new TestResourceObserver<Integer>();
+        TestResourceObserver<Integer> tc = new TestResourceObserver<>();
         tc.dispose();
 
         Disposable d = Disposable.empty();
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
index 054f189bc5..b720931088 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
@@ -30,7 +30,7 @@ public class ResourceSingleObserverTest extends RxJavaTest {
     static final class TestResourceSingleObserver<T> extends ResourceSingleObserver<T> {
         T value;
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         int start;
 
@@ -58,13 +58,13 @@ public void onError(Throwable e) {
 
     @Test(expected = NullPointerException.class)
     public void nullResource() {
-        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
+        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<>();
         rso.add(null);
     }
 
     @Test
     public void addResources() {
-        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
+        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<>();
 
         assertFalse(rso.isDisposed());
 
@@ -89,7 +89,7 @@ public void addResources() {
 
     @Test
     public void onSuccessCleansUp() {
-        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
+        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<>();
 
         assertFalse(rso.isDisposed());
 
@@ -108,7 +108,7 @@ public void onSuccessCleansUp() {
 
     @Test
     public void onErrorCleansUp() {
-        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
+        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<>();
 
         assertFalse(rso.isDisposed());
 
@@ -127,7 +127,7 @@ public void onErrorCleansUp() {
 
     @Test
     public void normal() {
-        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
+        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<>();
 
         assertFalse(rso.isDisposed());
         assertEquals(0, rso.start);
@@ -144,7 +144,7 @@ public void normal() {
 
     @Test
     public void error() {
-        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
+        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<>();
 
         assertFalse(rso.isDisposed());
         assertEquals(0, rso.start);
@@ -167,7 +167,7 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
+            TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<>();
 
             rso.onSubscribe(Disposable.empty());
 
@@ -187,7 +187,7 @@ public void startOnce() {
 
     @Test
     public void dispose() {
-        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<Integer>();
+        TestResourceSingleObserver<Integer> rso = new TestResourceSingleObserver<>();
         rso.dispose();
 
         Disposable d = Disposable.empty();
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
index 446dfe20df..3afced2d40 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
@@ -30,7 +30,7 @@ public class SafeObserverTest extends RxJavaTest {
 
     @Test
     public void onNextFailure() {
-        AtomicReference<Throwable> onError = new AtomicReference<Throwable>();
+        AtomicReference<Throwable> onError = new AtomicReference<>();
         try {
             OBSERVER_ONNEXT_FAIL(onError).onNext("one");
             fail("expects exception to be thrown");
@@ -43,9 +43,9 @@ public void onNextFailure() {
 
     @Test
     public void onNextFailureSafe() {
-        AtomicReference<Throwable> onError = new AtomicReference<Throwable>();
+        AtomicReference<Throwable> onError = new AtomicReference<>();
         try {
-            SafeObserver<String> safeObserver = new SafeObserver<String>(OBSERVER_ONNEXT_FAIL(onError));
+            SafeObserver<String> safeObserver = new SafeObserver<>(OBSERVER_ONNEXT_FAIL(onError));
             safeObserver.onSubscribe(Disposable.empty());
             safeObserver.onNext("one");
             assertNotNull(onError.get());
@@ -58,7 +58,7 @@ public void onNextFailureSafe() {
 
     @Test
     public void onCompleteFailure() {
-        AtomicReference<Throwable> onError = new AtomicReference<Throwable>();
+        AtomicReference<Throwable> onError = new AtomicReference<>();
         try {
             OBSERVER_ONCOMPLETED_FAIL(onError).onComplete();
             fail("expects exception to be thrown");
@@ -198,16 +198,16 @@ public void onError(Throwable e) {
             public void onComplete() {
             }
         };
-        SafeObserver<Integer> observer = new SafeObserver<Integer>(actual);
+        SafeObserver<Integer> observer = new SafeObserver<>(actual);
 
         assertSame(actual, observer.downstream);
     }
 
     @Test
     public void dispose() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
-        SafeObserver<Integer> so = new SafeObserver<Integer>(to);
+        SafeObserver<Integer> so = new SafeObserver<>(to);
 
         Disposable d = Disposable.empty();
 
@@ -222,9 +222,9 @@ public void dispose() {
 
     @Test
     public void onNextAfterComplete() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
-        SafeObserver<Integer> so = new SafeObserver<Integer>(to);
+        SafeObserver<Integer> so = new SafeObserver<>(to);
 
         Disposable d = Disposable.empty();
 
@@ -243,9 +243,9 @@ public void onNextAfterComplete() {
 
     @Test
     public void onNextNull() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
-        SafeObserver<Integer> so = new SafeObserver<Integer>(to);
+        SafeObserver<Integer> so = new SafeObserver<>(to);
 
         Disposable d = Disposable.empty();
 
@@ -258,9 +258,9 @@ public void onNextNull() {
 
     @Test
     public void onNextWithoutOnSubscribe() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
-        SafeObserver<Integer> so = new SafeObserver<Integer>(to);
+        SafeObserver<Integer> so = new SafeObserver<>(to);
 
         so.onNext(1);
 
@@ -269,9 +269,9 @@ public void onNextWithoutOnSubscribe() {
 
     @Test
     public void onErrorWithoutOnSubscribe() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
-        SafeObserver<Integer> so = new SafeObserver<Integer>(to);
+        SafeObserver<Integer> so = new SafeObserver<>(to);
 
         so.onError(new TestException());
 
@@ -283,9 +283,9 @@ public void onErrorWithoutOnSubscribe() {
 
     @Test
     public void onCompleteWithoutOnSubscribe() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
-        SafeObserver<Integer> so = new SafeObserver<Integer>(to);
+        SafeObserver<Integer> so = new SafeObserver<>(to);
 
         so.onComplete();
 
@@ -294,9 +294,9 @@ public void onCompleteWithoutOnSubscribe() {
 
     @Test
     public void onNextNormal() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
-        SafeObserver<Integer> so = new SafeObserver<Integer>(to);
+        SafeObserver<Integer> so = new SafeObserver<>(to);
 
         Disposable d = Disposable.empty();
 
@@ -369,7 +369,7 @@ public void onComplete() {
         }
 
         public SafeObserver<Object> toSafe() {
-            return new SafeObserver<Object>(this);
+            return new SafeObserver<>(this);
         }
 
         public CrashDummy assertError(Class<? extends Throwable> clazz) {
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
index 84fa434879..e581012d9b 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
@@ -41,7 +41,7 @@ public void before() {
     }
 
     private Observer<String> serializedObserver(Observer<String> o) {
-        return new SerializedObserver<String>(o);
+        return new SerializedObserver<>(o);
     }
 
     @Test
@@ -163,7 +163,7 @@ public void runOutOfOrderConcurrencyTest() {
         try {
             TestConcurrencySubscriber tw = new TestConcurrencySubscriber();
             // we need Synchronized + SafeObserver to handle synchronization plus life-cycle
-            Observer<String> w = serializedObserver(new SafeObserver<String>(tw));
+            Observer<String> w = serializedObserver(new SafeObserver<>(tw));
 
             Future<?> f1 = tp.submit(new OnNextThread(w, 12000));
             Future<?> f2 = tp.submit(new OnNextThread(w, 5000));
@@ -219,7 +219,7 @@ public void runConcurrencyTest() {
         try {
             TestConcurrencySubscriber tw = new TestConcurrencySubscriber();
             // we need Synchronized + SafeObserver to handle synchronization plus life-cycle
-            Observer<String> w = serializedObserver(new SafeObserver<String>(tw));
+            Observer<String> w = serializedObserver(new SafeObserver<>(tw));
             w.onSubscribe(Disposable.empty());
 
             Future<?> f1 = tp.submit(new OnNextThread(w, 12000));
@@ -275,7 +275,7 @@ public void notificationDelay() throws InterruptedException {
                 final CountDownLatch latch = new CountDownLatch(1);
                 final CountDownLatch running = new CountDownLatch(2);
 
-                TestObserverEx<String> to = new TestObserverEx<String>(new DefaultObserver<String>() {
+                TestObserverEx<String> to = new TestObserverEx<>(new DefaultObserver<String>() {
 
                     @Override
                     public void onComplete() {
@@ -356,7 +356,7 @@ public void onNext(String t) {
     @Test
     public void threadStarvation() throws InterruptedException {
 
-        TestObserver<String> to = new TestObserver<String>(new DefaultObserver<String>() {
+        TestObserver<String> to = new TestObserver<>(new DefaultObserver<String>() {
 
             @Override
             public void onComplete() {
@@ -552,7 +552,7 @@ private static class TestConcurrencySubscriber extends DefaultObserver<String> {
         /**
          * used to store the order and number of events received.
          */
-        private final LinkedBlockingQueue<TestConcurrencySubscriberEvent> events = new LinkedBlockingQueue<TestConcurrencySubscriberEvent>();
+        private final LinkedBlockingQueue<TestConcurrencySubscriberEvent> events = new LinkedBlockingQueue<>();
         private final int waitTime;
 
         @SuppressWarnings("unused")
@@ -848,7 +848,7 @@ protected void captureMaxThreads() {
     public void errorReentry() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<Observer<Integer>> serial = new AtomicReference<Observer<Integer>>();
+            final AtomicReference<Observer<Integer>> serial = new AtomicReference<>();
 
             TestObserver<Integer> to = new TestObserver<Integer>() {
                 @Override
@@ -858,7 +858,7 @@ public void onNext(Integer v) {
                     super.onNext(v);
                 }
             };
-            SerializedObserver<Integer> sobs = new SerializedObserver<Integer>(to);
+            SerializedObserver<Integer> sobs = new SerializedObserver<>(to);
             sobs.onSubscribe(Disposable.empty());
             serial.set(sobs);
 
@@ -875,7 +875,7 @@ public void onNext(Integer v) {
 
     @Test
     public void completeReentry() {
-        final AtomicReference<Observer<Integer>> serial = new AtomicReference<Observer<Integer>>();
+        final AtomicReference<Observer<Integer>> serial = new AtomicReference<>();
 
         TestObserver<Integer> to = new TestObserver<Integer>() {
             @Override
@@ -885,7 +885,7 @@ public void onNext(Integer v) {
                 super.onNext(v);
             }
         };
-        SerializedObserver<Integer> sobs = new SerializedObserver<Integer>(to);
+        SerializedObserver<Integer> sobs = new SerializedObserver<>(to);
         sobs.onSubscribe(Disposable.empty());
         serial.set(sobs);
 
@@ -898,9 +898,9 @@ public void onNext(Integer v) {
 
     @Test
     public void dispose() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
-        SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
+        SerializedObserver<Integer> so = new SerializedObserver<>(to);
 
         Disposable d = Disposable.empty();
 
@@ -918,9 +918,9 @@ public void dispose() {
     @Test
     public void onCompleteRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
-            final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
+            final SerializedObserver<Integer> so = new SerializedObserver<>(to);
 
             Disposable d = Disposable.empty();
 
@@ -944,9 +944,9 @@ public void run() {
     @Test
     public void onNextOnCompleteRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
-            final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
+            final SerializedObserver<Integer> so = new SerializedObserver<>(to);
 
             Disposable d = Disposable.empty();
 
@@ -980,9 +980,9 @@ public void run() {
     @Test
     public void onNextOnErrorRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
-            final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
+            final SerializedObserver<Integer> so = new SerializedObserver<>(to);
 
             Disposable d = Disposable.empty();
 
@@ -1018,9 +1018,9 @@ public void run() {
     @Test
     public void onNextOnErrorRaceDelayError() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
-            final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to, true);
+            final SerializedObserver<Integer> so = new SerializedObserver<>(to, true);
 
             Disposable d = Disposable.empty();
 
@@ -1059,9 +1059,9 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
-            final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
+            final SerializedObserver<Integer> so = new SerializedObserver<>(to);
 
             so.onSubscribe(Disposable.empty());
 
@@ -1083,9 +1083,9 @@ public void onCompleteOnErrorRace() {
 
             List<Throwable> errors = TestHelper.trackPluginErrors();
             try {
-                TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+                TestObserverEx<Integer> to = new TestObserverEx<>();
 
-                final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
+                final SerializedObserver<Integer> so = new SerializedObserver<>(to);
 
                 Disposable d = Disposable.empty();
 
@@ -1130,9 +1130,9 @@ public void run() {
     @Test
     public void nullOnNext() {
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
-        final SerializedObserver<Integer> so = new SerializedObserver<Integer>(to);
+        final SerializedObserver<Integer> so = new SerializedObserver<>(to);
 
         Disposable d = Disposable.empty();
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
index 581aa0b0b1..1e4a287cee 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
@@ -46,7 +46,7 @@ public class TestObserverTest extends RxJavaTest {
     @Test
     public void assertTestObserver() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> subscriber = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> subscriber = new TestSubscriber<>();
         oi.subscribe(subscriber);
 
         subscriber.assertValues(1, 2);
@@ -57,7 +57,7 @@ public void assertTestObserver() {
     @Test
     public void assertNotMatchCount() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> subscriber = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> subscriber = new TestSubscriber<>();
         oi.subscribe(subscriber);
 
         thrown.expect(AssertionError.class);
@@ -72,7 +72,7 @@ public void assertNotMatchCount() {
     @Test
     public void assertNotMatchValue() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> subscriber = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> subscriber = new TestSubscriber<>();
         oi.subscribe(subscriber);
 
         thrown.expect(AssertionError.class);
@@ -87,7 +87,7 @@ public void assertNotMatchValue() {
     @Test
     public void assertTerminalEventNotReceived() {
         PublishProcessor<Integer> p = PublishProcessor.create();
-        TestSubscriber<Integer> subscriber = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> subscriber = new TestSubscriber<>();
         p.subscribe(subscriber);
 
         p.onNext(1);
@@ -108,7 +108,7 @@ public void wrappingMock() {
 
         Subscriber<Integer> mockSubscriber = TestHelper.mockSubscriber();
 
-        oi.subscribe(new TestSubscriber<Integer>(mockSubscriber));
+        oi.subscribe(new TestSubscriber<>(mockSubscriber));
 
         InOrder inOrder = inOrder(mockSubscriber);
         inOrder.verify(mockSubscriber, times(1)).onNext(1);
@@ -121,7 +121,7 @@ public void wrappingMock() {
     public void wrappingMockWhenUnsubscribeInvolved() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9)).take(2);
         Subscriber<Integer> mockSubscriber = TestHelper.mockSubscriber();
-        oi.subscribe(new TestSubscriber<Integer>(mockSubscriber));
+        oi.subscribe(new TestSubscriber<>(mockSubscriber));
 
         InOrder inOrder = inOrder(mockSubscriber);
         inOrder.verify(mockSubscriber, times(1)).onNext(1);
@@ -132,12 +132,12 @@ public void wrappingMockWhenUnsubscribeInvolved() {
 
     @Test
     public void errorSwallowed() {
-        Flowable.error(new RuntimeException()).subscribe(new TestSubscriber<Object>());
+        Flowable.error(new RuntimeException()).subscribe(new TestSubscriber<>());
     }
 
     @Test
     public void nullExpected() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onNext(1);
 
         try {
@@ -151,7 +151,7 @@ public void nullExpected() {
 
     @Test
     public void nullActual() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onNext(null);
 
         try {
@@ -334,7 +334,7 @@ public void assertFuseable() {
 
         to = TestObserver.create();
 
-        to.onSubscribe(new ScalarDisposable<Integer>(to, 1));
+        to.onSubscribe(new ScalarDisposable<>(to, 1));
     }
 
     @Test
@@ -645,7 +645,7 @@ public void assertValueSequence() {
 
     @Test
     public void assertEmpty() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         try {
             to.assertEmpty();
@@ -670,7 +670,7 @@ public void assertEmpty() {
 
     @Test
     public void awaitDoneTimed() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Thread.currentThread().interrupt();
 
@@ -683,7 +683,7 @@ public void awaitDoneTimed() {
 
     @Test
     public void assertErrorMultiple() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         TestException e = new TestException();
         to.onError(e);
@@ -711,7 +711,7 @@ public void assertErrorMultiple() {
 
     @Test
     public void errorInPredicate() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
         to.onError(new RuntimeException());
         try {
             to.assertError(new Predicate<Throwable>() {
@@ -729,7 +729,7 @@ public boolean test(Throwable throwable) throws Exception {
 
     @Test
     public void assertComplete() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -756,7 +756,7 @@ public void assertComplete() {
 
     @Test
     public void completeWithoutOnSubscribe() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         to.onComplete();
 
@@ -765,7 +765,7 @@ public void completeWithoutOnSubscribe() {
 
     @Test
     public void completeDelegateThrows() {
-        TestObserver<Integer> to = new TestObserver<Integer>(new Observer<Integer>() {
+        TestObserver<Integer> to = new TestObserver<>(new Observer<Integer>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -801,7 +801,7 @@ public void onComplete() {
 
     @Test
     public void errorDelegateThrows() {
-        TestObserver<Integer> to = new TestObserver<Integer>(new Observer<Integer>() {
+        TestObserver<Integer> to = new TestObserver<>(new Observer<Integer>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -853,7 +853,7 @@ public void errorMeansDisposed() {
 
     @Test
     public void assertValuePredicateEmpty() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         Observable.empty().subscribe(to);
 
@@ -868,7 +868,7 @@ public void assertValuePredicateEmpty() {
 
     @Test
     public void assertValuePredicateMatch() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1).subscribe(to);
 
@@ -881,7 +881,7 @@ public void assertValuePredicateMatch() {
 
     @Test
     public void assertValuePredicateNoMatch() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1).subscribe(to);
 
@@ -896,7 +896,7 @@ public void assertValuePredicateNoMatch() {
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1, 2).subscribe(to);
 
@@ -911,7 +911,7 @@ public void assertValuePredicateMatchButMore() {
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         Observable.empty().subscribe(to);
 
@@ -926,7 +926,7 @@ public void assertValueAtPredicateEmpty() {
 
     @Test
     public void assertValueAtPredicateMatch() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1, 2).subscribe(to);
 
@@ -939,7 +939,7 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1, 2, 3).subscribe(to);
 
@@ -954,7 +954,7 @@ public void assertValueAtPredicateNoMatch() {
 
     @Test
     public void assertValueAtInvalidIndex() {
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
         Observable.just(1, 2).subscribe(to);
 
@@ -969,7 +969,7 @@ public void assertValueAtInvalidIndex() {
 
     @Test
     public void assertValueAtIndexEmpty() {
-        TestObserver<Object> to = new TestObserver<Object>();
+        TestObserver<Object> to = new TestObserver<>();
 
         Observable.empty().subscribe(to);
 
@@ -980,7 +980,7 @@ public void assertValueAtIndexEmpty() {
 
     @Test
     public void assertValueAtIndexMatch() {
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         Observable.just("a", "b").subscribe(to);
 
@@ -989,7 +989,7 @@ public void assertValueAtIndexMatch() {
 
     @Test
     public void assertValueAtIndexNoMatch() {
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         Observable.just("a", "b", "c").subscribe(to);
 
@@ -1000,7 +1000,7 @@ public void assertValueAtIndexNoMatch() {
 
     @Test
     public void assertValueAtIndexInvalidIndex() {
-        TestObserver<String> to = new TestObserver<String>();
+        TestObserver<String> to = new TestObserver<>();
 
         Observable.just("a", "b").subscribe(to);
 
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
index 044c429d6c..26d5af8628 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
@@ -35,7 +35,7 @@ public void subscriberCount() {
         .collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -74,7 +74,7 @@ public void reducerCrash() {
         .collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -99,7 +99,7 @@ public void cancel() {
         .collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -125,7 +125,7 @@ public void error() {
         .collect(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiConsumer<List<Integer>, Integer>() {
             @Override
@@ -147,7 +147,7 @@ public void doubleError() {
             .collect(new Supplier<List<Object>>() {
                 @Override
                 public List<Object> get() throws Exception {
-                    return new ArrayList<Object>();
+                    return new ArrayList<>();
                 }
             }, new BiConsumer<List<Object>, Object>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
index 40afd9a511..1e048a1dcc 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
@@ -49,7 +49,7 @@ public Integer apply(Integer v) throws Exception {
             .sequential()
             ;
 
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
             result.subscribe(ts);
 
@@ -77,7 +77,7 @@ public Integer apply(Integer v) throws Exception {
             .sequential()
             ;
 
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
             result.subscribe(ts);
 
@@ -113,7 +113,7 @@ public Integer apply(Integer v) throws Exception {
                 .sequential()
                 ;
 
-                TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+                TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
                 result.subscribe(ts);
 
@@ -154,7 +154,7 @@ public Integer apply(Integer v) throws Exception {
                 .sequential()
                 ;
 
-                TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+                TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
                 result.subscribe(ts);
 
@@ -176,7 +176,7 @@ public Integer apply(Integer v) throws Exception {
     @Test
     public void reduceFull() {
         for (int i = 1; i <= Runtime.getRuntime().availableProcessors() * 2; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Flowable.range(1, 10)
             .parallel(i)
@@ -205,7 +205,7 @@ public void parallelReduceFull() {
                 Scheduler scheduler = Schedulers.from(exec);
 
                 try {
-                    TestSubscriber<Long> ts = new TestSubscriber<Long>();
+                    TestSubscriber<Long> ts = new TestSubscriber<>();
 
                     Flowable.range(1, n)
                     .map(new Function<Integer, Long>() {
@@ -239,7 +239,7 @@ public Long apply(Long a, Long b) throws Exception {
     @SuppressWarnings("unchecked")
     @Test
     public void toSortedList() {
-        TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+        TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
         Flowable.fromArray(10, 9, 8, 7, 6, 5, 4, 3, 2, 1)
         .parallel()
@@ -251,7 +251,7 @@ public void toSortedList() {
 
     @Test
     public void sorted() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
 
         Flowable.fromArray(10, 9, 8, 7, 6, 5, 4, 3, 2, 1)
         .parallel()
@@ -278,11 +278,11 @@ public void collect() {
         Supplier<List<Integer>> as = new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         };
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         Flowable.range(1, 10)
         .parallel()
         .collect(as, new BiConsumer<List<Integer>, Integer>() {
@@ -310,7 +310,7 @@ public Iterable<Integer> apply(List<Integer> v) throws Exception {
     @SuppressWarnings("unchecked")
     @Test
     public void from() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ParallelFlowable.fromArray(Flowable.range(1, 5), Flowable.range(6, 5))
         .sequential()
@@ -325,7 +325,7 @@ public void from() {
 
     @Test
     public void concatMapUnordered() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.range(1, 5)
         .parallel()
@@ -347,7 +347,7 @@ public Publisher<Integer> apply(Integer v) throws Exception {
 
     @Test
     public void flatMapUnordered() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.range(1, 5)
         .parallel()
@@ -377,10 +377,10 @@ public void collectAsyncFused() {
             Supplier<List<Integer>> as = new Supplier<List<Integer>>() {
                 @Override
                 public List<Integer> get() throws Exception {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             };
-            TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+            TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
             Flowable.range(1, 100000)
             .parallel(3)
@@ -424,10 +424,10 @@ public void collectAsync() {
             Supplier<List<Integer>> as = new Supplier<List<Integer>>() {
                 @Override
                 public List<Integer> get() throws Exception {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             };
-            TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+            TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
             Flowable.range(1, 100000).hide()
             .parallel(3)
@@ -471,10 +471,10 @@ public void collectAsync2() {
             Supplier<List<Integer>> as = new Supplier<List<Integer>>() {
                 @Override
                 public List<Integer> get() throws Exception {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             };
-            TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+            TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
             Flowable.range(1, 100000).hide()
             .observeOn(s)
@@ -519,10 +519,10 @@ public void collectAsync3() {
             Supplier<List<Integer>> as = new Supplier<List<Integer>>() {
                 @Override
                 public List<Integer> get() throws Exception {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             };
-            TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+            TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
             Flowable.range(1, 100000).hide()
             .observeOn(s)
@@ -567,10 +567,10 @@ public void collectAsync3Fused() {
             Supplier<List<Integer>> as = new Supplier<List<Integer>>() {
                 @Override
                 public List<Integer> get() throws Exception {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             };
-            TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+            TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
             Flowable.range(1, 100000)
             .observeOn(s)
@@ -615,10 +615,10 @@ public void collectAsync3Take() {
             Supplier<List<Integer>> as = new Supplier<List<Integer>>() {
                 @Override
                 public List<Integer> get() throws Exception {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             };
-            TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+            TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
             Flowable.range(1, 100000)
             .take(1000)
@@ -664,10 +664,10 @@ public void collectAsync4Take() {
             Supplier<List<Integer>> as = new Supplier<List<Integer>>() {
                 @Override
                 public List<Integer> get() throws Exception {
-                    return new ArrayList<Integer>();
+                    return new ArrayList<>();
                 }
             };
-            TestSubscriber<List<Integer>> ts = new TestSubscriber<List<Integer>>();
+            TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
 
             UnicastProcessor<Integer> up = UnicastProcessor.create();
 
@@ -711,7 +711,7 @@ public void accept(List<Integer> v) throws Exception {
 
     @Test
     public void emptySourceZeroRequest() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(0);
+        TestSubscriber<Object> ts = new TestSubscriber<>(0);
 
         Flowable.range(1, 3).parallel(3).sequential().subscribe(ts);
 
@@ -762,7 +762,7 @@ public void parallelismAndPrefetchAsync() {
     @SuppressWarnings("unchecked")
     @Test
     public void badParallelismStage() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.range(1, 10)
         .parallel(2)
@@ -774,9 +774,9 @@ public void badParallelismStage() {
     @SuppressWarnings("unchecked")
     @Test
     public void badParallelismStage2() {
-        TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
-        TestSubscriber<Integer> ts3 = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>();
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>();
+        TestSubscriber<Integer> ts3 = new TestSubscriber<>();
 
         Flowable.range(1, 10)
         .parallel(2)
@@ -1305,7 +1305,7 @@ public static void checkSubscriberCount(ParallelFlowable<?> source) {
         TestSubscriber<Object>[] consumers = new TestSubscriber[n + 1];
 
         for (int i = 0; i <= n; i++) {
-            consumers[i] = new TestSubscriber<Object>();
+            consumers[i] = new TestSubscriber<>();
         }
 
         source.subscribe(consumers);
@@ -1323,7 +1323,7 @@ public void checkAddBiConsumer() {
 
     @Test
     public void mergeBiFunction() throws Exception {
-        MergerBiFunction<Integer> f = new MergerBiFunction<Integer>(Functions.<Integer>naturalComparator());
+        MergerBiFunction<Integer> f = new MergerBiFunction<>(Functions.<Integer>naturalComparator());
 
         assertEquals(0, f.apply(Collections.<Integer>emptyList(), Collections.<Integer>emptyList()).size());
 
@@ -1331,12 +1331,12 @@ public void mergeBiFunction() throws Exception {
 
         for (int i = 0; i < 4; i++) {
             int k = 0;
-            List<Integer> list1 = new ArrayList<Integer>();
+            List<Integer> list1 = new ArrayList<>();
             for (int j = 0; j < i; j++) {
                 list1.add(k++);
             }
 
-            List<Integer> list2 = new ArrayList<Integer>();
+            List<Integer> list2 = new ArrayList<>();
             for (int j = i; j < 4; j++) {
                 list2.add(k++);
             }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
index 0d889d21cb..c790201d98 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
@@ -71,12 +71,12 @@ static final class StripBoundary<T> extends Flowable<T> implements FlowableTrans
 
         @Override
         public Publisher<T> apply(Flowable<T> upstream) {
-            return new StripBoundary<T>(upstream);
+            return new StripBoundary<>(upstream);
         }
 
         @Override
         protected void subscribeActual(Subscriber<? super T> s) {
-            source.subscribe(new StripBoundarySubscriber<T>(s));
+            source.subscribe(new StripBoundarySubscriber<>(s));
         }
 
         static final class StripBoundarySubscriber<T> extends BasicFuseableSubscriber<T, T> {
@@ -117,7 +117,7 @@ public Object apply(Integer v) throws Exception {
                 throw new TestException();
             }
         })
-        .compose(new StripBoundary<Object>(null))
+        .compose(new StripBoundary<>(null))
         .parallel()
         .sequential()
         .test()
@@ -137,7 +137,7 @@ public Object apply(Integer v) throws Exception {
                 throw new TestException();
             }
         })
-        .compose(new StripBoundary<Object>(null))
+        .compose(new StripBoundary<>(null))
         .parallel()
         .sequential()
         .test()
@@ -148,8 +148,8 @@ public Object apply(Integer v) throws Exception {
 
     @Test
     public void boundaryConfinement() {
-        final Set<String> between = new HashSet<String>();
-        final ConcurrentHashMap<String, String> processing = new ConcurrentHashMap<String, String>();
+        final Set<String> between = new HashSet<>();
+        final ConcurrentHashMap<String, String> processing = new ConcurrentHashMap<>();
 
         TestSubscriberEx<Object> ts = Flowable.range(1, 10)
         .observeOn(Schedulers.single(), false, 1)
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
index 61ef50c1f6..aac8c0af62 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
@@ -35,7 +35,7 @@ public void subscriberCount() {
         .reduce(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiFunction<List<Integer>, Integer, List<Integer>>() {
             @Override
@@ -76,7 +76,7 @@ public void reducerCrash() {
         .reduce(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiFunction<List<Integer>, Integer, List<Integer>>() {
             @Override
@@ -102,7 +102,7 @@ public void cancel() {
         .reduce(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiFunction<List<Integer>, Integer, List<Integer>>() {
             @Override
@@ -129,7 +129,7 @@ public void error() {
         .reduce(new Supplier<List<Integer>>() {
             @Override
             public List<Integer> get() throws Exception {
-                return new ArrayList<Integer>();
+                return new ArrayList<>();
             }
         }, new BiFunction<List<Integer>, Integer, List<Integer>>() {
             @Override
@@ -152,7 +152,7 @@ public void doubleError() {
             .reduce(new Supplier<List<Object>>() {
                 @Override
                 public List<Object> get() throws Exception {
-                    return new ArrayList<Object>();
+                    return new ArrayList<>();
                 }
             }, new BiFunction<List<Object>, Object, List<Object>>() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
index 4b19afdc66..907b0bb889 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
@@ -135,7 +135,7 @@ public void errorConditional() {
     @SuppressWarnings("unchecked")
     @Test
     public void errorConditionalBackpressured() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(0L);
+        TestSubscriber<Object> ts = new TestSubscriber<>(0L);
 
         Flowable.error(new TestException())
         .parallel(1)
@@ -150,7 +150,7 @@ public void errorConditionalBackpressured() {
     @SuppressWarnings("unchecked")
     @Test
     public void emptyConditionalBackpressured() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(0L);
+        TestSubscriber<Object> ts = new TestSubscriber<>(0L);
 
         Flowable.empty()
         .parallel(1)
diff --git a/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
index 090ff6b766..defc141800 100644
--- a/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
@@ -599,7 +599,7 @@ public void singleCreate() {
             RxJavaPlugins.setOnSingleAssembly(new Function<Single, Single>() {
                 @Override
                 public Single apply(Single t) {
-                    return new SingleJust<Integer>(10);
+                    return new SingleJust<>(10);
                 }
             });
 
@@ -806,7 +806,7 @@ public void onScheduleNewThread() throws InterruptedException {
     @Test
     public void onError() {
         try {
-            final List<Throwable> list = new ArrayList<Throwable>();
+            final List<Throwable> list = new ArrayList<>();
 
             RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
                 @Override
@@ -827,7 +827,7 @@ public void accept(Throwable t) {
     @Test
     public void onErrorNoHandler() {
         try {
-            final List<Throwable> list = new ArrayList<Throwable>();
+            final List<Throwable> list = new ArrayList<>();
 
             RxJavaPlugins.setErrorHandler(null);
 
@@ -858,7 +858,7 @@ public void uncaughtException(Thread t, Throwable e) {
     @Test
     public void onErrorCrashes() {
         try {
-            final List<Throwable> list = new ArrayList<Throwable>();
+            final List<Throwable> list = new ArrayList<>();
 
             RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
                 @Override
@@ -893,7 +893,7 @@ public void uncaughtException(Thread t, Throwable e) {
     @Test
     public void onErrorWithNull() {
         try {
-            final List<Throwable> list = new ArrayList<Throwable>();
+            final List<Throwable> list = new ArrayList<>();
 
             RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
                 @Override
@@ -1523,7 +1523,7 @@ public void onComplete() {
     @Test
     public void onErrorNull() {
         try {
-            final AtomicReference<Throwable> t = new AtomicReference<Throwable>();
+            final AtomicReference<Throwable> t = new AtomicReference<>();
 
             RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
                 @Override
@@ -1547,7 +1547,7 @@ private static void verifyThread(Scheduler scheduler, String expectedThreadName)
         assertNotNull(scheduler);
         Worker w = scheduler.createWorker();
         try {
-            final AtomicReference<Thread> value = new AtomicReference<Thread>();
+            final AtomicReference<Thread> value = new AtomicReference<>();
             final CountDownLatch cdl = new CountDownLatch(1);
 
             w.schedule(new Runnable() {
@@ -1703,7 +1703,7 @@ public void onParallelAssembly() {
             RxJavaPlugins.setOnParallelAssembly(new Function<ParallelFlowable, ParallelFlowable>() {
                 @Override
                 public ParallelFlowable apply(ParallelFlowable pf) throws Exception {
-                    return new ParallelFromPublisher<Integer>(Flowable.just(2), 2, 2);
+                    return new ParallelFromPublisher<>(Flowable.just(2), 2, 2);
                 }
             });
 
diff --git a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
index 421aee51a4..6daaf15245 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
@@ -136,7 +136,7 @@ public void unsubscribeBeforeCompleted() {
         AsyncProcessor<String> processor = AsyncProcessor.create();
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         processor.subscribe(ts);
 
         processor.onNext("one");
@@ -185,7 +185,7 @@ public void subscribeCompletionRaceCondition() {
          */
         for (int i = 0; i < 50; i++) {
             final AsyncProcessor<String> processor = AsyncProcessor.create();
-            final AtomicReference<String> value1 = new AtomicReference<String>();
+            final AtomicReference<String> value1 = new AtomicReference<>();
 
             processor.subscribe(new Consumer<String>() {
 
@@ -243,7 +243,7 @@ public void run() {
     private static class SubjectSubscriberThread extends Thread {
 
         private final AsyncProcessor<String> processor;
-        private final AtomicReference<String> value = new AtomicReference<String>();
+        private final AtomicReference<String> value = new AtomicReference<>();
 
         SubjectSubscriberThread(AsyncProcessor<String> processor) {
             this.processor = processor;
@@ -327,7 +327,7 @@ public void currentStateMethodsError() {
 
     @Test
     public void fusionLive() {
-        AsyncProcessor<Integer> ap = new AsyncProcessor<Integer>();
+        AsyncProcessor<Integer> ap = new AsyncProcessor<>();
 
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
 
@@ -350,7 +350,7 @@ public void fusionLive() {
 
     @Test
     public void fusionOfflie() {
-        AsyncProcessor<Integer> ap = new AsyncProcessor<Integer>();
+        AsyncProcessor<Integer> ap = new AsyncProcessor<>();
         ap.onNext(1);
         ap.onComplete();
 
@@ -461,7 +461,7 @@ public void run() {
     public void onNextCrossCancel() {
         AsyncProcessor<Object> p = AsyncProcessor.create();
 
-        final TestSubscriber<Object> ts2 = new TestSubscriber<Object>();
+        final TestSubscriber<Object> ts2 = new TestSubscriber<>();
         TestSubscriber<Object> ts1 = new TestSubscriber<Object>() {
             @Override
             public void onNext(Object t) {
@@ -484,7 +484,7 @@ public void onNext(Object t) {
     public void onErrorCrossCancel() {
         AsyncProcessor<Object> p = AsyncProcessor.create();
 
-        final TestSubscriber<Object> ts2 = new TestSubscriber<Object>();
+        final TestSubscriber<Object> ts2 = new TestSubscriber<>();
         TestSubscriber<Object> ts1 = new TestSubscriber<Object>() {
             @Override
             public void onError(Throwable t) {
@@ -506,7 +506,7 @@ public void onError(Throwable t) {
     public void onCompleteCrossCancel() {
         AsyncProcessor<Object> p = AsyncProcessor.create();
 
-        final TestSubscriber<Object> ts2 = new TestSubscriber<Object>();
+        final TestSubscriber<Object> ts2 = new TestSubscriber<>();
         TestSubscriber<Object> ts1 = new TestSubscriber<Object>() {
             @Override
             public void onComplete() {
diff --git a/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
index 0d61998b30..0f04c4baea 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
@@ -137,7 +137,7 @@ public void completedStopsEmittingData() {
         Subscriber<Object> observerB = TestHelper.mockSubscriber();
         Subscriber<Object> observerC = TestHelper.mockSubscriber();
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(observerA);
+        TestSubscriber<Object> ts = new TestSubscriber<>(observerA);
 
         channel.subscribe(ts);
         channel.subscribe(observerB);
@@ -389,7 +389,7 @@ public void run() {
                     }
                 });
 
-                final AtomicReference<Object> o = new AtomicReference<Object>();
+                final AtomicReference<Object> o = new AtomicReference<>();
 
                 rs.subscribeOn(s).observeOn(Schedulers.io())
                 .subscribe(new DefaultSubscriber<Object>() {
@@ -715,7 +715,7 @@ public void completeSubscribeRace() throws Exception {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final BehaviorProcessor<Object> p = BehaviorProcessor.create();
 
-            final TestSubscriber<Object> ts = new TestSubscriber<Object>();
+            final TestSubscriber<Object> ts = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -742,7 +742,7 @@ public void errorSubscribeRace() throws Exception {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final BehaviorProcessor<Object> p = BehaviorProcessor.create();
 
-            final TestSubscriber<Object> ts = new TestSubscriber<Object>();
+            final TestSubscriber<Object> ts = new TestSubscriber<>();
 
             final TestException ex = new TestException();
 
@@ -804,9 +804,9 @@ public void behaviorDisposableDisposeState() {
         BehaviorProcessor<Integer> bp = BehaviorProcessor.create();
         bp.onNext(1);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        BehaviorSubscription<Integer> bs = new BehaviorSubscription<Integer>(ts, bp);
+        BehaviorSubscription<Integer> bs = new BehaviorSubscription<>(ts, bp);
         ts.onSubscribe(bs);
 
         assertFalse(bs.cancelled);
@@ -835,9 +835,9 @@ public void emitFirstDisposeRace() {
             BehaviorProcessor<Integer> bp = BehaviorProcessor.create();
             bp.onNext(1);
 
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-            final BehaviorSubscription<Integer> bs = new BehaviorSubscription<Integer>(ts, bp);
+            final BehaviorSubscription<Integer> bs = new BehaviorSubscription<>(ts, bp);
             ts.onSubscribe(bs);
 
             Runnable r1 = new Runnable() {
@@ -864,9 +864,9 @@ public void emitNextDisposeRace() {
             BehaviorProcessor<Integer> bp = BehaviorProcessor.create();
             bp.onNext(1);
 
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-            final BehaviorSubscription<Integer> bs = new BehaviorSubscription<Integer>(ts, bp);
+            final BehaviorSubscription<Integer> bs = new BehaviorSubscription<>(ts, bp);
             ts.onSubscribe(bs);
 
             Runnable r1 = new Runnable() {
@@ -891,9 +891,9 @@ public void emittingEmitNext() {
         BehaviorProcessor<Integer> bp = BehaviorProcessor.create();
         bp.onNext(1);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        final BehaviorSubscription<Integer> bs = new BehaviorSubscription<Integer>(ts, bp);
+        final BehaviorSubscription<Integer> bs = new BehaviorSubscription<>(ts, bp);
         ts.onSubscribe(bs);
 
         bs.emitting = true;
@@ -910,9 +910,9 @@ public void badRequest() {
             BehaviorProcessor<Integer> bp = BehaviorProcessor.create();
             bp.onNext(1);
 
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-            final BehaviorSubscription<Integer> bs = new BehaviorSubscription<Integer>(ts, bp);
+            final BehaviorSubscription<Integer> bs = new BehaviorSubscription<>(ts, bp);
             ts.onSubscribe(bs);
 
             bs.request(-1);
diff --git a/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
index d34fbabcb4..4e71919b09 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
@@ -229,7 +229,7 @@ public void takeRefCountExact() {
     @Test
     public void crossCancel() {
 
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
             @Override
@@ -257,7 +257,7 @@ public void onNext(Integer t) {
     @Test
     public void crossCancelError() {
 
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
             @Override
@@ -285,7 +285,7 @@ public void onError(Throwable t) {
     @Test
     public void crossCancelComplete() {
 
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
             @Override
@@ -314,7 +314,7 @@ public void onComplete() {
     @Test
     public void crossCancel1() {
 
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>(1);
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>(1);
 
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(1) {
             @Override
@@ -536,7 +536,7 @@ public void addRemoveRaceNoRefCount() {
             final MulticastProcessor<Integer> mp = MulticastProcessor.create();
 
             final TestSubscriber<Integer> ts = mp.test();
-            final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts2 = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -565,7 +565,7 @@ public void addRemoveRaceNoRefCountNonEmpty() {
 
             mp.test();
             final TestSubscriber<Integer> ts = mp.test();
-            final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts2 = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -593,7 +593,7 @@ public void addRemoveRaceWitRefCount() {
             final MulticastProcessor<Integer> mp = MulticastProcessor.create(true);
 
             final TestSubscriber<Integer> ts = mp.test();
-            final TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts2 = new TestSubscriber<>();
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
index 3398e1bc58..277ac40c78 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
@@ -69,7 +69,7 @@ public void completedStopsEmittingData() {
         Subscriber<Object> observerB = TestHelper.mockSubscriber();
         Subscriber<Object> observerC = TestHelper.mockSubscriber();
 
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(observerA);
+        TestSubscriber<Object> ts = new TestSubscriber<>(observerA);
 
         channel.subscribe(ts);
         channel.subscribe(observerB);
@@ -178,7 +178,7 @@ public void unsubscribeFirstSubscriber() {
         PublishProcessor<String> processor = PublishProcessor.create();
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         processor.subscribe(ts);
 
         processor.onNext("one");
@@ -213,7 +213,7 @@ public void nestedSubscribe() {
         final AtomicInteger countChildren = new AtomicInteger();
         final AtomicInteger countTotal = new AtomicInteger();
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
 
         s.flatMap(new Function<Integer, Flowable<String>>() {
 
@@ -264,7 +264,7 @@ public void reSubscribe() {
         final PublishProcessor<Integer> pp = PublishProcessor.create();
 
         Subscriber<Integer> subscriber1 = TestHelper.mockSubscriber();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(subscriber1);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(subscriber1);
         pp.subscribe(ts);
 
         // emit
@@ -282,7 +282,7 @@ public void reSubscribe() {
         pp.onNext(2);
 
         Subscriber<Integer> subscriber2 = TestHelper.mockSubscriber();
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(subscriber2);
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(subscriber2);
         pp.subscribe(ts2);
 
         // emit
@@ -412,7 +412,7 @@ public void requestValidation() {
 
     @Test
     public void crossCancel() {
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
             @Override
             public void onNext(Integer t) {
@@ -435,7 +435,7 @@ public void onNext(Integer t) {
 
     @Test
     public void crossCancelOnError() {
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
             @Override
             public void onError(Throwable t) {
@@ -458,7 +458,7 @@ public void onError(Throwable t) {
 
     @Test
     public void crossCancelOnComplete() {
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
             @Override
             public void onComplete() {
diff --git a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java
index 8f733ae6ed..4590a6dec9 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java
@@ -162,8 +162,8 @@ public void subscribe(Subscriber<? super Long> subscriber) {
         });
 
         // used to collect results of each thread
-        final List<List<Long>> listOfListsOfValues = Collections.synchronizedList(new ArrayList<List<Long>>());
-        final List<Thread> threads = Collections.synchronizedList(new ArrayList<Thread>());
+        final List<List<Long>> listOfListsOfValues = Collections.synchronizedList(new ArrayList<>());
+        final List<Thread> threads = Collections.synchronizedList(new ArrayList<>());
 
         for (int i = 1; i <= 200; i++) {
             final int count = i;
@@ -196,7 +196,7 @@ public void run() {
         }
 
         // assert all threads got the same results
-        List<Long> sums = new ArrayList<Long>();
+        List<Long> sums = new ArrayList<>();
         for (List<Long> values : listOfListsOfValues) {
             long v = 0;
             for (long l : values) {
@@ -229,7 +229,7 @@ public void run() {
     public void subscribeCompletionRaceCondition() {
         for (int i = 0; i < 50; i++) {
             final ReplayProcessor<String> processor = ReplayProcessor.createUnbounded();
-            final AtomicReference<String> value1 = new AtomicReference<String>();
+            final AtomicReference<String> value1 = new AtomicReference<>();
 
             processor.subscribe(new Consumer<String>() {
 
@@ -292,7 +292,7 @@ public void run() {
     public void raceForTerminalState() {
         final List<Integer> expected = Arrays.asList(1);
         for (int i = 0; i < 100000; i++) {
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
             Flowable.just(1).subscribeOn(Schedulers.computation()).cache().subscribe(ts);
             ts.awaitDone(5, TimeUnit.SECONDS);
             ts.assertValueSequence(expected);
@@ -303,7 +303,7 @@ public void raceForTerminalState() {
     private static class SubjectObserverThread extends Thread {
 
         private final ReplayProcessor<String> processor;
-        private final AtomicReference<String> value = new AtomicReference<String>();
+        private final AtomicReference<String> value = new AtomicReference<>();
 
         SubjectObserverThread(ReplayProcessor<String> processor) {
             this.processor = processor;
@@ -350,7 +350,7 @@ public void run() {
                     }
                 });
 
-                final AtomicReference<Object> o = new AtomicReference<Object>();
+                final AtomicReference<Object> o = new AtomicReference<>();
 
                 rs
 //                .doOnSubscribe(v -> System.out.println("!! " + j))
diff --git a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java
index f9754a49ee..3cacc0d67a 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java
@@ -162,8 +162,8 @@ public void subscribe(Subscriber<? super Long> subscriber) {
         });
 
         // used to collect results of each thread
-        final List<List<Long>> listOfListsOfValues = Collections.synchronizedList(new ArrayList<List<Long>>());
-        final List<Thread> threads = Collections.synchronizedList(new ArrayList<Thread>());
+        final List<List<Long>> listOfListsOfValues = Collections.synchronizedList(new ArrayList<>());
+        final List<Thread> threads = Collections.synchronizedList(new ArrayList<>());
 
         for (int i = 1; i <= 200; i++) {
             final int count = i;
@@ -196,7 +196,7 @@ public void run() {
         }
 
         // assert all threads got the same results
-        List<Long> sums = new ArrayList<Long>();
+        List<Long> sums = new ArrayList<>();
         for (List<Long> values : listOfListsOfValues) {
             long v = 0;
             for (long l : values) {
@@ -229,7 +229,7 @@ public void run() {
     public void subscribeCompletionRaceCondition() {
         for (int i = 0; i < 50; i++) {
             final ReplayProcessor<String> processor = ReplayProcessor.create();
-            final AtomicReference<String> value1 = new AtomicReference<String>();
+            final AtomicReference<String> value1 = new AtomicReference<>();
 
             processor.subscribe(new Consumer<String>() {
 
@@ -292,7 +292,7 @@ public void run() {
     public void raceForTerminalState() {
         final List<Integer> expected = Arrays.asList(1);
         for (int i = 0; i < 100000; i++) {
-            TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
             Flowable.just(1).subscribeOn(Schedulers.computation()).cache().subscribe(ts);
             ts.awaitDone(5, TimeUnit.SECONDS);
             ts.assertValueSequence(expected);
@@ -303,7 +303,7 @@ public void raceForTerminalState() {
     static class SubjectObserverThread extends Thread {
 
         private final ReplayProcessor<String> processor;
-        private final AtomicReference<String> value = new AtomicReference<String>();
+        private final AtomicReference<String> value = new AtomicReference<>();
 
         SubjectObserverThread(ReplayProcessor<String> processor) {
             this.processor = processor;
@@ -347,7 +347,7 @@ public void run() {
                     }
                 });
 
-                final AtomicReference<Object> o = new AtomicReference<Object>();
+                final AtomicReference<Object> o = new AtomicReference<>();
 
                 rs.subscribeOn(s).observeOn(Schedulers.io())
                 .subscribe(new DefaultSubscriber<Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
index 80fe3af7b7..bb4b97e68b 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
@@ -76,7 +76,7 @@ public void completedStopsEmittingData() {
         Subscriber<Object> observerB = TestHelper.mockSubscriber();
         Subscriber<Object> observerC = TestHelper.mockSubscriber();
         Subscriber<Object> observerD = TestHelper.mockSubscriber();
-        TestSubscriber<Object> ts = new TestSubscriber<Object>(observerA);
+        TestSubscriber<Object> ts = new TestSubscriber<>(observerA);
 
         channel.subscribe(ts);
         channel.subscribe(observerB);
@@ -227,7 +227,7 @@ public void unsubscribeFirstSubscriber() {
         ReplayProcessor<String> processor = ReplayProcessor.create();
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
-        TestSubscriber<String> ts = new TestSubscriber<String>(subscriber);
+        TestSubscriber<String> ts = new TestSubscriber<>(subscriber);
         processor.subscribe(ts);
 
         processor.onNext("one");
@@ -258,7 +258,7 @@ private void assertObservedUntilTwo(Subscriber<String> subscriber) {
     @Test
     public void newSubscriberDoesntBlockExisting() throws InterruptedException {
 
-        final AtomicReference<String> lastValueForSubscriber1 = new AtomicReference<String>();
+        final AtomicReference<String> lastValueForSubscriber1 = new AtomicReference<>();
         Subscriber<String> subscriber1 = new DefaultSubscriber<String>() {
 
             @Override
@@ -279,7 +279,7 @@ public void onNext(String v) {
 
         };
 
-        final AtomicReference<String> lastValueForSubscriber2 = new AtomicReference<String>();
+        final AtomicReference<String> lastValueForSubscriber2 = new AtomicReference<>();
         final CountDownLatch oneReceived = new CountDownLatch(1);
         final CountDownLatch makeSlow = new CountDownLatch(1);
         final CountDownLatch completed = new CountDownLatch(1);
@@ -806,7 +806,7 @@ public void backpressureHonored() {
         rs.onNext(3);
         rs.onComplete();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         rs.subscribe(ts);
 
@@ -834,7 +834,7 @@ public void backpressureHonoredSizeBound() {
         rs.onNext(3);
         rs.onComplete();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         rs.subscribe(ts);
 
@@ -862,7 +862,7 @@ public void backpressureHonoredTimeBound() {
         rs.onNext(3);
         rs.onComplete();
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
 
         rs.subscribe(ts);
 
@@ -1026,7 +1026,7 @@ public void capacityHint() {
     @Test
     public void subscribeCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            final TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             final ReplayProcessor<Integer> rp = ReplayProcessor.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
index 0582689830..fc50ade3ef 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
@@ -31,8 +31,8 @@ public class SerializedProcessorTest extends RxJavaTest {
 
     @Test
     public void basic() {
-        SerializedProcessor<String> processor = new SerializedProcessor<String>(PublishProcessor.<String> create());
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        SerializedProcessor<String> processor = new SerializedProcessor<>(PublishProcessor.<String>create());
+        TestSubscriber<String> ts = new TestSubscriber<>();
         processor.subscribe(ts);
         processor.onNext("hello");
         processor.onComplete();
@@ -416,7 +416,7 @@ public void normal() {
 
     @Test
     public void onNextOnNextRace() {
-        Set<Integer> expectedSet = new HashSet<Integer>(Arrays.asList(1, 2));
+        Set<Integer> expectedSet = new HashSet<>(Arrays.asList(1, 2));
 
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final FlowableProcessor<Integer> s = PublishProcessor.<Integer>create().toSerialized();
@@ -445,7 +445,7 @@ public void run() {
             .assertValueCount(2)
             ;
 
-            Set<Integer> actualSet = new HashSet<Integer>(ts.values());
+            Set<Integer> actualSet = new HashSet<>(ts.values());
             assertEquals("" + actualSet, expectedSet, actualSet);
         }
     }
diff --git a/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
index a552783994..53b7062028 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
@@ -268,7 +268,7 @@ public void onErrorStatePeeking() {
     public void rejectSyncFusion() {
         UnicastProcessor<Object> p = UnicastProcessor.create();
 
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>().setInitialFusionMode(QueueFuseable.SYNC);
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>().setInitialFusionMode(QueueFuseable.SYNC);
 
         p.subscribe(ts);
 
@@ -302,7 +302,7 @@ public void fusedDrainCancel() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final UnicastProcessor<Object> p = UnicastProcessor.create();
 
-            final TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>().setInitialFusionMode(QueueFuseable.ANY);
+            final TestSubscriberEx<Object> ts = new TestSubscriberEx<>().setInitialFusionMode(QueueFuseable.ANY);
 
             p.subscribe(ts);
 
@@ -329,8 +329,8 @@ public void subscribeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final UnicastProcessor<Integer> us = UnicastProcessor.create();
 
-            final TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
-            final TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>();
+            final TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
+            final TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>();
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
index 4163c71ec6..34d8ac1b39 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
@@ -395,7 +395,7 @@ public void run() {
             }
         });
 
-        ConcurrentObserverValidator<String> observer = new ConcurrentObserverValidator<String>();
+        ConcurrentObserverValidator<String> observer = new ConcurrentObserverValidator<>();
         // this should call onNext concurrently
         f.subscribe(observer);
 
@@ -414,7 +414,7 @@ public final void observeOn() throws InterruptedException {
 
         Flowable<String> f = Flowable.fromArray("one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten");
 
-        ConcurrentObserverValidator<String> observer = new ConcurrentObserverValidator<String>();
+        ConcurrentObserverValidator<String> observer = new ConcurrentObserverValidator<>();
 
         f.observeOn(scheduler).subscribe(observer);
 
@@ -449,7 +449,7 @@ public void subscribe(Subscriber<? super String> subscriber) {
                     }
                 });
 
-        ConcurrentObserverValidator<String> observer = new ConcurrentObserverValidator<String>();
+        ConcurrentObserverValidator<String> observer = new ConcurrentObserverValidator<>();
 
         f.subscribe(observer);
 
@@ -471,7 +471,7 @@ public void subscribe(Subscriber<? super String> subscriber) {
     private static class ConcurrentObserverValidator<T> extends DefaultSubscriber<T> {
 
         final AtomicInteger concurrentCounter = new AtomicInteger();
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
         final CountDownLatch completed = new CountDownLatch(1);
 
         @Override
@@ -685,7 +685,7 @@ public void schedulePeriodicallyDirectDecoratesRunnable() throws InterruptedExce
             return;
         }
 
-        final AtomicReference<Disposable> disposable = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> disposable = new AtomicReference<>();
 
         try {
             assertRunnableDecorated(new Runnable() {
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
index a963f24665..0e6248cc89 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
@@ -39,7 +39,7 @@ public void threadSafetyWhenSchedulerIsHoppingBetweenThreads() {
 
         final int NUM = 1000000;
         final CountDownLatch latch = new CountDownLatch(1);
-        final HashMap<String, Integer> map = new HashMap<String, Integer>();
+        final HashMap<String, Integer> map = new HashMap<>();
 
         final Scheduler.Worker inner = Schedulers.computation().createWorker();
 
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerFairTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerFairTest.java
index 97fd1d3269..128a3bd5b5 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerFairTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerFairTest.java
@@ -72,7 +72,7 @@ public void cancelledTaskRetention() throws InterruptedException {
 
     /** A simple executor which queues tasks and executes them one-by-one if executeOne() is called. */
     static final class TestExecutor implements Executor {
-        final ConcurrentLinkedQueue<Runnable> queue = new ConcurrentLinkedQueue<Runnable>();
+        final ConcurrentLinkedQueue<Runnable> queue = new ConcurrentLinkedQueue<>();
         @Override
         public void execute(Runnable command) {
             queue.offer(command);
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
index ecf50c3e99..e9c953b049 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
@@ -69,7 +69,7 @@ public void cancelledTaskRetention() throws InterruptedException {
 
     /** A simple executor which queues tasks and executes them one-by-one if executeOne() is called. */
     static final class TestExecutor implements Executor {
-        final ConcurrentLinkedQueue<Runnable> queue = new ConcurrentLinkedQueue<Runnable>();
+        final ConcurrentLinkedQueue<Runnable> queue = new ConcurrentLinkedQueue<>();
         @Override
         public void execute(Runnable command) {
             queue.offer(command);
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
index b24fa65f90..b2e90cdb00 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
@@ -155,7 +155,7 @@ public void cancelledTaskRetention() throws InterruptedException {
 
     /** A simple executor which queues tasks and executes them one-by-one if executeOne() is called. */
     static final class TestExecutor implements Executor {
-        final ConcurrentLinkedQueue<Runnable> queue = new ConcurrentLinkedQueue<Runnable>();
+        final ConcurrentLinkedQueue<Runnable> queue = new ConcurrentLinkedQueue<>();
         @Override
         public void execute(Runnable command) {
             queue.offer(command);
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java
index 6a8eb53344..c378448220 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java
@@ -32,7 +32,7 @@ public void shutdown() throws InterruptedException {
         System.out.println("testShutdown >> Giving time threads to spin-up");
         Thread.sleep(500);
 
-        Set<Thread> rxThreads = new HashSet<Thread>();
+        Set<Thread> rxThreads = new HashSet<>();
         for (Thread t : Thread.getAllStackTraces().keySet()) {
             if (t.getName().startsWith("Rx")) {
                 rxThreads.add(t);
@@ -108,7 +108,7 @@ public void startIdempotence() throws InterruptedException {
         System.out.println("testStartIdempotence >> giving some time");
         Thread.sleep(500);
 
-        Set<Thread> rxThreadsBefore = new HashSet<Thread>();
+        Set<Thread> rxThreadsBefore = new HashSet<>();
         for (Thread t : Thread.getAllStackTraces().keySet()) {
             if (t.getName().startsWith("Rx")) {
                 rxThreadsBefore.add(t);
@@ -120,7 +120,7 @@ public void startIdempotence() throws InterruptedException {
         System.out.println("testStartIdempotence >> giving some time again");
         Thread.sleep(500);
 
-        Set<Thread> rxThreadsAfter = new HashSet<Thread>();
+        Set<Thread> rxThreadsAfter = new HashSet<>();
         for (Thread t : Thread.getAllStackTraces().keySet()) {
             if (t.getName().startsWith("Rx")) {
                 rxThreadsAfter.add(t);
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
index 33c41e1189..05dda6a058 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
@@ -33,7 +33,7 @@ static void handledErrorIsNotDeliveredToThreadHandler(Scheduler scheduler) throw
         Thread.UncaughtExceptionHandler originalHandler = Thread.getDefaultUncaughtExceptionHandler();
         try {
             CapturingUncaughtExceptionHandler handler = new CapturingUncaughtExceptionHandler();
-            CapturingObserver<Object> observer = new CapturingObserver<Object>();
+            CapturingObserver<Object> observer = new CapturingObserver<>();
             Thread.setDefaultUncaughtExceptionHandler(handler);
             IllegalStateException error = new IllegalStateException("Should be delivered to handler");
             Flowable.error(error)
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java
index 688e5fc429..87ad3698ad 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java
@@ -76,7 +76,7 @@ public void currentTimeDriftBackwards() throws Exception {
         Scheduler.Worker w = s.createWorker();
 
         try {
-            final List<Long> times = new ArrayList<Long>();
+            final List<Long> times = new ArrayList<>();
 
             Disposable d = w.schedulePeriodically(new Runnable() {
                 @Override
@@ -118,7 +118,7 @@ public void currentTimeDriftForwards() throws Exception {
         Scheduler.Worker w = s.createWorker();
 
         try {
-            final List<Long> times = new ArrayList<Long>();
+            final List<Long> times = new ArrayList<>();
 
             Disposable d = w.schedulePeriodically(new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
index 0fb0ce9767..d7a5eb752e 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
@@ -25,7 +25,7 @@ public class TimedTest extends RxJavaTest {
 
     @Test
     public void properties() {
-        Timed<Integer> timed = new Timed<Integer>(1, 5, TimeUnit.SECONDS);
+        Timed<Integer> timed = new Timed<>(1, 5, TimeUnit.SECONDS);
 
         assertEquals(1, timed.value().intValue());
         assertEquals(5, timed.time());
@@ -35,22 +35,22 @@ public void properties() {
 
     @Test
     public void hashCodeOf() {
-        Timed<Integer> t1 = new Timed<Integer>(1, 5, TimeUnit.SECONDS);
+        Timed<Integer> t1 = new Timed<>(1, 5, TimeUnit.SECONDS);
 
         assertEquals(TimeUnit.SECONDS.hashCode() + 31 * (5 + 31 * 1), t1.hashCode());
 
-        Timed<Integer> t2 = new Timed<Integer>(null, 5, TimeUnit.SECONDS);
+        Timed<Integer> t2 = new Timed<>(null, 5, TimeUnit.SECONDS);
 
         assertEquals(TimeUnit.SECONDS.hashCode() + 31 * (5 + 31 * 0), t2.hashCode());
     }
 
     @Test
     public void equalsWith() {
-        Timed<Integer> t1 = new Timed<Integer>(1, 5, TimeUnit.SECONDS);
-        Timed<Integer> t2 = new Timed<Integer>(1, 5, TimeUnit.SECONDS);
-        Timed<Integer> t3 = new Timed<Integer>(2, 5, TimeUnit.SECONDS);
-        Timed<Integer> t4 = new Timed<Integer>(1, 4, TimeUnit.SECONDS);
-        Timed<Integer> t5 = new Timed<Integer>(1, 5, TimeUnit.MINUTES);
+        Timed<Integer> t1 = new Timed<>(1, 5, TimeUnit.SECONDS);
+        Timed<Integer> t2 = new Timed<>(1, 5, TimeUnit.SECONDS);
+        Timed<Integer> t3 = new Timed<>(2, 5, TimeUnit.SECONDS);
+        Timed<Integer> t4 = new Timed<>(1, 4, TimeUnit.SECONDS);
+        Timed<Integer> t5 = new Timed<>(1, 5, TimeUnit.MINUTES);
 
         assertEquals(t1, t1);
         assertEquals(t1, t2);
@@ -83,13 +83,13 @@ public void equalsWith() {
 
     @Test
     public void toStringOf() {
-        Timed<Integer> t1 = new Timed<Integer>(1, 5, TimeUnit.SECONDS);
+        Timed<Integer> t1 = new Timed<>(1, 5, TimeUnit.SECONDS);
 
         assertEquals("Timed[time=5, unit=SECONDS, value=1]", t1.toString());
     }
 
     @Test(expected = NullPointerException.class)
     public void timeUnitNullFail() throws Exception {
-        new Timed<Integer>(1, 5, null);
+        new Timed<>(1, 5, null);
     }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java
index bfd7240db7..b409aa143a 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java
@@ -63,7 +63,7 @@ public void accept(String t) {
 
     @Test
     public void nestedTrampolineWithUnsubscribe() {
-        final ArrayList<String> workDone = new ArrayList<String>();
+        final ArrayList<String> workDone = new ArrayList<>();
         final CompositeDisposable workers = new CompositeDisposable();
         Worker worker = Schedulers.trampoline().createWorker();
         try {
@@ -107,7 +107,7 @@ public void run() {
     public void trampolineWorkerHandlesConcurrentScheduling() {
         final Worker trampolineWorker = Schedulers.trampoline().createWorker();
         final Subscriber<Object> subscriber = TestHelper.mockSubscriber();
-        final TestSubscriber<Disposable> ts = new TestSubscriber<Disposable>(subscriber);
+        final TestSubscriber<Disposable> ts = new TestSubscriber<>(subscriber);
 
         // Spam the trampoline with actions.
         Flowable.range(0, 50)
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java
index 16221a253f..1851c15e1f 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java
@@ -89,7 +89,7 @@ public void crossCancel() {
         PublishSubject<Integer> ps = PublishSubject.create();
         Single<Integer> cache = ps.single(-99).cache();
 
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
             @Override
@@ -114,7 +114,7 @@ public void crossCancelOnError() {
         PublishSubject<Integer> ps = PublishSubject.create();
         Single<Integer> cache = ps.single(-99).cache();
 
-        final TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
+        final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
 
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
index 8210632567..7da2cdf95f 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
@@ -177,7 +177,7 @@ public void fromFutureNull() {
 
     @Test(expected = NullPointerException.class)
     public void fromFutureReturnsNull() {
-        FutureTask<Object> f = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+        FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         f.run();
         Single.fromFuture(f).blockingGet();
     }
@@ -189,7 +189,7 @@ public void fromFutureTimedFutureNull() {
 
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedUnitNull() {
-        Single.fromFuture(new FutureTask<Object>(new Callable<Object>() {
+        Single.fromFuture(new FutureTask<>(new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 return null;
@@ -199,7 +199,7 @@ public Object call() throws Exception {
 
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedSchedulerNull() {
-        Single.fromFuture(new FutureTask<Object>(new Callable<Object>() {
+        Single.fromFuture(new FutureTask<>(new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 return null;
@@ -209,14 +209,14 @@ public Object call() throws Exception {
 
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedReturnsNull() {
-        FutureTask<Object> f = new FutureTask<Object>(Functions.EMPTY_RUNNABLE, null);
+        FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
         f.run();
         Single.fromFuture(f, 1, TimeUnit.SECONDS).blockingGet();
     }
 
     @Test(expected = NullPointerException.class)
     public void fromFutureSchedulerNull() {
-        Single.fromFuture(new FutureTask<Object>(new Callable<Object>() {
+        Single.fromFuture(new FutureTask<>(new Callable<Object>() {
             @Override
             public Object call() throws Exception {
                 return null;
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
index 81b5038719..92974c0ef2 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
@@ -35,14 +35,14 @@ public class SingleTest extends RxJavaTest {
 
     @Test
     public void helloWorld() {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Single.just("Hello World!").toFlowable().subscribe(ts);
         ts.assertValueSequence(Arrays.asList("Hello World!"));
     }
 
     @Test
     public void helloWorld2() {
-        final AtomicReference<String> v = new AtomicReference<String>();
+        final AtomicReference<String> v = new AtomicReference<>();
         Single.just("Hello World!").subscribe(new SingleObserver<String>() {
 
             @Override
@@ -66,7 +66,7 @@ public void onError(Throwable error) {
 
     @Test
     public void map() {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Single.just("A")
                 .map(new Function<String, String>() {
                     @Override
@@ -80,7 +80,7 @@ public String apply(String s) {
 
     @Test
     public void zip() {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Single<String> a = Single.just("A");
         Single<String> b = Single.just("B");
 
@@ -96,7 +96,7 @@ public String apply(String a1, String b1) {
 
     @Test
     public void zipWith() {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
 
         Single.just("A").zipWith(Single.just("B"), new BiFunction<String, String, String>() {
             @Override
@@ -110,7 +110,7 @@ public String apply(String a1, String b1) {
 
     @Test
     public void merge() {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Single<String> a = Single.just("A");
         Single<String> b = Single.just("B");
 
@@ -120,7 +120,7 @@ public void merge() {
 
     @Test
     public void mergeWith() {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
 
         Single.just("A").mergeWith(Single.just("B")).subscribe(ts);
         ts.assertValueSequence(Arrays.asList("A", "B"));
@@ -128,7 +128,7 @@ public void mergeWith() {
 
     @Test
     public void createSuccess() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Single.unsafeCreate(new SingleSource<Object>() {
             @Override
@@ -143,7 +143,7 @@ public void subscribe(SingleObserver<? super Object> observer) {
 
     @Test
     public void createError() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
         Single.unsafeCreate(new SingleSource<Object>() {
             @Override
             public void subscribe(SingleObserver<? super Object> observer) {
@@ -158,7 +158,7 @@ public void subscribe(SingleObserver<? super Object> observer) {
 
     @Test
     public void async() {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Single.just("Hello")
                 .subscribeOn(Schedulers.io())
                 .map(new Function<String, String>() {
@@ -183,7 +183,7 @@ public String apply(String v) {
 
     @Test
     public void flatMap() throws InterruptedException {
-        TestSubscriberEx<String> ts = new TestSubscriberEx<String>();
+        TestSubscriberEx<String> ts = new TestSubscriberEx<>();
         Single.just("Hello").flatMap(new Function<String, Single<String>>() {
             @Override
             public Single<String> apply(String s) {
@@ -200,7 +200,7 @@ public Single<String> apply(String s) {
 
     @Test
     public void timeout() {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Single<String> s1 = Single.<String>unsafeCreate(new SingleSource<String>() {
             @Override
             public void subscribe(SingleObserver<? super String> observer) {
@@ -222,7 +222,7 @@ public void subscribe(SingleObserver<? super String> observer) {
 
     @Test
     public void timeoutWithFallback() {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         Single<String> s1 = Single.<String>unsafeCreate(new SingleSource<String>() {
             @Override
             public void subscribe(SingleObserver<? super String> observer) {
@@ -245,7 +245,7 @@ public void subscribe(SingleObserver<? super String> observer) {
 
     @Test
     public void unsubscribe() throws InterruptedException {
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         final AtomicBoolean unsubscribed = new AtomicBoolean();
         final AtomicBoolean interrupted = new AtomicBoolean();
         final CountDownLatch latch = new CountDownLatch(2);
@@ -436,7 +436,7 @@ public void subscribe(SingleObserver<? super String> t) {
             }
         });
 
-        TestSubscriber<String> ts = new TestSubscriber<String>(0L);
+        TestSubscriber<String> ts = new TestSubscriber<>(0L);
 
         s.toFlowable().subscribe(ts);
 
@@ -450,7 +450,7 @@ public void subscribe(SingleObserver<? super String> t) {
     @Test
     public void toObservable() {
         Flowable<String> a = Single.just("a").toFlowable();
-        TestSubscriber<String> ts = new TestSubscriber<String>();
+        TestSubscriber<String> ts = new TestSubscriber<>();
         a.subscribe(ts);
         ts.assertValue("a");
         ts.assertNoErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
index e6f8245d22..395300e292 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
@@ -136,7 +136,7 @@ public void unsubscribeBeforeCompleted() {
         AsyncSubject<String> subject = AsyncSubject.create();
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         subject.subscribe(to);
 
         subject.onNext("one");
@@ -185,7 +185,7 @@ public void subscribeCompletionRaceCondition() {
          */
         for (int i = 0; i < 50; i++) {
             final AsyncSubject<String> subject = AsyncSubject.create();
-            final AtomicReference<String> value1 = new AtomicReference<String>();
+            final AtomicReference<String> value1 = new AtomicReference<>();
 
             subject.subscribe(new Consumer<String>() {
 
@@ -243,7 +243,7 @@ public void run() {
     private static class SubjectSubscriberThread extends Thread {
 
         private final AsyncSubject<String> subject;
-        private final AtomicReference<String> value = new AtomicReference<String>();
+        private final AtomicReference<String> value = new AtomicReference<>();
 
         SubjectSubscriberThread(AsyncSubject<String> subject) {
             this.subject = subject;
@@ -327,7 +327,7 @@ public void currentStateMethodsError() {
 
     @Test
     public void fusionLive() {
-        AsyncSubject<Integer> ap = new AsyncSubject<Integer>();
+        AsyncSubject<Integer> ap = new AsyncSubject<>();
 
         TestObserverEx<Integer> to = ap.to(TestHelper.<Integer>testConsumer(false, QueueFuseable.ANY));
 
@@ -347,7 +347,7 @@ public void fusionLive() {
 
     @Test
     public void fusionOfflie() {
-        AsyncSubject<Integer> ap = new AsyncSubject<Integer>();
+        AsyncSubject<Integer> ap = new AsyncSubject<>();
         ap.onNext(1);
         ap.onComplete();
 
@@ -455,7 +455,7 @@ public void run() {
     public void onNextCrossCancel() {
         AsyncSubject<Object> p = AsyncSubject.create();
 
-        final TestObserver<Object> to2 = new TestObserver<Object>();
+        final TestObserver<Object> to2 = new TestObserver<>();
         TestObserver<Object> to1 = new TestObserver<Object>() {
             @Override
             public void onNext(Object t) {
@@ -478,7 +478,7 @@ public void onNext(Object t) {
     public void onErrorCrossCancel() {
         AsyncSubject<Object> p = AsyncSubject.create();
 
-        final TestObserver<Object> to2 = new TestObserver<Object>();
+        final TestObserver<Object> to2 = new TestObserver<>();
         TestObserver<Object> to1 = new TestObserver<Object>() {
             @Override
             public void onError(Throwable t) {
@@ -500,7 +500,7 @@ public void onError(Throwable t) {
     public void onCompleteCrossCancel() {
         AsyncSubject<Object> p = AsyncSubject.create();
 
-        final TestObserver<Object> to2 = new TestObserver<Object>();
+        final TestObserver<Object> to2 = new TestObserver<>();
         TestObserver<Object> to1 = new TestObserver<Object>() {
             @Override
             public void onComplete() {
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
index 0d14802814..8e472ec4c5 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
@@ -136,7 +136,7 @@ public void completedStopsEmittingData() {
         Observer<Object> observerB = TestHelper.mockObserver();
         Observer<Object> observerC = TestHelper.mockObserver();
 
-        TestObserver<Object> to = new TestObserver<Object>(observerA);
+        TestObserver<Object> to = new TestObserver<>(observerA);
 
         channel.subscribe(to);
         channel.subscribe(observerB);
@@ -389,7 +389,7 @@ public void run() {
                     }
                 });
 
-                final AtomicReference<Object> o = new AtomicReference<Object>();
+                final AtomicReference<Object> o = new AtomicReference<>();
 
                 rs.subscribeOn(s).observeOn(Schedulers.io())
                 .subscribe(new DefaultObserver<Object>() {
@@ -679,7 +679,7 @@ public void completeSubscribeRace() throws Exception {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final BehaviorSubject<Object> p = BehaviorSubject.create();
 
-            final TestObserver<Object> to = new TestObserver<Object>();
+            final TestObserver<Object> to = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -706,7 +706,7 @@ public void errorSubscribeRace() throws Exception {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final BehaviorSubject<Object> p = BehaviorSubject.create();
 
-            final TestObserver<Object> to = new TestObserver<Object>();
+            final TestObserver<Object> to = new TestObserver<>();
 
             final TestException ex = new TestException();
 
@@ -735,9 +735,9 @@ public void behaviorDisposableDisposeState() {
         BehaviorSubject<Integer> bs = BehaviorSubject.create();
         bs.onNext(1);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
-        BehaviorDisposable<Integer> bd = new BehaviorDisposable<Integer>(to, bs);
+        BehaviorDisposable<Integer> bd = new BehaviorDisposable<>(to, bs);
         to.onSubscribe(bd);
 
         assertFalse(bd.isDisposed());
@@ -766,9 +766,9 @@ public void emitFirstDisposeRace() {
             BehaviorSubject<Integer> bs = BehaviorSubject.create();
             bs.onNext(1);
 
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
-            final BehaviorDisposable<Integer> bd = new BehaviorDisposable<Integer>(to, bs);
+            final BehaviorDisposable<Integer> bd = new BehaviorDisposable<>(to, bs);
             to.onSubscribe(bd);
 
             Runnable r1 = new Runnable() {
@@ -795,9 +795,9 @@ public void emitNextDisposeRace() {
             BehaviorSubject<Integer> bs = BehaviorSubject.create();
             bs.onNext(1);
 
-            TestObserver<Integer> to = new TestObserver<Integer>();
+            TestObserver<Integer> to = new TestObserver<>();
 
-            final BehaviorDisposable<Integer> bd = new BehaviorDisposable<Integer>(to, bs);
+            final BehaviorDisposable<Integer> bd = new BehaviorDisposable<>(to, bs);
             to.onSubscribe(bd);
 
             Runnable r1 = new Runnable() {
@@ -822,9 +822,9 @@ public void emittingEmitNext() {
         BehaviorSubject<Integer> bs = BehaviorSubject.create();
         bs.onNext(1);
 
-        TestObserver<Integer> to = new TestObserver<Integer>();
+        TestObserver<Integer> to = new TestObserver<>();
 
-        final BehaviorDisposable<Integer> bd = new BehaviorDisposable<Integer>(to, bs);
+        final BehaviorDisposable<Integer> bd = new BehaviorDisposable<>(to, bs);
         to.onSubscribe(bd);
 
         bd.emitting = true;
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
index 43ebb533d5..7c2c333a2b 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
@@ -68,7 +68,7 @@ public void completedStopsEmittingData() {
         Observer<Object> observerB = TestHelper.mockObserver();
         Observer<Object> observerC = TestHelper.mockObserver();
 
-        TestObserver<Object> to = new TestObserver<Object>(observerA);
+        TestObserver<Object> to = new TestObserver<>(observerA);
 
         channel.subscribe(to);
         channel.subscribe(observerB);
@@ -177,7 +177,7 @@ public void unsubscribeFirstSubscriber() {
         PublishSubject<String> subject = PublishSubject.create();
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         subject.subscribe(to);
 
         subject.onNext("one");
@@ -212,7 +212,7 @@ public void nestedSubscribe() {
         final AtomicInteger countChildren = new AtomicInteger();
         final AtomicInteger countTotal = new AtomicInteger();
 
-        final ArrayList<String> list = new ArrayList<String>();
+        final ArrayList<String> list = new ArrayList<>();
 
         s.flatMap(new Function<Integer, Observable<String>>() {
 
@@ -263,7 +263,7 @@ public void reSubscribe() {
         final PublishSubject<Integer> ps = PublishSubject.create();
 
         Observer<Integer> o1 = TestHelper.mockObserver();
-        TestObserver<Integer> to = new TestObserver<Integer>(o1);
+        TestObserver<Integer> to = new TestObserver<>(o1);
         ps.subscribe(to);
 
         // emit
@@ -281,7 +281,7 @@ public void reSubscribe() {
         ps.onNext(2);
 
         Observer<Integer> o2 = TestHelper.mockObserver();
-        TestObserver<Integer> to2 = new TestObserver<Integer>(o2);
+        TestObserver<Integer> to2 = new TestObserver<>(o2);
         ps.subscribe(to2);
 
         // emit
@@ -392,7 +392,7 @@ public void currentStateMethodsError() {
 
     @Test
     public void crossCancel() {
-        final TestObserver<Integer> to1 = new TestObserver<Integer>();
+        final TestObserver<Integer> to1 = new TestObserver<>();
         TestObserver<Integer> to2 = new TestObserver<Integer>() {
             @Override
             public void onNext(Integer t) {
@@ -415,7 +415,7 @@ public void onNext(Integer t) {
 
     @Test
     public void crossCancelOnError() {
-        final TestObserver<Integer> to1 = new TestObserver<Integer>();
+        final TestObserver<Integer> to1 = new TestObserver<>();
         TestObserver<Integer> to2 = new TestObserver<Integer>() {
             @Override
             public void onError(Throwable t) {
@@ -438,7 +438,7 @@ public void onError(Throwable t) {
 
     @Test
     public void crossCancelOnComplete() {
-        final TestObserver<Integer> to1 = new TestObserver<Integer>();
+        final TestObserver<Integer> to1 = new TestObserver<>();
         TestObserver<Integer> to2 = new TestObserver<Integer>() {
             @Override
             public void onComplete() {
@@ -572,7 +572,7 @@ public void addCompleteRance() throws Exception {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final PublishSubject<Integer> ps = PublishSubject.create();
 
-            final TestObserver<Integer> to = new TestObserver<Integer>();
+            final TestObserver<Integer> to = new TestObserver<>();
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
index c1cef763fe..369fcfc59f 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
@@ -166,8 +166,8 @@ public void subscribe(Observer<? super Long> o) {
         });
 
         // used to collect results of each thread
-        final List<List<Long>> listOfListsOfValues = Collections.synchronizedList(new ArrayList<List<Long>>());
-        final List<Thread> threads = Collections.synchronizedList(new ArrayList<Thread>());
+        final List<List<Long>> listOfListsOfValues = Collections.synchronizedList(new ArrayList<>());
+        final List<Thread> threads = Collections.synchronizedList(new ArrayList<>());
 
         for (int i = 1; i <= 200; i++) {
             final int count = i;
@@ -200,7 +200,7 @@ public void run() {
         }
 
         // assert all threads got the same results
-        List<Long> sums = new ArrayList<Long>();
+        List<Long> sums = new ArrayList<>();
         for (List<Long> values : listOfListsOfValues) {
             long v = 0;
             for (long l : values) {
@@ -233,7 +233,7 @@ public void run() {
     public void subscribeCompletionRaceCondition() {
         for (int i = 0; i < 50; i++) {
             final ReplaySubject<String> subject = ReplaySubject.createUnbounded();
-            final AtomicReference<String> value1 = new AtomicReference<String>();
+            final AtomicReference<String> value1 = new AtomicReference<>();
 
             subject.subscribe(new Consumer<String>() {
 
@@ -296,7 +296,7 @@ public void run() {
     public void raceForTerminalState() {
         final List<Integer> expected = Arrays.asList(1);
         for (int i = 0; i < 100000; i++) {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to = new TestObserverEx<>();
             Observable.just(1).subscribeOn(Schedulers.computation()).cache().subscribe(to);
             to.awaitDone(5, TimeUnit.SECONDS);
             to.assertValueSequence(expected);
@@ -307,7 +307,7 @@ public void raceForTerminalState() {
     static class SubjectObserverThread extends Thread {
 
         private final ReplaySubject<String> subject;
-        private final AtomicReference<String> value = new AtomicReference<String>();
+        private final AtomicReference<String> value = new AtomicReference<>();
 
         SubjectObserverThread(ReplaySubject<String> subject) {
             this.subject = subject;
@@ -354,7 +354,7 @@ public void run() {
                     }
                 });
 
-                final AtomicReference<Object> o = new AtomicReference<Object>();
+                final AtomicReference<Object> o = new AtomicReference<>();
 
                 rs
 //                .doOnSubscribe(v -> System.out.println("!! " + j))
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
index c608875071..767553dc59 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
@@ -166,8 +166,8 @@ public void subscribe(Observer<? super Long> o) {
         });
 
         // used to collect results of each thread
-        final List<List<Long>> listOfListsOfValues = Collections.synchronizedList(new ArrayList<List<Long>>());
-        final List<Thread> threads = Collections.synchronizedList(new ArrayList<Thread>());
+        final List<List<Long>> listOfListsOfValues = Collections.synchronizedList(new ArrayList<>());
+        final List<Thread> threads = Collections.synchronizedList(new ArrayList<>());
 
         for (int i = 1; i <= 200; i++) {
             final int count = i;
@@ -200,7 +200,7 @@ public void run() {
         }
 
         // assert all threads got the same results
-        List<Long> sums = new ArrayList<Long>();
+        List<Long> sums = new ArrayList<>();
         for (List<Long> values : listOfListsOfValues) {
             long v = 0;
             for (long l : values) {
@@ -233,7 +233,7 @@ public void run() {
     public void subscribeCompletionRaceCondition() {
         for (int i = 0; i < 50; i++) {
             final ReplaySubject<String> subject = ReplaySubject.create();
-            final AtomicReference<String> value1 = new AtomicReference<String>();
+            final AtomicReference<String> value1 = new AtomicReference<>();
 
             subject.subscribe(new Consumer<String>() {
 
@@ -296,7 +296,7 @@ public void run() {
     public void raceForTerminalState() {
         final List<Integer> expected = Arrays.asList(1);
         for (int i = 0; i < 100000; i++) {
-            TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+            TestObserverEx<Integer> to = new TestObserverEx<>();
             Observable.just(1).subscribeOn(Schedulers.computation()).cache().subscribe(to);
             to.awaitDone(5, TimeUnit.SECONDS);
             to.assertValueSequence(expected);
@@ -307,7 +307,7 @@ public void raceForTerminalState() {
     static class SubjectObserverThread extends Thread {
 
         private final ReplaySubject<String> subject;
-        private final AtomicReference<String> value = new AtomicReference<String>();
+        private final AtomicReference<String> value = new AtomicReference<>();
 
         SubjectObserverThread(ReplaySubject<String> subject) {
             this.subject = subject;
@@ -351,7 +351,7 @@ public void run() {
                     }
                 });
 
-                final AtomicReference<Object> o = new AtomicReference<Object>();
+                final AtomicReference<Object> o = new AtomicReference<>();
 
                 rs.subscribeOn(s).observeOn(Schedulers.io())
                 .subscribe(new DefaultObserver<Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
index e8d36a8c62..eb06a1a0ea 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
@@ -74,7 +74,7 @@ public void completedStopsEmittingData() {
         Observer<Object> observerB = TestHelper.mockObserver();
         Observer<Object> observerC = TestHelper.mockObserver();
         Observer<Object> observerD = TestHelper.mockObserver();
-        TestObserver<Object> to = new TestObserver<Object>(observerA);
+        TestObserver<Object> to = new TestObserver<>(observerA);
 
         channel.subscribe(to);
         channel.subscribe(observerB);
@@ -225,7 +225,7 @@ public void unsubscribeFirstSubscriber() {
         ReplaySubject<String> subject = ReplaySubject.create();
 
         Observer<String> observer = TestHelper.mockObserver();
-        TestObserver<String> to = new TestObserver<String>(observer);
+        TestObserver<String> to = new TestObserver<>(observer);
         subject.subscribe(to);
 
         subject.onNext("one");
@@ -256,7 +256,7 @@ private void assertObservedUntilTwo(Observer<String> observer) {
     @Test
     public void newSubscriberDoesntBlockExisting() throws InterruptedException {
 
-        final AtomicReference<String> lastValueForSubscriber1 = new AtomicReference<String>();
+        final AtomicReference<String> lastValueForSubscriber1 = new AtomicReference<>();
         Observer<String> observer1 = new DefaultObserver<String>() {
 
             @Override
@@ -277,7 +277,7 @@ public void onNext(String v) {
 
         };
 
-        final AtomicReference<String> lastValueForSubscriber2 = new AtomicReference<String>();
+        final AtomicReference<String> lastValueForSubscriber2 = new AtomicReference<>();
         final CountDownLatch oneReceived = new CountDownLatch(1);
         final CountDownLatch makeSlow = new CountDownLatch(1);
         final CountDownLatch completed = new CountDownLatch(1);
@@ -940,7 +940,7 @@ public void capacityHint() {
     @Test
     public void subscribeCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final TestObserver<Integer> to = new TestObserver<Integer>();
+            final TestObserver<Integer> to = new TestObserver<>();
 
             final ReplaySubject<Integer> rp = ReplaySubject.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
index 2d9999380b..bf74ac5998 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
@@ -32,8 +32,8 @@ public class SerializedSubjectTest extends RxJavaTest {
 
     @Test
     public void basic() {
-        SerializedSubject<String> subject = new SerializedSubject<String>(PublishSubject.<String> create());
-        TestObserver<String> to = new TestObserver<String>();
+        SerializedSubject<String> subject = new SerializedSubject<>(PublishSubject.<String>create());
+        TestObserver<String> to = new TestObserver<>();
         subject.subscribe(to);
         subject.onNext("hello");
         subject.onComplete();
@@ -417,7 +417,7 @@ public void normal() {
 
     @Test
     public void onNextOnNextRace() {
-        Set<Integer> expectedSet = new HashSet<Integer>(Arrays.asList(1, 2));
+        Set<Integer> expectedSet = new HashSet<>(Arrays.asList(1, 2));
 
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final Subject<Integer> s = PublishSubject.<Integer>create().toSerialized();
@@ -446,7 +446,7 @@ public void run() {
             .assertValueCount(2)
             ;
 
-            Set<Integer> actualSet = new HashSet<Integer>(to.values());
+            Set<Integer> actualSet = new HashSet<>(to.values());
             assertEquals("" + actualSet, expectedSet, actualSet);
         }
     }
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
index a65544532b..9c9301176c 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
@@ -43,7 +43,7 @@ protected Subject<Integer> create() {
     public void fusionLive() {
         UnicastSubject<Integer> ap = UnicastSubject.create();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         ap.subscribe(to);
 
@@ -68,7 +68,7 @@ public void fusionOfflie() {
         ap.onNext(1);
         ap.onComplete();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
         ap.subscribe(to);
 
@@ -124,7 +124,7 @@ public void fusionOfflineFailFast() {
         UnicastSubject<Integer> ap = UnicastSubject.create(false);
         ap.onNext(1);
         ap.onError(new RuntimeException());
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
         ap.subscribe(to);
 
         to
@@ -139,7 +139,7 @@ public void fusionOfflineFailFastMultipleEvents() {
         ap.onNext(2);
         ap.onNext(3);
         ap.onComplete();
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(QueueFuseable.ANY);
+        TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
         ap.subscribe(to);
 
         to
@@ -303,7 +303,7 @@ public void onErrorStatePeeking() {
     public void rejectSyncFusion() {
         UnicastSubject<Object> p = UnicastSubject.create();
 
-        TestObserverEx<Object> to = new TestObserverEx<Object>(QueueFuseable.SYNC);
+        TestObserverEx<Object> to = new TestObserverEx<>(QueueFuseable.SYNC);
 
         p.subscribe(to);
 
@@ -337,7 +337,7 @@ public void fusedDrainCancel() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final UnicastSubject<Object> p = UnicastSubject.create();
 
-            final TestObserverEx<Object> to = new TestObserverEx<Object>(QueueFuseable.ANY);
+            final TestObserverEx<Object> to = new TestObserverEx<>(QueueFuseable.ANY);
 
             p.subscribe(to);
 
@@ -363,9 +363,11 @@ public void run() {
     public void dispose() {
         final int[] calls = { 0 };
 
-        UnicastSubject<Integer> us = new UnicastSubject<Integer>(128, new Runnable() {
+        UnicastSubject<Integer> us = new UnicastSubject<>(128, new Runnable() {
             @Override
-            public void run() { calls[0]++; }
+            public void run() {
+                calls[0]++;
+            }
         });
 
         TestHelper.checkDisposed(us);
@@ -393,8 +395,8 @@ public void subscribeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final UnicastSubject<Integer> us = UnicastSubject.create();
 
-            final TestObserverEx<Integer> to1 = new TestObserverEx<Integer>();
-            final TestObserverEx<Integer> to2 = new TestObserverEx<Integer>();
+            final TestObserverEx<Integer> to1 = new TestObserverEx<>();
+            final TestObserverEx<Integer> to2 = new TestObserverEx<>();
 
             Runnable r1 = new Runnable() {
                 @Override
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java
index ead17680fc..562759247c 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java
@@ -25,7 +25,7 @@ public class DefaultSubscriberTest extends RxJavaTest {
 
     static final class RequestEarly extends DefaultSubscriber<Integer> {
 
-        final List<Object> events = new ArrayList<Object>();
+        final List<Object> events = new ArrayList<>();
 
         RequestEarly() {
             request(5);
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java
index 5958110afb..b58b231467 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java
@@ -31,9 +31,9 @@ static final class TestDisposableSubscriber<T> extends DisposableSubscriber<T> {
 
         int start;
 
-        final List<T> values = new ArrayList<T>();
+        final List<T> values = new ArrayList<>();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         int completions;
 
@@ -62,7 +62,7 @@ public void onComplete() {
 
     @Test
     public void normal() {
-        TestDisposableSubscriber<Integer> tc = new TestDisposableSubscriber<Integer>();
+        TestDisposableSubscriber<Integer> tc = new TestDisposableSubscriber<>();
 
         assertFalse(tc.isDisposed());
         assertEquals(0, tc.start);
@@ -83,7 +83,7 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestDisposableSubscriber<Integer> tc = new TestDisposableSubscriber<Integer>();
+            TestDisposableSubscriber<Integer> tc = new TestDisposableSubscriber<>();
 
             tc.onSubscribe(new BooleanSubscription());
 
@@ -103,7 +103,7 @@ public void startOnce() {
 
     @Test
     public void dispose() {
-        TestDisposableSubscriber<Integer> tc = new TestDisposableSubscriber<Integer>();
+        TestDisposableSubscriber<Integer> tc = new TestDisposableSubscriber<>();
 
         assertFalse(tc.isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
index 5a444ee9a9..5b135a6ed2 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
@@ -30,9 +30,9 @@
 public class ResourceSubscriberTest extends RxJavaTest {
 
     static class TestResourceSubscriber<T> extends ResourceSubscriber<T> {
-        final List<T> values = new ArrayList<T>();
+        final List<T> values = new ArrayList<>();
 
-        final List<Throwable> errors = new ArrayList<Throwable>();
+        final List<Throwable> errors = new ArrayList<>();
 
         int complete;
 
@@ -71,13 +71,13 @@ void requestMore(long n) {
 
     @Test(expected = NullPointerException.class)
     public void nullResource() {
-        TestResourceSubscriber<Integer> ro = new TestResourceSubscriber<Integer>();
+        TestResourceSubscriber<Integer> ro = new TestResourceSubscriber<>();
         ro.add(null);
     }
 
     @Test
     public void addResources() {
-        TestResourceSubscriber<Integer> ro = new TestResourceSubscriber<Integer>();
+        TestResourceSubscriber<Integer> ro = new TestResourceSubscriber<>();
 
         assertFalse(ro.isDisposed());
 
@@ -102,7 +102,7 @@ public void addResources() {
 
     @Test
     public void onCompleteCleansUp() {
-        TestResourceSubscriber<Integer> ro = new TestResourceSubscriber<Integer>();
+        TestResourceSubscriber<Integer> ro = new TestResourceSubscriber<>();
 
         assertFalse(ro.isDisposed());
 
@@ -121,7 +121,7 @@ public void onCompleteCleansUp() {
 
     @Test
     public void onErrorCleansUp() {
-        TestResourceSubscriber<Integer> ro = new TestResourceSubscriber<Integer>();
+        TestResourceSubscriber<Integer> ro = new TestResourceSubscriber<>();
 
         assertFalse(ro.isDisposed());
 
@@ -140,7 +140,7 @@ public void onErrorCleansUp() {
 
     @Test
     public void normal() {
-        TestResourceSubscriber<Integer> tc = new TestResourceSubscriber<Integer>();
+        TestResourceSubscriber<Integer> tc = new TestResourceSubscriber<>();
 
         assertFalse(tc.isDisposed());
         assertEquals(0, tc.start);
@@ -161,7 +161,7 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestResourceSubscriber<Integer> tc = new TestResourceSubscriber<Integer>();
+            TestResourceSubscriber<Integer> tc = new TestResourceSubscriber<>();
 
             tc.onSubscribe(new BooleanSubscription());
 
@@ -181,7 +181,7 @@ public void startOnce() {
 
     @Test
     public void dispose() {
-        TestResourceSubscriber<Integer> tc = new TestResourceSubscriber<Integer>();
+        TestResourceSubscriber<Integer> tc = new TestResourceSubscriber<>();
         tc.dispose();
 
         BooleanSubscription bs = new BooleanSubscription();
@@ -219,7 +219,7 @@ protected void onStart() {
 
     static final class RequestEarly extends ResourceSubscriber<Integer> {
 
-        final List<Object> events = new ArrayList<Object>();
+        final List<Object> events = new ArrayList<>();
 
         RequestEarly() {
             request(5);
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
index 0dccdc1306..e2bc1b1bbd 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
@@ -41,7 +41,7 @@ public void onNextAfterOnError() {
         Flowable<String> st = Flowable.unsafeCreate(t);
 
         Subscriber<String> w = TestHelper.mockSubscriber();
-        st.subscribe(new SafeSubscriber<String>(new TestSubscriber<String>(w)));
+        st.subscribe(new SafeSubscriber<>(new TestSubscriber<>(w)));
 
         t.sendOnNext("one");
         t.sendOnError(new RuntimeException("bad"));
@@ -62,7 +62,7 @@ public void onCompletedAfterOnError() {
 
         Subscriber<String> w = TestHelper.mockSubscriber();
 
-        st.subscribe(new SafeSubscriber<String>(new TestSubscriber<String>(w)));
+        st.subscribe(new SafeSubscriber<>(new TestSubscriber<>(w)));
 
         t.sendOnNext("one");
         t.sendOnError(new RuntimeException("bad"));
@@ -82,7 +82,7 @@ public void onNextAfterOnCompleted() {
         Flowable<String> st = Flowable.unsafeCreate(t);
 
         Subscriber<String> w = TestHelper.mockSubscriber();
-        st.subscribe(new SafeSubscriber<String>(new TestSubscriber<String>(w)));
+        st.subscribe(new SafeSubscriber<>(new TestSubscriber<>(w)));
 
         t.sendOnNext("one");
         t.sendOnCompleted();
@@ -103,7 +103,7 @@ public void onErrorAfterOnCompleted() {
         Flowable<String> st = Flowable.unsafeCreate(t);
 
         Subscriber<String> w = TestHelper.mockSubscriber();
-        st.subscribe(new SafeSubscriber<String>(new TestSubscriber<String>(w)));
+        st.subscribe(new SafeSubscriber<>(new TestSubscriber<>(w)));
 
         t.sendOnNext("one");
         t.sendOnCompleted();
@@ -159,7 +159,7 @@ public void request(long n) {
 
     @Test
     public void onNextFailure() {
-        AtomicReference<Throwable> onError = new AtomicReference<Throwable>();
+        AtomicReference<Throwable> onError = new AtomicReference<>();
         try {
             OBSERVER_ONNEXT_FAIL(onError).onNext("one");
             fail("expects exception to be thrown");
@@ -172,9 +172,9 @@ public void onNextFailure() {
 
     @Test
     public void onNextFailureSafe() {
-        AtomicReference<Throwable> onError = new AtomicReference<Throwable>();
+        AtomicReference<Throwable> onError = new AtomicReference<>();
         try {
-            SafeSubscriber<String> safeObserver = new SafeSubscriber<String>(OBSERVER_ONNEXT_FAIL(onError));
+            SafeSubscriber<String> safeObserver = new SafeSubscriber<>(OBSERVER_ONNEXT_FAIL(onError));
             safeObserver.onSubscribe(new BooleanSubscription());
             safeObserver.onNext("one");
             assertNotNull(onError.get());
@@ -187,7 +187,7 @@ public void onNextFailureSafe() {
 
     @Test
     public void onCompleteFailure() {
-        AtomicReference<Throwable> onError = new AtomicReference<Throwable>();
+        AtomicReference<Throwable> onError = new AtomicReference<>();
         try {
             OBSERVER_ONCOMPLETED_FAIL(onError).onComplete();
             fail("expects exception to be thrown");
@@ -341,16 +341,16 @@ public void onError(Throwable e) {
             public void onComplete() {
             }
         };
-        SafeSubscriber<Integer> s = new SafeSubscriber<Integer>(actual);
+        SafeSubscriber<Integer> s = new SafeSubscriber<>(actual);
 
         assertSame(actual, s.downstream);
     }
 
     @Test
     public void dispose() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        SafeSubscriber<Integer> so = new SafeSubscriber<Integer>(ts);
+        SafeSubscriber<Integer> so = new SafeSubscriber<>(ts);
 
         BooleanSubscription bs = new BooleanSubscription();
 
@@ -365,9 +365,9 @@ public void dispose() {
 
     @Test
     public void onNextAfterComplete() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        SafeSubscriber<Integer> so = new SafeSubscriber<Integer>(ts);
+        SafeSubscriber<Integer> so = new SafeSubscriber<>(ts);
 
         BooleanSubscription bs = new BooleanSubscription();
 
@@ -386,9 +386,9 @@ public void onNextAfterComplete() {
 
     @Test
     public void onNextNull() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        SafeSubscriber<Integer> so = new SafeSubscriber<Integer>(ts);
+        SafeSubscriber<Integer> so = new SafeSubscriber<>(ts);
 
         BooleanSubscription bs = new BooleanSubscription();
 
@@ -401,9 +401,9 @@ public void onNextNull() {
 
     @Test
     public void onNextWithoutOnSubscribe() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-        SafeSubscriber<Integer> so = new SafeSubscriber<Integer>(ts);
+        SafeSubscriber<Integer> so = new SafeSubscriber<>(ts);
 
         so.onNext(1);
 
@@ -412,9 +412,9 @@ public void onNextWithoutOnSubscribe() {
 
     @Test
     public void onErrorWithoutOnSubscribe() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-        SafeSubscriber<Integer> so = new SafeSubscriber<Integer>(ts);
+        SafeSubscriber<Integer> so = new SafeSubscriber<>(ts);
 
         so.onError(new TestException());
 
@@ -426,9 +426,9 @@ public void onErrorWithoutOnSubscribe() {
 
     @Test
     public void onCompleteWithoutOnSubscribe() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-        SafeSubscriber<Integer> so = new SafeSubscriber<Integer>(ts);
+        SafeSubscriber<Integer> so = new SafeSubscriber<>(ts);
 
         so.onComplete();
 
@@ -437,9 +437,9 @@ public void onCompleteWithoutOnSubscribe() {
 
     @Test
     public void onNextNormal() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        SafeSubscriber<Integer> so = new SafeSubscriber<Integer>(ts);
+        SafeSubscriber<Integer> so = new SafeSubscriber<>(ts);
 
         BooleanSubscription bs = new BooleanSubscription();
 
@@ -520,7 +520,7 @@ public void onComplete() {
         }
 
         public SafeSubscriber<Object> toSafe() {
-            return new SafeSubscriber<Object>(this);
+            return new SafeSubscriber<>(this);
         }
 
         public CrashDummy assertError(Class<? extends Throwable> clazz) {
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
index 09b800d43e..00c7ae2103 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
@@ -42,7 +42,7 @@ public void before() {
     }
 
     private Subscriber<String> serializedSubscriber(Subscriber<String> subscriber) {
-        return new SerializedSubscriber<String>(subscriber);
+        return new SerializedSubscriber<>(subscriber);
     }
 
     @Test
@@ -164,7 +164,7 @@ public void runOutOfOrderConcurrencyTest() {
         try {
             TestConcurrencySubscriber tw = new TestConcurrencySubscriber();
             // we need Synchronized + SafeSubscriber to handle synchronization plus life-cycle
-            Subscriber<String> w = serializedSubscriber(new SafeSubscriber<String>(tw));
+            Subscriber<String> w = serializedSubscriber(new SafeSubscriber<>(tw));
 
             Future<?> f1 = tp.submit(new OnNextThread(w, 12000));
             Future<?> f2 = tp.submit(new OnNextThread(w, 5000));
@@ -220,7 +220,7 @@ public void runConcurrencyTest() {
         try {
             TestConcurrencySubscriber tw = new TestConcurrencySubscriber();
             // we need Synchronized + SafeSubscriber to handle synchronization plus life-cycle
-            Subscriber<String> w = serializedSubscriber(new SafeSubscriber<String>(tw));
+            Subscriber<String> w = serializedSubscriber(new SafeSubscriber<>(tw));
             w.onSubscribe(new BooleanSubscription());
 
             Future<?> f1 = tp.submit(new OnNextThread(w, 12000));
@@ -276,7 +276,7 @@ public void notificationDelay() throws InterruptedException {
                 final CountDownLatch latch = new CountDownLatch(1);
                 final CountDownLatch running = new CountDownLatch(2);
 
-                TestSubscriberEx<String> ts = new TestSubscriberEx<String>(new DefaultSubscriber<String>() {
+                TestSubscriberEx<String> ts = new TestSubscriberEx<>(new DefaultSubscriber<String>() {
 
                     @Override
                     public void onComplete() {
@@ -357,7 +357,7 @@ public void onNext(String t) {
     @Test
     public void threadStarvation() throws InterruptedException {
 
-        TestSubscriber<String> ts = new TestSubscriber<String>(new DefaultSubscriber<String>() {
+        TestSubscriber<String> ts = new TestSubscriber<>(new DefaultSubscriber<String>() {
 
             @Override
             public void onComplete() {
@@ -553,7 +553,7 @@ private static class TestConcurrencySubscriber extends DefaultSubscriber<String>
         /**
          * Used to store the order and number of events received.
          */
-        private final LinkedBlockingQueue<TestConcurrencySubscriberEvent> events = new LinkedBlockingQueue<TestConcurrencySubscriberEvent>();
+        private final LinkedBlockingQueue<TestConcurrencySubscriberEvent> events = new LinkedBlockingQueue<>();
         private final int waitTime;
 
         @SuppressWarnings("unused")
@@ -849,7 +849,7 @@ protected void captureMaxThreads() {
     public void errorReentry() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            final AtomicReference<Subscriber<Integer>> serial = new AtomicReference<Subscriber<Integer>>();
+            final AtomicReference<Subscriber<Integer>> serial = new AtomicReference<>();
 
             TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
                 @Override
@@ -859,7 +859,7 @@ public void onNext(Integer v) {
                     super.onNext(v);
                 }
             };
-            SerializedSubscriber<Integer> sobs = new SerializedSubscriber<Integer>(ts);
+            SerializedSubscriber<Integer> sobs = new SerializedSubscriber<>(ts);
             sobs.onSubscribe(new BooleanSubscription());
             serial.set(sobs);
 
@@ -876,7 +876,7 @@ public void onNext(Integer v) {
 
     @Test
     public void completeReentry() {
-        final AtomicReference<Subscriber<Integer>> serial = new AtomicReference<Subscriber<Integer>>();
+        final AtomicReference<Subscriber<Integer>> serial = new AtomicReference<>();
 
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
             @Override
@@ -886,7 +886,7 @@ public void onNext(Integer v) {
                 super.onNext(v);
             }
         };
-        SerializedSubscriber<Integer> sobs = new SerializedSubscriber<Integer>(ts);
+        SerializedSubscriber<Integer> sobs = new SerializedSubscriber<>(ts);
         sobs.onSubscribe(new BooleanSubscription());
         serial.set(sobs);
 
@@ -899,9 +899,9 @@ public void onNext(Integer v) {
 
     @Test
     public void dispose() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        SerializedSubscriber<Integer> so = new SerializedSubscriber<Integer>(ts);
+        SerializedSubscriber<Integer> so = new SerializedSubscriber<>(ts);
 
         BooleanSubscription bs = new BooleanSubscription();
 
@@ -915,9 +915,9 @@ public void dispose() {
     @Test
     public void onCompleteRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-            final SerializedSubscriber<Integer> so = new SerializedSubscriber<Integer>(ts);
+            final SerializedSubscriber<Integer> so = new SerializedSubscriber<>(ts);
 
             BooleanSubscription bs = new BooleanSubscription();
 
@@ -941,9 +941,9 @@ public void run() {
     @Test
     public void onNextOnCompleteRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-            final SerializedSubscriber<Integer> so = new SerializedSubscriber<Integer>(ts);
+            final SerializedSubscriber<Integer> so = new SerializedSubscriber<>(ts);
 
             BooleanSubscription bs = new BooleanSubscription();
 
@@ -977,9 +977,9 @@ public void run() {
     @Test
     public void onNextOnErrorRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-            final SerializedSubscriber<Integer> so = new SerializedSubscriber<Integer>(ts);
+            final SerializedSubscriber<Integer> so = new SerializedSubscriber<>(ts);
 
             BooleanSubscription bs = new BooleanSubscription();
 
@@ -1015,9 +1015,9 @@ public void run() {
     @Test
     public void onNextOnErrorRaceDelayError() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-            final SerializedSubscriber<Integer> so = new SerializedSubscriber<Integer>(ts, true);
+            final SerializedSubscriber<Integer> so = new SerializedSubscriber<>(ts, true);
 
             BooleanSubscription bs = new BooleanSubscription();
 
@@ -1056,9 +1056,9 @@ public void startOnce() {
         List<Throwable> error = TestHelper.trackPluginErrors();
 
         try {
-            TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-            final SerializedSubscriber<Integer> so = new SerializedSubscriber<Integer>(ts);
+            final SerializedSubscriber<Integer> so = new SerializedSubscriber<>(ts);
 
             so.onSubscribe(new BooleanSubscription());
 
@@ -1079,9 +1079,9 @@ public void onCompleteOnErrorRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             List<Throwable> errors = TestHelper.trackPluginErrors();
             try {
-                TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+                TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-                final SerializedSubscriber<Integer> so = new SerializedSubscriber<Integer>(ts);
+                final SerializedSubscriber<Integer> so = new SerializedSubscriber<>(ts);
 
                 BooleanSubscription bs = new BooleanSubscription();
 
@@ -1124,9 +1124,9 @@ public void run() {
     @Test
     public void nullOnNext() {
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-        final SerializedSubscriber<Integer> so = new SerializedSubscriber<Integer>(ts);
+        final SerializedSubscriber<Integer> so = new SerializedSubscriber<>(ts);
 
         so.onSubscribe(new BooleanSubscription());
 
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
index 33d95bea88..6127d31ff5 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
@@ -44,7 +44,7 @@ public class TestSubscriberTest extends RxJavaTest {
     @Test
     public void assertTestSubscriber() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         oi.subscribe(ts);
 
         ts.assertValues(1, 2);
@@ -56,7 +56,7 @@ public void assertTestSubscriber() {
     @Test
     public void assertNotMatchCount() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         oi.subscribe(ts);
 
         thrown.expect(AssertionError.class);
@@ -72,7 +72,7 @@ public void assertNotMatchCount() {
     @Test
     public void assertNotMatchValue() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         oi.subscribe(ts);
 
         thrown.expect(AssertionError.class);
@@ -88,7 +88,7 @@ public void assertNotMatchValue() {
     @Test
     public void assertTerminalEventNotReceived() {
         PublishProcessor<Integer> p = PublishProcessor.create();
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         p.subscribe(ts);
 
         p.onNext(1);
@@ -109,7 +109,7 @@ public void wrappingMock() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
         Subscriber<Integer> mockSubscriber = TestHelper.mockSubscriber();
 
-        oi.subscribe(new TestSubscriber<Integer>(mockSubscriber));
+        oi.subscribe(new TestSubscriber<>(mockSubscriber));
 
         InOrder inOrder = inOrder(mockSubscriber);
         inOrder.verify(mockSubscriber, times(1)).onNext(1);
@@ -122,7 +122,7 @@ public void wrappingMock() {
     public void wrappingMockWhenUnsubscribeInvolved() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9)).take(2);
         Subscriber<Integer> mockSubscriber = TestHelper.mockSubscriber();
-        oi.subscribe(new TestSubscriber<Integer>(mockSubscriber));
+        oi.subscribe(new TestSubscriber<>(mockSubscriber));
 
         InOrder inOrder = inOrder(mockSubscriber);
         inOrder.verify(mockSubscriber, times(1)).onNext(1);
@@ -134,14 +134,14 @@ public void wrappingMockWhenUnsubscribeInvolved() {
     @Test
     public void assertError() {
         RuntimeException e = new RuntimeException("Oops");
-        TestSubscriber<Object> subscriber = new TestSubscriber<Object>();
+        TestSubscriber<Object> subscriber = new TestSubscriber<>();
         Flowable.error(e).subscribe(subscriber);
         subscriber.assertError(e);
     }
 
     @Test
     public void awaitTerminalEventWithDuration() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         Flowable.just(1).subscribe(ts);
         ts.awaitDone(1, TimeUnit.SECONDS);
         ts.assertComplete();
@@ -150,7 +150,7 @@ public void awaitTerminalEventWithDuration() {
 
     @Test
     public void awaitTerminalEventWithDurationAndUnsubscribeOnTimeout() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         final AtomicBoolean unsub = new AtomicBoolean(false);
         Flowable.just(1)
         //
@@ -169,28 +169,28 @@ public void run() {
 
     @Test(expected = NullPointerException.class)
     public void nullDelegate1() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(null);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(null);
         ts.onComplete();
     }
 
     @Test(expected = NullPointerException.class)
     public void nullDelegate2() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(null);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(null);
         ts.onComplete();
     }
 
     @Test(expected = NullPointerException.class)
     public void nullDelegate3() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(null, 0L);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(null, 0L);
         ts.onComplete();
     }
 
     @Test
     public void delegate1() {
-        TestSubscriber<Integer> ts0 = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts0 = new TestSubscriber<>();
         ts0.onSubscribe(EmptySubscription.INSTANCE);
 
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(ts0);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(ts0);
         ts.onComplete();
 
         ts0.assertComplete();
@@ -199,8 +199,8 @@ public void delegate1() {
 
     @Test
     public void delegate2() {
-        TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(ts1);
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>();
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(ts1);
         ts2.onComplete();
 
         ts1.assertComplete();
@@ -208,21 +208,21 @@ public void delegate2() {
 
     @Test
     public void delegate3() {
-        TestSubscriber<Integer> ts1 = new TestSubscriber<Integer>();
-        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>(ts1, 0L);
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>();
+        TestSubscriber<Integer> ts2 = new TestSubscriber<>(ts1, 0L);
         ts2.onComplete();
         ts1.assertComplete();
     }
 
     @Test
     public void unsubscribed() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         assertFalse(ts.isCancelled());
     }
 
     @Test
     public void noErrors() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onError(new TestException());
         try {
             ts.assertNoErrors();
@@ -235,7 +235,7 @@ public void noErrors() {
 
     @Test
     public void notCompleted() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         try {
             ts.assertComplete();
         } catch (AssertionError ex) {
@@ -247,7 +247,7 @@ public void notCompleted() {
 
     @Test
     public void multipleCompletions() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onComplete();
         ts.onComplete();
         try {
@@ -261,7 +261,7 @@ public void multipleCompletions() {
 
     @Test
     public void completed() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onComplete();
         try {
             ts.assertNotComplete();
@@ -274,7 +274,7 @@ public void completed() {
 
     @Test
     public void multipleCompletions2() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onComplete();
         ts.onComplete();
         try {
@@ -288,7 +288,7 @@ public void multipleCompletions2() {
 
     @Test
     public void multipleErrors() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
         ts.onError(new TestException());
         ts.onError(new TestException());
@@ -312,7 +312,7 @@ public void multipleErrors() {
 
     @Test
     public void multipleErrors2() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
         ts.onError(new TestException());
         ts.onError(new TestException());
@@ -333,7 +333,7 @@ public void multipleErrors2() {
 
     @Test
     public void multipleErrors3() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
         ts.onError(new TestException());
         ts.onError(new TestException());
@@ -354,7 +354,7 @@ public void multipleErrors3() {
 
     @Test
     public void multipleErrors4() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
         ts.onError(new TestException());
         ts.onError(new TestException());
@@ -375,7 +375,7 @@ public void multipleErrors4() {
 
     @Test
     public void differentError() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onError(new TestException());
         try {
             ts.assertError(new TestException());
@@ -388,7 +388,7 @@ public void differentError() {
 
     @Test
     public void differentError2() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onError(new RuntimeException());
         try {
             ts.assertError(new TestException());
@@ -401,7 +401,7 @@ public void differentError2() {
 
     @Test
     public void differentError3() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onError(new RuntimeException());
         try {
             ts.assertError(TestException.class);
@@ -415,7 +415,7 @@ public void differentError3() {
 
     @Test
     public void differentError4() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onError(new RuntimeException());
         try {
             ts.assertError(Functions.<Throwable>alwaysFalse());
@@ -428,7 +428,7 @@ public void differentError4() {
 
     @Test
     public void errorInPredicate() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onError(new RuntimeException());
         try {
             ts.assertError(new Predicate<Throwable>() {
@@ -446,7 +446,7 @@ public boolean test(Throwable throwable) throws Exception {
 
     @Test
     public void noError() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         try {
             ts.assertError(TestException.class);
         } catch (AssertionError ex) {
@@ -458,7 +458,7 @@ public void noError() {
 
     @Test
     public void noError2() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         try {
             ts.assertError(new TestException());
         } catch (AssertionError ex) {
@@ -470,7 +470,7 @@ public void noError2() {
 
     @Test
     public void noError3() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         try {
             ts.assertError(Functions.<Throwable>alwaysTrue());
         } catch (AssertionError ex) {
@@ -482,7 +482,7 @@ public void noError3() {
 
     @Test
     public void interruptTerminalEventAwait() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final Thread t0 = Thread.currentThread();
         Worker w = Schedulers.computation().createWorker();
@@ -508,7 +508,7 @@ public void run() {
 
     @Test
     public void interruptTerminalEventAwaitTimed() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final Thread t0 = Thread.currentThread();
         Worker w = Schedulers.computation().createWorker();
@@ -535,7 +535,7 @@ public void run() {
 
     @Test
     public void interruptTerminalEventAwaitAndUnsubscribe() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         final Thread t0 = Thread.currentThread();
         Worker w = Schedulers.computation().createWorker();
@@ -563,7 +563,7 @@ public void run() {
 
     @Test
     public void noTerminalEventBut1Completed() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         ts.onComplete();
 
@@ -577,7 +577,7 @@ public void noTerminalEventBut1Completed() {
 
     @Test
     public void noTerminalEventBut1Error() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         ts.onError(new TestException());
 
@@ -591,7 +591,7 @@ public void noTerminalEventBut1Error() {
 
     @Test
     public void noTerminalEventBut1Error1Complete() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         ts.onComplete();
         ts.onError(new TestException());
@@ -613,7 +613,7 @@ public void noTerminalEventBut1Error1Complete() {
 
     @Test
     public void noTerminalEventBut2Errors() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
 
         ts.onError(new TestException());
@@ -635,7 +635,7 @@ public void noTerminalEventBut2Errors() {
 
     @Test
     public void noValues() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onNext(1);
 
         try {
@@ -648,7 +648,7 @@ public void noValues() {
 
     @Test
     public void valueCount() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
         ts.onNext(1);
         ts.onNext(2);
 
@@ -668,7 +668,7 @@ public void onComplete() {
                 throw new TestException();
             }
         };
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(ts0);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(ts0);
 
         try {
             ts.onComplete();
@@ -687,7 +687,7 @@ public void onError(Throwable e) {
                 throw new TestException();
             }
         };
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(ts0);
+        TestSubscriber<Integer> ts = new TestSubscriber<>(ts0);
 
         try {
             ts.onError(new RuntimeException());
@@ -1207,7 +1207,7 @@ public void assertValueSequence() {
 
     @Test
     public void assertEmpty() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         try {
             ts.assertEmpty();
@@ -1232,7 +1232,7 @@ public void assertEmpty() {
 
     @Test
     public void awaitDoneTimed() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Thread.currentThread().interrupt();
 
@@ -1245,7 +1245,7 @@ public void awaitDoneTimed() {
 
     @Test
     public void assertErrorMultiple() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         TestException e = new TestException();
         ts.onError(e);
@@ -1267,7 +1267,7 @@ public void assertErrorMultiple() {
 
     @Test
     public void assertComplete() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1294,7 +1294,7 @@ public void assertComplete() {
 
     @Test
     public void completeWithoutOnSubscribe() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         ts.onComplete();
 
@@ -1303,7 +1303,7 @@ public void completeWithoutOnSubscribe() {
 
     @Test
     public void completeDelegateThrows() throws Exception {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(new FlowableSubscriber<Integer>() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>(new FlowableSubscriber<Integer>() {
 
             @Override
             public void onSubscribe(Subscription s) {
@@ -1339,7 +1339,7 @@ public void onComplete() {
 
     @Test
     public void errorDelegateThrows() throws Exception {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>(new FlowableSubscriber<Integer>() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>(new FlowableSubscriber<Integer>() {
 
             @Override
             public void onSubscribe(Subscription s) {
@@ -1375,7 +1375,7 @@ public void onComplete() {
 
     @Test
     public void assertValuePredicateEmpty() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.empty().subscribe(ts);
 
@@ -1390,7 +1390,7 @@ public void assertValuePredicateEmpty() {
 
     @Test
     public void assertValuePredicateMatch() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1).subscribe(ts);
 
@@ -1403,7 +1403,7 @@ public void assertValuePredicateMatch() {
 
     @Test
     public void assertValuePredicateNoMatch() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1).subscribe(ts);
 
@@ -1418,7 +1418,7 @@ public void assertValuePredicateNoMatch() {
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1, 2).subscribe(ts);
 
@@ -1433,7 +1433,7 @@ public void assertValuePredicateMatchButMore() {
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
 
         Flowable.empty().subscribe(ts);
 
@@ -1448,7 +1448,7 @@ public void assertValueAtPredicateEmpty() {
 
     @Test
     public void assertValueAtPredicateMatch() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1, 2).subscribe(ts);
 
@@ -1461,7 +1461,7 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1, 2, 3).subscribe(ts);
 
@@ -1476,7 +1476,7 @@ public void assertValueAtPredicateNoMatch() {
 
     @Test
     public void assertValueAtInvalidIndex() {
-        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
 
         Flowable.just(1, 2).subscribe(ts);
 
@@ -1563,7 +1563,7 @@ public void timeoutIndicated3() throws InterruptedException {
 
     @Test
     public void disposeIndicated() {
-        TestSubscriber<Object> ts = new TestSubscriber<Object>();
+        TestSubscriber<Object> ts = new TestSubscriber<>();
         ts.cancel();
 
         try {
diff --git a/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java
index ee0dd0695a..7b47ac3192 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java
@@ -25,7 +25,7 @@ public class FromFutureTckTest extends BaseTck<Long> {
 
     @Override
     public Publisher<Long> createPublisher(final long elements) {
-        FutureTask<Long> ft = new FutureTask<Long>(new Callable<Long>() {
+        FutureTask<Long> ft = new FutureTask<>(new Callable<Long>() {
             @Override
             public Long call() throws Exception {
                 return 1L;
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java
index a1089b7370..ed6de68012 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java
@@ -32,7 +32,7 @@ public MulticastProcessorTckTest() {
     @Override
     public Processor<Integer, Integer> createIdentityProcessor(int bufferSize) {
         MulticastProcessor<Integer> mp = MulticastProcessor.create();
-        return new RefCountProcessor<Integer>(mp);
+        return new RefCountProcessor<>(mp);
     }
 
     @Override
diff --git a/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java b/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
index 908f3e010c..77bdfef211 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
@@ -45,7 +45,7 @@
     @SuppressWarnings("unchecked")
     RefCountProcessor(FlowableProcessor<T> actual) {
         this.actual = actual;
-        this.upstream = new AtomicReference<Subscription>();
+        this.upstream = new AtomicReference<>();
         this.subscribers = new AtomicReference<RefCountSubscriber<T>[]>(EMPTY);
     }
 
@@ -75,7 +75,7 @@ public void onComplete() {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        RefCountSubscriber<T> rcs = new RefCountSubscriber<T>(s, this);
+        RefCountSubscriber<T> rcs = new RefCountSubscriber<>(s, this);
         if (!add(rcs)) {
             EmptySubscription.error(new IllegalStateException("RefCountProcessor terminated"), s);
             return;
diff --git a/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java
index f97b6ee83a..079c349245 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java
@@ -32,7 +32,7 @@ public UnicastProcessorTckTest() {
     @Override
     public Processor<Integer, Integer> createIdentityProcessor(int bufferSize) {
         UnicastProcessor<Integer> up = UnicastProcessor.create();
-        return new RefCountProcessor<Integer>(up);
+        return new RefCountProcessor<>(up);
     }
 
     @Override
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 886728709d..9bfb21668e 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -152,7 +152,7 @@ public static void checkUtilityClass(Class<?> clazz) {
     }
 
     public static List<Throwable> trackPluginErrors() {
-        final List<Throwable> list = Collections.synchronizedList(new ArrayList<Throwable>());
+        final List<Throwable> list = Collections.synchronizedList(new ArrayList<>());
 
         RxJavaPlugins.setErrorHandler(new Consumer<Throwable>() {
             @Override
@@ -2901,7 +2901,7 @@ public Flowable<T> apply(Flowable<T> upstream) {
 
         @Override
         protected void subscribeActual(Subscriber<? super T> s) {
-            source.subscribe(new StripBoundarySubscriber<T>(s));
+            source.subscribe(new StripBoundarySubscriber<>(s));
         }
 
         static final class StripBoundarySubscriber<T> implements FlowableSubscriber<T>, QueueSubscription<T> {
@@ -3017,7 +3017,7 @@ public Observable<T> apply(Observable<T> upstream) {
 
         @Override
         protected void subscribeActual(Observer<? super T> observer) {
-            source.subscribe(new StripBoundaryObserver<T>(observer));
+            source.subscribe(new StripBoundaryObserver<>(observer));
         }
 
         static final class StripBoundaryObserver<T> implements Observer<T>, QueueDisposable<T> {
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
index 9747d034bb..ff7df2d8b3 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
@@ -36,7 +36,7 @@ public class TestObserverEx<T>
     private final Observer<? super T> downstream;
 
     /** Holds the current subscription if any. */
-    private final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    private final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     private QueueDisposable<T> qd;
 
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
index e374aa67a2..9ee8a1cfc5 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
@@ -45,7 +45,7 @@ public class TestObserverExTest extends RxJavaTest {
     @Test
     public void assertTestObserverEx() {
         Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
-        TestObserverEx<Integer> subscriber = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
         oi.subscribe(subscriber);
 
         subscriber.assertValues(1, 2);
@@ -56,7 +56,7 @@ public void assertTestObserverEx() {
     @Test
     public void assertNotMatchCount() {
         Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
-        TestObserverEx<Integer> subscriber = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
         oi.subscribe(subscriber);
 
         thrown.expect(AssertionError.class);
@@ -71,7 +71,7 @@ public void assertNotMatchCount() {
     @Test
     public void assertNotMatchValue() {
         Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
-        TestObserverEx<Integer> subscriber = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
         oi.subscribe(subscriber);
 
         thrown.expect(AssertionError.class);
@@ -86,7 +86,7 @@ public void assertNotMatchValue() {
     @Test
     public void assertNeverAtNotMatchingValue() {
         Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
-        TestObserverEx<Integer> subscriber = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
         oi.subscribe(subscriber);
 
         subscriber.assertNever(3);
@@ -97,7 +97,7 @@ public void assertNeverAtNotMatchingValue() {
     @Test
     public void assertNeverAtMatchingValue() {
         Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
-        TestObserverEx<Integer> subscriber = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
         oi.subscribe(subscriber);
 
         subscriber.assertValues(1, 2);
@@ -111,7 +111,7 @@ public void assertNeverAtMatchingValue() {
 
     @Test
     public void assertNeverAtMatchingPredicate() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.just(1, 2).subscribe(to);
 
@@ -129,7 +129,7 @@ public boolean test(final Integer o) throws Exception {
 
     @Test
     public void assertNeverAtNotMatchingPredicate() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.just(2, 3).subscribe(to);
 
@@ -144,7 +144,7 @@ public boolean test(final Integer o) throws Exception {
     @Test
     public void assertTerminalEventNotReceived() {
         PublishSubject<Integer> p = PublishSubject.create();
-        TestObserverEx<Integer> subscriber = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
         p.subscribe(subscriber);
 
         p.onNext(1);
@@ -165,7 +165,7 @@ public void wrappingMock() {
 
         Observer<Integer> mockSubscriber = TestHelper.mockObserver();
 
-        oi.subscribe(new TestObserverEx<Integer>(mockSubscriber));
+        oi.subscribe(new TestObserverEx<>(mockSubscriber));
 
         InOrder inOrder = inOrder(mockSubscriber);
         inOrder.verify(mockSubscriber, times(1)).onNext(1);
@@ -178,7 +178,7 @@ public void wrappingMock() {
     public void wrappingMockWhenUnsubscribeInvolved() {
         Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9)).take(2);
         Observer<Integer> mockSubscriber = TestHelper.mockObserver();
-        oi.subscribe(new TestObserverEx<Integer>(mockSubscriber));
+        oi.subscribe(new TestObserverEx<>(mockSubscriber));
 
         InOrder inOrder = inOrder(mockSubscriber);
         inOrder.verify(mockSubscriber, times(1)).onNext(1);
@@ -189,12 +189,12 @@ public void wrappingMockWhenUnsubscribeInvolved() {
 
     @Test
     public void errorSwallowed() {
-        Observable.error(new RuntimeException()).subscribe(new TestObserverEx<Object>());
+        Observable.error(new RuntimeException()).subscribe(new TestObserverEx<>());
     }
 
     @Test
     public void nullExpected() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         to.onNext(1);
 
         try {
@@ -208,7 +208,7 @@ public void nullExpected() {
 
     @Test
     public void nullActual() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         to.onNext(null);
 
         try {
@@ -222,7 +222,7 @@ public void nullActual() {
 
     @Test
     public void terminalErrorOnce() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         to.onError(new TestException());
         to.onError(new TestException());
 
@@ -237,7 +237,7 @@ public void terminalErrorOnce() {
 
     @Test
     public void terminalCompletedOnce() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         to.onComplete();
         to.onComplete();
 
@@ -252,7 +252,7 @@ public void terminalCompletedOnce() {
 
     @Test
     public void terminalOneKind() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         to.onError(new TestException());
         to.onComplete();
 
@@ -267,9 +267,9 @@ public void terminalOneKind() {
 
     @Test
     public void createDelegate() {
-        TestObserverEx<Integer> to1 = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to1 = new TestObserverEx<>();
 
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(to1);
+        TestObserverEx<Integer> to = new TestObserverEx<>(to1);
 
         to.assertNotSubscribed();
 
@@ -326,7 +326,7 @@ public void createDelegate() {
 
     @Test
     public void assertError() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         try {
             to.assertError(TestException.class);
@@ -451,7 +451,7 @@ public void valueAndClass() {
 
     @Test
     public void assertFailure() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -474,7 +474,7 @@ public void assertFailure() {
 
     @Test
     public void assertFuseable() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -494,10 +494,10 @@ public void assertFuseable() {
             // expected
         }
 
-        to = new TestObserverEx<Integer>();
+        to = new TestObserverEx<>();
         to.setInitialFusionMode(QueueFuseable.ANY);
 
-        to.onSubscribe(new ScalarDisposable<Integer>(to, 1));
+        to.onSubscribe(new ScalarDisposable<>(to, 1));
 
         to.assertFuseable();
 
@@ -521,7 +521,7 @@ public void assertFuseable() {
 
     @Test
     public void assertTerminated() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.assertNotTerminated();
 
@@ -537,7 +537,7 @@ public void assertTerminated() {
 
     @Test
     public void assertResult() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -574,7 +574,7 @@ public void assertResult() {
 
     @Test
     public void await() throws Exception {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -596,7 +596,7 @@ public void await() throws Exception {
 
         to.assertNoErrors().assertComplete();
 
-        final TestObserverEx<Integer> to1 = new TestObserverEx<Integer>();
+        final TestObserverEx<Integer> to1 = new TestObserverEx<>();
 
         to1.onSubscribe(Disposable.empty());
 
@@ -612,7 +612,7 @@ public void run() {
 
     @Test
     public void errors() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -627,7 +627,7 @@ public void errors() {
 
     @Test
     public void onNext() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -658,7 +658,7 @@ public void fusionModeToString() {
 
     @Test
     public void multipleTerminals() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -701,7 +701,7 @@ public void multipleTerminals() {
 
     @Test
     public void assertValue() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -735,13 +735,13 @@ public void assertValue() {
 
     @Test
     public void onNextMisbehave() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onNext(1);
 
         to.assertError(IllegalStateException.class);
 
-        to = new TestObserverEx<Integer>();
+        to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -752,7 +752,7 @@ public void onNextMisbehave() {
 
     @Test
     public void assertTerminated2() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -778,7 +778,7 @@ public void assertTerminated2() {
             // expected
         }
 
-        to = new TestObserverEx<Integer>();
+        to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -795,13 +795,13 @@ public void assertTerminated2() {
 
     @Test
     public void onSubscribe() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(null);
 
         to.assertError(NullPointerException.class);
 
-        to = new TestObserverEx<Integer>();
+        to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -813,7 +813,7 @@ public void onSubscribe() {
 
         to.assertError(IllegalStateException.class);
 
-        to = new TestObserverEx<Integer>();
+        to = new TestObserverEx<>();
         to.dispose();
 
         d1 = Disposable.empty();
@@ -826,7 +826,7 @@ public void onSubscribe() {
 
     @Test
     public void assertValueSequence() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -859,7 +859,7 @@ public void assertValueSequence() {
 
     @Test
     public void assertEmpty() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         try {
             to.assertEmpty();
@@ -884,7 +884,7 @@ public void assertEmpty() {
 
     @Test
     public void awaitDoneTimed() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Thread.currentThread().interrupt();
 
@@ -897,7 +897,7 @@ public void awaitDoneTimed() {
 
     @Test
     public void assertNotSubscribed() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.assertNotSubscribed();
 
@@ -913,7 +913,7 @@ public void assertNotSubscribed() {
 
     @Test
     public void assertErrorMultiple() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         TestException e = new TestException();
         to.errors().add(e);
@@ -947,7 +947,7 @@ public void assertErrorMultiple() {
 
     @Test
     public void errorInPredicate() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         to.onError(new RuntimeException());
         try {
             to.assertError(new Predicate<Throwable>() {
@@ -965,7 +965,7 @@ public boolean test(Throwable throwable) throws Exception {
 
     @Test
     public void assertComplete() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onSubscribe(Disposable.empty());
 
@@ -992,7 +992,7 @@ public void assertComplete() {
 
     @Test
     public void completeWithoutOnSubscribe() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         to.onComplete();
 
@@ -1001,7 +1001,7 @@ public void completeWithoutOnSubscribe() {
 
     @Test
     public void completeDelegateThrows() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(new Observer<Integer>() {
+        TestObserverEx<Integer> to = new TestObserverEx<>(new Observer<Integer>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -1037,7 +1037,7 @@ public void onComplete() {
 
     @Test
     public void errorDelegateThrows() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>(new Observer<Integer>() {
+        TestObserverEx<Integer> to = new TestObserverEx<>(new Observer<Integer>() {
 
             @Override
             public void onSubscribe(Disposable d) {
@@ -1073,7 +1073,7 @@ public void onComplete() {
 
     @Test
     public void syncQueueThrows() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         to.setInitialFusionMode(QueueFuseable.SYNC);
 
         Observable.range(1, 5)
@@ -1091,7 +1091,7 @@ public void syncQueueThrows() {
 
     @Test
     public void asyncQueueThrows() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         to.setInitialFusionMode(QueueFuseable.ANY);
 
         UnicastSubject<Integer> up = UnicastSubject.create();
@@ -1129,7 +1129,7 @@ public void errorMeansDisposed() {
 
     @Test
     public void asyncFusion() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
         to.setInitialFusionMode(QueueFuseable.ANY);
 
         UnicastSubject<Integer> up = UnicastSubject.create();
@@ -1148,7 +1148,7 @@ public void asyncFusion() {
 
     @Test
     public void assertValuePredicateEmpty() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
 
         Observable.empty().subscribe(to);
 
@@ -1163,7 +1163,7 @@ public void assertValuePredicateEmpty() {
 
     @Test
     public void assertValuePredicateMatch() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.just(1).subscribe(to);
 
@@ -1176,7 +1176,7 @@ public void assertValuePredicateMatch() {
 
     @Test
     public void assertValuePredicateNoMatch() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.just(1).subscribe(to);
 
@@ -1191,7 +1191,7 @@ public void assertValuePredicateNoMatch() {
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.just(1, 2).subscribe(to);
 
@@ -1206,7 +1206,7 @@ public void assertValuePredicateMatchButMore() {
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
 
         Observable.empty().subscribe(to);
 
@@ -1221,7 +1221,7 @@ public void assertValueAtPredicateEmpty() {
 
     @Test
     public void assertValueAtPredicateMatch() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.just(1, 2).subscribe(to);
 
@@ -1234,7 +1234,7 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.just(1, 2, 3).subscribe(to);
 
@@ -1249,7 +1249,7 @@ public void assertValueAtPredicateNoMatch() {
 
     @Test
     public void assertValueAtInvalidIndex() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
 
         Observable.just(1, 2).subscribe(to);
 
@@ -1264,7 +1264,7 @@ public void assertValueAtInvalidIndex() {
 
     @Test
     public void assertValueAtIndexEmpty() {
-        TestObserverEx<Object> to = new TestObserverEx<Object>();
+        TestObserverEx<Object> to = new TestObserverEx<>();
 
         Observable.empty().subscribe(to);
 
@@ -1275,7 +1275,7 @@ public void assertValueAtIndexEmpty() {
 
     @Test
     public void assertValueAtIndexMatch() {
-        TestObserverEx<String> to = new TestObserverEx<String>();
+        TestObserverEx<String> to = new TestObserverEx<>();
 
         Observable.just("a", "b").subscribe(to);
 
@@ -1284,7 +1284,7 @@ public void assertValueAtIndexMatch() {
 
     @Test
     public void assertValueAtIndexNoMatch() {
-        TestObserverEx<String> to = new TestObserverEx<String>();
+        TestObserverEx<String> to = new TestObserverEx<>();
 
         Observable.just("a", "b", "c").subscribe(to);
 
@@ -1295,7 +1295,7 @@ public void assertValueAtIndexNoMatch() {
 
     @Test
     public void assertValueAtIndexInvalidIndex() {
-        TestObserverEx<String> to = new TestObserverEx<String>();
+        TestObserverEx<String> to = new TestObserverEx<>();
 
         Observable.just("a", "b").subscribe(to);
 
@@ -1322,7 +1322,7 @@ public void withTag() {
 
     @Test
     public void assertValuesOnly() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         to.onSubscribe(Disposable.empty());
         to.assertValuesOnly();
 
@@ -1335,7 +1335,7 @@ public void assertValuesOnly() {
 
     @Test
     public void assertValuesOnlyThrowsOnUnexpectedValue() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         to.onSubscribe(Disposable.empty());
         to.assertValuesOnly();
 
@@ -1354,7 +1354,7 @@ public void assertValuesOnlyThrowsOnUnexpectedValue() {
 
     @Test
     public void assertValuesOnlyThrowsWhenCompleted() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         to.onSubscribe(Disposable.empty());
 
         to.onComplete();
@@ -1369,7 +1369,7 @@ public void assertValuesOnlyThrowsWhenCompleted() {
 
     @Test
     public void assertValuesOnlyThrowsWhenErrored() {
-        TestObserverEx<Integer> to = new TestObserverEx<Integer>();
+        TestObserverEx<Integer> to = new TestObserverEx<>();
         to.onSubscribe(Disposable.empty());
 
         to.onError(new TestException());
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
index 23297689b8..43d4087c3e 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
@@ -88,7 +88,7 @@ public TestSubscriberEx(Subscriber<? super T> actual, long initialRequest) {
             throw new IllegalArgumentException("Negative initial request not allowed");
         }
         this.downstream = actual;
-        this.upstream = new AtomicReference<Subscription>();
+        this.upstream = new AtomicReference<>();
         this.missedRequested = new AtomicLong(initialRequest);
     }
 
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
index 24a9e84c9b..308c10e041 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
@@ -44,7 +44,7 @@ public class TestSubscriberExTest extends RxJavaTest {
     @Test
     public void assertTestSubscriberEx() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         oi.subscribe(ts);
 
         ts.assertValues(1, 2);
@@ -55,7 +55,7 @@ public void assertTestSubscriberEx() {
     @Test
     public void assertNotMatchCount() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         oi.subscribe(ts);
 
         thrown.expect(AssertionError.class);
@@ -68,7 +68,7 @@ public void assertNotMatchCount() {
     @Test
     public void assertNotMatchValue() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         oi.subscribe(ts);
 
         thrown.expect(AssertionError.class);
@@ -81,7 +81,7 @@ public void assertNotMatchValue() {
     @Test
     public void assertNeverAtNotMatchingValue() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         oi.subscribe(ts);
 
         ts.assertNever(3);
@@ -92,7 +92,7 @@ public void assertNeverAtNotMatchingValue() {
     @Test
     public void assertNeverAtMatchingValue() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         oi.subscribe(ts);
 
         ts.assertValues(1, 2);
@@ -106,7 +106,7 @@ public void assertNeverAtMatchingValue() {
 
     @Test
     public void assertNeverAtMatchingPredicate() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.just(1, 2).subscribe(ts);
 
@@ -124,7 +124,7 @@ public boolean test(final Integer o) throws Exception {
 
     @Test
     public void assertNeverAtNotMatchingPredicate() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.just(2, 3).subscribe(ts);
 
@@ -139,7 +139,7 @@ public boolean test(final Integer o) throws Exception {
     @Test
     public void assertTerminalEventNotReceived() {
         PublishProcessor<Integer> p = PublishProcessor.create();
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         p.subscribe(ts);
 
         p.onNext(1);
@@ -157,7 +157,7 @@ public void wrappingMock() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
         Subscriber<Integer> mockSubscriber = TestHelper.mockSubscriber();
 
-        oi.subscribe(new TestSubscriberEx<Integer>(mockSubscriber));
+        oi.subscribe(new TestSubscriberEx<>(mockSubscriber));
 
         InOrder inOrder = inOrder(mockSubscriber);
         inOrder.verify(mockSubscriber, times(1)).onNext(1);
@@ -170,7 +170,7 @@ public void wrappingMock() {
     public void wrappingMockWhenUnsubscribeInvolved() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9)).take(2);
         Subscriber<Integer> mockSubscriber = TestHelper.mockSubscriber();
-        oi.subscribe(new TestSubscriberEx<Integer>(mockSubscriber));
+        oi.subscribe(new TestSubscriberEx<>(mockSubscriber));
 
         InOrder inOrder = inOrder(mockSubscriber);
         inOrder.verify(mockSubscriber, times(1)).onNext(1);
@@ -182,14 +182,14 @@ public void wrappingMockWhenUnsubscribeInvolved() {
     @Test
     public void assertError() {
         RuntimeException e = new RuntimeException("Oops");
-        TestSubscriberEx<Object> subscriber = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> subscriber = new TestSubscriberEx<>();
         Flowable.error(e).subscribe(subscriber);
         subscriber.assertError(e);
     }
 
     @Test
     public void awaitTerminalEventWithDurationAndUnsubscribeOnTimeout() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
         final AtomicBoolean unsub = new AtomicBoolean(false);
         Flowable.just(1)
         //
@@ -208,28 +208,28 @@ public void run() {
 
     @Test(expected = NullPointerException.class)
     public void nullDelegate1() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(null);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(null);
         ts.onComplete();
     }
 
     @Test(expected = NullPointerException.class)
     public void nullDelegate2() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(null);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(null);
         ts.onComplete();
     }
 
     @Test(expected = NullPointerException.class)
     public void nullDelegate3() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(null, 0L);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(null, 0L);
         ts.onComplete();
     }
 
     @Test
     public void delegate1() {
-        TestSubscriberEx<Integer> ts0 = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts0 = new TestSubscriberEx<>();
         ts0.onSubscribe(EmptySubscription.INSTANCE);
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(ts0);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(ts0);
         ts.onComplete();
 
         ts0.assertTerminated();
@@ -237,8 +237,8 @@ public void delegate1() {
 
     @Test
     public void delegate2() {
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>(ts1);
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>(ts1);
         ts2.onComplete();
 
         ts1.assertComplete();
@@ -246,21 +246,21 @@ public void delegate2() {
 
     @Test
     public void delegate3() {
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
-        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<Integer>(ts1, 0L);
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
+        TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>(ts1, 0L);
         ts2.onComplete();
         ts1.assertComplete();
     }
 
     @Test
     public void unsubscribed() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         assertFalse(ts.isCancelled());
     }
 
     @Test
     public void noErrors() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onError(new TestException());
         try {
             ts.assertNoErrors();
@@ -273,7 +273,7 @@ public void noErrors() {
 
     @Test
     public void notCompleted() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         try {
             ts.assertComplete();
         } catch (AssertionError ex) {
@@ -285,7 +285,7 @@ public void notCompleted() {
 
     @Test
     public void multipleCompletions() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onComplete();
         ts.onComplete();
         try {
@@ -299,7 +299,7 @@ public void multipleCompletions() {
 
     @Test
     public void completed() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onComplete();
         try {
             ts.assertNotComplete();
@@ -312,7 +312,7 @@ public void completed() {
 
     @Test
     public void multipleCompletions2() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onComplete();
         ts.onComplete();
         try {
@@ -326,7 +326,7 @@ public void multipleCompletions2() {
 
     @Test
     public void multipleErrors() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
         ts.onError(new TestException());
         ts.onError(new TestException());
@@ -350,7 +350,7 @@ public void multipleErrors() {
 
     @Test
     public void multipleErrors2() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
         ts.onError(new TestException());
         ts.onError(new TestException());
@@ -371,7 +371,7 @@ public void multipleErrors2() {
 
     @Test
     public void multipleErrors3() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
         ts.onError(new TestException());
         ts.onError(new TestException());
@@ -392,7 +392,7 @@ public void multipleErrors3() {
 
     @Test
     public void multipleErrors4() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
         ts.onError(new TestException());
         ts.onError(new TestException());
@@ -413,7 +413,7 @@ public void multipleErrors4() {
 
     @Test
     public void differentError() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onError(new TestException());
         try {
             ts.assertError(new TestException());
@@ -426,7 +426,7 @@ public void differentError() {
 
     @Test
     public void differentError2() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onError(new RuntimeException());
         try {
             ts.assertError(new TestException());
@@ -439,7 +439,7 @@ public void differentError2() {
 
     @Test
     public void differentError3() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onError(new RuntimeException());
         try {
             ts.assertError(TestException.class);
@@ -453,7 +453,7 @@ public void differentError3() {
 
     @Test
     public void differentError4() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onError(new RuntimeException());
         try {
             ts.assertError(Functions.<Throwable>alwaysFalse());
@@ -466,7 +466,7 @@ public void differentError4() {
 
     @Test
     public void errorInPredicate() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onError(new RuntimeException());
         try {
             ts.assertError(new Predicate<Throwable>() {
@@ -484,7 +484,7 @@ public boolean test(Throwable throwable) throws Exception {
 
     @Test
     public void noError() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         try {
             ts.assertError(TestException.class);
         } catch (AssertionError ex) {
@@ -496,7 +496,7 @@ public void noError() {
 
     @Test
     public void noError2() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         try {
             ts.assertError(new TestException());
         } catch (AssertionError ex) {
@@ -508,7 +508,7 @@ public void noError2() {
 
     @Test
     public void noError3() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         try {
             ts.assertError(Functions.<Throwable>alwaysTrue());
         } catch (AssertionError ex) {
@@ -520,7 +520,7 @@ public void noError3() {
 
     @Test
     public void interruptTerminalEventAwait() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         final Thread t0 = Thread.currentThread();
         Worker w = Schedulers.computation().createWorker();
@@ -546,7 +546,7 @@ public void run() {
 
     @Test
     public void interruptTerminalEventAwaitTimed() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         final Thread t0 = Thread.currentThread();
         Worker w = Schedulers.computation().createWorker();
@@ -573,7 +573,7 @@ public void run() {
 
     @Test
     public void interruptTerminalEventAwaitAndUnsubscribe() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         final Thread t0 = Thread.currentThread();
         Worker w = Schedulers.computation().createWorker();
@@ -602,7 +602,7 @@ public void run() {
 
     @Test
     public void noTerminalEventBut1Completed() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onComplete();
 
@@ -616,7 +616,7 @@ public void noTerminalEventBut1Completed() {
 
     @Test
     public void noTerminalEventBut1Error() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onError(new TestException());
 
@@ -630,7 +630,7 @@ public void noTerminalEventBut1Error() {
 
     @Test
     public void noTerminalEventBut1Error1Completed() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onComplete();
         ts.onError(new TestException());
@@ -645,7 +645,7 @@ public void noTerminalEventBut1Error1Completed() {
 
     @Test
     public void noTerminalEventBut2Errors() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onSubscribe(EmptySubscription.INSTANCE);
 
         ts.onError(new TestException());
@@ -667,7 +667,7 @@ public void noTerminalEventBut2Errors() {
 
     @Test
     public void noValues() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onNext(1);
 
         try {
@@ -680,7 +680,7 @@ public void noValues() {
 
     @Test
     public void valueCount() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onNext(1);
         ts.onNext(2);
 
@@ -700,7 +700,7 @@ public void onComplete() {
                 throw new TestException();
             }
         };
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(ts0);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(ts0);
 
         try {
             ts.onComplete();
@@ -719,7 +719,7 @@ public void onError(Throwable e) {
                 throw new TestException();
             }
         };
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(ts0);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(ts0);
 
         try {
             ts.onError(new RuntimeException());
@@ -732,9 +732,9 @@ public void onError(Throwable e) {
 
     @Test
     public void createDelegate() {
-        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
 
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(ts1);
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(ts1);
 
         ts.assertNotSubscribed();
 
@@ -791,7 +791,7 @@ public void createDelegate() {
 
     @Test
     public void assertError2() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         try {
             ts.assertError(TestException.class);
@@ -916,7 +916,7 @@ public void valueAndClass() {
 
     @Test
     public void assertFailure() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -939,7 +939,7 @@ public void assertFailure() {
 
     @Test
     public void assertFuseable() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -958,10 +958,10 @@ public void assertFuseable() {
         } catch (AssertionError ex) {
             // expected
         }
-        ts = new TestSubscriberEx<Integer>();
+        ts = new TestSubscriberEx<>();
         ts.setInitialFusionMode(QueueFuseable.ANY);
 
-        ts.onSubscribe(new ScalarSubscription<Integer>(ts, 1));
+        ts.onSubscribe(new ScalarSubscription<>(ts, 1));
 
         ts.assertFuseable();
 
@@ -985,7 +985,7 @@ public void assertFuseable() {
 
     @Test
     public void assertTerminated() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.assertNotTerminated();
 
@@ -1001,7 +1001,7 @@ public void assertTerminated() {
 
     @Test
     public void assertResult() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1038,7 +1038,7 @@ public void assertResult() {
 
     @Test
     public void await() throws Exception {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1064,7 +1064,7 @@ public void await() throws Exception {
 
         assertTrue(ts.await(5, TimeUnit.SECONDS));
 
-        final TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<Integer>();
+        final TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
 
         ts1.onSubscribe(new BooleanSubscription());
 
@@ -1080,7 +1080,7 @@ public void run() {
 
     @Test
     public void errors() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1095,7 +1095,7 @@ public void errors() {
 
     @Test
     public void onNext() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1127,7 +1127,7 @@ public void fusionModeToString() {
 
     @Test
     public void multipleTerminals() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1170,7 +1170,7 @@ public void multipleTerminals() {
 
     @Test
     public void assertValue() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1204,13 +1204,13 @@ public void assertValue() {
 
     @Test
     public void onNextMisbehave() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onNext(1);
 
         ts.assertError(IllegalStateException.class);
 
-        ts = new TestSubscriberEx<Integer>();
+        ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1221,7 +1221,7 @@ public void onNextMisbehave() {
 
     @Test
     public void awaitTerminalEventInterrupt() {
-        final TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        final TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1250,7 +1250,7 @@ public void awaitTerminalEventInterrupt() {
 
     @Test
     public void assertTerminated2() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1276,7 +1276,7 @@ public void assertTerminated2() {
             // expected
         }
 
-        ts = new TestSubscriberEx<Integer>();
+        ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1293,13 +1293,13 @@ public void assertTerminated2() {
 
     @Test
     public void onSubscribe() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(null);
 
         ts.assertError(NullPointerException.class);
 
-        ts = new TestSubscriberEx<Integer>();
+        ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1311,7 +1311,7 @@ public void onSubscribe() {
 
         ts.assertError(IllegalStateException.class);
 
-        ts = new TestSubscriberEx<Integer>();
+        ts = new TestSubscriberEx<>();
         ts.dispose();
 
         bs1 = new BooleanSubscription();
@@ -1324,7 +1324,7 @@ public void onSubscribe() {
 
     @Test
     public void assertValueSequence() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1357,7 +1357,7 @@ public void assertValueSequence() {
 
     @Test
     public void assertEmpty() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         try {
             ts.assertEmpty();
@@ -1382,7 +1382,7 @@ public void assertEmpty() {
 
     @Test
     public void awaitDoneTimed() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Thread.currentThread().interrupt();
 
@@ -1395,7 +1395,7 @@ public void awaitDoneTimed() {
 
     @Test
     public void assertNotSubscribed() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.assertNotSubscribed();
 
@@ -1411,7 +1411,7 @@ public void assertNotSubscribed() {
 
     @Test
     public void assertErrorMultiple() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         TestException e = new TestException();
         ts.errors().add(e);
@@ -1439,7 +1439,7 @@ public void assertErrorMultiple() {
 
     @Test
     public void assertComplete() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onSubscribe(new BooleanSubscription());
 
@@ -1466,7 +1466,7 @@ public void assertComplete() {
 
     @Test
     public void completeWithoutOnSubscribe() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         ts.onComplete();
 
@@ -1475,7 +1475,7 @@ public void completeWithoutOnSubscribe() {
 
     @Test
     public void completeDelegateThrows() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(new FlowableSubscriber<Integer>() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(new FlowableSubscriber<Integer>() {
 
             @Override
             public void onSubscribe(Subscription s) {
@@ -1511,7 +1511,7 @@ public void onComplete() {
 
     @Test
     public void errorDelegateThrows() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(new FlowableSubscriber<Integer>() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(new FlowableSubscriber<Integer>() {
 
             @Override
             public void onSubscribe(Subscription s) {
@@ -1547,7 +1547,7 @@ public void onComplete() {
 
     @Test
     public void syncQueueThrows() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
         ts.setInitialFusionMode(QueueFuseable.SYNC);
 
         Flowable.range(1, 5)
@@ -1565,7 +1565,7 @@ public void syncQueueThrows() {
 
     @Test
     public void asyncQueueThrows() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
         ts.setInitialFusionMode(QueueFuseable.ANY);
 
         UnicastProcessor<Integer> up = UnicastProcessor.create();
@@ -1587,7 +1587,7 @@ public void asyncQueueThrows() {
 
     @Test
     public void assertValuePredicateEmpty() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
 
         Flowable.empty().subscribe(ts);
 
@@ -1602,7 +1602,7 @@ public void assertValuePredicateEmpty() {
 
     @Test
     public void assertValuePredicateMatch() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.just(1).subscribe(ts);
 
@@ -1615,7 +1615,7 @@ public void assertValuePredicateMatch() {
 
     @Test
     public void assertValuePredicateNoMatch() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.just(1).subscribe(ts);
 
@@ -1630,7 +1630,7 @@ public void assertValuePredicateNoMatch() {
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.just(1, 2).subscribe(ts);
 
@@ -1645,7 +1645,7 @@ public void assertValuePredicateMatchButMore() {
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
 
         Flowable.empty().subscribe(ts);
 
@@ -1660,7 +1660,7 @@ public void assertValueAtPredicateEmpty() {
 
     @Test
     public void assertValueAtPredicateMatch() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.just(1, 2).subscribe(ts);
 
@@ -1673,7 +1673,7 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.just(1, 2, 3).subscribe(ts);
 
@@ -1688,7 +1688,7 @@ public void assertValueAtPredicateNoMatch() {
 
     @Test
     public void assertValueAtInvalidIndex() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable.just(1, 2).subscribe(ts);
 
@@ -1775,7 +1775,7 @@ public void timeoutIndicated3() throws InterruptedException {
 
     @Test
     public void disposeIndicated() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<Object>();
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
         ts.cancel();
 
         try {
@@ -1824,7 +1824,7 @@ public boolean test(Integer t) throws Exception {
 
     @Test
     public void assertValuesOnly() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onSubscribe(new BooleanSubscription());
         ts.assertValuesOnly();
 
@@ -1837,7 +1837,7 @@ public void assertValuesOnly() {
 
     @Test
     public void assertValuesOnlyThrowsOnUnexpectedValue() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onSubscribe(new BooleanSubscription());
         ts.assertValuesOnly();
 
@@ -1856,7 +1856,7 @@ public void assertValuesOnlyThrowsOnUnexpectedValue() {
 
     @Test
     public void assertValuesOnlyThrowsWhenCompleted() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onSubscribe(new BooleanSubscription());
 
         ts.onComplete();
@@ -1871,7 +1871,7 @@ public void assertValuesOnlyThrowsWhenCompleted() {
 
     @Test
     public void assertValuesOnlyThrowsWhenErrored() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
         ts.onSubscribe(new BooleanSubscription());
 
         ts.onError(new TestException());
diff --git a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java
index 1dd9f1c1ce..39704aba14 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java
@@ -48,7 +48,7 @@ public static class RxMethod {
     }
 
     public static List<RxMethod> parse(File f, String baseClassName) throws Exception {
-        List<RxMethod> list = new ArrayList<RxMethod>();
+        List<RxMethod> list = new ArrayList<>();
 
         StringBuilder b = JavadocForAnnotations.readFile(f);
 
diff --git a/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java b/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
index 221896fea2..40a976a165 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
@@ -49,7 +49,7 @@ static void findPattern(String pattern, boolean checkMain) throws Exception {
             return;
         }
 
-        Queue<File> dirs = new ArrayDeque<File>();
+        Queue<File> dirs = new ArrayDeque<>();
 
         StringBuilder fail = new StringBuilder();
         fail.append("The following code pattern was found: ").append(pattern).append("\n");
diff --git a/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java b/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java
index f069ec43cf..c5e601d017 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java
@@ -52,7 +52,7 @@ public void checkAndUpdateLicenses() throws Exception {
             return;
         }
 
-        Queue<File> dirs = new ArrayDeque<File>();
+        Queue<File> dirs = new ArrayDeque<>();
 
         File parent = f.getParentFile().getParentFile();
         dirs.offer(parent);
@@ -73,7 +73,7 @@ public void checkAndUpdateLicenses() throws Exception {
                     } else {
                         if (u.getName().endsWith(".java")) {
 
-                            List<String> lines = new ArrayList<String>();
+                            List<String> lines = new ArrayList<>();
                             BufferedReader in = new BufferedReader(new FileReader(u));
                             try {
                                 for (;;) {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java b/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
index 984d6bbbd5..14d937502f 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
@@ -81,7 +81,7 @@ static void checkInternalOperatorNaming(String baseClassName, String consumerCla
     }
 
     static List<String> readFile(File u) throws Exception {
-        List<String> lines = new ArrayList<String>();
+        List<String> lines = new ArrayList<>();
 
         BufferedReader in = new BufferedReader(new FileReader(u));
         try {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java
index 7ebdd1e8a1..083da2902c 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java
@@ -31,7 +31,7 @@ public void find() throws Exception {
 
         base = base.getParentFile().getParentFile();
 
-        Queue<File[]> files = new ArrayDeque<File[]>();
+        Queue<File[]> files = new ArrayDeque<>();
 
         files.offer(base.listFiles());
 
diff --git a/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java b/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java
index 1e4177c4cd..36a0297a43 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java
@@ -72,7 +72,7 @@ static void findPattern(int newLines) throws Exception {
             return;
         }
 
-        Queue<File> dirs = new ArrayDeque<File>();
+        Queue<File> dirs = new ArrayDeque<>();
 
         StringBuilder fail = new StringBuilder();
         fail.append("The following code pattern was found: ");
@@ -102,7 +102,7 @@ static void findPattern(int newLines) throws Exception {
                         String fname = u.getName();
                         if (fname.endsWith(".java")) {
 
-                            List<String> lines = new ArrayList<String>();
+                            List<String> lines = new ArrayList<>();
                             BufferedReader in = new BufferedReader(new FileReader(u));
                             try {
                                 for (;;) {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java b/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java
index d744c2a48c..47e5d1dfd6 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java
@@ -39,7 +39,7 @@ public void verify() throws Exception {
 
         StringBuilder b = new StringBuilder("Anonymous inner classes found:");
 
-        Queue<File> queue = new ArrayDeque<File>();
+        Queue<File> queue = new ArrayDeque<>();
 
         queue.offer(f);
 
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index b796904cdb..5bc4306492 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -82,7 +82,7 @@ public void checkParallelFlowable() {
     static Map<Class<?>, List<Object>> defaultInstances;
 
     static {
-        overrides = new HashMap<String, List<ParamOverride>>();
+        overrides = new HashMap<>();
 
         // ***********************************************************************************************************************
 
@@ -514,7 +514,7 @@ public void checkParallelFlowable() {
 
         // -----------------------------------------------------------------------------------
 
-        ignores = new HashMap<String, List<ParamIgnore>>();
+        ignores = new HashMap<>();
 
         // needs special param validation due to (long)start + end - 1 <= Integer.MAX_VALUE
         addIgnore(new ParamIgnore(Flowable.class, "range", Integer.TYPE, Integer.TYPE));
@@ -544,7 +544,7 @@ public void checkParallelFlowable() {
 
         // -----------------------------------------------------------------------------------
 
-        defaultValues = new HashMap<Class<?>, Object>();
+        defaultValues = new HashMap<>();
 
         defaultValues.put(Publisher.class, new NeverPublisher());
         defaultValues.put(Flowable.class, new NeverPublisher());
@@ -645,7 +645,7 @@ public Object apply(Flowable upstream) {
 
         // -----------------------------------------------------------------------------------
 
-        defaultInstances = new HashMap<Class<?>, List<Object>>();
+        defaultInstances = new HashMap<>();
 
 //        addDefaultInstance(Flowable.class, Flowable.empty(), "Empty()");
 //        addDefaultInstance(Flowable.class, Flowable.empty().hide(), "Empty().Hide()");
@@ -677,7 +677,7 @@ static void addIgnore(ParamIgnore ignore) {
         String key = ignore.toString();
         List<ParamIgnore> list = ignores.get(key);
         if (list == null) {
-            list = new ArrayList<ParamIgnore>();
+            list = new ArrayList<>();
             ignores.put(key, list);
         }
         list.add(ignore);
@@ -687,7 +687,7 @@ static void addOverride(ParamOverride ignore) {
         String key = ignore.toString();
         List<ParamOverride> list = overrides.get(key);
         if (list == null) {
-            list = new ArrayList<ParamOverride>();
+            list = new ArrayList<>();
             overrides.put(key, list);
         }
         list.add(ignore);
@@ -696,7 +696,7 @@ static void addOverride(ParamOverride ignore) {
     static void addDefaultInstance(Class<?> clazz, Object o, String tag) {
         List<Object> list = defaultInstances.get(clazz);
         if (list == null) {
-            list = new ArrayList<Object>();
+            list = new ArrayList<>();
             defaultInstances.put(clazz, list);
         }
         list.add(o);
@@ -786,7 +786,7 @@ void checkClass(Class<?> clazz) {
 
                 List<ParamOverride> overrideList = overrides.get(key);
 
-                List<Object> baseObjects = new ArrayList<Object>();
+                List<Object> baseObjects = new ArrayList<>();
 
                 if ((m.getModifiers() & Modifier.STATIC) != 0) {
                     baseObjects.add(null);
@@ -853,7 +853,7 @@ void checkClass(Class<?> clazz) {
                             }
                         }
 
-                        List<Object> entryValues = new ArrayList<Object>();
+                        List<Object> entryValues = new ArrayList<>();
 
                         if (entryClass.isPrimitive()) {
                             addCheckPrimitive(params[i], overrideEntry, entryValues);
diff --git a/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java b/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java
index aedcc603f7..2fb3460a73 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java
@@ -37,7 +37,7 @@ public void checkAndUpdateTestMethodNames() throws Exception {
             return;
         }
 
-        Queue<File> dirs = new ArrayDeque<File>();
+        Queue<File> dirs = new ArrayDeque<>();
 
         StringBuilder fail = new StringBuilder();
         fail.append("The following code pattern was found: ").append(pattern).append("\n");
@@ -66,7 +66,7 @@ public void checkAndUpdateTestMethodNames() throws Exception {
                         if (fname.endsWith(".java")) {
 
                             int lineNum = 0;
-                            List<String> lines = new ArrayList<String>();
+                            List<String> lines = new ArrayList<>();
                             BufferedReader in = new BufferedReader(new FileReader(u));
                             //boolean found = false;
                             try {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java b/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java
index 4f693bd02c..6aff9cc10e 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java
@@ -32,7 +32,7 @@ public void checkFiles() throws Exception {
             return;
         }
 
-        Queue<File> dirs = new ArrayDeque<File>();
+        Queue<File> dirs = new ArrayDeque<>();
 
         File parent = f.getParentFile().getParentFile();
         dirs.offer(parent);
@@ -53,7 +53,7 @@ public void checkFiles() throws Exception {
                     } else {
                         if (u.getName().endsWith(".java")) {
 
-                            List<String> lines = new ArrayList<String>();
+                            List<String> lines = new ArrayList<>();
                             BufferedReader in = new BufferedReader(new FileReader(u));
                             try {
                                 for (;;) {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java b/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
index 22ab721a21..c87f19f10e 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
@@ -52,7 +52,7 @@ static void findPattern(int newLines) throws Exception {
             return;
         }
 
-        Queue<File> dirs = new ArrayDeque<File>();
+        Queue<File> dirs = new ArrayDeque<>();
 
         StringBuilder fail = new StringBuilder();
         fail.append("The following code pattern was found: ");
@@ -82,7 +82,7 @@ static void findPattern(int newLines) throws Exception {
                         String fname = u.getName();
                         if (fname.endsWith(".java")) {
 
-                            List<String> lines = new ArrayList<String>();
+                            List<String> lines = new ArrayList<>();
                             BufferedReader in = new BufferedReader(new FileReader(u));
                             try {
                                 for (;;) {

From 0b92c6f0464e4b1edcd92cfbb72270f28d820aa8 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 22 Dec 2019 22:05:32 +0100
Subject: [PATCH 020/665] 3.x: Remove now unnecessary unchecked warning
 suppressions (#6790)

---
 .../io/reactivex/rxjava3/core/MemoryPerf.java |  4 +-
 .../rxjava3/core/OperatorMergePerf.java       |  2 +-
 .../rxjava3/flowable/FlowableCollectTest.java |  2 -
 .../rxjava3/flowable/FlowableConcatTests.java |  1 -
 .../rxjava3/flowable/FlowableNullTests.java   | 16 ------
 .../rxjava3/flowable/FlowableTests.java       |  2 -
 .../CompletableMaterializeTest.java           |  2 -
 .../operators/flowable/FlowableAmbTest.java   | 22 --------
 .../flowable/FlowableBufferTest.java          | 51 -------------------
 .../flowable/FlowableCombineLatestTest.java   | 13 -----
 .../FlowableConcatDelayErrorTest.java         |  2 -
 .../flowable/FlowableConcatMapEagerTest.java  | 17 -------
 .../flowable/FlowableConcatTest.java          | 20 ++------
 .../flowable/FlowableGroupByTest.java         |  1 -
 .../flowable/FlowableMergeDelayErrorTest.java |  6 ---
 .../operators/flowable/FlowableMergeTest.java |  2 -
 .../flowable/FlowablePublishTest.java         |  2 -
 .../flowable/FlowableTimeIntervalTest.java    |  1 -
 .../flowable/FlowableToListTest.java          |  8 ---
 .../flowable/FlowableToSortedListTest.java    |  4 --
 .../FlowableWindowWithFlowableTest.java       |  2 -
 .../flowable/FlowableWindowWithSizeTest.java  |  4 --
 ...lowableWindowWithStartEndFlowableTest.java |  2 -
 .../flowable/FlowableWindowWithTimeTest.java  |  4 --
 .../flowable/FlowableWithLatestFromTest.java  |  1 -
 .../operators/flowable/FlowableZipTest.java   |  2 -
 .../operators/maybe/MaybeAmbTest.java         |  4 --
 .../maybe/MaybeConcatIterableTest.java        |  5 --
 .../operators/maybe/MaybeMaterializeTest.java |  3 --
 .../operators/maybe/MaybeOnErrorXTest.java    |  3 --
 .../operators/maybe/MaybeZipIterableTest.java | 10 ----
 .../observable/ObservableAmbTest.java         |  2 -
 .../observable/ObservableBufferTest.java      | 40 ---------------
 .../observable/ObservableCollectTest.java     |  2 -
 .../ObservableCombineLatestTest.java          |  6 ---
 .../ObservableConcatMapEagerTest.java         |  3 --
 .../observable/ObservableConcatTest.java      | 11 ++--
 .../ObservableMergeDelayErrorTest.java        |  4 --
 .../ObservableTimeIntervalTest.java           |  1 -
 .../observable/ObservableToListTest.java      |  8 ---
 .../ObservableToSortedListTest.java           |  4 --
 .../ObservableWindowWithSizeTest.java         |  3 --
 ...vableWindowWithStartEndObservableTest.java |  2 -
 .../ObservableWithLatestFromTest.java         |  1 -
 .../observable/ObservableZipTest.java         |  1 -
 .../operators/single/SingleAmbTest.java       |  4 --
 .../operators/single/SingleConcatTest.java    |  2 -
 .../single/SingleMaterializeTest.java         |  2 -
 .../operators/single/SingleMergeTest.java     |  1 -
 .../single/SingleZipIterableTest.java         | 11 ----
 .../operators/single/SingleZipTest.java       |  1 -
 .../io/reactivex/rxjava3/maybe/MaybeTest.java | 20 --------
 .../observable/ObservableConcatTests.java     |  1 -
 .../observable/ObservableNullTests.java       | 14 -----
 .../rxjava3/observable/ObservableTest.java    |  2 -
 .../rxjava3/parallel/ParallelCollectTest.java |  4 --
 .../parallel/ParallelDoOnNextTryTest.java     |  2 -
 .../parallel/ParallelFilterTryTest.java       |  2 -
 .../parallel/ParallelFlowableTest.java        |  1 -
 .../rxjava3/parallel/ParallelMapTryTest.java  |  2 -
 .../rxjava3/parallel/ParallelReduceTest.java  |  4 --
 .../rxjava3/single/SingleNullTests.java       |  7 ---
 .../reactivex/rxjava3/single/SingleTest.java  |  2 -
 .../rxjava3/tck/AmbArrayTckTest.java          |  1 -
 .../io/reactivex/rxjava3/tck/AmbTckTest.java  |  1 -
 ...ombineLatestIterableDelayErrorTckTest.java |  1 -
 .../tck/CombineLatestIterableTckTest.java     |  1 -
 .../rxjava3/tck/ConcatArrayEagerTckTest.java  |  1 -
 .../tck/ConcatIterableEagerTckTest.java       |  1 -
 .../rxjava3/tck/MergeIterableTckTest.java     |  1 -
 .../rxjava3/tck/RefCountProcessor.java        |  2 +-
 .../rxjava3/tck/ZipIterableTckTest.java       |  1 -
 .../testsupport/BaseTestConsumerEx.java       |  2 +
 73 files changed, 12 insertions(+), 388 deletions(-)

diff --git a/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java
index 7679ec5346..b7ed7e4ae1 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java
@@ -184,7 +184,7 @@ public Object call() throws Exception {
         checkMemory(new Callable<Object>() {
             @Override
             public Object call() throws Exception {
-                return new io.reactivex.rxjava3.observers.TestObserver<Object>();
+                return new io.reactivex.rxjava3.observers.TestObserver<>();
             }
         }, "test-consumer", "Rx2Observable");
 
@@ -374,7 +374,7 @@ public Object call() throws Exception {
         checkMemory(new Callable<Object>() {
             @Override
             public Object call() throws Exception {
-                return new io.reactivex.rxjava3.observers.TestObserver<Object>();
+                return new io.reactivex.rxjava3.observers.TestObserver<>();
             }
         }, "test-consumer", "Rx2Flowable");
 
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java
index 7d68316c83..560736c86c 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java
@@ -134,7 +134,7 @@ public static class InputForMergeN {
         @Setup
         public void setup(final Blackhole bh) {
             this.bh = bh;
-            observables = new ArrayList<Flowable<Integer>>();
+            observables = new ArrayList<>();
             for (int i = 0; i < size; i++) {
                 observables.add(Flowable.just(i));
             }
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
index ae3cd0c906..ea93877cdc 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
@@ -167,7 +167,6 @@ public void accept(Object o, Integer t) {
         assertFalse(added.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void collectIntoFlowable() {
         Flowable.just(1, 1, 1, 1, 2)
@@ -316,7 +315,6 @@ public void accept(Object o, Integer t) {
         assertFalse(added.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void collectInto() {
         Flowable.just(1, 1, 1, 1, 2)
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java
index e800a9173c..5d54f9df5f 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java
@@ -61,7 +61,6 @@ public void concatWithIterableOfFlowable() {
         Flowable<String> f2 = Flowable.just("three", "four");
         Flowable<String> f3 = Flowable.just("five", "six");
 
-        @SuppressWarnings("unchecked")
         Iterable<Flowable<String>> is = Arrays.asList(f1, f2, f3);
 
         List<String> values = Flowable.concat(Flowable.fromIterable(is)).toList().blockingGet();
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
index 0e85aa8a40..668a7acf92 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
@@ -47,7 +47,6 @@ public void ambVarargsNull() {
         Flowable.ambArray((Publisher<Object>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void ambVarargsOneIsNull() {
         Flowable.ambArray(Flowable.never(), null).blockingLast();
@@ -68,7 +67,6 @@ public Iterator<Publisher<Object>> iterator() {
         }).test().assertError(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableOneIsNull() {
         Flowable.amb(Arrays.asList(Flowable.never(), null))
@@ -101,7 +99,6 @@ public Object apply(Object[] v) {
         }).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableOneIsNull() {
         Flowable.combineLatestDelayError(Arrays.asList(Flowable.never(), null), new Function<Object[], Object>() {
@@ -112,13 +109,11 @@ public Object apply(Object[] v) {
         }).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableFunctionNull() {
         Flowable.combineLatestDelayError(Arrays.asList(just1), null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableFunctionReturnsNull() {
         Flowable.combineLatestDelayError(Arrays.asList(just1), new Function<Object[], Object>() {
@@ -144,7 +139,6 @@ public Iterator<Publisher<Object>> iterator() {
         }).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void concatIterableOneIsNull() {
         Flowable.concat(Arrays.asList(just1, null)).blockingLast();
@@ -161,7 +155,6 @@ public void concatArrayNull() {
         Flowable.concatArray((Publisher<Object>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void concatArrayOneIsNull() {
         Flowable.concatArray(just1, null).blockingLast();
@@ -480,7 +473,6 @@ public Iterator<Publisher<Object>> iterator() {
         }, 128, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void mergeIterableOneIsNull() {
         Flowable.merge(Arrays.asList(just1, null), 128, 128).blockingLast();
@@ -512,7 +504,6 @@ public Iterator<Publisher<Object>> iterator() {
         }, 128, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void mergeDelayErrorIterableOneIsNull() {
         Flowable.mergeDelayError(Arrays.asList(just1, null), 128, 128).blockingLast();
@@ -634,13 +625,11 @@ public Object apply(Object[] v) {
         }).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableFunctionNull() {
         Flowable.zip(Arrays.asList(just1, just1), null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableFunctionReturnsNull() {
         Flowable.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
@@ -676,13 +665,11 @@ public Object apply(Object[] a) {
         }, true, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterable2FunctionNull() {
         Flowable.zip(Arrays.asList(just1, just1), null, true, 128);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterable2FunctionReturnsNull() {
         Flowable.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
@@ -2679,7 +2666,6 @@ public void unsafeSubscribeNull() {
         just1.subscribe((FlowableSubscriber<Object>)null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableFunctionReturnsNull() {
         Flowable.combineLatestDelayError(Arrays.asList(just1), new Function<Object[], Object>() {
@@ -2690,7 +2676,6 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableFunctionNull() {
         Flowable.combineLatestDelayError(Arrays.asList(just1), null, 128);
@@ -2731,7 +2716,6 @@ public void doOnDisposeNull() {
         just1.doOnCancel(null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableOneIsNull() {
         Flowable.combineLatestDelayError(Arrays.asList(Flowable.never(), null), new Function<Object[], Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
index 616140c6b9..3d462efe0b 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
@@ -1074,7 +1074,6 @@ public void toObservableError() {
 
     @Test
     public void zipIterableObject() {
-        @SuppressWarnings("unchecked")
         final List<Flowable<Integer>> flowables = Arrays.asList(Flowable.just(1, 2, 3), Flowable.just(1, 2, 3));
         Flowable.zip(flowables, new Function<Object[], Object>() {
             @Override
@@ -1090,7 +1089,6 @@ public Object apply(Object[] o) throws Exception {
 
     @Test
     public void combineLatestObject() {
-        @SuppressWarnings("unchecked")
         final List<Flowable<Integer>> flowables = Arrays.asList(Flowable.just(1, 2, 3), Flowable.just(1, 2, 3));
         Flowable.combineLatest(flowables, new Function<Object[], Object>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java
index 23b4e25731..aa77e6a975 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java
@@ -24,7 +24,6 @@
 public class CompletableMaterializeTest extends RxJavaTest {
 
     @Test
-    @SuppressWarnings("unchecked")
     public void error() {
         TestException ex = new TestException();
         Completable.error(ex)
@@ -34,7 +33,6 @@ public void error() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void empty() {
         Completable.complete()
         .materialize()
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
index 42cba044db..0657a15474 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
@@ -102,7 +102,6 @@ public void amb() {
         Flowable<String> flowable3 = createFlowable(new String[] {
                 "3", "33", "333", "3333" }, 3000, null);
 
-        @SuppressWarnings("unchecked")
         Flowable<String> f = Flowable.ambArray(flowable1,
                 flowable2, flowable3);
 
@@ -131,7 +130,6 @@ public void amb2() {
         Flowable<String> flowable3 = createFlowable(new String[] {},
                 3000, new IOException("fake exception"));
 
-        @SuppressWarnings("unchecked")
         Flowable<String> f = Flowable.ambArray(flowable1,
                 flowable2, flowable3);
 
@@ -158,7 +156,6 @@ public void amb3() {
         Flowable<String> flowable3 = createFlowable(new String[] {
                 "3" }, 3000, null);
 
-        @SuppressWarnings("unchecked")
         Flowable<String> f = Flowable.ambArray(flowable1,
                 flowable2, flowable3);
 
@@ -171,7 +168,6 @@ public void amb3() {
         inOrder.verifyNoMoreInteractions();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void producerRequestThroughAmb() {
         TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
@@ -237,7 +233,6 @@ public void backpressure() {
         assertEquals(Flowable.bufferSize() * 2, ts.values().size());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void subscriptionOnlyHappensOnce() throws InterruptedException {
         final AtomicLong count = new AtomicLong();
@@ -262,7 +257,6 @@ public void accept(Subscription s) {
         assertEquals(2, count.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void secondaryRequestsPropagatedToChildren() throws InterruptedException {
         //this aync stream should emit first
@@ -302,7 +296,6 @@ public void accept(Integer t) {
         assertEquals(1, result);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambCancelsOthers() {
         PublishProcessor<Integer> source1 = PublishProcessor.create();
@@ -347,7 +340,6 @@ public void multipleUse() {
         ts2.assertNoErrors();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -370,7 +362,6 @@ public void ambIterable() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable2() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -393,19 +384,16 @@ public void ambIterable2() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayEmpty() {
         assertSame(Flowable.empty(), Flowable.ambArray());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArraySingleElement() {
         assertSame(Flowable.never(), Flowable.ambArray(Flowable.never()));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void disposed() {
         TestHelper.checkDisposed(Flowable.ambArray(Flowable.never(), Flowable.never()));
@@ -442,7 +430,6 @@ public void onNextRace() {
             final PublishProcessor<Integer> pp1 = PublishProcessor.create();
             final PublishProcessor<Integer> pp2 = PublishProcessor.create();
 
-            @SuppressWarnings("unchecked")
             TestSubscriberEx<Integer> ts = Flowable.ambArray(pp1, pp2).to(TestHelper.<Integer>testConsumer());
 
             Runnable r1 = new Runnable() {
@@ -471,7 +458,6 @@ public void onCompleteRace() {
             final PublishProcessor<Integer> pp1 = PublishProcessor.create();
             final PublishProcessor<Integer> pp2 = PublishProcessor.create();
 
-            @SuppressWarnings("unchecked")
             TestSubscriber<Integer> ts = Flowable.ambArray(pp1, pp2).test();
 
             Runnable r1 = new Runnable() {
@@ -499,7 +485,6 @@ public void onErrorRace() {
             final PublishProcessor<Integer> pp1 = PublishProcessor.create();
             final PublishProcessor<Integer> pp2 = PublishProcessor.create();
 
-            @SuppressWarnings("unchecked")
             TestSubscriber<Integer> ts = Flowable.ambArray(pp1, pp2).test();
 
             final Throwable ex = new TestException();
@@ -531,7 +516,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void nullIterableElement() {
         Flowable.amb(Arrays.asList(Flowable.never(), null, Flowable.never()))
@@ -575,21 +559,18 @@ public void ambWithOrder() {
         Flowable.just(1).ambWith(error).test().assertValue(1).assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableOrder() {
         Flowable<Integer> error = Flowable.error(new RuntimeException());
         Flowable.amb(Arrays.asList(Flowable.just(1), error)).test().assertValue(1).assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayOrder() {
         Flowable<Integer> error = Flowable.error(new RuntimeException());
         Flowable.ambArray(Flowable.just(1), error).test().assertValue(1).assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerSuccessDispose() throws Exception {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
@@ -615,7 +596,6 @@ public void accept(Object v) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerErrorDispose() throws Exception {
         final TestException ex = new TestException();
@@ -642,7 +622,6 @@ public void accept(Throwable e) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerCompleteDispose() throws Exception {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
@@ -668,7 +647,6 @@ public void run() throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void publishersInIterable() {
         Publisher<Integer> source = new Publisher<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
index 707d98e0d4..87a0eeaf38 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
@@ -988,7 +988,6 @@ public void onComplete() {
         assertFalse(s.isDisposed());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void postCompleteBackpressure() {
         Flowable<List<Integer>> source = Flowable.range(1, 10).buffer(3, 1);
@@ -1064,7 +1063,6 @@ public void postCompleteBackpressure() {
         ts.assertNoErrors();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void timeAndSkipOverlap() {
 
@@ -1104,7 +1102,6 @@ public void timeAndSkipOverlap() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void timeAndSkipSkip() {
 
@@ -1141,7 +1138,6 @@ public void timeAndSkipSkip() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void timeAndSkipOverlapScheduler() {
 
@@ -1192,7 +1188,6 @@ public Scheduler apply(Scheduler t) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void timeAndSkipSkipDefaultScheduler() {
         RxJavaPlugins.setComputationSchedulerHandler(new Function<Scheduler, Scheduler>() {
@@ -1240,7 +1235,6 @@ public Scheduler apply(Scheduler t) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferBoundaryHint() {
         Flowable.range(1, 5).buffer(Flowable.timer(1, TimeUnit.MINUTES), 2)
@@ -1252,7 +1246,6 @@ static HashSet<Integer> set(Integer... values) {
         return new HashSet<>(Arrays.asList(values));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferIntoCustomCollection() {
         Flowable.just(1, 1, 2, 2, 3, 3, 4, 4)
@@ -1266,7 +1259,6 @@ public Collection<Integer> get() throws Exception {
         .assertResult(set(1, 2), set(2, 3), set(4));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSkipIntoCustomCollection() {
         Flowable.just(1, 1, 2, 2, 3, 3, 4, 4)
@@ -1280,7 +1272,6 @@ public Collection<Integer> get() throws Exception {
         .assertResult(set(1, 2), set(2, 3), set(4));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimeSkipDefault() {
         Flowable.range(1, 5).buffer(1, 1, TimeUnit.MINUTES)
@@ -1307,7 +1298,6 @@ public void dispose() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierReturnsNull() {
         Flowable.<Integer>never()
         .buffer(1, TimeUnit.MILLISECONDS, Schedulers.single(), Integer.MAX_VALUE, new Supplier<Collection<Integer>>() {
@@ -1327,7 +1317,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierReturnsNull2() {
         Flowable.<Integer>never()
         .buffer(1, TimeUnit.MILLISECONDS, Schedulers.single(), 10, new Supplier<Collection<Integer>>() {
@@ -1347,7 +1336,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierReturnsNull3() {
         Flowable.<Integer>never()
         .buffer(2, 1, TimeUnit.MILLISECONDS, Schedulers.single(), new Supplier<Collection<Integer>>() {
@@ -1367,7 +1355,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows() {
         Flowable.just(1)
         .buffer(1, TimeUnit.SECONDS, Schedulers.single(), Integer.MAX_VALUE, new Supplier<Collection<Integer>>() {
@@ -1381,7 +1368,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows2() {
         Flowable.just(1)
         .buffer(1, TimeUnit.SECONDS, Schedulers.single(), 10, new Supplier<Collection<Integer>>() {
@@ -1395,7 +1381,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows3() {
         Flowable.just(1)
         .buffer(2, 1, TimeUnit.SECONDS, Schedulers.single(), new Supplier<Collection<Integer>>() {
@@ -1409,7 +1394,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows4() {
         Flowable.<Integer>never()
         .buffer(1, TimeUnit.MILLISECONDS, Schedulers.single(), Integer.MAX_VALUE, new Supplier<Collection<Integer>>() {
@@ -1429,7 +1413,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows5() {
         Flowable.<Integer>never()
         .buffer(1, TimeUnit.MILLISECONDS, Schedulers.single(), 10, new Supplier<Collection<Integer>>() {
@@ -1449,7 +1432,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows6() {
         Flowable.<Integer>never()
         .buffer(2, 1, TimeUnit.MILLISECONDS, Schedulers.single(), new Supplier<Collection<Integer>>() {
@@ -1468,7 +1450,6 @@ public Collection<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void restartTimer() {
         Flowable.range(1, 5)
@@ -1477,7 +1458,6 @@ public void restartTimer() {
         .assertResult(Arrays.asList(1, 2), Arrays.asList(3, 4), Arrays.asList(5));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSkipError() {
         Flowable.<Integer>error(new TestException())
@@ -1486,7 +1466,6 @@ public void bufferSkipError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSupplierCrash2() {
         Flowable.range(1, 2)
@@ -1504,7 +1483,6 @@ public List<Integer> get() throws Exception {
         .assertFailure(TestException.class, Arrays.asList(1));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSkipSupplierCrash2() {
         Flowable.range(1, 2)
@@ -1522,7 +1500,6 @@ public List<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferOverlapSupplierCrash2() {
         Flowable.range(1, 2)
@@ -1540,7 +1517,6 @@ public List<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSkipOverlap() {
         Flowable.range(1, 5)
@@ -1555,7 +1531,6 @@ public void bufferSkipOverlap() {
         );
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedExactError() {
         Flowable.error(new TestException())
@@ -1564,7 +1539,6 @@ public void bufferTimedExactError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedSkipError() {
         Flowable.error(new TestException())
@@ -1573,7 +1547,6 @@ public void bufferTimedSkipError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedOverlapError() {
         Flowable.error(new TestException())
@@ -1582,7 +1555,6 @@ public void bufferTimedOverlapError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedExactEmpty() {
         Flowable.empty()
@@ -1591,7 +1563,6 @@ public void bufferTimedExactEmpty() {
         .assertResult(Collections.emptyList());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedSkipEmpty() {
         Flowable.empty()
@@ -1600,7 +1571,6 @@ public void bufferTimedSkipEmpty() {
         .assertResult(Collections.emptyList());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedOverlapEmpty() {
         Flowable.empty()
@@ -1609,7 +1579,6 @@ public void bufferTimedOverlapEmpty() {
         .assertResult(Collections.emptyList());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedExactSupplierCrash() {
         TestScheduler scheduler = new TestScheduler();
@@ -1639,7 +1608,6 @@ public List<Integer> get() throws Exception {
         .assertFailure(TestException.class, Arrays.asList(1));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedExactBoundedError() {
         TestScheduler scheduler = new TestScheduler();
@@ -1713,7 +1681,6 @@ public void badRequest() {
         TestHelper.assertBadRequestReported(PublishProcessor.create().buffer(2, 1));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void skipError() {
         Flowable.error(new TestException())
@@ -1722,7 +1689,6 @@ public void skipError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void skipSingleResult() {
         Flowable.just(1)
@@ -1731,7 +1697,6 @@ public void skipSingleResult() {
         .assertResult(Arrays.asList(1));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void skipBackpressure() {
         Flowable.range(1, 10)
@@ -1782,7 +1747,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCompletionCancelExact() {
         final AtomicInteger counter = new AtomicInteger();
@@ -1802,7 +1766,6 @@ public void run() throws Exception {
         assertEquals(0, counter.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCompletionCancelSkip() {
         final AtomicInteger counter = new AtomicInteger();
@@ -1822,7 +1785,6 @@ public void run() throws Exception {
         assertEquals(0, counter.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCompletionCancelOverlap() {
         final AtomicInteger counter = new AtomicInteger();
@@ -1843,7 +1805,6 @@ public void run() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void boundaryOpenCloseDisposedOnComplete() {
         PublishProcessor<Integer> source = PublishProcessor.create();
 
@@ -1919,7 +1880,6 @@ public Publisher<?> apply(Long a) {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openClosemainError() {
         Flowable.error(new TestException())
         .buffer(Flowable.never(), Functions.justFunction(Flowable.never()))
@@ -1928,7 +1888,6 @@ public void openClosemainError() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openClosebadSource() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -1966,7 +1925,6 @@ protected void subscribeActual(Subscriber<? super Object> s) {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseOpenCompletes() {
         PublishProcessor<Integer> source = PublishProcessor.create();
 
@@ -1995,7 +1953,6 @@ public void openCloseOpenCompletes() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseOpenCompletesNoBuffers() {
         PublishProcessor<Integer> source = PublishProcessor.create();
 
@@ -2024,7 +1981,6 @@ public void openCloseOpenCompletesNoBuffers() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseTake() {
         PublishProcessor<Integer> source = PublishProcessor.create();
 
@@ -2048,7 +2004,6 @@ public void openCloseTake() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseEmptyBackpressure() {
         PublishProcessor<Integer> source = PublishProcessor.create();
 
@@ -2069,7 +2024,6 @@ public void openCloseEmptyBackpressure() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseErrorBackpressure() {
         PublishProcessor<Integer> source = PublishProcessor.create();
 
@@ -2090,7 +2044,6 @@ public void openCloseErrorBackpressure() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseBadOpen() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -2134,7 +2087,6 @@ protected void subscribeActual(Subscriber<? super Object> s) {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseBadClose() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -2191,7 +2143,6 @@ public Flowable<List<Object>> apply(Flowable<Object> f)
         );
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferExactBoundarySecondBufferCrash() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
@@ -2213,7 +2164,6 @@ public List<Integer> get() throws Exception {
         ts.assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferExactBoundaryBadSource() {
         Flowable<Integer> pp = new Flowable<Integer>() {
@@ -2425,7 +2375,6 @@ public void timedSizeBufferAlreadyCleared() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void bufferExactFailingSupplier() {
         Flowable.empty()
                 .buffer(1, TimeUnit.SECONDS, Schedulers.computation(), 10, new Supplier<List<Object>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
index 8ed8197138..c8e041b951 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
@@ -802,7 +802,6 @@ public Long apply(Long t1, Integer t2) {
 
     @Test
     public void combineLatestRequestOverflow() throws InterruptedException {
-        @SuppressWarnings("unchecked")
         List<Flowable<Integer>> sources = Arrays.asList(Flowable.fromArray(1, 2, 3, 4),
                 Flowable.fromArray(5, 6, 7, 8));
         Flowable<Integer> f = Flowable.combineLatest(sources, new Function<Object[], Integer>() {
@@ -864,7 +863,6 @@ public void accept(Throwable t) {
         assertFalse(errorOccurred.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void combineLatestIterable() {
         Flowable<Integer> source = Flowable.just(1);
@@ -916,7 +914,6 @@ public String apply(Object[] args) {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void firstJustError() {
         TestSubscriber<Integer> ts = TestSubscriber.create();
@@ -936,7 +933,6 @@ public Integer apply(Object[] args) {
         ts.assertNotComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void secondJustError() {
         TestSubscriber<Integer> ts = TestSubscriber.create();
@@ -956,7 +952,6 @@ public Integer apply(Object[] args) {
         ts.assertNotComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void oneErrors() {
         TestSubscriber<Integer> ts = TestSubscriber.create();
@@ -976,7 +971,6 @@ public Integer apply(Object[] args) {
         ts.assertNotComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void twoErrors() {
         TestSubscriber<Integer> ts = TestSubscriber.create();
@@ -996,7 +990,6 @@ public Integer apply(Object[] args) {
         ts.assertNotComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bothError() {
         TestSubscriber<Integer> ts = TestSubscriber.create();
@@ -1140,7 +1133,6 @@ public Object apply(Object[] a) throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void combineLatestDelayErrorIterableOfSources() {
 
         Flowable.combineLatestDelayError(Arrays.asList(
@@ -1156,7 +1148,6 @@ public Object apply(Object[] a) throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void combineLatestDelayErrorIterableOfSourcesWithError() {
 
         Flowable.combineLatestDelayError(Arrays.asList(
@@ -1366,7 +1357,6 @@ public Object apply(Object a, Object b) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void dontSubscribeIfDone2() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -1400,7 +1390,6 @@ public Object apply(Object[] a) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void combine2Flowable2Errors() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -1534,7 +1523,6 @@ public Integer apply(Integer t1, Integer t2) throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void syncFirstErrorsAfterItemDelayError() {
         Flowable.combineLatestDelayError(Arrays.asList(
                     Flowable.just(21).concatWith(Flowable.<Integer>error(new TestException())),
@@ -1552,7 +1540,6 @@ public Object apply(Object[] a) throws Exception {
         .assertFailure(TestException.class, 42);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void publishersInIterable() {
         Publisher<Integer> source = new Publisher<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
index 0543eb1b0f..22e23a4391 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
@@ -252,7 +252,6 @@ public void concatDelayErrorFlowableError() {
         assertTrue(cex.get(2).toString(), cex.get(2) instanceof TestException);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatDelayErrorIterable() {
         TestSubscriber<Integer> ts = TestSubscriber.create();
@@ -266,7 +265,6 @@ public void concatDelayErrorIterable() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatDelayErrorIterableError() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
index 5c052d616c..9289288ccc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
@@ -298,7 +298,6 @@ public void simple2() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness2() {
         final AtomicInteger count = new AtomicInteger();
@@ -323,7 +322,6 @@ public void accept(Integer t) {
         tsBp.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness3() {
         final AtomicInteger count = new AtomicInteger();
@@ -348,7 +346,6 @@ public void accept(Integer t) {
         tsBp.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness4() {
         final AtomicInteger count = new AtomicInteger();
@@ -373,7 +370,6 @@ public void accept(Integer t) {
         tsBp.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness5() {
         final AtomicInteger count = new AtomicInteger();
@@ -398,7 +394,6 @@ public void accept(Integer t) {
         tsBp.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness6() {
         final AtomicInteger count = new AtomicInteger();
@@ -423,7 +418,6 @@ public void accept(Integer t) {
         tsBp.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness7() {
         final AtomicInteger count = new AtomicInteger();
@@ -448,7 +442,6 @@ public void accept(Integer t) {
         tsBp.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness8() {
         final AtomicInteger count = new AtomicInteger();
@@ -473,7 +466,6 @@ public void accept(Integer t) {
         tsBp.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness9() {
         final AtomicInteger count = new AtomicInteger();
@@ -507,7 +499,6 @@ public void mainError() {
         ts.assertNotComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void innerError() {
         Flowable.concatArrayEager(Flowable.just(1), Flowable.error(new TestException())).subscribe(ts);
@@ -517,7 +508,6 @@ public void innerError() {
         ts.assertNotComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void innerEmpty() {
         Flowable.concatArrayEager(Flowable.empty(), Flowable.empty()).subscribe(ts);
@@ -552,7 +542,6 @@ public void invalidCapacityHint() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void backpressure() {
         Flowable.concatArrayEager(Flowable.just(1), Flowable.just(1)).subscribe(tsBp);
 
@@ -662,7 +651,6 @@ public void accept(long reqCount) {
         Assert.assertEquals(1, (long) requests.get(5));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void capacityHint() {
         Flowable<Integer> source = Flowable.just(1);
@@ -699,7 +687,6 @@ public void flowableCapacityHint() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void badCapacityHint() throws Exception {
         Flowable<Integer> source = Flowable.just(1);
@@ -730,7 +717,6 @@ public void concatEagerZero() {
         .assertResult();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatEagerOne() {
         Flowable.concatEager(Arrays.asList(Flowable.just(1)))
@@ -738,7 +724,6 @@ public void concatEagerOne() {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatEagerTwo() {
         Flowable.concatEager(Arrays.asList(Flowable.just(1), Flowable.just(2)))
@@ -770,7 +755,6 @@ public void ObservableCapacityHint() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatEagerIterable() {
         Flowable.concatEager(Arrays.asList(Flowable.just(1), Flowable.just(2)))
@@ -1193,7 +1177,6 @@ public void arrayDelayErrorDefault() {
         PublishProcessor<Integer> pp2 = PublishProcessor.create();
         PublishProcessor<Integer> pp3 = PublishProcessor.create();
 
-        @SuppressWarnings("unchecked")
         TestSubscriber<Integer> ts = Flowable.concatArrayEagerDelayError(pp1, pp2, pp3)
         .test();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
index 67451d6097..208f7b1b51 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
@@ -283,7 +283,7 @@ public void blockedObservableOfObservables() {
         final Flowable<String> even = Flowable.fromArray(e);
         final CountDownLatch callOnce = new CountDownLatch(1);
         final CountDownLatch okToContinue = new CountDownLatch(1);
-        @SuppressWarnings("unchecked")
+
         TestObservable<Flowable<String>> observableOfObservables = new TestObservable<>(callOnce, okToContinue, odds, even);
         Flowable<String> concatF = Flowable.concat(Flowable.unsafeCreate(observableOfObservables));
         concatF.subscribe(subscriber);
@@ -322,7 +322,6 @@ public void concatConcurrentWithInfinity() {
 
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
 
-        @SuppressWarnings("unchecked")
         TestObservable<Flowable<String>> observableOfObservables = new TestObservable<>(Flowable.unsafeCreate(w1), Flowable.unsafeCreate(w2));
         Flowable<String> concatF = Flowable.concat(Flowable.unsafeCreate(observableOfObservables));
 
@@ -450,7 +449,6 @@ public void concatUnsubscribeConcurrent() {
         Subscriber<String> subscriber = TestHelper.mockSubscriber();
         TestSubscriber<String> ts = new TestSubscriber<>(subscriber, 0L);
 
-        @SuppressWarnings("unchecked")
         TestObservable<Flowable<String>> observableOfObservables = new TestObservable<>(Flowable.unsafeCreate(w1), Flowable.unsafeCreate(w2));
         Flowable<String> concatF = Flowable.concat(Flowable.unsafeCreate(observableOfObservables));
 
@@ -506,10 +504,12 @@ public void cancel() {
         private final T seed;
         private final int size;
 
+        @SafeVarargs
         TestObservable(T... values) {
             this(null, null, values);
         }
 
+        @SafeVarargs
         TestObservable(CountDownLatch once, CountDownLatch okToContinue, T... values) {
             this.values = Arrays.asList(values);
             this.size = this.values.size();
@@ -1055,7 +1055,6 @@ public void concat4() {
         .assertResult(1, 1, 1, 1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayDelayError() {
         Flowable.concatArrayDelayError(Flowable.just(1), Flowable.just(2),
@@ -1064,7 +1063,6 @@ public void concatArrayDelayError() {
         .assertResult(1, 2, 3, 4);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayDelayErrorWithError() {
         Flowable.concatArrayDelayError(Flowable.just(1), Flowable.just(2),
@@ -1074,7 +1072,6 @@ public void concatArrayDelayErrorWithError() {
         .assertFailure(TestException.class, 1, 2, 3, 4);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatIterableDelayError() {
         Flowable.concatDelayError(
@@ -1084,7 +1081,6 @@ public void concatIterableDelayError() {
         .assertResult(1, 2, 3, 4);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatIterableDelayErrorWithError() {
         Flowable.concatDelayError(
@@ -1163,13 +1159,11 @@ public Iterable<Integer> apply(Integer v) throws Exception {
         .assertResult(1, 2, 3, 4, 5, 1, 2, 3, 4, 5);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void emptyArray() {
         assertSame(Flowable.empty(), Flowable.concatArrayDelayError());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleElementArray() {
         assertSame(Flowable.never(), Flowable.concatArrayDelayError(Flowable.never()));
@@ -1200,13 +1194,11 @@ public Flowable<Integer> apply(Object v) throws Exception {
 
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayEmpty() {
         assertSame(Flowable.empty(), Flowable.concatArray());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArraySingleElement() {
         assertSame(Flowable.never(), Flowable.concatArray(Flowable.never()));
@@ -1537,7 +1529,6 @@ public Publisher<Object> apply(Integer v) throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscription() {
         final int[] calls = { 0 };
@@ -1558,7 +1549,6 @@ public void subscribe(FlowableEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscriptionDelayError() {
         final int[] calls = { 0 };
@@ -1579,7 +1569,6 @@ public void subscribe(FlowableEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscriptionIterable() {
         final int[] calls = { 0 };
@@ -1600,7 +1589,6 @@ public void subscribe(FlowableEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscriptionDelayErrorIterable() {
         final int[] calls = { 0 };
@@ -1621,7 +1609,6 @@ public void subscribe(FlowableEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCancelPreviousArray() {
         final AtomicInteger counter = new AtomicInteger();
@@ -1640,7 +1627,6 @@ public void run() throws Exception {
         assertEquals(0, counter.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCancelPreviousIterable() {
         final AtomicInteger counter = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index a14372b959..f20f0ae0c7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -2390,7 +2390,6 @@ public Publisher<Integer> apply(GroupedFlowable<Integer, Integer> g) {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void valueSelectorCrashAndMissingBackpressure() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
index 7a528e8cb2..118f249091 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
@@ -544,7 +544,6 @@ public void mergeIterable() {
         verify(stringSubscriber, times(2)).onNext("hello");
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void iterableMaxConcurrent() {
         TestSubscriber<Integer> ts = TestSubscriber.create();
@@ -571,7 +570,6 @@ public void iterableMaxConcurrent() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void iterableMaxConcurrentError() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
@@ -632,7 +630,6 @@ public void mergeArrayDelayError() {
         .assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterableDelayErrorWithError() {
         Flowable.mergeDelayError(
@@ -678,7 +675,6 @@ public void mergeDelayErrorWithErrorMaxConcurrency() {
         .assertFailure(TestException.class, 1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterableDelayErrorMaxConcurrency() {
         Flowable.mergeDelayError(
@@ -688,7 +684,6 @@ public void mergeIterableDelayErrorMaxConcurrency() {
         .assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterableDelayErrorWithErrorMaxConcurrency() {
         Flowable.mergeDelayError(
@@ -720,7 +715,6 @@ public void mergeDelayError3WithError() {
         .assertFailure(TestException.class, 1, 2, 3);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterableDelayError() {
         Flowable.mergeDelayError(Arrays.asList(Flowable.just(1), Flowable.just(2)))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
index 6b3f72e2f9..19d0ac86a0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
@@ -1343,7 +1343,6 @@ public void onNext(Integer t) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void negativeMaxConcurrent() {
         try {
@@ -1354,7 +1353,6 @@ public void negativeMaxConcurrent() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void zeroMaxConcurrent() {
         try {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
index ec7c88da09..0dffd13798 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
@@ -1368,7 +1368,6 @@ public void badRequest() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void splitCombineSubscriberChangeAfterOnNext() {
         Flowable<Integer> source = Flowable.range(0, 20)
         .doOnSubscribe(new Consumer<Subscription>() {
@@ -1436,7 +1435,6 @@ public boolean test(List<Integer> v) throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void splitCombineSubscriberChangeAfterOnNextFused() {
         Flowable<Integer> source = Flowable.range(0, 20)
         .publish(10)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
index 496bce4a38..4153c92a22 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
@@ -129,7 +129,6 @@ public void dispose() {
         TestHelper.checkDisposed(Flowable.just(1).timeInterval());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error() {
         Flowable.error(new TestException())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
index 73d1455d5b..cad29e3fc8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
@@ -113,7 +113,6 @@ public void backpressureHonoredFlowable() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void capacityHintFlowable() {
         Flowable.range(1, 10)
@@ -182,7 +181,6 @@ static void await(CyclicBarrier cb) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void capacityHint() {
         Flowable.range(1, 10)
@@ -198,7 +196,6 @@ public void dispose() {
         TestHelper.checkDisposed(Flowable.just(1).toList());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error() {
         Flowable.error(new TestException())
@@ -208,7 +205,6 @@ public void error() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorSingle() {
         Flowable.error(new TestException())
@@ -217,7 +213,6 @@ public void errorSingle() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void collectionSupplierThrows() {
         Flowable.just(1)
@@ -232,7 +227,6 @@ public Collection<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void collectionSupplierReturnsNull() {
         Flowable.just(1)
@@ -248,7 +242,6 @@ public Collection<Integer> get() throws Exception {
         .assertErrorMessage(ExceptionHelper.nullWarning("The collectionSupplier returned a null Collection."));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleCollectionSupplierThrows() {
         Flowable.just(1)
@@ -262,7 +255,6 @@ public Collection<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleCollectionSupplierReturnsNull() {
         Flowable.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
index 6012db0add..5c7278da54 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
@@ -112,7 +112,6 @@ public int compare(Integer a, Integer b) {
         .assertResult(5, 4, 3, 2, 1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void toSortedListCapacityFlowable() {
         Flowable.just(5, 1, 2, 4, 3).toSortedList(4).toFlowable()
@@ -120,7 +119,6 @@ public void toSortedListCapacityFlowable() {
         .assertResult(Arrays.asList(1, 2, 3, 4, 5));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void toSortedListComparatorCapacityFlowable() {
         Flowable.just(5, 1, 2, 4, 3).toSortedList(new Comparator<Integer>() {
@@ -178,7 +176,6 @@ static void await(CyclicBarrier cb) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void toSortedListCapacity() {
         Flowable.just(5, 1, 2, 4, 3).toSortedList(4)
@@ -186,7 +183,6 @@ public void toSortedListCapacity() {
         .assertResult(Arrays.asList(1, 2, 3, 4, 5));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void toSortedListComparatorCapacity() {
         Flowable.just(5, 1, 2, 4, 3).toSortedList(new Comparator<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
index c17e2ccfae..66273656f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
@@ -328,7 +328,6 @@ public Flowable<Object> apply(Flowable<Object> v) throws Exception {
         }, false, 1, 1, 1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void boundaryDirectMissingBackpressure() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -344,7 +343,6 @@ public void boundaryDirectMissingBackpressure() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void boundaryDirectMissingBackpressureNoNullPointerException() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
index e9a7c77518..fbefcc953e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
@@ -290,7 +290,6 @@ public Flowable<Integer> apply(Flowable<Integer> w) {
         ts.assertValueCount(22);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void backpressureOuterInexact() {
         TestSubscriber<List<Integer>> ts = new TestSubscriber<>(0L);
@@ -364,7 +363,6 @@ public Flowable<Flowable<Object>> apply(Flowable<Object> f) throws Exception {
         });
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorExact() {
         Flowable.error(new TestException())
@@ -373,7 +371,6 @@ public void errorExact() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorSkip() {
         Flowable.error(new TestException())
@@ -382,7 +379,6 @@ public void errorSkip() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorOverlap() {
         Flowable.error(new TestException())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
index 55db25f654..023f6848d5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
@@ -434,7 +434,6 @@ public void accept(Flowable<Integer> w) throws Throwable {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void mainWindowMissingBackpressure() {
         PublishProcessor<Integer> source = PublishProcessor.create();
         PublishProcessor<Integer> boundary = PublishProcessor.create();
@@ -515,7 +514,6 @@ public void accept(Flowable<Integer> v) throws Throwable {
         inner.get().test().assertResult();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void closingIndicatorFunctionCrash() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
index 86da1bb09c..e3d9466b3e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
@@ -434,7 +434,6 @@ public void skipOnError() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void exactBackpressure() {
         TestScheduler scheduler = new TestScheduler();
 
@@ -449,7 +448,6 @@ public void exactBackpressure() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void skipBackpressure() {
         TestScheduler scheduler = new TestScheduler();
 
@@ -464,7 +462,6 @@ public void skipBackpressure() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void overlapBackpressure() {
         TestScheduler scheduler = new TestScheduler();
 
@@ -866,7 +863,6 @@ public Publisher<Flowable<Object>> apply(Flowable<Object> f)
         });
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void firstWindowMissingBackpressure() {
         Flowable.never()
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
index 544ca11bc6..655452057b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
@@ -704,7 +704,6 @@ public Object apply(Integer a, Integer b) throws Exception {
         .assertFailure(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void combineToNull2() {
         Flowable.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
index d40b3908c9..e4b41c8bea 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
@@ -1422,7 +1422,6 @@ public Object apply(Integer a, Integer b) throws Exception {
         .assertResult("929");
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void zipArrayEmpty() {
         assertSame(Flowable.empty(), Flowable.zipArray(Functions.<Object[]>identity(), false, 16));
@@ -1897,7 +1896,6 @@ public Object apply(Object[] a) throws Exception {
         assertEquals(0, counter.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void publishersInIterable() {
         Publisher<Integer> source = new Publisher<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
index af49d5353b..dec723d651 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
@@ -50,7 +50,6 @@ public void ambLots() {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambFirstDone() {
         Maybe.amb(Arrays.asList(Maybe.just(1), Maybe.just(2)))
@@ -58,7 +57,6 @@ public void ambFirstDone() {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void dispose() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -76,7 +74,6 @@ public void dispose() {
         assertFalse(pp2.hasSubscribers());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void innerErrorRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -255,7 +252,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void maybeSourcesInIterable() {
         MaybeSource<Integer> source = new MaybeSource<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
index c693e0296a..7450dc993b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
@@ -29,7 +29,6 @@
 
 public class MaybeConcatIterableTest extends RxJavaTest {
 
-    @SuppressWarnings("unchecked")
     @Test
     public void take() {
         Maybe.concat(Arrays.asList(Maybe.just(1), Maybe.just(2), Maybe.just(3)))
@@ -50,7 +49,6 @@ public Iterator<MaybeSource<Object>> iterator() {
         .assertFailureAndMessage(TestException.class, "iterator()");
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error() {
         Maybe.concat(Arrays.asList(Maybe.just(1), Maybe.<Integer>error(new TestException()), Maybe.just(3)))
@@ -58,7 +56,6 @@ public void error() {
         .assertFailure(TestException.class, 1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void successCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -124,7 +121,6 @@ public Maybe<Integer> apply(Integer v) throws Exception {
         .assertFailure(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscription() {
         final int[] calls = { 0 };
@@ -144,7 +140,6 @@ public void subscribe(MaybeEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscriptionDelayError() {
         final int[] calls = { 0 };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java
index 57a0ed11ae..57a478d112 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java
@@ -24,7 +24,6 @@
 public class MaybeMaterializeTest extends RxJavaTest {
 
     @Test
-    @SuppressWarnings("unchecked")
     public void success() {
         Maybe.just(1)
         .materialize()
@@ -33,7 +32,6 @@ public void success() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void error() {
         TestException ex = new TestException();
         Maybe.error(ex)
@@ -43,7 +41,6 @@ public void error() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void empty() {
         Maybe.empty()
         .materialize()
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
index e7d5e4b31b..f3a9b9345c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
@@ -66,7 +66,6 @@ public void onErrorCompleteFalse() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void onErrorReturnFunctionThrows() {
         TestHelper.assertCompositeExceptions(Maybe.error(new TestException())
@@ -79,7 +78,6 @@ public Object apply(Throwable v) throws Exception {
         .to(TestHelper.testConsumer()), TestException.class, IOException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void onErrorCompletePredicateThrows() {
         TestHelper.assertCompositeExceptions(Maybe.error(new TestException())
@@ -116,7 +114,6 @@ public void onExceptionResumeNextPassthrough() {
         .assertFailure(AssertionError.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void onErrorResumeNextFunctionThrows() {
         TestHelper.assertCompositeExceptions(Maybe.error(new TestException())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
index f06be6be57..aae11b288e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
@@ -38,7 +38,6 @@ public Object apply(Object[] a) throws Exception {
         }
     };
 
-    @SuppressWarnings("unchecked")
     @Test
     public void firstError() {
         Maybe.zip(Arrays.asList(Maybe.error(new TestException()), Maybe.just(1)), addString)
@@ -46,7 +45,6 @@ public void firstError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void secondError() {
         Maybe.zip(Arrays.asList(Maybe.just(1), Maybe.<Integer>error(new TestException())), addString)
@@ -54,7 +52,6 @@ public void secondError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void dispose() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
@@ -69,7 +66,6 @@ public void dispose() {
         assertFalse(pp.hasSubscribers());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void zipperThrows() {
         Maybe.zip(Arrays.asList(Maybe.just(1), Maybe.just(2)), new Function<Object[], Object>() {
@@ -82,7 +78,6 @@ public Object apply(Object[] b) throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void zipperReturnsNull() {
         Maybe.zip(Arrays.asList(Maybe.just(1), Maybe.just(2)), new Function<Object[], Object>() {
@@ -95,7 +90,6 @@ public Object apply(Object[] a) throws Exception {
         .assertFailure(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void middleError() {
         PublishProcessor<Integer> pp0 = PublishProcessor.create();
@@ -112,7 +106,6 @@ public void middleError() {
         to.assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void innerErrorRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -190,7 +183,6 @@ public Maybe<Integer> apply(Integer v) throws Exception {
         .assertFailureAndMessage(TestException.class, "next()");
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableOneIsNull() {
         Maybe.zip(Arrays.asList(null, Maybe.just(1)), new Function<Object[], Object>() {
@@ -202,7 +194,6 @@ public Object apply(Object[] v) {
         .blockingGet();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableTwoIsNull() {
         Maybe.zip(Arrays.asList(Maybe.just(1), null), new Function<Object[], Object>() {
@@ -222,7 +213,6 @@ public void singleSourceZipperReturnsNull() {
         .assertFailureAndMessage(NullPointerException.class, "The zipper returned a null value");
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void maybeSourcesInIterable() {
         MaybeSource<Integer> source = new MaybeSource<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
index 239d8339ea..4e8cbd34b6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
@@ -374,7 +374,6 @@ public void ambWithOrder() {
         Observable.just(1).ambWith(error).test().assertValue(1).assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableOrder() {
         Observable<Integer> error = Observable.error(new RuntimeException());
@@ -467,7 +466,6 @@ public void run() throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void observableSourcesInIterable() {
         ObservableSource<Integer> source = new ObservableSource<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
index eeee099b0d..af4e7a9415 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
@@ -764,7 +764,6 @@ public void onComplete() {
         assertFalse(observer.isDisposed());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimeSkipDefault() {
         Observable.range(1, 5).buffer(1, 1, TimeUnit.MINUTES)
@@ -772,7 +771,6 @@ public void bufferTimeSkipDefault() {
         .assertResult(Arrays.asList(1, 2, 3, 4, 5));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferBoundaryHint() {
         Observable.range(1, 5).buffer(Observable.timer(1, TimeUnit.MINUTES), 2)
@@ -784,7 +782,6 @@ static HashSet<Integer> set(Integer... values) {
         return new HashSet<>(Arrays.asList(values));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferIntoCustomCollection() {
         Observable.just(1, 1, 2, 2, 3, 3, 4, 4)
@@ -798,7 +795,6 @@ public Collection<Integer> get() throws Exception {
         .assertResult(set(1, 2), set(2, 3), set(4));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSkipIntoCustomCollection() {
         Observable.just(1, 1, 2, 2, 3, 3, 4, 4)
@@ -813,7 +809,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows() {
         Observable.just(1)
         .buffer(1, TimeUnit.SECONDS, Schedulers.single(), Integer.MAX_VALUE, new Supplier<Collection<Integer>>() {
@@ -827,7 +822,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows2() {
         Observable.just(1)
         .buffer(1, TimeUnit.SECONDS, Schedulers.single(), 10, new Supplier<Collection<Integer>>() {
@@ -841,7 +835,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows3() {
         Observable.just(1)
         .buffer(2, 1, TimeUnit.SECONDS, Schedulers.single(), new Supplier<Collection<Integer>>() {
@@ -855,7 +848,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows4() {
         Observable.<Integer>never()
         .buffer(1, TimeUnit.MILLISECONDS, Schedulers.single(), Integer.MAX_VALUE, new Supplier<Collection<Integer>>() {
@@ -875,7 +867,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows5() {
         Observable.<Integer>never()
         .buffer(1, TimeUnit.MILLISECONDS, Schedulers.single(), 10, new Supplier<Collection<Integer>>() {
@@ -895,7 +886,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierThrows6() {
         Observable.<Integer>never()
         .buffer(2, 1, TimeUnit.MILLISECONDS, Schedulers.single(), new Supplier<Collection<Integer>>() {
@@ -915,7 +905,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierReturnsNull() {
         Observable.<Integer>never()
         .buffer(1, TimeUnit.MILLISECONDS, Schedulers.single(), Integer.MAX_VALUE, new Supplier<Collection<Integer>>() {
@@ -935,7 +924,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierReturnsNull2() {
         Observable.<Integer>never()
         .buffer(1, TimeUnit.MILLISECONDS, Schedulers.single(), 10, new Supplier<Collection<Integer>>() {
@@ -955,7 +943,6 @@ public Collection<Integer> get() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void supplierReturnsNull3() {
         Observable.<Integer>never()
         .buffer(2, 1, TimeUnit.MILLISECONDS, Schedulers.single(), new Supplier<Collection<Integer>>() {
@@ -996,7 +983,6 @@ public void dispose() {
         TestHelper.checkDisposed(PublishSubject.create().buffer(Observable.never(), Functions.justFunction(Observable.never())));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void restartTimer() {
         Observable.range(1, 5)
@@ -1005,7 +991,6 @@ public void restartTimer() {
         .assertResult(Arrays.asList(1, 2), Arrays.asList(3, 4), Arrays.asList(5));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSupplierCrash2() {
         Observable.range(1, 2)
@@ -1023,7 +1008,6 @@ public List<Integer> get() throws Exception {
         .assertFailure(TestException.class, Arrays.asList(1));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSkipSupplierCrash2() {
         Observable.range(1, 2)
@@ -1041,7 +1025,6 @@ public List<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSkipError() {
         Observable.<Integer>error(new TestException())
@@ -1050,7 +1033,6 @@ public void bufferSkipError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferSkipOverlap() {
         Observable.range(1, 5)
@@ -1065,7 +1047,6 @@ public void bufferSkipOverlap() {
         );
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedExactError() {
         Observable.error(new TestException())
@@ -1074,7 +1055,6 @@ public void bufferTimedExactError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedSkipError() {
         Observable.error(new TestException())
@@ -1083,7 +1063,6 @@ public void bufferTimedSkipError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedOverlapError() {
         Observable.error(new TestException())
@@ -1092,7 +1071,6 @@ public void bufferTimedOverlapError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedExactEmpty() {
         Observable.empty()
@@ -1101,7 +1079,6 @@ public void bufferTimedExactEmpty() {
         .assertResult(Collections.emptyList());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedSkipEmpty() {
         Observable.empty()
@@ -1110,7 +1087,6 @@ public void bufferTimedSkipEmpty() {
         .assertResult(Collections.emptyList());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedOverlapEmpty() {
         Observable.empty()
@@ -1119,7 +1095,6 @@ public void bufferTimedOverlapEmpty() {
         .assertResult(Collections.emptyList());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedExactSupplierCrash() {
         TestScheduler scheduler = new TestScheduler();
@@ -1149,7 +1124,6 @@ public List<Integer> get() throws Exception {
         .assertFailure(TestException.class, Arrays.asList(1));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferTimedExactBoundedError() {
         TestScheduler scheduler = new TestScheduler();
@@ -1207,7 +1181,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCompletionCancelExact() {
         final AtomicInteger counter = new AtomicInteger();
@@ -1227,7 +1200,6 @@ public void run() throws Exception {
         assertEquals(0, counter.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCompletionCancelSkip() {
         final AtomicInteger counter = new AtomicInteger();
@@ -1247,7 +1219,6 @@ public void run() throws Exception {
         assertEquals(0, counter.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCompletionCancelOverlap() {
         final AtomicInteger counter = new AtomicInteger();
@@ -1268,7 +1239,6 @@ public void run() throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void boundaryOpenCloseDisposedOnComplete() {
         PublishSubject<Integer> source = PublishSubject.create();
 
@@ -1344,7 +1314,6 @@ public Observable<?> apply(Long a) {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openClosemainError() {
         Observable.error(new TestException())
         .buffer(Observable.never(), Functions.justFunction(Observable.never()))
@@ -1353,7 +1322,6 @@ public void openClosemainError() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openClosebadSource() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -1391,7 +1359,6 @@ protected void subscribeActual(Observer<? super Object> observer) {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseOpenCompletes() {
         PublishSubject<Integer> source = PublishSubject.create();
 
@@ -1420,7 +1387,6 @@ public void openCloseOpenCompletes() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseOpenCompletesNoBuffers() {
         PublishSubject<Integer> source = PublishSubject.create();
 
@@ -1449,7 +1415,6 @@ public void openCloseOpenCompletesNoBuffers() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseTake() {
         PublishSubject<Integer> source = PublishSubject.create();
 
@@ -1473,7 +1438,6 @@ public void openCloseTake() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseBadOpen() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -1517,7 +1481,6 @@ protected void subscribeActual(Observer<? super Object> observer) {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void openCloseBadClose() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -1574,7 +1537,6 @@ public ObservableSource<List<Object>> apply(Observable<Object> f)
         );
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferExactBoundarySecondBufferCrash() {
         PublishSubject<Integer> ps = PublishSubject.create();
@@ -1596,7 +1558,6 @@ public List<Integer> get() throws Exception {
         to.assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void bufferExactBoundaryBadSource() {
         Observable<Integer> ps = new Observable<Integer>() {
@@ -1814,7 +1775,6 @@ public ObservableSource<List<Object>> apply(Observable<Object> o)
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void bufferExactFailingSupplier() {
         Observable.empty()
                 .buffer(1, TimeUnit.SECONDS, Schedulers.computation(), 10, new Supplier<List<Object>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
index d28bd20e97..0568b0d474 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
@@ -142,7 +142,6 @@ public void accept(Object o, Integer t) {
         assertFalse(added.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void collectIntoObservable() {
         Observable.just(1, 1, 1, 1, 2)
@@ -266,7 +265,6 @@ public void accept(Object o, Integer t) {
         assertFalse(added.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void collectInto() {
         Observable.just(1, 1, 1, 1, 2)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
index c5f93d4222..3096cdabd7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
@@ -818,7 +818,6 @@ public Object apply(Object[] a) throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void combineLatestDelayErrorIterableOfSources() {
 
         Observable.combineLatestDelayError(Arrays.asList(
@@ -834,7 +833,6 @@ public Object apply(Object[] a) throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void combineLatestDelayErrorIterableOfSourcesWithError() {
 
         Observable.combineLatestDelayError(Arrays.asList(
@@ -1044,7 +1042,6 @@ public Object apply(Object a, Object b) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void dontSubscribeIfDone2() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -1078,7 +1075,6 @@ public Object apply(Object[] a) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void combine2Observable2Errors() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -1195,7 +1191,6 @@ public Integer apply(Integer t1, Integer t2) throws Exception {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void syncFirstErrorsAfterItemDelayError() {
         Observable.combineLatestDelayError(Arrays.asList(
                     Observable.just(21).concatWith(Observable.<Integer>error(new TestException())),
@@ -1213,7 +1208,6 @@ public Object apply(Object[] a) throws Exception {
         .assertFailure(TestException.class, 42);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void observableSourcesInIterable() {
         ObservableSource<Integer> source = new ObservableSource<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
index fe1cafe56b..6ad8b9c649 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
@@ -503,7 +503,6 @@ public void concatArrayEager() throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void capacityHint() {
         Observable<Integer> source = Observable.just(1);
@@ -540,7 +539,6 @@ public void ObservableCapacityHint() {
         to.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void badCapacityHint() throws Exception {
         Observable<Integer> source = Observable.just(1);
@@ -564,7 +562,6 @@ public void mappingBadCapacityHint() throws Exception {
 
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatEagerIterable() {
         Observable.concatEager(Arrays.asList(Observable.just(1), Observable.just(2)))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
index c5b00fdf7c..05df845a44 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
@@ -271,7 +271,7 @@ public void blockedObservableOfObservables() {
         final Observable<String> even = Observable.fromArray(e);
         final CountDownLatch callOnce = new CountDownLatch(1);
         final CountDownLatch okToContinue = new CountDownLatch(1);
-        @SuppressWarnings("unchecked")
+
         TestObservable<Observable<String>> observableOfObservables = new TestObservable<>(callOnce, okToContinue, odds, even);
         Observable<String> concatF = Observable.concat(Observable.unsafeCreate(observableOfObservables));
         concatF.subscribe(observer);
@@ -310,7 +310,6 @@ public void concatConcurrentWithInfinity() {
 
         Observer<String> observer = TestHelper.mockObserver();
 
-        @SuppressWarnings("unchecked")
         TestObservable<Observable<String>> observableOfObservables = new TestObservable<>(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2));
         Observable<String> concatF = Observable.concat(Observable.unsafeCreate(observableOfObservables));
 
@@ -438,7 +437,6 @@ public void concatUnsubscribeConcurrent() {
         Observer<String> observer = TestHelper.mockObserver();
         TestObserver<String> to = new TestObserver<>(observer);
 
-        @SuppressWarnings("unchecked")
         TestObservable<Observable<String>> observableOfObservables = new TestObservable<>(Observable.unsafeCreate(w1), Observable.unsafeCreate(w2));
         Observable<String> concatF = Observable.concat(Observable.unsafeCreate(observableOfObservables));
 
@@ -493,10 +491,12 @@ public boolean isDisposed() {
         private final T seed;
         private final int size;
 
+        @SafeVarargs
         TestObservable(T... values) {
             this(null, null, values);
         }
 
+        @SafeVarargs
         TestObservable(CountDownLatch once, CountDownLatch okToContinue, T... values) {
             this.values = Arrays.asList(values);
             this.size = this.values.size();
@@ -799,7 +799,6 @@ public void concatArrayDelayErrorWithError() {
         .assertFailure(TestException.class, 1, 2, 3, 4);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatIterableDelayError() {
         Observable.concatDelayError(
@@ -809,7 +808,6 @@ public void concatIterableDelayError() {
         .assertResult(1, 2, 3, 4);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatIterableDelayErrorWithError() {
         Observable.concatDelayError(
@@ -1004,7 +1002,6 @@ public void subscribe(ObservableEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscriptionIterable() {
         final int[] calls = { 0 };
@@ -1025,7 +1022,6 @@ public void subscribe(ObservableEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscriptionDelayErrorIterable() {
         final int[] calls = { 0 };
@@ -1179,7 +1175,6 @@ public void run() throws Exception {
         assertEquals(0, counter.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCancelPreviousIterable() {
         final AtomicInteger counter = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
index db6450d097..c4d24a69c7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
@@ -499,7 +499,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterableDelayError() {
         Observable.mergeDelayError(Arrays.asList(Observable.just(1), Observable.just(2)))
@@ -515,7 +514,6 @@ public void mergeArrayDelayError() {
         .assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterableDelayErrorWithError() {
         Observable.mergeDelayError(
@@ -561,7 +559,6 @@ public void mergeDelayErrorWithErrorMaxConcurrency() {
         .assertFailure(TestException.class, 1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterableDelayErrorMaxConcurrency() {
         Observable.mergeDelayError(
@@ -571,7 +568,6 @@ public void mergeIterableDelayErrorMaxConcurrency() {
         .assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterableDelayErrorWithErrorMaxConcurrency() {
         Observable.mergeDelayError(
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
index 3b849ab978..5f935791b1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
@@ -128,7 +128,6 @@ public void dispose() {
         TestHelper.checkDisposed(Observable.just(1).timeInterval());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error() {
         Observable.error(new TestException())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java
index 1981c2b5af..020183f9fa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java
@@ -85,7 +85,6 @@ public void listWithBlockingFirstObservable() {
         Assert.assertEquals(Arrays.asList("one", "two", "three"), actual);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void capacityHintObservable() {
         Observable.range(1, 10)
@@ -154,7 +153,6 @@ static void await(CyclicBarrier cb) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void capacityHint() {
         Observable.range(1, 10)
@@ -170,7 +168,6 @@ public void dispose() {
         TestHelper.checkDisposed(Observable.just(1).toList());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error() {
         Observable.error(new TestException())
@@ -180,7 +177,6 @@ public void error() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorSingle() {
         Observable.error(new TestException())
@@ -189,7 +185,6 @@ public void errorSingle() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void collectionSupplierThrows() {
         Observable.just(1)
@@ -204,7 +199,6 @@ public Collection<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void collectionSupplierReturnsNull() {
         Observable.just(1)
@@ -220,7 +214,6 @@ public Collection<Integer> get() throws Exception {
         .assertErrorMessage(ExceptionHelper.nullWarning("The collectionSupplier returned a null Collection."));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleCollectionSupplierThrows() {
         Observable.just(1)
@@ -234,7 +227,6 @@ public Collection<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleCollectionSupplierReturnsNull() {
         Observable.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java
index 7d01bcc3b1..19c10c6622 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java
@@ -96,7 +96,6 @@ public int compare(Integer a, Integer b) {
         .assertResult(5, 4, 3, 2, 1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void toSortedListCapacityObservable() {
         Observable.just(5, 1, 2, 4, 3).toSortedList(4).toObservable()
@@ -104,7 +103,6 @@ public void toSortedListCapacityObservable() {
         .assertResult(Arrays.asList(1, 2, 3, 4, 5));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void toSortedListComparatorCapacityObservable() {
         Observable.just(5, 1, 2, 4, 3).toSortedList(new Comparator<Integer>() {
@@ -152,7 +150,6 @@ public void withFollowingFirst() {
         assertEquals(Arrays.asList(1, 2, 3, 4, 5), o.toSortedList().blockingGet());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void toSortedListCapacity() {
         Observable.just(5, 1, 2, 4, 3).toSortedList(4)
@@ -160,7 +157,6 @@ public void toSortedListCapacity() {
         .assertResult(Arrays.asList(1, 2, 3, 4, 5));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void toSortedListComparatorCapacity() {
         Observable.just(5, 1, 2, 4, 3).toSortedList(new Comparator<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
index a897430ab7..04099c31cb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
@@ -293,7 +293,6 @@ public ObservableSource<Observable<Object>> apply(Observable<Object> o) throws E
         });
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorExact() {
         Observable.error(new TestException())
@@ -302,7 +301,6 @@ public void errorExact() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorSkip() {
         Observable.error(new TestException())
@@ -311,7 +309,6 @@ public void errorSkip() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorOverlap() {
         Observable.error(new TestException())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
index 0c7dc8056b..af67c36bf2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
@@ -498,7 +498,6 @@ public void accept(Observable<Integer> v) throws Throwable {
         inner.get().test().assertResult();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void closingIndicatorFunctionCrash() {
 
@@ -524,7 +523,6 @@ public Observable<Object> apply(Integer end) throws Throwable {
         assertFalse(boundary.hasObservers());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mainError() {
         Observable.error(new TestException())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
index a754b21b8c..c23c41fde1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
@@ -579,7 +579,6 @@ public Object apply(Integer a, Integer b) throws Exception {
         .assertFailure(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void combineToNull2() {
         Observable.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
index d8c153a285..1de6190f05 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
@@ -1430,7 +1430,6 @@ public Object apply(Object[] a) throws Exception {
         assertEquals(0, counter.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void observableSourcesInIterable() {
         ObservableSource<Integer> source = new ObservableSource<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
index a6caec6171..7faf26454e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
@@ -71,7 +71,6 @@ public void ambWithSecondFires() {
         to.assertResult(2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableWithFirstFires() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -93,7 +92,6 @@ public void ambIterableWithFirstFires() {
 
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableWithSecondFires() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -272,7 +270,6 @@ public void ambWithOrder() {
         Single.just(1).ambWith(error).test().assertValue(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableOrder() {
         Single<Integer> error = Single.error(new RuntimeException());
@@ -343,7 +340,6 @@ public void accept(Object v, Throwable e) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleSourcesInIterable() {
         SingleSource<Integer> source = new SingleSource<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
index eebe0c1020..348810be1f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
@@ -89,7 +89,6 @@ public void concatArrayEagerTest() {
         ts.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatEagerIterableTest() {
         PublishProcessor<String> pp1 = PublishProcessor.create();
@@ -163,7 +162,6 @@ public void subscribe(SingleEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscriptionIterable() {
         final int[] calls = { 0 };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java
index 00b5f8d712..4bc05ea67d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java
@@ -24,7 +24,6 @@
 public class SingleMaterializeTest extends RxJavaTest {
 
     @Test
-    @SuppressWarnings("unchecked")
     public void success() {
         Single.just(1)
         .materialize()
@@ -33,7 +32,6 @@ public void success() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void error() {
         TestException ex = new TestException();
         Maybe.error(ex)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java
index ee991b431b..7aba476c86 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java
@@ -72,7 +72,6 @@ public void mergeErrors() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeDelayErrorIterable() {
         Single.mergeDelayError(Arrays.asList(
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
index 948972dbcb..6fd6744479 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
@@ -38,7 +38,6 @@ public Object apply(Object[] a) throws Exception {
         }
     };
 
-    @SuppressWarnings("unchecked")
     @Test
     public void firstError() {
         Single.zip(Arrays.asList(Single.error(new TestException()), Single.just(1)), addString)
@@ -46,7 +45,6 @@ public void firstError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void secondError() {
         Single.zip(Arrays.asList(Single.just(1), Single.<Integer>error(new TestException())), addString)
@@ -54,7 +52,6 @@ public void secondError() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void dispose() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
@@ -69,7 +66,6 @@ public void dispose() {
         assertFalse(pp.hasSubscribers());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void zipperThrows() {
         Single.zip(Arrays.asList(Single.just(1), Single.just(2)), new Function<Object[], Object>() {
@@ -82,7 +78,6 @@ public Object apply(Object[] b) throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void zipperReturnsNull() {
         Single.zip(Arrays.asList(Single.just(1), Single.just(2)), new Function<Object[], Object>() {
@@ -95,7 +90,6 @@ public Object apply(Object[] a) throws Exception {
         .assertFailure(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void middleError() {
         PublishProcessor<Integer> pp0 = PublishProcessor.create();
@@ -112,7 +106,6 @@ public void middleError() {
         to.assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void innerErrorRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -190,7 +183,6 @@ public Single<Integer> apply(Integer v) throws Exception {
         .assertFailureAndMessage(TestException.class, "next()");
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableOneIsNull() {
         Single.zip(Arrays.asList(null, Single.just(1)), new Function<Object[], Object>() {
@@ -202,7 +194,6 @@ public Object apply(Object[] v) {
         .blockingGet();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableTwoIsNull() {
         Single.zip(Arrays.asList(Single.just(1), null), new Function<Object[], Object>() {
@@ -238,7 +229,6 @@ public Object apply(Object[] a) throws Exception {
         .assertResult(2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleSourceZipperReturnsNull() {
         Single.zip(Arrays.asList(Single.just(1)), Functions.justFunction(null))
@@ -246,7 +236,6 @@ public void singleSourceZipperReturnsNull() {
         .assertFailureAndMessage(NullPointerException.class, "The zipper returned a null value");
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleSourcesInIterable() {
         SingleSource<Integer> source = new SingleSource<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java
index f5ae16d0bc..79380cfa5f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java
@@ -163,7 +163,6 @@ public Integer apply(Integer a, Integer b) throws Exception {
         assertEquals(0, counter.get());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noDisposeOnAllSuccess2() {
         final AtomicInteger counter = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index e4d64764d8..c3335c0bab 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -1401,7 +1401,6 @@ public void concat4() {
         .assertResult(1, 2, 3, 4);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatIterable() {
         Maybe.concat(Arrays.asList(Maybe.just(1), Maybe.just(2)))
@@ -1409,7 +1408,6 @@ public void concatIterable() {
         .assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatIterableEmpty() {
         Maybe.concat(Arrays.asList(Maybe.empty(), Maybe.empty()))
@@ -1417,7 +1415,6 @@ public void concatIterableEmpty() {
         .assertResult();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatIterableBackpressured() {
         TestSubscriber<Integer> ts = Maybe.concat(Arrays.asList(Maybe.just(1), Maybe.just(2)))
@@ -1434,7 +1431,6 @@ public void concatIterableBackpressured() {
         ts.assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatIterableBackpressuredNonEager() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1624,7 +1620,6 @@ public void ambWithOrder() {
         Maybe.just(1).ambWith(error).test().assertValue(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableOrder() {
         Maybe<Integer> error = Maybe.error(new RuntimeException());
@@ -1772,7 +1767,6 @@ public void ambArray2SignalsComplete() {
         to.assertResult();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable1SignalsSuccess() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1795,7 +1789,6 @@ public void ambIterable1SignalsSuccess() {
         to.assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable2SignalsSuccess() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1818,7 +1811,6 @@ public void ambIterable2SignalsSuccess() {
         to.assertResult(2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable2SignalsSuccessWithOverlap() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1842,7 +1834,6 @@ public void ambIterable2SignalsSuccessWithOverlap() {
         to.assertResult(2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable1SignalsError() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1864,7 +1855,6 @@ public void ambIterable1SignalsError() {
         to.assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable2SignalsError() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1886,7 +1876,6 @@ public void ambIterable2SignalsError() {
         to.assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable2SignalsErrorWithOverlap() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1909,7 +1898,6 @@ public void ambIterable2SignalsErrorWithOverlap() {
         to.assertFailureAndMessage(TestException.class, "2");
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable1SignalsComplete() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1931,7 +1919,6 @@ public void ambIterable1SignalsComplete() {
         to.assertResult();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterable2SignalsComplete() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1968,7 +1955,6 @@ public Iterator<Maybe<Object>> iterator() {
         }).test().assertError(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableOneIsNull() {
         Maybe.amb(Arrays.asList(null, Maybe.just(1)))
@@ -2188,7 +2174,6 @@ public void mergeMaybe() {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterable() {
         Maybe.merge(Arrays.asList(Maybe.just(1), Maybe.just(2), Maybe.just(3)))
@@ -2493,7 +2478,6 @@ public void concatArrayDelayError() {
         assertFalse(Maybe.concatArrayDelayError(Maybe.never()) instanceof MaybeConcatArrayDelayError);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatIterableDelayError() {
         Maybe.concatDelayError(Arrays.asList(Maybe.empty(), Maybe.just(1), Maybe.error(new TestException())))
@@ -2539,7 +2523,6 @@ public void concatEagerArray() {
 
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatEagerIterable() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -2638,7 +2621,6 @@ public void mergeArrayDelayError() {
         assertSame(Flowable.empty(), Maybe.mergeArrayDelayError());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeIterableDelayError() {
         Maybe.mergeDelayError(Arrays.asList(Maybe.empty(), Maybe.just(1), Maybe.error(new TestException())))
@@ -2900,7 +2882,6 @@ public void zipArray() {
         .assertResult("[1]");
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void zipIterable() {
         Maybe.zip(
@@ -3048,7 +3029,6 @@ public void ambWith2SignalsSuccess() {
 
     @Test
     public void zipIterableObject() {
-        @SuppressWarnings("unchecked")
         final List<Maybe<Integer>> maybes = Arrays.asList(Maybe.just(1), Maybe.just(4));
         Maybe.zip(maybes, new Function<Object[], Object>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java
index a9d1afca12..f867a165d2 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java
@@ -62,7 +62,6 @@ public void concatWithIterableOfObservable() {
         Observable<String> o2 = Observable.just("three", "four");
         Observable<String> o3 = Observable.just("five", "six");
 
-        @SuppressWarnings("unchecked")
         Iterable<Observable<String>> is = Arrays.asList(o1, o2, o3);
 
         List<String> values = Observable.concat(Observable.fromIterable(is)).toList().blockingGet();
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
index 5e02ecc3e7..9c112b0f7d 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
@@ -66,7 +66,6 @@ public Iterator<Observable<Object>> iterator() {
         }).test().assertError(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableOneIsNull() {
         Observable.amb(Arrays.asList(Observable.never(), null))
@@ -99,7 +98,6 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableOneIsNull() {
         Observable.combineLatest(Arrays.asList(Observable.never(), null), new Function<Object[], Object>() {
@@ -110,13 +108,11 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableFunctionNull() {
         Observable.combineLatest(Arrays.asList(just1), null, 128);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableFunctionReturnsNull() {
         Observable.combineLatest(Arrays.asList(just1), new Function<Object[], Object>() {
@@ -152,7 +148,6 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableOneIsNull() {
         Observable.combineLatestDelayError(Arrays.asList(Observable.never(), null), new Function<Object[], Object>() {
@@ -163,13 +158,11 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableFunctionNull() {
         Observable.combineLatestDelayError(Arrays.asList(just1), null, 128);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableFunctionReturnsNull() {
         Observable.combineLatestDelayError(Arrays.asList(just1), new Function<Object[], Object>() {
@@ -195,7 +188,6 @@ public Iterator<Observable<Object>> iterator() {
         }).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void concatIterableOneIsNull() {
         Observable.concat(Arrays.asList(just1, null)).blockingLast();
@@ -520,7 +512,6 @@ public Iterator<Observable<Object>> iterator() {
         }, 128, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void mergeIterableOneIsNull() {
         Observable.merge(Arrays.asList(just1, null), 128, 128).blockingLast();
@@ -552,7 +543,6 @@ public Iterator<Observable<Object>> iterator() {
         }, 128, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void mergeDelayErrorIterableOneIsNull() {
         Observable.mergeDelayError(Arrays.asList(just1, null), 128, 128).blockingLast();
@@ -683,13 +673,11 @@ public Object apply(Object[] v) {
         }).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableFunctionNull() {
         Observable.zip(Arrays.asList(just1, just1), null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableFunctionReturnsNull() {
         Observable.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
@@ -725,13 +713,11 @@ public Object apply(Object[] a) {
         }, true, 128).blockingLast();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterable2FunctionNull() {
         Observable.zip(Arrays.asList(just1, just1), null, true, 128);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterable2FunctionReturnsNull() {
         Observable.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
index 4b888d4ed5..c3110eac3f 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
@@ -1120,7 +1120,6 @@ public void singleDefaultObservable() {
 
     @Test
     public void zipIterableObject() {
-        @SuppressWarnings("unchecked")
         final List<Observable<Integer>> observables = Arrays.asList(Observable.just(1, 2, 3), Observable.just(1, 2, 3));
         Observable.zip(observables, new Function<Object[], Object>() {
             @Override
@@ -1136,7 +1135,6 @@ public Object apply(Object[] o) throws Exception {
 
     @Test
     public void combineLatestObject() {
-        @SuppressWarnings("unchecked")
         final List<Observable<Integer>> observables = Arrays.asList(Observable.just(1, 2, 3), Observable.just(1, 2, 3));
         Observable.combineLatest(observables, new Function<Object[], Object>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
index 26d5af8628..1a94b3c247 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
@@ -45,7 +45,6 @@ public void accept(List<Integer> a, Integer b) throws Exception {
         }));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void initialCrash() {
         Flowable.range(1, 5)
@@ -66,7 +65,6 @@ public void accept(List<Integer> a, Integer b) throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void reducerCrash() {
         Flowable.range(1, 5)
@@ -117,7 +115,6 @@ public void accept(List<Integer> a, Integer b) throws Exception {
         assertFalse(pp.hasSubscribers());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error() {
         Flowable.<Integer>error(new TestException())
@@ -138,7 +135,6 @@ public void accept(List<Integer> a, Integer b) throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void doubleError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
index 47371b3073..0ba01a05fd 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
@@ -189,7 +189,6 @@ public void accept(Integer v) throws Exception {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void doOnNextFailHandlerThrows() {
         TestSubscriberEx<Integer> ts = Flowable.range(0, 2)
@@ -336,7 +335,6 @@ public void accept(Integer v) throws Exception {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void doOnNextFailHandlerThrowsConditional() {
         TestSubscriberEx<Integer> ts = Flowable.range(0, 2)
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
index f2f7377942..084566a0a5 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
@@ -192,7 +192,6 @@ public boolean test(Integer v) throws Exception {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void filterFailHandlerThrows() {
         TestSubscriberEx<Integer> ts = Flowable.range(0, 2)
@@ -327,7 +326,6 @@ public boolean test(Integer v) throws Exception {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void filterFailHandlerThrowsConditional() {
         TestSubscriberEx<Integer> ts = Flowable.range(0, 2)
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
index 1e048a1dcc..93ffe8de7d 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
@@ -236,7 +236,6 @@ public Long apply(Long a, Long b) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void toSortedList() {
         TestSubscriber<List<Integer>> ts = new TestSubscriber<>();
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
index 2df4dd1462..b036b2e17f 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
@@ -167,7 +167,6 @@ public Integer apply(Integer v) throws Exception {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mapFailHandlerThrows() {
         TestSubscriberEx<Integer> ts = Flowable.range(0, 2)
@@ -302,7 +301,6 @@ public Integer apply(Integer v) throws Exception {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mapFailHandlerThrowsConditional() {
         TestSubscriberEx<Integer> ts = Flowable.range(0, 2)
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
index aac8c0af62..5646b176b1 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
@@ -46,7 +46,6 @@ public List<Integer> apply(List<Integer> a, Integer b) throws Exception {
         }));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void initialCrash() {
         Flowable.range(1, 5)
@@ -68,7 +67,6 @@ public List<Integer> apply(List<Integer> a, Integer b) throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void reducerCrash() {
         Flowable.range(1, 5)
@@ -121,7 +119,6 @@ public List<Integer> apply(List<Integer> a, Integer b) throws Exception {
         assertFalse(pp.hasSubscribers());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error() {
         Flowable.<Integer>error(new TestException())
@@ -143,7 +140,6 @@ public List<Integer> apply(List<Integer> a, Integer b) throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void doubleError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
index 7da2cdf95f..98ba085b19 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
@@ -49,7 +49,6 @@ public Iterator<Single<Object>> iterator() {
         }).test().assertError(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambIterableOneIsNull() {
         Single.amb(Arrays.asList(null, just1))
@@ -85,7 +84,6 @@ public Iterator<Single<Object>> iterator() {
         }).blockingSubscribe();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void concatIterableOneIsNull() {
         Single.concat(Arrays.asList(just1, null)).blockingSubscribe();
@@ -249,7 +247,6 @@ public Iterator<Single<Object>> iterator() {
         }).blockingSubscribe();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void mergeIterableOneIsNull() {
         Single.merge(Arrays.asList(null, just1)).blockingSubscribe();
@@ -384,7 +381,6 @@ public Object apply(Object[] v) {
         }).blockingGet();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableOneIsNull() {
         Single.zip(Arrays.asList(null, just1), new Function<Object[], Object>() {
@@ -395,13 +391,11 @@ public Object apply(Object[] v) {
         }).blockingGet();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableOneFunctionNull() {
         Single.zip(Arrays.asList(just1, just1), null).blockingGet();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableOneFunctionReturnsNull() {
         Single.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
@@ -529,7 +523,6 @@ public Object apply(Object[] v) {
         }, (Single<Integer>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipIterableTwoIsNull() {
         Single.zip(Arrays.asList(just1, null), new Function<Object[], Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
index 92974c0ef2..1f7cba7e2d 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
@@ -510,7 +510,6 @@ public void toFutureThrows() throws Exception {
 
     @Test(expected = UnsupportedOperationException.class)
     public void toFlowableIterableRemove() {
-        @SuppressWarnings("unchecked")
         Iterable<? extends Flowable<Integer>> f = SingleInternalHelper.iterableToFlowable(Arrays.asList(Single.just(1)));
 
         Iterator<? extends Flowable<Integer>> iterator = f.iterator();
@@ -520,7 +519,6 @@ public void toFlowableIterableRemove() {
 
     @Test
     public void zipIterableObject() {
-        @SuppressWarnings("unchecked")
         final List<Single<Integer>> singles = Arrays.asList(Single.just(1), Single.just(4));
         Single.zip(singles, new Function<Object[], Object>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java
index 491eccb85b..88b24a00ab 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java
@@ -21,7 +21,6 @@
 @Test
 public class AmbArrayTckTest extends BaseTck<Long> {
 
-    @SuppressWarnings("unchecked")
     @Override
     public Publisher<Long> createPublisher(long elements) {
         return
diff --git a/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java
index 2bdcf2c89f..a0d4a63764 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java
@@ -23,7 +23,6 @@
 @Test
 public class AmbTckTest extends BaseTck<Long> {
 
-    @SuppressWarnings("unchecked")
     @Override
     public Publisher<Long> createPublisher(long elements) {
         return
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java
index b309de7837..5581b9551e 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java
@@ -24,7 +24,6 @@
 @Test
 public class CombineLatestIterableDelayErrorTckTest extends BaseTck<Long> {
 
-    @SuppressWarnings("unchecked")
     @Override
     public Publisher<Long> createPublisher(long elements) {
         return
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java
index ed59b0aeb7..744d909949 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java
@@ -24,7 +24,6 @@
 @Test
 public class CombineLatestIterableTckTest extends BaseTck<Long> {
 
-    @SuppressWarnings("unchecked")
     @Override
     public Publisher<Long> createPublisher(long elements) {
         return
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java
index 7cf2fb3dc1..9885f3b939 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java
@@ -23,7 +23,6 @@
 @Test
 public class ConcatArrayEagerTckTest extends BaseTck<Long> {
 
-    @SuppressWarnings("unchecked")
     @Override
     public Publisher<Long> createPublisher(long elements) {
         return
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java
index 6ab7f2a7ba..e365418449 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java
@@ -21,7 +21,6 @@
 @Test
 public class ConcatIterableEagerTckTest extends BaseTck<Long> {
 
-    @SuppressWarnings("unchecked")
     @Override
     public Publisher<Long> createPublisher(long elements) {
         return
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java
index f597b70905..79d781d848 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java
@@ -23,7 +23,6 @@
 @Test
 public class MergeIterableTckTest extends BaseTck<Long> {
 
-    @SuppressWarnings("unchecked")
     @Override
     public Publisher<Long> createPublisher(long elements) {
         return
diff --git a/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java b/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
index 77bdfef211..c65a0bd58f 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
@@ -46,7 +46,7 @@
     RefCountProcessor(FlowableProcessor<T> actual) {
         this.actual = actual;
         this.upstream = new AtomicReference<>();
-        this.subscribers = new AtomicReference<RefCountSubscriber<T>[]>(EMPTY);
+        this.subscribers = new AtomicReference<>(EMPTY);
     }
 
     @Override
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java
index ec4583ff07..8ef456e609 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java
@@ -24,7 +24,6 @@
 @Test
 public class ZipIterableTckTest extends BaseTck<Long> {
 
-    @SuppressWarnings("unchecked")
     @Override
     public Publisher<Long> createPublisher(long elements) {
         return
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
index 2c68b0151a..8eb1d9f906 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
@@ -176,6 +176,7 @@ public final U assertErrorMessage(String message) {
      * @param values the expected values, asserted in order
      * @return this
      */
+    @SafeVarargs
     public final U assertFailure(Predicate<Throwable> errorPredicate, T... values) {
         return assertSubscribed()
                 .assertValues(values)
@@ -192,6 +193,7 @@ public final U assertFailure(Predicate<Throwable> errorPredicate, T... values) {
      * @param values the expected values, asserted in order
      * @return this
      */
+    @SafeVarargs
     public final U assertFailureAndMessage(Class<? extends Throwable> error,
             String message, T... values) {
         return assertSubscribed()

From ecdf2570848847ff97bfb14c6ecde9660f323e33 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2019 13:29:03 +0100
Subject: [PATCH 021/665] Bump build-info-extractor-gradle from 4.11.0 to
 4.12.0 (#6792)

Bumps build-info-extractor-gradle from 4.11.0 to 4.12.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f0406bd3f7..2ae17aa25a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.0"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.4"
-  ext.jfrogExtractorVersion = "4.11.0"
+  ext.jfrogExtractorVersion = "4.12.0"
   ext.bndVersion = "4.3.1"
   ext.checkstyleVersion = "8.26"
 

From b57169babb184d0adc2fa28cf0425c4f0c1f8555 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 24 Dec 2019 10:18:06 +0100
Subject: [PATCH 022/665] 3.x: Add NonNull & SafeVarargs annotations +
 validator (#6791)

---
 .../reactivex/rxjava3/core/Completable.java   |  255 +--
 .../io/reactivex/rxjava3/core/Flowable.java   | 1616 ++++++++++-------
 .../java/io/reactivex/rxjava3/core/Maybe.java |  564 +++---
 .../reactivex/rxjava3/core/Notification.java  |    2 +-
 .../io/reactivex/rxjava3/core/Observable.java |  309 ++--
 .../io/reactivex/rxjava3/core/Single.java     |  487 ++---
 .../rxjava3/flowable/FlowableNullTests.java   |    2 -
 .../flowable/FlowableConcatMapEagerTest.java  |    2 -
 .../flowable/FlowableMergeDelayErrorTest.java |    1 -
 .../operators/flowable/FlowableMergeTest.java |    1 -
 .../flowable/FlowablePublishFunctionTest.java |    3 -
 .../operators/maybe/MaybeAmbTest.java         |    5 -
 .../operators/maybe/MaybeConcatArrayTest.java |    9 -
 .../operators/maybe/MaybeMergeArrayTest.java  |    7 -
 .../operators/maybe/MaybeZipArrayTest.java    |    2 -
 .../operators/maybe/MaybeZipIterableTest.java |    1 -
 .../mixed/ObservableConcatMapMaybeTest.java   |    1 -
 .../mixed/ObservableConcatMapSingleTest.java  |    1 -
 .../observable/ObservableAmbTest.java         |   15 -
 .../ObservableConcatMapEagerTest.java         |   11 -
 .../observable/ObservableConcatMapTest.java   |    2 -
 .../observable/ObservableZipTest.java         |    1 -
 .../operators/single/SingleAmbTest.java       |    9 -
 .../operators/single/SingleConcatTest.java    |    2 -
 .../operators/single/SingleZipArrayTest.java  |    3 -
 .../io/reactivex/rxjava3/maybe/MaybeTest.java |   24 -
 .../observable/ObservableNullTests.java       |    1 -
 .../rxjava3/single/SingleNullTests.java       |    4 -
 .../validators/SourceAnnotationCheck.java     |  257 +++
 29 files changed, 2066 insertions(+), 1531 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index d9991a913e..46ec666337 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -121,7 +121,8 @@ public abstract class Completable implements CompletableSource {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable ambArray(final CompletableSource... sources) {
+    @SafeVarargs
+    public static Completable ambArray(@NonNull CompletableSource... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return complete();
@@ -150,7 +151,7 @@ public static Completable ambArray(final CompletableSource... sources) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable amb(final Iterable<? extends CompletableSource> sources) {
+    public static Completable amb(@NonNull Iterable<? extends CompletableSource> sources) {
         Objects.requireNonNull(sources, "sources is null");
 
         return RxJavaPlugins.onAssembly(new CompletableAmb(null, sources));
@@ -188,7 +189,8 @@ public static Completable complete() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable concatArray(CompletableSource... sources) {
+    @SafeVarargs
+    public static Completable concatArray(@NonNull CompletableSource... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return complete();
@@ -214,7 +216,7 @@ public static Completable concatArray(CompletableSource... sources) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable concat(Iterable<? extends CompletableSource> sources) {
+    public static Completable concat(@NonNull Iterable<? extends CompletableSource> sources) {
         Objects.requireNonNull(sources, "sources is null");
 
         return RxJavaPlugins.onAssembly(new CompletableConcatIterable(sources));
@@ -238,7 +240,8 @@ public static Completable concat(Iterable<? extends CompletableSource> sources)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static Completable concat(Publisher<? extends CompletableSource> sources) {
+    @NonNull
+    public static Completable concat(@NonNull Publisher<? extends CompletableSource> sources) {
         return concat(sources, 2);
     }
 
@@ -262,7 +265,7 @@ public static Completable concat(Publisher<? extends CompletableSource> sources)
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static Completable concat(Publisher<? extends CompletableSource> sources, int prefetch) {
+    public static Completable concat(@NonNull Publisher<? extends CompletableSource> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new CompletableConcat(sources, prefetch));
@@ -312,7 +315,7 @@ public static Completable concat(Publisher<? extends CompletableSource> sources,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable create(CompletableOnSubscribe source) {
+    public static Completable create(@NonNull CompletableOnSubscribe source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new CompletableCreate(source));
     }
@@ -335,7 +338,7 @@ public static Completable create(CompletableOnSubscribe source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable unsafeCreate(CompletableSource source) {
+    public static Completable unsafeCreate(@NonNull CompletableSource source) {
         Objects.requireNonNull(source, "source is null");
         if (source instanceof Completable) {
             throw new IllegalArgumentException("Use of unsafeCreate(Completable)!");
@@ -357,7 +360,7 @@ public static Completable unsafeCreate(CompletableSource source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable defer(final Supplier<? extends CompletableSource> completableSupplier) {
+    public static Completable defer(@NonNull Supplier<? extends CompletableSource> completableSupplier) {
         Objects.requireNonNull(completableSupplier, "completableSupplier");
         return RxJavaPlugins.onAssembly(new CompletableDefer(completableSupplier));
     }
@@ -381,7 +384,7 @@ public static Completable defer(final Supplier<? extends CompletableSource> comp
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable error(final Supplier<? extends Throwable> errorSupplier) {
+    public static Completable error(@NonNull Supplier<? extends Throwable> errorSupplier) {
         Objects.requireNonNull(errorSupplier, "errorSupplier is null");
         return RxJavaPlugins.onAssembly(new CompletableErrorSupplier(errorSupplier));
     }
@@ -401,7 +404,7 @@ public static Completable error(final Supplier<? extends Throwable> errorSupplie
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable error(final Throwable error) {
+    public static Completable error(@NonNull Throwable error) {
         Objects.requireNonNull(error, "error is null");
         return RxJavaPlugins.onAssembly(new CompletableError(error));
     }
@@ -429,7 +432,7 @@ public static Completable error(final Throwable error) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable fromAction(final Action run) {
+    public static Completable fromAction(@NonNull Action run) {
         Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new CompletableFromAction(run));
     }
@@ -458,7 +461,7 @@ public static Completable fromAction(final Action run) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable fromCallable(final Callable<?> callable) {
+    public static Completable fromCallable(@NonNull Callable<?> callable) {
         Objects.requireNonNull(callable, "callable is null");
         return RxJavaPlugins.onAssembly(new CompletableFromCallable(callable));
     }
@@ -479,7 +482,7 @@ public static Completable fromCallable(final Callable<?> callable) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable fromFuture(final Future<?> future) {
+    public static Completable fromFuture(@NonNull Future<?> future) {
         Objects.requireNonNull(future, "future is null");
         return fromAction(Functions.futureAction(future));
     }
@@ -504,9 +507,9 @@ public static Completable fromFuture(final Future<?> future) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Completable fromMaybe(final MaybeSource<T> maybe) {
+    public static <T> Completable fromMaybe(@NonNull MaybeSource<T> maybe) {
         Objects.requireNonNull(maybe, "maybe is null");
-        return RxJavaPlugins.onAssembly(new MaybeIgnoreElementCompletable<T>(maybe));
+        return RxJavaPlugins.onAssembly(new MaybeIgnoreElementCompletable<>(maybe));
     }
 
     /**
@@ -532,7 +535,7 @@ public static <T> Completable fromMaybe(final MaybeSource<T> maybe) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable fromRunnable(final Runnable run) {
+    public static Completable fromRunnable(@NonNull Runnable run) {
         Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new CompletableFromRunnable(run));
     }
@@ -554,9 +557,9 @@ public static Completable fromRunnable(final Runnable run) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Completable fromObservable(final ObservableSource<T> observable) {
+    public static <T> Completable fromObservable(@NonNull ObservableSource<T> observable) {
         Objects.requireNonNull(observable, "observable is null");
-        return RxJavaPlugins.onAssembly(new CompletableFromObservable<T>(observable));
+        return RxJavaPlugins.onAssembly(new CompletableFromObservable<>(observable));
     }
 
     /**
@@ -592,9 +595,9 @@ public static <T> Completable fromObservable(final ObservableSource<T> observabl
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Completable fromPublisher(final Publisher<T> publisher) {
+    public static <T> Completable fromPublisher(@NonNull Publisher<T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
-        return RxJavaPlugins.onAssembly(new CompletableFromPublisher<T>(publisher));
+        return RxJavaPlugins.onAssembly(new CompletableFromPublisher<>(publisher));
     }
 
     /**
@@ -614,9 +617,9 @@ public static <T> Completable fromPublisher(final Publisher<T> publisher) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Completable fromSingle(final SingleSource<T> single) {
+    public static <T> Completable fromSingle(@NonNull SingleSource<T> single) {
         Objects.requireNonNull(single, "single is null");
-        return RxJavaPlugins.onAssembly(new CompletableFromSingle<T>(single));
+        return RxJavaPlugins.onAssembly(new CompletableFromSingle<>(single));
     }
 
     /**
@@ -644,7 +647,7 @@ public static <T> Completable fromSingle(final SingleSource<T> single) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable fromSupplier(final Supplier<?> supplier) {
+    public static Completable fromSupplier(@NonNull Supplier<?> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new CompletableFromSupplier(supplier));
     }
@@ -679,7 +682,8 @@ public static Completable fromSupplier(final Supplier<?> supplier) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable mergeArray(CompletableSource... sources) {
+    @SafeVarargs
+    public static Completable mergeArray(@NonNull CompletableSource... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return complete();
@@ -720,7 +724,7 @@ public static Completable mergeArray(CompletableSource... sources) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable merge(Iterable<? extends CompletableSource> sources) {
+    public static Completable merge(@NonNull Iterable<? extends CompletableSource> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new CompletableMergeIterable(sources));
     }
@@ -758,7 +762,8 @@ public static Completable merge(Iterable<? extends CompletableSource> sources) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
-    public static Completable merge(Publisher<? extends CompletableSource> sources) {
+    @NonNull
+    public static Completable merge(@NonNull Publisher<? extends CompletableSource> sources) {
         return merge0(sources, Integer.MAX_VALUE, false);
     }
 
@@ -797,7 +802,8 @@ public static Completable merge(Publisher<? extends CompletableSource> sources)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static Completable merge(Publisher<? extends CompletableSource> sources, int maxConcurrency) {
+    @NonNull
+    public static Completable merge(@NonNull Publisher<? extends CompletableSource> sources, int maxConcurrency) {
         return merge0(sources, maxConcurrency, false);
     }
 
@@ -823,7 +829,7 @@ public static Completable merge(Publisher<? extends CompletableSource> sources,
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    private static Completable merge0(Publisher<? extends CompletableSource> sources, int maxConcurrency, boolean delayErrors) {
+    private static Completable merge0(@NonNull Publisher<? extends CompletableSource> sources, int maxConcurrency, boolean delayErrors) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new CompletableMerge(sources, maxConcurrency, delayErrors));
@@ -846,7 +852,8 @@ private static Completable merge0(Publisher<? extends CompletableSource> sources
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable mergeArrayDelayError(CompletableSource... sources) {
+    @SafeVarargs
+    public static Completable mergeArrayDelayError(@NonNull CompletableSource... sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new CompletableMergeDelayErrorArray(sources));
     }
@@ -868,7 +875,7 @@ public static Completable mergeArrayDelayError(CompletableSource... sources) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable mergeDelayError(Iterable<? extends CompletableSource> sources) {
+    public static Completable mergeDelayError(@NonNull Iterable<? extends CompletableSource> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new CompletableMergeDelayErrorIterable(sources));
     }
@@ -893,7 +900,8 @@ public static Completable mergeDelayError(Iterable<? extends CompletableSource>
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
-    public static Completable mergeDelayError(Publisher<? extends CompletableSource> sources) {
+    @NonNull
+    public static Completable mergeDelayError(@NonNull Publisher<? extends CompletableSource> sources) {
         return merge0(sources, Integer.MAX_VALUE, true);
     }
 
@@ -919,7 +927,8 @@ public static Completable mergeDelayError(Publisher<? extends CompletableSource>
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static Completable mergeDelayError(Publisher<? extends CompletableSource> sources, int maxConcurrency) {
+    @NonNull
+    public static Completable mergeDelayError(@NonNull Publisher<? extends CompletableSource> sources, int maxConcurrency) {
         return merge0(sources, maxConcurrency, true);
     }
 
@@ -935,6 +944,7 @@ public static Completable mergeDelayError(Publisher<? extends CompletableSource>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static Completable never() {
         return RxJavaPlugins.onAssembly(CompletableNever.INSTANCE);
     }
@@ -953,7 +963,8 @@ public static Completable never() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Completable timer(long delay, TimeUnit unit) {
+    @NonNull
+    public static Completable timer(long delay, @NonNull TimeUnit unit) {
         return timer(delay, unit, Schedulers.computation());
     }
 
@@ -974,7 +985,7 @@ public static Completable timer(long delay, TimeUnit unit) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Completable timer(final long delay, final TimeUnit unit, final Scheduler scheduler) {
+    public static Completable timer(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new CompletableTimer(delay, unit, scheduler));
@@ -1010,9 +1021,10 @@ private static NullPointerException toNpe(Throwable ex) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <R> Completable using(Supplier<R> resourceSupplier,
-            Function<? super R, ? extends CompletableSource> completableFunction,
-            Consumer<? super R> disposer) {
+    @NonNull
+    public static <R> Completable using(@NonNull Supplier<R> resourceSupplier,
+            @NonNull Function<? super R, ? extends CompletableSource> completableFunction,
+            @NonNull Consumer<? super R> disposer) {
         return using(resourceSupplier, completableFunction, disposer, true);
     }
 
@@ -1045,15 +1057,15 @@ public static <R> Completable using(Supplier<R> resourceSupplier,
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <R> Completable using(
-            final Supplier<R> resourceSupplier,
-            final Function<? super R, ? extends CompletableSource> completableFunction,
-            final Consumer<? super R> disposer,
-            final boolean eager) {
+            @NonNull Supplier<R> resourceSupplier,
+            @NonNull Function<? super R, ? extends CompletableSource> completableFunction,
+            @NonNull Consumer<? super R> disposer,
+            boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(completableFunction, "completableFunction is null");
         Objects.requireNonNull(disposer, "disposer is null");
 
-        return RxJavaPlugins.onAssembly(new CompletableUsing<R>(resourceSupplier, completableFunction, disposer, eager));
+        return RxJavaPlugins.onAssembly(new CompletableUsing<>(resourceSupplier, completableFunction, disposer, eager));
     }
 
     /**
@@ -1072,7 +1084,7 @@ public static <R> Completable using(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable wrap(CompletableSource source) {
+    public static Completable wrap(@NonNull CompletableSource source) {
         Objects.requireNonNull(source, "source is null");
         if (source instanceof Completable) {
             return RxJavaPlugins.onAssembly((Completable)source);
@@ -1097,7 +1109,7 @@ public static Completable wrap(CompletableSource source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable ambWith(CompletableSource other) {
+    public final Completable ambWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
@@ -1121,9 +1133,9 @@ public final Completable ambWith(CompletableSource other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Observable<T> andThen(ObservableSource<T> next) {
+    public final <@NonNull T> Observable<T> andThen(@NonNull ObservableSource<T> next) {
         Objects.requireNonNull(next, "next is null");
-        return RxJavaPlugins.onAssembly(new CompletableAndThenObservable<T>(this, next));
+        return RxJavaPlugins.onAssembly(new CompletableAndThenObservable<>(this, next));
     }
 
     /**
@@ -1149,9 +1161,9 @@ public final <T> Observable<T> andThen(ObservableSource<T> next) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Flowable<T> andThen(Publisher<T> next) {
+    public final <@NonNull T> Flowable<T> andThen(@NonNull Publisher<T> next) {
         Objects.requireNonNull(next, "next is null");
-        return RxJavaPlugins.onAssembly(new CompletableAndThenPublisher<T>(this, next));
+        return RxJavaPlugins.onAssembly(new CompletableAndThenPublisher<>(this, next));
     }
 
     /**
@@ -1173,9 +1185,9 @@ public final <T> Flowable<T> andThen(Publisher<T> next) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Single<T> andThen(SingleSource<T> next) {
+    public final <@NonNull T> Single<T> andThen(@NonNull SingleSource<T> next) {
         Objects.requireNonNull(next, "next is null");
-        return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable<T>(next, this));
+        return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable<>(next, this));
     }
 
     /**
@@ -1197,9 +1209,9 @@ public final <T> Single<T> andThen(SingleSource<T> next) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Maybe<T> andThen(MaybeSource<T> next) {
+    public final <@NonNull T> Maybe<T> andThen(@NonNull MaybeSource<T> next) {
         Objects.requireNonNull(next, "next is null");
-        return RxJavaPlugins.onAssembly(new MaybeDelayWithCompletable<T>(next, this));
+        return RxJavaPlugins.onAssembly(new MaybeDelayWithCompletable<>(next, this));
     }
 
     /**
@@ -1219,7 +1231,8 @@ public final <T> Maybe<T> andThen(MaybeSource<T> next) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable andThen(CompletableSource next) {
+    @NonNull
+    public final Completable andThen(@NonNull CompletableSource next) {
         Objects.requireNonNull(next, "next is null");
         return RxJavaPlugins.onAssembly(new CompletableAndThenCompletable(this, next));
     }
@@ -1241,7 +1254,7 @@ public final Completable andThen(CompletableSource next) {
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void blockingAwait() {
-        BlockingMultiObserver<Void> observer = new BlockingMultiObserver<Void>();
+        BlockingMultiObserver<Void> observer = new BlockingMultiObserver<>();
         subscribe(observer);
         observer.blockingGet();
     }
@@ -1266,11 +1279,10 @@ public final void blockingAwait() {
      * @throws RuntimeException wrapping an InterruptedException if the current thread is interrupted
      */
     @CheckReturnValue
-    @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final boolean blockingAwait(long timeout, TimeUnit unit) {
+    public final boolean blockingAwait(long timeout, @NonNull TimeUnit unit) {
         Objects.requireNonNull(unit, "unit is null");
-        BlockingMultiObserver<Void> observer = new BlockingMultiObserver<Void>();
+        BlockingMultiObserver<Void> observer = new BlockingMultiObserver<>();
         subscribe(observer);
         return observer.blockingAwait(timeout, unit);
     }
@@ -1294,6 +1306,7 @@ public final boolean blockingAwait(long timeout, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable cache() {
         return RxJavaPlugins.onAssembly(new CompletableCache(this));
     }
@@ -1313,7 +1326,8 @@ public final Completable cache() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable compose(CompletableTransformer transformer) {
+    @NonNull
+    public final Completable compose(@NonNull CompletableTransformer transformer) {
         return wrap(Objects.requireNonNull(transformer, "transformer is null").apply(this));
     }
 
@@ -1336,7 +1350,7 @@ public final Completable compose(CompletableTransformer transformer) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable concatWith(CompletableSource other) {
+    public final Completable concatWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new CompletableAndThenCompletable(this, other));
     }
@@ -1356,7 +1370,8 @@ public final Completable concatWith(CompletableSource other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Completable delay(long delay, TimeUnit unit) {
+    @NonNull
+    public final Completable delay(long delay, @NonNull TimeUnit unit) {
         return delay(delay, unit, Schedulers.computation(), false);
     }
 
@@ -1377,7 +1392,8 @@ public final Completable delay(long delay, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable delay(long delay, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return delay(delay, unit, scheduler, false);
     }
 
@@ -1400,7 +1416,7 @@ public final Completable delay(long delay, TimeUnit unit, Scheduler scheduler) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable delay(final long delay, final TimeUnit unit, final Scheduler scheduler, final boolean delayError) {
+    public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new CompletableDelay(this, delay, unit, scheduler, delayError));
@@ -1424,7 +1440,8 @@ public final Completable delay(final long delay, final TimeUnit unit, final Sche
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Completable delaySubscription(long delay, TimeUnit unit) {
+    @NonNull
+    public final Completable delaySubscription(long delay, @NonNull TimeUnit unit) {
         return delaySubscription(delay, unit, Schedulers.computation());
     }
 
@@ -1448,7 +1465,8 @@ public final Completable delaySubscription(long delay, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable delaySubscription(long delay, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Completable delaySubscription(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return Completable.timer(delay, unit, scheduler).andThen(this);
     }
 
@@ -1467,7 +1485,8 @@ public final Completable delaySubscription(long delay, TimeUnit unit, Scheduler
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnComplete(Action onComplete) {
+    @NonNull
+    public final Completable doOnComplete(@NonNull Action onComplete) {
         return doOnLifecycle(Functions.emptyConsumer(), Functions.emptyConsumer(),
                 onComplete, Functions.EMPTY_ACTION,
                 Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
@@ -1488,7 +1507,8 @@ public final Completable doOnComplete(Action onComplete) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnDispose(Action onDispose) {
+    @NonNull
+    public final Completable doOnDispose(@NonNull Action onDispose) {
         return doOnLifecycle(Functions.emptyConsumer(), Functions.emptyConsumer(),
                 Functions.EMPTY_ACTION, Functions.EMPTY_ACTION,
                 Functions.EMPTY_ACTION, onDispose);
@@ -1509,7 +1529,8 @@ public final Completable doOnDispose(Action onDispose) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnError(Consumer<? super Throwable> onError) {
+    @NonNull
+    public final Completable doOnError(@NonNull Consumer<? super Throwable> onError) {
         return doOnLifecycle(Functions.emptyConsumer(), onError,
                 Functions.EMPTY_ACTION, Functions.EMPTY_ACTION,
                 Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
@@ -1531,7 +1552,7 @@ public final Completable doOnError(Consumer<? super Throwable> onError) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnEvent(final Consumer<? super Throwable> onEvent) {
+    public final Completable doOnEvent(@NonNull Consumer<? super Throwable> onEvent) {
         Objects.requireNonNull(onEvent, "onEvent is null");
         return RxJavaPlugins.onAssembly(new CompletableDoOnEvent(this, onEvent));
     }
@@ -1584,7 +1605,8 @@ private Completable doOnLifecycle(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnSubscribe(Consumer<? super Disposable> onSubscribe) {
+    @NonNull
+    public final Completable doOnSubscribe(@NonNull Consumer<? super Disposable> onSubscribe) {
         return doOnLifecycle(onSubscribe, Functions.emptyConsumer(),
                 Functions.EMPTY_ACTION, Functions.EMPTY_ACTION,
                 Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
@@ -1605,7 +1627,8 @@ public final Completable doOnSubscribe(Consumer<? super Disposable> onSubscribe)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnTerminate(final Action onTerminate) {
+    @NonNull
+    public final Completable doOnTerminate(@NonNull Action onTerminate) {
         return doOnLifecycle(Functions.emptyConsumer(), Functions.emptyConsumer(),
                 Functions.EMPTY_ACTION, onTerminate,
                 Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
@@ -1626,7 +1649,8 @@ public final Completable doOnTerminate(final Action onTerminate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doAfterTerminate(final Action onAfterTerminate) {
+    @NonNull
+    public final Completable doAfterTerminate(@NonNull Action onAfterTerminate) {
         return doOnLifecycle(
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -1658,7 +1682,7 @@ public final Completable doAfterTerminate(final Action onAfterTerminate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doFinally(Action onFinally) {
+    public final Completable doFinally(@NonNull Action onFinally) {
         Objects.requireNonNull(onFinally, "onFinally is null");
         return RxJavaPlugins.onAssembly(new CompletableDoFinally(this, onFinally));
     }
@@ -1796,7 +1820,7 @@ public final Completable doFinally(Action onFinally) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable lift(final CompletableOperator onLift) {
+    public final Completable lift(@NonNull CompletableOperator onLift) {
         Objects.requireNonNull(onLift, "onLift is null");
         return RxJavaPlugins.onAssembly(new CompletableLift(this, onLift));
     }
@@ -1818,6 +1842,7 @@ public final Completable lift(final CompletableOperator onLift) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <T> Single<Notification<T>> materialize() {
         return RxJavaPlugins.onAssembly(new CompletableMaterialize<T>(this));
     }
@@ -1838,7 +1863,7 @@ public final <T> Single<Notification<T>> materialize() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable mergeWith(CompletableSource other) {
+    public final Completable mergeWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
         return mergeArray(this, other);
     }
@@ -1858,7 +1883,7 @@ public final Completable mergeWith(CompletableSource other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable observeOn(final Scheduler scheduler) {
+    public final Completable observeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new CompletableObserveOn(this, scheduler));
     }
@@ -1876,6 +1901,7 @@ public final Completable observeOn(final Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable onErrorComplete() {
         return onErrorComplete(Functions.alwaysTrue());
     }
@@ -1896,7 +1922,7 @@ public final Completable onErrorComplete() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable onErrorComplete(final Predicate<? super Throwable> predicate) {
+    public final Completable onErrorComplete(@NonNull Predicate<? super Throwable> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
 
         return RxJavaPlugins.onAssembly(new CompletableOnErrorComplete(this, predicate));
@@ -1919,7 +1945,7 @@ public final Completable onErrorComplete(final Predicate<? super Throwable> pred
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable onErrorResumeNext(final Function<? super Throwable, ? extends CompletableSource> errorMapper) {
+    public final Completable onErrorResumeNext(@NonNull Function<? super Throwable, ? extends CompletableSource> errorMapper) {
         Objects.requireNonNull(errorMapper, "errorMapper is null");
         return RxJavaPlugins.onAssembly(new CompletableResumeNext(this, errorMapper));
     }
@@ -1940,6 +1966,7 @@ public final Completable onErrorResumeNext(final Function<? super Throwable, ? e
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable onTerminateDetach() {
         return RxJavaPlugins.onAssembly(new CompletableDetach(this));
     }
@@ -1956,6 +1983,7 @@ public final Completable onTerminateDetach() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable repeat() {
         return fromPublisher(toFlowable().repeat());
     }
@@ -1974,6 +2002,7 @@ public final Completable repeat() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable repeat(long times) {
         return fromPublisher(toFlowable().repeat(times));
     }
@@ -1993,7 +2022,8 @@ public final Completable repeat(long times) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable repeatUntil(BooleanSupplier stop) {
+    @NonNull
+    public final Completable repeatUntil(@NonNull BooleanSupplier stop) {
         return fromPublisher(toFlowable().repeatUntil(stop));
     }
 
@@ -2014,7 +2044,8 @@ public final Completable repeatUntil(BooleanSupplier stop) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable repeatWhen(Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
+    @NonNull
+    public final Completable repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
         return fromPublisher(toFlowable().repeatWhen(handler));
     }
 
@@ -2030,6 +2061,7 @@ public final Completable repeatWhen(Function<? super Flowable<Object>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable retry() {
         return fromPublisher(toFlowable().retry());
     }
@@ -2049,7 +2081,8 @@ public final Completable retry() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable retry(BiPredicate<? super Integer, ? super Throwable> predicate) {
+    @NonNull
+    public final Completable retry(@NonNull BiPredicate<? super Integer, ? super Throwable> predicate) {
         return fromPublisher(toFlowable().retry(predicate));
     }
 
@@ -2068,6 +2101,7 @@ public final Completable retry(BiPredicate<? super Integer, ? super Throwable> p
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable retry(long times) {
         return fromPublisher(toFlowable().retry(times));
     }
@@ -2092,7 +2126,8 @@ public final Completable retry(long times) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable retry(long times, Predicate<? super Throwable> predicate) {
+    @NonNull
+    public final Completable retry(long times, @NonNull Predicate<? super Throwable> predicate) {
         return fromPublisher(toFlowable().retry(times, predicate));
     }
 
@@ -2112,7 +2147,8 @@ public final Completable retry(long times, Predicate<? super Throwable> predicat
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable retry(Predicate<? super Throwable> predicate) {
+    @NonNull
+    public final Completable retry(@NonNull Predicate<? super Throwable> predicate) {
         return fromPublisher(toFlowable().retry(predicate));
     }
 
@@ -2158,7 +2194,8 @@ public final Completable retry(Predicate<? super Throwable> predicate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable retryWhen(Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
+    @NonNull
+    public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
         return fromPublisher(toFlowable().retryWhen(handler));
     }
 
@@ -2178,7 +2215,7 @@ public final Completable retryWhen(Function<? super Flowable<Throwable>, ? exten
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable startWith(CompletableSource other) {
+    public final Completable startWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
         return concatArray(other, this);
     }
@@ -2200,9 +2237,9 @@ public final Completable startWith(CompletableSource other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Observable<T> startWith(Observable<T> other) {
+    public final <T> Observable<T> startWith(@NonNull ObservableSource<T> other) {
         Objects.requireNonNull(other, "other is null");
-        return other.concatWith(this.<T>toObservable());
+        return Observable.wrap(other).concatWith(this.<T>toObservable());
     }
     /**
      * Returns a Flowable which first delivers the events
@@ -2225,7 +2262,7 @@ public final <T> Observable<T> startWith(Observable<T> other) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Flowable<T> startWith(Publisher<T> other) {
+    public final <T> Flowable<T> startWith(@NonNull Publisher<T> other) {
         Objects.requireNonNull(other, "other is null");
         return this.<T>toFlowable().startWith(other);
     }
@@ -2246,6 +2283,7 @@ public final <T> Flowable<T> startWith(Publisher<T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable hide() {
         return RxJavaPlugins.onAssembly(new CompletableHide(this));
     }
@@ -2262,6 +2300,7 @@ public final Completable hide() {
      * @return the Disposable that allows disposing the subscription
      */
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Disposable subscribe() {
         EmptyCompletableObserver observer = new EmptyCompletableObserver();
         subscribe(observer);
@@ -2270,7 +2309,7 @@ public final Disposable subscribe() {
 
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
-    public final void subscribe(CompletableObserver observer) {
+    public final void subscribe(@NonNull CompletableObserver observer) {
         Objects.requireNonNull(observer, "observer is null");
         try {
 
@@ -2326,7 +2365,8 @@ public final void subscribe(CompletableObserver observer) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <E extends CompletableObserver> E subscribeWith(E observer) {
+    @NonNull
+    public final <@NonNull E extends CompletableObserver> E subscribeWith(E observer) {
         subscribe(observer);
         return observer;
     }
@@ -2347,7 +2387,7 @@ public final <E extends CompletableObserver> E subscribeWith(E observer) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(final Action onComplete, final Consumer<? super Throwable> onError) {
+    public final Disposable subscribe(@NonNull Action onComplete, @NonNull Consumer<? super Throwable> onError) {
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
 
@@ -2375,7 +2415,7 @@ public final Disposable subscribe(final Action onComplete, final Consumer<? supe
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(final Action onComplete) {
+    public final Disposable subscribe(@NonNull Action onComplete) {
         Objects.requireNonNull(onComplete, "onComplete is null");
 
         CallbackCompletableObserver observer = new CallbackCompletableObserver(onComplete);
@@ -2399,7 +2439,7 @@ public final Disposable subscribe(final Action onComplete) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable subscribeOn(final Scheduler scheduler) {
+    public final Completable subscribeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
 
         return RxJavaPlugins.onAssembly(new CompletableSubscribeOn(this, scheduler));
@@ -2426,7 +2466,7 @@ public final Completable subscribeOn(final Scheduler scheduler) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable takeUntil(CompletableSource other) {
+    public final Completable takeUntil(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
 
         return RxJavaPlugins.onAssembly(new CompletableTakeUntilCompletable(this, other));
@@ -2448,7 +2488,8 @@ public final Completable takeUntil(CompletableSource other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Completable timeout(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Completable timeout(long timeout, @NonNull TimeUnit unit) {
         return timeout0(timeout, unit, Schedulers.computation(), null);
     }
 
@@ -2471,7 +2512,7 @@ public final Completable timeout(long timeout, TimeUnit unit) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Completable timeout(long timeout, TimeUnit unit, CompletableSource other) {
+    public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, Schedulers.computation(), other);
     }
@@ -2494,7 +2535,8 @@ public final Completable timeout(long timeout, TimeUnit unit, CompletableSource
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable timeout(long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return timeout0(timeout, unit, scheduler, null);
     }
 
@@ -2519,7 +2561,7 @@ public final Completable timeout(long timeout, TimeUnit unit, Scheduler schedule
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable timeout(long timeout, TimeUnit unit, Scheduler scheduler, CompletableSource other) {
+    public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, scheduler, other);
     }
@@ -2590,6 +2632,7 @@ public final <R> R to(@NonNull CompletableConverter<? extends R> converter) {
     @SuppressWarnings("unchecked")
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <T> Flowable<T> toFlowable() {
         if (this instanceof FuseToFlowable) {
             return ((FuseToFlowable<T>)this).fuseToFlowable();
@@ -2613,6 +2656,7 @@ public final <T> Flowable<T> toFlowable() {
     @CheckReturnValue
     @SuppressWarnings("unchecked")
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <T> Maybe<T> toMaybe() {
         if (this instanceof FuseToMaybe) {
             return ((FuseToMaybe<T>)this).fuseToMaybe();
@@ -2635,6 +2679,7 @@ public final <T> Maybe<T> toMaybe() {
     @CheckReturnValue
     @SuppressWarnings("unchecked")
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <T> Observable<T> toObservable() {
         if (this instanceof FuseToObservable) {
             return ((FuseToObservable<T>)this).fuseToObservable();
@@ -2659,7 +2704,7 @@ public final <T> Observable<T> toObservable() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Single<T> toSingle(final Supplier<? extends T> completionValueSupplier) {
+    public final <@NonNull T> Single<T> toSingle(@NonNull Supplier<? extends T> completionValueSupplier) {
         Objects.requireNonNull(completionValueSupplier, "completionValueSupplier is null");
         return RxJavaPlugins.onAssembly(new CompletableToSingle<T>(this, completionValueSupplier, null));
     }
@@ -2681,9 +2726,9 @@ public final <T> Single<T> toSingle(final Supplier<? extends T> completionValueS
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Single<T> toSingleDefault(final T completionValue) {
+    public final <@NonNull T> Single<T> toSingleDefault(T completionValue) {
         Objects.requireNonNull(completionValue, "completionValue is null");
-        return RxJavaPlugins.onAssembly(new CompletableToSingle<T>(this, null, completionValue));
+        return RxJavaPlugins.onAssembly(new CompletableToSingle<>(this, null, completionValue));
     }
 
     /**
@@ -2702,7 +2747,7 @@ public final <T> Single<T> toSingleDefault(final T completionValue) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable unsubscribeOn(final Scheduler scheduler) {
+    public final Completable unsubscribeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new CompletableDisposeOn(this, scheduler));
     }
@@ -2724,8 +2769,9 @@ public final Completable unsubscribeOn(final Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestObserver<Void> test() {
-        TestObserver<Void> to = new TestObserver<Void>();
+        TestObserver<Void> to = new TestObserver<>();
         subscribe(to);
         return to;
     }
@@ -2745,8 +2791,9 @@ public final TestObserver<Void> test() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestObserver<Void> test(boolean dispose) {
-        TestObserver<Void> to = new TestObserver<Void>();
+        TestObserver<Void> to = new TestObserver<>();
 
         if (dispose) {
             to.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 0b2e9197cb..c5bdb06b2c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -185,7 +185,7 @@ public abstract class Flowable<T> implements Publisher<T> {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> amb(Iterable<? extends Publisher<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new FlowableAmb<T>(null, sources));
+        return RxJavaPlugins.onAssembly(new FlowableAmb<>(null, sources));
     }
 
     /**
@@ -223,7 +223,7 @@ public static <T> Flowable<T> ambArray(Publisher<? extends T>... sources) {
         if (len == 1) {
             return fromPublisher(sources[0]);
         }
-        return RxJavaPlugins.onAssembly(new FlowableAmb<T>(sources, null));
+        return RxJavaPlugins.onAssembly(new FlowableAmb<>(sources, null));
     }
 
     /**
@@ -276,7 +276,8 @@ public static int bufferSize() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatestArray(Publisher<? extends T>[] sources, Function<? super Object[], ? extends R> combiner) {
+    @NonNull
+    public static <T, @NonNull R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestArray(sources, combiner, bufferSize());
     }
 
@@ -323,7 +324,7 @@ public static <T, R> Flowable<R> combineLatestArray(Publisher<? extends T>[] sou
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatestArray(Publisher<? extends T>[] sources, Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -373,8 +374,9 @@ public static <T, R> Flowable<R> combineLatestArray(Publisher<? extends T>[] sou
     @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatest(Iterable<? extends Publisher<? extends T>> sources,
-            Function<? super Object[], ? extends R> combiner) {
+    @NonNull
+    public static <T, @NonNull R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatest(sources, combiner, bufferSize());
     }
 
@@ -421,8 +423,8 @@ public static <T, R> Flowable<R> combineLatest(Iterable<? extends Publisher<? ex
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatest(Iterable<? extends Publisher<? extends T>> sources,
-            Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -469,8 +471,9 @@ public static <T, R> Flowable<R> combineLatest(Iterable<? extends Publisher<? ex
     @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatestDelayError(Publisher<? extends T>[] sources,
-            Function<? super Object[], ? extends R> combiner) {
+    @NonNull
+    public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Publisher<? extends T>[] sources,
+            @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestDelayError(sources, combiner, bufferSize());
     }
 
@@ -518,8 +521,8 @@ public static <T, R> Flowable<R> combineLatestDelayError(Publisher<? extends T>[
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatestDelayError(Publisher<? extends T>[] sources,
-            Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Publisher<? extends T>[] sources,
+            @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -570,8 +573,9 @@ public static <T, R> Flowable<R> combineLatestDelayError(Publisher<? extends T>[
     @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatestDelayError(Iterable<? extends Publisher<? extends T>> sources,
-            Function<? super Object[], ? extends R> combiner) {
+    @NonNull
+    public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestDelayError(sources, combiner, bufferSize());
     }
 
@@ -618,8 +622,9 @@ public static <T, R> Flowable<R> combineLatestDelayError(Iterable<? extends Publ
     @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatestDelayError(Iterable<? extends Publisher<? extends T>> sources,
-            Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    @NonNull
+    public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -662,9 +667,10 @@ public static <T, R> Flowable<R> combineLatestDelayError(Iterable<? extends Publ
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, R> Flowable<R> combineLatest(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> combiner) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return combineLatestArray(new Publisher[] { source1, source2 }, Functions.toFunction(combiner), bufferSize());
@@ -711,9 +717,9 @@ public static <T1, T2, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, R> Flowable<R> combineLatest(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            Publisher<? extends T3> source3,
-            Function3<? super T1, ? super T2, ? super T3, ? extends R> combiner) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3,
+            @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -764,9 +770,9 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            Publisher<? extends T3> source3, Publisher<? extends T4> source4,
-            Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combiner) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -821,10 +827,10 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            Publisher<? extends T3> source3, Publisher<? extends T4> source4,
-            Publisher<? extends T5> source5,
-            Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> combiner) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5,
+            @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -883,10 +889,10 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            Publisher<? extends T3> source3, Publisher<? extends T4> source4,
-            Publisher<? extends T5> source5, Publisher<? extends T6> source6,
-            Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> combiner) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -949,11 +955,11 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            Publisher<? extends T3> source3, Publisher<? extends T4> source4,
-            Publisher<? extends T5> source5, Publisher<? extends T6> source6,
-            Publisher<? extends T7> source7,
-            Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> combiner) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7,
+            @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1020,11 +1026,11 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            Publisher<? extends T3> source3, Publisher<? extends T4> source4,
-            Publisher<? extends T5> source5, Publisher<? extends T6> source6,
-            Publisher<? extends T7> source7, Publisher<? extends T8> source8,
-            Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> combiner) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8,
+            @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1095,12 +1101,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            Publisher<? extends T3> source3, Publisher<? extends T4> source4,
-            Publisher<? extends T5> source5, Publisher<? extends T6> source6,
-            Publisher<? extends T7> source7, Publisher<? extends T8> source8,
-            Publisher<? extends T9> source9,
-            Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> combiner) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8,
+            @NonNull Publisher<? extends T9> source9,
+            @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1136,7 +1142,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(Iterable<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         // unlike general sources, fromIterable can only throw on a boundary because it is consumed only there
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, 2);
@@ -1167,7 +1173,8 @@ public static <T> Flowable<T> concat(Iterable<? extends Publisher<? extends T>>
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(Publisher<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
         return concat(sources, bufferSize());
     }
 
@@ -1199,7 +1206,8 @@ public static <T> Flowable<T> concat(Publisher<? extends Publisher<? extends T>>
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(Publisher<? extends Publisher<? extends T>> sources, int prefetch) {
+    @NonNull
+    public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? extends T>> sources, int prefetch) {
         return fromPublisher(sources).concatMap((Function)Functions.identity(), prefetch);
     }
 
@@ -1231,7 +1239,7 @@ public static <T> Flowable<T> concat(Publisher<? extends Publisher<? extends T>>
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(Publisher<? extends T> source1, Publisher<? extends T> source2) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
@@ -1268,8 +1276,8 @@ public static <T> Flowable<T> concat(Publisher<? extends T> source1, Publisher<?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concat(
-            Publisher<? extends T> source1, Publisher<? extends T> source2,
-            Publisher<? extends T> source3) {
+            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull Publisher<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1309,8 +1317,8 @@ public static <T> Flowable<T> concat(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concat(
-            Publisher<? extends T> source1, Publisher<? extends T> source2,
-            Publisher<? extends T> source3, Publisher<? extends T> source4) {
+            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull Publisher<? extends T> source3, @NonNull Publisher<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1342,14 +1350,15 @@ public static <T> Flowable<T> concat(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> concatArray(Publisher<? extends T>... sources) {
+    @NonNull
+    public static <T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sources) {
         if (sources.length == 0) {
             return empty();
         } else
         if (sources.length == 1) {
             return fromPublisher(sources[0]);
         }
-        return RxJavaPlugins.onAssembly(new FlowableConcatArray<T>(sources, false));
+        return RxJavaPlugins.onAssembly(new FlowableConcatArray<>(sources, false));
     }
 
     /**
@@ -1375,14 +1384,15 @@ public static <T> Flowable<T> concatArray(Publisher<? extends T>... sources) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayDelayError(Publisher<? extends T>... sources) {
+    @NonNull
+    public static <T> Flowable<T> concatArrayDelayError(@NonNull Publisher<? extends T>... sources) {
         if (sources.length == 0) {
             return empty();
         } else
         if (sources.length == 1) {
             return fromPublisher(sources[0]);
         }
-        return RxJavaPlugins.onAssembly(new FlowableConcatArray<T>(sources, true));
+        return RxJavaPlugins.onAssembly(new FlowableConcatArray<>(sources, true));
     }
 
     /**
@@ -1411,7 +1421,8 @@ public static <T> Flowable<T> concatArrayDelayError(Publisher<? extends T>... so
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayEager(Publisher<? extends T>... sources) {
+    @NonNull
+    public static <T> Flowable<T> concatArrayEager(@NonNull Publisher<? extends T>... sources) {
         return concatArrayEager(bufferSize(), bufferSize(), sources);
     }
 
@@ -1445,7 +1456,8 @@ public static <T> Flowable<T> concatArrayEager(Publisher<? extends T>... sources
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch, Publisher<? extends T>... sources) {
+    @SafeVarargs
+    public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch, @NonNull Publisher<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1479,7 +1491,8 @@ public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch,
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayEagerDelayError(Publisher<? extends T>... sources) {
+    @NonNull
+    public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<? extends T>... sources) {
         return concatArrayEagerDelayError(bufferSize(), bufferSize(), sources);
     }
 
@@ -1513,7 +1526,9 @@ public static <T> Flowable<T> concatArrayEagerDelayError(Publisher<? extends T>.
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int prefetch, Publisher<? extends T>... sources) {
+    @SafeVarargs
+    @NonNull
+    public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int prefetch, @NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, prefetch);
     }
 
@@ -1540,7 +1555,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(Iterable<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity());
     }
@@ -1563,7 +1578,8 @@ public static <T> Flowable<T> concatDelayError(Iterable<? extends Publisher<? ex
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(Publisher<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
         return concatDelayError(sources, bufferSize(), true);
     }
 
@@ -1589,7 +1605,8 @@ public static <T> Flowable<T> concatDelayError(Publisher<? extends Publisher<? e
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(Publisher<? extends Publisher<? extends T>> sources, int prefetch, boolean tillTheEnd) {
+    @NonNull
+    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources, int prefetch, boolean tillTheEnd) {
         return fromPublisher(sources).concatMapDelayError((Function)Functions.identity(), tillTheEnd, prefetch);
     }
 
@@ -1615,7 +1632,8 @@ public static <T> Flowable<T> concatDelayError(Publisher<? extends Publisher<? e
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(Publisher<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1646,7 +1664,7 @@ public static <T> Flowable<T> concatEager(Publisher<? extends Publisher<? extend
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatEager(Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1675,7 +1693,8 @@ public static <T> Flowable<T> concatEager(Publisher<? extends Publisher<? extend
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(Iterable<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1706,7 +1725,7 @@ public static <T> Flowable<T> concatEager(Iterable<? extends Publisher<? extends
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatEager(Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1769,10 +1788,10 @@ public static <T> Flowable<T> concatEager(Iterable<? extends Publisher<? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> create(FlowableOnSubscribe<T> source, BackpressureStrategy mode) {
+    public static <T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @NonNull BackpressureStrategy mode) {
         Objects.requireNonNull(source, "source is null");
         Objects.requireNonNull(mode, "mode is null");
-        return RxJavaPlugins.onAssembly(new FlowableCreate<T>(source, mode));
+        return RxJavaPlugins.onAssembly(new FlowableCreate<>(source, mode));
     }
 
     /**
@@ -1806,9 +1825,9 @@ public static <T> Flowable<T> create(FlowableOnSubscribe<T> source, Backpressure
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> defer(Supplier<? extends Publisher<? extends T>> supplier) {
+    public static <T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableDefer<T>(supplier));
+        return RxJavaPlugins.onAssembly(new FlowableDefer<>(supplier));
     }
 
     /**
@@ -1833,6 +1852,7 @@ public static <T> Flowable<T> defer(Supplier<? extends Publisher<? extends T>> s
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Flowable<T> empty() {
         return RxJavaPlugins.onAssembly((Flowable<T>) FlowableEmpty.INSTANCE);
     }
@@ -1861,7 +1881,7 @@ public static <T> Flowable<T> empty() {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> error(Supplier<? extends Throwable> supplier) {
+    public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableError<T>(supplier));
     }
@@ -1890,7 +1910,7 @@ public static <T> Flowable<T> error(Supplier<? extends Throwable> supplier) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> error(final Throwable throwable) {
+    public static <T> Flowable<T> error(@NonNull Throwable throwable) {
         Objects.requireNonNull(throwable, "throwable is null");
         return error(Functions.justSupplier(throwable));
     }
@@ -1919,7 +1939,7 @@ public static <T> Flowable<T> error(final Throwable throwable) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> fromArray(T... items) {
+    public static <@NonNull T> Flowable<T> fromArray(@NonNull T... items) {
         Objects.requireNonNull(items, "items is null");
         if (items.length == 0) {
             return empty();
@@ -1927,7 +1947,7 @@ public static <T> Flowable<T> fromArray(T... items) {
         if (items.length == 1) {
             return just(items[0]);
         }
-        return RxJavaPlugins.onAssembly(new FlowableFromArray<T>(items));
+        return RxJavaPlugins.onAssembly(new FlowableFromArray<>(items));
     }
 
     /**
@@ -1966,7 +1986,7 @@ public static <T> Flowable<T> fromArray(T... items) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> fromCallable(Callable<? extends T> supplier) {
+    public static <@NonNull T> Flowable<T> fromCallable(@NonNull Callable<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableFromCallable<T>(supplier));
     }
@@ -2008,7 +2028,7 @@ public static <T> Flowable<T> fromCallable(Callable<? extends T> supplier) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> fromFuture(Future<? extends T> future) {
+    public static <@NonNull T> Flowable<T> fromFuture(@NonNull Future<? extends T> future) {
         Objects.requireNonNull(future, "future is null");
         return RxJavaPlugins.onAssembly(new FlowableFromFuture<T>(future, 0L, null));
     }
@@ -2054,7 +2074,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit) {
+    public static <@NonNull T> Flowable<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
         Objects.requireNonNull(future, "future is null");
         Objects.requireNonNull(unit, "unit is null");
         return RxJavaPlugins.onAssembly(new FlowableFromFuture<T>(future, timeout, unit));
@@ -2105,7 +2125,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeou
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit, Scheduler scheduler) {
+    public static <@NonNull T> Flowable<T> fromFuture(Future<? extends T> future, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         return fromFuture((Future<T>)future, timeout, unit).subscribeOn(scheduler);
     }
@@ -2144,7 +2164,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, long timeou
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <T> Flowable<T> fromFuture(Future<? extends T> future, Scheduler scheduler) {
+    public static <@NonNull T> Flowable<T> fromFuture(Future<? extends T> future, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         return fromFuture((Future<T>)future).subscribeOn(scheduler);
     }
@@ -2174,7 +2194,7 @@ public static <T> Flowable<T> fromFuture(Future<? extends T> future, Scheduler s
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> fromIterable(Iterable<? extends T> source) {
+    public static <@NonNull T> Flowable<T> fromIterable(@NonNull Iterable<? extends T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new FlowableFromIterable<T>(source));
     }
@@ -2211,7 +2231,7 @@ public static <T> Flowable<T> fromIterable(Iterable<? extends T> source) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
-    public static <T> Flowable<T> fromPublisher(final Publisher<? extends T> source) {
+    public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> source) {
         if (source instanceof Flowable) {
             return RxJavaPlugins.onAssembly((Flowable<T>)source);
         }
@@ -2256,7 +2276,7 @@ public static <T> Flowable<T> fromPublisher(final Publisher<? extends T> source)
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> fromSupplier(Supplier<? extends T> supplier) {
+    public static <@NonNull T> Flowable<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableFromSupplier<T>(supplier));
     }
@@ -2286,7 +2306,7 @@ public static <T> Flowable<T> fromSupplier(Supplier<? extends T> supplier) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> generate(final Consumer<Emitter<T>> generator) {
+    public static <T> Flowable<T> generate(@NonNull Consumer<@NonNull Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(Functions.nullSupplier(),
                 FlowableInternalHelper.<T, Object>simpleGenerator(generator),
@@ -2320,7 +2340,7 @@ public static <T> Flowable<T> generate(final Consumer<Emitter<T>> generator) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Flowable<T> generate(Supplier<S> initialState, final BiConsumer<S, Emitter<T>> generator) {
+    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, @NonNull Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, FlowableInternalHelper.<T, S>simpleBiGenerator(generator),
                 Functions.emptyConsumer());
@@ -2355,8 +2375,8 @@ public static <T, S> Flowable<T> generate(Supplier<S> initialState, final BiCons
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Flowable<T> generate(Supplier<S> initialState, final BiConsumer<S, Emitter<T>> generator,
-            Consumer<? super S> disposeState) {
+    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, @NonNull Emitter<T>> generator,
+            @NonNull Consumer<? super S> disposeState) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, FlowableInternalHelper.<T, S>simpleBiGenerator(generator), disposeState);
     }
@@ -2388,7 +2408,8 @@ public static <T, S> Flowable<T> generate(Supplier<S> initialState, final BiCons
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Flowable<T> generate(Supplier<S> initialState, BiFunction<S, Emitter<T>, S> generator) {
+    @NonNull
+    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, @NonNull Emitter<T>, S> generator) {
         return generate(initialState, generator, Functions.emptyConsumer());
     }
 
@@ -2422,11 +2443,11 @@ public static <T, S> Flowable<T> generate(Supplier<S> initialState, BiFunction<S
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Flowable<T> generate(Supplier<S> initialState, BiFunction<S, Emitter<T>, S> generator, Consumer<? super S> disposeState) {
+    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, @NonNull Emitter<T>, S> generator, @NonNull Consumer<? super S> disposeState) {
         Objects.requireNonNull(initialState, "initialState is null");
         Objects.requireNonNull(generator, "generator is null");
         Objects.requireNonNull(disposeState, "disposeState is null");
-        return RxJavaPlugins.onAssembly(new FlowableGenerate<T, S>(initialState, generator, disposeState));
+        return RxJavaPlugins.onAssembly(new FlowableGenerate<>(initialState, generator, disposeState));
     }
 
     /**
@@ -2457,7 +2478,8 @@ public static <T, S> Flowable<T> generate(Supplier<S> initialState, BiFunction<S
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Flowable<Long> interval(long initialDelay, long period, TimeUnit unit) {
+    @NonNull
+    public static Flowable<Long> interval(long initialDelay, long period, @NonNull TimeUnit unit) {
         return interval(initialDelay, period, unit, Schedulers.computation());
     }
 
@@ -2492,7 +2514,7 @@ public static Flowable<Long> interval(long initialDelay, long period, TimeUnit u
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Flowable<Long> interval(long initialDelay, long period, TimeUnit unit, Scheduler scheduler) {
+    public static Flowable<Long> interval(long initialDelay, long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableInterval(Math.max(0L, initialDelay), Math.max(0L, period), unit, scheduler));
@@ -2520,7 +2542,8 @@ public static Flowable<Long> interval(long initialDelay, long period, TimeUnit u
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Flowable<Long> interval(long period, TimeUnit unit) {
+    @NonNull
+    public static Flowable<Long> interval(long period, @NonNull TimeUnit unit) {
         return interval(period, period, unit, Schedulers.computation());
     }
 
@@ -2550,7 +2573,8 @@ public static Flowable<Long> interval(long period, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Flowable<Long> interval(long period, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public static Flowable<Long> interval(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return interval(period, period, unit, scheduler);
     }
 
@@ -2574,7 +2598,8 @@ public static Flowable<Long> interval(long period, TimeUnit unit, Scheduler sche
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Flowable<Long> intervalRange(long start, long count, long initialDelay, long period, TimeUnit unit) {
+    @NonNull
+    public static Flowable<Long> intervalRange(long start, long count, long initialDelay, long period, @NonNull TimeUnit unit) {
         return intervalRange(start, count, initialDelay, period, unit, Schedulers.computation());
     }
 
@@ -2600,7 +2625,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Flowable<Long> intervalRange(long start, long count, long initialDelay, long period, TimeUnit unit, Scheduler scheduler) {
+    public static Flowable<Long> intervalRange(long start, long count, long initialDelay, long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         if (count < 0L) {
             throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
@@ -2652,9 +2677,9 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item) {
+    public static <@NonNull T> Flowable<T> just(T item) {
         Objects.requireNonNull(item, "item is null");
-        return RxJavaPlugins.onAssembly(new FlowableJust<T>(item));
+        return RxJavaPlugins.onAssembly(new FlowableJust<>(item));
     }
 
     /**
@@ -2681,7 +2706,7 @@ public static <T> Flowable<T> just(T item) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item1, T item2) {
+    public static <@NonNull T> Flowable<T> just(T item1, T item2) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
 
@@ -2714,7 +2739,7 @@ public static <T> Flowable<T> just(T item1, T item2) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item1, T item2, T item3) {
+    public static <@NonNull T> Flowable<T> just(T item1, T item2, T item3) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2750,7 +2775,7 @@ public static <T> Flowable<T> just(T item1, T item2, T item3) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item1, T item2, T item3, T item4) {
+    public static <@NonNull T> Flowable<T> just(T item1, T item2, T item3, T item4) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2789,7 +2814,7 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5) {
+    public static <@NonNull T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2831,7 +2856,7 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5)
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6) {
+    public static <@NonNull T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2876,7 +2901,7 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7) {
+    public static <@NonNull T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2924,7 +2949,7 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8) {
+    public static <@NonNull T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2975,7 +3000,7 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9) {
+    public static <@NonNull T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -3029,7 +3054,7 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9, T item10) {
+    public static <@NonNull T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9, T item10) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -3091,7 +3116,8 @@ public static <T> Flowable<T> just(T item1, T item2, T item3, T item4, T item5,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    @NonNull
+    public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -3142,7 +3168,9 @@ public static <T> Flowable<T> merge(Iterable<? extends Publisher<? extends T>> s
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, Publisher<? extends T>... sources) {
+    @SafeVarargs
+    @NonNull
+    public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -3186,7 +3214,8 @@ public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, Pub
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Iterable<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity());
     }
 
@@ -3235,7 +3264,8 @@ public static <T> Flowable<T> merge(Iterable<? extends Publisher<? extends T>> s
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency) {
+    @NonNull
+    public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), maxConcurrency);
     }
 
@@ -3280,7 +3310,8 @@ public static <T> Flowable<T> merge(Iterable<? extends Publisher<? extends T>> s
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Publisher<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
         return merge(sources, bufferSize());
     }
 
@@ -3331,7 +3362,8 @@ public static <T> Flowable<T> merge(Publisher<? extends Publisher<? extends T>>
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency) {
+    @NonNull
+    public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency) {
         return fromPublisher(sources).flatMap((Function)Functions.identity(), maxConcurrency);
     }
 
@@ -3374,7 +3406,9 @@ public static <T> Flowable<T> merge(Publisher<? extends Publisher<? extends T>>
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeArray(Publisher<? extends T>... sources) {
+    @SafeVarargs
+    @NonNull
+    public static <T> Flowable<T> mergeArray(@NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), sources.length);
     }
 
@@ -3420,7 +3454,7 @@ public static <T> Flowable<T> mergeArray(Publisher<? extends T>... sources) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Publisher<? extends T> source1, Publisher<? extends T> source2) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), false, 2);
@@ -3470,7 +3504,7 @@ public static <T> Flowable<T> merge(Publisher<? extends T> source1, Publisher<?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Publisher<? extends T> source1, Publisher<? extends T> source2, Publisher<? extends T> source3) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2, @NonNull Publisher<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3524,8 +3558,8 @@ public static <T> Flowable<T> merge(Publisher<? extends T> source1, Publisher<?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> merge(
-            Publisher<? extends T> source1, Publisher<? extends T> source2,
-            Publisher<? extends T> source3, Publisher<? extends T> source4) {
+            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull Publisher<? extends T> source3, @NonNull Publisher<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3565,7 +3599,8 @@ public static <T> Flowable<T> merge(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Iterable<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true);
     }
 
@@ -3605,7 +3640,8 @@ public static <T> Flowable<T> mergeDelayError(Iterable<? extends Publisher<? ext
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    @NonNull
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -3645,7 +3681,9 @@ public static <T> Flowable<T> mergeDelayError(Iterable<? extends Publisher<? ext
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, Publisher<? extends T>... sources) {
+    @SafeVarargs
+    @NonNull
+    public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, @NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -3683,7 +3721,8 @@ public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int buffe
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency) {
+    @NonNull
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency);
     }
 
@@ -3719,7 +3758,8 @@ public static <T> Flowable<T> mergeDelayError(Iterable<? extends Publisher<? ext
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Publisher<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
         return mergeDelayError(sources, bufferSize());
     }
 
@@ -3759,7 +3799,8 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends Publisher<? ex
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency) {
+    @NonNull
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency) {
         return fromPublisher(sources).flatMap((Function)Functions.identity(), true, maxConcurrency);
     }
 
@@ -3795,7 +3836,9 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends Publisher<? ex
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeArrayDelayError(Publisher<? extends T>... sources) {
+    @SafeVarargs
+    @NonNull
+    public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, sources.length);
     }
 
@@ -3833,7 +3876,7 @@ public static <T> Flowable<T> mergeArrayDelayError(Publisher<? extends T>... sou
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Publisher<? extends T> source1, Publisher<? extends T> source2) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), true, 2);
@@ -3876,7 +3919,7 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends T> source1, Pu
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Publisher<? extends T> source1, Publisher<? extends T> source2, Publisher<? extends T> source3) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2, @NonNull Publisher<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3923,8 +3966,8 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends T> source1, Pu
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(
-            Publisher<? extends T> source1, Publisher<? extends T> source2,
-            Publisher<? extends T> source3, Publisher<? extends T> source4) {
+            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull Publisher<? extends T> source3, @NonNull Publisher<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3954,6 +3997,7 @@ public static <T> Flowable<T> mergeDelayError(
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Flowable<T> never() {
         return RxJavaPlugins.onAssembly((Flowable<T>) FlowableNever.INSTANCE);
     }
@@ -3982,6 +4026,7 @@ public static <T> Flowable<T> never() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static Flowable<Integer> range(int start, int count) {
         if (count < 0) {
             throw new IllegalArgumentException("count >= 0 required but it was " + count);
@@ -4022,6 +4067,7 @@ public static Flowable<Integer> range(int start, int count) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static Flowable<Long> rangeLong(long start, long count) {
         if (count < 0) {
             throw new IllegalArgumentException("count >= 0 required but it was " + count);
@@ -4068,7 +4114,8 @@ public static Flowable<Long> rangeLong(long start, long count) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1, Publisher<? extends T> source2) {
+    @NonNull
+    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize());
     }
 
@@ -4101,8 +4148,9 @@ public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1, Publisher<? extends T> source2,
-            BiPredicate<? super T, ? super T> isEqual) {
+    @NonNull
+    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull BiPredicate<? super T, ? super T> isEqual) {
         return sequenceEqual(source1, source2, isEqual, bufferSize());
     }
 
@@ -4138,13 +4186,13 @@ public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1, Publisher<? extends T> source2,
-            BiPredicate<? super T, ? super T> isEqual, int bufferSize) {
+    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull BiPredicate<? super T, ? super T> isEqual, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(isEqual, "isEqual is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableSequenceEqualSingle<T>(source1, source2, isEqual, bufferSize));
+        return RxJavaPlugins.onAssembly(new FlowableSequenceEqualSingle<>(source1, source2, isEqual, bufferSize));
     }
 
     /**
@@ -4174,7 +4222,8 @@ public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1, Publisher<? extends T> source2, int bufferSize) {
+    @NonNull
+    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2, int bufferSize) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize);
     }
 
@@ -4214,7 +4263,8 @@ public static <T> Single<Boolean> sequenceEqual(Publisher<? extends T> source1,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> switchOnNext(Publisher<? extends Publisher<? extends T>> sources, int bufferSize) {
+    @NonNull
+    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publisher<? extends T>> sources, int bufferSize) {
         return fromPublisher(sources).switchMap((Function)Functions.identity(), bufferSize);
     }
 
@@ -4252,7 +4302,8 @@ public static <T> Flowable<T> switchOnNext(Publisher<? extends Publisher<? exten
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> switchOnNext(Publisher<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
         return fromPublisher(sources).switchMap((Function)Functions.identity());
     }
 
@@ -4291,7 +4342,8 @@ public static <T> Flowable<T> switchOnNext(Publisher<? extends Publisher<? exten
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> switchOnNextDelayError(Publisher<? extends Publisher<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
         return switchOnNextDelayError(sources, bufferSize());
     }
 
@@ -4332,7 +4384,8 @@ public static <T> Flowable<T> switchOnNextDelayError(Publisher<? extends Publish
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> switchOnNextDelayError(Publisher<? extends Publisher<? extends T>> sources, int prefetch) {
+    @NonNull
+    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources, int prefetch) {
         return fromPublisher(sources).switchMapDelayError(Functions.<Publisher<? extends T>>identity(), prefetch);
     }
 
@@ -4358,7 +4411,8 @@ public static <T> Flowable<T> switchOnNextDelayError(Publisher<? extends Publish
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Flowable<Long> timer(long delay, TimeUnit unit) {
+    @NonNull
+    public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit) {
         return timer(delay, unit, Schedulers.computation());
     }
 
@@ -4389,7 +4443,7 @@ public static Flowable<Long> timer(long delay, TimeUnit unit) {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Flowable<Long> timer(long delay, TimeUnit unit, Scheduler scheduler) {
+    public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
 
@@ -4418,12 +4472,12 @@ public static Flowable<Long> timer(long delay, TimeUnit unit, Scheduler schedule
     @NonNull
     @BackpressureSupport(BackpressureKind.NONE)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> unsafeCreate(Publisher<T> onSubscribe) {
+    public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         if (onSubscribe instanceof Flowable) {
             throw new IllegalArgumentException("unsafeCreate(Flowable) should be upgraded");
         }
-        return RxJavaPlugins.onAssembly(new FlowableFromPublisher<T>(onSubscribe));
+        return RxJavaPlugins.onAssembly(new FlowableFromPublisher<>(onSubscribe));
     }
 
     /**
@@ -4452,8 +4506,11 @@ public static <T> Flowable<T> unsafeCreate(Publisher<T> onSubscribe) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, D> Flowable<T> using(Supplier<? extends D> resourceSupplier,
-            Function<? super D, ? extends Publisher<? extends T>> sourceSupplier, Consumer<? super D> resourceDisposer) {
+    @NonNull
+    public static <T, D> Flowable<T> using(
+            @NonNull Supplier<? extends D> resourceSupplier,
+            @NonNull Function<? super D, ? extends Publisher<? extends T>> sourceSupplier,
+            @NonNull Consumer<? super D> resourceDisposer) {
         return using(resourceSupplier, sourceSupplier, resourceDisposer, true);
     }
 
@@ -4494,9 +4551,11 @@ public static <T, D> Flowable<T> using(Supplier<? extends D> resourceSupplier,
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, D> Flowable<T> using(Supplier<? extends D> resourceSupplier,
-            Function<? super D, ? extends Publisher<? extends T>> sourceSupplier,
-                    Consumer<? super D> resourceDisposer, boolean eager) {
+    public static <T, D> Flowable<T> using(
+            @NonNull Supplier<? extends D> resourceSupplier,
+            @NonNull Function<? super D, ? extends Publisher<? extends T>> sourceSupplier,
+            @NonNull Consumer<? super D> resourceDisposer,
+            boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
         Objects.requireNonNull(resourceDisposer, "resourceDisposer is null");
@@ -4551,7 +4610,7 @@ public static <T, D> Flowable<T> using(Supplier<? extends D> resourceSupplier,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Flowable<R> zip(Iterable<? extends Publisher<? extends T>> sources, Function<? super Object[], ? extends R> zipper) {
+    public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableZip<T, R>(null, sources, zipper, bufferSize(), false));
@@ -4610,8 +4669,8 @@ public static <T, R> Flowable<R> zip(Iterable<? extends Publisher<? extends T>>
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Flowable<R> zip(Iterable<? extends Publisher<? extends T>> sources,
-            Function<? super Object[], ? extends R> zipper, boolean delayError,
+    public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> zipper, boolean delayError,
             int bufferSize) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
@@ -4672,8 +4731,8 @@ public static <T, R> Flowable<R> zip(Iterable<? extends Publisher<? extends T>>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> zipper) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2);
@@ -4733,8 +4792,8 @@ public static <T1, T2, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize(), source1, source2);
@@ -4795,8 +4854,8 @@ public static <T1, T2, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize, source1, source2);
@@ -4859,8 +4918,8 @@ public static <T1, T2, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
-            Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -4927,9 +4986,9 @@ public static <T1, T2, T3, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
-            Publisher<? extends T4> source4,
-            Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4,
+            @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -5000,9 +5059,9 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
-            Publisher<? extends T4> source4, Publisher<? extends T5> source5,
-            Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5,
+            @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -5076,9 +5135,9 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
-            Publisher<? extends T4> source4, Publisher<? extends T5> source5, Publisher<? extends T6> source6,
-            Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -5156,10 +5215,10 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
-            Publisher<? extends T4> source4, Publisher<? extends T5> source5, Publisher<? extends T6> source6,
-            Publisher<? extends T7> source7,
-            Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7,
+            @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -5241,10 +5300,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
-            Publisher<? extends T4> source4, Publisher<? extends T5> source5, Publisher<? extends T6> source6,
-            Publisher<? extends T7> source7, Publisher<? extends T8> source8,
-            Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8,
+            @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -5330,10 +5389,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
-            Publisher<? extends T1> source1, Publisher<? extends T2> source2, Publisher<? extends T3> source3,
-            Publisher<? extends T4> source4, Publisher<? extends T5> source5, Publisher<? extends T6> source6,
-            Publisher<? extends T7> source7, Publisher<? extends T8> source8, Publisher<? extends T9> source9,
-            Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8, @NonNull Publisher<? extends T9> source9,
+            @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
 
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5401,8 +5460,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T, R> Flowable<R> zipArray(Function<? super Object[], ? extends R> zipper,
-            boolean delayError, int bufferSize, Publisher<? extends T>... sources) {
+    public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper,
+            boolean delayError, int bufferSize, @NonNull Publisher<? extends T>... sources) {
         if (sources.length == 0) {
             return empty();
         }
@@ -5438,9 +5497,9 @@ public static <T, R> Flowable<R> zipArray(Function<? super Object[], ? extends R
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> all(Predicate<? super T> predicate) {
+    public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new FlowableAllSingle<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new FlowableAllSingle<>(this, predicate));
     }
 
     /**
@@ -5467,7 +5526,7 @@ public final Single<Boolean> all(Predicate<? super T> predicate) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> ambWith(Publisher<? extends T> other) {
+    public final Flowable<T> ambWith(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
@@ -5499,9 +5558,9 @@ public final Flowable<T> ambWith(Publisher<? extends T> other) {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> any(Predicate<? super T> predicate) {
+    public final Single<Boolean> any(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new FlowableAnySingle<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new FlowableAnySingle<>(this, predicate));
     }
 
     /**
@@ -5527,8 +5586,9 @@ public final Single<Boolean> any(Predicate<? super T> predicate) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final T blockingFirst() {
-        BlockingFirstSubscriber<T> s = new BlockingFirstSubscriber<T>();
+        BlockingFirstSubscriber<T> s = new BlockingFirstSubscriber<>();
         subscribe(s);
         T v = s.blockingGet();
         if (v != null) {
@@ -5561,8 +5621,9 @@ public final T blockingFirst() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final T blockingFirst(T defaultItem) {
-        BlockingFirstSubscriber<T> s = new BlockingFirstSubscriber<T>();
+    @NonNull
+    public final T blockingFirst(@NonNull T defaultItem) {
+        BlockingFirstSubscriber<T> s = new BlockingFirstSubscriber<>();
         subscribe(s);
         T v = s.blockingGet();
         return v != null ? v : defaultItem;
@@ -5602,7 +5663,7 @@ public final T blockingFirst(T defaultItem) {
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingForEach(Consumer<? super T> onNext) {
+    public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
         Iterator<T> it = blockingIterable().iterator();
         while (it.hasNext()) {
             try {
@@ -5633,6 +5694,7 @@ public final void blockingForEach(Consumer<? super T> onNext) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Iterable<T> blockingIterable() {
         return blockingIterable(bufferSize());
     }
@@ -5657,9 +5719,10 @@ public final Iterable<T> blockingIterable() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Iterable<T> blockingIterable(int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return new BlockingFlowableIterable<T>(this, bufferSize);
+        return new BlockingFlowableIterable<>(this, bufferSize);
     }
 
     /**
@@ -5687,8 +5750,9 @@ public final Iterable<T> blockingIterable(int bufferSize) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final T blockingLast() {
-        BlockingLastSubscriber<T> s = new BlockingLastSubscriber<T>();
+        BlockingLastSubscriber<T> s = new BlockingLastSubscriber<>();
         subscribe(s);
         T v = s.blockingGet();
         if (v != null) {
@@ -5723,8 +5787,9 @@ public final T blockingLast() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final T blockingLast(T defaultItem) {
-        BlockingLastSubscriber<T> s = new BlockingLastSubscriber<T>();
+    @NonNull
+    public final T blockingLast(@NonNull T defaultItem) {
+        BlockingLastSubscriber<T> s = new BlockingLastSubscriber<>();
         subscribe(s);
         T v = s.blockingGet();
         return v != null ? v : defaultItem;
@@ -5753,8 +5818,9 @@ public final T blockingLast(T defaultItem) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Iterable<T> blockingLatest() {
-        return new BlockingFlowableLatest<T>(this);
+        return new BlockingFlowableLatest<>(this);
     }
 
     /**
@@ -5780,8 +5846,9 @@ public final Iterable<T> blockingLatest() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Iterable<T> blockingMostRecent(T initialItem) {
-        return new BlockingFlowableMostRecent<T>(this, initialItem);
+    @NonNull
+    public final Iterable<T> blockingMostRecent(@NonNull T initialItem) {
+        return new BlockingFlowableMostRecent<>(this, initialItem);
     }
 
     /**
@@ -5804,8 +5871,9 @@ public final Iterable<T> blockingMostRecent(T initialItem) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Iterable<T> blockingNext() {
-        return new BlockingFlowableNext<T>(this);
+        return new BlockingFlowableNext<>(this);
     }
 
     /**
@@ -5831,6 +5899,7 @@ public final Iterable<T> blockingNext() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final T blockingSingle() {
         return singleOrError().blockingGet();
     }
@@ -5862,7 +5931,8 @@ public final T blockingSingle() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final T blockingSingle(T defaultItem) {
+    @NonNull
+    public final T blockingSingle(@NonNull T defaultItem) {
         return single(defaultItem).blockingGet();
     }
 
@@ -5891,6 +5961,7 @@ public final T blockingSingle(T defaultItem) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Future<T> toFuture() {
         return subscribeWith(new FutureSubscriber<T>());
     }
@@ -5945,7 +6016,7 @@ public final void blockingSubscribe() {
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Consumer<? super T> onNext) {
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onNext) {
         FlowableBlockingSubscribe.subscribe(this, onNext, Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
 
@@ -5977,7 +6048,7 @@ public final void blockingSubscribe(Consumer<? super T> onNext) {
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Consumer<? super T> onNext, int bufferSize) {
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, int bufferSize) {
         FlowableBlockingSubscribe.subscribe(this, onNext, Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION, bufferSize);
     }
 
@@ -6001,7 +6072,7 @@ public final void blockingSubscribe(Consumer<? super T> onNext, int bufferSize)
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError) {
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError) {
         FlowableBlockingSubscribe.subscribe(this, onNext, onError, Functions.EMPTY_ACTION);
     }
 
@@ -6027,7 +6098,7 @@ public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError,
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError,
         int bufferSize) {
         FlowableBlockingSubscribe.subscribe(this, onNext, onError, Functions.EMPTY_ACTION, bufferSize);
     }
@@ -6052,7 +6123,7 @@ public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError, Action onComplete) {
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError, @NonNull Action onComplete) {
         FlowableBlockingSubscribe.subscribe(this, onNext, onError, onComplete);
     }
 
@@ -6078,7 +6149,7 @@ public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError, Action onComplete,
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError, @NonNull Action onComplete,
         int bufferSize) {
         FlowableBlockingSubscribe.subscribe(this, onNext, onError, onComplete, bufferSize);
     }
@@ -6103,7 +6174,7 @@ public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Subscriber<? super T> subscriber) {
+    public final void blockingSubscribe(@NonNull Subscriber<? super T> subscriber) {
         FlowableBlockingSubscribe.subscribe(this, subscriber);
     }
 
@@ -6133,6 +6204,7 @@ public final void blockingSubscribe(Subscriber<? super T> subscriber) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<List<T>> buffer(int count) {
         return buffer(count, count);
     }
@@ -6167,6 +6239,7 @@ public final Flowable<List<T>> buffer(int count) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<List<T>> buffer(int count, int skip) {
         return buffer(count, skip, ArrayListSupplier.<T>asSupplier());
     }
@@ -6206,11 +6279,11 @@ public final Flowable<List<T>> buffer(int count, int skip) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int skip, Supplier<U> bufferSupplier) {
+    public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int skip, @NonNull Supplier<U> bufferSupplier) {
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(skip, "skip");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableBuffer<T, U>(this, count, skip, bufferSupplier));
+        return RxJavaPlugins.onAssembly(new FlowableBuffer<>(this, count, skip, bufferSupplier));
     }
 
     /**
@@ -6243,7 +6316,8 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U extends Collection<? super T>> Flowable<U> buffer(int count, Supplier<U> bufferSupplier) {
+    @NonNull
+    public final <U extends Collection<? super T>> Flowable<U> buffer(int count, @NonNull Supplier<U> bufferSupplier) {
         return buffer(count, count, bufferSupplier);
     }
 
@@ -6277,7 +6351,8 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, Sup
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<List<T>> buffer(long timespan, long timeskip, TimeUnit unit) {
+    @NonNull
+    public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull TimeUnit unit) {
         return buffer(timespan, timeskip, unit, Schedulers.computation(), ArrayListSupplier.<T>asSupplier());
     }
 
@@ -6314,7 +6389,8 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, TimeUnit uni
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<List<T>> buffer(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return buffer(timespan, timeskip, unit, scheduler, ArrayListSupplier.<T>asSupplier());
     }
 
@@ -6356,12 +6432,12 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, TimeUnit uni
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan, long timeskip, TimeUnit unit,
-            Scheduler scheduler, Supplier<U> bufferSupplier) {
+    public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan, long timeskip, @NonNull TimeUnit unit,
+            @NonNull Scheduler scheduler, @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableBufferTimed<T, U>(this, timespan, timeskip, unit, scheduler, bufferSupplier, Integer.MAX_VALUE, false));
+        return RxJavaPlugins.onAssembly(new FlowableBufferTimed<>(this, timespan, timeskip, unit, scheduler, bufferSupplier, Integer.MAX_VALUE, false));
     }
 
     /**
@@ -6393,7 +6469,8 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<List<T>> buffer(long timespan, TimeUnit unit) {
+    @NonNull
+    public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit) {
         return buffer(timespan, unit, Schedulers.computation(), Integer.MAX_VALUE);
     }
 
@@ -6429,7 +6506,8 @@ public final Flowable<List<T>> buffer(long timespan, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<List<T>> buffer(long timespan, TimeUnit unit, int count) {
+    @NonNull
+    public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, int count) {
         return buffer(timespan, unit, Schedulers.computation(), count);
     }
 
@@ -6468,7 +6546,8 @@ public final Flowable<List<T>> buffer(long timespan, TimeUnit unit, int count) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler scheduler, int count) {
+    @NonNull
+    public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int count) {
         return buffer(timespan, unit, scheduler, count, ArrayListSupplier.<T>asSupplier(), false);
     }
 
@@ -6513,16 +6592,17 @@ public final Flowable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler sc
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
     public final <U extends Collection<? super T>> Flowable<U> buffer(
-            long timespan, TimeUnit unit,
-            Scheduler scheduler, int count,
-            Supplier<U> bufferSupplier,
+            long timespan, @NonNull TimeUnit unit,
+            @NonNull Scheduler scheduler, int count,
+            @NonNull Supplier<U> bufferSupplier,
             boolean restartTimerOnMaxSize) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         ObjectHelper.verifyPositive(count, "count");
-        return RxJavaPlugins.onAssembly(new FlowableBufferTimed<T, U>(this, timespan, timespan, unit, scheduler, bufferSupplier, count, restartTimerOnMaxSize));
+        return RxJavaPlugins.onAssembly(new FlowableBufferTimed<>(this, timespan, timespan, unit, scheduler, bufferSupplier, count, restartTimerOnMaxSize));
     }
 
     /**
@@ -6556,7 +6636,8 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return buffer(timespan, unit, scheduler, Integer.MAX_VALUE, ArrayListSupplier.<T>asSupplier(), false);
     }
 
@@ -6590,9 +6671,10 @@ public final Flowable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler sc
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <TOpening, TClosing> Flowable<List<T>> buffer(
-            Flowable<? extends TOpening> openingIndicator,
-            Function<? super TOpening, ? extends Publisher<? extends TClosing>> closingIndicator) {
+            @NonNull Flowable<? extends TOpening> openingIndicator,
+            @NonNull Function<? super TOpening, ? extends Publisher<? extends TClosing>> closingIndicator) {
         return buffer(openingIndicator, closingIndicator, ArrayListSupplier.<T>asSupplier());
     }
 
@@ -6630,10 +6712,11 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> buffer(
-            Flowable<? extends TOpening> openingIndicator,
-            Function<? super TOpening, ? extends Publisher<? extends TClosing>> closingIndicator,
-            Supplier<U> bufferSupplier) {
+            @NonNull Flowable<? extends TOpening> openingIndicator,
+            @NonNull Function<? super TOpening, ? extends Publisher<? extends TClosing>> closingIndicator,
+            @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
         Objects.requireNonNull(closingIndicator, "closingIndicator is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
@@ -6670,7 +6753,8 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B> Flowable<List<T>> buffer(Publisher<B> boundaryIndicator) {
+    @NonNull
+    public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator) {
         return buffer(boundaryIndicator, ArrayListSupplier.<T>asSupplier());
     }
 
@@ -6706,7 +6790,8 @@ public final <B> Flowable<List<T>> buffer(Publisher<B> boundaryIndicator) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B> Flowable<List<T>> buffer(Publisher<B> boundaryIndicator, final int initialCapacity) {
+    @NonNull
+    public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator, final int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
         return buffer(boundaryIndicator, Functions.<T>createArrayList(initialCapacity));
     }
@@ -6745,10 +6830,11 @@ public final <B> Flowable<List<T>> buffer(Publisher<B> boundaryIndicator, final
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B, U extends Collection<? super T>> Flowable<U> buffer(Publisher<B> boundaryIndicator, Supplier<U> bufferSupplier) {
+    @NonNull
+    public final <B, U extends Collection<? super T>> Flowable<U> buffer(@NonNull Publisher<B> boundaryIndicator, @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableBufferExactBoundary<T, U, B>(this, boundaryIndicator, bufferSupplier));
+        return RxJavaPlugins.onAssembly(new FlowableBufferExactBoundary<>(this, boundaryIndicator, bufferSupplier));
     }
 
     /**
@@ -6805,6 +6891,7 @@ public final <B, U extends Collection<? super T>> Flowable<U> buffer(Publisher<B
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> cache() {
         return cacheWithInitialCapacity(16);
     }
@@ -6867,9 +6954,10 @@ public final Flowable<T> cache() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
-        return RxJavaPlugins.onAssembly(new FlowableCache<T>(this, initialCapacity));
+        return RxJavaPlugins.onAssembly(new FlowableCache<>(this, initialCapacity));
     }
 
     /**
@@ -6897,7 +6985,7 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> cast(final Class<U> clazz) {
+    public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
@@ -6936,7 +7024,7 @@ public final <U> Flowable<U> cast(final Class<U> clazz) {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<U> collect(Supplier<? extends U> initialItemSupplier, BiConsumer<? super U, ? super T> collector) {
+    public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
         Objects.requireNonNull(initialItemSupplier, "initialItemSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new FlowableCollectSingle<T, U>(this, initialItemSupplier, collector));
@@ -6975,7 +7063,7 @@ public final <U> Single<U> collect(Supplier<? extends U> initialItemSupplier, Bi
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<U> collectInto(final U initialItem, BiConsumer<? super U, ? super T> collector) {
+    public final <@NonNull U> Single<U> collectInto(U initialItem, @NonNull BiConsumer<? super U, ? super T> collector) {
         Objects.requireNonNull(initialItem, "initialItem is null");
         return collect(Functions.justSupplier(initialItem), collector);
     }
@@ -7006,7 +7094,8 @@ public final <U> Single<U> collectInto(final U initialItem, BiConsumer<? super U
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> compose(FlowableTransformer<? super T, ? extends R> composer) {
+    @NonNull
+    public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? extends R> composer) {
         return fromPublisher(((FlowableTransformer<T, R>) Objects.requireNonNull(composer, "composer is null")).apply(this));
     }
 
@@ -7042,7 +7131,8 @@ public final <R> Flowable<R> compose(FlowableTransformer<? super T, ? extends R>
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
         return concatMap(mapper, 2);
     }
 
@@ -7082,7 +7172,7 @@ public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<? extends R>> mapper, int prefetch) {
+    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         if (this instanceof ScalarSupplier) {
@@ -7093,7 +7183,7 @@ public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<?
             }
             return FlowableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new FlowableConcatMap<T, R>(this, mapper, prefetch, ErrorMode.IMMEDIATE));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMap<>(this, mapper, prefetch, ErrorMode.IMMEDIATE));
     }
 
     /**
@@ -7135,11 +7225,11 @@ public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<? extends R>> mapper, int prefetch, Scheduler scheduler) {
+    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int prefetch, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         Objects.requireNonNull(scheduler, "scheduler");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapScheduler<T, R>(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapScheduler<>(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler));
     }
 
     /**
@@ -7165,7 +7255,8 @@ public final <R> Flowable<R> concatMap(Function<? super T, ? extends Publisher<?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public final Completable concatMapCompletable(Function<? super T, ? extends CompletableSource> mapper) {
+    @NonNull
+    public final Completable concatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         return concatMapCompletable(mapper, 2);
     }
 
@@ -7197,10 +7288,10 @@ public final Completable concatMapCompletable(Function<? super T, ? extends Comp
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public final Completable concatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, int prefetch) {
+    public final Completable concatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapCompletable<T>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapCompletable<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
 
     /**
@@ -7227,7 +7318,8 @@ public final Completable concatMapCompletable(Function<? super T, ? extends Comp
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public final Completable concatMapCompletableDelayError(Function<? super T, ? extends CompletableSource> mapper) {
+    @NonNull
+    public final Completable concatMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         return concatMapCompletableDelayError(mapper, true, 2);
     }
 
@@ -7261,7 +7353,8 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public final Completable concatMapCompletableDelayError(Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd) {
+    @NonNull
+    public final Completable concatMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd) {
         return concatMapCompletableDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -7300,10 +7393,10 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public final Completable concatMapCompletableDelayError(Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd, int prefetch) {
+    public final Completable concatMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapCompletable<T>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapCompletable<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
 
     /**
@@ -7334,7 +7427,8 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
         return concatMapDelayError(mapper, true, 2);
     }
 
@@ -7373,7 +7467,7 @@ public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends P
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -7385,7 +7479,7 @@ public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends P
             }
             return FlowableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new FlowableConcatMap<T, R>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMap<>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
     }
 
     /**
@@ -7425,12 +7519,12 @@ public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends P
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper,
-            boolean tillTheEnd, int prefetch, Scheduler scheduler) {
+    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+            boolean tillTheEnd, int prefetch, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapScheduler<T, R>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapScheduler<>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler));
     }
 
     /**
@@ -7456,7 +7550,8 @@ public final <R> Flowable<R> concatMapDelayError(Function<? super T, ? extends P
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapEager(Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
         return concatMapEager(mapper, bufferSize(), bufferSize());
     }
 
@@ -7486,12 +7581,12 @@ public final <R> Flowable<R> concatMapEager(Function<? super T, ? extends Publis
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapEager(Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
             int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapEager<T, R>(this, mapper, maxConcurrency, prefetch, ErrorMode.IMMEDIATE));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapEager<>(this, mapper, maxConcurrency, prefetch, ErrorMode.IMMEDIATE));
     }
 
     /**
@@ -7520,7 +7615,8 @@ public final <R> Flowable<R> concatMapEager(Function<? super T, ? extends Publis
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapEagerDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper,
+    @NonNull
+    public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd) {
         return concatMapEagerDelayError(mapper, tillTheEnd, bufferSize(), bufferSize());
     }
@@ -7556,12 +7652,12 @@ public final <R> Flowable<R> concatMapEagerDelayError(Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapEagerDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapEager<T, R>(this, mapper, maxConcurrency, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapEager<>(this, mapper, maxConcurrency, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
     }
 
     /**
@@ -7589,7 +7685,8 @@ public final <R> Flowable<R> concatMapEagerDelayError(Function<? super T, ? exte
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> concatMapIterable(Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    @NonNull
+    public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
         return concatMapIterable(mapper, 2);
     }
 
@@ -7621,10 +7718,10 @@ public final <U> Flowable<U> concatMapIterable(Function<? super T, ? extends Ite
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> concatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper, int prefetch) {
+    public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<T, U>(this, mapper, prefetch));
+        return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<>(this, mapper, prefetch));
     }
 
     /**
@@ -7654,7 +7751,8 @@ public final <U> Flowable<U> concatMapIterable(final Function<? super T, ? exten
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return concatMapMaybe(mapper, 2);
     }
 
@@ -7690,10 +7788,10 @@ public final <R> Flowable<R> concatMapMaybe(Function<? super T, ? extends MaybeS
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
+    public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe<T, R>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
 
     /**
@@ -7723,7 +7821,8 @@ public final <R> Flowable<R> concatMapMaybe(Function<? super T, ? extends MaybeS
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapMaybeDelayError(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return concatMapMaybeDelayError(mapper, true, 2);
     }
 
@@ -7760,7 +7859,8 @@ public final <R> Flowable<R> concatMapMaybeDelayError(Function<? super T, ? exte
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapMaybeDelayError(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd) {
+    @NonNull
+    public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd) {
         return concatMapMaybeDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -7801,10 +7901,10 @@ public final <R> Flowable<R> concatMapMaybeDelayError(Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapMaybeDelayError(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
+    public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
 
     /**
@@ -7834,7 +7934,8 @@ public final <R> Flowable<R> concatMapMaybeDelayError(Function<? super T, ? exte
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return concatMapSingle(mapper, 2);
     }
 
@@ -7870,10 +7971,10 @@ public final <R> Flowable<R> concatMapSingle(Function<? super T, ? extends Singl
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
+    public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle<T, R>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
 
     /**
@@ -7903,7 +8004,8 @@ public final <R> Flowable<R> concatMapSingle(Function<? super T, ? extends Singl
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapSingleDelayError(Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return concatMapSingleDelayError(mapper, true, 2);
     }
 
@@ -7940,7 +8042,8 @@ public final <R> Flowable<R> concatMapSingleDelayError(Function<? super T, ? ext
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapSingleDelayError(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd) {
+    @NonNull
+    public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd) {
         return concatMapSingleDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -7981,10 +8084,10 @@ public final <R> Flowable<R> concatMapSingleDelayError(Function<? super T, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapSingleDelayError(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
+    public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
 
     /**
@@ -8011,7 +8114,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(Function<? super T, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> concatWith(Publisher<? extends T> other) {
+    public final Flowable<T> concatWith(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return concat(this, other);
     }
@@ -8036,9 +8139,10 @@ public final Flowable<T> concatWith(Publisher<? extends T> other) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new FlowableConcatWithSingle<T>(this, other));
+        return RxJavaPlugins.onAssembly(new FlowableConcatWithSingle<>(this, other));
     }
 
     /**
@@ -8061,9 +8165,10 @@ public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new FlowableConcatWithMaybe<T>(this, other));
+        return RxJavaPlugins.onAssembly(new FlowableConcatWithMaybe<>(this, other));
     }
 
     /**
@@ -8088,9 +8193,10 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> concatWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new FlowableConcatWithCompletable<T>(this, other));
+        return RxJavaPlugins.onAssembly(new FlowableConcatWithCompletable<>(this, other));
     }
 
     /**
@@ -8116,7 +8222,7 @@ public final Flowable<T> concatWith(@NonNull CompletableSource other) {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> contains(final Object item) {
+    public final Single<Boolean> contains(@NonNull Object item) {
         Objects.requireNonNull(item, "item is null");
         return any(Functions.equalsWith(item));
     }
@@ -8141,8 +8247,9 @@ public final Single<Boolean> contains(final Object item) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<Long> count() {
-        return RxJavaPlugins.onAssembly(new FlowableCountSingle<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableCountSingle<>(this));
     }
 
     /**
@@ -8179,9 +8286,9 @@ public final Single<Long> count() {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> debounce(Function<? super T, ? extends Publisher<U>> debounceIndicator) {
+    public final <U> Flowable<T> debounce(@NonNull Function<? super T, ? extends Publisher<U>> debounceIndicator) {
         Objects.requireNonNull(debounceIndicator, "debounceIndicator is null");
-        return RxJavaPlugins.onAssembly(new FlowableDebounce<T, U>(this, debounceIndicator));
+        return RxJavaPlugins.onAssembly(new FlowableDebounce<>(this, debounceIndicator));
     }
 
     /**
@@ -8222,7 +8329,8 @@ public final <U> Flowable<T> debounce(Function<? super T, ? extends Publisher<U>
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> debounce(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit) {
         return debounce(timeout, unit, Schedulers.computation());
     }
 
@@ -8267,10 +8375,10 @@ public final Flowable<T> debounce(long timeout, TimeUnit unit) {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> debounce(long timeout, TimeUnit unit, Scheduler scheduler) {
+    public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableDebounceTimed<T>(this, timeout, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new FlowableDebounceTimed<>(this, timeout, unit, scheduler));
     }
 
     /**
@@ -8298,7 +8406,7 @@ public final Flowable<T> debounce(long timeout, TimeUnit unit, Scheduler schedul
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> defaultIfEmpty(T defaultItem) {
+    public final Flowable<T> defaultIfEmpty(@NonNull T defaultItem) {
         Objects.requireNonNull(defaultItem, "defaultItem is null");
         return switchIfEmpty(just(defaultItem));
     }
@@ -8334,7 +8442,7 @@ public final Flowable<T> defaultIfEmpty(T defaultItem) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> delay(final Function<? super T, ? extends Publisher<U>> itemDelayIndicator) {
+    public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publisher<U>> itemDelayIndicator) {
         Objects.requireNonNull(itemDelayIndicator, "itemDelayIndicator is null");
         return flatMap(FlowableInternalHelper.itemDelay(itemDelayIndicator));
     }
@@ -8361,7 +8469,8 @@ public final <U> Flowable<T> delay(final Function<? super T, ? extends Publisher
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> delay(long delay, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> delay(long delay, @NonNull TimeUnit unit) {
         return delay(delay, unit, Schedulers.computation(), false);
     }
 
@@ -8390,7 +8499,8 @@ public final Flowable<T> delay(long delay, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> delay(long delay, TimeUnit unit, boolean delayError) {
+    @NonNull
+    public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, boolean delayError) {
         return delay(delay, unit, Schedulers.computation(), delayError);
     }
 
@@ -8418,7 +8528,8 @@ public final Flowable<T> delay(long delay, TimeUnit unit, boolean delayError) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return delay(delay, unit, scheduler, false);
     }
 
@@ -8450,11 +8561,11 @@ public final Flowable<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> delay(long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) {
+    public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
 
-        return RxJavaPlugins.onAssembly(new FlowableDelay<T>(this, Math.max(0L, delay), unit, scheduler, delayError));
+        return RxJavaPlugins.onAssembly(new FlowableDelay<>(this, Math.max(0L, delay), unit, scheduler, delayError));
     }
 
     /**
@@ -8492,8 +8603,9 @@ public final Flowable<T> delay(long delay, TimeUnit unit, Scheduler scheduler, b
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<T> delay(Publisher<U> subscriptionIndicator,
-            Function<? super T, ? extends Publisher<V>> itemDelayIndicator) {
+    @NonNull
+    public final <U, V> Flowable<T> delay(@NonNull Publisher<U> subscriptionIndicator,
+            @NonNull Function<? super T, ? extends Publisher<V>> itemDelayIndicator) {
         return delaySubscription(subscriptionIndicator).delay(itemDelayIndicator);
     }
 
@@ -8519,9 +8631,9 @@ public final <U, V> Flowable<T> delay(Publisher<U> subscriptionIndicator,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> delaySubscription(Publisher<U> subscriptionIndicator) {
+    public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptionIndicator) {
         Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
-        return RxJavaPlugins.onAssembly(new FlowableDelaySubscriptionOther<T, U>(this, subscriptionIndicator));
+        return RxJavaPlugins.onAssembly(new FlowableDelaySubscriptionOther<>(this, subscriptionIndicator));
     }
 
     /**
@@ -8545,7 +8657,8 @@ public final <U> Flowable<T> delaySubscription(Publisher<U> subscriptionIndicato
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> delaySubscription(long delay, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
         return delaySubscription(delay, unit, Schedulers.computation());
     }
 
@@ -8574,7 +8687,8 @@ public final Flowable<T> delaySubscription(long delay, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> delaySubscription(long delay, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return delaySubscription(timer(delay, unit, scheduler));
     }
 
@@ -8632,9 +8746,9 @@ public final Flowable<T> delaySubscription(long delay, TimeUnit unit, Scheduler
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> Flowable<R> dematerialize(Function<? super T, Notification<R>> selector) {
+    public final <R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T, @NonNull Notification<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
-        return RxJavaPlugins.onAssembly(new FlowableDematerialize<T, R>(this, selector));
+        return RxJavaPlugins.onAssembly(new FlowableDematerialize<>(this, selector));
     }
 
     /**
@@ -8674,6 +8788,7 @@ public final <R> Flowable<R> dematerialize(Function<? super T, Notification<R>>
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> distinct() {
         return distinct((Function)Functions.identity(), Functions.<T>createHashSet());
     }
@@ -8717,7 +8832,8 @@ public final Flowable<T> distinct() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Flowable<T> distinct(Function<? super T, K> keySelector) {
+    @NonNull
+    public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelector) {
         return distinct(keySelector, Functions.<K>createHashSet());
     }
 
@@ -8751,11 +8867,12 @@ public final <K> Flowable<T> distinct(Function<? super T, K> keySelector) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Flowable<T> distinct(Function<? super T, K> keySelector,
-            Supplier<? extends Collection<? super K>> collectionSupplier) {
+    @NonNull
+    public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelector,
+            @NonNull Supplier<? extends Collection<? super K>> collectionSupplier) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableDistinct<T, K>(this, keySelector, collectionSupplier));
+        return RxJavaPlugins.onAssembly(new FlowableDistinct<>(this, keySelector, collectionSupplier));
     }
 
     /**
@@ -8795,6 +8912,7 @@ public final <K> Flowable<T> distinct(Function<? super T, K> keySelector,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> distinctUntilChanged() {
         return distinctUntilChanged(Functions.identity());
     }
@@ -8841,9 +8959,10 @@ public final Flowable<T> distinctUntilChanged() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Flowable<T> distinctUntilChanged(Function<? super T, K> keySelector) {
+    @NonNull
+    public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
-        return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged<T, K>(this, keySelector, ObjectHelper.equalsPredicate()));
+        return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged<>(this, keySelector, ObjectHelper.equalsPredicate()));
     }
 
     /**
@@ -8879,9 +8998,10 @@ public final <K> Flowable<T> distinctUntilChanged(Function<? super T, K> keySele
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> distinctUntilChanged(BiPredicate<? super T, ? super T> comparer) {
+    @NonNull
+    public final Flowable<T> distinctUntilChanged(@NonNull BiPredicate<? super T, ? super T> comparer) {
         Objects.requireNonNull(comparer, "comparer is null");
-        return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged<T, T>(this, Functions.<T>identity(), comparer));
+        return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged<>(this, Functions.<T>identity(), comparer));
     }
 
     /**
@@ -8909,9 +9029,10 @@ public final Flowable<T> distinctUntilChanged(BiPredicate<? super T, ? super T>
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doFinally(Action onFinally) {
+    @NonNull
+    public final Flowable<T> doFinally(@NonNull Action onFinally) {
         Objects.requireNonNull(onFinally, "onFinally is null");
-        return RxJavaPlugins.onAssembly(new FlowableDoFinally<T>(this, onFinally));
+        return RxJavaPlugins.onAssembly(new FlowableDoFinally<>(this, onFinally));
     }
 
     /**
@@ -8936,9 +9057,10 @@ public final Flowable<T> doFinally(Action onFinally) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doAfterNext(Consumer<? super T> onAfterNext) {
+    @NonNull
+    public final Flowable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext) {
         Objects.requireNonNull(onAfterNext, "onAfterNext is null");
-        return RxJavaPlugins.onAssembly(new FlowableDoAfterNext<T>(this, onAfterNext));
+        return RxJavaPlugins.onAssembly(new FlowableDoAfterNext<>(this, onAfterNext));
     }
 
     /**
@@ -8964,7 +9086,8 @@ public final Flowable<T> doAfterNext(Consumer<? super T> onAfterNext) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doAfterTerminate(Action onAfterTerminate) {
+    @NonNull
+    public final Flowable<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
         return doOnEach(Functions.emptyConsumer(), Functions.emptyConsumer(),
                 Functions.EMPTY_ACTION, onAfterTerminate);
     }
@@ -8997,7 +9120,8 @@ public final Flowable<T> doAfterTerminate(Action onAfterTerminate) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnCancel(Action onCancel) {
+    @NonNull
+    public final Flowable<T> doOnCancel(@NonNull Action onCancel) {
         return doOnLifecycle(Functions.emptyConsumer(), Functions.EMPTY_LONG_CONSUMER, onCancel);
     }
 
@@ -9021,7 +9145,8 @@ public final Flowable<T> doOnCancel(Action onCancel) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnComplete(Action onComplete) {
+    @NonNull
+    public final Flowable<T> doOnComplete(@NonNull Action onComplete) {
         return doOnEach(Functions.emptyConsumer(), Functions.emptyConsumer(),
                 onComplete, Functions.EMPTY_ACTION);
     }
@@ -9046,13 +9171,13 @@ public final Flowable<T> doOnComplete(Action onComplete) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    private Flowable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Throwable> onError,
+    private Flowable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError,
             Action onComplete, Action onAfterTerminate) {
         Objects.requireNonNull(onNext, "onNext is null");
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
         Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
-        return RxJavaPlugins.onAssembly(new FlowableDoOnEach<T>(this, onNext, onError, onComplete, onAfterTerminate));
+        return RxJavaPlugins.onAssembly(new FlowableDoOnEach<>(this, onNext, onError, onComplete, onAfterTerminate));
     }
 
     /**
@@ -9076,7 +9201,7 @@ private Flowable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Throwa
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnEach(final Consumer<? super Notification<T>> onNotification) {
+    public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notification<T>> onNotification) {
         Objects.requireNonNull(onNotification, "onNotification is null");
         return doOnEach(
                 Functions.notificationOnNext(onNotification),
@@ -9113,7 +9238,7 @@ public final Flowable<T> doOnEach(final Consumer<? super Notification<T>> onNoti
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnEach(final Subscriber<? super T> subscriber) {
+    public final Flowable<T> doOnEach(@NonNull Subscriber<? super T> subscriber) {
         Objects.requireNonNull(subscriber, "subscriber is null");
         return doOnEach(
                 FlowableInternalHelper.subscriberOnNext(subscriber),
@@ -9145,7 +9270,8 @@ public final Flowable<T> doOnEach(final Subscriber<? super T> subscriber) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnError(Consumer<? super Throwable> onError) {
+    @NonNull
+    public final Flowable<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
         return doOnEach(Functions.emptyConsumer(), onError,
                 Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
     }
@@ -9176,12 +9302,12 @@ public final Flowable<T> doOnError(Consumer<? super Throwable> onError) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnLifecycle(final Consumer<? super Subscription> onSubscribe,
-            final LongConsumer onRequest, final Action onCancel) {
+    public final Flowable<T> doOnLifecycle(@NonNull Consumer<? super Subscription> onSubscribe,
+            @NonNull LongConsumer onRequest, @NonNull Action onCancel) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         Objects.requireNonNull(onRequest, "onRequest is null");
         Objects.requireNonNull(onCancel, "onCancel is null");
-        return RxJavaPlugins.onAssembly(new FlowableDoOnLifecycle<T>(this, onSubscribe, onRequest, onCancel));
+        return RxJavaPlugins.onAssembly(new FlowableDoOnLifecycle<>(this, onSubscribe, onRequest, onCancel));
     }
 
     /**
@@ -9204,7 +9330,8 @@ public final Flowable<T> doOnLifecycle(final Consumer<? super Subscription> onSu
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnNext(Consumer<? super T> onNext) {
+    @NonNull
+    public final Flowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
         return doOnEach(onNext, Functions.emptyConsumer(),
                 Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
     }
@@ -9234,7 +9361,8 @@ public final Flowable<T> doOnNext(Consumer<? super T> onNext) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnRequest(LongConsumer onRequest) {
+    @NonNull
+    public final Flowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
         return doOnLifecycle(Functions.emptyConsumer(), onRequest, Functions.EMPTY_ACTION);
     }
 
@@ -9261,7 +9389,8 @@ public final Flowable<T> doOnRequest(LongConsumer onRequest) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnSubscribe(Consumer<? super Subscription> onSubscribe) {
+    @NonNull
+    public final Flowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> onSubscribe) {
         return doOnLifecycle(onSubscribe, Functions.EMPTY_LONG_CONSUMER, Functions.EMPTY_ACTION);
     }
 
@@ -9290,7 +9419,8 @@ public final Flowable<T> doOnSubscribe(Consumer<? super Subscription> onSubscrib
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnTerminate(final Action onTerminate) {
+    @NonNull
+    public final Flowable<T> doOnTerminate(@NonNull Action onTerminate) {
         return doOnEach(Functions.emptyConsumer(), Functions.actionConsumer(onTerminate),
                 onTerminate, Functions.EMPTY_ACTION);
     }
@@ -9316,11 +9446,12 @@ public final Flowable<T> doOnTerminate(final Action onTerminate) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> elementAt(long index) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
         }
-        return RxJavaPlugins.onAssembly(new FlowableElementAtMaybe<T>(this, index));
+        return RxJavaPlugins.onAssembly(new FlowableElementAtMaybe<>(this, index));
     }
 
     /**
@@ -9349,12 +9480,12 @@ public final Maybe<T> elementAt(long index) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> elementAt(long index, T defaultItem) {
+    public final Single<T> elementAt(long index, @NonNull T defaultItem) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
         }
         Objects.requireNonNull(defaultItem, "defaultItem is null");
-        return RxJavaPlugins.onAssembly(new FlowableElementAtSingle<T>(this, index, defaultItem));
+        return RxJavaPlugins.onAssembly(new FlowableElementAtSingle<>(this, index, defaultItem));
     }
 
     /**
@@ -9380,11 +9511,12 @@ public final Single<T> elementAt(long index, T defaultItem) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> elementAtOrError(long index) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
         }
-        return RxJavaPlugins.onAssembly(new FlowableElementAtSingle<T>(this, index, null));
+        return RxJavaPlugins.onAssembly(new FlowableElementAtSingle<>(this, index, null));
     }
 
     /**
@@ -9410,9 +9542,9 @@ public final Single<T> elementAtOrError(long index) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> filter(Predicate<? super T> predicate) {
+    public final Flowable<T> filter(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new FlowableFilter<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new FlowableFilter<>(this, predicate));
     }
 
     /**
@@ -9433,6 +9565,7 @@ public final Flowable<T> filter(Predicate<? super T> predicate) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> firstElement() {
         return elementAt(0);
     }
@@ -9458,7 +9591,8 @@ public final Maybe<T> firstElement() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> first(T defaultItem) {
+    @NonNull
+    public final Single<T> first(@NonNull T defaultItem) {
         return elementAt(0, defaultItem);
     }
 
@@ -9480,6 +9614,7 @@ public final Single<T> first(T defaultItem) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL) // take may trigger UNBOUNDED_IN
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> firstOrError() {
         return elementAtOrError(0);
     }
@@ -9512,7 +9647,8 @@ public final Single<T> firstOrError() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
         return flatMap(mapper, false, bufferSize(), bufferSize());
     }
 
@@ -9547,7 +9683,8 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayErrors) {
+    @NonNull
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayErrors) {
         return flatMap(mapper, delayErrors, bufferSize(), bufferSize());
     }
 
@@ -9583,7 +9720,8 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends R>> mapper, int maxConcurrency) {
+    @NonNull
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int maxConcurrency) {
         return flatMap(mapper, false, maxConcurrency, bufferSize());
     }
 
@@ -9622,7 +9760,8 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
+    @NonNull
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, delayErrors, maxConcurrency, bufferSize());
     }
 
@@ -9664,7 +9803,7 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -9677,7 +9816,7 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
             }
             return FlowableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new FlowableFlatMap<T, R>(this, mapper, delayErrors, maxConcurrency, bufferSize));
+        return RxJavaPlugins.onAssembly(new FlowableFlatMap<>(this, mapper, delayErrors, maxConcurrency, bufferSize));
     }
 
     /**
@@ -9714,13 +9853,13 @@ public final <R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? e
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> flatMap(
-            Function<? super T, ? extends Publisher<? extends R>> onNextMapper,
-            Function<? super Throwable, ? extends Publisher<? extends R>> onErrorMapper,
-            Supplier<? extends Publisher<? extends R>> onCompleteSupplier) {
+            @NonNull Function<? super T, ? extends Publisher<? extends R>> onNextMapper,
+            @NonNull Function<? super Throwable, ? extends Publisher<? extends R>> onErrorMapper,
+            @NonNull Supplier<? extends Publisher<? extends R>> onCompleteSupplier) {
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
         Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
-        return merge(new FlowableMapNotification<T, Publisher<? extends R>>(this, onNextMapper, onErrorMapper, onCompleteSupplier));
+        return merge(new FlowableMapNotification<>(this, onNextMapper, onErrorMapper, onCompleteSupplier));
     }
 
     /**
@@ -9761,14 +9900,14 @@ public final <R> Flowable<R> flatMap(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> flatMap(
-            Function<? super T, ? extends Publisher<? extends R>> onNextMapper,
-            Function<Throwable, ? extends Publisher<? extends R>> onErrorMapper,
-            Supplier<? extends Publisher<? extends R>> onCompleteSupplier,
+            @NonNull Function<? super T, ? extends Publisher<? extends R>> onNextMapper,
+            @NonNull Function<Throwable, ? extends Publisher<? extends R>> onErrorMapper,
+            @NonNull Supplier<? extends Publisher<? extends R>> onCompleteSupplier,
             int maxConcurrency) {
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
         Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
-        return merge(new FlowableMapNotification<T, Publisher<? extends R>>(
+        return merge(new FlowableMapNotification<>(
                 this, onNextMapper, onErrorMapper, onCompleteSupplier), maxConcurrency);
     }
 
@@ -9803,8 +9942,9 @@ public final <R> Flowable<R> flatMap(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends R> combiner) {
+    @NonNull
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         return flatMap(mapper, combiner, false, bufferSize(), bufferSize());
     }
 
@@ -9842,8 +9982,9 @@ public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors) {
+    @NonNull
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors) {
         return flatMap(mapper, combiner, delayErrors, bufferSize(), bufferSize());
     }
 
@@ -9885,8 +10026,9 @@ public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency) {
+    @NonNull
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, combiner, delayErrors, maxConcurrency, bufferSize());
     }
 
@@ -9931,8 +10073,8 @@ public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> flatMap(final Function<? super T, ? extends Publisher<? extends U>> mapper,
-            final BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency, int bufferSize) {
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -9975,8 +10117,9 @@ public final <U, R> Flowable<R> flatMap(final Function<? super T, ? extends Publ
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends R> combiner, int maxConcurrency) {
+    @NonNull
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, int maxConcurrency) {
         return flatMap(mapper, combiner, false, maxConcurrency, bufferSize());
     }
 
@@ -9995,7 +10138,8 @@ public final <U, R> Flowable<R> flatMap(Function<? super T, ? extends Publisher<
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable flatMapCompletable(Function<? super T, ? extends CompletableSource> mapper) {
+    @NonNull
+    public final Completable flatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         return flatMapCompletable(mapper, false, Integer.MAX_VALUE);
     }
 
@@ -10020,10 +10164,10 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable flatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, boolean delayErrors, int maxConcurrency) {
+    public final Completable flatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper, boolean delayErrors, int maxConcurrency) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
-        return RxJavaPlugins.onAssembly(new FlowableFlatMapCompletableCompletable<T>(this, mapper, delayErrors, maxConcurrency));
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapCompletableCompletable<>(this, mapper, delayErrors, maxConcurrency));
     }
 
     /**
@@ -10052,7 +10196,8 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    @NonNull
+    public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
         return flatMapIterable(mapper, bufferSize());
     }
 
@@ -10085,10 +10230,10 @@ public final <U> Flowable<U> flatMapIterable(final Function<? super T, ? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper, int bufferSize) {
+    public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<T, U>(this, mapper, bufferSize));
+        return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<>(this, mapper, bufferSize));
     }
 
     /**
@@ -10122,8 +10267,8 @@ public final <U> Flowable<U> flatMapIterable(final Function<? super T, ? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<V> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper,
-            final BiFunction<? super T, ? super U, ? extends V> resultSelector) {
+    public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends V> resultSelector) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(resultSelector, "resultSelector is null");
         return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), bufferSize());
@@ -10165,8 +10310,8 @@ public final <U, V> Flowable<V> flatMapIterable(final Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<V> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper,
-            final BiFunction<? super T, ? super U, ? extends V> resultSelector, int prefetch) {
+    public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends V> resultSelector, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(resultSelector, "resultSelector is null");
         return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), prefetch);
@@ -10188,7 +10333,8 @@ public final <U, V> Flowable<V> flatMapIterable(final Function<? super T, ? exte
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return flatMapMaybe(mapper, false, Integer.MAX_VALUE);
     }
 
@@ -10215,10 +10361,10 @@ public final <R> Flowable<R> flatMapMaybe(Function<? super T, ? extends MaybeSou
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
+    public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
-        return RxJavaPlugins.onAssembly(new FlowableFlatMapMaybe<T, R>(this, mapper, delayErrors, maxConcurrency));
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapMaybe<>(this, mapper, delayErrors, maxConcurrency));
     }
 
     /**
@@ -10237,7 +10383,8 @@ public final <R> Flowable<R> flatMapMaybe(Function<? super T, ? extends MaybeSou
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return flatMapSingle(mapper, false, Integer.MAX_VALUE);
     }
 
@@ -10264,10 +10411,10 @@ public final <R> Flowable<R> flatMapSingle(Function<? super T, ? extends SingleS
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
+    public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
-        return RxJavaPlugins.onAssembly(new FlowableFlatMapSingle<T, R>(this, mapper, delayErrors, maxConcurrency));
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapSingle<>(this, mapper, delayErrors, maxConcurrency));
     }
 
     /**
@@ -10293,7 +10440,8 @@ public final <R> Flowable<R> flatMapSingle(Function<? super T, ? extends SingleS
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.NONE)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable forEach(Consumer<? super T> onNext) {
+    @NonNull
+    public final Disposable forEach(@NonNull Consumer<? super T> onNext) {
         return subscribe(onNext);
     }
 
@@ -10323,7 +10471,8 @@ public final Disposable forEach(Consumer<? super T> onNext) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.NONE)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable forEachWhile(Predicate<? super T> onNext) {
+    @NonNull
+    public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext) {
         return forEachWhile(onNext, Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
 
@@ -10352,7 +10501,8 @@ public final Disposable forEachWhile(Predicate<? super T> onNext) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.NONE)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable forEachWhile(Predicate<? super T> onNext, Consumer<? super Throwable> onError) {
+    @NonNull
+    public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonNull Consumer<? super Throwable> onError) {
         return forEachWhile(onNext, onError, Functions.EMPTY_ACTION);
     }
 
@@ -10385,13 +10535,13 @@ public final Disposable forEachWhile(Predicate<? super T> onNext, Consumer<? sup
     @NonNull
     @BackpressureSupport(BackpressureKind.NONE)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable forEachWhile(final Predicate<? super T> onNext, final Consumer<? super Throwable> onError,
-            final Action onComplete) {
+    public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonNull Consumer<? super Throwable> onError,
+            @NonNull Action onComplete) {
         Objects.requireNonNull(onNext, "onNext is null");
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
 
-        ForEachWhileSubscriber<T> s = new ForEachWhileSubscriber<T>(onNext, onError, onComplete);
+        ForEachWhileSubscriber<T> s = new ForEachWhileSubscriber<>(onNext, onError, onComplete);
         subscribe(s);
         return s;
     }
@@ -10450,7 +10600,8 @@ public final Disposable forEachWhile(final Predicate<? super T> onNext, final Co
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Flowable<GroupedFlowable<K, T>> groupBy(Function<? super T, ? extends K> keySelector) {
+    @NonNull
+    public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector) {
         return groupBy(keySelector, Functions.<T>identity(), false, bufferSize());
     }
 
@@ -10509,7 +10660,8 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(Function<? super T, ? e
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Flowable<GroupedFlowable<K, T>> groupBy(Function<? super T, ? extends K> keySelector, boolean delayError) {
+    @NonNull
+    public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector, boolean delayError) {
         return groupBy(keySelector, Functions.<T>identity(), delayError, bufferSize());
     }
 
@@ -10572,8 +10724,9 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(Function<? super T, ? e
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T, ? extends K> keySelector,
-            Function<? super T, ? extends V> valueSelector) {
+    @NonNull
+    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector) {
         return groupBy(keySelector, valueSelector, false, bufferSize());
     }
 
@@ -10637,8 +10790,9 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T, ? extends K> keySelector,
-            Function<? super T, ? extends V> valueSelector, boolean delayError) {
+    @NonNull
+    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector, boolean delayError) {
         return groupBy(keySelector, valueSelector, delayError, bufferSize());
     }
 
@@ -10704,8 +10858,8 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T,
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T, ? extends K> keySelector,
-            Function<? super T, ? extends V> valueSelector,
+    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector,
             boolean delayError, int bufferSize) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
@@ -10825,10 +10979,10 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T,
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T, ? extends K> keySelector,
-            Function<? super T, ? extends V> valueSelector,
+    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector,
             boolean delayError, int bufferSize,
-            Function<? super Consumer<Object>, ? extends Map<K, Object>> evictingMapFactory) {
+            @NonNull Function<? super Consumer<Object>, ? extends Map<K, Object>> evictingMapFactory) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -10876,10 +11030,10 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(Function<? super T,
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> groupJoin(
-            Publisher<? extends TRight> other,
-            Function<? super T, ? extends Publisher<TLeftEnd>> leftEnd,
-            Function<? super TRight, ? extends Publisher<TRightEnd>> rightEnd,
-            BiFunction<? super T, ? super Flowable<TRight>, ? extends R> resultSelector) {
+            @NonNull Publisher<? extends TRight> other,
+            @NonNull Function<? super T, ? extends Publisher<TLeftEnd>> leftEnd,
+            @NonNull Function<? super TRight, ? extends Publisher<TRightEnd>> rightEnd,
+            @NonNull BiFunction<? super T, ? super Flowable<TRight>, ? extends R> resultSelector) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(leftEnd, "leftEnd is null");
         Objects.requireNonNull(rightEnd, "rightEnd is null");
@@ -10907,8 +11061,9 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> groupJoin(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> hide() {
-        return RxJavaPlugins.onAssembly(new FlowableHide<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableHide<>(this));
     }
 
     /**
@@ -10930,8 +11085,9 @@ public final Flowable<T> hide() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable ignoreElements() {
-        return RxJavaPlugins.onAssembly(new FlowableIgnoreElementsCompletable<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableIgnoreElementsCompletable<>(this));
     }
 
     /**
@@ -10955,6 +11111,7 @@ public final Completable ignoreElements() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<Boolean> isEmpty() {
         return all(Functions.alwaysFalse());
     }
@@ -10998,10 +11155,10 @@ public final Single<Boolean> isEmpty() {
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
-            Publisher<? extends TRight> other,
-            Function<? super T, ? extends Publisher<TLeftEnd>> leftEnd,
-            Function<? super TRight, ? extends Publisher<TRightEnd>> rightEnd,
-            BiFunction<? super T, ? super TRight, ? extends R> resultSelector) {
+            @NonNull Publisher<? extends TRight> other,
+            @NonNull Function<? super T, ? extends Publisher<TLeftEnd>> leftEnd,
+            @NonNull Function<? super TRight, ? extends Publisher<TRightEnd>> rightEnd,
+            @NonNull BiFunction<? super T, ? super TRight, ? extends R> resultSelector) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(leftEnd, "leftEnd is null");
         Objects.requireNonNull(rightEnd, "rightEnd is null");
@@ -11029,8 +11186,9 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> lastElement() {
-        return RxJavaPlugins.onAssembly(new FlowableLastMaybe<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableLastMaybe<>(this));
     }
 
     /**
@@ -11055,9 +11213,9 @@ public final Maybe<T> lastElement() {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> last(T defaultItem) {
+    public final Single<T> last(@NonNull T defaultItem) {
         Objects.requireNonNull(defaultItem, "defaultItem");
-        return RxJavaPlugins.onAssembly(new FlowableLastSingle<T>(this, defaultItem));
+        return RxJavaPlugins.onAssembly(new FlowableLastSingle<>(this, defaultItem));
     }
 
     /**
@@ -11079,8 +11237,9 @@ public final Single<T> last(T defaultItem) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> lastOrError() {
-        return RxJavaPlugins.onAssembly(new FlowableLastSingle<T>(this, null));
+        return RxJavaPlugins.onAssembly(new FlowableLastSingle<>(this, null));
     }
 
     /**
@@ -11233,7 +11392,7 @@ public final Single<T> lastOrError() {
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> lift(FlowableOperator<? extends R, ? super T> lifter) {
+    public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super T> lifter) {
         Objects.requireNonNull(lifter, "lifter is null");
         return RxJavaPlugins.onAssembly(new FlowableLift<R, T>(this, lifter));
     }
@@ -11289,8 +11448,9 @@ public final <R> Flowable<R> lift(FlowableOperator<? extends R, ? super T> lifte
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<Notification<T>> materialize() {
-        return RxJavaPlugins.onAssembly(new FlowableMaterialize<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableMaterialize<>(this));
     }
 
     /**
@@ -11317,7 +11477,7 @@ public final Flowable<Notification<T>> materialize() {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> mergeWith(Publisher<? extends T> other) {
+    public final Flowable<T> mergeWith(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return merge(this, other);
     }
@@ -11347,7 +11507,7 @@ public final Flowable<T> mergeWith(Publisher<? extends T> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new FlowableMergeWithSingle<T>(this, other));
+        return RxJavaPlugins.onAssembly(new FlowableMergeWithSingle<>(this, other));
     }
 
     /**
@@ -11376,7 +11536,7 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new FlowableMergeWithMaybe<T>(this, other));
+        return RxJavaPlugins.onAssembly(new FlowableMergeWithMaybe<>(this, other));
     }
 
     /**
@@ -11402,7 +11562,7 @@ public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new FlowableMergeWithCompletable<T>(this, other));
+        return RxJavaPlugins.onAssembly(new FlowableMergeWithCompletable<>(this, other));
     }
 
     /**
@@ -11451,7 +11611,8 @@ public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> observeOn(Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> observeOn(@NonNull Scheduler scheduler) {
         return observeOn(scheduler, false, bufferSize());
     }
 
@@ -11502,7 +11663,8 @@ public final Flowable<T> observeOn(Scheduler scheduler) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> observeOn(Scheduler scheduler, boolean delayError) {
+    @NonNull
+    public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayError) {
         return observeOn(scheduler, delayError, bufferSize());
     }
 
@@ -11555,10 +11717,10 @@ public final Flowable<T> observeOn(Scheduler scheduler, boolean delayError) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> observeOn(Scheduler scheduler, boolean delayError, int bufferSize) {
+    public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayError, int bufferSize) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableObserveOn<T>(this, scheduler, delayError, bufferSize));
+        return RxJavaPlugins.onAssembly(new FlowableObserveOn<>(this, scheduler, delayError, bufferSize));
     }
 
     /**
@@ -11583,7 +11745,7 @@ public final Flowable<T> observeOn(Scheduler scheduler, boolean delayError, int
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> ofType(final Class<U> clazz) {
+    public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
@@ -11607,6 +11769,7 @@ public final <U> Flowable<U> ofType(final Class<U> clazz) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> onBackpressureBuffer() {
         return onBackpressureBuffer(bufferSize(), false, true);
     }
@@ -11633,6 +11796,7 @@ public final Flowable<T> onBackpressureBuffer() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> onBackpressureBuffer(boolean delayError) {
         return onBackpressureBuffer(bufferSize(), delayError, true);
     }
@@ -11660,6 +11824,7 @@ public final Flowable<T> onBackpressureBuffer(boolean delayError) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> onBackpressureBuffer(int capacity) {
         return onBackpressureBuffer(capacity, false, false);
     }
@@ -11691,6 +11856,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError) {
         return onBackpressureBuffer(capacity, delayError, false);
     }
@@ -11724,9 +11890,10 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError, boolean unbounded) {
         ObjectHelper.verifyPositive(capacity, "capacity");
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<T>(this, capacity, unbounded, delayError, Functions.EMPTY_ACTION));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<>(this, capacity, unbounded, delayError, Functions.EMPTY_ACTION));
     }
 
     /**
@@ -11761,10 +11928,10 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError, boolean unbounded,
-            Action onOverflow) {
+            @NonNull Action onOverflow) {
         Objects.requireNonNull(onOverflow, "onOverflow is null");
         ObjectHelper.verifyPositive(capacity, "capacity");
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<T>(this, capacity, unbounded, delayError, onOverflow));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<>(this, capacity, unbounded, delayError, onOverflow));
     }
 
     /**
@@ -11791,7 +11958,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onBackpressureBuffer(int capacity, Action onOverflow) {
+    @NonNull
+    public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOverflow) {
         return onBackpressureBuffer(capacity, false, false, onOverflow);
     }
 
@@ -11832,10 +12000,10 @@ public final Flowable<T> onBackpressureBuffer(int capacity, Action onOverflow) {
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onBackpressureBuffer(long capacity, Action onOverflow, BackpressureOverflowStrategy overflowStrategy) {
+    public final Flowable<T> onBackpressureBuffer(long capacity, @NonNull Action onOverflow, @NonNull BackpressureOverflowStrategy overflowStrategy) {
         Objects.requireNonNull(overflowStrategy, "overflowStrategy is null");
         ObjectHelper.verifyPositive(capacity, "capacity");
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBufferStrategy<T>(this, capacity, onOverflow, overflowStrategy));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBufferStrategy<>(this, capacity, onOverflow, overflowStrategy));
     }
 
     /**
@@ -11860,8 +12028,9 @@ public final Flowable<T> onBackpressureBuffer(long capacity, Action onOverflow,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> onBackpressureDrop() {
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureDrop<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureDrop<>(this));
     }
 
     /**
@@ -11889,9 +12058,9 @@ public final Flowable<T> onBackpressureDrop() {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onBackpressureDrop(Consumer<? super T> onDrop) {
+    public final Flowable<T> onBackpressureDrop(@NonNull Consumer<? super T> onDrop) {
         Objects.requireNonNull(onDrop, "onDrop is null");
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureDrop<T>(this, onDrop));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureDrop<>(this, onDrop));
     }
 
     /**
@@ -11922,8 +12091,9 @@ public final Flowable<T> onBackpressureDrop(Consumer<? super T> onDrop) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> onBackpressureLatest() {
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureLatest<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureLatest<>(this));
     }
 
     /**
@@ -11965,9 +12135,9 @@ public final Flowable<T> onBackpressureLatest() {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorResumeNext(Function<? super Throwable, ? extends Publisher<? extends T>> resumeFunction) {
+    public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends Publisher<? extends T>> resumeFunction) {
         Objects.requireNonNull(resumeFunction, "resumeFunction is null");
-        return RxJavaPlugins.onAssembly(new FlowableOnErrorNext<T>(this, resumeFunction));
+        return RxJavaPlugins.onAssembly(new FlowableOnErrorNext<>(this, resumeFunction));
     }
 
     /**
@@ -12009,7 +12179,7 @@ public final Flowable<T> onErrorResumeNext(Function<? super Throwable, ? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorResumeWith(final Publisher<? extends T> next) {
+    public final Flowable<T> onErrorResumeWith(@NonNull Publisher<? extends T> next) {
         Objects.requireNonNull(next, "next is null");
         return onErrorResumeNext(Functions.justFunction(next));
     }
@@ -12049,9 +12219,9 @@ public final Flowable<T> onErrorResumeWith(final Publisher<? extends T> next) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorReturn(Function<? super Throwable, ? extends T> valueSupplier) {
+    public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> valueSupplier) {
         Objects.requireNonNull(valueSupplier, "valueSupplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableOnErrorReturn<T>(this, valueSupplier));
+        return RxJavaPlugins.onAssembly(new FlowableOnErrorReturn<>(this, valueSupplier));
     }
 
     /**
@@ -12089,7 +12259,7 @@ public final Flowable<T> onErrorReturn(Function<? super Throwable, ? extends T>
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorReturnItem(final T item) {
+    public final Flowable<T> onErrorReturnItem(@NonNull T item) {
         Objects.requireNonNull(item, "item is null");
         return onErrorReturn(Functions.justFunction(item));
     }
@@ -12111,8 +12281,9 @@ public final Flowable<T> onErrorReturnItem(final T item) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> onTerminateDetach() {
-        return RxJavaPlugins.onAssembly(new FlowableDetach<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableDetach<>(this));
     }
 
     /**
@@ -12140,6 +12311,7 @@ public final Flowable<T> onTerminateDetach() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
+    @NonNull
     public final ParallelFlowable<T> parallel() {
         return ParallelFlowable.from(this);
     }
@@ -12170,6 +12342,7 @@ public final ParallelFlowable<T> parallel() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
+    @NonNull
     public final ParallelFlowable<T> parallel(int parallelism) {
         ObjectHelper.verifyPositive(parallelism, "parallelism");
         return ParallelFlowable.from(this, parallelism);
@@ -12203,6 +12376,7 @@ public final ParallelFlowable<T> parallel(int parallelism) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
+    @NonNull
     public final ParallelFlowable<T> parallel(int parallelism, int prefetch) {
         ObjectHelper.verifyPositive(parallelism, "parallelism");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -12231,6 +12405,7 @@ public final ParallelFlowable<T> parallel(int parallelism, int prefetch) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final ConnectableFlowable<T> publish() {
         return publish(bufferSize());
     }
@@ -12263,7 +12438,8 @@ public final ConnectableFlowable<T> publish() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> publish(Function<? super Flowable<T>, ? extends Publisher<R>> selector) {
+    @NonNull
+    public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector) {
         return publish(selector, bufferSize());
     }
 
@@ -12298,10 +12474,10 @@ public final <R> Flowable<R> publish(Function<? super Flowable<T>, ? extends Pub
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> publish(Function<? super Flowable<T>, ? extends Publisher<? extends R>> selector, int prefetch) {
+    public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? extends Publisher<? extends R>> selector, int prefetch) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowablePublishMulticast<T, R>(this, selector, prefetch, false));
+        return RxJavaPlugins.onAssembly(new FlowablePublishMulticast<>(this, selector, prefetch, false));
     }
 
     /**
@@ -12328,9 +12504,10 @@ public final <R> Flowable<R> publish(Function<? super Flowable<T>, ? extends Pub
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final ConnectableFlowable<T> publish(int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowablePublish<T>(this, bufferSize));
+        return RxJavaPlugins.onAssembly(new FlowablePublish<>(this, bufferSize));
     }
 
     /**
@@ -12354,6 +12531,7 @@ public final ConnectableFlowable<T> publish(int bufferSize) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> rebatchRequests(int n) {
         return observeOn(ImmediateThinScheduler.INSTANCE, true, n);
     }
@@ -12393,9 +12571,9 @@ public final Flowable<T> rebatchRequests(int n) {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
+    public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
         Objects.requireNonNull(reducer, "reducer is null");
-        return RxJavaPlugins.onAssembly(new FlowableReduceMaybe<T>(this, reducer));
+        return RxJavaPlugins.onAssembly(new FlowableReduceMaybe<>(this, reducer));
     }
 
     /**
@@ -12455,10 +12633,10 @@ public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
+    public final <@NonNull R> Single<R> reduce(R seed, @NonNull BiFunction<R, ? super T, R> reducer) {
         Objects.requireNonNull(seed, "seed is null");
         Objects.requireNonNull(reducer, "reducer is null");
-        return RxJavaPlugins.onAssembly(new FlowableReduceSeedSingle<T, R>(this, seed, reducer));
+        return RxJavaPlugins.onAssembly(new FlowableReduceSeedSingle<>(this, seed, reducer));
     }
 
     /**
@@ -12500,10 +12678,10 @@ public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> reduceWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> reducer) {
+    public final <@NonNull R> Single<R> reduceWith(@NonNull Supplier<R> seedSupplier, @NonNull BiFunction<R, ? super T, R> reducer) {
         Objects.requireNonNull(seedSupplier, "seedSupplier is null");
         Objects.requireNonNull(reducer, "reducer is null");
-        return RxJavaPlugins.onAssembly(new FlowableReduceWithSingle<T, R>(this, seedSupplier, reducer));
+        return RxJavaPlugins.onAssembly(new FlowableReduceWithSingle<>(this, seedSupplier, reducer));
     }
 
     /**
@@ -12524,6 +12702,7 @@ public final <R> Single<R> reduceWith(Supplier<R> seedSupplier, BiFunction<R, ?
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> repeat() {
         return repeat(Long.MAX_VALUE);
     }
@@ -12553,6 +12732,7 @@ public final Flowable<T> repeat() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> repeat(long times) {
         if (times < 0) {
             throw new IllegalArgumentException("times >= 0 required but it was " + times);
@@ -12560,7 +12740,7 @@ public final Flowable<T> repeat(long times) {
         if (times == 0) {
             return empty();
         }
-        return RxJavaPlugins.onAssembly(new FlowableRepeat<T>(this, times));
+        return RxJavaPlugins.onAssembly(new FlowableRepeat<>(this, times));
     }
 
     /**
@@ -12588,9 +12768,9 @@ public final Flowable<T> repeat(long times) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> repeatUntil(BooleanSupplier stop) {
+    public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
         Objects.requireNonNull(stop, "stop is null");
-        return RxJavaPlugins.onAssembly(new FlowableRepeatUntil<T>(this, stop));
+        return RxJavaPlugins.onAssembly(new FlowableRepeatUntil<>(this, stop));
     }
 
     /**
@@ -12619,9 +12799,9 @@ public final Flowable<T> repeatUntil(BooleanSupplier stop) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> repeatWhen(final Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
+    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
-        return RxJavaPlugins.onAssembly(new FlowableRepeatWhen<T>(this, handler));
+        return RxJavaPlugins.onAssembly(new FlowableRepeatWhen<>(this, handler));
     }
 
     /**
@@ -12647,6 +12827,7 @@ public final Flowable<T> repeatWhen(final Function<? super Flowable<Object>, ? e
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final ConnectableFlowable<T> replay() {
         return FlowableReplay.createFrom(this);
     }
@@ -12678,7 +12859,7 @@ public final ConnectableFlowable<T> replay() {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector) {
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this), selector);
     }
@@ -12718,7 +12899,7 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize) {
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, false), selector);
@@ -12761,7 +12942,7 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize, boolean eagerTruncate) {
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, eagerTruncate), selector);
@@ -12805,7 +12986,8 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize, long time, TimeUnit unit) {
+    @NonNull
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit) {
         return replay(selector, bufferSize, time, unit, Schedulers.computation());
     }
 
@@ -12853,7 +13035,7 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) {
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -12908,7 +13090,7 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -12949,7 +13131,8 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, long time, TimeUnit unit) {
+    @NonNull
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, long time, @NonNull TimeUnit unit) {
         return replay(selector, time, unit, Schedulers.computation());
     }
 
@@ -12989,7 +13172,7 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final long time, final TimeUnit unit, final Scheduler scheduler) {
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -13034,7 +13217,7 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publisher<R>> selector, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -13072,7 +13255,8 @@ public final <R> Flowable<R> replay(Function<? super Flowable<T>, ? extends Publ
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final ConnectableFlowable<T> replay(final int bufferSize) {
+    @NonNull
+    public final ConnectableFlowable<T> replay(int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.create(this, bufferSize, false);
     }
@@ -13109,7 +13293,8 @@ public final ConnectableFlowable<T> replay(final int bufferSize) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final ConnectableFlowable<T> replay(final int bufferSize, boolean eagerTruncate) {
+    @NonNull
+    public final ConnectableFlowable<T> replay(int bufferSize, boolean eagerTruncate) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.create(this, bufferSize, eagerTruncate);
     }
@@ -13150,7 +13335,8 @@ public final ConnectableFlowable<T> replay(final int bufferSize, boolean eagerTr
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final ConnectableFlowable<T> replay(int bufferSize, long time, TimeUnit unit) {
+    @NonNull
+    public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull TimeUnit unit) {
         return replay(bufferSize, time, unit, Schedulers.computation());
     }
 
@@ -13194,7 +13380,8 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, TimeUnit u
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final ConnectableFlowable<T> replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) {
+    @NonNull
+    public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -13244,7 +13431,8 @@ public final ConnectableFlowable<T> replay(final int bufferSize, final long time
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final ConnectableFlowable<T> replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
+    @NonNull
+    public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -13282,7 +13470,8 @@ public final ConnectableFlowable<T> replay(final int bufferSize, final long time
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final ConnectableFlowable<T> replay(long time, TimeUnit unit) {
+    @NonNull
+    public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit) {
         return replay(time, unit, Schedulers.computation());
     }
 
@@ -13319,7 +13508,8 @@ public final ConnectableFlowable<T> replay(long time, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final ConnectableFlowable<T> replay(final long time, final TimeUnit unit, final Scheduler scheduler) {
+    @NonNull
+    public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return FlowableReplay.create(this, time, unit, scheduler, false);
@@ -13360,7 +13550,8 @@ public final ConnectableFlowable<T> replay(final long time, final TimeUnit unit,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final ConnectableFlowable<T> replay(final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
+    @NonNull
+    public final ConnectableFlowable<T> replay(final long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return FlowableReplay.create(this, time, unit, scheduler, eagerTruncate);
@@ -13393,6 +13584,7 @@ public final ConnectableFlowable<T> replay(final long time, final TimeUnit unit,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> retry() {
         return retry(Long.MAX_VALUE, Functions.alwaysTrue());
     }
@@ -13421,10 +13613,10 @@ public final Flowable<T> retry() {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> retry(BiPredicate<? super Integer, ? super Throwable> predicate) {
+    public final Flowable<T> retry(@NonNull BiPredicate<@NonNull ? super Integer, @NonNull ? super Throwable> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
 
-        return RxJavaPlugins.onAssembly(new FlowableRetryBiPredicate<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new FlowableRetryBiPredicate<>(this, predicate));
     }
 
     /**
@@ -13457,6 +13649,7 @@ public final Flowable<T> retry(BiPredicate<? super Integer, ? super Throwable> p
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> retry(long count) {
         return retry(count, Functions.alwaysTrue());
     }
@@ -13479,13 +13672,13 @@ public final Flowable<T> retry(long count) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> retry(long times, Predicate<? super Throwable> predicate) {
+    public final Flowable<T> retry(long times, @NonNull Predicate<@NonNull ? super Throwable> predicate) {
         if (times < 0) {
             throw new IllegalArgumentException("times >= 0 required but it was " + times);
         }
         Objects.requireNonNull(predicate, "predicate is null");
 
-        return RxJavaPlugins.onAssembly(new FlowableRetryPredicate<T>(this, times, predicate));
+        return RxJavaPlugins.onAssembly(new FlowableRetryPredicate<>(this, times, predicate));
     }
 
     /**
@@ -13504,7 +13697,8 @@ public final Flowable<T> retry(long times, Predicate<? super Throwable> predicat
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> retry(Predicate<? super Throwable> predicate) {
+    @NonNull
+    public final Flowable<T> retry(@NonNull Predicate<@NonNull ? super Throwable> predicate) {
         return retry(Long.MAX_VALUE, predicate);
     }
 
@@ -13524,7 +13718,7 @@ public final Flowable<T> retry(Predicate<? super Throwable> predicate) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> retryUntil(final BooleanSupplier stop) {
+    public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
         Objects.requireNonNull(stop, "stop is null");
         return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop));
     }
@@ -13611,10 +13805,10 @@ public final Flowable<T> retryUntil(final BooleanSupplier stop) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> retryWhen(
-            final Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
+            @NonNull Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
 
-        return RxJavaPlugins.onAssembly(new FlowableRetryWhen<T>(this, handler));
+        return RxJavaPlugins.onAssembly(new FlowableRetryWhen<>(this, handler));
     }
 
     /**
@@ -13633,7 +13827,7 @@ public final Flowable<T> retryWhen(
      */
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void safeSubscribe(Subscriber<? super T> s) {
+    public final void safeSubscribe(@NonNull Subscriber<? super T> s) {
         Objects.requireNonNull(s, "s is null");
         if (s instanceof SafeSubscriber) {
             subscribe((SafeSubscriber<? super T>)s);
@@ -13667,7 +13861,8 @@ public final void safeSubscribe(Subscriber<? super T> s) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> sample(long period, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> sample(long period, @NonNull TimeUnit unit) {
         return sample(period, unit, Schedulers.computation());
     }
 
@@ -13702,7 +13897,8 @@ public final Flowable<T> sample(long period, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> sample(long period, TimeUnit unit, boolean emitLast) {
+    @NonNull
+    public final Flowable<T> sample(long period, @NonNull TimeUnit unit, boolean emitLast) {
         return sample(period, unit, Schedulers.computation(), emitLast);
     }
 
@@ -13734,10 +13930,10 @@ public final Flowable<T> sample(long period, TimeUnit unit, boolean emitLast) {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> sample(long period, TimeUnit unit, Scheduler scheduler) {
+    public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableSampleTimed<T>(this, period, unit, scheduler, false));
+        return RxJavaPlugins.onAssembly(new FlowableSampleTimed<>(this, period, unit, scheduler, false));
     }
 
     /**
@@ -13775,10 +13971,10 @@ public final Flowable<T> sample(long period, TimeUnit unit, Scheduler scheduler)
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> sample(long period, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
+    public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableSampleTimed<T>(this, period, unit, scheduler, emitLast));
+        return RxJavaPlugins.onAssembly(new FlowableSampleTimed<>(this, period, unit, scheduler, emitLast));
     }
 
     /**
@@ -13807,9 +14003,9 @@ public final Flowable<T> sample(long period, TimeUnit unit, Scheduler scheduler,
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> sample(Publisher<U> sampler) {
+    public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler) {
         Objects.requireNonNull(sampler, "sampler is null");
-        return RxJavaPlugins.onAssembly(new FlowableSamplePublisher<T>(this, sampler, false));
+        return RxJavaPlugins.onAssembly(new FlowableSamplePublisher<>(this, sampler, false));
     }
 
     /**
@@ -13845,9 +14041,9 @@ public final <U> Flowable<T> sample(Publisher<U> sampler) {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> sample(Publisher<U> sampler, boolean emitLast) {
+    public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitLast) {
         Objects.requireNonNull(sampler, "sampler is null");
-        return RxJavaPlugins.onAssembly(new FlowableSamplePublisher<T>(this, sampler, emitLast));
+        return RxJavaPlugins.onAssembly(new FlowableSamplePublisher<>(this, sampler, emitLast));
     }
 
     /**
@@ -13878,9 +14074,9 @@ public final <U> Flowable<T> sample(Publisher<U> sampler, boolean emitLast) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> scan(BiFunction<T, T, T> accumulator) {
+    public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
         Objects.requireNonNull(accumulator, "accumulator is null");
-        return RxJavaPlugins.onAssembly(new FlowableScan<T>(this, accumulator));
+        return RxJavaPlugins.onAssembly(new FlowableScan<>(this, accumulator));
     }
 
     /**
@@ -13932,7 +14128,7 @@ public final Flowable<T> scan(BiFunction<T, T, T> accumulator) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> scan(final R initialValue, BiFunction<R, ? super T, R> accumulator) {
+    public final <@NonNull R> Flowable<R> scan(R initialValue, @NonNull BiFunction<R, ? super T, R> accumulator) {
         Objects.requireNonNull(initialValue, "initialValue is null");
         return scanWith(Functions.justSupplier(initialValue), accumulator);
     }
@@ -13972,10 +14168,10 @@ public final <R> Flowable<R> scan(final R initialValue, BiFunction<R, ? super T,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> scanWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> accumulator) {
+    public final <@NonNull R> Flowable<R> scanWith(@NonNull Supplier<R> seedSupplier, @NonNull BiFunction<R, ? super T, R> accumulator) {
         Objects.requireNonNull(seedSupplier, "seedSupplier is null");
         Objects.requireNonNull(accumulator, "accumulator is null");
-        return RxJavaPlugins.onAssembly(new FlowableScanSeed<T, R>(this, seedSupplier, accumulator));
+        return RxJavaPlugins.onAssembly(new FlowableScanSeed<>(this, seedSupplier, accumulator));
     }
 
     /**
@@ -14004,8 +14200,9 @@ public final <R> Flowable<R> scanWith(Supplier<R> seedSupplier, BiFunction<R, ?
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> serialize() {
-        return RxJavaPlugins.onAssembly(new FlowableSerialized<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableSerialized<>(this));
     }
 
     /**
@@ -14032,6 +14229,7 @@ public final Flowable<T> serialize() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> share() {
         return publish().refCount();
     }
@@ -14056,8 +14254,9 @@ public final Flowable<T> share() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> singleElement() {
-        return RxJavaPlugins.onAssembly(new FlowableSingleMaybe<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableSingleMaybe<>(this));
     }
 
     /**
@@ -14084,9 +14283,9 @@ public final Maybe<T> singleElement() {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> single(T defaultItem) {
+    public final Single<T> single(@NonNull T defaultItem) {
         Objects.requireNonNull(defaultItem, "defaultItem is null");
-        return RxJavaPlugins.onAssembly(new FlowableSingleSingle<T>(this, defaultItem));
+        return RxJavaPlugins.onAssembly(new FlowableSingleSingle<>(this, defaultItem));
     }
 
     /**
@@ -14110,8 +14309,9 @@ public final Single<T> single(T defaultItem) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> singleOrError() {
-        return RxJavaPlugins.onAssembly(new FlowableSingleSingle<T>(this, null));
+        return RxJavaPlugins.onAssembly(new FlowableSingleSingle<>(this, null));
     }
 
     /**
@@ -14136,11 +14336,12 @@ public final Single<T> singleOrError() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> skip(long count) {
         if (count <= 0L) {
             return RxJavaPlugins.onAssembly(this);
         }
-        return RxJavaPlugins.onAssembly(new FlowableSkip<T>(this, count));
+        return RxJavaPlugins.onAssembly(new FlowableSkip<>(this, count));
     }
 
     /**
@@ -14168,7 +14369,8 @@ public final Flowable<T> skip(long count) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> skip(long time, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> skip(long time, @NonNull TimeUnit unit) {
         return skipUntil(timer(time, unit));
     }
 
@@ -14198,7 +14400,8 @@ public final Flowable<T> skip(long time, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> skip(long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return skipUntil(timer(time, unit, scheduler));
     }
 
@@ -14230,6 +14433,7 @@ public final Flowable<T> skip(long time, TimeUnit unit, Scheduler scheduler) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> skipLast(int count) {
         if (count < 0) {
             throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
@@ -14237,7 +14441,7 @@ public final Flowable<T> skipLast(int count) {
         if (count == 0) {
             return RxJavaPlugins.onAssembly(this);
         }
-        return RxJavaPlugins.onAssembly(new FlowableSkipLast<T>(this, count));
+        return RxJavaPlugins.onAssembly(new FlowableSkipLast<>(this, count));
     }
 
     /**
@@ -14267,7 +14471,8 @@ public final Flowable<T> skipLast(int count) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> skipLast(long time, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit) {
         return skipLast(time, unit, Schedulers.computation(), false, bufferSize());
     }
 
@@ -14301,7 +14506,8 @@ public final Flowable<T> skipLast(long time, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> skipLast(long time, TimeUnit unit, boolean delayError) {
+    @NonNull
+    public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, boolean delayError) {
         return skipLast(time, unit, Schedulers.computation(), delayError, bufferSize());
     }
 
@@ -14333,7 +14539,8 @@ public final Flowable<T> skipLast(long time, TimeUnit unit, boolean delayError)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return skipLast(time, unit, scheduler, false, bufferSize());
     }
 
@@ -14368,7 +14575,8 @@ public final Flowable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError) {
+    @NonNull
+    public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         return skipLast(time, unit, scheduler, delayError, bufferSize());
     }
 
@@ -14406,13 +14614,13 @@ public final Flowable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler,
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
+    public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError, int bufferSize) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         // the internal buffer holds pairs of (timestamp, value) so double the default buffer size
         int s = bufferSize << 1;
-        return RxJavaPlugins.onAssembly(new FlowableSkipLastTimed<T>(this, time, unit, scheduler, s, delayError));
+        return RxJavaPlugins.onAssembly(new FlowableSkipLastTimed<>(this, time, unit, scheduler, s, delayError));
     }
 
     /**
@@ -14440,9 +14648,9 @@ public final Flowable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> skipUntil(Publisher<U> other) {
+    public final <U> Flowable<T> skipUntil(@NonNull Publisher<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new FlowableSkipUntil<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new FlowableSkipUntil<>(this, other));
     }
 
     /**
@@ -14468,9 +14676,9 @@ public final <U> Flowable<T> skipUntil(Publisher<U> other) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> skipWhile(Predicate<? super T> predicate) {
+    public final Flowable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new FlowableSkipWhile<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new FlowableSkipWhile<>(this, predicate));
     }
     /**
      * Returns a Flowable that emits the events emitted by source Publisher, in a
@@ -14496,6 +14704,7 @@ public final Flowable<T> skipWhile(Predicate<? super T> predicate) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> sorted() {
         return toList().toFlowable().map(Functions.listSorter(Functions.<T>naturalComparator())).flatMapIterable(Functions.<List<T>>identity());
     }
@@ -14524,7 +14733,7 @@ public final Flowable<T> sorted() {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> sorted(Comparator<? super T> sortFunction) {
+    public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> sortFunction) {
         Objects.requireNonNull(sortFunction, "sortFunction");
         return toList().toFlowable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.<List<T>>identity());
     }
@@ -14555,7 +14764,8 @@ public final Flowable<T> sorted(Comparator<? super T> sortFunction) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> startWithIterable(Iterable<? extends T> items) {
+    @NonNull
+    public final Flowable<T> startWithIterable(@NonNull Iterable<? extends T> items) {
         return concatArray(fromIterable(items), this);
     }
 
@@ -14583,7 +14793,7 @@ public final Flowable<T> startWithIterable(Iterable<? extends T> items) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> startWith(Publisher<? extends T> other) {
+    public final Flowable<T> startWith(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return concatArray(other, this);
     }
@@ -14615,7 +14825,7 @@ public final Flowable<T> startWith(Publisher<? extends T> other) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> startWithItem(T item) {
+    public final Flowable<T> startWithItem(@NonNull T item) {
         Objects.requireNonNull(item, "item is null");
         return concatArray(just(item), this);
     }
@@ -14642,11 +14852,12 @@ public final Flowable<T> startWithItem(T item) {
      * @see #startWithItem(Object)
      * @see #startWithIterable(Iterable)
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> startWithArray(T... items) {
+    @SafeVarargs
+    @NonNull
+    public final Flowable<T> startWithArray(@NonNull T... items) {
         Flowable<T> fromArray = fromArray(items);
         if (fromArray == empty()) {
             return RxJavaPlugins.onAssembly(this);
@@ -14674,6 +14885,7 @@ public final Flowable<T> startWithArray(T... items) {
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Disposable subscribe() {
         return subscribe(Functions.emptyConsumer(), Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
@@ -14703,7 +14915,8 @@ public final Disposable subscribe() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onNext) {
+    @NonNull
+    public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
         return subscribe(onNext, Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
 
@@ -14733,7 +14946,8 @@ public final Disposable subscribe(Consumer<? super T> onNext) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError) {
+    @NonNull
+    public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError) {
         return subscribe(onNext, onError, Functions.EMPTY_ACTION);
     }
 
@@ -14767,13 +14981,14 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError,
-            Action onComplete) {
+    @NonNull
+    public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError,
+            @NonNull Action onComplete) {
         Objects.requireNonNull(onNext, "onNext is null");
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
 
-        LambdaSubscriber<T> ls = new LambdaSubscriber<T>(onNext, onError, onComplete, FlowableInternalHelper.RequestMax.INSTANCE);
+        LambdaSubscriber<T> ls = new LambdaSubscriber<>(onNext, onError, onComplete, FlowableInternalHelper.RequestMax.INSTANCE);
 
         subscribe(ls);
 
@@ -14783,7 +14998,7 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
-    public final void subscribe(Subscriber<? super T> s) {
+    public final void subscribe(@NonNull Subscriber<? super T> s) {
         if (s instanceof FlowableSubscriber) {
             subscribe((FlowableSubscriber<? super T>)s);
         } else {
@@ -14831,7 +15046,7 @@ public final void subscribe(Subscriber<? super T> s) {
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void subscribe(FlowableSubscriber<? super T> s) {
+    public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
         Objects.requireNonNull(s, "s is null");
         try {
             Subscriber<? super T> z = RxJavaPlugins.onSubscribe(this, s);
@@ -14861,7 +15076,7 @@ public final void subscribe(FlowableSubscriber<? super T> s) {
      * applied by {@link #subscribe(Subscriber)} before this method gets called.
      * @param s the incoming Subscriber, never null
      */
-    protected abstract void subscribeActual(Subscriber<? super T> s);
+    protected abstract void subscribeActual(@NonNull Subscriber<? super T> s);
 
     /**
      * Subscribes a given Subscriber (subclass) to this Flowable and returns the given
@@ -14893,7 +15108,8 @@ public final void subscribe(FlowableSubscriber<? super T> s) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <E extends Subscriber<? super T>> E subscribeWith(E subscriber) {
+    @NonNull
+    public final <@NonNull E extends Subscriber<? super T>> E subscribeWith(E subscriber) {
         subscribe(subscriber);
         return subscriber;
     }
@@ -14967,7 +15183,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean requestOn) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableSubscribeOn<T>(this, scheduler, requestOn));
+        return RxJavaPlugins.onAssembly(new FlowableSubscribeOn<>(this, scheduler, requestOn));
     }
 
     /**
@@ -14996,9 +15212,9 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> switchIfEmpty(Publisher<? extends T> other) {
+    public final Flowable<T> switchIfEmpty(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new FlowableSwitchIfEmpty<T>(this, other));
+        return RxJavaPlugins.onAssembly(new FlowableSwitchIfEmpty<>(this, other));
     }
 
     /**
@@ -15031,7 +15247,8 @@ public final Flowable<T> switchIfEmpty(Publisher<? extends T> other) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> switchMap(Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
         return switchMap(mapper, bufferSize());
     }
 
@@ -15067,7 +15284,8 @@ public final <R> Flowable<R> switchMap(Function<? super T, ? extends Publisher<?
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> switchMap(Function<? super T, ? extends Publisher<? extends R>> mapper, int bufferSize) {
+    @NonNull
+    public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int bufferSize) {
         return switchMap0(mapper, bufferSize, false);
     }
 
@@ -15114,7 +15332,7 @@ public final <R> Flowable<R> switchMap(Function<? super T, ? extends Publisher<?
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable switchMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletable<T>(this, mapper, false));
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletable<>(this, mapper, false));
     }
 
     /**
@@ -15161,7 +15379,7 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable switchMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletable<T>(this, mapper, true));
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletable<>(this, mapper, true));
     }
 
     /**
@@ -15196,7 +15414,8 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> switchMapDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    @NonNull
+    public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
         return switchMapDelayError(mapper, bufferSize());
     }
 
@@ -15234,7 +15453,8 @@ public final <R> Flowable<R> switchMapDelayError(Function<? super T, ? extends P
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> switchMapDelayError(Function<? super T, ? extends Publisher<? extends R>> mapper, int bufferSize) {
+    @NonNull
+    public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int bufferSize) {
         return switchMap0(mapper, bufferSize, true);
     }
 
@@ -15249,7 +15469,7 @@ <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<? extends R>>
             }
             return FlowableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new FlowableSwitchMap<T, R>(this, mapper, bufferSize, delayError));
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMap<>(this, mapper, bufferSize, delayError));
     }
 
     /**
@@ -15290,7 +15510,7 @@ <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<? extends R>>
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe<T, R>(this, mapper, false));
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe<>(this, mapper, false));
     }
 
     /**
@@ -15321,7 +15541,7 @@ public final <R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? exten
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe<T, R>(this, mapper, true));
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe<>(this, mapper, true));
     }
 
     /**
@@ -15362,7 +15582,7 @@ public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle<T, R>(this, mapper, false));
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle<>(this, mapper, false));
     }
 
     /**
@@ -15393,7 +15613,7 @@ public final <R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? exte
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle<T, R>(this, mapper, true));
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle<>(this, mapper, true));
     }
 
     /**
@@ -15439,11 +15659,12 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> take(long count) {
         if (count < 0) {
             throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
-        return RxJavaPlugins.onAssembly(new FlowableTake<T>(this, count));
+        return RxJavaPlugins.onAssembly(new FlowableTake<>(this, count));
     }
 
     /**
@@ -15472,7 +15693,8 @@ public final Flowable<T> take(long count) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> take(long time, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> take(long time, @NonNull TimeUnit unit) {
         return takeUntil(timer(time, unit));
     }
 
@@ -15505,7 +15727,8 @@ public final Flowable<T> take(long time, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> take(long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> take(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return takeUntil(timer(time, unit, scheduler));
     }
 
@@ -15533,17 +15756,18 @@ public final Flowable<T> take(long time, TimeUnit unit, Scheduler scheduler) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> takeLast(int count) {
         if (count < 0) {
             throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
         } else
         if (count == 0) {
-            return RxJavaPlugins.onAssembly(new FlowableIgnoreElements<T>(this));
+            return RxJavaPlugins.onAssembly(new FlowableIgnoreElements<>(this));
         } else
         if (count == 1) {
-            return RxJavaPlugins.onAssembly(new FlowableTakeLastOne<T>(this));
+            return RxJavaPlugins.onAssembly(new FlowableTakeLastOne<>(this));
         }
-        return RxJavaPlugins.onAssembly(new FlowableTakeLast<T>(this, count));
+        return RxJavaPlugins.onAssembly(new FlowableTakeLast<>(this, count));
     }
 
     /**
@@ -15573,7 +15797,8 @@ public final Flowable<T> takeLast(int count) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> takeLast(long count, long time, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit) {
         return takeLast(count, time, unit, Schedulers.computation(), false, bufferSize());
     }
 
@@ -15609,7 +15834,8 @@ public final Flowable<T> takeLast(long count, long time, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> takeLast(long count, long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return takeLast(count, time, unit, scheduler, false, bufferSize());
     }
 
@@ -15651,14 +15877,14 @@ public final Flowable<T> takeLast(long count, long time, TimeUnit unit, Schedule
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> takeLast(long count, long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
+    public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError, int bufferSize) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (count < 0) {
             throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
         }
-        return RxJavaPlugins.onAssembly(new FlowableTakeLastTimed<T>(this, count, time, unit, scheduler, bufferSize, delayError));
+        return RxJavaPlugins.onAssembly(new FlowableTakeLastTimed<>(this, count, time, unit, scheduler, bufferSize, delayError));
     }
 
     /**
@@ -15687,7 +15913,8 @@ public final Flowable<T> takeLast(long count, long time, TimeUnit unit, Schedule
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> takeLast(long time, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit) {
         return takeLast(time, unit, Schedulers.computation(), false, bufferSize());
     }
 
@@ -15720,7 +15947,8 @@ public final Flowable<T> takeLast(long time, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> takeLast(long time, TimeUnit unit, boolean delayError) {
+    @NonNull
+    public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, boolean delayError) {
         return takeLast(time, unit, Schedulers.computation(), delayError, bufferSize());
     }
 
@@ -15754,7 +15982,8 @@ public final Flowable<T> takeLast(long time, TimeUnit unit, boolean delayError)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return takeLast(time, unit, scheduler, false, bufferSize());
     }
 
@@ -15791,7 +16020,8 @@ public final Flowable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError) {
+    @NonNull
+    public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         return takeLast(time, unit, scheduler, delayError, bufferSize());
     }
 
@@ -15830,7 +16060,8 @@ public final Flowable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
+    @NonNull
+    public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError, int bufferSize) {
         return takeLast(Long.MAX_VALUE, time, unit, scheduler, delayError, bufferSize);
     }
 
@@ -15863,9 +16094,9 @@ public final Flowable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler,
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> takeUntil(Predicate<? super T> stopPredicate) {
+    public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate) {
         Objects.requireNonNull(stopPredicate, "stopPredicate is null");
-        return RxJavaPlugins.onAssembly(new FlowableTakeUntilPredicate<T>(this, stopPredicate));
+        return RxJavaPlugins.onAssembly(new FlowableTakeUntilPredicate<>(this, stopPredicate));
     }
 
     /**
@@ -15893,9 +16124,9 @@ public final Flowable<T> takeUntil(Predicate<? super T> stopPredicate) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> takeUntil(Publisher<U> other) {
+    public final <U> Flowable<T> takeUntil(@NonNull Publisher<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new FlowableTakeUntil<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new FlowableTakeUntil<>(this, other));
     }
 
     /**
@@ -15922,9 +16153,9 @@ public final <U> Flowable<T> takeUntil(Publisher<U> other) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> takeWhile(Predicate<? super T> predicate) {
+    public final Flowable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new FlowableTakeWhile<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new FlowableTakeWhile<>(this, predicate));
     }
 
     /**
@@ -15953,7 +16184,8 @@ public final Flowable<T> takeWhile(Predicate<? super T> predicate) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> throttleFirst(long windowDuration, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> throttleFirst(long windowDuration, @NonNull TimeUnit unit) {
         return throttleFirst(windowDuration, unit, Schedulers.computation());
     }
 
@@ -15987,10 +16219,10 @@ public final Flowable<T> throttleFirst(long windowDuration, TimeUnit unit) {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> throttleFirst(long skipDuration, TimeUnit unit, Scheduler scheduler) {
+    public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableThrottleFirstTimed<T>(this, skipDuration, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new FlowableThrottleFirstTimed<>(this, skipDuration, unit, scheduler));
     }
 
     /**
@@ -16021,7 +16253,8 @@ public final Flowable<T> throttleFirst(long skipDuration, TimeUnit unit, Schedul
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> throttleLast(long intervalDuration, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit) {
         return sample(intervalDuration, unit);
     }
 
@@ -16056,7 +16289,8 @@ public final Flowable<T> throttleLast(long intervalDuration, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> throttleLast(long intervalDuration, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return sample(intervalDuration, unit, scheduler);
     }
 
@@ -16093,7 +16327,8 @@ public final Flowable<T> throttleLast(long intervalDuration, TimeUnit unit, Sche
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> throttleLatest(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit) {
         return throttleLatest(timeout, unit, Schedulers.computation(), false);
     }
 
@@ -16130,7 +16365,8 @@ public final Flowable<T> throttleLatest(long timeout, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> throttleLatest(long timeout, TimeUnit unit, boolean emitLast) {
+    @NonNull
+    public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, boolean emitLast) {
         return throttleLatest(timeout, unit, Schedulers.computation(), emitLast);
     }
 
@@ -16168,7 +16404,8 @@ public final Flowable<T> throttleLatest(long timeout, TimeUnit unit, boolean emi
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return throttleLatest(timeout, unit, scheduler, false);
     }
 
@@ -16207,10 +16444,10 @@ public final Flowable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler s
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
+    public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableThrottleLatest<T>(this, timeout, unit, scheduler, emitLast));
+        return RxJavaPlugins.onAssembly(new FlowableThrottleLatest<>(this, timeout, unit, scheduler, emitLast));
     }
 
     /**
@@ -16244,7 +16481,8 @@ public final Flowable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler s
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> throttleWithTimeout(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit) {
         return debounce(timeout, unit);
     }
 
@@ -16282,7 +16520,8 @@ public final Flowable<T> throttleWithTimeout(long timeout, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> throttleWithTimeout(long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return debounce(timeout, unit, scheduler);
     }
 
@@ -16306,6 +16545,7 @@ public final Flowable<T> throttleWithTimeout(long timeout, TimeUnit unit, Schedu
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<Timed<T>> timeInterval() {
         return timeInterval(TimeUnit.MILLISECONDS, Schedulers.computation());
     }
@@ -16332,7 +16572,8 @@ public final Flowable<Timed<T>> timeInterval() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
-    public final Flowable<Timed<T>> timeInterval(Scheduler scheduler) {
+    @NonNull
+    public final Flowable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
         return timeInterval(TimeUnit.MILLISECONDS, scheduler);
     }
 
@@ -16357,7 +16598,8 @@ public final Flowable<Timed<T>> timeInterval(Scheduler scheduler) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<Timed<T>> timeInterval(TimeUnit unit) {
+    @NonNull
+    public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
         return timeInterval(unit, Schedulers.computation());
     }
 
@@ -16384,10 +16626,11 @@ public final Flowable<Timed<T>> timeInterval(TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
-    public final Flowable<Timed<T>> timeInterval(TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableTimeInterval<T>(this, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new FlowableTimeInterval<>(this, unit, scheduler));
     }
 
     /**
@@ -16422,7 +16665,8 @@ public final Flowable<Timed<T>> timeInterval(TimeUnit unit, Scheduler scheduler)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <V> Flowable<T> timeout(Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator) {
+    @NonNull
+    public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator) {
         return timeout0(null, itemTimeoutIndicator, null);
     }
 
@@ -16461,7 +16705,7 @@ public final <V> Flowable<T> timeout(Function<? super T, ? extends Publisher<V>>
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <V> Flowable<T> timeout(Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator, Flowable<? extends T> other) {
+    public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator, @NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(null, itemTimeoutIndicator, other);
     }
@@ -16491,7 +16735,8 @@ public final <V> Flowable<T> timeout(Function<? super T, ? extends Publisher<V>>
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> timeout(long timeout, TimeUnit timeUnit) {
+    @NonNull
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
         return timeout0(timeout, timeUnit, null, Schedulers.computation());
     }
 
@@ -16524,7 +16769,7 @@ public final Flowable<T> timeout(long timeout, TimeUnit timeUnit) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Publisher<? extends T> other) {
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, timeUnit, other, Schedulers.computation());
     }
@@ -16562,7 +16807,7 @@ public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Publisher<? ex
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler, Publisher<? extends T> other) {
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler, @NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, timeUnit, other, scheduler);
     }
@@ -16595,7 +16840,8 @@ public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler sche
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler) {
         return timeout0(timeout, timeUnit, null, scheduler);
     }
 
@@ -16634,8 +16880,8 @@ public final Flowable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler sche
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<T> timeout(Publisher<U> firstTimeoutIndicator,
-            Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator) {
+    public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndicator,
+            @NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, null);
     }
@@ -16681,9 +16927,9 @@ public final <U, V> Flowable<T> timeout(Publisher<U> firstTimeoutIndicator,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, V> Flowable<T> timeout(
-            Publisher<U> firstTimeoutIndicator,
-            Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
-                    Publisher<? extends T> other) {
+            @NonNull Publisher<U> firstTimeoutIndicator,
+            @NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
+            @NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutSelector is null");
         Objects.requireNonNull(other, "other is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other);
@@ -16693,7 +16939,7 @@ private Flowable<T> timeout0(long timeout, TimeUnit timeUnit, Publisher<? extend
             Scheduler scheduler) {
         Objects.requireNonNull(timeUnit, "timeUnit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableTimeoutTimed<T>(this, timeout, timeUnit, scheduler, other));
+        return RxJavaPlugins.onAssembly(new FlowableTimeoutTimed<>(this, timeout, timeUnit, scheduler, other));
     }
 
     private <U, V> Flowable<T> timeout0(
@@ -16701,7 +16947,7 @@ private <U, V> Flowable<T> timeout0(
             Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
                     Publisher<? extends T> other) {
         Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
-        return RxJavaPlugins.onAssembly(new FlowableTimeout<T, U, V>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
+        return RxJavaPlugins.onAssembly(new FlowableTimeout<>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
     }
 
     /**
@@ -16724,6 +16970,7 @@ private <U, V> Flowable<T> timeout0(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<Timed<T>> timestamp() {
         return timestamp(TimeUnit.MILLISECONDS, Schedulers.computation());
     }
@@ -16751,7 +16998,8 @@ public final Flowable<Timed<T>> timestamp() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
-    public final Flowable<Timed<T>> timestamp(Scheduler scheduler) {
+    @NonNull
+    public final Flowable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
         return timestamp(TimeUnit.MILLISECONDS, scheduler);
     }
 
@@ -16776,7 +17024,8 @@ public final Flowable<Timed<T>> timestamp(Scheduler scheduler) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<Timed<T>> timestamp(TimeUnit unit) {
+    @NonNull
+    public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
         return timestamp(unit, Schedulers.computation());
     }
 
@@ -16805,7 +17054,7 @@ public final Flowable<Timed<T>> timestamp(TimeUnit unit) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
-    public final Flowable<Timed<T>> timestamp(final TimeUnit unit, final Scheduler scheduler) {
+    public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return map(Functions.<T>timestampWith(unit, scheduler));
@@ -16865,6 +17114,7 @@ public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<List<T>> toList() {
         return RxJavaPlugins.onAssembly(new FlowableToListSingle<T, List<T>>(this));
     }
@@ -16901,9 +17151,10 @@ public final Single<List<T>> toList() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<List<T>> toList(final int capacityHint) {
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
-        return RxJavaPlugins.onAssembly(new FlowableToListSingle<T, List<T>>(this, Functions.<T>createArrayList(capacityHint)));
+        return RxJavaPlugins.onAssembly(new FlowableToListSingle<>(this, Functions.<T>createArrayList(capacityHint)));
     }
 
     /**
@@ -16939,9 +17190,10 @@ public final Single<List<T>> toList(final int capacityHint) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U extends Collection<? super T>> Single<U> toList(Supplier<U> collectionSupplier) {
+    @NonNull
+    public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplier<U> collectionSupplier) {
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableToListSingle<T, U>(this, collectionSupplier));
+        return RxJavaPlugins.onAssembly(new FlowableToListSingle<>(this, collectionSupplier));
     }
 
     /**
@@ -16974,7 +17226,7 @@ public final <U extends Collection<? super T>> Single<U> toList(Supplier<U> coll
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Single<Map<K, T>> toMap(final Function<? super T, ? extends K> keySelector) {
+    public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         return collect(HashMapSupplier.<K, T>asSupplier(), Functions.toMapKeySelector(keySelector));
     }
@@ -17013,7 +17265,7 @@ public final <K> Single<Map<K, T>> toMap(final Function<? super T, ? extends K>
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Single<Map<K, V>> toMap(final Function<? super T, ? extends K> keySelector, final Function<? super T, ? extends V> valueSelector) {
+    public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? extends K> keySelector, @NonNull Function<? super T, ? extends V> valueSelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         return collect(HashMapSupplier.<K, V>asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector));
@@ -17052,9 +17304,9 @@ public final <K, V> Single<Map<K, V>> toMap(final Function<? super T, ? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Single<Map<K, V>> toMap(final Function<? super T, ? extends K> keySelector,
-            final Function<? super T, ? extends V> valueSelector,
-            final Supplier<? extends Map<K, V>> mapSupplier) {
+    public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector,
+            @NonNull Supplier<? extends Map<K, V>> mapSupplier) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         return collect(mapSupplier, Functions.toMapKeyValueSelector(keySelector, valueSelector));
@@ -17086,7 +17338,8 @@ public final <K, V> Single<Map<K, V>> toMap(final Function<? super T, ? extends
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Single<Map<K, Collection<T>>> toMultimap(Function<? super T, ? extends K> keySelector) {
+    @NonNull
+    public final <K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector) {
         Function<T, T> valueSelector = Functions.identity();
         Supplier<Map<K, Collection<T>>> mapSupplier = HashMapSupplier.asSupplier();
         Function<K, List<T>> collectionFactory = ArrayListSupplier.asFunction();
@@ -17124,7 +17377,8 @@ public final <K> Single<Map<K, Collection<T>>> toMultimap(Function<? super T, ?
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Single<Map<K, Collection<V>>> toMultimap(Function<? super T, ? extends K> keySelector, Function<? super T, ? extends V> valueSelector) {
+    @NonNull
+    public final <K, V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector, @NonNull Function<? super T, ? extends V> valueSelector) {
         Supplier<Map<K, Collection<V>>> mapSupplier = HashMapSupplier.asSupplier();
         Function<K, List<V>> collectionFactory = ArrayListSupplier.asFunction();
         return toMultimap(keySelector, valueSelector, mapSupplier, collectionFactory);
@@ -17167,10 +17421,10 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(Function<? super T,
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
-            final Function<? super T, ? extends K> keySelector,
-            final Function<? super T, ? extends V> valueSelector,
-            final Supplier<? extends Map<K, Collection<V>>> mapSupplier,
-            final Function<? super K, ? extends Collection<? super V>> collectionFactory) {
+            @NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector,
+            @NonNull Supplier<? extends Map<K, Collection<V>>> mapSupplier,
+            @NonNull Function<? super K, ? extends Collection<? super V>> collectionFactory) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         Objects.requireNonNull(mapSupplier, "mapSupplier is null");
@@ -17211,10 +17465,11 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
-            Function<? super T, ? extends K> keySelector,
-            Function<? super T, ? extends V> valueSelector,
-            Supplier<Map<K, Collection<V>>> mapSupplier
+            @NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector,
+            @NonNull Supplier<Map<K, Collection<V>>> mapSupplier
             ) {
         return toMultimap(keySelector, valueSelector, mapSupplier, ArrayListSupplier.<V, K>asFunction());
     }
@@ -17234,8 +17489,9 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> toObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableFromPublisher<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableFromPublisher<>(this));
     }
 
     /**
@@ -17266,6 +17522,7 @@ public final Observable<T> toObservable() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<List<T>> toSortedList() {
         return toSortedList(Functions.naturalComparator());
     }
@@ -17298,7 +17555,7 @@ public final Single<List<T>> toSortedList() {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<List<T>> toSortedList(final Comparator<? super T> comparator) {
+    public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> comparator) {
         Objects.requireNonNull(comparator, "comparator is null");
         return toList().map(Functions.listSorter(comparator));
     }
@@ -17334,7 +17591,7 @@ public final Single<List<T>> toSortedList(final Comparator<? super T> comparator
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<List<T>> toSortedList(final Comparator<? super T> comparator, int capacityHint) {
+    public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> comparator, int capacityHint) {
         Objects.requireNonNull(comparator, "comparator is null");
         return toList(capacityHint).map(Functions.listSorter(comparator));
     }
@@ -17371,6 +17628,7 @@ public final Single<List<T>> toSortedList(final Comparator<? super T> comparator
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<List<T>> toSortedList(int capacityHint) {
         return toSortedList(Functions.naturalComparator(), capacityHint);
     }
@@ -17396,9 +17654,9 @@ public final Single<List<T>> toSortedList(int capacityHint) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> unsubscribeOn(Scheduler scheduler) {
+    public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableUnsubscribeOn<T>(this, scheduler));
+        return RxJavaPlugins.onAssembly(new FlowableUnsubscribeOn<>(this, scheduler));
     }
 
     /**
@@ -17430,6 +17688,7 @@ public final Flowable<T> unsubscribeOn(Scheduler scheduler) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<Flowable<T>> window(long count) {
         return window(count, count, bufferSize());
     }
@@ -17467,6 +17726,7 @@ public final Flowable<Flowable<T>> window(long count) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<Flowable<T>> window(long count, long skip) {
         return window(count, skip, bufferSize());
     }
@@ -17506,11 +17766,12 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize) {
         ObjectHelper.verifyPositive(skip, "skip");
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableWindow<T>(this, count, skip, bufferSize));
+        return RxJavaPlugins.onAssembly(new FlowableWindow<>(this, count, skip, bufferSize));
     }
 
     /**
@@ -17549,7 +17810,8 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<Flowable<T>> window(long timespan, long timeskip, TimeUnit unit) {
+    @NonNull
+    public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull TimeUnit unit) {
         return window(timespan, timeskip, unit, Schedulers.computation(), bufferSize());
     }
 
@@ -17591,7 +17853,8 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, TimeUnit
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<Flowable<T>> window(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return window(timespan, timeskip, unit, scheduler, bufferSize());
     }
 
@@ -17636,13 +17899,13 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, TimeUnit
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<Flowable<T>> window(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, int bufferSize) {
+    public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         ObjectHelper.verifyPositive(timespan, "timespan");
         ObjectHelper.verifyPositive(timeskip, "timeskip");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(unit, "unit is null");
-        return RxJavaPlugins.onAssembly(new FlowableWindowTimed<T>(this, timespan, timeskip, unit, scheduler, Long.MAX_VALUE, bufferSize, false));
+        return RxJavaPlugins.onAssembly(new FlowableWindowTimed<>(this, timespan, timeskip, unit, scheduler, Long.MAX_VALUE, bufferSize, false));
     }
 
     /**
@@ -17679,7 +17942,8 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, TimeUnit
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit) {
+    @NonNull
+    public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit) {
         return window(timespan, unit, Schedulers.computation(), Long.MAX_VALUE, false);
     }
 
@@ -17721,7 +17985,8 @@ public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit) {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
+    @NonNull
+    public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
             long count) {
         return window(timespan, unit, Schedulers.computation(), count, false);
     }
@@ -17766,7 +18031,8 @@ public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
+    @NonNull
+    public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
             long count, boolean restart) {
         return window(timespan, unit, Schedulers.computation(), count, restart);
     }
@@ -17808,8 +18074,9 @@ public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
-            Scheduler scheduler) {
+    @NonNull
+    public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
+            @NonNull Scheduler scheduler) {
         return window(timespan, unit, scheduler, Long.MAX_VALUE, false);
     }
 
@@ -17853,8 +18120,9 @@ public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
-            Scheduler scheduler, long count) {
+    @NonNull
+    public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
+            @NonNull Scheduler scheduler, long count) {
         return window(timespan, unit, scheduler, count, false);
     }
 
@@ -17900,8 +18168,9 @@ public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
-            Scheduler scheduler, long count, boolean restart) {
+    @NonNull
+    public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
+            @NonNull Scheduler scheduler, long count, boolean restart) {
         return window(timespan, unit, scheduler, count, restart, bufferSize());
     }
 
@@ -17951,13 +18220,13 @@ public final Flowable<Flowable<T>> window(long timespan, TimeUnit unit,
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Flowable<Flowable<T>> window(
-            long timespan, TimeUnit unit, Scheduler scheduler,
+            long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler,
             long count, boolean restart, int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(count, "count");
-        return RxJavaPlugins.onAssembly(new FlowableWindowTimed<T>(this, timespan, timespan, unit, scheduler, count, bufferSize, restart));
+        return RxJavaPlugins.onAssembly(new FlowableWindowTimed<>(this, timespan, timespan, unit, scheduler, count, bufferSize, restart));
     }
 
     /**
@@ -17991,7 +18260,8 @@ public final Flowable<Flowable<T>> window(
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B> Flowable<Flowable<T>> window(Publisher<B> boundaryIndicator) {
+    @NonNull
+    public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndicator) {
         return window(boundaryIndicator, bufferSize());
     }
 
@@ -18029,10 +18299,10 @@ public final <B> Flowable<Flowable<T>> window(Publisher<B> boundaryIndicator) {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B> Flowable<Flowable<T>> window(Publisher<B> boundaryIndicator, int bufferSize) {
+    public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndicator, int bufferSize) {
         Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableWindowBoundary<T, B>(this, boundaryIndicator, bufferSize));
+        return RxJavaPlugins.onAssembly(new FlowableWindowBoundary<>(this, boundaryIndicator, bufferSize));
     }
 
     /**
@@ -18071,9 +18341,10 @@ public final <B> Flowable<Flowable<T>> window(Publisher<B> boundaryIndicator, in
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <U, V> Flowable<Flowable<T>> window(
-            Publisher<U> openingIndicator,
-            Function<? super U, ? extends Publisher<V>> closingIndicator) {
+            @NonNull Publisher<U> openingIndicator,
+            @NonNull Function<? super U, ? extends Publisher<V>> closingIndicator) {
         return window(openingIndicator, closingIndicator, bufferSize());
     }
 
@@ -18117,12 +18388,12 @@ public final <U, V> Flowable<Flowable<T>> window(
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, V> Flowable<Flowable<T>> window(
-            Publisher<U> openingIndicator,
-            Function<? super U, ? extends Publisher<V>> closingIndicator, int bufferSize) {
+            @NonNull Publisher<U> openingIndicator,
+            @NonNull Function<? super U, ? extends Publisher<V>> closingIndicator, int bufferSize) {
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
         Objects.requireNonNull(closingIndicator, "closingIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableWindowBoundarySelector<T, U, V>(this, openingIndicator, closingIndicator, bufferSize));
+        return RxJavaPlugins.onAssembly(new FlowableWindowBoundarySelector<>(this, openingIndicator, closingIndicator, bufferSize));
     }
 
     /**
@@ -18157,8 +18428,8 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> withLatestFrom(Publisher<? extends U> other,
-            BiFunction<? super T, ? super U, ? extends R> combiner) {
+    public final <U, @NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<? extends U> other,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(combiner, "combiner is null");
 
@@ -18195,8 +18466,8 @@ public final <U, R> Flowable<R> withLatestFrom(Publisher<? extends U> other,
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T1, T2, R> Flowable<R> withLatestFrom(Publisher<T1> source1, Publisher<T2> source2,
-            Function3<? super T, ? super T1, ? super T2, R> combiner) {
+    public final <T1, T2, @NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<T1> source1, @NonNull Publisher<T2> source2,
+            @NonNull Function3<? super T, ? super T1, ? super T2, R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
@@ -18235,10 +18506,10 @@ public final <T1, T2, R> Flowable<R> withLatestFrom(Publisher<T1> source1, Publi
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T1, T2, T3, R> Flowable<R> withLatestFrom(
-            Publisher<T1> source1, Publisher<T2> source2,
-            Publisher<T3> source3,
-            Function4<? super T, ? super T1, ? super T2, ? super T3, R> combiner) {
+    public final <T1, T2, T3, @NonNull R> Flowable<R> withLatestFrom(
+            @NonNull Publisher<T1> source1, @NonNull Publisher<T2> source2,
+            @NonNull Publisher<T3> source3,
+            @NonNull Function4<? super T, ? super T1, ? super T2, ? super T3, R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -18280,10 +18551,10 @@ public final <T1, T2, T3, R> Flowable<R> withLatestFrom(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T1, T2, T3, T4, R> Flowable<R> withLatestFrom(
-            Publisher<T1> source1, Publisher<T2> source2,
-            Publisher<T3> source3, Publisher<T4> source4,
-            Function5<? super T, ? super T1, ? super T2, ? super T3, ? super T4, R> combiner) {
+    public final <T1, T2, T3, T4, @NonNull R> Flowable<R> withLatestFrom(
+            @NonNull Publisher<T1> source1, @NonNull Publisher<T2> source2,
+            @NonNull Publisher<T3> source3, @NonNull Publisher<T4> source4,
+            @NonNull Function5<? super T, ? super T1, ? super T2, ? super T3, ? super T4, R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -18319,10 +18590,10 @@ public final <T1, T2, T3, T4, R> Flowable<R> withLatestFrom(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> withLatestFrom(Publisher<?>[] others, Function<? super Object[], R> combiner) {
+    public final <@NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<?>[] others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
-        return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany<T, R>(this, others, combiner));
+        return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany<>(this, others, combiner));
     }
 
     /**
@@ -18352,10 +18623,10 @@ public final <R> Flowable<R> withLatestFrom(Publisher<?>[] others, Function<? su
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> withLatestFrom(Iterable<? extends Publisher<?>> others, Function<? super Object[], R> combiner) {
+    public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<? extends Publisher<?>> others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
-        return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany<T, R>(this, others, combiner));
+        return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany<>(this, others, combiner));
     }
 
     /**
@@ -18392,7 +18663,7 @@ public final <R> Flowable<R> withLatestFrom(Iterable<? extends Publisher<?>> oth
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> zipWith(Iterable<U> other,  BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(zipper, "zipper is null");
         return RxJavaPlugins.onAssembly(new FlowableZipIterable<T, U, R>(this, other, zipper));
@@ -18441,7 +18712,7 @@ public final <U, R> Flowable<R> zipWith(Iterable<U> other,  BiFunction<? super T
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> zipWith(Publisher<? extends U> other, BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
     }
@@ -18491,8 +18762,9 @@ public final <U, R> Flowable<R> zipWith(Publisher<? extends U> other, BiFunction
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> zipWith(Publisher<? extends U> other,
-            BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError) {
+    @NonNull
+    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError) {
         return zip(this, other, zipper, delayError);
     }
 
@@ -18543,8 +18815,9 @@ public final <U, R> Flowable<R> zipWith(Publisher<? extends U> other,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> zipWith(Publisher<? extends U> other,
-            BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError, int bufferSize) {
+    @NonNull
+    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError, int bufferSize) {
         return zip(this, other, zipper, delayError, bufferSize);
     }
 
@@ -18566,8 +18839,9 @@ public final <U, R> Flowable<R> zipWith(Publisher<? extends U> other,
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestSubscriber<T> test() { // NoPMD
-        TestSubscriber<T> ts = new TestSubscriber<T>();
+        TestSubscriber<T> ts = new TestSubscriber<>();
         subscribe(ts);
         return ts;
     }
@@ -18588,8 +18862,9 @@ public final TestSubscriber<T> test() { // NoPMD
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestSubscriber<T> test(long initialRequest) { // NoPMD
-        TestSubscriber<T> ts = new TestSubscriber<T>(initialRequest);
+        TestSubscriber<T> ts = new TestSubscriber<>(initialRequest);
         subscribe(ts);
         return ts;
     }
@@ -18612,8 +18887,9 @@ public final TestSubscriber<T> test(long initialRequest) { // NoPMD
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // NoPMD
-        TestSubscriber<T> ts = new TestSubscriber<T>(initialRequest);
+        TestSubscriber<T> ts = new TestSubscriber<>(initialRequest);
         if (cancel) {
             ts.cancel();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 35484ebef4..bb0a6dcbdb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -129,7 +129,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> amb(final Iterable<? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new MaybeAmb<T>(null, sources));
+        return RxJavaPlugins.onAssembly(new MaybeAmb<>(null, sources));
     }
 
     /**
@@ -148,15 +148,18 @@ public static <T> Maybe<T> amb(final Iterable<? extends MaybeSource<? extends T>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
-    public static <T> Maybe<T> ambArray(final MaybeSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Maybe<T> ambArray(@NonNull MaybeSource<? extends T>... sources) {
         if (sources.length == 0) {
             return empty();
         }
         if (sources.length == 1) {
-            return wrap((MaybeSource<T>)sources[0]);
+            @SuppressWarnings("unchecked")
+            MaybeSource<T> source = (MaybeSource<T>)sources[0];
+            return wrap(source);
         }
-        return RxJavaPlugins.onAssembly(new MaybeAmb<T>(sources, null));
+        return RxJavaPlugins.onAssembly(new MaybeAmb<>(sources, null));
     }
 
     /**
@@ -178,9 +181,9 @@ public static <T> Maybe<T> ambArray(final MaybeSource<? extends T>... sources) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(Iterable<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new MaybeConcatIterable<T>(sources));
+        return RxJavaPlugins.onAssembly(new MaybeConcatIterable<>(sources));
     }
 
     /**
@@ -206,8 +209,7 @@ public static <T> Flowable<T> concat(Iterable<? extends MaybeSource<? extends T>
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
-    public static <T> Flowable<T> concat(MaybeSource<? extends T> source1, MaybeSource<? extends T> source2) {
+    public static <T> Flowable<T> concat(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
@@ -238,9 +240,8 @@ public static <T> Flowable<T> concat(MaybeSource<? extends T> source1, MaybeSour
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> concat(
-            MaybeSource<? extends T> source1, MaybeSource<? extends T> source2, MaybeSource<? extends T> source3) {
+            @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2, @NonNull MaybeSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -274,9 +275,8 @@ public static <T> Flowable<T> concat(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> concat(
-            MaybeSource<? extends T> source1, MaybeSource<? extends T> source2, MaybeSource<? extends T> source3, MaybeSource<? extends T> source4) {
+            @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2, @NonNull MaybeSource<? extends T> source3, @NonNull MaybeSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -304,7 +304,8 @@ public static <T> Flowable<T> concat(
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(Publisher<? extends MaybeSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> concat(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
         return concat(sources, 2);
     }
 
@@ -331,7 +332,7 @@ public static <T> Flowable<T> concat(Publisher<? extends MaybeSource<? extends T
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> concat(Publisher<? extends MaybeSource<? extends T>> sources, int prefetch) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<? extends MaybeSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, MaybeToPublisher.instance(), prefetch, ErrorMode.IMMEDIATE));
@@ -355,16 +356,18 @@ public static <T> Flowable<T> concat(Publisher<? extends MaybeSource<? extends T
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
-    public static <T> Flowable<T> concatArray(MaybeSource<? extends T>... sources) {
+    @SafeVarargs
+    public static <T> Flowable<T> concatArray(@NonNull MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return Flowable.empty();
         }
         if (sources.length == 1) {
-            return RxJavaPlugins.onAssembly(new MaybeToFlowable<T>((MaybeSource<T>)sources[0]));
+            @SuppressWarnings("unchecked")
+            MaybeSource<T> source = (MaybeSource<T>)sources[0];
+            return RxJavaPlugins.onAssembly(new MaybeToFlowable<>(source));
         }
-        return RxJavaPlugins.onAssembly(new MaybeConcatArray<T>(sources));
+        return RxJavaPlugins.onAssembly(new MaybeConcatArray<>(sources));
     }
 
     /**
@@ -383,18 +386,21 @@ public static <T> Flowable<T> concatArray(MaybeSource<? extends T>... sources) {
      * @return the new Flowable instance
      * @throws NullPointerException if sources is null
      */
-    @SuppressWarnings("unchecked")
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatArrayDelayError(MaybeSource<? extends T>... sources) {
+    @SafeVarargs
+    @NonNull
+    public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? extends T>... sources) {
         if (sources.length == 0) {
             return Flowable.empty();
         } else
         if (sources.length == 1) {
-            return RxJavaPlugins.onAssembly(new MaybeToFlowable<T>((MaybeSource<T>)sources[0]));
+            @SuppressWarnings("unchecked")
+            MaybeSource<T> source = (MaybeSource<T>)sources[0];
+            return RxJavaPlugins.onAssembly(new MaybeToFlowable<>(source));
         }
-        return RxJavaPlugins.onAssembly(new MaybeConcatArrayDelayError<T>(sources));
+        return RxJavaPlugins.onAssembly(new MaybeConcatArrayDelayError<>(sources));
     }
 
     /**
@@ -419,7 +425,9 @@ public static <T> Flowable<T> concatArrayDelayError(MaybeSource<? extends T>...
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatArrayEager(MaybeSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>... sources) {
         return Flowable.fromArray(sources).concatMapEager((Function)MaybeToPublisher.instance());
     }
 
@@ -469,7 +477,8 @@ public static <T> Flowable<T> concatDelayError(Iterable<? extends MaybeSource<?
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(Publisher<? extends MaybeSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapDelayError((Function)MaybeToPublisher.instance());
     }
 
@@ -495,7 +504,8 @@ public static <T> Flowable<T> concatDelayError(Publisher<? extends MaybeSource<?
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(Iterable<? extends MaybeSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapEager((Function)MaybeToPublisher.instance());
     }
 
@@ -523,7 +533,8 @@ public static <T> Flowable<T> concatEager(Iterable<? extends MaybeSource<? exten
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(Publisher<? extends MaybeSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapEager((Function)MaybeToPublisher.instance());
     }
 
@@ -574,9 +585,9 @@ public static <T> Flowable<T> concatEager(Publisher<? extends MaybeSource<? exte
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> create(MaybeOnSubscribe<T> onSubscribe) {
+    public static <T> Maybe<T> create(@NonNull MaybeOnSubscribe<T> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
-        return RxJavaPlugins.onAssembly(new MaybeCreate<T>(onSubscribe));
+        return RxJavaPlugins.onAssembly(new MaybeCreate<>(onSubscribe));
     }
 
     /**
@@ -594,9 +605,9 @@ public static <T> Maybe<T> create(MaybeOnSubscribe<T> onSubscribe) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> defer(final Supplier<? extends MaybeSource<? extends T>> maybeSupplier) {
+    public static <T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? extends T>> maybeSupplier) {
         Objects.requireNonNull(maybeSupplier, "maybeSupplier is null");
-        return RxJavaPlugins.onAssembly(new MaybeDefer<T>(maybeSupplier));
+        return RxJavaPlugins.onAssembly(new MaybeDefer<>(maybeSupplier));
     }
 
     /**
@@ -614,6 +625,7 @@ public static <T> Maybe<T> defer(final Supplier<? extends MaybeSource<? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Maybe<T> empty() {
         return RxJavaPlugins.onAssembly((Maybe<T>)MaybeEmpty.INSTANCE);
     }
@@ -639,7 +651,7 @@ public static <T> Maybe<T> empty() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> error(Throwable exception) {
+    public static <T> Maybe<T> error(@NonNull Throwable exception) {
         Objects.requireNonNull(exception, "exception is null");
         return RxJavaPlugins.onAssembly(new MaybeError<T>(exception));
     }
@@ -665,7 +677,7 @@ public static <T> Maybe<T> error(Throwable exception) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> error(Supplier<? extends Throwable> supplier) {
+    public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier) {
         Objects.requireNonNull(supplier, "errorSupplier is null");
         return RxJavaPlugins.onAssembly(new MaybeErrorCallable<T>(supplier));
     }
@@ -692,7 +704,7 @@ public static <T> Maybe<T> error(Supplier<? extends Throwable> supplier) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromAction(final Action run) {
+    public static <T> Maybe<T> fromAction(@NonNull Action run) {
         Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new MaybeFromAction<T>(run));
     }
@@ -712,7 +724,7 @@ public static <T> Maybe<T> fromAction(final Action run) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromCompletable(CompletableSource completableSource) {
+    public static <T> Maybe<T> fromCompletable(@NonNull CompletableSource completableSource) {
         Objects.requireNonNull(completableSource, "completableSource is null");
         return RxJavaPlugins.onAssembly(new MaybeFromCompletable<T>(completableSource));
     }
@@ -732,9 +744,9 @@ public static <T> Maybe<T> fromCompletable(CompletableSource completableSource)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromSingle(SingleSource<T> singleSource) {
+    public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
         Objects.requireNonNull(singleSource, "singleSource is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromSingle<T>(singleSource));
+        return RxJavaPlugins.onAssembly(new MaybeFromSingle<>(singleSource));
     }
 
     /**
@@ -776,7 +788,7 @@ public static <T> Maybe<T> fromSingle(SingleSource<T> singleSource) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromCallable(@NonNull final Callable<? extends T> callable) {
+    public static <@NonNull T> Maybe<T> fromCallable(@NonNull final Callable<? extends T> callable) {
         Objects.requireNonNull(callable, "callable is null");
         return RxJavaPlugins.onAssembly(new MaybeFromCallable<T>(callable));
     }
@@ -810,7 +822,7 @@ public static <T> Maybe<T> fromCallable(@NonNull final Callable<? extends T> cal
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromFuture(Future<? extends T> future) {
+    public static <@NonNull T> Maybe<T> fromFuture(@NonNull Future<? extends T> future) {
         Objects.requireNonNull(future, "future is null");
         return RxJavaPlugins.onAssembly(new MaybeFromFuture<T>(future, 0L, null));
     }
@@ -848,7 +860,7 @@ public static <T> Maybe<T> fromFuture(Future<? extends T> future) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit) {
+    public static <@NonNull T> Maybe<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
         Objects.requireNonNull(future, "future is null");
         Objects.requireNonNull(unit, "unit is null");
         return RxJavaPlugins.onAssembly(new MaybeFromFuture<T>(future, timeout, unit));
@@ -869,7 +881,7 @@ public static <T> Maybe<T> fromFuture(Future<? extends T> future, long timeout,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromRunnable(final Runnable run) {
+    public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
         Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new MaybeFromRunnable<T>(run));
     }
@@ -916,7 +928,7 @@ public static <T> Maybe<T> fromRunnable(final Runnable run) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromSupplier(@NonNull final Supplier<? extends T> supplier) {
+    public static <@NonNull T> Maybe<T> fromSupplier(@NonNull final Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new MaybeFromSupplier<T>(supplier));
     }
@@ -943,9 +955,9 @@ public static <T> Maybe<T> fromSupplier(@NonNull final Supplier<? extends T> sup
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> just(T item) {
+    public static <@NonNull T> Maybe<T> just(T item) {
         Objects.requireNonNull(item, "item is null");
-        return RxJavaPlugins.onAssembly(new MaybeJust<T>(item));
+        return RxJavaPlugins.onAssembly(new MaybeJust<>(item));
     }
 
     /**
@@ -978,7 +990,8 @@ public static <T> Maybe<T> just(T item) {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Iterable<? extends MaybeSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> merge(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
         return merge(Flowable.fromIterable(sources));
     }
 
@@ -1012,7 +1025,8 @@ public static <T> Flowable<T> merge(Iterable<? extends MaybeSource<? extends T>>
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Publisher<? extends MaybeSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
         return merge(sources, Integer.MAX_VALUE);
     }
 
@@ -1049,7 +1063,7 @@ public static <T> Flowable<T> merge(Publisher<? extends MaybeSource<? extends T>
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> merge(Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "source is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), false, maxConcurrency, 1));
@@ -1082,7 +1096,7 @@ public static <T> Flowable<T> merge(Publisher<? extends MaybeSource<? extends T>
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Maybe<T> merge(MaybeSource<? extends MaybeSource<? extends T>> source) {
+    public static <T> Maybe<T> merge(@NonNull MaybeSource<? extends MaybeSource<? extends T>> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatten(source, Functions.identity()));
     }
@@ -1127,9 +1141,8 @@ public static <T> Maybe<T> merge(MaybeSource<? extends MaybeSource<? extends T>>
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> merge(
-            MaybeSource<? extends T> source1, MaybeSource<? extends T> source2
+            @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1178,10 +1191,9 @@ public static <T> Flowable<T> merge(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> merge(
-            MaybeSource<? extends T> source1, MaybeSource<? extends T> source2,
-            MaybeSource<? extends T> source3
+            @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2,
+            @NonNull MaybeSource<? extends T> source3
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1233,10 +1245,9 @@ public static <T> Flowable<T> merge(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> merge(
-            MaybeSource<? extends T> source1, MaybeSource<? extends T> source2,
-            MaybeSource<? extends T> source3, MaybeSource<? extends T> source4
+            @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2,
+            @NonNull MaybeSource<? extends T> source3, @NonNull MaybeSource<? extends T> source4
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1276,16 +1287,18 @@ public static <T> Flowable<T> merge(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
+    @SafeVarargs
     public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return Flowable.empty();
         }
         if (sources.length == 1) {
-            return RxJavaPlugins.onAssembly(new MaybeToFlowable<T>((MaybeSource<T>)sources[0]));
+            @SuppressWarnings("unchecked")
+            MaybeSource<T> source = (MaybeSource<T>)sources[0];
+            return RxJavaPlugins.onAssembly(new MaybeToFlowable<>(source));
         }
-        return RxJavaPlugins.onAssembly(new MaybeMergeArray<T>(sources));
+        return RxJavaPlugins.onAssembly(new MaybeMergeArray<>(sources));
     }
 
     /**
@@ -1319,7 +1332,9 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeArrayDelayError(MaybeSource<? extends T>... sources) {
+    @SafeVarargs
+    @NonNull
+    public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extends T>... sources) {
         if (sources.length == 0) {
             return Flowable.empty();
         }
@@ -1357,7 +1372,8 @@ public static <T> Flowable<T> mergeArrayDelayError(MaybeSource<? extends T>... s
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Iterable<? extends MaybeSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).flatMap((Function)MaybeToPublisher.instance(), true);
     }
 
@@ -1392,7 +1408,8 @@ public static <T> Flowable<T> mergeDelayError(Iterable<? extends MaybeSource<? e
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Publisher<? extends MaybeSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
         return mergeDelayError(sources, Integer.MAX_VALUE);
     }
 
@@ -1431,7 +1448,7 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends MaybeSource<?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "source is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), true, maxConcurrency, 1));
@@ -1465,12 +1482,11 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends MaybeSource<?
      * @return a Flowable that emits all of the items that are emitted by the two source MaybeSources
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
-    @SuppressWarnings({ "unchecked" })
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(MaybeSource<? extends T> source1, MaybeSource<? extends T> source2) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return mergeArrayDelayError(source1, source2);
@@ -1507,13 +1523,12 @@ public static <T> Flowable<T> mergeDelayError(MaybeSource<? extends T> source1,
      * @return a Flowable that emits all of the items that are emitted by the source MaybeSources
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
-    @SuppressWarnings({ "unchecked" })
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(MaybeSource<? extends T> source1,
-            MaybeSource<? extends T> source2, MaybeSource<? extends T> source3) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T> source1,
+            @NonNull MaybeSource<? extends T> source2, @NonNull MaybeSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1553,14 +1568,13 @@ public static <T> Flowable<T> mergeDelayError(MaybeSource<? extends T> source1,
      * @return a Flowable that emits all of the items that are emitted by the source MaybeSources
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
-    @SuppressWarnings({ "unchecked" })
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(
-            MaybeSource<? extends T> source1, MaybeSource<? extends T> source2,
-            MaybeSource<? extends T> source3, MaybeSource<? extends T> source4) {
+            @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2,
+            @NonNull MaybeSource<? extends T> source3, @NonNull MaybeSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1587,6 +1601,7 @@ public static <T> Flowable<T> mergeDelayError(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Maybe<T> never() {
         return RxJavaPlugins.onAssembly((Maybe<T>)MaybeNever.INSTANCE);
     }
@@ -1612,7 +1627,8 @@ public static <T> Maybe<T> never() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(MaybeSource<? extends T> source1, MaybeSource<? extends T> source2) {
+    @NonNull
+    public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate());
     }
 
@@ -1642,12 +1658,12 @@ public static <T> Single<Boolean> sequenceEqual(MaybeSource<? extends T> source1
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(MaybeSource<? extends T> source1, MaybeSource<? extends T> source2,
-            BiPredicate<? super T, ? super T> isEqual) {
+    public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2,
+            @NonNull BiPredicate<? super T, ? super T> isEqual) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(isEqual, "isEqual is null");
-        return RxJavaPlugins.onAssembly(new MaybeEqualSingle<T>(source1, source2, isEqual));
+        return RxJavaPlugins.onAssembly(new MaybeEqualSingle<>(source1, source2, isEqual));
     }
 
     /**
@@ -1668,7 +1684,8 @@ public static <T> Single<Boolean> sequenceEqual(MaybeSource<? extends T> source1
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Maybe<Long> timer(long delay, TimeUnit unit) {
+    @NonNull
+    public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit) {
         return timer(delay, unit, Schedulers.computation());
     }
 
@@ -1693,7 +1710,7 @@ public static Maybe<Long> timer(long delay, TimeUnit unit) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Maybe<Long> timer(long delay, TimeUnit unit, Scheduler scheduler) {
+    public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
 
@@ -1714,12 +1731,12 @@ public static Maybe<Long> timer(long delay, TimeUnit unit, Scheduler scheduler)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> unsafeCreate(MaybeSource<T> onSubscribe) {
+    public static <T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
         if (onSubscribe instanceof Maybe) {
             throw new IllegalArgumentException("unsafeCreate(Maybe) should be upgraded");
         }
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
-        return RxJavaPlugins.onAssembly(new MaybeUnsafeCreate<T>(onSubscribe));
+        return RxJavaPlugins.onAssembly(new MaybeUnsafeCreate<>(onSubscribe));
     }
 
     /**
@@ -1745,9 +1762,10 @@ public static <T> Maybe<T> unsafeCreate(MaybeSource<T> onSubscribe) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, D> Maybe<T> using(Supplier<? extends D> resourceSupplier,
-            Function<? super D, ? extends MaybeSource<? extends T>> sourceSupplier,
-                    Consumer<? super D> resourceDisposer) {
+    @NonNull
+    public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSupplier,
+            @NonNull Function<? super D, ? extends MaybeSource<? extends T>> sourceSupplier,
+            @NonNull Consumer<? super D> resourceDisposer) {
         return using(resourceSupplier, sourceSupplier, resourceDisposer, true);
     }
 
@@ -1783,9 +1801,9 @@ public static <T, D> Maybe<T> using(Supplier<? extends D> resourceSupplier,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, D> Maybe<T> using(Supplier<? extends D> resourceSupplier,
-            Function<? super D, ? extends MaybeSource<? extends T>> sourceSupplier,
-                    Consumer<? super D> resourceDisposer, boolean eager) {
+    public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSupplier,
+            @NonNull Function<? super D, ? extends MaybeSource<? extends T>> sourceSupplier,
+            @NonNull Consumer<? super D> resourceDisposer, boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
         Objects.requireNonNull(resourceDisposer, "disposer is null");
@@ -1806,12 +1824,12 @@ public static <T, D> Maybe<T> using(Supplier<? extends D> resourceSupplier,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> wrap(MaybeSource<T> source) {
+    public static <T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
         if (source instanceof Maybe) {
             return RxJavaPlugins.onAssembly((Maybe<T>)source);
         }
         Objects.requireNonNull(source, "onSubscribe is null");
-        return RxJavaPlugins.onAssembly(new MaybeUnsafeCreate<T>(source));
+        return RxJavaPlugins.onAssembly(new MaybeUnsafeCreate<>(source));
     }
 
     /**
@@ -1844,7 +1862,7 @@ public static <T> Maybe<T> wrap(MaybeSource<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Maybe<R> zip(Iterable<? extends MaybeSource<? extends T>> sources, Function<? super Object[], ? extends R> zipper) {
+    public static <T, R> Maybe<R> zip(@NonNull Iterable<? extends MaybeSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeZipIterable<T, R>(sources, zipper));
@@ -1876,13 +1894,12 @@ public static <T, R> Maybe<R> zip(Iterable<? extends MaybeSource<? extends T>> s
      * @return a Maybe that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Maybe<R> zip(
-            MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> zipper) {
+            @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return zipArray(Functions.toFunction(zipper), source1, source2);
@@ -1917,13 +1934,12 @@ public static <T1, T2, R> Maybe<R> zip(
      * @return a Maybe that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, R> Maybe<R> zip(
-            MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
-            Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
+            @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
+            @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1962,14 +1978,13 @@ public static <T1, T2, T3, R> Maybe<R> zip(
      * @return a Maybe that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, R> Maybe<R> zip(
-            MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
-            MaybeSource<? extends T4> source4,
-            Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
+            @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
+            @NonNull MaybeSource<? extends T4> source4,
+            @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -2012,14 +2027,13 @@ public static <T1, T2, T3, T4, R> Maybe<R> zip(
      * @return a Maybe that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, R> Maybe<R> zip(
-            MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
-            MaybeSource<? extends T4> source4, MaybeSource<? extends T5> source5,
-            Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
+            @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
+            @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5,
+            @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -2066,14 +2080,13 @@ public static <T1, T2, T3, T4, T5, R> Maybe<R> zip(
      * @return a Maybe that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, R> Maybe<R> zip(
-            MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
-            MaybeSource<? extends T4> source4, MaybeSource<? extends T5> source5, MaybeSource<? extends T6> source6,
-            Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
+            @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
+            @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5, @NonNull MaybeSource<? extends T6> source6,
+            @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -2124,15 +2137,14 @@ public static <T1, T2, T3, T4, T5, T6, R> Maybe<R> zip(
      * @return a Maybe that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, R> Maybe<R> zip(
-            MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
-            MaybeSource<? extends T4> source4, MaybeSource<? extends T5> source5, MaybeSource<? extends T6> source6,
-            MaybeSource<? extends T7> source7,
-            Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
+            @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
+            @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5, @NonNull MaybeSource<? extends T6> source6,
+            @NonNull MaybeSource<? extends T7> source7,
+            @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -2187,15 +2199,14 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Maybe<R> zip(
      * @return a Maybe that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Maybe<R> zip(
-            MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
-            MaybeSource<? extends T4> source4, MaybeSource<? extends T5> source5, MaybeSource<? extends T6> source6,
-            MaybeSource<? extends T7> source7, MaybeSource<? extends T8> source8,
-            Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
+            @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
+            @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5, @NonNull MaybeSource<? extends T6> source6,
+            @NonNull MaybeSource<? extends T7> source7, @NonNull MaybeSource<? extends T8> source8,
+            @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -2253,15 +2264,14 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Maybe<R> zip(
      * @return a Maybe that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
-            MaybeSource<? extends T1> source1, MaybeSource<? extends T2> source2, MaybeSource<? extends T3> source3,
-            MaybeSource<? extends T4> source4, MaybeSource<? extends T5> source5, MaybeSource<? extends T6> source6,
-            MaybeSource<? extends T7> source7, MaybeSource<? extends T8> source8, MaybeSource<? extends T9> source9,
-            Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
+            @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
+            @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5, @NonNull MaybeSource<? extends T6> source6,
+            @NonNull MaybeSource<? extends T7> source7, @NonNull MaybeSource<? extends T8> source8, @NonNull MaybeSource<? extends T9> source9,
+            @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
 
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -2305,8 +2315,9 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Maybe<R> zipArray(Function<? super Object[], ? extends R> zipper,
-            MaybeSource<? extends T>... sources) {
+    @SafeVarargs
+    public static <T, R> Maybe<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper,
+            @NonNull MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -2335,11 +2346,10 @@ public static <T, R> Maybe<R> zipArray(Function<? super Object[], ? extends R> z
      *         signalled
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> ambWith(MaybeSource<? extends T> other) {
+    public final Maybe<T> ambWith(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
@@ -2359,8 +2369,9 @@ public final Maybe<T> ambWith(MaybeSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @Nullable
     public final T blockingGet() {
-        BlockingMultiObserver<T> observer = new BlockingMultiObserver<T>();
+        BlockingMultiObserver<T> observer = new BlockingMultiObserver<>();
         subscribe(observer);
         return observer.blockingGet();
     }
@@ -2381,9 +2392,10 @@ public final T blockingGet() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final T blockingGet(T defaultValue) {
+    @Nullable
+    public final T blockingGet(@Nullable T defaultValue) {
         Objects.requireNonNull(defaultValue, "defaultValue is null");
-        BlockingMultiObserver<T> observer = new BlockingMultiObserver<T>();
+        BlockingMultiObserver<T> observer = new BlockingMultiObserver<>();
         subscribe(observer);
         return observer.blockingGet(defaultValue);
     }
@@ -2409,8 +2421,9 @@ public final T blockingGet(T defaultValue) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> cache() {
-        return RxJavaPlugins.onAssembly(new MaybeCache<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeCache<>(this));
     }
 
     /**
@@ -2429,7 +2442,7 @@ public final Maybe<T> cache() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<U> cast(final Class<? extends U> clazz) {
+    public final <U> Maybe<U> cast(@NonNull Class<? extends U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
@@ -2455,7 +2468,8 @@ public final <U> Maybe<U> cast(final Class<? extends U> clazz) {
     @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> compose(MaybeTransformer<? super T, ? extends R> transformer) {
+    @NonNull
+    public final <R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends R> transformer) {
         return wrap(((MaybeTransformer<T, R>) Objects.requireNonNull(transformer, "transformer is null")).apply(this));
     }
 
@@ -2478,9 +2492,9 @@ public final <R> Maybe<R> compose(MaybeTransformer<? super T, ? extends R> trans
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> concatMap(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <R> Maybe<R> concatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatten<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatten<>(this, mapper));
     }
 
     /**
@@ -2505,7 +2519,7 @@ public final <R> Maybe<R> concatMap(Function<? super T, ? extends MaybeSource<?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> concatWith(MaybeSource<? extends T> other) {
+    public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return concat(this, other);
     }
@@ -2529,9 +2543,9 @@ public final Flowable<T> concatWith(MaybeSource<? extends T> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> contains(final Object item) {
+    public final Single<Boolean> contains(@NonNull Object item) {
         Objects.requireNonNull(item, "item is null");
-        return RxJavaPlugins.onAssembly(new MaybeContains<T>(this, item));
+        return RxJavaPlugins.onAssembly(new MaybeContains<>(this, item));
     }
 
     /**
@@ -2550,8 +2564,9 @@ public final Single<Boolean> contains(final Object item) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<Long> count() {
-        return RxJavaPlugins.onAssembly(new MaybeCount<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeCount<>(this));
     }
 
     /**
@@ -2573,9 +2588,9 @@ public final Single<Long> count() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> defaultIfEmpty(T defaultItem) {
+    public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
         Objects.requireNonNull(defaultItem, "defaultItem is null");
-        return RxJavaPlugins.onAssembly(new MaybeToSingle<T>(this, defaultItem));
+        return RxJavaPlugins.onAssembly(new MaybeToSingle<>(this, defaultItem));
     }
 
     /**
@@ -2598,7 +2613,8 @@ public final Single<T> defaultIfEmpty(T defaultItem) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Maybe<T> delay(long delay, TimeUnit unit) {
+    @NonNull
+    public final Maybe<T> delay(long delay, @NonNull TimeUnit unit) {
         return delay(delay, unit, Schedulers.computation());
     }
 
@@ -2624,10 +2640,10 @@ public final Maybe<T> delay(long delay, TimeUnit unit) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
+    public final Maybe<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new MaybeDelay<T>(this, Math.max(0L, delay), unit, scheduler));
+        return RxJavaPlugins.onAssembly(new MaybeDelay<>(this, Math.max(0L, delay), unit, scheduler));
     }
 
     /**
@@ -2644,8 +2660,6 @@ public final Maybe<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
      *
      * @param <U>
      *            the subscription delay value type (ignored)
-     * @param <V>
-     *            the item delay value type (ignored)
      * @param delayIndicator
      *            the Publisher that gets subscribed to when this Maybe signals an event and that
      *            signal is emitted when the Publisher signals an item or completes
@@ -2656,9 +2670,9 @@ public final Maybe<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
-    public final <U, V> Maybe<T> delay(Publisher<U> delayIndicator) {
+    public final <U> Maybe<T> delay(@NonNull Publisher<U> delayIndicator) {
         Objects.requireNonNull(delayIndicator, "delayIndicator is null");
-        return RxJavaPlugins.onAssembly(new MaybeDelayOtherPublisher<T, U>(this, delayIndicator));
+        return RxJavaPlugins.onAssembly(new MaybeDelayOtherPublisher<>(this, delayIndicator));
     }
 
     /**
@@ -2683,9 +2697,9 @@ public final <U, V> Maybe<T> delay(Publisher<U> delayIndicator) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> delaySubscription(Publisher<U> subscriptionIndicator) {
+    public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIndicator) {
         Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
-        return RxJavaPlugins.onAssembly(new MaybeDelaySubscriptionOtherPublisher<T, U>(this, subscriptionIndicator));
+        return RxJavaPlugins.onAssembly(new MaybeDelaySubscriptionOtherPublisher<>(this, subscriptionIndicator));
     }
 
     /**
@@ -2707,7 +2721,8 @@ public final <U> Maybe<T> delaySubscription(Publisher<U> subscriptionIndicator)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Maybe<T> delaySubscription(long delay, TimeUnit unit) {
+    @NonNull
+    public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
         return delaySubscription(delay, unit, Schedulers.computation());
     }
 
@@ -2733,7 +2748,8 @@ public final Maybe<T> delaySubscription(long delay, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> delaySubscription(long delay, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return delaySubscription(Flowable.timer(delay, unit, scheduler));
     }
 
@@ -2753,9 +2769,9 @@ public final Maybe<T> delaySubscription(long delay, TimeUnit unit, Scheduler sch
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doAfterSuccess(Consumer<? super T> onAfterSuccess) {
+    public final Maybe<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSuccess) {
         Objects.requireNonNull(onAfterSuccess, "onAfterSuccess is null");
-        return RxJavaPlugins.onAssembly(new MaybeDoAfterSuccess<T>(this, onAfterSuccess));
+        return RxJavaPlugins.onAssembly(new MaybeDoAfterSuccess<>(this, onAfterSuccess));
     }
 
     /**
@@ -2778,8 +2794,8 @@ public final Maybe<T> doAfterSuccess(Consumer<? super T> onAfterSuccess) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doAfterTerminate(Action onAfterTerminate) {
-        return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
+    public final Maybe<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
+        return RxJavaPlugins.onAssembly(new MaybePeek<>(this,
                 Functions.emptyConsumer(), // onSubscribe
                 Functions.emptyConsumer(), // onSuccess
                 Functions.emptyConsumer(), // onError
@@ -2808,9 +2824,9 @@ public final Maybe<T> doAfterTerminate(Action onAfterTerminate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doFinally(Action onFinally) {
+    public final Maybe<T> doFinally(@NonNull Action onFinally) {
         Objects.requireNonNull(onFinally, "onFinally is null");
-        return RxJavaPlugins.onAssembly(new MaybeDoFinally<T>(this, onFinally));
+        return RxJavaPlugins.onAssembly(new MaybeDoFinally<>(this, onFinally));
     }
 
     /**
@@ -2827,8 +2843,8 @@ public final Maybe<T> doFinally(Action onFinally) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doOnDispose(Action onDispose) {
-        return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
+    public final Maybe<T> doOnDispose(@NonNull Action onDispose) {
+        return RxJavaPlugins.onAssembly(new MaybePeek<>(this,
                 Functions.emptyConsumer(), // onSubscribe
                 Functions.emptyConsumer(), // onSuccess
                 Functions.emptyConsumer(), // onError
@@ -2855,8 +2871,8 @@ public final Maybe<T> doOnDispose(Action onDispose) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doOnComplete(Action onComplete) {
-        return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
+    public final Maybe<T> doOnComplete(@NonNull Action onComplete) {
+        return RxJavaPlugins.onAssembly(new MaybePeek<>(this,
                 Functions.emptyConsumer(), // onSubscribe
                 Functions.emptyConsumer(), // onSuccess
                 Functions.emptyConsumer(), // onError
@@ -2881,8 +2897,8 @@ public final Maybe<T> doOnComplete(Action onComplete) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doOnError(Consumer<? super Throwable> onError) {
-        return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
+    public final Maybe<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
+        return RxJavaPlugins.onAssembly(new MaybePeek<>(this,
                 Functions.emptyConsumer(), // onSubscribe
                 Functions.emptyConsumer(), // onSuccess
                 Objects.requireNonNull(onError, "onError is null"),
@@ -2910,9 +2926,10 @@ public final Maybe<T> doOnError(Consumer<? super Throwable> onError) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doOnEvent(BiConsumer<? super T, ? super Throwable> onEvent) {
+    @NonNull
+    public final Maybe<T> doOnEvent(@NonNull BiConsumer<? super T, ? super Throwable> onEvent) {
         Objects.requireNonNull(onEvent, "onEvent is null");
-        return RxJavaPlugins.onAssembly(new MaybeDoOnEvent<T>(this, onEvent));
+        return RxJavaPlugins.onAssembly(new MaybeDoOnEvent<>(this, onEvent));
     }
 
     /**
@@ -2928,8 +2945,8 @@ public final Maybe<T> doOnEvent(BiConsumer<? super T, ? super Throwable> onEvent
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doOnSubscribe(Consumer<? super Disposable> onSubscribe) {
-        return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
+    public final Maybe<T> doOnSubscribe(@NonNull Consumer<? super Disposable> onSubscribe) {
+        return RxJavaPlugins.onAssembly(new MaybePeek<>(this,
                 Objects.requireNonNull(onSubscribe, "onSubscribe is null"),
                 Functions.emptyConsumer(), // onSuccess
                 Functions.emptyConsumer(), // onError
@@ -2961,9 +2978,9 @@ public final Maybe<T> doOnSubscribe(Consumer<? super Disposable> onSubscribe) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doOnTerminate(final Action onTerminate) {
+    public final Maybe<T> doOnTerminate(@NonNull Action onTerminate) {
         Objects.requireNonNull(onTerminate, "onTerminate is null");
-        return RxJavaPlugins.onAssembly(new MaybeDoOnTerminate<T>(this, onTerminate));
+        return RxJavaPlugins.onAssembly(new MaybeDoOnTerminate<>(this, onTerminate));
     }
 
     /**
@@ -2981,8 +2998,8 @@ public final Maybe<T> doOnTerminate(final Action onTerminate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> doOnSuccess(Consumer<? super T> onSuccess) {
-        return RxJavaPlugins.onAssembly(new MaybePeek<T>(this,
+    public final Maybe<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
+        return RxJavaPlugins.onAssembly(new MaybePeek<>(this,
                 Functions.emptyConsumer(), // onSubscribe
                 Objects.requireNonNull(onSuccess, "onSuccess is null"),
                 Functions.emptyConsumer(), // onError
@@ -3012,9 +3029,9 @@ public final Maybe<T> doOnSuccess(Consumer<? super T> onSuccess) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> filter(Predicate<? super T> predicate) {
+    public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new MaybeFilter<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new MaybeFilter<>(this, predicate));
     }
 
     /**
@@ -3037,9 +3054,9 @@ public final Maybe<T> filter(Predicate<? super T> predicate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> flatMap(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatten<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatten<>(this, mapper));
     }
 
     /**
@@ -3067,13 +3084,13 @@ public final <R> Maybe<R> flatMap(Function<? super T, ? extends MaybeSource<? ex
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> flatMap(
-            Function<? super T, ? extends MaybeSource<? extends R>> onSuccessMapper,
-            Function<? super Throwable, ? extends MaybeSource<? extends R>> onErrorMapper,
-            Supplier<? extends MaybeSource<? extends R>> onCompleteSupplier) {
+            @NonNull Function<? super T, ? extends MaybeSource<? extends R>> onSuccessMapper,
+            @NonNull Function<? super Throwable, ? extends MaybeSource<? extends R>> onErrorMapper,
+            @NonNull Supplier<? extends MaybeSource<? extends R>> onCompleteSupplier) {
         Objects.requireNonNull(onSuccessMapper, "onSuccessMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
         Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapNotification<T, R>(this, onSuccessMapper, onErrorMapper, onCompleteSupplier));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapNotification<>(this, onSuccessMapper, onErrorMapper, onCompleteSupplier));
     }
 
     /**
@@ -3101,11 +3118,11 @@ public final <R> Maybe<R> flatMap(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Maybe<R> flatMap(Function<? super T, ? extends MaybeSource<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends R> resultSelector) {
+    public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> resultSelector) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(resultSelector, "resultSelector is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapBiSelector<T, U, R>(this, mapper, resultSelector));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapBiSelector<>(this, mapper, resultSelector));
     }
 
     /**
@@ -3132,9 +3149,9 @@ public final <U, R> Maybe<R> flatMap(Function<? super T, ? extends MaybeSource<?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableFlowable<T, U>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableFlowable<>(this, mapper));
     }
 
     /**
@@ -3158,9 +3175,9 @@ public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? exten
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableObservable<T, U>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableObservable<>(this, mapper));
     }
 
     /**
@@ -3182,9 +3199,9 @@ public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? e
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMapObservable(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapObservable<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapObservable<>(this, mapper));
     }
 
     /**
@@ -3210,9 +3227,9 @@ public final <R> Observable<R> flatMapObservable(Function<? super T, ? extends O
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapPublisher(Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapPublisher<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapPublisher<>(this, mapper));
     }
 
     /**
@@ -3236,9 +3253,9 @@ public final <R> Flowable<R> flatMapPublisher(Function<? super T, ? extends Publ
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> flatMapSingle(final Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapSingle<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapSingle<>(this, mapper));
     }
 
     /**
@@ -3264,9 +3281,9 @@ public final <R> Single<R> flatMapSingle(final Function<? super T, ? extends Sin
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> flatMapSingleElement(final Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <R> Maybe<R> flatMapSingleElement(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapSingleElement<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapSingleElement<>(this, mapper));
     }
 
     /**
@@ -3288,9 +3305,9 @@ public final <R> Maybe<R> flatMapSingleElement(final Function<? super T, ? exten
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable flatMapCompletable(final Function<? super T, ? extends CompletableSource> mapper) {
+    public final Completable flatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapCompletable<T>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapCompletable<>(this, mapper));
     }
 
     /**
@@ -3307,8 +3324,9 @@ public final Completable flatMapCompletable(final Function<? super T, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> hide() {
-        return RxJavaPlugins.onAssembly(new MaybeHide<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeHide<>(this));
     }
 
     /**
@@ -3326,8 +3344,9 @@ public final Maybe<T> hide() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable ignoreElement() {
-        return RxJavaPlugins.onAssembly(new MaybeIgnoreElementCompletable<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeIgnoreElementCompletable<>(this));
     }
 
     /**
@@ -3344,8 +3363,9 @@ public final Completable ignoreElement() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<Boolean> isEmpty() {
-        return RxJavaPlugins.onAssembly(new MaybeIsEmptySingle<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeIsEmptySingle<>(this));
     }
 
     /**
@@ -3500,7 +3520,7 @@ public final Single<Boolean> isEmpty() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> lift(final MaybeOperator<? extends R, ? super T> lift) {
+    public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> lift) {
         Objects.requireNonNull(lift, "lift is null");
         return RxJavaPlugins.onAssembly(new MaybeLift<T, R>(this, lift));
     }
@@ -3524,7 +3544,7 @@ public final <R> Maybe<R> lift(final MaybeOperator<? extends R, ? super T> lift)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> map(Function<? super T, ? extends R> mapper) {
+    public final <R> Maybe<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeMap<T, R>(this, mapper));
     }
@@ -3545,8 +3565,9 @@ public final <R> Maybe<R> map(Function<? super T, ? extends R> mapper) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<Notification<T>> materialize() {
-        return RxJavaPlugins.onAssembly(new MaybeMaterialize<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeMaterialize<>(this));
     }
 
     /**
@@ -3572,7 +3593,7 @@ public final Single<Notification<T>> materialize() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> mergeWith(MaybeSource<? extends T> other) {
+    public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return merge(this, other);
     }
@@ -3598,9 +3619,9 @@ public final Flowable<T> mergeWith(MaybeSource<? extends T> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> observeOn(final Scheduler scheduler) {
+    public final Maybe<T> observeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new MaybeObserveOn<T>(this, scheduler));
+        return RxJavaPlugins.onAssembly(new MaybeObserveOn<>(this, scheduler));
     }
 
     /**
@@ -3622,7 +3643,7 @@ public final Maybe<T> observeOn(final Scheduler scheduler) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<U> ofType(final Class<U> clazz) {
+    public final <U> Maybe<U> ofType(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
@@ -3663,11 +3684,12 @@ public final <R> R to(@NonNull MaybeConverter<T, ? extends R> converter) {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> toFlowable() {
         if (this instanceof FuseToFlowable) {
             return ((FuseToFlowable<T>)this).fuseToFlowable();
         }
-        return RxJavaPlugins.onAssembly(new MaybeToFlowable<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeToFlowable<>(this));
     }
 
     /**
@@ -3682,11 +3704,12 @@ public final Flowable<T> toFlowable() {
     @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> toObservable() {
         if (this instanceof FuseToObservable) {
             return ((FuseToObservable<T>)this).fuseToObservable();
         }
-        return RxJavaPlugins.onAssembly(new MaybeToObservable<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeToObservable<>(this));
     }
 
     /**
@@ -3700,8 +3723,9 @@ public final Observable<T> toObservable() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> toSingle() {
-        return RxJavaPlugins.onAssembly(new MaybeToSingle<T>(this, null));
+        return RxJavaPlugins.onAssembly(new MaybeToSingle<>(this, null));
     }
 
     /**
@@ -3715,6 +3739,7 @@ public final Single<T> toSingle() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> onErrorComplete() {
         return onErrorComplete(Functions.alwaysTrue());
     }
@@ -3733,10 +3758,10 @@ public final Maybe<T> onErrorComplete() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onErrorComplete(final Predicate<? super Throwable> predicate) {
+    public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
 
-        return RxJavaPlugins.onAssembly(new MaybeOnErrorComplete<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new MaybeOnErrorComplete<>(this, predicate));
     }
 
     /**
@@ -3761,7 +3786,7 @@ public final Maybe<T> onErrorComplete(final Predicate<? super Throwable> predica
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onErrorResumeWith(final MaybeSource<? extends T> next) {
+    public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> next) {
         Objects.requireNonNull(next, "next is null");
         return onErrorResumeNext(Functions.justFunction(next));
     }
@@ -3788,9 +3813,9 @@ public final Maybe<T> onErrorResumeWith(final MaybeSource<? extends T> next) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onErrorResumeNext(Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction) {
+    public final Maybe<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction) {
         Objects.requireNonNull(resumeFunction, "resumeFunction is null");
-        return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<T>(this, resumeFunction, true));
+        return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<>(this, resumeFunction, true));
     }
 
     /**
@@ -3815,9 +3840,9 @@ public final Maybe<T> onErrorResumeNext(Function<? super Throwable, ? extends Ma
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onErrorReturn(Function<? super Throwable, ? extends T> valueSupplier) {
+    public final Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> valueSupplier) {
         Objects.requireNonNull(valueSupplier, "valueSupplier is null");
-        return RxJavaPlugins.onAssembly(new MaybeOnErrorReturn<T>(this, valueSupplier));
+        return RxJavaPlugins.onAssembly(new MaybeOnErrorReturn<>(this, valueSupplier));
     }
 
     /**
@@ -3841,7 +3866,7 @@ public final Maybe<T> onErrorReturn(Function<? super Throwable, ? extends T> val
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onErrorReturnItem(final T item) {
+    public final Maybe<T> onErrorReturnItem(@NonNull T item) {
         Objects.requireNonNull(item, "item is null");
         return onErrorReturn(Functions.justFunction(item));
     }
@@ -3871,9 +3896,9 @@ public final Maybe<T> onErrorReturnItem(final T item) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onExceptionResumeNext(final MaybeSource<? extends T> next) {
+    public final Maybe<T> onExceptionResumeNext(@NonNull MaybeSource<? extends T> next) {
         Objects.requireNonNull(next, "next is null");
-        return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<T>(this, Functions.justFunction(next), false));
+        return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<>(this, Functions.justFunction(next), false));
     }
 
     /**
@@ -3890,8 +3915,9 @@ public final Maybe<T> onExceptionResumeNext(final MaybeSource<? extends T> next)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> onTerminateDetach() {
-        return RxJavaPlugins.onAssembly(new MaybeDetach<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeDetach<>(this));
     }
 
     /**
@@ -3911,6 +3937,7 @@ public final Maybe<T> onTerminateDetach() {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> repeat() {
         return repeat(Long.MAX_VALUE);
     }
@@ -3939,6 +3966,7 @@ public final Flowable<T> repeat() {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> repeat(long times) {
         return toFlowable().repeat(times);
     }
@@ -3966,7 +3994,8 @@ public final Flowable<T> repeat(long times) {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> repeatUntil(BooleanSupplier stop) {
+    @NonNull
+    public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
         return toFlowable().repeatUntil(stop);
     }
 
@@ -3995,7 +4024,8 @@ public final Flowable<T> repeatUntil(BooleanSupplier stop) {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> repeatWhen(final Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
+    @NonNull
+    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
         return toFlowable().repeatWhen(handler);
     }
 
@@ -4017,6 +4047,7 @@ public final Flowable<T> repeatWhen(final Function<? super Flowable<Object>, ? e
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> retry() {
         return retry(Long.MAX_VALUE, Functions.alwaysTrue());
     }
@@ -4040,7 +4071,8 @@ public final Maybe<T> retry() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> retry(BiPredicate<? super Integer, ? super Throwable> predicate) {
+    @NonNull
+    public final Maybe<T> retry(@NonNull BiPredicate<? super Integer, ? super Throwable> predicate) {
         return toFlowable().retry(predicate).singleElement();
     }
 
@@ -4065,6 +4097,7 @@ public final Maybe<T> retry(BiPredicate<? super Integer, ? super Throwable> pred
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> retry(long count) {
         return retry(count, Functions.alwaysTrue());
     }
@@ -4082,7 +4115,8 @@ public final Maybe<T> retry(long count) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> retry(long times, Predicate<? super Throwable> predicate) {
+    @NonNull
+    public final Maybe<T> retry(long times, @NonNull Predicate<? super Throwable> predicate) {
         return toFlowable().retry(times, predicate).singleElement();
     }
 
@@ -4098,7 +4132,8 @@ public final Maybe<T> retry(long times, Predicate<? super Throwable> predicate)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> retry(Predicate<? super Throwable> predicate) {
+    @NonNull
+    public final Maybe<T> retry(@NonNull Predicate<? super Throwable> predicate) {
         return retry(Long.MAX_VALUE, predicate);
     }
 
@@ -4114,7 +4149,7 @@ public final Maybe<T> retry(Predicate<? super Throwable> predicate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> retryUntil(final BooleanSupplier stop) {
+    public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
         Objects.requireNonNull(stop, "stop is null");
         return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop));
     }
@@ -4194,8 +4229,9 @@ public final Maybe<T> retryUntil(final BooleanSupplier stop) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> retryWhen(
-            final Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
+            @NonNull Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
         return toFlowable().retryWhen(handler).singleElement();
     }
 
@@ -4215,6 +4251,7 @@ public final Maybe<T> retryWhen(
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Disposable subscribe() {
         return subscribe(Functions.emptyConsumer(), Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
@@ -4240,7 +4277,8 @@ public final Disposable subscribe() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onSuccess) {
+    @NonNull
+    public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
         return subscribe(onSuccess, Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
 
@@ -4266,7 +4304,8 @@ public final Disposable subscribe(Consumer<? super T> onSuccess) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onSuccess, Consumer<? super Throwable> onError) {
+    @NonNull
+    public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNull Consumer<? super Throwable> onError) {
         return subscribe(onSuccess, onError, Functions.EMPTY_ACTION);
     }
 
@@ -4297,8 +4336,8 @@ public final Disposable subscribe(Consumer<? super T> onSuccess, Consumer<? supe
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onSuccess, Consumer<? super Throwable> onError,
-            Action onComplete) {
+    public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNull Consumer<? super Throwable> onError,
+            @NonNull Action onComplete) {
         Objects.requireNonNull(onSuccess, "onSuccess is null");
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
@@ -4307,7 +4346,7 @@ public final Disposable subscribe(Consumer<? super T> onSuccess, Consumer<? supe
 
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
-    public final void subscribe(MaybeObserver<? super T> observer) {
+    public final void subscribe(@NonNull MaybeObserver<? super T> observer) {
         Objects.requireNonNull(observer, "observer is null");
 
         observer = RxJavaPlugins.onSubscribe(this, observer);
@@ -4333,7 +4372,7 @@ public final void subscribe(MaybeObserver<? super T> observer) {
      * applied by {@link #subscribe(MaybeObserver)} before this method gets called.
      * @param observer the MaybeObserver to handle, not null
      */
-    protected abstract void subscribeActual(MaybeObserver<? super T> observer);
+    protected abstract void subscribeActual(@NonNull MaybeObserver<? super T> observer);
 
     /**
      * Asynchronously subscribes subscribers to this Maybe on the specified {@link Scheduler}.
@@ -4354,9 +4393,9 @@ public final void subscribe(MaybeObserver<? super T> observer) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> subscribeOn(Scheduler scheduler) {
+    public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new MaybeSubscribeOn<T>(this, scheduler));
+        return RxJavaPlugins.onAssembly(new MaybeSubscribeOn<>(this, scheduler));
     }
 
     /**
@@ -4384,7 +4423,8 @@ public final Maybe<T> subscribeOn(Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <E extends MaybeObserver<? super T>> E subscribeWith(E observer) {
+    @NonNull
+    public final <@NonNull E extends MaybeObserver<? super T>> E subscribeWith(E observer) {
         subscribe(observer);
         return observer;
     }
@@ -4407,9 +4447,9 @@ public final <E extends MaybeObserver<? super T>> E subscribeWith(E observer) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> switchIfEmpty(MaybeSource<? extends T> other) {
+    public final Maybe<T> switchIfEmpty(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new MaybeSwitchIfEmpty<T>(this, other));
+        return RxJavaPlugins.onAssembly(new MaybeSwitchIfEmpty<>(this, other));
     }
 
     /**
@@ -4431,9 +4471,9 @@ public final Maybe<T> switchIfEmpty(MaybeSource<? extends T> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> switchIfEmpty(SingleSource<? extends T> other) {
+    public final Single<T> switchIfEmpty(@NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new MaybeSwitchIfEmptySingle<T>(this, other));
+        return RxJavaPlugins.onAssembly(new MaybeSwitchIfEmptySingle<>(this, other));
     }
 
     /**
@@ -4457,9 +4497,9 @@ public final Single<T> switchIfEmpty(SingleSource<? extends T> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> takeUntil(MaybeSource<U> other) {
+    public final <U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new MaybeTakeUntilMaybe<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new MaybeTakeUntilMaybe<>(this, other));
     }
 
     /**
@@ -4487,9 +4527,9 @@ public final <U> Maybe<T> takeUntil(MaybeSource<U> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> takeUntil(Publisher<U> other) {
+    public final <U> Maybe<T> takeUntil(@NonNull Publisher<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new MaybeTakeUntilPublisher<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new MaybeTakeUntilPublisher<>(this, other));
     }
 
     /**
@@ -4512,7 +4552,8 @@ public final <U> Maybe<T> takeUntil(Publisher<U> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Maybe<T> timeout(long timeout, TimeUnit timeUnit) {
+    @NonNull
+    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
         return timeout(timeout, timeUnit, Schedulers.computation());
     }
 
@@ -4539,7 +4580,7 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, MaybeSource<? extends T> fallback) {
+    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull MaybeSource<? extends T> fallback) {
         Objects.requireNonNull(fallback, "fallback is null");
         return timeout(timeout, timeUnit, Schedulers.computation(), fallback);
     }
@@ -4570,7 +4611,7 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, MaybeSource<? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler, MaybeSource<? extends T> fallback) {
+    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler, @NonNull MaybeSource<? extends T> fallback) {
         Objects.requireNonNull(fallback, "fallback is null");
         return timeout(timer(timeout, timeUnit, scheduler), fallback);
     }
@@ -4598,7 +4639,8 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, Scheduler schedul
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler) {
+    @NonNull
+    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler) {
         return timeout(timer(timeout, timeUnit, scheduler));
     }
 
@@ -4617,9 +4659,9 @@ public final Maybe<T> timeout(long timeout, TimeUnit timeUnit, Scheduler schedul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> timeout(MaybeSource<U> timeoutIndicator) {
+    public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator) {
         Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
-        return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe<T, U>(this, timeoutIndicator, null));
+        return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe<>(this, timeoutIndicator, null));
     }
 
     /**
@@ -4639,10 +4681,10 @@ public final <U> Maybe<T> timeout(MaybeSource<U> timeoutIndicator) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> timeout(MaybeSource<U> timeoutIndicator, MaybeSource<? extends T> fallback) {
+    public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator, @NonNull MaybeSource<? extends T> fallback) {
         Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
         Objects.requireNonNull(fallback, "fallback is null");
-        return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe<T, U>(this, timeoutIndicator, fallback));
+        return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe<>(this, timeoutIndicator, fallback));
     }
 
     /**
@@ -4664,9 +4706,9 @@ public final <U> Maybe<T> timeout(MaybeSource<U> timeoutIndicator, MaybeSource<?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> timeout(Publisher<U> timeoutIndicator) {
+    public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator) {
         Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
-        return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher<T, U>(this, timeoutIndicator, null));
+        return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher<>(this, timeoutIndicator, null));
     }
 
     /**
@@ -4690,10 +4732,10 @@ public final <U> Maybe<T> timeout(Publisher<U> timeoutIndicator) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> timeout(Publisher<U> timeoutIndicator, MaybeSource<? extends T> fallback) {
+    public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator, @NonNull MaybeSource<? extends T> fallback) {
         Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
         Objects.requireNonNull(fallback, "fallback is null");
-        return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher<T, U>(this, timeoutIndicator, fallback));
+        return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher<>(this, timeoutIndicator, fallback));
     }
 
     /**
@@ -4712,9 +4754,9 @@ public final <U> Maybe<T> timeout(Publisher<U> timeoutIndicator, MaybeSource<? e
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> unsubscribeOn(final Scheduler scheduler) {
+    public final Maybe<T> unsubscribeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new MaybeUnsubscribeOn<T>(this, scheduler));
+        return RxJavaPlugins.onAssembly(new MaybeUnsubscribeOn<>(this, scheduler));
     }
 
     /**
@@ -4746,7 +4788,7 @@ public final Maybe<T> unsubscribeOn(final Scheduler scheduler) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Maybe<R> zipWith(MaybeSource<? extends U> other, BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <U, R> Maybe<R> zipWith(@NonNull MaybeSource<? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
     }
@@ -4766,8 +4808,9 @@ public final <U, R> Maybe<R> zipWith(MaybeSource<? extends U> other, BiFunction<
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestObserver<T> test() {
-        TestObserver<T> to = new TestObserver<T>();
+        TestObserver<T> to = new TestObserver<>();
         subscribe(to);
         return to;
     }
@@ -4784,8 +4827,9 @@ public final TestObserver<T> test() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestObserver<T> test(boolean dispose) {
-        TestObserver<T> to = new TestObserver<T>();
+        TestObserver<T> to = new TestObserver<>();
 
         if (dispose) {
             to.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/core/Notification.java b/src/main/java/io/reactivex/rxjava3/core/Notification.java
index bb1c35c3f1..086ffafc8e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Notification.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Notification.java
@@ -27,7 +27,7 @@ public final class Notification<T> {
     final Object value;
 
     /** Not meant to be implemented externally. */
-    private Notification(Object value) {
+    private Notification(@Nullable Object value) {
         this.value = value;
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 0e2ff9dec1..42d7f3d00a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -120,7 +120,7 @@ public abstract class Observable<T> implements ObservableSource<T> {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> amb(Iterable<? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new ObservableAmb<T>(null, sources));
+        return RxJavaPlugins.onAssembly(new ObservableAmb<>(null, sources));
     }
 
     /**
@@ -145,6 +145,7 @@ public static <T> Observable<T> amb(Iterable<? extends ObservableSource<? extend
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T> Observable<T> ambArray(ObservableSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         int len = sources.length;
@@ -154,7 +155,7 @@ public static <T> Observable<T> ambArray(ObservableSource<? extends T>... source
         if (len == 1) {
             return (Observable<T>)wrap(sources[0]);
         }
-        return RxJavaPlugins.onAssembly(new ObservableAmb<T>(sources, null));
+        return RxJavaPlugins.onAssembly(new ObservableAmb<>(sources, null));
     }
 
     /**
@@ -1243,6 +1244,7 @@ public static <T> Observable<T> concatArrayDelayError(ObservableSource<? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T> Observable<T> concatArrayEager(ObservableSource<? extends T>... sources) {
         return concatArrayEager(bufferSize(), bufferSize(), sources);
     }
@@ -1294,6 +1296,7 @@ public static <T> Observable<T> concatArrayEager(int maxConcurrency, int prefetc
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T> Observable<T> concatArrayEagerDelayError(ObservableSource<? extends T>... sources) {
         return concatArrayEagerDelayError(bufferSize(), bufferSize(), sources);
     }
@@ -1550,7 +1553,7 @@ public static <T> Observable<T> concatEager(Iterable<? extends ObservableSource<
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> create(ObservableOnSubscribe<T> source) {
         Objects.requireNonNull(source, "source is null");
-        return RxJavaPlugins.onAssembly(new ObservableCreate<T>(source));
+        return RxJavaPlugins.onAssembly(new ObservableCreate<>(source));
     }
 
     /**
@@ -1582,7 +1585,7 @@ public static <T> Observable<T> create(ObservableOnSubscribe<T> source) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> defer(Supplier<? extends ObservableSource<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableDefer<T>(supplier));
+        return RxJavaPlugins.onAssembly(new ObservableDefer<>(supplier));
     }
 
     /**
@@ -1679,6 +1682,7 @@ public static <T> Observable<T> error(final Throwable exception) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
+    @SafeVarargs
     public static <T> Observable<T> fromArray(T... items) {
         Objects.requireNonNull(items, "items is null");
         if (items.length == 0) {
@@ -1687,7 +1691,7 @@ public static <T> Observable<T> fromArray(T... items) {
         if (items.length == 1) {
             return just(items[0]);
         }
-        return RxJavaPlugins.onAssembly(new ObservableFromArray<T>(items));
+        return RxJavaPlugins.onAssembly(new ObservableFromArray<>(items));
     }
 
     /**
@@ -2138,7 +2142,7 @@ public static <T, S> Observable<T> generate(Supplier<S> initialState, BiFunction
         Objects.requireNonNull(initialState, "initialState is null");
         Objects.requireNonNull(generator, "generator is null");
         Objects.requireNonNull(disposeState, "disposeState is null");
-        return RxJavaPlugins.onAssembly(new ObservableGenerate<T, S>(initialState, generator, disposeState));
+        return RxJavaPlugins.onAssembly(new ObservableGenerate<>(initialState, generator, disposeState));
     }
 
     /**
@@ -2343,7 +2347,7 @@ public static Observable<Long> intervalRange(long start, long count, long initia
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> just(T item) {
         Objects.requireNonNull(item, "item is null");
-        return RxJavaPlugins.onAssembly(new ObservableJust<T>(item));
+        return RxJavaPlugins.onAssembly(new ObservableJust<>(item));
     }
 
     /**
@@ -2364,7 +2368,6 @@ public static <T> Observable<T> just(T item) {
      * @return an Observable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2395,7 +2398,6 @@ public static <T> Observable<T> just(T item1, T item2) {
      * @return an Observable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2429,7 +2431,6 @@ public static <T> Observable<T> just(T item1, T item2, T item3) {
      * @return an Observable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2466,7 +2467,6 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4) {
      * @return an Observable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2506,7 +2506,6 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
      * @return an Observable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2549,7 +2548,6 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
      * @return an Observable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2595,7 +2593,6 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
      * @return an Observable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2644,7 +2641,6 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
      * @return an Observable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2696,7 +2692,6 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
      * @return an Observable that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3713,7 +3708,7 @@ public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> so
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(isEqual, "isEqual is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new ObservableSequenceEqualSingle<T>(source1, source2, isEqual, bufferSize));
+        return RxJavaPlugins.onAssembly(new ObservableSequenceEqualSingle<>(source1, source2, isEqual, bufferSize));
     }
 
     /**
@@ -3955,7 +3950,7 @@ public static <T> Observable<T> unsafeCreate(ObservableSource<T> onSubscribe) {
         if (onSubscribe instanceof Observable) {
             throw new IllegalArgumentException("unsafeCreate(Observable) should be upgraded");
         }
-        return RxJavaPlugins.onAssembly(new ObservableFromUnsafeSource<T>(onSubscribe));
+        return RxJavaPlugins.onAssembly(new ObservableFromUnsafeSource<>(onSubscribe));
     }
 
     /**
@@ -4044,7 +4039,7 @@ public static <T> Observable<T> wrap(ObservableSource<T> source) {
         if (source instanceof Observable) {
             return RxJavaPlugins.onAssembly((Observable<T>)source);
         }
-        return RxJavaPlugins.onAssembly(new ObservableFromUnsafeSource<T>(source));
+        return RxJavaPlugins.onAssembly(new ObservableFromUnsafeSource<>(source));
     }
 
     /**
@@ -4205,7 +4200,6 @@ public static <T, R> Observable<R> zip(Iterable<? extends ObservableSource<? ext
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Observable<R> zip(
@@ -4261,7 +4255,6 @@ public static <T1, T2, R> Observable<R> zip(
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Observable<R> zip(
@@ -4318,7 +4311,6 @@ public static <T1, T2, R> Observable<R> zip(
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Observable<R> zip(
@@ -4377,7 +4369,6 @@ public static <T1, T2, R> Observable<R> zip(
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, R> Observable<R> zip(
@@ -4440,7 +4431,6 @@ public static <T1, T2, T3, R> Observable<R> zip(
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, R> Observable<R> zip(
@@ -4508,7 +4498,6 @@ public static <T1, T2, T3, T4, R> Observable<R> zip(
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
@@ -4579,7 +4568,6 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
@@ -4654,7 +4642,6 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
@@ -4734,7 +4721,6 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
@@ -4818,7 +4804,6 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
      * @return an Observable that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
@@ -4890,6 +4875,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
     public static <T, R> Observable<R> zipArray(Function<? super Object[], ? extends R> zipper,
             boolean delayError, int bufferSize, ObservableSource<? extends T>... sources) {
         if (sources.length == 0) {
@@ -4924,7 +4910,7 @@ public static <T, R> Observable<R> zipArray(Function<? super Object[], ? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> all(Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new ObservableAllSingle<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new ObservableAllSingle<>(this, predicate));
     }
 
     /**
@@ -4944,7 +4930,6 @@ public final Single<Boolean> all(Predicate<? super T> predicate) {
      *         emitted an item or sent a termination notification
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> ambWith(ObservableSource<? extends T> other) {
@@ -4976,7 +4961,7 @@ public final Observable<T> ambWith(ObservableSource<? extends T> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Boolean> any(Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new ObservableAnySingle<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new ObservableAnySingle<>(this, predicate));
     }
 
     /**
@@ -4997,7 +4982,7 @@ public final Single<Boolean> any(Predicate<? super T> predicate) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final T blockingFirst() {
-        BlockingFirstObserver<T> observer = new BlockingFirstObserver<T>();
+        BlockingFirstObserver<T> observer = new BlockingFirstObserver<>();
         subscribe(observer);
         T v = observer.blockingGet();
         if (v != null) {
@@ -5025,7 +5010,7 @@ public final T blockingFirst() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final T blockingFirst(T defaultItem) {
-        BlockingFirstObserver<T> observer = new BlockingFirstObserver<T>();
+        BlockingFirstObserver<T> observer = new BlockingFirstObserver<>();
         subscribe(observer);
         T v = observer.blockingGet();
         return v != null ? v : defaultItem;
@@ -5109,7 +5094,7 @@ public final Iterable<T> blockingIterable() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Iterable<T> blockingIterable(int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return new BlockingObservableIterable<T>(this, bufferSize);
+        return new BlockingObservableIterable<>(this, bufferSize);
     }
 
     /**
@@ -5134,7 +5119,7 @@ public final Iterable<T> blockingIterable(int bufferSize) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final T blockingLast() {
-        BlockingLastObserver<T> observer = new BlockingLastObserver<T>();
+        BlockingLastObserver<T> observer = new BlockingLastObserver<>();
         subscribe(observer);
         T v = observer.blockingGet();
         if (v != null) {
@@ -5166,7 +5151,7 @@ public final T blockingLast() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final T blockingLast(T defaultItem) {
-        BlockingLastObserver<T> observer = new BlockingLastObserver<T>();
+        BlockingLastObserver<T> observer = new BlockingLastObserver<>();
         subscribe(observer);
         T v = observer.blockingGet();
         return v != null ? v : defaultItem;
@@ -5194,7 +5179,7 @@ public final T blockingLast(T defaultItem) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Iterable<T> blockingLatest() {
-        return new BlockingObservableLatest<T>(this);
+        return new BlockingObservableLatest<>(this);
     }
 
     /**
@@ -5217,7 +5202,7 @@ public final Iterable<T> blockingLatest() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Iterable<T> blockingMostRecent(T initialValue) {
-        return new BlockingObservableMostRecent<T>(this, initialValue);
+        return new BlockingObservableMostRecent<>(this, initialValue);
     }
 
     /**
@@ -5237,7 +5222,7 @@ public final Iterable<T> blockingMostRecent(T initialValue) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Iterable<T> blockingNext() {
-        return new BlockingObservableNext<T>(this);
+        return new BlockingObservableNext<>(this);
     }
 
     /**
@@ -5521,7 +5506,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(skip, "skip");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableBuffer<T, U>(this, count, skip, bufferSupplier));
+        return RxJavaPlugins.onAssembly(new ObservableBuffer<>(this, count, skip, bufferSupplier));
     }
 
     /**
@@ -5653,7 +5638,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(long timespa
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableBufferTimed<T, U>(this, timespan, timeskip, unit, scheduler, bufferSupplier, Integer.MAX_VALUE, false));
+        return RxJavaPlugins.onAssembly(new ObservableBufferTimed<>(this, timespan, timeskip, unit, scheduler, bufferSupplier, Integer.MAX_VALUE, false));
     }
 
     /**
@@ -5799,7 +5784,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         ObjectHelper.verifyPositive(count, "count");
-        return RxJavaPlugins.onAssembly(new ObservableBufferTimed<T, U>(this, timespan, timespan, unit, scheduler, bufferSupplier, count, restartTimerOnMaxSize));
+        return RxJavaPlugins.onAssembly(new ObservableBufferTimed<>(this, timespan, timespan, unit, scheduler, bufferSupplier, count, restartTimerOnMaxSize));
     }
 
     /**
@@ -6001,7 +5986,7 @@ public final <B> Observable<List<T>> buffer(ObservableSource<B> boundary, final
     public final <B, U extends Collection<? super T>> Observable<U> buffer(ObservableSource<B> boundary, Supplier<U> bufferSupplier) {
         Objects.requireNonNull(boundary, "boundary is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableBufferExactBoundary<T, U, B>(this, boundary, bufferSupplier));
+        return RxJavaPlugins.onAssembly(new ObservableBufferExactBoundary<>(this, boundary, bufferSupplier));
     }
 
     /**
@@ -6114,7 +6099,7 @@ public final Observable<T> cache() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
-        return RxJavaPlugins.onAssembly(new ObservableCache<T>(this, initialCapacity));
+        return RxJavaPlugins.onAssembly(new ObservableCache<>(this, initialCapacity));
     }
 
     /**
@@ -6304,7 +6289,7 @@ public final <R> Observable<R> concatMap(Function<? super T, ? extends Observabl
             }
             return ObservableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new ObservableConcatMap<T, R>(this, mapper, prefetch, ErrorMode.IMMEDIATE));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMap<>(this, mapper, prefetch, ErrorMode.IMMEDIATE));
     }
 
     /**
@@ -6339,7 +6324,7 @@ public final <R> Observable<R> concatMap(Function<? super T, ? extends Observabl
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<T, R>(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<>(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler));
     }
 
     /**
@@ -6409,7 +6394,7 @@ public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends
             }
             return ObservableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new ObservableConcatMap<T, R>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMap<>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
     }
 
     /**
@@ -6444,7 +6429,7 @@ public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<T, R>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler));
     }
 
     /**
@@ -6500,7 +6485,7 @@ public final <R> Observable<R> concatMapEager(Function<? super T, ? extends Obse
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<T, R>(this, mapper, ErrorMode.IMMEDIATE, maxConcurrency, prefetch));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<>(this, mapper, ErrorMode.IMMEDIATE, maxConcurrency, prefetch));
     }
 
     /**
@@ -6565,7 +6550,7 @@ public final <R> Observable<R> concatMapEagerDelayError(Function<? super T, ? ex
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, maxConcurrency, prefetch));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, maxConcurrency, prefetch));
     }
 
     /**
@@ -6613,7 +6598,7 @@ public final Completable concatMapCompletable(Function<? super T, ? extends Comp
     public final Completable concatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, int capacityHint) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<T>(this, mapper, ErrorMode.IMMEDIATE, capacityHint));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<>(this, mapper, ErrorMode.IMMEDIATE, capacityHint));
     }
 
     /**
@@ -6703,7 +6688,7 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
     public final Completable concatMapCompletableDelayError(Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<T>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
 
     /**
@@ -6730,7 +6715,7 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<U> concatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<T, U>(this, mapper));
+        return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
     }
 
     /**
@@ -6818,7 +6803,7 @@ public final <R> Observable<R> concatMapMaybe(Function<? super T, ? extends Mayb
     public final <R> Observable<R> concatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<T, R>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
 
     /**
@@ -6913,7 +6898,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? ex
     public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
 
     /**
@@ -6971,7 +6956,7 @@ public final <R> Observable<R> concatMapSingle(Function<? super T, ? extends Sin
     public final <R> Observable<R> concatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<T, R>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
     }
 
     /**
@@ -7066,7 +7051,7 @@ public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? e
     public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<T, R>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
     }
 
     /**
@@ -7110,7 +7095,7 @@ public final Observable<T> concatWith(ObservableSource<? extends T> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> concatWith(@NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableConcatWithSingle<T>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableConcatWithSingle<>(this, other));
     }
 
     /**
@@ -7131,7 +7116,7 @@ public final Observable<T> concatWith(@NonNull SingleSource<? extends T> other)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableConcatWithMaybe<T>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableConcatWithMaybe<>(this, other));
     }
 
     /**
@@ -7152,7 +7137,7 @@ public final Observable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> concatWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableConcatWithCompletable<T>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableConcatWithCompletable<>(this, other));
     }
 
     /**
@@ -7195,7 +7180,7 @@ public final Single<Boolean> contains(final Object element) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<Long> count() {
-        return RxJavaPlugins.onAssembly(new ObservableCountSingle<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableCountSingle<>(this));
     }
 
     /**
@@ -7228,7 +7213,7 @@ public final Single<Long> count() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> debounce(Function<? super T, ? extends ObservableSource<U>> debounceSelector) {
         Objects.requireNonNull(debounceSelector, "debounceSelector is null");
-        return RxJavaPlugins.onAssembly(new ObservableDebounce<T, U>(this, debounceSelector));
+        return RxJavaPlugins.onAssembly(new ObservableDebounce<>(this, debounceSelector));
     }
 
     /**
@@ -7308,7 +7293,7 @@ public final Observable<T> debounce(long timeout, TimeUnit unit) {
     public final Observable<T> debounce(long timeout, TimeUnit unit, Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableDebounceTimed<T>(this, timeout, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableDebounceTimed<>(this, timeout, unit, scheduler));
     }
 
     /**
@@ -7466,7 +7451,7 @@ public final Observable<T> delay(long delay, TimeUnit unit, Scheduler scheduler,
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
 
-        return RxJavaPlugins.onAssembly(new ObservableDelay<T>(this, delay, unit, scheduler, delayError));
+        return RxJavaPlugins.onAssembly(new ObservableDelay<>(this, delay, unit, scheduler, delayError));
     }
 
     /**
@@ -7525,7 +7510,7 @@ public final <U, V> Observable<T> delay(ObservableSource<U> subscriptionDelay,
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> delaySubscription(ObservableSource<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableDelaySubscriptionOther<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableDelaySubscriptionOther<>(this, other));
     }
 
     /**
@@ -7627,7 +7612,7 @@ public final Observable<T> delaySubscription(long delay, TimeUnit unit, Schedule
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> dematerialize(Function<? super T, Notification<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
-        return RxJavaPlugins.onAssembly(new ObservableDematerialize<T, R>(this, selector));
+        return RxJavaPlugins.onAssembly(new ObservableDematerialize<>(this, selector));
     }
 
     /**
@@ -7737,7 +7722,7 @@ public final <K> Observable<T> distinct(Function<? super T, K> keySelector) {
     public final <K> Observable<T> distinct(Function<? super T, K> keySelector, Supplier<? extends Collection<? super K>> collectionSupplier) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableDistinct<T, K>(this, keySelector, collectionSupplier));
+        return RxJavaPlugins.onAssembly(new ObservableDistinct<>(this, keySelector, collectionSupplier));
     }
 
     /**
@@ -7817,7 +7802,7 @@ public final Observable<T> distinctUntilChanged() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K> Observable<T> distinctUntilChanged(Function<? super T, K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
-        return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<T, K>(this, keySelector, ObjectHelper.equalsPredicate()));
+        return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<>(this, keySelector, ObjectHelper.equalsPredicate()));
     }
 
     /**
@@ -7851,7 +7836,7 @@ public final <K> Observable<T> distinctUntilChanged(Function<? super T, K> keySe
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> distinctUntilChanged(BiPredicate<? super T, ? super T> comparer) {
         Objects.requireNonNull(comparer, "comparer is null");
-        return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<T, T>(this, Functions.<T>identity(), comparer));
+        return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<>(this, Functions.<T>identity(), comparer));
     }
 
     /**
@@ -7875,7 +7860,7 @@ public final Observable<T> distinctUntilChanged(BiPredicate<? super T, ? super T
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> doAfterNext(Consumer<? super T> onAfterNext) {
         Objects.requireNonNull(onAfterNext, "onAfterNext is null");
-        return RxJavaPlugins.onAssembly(new ObservableDoAfterNext<T>(this, onAfterNext));
+        return RxJavaPlugins.onAssembly(new ObservableDoAfterNext<>(this, onAfterNext));
     }
 
     /**
@@ -7926,7 +7911,7 @@ public final Observable<T> doAfterTerminate(Action onFinally) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> doFinally(Action onFinally) {
         Objects.requireNonNull(onFinally, "onFinally is null");
-        return RxJavaPlugins.onAssembly(new ObservableDoFinally<T>(this, onFinally));
+        return RxJavaPlugins.onAssembly(new ObservableDoFinally<>(this, onFinally));
     }
 
     /**
@@ -7996,7 +7981,7 @@ private Observable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Thro
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
         Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
-        return RxJavaPlugins.onAssembly(new ObservableDoOnEach<T>(this, onNext, onError, onComplete, onAfterTerminate));
+        return RxJavaPlugins.onAssembly(new ObservableDoOnEach<>(this, onNext, onError, onComplete, onAfterTerminate));
     }
 
     /**
@@ -8101,7 +8086,7 @@ public final Observable<T> doOnError(Consumer<? super Throwable> onError) {
     public final Observable<T> doOnLifecycle(final Consumer<? super Disposable> onSubscribe, final Action onDispose) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         Objects.requireNonNull(onDispose, "onDispose is null");
-        return RxJavaPlugins.onAssembly(new ObservableDoOnLifecycle<T>(this, onSubscribe, onDispose));
+        return RxJavaPlugins.onAssembly(new ObservableDoOnLifecycle<>(this, onSubscribe, onDispose));
     }
 
     /**
@@ -8199,7 +8184,7 @@ public final Maybe<T> elementAt(long index) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
         }
-        return RxJavaPlugins.onAssembly(new ObservableElementAtMaybe<T>(this, index));
+        return RxJavaPlugins.onAssembly(new ObservableElementAtMaybe<>(this, index));
     }
 
     /**
@@ -8229,7 +8214,7 @@ public final Single<T> elementAt(long index, T defaultItem) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
         }
         Objects.requireNonNull(defaultItem, "defaultItem is null");
-        return RxJavaPlugins.onAssembly(new ObservableElementAtSingle<T>(this, index, defaultItem));
+        return RxJavaPlugins.onAssembly(new ObservableElementAtSingle<>(this, index, defaultItem));
     }
 
     /**
@@ -8256,7 +8241,7 @@ public final Single<T> elementAtOrError(long index) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
         }
-        return RxJavaPlugins.onAssembly(new ObservableElementAtSingle<T>(this, index, null));
+        return RxJavaPlugins.onAssembly(new ObservableElementAtSingle<>(this, index, null));
     }
 
     /**
@@ -8279,7 +8264,7 @@ public final Single<T> elementAtOrError(long index) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> filter(Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new ObservableFilter<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new ObservableFilter<>(this, predicate));
     }
 
     /**
@@ -8473,7 +8458,7 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
             }
             return ObservableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new ObservableFlatMap<T, R>(this, mapper, delayErrors, maxConcurrency, bufferSize));
+        return RxJavaPlugins.onAssembly(new ObservableFlatMap<>(this, mapper, delayErrors, maxConcurrency, bufferSize));
     }
 
     /**
@@ -8509,7 +8494,7 @@ public final <R> Observable<R> flatMap(
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
         Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
-        return merge(new ObservableMapNotification<T, R>(this, onNextMapper, onErrorMapper, onCompleteSupplier));
+        return merge(new ObservableMapNotification<>(this, onNextMapper, onErrorMapper, onCompleteSupplier));
     }
 
     /**
@@ -8550,7 +8535,7 @@ public final <R> Observable<R> flatMap(
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
         Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
-        return merge(new ObservableMapNotification<T, R>(this, onNextMapper, onErrorMapper, onCompleteSupplier), maxConcurrency);
+        return merge(new ObservableMapNotification<>(this, onNextMapper, onErrorMapper, onCompleteSupplier), maxConcurrency);
     }
 
     /**
@@ -8794,7 +8779,7 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable flatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, boolean delayErrors) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableFlatMapCompletableCompletable<T>(this, mapper, delayErrors));
+        return RxJavaPlugins.onAssembly(new ObservableFlatMapCompletableCompletable<>(this, mapper, delayErrors));
     }
 
     /**
@@ -8820,7 +8805,7 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<U> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<T, U>(this, mapper));
+        return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
     }
 
     /**
@@ -8895,7 +8880,7 @@ public final <R> Observable<R> flatMapMaybe(Function<? super T, ? extends MaybeS
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> flatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableFlatMapMaybe<T, R>(this, mapper, delayErrors));
+        return RxJavaPlugins.onAssembly(new ObservableFlatMapMaybe<>(this, mapper, delayErrors));
     }
 
     /**
@@ -8937,7 +8922,7 @@ public final <R> Observable<R> flatMapSingle(Function<? super T, ? extends Singl
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> flatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableFlatMapSingle<T, R>(this, mapper, delayErrors));
+        return RxJavaPlugins.onAssembly(new ObservableFlatMapSingle<>(this, mapper, delayErrors));
     }
 
     /**
@@ -9048,7 +9033,7 @@ public final Disposable forEachWhile(final Predicate<? super T> onNext, Consumer
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
 
-        ForEachWhileObserver<T> o = new ForEachWhileObserver<T>(onNext, onError, onComplete);
+        ForEachWhileObserver<T> o = new ForEachWhileObserver<>(onNext, onError, onComplete);
         subscribe(o);
         return o;
     }
@@ -9346,7 +9331,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> groupJoin(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> hide() {
-        return RxJavaPlugins.onAssembly(new ObservableHide<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableHide<>(this));
     }
 
     /**
@@ -9364,7 +9349,7 @@ public final Observable<T> hide() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable ignoreElements() {
-        return RxJavaPlugins.onAssembly(new ObservableIgnoreElementsCompletable<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableIgnoreElementsCompletable<>(this));
     }
 
     /**
@@ -9452,7 +9437,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> join(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> lastElement() {
-        return RxJavaPlugins.onAssembly(new ObservableLastMaybe<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableLastMaybe<>(this));
     }
 
     /**
@@ -9475,7 +9460,7 @@ public final Maybe<T> lastElement() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> last(T defaultItem) {
         Objects.requireNonNull(defaultItem, "defaultItem is null");
-        return RxJavaPlugins.onAssembly(new ObservableLastSingle<T>(this, defaultItem));
+        return RxJavaPlugins.onAssembly(new ObservableLastSingle<>(this, defaultItem));
     }
 
     /**
@@ -9495,7 +9480,7 @@ public final Single<T> last(T defaultItem) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> lastOrError() {
-        return RxJavaPlugins.onAssembly(new ObservableLastSingle<T>(this, null));
+        return RxJavaPlugins.onAssembly(new ObservableLastSingle<>(this, null));
     }
 
     /**
@@ -9689,7 +9674,7 @@ public final <R> Observable<R> map(Function<? super T, ? extends R> mapper) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<Notification<T>> materialize() {
-        return RxJavaPlugins.onAssembly(new ObservableMaterialize<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableMaterialize<>(this));
     }
 
     /**
@@ -9736,7 +9721,7 @@ public final Observable<T> mergeWith(ObservableSource<? extends T> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableMergeWithSingle<T>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableMergeWithSingle<>(this, other));
     }
 
     /**
@@ -9760,7 +9745,7 @@ public final Observable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableMergeWithMaybe<T>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableMergeWithMaybe<>(this, other));
     }
 
     /**
@@ -9781,7 +9766,7 @@ public final Observable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> mergeWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableMergeWithCompletable<T>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableMergeWithCompletable<>(this, other));
     }
 
     /**
@@ -9897,7 +9882,7 @@ public final Observable<T> observeOn(Scheduler scheduler, boolean delayError) {
     public final Observable<T> observeOn(Scheduler scheduler, boolean delayError, int bufferSize) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new ObservableObserveOn<T>(this, scheduler, delayError, bufferSize));
+        return RxJavaPlugins.onAssembly(new ObservableObserveOn<>(this, scheduler, delayError, bufferSize));
     }
 
     /**
@@ -9955,7 +9940,7 @@ public final <U> Observable<U> ofType(final Class<U> clazz) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> onErrorResumeNext(Function<? super Throwable, ? extends ObservableSource<? extends T>> resumeFunction) {
         Objects.requireNonNull(resumeFunction, "resumeFunction is null");
-        return RxJavaPlugins.onAssembly(new ObservableOnErrorNext<T>(this, resumeFunction));
+        return RxJavaPlugins.onAssembly(new ObservableOnErrorNext<>(this, resumeFunction));
     }
 
     /**
@@ -10024,7 +10009,7 @@ public final Observable<T> onErrorResumeWith(final ObservableSource<? extends T>
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> onErrorReturn(Function<? super Throwable, ? extends T> valueSupplier) {
         Objects.requireNonNull(valueSupplier, "valueSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableOnErrorReturn<T>(this, valueSupplier));
+        return RxJavaPlugins.onAssembly(new ObservableOnErrorReturn<>(this, valueSupplier));
     }
 
     /**
@@ -10076,7 +10061,7 @@ public final Observable<T> onErrorReturnItem(final T item) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> onTerminateDetach() {
-        return RxJavaPlugins.onAssembly(new ObservableDetach<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableDetach<>(this));
     }
 
     /**
@@ -10097,7 +10082,7 @@ public final Observable<T> onTerminateDetach() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final ConnectableObservable<T> publish() {
-        return RxJavaPlugins.onAssembly(new ObservablePublish<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservablePublish<>(this));
     }
 
     /**
@@ -10123,7 +10108,7 @@ public final ConnectableObservable<T> publish() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> publish(Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
-        return RxJavaPlugins.onAssembly(new ObservablePublishSelector<T, R>(this, selector));
+        return RxJavaPlugins.onAssembly(new ObservablePublishSelector<>(this, selector));
     }
 
     /**
@@ -10158,7 +10143,7 @@ public final <R> Observable<R> publish(Function<? super Observable<T>, ? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
         Objects.requireNonNull(reducer, "reducer is null");
-        return RxJavaPlugins.onAssembly(new ObservableReduceMaybe<T>(this, reducer));
+        return RxJavaPlugins.onAssembly(new ObservableReduceMaybe<>(this, reducer));
     }
 
     /**
@@ -10216,7 +10201,7 @@ public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
     public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
         Objects.requireNonNull(seed, "seed is null");
         Objects.requireNonNull(reducer, "reducer is null");
-        return RxJavaPlugins.onAssembly(new ObservableReduceSeedSingle<T, R>(this, seed, reducer));
+        return RxJavaPlugins.onAssembly(new ObservableReduceSeedSingle<>(this, seed, reducer));
     }
 
     /**
@@ -10256,7 +10241,7 @@ public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
     public final <R> Single<R> reduceWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> reducer) {
         Objects.requireNonNull(seedSupplier, "seedSupplier is null");
         Objects.requireNonNull(reducer, "reducer is null");
-        return RxJavaPlugins.onAssembly(new ObservableReduceWithSingle<T, R>(this, seedSupplier, reducer));
+        return RxJavaPlugins.onAssembly(new ObservableReduceWithSingle<>(this, seedSupplier, reducer));
     }
 
     /**
@@ -10305,7 +10290,7 @@ public final Observable<T> repeat(long times) {
         if (times == 0) {
             return empty();
         }
-        return RxJavaPlugins.onAssembly(new ObservableRepeat<T>(this, times));
+        return RxJavaPlugins.onAssembly(new ObservableRepeat<>(this, times));
     }
 
     /**
@@ -10331,7 +10316,7 @@ public final Observable<T> repeat(long times) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> repeatUntil(BooleanSupplier stop) {
         Objects.requireNonNull(stop, "stop is null");
-        return RxJavaPlugins.onAssembly(new ObservableRepeatUntil<T>(this, stop));
+        return RxJavaPlugins.onAssembly(new ObservableRepeatUntil<>(this, stop));
     }
 
     /**
@@ -10357,7 +10342,7 @@ public final Observable<T> repeatUntil(BooleanSupplier stop) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> repeatWhen(final Function<? super Observable<Object>, ? extends ObservableSource<?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
-        return RxJavaPlugins.onAssembly(new ObservableRepeatWhen<T>(this, handler));
+        return RxJavaPlugins.onAssembly(new ObservableRepeatWhen<>(this, handler));
     }
 
     /**
@@ -11048,7 +11033,7 @@ public final Observable<T> retry() {
     public final Observable<T> retry(BiPredicate<? super Integer, ? super Throwable> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
 
-        return RxJavaPlugins.onAssembly(new ObservableRetryBiPredicate<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new ObservableRetryBiPredicate<>(this, predicate));
     }
 
     /**
@@ -11101,7 +11086,7 @@ public final Observable<T> retry(long times, Predicate<? super Throwable> predic
         }
         Objects.requireNonNull(predicate, "predicate is null");
 
-        return RxJavaPlugins.onAssembly(new ObservableRetryPredicate<T>(this, times, predicate));
+        return RxJavaPlugins.onAssembly(new ObservableRetryPredicate<>(this, times, predicate));
     }
 
     /**
@@ -11218,7 +11203,7 @@ public final Observable<T> retryUntil(final BooleanSupplier stop) {
     public final Observable<T> retryWhen(
             final Function<? super Observable<Throwable>, ? extends ObservableSource<?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
-        return RxJavaPlugins.onAssembly(new ObservableRetryWhen<T>(this, handler));
+        return RxJavaPlugins.onAssembly(new ObservableRetryWhen<>(this, handler));
     }
 
     /**
@@ -11325,7 +11310,7 @@ public final Observable<T> sample(long period, TimeUnit unit, boolean emitLast)
     public final Observable<T> sample(long period, TimeUnit unit, Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<T>(this, period, unit, scheduler, false));
+        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, false));
     }
 
     /**
@@ -11361,7 +11346,7 @@ public final Observable<T> sample(long period, TimeUnit unit, Scheduler schedule
     public final Observable<T> sample(long period, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<T>(this, period, unit, scheduler, emitLast));
+        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, emitLast));
     }
 
     /**
@@ -11386,7 +11371,7 @@ public final Observable<T> sample(long period, TimeUnit unit, Scheduler schedule
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> sample(ObservableSource<U> sampler) {
         Objects.requireNonNull(sampler, "sampler is null");
-        return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<T>(this, sampler, false));
+        return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<>(this, sampler, false));
     }
 
     /**
@@ -11418,7 +11403,7 @@ public final <U> Observable<T> sample(ObservableSource<U> sampler) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> sample(ObservableSource<U> sampler, boolean emitLast) {
         Objects.requireNonNull(sampler, "sampler is null");
-        return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<T>(this, sampler, emitLast));
+        return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<>(this, sampler, emitLast));
     }
 
     /**
@@ -11446,7 +11431,7 @@ public final <U> Observable<T> sample(ObservableSource<U> sampler, boolean emitL
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> scan(BiFunction<T, T, T> accumulator) {
         Objects.requireNonNull(accumulator, "accumulator is null");
-        return RxJavaPlugins.onAssembly(new ObservableScan<T>(this, accumulator));
+        return RxJavaPlugins.onAssembly(new ObservableScan<>(this, accumulator));
     }
 
     /**
@@ -11531,7 +11516,7 @@ public final <R> Observable<R> scan(final R initialValue, BiFunction<R, ? super
     public final <R> Observable<R> scanWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> accumulator) {
         Objects.requireNonNull(seedSupplier, "seedSupplier is null");
         Objects.requireNonNull(accumulator, "accumulator is null");
-        return RxJavaPlugins.onAssembly(new ObservableScanSeed<T, R>(this, seedSupplier, accumulator));
+        return RxJavaPlugins.onAssembly(new ObservableScanSeed<>(this, seedSupplier, accumulator));
     }
 
     /**
@@ -11557,7 +11542,7 @@ public final <R> Observable<R> scanWith(Supplier<R> seedSupplier, BiFunction<R,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> serialize() {
-        return RxJavaPlugins.onAssembly(new ObservableSerialized<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableSerialized<>(this));
     }
 
     /**
@@ -11599,7 +11584,7 @@ public final Observable<T> share() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> singleElement() {
-        return RxJavaPlugins.onAssembly(new ObservableSingleMaybe<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableSingleMaybe<>(this));
     }
 
     /**
@@ -11622,7 +11607,7 @@ public final Maybe<T> singleElement() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> single(T defaultItem) {
         Objects.requireNonNull(defaultItem, "defaultItem is null");
-        return RxJavaPlugins.onAssembly(new ObservableSingleSingle<T>(this, defaultItem));
+        return RxJavaPlugins.onAssembly(new ObservableSingleSingle<>(this, defaultItem));
     }
 
     /**
@@ -11643,7 +11628,7 @@ public final Single<T> single(T defaultItem) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> singleOrError() {
-        return RxJavaPlugins.onAssembly(new ObservableSingleSingle<T>(this, null));
+        return RxJavaPlugins.onAssembly(new ObservableSingleSingle<>(this, null));
     }
 
     /**
@@ -11668,7 +11653,7 @@ public final Observable<T> skip(long count) {
         if (count <= 0) {
             return RxJavaPlugins.onAssembly(this);
         }
-        return RxJavaPlugins.onAssembly(new ObservableSkip<T>(this, count));
+        return RxJavaPlugins.onAssembly(new ObservableSkip<>(this, count));
     }
 
     /**
@@ -11753,7 +11738,7 @@ public final Observable<T> skipLast(int count) {
         if (count == 0) {
             return RxJavaPlugins.onAssembly(this);
         }
-        return RxJavaPlugins.onAssembly(new ObservableSkipLast<T>(this, count));
+        return RxJavaPlugins.onAssembly(new ObservableSkipLast<>(this, count));
     }
 
     /**
@@ -11907,7 +11892,7 @@ public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler schedule
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         // the internal buffer holds pairs of (timestamp, value) so double the default buffer size
         int s = bufferSize << 1;
-        return RxJavaPlugins.onAssembly(new ObservableSkipLastTimed<T>(this, time, unit, scheduler, s, delayError));
+        return RxJavaPlugins.onAssembly(new ObservableSkipLastTimed<>(this, time, unit, scheduler, s, delayError));
     }
 
     /**
@@ -11932,7 +11917,7 @@ public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler schedule
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> skipUntil(ObservableSource<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableSkipUntil<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableSkipUntil<>(this, other));
     }
 
     /**
@@ -11955,7 +11940,7 @@ public final <U> Observable<T> skipUntil(ObservableSource<U> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> skipWhile(Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new ObservableSkipWhile<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new ObservableSkipWhile<>(this, predicate));
     }
 
     /**
@@ -12217,7 +12202,7 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
 
-        LambdaObserver<T> ls = new LambdaObserver<T>(onNext, onError, onComplete, Functions.emptyConsumer());
+        LambdaObserver<T> ls = new LambdaObserver<>(onNext, onError, onComplete, Functions.emptyConsumer());
 
         subscribe(ls);
 
@@ -12310,7 +12295,7 @@ public final <E extends Observer<? super T>> E subscribeWith(E observer) {
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> subscribeOn(Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableSubscribeOn<T>(this, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableSubscribeOn<>(this, scheduler));
     }
 
     /**
@@ -12333,7 +12318,7 @@ public final Observable<T> subscribeOn(Scheduler scheduler) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> switchIfEmpty(ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableSwitchIfEmpty<T>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableSwitchIfEmpty<>(this, other));
     }
 
     /**
@@ -12401,7 +12386,7 @@ public final <R> Observable<R> switchMap(Function<? super T, ? extends Observabl
             }
             return ObservableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new ObservableSwitchMap<T, R>(this, mapper, bufferSize, false));
+        return RxJavaPlugins.onAssembly(new ObservableSwitchMap<>(this, mapper, bufferSize, false));
     }
 
     /**
@@ -12442,7 +12427,7 @@ public final <R> Observable<R> switchMap(Function<? super T, ? extends Observabl
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable switchMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable<T>(this, mapper, false));
+        return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable<>(this, mapper, false));
     }
 
     /**
@@ -12484,7 +12469,7 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Completable switchMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable<T>(this, mapper, true));
+        return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable<>(this, mapper, true));
     }
 
     /**
@@ -12520,7 +12505,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<T, R>(this, mapper, false));
+        return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<>(this, mapper, false));
     }
 
     /**
@@ -12546,7 +12531,7 @@ public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<T, R>(this, mapper, true));
+        return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<>(this, mapper, true));
     }
 
     /**
@@ -12577,7 +12562,7 @@ public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? supe
     @NonNull
     public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle<T, R>(this, mapper, false));
+        return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle<>(this, mapper, false));
     }
 
     /**
@@ -12609,7 +12594,7 @@ public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? ex
     @NonNull
     public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle<T, R>(this, mapper, true));
+        return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle<>(this, mapper, true));
     }
 
     /**
@@ -12681,7 +12666,7 @@ public final <R> Observable<R> switchMapDelayError(Function<? super T, ? extends
             }
             return ObservableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new ObservableSwitchMap<T, R>(this, mapper, bufferSize, true));
+        return RxJavaPlugins.onAssembly(new ObservableSwitchMap<>(this, mapper, bufferSize, true));
     }
 
     /**
@@ -12710,7 +12695,7 @@ public final Observable<T> take(long count) {
         if (count < 0) {
             throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
-        return RxJavaPlugins.onAssembly(new ObservableTake<T>(this, count));
+        return RxJavaPlugins.onAssembly(new ObservableTake<>(this, count));
     }
 
     /**
@@ -12793,12 +12778,12 @@ public final Observable<T> takeLast(int count) {
             throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
         }
         if (count == 0) {
-            return RxJavaPlugins.onAssembly(new ObservableIgnoreElements<T>(this));
+            return RxJavaPlugins.onAssembly(new ObservableIgnoreElements<>(this));
         }
         if (count == 1) {
-            return RxJavaPlugins.onAssembly(new ObservableTakeLastOne<T>(this));
+            return RxJavaPlugins.onAssembly(new ObservableTakeLastOne<>(this));
         }
-        return RxJavaPlugins.onAssembly(new ObservableTakeLast<T>(this, count));
+        return RxJavaPlugins.onAssembly(new ObservableTakeLast<>(this, count));
     }
 
     /**
@@ -12900,7 +12885,7 @@ public final Observable<T> takeLast(long count, long time, TimeUnit unit, Schedu
         if (count < 0) {
             throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
         }
-        return RxJavaPlugins.onAssembly(new ObservableTakeLastTimed<T>(this, count, time, unit, scheduler, bufferSize, delayError));
+        return RxJavaPlugins.onAssembly(new ObservableTakeLastTimed<>(this, count, time, unit, scheduler, bufferSize, delayError));
     }
 
     /**
@@ -13068,7 +13053,7 @@ public final Observable<T> takeLast(long time, TimeUnit unit, Scheduler schedule
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> Observable<T> takeUntil(ObservableSource<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableTakeUntil<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new ObservableTakeUntil<>(this, other));
     }
 
     /**
@@ -13097,7 +13082,7 @@ public final <U> Observable<T> takeUntil(ObservableSource<U> other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> takeUntil(Predicate<? super T> stopPredicate) {
         Objects.requireNonNull(stopPredicate, "stopPredicate is null");
-        return RxJavaPlugins.onAssembly(new ObservableTakeUntilPredicate<T>(this, stopPredicate));
+        return RxJavaPlugins.onAssembly(new ObservableTakeUntilPredicate<>(this, stopPredicate));
     }
 
     /**
@@ -13121,7 +13106,7 @@ public final Observable<T> takeUntil(Predicate<? super T> stopPredicate) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Observable<T> takeWhile(Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new ObservableTakeWhile<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new ObservableTakeWhile<>(this, predicate));
     }
 
     /**
@@ -13178,7 +13163,7 @@ public final Observable<T> throttleFirst(long windowDuration, TimeUnit unit) {
     public final Observable<T> throttleFirst(long skipDuration, TimeUnit unit, Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableThrottleFirstTimed<T>(this, skipDuration, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableThrottleFirstTimed<>(this, skipDuration, unit, scheduler));
     }
 
     /**
@@ -13365,7 +13350,7 @@ public final Observable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler
     public final Observable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableThrottleLatest<T>(this, timeout, unit, scheduler, emitLast));
+        return RxJavaPlugins.onAssembly(new ObservableThrottleLatest<>(this, timeout, unit, scheduler, emitLast));
     }
 
     /**
@@ -13518,7 +13503,7 @@ public final Observable<Timed<T>> timeInterval(TimeUnit unit) {
     public final Observable<Timed<T>> timeInterval(TimeUnit unit, Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableTimeInterval<T>(this, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableTimeInterval<>(this, unit, scheduler));
     }
 
     /**
@@ -13779,7 +13764,7 @@ private Observable<T> timeout0(long timeout, TimeUnit timeUnit, ObservableSource
             Scheduler scheduler) {
         Objects.requireNonNull(timeUnit, "timeUnit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableTimeoutTimed<T>(this, timeout, timeUnit, scheduler, other));
+        return RxJavaPlugins.onAssembly(new ObservableTimeoutTimed<>(this, timeout, timeUnit, scheduler, other));
     }
 
     private <U, V> Observable<T> timeout0(
@@ -13787,7 +13772,7 @@ private <U, V> Observable<T> timeout0(
             Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
                     ObservableSource<? extends T> other) {
         Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
-        return RxJavaPlugins.onAssembly(new ObservableTimeout<T, U, V>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
+        return RxJavaPlugins.onAssembly(new ObservableTimeout<>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
     }
 
     /**
@@ -13995,7 +13980,7 @@ public final Single<List<T>> toList(final int capacityHint) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U extends Collection<? super T>> Single<U> toList(Supplier<U> collectionSupplier) {
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableToListSingle<T, U>(this, collectionSupplier));
+        return RxJavaPlugins.onAssembly(new ObservableToListSingle<>(this, collectionSupplier));
     }
 
     /**
@@ -14284,7 +14269,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> toFlowable(BackpressureStrategy strategy) {
-        Flowable<T> f = new FlowableFromObservable<T>(this);
+        Flowable<T> f = new FlowableFromObservable<>(this);
 
         switch (strategy) {
             case DROP:
@@ -14294,7 +14279,7 @@ public final Flowable<T> toFlowable(BackpressureStrategy strategy) {
             case MISSING:
                 return f;
             case ERROR:
-                return RxJavaPlugins.onAssembly(new FlowableOnBackpressureError<T>(f));
+                return RxJavaPlugins.onAssembly(new FlowableOnBackpressureError<>(f));
             default:
                 return f.onBackpressureBuffer();
         }
@@ -14439,7 +14424,7 @@ public final Single<List<T>> toSortedList(int capacityHint) {
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final Observable<T> unsubscribeOn(Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableUnsubscribeOn<T>(this, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableUnsubscribeOn<>(this, scheduler));
     }
 
     /**
@@ -14525,7 +14510,7 @@ public final Observable<Observable<T>> window(long count, long skip, int bufferS
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(skip, "skip");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new ObservableWindow<T>(this, count, skip, bufferSize));
+        return RxJavaPlugins.onAssembly(new ObservableWindow<>(this, count, skip, bufferSize));
     }
 
     /**
@@ -14635,7 +14620,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, Time
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(unit, "unit is null");
-        return RxJavaPlugins.onAssembly(new ObservableWindowTimed<T>(this, timespan, timeskip, unit, scheduler, Long.MAX_VALUE, bufferSize, false));
+        return RxJavaPlugins.onAssembly(new ObservableWindowTimed<>(this, timespan, timeskip, unit, scheduler, Long.MAX_VALUE, bufferSize, false));
     }
 
     /**
@@ -14906,7 +14891,7 @@ public final Observable<Observable<T>> window(
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(count, "count");
-        return RxJavaPlugins.onAssembly(new ObservableWindowTimed<T>(this, timespan, timespan, unit, scheduler, count, bufferSize, restart));
+        return RxJavaPlugins.onAssembly(new ObservableWindowTimed<>(this, timespan, timespan, unit, scheduler, count, bufferSize, restart));
     }
 
     /**
@@ -14972,7 +14957,7 @@ public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary)
     public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary, int bufferSize) {
         Objects.requireNonNull(boundary, "boundary is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new ObservableWindowBoundary<T, B>(this, boundary, bufferSize));
+        return RxJavaPlugins.onAssembly(new ObservableWindowBoundary<>(this, boundary, bufferSize));
     }
 
     /**
@@ -15049,7 +15034,7 @@ public final <U, V> Observable<Observable<T>> window(
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
         Objects.requireNonNull(closingIndicator, "closingIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new ObservableWindowBoundarySelector<T, U, V>(this, openingIndicator, closingIndicator, bufferSize));
+        return RxJavaPlugins.onAssembly(new ObservableWindowBoundarySelector<>(this, openingIndicator, closingIndicator, bufferSize));
     }
 
     /**
@@ -15230,7 +15215,7 @@ public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
     public final <R> Observable<R> withLatestFrom(ObservableSource<?>[] others, Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
-        return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<T, R>(this, others, combiner));
+        return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<>(this, others, combiner));
     }
 
     /**
@@ -15259,7 +15244,7 @@ public final <R> Observable<R> withLatestFrom(ObservableSource<?>[] others, Func
     public final <R> Observable<R> withLatestFrom(Iterable<? extends ObservableSource<?>> others, Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
-        return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<T, R>(this, others, combiner));
+        return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<>(this, others, combiner));
     }
 
     /**
@@ -15447,7 +15432,7 @@ public final <U, R> Observable<R> zipWith(ObservableSource<? extends U> other,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final TestObserver<T> test() { // NoPMD
-        TestObserver<T> to = new TestObserver<T>();
+        TestObserver<T> to = new TestObserver<>();
         subscribe(to);
         return to;
     }
@@ -15467,7 +15452,7 @@ public final TestObserver<T> test() { // NoPMD
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public final TestObserver<T> test(boolean dispose) { // NoPMD
-        TestObserver<T> to = new TestObserver<T>();
+        TestObserver<T> to = new TestObserver<>();
         if (dispose) {
             to.dispose();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index bb742d4a03..ce7ef85608 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -132,9 +132,9 @@ public abstract class Single<T> implements SingleSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> amb(final Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Single<T> amb(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new SingleAmb<T>(null, sources));
+        return RxJavaPlugins.onAssembly(new SingleAmb<>(null, sources));
     }
 
     /**
@@ -154,15 +154,18 @@ public static <T> Single<T> amb(final Iterable<? extends SingleSource<? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
-    public static <T> Single<T> ambArray(final SingleSource<? extends T>... sources) {
+    @SafeVarargs
+    @NonNull
+    public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sources) {
         if (sources.length == 0) {
             return error(SingleInternalHelper.<T>emptyThrower());
         }
         if (sources.length == 1) {
-            return wrap((SingleSource<T>)sources[0]);
+            @SuppressWarnings("unchecked")
+            SingleSource<T> source = (SingleSource<T>)sources[0];
+            return wrap(source);
         }
-        return RxJavaPlugins.onAssembly(new SingleAmb<T>(sources, null));
+        return RxJavaPlugins.onAssembly(new SingleAmb<>(sources, null));
     }
 
     /**
@@ -185,7 +188,7 @@ public static <T> Single<T> ambArray(final SingleSource<? extends T>... sources)
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T> Flowable<T> concat(Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
         return concat(Flowable.fromIterable(sources));
     }
 
@@ -207,7 +210,7 @@ public static <T> Flowable<T> concat(Iterable<? extends SingleSource<? extends T
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Observable<T> concat(ObservableSource<? extends SingleSource<? extends T>> sources) {
+    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, SingleInternalHelper.toObservable(), 2, ErrorMode.IMMEDIATE));
     }
@@ -233,7 +236,7 @@ public static <T> Observable<T> concat(ObservableSource<? extends SingleSource<?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(Publisher<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<? extends SingleSource<? extends T>> sources) {
         return concat(sources, 2);
     }
 
@@ -260,7 +263,7 @@ public static <T> Flowable<T> concat(Publisher<? extends SingleSource<? extends
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> concat(Publisher<? extends SingleSource<? extends T>> sources, int prefetch) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<? extends SingleSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, SingleInternalHelper.toFlowable(), prefetch, ErrorMode.IMMEDIATE));
@@ -289,9 +292,8 @@ public static <T> Flowable<T> concat(Publisher<? extends SingleSource<? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> concat(
-            SingleSource<? extends T> source1, SingleSource<? extends T> source2
+            @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -323,10 +325,9 @@ public static <T> Flowable<T> concat(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> concat(
-            SingleSource<? extends T> source1, SingleSource<? extends T> source2,
-            SingleSource<? extends T> source3
+            @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
+            @NonNull SingleSource<? extends T> source3
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -361,10 +362,9 @@ public static <T> Flowable<T> concat(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> concat(
-            SingleSource<? extends T> source1, SingleSource<? extends T> source2,
-            SingleSource<? extends T> source3, SingleSource<? extends T> source4
+            @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
+            @NonNull SingleSource<? extends T> source3, @NonNull SingleSource<? extends T> source4
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -394,7 +394,8 @@ public static <T> Flowable<T> concat(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> concatArray(SingleSource<? extends T>... sources) {
+    @SafeVarargs
+    public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>... sources) {
         return RxJavaPlugins.onAssembly(new FlowableConcatMap(Flowable.fromArray(sources), SingleInternalHelper.toFlowable(), 2, ErrorMode.BOUNDARY));
     }
 
@@ -420,7 +421,8 @@ public static <T> Flowable<T> concatArray(SingleSource<? extends T>... sources)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatArrayEager(SingleSource<? extends T>... sources) {
+    @SafeVarargs
+    public static <T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T>... sources) {
         return Flowable.fromArray(sources).concatMapEager(SingleInternalHelper.<T>toFlowable());
     }
 
@@ -448,7 +450,7 @@ public static <T> Flowable<T> concatArrayEager(SingleSource<? extends T>... sour
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(Publisher<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends SingleSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.<T>toFlowable());
     }
 
@@ -474,7 +476,7 @@ public static <T> Flowable<T> concatEager(Publisher<? extends SingleSource<? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapEager(SingleInternalHelper.<T>toFlowable());
     }
 
@@ -523,9 +525,9 @@ public static <T> Flowable<T> concatEager(Iterable<? extends SingleSource<? exte
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> create(SingleOnSubscribe<T> source) {
+    public static <@NonNull T> Single<T> create(@NonNull SingleOnSubscribe<T> source) {
         Objects.requireNonNull(source, "source is null");
-        return RxJavaPlugins.onAssembly(new SingleCreate<T>(source));
+        return RxJavaPlugins.onAssembly(new SingleCreate<>(source));
     }
 
     /**
@@ -545,9 +547,9 @@ public static <T> Single<T> create(SingleOnSubscribe<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> defer(final Supplier<? extends SingleSource<? extends T>> singleSupplier) {
+    public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? extends T>> singleSupplier) {
         Objects.requireNonNull(singleSupplier, "singleSupplier is null");
-        return RxJavaPlugins.onAssembly(new SingleDefer<T>(singleSupplier));
+        return RxJavaPlugins.onAssembly(new SingleDefer<>(singleSupplier));
     }
 
     /**
@@ -566,7 +568,7 @@ public static <T> Single<T> defer(final Supplier<? extends SingleSource<? extend
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> error(final Supplier<? extends Throwable> errorSupplier) {
+    public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> errorSupplier) {
         Objects.requireNonNull(errorSupplier, "errorSupplier is null");
         return RxJavaPlugins.onAssembly(new SingleError<T>(errorSupplier));
     }
@@ -592,7 +594,7 @@ public static <T> Single<T> error(final Supplier<? extends Throwable> errorSuppl
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> error(final Throwable exception) {
+    public static <T> Single<T> error(@NonNull Throwable exception) {
         Objects.requireNonNull(exception, "exception is null");
         return error(Functions.justSupplier(exception));
     }
@@ -628,7 +630,7 @@ public static <T> Single<T> error(final Throwable exception) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromCallable(final Callable<? extends T> callable) {
+    public static <@NonNull T> Single<T> fromCallable(@NonNull Callable<? extends T> callable) {
         Objects.requireNonNull(callable, "callable is null");
         return RxJavaPlugins.onAssembly(new SingleFromCallable<T>(callable));
     }
@@ -658,7 +660,8 @@ public static <T> Single<T> fromCallable(final Callable<? extends T> callable) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromFuture(Future<? extends T> future) {
+    @NonNull
+    public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future) {
         return toSingle(Flowable.<T>fromFuture(future));
     }
 
@@ -691,7 +694,8 @@ public static <T> Single<T> fromFuture(Future<? extends T> future) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit) {
+    @NonNull
+    public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
         return toSingle(Flowable.<T>fromFuture(future, timeout, unit));
     }
 
@@ -726,7 +730,8 @@ public static <T> Single<T> fromFuture(Future<? extends T> future, long timeout,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <T> Single<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return toSingle(Flowable.<T>fromFuture(future, timeout, unit, scheduler));
     }
 
@@ -756,7 +761,8 @@ public static <T> Single<T> fromFuture(Future<? extends T> future, long timeout,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <T> Single<T> fromFuture(Future<? extends T> future, Scheduler scheduler) {
+    @NonNull
+    public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future, @NonNull Scheduler scheduler) {
         return toSingle(Flowable.<T>fromFuture(future, scheduler));
     }
 
@@ -793,7 +799,7 @@ public static <T> Single<T> fromFuture(Future<? extends T> future, Scheduler sch
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromPublisher(final Publisher<? extends T> publisher) {
+    public static <T> Single<T> fromPublisher(@NonNull Publisher<? extends T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new SingleFromPublisher<T>(publisher));
     }
@@ -817,7 +823,7 @@ public static <T> Single<T> fromPublisher(final Publisher<? extends T> publisher
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromObservable(ObservableSource<? extends T> observableSource) {
+    public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T> observableSource) {
         Objects.requireNonNull(observableSource, "observableSource is null");
         return RxJavaPlugins.onAssembly(new ObservableSingleSingle<T>(observableSource, null));
     }
@@ -855,7 +861,7 @@ public static <T> Single<T> fromObservable(ObservableSource<? extends T> observa
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromSupplier(final Supplier<? extends T> supplier) {
+    public static <@NonNull T> Single<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new SingleFromSupplier<T>(supplier));
     }
@@ -882,9 +888,9 @@ public static <T> Single<T> fromSupplier(final Supplier<? extends T> supplier) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<T> just(final T item) {
+    public static <@NonNull T> Single<T> just(T item) {
         Objects.requireNonNull(item, "item is null");
-        return RxJavaPlugins.onAssembly(new SingleJust<T>(item));
+        return RxJavaPlugins.onAssembly(new SingleJust<>(item));
     }
 
     /**
@@ -960,7 +966,7 @@ public static <T> Flowable<T> merge(Iterable<? extends SingleSource<? extends T>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> merge(Publisher<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), false, Integer.MAX_VALUE, Flowable.bufferSize()));
     }
@@ -991,7 +997,7 @@ public static <T> Flowable<T> merge(Publisher<? extends SingleSource<? extends T
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Single<T> merge(SingleSource<? extends SingleSource<? extends T>> source) {
+    public static <T> Single<T> merge(@NonNull SingleSource<? extends SingleSource<? extends T>> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMap<SingleSource<? extends T>, T>(source, (Function)Functions.identity()));
     }
@@ -1036,9 +1042,8 @@ public static <T> Single<T> merge(SingleSource<? extends SingleSource<? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> merge(
-            SingleSource<? extends T> source1, SingleSource<? extends T> source2
+            @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1087,10 +1092,9 @@ public static <T> Flowable<T> merge(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> merge(
-            SingleSource<? extends T> source1, SingleSource<? extends T> source2,
-            SingleSource<? extends T> source3
+            @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
+            @NonNull SingleSource<? extends T> source3
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1142,10 +1146,9 @@ public static <T> Flowable<T> merge(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> merge(
-            SingleSource<? extends T> source1, SingleSource<? extends T> source2,
-            SingleSource<? extends T> source3, SingleSource<? extends T> source4
+            @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
+            @NonNull SingleSource<? extends T> source3, @NonNull SingleSource<? extends T> source4
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1176,7 +1179,7 @@ public static <T> Flowable<T> merge(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
         return mergeDelayError(Flowable.fromIterable(sources));
     }
 
@@ -1203,7 +1206,7 @@ public static <T> Flowable<T> mergeDelayError(Iterable<? extends SingleSource<?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> mergeDelayError(Publisher<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), true, Integer.MAX_VALUE, Flowable.bufferSize()));
     }
@@ -1237,9 +1240,8 @@ public static <T> Flowable<T> mergeDelayError(Publisher<? extends SingleSource<?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> mergeDelayError(
-            SingleSource<? extends T> source1, SingleSource<? extends T> source2
+            @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1277,10 +1279,9 @@ public static <T> Flowable<T> mergeDelayError(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> mergeDelayError(
-            SingleSource<? extends T> source1, SingleSource<? extends T> source2,
-            SingleSource<? extends T> source3
+            @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
+            @NonNull SingleSource<? extends T> source3
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1321,10 +1322,9 @@ public static <T> Flowable<T> mergeDelayError(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T> Flowable<T> mergeDelayError(
-            SingleSource<? extends T> source1, SingleSource<? extends T> source2,
-            SingleSource<? extends T> source3, SingleSource<? extends T> source4
+            @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
+            @NonNull SingleSource<? extends T> source3, @NonNull SingleSource<? extends T> source4
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1348,6 +1348,7 @@ public static <T> Flowable<T> mergeDelayError(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Single<T> never() {
         return RxJavaPlugins.onAssembly((Single<T>) SingleNever.INSTANCE);
     }
@@ -1367,7 +1368,8 @@ public static <T> Single<T> never() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Single<Long> timer(long delay, TimeUnit unit) {
+    @NonNull
+    public static Single<Long> timer(long delay, @NonNull TimeUnit unit) {
         return timer(delay, unit, Schedulers.computation());
     }
 
@@ -1391,7 +1393,7 @@ public static Single<Long> timer(long delay, TimeUnit unit) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Single<Long> timer(final long delay, final TimeUnit unit, final Scheduler scheduler) {
+    public static Single<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new SingleTimer(delay, unit, scheduler));
@@ -1414,10 +1416,10 @@ public static Single<Long> timer(final long delay, final TimeUnit unit, final Sc
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> equals(final SingleSource<? extends T> first, final SingleSource<? extends T> second) { // NOPMD
+    public static <T> Single<Boolean> equals(@NonNull SingleSource<? extends T> first, @NonNull SingleSource<? extends T> second) { // NOPMD
         Objects.requireNonNull(first, "first is null");
         Objects.requireNonNull(second, "second is null");
-        return RxJavaPlugins.onAssembly(new SingleEquals<T>(first, second));
+        return RxJavaPlugins.onAssembly(new SingleEquals<>(first, second));
     }
 
     /**
@@ -1440,12 +1442,12 @@ public static <T> Single<Boolean> equals(final SingleSource<? extends T> first,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> unsafeCreate(SingleSource<T> onSubscribe) {
+    public static <T> Single<T> unsafeCreate(@NonNull SingleSource<T> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         if (onSubscribe instanceof Single) {
             throw new IllegalArgumentException("unsafeCreate(Single) should be upgraded");
         }
-        return RxJavaPlugins.onAssembly(new SingleFromUnsafeSource<T>(onSubscribe));
+        return RxJavaPlugins.onAssembly(new SingleFromUnsafeSource<>(onSubscribe));
     }
 
     /**
@@ -1471,9 +1473,10 @@ public static <T> Single<T> unsafeCreate(SingleSource<T> onSubscribe) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, U> Single<T> using(Supplier<U> resourceSupplier,
-                                         Function<? super U, ? extends SingleSource<? extends T>> singleFunction,
-                                         Consumer<? super U> disposer) {
+    @NonNull
+    public static <T, U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
+            @NonNull Function<? super U, ? extends SingleSource<? extends T>> singleFunction,
+            @NonNull Consumer<? super U> disposer) {
         return using(resourceSupplier, singleFunction, disposer, true);
     }
 
@@ -1507,15 +1510,15 @@ public static <T, U> Single<T> using(Supplier<U> resourceSupplier,
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, U> Single<T> using(
-            final Supplier<U> resourceSupplier,
-            final Function<? super U, ? extends SingleSource<? extends T>> singleFunction,
-            final Consumer<? super U> disposer,
-            final boolean eager) {
+            @NonNull Supplier<U> resourceSupplier,
+            @NonNull Function<? super U, ? extends SingleSource<? extends T>> singleFunction,
+            @NonNull Consumer<? super U> disposer,
+            boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(singleFunction, "singleFunction is null");
         Objects.requireNonNull(disposer, "disposer is null");
 
-        return RxJavaPlugins.onAssembly(new SingleUsing<T, U>(resourceSupplier, singleFunction, disposer, eager));
+        return RxJavaPlugins.onAssembly(new SingleUsing<>(resourceSupplier, singleFunction, disposer, eager));
     }
 
     /**
@@ -1534,12 +1537,12 @@ public static <T, U> Single<T> using(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> wrap(SingleSource<T> source) {
+    public static <T> Single<T> wrap(@NonNull SingleSource<T> source) {
         Objects.requireNonNull(source, "source is null");
         if (source instanceof Single) {
             return RxJavaPlugins.onAssembly((Single<T>)source);
         }
-        return RxJavaPlugins.onAssembly(new SingleFromUnsafeSource<T>(source));
+        return RxJavaPlugins.onAssembly(new SingleFromUnsafeSource<>(source));
     }
 
     /**
@@ -1574,7 +1577,7 @@ public static <T> Single<T> wrap(SingleSource<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Single<R> zip(final Iterable<? extends SingleSource<? extends T>> sources, Function<? super Object[], ? extends R> zipper) {
+    public static <T, R> Single<R> zip(@NonNull Iterable<? extends SingleSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new SingleZipIterable<T, R>(sources, zipper));
@@ -1606,10 +1609,9 @@ public static <T, R> Single<R> zip(final Iterable<? extends SingleSource<? exten
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T1, T2, R> Single<R> zip(
-            SingleSource<? extends T1> source1, SingleSource<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> zipper
+            @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1645,11 +1647,10 @@ public static <T1, T2, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T1, T2, T3, R> Single<R> zip(
-            SingleSource<? extends T1> source1, SingleSource<? extends T2> source2,
-            SingleSource<? extends T3> source3,
-            Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper
+            @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
+            @NonNull SingleSource<? extends T3> source3,
+            @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1689,11 +1690,10 @@ public static <T1, T2, T3, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T1, T2, T3, T4, R> Single<R> zip(
-            SingleSource<? extends T1> source1, SingleSource<? extends T2> source2,
-            SingleSource<? extends T3> source3, SingleSource<? extends T4> source4,
-            Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper
+            @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
+            @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
+            @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1737,12 +1737,11 @@ public static <T1, T2, T3, T4, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T1, T2, T3, T4, T5, R> Single<R> zip(
-            SingleSource<? extends T1> source1, SingleSource<? extends T2> source2,
-            SingleSource<? extends T3> source3, SingleSource<? extends T4> source4,
-            SingleSource<? extends T5> source5,
-            Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper
+            @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
+            @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
+            @NonNull SingleSource<? extends T5> source5,
+            @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1790,12 +1789,11 @@ public static <T1, T2, T3, T4, T5, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(
-            SingleSource<? extends T1> source1, SingleSource<? extends T2> source2,
-            SingleSource<? extends T3> source3, SingleSource<? extends T4> source4,
-            SingleSource<? extends T5> source5, SingleSource<? extends T6> source6,
-            Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper
+            @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
+            @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
+            @NonNull SingleSource<? extends T5> source5, @NonNull SingleSource<? extends T6> source6,
+            @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1847,13 +1845,12 @@ public static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(
-            SingleSource<? extends T1> source1, SingleSource<? extends T2> source2,
-            SingleSource<? extends T3> source3, SingleSource<? extends T4> source4,
-            SingleSource<? extends T5> source5, SingleSource<? extends T6> source6,
-            SingleSource<? extends T7> source7,
-            Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper
+            @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
+            @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
+            @NonNull SingleSource<? extends T5> source5, @NonNull SingleSource<? extends T6> source6,
+            @NonNull SingleSource<? extends T7> source7,
+            @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1909,13 +1906,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(
-            SingleSource<? extends T1> source1, SingleSource<? extends T2> source2,
-            SingleSource<? extends T3> source3, SingleSource<? extends T4> source4,
-            SingleSource<? extends T5> source5, SingleSource<? extends T6> source6,
-            SingleSource<? extends T7> source7, SingleSource<? extends T8> source8,
-            Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper
+            @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
+            @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
+            @NonNull SingleSource<? extends T5> source5, @NonNull SingleSource<? extends T6> source6,
+            @NonNull SingleSource<? extends T7> source7, @NonNull SingleSource<? extends T8> source8,
+            @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1975,14 +1971,13 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(
-            SingleSource<? extends T1> source1, SingleSource<? extends T2> source2,
-            SingleSource<? extends T3> source3, SingleSource<? extends T4> source4,
-            SingleSource<? extends T5> source5, SingleSource<? extends T6> source6,
-            SingleSource<? extends T7> source7, SingleSource<? extends T8> source8,
-            SingleSource<? extends T9> source9,
-            Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper
+            @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
+            @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
+            @NonNull SingleSource<? extends T5> source5, @NonNull SingleSource<? extends T6> source6,
+            @NonNull SingleSource<? extends T7> source7, @NonNull SingleSource<? extends T8> source8,
+            @NonNull SingleSource<? extends T9> source9,
+            @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -2027,7 +2022,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Single<R> zipArray(Function<? super Object[], ? extends R> zipper, SingleSource<? extends T>... sources) {
+    @SafeVarargs
+    public static <T, R> Single<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper, @NonNull SingleSource<? extends T>... sources) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
@@ -2052,8 +2048,7 @@ public static <T, R> Single<R> zipArray(Function<? super Object[], ? extends R>
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings("unchecked")
-    public final Single<T> ambWith(SingleSource<? extends T> other) {
+    public final Single<T> ambWith(@NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
@@ -2072,8 +2067,9 @@ public final Single<T> ambWith(SingleSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> hide() {
-        return RxJavaPlugins.onAssembly(new SingleHide<T>(this));
+        return RxJavaPlugins.onAssembly(new SingleHide<>(this));
     }
 
     /**
@@ -2099,7 +2095,8 @@ public final Single<T> hide() {
     @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> compose(SingleTransformer<? super T, ? extends R> transformer) {
+    @NonNull
+    public final <R> Single<R> compose(@NonNull SingleTransformer<? super T, ? extends R> transformer) {
         return wrap(((SingleTransformer<T, R>) Objects.requireNonNull(transformer, "transformer is null")).apply(this));
     }
 
@@ -2119,8 +2116,9 @@ public final <R> Single<R> compose(SingleTransformer<? super T, ? extends R> tra
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> cache() {
-        return RxJavaPlugins.onAssembly(new SingleCache<T>(this));
+        return RxJavaPlugins.onAssembly(new SingleCache<>(this));
     }
 
     /**
@@ -2140,7 +2138,7 @@ public final Single<T> cache() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<U> cast(final Class<? extends U> clazz) {
+    public final <U> Single<U> cast(@NonNull Class<? extends U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
@@ -2166,7 +2164,8 @@ public final <U> Single<U> cast(final Class<? extends U> clazz) {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> concatWith(SingleSource<? extends T> other) {
+    @NonNull
+    public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
         return concat(this, other);
     }
 
@@ -2187,7 +2186,8 @@ public final Flowable<T> concatWith(SingleSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Single<T> delay(long time, TimeUnit unit) {
+    @NonNull
+    public final Single<T> delay(long time, @NonNull TimeUnit unit) {
         return delay(time, unit, Schedulers.computation(), false);
     }
 
@@ -2208,7 +2208,8 @@ public final Single<T> delay(long time, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Single<T> delay(long time, TimeUnit unit, boolean delayError) {
+    @NonNull
+    public final Single<T> delay(long time, @NonNull TimeUnit unit, boolean delayError) {
         return delay(time, unit, Schedulers.computation(), delayError);
     }
 
@@ -2233,7 +2234,8 @@ public final Single<T> delay(long time, TimeUnit unit, boolean delayError) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Single<T> delay(final long time, final TimeUnit unit, final Scheduler scheduler) {
+    @NonNull
+    public final Single<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return delay(time, unit, scheduler, false);
     }
 
@@ -2259,10 +2261,10 @@ public final Single<T> delay(final long time, final TimeUnit unit, final Schedul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Single<T> delay(final long time, final TimeUnit unit, final Scheduler scheduler, boolean delayError) {
+    public final Single<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new SingleDelay<T>(this, time, unit, scheduler, delayError));
+        return RxJavaPlugins.onAssembly(new SingleDelay<>(this, time, unit, scheduler, delayError));
     }
 
     /**
@@ -2284,9 +2286,9 @@ public final Single<T> delay(final long time, final TimeUnit unit, final Schedul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> delaySubscription(CompletableSource other) {
+    public final Single<T> delaySubscription(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable<T>(this, other));
+        return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable<>(this, other));
     }
 
     /**
@@ -2309,9 +2311,9 @@ public final Single<T> delaySubscription(CompletableSource other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<T> delaySubscription(SingleSource<U> other) {
+    public final <U> Single<T> delaySubscription(@NonNull SingleSource<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new SingleDelayWithSingle<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new SingleDelayWithSingle<>(this, other));
     }
 
     /**
@@ -2334,9 +2336,9 @@ public final <U> Single<T> delaySubscription(SingleSource<U> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<T> delaySubscription(ObservableSource<U> other) {
+    public final <U> Single<T> delaySubscription(@NonNull ObservableSource<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new SingleDelayWithObservable<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new SingleDelayWithObservable<>(this, other));
     }
 
     /**
@@ -2364,9 +2366,9 @@ public final <U> Single<T> delaySubscription(ObservableSource<U> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<T> delaySubscription(Publisher<U> other) {
+    public final <U> Single<T> delaySubscription(@NonNull Publisher<U> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new SingleDelayWithPublisher<T, U>(this, other));
+        return RxJavaPlugins.onAssembly(new SingleDelayWithPublisher<>(this, other));
     }
 
     /**
@@ -2385,7 +2387,8 @@ public final <U> Single<T> delaySubscription(Publisher<U> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Single<T> delaySubscription(long time, TimeUnit unit) {
+    @NonNull
+    public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit) {
         return delaySubscription(time, unit, Schedulers.computation());
     }
 
@@ -2406,7 +2409,8 @@ public final Single<T> delaySubscription(long time, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Single<T> delaySubscription(long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return delaySubscription(Observable.timer(time, unit, scheduler));
     }
 
@@ -2445,9 +2449,9 @@ public final Single<T> delaySubscription(long time, TimeUnit unit, Scheduler sch
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> dematerialize(Function<? super T, Notification<R>> selector) {
+    public final <@NonNull R> Maybe<R> dematerialize(@NonNull Function<? super T, @NonNull Notification<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
-        return RxJavaPlugins.onAssembly(new SingleDematerialize<T, R>(this, selector));
+        return RxJavaPlugins.onAssembly(new SingleDematerialize<>(this, selector));
     }
 
     /**
@@ -2469,9 +2473,9 @@ public final <R> Maybe<R> dematerialize(Function<? super T, Notification<R>> sel
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doAfterSuccess(Consumer<? super T> onAfterSuccess) {
+    public final Single<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSuccess) {
         Objects.requireNonNull(onAfterSuccess, "onAfterSuccess is null");
-        return RxJavaPlugins.onAssembly(new SingleDoAfterSuccess<T>(this, onAfterSuccess));
+        return RxJavaPlugins.onAssembly(new SingleDoAfterSuccess<>(this, onAfterSuccess));
     }
 
     /**
@@ -2498,9 +2502,9 @@ public final Single<T> doAfterSuccess(Consumer<? super T> onAfterSuccess) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doAfterTerminate(Action onAfterTerminate) {
+    public final Single<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
         Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
-        return RxJavaPlugins.onAssembly(new SingleDoAfterTerminate<T>(this, onAfterTerminate));
+        return RxJavaPlugins.onAssembly(new SingleDoAfterTerminate<>(this, onAfterTerminate));
     }
 
     /**
@@ -2525,9 +2529,9 @@ public final Single<T> doAfterTerminate(Action onAfterTerminate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doFinally(Action onFinally) {
+    public final Single<T> doFinally(@NonNull Action onFinally) {
         Objects.requireNonNull(onFinally, "onFinally is null");
-        return RxJavaPlugins.onAssembly(new SingleDoFinally<T>(this, onFinally));
+        return RxJavaPlugins.onAssembly(new SingleDoFinally<>(this, onFinally));
     }
 
     /**
@@ -2547,9 +2551,9 @@ public final Single<T> doFinally(Action onFinally) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doOnSubscribe(final Consumer<? super Disposable> onSubscribe) {
+    public final Single<T> doOnSubscribe(@NonNull Consumer<? super Disposable> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
-        return RxJavaPlugins.onAssembly(new SingleDoOnSubscribe<T>(this, onSubscribe));
+        return RxJavaPlugins.onAssembly(new SingleDoOnSubscribe<>(this, onSubscribe));
     }
 
     /**
@@ -2574,9 +2578,9 @@ public final Single<T> doOnSubscribe(final Consumer<? super Disposable> onSubscr
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doOnTerminate(final Action onTerminate) {
+    public final Single<T> doOnTerminate(@NonNull Action onTerminate) {
         Objects.requireNonNull(onTerminate, "onTerminate is null");
-        return RxJavaPlugins.onAssembly(new SingleDoOnTerminate<T>(this, onTerminate));
+        return RxJavaPlugins.onAssembly(new SingleDoOnTerminate<>(this, onTerminate));
     }
 
     /**
@@ -2596,9 +2600,9 @@ public final Single<T> doOnTerminate(final Action onTerminate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doOnSuccess(final Consumer<? super T> onSuccess) {
+    public final Single<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
         Objects.requireNonNull(onSuccess, "onSuccess is null");
-        return RxJavaPlugins.onAssembly(new SingleDoOnSuccess<T>(this, onSuccess));
+        return RxJavaPlugins.onAssembly(new SingleDoOnSuccess<>(this, onSuccess));
     }
 
     /**
@@ -2617,9 +2621,9 @@ public final Single<T> doOnSuccess(final Consumer<? super T> onSuccess) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doOnEvent(final BiConsumer<? super T, ? super Throwable> onEvent) {
+    public final Single<T> doOnEvent(@NonNull BiConsumer<? super T, ? super Throwable> onEvent) {
         Objects.requireNonNull(onEvent, "onEvent is null");
-        return RxJavaPlugins.onAssembly(new SingleDoOnEvent<T>(this, onEvent));
+        return RxJavaPlugins.onAssembly(new SingleDoOnEvent<>(this, onEvent));
     }
 
     /**
@@ -2639,9 +2643,9 @@ public final Single<T> doOnEvent(final BiConsumer<? super T, ? super Throwable>
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doOnError(final Consumer<? super Throwable> onError) {
+    public final Single<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
         Objects.requireNonNull(onError, "onError is null");
-        return RxJavaPlugins.onAssembly(new SingleDoOnError<T>(this, onError));
+        return RxJavaPlugins.onAssembly(new SingleDoOnError<>(this, onError));
     }
 
     /**
@@ -2662,9 +2666,9 @@ public final Single<T> doOnError(final Consumer<? super Throwable> onError) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doOnDispose(final Action onDispose) {
+    public final Single<T> doOnDispose(@NonNull Action onDispose) {
         Objects.requireNonNull(onDispose, "onDispose is null");
-        return RxJavaPlugins.onAssembly(new SingleDoOnDispose<T>(this, onDispose));
+        return RxJavaPlugins.onAssembly(new SingleDoOnDispose<>(this, onDispose));
     }
 
     /**
@@ -2687,9 +2691,9 @@ public final Single<T> doOnDispose(final Action onDispose) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> filter(Predicate<? super T> predicate) {
+    public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
-        return RxJavaPlugins.onAssembly(new MaybeFilterSingle<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new MaybeFilterSingle<>(this, predicate));
     }
 
     /**
@@ -2711,9 +2715,9 @@ public final Maybe<T> filter(Predicate<? super T> predicate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> flatMap(Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <R> Single<R> flatMap(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new SingleFlatMap<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new SingleFlatMap<>(this, mapper));
     }
 
     /**
@@ -2735,9 +2739,9 @@ public final <R> Single<R> flatMap(Function<? super T, ? extends SingleSource<?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> flatMapMaybe(final Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new SingleFlatMapMaybe<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new SingleFlatMapMaybe<>(this, mapper));
     }
 
     /**
@@ -2764,9 +2768,9 @@ public final <R> Maybe<R> flatMapMaybe(final Function<? super T, ? extends Maybe
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapPublisher(Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new SingleFlatMapPublisher<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new SingleFlatMapPublisher<>(this, mapper));
     }
 
     /**
@@ -2793,9 +2797,9 @@ public final <R> Flowable<R> flatMapPublisher(Function<? super T, ? extends Publ
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new SingleFlatMapIterableFlowable<T, U>(this, mapper));
+        return RxJavaPlugins.onAssembly(new SingleFlatMapIterableFlowable<>(this, mapper));
     }
 
     /**
@@ -2819,9 +2823,9 @@ public final <U> Flowable<U> flattenAsFlowable(final Function<? super T, ? exten
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <@NonNull U> Observable<U> flattenAsObservable(@NonNull Function<@NonNull ? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new SingleFlatMapIterableObservable<T, U>(this, mapper));
+        return RxJavaPlugins.onAssembly(new SingleFlatMapIterableObservable<>(this, mapper));
     }
 
     /**
@@ -2843,9 +2847,9 @@ public final <U> Observable<U> flattenAsObservable(final Function<? super T, ? e
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMapObservable(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> flatMapObservable(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new SingleFlatMapObservable<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new SingleFlatMapObservable<>(this, mapper));
     }
 
     /**
@@ -2868,9 +2872,9 @@ public final <R> Observable<R> flatMapObservable(Function<? super T, ? extends O
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable flatMapCompletable(final Function<? super T, ? extends CompletableSource> mapper) {
+    public final Completable flatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new SingleFlatMapCompletable<T>(this, mapper));
+        return RxJavaPlugins.onAssembly(new SingleFlatMapCompletable<>(this, mapper));
     }
 
     /**
@@ -2890,8 +2894,9 @@ public final Completable flatMapCompletable(final Function<? super T, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final T blockingGet() {
-        BlockingMultiObserver<T> observer = new BlockingMultiObserver<T>();
+        BlockingMultiObserver<T> observer = new BlockingMultiObserver<>();
         subscribe(observer);
         return observer.blockingGet();
     }
@@ -3042,7 +3047,7 @@ public final T blockingGet() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> lift(final SingleOperator<? extends R, ? super T> lift) {
+    public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T> lift) {
         Objects.requireNonNull(lift, "lift is null");
         return RxJavaPlugins.onAssembly(new SingleLift<T, R>(this, lift));
     }
@@ -3066,7 +3071,7 @@ public final <R> Single<R> lift(final SingleOperator<? extends R, ? super T> lif
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> map(Function<? super T, ? extends R> mapper) {
+    public final <@NonNull R> Single<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleMap<T, R>(this, mapper));
     }
@@ -3087,8 +3092,9 @@ public final <R> Single<R> map(Function<? super T, ? extends R> mapper) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<Notification<T>> materialize() {
-        return RxJavaPlugins.onAssembly(new SingleMaterialize<T>(this));
+        return RxJavaPlugins.onAssembly(new SingleMaterialize<>(this));
     }
 
     /**
@@ -3108,7 +3114,8 @@ public final Single<Notification<T>> materialize() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> contains(Object value) {
+    @NonNull
+    public final Single<Boolean> contains(@NonNull Object value) {
         return contains(value, ObjectHelper.equalsPredicate());
     }
 
@@ -3130,10 +3137,10 @@ public final Single<Boolean> contains(Object value) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> contains(final Object value, final BiPredicate<Object, Object> comparer) {
+    public final Single<Boolean> contains(@NonNull Object value, @NonNull BiPredicate<Object, Object> comparer) {
         Objects.requireNonNull(value, "value is null");
         Objects.requireNonNull(comparer, "comparer is null");
-        return RxJavaPlugins.onAssembly(new SingleContains<T>(this, value, comparer));
+        return RxJavaPlugins.onAssembly(new SingleContains<>(this, value, comparer));
     }
 
     /**
@@ -3158,7 +3165,8 @@ public final Single<Boolean> contains(final Object value, final BiPredicate<Obje
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> mergeWith(SingleSource<? extends T> other) {
+    @NonNull
+    public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
         return merge(this, other);
     }
 
@@ -3184,9 +3192,9 @@ public final Flowable<T> mergeWith(SingleSource<? extends T> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Single<T> observeOn(final Scheduler scheduler) {
+    public final Single<T> observeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new SingleObserveOn<T>(this, scheduler));
+        return RxJavaPlugins.onAssembly(new SingleObserveOn<>(this, scheduler));
     }
 
     /**
@@ -3218,9 +3226,9 @@ public final Single<T> observeOn(final Scheduler scheduler) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> onErrorReturn(final Function<Throwable, ? extends T> resumeFunction) {
+    public final Single<T> onErrorReturn(@NonNull Function<Throwable, ? extends T> resumeFunction) {
         Objects.requireNonNull(resumeFunction, "resumeFunction is null");
-        return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<T>(this, resumeFunction, null));
+        return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<>(this, resumeFunction, null));
     }
 
     /**
@@ -3238,9 +3246,9 @@ public final Single<T> onErrorReturn(final Function<Throwable, ? extends T> resu
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> onErrorReturnItem(final T value) {
+    public final Single<T> onErrorReturnItem(@NonNull T value) {
         Objects.requireNonNull(value, "value is null");
-        return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<T>(this, null, value));
+        return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<>(this, null, value));
     }
 
     /**
@@ -3273,7 +3281,7 @@ public final Single<T> onErrorReturnItem(final T value) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> onErrorResumeWith(final SingleSource<? extends T> resumeSingleInCaseOfError) {
+    public final Single<T> onErrorResumeWith(@NonNull SingleSource<? extends T> resumeSingleInCaseOfError) {
         Objects.requireNonNull(resumeSingleInCaseOfError, "resumeSingleInCaseOfError is null");
         return onErrorResumeNext(Functions.justFunction(resumeSingleInCaseOfError));
     }
@@ -3310,9 +3318,9 @@ public final Single<T> onErrorResumeWith(final SingleSource<? extends T> resumeS
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> onErrorResumeNext(
-            final Function<? super Throwable, ? extends SingleSource<? extends T>> resumeFunctionInCaseOfError) {
+            @NonNull Function<? super Throwable, ? extends SingleSource<? extends T>> resumeFunctionInCaseOfError) {
         Objects.requireNonNull(resumeFunctionInCaseOfError, "resumeFunctionInCaseOfError is null");
-        return RxJavaPlugins.onAssembly(new SingleResumeNext<T>(this, resumeFunctionInCaseOfError));
+        return RxJavaPlugins.onAssembly(new SingleResumeNext<>(this, resumeFunctionInCaseOfError));
     }
 
     /**
@@ -3331,8 +3339,9 @@ public final Single<T> onErrorResumeNext(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> onTerminateDetach() {
-        return RxJavaPlugins.onAssembly(new SingleDetach<T>(this));
+        return RxJavaPlugins.onAssembly(new SingleDetach<>(this));
     }
 
     /**
@@ -3351,6 +3360,7 @@ public final Single<T> onTerminateDetach() {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> repeat() {
         return toFlowable().repeat();
     }
@@ -3372,6 +3382,7 @@ public final Flowable<T> repeat() {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Flowable<T> repeat(long times) {
         return toFlowable().repeat(times);
     }
@@ -3399,7 +3410,8 @@ public final Flowable<T> repeat(long times) {
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> repeatWhen(Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
+    @NonNull
+    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
         return toFlowable().repeatWhen(handler);
     }
 
@@ -3421,7 +3433,8 @@ public final Flowable<T> repeatWhen(Function<? super Flowable<Object>, ? extends
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> repeatUntil(BooleanSupplier stop) {
+    @NonNull
+    public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
         return toFlowable().repeatUntil(stop);
     }
 
@@ -3438,6 +3451,7 @@ public final Flowable<T> repeatUntil(BooleanSupplier stop) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> retry() {
         return toSingle(toFlowable().retry());
     }
@@ -3457,6 +3471,7 @@ public final Single<T> retry() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> retry(long times) {
         return toSingle(toFlowable().retry(times));
     }
@@ -3477,7 +3492,8 @@ public final Single<T> retry(long times) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> retry(BiPredicate<? super Integer, ? super Throwable> predicate) {
+    @NonNull
+    public final Single<T> retry(@NonNull BiPredicate<? super Integer, ? super Throwable> predicate) {
         return toSingle(toFlowable().retry(predicate));
     }
 
@@ -3499,7 +3515,8 @@ public final Single<T> retry(BiPredicate<? super Integer, ? super Throwable> pre
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> retry(long times, Predicate<? super Throwable> predicate) {
+    @NonNull
+    public final Single<T> retry(long times, @NonNull Predicate<? super Throwable> predicate) {
         return toSingle(toFlowable().retry(times, predicate));
     }
 
@@ -3519,7 +3536,8 @@ public final Single<T> retry(long times, Predicate<? super Throwable> predicate)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> retry(Predicate<? super Throwable> predicate) {
+    @NonNull
+    public final Single<T> retry(@NonNull Predicate<? super Throwable> predicate) {
         return toSingle(toFlowable().retry(predicate));
     }
 
@@ -3568,7 +3586,8 @@ public final Single<T> retry(Predicate<? super Throwable> predicate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> retryWhen(Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
+    @NonNull
+    public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
         return toSingle(toFlowable().retryWhen(handler));
     }
 
@@ -3589,6 +3608,7 @@ public final Single<T> retryWhen(Function<? super Flowable<Throwable>, ? extends
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Disposable subscribe() {
         return subscribe(Functions.emptyConsumer(), Functions.ON_ERROR_MISSING);
     }
@@ -3614,10 +3634,10 @@ public final Disposable subscribe() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(final BiConsumer<? super T, ? super Throwable> onCallback) {
+    public final Disposable subscribe(@NonNull BiConsumer<? super T, ? super Throwable> onCallback) {
         Objects.requireNonNull(onCallback, "onCallback is null");
 
-        BiConsumerSingleObserver<T> observer = new BiConsumerSingleObserver<T>(onCallback);
+        BiConsumerSingleObserver<T> observer = new BiConsumerSingleObserver<>(onCallback);
         subscribe(observer);
         return observer;
     }
@@ -3644,7 +3664,8 @@ public final Disposable subscribe(final BiConsumer<? super T, ? super Throwable>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onSuccess) {
+    @NonNull
+    public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
         return subscribe(onSuccess, Functions.ON_ERROR_MISSING);
     }
 
@@ -3672,18 +3693,18 @@ public final Disposable subscribe(Consumer<? super T> onSuccess) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(final Consumer<? super T> onSuccess, final Consumer<? super Throwable> onError) {
+    public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNull Consumer<? super Throwable> onError) {
         Objects.requireNonNull(onSuccess, "onSuccess is null");
         Objects.requireNonNull(onError, "onError is null");
 
-        ConsumerSingleObserver<T> observer = new ConsumerSingleObserver<T>(onSuccess, onError);
+        ConsumerSingleObserver<T> observer = new ConsumerSingleObserver<>(onSuccess, onError);
         subscribe(observer);
         return observer;
     }
 
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
-    public final void subscribe(SingleObserver<? super T> observer) {
+    public final void subscribe(@NonNull SingleObserver<? super T> observer) {
         Objects.requireNonNull(observer, "observer is null");
 
         observer = RxJavaPlugins.onSubscribe(this, observer);
@@ -3739,7 +3760,8 @@ public final void subscribe(SingleObserver<? super T> observer) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <E extends SingleObserver<? super T>> E subscribeWith(E observer) {
+    @NonNull
+    public final <@NonNull E extends SingleObserver<? super T>> E subscribeWith(E observer) {
         subscribe(observer);
         return observer;
     }
@@ -3763,9 +3785,9 @@ public final <E extends SingleObserver<? super T>> E subscribeWith(E observer) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Single<T> subscribeOn(final Scheduler scheduler) {
+    public final Single<T> subscribeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new SingleSubscribeOn<T>(this, scheduler));
+        return RxJavaPlugins.onAssembly(new SingleSubscribeOn<>(this, scheduler));
     }
 
     /**
@@ -3788,7 +3810,7 @@ public final Single<T> subscribeOn(final Scheduler scheduler) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> takeUntil(final CompletableSource other) {
+    public final Single<T> takeUntil(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
         return takeUntil(new CompletableToFlowable<T>(other));
     }
@@ -3820,9 +3842,9 @@ public final Single<T> takeUntil(final CompletableSource other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <E> Single<T> takeUntil(final Publisher<E> other) {
+    public final <E> Single<T> takeUntil(@NonNull Publisher<E> other) {
         Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new SingleTakeUntil<T, E>(this, other));
+        return RxJavaPlugins.onAssembly(new SingleTakeUntil<>(this, other));
     }
 
     /**
@@ -3846,7 +3868,7 @@ public final <E> Single<T> takeUntil(final Publisher<E> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <E> Single<T> takeUntil(final SingleSource<? extends E> other) {
+    public final <E> Single<T> takeUntil(@NonNull SingleSource<? extends E> other) {
         Objects.requireNonNull(other, "other is null");
         return takeUntil(new SingleToFlowable<E>(other));
     }
@@ -3867,7 +3889,8 @@ public final <E> Single<T> takeUntil(final SingleSource<? extends E> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Single<T> timeout(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Single<T> timeout(long timeout, @NonNull TimeUnit unit) {
         return timeout0(timeout, unit, Schedulers.computation(), null);
     }
 
@@ -3889,7 +3912,8 @@ public final Single<T> timeout(long timeout, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Single<T> timeout(long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Single<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return timeout0(timeout, unit, scheduler, null);
     }
 
@@ -3912,7 +3936,7 @@ public final Single<T> timeout(long timeout, TimeUnit unit, Scheduler scheduler)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Single<T> timeout(long timeout, TimeUnit unit, Scheduler scheduler, SingleSource<? extends T> other) {
+    public final Single<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, scheduler, other);
     }
@@ -3940,7 +3964,7 @@ public final Single<T> timeout(long timeout, TimeUnit unit, Scheduler scheduler,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Single<T> timeout(long timeout, TimeUnit unit, SingleSource<? extends T> other) {
+    public final Single<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, Schedulers.computation(), other);
     }
@@ -3948,7 +3972,7 @@ public final Single<T> timeout(long timeout, TimeUnit unit, SingleSource<? exten
     private Single<T> timeout0(final long timeout, final TimeUnit unit, final Scheduler scheduler, final SingleSource<? extends T> other) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new SingleTimeout<T>(this, timeout, unit, scheduler, other));
+        return RxJavaPlugins.onAssembly(new SingleTimeout<>(this, timeout, unit, scheduler, other));
     }
 
     /**
@@ -3990,8 +4014,9 @@ public final <R> R to(@NonNull SingleConverter<T, ? extends R> converter) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable ignoreElement() {
-        return RxJavaPlugins.onAssembly(new CompletableFromSingle<T>(this));
+        return RxJavaPlugins.onAssembly(new CompletableFromSingle<>(this));
     }
 
     /**
@@ -4011,11 +4036,12 @@ public final Completable ignoreElement() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public final Flowable<T> toFlowable() {
         if (this instanceof FuseToFlowable) {
             return ((FuseToFlowable<T>)this).fuseToFlowable();
         }
-        return RxJavaPlugins.onAssembly(new SingleToFlowable<T>(this));
+        return RxJavaPlugins.onAssembly(new SingleToFlowable<>(this));
     }
 
     /**
@@ -4032,6 +4058,7 @@ public final Flowable<T> toFlowable() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Future<T> toFuture() {
         return subscribeWith(new FutureSingleObserver<T>());
     }
@@ -4050,11 +4077,12 @@ public final Future<T> toFuture() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public final Maybe<T> toMaybe() {
         if (this instanceof FuseToMaybe) {
             return ((FuseToMaybe<T>)this).fuseToMaybe();
         }
-        return RxJavaPlugins.onAssembly(new MaybeFromSingle<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeFromSingle<>(this));
     }
     /**
      * Converts this Single into an {@link Observable}.
@@ -4070,11 +4098,12 @@ public final Maybe<T> toMaybe() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public final Observable<T> toObservable() {
         if (this instanceof FuseToObservable) {
             return ((FuseToObservable<T>)this).fuseToObservable();
         }
-        return RxJavaPlugins.onAssembly(new SingleToObservable<T>(this));
+        return RxJavaPlugins.onAssembly(new SingleToObservable<>(this));
     }
 
     /**
@@ -4095,9 +4124,9 @@ public final Observable<T> toObservable() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Single<T> unsubscribeOn(final Scheduler scheduler) {
+    public final Single<T> unsubscribeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new SingleUnsubscribeOn<T>(this, scheduler));
+        return RxJavaPlugins.onAssembly(new SingleUnsubscribeOn<>(this, scheduler));
     }
 
     /**
@@ -4125,7 +4154,8 @@ public final Single<T> unsubscribeOn(final Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Single<R> zipWith(SingleSource<U> other, BiFunction<? super T, ? super U, ? extends R> zipper) {
+    @NonNull
+    public final <U, R> Single<R> zipWith(@NonNull SingleSource<U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         return zip(this, other, zipper);
     }
 
@@ -4146,8 +4176,9 @@ public final <U, R> Single<R> zipWith(SingleSource<U> other, BiFunction<? super
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestObserver<T> test() {
-        TestObserver<T> to = new TestObserver<T>();
+        TestObserver<T> to = new TestObserver<>();
         subscribe(to);
         return to;
     }
@@ -4167,8 +4198,9 @@ public final TestObserver<T> test() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestObserver<T> test(boolean dispose) {
-        TestObserver<T> to = new TestObserver<T>();
+        TestObserver<T> to = new TestObserver<>();
 
         if (dispose) {
             to.dispose();
@@ -4178,8 +4210,9 @@ public final TestObserver<T> test(boolean dispose) {
         return to;
     }
 
-    private static <T> Single<T> toSingle(Flowable<T> source) {
-        return RxJavaPlugins.onAssembly(new FlowableSingleSingle<T>(source, null));
+    @NonNull
+    private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
+        return RxJavaPlugins.onAssembly(new FlowableSingleSingle<>(source, null));
     }
 
     // -------------------------------------------------------------------------
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
index 668a7acf92..fd9712b64d 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
@@ -483,7 +483,6 @@ public void mergeArrayNull() {
         Flowable.mergeArray(128, 128, (Publisher<Object>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void mergeArrayOneIsNull() {
         Flowable.mergeArray(128, 128, just1, null).blockingLast();
@@ -514,7 +513,6 @@ public void mergeDelayErrorArrayNull() {
         Flowable.mergeArrayDelayError(128, 128, (Publisher<Object>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void mergeDelayErrorArrayOneIsNull() {
         Flowable.mergeArrayDelayError(128, 128, just1, null).blockingLast();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
index 9289288ccc..e7625da6f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
@@ -1210,7 +1210,6 @@ public void arrayDelayErrorMaxConcurrency() {
         PublishProcessor<Integer> pp2 = PublishProcessor.create();
         PublishProcessor<Integer> pp3 = PublishProcessor.create();
 
-        @SuppressWarnings("unchecked")
         TestSubscriber<Integer> ts = Flowable.concatArrayEagerDelayError(2, 2, pp1, pp2, pp3)
         .test();
 
@@ -1246,7 +1245,6 @@ public void arrayDelayErrorMaxConcurrencyErrorDelayed() {
         PublishProcessor<Integer> pp2 = PublishProcessor.create();
         PublishProcessor<Integer> pp3 = PublishProcessor.create();
 
-        @SuppressWarnings("unchecked")
         TestSubscriber<Integer> ts = Flowable.concatArrayEagerDelayError(2, 2, pp1, pp2, pp3)
         .test();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
index 118f249091..64a2206e84 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
@@ -622,7 +622,6 @@ public void array() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayDelayError() {
         Flowable.mergeArrayDelayError(Flowable.just(1), Flowable.just(2))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
index 19d0ac86a0..3a1d65fc33 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
@@ -1518,7 +1518,6 @@ public void array() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArray2() {
         Flowable.mergeArray(Flowable.just(1), Flowable.just(2))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
index a660eb7429..69ed3a4aed 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
@@ -464,7 +464,6 @@ public void run() {
     public void longFlow() {
         Flowable.range(1, 1000000)
         .publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @SuppressWarnings("unchecked")
             @Override
             public Publisher<Integer> apply(Flowable<Integer> v) throws Exception {
                 return Flowable.mergeArray(
@@ -491,7 +490,6 @@ public boolean test(Integer w) throws Exception {
     public void longFlow2() {
         Flowable.range(1, 100000)
         .publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @SuppressWarnings("unchecked")
             @Override
             public Publisher<Integer> apply(Flowable<Integer> v) throws Exception {
                 return Flowable.mergeArray(
@@ -519,7 +517,6 @@ public boolean test(Integer w) throws Exception {
     public void longFlowHidden() {
         Flowable.range(1, 1000000).hide()
         .publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @SuppressWarnings("unchecked")
             @Override
             public Publisher<Integer> apply(Flowable<Integer> v) throws Exception {
                 return Flowable.mergeArray(
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
index dec723d651..fb3a6aff5b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
@@ -116,7 +116,6 @@ public void run() {
 
     @Test
     public void disposeNoFurtherSignals() {
-        @SuppressWarnings("unchecked")
         TestObserver<Integer> to = Maybe.ambArray(new Maybe<Integer>() {
             @Override
             protected void subscribeActual(
@@ -134,7 +133,6 @@ protected void subscribeActual(
         to.assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerSuccessDispose() throws Exception {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
@@ -160,7 +158,6 @@ public void accept(Object v) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerErrorDispose() throws Exception {
         final TestException ex = new TestException();
@@ -187,7 +184,6 @@ public void accept(Throwable e) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerCompleteDispose() throws Exception {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
@@ -223,7 +219,6 @@ public void nullSourceSuccessRace() {
                 final Subject<Integer> ps = ReplaySubject.create();
                 ps.onNext(1);
 
-                @SuppressWarnings("unchecked")
                 final Maybe<Integer> source = Maybe.ambArray(ps.singleElement(),
                         Maybe.<Integer>never(), Maybe.<Integer>never(), null);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
index 3fa9235fbd..301a8a35f5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
@@ -29,7 +29,6 @@
 
 public class MaybeConcatArrayTest extends RxJavaTest {
 
-    @SuppressWarnings("unchecked")
     @Test
     public void cancel() {
         Maybe.concatArray(Maybe.just(1), Maybe.just(2))
@@ -38,7 +37,6 @@ public void cancel() {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void cancelDelayError() {
         Maybe.concatArrayDelayError(Maybe.just(1), Maybe.just(2))
@@ -47,7 +45,6 @@ public void cancelDelayError() {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void backpressure() {
         TestSubscriber<Integer> ts = Maybe.concatArray(Maybe.just(1), Maybe.just(2))
@@ -64,7 +61,6 @@ public void backpressure() {
         ts.assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void backpressureDelayError() {
         TestSubscriber<Integer> ts = Maybe.concatArrayDelayError(Maybe.just(1), Maybe.just(2))
@@ -81,7 +77,6 @@ public void backpressureDelayError() {
         ts.assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void requestCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -106,7 +101,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void requestCancelRaceDelayError() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -131,7 +125,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorAfterTermination() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -158,7 +151,6 @@ protected void subscribeActual(MaybeObserver<? super Integer> observer) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscription() {
         final int[] calls = { 0 };
@@ -178,7 +170,6 @@ public void subscribe(MaybeEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscriptionDelayError() {
         final int[] calls = { 0 };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
index 86261efc4f..6b886fd894 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
@@ -32,7 +32,6 @@
 
 public class MaybeMergeArrayTest extends RxJavaTest {
 
-    @SuppressWarnings("unchecked")
     @Test
     public void normal() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.SYNC);
@@ -45,7 +44,6 @@ public void normal() {
         .assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void fusedPollMixed() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
@@ -92,7 +90,6 @@ public void onComplete() {
         });
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void cancel() {
         TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
@@ -106,7 +103,6 @@ public void cancel() {
         ts.assertEmpty();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void firstErrors() {
         TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
@@ -117,7 +113,6 @@ public void firstErrors() {
         ts.assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorFused() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
@@ -130,7 +125,6 @@ public void errorFused() {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void errorRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -172,7 +166,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeBadSource() {
         Maybe.mergeArray(new Maybe<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
index aea7a478ce..c685e79cae 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
@@ -151,7 +151,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipArrayOneIsNull() {
         Maybe.zipArray(new Function<Object[], Object>() {
@@ -163,7 +162,6 @@ public Object apply(Object[] v) {
         .blockingGet();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleSourceZipperReturnsNull() {
         Maybe.zipArray(Functions.justFunction(null), Maybe.just(1))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
index aae11b288e..4f6e07f00a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
@@ -205,7 +205,6 @@ public Object apply(Object[] v) {
         .blockingGet();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleSourceZipperReturnsNull() {
         Maybe.zipArray(Functions.justFunction(null), Maybe.just(1))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
index 4764b3e50e..323cbc3270 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
@@ -399,7 +399,6 @@ public void cancelNoConcurrentClean() {
     public void checkUnboundedInnerQueue() {
         MaybeSubject<Integer> ms = MaybeSubject.create();
 
-        @SuppressWarnings("unchecked")
         TestObserver<Integer> to = Observable
                 .fromArray(ms, Maybe.just(2), Maybe.just(3), Maybe.just(4))
                 .concatMapMaybe(Functions.<Maybe<Integer>>identity(), 2)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
index 41659020e5..90f15ac250 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
@@ -339,7 +339,6 @@ public void cancelNoConcurrentClean() {
     public void checkUnboundedInnerQueue() {
         SingleSubject<Integer> ss = SingleSubject.create();
 
-        @SuppressWarnings("unchecked")
         TestObserver<Integer> to = Observable
                 .fromArray(ss, Single.just(2), Single.just(3), Single.just(4))
                 .concatMapSingle(Functions.<Single<Integer>>identity(), 2)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
index 4e8cbd34b6..4948f1a13d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
@@ -92,7 +92,6 @@ public void amb() {
         Observable<String> observable3 = createObservable(new String[] {
                 "3", "33", "333", "3333" }, 3000, null);
 
-        @SuppressWarnings("unchecked")
         Observable<String> o = Observable.ambArray(observable1,
                 observable2, observable3);
 
@@ -121,7 +120,6 @@ public void amb2() {
         Observable<String> observable3 = createObservable(new String[] {},
                 3000, new IOException("fake exception"));
 
-        @SuppressWarnings("unchecked")
         Observable<String> o = Observable.ambArray(observable1,
                 observable2, observable3);
 
@@ -148,7 +146,6 @@ public void amb3() {
         Observable<String> observable3 = createObservable(new String[] {
                 "3" }, 3000, null);
 
-        @SuppressWarnings("unchecked")
         Observable<String> o = Observable.ambArray(observable1,
                 observable2, observable3);
 
@@ -161,7 +158,6 @@ public void amb3() {
         inOrder.verifyNoMoreInteractions();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void subscriptionOnlyHappensOnce() throws InterruptedException {
         final AtomicLong count = new AtomicLong();
@@ -205,7 +201,6 @@ public void accept(Integer t) {
         assertEquals(1, result);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambCancelsOthers() {
         PublishSubject<Integer> source1 = PublishSubject.create();
@@ -228,13 +223,11 @@ public void ambCancelsOthers() {
 
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayEmpty() {
         assertSame(Observable.empty(), Observable.ambArray());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArraySingleElement() {
         assertSame(Observable.never(), Observable.ambArray(Observable.never()));
@@ -265,7 +258,6 @@ public void singleIterable() {
         .assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void disposed() {
         TestHelper.checkDisposed(Observable.ambArray(Observable.never(), Observable.never()));
@@ -277,7 +269,6 @@ public void onNextRace() {
             final PublishSubject<Integer> ps1 = PublishSubject.create();
             final PublishSubject<Integer> ps2 = PublishSubject.create();
 
-            @SuppressWarnings("unchecked")
             TestObserverEx<Integer> to = Observable.ambArray(ps1, ps2).to(TestHelper.<Integer>testConsumer());
 
             Runnable r1 = new Runnable() {
@@ -308,7 +299,6 @@ public void onCompleteRace() {
             final PublishSubject<Integer> ps1 = PublishSubject.create();
             final PublishSubject<Integer> ps2 = PublishSubject.create();
 
-            @SuppressWarnings("unchecked")
             TestObserver<Integer> to = Observable.ambArray(ps1, ps2).test();
 
             Runnable r1 = new Runnable() {
@@ -336,7 +326,6 @@ public void onErrorRace() {
             final PublishSubject<Integer> ps1 = PublishSubject.create();
             final PublishSubject<Integer> ps2 = PublishSubject.create();
 
-            @SuppressWarnings("unchecked")
             TestObserver<Integer> to = Observable.ambArray(ps1, ps2).test();
 
             final Throwable ex = new TestException();
@@ -380,14 +369,12 @@ public void ambIterableOrder() {
         Observable.amb(Arrays.asList(Observable.just(1), error)).test().assertValue(1).assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayOrder() {
         Observable<Integer> error = Observable.error(new RuntimeException());
         Observable.ambArray(Observable.just(1), error).test().assertValue(1).assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerSuccessDispose() throws Exception {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
@@ -413,7 +400,6 @@ public void accept(Object v) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerErrorDispose() throws Exception {
         final TestException ex = new TestException();
@@ -440,7 +426,6 @@ public void accept(Throwable e) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerCompleteDispose() throws Exception {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
index 6ad8b9c649..6a88930b75 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
@@ -218,7 +218,6 @@ public void simple2() {
         to.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness2() {
         final AtomicInteger count = new AtomicInteger();
@@ -238,7 +237,6 @@ public void accept(Integer t) {
         to.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness3() {
         final AtomicInteger count = new AtomicInteger();
@@ -258,7 +256,6 @@ public void accept(Integer t) {
         to.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness4() {
         final AtomicInteger count = new AtomicInteger();
@@ -278,7 +275,6 @@ public void accept(Integer t) {
         to.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness5() {
         final AtomicInteger count = new AtomicInteger();
@@ -298,7 +294,6 @@ public void accept(Integer t) {
         to.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness6() {
         final AtomicInteger count = new AtomicInteger();
@@ -318,7 +313,6 @@ public void accept(Integer t) {
         to.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness7() {
         final AtomicInteger count = new AtomicInteger();
@@ -338,7 +332,6 @@ public void accept(Integer t) {
         to.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness8() {
         final AtomicInteger count = new AtomicInteger();
@@ -358,7 +351,6 @@ public void accept(Integer t) {
         to.assertComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void eagerness9() {
         final AtomicInteger count = new AtomicInteger();
@@ -387,7 +379,6 @@ public void mainError() {
         to.assertNotComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void innerError() {
         // TODO verify: concatMapEager subscribes first then consumes the sources is okay
@@ -404,7 +395,6 @@ public void innerError() {
         to.assertNotComplete();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void innerEmpty() {
         Observable.concatArrayEager(Observable.empty(), Observable.empty()).subscribe(to);
@@ -870,7 +860,6 @@ public void arrayDelayErrorDefault() {
         PublishSubject<Integer> ps2 = PublishSubject.create();
         PublishSubject<Integer> ps3 = PublishSubject.create();
 
-        @SuppressWarnings("unchecked")
         TestObserver<Integer> to = Observable.concatArrayEagerDelayError(ps1, ps2, ps3)
         .test();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
index 769f42f984..a5d2a6aa4c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
@@ -372,7 +372,6 @@ protected void subscribeActual(Observer<? super Integer> observer) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatReportsDisposedOnComplete() {
         final Disposable[] disposable = { null };
@@ -404,7 +403,6 @@ public void onComplete() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void concatReportsDisposedOnError() {
         final Disposable[] disposable = { null };
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
index 1de6190f05..d481c16662 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
@@ -1299,7 +1299,6 @@ public Object apply(Integer a, Integer b) throws Exception {
         .assertFailure(TestException.class, "929");
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void zipArrayEmpty() {
         assertSame(Observable.empty(), Observable.zipArray(Functions.<Object[]>identity(), false, 16));
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
index 7faf26454e..acfa6528a6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
@@ -112,7 +112,6 @@ public void ambIterableWithSecondFires() {
         to.assertResult(2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayEmpty() {
         Single.ambArray()
@@ -120,13 +119,11 @@ public void ambArrayEmpty() {
         .assertFailure(NoSuchElementException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambSingleSource() {
         assertSame(Single.never(), Single.ambArray(Single.never()));
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error() {
         Single.ambArray(Single.error(new TestException()), Single.just(1))
@@ -144,7 +141,6 @@ public void nullSourceSuccessRace() {
                 final Subject<Integer> ps = ReplaySubject.create();
                 ps.onNext(1);
 
-                @SuppressWarnings("unchecked")
                 final Single<Integer> source = Single.ambArray(ps.singleOrError(), Single.<Integer>never(), Single.<Integer>never(), null);
 
                 Runnable r1 = new Runnable() {
@@ -172,7 +168,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void multipleErrorRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -212,7 +207,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void successErrorRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -276,14 +270,12 @@ public void ambIterableOrder() {
         Single.amb(Arrays.asList(Single.just(1), error)).test().assertValue(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayOrder() {
         Single<Integer> error = Single.error(new RuntimeException());
         Single.ambArray(Single.just(1), error).test().assertValue(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerSuccessDispose() throws Exception {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
@@ -311,7 +303,6 @@ public void accept(Object v, Throwable e) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noWinnerErrorDispose() throws Exception {
         final TestException ex = new TestException();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
index 348810be1f..bf8c534f46 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
@@ -70,7 +70,6 @@ public void concatArray() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayEagerTest() {
         PublishProcessor<String> pp1 = PublishProcessor.create();
@@ -142,7 +141,6 @@ public void concatObservable() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscription() {
         final int[] calls = { 0 };
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
index 18f799b3a2..50989db3ec 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
@@ -151,7 +151,6 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipArrayOneIsNull() {
         Single.zipArray(new Function<Object[], Object>() {
@@ -176,7 +175,6 @@ public Object[] apply(Object[] a) throws Exception {
         .assertFailure(NoSuchElementException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void oneArray() {
         Single.zipArray(new Function<Object[], Object>() {
@@ -189,7 +187,6 @@ public Object apply(Object[] a) throws Exception {
         .assertResult(2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleSourceZipperReturnsNull() {
         Single.zipArray(Functions.justFunction(null), Single.just(1))
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index c3335c0bab..d222f92392 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -1382,13 +1382,11 @@ public void concat3Backpressured() {
         ts.assertResult(1, 2, 3);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayZero() {
         assertSame(Flowable.empty(), Maybe.concatArray());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayOne() {
         Maybe.concatArray(Maybe.just(1)).test().assertResult(1);
@@ -1594,7 +1592,6 @@ public void maybeToPublisherEnum() {
         TestHelper.checkEnum(MaybeToPublisher.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayOneIsNull() {
         Maybe.ambArray(null, Maybe.just(1))
@@ -1602,13 +1599,11 @@ public void ambArrayOneIsNull() {
                 .assertError(NullPointerException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayEmpty() {
         assertSame(Maybe.empty(), Maybe.ambArray());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayOne() {
         assertSame(Maybe.never(), Maybe.ambArray(Maybe.never()));
@@ -1626,14 +1621,12 @@ public void ambIterableOrder() {
         Maybe.amb(Arrays.asList(Maybe.just(1), error)).test().assertValue(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayOrder() {
         Maybe<Integer> error = Maybe.error(new RuntimeException());
         Maybe.ambArray(Maybe.just(1), error).test().assertValue(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArray1SignalsSuccess() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1656,7 +1649,6 @@ public void ambArray1SignalsSuccess() {
         to.assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArray2SignalsSuccess() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1679,7 +1671,6 @@ public void ambArray2SignalsSuccess() {
         to.assertResult(2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArray1SignalsError() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1701,7 +1692,6 @@ public void ambArray1SignalsError() {
         to.assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArray2SignalsError() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1723,7 +1713,6 @@ public void ambArray2SignalsError() {
         to.assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArray1SignalsComplete() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1745,7 +1734,6 @@ public void ambArray1SignalsComplete() {
         to.assertResult();
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArray2SignalsComplete() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -1972,7 +1960,6 @@ public void ambIterableOne() {
         Maybe.amb(Collections.singleton(Maybe.just(1))).test().assertResult(1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArray() {
         Maybe.mergeArray(Maybe.just(1), Maybe.just(2), Maybe.just(3))
@@ -2009,7 +1996,6 @@ public void merge4Take2() {
         .assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayBackpressured() {
         TestSubscriber<Integer> ts = Maybe.mergeArray(Maybe.just(1), Maybe.just(2), Maybe.just(3))
@@ -2029,7 +2015,6 @@ public void mergeArrayBackpressured() {
         ts.assertResult(1, 2, 3);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayBackpressuredMixed1() {
         TestSubscriber<Integer> ts = Maybe.mergeArray(Maybe.just(1), Maybe.<Integer>empty(), Maybe.just(3))
@@ -2046,7 +2031,6 @@ public void mergeArrayBackpressuredMixed1() {
         ts.assertResult(1, 3);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayBackpressuredMixed2() {
         TestSubscriber<Integer> ts = Maybe.mergeArray(Maybe.just(1), Maybe.just(2), Maybe.<Integer>empty())
@@ -2063,7 +2047,6 @@ public void mergeArrayBackpressuredMixed2() {
         ts.assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayBackpressuredMixed3() {
         TestSubscriber<Integer> ts = Maybe.mergeArray(Maybe.<Integer>empty(), Maybe.just(2), Maybe.just(3))
@@ -2080,7 +2063,6 @@ public void mergeArrayBackpressuredMixed3() {
         ts.assertResult(2, 3);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayFused() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
@@ -2093,7 +2075,6 @@ public void mergeArrayFused() {
         .assertResult(1, 2, 3);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayFusedRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -2129,13 +2110,11 @@ public void run() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayZero() {
         assertSame(Flowable.empty(), Maybe.mergeArray());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayOne() {
         Maybe.mergeArray(Maybe.just(1)).test().assertResult(1);
@@ -2462,7 +2441,6 @@ public void accept(Integer v, Throwable e) throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayDelayError() {
         Maybe.concatArrayDelayError(Maybe.empty(), Maybe.just(1), Maybe.error(new TestException()))
@@ -2500,7 +2478,6 @@ public void concatPublisherDelayError() {
         .assertFailure(TestException.class, 1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatEagerArray() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();
@@ -2607,7 +2584,6 @@ public void fromFuture() {
         ;
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayDelayError() {
         Maybe.mergeArrayDelayError(Maybe.empty(), Maybe.just(1), Maybe.error(new TestException()))
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
index 9c112b0f7d..074057a8d3 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
@@ -45,7 +45,6 @@ public void ambVarargsNull() {
         Observable.ambArray((Observable<Object>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void ambVarargsOneIsNull() {
         Observable.ambArray(Observable.never(), null).blockingLast();
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
index 98ba085b19..6ffdb2ebf8 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
@@ -61,7 +61,6 @@ public void ambArrayNull() {
         Single.ambArray((Single<Integer>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void ambArrayOneIsNull() {
         Single.ambArray(null, just1)
@@ -534,7 +533,6 @@ public Object apply(Object[] v) {
         .blockingGet();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipArrayOneIsNull() {
         Single.zipArray(new Function<Object[], Object>() {
@@ -546,13 +544,11 @@ public Object apply(Object[] v) {
         .blockingGet();
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipArrayFunctionNull() {
         Single.zipArray(null, just1, just1);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void zipArrayFunctionReturnsNull() {
         Single.zipArray(new Function<Object[], Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
new file mode 100644
index 0000000000..8cde4fac7e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
@@ -0,0 +1,257 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.validators;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+/**
+ * Parse the given files and check if all public final and public static methods have
+ * &#64;NonNull or &#64;Nullable annotations specified on their return type and object-type parameters
+ * as well as &#64;SafeVarargs for varargs.
+ */
+public class SourceAnnotationCheck {
+
+    @Test
+    public void checkCompletable() throws Exception {
+        processFile(Completable.class);
+    }
+
+    @Test
+    public void checkSingle() throws Exception {
+        processFile(Single.class);
+    }
+
+    @Test
+    public void checkMaybe() throws Exception {
+        processFile(Maybe.class);
+    }
+
+    // TODO later
+    // @Test
+    public void checkObservable() throws Exception {
+        processFile(Observable.class);
+    }
+
+    @Test
+    public void checkFlowable() throws Exception {
+        processFile(Flowable.class);
+    }
+
+    // TODO later
+    // @Test
+    public void checkParallelFlowable() throws Exception {
+        processFile(ParallelFlowable.class);
+    }
+
+    static void processFile(Class<?> clazz) throws Exception {
+        String baseClassName = clazz.getSimpleName();
+        File f = TestHelper.findSource(baseClassName);
+        if (f == null) {
+            return;
+        }
+        String fullClassName = clazz.getName();
+
+        int errorCount = 0;
+        StringBuilder errors = new StringBuilder();
+
+        List<String> lines = Files.readAllLines(f.toPath());
+
+        for (int j = 0; j < lines.size(); j++) {
+            String line = lines.get(j).trim();
+
+            if (line.startsWith("public static") || line.startsWith("public final")) {
+                int methodArgStart = line.indexOf("(");
+
+                int isBoolean = line.indexOf(" boolean ");
+                int isInt = line.indexOf(" int ");
+                int isLong = line.indexOf(" long ");
+                int isVoid = line.indexOf(" void ");
+                int isElementType = line.indexOf(" R ");
+
+                boolean hasSafeVarargsAnnotation = false;
+
+                if (!((isBoolean > 0 && isBoolean < methodArgStart)
+                        || (isInt > 0 && isInt < methodArgStart)
+                        || (isLong > 0 && isLong < methodArgStart)
+                        || (isVoid > 0 && isVoid < methodArgStart)
+                        || (isElementType > 0 && isElementType < methodArgStart)
+                    )) {
+
+                    boolean annotationFound = false;
+                    for (int k = j - 1; k >= 0; k--) {
+
+                        String prevLine = lines.get(k).trim();
+
+                        if (prevLine.startsWith("}") || prevLine.startsWith("*/")) {
+                            break;
+                        }
+                        if (prevLine.startsWith("@NonNull") || prevLine.startsWith("@Nullable")) {
+                            annotationFound = true;
+                        }
+                        if (prevLine.startsWith("@SafeVarargs")) {
+                            hasSafeVarargsAnnotation = true;
+                        }
+                    }
+
+                    if (!annotationFound) {
+                        errorCount++;
+                        errors.append("L")
+                        .append(j)
+                        .append(" : Missing return type nullability annotation | ")
+                        .append(line)
+                        .append("\r\n")
+                        .append(" at ")
+                        .append(fullClassName)
+                        .append(".method(")
+                        .append(f.getName())
+                        .append(":")
+                        .append(j + 1)
+                        .append(")\r\n")
+                        ;
+                    }
+                }
+
+                // Extract arguments
+                StringBuilder arguments = new StringBuilder();
+                int methodArgEnd = line.indexOf(")", methodArgStart);
+                if (methodArgEnd > 0) {
+                    arguments.append(line.substring(methodArgStart + 1, methodArgEnd));
+                } else {
+                    arguments.append(line.substring(methodArgStart + 1));
+                    for (int k = j + 1; k < lines.size(); k++) {
+                        String ln = lines.get(k).trim();
+                        int idx = ln.indexOf(")");
+                        if (idx > 0) {
+                            arguments.append(ln.substring(0, idx));
+                            break;
+                        }
+                        arguments.append(ln).append(" ");
+                    }
+                }
+
+                // Strip generics arguments
+                StringBuilder strippedArguments = new StringBuilder();
+                int skippingDepth = 0;
+                for (int k = 0; k < arguments.length(); k++) {
+                    char c = arguments.charAt(k);
+                    if (c == '<') {
+                        skippingDepth++;
+                    }
+                    else if (c == '>') {
+                        skippingDepth--;
+                    }
+                    else if (skippingDepth == 0) {
+                        strippedArguments.append(c);
+                    }
+                }
+
+                String strippedArgumentsStr = strippedArguments.toString();
+                String[] args = strippedArgumentsStr.split("\\s*,\\s*");
+
+                for (String typeName : CLASS_NAMES) {
+                    String typeNameSpaced = typeName + " ";
+                    for (int k = 0; k < args.length; k++) {
+                        String typeDef = args[k];
+                        if (typeDef.contains(typeNameSpaced)
+                                && !typeDef.contains("@NonNull")
+                                && !typeDef.contains("@Nullable")) {
+
+                            if (!line.contains("@Nullable " + typeName)
+                                    && !line.contains("@NonNull " + typeName)) {
+                                errorCount++;
+                                errors.append("L")
+                                .append(j)
+                                .append(" - argument ").append(k + 1).append(" - ").append(typeDef)
+                                .append(" : Missing argument type nullability annotation |\r\n    ")
+                                .append(strippedArgumentsStr)
+                                .append("\r\n")
+                                .append(" at ")
+                                .append(fullClassName)
+                                .append(".method(")
+                                .append(f.getName())
+                                .append(":")
+                                .append(j + 1)
+                                .append(")\r\n")
+                                ;
+                            }
+                        }
+                    }
+                }
+
+                if (strippedArgumentsStr.contains("...") && !hasSafeVarargsAnnotation) {
+                    errorCount++;
+                    errors.append("L")
+                    .append(j)
+                    .append(" : Missing @SafeVarargs annotation |\r\n    ")
+                    .append(strippedArgumentsStr)
+                    .append("\r\n")
+                    .append(" at ")
+                    .append(fullClassName)
+                    .append(".method(")
+                    .append(f.getName())
+                    .append(":")
+                    .append(j + 1)
+                    .append(")\r\n")
+                    ;
+                }
+            }
+        }
+
+        if (errorCount != 0) {
+            errors.insert(0, errorCount + " missing annotations\r\n");
+            errors.setLength(errors.length() - 2);
+            throw new AssertionError(errors.toString());
+        }
+    }
+
+    static final List<String> CLASS_NAMES = Arrays.asList(
+            "TimeUnit", "Scheduler", "Emitter",
+
+            "Completable", "CompletableSource", "CompletableObserver", "CompletableOnSubscribe",
+            "CompletableTransformer", "CompletableOperator", "CompletableEmitter", "CompletableConverter",
+
+            "Single", "SingleSource", "SingleObserver", "SingleOnSubscribe",
+            "SingleTransformer", "SingleOperator", "SingleEmitter", "SingleConverter",
+
+            "Maybe", "MaybeSource", "MaybeObserver", "MaybeOnSubscribe",
+            "MaybeTransformer", "MaybeOperator", "MaybeEmitter", "MaybeConverter",
+
+            "Observable", "ObservableSource", "Observer", "ObservableOnSubscribe",
+            "ObservableTransformer", "ObservableOperator", "ObservableEmitter", "ObservableConverter",
+
+            "Flowable", "Publisher", "Subscriber", "FlowableSubscriber", "FlowableOnSubscribe",
+            "FlowableTransformer", "FlowableOperator", "FlowableEmitter", "FlowableConverter",
+
+            "Function", "BiFunction", "Function3", "Function4", "Function5", "Function6",
+            "Function7", "Function8", "Function9",
+
+            "Action", "Runnable", "Consumer", "BiConsumer", "Supplier", "Callable", "Void",
+            "Throwable", "Optional", "CompletionStage", "BooleanSupplier", "LongConsumer",
+            "Predicate", "BiPredicate", "Object",
+
+            "BackpressureOverflowStrategy", "BackpressureStrategy",
+            "Subject", "Processor", "FlowableProcessor",
+
+            "T", "R", "U", "V"
+    );
+}

From 480889c58d3b762b073ef80229bf27f9d9429dd7 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 25 Dec 2019 23:52:13 +0100
Subject: [PATCH 023/665] 3.x: Add missing annotations, fix many diamonds
 (#6795)

* 3.x: Add missing annotations, fix many diamonds

* Fix accidental JDK 9 API usage

* Fix NPE in unicast due to null-cleanup
---
 .../reactivex/rxjava3/core/Completable.java   |    2 +-
 .../io/reactivex/rxjava3/core/Flowable.java   |   36 +-
 .../java/io/reactivex/rxjava3/core/Maybe.java |   26 +-
 .../io/reactivex/rxjava3/core/Observable.java | 1565 +++++++++++------
 .../io/reactivex/rxjava3/core/Single.java     |   10 +-
 .../disposables/CompositeDisposable.java      |   10 +-
 .../rxjava3/disposables/SerialDisposable.java |    4 +-
 .../exceptions/CompositeException.java        |    6 +-
 .../flowables/ConnectableFlowable.java        |   65 +-
 .../rxjava3/internal/functions/Functions.java |   53 +-
 .../observables/ConnectableObservable.java    |   53 +-
 .../rxjava3/parallel/ParallelFlowable.java    |  479 ++++-
 .../rxjava3/processors/AsyncProcessor.java    |   12 +-
 .../rxjava3/processors/BehaviorProcessor.java |   24 +-
 .../rxjava3/processors/FlowableProcessor.java |    6 +-
 .../processors/MulticastProcessor.java        |   25 +-
 .../rxjava3/processors/PublishProcessor.java  |   11 +-
 .../rxjava3/processors/ReplayProcessor.java   |   49 +-
 .../processors/SerializedProcessor.java       |    8 +-
 .../rxjava3/processors/UnicastProcessor.java  |   58 +-
 .../rxjava3/schedulers/TestScheduler.java     |    2 +-
 .../rxjava3/subjects/AsyncSubject.java        |   12 +-
 .../rxjava3/subjects/BehaviorSubject.java     |   23 +-
 .../rxjava3/subjects/CompletableSubject.java  |    2 +-
 .../rxjava3/subjects/MaybeSubject.java        |    6 +-
 .../rxjava3/subjects/PublishSubject.java      |   10 +-
 .../rxjava3/subjects/ReplaySubject.java       |   52 +-
 .../rxjava3/subjects/SerializedSubject.java   |    8 +-
 .../rxjava3/subjects/SingleSubject.java       |    6 +-
 .../reactivex/rxjava3/subjects/Subject.java   |    7 +-
 .../rxjava3/subjects/UnicastSubject.java      |   60 +-
 .../reactivex/rxjava3/core/ConverterTest.java |   10 +
 .../rxjava3/core/TransformerTest.java         |    4 +-
 .../flowable/FlowableConversionTest.java      |    2 +-
 .../internal/functions/FunctionsTest.java     |   56 -
 .../flowable/FlowableCombineLatestTest.java   |    2 +-
 .../operators/flowable/FlowableRetryTest.java |    2 +-
 .../operators/flowable/FlowableZipTest.java   |    2 +-
 .../ObservableConcatMapEagerTest.java         |    2 -
 .../observable/ObservableConcatTest.java      |   11 -
 .../ObservableMergeDelayErrorTest.java        |    1 -
 .../observable/ObservableMergeTest.java       |    1 -
 .../observable/ObservableRetryTest.java       |    2 +-
 .../io/reactivex/rxjava3/maybe/MaybeTest.java |    2 +-
 .../observable/ObservableNullTests.java       |    3 -
 .../parallel/ParallelFlowableTest.java        |    1 -
 .../parallel/ParallelReduceFullTest.java      |    1 -
 .../parallel/ParallelSortedJoinTest.java      |    1 -
 .../rxjava3/subjects/UnicastSubjectTest.java  |    2 +-
 .../rxjava3/testsupport/TestHelper.java       |   25 +-
 .../validators/BaseTypeAnnotations.java       |  142 +-
 .../validators/ParamValidationNaming.java     |  235 +++
 .../validators/SourceAnnotationCheck.java     |  191 +-
 53 files changed, 2441 insertions(+), 947 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 46ec666337..00591742e4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2335,7 +2335,7 @@ public final void subscribe(@NonNull CompletableObserver observer) {
      * applied by {@link #subscribe(CompletableObserver)} before this method gets called.
      * @param observer the CompletableObserver instance, never null
      */
-    protected abstract void subscribeActual(CompletableObserver observer);
+    protected abstract void subscribeActual(@NonNull CompletableObserver observer);
 
     /**
      * Subscribes a given CompletableObserver (subclass) to this Completable and returns the given
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index c5bdb06b2c..15b1864d8b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -183,7 +183,7 @@ public abstract class Flowable<T> implements Publisher<T> {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> amb(Iterable<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> amb(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableAmb<>(null, sources));
     }
@@ -232,6 +232,7 @@ public static <T> Flowable<T> ambArray(Publisher<? extends T>... sources) {
      * <em>before</em> the Flowable class is loaded.
      * @return the default internal buffer size.
      */
+    @CheckReturnValue
     public static int bufferSize() {
         return BUFFER_SIZE;
     }
@@ -673,6 +674,7 @@ public static <T1, T2, R> Flowable<R> combineLatest(
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new Publisher[] { source1, source2 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -723,6 +725,7 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -777,6 +780,7 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -836,6 +840,7 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -899,6 +904,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -967,6 +973,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -1039,6 +1046,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -1116,6 +1124,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
         Objects.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new Publisher[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -4735,6 +4744,7 @@ public static <T1, T2, R> Flowable<R> zip(
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2);
     }
 
@@ -4796,6 +4806,7 @@ public static <T1, T2, R> Flowable<R> zip(
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize(), source1, source2);
     }
 
@@ -4858,6 +4869,7 @@ public static <T1, T2, R> Flowable<R> zip(
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize, source1, source2);
     }
 
@@ -4923,6 +4935,7 @@ public static <T1, T2, T3, R> Flowable<R> zip(
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3);
     }
 
@@ -4993,6 +5006,7 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4);
     }
 
@@ -5067,6 +5081,7 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5);
     }
 
@@ -5144,6 +5159,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6);
     }
 
@@ -5226,6 +5242,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7);
     }
 
@@ -5312,6 +5329,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8);
     }
 
@@ -5403,6 +5421,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
         Objects.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8, source9);
     }
 
@@ -6791,7 +6810,7 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator, final int initialCapacity) {
+    public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator, int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
         return buffer(boundaryIndicator, Functions.<T>createArrayList(initialCapacity));
     }
@@ -12899,7 +12918,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize) {
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, false), selector);
@@ -12942,7 +12961,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, final int bufferSize, boolean eagerTruncate) {
+    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, eagerTruncate), selector);
@@ -13551,7 +13570,7 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final ConnectableFlowable<T> replay(final long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
+    public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return FlowableReplay.create(this, time, unit, scheduler, eagerTruncate);
@@ -16930,7 +16949,7 @@ public final <U, V> Flowable<T> timeout(
             @NonNull Publisher<U> firstTimeoutIndicator,
             @NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
             @NonNull Publisher<? extends T> other) {
-        Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutSelector is null");
+        Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         Objects.requireNonNull(other, "other is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other);
     }
@@ -17152,7 +17171,7 @@ public final Single<List<T>> toList() {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Single<List<T>> toList(final int capacityHint) {
+    public final Single<List<T>> toList(int capacityHint) {
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         return RxJavaPlugins.onAssembly(new FlowableToListSingle<>(this, Functions.<T>createArrayList(capacityHint)));
     }
@@ -18470,6 +18489,7 @@ public final <U, V> Flowable<Flowable<T>> window(
             @NonNull Function3<? super T, ? super T1, ? super T2, R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
         return withLatestFrom(new Publisher[] { source1, source2 }, f);
     }
@@ -18513,6 +18533,7 @@ public final <U, V> Flowable<Flowable<T>> window(
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
         return withLatestFrom(new Publisher[] { source1, source2, source3 }, f);
     }
@@ -18559,6 +18580,7 @@ public final <U, V> Flowable<Flowable<T>> window(
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
         return withLatestFrom(new Publisher[] { source1, source2, source3, source4 }, f);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index bb0a6dcbdb..d5336f96ce 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -127,7 +127,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> amb(final Iterable<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Maybe<T> amb(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeAmb<>(null, sources));
     }
@@ -452,7 +452,7 @@ public static <T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(Iterable<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return Flowable.fromIterable(sources).concatMapDelayError((Function)MaybeToPublisher.instance());
     }
@@ -678,7 +678,7 @@ public static <T> Maybe<T> error(@NonNull Throwable exception) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier) {
-        Objects.requireNonNull(supplier, "errorSupplier is null");
+        Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new MaybeErrorCallable<T>(supplier));
     }
 
@@ -788,7 +788,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Maybe<T> fromCallable(@NonNull final Callable<? extends T> callable) {
+    public static <@NonNull T> Maybe<T> fromCallable(@NonNull Callable<? extends T> callable) {
         Objects.requireNonNull(callable, "callable is null");
         return RxJavaPlugins.onAssembly(new MaybeFromCallable<T>(callable));
     }
@@ -928,7 +928,7 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Maybe<T> fromSupplier(@NonNull final Supplier<? extends T> supplier) {
+    public static <@NonNull T> Maybe<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new MaybeFromSupplier<T>(supplier));
     }
@@ -1064,7 +1064,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? e
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
-        Objects.requireNonNull(sources, "source is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), false, maxConcurrency, 1));
     }
@@ -1449,7 +1449,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Maybe
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
-        Objects.requireNonNull(sources, "source is null");
+        Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), true, maxConcurrency, 1));
     }
@@ -1806,7 +1806,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
             @NonNull Consumer<? super D> resourceDisposer, boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
-        Objects.requireNonNull(resourceDisposer, "disposer is null");
+        Objects.requireNonNull(resourceDisposer, "resourceDisposer is null");
         return RxJavaPlugins.onAssembly(new MaybeUsing<T, D>(resourceSupplier, sourceSupplier, resourceDisposer, eager));
     }
 
@@ -1828,7 +1828,7 @@ public static <T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
         if (source instanceof Maybe) {
             return RxJavaPlugins.onAssembly((Maybe<T>)source);
         }
-        Objects.requireNonNull(source, "onSubscribe is null");
+        Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new MaybeUnsafeCreate<>(source));
     }
 
@@ -1902,6 +1902,7 @@ public static <T1, T2, R> Maybe<R> zip(
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2);
     }
 
@@ -1943,6 +1944,7 @@ public static <T1, T2, T3, R> Maybe<R> zip(
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3);
     }
 
@@ -1989,6 +1991,7 @@ public static <T1, T2, T3, T4, R> Maybe<R> zip(
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4);
     }
 
@@ -2039,6 +2042,7 @@ public static <T1, T2, T3, T4, T5, R> Maybe<R> zip(
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5);
     }
 
@@ -2093,6 +2097,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Maybe<R> zip(
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6);
     }
 
@@ -2152,6 +2157,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Maybe<R> zip(
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7);
     }
 
@@ -2215,6 +2221,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Maybe<R> zip(
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8);
     }
 
@@ -2282,6 +2289,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
         Objects.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8, source9);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 42d7f3d00a..16e1454af3 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -118,7 +118,7 @@ public abstract class Observable<T> implements ObservableSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> amb(Iterable<? extends ObservableSource<? extends T>> sources) {
+    public static <T> Observable<T> amb(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableAmb<>(null, sources));
     }
@@ -146,7 +146,7 @@ public static <T> Observable<T> amb(Iterable<? extends ObservableSource<? extend
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Observable<T> ambArray(ObservableSource<? extends T>... sources) {
+    public static <T> Observable<T> ambArray(@NonNull ObservableSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         int len = sources.length;
         if (len == 0) {
@@ -165,6 +165,7 @@ public static <T> Observable<T> ambArray(ObservableSource<? extends T>... source
      * <em>before</em> the {@link Flowable} class is loaded.
      * @return the default 'island' size or capacity-increment hint
      */
+    @CheckReturnValue
     public static int bufferSize() {
         return Flowable.bufferSize();
     }
@@ -206,8 +207,10 @@ public static int bufferSize() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatest(Iterable<? extends ObservableSource<? extends T>> sources,
-            Function<? super Object[], ? extends R> combiner) {
+    @NonNull
+    public static <T, R> Observable<R> combineLatest(
+            @NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatest(sources, combiner, bufferSize());
     }
 
@@ -251,8 +254,9 @@ public static <T, R> Observable<R> combineLatest(Iterable<? extends ObservableSo
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatest(Iterable<? extends ObservableSource<? extends T>> sources,
-            Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    public static <T, R> Observable<R> combineLatest(
+            @NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -299,8 +303,10 @@ public static <T, R> Observable<R> combineLatest(Iterable<? extends ObservableSo
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestArray(ObservableSource<? extends T>[] sources,
-            Function<? super Object[], ? extends R> combiner) {
+    @NonNull
+    public static <T, R> Observable<R> combineLatestArray(
+            @NonNull ObservableSource<? extends T>[] sources,
+            @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestArray(sources, combiner, bufferSize());
     }
 
@@ -344,8 +350,9 @@ public static <T, R> Observable<R> combineLatestArray(ObservableSource<? extends
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestArray(ObservableSource<? extends T>[] sources,
-            Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    public static <T, R> Observable<R> combineLatestArray(
+            @NonNull ObservableSource<? extends T>[] sources,
+            @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -391,10 +398,11 @@ public static <T, R> Observable<R> combineLatestArray(ObservableSource<? extends
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Observable<R> combineLatest(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> combiner) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new ObservableSource[] { source1, source2 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -434,12 +442,13 @@ public static <T1, T2, R> Observable<R> combineLatest(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, R> Observable<R> combineLatest(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            ObservableSource<? extends T3> source3,
-            Function3<? super T1, ? super T2, ? super T3, ? extends R> combiner) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull ObservableSource<? extends T3> source3,
+            @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -482,13 +491,14 @@ public static <T1, T2, T3, R> Observable<R> combineLatest(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, R> Observable<R> combineLatest(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            ObservableSource<? extends T3> source3, ObservableSource<? extends T4> source4,
-            Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combiner) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
+            @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -534,15 +544,16 @@ public static <T1, T2, T3, T4, R> Observable<R> combineLatest(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            ObservableSource<? extends T3> source3, ObservableSource<? extends T4> source4,
-            ObservableSource<? extends T5> source5,
-            Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> combiner) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
+            @NonNull ObservableSource<? extends T5> source5,
+            @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -591,16 +602,17 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            ObservableSource<? extends T3> source3, ObservableSource<? extends T4> source4,
-            ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
-            Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> combiner) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
+            @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
+            @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -652,11 +664,11 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            ObservableSource<? extends T3> source3, ObservableSource<? extends T4> source4,
-            ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
-            ObservableSource<? extends T7> source7,
-            Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> combiner) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
+            @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
+            @NonNull ObservableSource<? extends T7> source7,
+            @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -664,6 +676,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -718,11 +731,11 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            ObservableSource<? extends T3> source3, ObservableSource<? extends T4> source4,
-            ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
-            ObservableSource<? extends T7> source7, ObservableSource<? extends T8> source8,
-            Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> combiner) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
+            @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
+            @NonNull ObservableSource<? extends T7> source7, @NonNull ObservableSource<? extends T8> source8,
+            @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -731,6 +744,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -788,12 +802,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLatest(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            ObservableSource<? extends T3> source3, ObservableSource<? extends T4> source4,
-            ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
-            ObservableSource<? extends T7> source7, ObservableSource<? extends T8> source8,
-            ObservableSource<? extends T9> source9,
-            Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> combiner) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
+            @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
+            @NonNull ObservableSource<? extends T7> source7, @NonNull ObservableSource<? extends T8> source8,
+            @NonNull ObservableSource<? extends T9> source9,
+            @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -803,6 +817,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
         Objects.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(combiner, "combiner is null");
         return combineLatestArray(new ObservableSource[] { source1, source2, source3, source4, source5, source6, source7, source8, source9 }, Functions.toFunction(combiner), bufferSize());
     }
 
@@ -843,8 +858,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestDelayError(ObservableSource<? extends T>[] sources,
-            Function<? super Object[], ? extends R> combiner) {
+    @NonNull
+    public static <T, R> Observable<R> combineLatestDelayError(
+            @NonNull ObservableSource<? extends T>[] sources,
+            @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestDelayError(sources, combiner, bufferSize());
     }
 
@@ -889,8 +906,8 @@ public static <T, R> Observable<R> combineLatestDelayError(ObservableSource<? ex
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestDelayError(ObservableSource<? extends T>[] sources,
-            Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    public static <T, R> Observable<R> combineLatestDelayError(@NonNull ObservableSource<? extends T>[] sources,
+            @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(combiner, "combiner is null");
         if (sources.length == 0) {
@@ -939,8 +956,9 @@ public static <T, R> Observable<R> combineLatestDelayError(ObservableSource<? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestDelayError(Iterable<? extends ObservableSource<? extends T>> sources,
-            Function<? super Object[], ? extends R> combiner) {
+    @NonNull
+    public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestDelayError(sources, combiner, bufferSize());
     }
 
@@ -985,8 +1003,8 @@ public static <T, R> Observable<R> combineLatestDelayError(Iterable<? extends Ob
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestDelayError(Iterable<? extends ObservableSource<? extends T>> sources,
-            Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -1013,7 +1031,7 @@ public static <T, R> Observable<R> combineLatestDelayError(Iterable<? extends Ob
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(Iterable<? extends ObservableSource<? extends T>> sources) {
+    public static <T> Observable<T> concat(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, bufferSize());
     }
@@ -1037,7 +1055,8 @@ public static <T> Observable<T> concat(Iterable<? extends ObservableSource<? ext
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return concat(sources, bufferSize());
     }
 
@@ -1064,7 +1083,7 @@ public static <T> Observable<T> concat(ObservableSource<? extends ObservableSour
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch) {
+    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), prefetch, ErrorMode.IMMEDIATE));
@@ -1089,11 +1108,10 @@ public static <T> Observable<T> concat(ObservableSource<? extends ObservableSour
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
+    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
@@ -1120,13 +1138,12 @@ public static <T> Observable<T> concat(ObservableSource<? extends T> source1, Ob
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> concat(
-            ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
-            ObservableSource<? extends T> source3) {
+            @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
+            @NonNull ObservableSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1156,13 +1173,12 @@ public static <T> Observable<T> concat(
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> concat(
-            ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
-            ObservableSource<? extends T> source3, ObservableSource<? extends T> source4) {
+            @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
+            @NonNull ObservableSource<? extends T> source3, @NonNull ObservableSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1188,7 +1204,9 @@ public static <T> Observable<T> concat(
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatArray(ObservableSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Observable<T> concatArray(@NonNull ObservableSource<? extends T>... sources) {
         if (sources.length == 0) {
             return empty();
         }
@@ -1212,15 +1230,18 @@ public static <T> Observable<T> concatArray(ObservableSource<? extends T>... sou
      * @return the new Observable instance
      * @throws NullPointerException if sources is null
      */
-    @SuppressWarnings({ "unchecked" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatArrayDelayError(ObservableSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Observable<T> concatArrayDelayError(@NonNull ObservableSource<? extends T>... sources) {
         if (sources.length == 0) {
             return empty();
         }
         if (sources.length == 1) {
-            return (Observable<T>)wrap(sources[0]);
+            @SuppressWarnings("unchecked")
+            Observable<T> source = (Observable<T>)wrap(sources[0]);
+            return source;
         }
         return concatDelayError(fromArray(sources));
     }
@@ -1245,7 +1266,8 @@ public static <T> Observable<T> concatArrayDelayError(ObservableSource<? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Observable<T> concatArrayEager(ObservableSource<? extends T>... sources) {
+    @NonNull
+    public static <T> Observable<T> concatArrayEager(@NonNull ObservableSource<? extends T>... sources) {
         return concatArrayEager(bufferSize(), bufferSize(), sources);
     }
 
@@ -1272,7 +1294,9 @@ public static <T> Observable<T> concatArrayEager(ObservableSource<? extends T>..
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatArrayEager(int maxConcurrency, int prefetch, ObservableSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Observable<T> concatArrayEager(int maxConcurrency, int prefetch, @NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, prefetch);
     }
 
@@ -1297,7 +1321,8 @@ public static <T> Observable<T> concatArrayEager(int maxConcurrency, int prefetc
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Observable<T> concatArrayEagerDelayError(ObservableSource<? extends T>... sources) {
+    @NonNull
+    public static <T> Observable<T> concatArrayEagerDelayError(@NonNull ObservableSource<? extends T>... sources) {
         return concatArrayEagerDelayError(bufferSize(), bufferSize(), sources);
     }
 
@@ -1325,7 +1350,9 @@ public static <T> Observable<T> concatArrayEagerDelayError(ObservableSource<? ex
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, int prefetch, ObservableSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, int prefetch, @NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, prefetch);
     }
 
@@ -1346,7 +1373,7 @@ public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, i
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatDelayError(Iterable<? extends ObservableSource<? extends T>> sources) {
+    public static <T> Observable<T> concatDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return concatDelayError(fromIterable(sources));
     }
@@ -1367,7 +1394,8 @@ public static <T> Observable<T> concatDelayError(Iterable<? extends ObservableSo
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return concatDelayError(sources, bufferSize(), true);
     }
 
@@ -1392,7 +1420,7 @@ public static <T> Observable<T> concatDelayError(ObservableSource<? extends Obse
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch, boolean tillTheEnd) {
+    public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch, boolean tillTheEnd) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
@@ -1417,7 +1445,8 @@ public static <T> Observable<T> concatDelayError(ObservableSource<? extends Obse
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatEager(ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1444,7 +1473,8 @@ public static <T> Observable<T> concatEager(ObservableSource<? extends Observabl
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatEager(ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int prefetch) {
+    @NonNull
+    public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int prefetch) {
         return wrap(sources).concatMapEager((Function)Functions.identity(), maxConcurrency, prefetch);
     }
 
@@ -1467,7 +1497,8 @@ public static <T> Observable<T> concatEager(ObservableSource<? extends Observabl
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatEager(Iterable<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> concatEager(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1494,7 +1525,8 @@ public static <T> Observable<T> concatEager(Iterable<? extends ObservableSource<
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatEager(Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int prefetch) {
+    @NonNull
+    public static <T> Observable<T> concatEager(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int prefetch) {
         return fromIterable(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, prefetch);
     }
 
@@ -1551,7 +1583,7 @@ public static <T> Observable<T> concatEager(Iterable<? extends ObservableSource<
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> create(ObservableOnSubscribe<T> source) {
+    public static <T> Observable<T> create(@NonNull ObservableOnSubscribe<T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new ObservableCreate<>(source));
     }
@@ -1583,7 +1615,7 @@ public static <T> Observable<T> create(ObservableOnSubscribe<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> defer(Supplier<? extends ObservableSource<? extends T>> supplier) {
+    public static <T> Observable<T> defer(@NonNull Supplier<? extends ObservableSource<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableDefer<>(supplier));
     }
@@ -1607,6 +1639,7 @@ public static <T> Observable<T> defer(Supplier<? extends ObservableSource<? exte
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Observable<T> empty() {
         return RxJavaPlugins.onAssembly((Observable<T>) ObservableEmpty.INSTANCE);
     }
@@ -1632,7 +1665,7 @@ public static <T> Observable<T> empty() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> error(Supplier<? extends Throwable> errorSupplier) {
+    public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> errorSupplier) {
         Objects.requireNonNull(errorSupplier, "errorSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableError<T>(errorSupplier));
     }
@@ -1658,7 +1691,7 @@ public static <T> Observable<T> error(Supplier<? extends Throwable> errorSupplie
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> error(final Throwable exception) {
+    public static <T> Observable<T> error(@NonNull Throwable exception) {
         Objects.requireNonNull(exception, "exception is null");
         return error(Functions.justSupplier(exception));
     }
@@ -1683,7 +1716,7 @@ public static <T> Observable<T> error(final Throwable exception) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> fromArray(T... items) {
+    public static <T> Observable<T> fromArray(@NonNull T... items) {
         Objects.requireNonNull(items, "items is null");
         if (items.length == 0) {
             return empty();
@@ -1726,7 +1759,7 @@ public static <T> Observable<T> fromArray(T... items) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromCallable(Callable<? extends T> supplier) {
+    public static <T> Observable<T> fromCallable(@NonNull Callable<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableFromCallable<T>(supplier));
     }
@@ -1760,7 +1793,7 @@ public static <T> Observable<T> fromCallable(Callable<? extends T> supplier) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromFuture(Future<? extends T> future) {
+    public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future) {
         Objects.requireNonNull(future, "future is null");
         return RxJavaPlugins.onAssembly(new ObservableFromFuture<T>(future, 0L, null));
     }
@@ -1798,7 +1831,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit) {
+    public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
         Objects.requireNonNull(future, "future is null");
         Objects.requireNonNull(unit, "unit is null");
         return RxJavaPlugins.onAssembly(new ObservableFromFuture<T>(future, timeout, unit));
@@ -1840,7 +1873,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, long time
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <T> Observable<T> fromFuture(Future<? extends T> future, long timeout, TimeUnit unit, Scheduler scheduler) {
+    public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         Observable<T> o = fromFuture(future, timeout, unit);
         return o.subscribeOn(scheduler);
@@ -1876,7 +1909,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, long time
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <T> Observable<T> fromFuture(Future<? extends T> future, Scheduler scheduler) {
+    public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         Observable<T> o = fromFuture(future);
         return o.subscribeOn(scheduler);
@@ -1902,7 +1935,7 @@ public static <T> Observable<T> fromFuture(Future<? extends T> future, Scheduler
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromIterable(Iterable<? extends T> source) {
+    public static <T> Observable<T> fromIterable(@NonNull Iterable<? extends T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new ObservableFromIterable<T>(source));
     }
@@ -1939,7 +1972,7 @@ public static <T> Observable<T> fromIterable(Iterable<? extends T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromPublisher(Publisher<? extends T> publisher) {
+    public static <T> Observable<T> fromPublisher(@NonNull Publisher<? extends T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new ObservableFromPublisher<T>(publisher));
     }
@@ -1976,7 +2009,7 @@ public static <T> Observable<T> fromPublisher(Publisher<? extends T> publisher)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromSupplier(Supplier<? extends T> supplier) {
+    public static <T> Observable<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableFromSupplier<T>(supplier));
     }
@@ -2005,7 +2038,7 @@ public static <T> Observable<T> fromSupplier(Supplier<? extends T> supplier) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> generate(final Consumer<Emitter<T>> generator) {
+    public static <T> Observable<T> generate(@NonNull Consumer<Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(Functions.<Object>nullSupplier(),
                 ObservableInternalHelper.simpleGenerator(generator), Functions.<Object>emptyConsumer());
@@ -2037,7 +2070,7 @@ public static <T> Observable<T> generate(final Consumer<Emitter<T>> generator) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Observable<T> generate(Supplier<S> initialState, final BiConsumer<S, Emitter<T>> generator) {
+    public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, ObservableInternalHelper.simpleBiGenerator(generator), Functions.emptyConsumer());
     }
@@ -2071,9 +2104,9 @@ public static <T, S> Observable<T> generate(Supplier<S> initialState, final BiCo
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, S> Observable<T> generate(
-            final Supplier<S> initialState,
-            final BiConsumer<S, Emitter<T>> generator,
-            Consumer<? super S> disposeState) {
+            @NonNull Supplier<S> initialState,
+            @NonNull BiConsumer<S, Emitter<T>> generator,
+            @NonNull Consumer<? super S> disposeState) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, ObservableInternalHelper.simpleBiGenerator(generator), disposeState);
     }
@@ -2104,7 +2137,8 @@ public static <T, S> Observable<T> generate(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Observable<T> generate(Supplier<S> initialState, BiFunction<S, Emitter<T>, S> generator) {
+    @NonNull
+    public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, Emitter<T>, S> generator) {
         return generate(initialState, generator, Functions.emptyConsumer());
     }
 
@@ -2137,8 +2171,8 @@ public static <T, S> Observable<T> generate(Supplier<S> initialState, BiFunction
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Observable<T> generate(Supplier<S> initialState, BiFunction<S, Emitter<T>, S> generator,
-            Consumer<? super S> disposeState) {
+    public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, Emitter<T>, S> generator,
+            @NonNull Consumer<? super S> disposeState) {
         Objects.requireNonNull(initialState, "initialState is null");
         Objects.requireNonNull(generator, "generator is null");
         Objects.requireNonNull(disposeState, "disposeState is null");
@@ -2168,7 +2202,8 @@ public static <T, S> Observable<T> generate(Supplier<S> initialState, BiFunction
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Observable<Long> interval(long initialDelay, long period, TimeUnit unit) {
+    @NonNull
+    public static Observable<Long> interval(long initialDelay, long period, @NonNull TimeUnit unit) {
         return interval(initialDelay, period, unit, Schedulers.computation());
     }
 
@@ -2198,7 +2233,7 @@ public static Observable<Long> interval(long initialDelay, long period, TimeUnit
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Observable<Long> interval(long initialDelay, long period, TimeUnit unit, Scheduler scheduler) {
+    public static Observable<Long> interval(long initialDelay, long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
 
@@ -2223,7 +2258,8 @@ public static Observable<Long> interval(long initialDelay, long period, TimeUnit
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Observable<Long> interval(long period, TimeUnit unit) {
+    @NonNull
+    public static Observable<Long> interval(long period, @NonNull TimeUnit unit) {
         return interval(period, period, unit, Schedulers.computation());
     }
 
@@ -2248,7 +2284,8 @@ public static Observable<Long> interval(long period, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Observable<Long> interval(long period, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public static Observable<Long> interval(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return interval(period, period, unit, scheduler);
     }
 
@@ -2271,7 +2308,8 @@ public static Observable<Long> interval(long period, TimeUnit unit, Scheduler sc
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Observable<Long> intervalRange(long start, long count, long initialDelay, long period, TimeUnit unit) {
+    @NonNull
+    public static Observable<Long> intervalRange(long start, long count, long initialDelay, long period, @NonNull TimeUnit unit) {
         return intervalRange(start, count, initialDelay, period, unit, Schedulers.computation());
     }
 
@@ -2295,7 +2333,7 @@ public static Observable<Long> intervalRange(long start, long count, long initia
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Observable<Long> intervalRange(long start, long count, long initialDelay, long period, TimeUnit unit, Scheduler scheduler) {
+    public static Observable<Long> intervalRange(long start, long count, long initialDelay, long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         if (count < 0) {
             throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
@@ -2345,7 +2383,7 @@ public static Observable<Long> intervalRange(long start, long count, long initia
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item) {
+    public static <T> Observable<T> just(@NonNull T item) {
         Objects.requireNonNull(item, "item is null");
         return RxJavaPlugins.onAssembly(new ObservableJust<>(item));
     }
@@ -2371,7 +2409,7 @@ public static <T> Observable<T> just(T item) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item1, T item2) {
+    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
 
@@ -2401,7 +2439,7 @@ public static <T> Observable<T> just(T item1, T item2) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item1, T item2, T item3) {
+    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2434,7 +2472,7 @@ public static <T> Observable<T> just(T item1, T item2, T item3) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item1, T item2, T item3, T item4) {
+    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2470,7 +2508,7 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5) {
+    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2509,7 +2547,7 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6) {
+    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2551,7 +2589,7 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7) {
+    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2596,7 +2634,7 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8) {
+    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2644,7 +2682,7 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9) {
+    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8, @NonNull T item9) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2695,7 +2733,7 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5, T item6, T item7, T item8, T item9, T item10) {
+    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8, @NonNull T item9, @NonNull T item10) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2753,7 +2791,8 @@ public static <T> Observable<T> just(T item1, T item2, T item3, T item4, T item5
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> merge(Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    @NonNull
+    public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -2800,7 +2839,9 @@ public static <T> Observable<T> merge(Iterable<? extends ObservableSource<? exte
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, ObservableSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -2840,7 +2881,8 @@ public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, O
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> merge(Iterable<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity());
     }
 
@@ -2885,7 +2927,8 @@ public static <T> Observable<T> merge(Iterable<? extends ObservableSource<? exte
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> merge(Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    @NonNull
+    public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), maxConcurrency);
     }
 
@@ -2926,7 +2969,8 @@ public static <T> Observable<T> merge(Iterable<? extends ObservableSource<? exte
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Observable<T> merge(ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> merge(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), false, Integer.MAX_VALUE, bufferSize()));
     }
@@ -2974,7 +3018,8 @@ public static <T> Observable<T> merge(ObservableSource<? extends ObservableSourc
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> merge(ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    @NonNull
+    public static <T> Observable<T> merge(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), false, maxConcurrency, bufferSize()));
@@ -3017,7 +3062,8 @@ public static <T> Observable<T> merge(ObservableSource<? extends ObservableSourc
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> merge(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
+    @NonNull
+    public static <T> Observable<T> merge(@NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), false, 2);
@@ -3062,7 +3108,10 @@ public static <T> Observable<T> merge(ObservableSource<? extends T> source1, Obs
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> merge(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2, ObservableSource<? extends T> source3) {
+    @NonNull
+    public static <T> Observable<T> merge(
+            @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
+            @NonNull ObservableSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3110,9 +3159,10 @@ public static <T> Observable<T> merge(ObservableSource<? extends T> source1, Obs
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T> Observable<T> merge(
-            ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
-            ObservableSource<? extends T> source3, ObservableSource<? extends T> source4) {
+            @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
+            @NonNull ObservableSource<? extends T> source3, @NonNull ObservableSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3155,7 +3205,9 @@ public static <T> Observable<T> merge(
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeArray(ObservableSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Observable<T> mergeArray(@NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), sources.length);
     }
 
@@ -3187,7 +3239,8 @@ public static <T> Observable<T> mergeArray(ObservableSource<? extends T>... sour
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeDelayError(Iterable<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true);
     }
 
@@ -3223,7 +3276,8 @@ public static <T> Observable<T> mergeDelayError(Iterable<? extends ObservableSou
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeDelayError(Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    @NonNull
+    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -3259,7 +3313,9 @@ public static <T> Observable<T> mergeDelayError(Iterable<? extends ObservableSou
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, ObservableSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -3293,7 +3349,8 @@ public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int buf
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeDelayError(Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    @NonNull
+    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency);
     }
 
@@ -3325,7 +3382,8 @@ public static <T> Observable<T> mergeDelayError(Iterable<? extends ObservableSou
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Observable<T> mergeDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), true, Integer.MAX_VALUE, bufferSize()));
     }
@@ -3362,7 +3420,8 @@ public static <T> Observable<T> mergeDelayError(ObservableSource<? extends Obser
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    @NonNull
+    public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), true, maxConcurrency, bufferSize()));
@@ -3397,7 +3456,9 @@ public static <T> Observable<T> mergeDelayError(ObservableSource<? extends Obser
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeDelayError(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
+    @NonNull
+    public static <T> Observable<T> mergeDelayError(
+            @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), true, 2);
@@ -3435,7 +3496,10 @@ public static <T> Observable<T> mergeDelayError(ObservableSource<? extends T> so
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeDelayError(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2, ObservableSource<? extends T> source3) {
+    @NonNull
+    public static <T> Observable<T> mergeDelayError(
+            @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
+            @NonNull ObservableSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3476,9 +3540,10 @@ public static <T> Observable<T> mergeDelayError(ObservableSource<? extends T> so
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T> Observable<T> mergeDelayError(
-            ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
-            ObservableSource<? extends T> source3, ObservableSource<? extends T> source4) {
+            @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
+            @NonNull ObservableSource<? extends T> source3, @NonNull ObservableSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3514,7 +3579,9 @@ public static <T> Observable<T> mergeDelayError(
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> mergeArrayDelayError(ObservableSource<? extends T>... sources) {
+    @NonNull
+    @SafeVarargs
+    public static <T> Observable<T> mergeArrayDelayError(@NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, sources.length);
     }
 
@@ -3537,6 +3604,7 @@ public static <T> Observable<T> mergeArrayDelayError(ObservableSource<? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Observable<T> never() {
         return RxJavaPlugins.onAssembly((Observable<T>) ObservableNever.INSTANCE);
     }
@@ -3562,7 +3630,8 @@ public static <T> Observable<T> never() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Observable<Integer> range(final int start, final int count) {
+    @NonNull
+    public static Observable<Integer> range(int start, int count) {
         if (count < 0) {
             throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
@@ -3599,6 +3668,7 @@ public static Observable<Integer> range(final int start, final int count) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static Observable<Long> rangeLong(long start, long count) {
         if (count < 0) {
             throw new IllegalArgumentException("count >= 0 required but it was " + count);
@@ -3641,7 +3711,8 @@ public static Observable<Long> rangeLong(long start, long count) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
+    @NonNull
+    public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize());
     }
 
@@ -3670,8 +3741,10 @@ public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> so
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
-            BiPredicate<? super T, ? super T> isEqual) {
+    @NonNull
+    public static <T> Single<Boolean> sequenceEqual(
+            @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
+            @NonNull BiPredicate<? super T, ? super T> isEqual) {
         return sequenceEqual(source1, source2, isEqual, bufferSize());
     }
 
@@ -3702,8 +3775,10 @@ public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> so
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
-            BiPredicate<? super T, ? super T> isEqual, int bufferSize) {
+    @NonNull
+    public static <T> Single<Boolean> sequenceEqual(
+            @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
+            @NonNull BiPredicate<? super T, ? super T> isEqual, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(isEqual, "isEqual is null");
@@ -3734,7 +3809,8 @@ public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> so
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> source1, ObservableSource<? extends T> source2,
+    @NonNull
+    public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             int bufferSize) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize);
     }
@@ -3769,7 +3845,8 @@ public static <T> Single<Boolean> sequenceEqual(ObservableSource<? extends T> so
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> switchOnNext(ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
+    @NonNull
+    public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), bufferSize, false));
@@ -3802,7 +3879,8 @@ public static <T> Observable<T> switchOnNext(ObservableSource<? extends Observab
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> switchOnNext(ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return switchOnNext(sources, bufferSize());
     }
 
@@ -3835,7 +3913,8 @@ public static <T> Observable<T> switchOnNext(ObservableSource<? extends Observab
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> switchOnNextDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    @NonNull
+    public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return switchOnNextDelayError(sources, bufferSize());
     }
 
@@ -3871,7 +3950,8 @@ public static <T> Observable<T> switchOnNextDelayError(ObservableSource<? extend
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> switchOnNextDelayError(ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch) {
+    @NonNull
+    public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), prefetch, true));
@@ -3895,7 +3975,8 @@ public static <T> Observable<T> switchOnNextDelayError(ObservableSource<? extend
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public static Observable<Long> timer(long delay, TimeUnit unit) {
+    @NonNull
+    public static Observable<Long> timer(long delay, @NonNull TimeUnit unit) {
         return timer(delay, unit, Schedulers.computation());
     }
 
@@ -3924,7 +4005,8 @@ public static Observable<Long> timer(long delay, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static Observable<Long> timer(long delay, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public static Observable<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
 
@@ -3945,7 +4027,8 @@ public static Observable<Long> timer(long delay, TimeUnit unit, Scheduler schedu
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> unsafeCreate(ObservableSource<T> onSubscribe) {
+    @NonNull
+    public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         if (onSubscribe instanceof Observable) {
             throw new IllegalArgumentException("unsafeCreate(Observable) should be upgraded");
@@ -3976,7 +4059,11 @@ public static <T> Observable<T> unsafeCreate(ObservableSource<T> onSubscribe) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, D> Observable<T> using(Supplier<? extends D> resourceSupplier, Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier, Consumer<? super D> disposer) {
+    @NonNull
+    public static <T, D> Observable<T> using(
+            @NonNull Supplier<? extends D> resourceSupplier,
+            @NonNull Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier,
+            @NonNull Consumer<? super D> disposer) {
         return using(resourceSupplier, sourceSupplier, disposer, true);
     }
 
@@ -4012,7 +4099,11 @@ public static <T, D> Observable<T> using(Supplier<? extends D> resourceSupplier,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, D> Observable<T> using(Supplier<? extends D> resourceSupplier, Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier, Consumer<? super D> disposer, boolean eager) {
+    @NonNull
+    public static <T, D> Observable<T> using(
+            @NonNull Supplier<? extends D> resourceSupplier,
+            @NonNull Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier,
+            @NonNull Consumer<? super D> disposer, boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
         Objects.requireNonNull(disposer, "disposer is null");
@@ -4034,7 +4125,8 @@ public static <T, D> Observable<T> using(Supplier<? extends D> resourceSupplier,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> wrap(ObservableSource<T> source) {
+    @NonNull
+    public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
         Objects.requireNonNull(source, "source is null");
         if (source instanceof Observable) {
             return RxJavaPlugins.onAssembly((Observable<T>)source);
@@ -4089,7 +4181,8 @@ public static <T> Observable<T> wrap(ObservableSource<T> source) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> zip(Iterable<? extends ObservableSource<? extends T>> sources, Function<? super Object[], ? extends R> zipper) {
+    @NonNull
+    public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableZip<T, R>(null, sources, zipper, bufferSize(), false));
@@ -4147,8 +4240,9 @@ public static <T, R> Observable<R> zip(Iterable<? extends ObservableSource<? ext
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> zip(Iterable<? extends ObservableSource<? extends T>> sources,
-            Function<? super Object[], ? extends R> zipper, boolean delayError,
+    @NonNull
+    public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> zipper, boolean delayError,
             int bufferSize) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
@@ -4202,11 +4296,13 @@ public static <T, R> Observable<R> zip(Iterable<? extends ObservableSource<? ext
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> zipper) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2);
     }
 
@@ -4257,11 +4353,13 @@ public static <T1, T2, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize(), source1, source2);
     }
 
@@ -4313,11 +4411,13 @@ public static <T1, T2, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2,
-            BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), delayError, bufferSize, source1, source2);
     }
 
@@ -4371,12 +4471,15 @@ public static <T1, T2, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, T3, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
-            Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull ObservableSource<? extends T3> source3,
+            @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3);
     }
 
@@ -4433,14 +4536,16 @@ public static <T1, T2, T3, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, T3, T4, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
-            ObservableSource<? extends T4> source4,
-            Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
+            @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
+            @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4);
     }
 
@@ -4500,15 +4605,17 @@ public static <T1, T2, T3, T4, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
-            ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5,
-            Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
+            @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5,
+            @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5);
     }
 
@@ -4570,16 +4677,18 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
-            ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
-            Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
+            @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
+            @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6);
     }
 
@@ -4644,11 +4753,12 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
-            ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
-            ObservableSource<? extends T7> source7,
-            Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
+            @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
+            @NonNull ObservableSource<? extends T7> source7,
+            @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -4656,6 +4766,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7);
     }
 
@@ -4723,11 +4834,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
-            ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
-            ObservableSource<? extends T7> source7, ObservableSource<? extends T8> source8,
-            Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
+            @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
+            @NonNull ObservableSource<? extends T7> source7, @NonNull ObservableSource<? extends T8> source8,
+            @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -4736,6 +4848,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8);
     }
 
@@ -4806,11 +4919,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
-            ObservableSource<? extends T1> source1, ObservableSource<? extends T2> source2, ObservableSource<? extends T3> source3,
-            ObservableSource<? extends T4> source4, ObservableSource<? extends T5> source5, ObservableSource<? extends T6> source6,
-            ObservableSource<? extends T7> source7, ObservableSource<? extends T8> source8, ObservableSource<? extends T9> source9,
-            Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
+            @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
+            @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
+            @NonNull ObservableSource<? extends T7> source7, @NonNull ObservableSource<? extends T8> source8, @NonNull ObservableSource<? extends T9> source9,
+            @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -4820,6 +4934,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
         Objects.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), false, bufferSize(), source1, source2, source3, source4, source5, source6, source7, source8, source9);
     }
 
@@ -4876,8 +4991,11 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T, R> Observable<R> zipArray(Function<? super Object[], ? extends R> zipper,
-            boolean delayError, int bufferSize, ObservableSource<? extends T>... sources) {
+    @NonNull
+    public static <T, R> Observable<R> zipArray(
+            @NonNull Function<? super Object[], ? extends R> zipper,
+            boolean delayError, int bufferSize,
+            @NonNull ObservableSource<? extends T>... sources) {
         if (sources.length == 0) {
             return empty();
         }
@@ -4908,7 +5026,8 @@ public static <T, R> Observable<R> zipArray(Function<? super Object[], ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> all(Predicate<? super T> predicate) {
+    @NonNull
+    public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableAllSingle<>(this, predicate));
     }
@@ -4932,7 +5051,8 @@ public final Single<Boolean> all(Predicate<? super T> predicate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> ambWith(ObservableSource<? extends T> other) {
+    @NonNull
+    public final Observable<T> ambWith(@NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
@@ -4959,7 +5079,8 @@ public final Observable<T> ambWith(ObservableSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> any(Predicate<? super T> predicate) {
+    @NonNull
+    public final Single<Boolean> any(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableAnySingle<>(this, predicate));
     }
@@ -4981,6 +5102,7 @@ public final Single<Boolean> any(Predicate<? super T> predicate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final T blockingFirst() {
         BlockingFirstObserver<T> observer = new BlockingFirstObserver<>();
         subscribe(observer);
@@ -5009,7 +5131,8 @@ public final T blockingFirst() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final T blockingFirst(T defaultItem) {
+    @NonNull
+    public final T blockingFirst(@NonNull T defaultItem) {
         BlockingFirstObserver<T> observer = new BlockingFirstObserver<>();
         subscribe(observer);
         T v = observer.blockingGet();
@@ -5046,7 +5169,8 @@ public final T blockingFirst(T defaultItem) {
      * @see #subscribe(Consumer)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingForEach(Consumer<? super T> onNext) {
+    @NonNull
+    public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
         Iterator<T> it = blockingIterable().iterator();
         while (it.hasNext()) {
             try {
@@ -5073,6 +5197,7 @@ public final void blockingForEach(Consumer<? super T> onNext) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Iterable<T> blockingIterable() {
         return blockingIterable(bufferSize());
     }
@@ -5092,6 +5217,7 @@ public final Iterable<T> blockingIterable() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Iterable<T> blockingIterable(int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return new BlockingObservableIterable<>(this, bufferSize);
@@ -5118,6 +5244,7 @@ public final Iterable<T> blockingIterable(int bufferSize) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final T blockingLast() {
         BlockingLastObserver<T> observer = new BlockingLastObserver<>();
         subscribe(observer);
@@ -5150,7 +5277,8 @@ public final T blockingLast() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final T blockingLast(T defaultItem) {
+    @NonNull
+    public final T blockingLast(@NonNull T defaultItem) {
         BlockingLastObserver<T> observer = new BlockingLastObserver<>();
         subscribe(observer);
         T v = observer.blockingGet();
@@ -5178,6 +5306,7 @@ public final T blockingLast(T defaultItem) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Iterable<T> blockingLatest() {
         return new BlockingObservableLatest<>(this);
     }
@@ -5201,7 +5330,8 @@ public final Iterable<T> blockingLatest() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Iterable<T> blockingMostRecent(T initialValue) {
+    @NonNull
+    public final Iterable<T> blockingMostRecent(@NonNull T initialValue) {
         return new BlockingObservableMostRecent<>(this, initialValue);
     }
 
@@ -5221,6 +5351,7 @@ public final Iterable<T> blockingMostRecent(T initialValue) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Iterable<T> blockingNext() {
         return new BlockingObservableNext<>(this);
     }
@@ -5244,6 +5375,7 @@ public final Iterable<T> blockingNext() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final T blockingSingle() {
         T v = singleElement().blockingGet();
         if (v == null) {
@@ -5275,7 +5407,8 @@ public final T blockingSingle() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final T blockingSingle(T defaultItem) {
+    @NonNull
+    public final T blockingSingle(@NonNull T defaultItem) {
         return single(defaultItem).blockingGet();
     }
 
@@ -5300,6 +5433,7 @@ public final T blockingSingle(T defaultItem) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Future<T> toFuture() {
         return subscribeWith(new FutureObserver<T>());
     }
@@ -5350,7 +5484,7 @@ public final void blockingSubscribe() {
      * @see #blockingSubscribe(Consumer, Consumer, Action)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Consumer<? super T> onNext) {
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onNext) {
         ObservableBlockingSubscribe.subscribe(this, onNext, Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
 
@@ -5372,7 +5506,7 @@ public final void blockingSubscribe(Consumer<? super T> onNext) {
      * @see #blockingSubscribe(Consumer, Consumer, Action)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError) {
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError) {
         ObservableBlockingSubscribe.subscribe(this, onNext, onError, Functions.EMPTY_ACTION);
     }
 
@@ -5394,7 +5528,7 @@ public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super
      * @since 2.0
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError, Action onComplete) {
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError, @NonNull Action onComplete) {
         ObservableBlockingSubscribe.subscribe(this, onNext, onError, onComplete);
     }
 
@@ -5415,7 +5549,7 @@ public final void blockingSubscribe(Consumer<? super T> onNext, Consumer<? super
      * @since 2.0
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(Observer<? super T> observer) {
+    public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
         ObservableBlockingSubscribe.subscribe(this, observer);
     }
 
@@ -5440,7 +5574,8 @@ public final void blockingSubscribe(Observer<? super T> observer) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<List<T>> buffer(int count) {
+    @NonNull
+    public final Observable<@NonNull List<T>> buffer(int count) {
         return buffer(count, count);
     }
 
@@ -5469,7 +5604,8 @@ public final Observable<List<T>> buffer(int count) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<List<T>> buffer(int count, int skip) {
+    @NonNull
+    public final Observable<@NonNull List<T>> buffer(int count, int skip) {
         return buffer(count, skip, ArrayListSupplier.<T>asSupplier());
     }
 
@@ -5502,7 +5638,8 @@ public final Observable<List<T>> buffer(int count, int skip) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U extends Collection<? super T>> Observable<U> buffer(int count, int skip, Supplier<U> bufferSupplier) {
+    @NonNull
+    public final <U extends Collection<? super T>> Observable<U> buffer(int count, int skip, @NonNull Supplier<U> bufferSupplier) {
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(skip, "skip");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
@@ -5534,7 +5671,8 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U extends Collection<? super T>> Observable<U> buffer(int count, Supplier<U> bufferSupplier) {
+    @NonNull
+    public final <@NonNull U extends Collection<? super T>> Observable<U> buffer(int count, @NonNull Supplier<U> bufferSupplier) {
         return buffer(count, count, bufferSupplier);
     }
 
@@ -5564,7 +5702,8 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, S
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<List<T>> buffer(long timespan, long timeskip, TimeUnit unit) {
+    @NonNull
+    public final Observable<@NonNull List<T>> buffer(long timespan, long timeskip, @NonNull TimeUnit unit) {
         return buffer(timespan, timeskip, unit, Schedulers.computation(), ArrayListSupplier.<T>asSupplier());
     }
 
@@ -5597,7 +5736,8 @@ public final Observable<List<T>> buffer(long timespan, long timeskip, TimeUnit u
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<List<T>> buffer(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<@NonNull List<T>> buffer(long timespan, long timeskip, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return buffer(timespan, timeskip, unit, scheduler, ArrayListSupplier.<T>asSupplier());
     }
 
@@ -5634,7 +5774,8 @@ public final Observable<List<T>> buffer(long timespan, long timeskip, TimeUnit u
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <U extends Collection<? super T>> Observable<U> buffer(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, Supplier<U> bufferSupplier) {
+    @NonNull
+    public final <@NonNull U extends Collection<? super T>> Observable<U> buffer(long timespan, long timeskip, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
@@ -5666,7 +5807,8 @@ public final <U extends Collection<? super T>> Observable<U> buffer(long timespa
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<List<T>> buffer(long timespan, TimeUnit unit) {
+    @NonNull
+    public final Observable<@NonNull List<T>> buffer(long timespan, @NonNull TimeUnit unit) {
         return buffer(timespan, unit, Schedulers.computation(), Integer.MAX_VALUE);
     }
 
@@ -5699,7 +5841,8 @@ public final Observable<List<T>> buffer(long timespan, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<List<T>> buffer(long timespan, TimeUnit unit, int count) {
+    @NonNull
+    public final Observable<@NonNull List<T>> buffer(long timespan, @NonNull TimeUnit unit, int count) {
         return buffer(timespan, unit, Schedulers.computation(), count);
     }
 
@@ -5734,7 +5877,8 @@ public final Observable<List<T>> buffer(long timespan, TimeUnit unit, int count)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler scheduler, int count) {
+    @NonNull
+    public final Observable<@NonNull List<T>> buffer(long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int count) {
         return buffer(timespan, unit, scheduler, count, ArrayListSupplier.<T>asSupplier(), false);
     }
 
@@ -5775,10 +5919,11 @@ public final Observable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <U extends Collection<? super T>> Observable<U> buffer(
-            long timespan, TimeUnit unit,
-            Scheduler scheduler, int count,
-            Supplier<U> bufferSupplier,
+    @NonNull
+    public final <@NonNull U extends Collection<? super T>> Observable<U> buffer(
+            long timespan, @NonNull TimeUnit unit,
+            @NonNull Scheduler scheduler, int count,
+            @NonNull Supplier<U> bufferSupplier,
             boolean restartTimerOnMaxSize) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -5814,7 +5959,8 @@ public final <U extends Collection<? super T>> Observable<U> buffer(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<@NonNull List<T>> buffer(long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return buffer(timespan, unit, scheduler, Integer.MAX_VALUE, ArrayListSupplier.<T>asSupplier(), false);
     }
 
@@ -5844,9 +5990,10 @@ public final Observable<List<T>> buffer(long timespan, TimeUnit unit, Scheduler
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <TOpening, TClosing> Observable<List<T>> buffer(
-            ObservableSource<? extends TOpening> openingIndicator,
-            Function<? super TOpening, ? extends ObservableSource<? extends TClosing>> closingIndicator) {
+    @NonNull
+    public final <TOpening, TClosing> Observable<@NonNull List<T>> buffer(
+            @NonNull ObservableSource<? extends TOpening> openingIndicator,
+            @NonNull Function<? super TOpening, ? extends ObservableSource<? extends TClosing>> closingIndicator) {
         return buffer(openingIndicator, closingIndicator, ArrayListSupplier.<T>asSupplier());
     }
 
@@ -5880,10 +6027,11 @@ public final <TOpening, TClosing> Observable<List<T>> buffer(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <TOpening, TClosing, U extends Collection<? super T>> Observable<U> buffer(
-            ObservableSource<? extends TOpening> openingIndicator,
-            Function<? super TOpening, ? extends ObservableSource<? extends TClosing>> closingIndicator,
-            Supplier<U> bufferSupplier) {
+    @NonNull
+    public final <TOpening, TClosing, @NonNull U extends Collection<? super T>> Observable<U> buffer(
+            @NonNull ObservableSource<? extends TOpening> openingIndicator,
+            @NonNull Function<? super TOpening, ? extends ObservableSource<? extends TClosing>> closingIndicator,
+            @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
         Objects.requireNonNull(closingIndicator, "closingIndicator is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
@@ -5916,7 +6064,8 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Observable<U>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B> Observable<List<T>> buffer(ObservableSource<B> boundary) {
+    @NonNull
+    public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundary) {
         return buffer(boundary, ArrayListSupplier.<T>asSupplier());
     }
 
@@ -5948,7 +6097,8 @@ public final <B> Observable<List<T>> buffer(ObservableSource<B> boundary) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B> Observable<List<T>> buffer(ObservableSource<B> boundary, final int initialCapacity) {
+    @NonNull
+    public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundary, int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
         return buffer(boundary, Functions.<T>createArrayList(initialCapacity));
     }
@@ -5983,7 +6133,8 @@ public final <B> Observable<List<T>> buffer(ObservableSource<B> boundary, final
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B, U extends Collection<? super T>> Observable<U> buffer(ObservableSource<B> boundary, Supplier<U> bufferSupplier) {
+    @NonNull
+    public final <B, @NonNull U extends Collection<? super T>> Observable<U> buffer(@NonNull ObservableSource<B> boundary, @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(boundary, "boundary is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableBufferExactBoundary<>(this, boundary, bufferSupplier));
@@ -6039,6 +6190,7 @@ public final <B, U extends Collection<? super T>> Observable<U> buffer(Observabl
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> cache() {
         return cacheWithInitialCapacity(16);
     }
@@ -6097,6 +6249,7 @@ public final Observable<T> cache() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
         return RxJavaPlugins.onAssembly(new ObservableCache<>(this, initialCapacity));
@@ -6122,7 +6275,8 @@ public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<U> cast(final Class<U> clazz) {
+    @NonNull
+    public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
@@ -6155,7 +6309,8 @@ public final <U> Observable<U> cast(final Class<U> clazz) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<U> collect(Supplier<? extends U> initialValueSupplier, BiConsumer<? super U, ? super T> collector) {
+    @NonNull
+    public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialValueSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
         Objects.requireNonNull(initialValueSupplier, "initialValueSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ObservableCollectSingle<T, U>(this, initialValueSupplier, collector));
@@ -6189,7 +6344,8 @@ public final <U> Single<U> collect(Supplier<? extends U> initialValueSupplier, B
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<U> collectInto(final U initialValue, BiConsumer<? super U, ? super T> collector) {
+    @NonNull
+    public final <U> Single<U> collectInto(@NonNull U initialValue, @NonNull BiConsumer<? super U, ? super T> collector) {
         Objects.requireNonNull(initialValue, "initialValue is null");
         return collect(Functions.justSupplier(initialValue), collector);
     }
@@ -6216,7 +6372,8 @@ public final <U> Single<U> collectInto(final U initialValue, BiConsumer<? super
     @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> compose(ObservableTransformer<? super T, ? extends R> composer) {
+    @NonNull
+    public final <R> Observable<R> compose(@NonNull ObservableTransformer<? super T, ? extends R> composer) {
         return wrap(((ObservableTransformer<T, R>) Objects.requireNonNull(composer, "composer is null")).apply(this));
     }
 
@@ -6246,7 +6403,8 @@ public final <R> Observable<R> compose(ObservableTransformer<? super T, ? extend
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return concatMap(mapper, 2);
     }
 
@@ -6278,7 +6436,8 @@ public final <R> Observable<R> concatMap(Function<? super T, ? extends Observabl
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper, int prefetch) {
+    @NonNull
+    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         if (this instanceof ScalarSupplier) {
@@ -6320,7 +6479,8 @@ public final <R> Observable<R> concatMap(Function<? super T, ? extends Observabl
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Observable<R> concatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper, int prefetch, Scheduler scheduler) {
+    @NonNull
+    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int prefetch, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -6350,7 +6510,8 @@ public final <R> Observable<R> concatMap(Function<? super T, ? extends Observabl
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return concatMapDelayError(mapper, true, bufferSize());
     }
 
@@ -6382,7 +6543,8 @@ public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    @NonNull
+    public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -6424,8 +6586,9 @@ public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
-            boolean tillTheEnd, int prefetch, Scheduler scheduler) {
+    @NonNull
+    public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+            boolean tillTheEnd, int prefetch, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -6453,7 +6616,8 @@ public final <R> Observable<R> concatMapDelayError(Function<? super T, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapEager(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return concatMapEager(mapper, Integer.MAX_VALUE, bufferSize());
     }
 
@@ -6480,7 +6644,8 @@ public final <R> Observable<R> concatMapEager(Function<? super T, ? extends Obse
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapEager(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    @NonNull
+    public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -6512,7 +6677,8 @@ public final <R> Observable<R> concatMapEager(Function<? super T, ? extends Obse
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapEagerDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    @NonNull
+    public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd) {
         return concatMapEagerDelayError(mapper, tillTheEnd, Integer.MAX_VALUE, bufferSize());
     }
@@ -6545,7 +6711,8 @@ public final <R> Observable<R> concatMapEagerDelayError(Function<? super T, ? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapEagerDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    @NonNull
+    public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -6570,7 +6737,8 @@ public final <R> Observable<R> concatMapEagerDelayError(Function<? super T, ? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable concatMapCompletable(Function<? super T, ? extends CompletableSource> mapper) {
+    @NonNull
+    public final Completable concatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         return concatMapCompletable(mapper, 2);
     }
 
@@ -6595,7 +6763,8 @@ public final Completable concatMapCompletable(Function<? super T, ? extends Comp
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable concatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, int capacityHint) {
+    @NonNull
+    public final Completable concatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper, int capacityHint) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<>(this, mapper, ErrorMode.IMMEDIATE, capacityHint));
@@ -6621,7 +6790,8 @@ public final Completable concatMapCompletable(Function<? super T, ? extends Comp
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable concatMapCompletableDelayError(Function<? super T, ? extends CompletableSource> mapper) {
+    @NonNull
+    public final Completable concatMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         return concatMapCompletableDelayError(mapper, true, 2);
     }
 
@@ -6651,7 +6821,8 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable concatMapCompletableDelayError(Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd) {
+    @NonNull
+    public final Completable concatMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd) {
         return concatMapCompletableDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -6685,7 +6856,8 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable concatMapCompletableDelayError(Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd, int prefetch) {
+    @NonNull
+    public final Completable concatMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
@@ -6713,7 +6885,8 @@ public final Completable concatMapCompletableDelayError(Function<? super T, ? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<U> concatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    @NonNull
+    public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
     }
@@ -6742,7 +6915,8 @@ public final <U> Observable<U> concatMapIterable(final Function<? super T, ? ext
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<U> concatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper, int prefetch) {
+    @NonNull
+    public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return concatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), prefetch);
@@ -6770,7 +6944,8 @@ public final <U> Observable<U> concatMapIterable(final Function<? super T, ? ext
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return concatMapMaybe(mapper, 2);
     }
 
@@ -6800,7 +6975,8 @@ public final <R> Observable<R> concatMapMaybe(Function<? super T, ? extends Mayb
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
+    @NonNull
+    public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
@@ -6828,7 +7004,8 @@ public final <R> Observable<R> concatMapMaybe(Function<? super T, ? extends Mayb
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return concatMapMaybeDelayError(mapper, true, 2);
     }
 
@@ -6860,7 +7037,8 @@ public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd) {
+    @NonNull
+    public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd) {
         return concatMapMaybeDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -6895,7 +7073,8 @@ public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
+    @NonNull
+    public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
@@ -6923,7 +7102,8 @@ public final <R> Observable<R> concatMapMaybeDelayError(Function<? super T, ? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return concatMapSingle(mapper, 2);
     }
 
@@ -6953,7 +7133,8 @@ public final <R> Observable<R> concatMapSingle(Function<? super T, ? extends Sin
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
+    @NonNull
+    public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
@@ -6981,7 +7162,8 @@ public final <R> Observable<R> concatMapSingle(Function<? super T, ? extends Sin
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return concatMapSingleDelayError(mapper, true, 2);
     }
 
@@ -7013,7 +7195,8 @@ public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? e
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd) {
+    @NonNull
+    public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd) {
         return concatMapSingleDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -7048,7 +7231,8 @@ public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? e
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
+    @NonNull
+    public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
@@ -7072,7 +7256,8 @@ public final <R> Observable<R> concatMapSingleDelayError(Function<? super T, ? e
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> concatWith(ObservableSource<? extends T> other) {
+    @NonNull
+    public final Observable<T> concatWith(@NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return concat(this, other);
     }
@@ -7093,6 +7278,7 @@ public final Observable<T> concatWith(ObservableSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> concatWith(@NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatWithSingle<>(this, other));
@@ -7114,6 +7300,7 @@ public final Observable<T> concatWith(@NonNull SingleSource<? extends T> other)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatWithMaybe<>(this, other));
@@ -7135,6 +7322,7 @@ public final Observable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> concatWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatWithCompletable<>(this, other));
@@ -7158,7 +7346,8 @@ public final Observable<T> concatWith(@NonNull CompletableSource other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> contains(final Object element) {
+    @NonNull
+    public final Single<Boolean> contains(@NonNull Object element) {
         Objects.requireNonNull(element, "element is null");
         return any(Functions.equalsWith(element));
     }
@@ -7179,6 +7368,7 @@ public final Single<Boolean> contains(final Object element) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<Long> count() {
         return RxJavaPlugins.onAssembly(new ObservableCountSingle<>(this));
     }
@@ -7211,7 +7401,8 @@ public final Single<Long> count() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<T> debounce(Function<? super T, ? extends ObservableSource<U>> debounceSelector) {
+    @NonNull
+    public final <U> Observable<T> debounce(@NonNull Function<? super T, ? extends ObservableSource<U>> debounceSelector) {
         Objects.requireNonNull(debounceSelector, "debounceSelector is null");
         return RxJavaPlugins.onAssembly(new ObservableDebounce<>(this, debounceSelector));
     }
@@ -7250,7 +7441,8 @@ public final <U> Observable<T> debounce(Function<? super T, ? extends Observable
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> debounce(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit) {
         return debounce(timeout, unit, Schedulers.computation());
     }
 
@@ -7290,7 +7482,8 @@ public final Observable<T> debounce(long timeout, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> debounce(long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableDebounceTimed<>(this, timeout, unit, scheduler));
@@ -7314,7 +7507,8 @@ public final Observable<T> debounce(long timeout, TimeUnit unit, Scheduler sched
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> defaultIfEmpty(T defaultItem) {
+    @NonNull
+    public final Observable<T> defaultIfEmpty(@NonNull T defaultItem) {
         Objects.requireNonNull(defaultItem, "defaultItem is null");
         return switchIfEmpty(just(defaultItem));
     }
@@ -7344,7 +7538,8 @@ public final Observable<T> defaultIfEmpty(T defaultItem) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<T> delay(final Function<? super T, ? extends ObservableSource<U>> itemDelay) {
+    @NonNull
+    public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends ObservableSource<U>> itemDelay) {
         Objects.requireNonNull(itemDelay, "itemDelay is null");
         return flatMap(ObservableInternalHelper.itemDelay(itemDelay));
     }
@@ -7368,7 +7563,8 @@ public final <U> Observable<T> delay(final Function<? super T, ? extends Observa
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> delay(long delay, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> delay(long delay, @NonNull TimeUnit unit) {
         return delay(delay, unit, Schedulers.computation(), false);
     }
 
@@ -7394,7 +7590,8 @@ public final Observable<T> delay(long delay, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> delay(long delay, TimeUnit unit, boolean delayError) {
+    @NonNull
+    public final Observable<T> delay(long delay, @NonNull TimeUnit unit, boolean delayError) {
         return delay(delay, unit, Schedulers.computation(), delayError);
     }
 
@@ -7419,7 +7616,8 @@ public final Observable<T> delay(long delay, TimeUnit unit, boolean delayError)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> delay(long delay, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return delay(delay, unit, scheduler, false);
     }
 
@@ -7447,7 +7645,8 @@ public final Observable<T> delay(long delay, TimeUnit unit, Scheduler scheduler)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> delay(long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) {
+    @NonNull
+    public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
 
@@ -7484,8 +7683,9 @@ public final Observable<T> delay(long delay, TimeUnit unit, Scheduler scheduler,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Observable<T> delay(ObservableSource<U> subscriptionDelay,
-            Function<? super T, ? extends ObservableSource<V>> itemDelay) {
+    @NonNull
+    public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptionDelay,
+            @NonNull Function<? super T, ? extends ObservableSource<V>> itemDelay) {
         return delaySubscription(subscriptionDelay).delay(itemDelay);
     }
 
@@ -7508,7 +7708,8 @@ public final <U, V> Observable<T> delay(ObservableSource<U> subscriptionDelay,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<T> delaySubscription(ObservableSource<U> other) {
+    @NonNull
+    public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableDelaySubscriptionOther<>(this, other));
     }
@@ -7531,7 +7732,8 @@ public final <U> Observable<T> delaySubscription(ObservableSource<U> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> delaySubscription(long delay, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
         return delaySubscription(delay, unit, Schedulers.computation());
     }
 
@@ -7557,7 +7759,8 @@ public final Observable<T> delaySubscription(long delay, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> delaySubscription(long delay, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return delaySubscription(timer(delay, unit, scheduler));
     }
 
@@ -7610,7 +7813,8 @@ public final Observable<T> delaySubscription(long delay, TimeUnit unit, Schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> dematerialize(Function<? super T, Notification<R>> selector) {
+    @NonNull
+    public final <R> Observable<R> dematerialize(@NonNull Function<? super T, Notification<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
         return RxJavaPlugins.onAssembly(new ObservableDematerialize<>(this, selector));
     }
@@ -7648,6 +7852,7 @@ public final <R> Observable<R> dematerialize(Function<? super T, Notification<R>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> distinct() {
         return distinct(Functions.identity(), Functions.createHashSet());
     }
@@ -7688,7 +7893,8 @@ public final Observable<T> distinct() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Observable<T> distinct(Function<? super T, K> keySelector) {
+    @NonNull
+    public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelector) {
         return distinct(keySelector, Functions.createHashSet());
     }
 
@@ -7719,7 +7925,8 @@ public final <K> Observable<T> distinct(Function<? super T, K> keySelector) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Observable<T> distinct(Function<? super T, K> keySelector, Supplier<? extends Collection<? super K>> collectionSupplier) {
+    @NonNull
+    public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelector, @NonNull Supplier<? extends Collection<? super K>> collectionSupplier) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableDistinct<>(this, keySelector, collectionSupplier));
@@ -7758,6 +7965,7 @@ public final <K> Observable<T> distinct(Function<? super T, K> keySelector, Supp
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> distinctUntilChanged() {
         return distinctUntilChanged(Functions.identity());
     }
@@ -7800,7 +8008,8 @@ public final Observable<T> distinctUntilChanged() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Observable<T> distinctUntilChanged(Function<? super T, K> keySelector) {
+    @NonNull
+    public final <K> Observable<T> distinctUntilChanged(@NonNull Function<? super T, K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<>(this, keySelector, ObjectHelper.equalsPredicate()));
     }
@@ -7834,7 +8043,8 @@ public final <K> Observable<T> distinctUntilChanged(Function<? super T, K> keySe
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> distinctUntilChanged(BiPredicate<? super T, ? super T> comparer) {
+    @NonNull
+    public final Observable<T> distinctUntilChanged(@NonNull BiPredicate<? super T, ? super T> comparer) {
         Objects.requireNonNull(comparer, "comparer is null");
         return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<>(this, Functions.<T>identity(), comparer));
     }
@@ -7858,7 +8068,8 @@ public final Observable<T> distinctUntilChanged(BiPredicate<? super T, ? super T
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doAfterNext(Consumer<? super T> onAfterNext) {
+    @NonNull
+    public final Observable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext) {
         Objects.requireNonNull(onAfterNext, "onAfterNext is null");
         return RxJavaPlugins.onAssembly(new ObservableDoAfterNext<>(this, onAfterNext));
     }
@@ -7882,7 +8093,8 @@ public final Observable<T> doAfterNext(Consumer<? super T> onAfterNext) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doAfterTerminate(Action onFinally) {
+    @NonNull
+    public final Observable<T> doAfterTerminate(@NonNull Action onFinally) {
         Objects.requireNonNull(onFinally, "onFinally is null");
         return doOnEach(Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.EMPTY_ACTION, onFinally);
     }
@@ -7909,7 +8121,8 @@ public final Observable<T> doAfterTerminate(Action onFinally) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doFinally(Action onFinally) {
+    @NonNull
+    public final Observable<T> doFinally(@NonNull Action onFinally) {
         Objects.requireNonNull(onFinally, "onFinally is null");
         return RxJavaPlugins.onAssembly(new ObservableDoFinally<>(this, onFinally));
     }
@@ -7937,7 +8150,8 @@ public final Observable<T> doFinally(Action onFinally) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doOnDispose(Action onDispose) {
+    @NonNull
+    public final Observable<T> doOnDispose(@NonNull Action onDispose) {
         return doOnLifecycle(Functions.emptyConsumer(), onDispose);
     }
 
@@ -7957,7 +8171,8 @@ public final Observable<T> doOnDispose(Action onDispose) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doOnComplete(Action onComplete) {
+    @NonNull
+    public final Observable<T> doOnComplete(@NonNull Action onComplete) {
         return doOnEach(Functions.emptyConsumer(), Functions.emptyConsumer(), onComplete, Functions.EMPTY_ACTION);
     }
 
@@ -7976,7 +8191,8 @@ public final Observable<T> doOnComplete(Action onComplete) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    private Observable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Throwable> onError, Action onComplete, Action onAfterTerminate) {
+    @NonNull
+    private Observable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError, @NonNull Action onComplete, @NonNull Action onAfterTerminate) {
         Objects.requireNonNull(onNext, "onNext is null");
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
@@ -8000,7 +8216,8 @@ private Observable<T> doOnEach(Consumer<? super T> onNext, Consumer<? super Thro
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doOnEach(final Consumer<? super Notification<T>> onNotification) {
+    @NonNull
+    public final Observable<T> doOnEach(@NonNull Consumer<? super Notification<T>> onNotification) {
         Objects.requireNonNull(onNotification, "onNotification is null");
         return doOnEach(
                 Functions.notificationOnNext(onNotification),
@@ -8032,7 +8249,8 @@ public final Observable<T> doOnEach(final Consumer<? super Notification<T>> onNo
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doOnEach(final Observer<? super T> observer) {
+    @NonNull
+    public final Observable<T> doOnEach(@NonNull Observer<? super T> observer) {
         Objects.requireNonNull(observer, "observer is null");
         return doOnEach(
                 ObservableInternalHelper.observerOnNext(observer),
@@ -8060,7 +8278,8 @@ public final Observable<T> doOnEach(final Observer<? super T> observer) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doOnError(Consumer<? super Throwable> onError) {
+    @NonNull
+    public final Observable<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
         return doOnEach(Functions.emptyConsumer(), onError, Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
     }
 
@@ -8083,7 +8302,8 @@ public final Observable<T> doOnError(Consumer<? super Throwable> onError) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doOnLifecycle(final Consumer<? super Disposable> onSubscribe, final Action onDispose) {
+    @NonNull
+    public final Observable<T> doOnLifecycle(@NonNull Consumer<? super Disposable> onSubscribe, @NonNull Action onDispose) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         Objects.requireNonNull(onDispose, "onDispose is null");
         return RxJavaPlugins.onAssembly(new ObservableDoOnLifecycle<>(this, onSubscribe, onDispose));
@@ -8105,7 +8325,8 @@ public final Observable<T> doOnLifecycle(final Consumer<? super Disposable> onSu
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doOnNext(Consumer<? super T> onNext) {
+    @NonNull
+    public final Observable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
         return doOnEach(onNext, Functions.emptyConsumer(), Functions.EMPTY_ACTION, Functions.EMPTY_ACTION);
     }
 
@@ -8128,7 +8349,8 @@ public final Observable<T> doOnNext(Consumer<? super T> onNext) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doOnSubscribe(Consumer<? super Disposable> onSubscribe) {
+    @NonNull
+    public final Observable<T> doOnSubscribe(@NonNull Consumer<? super Disposable> onSubscribe) {
         return doOnLifecycle(onSubscribe, Functions.EMPTY_ACTION);
     }
 
@@ -8153,7 +8375,8 @@ public final Observable<T> doOnSubscribe(Consumer<? super Disposable> onSubscrib
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> doOnTerminate(final Action onTerminate) {
+    @NonNull
+    public final Observable<T> doOnTerminate(@NonNull Action onTerminate) {
         Objects.requireNonNull(onTerminate, "onTerminate is null");
         return doOnEach(Functions.emptyConsumer(),
                 Functions.actionConsumer(onTerminate), onTerminate,
@@ -8180,6 +8403,7 @@ public final Observable<T> doOnTerminate(final Action onTerminate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> elementAt(long index) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
@@ -8209,7 +8433,8 @@ public final Maybe<T> elementAt(long index) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> elementAt(long index, T defaultItem) {
+    @NonNull
+    public final Single<T> elementAt(long index, @NonNull T defaultItem) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
         }
@@ -8237,6 +8462,7 @@ public final Single<T> elementAt(long index, T defaultItem) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> elementAtOrError(long index) {
         if (index < 0) {
             throw new IndexOutOfBoundsException("index >= 0 required but it was " + index);
@@ -8262,7 +8488,8 @@ public final Single<T> elementAtOrError(long index) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> filter(Predicate<? super T> predicate) {
+    @NonNull
+    public final Observable<T> filter(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableFilter<>(this, predicate));
     }
@@ -8282,6 +8509,7 @@ public final Observable<T> filter(Predicate<? super T> predicate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> firstElement() {
         return elementAt(0L);
     }
@@ -8303,7 +8531,8 @@ public final Maybe<T> firstElement() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> first(T defaultItem) {
+    @NonNull
+    public final Single<T> first(@NonNull T defaultItem) {
         return elementAt(0L, defaultItem);
     }
 
@@ -8322,6 +8551,7 @@ public final Single<T> first(T defaultItem) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> firstOrError() {
         return elementAtOrError(0L);
     }
@@ -8348,7 +8578,8 @@ public final Single<T> firstOrError() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return flatMap(mapper, false);
     }
 
@@ -8377,7 +8608,8 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper, boolean delayErrors) {
+    @NonNull
+    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, boolean delayErrors) {
         return flatMap(mapper, delayErrors, Integer.MAX_VALUE);
     }
 
@@ -8410,7 +8642,8 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
+    @NonNull
+    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, delayErrors, maxConcurrency, bufferSize());
     }
 
@@ -8445,7 +8678,8 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    @NonNull
+    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -8487,10 +8721,11 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <R> Observable<R> flatMap(
-            Function<? super T, ? extends ObservableSource<? extends R>> onNextMapper,
-            Function<? super Throwable, ? extends ObservableSource<? extends R>> onErrorMapper,
-            Supplier<? extends ObservableSource<? extends R>> onCompleteSupplier) {
+            @NonNull Function<? super T, ? extends ObservableSource<? extends R>> onNextMapper,
+            @NonNull Function<? super Throwable, ? extends ObservableSource<? extends R>> onErrorMapper,
+            @NonNull Supplier<? extends ObservableSource<? extends R>> onCompleteSupplier) {
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
         Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
@@ -8527,10 +8762,11 @@ public final <R> Observable<R> flatMap(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <R> Observable<R> flatMap(
-            Function<? super T, ? extends ObservableSource<? extends R>> onNextMapper,
-            Function<Throwable, ? extends ObservableSource<? extends R>> onErrorMapper,
-            Supplier<? extends ObservableSource<? extends R>> onCompleteSupplier,
+            @NonNull Function<? super T, ? extends ObservableSource<? extends R>> onNextMapper,
+            @NonNull Function<Throwable, ? extends ObservableSource<? extends R>> onErrorMapper,
+            @NonNull Supplier<? extends ObservableSource<? extends R>> onCompleteSupplier,
             int maxConcurrency) {
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
@@ -8564,7 +8800,8 @@ public final <R> Observable<R> flatMap(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper, int maxConcurrency) {
+    @NonNull
+    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int maxConcurrency) {
         return flatMap(mapper, false, maxConcurrency, bufferSize());
     }
 
@@ -8593,8 +8830,9 @@ public final <R> Observable<R> flatMap(Function<? super T, ? extends ObservableS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends R> resultSelector) {
+    @NonNull
+    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> resultSelector) {
         return flatMap(mapper, resultSelector, false, bufferSize(), bufferSize());
     }
 
@@ -8626,8 +8864,9 @@ public final <U, R> Observable<R> flatMap(Function<? super T, ? extends Observab
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors) {
+    @NonNull
+    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors) {
         return flatMap(mapper, combiner, delayErrors, bufferSize(), bufferSize());
     }
 
@@ -8663,8 +8902,9 @@ public final <U, R> Observable<R> flatMap(Function<? super T, ? extends Observab
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency) {
+    @NonNull
+    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, combiner, delayErrors, maxConcurrency, bufferSize());
     }
 
@@ -8702,8 +8942,9 @@ public final <U, R> Observable<R> flatMap(Function<? super T, ? extends Observab
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> flatMap(final Function<? super T, ? extends ObservableSource<? extends U>> mapper,
-            final BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency, int bufferSize) {
+    @NonNull
+    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
         return flatMap(ObservableInternalHelper.flatMapWithCombiner(mapper, combiner), delayErrors, maxConcurrency, bufferSize);
@@ -8738,8 +8979,9 @@ public final <U, R> Observable<R> flatMap(final Function<? super T, ? extends Ob
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> flatMap(Function<? super T, ? extends ObservableSource<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends R> combiner, int maxConcurrency) {
+    @NonNull
+    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, int maxConcurrency) {
         return flatMap(mapper, combiner, false, maxConcurrency, bufferSize());
     }
 
@@ -8757,7 +8999,8 @@ public final <U, R> Observable<R> flatMap(Function<? super T, ? extends Observab
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable flatMapCompletable(Function<? super T, ? extends CompletableSource> mapper) {
+    @NonNull
+    public final Completable flatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         return flatMapCompletable(mapper, false);
     }
 
@@ -8777,7 +9020,8 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable flatMapCompletable(Function<? super T, ? extends CompletableSource> mapper, boolean delayErrors) {
+    @NonNull
+    public final Completable flatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper, boolean delayErrors) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapCompletableCompletable<>(this, mapper, delayErrors));
     }
@@ -8803,7 +9047,8 @@ public final Completable flatMapCompletable(Function<? super T, ? extends Comple
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<U> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    @NonNull
+    public final <U> Observable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
     }
@@ -8834,8 +9079,9 @@ public final <U> Observable<U> flatMapIterable(final Function<? super T, ? exten
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Observable<V> flatMapIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper,
-            BiFunction<? super T, ? super U, ? extends V> resultSelector) {
+    @NonNull
+    public final <U, V> Observable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends V> resultSelector) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(resultSelector, "resultSelector is null");
         return flatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), bufferSize());
@@ -8856,7 +9102,8 @@ public final <U, V> Observable<V> flatMapIterable(final Function<? super T, ? ex
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return flatMapMaybe(mapper, false);
     }
 
@@ -8878,7 +9125,8 @@ public final <R> Observable<R> flatMapMaybe(Function<? super T, ? extends MaybeS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMapMaybe(Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors) {
+    @NonNull
+    public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapMaybe<>(this, mapper, delayErrors));
     }
@@ -8898,7 +9146,8 @@ public final <R> Observable<R> flatMapMaybe(Function<? super T, ? extends MaybeS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return flatMapSingle(mapper, false);
     }
 
@@ -8920,7 +9169,8 @@ public final <R> Observable<R> flatMapSingle(Function<? super T, ? extends Singl
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMapSingle(Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors) {
+    @NonNull
+    public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapSingle<>(this, mapper, delayErrors));
     }
@@ -8946,7 +9196,8 @@ public final <R> Observable<R> flatMapSingle(Function<? super T, ? extends Singl
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable forEach(Consumer<? super T> onNext) {
+    @NonNull
+    public final Disposable forEach(@NonNull Consumer<? super T> onNext) {
         return subscribe(onNext);
     }
 
@@ -8974,7 +9225,8 @@ public final Disposable forEach(Consumer<? super T> onNext) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable forEachWhile(Predicate<? super T> onNext) {
+    @NonNull
+    public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext) {
         return forEachWhile(onNext, Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
 
@@ -8999,7 +9251,8 @@ public final Disposable forEachWhile(Predicate<? super T> onNext) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable forEachWhile(Predicate<? super T> onNext, Consumer<? super Throwable> onError) {
+    @NonNull
+    public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonNull Consumer<? super Throwable> onError) {
         return forEachWhile(onNext, onError, Functions.EMPTY_ACTION);
     }
 
@@ -9027,8 +9280,9 @@ public final Disposable forEachWhile(Predicate<? super T> onNext, Consumer<? sup
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable forEachWhile(final Predicate<? super T> onNext, Consumer<? super Throwable> onError,
-            final Action onComplete) {
+    @NonNull
+    public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonNull Consumer<? super Throwable> onError,
+            @NonNull Action onComplete) {
         Objects.requireNonNull(onNext, "onNext is null");
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
@@ -9074,7 +9328,8 @@ public final Disposable forEachWhile(final Predicate<? super T> onNext, Consumer
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Observable<GroupedObservable<K, T>> groupBy(Function<? super T, ? extends K> keySelector) {
+    @NonNull
+    public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector) {
         return groupBy(keySelector, (Function)Functions.identity(), false, bufferSize());
     }
 
@@ -9117,7 +9372,8 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(Function<? super T,
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Observable<GroupedObservable<K, T>> groupBy(Function<? super T, ? extends K> keySelector, boolean delayError) {
+    @NonNull
+    public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector, boolean delayError) {
         return groupBy(keySelector, (Function)Functions.identity(), delayError, bufferSize());
     }
 
@@ -9160,7 +9416,8 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(Function<? super T,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Observable<GroupedObservable<K, V>> groupBy(Function<? super T, ? extends K> keySelector,
+    @NonNull
+    public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
             Function<? super T, ? extends V> valueSelector) {
         return groupBy(keySelector, valueSelector, false, bufferSize());
     }
@@ -9207,8 +9464,9 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(Function<? super
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Observable<GroupedObservable<K, V>> groupBy(Function<? super T, ? extends K> keySelector,
-            Function<? super T, ? extends V> valueSelector, boolean delayError) {
+    @NonNull
+    public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector, boolean delayError) {
         return groupBy(keySelector, valueSelector, delayError, bufferSize());
     }
 
@@ -9256,8 +9514,9 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(Function<? super
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Observable<GroupedObservable<K, V>> groupBy(Function<? super T, ? extends K> keySelector,
-            Function<? super T, ? extends V> valueSelector,
+    @NonNull
+    public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector,
             boolean delayError, int bufferSize) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
@@ -9299,12 +9558,13 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(Function<? super
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> groupJoin(
-            ObservableSource<? extends TRight> other,
-            Function<? super T, ? extends ObservableSource<TLeftEnd>> leftEnd,
-            Function<? super TRight, ? extends ObservableSource<TRightEnd>> rightEnd,
-            BiFunction<? super T, ? super Observable<TRight>, ? extends R> resultSelector
-                    ) {
+            @NonNull ObservableSource<? extends TRight> other,
+            @NonNull Function<? super T, ? extends ObservableSource<TLeftEnd>> leftEnd,
+            @NonNull Function<? super TRight, ? extends ObservableSource<TRightEnd>> rightEnd,
+            @NonNull BiFunction<? super T, ? super Observable<TRight>, ? extends R> resultSelector
+    ) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(leftEnd, "leftEnd is null");
         Objects.requireNonNull(rightEnd, "rightEnd is null");
@@ -9330,6 +9590,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> groupJoin(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> hide() {
         return RxJavaPlugins.onAssembly(new ObservableHide<>(this));
     }
@@ -9348,6 +9609,7 @@ public final Observable<T> hide() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable ignoreElements() {
         return RxJavaPlugins.onAssembly(new ObservableIgnoreElementsCompletable<>(this));
     }
@@ -9369,6 +9631,7 @@ public final Completable ignoreElements() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<Boolean> isEmpty() {
         return all(Functions.alwaysFalse());
     }
@@ -9406,12 +9669,13 @@ public final Single<Boolean> isEmpty() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> join(
-            ObservableSource<? extends TRight> other,
-            Function<? super T, ? extends ObservableSource<TLeftEnd>> leftEnd,
-            Function<? super TRight, ? extends ObservableSource<TRightEnd>> rightEnd,
-            BiFunction<? super T, ? super TRight, ? extends R> resultSelector
-                    ) {
+            @NonNull ObservableSource<? extends TRight> other,
+            @NonNull Function<? super T, ? extends ObservableSource<TLeftEnd>> leftEnd,
+            @NonNull Function<? super TRight, ? extends ObservableSource<TRightEnd>> rightEnd,
+            @NonNull BiFunction<? super T, ? super TRight, ? extends R> resultSelector
+    ) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(leftEnd, "leftEnd is null");
         Objects.requireNonNull(rightEnd, "rightEnd is null");
@@ -9436,6 +9700,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> join(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> lastElement() {
         return RxJavaPlugins.onAssembly(new ObservableLastMaybe<>(this));
     }
@@ -9458,7 +9723,8 @@ public final Maybe<T> lastElement() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> last(T defaultItem) {
+    @NonNull
+    public final Single<T> last(@NonNull T defaultItem) {
         Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new ObservableLastSingle<>(this, defaultItem));
     }
@@ -9479,6 +9745,7 @@ public final Single<T> last(T defaultItem) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> lastOrError() {
         return RxJavaPlugins.onAssembly(new ObservableLastSingle<>(this, null));
     }
@@ -9627,7 +9894,8 @@ public final Single<T> lastOrError() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> lift(ObservableOperator<? extends R, ? super T> lifter) {
+    @NonNull
+    public final <R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? super T> lifter) {
         Objects.requireNonNull(lifter, "lifter is null");
         return RxJavaPlugins.onAssembly(new ObservableLift<R, T>(this, lifter));
     }
@@ -9651,7 +9919,8 @@ public final <R> Observable<R> lift(ObservableOperator<? extends R, ? super T> l
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> map(Function<? super T, ? extends R> mapper) {
+    @NonNull
+    public final <R> Observable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableMap<T, R>(this, mapper));
     }
@@ -9673,6 +9942,7 @@ public final <R> Observable<R> map(Function<? super T, ? extends R> mapper) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<Notification<T>> materialize() {
         return RxJavaPlugins.onAssembly(new ObservableMaterialize<>(this));
     }
@@ -9696,7 +9966,8 @@ public final Observable<Notification<T>> materialize() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> mergeWith(ObservableSource<? extends T> other) {
+    @NonNull
+    public final Observable<T> mergeWith(@NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return merge(this, other);
     }
@@ -9719,6 +9990,7 @@ public final Observable<T> mergeWith(ObservableSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableMergeWithSingle<>(this, other));
@@ -9743,6 +10015,7 @@ public final Observable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableMergeWithMaybe<>(this, other));
@@ -9764,6 +10037,7 @@ public final Observable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> mergeWith(@NonNull CompletableSource other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableMergeWithCompletable<>(this, other));
@@ -9802,7 +10076,8 @@ public final Observable<T> mergeWith(@NonNull CompletableSource other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> observeOn(Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> observeOn(@NonNull Scheduler scheduler) {
         return observeOn(scheduler, false, bufferSize());
     }
 
@@ -9840,7 +10115,8 @@ public final Observable<T> observeOn(Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> observeOn(Scheduler scheduler, boolean delayError) {
+    @NonNull
+    public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delayError) {
         return observeOn(scheduler, delayError, bufferSize());
     }
 
@@ -9879,7 +10155,8 @@ public final Observable<T> observeOn(Scheduler scheduler, boolean delayError) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> observeOn(Scheduler scheduler, boolean delayError, int bufferSize) {
+    @NonNull
+    public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delayError, int bufferSize) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableObserveOn<>(this, scheduler, delayError, bufferSize));
@@ -9902,7 +10179,8 @@ public final Observable<T> observeOn(Scheduler scheduler, boolean delayError, in
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<U> ofType(final Class<U> clazz) {
+    @NonNull
+    public final <U> Observable<U> ofType(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
@@ -9938,7 +10216,8 @@ public final <U> Observable<U> ofType(final Class<U> clazz) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> onErrorResumeNext(Function<? super Throwable, ? extends ObservableSource<? extends T>> resumeFunction) {
+    @NonNull
+    public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends ObservableSource<? extends T>> resumeFunction) {
         Objects.requireNonNull(resumeFunction, "resumeFunction is null");
         return RxJavaPlugins.onAssembly(new ObservableOnErrorNext<>(this, resumeFunction));
     }
@@ -9974,7 +10253,8 @@ public final Observable<T> onErrorResumeNext(Function<? super Throwable, ? exten
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> onErrorResumeWith(final ObservableSource<? extends T> next) {
+    @NonNull
+    public final Observable<T> onErrorResumeWith(@NonNull ObservableSource<? extends T> next) {
         Objects.requireNonNull(next, "next is null");
         return onErrorResumeNext(Functions.justFunction(next));
     }
@@ -10007,7 +10287,8 @@ public final Observable<T> onErrorResumeWith(final ObservableSource<? extends T>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> onErrorReturn(Function<? super Throwable, ? extends T> valueSupplier) {
+    @NonNull
+    public final Observable<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> valueSupplier) {
         Objects.requireNonNull(valueSupplier, "valueSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableOnErrorReturn<>(this, valueSupplier));
     }
@@ -10040,7 +10321,8 @@ public final Observable<T> onErrorReturn(Function<? super Throwable, ? extends T
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> onErrorReturnItem(final T item) {
+    @NonNull
+    public final Observable<T> onErrorReturnItem(@NonNull T item) {
         Objects.requireNonNull(item, "item is null");
         return onErrorReturn(Functions.justFunction(item));
     }
@@ -10060,6 +10342,7 @@ public final Observable<T> onErrorReturnItem(final T item) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> onTerminateDetach() {
         return RxJavaPlugins.onAssembly(new ObservableDetach<>(this));
     }
@@ -10081,6 +10364,7 @@ public final Observable<T> onTerminateDetach() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final ConnectableObservable<T> publish() {
         return RxJavaPlugins.onAssembly(new ObservablePublish<>(this));
     }
@@ -10106,7 +10390,8 @@ public final ConnectableObservable<T> publish() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> publish(Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
+    @NonNull
+    public final <R> Observable<R> publish(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
         return RxJavaPlugins.onAssembly(new ObservablePublishSelector<>(this, selector));
     }
@@ -10141,7 +10426,8 @@ public final <R> Observable<R> publish(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
+    @NonNull
+    public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
         Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new ObservableReduceMaybe<>(this, reducer));
     }
@@ -10198,7 +10484,8 @@ public final Maybe<T> reduce(BiFunction<T, T, T> reducer) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
+    @NonNull
+    public final <@NonNull R> Single<R> reduce(R seed, @NonNull BiFunction<R, ? super T, R> reducer) {
         Objects.requireNonNull(seed, "seed is null");
         Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new ObservableReduceSeedSingle<>(this, seed, reducer));
@@ -10238,7 +10525,8 @@ public final <R> Single<R> reduce(R seed, BiFunction<R, ? super T, R> reducer) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> reduceWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> reducer) {
+    @NonNull
+    public final <@NonNull R> Single<R> reduceWith(@NonNull Supplier<R> seedSupplier, @NonNull BiFunction<R, ? super T, R> reducer) {
         Objects.requireNonNull(seedSupplier, "seedSupplier is null");
         Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new ObservableReduceWithSingle<>(this, seedSupplier, reducer));
@@ -10258,6 +10546,7 @@ public final <R> Single<R> reduceWith(Supplier<R> seedSupplier, BiFunction<R, ?
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> repeat() {
         return repeat(Long.MAX_VALUE);
     }
@@ -10283,6 +10572,7 @@ public final Observable<T> repeat() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> repeat(long times) {
         if (times < 0) {
             throw new IllegalArgumentException("times >= 0 required but it was " + times);
@@ -10314,7 +10604,8 @@ public final Observable<T> repeat(long times) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> repeatUntil(BooleanSupplier stop) {
+    @NonNull
+    public final Observable<T> repeatUntil(@NonNull BooleanSupplier stop) {
         Objects.requireNonNull(stop, "stop is null");
         return RxJavaPlugins.onAssembly(new ObservableRepeatUntil<>(this, stop));
     }
@@ -10340,7 +10631,8 @@ public final Observable<T> repeatUntil(BooleanSupplier stop) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> repeatWhen(final Function<? super Observable<Object>, ? extends ObservableSource<?>> handler) {
+    @NonNull
+    public final Observable<T> repeatWhen(@NonNull Function<? super Observable<Object>, ? extends ObservableSource<?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
         return RxJavaPlugins.onAssembly(new ObservableRepeatWhen<>(this, handler));
     }
@@ -10363,6 +10655,7 @@ public final Observable<T> repeatWhen(final Function<? super Observable<Object>,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final ConnectableObservable<T> replay() {
         return ObservableReplay.createFrom(this);
     }
@@ -10388,7 +10681,8 @@ public final ConnectableObservable<T> replay() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
+    @NonNull
+    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this), selector);
     }
@@ -10422,7 +10716,8 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final int bufferSize) {
+    @NonNull
+    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, bufferSize, false), selector);
@@ -10459,7 +10754,8 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final int bufferSize, boolean eagerTruncate) {
+    @NonNull
+    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, bufferSize, eagerTruncate), selector);
@@ -10498,7 +10794,8 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, TimeUnit unit) {
+    @NonNull
+    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit) {
         return replay(selector, bufferSize, time, unit, Schedulers.computation());
     }
 
@@ -10540,7 +10837,8 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) {
+    @NonNull
+    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
@@ -10588,7 +10886,8 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
+    @NonNull
+    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
@@ -10624,7 +10923,8 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, TimeUnit unit) {
+    @NonNull
+    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, @NonNull TimeUnit unit) {
         return replay(selector, time, unit, Schedulers.computation());
     }
 
@@ -10658,7 +10958,8 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final long time, final TimeUnit unit, final Scheduler scheduler) {
+    @NonNull
+    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -10697,7 +10998,8 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends ObservableSource<R>> selector, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
+    @NonNull
+    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -10730,7 +11032,8 @@ public final <R> Observable<R> replay(Function<? super Observable<T>, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final ConnectableObservable<T> replay(final int bufferSize) {
+    @NonNull
+    public final ConnectableObservable<T> replay(int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return ObservableReplay.create(this, bufferSize, false);
     }
@@ -10762,7 +11065,8 @@ public final ConnectableObservable<T> replay(final int bufferSize) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final ConnectableObservable<T> replay(final int bufferSize, boolean eagerTruncate) {
+    @NonNull
+    public final ConnectableObservable<T> replay(int bufferSize, boolean eagerTruncate) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return ObservableReplay.create(this, bufferSize, eagerTruncate);
     }
@@ -10798,7 +11102,8 @@ public final ConnectableObservable<T> replay(final int bufferSize, boolean eager
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final ConnectableObservable<T> replay(int bufferSize, long time, TimeUnit unit) {
+    @NonNull
+    public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull TimeUnit unit) {
         return replay(bufferSize, time, unit, Schedulers.computation());
     }
 
@@ -10837,7 +11142,8 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, TimeUnit
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final ConnectableObservable<T> replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler) {
+    @NonNull
+    public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -10881,7 +11187,8 @@ public final ConnectableObservable<T> replay(final int bufferSize, final long ti
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final ConnectableObservable<T> replay(final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
+    @NonNull
+    public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -10910,7 +11217,8 @@ public final ConnectableObservable<T> replay(final int bufferSize, final long ti
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final ConnectableObservable<T> replay(long time, TimeUnit unit) {
+    @NonNull
+    public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit) {
         return replay(time, unit, Schedulers.computation());
     }
 
@@ -10942,7 +11250,8 @@ public final ConnectableObservable<T> replay(long time, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final ConnectableObservable<T> replay(final long time, final TimeUnit unit, final Scheduler scheduler) {
+    @NonNull
+    public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.create(this, time, unit, scheduler, false);
@@ -10978,7 +11287,8 @@ public final ConnectableObservable<T> replay(final long time, final TimeUnit uni
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final ConnectableObservable<T> replay(final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
+    @NonNull
+    public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return ObservableReplay.create(this, time, unit, scheduler, eagerTruncate);
@@ -11007,6 +11317,7 @@ public final ConnectableObservable<T> replay(final long time, final TimeUnit uni
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> retry() {
         return retry(Long.MAX_VALUE, Functions.alwaysTrue());
     }
@@ -11030,7 +11341,8 @@ public final Observable<T> retry() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> retry(BiPredicate<? super Integer, ? super Throwable> predicate) {
+    @NonNull
+    public final Observable<T> retry(@NonNull BiPredicate<? super Integer, ? super Throwable> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
 
         return RxJavaPlugins.onAssembly(new ObservableRetryBiPredicate<>(this, predicate));
@@ -11062,6 +11374,7 @@ public final Observable<T> retry(BiPredicate<? super Integer, ? super Throwable>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> retry(long times) {
         return retry(times, Functions.alwaysTrue());
     }
@@ -11080,7 +11393,8 @@ public final Observable<T> retry(long times) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> retry(long times, Predicate<? super Throwable> predicate) {
+    @NonNull
+    public final Observable<T> retry(long times, @NonNull Predicate<? super Throwable> predicate) {
         if (times < 0) {
             throw new IllegalArgumentException("times >= 0 required but it was " + times);
         }
@@ -11103,7 +11417,8 @@ public final Observable<T> retry(long times, Predicate<? super Throwable> predic
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> retry(Predicate<? super Throwable> predicate) {
+    @NonNull
+    public final Observable<T> retry(@NonNull Predicate<? super Throwable> predicate) {
         return retry(Long.MAX_VALUE, predicate);
     }
 
@@ -11120,7 +11435,8 @@ public final Observable<T> retry(Predicate<? super Throwable> predicate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> retryUntil(final BooleanSupplier stop) {
+    @NonNull
+    public final Observable<T> retryUntil(@NonNull BooleanSupplier stop) {
         Objects.requireNonNull(stop, "stop is null");
         return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop));
     }
@@ -11200,8 +11516,9 @@ public final Observable<T> retryUntil(final BooleanSupplier stop) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> retryWhen(
-            final Function<? super Observable<Throwable>, ? extends ObservableSource<?>> handler) {
+            @NonNull Function<? super Observable<Throwable>, ? extends ObservableSource<?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
         return RxJavaPlugins.onAssembly(new ObservableRetryWhen<>(this, handler));
     }
@@ -11219,7 +11536,8 @@ public final Observable<T> retryWhen(
      * @throws NullPointerException if s is null
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void safeSubscribe(Observer<? super T> observer) {
+    @NonNull
+    public final void safeSubscribe(@NonNull Observer<? super T> observer) {
         Objects.requireNonNull(observer, "observer is null");
         if (observer instanceof SafeObserver) {
             subscribe(observer);
@@ -11249,7 +11567,8 @@ public final void safeSubscribe(Observer<? super T> observer) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> sample(long period, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> sample(long period, @NonNull TimeUnit unit) {
         return sample(period, unit, Schedulers.computation());
     }
 
@@ -11280,7 +11599,8 @@ public final Observable<T> sample(long period, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> sample(long period, TimeUnit unit, boolean emitLast) {
+    @NonNull
+    public final Observable<T> sample(long period, @NonNull TimeUnit unit, boolean emitLast) {
         return sample(period, unit, Schedulers.computation(), emitLast);
     }
 
@@ -11307,7 +11627,8 @@ public final Observable<T> sample(long period, TimeUnit unit, boolean emitLast)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> sample(long period, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, false));
@@ -11343,7 +11664,8 @@ public final Observable<T> sample(long period, TimeUnit unit, Scheduler schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> sample(long period, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
+    @NonNull
+    public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, emitLast));
@@ -11369,7 +11691,8 @@ public final Observable<T> sample(long period, TimeUnit unit, Scheduler schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<T> sample(ObservableSource<U> sampler) {
+    @NonNull
+    public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler) {
         Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<>(this, sampler, false));
     }
@@ -11401,7 +11724,8 @@ public final <U> Observable<T> sample(ObservableSource<U> sampler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<T> sample(ObservableSource<U> sampler, boolean emitLast) {
+    @NonNull
+    public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler, boolean emitLast) {
         Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<>(this, sampler, emitLast));
     }
@@ -11429,7 +11753,8 @@ public final <U> Observable<T> sample(ObservableSource<U> sampler, boolean emitL
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> scan(BiFunction<T, T, T> accumulator) {
+    @NonNull
+    public final Observable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
         Objects.requireNonNull(accumulator, "accumulator is null");
         return RxJavaPlugins.onAssembly(new ObservableScan<>(this, accumulator));
     }
@@ -11478,7 +11803,8 @@ public final Observable<T> scan(BiFunction<T, T, T> accumulator) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> scan(final R initialValue, BiFunction<R, ? super T, R> accumulator) {
+    @NonNull
+    public final <R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction<R, ? super T, R> accumulator) {
         Objects.requireNonNull(initialValue, "initialValue is null");
         return scanWith(Functions.justSupplier(initialValue), accumulator);
     }
@@ -11513,7 +11839,8 @@ public final <R> Observable<R> scan(final R initialValue, BiFunction<R, ? super
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> scanWith(Supplier<R> seedSupplier, BiFunction<R, ? super T, R> accumulator) {
+    @NonNull
+    public final <R> Observable<R> scanWith(@NonNull Supplier<R> seedSupplier, @NonNull BiFunction<R, ? super T, R> accumulator) {
         Objects.requireNonNull(seedSupplier, "seedSupplier is null");
         Objects.requireNonNull(accumulator, "accumulator is null");
         return RxJavaPlugins.onAssembly(new ObservableScanSeed<>(this, seedSupplier, accumulator));
@@ -11541,6 +11868,7 @@ public final <R> Observable<R> scanWith(Supplier<R> seedSupplier, BiFunction<R,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> serialize() {
         return RxJavaPlugins.onAssembly(new ObservableSerialized<>(this));
     }
@@ -11564,6 +11892,7 @@ public final Observable<T> serialize() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> share() {
         return publish().refCount();
     }
@@ -11583,6 +11912,7 @@ public final Observable<T> share() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Maybe<T> singleElement() {
         return RxJavaPlugins.onAssembly(new ObservableSingleMaybe<>(this));
     }
@@ -11605,7 +11935,8 @@ public final Maybe<T> singleElement() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> single(T defaultItem) {
+    @NonNull
+    public final Single<T> single(@NonNull T defaultItem) {
         Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new ObservableSingleSingle<>(this, defaultItem));
     }
@@ -11627,6 +11958,7 @@ public final Single<T> single(T defaultItem) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Single<T> singleOrError() {
         return RxJavaPlugins.onAssembly(new ObservableSingleSingle<>(this, null));
     }
@@ -11649,6 +11981,7 @@ public final Single<T> singleOrError() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> skip(long count) {
         if (count <= 0) {
             return RxJavaPlugins.onAssembly(this);
@@ -11677,7 +12010,8 @@ public final Observable<T> skip(long count) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> skip(long time, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> skip(long time, @NonNull TimeUnit unit) {
         return skipUntil(timer(time, unit));
     }
 
@@ -11703,7 +12037,8 @@ public final Observable<T> skip(long time, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> skip(long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return skipUntil(timer(time, unit, scheduler));
     }
 
@@ -11731,6 +12066,7 @@ public final Observable<T> skip(long time, TimeUnit unit, Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> skipLast(int count) {
         if (count < 0) {
             throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
@@ -11764,7 +12100,8 @@ public final Observable<T> skipLast(int count) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.TRAMPOLINE)
-    public final Observable<T> skipLast(long time, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> skipLast(long time, @NonNull TimeUnit unit) {
         return skipLast(time, unit, Schedulers.trampoline(), false, bufferSize());
     }
 
@@ -11794,7 +12131,8 @@ public final Observable<T> skipLast(long time, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.TRAMPOLINE)
-    public final Observable<T> skipLast(long time, TimeUnit unit, boolean delayError) {
+    @NonNull
+    public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, boolean delayError) {
         return skipLast(time, unit, Schedulers.trampoline(), delayError, bufferSize());
     }
 
@@ -11822,7 +12160,8 @@ public final Observable<T> skipLast(long time, TimeUnit unit, boolean delayError
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return skipLast(time, unit, scheduler, false, bufferSize());
     }
 
@@ -11853,7 +12192,8 @@ public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError) {
+    @NonNull
+    public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         return skipLast(time, unit, scheduler, delayError, bufferSize());
     }
 
@@ -11886,7 +12226,8 @@ public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
+    @NonNull
+    public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError, int bufferSize) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -11915,7 +12256,8 @@ public final Observable<T> skipLast(long time, TimeUnit unit, Scheduler schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<T> skipUntil(ObservableSource<U> other) {
+    @NonNull
+    public final <U> Observable<T> skipUntil(@NonNull ObservableSource<U> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableSkipUntil<>(this, other));
     }
@@ -11938,7 +12280,8 @@ public final <U> Observable<T> skipUntil(ObservableSource<U> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> skipWhile(Predicate<? super T> predicate) {
+    @NonNull
+    public final Observable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableSkipWhile<>(this, predicate));
     }
@@ -11965,6 +12308,7 @@ public final Observable<T> skipWhile(Predicate<? super T> predicate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> sorted() {
         return toList().toObservable().map(Functions.listSorter(Functions.<T>naturalComparator())).flatMapIterable(Functions.<List<T>>identity());
     }
@@ -11988,7 +12332,8 @@ public final Observable<T> sorted() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> sorted(Comparator<? super T> sortFunction) {
+    @NonNull
+    public final Observable<T> sorted(@NonNull Comparator<? super T> sortFunction) {
         Objects.requireNonNull(sortFunction, "sortFunction is null");
         return toList().toObservable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.<List<T>>identity());
     }
@@ -12012,10 +12357,10 @@ public final Observable<T> sorted(Comparator<? super T> sortFunction) {
      * @see #startWithItem(Object)
      * @see #startWithArray(Object...)
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> startWithIterable(Iterable<? extends T> items) {
+    @NonNull
+    public final Observable<T> startWithIterable(@NonNull Iterable<? extends T> items) {
         return concatArray(fromIterable(items), this);
     }
 
@@ -12035,10 +12380,10 @@ public final Observable<T> startWithIterable(Iterable<? extends T> items) {
      *         emitted by the source ObservableSource
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> startWith(ObservableSource<? extends T> other) {
+    @NonNull
+    public final Observable<T> startWith(@NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return concatArray(other, this);
     }
@@ -12062,10 +12407,10 @@ public final Observable<T> startWith(ObservableSource<? extends T> other) {
      * @see #startWithIterable(Iterable)
      * @since 3.0.0
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> startWithItem(T item) {
+    @NonNull
+    public final Observable<T> startWithItem(@NonNull T item) {
         Objects.requireNonNull(item, "item is null");
         return concatArray(just(item), this);
     }
@@ -12088,10 +12433,11 @@ public final Observable<T> startWithItem(T item) {
      * @see #startWithItem(Object)
      * @see #startWithIterable(Iterable)
      */
-    @SuppressWarnings("unchecked")
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> startWithArray(T... items) {
+    @SafeVarargs
+    @NonNull
+    public final Observable<T> startWithArray(@NonNull T... items) {
         Observable<T> fromArray = fromArray(items);
         if (fromArray == empty()) {
             return RxJavaPlugins.onAssembly(this);
@@ -12115,6 +12461,7 @@ public final Observable<T> startWithArray(T... items) {
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Disposable subscribe() {
         return subscribe(Functions.emptyConsumer(), Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
@@ -12140,7 +12487,8 @@ public final Disposable subscribe() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onNext) {
+    @NonNull
+    public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
         return subscribe(onNext, Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
     }
 
@@ -12166,7 +12514,8 @@ public final Disposable subscribe(Consumer<? super T> onNext) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError) {
+    @NonNull
+    public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError) {
         return subscribe(onNext, onError, Functions.EMPTY_ACTION);
     }
 
@@ -12196,8 +12545,9 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super Throwable> onError,
-            Action onComplete) {
+    @NonNull
+    public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError,
+            @NonNull Action onComplete) {
         Objects.requireNonNull(onNext, "onNext is null");
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
@@ -12211,7 +12561,7 @@ public final Disposable subscribe(Consumer<? super T> onNext, Consumer<? super T
 
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
-    public final void subscribe(Observer<? super T> observer) {
+    public final void subscribe(@NonNull Observer<? super T> observer) {
         Objects.requireNonNull(observer, "observer is null");
         try {
             observer = RxJavaPlugins.onSubscribe(this, observer);
@@ -12241,7 +12591,7 @@ public final void subscribe(Observer<? super T> observer) {
      * applied by {@link #subscribe(Observer)} before this method gets called.
      * @param observer the incoming Observer, never null
      */
-    protected abstract void subscribeActual(Observer<? super T> observer);
+    protected abstract void subscribeActual(@NonNull Observer<? super T> observer);
 
     /**
      * Subscribes a given Observer (subclass) to this Observable and returns the given
@@ -12269,7 +12619,8 @@ public final void subscribe(Observer<? super T> observer) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <E extends Observer<? super T>> E subscribeWith(E observer) {
+    @NonNull
+    public final <@NonNull E extends Observer<? super T>> E subscribeWith(E observer) {
         subscribe(observer);
         return observer;
     }
@@ -12293,7 +12644,8 @@ public final <E extends Observer<? super T>> E subscribeWith(E observer) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> subscribeOn(Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> subscribeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableSubscribeOn<>(this, scheduler));
     }
@@ -12316,7 +12668,8 @@ public final Observable<T> subscribeOn(Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> switchIfEmpty(ObservableSource<? extends T> other) {
+    @NonNull
+    public final Observable<T> switchIfEmpty(@NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchIfEmpty<>(this, other));
     }
@@ -12345,7 +12698,8 @@ public final Observable<T> switchIfEmpty(ObservableSource<? extends T> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> switchMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return switchMap(mapper, bufferSize());
     }
 
@@ -12375,7 +12729,8 @@ public final <R> Observable<R> switchMap(Function<? super T, ? extends Observabl
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> switchMap(Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
+    @NonNull
+    public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
@@ -12425,6 +12780,7 @@ public final <R> Observable<R> switchMap(Function<? super T, ? extends Observabl
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable switchMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable<>(this, mapper, false));
@@ -12467,6 +12823,7 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Completable switchMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapCompletable<>(this, mapper, true));
@@ -12503,6 +12860,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<>(this, mapper, false));
@@ -12529,6 +12887,7 @@ public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? ext
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<>(this, mapper, true));
@@ -12623,7 +12982,8 @@ public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? sup
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> switchMapDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    @NonNull
+    public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return switchMapDelayError(mapper, bufferSize());
     }
 
@@ -12655,7 +13015,8 @@ public final <R> Observable<R> switchMapDelayError(Function<? super T, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> switchMapDelayError(Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
+    @NonNull
+    public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
@@ -12691,6 +13052,7 @@ public final <R> Observable<R> switchMapDelayError(Function<? super T, ? extends
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> take(long count) {
         if (count < 0) {
             throw new IllegalArgumentException("count >= 0 required but it was " + count);
@@ -12720,7 +13082,8 @@ public final Observable<T> take(long count) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> take(long time, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> take(long time, @NonNull TimeUnit unit) {
         return takeUntil(timer(time, unit));
     }
 
@@ -12749,7 +13112,8 @@ public final Observable<T> take(long time, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> take(long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> take(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return takeUntil(timer(time, unit, scheduler));
     }
 
@@ -12773,6 +13137,7 @@ public final Observable<T> take(long time, TimeUnit unit, Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> takeLast(int count) {
         if (count < 0) {
             throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
@@ -12809,7 +13174,8 @@ public final Observable<T> takeLast(int count) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.TRAMPOLINE)
-    public final Observable<T> takeLast(long count, long time, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit unit) {
         return takeLast(count, time, unit, Schedulers.trampoline(), false, bufferSize());
     }
 
@@ -12841,7 +13207,8 @@ public final Observable<T> takeLast(long count, long time, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> takeLast(long count, long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return takeLast(count, time, unit, scheduler, false, bufferSize());
     }
 
@@ -12878,7 +13245,8 @@ public final Observable<T> takeLast(long count, long time, TimeUnit unit, Schedu
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> takeLast(long count, long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
+    @NonNull
+    public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError, int bufferSize) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -12908,7 +13276,8 @@ public final Observable<T> takeLast(long count, long time, TimeUnit unit, Schedu
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.TRAMPOLINE)
-    public final Observable<T> takeLast(long time, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> takeLast(long time, @NonNull TimeUnit unit) {
         return takeLast(time, unit, Schedulers.trampoline(), false, bufferSize());
     }
 
@@ -12935,7 +13304,8 @@ public final Observable<T> takeLast(long time, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.TRAMPOLINE)
-    public final Observable<T> takeLast(long time, TimeUnit unit, boolean delayError) {
+    @NonNull
+    public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, boolean delayError) {
         return takeLast(time, unit, Schedulers.trampoline(), delayError, bufferSize());
     }
 
@@ -12963,7 +13333,8 @@ public final Observable<T> takeLast(long time, TimeUnit unit, boolean delayError
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return takeLast(time, unit, scheduler, false, bufferSize());
     }
 
@@ -12994,7 +13365,8 @@ public final Observable<T> takeLast(long time, TimeUnit unit, Scheduler schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError) {
+    @NonNull
+    public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         return takeLast(time, unit, scheduler, delayError, bufferSize());
     }
 
@@ -13027,7 +13399,8 @@ public final Observable<T> takeLast(long time, TimeUnit unit, Scheduler schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> takeLast(long time, TimeUnit unit, Scheduler scheduler, boolean delayError, int bufferSize) {
+    @NonNull
+    public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError, int bufferSize) {
         return takeLast(Long.MAX_VALUE, time, unit, scheduler, delayError, bufferSize);
     }
 
@@ -13051,7 +13424,8 @@ public final Observable<T> takeLast(long time, TimeUnit unit, Scheduler schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<T> takeUntil(ObservableSource<U> other) {
+    @NonNull
+    public final <U> Observable<T> takeUntil(@NonNull ObservableSource<U> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableTakeUntil<>(this, other));
     }
@@ -13080,7 +13454,8 @@ public final <U> Observable<T> takeUntil(ObservableSource<U> other) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> takeUntil(Predicate<? super T> stopPredicate) {
+    @NonNull
+    public final Observable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate) {
         Objects.requireNonNull(stopPredicate, "stopPredicate is null");
         return RxJavaPlugins.onAssembly(new ObservableTakeUntilPredicate<>(this, stopPredicate));
     }
@@ -13104,7 +13479,8 @@ public final Observable<T> takeUntil(Predicate<? super T> stopPredicate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<T> takeWhile(Predicate<? super T> predicate) {
+    @NonNull
+    public final Observable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ObservableTakeWhile<>(this, predicate));
     }
@@ -13131,7 +13507,8 @@ public final Observable<T> takeWhile(Predicate<? super T> predicate) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> throttleFirst(long windowDuration, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> throttleFirst(long windowDuration, @NonNull TimeUnit unit) {
         return throttleFirst(windowDuration, unit, Schedulers.computation());
     }
 
@@ -13160,7 +13537,8 @@ public final Observable<T> throttleFirst(long windowDuration, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> throttleFirst(long skipDuration, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableThrottleFirstTimed<>(this, skipDuration, unit, scheduler));
@@ -13190,7 +13568,8 @@ public final Observable<T> throttleFirst(long skipDuration, TimeUnit unit, Sched
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> throttleLast(long intervalDuration, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit) {
         return sample(intervalDuration, unit);
     }
 
@@ -13221,7 +13600,8 @@ public final Observable<T> throttleLast(long intervalDuration, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> throttleLast(long intervalDuration, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return sample(intervalDuration, unit, scheduler);
     }
 
@@ -13252,7 +13632,8 @@ public final Observable<T> throttleLast(long intervalDuration, TimeUnit unit, Sc
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> throttleLatest(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit) {
         return throttleLatest(timeout, unit, Schedulers.computation(), false);
     }
 
@@ -13283,7 +13664,8 @@ public final Observable<T> throttleLatest(long timeout, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> throttleLatest(long timeout, TimeUnit unit, boolean emitLast) {
+    @NonNull
+    public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, boolean emitLast) {
         return throttleLatest(timeout, unit, Schedulers.computation(), emitLast);
     }
 
@@ -13315,7 +13697,8 @@ public final Observable<T> throttleLatest(long timeout, TimeUnit unit, boolean e
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return throttleLatest(timeout, unit, scheduler, false);
     }
 
@@ -13347,7 +13730,8 @@ public final Observable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
+    @NonNull
+    public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableThrottleLatest<>(this, timeout, unit, scheduler, emitLast));
@@ -13380,7 +13764,8 @@ public final Observable<T> throttleLatest(long timeout, TimeUnit unit, Scheduler
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> throttleWithTimeout(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit) {
         return debounce(timeout, unit);
     }
 
@@ -13414,7 +13799,8 @@ public final Observable<T> throttleWithTimeout(long timeout, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> throttleWithTimeout(long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return debounce(timeout, unit, scheduler);
     }
 
@@ -13434,6 +13820,7 @@ public final Observable<T> throttleWithTimeout(long timeout, TimeUnit unit, Sche
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<Timed<T>> timeInterval() {
         return timeInterval(TimeUnit.MILLISECONDS, Schedulers.computation());
     }
@@ -13456,7 +13843,8 @@ public final Observable<Timed<T>> timeInterval() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
-    public final Observable<Timed<T>> timeInterval(Scheduler scheduler) {
+    @NonNull
+    public final Observable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
         return timeInterval(TimeUnit.MILLISECONDS, scheduler);
     }
 
@@ -13477,7 +13865,8 @@ public final Observable<Timed<T>> timeInterval(Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<Timed<T>> timeInterval(TimeUnit unit) {
+    @NonNull
+    public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
         return timeInterval(unit, Schedulers.computation());
     }
 
@@ -13500,7 +13889,8 @@ public final Observable<Timed<T>> timeInterval(TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
-    public final Observable<Timed<T>> timeInterval(TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableTimeInterval<>(this, unit, scheduler));
@@ -13532,7 +13922,8 @@ public final Observable<Timed<T>> timeInterval(TimeUnit unit, Scheduler schedule
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <V> Observable<T> timeout(Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator) {
+    @NonNull
+    public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator) {
         return timeout0(null, itemTimeoutIndicator, null);
     }
 
@@ -13564,8 +13955,9 @@ public final <V> Observable<T> timeout(Function<? super T, ? extends ObservableS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <V> Observable<T> timeout(Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
-            ObservableSource<? extends T> other) {
+    @NonNull
+    public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
+            @NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(null, itemTimeoutIndicator, other);
     }
@@ -13591,7 +13983,8 @@ public final <V> Observable<T> timeout(Function<? super T, ? extends ObservableS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> timeout(long timeout, TimeUnit timeUnit) {
+    @NonNull
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
         return timeout0(timeout, timeUnit, null, Schedulers.computation());
     }
 
@@ -13618,7 +14011,8 @@ public final Observable<T> timeout(long timeout, TimeUnit timeUnit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> timeout(long timeout, TimeUnit timeUnit, ObservableSource<? extends T> other) {
+    @NonNull
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, timeUnit, other, Schedulers.computation());
     }
@@ -13649,7 +14043,8 @@ public final Observable<T> timeout(long timeout, TimeUnit timeUnit, ObservableSo
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler, ObservableSource<? extends T> other) {
+    @NonNull
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler, @NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, timeUnit, other, scheduler);
     }
@@ -13678,7 +14073,8 @@ public final Observable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler sc
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler) {
         return timeout0(timeout, timeUnit, null, scheduler);
     }
 
@@ -13711,8 +14107,9 @@ public final Observable<T> timeout(long timeout, TimeUnit timeUnit, Scheduler sc
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Observable<T> timeout(ObservableSource<U> firstTimeoutIndicator,
-            Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator) {
+    @NonNull
+    public final <U, V> Observable<T> timeout(@NonNull ObservableSource<U> firstTimeoutIndicator,
+            @NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, null);
     }
@@ -13751,26 +14148,30 @@ public final <U, V> Observable<T> timeout(ObservableSource<U> firstTimeoutIndica
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <U, V> Observable<T> timeout(
-            ObservableSource<U> firstTimeoutIndicator,
-            Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
-                    ObservableSource<? extends T> other) {
+            @NonNull ObservableSource<U> firstTimeoutIndicator,
+            @NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
+            @NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         Objects.requireNonNull(other, "other is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other);
     }
 
-    private Observable<T> timeout0(long timeout, TimeUnit timeUnit, ObservableSource<? extends T> other,
-            Scheduler scheduler) {
+    @NonNull
+    private Observable<T> timeout0(long timeout, @NonNull TimeUnit timeUnit,
+            @Nullable ObservableSource<? extends T> other,
+            @NonNull Scheduler scheduler) {
         Objects.requireNonNull(timeUnit, "timeUnit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableTimeoutTimed<>(this, timeout, timeUnit, scheduler, other));
     }
 
+    @NonNull
     private <U, V> Observable<T> timeout0(
-            ObservableSource<U> firstTimeoutIndicator,
-            Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
-                    ObservableSource<? extends T> other) {
+            @NonNull ObservableSource<U> firstTimeoutIndicator,
+            @NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
+            @Nullable ObservableSource<? extends T> other) {
         Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
         return RxJavaPlugins.onAssembly(new ObservableTimeout<>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
     }
@@ -13791,6 +14192,7 @@ private <U, V> Observable<T> timeout0(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<Timed<T>> timestamp() {
         return timestamp(TimeUnit.MILLISECONDS, Schedulers.computation());
     }
@@ -13814,7 +14216,8 @@ public final Observable<Timed<T>> timestamp() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
-    public final Observable<Timed<T>> timestamp(Scheduler scheduler) {
+    @NonNull
+    public final Observable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
         return timestamp(TimeUnit.MILLISECONDS, scheduler);
     }
 
@@ -13835,7 +14238,8 @@ public final Observable<Timed<T>> timestamp(Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Observable<Timed<T>> timestamp(TimeUnit unit) {
+    @NonNull
+    public final Observable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
         return timestamp(unit, Schedulers.computation());
     }
 
@@ -13859,7 +14263,8 @@ public final Observable<Timed<T>> timestamp(TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE) // Supplied scheduler is only used for creating timestamps.
-    public final Observable<Timed<T>> timestamp(final TimeUnit unit, final Scheduler scheduler) {
+    @NonNull
+    public final Observable<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return map(Functions.<T>timestampWith(unit, scheduler));
@@ -13882,6 +14287,7 @@ public final Observable<Timed<T>> timestamp(final TimeUnit unit, final Scheduler
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
         return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
@@ -13912,7 +14318,8 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<List<T>> toList() {
+    @NonNull
+    public final Single<@NonNull List<T>> toList() {
         return toList(16);
     }
 
@@ -13944,7 +14351,8 @@ public final Single<List<T>> toList() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<List<T>> toList(final int capacityHint) {
+    @NonNull
+    public final Single<@NonNull List<T>> toList(int capacityHint) {
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         return RxJavaPlugins.onAssembly(new ObservableToListSingle<T, List<T>>(this, capacityHint));
     }
@@ -13978,7 +14386,8 @@ public final Single<List<T>> toList(final int capacityHint) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U extends Collection<? super T>> Single<U> toList(Supplier<U> collectionSupplier) {
+    @NonNull
+    public final <@NonNull U extends Collection<? super T>> Single<U> toList(@NonNull Supplier<U> collectionSupplier) {
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableToListSingle<>(this, collectionSupplier));
     }
@@ -14009,7 +14418,8 @@ public final <U extends Collection<? super T>> Single<U> toList(Supplier<U> coll
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Single<Map<K, T>> toMap(final Function<? super T, ? extends K> keySelector) {
+    @NonNull
+    public final <K> Single<@NonNull Map<K, T>> toMap(@NonNull Function<? super T, ? extends K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         return collect(HashMapSupplier.<K, T>asSupplier(), Functions.toMapKeySelector(keySelector));
     }
@@ -14043,9 +14453,10 @@ public final <K> Single<Map<K, T>> toMap(final Function<? super T, ? extends K>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <K, V> Single<Map<K, V>> toMap(
-            final Function<? super T, ? extends K> keySelector,
-            final Function<? super T, ? extends V> valueSelector) {
+            @NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         return collect(HashMapSupplier.<K, V>asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector));
@@ -14079,10 +14490,11 @@ public final <K, V> Single<Map<K, V>> toMap(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <K, V> Single<Map<K, V>> toMap(
-            final Function<? super T, ? extends K> keySelector,
-            final Function<? super T, ? extends V> valueSelector,
-            Supplier<? extends Map<K, V>> mapSupplier) {
+            @NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector,
+            @NonNull Supplier<? extends Map<K, V>> mapSupplier) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         Objects.requireNonNull(mapSupplier, "mapSupplier is null");
@@ -14112,7 +14524,8 @@ public final <K, V> Single<Map<K, V>> toMap(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Single<Map<K, Collection<T>>> toMultimap(Function<? super T, ? extends K> keySelector) {
+    @NonNull
+    public final <K> Single<@NonNull Map<K, Collection<T>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector) {
         @SuppressWarnings({ "rawtypes", "unchecked" })
         Function<? super T, ? extends T> valueSelector = (Function)Functions.identity();
         Supplier<Map<K, Collection<T>>> mapSupplier = HashMapSupplier.asSupplier();
@@ -14147,7 +14560,8 @@ public final <K> Single<Map<K, Collection<T>>> toMultimap(Function<? super T, ?
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Single<Map<K, Collection<V>>> toMultimap(Function<? super T, ? extends K> keySelector, Function<? super T, ? extends V> valueSelector) {
+    @NonNull
+    public final <K, V> Single<@NonNull Map<K, Collection<V>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector, Function<? super T, ? extends V> valueSelector) {
         Supplier<Map<K, Collection<V>>> mapSupplier = HashMapSupplier.asSupplier();
         Function<K, List<V>> collectionFactory = ArrayListSupplier.asFunction();
         return toMultimap(keySelector, valueSelector, mapSupplier, collectionFactory);
@@ -14180,11 +14594,12 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(Function<? super T,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
-            final Function<? super T, ? extends K> keySelector,
-            final Function<? super T, ? extends V> valueSelector,
-            final Supplier<? extends Map<K, Collection<V>>> mapSupplier,
-            final Function<? super K, ? extends Collection<? super V>> collectionFactory) {
+    @NonNull
+    public final <K, V> Single<@NonNull Map<K, Collection<V>>> toMultimap(
+            @NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector,
+            @NonNull Supplier<? extends Map<K, Collection<V>>> mapSupplier,
+            @NonNull Function<? super K, ? extends Collection<? super V>> collectionFactory) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         Objects.requireNonNull(mapSupplier, "mapSupplier is null");
@@ -14221,11 +14636,12 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
-            Function<? super T, ? extends K> keySelector,
-            Function<? super T, ? extends V> valueSelector,
-            Supplier<Map<K, Collection<V>>> mapSupplier
-            ) {
+    @NonNull
+    public final <K, V> Single<@NonNull Map<K, Collection<V>>> toMultimap(
+            @NonNull Function<? super T, ? extends K> keySelector,
+            @NonNull Function<? super T, ? extends V> valueSelector,
+            @NonNull Supplier<Map<K, Collection<V>>> mapSupplier
+    ) {
         return toMultimap(keySelector, valueSelector, mapSupplier, ArrayListSupplier.<V, K>asFunction());
     }
 
@@ -14268,7 +14684,8 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> toFlowable(BackpressureStrategy strategy) {
+    @NonNull
+    public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
         Flowable<T> f = new FlowableFromObservable<>(this);
 
         switch (strategy) {
@@ -14309,7 +14726,8 @@ public final Flowable<T> toFlowable(BackpressureStrategy strategy) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<List<T>> toSortedList() {
+    @NonNull
+    public final Single<@NonNull List<T>> toSortedList() {
         return toSortedList(Functions.naturalOrder());
     }
 
@@ -14336,7 +14754,8 @@ public final Single<List<T>> toSortedList() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<List<T>> toSortedList(final Comparator<? super T> comparator) {
+    @NonNull
+    public final Single<@NonNull List<T>> toSortedList(@NonNull Comparator<? super T> comparator) {
         Objects.requireNonNull(comparator, "comparator is null");
         return toList().map(Functions.listSorter(comparator));
     }
@@ -14367,7 +14786,8 @@ public final Single<List<T>> toSortedList(final Comparator<? super T> comparator
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<List<T>> toSortedList(final Comparator<? super T> comparator, int capacityHint) {
+    @NonNull
+    public final Single<@NonNull List<T>> toSortedList(@NonNull Comparator<? super T> comparator, int capacityHint) {
         Objects.requireNonNull(comparator, "comparator is null");
         return toList(capacityHint).map(Functions.listSorter(comparator));
     }
@@ -14400,7 +14820,8 @@ public final Single<List<T>> toSortedList(final Comparator<? super T> comparator
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<List<T>> toSortedList(int capacityHint) {
+    @NonNull
+    public final Single<@NonNull List<T>> toSortedList(int capacityHint) {
         return toSortedList(Functions.<T>naturalOrder(), capacityHint);
     }
 
@@ -14422,7 +14843,8 @@ public final Single<List<T>> toSortedList(int capacityHint) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> unsubscribeOn(Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new ObservableUnsubscribeOn<>(this, scheduler));
     }
@@ -14448,6 +14870,7 @@ public final Observable<T> unsubscribeOn(Scheduler scheduler) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<Observable<T>> window(long count) {
         return window(count, count, bufferSize());
     }
@@ -14476,6 +14899,7 @@ public final Observable<Observable<T>> window(long count) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<Observable<T>> window(long count, long skip) {
         return window(count, skip, bufferSize());
     }
@@ -14506,6 +14930,7 @@ public final Observable<Observable<T>> window(long count, long skip) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<Observable<T>> window(long count, long skip, int bufferSize) {
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(skip, "skip");
@@ -14542,7 +14967,8 @@ public final Observable<Observable<T>> window(long count, long skip, int bufferS
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<Observable<T>> window(long timespan, long timeskip, TimeUnit unit) {
+    @NonNull
+    public final Observable<Observable<T>> window(long timespan, long timeskip, @NonNull TimeUnit unit) {
         return window(timespan, timeskip, unit, Schedulers.computation(), bufferSize());
     }
 
@@ -14577,7 +15003,8 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, Time
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<Observable<T>> window(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<Observable<T>> window(long timespan, long timeskip, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return window(timespan, timeskip, unit, scheduler, bufferSize());
     }
 
@@ -14614,7 +15041,8 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, Time
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<Observable<T>> window(long timespan, long timeskip, TimeUnit unit, Scheduler scheduler, int bufferSize) {
+    @NonNull
+    public final Observable<Observable<T>> window(long timespan, long timeskip, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int bufferSize) {
         ObjectHelper.verifyPositive(timespan, "timespan");
         ObjectHelper.verifyPositive(timeskip, "timeskip");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -14651,7 +15079,8 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, Time
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<Observable<T>> window(long timespan, TimeUnit unit) {
+    @NonNull
+    public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit unit) {
         return window(timespan, unit, Schedulers.computation(), Long.MAX_VALUE, false);
     }
 
@@ -14687,7 +15116,8 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
+    @NonNull
+    public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit unit,
             long count) {
         return window(timespan, unit, Schedulers.computation(), count, false);
     }
@@ -14726,7 +15156,8 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
+    @NonNull
+    public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit unit,
             long count, boolean restart) {
         return window(timespan, unit, Schedulers.computation(), count, restart);
     }
@@ -14761,8 +15192,9 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
-            Scheduler scheduler) {
+    @NonNull
+    public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit unit,
+            @NonNull Scheduler scheduler) {
         return window(timespan, unit, scheduler, Long.MAX_VALUE, false);
     }
 
@@ -14800,8 +15232,9 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
-            Scheduler scheduler, long count) {
+    @NonNull
+    public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit unit,
+            @NonNull Scheduler scheduler, long count) {
         return window(timespan, unit, scheduler, count, false);
     }
 
@@ -14841,8 +15274,9 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
-            Scheduler scheduler, long count, boolean restart) {
+    @NonNull
+    public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit unit,
+            @NonNull Scheduler scheduler, long count, boolean restart) {
         return window(timespan, unit, scheduler, count, restart, bufferSize());
     }
 
@@ -14884,8 +15318,9 @@ public final Observable<Observable<T>> window(long timespan, TimeUnit unit,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
     public final Observable<Observable<T>> window(
-            long timespan, TimeUnit unit, Scheduler scheduler,
+            long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler,
             long count, boolean restart, int bufferSize) {
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -14921,7 +15356,8 @@ public final Observable<Observable<T>> window(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary) {
+    @NonNull
+    public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundary) {
         return window(boundary, bufferSize());
     }
 
@@ -14954,7 +15390,8 @@ public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary, int bufferSize) {
+    @NonNull
+    public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundary, int bufferSize) {
         Objects.requireNonNull(boundary, "boundary is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableWindowBoundary<>(this, boundary, bufferSize));
@@ -14990,9 +15427,10 @@ public final <B> Observable<Observable<T>> window(ObservableSource<B> boundary,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <U, V> Observable<Observable<T>> window(
-            ObservableSource<U> openingIndicator,
-            Function<? super U, ? extends ObservableSource<V>> closingIndicator) {
+            @NonNull ObservableSource<U> openingIndicator,
+            @NonNull Function<? super U, ? extends ObservableSource<V>> closingIndicator) {
         return window(openingIndicator, closingIndicator, bufferSize());
     }
 
@@ -15028,9 +15466,10 @@ public final <U, V> Observable<Observable<T>> window(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <U, V> Observable<Observable<T>> window(
-            ObservableSource<U> openingIndicator,
-            Function<? super U, ? extends ObservableSource<V>> closingIndicator, int bufferSize) {
+            @NonNull ObservableSource<U> openingIndicator,
+            @NonNull Function<? super U, ? extends ObservableSource<V>> closingIndicator, int bufferSize) {
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
         Objects.requireNonNull(closingIndicator, "closingIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -15063,7 +15502,8 @@ public final <U, V> Observable<Observable<T>> window(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> withLatestFrom(ObservableSource<? extends U> other, BiFunction<? super T, ? super U, ? extends R> combiner) {
+    @NonNull
+    public final <U, R> Observable<R> withLatestFrom(@NonNull ObservableSource<? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(combiner, "combiner is null");
 
@@ -15088,22 +15528,23 @@ public final <U, R> Observable<R> withLatestFrom(ObservableSource<? extends U> o
      * @param <T1> the first other source's value type
      * @param <T2> the second other source's value type
      * @param <R> the result value type
-     * @param o1 the first other ObservableSource
-     * @param o2 the second other ObservableSource
+     * @param source1 the first other ObservableSource
+     * @param source2 the second other ObservableSource
      * @param combiner the function called with an array of values from each participating ObservableSource
      * @return the new ObservableSource instance
      * @since 2.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <T1, T2, R> Observable<R> withLatestFrom(
-            ObservableSource<T1> o1, ObservableSource<T2> o2,
-            Function3<? super T, ? super T1, ? super T2, R> combiner) {
-        Objects.requireNonNull(o1, "o1 is null");
-        Objects.requireNonNull(o2, "o2 is null");
+            @NonNull ObservableSource<T1> source1, @NonNull ObservableSource<T2> source2,
+            @NonNull Function3<? super T, ? super T1, ? super T2, R> combiner) {
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(combiner, "combiner is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
-        return withLatestFrom(new ObservableSource[] { o1, o2 }, f);
+        return withLatestFrom(new ObservableSource[] { source1, source2 }, f);
     }
 
     /**
@@ -15125,25 +15566,26 @@ public final <T1, T2, R> Observable<R> withLatestFrom(
      * @param <T2> the second other source's value type
      * @param <T3> the third other source's value type
      * @param <R> the result value type
-     * @param o1 the first other ObservableSource
-     * @param o2 the second other ObservableSource
-     * @param o3 the third other ObservableSource
+     * @param source1 the first other ObservableSource
+     * @param source2 the second other ObservableSource
+     * @param source3 the third other ObservableSource
      * @param combiner the function called with an array of values from each participating ObservableSource
      * @return the new ObservableSource instance
      * @since 2.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <T1, T2, T3, R> Observable<R> withLatestFrom(
-            ObservableSource<T1> o1, ObservableSource<T2> o2,
-            ObservableSource<T3> o3,
-            Function4<? super T, ? super T1, ? super T2, ? super T3, R> combiner) {
-        Objects.requireNonNull(o1, "o1 is null");
-        Objects.requireNonNull(o2, "o2 is null");
-        Objects.requireNonNull(o3, "o3 is null");
+            @NonNull ObservableSource<T1> source1, @NonNull ObservableSource<T2> source2,
+            @NonNull ObservableSource<T3> source3,
+            @NonNull Function4<? super T, ? super T1, ? super T2, ? super T3, R> combiner) {
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(combiner, "combiner is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
-        return withLatestFrom(new ObservableSource[] { o1, o2, o3 }, f);
+        return withLatestFrom(new ObservableSource[] { source1, source2, source3 }, f);
     }
 
     /**
@@ -15166,27 +15608,28 @@ public final <T1, T2, T3, R> Observable<R> withLatestFrom(
      * @param <T3> the third other source's value type
      * @param <T4> the fourth other source's value type
      * @param <R> the result value type
-     * @param o1 the first other ObservableSource
-     * @param o2 the second other ObservableSource
-     * @param o3 the third other ObservableSource
-     * @param o4 the fourth other ObservableSource
+     * @param source1 the first other ObservableSource
+     * @param source2 the second other ObservableSource
+     * @param source3 the third other ObservableSource
+     * @param source4 the fourth other ObservableSource
      * @param combiner the function called with an array of values from each participating ObservableSource
      * @return the new ObservableSource instance
      * @since 2.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
-            ObservableSource<T1> o1, ObservableSource<T2> o2,
-            ObservableSource<T3> o3, ObservableSource<T4> o4,
-            Function5<? super T, ? super T1, ? super T2, ? super T3, ? super T4, R> combiner) {
-        Objects.requireNonNull(o1, "o1 is null");
-        Objects.requireNonNull(o2, "o2 is null");
-        Objects.requireNonNull(o3, "o3 is null");
-        Objects.requireNonNull(o4, "o4 is null");
+            @NonNull ObservableSource<T1> source1, @NonNull ObservableSource<T2> source2,
+            @NonNull ObservableSource<T3> source3, @NonNull ObservableSource<T4> source4,
+            @NonNull Function5<? super T, ? super T1, ? super T2, ? super T3, ? super T4, R> combiner) {
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(combiner, "combiner is null");
         Function<Object[], R> f = Functions.toFunction(combiner);
-        return withLatestFrom(new ObservableSource[] { o1, o2, o3, o4 }, f);
+        return withLatestFrom(new ObservableSource[] { source1, source2, source3, source4 }, f);
     }
 
     /**
@@ -15212,7 +15655,8 @@ public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> withLatestFrom(ObservableSource<?>[] others, Function<? super Object[], R> combiner) {
+    @NonNull
+    public final <R> Observable<R> withLatestFrom(@NonNull ObservableSource<?>[] others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<>(this, others, combiner));
@@ -15241,7 +15685,8 @@ public final <R> Observable<R> withLatestFrom(ObservableSource<?>[] others, Func
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> withLatestFrom(Iterable<? extends ObservableSource<?>> others, Function<? super Object[], R> combiner) {
+    @NonNull
+    public final <R> Observable<R> withLatestFrom(@NonNull Iterable<? extends ObservableSource<?>> others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<>(this, others, combiner));
@@ -15275,7 +15720,8 @@ public final <R> Observable<R> withLatestFrom(Iterable<? extends ObservableSourc
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> zipWith(Iterable<U> other,  BiFunction<? super T, ? super U, ? extends R> zipper) {
+    @NonNull
+    public final <U, R> Observable<R> zipWith(@NonNull Iterable<U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(zipper, "zipper is null");
         return RxJavaPlugins.onAssembly(new ObservableZipIterable<T, U, R>(this, other, zipper));
@@ -15318,8 +15764,9 @@ public final <U, R> Observable<R> zipWith(Iterable<U> other,  BiFunction<? super
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> zipWith(ObservableSource<? extends U> other,
-            BiFunction<? super T, ? super U, ? extends R> zipper) {
+    @NonNull
+    public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U> other,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
     }
@@ -15364,8 +15811,9 @@ public final <U, R> Observable<R> zipWith(ObservableSource<? extends U> other,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> zipWith(ObservableSource<? extends U> other,
-            BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError) {
+    @NonNull
+    public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U> other,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError) {
         return zip(this, other, zipper, delayError);
     }
 
@@ -15411,8 +15859,9 @@ public final <U, R> Observable<R> zipWith(ObservableSource<? extends U> other,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Observable<R> zipWith(ObservableSource<? extends U> other,
-            BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError, int bufferSize) {
+    @NonNull
+    public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U> other,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError, int bufferSize) {
         return zip(this, other, zipper, delayError, bufferSize);
     }
 
@@ -15431,6 +15880,7 @@ public final <U, R> Observable<R> zipWith(ObservableSource<? extends U> other,
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestObserver<T> test() { // NoPMD
         TestObserver<T> to = new TestObserver<>();
         subscribe(to);
@@ -15451,6 +15901,7 @@ public final TestObserver<T> test() { // NoPMD
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final TestObserver<T> test(boolean dispose) { // NoPMD
         TestObserver<T> to = new TestObserver<>();
         if (dispose) {
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index ce7ef85608..8bd0f1db4e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -927,7 +927,7 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> merge(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
         return merge(Flowable.fromIterable(sources));
     }
 
@@ -1615,6 +1615,7 @@ public static <T1, T2, R> Single<R> zip(
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2);
     }
 
@@ -1655,6 +1656,7 @@ public static <T1, T2, T3, R> Single<R> zip(
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3);
     }
 
@@ -1699,6 +1701,7 @@ public static <T1, T2, T3, T4, R> Single<R> zip(
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4);
     }
 
@@ -1748,6 +1751,7 @@ public static <T1, T2, T3, T4, T5, R> Single<R> zip(
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5);
     }
 
@@ -1801,6 +1805,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(
         Objects.requireNonNull(source4, "source4 is null");
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6);
     }
 
@@ -1859,6 +1864,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(
         Objects.requireNonNull(source5, "source5 is null");
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7);
     }
 
@@ -1921,6 +1927,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(
         Objects.requireNonNull(source6, "source6 is null");
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8);
     }
 
@@ -1988,6 +1995,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(
         Objects.requireNonNull(source7, "source7 is null");
         Objects.requireNonNull(source8, "source8 is null");
         Objects.requireNonNull(source9, "source9 is null");
+        Objects.requireNonNull(zipper, "zipper is null");
         return zipArray(Functions.toFunction(zipper), source1, source2, source3, source4, source5, source6, source7, source8, source9);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
index 3a75ac5f3e..eaf067c177 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
@@ -41,7 +41,7 @@ public CompositeDisposable() {
      */
     public CompositeDisposable(@NonNull Disposable... disposables) {
         Objects.requireNonNull(disposables, "disposables is null");
-        this.resources = new OpenHashSet<Disposable>(disposables.length + 1);
+        this.resources = new OpenHashSet<>(disposables.length + 1);
         for (Disposable d : disposables) {
             Objects.requireNonNull(d, "A Disposable in the disposables array is null");
             this.resources.add(d);
@@ -55,7 +55,7 @@ public CompositeDisposable(@NonNull Disposable... disposables) {
      */
     public CompositeDisposable(@NonNull Iterable<? extends Disposable> disposables) {
         Objects.requireNonNull(disposables, "disposables is null");
-        this.resources = new OpenHashSet<Disposable>();
+        this.resources = new OpenHashSet<>();
         for (Disposable d : disposables) {
             Objects.requireNonNull(d, "A Disposable item in the disposables sequence is null");
             this.resources.add(d);
@@ -100,7 +100,7 @@ public boolean add(@NonNull Disposable disposable) {
                 if (!disposed) {
                     OpenHashSet<Disposable> set = resources;
                     if (set == null) {
-                        set = new OpenHashSet<Disposable>();
+                        set = new OpenHashSet<>();
                         resources = set;
                     }
                     set.add(disposable);
@@ -126,7 +126,7 @@ public boolean addAll(@NonNull Disposable... disposables) {
                 if (!disposed) {
                     OpenHashSet<Disposable> set = resources;
                     if (set == null) {
-                        set = new OpenHashSet<Disposable>(disposables.length + 1);
+                        set = new OpenHashSet<>(disposables.length + 1);
                         resources = set;
                     }
                     for (Disposable d : disposables) {
@@ -239,7 +239,7 @@ void dispose(OpenHashSet<Disposable> set) {
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     if (errors == null) {
-                        errors = new ArrayList<Throwable>();
+                        errors = new ArrayList<>();
                     }
                     errors.add(ex);
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java
index d2c7ddee4b..1f408f8c94 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java
@@ -30,7 +30,7 @@ public final class SerialDisposable implements Disposable {
      * Constructs an empty SerialDisposable.
      */
     public SerialDisposable() {
-        this.resource = new AtomicReference<Disposable>();
+        this.resource = new AtomicReference<>();
     }
 
     /**
@@ -38,7 +38,7 @@ public SerialDisposable() {
      * @param initialDisposable the initial Disposable instance to use, null allowed
      */
     public SerialDisposable(@Nullable Disposable initialDisposable) {
-        this.resource = new AtomicReference<Disposable>(initialDisposable);
+        this.resource = new AtomicReference<>(initialDisposable);
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
index aa08128917..85b06bd313 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
@@ -62,8 +62,8 @@ public CompositeException(@NonNull Throwable... exceptions) {
      * @throws IllegalArgumentException if <code>errors</code> is empty.
      */
     public CompositeException(@NonNull Iterable<? extends Throwable> errors) {
-        Set<Throwable> deDupedExceptions = new LinkedHashSet<Throwable>();
-        List<Throwable> localExceptions = new ArrayList<Throwable>();
+        Set<Throwable> deDupedExceptions = new LinkedHashSet<>();
+        List<Throwable> localExceptions = new ArrayList<>();
         if (errors != null) {
             for (Throwable ex : errors) {
                 if (ex instanceof CompositeException) {
@@ -108,7 +108,7 @@ public synchronized Throwable getCause() { // NOPMD
         if (cause == null) {
             String separator = System.getProperty("line.separator");
             if (exceptions.size() > 1) {
-                Map<Throwable, Boolean> seenCauses = new IdentityHashMap<Throwable, Boolean>();
+                Map<Throwable, Boolean> seenCauses = new IdentityHashMap<>();
 
                 StringBuilder aggregateMessage = new StringBuilder();
                 aggregateMessage.append("Multiple exceptions (").append(exceptions.size()).append(")").append(separator);
diff --git a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
index 6916d219bf..3c51f1c3bc 100644
--- a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
@@ -59,20 +59,30 @@ public abstract class ConnectableFlowable<T> extends Flowable<T> {
     /**
      * Instructs the {@code ConnectableFlowable} to begin emitting the items from its underlying
      * {@link Flowable} to its {@link Subscriber}s.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>The behavior is determined by the implementor of this abstract class.</dd>
+     * </dl>
      *
      * @param connection
      *          the action that receives the connection subscription before the subscription to source happens
      *          allowing the caller to synchronously disconnect a synchronous source
      * @see <a href="http://reactivex.io/documentation/operators/connect.html">ReactiveX documentation: Connect</a>
      */
+    @SchedulerSupport(SchedulerSupport.NONE)
     public abstract void connect(@NonNull Consumer<? super Disposable> connection);
 
     /**
      * Resets this ConnectableFlowable into its fresh state if it has terminated.
      * <p>
      * Calling this method on a fresh or active {@code ConnectableFlowable} has no effect.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>The behavior is determined by the implementor of this abstract class.</dd>
+     * </dl>
      * @since 3.0.0
      */
+    @SchedulerSupport(SchedulerSupport.NONE)
     public abstract void reset();
 
     /**
@@ -80,10 +90,16 @@ public abstract class ConnectableFlowable<T> extends Flowable<T> {
      * {@link Flowable} to its {@link Subscriber}s.
      * <p>
      * To disconnect from a synchronous source, use the {@link #connect(io.reactivex.rxjava3.functions.Consumer)} method.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>The behavior is determined by the implementor of this abstract class.</dd>
+     * </dl>
      *
      * @return the subscription representing the connection
      * @see <a href="http://reactivex.io/documentation/operators/connect.html">ReactiveX documentation: Connect</a>
      */
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable connect() {
         ConnectConsumer cc = new ConnectConsumer();
         connect(cc);
@@ -111,7 +127,7 @@ public final Disposable connect() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public Flowable<T> refCount() {
-        return RxJavaPlugins.onAssembly(new FlowableRefCount<T>(this));
+        return RxJavaPlugins.onAssembly(new FlowableRefCount<>(this));
     }
 
     /**
@@ -132,6 +148,7 @@ public Flowable<T> refCount() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @NonNull
     public final Flowable<T> refCount(int subscriberCount) {
         return refCount(subscriberCount, 0, TimeUnit.NANOSECONDS, Schedulers.trampoline());
     }
@@ -157,7 +174,8 @@ public final Flowable<T> refCount(int subscriberCount) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final Flowable<T> refCount(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> refCount(long timeout, @NonNull TimeUnit unit) {
         return refCount(1, timeout, unit, Schedulers.computation());
     }
 
@@ -182,7 +200,8 @@ public final Flowable<T> refCount(long timeout, TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final Flowable<T> refCount(long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> refCount(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return refCount(1, timeout, unit, scheduler);
     }
 
@@ -208,7 +227,8 @@ public final Flowable<T> refCount(long timeout, TimeUnit unit, Scheduler schedul
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final Flowable<T> refCount(int subscriberCount, long timeout, TimeUnit unit) {
+    @NonNull
+    public final Flowable<T> refCount(int subscriberCount, long timeout, @NonNull TimeUnit unit) {
         return refCount(subscriberCount, timeout, unit, Schedulers.computation());
     }
 
@@ -234,11 +254,12 @@ public final Flowable<T> refCount(int subscriberCount, long timeout, TimeUnit un
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final Flowable<T> refCount(int subscriberCount, long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Flowable<T> refCount(int subscriberCount, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         ObjectHelper.verifyPositive(subscriberCount, "subscriberCount");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableRefCount<T>(this, subscriberCount, timeout, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new FlowableRefCount<>(this, subscriberCount, timeout, unit, scheduler));
     }
 
     /**
@@ -256,6 +277,13 @@ public final Flowable<T> refCount(int subscriberCount, long timeout, TimeUnit un
      * This overload does not allow disconnecting the connection established via
      * {@link #connect(Consumer)}. Use the {@link #autoConnect(int, Consumer)} overload
      * to gain access to the {@code Disposable} representing the only connection.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator itself doesn't interfere with backpressure which is determined by
+     *  the upstream {@code ConnectableFlowable}'s behavior.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code autoConnect} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @return a Flowable that automatically connects to this ConnectableFlowable
      *         when the first Subscriber subscribes
@@ -263,6 +291,9 @@ public final Flowable<T> refCount(int subscriberCount, long timeout, TimeUnit un
      * @see #autoConnect(int, Consumer)
      */
     @NonNull
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public Flowable<T> autoConnect() {
         return autoConnect(1);
     }
@@ -281,6 +312,13 @@ public Flowable<T> autoConnect() {
      * This overload does not allow disconnecting the connection established via
      * {@link #connect(Consumer)}. Use the {@link #autoConnect(int, Consumer)} overload
      * to gain access to the {@code Disposable} representing the only connection.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator itself doesn't interfere with backpressure which is determined by
+     *  the upstream {@code ConnectableFlowable}'s behavior.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code autoConnect} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param numberOfSubscribers the number of subscribers to await before calling connect
      *                            on the ConnectableFlowable. A non-positive value indicates
@@ -289,6 +327,9 @@ public Flowable<T> autoConnect() {
      *         when the specified number of Subscribers subscribe to it
      */
     @NonNull
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public Flowable<T> autoConnect(int numberOfSubscribers) {
         return autoConnect(numberOfSubscribers, Functions.emptyConsumer());
     }
@@ -305,6 +346,13 @@ public Flowable<T> autoConnect(int numberOfSubscribers) {
      * terminates, the connection is never renewed, no matter how Subscribers come
      * and go. Use {@link #refCount()} to renew a connection or dispose an active
      * connection when all {@code Subscriber}s have cancelled their {@code Subscription}s.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator itself doesn't interfere with backpressure which is determined by
+     *  the upstream {@code ConnectableFlowable}'s behavior.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code autoConnect} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param numberOfSubscribers the number of subscribers to await before calling connect
      *                            on the ConnectableFlowable. A non-positive value indicates
@@ -316,11 +364,14 @@ public Flowable<T> autoConnect(int numberOfSubscribers) {
      *         specified callback with the Subscription associated with the established connection
      */
     @NonNull
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public Flowable<T> autoConnect(int numberOfSubscribers, @NonNull Consumer<? super Disposable> connection) {
         if (numberOfSubscribers <= 0) {
             this.connect(connection);
             return RxJavaPlugins.onAssembly(this);
         }
-        return RxJavaPlugins.onAssembly(new FlowableAutoConnect<T>(this, numberOfSubscribers, connection));
+        return RxJavaPlugins.onAssembly(new FlowableAutoConnect<>(this, numberOfSubscribers, connection));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
index 2dcbbdea50..05d1997893 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
@@ -17,6 +17,7 @@
 
 import org.reactivestreams.Subscription;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException;
 import io.reactivex.rxjava3.functions.*;
@@ -33,47 +34,47 @@ private Functions() {
         throw new IllegalStateException("No instances!");
     }
 
-    public static <T1, T2, R> Function<Object[], R> toFunction(final BiFunction<? super T1, ? super T2, ? extends R> f) {
-        Objects.requireNonNull(f, "f is null");
+    @NonNull
+    public static <T1, T2, R> Function<Object[], R> toFunction(@NonNull BiFunction<? super T1, ? super T2, ? extends R> f) {
         return new Array2Func<T1, T2, R>(f);
     }
 
-    public static <T1, T2, T3, R> Function<Object[], R> toFunction(final Function3<T1, T2, T3, R> f) {
-        Objects.requireNonNull(f, "f is null");
+    @NonNull
+    public static <T1, T2, T3, R> Function<Object[], R> toFunction(@NonNull Function3<T1, T2, T3, R> f) {
         return new Array3Func<T1, T2, T3, R>(f);
     }
 
-    public static <T1, T2, T3, T4, R> Function<Object[], R> toFunction(final Function4<T1, T2, T3, T4, R> f) {
-        Objects.requireNonNull(f, "f is null");
+    @NonNull
+    public static <T1, T2, T3, T4, R> Function<Object[], R> toFunction(@NonNull Function4<T1, T2, T3, T4, R> f) {
         return new Array4Func<T1, T2, T3, T4, R>(f);
     }
 
-    public static <T1, T2, T3, T4, T5, R> Function<Object[], R> toFunction(final Function5<T1, T2, T3, T4, T5, R> f) {
-        Objects.requireNonNull(f, "f is null");
+    @NonNull
+    public static <T1, T2, T3, T4, T5, R> Function<Object[], R> toFunction(@NonNull Function5<T1, T2, T3, T4, T5, R> f) {
         return new Array5Func<T1, T2, T3, T4, T5, R>(f);
     }
 
+    @NonNull
     public static <T1, T2, T3, T4, T5, T6, R> Function<Object[], R> toFunction(
-            final Function6<T1, T2, T3, T4, T5, T6, R> f) {
-        Objects.requireNonNull(f, "f is null");
+            @NonNull Function6<T1, T2, T3, T4, T5, T6, R> f) {
         return new Array6Func<T1, T2, T3, T4, T5, T6, R>(f);
     }
 
+    @NonNull
     public static <T1, T2, T3, T4, T5, T6, T7, R> Function<Object[], R> toFunction(
-            final Function7<T1, T2, T3, T4, T5, T6, T7, R> f) {
-        Objects.requireNonNull(f, "f is null");
+            @NonNull Function7<T1, T2, T3, T4, T5, T6, T7, R> f) {
         return new Array7Func<T1, T2, T3, T4, T5, T6, T7, R>(f);
     }
 
+    @NonNull
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Function<Object[], R> toFunction(
-            final Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> f) {
-        Objects.requireNonNull(f, "f is null");
+            @NonNull Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> f) {
         return new Array8Func<T1, T2, T3, T4, T5, T6, T7, T8, R>(f);
     }
 
+    @NonNull
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Function<Object[], R> toFunction(
-            final Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> f) {
-        Objects.requireNonNull(f, "f is null");
+            @NonNull Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> f) {
         return new Array9Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, R>(f);
     }
 
@@ -86,6 +87,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Function<Object[], R> toFu
      * @return the identity function
      */
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Function<T, T> identity() {
         return (Function<T, T>)IDENTITY;
     }
@@ -125,16 +127,19 @@ public static <T> Consumer<T> emptyConsumer() {
     static final Comparator<Object> NATURAL_COMPARATOR = new NaturalObjectComparator();
 
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Predicate<T> alwaysTrue() {
         return (Predicate<T>)ALWAYS_TRUE;
     }
 
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Predicate<T> alwaysFalse() {
         return (Predicate<T>)ALWAYS_FALSE;
     }
 
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Supplier<T> nullSupplier() {
         return (Supplier<T>)NULL_SUPPLIER;
     }
@@ -145,6 +150,7 @@ public static <T> Supplier<T> nullSupplier() {
      * @return a natural order comparator which casts the parameters to Comparable
      */
     @SuppressWarnings("unchecked")
+    @NonNull
     public static <T> Comparator<T> naturalOrder() {
         return (Comparator<T>)NATURAL_COMPARATOR;
     }
@@ -167,7 +173,8 @@ public void run() throws Exception {
      * @param future the future to call get() on, not null
      * @return the new Action instance
      */
-    public static Action futureAction(Future<?> future) {
+    @NonNull
+    public static Action futureAction(@NonNull Future<?> future) {
         return new FutureAction(future);
     }
 
@@ -200,7 +207,8 @@ public U get() throws Throwable {
      * @param value the value to return
      * @return the new Callable instance
      */
-    public static <T> Callable<T> justCallable(T value) {
+    @NonNull
+    public static <T> Callable<T> justCallable(@NonNull T value) {
         return new JustValue<Object, T>(value);
     }
 
@@ -210,7 +218,8 @@ public static <T> Callable<T> justCallable(T value) {
      * @param value the value to return
      * @return the new Callable instance
      */
-    public static <T> Supplier<T> justSupplier(T value) {
+    @NonNull
+    public static <T> Supplier<T> justSupplier(@NonNull T value) {
         return new JustValue<Object, T>(value);
     }
 
@@ -221,7 +230,8 @@ public static <T> Supplier<T> justSupplier(T value) {
      * @param value the value to return
      * @return the new Function instance
      */
-    public static <T, U> Function<T, U> justFunction(U value) {
+    @NonNull
+    public static <T, U> Function<T, U> justFunction(@NonNull U value) {
         return new JustValue<T, U>(value);
     }
 
@@ -245,7 +255,8 @@ public U apply(T t) throws Exception {
      * @param target the target class
      * @return the new Function instance
      */
-    public static <T, U> Function<T, U> castFunction(Class<U> target) {
+    @NonNull
+    public static <T, U> Function<T, U> castFunction(@NonNull Class<U> target) {
         return new CastToClass<T, U>(target);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
index 1a9b942011..192743187e 100644
--- a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
@@ -56,12 +56,17 @@ public abstract class ConnectableObservable<T> extends Observable<T> {
     /**
      * Instructs the {@code ConnectableObservable} to begin emitting the items from its underlying
      * {@link Observable} to its {@link Observer}s.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>The behavior is determined by the implementor of this abstract class.</dd>
+     * </dl>
      *
      * @param connection
      *          the action that receives the connection subscription before the subscription to source happens
      *          allowing the caller to synchronously disconnect a synchronous source
      * @see <a href="http://reactivex.io/documentation/operators/connect.html">ReactiveX documentation: Connect</a>
      */
+    @SchedulerSupport(SchedulerSupport.NONE)
     public abstract void connect(@NonNull Consumer<? super Disposable> connection);
 
     /**
@@ -69,8 +74,13 @@ public abstract class ConnectableObservable<T> extends Observable<T> {
      * or has been disposed.
      * <p>
      * Calling this method on a fresh or active {@code ConnectableObservable} has no effect.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>The behavior is determined by the implementor of this abstract class.</dd>
+     * </dl>
      * @since 3.0.0
      */
+    @SchedulerSupport(SchedulerSupport.NONE)
     public abstract void reset();
 
     /**
@@ -78,10 +88,16 @@ public abstract class ConnectableObservable<T> extends Observable<T> {
      * {@link Observable} to its {@link Observer}s.
      * <p>
      * To disconnect from a synchronous source, use the {@link #connect(Consumer)} method.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>The behavior is determined by the implementor of this abstract class.</dd>
+     * </dl>
      *
      * @return the subscription representing the connection
      * @see <a href="http://reactivex.io/documentation/operators/connect.html">ReactiveX documentation: Connect</a>
      */
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable connect() {
         ConnectConsumer cc = new ConnectConsumer();
         connect(cc);
@@ -105,7 +121,7 @@ public final Disposable connect() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public Observable<T> refCount() {
-        return RxJavaPlugins.onAssembly(new ObservableRefCount<T>(this));
+        return RxJavaPlugins.onAssembly(new ObservableRefCount<>(this));
     }
 
     /**
@@ -122,6 +138,7 @@ public Observable<T> refCount() {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
     public final Observable<T> refCount(int subscriberCount) {
         return refCount(subscriberCount, 0, TimeUnit.NANOSECONDS, Schedulers.trampoline());
     }
@@ -143,7 +160,8 @@ public final Observable<T> refCount(int subscriberCount) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> refCount(long timeout, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> refCount(long timeout, @NonNull TimeUnit unit) {
         return refCount(1, timeout, unit, Schedulers.computation());
     }
 
@@ -164,7 +182,8 @@ public final Observable<T> refCount(long timeout, TimeUnit unit) {
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> refCount(long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> refCount(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         return refCount(1, timeout, unit, scheduler);
     }
 
@@ -186,7 +205,8 @@ public final Observable<T> refCount(long timeout, TimeUnit unit, Scheduler sched
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Observable<T> refCount(int subscriberCount, long timeout, TimeUnit unit) {
+    @NonNull
+    public final Observable<T> refCount(int subscriberCount, long timeout, @NonNull TimeUnit unit) {
         return refCount(subscriberCount, timeout, unit, Schedulers.computation());
     }
 
@@ -208,11 +228,12 @@ public final Observable<T> refCount(int subscriberCount, long timeout, TimeUnit
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Observable<T> refCount(int subscriberCount, long timeout, TimeUnit unit, Scheduler scheduler) {
+    @NonNull
+    public final Observable<T> refCount(int subscriberCount, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         ObjectHelper.verifyPositive(subscriberCount, "subscriberCount");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableRefCount<T>(this, subscriberCount, timeout, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableRefCount<>(this, subscriberCount, timeout, unit, scheduler));
     }
 
     /**
@@ -230,11 +251,17 @@ public final Observable<T> refCount(int subscriberCount, long timeout, TimeUnit
      * This overload does not allow disconnecting the connection established via
      * {@link #connect(Consumer)}. Use the {@link #autoConnect(int, Consumer)} overload
      * to gain access to the {@code Disposable} representing the only connection.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code autoConnect} overload does not operate on any particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @return an Observable that automatically connects to this ConnectableObservable
      *         when the first Observer subscribes
      */
     @NonNull
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
     public Observable<T> autoConnect() {
         return autoConnect(1);
     }
@@ -254,6 +281,10 @@ public Observable<T> autoConnect() {
      * This overload does not allow disconnecting the connection established via
      * {@link #connect(Consumer)}. Use the {@link #autoConnect(int, Consumer)} overload
      * to gain access to the {@code Disposable} representing the only connection.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code autoConnect} overload does not operate on any particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param numberOfSubscribers the number of subscribers to await before calling connect
      *                            on the ConnectableObservable. A non-positive value indicates
@@ -262,6 +293,8 @@ public Observable<T> autoConnect() {
      *         when the specified number of Subscribers subscribe to it
      */
     @NonNull
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
     public Observable<T> autoConnect(int numberOfSubscribers) {
         return autoConnect(numberOfSubscribers, Functions.emptyConsumer());
     }
@@ -278,6 +311,10 @@ public Observable<T> autoConnect(int numberOfSubscribers) {
      * terminates, the connection is never renewed, no matter how Observers come
      * and go. Use {@link #refCount()} to renew a connection or dispose an active
      * connection when all {@code Observer}s have disposed their {@code Disposable}s.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code autoConnect} overload does not operate on any particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param numberOfSubscribers the number of subscribers to await before calling connect
      *                            on the ConnectableObservable. A non-positive value indicates
@@ -289,11 +326,13 @@ public Observable<T> autoConnect(int numberOfSubscribers) {
      *         specified callback with the Subscription associated with the established connection
      */
     @NonNull
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
     public Observable<T> autoConnect(int numberOfSubscribers, @NonNull Consumer<? super Disposable> connection) {
         if (numberOfSubscribers <= 0) {
             this.connect(connection);
             return RxJavaPlugins.onAssembly(this);
         }
-        return RxJavaPlugins.onAssembly(new ObservableAutoConnect<T>(this, numberOfSubscribers, connection));
+        return RxJavaPlugins.onAssembly(new ObservableAutoConnect<>(this, numberOfSubscribers, connection));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index afa2eddcf0..d4dff1cbb0 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -37,22 +37,31 @@
  * @param <T> the value type
  * @since 2.2
  */
-public abstract class ParallelFlowable<T> {
+public abstract class ParallelFlowable<@NonNull T> {
 
     /**
      * Subscribes an array of Subscribers to this ParallelFlowable and triggers
      * the execution chain for all 'rails'.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The backpressure behavior/expectation is determined by the supplied {@code Subscriber}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param subscribers the subscribers array to run in parallel, the number
      * of items must be equal to the parallelism level of this ParallelFlowable
      * @see #parallelism()
      */
+    @BackpressureSupport(BackpressureKind.SPECIAL)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public abstract void subscribe(@NonNull Subscriber<? super T>[] subscribers);
 
     /**
      * Returns the number of expected parallel Subscribers.
      * @return the number of expected parallel Subscribers
      */
+    @CheckReturnValue
     public abstract int parallelism();
 
     /**
@@ -77,24 +86,46 @@ protected final boolean validate(@NonNull Subscriber<?>[] subscribers) {
     /**
      * Take a Publisher and prepare to consume it on multiple 'rails' (number of CPUs)
      * in a round-robin fashion.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the backpressure of the parallel rails and
+     *  requests {@link Flowable#bufferSize} amount from the upstream, followed
+     *  by 75% of that amount requested after every 75% received.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code from} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * @param <T> the value type
      * @param source the source Publisher
      * @return the ParallelFlowable instance
      */
     @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
     public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source) {
         return from(source, Runtime.getRuntime().availableProcessors(), Flowable.bufferSize());
     }
 
     /**
      * Take a Publisher and prepare to consume it on parallelism number of 'rails' in a round-robin fashion.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the backpressure of the parallel rails and
+     *  requests {@link Flowable#bufferSize} amount from the upstream, followed
+     *  by 75% of that amount requested after every 75% received.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code from} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * @param <T> the value type
      * @param source the source Publisher
      * @param parallelism the number of parallel rails
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
-    public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source, int parallelism) {
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source, int parallelism) {
         return from(source, parallelism, Flowable.bufferSize());
     }
 
@@ -102,6 +133,14 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
      * Take a Publisher and prepare to consume it on parallelism number of 'rails' ,
      * possibly ordered and round-robin fashion and use custom prefetch amount and queue
      * for dealing with the source Publisher's values.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the backpressure of the parallel rails and
+     *  requests the {@code prefetch} amount from the upstream, followed
+     *  by 75% of that amount requested after every 75% received.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code from} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * @param <T> the value type
      * @param source the source Publisher
      * @param parallelism the number of parallel rails
@@ -111,7 +150,9 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
      */
     @CheckReturnValue
     @NonNull
-    public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source,
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source,
             int parallelism, int prefetch) {
         Objects.requireNonNull(source, "source");
         ObjectHelper.verifyPositive(parallelism, "parallelism");
@@ -124,12 +165,21 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
      * Maps the source values on each 'rail' to another value.
      * <p>
      * Note that the same mapper function may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * @param <R> the output value type
      * @param mapper the mapper function turning Ts into Us.
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
     @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper");
         return RxJavaPlugins.onAssembly(new ParallelMap<T, R>(this, mapper));
@@ -140,6 +190,13 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      * handles errors based on the given {@link ParallelFailureHandling} enumeration value.
      * <p>
      * Note that the same mapper function may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * <p>History: 2.0.8 - experimental
      * @param <R> the output value type
      * @param mapper the mapper function turning Ts into Us.
@@ -150,6 +207,8 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      */
     @CheckReturnValue
     @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull ParallelFailureHandling errorHandler) {
         Objects.requireNonNull(mapper, "mapper");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
@@ -161,6 +220,13 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      * handles errors based on the returned value by the handler function.
      * <p>
      * Note that the same mapper function may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * <p>History: 2.0.8 - experimental
      * @param <R> the output value type
      * @param mapper the mapper function turning Ts into Us.
@@ -172,6 +238,8 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      */
     @CheckReturnValue
     @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
         Objects.requireNonNull(mapper, "mapper");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
@@ -182,13 +250,23 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      * Filters the source values on each 'rail'.
      * <p>
      * Note that the same predicate may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code filter} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * @param predicate the function returning true to keep a value or false to drop a value
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate) {
         Objects.requireNonNull(predicate, "predicate");
-        return RxJavaPlugins.onAssembly(new ParallelFilter<T>(this, predicate));
+        return RxJavaPlugins.onAssembly(new ParallelFilter<>(this, predicate));
     }
 
     /**
@@ -196,6 +274,13 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate)
      * handles errors based on the given {@link ParallelFailureHandling} enumeration value.
      * <p>
      * Note that the same predicate may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code filter} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * <p>History: 2.0.8 - experimental
      * @param predicate the function returning true to keep a value or false to drop a value
      * @param errorHandler the enumeration that defines how to handle errors thrown
@@ -204,10 +289,13 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate)
      * @since 2.2
      */
     @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate, @NonNull ParallelFailureHandling errorHandler) {
         Objects.requireNonNull(predicate, "predicate");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
-        return RxJavaPlugins.onAssembly(new ParallelFilterTry<T>(this, predicate, errorHandler));
+        return RxJavaPlugins.onAssembly(new ParallelFilterTry<>(this, predicate, errorHandler));
     }
 
     /**
@@ -215,6 +303,13 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate,
      * handles errors based on the returned value by the handler function.
      * <p>
      * Note that the same predicate may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * <p>History: 2.0.8 - experimental
      * @param predicate the function returning true to keep a value or false to drop a value
      * @param errorHandler the function called with the current repeat count and
@@ -224,10 +319,13 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate,
      * @since 2.2
      */
     @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
         Objects.requireNonNull(predicate, "predicate");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
-        return RxJavaPlugins.onAssembly(new ParallelFilterTry<T>(this, predicate, errorHandler));
+        return RxJavaPlugins.onAssembly(new ParallelFilterTry<>(this, predicate, errorHandler));
     }
 
     /**
@@ -245,12 +343,23 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate,
      * <p>
      * This operator doesn't require the Scheduler to be trampolining as it
      * does its own built-in trampolining logic.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the backpressure of the parallel rails and
+     *  requests {@link Flowable#bufferSize} amount from the upstream, followed
+     *  by 75% of that amount requested after every 75% received.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code runOn} drains the upstream rails on the specified {@link Scheduler}'s
+     *  {@link io.reactivex.rxjava3.core.Scheduler.Worker Worker}s.</dd>
+     * </dl>
      *
      * @param scheduler the scheduler to use
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler) {
         return runOn(scheduler, Flowable.bufferSize());
     }
@@ -270,6 +379,15 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler) {
      * <p>
      * This operator doesn't require the Scheduler to be trampolining as it
      * does its own built-in trampolining logic.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the backpressure of the parallel rails and
+     *  requests the {@code prefetch} amount from the upstream, followed
+     *  by 75% of that amount requested after every 75% received.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code runOn} drains the upstream rails on the specified {@link Scheduler}'s
+     *  {@link io.reactivex.rxjava3.core.Scheduler.Worker Worker}s.</dd>
+     * </dl>
      *
      * @param scheduler the scheduler to use
      * that rail's worker has run out of work.
@@ -278,10 +396,12 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler) {
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler, int prefetch) {
         Objects.requireNonNull(scheduler, "scheduler");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ParallelRunOn<T>(this, scheduler, prefetch));
+        return RxJavaPlugins.onAssembly(new ParallelRunOn<>(this, scheduler, prefetch));
     }
 
     /**
@@ -289,14 +409,23 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler, int prefetc
      * sequential value.
      * <p>
      * Note that the same reducer function may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream and consumes
+     *  the upstream rails in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code reduce} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * @param reducer the function to reduce two values into one.
      * @return the new Flowable instance emitting the reduced value or empty if the ParallelFlowable was empty
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
         Objects.requireNonNull(reducer, "reducer");
-        return RxJavaPlugins.onAssembly(new ParallelReduceFull<T>(this, reducer));
+        return RxJavaPlugins.onAssembly(new ParallelReduceFull<>(this, reducer));
     }
 
     /**
@@ -304,6 +433,13 @@ public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * a reducer function that is initialized on each rail from an initialSupplier value.
      * <p>
      * Note that the same mapper function may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and consumes
+     *  the upstream rails in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code reduce} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * @param <R> the reduced output type
      * @param initialSupplier the supplier for the initial value
      * @param reducer the function to reduce a previous output of reduce (or the initial value supplied)
@@ -312,10 +448,12 @@ public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> reduce(@NonNull Supplier<R> initialSupplier, @NonNull BiFunction<R, ? super T, R> reducer) {
         Objects.requireNonNull(initialSupplier, "initialSupplier");
         Objects.requireNonNull(reducer, "reducer");
-        return RxJavaPlugins.onAssembly(new ParallelReduce<T, R>(this, initialSupplier, reducer));
+        return RxJavaPlugins.onAssembly(new ParallelReduce<>(this, initialSupplier, reducer));
     }
 
     /**
@@ -327,7 +465,9 @@ public final <R> ParallelFlowable<R> reduce(@NonNull Supplier<R> initialSupplier
      * <img width="640" height="602" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallelflowable.sequential.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure.</dd>
+     *  <dd>The operator honors backpressure from the downstream and
+     *  requests {@link Flowable#bufferSize()} amount from each rail, then
+     *  requests from each rail 75% of this amount after 75% received.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequential} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -338,6 +478,7 @@ public final <R> ParallelFlowable<R> reduce(@NonNull Supplier<R> initialSupplier
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
+    @NonNull
     public final Flowable<T> sequential() {
         return sequential(Flowable.bufferSize());
     }
@@ -349,7 +490,9 @@ public final Flowable<T> sequential() {
      * <img width="640" height="602" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallelflowable.sequential.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure.</dd>
+     *  <dd>The operator honors backpressure from the downstream and
+     *  requests the {@code prefetch} amount from each rail, then
+     *  requests from each rail 75% of this amount after 75% received.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequential} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -364,7 +507,7 @@ public final Flowable<T> sequential() {
     @NonNull
     public final Flowable<T> sequential(int prefetch) {
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ParallelJoin<T>(this, prefetch, false));
+        return RxJavaPlugins.onAssembly(new ParallelJoin<>(this, prefetch, false));
     }
 
     /**
@@ -376,7 +519,9 @@ public final Flowable<T> sequential(int prefetch) {
      * <img width="640" height="602" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallelflowable.sequential.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure.</dd>
+     *  <dd>The operator honors backpressure from the downstream and
+     *  requests {@link Flowable#bufferSize()} amount from each rail, then
+     *  requests from each rail 75% of this amount after 75% received.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequentialDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -401,7 +546,9 @@ public final Flowable<T> sequentialDelayError() {
      * <img width="640" height="602" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallelflowable.sequential.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure.</dd>
+     *  <dd>The operator honors backpressure from the downstream and
+     *  requests the {@code prefetch} amount from each rail, then
+     *  requests from each rail 75% of this amount after 75% received.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequentialDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -418,7 +565,7 @@ public final Flowable<T> sequentialDelayError() {
     @NonNull
     public final Flowable<T> sequentialDelayError(int prefetch) {
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ParallelJoin<T>(this, prefetch, true));
+        return RxJavaPlugins.onAssembly(new ParallelJoin<>(this, prefetch, true));
     }
 
     /**
@@ -426,12 +573,21 @@ public final Flowable<T> sequentialDelayError(int prefetch) {
      * picks the smallest next value from the rails.
      * <p>
      * This operator requires a finite source ParallelFlowable.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream and
+     *  consumes the upstream rails in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code sorted} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param comparator the comparator to use
      * @return the new Flowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator) {
         return sorted(comparator, 16);
     }
@@ -441,6 +597,13 @@ public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator) {
      * picks the smallest next value from the rails.
      * <p>
      * This operator requires a finite source ParallelFlowable.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream and
+     *  consumes the upstream rails in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code sorted} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param comparator the comparator to use
      * @param capacityHint the expected number of total elements
@@ -448,6 +611,8 @@ public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator) {
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator, int capacityHint) {
         Objects.requireNonNull(comparator, "comparator is null");
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
@@ -455,19 +620,28 @@ public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator, int c
         ParallelFlowable<List<T>> railReduced = reduce(Functions.<T>createArrayList(ch), ListAddBiConsumer.<T>instance());
         ParallelFlowable<List<T>> railSorted = railReduced.map(new SorterFunction<T>(comparator));
 
-        return RxJavaPlugins.onAssembly(new ParallelSortedJoin<T>(railSorted, comparator));
+        return RxJavaPlugins.onAssembly(new ParallelSortedJoin<>(railSorted, comparator));
     }
 
     /**
      * Sorts the 'rails' according to the comparator and returns a full sorted list as a Publisher.
      * <p>
      * This operator requires a finite source ParallelFlowable.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream and
+     *  consumes the upstream rails in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param comparator the comparator to compare elements
      * @return the new Flowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> comparator) {
         return toSortedList(comparator, 16);
     }
@@ -475,6 +649,13 @@ public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> compa
      * Sorts the 'rails' according to the comparator and returns a full sorted list as a Publisher.
      * <p>
      * This operator requires a finite source ParallelFlowable.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream and
+     *  consumes the upstream rails in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param comparator the comparator to compare elements
      * @param capacityHint the expected number of total elements
@@ -482,7 +663,9 @@ public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> compa
      */
     @CheckReturnValue
     @NonNull
-    public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> comparator, int capacityHint) {
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Flowable<@NonNull List<T>> toSortedList(@NonNull Comparator<? super T> comparator, int capacityHint) {
         Objects.requireNonNull(comparator, "comparator is null");
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
 
@@ -497,15 +680,24 @@ public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> compa
 
     /**
      * Call the specified consumer with the current element passing through any 'rail'.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param onNext the callback
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
         Objects.requireNonNull(onNext, "onNext is null");
-        return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
+        return RxJavaPlugins.onAssembly(new ParallelPeek<>(this,
                 onNext,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -520,6 +712,13 @@ public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
     /**
      * Call the specified consumer with the current element passing through any 'rail' and
      * handles errors based on the given {@link ParallelFailureHandling} enumeration value.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * <p>History: 2.0.8 - experimental
      * @param onNext the callback
      * @param errorHandler the enumeration that defines how to handle errors thrown
@@ -529,15 +728,24 @@ public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext, @NonNull ParallelFailureHandling errorHandler) {
         Objects.requireNonNull(onNext, "onNext is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
-        return RxJavaPlugins.onAssembly(new ParallelDoOnNextTry<T>(this, onNext, errorHandler));
+        return RxJavaPlugins.onAssembly(new ParallelDoOnNextTry<>(this, onNext, errorHandler));
     }
 
     /**
      * Call the specified consumer with the current element passing through any 'rail' and
      * handles errors based on the returned value by the handler function.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * <p>History: 2.0.8 - experimental
      * @param onNext the callback
      * @param errorHandler the function called with the current repeat count and
@@ -548,24 +756,35 @@ public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext, @
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
         Objects.requireNonNull(onNext, "onNext is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
-        return RxJavaPlugins.onAssembly(new ParallelDoOnNextTry<T>(this, onNext, errorHandler));
+        return RxJavaPlugins.onAssembly(new ParallelDoOnNextTry<>(this, onNext, errorHandler));
     }
 
     /**
      * Call the specified consumer with the current element passing through any 'rail'
      * after it has been delivered to downstream within the rail.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param onAfterNext the callback
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final ParallelFlowable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext) {
         Objects.requireNonNull(onAfterNext, "onAfterNext is null");
-        return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
+        return RxJavaPlugins.onAssembly(new ParallelPeek<>(this,
                 Functions.emptyConsumer(),
                 onAfterNext,
                 Functions.emptyConsumer(),
@@ -579,15 +798,24 @@ public final ParallelFlowable<T> doAfterNext(@NonNull Consumer<? super T> onAfte
 
     /**
      * Call the specified consumer with the exception passing through any 'rail'.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param onError the callback
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final ParallelFlowable<T> doOnError(@NonNull Consumer<Throwable> onError) {
         Objects.requireNonNull(onError, "onError is null");
-        return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
+        return RxJavaPlugins.onAssembly(new ParallelPeek<>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
                 onError,
@@ -601,15 +829,24 @@ public final ParallelFlowable<T> doOnError(@NonNull Consumer<Throwable> onError)
 
     /**
      * Run the specified Action when a 'rail' completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param onComplete the callback
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final ParallelFlowable<T> doOnComplete(@NonNull Action onComplete) {
         Objects.requireNonNull(onComplete, "onComplete is null");
-        return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
+        return RxJavaPlugins.onAssembly(new ParallelPeek<>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -623,15 +860,24 @@ public final ParallelFlowable<T> doOnComplete(@NonNull Action onComplete) {
 
     /**
      * Run the specified Action when a 'rail' completes or signals an error.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param onAfterTerminate the callback
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final ParallelFlowable<T> doAfterTerminated(@NonNull Action onAfterTerminate) {
         Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
-        return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
+        return RxJavaPlugins.onAssembly(new ParallelPeek<>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -645,15 +891,24 @@ public final ParallelFlowable<T> doAfterTerminated(@NonNull Action onAfterTermin
 
     /**
      * Call the specified callback when a 'rail' receives a Subscription from its upstream.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param onSubscribe the callback
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final ParallelFlowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
-        return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
+        return RxJavaPlugins.onAssembly(new ParallelPeek<>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -667,15 +922,24 @@ public final ParallelFlowable<T> doOnSubscribe(@NonNull Consumer<? super Subscri
 
     /**
      * Call the specified consumer with the request amount if any rail receives a request.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param onRequest the callback
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final ParallelFlowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
         Objects.requireNonNull(onRequest, "onRequest is null");
-        return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
+        return RxJavaPlugins.onAssembly(new ParallelPeek<>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -689,15 +953,24 @@ public final ParallelFlowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
 
     /**
      * Run the specified Action when a 'rail' receives a cancellation.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param onCancel the callback
      * @return the new ParallelFlowable instance
      */
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> doOnCancel(@NonNull Action onCancel) {
         Objects.requireNonNull(onCancel, "onCancel is null");
-        return RxJavaPlugins.onAssembly(new ParallelPeek<T>(this,
+        return RxJavaPlugins.onAssembly(new ParallelPeek<>(this,
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
                 Functions.emptyConsumer(),
@@ -712,6 +985,13 @@ public final ParallelFlowable<T> doOnCancel(@NonNull Action onCancel) {
     /**
      * Collect the elements in each rail into a collection supplied via a collectionSupplier
      * and collected into with a collector action, emitting the collection at the end.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and
+     *  consumes the upstream rails in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <C> the collection type
      * @param collectionSupplier the supplier of the collection in each rail
@@ -720,6 +1000,8 @@ public final ParallelFlowable<T> doOnCancel(@NonNull Action onCancel) {
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> collectionSupplier, @NonNull BiConsumer<? super C, ? super T> collector) {
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
@@ -729,6 +1011,13 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
     /**
      * Wraps multiple Publishers into a ParallelFlowable which runs them
      * in parallel and unordered.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <T> the value type
      * @param publishers the array of publishers
@@ -736,17 +1025,27 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
      */
     @CheckReturnValue
     @NonNull
-    public static <T> ParallelFlowable<T> fromArray(@NonNull Publisher<T>... publishers) {
+    @SafeVarargs
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <@NonNull T> ParallelFlowable<T> fromArray(@NonNull Publisher<T>... publishers) {
         if (publishers.length == 0) {
             throw new IllegalArgumentException("Zero publishers not supported");
         }
-        return RxJavaPlugins.onAssembly(new ParallelFromArray<T>(publishers));
+        return RxJavaPlugins.onAssembly(new ParallelFromArray<>(publishers));
     }
 
     /**
      * Calls the specified converter function during assembly time and returns its resulting value.
      * <p>
      * This allows fluent conversion to any other type.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by how the converter function composes over the upstream source.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code to} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      * <p>History: 2.1.7 - experimental
      * @param <R> the resulting object type
      * @param converter the function that receives the current ParallelFlowable instance and returns a value
@@ -756,13 +1055,22 @@ public static <T> ParallelFlowable<T> fromArray(@NonNull Publisher<T>... publish
      */
     @CheckReturnValue
     @NonNull
-    public final <R> R to(@NonNull ParallelFlowableConverter<T, R> converter) {
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <@NonNull R> R to(@NonNull ParallelFlowableConverter<T, R> converter) {
         return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
 
     /**
      * Allows composing operators, in assembly time, on top of this ParallelFlowable
      * and returns another ParallelFlowable with composed features.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by how the converter function composes over the upstream source.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code compose} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <U> the output value type
      * @param composer the composer function from ParallelFlowable (this) to another ParallelFlowable
@@ -770,6 +1078,8 @@ public final <R> R to(@NonNull ParallelFlowableConverter<T, R> converter) {
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U> composer) {
         return RxJavaPlugins.onAssembly(Objects.requireNonNull(composer, "composer is null").apply(this));
     }
@@ -778,6 +1088,16 @@ public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U>
      * Generates and flattens Publishers on each 'rail'.
      * <p>
      * Errors are not delayed and uses unbounded concurrency along with default inner prefetch.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and
+     *  requests {@link Flowable#bufferSize()} amount from each rail upfront
+     *  and keeps requesting as many items per rail as many inner sources on
+     *  that rail completed. The inner sources are requested {@link Flowable#bufferSize()}
+     *  amount upfront, then 75% of this amount requested after 75% received.
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <R> the result type
      * @param mapper the function to map each rail's value into a Publisher
@@ -785,14 +1105,27 @@ public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U>
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
-        return flatMap(mapper, false, Integer.MAX_VALUE, Flowable.bufferSize());
+        return flatMap(mapper, false, Flowable.bufferSize(), Flowable.bufferSize());
     }
 
     /**
      * Generates and flattens Publishers on each 'rail', optionally delaying errors.
      * <p>
      * It uses unbounded concurrency along with default inner prefetch.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and
+     *  requests {@link Flowable#bufferSize()} amount from each rail upfront
+     *  and keeps requesting as many items per rail as many inner sources on
+     *  that rail completed. The inner sources are requested {@link Flowable#bufferSize()}
+     *  amount upfront, then 75% of this amount requested after 75% received.
+     *  </dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <R> the result type
      * @param mapper the function to map each rail's value into a Publisher
@@ -801,9 +1134,11 @@ public final <R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, ? exte
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> flatMap(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayError) {
-        return flatMap(mapper, delayError, Integer.MAX_VALUE, Flowable.bufferSize());
+        return flatMap(mapper, delayError, Flowable.bufferSize(), Flowable.bufferSize());
     }
 
     /**
@@ -811,6 +1146,17 @@ public final <R> ParallelFlowable<R> flatMap(
      * and having a total number of simultaneous subscriptions to the inner Publishers.
      * <p>
      * It uses a default inner prefetch.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and
+     *  requests {@code maxConcurrency} amount from each rail upfront
+     *  and keeps requesting as many items per rail as many inner sources on
+     *  that rail completed. The inner sources are requested {@link Flowable#bufferSize()}
+     *  amount upfront, then 75% of this amount requested after 75% received.
+     *  </dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <R> the result type
      * @param mapper the function to map each rail's value into a Publisher
@@ -820,6 +1166,8 @@ public final <R> ParallelFlowable<R> flatMap(
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> flatMap(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayError, int maxConcurrency) {
         return flatMap(mapper, delayError, maxConcurrency, Flowable.bufferSize());
@@ -829,6 +1177,17 @@ public final <R> ParallelFlowable<R> flatMap(
      * Generates and flattens Publishers on each 'rail', optionally delaying errors,
      * having a total number of simultaneous subscriptions to the inner Publishers
      * and using the given prefetch amount for the inner Publishers.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and
+     *  requests {@code maxConcurrency} amount from each rail upfront
+     *  and keeps requesting as many items per rail as many inner sources on
+     *  that rail completed. The inner sources are requested the {@code prefetch}
+     *  amount upfront, then 75% of this amount requested after 75% received.
+     *  </dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <R> the result type
      * @param mapper the function to map each rail's value into a Publisher
@@ -839,18 +1198,29 @@ public final <R> ParallelFlowable<R> flatMap(
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> flatMap(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
             boolean delayError, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ParallelFlatMap<T, R>(this, mapper, delayError, maxConcurrency, prefetch));
+        return RxJavaPlugins.onAssembly(new ParallelFlatMap<>(this, mapper, delayError, maxConcurrency, prefetch));
     }
 
     /**
      * Generates and concatenates Publishers on each 'rail', signalling errors immediately
      * and generating 2 publishers upfront.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and
+     *  requests 2 from each rail upfront and keeps requesting 1 when the inner source complete.
+     *  Requests for the inner sources are determined by the downstream rails'
+     *  backpressure behavior.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <R> the result type
      * @param mapper the function to map each rail's value into a Publisher
@@ -859,6 +1229,8 @@ public final <R> ParallelFlowable<R> flatMap(
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> concatMap(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
         return concatMap(mapper, 2);
@@ -867,6 +1239,16 @@ public final <R> ParallelFlowable<R> concatMap(
     /**
      * Generates and concatenates Publishers on each 'rail', signalling errors immediately
      * and using the given prefetch amount for generating Publishers upfront.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and
+     *  requests the {@code prefetch} amount from each rail upfront and keeps
+     *  requesting 75% of this amount after 75% received and the inner sources completed.
+     *  Requests for the inner sources are determined by the downstream rails'
+     *  backpressure behavior.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <R> the result type
      * @param mapper the function to map each rail's value into a Publisher
@@ -876,17 +1258,28 @@ public final <R> ParallelFlowable<R> concatMap(
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> concatMap(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
-                    int prefetch) {
+            int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ParallelConcatMap<T, R>(this, mapper, prefetch, ErrorMode.IMMEDIATE));
+        return RxJavaPlugins.onAssembly(new ParallelConcatMap<>(this, mapper, prefetch, ErrorMode.IMMEDIATE));
     }
 
     /**
      * Generates and concatenates Publishers on each 'rail', optionally delaying errors
      * and generating 2 publishers upfront.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and
+     *  requests 2 from each rail upfront and keeps requesting 1 when the inner source complete.
+     *  Requests for the inner sources are determined by the downstream rails'
+     *  backpressure behavior.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <R> the result type
      * @param mapper the function to map each rail's value into a Publisher
@@ -897,6 +1290,8 @@ public final <R> ParallelFlowable<R> concatMap(
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> concatMapDelayError(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
                     boolean tillTheEnd) {
@@ -906,6 +1301,16 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
     /**
      * Generates and concatenates Publishers on each 'rail', optionally delaying errors
      * and using the given prefetch amount for generating Publishers upfront.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream rails and
+     *  requests the {@code prefetch} amount from each rail upfront and keeps
+     *  requesting 75% of this amount after 75% received and the inner sources completed.
+     *  Requests for the inner sources are determined by the downstream rails'
+     *  backpressure behavior.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
      *
      * @param <R> the result type
      * @param mapper the function to map each rail's value into a Publisher
@@ -916,12 +1321,14 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
      */
     @CheckReturnValue
     @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> concatMapDelayError(
             @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
                     int prefetch, boolean tillTheEnd) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ParallelConcatMap<T, R>(
+        return RxJavaPlugins.onAssembly(new ParallelConcatMap<>(
                 this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
index 9491773080..3461c146d6 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
@@ -137,7 +137,7 @@ public final class AsyncProcessor<T> extends FlowableProcessor<T> {
     @CheckReturnValue
     @NonNull
     public static <T> AsyncProcessor<T> create() {
-        return new AsyncProcessor<T>();
+        return new AsyncProcessor<>();
     }
 
     /**
@@ -146,7 +146,7 @@ public static <T> AsyncProcessor<T> create() {
      */
     @SuppressWarnings("unchecked")
     AsyncProcessor() {
-        this.subscribers = new AtomicReference<AsyncSubscription<T>[]>(EMPTY);
+        this.subscribers = new AtomicReference<>(EMPTY);
     }
 
     @Override
@@ -203,29 +203,33 @@ public void onComplete() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasSubscribers() {
         return subscribers.get().length != 0;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         return subscribers.get() == TERMINATED && error != null;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         return subscribers.get() == TERMINATED && error == null;
     }
 
     @Override
     @Nullable
+    @CheckReturnValue
     public Throwable getThrowable() {
         return subscribers.get() == TERMINATED ? error : null;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        AsyncSubscription<T> as = new AsyncSubscription<T>(s, this);
+        AsyncSubscription<T> as = new AsyncSubscription<>(s, this);
         s.onSubscribe(as);
         if (add(as)) {
             if (as.isCancelled()) {
@@ -316,6 +320,7 @@ void remove(AsyncSubscription<T> ps) {
      * <p>The method is thread-safe.
      * @return true if this processor has any value
      */
+    @CheckReturnValue
     public boolean hasValue() {
         return subscribers.get() == TERMINATED && value != null;
     }
@@ -326,6 +331,7 @@ public boolean hasValue() {
      * @return a single value this processor currently has or null if no such value exists
      */
     @Nullable
+    @CheckReturnValue
     public T getValue() {
         return subscribers.get() == TERMINATED ? value : null;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index 4b85ff5ab0..ab4c517e65 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -191,7 +191,7 @@ public final class BehaviorProcessor<T> extends FlowableProcessor<T> {
     @CheckReturnValue
     @NonNull
     public static <T> BehaviorProcessor<T> create() {
-        return new BehaviorProcessor<T>();
+        return new BehaviorProcessor<>();
     }
 
     /**
@@ -207,9 +207,9 @@ public static <T> BehaviorProcessor<T> create() {
      */
     @CheckReturnValue
     @NonNull
-    public static <T> BehaviorProcessor<T> createDefault(T defaultValue) {
+    public static <@NonNull T> BehaviorProcessor<T> createDefault(T defaultValue) {
         Objects.requireNonNull(defaultValue, "defaultValue is null");
-        return new BehaviorProcessor<T>(defaultValue);
+        return new BehaviorProcessor<>(defaultValue);
     }
 
     /**
@@ -218,12 +218,12 @@ public static <T> BehaviorProcessor<T> createDefault(T defaultValue) {
      */
     @SuppressWarnings("unchecked")
     BehaviorProcessor() {
-        this.value = new AtomicReference<Object>();
+        this.value = new AtomicReference<>();
         this.lock = new ReentrantReadWriteLock();
         this.readLock = lock.readLock();
         this.writeLock = lock.writeLock();
-        this.subscribers = new AtomicReference<BehaviorSubscription<T>[]>(EMPTY);
-        this.terminalEvent = new AtomicReference<Throwable>();
+        this.subscribers = new AtomicReference<>(EMPTY);
+        this.terminalEvent = new AtomicReference<>();
     }
 
     /**
@@ -239,7 +239,7 @@ public static <T> BehaviorProcessor<T> createDefault(T defaultValue) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        BehaviorSubscription<T> bs = new BehaviorSubscription<T>(s, this);
+        BehaviorSubscription<T> bs = new BehaviorSubscription<>(s, this);
         s.onSubscribe(bs);
         if (add(bs)) {
             if (bs.cancelled) {
@@ -318,6 +318,7 @@ public void onComplete() {
      * @return true if the item was emitted to all Subscribers
      * @since 2.2
      */
+    @CheckReturnValue
     public boolean offer(T t) {
         if (t == null) {
             onError(ExceptionHelper.createNullPointerException("offer called with a null value."));
@@ -340,16 +341,19 @@ public boolean offer(T t) {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasSubscribers() {
         return subscribers.get().length != 0;
     }
 
+    @CheckReturnValue
     /* test support*/ int subscriberCount() {
         return subscribers.get().length;
     }
 
     @Override
     @Nullable
+    @CheckReturnValue
     public Throwable getThrowable() {
         Object o = value.get();
         if (NotificationLite.isError(o)) {
@@ -364,6 +368,7 @@ public Throwable getThrowable() {
      * @return a single value the BehaviorProcessor currently has or null if no such value exists
      */
     @Nullable
+    @CheckReturnValue
     public T getValue() {
         Object o = value.get();
         if (NotificationLite.isComplete(o) || NotificationLite.isError(o)) {
@@ -373,12 +378,14 @@ public T getValue() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         Object o = value.get();
         return NotificationLite.isComplete(o);
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         Object o = value.get();
         return NotificationLite.isError(o);
@@ -389,6 +396,7 @@ public boolean hasThrowable() {
      * <p>The method is thread-safe.
      * @return true if the BehaviorProcessor has any value
      */
+    @CheckReturnValue
     public boolean hasValue() {
         Object o = value.get();
         return o != null && !NotificationLite.isComplete(o) && !NotificationLite.isError(o);
@@ -554,7 +562,7 @@ void emitNext(Object value, long stateIndex) {
                     if (emitting) {
                         AppendOnlyLinkedArrayList<Object> q = queue;
                         if (q == null) {
-                            q = new AppendOnlyLinkedArrayList<Object>(4);
+                            q = new AppendOnlyLinkedArrayList<>(4);
                             queue = q;
                         }
                         q.add(value);
diff --git a/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
index abe5e2ad08..80db65e652 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
@@ -33,6 +33,7 @@ public abstract class FlowableProcessor<T> extends Flowable<T> implements Proces
      * <p>The method is thread-safe.
      * @return true if the FlowableProcessor has subscribers
      */
+    @CheckReturnValue
     public abstract boolean hasSubscribers();
 
     /**
@@ -42,6 +43,7 @@ public abstract class FlowableProcessor<T> extends Flowable<T> implements Proces
      * @see #getThrowable()
      * @see #hasComplete()
      */
+    @CheckReturnValue
     public abstract boolean hasThrowable();
 
     /**
@@ -50,6 +52,7 @@ public abstract class FlowableProcessor<T> extends Flowable<T> implements Proces
      * @return true if the FlowableProcessor has reached a terminal state through a complete event
      * @see #hasThrowable()
      */
+    @CheckReturnValue
     public abstract boolean hasComplete();
 
     /**
@@ -60,6 +63,7 @@ public abstract class FlowableProcessor<T> extends Flowable<T> implements Proces
      * hasn't terminated yet
      */
     @Nullable
+    @CheckReturnValue
     public abstract Throwable getThrowable();
 
     /**
@@ -74,6 +78,6 @@ public final FlowableProcessor<T> toSerialized() {
         if (this instanceof SerializedProcessor) {
             return this;
         }
-        return new SerializedProcessor<T>(this);
+        return new SerializedProcessor<>(this);
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index 50497473ac..d258ba1718 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -170,7 +170,7 @@ public final class MulticastProcessor<T> extends FlowableProcessor<T> {
     @CheckReturnValue
     @NonNull
     public static <T> MulticastProcessor<T> create() {
-        return new MulticastProcessor<T>(bufferSize(), false);
+        return new MulticastProcessor<>(bufferSize(), false);
     }
 
     /**
@@ -184,7 +184,7 @@ public static <T> MulticastProcessor<T> create() {
     @CheckReturnValue
     @NonNull
     public static <T> MulticastProcessor<T> create(boolean refCount) {
-        return new MulticastProcessor<T>(bufferSize(), refCount);
+        return new MulticastProcessor<>(bufferSize(), refCount);
     }
 
     /**
@@ -196,7 +196,7 @@ public static <T> MulticastProcessor<T> create(boolean refCount) {
     @CheckReturnValue
     @NonNull
     public static <T> MulticastProcessor<T> create(int bufferSize) {
-        return new MulticastProcessor<T>(bufferSize, false);
+        return new MulticastProcessor<>(bufferSize, false);
     }
 
     /**
@@ -211,7 +211,7 @@ public static <T> MulticastProcessor<T> create(int bufferSize) {
     @CheckReturnValue
     @NonNull
     public static <T> MulticastProcessor<T> create(int bufferSize, boolean refCount) {
-        return new MulticastProcessor<T>(bufferSize, refCount);
+        return new MulticastProcessor<>(bufferSize, refCount);
     }
 
     /**
@@ -227,8 +227,8 @@ public static <T> MulticastProcessor<T> create(int bufferSize, boolean refCount)
         this.bufferSize = bufferSize;
         this.limit = bufferSize - (bufferSize >> 2);
         this.wip = new AtomicInteger();
-        this.subscribers = new AtomicReference<MulticastSubscription<T>[]>(EMPTY);
-        this.upstream = new AtomicReference<Subscription>();
+        this.subscribers = new AtomicReference<>(EMPTY);
+        this.upstream = new AtomicReference<>();
         this.refcount = refCount;
         this.once = new AtomicBoolean();
     }
@@ -241,7 +241,7 @@ public static <T> MulticastProcessor<T> create(int bufferSize, boolean refCount)
      */
     public void start() {
         if (SubscriptionHelper.setOnce(upstream, EmptySubscription.INSTANCE)) {
-            queue = new SpscArrayQueue<T>(bufferSize);
+            queue = new SpscArrayQueue<>(bufferSize);
         }
     }
 
@@ -253,7 +253,7 @@ public void start() {
      */
     public void startUnbounded() {
         if (SubscriptionHelper.setOnce(upstream, EmptySubscription.INSTANCE)) {
-            queue = new SpscLinkedArrayQueue<T>(bufferSize);
+            queue = new SpscLinkedArrayQueue<>(bufferSize);
         }
     }
 
@@ -281,7 +281,7 @@ public void onSubscribe(Subscription s) {
                 }
             }
 
-            queue = new SpscArrayQueue<T>(bufferSize);
+            queue = new SpscArrayQueue<>(bufferSize);
 
             s.request(bufferSize);
         }
@@ -309,6 +309,7 @@ public void onNext(T t) {
      * @param t the item to offer, not null
      * @return true if successful, false if the queue is full
      */
+    @CheckReturnValue
     public boolean offer(T t) {
         if (once.get()) {
             return false;
@@ -344,28 +345,32 @@ public void onComplete() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasSubscribers() {
         return subscribers.get().length != 0;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         return once.get() && error != null;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         return once.get() && error == null;
     }
 
     @Override
+    @CheckReturnValue
     public Throwable getThrowable() {
         return once.get() ? error : null;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        MulticastSubscription<T> ms = new MulticastSubscription<T>(s, this);
+        MulticastSubscription<T> ms = new MulticastSubscription<>(s, this);
         s.onSubscribe(ms);
         if (add(ms)) {
             if (ms.get() == Long.MIN_VALUE) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
index 4dc9bc9371..36bc4eff34 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
@@ -128,7 +128,7 @@ public final class PublishProcessor<T> extends FlowableProcessor<T> {
     @CheckReturnValue
     @NonNull
     public static <T> PublishProcessor<T> create() {
-        return new PublishProcessor<T>();
+        return new PublishProcessor<>();
     }
 
     /**
@@ -137,12 +137,12 @@ public static <T> PublishProcessor<T> create() {
      */
     @SuppressWarnings("unchecked")
     PublishProcessor() {
-        subscribers = new AtomicReference<PublishSubscription<T>[]>(EMPTY);
+        subscribers = new AtomicReference<>(EMPTY);
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> t) {
-        PublishSubscription<T> ps = new PublishSubscription<T>(t, this);
+        PublishSubscription<T> ps = new PublishSubscription<>(t, this);
         t.onSubscribe(ps);
         if (add(ps)) {
             // if cancellation happened while a successful add, the remove() didn't work
@@ -283,6 +283,7 @@ public void onComplete() {
      * @return true if the item was emitted to all Subscribers
      * @since 2.2
      */
+    @CheckReturnValue
     public boolean offer(T t) {
         if (t == null) {
             onError(ExceptionHelper.createNullPointerException("offer called with a null value."));
@@ -303,12 +304,14 @@ public boolean offer(T t) {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasSubscribers() {
         return subscribers.get().length != 0;
     }
 
     @Override
     @Nullable
+    @CheckReturnValue
     public Throwable getThrowable() {
         if (subscribers.get() == TERMINATED) {
             return error;
@@ -317,11 +320,13 @@ public Throwable getThrowable() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         return subscribers.get() == TERMINATED && error != null;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         return subscribers.get() == TERMINATED && error == null;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index 04de41a77f..9b722057b9 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -173,7 +173,7 @@ public final class ReplayProcessor<T> extends FlowableProcessor<T> {
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> create() {
-        return new ReplayProcessor<T>(new UnboundedReplayBuffer<T>(16));
+        return new ReplayProcessor<>(new UnboundedReplayBuffer<T>(16));
     }
 
     /**
@@ -194,7 +194,7 @@ public static <T> ReplayProcessor<T> create() {
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> create(int capacityHint) {
-        return new ReplayProcessor<T>(new UnboundedReplayBuffer<T>(capacityHint));
+        return new ReplayProcessor<>(new UnboundedReplayBuffer<T>(capacityHint));
     }
 
     /**
@@ -220,7 +220,7 @@ public static <T> ReplayProcessor<T> create(int capacityHint) {
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> createWithSize(int maxSize) {
-        return new ReplayProcessor<T>(new SizeBoundReplayBuffer<T>(maxSize));
+        return new ReplayProcessor<>(new SizeBoundReplayBuffer<T>(maxSize));
     }
 
     /**
@@ -236,8 +236,9 @@ public static <T> ReplayProcessor<T> createWithSize(int maxSize) {
      *          the type of items observed and emitted by this type of processor
      * @return the created processor
      */
+    @CheckReturnValue
     /* test */ static <T> ReplayProcessor<T> createUnbounded() {
-        return new ReplayProcessor<T>(new SizeBoundReplayBuffer<T>(Integer.MAX_VALUE));
+        return new ReplayProcessor<>(new SizeBoundReplayBuffer<T>(Integer.MAX_VALUE));
     }
 
     /**
@@ -274,8 +275,8 @@ public static <T> ReplayProcessor<T> createWithSize(int maxSize) {
      */
     @CheckReturnValue
     @NonNull
-    public static <T> ReplayProcessor<T> createWithTime(long maxAge, TimeUnit unit, Scheduler scheduler) {
-        return new ReplayProcessor<T>(new SizeAndTimeBoundReplayBuffer<T>(Integer.MAX_VALUE, maxAge, unit, scheduler));
+    public static <T> ReplayProcessor<T> createWithTime(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return new ReplayProcessor<>(new SizeAndTimeBoundReplayBuffer<T>(Integer.MAX_VALUE, maxAge, unit, scheduler));
     }
 
     /**
@@ -314,8 +315,8 @@ public static <T> ReplayProcessor<T> createWithTime(long maxAge, TimeUnit unit,
      */
     @CheckReturnValue
     @NonNull
-    public static <T> ReplayProcessor<T> createWithTimeAndSize(long maxAge, TimeUnit unit, Scheduler scheduler, int maxSize) {
-        return new ReplayProcessor<T>(new SizeAndTimeBoundReplayBuffer<T>(maxSize, maxAge, unit, scheduler));
+    public static <T> ReplayProcessor<T> createWithTimeAndSize(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int maxSize) {
+        return new ReplayProcessor<>(new SizeAndTimeBoundReplayBuffer<T>(maxSize, maxAge, unit, scheduler));
     }
 
     /**
@@ -325,12 +326,12 @@ public static <T> ReplayProcessor<T> createWithTimeAndSize(long maxAge, TimeUnit
     @SuppressWarnings("unchecked")
     ReplayProcessor(ReplayBuffer<T> buffer) {
         this.buffer = buffer;
-        this.subscribers = new AtomicReference<ReplaySubscription<T>[]>(EMPTY);
+        this.subscribers = new AtomicReference<>(EMPTY);
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        ReplaySubscription<T> rs = new ReplaySubscription<T>(s, this);
+        ReplaySubscription<T> rs = new ReplaySubscription<>(s, this);
         s.onSubscribe(rs);
 
         if (add(rs)) {
@@ -404,16 +405,19 @@ public void onComplete() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasSubscribers() {
         return subscribers.get().length != 0;
     }
 
+    @CheckReturnValue
     /* test */ int subscriberCount() {
         return subscribers.get().length;
     }
 
     @Override
     @Nullable
+    @CheckReturnValue
     public Throwable getThrowable() {
         ReplayBuffer<T> b = buffer;
         if (b.isDone()) {
@@ -445,6 +449,7 @@ public void cleanupBuffer() {
      * <p>The method is thread-safe.
      * @return the latest value this processor currently has or null if no such value exists
      */
+    @CheckReturnValue
     public T getValue() {
         return buffer.getValue();
     }
@@ -454,6 +459,7 @@ public T getValue() {
      * <p>The method is thread-safe.
      * @return the array containing the snapshot of all values of this processor
      */
+    @CheckReturnValue
     public Object[] getValues() {
         @SuppressWarnings("unchecked")
         T[] a = (T[])EMPTY_ARRAY;
@@ -473,17 +479,20 @@ public Object[] getValues() {
      * @param array the target array to copy values into if it fits
      * @return the given array if the values fit into it or a new array containing all values
      */
+    @CheckReturnValue
     public T[] getValues(T[] array) {
         return buffer.getValues(array);
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         ReplayBuffer<T> b = buffer;
         return b.isDone() && b.getError() == null;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         ReplayBuffer<T> b = buffer;
         return b.isDone() && b.getError() != null;
@@ -494,10 +503,12 @@ public boolean hasThrowable() {
      * <p>The method is thread-safe.
      * @return true if the processor has any value
      */
+    @CheckReturnValue
     public boolean hasValue() {
         return buffer.size() != 0; // NOPMD
     }
 
+    @CheckReturnValue
     /* test*/ int size() {
         return buffer.size();
     }
@@ -634,7 +645,7 @@ static final class UnboundedReplayBuffer<T>
         volatile int size;
 
         UnboundedReplayBuffer(int capacityHint) {
-            this.buffer = new ArrayList<T>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
+            this.buffer = new ArrayList<>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
         }
 
         @Override
@@ -835,7 +846,7 @@ static final class SizeBoundReplayBuffer<T>
 
         SizeBoundReplayBuffer(int maxSize) {
             this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize");
-            Node<T> h = new Node<T>(null);
+            Node<T> h = new Node<>(null);
             this.tail = h;
             this.head = h;
         }
@@ -850,7 +861,7 @@ void trim() {
 
         @Override
         public void next(T value) {
-            Node<T> n = new Node<T>(value);
+            Node<T> n = new Node<>(value);
             Node<T> t = tail;
 
             tail = n;
@@ -876,7 +887,7 @@ public void complete() {
         @Override
         public void trimHead() {
             if (head.value != null) {
-                Node<T> n = new Node<T>(null);
+                Node<T> n = new Node<>(null);
                 n.lazySet(head.get());
                 head = n;
             }
@@ -1054,7 +1065,7 @@ static final class SizeAndTimeBoundReplayBuffer<T>
             this.maxAge = ObjectHelper.verifyPositive(maxAge, "maxAge");
             this.unit = Objects.requireNonNull(unit, "unit is null");
             this.scheduler = Objects.requireNonNull(scheduler, "scheduler is null");
-            TimedNode<T> h = new TimedNode<T>(null, 0L);
+            TimedNode<T> h = new TimedNode<>(null, 0L);
             this.tail = h;
             this.head = h;
         }
@@ -1100,7 +1111,7 @@ void trimFinal() {
                 TimedNode<T> next = h.get();
                 if (next == null) {
                     if (h.value != null) {
-                        head = new TimedNode<T>(null, 0L);
+                        head = new TimedNode<>(null, 0L);
                     } else {
                         head = h;
                     }
@@ -1109,7 +1120,7 @@ void trimFinal() {
 
                 if (next.time > limit) {
                     if (h.value != null) {
-                        TimedNode<T> n = new TimedNode<T>(null, 0L);
+                        TimedNode<T> n = new TimedNode<>(null, 0L);
                         n.lazySet(h.get());
                         head = n;
                     } else {
@@ -1125,7 +1136,7 @@ void trimFinal() {
         @Override
         public void trimHead() {
             if (head.value != null) {
-                TimedNode<T> n = new TimedNode<T>(null, 0L);
+                TimedNode<T> n = new TimedNode<>(null, 0L);
                 n.lazySet(head.get());
                 head = n;
             }
@@ -1133,7 +1144,7 @@ public void trimHead() {
 
         @Override
         public void next(T value) {
-            TimedNode<T> n = new TimedNode<T>(value, scheduler.now(unit));
+            TimedNode<T> n = new TimedNode<>(value, scheduler.now(unit));
             TimedNode<T> t = tail;
 
             tail = n;
diff --git a/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java
index 6096398618..e7740b6523 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java
@@ -59,7 +59,7 @@ public void onSubscribe(Subscription s) {
                     if (emitting) {
                         AppendOnlyLinkedArrayList<Object> q = queue;
                         if (q == null) {
-                            q = new AppendOnlyLinkedArrayList<Object>(4);
+                            q = new AppendOnlyLinkedArrayList<>(4);
                             queue = q;
                         }
                         q.add(NotificationLite.subscription(s));
@@ -92,7 +92,7 @@ public void onNext(T t) {
             if (emitting) {
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(4);
+                    q = new AppendOnlyLinkedArrayList<>(4);
                     queue = q;
                 }
                 q.add(NotificationLite.next(t));
@@ -119,7 +119,7 @@ public void onError(Throwable t) {
                 if (emitting) {
                     AppendOnlyLinkedArrayList<Object> q = queue;
                     if (q == null) {
-                        q = new AppendOnlyLinkedArrayList<Object>(4);
+                        q = new AppendOnlyLinkedArrayList<>(4);
                         queue = q;
                     }
                     q.setFirst(NotificationLite.error(t));
@@ -149,7 +149,7 @@ public void onComplete() {
             if (emitting) {
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(4);
+                    q = new AppendOnlyLinkedArrayList<>(4);
                     queue = q;
                 }
                 q.add(NotificationLite.complete());
diff --git a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
index ee93a5ac9c..eab7da4f05 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
@@ -19,7 +19,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
@@ -179,7 +179,7 @@ public final class UnicastProcessor<T> extends FlowableProcessor<T> {
     @CheckReturnValue
     @NonNull
     public static <T> UnicastProcessor<T> create() {
-        return new UnicastProcessor<T>(bufferSize());
+        return create(bufferSize(), Functions.EMPTY_RUNNABLE, true);
     }
 
     /**
@@ -191,7 +191,7 @@ public static <T> UnicastProcessor<T> create() {
     @CheckReturnValue
     @NonNull
     public static <T> UnicastProcessor<T> create(int capacityHint) {
-        return new UnicastProcessor<T>(capacityHint);
+        return create(capacityHint, Functions.EMPTY_RUNNABLE, true);
     }
 
     /**
@@ -205,67 +205,47 @@ public static <T> UnicastProcessor<T> create(int capacityHint) {
     @CheckReturnValue
     @NonNull
     public static <T> UnicastProcessor<T> create(boolean delayError) {
-        return new UnicastProcessor<T>(bufferSize(), null, delayError);
+        return create(bufferSize(), Functions.EMPTY_RUNNABLE, delayError);
     }
 
     /**
      * Creates an UnicastProcessor with the given internal buffer capacity hint and a callback for
-     * the case when the single Subscriber cancels its subscription.
+     * the case when the single Subscriber cancels its subscription or the
+     * processor is terminated.
      *
      * <p>The callback, if not null, is called exactly once and
      * non-overlapped with any active replay.
      *
      * @param <T> the value type
      * @param capacityHint the hint to size the internal unbounded buffer
-     * @param onCancelled the non null callback
+     * @param onTerminate the non null callback
      * @return an UnicastProcessor instance
      */
     @CheckReturnValue
     @NonNull
-    public static <T> UnicastProcessor<T> create(int capacityHint, Runnable onCancelled) {
-        Objects.requireNonNull(onCancelled, "onTerminate");
-        return new UnicastProcessor<T>(capacityHint, onCancelled);
+    public static <T> UnicastProcessor<T> create(int capacityHint, @NonNull Runnable onTerminate) {
+        return create(capacityHint, onTerminate, true);
     }
 
     /**
      * Creates an UnicastProcessor with the given internal buffer capacity hint, delay error flag and a callback for
-     * the case when the single Subscriber cancels its subscription.
+     * the case when the single Subscriber cancels its subscription or
+     * the processor is terminated.
      *
      * <p>The callback, if not null, is called exactly once and
      * non-overlapped with any active replay.
      * <p>History: 2.0.8 - experimental
      * @param <T> the value type
      * @param capacityHint the hint to size the internal unbounded buffer
-     * @param onCancelled the non null callback
+     * @param onTerminate the non null callback
      * @param delayError deliver pending onNext events before onError
      * @return an UnicastProcessor instance
      * @since 2.2
      */
     @CheckReturnValue
     @NonNull
-    public static <T> UnicastProcessor<T> create(int capacityHint, Runnable onCancelled, boolean delayError) {
-        Objects.requireNonNull(onCancelled, "onTerminate");
-        return new UnicastProcessor<T>(capacityHint, onCancelled, delayError);
-    }
-
-    /**
-     * Creates an UnicastProcessor with the given capacity hint.
-     * @param capacityHint the capacity hint for the internal, unbounded queue
-     * @since 2.0
-     */
-    UnicastProcessor(int capacityHint) {
-        this(capacityHint, null, true);
-    }
-
-    /**
-     * Creates an UnicastProcessor with the given capacity hint and callback
-     * for when the Processor is terminated normally or its single Subscriber cancels.
-     * @param capacityHint the capacity hint for the internal, unbounded queue
-     * @param onTerminate the callback to run when the Processor is terminated or cancelled, null not allowed
-     * @since 2.0
-     */
-    UnicastProcessor(int capacityHint, Runnable onTerminate) {
-        this(capacityHint, onTerminate, true);
+    public static <T> UnicastProcessor<T> create(int capacityHint, @NonNull Runnable onTerminate, boolean delayError) {
+        return new UnicastProcessor<>(capacityHint, onTerminate, delayError);
     }
 
     /**
@@ -278,10 +258,10 @@ public static <T> UnicastProcessor<T> create(int capacityHint, Runnable onCancel
      * @since 2.2
      */
     UnicastProcessor(int capacityHint, Runnable onTerminate, boolean delayError) {
-        this.queue = new SpscLinkedArrayQueue<T>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
-        this.onTerminate = new AtomicReference<Runnable>(onTerminate);
+        this.queue = new SpscLinkedArrayQueue<>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
+        this.onTerminate = new AtomicReference<>(Objects.requireNonNull(onTerminate, "onTerminate"));
         this.delayError = delayError;
-        this.downstream = new AtomicReference<Subscriber<? super T>>();
+        this.downstream = new AtomicReference<>();
         this.once = new AtomicBoolean();
         this.wip = new UnicastQueueSubscription();
         this.requested = new AtomicLong();
@@ -559,12 +539,14 @@ public void cancel() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasSubscribers() {
         return downstream.get() != null;
     }
 
     @Override
     @Nullable
+    @CheckReturnValue
     public Throwable getThrowable() {
         if (done) {
             return error;
@@ -573,11 +555,13 @@ public Throwable getThrowable() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         return done && error == null;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         return done && error != null;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
index d9247acee2..3e05665283 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
@@ -28,7 +28,7 @@
  */
 public final class TestScheduler extends Scheduler {
     /** The ordered queue for the runnable tasks. */
-    final Queue<TimedRunnable> queue = new PriorityBlockingQueue<TimedRunnable>(11);
+    final Queue<TimedRunnable> queue = new PriorityBlockingQueue<>(11);
     /** The per-scheduler global order counter. */
     long counter;
     // Storing time in nanoseconds internally.
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java
index 174c98c4f5..cfeafcd4a8 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java
@@ -129,7 +129,7 @@ public final class AsyncSubject<T> extends Subject<T> {
     @CheckReturnValue
     @NonNull
     public static <T> AsyncSubject<T> create() {
-        return new AsyncSubject<T>();
+        return new AsyncSubject<>();
     }
 
     /**
@@ -138,7 +138,7 @@ public static <T> AsyncSubject<T> create() {
      */
     @SuppressWarnings("unchecked")
     AsyncSubject() {
-        this.subscribers = new AtomicReference<AsyncDisposable<T>[]>(EMPTY);
+        this.subscribers = new AtomicReference<>(EMPTY);
     }
 
     @Override
@@ -192,28 +192,32 @@ public void onComplete() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasObservers() {
         return subscribers.get().length != 0;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         return subscribers.get() == TERMINATED && error != null;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         return subscribers.get() == TERMINATED && error == null;
     }
 
     @Override
+    @CheckReturnValue
     public Throwable getThrowable() {
         return subscribers.get() == TERMINATED ? error : null;
     }
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        AsyncDisposable<T> as = new AsyncDisposable<T>(observer, this);
+        AsyncDisposable<T> as = new AsyncDisposable<>(observer, this);
         observer.onSubscribe(as);
         if (add(as)) {
             if (as.isDisposed()) {
@@ -304,6 +308,7 @@ void remove(AsyncDisposable<T> ps) {
      * <p>The method is thread-safe.
      * @return true if the subject has any value
      */
+    @CheckReturnValue
     public boolean hasValue() {
         return subscribers.get() == TERMINATED && value != null;
     }
@@ -314,6 +319,7 @@ public boolean hasValue() {
      * @return a single value the Subject currently has or null if no such value exists
      */
     @Nullable
+    @CheckReturnValue
     public T getValue() {
         return subscribers.get() == TERMINATED ? value : null;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
index b3b212eea4..d7f5516e7d 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
@@ -176,7 +176,7 @@ public final class BehaviorSubject<T> extends Subject<T> {
     @CheckReturnValue
     @NonNull
     public static <T> BehaviorSubject<T> create() {
-        return new BehaviorSubject<T>();
+        return new BehaviorSubject<>();
     }
 
     /**
@@ -192,8 +192,8 @@ public static <T> BehaviorSubject<T> create() {
      */
     @CheckReturnValue
     @NonNull
-    public static <T> BehaviorSubject<T> createDefault(T defaultValue) {
-        return new BehaviorSubject<T>(defaultValue);
+    public static <@NonNull T> BehaviorSubject<T> createDefault(T defaultValue) {
+        return new BehaviorSubject<>(defaultValue);
     }
 
     /**
@@ -205,9 +205,9 @@ public static <T> BehaviorSubject<T> createDefault(T defaultValue) {
         this.lock = new ReentrantReadWriteLock();
         this.readLock = lock.readLock();
         this.writeLock = lock.writeLock();
-        this.subscribers = new AtomicReference<BehaviorDisposable<T>[]>(EMPTY);
-        this.value = new AtomicReference<Object>();
-        this.terminalEvent = new AtomicReference<Throwable>();
+        this.subscribers = new AtomicReference<>(EMPTY);
+        this.value = new AtomicReference<>();
+        this.terminalEvent = new AtomicReference<>();
     }
 
     /**
@@ -223,7 +223,7 @@ public static <T> BehaviorSubject<T> createDefault(T defaultValue) {
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        BehaviorDisposable<T> bs = new BehaviorDisposable<T>(observer, this);
+        BehaviorDisposable<T> bs = new BehaviorDisposable<>(observer, this);
         observer.onSubscribe(bs);
         if (add(bs)) {
             if (bs.cancelled) {
@@ -287,16 +287,19 @@ public void onComplete() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasObservers() {
         return subscribers.get().length != 0;
     }
 
+    @CheckReturnValue
     /* test support*/ int subscriberCount() {
         return subscribers.get().length;
     }
 
     @Override
     @Nullable
+    @CheckReturnValue
     public Throwable getThrowable() {
         Object o = value.get();
         if (NotificationLite.isError(o)) {
@@ -311,6 +314,7 @@ public Throwable getThrowable() {
      * @return a single value the Subject currently has or null if no such value exists
      */
     @Nullable
+    @CheckReturnValue
     public T getValue() {
         Object o = value.get();
         if (NotificationLite.isComplete(o) || NotificationLite.isError(o)) {
@@ -320,12 +324,14 @@ public T getValue() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         Object o = value.get();
         return NotificationLite.isComplete(o);
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         Object o = value.get();
         return NotificationLite.isError(o);
@@ -336,6 +342,7 @@ public boolean hasThrowable() {
      * <p>The method is thread-safe.
      * @return true if the subject has any value
      */
+    @CheckReturnValue
     public boolean hasValue() {
         Object o = value.get();
         return o != null && !NotificationLite.isComplete(o) && !NotificationLite.isError(o);
@@ -493,7 +500,7 @@ void emitNext(Object value, long stateIndex) {
                     if (emitting) {
                         AppendOnlyLinkedArrayList<Object> q = queue;
                         if (q == null) {
-                            q = new AppendOnlyLinkedArrayList<Object>(4);
+                            q = new AppendOnlyLinkedArrayList<>(4);
                             queue = q;
                         }
                         q.add(value);
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java
index bbb4b24b0c..9753d276a1 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java
@@ -107,7 +107,7 @@ public static CompletableSubject create() {
 
     CompletableSubject() {
         once = new AtomicBoolean();
-        observers = new AtomicReference<CompletableDisposable[]>(EMPTY);
+        observers = new AtomicReference<>(EMPTY);
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java
index a2f62524f0..f06d8c1aae 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java
@@ -131,13 +131,13 @@ public final class MaybeSubject<T> extends Maybe<T> implements MaybeObserver<T>
     @CheckReturnValue
     @NonNull
     public static <T> MaybeSubject<T> create() {
-        return new MaybeSubject<T>();
+        return new MaybeSubject<>();
     }
 
     @SuppressWarnings("unchecked")
     MaybeSubject() {
         once = new AtomicBoolean();
-        observers = new AtomicReference<MaybeDisposable<T>[]>(EMPTY);
+        observers = new AtomicReference<>(EMPTY);
     }
 
     @Override
@@ -185,7 +185,7 @@ public void onComplete() {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        MaybeDisposable<T> md = new MaybeDisposable<T>(observer, this);
+        MaybeDisposable<T> md = new MaybeDisposable<>(observer, this);
         observer.onSubscribe(md);
         if (add(md)) {
             if (md.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java
index a81d6062fd..2c3a847832 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java
@@ -115,7 +115,7 @@ public final class PublishSubject<T> extends Subject<T> {
     @CheckReturnValue
     @NonNull
     public static <T> PublishSubject<T> create() {
-        return new PublishSubject<T>();
+        return new PublishSubject<>();
     }
 
     /**
@@ -124,12 +124,12 @@ public static <T> PublishSubject<T> create() {
      */
     @SuppressWarnings("unchecked")
     PublishSubject() {
-        subscribers = new AtomicReference<PublishDisposable<T>[]>(EMPTY);
+        subscribers = new AtomicReference<>(EMPTY);
     }
 
     @Override
     protected void subscribeActual(Observer<? super T> t) {
-        PublishDisposable<T> ps = new PublishDisposable<T>(t, this);
+        PublishDisposable<T> ps = new PublishDisposable<>(t, this);
         t.onSubscribe(ps);
         if (add(ps)) {
             // if cancellation happened while a successful add, the remove() didn't work
@@ -254,12 +254,14 @@ public void onComplete() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasObservers() {
         return subscribers.get().length != 0;
     }
 
     @Override
     @Nullable
+    @CheckReturnValue
     public Throwable getThrowable() {
         if (subscribers.get() == TERMINATED) {
             return error;
@@ -268,11 +270,13 @@ public Throwable getThrowable() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         return subscribers.get() == TERMINATED && error != null;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         return subscribers.get() == TERMINATED && error == null;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
index aad2092429..9bb3d93b99 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
@@ -160,7 +160,7 @@ public final class ReplaySubject<T> extends Subject<T> {
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> create() {
-        return new ReplaySubject<T>(new UnboundedReplayBuffer<T>(16));
+        return new ReplaySubject<>(new UnboundedReplayBuffer<T>(16));
     }
 
     /**
@@ -181,7 +181,7 @@ public static <T> ReplaySubject<T> create() {
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> create(int capacityHint) {
-        return new ReplaySubject<T>(new UnboundedReplayBuffer<T>(capacityHint));
+        return new ReplaySubject<>(new UnboundedReplayBuffer<T>(capacityHint));
     }
 
     /**
@@ -207,7 +207,7 @@ public static <T> ReplaySubject<T> create(int capacityHint) {
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> createWithSize(int maxSize) {
-        return new ReplaySubject<T>(new SizeBoundReplayBuffer<T>(maxSize));
+        return new ReplaySubject<>(new SizeBoundReplayBuffer<T>(maxSize));
     }
 
     /**
@@ -224,7 +224,7 @@ public static <T> ReplaySubject<T> createWithSize(int maxSize) {
      * @return the created subject
      */
     /* test */ static <T> ReplaySubject<T> createUnbounded() {
-        return new ReplaySubject<T>(new SizeBoundReplayBuffer<T>(Integer.MAX_VALUE));
+        return new ReplaySubject<>(new SizeBoundReplayBuffer<T>(Integer.MAX_VALUE));
     }
 
     /**
@@ -261,8 +261,8 @@ public static <T> ReplaySubject<T> createWithSize(int maxSize) {
      */
     @CheckReturnValue
     @NonNull
-    public static <T> ReplaySubject<T> createWithTime(long maxAge, TimeUnit unit, Scheduler scheduler) {
-        return new ReplaySubject<T>(new SizeAndTimeBoundReplayBuffer<T>(Integer.MAX_VALUE, maxAge, unit, scheduler));
+    public static <T> ReplaySubject<T> createWithTime(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return new ReplaySubject<>(new SizeAndTimeBoundReplayBuffer<T>(Integer.MAX_VALUE, maxAge, unit, scheduler));
     }
 
     /**
@@ -301,8 +301,8 @@ public static <T> ReplaySubject<T> createWithTime(long maxAge, TimeUnit unit, Sc
      */
     @CheckReturnValue
     @NonNull
-    public static <T> ReplaySubject<T> createWithTimeAndSize(long maxAge, TimeUnit unit, Scheduler scheduler, int maxSize) {
-        return new ReplaySubject<T>(new SizeAndTimeBoundReplayBuffer<T>(maxSize, maxAge, unit, scheduler));
+    public static <T> ReplaySubject<T> createWithTimeAndSize(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int maxSize) {
+        return new ReplaySubject<>(new SizeAndTimeBoundReplayBuffer<T>(maxSize, maxAge, unit, scheduler));
     }
 
     /**
@@ -312,12 +312,12 @@ public static <T> ReplaySubject<T> createWithTimeAndSize(long maxAge, TimeUnit u
     @SuppressWarnings("unchecked")
     ReplaySubject(ReplayBuffer<T> buffer) {
         this.buffer = buffer;
-        this.observers = new AtomicReference<ReplayDisposable<T>[]>(EMPTY);
+        this.observers = new AtomicReference<>(EMPTY);
     }
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        ReplayDisposable<T> rs = new ReplayDisposable<T>(observer, this);
+        ReplayDisposable<T> rs = new ReplayDisposable<>(observer, this);
         observer.onSubscribe(rs);
 
         if (!rs.cancelled) {
@@ -392,16 +392,19 @@ public void onComplete() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasObservers() {
         return observers.get().length != 0;
     }
 
+    @CheckReturnValue
     /* test */ int observerCount() {
         return observers.get().length;
     }
 
     @Override
     @Nullable
+    @CheckReturnValue
     public Throwable getThrowable() {
         Object o = buffer.get();
         if (NotificationLite.isError(o)) {
@@ -416,6 +419,7 @@ public Throwable getThrowable() {
      * @return a single value the Subject currently has or null if no such value exists
      */
     @Nullable
+    @CheckReturnValue
     public T getValue() {
         return buffer.getValue();
     }
@@ -446,6 +450,7 @@ public void cleanupBuffer() {
      * <p>The method is thread-safe.
      * @return the array containing the snapshot of all values of the Subject
      */
+    @CheckReturnValue
     public Object[] getValues() {
         @SuppressWarnings("unchecked")
         T[] a = (T[])EMPTY_ARRAY;
@@ -465,17 +470,20 @@ public Object[] getValues() {
      * @param array the target array to copy values into if it fits
      * @return the given array if the values fit into it or a new array containing all values
      */
+    @CheckReturnValue
     public T[] getValues(T[] array) {
         return buffer.getValues(array);
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         Object o = buffer.get();
         return NotificationLite.isComplete(o);
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         Object o = buffer.get();
         return NotificationLite.isError(o);
@@ -486,10 +494,12 @@ public boolean hasThrowable() {
      * <p>The method is thread-safe.
      * @return true if the subject has any value
      */
+    @CheckReturnValue
     public boolean hasValue() {
         return buffer.size() != 0; // NOPMD
     }
 
+    @CheckReturnValue
     /* test*/ int size() {
         return buffer.size();
     }
@@ -636,7 +646,7 @@ static final class UnboundedReplayBuffer<T>
         volatile int size;
 
         UnboundedReplayBuffer(int capacityHint) {
-            this.buffer = new ArrayList<Object>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
+            this.buffer = new ArrayList<>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
         }
 
         @Override
@@ -839,7 +849,7 @@ static final class SizeBoundReplayBuffer<T>
 
         SizeBoundReplayBuffer(int maxSize) {
             this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize");
-            Node<Object> h = new Node<Object>(null);
+            Node<Object> h = new Node<>(null);
             this.tail = h;
             this.head = h;
         }
@@ -854,7 +864,7 @@ void trim() {
 
         @Override
         public void add(T value) {
-            Node<Object> n = new Node<Object>(value);
+            Node<Object> n = new Node<>(value);
             Node<Object> t = tail;
 
             tail = n;
@@ -866,7 +876,7 @@ public void add(T value) {
 
         @Override
         public void addFinal(Object notificationLite) {
-            Node<Object> n = new Node<Object>(notificationLite);
+            Node<Object> n = new Node<>(notificationLite);
             Node<Object> t = tail;
 
             tail = n;
@@ -885,7 +895,7 @@ public void addFinal(Object notificationLite) {
         public void trimHead() {
             Node<Object> h = head;
             if (h.value != null) {
-                Node<Object> n = new Node<Object>(null);
+                Node<Object> n = new Node<>(null);
                 n.lazySet(h.get());
                 head = n;
             }
@@ -1055,7 +1065,7 @@ static final class SizeAndTimeBoundReplayBuffer<T>
             this.maxAge = ObjectHelper.verifyPositive(maxAge, "maxAge");
             this.unit = Objects.requireNonNull(unit, "unit is null");
             this.scheduler = Objects.requireNonNull(scheduler, "scheduler is null");
-            TimedNode<Object> h = new TimedNode<Object>(null, 0L);
+            TimedNode<Object> h = new TimedNode<>(null, 0L);
             this.tail = h;
             this.head = h;
         }
@@ -1101,7 +1111,7 @@ void trimFinal() {
                 TimedNode<Object> next = h.get();
                 if (next.get() == null) {
                     if (h.value != null) {
-                        TimedNode<Object> lasth = new TimedNode<Object>(null, 0L);
+                        TimedNode<Object> lasth = new TimedNode<>(null, 0L);
                         lasth.lazySet(h.get());
                         head = lasth;
                     } else {
@@ -1112,7 +1122,7 @@ void trimFinal() {
 
                 if (next.time > limit) {
                     if (h.value != null) {
-                        TimedNode<Object> lasth = new TimedNode<Object>(null, 0L);
+                        TimedNode<Object> lasth = new TimedNode<>(null, 0L);
                         lasth.lazySet(h.get());
                         head = lasth;
                     } else {
@@ -1127,7 +1137,7 @@ void trimFinal() {
 
         @Override
         public void add(T value) {
-            TimedNode<Object> n = new TimedNode<Object>(value, scheduler.now(unit));
+            TimedNode<Object> n = new TimedNode<>(value, scheduler.now(unit));
             TimedNode<Object> t = tail;
 
             tail = n;
@@ -1139,7 +1149,7 @@ public void add(T value) {
 
         @Override
         public void addFinal(Object notificationLite) {
-            TimedNode<Object> n = new TimedNode<Object>(notificationLite, Long.MAX_VALUE);
+            TimedNode<Object> n = new TimedNode<>(notificationLite, Long.MAX_VALUE);
             TimedNode<Object> t = tail;
 
             tail = n;
@@ -1158,7 +1168,7 @@ public void addFinal(Object notificationLite) {
         public void trimHead() {
             TimedNode<Object> h = head;
             if (h.value != null) {
-                TimedNode<Object> n = new TimedNode<Object>(null, 0);
+                TimedNode<Object> n = new TimedNode<>(null, 0);
                 n.lazySet(h.get());
                 head = n;
             }
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java
index d70cf2f15c..137cefc895 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java
@@ -60,7 +60,7 @@ public void onSubscribe(Disposable d) {
                     if (emitting) {
                         AppendOnlyLinkedArrayList<Object> q = queue;
                         if (q == null) {
-                            q = new AppendOnlyLinkedArrayList<Object>(4);
+                            q = new AppendOnlyLinkedArrayList<>(4);
                             queue = q;
                         }
                         q.add(NotificationLite.disposable(d));
@@ -93,7 +93,7 @@ public void onNext(T t) {
             if (emitting) {
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(4);
+                    q = new AppendOnlyLinkedArrayList<>(4);
                     queue = q;
                 }
                 q.add(NotificationLite.next(t));
@@ -120,7 +120,7 @@ public void onError(Throwable t) {
                 if (emitting) {
                     AppendOnlyLinkedArrayList<Object> q = queue;
                     if (q == null) {
-                        q = new AppendOnlyLinkedArrayList<Object>(4);
+                        q = new AppendOnlyLinkedArrayList<>(4);
                         queue = q;
                     }
                     q.setFirst(NotificationLite.error(t));
@@ -150,7 +150,7 @@ public void onComplete() {
             if (emitting) {
                 AppendOnlyLinkedArrayList<Object> q = queue;
                 if (q == null) {
-                    q = new AppendOnlyLinkedArrayList<Object>(4);
+                    q = new AppendOnlyLinkedArrayList<>(4);
                     queue = q;
                 }
                 q.add(NotificationLite.complete());
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java
index fdd1c806f6..6f8f8b6f35 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java
@@ -115,13 +115,13 @@ public final class SingleSubject<T> extends Single<T> implements SingleObserver<
     @CheckReturnValue
     @NonNull
     public static <T> SingleSubject<T> create() {
-        return new SingleSubject<T>();
+        return new SingleSubject<>();
     }
 
     @SuppressWarnings("unchecked")
     SingleSubject() {
         once = new AtomicBoolean();
-        observers = new AtomicReference<SingleDisposable<T>[]>(EMPTY);
+        observers = new AtomicReference<>(EMPTY);
     }
 
     @Override
@@ -159,7 +159,7 @@ public void onError(@NonNull Throwable e) {
 
     @Override
     protected void subscribeActual(@NonNull SingleObserver<? super T> observer) {
-        SingleDisposable<T> md = new SingleDisposable<T>(observer, this);
+        SingleDisposable<T> md = new SingleDisposable<>(observer, this);
         observer.onSubscribe(md);
         if (add(md)) {
             if (md.isDisposed()) {
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/Subject.java b/src/main/java/io/reactivex/rxjava3/subjects/Subject.java
index 6a3b6462be..35d26d49b5 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/Subject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/Subject.java
@@ -32,6 +32,7 @@ public abstract class Subject<T> extends Observable<T> implements Observer<T> {
      * <p>The method is thread-safe.
      * @return true if the subject has any Observers
      */
+    @CheckReturnValue
     public abstract boolean hasObservers();
 
     /**
@@ -41,6 +42,7 @@ public abstract class Subject<T> extends Observable<T> implements Observer<T> {
      * @see #getThrowable()
      * @see #hasComplete()
      */
+    @CheckReturnValue
     public abstract boolean hasThrowable();
 
     /**
@@ -49,6 +51,7 @@ public abstract class Subject<T> extends Observable<T> implements Observer<T> {
      * @return true if the subject has reached a terminal state through a complete event
      * @see #hasThrowable()
      */
+    @CheckReturnValue
     public abstract boolean hasComplete();
 
     /**
@@ -59,6 +62,7 @@ public abstract class Subject<T> extends Observable<T> implements Observer<T> {
      * hasn't terminated yet
      */
     @Nullable
+    @CheckReturnValue
     public abstract Throwable getThrowable();
 
     /**
@@ -68,10 +72,11 @@ public abstract class Subject<T> extends Observable<T> implements Observer<T> {
      * @return the wrapped and serialized subject
      */
     @NonNull
+    @CheckReturnValue
     public final Subject<T> toSerialized() {
         if (this instanceof SerializedSubject) {
             return this;
         }
-        return new SerializedSubject<T>(this);
+        return new SerializedSubject<>(this);
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
index c522343aed..8f495a9ca5 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
@@ -20,7 +20,7 @@
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.functions.ObjectHelper;
+import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable;
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
@@ -180,7 +180,7 @@ public final class UnicastSubject<T> extends Subject<T> {
     @CheckReturnValue
     @NonNull
     public static <T> UnicastSubject<T> create() {
-        return new UnicastSubject<T>(bufferSize(), true);
+        return create(bufferSize(), Functions.EMPTY_RUNNABLE, true);
     }
 
     /**
@@ -192,12 +192,13 @@ public static <T> UnicastSubject<T> create() {
     @CheckReturnValue
     @NonNull
     public static <T> UnicastSubject<T> create(int capacityHint) {
-        return new UnicastSubject<T>(capacityHint, true);
+        return create(capacityHint, Functions.EMPTY_RUNNABLE, true);
     }
 
     /**
      * Creates an UnicastSubject with the given internal buffer capacity hint and a callback for
-     * the case when the single Subscriber cancels its subscription.
+     * the case when the single Subscriber cancels its subscription
+     * or the subject is terminated.
      *
      * <p>The callback, if not null, is called exactly once and
      * non-overlapped with any active replay.
@@ -209,13 +210,14 @@ public static <T> UnicastSubject<T> create(int capacityHint) {
      */
     @CheckReturnValue
     @NonNull
-    public static <T> UnicastSubject<T> create(int capacityHint, Runnable onTerminate) {
-        return new UnicastSubject<T>(capacityHint, onTerminate, true);
+    public static <T> UnicastSubject<T> create(int capacityHint, @NonNull Runnable onTerminate) {
+        return create(capacityHint, onTerminate, true);
     }
 
     /**
      * Creates an UnicastSubject with the given internal buffer capacity hint, delay error flag and
-     * a callback for the case when the single Subscriber cancels its subscription.
+     * a callback for the case when the single Observer disposes its {@link Disposable}
+     * or the subject is terminated.
      *
      * <p>The callback, if not null, is called exactly once and
      * non-overlapped with any active replay.
@@ -229,8 +231,8 @@ public static <T> UnicastSubject<T> create(int capacityHint, Runnable onTerminat
      */
     @CheckReturnValue
     @NonNull
-    public static <T> UnicastSubject<T> create(int capacityHint, Runnable onTerminate, boolean delayError) {
-        return new UnicastSubject<T>(capacityHint, onTerminate, delayError);
+    public static <T> UnicastSubject<T> create(int capacityHint, @NonNull Runnable onTerminate, boolean delayError) {
+        return new UnicastSubject<>(capacityHint, onTerminate, delayError);
     }
 
     /**
@@ -247,35 +249,7 @@ public static <T> UnicastSubject<T> create(int capacityHint, Runnable onTerminat
     @CheckReturnValue
     @NonNull
     public static <T> UnicastSubject<T> create(boolean delayError) {
-        return new UnicastSubject<T>(bufferSize(), delayError);
-    }
-
-    /**
-     * Creates an UnicastSubject with the given capacity hint and delay error flag.
-     * <p>History: 2.0.8 - experimental
-     * @param capacityHint the capacity hint for the internal, unbounded queue
-     * @param delayError deliver pending onNext events before onError
-     * @since 2.2
-     */
-    UnicastSubject(int capacityHint, boolean delayError) {
-        this.queue = new SpscLinkedArrayQueue<T>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
-        this.onTerminate = new AtomicReference<Runnable>();
-        this.delayError = delayError;
-        this.downstream = new AtomicReference<Observer<? super T>>();
-        this.once = new AtomicBoolean();
-        this.wip = new UnicastQueueDisposable();
-    }
-
-    /**
-     * Creates an UnicastSubject with the given capacity hint and callback
-     * for when the Subject is terminated normally or its single Subscriber cancels.
-     * @param capacityHint the capacity hint for the internal, unbounded queue
-     * @param onTerminate the callback to run when the Subject is terminated or cancelled, null not allowed
-     * @since 2.0
-     *
-     * */
-    UnicastSubject(int capacityHint, Runnable onTerminate) {
-        this(capacityHint, onTerminate, true);
+        return create(bufferSize(), Functions.EMPTY_RUNNABLE, delayError);
     }
 
     /**
@@ -288,10 +262,10 @@ public static <T> UnicastSubject<T> create(boolean delayError) {
      * @since 2.2
      */
     UnicastSubject(int capacityHint, Runnable onTerminate, boolean delayError) {
-        this.queue = new SpscLinkedArrayQueue<T>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
-        this.onTerminate = new AtomicReference<Runnable>(Objects.requireNonNull(onTerminate, "onTerminate"));
+        this.queue = new SpscLinkedArrayQueue<>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
+        this.onTerminate = new AtomicReference<>(Objects.requireNonNull(onTerminate, "onTerminate"));
         this.delayError = delayError;
-        this.downstream = new AtomicReference<Observer<? super T>>();
+        this.downstream = new AtomicReference<>();
         this.once = new AtomicBoolean();
         this.wip = new UnicastQueueDisposable();
     }
@@ -494,12 +468,14 @@ void drain() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasObservers() {
         return downstream.get() != null;
     }
 
     @Override
     @Nullable
+    @CheckReturnValue
     public Throwable getThrowable() {
         if (done) {
             return error;
@@ -508,11 +484,13 @@ public Throwable getThrowable() {
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasThrowable() {
         return done && error != null;
     }
 
     @Override
+    @CheckReturnValue
     public boolean hasComplete() {
         return done && error == null;
     }
diff --git a/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java b/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java
index 7a39c85cfd..68006e3c64 100644
--- a/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java
@@ -175,7 +175,17 @@ public void compositeTest() {
         .assertValue(1);
     }
 
+    /**
+     * Two argument type.
+     * @param <T> the input type
+     * @param <R> the output type
+     */
     interface A<T, R> { }
+
+    /**
+     * One argument type.
+     * @param <T> the type
+     */
     interface B<T> { }
 
     private static <T> ObservableConverter<A<T, ?>, B<T>> testObservableConverterCreator() {
diff --git a/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java b/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java
index 8f9f102a04..20725c80fa 100644
--- a/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java
@@ -18,6 +18,7 @@
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
+import io.reactivex.rxjava3.core.ConverterTest.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 
 public class TransformerTest extends RxJavaTest {
@@ -127,9 +128,6 @@ public void flowableGenericsSignatureTest() {
         Flowable.just(a).compose(TransformerTest.<String>testFlowableTransformerCreator());
     }
 
-    interface A<T, R> { }
-    interface B<T> { }
-
     private static <T> ObservableTransformer<A<T, ?>, B<T>> testObservableTransformerCreator() {
         return new ObservableTransformer<A<T, ?>, B<T>>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
index c5b75a9b39..a579a82ae7 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
@@ -59,7 +59,7 @@ public <R> CylonDetectorObservable<R> lift(FlowableOperator<? extends R, ? super
             return x(new RobotConversionFunc<>(operator));
         }
 
-        public <R, O> O x(Function<Publisher<T>, O> operator) {
+        public <O> O x(Function<Publisher<T>, O> operator) {
             try {
                 return operator.apply(onSubscribe);
             } catch (Throwable ex) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java b/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
index 98488bcd49..72e188fe99 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
@@ -173,62 +173,6 @@ public Integer apply(Integer t1, Integer t2, Integer t3, Integer t4, Integer t5,
         }).apply(new Object[20]);
     }
 
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Test(expected = NullPointerException.class)
-    public void biFunctionFail() throws Exception {
-        BiFunction biFunction = null;
-        Functions.toFunction(biFunction);
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Test(expected = NullPointerException.class)
-    public void function3Fail() throws Exception {
-        Function3 function3 = null;
-        Functions.toFunction(function3);
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Test(expected = NullPointerException.class)
-    public void function4Fail() throws Exception {
-        Function4 function4 = null;
-        Functions.toFunction(function4);
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Test(expected = NullPointerException.class)
-    public void function5Fail() throws Exception {
-        Function5 function5 = null;
-        Functions.toFunction(function5);
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Test(expected = NullPointerException.class)
-    public void function6Fail() throws Exception {
-        Function6 function6 = null;
-        Functions.toFunction(function6);
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Test(expected = NullPointerException.class)
-    public void function7Fail() throws Exception {
-        Function7 function7 = null;
-        Functions.toFunction(function7);
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Test(expected = NullPointerException.class)
-    public void function8Fail() throws Exception {
-        Function8 function8 = null;
-        Functions.toFunction(function8);
-    }
-
-    @SuppressWarnings({"unchecked", "rawtypes"})
-    @Test(expected = NullPointerException.class)
-    public void function9Fail() throws Exception {
-        Function9 function9 = null;
-        Functions.toFunction(function9);
-    }
-
     @Test
     public void identityFunctionToString() {
         assertEquals("IdentityFunction", Functions.identity().toString());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
index c8e041b951..6829c99986 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
@@ -1046,7 +1046,7 @@ public void combineLatestNArguments() throws Exception {
                     if (j < i) {
                         assertEquals("source" + (j + 1) + " is null", ex.getCause().getMessage());
                     } else {
-                        assertEquals("f is null", ex.getCause().getMessage());
+                        assertEquals("combiner is null", ex.getCause().getMessage());
                     }
                 }
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
index 4de1cfb8b0..607801bd19 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
@@ -73,7 +73,7 @@ public Flowable<Object> apply(Flowable<? extends Throwable> attempts) {
                     .map(new Function<Throwable, Tuple>() {
                         @Override
                         public Tuple apply(Throwable n) {
-                            return new Tuple(new Long(1), n);
+                            return new Tuple(1L, n);
                         }})
                     .scan(new BiFunction<Tuple, Tuple, Tuple>() {
                         @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
index e4b41c8bea..614dc28aaa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
@@ -1297,7 +1297,7 @@ public void zipNArguments() throws Exception {
                     if (j < i) {
                         assertEquals("source" + (j + 1) + " is null", ex.getCause().getMessage());
                     } else {
-                        assertEquals("f is null", ex.getCause().getMessage());
+                        assertEquals("zipper is null", ex.getCause().getMessage());
                     }
                 }
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
index 6a88930b75..ab4ba0273f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
@@ -893,7 +893,6 @@ public void arrayDelayErrorMaxConcurrency() {
         PublishSubject<Integer> ps2 = PublishSubject.create();
         PublishSubject<Integer> ps3 = PublishSubject.create();
 
-        @SuppressWarnings("unchecked")
         TestObserver<Integer> to = Observable.concatArrayEagerDelayError(2, 2, ps1, ps2, ps3)
         .test();
 
@@ -929,7 +928,6 @@ public void arrayDelayErrorMaxConcurrencyErrorDelayed() {
         PublishSubject<Integer> ps2 = PublishSubject.create();
         PublishSubject<Integer> ps3 = PublishSubject.create();
 
-        @SuppressWarnings("unchecked")
         TestObserver<Integer> to = Observable.concatArrayEagerDelayError(2, 2, ps1, ps2, ps3)
         .test();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
index 05df845a44..b1c42a1175 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
@@ -780,7 +780,6 @@ public void concat4() {
         .assertResult(1, 2, 3, 4);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayDelayError() {
         Observable.concatArrayDelayError(Observable.just(1), Observable.just(2),
@@ -789,7 +788,6 @@ public void concatArrayDelayError() {
         .assertResult(1, 2, 3, 4);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayDelayErrorWithError() {
         Observable.concatArrayDelayError(Observable.just(1), Observable.just(2),
@@ -886,13 +884,11 @@ public Iterable<Integer> apply(Integer v) throws Exception {
         .assertResult(1, 2, 3, 4, 5, 1, 2, 3, 4, 5);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void emptyArray() {
         assertSame(Observable.empty(), Observable.concatArrayDelayError());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void singleElementArray() {
         assertSame(Observable.never(), Observable.concatArrayDelayError(Observable.never()));
@@ -923,13 +919,11 @@ public ObservableSource<Integer> apply(Object v) throws Exception {
 
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArrayEmpty() {
         assertSame(Observable.empty(), Observable.concatArray());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void concatArraySingleElement() {
         assertSame(Observable.never(), Observable.concatArray(Observable.never()));
@@ -960,7 +954,6 @@ public ObservableSource<Integer> apply(Object v) throws Exception {
 
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscription() {
         final int[] calls = { 0 };
@@ -981,7 +974,6 @@ public void subscribe(ObservableEmitter<Integer> s) throws Exception {
         assertEquals(1, calls[0]);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noSubsequentSubscriptionDelayError() {
         final int[] calls = { 0 };
@@ -1071,7 +1063,6 @@ public void onComplete() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void concatReportsDisposedOnCompleteDelayError() {
         final Disposable[] disposable = { null };
 
@@ -1128,7 +1119,6 @@ public void onComplete() {
     }
 
     @Test
-    @SuppressWarnings("unchecked")
     public void concatReportsDisposedOnErrorDelayError() {
         final Disposable[] disposable = { null };
 
@@ -1156,7 +1146,6 @@ public void onComplete() {
         assertTrue(disposable[0].isDisposed());
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void noCancelPreviousArray() {
         final AtomicInteger counter = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
index c4d24a69c7..fefce52867 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
@@ -506,7 +506,6 @@ public void mergeIterableDelayError() {
         .assertResult(1, 2);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArrayDelayError() {
         Observable.mergeArrayDelayError(Observable.just(1), Observable.just(2))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
index 92d30f8a85..d5b9a45a6f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
@@ -1065,7 +1065,6 @@ public void onNext(Integer t) {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void mergeArray2() {
         Observable.mergeArray(Observable.just(1), Observable.just(2))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
index 381ee0a790..94009c5b86 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
@@ -74,7 +74,7 @@ public Observable<Object> apply(Observable<? extends Throwable> attempts) {
                     .map(new Function<Throwable, Tuple>() {
                         @Override
                         public Tuple apply(Throwable n) {
-                            return new Tuple(new Long(1), n);
+                            return new Tuple(1L, n);
                         }})
                     .scan(new BiFunction<Tuple, Tuple, Tuple>() {
                         @Override
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index d222f92392..b5a03ede3b 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -2662,7 +2662,7 @@ public void mergeDelayError4() {
 
     @Test
     public void sequenceEqual() {
-        Maybe.sequenceEqual(Maybe.just(1), Maybe.just(new Integer(1))).test().assertResult(true);
+        Maybe.sequenceEqual(Maybe.just(1_000_000), Maybe.just(Integer.valueOf(1_000_000))).test().assertResult(true);
 
         Maybe.sequenceEqual(Maybe.just(1), Maybe.just(2)).test().assertResult(false);
 
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
index 074057a8d3..0fa7c22711 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
@@ -202,7 +202,6 @@ public void concatArrayNull() {
         Observable.concatArray((Observable<Object>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void concatArrayOneIsNull() {
         Observable.concatArray(just1, null).blockingLast();
@@ -521,7 +520,6 @@ public void mergeArrayNull() {
         Observable.mergeArray(128, 128, (Observable<Object>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void mergeArrayOneIsNull() {
         Observable.mergeArray(128, 128, just1, null).blockingLast();
@@ -552,7 +550,6 @@ public void mergeDelayErrorArrayNull() {
         Observable.mergeArrayDelayError(128, 128, (Observable<Object>[])null);
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = NullPointerException.class)
     public void mergeDelayErrorArrayOneIsNull() {
         Observable.mergeArrayDelayError(128, 128, just1, null).blockingLast();
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
index 93ffe8de7d..1d1f97163f 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
@@ -306,7 +306,6 @@ public Iterable<Integer> apply(List<Integer> v) throws Exception {
         TestHelper.assertValueSet(ts, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void from() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
index 56595583bb..25d72af909 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
@@ -73,7 +73,6 @@ public Integer apply(Integer a, Integer b) throws Exception {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error2() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
index d2cc8aaec0..e7b5cda9b0 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
@@ -82,7 +82,6 @@ public void error3() {
         }
     }
 
-    @SuppressWarnings("unchecked")
     @Test
     public void error2() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
index 9c9301176c..17e4cb0a72 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
@@ -368,7 +368,7 @@ public void dispose() {
             public void run() {
                 calls[0]++;
             }
-        });
+        }, true);
 
         TestHelper.checkDisposed(us);
 
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 9bfb21668e..eabbb6f96d 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -3257,10 +3257,23 @@ public static <T> TestObserverEx<T> assertValueSet(TestObserverEx<T> to, T... va
      * @throws Exception on error
      */
     public static File findSource(String baseClassName) throws Exception {
+        return findSource(baseClassName, "io.reactivex.rxjava3.core");
+    }
+
+    /**
+     * Given a base reactive type name, try to find its source in the current runtime
+     * path and return a file to it or null if not found.
+     * @param baseClassName the class name such as {@code Maybe}
+     * @param parentPackage the parent package such as {@code io.reactivex.rxjava3.core}
+     * @return the File pointing to the source
+     * @throws Exception on error
+     */
+    public static File findSource(String baseClassName, String parentPackage) throws Exception {
         URL u = TestHelper.class.getResource(TestHelper.class.getSimpleName() + ".class");
 
         String path = new File(u.toURI()).toString().replace('\\', '/');
 
+        parentPackage = parentPackage.replace(".", "/");
 //        System.out.println(path);
 
         int i = path.toLowerCase().indexOf("/rxjava");
@@ -3272,16 +3285,18 @@ public static File findSource(String baseClassName) throws Exception {
         // find end of any potential postfix to /RxJava
         int j = path.indexOf("/", i + 6);
 
-        String p = path.substring(0, j + 1) + "src/main/java/io/reactivex/rxjava3/core/" + baseClassName + ".java";
+        String basePackage = path.substring(0, j + 1) + "src/main/java";
+
+        String p = basePackage + "/" + parentPackage + "/" + baseClassName + ".java";
 
         File f = new File(p);
 
-        if (!f.canRead()) {
-            System.out.println("Can't read " + p);
-            return null;
+        if (f.canRead()) {
+            return f;
         }
 
-        return f;
+        System.out.println("Can't read " + p);
+        return null;
     }
 
     /**
diff --git a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
index 36457ffd86..504232be2e 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
@@ -22,6 +22,11 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.subjects.*;
 
 /**
  * Verifies several properties.
@@ -38,16 +43,14 @@ static void checkCheckReturnValueSupport(Class<?> clazz) {
         StringBuilder b = new StringBuilder();
 
         for (Method m : clazz.getMethods()) {
-            if (m.getName().equals("bufferSize")) {
-                continue;
-            }
             if (m.getDeclaringClass() == clazz) {
                 boolean isSubscribeMethod = "subscribe".equals(m.getName()) && m.getParameterTypes().length == 0;
+                boolean isConnectMethod = "connect".equals(m.getName()) && m.getParameterTypes().length == 0;
                 boolean isAnnotationPresent = m.isAnnotationPresent(CheckReturnValue.class);
 
-                if (isSubscribeMethod) {
+                if (isSubscribeMethod || isConnectMethod) {
                     if (isAnnotationPresent) {
-                        b.append("subscribe() method has @CheckReturnValue: ").append(m).append("\r\n");
+                        b.append(m.getName()).append(" method has @CheckReturnValue: ").append(m).append("\r\n");
                     }
                     continue;
                 }
@@ -83,7 +86,8 @@ static void checkSchedulerSupport(Class<?> clazz) {
         StringBuilder b = new StringBuilder();
 
         for (Method m : clazz.getMethods()) {
-            if (m.getName().equals("bufferSize")) {
+            if (m.getName().equals("bufferSize")
+                    || m.getName().equals("parallelism")) {
                 continue;
             }
             if (m.getDeclaringClass() == clazz) {
@@ -130,18 +134,24 @@ static void checkBackpressureSupport(Class<?> clazz) {
         StringBuilder b = new StringBuilder();
 
         for (Method m : clazz.getMethods()) {
-            if (m.getName().equals("bufferSize")) {
+            if (m.getName().equals("bufferSize")
+                    || m.getName().equals("parallelism")) {
                 continue;
             }
             if (m.getDeclaringClass() == clazz) {
-                if (clazz == Flowable.class) {
+                if (clazz == Flowable.class || clazz == ParallelFlowable.class) {
                     if (!m.isAnnotationPresent(BackpressureSupport.class)) {
-                        b.append("No @BackpressureSupport annotation (being Flowable): ").append(m).append("\r\n");
+                        b.append("No @BackpressureSupport annotation (being ")
+                        .append(clazz.getSimpleName())
+                        .append("): ").append(m).append("\r\n");
                     }
                 } else {
-                    if (m.getReturnType() == Flowable.class) {
+                    if (m.getReturnType() == Flowable.class
+                            || m.getReturnType() == ParallelFlowable.class) {
                         if (!m.isAnnotationPresent(BackpressureSupport.class)) {
-                            b.append("No @BackpressureSupport annotation (having Flowable return): ").append(m).append("\r\n");
+                            b.append("No @BackpressureSupport annotation (having ")
+                            .append(m.getReturnType().getSimpleName())
+                            .append(" return): ").append(m).append("\r\n");
                         }
                     } else {
                         boolean found = false;
@@ -200,6 +210,86 @@ public void checkReturnValueMaybe() {
         checkCheckReturnValueSupport(Maybe.class);
     }
 
+    @Test
+    public void checkReturnValueConnectableObservable() {
+        checkCheckReturnValueSupport(ConnectableObservable.class);
+    }
+
+    @Test
+    public void checkReturnValueConnectableFlowable() {
+        checkCheckReturnValueSupport(ConnectableFlowable.class);
+    }
+
+    @Test
+    public void checkReturnValueParallelFlowable() {
+        checkCheckReturnValueSupport(ParallelFlowable.class);
+    }
+
+    @Test
+    public void checkReturnValueAsyncSubject() {
+        checkCheckReturnValueSupport(AsyncSubject.class);
+    }
+
+    @Test
+    public void checkReturnValueBehaviorSubject() {
+        checkCheckReturnValueSupport(BehaviorSubject.class);
+    }
+
+    @Test
+    public void checkReturnValuePublishSubject() {
+        checkCheckReturnValueSupport(PublishSubject.class);
+    }
+
+    @Test
+    public void checkReturnValueReplaySubject() {
+        checkCheckReturnValueSupport(ReplaySubject.class);
+    }
+
+    @Test
+    public void checkReturnValueUnicastSubject() {
+        checkCheckReturnValueSupport(UnicastSubject.class);
+    }
+
+    @Test
+    public void checkReturnValueAsyncProcessor() {
+        checkCheckReturnValueSupport(AsyncProcessor.class);
+    }
+
+    @Test
+    public void checkReturnValueBehaviorProcessor() {
+        checkCheckReturnValueSupport(BehaviorProcessor.class);
+    }
+
+    @Test
+    public void checkReturnValuePublishProcessor() {
+        checkCheckReturnValueSupport(PublishProcessor.class);
+    }
+
+    @Test
+    public void checkReturnValueReplayProcessor() {
+        checkCheckReturnValueSupport(ReplayProcessor.class);
+    }
+
+    @Test
+    public void checkReturnValueUnicastProcessor() {
+        checkCheckReturnValueSupport(UnicastProcessor.class);
+    }
+
+    @Test
+    public void checkReturnValueMulticastProcessor() {
+        checkCheckReturnValueSupport(MulticastProcessor.class);
+    }
+
+    @Test
+    public void checkReturnValueSubject() {
+        checkCheckReturnValueSupport(Subject.class);
+    }
+
+    @Test
+    public void checkReturnValueFlowableProcessor() {
+        checkCheckReturnValueSupport(FlowableProcessor.class);
+    }
+
     @Test
     public void schedulerSupportFlowable() {
         checkSchedulerSupport(Flowable.class);
@@ -225,6 +315,21 @@ public void schedulerSupportMaybe() {
         checkSchedulerSupport(Maybe.class);
     }
 
+    @Test
+    public void schedulerSupportConnectableObservable() {
+        checkSchedulerSupport(ConnectableObservable.class);
+    }
+
+    @Test
+    public void schedulerSupportConnectableFlowable() {
+        checkSchedulerSupport(ConnectableFlowable.class);
+    }
+
+    @Test
+    public void schedulerSupportParallelFlowable() {
+        checkSchedulerSupport(ParallelFlowable.class);
+    }
+
     @Test
     public void backpressureSupportFlowable() {
         checkBackpressureSupport(Flowable.class);
@@ -249,4 +354,19 @@ public void backpressureSupportCompletable() {
     public void backpressureSupportMaybe() {
         checkBackpressureSupport(Maybe.class);
     }
+
+    @Test
+    public void backpressureSupportConnectableFlowable() {
+        checkBackpressureSupport(ConnectableFlowable.class);
+    }
+
+    @Test
+    public void backpressureSupportConnectableObservable() {
+        checkBackpressureSupport(ConnectableObservable.class);
+    }
+
+    @Test
+    public void backpressureSupportParallelFlowable() {
+        checkBackpressureSupport(ParallelFlowable.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
new file mode 100644
index 0000000000..6e66d4249e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -0,0 +1,235 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.validators;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+/**
+ * Check if the parameter name in Objects.requireNonNull
+ * and ObjectHelper.verifyPositive calls match the parameter
+ *  name in the message.
+ */
+public class ParamValidationNaming {
+
+    @Test
+    public void checkCompletable() throws Exception {
+        processFile(Completable.class);
+    }
+
+    @Test
+    public void checkSingle() throws Exception {
+        processFile(Single.class);
+    }
+
+    @Test
+    public void checkMaybe() throws Exception {
+        processFile(Maybe.class);
+    }
+
+    @Test
+    public void checkObservable() throws Exception {
+        processFile(Observable.class);
+    }
+
+    @Test
+    public void checkFlowable() throws Exception {
+        processFile(Flowable.class);
+    }
+
+    @Test
+    public void checkParallelFlowable() throws Exception {
+        processFile(ParallelFlowable.class);
+    }
+
+    @Test
+    public void checkConnectableObservable() throws Exception {
+        processFile(ConnectableObservable.class);
+    }
+
+    @Test
+    public void checkConnectableFlowable() throws Exception {
+        processFile(ConnectableFlowable.class);
+    }
+
+    @Test
+    public void checkSubject() throws Exception {
+        processFile(Subject.class);
+    }
+
+    @Test
+    public void checkFlowableProcessor() throws Exception {
+        processFile(FlowableProcessor.class);
+    }
+
+    @Test
+    public void checkDisposable() throws Exception {
+        processFile(Disposable.class);
+    }
+
+    @Test
+    public void checkScheduler() throws Exception {
+        processFile(Scheduler.class);
+    }
+
+    @Test
+    public void checkSchedulers() throws Exception {
+        processFile(Schedulers.class);
+    }
+
+    @Test
+    public void checkAsyncSubject() throws Exception {
+        processFile(AsyncSubject.class);
+    }
+
+    @Test
+    public void checkBehaviorSubject() throws Exception {
+        processFile(BehaviorSubject.class);
+    }
+
+    @Test
+    public void checkPublishSubject() throws Exception {
+        processFile(PublishSubject.class);
+    }
+
+    @Test
+    public void checkReplaySubject() throws Exception {
+        processFile(ReplaySubject.class);
+    }
+
+    @Test
+    public void checkUnicastSubject() throws Exception {
+        processFile(UnicastSubject.class);
+    }
+
+    @Test
+    public void checkSingleSubject() throws Exception {
+        processFile(SingleSubject.class);
+    }
+
+    @Test
+    public void checkMaybeSubject() throws Exception {
+        processFile(MaybeSubject.class);
+    }
+
+    @Test
+    public void checkCompletableSubject() throws Exception {
+        processFile(CompletableSubject.class);
+    }
+
+    @Test
+    public void checkAsyncProcessor() throws Exception {
+        processFile(AsyncProcessor.class);
+    }
+
+    @Test
+    public void checkBehaviorProcessor() throws Exception {
+        processFile(BehaviorProcessor.class);
+    }
+
+    @Test
+    public void checkPublishProcessor() throws Exception {
+        processFile(PublishProcessor.class);
+    }
+
+    @Test
+    public void checkReplayProcessor() throws Exception {
+        processFile(ReplayProcessor.class);
+    }
+
+    @Test
+    public void checkUnicastProcessor() throws Exception {
+        processFile(UnicastProcessor.class);
+    }
+
+    @Test
+    public void checkMulticastProcessor() throws Exception {
+        processFile(MulticastProcessor.class);
+    }
+
+    static void processFile(Class<?> clazz) throws Exception {
+        String baseClassName = clazz.getSimpleName();
+        File f = TestHelper.findSource(baseClassName, clazz.getPackage().getName());
+        if (f == null) {
+            return;
+        }
+        String fullClassName = clazz.getName();
+
+        int errorCount = 0;
+        StringBuilder errors = new StringBuilder();
+
+        List<String> lines = Files.readAllLines(f.toPath());
+
+        for (int j = 0; j < lines.size(); j++) {
+            String line = lines.get(j).trim();
+
+            for (String validatorStr : VALIDATOR_STRINGS)
+            if (line.startsWith(validatorStr)) {
+
+                int comma = line.indexOf(',');
+
+                String paramName = line.substring(validatorStr.length(), comma);
+
+                int quote = line.indexOf('"', comma);
+
+                String message = line.substring(quote + 1, quote + 2 + paramName.length());
+
+                if (!line.contains("The RxJavaPlugins")
+                        && !(message.startsWith(paramName)
+                        && (message.endsWith(" ") || message.endsWith("\"")))) {
+                    errorCount++;
+                    errors.append("L")
+                    .append(j)
+                    .append(" : Wrong validator message parameter name\r\n    ")
+                    .append(line)
+                    .append("\r\n")
+                    .append("    ").append(paramName).append(" != ").append(message)
+                    .append("\r\n at ")
+                    .append(fullClassName)
+                    .append(".method(")
+                    .append(f.getName())
+                    .append(":")
+                    .append(j + 1)
+                    .append(")\r\n")
+                    ;
+                }
+            }
+        }
+
+        if (errorCount != 0) {
+            errors.insert(0, errorCount + " problems\r\n");
+            errors.setLength(errors.length() - 2);
+            throw new AssertionError(errors.toString());
+        }
+    }
+
+    static final List<String> VALIDATOR_STRINGS = Arrays.asList(
+            "Objects.requireNonNull(",
+            "ObjectHelper.requirePositive("
+    );
+}
diff --git a/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
index 8cde4fac7e..6fb50a141b 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
@@ -21,7 +21,13 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.flowables.ConnectableFlowable;
+import io.reactivex.rxjava3.observables.ConnectableObservable;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 /**
@@ -46,8 +52,7 @@ public void checkMaybe() throws Exception {
         processFile(Maybe.class);
     }
 
-    // TODO later
-    // @Test
+    @Test
     public void checkObservable() throws Exception {
         processFile(Observable.class);
     }
@@ -57,15 +62,119 @@ public void checkFlowable() throws Exception {
         processFile(Flowable.class);
     }
 
-    // TODO later
-    // @Test
+    @Test
     public void checkParallelFlowable() throws Exception {
         processFile(ParallelFlowable.class);
     }
 
+    @Test
+    public void checkConnectableObservable() throws Exception {
+        processFile(ConnectableObservable.class);
+    }
+
+    @Test
+    public void checkConnectableFlowable() throws Exception {
+        processFile(ConnectableFlowable.class);
+    }
+
+    @Test
+    public void checkSubject() throws Exception {
+        processFile(Subject.class);
+    }
+
+    @Test
+    public void checkFlowableProcessor() throws Exception {
+        processFile(FlowableProcessor.class);
+    }
+
+    @Test
+    public void checkDisposable() throws Exception {
+        processFile(Disposable.class);
+    }
+
+    @Test
+    public void checkScheduler() throws Exception {
+        processFile(Scheduler.class);
+    }
+
+    @Test
+    public void checkSchedulers() throws Exception {
+        processFile(Schedulers.class);
+    }
+
+    @Test
+    public void checkAsyncSubject() throws Exception {
+        processFile(AsyncSubject.class);
+    }
+
+    @Test
+    public void checkBehaviorSubject() throws Exception {
+        processFile(BehaviorSubject.class);
+    }
+
+    @Test
+    public void checkPublishSubject() throws Exception {
+        processFile(PublishSubject.class);
+    }
+
+    @Test
+    public void checkReplaySubject() throws Exception {
+        processFile(ReplaySubject.class);
+    }
+
+    @Test
+    public void checkUnicastSubject() throws Exception {
+        processFile(UnicastSubject.class);
+    }
+
+    @Test
+    public void checkSingleSubject() throws Exception {
+        processFile(SingleSubject.class);
+    }
+
+    @Test
+    public void checkMaybeSubject() throws Exception {
+        processFile(MaybeSubject.class);
+    }
+
+    @Test
+    public void checkCompletableSubject() throws Exception {
+        processFile(CompletableSubject.class);
+    }
+
+    @Test
+    public void checkAsyncProcessor() throws Exception {
+        processFile(AsyncProcessor.class);
+    }
+
+    @Test
+    public void checkBehaviorProcessor() throws Exception {
+        processFile(BehaviorProcessor.class);
+    }
+
+    @Test
+    public void checkPublishProcessor() throws Exception {
+        processFile(PublishProcessor.class);
+    }
+
+    @Test
+    public void checkReplayProcessor() throws Exception {
+        processFile(ReplayProcessor.class);
+    }
+
+    @Test
+    public void checkUnicastProcessor() throws Exception {
+        processFile(UnicastProcessor.class);
+    }
+
+    @Test
+    public void checkMulticastProcessor() throws Exception {
+        processFile(MulticastProcessor.class);
+    }
+
     static void processFile(Class<?> clazz) throws Exception {
         String baseClassName = clazz.getSimpleName();
-        File f = TestHelper.findSource(baseClassName);
+        File f = TestHelper.findSource(baseClassName, clazz.getPackage().getName());
         if (f == null) {
             return;
         }
@@ -79,7 +188,14 @@ static void processFile(Class<?> clazz) throws Exception {
         for (int j = 0; j < lines.size(); j++) {
             String line = lines.get(j).trim();
 
-            if (line.startsWith("public static") || line.startsWith("public final")) {
+            if (line.contains("class")) {
+                continue;
+            }
+            if (line.startsWith("public static")
+                    || line.startsWith("public final")
+                    || line.startsWith("protected final")
+                    || line.startsWith("protected abstract")
+                    || line.startsWith("public abstract")) {
                 int methodArgStart = line.indexOf("(");
 
                 int isBoolean = line.indexOf(" boolean ");
@@ -168,10 +284,12 @@ else if (skippingDepth == 0) {
                 String strippedArgumentsStr = strippedArguments.toString();
                 String[] args = strippedArgumentsStr.split("\\s*,\\s*");
 
-                for (String typeName : CLASS_NAMES) {
-                    String typeNameSpaced = typeName + " ";
-                    for (int k = 0; k < args.length; k++) {
-                        String typeDef = args[k];
+                for (int k = 0; k < args.length; k++) {
+                    String typeDef = args[k];
+
+                    for (String typeName : CLASS_NAMES) {
+                        String typeNameSpaced = typeName + " ";
+
                         if (typeDef.contains(typeNameSpaced)
                                 && !typeDef.contains("@NonNull")
                                 && !typeDef.contains("@Nullable")) {
@@ -181,8 +299,9 @@ else if (skippingDepth == 0) {
                                 errorCount++;
                                 errors.append("L")
                                 .append(j)
-                                .append(" - argument ").append(k + 1).append(" - ").append(typeDef)
-                                .append(" : Missing argument type nullability annotation |\r\n    ")
+                                .append(" - argument ").append(k + 1)
+                                .append(" : Missing argument type nullability annotation\r\n    ")
+                                .append(typeDef).append("\r\n    ")
                                 .append(strippedArgumentsStr)
                                 .append("\r\n")
                                 .append(" at ")
@@ -196,13 +315,55 @@ else if (skippingDepth == 0) {
                             }
                         }
                     }
+
+                    if (typeDef.contains("final ")) {
+                        errorCount++;
+                        errors.append("L")
+                        .append(j)
+                        .append(" - argument ").append(k + 1)
+                        .append(" : unnecessary final on argument\r\n    ")
+                        .append(typeDef).append("\r\n    ")
+                        .append(strippedArgumentsStr)
+                        .append("\r\n")
+                        .append(" at ")
+                        .append(fullClassName)
+                        .append(".method(")
+                        .append(f.getName())
+                        .append(":")
+                        .append(j + 1)
+                        .append(")\r\n")
+                        ;
+                    }
+                    if (typeDef.contains("@NonNull int")
+                            || typeDef.contains("@NonNull long")
+                            || typeDef.contains("@Nullable int")
+                            || typeDef.contains("@Nullable long")
+                        ) {
+                        errorCount++;
+                        errors.append("L")
+                        .append(j)
+                        .append(" - argument ").append(k + 1)
+                        .append(" : unnecessary nullability annotation\r\n    ")
+                        .append(typeDef).append("\r\n    ")
+                        .append(strippedArgumentsStr)
+                        .append("\r\n")
+                        .append(" at ")
+                        .append(fullClassName)
+                        .append(".method(")
+                        .append(f.getName())
+                        .append(":")
+                        .append(j + 1)
+                        .append(")\r\n")
+                        ;
+                    }
+
                 }
 
                 if (strippedArgumentsStr.contains("...") && !hasSafeVarargsAnnotation) {
                     errorCount++;
                     errors.append("L")
                     .append(j)
-                    .append(" : Missing @SafeVarargs annotation |\r\n    ")
+                    .append(" : Missing @SafeVarargs annotation\r\n    ")
                     .append(strippedArgumentsStr)
                     .append("\r\n")
                     .append(" at ")
@@ -218,7 +379,7 @@ else if (skippingDepth == 0) {
         }
 
         if (errorCount != 0) {
-            errors.insert(0, errorCount + " missing annotations\r\n");
+            errors.insert(0, errorCount + " problems\r\n");
             errors.setLength(errors.length() - 2);
             throw new AssertionError(errors.toString());
         }
@@ -249,6 +410,8 @@ else if (skippingDepth == 0) {
             "Throwable", "Optional", "CompletionStage", "BooleanSupplier", "LongConsumer",
             "Predicate", "BiPredicate", "Object",
 
+            "Iterable", "Stream", "Iterator",
+
             "BackpressureOverflowStrategy", "BackpressureStrategy",
             "Subject", "Processor", "FlowableProcessor",
 

From af17c6e268d0e2fe4675feb46c19a29227cb135b Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 26 Dec 2019 13:33:30 +0100
Subject: [PATCH 024/665] 3.x: [Java 8] Add Observable operators + cleanup
 (#6797)

---
 .../io/reactivex/rxjava3/core/Observable.java | 509 +++++++++++++++++-
 .../internal/jdk8/FlowableFromStream.java     |  14 +-
 .../jdk8/ObservableCollectWithCollector.java  | 151 ++++++
 .../ObservableCollectWithCollectorSingle.java | 159 ++++++
 .../jdk8/ObservableFirstStageObserver.java    |  51 ++
 .../jdk8/ObservableFlatMapStream.java         | 162 ++++++
 .../jdk8/ObservableFromCompletionStage.java   |  92 ++++
 .../internal/jdk8/ObservableFromStream.java   | 219 ++++++++
 .../jdk8/ObservableLastStageObserver.java     |  54 ++
 .../internal/jdk8/ObservableMapOptional.java  |  96 ++++
 .../jdk8/ObservableSingleStageObserver.java   |  60 +++
 .../jdk8/ObservableStageObserver.java         |  75 +++
 .../internal/jdk8/FlowableFromStreamTest.java |  42 ++
 .../jdk8/ObservableBlockingStreamTest.java    | 107 ++++
 .../ObservableCollectWithCollectorTest.java   | 444 +++++++++++++++
 .../jdk8/ObservableFlatMapStreamTest.java     | 466 ++++++++++++++++
 .../ObservableFromCompletionStageTest.java    |  65 +++
 .../jdk8/ObservableFromOptionalTest.java      |  38 ++
 .../jdk8/ObservableFromStreamTest.java        | 488 +++++++++++++++++
 .../jdk8/ObservableMapOptionalTest.java       | 394 ++++++++++++++
 ...bservableStageSubscriberOrDefaultTest.java | 475 ++++++++++++++++
 .../ObservableStageSubscriberOrErrorTest.java | 469 ++++++++++++++++
 .../flowable/FlowableConcatMapEagerTest.java  |  16 +-
 .../flowable/FlowableDistinctTest.java        |   6 +-
 .../flowable/FlowableFilterTest.java          |   6 +-
 .../operators/flowable/FlowableMapTest.java   |   6 +-
 .../flowable/FlowableObserveOnTest.java       |  38 +-
 .../ObservableDistinctUntilChangedTest.java   |   6 +-
 .../observable/ObservableDoAfterNextTest.java |  12 +-
 .../observable/ObservableDoFinallyTest.java   |  24 +-
 .../observable/ObservableDoOnEachTest.java    |  18 +-
 .../observable/ObservableObserveOnTest.java   |   8 +-
 .../processors/UnicastProcessorTest.java      |  68 +--
 .../rxjava3/subjects/UnicastSubjectTest.java  |   6 +-
 .../testsupport/TestObserverExTest.java       |  14 +-
 .../CheckLocalVariablesInTests.java           |  24 +-
 .../rxjava3/validators/JavadocWording.java    | 186 +++----
 .../ParamValidationCheckerTest.java           |   4 +
 38 files changed, 4854 insertions(+), 218 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFirstStageObserver.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStage.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableLastStageObserver.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptional.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableSingleStageObserver.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageObserver.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableBlockingStreamTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStreamTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStageTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromOptionalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrErrorTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 16e1454af3..0afdd29a93 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -15,6 +15,7 @@
 
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.stream.*;
 
 import org.reactivestreams.Publisher;
 
@@ -24,6 +25,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.observers.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
@@ -1931,6 +1933,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
      *            resulting ObservableSource
      * @return an Observable that emits each item in the source {@link Iterable} sequence
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromStream(Stream)
      */
     @CheckReturnValue
     @NonNull
@@ -5211,16 +5214,16 @@ public final Iterable<T> blockingIterable() {
      *  <dd>{@code blockingIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param bufferSize the number of items to prefetch from the current Observable
+     * @param capacityHint the expected number of items to be buffered
      * @return an {@link Iterable} version of this {@code Observable}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Iterable<T> blockingIterable(int bufferSize) {
-        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return new BlockingObservableIterable<>(this, bufferSize);
+    public final Iterable<T> blockingIterable(int capacityHint) {
+        ObjectHelper.verifyPositive(capacityHint, "bufferSize");
+        return new BlockingObservableIterable<>(this, capacityHint);
     }
 
     /**
@@ -15910,4 +15913,502 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
         subscribe(to);
         return to;
     }
+
+    // -------------------------------------------------------------------------
+    // JDK 8 Support
+    // -------------------------------------------------------------------------
+
+    /**
+     * Converts the existing value of the provided optional into a {@link #just(Object)}
+     * or an empty optional into an {@link #empty()} {@code Observable} instance.
+     * <p>
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromOptional.o.png" alt="">
+     * <p>
+     * Note that the operator takes an already instantiated optional reference and does not
+     * by any means create this original optional. If the optional is to be created per
+     * consumer upon subscription, use {@link #defer(Supplier)} around {@code fromOptional}:
+     * <pre><code>
+     * Observable.defer(() -&gt; Observable.fromOptional(createOptional()));
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromOptional} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the optional value
+     * @param optional the optional value to convert into an {@code Observable}
+     * @return the new Observable instance
+     * @see #just(Object)
+     * @see #empty()
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Observable<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
+        Objects.requireNonNull(optional, "optional is null");
+        return optional.map(Observable::just).orElseGet(Observable::empty);
+    }
+
+    /**
+     * Signals the completion value or error of the given (hot) {@link CompletionStage}-based asynchronous calculation.
+     * <p>
+     * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.o.png" alt="">
+     * <p>
+     * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
+     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * around {@code fromCompletionStage}:
+     * <pre><code>
+     * Observable.defer(() -&gt; Observable.fromCompletionStage(createCompletionStage()));
+     * </code></pre>
+     * <p>
+     * If the {@code CompletionStage} completes with {@code null}, a {@link NullPointerException} is signaled.
+     * <p>
+     * Canceling the flow can't cancel the execution of the {@code CompletionStage} because {@code CompletionStage}
+     * itself doesn't support cancellation. Instead, the operator detaches from the {@code CompletionStage}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the CompletionStage
+     * @param stage the CompletionStage to convert to Observable and signal its terminal value or error
+     * @return the new Observable instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Observable<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
+        Objects.requireNonNull(stage, "stage is null");
+        return RxJavaPlugins.onAssembly(new ObservableFromCompletionStage<>(stage));
+    }
+
+    /**
+     * Converts a {@link Stream} into a finite {@code Observable} and emits its items in the sequence.
+     * <p>
+     * <img width="640" height="407" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromStream.o.png" alt="">
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #fromIterable(Iterable)}:
+     * <pre><code>
+     * Stream&lt;T&gt; stream = ...
+     * Observable.fromIterable(stream::iterator);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * IntStream intStream = IntStream.rangeClosed(1, 10);
+     * Observable.fromStream(intStream.boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the source {@code Stream}
+     * @param stream the {@code Stream} of values to emit
+     * @return the new Observable instance
+     * @since 3.0.0
+     * @see #fromIterable(Iterable)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Observable<@NonNull T> fromStream(@NonNull Stream<T> stream) {
+        Objects.requireNonNull(stream, "stream is null");
+        return RxJavaPlugins.onAssembly(new ObservableFromStream<>(stream));
+    }
+
+    /**
+     * Maps each upstream value into an {@link Optional} and emits the contained item if not empty.
+     * <p>
+     * <img width="640" height="306" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mapOptional.o.png" alt="">
+     *
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the non-null output type
+     * @param mapper the function that receives the upstream item and should return a <em>non-empty</em> {@code Optional}
+     * to emit as the output or an <em>empty</em> {@code Optional} to skip to the next upstream value
+     * @return the new Observable instance
+     * @since 3.0.0
+     * @see #map(Function)
+     * @see #filter(Predicate)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Observable<R> mapOptional(@NonNull Function<? super T, @NonNull Optional<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new ObservableMapOptional<>(this, mapper));
+    }
+
+    /**
+     * Collects the finite upstream's values into a container via a Stream {@link Collector} callback set and emits
+     * it as the success result.
+     * <p>
+     * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collector.o.png" alt="">
+     *
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code collect} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the non-null result type
+     * @param <A> the intermediate container type used for the accumulation
+     * @param collector the interface defining the container supplier, accumulator and finisher functions;
+     * see {@link Collectors} for some standard implementations
+     * @return the new Single instance
+     * @since 3.0.0
+     * @see Collectors
+     * @see #collect(Supplier, BiConsumer)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R, A> Single<R> collect(@NonNull Collector<T, A, R> collector) {
+        Objects.requireNonNull(collector, "collector is null");
+        return RxJavaPlugins.onAssembly(new ObservableCollectWithCollectorSingle<>(this, collector));
+    }
+
+    /**
+     * Signals the first upstream item (or the default item if the upstream is empty) via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="313" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstStage.o.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <p>
+     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
+     * <pre><code>
+     * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).firstStage(Optional.empty());
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code firstStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param defaultItem the item to signal if the upstream is empty
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #firstOrErrorStage()
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> firstStage(@Nullable T defaultItem) {
+        return subscribeWith(new ObservableFirstStageObserver<>(true, defaultItem));
+    }
+
+    /**
+     * Signals the only expected upstream item (or the default item if the upstream is empty)
+     * or signals {@link IllegalArgumentException} if the upstream has more than one item
+     * via a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="227" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleStage.o.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <p>
+     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
+     * <pre><code>
+     * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).singleStage(Optional.empty());
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code singleStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param defaultItem the item to signal if the upstream is empty
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #singleOrErrorStage()
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> singleStage(@Nullable T defaultItem) {
+        return subscribeWith(new ObservableSingleStageObserver<>(true, defaultItem));
+    }
+
+    /**
+     * Signals the last upstream item (or the default item if the upstream is empty) via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="313" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastStage.o.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <p>
+     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
+     * <pre><code>
+     * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).lastStage(Optional.empty());
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code lastStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param defaultItem the item to signal if the upstream is empty
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #lastOrErrorStage()
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> lastStage(@Nullable T defaultItem) {
+        return subscribeWith(new ObservableLastStageObserver<>(true, defaultItem));
+    }
+
+    /**
+     * Signals the first upstream item or a {@link NoSuchElementException} if the upstream is empty via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="341" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrErrorStage.o.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code firstOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #firstStage(Object)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> firstOrErrorStage() {
+        return subscribeWith(new ObservableFirstStageObserver<>(false, null));
+    }
+
+    /**
+     * Signals the only expected upstream item, a {@link NoSuchElementException} if the upstream is empty
+     * or signals {@link IllegalArgumentException} if the upstream has more than one item
+     * via a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="227" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrErrorStage.o.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code singleOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #singleStage(Object)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> singleOrErrorStage() {
+        return subscribeWith(new ObservableSingleStageObserver<>(false, null));
+    }
+
+    /**
+     * Signals the last upstream item or a {@link NoSuchElementException} if the upstream is empty via
+     * a {@link CompletionStage}.
+     * <p>
+     * <img width="640" height="343" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrErrorStage.o.png" alt="">
+     * <p>
+     * The upstream can be canceled by converting the resulting {@code CompletionStage} into
+     * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
+     * calling {@link CompletableFuture#cancel(boolean)} on it.
+     * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
+     * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code lastOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new CompletionStage instance
+     * @since 3.0.0
+     * @see #lastStage(Object)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final CompletionStage<T> lastOrErrorStage() {
+        return subscribeWith(new ObservableLastStageObserver<>(false, null));
+    }
+
+    /**
+     * Creates a sequential {@link Stream} to consume or process this {@code Observable} in a blocking manner via
+     * the Java {@code Stream} API.
+     * <p>
+     * <img width="640" height="399" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingStream.o.png" alt="">
+     * <p>
+     * Cancellation of the upstream is done via {@link Stream#close()}, therefore, it is strongly recommended the
+     * consumption is performed within a try-with-resources construct:
+     * <pre><code>
+     * Observable&lt;Integer&gt; source = Observable.range(1, 10)
+     *        .subscribeOn(Schedulers.computation());
+     *
+     * try (Stream&lt;Integer&gt; stream = source.blockingStream()) {
+     *     stream.limit(3).forEach(System.out::println);
+     * }
+     * </code></pre>
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @return the new Stream instance
+     * @since 3.0.0
+     * @see #blockingStream(int)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Stream<T> blockingStream() {
+        return blockingStream(bufferSize());
+    }
+
+    /**
+     * Creates a sequential {@link Stream} to consume or process this {@code Observable} in a blocking manner via
+     * the Java {@code Stream} API.
+     * <p>
+     * <img width="640" height="399" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingStream.oi.png" alt="">
+     * <p>
+     * Cancellation of the upstream is done via {@link Stream#close()}, therefore, it is strongly recommended the
+     * consumption is performed within a try-with-resources construct:
+     * <pre><code>
+     * Observable&lt;Integer&gt; source = Observable.range(1, 10)
+     *        .subscribeOn(Schedulers.computation());
+     *
+     * try (Stream&lt;Integer&gt; stream = source.blockingStream(4)) {
+     *     stream.limit(3).forEach(System.out::println);
+     * }
+     * </code></pre>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param capacityHint the expected number of items to be buffered
+     * @return the new Stream instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Stream<T> blockingStream(int capacityHint) {
+        Iterator<T> iterator = blockingIterable(capacityHint).iterator();
+        return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, 0), false)
+                .onClose(() -> ((Disposable)iterator).dispose());
+    }
+
+    /**
+     * Maps each upstream item into a {@link Stream} and emits the {@code Stream}'s items to the downstream in a sequential fashion.
+     * <p>
+     * <img width="640" height="299" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapStream.o.png" alt="">
+     * <p>
+     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
+     * {@code concatMapStream} are identical operators and are provided as aliases.
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #concatMapIterable(Function)}:
+     * <pre><code>
+     * source.concatMapIterable(v -&gt; createStream(v)::iterator);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.concatMapStream(v -&gt; IntStream.rangeClosed(v + 1, v + 10).boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatMapStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the element type of the {@code Stream}s and the result
+     * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
+     * will be emitted to the downstream
+     * @return the new Observable instance
+     * @see #concatMap(Function)
+     * @see #concatMapIterable(Function)
+     * @see #flatMapStream(Function)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Observable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+        return flatMapStream(mapper);
+    }
+
+    /**
+     * Maps each upstream item into a {@link Stream} and emits the {@code Stream}'s items to the downstream in a sequential fashion.
+     * <p>
+     * <img width="640" height="299" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.o.png" alt="">
+     * <p>
+     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
+     * {@code concatMapStream} are identical operators and are provided as aliases.
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function)}:
+     * <pre><code>
+     * source.flatMapIterable(v -&gt; createStream(v)::iterator);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.flatMapStream(v -&gt; IntStream.rangeClosed(v + 1, v + 10).boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMapStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the element type of the {@code Stream}s and the result
+     * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
+     * will be emitted to the downstream
+     * @return the new Observable instance
+     * @see #flatMap(Function)
+     * @see #flatMapIterable(Function)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> Observable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new ObservableFlatMapStream<>(this, mapper));
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
index ecc18fb154..55ec854ddf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
@@ -69,7 +69,7 @@ public static <T> void subscribeStream(Subscriber<? super T> s, Stream<T> stream
         }
 
         if (s instanceof ConditionalSubscriber) {
-            s.onSubscribe(new StreamConditionalSubscription<T>((ConditionalSubscriber<? super T>)s, iterator, stream));
+            s.onSubscribe(new StreamConditionalSubscription<>((ConditionalSubscriber<? super T>)s, iterator, stream));
         } else {
             s.onSubscribe(new StreamSubscription<>(s, iterator, stream));
         }
@@ -147,15 +147,23 @@ public T poll() {
                 once = true;
             } else {
                 if (!iterator.hasNext()) {
+                    clear();
                     return null;
                 }
             }
-            return Objects.requireNonNull(iterator.next(), "Iterator.next() returned a null value");
+            return Objects.requireNonNull(iterator.next(), "The Stream's Iterator.next() returned a null value");
         }
 
         @Override
         public boolean isEmpty() {
-            return iterator == null || !iterator.hasNext();
+            Iterator<T> it = iterator;
+            if (it != null) {
+                if (!once || it.hasNext()) {
+                    return false;
+                }
+                clear();
+            }
+            return true;
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
new file mode 100644
index 0000000000..34132a01b3
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
@@ -0,0 +1,151 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Objects;
+import java.util.function.*;
+import java.util.stream.Collector;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Collect items into a container defined by a Stream {@link Collector} callback set.
+ *
+ * @param <T> the upstream value type
+ * @param <A> the intermediate accumulator type
+ * @param <R> the result type
+ * @since 3.0.0
+ */
+public final class ObservableCollectWithCollector<T, A, R> extends Observable<R> {
+
+    final Observable<T> source;
+
+    final Collector<T, A, R> collector;
+
+    public ObservableCollectWithCollector(Observable<T> source, Collector<T, A, R> collector) {
+        this.source = source;
+        this.collector = collector;
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull Observer<? super R> observer) {
+        A container;
+        BiConsumer<A, T> accumulator;
+        Function<A, R> finisher;
+
+        try {
+            container = collector.supplier().get();
+            accumulator = collector.accumulator();
+            finisher = collector.finisher();
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            EmptyDisposable.error(ex, observer);
+            return;
+        }
+
+        source.subscribe(new CollectorObserver<>(observer, container, accumulator, finisher));
+    }
+
+    static final class CollectorObserver<T, A, R>
+    extends DeferredScalarDisposable<R>
+    implements Observer<T> {
+
+        private static final long serialVersionUID = -229544830565448758L;
+
+        final BiConsumer<A, T> accumulator;
+
+        final Function<A, R> finisher;
+
+        Disposable upstream;
+
+        boolean done;
+
+        A container;
+
+        CollectorObserver(Observer<? super R> downstream, A container, BiConsumer<A, T> accumulator, Function<A, R> finisher) {
+            super(downstream);
+            this.container = container;
+            this.accumulator = accumulator;
+            this.finisher = finisher;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (done) {
+                return;
+            }
+            try {
+                accumulator.accept(container, t);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                upstream.dispose();
+                onError(ex);
+            }
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (done) {
+                RxJavaPlugins.onError(t);
+            } else {
+                done = true;
+                upstream = DisposableHelper.DISPOSED;
+                this.container = null;
+                downstream.onError(t);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            if (done) {
+                return;
+            }
+
+            done = true;
+            upstream = DisposableHelper.DISPOSED;
+            A container = this.container;
+            this.container = null;
+            R result;
+            try {
+                result = Objects.requireNonNull(finisher.apply(container), "The finisher returned a null value");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+
+            complete(result);
+        }
+
+        @Override
+        public void dispose() {
+            super.dispose();
+            upstream.dispose();
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
new file mode 100644
index 0000000000..a919b02ab9
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
@@ -0,0 +1,159 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Objects;
+import java.util.function.*;
+import java.util.stream.Collector;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.internal.fuseable.FuseToObservable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Collect items into a container defined by a Stream {@link Collector} callback set.
+ *
+ * @param <T> the upstream value type
+ * @param <A> the intermediate accumulator type
+ * @param <R> the result type
+ * @since 3.0.0
+ */
+public final class ObservableCollectWithCollectorSingle<T, A, R> extends Single<R> implements FuseToObservable<R> {
+
+    final Observable<T> source;
+
+    final Collector<T, A, R> collector;
+
+    public ObservableCollectWithCollectorSingle(Observable<T> source, Collector<T, A, R> collector) {
+        this.source = source;
+        this.collector = collector;
+    }
+
+    @Override
+    public Observable<R> fuseToObservable() {
+        return new ObservableCollectWithCollector<>(source, collector);
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull SingleObserver<? super R> observer) {
+        A container;
+        BiConsumer<A, T> accumulator;
+        Function<A, R> finisher;
+
+        try {
+            container = collector.supplier().get();
+            accumulator = collector.accumulator();
+            finisher = collector.finisher();
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            EmptyDisposable.error(ex, observer);
+            return;
+        }
+
+        source.subscribe(new CollectorSingleObserver<>(observer, container, accumulator, finisher));
+    }
+
+    static final class CollectorSingleObserver<T, A, R> implements Observer<T>, Disposable {
+
+        final SingleObserver<? super R> downstream;
+
+        final BiConsumer<A, T> accumulator;
+
+        final Function<A, R> finisher;
+
+        Disposable upstream;
+
+        boolean done;
+
+        A container;
+
+        CollectorSingleObserver(SingleObserver<? super R> downstream, A container, BiConsumer<A, T> accumulator, Function<A, R> finisher) {
+            this.downstream = downstream;
+            this.container = container;
+            this.accumulator = accumulator;
+            this.finisher = finisher;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (done) {
+                return;
+            }
+            try {
+                accumulator.accept(container, t);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                upstream.dispose();
+                onError(ex);
+            }
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (done) {
+                RxJavaPlugins.onError(t);
+            } else {
+                done = true;
+                upstream = DisposableHelper.DISPOSED;
+                this.container = null;
+                downstream.onError(t);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            if (done) {
+                return;
+            }
+
+            done = true;
+            upstream = DisposableHelper.DISPOSED;
+            A container = this.container;
+            this.container = null;
+            R result;
+            try {
+                result = Objects.requireNonNull(finisher.apply(container), "The finisher returned a null value");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+
+            downstream.onSuccess(result);
+        }
+
+        @Override
+        public void dispose() {
+            upstream.dispose();
+            upstream = DisposableHelper.DISPOSED;
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream == DisposableHelper.DISPOSED;
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFirstStageObserver.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFirstStageObserver.java
new file mode 100644
index 0000000000..cda0073067
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFirstStageObserver.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.NoSuchElementException;
+
+/**
+ * Signals the first element of the source via the underlying CompletableFuture,
+ * signals the a default item if the upstream is empty or signals {@link NoSuchElementException}.
+ *
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class ObservableFirstStageObserver<T> extends ObservableStageObserver<T> {
+
+    final boolean hasDefault;
+
+    final T defaultItem;
+
+    public ObservableFirstStageObserver(boolean hasDefault, T defaultItem) {
+        this.hasDefault = hasDefault;
+        this.defaultItem = defaultItem;
+    }
+
+    @Override
+    public void onNext(T t) {
+        complete(t);
+    }
+
+    @Override
+    public void onComplete() {
+        if (!isDone()) {
+            clear();
+            if (hasDefault) {
+                complete(defaultItem);
+            } else {
+                completeExceptionally(new NoSuchElementException());
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
new file mode 100644
index 0000000000..9b7b446e28
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
@@ -0,0 +1,162 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Maps the upstream values onto {@link Stream}s and emits their items in order to the downstream.
+ *
+ * @param <T> the upstream element type
+ * @param <R> the inner {@code Stream} and result element type
+ * @since 3.0.0
+ */
+public final class ObservableFlatMapStream<T, R> extends Observable<R> {
+
+    final Observable<T> source;
+
+    final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+    public ObservableFlatMapStream(Observable<T> source, Function<? super T, ? extends Stream<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super R> observer) {
+        if (source instanceof Supplier) {
+            Stream<? extends R> stream = null;
+            try {
+                @SuppressWarnings("unchecked")
+                T t = ((Supplier<T>)source).get();
+                if (t != null) {
+                    stream = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Stream");
+                }
+            } catch (Throwable ex) {
+                EmptyDisposable.error(ex, observer);
+                return;
+            }
+
+            if (stream != null) {
+                ObservableFromStream.subscribeStream(observer, stream);
+            } else {
+                EmptyDisposable.complete(observer);
+            }
+        } else {
+            source.subscribe(new FlatMapStreamObserver<>(observer, mapper));
+        }
+    }
+
+    static final class FlatMapStreamObserver<T, R> extends AtomicInteger
+    implements Observer<T>, Disposable {
+
+        private static final long serialVersionUID = -5127032662980523968L;
+
+        final Observer<? super R> downstream;
+
+        final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+        Disposable upstream;
+
+        volatile boolean disposed;
+
+        boolean done;
+
+        FlatMapStreamObserver(Observer<? super R> downstream, Function<? super T, ? extends Stream<? extends R>> mapper) {
+            this.downstream = downstream;
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onNext(@NonNull T t) {
+            if (done) {
+                return;
+            }
+            try {
+                try (Stream<? extends R> stream = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Stream")) {
+                    Iterator<? extends R> it = stream.iterator();
+                    while (it.hasNext()) {
+                        if (disposed) {
+                            done = true;
+                            break;
+                        }
+                        R value = Objects.requireNonNull(it.next(), "The Stream's Iterator.next retuned a null value");
+                        if (disposed) {
+                            done = true;
+                            break;
+                        }
+                        downstream.onNext(value);
+                        if (disposed) {
+                            done = true;
+                            break;
+                        }
+                    }
+                }
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                upstream.dispose();
+                onError(ex);
+            }
+        }
+
+        @Override
+        public void onError(@NonNull Throwable e) {
+            if (done) {
+                RxJavaPlugins.onError(e);
+            } else {
+                done = true;
+                downstream.onError(e);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            if (!done) {
+                done = true;
+                downstream.onComplete();
+            }
+        }
+
+        @Override
+        public void dispose() {
+            disposed = true;
+            upstream.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return disposed;
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStage.java
new file mode 100644
index 0000000000..262da56026
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStage.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.observers.DeferredScalarDisposable;
+
+/**
+ * Wrap a CompletionStage and signal its outcome.
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class ObservableFromCompletionStage<T> extends Observable<T> {
+
+    final CompletionStage<T> stage;
+
+    public ObservableFromCompletionStage(CompletionStage<T> stage) {
+        this.stage = stage;
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super T> observer) {
+        // We need an indirection because one can't detach from a whenComplete
+        // and cancellation should not hold onto the stage.
+        BiConsumerAtomicReference<T> whenReference = new BiConsumerAtomicReference<>();
+        CompletionStageHandler<T> handler = new CompletionStageHandler<>(observer, whenReference);
+        whenReference.lazySet(handler);
+
+        observer.onSubscribe(handler);
+        stage.whenComplete(whenReference);
+    }
+
+    static final class CompletionStageHandler<T>
+    extends DeferredScalarDisposable<T>
+    implements BiConsumer<T, Throwable> {
+
+        private static final long serialVersionUID = 4665335664328839859L;
+
+        final BiConsumerAtomicReference<T> whenReference;
+
+        CompletionStageHandler(Observer<? super T> downstream, BiConsumerAtomicReference<T> whenReference) {
+            super(downstream);
+            this.whenReference = whenReference;
+        }
+
+        @Override
+        public void accept(T item, Throwable error) {
+            if (error != null) {
+                downstream.onError(error);
+            }
+            else if (item != null) {
+                complete(item);
+            } else {
+                downstream.onError(new NullPointerException("The CompletionStage terminated with null."));
+            }
+        }
+
+        @Override
+        public void dispose() {
+            super.dispose();
+            whenReference.set(null);
+        }
+    }
+
+    static final class BiConsumerAtomicReference<T> extends AtomicReference<BiConsumer<T, Throwable>>
+    implements BiConsumer<T, Throwable> {
+
+        private static final long serialVersionUID = 45838553147237545L;
+
+        @Override
+        public void accept(T t, Throwable u) {
+            BiConsumer<T, Throwable> biConsumer = get();
+            if (biConsumer != null) {
+                biConsumer.accept(t, u);
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java
new file mode 100644
index 0000000000..90d7681303
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java
@@ -0,0 +1,219 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+import java.util.stream.Stream;
+
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Wraps a {@link Stream} and emits its values as an {@link Observable} sequence.
+ * @param <T> the element type of the Stream
+ * @since 3.0.0
+ */
+public final class ObservableFromStream<T> extends Observable<T> {
+
+    final Stream<T> stream;
+
+    public ObservableFromStream(Stream<T> stream) {
+        this.stream = stream;
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super T> observer) {
+        subscribeStream(observer, stream);
+    }
+
+    /**
+     * Subscribes to the Stream.
+     * @param <T> the element type of the flow
+     * @param observer the observer to drive
+     * @param stream the sequence to consume
+     */
+    public static <T> void subscribeStream(Observer<? super T> observer, Stream<T> stream) {
+        Iterator<T> iterator;
+        try {
+            iterator = stream.iterator();
+
+            if (!iterator.hasNext()) {
+                EmptyDisposable.complete(observer);
+                closeSafely(stream);
+                return;
+            }
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            EmptyDisposable.error(ex, observer);
+            closeSafely(stream);
+            return;
+        }
+
+        StreamDisposable<T> disposable = new StreamDisposable<>(observer, iterator, stream);
+        observer.onSubscribe(disposable);
+        disposable.run();
+    }
+
+    static void closeSafely(AutoCloseable c) {
+        try {
+            c.close();
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            RxJavaPlugins.onError(ex);
+        }
+    }
+
+    static final class StreamDisposable<T> implements QueueDisposable<T> {
+
+        final Observer<? super T> downstream;
+
+        Iterator<T> iterator;
+
+        AutoCloseable closeable;
+
+        volatile boolean disposed;
+
+        boolean once;
+
+        boolean outputFused;
+
+        StreamDisposable(Observer<? super T> downstream, Iterator<T> iterator, AutoCloseable closeable) {
+            this.downstream = downstream;
+            this.iterator = iterator;
+            this.closeable = closeable;
+        }
+
+        @Override
+        public void dispose() {
+            disposed = true;
+            run();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return disposed;
+        }
+
+        @Override
+        public int requestFusion(int mode) {
+            if ((mode & SYNC) != 0) {
+                outputFused = true;
+                return SYNC;
+            }
+            return NONE;
+        }
+
+        @Override
+        public boolean offer(@NonNull T value) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Override
+        public boolean offer(@NonNull T v1, @NonNull T v2) {
+            throw new UnsupportedOperationException();
+        }
+
+        @Nullable
+        @Override
+        public T poll() {
+            if (iterator == null) {
+                return null;
+            }
+            if (!once) {
+                once = true;
+            } else {
+                if (!iterator.hasNext()) {
+                    clear();
+                    return null;
+                }
+            }
+            return Objects.requireNonNull(iterator.next(), "The Stream's Iterator.next() returned a null value");
+        }
+
+        @Override
+        public boolean isEmpty() {
+            Iterator<T> it = iterator;
+            if (it != null) {
+                if (!once || it.hasNext()) {
+                    return false;
+                }
+                clear();
+            }
+            return true;
+        }
+
+        @Override
+        public void clear() {
+            iterator = null;
+            AutoCloseable c = closeable;
+            closeable = null;
+            if (c != null) {
+                closeSafely(c);
+            }
+        }
+
+        public void run() {
+            if (outputFused) {
+                return;
+            }
+            Iterator<T> iterator = this.iterator;
+            Observer<? super T> downstream = this.downstream;
+
+            for (;;) {
+                if (disposed) {
+                    clear();
+                    break;
+                }
+
+                T next;
+                try {
+                    next = Objects.requireNonNull(iterator.next(), "The Stream's Iterator.next returned a null value");
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    downstream.onError(ex);
+                    disposed = true;
+                    continue;
+                }
+
+                if (disposed) {
+                    continue;
+                }
+
+                downstream.onNext(next);
+
+                if (disposed) {
+                    continue;
+                }
+
+                try {
+                    if (iterator.hasNext()) {
+                        continue;
+                    }
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    downstream.onError(ex);
+                    disposed = true;
+                    continue;
+                }
+
+                downstream.onComplete();
+                disposed = true;
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableLastStageObserver.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableLastStageObserver.java
new file mode 100644
index 0000000000..e2f9dc2225
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableLastStageObserver.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.NoSuchElementException;
+
+/**
+ * Signals the last element of the source via the underlying CompletableFuture,
+ * signals the a default item if the upstream is empty or signals {@link NoSuchElementException}.
+ *
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class ObservableLastStageObserver<T> extends ObservableStageObserver<T> {
+
+    final boolean hasDefault;
+
+    final T defaultItem;
+
+    public ObservableLastStageObserver(boolean hasDefault, T defaultItem) {
+        this.hasDefault = hasDefault;
+        this.defaultItem = defaultItem;
+    }
+
+    @Override
+    public void onNext(T t) {
+        value = t;
+    }
+
+    @Override
+    public void onComplete() {
+        if (!isDone()) {
+            T v = value;
+            clear();
+            if (v != null) {
+                complete(v);
+            } else if (hasDefault) {
+                complete(defaultItem);
+            } else {
+                completeExceptionally(new NoSuchElementException());
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptional.java
new file mode 100644
index 0000000000..eb134482be
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptional.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.observers.BasicFuseableObserver;
+
+/**
+ * Map the upstream values into an Optional and emit its value if any.
+ * @param <T> the upstream element type
+ * @param <R> the output element type
+ * @since 3.0.0
+ */
+public final class ObservableMapOptional<T, R> extends Observable<R> {
+
+    final Observable<T> source;
+
+    final Function<? super T, Optional<? extends R>> mapper;
+
+    public ObservableMapOptional(Observable<T> source, Function<? super T, Optional<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super R> observer) {
+        source.subscribe(new MapOptionalObserver<>(observer, mapper));
+    }
+
+    static final class MapOptionalObserver<T, R> extends BasicFuseableObserver<T, R> {
+
+        final Function<? super T, Optional<? extends R>> mapper;
+
+        MapOptionalObserver(Observer<? super R> downstream, Function<? super T, Optional<? extends R>> mapper) {
+            super(downstream);
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (done) {
+                return;
+            }
+
+            if (sourceMode != NONE) {
+                downstream.onNext(null);
+                return;
+            }
+
+            Optional<? extends R> result;
+            try {
+                result = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Optional");
+            } catch (Throwable ex) {
+                fail(ex);
+                return;
+            }
+
+            if (result.isPresent()) {
+                downstream.onNext(result.get());
+            }
+        }
+
+        @Override
+        public int requestFusion(int mode) {
+            return transitiveBoundaryFusion(mode);
+        }
+
+        @Override
+        public R poll() throws Throwable {
+            for (;;) {
+                T item = qd.poll();
+                if (item == null) {
+                    return null;
+                }
+                Optional<? extends R> result = Objects.requireNonNull(mapper.apply(item), "The mapper returned a null Optional");
+                if (result.isPresent()) {
+                    return result.get();
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableSingleStageObserver.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableSingleStageObserver.java
new file mode 100644
index 0000000000..fa8714397a
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableSingleStageObserver.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.NoSuchElementException;
+
+/**
+ * Signals the only element of the source via the underlying CompletableFuture,
+ * signals the a default item if the upstream is empty or signals {@link IllegalArgumentException}
+ * if the upstream has more than one item.
+ *
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+public final class ObservableSingleStageObserver<T> extends ObservableStageObserver<T> {
+
+    final boolean hasDefault;
+
+    final T defaultItem;
+
+    public ObservableSingleStageObserver(boolean hasDefault, T defaultItem) {
+        this.hasDefault = hasDefault;
+        this.defaultItem = defaultItem;
+    }
+
+    @Override
+    public void onNext(T t) {
+        if (value != null) {
+            value = null;
+            completeExceptionally(new IllegalArgumentException("Sequence contains more than one element!"));
+        } else {
+            value = t;
+        }
+    }
+
+    @Override
+    public void onComplete() {
+        if (!isDone()) {
+            T v = value;
+            clear();
+            if (v != null) {
+                complete(v);
+            } else if (hasDefault) {
+                complete(defaultItem);
+            } else {
+                completeExceptionally(new NoSuchElementException());
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageObserver.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageObserver.java
new file mode 100644
index 0000000000..54acae086f
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageObserver.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Base class that extends CompletableFuture and provides basic infrastructure
+ * to notify watchers upon upstream signals.
+ * @param <T> the element type
+ * @since 3.0.0
+ */
+abstract class ObservableStageObserver<T> extends CompletableFuture<T> implements Observer<T> {
+
+    final AtomicReference<Disposable> upstream = new AtomicReference<>();
+
+    T value;
+
+    @Override
+    public final void onSubscribe(@NonNull Disposable d) {
+        DisposableHelper.setOnce(upstream, d);
+    }
+
+    @Override
+    public final void onError(Throwable t) {
+        clear();
+        if (!completeExceptionally(t)) {
+            RxJavaPlugins.onError(t);
+        }
+    }
+
+    protected final void disposeUpstream() {
+        DisposableHelper.dispose(upstream);
+    }
+
+    protected final void clear() {
+        value = null;
+        upstream.lazySet(DisposableHelper.DISPOSED);
+    }
+
+    @Override
+    public final boolean cancel(boolean mayInterruptIfRunning) {
+        disposeUpstream();
+        return super.cancel(mayInterruptIfRunning);
+    }
+
+    @Override
+    public final boolean complete(T value) {
+        disposeUpstream();
+        return super.complete(value);
+    }
+
+    @Override
+    public final boolean completeExceptionally(Throwable ex) {
+        disposeUpstream();
+        return super.completeExceptionally(ex);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
index 940ac95c4d..7d5f7a0a74 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
@@ -184,6 +184,43 @@ public void onComplete() {
         assertTrue(q.isEmpty());
     }
 
+    @Test
+    public void fusedPoll() throws Throwable {
+        AtomicReference<SimpleQueue<?>> queue = new AtomicReference<>();
+        AtomicInteger calls = new AtomicInteger();
+
+        Flowable.fromStream(Stream.of(1).onClose(() -> calls.getAndIncrement()))
+        .subscribe(new FlowableSubscriber<Integer>() {
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                queue.set((SimpleQueue<?>)s);
+                ((QueueSubscription<?>)s).requestFusion(QueueFuseable.ANY);
+            }
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        });
+
+        SimpleQueue<?> q = queue.get();
+
+        assertFalse(q.isEmpty());
+
+        assertEquals(1, q.poll());
+
+        assertTrue(q.isEmpty());
+
+        assertEquals(1, calls.get());
+    }
+
     @Test
     public void streamOfNull() {
         Flowable.fromStream(Stream.of((Integer)null))
@@ -512,4 +549,9 @@ public void closeCalledOnItemCrashConditional() {
 
         assertEquals(1, calls.get());
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.fromStream(Stream.of(1)));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableBlockingStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableBlockingStreamTest.java
new file mode 100644
index 0000000000..b62bedb6f8
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableBlockingStreamTest.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.List;
+import java.util.stream.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+
+public class ObservableBlockingStreamTest extends RxJavaTest {
+
+    @Test
+    public void empty() {
+        try (Stream<Integer> stream = Observable.<Integer>empty().blockingStream()) {
+            assertEquals(0, stream.toArray().length);
+        }
+    }
+
+    @Test
+    public void just() {
+        try (Stream<Integer> stream = Observable.just(1).blockingStream()) {
+            assertArrayEquals(new Integer[] { 1 }, stream.toArray(Integer[]::new));
+        }
+    }
+
+    @Test
+    public void range() {
+        try (Stream<Integer> stream = Observable.range(1, 5).blockingStream()) {
+            assertArrayEquals(new Integer[] { 1, 2, 3, 4, 5 }, stream.toArray(Integer[]::new));
+        }
+    }
+
+    @Test
+    public void rangeBackpressured() {
+        try (Stream<Integer> stream = Observable.range(1, 5).blockingStream(1)) {
+            assertArrayEquals(new Integer[] { 1, 2, 3, 4, 5 }, stream.toArray(Integer[]::new));
+        }
+    }
+
+    @Test
+    public void rangeAsyncBackpressured() {
+        try (Stream<Integer> stream = Observable.range(1, 1000).subscribeOn(Schedulers.computation()).blockingStream()) {
+            List<Integer> list = stream.collect(Collectors.toList());
+
+            assertEquals(1000, list.size());
+            for (int i = 1; i <= 1000; i++) {
+                assertEquals(i, list.get(i - 1).intValue());
+            }
+        }
+    }
+
+    @Test
+    public void rangeAsyncBackpressured1() {
+        try (Stream<Integer> stream = Observable.range(1, 1000).subscribeOn(Schedulers.computation()).blockingStream(1)) {
+            List<Integer> list = stream.collect(Collectors.toList());
+
+            assertEquals(1000, list.size());
+            for (int i = 1; i <= 1000; i++) {
+                assertEquals(i, list.get(i - 1).intValue());
+            }
+        }
+    }
+
+    @Test
+    public void error() {
+        try (Stream<Integer> stream = Observable.<Integer>error(new TestException()).blockingStream()) {
+            stream.toArray(Integer[]::new);
+            fail("Should have thrown!");
+        } catch (TestException expected) {
+            // expected
+        }
+    }
+
+    @Test
+    public void close() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        up.onNext(1);
+        up.onNext(2);
+        up.onNext(3);
+        up.onNext(4);
+        up.onNext(5);
+
+        try (Stream<Integer> stream = up.blockingStream()) {
+            assertArrayEquals(new Integer[] { 1, 2, 3 }, stream.limit(3).toArray(Integer[]::new));
+        }
+
+        assertFalse(up.hasSubscribers());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorTest.java
new file mode 100644
index 0000000000..923a7dbaa3
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorTest.java
@@ -0,0 +1,444 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.function.*;
+import java.util.stream.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class ObservableCollectWithCollectorTest extends RxJavaTest {
+
+    @Test
+    public void basic() {
+        Observable.range(1, 5)
+        .collect(Collectors.toList())
+        .test()
+        .assertResult(Arrays.asList(1, 2, 3, 4, 5));
+    }
+
+    @Test
+    public void empty() {
+        Observable.empty()
+        .collect(Collectors.toList())
+        .test()
+        .assertResult(Collections.emptyList());
+    }
+
+    @Test
+    public void error() {
+        Observable.error(new TestException())
+        .collect(Collectors.toList())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorSupplierCrash() {
+        Observable.range(1, 5)
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                throw new TestException();
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorAccumulatorCrash() {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        source
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { throw new TestException(); };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void collectorFinisherCrash() {
+        Observable.range(1, 5)
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> {  };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> { throw new TestException(); };
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorAccumulatorDropSignals() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Observable<Integer> source = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onNext(2);
+                    observer.onError(new IOException());
+                    observer.onComplete();
+                }
+            };
+
+            source
+            .collect(new Collector<Integer, Integer, Integer>() {
+
+                @Override
+                public Supplier<Integer> supplier() {
+                    return () -> 1;
+                }
+
+                @Override
+                public BiConsumer<Integer, Integer> accumulator() {
+                    return (a, b) -> { throw new TestException(); };
+                }
+
+                @Override
+                public BinaryOperator<Integer> combiner() {
+                    return (a, b) -> a + b;
+                }
+
+                @Override
+                public Function<Integer, Integer> finisher() {
+                    return a -> a;
+                }
+
+                @Override
+                public Set<Characteristics> characteristics() {
+                    return Collections.emptySet();
+                }
+            })
+            .test()
+            .assertFailure(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        });
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(PublishSubject.create()
+                .collect(Collectors.toList()));
+    }
+
+    @Test
+    public void onSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservableToSingle(f -> f.collect(Collectors.toList()));
+    }
+
+    @Test
+    public void basicToObservable() {
+        Observable.range(1, 5)
+        .collect(Collectors.toList())
+        .toObservable()
+        .test()
+        .assertResult(Arrays.asList(1, 2, 3, 4, 5));
+    }
+
+    @Test
+    public void emptyToObservable() {
+        Observable.empty()
+        .collect(Collectors.toList())
+        .toObservable()
+        .test()
+        .assertResult(Collections.emptyList());
+    }
+
+    @Test
+    public void errorToObservable() {
+        Observable.error(new TestException())
+        .collect(Collectors.toList())
+        .toObservable()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorSupplierCrashToObservable() {
+        Observable.range(1, 5)
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                throw new TestException();
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .toObservable()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorAccumulatorCrashToObservable() {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        source
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { throw new TestException(); };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .toObservable()
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void collectorFinisherCrashToObservable() {
+        Observable.range(1, 5)
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> {  };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> { throw new TestException(); };
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .toObservable()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorAccumulatorDropSignalsToObservable() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Observable<Integer> source = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onNext(2);
+                    observer.onError(new IOException());
+                    observer.onComplete();
+                }
+            };
+
+            source
+            .collect(new Collector<Integer, Integer, Integer>() {
+
+                @Override
+                public Supplier<Integer> supplier() {
+                    return () -> 1;
+                }
+
+                @Override
+                public BiConsumer<Integer, Integer> accumulator() {
+                    return (a, b) -> { throw new TestException(); };
+                }
+
+                @Override
+                public BinaryOperator<Integer> combiner() {
+                    return (a, b) -> a + b;
+                }
+
+                @Override
+                public Function<Integer, Integer> finisher() {
+                    return a -> a;
+                }
+
+                @Override
+                public Set<Characteristics> characteristics() {
+                    return Collections.emptySet();
+                }
+            })
+            .toObservable()
+            .test()
+            .assertFailure(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        });
+    }
+
+    @Test
+    public void disposeToObservable() {
+        TestHelper.checkDisposed(PublishProcessor.create()
+                .collect(Collectors.toList()).toObservable());
+    }
+
+    @Test
+    public void onSubscribeToObservable() {
+        TestHelper.checkDoubleOnSubscribeObservable(f -> f.collect(Collectors.toList()).toObservable());
+    }
+
+    @Test
+    public void toObservableTake() {
+        Observable.range(1, 5)
+        .collect(Collectors.toList())
+        .toObservable()
+        .take(1)
+        .test()
+        .assertResult(Arrays.asList(1, 2, 3, 4, 5));
+    }
+
+    @Test
+    public void disposeBeforeEnd() {
+        TestObserver<List<Integer>> to = Observable.range(1, 5).concatWith(Observable.never())
+        .collect(Collectors.toList())
+        .test();
+
+        to.dispose();
+
+        to.assertEmpty();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStreamTest.java
new file mode 100644
index 0000000000..8341aa03dd
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStreamTest.java
@@ -0,0 +1,466 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class ObservableFlatMapStreamTest extends RxJavaTest {
+
+    @Test
+    public void empty() {
+        Observable.empty()
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void emptyHidden() {
+        Observable.empty()
+        .hide()
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void just() {
+        Observable.just(1)
+        .flatMapStream(v -> Stream.of(v + 1, v + 2, v + 3, v + 4, v + 5))
+        .test()
+        .assertResult(2, 3, 4, 5, 6);
+    }
+
+    @Test
+    public void justHidden() {
+        Observable.just(1).hide()
+        .flatMapStream(v -> Stream.of(v + 1, v + 2, v + 3, v + 4, v + 5))
+        .test()
+        .assertResult(2, 3, 4, 5, 6);
+    }
+
+    @Test
+    public void error() {
+        Observable.error(new TestException())
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void supplierFusedError() {
+        Observable.fromCallable(() -> { throw new TestException(); })
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void errorHidden() {
+        Observable.error(new TestException())
+        .hide()
+        .flatMapStream(v -> Stream.of(1, 2, 3, 4, 5))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void range() {
+        Observable.range(1, 5)
+        .flatMapStream(v -> IntStream.range(v * 10, v * 10 + 5).boxed())
+        .test()
+        .assertResult(
+                10, 11, 12, 13, 14,
+                20, 21, 22, 23, 24,
+                30, 31, 32, 33, 34,
+                40, 41, 42, 43, 44,
+                50, 51, 52, 53, 54
+        );
+    }
+
+    @Test
+    public void rangeHidden() {
+        Observable.range(1, 5)
+        .hide()
+        .flatMapStream(v -> IntStream.range(v * 10, v * 10 + 5).boxed())
+        .test()
+        .assertResult(
+                10, 11, 12, 13, 14,
+                20, 21, 22, 23, 24,
+                30, 31, 32, 33, 34,
+                40, 41, 42, 43, 44,
+                50, 51, 52, 53, 54
+        );
+    }
+
+    @Test
+    public void rangeToEmpty() {
+        Observable.range(1, 5)
+        .flatMapStream(v -> Stream.of())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void rangeTake() {
+        Observable.range(1, 5)
+        .flatMapStream(v -> IntStream.range(v * 10, v * 10 + 5).boxed())
+        .take(12)
+        .test()
+        .assertResult(
+                10, 11, 12, 13, 14,
+                20, 21, 22, 23, 24,
+                30, 31
+        );
+    }
+
+    @Test
+    public void rangeTakeHidden() {
+        Observable.range(1, 5)
+        .hide()
+        .flatMapStream(v -> IntStream.range(v * 10, v * 10 + 5).boxed())
+        .take(12)
+        .test()
+        .assertResult(
+                10, 11, 12, 13, 14,
+                20, 21, 22, 23, 24,
+                30, 31
+        );
+    }
+
+    @Test
+    public void upstreamCancelled() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        AtomicInteger calls = new AtomicInteger();
+
+        TestObserver<Integer> to = ps
+                .flatMapStream(v -> Stream.of(v + 1, v + 2).onClose(() -> calls.getAndIncrement()))
+                .take(1)
+                .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to.assertResult(2);
+
+        assertFalse(ps.hasObservers());
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void upstreamCancelledCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            PublishSubject<Integer> ps = PublishSubject.create();
+
+            TestObserver<Integer> to = ps
+                    .flatMapStream(v -> Stream.of(v + 1, v + 2).onClose(() -> { throw new TestException(); }))
+                    .take(1)
+                    .test();
+
+            assertTrue(ps.hasObservers());
+
+            ps.onNext(1);
+
+            to.assertResult(2);
+
+            assertFalse(ps.hasObservers());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void crossMap() {
+        Observable.range(1, 1000)
+        .flatMapStream(v -> IntStream.range(v * 1000, v * 1000 + 1000).boxed())
+        .test()
+        .assertValueCount(1_000_000)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void crossMapHidden() {
+        Observable.range(1, 1000)
+        .hide()
+        .flatMapStream(v -> IntStream.range(v * 1000, v * 1000 + 1000).boxed())
+        .test()
+        .assertValueCount(1_000_000)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void onSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(f -> f.flatMapStream(v -> Stream.of(1, 2)));
+    }
+
+    @Test
+    public void mapperThrows() {
+        Observable.just(1).hide()
+        .concatMapStream(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mapperNull() {
+        Observable.just(1).hide()
+        .concatMapStream(v -> null)
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void streamNull() {
+        Observable.just(1).hide()
+        .concatMapStream(v -> Stream.of(1, null))
+        .test()
+        .assertFailure(NullPointerException.class, 1);
+    }
+
+    @Test
+    public void hasNextThrows() {
+        Observable.just(1).hide()
+        .concatMapStream(v -> Stream.generate(() -> { throw new TestException(); }))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void hasNextThrowsLater() {
+        AtomicInteger counter = new AtomicInteger();
+        Observable.just(1).hide()
+        .concatMapStream(v -> Stream.generate(() -> {
+            if (counter.getAndIncrement() == 0) {
+                return 1;
+            }
+            throw new TestException();
+        }))
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void mapperThrowsWhenUpstreamErrors() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            PublishSubject<Integer> ps = PublishSubject.create();
+
+            AtomicInteger counter = new AtomicInteger();
+
+            TestObserver<Integer> to = ps.hide()
+            .concatMapStream(v -> {
+                if (counter.getAndIncrement() == 0) {
+                    return Stream.of(1, 2);
+                }
+                ps.onError(new IOException());
+                throw new TestException();
+            })
+            .test();
+
+            ps.onNext(1);
+            ps.onNext(2);
+
+            to
+            .assertFailure(IOException.class, 1, 2);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void cancelAfterIteratorNext() throws Exception {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                to.dispose();
+                return 1;
+            }
+        });
+
+        Observable.just(1)
+        .hide()
+        .concatMapStream(v -> stream)
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
+
+    @Test
+    public void cancelAfterIteratorHasNext() throws Exception {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                to.dispose();
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Observable.just(1)
+        .hide()
+        .concatMapStream(v -> stream)
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
+
+    @Test
+    public void asyncUpstreamFused() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+
+        TestObserver<Integer> to = us.flatMapStream(v -> Stream.of(1, 2))
+        .test();
+
+        assertTrue(us.hasObservers());
+
+        us.onNext(1);
+
+        to.assertValuesOnly(1, 2);
+
+        us.onComplete();
+
+        to.assertResult(1, 2);
+    }
+
+    @Test
+    public void asyncUpstreamFusionBoundary() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+
+        TestObserver<Integer> to = us
+                .map(v -> v + 1)
+                .flatMapStream(v -> Stream.of(1, 2))
+        .test();
+
+        assertTrue(us.hasObservers());
+
+        us.onNext(1);
+
+        to.assertValuesOnly(1, 2);
+
+        us.onComplete();
+
+        to.assertResult(1, 2);
+    }
+
+    @Test
+    public void fusedPollCrash() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+
+        TestObserver<Integer> to = us
+                .map(v -> { throw new TestException(); })
+                .compose(TestHelper.observableStripBoundary())
+                .flatMapStream(v -> Stream.of(1, 2))
+        .test();
+
+        assertTrue(us.hasObservers());
+
+        us.onNext(1);
+
+        assertFalse(us.hasObservers());
+
+        to.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(PublishSubject.create().flatMapStream(v -> Stream.of(1)));
+    }
+
+    @Test
+    public void eventsIgnoredAfterCrash() {
+        AtomicInteger calls = new AtomicInteger();
+
+        new Observable<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull Observer<? super Integer> observer) {
+                observer.onSubscribe(Disposable.empty());
+                observer.onNext(1);
+                observer.onNext(2);
+                observer.onComplete();
+            }
+        }
+        .flatMapStream(v -> {
+            calls.getAndIncrement();
+            throw new TestException();
+        })
+        .take(1)
+        .test()
+        .assertFailure(TestException.class);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void eventsIgnoredAfterDispose() {
+        AtomicInteger calls = new AtomicInteger();
+
+        new Observable<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull Observer<? super Integer> observer) {
+                observer.onSubscribe(Disposable.empty());
+                observer.onNext(1);
+                observer.onNext(2);
+                observer.onComplete();
+            }
+        }
+        .flatMapStream(v -> {
+            calls.getAndIncrement();
+            return Stream.of(1);
+        })
+        .take(1)
+        .test()
+        .assertResult(1);
+
+        assertEquals(1, calls.get());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStageTest.java
new file mode 100644
index 0000000000..612ab0724b
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStageTest.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+
+public class ObservableFromCompletionStageTest extends RxJavaTest {
+
+    @Test
+    public void syncSuccess() {
+        Observable.fromCompletionStage(CompletableFuture.completedFuture(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void syncFailure() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+        cf.completeExceptionally(new TestException());
+
+        Observable.fromCompletionStage(cf)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void syncNull() {
+        Observable.fromCompletionStage(CompletableFuture.<Integer>completedFuture(null))
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void cancel() {
+        CompletableFuture<Integer> cf = new CompletableFuture<>();
+
+        TestObserver<Integer> to = Observable.fromCompletionStage(cf)
+        .test();
+
+        to.assertEmpty();
+
+        to.dispose();
+
+        cf.complete(1);
+
+        to.assertEmpty();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromOptionalTest.java
new file mode 100644
index 0000000000..e2e4059e70
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromOptionalTest.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+
+public class ObservableFromOptionalTest extends RxJavaTest {
+
+    @Test
+    public void hasValue() {
+        Observable.fromOptional(Optional.of(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void empty() {
+        Observable.fromOptional(Optional.empty())
+        .test()
+        .assertResult();
+    }
+
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java
new file mode 100644
index 0000000000..6074e54689
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java
@@ -0,0 +1,488 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.Iterator;
+import java.util.concurrent.atomic.*;
+import java.util.stream.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class ObservableFromStreamTest extends RxJavaTest {
+
+    @Test
+    public void empty() {
+        Observable.fromStream(Stream.<Integer>of())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void just() {
+        Observable.fromStream(Stream.<Integer>of(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void many() {
+        Observable.fromStream(Stream.<Integer>of(1, 2, 3, 4, 5))
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void noReuse() {
+        Observable<Integer> source = Observable.fromStream(Stream.<Integer>of(1, 2, 3, 4, 5));
+
+        source
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+
+        source
+        .test()
+        .assertFailure(IllegalStateException.class);
+    }
+
+    @Test
+    public void take() {
+        Observable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .take(5)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void emptyConditional() {
+        Observable.fromStream(Stream.<Integer>of())
+        .filter(v -> true)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void justConditional() {
+        Observable.fromStream(Stream.<Integer>of(1))
+        .filter(v -> true)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void manyConditional() {
+        Observable.fromStream(Stream.<Integer>of(1, 2, 3, 4, 5))
+        .filter(v -> true)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void manyConditionalSkip() {
+        Observable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .filter(v -> v % 2 == 0)
+        .test()
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void takeConditional() {
+        Observable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .filter(v -> true)
+        .take(5)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void noOfferNoCrashAfterClear() throws Throwable {
+        AtomicReference<SimpleQueue<?>> queue = new AtomicReference<>();
+
+        Observable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .subscribe(new Observer<Integer>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
+                queue.set((SimpleQueue<?>)d);
+                ((QueueDisposable<?>)d).requestFusion(QueueFuseable.ANY);
+            }
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        });
+
+        SimpleQueue<?> q = queue.get();
+        TestHelper.assertNoOffer(q);
+
+        assertFalse(q.isEmpty());
+
+        q.clear();
+
+        assertNull(q.poll());
+
+        assertTrue(q.isEmpty());
+
+        q.clear();
+
+        assertNull(q.poll());
+
+        assertTrue(q.isEmpty());
+    }
+
+    @Test
+    public void fusedPoll() throws Throwable {
+        AtomicReference<SimpleQueue<?>> queue = new AtomicReference<>();
+        AtomicInteger calls = new AtomicInteger();
+
+        Observable.fromStream(Stream.of(1).onClose(() -> calls.getAndIncrement()))
+        .subscribe(new Observer<Integer>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
+                queue.set((SimpleQueue<?>)d);
+                ((QueueDisposable<?>)d).requestFusion(QueueFuseable.ANY);
+            }
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        });
+
+        SimpleQueue<?> q = queue.get();
+
+        assertFalse(q.isEmpty());
+
+        assertEquals(1, q.poll());
+
+        assertTrue(q.isEmpty());
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void fusedPoll2() throws Throwable {
+        AtomicReference<SimpleQueue<?>> queue = new AtomicReference<>();
+        AtomicInteger calls = new AtomicInteger();
+
+        Observable.fromStream(Stream.of(1, 2).onClose(() -> calls.getAndIncrement()))
+        .subscribe(new Observer<Integer>() {
+            @Override
+            public void onSubscribe(@NonNull Disposable d) {
+                queue.set((SimpleQueue<?>)d);
+                ((QueueDisposable<?>)d).requestFusion(QueueFuseable.ANY);
+            }
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        });
+
+        SimpleQueue<?> q = queue.get();
+
+        assertFalse(q.isEmpty());
+
+        assertEquals(1, q.poll());
+
+        assertFalse(q.isEmpty());
+
+        assertEquals(2, q.poll());
+
+        assertTrue(q.isEmpty());
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void streamOfNull() {
+        Observable.fromStream(Stream.of((Integer)null))
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void streamOfNullConditional() {
+        Observable.fromStream(Stream.of((Integer)null))
+        .filter(v -> true)
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void syncFusionSupport() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        Observable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .subscribeWith(to)
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void asyncFusionNotSupported() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Observable.fromStream(IntStream.rangeClosed(1, 10).boxed())
+        .subscribeWith(to)
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void runToEndCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Stream<Integer> stream = Stream.of(1, 2, 3, 4, 5).onClose(() -> { throw new TestException(); });
+
+            Observable.fromStream(stream)
+            .test()
+            .assertResult(1, 2, 3, 4, 5);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void takeCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Stream<Integer> stream = Stream.of(1, 2, 3, 4, 5).onClose(() -> { throw new TestException(); });
+
+            Observable.fromStream(stream)
+            .take(3)
+            .test()
+            .assertResult(1, 2, 3);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void hasNextCrash() {
+        AtomicInteger v = new AtomicInteger();
+        Observable.fromStream(Stream.<Integer>generate(() -> {
+            int value = v.getAndIncrement();
+            if (value == 1) {
+                throw new TestException();
+            }
+            return value;
+        }))
+        .test()
+        .assertFailure(TestException.class, 0);
+    }
+
+    @Test
+    public void hasNextCrashConditional() {
+        AtomicInteger counter = new AtomicInteger();
+        Observable.fromStream(Stream.<Integer>generate(() -> {
+            int value = counter.getAndIncrement();
+            if (value == 1) {
+                throw new TestException();
+            }
+            return value;
+        }))
+        .filter(v -> true)
+        .test()
+        .assertFailure(TestException.class, 0);
+    }
+
+    @Test
+    public void closeCalledOnEmpty() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Observable.fromStream(Stream.of().onClose(() -> calls.getAndIncrement()))
+        .test()
+        .assertResult();
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledAfterItems() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Observable.fromStream(Stream.of(1, 2, 3, 4, 5).onClose(() -> calls.getAndIncrement()))
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledOnCancel() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Observable.fromStream(Stream.of(1, 2, 3, 4, 5).onClose(() -> calls.getAndIncrement()))
+        .take(3)
+        .test()
+        .assertResult(1, 2, 3);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledOnItemCrash() {
+        AtomicInteger calls = new AtomicInteger();
+        AtomicInteger counter = new AtomicInteger();
+        Observable.fromStream(Stream.<Integer>generate(() -> {
+            int value = counter.getAndIncrement();
+            if (value == 1) {
+                throw new TestException();
+            }
+            return value;
+        }).onClose(() -> calls.getAndIncrement()))
+        .test()
+        .assertFailure(TestException.class, 0);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledAfterItemsConditional() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Observable.fromStream(Stream.of(1, 2, 3, 4, 5).onClose(() -> calls.getAndIncrement()))
+        .filter(v -> true)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledOnCancelConditional() {
+        AtomicInteger calls = new AtomicInteger();
+
+        Observable.fromStream(Stream.of(1, 2, 3, 4, 5).onClose(() -> calls.getAndIncrement()))
+        .filter(v -> true)
+        .take(3)
+        .test()
+        .assertResult(1, 2, 3);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void closeCalledOnItemCrashConditional() {
+        AtomicInteger calls = new AtomicInteger();
+        AtomicInteger counter = new AtomicInteger();
+        Observable.fromStream(Stream.<Integer>generate(() -> {
+            int value = counter.getAndIncrement();
+            if (value == 1) {
+                throw new TestException();
+            }
+            return value;
+        }).onClose(() -> calls.getAndIncrement()))
+        .filter(v -> true)
+        .test()
+        .assertFailure(TestException.class, 0);
+
+        assertEquals(1, calls.get());
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Observable.fromStream(Stream.of(1)));
+    }
+
+    @Test
+    public void cancelAfterIteratorNext() throws Exception {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                to.dispose();
+                return 1;
+            }
+        });
+
+        Observable.fromStream(stream)
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
+
+    @Test
+    public void cancelAfterIteratorHasNext() throws Exception {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            int calls;
+
+            @Override
+            public boolean hasNext() {
+                if (++calls == 1) {
+                    to.dispose();
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Observable.fromStream(stream)
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java
new file mode 100644
index 0000000000..ba38417b12
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java
@@ -0,0 +1,394 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.assertFalse;
+
+import java.util.Optional;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class ObservableMapOptionalTest extends RxJavaTest {
+
+    static final Function<? super Integer, Optional<? extends Integer>> MODULO = v -> v % 2 == 0 ? Optional.of(v) : Optional.<Integer>empty();
+
+    @Test
+    public void allPresent() {
+        Observable.range(1, 5)
+        .mapOptional(Optional::of)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void allEmpty() {
+        Observable.range(1, 5)
+        .mapOptional(v -> Optional.<Integer>empty())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void mixed() {
+        Observable.range(1, 10)
+        .mapOptional(MODULO)
+        .test()
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void mapperChash() {
+        BehaviorSubject<Integer> source = BehaviorSubject.createDefault(1);
+
+        source
+        .mapOptional(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void mapperNull() {
+        BehaviorSubject<Integer> source = BehaviorSubject.createDefault(1);
+
+        source
+        .mapOptional(v -> null)
+        .test()
+        .assertFailure(NullPointerException.class);
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void crashDropsOnNexts() {
+        Observable<Integer> source = new Observable<Integer>() {
+            @Override
+            protected void subscribeActual(Observer<? super Integer> observer) {
+                observer.onSubscribe(Disposable.empty());
+                observer.onNext(1);
+                observer.onNext(2);
+            }
+        };
+
+        source
+        .mapOptional(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void syncFusedAll() {
+        Observable.range(1, 5)
+        .mapOptional(Optional::of)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void asyncFusedAll() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .mapOptional(Optional::of)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void boundaryFusedAll() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .mapOptional(Optional::of)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void syncFusedNone() {
+        Observable.range(1, 5)
+        .mapOptional(v -> Optional.empty())
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void asyncFusedNone() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .mapOptional(v -> Optional.empty())
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void boundaryFusedNone() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .mapOptional(v -> Optional.empty())
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+    }
+
+    @Test
+    public void syncFusedMixed() {
+        Observable.range(1, 10)
+        .mapOptional(MODULO)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void asyncFusedMixed() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        us
+        .mapOptional(MODULO)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void boundaryFusedMixed() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        us
+        .mapOptional(MODULO)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void allPresentConditional() {
+        Observable.range(1, 5)
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void allEmptyConditional() {
+        Observable.range(1, 5)
+        .mapOptional(v -> Optional.<Integer>empty())
+        .filter(v -> true)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void mixedConditional() {
+        Observable.range(1, 10)
+        .mapOptional(MODULO)
+        .filter(v -> true)
+        .test()
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void mapperChashConditional() {
+        BehaviorSubject<Integer> source = BehaviorSubject.createDefault(1);
+
+        source
+        .mapOptional(v -> { throw new TestException(); })
+        .filter(v -> true)
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void mapperNullConditional() {
+        BehaviorSubject<Integer> source = BehaviorSubject.createDefault(1);
+
+        source
+        .mapOptional(v -> null)
+        .filter(v -> true)
+        .test()
+        .assertFailure(NullPointerException.class);
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void crashDropsOnNextsConditional() {
+        Observable<Integer> source = new Observable<Integer>() {
+            @Override
+            protected void subscribeActual(Observer<? super Integer> observer) {
+                observer.onSubscribe(Disposable.empty());
+                observer.onNext(1);
+                observer.onNext(2);
+            }
+        };
+
+        source
+        .mapOptional(v -> { throw new TestException(); })
+        .filter(v -> true)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void syncFusedAllConditional() {
+        Observable.range(1, 5)
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void asyncFusedAllConditional() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void boundaryFusedAllConditiona() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void syncFusedNoneConditional() {
+        Observable.range(1, 5)
+        .mapOptional(v -> Optional.empty())
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void asyncFusedNoneConditional() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .mapOptional(v -> Optional.empty())
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void boundaryFusedNoneConditional() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .mapOptional(v -> Optional.empty())
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+    }
+
+    @Test
+    public void syncFusedMixedConditional() {
+        Observable.range(1, 10)
+        .mapOptional(MODULO)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.SYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.SYNC)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void asyncFusedMixedConditional() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        us
+        .mapOptional(MODULO)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void boundaryFusedMixedConditional() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+
+        us
+        .mapOptional(MODULO)
+        .filter(v -> true)
+        .to(TestHelper.testConsumer(false, QueueFuseable.ASYNC | QueueFuseable.BOUNDARY))
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(2, 4, 6, 8, 10);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java
new file mode 100644
index 0000000000..9b02622c9b
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java
@@ -0,0 +1,475 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class ObservableStageSubscriberOrDefaultTest extends RxJavaTest {
+
+    @Test
+    public void firstJust() throws Exception {
+        Integer v = Observable.just(1)
+                .firstStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void firstEmpty() throws Exception {
+        Integer v = Observable.<Integer>empty()
+                .firstStage(2)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)2, v);
+    }
+
+    @Test
+    public void firstCancels() throws Exception {
+        BehaviorSubject<Integer> source = BehaviorSubject.createDefault(1);
+
+        Integer v = source
+                .firstStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void firstCompletableFutureCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void firstCompletableManualCompleteCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void firstCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void firstError() throws Exception {
+        CompletableFuture<Integer> cf = Observable.<Integer>error(new TestException())
+                .firstStage(null)
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void firstSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onError(new TestException());
+                    observer.onComplete();
+                }
+            }
+            .firstStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void firstDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                }
+            }
+            .firstStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+
+    @Test
+    public void singleJust() throws Exception {
+        Integer v = Observable.just(1)
+                .singleStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void singleEmpty() throws Exception {
+        Integer v = Observable.<Integer>empty()
+                .singleStage(2)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)2, v);
+    }
+
+    @Test
+    public void singleTooManyCancels() throws Exception {
+        ReplaySubject<Integer> source = ReplaySubject.create();
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(source
+                .singleStage(null)
+                .toCompletableFuture(), IllegalArgumentException.class);
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void singleCompletableFutureCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void singleCompletableManualCompleteCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void singleCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void singleError() throws Exception {
+        CompletableFuture<Integer> cf = Observable.<Integer>error(new TestException())
+                .singleStage(null)
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void singleSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onComplete();
+                    observer.onError(new TestException());
+                    observer.onComplete();
+                }
+            }
+            .singleStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void singleDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onComplete();
+                }
+            }
+            .singleStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+
+    @Test
+    public void lastJust() throws Exception {
+        Integer v = Observable.just(1)
+                .lastStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void lastRange() throws Exception {
+        Integer v = Observable.range(1, 5)
+                .lastStage(null)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)5, v);
+    }
+
+    @Test
+    public void lastEmpty() throws Exception {
+        Integer v = Observable.<Integer>empty()
+                .lastStage(2)
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)2, v);
+    }
+
+    @Test
+    public void lastCompletableFutureCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void lastCompletableManualCompleteCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void lastCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastStage(null)
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void lastError() throws Exception {
+        CompletableFuture<Integer> cf = Observable.<Integer>error(new TestException())
+                .lastStage(null)
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void lastSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onComplete();
+                    observer.onError(new TestException());
+                    observer.onComplete();
+                }
+            }
+            .lastStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void lastDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onComplete();
+                }
+            }
+            .lastStage(null)
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrErrorTest.java
new file mode 100644
index 0000000000..d8e6fbe918
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrErrorTest.java
@@ -0,0 +1,469 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.NoSuchElementException;
+import java.util.concurrent.CompletableFuture;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class ObservableStageSubscriberOrErrorTest extends RxJavaTest {
+
+    @Test
+    public void firstJust() throws Exception {
+        Integer v = Observable.just(1)
+                .firstOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void firstEmpty() throws Exception {
+        TestHelper.assertError(
+                Observable.<Integer>empty()
+                .firstOrErrorStage()
+                .toCompletableFuture(), NoSuchElementException.class);
+    }
+
+    @Test
+    public void firstCancels() throws Exception {
+        BehaviorSubject<Integer> source = BehaviorSubject.createDefault(1);
+
+        Integer v = source
+                .firstOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void firstCompletableFutureCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void firstCompletableManualCompleteCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void firstCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .firstOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void firstError() throws Exception {
+        CompletableFuture<Integer> cf = Observable.<Integer>error(new TestException())
+                .firstOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void firstSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onError(new TestException());
+                    observer.onComplete();
+                }
+            }
+            .firstOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void firstDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                }
+            }
+            .firstOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+
+    @Test
+    public void singleJust() throws Exception {
+        Integer v = Observable.just(1)
+                .singleOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void singleEmpty() throws Exception {
+        TestHelper.assertError(
+                Observable.<Integer>empty()
+                .singleOrErrorStage()
+                .toCompletableFuture(), NoSuchElementException.class);
+    }
+
+    @Test
+    public void singleTooManyCancels() throws Exception {
+        ReplaySubject<Integer> source = ReplaySubject.create();
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(source
+            .singleOrErrorStage()
+            .toCompletableFuture(), IllegalArgumentException.class);
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void singleCompletableFutureCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void singleCompletableManualCompleteCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void singleCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .singleOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void singleError() throws Exception {
+        CompletableFuture<Integer> cf = Observable.<Integer>error(new TestException())
+                .singleOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void singleSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onComplete();
+                    observer.onError(new TestException());
+                    observer.onComplete();
+                }
+            }
+            .singleOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void singleDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onComplete();
+                }
+            }
+            .singleOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+
+    @Test
+    public void lastJust() throws Exception {
+        Integer v = Observable.just(1)
+                .lastOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)1, v);
+    }
+
+    @Test
+    public void lastRange() throws Exception {
+        Integer v = Observable.range(1, 5)
+                .lastOrErrorStage()
+                .toCompletableFuture()
+                .get();
+
+        assertEquals((Integer)5, v);
+    }
+
+    @Test
+    public void lastEmpty() throws Exception {
+        TestHelper.assertError(Observable.<Integer>empty()
+                .lastOrErrorStage()
+                .toCompletableFuture(), NoSuchElementException.class);
+    }
+
+    @Test
+    public void lastCompletableFutureCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.cancel(true);
+
+        assertTrue(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+    }
+
+    @Test
+    public void lastCompletableManualCompleteCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.complete(1);
+
+        assertTrue(cf.isDone());
+        assertFalse(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        assertEquals((Integer)1, cf.get());
+    }
+
+    @Test
+    public void lastCompletableManualCompleteExceptionallyCancels() throws Exception {
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        CompletableFuture<Integer> cf = source
+                .lastOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(source.hasObservers());
+
+        cf.completeExceptionally(new TestException());
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        assertFalse(source.hasObservers());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void lastError() throws Exception {
+        CompletableFuture<Integer> cf = Observable.<Integer>error(new TestException())
+                .lastOrErrorStage()
+                .toCompletableFuture();
+
+        assertTrue(cf.isDone());
+        assertTrue(cf.isCompletedExceptionally());
+        assertFalse(cf.isCancelled());
+
+        TestHelper.assertError(cf, TestException.class);
+    }
+
+    @Test
+    public void lastSourceIgnoresCancel() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onComplete();
+                    observer.onError(new TestException());
+                    observer.onComplete();
+                }
+            }
+            .lastOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void lastDoubleOnSubscribe() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Integer v = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(Observer<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onComplete();
+                }
+            }
+            .lastOrErrorStage()
+            .toCompletableFuture()
+            .get();
+
+            assertEquals((Integer)1, v);
+
+            TestHelper.assertError(errors, 0, ProtocolViolationException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
index e7625da6f9..0adfd655b0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
@@ -882,14 +882,14 @@ public Integer call() throws Exception {
 
     @Test
     public void innerErrorAfterPoll() {
-        final UnicastProcessor<Integer> us = UnicastProcessor.create();
-        us.onNext(1);
+        final UnicastProcessor<Integer> up = UnicastProcessor.create();
+        up.onNext(1);
 
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
             @Override
             public void onNext(Integer t) {
                 super.onNext(t);
-                us.onError(new TestException());
+                up.onError(new TestException());
             }
         };
 
@@ -897,7 +897,7 @@ public void onNext(Integer t) {
         .concatMapEager(new Function<Integer, Flowable<Integer>>() {
             @Override
             public Flowable<Integer> apply(Integer v) throws Exception {
-                return us;
+                return up;
             }
         }, 1, 128)
         .subscribe(ts);
@@ -973,12 +973,12 @@ public Integer apply(Integer v) throws Exception {
 
     @Test
     public void fuseAndTake() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        us.onNext(1);
-        us.onComplete();
+        up.onNext(1);
+        up.onComplete();
 
-        us.concatMapEager(new Function<Integer, Flowable<Integer>>() {
+        up.concatMapEager(new Function<Integer, Flowable<Integer>>() {
             @Override
             public Flowable<Integer> apply(Integer v) throws Exception {
                 return Flowable.just(1);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
index 70682d9e03..87d5cda476 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
@@ -128,13 +128,13 @@ public void fusedSync() {
     public void fusedAsync() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
 
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        us
+        up
         .distinct()
         .subscribe(ts);
 
-        TestHelper.emit(us, 1, 1, 2, 1, 3, 2, 4, 5, 4);
+        TestHelper.emit(up, 1, 1, 2, 1, 3, 2, 4, 5, 4);
 
         ts.assertFusionMode(QueueFuseable.ASYNC)
         .assertResult(1, 2, 3, 4, 5);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
index 86ad5aa874..586a7b56c2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
@@ -557,9 +557,9 @@ public boolean test(Integer v) throws Exception {
     public void fusedAsync() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
 
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        us
+        up
         .filter(new Predicate<Integer>() {
             @Override
             public boolean test(Integer v) throws Exception {
@@ -568,7 +568,7 @@ public boolean test(Integer v) throws Exception {
         })
         .subscribe(ts);
 
-        TestHelper.emit(us, 1, 2, 3, 4, 5);
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
 
         ts.assertFusionMode(QueueFuseable.ASYNC)
         .assertResult(2, 4);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
index c12aafa21d..1c0e6c58a3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
@@ -583,13 +583,13 @@ public void fusedSync() {
     public void fusedAsync() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
 
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        us
+        up
         .map(Functions.<Integer>identity())
         .subscribe(ts);
 
-        TestHelper.emit(us, 1, 2, 3, 4, 5);
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
 
         ts.assertFusionMode(QueueFuseable.ASYNC)
         .assertResult(1, 2, 3, 4, 5);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
index 73efdfc426..7fbf19fa60 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
@@ -1193,11 +1193,11 @@ public void inputSyncFused() {
 
     @Test
     public void inputAsyncFused() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        TestSubscriber<Integer> ts = us.observeOn(Schedulers.single()).test();
+        TestSubscriber<Integer> ts = up.observeOn(Schedulers.single()).test();
 
-        TestHelper.emit(us, 1, 2, 3, 4, 5);
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
 
         ts
         .awaitDone(5, TimeUnit.SECONDS)
@@ -1206,11 +1206,11 @@ public void inputAsyncFused() {
 
     @Test
     public void inputAsyncFusedError() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        TestSubscriber<Integer> ts = us.observeOn(Schedulers.single()).test();
+        TestSubscriber<Integer> ts = up.observeOn(Schedulers.single()).test();
 
-        us.onError(new TestException());
+        up.onError(new TestException());
 
         ts
         .awaitDone(5, TimeUnit.SECONDS)
@@ -1219,11 +1219,11 @@ public void inputAsyncFusedError() {
 
     @Test
     public void inputAsyncFusedErrorDelayed() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        TestSubscriber<Integer> ts = us.observeOn(Schedulers.single(), true).test();
+        TestSubscriber<Integer> ts = up.observeOn(Schedulers.single(), true).test();
 
-        us.onError(new TestException());
+        up.onError(new TestException());
 
         ts
         .awaitDone(5, TimeUnit.SECONDS)
@@ -1260,12 +1260,12 @@ public void outputFusedReject() {
     public void inputOutputAsyncFusedError() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
 
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        us.observeOn(Schedulers.single())
+        up.observeOn(Schedulers.single())
         .subscribe(ts);
 
-        us.onError(new TestException());
+        up.onError(new TestException());
 
         ts
         .awaitDone(5, TimeUnit.SECONDS)
@@ -1280,12 +1280,12 @@ public void inputOutputAsyncFusedError() {
     public void inputOutputAsyncFusedErrorDelayed() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
 
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        us.observeOn(Schedulers.single(), true)
+        up.observeOn(Schedulers.single(), true)
         .subscribe(ts);
 
-        us.onError(new TestException());
+        up.onError(new TestException());
 
         ts
         .awaitDone(5, TimeUnit.SECONDS)
@@ -1298,11 +1298,11 @@ public void inputOutputAsyncFusedErrorDelayed() {
 
     @Test
     public void outputFusedCancelReentrant() throws Exception {
-        final UnicastProcessor<Integer> us = UnicastProcessor.create();
+        final UnicastProcessor<Integer> up = UnicastProcessor.create();
 
         final CountDownLatch cdl = new CountDownLatch(1);
 
-        us.observeOn(Schedulers.single())
+        up.observeOn(Schedulers.single())
         .subscribe(new FlowableSubscriber<Integer>() {
             Subscription upstream;
             int count;
@@ -1315,7 +1315,7 @@ public void onSubscribe(Subscription s) {
             @Override
             public void onNext(Integer value) {
                 if (++count == 1) {
-                    us.onNext(2);
+                    up.onNext(2);
                     upstream.cancel();
                     cdl.countDown();
                 }
@@ -1332,7 +1332,7 @@ public void onComplete() {
             }
         });
 
-        us.onNext(1);
+        up.onNext(1);
 
         cdl.await();
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
index da1d67e819..190506aed2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
@@ -169,9 +169,9 @@ public boolean test(Integer a, Integer b) throws Exception {
     public void fusedAsync() {
         TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ANY);
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
+        UnicastSubject<Integer> us = UnicastSubject.create();
 
-        up
+        us
         .distinctUntilChanged(new BiPredicate<Integer, Integer>() {
             @Override
             public boolean test(Integer a, Integer b) throws Exception {
@@ -180,7 +180,7 @@ public boolean test(Integer a, Integer b) throws Exception {
         })
         .subscribe(to);
 
-        TestHelper.emit(up, 1, 2, 2, 3, 3, 4, 5);
+        TestHelper.emit(us, 1, 2, 2, 3, 3, 4, 5);
 
         to.assertFuseable()
         .assertFusionMode(QueueFuseable.ASYNC)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
index 5b6cd18987..411989a0f1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
@@ -131,11 +131,11 @@ public void asyncFusedRejected() {
     public void asyncFused() {
         TestObserverEx<Integer> to0 = new TestObserverEx<>(QueueFuseable.ASYNC);
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
+        UnicastSubject<Integer> us = UnicastSubject.create();
 
-        TestHelper.emit(up, 1, 2, 3, 4, 5);
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
 
-        up
+        us
         .doAfterNext(afterNext)
         .subscribe(to0);
 
@@ -228,11 +228,11 @@ public void asyncFusedRejectedConditional() {
     public void asyncFusedConditional() {
         TestObserverEx<Integer> to0 = new TestObserverEx<>(QueueFuseable.ASYNC);
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
+        UnicastSubject<Integer> us = UnicastSubject.create();
 
-        TestHelper.emit(up, 1, 2, 3, 4, 5);
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
 
-        up
+        us
         .doAfterNext(afterNext)
         .filter(Functions.alwaysTrue())
         .subscribe(to0);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
index a0eeccb405..0cc21b8f13 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
@@ -129,10 +129,10 @@ public void syncFusedBoundary() {
     public void asyncFused() {
         TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC);
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
-        TestHelper.emit(up, 1, 2, 3, 4, 5);
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
 
-        up
+        us
         .doFinally(this)
         .subscribe(to);
 
@@ -146,10 +146,10 @@ public void asyncFused() {
     public void asyncFusedBoundary() {
         TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC | QueueFuseable.BOUNDARY);
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
-        TestHelper.emit(up, 1, 2, 3, 4, 5);
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
 
-        up
+        us
         .doFinally(this)
         .subscribe(to);
 
@@ -267,10 +267,10 @@ public void syncFusedBoundaryConditional() {
     public void asyncFusedConditional() {
         TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC);
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
-        TestHelper.emit(up, 1, 2, 3, 4, 5);
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
 
-        up
+        us
         .doFinally(this)
         .filter(Functions.alwaysTrue())
         .subscribe(to);
@@ -285,10 +285,10 @@ public void asyncFusedConditional() {
     public void asyncFusedBoundaryConditional() {
         TestObserverEx<Integer> to = new TestObserverEx<>(QueueFuseable.ASYNC | QueueFuseable.BOUNDARY);
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
-        TestHelper.emit(up, 1, 2, 3, 4, 5);
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
 
-        up
+        us
         .doFinally(this)
         .filter(Functions.alwaysTrue())
         .subscribe(to);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
index 0482d23906..6b8627b02b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
@@ -596,9 +596,9 @@ public void fusedAsync() {
 
         final int[] call = { 0, 0 };
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
+        UnicastSubject<Integer> us = UnicastSubject.create();
 
-        up
+        us
         .doOnNext(new Consumer<Integer>() {
             @Override
             public void accept(Integer v) throws Exception {
@@ -613,7 +613,7 @@ public void run() throws Exception {
         })
         .subscribe(to);
 
-        TestHelper.emit(up, 1, 2, 3, 4, 5);
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
 
         to.assertFuseable()
         .assertFusionMode(QueueFuseable.ASYNC)
@@ -630,9 +630,9 @@ public void fusedAsyncConditional() {
 
         final int[] call = { 0, 0 };
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
+        UnicastSubject<Integer> us = UnicastSubject.create();
 
-        up
+        us
         .doOnNext(new Consumer<Integer>() {
             @Override
             public void accept(Integer v) throws Exception {
@@ -648,7 +648,7 @@ public void run() throws Exception {
         .filter(Functions.alwaysTrue())
         .subscribe(to);
 
-        TestHelper.emit(up, 1, 2, 3, 4, 5);
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
 
         to.assertFuseable()
         .assertFusionMode(QueueFuseable.ASYNC)
@@ -665,9 +665,9 @@ public void fusedAsyncConditional2() {
 
         final int[] call = { 0, 0 };
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
+        UnicastSubject<Integer> us = UnicastSubject.create();
 
-        up.hide()
+        us.hide()
         .doOnNext(new Consumer<Integer>() {
             @Override
             public void accept(Integer v) throws Exception {
@@ -683,7 +683,7 @@ public void run() throws Exception {
         .filter(Functions.alwaysTrue())
         .subscribe(to);
 
-        TestHelper.emit(up, 1, 2, 3, 4, 5);
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
 
         to.assertFuseable()
         .assertFusionMode(QueueFuseable.NONE)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
index 579b713313..2b8c2e0274 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
@@ -775,12 +775,12 @@ public void workerNotDisposedPrematurelySyncInNormalOut() {
     public void workerNotDisposedPrematurelyAsyncInNormalOut() {
         DisposeTrackingScheduler s = new DisposeTrackingScheduler();
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
-        up.onNext(1);
-        up.onComplete();
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        us.onNext(1);
+        us.onComplete();
 
         Observable.concat(
-                up.observeOn(s),
+                us.observeOn(s),
                 Observable.just(2)
         )
         .test()
diff --git a/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
index 53b7062028..002d6a17d3 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
@@ -131,14 +131,14 @@ public void run() {
     public void onTerminateCalledWhenOnError() {
         final AtomicBoolean didRunOnTerminate = new AtomicBoolean();
 
-        UnicastProcessor<Integer> us = UnicastProcessor.create(Observable.bufferSize(), new Runnable() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create(Observable.bufferSize(), new Runnable() {
             @Override public void run() {
                 didRunOnTerminate.set(true);
             }
         });
 
         assertFalse(didRunOnTerminate.get());
-        us.onError(new RuntimeException("some error"));
+        up.onError(new RuntimeException("some error"));
         assertTrue(didRunOnTerminate.get());
     }
 
@@ -146,14 +146,14 @@ public void onTerminateCalledWhenOnError() {
     public void onTerminateCalledWhenOnComplete() {
         final AtomicBoolean didRunOnTerminate = new AtomicBoolean();
 
-        UnicastProcessor<Integer> us = UnicastProcessor.create(Observable.bufferSize(), new Runnable() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create(Observable.bufferSize(), new Runnable() {
             @Override public void run() {
                 didRunOnTerminate.set(true);
             }
         });
 
         assertFalse(didRunOnTerminate.get());
-        us.onComplete();
+        up.onComplete();
         assertTrue(didRunOnTerminate.get());
     }
 
@@ -161,13 +161,13 @@ public void onTerminateCalledWhenOnComplete() {
     public void onTerminateCalledWhenCanceled() {
         final AtomicBoolean didRunOnTerminate = new AtomicBoolean();
 
-        UnicastProcessor<Integer> us = UnicastProcessor.create(Observable.bufferSize(), new Runnable() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create(Observable.bufferSize(), new Runnable() {
             @Override public void run() {
                 didRunOnTerminate.set(true);
             }
         });
 
-        final Disposable subscribe = us.subscribe();
+        final Disposable subscribe = up.subscribe();
 
         assertFalse(didRunOnTerminate.get());
         subscribe.dispose();
@@ -327,7 +327,7 @@ public void run() {
     @Test
     public void subscribeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final UnicastProcessor<Integer> us = UnicastProcessor.create();
+            final UnicastProcessor<Integer> up = UnicastProcessor.create();
 
             final TestSubscriberEx<Integer> ts1 = new TestSubscriberEx<>();
             final TestSubscriberEx<Integer> ts2 = new TestSubscriberEx<>();
@@ -335,14 +335,14 @@ public void subscribeRace() {
             Runnable r1 = new Runnable() {
                 @Override
                 public void run() {
-                    us.subscribe(ts1);
+                    up.subscribe(ts1);
                 }
             };
 
             Runnable r2 = new Runnable() {
                 @Override
                 public void run() {
-                    us.subscribe(ts2);
+                    up.subscribe(ts2);
                 }
             };
 
@@ -361,67 +361,67 @@ public void run() {
 
     @Test
     public void hasObservers() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create();
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-        assertFalse(us.hasSubscribers());
+        assertFalse(up.hasSubscribers());
 
-        TestSubscriber<Integer> ts = us.test();
+        TestSubscriber<Integer> ts = up.test();
 
-        assertTrue(us.hasSubscribers());
+        assertTrue(up.hasSubscribers());
 
         ts.cancel();
 
-        assertFalse(us.hasSubscribers());
+        assertFalse(up.hasSubscribers());
     }
 
     @Test
     public void drainFusedFailFast() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create(false);
+        UnicastProcessor<Integer> up = UnicastProcessor.create(false);
 
-        TestSubscriberEx<Integer> ts = us.to(TestHelper.<Integer>testSubscriber(1, QueueFuseable.ANY, false));
+        TestSubscriberEx<Integer> ts = up.to(TestHelper.<Integer>testSubscriber(1, QueueFuseable.ANY, false));
 
-        us.done = true;
-        us.drainFused(ts);
+        up.done = true;
+        up.drainFused(ts);
 
         ts.assertResult();
     }
 
     @Test
     public void drainFusedFailFastEmpty() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create(false);
+        UnicastProcessor<Integer> up = UnicastProcessor.create(false);
 
-        TestSubscriberEx<Integer> ts = us.to(TestHelper.<Integer>testSubscriber(1, QueueFuseable.ANY, false));
+        TestSubscriberEx<Integer> ts = up.to(TestHelper.<Integer>testSubscriber(1, QueueFuseable.ANY, false));
 
-        us.drainFused(ts);
+        up.drainFused(ts);
 
         ts.assertEmpty();
     }
 
     @Test
     public void checkTerminatedFailFastEmpty() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create(false);
+        UnicastProcessor<Integer> up = UnicastProcessor.create(false);
 
-        TestSubscriberEx<Integer> ts = us.to(TestHelper.<Integer>testSubscriber(1, QueueFuseable.ANY, false));
+        TestSubscriberEx<Integer> ts = up.to(TestHelper.<Integer>testSubscriber(1, QueueFuseable.ANY, false));
 
-        us.checkTerminated(true, true, false, ts, us.queue);
+        up.checkTerminated(true, true, false, ts, up.queue);
 
         ts.assertEmpty();
     }
 
     @Test
     public void alreadyCancelled() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create(false);
+        UnicastProcessor<Integer> up = UnicastProcessor.create(false);
 
-        us.test().cancel();
+        up.test().cancel();
 
         BooleanSubscription bs = new BooleanSubscription();
-        us.onSubscribe(bs);
+        up.onSubscribe(bs);
 
         assertTrue(bs.isCancelled());
 
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            us.onError(new TestException());
+            up.onError(new TestException());
 
             TestHelper.assertUndeliverable(errors, 0, TestException.class);
         } finally {
@@ -431,9 +431,9 @@ public void alreadyCancelled() {
 
     @Test
     public void unicastSubscriptionBadRequest() {
-        UnicastProcessor<Integer> us = UnicastProcessor.create(false);
+        UnicastProcessor<Integer> up = UnicastProcessor.create(false);
 
-        UnicastProcessor<Integer>.UnicastQueueSubscription usc = (UnicastProcessor<Integer>.UnicastQueueSubscription)us.wip;
+        UnicastProcessor<Integer>.UnicastQueueSubscription usc = (UnicastProcessor<Integer>.UnicastQueueSubscription)up.wip;
 
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -449,17 +449,17 @@ public void fusedNoConcurrentCleanDueToCancel() {
         for (int j = 0; j < TestHelper.RACE_LONG_LOOPS; j++) {
             List<Throwable> errors = TestHelper.trackPluginErrors();
             try {
-                final UnicastProcessor<Integer> us = UnicastProcessor.create();
+                final UnicastProcessor<Integer> up = UnicastProcessor.create();
 
-                TestObserver<Integer> to = us
+                TestObserver<Integer> to = up
                 .observeOn(Schedulers.io())
                 .map(Functions.<Integer>identity())
                 .observeOn(Schedulers.single())
                 .firstOrError()
                 .test();
 
-                for (int i = 0; us.hasSubscribers(); i++) {
-                    us.onNext(i);
+                for (int i = 0; up.hasSubscribers(); i++) {
+                    up.onNext(i);
                 }
 
                 to
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
index 17e4cb0a72..ac000e4228 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
@@ -228,14 +228,14 @@ public void zeroCapacityHint() {
     public void completeCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final int[] calls = { 0 };
-            final UnicastSubject<Object> up = UnicastSubject.create(100, new Runnable() {
+            final UnicastSubject<Object> us = UnicastSubject.create(100, new Runnable() {
                 @Override
                 public void run() {
                     calls[0]++;
                 }
             });
 
-            final TestObserver<Object> to = up.test();
+            final TestObserver<Object> to = us.test();
 
             Runnable r1 = new Runnable() {
                 @Override
@@ -247,7 +247,7 @@ public void run() {
             Runnable r2 = new Runnable() {
                 @Override
                 public void run() {
-                    up.onComplete();
+                    us.onComplete();
                 }
             };
 
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
index 9ee8a1cfc5..0d6edd6c3d 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
@@ -1094,16 +1094,16 @@ public void asyncQueueThrows() {
         TestObserverEx<Object> to = new TestObserverEx<>();
         to.setInitialFusionMode(QueueFuseable.ANY);
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
+        UnicastSubject<Integer> us = UnicastSubject.create();
 
-        up
+        us
         .map(new Function<Integer, Object>() {
             @Override
             public Object apply(Integer v) throws Exception { throw new TestException(); }
         })
         .subscribe(to);
 
-        up.onNext(1);
+        us.onNext(1);
 
         to.assertSubscribed()
         .assertFuseable()
@@ -1132,13 +1132,13 @@ public void asyncFusion() {
         TestObserverEx<Object> to = new TestObserverEx<>();
         to.setInitialFusionMode(QueueFuseable.ANY);
 
-        UnicastSubject<Integer> up = UnicastSubject.create();
+        UnicastSubject<Integer> us = UnicastSubject.create();
 
-        up
+        us
         .subscribe(to);
 
-        up.onNext(1);
-        up.onComplete();
+        us.onNext(1);
+        us.onComplete();
 
         to.assertSubscribed()
         .assertFuseable()
diff --git a/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java b/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
index 40a976a165..df6f0a378a 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
@@ -94,7 +94,15 @@ static void findPattern(String pattern, boolean checkMain) throws Exception {
                                                 .append(fname)
                                                 .append("#L").append(lineNum)
                                                 .append("    ").append(line)
-                                                .append("\n");
+                                                .append("\n")
+                                                .append(" at ")
+                                                .append(fname.replace(".java", ""))
+                                                .append(".method(")
+                                                .append(fname)
+                                                .append(":")
+                                                .append(lineNum)
+                                                .append(")\n");
+
                                                 total++;
                                             }
                                         }
@@ -111,9 +119,7 @@ static void findPattern(String pattern, boolean checkMain) throws Exception {
             }
         }
         if (total != 0) {
-            fail.append("Found ")
-            .append(total)
-            .append(" instances");
+            fail.insert(0, "Found " + total + " instances");
             System.out.println(fail);
             throw new AssertionError(fail.toString());
         }
@@ -149,6 +155,16 @@ public void publishProcessorAsPs() throws Exception {
         findPattern("PublishProcessor<.*>\\s+ps");
     }
 
+    @Test
+    public void unicastSubjectAsUp() throws Exception {
+        findPattern("UnicastSubject<.*>\\s+up");
+    }
+
+    @Test
+    public void unicastProcessorAsUs() throws Exception {
+        findPattern("UnicastProcessor<.*>\\s+us");
+    }
+
     @Test
     public void behaviorProcessorAsBs() throws Exception {
         findPattern("BehaviorProcessor<.*>\\s+bs");
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index e8219df148..4a4baaf8ae 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -57,8 +57,8 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                                 && !m.signature.contains("Flowable")
                                 && !m.signature.contains("Observable")
                                 && !m.signature.contains("ObservableSource")) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions onNext but no Flowable/Observable in signature\r\n at io.reactivex.")
-                            .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Maybe doc mentions onNext but no Flowable/Observable in signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -74,8 +74,8 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                                 && !m.signature.contains("Flowable")
                                 && !m.signature.contains("TestSubscriber")
                         ) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions Subscriber but not using Flowable\r\n at io.reactivex.")
-                            .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Maybe doc mentions Subscriber but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -90,8 +90,8 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                         if (!m.signature.contains("Publisher")
                                 && !m.signature.contains("Flowable")
                         ) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions Subscription but not using Flowable\r\n at io.reactivex.")
-                            .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Maybe doc mentions Subscription but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -108,8 +108,8 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                                 && !m.signature.contains("TestObserver")) {
 
                             if (idx < 5 || !m.javadoc.substring(idx - 5, idx + 8).equals("MaybeObserver")) {
-                                e.append("java.lang.RuntimeException: Maybe doc mentions Observer but not using Observable\r\n at io.reactivex.")
-                                .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Maybe doc mentions Observer but not using Observable\r\n at io.reactivex.rxjava3.core.")
+                                .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
 
@@ -124,8 +124,8 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                     if (idx >= 0) {
                         if (!m.signature.contains("Publisher")) {
                             if (idx == 0 || !m.javadoc.substring(idx - 1, idx + 9).equals("(Publisher")) {
-                                e.append("java.lang.RuntimeException: Maybe doc mentions Publisher but not in the signature\r\n at io.reactivex.")
-                                .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Maybe doc mentions Publisher but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
 
@@ -139,8 +139,8 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                     int idx = m.javadoc.indexOf("Flowable", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("Flowable")) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions Flowable but not in the signature\r\n at io.reactivex.")
-                            .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Maybe doc mentions Flowable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -154,7 +154,7 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                         int j = m.javadoc.indexOf("#toSingle", jdx);
                         int k = m.javadoc.indexOf("{@code Single", jdx);
                         if (!m.signature.contains("Single") && (j + 3 != idx && k + 7 != idx)) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions Single but not in the signature\r\n at io.reactivex.")
+                            e.append("java.lang.RuntimeException: Maybe doc mentions Single but not in the signature\r\n at io.reactivex.rxjava3.core.")
                             .append("Maybe(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
@@ -167,8 +167,8 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                     int idx = m.javadoc.indexOf("SingleSource", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("SingleSource")) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions SingleSource but not in the signature\r\n at io.reactivex.")
-                            .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Maybe doc mentions SingleSource but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -180,8 +180,8 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                     int idx = m.javadoc.indexOf("Observable", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("Observable")) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions Observable but not in the signature\r\n at io.reactivex.")
-                            .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Maybe doc mentions Observable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -193,8 +193,8 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                     int idx = m.javadoc.indexOf("ObservableSource", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("ObservableSource")) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions ObservableSource but not in the signature\r\n at io.reactivex.")
-                            .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Maybe doc mentions ObservableSource but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -233,8 +233,8 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                                 && !m.signature.contains("MaybeSource")
                                 && !m.signature.contains("Single")
                                 && !m.signature.contains("SingleSource")) {
-                            e.append("java.lang.RuntimeException: Flowable doc mentions onSuccess\r\n at io.reactivex.")
-                            .append("Flowable (Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Flowable doc mentions onSuccess\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -248,8 +248,8 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                     if (idx >= 0) {
                         if (!m.signature.contains("ObservableSource")
                                 && !m.signature.contains("Observable")) {
-                            e.append("java.lang.RuntimeException: Flowable doc mentions Observer but not using Flowable\r\n at io.reactivex.")
-                            .append("Flowable (Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Flowable doc mentions Observer but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -273,8 +273,8 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                         ) {
                             CharSequence subSequence = m.javadoc.subSequence(idx - 6, idx + 11);
                             if (idx < 6 || !subSequence.equals("{@link Disposable")) {
-                                e.append("java.lang.RuntimeException: Flowable doc mentions Disposable but not using Flowable\r\n at io.reactivex.")
-                                .append("Flowable (Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Flowable doc mentions Disposable but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                                .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
 
@@ -288,8 +288,8 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                     int idx = m.javadoc.indexOf("Observable", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("Observable")) {
-                            e.append("java.lang.RuntimeException: Flowable doc mentions Observable but not in the signature\r\n at io.reactivex.")
-                            .append("Flowable (Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Flowable doc mentions Observable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -302,8 +302,8 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                     int idx = m.javadoc.indexOf("ObservableSource", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("ObservableSource")) {
-                            e.append("java.lang.RuntimeException: Flowable doc mentions ObservableSource but not in the signature\r\n at io.reactivex.")
-                            .append("Flowable (Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Flowable doc mentions ObservableSource but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -342,8 +342,8 @@ public void observableDocRefersToObservableTypes() throws Exception {
                                 && !m.signature.contains("MaybeSource")
                                 && !m.signature.contains("Single")
                                 && !m.signature.contains("SingleSource")) {
-                            e.append("java.lang.RuntimeException: Observable doc mentions onSuccess\r\n at io.reactivex.")
-                            .append("Observable (Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Observable doc mentions onSuccess\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -358,8 +358,8 @@ public void observableDocRefersToObservableTypes() throws Exception {
                         if (!m.signature.contains("Flowable")
                                 && !m.signature.contains("Publisher")
                         ) {
-                            e.append("java.lang.RuntimeException: Observable doc mentions Subscription but not using Flowable\r\n at io.reactivex.")
-                            .append("Observable (Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Observable doc mentions Subscription but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -373,8 +373,8 @@ public void observableDocRefersToObservableTypes() throws Exception {
                     if (idx >= 0) {
                         if (!m.signature.contains("Flowable")) {
                             if (idx < 6 || !m.javadoc.substring(idx - 6, idx + 8).equals("@link Flowable")) {
-                                e.append("java.lang.RuntimeException: Observable doc mentions Flowable but not in the signature\r\n at io.reactivex.")
-                                .append("Observable (Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Observable doc mentions Flowable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
 
@@ -388,8 +388,8 @@ public void observableDocRefersToObservableTypes() throws Exception {
                     int idx = m.javadoc.indexOf("Publisher", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("Publisher")) {
-                            e.append("java.lang.RuntimeException: Observable doc mentions Publisher but not in the signature\r\n at io.reactivex.")
-                            .append("Observable (Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Observable doc mentions Publisher but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -402,8 +402,8 @@ public void observableDocRefersToObservableTypes() throws Exception {
                     if (idx >= 0) {
                         if (!m.signature.contains("Publisher")
                                 && !m.signature.contains("Flowable")) {
-                            e.append("java.lang.RuntimeException: Observable doc mentions Subscriber but not using Flowable\r\n at io.reactivex.")
-                            .append("Observable (Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Observable doc mentions Subscriber but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -443,8 +443,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                                 && !m.signature.contains("Flowable")
                                 && !m.signature.contains("Observable")
                                 && !m.signature.contains("ObservableSource")) {
-                            e.append("java.lang.RuntimeException: Single doc mentions onNext but no Flowable/Observable in signature\r\n at io.reactivex.")
-                            .append("Single (Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Single doc mentions onNext but no Flowable/Observable in signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Single.method(Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -459,8 +459,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                         if (!m.signature.contains("Publisher")
                                 && !m.signature.contains("Flowable")
                                 && !m.signature.contains("TestSubscriber")) {
-                            e.append("java.lang.RuntimeException: Single doc mentions Subscriber but not using Flowable\r\n at io.reactivex.")
-                            .append("Single (Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Single doc mentions Subscriber but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Single.method(Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -475,8 +475,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                         if (!m.signature.contains("Flowable")
                                 && !m.signature.contains("Publisher")
                         ) {
-                            e.append("java.lang.RuntimeException: Single doc mentions Subscription but not using Flowable\r\n at io.reactivex.")
-                            .append("Single (Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Single doc mentions Subscription but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Single.method(Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -493,8 +493,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                                 && !m.signature.contains("TestObserver")) {
 
                             if (idx < 6 || !m.javadoc.substring(idx - 6, idx + 8).equals("SingleObserver")) {
-                                e.append("java.lang.RuntimeException: Single doc mentions Observer but not using Observable\r\n at io.reactivex.")
-                                .append("Single (Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Single doc mentions Observer but not using Observable\r\n at io.reactivex.rxjava3.core.")
+                                .append("Single.method(Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
 
@@ -509,8 +509,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                     if (idx >= 0) {
                         if (!m.signature.contains("Publisher")) {
                             if (idx == 0 || !m.javadoc.substring(idx - 1, idx + 9).equals("(Publisher")) {
-                                e.append("java.lang.RuntimeException: Single doc mentions Publisher but not in the signature\r\n at io.reactivex.")
-                                .append("Single (Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Single doc mentions Publisher but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Single.method(Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
 
@@ -524,8 +524,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                     int idx = m.javadoc.indexOf(" Flowable", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("Flowable")) {
-                            e.append("java.lang.RuntimeException: Single doc mentions Flowable but not in the signature\r\n at io.reactivex.")
-                            .append("Single (Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Single doc mentions Flowable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Single.method(Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -537,8 +537,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                     int idx = m.javadoc.indexOf(" Maybe", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("Maybe")) {
-                            e.append("java.lang.RuntimeException: Single doc mentions Maybe but not in the signature\r\n at io.reactivex.")
-                            .append("Single (Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Single doc mentions Maybe but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Single.method(Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -550,8 +550,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                     int idx = m.javadoc.indexOf(" MaybeSource", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("MaybeSource")) {
-                            e.append("java.lang.RuntimeException: Single doc mentions SingleSource but not in the signature\r\n at io.reactivex.")
-                            .append("Maybe (Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Single doc mentions SingleSource but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -563,8 +563,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                     int idx = m.javadoc.indexOf(" Observable", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("Observable")) {
-                            e.append("java.lang.RuntimeException: Single doc mentions Observable but not in the signature\r\n at io.reactivex.")
-                            .append("Single (Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Single doc mentions Observable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Single.method(Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -576,8 +576,8 @@ public void singleDocRefersToSingleTypes() throws Exception {
                     int idx = m.javadoc.indexOf(" ObservableSource", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("ObservableSource")) {
-                            e.append("java.lang.RuntimeException: Single doc mentions ObservableSource but not in the signature\r\n at io.reactivex.")
-                            .append("Single (Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Single doc mentions ObservableSource but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Single.method(Single.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {
@@ -617,8 +617,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                                 && !m.signature.contains("Flowable")
                                 && !m.signature.contains("Observable")
                                 && !m.signature.contains("ObservableSource")) {
-                            e.append("java.lang.RuntimeException: Completable doc mentions onNext but no Flowable/Observable in signature\r\n at io.reactivex.")
-                            .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Completable doc mentions onNext but no Flowable/Observable in signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -633,8 +633,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                         if (!m.signature.contains("Publisher")
                                 && !m.signature.contains("Flowable")
                                 && !m.signature.contains("TestSubscriber")) {
-                            e.append("java.lang.RuntimeException: Completable doc mentions Subscriber but not using Flowable\r\n at io.reactivex.")
-                            .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Completable doc mentions Subscriber but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -649,8 +649,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                         if (!m.signature.contains("Flowable")
                                 && !m.signature.contains("Publisher")
                         ) {
-                            e.append("java.lang.RuntimeException: Completable doc mentions Subscription but not using Flowable\r\n at io.reactivex.")
-                            .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            e.append("java.lang.RuntimeException: Completable doc mentions Subscription but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 
                         jdx = idx + 6;
@@ -667,8 +667,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                                 && !m.signature.contains("TestObserver")) {
 
                             if (idx < 11 || !m.javadoc.substring(idx - 11, idx + 8).equals("CompletableObserver")) {
-                                e.append("java.lang.RuntimeException: Completable doc mentions Observer but not using Observable\r\n at io.reactivex.")
-                                .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Completable doc mentions Observer but not using Observable\r\n at io.reactivex.rxjava3.core.")
+                                .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
 
@@ -683,8 +683,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                     if (idx >= 0) {
                         if (!m.signature.contains("Publisher")) {
                             if (idx == 0 || !m.javadoc.substring(idx - 1, idx + 9).equals("(Publisher")) {
-                                e.append("java.lang.RuntimeException: Completable doc mentions Publisher but not in the signature\r\n at io.reactivex.")
-                                .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Completable doc mentions Publisher but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
 
@@ -700,8 +700,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                         if (!m.signature.contains("Flowable")) {
                             Pattern p = Pattern.compile("@see\\s+#[A-Za-z0-9 _.,()]*Flowable");
                             if (!p.matcher(m.javadoc).find()) {
-                                e.append("java.lang.RuntimeException: Completable doc mentions Flowable but not in the signature\r\n at io.reactivex.")
-                                .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Completable doc mentions Flowable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
                         jdx = idx + 6;
@@ -716,8 +716,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                         if (!m.signature.contains("Single")) {
                             Pattern p = Pattern.compile("@see\\s+#[A-Za-z0-9 _.,()]*Single");
                             if (!p.matcher(m.javadoc).find()) {
-                                e.append("java.lang.RuntimeException: Completable doc mentions Single but not in the signature\r\n at io.reactivex.")
-                                .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Completable doc mentions Single but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
                         jdx = idx + 6;
@@ -732,8 +732,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                         if (!m.signature.contains("SingleSource")) {
                             Pattern p = Pattern.compile("@see\\s+#[A-Za-z0-9 _.,()]*SingleSource");
                             if (!p.matcher(m.javadoc).find()) {
-                                e.append("java.lang.RuntimeException: Completable doc mentions SingleSource but not in the signature\r\n at io.reactivex.")
-                                .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Completable doc mentions SingleSource but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
                         jdx = idx + 6;
@@ -748,8 +748,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                         if (!m.signature.contains("Observable")) {
                             Pattern p = Pattern.compile("@see\\s+#[A-Za-z0-9 _.,()]*Observable");
                             if (!p.matcher(m.javadoc).find()) {
-                                e.append("java.lang.RuntimeException: Completable doc mentions Observable but not in the signature\r\n at io.reactivex.")
-                                .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Completable doc mentions Observable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
                         jdx = idx + 6;
@@ -764,8 +764,8 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                         if (!m.signature.contains("ObservableSource")) {
                             Pattern p = Pattern.compile("@see\\s+#[A-Za-z0-9 _.,()]*ObservableSource");
                             if (!p.matcher(m.javadoc).find()) {
-                                e.append("java.lang.RuntimeException: Completable doc mentions ObservableSource but not in the signature\r\n at io.reactivex.")
-                                .append("Completable (Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                                e.append("java.lang.RuntimeException: Completable doc mentions ObservableSource but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Completable.method(Completable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                             }
                         }
                         jdx = idx + 6;
@@ -807,9 +807,9 @@ static void aOrAn(StringBuilder e, RxMethod m, String wrongPre, String word, Str
             if (idx >= 0) {
                 e.append("java.lang.RuntimeException: a/an typo ")
                 .append(word)
-                .append("\r\n at io.reactivex.")
+                .append("\r\n at io.reactivex.rxjava3.core.")
                 .append(baseTypeName)
-                .append(" (")
+                .append(".method(")
                 .append(baseTypeName)
                 .append(".java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                 jdx = idx + 6;
@@ -824,9 +824,9 @@ static void aOrAn(StringBuilder e, RxMethod m, String wrongPre, String word, Str
             if (idx >= 0) {
                 e.append("java.lang.RuntimeException: a/an typo ")
                 .append(word)
-                .append("\r\n at io.reactivex.")
+                .append("\r\n at io.reactivex.rxjava3.core.")
                 .append(baseTypeName)
-                .append(" (")
+                .append(".method(")
                 .append(baseTypeName)
                 .append(".java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                 jdx = idx + 6;
@@ -841,9 +841,9 @@ static void aOrAn(StringBuilder e, RxMethod m, String wrongPre, String word, Str
             if (idx >= 0) {
                 e.append("java.lang.RuntimeException: a/an typo ")
                 .append(word)
-                .append("\r\n at io.reactivex.")
+                .append("\r\n at io.reactivex.rxjava3.core.")
                 .append(baseTypeName)
-                .append(" (")
+                .append(".method(")
                 .append(baseTypeName)
                 .append(".java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                 jdx = idx + 6;
@@ -858,9 +858,9 @@ static void aOrAn(StringBuilder e, RxMethod m, String wrongPre, String word, Str
             if (idx >= 0) {
                 e.append("java.lang.RuntimeException: a/an typo ")
                 .append(word)
-                .append("\r\n at io.reactivex.")
+                .append("\r\n at io.reactivex.rxjava3.core.")
                 .append(baseTypeName)
-                .append(" (")
+                .append(".method(")
                 .append(baseTypeName)
                 .append(".java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                 jdx = idx + 6;
@@ -895,9 +895,9 @@ static void aOrAn(StringBuilder e, RxMethod m, String wrongPre, String word, Str
             if (idx >= 0) {
                 e.append("java.lang.RuntimeException: a/an typo ")
                 .append(word)
-                .append("\r\n at io.reactivex.")
+                .append("\r\n at io.reactivex.rxjava3.core.")
                 .append(baseTypeName)
-                .append(" (")
+                .append(".method(")
                 .append(baseTypeName)
                 .append(".java:").append(m.javadocLine).append(")\r\n\r\n");
                 jdx = idx + wrongPre.length() + 1 + word.length();
@@ -923,9 +923,9 @@ static void missingClosingDD(StringBuilder e, RxMethod m, String baseTypeName) {
                 jdx = idx2 + 5;
             } else {
                 e.append("java.lang.RuntimeException: unbalanced <dd></dd> ")
-                .append("\r\n at io.reactivex.")
+                .append("\r\n at io.reactivex.rxjava3.core.")
                 .append(baseTypeName)
-                .append(" (")
+                .append(".method(")
                 .append(baseTypeName)
                 .append(".java:").append(m.javadocLine + lineNumber(m.javadoc, idx1) - 1).append(")\r\n\r\n");
                 break;
@@ -936,9 +936,9 @@ static void missingClosingDD(StringBuilder e, RxMethod m, String baseTypeName) {
     static void backpressureMentionedWithoutAnnotation(StringBuilder e, RxMethod m, String baseTypeName) {
         if (m.backpressureDocLine > 0 && m.backpressureKind == null) {
             e.append("java.lang.RuntimeException: backpressure documented but not annotated ")
-            .append("\r\n at io.reactivex.")
+            .append("\r\n at io.reactivex.rxjava3.core.")
             .append(baseTypeName)
-            .append(" (")
+            .append(".method(")
             .append(baseTypeName)
             .append(".java:").append(m.backpressureDocLine).append(")\r\n\r\n");
         }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 5bc4306492..d8c3e32636 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -509,6 +509,10 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "singleStage", Object.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "lastStage", Object.class));
 
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "firstStage", Object.class));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "singleStage", Object.class));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "lastStage", Object.class));
+
         addOverride(new ParamOverride(Maybe.class, 0, ParamMode.ANY, "toCompletionStage", Object.class));
         addOverride(new ParamOverride(Completable.class, 0, ParamMode.ANY, "toCompletionStage", Object.class));
 

From 3d00eb188bad1d49aa058e896ad9d1b5026eba7d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 26 Dec 2019 22:37:39 +0100
Subject: [PATCH 025/665] 3.x: [Java 8] Add ParallelFlowable operators +
 cleanup (#6798)

---
 .../io/reactivex/rxjava3/core/Flowable.java   |   6 +-
 .../java/io/reactivex/rxjava3/core/Maybe.java |   2 +-
 .../io/reactivex/rxjava3/core/Observable.java |   4 +-
 .../internal/jdk8/FlowableFlatMapStream.java  |  15 +-
 .../internal/jdk8/ParallelCollector.java      | 270 +++++++++++++
 .../internal/jdk8/ParallelFlatMapStream.java  |  69 ++++
 .../internal/jdk8/ParallelMapOptional.java    | 236 +++++++++++
 .../internal/jdk8/ParallelMapTryOptional.java | 306 ++++++++++++++
 .../flowable/FlowableFlattenIterable.java     |  20 +-
 .../operators/parallel/ParallelCollect.java   |   2 +-
 .../parallel/ParallelDoOnNextTry.java         |   8 +-
 .../operators/parallel/ParallelFilter.java    |   4 +-
 .../operators/parallel/ParallelFilterTry.java |   8 +-
 .../parallel/ParallelFlatMapIterable.java     |  68 ++++
 .../parallel/ParallelFromPublisher.java       |   4 +-
 .../operators/parallel/ParallelJoin.java      |   8 +-
 .../operators/parallel/ParallelMapTry.java    |   4 +-
 .../operators/parallel/ParallelPeek.java      |   2 +-
 .../operators/parallel/ParallelReduce.java    |   2 +-
 .../parallel/ParallelReduceFull.java          |  11 +-
 .../operators/parallel/ParallelRunOn.java     |   6 +-
 .../parallel/ParallelSortedJoin.java          |   6 +-
 .../rxjava3/parallel/ParallelFlowable.java    | 310 +++++++++++++-
 .../internal/jdk8/ParallelCollectorTest.java  | 305 ++++++++++++++
 .../jdk8/ParallelFlatMapStreamTest.java       |  73 ++++
 .../jdk8/ParallelMapOptionalTest.java         | 228 +++++++++++
 .../jdk8/ParallelMapTryOptionalTest.java      | 378 ++++++++++++++++++
 .../parallel/ParallelFlatMapIterableTest.java |  73 ++++
 .../rxjava3/parallel/ParallelMapTest.java     |  22 +-
 .../rxjava3/parallel/ParallelMapTryTest.java  |  22 +-
 .../rxjava3/testsupport/TestHelper.java       |  65 +++
 .../validators/TooManyEmptyNewLines.java      |  13 +-
 32 files changed, 2497 insertions(+), 53 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStream.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStreamTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptionalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptionalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 15b1864d8b..57efac10e0 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -18944,9 +18944,9 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * @param <T> the element type of the optional value
      * @param optional the optional value to convert into a {@code Flowable}
      * @return the new Flowable instance
+     * @since 3.0.0
      * @see #just(Object)
      * @see #empty()
-     * @since 3.0.0
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -19409,6 +19409,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
      * @return the new Flowable instance
+     * @since 3.0.0
      * @see #concatMap(Function)
      * @see #concatMapIterable(Function)
      * @see #concatMapStream(Function, int)
@@ -19461,6 +19462,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * will be emitted to the downstream
      * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
      * @return the new Flowable instance
+     * @since 3.0.0
      * @see #concatMap(Function, int)
      * @see #concatMapIterable(Function, int)
      * @see #flatMapStream(Function, int)
@@ -19515,6 +19517,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
      * @return the new Flowable instance
+     * @since 3.0.0
      * @see #flatMap(Function)
      * @see #flatMapIterable(Function)
      * @see #flatMapStream(Function, int)
@@ -19567,6 +19570,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * will be emitted to the downstream
      * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
      * @return the new Flowable instance
+     * @since 3.0.0
      * @see #flatMap(Function, int)
      * @see #flatMapIterable(Function, int)
      * @see #concatMapStream(Function, int)
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index d5336f96ce..f26e584c16 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -4870,9 +4870,9 @@ public final TestObserver<T> test(boolean dispose) {
      * @param <T> the element type of the optional value
      * @param optional the optional value to convert into a {@code Maybe}
      * @return the new Maybe instance
+     * @since 3.0.0
      * @see #just(Object)
      * @see #empty()
-     * @since 3.0.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 0afdd29a93..eb33792f34 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -15937,9 +15937,9 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      * @param <T> the element type of the optional value
      * @param optional the optional value to convert into an {@code Observable}
      * @return the new Observable instance
+     * @since 3.0.0
      * @see #just(Object)
      * @see #empty()
-     * @since 3.0.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -16355,6 +16355,7 @@ public final Stream<T> blockingStream(int capacityHint) {
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
      * @return the new Observable instance
+     * @since 3.0.0
      * @see #concatMap(Function)
      * @see #concatMapIterable(Function)
      * @see #flatMapStream(Function)
@@ -16401,6 +16402,7 @@ public final Stream<T> blockingStream(int capacityHint) {
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
      * @return the new Observable instance
+     * @since 3.0.0
      * @see #flatMap(Function)
      * @see #flatMapIterable(Function)
      */
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
index ad1b3ad140..c967a011e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
@@ -71,10 +71,23 @@ protected void subscribeActual(Subscriber<? super R> s) {
                 EmptySubscription.complete(s);
             }
         } else {
-            source.subscribe(new FlatMapStreamSubscriber<>(s, mapper, prefetch));
+            source.subscribe(subscribe(s, mapper, prefetch));
         }
     }
 
+    /**
+     * Create a {@link Subscriber} with the given parameters.
+     * @param <T> the upstream value type
+     * @param <R> the {@link Stream} and output value type
+     * @param downstream the downstream {@code Subscriber} to wrap
+     * @param mapper the mapper function
+     * @param prefetch the number of items to prefetch
+     * @return the new {@code Subscriber}
+     */
+    public static <T, R> Subscriber<T> subscribe(Subscriber<? super R> downstream, Function<? super T, ? extends Stream<? extends R>> mapper, int prefetch) {
+        return new FlatMapStreamSubscriber<>(downstream, mapper, prefetch);
+    }
+
     static final class FlatMapStreamSubscriber<T, R> extends AtomicInteger
     implements FlowableSubscriber<T>, Subscription {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java
new file mode 100644
index 0000000000..e94f50cb67
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java
@@ -0,0 +1,270 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.*;
+import java.util.function.*;
+import java.util.stream.Collector;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Reduces all 'rails' into a single via a Java 8 {@link Collector} callback set.
+ *
+ * @param <T> the value type
+ * @param <A> the accumulator type
+ * @param <R> the result type
+ * @since 3.0.0
+ */
+public final class ParallelCollector<T, A, R> extends Flowable<R> {
+
+    final ParallelFlowable<? extends T> source;
+
+    final Collector<T, A, R> collector;
+
+    public ParallelCollector(ParallelFlowable<? extends T> source, Collector<T, A, R> collector) {
+        this.source = source;
+        this.collector = collector;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super R> s) {
+        ParallelCollectorSubscriber<T, A, R> parent;
+        try {
+            parent = new ParallelCollectorSubscriber<>(s, source.parallelism(), collector);
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            EmptySubscription.error(ex, s);
+            return;
+        }
+        s.onSubscribe(parent);
+
+        source.subscribe(parent.subscribers);
+    }
+
+    static final class ParallelCollectorSubscriber<T, A, R> extends DeferredScalarSubscription<R> {
+
+        private static final long serialVersionUID = -5370107872170712765L;
+
+        final ParallelCollectorInnerSubscriber<T, A, R>[] subscribers;
+
+        final AtomicReference<SlotPair<A>> current = new AtomicReference<>();
+
+        final AtomicInteger remaining = new AtomicInteger();
+
+        final AtomicThrowable error = new AtomicThrowable();
+
+        final Function<A, R> finisher;
+
+        ParallelCollectorSubscriber(Subscriber<? super R> subscriber, int n, Collector<T, A, R> collector) {
+            super(subscriber);
+            this.finisher = collector.finisher();
+            @SuppressWarnings("unchecked")
+            ParallelCollectorInnerSubscriber<T, A, R>[] a = new ParallelCollectorInnerSubscriber[n];
+            for (int i = 0; i < n; i++) {
+                a[i] = new ParallelCollectorInnerSubscriber<>(this, collector.supplier().get(), collector.accumulator(), collector.combiner());
+            }
+            this.subscribers = a;
+            remaining.lazySet(n);
+        }
+
+        SlotPair<A> addValue(A value) {
+            for (;;) {
+                SlotPair<A> curr = current.get();
+
+                if (curr == null) {
+                    curr = new SlotPair<>();
+                    if (!current.compareAndSet(null, curr)) {
+                        continue;
+                    }
+                }
+
+                int c = curr.tryAcquireSlot();
+                if (c < 0) {
+                    current.compareAndSet(curr, null);
+                    continue;
+                }
+                if (c == 0) {
+                    curr.first = value;
+                } else {
+                    curr.second = value;
+                }
+
+                if (curr.releaseSlot()) {
+                    current.compareAndSet(curr, null);
+                    return curr;
+                }
+                return null;
+            }
+        }
+
+        @Override
+        public void cancel() {
+            for (ParallelCollectorInnerSubscriber<T, A, R> inner : subscribers) {
+                inner.cancel();
+            }
+        }
+
+        void innerError(Throwable ex) {
+            if (error.compareAndSet(null, ex)) {
+                cancel();
+                downstream.onError(ex);
+            } else {
+                if (ex != error.get()) {
+                    RxJavaPlugins.onError(ex);
+                }
+            }
+        }
+
+        void innerComplete(A value, BinaryOperator<A> combiner) {
+            for (;;) {
+                SlotPair<A> sp = addValue(value);
+
+                if (sp != null) {
+
+                    try {
+                        value = combiner.apply(sp.first, sp.second);
+                    } catch (Throwable ex) {
+                        Exceptions.throwIfFatal(ex);
+                        innerError(ex);
+                        return;
+                    }
+
+                } else {
+                    break;
+                }
+            }
+
+            if (remaining.decrementAndGet() == 0) {
+                SlotPair<A> sp = current.get();
+                current.lazySet(null);
+
+                R result;
+                try {
+                    result = Objects.requireNonNull(finisher.apply(sp.first), "The finisher returned a null value");
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    innerError(ex);
+                    return;
+                }
+
+                complete(result);
+            }
+        }
+    }
+
+    static final class ParallelCollectorInnerSubscriber<T, A, R>
+    extends AtomicReference<Subscription>
+    implements FlowableSubscriber<T> {
+
+        private static final long serialVersionUID = -7954444275102466525L;
+
+        final ParallelCollectorSubscriber<T, A, R> parent;
+
+        final BiConsumer<A, T> accumulator;
+
+        final BinaryOperator<A> combiner;
+
+        A container;
+
+        boolean done;
+
+        ParallelCollectorInnerSubscriber(ParallelCollectorSubscriber<T, A, R> parent, A container, BiConsumer<A, T> accumulator, BinaryOperator<A> combiner) {
+            this.parent = parent;
+            this.accumulator = accumulator;
+            this.combiner = combiner;
+            this.container = container;
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            SubscriptionHelper.setOnce(this, s, Long.MAX_VALUE);
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (!done) {
+                try {
+                    accumulator.accept(container, t);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    get().cancel();
+                    onError(ex);
+                    return;
+                }
+            }
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (done) {
+                RxJavaPlugins.onError(t);
+                return;
+            }
+            container = null;
+            done = true;
+            parent.innerError(t);
+        }
+
+        @Override
+        public void onComplete() {
+            if (!done) {
+                A v = container;
+                container = null;
+                done = true;
+                parent.innerComplete(v, combiner);
+            }
+        }
+
+        void cancel() {
+            SubscriptionHelper.cancel(this);
+        }
+    }
+
+    static final class SlotPair<T> extends AtomicInteger {
+
+        private static final long serialVersionUID = 473971317683868662L;
+
+        T first;
+
+        T second;
+
+        final AtomicInteger releaseIndex = new AtomicInteger();
+
+        int tryAcquireSlot() {
+            for (;;) {
+                int acquired = get();
+                if (acquired >= 2) {
+                    return -1;
+                }
+
+                if (compareAndSet(acquired, acquired + 1)) {
+                    return acquired;
+                }
+            }
+        }
+
+        boolean releaseSlot() {
+            return releaseIndex.incrementAndGet() == 2;
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStream.java
new file mode 100644
index 0000000000..3f38d1fec3
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStream.java
@@ -0,0 +1,69 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.Stream;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+
+/**
+ * Flattens the generated {@link Stream}s on each rail.
+ *
+ * @param <T> the input value type
+ * @param <R> the output value type
+ * @since 3.0.0
+ */
+public final class ParallelFlatMapStream<T, R> extends ParallelFlowable<R> {
+
+    final ParallelFlowable<T> source;
+
+    final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+    final int prefetch;
+
+    public ParallelFlatMapStream(
+            ParallelFlowable<T> source,
+            Function<? super T, ? extends Stream<? extends R>> mapper,
+            int prefetch) {
+        this.source = source;
+        this.mapper = mapper;
+        this.prefetch = prefetch;
+    }
+
+    @Override
+    public int parallelism() {
+        return source.parallelism();
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super R>[] subscribers) {
+        if (!validate(subscribers)) {
+            return;
+        }
+
+        int n = subscribers.length;
+
+        @SuppressWarnings("unchecked")
+        final Subscriber<T>[] parents = new Subscriber[n];
+
+        for (int i = 0; i < n; i++) {
+            parents[i] = FlowableFlatMapStream.subscribe(subscribers[i], mapper, prefetch);
+        }
+
+        source.subscribe(parents);
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java
new file mode 100644
index 0000000000..350f59f2b2
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java
@@ -0,0 +1,236 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Maps each 'rail' of the source ParallelFlowable with a mapper function.
+ *
+ * @param <T> the input value type
+ * @param <R> the output value type
+ * @since 3.0.0
+ */
+public final class ParallelMapOptional<T, R> extends ParallelFlowable<R> {
+
+    final ParallelFlowable<T> source;
+
+    final Function<? super T, Optional<? extends R>> mapper;
+
+    public ParallelMapOptional(ParallelFlowable<T> source, Function<? super T, Optional<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super R>[] subscribers) {
+        if (!validate(subscribers)) {
+            return;
+        }
+
+        int n = subscribers.length;
+        @SuppressWarnings("unchecked")
+        Subscriber<? super T>[] parents = new Subscriber[n];
+
+        for (int i = 0; i < n; i++) {
+            Subscriber<? super R> a = subscribers[i];
+            if (a instanceof ConditionalSubscriber) {
+                parents[i] = new ParallelMapConditionalSubscriber<>((ConditionalSubscriber<? super R>)a, mapper);
+            } else {
+                parents[i] = new ParallelMapSubscriber<>(a, mapper);
+            }
+        }
+
+        source.subscribe(parents);
+    }
+
+    @Override
+    public int parallelism() {
+        return source.parallelism();
+    }
+
+    static final class ParallelMapSubscriber<T, R> implements ConditionalSubscriber<T>, Subscription {
+
+        final Subscriber<? super R> downstream;
+
+        final Function<? super T, Optional<? extends R>> mapper;
+
+        Subscription upstream;
+
+        boolean done;
+
+        ParallelMapSubscriber(Subscriber<? super R> actual, Function<? super T, Optional<? extends R>> mapper) {
+            this.downstream = actual;
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void request(long n) {
+            upstream.request(n);
+        }
+
+        @Override
+        public void cancel() {
+            upstream.cancel();
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            if (SubscriptionHelper.validate(this.upstream, s)) {
+                this.upstream = s;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (!tryOnNext(t)) {
+                upstream.request(1);
+            }
+        }
+
+        @Override
+        public boolean tryOnNext(T t) {
+            if (done) {
+                return true;
+            }
+            Optional<? extends R> v;
+
+            try {
+                v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Optional");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                cancel();
+                onError(ex);
+                return true;
+            }
+
+            if (v.isPresent()) {
+                downstream.onNext(v.get());
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (done) {
+                RxJavaPlugins.onError(t);
+                return;
+            }
+            done = true;
+            downstream.onError(t);
+        }
+
+        @Override
+        public void onComplete() {
+            if (done) {
+                return;
+            }
+            done = true;
+            downstream.onComplete();
+        }
+
+    }
+    static final class ParallelMapConditionalSubscriber<T, R> implements ConditionalSubscriber<T>, Subscription {
+
+        final ConditionalSubscriber<? super R> downstream;
+
+        final Function<? super T, Optional<? extends R>> mapper;
+
+        Subscription upstream;
+
+        boolean done;
+
+        ParallelMapConditionalSubscriber(ConditionalSubscriber<? super R> actual, Function<? super T, Optional<? extends R>> mapper) {
+            this.downstream = actual;
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void request(long n) {
+            upstream.request(n);
+        }
+
+        @Override
+        public void cancel() {
+            upstream.cancel();
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            if (SubscriptionHelper.validate(this.upstream, s)) {
+                this.upstream = s;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (!tryOnNext(t)) {
+                upstream.request(1);
+            }
+        }
+
+        @Override
+        public boolean tryOnNext(T t) {
+            if (done) {
+                return false;
+            }
+            Optional<? extends R> v;
+
+            try {
+                v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null value");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                cancel();
+                onError(ex);
+                return false;
+            }
+
+            return v.isPresent() && downstream.tryOnNext(v.get());
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (done) {
+                RxJavaPlugins.onError(t);
+                return;
+            }
+            done = true;
+            downstream.onError(t);
+        }
+
+        @Override
+        public void onComplete() {
+            if (done) {
+                return;
+            }
+            done = true;
+            downstream.onComplete();
+        }
+
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java
new file mode 100644
index 0000000000..a2d454c994
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java
@@ -0,0 +1,306 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.parallel.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Maps each 'rail' of the source ParallelFlowable with a mapper function
+ * and handle any failure based on a handler function.
+ * @param <T> the input value type
+ * @param <R> the output value type
+ * @since 3.0.0
+ */
+public final class ParallelMapTryOptional<T, R> extends ParallelFlowable<R> {
+
+    final ParallelFlowable<T> source;
+
+    final Function<? super T, Optional<? extends R>> mapper;
+
+    final BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler;
+
+    public ParallelMapTryOptional(
+            ParallelFlowable<T> source,
+            Function<? super T, Optional<? extends R>> mapper,
+            BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
+        this.source = source;
+        this.mapper = mapper;
+        this.errorHandler = errorHandler;
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super R>[] subscribers) {
+        if (!validate(subscribers)) {
+            return;
+        }
+
+        int n = subscribers.length;
+        @SuppressWarnings("unchecked")
+        Subscriber<? super T>[] parents = new Subscriber[n];
+
+        for (int i = 0; i < n; i++) {
+            Subscriber<? super R> a = subscribers[i];
+            if (a instanceof ConditionalSubscriber) {
+                parents[i] = new ParallelMapTryConditionalSubscriber<>((ConditionalSubscriber<? super R>)a, mapper, errorHandler);
+            } else {
+                parents[i] = new ParallelMapTrySubscriber<>(a, mapper, errorHandler);
+            }
+        }
+
+        source.subscribe(parents);
+    }
+
+    @Override
+    public int parallelism() {
+        return source.parallelism();
+    }
+
+    static final class ParallelMapTrySubscriber<T, R> implements ConditionalSubscriber<T>, Subscription {
+
+        final Subscriber<? super R> downstream;
+
+        final Function<? super T, Optional<? extends R>> mapper;
+
+        final BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler;
+
+        Subscription upstream;
+
+        boolean done;
+
+        ParallelMapTrySubscriber(Subscriber<? super R> actual,
+                Function<? super T, Optional<? extends R>> mapper,
+                BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
+            this.downstream = actual;
+            this.mapper = mapper;
+            this.errorHandler = errorHandler;
+        }
+
+        @Override
+        public void request(long n) {
+            upstream.request(n);
+        }
+
+        @Override
+        public void cancel() {
+            upstream.cancel();
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            if (SubscriptionHelper.validate(this.upstream, s)) {
+                this.upstream = s;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (!tryOnNext(t) && !done) {
+                upstream.request(1);
+            }
+        }
+
+        @Override
+        public boolean tryOnNext(T t) {
+            if (done) {
+                return false;
+            }
+            long retries = 0;
+
+            for (;;) {
+                Optional<? extends R> v;
+
+                try {
+                    v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Optional");
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+
+                    ParallelFailureHandling h;
+
+                    try {
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null ParallelFailureHandling");
+                    } catch (Throwable exc) {
+                        Exceptions.throwIfFatal(exc);
+                        cancel();
+                        onError(new CompositeException(ex, exc));
+                        return false;
+                    }
+
+                    switch (h) {
+                    case RETRY:
+                        continue;
+                    case SKIP:
+                        return false;
+                    case STOP:
+                        cancel();
+                        onComplete();
+                        return false;
+                    default:
+                        cancel();
+                        onError(ex);
+                        return false;
+                    }
+                }
+
+                if (v.isPresent()) {
+                    downstream.onNext(v.get());
+                    return true;
+                }
+                return false;
+            }
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (done) {
+                RxJavaPlugins.onError(t);
+                return;
+            }
+            done = true;
+            downstream.onError(t);
+        }
+
+        @Override
+        public void onComplete() {
+            if (done) {
+                return;
+            }
+            done = true;
+            downstream.onComplete();
+        }
+
+    }
+    static final class ParallelMapTryConditionalSubscriber<T, R> implements ConditionalSubscriber<T>, Subscription {
+
+        final ConditionalSubscriber<? super R> downstream;
+
+        final Function<? super T, Optional<? extends R>> mapper;
+
+        final BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler;
+
+        Subscription upstream;
+
+        boolean done;
+
+        ParallelMapTryConditionalSubscriber(ConditionalSubscriber<? super R> actual,
+                Function<? super T, Optional<? extends R>> mapper,
+                BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
+            this.downstream = actual;
+            this.mapper = mapper;
+            this.errorHandler = errorHandler;
+        }
+
+        @Override
+        public void request(long n) {
+            upstream.request(n);
+        }
+
+        @Override
+        public void cancel() {
+            upstream.cancel();
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            if (SubscriptionHelper.validate(this.upstream, s)) {
+                this.upstream = s;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onNext(T t) {
+            if (!tryOnNext(t) && !done) {
+                upstream.request(1);
+            }
+        }
+
+        @Override
+        public boolean tryOnNext(T t) {
+            if (done) {
+                return false;
+            }
+            long retries = 0;
+
+            for (;;) {
+                Optional<? extends R> v;
+
+                try {
+                    v = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Optional");
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+
+                    ParallelFailureHandling h;
+
+                    try {
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null ParallelFailureHandling");
+                    } catch (Throwable exc) {
+                        Exceptions.throwIfFatal(exc);
+                        cancel();
+                        onError(new CompositeException(ex, exc));
+                        return false;
+                    }
+
+                    switch (h) {
+                    case RETRY:
+                        continue;
+                    case SKIP:
+                        return false;
+                    case STOP:
+                        cancel();
+                        onComplete();
+                        return false;
+                    default:
+                        cancel();
+                        onError(ex);
+                        return false;
+                    }
+                }
+
+                return v.isPresent() && downstream.tryOnNext(v.get());
+            }
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            if (done) {
+                RxJavaPlugins.onError(t);
+                return;
+            }
+            done = true;
+            downstream.onError(t);
+        }
+
+        @Override
+        public void onComplete() {
+            if (done) {
+                return;
+            }
+            done = true;
+            downstream.onComplete();
+        }
+
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
index de7221cb38..b275337841 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
@@ -13,8 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
-import java.util.Iterator;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
@@ -80,6 +79,19 @@ public void subscribeActual(Subscriber<? super R> s) {
         source.subscribe(new FlattenIterableSubscriber<T, R>(s, mapper, prefetch));
     }
 
+    /**
+     * Create a {@link Subscriber} with the given parameters.
+     * @param <T> the upstream value type
+     * @param <R> the {@link Iterable} and output value type
+     * @param downstream the downstream {@code Subscriber} to wrap
+     * @param mapper the mapper function
+     * @param prefetch the number of items to prefetch
+     * @return the new {@code Subscriber}
+     */
+    public static <T, R> Subscriber<T> subscribe(Subscriber<? super R> downstream, Function<? super T, ? extends Iterable<? extends R>> mapper, int prefetch) {
+        return new FlattenIterableSubscriber<>(downstream, mapper, prefetch);
+    }
+
     static final class FlattenIterableSubscriber<T, R>
     extends BasicIntQueueSubscription<R>
     implements FlowableSubscriber<T> {
@@ -118,7 +130,7 @@ static final class FlattenIterableSubscriber<T, R>
             this.mapper = mapper;
             this.prefetch = prefetch;
             this.limit = prefetch - (prefetch >> 2);
-            this.error = new AtomicReference<Throwable>();
+            this.error = new AtomicReference<>();
             this.requested = new AtomicLong();
         }
 
@@ -153,7 +165,7 @@ public void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<T>(prefetch);
+                queue = new SpscArrayQueue<>(prefetch);
 
                 downstream.onSubscribe(this);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
index e1da1b76b7..29f9d91674 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
@@ -67,7 +67,7 @@ public void subscribe(Subscriber<? super C>[] subscribers) {
                 return;
             }
 
-            parents[i] = new ParallelCollectSubscriber<T, C>(subscribers[i], initialValue, collector);
+            parents[i] = new ParallelCollectSubscriber<>(subscribers[i], initialValue, collector);
         }
 
         source.subscribe(parents);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
index 557d5282c4..6b3f69ff97 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
@@ -59,9 +59,9 @@ public void subscribe(Subscriber<? super T>[] subscribers) {
         for (int i = 0; i < n; i++) {
             Subscriber<? super T> a = subscribers[i];
             if (a instanceof ConditionalSubscriber) {
-                parents[i] = new ParallelDoOnNextConditionalSubscriber<T>((ConditionalSubscriber<? super T>)a, onNext, errorHandler);
+                parents[i] = new ParallelDoOnNextConditionalSubscriber<>((ConditionalSubscriber<? super T>)a, onNext, errorHandler);
             } else {
-                parents[i] = new ParallelDoOnNextSubscriber<T>(a, onNext, errorHandler);
+                parents[i] = new ParallelDoOnNextSubscriber<>(a, onNext, errorHandler);
             }
         }
 
@@ -134,7 +134,7 @@ public boolean tryOnNext(T t) {
                     ParallelFailureHandling h;
 
                     try {
-                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null ParallelFailureHandling");
                     } catch (Throwable exc) {
                         Exceptions.throwIfFatal(exc);
                         cancel();
@@ -245,7 +245,7 @@ public boolean tryOnNext(T t) {
                     ParallelFailureHandling h;
 
                     try {
-                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null ParallelFailureHandling");
                     } catch (Throwable exc) {
                         Exceptions.throwIfFatal(exc);
                         cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
index 6d1fc2fb96..14f414dce3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
@@ -51,9 +51,9 @@ public void subscribe(Subscriber<? super T>[] subscribers) {
         for (int i = 0; i < n; i++) {
             Subscriber<? super T> a = subscribers[i];
             if (a instanceof ConditionalSubscriber) {
-                parents[i] = new ParallelFilterConditionalSubscriber<T>((ConditionalSubscriber<? super T>)a, predicate);
+                parents[i] = new ParallelFilterConditionalSubscriber<>((ConditionalSubscriber<? super T>)a, predicate);
             } else {
-                parents[i] = new ParallelFilterSubscriber<T>(a, predicate);
+                parents[i] = new ParallelFilterSubscriber<>(a, predicate);
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
index f6eff78249..bfd22ec5a8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
@@ -57,9 +57,9 @@ public void subscribe(Subscriber<? super T>[] subscribers) {
         for (int i = 0; i < n; i++) {
             Subscriber<? super T> a = subscribers[i];
             if (a instanceof ConditionalSubscriber) {
-                parents[i] = new ParallelFilterConditionalSubscriber<T>((ConditionalSubscriber<? super T>)a, predicate, errorHandler);
+                parents[i] = new ParallelFilterConditionalSubscriber<>((ConditionalSubscriber<? super T>)a, predicate, errorHandler);
             } else {
-                parents[i] = new ParallelFilterSubscriber<T>(a, predicate, errorHandler);
+                parents[i] = new ParallelFilterSubscriber<>(a, predicate, errorHandler);
             }
         }
 
@@ -137,7 +137,7 @@ public boolean tryOnNext(T t) {
                         ParallelFailureHandling h;
 
                         try {
-                            h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                            h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null ParallelFailureHandling");
                         } catch (Throwable exc) {
                             Exceptions.throwIfFatal(exc);
                             cancel();
@@ -226,7 +226,7 @@ public boolean tryOnNext(T t) {
                         ParallelFailureHandling h;
 
                         try {
-                            h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                            h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null ParallelFailureHandling");
                         } catch (Throwable exc) {
                             Exceptions.throwIfFatal(exc);
                             cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java
new file mode 100644
index 0000000000..1bb127233f
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.parallel;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableFlattenIterable;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+
+/**
+ * Flattens the generated {@link Iterable}s on each rail.
+ *
+ * @param <T> the input value type
+ * @param <R> the output value type
+ * @since 3.0.0
+ */
+public final class ParallelFlatMapIterable<T, R> extends ParallelFlowable<R> {
+
+    final ParallelFlowable<T> source;
+
+    final Function<? super T, ? extends Iterable<? extends R>> mapper;
+
+    final int prefetch;
+
+    public ParallelFlatMapIterable(
+            ParallelFlowable<T> source,
+            Function<? super T, ? extends Iterable<? extends R>> mapper,
+            int prefetch) {
+        this.source = source;
+        this.mapper = mapper;
+        this.prefetch = prefetch;
+    }
+
+    @Override
+    public int parallelism() {
+        return source.parallelism();
+    }
+
+    @Override
+    public void subscribe(Subscriber<? super R>[] subscribers) {
+        if (!validate(subscribers)) {
+            return;
+        }
+
+        int n = subscribers.length;
+
+        @SuppressWarnings("unchecked")
+        final Subscriber<T>[] parents = new Subscriber[n];
+
+        for (int i = 0; i < n; i++) {
+            parents[i] = FlowableFlattenIterable.subscribe(subscribers[i], mapper, prefetch);
+        }
+
+        source.subscribe(parents);
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
index 126f7cdf13..0d4fb9a4c5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
@@ -55,7 +55,7 @@ public void subscribe(Subscriber<? super T>[] subscribers) {
             return;
         }
 
-        source.subscribe(new ParallelDispatcher<T>(subscribers, prefetch));
+        source.subscribe(new ParallelDispatcher<>(subscribers, prefetch));
     }
 
     static final class ParallelDispatcher<T>
@@ -137,7 +137,7 @@ public void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<T>(prefetch);
+                queue = new SpscArrayQueue<>(prefetch);
 
                 setupSubscribers();
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
index b15fa8dfd5..4545b133f5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
@@ -50,9 +50,9 @@ public ParallelJoin(ParallelFlowable<? extends T> source, int prefetch, boolean
     protected void subscribeActual(Subscriber<? super T> s) {
         JoinSubscriptionBase<T> parent;
         if (delayErrors) {
-            parent = new JoinSubscriptionDelayError<T>(s, source.parallelism(), prefetch);
+            parent = new JoinSubscriptionDelayError<>(s, source.parallelism(), prefetch);
         } else {
-            parent = new JoinSubscription<T>(s, source.parallelism(), prefetch);
+            parent = new JoinSubscription<>(s, source.parallelism(), prefetch);
         }
         s.onSubscribe(parent);
         source.subscribe(parent.subscribers);
@@ -81,7 +81,7 @@ abstract static class JoinSubscriptionBase<T> extends AtomicInteger
             JoinInnerSubscriber<T>[] a = new JoinInnerSubscriber[n];
 
             for (int i = 0; i < n; i++) {
-                a[i] = new JoinInnerSubscriber<T>(this, prefetch);
+                a[i] = new JoinInnerSubscriber<>(this, prefetch);
             }
 
             this.subscribers = a;
@@ -550,7 +550,7 @@ public boolean cancel() {
         SimplePlainQueue<T> getQueue() {
             SimplePlainQueue<T> q = queue;
             if (q == null) {
-                q = new SpscArrayQueue<T>(prefetch);
+                q = new SpscArrayQueue<>(prefetch);
                 this.queue = q;
             }
             return q;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
index ff8da40c62..30250f2e60 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
@@ -137,7 +137,7 @@ public boolean tryOnNext(T t) {
                     ParallelFailureHandling h;
 
                     try {
-                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null ParallelFailureHandling");
                     } catch (Throwable exc) {
                         Exceptions.throwIfFatal(exc);
                         cancel();
@@ -250,7 +250,7 @@ public boolean tryOnNext(T t) {
                     ParallelFailureHandling h;
 
                     try {
-                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null item");
+                        h = Objects.requireNonNull(errorHandler.apply(++retries, ex), "The errorHandler returned a null ParallelFailureHandling");
                     } catch (Throwable exc) {
                         Exceptions.throwIfFatal(exc);
                         cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
index 50f04d46ec..206a2dd472 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
@@ -75,7 +75,7 @@ public void subscribe(Subscriber<? super T>[] subscribers) {
         Subscriber<? super T>[] parents = new Subscriber[n];
 
         for (int i = 0; i < n; i++) {
-            parents[i] = new ParallelPeekSubscriber<T>(subscribers[i], this);
+            parents[i] = new ParallelPeekSubscriber<>(subscribers[i], this);
         }
 
         source.subscribe(parents);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
index 87c02c8922..53fa2b3899 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
@@ -66,7 +66,7 @@ public void subscribe(Subscriber<? super R>[] subscribers) {
                 return;
             }
 
-            parents[i] = new ParallelReduceSubscriber<T, R>(subscribers[i], initialValue, reducer);
+            parents[i] = new ParallelReduceSubscriber<>(subscribers[i], initialValue, reducer);
         }
 
         source.subscribe(parents);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java
index e376c352cb..a47bc5b898 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java
@@ -22,6 +22,7 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
 import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -44,7 +45,7 @@ public ParallelReduceFull(ParallelFlowable<? extends T> source, BiFunction<T, T,
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        ParallelReduceFullMainSubscriber<T> parent = new ParallelReduceFullMainSubscriber<T>(s, source.parallelism(), reducer);
+        ParallelReduceFullMainSubscriber<T> parent = new ParallelReduceFullMainSubscriber<>(s, source.parallelism(), reducer);
         s.onSubscribe(parent);
 
         source.subscribe(parent.subscribers);
@@ -58,18 +59,18 @@ static final class ParallelReduceFullMainSubscriber<T> extends DeferredScalarSub
 
         final BiFunction<T, T, T> reducer;
 
-        final AtomicReference<SlotPair<T>> current = new AtomicReference<SlotPair<T>>();
+        final AtomicReference<SlotPair<T>> current = new AtomicReference<>();
 
         final AtomicInteger remaining = new AtomicInteger();
 
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicThrowable error = new AtomicThrowable();
 
         ParallelReduceFullMainSubscriber(Subscriber<? super T> subscriber, int n, BiFunction<T, T, T> reducer) {
             super(subscriber);
             @SuppressWarnings("unchecked")
             ParallelReduceFullInnerSubscriber<T>[] a = new ParallelReduceFullInnerSubscriber[n];
             for (int i = 0; i < n; i++) {
-                a[i] = new ParallelReduceFullInnerSubscriber<T>(this, reducer);
+                a[i] = new ParallelReduceFullInnerSubscriber<>(this, reducer);
             }
             this.subscribers = a;
             this.reducer = reducer;
@@ -81,7 +82,7 @@ SlotPair<T> addValue(T value) {
                 SlotPair<T> curr = current.get();
 
                 if (curr == null) {
-                    curr = new SlotPair<T>();
+                    curr = new SlotPair<>();
                     if (!current.compareAndSet(null, curr)) {
                         continue;
                     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
index bb6c1fd582..ceb2a7665a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
@@ -75,12 +75,12 @@ void createSubscriber(int i, Subscriber<? super T>[] subscribers,
 
         Subscriber<? super T> a = subscribers[i];
 
-        SpscArrayQueue<T> q = new SpscArrayQueue<T>(prefetch);
+        SpscArrayQueue<T> q = new SpscArrayQueue<>(prefetch);
 
         if (a instanceof ConditionalSubscriber) {
-            parents[i] = new RunOnConditionalSubscriber<T>((ConditionalSubscriber<? super T>)a, prefetch, q, worker);
+            parents[i] = new RunOnConditionalSubscriber<>((ConditionalSubscriber<? super T>)a, prefetch, q, worker);
         } else {
-            parents[i] = new RunOnSubscriber<T>(a, prefetch, q, worker);
+            parents[i] = new RunOnSubscriber<>(a, prefetch, q, worker);
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java
index 0e20b6f2c9..7994abf697 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java
@@ -46,7 +46,7 @@ public ParallelSortedJoin(ParallelFlowable<List<T>> source, Comparator<? super T
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        SortedJoinSubscription<T> parent = new SortedJoinSubscription<T>(s, source.parallelism(), comparator);
+        SortedJoinSubscription<T> parent = new SortedJoinSubscription<>(s, source.parallelism(), comparator);
         s.onSubscribe(parent);
 
         source.subscribe(parent.subscribers);
@@ -74,7 +74,7 @@ static final class SortedJoinSubscription<T>
 
         final AtomicInteger remaining = new AtomicInteger();
 
-        final AtomicReference<Throwable> error = new AtomicReference<Throwable>();
+        final AtomicReference<Throwable> error = new AtomicReference<>();
 
         @SuppressWarnings("unchecked")
         SortedJoinSubscription(Subscriber<? super T> actual, int n, Comparator<? super T> comparator) {
@@ -84,7 +84,7 @@ static final class SortedJoinSubscription<T>
             SortedJoinInnerSubscriber<T>[] s = new SortedJoinInnerSubscriber[n];
 
             for (int i = 0; i < n; i++) {
-                s[i] = new SortedJoinInnerSubscriber<T>(this, i);
+                s[i] = new SortedJoinInnerSubscriber<>(this, i);
             }
             this.subscribers = s;
             this.lists = new List[n];
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index d4dff1cbb0..c8fbf203ef 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.parallel;
 
 import java.util.*;
+import java.util.stream.*;
 
 import org.reactivestreams.*;
 
@@ -21,17 +22,19 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
+import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.operators.parallel.*;
+import io.reactivex.rxjava3.internal.operators.parallel.ParallelReduceFull;
 import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
- * Abstract base class for Parallel publishers that take an array of Subscribers.
+ * Abstract base class for parallel publishing of events signaled to an array of {@link Subscriber}s.
  * <p>
- * Use {@code from()} to start processing a regular Publisher in 'rails'.
- * Use {@code runOn()} to introduce where each 'rail' should run on thread-vise.
- * Use {@code sequential()} to merge the sources back into a single Flowable.
+ * Use {@link #from(Publisher)} to start processing a regular {@link Publisher} in 'rails'.
+ * Use {@link #runOn(Scheduler)} to introduce where each 'rail' should run on thread-vise.
+ * Use {@link #sequential()} to merge the sources back into a single {@link Flowable}.
  *
  * <p>History: 2.0.5 - experimental; 2.1 - beta
  * @param <T> the value type
@@ -173,7 +176,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
      *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the output value type
-     * @param mapper the mapper function turning Ts into Us.
+     * @param mapper the mapper function turning Ts into Rs.
      * @return the new ParallelFlowable instance
      */
     @CheckReturnValue
@@ -199,7 +202,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      * </dl>
      * <p>History: 2.0.8 - experimental
      * @param <R> the output value type
-     * @param mapper the mapper function turning Ts into Us.
+     * @param mapper the mapper function turning Ts into Rs.
      * @param errorHandler the enumeration that defines how to handle errors thrown
      *                     from the mapper function
      * @return the new ParallelFlowable instance
@@ -229,7 +232,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      * </dl>
      * <p>History: 2.0.8 - experimental
      * @param <R> the output value type
-     * @param mapper the mapper function turning Ts into Us.
+     * @param mapper the mapper function turning Ts into Rs.
      * @param errorHandler the function called with the current repeat count and
      *                     failure Throwable and should return one of the {@link ParallelFailureHandling}
      *                     enumeration values to indicate how to proceed.
@@ -1331,4 +1334,297 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
         return RxJavaPlugins.onAssembly(new ParallelConcatMap<>(
                 this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
     }
+
+    /**
+     * Returns a {@code ParallelFlowable} that merges each item emitted by the source on each rail with the values in an
+     * {@link Iterable} corresponding to that item that is generated by a selector.
+     * <p>
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from each downstream rail. The source {@code ParallelFlowable}s is
+     *  expected to honor backpressure as well. If the source {@code ParallelFlowable} violates the rule, the operator will
+     *  signal a {@code MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <U>
+     *            the type of item emitted by the resulting {@code Iterable}
+     * @param mapper
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code ParallelFlowable}
+     * @return the new ParallelFlowable instance
+     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @see #flatMapStream(Function)
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
+        return flatMapIterable(mapper, Flowable.bufferSize());
+    }
+
+    /**
+     * Returns a {@code ParallelFlowable} that merges each item emitted by the source {@code ParallelFlowable} with the values in an
+     * Iterable corresponding to that item that is generated by a selector.
+     * <p>
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from each downstream rail. The source {@code ParallelFlowable}s is
+     *  expected to honor backpressure as well. If the source {@code ParallelFlowable} violates the rule, the operator will
+     *  signal a {@code MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <U>
+     *            the type of item emitted by the resulting {@code Iterable}
+     * @param mapper
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code ParallelFlowable}
+     * @param bufferSize
+     *            the number of elements to prefetch from each upstream rail
+     * @return the new {@code ParallelFlowable} instance
+     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @see #flatMapStream(Function, int)
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int bufferSize) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ParallelFlatMapIterable<>(this, mapper, bufferSize));
+    }
+
+    // -------------------------------------------------------------------------
+    // JDK 8 Support
+    // -------------------------------------------------------------------------
+
+    /**
+     * Maps the source values on each 'rail' to an optional and emits its value if any.
+     * <p>
+     * Note that the same mapper function may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the output value type
+     * @param mapper the mapper function turning Ts into optional of Rs.
+     * @return the new ParallelFlowable instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper");
+        return RxJavaPlugins.onAssembly(new ParallelMapOptional<>(this, mapper));
+    }
+
+    /**
+     * Maps the source values on each 'rail' to an optional and emits its value if any and
+     * handles errors based on the given {@link ParallelFailureHandling} enumeration value.
+     * <p>
+     * Note that the same mapper function may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * <p>History: 2.0.8 - experimental
+     * @param <R> the output value type
+     * @param mapper the mapper function turning Ts into optional of Rs.
+     * @param errorHandler the enumeration that defines how to handle errors thrown
+     *                     from the mapper function
+     * @return the new ParallelFlowable instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<? extends R>> mapper, @NonNull ParallelFailureHandling errorHandler) {
+        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(errorHandler, "errorHandler is null");
+        return RxJavaPlugins.onAssembly(new ParallelMapTryOptional<>(this, mapper, errorHandler));
+    }
+
+    /**
+     * Maps the source values on each 'rail' to an optional and emits its value if any and
+     * handles errors based on the returned value by the handler function.
+     * <p>
+     * Note that the same mapper function may be called from multiple threads concurrently.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator is a pass-through for backpressure and the behavior
+     *  is determined by the upstream and downstream rail behaviors.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * <p>History: 2.0.8 - experimental
+     * @param <R> the output value type
+     * @param mapper the mapper function turning Ts into optional of Rs.
+     * @param errorHandler the function called with the current repeat count and
+     *                     failure Throwable and should return one of the {@link ParallelFailureHandling}
+     *                     enumeration values to indicate how to proceed.
+     * @return the new ParallelFlowable instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<? extends R>> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
+        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(errorHandler, "errorHandler is null");
+        return RxJavaPlugins.onAssembly(new ParallelMapTryOptional<>(this, mapper, errorHandler));
+    }
+
+    /**
+     * Maps each upstream item on each rail into a {@link Stream} and emits the {@code Stream}'s items to the downstream in a sequential fashion.
+     * <p>
+     * <img width="640" height="328" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.f.png" alt="">
+     * <p>
+     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
+     * {@code concatMapStream} are identical operators and are provided as aliases.
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function)}:
+     * <pre><code>
+     * source.flatMapIterable(v -&gt; createStream(v)::iterator);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.flatMapStream(v -&gt; IntStream.rangeClosed(v + 1, v + 10).boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the downstream backpressure and consumes the inner stream only on demand. The operator
+     *  prefetches {@link Flowable#bufferSize()} items of the upstream (then 75% of it after the 75% received)
+     *  and caches them until they are ready to be mapped into {@code Stream}s
+     *  after the current {@code Stream} has been consumed.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMapStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the element type of the {@code Stream}s and the result
+     * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
+     * will be emitted to the downstream
+     * @return the new Flowable instance
+     * @see #flatMap(Function)
+     * @see #flatMapIterable(Function)
+     * @see #flatMapStream(Function, int)
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+        return flatMapStream(mapper, Flowable.bufferSize());
+    }
+
+    /**
+     * Maps each upstream item of each rail into a {@link Stream} and emits the {@code Stream}'s items to the downstream in a sequential fashion.
+     * <p>
+     * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.fi.png" alt="">
+     * <p>
+     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
+     * {@code concatMapStream} are identical operators and are provided as aliases.
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function, int)}:
+     * <pre><code>
+     * source.flatMapIterable(v -&gt; createStream(v)::iterator, 32);
+     * </code></pre>
+     * <p>
+     * Note that {@code Stream}s can be consumed only once; any subsequent attempt to consume a {@code Stream}
+     * will result in an {@link IllegalStateException}.
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.flatMapStream(v -&gt; IntStream.rangeClosed(v + 1, v + 10).boxed(), 32);
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors the downstream backpressure and consumes the inner stream only on demand. The operator
+     *  prefetches the given amount of upstream items and caches them until they are ready to be mapped into {@code Stream}s
+     *  after the current {@code Stream} has been consumed.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMapStream} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the element type of the {@code Stream}s and the result
+     * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
+     * will be emitted to the downstream
+     * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
+     * @return the new Flowable instance
+     * @see #flatMap(Function, boolean, int)
+     * @see #flatMapIterable(Function, int)
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper, int prefetch) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        ObjectHelper.verifyPositive(prefetch, "prefetch");
+        return RxJavaPlugins.onAssembly(new ParallelFlatMapStream<>(this, mapper, prefetch));
+    }
+
+    /**
+     * Reduces all values within a 'rail' and across 'rails' with a callbacks
+     * of the given {@link Collector} into a single sequential value.
+     * <p>
+     * Each parallel rail receives its own {@link Collector#accumulator()} and
+     * {@link Collector#combiner()}.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from the downstream and consumes
+     *  the upstream rails in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code collect} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <A> the accumulator type
+     * @param <R> the output value type
+     * @param collector the {@code Collector} instance
+     * @return the new Flowable instance emitting the collected value.
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <A, R> Flowable<R> collect(@NonNull Collector<T, A, R> collector) {
+        Objects.requireNonNull(collector, "collector is null");
+        return RxJavaPlugins.onAssembly(new ParallelCollector<>(this, collector));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java
new file mode 100644
index 0000000000..8e558a0048
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java
@@ -0,0 +1,305 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.function.*;
+import java.util.stream.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.parallel.ParallelInvalid;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.BehaviorProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class ParallelCollectorTest extends RxJavaTest {
+
+    static Set<Integer> set(int count) {
+        return IntStream.rangeClosed(1, count)
+                .boxed()
+                .collect(Collectors.toSet());
+    }
+
+    @Test
+    public void basic() {
+        TestSubscriberEx<List<Integer>> ts = Flowable.range(1, 5)
+        .parallel()
+        .collect(Collectors.toList())
+        .subscribeWith(new TestSubscriberEx<>());
+
+        ts
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+
+        assertEquals(5, ts.values().get(0).size());
+        assertTrue(ts.values().get(0).containsAll(set(5)));
+    }
+
+    @Test
+    public void empty() {
+        Flowable.empty()
+        .parallel()
+        .collect(Collectors.toList())
+        .test()
+        .assertResult(Collections.emptyList());
+    }
+
+    @Test
+    public void error() {
+        Flowable.error(new TestException())
+        .parallel()
+        .collect(Collectors.toList())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorSupplierCrash() {
+        Flowable.range(1, 5)
+        .parallel()
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                throw new TestException();
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorAccumulatorCrash() {
+        BehaviorProcessor<Integer> source = BehaviorProcessor.createDefault(1);
+
+        source
+        .parallel()
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> { throw new TestException(); };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(source.hasSubscribers());
+    }
+
+    @Test
+    public void collectorCombinerCrash() {
+        Flowable.range(1, 5)
+        .parallel()
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> {  };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> { throw new TestException(); };
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> a;
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void collectorFinisherCrash() {
+        Flowable.range(1, 5)
+        .parallel()
+        .collect(new Collector<Integer, Integer, Integer>() {
+
+            @Override
+            public Supplier<Integer> supplier() {
+                return () -> 1;
+            }
+
+            @Override
+            public BiConsumer<Integer, Integer> accumulator() {
+                return (a, b) -> {  };
+            }
+
+            @Override
+            public BinaryOperator<Integer> combiner() {
+                return (a, b) -> a + b;
+            }
+
+            @Override
+            public Function<Integer, Integer> finisher() {
+                return a -> { throw new TestException(); };
+            }
+
+            @Override
+            public Set<Characteristics> characteristics() {
+                return Collections.emptySet();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void async() {
+        for (int i = 1; i < 32; i++) {
+            TestSubscriber<List<Integer>> ts = Flowable.range(1, 1000)
+            .parallel(i)
+            .runOn(Schedulers.computation())
+            .collect(Collectors.toList())
+            .test()
+            .withTag("Parallelism: " + i)
+            .awaitDone(5, TimeUnit.SECONDS)
+            .assertValueCount(1)
+            .assertNoErrors()
+            .assertComplete();
+
+            assertEquals(1000, ts.values().get(0).size());
+
+            assertTrue(ts.values().get(0).containsAll(set(1000)));
+        }
+    }
+
+    @Test
+    public void asyncHidden() {
+        for (int i = 1; i < 32; i++) {
+            TestSubscriber<List<Integer>> ts = Flowable.range(1, 1000)
+            .hide()
+            .parallel(i)
+            .runOn(Schedulers.computation())
+            .collect(Collectors.toList())
+            .test()
+            .withTag("Parallelism: " + i)
+            .awaitDone(5, TimeUnit.SECONDS)
+            .assertValueCount(1)
+            .assertNoErrors()
+            .assertComplete();
+
+            assertEquals(1000, ts.values().get(0).size());
+
+            assertTrue(ts.values().get(0).containsAll(set(1000)));
+        }
+    }
+
+    @Test
+    public void doubleError() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            new ParallelInvalid()
+            .collect(Collectors.toList())
+            .test()
+            .assertFailure(TestException.class);
+
+            assertFalse(errors.isEmpty());
+            for (Throwable ex : errors) {
+                assertTrue(ex.toString(), ex.getCause() instanceof TestException);
+            }
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void asyncSum() {
+        long n = 1_000;
+        for (int i = 1; i < 32; i++) {
+            Flowable.rangeLong(1, n)
+            .parallel(i)
+            .runOn(Schedulers.computation())
+            .collect(Collectors.summingLong(v -> v))
+            .test()
+            .withTag("Parallelism: " + i)
+            .awaitDone(5, TimeUnit.SECONDS)
+            .assertResult(n * (n + 1) / 2);
+        }
+    }
+
+    @Test
+    public void asyncSumLong() {
+        long n = 1_000_000;
+        Flowable.rangeLong(1, n)
+        .parallel()
+        .runOn(Schedulers.computation())
+        .collect(Collectors.summingLong(v -> v))
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertResult(n * (n + 1) / 2);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStreamTest.java
new file mode 100644
index 0000000000..0f39d4c842
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStreamTest.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.Stream;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.parallel.ParallelFlowableTest;
+
+public class ParallelFlatMapStreamTest extends RxJavaTest {
+
+    @Test
+    public void subscriberCount() {
+        ParallelFlowableTest.checkSubscriberCount(Flowable.range(1, 5).parallel()
+        .flatMapStream(v -> Stream.of(1, 2, 3)));
+    }
+
+    @Test
+    public void normal() {
+        for (int i = 1; i < 32; i++) {
+            Flowable.range(1, 1000)
+            .parallel(i)
+            .flatMapStream(v -> Stream.of(v, v + 1))
+            .sequential()
+            .test()
+            .withTag("Parallelism: " + i)
+            .assertValueCount(2000)
+            .assertNoErrors()
+            .assertComplete();
+        }
+    }
+
+    @Test
+    public void none() {
+        for (int i = 1; i < 32; i++) {
+            Flowable.range(1, 1000)
+            .parallel(i)
+            .flatMapStream(v -> Stream.of())
+            .sequential()
+            .test()
+            .withTag("Parallelism: " + i)
+            .assertResult();
+        }
+    }
+
+    @Test
+    public void mixed() {
+        for (int i = 1; i < 32; i++) {
+            Flowable.range(1, 1000)
+            .parallel(i)
+            .flatMapStream(v -> v % 2 == 0 ? Stream.of(v) : Stream.of())
+            .sequential()
+            .test()
+            .withTag("Parallelism: " + i)
+            .assertValueCount(500)
+            .assertNoErrors()
+            .assertComplete();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptionalTest.java
new file mode 100644
index 0000000000..67cab4087e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptionalTest.java
@@ -0,0 +1,228 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.parallel.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class ParallelMapOptionalTest extends RxJavaTest {
+
+    @Test
+    public void doubleFilter() {
+        Flowable.range(1, 10)
+        .parallel()
+        .mapOptional(Optional::of)
+        .filter(new Predicate<Integer>() {
+            @Override
+            public boolean test(Integer v) throws Exception {
+                return v % 2 == 0;
+            }
+        })
+        .filter(new Predicate<Integer>() {
+            @Override
+            public boolean test(Integer v) throws Exception {
+                return v % 3 == 0;
+            }
+        })
+        .sequential()
+        .test()
+        .assertResult(6);
+    }
+
+    @Test
+    public void doubleFilterAsync() {
+        Flowable.range(1, 10)
+        .parallel()
+        .runOn(Schedulers.computation())
+        .mapOptional(Optional::of)
+        .filter(new Predicate<Integer>() {
+            @Override
+            public boolean test(Integer v) throws Exception {
+                return v % 2 == 0;
+            }
+        })
+        .filter(new Predicate<Integer>() {
+            @Override
+            public boolean test(Integer v) throws Exception {
+                return v % 3 == 0;
+            }
+        })
+        .sequential()
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertResult(6);
+    }
+
+    @Test
+    public void doubleError() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            new ParallelInvalid()
+            .mapOptional(Optional::of)
+            .sequential()
+            .test()
+            .assertFailure(TestException.class);
+
+            assertFalse(errors.isEmpty());
+            for (Throwable ex : errors) {
+                assertTrue(ex.toString(), ex.getCause() instanceof TestException);
+            }
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void doubleError2() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            new ParallelInvalid()
+            .mapOptional(Optional::of)
+            .filter(Functions.alwaysTrue())
+            .sequential()
+            .test()
+            .assertFailure(TestException.class);
+
+            assertFalse(errors.isEmpty());
+            for (Throwable ex : errors) {
+                assertTrue(ex.toString(), ex.getCause() instanceof TestException);
+            }
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void error() {
+        Flowable.error(new TestException())
+        .parallel()
+        .mapOptional(Optional::of)
+        .sequential()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mapCrash() {
+        Flowable.just(1)
+        .parallel()
+        .mapOptional(v -> { throw new TestException(); })
+        .sequential()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mapCrashConditional() {
+        Flowable.just(1)
+        .parallel()
+        .mapOptional(v -> { throw new TestException(); })
+        .filter(Functions.alwaysTrue())
+        .sequential()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mapCrashConditional2() {
+        Flowable.just(1)
+        .parallel()
+        .runOn(Schedulers.computation())
+        .mapOptional(v -> { throw new TestException(); })
+        .filter(Functions.alwaysTrue())
+        .sequential()
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void allNone() {
+        Flowable.range(1, 1000)
+        .parallel()
+        .mapOptional(v -> Optional.empty())
+        .sequential()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void allNoneConditional() {
+        Flowable.range(1, 1000)
+        .parallel()
+        .mapOptional(v -> Optional.empty())
+        .filter(v -> true)
+        .sequential()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void mixed() {
+        Flowable.range(1, 1000)
+        .parallel()
+        .mapOptional(v -> v % 2 == 0 ? Optional.of(v) : Optional.empty())
+        .sequential()
+        .test()
+        .assertValueCount(500)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void mixedConditional() {
+        Flowable.range(1, 1000)
+        .parallel()
+        .mapOptional(v -> v % 2 == 0 ? Optional.of(v) : Optional.empty())
+        .filter(v -> true)
+        .sequential()
+        .test()
+        .assertValueCount(500)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void invalidSubscriberCount() {
+        TestHelper.checkInvalidParallelSubscribers(
+                Flowable.range(1, 10).parallel()
+                .mapOptional(Optional::of)
+            );
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeParallel(
+                p -> p.mapOptional(Optional::of)
+            );
+
+        TestHelper.checkDoubleOnSubscribeParallel(
+                p -> p.mapOptional(Optional::of)
+                .filter(v -> true)
+            );
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptionalTest.java
new file mode 100644
index 0000000000..b7cae91568
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptionalTest.java
@@ -0,0 +1,378 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.parallel.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class ParallelMapTryOptionalTest extends RxJavaTest implements Consumer<Object> {
+
+    volatile int calls;
+
+    @Override
+    public void accept(Object t) throws Exception {
+        calls++;
+    }
+
+    @Test
+    public void mapNoError() {
+        for (ParallelFailureHandling e : ParallelFailureHandling.values()) {
+            Flowable.just(1)
+            .parallel(1)
+            .mapOptional(Optional::of, e)
+            .sequential()
+            .test()
+            .assertResult(1);
+        }
+    }
+
+    @Test
+    public void mapErrorNoError() {
+        for (ParallelFailureHandling e : ParallelFailureHandling.values()) {
+            Flowable.<Integer>error(new TestException())
+            .parallel(1)
+            .mapOptional(Optional::of, e)
+            .sequential()
+            .test()
+            .assertFailure(TestException.class);
+        }
+    }
+
+    @Test
+    public void mapConditionalNoError() {
+        for (ParallelFailureHandling e : ParallelFailureHandling.values()) {
+            Flowable.just(1)
+            .parallel(1)
+            .mapOptional(Optional::of, e)
+            .filter(Functions.alwaysTrue())
+            .sequential()
+            .test()
+            .assertResult(1);
+        }
+    }
+
+    @Test
+    public void mapErrorConditionalNoError() {
+        for (ParallelFailureHandling e : ParallelFailureHandling.values()) {
+            Flowable.<Integer>error(new TestException())
+            .parallel(1)
+            .mapOptional(Optional::of, e)
+            .filter(Functions.alwaysTrue())
+            .sequential()
+            .test()
+            .assertFailure(TestException.class);
+        }
+    }
+
+    @Test
+    public void mapFailWithError() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), ParallelFailureHandling.ERROR)
+        .sequential()
+        .test()
+        .assertFailure(ArithmeticException.class);
+    }
+
+    @Test
+    public void mapFailWithStop() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), ParallelFailureHandling.STOP)
+        .sequential()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void mapFailWithRetry() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(new Function<Integer, Optional<? extends Integer>>() {
+            int count;
+            @Override
+            public Optional<? extends Integer> apply(Integer v) throws Exception {
+                if (count++ == 1) {
+                    return Optional.of(-1);
+                }
+                return Optional.of(1 / v);
+            }
+        }, ParallelFailureHandling.RETRY)
+        .sequential()
+        .test()
+        .assertResult(-1, 1);
+    }
+
+    @Test
+    public void mapFailWithRetryLimited() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), new BiFunction<Long, Throwable, ParallelFailureHandling>() {
+            @Override
+            public ParallelFailureHandling apply(Long n, Throwable e) throws Exception {
+                return n < 5 ? ParallelFailureHandling.RETRY : ParallelFailureHandling.SKIP;
+            }
+        })
+        .sequential()
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void mapFailWithSkip() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), ParallelFailureHandling.SKIP)
+        .sequential()
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void mapFailHandlerThrows() {
+        TestSubscriberEx<Integer> ts = Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), new BiFunction<Long, Throwable, ParallelFailureHandling>() {
+            @Override
+            public ParallelFailureHandling apply(Long n, Throwable e) throws Exception {
+                throw new TestException();
+            }
+        })
+        .sequential()
+        .to(TestHelper.<Integer>testConsumer())
+        .assertFailure(CompositeException.class);
+
+        TestHelper.assertCompositeExceptions(ts, ArithmeticException.class, TestException.class);
+    }
+
+    @Test
+    public void mapInvalidSource() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            new ParallelInvalid()
+            .mapOptional(Optional::of, ParallelFailureHandling.ERROR)
+            .sequential()
+            .test();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void mapFailWithErrorConditional() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), ParallelFailureHandling.ERROR)
+        .filter(Functions.alwaysTrue())
+        .sequential()
+        .test()
+        .assertFailure(ArithmeticException.class);
+    }
+
+    @Test
+    public void mapFailWithStopConditional() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), ParallelFailureHandling.STOP)
+        .filter(Functions.alwaysTrue())
+        .sequential()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void mapFailWithRetryConditional() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(new Function<Integer, Optional<? extends Integer>>() {
+            int count;
+            @Override
+            public Optional<? extends Integer> apply(Integer v) throws Exception {
+                if (count++ == 1) {
+                    return Optional.of(-1);
+                }
+                return Optional.of(1 / v);
+            }
+        }, ParallelFailureHandling.RETRY)
+        .filter(Functions.alwaysTrue())
+        .sequential()
+        .test()
+        .assertResult(-1, 1);
+    }
+
+    @Test
+    public void mapFailWithRetryLimitedConditional() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), new BiFunction<Long, Throwable, ParallelFailureHandling>() {
+            @Override
+            public ParallelFailureHandling apply(Long n, Throwable e) throws Exception {
+                return n < 5 ? ParallelFailureHandling.RETRY : ParallelFailureHandling.SKIP;
+            }
+        })
+        .filter(Functions.alwaysTrue())
+        .sequential()
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void mapFailWithSkipConditional() {
+        Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), ParallelFailureHandling.SKIP)
+        .filter(Functions.alwaysTrue())
+        .sequential()
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void mapFailHandlerThrowsConditional() {
+        TestSubscriberEx<Integer> ts = Flowable.range(0, 2)
+        .parallel(1)
+        .mapOptional(v -> Optional.of(1 / v), new BiFunction<Long, Throwable, ParallelFailureHandling>() {
+            @Override
+            public ParallelFailureHandling apply(Long n, Throwable e) throws Exception {
+                throw new TestException();
+            }
+        })
+        .filter(Functions.alwaysTrue())
+        .sequential()
+        .to(TestHelper.<Integer>testConsumer())
+        .assertFailure(CompositeException.class);
+
+        TestHelper.assertCompositeExceptions(ts, ArithmeticException.class, TestException.class);
+    }
+
+    @Test
+    public void mapWrongParallelismConditional() {
+        TestHelper.checkInvalidParallelSubscribers(
+            Flowable.just(1).parallel(1)
+            .mapOptional(Optional::of, ParallelFailureHandling.ERROR)
+            .filter(Functions.alwaysTrue())
+        );
+    }
+
+    @Test
+    public void mapInvalidSourceConditional() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            new ParallelInvalid()
+            .mapOptional(Optional::of, ParallelFailureHandling.ERROR)
+            .filter(Functions.alwaysTrue())
+            .sequential()
+            .test();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void failureHandlingEnum() {
+        TestHelper.checkEnum(ParallelFailureHandling.class);
+    }
+
+    @Test
+    public void allNone() {
+        Flowable.range(1, 1000)
+        .parallel()
+        .mapOptional(v -> Optional.empty(), ParallelFailureHandling.SKIP)
+        .sequential()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void allNoneConditional() {
+        Flowable.range(1, 1000)
+        .parallel()
+        .mapOptional(v -> Optional.empty(), ParallelFailureHandling.SKIP)
+        .filter(v -> true)
+        .sequential()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void mixed() {
+        Flowable.range(1, 1000)
+        .parallel()
+        .mapOptional(v -> v % 2 == 0 ? Optional.of(v) : Optional.empty(), ParallelFailureHandling.SKIP)
+        .sequential()
+        .test()
+        .assertValueCount(500)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void mixedConditional() {
+        Flowable.range(1, 1000)
+        .parallel()
+        .mapOptional(v -> v % 2 == 0 ? Optional.of(v) : Optional.empty(), ParallelFailureHandling.SKIP)
+        .filter(v -> true)
+        .sequential()
+        .test()
+        .assertValueCount(500)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void mixedConditional2() {
+        Flowable.range(1, 1000)
+        .parallel()
+        .mapOptional(v -> v % 2 == 0 ? Optional.of(v) : Optional.empty(), ParallelFailureHandling.SKIP)
+        .filter(v -> v % 4 == 0)
+        .sequential()
+        .test()
+        .assertValueCount(250)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void invalidSubscriberCount() {
+        TestHelper.checkInvalidParallelSubscribers(
+                Flowable.range(1, 10).parallel()
+                .mapOptional(Optional::of, ParallelFailureHandling.SKIP)
+            );
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeParallel(
+                p -> p.mapOptional(Optional::of, ParallelFailureHandling.ERROR)
+            );
+
+        TestHelper.checkDoubleOnSubscribeParallel(
+                p -> p.mapOptional(Optional::of, ParallelFailureHandling.ERROR)
+                .filter(v -> true)
+            );
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java
new file mode 100644
index 0000000000..916d3651b9
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.parallel;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+
+public class ParallelFlatMapIterableTest extends RxJavaTest {
+
+    @Test
+    public void subscriberCount() {
+        ParallelFlowableTest.checkSubscriberCount(Flowable.range(1, 5).parallel()
+        .flatMapStream(v -> Stream.of(1, 2, 3)));
+    }
+
+    @Test
+    public void normal() {
+        for (int i = 1; i < 32; i++) {
+            Flowable.range(1, 1000)
+            .parallel(i)
+            .flatMapIterable(v -> Arrays.asList(v, v + 1))
+            .sequential()
+            .test()
+            .withTag("Parallelism: " + i)
+            .assertValueCount(2000)
+            .assertNoErrors()
+            .assertComplete();
+        }
+    }
+
+    @Test
+    public void none() {
+        for (int i = 1; i < 32; i++) {
+            Flowable.range(1, 1000)
+            .parallel(i)
+            .flatMapIterable(v -> Arrays.asList())
+            .sequential()
+            .test()
+            .withTag("Parallelism: " + i)
+            .assertResult();
+        }
+    }
+
+    @Test
+    public void mixed() {
+        for (int i = 1; i < 32; i++) {
+            Flowable.range(1, 1000)
+            .parallel(i)
+            .flatMapIterable(v -> v % 2 == 0 ? Arrays.asList(v) : Arrays.asList())
+            .sequential()
+            .test()
+            .withTag("Parallelism: " + i)
+            .assertValueCount(500)
+            .assertNoErrors()
+            .assertComplete();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
index c8e850daf1..e45034d416 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
@@ -15,7 +15,7 @@
 
 import static org.junit.Assert.*;
 
-import java.util.List;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
@@ -179,4 +179,24 @@ public Object apply(Integer v) throws Exception {
         .awaitDone(5, TimeUnit.SECONDS)
         .assertFailure(TestException.class);
     }
+
+    @Test
+    public void invalidSubscriberCount() {
+        TestHelper.checkInvalidParallelSubscribers(
+                Flowable.range(1, 10).parallel()
+                .map(v -> v)
+            );
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeParallel(
+                p -> p.map(v -> v)
+            );
+
+        TestHelper.checkDoubleOnSubscribeParallel(
+                p -> p.map(v -> v)
+                .filter(v -> true)
+            );
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
index b036b2e17f..d56669d755 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
@@ -13,7 +13,7 @@
 
 package io.reactivex.rxjava3.parallel;
 
-import java.util.List;
+import java.util.*;
 
 import org.junit.Test;
 
@@ -353,4 +353,24 @@ public void mapInvalidSourceConditional() {
     public void failureHandlingEnum() {
         TestHelper.checkEnum(ParallelFailureHandling.class);
     }
+
+    @Test
+    public void invalidSubscriberCount() {
+        TestHelper.checkInvalidParallelSubscribers(
+                Flowable.range(1, 10).parallel()
+                .map(v -> v, ParallelFailureHandling.SKIP)
+            );
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeParallel(
+                p -> p.map(v -> v, ParallelFailureHandling.ERROR)
+            );
+
+        TestHelper.checkDoubleOnSubscribeParallel(
+                p -> p.map(v -> v, ParallelFailureHandling.ERROR)
+                .filter(v -> true)
+            );
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index eabbb6f96d..f50354b6a5 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -1421,6 +1421,71 @@ protected void subscribeActual(Subscriber<? super T> subscriber) {
         }
     }
 
+    /**
+     * Check if the given transformed reactive type reports multiple onSubscribe calls to
+     * RxJavaPlugins.
+     * @param <T> the input value type
+     * @param transform the transform to drive an operator
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> void checkDoubleOnSubscribeParallel(Function<ParallelFlowable<T>, ? extends ParallelFlowable<?>> transform) {
+        List<Throwable> errors = trackPluginErrors();
+        try {
+            final Boolean[] b = { null, null, null, null };
+            final CountDownLatch cdl = new CountDownLatch(2);
+
+            ParallelFlowable<T> source = new ParallelFlowable<T>() {
+                @Override
+                public void subscribe(Subscriber<? super T>[] subscribers) {
+                    for (int i = 0; i < subscribers.length; i++) {
+                        try {
+                            BooleanSubscription bs1 = new BooleanSubscription();
+
+                            subscribers[i].onSubscribe(bs1);
+
+                            BooleanSubscription bs2 = new BooleanSubscription();
+
+                            subscribers[i].onSubscribe(bs2);
+
+                            b[i * 2 + 0] = bs1.isCancelled();
+                            b[i * 2 + 1] = bs2.isCancelled();
+                        } finally {
+                            cdl.countDown();
+                        }
+                    }
+                }
+
+                @Override
+                public int parallelism() {
+                    return 2;
+                }
+            };
+
+            ParallelFlowable<?> out = transform.apply(source);
+
+            out.subscribe(new Subscriber[] { NoOpConsumer.INSTANCE, NoOpConsumer.INSTANCE });
+
+            try {
+                assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS));
+            } catch (InterruptedException ex) {
+                throw ExceptionHelper.wrapOrThrow(ex);
+            }
+
+            assertEquals("Rail 1 First disposed?", false, b[0]);
+            assertEquals("Rail 1 Second not disposed?", true, b[1]);
+
+            assertEquals("Rail 2 First disposed?", false, b[2]);
+            assertEquals("Rail 2 Second not disposed?", true, b[3]);
+
+            assertError(errors, 0, IllegalStateException.class, "Subscription already set!");
+            assertError(errors, 1, IllegalStateException.class, "Subscription already set!");
+        } catch (Throwable ex) {
+            throw ExceptionHelper.wrapOrThrow(ex);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
     /**
      * Check if the given transformed reactive type reports multiple onSubscribe calls to
      * RxJavaPlugins.
diff --git a/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java b/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
index c87f19f10e..581e78301b 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
@@ -112,7 +112,14 @@ static void findPattern(int newLines) throws Exception {
                                         fail
                                         .append(fname)
                                         .append("#L").append(i + 1)
-                                        .append("\n");
+                                        .append("\n")
+                                        .append(" at ")
+                                        .append(fname.replace(".java", ""))
+                                        .append(".method(")
+                                        .append(fname)
+                                        .append(":").append(i + 1)
+                                        .append(")\n")
+                                        ;
                                         total++;
                                         i += c;
                                     }
@@ -124,9 +131,7 @@ static void findPattern(int newLines) throws Exception {
             }
         }
         if (total != 0) {
-            fail.append("Found ")
-            .append(total)
-            .append(" instances");
+            fail.insert(0, "Found " + total + " instances\n");
             System.out.println(fail);
             throw new AssertionError(fail.toString());
         }

From 38bcd5e292c9e44c542ff4bbcf8e23736b4a7748 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 26 Dec 2019 23:43:56 +0100
Subject: [PATCH 026/665] 3.x: XProcessor.offer to throw NPE immediately
 (#6799)

---
 .../rxjava3/processors/BehaviorProcessor.java | 19 +++++++++----------
 .../processors/MulticastProcessor.java        | 19 +++++++++++--------
 .../rxjava3/processors/PublishProcessor.java  | 17 ++++++++---------
 .../processors/BehaviorProcessorTest.java     | 12 +++++++-----
 .../processors/MulticastProcessorTest.java    |  7 ++++++-
 .../processors/PublishProcessorTest.java      | 12 +++++++-----
 6 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index ab4c517e65..ea93669ca3 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -234,11 +234,11 @@ public static <T> BehaviorProcessor<T> create() {
      */
     BehaviorProcessor(T defaultValue) {
         this();
-        this.value.lazySet(Objects.requireNonNull(defaultValue, "defaultValue is null"));
+        this.value.lazySet(defaultValue);
     }
 
     @Override
-    protected void subscribeActual(Subscriber<? super T> s) {
+    protected void subscribeActual(@NonNull Subscriber<? super T> s) {
         BehaviorSubscription<T> bs = new BehaviorSubscription<>(s, this);
         s.onSubscribe(bs);
         if (add(bs)) {
@@ -258,7 +258,7 @@ protected void subscribeActual(Subscriber<? super T> s) {
     }
 
     @Override
-    public void onSubscribe(Subscription s) {
+    public void onSubscribe(@NonNull Subscription s) {
         if (terminalEvent.get() != null) {
             s.cancel();
             return;
@@ -267,7 +267,7 @@ public void onSubscribe(Subscription s) {
     }
 
     @Override
-    public void onNext(T t) {
+    public void onNext(@NonNull T t) {
         ExceptionHelper.nullCheck(t, "onNext called with a null value.");
 
         if (terminalEvent.get() != null) {
@@ -281,7 +281,7 @@ public void onNext(T t) {
     }
 
     @Override
-    public void onError(Throwable t) {
+    public void onError(@NonNull Throwable t) {
         ExceptionHelper.nullCheck(t, "onError called with a null Throwable.");
         if (!terminalEvent.compareAndSet(null, t)) {
             RxJavaPlugins.onError(t);
@@ -316,14 +316,13 @@ public void onComplete() {
      * <p>History: 2.0.8 - experimental
      * @param t the item to emit, not null
      * @return true if the item was emitted to all Subscribers
+     * @throws NullPointerException if {@code t} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
-    public boolean offer(T t) {
-        if (t == null) {
-            onError(ExceptionHelper.createNullPointerException("offer called with a null value."));
-            return true;
-        }
+    public boolean offer(@NonNull T t) {
+        ExceptionHelper.nullCheck(t, "offer called with a null value.");
+
         BehaviorSubscription<T>[] array = subscribers.get();
 
         for (BehaviorSubscription<T> s : array) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index d258ba1718..ea300afe34 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -258,7 +258,7 @@ public void startUnbounded() {
     }
 
     @Override
-    public void onSubscribe(Subscription s) {
+    public void onSubscribe(@NonNull Subscription s) {
         if (SubscriptionHelper.setOnce(upstream, s)) {
             if (s instanceof QueueSubscription) {
                 @SuppressWarnings("unchecked")
@@ -288,7 +288,7 @@ public void onSubscribe(Subscription s) {
     }
 
     @Override
-    public void onNext(T t) {
+    public void onNext(@NonNull T t) {
         if (once.get()) {
             return;
         }
@@ -306,26 +306,29 @@ public void onNext(T t) {
     /**
      * Tries to offer an item into the internal queue and returns false
      * if the queue is full.
-     * @param t the item to offer, not null
+     * @param t the item to offer, not {@code null}
      * @return true if successful, false if the queue is full
+     * @throws NullPointerException if {@code t} is {@code null}
+     * @throws IllegalStateException if the processor is in fusion mode
      */
     @CheckReturnValue
-    public boolean offer(T t) {
+    public boolean offer(@NonNull T t) {
+        ExceptionHelper.nullCheck(t, "offer called with a null value.");
         if (once.get()) {
             return false;
         }
-        ExceptionHelper.nullCheck(t, "offer called with a null value.");
         if (fusionMode == QueueSubscription.NONE) {
             if (queue.offer(t)) {
                 drain();
                 return true;
             }
+            return false;
         }
-        return false;
+        throw new IllegalStateException("offer() should not be called in fusion mode!");
     }
 
     @Override
-    public void onError(Throwable t) {
+    public void onError(@NonNull Throwable t) {
         ExceptionHelper.nullCheck(t, "onError called with a null Throwable.");
         if (once.compareAndSet(false, true)) {
             error = t;
@@ -369,7 +372,7 @@ public Throwable getThrowable() {
     }
 
     @Override
-    protected void subscribeActual(Subscriber<? super T> s) {
+    protected void subscribeActual(@NonNull Subscriber<? super T> s) {
         MulticastSubscription<T> ms = new MulticastSubscription<>(s, this);
         s.onSubscribe(ms);
         if (add(ms)) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
index 36bc4eff34..0a73cf1bf8 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
@@ -141,7 +141,7 @@ public static <T> PublishProcessor<T> create() {
     }
 
     @Override
-    protected void subscribeActual(Subscriber<? super T> t) {
+    protected void subscribeActual(@NonNull Subscriber<? super T> t) {
         PublishSubscription<T> ps = new PublishSubscription<>(t, this);
         t.onSubscribe(ps);
         if (add(ps)) {
@@ -226,7 +226,7 @@ void remove(PublishSubscription<T> ps) {
     }
 
     @Override
-    public void onSubscribe(Subscription s) {
+    public void onSubscribe(@NonNull Subscription s) {
         if (subscribers.get() == TERMINATED) {
             s.cancel();
             return;
@@ -236,7 +236,7 @@ public void onSubscribe(Subscription s) {
     }
 
     @Override
-    public void onNext(T t) {
+    public void onNext(@NonNull T t) {
         ExceptionHelper.nullCheck(t, "onNext called with a null value.");
         for (PublishSubscription<T> s : subscribers.get()) {
             s.onNext(t);
@@ -245,7 +245,7 @@ public void onNext(T t) {
 
     @SuppressWarnings("unchecked")
     @Override
-    public void onError(Throwable t) {
+    public void onError(@NonNull Throwable t) {
         ExceptionHelper.nullCheck(t, "onError called with a null Throwable.");
         if (subscribers.get() == TERMINATED) {
             RxJavaPlugins.onError(t);
@@ -281,14 +281,13 @@ public void onComplete() {
      * <p>History: 2.0.8 - experimental
      * @param t the item to emit, not null
      * @return true if the item was emitted to all Subscribers
+     * @throws NullPointerException if {@code t} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
-    public boolean offer(T t) {
-        if (t == null) {
-            onError(ExceptionHelper.createNullPointerException("offer called with a null value."));
-            return true;
-        }
+    public boolean offer(@NonNull T t) {
+        ExceptionHelper.nullCheck(t, "offer called with a null value.");
+
         PublishSubscription<T>[] array = subscribers.get();
 
         for (PublishSubscription<T> s : array) {
diff --git a/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
index 0f04c4baea..d49ba5f565 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
@@ -673,12 +673,14 @@ public void offer() {
 
         ts = pp.test(1);
 
-        assertTrue(pp.offer(null));
-
-        ts.assertFailure(NullPointerException.class, 2);
+        try {
+            pp.offer(null);
+            fail("Should have thrown NPE!");
+        } catch (NullPointerException expected) {
+            // expected
+        }
 
-        assertTrue(pp.hasThrowable());
-        assertTrue(pp.getThrowable().toString(), pp.getThrowable() instanceof NullPointerException);
+        ts.assertValuesOnly(2);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
index 4e71919b09..afa14b8deb 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
@@ -466,7 +466,12 @@ public void asyncFused() {
             up.onNext(i);
         }
 
-        assertFalse(mp.offer(10));
+        try {
+            mp.offer(10);
+            fail("Should have thrown IllegalStateException");
+        } catch (IllegalStateException expected) {
+            // expected
+        }
 
         up.onComplete();
 
diff --git a/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
index 277ac40c78..7c413d9dc0 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
@@ -597,12 +597,14 @@ public void offer() {
 
         ts = pp.test(0);
 
-        assertTrue(pp.offer(null));
-
-        ts.assertFailure(NullPointerException.class);
+        try {
+            pp.offer(null);
+            fail("Should have thrown NPE!");
+        } catch (NullPointerException expected) {
+            // expected
+        }
 
-        assertTrue(pp.hasThrowable());
-        assertTrue(pp.getThrowable().toString(), pp.getThrowable() instanceof NullPointerException);
+        ts.assertEmpty();
     }
 
     @Test

From d1cbf57c4357569094e3b2727f9c57a9d56f2e22 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 27 Dec 2019 00:33:42 +0100
Subject: [PATCH 027/665] 3.x: Add blockingForEach(Consumer, int) overload
 (#6800)

---
 .../io/reactivex/rxjava3/core/Flowable.java   | 53 +++++++++++++++++--
 .../io/reactivex/rxjava3/core/Observable.java | 41 +++++++++++++-
 2 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 57efac10e0..df3a8a270a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -5663,8 +5663,8 @@ public final T blockingFirst(@NonNull T defaultItem) {
      * sequence.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
-     *  (i.e., no backpressure applied to it).</dd>
+     *  <dd>The operator requests {@link Flowable#bufferSize()} upfront, then 75% of this
+     *  amount when 75% is received.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingForEach} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
@@ -5676,14 +5676,57 @@ public final T blockingFirst(@NonNull T defaultItem) {
      * @param onNext
      *            the {@link Consumer} to invoke for each item emitted by the {@code Flowable}
      * @throws RuntimeException
-     *             if an error occurs
+     *             if an error occurs; {@link Error}s and {@link RuntimeException}s are rethrown
+     *             as they are, checked {@link Exception}s are wrapped into {@code RuntimeException}s
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX documentation: Subscribe</a>
      * @see #subscribe(Consumer)
+     * @see #blockingForEach(Consumer, int)
      */
-    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
-        Iterator<T> it = blockingIterable().iterator();
+        blockingForEach(onNext, bufferSize());
+    }
+
+    /**
+     * Consumes the upstream {@code Flowable} in a blocking fashion and invokes the given
+     * {@code Consumer} with each upstream item on the <em>current thread</em> until the
+     * upstream terminates.
+     * <p>
+     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.forEach.png" alt="">
+     * <p>
+     * <em>Note:</em> the method will only return if the upstream terminates or the current
+     * thread is interrupted.
+     * <p>
+     * This method executes the {@code Consumer} on the current thread while
+     * {@link #subscribe(Consumer)} executes the consumer on the original caller thread of the
+     * sequence.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator requests the given {@code prefetch} amount upfront, then 75% of this
+     *  amount when 75% is received.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingForEach} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If the source signals an error, the operator wraps a checked {@link Exception}
+     *  into {@link RuntimeException} and throws that. Otherwise, {@code RuntimeException}s and
+     *  {@link Error}s are rethrown as they are.</dd>
+     * </dl>
+     *
+     * @param onNext
+     *            the {@link Consumer} to invoke for each item emitted by the {@code Flowable}
+     * @param bufferSize
+     *            the number of items to prefetch upfront, then 75% of it after 75% received
+     * @throws RuntimeException
+     *             if an error occurs; {@link Error}s and {@link RuntimeException}s are rethrown
+     *             as they are, checked {@link Exception}s are wrapped into {@code RuntimeException}s
+     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX documentation: Subscribe</a>
+     * @see #subscribe(Consumer)
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingForEach(@NonNull Consumer<? super T> onNext, int bufferSize) {
+        Iterator<T> it = blockingIterable(bufferSize).iterator();
         while (it.hasNext()) {
             try {
                 onNext.accept(it.next());
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index eb33792f34..1933a6db0b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -5170,11 +5170,50 @@ public final T blockingFirst(@NonNull T defaultItem) {
      *             if an error occurs
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX documentation: Subscribe</a>
      * @see #subscribe(Consumer)
+     * @see #blockingForEach(Consumer, int)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
-        Iterator<T> it = blockingIterable().iterator();
+        blockingForEach(onNext, bufferSize());
+    }
+
+    /**
+     * Consumes the upstream {@code Observable} in a blocking fashion and invokes the given
+     * {@code Consumer} with each upstream item on the <em>current thread</em> until the
+     * upstream terminates.
+     * <p>
+     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingForEach.o.png" alt="">
+     * <p>
+     * <em>Note:</em> the method will only return if the upstream terminates or the current
+     * thread is interrupted.
+     * <p>
+     * This method executes the {@code Consumer} on the current thread while
+     * {@link #subscribe(Consumer)} executes the consumer on the original caller thread of the
+     * sequence.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingForEach} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If the source signals an error, the operator wraps a checked {@link Exception}
+     *  into {@link RuntimeException} and throws that. Otherwise, {@code RuntimeException}s and
+     *  {@link Error}s are rethrown as they are.</dd>
+     * </dl>
+     *
+     * @param onNext
+     *            the {@link Consumer} to invoke for each item emitted by the {@code Observable}
+     * @param capacityHint
+     *            the number of items expected to be buffered (allows reducing buffer reallocations)
+     * @throws RuntimeException
+     *             if an error occurs; {@link Error}s and {@link RuntimeException}s are rethrown
+     *             as they are, checked {@link Exception}s are wrapped into {@code RuntimeException}s
+     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX documentation: Subscribe</a>
+     * @see #subscribe(Consumer)
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final void blockingForEach(@NonNull Consumer<? super T> onNext, int capacityHint) {
+        Iterator<T> it = blockingIterable(capacityHint).iterator();
         while (it.hasNext()) {
             try {
                 onNext.accept(it.next());

From a97d871ee7161fc9f4684d95cae3e94340cd0ccf Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 27 Dec 2019 00:55:36 +0100
Subject: [PATCH 028/665] 3.x: Add missing throwIfFatal calls (#6801)

---
 .../disposables/AutoCloseableDisposable.java  |  4 +-
 .../internal/jdk8/FlowableFlatMapStream.java  |  8 +-
 .../jdk8/ObservableFlatMapStream.java         |  1 +
 .../operators/flowable/FlowableCollect.java   |  1 +
 .../flowable/FlowableCollectSingle.java       |  1 +
 .../operators/flowable/FlowableDoOnEach.java  |  4 +
 .../operators/flowable/FlowableReplay.java    |  1 +
 .../flowable/FlowableScalarXMap.java          |  1 +
 .../FlowableWindowBoundarySelector.java       |  1 +
 .../flowable/FlowableZipIterable.java         |  8 +-
 .../operators/maybe/MaybeFromFuture.java      |  1 +
 .../observable/ObservableBuffer.java          |  1 +
 .../observable/ObservableCollect.java         |  3 +
 .../observable/ObservableCollectSingle.java   |  3 +
 .../observable/ObservableReplay.java          |  1 +
 .../observable/ObservableScalarXMap.java      |  1 +
 .../ObservableWindowBoundarySelector.java     |  1 +
 .../schedulers/InstantPeriodicTask.java       |  2 +
 .../ScheduledDirectPeriodicTask.java          |  2 +
 .../schedulers/SchedulerPoolFactory.java      |  3 +
 .../rxjava3/disposables/DisposableTest.java   | 11 ++-
 .../validators/CatchThrowIfFatalCheck.java    | 96 +++++++++++++++++++
 22 files changed, 144 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/validators/CatchThrowIfFatalCheck.java

diff --git a/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java
index 8c0f2be2dc..08cbe9cd99 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java
@@ -14,7 +14,7 @@
 package io.reactivex.rxjava3.disposables;
 
 import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 
 /**
  * A disposable container that manages an {@link AutoCloseable} instance.
@@ -33,7 +33,7 @@ protected void onDisposed(@NonNull AutoCloseable value) {
         try {
             value.close();
         } catch (Throwable ex) {
-            RxJavaPlugins.onError(ex);
+            throw ExceptionHelper.wrapOrThrow(ex);
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
index c967a011e5..b01b24748a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
@@ -21,7 +21,7 @@
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
@@ -61,6 +61,7 @@ protected void subscribeActual(Subscriber<? super R> s) {
                     stream = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Stream");
                 }
             } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
                 EmptySubscription.error(ex, s);
                 return;
             }
@@ -243,6 +244,7 @@ void drain() {
                         try {
                             t = queue.poll();
                         } catch (Throwable ex) {
+                            Exceptions.throwIfFatal(ex);
                             trySignalError(downstream, ex);
                             continue;
                         }
@@ -271,6 +273,7 @@ else if (!isEmpty) {
                                     iterator = null;
                                 }
                             } catch (Throwable ex) {
+                                Exceptions.throwIfFatal(ex);
                                 trySignalError(downstream, ex);
                             }
                             continue;
@@ -282,6 +285,7 @@ else if (!isEmpty) {
                         try {
                             item = Objects.requireNonNull(iterator.next(), "The Stream.Iterator returned a null value");
                         } catch (Throwable ex) {
+                            Exceptions.throwIfFatal(ex);
                             trySignalError(downstream, ex);
                             continue;
                         }
@@ -297,6 +301,7 @@ else if (!isEmpty) {
                                         clearCurrentRethrowCloseError();
                                     }
                                 } catch (Throwable ex) {
+                                    Exceptions.throwIfFatal(ex);
                                     trySignalError(downstream, ex);
                                 }
                             }
@@ -328,6 +333,7 @@ void clearCurrentSuppressCloseError() {
             try {
                 clearCurrentRethrowCloseError();
             } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
                 RxJavaPlugins.onError(ex);
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
index 9b7b446e28..968e581625 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
@@ -55,6 +55,7 @@ protected void subscribeActual(Observer<? super R> observer) {
                     stream = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Stream");
                 }
             } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
                 EmptyDisposable.error(ex, observer);
                 return;
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
index 80345f2f3b..c2560cf6e3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
@@ -39,6 +39,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
         try {
             u = Objects.requireNonNull(initialSupplier.get(), "The initial value supplied is null");
         } catch (Throwable e) {
+            Exceptions.throwIfFatal(e);
             EmptySubscription.error(e, s);
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
index fcb5590b49..edf17d95ef 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
@@ -44,6 +44,7 @@ protected void subscribeActual(SingleObserver<? super U> observer) {
         try {
             u = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
         } catch (Throwable e) {
+            Exceptions.throwIfFatal(e);
             EmptyDisposable.error(e, observer);
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
index b6900b077e..74d74f41cf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
@@ -159,6 +159,7 @@ public T poll() throws Throwable {
                 try {
                     onError.accept(ex);
                 } catch (Throwable exc) {
+                    Exceptions.throwIfFatal(exc);
                     throw new CompositeException(ex, exc);
                 }
                 throw ExceptionHelper.<Exception>throwIfThrowable(ex);
@@ -173,6 +174,7 @@ public T poll() throws Throwable {
                         try {
                             onError.accept(ex);
                         } catch (Throwable exc) {
+                            Exceptions.throwIfFatal(exc);
                             throw new CompositeException(ex, exc);
                         }
                         throw ExceptionHelper.<Exception>throwIfThrowable(ex);
@@ -314,6 +316,7 @@ public T poll() throws Throwable {
                 try {
                     onError.accept(ex);
                 } catch (Throwable exc) {
+                    Exceptions.throwIfFatal(exc);
                     throw new CompositeException(ex, exc);
                 }
                 throw ExceptionHelper.<Exception>throwIfThrowable(ex);
@@ -328,6 +331,7 @@ public T poll() throws Throwable {
                         try {
                             onError.accept(ex);
                         } catch (Throwable exc) {
+                            Exceptions.throwIfFatal(exc);
                             throw new CompositeException(ex, exc);
                         }
                         throw ExceptionHelper.<Exception>throwIfThrowable(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
index 8d9e2e8460..6a352e2fc4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
@@ -209,6 +209,7 @@ public void connect(Consumer<? super Disposable> connection) {
         try {
             connection.accept(ps);
         } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
             if (doConnect) {
                 ps.shouldConnect.compareAndSet(true, false);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
index 2ef89c0023..d78e83a3d2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
@@ -136,6 +136,7 @@ public void subscribeActual(Subscriber<? super R> s) {
             try {
                 other = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null Publisher");
             } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
                 EmptySubscription.error(e, s);
                 return;
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
index 4e38351ef7..d55198010a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
@@ -245,6 +245,7 @@ void drain() {
                                     try {
                                         endSource = Objects.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null Publisher");
                                     } catch (Throwable ex) {
+                                        Exceptions.throwIfFatal(ex);
                                         upstream.cancel();
                                         startSubscriber.cancel();
                                         resources.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java
index a41c591fe2..1fb9777a50 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java
@@ -101,7 +101,7 @@ public void onNext(T t) {
             try {
                 u = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
             } catch (Throwable e) {
-                error(e);
+                fail(e);
                 return;
             }
 
@@ -109,7 +109,7 @@ public void onNext(T t) {
             try {
                 v = Objects.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value");
             } catch (Throwable e) {
-                error(e);
+                fail(e);
                 return;
             }
 
@@ -120,7 +120,7 @@ public void onNext(T t) {
             try {
                 b = iterator.hasNext();
             } catch (Throwable e) {
-                error(e);
+                fail(e);
                 return;
             }
 
@@ -131,7 +131,7 @@ public void onNext(T t) {
             }
         }
 
-        void error(Throwable e) {
+        void fail(Throwable e) {
             Exceptions.throwIfFatal(e);
             done = true;
             upstream.cancel();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java
index 5d4dbc0f0b..acc93b3ea6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java
@@ -52,6 +52,7 @@ protected void subscribeActual(MaybeObserver<? super T> observer) {
                     v = future.get(timeout, unit);
                 }
             } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
                 if (ex instanceof ExecutionException) {
                     ex = ex.getCause();
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
index 2b09748a61..bd7f4b1baa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
@@ -186,6 +186,7 @@ public void onNext(T t) {
                 try {
                     b = ExceptionHelper.nullCheck(bufferSupplier.get(), "The bufferSupplier returned a null Collection.");
                 } catch (Throwable e) {
+                    Exceptions.throwIfFatal(e);
                     buffers.clear();
                     upstream.dispose();
                     downstream.onError(e);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
index 6471d7538c..76b03eddb6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
@@ -14,6 +14,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -37,6 +38,7 @@ protected void subscribeActual(Observer<? super U> t) {
         try {
             u = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
         } catch (Throwable e) {
+            Exceptions.throwIfFatal(e);
             EmptyDisposable.error(e, t);
             return;
         }
@@ -86,6 +88,7 @@ public void onNext(T t) {
             try {
                 collector.accept(u, t);
             } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
                 upstream.dispose();
                 onError(e);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
index 09c86cb24a..07db8d5bf3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
@@ -14,6 +14,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.*;
 import io.reactivex.rxjava3.internal.fuseable.FuseToObservable;
@@ -41,6 +42,7 @@ protected void subscribeActual(SingleObserver<? super U> t) {
         try {
             u = Objects.requireNonNull(initialSupplier.get(), "The initialSupplier returned a null value");
         } catch (Throwable e) {
+            Exceptions.throwIfFatal(e);
             EmptyDisposable.error(e, t);
             return;
         }
@@ -94,6 +96,7 @@ public void onNext(T t) {
             try {
                 collector.accept(u, t);
             } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
                 upstream.dispose();
                 onError(e);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
index ba0811b85c..b6a945e8b7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
@@ -205,6 +205,7 @@ public void connect(Consumer<? super Disposable> connection) {
         try {
             connection.accept(ps);
         } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
             if (doConnect) {
                 ps.shouldConnect.compareAndSet(true, false);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
index 128d327e2b..f4a1bce25b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
@@ -140,6 +140,7 @@ public void subscribeActual(Observer<? super R> observer) {
             try {
                 other = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null ObservableSource");
             } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
                 EmptyDisposable.error(e, observer);
                 return;
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
index 5ea42da118..8722d6df0c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
@@ -237,6 +237,7 @@ void drain() {
                                 try {
                                     endSource = Objects.requireNonNull(closingIndicator.apply(startItem), "The closingIndicator returned a null ObservableSource");
                                 } catch (Throwable ex) {
+                                    Exceptions.throwIfFatal(ex);
                                     upstream.dispose();
                                     startObserver.dispose();
                                     resources.dispose();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
index 678c82e794..5df8793ebb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -56,6 +57,7 @@ public Void call() throws Exception {
             setRest(executor.submit(this));
             runner = null;
         } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
             runner = null;
             RxJavaPlugins.onError(ex);
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
index 695760f2ca..ac30532e68 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
@@ -16,6 +16,7 @@
 
 package io.reactivex.rxjava3.internal.schedulers;
 
+import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
@@ -38,6 +39,7 @@ public void run() {
             runnable.run();
             runner = null;
         } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
             runner = null;
             lazySet(FINISHED);
             RxJavaPlugins.onError(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
index cc82349cfc..392a3c3051 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 
 /**
@@ -108,6 +109,7 @@ static int getIntProperty(boolean enabled, String key, int defaultNotFound, int
                 }
                 return Integer.parseInt(value);
             } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
                 return defaultNotFound;
             }
         }
@@ -123,6 +125,7 @@ static boolean getBooleanProperty(boolean enabled, String key, boolean defaultNo
                 }
                 return "true".equals(value);
             } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
                 return defaultNotFound;
             }
         }
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
index 66abc6a280..b966a1db0f 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
@@ -213,17 +213,20 @@ public void fromAutoCloseableThrows() throws Throwable {
 
             assertTrue(errors.isEmpty());
 
-            d.dispose();
+            try {
+                d.dispose();
+                fail("Should have thrown!");
+            } catch (TestException expected) {
+                // expected
+            }
 
             assertTrue(d.isDisposed());
-            assertEquals(1, errors.size());
 
             d.dispose();
 
             assertTrue(d.isDisposed());
-            assertEquals(1, errors.size());
 
-            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+            assertTrue(errors.isEmpty());
         });
     }
 
diff --git a/src/test/java/io/reactivex/rxjava3/validators/CatchThrowIfFatalCheck.java b/src/test/java/io/reactivex/rxjava3/validators/CatchThrowIfFatalCheck.java
new file mode 100644
index 0000000000..5b78a2da0a
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/validators/CatchThrowIfFatalCheck.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.validators;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+/**
+ * Check if a {@code catch(Throwable} is followed by a
+ * {@code Exceptions.throwIfFatal}, {@code Exceptions.wrapOrThrow}
+ * or {@code fail} call.
+ * @since 3.0.0
+ */
+public class CatchThrowIfFatalCheck {
+
+    @Test
+    public void check() throws Exception {
+        File f = TestHelper.findSource("Flowable");
+        if (f == null) {
+            System.out.println("Unable to find sources of RxJava");
+            return;
+        }
+
+        Queue<File> dirs = new ArrayDeque<>();
+
+        StringBuilder fail = new StringBuilder();
+        int errors = 0;
+
+        File parent = f.getParentFile().getParentFile();
+
+        dirs.offer(new File(parent.getAbsolutePath().replace('\\', '/')));
+
+        while (!dirs.isEmpty()) {
+            f = dirs.poll();
+
+            File[] list = f.listFiles();
+            if (list != null && list.length != 0) {
+
+                for (File u : list) {
+                    if (u.isDirectory()) {
+                        dirs.offer(u);
+                    } else {
+                        List<String> lines = Files.readAllLines(u.toPath());
+
+                        for (int i = 0; i < lines.size(); i++) {
+                            String line = lines.get(i).trim();
+
+                            if (line.startsWith("} catch (Throwable ")) {
+                                String next = lines.get(i + 1).trim();
+                                boolean throwIfFatal = next.contains("Exceptions.throwIfFatal");
+                                boolean wrapOrThrow = next.contains("ExceptionHelper.wrapOrThrow");
+                                boolean failCall = next.startsWith("fail(");
+
+                                if (!(throwIfFatal || wrapOrThrow || failCall)) {
+                                    errors++;
+                                    fail.append("Missing Exceptions.throwIfFatal\n    ")
+                                    .append(next)
+                                    .append("\n at ")
+                                    .append(u.getName().replace(".java", ""))
+                                    .append(".method(")
+                                    .append(u.getName())
+                                    .append(":")
+                                    .append(i + 1)
+                                    .append(")\n")
+                                    ;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        if (errors != 0) {
+            fail.insert(0, "Found " + errors + " cases\n");
+            System.out.println(fail);
+            throw new AssertionError(fail.toString());
+        }
+    }
+}

From e6eb21bc9df0777105cd1f469754a0bed658e966 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 27 Dec 2019 09:49:14 +0100
Subject: [PATCH 029/665] Bump guava from 28.1-jre to 28.2-jre (#6802)

Bumps [guava](https://github.com/google/guava) from 28.1-jre to 28.2-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2ae17aa25a..f21e95925a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
   ext.mockitoVersion = "3.2.4"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
-  ext.guavaVersion = "28.1-jre"
+  ext.guavaVersion = "28.2-jre"
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.0"
   ext.licenseVersion = "0.15.0"

From 79f8e6dde6446b1aa33c146eaedbb958086daf56 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 27 Dec 2019 20:01:34 +0100
Subject: [PATCH 030/665] 3.x: Fix diamonds, spelling, unnecessary code (#6804)

---
 docs/Backpressure.md                          |  30 ++--
 docs/Combining-Observables.md                 |   8 +-
 docs/How-To-Use-RxJava.md                     |   4 +-
 docs/Writing-operators-for-2.0.md             |   2 +-
 .../rxjava3/core/BinaryFlatMapPerf.java       |  36 ++---
 .../rxjava3/core/CallableAsyncPerf.java       |  30 ++--
 .../rxjava3/core/EachTypeFlatMapPerf.java     |   4 +-
 .../rxjava3/core/FlatMapJustPerf.java         |   4 +-
 .../rxjava3/core/FlattenCrossMapPerf.java     |   4 +-
 .../rxjava3/core/FlattenJustPerf.java         |   4 +-
 .../rxjava3/core/FlattenRangePerf.java        |   4 +-
 .../FlowableFlatMapCompletableAsyncPerf.java  |   2 +-
 .../core/InputWithIncrementingInteger.java    |   4 +-
 .../reactivex/rxjava3/core/JustAsyncPerf.java |  28 ++--
 .../io/reactivex/rxjava3/core/MemoryPerf.java | 110 ++++++-------
 .../rxjava3/core/OperatorFlatMapPerf.java     |   4 +-
 .../rxjava3/core/PerfSubscriber.java          |   2 +-
 .../io/reactivex/rxjava3/core/ReducePerf.java |   2 +-
 .../reactivex/rxjava3/core/TakeUntilPerf.java |  10 +-
 .../rxjava3/core/ToFlowablePerf.java          |   6 +-
 .../io/reactivex/rxjava3/core/XMapYPerf.java  |  76 ++++-----
 .../rxjava3/parallel/ParallelPerf.java        |   8 +-
 .../FlowableConcatMapCompletablePerf.java     |   9 +-
 .../FlowableConcatMapMaybeEmptyPerf.java      |   9 +-
 .../xmapz/FlowableConcatMapMaybePerf.java     |   9 +-
 .../xmapz/FlowableConcatMapSinglePerf.java    |   9 +-
 .../xmapz/FlowableFlatMapCompletablePerf.java |   9 +-
 .../xmapz/FlowableFlatMapMaybeEmptyPerf.java  |   9 +-
 .../xmapz/FlowableFlatMapMaybePerf.java       |   9 +-
 .../xmapz/FlowableFlatMapSinglePerf.java      |   9 +-
 .../FlowableSwitchMapCompletablePerf.java     |   9 +-
 .../FlowableSwitchMapMaybeEmptyPerf.java      |   9 +-
 .../xmapz/FlowableSwitchMapMaybePerf.java     |   9 +-
 .../xmapz/FlowableSwitchMapSinglePerf.java    |   9 +-
 .../ObservableConcatMapCompletablePerf.java   |   9 +-
 .../ObservableConcatMapMaybeEmptyPerf.java    |   9 +-
 .../xmapz/ObservableConcatMapMaybePerf.java   |   9 +-
 .../xmapz/ObservableConcatMapSinglePerf.java  |   9 +-
 .../ObservableFlatMapCompletablePerf.java     |   9 +-
 .../ObservableFlatMapMaybeEmptyPerf.java      |   9 +-
 .../xmapz/ObservableFlatMapMaybePerf.java     |   9 +-
 .../xmapz/ObservableFlatMapSinglePerf.java    |   9 +-
 .../ObservableSwitchMapCompletablePerf.java   |   9 +-
 .../ObservableSwitchMapMaybeEmptyPerf.java    |   9 +-
 .../xmapz/ObservableSwitchMapMaybePerf.java   |   9 +-
 .../xmapz/ObservableSwitchMapSinglePerf.java  |   9 +-
 .../reactivex/rxjava3/core/Completable.java   |  14 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 148 +++++++++---------
 .../java/io/reactivex/rxjava3/core/Maybe.java |  36 ++---
 .../io/reactivex/rxjava3/core/Observable.java | 131 ++++++++--------
 .../io/reactivex/rxjava3/core/Single.java     |  43 +++--
 .../exceptions/CompositeException.java        |   3 +-
 .../rxjava3/exceptions/package-info.java      |   2 +-
 .../internal/disposables/EmptyDisposable.java |   2 +-
 .../disposables/ListCompositeDisposable.java  |  10 +-
 .../rxjava3/internal/functions/Functions.java |  88 +++++------
 .../jdk8/ObservableFlatMapStream.java         |   2 +-
 .../internal/jdk8/ParallelCollector.java      |   1 -
 .../observers/DeferredScalarDisposable.java   |   2 +-
 .../internal/observers/FutureObserver.java    |   5 +-
 .../observers/FutureSingleObserver.java       |   5 +-
 .../completable/CompletableCache.java         |   2 +-
 .../completable/CompletableConcat.java        |   4 +-
 .../CompletableFromObservable.java            |   2 +-
 .../completable/CompletableFromPublisher.java |   2 +-
 .../completable/CompletableFromSingle.java    |   2 +-
 .../completable/CompletableMaterialize.java   |   2 +-
 .../completable/CompletableToFlowable.java    |   2 +-
 .../completable/CompletableToObservable.java  |   2 +-
 .../completable/CompletableUsing.java         |   2 +-
 .../flowable/BlockingFlowableIterable.java    |   4 +-
 .../flowable/BlockingFlowableLatest.java      |   4 +-
 .../flowable/BlockingFlowableMostRecent.java  |   2 +-
 .../flowable/BlockingFlowableNext.java        |   6 +-
 .../operators/flowable/FlowableAll.java       |   2 +-
 .../operators/flowable/FlowableAllSingle.java |   4 +-
 .../operators/flowable/FlowableAmb.java       |   4 +-
 .../operators/flowable/FlowableAny.java       |   2 +-
 .../operators/flowable/FlowableAnySingle.java |   4 +-
 .../flowable/FlowableBlockingSubscribe.java   |   6 +-
 .../operators/flowable/FlowableBuffer.java    |   8 +-
 .../flowable/FlowableBufferBoundary.java      |  12 +-
 .../flowable/FlowableBufferExactBoundary.java |   6 +-
 .../flowable/FlowableBufferTimed.java         |  24 +--
 .../operators/flowable/FlowableCache.java     |   8 +-
 .../operators/flowable/FlowableCollect.java   |   2 +-
 .../flowable/FlowableCollectSingle.java       |   4 +-
 .../flowable/FlowableCombineLatest.java       |  10 +-
 .../flowable/FlowableConcatArray.java         |   6 +-
 .../operators/flowable/FlowableConcatMap.java |  14 +-
 .../flowable/FlowableConcatMapEager.java      |   6 +-
 .../FlowableConcatMapEagerPublisher.java      |   2 +-
 .../flowable/FlowableConcatMapScheduler.java  |  14 +-
 .../FlowableConcatWithCompletable.java        |   2 +-
 .../flowable/FlowableConcatWithMaybe.java     |   4 +-
 .../flowable/FlowableConcatWithSingle.java    |   4 +-
 .../flowable/FlowableCountSingle.java         |   2 +-
 .../operators/flowable/FlowableCreate.java    |  18 +--
 .../operators/flowable/FlowableDebounce.java  |   6 +-
 .../flowable/FlowableDebounceTimed.java       |   6 +-
 .../operators/flowable/FlowableDelay.java     |   4 +-
 .../FlowableDelaySubscriptionOther.java       |   4 +-
 .../flowable/FlowableDematerialize.java       |   2 +-
 .../operators/flowable/FlowableDetach.java    |   2 +-
 .../operators/flowable/FlowableDistinct.java  |   2 +-
 .../FlowableDistinctUntilChanged.java         |   4 +-
 .../flowable/FlowableDoAfterNext.java         |   4 +-
 .../operators/flowable/FlowableDoFinally.java |   4 +-
 .../operators/flowable/FlowableDoOnEach.java  |   6 +-
 .../flowable/FlowableDoOnLifecycle.java       |   2 +-
 .../operators/flowable/FlowableElementAt.java |   2 +-
 .../flowable/FlowableElementAtMaybe.java      |   4 +-
 .../flowable/FlowableElementAtSingle.java     |   4 +-
 .../operators/flowable/FlowableFilter.java    |   6 +-
 .../operators/flowable/FlowableFlatMap.java   |  14 +-
 .../flowable/FlowableFlatMapCompletable.java  |   4 +-
 ...FlowableFlatMapCompletableCompletable.java |   4 +-
 .../flowable/FlowableFlatMapMaybe.java        |   6 +-
 .../flowable/FlowableFlatMapSingle.java       |   6 +-
 .../flowable/FlowableFlattenIterable.java     |   2 +-
 .../operators/flowable/FlowableFromArray.java |   4 +-
 .../flowable/FlowableFromCallable.java        |   2 +-
 .../flowable/FlowableFromFuture.java          |   2 +-
 .../flowable/FlowableFromObservable.java      |   2 +-
 .../flowable/FlowableFromSupplier.java        |   2 +-
 .../operators/flowable/FlowableGenerate.java  |   2 +-
 .../operators/flowable/FlowableGroupBy.java   |  16 +-
 .../operators/flowable/FlowableGroupJoin.java |  12 +-
 .../operators/flowable/FlowableHide.java      |   2 +-
 .../flowable/FlowableIgnoreElements.java      |   2 +-
 .../FlowableIgnoreElementsCompletable.java    |   4 +-
 .../flowable/FlowableInternalHelper.java      |  38 ++---
 .../operators/flowable/FlowableInterval.java  |   2 +-
 .../flowable/FlowableIntervalRange.java       |   2 +-
 .../operators/flowable/FlowableJoin.java      |  10 +-
 .../operators/flowable/FlowableJust.java      |   2 +-
 .../operators/flowable/FlowableLastMaybe.java |   2 +-
 .../flowable/FlowableLastSingle.java          |   2 +-
 .../flowable/FlowableMapNotification.java     |   2 +-
 .../flowable/FlowableMaterialize.java         |   6 +-
 .../FlowableMergeWithCompletable.java         |   4 +-
 .../flowable/FlowableMergeWithMaybe.java      |   8 +-
 .../flowable/FlowableMergeWithSingle.java     |   8 +-
 .../operators/flowable/FlowableObserveOn.java |   8 +-
 .../FlowableOnBackpressureBuffer.java         |   8 +-
 .../FlowableOnBackpressureBufferStrategy.java |   4 +-
 .../flowable/FlowableOnBackpressureDrop.java  |   2 +-
 .../flowable/FlowableOnBackpressureError.java |   2 +-
 .../FlowableOnBackpressureLatest.java         |   4 +-
 .../flowable/FlowableOnErrorNext.java         |   2 +-
 .../flowable/FlowableOnErrorReturn.java       |   2 +-
 .../operators/flowable/FlowablePublish.java   |  20 +--
 .../flowable/FlowablePublishMulticast.java    |  10 +-
 .../operators/flowable/FlowableReduce.java    |   2 +-
 .../flowable/FlowableReduceMaybe.java         |   4 +-
 .../flowable/FlowableReduceSeedSingle.java    |   2 +-
 .../flowable/FlowableReduceWithSingle.java    |   2 +-
 .../operators/flowable/FlowableRefCount.java  |   4 +-
 .../operators/flowable/FlowableRepeat.java    |   2 +-
 .../flowable/FlowableRepeatUntil.java         |   2 +-
 .../flowable/FlowableRepeatWhen.java          |  10 +-
 .../operators/flowable/FlowableReplay.java    |  30 ++--
 .../flowable/FlowableRetryBiPredicate.java    |   2 +-
 .../flowable/FlowableRetryPredicate.java      |   2 +-
 .../operators/flowable/FlowableRetryWhen.java |   6 +-
 .../flowable/FlowableSamplePublisher.java     |  10 +-
 .../flowable/FlowableSampleTimed.java         |   6 +-
 .../flowable/FlowableScalarXMap.java          |   6 +-
 .../operators/flowable/FlowableScan.java      |   2 +-
 .../operators/flowable/FlowableScanSeed.java  |   4 +-
 .../flowable/FlowableSequenceEqual.java       |   8 +-
 .../flowable/FlowableSequenceEqualSingle.java |   8 +-
 .../flowable/FlowableSerialized.java          |   2 +-
 .../operators/flowable/FlowableSingle.java    |   2 +-
 .../flowable/FlowableSingleMaybe.java         |   4 +-
 .../flowable/FlowableSingleSingle.java        |   4 +-
 .../operators/flowable/FlowableSkip.java      |   2 +-
 .../operators/flowable/FlowableSkipLast.java  |   2 +-
 .../flowable/FlowableSkipLastTimed.java       |   4 +-
 .../operators/flowable/FlowableSkipUntil.java |   4 +-
 .../operators/flowable/FlowableSkipWhile.java |   2 +-
 .../flowable/FlowableSubscribeOn.java         |   4 +-
 .../flowable/FlowableSwitchIfEmpty.java       |   2 +-
 .../operators/flowable/FlowableSwitchMap.java |  10 +-
 .../operators/flowable/FlowableTake.java      |   9 +-
 .../operators/flowable/FlowableTakeLast.java  |   2 +-
 .../flowable/FlowableTakeLastOne.java         |   2 +-
 .../flowable/FlowableTakeLastTimed.java       |   4 +-
 .../flowable/FlowableTakePublisher.java       |   2 +-
 .../operators/flowable/FlowableTakeUntil.java |   4 +-
 .../flowable/FlowableTakeUntilPredicate.java  |   2 +-
 .../operators/flowable/FlowableTakeWhile.java |   2 +-
 .../flowable/FlowableThrottleFirstTimed.java  |   4 +-
 .../flowable/FlowableThrottleLatest.java      |   4 +-
 .../flowable/FlowableTimeInterval.java        |   4 +-
 .../operators/flowable/FlowableTimeout.java   |   8 +-
 .../flowable/FlowableTimeoutTimed.java        |   8 +-
 .../operators/flowable/FlowableToList.java    |   2 +-
 .../flowable/FlowableToListSingle.java        |   4 +-
 .../flowable/FlowableUnsubscribeOn.java       |   2 +-
 .../operators/flowable/FlowableUsing.java     |   2 +-
 .../operators/flowable/FlowableWindow.java    |  24 +--
 .../flowable/FlowableWindowBoundary.java      |  10 +-
 .../FlowableWindowBoundarySelector.java       |  14 +-
 .../flowable/FlowableWindowTimed.java         |  22 +--
 .../flowable/FlowableWithLatestFrom.java      |   8 +-
 .../flowable/FlowableWithLatestFromMany.java  |   8 +-
 .../operators/flowable/FlowableZip.java       |   6 +-
 .../internal/operators/maybe/MaybeCache.java  |   6 +-
 .../operators/maybe/MaybeConcatArray.java     |   4 +-
 .../maybe/MaybeConcatArrayDelayError.java     |   4 +-
 .../operators/maybe/MaybeConcatIterable.java  |   4 +-
 .../internal/operators/maybe/MaybeCreate.java |   2 +-
 .../internal/operators/maybe/MaybeDelay.java  |   2 +-
 .../maybe/MaybeDelayOtherPublisher.java       |   4 +-
 .../MaybeDelaySubscriptionOtherPublisher.java |   4 +-
 .../maybe/MaybeDelayWithCompletable.java      |   4 +-
 .../internal/operators/maybe/MaybeDetach.java |   2 +-
 .../operators/maybe/MaybeDoAfterSuccess.java  |   2 +-
 .../operators/maybe/MaybeDoFinally.java       |   2 +-
 .../operators/maybe/MaybeDoOnEvent.java       |   2 +-
 .../operators/maybe/MaybeEqualSingle.java     |   6 +-
 .../internal/operators/maybe/MaybeFilter.java |   2 +-
 .../operators/maybe/MaybeFilterSingle.java    |   2 +-
 .../maybe/MaybeFlatMapBiSelector.java         |   2 +-
 .../maybe/MaybeFlatMapCompletable.java        |   2 +-
 .../maybe/MaybeFlatMapIterableFlowable.java   |   4 +-
 .../maybe/MaybeFlatMapIterableObservable.java |   4 +-
 .../maybe/MaybeFlatMapNotification.java       |   2 +-
 .../operators/maybe/MaybeFlatMapSingle.java   |   2 +-
 .../maybe/MaybeFlatMapSingleElement.java      |   2 +-
 .../operators/maybe/MaybeFlatten.java         |   2 +-
 .../operators/maybe/MaybeFromRunnable.java    |   2 +-
 .../operators/maybe/MaybeFromSingle.java      |   2 +-
 .../internal/operators/maybe/MaybeHide.java   |   2 +-
 .../operators/maybe/MaybeIgnoreElement.java   |   2 +-
 .../maybe/MaybeIgnoreElementCompletable.java  |   4 +-
 .../operators/maybe/MaybeIsEmpty.java         |   2 +-
 .../operators/maybe/MaybeIsEmptySingle.java   |   4 +-
 .../operators/maybe/MaybeMaterialize.java     |   2 +-
 .../operators/maybe/MaybeMergeArray.java      |   8 +-
 .../operators/maybe/MaybeObserveOn.java       |   2 +-
 .../operators/maybe/MaybeOnErrorComplete.java |   2 +-
 .../operators/maybe/MaybeOnErrorNext.java     |   2 +-
 .../operators/maybe/MaybeOnErrorReturn.java   |   2 +-
 .../internal/operators/maybe/MaybePeek.java   |   2 +-
 .../operators/maybe/MaybeSubscribeOn.java     |   4 +-
 .../operators/maybe/MaybeSwitchIfEmpty.java   |   2 +-
 .../maybe/MaybeSwitchIfEmptySingle.java       |   2 +-
 .../operators/maybe/MaybeTakeUntilMaybe.java  |   4 +-
 .../maybe/MaybeTakeUntilPublisher.java        |   4 +-
 .../operators/maybe/MaybeTimeoutMaybe.java    |   6 +-
 .../maybe/MaybeTimeoutPublisher.java          |   6 +-
 .../operators/maybe/MaybeToFlowable.java      |   2 +-
 .../operators/maybe/MaybeToObservable.java    |   2 +-
 .../operators/maybe/MaybeToPublisher.java     |   4 +-
 .../operators/maybe/MaybeToSingle.java        |   2 +-
 .../operators/maybe/MaybeUnsubscribeOn.java   |   2 +-
 .../operators/maybe/MaybeZipArray.java        |   6 +-
 .../operators/maybe/MaybeZipIterable.java     |   4 +-
 .../mixed/CompletableAndThenObservable.java   |   2 +-
 .../mixed/FlowableConcatMapCompletable.java   |   4 +-
 .../mixed/FlowableConcatMapMaybe.java         |   6 +-
 .../mixed/FlowableConcatMapSingle.java        |   6 +-
 .../mixed/FlowableSwitchMapCompletable.java   |   4 +-
 .../mixed/FlowableSwitchMapMaybe.java         |   8 +-
 .../mixed/FlowableSwitchMapSingle.java        |   8 +-
 .../mixed/MaterializeSingleObserver.java      |   6 +-
 .../mixed/MaybeFlatMapObservable.java         |   2 +-
 .../mixed/MaybeFlatMapPublisher.java          |   2 +-
 .../mixed/ObservableConcatMapCompletable.java |   4 +-
 .../mixed/ObservableConcatMapMaybe.java       |   6 +-
 .../mixed/ObservableConcatMapSingle.java      |   6 +-
 .../mixed/ObservableSwitchMapCompletable.java |   4 +-
 .../mixed/ObservableSwitchMapMaybe.java       |   8 +-
 .../mixed/ObservableSwitchMapSingle.java      |   8 +-
 .../mixed/SingleFlatMapObservable.java        |   2 +-
 .../BlockingObservableIterable.java           |   4 +-
 .../observable/BlockingObservableLatest.java  |   4 +-
 .../BlockingObservableMostRecent.java         |   2 +-
 .../observable/BlockingObservableNext.java    |   8 +-
 .../operators/observable/ObservableAll.java   |   2 +-
 .../observable/ObservableAllSingle.java       |   4 +-
 .../operators/observable/ObservableAmb.java   |   4 +-
 .../operators/observable/ObservableAny.java   |   2 +-
 .../observable/ObservableAnySingle.java       |   4 +-
 .../ObservableBlockingSubscribe.java          |   6 +-
 .../observable/ObservableBuffer.java          |   6 +-
 .../observable/ObservableBufferBoundary.java  |  12 +-
 .../ObservableBufferExactBoundary.java        |   6 +-
 .../observable/ObservableBufferTimed.java     |  24 +--
 .../operators/observable/ObservableCache.java |   8 +-
 .../observable/ObservableCollect.java         |   2 +-
 .../observable/ObservableCollectSingle.java   |   4 +-
 .../observable/ObservableCombineLatest.java   |   6 +-
 .../observable/ObservableConcatMap.java       |  14 +-
 .../observable/ObservableConcatMapEager.java  |   8 +-
 .../ObservableConcatMapScheduler.java         |  14 +-
 .../ObservableConcatWithCompletable.java      |   2 +-
 .../observable/ObservableConcatWithMaybe.java |   2 +-
 .../ObservableConcatWithSingle.java           |   2 +-
 .../observable/ObservableCountSingle.java     |   2 +-
 .../observable/ObservableCreate.java          |   6 +-
 .../observable/ObservableDebounce.java        |   6 +-
 .../observable/ObservableDebounceTimed.java   |   6 +-
 .../operators/observable/ObservableDelay.java |   4 +-
 .../observable/ObservableDematerialize.java   |   2 +-
 .../observable/ObservableDetach.java          |   2 +-
 .../observable/ObservableDistinct.java        |   2 +-
 .../ObservableDistinctUntilChanged.java       |   2 +-
 .../observable/ObservableDoAfterNext.java     |   2 +-
 .../observable/ObservableDoFinally.java       |   2 +-
 .../observable/ObservableDoOnEach.java        |   2 +-
 .../observable/ObservableDoOnLifecycle.java   |   2 +-
 .../observable/ObservableElementAt.java       |   2 +-
 .../observable/ObservableElementAtMaybe.java  |   4 +-
 .../observable/ObservableElementAtSingle.java |   4 +-
 .../observable/ObservableFilter.java          |   2 +-
 .../observable/ObservableFlatMap.java         |  14 +-
 .../ObservableFlatMapCompletable.java         |   4 +-
 ...servableFlatMapCompletableCompletable.java |   4 +-
 .../observable/ObservableFlatMapMaybe.java    |   6 +-
 .../observable/ObservableFlatMapSingle.java   |   6 +-
 .../observable/ObservableFlattenIterable.java |   2 +-
 .../observable/ObservableFromArray.java       |   2 +-
 .../observable/ObservableFromCallable.java    |   2 +-
 .../observable/ObservableFromFuture.java      |   2 +-
 .../observable/ObservableFromIterable.java    |   2 +-
 .../observable/ObservableFromSupplier.java    |   2 +-
 .../observable/ObservableGenerate.java        |   2 +-
 .../observable/ObservableGroupBy.java         |  16 +-
 .../observable/ObservableGroupJoin.java       |  10 +-
 .../operators/observable/ObservableHide.java  |   2 +-
 .../observable/ObservableIgnoreElements.java  |   2 +-
 .../ObservableIgnoreElementsCompletable.java  |   4 +-
 .../observable/ObservableInternalHelper.java  |  38 ++---
 .../operators/observable/ObservableJoin.java  |  10 +-
 .../operators/observable/ObservableJust.java  |   2 +-
 .../observable/ObservableLastMaybe.java       |   2 +-
 .../observable/ObservableLastSingle.java      |   2 +-
 .../observable/ObservableMapNotification.java |   2 +-
 .../observable/ObservableMaterialize.java     |   2 +-
 .../ObservableMergeWithCompletable.java       |   4 +-
 .../observable/ObservableMergeWithMaybe.java  |   8 +-
 .../observable/ObservableMergeWithSingle.java |   8 +-
 .../observable/ObservableObserveOn.java       |   4 +-
 .../observable/ObservableOnErrorNext.java     |   2 +-
 .../observable/ObservableOnErrorReturn.java   |   2 +-
 .../observable/ObservablePublish.java         |  10 +-
 .../observable/ObservablePublishSelector.java |   8 +-
 .../operators/observable/ObservableRange.java |   2 +-
 .../observable/ObservableRangeLong.java       |   2 +-
 .../observable/ObservableReduceMaybe.java     |   2 +-
 .../ObservableReduceSeedSingle.java           |   2 +-
 .../ObservableReduceWithSingle.java           |   2 +-
 .../observable/ObservableRefCount.java        |   4 +-
 .../observable/ObservableRepeat.java          |   2 +-
 .../observable/ObservableRepeatUntil.java     |   2 +-
 .../observable/ObservableRepeatWhen.java      |   4 +-
 .../observable/ObservableReplay.java          |  32 ++--
 .../ObservableRetryBiPredicate.java           |   2 +-
 .../observable/ObservableRetryPredicate.java  |   2 +-
 .../observable/ObservableRetryWhen.java       |   4 +-
 .../observable/ObservableSampleTimed.java     |   8 +-
 .../ObservableSampleWithObservable.java       |  10 +-
 .../observable/ObservableScalarXMap.java      |   8 +-
 .../operators/observable/ObservableScan.java  |   2 +-
 .../observable/ObservableScanSeed.java        |   2 +-
 .../observable/ObservableSequenceEqual.java   |   8 +-
 .../ObservableSequenceEqualSingle.java        |  10 +-
 .../observable/ObservableSerialized.java      |   2 +-
 .../observable/ObservableSingleMaybe.java     |   2 +-
 .../observable/ObservableSingleSingle.java    |   2 +-
 .../operators/observable/ObservableSkip.java  |   2 +-
 .../observable/ObservableSkipLast.java        |   2 +-
 .../observable/ObservableSkipLastTimed.java   |   4 +-
 .../observable/ObservableSkipUntil.java       |   4 +-
 .../observable/ObservableSkipWhile.java       |   2 +-
 .../observable/ObservableSubscribeOn.java     |   4 +-
 .../observable/ObservableSwitchIfEmpty.java   |   2 +-
 .../observable/ObservableSwitchMap.java       |  10 +-
 .../operators/observable/ObservableTake.java  |   2 +-
 .../observable/ObservableTakeLast.java        |   2 +-
 .../observable/ObservableTakeLastOne.java     |   2 +-
 .../observable/ObservableTakeLastTimed.java   |   4 +-
 .../observable/ObservableTakeUntil.java       |   4 +-
 .../ObservableTakeUntilPredicate.java         |   2 +-
 .../observable/ObservableTakeWhile.java       |   2 +-
 .../ObservableThrottleFirstTimed.java         |   4 +-
 .../observable/ObservableThrottleLatest.java  |   4 +-
 .../observable/ObservableTimeInterval.java    |   4 +-
 .../observable/ObservableTimeout.java         |   8 +-
 .../observable/ObservableTimeoutTimed.java    |   8 +-
 .../observable/ObservableToList.java          |   2 +-
 .../observable/ObservableToListSingle.java    |   4 +-
 .../observable/ObservableUnsubscribeOn.java   |   2 +-
 .../operators/observable/ObservableUsing.java |   2 +-
 .../observable/ObservableWindow.java          |  10 +-
 .../observable/ObservableWindowBoundary.java  |  10 +-
 .../ObservableWindowBoundarySelector.java     |  14 +-
 .../observable/ObservableWindowTimed.java     |  22 +--
 .../observable/ObservableWithLatestFrom.java  |   8 +-
 .../ObservableWithLatestFromMany.java         |   8 +-
 .../operators/observable/ObservableZip.java   |   8 +-
 .../observable/ObserverResourceWrapper.java   |   2 +-
 .../operators/single/SingleCache.java         |   4 +-
 .../operators/single/SingleCreate.java        |   2 +-
 .../single/SingleDelayWithCompletable.java    |   4 +-
 .../single/SingleDelayWithObservable.java     |   4 +-
 .../single/SingleDelayWithPublisher.java      |   4 +-
 .../single/SingleDelayWithSingle.java         |   4 +-
 .../operators/single/SingleDematerialize.java |   2 +-
 .../operators/single/SingleDetach.java        |   2 +-
 .../single/SingleDoAfterSuccess.java          |   2 +-
 .../single/SingleDoAfterTerminate.java        |   2 +-
 .../operators/single/SingleDoFinally.java     |   2 +-
 .../operators/single/SingleDoOnDispose.java   |   2 +-
 .../operators/single/SingleDoOnSubscribe.java |   2 +-
 .../single/SingleFlatMapCompletable.java      |   2 +-
 .../single/SingleFlatMapIterableFlowable.java |   4 +-
 .../SingleFlatMapIterableObservable.java      |   4 +-
 .../single/SingleFlatMapPublisher.java        |   4 +-
 .../single/SingleInternalHelper.java          |  12 +-
 .../operators/single/SingleMaterialize.java   |   2 +-
 .../operators/single/SingleObserveOn.java     |   2 +-
 .../operators/single/SingleResumeNext.java    |   2 +-
 .../operators/single/SingleSubscribeOn.java   |   2 +-
 .../operators/single/SingleTakeUntil.java     |   2 +-
 .../operators/single/SingleTimeout.java       |   6 +-
 .../operators/single/SingleToObservable.java  |   2 +-
 .../operators/single/SingleUnsubscribeOn.java |   2 +-
 .../operators/single/SingleZipArray.java      |   6 +-
 .../operators/single/SingleZipIterable.java   |   4 +-
 .../internal/queue/MpscLinkedQueue.java       |   8 +-
 .../internal/queue/SpscLinkedArrayQueue.java  |   8 +-
 .../schedulers/AbstractDirectTask.java        |   4 +-
 .../schedulers/ComputationScheduler.java      |   2 +-
 .../internal/schedulers/DisposeOnCancel.java  |   6 +-
 .../schedulers/ExecutorScheduler.java         |   2 +-
 .../schedulers/InstantPeriodicTask.java       |   8 +-
 .../internal/schedulers/IoScheduler.java      |   4 +-
 .../internal/schedulers/RxThreadFactory.java  |   4 +-
 .../schedulers/ScheduledDirectTask.java       |   2 +-
 .../schedulers/SchedulerPoolFactory.java      |   8 +-
 .../internal/schedulers/SingleScheduler.java  |   2 +-
 .../schedulers/TrampolineScheduler.java       |   2 +-
 .../subscribers/FutureSubscriber.java         |   5 +-
 .../subscribers/StrictSubscriber.java         |   2 +-
 .../SubscriberResourceWrapper.java            |   2 +-
 .../subscriptions/AsyncSubscription.java      |   4 +-
 .../subscriptions/SubscriptionArbiter.java    |   2 +-
 .../internal/util/ArrayListSupplier.java      |   4 +-
 .../internal/util/ConnectConsumer.java        |   2 +-
 .../internal/util/ExceptionHelper.java        |   8 +-
 .../internal/util/HashMapSupplier.java        |   2 +-
 .../internal/util/LinkedArrayList.java        |   2 +-
 .../internal/util/ListAddBiConsumer.java      |   2 +-
 .../internal/util/MergerBiFunction.java       |   6 +-
 .../internal/util/QueueDrainHelper.java       |   4 +-
 .../rxjava3/internal/util/SorterFunction.java |   2 +-
 .../internal/util/VolatileSizeArrayList.java  |  18 ++-
 .../rxjava3/parallel/ParallelFlowable.java    |  21 ++-
 .../processors/MulticastProcessor.java        |   2 +-
 .../rxjava3/processors/ReplayProcessor.java   |  14 +-
 .../rxjava3/schedulers/Schedulers.java        |  20 +--
 .../rxjava3/subjects/ReplaySubject.java       |  12 +-
 .../rxjava3/subjects/UnicastSubject.java      |   8 +-
 467 files changed, 1513 insertions(+), 1600 deletions(-)

diff --git a/docs/Backpressure.md b/docs/Backpressure.md
index 8feec0d487..bfe90330bb 100644
--- a/docs/Backpressure.md
+++ b/docs/Backpressure.md
@@ -34,25 +34,25 @@ The following diagrams show how you could use each of these operators on the bur
 The `sample` operator periodically "dips" into the sequence and emits only the most recently emitted item during each dip:
 
 <img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.sample.png" width="640" height="260" />​
-````groovy
+```java
 Observable<Integer> burstySampled = bursty.sample(500, TimeUnit.MILLISECONDS);
-````
+```
 
 ### throttleFirst
 The `throttleFirst` operator is similar, but emits not the most recently emitted item, but the first item that was emitted after the previous "dip":
 
 <img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.throttleFirst.png" width="640" height="260" />​
-````groovy
+```java
 Observable<Integer> burstyThrottled = bursty.throttleFirst(500, TimeUnit.MILLISECONDS);
-````
+```
 
 ### debounce (or throttleWithTimeout)
 The `debounce` operator emits only those items from the source Observable that are not followed by another item within a specified duration:
 
 <img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.debounce.png" width="640" height="240" />​
-````groovy
+```java
 Observable<Integer> burstyDebounced = bursty.debounce(10, TimeUnit.MILLISECONDS);
-````
+```
 
 ## Buffers and windows
 
@@ -65,14 +65,14 @@ The following diagrams show how you could use each of these operators on the bur
 You could, for example, close and emit a buffer of items from the bursty Observable periodically, at a regular interval of time:
 
 <img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.buffer2.png" width="640" height="270" />​
-````groovy
+```java
 Observable<List<Integer>> burstyBuffered = bursty.buffer(500, TimeUnit.MILLISECONDS);
-````
+```
 
 Or you could get fancy, and collect items in buffers during the bursty periods and emit them at the end of each burst, by using the `debounce` operator to emit a buffer closing indicator to the `buffer` operator:
 
 <img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.buffer1.png" width="640" height="500" />​
-````groovy
+```java
 // we have to multicast the original bursty Observable so we can use it
 // both as our source and as the source for our buffer closing selector:
 Observable<Integer> burstyMulticast = bursty.publish().refCount();
@@ -87,16 +87,16 @@ Observable<List<Integer>> burstyBuffered = burstyMulticast.buffer(burstyDebounce
 `window` is similar to `buffer`. One variant of `window` allows you to periodically emit Observable windows of items at a regular interval of time:
 
 <img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.window1.png" width="640" height="325" />​
-````groovy
+```java
 Observable<Observable<Integer>> burstyWindowed = bursty.window(500, TimeUnit.MILLISECONDS);
 ````
 
 You could also choose to emit a new window each time you have collected a particular number of items from the source Observable:
 
 <img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.window2.png" width="640" height="325" />​
-````groovy
+```java
 Observable<Observable<Integer>> burstyWindowed = bursty.window(5);
-````
+```
 
 # Callstack blocking as a flow-control alternative to backpressure
 
@@ -110,8 +110,8 @@ When you subscribe to an `Observable` with a `Subscriber`, you can request react
 
 Then, after handling this item (or these items) in `onNext()`, you can call `request()` again to instruct the `Observable` to emit another item (or items).  Here is an example of a `Subscriber` that requests one item at a time from `someObservable`:
 
-````java
-someObservable.subscribe(new Subscriber<t>() {
+```java
+someObservable.subscribe(new Subscriber<T>() {
     @Override
     public void onStart() {
       request(1);
@@ -134,7 +134,7 @@ someObservable.subscribe(new Subscriber<t>() {
       request(1);
     }
 });
-````
+```
 
 You can pass a magic number to `request`, `request(Long.MAX_VALUE)`, to disable reactive pull backpressure and to ask the Observable to emit items at its own pace. `request(0)` is a legal call, but has no effect. Passing values less than zero to `request` will cause an exception to be thrown.
 
diff --git a/docs/Combining-Observables.md b/docs/Combining-Observables.md
index bcc19f6b0f..fcde91b76b 100644
--- a/docs/Combining-Observables.md
+++ b/docs/Combining-Observables.md
@@ -2,13 +2,13 @@ This section explains operators you can use to combine multiple Observables.
 
 # Outline
 
-- [`combineLatest`](#combineLatest)
+- [`combineLatest`](#combinelatest)
 - [`join` and `groupJoin`](#joins)
 - [`merge`](#merge)
-- [`mergeDelayError`](#mergeDelayError)
+- [`mergeDelayError`](#mergedelayerror)
 - [`rxjava-joins`](#rxjava-joins)
-- [`startWith`](#startWith)
-- [`switchOnNext`](#switchOnNext)
+- [`startWith`](#startwith)
+- [`switchOnNext`](#switchonnext)
 - [`zip`](#zip)
 
 ## startWith
diff --git a/docs/How-To-Use-RxJava.md b/docs/How-To-Use-RxJava.md
index 16d156caa9..ad309496b9 100644
--- a/docs/How-To-Use-RxJava.md
+++ b/docs/How-To-Use-RxJava.md
@@ -96,9 +96,9 @@ You use the Observable [`just( )`](http://reactivex.io/documentation/operators
 Observable<String> o = Observable.from("a", "b", "c");
 
 def list = [5, 6, 7, 8]
-Observable<Integer> o = Observable.from(list);
+Observable<Integer> o2 = Observable.from(list);
 
-Observable<String> o = Observable.just("one object");
+Observable<String> o3 = Observable.just("one object");
 ```
 
 These converted Observables will synchronously invoke the [`onNext( )`](Observable#onnext-oncompleted-and-onerror) method of any subscriber that subscribes to them, for each item to be emitted by the Observable, and will then invoke the subscriber’s [`onCompleted( )`](Observable#onnext-oncompleted-and-onerror) method.
diff --git a/docs/Writing-operators-for-2.0.md b/docs/Writing-operators-for-2.0.md
index 7b6e57666e..e8486564b1 100644
--- a/docs/Writing-operators-for-2.0.md
+++ b/docs/Writing-operators-for-2.0.md
@@ -1,7 +1,7 @@
 ##### Table of contents
 
   - [Introduction](#introduction)
-    - [Warning on internal components](warning-on-internal-components)
+    - [Warning on internal components](#warning-on-internal-components)
   - [Atomics, serialization, deferred actions](#atomics-serialization-deferred-actions)
     - [Field updaters and Android](#field-updaters-and-android)
     - [Request accounting](#request-accounting)
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java
index 6d5bb44b23..836957192e 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java
@@ -86,48 +86,42 @@ public void setup() {
 
         singleFlatMapPublisher = Single.just(1).flatMapPublisher(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return arrayFlowable;
             }
         });
 
         singleFlatMapHidePublisher = Single.just(1).flatMapPublisher(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return arrayFlowableHide;
             }
         });
 
         singleFlattenAsPublisher = Single.just(1).flattenAsFlowable(new Function<Integer, Iterable<? extends Integer>>() {
             @Override
-            public Iterable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Iterable<? extends Integer> apply(Integer v) {
                 return list;
             }
         });
 
         maybeFlatMapPublisher = Maybe.just(1).flatMapPublisher(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return arrayFlowable;
             }
         });
 
         maybeFlatMapHidePublisher = Maybe.just(1).flatMapPublisher(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return arrayFlowableHide;
             }
         });
 
         maybeFlattenAsPublisher = Maybe.just(1).flattenAsFlowable(new Function<Integer, Iterable<? extends Integer>>() {
             @Override
-            public Iterable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Iterable<? extends Integer> apply(Integer v) {
                 return list;
             }
         });
@@ -140,48 +134,42 @@ public Iterable<? extends Integer> apply(Integer v)
 
         singleFlatMapObservable = Single.just(1).flatMapObservable(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return arrayObservable;
             }
         });
 
         singleFlatMapHideObservable = Single.just(1).flatMapObservable(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return arrayObservableHide;
             }
         });
 
         singleFlattenAsObservable = Single.just(1).flattenAsObservable(new Function<Integer, Iterable<? extends Integer>>() {
             @Override
-            public Iterable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Iterable<? extends Integer> apply(Integer v) {
                 return list;
             }
         });
 
         maybeFlatMapObservable = Maybe.just(1).flatMapObservable(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return arrayObservable;
             }
         });
 
         maybeFlatMapHideObservable = Maybe.just(1).flatMapObservable(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return arrayObservableHide;
             }
         });
 
         maybeFlattenAsObservable = Maybe.just(1).flattenAsObservable(new Function<Integer, Iterable<? extends Integer>>() {
             @Override
-            public Iterable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Iterable<? extends Integer> apply(Integer v) {
                 return list;
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java
index 4afa54ecc8..8098b1aaf4 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java
@@ -68,7 +68,7 @@ public void setup() {
 
         Callable<Integer> c = new Callable<Integer>() {
             @Override
-            public Integer call() throws Exception {
+            public Integer call() {
                 return 1;
             }
         };
@@ -120,71 +120,71 @@ public void subscribeOnFlowable(Blackhole bh) {
     @Benchmark
     public void observeOnFlowable(Blackhole bh) {
         observeOnFlowable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineFlowable(Blackhole bh) {
         pipelineFlowable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void subscribeOnObservable(Blackhole bh) {
         subscribeOnObservable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void observeOnObservable(Blackhole bh) {
         observeOnObservable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineObservable(Blackhole bh) {
         pipelineObservable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void observeOnSingle(Blackhole bh) {
         observeOnSingle.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void subscribeOnSingle(Blackhole bh) {
         subscribeOnSingle.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineSingle(Blackhole bh) {
         pipelineSingle.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void observeOnCompletable(Blackhole bh) {
         observeOnCompletable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void subscribeOnCompletable(Blackhole bh) {
         subscribeOnCompletable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineCompletable(Blackhole bh) {
         pipelineCompletable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void observeOnMaybe(Blackhole bh) {
         observeOnMaybe.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void subscribeOnMaybe(Blackhole bh) {
         subscribeOnMaybe.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineMaybe(Blackhole bh) {
         pipelineMaybe.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
 }
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java
index e05921c531..37a4f196e8 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java
@@ -114,11 +114,11 @@ public void nbpRangeMapRange(Blackhole bh) {
 
     @Benchmark
     public void singleJust(Blackhole bh) {
-        singleJust.subscribe(new LatchedSingleObserver<Integer>(bh));
+        singleJust.subscribe(new LatchedSingleObserver<>(bh));
     }
 
     @Benchmark
     public void singleJustMapJust(Blackhole bh) {
-        singleJustMapJust.subscribe(new LatchedSingleObserver<Integer>(bh));
+        singleJustMapJust.subscribe(new LatchedSingleObserver<>(bh));
     }
 }
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java
index 8541f92834..2a1fd7539c 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java
@@ -41,14 +41,14 @@ public void setup() {
 
         flowable = Flowable.fromArray(array).flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
+            public Publisher<Integer> apply(Integer v) {
                 return Flowable.just(v);
             }
         });
 
         observable = Observable.fromArray(array).flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java
index cfc5a1af97..866fe5de77 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java
@@ -47,14 +47,14 @@ public void setup() {
 
         flowable = Flowable.fromArray(array).flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
+            public Iterable<Integer> apply(Integer v) {
                 return list;
             }
         });
 
         observable = Observable.fromArray(array).flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
+            public Iterable<Integer> apply(Integer v) {
                 return list;
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java
index bb2394a053..d2ac9aa5b7 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java
@@ -44,14 +44,14 @@ public void setup() {
 
         flowable = Flowable.fromArray(array).flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
+            public Iterable<Integer> apply(Integer v) {
                 return singletonList;
             }
         });
 
         observable = Observable.fromArray(array).flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
+            public Iterable<Integer> apply(Integer v) {
                 return singletonList;
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java
index 663fd8cdde..a3195b760d 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java
@@ -44,14 +44,14 @@ public void setup() {
 
         flowable = Flowable.fromArray(array).flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
+            public Iterable<Integer> apply(Integer v) {
                 return list;
             }
         });
 
         observable = Observable.fromArray(array).flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
+            public Iterable<Integer> apply(Integer v) {
                 return list;
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java
index 83f2d4c4f4..e9494e97df 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java
@@ -45,7 +45,7 @@ public class FlowableFlatMapCompletableAsyncPerf implements Action {
     Flowable<Object> flatMap;
 
     @Override
-    public void run() throws Exception {
+    public void run() {
         Blackhole.consumeCPU(work);
     }
 
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java b/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java
index 24c4e016d3..772d202dca 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java
@@ -43,7 +43,7 @@ public void onNext(Integer t) {
         }
     }
 
-    final class IncrementingIterable implements Iterable<Integer> {
+    static final class IncrementingIterable implements Iterable<Integer> {
 
         final class IncrementingIterator implements Iterator<Integer> {
             int i;
@@ -77,7 +77,7 @@ public Iterator<Integer> iterator() {
         }
     }
 
-    final class IncrementingPublisher implements Publisher<Integer> {
+    static final class IncrementingPublisher implements Publisher<Integer> {
 
         final int size;
 
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java
index d22c1699e5..f60204c88b 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java
@@ -113,71 +113,71 @@ public void subscribeOnFlowable(Blackhole bh) {
     @Benchmark
     public void observeOnFlowable(Blackhole bh) {
         observeOnFlowable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineFlowable(Blackhole bh) {
         pipelineFlowable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void subscribeOnObservable(Blackhole bh) {
         subscribeOnObservable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void observeOnObservable(Blackhole bh) {
         observeOnObservable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineObservable(Blackhole bh) {
         pipelineObservable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void observeOnSingle(Blackhole bh) {
         observeOnSingle.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void subscribeOnSingle(Blackhole bh) {
         subscribeOnSingle.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineSingle(Blackhole bh) {
         pipelineSingle.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void observeOnCompletable(Blackhole bh) {
         observeOnCompletable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void subscribeOnCompletable(Blackhole bh) {
         subscribeOnCompletable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineCompletable(Blackhole bh) {
         pipelineCompletable.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void observeOnMaybe(Blackhole bh) {
         observeOnMaybe.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void subscribeOnMaybe(Blackhole bh) {
         subscribeOnMaybe.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
     @Benchmark
     public void pipelineMaybe(Blackhole bh) {
         pipelineMaybe.subscribeWith(new PerfAsyncConsumer(bh)).await(1);
-    };
+    }
 
 }
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java
index b7ed7e4ae1..c7c407de15 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java
@@ -143,31 +143,31 @@ public static void main(String[] args) throws Exception {
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.just(1);
             }
         }, "just", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.range(1, 10);
             }
         }, "range", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.empty();
             }
         }, "empty", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.fromCallable(new Callable<Object>() {
                     @Override
-                    public Object call() throws Exception {
+                    public Object call() {
                         return 1;
                     }
                 });
@@ -176,38 +176,38 @@ public Object call() throws Exception {
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return new MyRx2Observer();
             }
         }, "consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return new io.reactivex.rxjava3.observers.TestObserver<>();
             }
         }, "test-consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.just(1).subscribeWith(new MyRx2Observer());
             }
         }, "just+consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.range(1, 10).subscribeWith(new MyRx2Observer());
             }
         }, "range+consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.range(1, 10).map(new Function<Integer, Object>() {
                     @Override
-                    public Object apply(Integer v) throws Exception {
+                    public Object apply(Integer v) {
                         return v;
                     }
                 }).subscribeWith(new MyRx2Observer());
@@ -216,15 +216,15 @@ public Object apply(Integer v) throws Exception {
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.range(1, 10).map(new Function<Integer, Object>() {
                     @Override
-                    public Object apply(Integer v) throws Exception {
+                    public Object apply(Integer v) {
                         return v;
                     }
                 }).filter(new Predicate<Object>() {
                     @Override
-                    public boolean test(Object v) throws Exception {
+                    public boolean test(Object v) {
                         return true;
                     }
                 }).subscribeWith(new MyRx2Observer());
@@ -233,91 +233,91 @@ public boolean test(Object v) throws Exception {
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.range(1, 10).subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Observer());
             }
         }, "range+subscribeOn+consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.range(1, 10).observeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Observer());
             }
         }, "range+observeOn+consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Observable.range(1, 10).subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).observeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Observer());
             }
         }, "range+subscribeOn+observeOn+consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.AsyncSubject.create();
             }
         }, "Async", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.PublishSubject.create();
             }
         }, "Publish", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.ReplaySubject.create();
             }
         }, "Replay", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.BehaviorSubject.create();
             }
         }, "Behavior", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.UnicastSubject.create();
             }
         }, "Unicast", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.AsyncSubject.create().subscribeWith(new MyRx2Observer());
             }
         }, "Async+consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.PublishSubject.create().subscribeWith(new MyRx2Observer());
             }
         }, "Publish+consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.ReplaySubject.create().subscribeWith(new MyRx2Observer());
             }
         }, "Replay+consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.BehaviorSubject.create().subscribeWith(new MyRx2Observer());
             }
         }, "Behavior+consumer", "Rx2Observable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.subjects.UnicastSubject.create().subscribeWith(new MyRx2Observer());
             }
         }, "Unicast+consumer", "Rx2Observable");
@@ -326,38 +326,38 @@ public Object call() throws Exception {
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.just(1);
             }
         }, "just", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.range(1, 10);
             }
         }, "range", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.empty();
             }
         }, "empty", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.empty();
             }
         }, "empty", "Rx2Flowable", 10000000);
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.fromCallable(new Callable<Object>() {
                     @Override
-                    public Object call() throws Exception {
+                    public Object call() {
                         return 1;
                     }
                 });
@@ -366,38 +366,38 @@ public Object call() throws Exception {
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return new MyRx2Subscriber();
             }
         }, "consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return new io.reactivex.rxjava3.observers.TestObserver<>();
             }
         }, "test-consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.just(1).subscribeWith(new MyRx2Subscriber());
             }
         }, "just+consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.range(1, 10).subscribeWith(new MyRx2Subscriber());
             }
         }, "range+consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.range(1, 10).map(new Function<Integer, Object>() {
                     @Override
-                    public Object apply(Integer v) throws Exception {
+                    public Object apply(Integer v) {
                         return v;
                     }
                 }).subscribeWith(new MyRx2Subscriber());
@@ -406,15 +406,15 @@ public Object apply(Integer v) throws Exception {
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.range(1, 10).map(new Function<Integer, Object>() {
                     @Override
-                    public Object apply(Integer v) throws Exception {
+                    public Object apply(Integer v) {
                         return v;
                     }
                 }).filter(new Predicate<Object>() {
                     @Override
-                    public boolean test(Object v) throws Exception {
+                    public boolean test(Object v) {
                         return true;
                     }
                 }).subscribeWith(new MyRx2Subscriber());
@@ -423,91 +423,91 @@ public boolean test(Object v) throws Exception {
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.range(1, 10).subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Subscriber());
             }
         }, "range+subscribeOn+consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.range(1, 10).observeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Subscriber());
             }
         }, "range+observeOn+consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.core.Flowable.range(1, 10).subscribeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).observeOn(io.reactivex.rxjava3.schedulers.Schedulers.computation()).subscribeWith(new MyRx2Subscriber());
             }
         }, "range+subscribeOn+observeOn+consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.AsyncProcessor.create();
             }
         }, "Async", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.PublishProcessor.create();
             }
         }, "Publish", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.ReplayProcessor.create();
             }
         }, "Replay", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.BehaviorProcessor.create();
             }
         }, "Behavior", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.UnicastProcessor.create();
             }
         }, "Unicast", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.AsyncProcessor.create().subscribeWith(new MyRx2Subscriber());
             }
         }, "Async+consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.PublishProcessor.create().subscribeWith(new MyRx2Subscriber());
             }
         }, "Publish+consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.ReplayProcessor.create().subscribeWith(new MyRx2Subscriber());
             }
         }, "Replay+consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.BehaviorProcessor.create().subscribeWith(new MyRx2Subscriber());
             }
         }, "Behavior+consumer", "Rx2Flowable");
 
         checkMemory(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 return io.reactivex.rxjava3.processors.UnicastProcessor.create().subscribeWith(new MyRx2Subscriber());
             }
         }, "Unicast+consumer", "Rx2Flowable");
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java
index 621894bd74..0eb7f03aa9 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java
@@ -40,7 +40,7 @@ public int getSize() {
     }
 
     @Benchmark
-    public void flatMapIntPassthruSync(Input input) throws InterruptedException {
+    public void flatMapIntPassthruSync(Input input) {
         input.flowable.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
             public Publisher<Integer> apply(Integer v) {
@@ -66,7 +66,7 @@ public Publisher<Integer> apply(Integer i) {
     }
 
     @Benchmark
-    public void flatMapTwoNestedSync(final Input input) throws InterruptedException {
+    public void flatMapTwoNestedSync(final Input input) {
         Flowable.range(1, 2).flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
             public Publisher<Integer> apply(Integer i) {
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java
index e4c52b5040..51da5a5c53 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java
@@ -20,7 +20,7 @@
 
 public class PerfSubscriber implements FlowableSubscriber<Object> {
 
-    public CountDownLatch latch = new CountDownLatch(1);
+    public final CountDownLatch latch = new CountDownLatch(1);
     private final Blackhole bh;
 
     public PerfSubscriber(Blackhole bh) {
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java
index 0282aa31e5..faf0423760 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java
@@ -40,7 +40,7 @@ public class ReducePerf implements BiFunction<Integer, Integer, Integer> {
     Maybe<Integer> flowMaybe;
 
     @Override
-    public Integer apply(Integer t1, Integer t2) throws Exception {
+    public Integer apply(Integer t1, Integer t2) {
         return t1 + t2;
     }
 
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java
index 71161b32d3..b2f89a39ca 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java
@@ -39,7 +39,7 @@ public class TakeUntilPerf implements Consumer<Integer> {
     Observable<Integer> observable;
 
     @Override
-    public void accept(Integer t) throws Exception {
+    public void accept(Integer t) {
         items++;
     }
 
@@ -48,7 +48,7 @@ public void setup() {
 
         flowable = Flowable.range(1, 1000 * 1000).takeUntil(Flowable.fromCallable(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 int c = count;
                 while (items < c) { }
                 return 1;
@@ -57,7 +57,7 @@ public Object call() throws Exception {
 
         observable = Observable.range(1, 1000 * 1000).takeUntil(Observable.fromCallable(new Callable<Object>() {
             @Override
-            public Object call() throws Exception {
+            public Object call() {
                 int c = count;
                 while (items < c) { }
                 return 1;
@@ -71,7 +71,7 @@ public void flowable() {
 
         flowable.subscribe(this, Functions.emptyConsumer(), new Action() {
             @Override
-            public void run() throws Exception {
+            public void run() {
                 cdl.countDown();
             }
         });
@@ -85,7 +85,7 @@ public void observable() {
 
         observable.subscribe(this, Functions.emptyConsumer(), new Action() {
             @Override
-            public void run() throws Exception {
+            public void run() {
                 cdl.countDown();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java
index 28b1d050fc..9c86e83678 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java
@@ -48,7 +48,7 @@ public void setup() {
 
         final BiFunction<Integer, Integer, Integer> second = new BiFunction<Integer, Integer, Integer>() {
             @Override
-            public Integer apply(Integer a, Integer b) throws Exception {
+            public Integer apply(Integer a, Integer b) {
                 return b;
             }
         };
@@ -57,7 +57,7 @@ public Integer apply(Integer a, Integer b) throws Exception {
 
         flowableInner = source.concatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
+            public Publisher<Integer> apply(Integer v) {
                 return Flowable.range(1, 50).reduce(second).toFlowable();
             }
         });
@@ -68,7 +68,7 @@ public Publisher<Integer> apply(Integer v) throws Exception {
 
         observableInner = sourceObs.concatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.range(1, 50).reduce(second).toObservable();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java
index 582d9da8dc..6205efa25d 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java
@@ -103,84 +103,84 @@ public void setup() {
 
         flowFlatMapFlowable1 = fsource.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
+            public Publisher<Integer> apply(Integer v) {
                 return Flowable.just(v);
             }
         });
 
         flowFlatMapFlowable0 = fsource.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
+            public Publisher<Integer> apply(Integer v) {
                 return Flowable.empty();
             }
         });
 
         flowFlatMapSingle1 = fsource.flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
             @Override
-            public SingleSource<Integer> apply(Integer v) throws Exception {
+            public SingleSource<Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
 
         flowFlatMapMaybe1 = fsource.flatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
             @Override
-            public MaybeSource<Integer> apply(Integer v) throws Exception {
+            public MaybeSource<Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
 
         flowFlatMapMaybe0 = fsource.flatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
             @Override
-            public MaybeSource<Integer> apply(Integer v) throws Exception {
+            public MaybeSource<Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
 
         flowFlatMapCompletable0 = fsource.flatMapCompletable(new Function<Integer, CompletableSource>() {
             @Override
-            public CompletableSource apply(Integer v) throws Exception {
+            public CompletableSource apply(Integer v) {
                 return Completable.complete();
             }
         });
 
         flowFlatMapIterable1 = fsource.flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
+            public Iterable<Integer> apply(Integer v) {
                 return Collections.singletonList(v);
             }
         });
 
         flowFlatMapIterable0 = fsource.flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
-                return Collections.<Integer>emptyList();
+            public Iterable<Integer> apply(Integer v) {
+                return Collections.emptyList();
             }
         });
 
         flowFlatMapSingle1 = fsource.flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
             @Override
-            public SingleSource<Integer> apply(Integer v) throws Exception {
+            public SingleSource<Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
 
         flowFlatMapMaybe1 = fsource.flatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
             @Override
-            public MaybeSource<Integer> apply(Integer v) throws Exception {
+            public MaybeSource<Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
 
         flowFlatMapMaybe0 = fsource.flatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
             @Override
-            public MaybeSource<Integer> apply(Integer v) throws Exception {
+            public MaybeSource<Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
 
         flowFlatMapCompletable0 = fsource.flatMapCompletable(new Function<Integer, CompletableSource>() {
             @Override
-            public CompletableSource apply(Integer v) throws Exception {
+            public CompletableSource apply(Integer v) {
                 return Completable.complete();
             }
         });
@@ -189,43 +189,43 @@ public CompletableSource apply(Integer v) throws Exception {
 
         flowFlatMapSingleAsFlow1 = fsource.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
+            public Publisher<Integer> apply(Integer v) {
                 return Single.just(v).toFlowable();
             }
         });
 
         flowFlatMapMaybeAsFlow1 = fsource.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
+            public Publisher<Integer> apply(Integer v) {
                 return Maybe.just(v).toFlowable();
             }
         });
 
         flowFlatMapMaybeAsFlow0 = fsource.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
+            public Publisher<Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toFlowable();
             }
         });
 
         flowFlatMapCompletableAsFlow0 = fsource.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
-                return Completable.complete().<Integer>toFlowable();
+            public Publisher<Integer> apply(Integer v) {
+                return Completable.complete().toFlowable();
             }
         });
 
         flowFlatMapIterableAsFlow1 = fsource.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
+            public Publisher<Integer> apply(Integer v) {
                 return Flowable.fromIterable(Collections.singletonList(v));
             }
         });
 
         flowFlatMapIterableAsFlow0 = fsource.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
-                return Flowable.fromIterable(Collections.<Integer>emptyList());
+            public Publisher<Integer> apply(Integer v) {
+                return Flowable.fromIterable(Collections.emptyList());
             }
         });
 
@@ -235,57 +235,57 @@ public Publisher<Integer> apply(Integer v) throws Exception {
 
         obsFlatMapObservable1 = osource.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
 
         obsFlatMapObservable0 = osource.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
 
         obsFlatMapSingle1 = osource.flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
             @Override
-            public SingleSource<Integer> apply(Integer v) throws Exception {
+            public SingleSource<Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
 
         obsFlatMapMaybe1 = osource.flatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
             @Override
-            public MaybeSource<Integer> apply(Integer v) throws Exception {
+            public MaybeSource<Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
 
         obsFlatMapMaybe0 = osource.flatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
             @Override
-            public MaybeSource<Integer> apply(Integer v) throws Exception {
+            public MaybeSource<Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
 
         obsFlatMapCompletable0 = osource.flatMapCompletable(new Function<Integer, CompletableSource>() {
             @Override
-            public CompletableSource apply(Integer v) throws Exception {
+            public CompletableSource apply(Integer v) {
                 return Completable.complete();
             }
         });
 
         obsFlatMapIterable1 = osource.flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
+            public Iterable<Integer> apply(Integer v) {
                 return Collections.singletonList(v);
             }
         });
 
         obsFlatMapIterable0 = osource.flatMapIterable(new Function<Integer, Iterable<Integer>>() {
             @Override
-            public Iterable<Integer> apply(Integer v) throws Exception {
-                return Collections.<Integer>emptyList();
+            public Iterable<Integer> apply(Integer v) {
+                return Collections.emptyList();
             }
         });
 
@@ -293,43 +293,43 @@ public Iterable<Integer> apply(Integer v) throws Exception {
 
         obsFlatMapSingleAsObs1 = osource.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
+            public Observable<Integer> apply(Integer v) {
                 return Single.just(v).toObservable();
             }
         });
 
         obsFlatMapMaybeAsObs1 = osource.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
+            public Observable<Integer> apply(Integer v) {
                 return Maybe.just(v).toObservable();
             }
         });
 
         obsFlatMapMaybeAsObs0 = osource.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
+            public Observable<Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toObservable();
             }
         });
 
         obsFlatMapCompletableAsObs0 = osource.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
-                return Completable.complete().<Integer>toObservable();
+            public Observable<Integer> apply(Integer v) {
+                return Completable.complete().toObservable();
             }
         });
 
         obsFlatMapIterableAsObs1 = osource.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.fromIterable(Collections.singletonList(v));
             }
         });
 
         obsFlatMapIterableAsObs0 = osource.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<Integer> apply(Integer v) throws Exception {
-                return Observable.fromIterable(Collections.<Integer>emptyList());
+            public Observable<Integer> apply(Integer v) {
+                return Observable.fromIterable(Collections.emptyList());
             }
         });
     }
diff --git a/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java b/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java
index 31d0ecc8c5..4eaac7b0da 100644
--- a/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java
@@ -49,7 +49,7 @@ public class ParallelPerf implements Function<Integer, Integer> {
     Flowable<Integer> parallel;
 
     @Override
-    public Integer apply(Integer t) throws Exception {
+    public Integer apply(Integer t) {
         Blackhole.consumeCPU(compute);
         return t;
     }
@@ -66,7 +66,7 @@ public void setup() {
 
         flatMap = source.flatMap(new Function<Integer, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(Integer v) throws Exception {
+            public Publisher<Integer> apply(Integer v) {
                 return Flowable.just(v).subscribeOn(Schedulers.computation())
                         .map(ParallelPerf.this);
             }
@@ -75,13 +75,13 @@ public Publisher<Integer> apply(Integer v) throws Exception {
         groupBy = source.groupBy(new Function<Integer, Integer>() {
             int i;
             @Override
-            public Integer apply(Integer v) throws Exception {
+            public Integer apply(Integer v) {
                 return (i++) % cpu;
             }
         })
         .flatMap(new Function<GroupedFlowable<Integer, Integer>, Publisher<Integer>>() {
             @Override
-            public Publisher<Integer> apply(GroupedFlowable<Integer, Integer> g) throws Exception {
+            public Publisher<Integer> apply(GroupedFlowable<Integer, Integer> g) {
                 return g.observeOn(Schedulers.computation()).map(ParallelPerf.this);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java
index cb58173206..9e1096ab74 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.concatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.empty();
             }
         });
 
         flowableConvert = source.concatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Completable.complete().toFlowable();
             }
         });
 
         flowableDedicated = source.concatMapCompletable(new Function<Integer, Completable>() {
             @Override
-            public Completable apply(Integer v)
-                    throws Exception {
+            public Completable apply(Integer v) {
                 return Completable.complete();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java
index 1aff189e56..a211fbe829 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.concatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.empty();
             }
         });
 
         concatMapToFlowableEmpty = source.concatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toFlowable();
             }
         });
 
         flowableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java
index 38ca515171..059a0b162b 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.concatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.just(v);
             }
         });
 
         flowableConvert = source.concatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Maybe.just(v).toFlowable();
             }
         });
 
         flowableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java
index 04148d7a47..e812708a15 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.concatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.just(v);
             }
         });
 
         flowableConvert = source.concatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Single.just(v).toFlowable();
             }
         });
 
         flowableDedicated = source.concatMapSingle(new Function<Integer, Single<? extends Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Single<? extends Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java
index e605629a8d..1960735cfa 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.flatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.empty();
             }
         });
 
         flowableConvert = source.flatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Completable.complete().toFlowable();
             }
         });
 
         flowableDedicated = source.flatMapCompletable(new Function<Integer, Completable>() {
             @Override
-            public Completable apply(Integer v)
-                    throws Exception {
+            public Completable apply(Integer v) {
                 return Completable.complete();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java
index 23bd80fe6b..96e6fcf672 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.flatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.empty();
             }
         });
 
         flowableConvert = source.flatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toFlowable();
             }
         });
 
         flowableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java
index bbbc96fc03..2f71d5793e 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.flatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.just(v);
             }
         });
 
         flowableConvert = source.flatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Maybe.just(v).toFlowable();
             }
         });
 
         flowableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java
index 8407a60e6a..2bbdf9bf95 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.flatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.just(v);
             }
         });
 
         flowableConvert = source.flatMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Single.just(v).toFlowable();
             }
         });
 
         flowableDedicated = source.flatMapSingle(new Function<Integer, Single<? extends Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Single<? extends Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java
index 25b4e34529..033d35c429 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.switchMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.empty();
             }
         });
 
         flowableConvert = source.switchMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Completable.complete().toFlowable();
             }
         });
 
         flowableDedicated = source.switchMapCompletable(new Function<Integer, Completable>() {
             @Override
-            public Completable apply(Integer v)
-                    throws Exception {
+            public Completable apply(Integer v) {
                 return Completable.complete();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java
index ff6d5999ba..adc6060189 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.switchMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.empty();
             }
         });
 
         flowableConvert = source.switchMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toFlowable();
             }
         });
 
         flowableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java
index 87071d1108..d5d8cb9443 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.switchMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.just(v);
             }
         });
 
         flowableConvert = source.switchMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Maybe.just(v).toFlowable();
             }
         });
 
         flowableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java
index a633856881..a997f27b53 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java
@@ -48,24 +48,21 @@ public void setup() {
 
         flowablePlain = source.switchMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Flowable.just(v);
             }
         });
 
         flowableConvert = source.switchMap(new Function<Integer, Publisher<? extends Integer>>() {
             @Override
-            public Publisher<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Publisher<? extends Integer> apply(Integer v) {
                 return Single.just(v).toFlowable();
             }
         });
 
         flowableDedicated = source.switchMapSingle(new Function<Integer, Single<? extends Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Single<? extends Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
index 5b2b9247fc..ca6174a006 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
 
         observableConvert = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Completable.complete().toObservable();
             }
         });
 
         observableDedicated = source.concatMapCompletable(new Function<Integer, Completable>() {
             @Override
-            public Completable apply(Integer v)
-                    throws Exception {
+            public Completable apply(Integer v) {
                 return Completable.complete();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
index 0ffbfcd321..b194580fa8 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
 
         concatMapToObservableEmpty = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toObservable();
             }
         });
 
         observableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
index 2ec317234b..5c7d6ad7a0 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
 
         observableConvert = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Maybe.just(v).toObservable();
             }
         });
 
         observableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
index e67138c816..1785b59135 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
 
         observableConvert = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Single.just(v).toObservable();
             }
         });
 
         observableDedicated = source.concatMapSingle(new Function<Integer, Single<? extends Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Single<? extends Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
index 6fc1ed9b07..64247ac219 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
 
         observableConvert = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Completable.complete().toObservable();
             }
         });
 
         observableDedicated = source.flatMapCompletable(new Function<Integer, Completable>() {
             @Override
-            public Completable apply(Integer v)
-                    throws Exception {
+            public Completable apply(Integer v) {
                 return Completable.complete();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
index d1b8dea70a..5e38b30061 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
 
         observableConvert = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toObservable();
             }
         });
 
         observableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
index 37bf095ce5..ffc5b15e56 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
 
         observableConvert = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Maybe.just(v).toObservable();
             }
         });
 
         observableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
index 6139e6e080..6356ad8ace 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
 
         observableConvert = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Single.just(v).toObservable();
             }
         });
 
         observableDedicated = source.flatMapSingle(new Function<Integer, Single<? extends Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Single<? extends Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
index 7f91a83adf..1fc6eef9b3 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
 
         observableConvert = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Completable.complete().toObservable();
             }
         });
 
         observableDedicated = source.switchMapCompletable(new Function<Integer, Completable>() {
             @Override
-            public Completable apply(Integer v)
-                    throws Exception {
+            public Completable apply(Integer v) {
                 return Completable.complete();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
index 967a244b07..4737493420 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
 
         observableConvert = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toObservable();
             }
         });
 
         observableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
index 123e88b921..b8dca2d95b 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
 
         observableConvert = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Maybe.just(v).toObservable();
             }
         });
 
         observableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Maybe<? extends Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
index abe4ea45b3..682e2712f0 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
@@ -47,24 +47,21 @@ public void setup() {
 
         observablePlain = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
 
         observableConvert = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Observable<? extends Integer> apply(Integer v) {
                 return Single.just(v).toObservable();
             }
         });
 
         observableDedicated = source.switchMapSingle(new Function<Integer, Single<? extends Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v)
-                    throws Exception {
+            public Single<? extends Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 00591742e4..9ce0ee1df8 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -1844,7 +1844,7 @@ public final Completable lift(@NonNull CompletableOperator onLift) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <T> Single<Notification<T>> materialize() {
-        return RxJavaPlugins.onAssembly(new CompletableMaterialize<T>(this));
+        return RxJavaPlugins.onAssembly(new CompletableMaterialize<>(this));
     }
 
     /**
@@ -2239,7 +2239,7 @@ public final Completable startWith(@NonNull CompletableSource other) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <T> Observable<T> startWith(@NonNull ObservableSource<T> other) {
         Objects.requireNonNull(other, "other is null");
-        return Observable.wrap(other).concatWith(this.<T>toObservable());
+        return Observable.wrap(other).concatWith(this.toObservable());
     }
     /**
      * Returns a Flowable which first delivers the events
@@ -2637,7 +2637,7 @@ public final <T> Flowable<T> toFlowable() {
         if (this instanceof FuseToFlowable) {
             return ((FuseToFlowable<T>)this).fuseToFlowable();
         }
-        return RxJavaPlugins.onAssembly(new CompletableToFlowable<T>(this));
+        return RxJavaPlugins.onAssembly(new CompletableToFlowable<>(this));
     }
 
     /**
@@ -2661,7 +2661,7 @@ public final <T> Maybe<T> toMaybe() {
         if (this instanceof FuseToMaybe) {
             return ((FuseToMaybe<T>)this).fuseToMaybe();
         }
-        return RxJavaPlugins.onAssembly(new MaybeFromCompletable<T>(this));
+        return RxJavaPlugins.onAssembly(new MaybeFromCompletable<>(this));
     }
 
     /**
@@ -2684,7 +2684,7 @@ public final <T> Observable<T> toObservable() {
         if (this instanceof FuseToObservable) {
             return ((FuseToObservable<T>)this).fuseToObservable();
         }
-        return RxJavaPlugins.onAssembly(new CompletableToObservable<T>(this));
+        return RxJavaPlugins.onAssembly(new CompletableToObservable<>(this));
     }
 
     /**
@@ -2706,7 +2706,7 @@ public final <T> Observable<T> toObservable() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <@NonNull T> Single<T> toSingle(@NonNull Supplier<? extends T> completionValueSupplier) {
         Objects.requireNonNull(completionValueSupplier, "completionValueSupplier is null");
-        return RxJavaPlugins.onAssembly(new CompletableToSingle<T>(this, completionValueSupplier, null));
+        return RxJavaPlugins.onAssembly(new CompletableToSingle<>(this, completionValueSupplier, null));
     }
 
     /**
@@ -2848,7 +2848,7 @@ public static Completable fromCompletionStage(@NonNull CompletionStage<?> stage)
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
-     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use
      * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
      * <pre><code>
      * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).toCompletionStage(Optional.empty());
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index df3a8a270a..97785c1f4c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -332,7 +332,7 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends
         }
         Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableCombineLatest<T, R>(sources, combiner, bufferSize, false));
+        return RxJavaPlugins.onAssembly(new FlowableCombineLatest<>(sources, combiner, bufferSize, false));
     }
 
     /**
@@ -429,7 +429,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableCombineLatest<T, R>(sources, combiner, bufferSize, false));
+        return RxJavaPlugins.onAssembly(new FlowableCombineLatest<>(sources, combiner, bufferSize, false));
     }
 
     /**
@@ -530,7 +530,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
         if (sources.length == 0) {
             return empty();
         }
-        return RxJavaPlugins.onAssembly(new FlowableCombineLatest<T, R>(sources, combiner, bufferSize, true));
+        return RxJavaPlugins.onAssembly(new FlowableCombineLatest<>(sources, combiner, bufferSize, true));
     }
 
     /**
@@ -629,7 +629,7 @@ public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? ext
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableCombineLatest<T, R>(sources, combiner, bufferSize, true));
+        return RxJavaPlugins.onAssembly(new FlowableCombineLatest<>(sources, combiner, bufferSize, true));
     }
 
     /**
@@ -1892,7 +1892,7 @@ public static <T> Flowable<T> empty() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableError<T>(supplier));
+        return RxJavaPlugins.onAssembly(new FlowableError<>(supplier));
     }
 
     /**
@@ -1997,7 +1997,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> Flowable<T> fromCallable(@NonNull Callable<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableFromCallable<T>(supplier));
+        return RxJavaPlugins.onAssembly(new FlowableFromCallable<>(supplier));
     }
 
     /**
@@ -2039,7 +2039,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> Flowable<T> fromFuture(@NonNull Future<? extends T> future) {
         Objects.requireNonNull(future, "future is null");
-        return RxJavaPlugins.onAssembly(new FlowableFromFuture<T>(future, 0L, null));
+        return RxJavaPlugins.onAssembly(new FlowableFromFuture<>(future, 0L, null));
     }
 
     /**
@@ -2086,7 +2086,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     public static <@NonNull T> Flowable<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
         Objects.requireNonNull(future, "future is null");
         Objects.requireNonNull(unit, "unit is null");
-        return RxJavaPlugins.onAssembly(new FlowableFromFuture<T>(future, timeout, unit));
+        return RxJavaPlugins.onAssembly(new FlowableFromFuture<>(future, timeout, unit));
     }
 
     /**
@@ -2205,7 +2205,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> Flowable<T> fromIterable(@NonNull Iterable<? extends T> source) {
         Objects.requireNonNull(source, "source is null");
-        return RxJavaPlugins.onAssembly(new FlowableFromIterable<T>(source));
+        return RxJavaPlugins.onAssembly(new FlowableFromIterable<>(source));
     }
 
     /**
@@ -2246,7 +2246,7 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> sour
         }
         Objects.requireNonNull(source, "source is null");
 
-        return RxJavaPlugins.onAssembly(new FlowableFromPublisher<T>(source));
+        return RxJavaPlugins.onAssembly(new FlowableFromPublisher<>(source));
     }
 
     /**
@@ -2287,7 +2287,7 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> sour
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> Flowable<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableFromSupplier<T>(supplier));
+        return RxJavaPlugins.onAssembly(new FlowableFromSupplier<>(supplier));
     }
 
     /**
@@ -2318,7 +2318,7 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> sour
     public static <T> Flowable<T> generate(@NonNull Consumer<@NonNull Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(Functions.nullSupplier(),
-                FlowableInternalHelper.<T, Object>simpleGenerator(generator),
+                FlowableInternalHelper.simpleGenerator(generator),
                 Functions.emptyConsumer());
     }
 
@@ -2351,7 +2351,7 @@ public static <T> Flowable<T> generate(@NonNull Consumer<@NonNull Emitter<T>> ge
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, @NonNull Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
-        return generate(initialState, FlowableInternalHelper.<T, S>simpleBiGenerator(generator),
+        return generate(initialState, FlowableInternalHelper.simpleBiGenerator(generator),
                 Functions.emptyConsumer());
     }
 
@@ -2387,7 +2387,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
     public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, @NonNull Emitter<T>> generator,
             @NonNull Consumer<? super S> disposeState) {
         Objects.requireNonNull(generator, "generator is null");
-        return generate(initialState, FlowableInternalHelper.<T, S>simpleBiGenerator(generator), disposeState);
+        return generate(initialState, FlowableInternalHelper.simpleBiGenerator(generator), disposeState);
     }
 
     /**
@@ -4622,7 +4622,7 @@ public static <T, D> Flowable<T> using(
     public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new FlowableZip<T, R>(null, sources, zipper, bufferSize(), false));
+        return RxJavaPlugins.onAssembly(new FlowableZip<>(null, sources, zipper, bufferSize(), false));
     }
 
     /**
@@ -4684,7 +4684,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableZip<T, R>(null, sources, zipper, bufferSize, delayError));
+        return RxJavaPlugins.onAssembly(new FlowableZip<>(null, sources, zipper, bufferSize, delayError));
     }
 
     /**
@@ -5486,7 +5486,7 @@ public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ?
         }
         Objects.requireNonNull(zipper, "zipper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new FlowableZip<T, R>(sources, null, zipper, bufferSize, delayError));
+        return RxJavaPlugins.onAssembly(new FlowableZip<>(sources, null, zipper, bufferSize, delayError));
     }
 
     // ***************************************************************************************************
@@ -6025,7 +6025,7 @@ public final T blockingSingle(@NonNull T defaultItem) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Future<T> toFuture() {
-        return subscribeWith(new FutureSubscriber<T>());
+        return subscribeWith(new FutureSubscriber<>());
     }
 
     /**
@@ -6303,7 +6303,7 @@ public final Flowable<List<T>> buffer(int count) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Flowable<List<T>> buffer(int count, int skip) {
-        return buffer(count, skip, ArrayListSupplier.<T>asSupplier());
+        return buffer(count, skip, ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -6415,7 +6415,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, @No
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
     public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull TimeUnit unit) {
-        return buffer(timespan, timeskip, unit, Schedulers.computation(), ArrayListSupplier.<T>asSupplier());
+        return buffer(timespan, timeskip, unit, Schedulers.computation(), ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -6453,7 +6453,7 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return buffer(timespan, timeskip, unit, scheduler, ArrayListSupplier.<T>asSupplier());
+        return buffer(timespan, timeskip, unit, scheduler, ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -6610,7 +6610,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, int
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int count) {
-        return buffer(timespan, unit, scheduler, count, ArrayListSupplier.<T>asSupplier(), false);
+        return buffer(timespan, unit, scheduler, count, ArrayListSupplier.asSupplier(), false);
     }
 
     /**
@@ -6700,7 +6700,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return buffer(timespan, unit, scheduler, Integer.MAX_VALUE, ArrayListSupplier.<T>asSupplier(), false);
+        return buffer(timespan, unit, scheduler, Integer.MAX_VALUE, ArrayListSupplier.asSupplier(), false);
     }
 
     /**
@@ -6737,7 +6737,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
     public final <TOpening, TClosing> Flowable<List<T>> buffer(
             @NonNull Flowable<? extends TOpening> openingIndicator,
             @NonNull Function<? super TOpening, ? extends Publisher<? extends TClosing>> closingIndicator) {
-        return buffer(openingIndicator, closingIndicator, ArrayListSupplier.<T>asSupplier());
+        return buffer(openingIndicator, closingIndicator, ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -6817,7 +6817,7 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator) {
-        return buffer(boundaryIndicator, ArrayListSupplier.<T>asSupplier());
+        return buffer(boundaryIndicator, ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -6855,7 +6855,7 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
     @NonNull
     public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator, int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
-        return buffer(boundaryIndicator, Functions.<T>createArrayList(initialCapacity));
+        return buffer(boundaryIndicator, Functions.createArrayList(initialCapacity));
     }
 
     /**
@@ -7089,7 +7089,7 @@ public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
     public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
         Objects.requireNonNull(initialItemSupplier, "initialItemSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
-        return RxJavaPlugins.onAssembly(new FlowableCollectSingle<T, U>(this, initialItemSupplier, collector));
+        return RxJavaPlugins.onAssembly(new FlowableCollectSingle<>(this, initialItemSupplier, collector));
     }
 
     /**
@@ -8896,7 +8896,7 @@ public final Flowable<T> distinct() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelector) {
-        return distinct(keySelector, Functions.<K>createHashSet());
+        return distinct(keySelector, Functions.createHashSet());
     }
 
     /**
@@ -9063,7 +9063,7 @@ public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K
     @NonNull
     public final Flowable<T> distinctUntilChanged(@NonNull BiPredicate<? super T, ? super T> comparer) {
         Objects.requireNonNull(comparer, "comparer is null");
-        return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged<>(this, Functions.<T>identity(), comparer));
+        return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged<>(this, Functions.identity(), comparer));
     }
 
     /**
@@ -10632,7 +10632,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -10664,7 +10664,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector) {
-        return groupBy(keySelector, Functions.<T>identity(), false, bufferSize());
+        return groupBy(keySelector, Functions.identity(), false, bufferSize());
     }
 
     /**
@@ -10691,7 +10691,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -10724,7 +10724,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector, boolean delayError) {
-        return groupBy(keySelector, Functions.<T>identity(), delayError, bufferSize());
+        return groupBy(keySelector, Functions.identity(), delayError, bufferSize());
     }
 
     /**
@@ -10751,7 +10751,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -10816,7 +10816,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -10882,7 +10882,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -10927,7 +10927,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
 
-        return RxJavaPlugins.onAssembly(new FlowableGroupBy<T, K, V>(this, keySelector, valueSelector, bufferSize, delayError, null));
+        return RxJavaPlugins.onAssembly(new FlowableGroupBy<>(this, keySelector, valueSelector, bufferSize, delayError, null));
     }
 
     /**
@@ -10995,7 +10995,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -11050,7 +11050,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(evictingMapFactory, "evictingMapFactory is null");
 
-        return RxJavaPlugins.onAssembly(new FlowableGroupBy<T, K, V>(this, keySelector, valueSelector, bufferSize, delayError, evictingMapFactory));
+        return RxJavaPlugins.onAssembly(new FlowableGroupBy<>(this, keySelector, valueSelector, bufferSize, delayError, evictingMapFactory));
     }
 
     /**
@@ -11100,7 +11100,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> groupJoin(
         Objects.requireNonNull(leftEnd, "leftEnd is null");
         Objects.requireNonNull(rightEnd, "rightEnd is null");
         Objects.requireNonNull(resultSelector, "resultSelector is null");
-        return RxJavaPlugins.onAssembly(new FlowableGroupJoin<T, TRight, TLeftEnd, TRightEnd, R>(
+        return RxJavaPlugins.onAssembly(new FlowableGroupJoin<>(
                 this, other, leftEnd, rightEnd, resultSelector));
     }
 
@@ -11456,7 +11456,7 @@ public final Single<T> lastOrError() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super T> lifter) {
         Objects.requireNonNull(lifter, "lifter is null");
-        return RxJavaPlugins.onAssembly(new FlowableLift<R, T>(this, lifter));
+        return RxJavaPlugins.onAssembly(new FlowableLift<>(this, lifter));
     }
 
     /**
@@ -11486,7 +11486,7 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <@NonNull R> Flowable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new FlowableMap<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new FlowableMap<>(this, mapper));
     }
 
     /**
@@ -13894,7 +13894,7 @@ public final void safeSubscribe(@NonNull Subscriber<? super T> s) {
         if (s instanceof SafeSubscriber) {
             subscribe((SafeSubscriber<? super T>)s);
         } else {
-            subscribe(new SafeSubscriber<T>(s));
+            subscribe(new SafeSubscriber<>(s));
         }
     }
 
@@ -14768,7 +14768,7 @@ public final Flowable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Flowable<T> sorted() {
-        return toList().toFlowable().map(Functions.listSorter(Functions.<T>naturalComparator())).flatMapIterable(Functions.<List<T>>identity());
+        return toList().toFlowable().map(Functions.listSorter(Functions.naturalComparator())).flatMapIterable(Functions.identity());
     }
 
     /**
@@ -14797,7 +14797,7 @@ public final Flowable<T> sorted() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> sortFunction) {
         Objects.requireNonNull(sortFunction, "sortFunction");
-        return toList().toFlowable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.<List<T>>identity());
+        return toList().toFlowable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.identity());
     }
 
     /**
@@ -15065,7 +15065,7 @@ public final void subscribe(@NonNull Subscriber<? super T> s) {
             subscribe((FlowableSubscriber<? super T>)s);
         } else {
             Objects.requireNonNull(s, "s is null");
-            subscribe(new StrictSubscriber<T>(s));
+            subscribe(new StrictSubscriber<>(s));
         }
     }
 
@@ -17119,7 +17119,7 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
     public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return map(Functions.<T>timestampWith(unit, scheduler));
+        return map(Functions.timestampWith(unit, scheduler));
     }
 
     /**
@@ -17178,7 +17178,7 @@ public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Single<List<T>> toList() {
-        return RxJavaPlugins.onAssembly(new FlowableToListSingle<T, List<T>>(this));
+        return RxJavaPlugins.onAssembly(new FlowableToListSingle<>(this));
     }
 
     /**
@@ -17216,7 +17216,7 @@ public final Single<List<T>> toList() {
     @NonNull
     public final Single<List<T>> toList(int capacityHint) {
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
-        return RxJavaPlugins.onAssembly(new FlowableToListSingle<>(this, Functions.<T>createArrayList(capacityHint)));
+        return RxJavaPlugins.onAssembly(new FlowableToListSingle<>(this, Functions.createArrayList(capacityHint)));
     }
 
     /**
@@ -17290,7 +17290,7 @@ public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplie
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
-        return collect(HashMapSupplier.<K, T>asSupplier(), Functions.toMapKeySelector(keySelector));
+        return collect(HashMapSupplier.asSupplier(), Functions.toMapKeySelector(keySelector));
     }
 
     /**
@@ -17330,7 +17330,7 @@ public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends
     public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? extends K> keySelector, @NonNull Function<? super T, ? extends V> valueSelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
-        return collect(HashMapSupplier.<K, V>asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector));
+        return collect(HashMapSupplier.asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector));
     }
 
     /**
@@ -17533,7 +17533,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
             @NonNull Function<? super T, ? extends V> valueSelector,
             @NonNull Supplier<Map<K, Collection<V>>> mapSupplier
             ) {
-        return toMultimap(keySelector, valueSelector, mapSupplier, ArrayListSupplier.<V, K>asFunction());
+        return toMultimap(keySelector, valueSelector, mapSupplier, ArrayListSupplier.asFunction());
     }
 
     /**
@@ -17731,7 +17731,7 @@ public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window will only contain one element. The behavior is
-     * a tradeoff between no-dataloss and ensuring upstream cancellation can happen.
+     * a trade-off between no-dataloss and ensuring upstream cancellation can happen.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner Publisher uses an
@@ -17766,7 +17766,7 @@ public final Flowable<Flowable<T>> window(long count) {
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff between no-dataloss and ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off between no-dataloss and ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner Publisher uses an
@@ -17804,7 +17804,7 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff between no-dataloss and ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off between no-dataloss and ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner Publisher uses an
@@ -17848,7 +17848,7 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -17889,7 +17889,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -17932,7 +17932,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -17981,7 +17981,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -18021,7 +18021,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit)
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -18065,7 +18065,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -18110,7 +18110,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -18154,7 +18154,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -18200,7 +18200,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -18248,7 +18248,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
@@ -18301,7 +18301,7 @@ public final Flowable<Flowable<T>> window(
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The outer Publisher of this operator does not support backpressure as it uses a {@code boundary} Publisher to control data
@@ -18337,7 +18337,7 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The outer Publisher of this operator does not support backpressure as it uses a {@code boundary} Publisher to control data
@@ -18378,7 +18378,7 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The outer Publisher of this operator doesn't support backpressure because the emission of new
@@ -18421,7 +18421,7 @@ public final <U, V> Flowable<Flowable<T>> window(
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The outer Publisher of this operator doesn't support backpressure because the emission of new
@@ -18731,7 +18731,7 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<? extends Publishe
     public final <U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(zipper, "zipper is null");
-        return RxJavaPlugins.onAssembly(new FlowableZipIterable<T, U, R>(this, other, zipper));
+        return RxJavaPlugins.onAssembly(new FlowableZipIterable<>(this, other, zipper));
     }
 
     /**
@@ -19154,7 +19154,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
-     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use
      * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
      * <pre><code>
      * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).firstStage(Optional.empty());
@@ -19191,7 +19191,7 @@ public final CompletionStage<T> firstStage(@Nullable T defaultItem) {
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
-     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use
      * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
      * <pre><code>
      * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).singleStage(Optional.empty());
@@ -19227,7 +19227,7 @@ public final CompletionStage<T> singleStage(@Nullable T defaultItem) {
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
-     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use
      * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
      * <pre><code>
      * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).lastStage(Optional.empty());
@@ -19409,7 +19409,7 @@ public final Stream<T> blockingStream() {
     public final Stream<T> blockingStream(int prefetch) {
         Iterator<T> iterator = blockingIterable(prefetch).iterator();
         return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, 0), false)
-                .onClose(() -> ((Disposable)iterator).dispose());
+                .onClose(((Disposable) iterator)::dispose);
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index f26e584c16..dfe8c4f0b4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -653,7 +653,7 @@ public static <T> Maybe<T> empty() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> error(@NonNull Throwable exception) {
         Objects.requireNonNull(exception, "exception is null");
-        return RxJavaPlugins.onAssembly(new MaybeError<T>(exception));
+        return RxJavaPlugins.onAssembly(new MaybeError<>(exception));
     }
 
     /**
@@ -679,7 +679,7 @@ public static <T> Maybe<T> error(@NonNull Throwable exception) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new MaybeErrorCallable<T>(supplier));
+        return RxJavaPlugins.onAssembly(new MaybeErrorCallable<>(supplier));
     }
 
     /**
@@ -706,7 +706,7 @@ public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromAction(@NonNull Action run) {
         Objects.requireNonNull(run, "run is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromAction<T>(run));
+        return RxJavaPlugins.onAssembly(new MaybeFromAction<>(run));
     }
 
     /**
@@ -726,7 +726,7 @@ public static <T> Maybe<T> fromAction(@NonNull Action run) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromCompletable(@NonNull CompletableSource completableSource) {
         Objects.requireNonNull(completableSource, "completableSource is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromCompletable<T>(completableSource));
+        return RxJavaPlugins.onAssembly(new MaybeFromCompletable<>(completableSource));
     }
 
     /**
@@ -790,7 +790,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> Maybe<T> fromCallable(@NonNull Callable<? extends T> callable) {
         Objects.requireNonNull(callable, "callable is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromCallable<T>(callable));
+        return RxJavaPlugins.onAssembly(new MaybeFromCallable<>(callable));
     }
 
     /**
@@ -824,7 +824,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> Maybe<T> fromFuture(@NonNull Future<? extends T> future) {
         Objects.requireNonNull(future, "future is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromFuture<T>(future, 0L, null));
+        return RxJavaPlugins.onAssembly(new MaybeFromFuture<>(future, 0L, null));
     }
 
     /**
@@ -863,7 +863,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
     public static <@NonNull T> Maybe<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
         Objects.requireNonNull(future, "future is null");
         Objects.requireNonNull(unit, "unit is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromFuture<T>(future, timeout, unit));
+        return RxJavaPlugins.onAssembly(new MaybeFromFuture<>(future, timeout, unit));
     }
 
     /**
@@ -883,7 +883,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
         Objects.requireNonNull(run, "run is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromRunnable<T>(run));
+        return RxJavaPlugins.onAssembly(new MaybeFromRunnable<>(run));
     }
 
     /**
@@ -930,7 +930,7 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> Maybe<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromSupplier<T>(supplier));
+        return RxJavaPlugins.onAssembly(new MaybeFromSupplier<>(supplier));
     }
 
     /**
@@ -1865,7 +1865,7 @@ public static <T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
     public static <T, R> Maybe<R> zip(@NonNull Iterable<? extends MaybeSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new MaybeZipIterable<T, R>(sources, zipper));
+        return RxJavaPlugins.onAssembly(new MaybeZipIterable<>(sources, zipper));
     }
 
     /**
@@ -2331,7 +2331,7 @@ public static <T, R> Maybe<R> zipArray(@NonNull Function<? super Object[], ? ext
             return empty();
         }
         Objects.requireNonNull(zipper, "zipper is null");
-        return RxJavaPlugins.onAssembly(new MaybeZipArray<T, R>(sources, zipper));
+        return RxJavaPlugins.onAssembly(new MaybeZipArray<>(sources, zipper));
     }
 
     // ------------------------------------------------------------------
@@ -3530,7 +3530,7 @@ public final Single<Boolean> isEmpty() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> lift) {
         Objects.requireNonNull(lift, "lift is null");
-        return RxJavaPlugins.onAssembly(new MaybeLift<T, R>(this, lift));
+        return RxJavaPlugins.onAssembly(new MaybeLift<>(this, lift));
     }
 
     /**
@@ -3554,7 +3554,7 @@ public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> li
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeMap<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeMap<>(this, mapper));
     }
 
     /**
@@ -4349,7 +4349,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNu
         Objects.requireNonNull(onSuccess, "onSuccess is null");
         Objects.requireNonNull(onError, "onError is null");
         Objects.requireNonNull(onComplete, "onComplete is null");
-        return subscribeWith(new MaybeCallbackObserver<T>(onSuccess, onError, onComplete));
+        return subscribeWith(new MaybeCallbackObserver<>(onSuccess, onError, onComplete));
     }
 
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4925,7 +4925,7 @@ public final TestObserver<T> test(boolean dispose) {
      *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the non-null output type
-     * @param mapper the function that receives the upstream success iteem and should return a <em>non-empty</em> {@code Optional}
+     * @param mapper the function that receives the upstream success item and should return a <em>non-empty</em> {@code Optional}
      * to emit as the success output or an <em>empty</em> {@code Optional} to complete the {@code Maybe}
      * @return the new Maybe instance
      * @since 3.0.0
@@ -4952,8 +4952,8 @@ public final TestObserver<T> test(boolean dispose) {
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
-     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
-     * {@link #toCompletionStage(Object)} with {@code null} or turn the upstrea into a sequence of {@link Optional}s and
+     * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use
+     * {@link #toCompletionStage(Object)} with {@code null} or turn the upstream into a sequence of {@link Optional}s and
      * default to {@link Optional#empty()}:
      * <pre><code>
      * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).toCompletionStage(Optional.empty());
@@ -4985,7 +4985,7 @@ public final CompletionStage<T> toCompletionStage() {
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
-     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use
      * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
      * <pre><code>
      * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).toCompletionStage(Optional.empty());
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 1933a6db0b..373a576888 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -265,7 +265,7 @@ public static <T, R> Observable<R> combineLatest(
 
         // the queue holds a pair of values so we need to double the capacity
         int s = bufferSize << 1;
-        return RxJavaPlugins.onAssembly(new ObservableCombineLatest<T, R>(null, sources, combiner, s, false));
+        return RxJavaPlugins.onAssembly(new ObservableCombineLatest<>(null, sources, combiner, s, false));
     }
 
     /**
@@ -364,7 +364,7 @@ public static <T, R> Observable<R> combineLatestArray(
 
         // the queue holds a pair of values so we need to double the capacity
         int s = bufferSize << 1;
-        return RxJavaPlugins.onAssembly(new ObservableCombineLatest<T, R>(sources, null, combiner, s, false));
+        return RxJavaPlugins.onAssembly(new ObservableCombineLatest<>(sources, null, combiner, s, false));
     }
 
     /**
@@ -917,7 +917,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull ObservableSo
         }
         // the queue holds a pair of values so we need to double the capacity
         int s = bufferSize << 1;
-        return RxJavaPlugins.onAssembly(new ObservableCombineLatest<T, R>(sources, null, combiner, s, true));
+        return RxJavaPlugins.onAssembly(new ObservableCombineLatest<>(sources, null, combiner, s, true));
     }
 
     /**
@@ -1013,7 +1013,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? e
 
         // the queue holds a pair of values so we need to double the capacity
         int s = bufferSize << 1;
-        return RxJavaPlugins.onAssembly(new ObservableCombineLatest<T, R>(null, sources, combiner, s, true));
+        return RxJavaPlugins.onAssembly(new ObservableCombineLatest<>(null, sources, combiner, s, true));
     }
 
     /**
@@ -1669,7 +1669,7 @@ public static <T> Observable<T> empty() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> errorSupplier) {
         Objects.requireNonNull(errorSupplier, "errorSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableError<T>(errorSupplier));
+        return RxJavaPlugins.onAssembly(new ObservableError<>(errorSupplier));
     }
 
     /**
@@ -1763,7 +1763,7 @@ public static <T> Observable<T> fromArray(@NonNull T... items) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromCallable(@NonNull Callable<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableFromCallable<T>(supplier));
+        return RxJavaPlugins.onAssembly(new ObservableFromCallable<>(supplier));
     }
 
     /**
@@ -1797,7 +1797,7 @@ public static <T> Observable<T> fromCallable(@NonNull Callable<? extends T> supp
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future) {
         Objects.requireNonNull(future, "future is null");
-        return RxJavaPlugins.onAssembly(new ObservableFromFuture<T>(future, 0L, null));
+        return RxJavaPlugins.onAssembly(new ObservableFromFuture<>(future, 0L, null));
     }
 
     /**
@@ -1836,7 +1836,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future)
     public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
         Objects.requireNonNull(future, "future is null");
         Objects.requireNonNull(unit, "unit is null");
-        return RxJavaPlugins.onAssembly(new ObservableFromFuture<T>(future, timeout, unit));
+        return RxJavaPlugins.onAssembly(new ObservableFromFuture<>(future, timeout, unit));
     }
 
     /**
@@ -1940,7 +1940,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromIterable(@NonNull Iterable<? extends T> source) {
         Objects.requireNonNull(source, "source is null");
-        return RxJavaPlugins.onAssembly(new ObservableFromIterable<T>(source));
+        return RxJavaPlugins.onAssembly(new ObservableFromIterable<>(source));
     }
 
     /**
@@ -1977,7 +1977,7 @@ public static <T> Observable<T> fromIterable(@NonNull Iterable<? extends T> sour
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromPublisher(@NonNull Publisher<? extends T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
-        return RxJavaPlugins.onAssembly(new ObservableFromPublisher<T>(publisher));
+        return RxJavaPlugins.onAssembly(new ObservableFromPublisher<>(publisher));
     }
 
     /**
@@ -2014,7 +2014,7 @@ public static <T> Observable<T> fromPublisher(@NonNull Publisher<? extends T> pu
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableFromSupplier<T>(supplier));
+        return RxJavaPlugins.onAssembly(new ObservableFromSupplier<>(supplier));
     }
 
     /**
@@ -2043,8 +2043,8 @@ public static <T> Observable<T> fromSupplier(@NonNull Supplier<? extends T> supp
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Observable<T> generate(@NonNull Consumer<Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
-        return generate(Functions.<Object>nullSupplier(),
-                ObservableInternalHelper.simpleGenerator(generator), Functions.<Object>emptyConsumer());
+        return generate(Functions.nullSupplier(),
+                ObservableInternalHelper.simpleGenerator(generator), Functions.emptyConsumer());
     }
 
     /**
@@ -4188,7 +4188,7 @@ public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
     public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new ObservableZip<T, R>(null, sources, zipper, bufferSize(), false));
+        return RxJavaPlugins.onAssembly(new ObservableZip<>(null, sources, zipper, bufferSize(), false));
     }
 
     /**
@@ -4250,7 +4250,7 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSou
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new ObservableZip<T, R>(null, sources, zipper, bufferSize, delayError));
+        return RxJavaPlugins.onAssembly(new ObservableZip<>(null, sources, zipper, bufferSize, delayError));
     }
 
     /**
@@ -5004,7 +5004,7 @@ public static <T, R> Observable<R> zipArray(
         }
         Objects.requireNonNull(zipper, "zipper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new ObservableZip<T, R>(sources, null, zipper, bufferSize, delayError));
+        return RxJavaPlugins.onAssembly(new ObservableZip<>(sources, null, zipper, bufferSize, delayError));
     }
 
     // ***************************************************************************************************
@@ -5477,7 +5477,7 @@ public final T blockingSingle(@NonNull T defaultItem) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Future<T> toFuture() {
-        return subscribeWith(new FutureObserver<T>());
+        return subscribeWith(new FutureObserver<>());
     }
 
     /**
@@ -5648,7 +5648,7 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Observable<@NonNull List<T>> buffer(int count, int skip) {
-        return buffer(count, skip, ArrayListSupplier.<T>asSupplier());
+        return buffer(count, skip, ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -5746,7 +5746,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
     public final Observable<@NonNull List<T>> buffer(long timespan, long timeskip, @NonNull TimeUnit unit) {
-        return buffer(timespan, timeskip, unit, Schedulers.computation(), ArrayListSupplier.<T>asSupplier());
+        return buffer(timespan, timeskip, unit, Schedulers.computation(), ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -5780,7 +5780,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public final Observable<@NonNull List<T>> buffer(long timespan, long timeskip, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return buffer(timespan, timeskip, unit, scheduler, ArrayListSupplier.<T>asSupplier());
+        return buffer(timespan, timeskip, unit, scheduler, ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -5921,7 +5921,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public final Observable<@NonNull List<T>> buffer(long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int count) {
-        return buffer(timespan, unit, scheduler, count, ArrayListSupplier.<T>asSupplier(), false);
+        return buffer(timespan, unit, scheduler, count, ArrayListSupplier.asSupplier(), false);
     }
 
     /**
@@ -6003,7 +6003,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public final Observable<@NonNull List<T>> buffer(long timespan, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return buffer(timespan, unit, scheduler, Integer.MAX_VALUE, ArrayListSupplier.<T>asSupplier(), false);
+        return buffer(timespan, unit, scheduler, Integer.MAX_VALUE, ArrayListSupplier.asSupplier(), false);
     }
 
     /**
@@ -6036,7 +6036,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     public final <TOpening, TClosing> Observable<@NonNull List<T>> buffer(
             @NonNull ObservableSource<? extends TOpening> openingIndicator,
             @NonNull Function<? super TOpening, ? extends ObservableSource<? extends TClosing>> closingIndicator) {
-        return buffer(openingIndicator, closingIndicator, ArrayListSupplier.<T>asSupplier());
+        return buffer(openingIndicator, closingIndicator, ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -6108,7 +6108,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundary) {
-        return buffer(boundary, ArrayListSupplier.<T>asSupplier());
+        return buffer(boundary, ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -6142,7 +6142,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @NonNull
     public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundary, int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
-        return buffer(boundary, Functions.<T>createArrayList(initialCapacity));
+        return buffer(boundary, Functions.createArrayList(initialCapacity));
     }
 
     /**
@@ -6355,7 +6355,7 @@ public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
     public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialValueSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
         Objects.requireNonNull(initialValueSupplier, "initialValueSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
-        return RxJavaPlugins.onAssembly(new ObservableCollectSingle<T, U>(this, initialValueSupplier, collector));
+        return RxJavaPlugins.onAssembly(new ObservableCollectSingle<>(this, initialValueSupplier, collector));
     }
 
     /**
@@ -8088,7 +8088,7 @@ public final <K> Observable<T> distinctUntilChanged(@NonNull Function<? super T,
     @NonNull
     public final Observable<T> distinctUntilChanged(@NonNull BiPredicate<? super T, ? super T> comparer) {
         Objects.requireNonNull(comparer, "comparer is null");
-        return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<>(this, Functions.<T>identity(), comparer));
+        return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<>(this, Functions.identity(), comparer));
     }
 
     /**
@@ -9351,7 +9351,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -9392,7 +9392,7 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -9436,7 +9436,7 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -9481,7 +9481,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -9529,7 +9529,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
      * so-called group abandonment where a group will only contain one element and the group will be
      * re-created over and over as new upstream items trigger a new group. The behavior is
-     * a tradeoff between no-dataloss, upstream cancellation and excessive group creation.
+     * a trade-off between no-dataloss, upstream cancellation and excessive group creation.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -9564,7 +9564,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
 
-        return RxJavaPlugins.onAssembly(new ObservableGroupBy<T, K, V>(this, keySelector, valueSelector, bufferSize, delayError));
+        return RxJavaPlugins.onAssembly(new ObservableGroupBy<>(this, keySelector, valueSelector, bufferSize, delayError));
     }
 
     /**
@@ -9611,7 +9611,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> groupJoin(
         Objects.requireNonNull(leftEnd, "leftEnd is null");
         Objects.requireNonNull(rightEnd, "rightEnd is null");
         Objects.requireNonNull(resultSelector, "resultSelector is null");
-        return RxJavaPlugins.onAssembly(new ObservableGroupJoin<T, TRight, TLeftEnd, TRightEnd, R>(
+        return RxJavaPlugins.onAssembly(new ObservableGroupJoin<>(
                 this, other, leftEnd, rightEnd, resultSelector));
     }
 
@@ -9939,7 +9939,7 @@ public final Single<T> lastOrError() {
     @NonNull
     public final <R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? super T> lifter) {
         Objects.requireNonNull(lifter, "lifter is null");
-        return RxJavaPlugins.onAssembly(new ObservableLift<R, T>(this, lifter));
+        return RxJavaPlugins.onAssembly(new ObservableLift<>(this, lifter));
     }
 
     /**
@@ -9964,7 +9964,7 @@ public final <R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? s
     @NonNull
     public final <R> Observable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new ObservableMap<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new ObservableMap<>(this, mapper));
     }
 
     /**
@@ -11584,7 +11584,7 @@ public final void safeSubscribe(@NonNull Observer<? super T> observer) {
         if (observer instanceof SafeObserver) {
             subscribe(observer);
         } else {
-            subscribe(new SafeObserver<T>(observer));
+            subscribe(new SafeObserver<>(observer));
         }
     }
 
@@ -12352,7 +12352,7 @@ public final Observable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Observable<T> sorted() {
-        return toList().toObservable().map(Functions.listSorter(Functions.<T>naturalComparator())).flatMapIterable(Functions.<List<T>>identity());
+        return toList().toObservable().map(Functions.listSorter(Functions.naturalComparator())).flatMapIterable(Functions.identity());
     }
 
     /**
@@ -12377,7 +12377,7 @@ public final Observable<T> sorted() {
     @NonNull
     public final Observable<T> sorted(@NonNull Comparator<? super T> sortFunction) {
         Objects.requireNonNull(sortFunction, "sortFunction is null");
-        return toList().toObservable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.<List<T>>identity());
+        return toList().toObservable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.identity());
     }
 
     /**
@@ -14309,7 +14309,7 @@ public final Observable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
     public final Observable<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return map(Functions.<T>timestampWith(unit, scheduler));
+        return map(Functions.timestampWith(unit, scheduler));
     }
 
     /**
@@ -14396,7 +14396,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
     @NonNull
     public final Single<@NonNull List<T>> toList(int capacityHint) {
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
-        return RxJavaPlugins.onAssembly(new ObservableToListSingle<T, List<T>>(this, capacityHint));
+        return RxJavaPlugins.onAssembly(new ObservableToListSingle<>(this, capacityHint));
     }
 
     /**
@@ -14463,7 +14463,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
     @NonNull
     public final <K> Single<@NonNull Map<K, T>> toMap(@NonNull Function<? super T, ? extends K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
-        return collect(HashMapSupplier.<K, T>asSupplier(), Functions.toMapKeySelector(keySelector));
+        return collect(HashMapSupplier.asSupplier(), Functions.toMapKeySelector(keySelector));
     }
 
     /**
@@ -14501,7 +14501,7 @@ public final <K, V> Single<Map<K, V>> toMap(
             @NonNull Function<? super T, ? extends V> valueSelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
-        return collect(HashMapSupplier.<K, V>asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector));
+        return collect(HashMapSupplier.asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector));
     }
 
     /**
@@ -14568,8 +14568,7 @@ public final <K, V> Single<Map<K, V>> toMap(
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <K> Single<@NonNull Map<K, Collection<T>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector) {
-        @SuppressWarnings({ "rawtypes", "unchecked" })
-        Function<? super T, ? extends T> valueSelector = (Function)Functions.identity();
+        Function<? super T, ? extends T> valueSelector = Functions.identity();
         Supplier<Map<K, Collection<T>>> mapSupplier = HashMapSupplier.asSupplier();
         Function<K, List<T>> collectionFactory = ArrayListSupplier.asFunction();
         return toMultimap(keySelector, valueSelector, mapSupplier, collectionFactory);
@@ -14684,7 +14683,7 @@ public final <K, V> Single<Map<K, V>> toMap(
             @NonNull Function<? super T, ? extends V> valueSelector,
             @NonNull Supplier<Map<K, Collection<V>>> mapSupplier
     ) {
-        return toMultimap(keySelector, valueSelector, mapSupplier, ArrayListSupplier.<V, K>asFunction());
+        return toMultimap(keySelector, valueSelector, mapSupplier, ArrayListSupplier.asFunction());
     }
 
     /**
@@ -14864,7 +14863,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Single<@NonNull List<T>> toSortedList(int capacityHint) {
-        return toSortedList(Functions.<T>naturalOrder(), capacityHint);
+        return toSortedList(Functions.naturalOrder(), capacityHint);
     }
 
     /**
@@ -14992,7 +14991,7 @@ public final Observable<Observable<T>> window(long count, long skip, int bufferS
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -15026,7 +15025,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -15062,7 +15061,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -15104,7 +15103,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -15138,7 +15137,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -15176,7 +15175,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -15215,7 +15214,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -15252,7 +15251,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -15292,7 +15291,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -15334,7 +15333,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -15381,7 +15380,7 @@ public final Observable<Observable<T>> window(
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -15413,7 +15412,7 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -15450,7 +15449,7 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -15487,7 +15486,7 @@ public final <U, V> Observable<Observable<T>> window(
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
      * elements will be dropped until the condition for the next window boundary is satisfied. The behavior is
-     * a tradeoff for ensuring upstream cancellation can happen under some race conditions.
+     * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -15766,7 +15765,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<? extends Observ
     public final <U, R> Observable<R> zipWith(@NonNull Iterable<U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(zipper, "zipper is null");
-        return RxJavaPlugins.onAssembly(new ObservableZipIterable<T, U, R>(this, other, zipper));
+        return RxJavaPlugins.onAssembly(new ObservableZipIterable<>(this, other, zipper));
     }
 
     /**
@@ -16127,7 +16126,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
-     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use
      * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
      * <pre><code>
      * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).firstStage(Optional.empty());
@@ -16161,7 +16160,7 @@ public final CompletionStage<T> firstStage(@Nullable T defaultItem) {
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
-     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use
      * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
      * <pre><code>
      * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).singleStage(Optional.empty());
@@ -16194,7 +16193,7 @@ public final CompletionStage<T> singleStage(@Nullable T defaultItem) {
      * The upstream will be also cancelled if the resulting {@code CompletionStage} is converted to and
      * completed manually by {@link CompletableFuture#complete(Object)} or {@link CompletableFuture#completeExceptionally(Throwable)}.
      * <p>
-     * {@code CompletionStage}s don't have a notion of emptyness and allow {@code null}s, therefore, one can either use
+     * {@code CompletionStage}s don't have a notion of emptiness and allow {@code null}s, therefore, one can either use
      * a {@code defaultItem} of {@code null} or turn the flow into a sequence of {@link Optional}s and default to {@link Optional#empty()}:
      * <pre><code>
      * CompletionStage&lt;Optional&lt;T&gt;&gt; stage = source.map(Optional::of).lastStage(Optional.empty());
@@ -16356,7 +16355,7 @@ public final Stream<T> blockingStream() {
     public final Stream<T> blockingStream(int capacityHint) {
         Iterator<T> iterator = blockingIterable(capacityHint).iterator();
         return StreamSupport.stream(Spliterators.spliteratorUnknownSize(iterator, 0), false)
-                .onClose(() -> ((Disposable)iterator).dispose());
+                .onClose(((Disposable) iterator)::dispose);
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 8bd0f1db4e..f0022aef17 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -158,7 +158,7 @@ public static <T> Single<T> amb(@NonNull Iterable<? extends SingleSource<? exten
     @NonNull
     public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sources) {
         if (sources.length == 0) {
-            return error(SingleInternalHelper.<T>emptyThrower());
+            return error(SingleInternalHelper.emptyThrower());
         }
         if (sources.length == 1) {
             @SuppressWarnings("unchecked")
@@ -423,7 +423,7 @@ public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>...
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T>... sources) {
-        return Flowable.fromArray(sources).concatMapEager(SingleInternalHelper.<T>toFlowable());
+        return Flowable.fromArray(sources).concatMapEager(SingleInternalHelper.toFlowable());
     }
 
     /**
@@ -451,7 +451,7 @@ public static <T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends SingleSource<? extends T>> sources) {
-        return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.<T>toFlowable());
+        return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.toFlowable());
     }
 
     /**
@@ -477,7 +477,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends SingleSou
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
-        return Flowable.fromIterable(sources).concatMapEager(SingleInternalHelper.<T>toFlowable());
+        return Flowable.fromIterable(sources).concatMapEager(SingleInternalHelper.toFlowable());
     }
 
     /**
@@ -570,7 +570,7 @@ public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> errorSupplier) {
         Objects.requireNonNull(errorSupplier, "errorSupplier is null");
-        return RxJavaPlugins.onAssembly(new SingleError<T>(errorSupplier));
+        return RxJavaPlugins.onAssembly(new SingleError<>(errorSupplier));
     }
 
     /**
@@ -632,7 +632,7 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> Single<T> fromCallable(@NonNull Callable<? extends T> callable) {
         Objects.requireNonNull(callable, "callable is null");
-        return RxJavaPlugins.onAssembly(new SingleFromCallable<T>(callable));
+        return RxJavaPlugins.onAssembly(new SingleFromCallable<>(callable));
     }
 
     /**
@@ -662,7 +662,7 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future) {
-        return toSingle(Flowable.<T>fromFuture(future));
+        return toSingle(Flowable.fromFuture(future));
     }
 
     /**
@@ -696,7 +696,7 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
-        return toSingle(Flowable.<T>fromFuture(future, timeout, unit));
+        return toSingle(Flowable.fromFuture(future, timeout, unit));
     }
 
     /**
@@ -732,7 +732,7 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return toSingle(Flowable.<T>fromFuture(future, timeout, unit, scheduler));
+        return toSingle(Flowable.fromFuture(future, timeout, unit, scheduler));
     }
 
     /**
@@ -763,7 +763,7 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future, @NonNull Scheduler scheduler) {
-        return toSingle(Flowable.<T>fromFuture(future, scheduler));
+        return toSingle(Flowable.fromFuture(future, scheduler));
     }
 
     /**
@@ -801,7 +801,7 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> fromPublisher(@NonNull Publisher<? extends T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
-        return RxJavaPlugins.onAssembly(new SingleFromPublisher<T>(publisher));
+        return RxJavaPlugins.onAssembly(new SingleFromPublisher<>(publisher));
     }
 
     /**
@@ -825,11 +825,11 @@ public static <T> Single<T> fromPublisher(@NonNull Publisher<? extends T> publis
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T> observableSource) {
         Objects.requireNonNull(observableSource, "observableSource is null");
-        return RxJavaPlugins.onAssembly(new ObservableSingleSingle<T>(observableSource, null));
+        return RxJavaPlugins.onAssembly(new ObservableSingleSingle<>(observableSource, null));
     }
 
     /**
-     * Returns a {@link Single} that invokes passed supplierfunction and emits its result
+     * Returns a {@link Single} that invokes passed supplier and emits its result
      * for each new SingleObserver that subscribes.
      * <p>
      * Allows you to defer execution of passed function until SingleObserver subscribes to the {@link Single}.
@@ -863,7 +863,7 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> Single<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new SingleFromSupplier<T>(supplier));
+        return RxJavaPlugins.onAssembly(new SingleFromSupplier<>(supplier));
     }
 
     /**
@@ -996,10 +996,9 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends SingleSource<?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Single<T> merge(@NonNull SingleSource<? extends SingleSource<? extends T>> source) {
         Objects.requireNonNull(source, "source is null");
-        return RxJavaPlugins.onAssembly(new SingleFlatMap<SingleSource<? extends T>, T>(source, (Function)Functions.identity()));
+        return RxJavaPlugins.onAssembly(new SingleFlatMap<SingleSource<? extends T>, T>(source, Functions.identity()));
     }
 
     /**
@@ -1580,7 +1579,7 @@ public static <T> Single<T> wrap(@NonNull SingleSource<T> source) {
     public static <T, R> Single<R> zip(@NonNull Iterable<? extends SingleSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new SingleZipIterable<T, R>(sources, zipper));
+        return RxJavaPlugins.onAssembly(new SingleZipIterable<>(sources, zipper));
     }
 
     /**
@@ -2037,7 +2036,7 @@ public static <T, R> Single<R> zipArray(@NonNull Function<? super Object[], ? ex
         if (sources.length == 0) {
             return error(new NoSuchElementException());
         }
-        return RxJavaPlugins.onAssembly(new SingleZipArray<T, R>(sources, zipper));
+        return RxJavaPlugins.onAssembly(new SingleZipArray<>(sources, zipper));
     }
 
     /**
@@ -3057,7 +3056,7 @@ public final T blockingGet() {
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T> lift) {
         Objects.requireNonNull(lift, "lift is null");
-        return RxJavaPlugins.onAssembly(new SingleLift<T, R>(this, lift));
+        return RxJavaPlugins.onAssembly(new SingleLift<>(this, lift));
     }
 
     /**
@@ -3081,7 +3080,7 @@ public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T>
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <@NonNull R> Single<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new SingleMap<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new SingleMap<>(this, mapper));
     }
 
     /**
@@ -4068,7 +4067,7 @@ public final Flowable<T> toFlowable() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Future<T> toFuture() {
-        return subscribeWith(new FutureSingleObserver<T>());
+        return subscribeWith(new FutureSingleObserver<>());
     }
 
     /**
@@ -4271,7 +4270,7 @@ private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
      *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the non-null output type
-     * @param mapper the function that receives the upstream success iteem and should return a <em>non-empty</em> {@code Optional}
+     * @param mapper the function that receives the upstream success item and should return a <em>non-empty</em> {@code Optional}
      * to emit as the success output or an <em>empty</em> {@code Optional} to complete the {@code Maybe}
      * @return the new Maybe instance
      * @since 3.0.0
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
index 85b06bd313..d7a3457fe4 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
@@ -63,7 +63,6 @@ public CompositeException(@NonNull Throwable... exceptions) {
      */
     public CompositeException(@NonNull Iterable<? extends Throwable> errors) {
         Set<Throwable> deDupedExceptions = new LinkedHashSet<>();
-        List<Throwable> localExceptions = new ArrayList<>();
         if (errors != null) {
             for (Throwable ex : errors) {
                 if (ex instanceof CompositeException) {
@@ -81,7 +80,7 @@ public CompositeException(@NonNull Iterable<? extends Throwable> errors) {
         if (deDupedExceptions.isEmpty()) {
             throw new IllegalArgumentException("errors is empty");
         }
-        localExceptions.addAll(deDupedExceptions);
+        List<Throwable> localExceptions = new ArrayList<>(deDupedExceptions);
         this.exceptions = Collections.unmodifiableList(localExceptions);
         this.message = exceptions.size() + " exceptions occurred. ";
     }
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java b/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java
index 34557ce302..05ebb5bfb3 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java
@@ -17,7 +17,7 @@
 /**
  * Exception handling utilities ({@link io.reactivex.rxjava3.exceptions.Exceptions Exceptions}),
  * composite exception container ({@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}) and
- * various lifecycle-reladed ({@link io.reactivex.rxjava3.exceptions.MissingBackpressureException UndeliverableException})
+ * various lifecycle-related ({@link io.reactivex.rxjava3.exceptions.MissingBackpressureException UndeliverableException})
  * and behavior-violation exception types ({@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException},
  * {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException}).
  */
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java
index d08ce8d14a..51acc86c75 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java
@@ -95,7 +95,7 @@ public boolean offer(Object v1, Object v2) {
 
     @Nullable
     @Override
-    public Object poll() throws Exception {
+    public Object poll() {
         return null; // always empty
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
index 90928b64c6..8a6d4dd992 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
@@ -32,7 +32,7 @@ public ListCompositeDisposable() {
 
     public ListCompositeDisposable(Disposable... resources) {
         Objects.requireNonNull(resources, "resources is null");
-        this.resources = new LinkedList<Disposable>();
+        this.resources = new LinkedList<>();
         for (Disposable d : resources) {
             Objects.requireNonNull(d, "Disposable item is null");
             this.resources.add(d);
@@ -41,7 +41,7 @@ public ListCompositeDisposable(Disposable... resources) {
 
     public ListCompositeDisposable(Iterable<? extends Disposable> resources) {
         Objects.requireNonNull(resources, "resources is null");
-        this.resources = new LinkedList<Disposable>();
+        this.resources = new LinkedList<>();
         for (Disposable d : resources) {
             Objects.requireNonNull(d, "Disposable item is null");
             this.resources.add(d);
@@ -79,7 +79,7 @@ public boolean add(Disposable d) {
                 if (!disposed) {
                     List<Disposable> set = resources;
                     if (set == null) {
-                        set = new LinkedList<Disposable>();
+                        set = new LinkedList<>();
                         resources = set;
                     }
                     set.add(d);
@@ -98,7 +98,7 @@ public boolean addAll(Disposable... ds) {
                 if (!disposed) {
                     List<Disposable> set = resources;
                     if (set == null) {
-                        set = new LinkedList<Disposable>();
+                        set = new LinkedList<>();
                         resources = set;
                     }
                     for (Disposable d : ds) {
@@ -171,7 +171,7 @@ void dispose(List<Disposable> set) {
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 if (errors == null) {
-                    errors = new ArrayList<Throwable>();
+                    errors = new ArrayList<>();
                 }
                 errors.add(ex);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
index 05d1997893..1fee43d07e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
@@ -36,46 +36,46 @@ private Functions() {
 
     @NonNull
     public static <T1, T2, R> Function<Object[], R> toFunction(@NonNull BiFunction<? super T1, ? super T2, ? extends R> f) {
-        return new Array2Func<T1, T2, R>(f);
+        return new Array2Func<>(f);
     }
 
     @NonNull
     public static <T1, T2, T3, R> Function<Object[], R> toFunction(@NonNull Function3<T1, T2, T3, R> f) {
-        return new Array3Func<T1, T2, T3, R>(f);
+        return new Array3Func<>(f);
     }
 
     @NonNull
     public static <T1, T2, T3, T4, R> Function<Object[], R> toFunction(@NonNull Function4<T1, T2, T3, T4, R> f) {
-        return new Array4Func<T1, T2, T3, T4, R>(f);
+        return new Array4Func<>(f);
     }
 
     @NonNull
     public static <T1, T2, T3, T4, T5, R> Function<Object[], R> toFunction(@NonNull Function5<T1, T2, T3, T4, T5, R> f) {
-        return new Array5Func<T1, T2, T3, T4, T5, R>(f);
+        return new Array5Func<>(f);
     }
 
     @NonNull
     public static <T1, T2, T3, T4, T5, T6, R> Function<Object[], R> toFunction(
             @NonNull Function6<T1, T2, T3, T4, T5, T6, R> f) {
-        return new Array6Func<T1, T2, T3, T4, T5, T6, R>(f);
+        return new Array6Func<>(f);
     }
 
     @NonNull
     public static <T1, T2, T3, T4, T5, T6, T7, R> Function<Object[], R> toFunction(
             @NonNull Function7<T1, T2, T3, T4, T5, T6, T7, R> f) {
-        return new Array7Func<T1, T2, T3, T4, T5, T6, T7, R>(f);
+        return new Array7Func<>(f);
     }
 
     @NonNull
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Function<Object[], R> toFunction(
             @NonNull Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> f) {
-        return new Array8Func<T1, T2, T3, T4, T5, T6, T7, T8, R>(f);
+        return new Array8Func<>(f);
     }
 
     @NonNull
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Function<Object[], R> toFunction(
             @NonNull Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> f) {
-        return new Array9Func<T1, T2, T3, T4, T5, T6, T7, T8, T9, R>(f);
+        return new Array9Func<>(f);
     }
 
     /** A singleton identity function. */
@@ -186,17 +186,17 @@ static final class JustValue<T, U> implements Callable<U>, Supplier<U>, Function
         }
 
         @Override
-        public U call() throws Exception {
+        public U call() {
             return value;
         }
 
         @Override
-        public U apply(T t) throws Exception {
+        public U apply(T t) {
             return value;
         }
 
         @Override
-        public U get() throws Throwable {
+        public U get() {
             return value;
         }
     }
@@ -209,7 +209,7 @@ public U get() throws Throwable {
      */
     @NonNull
     public static <T> Callable<T> justCallable(@NonNull T value) {
-        return new JustValue<Object, T>(value);
+        return new JustValue<>(value);
     }
 
     /**
@@ -220,7 +220,7 @@ public static <T> Callable<T> justCallable(@NonNull T value) {
      */
     @NonNull
     public static <T> Supplier<T> justSupplier(@NonNull T value) {
-        return new JustValue<Object, T>(value);
+        return new JustValue<>(value);
     }
 
     /**
@@ -232,7 +232,7 @@ public static <T> Supplier<T> justSupplier(@NonNull T value) {
      */
     @NonNull
     public static <T, U> Function<T, U> justFunction(@NonNull U value) {
-        return new JustValue<T, U>(value);
+        return new JustValue<>(value);
     }
 
     static final class CastToClass<T, U> implements Function<T, U> {
@@ -243,7 +243,7 @@ static final class CastToClass<T, U> implements Function<T, U> {
         }
 
         @Override
-        public U apply(T t) throws Exception {
+        public U apply(T t) {
             return clazz.cast(t);
         }
     }
@@ -257,7 +257,7 @@ public U apply(T t) throws Exception {
      */
     @NonNull
     public static <T, U> Function<T, U> castFunction(@NonNull Class<U> target) {
-        return new CastToClass<T, U>(target);
+        return new CastToClass<>(target);
     }
 
     static final class ArrayListCapacityCallable<T> implements Supplier<List<T>> {
@@ -268,13 +268,13 @@ static final class ArrayListCapacityCallable<T> implements Supplier<List<T>> {
         }
 
         @Override
-        public List<T> get() throws Exception {
-            return new ArrayList<T>(capacity);
+        public List<T> get() {
+            return new ArrayList<>(capacity);
         }
     }
 
     public static <T> Supplier<List<T>> createArrayList(int capacity) {
-        return new ArrayListCapacityCallable<T>(capacity);
+        return new ArrayListCapacityCallable<>(capacity);
     }
 
     static final class EqualsPredicate<T> implements Predicate<T> {
@@ -285,25 +285,25 @@ static final class EqualsPredicate<T> implements Predicate<T> {
         }
 
         @Override
-        public boolean test(T t) throws Exception {
+        public boolean test(T t) {
             return Objects.equals(t, value);
         }
     }
 
     public static <T> Predicate<T> equalsWith(T value) {
-        return new EqualsPredicate<T>(value);
+        return new EqualsPredicate<>(value);
     }
 
     enum HashSetCallable implements Supplier<Set<Object>>, Callable<Set<Object>> {
         INSTANCE;
         @Override
-        public Set<Object> call() throws Exception {
-            return new HashSet<Object>();
+        public Set<Object> call() {
+            return new HashSet<>();
         }
 
         @Override
-        public Set<Object> get() throws Throwable {
-            return new HashSet<Object>();
+        public Set<Object> get() {
+            return new HashSet<>();
         }
     }
 
@@ -334,7 +334,7 @@ static final class NotificationOnError<T> implements Consumer<Throwable> {
 
         @Override
         public void accept(Throwable v) throws Throwable {
-            onNotification.accept(Notification.<T>createOnError(v));
+            onNotification.accept(Notification.createOnError(v));
         }
     }
 
@@ -347,20 +347,20 @@ static final class NotificationOnComplete<T> implements Action {
 
         @Override
         public void run() throws Throwable {
-            onNotification.accept(Notification.<T>createOnComplete());
+            onNotification.accept(Notification.createOnComplete());
         }
     }
 
     public static <T> Consumer<T> notificationOnNext(Consumer<? super Notification<T>> onNotification) {
-        return new NotificationOnNext<T>(onNotification);
+        return new NotificationOnNext<>(onNotification);
     }
 
     public static <T> Consumer<Throwable> notificationOnError(Consumer<? super Notification<T>> onNotification) {
-        return new NotificationOnError<T>(onNotification);
+        return new NotificationOnError<>(onNotification);
     }
 
     public static <T> Action notificationOnComplete(Consumer<? super Notification<T>> onNotification) {
-        return new NotificationOnComplete<T>(onNotification);
+        return new NotificationOnComplete<>(onNotification);
     }
 
     static final class ActionConsumer<T> implements Consumer<T> {
@@ -377,7 +377,7 @@ public void accept(T t) throws Throwable {
     }
 
     public static <T> Consumer<T> actionConsumer(Action action) {
-        return new ActionConsumer<T>(action);
+        return new ActionConsumer<>(action);
     }
 
     static final class ClassFilter<T, U> implements Predicate<T> {
@@ -388,13 +388,13 @@ static final class ClassFilter<T, U> implements Predicate<T> {
         }
 
         @Override
-        public boolean test(T t) throws Exception {
+        public boolean test(T t) {
             return clazz.isInstance(t);
         }
     }
 
     public static <T, U> Predicate<T> isInstanceOf(Class<U> clazz) {
-        return new ClassFilter<T, U>(clazz);
+        return new ClassFilter<>(clazz);
     }
 
     static final class BooleanSupplierPredicateReverse<T> implements Predicate<T> {
@@ -411,7 +411,7 @@ public boolean test(T t) throws Throwable {
     }
 
     public static <T> Predicate<T> predicateReverseFor(BooleanSupplier supplier) {
-        return new BooleanSupplierPredicateReverse<T>(supplier);
+        return new BooleanSupplierPredicateReverse<>(supplier);
     }
 
     static final class TimestampFunction<T> implements Function<T, Timed<T>> {
@@ -425,13 +425,13 @@ static final class TimestampFunction<T> implements Function<T, Timed<T>> {
         }
 
         @Override
-        public Timed<T> apply(T t) throws Exception {
-            return new Timed<T>(t, scheduler.now(unit), unit);
+        public Timed<T> apply(T t) {
+            return new Timed<>(t, scheduler.now(unit), unit);
         }
     }
 
     public static <T> Function<T, Timed<T>> timestampWith(TimeUnit unit, Scheduler scheduler) {
-        return new TimestampFunction<T>(unit, scheduler);
+        return new TimestampFunction<>(unit, scheduler);
     }
 
     static final class ToMapKeySelector<K, T> implements BiConsumer<Map<K, T>, T> {
@@ -449,7 +449,7 @@ public void accept(Map<K, T> m, T t) throws Throwable {
     }
 
     public static <T, K> BiConsumer<Map<K, T>, T> toMapKeySelector(final Function<? super T, ? extends K> keySelector) {
-        return new ToMapKeySelector<K, T>(keySelector);
+        return new ToMapKeySelector<>(keySelector);
     }
 
     static final class ToMapKeyValueSelector<K, V, T> implements BiConsumer<Map<K, V>, T> {
@@ -471,7 +471,7 @@ public void accept(Map<K, V> m, T t) throws Throwable {
     }
 
     public static <T, K, V> BiConsumer<Map<K, V>, T> toMapKeyValueSelector(final Function<? super T, ? extends K> keySelector, final Function<? super T, ? extends V> valueSelector) {
-        return new ToMapKeyValueSelector<K, V, T>(valueSelector, keySelector);
+        return new ToMapKeyValueSelector<>(valueSelector, keySelector);
     }
 
     static final class ToMultimapKeyValueSelector<K, V, T> implements BiConsumer<Map<K, Collection<V>>, T> {
@@ -506,7 +506,7 @@ public void accept(Map<K, Collection<V>> m, T t) throws Throwable {
     public static <T, K, V> BiConsumer<Map<K, Collection<V>>, T> toMultimapKeyValueSelector(
             final Function<? super T, ? extends K> keySelector, final Function<? super T, ? extends V> valueSelector,
             final Function<? super K, ? extends Collection<? super V>> collectionFactory) {
-        return new ToMultimapKeyValueSelector<K, V, T>(collectionFactory, valueSelector, keySelector);
+        return new ToMultimapKeyValueSelector<>(collectionFactory, valueSelector, keySelector);
     }
 
     enum NaturalComparator implements Comparator<Object> {
@@ -539,7 +539,7 @@ public List<T> apply(List<T> v) {
     }
 
     public static <T> Function<List<T>, List<T>> listSorter(final Comparator<? super T> comparator) {
-        return new ListSorter<T>(comparator);
+        return new ListSorter<>(comparator);
     }
 
     public static final Consumer<Subscription> REQUEST_MAX = new MaxRequestSubscription();
@@ -762,7 +762,7 @@ public Object call() {
         }
 
         @Override
-        public Object get() throws Throwable {
+        public Object get() {
             return null;
         }
     }
@@ -777,7 +777,7 @@ public int compare(Object a, Object b) {
 
     static final class MaxRequestSubscription implements Consumer<Subscription> {
         @Override
-        public void accept(Subscription t) throws Exception {
+        public void accept(Subscription t) {
             t.request(Long.MAX_VALUE);
         }
     }
@@ -796,7 +796,7 @@ public static class BoundedConsumer implements Consumer<Subscription> {
         }
 
         @Override
-        public void accept(Subscription s) throws Exception {
+        public void accept(Subscription s) {
             s.request(bufferSize);
         }
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
index 968e581625..210d920aad 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
@@ -112,7 +112,7 @@ public void onNext(@NonNull T t) {
                             done = true;
                             break;
                         }
-                        R value = Objects.requireNonNull(it.next(), "The Stream's Iterator.next retuned a null value");
+                        R value = Objects.requireNonNull(it.next(), "The Stream's Iterator.next returned a null value");
                         if (disposed) {
                             done = true;
                             break;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java
index e94f50cb67..c8802de3f6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java
@@ -209,7 +209,6 @@ public void onNext(T t) {
                     Exceptions.throwIfFatal(ex);
                     get().cancel();
                     onError(ex);
-                    return;
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java
index 8db129efb6..57d5f8c5c7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java
@@ -114,7 +114,7 @@ public final void complete() {
 
     @Nullable
     @Override
-    public final T poll() throws Exception {
+    public final T poll() {
         if (get() == FUSED_READY) {
             T v = value;
             value = null;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java
index f3d067f7ca..515e23e6bf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java
@@ -19,6 +19,7 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
@@ -41,7 +42,7 @@ public final class FutureObserver<T> extends CountDownLatch
 
     public FutureObserver() {
         super(1);
-        this.upstream = new AtomicReference<Disposable>();
+        this.upstream = new AtomicReference<>();
     }
 
     @Override
@@ -90,7 +91,7 @@ public T get() throws InterruptedException, ExecutionException {
     }
 
     @Override
-    public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+    public T get(long timeout, @NonNull TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
         if (getCount() != 0) {
             BlockingHelper.verifyNonBlocking();
             if (!await(timeout, unit)) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java
index 80abb70419..3e55963bea 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java
@@ -18,6 +18,7 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.SingleObserver;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
@@ -40,7 +41,7 @@ public final class FutureSingleObserver<T> extends CountDownLatch
 
     public FutureSingleObserver() {
         super(1);
-        this.upstream = new AtomicReference<Disposable>();
+        this.upstream = new AtomicReference<>();
     }
 
     @Override
@@ -89,7 +90,7 @@ public T get() throws InterruptedException, ExecutionException {
     }
 
     @Override
-    public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+    public T get(long timeout, @NonNull TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
         if (getCount() != 0) {
             BlockingHelper.verifyNonBlocking();
             if (!await(timeout, unit)) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java
index 253e518dad..da002c0dd6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java
@@ -39,7 +39,7 @@ public final class CompletableCache extends Completable implements CompletableOb
 
     public CompletableCache(CompletableSource source) {
         this.source = source;
-        this.observers = new AtomicReference<InnerCompletableCache[]>(EMPTY);
+        this.observers = new AtomicReference<>(EMPTY);
         this.once = new AtomicBoolean();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
index 9d55b626ea..c16b847c58 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
@@ -106,9 +106,9 @@ public void onSubscribe(Subscription s) {
                 }
 
                 if (prefetch == Integer.MAX_VALUE) {
-                    queue = new SpscLinkedArrayQueue<CompletableSource>(Flowable.bufferSize());
+                    queue = new SpscLinkedArrayQueue<>(Flowable.bufferSize());
                 } else {
-                    queue = new SpscArrayQueue<CompletableSource>(prefetch);
+                    queue = new SpscArrayQueue<>(prefetch);
                 }
 
                 downstream.onSubscribe(this);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java
index d368a04244..d91133e502 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java
@@ -26,7 +26,7 @@ public CompletableFromObservable(ObservableSource<T> observable) {
 
     @Override
     protected void subscribeActual(final CompletableObserver observer) {
-        observable.subscribe(new CompletableFromObservableObserver<T>(observer));
+        observable.subscribe(new CompletableFromObservableObserver<>(observer));
     }
 
     static final class CompletableFromObservableObserver<T> implements Observer<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java
index 0e65777e3f..6baeb7a87e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java
@@ -29,7 +29,7 @@ public CompletableFromPublisher(Publisher<T> flowable) {
 
     @Override
     protected void subscribeActual(final CompletableObserver downstream) {
-        flowable.subscribe(new FromPublisherSubscriber<T>(downstream));
+        flowable.subscribe(new FromPublisherSubscriber<>(downstream));
     }
 
     static final class FromPublisherSubscriber<T> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java
index adee6c86f0..b035f142d9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java
@@ -26,7 +26,7 @@ public CompletableFromSingle(SingleSource<T> single) {
 
     @Override
     protected void subscribeActual(final CompletableObserver observer) {
-        single.subscribe(new CompletableFromSingleObserver<T>(observer));
+        single.subscribe(new CompletableFromSingleObserver<>(observer));
     }
 
     static final class CompletableFromSingleObserver<T> implements SingleObserver<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java
index 129084898a..15dd320cad 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java
@@ -34,6 +34,6 @@ public CompletableMaterialize(Completable source) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super Notification<T>> observer) {
-        source.subscribe(new MaterializeSingleObserver<T>(observer));
+        source.subscribe(new MaterializeSingleObserver<>(observer));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java
index ccbafd06b5..9ad0d0a8d8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java
@@ -28,7 +28,7 @@ public CompletableToFlowable(CompletableSource source) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        SubscriberCompletableObserver<T> os = new SubscriberCompletableObserver<T>(s);
+        SubscriberCompletableObserver<T> os = new SubscriberCompletableObserver<>(s);
         source.subscribe(os);
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java
index 91ce597c3b..095a975dbf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java
@@ -71,7 +71,7 @@ public int requestFusion(int mode) {
         }
 
         @Override
-        public Void poll() throws Exception {
+        public Void poll() {
             return null; // always empty
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java
index 7a4e99b332..3476a65b25 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java
@@ -80,7 +80,7 @@ protected void subscribeActual(CompletableObserver observer) {
             return;
         }
 
-        source.subscribe(new UsingObserver<R>(observer, resource, disposer, eager));
+        source.subscribe(new UsingObserver<>(observer, resource, disposer, eager));
     }
 
     static final class UsingObserver<R>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
index 151541f63f..51015ce918 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
@@ -38,7 +38,7 @@ public BlockingFlowableIterable(Flowable<T> source, int bufferSize) {
 
     @Override
     public Iterator<T> iterator() {
-        BlockingFlowableIterator<T> it = new BlockingFlowableIterator<T>(bufferSize);
+        BlockingFlowableIterator<T> it = new BlockingFlowableIterator<>(bufferSize);
         source.subscribe(it);
         return it;
     }
@@ -65,7 +65,7 @@ static final class BlockingFlowableIterator<T>
         volatile Throwable error;
 
         BlockingFlowableIterator(int batchSize) {
-            this.queue = new SpscArrayQueue<T>(batchSize);
+            this.queue = new SpscArrayQueue<>(batchSize);
             this.batchSize = batchSize;
             this.limit = batchSize - (batchSize >> 2);
             this.lock = new ReentrantLock();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java
index 91fce3e427..1cc469a1b9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java
@@ -39,7 +39,7 @@ public BlockingFlowableLatest(Publisher<? extends T> source) {
 
     @Override
     public Iterator<T> iterator() {
-        LatestSubscriberIterator<T> lio = new LatestSubscriberIterator<T>();
+        LatestSubscriberIterator<T> lio = new LatestSubscriberIterator<>();
         Flowable.<T>fromPublisher(source).materialize().subscribe(lio);
         return lio;
     }
@@ -48,7 +48,7 @@ public Iterator<T> iterator() {
     static final class LatestSubscriberIterator<T> extends DisposableSubscriber<Notification<T>> implements Iterator<T> {
         final Semaphore notify = new Semaphore(0);
         // observer's notification
-        final AtomicReference<Notification<T>> value = new AtomicReference<Notification<T>>();
+        final AtomicReference<Notification<T>> value = new AtomicReference<>();
 
         // iterator's notification
         Notification<T> iteratorNotification;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java
index f8fae1d413..bfd206eea9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java
@@ -40,7 +40,7 @@ public BlockingFlowableMostRecent(Flowable<T> source, T initialValue) {
 
     @Override
     public Iterator<T> iterator() {
-        MostRecentSubscriber<T> mostRecentSubscriber = new MostRecentSubscriber<T>(initialValue);
+        MostRecentSubscriber<T> mostRecentSubscriber = new MostRecentSubscriber<>(initialValue);
 
         source.subscribe(mostRecentSubscriber);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
index 4db920bb1f..57ca264f0c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
@@ -41,8 +41,8 @@ public BlockingFlowableNext(Publisher<? extends T> source) {
 
     @Override
     public Iterator<T> iterator() {
-        NextSubscriber<T> nextSubscriber = new NextSubscriber<T>();
-        return new NextIterator<T>(source, nextSubscriber);
+        NextSubscriber<T> nextSubscriber = new NextSubscriber<>();
+        return new NextIterator<>(source, nextSubscriber);
     }
 
     // test needs to access the observer.waiting flag
@@ -133,7 +133,7 @@ public void remove() {
     }
 
     static final class NextSubscriber<T> extends DisposableSubscriber<Notification<T>> {
-        private final BlockingQueue<Notification<T>> buf = new ArrayBlockingQueue<Notification<T>>(1);
+        private final BlockingQueue<Notification<T>> buf = new ArrayBlockingQueue<>(1);
         final AtomicInteger waiting = new AtomicInteger();
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java
index 0933703803..84ea50cbf7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java
@@ -31,7 +31,7 @@ public FlowableAll(Flowable<T> source, Predicate<? super T> predicate) {
 
     @Override
     protected void subscribeActual(Subscriber<? super Boolean> s) {
-        source.subscribe(new AllSubscriber<T>(s, predicate));
+        source.subscribe(new AllSubscriber<>(s, predicate));
     }
 
     static final class AllSubscriber<T> extends DeferredScalarSubscription<Boolean> implements FlowableSubscriber<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java
index 516d37bf7c..8d1bf998ef 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java
@@ -35,12 +35,12 @@ public FlowableAllSingle(Flowable<T> source, Predicate<? super T> predicate) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super Boolean> observer) {
-        source.subscribe(new AllSubscriber<T>(observer, predicate));
+        source.subscribe(new AllSubscriber<>(observer, predicate));
     }
 
     @Override
     public Flowable<Boolean> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableAll<T>(source, predicate));
+        return RxJavaPlugins.onAssembly(new FlowableAll<>(source, predicate));
     }
 
     static final class AllSubscriber<T> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java
index 546beb0fae..ff650b5719 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java
@@ -69,7 +69,7 @@ public void subscribeActual(Subscriber<? super T> s) {
             return;
         }
 
-        AmbCoordinator<T> ac = new AmbCoordinator<T>(s, count);
+        AmbCoordinator<T> ac = new AmbCoordinator<>(s, count);
         ac.subscribe(sources);
     }
 
@@ -89,7 +89,7 @@ public void subscribe(Publisher<? extends T>[] sources) {
             AmbInnerSubscriber<T>[] as = subscribers;
             int len = as.length;
             for (int i = 0; i < len; i++) {
-                as[i] = new AmbInnerSubscriber<T>(this, i + 1, downstream);
+                as[i] = new AmbInnerSubscriber<>(this, i + 1, downstream);
             }
             winner.lazySet(0); // release the contents of 'as'
             downstream.onSubscribe(this);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java
index 401d444cca..d0adcb6dbe 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java
@@ -29,7 +29,7 @@ public FlowableAny(Flowable<T> source, Predicate<? super T> predicate) {
 
     @Override
     protected void subscribeActual(Subscriber<? super Boolean> s) {
-        source.subscribe(new AnySubscriber<T>(s, predicate));
+        source.subscribe(new AnySubscriber<>(s, predicate));
     }
 
     static final class AnySubscriber<T> extends DeferredScalarSubscription<Boolean> implements FlowableSubscriber<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java
index 6a9e4aacbb..7ca8a6b428 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java
@@ -34,12 +34,12 @@ public FlowableAnySingle(Flowable<T> source, Predicate<? super T> predicate) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super Boolean> observer) {
-        source.subscribe(new AnySubscriber<T>(observer, predicate));
+        source.subscribe(new AnySubscriber<>(observer, predicate));
     }
 
     @Override
     public Flowable<Boolean> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableAny<T>(source, predicate));
+        return RxJavaPlugins.onAssembly(new FlowableAny<>(source, predicate));
     }
 
     static final class AnySubscriber<T> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
index 14654d35ee..9caafbc8e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
@@ -42,9 +42,9 @@ private FlowableBlockingSubscribe() {
      * @param <T> the value type
      */
     public static <T> void subscribe(Publisher<? extends T> o, Subscriber<? super T> subscriber) {
-        final BlockingQueue<Object> queue = new LinkedBlockingQueue<Object>();
+        final BlockingQueue<Object> queue = new LinkedBlockingQueue<>();
 
-        BlockingSubscriber<T> bs = new BlockingSubscriber<T>(queue);
+        BlockingSubscriber<T> bs = new BlockingSubscriber<>(queue);
 
         o.subscribe(bs);
 
@@ -82,7 +82,7 @@ public static <T> void subscribe(Publisher<? extends T> o, Subscriber<? super T>
      */
     public static <T> void subscribe(Publisher<? extends T> o) {
         BlockingIgnoringReceiver callback = new BlockingIgnoringReceiver();
-        LambdaSubscriber<T> ls = new LambdaSubscriber<T>(Functions.emptyConsumer(),
+        LambdaSubscriber<T> ls = new LambdaSubscriber<>(Functions.emptyConsumer(),
         callback, callback, Functions.REQUEST_MAX);
 
         o.subscribe(ls);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
index 08f89e99e2..04f5ae182e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
@@ -42,11 +42,11 @@ public FlowableBuffer(Flowable<T> source, int size, int skip, Supplier<C> buffer
     @Override
     public void subscribeActual(Subscriber<? super C> s) {
         if (size == skip) {
-            source.subscribe(new PublisherBufferExactSubscriber<T, C>(s, size, bufferSupplier));
+            source.subscribe(new PublisherBufferExactSubscriber<>(s, size, bufferSupplier));
         } else if (skip > size) {
-            source.subscribe(new PublisherBufferSkipSubscriber<T, C>(s, size, skip, bufferSupplier));
+            source.subscribe(new PublisherBufferSkipSubscriber<>(s, size, skip, bufferSupplier));
         } else {
-            source.subscribe(new PublisherBufferOverlappingSubscriber<T, C>(s, size, skip, bufferSupplier));
+            source.subscribe(new PublisherBufferOverlappingSubscriber<>(s, size, skip, bufferSupplier));
         }
     }
 
@@ -318,7 +318,7 @@ static final class PublisherBufferOverlappingSubscriber<T, C extends Collection<
             this.skip = skip;
             this.bufferSupplier = bufferSupplier;
             this.once = new AtomicBoolean();
-            this.buffers = new ArrayDeque<C>();
+            this.buffers = new ArrayDeque<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
index 47f6e6bf06..251144a1d2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
@@ -44,7 +44,7 @@ public FlowableBufferBoundary(Flowable<T> source, Publisher<? extends Open> buff
     @Override
     protected void subscribeActual(Subscriber<? super U> s) {
         BufferBoundarySubscriber<T, U, Open, Close> parent =
-            new BufferBoundarySubscriber<T, U, Open, Close>(
+            new BufferBoundarySubscriber<>(
                 s, bufferOpen, bufferClose, bufferSupplier
             );
         s.onSubscribe(parent);
@@ -93,11 +93,11 @@ static final class BufferBoundarySubscriber<T, C extends Collection<? super T>,
             this.bufferSupplier = bufferSupplier;
             this.bufferOpen = bufferOpen;
             this.bufferClose = bufferClose;
-            this.queue = new SpscLinkedArrayQueue<C>(bufferSize());
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize());
             this.subscribers = new CompositeDisposable();
             this.requested = new AtomicLong();
-            this.upstream = new AtomicReference<Subscription>();
-            this.buffers = new LinkedHashMap<Long, C>();
+            this.upstream = new AtomicReference<>();
+            this.buffers = new LinkedHashMap<>();
             this.errors = new AtomicThrowable();
         }
 
@@ -105,7 +105,7 @@ static final class BufferBoundarySubscriber<T, C extends Collection<? super T>,
         public void onSubscribe(Subscription s) {
             if (SubscriptionHelper.setOnce(this.upstream, s)) {
 
-                BufferOpenSubscriber<Open> open = new BufferOpenSubscriber<Open>(this);
+                BufferOpenSubscriber<Open> open = new BufferOpenSubscriber<>(this);
                 subscribers.add(open);
 
                 bufferOpen.subscribe(open);
@@ -199,7 +199,7 @@ void open(Open token) {
                 bufs.put(idx, buf);
             }
 
-            BufferCloseSubscriber<T, C> bc = new BufferCloseSubscriber<T, C>(this, idx);
+            BufferCloseSubscriber<T, C> bc = new BufferCloseSubscriber<>(this, idx);
             subscribers.add(bc);
             p.subscribe(bc);
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
index a1ca188b13..8d23e3c7bc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
@@ -41,7 +41,7 @@ public FlowableBufferExactBoundary(Flowable<T> source, Publisher<B> boundary, Su
 
     @Override
     protected void subscribeActual(Subscriber<? super U> s) {
-        source.subscribe(new BufferExactBoundarySubscriber<T, U, B>(new SerializedSubscriber<U>(s), bufferSupplier, boundary));
+        source.subscribe(new BufferExactBoundarySubscriber<>(new SerializedSubscriber<>(s), bufferSupplier, boundary));
     }
 
     static final class BufferExactBoundarySubscriber<T, U extends Collection<? super T>, B>
@@ -58,7 +58,7 @@ static final class BufferExactBoundarySubscriber<T, U extends Collection<? super
 
         BufferExactBoundarySubscriber(Subscriber<? super U> actual, Supplier<U> bufferSupplier,
                                              Publisher<B> boundary) {
-            super(actual, new MpscLinkedQueue<U>());
+            super(actual, new MpscLinkedQueue<>());
             this.bufferSupplier = bufferSupplier;
             this.boundary = boundary;
         }
@@ -84,7 +84,7 @@ public void onSubscribe(Subscription s) {
 
             buffer = b;
 
-            BufferBoundarySubscriber<T, U, B> bs = new BufferBoundarySubscriber<T, U, B>(this);
+            BufferBoundarySubscriber<T, U, B> bs = new BufferBoundarySubscriber<>(this);
             other = bs;
 
             downstream.onSubscribe(this);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java
index 0b3faed1c5..854e0460ed 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java
@@ -56,16 +56,16 @@ public FlowableBufferTimed(Flowable<T> source, long timespan, long timeskip, Tim
     @Override
     protected void subscribeActual(Subscriber<? super U> s) {
         if (timespan == timeskip && maxSize == Integer.MAX_VALUE) {
-            source.subscribe(new BufferExactUnboundedSubscriber<T, U>(
-                    new SerializedSubscriber<U>(s),
+            source.subscribe(new BufferExactUnboundedSubscriber<>(
+                    new SerializedSubscriber<>(s),
                     bufferSupplier, timespan, unit, scheduler));
             return;
         }
         Scheduler.Worker w = scheduler.createWorker();
 
         if (timespan == timeskip) {
-            source.subscribe(new BufferExactBoundedSubscriber<T, U>(
-                    new SerializedSubscriber<U>(s),
+            source.subscribe(new BufferExactBoundedSubscriber<>(
+                    new SerializedSubscriber<>(s),
                     bufferSupplier,
                     timespan, unit, maxSize, restartTimerOnMaxSize, w
             ));
@@ -73,8 +73,8 @@ protected void subscribeActual(Subscriber<? super U> s) {
         }
         // Can't use maxSize because what to do if a buffer is full but its
         // timespan hasn't been elapsed?
-        source.subscribe(new BufferSkipBoundedSubscriber<T, U>(
-                new SerializedSubscriber<U>(s),
+        source.subscribe(new BufferSkipBoundedSubscriber<>(
+                new SerializedSubscriber<>(s),
                 bufferSupplier, timespan, timeskip, unit, w));
     }
 
@@ -89,12 +89,12 @@ static final class BufferExactUnboundedSubscriber<T, U extends Collection<? supe
 
         U buffer;
 
-        final AtomicReference<Disposable> timer = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> timer = new AtomicReference<>();
 
         BufferExactUnboundedSubscriber(
                 Subscriber<? super U> actual, Supplier<U> bufferSupplier,
                 long timespan, TimeUnit unit, Scheduler scheduler) {
-            super(actual, new MpscLinkedQueue<U>());
+            super(actual, new MpscLinkedQueue<>());
             this.bufferSupplier = bufferSupplier;
             this.timespan = timespan;
             this.unit = unit;
@@ -238,13 +238,13 @@ static final class BufferSkipBoundedSubscriber<T, U extends Collection<? super T
         BufferSkipBoundedSubscriber(Subscriber<? super U> actual,
                 Supplier<U> bufferSupplier, long timespan,
                 long timeskip, TimeUnit unit, Worker w) {
-            super(actual, new MpscLinkedQueue<U>());
+            super(actual, new MpscLinkedQueue<>());
             this.bufferSupplier = bufferSupplier;
             this.timespan = timespan;
             this.timeskip = timeskip;
             this.unit = unit;
             this.w = w;
-            this.buffers = new LinkedList<U>();
+            this.buffers = new LinkedList<>();
         }
 
         @Override
@@ -298,7 +298,7 @@ public void onError(Throwable t) {
         public void onComplete() {
             List<U> bs;
             synchronized (this) {
-                bs = new ArrayList<U>(buffers);
+                bs = new ArrayList<>(buffers);
                 buffers.clear();
             }
 
@@ -404,7 +404,7 @@ static final class BufferExactBoundedSubscriber<T, U extends Collection<? super
                 Supplier<U> bufferSupplier,
                 long timespan, TimeUnit unit, int maxSize,
                 boolean restartOnMaxSize, Worker w) {
-            super(actual, new MpscLinkedQueue<U>());
+            super(actual, new MpscLinkedQueue<>());
             this.bufferSupplier = bufferSupplier;
             this.timespan = timespan;
             this.unit = unit;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java
index aea0b3150d..25d5fb71a3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java
@@ -99,15 +99,15 @@ public FlowableCache(Flowable<T> source, int capacityHint) {
         super(source);
         this.capacityHint = capacityHint;
         this.once = new AtomicBoolean();
-        Node<T> n = new Node<T>(capacityHint);
+        Node<T> n = new Node<>(capacityHint);
         this.head = n;
         this.tail = n;
-        this.subscribers = new AtomicReference<CacheSubscription<T>[]>(EMPTY);
+        this.subscribers = new AtomicReference<>(EMPTY);
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> t) {
-        CacheSubscription<T> consumer = new CacheSubscription<T>(t, this);
+        CacheSubscription<T> consumer = new CacheSubscription<>(t, this);
         t.onSubscribe(consumer);
         add(consumer);
 
@@ -303,7 +303,7 @@ public void onNext(T t) {
         int tailOffset = this.tailOffset;
         // if the current tail node is full, create a fresh node
         if (tailOffset == capacityHint) {
-            Node<T> n = new Node<T>(tailOffset);
+            Node<T> n = new Node<>(tailOffset);
             n.values[0] = t;
             this.tailOffset = 1;
             tail.next = n;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
index c2560cf6e3..b8751a23f9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
@@ -44,7 +44,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
             return;
         }
 
-        source.subscribe(new CollectSubscriber<T, U>(s, u, collector));
+        source.subscribe(new CollectSubscriber<>(s, u, collector));
     }
 
     static final class CollectSubscriber<T, U> extends DeferredScalarSubscription<U> implements FlowableSubscriber<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
index edf17d95ef..f159911fba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
@@ -49,12 +49,12 @@ protected void subscribeActual(SingleObserver<? super U> observer) {
             return;
         }
 
-        source.subscribe(new CollectSubscriber<T, U>(observer, u, collector));
+        source.subscribe(new CollectSubscriber<>(observer, u, collector));
     }
 
     @Override
     public Flowable<U> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableCollect<T, U>(source, initialSupplier, collector));
+        return RxJavaPlugins.onAssembly(new FlowableCollect<>(source, initialSupplier, collector));
     }
 
     static final class CollectSubscriber<T, U> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
index 24306072bc..392de62d22 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
@@ -132,12 +132,12 @@ public void subscribeActual(Subscriber<? super R> s) {
             return;
         }
         if (n == 1) {
-            ((Publisher<T>)a[0]).subscribe(new MapSubscriber<T, R>(s, new SingletonArrayFunc()));
+            a[0].subscribe(new MapSubscriber<>(s, new SingletonArrayFunc()));
             return;
         }
 
         CombineLatestCoordinator<T, R> coordinator =
-                new CombineLatestCoordinator<T, R>(s, combiner, n, bufferSize, delayErrors);
+                new CombineLatestCoordinator<>(s, combiner, n, bufferSize, delayErrors);
 
         s.onSubscribe(coordinator);
 
@@ -183,13 +183,13 @@ static final class CombineLatestCoordinator<T, R>
             @SuppressWarnings("unchecked")
             CombineLatestInnerSubscriber<T>[] a = new CombineLatestInnerSubscriber[n];
             for (int i = 0; i < n; i++) {
-                a[i] = new CombineLatestInnerSubscriber<T>(this, i, bufferSize);
+                a[i] = new CombineLatestInnerSubscriber<>(this, i, bufferSize);
             }
             this.subscribers = a;
             this.latest = new Object[n];
-            this.queue = new SpscLinkedArrayQueue<Object>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
             this.requested = new AtomicLong();
-            this.error = new  AtomicReference<Throwable>();
+            this.error = new  AtomicReference<>();
             this.delayErrors = delayErrors;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java
index ad1651b261..81834bba61 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java
@@ -34,7 +34,7 @@ public FlowableConcatArray(Publisher<? extends T>[] sources, boolean delayError)
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        ConcatArraySubscriber<T> parent = new ConcatArraySubscriber<T>(sources, delayError, s);
+        ConcatArraySubscriber<T> parent = new ConcatArraySubscriber<>(sources, delayError, s);
         s.onSubscribe(parent);
 
         parent.onComplete();
@@ -82,7 +82,7 @@ public void onError(Throwable t) {
             if (delayError) {
                 List<Throwable> list = errors;
                 if (list == null) {
-                    list = new ArrayList<Throwable>(sources.length - index + 1);
+                    list = new ArrayList<>(sources.length - index + 1);
                     errors = list;
                 }
                 list.add(t);
@@ -121,7 +121,7 @@ public void onComplete() {
                         if (delayError) {
                             List<Throwable> list = errors;
                             if (list == null) {
-                                list = new ArrayList<Throwable>(n - i + 1);
+                                list = new ArrayList<>(n - i + 1);
                                 errors = list;
                             }
                             list.add(ex);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
index f757fb5f3b..98d8ea4410 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
@@ -46,11 +46,11 @@ public static <T, R> Subscriber<T> subscribe(Subscriber<? super R> s, Function<?
             int prefetch, ErrorMode errorMode) {
         switch (errorMode) {
         case BOUNDARY:
-            return new ConcatMapDelayed<T, R>(s, mapper, prefetch, false);
+            return new ConcatMapDelayed<>(s, mapper, prefetch, false);
         case END:
-            return new ConcatMapDelayed<T, R>(s, mapper, prefetch, true);
+            return new ConcatMapDelayed<>(s, mapper, prefetch, true);
         default:
-            return new ConcatMapImmediate<T, R>(s, mapper, prefetch);
+            return new ConcatMapImmediate<>(s, mapper, prefetch);
         }
     }
 
@@ -100,7 +100,7 @@ abstract static class BaseConcatMapSubscriber<T, R>
             this.mapper = mapper;
             this.prefetch = prefetch;
             this.limit = prefetch - (prefetch >> 2);
-            this.inner = new ConcatMapInner<R>(this);
+            this.inner = new ConcatMapInner<>(this);
             this.errors = new AtomicThrowable();
         }
 
@@ -133,7 +133,7 @@ public final void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<T>(prefetch);
+                queue = new SpscArrayQueue<>(prefetch);
 
                 subscribeActual();
 
@@ -328,7 +328,7 @@ void drain() {
                                     continue;
                                 } else {
                                     active = true;
-                                    inner.setSubscription(new WeakScalarSubscription<R>(vr, inner));
+                                    inner.setSubscription(new WeakScalarSubscription<>(vr, inner));
                                 }
 
                             } else {
@@ -527,7 +527,7 @@ void drain() {
                                     continue;
                                 } else {
                                     active = true;
-                                    inner.setSubscription(new WeakScalarSubscription<R>(vr, inner));
+                                    inner.setSubscription(new WeakScalarSubscription<>(vr, inner));
                                 }
                             } else {
                                 active = true;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
index 9aee3eaebb..ea39af45a2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
@@ -51,7 +51,7 @@ public FlowableConcatMapEager(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new ConcatMapEagerDelayErrorSubscriber<T, R>(
+        source.subscribe(new ConcatMapEagerDelayErrorSubscriber<>(
                 s, mapper, maxConcurrency, prefetch, errorMode));
     }
 
@@ -93,7 +93,7 @@ static final class ConcatMapEagerDelayErrorSubscriber<T, R>
             this.maxConcurrency = maxConcurrency;
             this.prefetch = prefetch;
             this.errorMode = errorMode;
-            this.subscribers = new SpscLinkedArrayQueue<InnerQueuedSubscriber<R>>(Math.min(prefetch, maxConcurrency));
+            this.subscribers = new SpscLinkedArrayQueue<>(Math.min(prefetch, maxConcurrency));
             this.errors = new AtomicThrowable();
             this.requested = new AtomicLong();
         }
@@ -123,7 +123,7 @@ public void onNext(T t) {
                 return;
             }
 
-            InnerQueuedSubscriber<R> inner = new InnerQueuedSubscriber<R>(this, prefetch);
+            InnerQueuedSubscriber<R> inner = new InnerQueuedSubscriber<>(this, prefetch);
 
             if (cancelled) {
                 return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java
index 8b1e7ec68b..36d465d190 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java
@@ -53,7 +53,7 @@ public FlowableConcatMapEagerPublisher(Publisher<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new ConcatMapEagerDelayErrorSubscriber<T, R>(
+        source.subscribe(new ConcatMapEagerDelayErrorSubscriber<>(
                 s, mapper, maxConcurrency, prefetch, errorMode));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
index 05c984b533..d59677efa1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
@@ -50,13 +50,13 @@ public FlowableConcatMapScheduler(Flowable<T> source,
     protected void subscribeActual(Subscriber<? super R> s) {
         switch (errorMode) {
         case BOUNDARY:
-            source.subscribe(new ConcatMapDelayed<T, R>(s, mapper, prefetch, false, scheduler.createWorker()));
+            source.subscribe(new ConcatMapDelayed<>(s, mapper, prefetch, false, scheduler.createWorker()));
             break;
         case END:
-            source.subscribe(new ConcatMapDelayed<T, R>(s, mapper, prefetch, true, scheduler.createWorker()));
+            source.subscribe(new ConcatMapDelayed<>(s, mapper, prefetch, true, scheduler.createWorker()));
             break;
         default:
-            source.subscribe(new ConcatMapImmediate<T, R>(s, mapper, prefetch, scheduler.createWorker()));
+            source.subscribe(new ConcatMapImmediate<>(s, mapper, prefetch, scheduler.createWorker()));
         }
     }
 
@@ -98,7 +98,7 @@ abstract static class BaseConcatMapSubscriber<T, R>
             this.mapper = mapper;
             this.prefetch = prefetch;
             this.limit = prefetch - (prefetch >> 2);
-            this.inner = new ConcatMapInner<R>(this);
+            this.inner = new ConcatMapInner<>(this);
             this.errors = new AtomicThrowable();
             this.worker = worker;
         }
@@ -132,7 +132,7 @@ public final void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<T>(prefetch);
+                queue = new SpscArrayQueue<>(prefetch);
 
                 subscribeActual();
 
@@ -341,7 +341,7 @@ public void run() {
                                 continue;
                             } else {
                                 active = true;
-                                inner.setSubscription(new WeakScalarSubscription<R>(vr, inner));
+                                inner.setSubscription(new WeakScalarSubscription<>(vr, inner));
                             }
 
                         } else {
@@ -524,7 +524,7 @@ public void run() {
                                 continue;
                             } else {
                                 active = true;
-                                inner.setSubscription(new WeakScalarSubscription<R>(vr, inner));
+                                inner.setSubscription(new WeakScalarSubscription<>(vr, inner));
                             }
                         } else {
                             active = true;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java
index 16556a5892..31729e450f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java
@@ -40,7 +40,7 @@ public FlowableConcatWithCompletable(Flowable<T> source, CompletableSource other
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new ConcatWithSubscriber<T>(s, other));
+        source.subscribe(new ConcatWithSubscriber<>(s, other));
     }
 
     static final class ConcatWithSubscriber<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java
index 92c65809c7..b7db7fd093 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java
@@ -41,7 +41,7 @@ public FlowableConcatWithMaybe(Flowable<T> source, MaybeSource<? extends T> othe
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new ConcatWithSubscriber<T>(s, other));
+        source.subscribe(new ConcatWithSubscriber<>(s, other));
     }
 
     static final class ConcatWithSubscriber<T>
@@ -59,7 +59,7 @@ static final class ConcatWithSubscriber<T>
         ConcatWithSubscriber(Subscriber<? super T> actual, MaybeSource<? extends T> other) {
             super(actual);
             this.other = other;
-            this.otherDisposable = new AtomicReference<Disposable>();
+            this.otherDisposable = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java
index b1b65d9dbf..c93ee51ba8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java
@@ -41,7 +41,7 @@ public FlowableConcatWithSingle(Flowable<T> source, SingleSource<? extends T> ot
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new ConcatWithSubscriber<T>(s, other));
+        source.subscribe(new ConcatWithSubscriber<>(s, other));
     }
 
     static final class ConcatWithSubscriber<T>
@@ -57,7 +57,7 @@ static final class ConcatWithSubscriber<T>
         ConcatWithSubscriber(Subscriber<? super T> actual, SingleSource<? extends T> other) {
             super(actual);
             this.other = other;
-            this.otherDisposable = new AtomicReference<Disposable>();
+            this.otherDisposable = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java
index 517d026e3f..928f36209c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java
@@ -36,7 +36,7 @@ protected void subscribeActual(SingleObserver<? super Long> observer) {
 
     @Override
     public Flowable<Long> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableCount<T>(source));
+        return RxJavaPlugins.onAssembly(new FlowableCount<>(source));
     }
 
     static final class CountSubscriber implements FlowableSubscriber<Object>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
index 66cbd7409b..b7091c31f9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
@@ -45,23 +45,23 @@ public void subscribeActual(Subscriber<? super T> t) {
 
         switch (backpressure) {
         case MISSING: {
-            emitter = new MissingEmitter<T>(t);
+            emitter = new MissingEmitter<>(t);
             break;
         }
         case ERROR: {
-            emitter = new ErrorAsyncEmitter<T>(t);
+            emitter = new ErrorAsyncEmitter<>(t);
             break;
         }
         case DROP: {
-            emitter = new DropAsyncEmitter<T>(t);
+            emitter = new DropAsyncEmitter<>(t);
             break;
         }
         case LATEST: {
-            emitter = new LatestAsyncEmitter<T>(t);
+            emitter = new LatestAsyncEmitter<>(t);
             break;
         }
         default: {
-            emitter = new BufferAsyncEmitter<T>(t, bufferSize());
+            emitter = new BufferAsyncEmitter<>(t, bufferSize());
             break;
         }
         }
@@ -97,7 +97,7 @@ static final class SerializedEmitter<T>
         SerializedEmitter(BaseEmitter<T> emitter) {
             this.emitter = emitter;
             this.errors = new AtomicThrowable();
-            this.queue = new SpscLinkedArrayQueue<T>(16);
+            this.queue = new SpscLinkedArrayQueue<>(16);
         }
 
         @Override
@@ -347,7 +347,7 @@ public final long requested() {
 
         @Override
         public final FlowableEmitter<T> serialize() {
-            return new SerializedEmitter<T>(this);
+            return new SerializedEmitter<>(this);
         }
 
         @Override
@@ -460,7 +460,7 @@ static final class BufferAsyncEmitter<T> extends BaseEmitter<T> {
 
         BufferAsyncEmitter(Subscriber<? super T> actual, int capacityHint) {
             super(actual);
-            this.queue = new SpscLinkedArrayQueue<T>(capacityHint);
+            this.queue = new SpscLinkedArrayQueue<>(capacityHint);
             this.wip = new AtomicInteger();
         }
 
@@ -598,7 +598,7 @@ static final class LatestAsyncEmitter<T> extends BaseEmitter<T> {
 
         LatestAsyncEmitter(Subscriber<? super T> downstream) {
             super(downstream);
-            this.queue = new AtomicReference<T>();
+            this.queue = new AtomicReference<>();
             this.wip = new AtomicInteger();
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
index ab86164622..16c666b283 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
@@ -38,7 +38,7 @@ public FlowableDebounce(Flowable<T> source, Function<? super T, ? extends Publis
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new DebounceSubscriber<T, U>(new SerializedSubscriber<T>(s), debounceSelector));
+        source.subscribe(new DebounceSubscriber<>(new SerializedSubscriber<>(s), debounceSelector));
     }
 
     static final class DebounceSubscriber<T, U> extends AtomicLong
@@ -50,7 +50,7 @@ static final class DebounceSubscriber<T, U> extends AtomicLong
 
         Subscription upstream;
 
-        final AtomicReference<Disposable> debouncer = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> debouncer = new AtomicReference<>();
 
         volatile long index;
 
@@ -96,7 +96,7 @@ public void onNext(T t) {
                 return;
             }
 
-            DebounceInnerSubscriber<T, U> dis = new DebounceInnerSubscriber<T, U>(this, idx, t);
+            DebounceInnerSubscriber<T, U> dis = new DebounceInnerSubscriber<>(this, idx, t);
 
             if (debouncer.compareAndSet(d, dis)) {
                 p.subscribe(dis);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
index 582c04c6e5..82ae29d497 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
@@ -42,8 +42,8 @@ public FlowableDebounceTimed(Flowable<T> source, long timeout, TimeUnit unit, Sc
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new DebounceTimedSubscriber<T>(
-                new SerializedSubscriber<T>(s),
+        source.subscribe(new DebounceTimedSubscriber<>(
+                new SerializedSubscriber<>(s),
                 timeout, unit, scheduler.createWorker()));
     }
 
@@ -93,7 +93,7 @@ public void onNext(T t) {
                 d.dispose();
             }
 
-            DebounceEmitter<T> de = new DebounceEmitter<T>(t, idx, this);
+            DebounceEmitter<T> de = new DebounceEmitter<>(t, idx, this);
             timer = de;
             d = worker.schedule(de, timeout, unit);
             de.setResource(d);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java
index 18950363e2..e66acd39e9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java
@@ -42,12 +42,12 @@ protected void subscribeActual(Subscriber<? super T> t) {
         if (delayError) {
             downstream = t;
         } else {
-            downstream = new SerializedSubscriber<T>(t);
+            downstream = new SerializedSubscriber<>(t);
         }
 
         Scheduler.Worker w = scheduler.createWorker();
 
-        source.subscribe(new DelaySubscriber<T>(downstream, delay, unit, w, delayError));
+        source.subscribe(new DelaySubscriber<>(downstream, delay, unit, w, delayError));
     }
 
     static final class DelaySubscriber<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java
index 1ae7f8210e..c4e199c7e2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java
@@ -37,7 +37,7 @@ public FlowableDelaySubscriptionOther(Publisher<? extends T> main, Publisher<U>
 
     @Override
     public void subscribeActual(final Subscriber<? super T> child) {
-        MainSubscriber<T> parent = new MainSubscriber<T>(child, main);
+        MainSubscriber<T> parent = new MainSubscriber<>(child, main);
         child.onSubscribe(parent);
         other.subscribe(parent.other);
     }
@@ -58,7 +58,7 @@ static final class MainSubscriber<T> extends AtomicLong implements FlowableSubsc
             this.downstream = downstream;
             this.main = main;
             this.other = new OtherSubscriber();
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
         }
 
         void next() {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java
index d5e46e6d23..dc2de8e389 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java
@@ -34,7 +34,7 @@ public FlowableDematerialize(Flowable<T> source, Function<? super T, ? extends N
 
     @Override
     protected void subscribeActual(Subscriber<? super R> subscriber) {
-        source.subscribe(new DematerializeSubscriber<T, R>(subscriber, selector));
+        source.subscribe(new DematerializeSubscriber<>(subscriber, selector));
     }
 
     static final class DematerializeSubscriber<T, R> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java
index e3f266094e..e03ee6094b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java
@@ -27,7 +27,7 @@ public FlowableDetach(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new DetachSubscriber<T>(s));
+        source.subscribe(new DetachSubscriber<>(s));
     }
 
     static final class DetachSubscriber<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
index 1cd4be2458..bc62429611 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
@@ -52,7 +52,7 @@ protected void subscribeActual(Subscriber<? super T> subscriber) {
             return;
         }
 
-        source.subscribe(new DistinctSubscriber<T, K>(subscriber, keySelector, collection));
+        source.subscribe(new DistinctSubscriber<>(subscriber, keySelector, collection));
     }
 
     static final class DistinctSubscriber<T, K> extends BasicFuseableSubscriber<T, T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java
index f3ee070429..6eb323625d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java
@@ -37,9 +37,9 @@ public FlowableDistinctUntilChanged(Flowable<T> source, Function<? super T, K> k
     protected void subscribeActual(Subscriber<? super T> s) {
         if (s instanceof ConditionalSubscriber) {
             ConditionalSubscriber<? super T> cs = (ConditionalSubscriber<? super T>) s;
-            source.subscribe(new DistinctUntilChangedConditionalSubscriber<T, K>(cs, keySelector, comparer));
+            source.subscribe(new DistinctUntilChangedConditionalSubscriber<>(cs, keySelector, comparer));
         } else {
-            source.subscribe(new DistinctUntilChangedSubscriber<T, K>(s, keySelector, comparer));
+            source.subscribe(new DistinctUntilChangedSubscriber<>(s, keySelector, comparer));
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java
index ed5d969328..7aa451e1f6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java
@@ -39,9 +39,9 @@ public FlowableDoAfterNext(Flowable<T> source, Consumer<? super T> onAfterNext)
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
         if (s instanceof ConditionalSubscriber) {
-            source.subscribe(new DoAfterConditionalSubscriber<T>((ConditionalSubscriber<? super T>)s, onAfterNext));
+            source.subscribe(new DoAfterConditionalSubscriber<>((ConditionalSubscriber<? super T>) s, onAfterNext));
         } else {
-            source.subscribe(new DoAfterSubscriber<T>(s, onAfterNext));
+            source.subscribe(new DoAfterSubscriber<>(s, onAfterNext));
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java
index 8cc70f171c..9373819291 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java
@@ -41,9 +41,9 @@ public FlowableDoFinally(Flowable<T> source, Action onFinally) {
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
         if (s instanceof ConditionalSubscriber) {
-            source.subscribe(new DoFinallyConditionalSubscriber<T>((ConditionalSubscriber<? super T>)s, onFinally));
+            source.subscribe(new DoFinallyConditionalSubscriber<>((ConditionalSubscriber<? super T>) s, onFinally));
         } else {
-            source.subscribe(new DoFinallySubscriber<T>(s, onFinally));
+            source.subscribe(new DoFinallySubscriber<>(s, onFinally));
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
index 74d74f41cf..2e6d45d5e7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
@@ -44,10 +44,10 @@ public FlowableDoOnEach(Flowable<T> source, Consumer<? super T> onNext,
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
         if (s instanceof ConditionalSubscriber) {
-            source.subscribe(new DoOnEachConditionalSubscriber<T>(
-                    (ConditionalSubscriber<? super T>)s, onNext, onError, onComplete, onAfterTerminate));
+            source.subscribe(new DoOnEachConditionalSubscriber<>(
+                    (ConditionalSubscriber<? super T>) s, onNext, onError, onComplete, onAfterTerminate));
         } else {
-            source.subscribe(new DoOnEachSubscriber<T>(
+            source.subscribe(new DoOnEachSubscriber<>(
                     s, onNext, onError, onComplete, onAfterTerminate));
         }
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java
index 687474a403..a75881d2ba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java
@@ -35,7 +35,7 @@ public FlowableDoOnLifecycle(Flowable<T> source, Consumer<? super Subscription>
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new SubscriptionLambdaSubscriber<T>(s, onSubscribe, onRequest, onCancel));
+        source.subscribe(new SubscriptionLambdaSubscriber<>(s, onSubscribe, onRequest, onCancel));
     }
 
     static final class SubscriptionLambdaSubscriber<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java
index 31c21e2552..91c9c0bee7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java
@@ -35,7 +35,7 @@ public FlowableElementAt(Flowable<T> source, long index, T defaultValue, boolean
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new ElementAtSubscriber<T>(s, index, defaultValue, errorOnFewer));
+        source.subscribe(new ElementAtSubscriber<>(s, index, defaultValue, errorOnFewer));
     }
 
     static final class ElementAtSubscriber<T> extends DeferredScalarSubscription<T> implements FlowableSubscriber<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java
index 67f4744b76..fc30483fd2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java
@@ -33,12 +33,12 @@ public FlowableElementAtMaybe(Flowable<T> source, long index) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new ElementAtSubscriber<T>(observer, index));
+        source.subscribe(new ElementAtSubscriber<>(observer, index));
     }
 
     @Override
     public Flowable<T> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableElementAt<T>(source, index, null, false));
+        return RxJavaPlugins.onAssembly(new FlowableElementAt<>(source, index, null, false));
     }
 
     static final class ElementAtSubscriber<T> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java
index 3260307745..b743b6a3b7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java
@@ -38,12 +38,12 @@ public FlowableElementAtSingle(Flowable<T> source, long index, T defaultValue) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new ElementAtSubscriber<T>(observer, index, defaultValue));
+        source.subscribe(new ElementAtSubscriber<>(observer, index, defaultValue));
     }
 
     @Override
     public Flowable<T> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableElementAt<T>(source, index, defaultValue, true));
+        return RxJavaPlugins.onAssembly(new FlowableElementAt<>(source, index, defaultValue, true));
     }
 
     static final class ElementAtSubscriber<T> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java
index 52aac8e1f4..790881a160 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java
@@ -31,10 +31,10 @@ public FlowableFilter(Flowable<T> source, Predicate<? super T> predicate) {
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
         if (s instanceof ConditionalSubscriber) {
-            source.subscribe(new FilterConditionalSubscriber<T>(
-                    (ConditionalSubscriber<? super T>)s, predicate));
+            source.subscribe(new FilterConditionalSubscriber<>(
+                    (ConditionalSubscriber<? super T>) s, predicate));
         } else {
-            source.subscribe(new FilterSubscriber<T>(s, predicate));
+            source.subscribe(new FilterSubscriber<>(s, predicate));
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
index 1c14ea54af..ea6a4f76ed 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
@@ -55,7 +55,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
     public static <T, U> FlowableSubscriber<T> subscribe(Subscriber<? super U> s,
             Function<? super T, ? extends Publisher<? extends U>> mapper,
             boolean delayErrors, int maxConcurrency, int bufferSize) {
-        return new MergeSubscriber<T, U>(s, mapper, delayErrors, maxConcurrency, bufferSize);
+        return new MergeSubscriber<>(s, mapper, delayErrors, maxConcurrency, bufferSize);
     }
 
     static final class MergeSubscriber<T, U> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
@@ -76,7 +76,7 @@ static final class MergeSubscriber<T, U> extends AtomicInteger implements Flowab
 
         volatile boolean cancelled;
 
-        final AtomicReference<InnerSubscriber<?, ?>[]> subscribers = new AtomicReference<InnerSubscriber<?, ?>[]>();
+        final AtomicReference<InnerSubscriber<?, ?>[]> subscribers = new AtomicReference<>();
 
         static final InnerSubscriber<?, ?>[] EMPTY = new InnerSubscriber<?, ?>[0];
 
@@ -157,7 +157,7 @@ public void onNext(T t) {
                     }
                 }
             } else {
-                InnerSubscriber<T, U> inner = new InnerSubscriber<T, U>(this, uniqueId++);
+                InnerSubscriber<T, U> inner = new InnerSubscriber<>(this, uniqueId++);
                 if (addInner(inner)) {
                     p.subscribe(inner);
                 }
@@ -216,9 +216,9 @@ SimpleQueue<U> getMainQueue() {
             SimplePlainQueue<U> q = queue;
             if (q == null) {
                 if (maxConcurrency == Integer.MAX_VALUE) {
-                    q = new SpscLinkedArrayQueue<U>(bufferSize);
+                    q = new SpscLinkedArrayQueue<>(bufferSize);
                 } else {
-                    q = new SpscArrayQueue<U>(maxConcurrency);
+                    q = new SpscArrayQueue<>(maxConcurrency);
                 }
                 queue = q;
             }
@@ -267,7 +267,7 @@ void tryEmitScalar(U value) {
         SimpleQueue<U> getInnerQueue(InnerSubscriber<T, U> inner) {
             SimpleQueue<U> q = inner.queue;
             if (q == null) {
-                q = new SpscArrayQueue<U>(bufferSize);
+                q = new SpscArrayQueue<>(bufferSize);
                 inner.queue = q;
             }
             return q;
@@ -298,7 +298,7 @@ void tryEmit(U value, InnerSubscriber<T, U> inner) {
             } else {
                 SimpleQueue<U> q = inner.queue;
                 if (q == null) {
-                    q = new SpscArrayQueue<U>(bufferSize);
+                    q = new SpscArrayQueue<>(bufferSize);
                     inner.queue = q;
                 }
                 if (!q.offer(value)) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
index 5c544add23..945e6a877e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
@@ -50,7 +50,7 @@ public FlowableFlatMapCompletable(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super T> subscriber) {
-        source.subscribe(new FlatMapCompletableMainSubscriber<T>(subscriber, mapper, delayErrors, maxConcurrency));
+        source.subscribe(new FlatMapCompletableMainSubscriber<>(subscriber, mapper, delayErrors, maxConcurrency));
     }
 
     static final class FlatMapCompletableMainSubscriber<T> extends BasicIntQueueSubscription<T>
@@ -171,7 +171,7 @@ public void request(long n) {
 
         @Nullable
         @Override
-        public T poll() throws Exception {
+        public T poll() {
             return null; // always empty
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
index 94f0fa8653..00445c8018 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
@@ -53,12 +53,12 @@ public FlowableFlatMapCompletableCompletable(Flowable<T> source,
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        source.subscribe(new FlatMapCompletableMainSubscriber<T>(observer, mapper, delayErrors, maxConcurrency));
+        source.subscribe(new FlatMapCompletableMainSubscriber<>(observer, mapper, delayErrors, maxConcurrency));
     }
 
     @Override
     public Flowable<T> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableFlatMapCompletable<T>(source, mapper, delayErrors, maxConcurrency));
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapCompletable<>(source, mapper, delayErrors, maxConcurrency));
     }
 
     static final class FlatMapCompletableMainSubscriber<T> extends AtomicInteger
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
index 18c2e21f63..1036e73973 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
@@ -50,7 +50,7 @@ public FlowableFlatMapMaybe(Flowable<T> source, Function<? super T, ? extends Ma
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new FlatMapMaybeSubscriber<T, R>(s, mapper, delayErrors, maxConcurrency));
+        source.subscribe(new FlatMapMaybeSubscriber<>(s, mapper, delayErrors, maxConcurrency));
     }
 
     static final class FlatMapMaybeSubscriber<T, R>
@@ -91,7 +91,7 @@ static final class FlatMapMaybeSubscriber<T, R>
             this.set = new CompositeDisposable();
             this.errors = new AtomicThrowable();
             this.active = new AtomicInteger(1);
-            this.queue = new AtomicReference<SpscLinkedArrayQueue<R>>();
+            this.queue = new AtomicReference<>();
         }
 
         @Override
@@ -210,7 +210,7 @@ SpscLinkedArrayQueue<R> getOrCreateQueue() {
                 if (current != null) {
                     return current;
                 }
-                current = new SpscLinkedArrayQueue<R>(Flowable.bufferSize());
+                current = new SpscLinkedArrayQueue<>(Flowable.bufferSize());
                 if (queue.compareAndSet(null, current)) {
                     return current;
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
index 366b48be09..d0c9002669 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
@@ -50,7 +50,7 @@ public FlowableFlatMapSingle(Flowable<T> source, Function<? super T, ? extends S
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new FlatMapSingleSubscriber<T, R>(s, mapper, delayErrors, maxConcurrency));
+        source.subscribe(new FlatMapSingleSubscriber<>(s, mapper, delayErrors, maxConcurrency));
     }
 
     static final class FlatMapSingleSubscriber<T, R>
@@ -91,7 +91,7 @@ static final class FlatMapSingleSubscriber<T, R>
             this.set = new CompositeDisposable();
             this.errors = new AtomicThrowable();
             this.active = new AtomicInteger(1);
-            this.queue = new AtomicReference<SpscLinkedArrayQueue<R>>();
+            this.queue = new AtomicReference<>();
         }
 
         @Override
@@ -210,7 +210,7 @@ SpscLinkedArrayQueue<R> getOrCreateQueue() {
                 if (current != null) {
                     return current;
                 }
-                current = new SpscLinkedArrayQueue<R>(Flowable.bufferSize());
+                current = new SpscLinkedArrayQueue<>(Flowable.bufferSize());
                 if (queue.compareAndSet(null, current)) {
                     return current;
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
index b275337841..06f0b650e6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
@@ -76,7 +76,7 @@ public void subscribeActual(Subscriber<? super R> s) {
 
             return;
         }
-        source.subscribe(new FlattenIterableSubscriber<T, R>(s, mapper, prefetch));
+        source.subscribe(new FlattenIterableSubscriber<>(s, mapper, prefetch));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
index 83371ab447..9b9a4c66f4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
@@ -33,10 +33,10 @@ public FlowableFromArray(T[] array) {
     @Override
     public void subscribeActual(Subscriber<? super T> s) {
         if (s instanceof ConditionalSubscriber) {
-            s.onSubscribe(new ArrayConditionalSubscription<T>(
+            s.onSubscribe(new ArrayConditionalSubscription<>(
                     (ConditionalSubscriber<? super T>)s, array));
         } else {
-            s.onSubscribe(new ArraySubscription<T>(s, array));
+            s.onSubscribe(new ArraySubscription<>(s, array));
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java
index 80afc65910..603f09abae 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java
@@ -32,7 +32,7 @@ public FlowableFromCallable(Callable<? extends T> callable) {
 
     @Override
     public void subscribeActual(Subscriber<? super T> s) {
-        DeferredScalarSubscription<T> deferred = new DeferredScalarSubscription<T>(s);
+        DeferredScalarSubscription<T> deferred = new DeferredScalarSubscription<>(s);
         s.onSubscribe(deferred);
 
         T t;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java
index 8356c92915..57dc02774f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java
@@ -35,7 +35,7 @@ public FlowableFromFuture(Future<? extends T> future, long timeout, TimeUnit uni
 
     @Override
     public void subscribeActual(Subscriber<? super T> s) {
-        DeferredScalarSubscription<T> deferred = new DeferredScalarSubscription<T>(s);
+        DeferredScalarSubscription<T> deferred = new DeferredScalarSubscription<>(s);
         s.onSubscribe(deferred);
 
         T v;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java
index e88fd35c73..105c6b6ee2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java
@@ -26,7 +26,7 @@ public FlowableFromObservable(Observable<T> upstream) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        upstream.subscribe(new SubscriberObserver<T>(s));
+        upstream.subscribe(new SubscriberObserver<>(s));
     }
 
     static final class SubscriberObserver<T> implements Observer<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java
index 7be86d618b..84fbae7eec 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java
@@ -38,7 +38,7 @@ public FlowableFromSupplier(Supplier<? extends T> supplier) {
 
     @Override
     public void subscribeActual(Subscriber<? super T> s) {
-        DeferredScalarSubscription<T> deferred = new DeferredScalarSubscription<T>(s);
+        DeferredScalarSubscription<T> deferred = new DeferredScalarSubscription<>(s);
         s.onSubscribe(deferred);
 
         T t;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java
index 893ec19ff9..2feda7ad97 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java
@@ -48,7 +48,7 @@ public void subscribeActual(Subscriber<? super T> s) {
             return;
         }
 
-        s.onSubscribe(new GeneratorSubscription<T, S>(s, generator, disposeState, state));
+        s.onSubscribe(new GeneratorSubscription<>(s, generator, disposeState, state));
     }
 
     static final class GeneratorSubscription<T, S>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
index 85c7d08289..3cb84d4d6b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
@@ -56,10 +56,10 @@ protected void subscribeActual(Subscriber<? super GroupedFlowable<K, V>> s) {
         try {
             if (mapFactory == null) {
                 evictedGroups = null;
-                groups = new ConcurrentHashMap<Object, GroupedUnicast<K, V>>();
+                groups = new ConcurrentHashMap<>();
             } else {
-                evictedGroups = new ConcurrentLinkedQueue<GroupedUnicast<K, V>>();
-                Consumer<Object> evictionAction = (Consumer) new EvictionAction<K, V>(evictedGroups);
+                evictedGroups = new ConcurrentLinkedQueue<>();
+                Consumer<Object> evictionAction = (Consumer) new EvictionAction<>(evictedGroups);
                 groups = (Map) mapFactory.apply(evictionAction);
             }
         } catch (Throwable e) {
@@ -69,7 +69,7 @@ protected void subscribeActual(Subscriber<? super GroupedFlowable<K, V>> s) {
             return;
         }
         GroupBySubscriber<T, K, V> subscriber =
-                new GroupBySubscriber<T, K, V>(s, keySelector, valueSelector, bufferSize, delayError, groups, evictedGroups);
+                new GroupBySubscriber<>(s, keySelector, valueSelector, bufferSize, delayError, groups, evictedGroups);
         source.subscribe(subscriber);
     }
 
@@ -327,8 +327,8 @@ static final class GroupedUnicast<K, T> extends GroupedFlowable<K, T> {
         final State<T, K> state;
 
         public static <T, K> GroupedUnicast<K, T> createWith(K key, int bufferSize, GroupBySubscriber<?, K, T> parent, boolean delayError) {
-            State<T, K> state = new State<T, K>(bufferSize, parent, key, delayError);
-            return new GroupedUnicast<K, T>(key, state);
+            State<T, K> state = new State<>(bufferSize, parent, key, delayError);
+            return new GroupedUnicast<>(key, state);
         }
 
         protected GroupedUnicast(K key, State<T, K> state) {
@@ -370,7 +370,7 @@ static final class State<T, K> extends BasicIntQueueSubscription<T> implements P
 
         final AtomicBoolean cancelled = new AtomicBoolean();
 
-        final AtomicReference<Subscriber<? super T>> actual = new AtomicReference<Subscriber<? super T>>();
+        final AtomicReference<Subscriber<? super T>> actual = new AtomicReference<>();
 
         boolean outputFused;
         int produced;
@@ -383,7 +383,7 @@ static final class State<T, K> extends BasicIntQueueSubscription<T> implements P
         static final int ABANDONED_HAS_SUBSCRIBER = ABANDONED | HAS_SUBSCRIBER;
 
         State(int bufferSize, GroupBySubscriber<?, K, T> parent, K key, boolean delayError) {
-            this.queue = new SpscLinkedArrayQueue<T>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
             this.parent = parent;
             this.key = key;
             this.delayError = delayError;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
index ccd80c53d9..a950de7a96 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
@@ -59,7 +59,7 @@ public FlowableGroupJoin(
     protected void subscribeActual(Subscriber<? super R> s) {
 
         GroupJoinSubscription<TLeft, TRight, TLeftEnd, TRightEnd, R> parent =
-                new GroupJoinSubscription<TLeft, TRight, TLeftEnd, TRightEnd, R>(s, leftEnd, rightEnd, resultSelector);
+                new GroupJoinSubscription<>(s, leftEnd, rightEnd, resultSelector);
 
         s.onSubscribe(parent);
 
@@ -132,10 +132,10 @@ static final class GroupJoinSubscription<TLeft, TRight, TLeftEnd, TRightEnd, R>
             this.downstream = actual;
             this.requested = new AtomicLong();
             this.disposables = new CompositeDisposable();
-            this.queue = new SpscLinkedArrayQueue<Object>(bufferSize());
-            this.lefts = new LinkedHashMap<Integer, UnicastProcessor<TRight>>();
-            this.rights = new LinkedHashMap<Integer, TRight>();
-            this.error = new AtomicReference<Throwable>();
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize());
+            this.lefts = new LinkedHashMap<>();
+            this.rights = new LinkedHashMap<>();
+            this.error = new AtomicReference<>();
             this.leftEnd = leftEnd;
             this.rightEnd = rightEnd;
             this.resultSelector = resultSelector;
@@ -239,7 +239,7 @@ void drain() {
                         @SuppressWarnings("unchecked")
                         TLeft left = (TLeft)val;
 
-                        UnicastProcessor<TRight> up = UnicastProcessor.<TRight>create();
+                        UnicastProcessor<TRight> up = UnicastProcessor.create();
                         int idx = leftIndex++;
                         lefts.put(idx, up);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java
index 512269f58f..17d84f178a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java
@@ -32,7 +32,7 @@ public FlowableHide(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new HideSubscriber<T>(s));
+        source.subscribe(new HideSubscriber<>(s));
     }
 
     static final class HideSubscriber<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java
index c30935c569..9afee2e50d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java
@@ -28,7 +28,7 @@ public FlowableIgnoreElements(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(final Subscriber<? super T> t) {
-        source.subscribe(new IgnoreElementsSubscriber<T>(t));
+        source.subscribe(new IgnoreElementsSubscriber<>(t));
     }
 
     static final class IgnoreElementsSubscriber<T> implements FlowableSubscriber<T>, QueueSubscription<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java
index e68e5dd784..4eaced342e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java
@@ -31,12 +31,12 @@ public FlowableIgnoreElementsCompletable(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(final CompletableObserver t) {
-        source.subscribe(new IgnoreElementsSubscriber<T>(t));
+        source.subscribe(new IgnoreElementsSubscriber<>(t));
     }
 
     @Override
     public Flowable<T> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableIgnoreElements<T>(source));
+        return RxJavaPlugins.onAssembly(new FlowableIgnoreElements<>(source));
     }
 
     static final class IgnoreElementsSubscriber<T> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java
index f8f97191fd..41dc08d920 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java
@@ -47,7 +47,7 @@ public S apply(S t1, Emitter<T> t2) throws Throwable {
     }
 
     public static <T, S> BiFunction<S, Emitter<T>, S> simpleGenerator(Consumer<Emitter<T>> consumer) {
-        return new SimpleGenerator<T, S>(consumer);
+        return new SimpleGenerator<>(consumer);
     }
 
     static final class SimpleBiGenerator<T, S> implements BiFunction<S, Emitter<T>, S> {
@@ -65,7 +65,7 @@ public S apply(S t1, Emitter<T> t2) throws Throwable {
     }
 
     public static <T, S> BiFunction<S, Emitter<T>, S> simpleBiGenerator(BiConsumer<S, Emitter<T>> consumer) {
-        return new SimpleBiGenerator<T, S>(consumer);
+        return new SimpleBiGenerator<>(consumer);
     }
 
     static final class ItemDelayFunction<T, U> implements Function<T, Publisher<T>> {
@@ -78,12 +78,12 @@ static final class ItemDelayFunction<T, U> implements Function<T, Publisher<T>>
         @Override
         public Publisher<T> apply(final T v) throws Throwable {
             Publisher<U> p = Objects.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null Publisher");
-            return new FlowableTakePublisher<U>(p, 1).map(Functions.justFunction(v)).defaultIfEmpty(v);
+            return new FlowableTakePublisher<>(p, 1).map(Functions.justFunction(v)).defaultIfEmpty(v);
         }
     }
 
     public static <T, U> Function<T, Publisher<T>> itemDelay(final Function<? super T, ? extends Publisher<U>> itemDelay) {
-        return new ItemDelayFunction<T, U>(itemDelay);
+        return new ItemDelayFunction<>(itemDelay);
     }
 
     static final class SubscriberOnNext<T> implements Consumer<T> {
@@ -94,7 +94,7 @@ static final class SubscriberOnNext<T> implements Consumer<T> {
         }
 
         @Override
-        public void accept(T v) throws Exception {
+        public void accept(T v) {
             subscriber.onNext(v);
         }
     }
@@ -107,7 +107,7 @@ static final class SubscriberOnError<T> implements Consumer<Throwable> {
         }
 
         @Override
-        public void accept(Throwable v) throws Exception {
+        public void accept(Throwable v) {
             subscriber.onError(v);
         }
     }
@@ -120,21 +120,21 @@ static final class SubscriberOnComplete<T> implements Action {
         }
 
         @Override
-        public void run() throws Exception {
+        public void run() {
             subscriber.onComplete();
         }
     }
 
     public static <T> Consumer<T> subscriberOnNext(Subscriber<T> subscriber) {
-        return new SubscriberOnNext<T>(subscriber);
+        return new SubscriberOnNext<>(subscriber);
     }
 
     public static <T> Consumer<Throwable> subscriberOnError(Subscriber<T> subscriber) {
-        return new SubscriberOnError<T>(subscriber);
+        return new SubscriberOnError<>(subscriber);
     }
 
     public static <T> Action subscriberOnComplete(Subscriber<T> subscriber) {
-        return new SubscriberOnComplete<T>(subscriber);
+        return new SubscriberOnComplete<>(subscriber);
     }
 
     static final class FlatMapWithCombinerInner<U, R, T> implements Function<U, R> {
@@ -166,14 +166,14 @@ static final class FlatMapWithCombinerOuter<T, R, U> implements Function<T, Publ
         public Publisher<R> apply(final T t) throws Throwable {
             @SuppressWarnings("unchecked")
             Publisher<U> u = (Publisher<U>)Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Publisher");
-            return new FlowableMapPublisher<U, R>(u, new FlatMapWithCombinerInner<U, R, T>(combiner, t));
+            return new FlowableMapPublisher<>(u, new FlatMapWithCombinerInner<U, R, T>(combiner, t));
         }
     }
 
     public static <T, U, R> Function<T, Publisher<R>> flatMapWithCombiner(
             final Function<? super T, ? extends Publisher<? extends U>> mapper,
                     final BiFunction<? super T, ? super U, ? extends R> combiner) {
-        return new FlatMapWithCombinerOuter<T, R, U>(combiner, mapper);
+        return new FlatMapWithCombinerOuter<>(combiner, mapper);
     }
 
     static final class FlatMapIntoIterable<T, U> implements Function<T, Publisher<U>> {
@@ -185,34 +185,34 @@ static final class FlatMapIntoIterable<T, U> implements Function<T, Publisher<U>
 
         @Override
         public Publisher<U> apply(T t) throws Throwable {
-            return new FlowableFromIterable<U>(Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable"));
+            return new FlowableFromIterable<>(Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable"));
         }
     }
 
     public static <T, U> Function<T, Publisher<U>> flatMapIntoIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
-        return new FlatMapIntoIterable<T, U>(mapper);
+        return new FlatMapIntoIterable<>(mapper);
     }
 
     public static <T> Supplier<ConnectableFlowable<T>> replaySupplier(final Flowable<T> parent) {
-        return new ReplaySupplier<T>(parent);
+        return new ReplaySupplier<>(parent);
     }
 
     public static <T> Supplier<ConnectableFlowable<T>> replaySupplier(final Flowable<T> parent, final int bufferSize, boolean eagerTruncate) {
-        return new BufferedReplaySupplier<T>(parent, bufferSize, eagerTruncate);
+        return new BufferedReplaySupplier<>(parent, bufferSize, eagerTruncate);
     }
 
     public static <T> Supplier<ConnectableFlowable<T>> replaySupplier(final Flowable<T> parent, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        return new BufferedTimedReplay<T>(parent, bufferSize, time, unit, scheduler, eagerTruncate);
+        return new BufferedTimedReplay<>(parent, bufferSize, time, unit, scheduler, eagerTruncate);
     }
 
     public static <T> Supplier<ConnectableFlowable<T>> replaySupplier(final Flowable<T> parent, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        return new TimedReplay<T>(parent, time, unit, scheduler, eagerTruncate);
+        return new TimedReplay<>(parent, time, unit, scheduler, eagerTruncate);
     }
 
     public enum RequestMax implements Consumer<Subscription> {
         INSTANCE;
         @Override
-        public void accept(Subscription t) throws Exception {
+        public void accept(Subscription t) {
             t.request(Long.MAX_VALUE);
         }
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java
index 44e735be37..9ef04ea11c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java
@@ -66,7 +66,7 @@ static final class IntervalSubscriber extends AtomicLong
 
         long count;
 
-        final AtomicReference<Disposable> resource = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> resource = new AtomicReference<>();
 
         IntervalSubscriber(Subscriber<? super Long> downstream) {
             this.downstream = downstream;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java
index 83ff94ecaa..e9580f40c6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java
@@ -71,7 +71,7 @@ static final class IntervalRangeSubscriber extends AtomicLong
 
         long count;
 
-        final AtomicReference<Disposable> resource = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> resource = new AtomicReference<>();
 
         IntervalRangeSubscriber(Subscriber<? super Long> actual, long start, long end) {
             this.downstream = actual;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
index df8eff7049..01cf71023f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
@@ -56,7 +56,7 @@ public FlowableJoin(
     protected void subscribeActual(Subscriber<? super R> s) {
 
         JoinSubscription<TLeft, TRight, TLeftEnd, TRightEnd, R> parent =
-                new JoinSubscription<TLeft, TRight, TLeftEnd, TRightEnd, R>(s, leftEnd, rightEnd, resultSelector);
+                new JoinSubscription<>(s, leftEnd, rightEnd, resultSelector);
 
         s.onSubscribe(parent);
 
@@ -116,10 +116,10 @@ static final class JoinSubscription<TLeft, TRight, TLeftEnd, TRightEnd, R>
             this.downstream = actual;
             this.requested = new AtomicLong();
             this.disposables = new CompositeDisposable();
-            this.queue = new SpscLinkedArrayQueue<Object>(bufferSize());
-            this.lefts = new LinkedHashMap<Integer, TLeft>();
-            this.rights = new LinkedHashMap<Integer, TRight>();
-            this.error = new AtomicReference<Throwable>();
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize());
+            this.lefts = new LinkedHashMap<>();
+            this.rights = new LinkedHashMap<>();
+            this.error = new AtomicReference<>();
             this.leftEnd = leftEnd;
             this.rightEnd = rightEnd;
             this.resultSelector = resultSelector;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java
index d498befefc..d17c9644fa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java
@@ -31,7 +31,7 @@ public FlowableJust(final T value) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        s.onSubscribe(new ScalarSubscription<T>(s, value));
+        s.onSubscribe(new ScalarSubscription<>(s, value));
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java
index 1c6a46f71c..936e68c211 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java
@@ -36,7 +36,7 @@ public FlowableLastMaybe(Publisher<T> source) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new LastSubscriber<T>(observer));
+        source.subscribe(new LastSubscriber<>(observer));
     }
 
     static final class LastSubscriber<T> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java
index 7694067609..70346f3555 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java
@@ -42,7 +42,7 @@ public FlowableLastSingle(Publisher<T> source, T defaultItem) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new LastSubscriber<T>(observer, defaultItem));
+        source.subscribe(new LastSubscriber<>(observer, defaultItem));
     }
 
     static final class LastSubscriber<T> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java
index cdfb0b0bb5..b01d6dc5a0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java
@@ -41,7 +41,7 @@ public FlowableMapNotification(
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new MapNotificationSubscriber<T, R>(s, onNextMapper, onErrorMapper, onCompleteSupplier));
+        source.subscribe(new MapNotificationSubscriber<>(s, onNextMapper, onErrorMapper, onCompleteSupplier));
     }
 
     static final class MapNotificationSubscriber<T, R>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java
index e3e23c18e5..2b361427b1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java
@@ -27,7 +27,7 @@ public FlowableMaterialize(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(Subscriber<? super Notification<T>> s) {
-        source.subscribe(new MaterializeSubscriber<T>(s));
+        source.subscribe(new MaterializeSubscriber<>(s));
     }
 
     static final class MaterializeSubscriber<T> extends SinglePostCompleteSubscriber<T, Notification<T>> {
@@ -46,12 +46,12 @@ public void onNext(T t) {
 
         @Override
         public void onError(Throwable t) {
-            complete(Notification.<T>createOnError(t));
+            complete(Notification.createOnError(t));
         }
 
         @Override
         public void onComplete() {
-            complete(Notification.<T>createOnComplete());
+            complete(Notification.createOnComplete());
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java
index efb978083c..a0725a1d64 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java
@@ -41,7 +41,7 @@ public FlowableMergeWithCompletable(Flowable<T> source, CompletableSource other)
 
     @Override
     protected void subscribeActual(Subscriber<? super T> subscriber) {
-        MergeWithSubscriber<T> parent = new MergeWithSubscriber<T>(subscriber);
+        MergeWithSubscriber<T> parent = new MergeWithSubscriber<>(subscriber);
         subscriber.onSubscribe(parent);
         source.subscribe(parent);
         other.subscribe(parent.otherObserver);
@@ -68,7 +68,7 @@ static final class MergeWithSubscriber<T> extends AtomicInteger
 
         MergeWithSubscriber(Subscriber<? super T> downstream) {
             this.downstream = downstream;
-            this.mainSubscription = new AtomicReference<Subscription>();
+            this.mainSubscription = new AtomicReference<>();
             this.otherObserver = new OtherObserver(this);
             this.errors = new AtomicThrowable();
             this.requested = new AtomicLong();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java
index 4ad7f92d07..7d3be91bea 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java
@@ -43,7 +43,7 @@ public FlowableMergeWithMaybe(Flowable<T> source, MaybeSource<? extends T> other
 
     @Override
     protected void subscribeActual(Subscriber<? super T> subscriber) {
-        MergeWithObserver<T> parent = new MergeWithObserver<T>(subscriber);
+        MergeWithObserver<T> parent = new MergeWithObserver<>(subscriber);
         subscriber.onSubscribe(parent);
         source.subscribe(parent);
         other.subscribe(parent.otherObserver);
@@ -88,8 +88,8 @@ static final class MergeWithObserver<T> extends AtomicInteger
 
         MergeWithObserver(Subscriber<? super T> downstream) {
             this.downstream = downstream;
-            this.mainSubscription = new AtomicReference<Subscription>();
-            this.otherObserver = new OtherObserver<T>(this);
+            this.mainSubscription = new AtomicReference<>();
+            this.otherObserver = new OtherObserver<>(this);
             this.errors = new AtomicThrowable();
             this.requested = new AtomicLong();
             this.prefetch = bufferSize();
@@ -211,7 +211,7 @@ void otherComplete() {
         SimplePlainQueue<T> getOrCreateQueue() {
             SimplePlainQueue<T> q = queue;
             if (q == null) {
-                q = new SpscArrayQueue<T>(bufferSize());
+                q = new SpscArrayQueue<>(bufferSize());
                 queue = q;
             }
             return q;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java
index 33fe6b8454..997ad3fa2e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java
@@ -43,7 +43,7 @@ public FlowableMergeWithSingle(Flowable<T> source, SingleSource<? extends T> oth
 
     @Override
     protected void subscribeActual(Subscriber<? super T> subscriber) {
-        MergeWithObserver<T> parent = new MergeWithObserver<T>(subscriber);
+        MergeWithObserver<T> parent = new MergeWithObserver<>(subscriber);
         subscriber.onSubscribe(parent);
         source.subscribe(parent);
         other.subscribe(parent.otherObserver);
@@ -88,8 +88,8 @@ static final class MergeWithObserver<T> extends AtomicInteger
 
         MergeWithObserver(Subscriber<? super T> downstream) {
             this.downstream = downstream;
-            this.mainSubscription = new AtomicReference<Subscription>();
-            this.otherObserver = new OtherObserver<T>(this);
+            this.mainSubscription = new AtomicReference<>();
+            this.otherObserver = new OtherObserver<>(this);
             this.errors = new AtomicThrowable();
             this.requested = new AtomicLong();
             this.prefetch = bufferSize();
@@ -206,7 +206,7 @@ void otherError(Throwable ex) {
         SimplePlainQueue<T> getOrCreateQueue() {
             SimplePlainQueue<T> q = queue;
             if (q == null) {
-                q = new SpscArrayQueue<T>(bufferSize());
+                q = new SpscArrayQueue<>(bufferSize());
                 queue = q;
             }
             return q;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
index 66605c9520..3a4f237e5b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
@@ -50,10 +50,10 @@ public void subscribeActual(Subscriber<? super T> s) {
         Worker worker = scheduler.createWorker();
 
         if (s instanceof ConditionalSubscriber) {
-            source.subscribe(new ObserveOnConditionalSubscriber<T>(
+            source.subscribe(new ObserveOnConditionalSubscriber<>(
                     (ConditionalSubscriber<? super T>) s, worker, delayError, prefetch));
         } else {
-            source.subscribe(new ObserveOnSubscriber<T>(s, worker, delayError, prefetch));
+            source.subscribe(new ObserveOnSubscriber<>(s, worker, delayError, prefetch));
         }
     }
 
@@ -289,7 +289,7 @@ public void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<T>(prefetch);
+                queue = new SpscArrayQueue<>(prefetch);
 
                 downstream.onSubscribe(this);
 
@@ -533,7 +533,7 @@ public void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<T>(prefetch);
+                queue = new SpscArrayQueue<>(prefetch);
 
                 downstream.onSubscribe(this);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
index df04ac54db..19d28291ba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
@@ -43,7 +43,7 @@ public FlowableOnBackpressureBuffer(Flowable<T> source, int bufferSize, boolean
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new BackpressureBufferSubscriber<T>(s, bufferSize, unbounded, delayError, onOverflow));
+        source.subscribe(new BackpressureBufferSubscriber<>(s, bufferSize, unbounded, delayError, onOverflow));
     }
 
     static final class BackpressureBufferSubscriber<T> extends BasicIntQueueSubscription<T> implements FlowableSubscriber<T> {
@@ -75,9 +75,9 @@ static final class BackpressureBufferSubscriber<T> extends BasicIntQueueSubscrip
             SimplePlainQueue<T> q;
 
             if (unbounded) {
-                q = new SpscLinkedArrayQueue<T>(bufferSize);
+                q = new SpscLinkedArrayQueue<>(bufferSize);
             } else {
-                q = new SpscArrayQueue<T>(bufferSize);
+                q = new SpscArrayQueue<>(bufferSize);
             }
 
             this.queue = q;
@@ -255,7 +255,7 @@ public int requestFusion(int mode) {
 
         @Nullable
         @Override
-        public T poll() throws Exception {
+        public T poll() {
             return queue.poll();
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
index 70b65ab39a..6e458356b6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
@@ -48,7 +48,7 @@ public FlowableOnBackpressureBufferStrategy(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new OnBackpressureBufferStrategySubscriber<T>(s, onOverflow, strategy, bufferSize));
+        source.subscribe(new OnBackpressureBufferStrategySubscriber<>(s, onOverflow, strategy, bufferSize));
     }
 
     static final class OnBackpressureBufferStrategySubscriber<T>
@@ -83,7 +83,7 @@ static final class OnBackpressureBufferStrategySubscriber<T>
             this.strategy = strategy;
             this.bufferSize = bufferSize;
             this.requested = new AtomicLong();
-            this.deque = new ArrayDeque<T>();
+            this.deque = new ArrayDeque<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java
index 8f3f2d4946..0db3cd3cc2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java
@@ -45,7 +45,7 @@ public void accept(T t) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        this.source.subscribe(new BackpressureDropSubscriber<T>(s, onDrop));
+        this.source.subscribe(new BackpressureDropSubscriber<>(s, onDrop));
     }
 
     static final class BackpressureDropSubscriber<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
index 10304a4b84..b85e1281fb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
@@ -31,7 +31,7 @@ public FlowableOnBackpressureError(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        this.source.subscribe(new BackpressureErrorSubscriber<T>(s));
+        this.source.subscribe(new BackpressureErrorSubscriber<>(s));
     }
 
     static final class BackpressureErrorSubscriber<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
index b7ba9116a2..6123475ef0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
@@ -29,7 +29,7 @@ public FlowableOnBackpressureLatest(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new BackpressureLatestSubscriber<T>(s));
+        source.subscribe(new BackpressureLatestSubscriber<>(s));
     }
 
     static final class BackpressureLatestSubscriber<T> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
@@ -47,7 +47,7 @@ static final class BackpressureLatestSubscriber<T> extends AtomicInteger impleme
 
         final AtomicLong requested = new AtomicLong();
 
-        final AtomicReference<T> current = new AtomicReference<T>();
+        final AtomicReference<T> current = new AtomicReference<>();
 
         BackpressureLatestSubscriber(Subscriber<? super T> downstream) {
             this.downstream = downstream;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java
index 1d939022b4..7c9de4a748 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java
@@ -34,7 +34,7 @@ public FlowableOnErrorNext(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        OnErrorNextSubscriber<T> parent = new OnErrorNextSubscriber<T>(s, nextSupplier);
+        OnErrorNextSubscriber<T> parent = new OnErrorNextSubscriber<>(s, nextSupplier);
         s.onSubscribe(parent);
         source.subscribe(parent);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java
index 4a908cc113..4fe88985a4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java
@@ -31,7 +31,7 @@ public FlowableOnErrorReturn(Flowable<T> source, Function<? super Throwable, ? e
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new OnErrorReturnSubscriber<T>(s, valueSupplier));
+        source.subscribe(new OnErrorReturnSubscriber<>(s, valueSupplier));
     }
 
     static final class OnErrorReturnSubscriber<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
index 452dc83cce..49e75fc1fd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
@@ -34,7 +34,7 @@
  * completes or the connection is disposed.
  * <p>
  * The difference to FlowablePublish is that when the upstream terminates,
- * late subscriberss will receive that terminal event until the connection is
+ * late subscribers will receive that terminal event until the connection is
  * disposed and the ConnectableFlowable is reset to its fresh state.
  *
  * @param <T> the element type
@@ -52,7 +52,7 @@ public final class FlowablePublish<T> extends ConnectableFlowable<T>
     public FlowablePublish(Publisher<T> source, int bufferSize) {
         this.source = source;
         this.bufferSize = bufferSize;
-        this.current = new AtomicReference<PublishConnection<T>>();
+        this.current = new AtomicReference<>();
     }
 
     @Override
@@ -61,8 +61,8 @@ public Publisher<T> source() {
     }
 
     /**
-     * The internal buffer size of this FloawblePublishAlt operator.
-     * @return The internal buffer size of this FloawblePublishAlt operator.
+     * The internal buffer size of this FlowablePublishAlt operator.
+     * @return The internal buffer size of this FlowablePublishAlt operator.
      */
     public int publishBufferSize() {
         return bufferSize;
@@ -77,7 +77,7 @@ public void connect(Consumer<? super Disposable> connection) {
             conn = current.get();
 
             if (conn == null || conn.isDisposed()) {
-                PublishConnection<T> fresh = new PublishConnection<T>(current, bufferSize);
+                PublishConnection<T> fresh = new PublishConnection<>(current, bufferSize);
                 if (!current.compareAndSet(conn, fresh)) {
                     continue;
                 }
@@ -109,7 +109,7 @@ protected void subscribeActual(Subscriber<? super T> s) {
 
             // don't create a fresh connection if the current is disposed
             if (conn == null) {
-                PublishConnection<T> fresh = new PublishConnection<T>(current, bufferSize);
+                PublishConnection<T> fresh = new PublishConnection<>(current, bufferSize);
                 if (!current.compareAndSet(conn, fresh)) {
                     continue;
                 }
@@ -119,7 +119,7 @@ protected void subscribeActual(Subscriber<? super T> s) {
             break;
         }
 
-        InnerSubscription<T> inner = new InnerSubscription<T>(s, conn);
+        InnerSubscription<T> inner = new InnerSubscription<>(s, conn);
         s.onSubscribe(inner);
 
         if (conn.add(inner)) {
@@ -180,10 +180,10 @@ static final class PublishConnection<T>
         @SuppressWarnings("unchecked")
         PublishConnection(AtomicReference<PublishConnection<T>> current, int bufferSize) {
             this.current = current;
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
             this.connect = new AtomicBoolean();
             this.bufferSize = bufferSize;
-            this.subscribers = new AtomicReference<InnerSubscription<T>[]>(EMPTY);
+            this.subscribers = new AtomicReference<>(EMPTY);
         }
 
         @SuppressWarnings("unchecked")
@@ -222,7 +222,7 @@ public void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<T>(bufferSize);
+                queue = new SpscArrayQueue<>(bufferSize);
 
                 s.request(bufferSize);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
index 702955bf02..05e0e7a907 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
@@ -55,7 +55,7 @@ public FlowablePublishMulticast(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        MulticastProcessor<T> mp = new MulticastProcessor<T>(prefetch, delayError);
+        MulticastProcessor<T> mp = new MulticastProcessor<>(prefetch, delayError);
 
         Publisher<? extends R> other;
 
@@ -67,7 +67,7 @@ protected void subscribeActual(Subscriber<? super R> s) {
             return;
         }
 
-        OutputCanceller<R> out = new OutputCanceller<R>(s, mp);
+        OutputCanceller<R> out = new OutputCanceller<>(s, mp);
 
         other.subscribe(out);
 
@@ -159,8 +159,8 @@ static final class MulticastProcessor<T> extends Flowable<T> implements Flowable
             this.limit = prefetch - (prefetch >> 2); // request after 75% consumption
             this.delayError = delayError;
             this.wip = new AtomicInteger();
-            this.upstream = new AtomicReference<Subscription>();
-            this.subscribers = new AtomicReference<MulticastSubscription<T>[]>(EMPTY);
+            this.upstream = new AtomicReference<>();
+            this.subscribers = new AtomicReference<>(EMPTY);
         }
 
         @Override
@@ -293,7 +293,7 @@ void remove(MulticastSubscription<T> s) {
 
         @Override
         protected void subscribeActual(Subscriber<? super T> s) {
-            MulticastSubscription<T> ms = new MulticastSubscription<T>(s, this);
+            MulticastSubscription<T> ms = new MulticastSubscription<>(s, this);
             s.onSubscribe(ms);
             if (add(ms)) {
                 if (ms.isCancelled()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java
index 9d3d3f4794..2aa1d71db0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java
@@ -40,7 +40,7 @@ public FlowableReduce(Flowable<T> source, BiFunction<T, T, T> reducer) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new ReduceSubscriber<T>(s, reducer));
+        source.subscribe(new ReduceSubscriber<>(s, reducer));
     }
 
     static final class ReduceSubscriber<T> extends DeferredScalarSubscription<T> implements FlowableSubscriber<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java
index 2de3b633fe..aded7967b8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java
@@ -50,12 +50,12 @@ public Publisher<T> source() {
 
     @Override
     public Flowable<T> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableReduce<T>(source, reducer));
+        return RxJavaPlugins.onAssembly(new FlowableReduce<>(source, reducer));
     }
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new ReduceSubscriber<T>(observer, reducer));
+        source.subscribe(new ReduceSubscriber<>(observer, reducer));
     }
 
     static final class ReduceSubscriber<T> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java
index ec570639c6..715cb49c0a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java
@@ -47,7 +47,7 @@ public FlowableReduceSeedSingle(Publisher<T> source, R seed, BiFunction<R, ? sup
 
     @Override
     protected void subscribeActual(SingleObserver<? super R> observer) {
-        source.subscribe(new ReduceSeedObserver<T, R>(observer, reducer, seed));
+        source.subscribe(new ReduceSeedObserver<>(observer, reducer, seed));
     }
 
     static final class ReduceSeedObserver<T, R> implements FlowableSubscriber<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java
index 343d72c4e3..b2aaf836d7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java
@@ -55,6 +55,6 @@ protected void subscribeActual(SingleObserver<? super R> observer) {
             EmptyDisposable.error(ex, observer);
             return;
         }
-        source.subscribe(new ReduceSeedObserver<T, R>(observer, reducer, seed));
+        source.subscribe(new ReduceSeedObserver<>(observer, reducer, seed));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java
index e8f7f895ba..1bce5a4dd7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java
@@ -84,7 +84,7 @@ protected void subscribeActual(Subscriber<? super T> s) {
             }
         }
 
-        source.subscribe(new RefCountSubscriber<T>(s, this, conn));
+        source.subscribe(new RefCountSubscriber<>(s, this, conn));
 
         if (connect) {
             source.connect(conn);
@@ -168,7 +168,7 @@ public void run() {
         }
 
         @Override
-        public void accept(Disposable t) throws Exception {
+        public void accept(Disposable t) {
             DisposableHelper.replace(this, t);
             synchronized (parent) {
                 if (disconnectedEarly) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java
index 092703b343..3acb03fb76 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java
@@ -32,7 +32,7 @@ public void subscribeActual(Subscriber<? super T> s) {
         SubscriptionArbiter sa = new SubscriptionArbiter(false);
         s.onSubscribe(sa);
 
-        RepeatSubscriber<T> rs = new RepeatSubscriber<T>(s, count != Long.MAX_VALUE ? count - 1 : Long.MAX_VALUE, sa, source);
+        RepeatSubscriber<T> rs = new RepeatSubscriber<>(s, count != Long.MAX_VALUE ? count - 1 : Long.MAX_VALUE, sa, source);
         rs.subscribeNext();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java
index 9e24575c58..70df0e949d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java
@@ -34,7 +34,7 @@ public void subscribeActual(Subscriber<? super T> s) {
         SubscriptionArbiter sa = new SubscriptionArbiter(false);
         s.onSubscribe(sa);
 
-        RepeatSubscriber<T> rs = new RepeatSubscriber<T>(s, until, sa, source);
+        RepeatSubscriber<T> rs = new RepeatSubscriber<>(s, until, sa, source);
         rs.subscribeNext();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java
index dcd807aa2a..5371930b5f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java
@@ -37,9 +37,9 @@ public FlowableRepeatWhen(Flowable<T> source,
     @Override
     public void subscribeActual(Subscriber<? super T> s) {
 
-        SerializedSubscriber<T> z = new SerializedSubscriber<T>(s);
+        SerializedSubscriber<T> z = new SerializedSubscriber<>(s);
 
-        FlowableProcessor<Object> processor = UnicastProcessor.<Object>create(8).toSerialized();
+        FlowableProcessor<Object> processor = UnicastProcessor.create(8).toSerialized();
 
         Publisher<?> when;
 
@@ -51,9 +51,9 @@ public void subscribeActual(Subscriber<? super T> s) {
             return;
         }
 
-        WhenReceiver<T, Object> receiver = new WhenReceiver<T, Object>(source);
+        WhenReceiver<T, Object> receiver = new WhenReceiver<>(source);
 
-        RepeatWhenSubscriber<T> subscriber = new RepeatWhenSubscriber<T>(z, processor, receiver);
+        RepeatWhenSubscriber<T> subscriber = new RepeatWhenSubscriber<>(z, processor, receiver);
 
         receiver.subscriber = subscriber;
 
@@ -80,7 +80,7 @@ static final class WhenReceiver<T, U>
 
         WhenReceiver(Publisher<T> source) {
             this.source = source;
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
             this.requested = new AtomicLong();
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
index 6a352e2fc4..db8718a433 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
@@ -56,7 +56,7 @@ public final class FlowableReplay<T> extends ConnectableFlowable<T> implements H
     public static <U, R> Flowable<R> multicastSelector(
             final Supplier<? extends ConnectableFlowable<U>> connectableFactory,
             final Function<? super Flowable<U>, ? extends Publisher<R>> selector) {
-        return new MulticastFlowable<R, U>(connectableFactory, selector);
+        return new MulticastFlowable<>(connectableFactory, selector);
     }
 
     /**
@@ -83,7 +83,7 @@ public static <T> ConnectableFlowable<T> create(Flowable<T> source,
         if (bufferSize == Integer.MAX_VALUE) {
             return createFrom(source);
         }
-        return create(source, new ReplayBufferSupplier<T>(bufferSize, eagerTruncate));
+        return create(source, new ReplayBufferSupplier<>(bufferSize, eagerTruncate));
     }
 
     /**
@@ -114,7 +114,7 @@ public static <T> ConnectableFlowable<T> create(Flowable<T> source,
      */
     public static <T> ConnectableFlowable<T> create(Flowable<T> source,
             final long maxAge, final TimeUnit unit, final Scheduler scheduler, final int bufferSize, boolean eagerTruncate) {
-        return create(source, new ScheduledReplayBufferSupplier<T>(bufferSize, maxAge, unit, scheduler, eagerTruncate));
+        return create(source, new ScheduledReplayBufferSupplier<>(bufferSize, maxAge, unit, scheduler, eagerTruncate));
     }
 
     /**
@@ -126,9 +126,9 @@ public static <T> ConnectableFlowable<T> create(Flowable<T> source,
     static <T> ConnectableFlowable<T> create(Flowable<T> source,
             final Supplier<? extends ReplayBuffer<T>> bufferFactory) {
         // the current connection to source needs to be shared between the operator and its onSubscribe call
-        final AtomicReference<ReplaySubscriber<T>> curr = new AtomicReference<ReplaySubscriber<T>>();
-        Publisher<T> onSubscribe = new ReplayPublisher<T>(curr, bufferFactory);
-        return RxJavaPlugins.onAssembly(new FlowableReplay<T>(onSubscribe, source, curr, bufferFactory));
+        final AtomicReference<ReplaySubscriber<T>> curr = new AtomicReference<>();
+        Publisher<T> onSubscribe = new ReplayPublisher<>(curr, bufferFactory);
+        return RxJavaPlugins.onAssembly(new FlowableReplay<>(onSubscribe, source, curr, bufferFactory));
     }
 
     private FlowableReplay(Publisher<T> onSubscribe, Flowable<T> source,
@@ -179,7 +179,7 @@ public void connect(Consumer<? super Disposable> connection) {
                 }
 
                 // create a new subscriber-to-source
-                ReplaySubscriber<T> u = new ReplaySubscriber<T>(buf);
+                ReplaySubscriber<T> u = new ReplaySubscriber<>(buf);
                 // try setting it as the current subscriber-to-source
                 if (!current.compareAndSet(ps, u)) {
                     // did not work, perhaps a new subscriber arrived
@@ -255,7 +255,7 @@ static final class ReplaySubscriber<T>
         ReplaySubscriber(ReplayBuffer<T> buffer) {
             this.buffer = buffer;
             this.management = new AtomicInteger();
-            this.subscribers = new AtomicReference<InnerSubscription<T>[]>(EMPTY);
+            this.subscribers = new AtomicReference<>(EMPTY);
             this.shouldConnect = new AtomicBoolean();
         }
 
@@ -1004,7 +1004,7 @@ static final class SizeAndTimeBoundReplayBuffer<T> extends BoundedReplayBuffer<T
 
         @Override
         Object enterTransform(Object value, boolean terminal) {
-            return new Timed<Object>(value, terminal ? Long.MAX_VALUE : scheduler.now(unit), unit);
+            return new Timed<>(value, terminal ? Long.MAX_VALUE : scheduler.now(unit), unit);
         }
 
         @Override
@@ -1128,7 +1128,7 @@ protected void subscribeActual(Subscriber<? super R> child) {
                 return;
             }
 
-            final SubscriberResourceWrapper<R> srw = new SubscriberResourceWrapper<R>(child);
+            final SubscriberResourceWrapper<R> srw = new SubscriberResourceWrapper<>(child);
 
             observable.subscribe(srw);
 
@@ -1187,7 +1187,7 @@ static final class ReplayBufferSupplier<T> implements Supplier<ReplayBuffer<T>>
 
         @Override
         public ReplayBuffer<T> get() {
-            return new SizeBoundReplayBuffer<T>(bufferSize, eagerTruncate);
+            return new SizeBoundReplayBuffer<>(bufferSize, eagerTruncate);
         }
     }
 
@@ -1209,7 +1209,7 @@ static final class ScheduledReplayBufferSupplier<T> implements Supplier<ReplayBu
 
         @Override
         public ReplayBuffer<T> get() {
-            return new SizeAndTimeBoundReplayBuffer<T>(bufferSize, maxAge, unit, scheduler, eagerTruncate);
+            return new SizeAndTimeBoundReplayBuffer<>(bufferSize, maxAge, unit, scheduler, eagerTruncate);
         }
     }
 
@@ -1241,7 +1241,7 @@ public void subscribe(Subscriber<? super T> child) {
                         return;
                     }
                     // create a new subscriber to source
-                    ReplaySubscriber<T> u = new ReplaySubscriber<T>(buf);
+                    ReplaySubscriber<T> u = new ReplaySubscriber<>(buf);
                     // let's try setting it as the current subscriber-to-source
                     if (!curr.compareAndSet(null, u)) {
                         // didn't work, maybe someone else did it or the current subscriber
@@ -1253,7 +1253,7 @@ public void subscribe(Subscriber<? super T> child) {
                 }
 
                 // create the backpressure-managing producer for this child
-                InnerSubscription<T> inner = new InnerSubscription<T>(r, child);
+                InnerSubscription<T> inner = new InnerSubscription<>(r, child);
                 // the producer has been registered with the current subscriber-to-source so
                 // at least it will receive the next terminal event
                 // setting the producer will trigger the first request to be considered by
@@ -1282,7 +1282,7 @@ public void subscribe(Subscriber<? super T> child) {
     static final class DefaultUnboundedFactory implements Supplier<Object> {
         @Override
         public Object get() {
-            return new UnboundedReplayBuffer<Object>(16);
+            return new UnboundedReplayBuffer<>(16);
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java
index 1a06e02bb6..62b4852849 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java
@@ -36,7 +36,7 @@ public void subscribeActual(Subscriber<? super T> s) {
         SubscriptionArbiter sa = new SubscriptionArbiter(false);
         s.onSubscribe(sa);
 
-        RetryBiSubscriber<T> rs = new RetryBiSubscriber<T>(s, predicate, sa, source);
+        RetryBiSubscriber<T> rs = new RetryBiSubscriber<>(s, predicate, sa, source);
         rs.subscribeNext();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java
index 07d7207d74..75350871c4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java
@@ -38,7 +38,7 @@ public void subscribeActual(Subscriber<? super T> s) {
         SubscriptionArbiter sa = new SubscriptionArbiter(false);
         s.onSubscribe(sa);
 
-        RetrySubscriber<T> rs = new RetrySubscriber<T>(s, count, predicate, sa, source);
+        RetrySubscriber<T> rs = new RetrySubscriber<>(s, count, predicate, sa, source);
         rs.subscribeNext();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java
index 7307664353..f4129d7be8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java
@@ -36,7 +36,7 @@ public FlowableRetryWhen(Flowable<T> source,
 
     @Override
     public void subscribeActual(Subscriber<? super T> s) {
-        SerializedSubscriber<T> z = new SerializedSubscriber<T>(s);
+        SerializedSubscriber<T> z = new SerializedSubscriber<>(s);
 
         FlowableProcessor<Throwable> processor = UnicastProcessor.<Throwable>create(8).toSerialized();
 
@@ -50,9 +50,9 @@ public void subscribeActual(Subscriber<? super T> s) {
             return;
         }
 
-        WhenReceiver<T, Throwable> receiver = new WhenReceiver<T, Throwable>(source);
+        WhenReceiver<T, Throwable> receiver = new WhenReceiver<>(source);
 
-        RetryWhenSubscriber<T> subscriber = new RetryWhenSubscriber<T>(z, processor, receiver);
+        RetryWhenSubscriber<T> subscriber = new RetryWhenSubscriber<>(z, processor, receiver);
 
         receiver.subscriber = subscriber;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java
index 59a6ec3a14..4a20a2b95f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java
@@ -37,11 +37,11 @@ public FlowableSamplePublisher(Publisher<T> source, Publisher<?> other, boolean
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        SerializedSubscriber<T> serial = new SerializedSubscriber<T>(s);
+        SerializedSubscriber<T> serial = new SerializedSubscriber<>(s);
         if (emitLast) {
-            source.subscribe(new SampleMainEmitLast<T>(serial, other));
+            source.subscribe(new SampleMainEmitLast<>(serial, other));
         } else {
-            source.subscribe(new SampleMainNoLast<T>(serial, other));
+            source.subscribe(new SampleMainNoLast<>(serial, other));
         }
     }
 
@@ -54,7 +54,7 @@ abstract static class SamplePublisherSubscriber<T> extends AtomicReference<T> im
 
         final AtomicLong requested = new AtomicLong();
 
-        final AtomicReference<Subscription> other = new AtomicReference<Subscription>();
+        final AtomicReference<Subscription> other = new AtomicReference<>();
 
         Subscription upstream;
 
@@ -69,7 +69,7 @@ public void onSubscribe(Subscription s) {
                 this.upstream = s;
                 downstream.onSubscribe(this);
                 if (other.get() == null) {
-                    sampler.subscribe(new SamplerSubscriber<T>(this));
+                    sampler.subscribe(new SamplerSubscriber<>(this));
                     s.request(Long.MAX_VALUE);
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
index ea9a4d5ae2..17e1644749 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
@@ -42,11 +42,11 @@ public FlowableSampleTimed(Flowable<T> source, long period, TimeUnit unit, Sched
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        SerializedSubscriber<T> serial = new SerializedSubscriber<T>(s);
+        SerializedSubscriber<T> serial = new SerializedSubscriber<>(s);
         if (emitLast) {
-            source.subscribe(new SampleTimedEmitLast<T>(serial, period, unit, scheduler));
+            source.subscribe(new SampleTimedEmitLast<>(serial, period, unit, scheduler));
         } else {
-            source.subscribe(new SampleTimedNoLast<T>(serial, period, unit, scheduler));
+            source.subscribe(new SampleTimedNoLast<>(serial, period, unit, scheduler));
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
index d78e83a3d2..4abae183b4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
@@ -87,7 +87,7 @@ public static <T, R> boolean tryScalarXMapSubscribe(Publisher<T> source,
                     EmptySubscription.complete(subscriber);
                     return true;
                 }
-                subscriber.onSubscribe(new ScalarSubscription<R>(subscriber, u));
+                subscriber.onSubscribe(new ScalarSubscription<>(subscriber, u));
             } else {
                 r.subscribe(subscriber);
             }
@@ -108,7 +108,7 @@ public static <T, R> boolean tryScalarXMapSubscribe(Publisher<T> source,
      * @return the new Flowable instance
      */
     public static <T, U> Flowable<U> scalarXMap(final T value, final Function<? super T, ? extends Publisher<? extends U>> mapper) {
-        return RxJavaPlugins.onAssembly(new ScalarXMapFlowable<T, U>(value, mapper));
+        return RxJavaPlugins.onAssembly(new ScalarXMapFlowable<>(value, mapper));
     }
 
     /**
@@ -155,7 +155,7 @@ public void subscribeActual(Subscriber<? super R> s) {
                     EmptySubscription.complete(s);
                     return;
                 }
-                s.onSubscribe(new ScalarSubscription<R>(s, u));
+                s.onSubscribe(new ScalarSubscription<>(s, u));
             } else {
                 other.subscribe(s);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java
index 2fab24a484..0199189204 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java
@@ -32,7 +32,7 @@ public FlowableScan(Flowable<T> source, BiFunction<T, T, T> accumulator) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new ScanSubscriber<T>(s, accumulator));
+        source.subscribe(new ScanSubscriber<>(s, accumulator));
     }
 
     static final class ScanSubscriber<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
index da0b1870da..21c88ab7bf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
@@ -48,7 +48,7 @@ protected void subscribeActual(Subscriber<? super R> s) {
             return;
         }
 
-        source.subscribe(new ScanSeedSubscriber<T, R>(s, accumulator, r, bufferSize()));
+        source.subscribe(new ScanSeedSubscriber<>(s, accumulator, r, bufferSize()));
     }
 
     static final class ScanSeedSubscriber<T, R>
@@ -85,7 +85,7 @@ static final class ScanSeedSubscriber<T, R>
             this.value = value;
             this.prefetch = prefetch;
             this.limit = prefetch - (prefetch >> 2);
-            this.queue = new SpscArrayQueue<R>(prefetch);
+            this.queue = new SpscArrayQueue<>(prefetch);
             this.queue.offer(value);
             this.requested = new AtomicLong();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
index 05be9542be..cc65e1d37e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
@@ -41,7 +41,7 @@ public FlowableSequenceEqual(Publisher<? extends T> first, Publisher<? extends T
 
     @Override
     public void subscribeActual(Subscriber<? super Boolean> s) {
-        EqualCoordinator<T> parent = new EqualCoordinator<T>(s, prefetch, comparer);
+        EqualCoordinator<T> parent = new EqualCoordinator<>(s, prefetch, comparer);
         s.onSubscribe(parent);
         parent.subscribe(first, second);
     }
@@ -79,8 +79,8 @@ static final class EqualCoordinator<T> extends DeferredScalarSubscription<Boolea
             super(actual);
             this.comparer = comparer;
             this.wip = new AtomicInteger();
-            this.first = new EqualSubscriber<T>(this, prefetch);
-            this.second = new EqualSubscriber<T>(this, prefetch);
+            this.first = new EqualSubscriber<>(this, prefetch);
+            this.second = new EqualSubscriber<>(this, prefetch);
             this.errors = new AtomicThrowable();
         }
 
@@ -289,7 +289,7 @@ public void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<T>(prefetch);
+                queue = new SpscArrayQueue<>(prefetch);
 
                 s.request(prefetch);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java
index 7761c93041..05d99e4e49 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java
@@ -43,14 +43,14 @@ public FlowableSequenceEqualSingle(Publisher<? extends T> first, Publisher<? ext
 
     @Override
     public void subscribeActual(SingleObserver<? super Boolean> observer) {
-        EqualCoordinator<T> parent = new EqualCoordinator<T>(observer, prefetch, comparer);
+        EqualCoordinator<T> parent = new EqualCoordinator<>(observer, prefetch, comparer);
         observer.onSubscribe(parent);
         parent.subscribe(first, second);
     }
 
     @Override
     public Flowable<Boolean> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableSequenceEqual<T>(first, second, comparer, prefetch));
+        return RxJavaPlugins.onAssembly(new FlowableSequenceEqual<>(first, second, comparer, prefetch));
     }
 
     static final class EqualCoordinator<T>
@@ -76,8 +76,8 @@ static final class EqualCoordinator<T>
         EqualCoordinator(SingleObserver<? super Boolean> actual, int prefetch, BiPredicate<? super T, ? super T> comparer) {
             this.downstream = actual;
             this.comparer = comparer;
-            this.first = new EqualSubscriber<T>(this, prefetch);
-            this.second = new EqualSubscriber<T>(this, prefetch);
+            this.first = new EqualSubscriber<>(this, prefetch);
+            this.second = new EqualSubscriber<>(this, prefetch);
             this.errors = new AtomicThrowable();
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java
index ec924bb0d1..2cd7df3369 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java
@@ -24,6 +24,6 @@ public FlowableSerialized(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new SerializedSubscriber<T>(s));
+        source.subscribe(new SerializedSubscriber<>(s));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java
index 11a27d372b..068385289a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java
@@ -35,7 +35,7 @@ public FlowableSingle(Flowable<T> source, T defaultValue, boolean failOnEmpty) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new SingleElementSubscriber<T>(s, defaultValue, failOnEmpty));
+        source.subscribe(new SingleElementSubscriber<>(s, defaultValue, failOnEmpty));
     }
 
     static final class SingleElementSubscriber<T> extends DeferredScalarSubscription<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java
index 1d701014cb..fac74c9cd8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java
@@ -31,12 +31,12 @@ public FlowableSingleMaybe(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new SingleElementSubscriber<T>(observer));
+        source.subscribe(new SingleElementSubscriber<>(observer));
     }
 
     @Override
     public Flowable<T> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableSingle<T>(source, null, false));
+        return RxJavaPlugins.onAssembly(new FlowableSingle<>(source, null, false));
     }
 
     static final class SingleElementSubscriber<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java
index 50c4d06ccc..c24b45a760 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java
@@ -36,12 +36,12 @@ public FlowableSingleSingle(Flowable<T> source, T defaultValue) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new SingleElementSubscriber<T>(observer, defaultValue));
+        source.subscribe(new SingleElementSubscriber<>(observer, defaultValue));
     }
 
     @Override
     public Flowable<T> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableSingle<T>(source, defaultValue, true));
+        return RxJavaPlugins.onAssembly(new FlowableSingle<>(source, defaultValue, true));
     }
 
     static final class SingleElementSubscriber<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java
index f60d36e8f1..2aecef3e10 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java
@@ -27,7 +27,7 @@ public FlowableSkip(Flowable<T> source, long n) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new SkipSubscriber<T>(s, n));
+        source.subscribe(new SkipSubscriber<>(s, n));
     }
 
     static final class SkipSubscriber<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java
index 8b3a6a2487..5908d6d0b0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java
@@ -30,7 +30,7 @@ public FlowableSkipLast(Flowable<T> source, int skip) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new SkipLastSubscriber<T>(s, skip));
+        source.subscribe(new SkipLastSubscriber<>(s, skip));
     }
 
     static final class SkipLastSubscriber<T> extends ArrayDeque<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java
index 099c5ec59c..b56224cbdf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java
@@ -41,7 +41,7 @@ public FlowableSkipLastTimed(Flowable<T> source, long time, TimeUnit unit, Sched
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new SkipLastTimedSubscriber<T>(s, time, unit, scheduler, bufferSize, delayError));
+        source.subscribe(new SkipLastTimedSubscriber<>(s, time, unit, scheduler, bufferSize, delayError));
     }
 
     static final class SkipLastTimedSubscriber<T> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
@@ -68,7 +68,7 @@ static final class SkipLastTimedSubscriber<T> extends AtomicInteger implements F
             this.time = time;
             this.unit = unit;
             this.scheduler = scheduler;
-            this.queue = new SpscLinkedArrayQueue<Object>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
             this.delayError = delayError;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java
index 8052bc7fbf..8de843142c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java
@@ -31,7 +31,7 @@ public FlowableSkipUntil(Flowable<T> source, Publisher<U> other) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> child) {
-        SkipUntilMainSubscriber<T> parent = new SkipUntilMainSubscriber<T>(child);
+        SkipUntilMainSubscriber<T> parent = new SkipUntilMainSubscriber<>(child);
         child.onSubscribe(parent);
 
         other.subscribe(parent.other);
@@ -57,7 +57,7 @@ static final class SkipUntilMainSubscriber<T> extends AtomicInteger
 
         SkipUntilMainSubscriber(Subscriber<? super T> downstream) {
             this.downstream = downstream;
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
             this.requested = new AtomicLong();
             this.other = new OtherSubscriber();
             this.error = new AtomicThrowable();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java
index 7ed91df231..62ee5ebdbe 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java
@@ -29,7 +29,7 @@ public FlowableSkipWhile(Flowable<T> source, Predicate<? super T> predicate) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new SkipWhileSubscriber<T>(s, predicate));
+        source.subscribe(new SkipWhileSubscriber<>(s, predicate));
     }
 
     static final class SkipWhileSubscriber<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java
index 63394a09ab..b7fdd91e9f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java
@@ -42,7 +42,7 @@ public FlowableSubscribeOn(Flowable<T> source, Scheduler scheduler, boolean nonS
     @Override
     public void subscribeActual(final Subscriber<? super T> s) {
         Scheduler.Worker w = scheduler.createWorker();
-        final SubscribeOnSubscriber<T> sos = new SubscribeOnSubscriber<T>(s, w, source, nonScheduledRequests);
+        final SubscribeOnSubscriber<T> sos = new SubscribeOnSubscriber<>(s, w, source, nonScheduledRequests);
         s.onSubscribe(sos);
 
         w.schedule(sos);
@@ -69,7 +69,7 @@ static final class SubscribeOnSubscriber<T> extends AtomicReference<Thread>
             this.downstream = actual;
             this.worker = worker;
             this.source = source;
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
             this.requested = new AtomicLong();
             this.nonScheduledRequests = !requestOn;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java
index a2e81eac58..b2ad9db0d0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java
@@ -27,7 +27,7 @@ public FlowableSwitchIfEmpty(Flowable<T> source, Publisher<? extends T> other) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        SwitchIfEmptySubscriber<T> parent = new SwitchIfEmptySubscriber<T>(s, other);
+        SwitchIfEmptySubscriber<T> parent = new SwitchIfEmptySubscriber<>(s, other);
         s.onSubscribe(parent.arbiter);
         source.subscribe(parent);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
index c618a0252b..7c6c1006ca 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
@@ -46,7 +46,7 @@ protected void subscribeActual(Subscriber<? super R> s) {
         if (FlowableScalarXMap.tryScalarXMapSubscribe(source, s, mapper)) {
             return;
         }
-        source.subscribe(new SwitchMapSubscriber<T, R>(s, mapper, bufferSize, delayErrors));
+        source.subscribe(new SwitchMapSubscriber<>(s, mapper, bufferSize, delayErrors));
     }
 
     static final class SwitchMapSubscriber<T, R> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
@@ -64,13 +64,13 @@ static final class SwitchMapSubscriber<T, R> extends AtomicInteger implements Fl
 
         Subscription upstream;
 
-        final AtomicReference<SwitchMapInnerSubscriber<T, R>> active = new AtomicReference<SwitchMapInnerSubscriber<T, R>>();
+        final AtomicReference<SwitchMapInnerSubscriber<T, R>> active = new AtomicReference<>();
 
         final AtomicLong requested = new AtomicLong();
 
         static final SwitchMapInnerSubscriber<Object, Object> CANCELLED;
         static {
-            CANCELLED = new SwitchMapInnerSubscriber<Object, Object>(null, -1L, 1);
+            CANCELLED = new SwitchMapInnerSubscriber<>(null, -1L, 1);
             CANCELLED.cancel();
         }
 
@@ -118,7 +118,7 @@ public void onNext(T t) {
                 return;
             }
 
-            SwitchMapInnerSubscriber<T, R> nextInner = new SwitchMapInnerSubscriber<T, R>(this, c, bufferSize);
+            SwitchMapInnerSubscriber<T, R> nextInner = new SwitchMapInnerSubscriber<>(this, c, bufferSize);
 
             for (;;) {
                 inner = active.get();
@@ -371,7 +371,7 @@ public void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<R>(bufferSize);
+                queue = new SpscArrayQueue<>(bufferSize);
 
                 s.request(bufferSize);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java
index 9b8e995322..15d06f087f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java
@@ -32,7 +32,7 @@ public FlowableTake(Flowable<T> source, long n) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new TakeSubscriber<T>(s, n));
+        source.subscribe(new TakeSubscriber<>(s, n));
     }
 
     static final class TakeSubscriber<T>
@@ -105,12 +105,7 @@ public void request(long n) {
                     if (r == 0L) {
                         break;
                     }
-                    long toRequest;
-                    if (r <= n) {
-                        toRequest = r;
-                    } else {
-                        toRequest = n;
-                    }
+                    long toRequest = Math.min(r, n);
                     long u = r - toRequest;
                     if (compareAndSet(r, u)) {
                         upstream.request(toRequest);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java
index 5252bd808d..062135b47c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java
@@ -32,7 +32,7 @@ public FlowableTakeLast(Flowable<T> source, int count) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new TakeLastSubscriber<T>(s, count));
+        source.subscribe(new TakeLastSubscriber<>(s, count));
     }
 
     static final class TakeLastSubscriber<T> extends ArrayDeque<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java
index fb11b74c0c..e4b674704d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java
@@ -25,7 +25,7 @@ public FlowableTakeLastOne(Flowable<T> source) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new TakeLastOneSubscriber<T>(s));
+        source.subscribe(new TakeLastOneSubscriber<>(s));
     }
 
     static final class TakeLastOneSubscriber<T> extends DeferredScalarSubscription<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java
index 2538fc178e..a7c2ab3343 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java
@@ -45,7 +45,7 @@ public FlowableTakeLastTimed(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new TakeLastTimedSubscriber<T>(s, count, time, unit, scheduler, bufferSize, delayError));
+        source.subscribe(new TakeLastTimedSubscriber<>(s, count, time, unit, scheduler, bufferSize, delayError));
     }
 
     static final class TakeLastTimedSubscriber<T> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
@@ -74,7 +74,7 @@ static final class TakeLastTimedSubscriber<T> extends AtomicInteger implements F
             this.time = time;
             this.unit = unit;
             this.scheduler = scheduler;
-            this.queue = new SpscLinkedArrayQueue<Object>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
             this.delayError = delayError;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java
index bda003e7da..9a30bda905 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java
@@ -35,6 +35,6 @@ public FlowableTakePublisher(Publisher<T> source, long limit) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new TakeSubscriber<T>(s, limit));
+        source.subscribe(new TakeSubscriber<>(s, limit));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java
index 1bbe14cd57..9c927cca5d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java
@@ -30,7 +30,7 @@ public FlowableTakeUntil(Flowable<T> source, Publisher<? extends U> other) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> child) {
-        TakeUntilMainSubscriber<T> parent = new TakeUntilMainSubscriber<T>(child);
+        TakeUntilMainSubscriber<T> parent = new TakeUntilMainSubscriber<>(child);
         child.onSubscribe(parent);
 
         other.subscribe(parent.other);
@@ -55,7 +55,7 @@ static final class TakeUntilMainSubscriber<T> extends AtomicInteger implements F
         TakeUntilMainSubscriber(Subscriber<? super T> downstream) {
             this.downstream = downstream;
             this.requested = new AtomicLong();
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
             this.other = new OtherSubscriber();
             this.error = new AtomicThrowable();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java
index 8bb8f27531..a8ec19c22a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java
@@ -30,7 +30,7 @@ public FlowableTakeUntilPredicate(Flowable<T> source, Predicate<? super T> predi
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new InnerSubscriber<T>(s, predicate));
+        source.subscribe(new InnerSubscriber<>(s, predicate));
     }
 
     static final class InnerSubscriber<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java
index ba9a115da8..5bcd8157d3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java
@@ -30,7 +30,7 @@ public FlowableTakeWhile(Flowable<T> source, Predicate<? super T> predicate) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new TakeWhileSubscriber<T>(s, predicate));
+        source.subscribe(new TakeWhileSubscriber<>(s, predicate));
     }
 
     static final class TakeWhileSubscriber<T> implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
index 4b1441b731..918e2ea6d7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
@@ -42,8 +42,8 @@ public FlowableThrottleFirstTimed(Flowable<T> source, long timeout, TimeUnit uni
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new DebounceTimedSubscriber<T>(
-                new SerializedSubscriber<T>(s),
+        source.subscribe(new DebounceTimedSubscriber<>(
+                new SerializedSubscriber<>(s),
                 timeout, unit, scheduler.createWorker()));
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
index fe32addcc6..989eaaf4b2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
@@ -56,7 +56,7 @@ public FlowableThrottleLatest(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new ThrottleLatestSubscriber<T>(s, timeout, unit, scheduler.createWorker(), emitLast));
+        source.subscribe(new ThrottleLatestSubscriber<>(s, timeout, unit, scheduler.createWorker(), emitLast));
     }
 
     static final class ThrottleLatestSubscriber<T>
@@ -100,7 +100,7 @@ static final class ThrottleLatestSubscriber<T>
             this.unit = unit;
             this.worker = worker;
             this.emitLast = emitLast;
-            this.latest = new AtomicReference<T>();
+            this.latest = new AtomicReference<>();
             this.requested = new AtomicLong();
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java
index 4f7c1e899b..eb9ec1fbd9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java
@@ -33,7 +33,7 @@ public FlowableTimeInterval(Flowable<T> source, TimeUnit unit, Scheduler schedul
 
     @Override
     protected void subscribeActual(Subscriber<? super Timed<T>> s) {
-        source.subscribe(new TimeIntervalSubscriber<T>(s, unit, scheduler));
+        source.subscribe(new TimeIntervalSubscriber<>(s, unit, scheduler));
     }
 
     static final class TimeIntervalSubscriber<T> implements FlowableSubscriber<T>, Subscription {
@@ -66,7 +66,7 @@ public void onNext(T t) {
             long last = lastTime;
             lastTime = now;
             long delta = now - last;
-            downstream.onNext(new Timed<T>(t, delta, unit));
+            downstream.onNext(new Timed<>(t, delta, unit));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java
index c5879c2e74..976ab10a05 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java
@@ -47,12 +47,12 @@ public FlowableTimeout(
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
         if (other == null) {
-            TimeoutSubscriber<T> parent = new TimeoutSubscriber<T>(s, itemTimeoutIndicator);
+            TimeoutSubscriber<T> parent = new TimeoutSubscriber<>(s, itemTimeoutIndicator);
             s.onSubscribe(parent);
             parent.startFirstTimeout(firstTimeoutIndicator);
             source.subscribe(parent);
         } else {
-            TimeoutFallbackSubscriber<T> parent = new TimeoutFallbackSubscriber<T>(s, itemTimeoutIndicator, other);
+            TimeoutFallbackSubscriber<T> parent = new TimeoutFallbackSubscriber<>(s, itemTimeoutIndicator, other);
             s.onSubscribe(parent);
             parent.startFirstTimeout(firstTimeoutIndicator);
             source.subscribe(parent);
@@ -82,7 +82,7 @@ static final class TimeoutSubscriber<T> extends AtomicLong
             this.downstream = actual;
             this.itemTimeoutIndicator = itemTimeoutIndicator;
             this.task = new SequentialDisposable();
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
             this.requested = new AtomicLong();
         }
 
@@ -212,7 +212,7 @@ static final class TimeoutFallbackSubscriber<T> extends SubscriptionArbiter
             this.downstream = actual;
             this.itemTimeoutIndicator = itemTimeoutIndicator;
             this.task = new SequentialDisposable();
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
             this.fallback = fallback;
             this.index = new AtomicLong();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java
index 8963788992..351099500e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java
@@ -43,12 +43,12 @@ public FlowableTimeoutTimed(Flowable<T> source,
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
         if (other == null) {
-            TimeoutSubscriber<T> parent = new TimeoutSubscriber<T>(s, timeout, unit, scheduler.createWorker());
+            TimeoutSubscriber<T> parent = new TimeoutSubscriber<>(s, timeout, unit, scheduler.createWorker());
             s.onSubscribe(parent);
             parent.startTimeout(0L);
             source.subscribe(parent);
         } else {
-            TimeoutFallbackSubscriber<T> parent = new TimeoutFallbackSubscriber<T>(s, timeout, unit, scheduler.createWorker(), other);
+            TimeoutFallbackSubscriber<T> parent = new TimeoutFallbackSubscriber<>(s, timeout, unit, scheduler.createWorker(), other);
             s.onSubscribe(parent);
             parent.startTimeout(0L);
             source.subscribe(parent);
@@ -80,7 +80,7 @@ static final class TimeoutSubscriber<T> extends AtomicLong
             this.unit = unit;
             this.worker = worker;
             this.task = new SequentialDisposable();
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
             this.requested = new AtomicLong();
         }
 
@@ -203,7 +203,7 @@ static final class TimeoutFallbackSubscriber<T> extends SubscriptionArbiter
             this.worker = worker;
             this.fallback = fallback;
             this.task = new SequentialDisposable();
-            this.upstream = new AtomicReference<Subscription>();
+            this.upstream = new AtomicReference<>();
             this.index = new AtomicLong();
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
index 439fba1074..18d8a86de4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
@@ -41,7 +41,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
             EmptySubscription.error(e, s);
             return;
         }
-        source.subscribe(new ToListSubscriber<T, U>(s, coll));
+        source.subscribe(new ToListSubscriber<>(s, coll));
     }
 
     static final class ToListSubscriber<T, U extends Collection<? super T>>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java
index b90869ad62..aea4eb3270 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java
@@ -53,12 +53,12 @@ protected void subscribeActual(SingleObserver<? super U> observer) {
             EmptyDisposable.error(e, observer);
             return;
         }
-        source.subscribe(new ToListSubscriber<T, U>(observer, coll));
+        source.subscribe(new ToListSubscriber<>(observer, coll));
     }
 
     @Override
     public Flowable<U> fuseToFlowable() {
-        return RxJavaPlugins.onAssembly(new FlowableToList<T, U>(source, collectionSupplier));
+        return RxJavaPlugins.onAssembly(new FlowableToList<>(source, collectionSupplier));
     }
 
     static final class ToListSubscriber<T, U extends Collection<? super T>>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java
index 3a7d29a47b..ee9d8f3cc7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java
@@ -30,7 +30,7 @@ public FlowableUnsubscribeOn(Flowable<T> source, Scheduler scheduler) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new UnsubscribeSubscriber<T>(s, scheduler));
+        source.subscribe(new UnsubscribeSubscriber<>(s, scheduler));
     }
 
     static final class UnsubscribeSubscriber<T> extends AtomicBoolean implements FlowableSubscriber<T>, Subscription {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
index 7e2e91c672..5a5b177d35 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
@@ -68,7 +68,7 @@ public void subscribeActual(Subscriber<? super T> s) {
             return;
         }
 
-        UsingSubscriber<T, D> us = new UsingSubscriber<T, D>(s, resource, disposer, eager);
+        UsingSubscriber<T, D> us = new UsingSubscriber<>(s, resource, disposer, eager);
 
         source.subscribe(us);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
index ae027e2d04..e00ed99edf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
@@ -42,12 +42,12 @@ public FlowableWindow(Flowable<T> source, long size, long skip,  int bufferSize)
     @Override
     public void subscribeActual(Subscriber<? super Flowable<T>> s) {
         if (skip == size) {
-            source.subscribe(new WindowExactSubscriber<T>(s, size, bufferSize));
+            source.subscribe(new WindowExactSubscriber<>(s, size, bufferSize));
         } else
         if (skip > size) {
-            source.subscribe(new WindowSkipSubscriber<T>(s, size, skip, bufferSize));
+            source.subscribe(new WindowSkipSubscriber<>(s, size, skip, bufferSize));
         } else {
-            source.subscribe(new WindowOverlapSubscriber<T>(s, size, skip, bufferSize));
+            source.subscribe(new WindowOverlapSubscriber<>(s, size, skip, bufferSize));
         }
     }
 
@@ -96,10 +96,10 @@ public void onNext(T t) {
             if (i == 0) {
                 getAndIncrement();
 
-                w = UnicastProcessor.<T>create(bufferSize, this);
+                w = UnicastProcessor.create(bufferSize, this);
                 window = w;
 
-                intercept = new FlowableWindowSubscribeIntercept<T>(w);
+                intercept = new FlowableWindowSubscribeIntercept<>(w);
                 downstream.onNext(intercept);
             }
 
@@ -216,10 +216,10 @@ public void onNext(T t) {
             if (i == 0) {
                 getAndIncrement();
 
-                w = UnicastProcessor.<T>create(bufferSize, this);
+                w = UnicastProcessor.create(bufferSize, this);
                 window = w;
 
-                intercept = new FlowableWindowSubscribeIntercept<T>(w);
+                intercept = new FlowableWindowSubscribeIntercept<>(w);
                 downstream.onNext(intercept);
             }
 
@@ -339,8 +339,8 @@ static final class WindowOverlapSubscriber<T>
             this.downstream = actual;
             this.size = size;
             this.skip = skip;
-            this.queue = new SpscLinkedArrayQueue<UnicastProcessor<T>>(bufferSize);
-            this.windows = new ArrayDeque<UnicastProcessor<T>>();
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
+            this.windows = new ArrayDeque<>();
             this.once = new AtomicBoolean();
             this.firstRequest = new AtomicBoolean();
             this.requested = new AtomicLong();
@@ -369,7 +369,7 @@ public void onNext(T t) {
                 if (!cancelled) {
                     getAndIncrement();
 
-                    newWindow = UnicastProcessor.<T>create(bufferSize, this);
+                    newWindow = UnicastProcessor.create(bufferSize, this);
 
                     windows.offer(newWindow);
                 }
@@ -477,7 +477,7 @@ void drain() {
                             break;
                         }
 
-                        FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(t);
+                        FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<>(t);
                         a.onNext(intercept);
 
                         if (intercept.tryAbandon()) {
@@ -488,7 +488,7 @@ void drain() {
 
                     if (e == r) {
                         if (cancelled) {
-                            continue outer;
+                            continue;
                         }
 
                         if (checkTerminated(done, q.isEmpty(), a, q)) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
index 2e07d3eec8..c86d3faab1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
@@ -38,7 +38,7 @@ public FlowableWindowBoundary(Flowable<T> source, Publisher<B> other, int capaci
 
     @Override
     protected void subscribeActual(Subscriber<? super Flowable<T>> subscriber) {
-        WindowBoundaryMainSubscriber<T, B> parent = new WindowBoundaryMainSubscriber<T, B>(subscriber, capacityHint);
+        WindowBoundaryMainSubscriber<T, B> parent = new WindowBoundaryMainSubscriber<>(subscriber, capacityHint);
 
         subscriber.onSubscribe(parent);
 
@@ -84,10 +84,10 @@ static final class WindowBoundaryMainSubscriber<T, B>
         WindowBoundaryMainSubscriber(Subscriber<? super Flowable<T>> downstream, int capacityHint) {
             this.downstream = downstream;
             this.capacityHint = capacityHint;
-            this.boundarySubscriber = new WindowBoundaryInnerSubscriber<T, B>(this);
-            this.upstream = new AtomicReference<Subscription>();
+            this.boundarySubscriber = new WindowBoundaryInnerSubscriber<>(this);
+            this.upstream = new AtomicReference<>();
             this.windows = new AtomicInteger(1);
-            this.queue = new MpscLinkedQueue<Object>();
+            this.queue = new MpscLinkedQueue<>();
             this.errors = new AtomicThrowable();
             this.stopWindows = new AtomicBoolean();
             this.requested = new AtomicLong();
@@ -240,7 +240,7 @@ void drain() {
 
                         if (emitted != requested.get()) {
                             emitted++;
-                            FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(w);
+                            FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<>(w);
                             downstream.onNext(intercept);
                             if (intercept.tryAbandon()) {
                                 w.onComplete();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
index d55198010a..f6248b3355 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
@@ -46,7 +46,7 @@ public FlowableWindowBoundarySelector(
 
     @Override
     protected void subscribeActual(Subscriber<? super Flowable<T>> s) {
-        source.subscribe(new WindowBoundaryMainSubscriber<T, B, V>(
+        source.subscribe(new WindowBoundaryMainSubscriber<>(
                 s, open, closingIndicator, bufferSize));
     }
 
@@ -85,16 +85,16 @@ static final class WindowBoundaryMainSubscriber<T, B, V>
         WindowBoundaryMainSubscriber(Subscriber<? super Flowable<T>> actual,
                 Publisher<B> open, Function<? super B, ? extends Publisher<V>> closingIndicator, int bufferSize) {
             this.downstream = actual;
-            this.queue = new MpscLinkedQueue<Object>();
+            this.queue = new MpscLinkedQueue<>();
             this.open = open;
             this.closingIndicator = closingIndicator;
             this.bufferSize = bufferSize;
             this.resources = new CompositeDisposable();
-            this.windows = new ArrayList<UnicastProcessor<T>>();
+            this.windows = new ArrayList<>();
             this.windowCount = new AtomicLong(1L);
             this.downstreamCancelled = new AtomicBoolean();
             this.error = new AtomicThrowable();
-            this.startSubscriber = new WindowStartSubscriber<B>(this);
+            this.startSubscriber = new WindowStartSubscriber<>(this);
             this.requested = new AtomicLong();
         }
 
@@ -171,7 +171,7 @@ public void run() {
         }
 
         void open(B startValue) {
-            queue.offer(new WindowStartItem<B>(startValue));
+            queue.offer(new WindowStartItem<>(startValue));
             drain();
         }
 
@@ -257,7 +257,7 @@ void drain() {
 
                                     windowCount.getAndIncrement();
                                     UnicastProcessor<T> newWindow = UnicastProcessor.create(bufferSize, this);
-                                    WindowEndSubscriberIntercept<T, V> endSubscriber = new WindowEndSubscriberIntercept<T, V>(this, newWindow);
+                                    WindowEndSubscriberIntercept<T, V> endSubscriber = new WindowEndSubscriberIntercept<>(this, newWindow);
 
                                     downstream.onNext(endSubscriber);
 
@@ -388,7 +388,7 @@ static final class WindowEndSubscriberIntercept<T, V> extends Flowable<T>
             WindowEndSubscriberIntercept(WindowBoundaryMainSubscriber<T, ?, V> parent, UnicastProcessor<T> window) {
                 this.parent = parent;
                 this.window = window;
-                this.upstream = new AtomicReference<Subscription>();
+                this.upstream = new AtomicReference<>();
                 this.once = new AtomicBoolean();
             }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
index 0dfec4e4af..89b49e857a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
@@ -55,18 +55,18 @@ public FlowableWindowTimed(Flowable<T> source,
     protected void subscribeActual(Subscriber<? super Flowable<T>> downstream) {
         if (timespan == timeskip) {
             if (maxSize == Long.MAX_VALUE) {
-                source.subscribe(new WindowExactUnboundedSubscriber<T>(
+                source.subscribe(new WindowExactUnboundedSubscriber<>(
                         downstream,
                         timespan, unit, scheduler, bufferSize));
                 return;
             }
-            source.subscribe(new WindowExactBoundedSubscriber<T>(
+            source.subscribe(new WindowExactBoundedSubscriber<>(
                         downstream,
                         timespan, unit, scheduler,
                         bufferSize, maxSize, restartTimerOnMaxSize));
             return;
         }
-        source.subscribe(new WindowSkipSubscriber<T>(downstream,
+        source.subscribe(new WindowSkipSubscriber<>(downstream,
                 timespan, timeskip, unit, scheduler.createWorker(), bufferSize));
     }
 
@@ -99,7 +99,7 @@ abstract static class AbstractWindowSubscriber<T>
 
         AbstractWindowSubscriber(Subscriber<? super Flowable<T>> downstream, long timespan, TimeUnit unit, int bufferSize) {
             this.downstream = downstream;
-            this.queue = new MpscLinkedQueue<Object>();
+            this.queue = new MpscLinkedQueue<>();
             this.timespan = timespan;
             this.unit = unit;
             this.bufferSize = bufferSize;
@@ -201,7 +201,7 @@ void createFirstWindow() {
 
                     emitted = 1;
 
-                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
+                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<>(window);
                     downstream.onNext(intercept);
 
                     timer.replace(scheduler.schedulePeriodicallyDirect(this, timespan, timespan, unit));
@@ -290,7 +290,7 @@ else if (!isEmpty) {
                                     window = UnicastProcessor.create(bufferSize, windowRunnable);
                                     this.window = window;
 
-                                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
+                                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<>(window);
                                     downstream.onNext(intercept);
 
                                     if (intercept.tryAbandon()) {
@@ -369,7 +369,7 @@ void createFirstWindow() {
                     windowCount.getAndIncrement();
                     window = UnicastProcessor.create(bufferSize, this);
 
-                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
+                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<>(window);
                     downstream.onNext(intercept);
 
                     Runnable boundaryTask = new WindowBoundaryRunnable(this, 1L);
@@ -507,7 +507,7 @@ UnicastProcessor<T> createNewWindow(UnicastProcessor<T> window) {
                     window = UnicastProcessor.create(bufferSize, this);
                     this.window = window;
 
-                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
+                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<>(window);
                     downstream.onNext(intercept);
 
                     if (restartTimerOnMaxSize) {
@@ -557,7 +557,7 @@ static final class WindowSkipSubscriber<T>
             super(actual, timespan, unit, bufferSize);
             this.timeskip = timeskip;
             this.worker = worker;
-            this.windows = new LinkedList<UnicastProcessor<T>>();
+            this.windows = new LinkedList<>();
         }
 
         @Override
@@ -570,7 +570,7 @@ void createFirstWindow() {
                     UnicastProcessor<T> window = UnicastProcessor.create(bufferSize, this);
                     windows.add(window);
 
-                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
+                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<>(window);
                     downstream.onNext(intercept);
 
                     worker.schedule(new WindowBoundaryRunnable(this, false), timespan, unit);
@@ -644,7 +644,7 @@ void drain() {
                                     UnicastProcessor<T> window = UnicastProcessor.create(bufferSize, this);
                                     windows.add(window);
 
-                                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<T>(window);
+                                    FlowableWindowSubscribeIntercept<T> intercept = new FlowableWindowSubscribeIntercept<>(window);
                                     downstream.onNext(intercept);
 
                                     worker.schedule(new WindowBoundaryRunnable(this, false), timespan, unit);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
index 049befd1f4..81d3544dd0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
@@ -36,8 +36,8 @@ public FlowableWithLatestFrom(Flowable<T> source, BiFunction<? super T, ? super
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        final SerializedSubscriber<R> serial = new SerializedSubscriber<R>(s);
-        final WithLatestFromSubscriber<T, U, R> wlf = new WithLatestFromSubscriber<T, U, R>(serial, combiner);
+        final SerializedSubscriber<R> serial = new SerializedSubscriber<>(s);
+        final WithLatestFromSubscriber<T, U, R> wlf = new WithLatestFromSubscriber<>(serial, combiner);
 
         serial.onSubscribe(wlf);
 
@@ -55,11 +55,11 @@ static final class WithLatestFromSubscriber<T, U, R> extends AtomicReference<U>
 
         final BiFunction<? super T, ? super U, ? extends R> combiner;
 
-        final AtomicReference<Subscription> upstream = new AtomicReference<Subscription>();
+        final AtomicReference<Subscription> upstream = new AtomicReference<>();
 
         final AtomicLong requested = new AtomicLong();
 
-        final AtomicReference<Subscription> other = new AtomicReference<Subscription>();
+        final AtomicReference<Subscription> other = new AtomicReference<>();
 
         WithLatestFromSubscriber(Subscriber<? super R> actual, BiFunction<? super T, ? super U, ? extends R> combiner) {
             this.downstream = actual;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
index 1d1be81e05..be9166a16d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
@@ -82,11 +82,11 @@ protected void subscribeActual(Subscriber<? super R> s) {
         }
 
         if (n == 0) {
-            new FlowableMap<T, R>(source, new SingletonArrayFunc()).subscribeActual(s);
+            new FlowableMap<>(source, new SingletonArrayFunc()).subscribeActual(s);
             return;
         }
 
-        WithLatestFromSubscriber<T, R> parent = new WithLatestFromSubscriber<T, R>(s, combiner, n);
+        WithLatestFromSubscriber<T, R> parent = new WithLatestFromSubscriber<>(s, combiner, n);
         s.onSubscribe(parent);
         parent.subscribe(others, n);
 
@@ -123,8 +123,8 @@ static final class WithLatestFromSubscriber<T, R>
                 s[i] = new WithLatestInnerSubscriber(this, i);
             }
             this.subscribers = s;
-            this.values = new AtomicReferenceArray<Object>(n);
-            this.upstream = new AtomicReference<Subscription>();
+            this.values = new AtomicReferenceArray<>(n);
+            this.upstream = new AtomicReference<>();
             this.requested = new AtomicLong();
             this.error = new AtomicThrowable();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
index 27f1f8e2dc..77011a5a2d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
@@ -71,7 +71,7 @@ public void subscribeActual(Subscriber<? super R> s) {
             return;
         }
 
-        ZipCoordinator<T, R> coordinator = new ZipCoordinator<T, R>(s, zipper, count, bufferSize, delayError);
+        ZipCoordinator<T, R> coordinator = new ZipCoordinator<>(s, zipper, count, bufferSize, delayError);
 
         s.onSubscribe(coordinator);
 
@@ -108,7 +108,7 @@ static final class ZipCoordinator<T, R>
             @SuppressWarnings("unchecked")
             ZipSubscriber<T, R>[] a = new ZipSubscriber[n];
             for (int i = 0; i < n; i++) {
-                a[i] = new ZipSubscriber<T, R>(this, prefetch);
+                a[i] = new ZipSubscriber<>(this, prefetch);
             }
             this.current = new Object[n];
             this.subscribers = a;
@@ -354,7 +354,7 @@ public void onSubscribe(Subscription s) {
                     }
                 }
 
-                queue = new SpscArrayQueue<T>(prefetch);
+                queue = new SpscArrayQueue<>(prefetch);
 
                 s.request(prefetch);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java
index 64d57a0605..05c1593707 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java
@@ -41,13 +41,13 @@ public final class MaybeCache<T> extends Maybe<T> implements MaybeObserver<T> {
 
     @SuppressWarnings("unchecked")
     public MaybeCache(MaybeSource<T> source) {
-        this.source = new AtomicReference<MaybeSource<T>>(source);
-        this.observers = new AtomicReference<CacheDisposable<T>[]>(EMPTY);
+        this.source = new AtomicReference<>(source);
+        this.observers = new AtomicReference<>(EMPTY);
     }
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        CacheDisposable<T> parent = new CacheDisposable<T>(observer, this);
+        CacheDisposable<T> parent = new CacheDisposable<>(observer, this);
         observer.onSubscribe(parent);
 
         if (add(parent)) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java
index bab81330b2..f77a59c364 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java
@@ -38,7 +38,7 @@ public MaybeConcatArray(MaybeSource<? extends T>[] sources) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        ConcatMaybeObserver<T> parent = new ConcatMaybeObserver<T>(s, sources);
+        ConcatMaybeObserver<T> parent = new ConcatMaybeObserver<>(s, sources);
         s.onSubscribe(parent);
         parent.drain();
     }
@@ -68,7 +68,7 @@ static final class ConcatMaybeObserver<T>
             this.sources = sources;
             this.requested = new AtomicLong();
             this.disposables = new SequentialDisposable();
-            this.current = new AtomicReference<Object>(NotificationLite.COMPLETE); // as if a previous completed
+            this.current = new AtomicReference<>(NotificationLite.COMPLETE); // as if a previous completed
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java
index a928db62a6..e889adfe1a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java
@@ -39,7 +39,7 @@ public MaybeConcatArrayDelayError(MaybeSource<? extends T>[] sources) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        ConcatMaybeObserver<T> parent = new ConcatMaybeObserver<T>(s, sources);
+        ConcatMaybeObserver<T> parent = new ConcatMaybeObserver<>(s, sources);
         s.onSubscribe(parent);
         parent.drain();
     }
@@ -71,7 +71,7 @@ static final class ConcatMaybeObserver<T>
             this.sources = sources;
             this.requested = new AtomicLong();
             this.disposables = new SequentialDisposable();
-            this.current = new AtomicReference<Object>(NotificationLite.COMPLETE); // as if a previous completed
+            this.current = new AtomicReference<>(NotificationLite.COMPLETE); // as if a previous completed
             this.errors = new AtomicThrowable();
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java
index f3abd7ddb8..ee6e87cbe0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java
@@ -52,7 +52,7 @@ protected void subscribeActual(Subscriber<? super T> s) {
             return;
         }
 
-        ConcatMaybeObserver<T> parent = new ConcatMaybeObserver<T>(s, it);
+        ConcatMaybeObserver<T> parent = new ConcatMaybeObserver<>(s, it);
         s.onSubscribe(parent);
         parent.drain();
     }
@@ -80,7 +80,7 @@ static final class ConcatMaybeObserver<T>
             this.sources = sources;
             this.requested = new AtomicLong();
             this.disposables = new SequentialDisposable();
-            this.current = new AtomicReference<Object>(NotificationLite.COMPLETE); // as if a previous completed
+            this.current = new AtomicReference<>(NotificationLite.COMPLETE); // as if a previous completed
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java
index 2fc0f48414..24293b895b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java
@@ -39,7 +39,7 @@ public MaybeCreate(MaybeOnSubscribe<T> source) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        Emitter<T> parent = new Emitter<T>(observer);
+        Emitter<T> parent = new Emitter<>(observer);
         observer.onSubscribe(parent);
 
         try {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java
index 8509d90ab4..6885763cbd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java
@@ -42,7 +42,7 @@ public MaybeDelay(MaybeSource<T> source, long delay, TimeUnit unit, Scheduler sc
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new DelayMaybeObserver<T>(observer, delay, unit, scheduler));
+        source.subscribe(new DelayMaybeObserver<>(observer, delay, unit, scheduler));
     }
 
     static final class DelayMaybeObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java
index 0e3e8758fe..7797a968a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java
@@ -40,7 +40,7 @@ public MaybeDelayOtherPublisher(MaybeSource<T> source, Publisher<U> other) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new DelayMaybeObserver<T, U>(observer, other));
+        source.subscribe(new DelayMaybeObserver<>(observer, other));
     }
 
     static final class DelayMaybeObserver<T, U>
@@ -52,7 +52,7 @@ static final class DelayMaybeObserver<T, U>
         Disposable upstream;
 
         DelayMaybeObserver(MaybeObserver<? super T> actual, Publisher<U> otherSource) {
-            this.other = new OtherSubscriber<T>(actual);
+            this.other = new OtherSubscriber<>(actual);
             this.otherSource = otherSource;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java
index 09851e4af8..7de18c70a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java
@@ -40,7 +40,7 @@ public MaybeDelaySubscriptionOtherPublisher(MaybeSource<T> source, Publisher<U>
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        other.subscribe(new OtherSubscriber<T>(observer, source));
+        other.subscribe(new OtherSubscriber<>(observer, source));
     }
 
     static final class OtherSubscriber<T> implements FlowableSubscriber<Object>, Disposable {
@@ -51,7 +51,7 @@ static final class OtherSubscriber<T> implements FlowableSubscriber<Object>, Dis
         Subscription upstream;
 
         OtherSubscriber(MaybeObserver<? super T> actual, MaybeSource<T> source) {
-            this.main = new DelayMaybeObserver<T>(actual);
+            this.main = new DelayMaybeObserver<>(actual);
             this.source = source;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java
index 65a9460ec0..6bdc5d1a98 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java
@@ -32,7 +32,7 @@ public MaybeDelayWithCompletable(MaybeSource<T> source, CompletableSource other)
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        other.subscribe(new OtherObserver<T>(observer, source));
+        other.subscribe(new OtherObserver<>(observer, source));
     }
 
     static final class OtherObserver<T>
@@ -64,7 +64,7 @@ public void onError(Throwable e) {
 
         @Override
         public void onComplete() {
-            source.subscribe(new DelayWithMainObserver<T>(this, downstream));
+            source.subscribe(new DelayWithMainObserver<>(this, downstream));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java
index 9c4e4b9070..595c362917 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java
@@ -30,7 +30,7 @@ public MaybeDetach(MaybeSource<T> source) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new DetachMaybeObserver<T>(observer));
+        source.subscribe(new DetachMaybeObserver<>(observer));
     }
 
     static final class DetachMaybeObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java
index 939f817ac9..28943223f0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java
@@ -37,7 +37,7 @@ public MaybeDoAfterSuccess(MaybeSource<T> source, Consumer<? super T> onAfterSuc
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new DoAfterObserver<T>(observer, onAfterSuccess));
+        source.subscribe(new DoAfterObserver<>(observer, onAfterSuccess));
     }
 
     static final class DoAfterObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java
index eaeae0234f..0078cf88b1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java
@@ -39,7 +39,7 @@ public MaybeDoFinally(MaybeSource<T> source, Action onFinally) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new DoFinallyObserver<T>(observer, onFinally));
+        source.subscribe(new DoFinallyObserver<>(observer, onFinally));
     }
 
     static final class DoFinallyObserver<T> extends AtomicInteger implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java
index c70397473b..eccc36c606 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java
@@ -36,7 +36,7 @@ public MaybeDoOnEvent(MaybeSource<T> source, BiConsumer<? super T, ? super Throw
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new DoOnEventMaybeObserver<T>(observer, onEvent));
+        source.subscribe(new DoOnEventMaybeObserver<>(observer, onEvent));
     }
 
     static final class DoOnEventMaybeObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java
index e1e7e9fcbf..ddcfc7b3c5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java
@@ -44,7 +44,7 @@ public MaybeEqualSingle(MaybeSource<? extends T> source1, MaybeSource<? extends
 
     @Override
     protected void subscribeActual(SingleObserver<? super Boolean> observer) {
-        EqualCoordinator<T> parent = new EqualCoordinator<T>(observer, isEqual);
+        EqualCoordinator<T> parent = new EqualCoordinator<>(observer, isEqual);
         observer.onSubscribe(parent);
         parent.subscribe(source1, source2);
     }
@@ -65,8 +65,8 @@ static final class EqualCoordinator<T>
             super(2);
             this.downstream = actual;
             this.isEqual = isEqual;
-            this.observer1 = new EqualObserver<T>(this);
-            this.observer2 = new EqualObserver<T>(this);
+            this.observer1 = new EqualObserver<>(this);
+            this.observer2 = new EqualObserver<>(this);
         }
 
         void subscribe(MaybeSource<? extends T> source1, MaybeSource<? extends T> source2) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java
index a8c4f12176..2ddf5fff27 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java
@@ -36,7 +36,7 @@ public MaybeFilter(MaybeSource<T> source, Predicate<? super T> predicate) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new FilterMaybeObserver<T>(observer, predicate));
+        source.subscribe(new FilterMaybeObserver<>(observer, predicate));
     }
 
     static final class FilterMaybeObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java
index ff8e71b745..0535447881 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java
@@ -37,7 +37,7 @@ public MaybeFilterSingle(SingleSource<T> source, Predicate<? super T> predicate)
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new FilterMaybeObserver<T>(observer, predicate));
+        source.subscribe(new FilterMaybeObserver<>(observer, predicate));
     }
 
     static final class FilterMaybeObserver<T> implements SingleObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java
index afb27373c5..da5cfe56b8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java
@@ -59,7 +59,7 @@ static final class FlatMapBiMainObserver<T, U, R>
         FlatMapBiMainObserver(MaybeObserver<? super R> actual,
                 Function<? super T, ? extends MaybeSource<? extends U>> mapper,
                 BiFunction<? super T, ? super U, ? extends R> resultSelector) {
-            this.inner = new InnerObserver<T, U, R>(actual, resultSelector);
+            this.inner = new InnerObserver<>(actual, resultSelector);
             this.mapper = mapper;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java
index fb8bb9d9f1..10fc003bf8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java
@@ -39,7 +39,7 @@ public MaybeFlatMapCompletable(MaybeSource<T> source, Function<? super T, ? exte
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        FlatMapCompletableObserver<T> parent = new FlatMapCompletableObserver<T>(observer, mapper);
+        FlatMapCompletableObserver<T> parent = new FlatMapCompletableObserver<>(observer, mapper);
         observer.onSubscribe(parent);
         source.subscribe(parent);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java
index 8460405dc9..40ca98c351 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java
@@ -48,7 +48,7 @@ public MaybeFlatMapIterableFlowable(MaybeSource<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new FlatMapIterableObserver<T, R>(s, mapper));
+        source.subscribe(new FlatMapIterableObserver<>(s, mapper));
     }
 
     static final class FlatMapIterableObserver<T, R>
@@ -279,7 +279,7 @@ public boolean isEmpty() {
 
         @Nullable
         @Override
-        public R poll() throws Exception {
+        public R poll() {
             Iterator<? extends R> iterator = it;
 
             if (iterator != null) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java
index afbb56f8e9..c5c24995b1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java
@@ -44,7 +44,7 @@ public MaybeFlatMapIterableObservable(MaybeSource<T> source,
 
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
-        source.subscribe(new FlatMapIterableObserver<T, R>(observer, mapper));
+        source.subscribe(new FlatMapIterableObserver<>(observer, mapper));
     }
 
     static final class FlatMapIterableObserver<T, R>
@@ -189,7 +189,7 @@ public boolean isEmpty() {
 
         @Nullable
         @Override
-        public R poll() throws Exception {
+        public R poll() {
             Iterator<? extends R> iterator = it;
 
             if (iterator != null) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
index 2f50f8cd7d..e357938db2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
@@ -48,7 +48,7 @@ public MaybeFlatMapNotification(MaybeSource<T> source,
 
     @Override
     protected void subscribeActual(MaybeObserver<? super R> observer) {
-        source.subscribe(new FlatMapMaybeObserver<T, R>(observer, onSuccessMapper, onErrorMapper, onCompleteSupplier));
+        source.subscribe(new FlatMapMaybeObserver<>(observer, onSuccessMapper, onErrorMapper, onCompleteSupplier));
     }
 
     static final class FlatMapMaybeObserver<T, R>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
index 38ec9417d9..2199ea470b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
@@ -41,7 +41,7 @@ public MaybeFlatMapSingle(MaybeSource<T> source, Function<? super T, ? extends S
 
     @Override
     protected void subscribeActual(SingleObserver<? super R> downstream) {
-        source.subscribe(new FlatMapMaybeObserver<T, R>(downstream, mapper));
+        source.subscribe(new FlatMapMaybeObserver<>(downstream, mapper));
     }
 
     static final class FlatMapMaybeObserver<T, R>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java
index b917a5885e..49b7100575 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java
@@ -42,7 +42,7 @@ public MaybeFlatMapSingleElement(MaybeSource<T> source, Function<? super T, ? ex
 
     @Override
     protected void subscribeActual(MaybeObserver<? super R> downstream) {
-        source.subscribe(new FlatMapMaybeObserver<T, R>(downstream, mapper));
+        source.subscribe(new FlatMapMaybeObserver<>(downstream, mapper));
     }
 
     static final class FlatMapMaybeObserver<T, R>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java
index 325c4db2ea..21d306095c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java
@@ -39,7 +39,7 @@ public MaybeFlatten(MaybeSource<T> source, Function<? super T, ? extends MaybeSo
 
     @Override
     protected void subscribeActual(MaybeObserver<? super R> observer) {
-        source.subscribe(new FlatMapMaybeObserver<T, R>(observer, mapper));
+        source.subscribe(new FlatMapMaybeObserver<>(observer, mapper));
     }
 
     static final class FlatMapMaybeObserver<T, R>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java
index 2b7b658390..4c83bbeee7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java
@@ -58,7 +58,7 @@ protected void subscribeActual(MaybeObserver<? super T> observer) {
     }
 
     @Override
-    public T get() throws Throwable {
+    public T get() {
         runnable.run();
         return null;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java
index 7ea38ea986..c74a73ee25 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java
@@ -38,7 +38,7 @@ public SingleSource<T> source() {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new FromSingleObserver<T>(observer));
+        source.subscribe(new FromSingleObserver<>(observer));
     }
 
     static final class FromSingleObserver<T> implements SingleObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java
index 2950734c37..4dcddd0c27 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java
@@ -30,7 +30,7 @@ public MaybeHide(MaybeSource<T> source) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new HideMaybeObserver<T>(observer));
+        source.subscribe(new HideMaybeObserver<>(observer));
     }
 
     static final class HideMaybeObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java
index 8750bc4f7e..1c9242548d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java
@@ -30,7 +30,7 @@ public MaybeIgnoreElement(MaybeSource<T> source) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new IgnoreMaybeObserver<T>(observer));
+        source.subscribe(new IgnoreMaybeObserver<>(observer));
     }
 
     static final class IgnoreMaybeObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java
index 4b2ea8d462..6e9c1e9d67 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java
@@ -34,12 +34,12 @@ public MaybeIgnoreElementCompletable(MaybeSource<T> source) {
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        source.subscribe(new IgnoreMaybeObserver<T>(observer));
+        source.subscribe(new IgnoreMaybeObserver<>(observer));
     }
 
     @Override
     public Maybe<T> fuseToMaybe() {
-        return RxJavaPlugins.onAssembly(new MaybeIgnoreElement<T>(source));
+        return RxJavaPlugins.onAssembly(new MaybeIgnoreElement<>(source));
     }
 
     static final class IgnoreMaybeObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java
index 83ec1d278a..64fb3046ba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java
@@ -31,7 +31,7 @@ public MaybeIsEmpty(MaybeSource<T> source) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super Boolean> observer) {
-        source.subscribe(new IsEmptyMaybeObserver<T>(observer));
+        source.subscribe(new IsEmptyMaybeObserver<>(observer));
     }
 
     static final class IsEmptyMaybeObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java
index c2f3bf4428..a7fa1882b8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java
@@ -41,12 +41,12 @@ public MaybeSource<T> source() {
 
     @Override
     public Maybe<Boolean> fuseToMaybe() {
-        return RxJavaPlugins.onAssembly(new MaybeIsEmpty<T>(source));
+        return RxJavaPlugins.onAssembly(new MaybeIsEmpty<>(source));
     }
 
     @Override
     protected void subscribeActual(SingleObserver<? super Boolean> observer) {
-        source.subscribe(new IsEmptyMaybeObserver<T>(observer));
+        source.subscribe(new IsEmptyMaybeObserver<>(observer));
     }
 
     static final class IsEmptyMaybeObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java
index 02e6691578..2690bc4797 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java
@@ -34,6 +34,6 @@ public MaybeMaterialize(Maybe<T> source) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super Notification<T>> observer) {
-        source.subscribe(new MaterializeSingleObserver<T>(observer));
+        source.subscribe(new MaterializeSingleObserver<>(observer));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
index 2910a2e803..e550b16fba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
@@ -47,11 +47,11 @@ protected void subscribeActual(Subscriber<? super T> s) {
         SimpleQueueWithConsumerIndex<Object> queue;
 
         if (n <= bufferSize()) {
-            queue = new MpscFillOnceSimpleQueue<Object>(n);
+            queue = new MpscFillOnceSimpleQueue<>(n);
         } else {
-            queue = new ClqSimpleQueue<Object>();
+            queue = new ClqSimpleQueue<>();
         }
-        MergeMaybeObserver<T> parent = new MergeMaybeObserver<T>(s, n, queue);
+        MergeMaybeObserver<T> parent = new MergeMaybeObserver<>(s, n, queue);
 
         s.onSubscribe(parent);
 
@@ -110,7 +110,7 @@ public int requestFusion(int mode) {
         @Nullable
         @SuppressWarnings("unchecked")
         @Override
-        public T poll() throws Exception {
+        public T poll() {
             for (;;) {
                 Object o = queue.poll();
                 if (o != NotificationLite.COMPLETE) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java
index 0bf89494e9..7bf03b080e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java
@@ -35,7 +35,7 @@ public MaybeObserveOn(MaybeSource<T> source, Scheduler scheduler) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new ObserveOnMaybeObserver<T>(observer, scheduler));
+        source.subscribe(new ObserveOnMaybeObserver<>(observer, scheduler));
     }
 
     static final class ObserveOnMaybeObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java
index cd82570f58..8792a93cc5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java
@@ -37,7 +37,7 @@ public MaybeOnErrorComplete(MaybeSource<T> source,
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new OnErrorCompleteMaybeObserver<T>(observer, predicate));
+        source.subscribe(new OnErrorCompleteMaybeObserver<>(observer, predicate));
     }
 
     static final class OnErrorCompleteMaybeObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
index 901016f39a..434685c074 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
@@ -43,7 +43,7 @@ public MaybeOnErrorNext(MaybeSource<T> source,
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new OnErrorNextMaybeObserver<T>(observer, resumeFunction, allowFatal));
+        source.subscribe(new OnErrorNextMaybeObserver<>(observer, resumeFunction, allowFatal));
     }
 
     static final class OnErrorNextMaybeObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
index c7ab7b8524..1a75120e84 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
@@ -37,7 +37,7 @@ public MaybeOnErrorReturn(MaybeSource<T> source,
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new OnErrorReturnMaybeObserver<T>(observer, valueSupplier));
+        source.subscribe(new OnErrorReturnMaybeObserver<>(observer, valueSupplier));
     }
 
     static final class OnErrorReturnMaybeObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java
index 1b4b717367..3b5427ba0f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java
@@ -53,7 +53,7 @@ public MaybePeek(MaybeSource<T> source, Consumer<? super Disposable> onSubscribe
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new MaybePeekObserver<T>(observer, this));
+        source.subscribe(new MaybePeekObserver<>(observer, this));
     }
 
     static final class MaybePeekObserver<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java
index 8a934d5216..543b7c2b6a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java
@@ -34,10 +34,10 @@ public MaybeSubscribeOn(MaybeSource<T> source, Scheduler scheduler) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        SubscribeOnMaybeObserver<T> parent = new SubscribeOnMaybeObserver<T>(observer);
+        SubscribeOnMaybeObserver<T> parent = new SubscribeOnMaybeObserver<>(observer);
         observer.onSubscribe(parent);
 
-        parent.task.replace(scheduler.scheduleDirect(new SubscribeTask<T>(parent, source)));
+        parent.task.replace(scheduler.scheduleDirect(new SubscribeTask<>(parent, source)));
     }
 
     static final class SubscribeTask<T> implements Runnable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java
index e1b218078e..3be260441c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java
@@ -35,7 +35,7 @@ public MaybeSwitchIfEmpty(MaybeSource<T> source, MaybeSource<? extends T> other)
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new SwitchIfEmptyMaybeObserver<T>(observer, other));
+        source.subscribe(new SwitchIfEmptyMaybeObserver<>(observer, other));
     }
 
     static final class SwitchIfEmptyMaybeObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java
index 3533092a14..142e39f1f6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java
@@ -42,7 +42,7 @@ public MaybeSource<T> source() {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new SwitchIfEmptyMaybeObserver<T>(observer, other));
+        source.subscribe(new SwitchIfEmptyMaybeObserver<>(observer, other));
     }
 
     static final class SwitchIfEmptyMaybeObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java
index 9b53acf077..6c9498c065 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java
@@ -38,7 +38,7 @@ public MaybeTakeUntilMaybe(MaybeSource<T> source, MaybeSource<U> other) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        TakeUntilMainMaybeObserver<T, U> parent = new TakeUntilMainMaybeObserver<T, U>(observer);
+        TakeUntilMainMaybeObserver<T, U> parent = new TakeUntilMainMaybeObserver<>(observer);
         observer.onSubscribe(parent);
 
         other.subscribe(parent.other);
@@ -57,7 +57,7 @@ static final class TakeUntilMainMaybeObserver<T, U>
 
         TakeUntilMainMaybeObserver(MaybeObserver<? super T> downstream) {
             this.downstream = downstream;
-            this.other = new TakeUntilOtherMaybeObserver<U>(this);
+            this.other = new TakeUntilOtherMaybeObserver<>(this);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java
index 0ef77d40e2..e86cc7c324 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java
@@ -41,7 +41,7 @@ public MaybeTakeUntilPublisher(MaybeSource<T> source, Publisher<U> other) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        TakeUntilMainMaybeObserver<T, U> parent = new TakeUntilMainMaybeObserver<T, U>(observer);
+        TakeUntilMainMaybeObserver<T, U> parent = new TakeUntilMainMaybeObserver<>(observer);
         observer.onSubscribe(parent);
 
         other.subscribe(parent.other);
@@ -60,7 +60,7 @@ static final class TakeUntilMainMaybeObserver<T, U>
 
         TakeUntilMainMaybeObserver(MaybeObserver<? super T> downstream) {
             this.downstream = downstream;
-            this.other = new TakeUntilOtherMaybeObserver<U>(this);
+            this.other = new TakeUntilOtherMaybeObserver<>(this);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java
index aee0b524c2..03783489a3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java
@@ -42,7 +42,7 @@ public MaybeTimeoutMaybe(MaybeSource<T> source, MaybeSource<U> other, MaybeSourc
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        TimeoutMainMaybeObserver<T, U> parent = new TimeoutMainMaybeObserver<T, U>(observer, fallback);
+        TimeoutMainMaybeObserver<T, U> parent = new TimeoutMainMaybeObserver<>(observer, fallback);
         observer.onSubscribe(parent);
 
         other.subscribe(parent.other);
@@ -66,9 +66,9 @@ static final class TimeoutMainMaybeObserver<T, U>
 
         TimeoutMainMaybeObserver(MaybeObserver<? super T> actual, MaybeSource<? extends T> fallback) {
             this.downstream = actual;
-            this.other = new TimeoutOtherMaybeObserver<T, U>(this);
+            this.other = new TimeoutOtherMaybeObserver<>(this);
             this.fallback = fallback;
-            this.otherObserver = fallback != null ? new TimeoutFallbackMaybeObserver<T>(actual) : null;
+            this.otherObserver = fallback != null ? new TimeoutFallbackMaybeObserver<>(actual) : null;
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java
index ae1a2efd18..76545730f3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java
@@ -45,7 +45,7 @@ public MaybeTimeoutPublisher(MaybeSource<T> source, Publisher<U> other, MaybeSou
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        TimeoutMainMaybeObserver<T, U> parent = new TimeoutMainMaybeObserver<T, U>(observer, fallback);
+        TimeoutMainMaybeObserver<T, U> parent = new TimeoutMainMaybeObserver<>(observer, fallback);
         observer.onSubscribe(parent);
 
         other.subscribe(parent.other);
@@ -69,9 +69,9 @@ static final class TimeoutMainMaybeObserver<T, U>
 
         TimeoutMainMaybeObserver(MaybeObserver<? super T> actual, MaybeSource<? extends T> fallback) {
             this.downstream = actual;
-            this.other = new TimeoutOtherMaybeObserver<T, U>(this);
+            this.other = new TimeoutOtherMaybeObserver<>(this);
             this.fallback = fallback;
-            this.otherObserver = fallback != null ? new TimeoutFallbackMaybeObserver<T>(actual) : null;
+            this.otherObserver = fallback != null ? new TimeoutFallbackMaybeObserver<>(actual) : null;
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java
index 11b713265d..c31ad262ab 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java
@@ -42,7 +42,7 @@ public MaybeSource<T> source() {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new MaybeToFlowableSubscriber<T>(s));
+        source.subscribe(new MaybeToFlowableSubscriber<>(s));
     }
 
     static final class MaybeToFlowableSubscriber<T> extends DeferredScalarSubscription<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java
index 75129b3514..4b27918621 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java
@@ -52,7 +52,7 @@ protected void subscribeActual(Observer<? super T> observer) {
      * @since 2.2
      */
     public static <T> MaybeObserver<T> create(Observer<? super T> downstream) {
-        return new MaybeToObservableObserver<T>(downstream);
+        return new MaybeToObservableObserver<>(downstream);
     }
 
     static final class MaybeToObservableObserver<T> extends DeferredScalarDisposable<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java
index b6552e9726..914021c914 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java
@@ -30,7 +30,7 @@ public static <T> Function<MaybeSource<T>, Publisher<T>> instance() {
     }
 
     @Override
-    public Publisher<Object> apply(MaybeSource<Object> t) throws Exception {
-        return new MaybeToFlowable<Object>(t);
+    public Publisher<Object> apply(MaybeSource<Object> t) {
+        return new MaybeToFlowable<>(t);
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java
index c620cef68e..3199521639 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java
@@ -43,7 +43,7 @@ public MaybeSource<T> source() {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new ToSingleMaybeSubscriber<T>(observer, defaultValue));
+        source.subscribe(new ToSingleMaybeSubscriber<>(observer, defaultValue));
     }
 
     static final class ToSingleMaybeSubscriber<T> implements MaybeObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java
index 6e29ffa610..2f07161dc9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java
@@ -35,7 +35,7 @@ public MaybeUnsubscribeOn(MaybeSource<T> source, Scheduler scheduler) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new UnsubscribeOnMaybeObserver<T>(observer, scheduler));
+        source.subscribe(new UnsubscribeOnMaybeObserver<>(observer, scheduler));
     }
 
     static final class UnsubscribeOnMaybeObserver<T> extends AtomicReference<Disposable>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
index d4bf3b0a77..b155e019fc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
@@ -40,11 +40,11 @@ protected void subscribeActual(MaybeObserver<? super R> observer) {
         int n = sources.length;
 
         if (n == 1) {
-            sources[0].subscribe(new MaybeMap.MapMaybeObserver<T, R>(observer, new SingletonArrayFunc()));
+            sources[0].subscribe(new MaybeMap.MapMaybeObserver<>(observer, new SingletonArrayFunc()));
             return;
         }
 
-        ZipCoordinator<T, R> parent = new ZipCoordinator<T, R>(observer, n, zipper);
+        ZipCoordinator<T, R> parent = new ZipCoordinator<>(observer, n, zipper);
 
         observer.onSubscribe(parent);
 
@@ -82,7 +82,7 @@ static final class ZipCoordinator<T, R> extends AtomicInteger implements Disposa
             this.zipper = zipper;
             ZipMaybeObserver<T>[] o = new ZipMaybeObserver[n];
             for (int i = 0; i < n; i++) {
-                o[i] = new ZipMaybeObserver<T>(this, i);
+                o[i] = new ZipMaybeObserver<>(this, i);
             }
             this.observers = o;
             this.values = new Object[n];
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java
index 7c2d85c97b..839b373920 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java
@@ -62,11 +62,11 @@ protected void subscribeActual(MaybeObserver<? super R> observer) {
         }
 
         if (n == 1) {
-            a[0].subscribe(new MaybeMap.MapMaybeObserver<T, R>(observer, new SingletonArrayFunc()));
+            a[0].subscribe(new MaybeMap.MapMaybeObserver<>(observer, new SingletonArrayFunc()));
             return;
         }
 
-        ZipCoordinator<T, R> parent = new ZipCoordinator<T, R>(observer, n, zipper);
+        ZipCoordinator<T, R> parent = new ZipCoordinator<>(observer, n, zipper);
 
         observer.onSubscribe(parent);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java
index 28bdae282a..2a3263a50a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java
@@ -40,7 +40,7 @@ public CompletableAndThenObservable(CompletableSource source,
 
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
-        AndThenObservableObserver<R> parent = new AndThenObservableObserver<R>(observer, other);
+        AndThenObservableObserver<R> parent = new AndThenObservableObserver<>(observer, other);
         observer.onSubscribe(parent);
         source.subscribe(parent);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
index 986af99049..e4a3f36c05 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
@@ -57,7 +57,7 @@ public FlowableConcatMapCompletable(Flowable<T> source,
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        source.subscribe(new ConcatMapCompletableObserver<T>(observer, mapper, errorMode, prefetch));
+        source.subscribe(new ConcatMapCompletableObserver<>(observer, mapper, errorMode, prefetch));
     }
 
     static final class ConcatMapCompletableObserver<T>
@@ -99,7 +99,7 @@ static final class ConcatMapCompletableObserver<T>
             this.prefetch = prefetch;
             this.errors = new AtomicThrowable();
             this.inner = new ConcatMapInnerObserver(this);
-            this.queue = new SpscArrayQueue<T>(prefetch);
+            this.queue = new SpscArrayQueue<>(prefetch);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
index cd8b9fa77f..5f71148e0d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
@@ -58,7 +58,7 @@ public FlowableConcatMapMaybe(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new ConcatMapMaybeSubscriber<T, R>(s, mapper, prefetch, errorMode));
+        source.subscribe(new ConcatMapMaybeSubscriber<>(s, mapper, prefetch, errorMode));
     }
 
     static final class ConcatMapMaybeSubscriber<T, R>
@@ -113,8 +113,8 @@ static final class ConcatMapMaybeSubscriber<T, R>
             this.errorMode = errorMode;
             this.requested = new AtomicLong();
             this.errors = new AtomicThrowable();
-            this.inner = new ConcatMapMaybeObserver<R>(this);
-            this.queue = new SpscArrayQueue<T>(prefetch);
+            this.inner = new ConcatMapMaybeObserver<>(this);
+            this.queue = new SpscArrayQueue<>(prefetch);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
index 78334d4a1f..f6cd939546 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
@@ -58,7 +58,7 @@ public FlowableConcatMapSingle(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new ConcatMapSingleSubscriber<T, R>(s, mapper, prefetch, errorMode));
+        source.subscribe(new ConcatMapSingleSubscriber<>(s, mapper, prefetch, errorMode));
     }
 
     static final class ConcatMapSingleSubscriber<T, R>
@@ -113,8 +113,8 @@ static final class ConcatMapSingleSubscriber<T, R>
             this.errorMode = errorMode;
             this.requested = new AtomicLong();
             this.errors = new AtomicThrowable();
-            this.inner = new ConcatMapSingleObserver<R>(this);
-            this.queue = new SpscArrayQueue<T>(prefetch);
+            this.inner = new ConcatMapSingleObserver<>(this);
+            this.queue = new SpscArrayQueue<>(prefetch);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java
index a2d66067ab..1bc0fb709e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java
@@ -52,7 +52,7 @@ public FlowableSwitchMapCompletable(Flowable<T> source,
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        source.subscribe(new SwitchMapCompletableObserver<T>(observer, mapper, delayErrors));
+        source.subscribe(new SwitchMapCompletableObserver<>(observer, mapper, delayErrors));
     }
 
     static final class SwitchMapCompletableObserver<T> implements FlowableSubscriber<T>, Disposable {
@@ -79,7 +79,7 @@ static final class SwitchMapCompletableObserver<T> implements FlowableSubscriber
             this.mapper = mapper;
             this.delayErrors = delayErrors;
             this.errors = new AtomicThrowable();
-            this.inner = new AtomicReference<SwitchMapInnerObserver>();
+            this.inner = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java
index 11ea0a4c77..7933b4ec13 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java
@@ -54,7 +54,7 @@ public FlowableSwitchMapMaybe(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new SwitchMapMaybeSubscriber<T, R>(s, mapper, delayErrors));
+        source.subscribe(new SwitchMapMaybeSubscriber<>(s, mapper, delayErrors));
     }
 
     static final class SwitchMapMaybeSubscriber<T, R> extends AtomicInteger
@@ -75,7 +75,7 @@ static final class SwitchMapMaybeSubscriber<T, R> extends AtomicInteger
         final AtomicReference<SwitchMapMaybeObserver<R>> inner;
 
         static final SwitchMapMaybeObserver<Object> INNER_DISPOSED =
-                new SwitchMapMaybeObserver<Object>(null);
+                new SwitchMapMaybeObserver<>(null);
 
         Subscription upstream;
 
@@ -93,7 +93,7 @@ static final class SwitchMapMaybeSubscriber<T, R> extends AtomicInteger
             this.delayErrors = delayErrors;
             this.errors = new AtomicThrowable();
             this.requested = new AtomicLong();
-            this.inner = new AtomicReference<SwitchMapMaybeObserver<R>>();
+            this.inner = new AtomicReference<>();
         }
 
         @Override
@@ -125,7 +125,7 @@ public void onNext(T t) {
                 return;
             }
 
-            SwitchMapMaybeObserver<R> observer = new SwitchMapMaybeObserver<R>(this);
+            SwitchMapMaybeObserver<R> observer = new SwitchMapMaybeObserver<>(this);
 
             for (;;) {
                 current = inner.get();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java
index c41b52f6e5..4fe83126e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java
@@ -54,7 +54,7 @@ public FlowableSwitchMapSingle(Flowable<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new SwitchMapSingleSubscriber<T, R>(s, mapper, delayErrors));
+        source.subscribe(new SwitchMapSingleSubscriber<>(s, mapper, delayErrors));
     }
 
     static final class SwitchMapSingleSubscriber<T, R> extends AtomicInteger
@@ -75,7 +75,7 @@ static final class SwitchMapSingleSubscriber<T, R> extends AtomicInteger
         final AtomicReference<SwitchMapSingleObserver<R>> inner;
 
         static final SwitchMapSingleObserver<Object> INNER_DISPOSED =
-                new SwitchMapSingleObserver<Object>(null);
+                new SwitchMapSingleObserver<>(null);
 
         Subscription upstream;
 
@@ -93,7 +93,7 @@ static final class SwitchMapSingleSubscriber<T, R> extends AtomicInteger
             this.delayErrors = delayErrors;
             this.errors = new AtomicThrowable();
             this.requested = new AtomicLong();
-            this.inner = new AtomicReference<SwitchMapSingleObserver<R>>();
+            this.inner = new AtomicReference<>();
         }
 
         @Override
@@ -125,7 +125,7 @@ public void onNext(T t) {
                 return;
             }
 
-            SwitchMapSingleObserver<R> observer = new SwitchMapSingleObserver<R>(this);
+            SwitchMapSingleObserver<R> observer = new SwitchMapSingleObserver<>(this);
 
             for (;;) {
                 current = inner.get();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java
index 551b32d4b1..d9cb5592ac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java
@@ -45,17 +45,17 @@ public void onSubscribe(Disposable d) {
 
     @Override
     public void onComplete() {
-        downstream.onSuccess(Notification.<T>createOnComplete());
+        downstream.onSuccess(Notification.createOnComplete());
     }
 
     @Override
     public void onSuccess(T t) {
-        downstream.onSuccess(Notification.<T>createOnNext(t));
+        downstream.onSuccess(Notification.createOnNext(t));
     }
 
     @Override
     public void onError(Throwable e) {
-        downstream.onSuccess(Notification.<T>createOnError(e));
+        downstream.onSuccess(Notification.createOnError(e));
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
index 891c2a0f33..ae42405f74 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
@@ -44,7 +44,7 @@ public MaybeFlatMapObservable(MaybeSource<T> source,
 
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
-        FlatMapObserver<T, R> parent = new FlatMapObserver<T, R>(observer, mapper);
+        FlatMapObserver<T, R> parent = new FlatMapObserver<>(observer, mapper);
         observer.onSubscribe(parent);
         source.subscribe(parent);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
index 1ac179bcca..c590755704 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
@@ -47,7 +47,7 @@ public MaybeFlatMapPublisher(MaybeSource<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new FlatMapPublisherSubscriber<T, R>(s, mapper));
+        source.subscribe(new FlatMapPublisherSubscriber<>(s, mapper));
     }
 
     static final class FlatMapPublisherSubscriber<T, R>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
index 44f322e39d..2295f4397e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
@@ -55,7 +55,7 @@ public ObservableConcatMapCompletable(Observable<T> source,
     @Override
     protected void subscribeActual(CompletableObserver observer) {
         if (!ScalarXMapZHelper.tryAsCompletable(source, mapper, observer)) {
-            source.subscribe(new ConcatMapCompletableObserver<T>(observer, mapper, errorMode, prefetch));
+            source.subscribe(new ConcatMapCompletableObserver<>(observer, mapper, errorMode, prefetch));
         }
     }
 
@@ -120,7 +120,7 @@ public void onSubscribe(Disposable d) {
                         return;
                     }
                 }
-                queue = new SpscLinkedArrayQueue<T>(prefetch);
+                queue = new SpscLinkedArrayQueue<>(prefetch);
                 downstream.onSubscribe(this);
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
index c76b0115cb..1177d5a06e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
@@ -56,7 +56,7 @@ public ObservableConcatMapMaybe(Observable<T> source,
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
         if (!ScalarXMapZHelper.tryAsMaybe(source, mapper, observer)) {
-            source.subscribe(new ConcatMapMaybeMainObserver<T, R>(observer, mapper, prefetch, errorMode));
+            source.subscribe(new ConcatMapMaybeMainObserver<>(observer, mapper, prefetch, errorMode));
         }
     }
 
@@ -102,8 +102,8 @@ static final class ConcatMapMaybeMainObserver<T, R>
             this.mapper = mapper;
             this.errorMode = errorMode;
             this.errors = new AtomicThrowable();
-            this.inner = new ConcatMapMaybeObserver<R>(this);
-            this.queue = new SpscLinkedArrayQueue<T>(prefetch);
+            this.inner = new ConcatMapMaybeObserver<>(this);
+            this.queue = new SpscLinkedArrayQueue<>(prefetch);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
index 34d7d04734..5fc6b8a520 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
@@ -56,7 +56,7 @@ public ObservableConcatMapSingle(Observable<T> source,
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
         if (!ScalarXMapZHelper.tryAsSingle(source, mapper, observer)) {
-            source.subscribe(new ConcatMapSingleMainObserver<T, R>(observer, mapper, prefetch, errorMode));
+            source.subscribe(new ConcatMapSingleMainObserver<>(observer, mapper, prefetch, errorMode));
         }
     }
 
@@ -102,8 +102,8 @@ static final class ConcatMapSingleMainObserver<T, R>
             this.mapper = mapper;
             this.errorMode = errorMode;
             this.errors = new AtomicThrowable();
-            this.inner = new ConcatMapSingleObserver<R>(this);
-            this.queue = new SpscLinkedArrayQueue<T>(prefetch);
+            this.inner = new ConcatMapSingleObserver<>(this);
+            this.queue = new SpscLinkedArrayQueue<>(prefetch);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java
index a7a6a7fd99..bb6ec70f85 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java
@@ -50,7 +50,7 @@ public ObservableSwitchMapCompletable(Observable<T> source,
     @Override
     protected void subscribeActual(CompletableObserver observer) {
         if (!ScalarXMapZHelper.tryAsCompletable(source, mapper, observer)) {
-            source.subscribe(new SwitchMapCompletableObserver<T>(observer, mapper, delayErrors));
+            source.subscribe(new SwitchMapCompletableObserver<>(observer, mapper, delayErrors));
         }
     }
 
@@ -78,7 +78,7 @@ static final class SwitchMapCompletableObserver<T> implements Observer<T>, Dispo
             this.mapper = mapper;
             this.delayErrors = delayErrors;
             this.errors = new AtomicThrowable();
-            this.inner = new AtomicReference<SwitchMapInnerObserver>();
+            this.inner = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java
index bf3c9f43c2..f4c9bf6c0c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java
@@ -52,7 +52,7 @@ public ObservableSwitchMapMaybe(Observable<T> source,
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
         if (!ScalarXMapZHelper.tryAsMaybe(source, mapper, observer)) {
-            source.subscribe(new SwitchMapMaybeMainObserver<T, R>(observer, mapper, delayErrors));
+            source.subscribe(new SwitchMapMaybeMainObserver<>(observer, mapper, delayErrors));
         }
     }
 
@@ -72,7 +72,7 @@ static final class SwitchMapMaybeMainObserver<T, R> extends AtomicInteger
         final AtomicReference<SwitchMapMaybeObserver<R>> inner;
 
         static final SwitchMapMaybeObserver<Object> INNER_DISPOSED =
-                new SwitchMapMaybeObserver<Object>(null);
+                new SwitchMapMaybeObserver<>(null);
 
         Disposable upstream;
 
@@ -87,7 +87,7 @@ static final class SwitchMapMaybeMainObserver<T, R> extends AtomicInteger
             this.mapper = mapper;
             this.delayErrors = delayErrors;
             this.errors = new AtomicThrowable();
-            this.inner = new AtomicReference<SwitchMapMaybeObserver<R>>();
+            this.inner = new AtomicReference<>();
         }
 
         @Override
@@ -118,7 +118,7 @@ public void onNext(T t) {
                 return;
             }
 
-            SwitchMapMaybeObserver<R> observer = new SwitchMapMaybeObserver<R>(this);
+            SwitchMapMaybeObserver<R> observer = new SwitchMapMaybeObserver<>(this);
 
             for (;;) {
                 current = inner.get();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java
index bc19c88b55..f5db39d5d5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java
@@ -52,7 +52,7 @@ public ObservableSwitchMapSingle(Observable<T> source,
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
         if (!ScalarXMapZHelper.tryAsSingle(source, mapper, observer)) {
-            source.subscribe(new SwitchMapSingleMainObserver<T, R>(observer, mapper, delayErrors));
+            source.subscribe(new SwitchMapSingleMainObserver<>(observer, mapper, delayErrors));
         }
     }
 
@@ -72,7 +72,7 @@ static final class SwitchMapSingleMainObserver<T, R> extends AtomicInteger
         final AtomicReference<SwitchMapSingleObserver<R>> inner;
 
         static final SwitchMapSingleObserver<Object> INNER_DISPOSED =
-                new SwitchMapSingleObserver<Object>(null);
+                new SwitchMapSingleObserver<>(null);
 
         Disposable upstream;
 
@@ -87,7 +87,7 @@ static final class SwitchMapSingleMainObserver<T, R> extends AtomicInteger
             this.mapper = mapper;
             this.delayErrors = delayErrors;
             this.errors = new AtomicThrowable();
-            this.inner = new AtomicReference<SwitchMapSingleObserver<R>>();
+            this.inner = new AtomicReference<>();
         }
 
         @Override
@@ -118,7 +118,7 @@ public void onNext(T t) {
                 return;
             }
 
-            SwitchMapSingleObserver<R> observer = new SwitchMapSingleObserver<R>(this);
+            SwitchMapSingleObserver<R> observer = new SwitchMapSingleObserver<>(this);
 
             for (;;) {
                 current = inner.get();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
index bfb466bac1..c3dd9b59c1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
@@ -44,7 +44,7 @@ public SingleFlatMapObservable(SingleSource<T> source,
 
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
-        FlatMapObserver<T, R> parent = new FlatMapObserver<T, R>(observer, mapper);
+        FlatMapObserver<T, R> parent = new FlatMapObserver<>(observer, mapper);
         observer.onSubscribe(parent);
         source.subscribe(parent);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java
index 0ba2da1720..dce3e2bc21 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java
@@ -35,7 +35,7 @@ public BlockingObservableIterable(ObservableSource<? extends T> source, int buff
 
     @Override
     public Iterator<T> iterator() {
-        BlockingObservableIterator<T> it = new BlockingObservableIterator<T>(bufferSize);
+        BlockingObservableIterator<T> it = new BlockingObservableIterator<>(bufferSize);
         source.subscribe(it);
         return it;
     }
@@ -56,7 +56,7 @@ static final class BlockingObservableIterator<T>
         volatile Throwable error;
 
         BlockingObservableIterator(int batchSize) {
-            this.queue = new SpscLinkedArrayQueue<T>(batchSize);
+            this.queue = new SpscLinkedArrayQueue<>(batchSize);
             this.lock = new ReentrantLock();
             this.condition = lock.newCondition();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java
index aaa975dbf7..e431db42a7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java
@@ -38,7 +38,7 @@ public BlockingObservableLatest(ObservableSource<T> source) {
 
     @Override
     public Iterator<T> iterator() {
-        BlockingObservableLatestIterator<T> lio = new BlockingObservableLatestIterator<T>();
+        BlockingObservableLatestIterator<T> lio = new BlockingObservableLatestIterator<>();
 
         Observable<Notification<T>> materialized = Observable.wrap(source).materialize();
 
@@ -52,7 +52,7 @@ static final class BlockingObservableLatestIterator<T> extends DisposableObserve
 
         final Semaphore notify = new Semaphore(0);
         // observer's notification
-        final AtomicReference<Notification<T>> value = new AtomicReference<Notification<T>>();
+        final AtomicReference<Notification<T>> value = new AtomicReference<>();
 
         @Override
         public void onNext(Notification<T> args) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java
index 20408d2607..1332351cac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java
@@ -40,7 +40,7 @@ public BlockingObservableMostRecent(ObservableSource<T> source, T initialValue)
 
     @Override
     public Iterator<T> iterator() {
-        MostRecentObserver<T> mostRecentObserver = new MostRecentObserver<T>(initialValue);
+        MostRecentObserver<T> mostRecentObserver = new MostRecentObserver<>(initialValue);
 
         source.subscribe(mostRecentObserver);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java
index 1d5cca354b..53aed40999 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java
@@ -39,8 +39,8 @@ public BlockingObservableNext(ObservableSource<T> source) {
 
     @Override
     public Iterator<T> iterator() {
-        NextObserver<T> nextObserver = new NextObserver<T>();
-        return new NextIterator<T>(source, nextObserver);
+        NextObserver<T> nextObserver = new NextObserver<>();
+        return new NextIterator<>(source, nextObserver);
     }
 
     // test needs to access the observer.waiting flag
@@ -80,7 +80,7 @@ private boolean moveToNext() {
                 started = true;
                 // if not started, start now
                 observer.setWaiting();
-                new ObservableMaterialize<T>(items).subscribe(observer);
+                new ObservableMaterialize<>(items).subscribe(observer);
             }
 
             Notification<T> nextNotification;
@@ -130,7 +130,7 @@ public void remove() {
     }
 
     static final class NextObserver<T> extends DisposableObserver<Notification<T>> {
-        private final BlockingQueue<Notification<T>> buf = new ArrayBlockingQueue<Notification<T>>(1);
+        private final BlockingQueue<Notification<T>> buf = new ArrayBlockingQueue<>(1);
         final AtomicInteger waiting = new AtomicInteger();
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java
index a28da3650d..3f62b4732c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java
@@ -28,7 +28,7 @@ public ObservableAll(ObservableSource<T> source, Predicate<? super T> predicate)
 
     @Override
     protected void subscribeActual(Observer<? super Boolean> t) {
-        source.subscribe(new AllObserver<T>(t, predicate));
+        source.subscribe(new AllObserver<>(t, predicate));
     }
 
     static final class AllObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java
index db004ef966..8c167d4c47 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java
@@ -31,12 +31,12 @@ public ObservableAllSingle(ObservableSource<T> source, Predicate<? super T> pred
 
     @Override
     protected void subscribeActual(SingleObserver<? super Boolean> t) {
-        source.subscribe(new AllObserver<T>(t, predicate));
+        source.subscribe(new AllObserver<>(t, predicate));
     }
 
     @Override
     public Observable<Boolean> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableAll<T>(source, predicate));
+        return RxJavaPlugins.onAssembly(new ObservableAll<>(source, predicate));
     }
 
     static final class AllObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java
index aa8fae849d..8bc43aa41c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java
@@ -68,7 +68,7 @@ public void subscribeActual(Observer<? super T> observer) {
             return;
         }
 
-        AmbCoordinator<T> ac = new AmbCoordinator<T>(observer, count);
+        AmbCoordinator<T> ac = new AmbCoordinator<>(observer, count);
         ac.subscribe(sources);
     }
 
@@ -88,7 +88,7 @@ public void subscribe(ObservableSource<? extends T>[] sources) {
             AmbInnerObserver<T>[] as = observers;
             int len = as.length;
             for (int i = 0; i < len; i++) {
-                as[i] = new AmbInnerObserver<T>(this, i + 1, downstream);
+                as[i] = new AmbInnerObserver<>(this, i + 1, downstream);
             }
             winner.lazySet(0); // release the contents of 'as'
             downstream.onSubscribe(this);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java
index 69d3298d40..bda497f7ed 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java
@@ -28,7 +28,7 @@ public ObservableAny(ObservableSource<T> source, Predicate<? super T> predicate)
 
     @Override
     protected void subscribeActual(Observer<? super Boolean> t) {
-        source.subscribe(new AnyObserver<T>(t, predicate));
+        source.subscribe(new AnyObserver<>(t, predicate));
     }
 
     static final class AnyObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java
index d3c3e495a5..6e263a0d48 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java
@@ -32,12 +32,12 @@ public ObservableAnySingle(ObservableSource<T> source, Predicate<? super T> pred
 
     @Override
     protected void subscribeActual(SingleObserver<? super Boolean> t) {
-        source.subscribe(new AnyObserver<T>(t, predicate));
+        source.subscribe(new AnyObserver<>(t, predicate));
     }
 
     @Override
     public Observable<Boolean> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableAny<T>(source, predicate));
+        return RxJavaPlugins.onAssembly(new ObservableAny<>(source, predicate));
     }
 
     static final class AnyObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
index c02bcfca88..2c88f007e9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
@@ -41,9 +41,9 @@ private ObservableBlockingSubscribe() {
      * @param <T> the value type
      */
     public static <T> void subscribe(ObservableSource<? extends T> o, Observer<? super T> observer) {
-        final BlockingQueue<Object> queue = new LinkedBlockingQueue<Object>();
+        final BlockingQueue<Object> queue = new LinkedBlockingQueue<>();
 
-        BlockingObserver<T> bs = new BlockingObserver<T>(queue);
+        BlockingObserver<T> bs = new BlockingObserver<>(queue);
         observer.onSubscribe(bs);
 
         o.subscribe(bs);
@@ -76,7 +76,7 @@ public static <T> void subscribe(ObservableSource<? extends T> o, Observer<? sup
      */
     public static <T> void subscribe(ObservableSource<? extends T> o) {
         BlockingIgnoringReceiver callback = new BlockingIgnoringReceiver();
-        LambdaObserver<T> ls = new LambdaObserver<T>(Functions.emptyConsumer(),
+        LambdaObserver<T> ls = new LambdaObserver<>(Functions.emptyConsumer(),
         callback, callback, Functions.emptyConsumer());
 
         o.subscribe(ls);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
index bd7f4b1baa..2688212575 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
@@ -39,12 +39,12 @@ public ObservableBuffer(ObservableSource<T> source, int count, int skip, Supplie
     @Override
     protected void subscribeActual(Observer<? super U> t) {
         if (skip == count) {
-            BufferExactObserver<T, U> bes = new BufferExactObserver<T, U>(t, count, bufferSupplier);
+            BufferExactObserver<T, U> bes = new BufferExactObserver<>(t, count, bufferSupplier);
             if (bes.createBuffer()) {
                 source.subscribe(bes);
             }
         } else {
-            source.subscribe(new BufferSkipObserver<T, U>(t, count, skip, bufferSupplier));
+            source.subscribe(new BufferSkipObserver<>(t, count, skip, bufferSupplier));
         }
     }
 
@@ -157,7 +157,7 @@ static final class BufferSkipObserver<T, U extends Collection<? super T>>
             this.count = count;
             this.skip = skip;
             this.bufferSupplier = bufferSupplier;
-            this.buffers = new ArrayDeque<U>();
+            this.buffers = new ArrayDeque<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
index cef9ef41d8..4b0027f4fe 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
@@ -43,7 +43,7 @@ public ObservableBufferBoundary(ObservableSource<T> source, ObservableSource<? e
     @Override
     protected void subscribeActual(Observer<? super U> t) {
         BufferBoundaryObserver<T, U, Open, Close> parent =
-            new BufferBoundaryObserver<T, U, Open, Close>(
+            new BufferBoundaryObserver<>(
                 t, bufferOpen, bufferClose, bufferSupplier
             );
         t.onSubscribe(parent);
@@ -88,10 +88,10 @@ static final class BufferBoundaryObserver<T, C extends Collection<? super T>, Op
             this.bufferSupplier = bufferSupplier;
             this.bufferOpen = bufferOpen;
             this.bufferClose = bufferClose;
-            this.queue = new SpscLinkedArrayQueue<C>(bufferSize());
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize());
             this.observers = new CompositeDisposable();
-            this.upstream = new AtomicReference<Disposable>();
-            this.buffers = new LinkedHashMap<Long, C>();
+            this.upstream = new AtomicReference<>();
+            this.buffers = new LinkedHashMap<>();
             this.errors = new AtomicThrowable();
         }
 
@@ -99,7 +99,7 @@ static final class BufferBoundaryObserver<T, C extends Collection<? super T>, Op
         public void onSubscribe(Disposable d) {
             if (DisposableHelper.setOnce(this.upstream, d)) {
 
-                BufferOpenObserver<Open> open = new BufferOpenObserver<Open>(this);
+                BufferOpenObserver<Open> open = new BufferOpenObserver<>(this);
                 observers.add(open);
 
                 bufferOpen.subscribe(open);
@@ -190,7 +190,7 @@ void open(Open token) {
                 bufs.put(idx, buf);
             }
 
-            BufferCloseObserver<T, C> bc = new BufferCloseObserver<T, C>(this, idx);
+            BufferCloseObserver<T, C> bc = new BufferCloseObserver<>(this, idx);
             observers.add(bc);
             p.subscribe(bc);
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
index 7d76354cf9..849222505e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
@@ -39,7 +39,7 @@ public ObservableBufferExactBoundary(ObservableSource<T> source, ObservableSourc
 
     @Override
     protected void subscribeActual(Observer<? super U> t) {
-        source.subscribe(new BufferExactBoundaryObserver<T, U, B>(new SerializedObserver<U>(t), bufferSupplier, boundary));
+        source.subscribe(new BufferExactBoundaryObserver<>(new SerializedObserver<>(t), bufferSupplier, boundary));
     }
 
     static final class BufferExactBoundaryObserver<T, U extends Collection<? super T>, B>
@@ -56,7 +56,7 @@ static final class BufferExactBoundaryObserver<T, U extends Collection<? super T
 
         BufferExactBoundaryObserver(Observer<? super U> actual, Supplier<U> bufferSupplier,
                                              ObservableSource<B> boundary) {
-            super(actual, new MpscLinkedQueue<U>());
+            super(actual, new MpscLinkedQueue<>());
             this.bufferSupplier = bufferSupplier;
             this.boundary = boundary;
         }
@@ -80,7 +80,7 @@ public void onSubscribe(Disposable d) {
 
                 buffer = b;
 
-                BufferBoundaryObserver<T, U, B> bs = new BufferBoundaryObserver<T, U, B>(this);
+                BufferBoundaryObserver<T, U, B> bs = new BufferBoundaryObserver<>(this);
                 other = bs;
 
                 downstream.onSubscribe(this);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
index 3b12c3d0f5..8a7becc241 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
@@ -55,16 +55,16 @@ public ObservableBufferTimed(ObservableSource<T> source, long timespan, long tim
     @Override
     protected void subscribeActual(Observer<? super U> t) {
         if (timespan == timeskip && maxSize == Integer.MAX_VALUE) {
-            source.subscribe(new BufferExactUnboundedObserver<T, U>(
-                    new SerializedObserver<U>(t),
+            source.subscribe(new BufferExactUnboundedObserver<>(
+                    new SerializedObserver<>(t),
                     bufferSupplier, timespan, unit, scheduler));
             return;
         }
         Scheduler.Worker w = scheduler.createWorker();
 
         if (timespan == timeskip) {
-            source.subscribe(new BufferExactBoundedObserver<T, U>(
-                    new SerializedObserver<U>(t),
+            source.subscribe(new BufferExactBoundedObserver<>(
+                    new SerializedObserver<>(t),
                     bufferSupplier,
                     timespan, unit, maxSize, restartTimerOnMaxSize, w
             ));
@@ -72,8 +72,8 @@ protected void subscribeActual(Observer<? super U> t) {
         }
         // Can't use maxSize because what to do if a buffer is full but its
         // timespan hasn't been elapsed?
-        source.subscribe(new BufferSkipBoundedObserver<T, U>(
-                new SerializedObserver<U>(t),
+        source.subscribe(new BufferSkipBoundedObserver<>(
+                new SerializedObserver<>(t),
                 bufferSupplier, timespan, timeskip, unit, w));
 
     }
@@ -89,12 +89,12 @@ static final class BufferExactUnboundedObserver<T, U extends Collection<? super
 
         U buffer;
 
-        final AtomicReference<Disposable> timer = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> timer = new AtomicReference<>();
 
         BufferExactUnboundedObserver(
                 Observer<? super U> actual, Supplier<U> bufferSupplier,
                 long timespan, TimeUnit unit, Scheduler scheduler) {
-            super(actual, new MpscLinkedQueue<U>());
+            super(actual, new MpscLinkedQueue<>());
             this.bufferSupplier = bufferSupplier;
             this.timespan = timespan;
             this.unit = unit;
@@ -228,13 +228,13 @@ static final class BufferSkipBoundedObserver<T, U extends Collection<? super T>>
         BufferSkipBoundedObserver(Observer<? super U> actual,
                 Supplier<U> bufferSupplier, long timespan,
                 long timeskip, TimeUnit unit, Worker w) {
-            super(actual, new MpscLinkedQueue<U>());
+            super(actual, new MpscLinkedQueue<>());
             this.bufferSupplier = bufferSupplier;
             this.timespan = timespan;
             this.timeskip = timeskip;
             this.unit = unit;
             this.w = w;
-            this.buffers = new LinkedList<U>();
+            this.buffers = new LinkedList<>();
         }
 
         @Override
@@ -285,7 +285,7 @@ public void onError(Throwable t) {
         public void onComplete() {
             List<U> bs;
             synchronized (this) {
-                bs = new ArrayList<U>(buffers);
+                bs = new ArrayList<>(buffers);
                 buffers.clear();
             }
 
@@ -409,7 +409,7 @@ static final class BufferExactBoundedObserver<T, U extends Collection<? super T>
                 Supplier<U> bufferSupplier,
                 long timespan, TimeUnit unit, int maxSize,
                 boolean restartOnMaxSize, Worker w) {
-            super(actual, new MpscLinkedQueue<U>());
+            super(actual, new MpscLinkedQueue<>());
             this.bufferSupplier = bufferSupplier;
             this.timespan = timespan;
             this.unit = unit;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
index d03ad2008e..c3e7447e6e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
@@ -95,15 +95,15 @@ public ObservableCache(Observable<T> source, int capacityHint) {
         super(source);
         this.capacityHint = capacityHint;
         this.once = new AtomicBoolean();
-        Node<T> n = new Node<T>(capacityHint);
+        Node<T> n = new Node<>(capacityHint);
         this.head = n;
         this.tail = n;
-        this.observers = new AtomicReference<CacheDisposable<T>[]>(EMPTY);
+        this.observers = new AtomicReference<>(EMPTY);
     }
 
     @Override
     protected void subscribeActual(Observer<? super T> t) {
-        CacheDisposable<T> consumer = new CacheDisposable<T>(t, this);
+        CacheDisposable<T> consumer = new CacheDisposable<>(t, this);
         t.onSubscribe(consumer);
         add(consumer);
 
@@ -292,7 +292,7 @@ public void onNext(T t) {
         int tailOffset = this.tailOffset;
         // if the current tail node is full, create a fresh node
         if (tailOffset == capacityHint) {
-            Node<T> n = new Node<T>(tailOffset);
+            Node<T> n = new Node<>(tailOffset);
             n.values[0] = t;
             this.tailOffset = 1;
             tail.next = n;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
index 76b03eddb6..6bddb34aac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
@@ -43,7 +43,7 @@ protected void subscribeActual(Observer<? super U> t) {
             return;
         }
 
-        source.subscribe(new CollectObserver<T, U>(t, u, collector));
+        source.subscribe(new CollectObserver<>(t, u, collector));
 
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
index 07db8d5bf3..82f8923de3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
@@ -47,12 +47,12 @@ protected void subscribeActual(SingleObserver<? super U> t) {
             return;
         }
 
-        source.subscribe(new CollectObserver<T, U>(t, u, collector));
+        source.subscribe(new CollectObserver<>(t, u, collector));
     }
 
     @Override
     public Observable<U> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableCollect<T, U>(source, initialSupplier, collector));
+        return RxJavaPlugins.onAssembly(new ObservableCollect<>(source, initialSupplier, collector));
     }
 
     static final class CollectObserver<T, U> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
index 0cc8e3e45e..34dce80431 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
@@ -66,7 +66,7 @@ public void subscribeActual(Observer<? super R> observer) {
             return;
         }
 
-        LatestCoordinator<T, R> lc = new LatestCoordinator<T, R>(observer, combiner, count, bufferSize, delayError);
+        LatestCoordinator<T, R> lc = new LatestCoordinator<>(observer, combiner, count, bufferSize, delayError);
         lc.subscribe(sources);
     }
 
@@ -99,10 +99,10 @@ static final class LatestCoordinator<T, R> extends AtomicInteger implements Disp
             this.latest = new Object[count];
             CombinerObserver<T, R>[] as = new CombinerObserver[count];
             for (int i = 0; i < count; i++) {
-                as[i] = new CombinerObserver<T, R>(this, i);
+                as[i] = new CombinerObserver<>(this, i);
             }
             this.observers = as;
-            this.queue = new SpscLinkedArrayQueue<Object[]>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
         }
 
         public void subscribe(ObservableSource<? extends T>[] sources) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
index b96b1ec8a0..9b03b9fc35 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
@@ -48,10 +48,10 @@ public void subscribeActual(Observer<? super U> observer) {
         }
 
         if (delayErrors == ErrorMode.IMMEDIATE) {
-            SerializedObserver<U> serial = new SerializedObserver<U>(observer);
-            source.subscribe(new SourceObserver<T, U>(serial, mapper, bufferSize));
+            SerializedObserver<U> serial = new SerializedObserver<>(observer);
+            source.subscribe(new SourceObserver<>(serial, mapper, bufferSize));
         } else {
-            source.subscribe(new ConcatMapDelayErrorObserver<T, U>(observer, mapper, bufferSize, delayErrors == ErrorMode.END));
+            source.subscribe(new ConcatMapDelayErrorObserver<>(observer, mapper, bufferSize, delayErrors == ErrorMode.END));
         }
     }
 
@@ -80,7 +80,7 @@ static final class SourceObserver<T, U> extends AtomicInteger implements Observe
             this.downstream = actual;
             this.mapper = mapper;
             this.bufferSize = bufferSize;
-            this.inner = new InnerObserver<U>(actual, this);
+            this.inner = new InnerObserver<>(actual, this);
         }
 
         @Override
@@ -113,7 +113,7 @@ public void onSubscribe(Disposable d) {
                     }
                 }
 
-                queue = new SpscLinkedArrayQueue<T>(bufferSize);
+                queue = new SpscLinkedArrayQueue<>(bufferSize);
 
                 downstream.onSubscribe(this);
             }
@@ -305,7 +305,7 @@ static final class ConcatMapDelayErrorObserver<T, R>
             this.bufferSize = bufferSize;
             this.tillTheEnd = tillTheEnd;
             this.errors = new AtomicThrowable();
-            this.observer = new DelayErrorInnerObserver<R>(actual, this);
+            this.observer = new DelayErrorInnerObserver<>(actual, this);
         }
 
         @Override
@@ -338,7 +338,7 @@ public void onSubscribe(Disposable d) {
                     }
                 }
 
-                queue = new SpscLinkedArrayQueue<T>(bufferSize);
+                queue = new SpscLinkedArrayQueue<>(bufferSize);
 
                 downstream.onSubscribe(this);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
index fe2bed8c8c..792940b5e0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
@@ -50,7 +50,7 @@ public ObservableConcatMapEager(ObservableSource<T> source,
 
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
-        source.subscribe(new ConcatMapEagerMainObserver<T, R>(observer, mapper, maxConcurrency, prefetch, errorMode));
+        source.subscribe(new ConcatMapEagerMainObserver<>(observer, mapper, maxConcurrency, prefetch, errorMode));
     }
 
     static final class ConcatMapEagerMainObserver<T, R>
@@ -96,7 +96,7 @@ static final class ConcatMapEagerMainObserver<T, R>
             this.prefetch = prefetch;
             this.errorMode = errorMode;
             this.errors = new AtomicThrowable();
-            this.observers = new ArrayDeque<InnerQueuedObserver<R>>();
+            this.observers = new ArrayDeque<>();
         }
 
         @SuppressWarnings("unchecked")
@@ -129,7 +129,7 @@ public void onSubscribe(Disposable d) {
                     }
                 }
 
-                queue = new SpscLinkedArrayQueue<T>(prefetch);
+                queue = new SpscLinkedArrayQueue<>(prefetch);
 
                 downstream.onSubscribe(this);
             }
@@ -282,7 +282,7 @@ public void drain() {
                         return;
                     }
 
-                    InnerQueuedObserver<R> inner = new InnerQueuedObserver<R>(this, prefetch);
+                    InnerQueuedObserver<R> inner = new InnerQueuedObserver<>(this, prefetch);
 
                     observers.offer(inner);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
index f45dd92f1f..b4cd8352b5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
@@ -48,10 +48,10 @@ public ObservableConcatMapScheduler(ObservableSource<T> source, Function<? super
     @Override
     public void subscribeActual(Observer<? super U> observer) {
         if (delayErrors == ErrorMode.IMMEDIATE) {
-            SerializedObserver<U> serial = new SerializedObserver<U>(observer);
-            source.subscribe(new ConcatMapObserver<T, U>(serial, mapper, bufferSize, scheduler.createWorker()));
+            SerializedObserver<U> serial = new SerializedObserver<>(observer);
+            source.subscribe(new ConcatMapObserver<>(serial, mapper, bufferSize, scheduler.createWorker()));
         } else {
-            source.subscribe(new ConcatMapDelayErrorObserver<T, U>(observer, mapper, bufferSize, delayErrors == ErrorMode.END, scheduler.createWorker()));
+            source.subscribe(new ConcatMapDelayErrorObserver<>(observer, mapper, bufferSize, delayErrors == ErrorMode.END, scheduler.createWorker()));
         }
     }
 
@@ -81,7 +81,7 @@ static final class ConcatMapObserver<T, U> extends AtomicInteger implements Obse
             this.downstream = actual;
             this.mapper = mapper;
             this.bufferSize = bufferSize;
-            this.inner = new InnerObserver<U>(actual, this);
+            this.inner = new InnerObserver<>(actual, this);
             this.worker = worker;
         }
 
@@ -115,7 +115,7 @@ public void onSubscribe(Disposable d) {
                     }
                 }
 
-                queue = new SpscLinkedArrayQueue<T>(bufferSize);
+                queue = new SpscLinkedArrayQueue<>(bufferSize);
 
                 downstream.onSubscribe(this);
             }
@@ -318,7 +318,7 @@ static final class ConcatMapDelayErrorObserver<T, R>
             this.bufferSize = bufferSize;
             this.tillTheEnd = tillTheEnd;
             this.errors = new AtomicThrowable();
-            this.observer = new DelayErrorInnerObserver<R>(actual, this);
+            this.observer = new DelayErrorInnerObserver<>(actual, this);
             this.worker = worker;
         }
 
@@ -352,7 +352,7 @@ public void onSubscribe(Disposable d) {
                     }
                 }
 
-                queue = new SpscLinkedArrayQueue<T>(bufferSize);
+                queue = new SpscLinkedArrayQueue<>(bufferSize);
 
                 downstream.onSubscribe(this);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java
index 333428a80b..4ffc8f5490 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java
@@ -37,7 +37,7 @@ public ObservableConcatWithCompletable(Observable<T> source, CompletableSource o
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new ConcatWithObserver<T>(observer, other));
+        source.subscribe(new ConcatWithObserver<>(observer, other));
     }
 
     static final class ConcatWithObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java
index 7f3d8d8716..19af4e5641 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java
@@ -37,7 +37,7 @@ public ObservableConcatWithMaybe(Observable<T> source, MaybeSource<? extends T>
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new ConcatWithObserver<T>(observer, other));
+        source.subscribe(new ConcatWithObserver<>(observer, other));
     }
 
     static final class ConcatWithObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java
index 3c91beb30f..b2e1860110 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java
@@ -37,7 +37,7 @@ public ObservableConcatWithSingle(Observable<T> source, SingleSource<? extends T
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new ConcatWithObserver<T>(observer, other));
+        source.subscribe(new ConcatWithObserver<>(observer, other));
     }
 
     static final class ConcatWithObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java
index 84042bfbea..5796519f74 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java
@@ -32,7 +32,7 @@ public void subscribeActual(SingleObserver<? super Long> t) {
 
     @Override
     public Observable<Long> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableCount<T>(source));
+        return RxJavaPlugins.onAssembly(new ObservableCount<>(source));
     }
 
     static final class CountObserver implements Observer<Object>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
index fe1f394ff3..66445bc8d1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
@@ -33,7 +33,7 @@ public ObservableCreate(ObservableOnSubscribe<T> source) {
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        CreateEmitter<T> parent = new CreateEmitter<T>(observer);
+        CreateEmitter<T> parent = new CreateEmitter<>(observer);
         observer.onSubscribe(parent);
 
         try {
@@ -113,7 +113,7 @@ public void setCancellable(Cancellable c) {
 
         @Override
         public ObservableEmitter<T> serialize() {
-            return new SerializedEmitter<T>(this);
+            return new SerializedEmitter<>(this);
         }
 
         @Override
@@ -154,7 +154,7 @@ static final class SerializedEmitter<T>
         SerializedEmitter(ObservableEmitter<T> emitter) {
             this.emitter = emitter;
             this.errors = new AtomicThrowable();
-            this.queue = new SpscLinkedArrayQueue<T>(16);
+            this.queue = new SpscLinkedArrayQueue<>(16);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java
index 20f98731c1..16f882d6c5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java
@@ -34,7 +34,7 @@ public ObservableDebounce(ObservableSource<T> source, Function<? super T, ? exte
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new DebounceObserver<T, U>(new SerializedObserver<T>(t), debounceSelector));
+        source.subscribe(new DebounceObserver<>(new SerializedObserver<>(t), debounceSelector));
     }
 
     static final class DebounceObserver<T, U>
@@ -44,7 +44,7 @@ static final class DebounceObserver<T, U>
 
         Disposable upstream;
 
-        final AtomicReference<Disposable> debouncer = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> debouncer = new AtomicReference<>();
 
         volatile long index;
 
@@ -89,7 +89,7 @@ public void onNext(T t) {
                 return;
             }
 
-            DebounceInnerObserver<T, U> dis = new DebounceInnerObserver<T, U>(this, idx, t);
+            DebounceInnerObserver<T, U> dis = new DebounceInnerObserver<>(this, idx, t);
 
             if (debouncer.compareAndSet(d, dis)) {
                 p.subscribe(dis);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
index 626fe77928..b0b19ef0dc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
@@ -37,8 +37,8 @@ public ObservableDebounceTimed(ObservableSource<T> source, long timeout, TimeUni
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new DebounceTimedObserver<T>(
-                new SerializedObserver<T>(t),
+        source.subscribe(new DebounceTimedObserver<>(
+                new SerializedObserver<>(t),
                 timeout, unit, scheduler.createWorker()));
     }
 
@@ -85,7 +85,7 @@ public void onNext(T t) {
                 d.dispose();
             }
 
-            DebounceEmitter<T> de = new DebounceEmitter<T>(t, idx, this);
+            DebounceEmitter<T> de = new DebounceEmitter<>(t, idx, this);
             timer = de;
             d = worker.schedule(de, timeout, unit);
             de.setResource(d);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java
index 61e424a3eb..93cbb00389 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java
@@ -42,12 +42,12 @@ public void subscribeActual(Observer<? super T> t) {
         if (delayError) {
             observer = (Observer<T>)t;
         } else {
-            observer = new SerializedObserver<T>(t);
+            observer = new SerializedObserver<>(t);
         }
 
         Scheduler.Worker w = scheduler.createWorker();
 
-        source.subscribe(new DelayObserver<T>(observer, delay, unit, w, delayError));
+        source.subscribe(new DelayObserver<>(observer, delay, unit, w, delayError));
     }
 
     static final class DelayObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java
index 45b42e1ecc..37f5fdadd8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java
@@ -33,7 +33,7 @@ public ObservableDematerialize(ObservableSource<T> source, Function<? super T, ?
 
     @Override
     public void subscribeActual(Observer<? super R> observer) {
-        source.subscribe(new DematerializeObserver<T, R>(observer, selector));
+        source.subscribe(new DematerializeObserver<>(observer, selector));
     }
 
     static final class DematerializeObserver<T, R> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java
index 7665a6b4f8..763fcdde97 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java
@@ -32,7 +32,7 @@ public ObservableDetach(ObservableSource<T> source) {
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new DetachObserver<T>(observer));
+        source.subscribe(new DetachObserver<>(observer));
     }
 
     static final class DetachObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java
index aadeafb2b1..cd766ef559 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java
@@ -49,7 +49,7 @@ protected void subscribeActual(Observer<? super T> observer) {
             return;
         }
 
-        source.subscribe(new DistinctObserver<T, K>(observer, keySelector, collection));
+        source.subscribe(new DistinctObserver<>(observer, keySelector, collection));
     }
 
     static final class DistinctObserver<T, K> extends BasicFuseableObserver<T, T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java
index a36e92a3c4..f18e47030d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java
@@ -32,7 +32,7 @@ public ObservableDistinctUntilChanged(ObservableSource<T> source, Function<? sup
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new DistinctUntilChangedObserver<T, K>(observer, keySelector, comparer));
+        source.subscribe(new DistinctUntilChangedObserver<>(observer, keySelector, comparer));
     }
 
     static final class DistinctUntilChangedObserver<T, K> extends BasicFuseableObserver<T, T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java
index 212b84fccc..91051e7562 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java
@@ -35,7 +35,7 @@ public ObservableDoAfterNext(ObservableSource<T> source, Consumer<? super T> onA
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new DoAfterObserver<T>(observer, onAfterNext));
+        source.subscribe(new DoAfterObserver<>(observer, onAfterNext));
     }
 
     static final class DoAfterObserver<T> extends BasicFuseableObserver<T, T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java
index e5087d0ee4..8c7ee32d09 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java
@@ -40,7 +40,7 @@ public ObservableDoFinally(ObservableSource<T> source, Action onFinally) {
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new DoFinallyObserver<T>(observer, onFinally));
+        source.subscribe(new DoFinallyObserver<>(observer, onFinally));
     }
 
     static final class DoFinallyObserver<T> extends BasicIntQueueDisposable<T> implements Observer<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java
index bbc34fed83..ff884192fa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java
@@ -39,7 +39,7 @@ public ObservableDoOnEach(ObservableSource<T> source, Consumer<? super T> onNext
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new DoOnEachObserver<T>(t, onNext, onError, onComplete, onAfterTerminate));
+        source.subscribe(new DoOnEachObserver<>(t, onNext, onError, onComplete, onAfterTerminate));
     }
 
     static final class DoOnEachObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java
index b59cfdca64..835cd886b2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java
@@ -30,6 +30,6 @@ public ObservableDoOnLifecycle(Observable<T> upstream, Consumer<? super Disposab
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new DisposableLambdaObserver<T>(observer, onSubscribe, onDispose));
+        source.subscribe(new DisposableLambdaObserver<>(observer, onSubscribe, onDispose));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java
index 28ff883d03..b8d042a532 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java
@@ -34,7 +34,7 @@ public ObservableElementAt(ObservableSource<T> source, long index, T defaultValu
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new ElementAtObserver<T>(t, index, defaultValue, errorOnFewer));
+        source.subscribe(new ElementAtObserver<>(t, index, defaultValue, errorOnFewer));
     }
 
     static final class ElementAtObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java
index ad987cccd2..53b1312092 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java
@@ -29,12 +29,12 @@ public ObservableElementAtMaybe(ObservableSource<T> source, long index) {
 
     @Override
     public void subscribeActual(MaybeObserver<? super T> t) {
-        source.subscribe(new ElementAtObserver<T>(t, index));
+        source.subscribe(new ElementAtObserver<>(t, index));
     }
 
     @Override
     public Observable<T> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableElementAt<T>(source, index, null, false));
+        return RxJavaPlugins.onAssembly(new ObservableElementAt<>(source, index, null, false));
     }
 
     static final class ElementAtObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java
index 397e678265..bb006ca2dd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java
@@ -34,12 +34,12 @@ public ObservableElementAtSingle(ObservableSource<T> source, long index, T defau
 
     @Override
     public void subscribeActual(SingleObserver<? super T> t) {
-        source.subscribe(new ElementAtObserver<T>(t, index, defaultValue));
+        source.subscribe(new ElementAtObserver<>(t, index, defaultValue));
     }
 
     @Override
     public Observable<T> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableElementAt<T>(source, index, defaultValue, true));
+        return RxJavaPlugins.onAssembly(new ObservableElementAt<>(source, index, defaultValue, true));
     }
 
     static final class ElementAtObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java
index 3bbacc6250..51fec2cc68 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java
@@ -27,7 +27,7 @@ public ObservableFilter(ObservableSource<T> source, Predicate<? super T> predica
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new FilterObserver<T>(observer, predicate));
+        source.subscribe(new FilterObserver<>(observer, predicate));
     }
 
     static final class FilterObserver<T> extends BasicFuseableObserver<T, T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
index 7e01d7cbc1..a169627ed3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
@@ -50,7 +50,7 @@ public void subscribeActual(Observer<? super U> t) {
             return;
         }
 
-        source.subscribe(new MergeObserver<T, U>(t, mapper, delayErrors, maxConcurrency, bufferSize));
+        source.subscribe(new MergeObserver<>(t, mapper, delayErrors, maxConcurrency, bufferSize));
     }
 
     static final class MergeObserver<T, U> extends AtomicInteger implements Disposable, Observer<T> {
@@ -95,9 +95,9 @@ static final class MergeObserver<T, U> extends AtomicInteger implements Disposab
             this.maxConcurrency = maxConcurrency;
             this.bufferSize = bufferSize;
             if (maxConcurrency != Integer.MAX_VALUE) {
-                sources = new ArrayDeque<ObservableSource<? extends U>>(maxConcurrency);
+                sources = new ArrayDeque<>(maxConcurrency);
             }
-            this.observers = new AtomicReference<InnerObserver<?, ?>[]>(EMPTY);
+            this.observers = new AtomicReference<>(EMPTY);
         }
 
         @Override
@@ -158,7 +158,7 @@ void subscribeInner(ObservableSource<? extends U> p) {
                         break;
                     }
                 } else {
-                    InnerObserver<T, U> inner = new InnerObserver<T, U>(this, uniqueId++);
+                    InnerObserver<T, U> inner = new InnerObserver<>(this, uniqueId++);
                     if (addInner(inner)) {
                         p.subscribe(inner);
                     }
@@ -239,9 +239,9 @@ boolean tryEmitScalar(Supplier<? extends U> value) {
                 SimplePlainQueue<U> q = queue;
                 if (q == null) {
                     if (maxConcurrency == Integer.MAX_VALUE) {
-                        q = new SpscLinkedArrayQueue<U>(bufferSize);
+                        q = new SpscLinkedArrayQueue<>(bufferSize);
                     } else {
-                        q = new SpscArrayQueue<U>(maxConcurrency);
+                        q = new SpscArrayQueue<>(maxConcurrency);
                     }
                     queue = q;
                 }
@@ -267,7 +267,7 @@ void tryEmit(U value, InnerObserver<T, U> inner) {
             } else {
                 SimpleQueue<U> q = inner.queue;
                 if (q == null) {
-                    q = new SpscLinkedArrayQueue<U>(bufferSize);
+                    q = new SpscLinkedArrayQueue<>(bufferSize);
                     inner.queue = q;
                 }
                 q.offer(value);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
index 75fc80ac61..729e8cf6c5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
@@ -44,7 +44,7 @@ public ObservableFlatMapCompletable(ObservableSource<T> source,
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new FlatMapCompletableMainObserver<T>(observer, mapper, delayErrors));
+        source.subscribe(new FlatMapCompletableMainObserver<>(observer, mapper, delayErrors));
     }
 
     static final class FlatMapCompletableMainObserver<T> extends BasicIntQueueDisposable<T>
@@ -145,7 +145,7 @@ public boolean isDisposed() {
 
         @Nullable
         @Override
-        public T poll() throws Exception {
+        public T poll() {
             return null; // always empty
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
index ddf9602a05..2d488ac2c5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
@@ -46,12 +46,12 @@ public ObservableFlatMapCompletableCompletable(ObservableSource<T> source,
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        source.subscribe(new FlatMapCompletableMainObserver<T>(observer, mapper, delayErrors));
+        source.subscribe(new FlatMapCompletableMainObserver<>(observer, mapper, delayErrors));
     }
 
     @Override
     public Observable<T> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableFlatMapCompletable<T>(source, mapper, delayErrors));
+        return RxJavaPlugins.onAssembly(new ObservableFlatMapCompletable<>(source, mapper, delayErrors));
     }
 
     static final class FlatMapCompletableMainObserver<T> extends AtomicInteger implements Disposable, Observer<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
index ac951a571c..7ac5ca6f3c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
@@ -44,7 +44,7 @@ public ObservableFlatMapMaybe(ObservableSource<T> source, Function<? super T, ?
 
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
-        source.subscribe(new FlatMapMaybeObserver<T, R>(observer, mapper, delayErrors));
+        source.subscribe(new FlatMapMaybeObserver<>(observer, mapper, delayErrors));
     }
 
     static final class FlatMapMaybeObserver<T, R>
@@ -79,7 +79,7 @@ static final class FlatMapMaybeObserver<T, R>
             this.set = new CompositeDisposable();
             this.errors = new AtomicThrowable();
             this.active = new AtomicInteger(1);
-            this.queue = new AtomicReference<SpscLinkedArrayQueue<R>>();
+            this.queue = new AtomicReference<>();
         }
 
         @Override
@@ -177,7 +177,7 @@ SpscLinkedArrayQueue<R> getOrCreateQueue() {
                 if (current != null) {
                     return current;
                 }
-                current = new SpscLinkedArrayQueue<R>(Observable.bufferSize());
+                current = new SpscLinkedArrayQueue<>(Observable.bufferSize());
                 if (queue.compareAndSet(null, current)) {
                     return current;
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
index 6d5dd3da63..8ed45d5f39 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
@@ -44,7 +44,7 @@ public ObservableFlatMapSingle(ObservableSource<T> source, Function<? super T, ?
 
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
-        source.subscribe(new FlatMapSingleObserver<T, R>(observer, mapper, delayErrors));
+        source.subscribe(new FlatMapSingleObserver<>(observer, mapper, delayErrors));
     }
 
     static final class FlatMapSingleObserver<T, R>
@@ -79,7 +79,7 @@ static final class FlatMapSingleObserver<T, R>
             this.set = new CompositeDisposable();
             this.errors = new AtomicThrowable();
             this.active = new AtomicInteger(1);
-            this.queue = new AtomicReference<SpscLinkedArrayQueue<R>>();
+            this.queue = new AtomicReference<>();
         }
 
         @Override
@@ -177,7 +177,7 @@ SpscLinkedArrayQueue<R> getOrCreateQueue() {
                 if (current != null) {
                     return current;
                 }
-                current = new SpscLinkedArrayQueue<R>(Observable.bufferSize());
+                current = new SpscLinkedArrayQueue<>(Observable.bufferSize());
                 if (queue.compareAndSet(null, current)) {
                     return current;
                 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java
index 3f90f31acd..732eb50dd3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java
@@ -41,7 +41,7 @@ public ObservableFlattenIterable(ObservableSource<T> source,
 
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
-        source.subscribe(new FlattenIterableObserver<T, R>(observer, mapper));
+        source.subscribe(new FlattenIterableObserver<>(observer, mapper));
     }
 
     static final class FlattenIterableObserver<T, R> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java
index fb4beaaf21..97ebfe0d4f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java
@@ -27,7 +27,7 @@ public ObservableFromArray(T[] array) {
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        FromArrayDisposable<T> d = new FromArrayDisposable<T>(observer, array);
+        FromArrayDisposable<T> d = new FromArrayDisposable<>(observer, array);
 
         observer.onSubscribe(d);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java
index db08487f81..0285b83ff2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java
@@ -36,7 +36,7 @@ public ObservableFromCallable(Callable<? extends T> callable) {
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        DeferredScalarDisposable<T> d = new DeferredScalarDisposable<T>(observer);
+        DeferredScalarDisposable<T> d = new DeferredScalarDisposable<>(observer);
         observer.onSubscribe(d);
         if (d.isDisposed()) {
             return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java
index aa9e7da0bb..5459429f4d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java
@@ -33,7 +33,7 @@ public ObservableFromFuture(Future<? extends T> future, long timeout, TimeUnit u
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        DeferredScalarDisposable<T> d = new DeferredScalarDisposable<T>(observer);
+        DeferredScalarDisposable<T> d = new DeferredScalarDisposable<>(observer);
         observer.onSubscribe(d);
         if (!d.isDisposed()) {
             T v;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java
index 9edf260931..187d0cecc3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java
@@ -51,7 +51,7 @@ public void subscribeActual(Observer<? super T> observer) {
             return;
         }
 
-        FromIterableDisposable<T> d = new FromIterableDisposable<T>(observer, it);
+        FromIterableDisposable<T> d = new FromIterableDisposable<>(observer, it);
         observer.onSubscribe(d);
 
         if (!d.fusionMode) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java
index 44b6dbdd00..e46cf8fe8f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java
@@ -35,7 +35,7 @@ public ObservableFromSupplier(Supplier<? extends T> supplier) {
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        DeferredScalarDisposable<T> d = new DeferredScalarDisposable<T>(observer);
+        DeferredScalarDisposable<T> d = new DeferredScalarDisposable<>(observer);
         observer.onSubscribe(d);
         if (d.isDisposed()) {
             return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java
index df94a37dbd..2bd9a866a1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java
@@ -45,7 +45,7 @@ public void subscribeActual(Observer<? super T> observer) {
             return;
         }
 
-        GeneratorDisposable<T, S> gd = new GeneratorDisposable<T, S>(observer, generator, disposeState, state);
+        GeneratorDisposable<T, S> gd = new GeneratorDisposable<>(observer, generator, disposeState, state);
         observer.onSubscribe(gd);
         gd.run();
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
index 78edf33cea..8e259db47c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
@@ -44,7 +44,7 @@ public ObservableGroupBy(ObservableSource<T> source,
 
     @Override
     public void subscribeActual(Observer<? super GroupedObservable<K, V>> t) {
-        source.subscribe(new GroupByObserver<T, K, V>(t, keySelector, valueSelector, bufferSize, delayError));
+        source.subscribe(new GroupByObserver<>(t, keySelector, valueSelector, bufferSize, delayError));
     }
 
     public static final class GroupByObserver<T, K, V> extends AtomicInteger implements Observer<T>, Disposable {
@@ -70,7 +70,7 @@ public GroupByObserver(Observer<? super GroupedObservable<K, V>> actual, Functio
             this.valueSelector = valueSelector;
             this.bufferSize = bufferSize;
             this.delayError = delayError;
-            this.groups = new ConcurrentHashMap<Object, GroupedUnicast<K, V>>();
+            this.groups = new ConcurrentHashMap<>();
             this.lazySet(1);
         }
 
@@ -139,7 +139,7 @@ public void onNext(T t) {
 
         @Override
         public void onError(Throwable t) {
-            List<GroupedUnicast<K, V>> list = new ArrayList<GroupedUnicast<K, V>>(groups.values());
+            List<GroupedUnicast<K, V>> list = new ArrayList<>(groups.values());
             groups.clear();
 
             for (GroupedUnicast<K, V> e : list) {
@@ -151,7 +151,7 @@ public void onError(Throwable t) {
 
         @Override
         public void onComplete() {
-            List<GroupedUnicast<K, V>> list = new ArrayList<GroupedUnicast<K, V>>(groups.values());
+            List<GroupedUnicast<K, V>> list = new ArrayList<>(groups.values());
             groups.clear();
 
             for (GroupedUnicast<K, V> e : list) {
@@ -191,8 +191,8 @@ static final class GroupedUnicast<K, T> extends GroupedObservable<K, T> {
         final State<T, K> state;
 
         public static <T, K> GroupedUnicast<K, T> createWith(K key, int bufferSize, GroupByObserver<?, K, T> parent, boolean delayError) {
-            State<T, K> state = new State<T, K>(bufferSize, parent, key, delayError);
-            return new GroupedUnicast<K, T>(key, state);
+            State<T, K> state = new State<>(bufferSize, parent, key, delayError);
+            return new GroupedUnicast<>(key, state);
         }
 
         protected GroupedUnicast(K key, State<T, K> state) {
@@ -232,7 +232,7 @@ static final class State<T, K> extends AtomicInteger implements Disposable, Obse
 
         final AtomicBoolean cancelled = new AtomicBoolean();
 
-        final AtomicReference<Observer<? super T>> actual = new AtomicReference<Observer<? super T>>();
+        final AtomicReference<Observer<? super T>> actual = new AtomicReference<>();
 
         final AtomicInteger once = new AtomicInteger();
 
@@ -242,7 +242,7 @@ static final class State<T, K> extends AtomicInteger implements Disposable, Obse
         static final int ABANDONED_HAS_SUBSCRIBER = ABANDONED | HAS_SUBSCRIBER;
 
         State(int bufferSize, GroupByObserver<?, K, T> parent, K key, boolean delayError) {
-            this.queue = new SpscLinkedArrayQueue<T>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
             this.parent = parent;
             this.key = key;
             this.delayError = delayError;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
index 7b12579966..3605ee5203 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
@@ -58,7 +58,7 @@ public ObservableGroupJoin(
     protected void subscribeActual(Observer<? super R> observer) {
 
         GroupJoinDisposable<TLeft, TRight, TLeftEnd, TRightEnd, R> parent =
-                new GroupJoinDisposable<TLeft, TRight, TLeftEnd, TRightEnd, R>(observer, leftEnd, rightEnd, resultSelector);
+                new GroupJoinDisposable<>(observer, leftEnd, rightEnd, resultSelector);
 
         observer.onSubscribe(parent);
 
@@ -130,10 +130,10 @@ static final class GroupJoinDisposable<TLeft, TRight, TLeftEnd, TRightEnd, R>
                 BiFunction<? super TLeft, ? super Observable<TRight>, ? extends R> resultSelector) {
             this.downstream = actual;
             this.disposables = new CompositeDisposable();
-            this.queue = new SpscLinkedArrayQueue<Object>(bufferSize());
-            this.lefts = new LinkedHashMap<Integer, UnicastSubject<TRight>>();
-            this.rights = new LinkedHashMap<Integer, TRight>();
-            this.error = new AtomicReference<Throwable>();
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize());
+            this.lefts = new LinkedHashMap<>();
+            this.rights = new LinkedHashMap<>();
+            this.error = new AtomicReference<>();
             this.leftEnd = leftEnd;
             this.rightEnd = rightEnd;
             this.resultSelector = resultSelector;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java
index b929da4f78..5b216cd44c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java
@@ -31,7 +31,7 @@ public ObservableHide(ObservableSource<T> source) {
 
     @Override
     protected void subscribeActual(Observer<? super T> o) {
-        source.subscribe(new HideDisposable<T>(o));
+        source.subscribe(new HideDisposable<>(o));
     }
 
     static final class HideDisposable<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java
index a633c80dbb..ec4a07e92a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java
@@ -24,7 +24,7 @@ public ObservableIgnoreElements(ObservableSource<T> source) {
 
     @Override
     public void subscribeActual(final Observer<? super T> t) {
-        source.subscribe(new IgnoreObservable<T>(t));
+        source.subscribe(new IgnoreObservable<>(t));
     }
 
     static final class IgnoreObservable<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java
index f19ea85008..14b3a77684 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java
@@ -28,12 +28,12 @@ public ObservableIgnoreElementsCompletable(ObservableSource<T> source) {
 
     @Override
     public void subscribeActual(final CompletableObserver t) {
-        source.subscribe(new IgnoreObservable<T>(t));
+        source.subscribe(new IgnoreObservable<>(t));
     }
 
     @Override
     public Observable<T> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableIgnoreElements<T>(source));
+        return RxJavaPlugins.onAssembly(new ObservableIgnoreElements<>(source));
     }
 
     static final class IgnoreObservable<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java
index fcd5f57fa5..5f9dce646d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java
@@ -44,7 +44,7 @@ public S apply(S t1, Emitter<T> t2) throws Throwable {
     }
 
     public static <T, S> BiFunction<S, Emitter<T>, S> simpleGenerator(Consumer<Emitter<T>> consumer) {
-        return new SimpleGenerator<T, S>(consumer);
+        return new SimpleGenerator<>(consumer);
     }
 
     static final class SimpleBiGenerator<T, S> implements BiFunction<S, Emitter<T>, S> {
@@ -62,7 +62,7 @@ public S apply(S t1, Emitter<T> t2) throws Throwable {
     }
 
     public static <T, S> BiFunction<S, Emitter<T>, S> simpleBiGenerator(BiConsumer<S, Emitter<T>> consumer) {
-        return new SimpleBiGenerator<T, S>(consumer);
+        return new SimpleBiGenerator<>(consumer);
     }
 
     static final class ItemDelayFunction<T, U> implements Function<T, ObservableSource<T>> {
@@ -75,12 +75,12 @@ static final class ItemDelayFunction<T, U> implements Function<T, ObservableSour
         @Override
         public ObservableSource<T> apply(final T v) throws Throwable {
             ObservableSource<U> o = Objects.requireNonNull(itemDelay.apply(v), "The itemDelay returned a null ObservableSource");
-            return new ObservableTake<U>(o, 1).map(Functions.justFunction(v)).defaultIfEmpty(v);
+            return new ObservableTake<>(o, 1).map(Functions.justFunction(v)).defaultIfEmpty(v);
         }
     }
 
     public static <T, U> Function<T, ObservableSource<T>> itemDelay(final Function<? super T, ? extends ObservableSource<U>> itemDelay) {
-        return new ItemDelayFunction<T, U>(itemDelay);
+        return new ItemDelayFunction<>(itemDelay);
     }
 
     static final class ObserverOnNext<T> implements Consumer<T> {
@@ -91,7 +91,7 @@ static final class ObserverOnNext<T> implements Consumer<T> {
         }
 
         @Override
-        public void accept(T v) throws Exception {
+        public void accept(T v) {
             observer.onNext(v);
         }
     }
@@ -104,7 +104,7 @@ static final class ObserverOnError<T> implements Consumer<Throwable> {
         }
 
         @Override
-        public void accept(Throwable v) throws Exception {
+        public void accept(Throwable v) {
             observer.onError(v);
         }
     }
@@ -117,21 +117,21 @@ static final class ObserverOnComplete<T> implements Action {
         }
 
         @Override
-        public void run() throws Exception {
+        public void run() {
             observer.onComplete();
         }
     }
 
     public static <T> Consumer<T> observerOnNext(Observer<T> observer) {
-        return new ObserverOnNext<T>(observer);
+        return new ObserverOnNext<>(observer);
     }
 
     public static <T> Consumer<Throwable> observerOnError(Observer<T> observer) {
-        return new ObserverOnError<T>(observer);
+        return new ObserverOnError<>(observer);
     }
 
     public static <T> Action observerOnComplete(Observer<T> observer) {
-        return new ObserverOnComplete<T>(observer);
+        return new ObserverOnComplete<>(observer);
     }
 
     static final class FlatMapWithCombinerInner<U, R, T> implements Function<U, R> {
@@ -163,14 +163,14 @@ static final class FlatMapWithCombinerOuter<T, R, U> implements Function<T, Obse
         public ObservableSource<R> apply(final T t) throws Throwable {
             @SuppressWarnings("unchecked")
             ObservableSource<U> u = (ObservableSource<U>)Objects.requireNonNull(mapper.apply(t), "The mapper returned a null ObservableSource");
-            return new ObservableMap<U, R>(u, new FlatMapWithCombinerInner<U, R, T>(combiner, t));
+            return new ObservableMap<>(u, new FlatMapWithCombinerInner<U, R, T>(combiner, t));
         }
     }
 
     public static <T, U, R> Function<T, ObservableSource<R>> flatMapWithCombiner(
             final Function<? super T, ? extends ObservableSource<? extends U>> mapper,
                     final BiFunction<? super T, ? super U, ? extends R> combiner) {
-        return new FlatMapWithCombinerOuter<T, R, U>(combiner, mapper);
+        return new FlatMapWithCombinerOuter<>(combiner, mapper);
     }
 
     static final class FlatMapIntoIterable<T, U> implements Function<T, ObservableSource<U>> {
@@ -182,36 +182,36 @@ static final class FlatMapIntoIterable<T, U> implements Function<T, ObservableSo
 
         @Override
         public ObservableSource<U> apply(T t) throws Throwable {
-            return new ObservableFromIterable<U>(Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable"));
+            return new ObservableFromIterable<>(Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Iterable"));
         }
     }
 
     public static <T, U> Function<T, ObservableSource<U>> flatMapIntoIterable(final Function<? super T, ? extends Iterable<? extends U>> mapper) {
-        return new FlatMapIntoIterable<T, U>(mapper);
+        return new FlatMapIntoIterable<>(mapper);
     }
 
     enum MapToInt implements Function<Object, Object> {
         INSTANCE;
         @Override
-        public Object apply(Object t) throws Exception {
+        public Object apply(Object t) {
             return 0;
         }
     }
 
     public static <T> Supplier<ConnectableObservable<T>> replaySupplier(final Observable<T> parent) {
-        return new ReplaySupplier<T>(parent);
+        return new ReplaySupplier<>(parent);
     }
 
     public static <T> Supplier<ConnectableObservable<T>> replaySupplier(final Observable<T> parent, final int bufferSize, boolean eagerTruncate) {
-        return new BufferedReplaySupplier<T>(parent, bufferSize, eagerTruncate);
+        return new BufferedReplaySupplier<>(parent, bufferSize, eagerTruncate);
     }
 
     public static <T> Supplier<ConnectableObservable<T>> replaySupplier(final Observable<T> parent, final int bufferSize, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        return new BufferedTimedReplaySupplier<T>(parent, bufferSize, time, unit, scheduler, eagerTruncate);
+        return new BufferedTimedReplaySupplier<>(parent, bufferSize, time, unit, scheduler, eagerTruncate);
     }
 
     public static <T> Supplier<ConnectableObservable<T>> replaySupplier(final Observable<T> parent, final long time, final TimeUnit unit, final Scheduler scheduler, boolean eagerTruncate) {
-        return new TimedReplayCallable<T>(parent, time, unit, scheduler, eagerTruncate);
+        return new TimedReplayCallable<>(parent, time, unit, scheduler, eagerTruncate);
     }
 
     static final class ReplaySupplier<T> implements Supplier<ConnectableObservable<T>> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
index 6660d342f3..70f62aec03 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
@@ -56,7 +56,7 @@ public ObservableJoin(
     protected void subscribeActual(Observer<? super R> observer) {
 
         JoinDisposable<TLeft, TRight, TLeftEnd, TRightEnd, R> parent =
-                new JoinDisposable<TLeft, TRight, TLeftEnd, TRightEnd, R>(
+                new JoinDisposable<>(
                         observer, leftEnd, rightEnd, resultSelector);
 
         observer.onSubscribe(parent);
@@ -115,10 +115,10 @@ static final class JoinDisposable<TLeft, TRight, TLeftEnd, TRightEnd, R>
                         BiFunction<? super TLeft, ? super TRight, ? extends R> resultSelector) {
             this.downstream = actual;
             this.disposables = new CompositeDisposable();
-            this.queue = new SpscLinkedArrayQueue<Object>(bufferSize());
-            this.lefts = new LinkedHashMap<Integer, TLeft>();
-            this.rights = new LinkedHashMap<Integer, TRight>();
-            this.error = new AtomicReference<Throwable>();
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize());
+            this.lefts = new LinkedHashMap<>();
+            this.rights = new LinkedHashMap<>();
+            this.error = new AtomicReference<>();
             this.leftEnd = leftEnd;
             this.rightEnd = rightEnd;
             this.resultSelector = resultSelector;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java
index 0fe64a5291..d3448d0b41 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java
@@ -30,7 +30,7 @@ public ObservableJust(final T value) {
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        ScalarDisposable<T> sd = new ScalarDisposable<T>(observer, value);
+        ScalarDisposable<T> sd = new ScalarDisposable<>(observer, value);
         observer.onSubscribe(sd);
         sd.run();
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java
index 79457e0e80..73e26a3972 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java
@@ -35,7 +35,7 @@ public ObservableLastMaybe(ObservableSource<T> source) {
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new LastObserver<T>(observer));
+        source.subscribe(new LastObserver<>(observer));
     }
 
     static final class LastObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java
index 2ba8f28856..7c5433e105 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java
@@ -40,7 +40,7 @@ public ObservableLastSingle(ObservableSource<T> source, T defaultItem) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new LastObserver<T>(observer, defaultItem));
+        source.subscribe(new LastObserver<>(observer, defaultItem));
     }
 
     static final class LastObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java
index 147c21ae37..1622b504d4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java
@@ -40,7 +40,7 @@ public ObservableMapNotification(
 
     @Override
     public void subscribeActual(Observer<? super ObservableSource<? extends R>> t) {
-        source.subscribe(new MapNotificationObserver<T, R>(t, onNextMapper, onErrorMapper, onCompleteSupplier));
+        source.subscribe(new MapNotificationObserver<>(t, onNextMapper, onErrorMapper, onCompleteSupplier));
     }
 
     static final class MapNotificationObserver<T, R>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java
index 6041961bcb..e55430c378 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java
@@ -25,7 +25,7 @@ public ObservableMaterialize(ObservableSource<T> source) {
 
     @Override
     public void subscribeActual(Observer<? super Notification<T>> t) {
-        source.subscribe(new MaterializeObserver<T>(t));
+        source.subscribe(new MaterializeObserver<>(t));
     }
 
     static final class MaterializeObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java
index 6d022ebf62..1f086f7175 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java
@@ -38,7 +38,7 @@ public ObservableMergeWithCompletable(Observable<T> source, CompletableSource ot
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        MergeWithObserver<T> parent = new MergeWithObserver<T>(observer);
+        MergeWithObserver<T> parent = new MergeWithObserver<>(observer);
         observer.onSubscribe(parent);
         source.subscribe(parent);
         other.subscribe(parent.otherObserver);
@@ -63,7 +63,7 @@ static final class MergeWithObserver<T> extends AtomicInteger
 
         MergeWithObserver(Observer<? super T> downstream) {
             this.downstream = downstream;
-            this.mainDisposable = new AtomicReference<Disposable>();
+            this.mainDisposable = new AtomicReference<>();
             this.otherObserver = new OtherObserver(this);
             this.errors = new AtomicThrowable();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java
index d852bff7dd..f462075a50 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java
@@ -40,7 +40,7 @@ public ObservableMergeWithMaybe(Observable<T> source, MaybeSource<? extends T> o
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        MergeWithObserver<T> parent = new MergeWithObserver<T>(observer);
+        MergeWithObserver<T> parent = new MergeWithObserver<>(observer);
         observer.onSubscribe(parent);
         source.subscribe(parent);
         other.subscribe(parent.otherObserver);
@@ -75,8 +75,8 @@ static final class MergeWithObserver<T> extends AtomicInteger
 
         MergeWithObserver(Observer<? super T> downstream) {
             this.downstream = downstream;
-            this.mainDisposable = new AtomicReference<Disposable>();
-            this.otherObserver = new OtherObserver<T>(this);
+            this.mainDisposable = new AtomicReference<>();
+            this.otherObserver = new OtherObserver<>(this);
             this.errors = new AtomicThrowable();
         }
 
@@ -162,7 +162,7 @@ void otherComplete() {
         SimplePlainQueue<T> getOrCreateQueue() {
             SimplePlainQueue<T> q = queue;
             if (q == null) {
-                q = new SpscLinkedArrayQueue<T>(bufferSize());
+                q = new SpscLinkedArrayQueue<>(bufferSize());
                 queue = q;
             }
             return q;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java
index 30e80cf4de..08940cf645 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java
@@ -40,7 +40,7 @@ public ObservableMergeWithSingle(Observable<T> source, SingleSource<? extends T>
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        MergeWithObserver<T> parent = new MergeWithObserver<T>(observer);
+        MergeWithObserver<T> parent = new MergeWithObserver<>(observer);
         observer.onSubscribe(parent);
         source.subscribe(parent);
         other.subscribe(parent.otherObserver);
@@ -75,8 +75,8 @@ static final class MergeWithObserver<T> extends AtomicInteger
 
         MergeWithObserver(Observer<? super T> downstream) {
             this.downstream = downstream;
-            this.mainDisposable = new AtomicReference<Disposable>();
-            this.otherObserver = new OtherObserver<T>(this);
+            this.mainDisposable = new AtomicReference<>();
+            this.otherObserver = new OtherObserver<>(this);
             this.errors = new AtomicThrowable();
         }
 
@@ -157,7 +157,7 @@ void otherError(Throwable ex) {
         SimplePlainQueue<T> getOrCreateQueue() {
             SimplePlainQueue<T> q = queue;
             if (q == null) {
-                q = new SpscLinkedArrayQueue<T>(bufferSize());
+                q = new SpscLinkedArrayQueue<>(bufferSize());
                 queue = q;
             }
             return q;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java
index 9bc2b39117..af5e78df3f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java
@@ -42,7 +42,7 @@ protected void subscribeActual(Observer<? super T> observer) {
         } else {
             Scheduler.Worker w = scheduler.createWorker();
 
-            source.subscribe(new ObserveOnObserver<T>(observer, w, delayError, bufferSize));
+            source.subscribe(new ObserveOnObserver<>(observer, w, delayError, bufferSize));
         }
     }
 
@@ -101,7 +101,7 @@ public void onSubscribe(Disposable d) {
                     }
                 }
 
-                queue = new SpscLinkedArrayQueue<T>(bufferSize);
+                queue = new SpscLinkedArrayQueue<>(bufferSize);
 
                 downstream.onSubscribe(this);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java
index 093e8d1299..3cf1849011 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java
@@ -31,7 +31,7 @@ public ObservableOnErrorNext(ObservableSource<T> source,
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        OnErrorNextObserver<T> parent = new OnErrorNextObserver<T>(t, nextSupplier);
+        OnErrorNextObserver<T> parent = new OnErrorNextObserver<>(t, nextSupplier);
         t.onSubscribe(parent.arbiter);
         source.subscribe(parent);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java
index df868ab410..54efdc62e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java
@@ -28,7 +28,7 @@ public ObservableOnErrorReturn(ObservableSource<T> source, Function<? super Thro
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new OnErrorReturnObserver<T>(t, valueSupplier));
+        source.subscribe(new OnErrorReturnObserver<>(t, valueSupplier));
     }
 
     static final class OnErrorReturnObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java
index 629945369e..8589ee3c8a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java
@@ -46,7 +46,7 @@ public final class ObservablePublish<T> extends ConnectableObservable<T>
 
     public ObservablePublish(ObservableSource<T> source) {
         this.source = source;
-        this.current = new AtomicReference<PublishConnection<T>>();
+        this.current = new AtomicReference<>();
     }
 
     @Override
@@ -58,7 +58,7 @@ public void connect(Consumer<? super Disposable> connection) {
             conn = current.get();
 
             if (conn == null || conn.isDisposed()) {
-                PublishConnection<T> fresh = new PublishConnection<T>(current);
+                PublishConnection<T> fresh = new PublishConnection<>(current);
                 if (!current.compareAndSet(conn, fresh)) {
                     continue;
                 }
@@ -89,7 +89,7 @@ protected void subscribeActual(Observer<? super T> observer) {
             conn = current.get();
             // we don't create a fresh connection if the current is terminated
             if (conn == null) {
-                PublishConnection<T> fresh = new PublishConnection<T>(current);
+                PublishConnection<T> fresh = new PublishConnection<>(current);
                 if (!current.compareAndSet(conn, fresh)) {
                     continue;
                 }
@@ -98,7 +98,7 @@ protected void subscribeActual(Observer<? super T> observer) {
             break;
         }
 
-        InnerDisposable<T> inner = new InnerDisposable<T>(observer, conn);
+        InnerDisposable<T> inner = new InnerDisposable<>(observer, conn);
         observer.onSubscribe(inner);
         if (conn.add(inner)) {
             if (inner.isDisposed()) {
@@ -152,7 +152,7 @@ static final class PublishConnection<T>
         PublishConnection(AtomicReference<PublishConnection<T>> current) {
             this.connect = new AtomicBoolean();
             this.current = current;
-            this.upstream = new AtomicReference<Disposable>();
+            this.upstream = new AtomicReference<>();
             lazySet(EMPTY);
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java
index 8247a6abfc..687bee9548 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java
@@ -52,14 +52,14 @@ protected void subscribeActual(Observer<? super R> observer) {
             return;
         }
 
-        TargetObserver<T, R> o = new TargetObserver<T, R>(observer);
+        TargetObserver<R> o = new TargetObserver<>(observer);
 
         target.subscribe(o);
 
-        source.subscribe(new SourceObserver<T, R>(subject, o));
+        source.subscribe(new SourceObserver<>(subject, o));
     }
 
-    static final class SourceObserver<T, R> implements Observer<T> {
+    static final class SourceObserver<T> implements Observer<T> {
 
         final PublishSubject<T> subject;
 
@@ -91,7 +91,7 @@ public void onComplete() {
         }
     }
 
-    static final class TargetObserver<T, R>
+    static final class TargetObserver<R>
     extends AtomicReference<Disposable> implements Observer<R>, Disposable {
         private static final long serialVersionUID = 854110278590336484L;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java
index 2b845fec51..56e277dc32 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java
@@ -71,7 +71,7 @@ void run() {
 
         @Nullable
         @Override
-        public Integer poll() throws Exception {
+        public Integer poll() {
             long i = index;
             if (i != end) {
                 index = i + 1;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java
index 2a4122ccad..f92decb11e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java
@@ -68,7 +68,7 @@ void run() {
 
         @Nullable
         @Override
-        public Long poll() throws Exception {
+        public Long poll() {
             long i = index;
             if (i != end) {
                 index = i + 1;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java
index bab7bbb065..f5421a666e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java
@@ -41,7 +41,7 @@ public ObservableReduceMaybe(ObservableSource<T> source, BiFunction<T, T, T> red
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new ReduceObserver<T>(observer, reducer));
+        source.subscribe(new ReduceObserver<>(observer, reducer));
     }
 
     static final class ReduceObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java
index e6b0d1d0ef..67347debb8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java
@@ -45,7 +45,7 @@ public ObservableReduceSeedSingle(ObservableSource<T> source, R seed, BiFunction
 
     @Override
     protected void subscribeActual(SingleObserver<? super R> observer) {
-        source.subscribe(new ReduceSeedObserver<T, R>(observer, reducer, seed));
+        source.subscribe(new ReduceSeedObserver<>(observer, reducer, seed));
     }
 
     static final class ReduceSeedObserver<T, R> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java
index 956d7bf7c9..1de6cb1e6c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java
@@ -53,6 +53,6 @@ protected void subscribeActual(SingleObserver<? super R> observer) {
             EmptyDisposable.error(ex, observer);
             return;
         }
-        source.subscribe(new ReduceSeedObserver<T, R>(observer, reducer, seed));
+        source.subscribe(new ReduceSeedObserver<>(observer, reducer, seed));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java
index f0b9157204..a806a537c6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java
@@ -81,7 +81,7 @@ protected void subscribeActual(Observer<? super T> observer) {
             }
         }
 
-        source.subscribe(new RefCountObserver<T>(observer, this, conn));
+        source.subscribe(new RefCountObserver<>(observer, this, conn));
 
         if (connect) {
             source.connect(conn);
@@ -166,7 +166,7 @@ public void run() {
         }
 
         @Override
-        public void accept(Disposable t) throws Exception {
+        public void accept(Disposable t) {
             DisposableHelper.replace(this, t);
             synchronized (parent) {
                 if (disconnectedEarly) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java
index ad9159137c..2816dac708 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java
@@ -31,7 +31,7 @@ public void subscribeActual(Observer<? super T> observer) {
         SequentialDisposable sd = new SequentialDisposable();
         observer.onSubscribe(sd);
 
-        RepeatObserver<T> rs = new RepeatObserver<T>(observer, count != Long.MAX_VALUE ? count - 1 : Long.MAX_VALUE, sd, source);
+        RepeatObserver<T> rs = new RepeatObserver<>(observer, count != Long.MAX_VALUE ? count - 1 : Long.MAX_VALUE, sd, source);
         rs.subscribeNext();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java
index 60637fe802..51c8b9dd65 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java
@@ -33,7 +33,7 @@ public void subscribeActual(Observer<? super T> observer) {
         SequentialDisposable sd = new SequentialDisposable();
         observer.onSubscribe(sd);
 
-        RepeatUntilObserver<T> rs = new RepeatUntilObserver<T>(observer, until, sd, source);
+        RepeatUntilObserver<T> rs = new RepeatUntilObserver<>(observer, until, sd, source);
         rs.subscribeNext();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java
index eff1e248ac..d3fcdf5971 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java
@@ -52,7 +52,7 @@ protected void subscribeActual(Observer<? super T> observer) {
             return;
         }
 
-        RepeatWhenObserver<T> parent = new RepeatWhenObserver<T>(observer, signaller, source);
+        RepeatWhenObserver<T> parent = new RepeatWhenObserver<>(observer, signaller, source);
         observer.onSubscribe(parent);
 
         other.subscribe(parent.inner);
@@ -87,7 +87,7 @@ static final class RepeatWhenObserver<T> extends AtomicInteger implements Observ
             this.wip = new AtomicInteger();
             this.error = new AtomicThrowable();
             this.inner = new InnerRepeatObserver();
-            this.upstream = new AtomicReference<Disposable>();
+            this.upstream = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
index b6a945e8b7..7dabfcc72d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
@@ -59,7 +59,7 @@ interface BufferSupplier<T> {
     public static <U, R> Observable<R> multicastSelector(
             final Supplier<? extends ConnectableObservable<U>> connectableFactory,
             final Function<? super Observable<U>, ? extends ObservableSource<R>> selector) {
-        return RxJavaPlugins.onAssembly(new MulticastReplay<R, U>(connectableFactory, selector));
+        return RxJavaPlugins.onAssembly(new MulticastReplay<>(connectableFactory, selector));
     }
 
     /**
@@ -86,7 +86,7 @@ public static <T> ConnectableObservable<T> create(ObservableSource<T> source,
         if (bufferSize == Integer.MAX_VALUE) {
             return createFrom(source);
         }
-        return create(source, new ReplayBufferSupplier<T>(bufferSize, eagerTruncate));
+        return create(source, new ReplayBufferSupplier<>(bufferSize, eagerTruncate));
     }
 
     /**
@@ -117,7 +117,7 @@ public static <T> ConnectableObservable<T> create(ObservableSource<T> source,
      */
     public static <T> ConnectableObservable<T> create(ObservableSource<T> source,
             final long maxAge, final TimeUnit unit, final Scheduler scheduler, final int bufferSize, boolean eagerTruncate) {
-        return create(source, new ScheduledReplaySupplier<T>(bufferSize, maxAge, unit, scheduler, eagerTruncate));
+        return create(source, new ScheduledReplaySupplier<>(bufferSize, maxAge, unit, scheduler, eagerTruncate));
     }
 
     /**
@@ -129,9 +129,9 @@ public static <T> ConnectableObservable<T> create(ObservableSource<T> source,
     static <T> ConnectableObservable<T> create(ObservableSource<T> source,
             final BufferSupplier<T> bufferFactory) {
         // the current connection to source needs to be shared between the operator and its onSubscribe call
-        final AtomicReference<ReplayObserver<T>> curr = new AtomicReference<ReplayObserver<T>>();
-        ObservableSource<T> onSubscribe = new ReplaySource<T>(curr, bufferFactory);
-        return RxJavaPlugins.onAssembly(new ObservableReplay<T>(onSubscribe, source, curr, bufferFactory));
+        final AtomicReference<ReplayObserver<T>> curr = new AtomicReference<>();
+        ObservableSource<T> onSubscribe = new ReplaySource<>(curr, bufferFactory);
+        return RxJavaPlugins.onAssembly(new ObservableReplay<>(onSubscribe, source, curr, bufferFactory));
     }
 
     private ObservableReplay(ObservableSource<T> onSubscribe, ObservableSource<T> source,
@@ -174,7 +174,7 @@ public void connect(Consumer<? super Disposable> connection) {
                 // create a new subscriber-to-source
                 ReplayBuffer<T> buf = bufferFactory.call();
 
-                ReplayObserver<T> u = new ReplayObserver<T>(buf);
+                ReplayObserver<T> u = new ReplayObserver<>(buf);
                 // try setting it as the current subscriber-to-source
                 if (!current.compareAndSet(ps, u)) {
                     // did not work, perhaps a new subscriber arrived
@@ -243,7 +243,7 @@ static final class ReplayObserver<T>
         ReplayObserver(ReplayBuffer<T> buffer) {
             this.buffer = buffer;
 
-            this.observers = new AtomicReference<InnerDisposable[]>(EMPTY);
+            this.observers = new AtomicReference<>(EMPTY);
             this.shouldConnect = new AtomicBoolean();
         }
 
@@ -829,7 +829,7 @@ static final class SizeAndTimeBoundReplayBuffer<T> extends BoundedReplayBuffer<T
 
         @Override
         Object enterTransform(Object value) {
-            return new Timed<Object>(value, scheduler.now(unit), unit);
+            return new Timed<>(value, scheduler.now(unit), unit);
         }
 
         @Override
@@ -927,7 +927,7 @@ Node getHead() {
     static final class UnBoundedFactory implements BufferSupplier<Object> {
         @Override
         public ReplayBuffer<Object> call() {
-            return new UnboundedReplayBuffer<Object>(16);
+            return new UnboundedReplayBuffer<>(16);
         }
     }
 
@@ -957,7 +957,7 @@ static final class ReplayBufferSupplier<T> implements BufferSupplier<T> {
 
         @Override
         public ReplayBuffer<T> call() {
-            return new SizeBoundReplayBuffer<T>(bufferSize, eagerTruncate);
+            return new SizeBoundReplayBuffer<>(bufferSize, eagerTruncate);
         }
     }
 
@@ -979,7 +979,7 @@ static final class ScheduledReplaySupplier<T> implements BufferSupplier<T> {
 
         @Override
         public ReplayBuffer<T> call() {
-            return new SizeAndTimeBoundReplayBuffer<T>(bufferSize, maxAge, unit, scheduler, eagerTruncate);
+            return new SizeAndTimeBoundReplayBuffer<>(bufferSize, maxAge, unit, scheduler, eagerTruncate);
         }
     }
 
@@ -1004,7 +1004,7 @@ public void subscribe(Observer<? super T> child) {
                     // create a new subscriber to source
                     ReplayBuffer<T> buf = bufferFactory.call();
 
-                    ReplayObserver<T> u = new ReplayObserver<T>(buf);
+                    ReplayObserver<T> u = new ReplayObserver<>(buf);
                     // let's try setting it as the current subscriber-to-source
                     if (!curr.compareAndSet(null, u)) {
                         // didn't work, maybe someone else did it or the current subscriber
@@ -1016,7 +1016,7 @@ public void subscribe(Observer<? super T> child) {
                 }
 
                 // create the backpressure-managing producer for this child
-                InnerDisposable<T> inner = new InnerDisposable<T>(r, child);
+                InnerDisposable<T> inner = new InnerDisposable<>(r, child);
                 // the producer has been registered with the current subscriber-to-source so
                 // at least it will receive the next terminal event
                 // setting the producer will trigger the first request to be considered by
@@ -1062,11 +1062,11 @@ protected void subscribeActual(Observer<? super R> child) {
                 return;
             }
 
-            final ObserverResourceWrapper<R> srw = new ObserverResourceWrapper<R>(child);
+            final ObserverResourceWrapper<R> srw = new ObserverResourceWrapper<>(child);
 
             observable.subscribe(srw);
 
-            co.connect(new DisposeConsumer<R>(srw));
+            co.connect(new DisposeConsumer<>(srw));
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java
index 48edbdaa26..56de8606be 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java
@@ -35,7 +35,7 @@ public void subscribeActual(Observer<? super T> observer) {
         SequentialDisposable sa = new SequentialDisposable();
         observer.onSubscribe(sa);
 
-        RetryBiObserver<T> rs = new RetryBiObserver<T>(observer, predicate, sa, source);
+        RetryBiObserver<T> rs = new RetryBiObserver<>(observer, predicate, sa, source);
         rs.subscribeNext();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java
index 963e5c8890..9c4d5c748a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java
@@ -37,7 +37,7 @@ public void subscribeActual(Observer<? super T> observer) {
         SequentialDisposable sa = new SequentialDisposable();
         observer.onSubscribe(sa);
 
-        RepeatObserver<T> rs = new RepeatObserver<T>(observer, count, predicate, sa, source);
+        RepeatObserver<T> rs = new RepeatObserver<>(observer, count, predicate, sa, source);
         rs.subscribeNext();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java
index 0eb5fbb5b7..2a3f0b6b07 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java
@@ -52,7 +52,7 @@ protected void subscribeActual(Observer<? super T> observer) {
             return;
         }
 
-        RepeatWhenObserver<T> parent = new RepeatWhenObserver<T>(observer, signaller, source);
+        RepeatWhenObserver<T> parent = new RepeatWhenObserver<>(observer, signaller, source);
         observer.onSubscribe(parent);
 
         other.subscribe(parent.inner);
@@ -87,7 +87,7 @@ static final class RepeatWhenObserver<T> extends AtomicInteger implements Observ
             this.wip = new AtomicInteger();
             this.error = new AtomicThrowable();
             this.inner = new InnerRepeatObserver();
-            this.upstream = new AtomicReference<Disposable>();
+            this.upstream = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
index 4a91ff30b8..3f516e8cca 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
@@ -38,11 +38,11 @@ public ObservableSampleTimed(ObservableSource<T> source, long period, TimeUnit u
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        SerializedObserver<T> serial = new SerializedObserver<T>(t);
+        SerializedObserver<T> serial = new SerializedObserver<>(t);
         if (emitLast) {
-            source.subscribe(new SampleTimedEmitLast<T>(serial, period, unit, scheduler));
+            source.subscribe(new SampleTimedEmitLast<>(serial, period, unit, scheduler));
         } else {
-            source.subscribe(new SampleTimedNoLast<T>(serial, period, unit, scheduler));
+            source.subscribe(new SampleTimedNoLast<>(serial, period, unit, scheduler));
         }
     }
 
@@ -55,7 +55,7 @@ abstract static class SampleTimedObserver<T> extends AtomicReference<T> implemen
         final TimeUnit unit;
         final Scheduler scheduler;
 
-        final AtomicReference<Disposable> timer = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> timer = new AtomicReference<>();
 
         Disposable upstream;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java
index 4c0fccc654..cae3259d12 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java
@@ -34,11 +34,11 @@ public ObservableSampleWithObservable(ObservableSource<T> source, ObservableSour
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        SerializedObserver<T> serial = new SerializedObserver<T>(t);
+        SerializedObserver<T> serial = new SerializedObserver<>(t);
         if (emitLast) {
-            source.subscribe(new SampleMainEmitLast<T>(serial, other));
+            source.subscribe(new SampleMainEmitLast<>(serial, other));
         } else {
-            source.subscribe(new SampleMainNoLast<T>(serial, other));
+            source.subscribe(new SampleMainNoLast<>(serial, other));
         }
     }
 
@@ -50,7 +50,7 @@ abstract static class SampleMainObserver<T> extends AtomicReference<T>
         final Observer<? super T> downstream;
         final ObservableSource<?> sampler;
 
-        final AtomicReference<Disposable> other = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> other = new AtomicReference<>();
 
         Disposable upstream;
 
@@ -65,7 +65,7 @@ public void onSubscribe(Disposable d) {
                 this.upstream = d;
                 downstream.onSubscribe(this);
                 if (other.get() == null) {
-                    sampler.subscribe(new SamplerObserver<T>(this));
+                    sampler.subscribe(new SamplerObserver<>(this));
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
index f4a1bce25b..c62c23c0c5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
@@ -88,7 +88,7 @@ public static <T, R> boolean tryScalarXMapSubscribe(ObservableSource<T> source,
                     EmptyDisposable.complete(observer);
                     return true;
                 }
-                ScalarDisposable<R> sd = new ScalarDisposable<R>(observer, u);
+                ScalarDisposable<R> sd = new ScalarDisposable<>(observer, u);
                 observer.onSubscribe(sd);
                 sd.run();
             } else {
@@ -112,7 +112,7 @@ public static <T, R> boolean tryScalarXMapSubscribe(ObservableSource<T> source,
      */
     public static <T, U> Observable<U> scalarXMap(T value,
             Function<? super T, ? extends ObservableSource<? extends U>> mapper) {
-        return RxJavaPlugins.onAssembly(new ScalarXMapObservable<T, U>(value, mapper));
+        return RxJavaPlugins.onAssembly(new ScalarXMapObservable<>(value, mapper));
     }
 
     /**
@@ -159,7 +159,7 @@ public void subscribeActual(Observer<? super R> observer) {
                     EmptyDisposable.complete(observer);
                     return;
                 }
-                ScalarDisposable<R> sd = new ScalarDisposable<R>(observer, u);
+                ScalarDisposable<R> sd = new ScalarDisposable<>(observer, u);
                 observer.onSubscribe(sd);
                 sd.run();
             } else {
@@ -205,7 +205,7 @@ public boolean offer(T v1, T v2) {
 
         @Nullable
         @Override
-        public T poll() throws Exception {
+        public T poll() {
             if (get() == FUSED) {
                 lazySet(ON_COMPLETE);
                 return value;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java
index 94918b6c39..bd0ba2b12a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java
@@ -31,7 +31,7 @@ public ObservableScan(ObservableSource<T> source, BiFunction<T, T, T> accumulato
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new ScanObserver<T>(t, accumulator));
+        source.subscribe(new ScanObserver<>(t, accumulator));
     }
 
     static final class ScanObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java
index 24e4b580ad..89eb4046f0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java
@@ -43,7 +43,7 @@ public void subscribeActual(Observer<? super R> t) {
             return;
         }
 
-        source.subscribe(new ScanSeedObserver<T, R>(t, accumulator, r));
+        source.subscribe(new ScanSeedObserver<>(t, accumulator, r));
     }
 
     static final class ScanSeedObserver<T, R> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java
index 1e779db18e..11eb694696 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java
@@ -38,7 +38,7 @@ public ObservableSequenceEqual(ObservableSource<? extends T> first, ObservableSo
 
     @Override
     public void subscribeActual(Observer<? super Boolean> observer) {
-        EqualCoordinator<T> ec = new EqualCoordinator<T>(observer, bufferSize, first, second, comparer);
+        EqualCoordinator<T> ec = new EqualCoordinator<>(observer, bufferSize, first, second, comparer);
         observer.onSubscribe(ec);
         ec.subscribe();
     }
@@ -69,8 +69,8 @@ static final class EqualCoordinator<T> extends AtomicInteger implements Disposab
             @SuppressWarnings("unchecked")
             EqualObserver<T>[] as = new EqualObserver[2];
             this.observers = as;
-            as[0] = new EqualObserver<T>(this, 0, bufferSize);
-            as[1] = new EqualObserver<T>(this, 1, bufferSize);
+            as[0] = new EqualObserver<>(this, 0, bufferSize);
+            as[1] = new EqualObserver<>(this, 1, bufferSize);
             this.resources = new ArrayCompositeDisposable(2);
         }
 
@@ -226,7 +226,7 @@ static final class EqualObserver<T> implements Observer<T> {
         EqualObserver(EqualCoordinator<T> parent, int index, int bufferSize) {
             this.parent = parent;
             this.index = index;
-            this.queue = new SpscLinkedArrayQueue<T>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java
index 165a8ab64a..9169cb6465 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java
@@ -40,14 +40,14 @@ public ObservableSequenceEqualSingle(ObservableSource<? extends T> first, Observ
 
     @Override
     public void subscribeActual(SingleObserver<? super Boolean> observer) {
-        EqualCoordinator<T> ec = new EqualCoordinator<T>(observer, bufferSize, first, second, comparer);
+        EqualCoordinator<T> ec = new EqualCoordinator<>(observer, bufferSize, first, second, comparer);
         observer.onSubscribe(ec);
         ec.subscribe();
     }
 
     @Override
     public Observable<Boolean> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableSequenceEqual<T>(first, second, comparer, bufferSize));
+        return RxJavaPlugins.onAssembly(new ObservableSequenceEqual<>(first, second, comparer, bufferSize));
     }
 
     static final class EqualCoordinator<T> extends AtomicInteger implements Disposable {
@@ -76,8 +76,8 @@ static final class EqualCoordinator<T> extends AtomicInteger implements Disposab
             @SuppressWarnings("unchecked")
             EqualObserver<T>[] as = new EqualObserver[2];
             this.observers = as;
-            as[0] = new EqualObserver<T>(this, 0, bufferSize);
-            as[1] = new EqualObserver<T>(this, 1, bufferSize);
+            as[0] = new EqualObserver<>(this, 0, bufferSize);
+            as[1] = new EqualObserver<>(this, 1, bufferSize);
             this.resources = new ArrayCompositeDisposable(2);
         }
 
@@ -230,7 +230,7 @@ static final class EqualObserver<T> implements Observer<T> {
         EqualObserver(EqualCoordinator<T> parent, int index, int bufferSize) {
             this.parent = parent;
             this.index = index;
-            this.queue = new SpscLinkedArrayQueue<T>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java
index 35ce558744..98f757e6f7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java
@@ -22,6 +22,6 @@ public ObservableSerialized(Observable<T> upstream) {
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new SerializedObserver<T>(observer));
+        source.subscribe(new SerializedObserver<>(observer));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java
index b0bba864b9..83a8569f05 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java
@@ -28,7 +28,7 @@ public ObservableSingleMaybe(ObservableSource<T> source) {
 
     @Override
     public void subscribeActual(MaybeObserver<? super T> t) {
-        source.subscribe(new SingleElementObserver<T>(t));
+        source.subscribe(new SingleElementObserver<>(t));
     }
 
     static final class SingleElementObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java
index f7c8f597e1..de4729f5e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java
@@ -33,7 +33,7 @@ public ObservableSingleSingle(ObservableSource<? extends T> source, T defaultVal
 
     @Override
     public void subscribeActual(SingleObserver<? super T> t) {
-        source.subscribe(new SingleElementObserver<T>(t, defaultValue));
+        source.subscribe(new SingleElementObserver<>(t, defaultValue));
     }
 
     static final class SingleElementObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java
index 9812b33663..e0000dc7a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java
@@ -26,7 +26,7 @@ public ObservableSkip(ObservableSource<T> source, long n) {
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new SkipObserver<T>(observer, n));
+        source.subscribe(new SkipObserver<>(observer, n));
     }
 
     static final class SkipObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java
index 7d7ea2383e..3e45e38a79 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java
@@ -29,7 +29,7 @@ public ObservableSkipLast(ObservableSource<T> source, int skip) {
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new SkipLastObserver<T>(observer, skip));
+        source.subscribe(new SkipLastObserver<>(observer, skip));
     }
 
     static final class SkipLastObserver<T> extends ArrayDeque<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java
index 41b34b6186..f70620b5c0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java
@@ -40,7 +40,7 @@ public ObservableSkipLastTimed(ObservableSource<T> source,
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new SkipLastTimedObserver<T>(t, time, unit, scheduler, bufferSize, delayError));
+        source.subscribe(new SkipLastTimedObserver<>(t, time, unit, scheduler, bufferSize, delayError));
     }
 
     static final class SkipLastTimedObserver<T> extends AtomicInteger implements Observer<T>, Disposable {
@@ -65,7 +65,7 @@ static final class SkipLastTimedObserver<T> extends AtomicInteger implements Obs
             this.time = time;
             this.unit = unit;
             this.scheduler = scheduler;
-            this.queue = new SpscLinkedArrayQueue<Object>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
             this.delayError = delayError;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java
index 9f0377b784..457158200d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java
@@ -28,13 +28,13 @@ public ObservableSkipUntil(ObservableSource<T> source, ObservableSource<U> other
     @Override
     public void subscribeActual(Observer<? super T> child) {
 
-        final SerializedObserver<T> serial = new SerializedObserver<T>(child);
+        final SerializedObserver<T> serial = new SerializedObserver<>(child);
 
         final ArrayCompositeDisposable frc = new ArrayCompositeDisposable(2);
 
         serial.onSubscribe(frc);
 
-        final SkipUntilObserver<T> sus = new SkipUntilObserver<T>(serial, frc);
+        final SkipUntilObserver<T> sus = new SkipUntilObserver<>(serial, frc);
 
         other.subscribe(new SkipUntil(frc, sus, serial));
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java
index 04326b2647..d6dad232b5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java
@@ -28,7 +28,7 @@ public ObservableSkipWhile(ObservableSource<T> source, Predicate<? super T> pred
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new SkipWhileObserver<T>(observer, predicate));
+        source.subscribe(new SkipWhileObserver<>(observer, predicate));
     }
 
     static final class SkipWhileObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java
index f1fce38571..8eac3ae04e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java
@@ -29,7 +29,7 @@ public ObservableSubscribeOn(ObservableSource<T> source, Scheduler scheduler) {
 
     @Override
     public void subscribeActual(final Observer<? super T> observer) {
-        final SubscribeOnObserver<T> parent = new SubscribeOnObserver<T>(observer);
+        final SubscribeOnObserver<T> parent = new SubscribeOnObserver<>(observer);
 
         observer.onSubscribe(parent);
 
@@ -45,7 +45,7 @@ static final class SubscribeOnObserver<T> extends AtomicReference<Disposable> im
 
         SubscribeOnObserver(Observer<? super T> downstream) {
             this.downstream = downstream;
-            this.upstream = new AtomicReference<Disposable>();
+            this.upstream = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java
index 4b41661f1d..b697afc1c9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java
@@ -26,7 +26,7 @@ public ObservableSwitchIfEmpty(ObservableSource<T> source, ObservableSource<? ex
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        SwitchIfEmptyObserver<T> parent = new SwitchIfEmptyObserver<T>(t, other);
+        SwitchIfEmptyObserver<T> parent = new SwitchIfEmptyObserver<>(t, other);
         t.onSubscribe(parent.arbiter);
         source.subscribe(parent);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
index bca0f1beeb..e533834541 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
@@ -48,7 +48,7 @@ public void subscribeActual(Observer<? super R> t) {
             return;
         }
 
-        source.subscribe(new SwitchMapObserver<T, R>(t, mapper, bufferSize, delayErrors));
+        source.subscribe(new SwitchMapObserver<>(t, mapper, bufferSize, delayErrors));
     }
 
     static final class SwitchMapObserver<T, R> extends AtomicInteger implements Observer<T>, Disposable {
@@ -68,11 +68,11 @@ static final class SwitchMapObserver<T, R> extends AtomicInteger implements Obse
 
         Disposable upstream;
 
-        final AtomicReference<SwitchMapInnerObserver<T, R>> active = new AtomicReference<SwitchMapInnerObserver<T, R>>();
+        final AtomicReference<SwitchMapInnerObserver<T, R>> active = new AtomicReference<>();
 
         static final SwitchMapInnerObserver<Object, Object> CANCELLED;
         static {
-            CANCELLED = new SwitchMapInnerObserver<Object, Object>(null, -1L, 1);
+            CANCELLED = new SwitchMapInnerObserver<>(null, -1L, 1);
             CANCELLED.cancel();
         }
 
@@ -116,7 +116,7 @@ public void onNext(T t) {
                 return;
             }
 
-            SwitchMapInnerObserver<T, R> nextInner = new SwitchMapInnerObserver<T, R>(this, c, bufferSize);
+            SwitchMapInnerObserver<T, R> nextInner = new SwitchMapInnerObserver<>(this, c, bufferSize);
 
             for (;;) {
                 inner = active.get();
@@ -364,7 +364,7 @@ public void onSubscribe(Disposable d) {
                     }
                 }
 
-                queue = new SpscLinkedArrayQueue<R>(bufferSize);
+                queue = new SpscLinkedArrayQueue<>(bufferSize);
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java
index 7e675f061c..63f37db46e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java
@@ -27,7 +27,7 @@ public ObservableTake(ObservableSource<T> source, long limit) {
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new TakeObserver<T>(observer, limit));
+        source.subscribe(new TakeObserver<>(observer, limit));
     }
 
     static final class TakeObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java
index 45566a64e7..bfa2ee0bdd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java
@@ -29,7 +29,7 @@ public ObservableTakeLast(ObservableSource<T> source, int count) {
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new TakeLastObserver<T>(t, count));
+        source.subscribe(new TakeLastObserver<>(t, count));
     }
 
     static final class TakeLastObserver<T> extends ArrayDeque<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java
index 8f176bfebd..f2766db765 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java
@@ -24,7 +24,7 @@ public ObservableTakeLastOne(ObservableSource<T> source) {
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new TakeLastOneObserver<T>(observer));
+        source.subscribe(new TakeLastOneObserver<>(observer));
     }
 
     static final class TakeLastOneObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java
index 0b9e16e26f..be6f83db79 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java
@@ -42,7 +42,7 @@ public ObservableTakeLastTimed(ObservableSource<T> source,
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new TakeLastTimedObserver<T>(t, count, time, unit, scheduler, bufferSize, delayError));
+        source.subscribe(new TakeLastTimedObserver<>(t, count, time, unit, scheduler, bufferSize, delayError));
     }
 
     static final class TakeLastTimedObserver<T>
@@ -69,7 +69,7 @@ static final class TakeLastTimedObserver<T>
             this.time = time;
             this.unit = unit;
             this.scheduler = scheduler;
-            this.queue = new SpscLinkedArrayQueue<Object>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
             this.delayError = delayError;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java
index fdb376c57e..f1d5d00a0d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java
@@ -31,7 +31,7 @@ public ObservableTakeUntil(ObservableSource<T> source, ObservableSource<? extend
 
     @Override
     public void subscribeActual(Observer<? super T> child) {
-        TakeUntilMainObserver<T, U> parent = new TakeUntilMainObserver<T, U>(child);
+        TakeUntilMainObserver<T, U> parent = new TakeUntilMainObserver<>(child);
         child.onSubscribe(parent);
 
         other.subscribe(parent.otherObserver);
@@ -53,7 +53,7 @@ static final class TakeUntilMainObserver<T, U> extends AtomicInteger
 
         TakeUntilMainObserver(Observer<? super T> downstream) {
             this.downstream = downstream;
-            this.upstream = new AtomicReference<Disposable>();
+            this.upstream = new AtomicReference<>();
             this.otherObserver = new OtherObserver();
             this.error = new AtomicThrowable();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java
index d38aabd839..1727a24fb4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java
@@ -29,7 +29,7 @@ public ObservableTakeUntilPredicate(ObservableSource<T> source, Predicate<? supe
 
     @Override
     public void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new TakeUntilPredicateObserver<T>(observer, predicate));
+        source.subscribe(new TakeUntilPredicateObserver<>(observer, predicate));
     }
 
     static final class TakeUntilPredicateObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java
index 62cb16d791..5c251c969e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java
@@ -29,7 +29,7 @@ public ObservableTakeWhile(ObservableSource<T> source, Predicate<? super T> pred
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new TakeWhileObserver<T>(t, predicate));
+        source.subscribe(new TakeWhileObserver<>(t, predicate));
     }
 
     static final class TakeWhileObserver<T> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
index 5708f04816..041ce80840 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
@@ -38,8 +38,8 @@ public ObservableThrottleFirstTimed(ObservableSource<T> source,
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new DebounceTimedObserver<T>(
-                new SerializedObserver<T>(t),
+        source.subscribe(new DebounceTimedObserver<>(
+                new SerializedObserver<>(t),
                 timeout, unit, scheduler.createWorker()));
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java
index 9d23714549..253f5d3501 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java
@@ -53,7 +53,7 @@ public ObservableThrottleLatest(Observable<T> source,
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new ThrottleLatestObserver<T>(observer, timeout, unit, scheduler.createWorker(), emitLast));
+        source.subscribe(new ThrottleLatestObserver<>(observer, timeout, unit, scheduler.createWorker(), emitLast));
     }
 
     static final class ThrottleLatestObserver<T>
@@ -93,7 +93,7 @@ static final class ThrottleLatestObserver<T>
             this.unit = unit;
             this.worker = worker;
             this.emitLast = emitLast;
-            this.latest = new AtomicReference<T>();
+            this.latest = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java
index f5ad5a52f5..7dd47ec03b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java
@@ -32,7 +32,7 @@ public ObservableTimeInterval(ObservableSource<T> source, TimeUnit unit, Schedul
 
     @Override
     public void subscribeActual(Observer<? super Timed<T>> t) {
-        source.subscribe(new TimeIntervalObserver<T>(t, unit, scheduler));
+        source.subscribe(new TimeIntervalObserver<>(t, unit, scheduler));
     }
 
     static final class TimeIntervalObserver<T> implements Observer<T>, Disposable {
@@ -75,7 +75,7 @@ public void onNext(T t) {
             long last = lastTime;
             lastTime = now;
             long delta = now - last;
-            downstream.onNext(new Timed<T>(t, delta, unit));
+            downstream.onNext(new Timed<>(t, delta, unit));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java
index a9ada29730..dfef0e74e6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java
@@ -44,12 +44,12 @@ public ObservableTimeout(
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
         if (other == null) {
-            TimeoutObserver<T> parent = new TimeoutObserver<T>(observer, itemTimeoutIndicator);
+            TimeoutObserver<T> parent = new TimeoutObserver<>(observer, itemTimeoutIndicator);
             observer.onSubscribe(parent);
             parent.startFirstTimeout(firstTimeoutIndicator);
             source.subscribe(parent);
         } else {
-            TimeoutFallbackObserver<T> parent = new TimeoutFallbackObserver<T>(observer, itemTimeoutIndicator, other);
+            TimeoutFallbackObserver<T> parent = new TimeoutFallbackObserver<>(observer, itemTimeoutIndicator, other);
             observer.onSubscribe(parent);
             parent.startFirstTimeout(firstTimeoutIndicator);
             source.subscribe(parent);
@@ -77,7 +77,7 @@ static final class TimeoutObserver<T> extends AtomicLong
             this.downstream = actual;
             this.itemTimeoutIndicator = itemTimeoutIndicator;
             this.task = new SequentialDisposable();
-            this.upstream = new AtomicReference<Disposable>();
+            this.upstream = new AtomicReference<>();
         }
 
         @Override
@@ -206,7 +206,7 @@ static final class TimeoutFallbackObserver<T>
             this.task = new SequentialDisposable();
             this.fallback = fallback;
             this.index = new AtomicLong();
-            this.upstream = new AtomicReference<Disposable>();
+            this.upstream = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java
index 0553c9474f..29b1772930 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java
@@ -41,12 +41,12 @@ public ObservableTimeoutTimed(Observable<T> source,
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
         if (other == null) {
-            TimeoutObserver<T> parent = new TimeoutObserver<T>(observer, timeout, unit, scheduler.createWorker());
+            TimeoutObserver<T> parent = new TimeoutObserver<>(observer, timeout, unit, scheduler.createWorker());
             observer.onSubscribe(parent);
             parent.startTimeout(0L);
             source.subscribe(parent);
         } else {
-            TimeoutFallbackObserver<T> parent = new TimeoutFallbackObserver<T>(observer, timeout, unit, scheduler.createWorker(), other);
+            TimeoutFallbackObserver<T> parent = new TimeoutFallbackObserver<>(observer, timeout, unit, scheduler.createWorker(), other);
             observer.onSubscribe(parent);
             parent.startTimeout(0L);
             source.subscribe(parent);
@@ -76,7 +76,7 @@ static final class TimeoutObserver<T> extends AtomicLong
             this.unit = unit;
             this.worker = worker;
             this.task = new SequentialDisposable();
-            this.upstream = new AtomicReference<Disposable>();
+            this.upstream = new AtomicReference<>();
         }
 
         @Override
@@ -196,7 +196,7 @@ static final class TimeoutFallbackObserver<T> extends AtomicReference<Disposable
             this.fallback = fallback;
             this.task = new SequentialDisposable();
             this.index = new AtomicLong();
-            this.upstream = new AtomicReference<Disposable>();
+            this.upstream = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java
index 9cde3b4033..6a3c5322f2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java
@@ -49,7 +49,7 @@ public void subscribeActual(Observer<? super U> t) {
             EmptyDisposable.error(e, t);
             return;
         }
-        source.subscribe(new ToListObserver<T, U>(t, coll));
+        source.subscribe(new ToListObserver<>(t, coll));
     }
 
     static final class ToListObserver<T, U extends Collection<? super T>> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java
index 6258313b61..0ac41b12d6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java
@@ -53,12 +53,12 @@ public void subscribeActual(SingleObserver<? super U> t) {
             EmptyDisposable.error(e, t);
             return;
         }
-        source.subscribe(new ToListObserver<T, U>(t, coll));
+        source.subscribe(new ToListObserver<>(t, coll));
     }
 
     @Override
     public Observable<U> fuseToObservable() {
-        return RxJavaPlugins.onAssembly(new ObservableToList<T, U>(source, collectionSupplier));
+        return RxJavaPlugins.onAssembly(new ObservableToList<>(source, collectionSupplier));
     }
 
     static final class ToListObserver<T, U extends Collection<? super T>> implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java
index d012b7cc4d..2c5f748477 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java
@@ -29,7 +29,7 @@ public ObservableUnsubscribeOn(ObservableSource<T> source, Scheduler scheduler)
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
-        source.subscribe(new UnsubscribeObserver<T>(t, scheduler));
+        source.subscribe(new UnsubscribeObserver<>(t, scheduler));
     }
 
     static final class UnsubscribeObserver<T> extends AtomicBoolean implements Observer<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
index 60fad9e740..dec3da5ebe 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
@@ -67,7 +67,7 @@ public void subscribeActual(Observer<? super T> observer) {
             return;
         }
 
-        UsingObserver<T, D> us = new UsingObserver<T, D>(observer, resource, disposer, eager);
+        UsingObserver<T, D> us = new UsingObserver<>(observer, resource, disposer, eager);
 
         source.subscribe(us);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
index 3f11f3952a..3ada9cd93c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
@@ -36,9 +36,9 @@ public ObservableWindow(ObservableSource<T> source, long count, long skip, int c
     @Override
     public void subscribeActual(Observer<? super Observable<T>> t) {
         if (count == skip) {
-            source.subscribe(new WindowExactObserver<T>(t, count, capacityHint));
+            source.subscribe(new WindowExactObserver<>(t, count, capacityHint));
         } else {
-            source.subscribe(new WindowSkipObserver<T>(t, count, skip, capacityHint));
+            source.subscribe(new WindowSkipObserver<>(t, count, skip, capacityHint));
         }
     }
 
@@ -81,7 +81,7 @@ public void onNext(T t) {
             if (w == null && !cancelled) {
                 w = UnicastSubject.create(capacityHint, this);
                 window = w;
-                intercept = new ObservableWindowSubscribeIntercept<T>(w);
+                intercept = new ObservableWindowSubscribeIntercept<>(w);
                 downstream.onNext(intercept);
             }
 
@@ -169,7 +169,7 @@ static final class WindowSkipObserver<T> extends AtomicBoolean
             this.count = count;
             this.skip = skip;
             this.capacityHint = capacityHint;
-            this.windows = new ArrayDeque<UnicastSubject<T>>();
+            this.windows = new ArrayDeque<>();
         }
 
         @Override
@@ -194,7 +194,7 @@ public void onNext(T t) {
             if (i % s == 0 && !cancelled) {
                 wip.getAndIncrement();
                 UnicastSubject<T> w = UnicastSubject.create(capacityHint, this);
-                intercept = new ObservableWindowSubscribeIntercept<T>(w);
+                intercept = new ObservableWindowSubscribeIntercept<>(w);
                 ws.offer(w);
                 downstream.onNext(intercept);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java
index 48de711a04..503a5cbd29 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java
@@ -36,7 +36,7 @@ public ObservableWindowBoundary(ObservableSource<T> source, ObservableSource<B>
 
     @Override
     public void subscribeActual(Observer<? super Observable<T>> observer) {
-        WindowBoundaryMainObserver<T, B> parent = new WindowBoundaryMainObserver<T, B>(observer, capacityHint);
+        WindowBoundaryMainObserver<T, B> parent = new WindowBoundaryMainObserver<>(observer, capacityHint);
 
         observer.onSubscribe(parent);
         other.subscribe(parent.boundaryObserver);
@@ -75,10 +75,10 @@ static final class WindowBoundaryMainObserver<T, B>
         WindowBoundaryMainObserver(Observer<? super Observable<T>> downstream, int capacityHint) {
             this.downstream = downstream;
             this.capacityHint = capacityHint;
-            this.boundaryObserver = new WindowBoundaryInnerObserver<T, B>(this);
-            this.upstream = new AtomicReference<Disposable>();
+            this.boundaryObserver = new WindowBoundaryInnerObserver<>(this);
+            this.upstream = new AtomicReference<>();
             this.windows = new AtomicInteger(1);
-            this.queue = new MpscLinkedQueue<Object>();
+            this.queue = new MpscLinkedQueue<>();
             this.errors = new AtomicThrowable();
             this.stopWindows = new AtomicBoolean();
         }
@@ -230,7 +230,7 @@ void drain() {
                         window = w;
                         windows.getAndIncrement();
 
-                        ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(w);
+                        ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<>(w);
                         downstream.onNext(intercept);
                         if (intercept.tryAbandon()) {
                             w.onComplete();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
index 8722d6df0c..367ddf2d02 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
@@ -46,7 +46,7 @@ public ObservableWindowBoundarySelector(
 
     @Override
     public void subscribeActual(Observer<? super Observable<T>> t) {
-        source.subscribe(new WindowBoundaryMainObserver<T, B, V>(
+        source.subscribe(new WindowBoundaryMainObserver<>(
                 t, open, closingIndicator, bufferSize));
     }
 
@@ -85,16 +85,16 @@ static final class WindowBoundaryMainObserver<T, B, V>
         WindowBoundaryMainObserver(Observer<? super Observable<T>> downstream,
                 ObservableSource<B> open, Function<? super B, ? extends ObservableSource<V>> closingIndicator, int bufferSize) {
             this.downstream = downstream;
-            this.queue = new MpscLinkedQueue<Object>();
+            this.queue = new MpscLinkedQueue<>();
             this.open = open;
             this.closingIndicator = closingIndicator;
             this.bufferSize = bufferSize;
             this.resources = new CompositeDisposable();
-            this.windows = new ArrayList<UnicastSubject<T>>();
+            this.windows = new ArrayList<>();
             this.windowCount = new AtomicLong(1L);
             this.downstreamDisposed = new AtomicBoolean();
             this.error = new AtomicThrowable();
-            this.startObserver = new WindowStartObserver<B>(this);
+            this.startObserver = new WindowStartObserver<>(this);
             this.requested = new AtomicLong();
         }
 
@@ -167,7 +167,7 @@ public void run() {
         }
 
         void open(B startValue) {
-            queue.offer(new WindowStartItem<B>(startValue));
+            queue.offer(new WindowStartItem<>(startValue));
             drain();
         }
 
@@ -249,7 +249,7 @@ void drain() {
 
                                 windowCount.getAndIncrement();
                                 UnicastSubject<T> newWindow = UnicastSubject.create(bufferSize, this);
-                                WindowEndObserverIntercept<T, V> endObserver = new WindowEndObserverIntercept<T, V>(this, newWindow);
+                                WindowEndObserverIntercept<T, V> endObserver = new WindowEndObserverIntercept<>(this, newWindow);
 
                                 downstream.onNext(endObserver);
 
@@ -371,7 +371,7 @@ static final class WindowEndObserverIntercept<T, V> extends Observable<T>
             WindowEndObserverIntercept(WindowBoundaryMainObserver<T, ?, V> parent, UnicastSubject<T> window) {
                 this.parent = parent;
                 this.window = window;
-                this.upstream = new AtomicReference<Disposable>();
+                this.upstream = new AtomicReference<>();
                 this.once = new AtomicBoolean();
             }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
index 3913bf2911..5c295f4608 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
@@ -53,18 +53,18 @@ public ObservableWindowTimed(Observable<T> source,
     protected void subscribeActual(Observer<? super Observable<T>> downstream) {
         if (timespan == timeskip) {
             if (maxSize == Long.MAX_VALUE) {
-                source.subscribe(new WindowExactUnboundedObserver<T>(
+                source.subscribe(new WindowExactUnboundedObserver<>(
                         downstream,
                         timespan, unit, scheduler, bufferSize));
                 return;
             }
-            source.subscribe(new WindowExactBoundedObserver<T>(
+            source.subscribe(new WindowExactBoundedObserver<>(
                         downstream,
                         timespan, unit, scheduler,
                         bufferSize, maxSize, restartTimerOnMaxSize));
             return;
         }
-        source.subscribe(new WindowSkipObserver<T>(downstream,
+        source.subscribe(new WindowSkipObserver<>(downstream,
                 timespan, timeskip, unit, scheduler.createWorker(), bufferSize));
     }
 
@@ -96,7 +96,7 @@ abstract static class AbstractWindowObserver<T>
 
         AbstractWindowObserver(Observer<? super Observable<T>> downstream, long timespan, TimeUnit unit, int bufferSize) {
             this.downstream = downstream;
-            this.queue = new MpscLinkedQueue<Object>();
+            this.queue = new MpscLinkedQueue<>();
             this.timespan = timespan;
             this.unit = unit;
             this.bufferSize = bufferSize;
@@ -194,7 +194,7 @@ void createFirstWindow() {
 
                 emitted = 1;
 
-                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<>(window);
                 downstream.onNext(intercept);
 
                 timer.replace(scheduler.schedulePeriodicallyDirect(this, timespan, timespan, unit));
@@ -267,7 +267,7 @@ else if (!isEmpty) {
                                 window = UnicastSubject.create(bufferSize, windowRunnable);
                                 this.window = window;
 
-                                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<>(window);
                                 downstream.onNext(intercept);
 
                                 if (intercept.tryAbandon()) {
@@ -344,7 +344,7 @@ void createFirstWindow() {
                 windowCount.getAndIncrement();
                 window = UnicastSubject.create(bufferSize, this);
 
-                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<>(window);
                 downstream.onNext(intercept);
 
                 Runnable boundaryTask = new WindowBoundaryRunnable(this, 1L);
@@ -466,7 +466,7 @@ UnicastSubject<T> createNewWindow(UnicastSubject<T> window) {
                 window = UnicastSubject.create(bufferSize, this);
                 this.window = window;
 
-                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<>(window);
                 downstream.onNext(intercept);
 
                 if (restartTimerOnMaxSize) {
@@ -515,7 +515,7 @@ static final class WindowSkipObserver<T>
             super(actual, timespan, unit, bufferSize);
             this.timeskip = timeskip;
             this.worker = worker;
-            this.windows = new LinkedList<UnicastSubject<T>>();
+            this.windows = new LinkedList<>();
         }
 
         @Override
@@ -527,7 +527,7 @@ void createFirstWindow() {
                 UnicastSubject<T> window = UnicastSubject.create(bufferSize, this);
                 windows.add(window);
 
-                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<>(window);
                 downstream.onNext(intercept);
 
                 worker.schedule(new WindowBoundaryRunnable(this, false), timespan, unit);
@@ -591,7 +591,7 @@ void drain() {
                                 UnicastSubject<T> window = UnicastSubject.create(bufferSize, this);
                                 windows.add(window);
 
-                                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<T>(window);
+                                ObservableWindowSubscribeIntercept<T> intercept = new ObservableWindowSubscribeIntercept<>(window);
                                 downstream.onNext(intercept);
 
                                 worker.schedule(new WindowBoundaryRunnable(this, false), timespan, unit);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java
index 6ac680db30..b7e283c515 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java
@@ -35,8 +35,8 @@ public ObservableWithLatestFrom(ObservableSource<T> source,
 
     @Override
     public void subscribeActual(Observer<? super R> t) {
-        final SerializedObserver<R> serial = new SerializedObserver<R>(t);
-        final WithLatestFromObserver<T, U, R> wlf = new WithLatestFromObserver<T, U, R>(serial, combiner);
+        final SerializedObserver<R> serial = new SerializedObserver<>(t);
+        final WithLatestFromObserver<T, U, R> wlf = new WithLatestFromObserver<>(serial, combiner);
 
         serial.onSubscribe(wlf);
 
@@ -53,9 +53,9 @@ static final class WithLatestFromObserver<T, U, R> extends AtomicReference<U> im
 
         final BiFunction<? super T, ? super U, ? extends R> combiner;
 
-        final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
-        final AtomicReference<Disposable> other = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> other = new AtomicReference<>();
 
         WithLatestFromObserver(Observer<? super R> actual, BiFunction<? super T, ? super U, ? extends R> combiner) {
             this.downstream = actual;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java
index 73d28032fc..c9f2a6b57a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java
@@ -82,11 +82,11 @@ protected void subscribeActual(Observer<? super R> observer) {
         }
 
         if (n == 0) {
-            new ObservableMap<T, R>(source, new SingletonArrayFunc()).subscribeActual(observer);
+            new ObservableMap<>(source, new SingletonArrayFunc()).subscribeActual(observer);
             return;
         }
 
-        WithLatestFromObserver<T, R> parent = new WithLatestFromObserver<T, R>(observer, combiner, n);
+        WithLatestFromObserver<T, R> parent = new WithLatestFromObserver<>(observer, combiner, n);
         observer.onSubscribe(parent);
         parent.subscribe(others, n);
 
@@ -121,8 +121,8 @@ static final class WithLatestFromObserver<T, R>
                 s[i] = new WithLatestInnerObserver(this, i);
             }
             this.observers = s;
-            this.values = new AtomicReferenceArray<Object>(n);
-            this.upstream = new AtomicReference<Disposable>();
+            this.values = new AtomicReferenceArray<>(n);
+            this.upstream = new AtomicReference<>();
             this.error = new AtomicThrowable();
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
index 80ae9b174b..ace2d748e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
@@ -68,7 +68,7 @@ public void subscribeActual(Observer<? super R> observer) {
             return;
         }
 
-        ZipCoordinator<T, R> zc = new ZipCoordinator<T, R>(observer, zipper, count, delayError);
+        ZipCoordinator<T, R> zc = new ZipCoordinator<>(observer, zipper, count, delayError);
         zc.subscribe(sources, bufferSize);
     }
 
@@ -98,7 +98,7 @@ public void subscribe(ObservableSource<? extends T>[] sources, int bufferSize) {
             ZipObserver<T, R>[] s = observers;
             int len = s.length;
             for (int i = 0; i < len; i++) {
-                s[i] = new ZipObserver<T, R>(this, bufferSize);
+                s[i] = new ZipObserver<>(this, bufferSize);
             }
             // this makes sure the contents of the observers array is visible
             this.lazySet(0);
@@ -263,11 +263,11 @@ static final class ZipObserver<T, R> implements Observer<T> {
         volatile boolean done;
         Throwable error;
 
-        final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+        final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
         ZipObserver(ZipCoordinator<T, R> parent, int bufferSize) {
             this.parent = parent;
-            this.queue = new SpscLinkedArrayQueue<T>(bufferSize);
+            this.queue = new SpscLinkedArrayQueue<>(bufferSize);
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java
index 4111a36af4..4245417ce7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java
@@ -25,7 +25,7 @@ public final class ObserverResourceWrapper<T> extends AtomicReference<Disposable
 
     final Observer<? super T> downstream;
 
-    final AtomicReference<Disposable> upstream = new AtomicReference<Disposable>();
+    final AtomicReference<Disposable> upstream = new AtomicReference<>();
 
     public ObserverResourceWrapper(Observer<? super T> downstream) {
         this.downstream = downstream;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java
index 48220d16b1..a8cb63f0ed 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java
@@ -39,12 +39,12 @@ public final class SingleCache<T> extends Single<T> implements SingleObserver<T>
     public SingleCache(SingleSource<? extends T> source) {
         this.source = source;
         this.wip = new AtomicInteger();
-        this.observers = new AtomicReference<CacheDisposable<T>[]>(EMPTY);
+        this.observers = new AtomicReference<>(EMPTY);
     }
 
     @Override
     protected void subscribeActual(final SingleObserver<? super T> observer) {
-        CacheDisposable<T> d = new CacheDisposable<T>(observer, this);
+        CacheDisposable<T> d = new CacheDisposable<>(observer, this);
         observer.onSubscribe(d);
 
         if (add(d)) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java
index a2164d2ec5..8c5331c87b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java
@@ -33,7 +33,7 @@ public SingleCreate(SingleOnSubscribe<T> source) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        Emitter<T> parent = new Emitter<T>(observer);
+        Emitter<T> parent = new Emitter<>(observer);
         observer.onSubscribe(parent);
 
         try {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java
index 9915ff1c66..c3f7458459 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java
@@ -33,7 +33,7 @@ public SingleDelayWithCompletable(SingleSource<T> source, CompletableSource othe
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        other.subscribe(new OtherObserver<T>(observer, source));
+        other.subscribe(new OtherObserver<>(observer, source));
     }
 
     static final class OtherObserver<T>
@@ -66,7 +66,7 @@ public void onError(Throwable e) {
 
         @Override
         public void onComplete() {
-            source.subscribe(new ResumeSingleObserver<T>(this, downstream));
+            source.subscribe(new ResumeSingleObserver<>(this, downstream));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java
index 78c843db4b..a0eb8ab860 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java
@@ -34,7 +34,7 @@ public SingleDelayWithObservable(SingleSource<T> source, ObservableSource<U> oth
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        other.subscribe(new OtherSubscriber<T, U>(observer, source));
+        other.subscribe(new OtherSubscriber<>(observer, source));
     }
 
     static final class OtherSubscriber<T, U>
@@ -84,7 +84,7 @@ public void onComplete() {
                 return;
             }
             done = true;
-            source.subscribe(new ResumeSingleObserver<T>(this, downstream));
+            source.subscribe(new ResumeSingleObserver<>(this, downstream));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java
index 647f55916b..1d8a601a02 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java
@@ -37,7 +37,7 @@ public SingleDelayWithPublisher(SingleSource<T> source, Publisher<U> other) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        other.subscribe(new OtherSubscriber<T, U>(observer, source));
+        other.subscribe(new OtherSubscriber<>(observer, source));
     }
 
     static final class OtherSubscriber<T, U>
@@ -92,7 +92,7 @@ public void onComplete() {
                 return;
             }
             done = true;
-            source.subscribe(new ResumeSingleObserver<T>(this, downstream));
+            source.subscribe(new ResumeSingleObserver<>(this, downstream));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java
index 721d4dc2a5..d8e11665c8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java
@@ -33,7 +33,7 @@ public SingleDelayWithSingle(SingleSource<T> source, SingleSource<U> other) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        other.subscribe(new OtherObserver<T, U>(observer, source));
+        other.subscribe(new OtherObserver<>(observer, source));
     }
 
     static final class OtherObserver<T, U>
@@ -61,7 +61,7 @@ public void onSubscribe(Disposable d) {
 
         @Override
         public void onSuccess(U value) {
-            source.subscribe(new ResumeSingleObserver<T>(this, downstream));
+            source.subscribe(new ResumeSingleObserver<>(this, downstream));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java
index 4582e4d4da..6d072f4cea 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java
@@ -42,7 +42,7 @@ public SingleDematerialize(Single<T> source, Function<? super T, Notification<R>
 
     @Override
     protected void subscribeActual(MaybeObserver<? super R> observer) {
-        source.subscribe(new DematerializeObserver<T, R>(observer, selector));
+        source.subscribe(new DematerializeObserver<>(observer, selector));
     }
 
     static final class DematerializeObserver<T, R> implements SingleObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java
index 70e5ae029c..72e1f3def3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java
@@ -33,7 +33,7 @@ public SingleDetach(SingleSource<T> source) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new DetachSingleObserver<T>(observer));
+        source.subscribe(new DetachSingleObserver<>(observer));
     }
 
     static final class DetachSingleObserver<T> implements SingleObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java
index 01fa4ce590..d7ab5e4c79 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java
@@ -39,7 +39,7 @@ public SingleDoAfterSuccess(SingleSource<T> source, Consumer<? super T> onAfterS
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new DoAfterObserver<T>(observer, onAfterSuccess));
+        source.subscribe(new DoAfterObserver<>(observer, onAfterSuccess));
     }
 
     static final class DoAfterObserver<T> implements SingleObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java
index bcb604e2ca..eca7ebff15 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java
@@ -39,7 +39,7 @@ public SingleDoAfterTerminate(SingleSource<T> source, Action onAfterTerminate) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new DoAfterTerminateObserver<T>(observer, onAfterTerminate));
+        source.subscribe(new DoAfterTerminateObserver<>(observer, onAfterTerminate));
     }
 
     static final class DoAfterTerminateObserver<T> implements SingleObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java
index bfa309be03..0ba60a6493 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java
@@ -41,7 +41,7 @@ public SingleDoFinally(SingleSource<T> source, Action onFinally) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new DoFinallyObserver<T>(observer, onFinally));
+        source.subscribe(new DoFinallyObserver<>(observer, onFinally));
     }
 
     static final class DoFinallyObserver<T> extends AtomicInteger implements SingleObserver<T>, Disposable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java
index 31dd0183f4..262f4f7d43 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java
@@ -35,7 +35,7 @@ public SingleDoOnDispose(SingleSource<T> source, Action onDispose) {
     @Override
     protected void subscribeActual(final SingleObserver<? super T> observer) {
 
-        source.subscribe(new DoOnDisposeObserver<T>(observer, onDispose));
+        source.subscribe(new DoOnDisposeObserver<>(observer, onDispose));
     }
 
     static final class DoOnDisposeObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java
index d7c9230fb7..24a24caac9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java
@@ -38,7 +38,7 @@ public SingleDoOnSubscribe(SingleSource<T> source, Consumer<? super Disposable>
 
     @Override
     protected void subscribeActual(final SingleObserver<? super T> observer) {
-        source.subscribe(new DoOnSubscribeSingleObserver<T>(observer, onSubscribe));
+        source.subscribe(new DoOnSubscribeSingleObserver<>(observer, onSubscribe));
     }
 
     static final class DoOnSubscribeSingleObserver<T> implements SingleObserver<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java
index d4a9f54737..d914799640 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java
@@ -39,7 +39,7 @@ public SingleFlatMapCompletable(SingleSource<T> source, Function<? super T, ? ex
 
     @Override
     protected void subscribeActual(CompletableObserver observer) {
-        FlatMapCompletableObserver<T> parent = new FlatMapCompletableObserver<T>(observer, mapper);
+        FlatMapCompletableObserver<T> parent = new FlatMapCompletableObserver<>(observer, mapper);
         observer.onSubscribe(parent);
         source.subscribe(parent);
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
index 0d9e4aee0f..9e05a25ef8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
@@ -48,7 +48,7 @@ public SingleFlatMapIterableFlowable(SingleSource<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-        source.subscribe(new FlatMapIterableObserver<T, R>(s, mapper));
+        source.subscribe(new FlatMapIterableObserver<>(s, mapper));
     }
 
     static final class FlatMapIterableObserver<T, R>
@@ -273,7 +273,7 @@ public boolean isEmpty() {
 
         @Nullable
         @Override
-        public R poll() throws Exception {
+        public R poll() {
             Iterator<? extends R> iterator = it;
 
             if (iterator != null) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java
index 795f60a3ca..add137d7cb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java
@@ -44,7 +44,7 @@ public SingleFlatMapIterableObservable(SingleSource<T> source,
 
     @Override
     protected void subscribeActual(Observer<? super R> observer) {
-        source.subscribe(new FlatMapIterableObserver<T, R>(observer, mapper));
+        source.subscribe(new FlatMapIterableObserver<>(observer, mapper));
     }
 
     static final class FlatMapIterableObserver<T, R>
@@ -183,7 +183,7 @@ public boolean isEmpty() {
 
         @Nullable
         @Override
-        public R poll() throws Exception {
+        public R poll() {
             Iterator<? extends R> iterator = it;
 
             if (iterator != null) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
index 4a636ba337..f474830e40 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
@@ -56,7 +56,7 @@ public SingleFlatMapPublisher(SingleSource<T> source,
 
     @Override
     protected void subscribeActual(Subscriber<? super R> downstream) {
-        source.subscribe(new SingleFlatMapPublisherObserver<T, R>(downstream, mapper));
+        source.subscribe(new SingleFlatMapPublisherObserver<>(downstream, mapper));
     }
 
     static final class SingleFlatMapPublisherObserver<S, T> extends AtomicLong
@@ -73,7 +73,7 @@ static final class SingleFlatMapPublisherObserver<S, T> extends AtomicLong
                 Function<? super S, ? extends Publisher<? extends T>> mapper) {
             this.downstream = actual;
             this.mapper = mapper;
-            this.parent = new AtomicReference<Subscription>();
+            this.parent = new AtomicReference<>();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
index 8c322ada64..95ed46144c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
@@ -36,17 +36,17 @@ enum NoSuchElementCallable implements Supplier<NoSuchElementException>, Callable
         INSTANCE;
 
         @Override
-        public NoSuchElementException call() throws Exception {
+        public NoSuchElementException call() {
             return new NoSuchElementException();
         }
 
         @Override
-        public NoSuchElementException get() throws Throwable {
+        public NoSuchElementException get() {
             return new NoSuchElementException();
         }
     }
 
-    public static <T> Supplier<NoSuchElementException> emptyThrower() {
+    public static Supplier<NoSuchElementException> emptyThrower() {
         return NoSuchElementCallable.INSTANCE;
     }
 
@@ -79,7 +79,7 @@ public boolean hasNext() {
 
         @Override
         public Flowable<T> next() {
-            return new SingleToFlowable<T>(sit.next());
+            return new SingleToFlowable<>(sit.next());
         }
 
         @Override
@@ -98,12 +98,12 @@ static final class ToFlowableIterable<T> implements Iterable<Flowable<T>> {
 
         @Override
         public Iterator<Flowable<T>> iterator() {
-            return new ToFlowableIterator<T>(sources.iterator());
+            return new ToFlowableIterator<>(sources.iterator());
         }
     }
 
     public static <T> Iterable<? extends Flowable<T>> iterableToFlowable(final Iterable<? extends SingleSource<? extends T>> sources) {
-        return new ToFlowableIterable<T>(sources);
+        return new ToFlowableIterable<>(sources);
     }
 
     @SuppressWarnings("rawtypes")
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java
index fd0afc2f98..1ffbfe073a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java
@@ -34,6 +34,6 @@ public SingleMaterialize(Single<T> source) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super Notification<T>> observer) {
-        source.subscribe(new MaterializeSingleObserver<T>(observer));
+        source.subscribe(new MaterializeSingleObserver<>(observer));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java
index 035f458e11..168a88ee8e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java
@@ -32,7 +32,7 @@ public SingleObserveOn(SingleSource<T> source, Scheduler scheduler) {
 
     @Override
     protected void subscribeActual(final SingleObserver<? super T> observer) {
-        source.subscribe(new ObserveOnSingleObserver<T>(observer, scheduler));
+        source.subscribe(new ObserveOnSingleObserver<>(observer, scheduler));
     }
 
     static final class ObserveOnSingleObserver<T> extends AtomicReference<Disposable>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java
index 6f768591e8..070b244747 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java
@@ -36,7 +36,7 @@ public SingleResumeNext(SingleSource<? extends T> source,
 
     @Override
     protected void subscribeActual(final SingleObserver<? super T> observer) {
-        source.subscribe(new ResumeMainSingleObserver<T>(observer, nextFunction));
+        source.subscribe(new ResumeMainSingleObserver<>(observer, nextFunction));
     }
 
     static final class ResumeMainSingleObserver<T> extends AtomicReference<Disposable>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java
index 79187148cd..3347fc1989 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java
@@ -31,7 +31,7 @@ public SingleSubscribeOn(SingleSource<? extends T> source, Scheduler scheduler)
 
     @Override
     protected void subscribeActual(final SingleObserver<? super T> observer) {
-        final SubscribeOnObserver<T> parent = new SubscribeOnObserver<T>(observer, source);
+        final SubscribeOnObserver<T> parent = new SubscribeOnObserver<>(observer, source);
         observer.onSubscribe(parent);
 
         Disposable f = scheduler.scheduleDirect(parent);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java
index e69ac1b118..50e8b89763 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java
@@ -43,7 +43,7 @@ public SingleTakeUntil(SingleSource<T> source, Publisher<U> other) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        TakeUntilMainObserver<T> parent = new TakeUntilMainObserver<T>(observer);
+        TakeUntilMainObserver<T> parent = new TakeUntilMainObserver<>(observer);
         observer.onSubscribe(parent);
 
         other.subscribe(parent.other);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java
index 1cb417c8db..f529d02446 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java
@@ -47,7 +47,7 @@ public SingleTimeout(SingleSource<T> source, long timeout, TimeUnit unit, Schedu
     @Override
     protected void subscribeActual(final SingleObserver<? super T> observer) {
 
-        TimeoutMainObserver<T> parent = new TimeoutMainObserver<T>(observer, other, timeout, unit);
+        TimeoutMainObserver<T> parent = new TimeoutMainObserver<>(observer, other, timeout, unit);
         observer.onSubscribe(parent);
 
         DisposableHelper.replace(parent.task, scheduler.scheduleDirect(parent, timeout, unit));
@@ -103,9 +103,9 @@ public void onError(Throwable e) {
             this.other = other;
             this.timeout = timeout;
             this.unit = unit;
-            this.task = new AtomicReference<Disposable>();
+            this.task = new AtomicReference<>();
             if (other != null) {
-                this.fallback = new TimeoutFallbackObserver<T>(actual);
+                this.fallback = new TimeoutFallbackObserver<>(actual);
             } else {
                 this.fallback = null;
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java
index 18ecef340f..810adaea3f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java
@@ -44,7 +44,7 @@ public void subscribeActual(final Observer<? super T> observer) {
      * @since 2.2
      */
     public static <T> SingleObserver<T> create(Observer<? super T> downstream) {
-        return new SingleToObservableObserver<T>(downstream);
+        return new SingleToObservableObserver<>(downstream);
     }
 
     static final class SingleToObservableObserver<T>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java
index 3f5b20b20c..9a78d61bb7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java
@@ -37,7 +37,7 @@ public SingleUnsubscribeOn(SingleSource<T> source, Scheduler scheduler) {
 
     @Override
     protected void subscribeActual(SingleObserver<? super T> observer) {
-        source.subscribe(new UnsubscribeOnSingleObserver<T>(observer, scheduler));
+        source.subscribe(new UnsubscribeOnSingleObserver<>(observer, scheduler));
     }
 
     static final class UnsubscribeOnSingleObserver<T> extends AtomicReference<Disposable>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
index b207476c95..9130a2bf35 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
@@ -40,11 +40,11 @@ protected void subscribeActual(SingleObserver<? super R> observer) {
         int n = sources.length;
 
         if (n == 1) {
-            sources[0].subscribe(new SingleMap.MapSingleObserver<T, R>(observer, new SingletonArrayFunc()));
+            sources[0].subscribe(new SingleMap.MapSingleObserver<>(observer, new SingletonArrayFunc()));
             return;
         }
 
-        ZipCoordinator<T, R> parent = new ZipCoordinator<T, R>(observer, n, zipper);
+        ZipCoordinator<T, R> parent = new ZipCoordinator<>(observer, n, zipper);
 
         observer.onSubscribe(parent);
 
@@ -83,7 +83,7 @@ static final class ZipCoordinator<T, R> extends AtomicInteger implements Disposa
             this.zipper = zipper;
             ZipSingleObserver<T>[] o = new ZipSingleObserver[n];
             for (int i = 0; i < n; i++) {
-                o[i] = new ZipSingleObserver<T>(this, i);
+                o[i] = new ZipSingleObserver<>(this, i);
             }
             this.observers = o;
             this.values = new Object[n];
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java
index b41538aeb4..ad393987be 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java
@@ -61,11 +61,11 @@ protected void subscribeActual(SingleObserver<? super R> observer) {
         }
 
         if (n == 1) {
-            a[0].subscribe(new SingleMap.MapSingleObserver<T, R>(observer, new SingletonArrayFunc()));
+            a[0].subscribe(new SingleMap.MapSingleObserver<>(observer, new SingletonArrayFunc()));
             return;
         }
 
-        ZipCoordinator<T, R> parent = new ZipCoordinator<T, R>(observer, n, zipper);
+        ZipCoordinator<T, R> parent = new ZipCoordinator<>(observer, n, zipper);
 
         observer.onSubscribe(parent);
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
index 8458e8d876..31fe6eca9b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
@@ -32,9 +32,9 @@ public final class MpscLinkedQueue<T> implements SimplePlainQueue<T> {
     private final AtomicReference<LinkedQueueNode<T>> consumerNode;
 
     public MpscLinkedQueue() {
-        producerNode = new AtomicReference<LinkedQueueNode<T>>();
-        consumerNode = new AtomicReference<LinkedQueueNode<T>>();
-        LinkedQueueNode<T> node = new LinkedQueueNode<T>();
+        producerNode = new AtomicReference<>();
+        consumerNode = new AtomicReference<>();
+        LinkedQueueNode<T> node = new LinkedQueueNode<>();
         spConsumerNode(node);
         xchgProducerNode(node); // this ensures correct construction: StoreLoad
     }
@@ -59,7 +59,7 @@ public boolean offer(final T e) {
         if (null == e) {
             throw new NullPointerException("Null is not a valid element");
         }
-        final LinkedQueueNode<T> nextNode = new LinkedQueueNode<T>(e);
+        final LinkedQueueNode<T> nextNode = new LinkedQueueNode<>(e);
         final LinkedQueueNode<T> prevProducerNode = xchgProducerNode(nextNode);
         // Should a producer thread get interrupted here the chain WILL be broken until that thread is resumed
         // and completes the store in prev.next.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java
index 4a2a182dfc..2bd61dcc15 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java
@@ -48,7 +48,7 @@ public final class SpscLinkedArrayQueue<T> implements SimplePlainQueue<T> {
     public SpscLinkedArrayQueue(final int bufferSize) {
         int p2capacity = Pow2.roundToPowerOfTwo(Math.max(8, bufferSize));
         int mask = p2capacity - 1;
-        AtomicReferenceArray<Object> buffer = new AtomicReferenceArray<Object>(p2capacity + 1);
+        AtomicReferenceArray<Object> buffer = new AtomicReferenceArray<>(p2capacity + 1);
         producerBuffer = buffer;
         producerMask = mask;
         adjustLookAheadStep(p2capacity);
@@ -100,7 +100,7 @@ private boolean writeToQueue(final AtomicReferenceArray<Object> buffer, final T
     private void resize(final AtomicReferenceArray<Object> oldBuffer, final long currIndex, final int offset, final T e,
             final long mask) {
         final int capacity = oldBuffer.length();
-        final AtomicReferenceArray<Object> newBuffer = new AtomicReferenceArray<Object>(capacity);
+        final AtomicReferenceArray<Object> newBuffer = new AtomicReferenceArray<>(capacity);
         producerBuffer = newBuffer;
         producerLookAhead = currIndex + mask - 1;
         soElement(newBuffer, offset, e); // StoreStore
@@ -247,7 +247,7 @@ private static void soElement(AtomicReferenceArray<Object> buffer, int offset, O
         buffer.lazySet(offset, e);
     }
 
-    private static <E> Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
+    private static Object lvElement(AtomicReferenceArray<Object> buffer, int offset) {
         return buffer.get(offset);
     }
 
@@ -273,7 +273,7 @@ public boolean offer(T first, T second) {
             soProducerIndex(p + 2);
         } else {
             final int capacity = buffer.length();
-            final AtomicReferenceArray<Object> newBuffer = new AtomicReferenceArray<Object>(capacity);
+            final AtomicReferenceArray<Object> newBuffer = new AtomicReferenceArray<>(capacity);
             producerBuffer = newBuffer;
 
             pi = calcWrappedOffset(p, m);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
index 2788bdfec6..a1c4bc2ce1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
@@ -37,9 +37,9 @@ abstract class AbstractDirectTask
 
     protected Thread runner;
 
-    protected static final FutureTask<Void> FINISHED = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+    protected static final FutureTask<Void> FINISHED = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
 
-    protected static final FutureTask<Void> DISPOSED = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+    protected static final FutureTask<Void> DISPOSED = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
 
     AbstractDirectTask(Runnable runnable) {
         this.runnable = runnable;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java
index eb686b17e0..e0bf388772 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java
@@ -135,7 +135,7 @@ public ComputationScheduler() {
      */
     public ComputationScheduler(ThreadFactory threadFactory) {
         this.threadFactory = threadFactory;
-        this.pool = new AtomicReference<FixedSchedulerPool>(NONE);
+        this.pool = new AtomicReference<>(NONE);
         start();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java
index 231cb5b3f2..370fb5d8a2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java
@@ -15,6 +15,7 @@
 
 import java.util.concurrent.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
@@ -46,13 +47,12 @@ public boolean isDone() {
     }
 
     @Override
-    public Object get() throws InterruptedException, ExecutionException {
+    public Object get() {
         return null;
     }
 
     @Override
-    public Object get(long timeout, TimeUnit unit)
-            throws InterruptedException, ExecutionException, TimeoutException {
+    public Object get(long timeout, @NonNull TimeUnit unit) {
         return null;
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
index 8fd7b33720..a9547e64e1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
@@ -140,7 +140,7 @@ public static final class ExecutorWorker extends Scheduler.Worker implements Run
 
         public ExecutorWorker(Executor executor, boolean interruptibleWorker, boolean fair) {
             this.executor = executor;
-            this.queue = new MpscLinkedQueue<Runnable>();
+            this.queue = new MpscLinkedQueue<>();
             this.interruptibleWorker = interruptibleWorker;
             this.fair = fair;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
index 5df8793ebb..a855b44683 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
@@ -39,18 +39,18 @@ final class InstantPeriodicTask implements Callable<Void>, Disposable {
 
     Thread runner;
 
-    static final FutureTask<Void> CANCELLED = new FutureTask<Void>(Functions.EMPTY_RUNNABLE, null);
+    static final FutureTask<Void> CANCELLED = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
 
     InstantPeriodicTask(Runnable task, ExecutorService executor) {
         super();
         this.task = task;
-        this.first = new AtomicReference<Future<?>>();
-        this.rest = new AtomicReference<Future<?>>();
+        this.first = new AtomicReference<>();
+        this.rest = new AtomicReference<>();
         this.executor = executor;
     }
 
     @Override
-    public Void call() throws Exception {
+    public Void call() {
         runner = Thread.currentThread();
         try {
             task.run();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
index f4edcf0208..3a4bac58b2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
@@ -77,7 +77,7 @@ static final class CachedWorkerPool implements Runnable {
 
         CachedWorkerPool(long keepAliveTime, TimeUnit unit, ThreadFactory threadFactory) {
             this.keepAliveTime = unit != null ? unit.toNanos(keepAliveTime) : 0L;
-            this.expiringWorkerQueue = new ConcurrentLinkedQueue<ThreadWorker>();
+            this.expiringWorkerQueue = new ConcurrentLinkedQueue<>();
             this.allWorkers = new CompositeDisposable();
             this.threadFactory = threadFactory;
 
@@ -164,7 +164,7 @@ public IoScheduler() {
      */
     public IoScheduler(ThreadFactory threadFactory) {
         this.threadFactory = threadFactory;
-        this.pool = new AtomicReference<CachedWorkerPool>(NONE);
+        this.pool = new AtomicReference<>(NONE);
         start();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java
index 7d0646056d..5bd0614b89 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java
@@ -13,6 +13,8 @@
 
 package io.reactivex.rxjava3.internal.schedulers;
 
+import io.reactivex.rxjava3.annotations.NonNull;
+
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -47,7 +49,7 @@ public RxThreadFactory(String prefix, int priority, boolean nonBlocking) {
     }
 
     @Override
-    public Thread newThread(Runnable r) {
+    public Thread newThread(@NonNull Runnable r) {
         StringBuilder nameBuilder = new StringBuilder(prefix).append('-').append(incrementAndGet());
 
 //        if (CREATE_TRACE) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
index 89bd9d3d01..d48ccf8ab6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
@@ -32,7 +32,7 @@ public ScheduledDirectTask(Runnable runnable) {
     }
 
     @Override
-    public Void call() throws Exception {
+    public Void call() {
         runner = Thread.currentThread();
         try {
             runnable.run();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
index 392a3c3051..333d4ded9e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
@@ -47,12 +47,12 @@ private SchedulerPoolFactory() {
     public static final int PURGE_PERIOD_SECONDS;
 
     static final AtomicReference<ScheduledExecutorService> PURGE_THREAD =
-            new AtomicReference<ScheduledExecutorService>();
+            new AtomicReference<>();
 
     // Upcast to the Map interface here to avoid 8.x compatibility issues.
     // See http://stackoverflow.com/a/32955708/61158
     static final Map<ScheduledThreadPoolExecutor, Object> POOLS =
-            new ConcurrentHashMap<ScheduledThreadPoolExecutor, Object>();
+            new ConcurrentHashMap<>();
 
     /**
      * Starts the purge thread if not already started.
@@ -134,7 +134,7 @@ static boolean getBooleanProperty(boolean enabled, String key, boolean defaultNo
 
     static final class SystemPropertyAccessor implements Function<String, String> {
         @Override
-        public String apply(String t) throws Throwable {
+        public String apply(String t) {
             return System.getProperty(t);
         }
     }
@@ -160,7 +160,7 @@ static void tryPutIntoPool(boolean purgeEnabled, ScheduledExecutorService exec)
     static final class ScheduledTask implements Runnable {
         @Override
         public void run() {
-            for (ScheduledThreadPoolExecutor e : new ArrayList<ScheduledThreadPoolExecutor>(POOLS.keySet())) {
+            for (ScheduledThreadPoolExecutor e : new ArrayList<>(POOLS.keySet())) {
                 if (e.isShutdown()) {
                     POOLS.remove(e);
                 } else {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
index a1dba3036b..13c7430f94 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
@@ -28,7 +28,7 @@
 public final class SingleScheduler extends Scheduler {
 
     final ThreadFactory threadFactory;
-    final AtomicReference<ScheduledExecutorService> executor = new AtomicReference<ScheduledExecutorService>();
+    final AtomicReference<ScheduledExecutorService> executor = new AtomicReference<>();
 
     /** The name of the system property for setting the thread priority for this Scheduler. */
     private static final String KEY_SINGLE_PRIORITY = "rx3.single-priority";
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
index b8a164f9e1..5ddd867783 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
@@ -66,7 +66,7 @@ public Disposable scheduleDirect(@NonNull Runnable run, long delay, TimeUnit uni
     }
 
     static final class TrampolineWorker extends Scheduler.Worker implements Disposable {
-        final PriorityBlockingQueue<TimedRunnable> queue = new PriorityBlockingQueue<TimedRunnable>();
+        final PriorityBlockingQueue<TimedRunnable> queue = new PriorityBlockingQueue<>();
 
         private final AtomicInteger wip = new AtomicInteger();
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java
index 1e09f5b414..59edd4f80d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java
@@ -19,6 +19,7 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.core.FlowableSubscriber;
@@ -42,7 +43,7 @@ public final class FutureSubscriber<T> extends CountDownLatch
 
     public FutureSubscriber() {
         super(1);
-        this.upstream = new AtomicReference<Subscription>();
+        this.upstream = new AtomicReference<>();
     }
 
     @Override
@@ -91,7 +92,7 @@ public T get() throws InterruptedException, ExecutionException {
     }
 
     @Override
-    public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+    public T get(long timeout, @NonNull TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
         if (getCount() != 0) {
             BlockingHelper.verifyNonBlocking();
             if (!await(timeout, unit)) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java
index 32668ed4d9..f351126044 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java
@@ -57,7 +57,7 @@ public StrictSubscriber(Subscriber<? super T> downstream) {
         this.downstream = downstream;
         this.error = new AtomicThrowable();
         this.requested = new AtomicLong();
-        this.upstream = new AtomicReference<Subscription>();
+        this.upstream = new AtomicReference<>();
         this.once = new AtomicBoolean();
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java
index 55d052c705..4c9b6b4930 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java
@@ -28,7 +28,7 @@ public final class SubscriberResourceWrapper<T> extends AtomicReference<Disposab
 
     final Subscriber<? super T> downstream;
 
-    final AtomicReference<Subscription> upstream = new AtomicReference<Subscription>();
+    final AtomicReference<Subscription> upstream = new AtomicReference<>();
 
     public SubscriberResourceWrapper(Subscriber<? super T> downstream) {
         this.downstream = downstream;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java
index 370c45ffbe..62973e7440 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java
@@ -35,8 +35,8 @@ public final class AsyncSubscription extends AtomicLong implements Subscription,
     final AtomicReference<Disposable> resource;
 
     public AsyncSubscription() {
-        resource = new AtomicReference<Disposable>();
-        actual = new AtomicReference<Subscription>();
+        resource = new AtomicReference<>();
+        actual = new AtomicReference<>();
     }
 
     public AsyncSubscription(Disposable resource) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java
index 6a50ab07dc..44c5fe5845 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java
@@ -63,7 +63,7 @@ public class SubscriptionArbiter extends AtomicInteger implements Subscription {
 
     public SubscriptionArbiter(boolean cancelOnReplace) {
         this.cancelOnReplace = cancelOnReplace;
-        missedSubscription = new AtomicReference<Subscription>();
+        missedSubscription = new AtomicReference<>();
         missedRequested = new AtomicLong();
         missedProduced = new AtomicLong();
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java
index 1f82daf237..7338c99040 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java
@@ -32,10 +32,10 @@ public static <T, O> Function<O, List<T>> asFunction() {
 
     @Override
     public List<Object> get() {
-        return new ArrayList<Object>();
+        return new ArrayList<>();
     }
 
     @Override public List<Object> apply(Object o) {
-        return new ArrayList<Object>();
+        return new ArrayList<>();
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java b/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java
index 4d4f160a8a..63fd12dc99 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java
@@ -23,7 +23,7 @@ public final class ConnectConsumer implements Consumer<Disposable> {
     public Disposable disposable;
 
     @Override
-    public void accept(Disposable t) throws Exception {
+    public void accept(Disposable t) {
         this.disposable = t;
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java
index c4aaadb343..8b9d62317a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java
@@ -52,7 +52,7 @@ public static RuntimeException wrapOrThrow(Throwable error) {
      */
     public static final Throwable TERMINATED = new Termination();
 
-    public static <T> boolean addThrowable(AtomicReference<Throwable> field, Throwable exception) {
+    public static boolean addThrowable(AtomicReference<Throwable> field, Throwable exception) {
         for (;;) {
             Throwable current = field.get();
 
@@ -73,7 +73,7 @@ public static <T> boolean addThrowable(AtomicReference<Throwable> field, Throwab
         }
     }
 
-    public static <T> Throwable terminate(AtomicReference<Throwable> field) {
+    public static Throwable terminate(AtomicReference<Throwable> field) {
         Throwable current = field.get();
         if (current != TERMINATED) {
             current = field.getAndSet(TERMINATED);
@@ -87,8 +87,8 @@ public static <T> Throwable terminate(AtomicReference<Throwable> field) {
      * @return the list of Throwables flattened in a depth-first manner
      */
     public static List<Throwable> flatten(Throwable t) {
-        List<Throwable> list = new ArrayList<Throwable>();
-        ArrayDeque<Throwable> deque = new ArrayDeque<Throwable>();
+        List<Throwable> list = new ArrayList<>();
+        ArrayDeque<Throwable> deque = new ArrayDeque<>();
         deque.offer(t);
 
         while (!deque.isEmpty()) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java
index 22d9900d19..46236ff293 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java
@@ -26,6 +26,6 @@ public static <K, V> Supplier<Map<K, V>> asSupplier() {
     }
 
     @Override public Map<Object, Object> get() {
-        return new HashMap<Object, Object>();
+        return new HashMap<>();
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java b/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java
index f4b1d4aae2..08d675a4af 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java
@@ -92,7 +92,7 @@ public int size() {
     public String toString() {
         final int cap = capacityHint;
         final int s = size;
-        final List<Object> list = new ArrayList<Object>(s + 1);
+        final List<Object> list = new ArrayList<>(s + 1);
 
         Object[] h = head();
         int j = 0;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java b/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java
index 9f484f1700..cd6c8e9750 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java
@@ -28,7 +28,7 @@ public static <T> BiFunction<List<T>, T, List<T>> instance() {
 
     @SuppressWarnings("unchecked")
     @Override
-    public List apply(List t1, Object t2) throws Exception {
+    public List apply(List t1, Object t2) {
         t1.add(t2);
         return t1;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java b/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java
index 9efe097a7c..64d9faff71 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java
@@ -30,12 +30,12 @@ public MergerBiFunction(Comparator<? super T> comparator) {
     }
 
     @Override
-    public List<T> apply(List<T> a, List<T> b) throws Exception {
+    public List<T> apply(List<T> a, List<T> b) {
         int n = a.size() + b.size();
         if (n == 0) {
-            return new ArrayList<T>();
+            return new ArrayList<>();
         }
-        List<T> both = new ArrayList<T>(n);
+        List<T> both = new ArrayList<>(n);
 
         Iterator<T> at = a.iterator();
         Iterator<T> bt = b.iterator();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
index 9cdfab07ce..9808e2fe0d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
@@ -212,9 +212,9 @@ public static <T, U> boolean checkTerminated(boolean d, boolean empty,
      */
     public static <T> SimpleQueue<T> createQueue(int capacityHint) {
         if (capacityHint < 0) {
-            return new SpscLinkedArrayQueue<T>(-capacityHint);
+            return new SpscLinkedArrayQueue<>(-capacityHint);
         }
-        return new SpscArrayQueue<T>(capacityHint);
+        return new SpscArrayQueue<>(capacityHint);
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java b/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java
index 5a9929f604..a62efd154f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java
@@ -26,7 +26,7 @@ public SorterFunction(Comparator<? super T> comparator) {
     }
 
     @Override
-    public List<T> apply(List<T> t) throws Exception {
+    public List<T> apply(List<T> t) {
         Collections.sort(t, comparator);
         return t;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java b/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java
index 301dc634fa..33e1e18a56 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java
@@ -13,6 +13,8 @@
 
 package io.reactivex.rxjava3.internal.util;
 
+import io.reactivex.rxjava3.annotations.NonNull;
+
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -29,11 +31,11 @@ public final class VolatileSizeArrayList<T> extends AtomicInteger implements Lis
     final ArrayList<T> list;
 
     public VolatileSizeArrayList() {
-        list = new ArrayList<T>();
+        list = new ArrayList<>();
     }
 
     public VolatileSizeArrayList(int initialCapacity) {
-        list = new ArrayList<T>(initialCapacity);
+        list = new ArrayList<>(initialCapacity);
     }
 
     @Override
@@ -62,7 +64,7 @@ public Object[] toArray() {
     }
 
     @Override
-    public <E> E[] toArray(E[] a) {
+    public <E> E[] toArray(@NonNull E[] a) {
         return list.toArray(a);
     }
 
@@ -81,33 +83,33 @@ public boolean remove(Object o) {
     }
 
     @Override
-    public boolean containsAll(Collection<?> c) {
+    public boolean containsAll(@NonNull Collection<?> c) {
         return list.containsAll(c);
     }
 
     @Override
-    public boolean addAll(Collection<? extends T> c) {
+    public boolean addAll(@NonNull Collection<? extends T> c) {
         boolean b = list.addAll(c);
         lazySet(list.size());
         return b;
     }
 
     @Override
-    public boolean addAll(int index, Collection<? extends T> c) {
+    public boolean addAll(int index, @NonNull Collection<? extends T> c) {
         boolean b = list.addAll(index, c);
         lazySet(list.size());
         return b;
     }
 
     @Override
-    public boolean removeAll(Collection<?> c) {
+    public boolean removeAll(@NonNull Collection<?> c) {
         boolean b = list.removeAll(c);
         lazySet(list.size());
         return b;
     }
 
     @Override
-    public boolean retainAll(Collection<?> c) {
+    public boolean retainAll(@NonNull Collection<?> c) {
         boolean b = list.retainAll(c);
         lazySet(list.size());
         return b;
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index c8fbf203ef..ea09fb53d4 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -24,7 +24,6 @@
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.operators.parallel.*;
-import io.reactivex.rxjava3.internal.operators.parallel.ParallelReduceFull;
 import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -161,7 +160,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
         ObjectHelper.verifyPositive(parallelism, "parallelism");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
 
-        return RxJavaPlugins.onAssembly(new ParallelFromPublisher<T>(source, parallelism, prefetch));
+        return RxJavaPlugins.onAssembly(new ParallelFromPublisher<>(source, parallelism, prefetch));
     }
 
     /**
@@ -185,7 +184,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper");
-        return RxJavaPlugins.onAssembly(new ParallelMap<T, R>(this, mapper));
+        return RxJavaPlugins.onAssembly(new ParallelMap<>(this, mapper));
     }
 
     /**
@@ -215,7 +214,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull ParallelFailureHandling errorHandler) {
         Objects.requireNonNull(mapper, "mapper");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
-        return RxJavaPlugins.onAssembly(new ParallelMapTry<T, R>(this, mapper, errorHandler));
+        return RxJavaPlugins.onAssembly(new ParallelMapTry<>(this, mapper, errorHandler));
     }
 
     /**
@@ -246,7 +245,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
         Objects.requireNonNull(mapper, "mapper");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
-        return RxJavaPlugins.onAssembly(new ParallelMapTry<T, R>(this, mapper, errorHandler));
+        return RxJavaPlugins.onAssembly(new ParallelMapTry<>(this, mapper, errorHandler));
     }
 
     /**
@@ -620,8 +619,8 @@ public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator, int c
         Objects.requireNonNull(comparator, "comparator is null");
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         int ch = capacityHint / parallelism() + 1;
-        ParallelFlowable<List<T>> railReduced = reduce(Functions.<T>createArrayList(ch), ListAddBiConsumer.<T>instance());
-        ParallelFlowable<List<T>> railSorted = railReduced.map(new SorterFunction<T>(comparator));
+        ParallelFlowable<List<T>> railReduced = reduce(Functions.createArrayList(ch), ListAddBiConsumer.instance());
+        ParallelFlowable<List<T>> railSorted = railReduced.map(new SorterFunction<>(comparator));
 
         return RxJavaPlugins.onAssembly(new ParallelSortedJoin<>(railSorted, comparator));
     }
@@ -673,10 +672,10 @@ public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> compa
         ObjectHelper.verifyPositive(capacityHint, "capacityHint");
 
         int ch = capacityHint / parallelism() + 1;
-        ParallelFlowable<List<T>> railReduced = reduce(Functions.<T>createArrayList(ch), ListAddBiConsumer.<T>instance());
-        ParallelFlowable<List<T>> railSorted = railReduced.map(new SorterFunction<T>(comparator));
+        ParallelFlowable<List<T>> railReduced = reduce(Functions.createArrayList(ch), ListAddBiConsumer.instance());
+        ParallelFlowable<List<T>> railSorted = railReduced.map(new SorterFunction<>(comparator));
 
-        Flowable<List<T>> merged = railSorted.reduce(new MergerBiFunction<T>(comparator));
+        Flowable<List<T>> merged = railSorted.reduce(new MergerBiFunction<>(comparator));
 
         return RxJavaPlugins.onAssembly(merged);
     }
@@ -1008,7 +1007,7 @@ public final ParallelFlowable<T> doOnCancel(@NonNull Action onCancel) {
     public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> collectionSupplier, @NonNull BiConsumer<? super C, ? super T> collector) {
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
-        return RxJavaPlugins.onAssembly(new ParallelCollect<T, C>(this, collectionSupplier, collector));
+        return RxJavaPlugins.onAssembly(new ParallelCollect<>(this, collectionSupplier, collector));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index ea300afe34..8a20c9140d 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -558,7 +558,7 @@ void drain() {
                         }
 
                         if (as != bs) {
-                            continue outer;
+                            continue;
                         }
 
                         if (done && q.isEmpty()) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index 9b722057b9..b7880d6833 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -30,7 +30,7 @@
 /**
  * Replays events to Subscribers.
  * <p>
- * The {@code ReplayProcessor} supports the following item retainment strategies:
+ * The {@code ReplayProcessor} supports the following item retention strategies:
  * <ul>
  * <li>{@link #create()} and {@link #create(int)}: retains and replays all events to current and
  * future {@code Subscriber}s.
@@ -173,7 +173,7 @@ public final class ReplayProcessor<T> extends FlowableProcessor<T> {
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> create() {
-        return new ReplayProcessor<>(new UnboundedReplayBuffer<T>(16));
+        return new ReplayProcessor<>(new UnboundedReplayBuffer<>(16));
     }
 
     /**
@@ -194,7 +194,7 @@ public static <T> ReplayProcessor<T> create() {
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> create(int capacityHint) {
-        return new ReplayProcessor<>(new UnboundedReplayBuffer<T>(capacityHint));
+        return new ReplayProcessor<>(new UnboundedReplayBuffer<>(capacityHint));
     }
 
     /**
@@ -220,7 +220,7 @@ public static <T> ReplayProcessor<T> create(int capacityHint) {
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> createWithSize(int maxSize) {
-        return new ReplayProcessor<>(new SizeBoundReplayBuffer<T>(maxSize));
+        return new ReplayProcessor<>(new SizeBoundReplayBuffer<>(maxSize));
     }
 
     /**
@@ -238,7 +238,7 @@ public static <T> ReplayProcessor<T> createWithSize(int maxSize) {
      */
     @CheckReturnValue
     /* test */ static <T> ReplayProcessor<T> createUnbounded() {
-        return new ReplayProcessor<>(new SizeBoundReplayBuffer<T>(Integer.MAX_VALUE));
+        return new ReplayProcessor<>(new SizeBoundReplayBuffer<>(Integer.MAX_VALUE));
     }
 
     /**
@@ -276,7 +276,7 @@ public static <T> ReplayProcessor<T> createWithSize(int maxSize) {
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> createWithTime(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return new ReplayProcessor<>(new SizeAndTimeBoundReplayBuffer<T>(Integer.MAX_VALUE, maxAge, unit, scheduler));
+        return new ReplayProcessor<>(new SizeAndTimeBoundReplayBuffer<>(Integer.MAX_VALUE, maxAge, unit, scheduler));
     }
 
     /**
@@ -316,7 +316,7 @@ public static <T> ReplayProcessor<T> createWithTime(long maxAge, @NonNull TimeUn
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> createWithTimeAndSize(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int maxSize) {
-        return new ReplayProcessor<>(new SizeAndTimeBoundReplayBuffer<T>(maxSize, maxAge, unit, scheduler));
+        return new ReplayProcessor<>(new SizeAndTimeBoundReplayBuffer<>(maxSize, maxAge, unit, scheduler));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 254511f5e0..4d4c3517a5 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -112,8 +112,8 @@ private Schedulers() {
      * before the {@link Schedulers} class is referenced in your code.
      * <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
      * <ul>
-     * <li>{@code rx3.computation-threads} (int): sets the number of threads in the {@link #computation()} Scheduler, default is the number of available CPUs</li>
-     * <li>{@code rx3.computation-priority} (int): sets the thread priority of the {@link #computation()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+     * <li>{@code rx3.computation-threads} (int): sets the number of threads in the {@code computation()} Scheduler, default is the number of available CPUs</li>
+     * <li>{@code rx3.computation-priority} (int): sets the thread priority of the {@code computation()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
      * </ul>
      * <p>
      * The default value of this scheduler can be overridden at initialization time via the
@@ -157,8 +157,8 @@ public static Scheduler computation() {
      * before the {@link Schedulers} class is referenced in your code.
      * <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
      * <ul>
-     * <li>{@code rx3.io-keep-alive-time} (long): sets the keep-alive time of the {@link #io()} Scheduler workers, default is {@link IoScheduler#KEEP_ALIVE_TIME_DEFAULT}</li>
-     * <li>{@code rx3.io-priority} (int): sets the thread priority of the {@link #io()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+     * <li>{@code rx3.io-keep-alive-time} (long): sets the keep-alive time of the {@code io()} Scheduler workers, default is {@link IoScheduler#KEEP_ALIVE_TIME_DEFAULT}</li>
+     * <li>{@code rx3.io-priority} (int): sets the thread priority of the {@code io()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
      * </ul>
      * <p>
      * The default value of this scheduler can be overridden at initialization time via the
@@ -216,7 +216,7 @@ public static Scheduler trampoline() {
      * before the {@link Schedulers} class is referenced in your code.
      * <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
      * <ul>
-     * <li>{@code rx3.newthread-priority} (int): sets the thread priority of the {@link #newThread()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+     * <li>{@code rx3.newthread-priority} (int): sets the thread priority of the {@code newThread()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
      * </ul>
      * <p>
      * The default value of this scheduler can be overridden at initialization time via the
@@ -265,7 +265,7 @@ public static Scheduler newThread() {
      * before the {@link Schedulers} class is referenced in your code.
      * <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
      * <ul>
-     * <li>{@code rx3.single-priority} (int): sets the thread priority of the {@link #single()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+     * <li>{@code rx3.single-priority} (int): sets the thread priority of the {@code single()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
      * </ul>
      * <p>
      * The default value of this scheduler can be overridden at initialization time via the
@@ -522,28 +522,28 @@ public static void start() {
 
     static final class IOTask implements Supplier<Scheduler> {
         @Override
-        public Scheduler get() throws Exception {
+        public Scheduler get() {
             return IoHolder.DEFAULT;
         }
     }
 
     static final class NewThreadTask implements Supplier<Scheduler> {
         @Override
-        public Scheduler get() throws Exception {
+        public Scheduler get() {
             return NewThreadHolder.DEFAULT;
         }
     }
 
     static final class SingleTask implements Supplier<Scheduler> {
         @Override
-        public Scheduler get() throws Exception {
+        public Scheduler get() {
             return SingleHolder.DEFAULT;
         }
     }
 
     static final class ComputationTask implements Supplier<Scheduler> {
         @Override
-        public Scheduler get() throws Exception {
+        public Scheduler get() {
             return ComputationHolder.DEFAULT;
         }
     }
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
index 9bb3d93b99..efad31e669 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
@@ -160,7 +160,7 @@ public final class ReplaySubject<T> extends Subject<T> {
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> create() {
-        return new ReplaySubject<>(new UnboundedReplayBuffer<T>(16));
+        return new ReplaySubject<>(new UnboundedReplayBuffer<>(16));
     }
 
     /**
@@ -181,7 +181,7 @@ public static <T> ReplaySubject<T> create() {
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> create(int capacityHint) {
-        return new ReplaySubject<>(new UnboundedReplayBuffer<T>(capacityHint));
+        return new ReplaySubject<>(new UnboundedReplayBuffer<>(capacityHint));
     }
 
     /**
@@ -207,7 +207,7 @@ public static <T> ReplaySubject<T> create(int capacityHint) {
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> createWithSize(int maxSize) {
-        return new ReplaySubject<>(new SizeBoundReplayBuffer<T>(maxSize));
+        return new ReplaySubject<>(new SizeBoundReplayBuffer<>(maxSize));
     }
 
     /**
@@ -224,7 +224,7 @@ public static <T> ReplaySubject<T> createWithSize(int maxSize) {
      * @return the created subject
      */
     /* test */ static <T> ReplaySubject<T> createUnbounded() {
-        return new ReplaySubject<>(new SizeBoundReplayBuffer<T>(Integer.MAX_VALUE));
+        return new ReplaySubject<>(new SizeBoundReplayBuffer<>(Integer.MAX_VALUE));
     }
 
     /**
@@ -262,7 +262,7 @@ public static <T> ReplaySubject<T> createWithSize(int maxSize) {
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> createWithTime(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return new ReplaySubject<>(new SizeAndTimeBoundReplayBuffer<T>(Integer.MAX_VALUE, maxAge, unit, scheduler));
+        return new ReplaySubject<>(new SizeAndTimeBoundReplayBuffer<>(Integer.MAX_VALUE, maxAge, unit, scheduler));
     }
 
     /**
@@ -302,7 +302,7 @@ public static <T> ReplaySubject<T> createWithTime(long maxAge, @NonNull TimeUnit
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> createWithTimeAndSize(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int maxSize) {
-        return new ReplaySubject<>(new SizeAndTimeBoundReplayBuffer<T>(maxSize, maxAge, unit, scheduler));
+        return new ReplaySubject<>(new SizeAndTimeBoundReplayBuffer<>(maxSize, maxAge, unit, scheduler));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
index 8f495a9ca5..5e19604eed 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
@@ -30,7 +30,7 @@
 /**
  * A Subject that queues up events until a single {@link Observer} subscribes to it, replays
  * those events to it until the {@code Observer} catches up and then switches to relaying events live to
- * this single {@code Observer} until this {@code UnicastSubject} terminates or the {@code Observer} unsubscribes.
+ * this single {@code Observer} until this {@code UnicastSubject} terminates or the {@code Observer} disposes.
  * <p>
  * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/UnicastSubject.png" alt="">
  * <p>
@@ -48,10 +48,10 @@
  *     optionally delays an error it receives and replays it after the regular items have been emitted.</li>
  * <li>{@link #create(int, Runnable)} - creates an empty, unbounded {@code UnicastSubject}
  *     with a hint about how many <b>total</b> items one expects to retain and a callback that will be
- *     called exactly once when the {@code UnicastSubject} gets terminated or the single {@code Observer} unsubscribes.</li>
+ *     called exactly once when the {@code UnicastSubject} gets terminated or the single {@code Observer} disposes.</li>
  * <li>{@link #create(int, Runnable, boolean)} - creates an empty, unbounded {@code UnicastSubject}
  *     with a hint about how many <b>total</b> items one expects to retain and a callback that will be
- *     called exactly once when the {@code UnicastSubject} gets terminated or the single {@code Observer} unsubscribes
+ *     called exactly once when the {@code UnicastSubject} gets terminated or the single {@code Observer} disposes
  *     and optionally delays an error it receives and replays it after the regular items have been emitted.</li>
  * </ul>
  * <p>
@@ -510,7 +510,7 @@ public int requestFusion(int mode) {
 
         @Nullable
         @Override
-        public T poll() throws Exception {
+        public T poll() {
             return queue.poll();
         }
 

From 34f381ceec3fa0b5fc0a03c76161dc1cde2f09bc Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 28 Dec 2019 18:05:30 +0100
Subject: [PATCH 031/665] 3.x: [Java 8] Add flattenStreamAsX to Maybe/Single
 (#6805)

* 3.x: [Java 8] Add flattenStreamAsX to Maybe/Single

* Add RS TCK tests for flattenStreamAsFlowable
---
 .../java/io/reactivex/rxjava3/core/Maybe.java |  85 ++++
 .../io/reactivex/rxjava3/core/Observable.java |   1 +
 .../io/reactivex/rxjava3/core/Single.java     |  87 ++++
 .../jdk8/MaybeFlattenStreamAsFlowable.java    | 285 +++++++++++
 .../jdk8/MaybeFlattenStreamAsObservable.java  | 262 ++++++++++
 .../jdk8/SingleFlattenStreamAsFlowable.java   |  47 ++
 .../jdk8/SingleFlattenStreamAsObservable.java |  45 ++
 .../MaybeFlattenStreamAsFlowableTckTest.java  |  40 ++
 .../MaybeFlattenStreamAsFlowableTest.java     | 453 ++++++++++++++++++
 .../MaybeFlattenStreamAsObservableTest.java   | 431 +++++++++++++++++
 .../SingleFlattenStreamAsFlowableTckTest.java |  40 ++
 .../SingleFlattenStreamAsFlowableTest.java    | 440 +++++++++++++++++
 .../SingleFlattenStreamAsObservableTest.java  | 418 ++++++++++++++++
 .../validators/JavadocForAnnotations.java     |   6 +-
 .../rxjava3/validators/JavadocWording.java    |  14 +-
 15 files changed, 2647 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowable.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservable.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowable.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservable.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTckTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index dfe8c4f0b4..84a088d5c7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -15,6 +15,7 @@
 
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.stream.*;
 
 import org.reactivestreams.*;
 
@@ -3152,6 +3153,7 @@ public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends Mayb
      *            source Maybe
      * @return the new Flowable instance
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @see #flattenStreamAsFlowable(Function)
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -5004,4 +5006,87 @@ public final CompletionStage<T> toCompletionStage() {
     public final CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
         return subscribeWith(new CompletionStageConsumer<>(true, defaultItem));
     }
+
+    /**
+     * Maps the upstream succecss value into a Java {@link Stream} and emits its
+     * items to the downstream consumer as a {@link Flowable}.
+     * <p>
+     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsFlowable.m.png" alt="">
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsFlowable(Function)}:
+     * <pre><code>
+     * source.flattenAsFlowable(item -&gt; createStream(item)::iterator);
+     * </code></pre>
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.flattenStreamAsFlowable(item -&gt; IntStream.rangeClosed(1, 10).boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream and iterates the given {@code Stream}
+     *  on demand (i.e., when requested).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flattenStreamAsFlowable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the element type of the {@code Stream} and the output {@code Flowable}
+     * @param mapper the function that receives the upstream success item and should
+     * return a {@code Stream} of values to emit.
+     * @return the new Flowable instance
+     * @since 3.0.0
+     * @see #flattenAsFlowable(Function)
+     * @see #flattenStreamAsObservable(Function)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    @NonNull
+    public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new MaybeFlattenStreamAsFlowable<>(this, mapper));
+    }
+
+    /**
+     * Maps the upstream succecss value into a Java {@link Stream} and emits its
+     * items to the downstream consumer as an {@link Observable}.
+     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsObservable.m.png" alt="">
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsObservable(Function)}:
+     * <pre><code>
+     * source.flattenAsObservable(item -&gt; createStream(item)::iterator);
+     * </code></pre>
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.flattenStreamAsObservable(item -&gt; IntStream.rangeClosed(1, 10).boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flattenStreamAsObservable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the element type of the {@code Stream} and the output {@code Observable}
+     * @param mapper the function that receives the upstream success item and should
+     * return a {@code Stream} of values to emit.
+     * @return the new Observable instance
+     * @since 3.0.0
+     * @see #flattenAsObservable(Function)
+     * @see #flattenStreamAsFlowable(Function)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new MaybeFlattenStreamAsObservable<>(this, mapper));
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 373a576888..7c2558036e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -6517,6 +6517,7 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
      *            the scheduler where the {@code mapper} function will be executed
      * @return an Observable that emits the result of applying the transformation function to each item emitted
      *         by the source ObservableSource and concatenating the ObservableSources obtained from this transformation
+     * @since 3.0.0
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index f0022aef17..28177cc9e3 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -15,10 +15,12 @@
 
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.stream.*;
 
 import org.reactivestreams.Publisher;
 
 import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
@@ -2799,6 +2801,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
      *            source Single
      * @return the new Flowable instance
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @see #flattenStreamAsFlowable(Function)
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -2826,6 +2829,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      *            source Single
      * @return the new Observable instance
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @see #flattenStreamAsObservable(Function)
      */
     @CheckReturnValue
     @NonNull
@@ -4308,4 +4312,87 @@ private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
     public final CompletionStage<T> toCompletionStage() {
         return subscribeWith(new CompletionStageConsumer<>(false, null));
     }
+
+    /**
+     * Maps the upstream succecss value into a Java {@link Stream} and emits its
+     * items to the downstream consumer as a {@link Flowable}.
+     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsFlowable.s.png" alt="">
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsFlowable(Function)}:
+     * <pre><code>
+     * source.flattenAsFlowable(item -&gt; createStream(item)::iterator);
+     * </code></pre>
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.flattenStreamAsFlowable(item -&gt; IntStream.rangeClosed(1, 10).boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream and iterates the given {@code Stream}
+     *  on demand (i.e., when requested).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flattenStreamAsFlowable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the element type of the {@code Stream} and the output {@code Flowable}
+     * @param mapper the function that receives the upstream success item and should
+     * return a {@code Stream} of values to emit.
+     * @return the new Flowable instance
+     * @since 3.0.0
+     * @see #flattenAsFlowable(Function)
+     * @see #flattenStreamAsObservable(Function)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    @NonNull
+    public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new SingleFlattenStreamAsFlowable<>(this, mapper));
+    }
+
+    /**
+     * Maps the upstream succecss value into a Java {@link Stream} and emits its
+     * items to the downstream consumer as an {@link Observable}.
+     * <p>
+     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsObservable.s.png" alt="">
+     * <p>
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsFlowable(Function)}:
+     * <pre><code>
+     * source.flattenAsObservable(item -&gt; createStream(item)::iterator);
+     * </code></pre>
+     * <p>
+     * Primitive streams are not supported and items have to be boxed manually (e.g., via {@link IntStream#boxed()}):
+     * <pre><code>
+     * source.flattenStreamAsObservable(item -&gt; IntStream.rangeClosed(1, 10).boxed());
+     * </code></pre>
+     * <p>
+     * {@code Stream} does not support concurrent usage so creating and/or consuming the same instance multiple times
+     * from multiple threads can lead to undefined behavior.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flattenStreamAsObservable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <R> the element type of the {@code Stream} and the output {@code Observable}
+     * @param mapper the function that receives the upstream success item and should
+     * return a {@code Stream} of values to emit.
+     * @return the new Observable instance
+     * @since 3.0.0
+     * @see #flattenAsObservable(Function)
+     * @see #flattenStreamAsFlowable(Function)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new SingleFlattenStreamAsObservable<>(this, mapper));
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowable.java
new file mode 100644
index 0000000000..0ac724bdf4
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowable.java
@@ -0,0 +1,285 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Stream;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Map the success value into a Java {@link Stream} and emits its values.
+ *
+ * @param <T> the source value type
+ * @param <R> the output value type
+ * @since 3.0.0
+ */
+public final class MaybeFlattenStreamAsFlowable<T, R> extends Flowable<R> {
+
+    final Maybe<T> source;
+
+    final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+    public MaybeFlattenStreamAsFlowable(Maybe<T> source, Function<? super T, ? extends Stream<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull Subscriber<? super R> s) {
+        source.subscribe(new FlattenStreamMultiObserver<>(s, mapper));
+    }
+
+    static final class FlattenStreamMultiObserver<T, R>
+    extends BasicIntQueueSubscription<R>
+    implements MaybeObserver<T>, SingleObserver<T> {
+
+        private static final long serialVersionUID = 7363336003027148283L;
+
+        final Subscriber<? super R> downstream;
+
+        final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+        final AtomicLong requested;
+
+        Disposable upstream;
+
+        volatile Iterator<? extends R> iterator;
+
+        AutoCloseable close;
+
+        boolean once;
+
+        volatile boolean cancelled;
+
+        boolean outputFused;
+
+        long emitted;
+
+        FlattenStreamMultiObserver(Subscriber<? super R> downstream, Function<? super T, ? extends Stream<? extends R>> mapper) {
+            this.downstream = downstream;
+            this.mapper = mapper;
+            this.requested = new AtomicLong();
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(@NonNull T t) {
+            try {
+                Stream<? extends R> stream = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Stream");
+                Iterator<? extends R> iterator = stream.iterator();
+                AutoCloseable c = stream;
+
+                if (!iterator.hasNext()) {
+                    downstream.onComplete();
+                    close(c);
+                    return;
+                }
+                this.iterator = iterator;
+                this.close = stream;
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+            drain();
+        }
+
+        @Override
+        public void onError(@NonNull Throwable e) {
+            downstream.onError(e);
+        }
+
+        @Override
+        public void onComplete() {
+            downstream.onComplete();
+        }
+
+        @Override
+        public void request(long n) {
+            if (SubscriptionHelper.validate(n)) {
+                BackpressureHelper.add(requested, n);
+                drain();
+            }
+        }
+
+        @Override
+        public void cancel() {
+            cancelled = true;
+            upstream.dispose();
+            if (!outputFused) {
+                drain();
+            }
+        }
+
+        @Override
+        public int requestFusion(int mode) {
+            if ((mode & ASYNC) != 0) {
+                outputFused = true;
+                return ASYNC;
+            }
+            return NONE;
+        }
+
+        @Override
+        public @Nullable R poll() throws Throwable {
+            Iterator<? extends R> it = iterator;
+            if (it != null) {
+                if (once) {
+                    if (!it.hasNext()) {
+                        clear();
+                        return null;
+                    }
+                } else {
+                    once = true;
+                }
+                return it.next();
+            }
+            return null;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            Iterator<? extends R> it = iterator;
+            if (it != null) {
+                if (!once) {
+                    return false;
+                }
+                if (it.hasNext()) {
+                    return false;
+                }
+                clear();
+            }
+            return true;
+        }
+
+        @Override
+        public void clear() {
+            iterator = null;
+            AutoCloseable close = this.close;
+            this.close = null;
+            close(close);
+        }
+
+        void close(AutoCloseable c) {
+            try {
+                if (c != null) {
+                    c.close();
+                }
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                RxJavaPlugins.onError(ex);
+            }
+        }
+
+        void drain() {
+            if (getAndIncrement() != 0) {
+                return;
+            }
+
+            int missed = 1;
+            Subscriber<? super R> downstream = this.downstream;
+            long emitted = this.emitted;
+            long requested = this.requested.get();
+            Iterator<? extends R> it = iterator;
+
+            for (;;) {
+
+                if (cancelled) {
+                    clear();
+                } else {
+                    if (outputFused) {
+                        if (it != null) {
+                            downstream.onNext(null);
+                            downstream.onComplete();
+                        }
+                    } else {
+                        if (it != null && emitted != requested) {
+                            R item;
+                            try {
+                                item = it.next();
+                            } catch (Throwable ex) {
+                                Exceptions.throwIfFatal(ex);
+                                downstream.onError(ex);
+                                cancelled = true;
+                                continue;
+                            }
+
+                            if (cancelled) {
+                                continue;
+                            }
+
+                            downstream.onNext(item);
+                            emitted++;
+
+                            if (cancelled) {
+                                continue;
+                            }
+
+                            boolean has;
+                            try {
+                                has = it.hasNext();
+                            } catch (Throwable ex) {
+                                Exceptions.throwIfFatal(ex);
+                                downstream.onError(ex);
+                                cancelled = true;
+                                continue;
+                            }
+
+                            if (cancelled) {
+                                continue;
+                            }
+
+                            if (!has) {
+                                downstream.onComplete();
+                                cancelled = true;
+                            }
+                            continue;
+                        }
+                    }
+                }
+
+                this.emitted = emitted;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    return;
+                }
+
+                requested = this.requested.get();
+                if (it == null) {
+                    it = iterator;
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservable.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservable.java
new file mode 100644
index 0000000000..e7a74f0593
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservable.java
@@ -0,0 +1,262 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.*;
+import java.util.stream.Stream;
+
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Map the success value into a Java {@link Stream} and emits its values.
+ *
+ * @param <T> the source value type
+ * @param <R> the output value type
+ * @since 3.0.0
+ */
+public final class MaybeFlattenStreamAsObservable<T, R> extends Observable<R> {
+
+    final Maybe<T> source;
+
+    final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+    public MaybeFlattenStreamAsObservable(Maybe<T> source, Function<? super T, ? extends Stream<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull Observer<? super R> s) {
+        source.subscribe(new FlattenStreamMultiObserver<>(s, mapper));
+    }
+
+    static final class FlattenStreamMultiObserver<T, R>
+    extends BasicIntQueueDisposable<R>
+    implements MaybeObserver<T>, SingleObserver<T> {
+
+        private static final long serialVersionUID = 7363336003027148283L;
+
+        final Observer<? super R> downstream;
+
+        final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+        Disposable upstream;
+
+        volatile Iterator<? extends R> iterator;
+
+        AutoCloseable close;
+
+        boolean once;
+
+        volatile boolean disposed;
+
+        boolean outputFused;
+
+        FlattenStreamMultiObserver(Observer<? super R> downstream, Function<? super T, ? extends Stream<? extends R>> mapper) {
+            this.downstream = downstream;
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(@NonNull T t) {
+            try {
+                Stream<? extends R> stream = Objects.requireNonNull(mapper.apply(t), "The mapper returned a null Stream");
+                Iterator<? extends R> iterator = stream.iterator();
+                AutoCloseable c = stream;
+
+                if (!iterator.hasNext()) {
+                    downstream.onComplete();
+                    close(c);
+                    return;
+                }
+                this.iterator = iterator;
+                this.close = stream;
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+            drain();
+        }
+
+        @Override
+        public void onError(@NonNull Throwable e) {
+            downstream.onError(e);
+        }
+
+        @Override
+        public void onComplete() {
+            downstream.onComplete();
+        }
+
+        @Override
+        public void dispose() {
+            disposed = true;
+            upstream.dispose();
+            if (!outputFused) {
+                drain();
+            }
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return disposed;
+        }
+
+        @Override
+        public int requestFusion(int mode) {
+            if ((mode & ASYNC) != 0) {
+                outputFused = true;
+                return ASYNC;
+            }
+            return NONE;
+        }
+
+        @Override
+        public @Nullable R poll() throws Throwable {
+            Iterator<? extends R> it = iterator;
+            if (it != null) {
+                if (once) {
+                    if (!it.hasNext()) {
+                        clear();
+                        return null;
+                    }
+                } else {
+                    once = true;
+                }
+                return it.next();
+            }
+            return null;
+        }
+
+        @Override
+        public boolean isEmpty() {
+            Iterator<? extends R> it = iterator;
+            if (it != null) {
+                if (!once) {
+                    return false;
+                }
+                if (it.hasNext()) {
+                    return false;
+                }
+                clear();
+            }
+            return true;
+        }
+
+        @Override
+        public void clear() {
+            iterator = null;
+            AutoCloseable close = this.close;
+            this.close = null;
+            close(close);
+        }
+
+        void close(AutoCloseable c) {
+            try {
+                if (c != null) {
+                    c.close();
+                }
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                RxJavaPlugins.onError(ex);
+            }
+        }
+
+        void drain() {
+            if (getAndIncrement() != 0) {
+                return;
+            }
+
+            int missed = 1;
+            Observer<? super R> downstream = this.downstream;
+            Iterator<? extends R> it = iterator;
+
+            for (;;) {
+
+                if (disposed) {
+                    clear();
+                } else {
+                    if (outputFused) {
+                        downstream.onNext(null);
+                        downstream.onComplete();
+                    } else {
+                        R item;
+                        try {
+                            item = it.next();
+                        } catch (Throwable ex) {
+                            Exceptions.throwIfFatal(ex);
+                            downstream.onError(ex);
+                            disposed = true;
+                            continue;
+                        }
+
+                        if (disposed) {
+                            continue;
+                        }
+
+                        downstream.onNext(item);
+
+                        if (disposed) {
+                            continue;
+                        }
+
+                        boolean has;
+                        try {
+                            has = it.hasNext();
+                        } catch (Throwable ex) {
+                            Exceptions.throwIfFatal(ex);
+                            downstream.onError(ex);
+                            disposed = true;
+                            continue;
+                        }
+
+                        if (disposed) {
+                            continue;
+                        }
+
+                        if (!has) {
+                            downstream.onComplete();
+                            disposed = true;
+                        }
+                        continue;
+                    }
+                }
+
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    return;
+                }
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowable.java
new file mode 100644
index 0000000000..d7286d5932
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowable.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.Stream;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.jdk8.MaybeFlattenStreamAsFlowable.FlattenStreamMultiObserver;
+
+/**
+ * Map the success value into a Java {@link Stream} and emits its values.
+ *
+ * @param <T> the source value type
+ * @param <R> the output value type
+ * @since 3.0.0
+ */
+public final class SingleFlattenStreamAsFlowable<T, R> extends Flowable<R> {
+
+    final Single<T> source;
+
+    final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+    public SingleFlattenStreamAsFlowable(Single<T> source, Function<? super T, ? extends Stream<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull Subscriber<? super R> s) {
+        source.subscribe(new FlattenStreamMultiObserver<>(s, mapper));
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservable.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservable.java
new file mode 100644
index 0000000000..81b2d5fd7b
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservable.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.Stream;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.jdk8.MaybeFlattenStreamAsObservable.FlattenStreamMultiObserver;
+
+/**
+ * Map the success value into a Java {@link Stream} and emits its values.
+ *
+ * @param <T> the source value type
+ * @param <R> the output value type
+ * @since 3.0.0
+ */
+public final class SingleFlattenStreamAsObservable<T, R> extends Observable<R> {
+
+    final Single<T> source;
+
+    final Function<? super T, ? extends Stream<? extends R>> mapper;
+
+    public SingleFlattenStreamAsObservable(Single<T> source, Function<? super T, ? extends Stream<? extends R>> mapper) {
+        this.source = source;
+        this.mapper = mapper;
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull Observer<? super R> s) {
+        source.subscribe(new FlattenStreamMultiObserver<>(s, mapper));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTckTest.java
new file mode 100644
index 0000000000..94906fdd2f
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTckTest.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class MaybeFlattenStreamAsFlowableTckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        return
+                Maybe.just(1).flattenStreamAsFlowable(v -> IntStream.range(0, (int)elements).boxed())
+            ;
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        Stream<Integer> stream = Stream.of(1);
+        stream.forEach(v -> { });
+        return Maybe.just(1).flattenStreamAsFlowable(v -> stream);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java
new file mode 100644
index 0000000000..8e1e75b8e0
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java
@@ -0,0 +1,453 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.*;
+
+import org.junit.Test;
+import org.reactivestreams.Subscription;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class MaybeFlattenStreamAsFlowableTest extends RxJavaTest {
+
+    @Test
+    public void successJust() {
+        Maybe.just(1)
+        .flattenStreamAsFlowable(Stream::of)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void successEmpty() {
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> Stream.of())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void successMany() {
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> Stream.of(2, 3, 4, 5, 6))
+        .test()
+        .assertResult(2, 3, 4, 5, 6);
+    }
+
+    @Test
+    public void successManyTake() {
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> Stream.of(2, 3, 4, 5, 6))
+        .take(3)
+        .test()
+        .assertResult(2, 3, 4);
+    }
+
+    @Test
+    public void empty() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<? super Integer, Stream<? extends Integer>> f = mock(Function.class);
+
+        Maybe.<Integer>empty()
+        .flattenStreamAsFlowable(f)
+        .test()
+        .assertResult();
+
+        verify(f, never()).apply(any());
+    }
+
+    @Test
+    public void error() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<? super Integer, Stream<? extends Integer>> f = mock(Function.class);
+
+        Maybe.<Integer>error(new TestException())
+        .flattenStreamAsFlowable(f)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(f, never()).apply(any());
+    }
+
+    @Test
+    public void mapperCrash() {
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Maybe.never().flattenStreamAsFlowable(Stream::of));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybeToFlowable(m -> m.flattenStreamAsFlowable(Stream::of));
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(MaybeSubject.create().flattenStreamAsFlowable(Stream::of));
+    }
+
+    @Test
+    public void fusedEmpty() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of())
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void fusedJust() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of(v))
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1);
+    }
+
+    @Test
+    public void fusedMany() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fusedManyRejected() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void manyBackpressured() {
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> IntStream.rangeClosed(1, 5).boxed())
+        .test(0L)
+        .assertEmpty()
+        .requestMore(2)
+        .assertValuesOnly(1, 2)
+        .requestMore(2)
+        .assertValuesOnly(1, 2, 3, 4)
+        .requestMore(1)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void manyBackpressured2() {
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> IntStream.rangeClosed(1, 5).boxed())
+        .rebatchRequests(1)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(2)
+        .assertValuesOnly(1, 2)
+        .requestMore(2)
+        .assertValuesOnly(1, 2, 3, 4)
+        .requestMore(1)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void fusedStreamAvailableLater() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        ms
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertEmpty();
+
+        ms.onSuccess(1);
+
+        ts
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fused() throws Throwable {
+        AtomicReference<QueueSubscription<Integer>> qsr = new AtomicReference<>();
+
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        ms
+        .flattenStreamAsFlowable(Stream::of)
+        .subscribe(new FlowableSubscriber<Integer>() {
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            @SuppressWarnings("unchecked")
+            public void onSubscribe(@NonNull Subscription s) {
+                qsr.set((QueueSubscription<Integer>)s);
+            }
+        });
+
+        QueueSubscription<Integer> qs = qsr.get();
+
+        assertEquals(QueueFuseable.ASYNC, qs.requestFusion(QueueFuseable.ASYNC));
+
+        assertTrue(qs.isEmpty());
+        assertNull(qs.poll());
+
+        ms.onSuccess(1);
+
+        assertFalse(qs.isEmpty());
+        assertEquals(1, qs.poll().intValue());
+
+        assertTrue(qs.isEmpty());
+        assertNull(qs.poll());
+
+        qs.cancel();
+
+        assertTrue(qs.isEmpty());
+        assertNull(qs.poll());
+    }
+
+    @Test
+    public void requestOneByOne() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> Stream.of(1, 2, 3, 4, 5))
+        .subscribe(new FlowableSubscriber<Integer>() {
+
+            Subscription upstream;
+
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                ts.onSubscribe(new BooleanSubscription());
+                upstream = s;
+                s.request(1);
+            }
+
+            @Override
+            public void onNext(Integer t) {
+                ts.onNext(t);
+                upstream.request(1);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                ts.onError(t);
+            }
+
+            @Override
+            public void onComplete() {
+                ts.onComplete();
+            }
+        });
+
+        ts.assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void streamCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Maybe.just(1)
+            .flattenStreamAsFlowable(v -> Stream.of(v).onClose(() -> { throw new TestException(); }))
+            .test()
+            .assertResult(1);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void hasNextThrowsInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            int count;
+
+            @Override
+            public boolean hasNext() {
+                if (count++ > 0) {
+                    throw new TestException();
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> stream)
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void nextThrowsInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                throw new TestException();
+            }
+        });
+
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> stream)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void cancelAfterHasNextInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            int count;
+
+            @Override
+            public boolean hasNext() {
+                if (count++ > 0) {
+                    ts.cancel();
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> stream)
+        .subscribeWith(ts)
+        .assertValuesOnly(1);
+    }
+
+    @Test
+    public void cancelAfterNextInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                ts.cancel();
+                return 1;
+            }
+        });
+
+        Maybe.just(1)
+        .flattenStreamAsFlowable(v -> stream)
+        .subscribeWith(ts)
+        .assertEmpty();
+    }
+
+    @Test
+    public void requestSuccessRace() {
+        for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
+            MaybeSubject<Integer> ms = MaybeSubject.create();
+
+            TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
+
+            ms.flattenStreamAsFlowable(Stream::of)
+            .subscribe(ts);
+
+            Runnable r1 = () -> ms.onSuccess(1);
+            Runnable r2 = () -> ts.request(1);
+
+            TestHelper.race(r1, r2);
+
+            ts.assertResult(1);
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java
new file mode 100644
index 0000000000..dd0fb5c2ed
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java
@@ -0,0 +1,431 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class MaybeFlattenStreamAsObservableTest extends RxJavaTest {
+
+    @Test
+    public void successJust() {
+        Maybe.just(1)
+        .flattenStreamAsObservable(Stream::of)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void successEmpty() {
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> Stream.of())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void successMany() {
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> Stream.of(2, 3, 4, 5, 6))
+        .test()
+        .assertResult(2, 3, 4, 5, 6);
+    }
+
+    @Test
+    public void successManyTake() {
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> Stream.of(2, 3, 4, 5, 6))
+        .take(3)
+        .test()
+        .assertResult(2, 3, 4);
+    }
+
+    @Test
+    public void empty() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<? super Integer, Stream<? extends Integer>> f = mock(Function.class);
+
+        Maybe.<Integer>empty()
+        .flattenStreamAsObservable(f)
+        .test()
+        .assertResult();
+
+        verify(f, never()).apply(any());
+    }
+
+    @Test
+    public void error() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<? super Integer, Stream<? extends Integer>> f = mock(Function.class);
+
+        Maybe.<Integer>error(new TestException())
+        .flattenStreamAsObservable(f)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(f, never()).apply(any());
+    }
+
+    @Test
+    public void mapperCrash() {
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Maybe.never().flattenStreamAsObservable(Stream::of));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybeToObservable(m -> m.flattenStreamAsObservable(Stream::of));
+    }
+
+    @Test
+    public void fusedEmpty() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> Stream.<Integer>of())
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void fusedJust() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> Stream.<Integer>of(v))
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1);
+    }
+
+    @Test
+    public void fusedMany() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fusedManyRejected() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fusedStreamAvailableLater() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        ms
+        .flattenStreamAsObservable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertEmpty();
+
+        ms.onSuccess(1);
+
+        to
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fused() throws Throwable {
+        AtomicReference<QueueDisposable<Integer>> qdr = new AtomicReference<>();
+
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        ms
+        .flattenStreamAsObservable(Stream::of)
+        .subscribe(new Observer<Integer>() {
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            @SuppressWarnings("unchecked")
+            public void onSubscribe(Disposable d) {
+                qdr.set((QueueDisposable<Integer>)d);
+            }
+        });
+
+        QueueDisposable<Integer> qd = qdr.get();
+
+        assertEquals(QueueFuseable.ASYNC, qd.requestFusion(QueueFuseable.ASYNC));
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+
+        ms.onSuccess(1);
+
+        assertFalse(qd.isEmpty());
+        assertEquals(1, qd.poll().intValue());
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+
+        qd.dispose();
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+    }
+
+    @Test
+    public void fused2() throws Throwable {
+        AtomicReference<QueueDisposable<Integer>> qdr = new AtomicReference<>();
+
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        ms
+        .flattenStreamAsObservable(v -> Stream.of(v, v + 1))
+        .subscribe(new Observer<Integer>() {
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            @SuppressWarnings("unchecked")
+            public void onSubscribe(Disposable d) {
+                qdr.set((QueueDisposable<Integer>)d);
+            }
+        });
+
+        QueueDisposable<Integer> qd = qdr.get();
+
+        assertEquals(QueueFuseable.ASYNC, qd.requestFusion(QueueFuseable.ASYNC));
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+
+        ms.onSuccess(1);
+
+        assertFalse(qd.isEmpty());
+        assertEquals(1, qd.poll().intValue());
+
+        assertFalse(qd.isEmpty());
+        assertEquals(2, qd.poll().intValue());
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+
+        qd.dispose();
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+    }
+
+    @Test
+    public void streamCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Maybe.just(1)
+            .flattenStreamAsObservable(v -> Stream.of(v).onClose(() -> { throw new TestException(); }))
+            .test()
+            .assertResult(1);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void hasNextThrowsInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            int count;
+
+            @Override
+            public boolean hasNext() {
+                if (count++ > 0) {
+                    throw new TestException();
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> stream)
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void nextThrowsInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                throw new TestException();
+            }
+        });
+
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> stream)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void cancelAfterHasNextInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+
+        TestObserver<Integer> to = new TestObserver<>();
+
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            int count;
+
+            @Override
+            public boolean hasNext() {
+                if (count++ > 0) {
+                    to.dispose();
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> stream)
+        .subscribeWith(to)
+        .assertValuesOnly(1);
+    }
+
+    @Test
+    public void cancelAfterNextInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+
+        TestObserver<Integer> to = new TestObserver<>();
+
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                to.dispose();
+                return 1;
+            }
+        });
+
+        Maybe.just(1)
+        .flattenStreamAsObservable(v -> stream)
+        .subscribeWith(to)
+        .assertEmpty();
+    }
+
+    @Test
+    public void cancelSuccessRace() {
+        for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
+            MaybeSubject<Integer> ms = MaybeSubject.create();
+
+            TestObserver<Integer> to = new TestObserver<>();
+
+            ms.flattenStreamAsObservable(Stream::of)
+            .subscribe(to);
+
+            Runnable r1 = () -> ms.onSuccess(1);
+            Runnable r2 = () -> to.dispose();
+
+            TestHelper.race(r1, r2);
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTckTest.java
new file mode 100644
index 0000000000..509429d4af
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTckTest.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import java.util.stream.*;
+
+import org.reactivestreams.Publisher;
+import org.testng.annotations.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.tck.BaseTck;
+
+@Test
+public class SingleFlattenStreamAsFlowableTckTest extends BaseTck<Integer> {
+
+    @Override
+    public Publisher<Integer> createPublisher(final long elements) {
+        return
+                Single.just(1).flattenStreamAsFlowable(v -> IntStream.range(0, (int)elements).boxed())
+            ;
+    }
+
+    @Override
+    public Publisher<Integer> createFailedPublisher() {
+        Stream<Integer> stream = Stream.of(1);
+        stream.forEach(v -> { });
+        return Single.just(1).flattenStreamAsFlowable(v -> stream);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java
new file mode 100644
index 0000000000..72dc8fb239
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java
@@ -0,0 +1,440 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.*;
+
+import org.junit.Test;
+import org.reactivestreams.Subscription;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class SingleFlattenStreamAsFlowableTest extends RxJavaTest {
+
+    @Test
+    public void successJust() {
+        Single.just(1)
+        .flattenStreamAsFlowable(Stream::of)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void successEmpty() {
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> Stream.of())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void successMany() {
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> Stream.of(2, 3, 4, 5, 6))
+        .test()
+        .assertResult(2, 3, 4, 5, 6);
+    }
+
+    @Test
+    public void successManyTake() {
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> Stream.of(2, 3, 4, 5, 6))
+        .take(3)
+        .test()
+        .assertResult(2, 3, 4);
+    }
+
+    @Test
+    public void error() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<? super Integer, Stream<? extends Integer>> f = mock(Function.class);
+
+        Single.<Integer>error(new TestException())
+        .flattenStreamAsFlowable(f)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(f, never()).apply(any());
+    }
+
+    @Test
+    public void mapperCrash() {
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Single.never().flattenStreamAsFlowable(Stream::of));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingleToFlowable(m -> m.flattenStreamAsFlowable(Stream::of));
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(SingleSubject.create().flattenStreamAsFlowable(Stream::of));
+    }
+
+    @Test
+    public void fusedEmpty() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of())
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void fusedJust() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of(v))
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1);
+    }
+
+    @Test
+    public void fusedMany() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fusedManyRejected() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void manyBackpressured() {
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> IntStream.rangeClosed(1, 5).boxed())
+        .test(0L)
+        .assertEmpty()
+        .requestMore(2)
+        .assertValuesOnly(1, 2)
+        .requestMore(2)
+        .assertValuesOnly(1, 2, 3, 4)
+        .requestMore(1)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void manyBackpressured2() {
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> IntStream.rangeClosed(1, 5).boxed())
+        .rebatchRequests(1)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(2)
+        .assertValuesOnly(1, 2)
+        .requestMore(2)
+        .assertValuesOnly(1, 2, 3, 4)
+        .requestMore(1)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void fusedStreamAvailableLater() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        ss
+        .flattenStreamAsFlowable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertEmpty();
+
+        ss.onSuccess(1);
+
+        ts
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fused() throws Throwable {
+        AtomicReference<QueueSubscription<Integer>> qsr = new AtomicReference<>();
+
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        ss
+        .flattenStreamAsFlowable(Stream::of)
+        .subscribe(new FlowableSubscriber<Integer>() {
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            @SuppressWarnings("unchecked")
+            public void onSubscribe(@NonNull Subscription s) {
+                qsr.set((QueueSubscription<Integer>)s);
+            }
+        });
+
+        QueueSubscription<Integer> qs = qsr.get();
+
+        assertEquals(QueueFuseable.ASYNC, qs.requestFusion(QueueFuseable.ASYNC));
+
+        assertTrue(qs.isEmpty());
+        assertNull(qs.poll());
+
+        ss.onSuccess(1);
+
+        assertFalse(qs.isEmpty());
+        assertEquals(1, qs.poll().intValue());
+
+        assertTrue(qs.isEmpty());
+        assertNull(qs.poll());
+
+        qs.cancel();
+
+        assertTrue(qs.isEmpty());
+        assertNull(qs.poll());
+    }
+
+    @Test
+    public void requestOneByOne() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> Stream.of(1, 2, 3, 4, 5))
+        .subscribe(new FlowableSubscriber<Integer>() {
+
+            Subscription upstream;
+
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                ts.onSubscribe(new BooleanSubscription());
+                upstream = s;
+                s.request(1);
+            }
+
+            @Override
+            public void onNext(Integer t) {
+                ts.onNext(t);
+                upstream.request(1);
+            }
+
+            @Override
+            public void onError(Throwable t) {
+                ts.onError(t);
+            }
+
+            @Override
+            public void onComplete() {
+                ts.onComplete();
+            }
+        });
+
+        ts.assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void streamCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Single.just(1)
+            .flattenStreamAsFlowable(v -> Stream.of(v).onClose(() -> { throw new TestException(); }))
+            .test()
+            .assertResult(1);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void hasNextThrowsInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            int count;
+
+            @Override
+            public boolean hasNext() {
+                if (count++ > 0) {
+                    throw new TestException();
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> stream)
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void nextThrowsInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                throw new TestException();
+            }
+        });
+
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> stream)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void cancelAfterHasNextInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            int count;
+
+            @Override
+            public boolean hasNext() {
+                if (count++ > 0) {
+                    ts.cancel();
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> stream)
+        .subscribeWith(ts)
+        .assertValuesOnly(1);
+    }
+
+    @Test
+    public void cancelAfterNextInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                ts.cancel();
+                return 1;
+            }
+        });
+
+        Single.just(1)
+        .flattenStreamAsFlowable(v -> stream)
+        .subscribeWith(ts)
+        .assertEmpty();
+    }
+
+    @Test
+    public void requestSuccessRace() {
+        for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
+            SingleSubject<Integer> ss = SingleSubject.create();
+
+            TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
+
+            ss.flattenStreamAsFlowable(Stream::of)
+            .subscribe(ts);
+
+            Runnable r1 = () -> ss.onSuccess(1);
+            Runnable r2 = () -> ts.request(1);
+
+            TestHelper.race(r1, r2);
+
+            ts.assertResult(1);
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java
new file mode 100644
index 0000000000..2b3a624d50
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java
@@ -0,0 +1,418 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.jdk8;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.Iterator;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Stream;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class SingleFlattenStreamAsObservableTest extends RxJavaTest {
+
+    @Test
+    public void successJust() {
+        Single.just(1)
+        .flattenStreamAsObservable(Stream::of)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void successEmpty() {
+        Single.just(1)
+        .flattenStreamAsObservable(v -> Stream.of())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void successMany() {
+        Single.just(1)
+        .flattenStreamAsObservable(v -> Stream.of(2, 3, 4, 5, 6))
+        .test()
+        .assertResult(2, 3, 4, 5, 6);
+    }
+
+    @Test
+    public void successManyTake() {
+        Single.just(1)
+        .flattenStreamAsObservable(v -> Stream.of(2, 3, 4, 5, 6))
+        .take(3)
+        .test()
+        .assertResult(2, 3, 4);
+    }
+
+    @Test
+    public void error() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<? super Integer, Stream<? extends Integer>> f = mock(Function.class);
+
+        Single.<Integer>error(new TestException())
+        .flattenStreamAsObservable(f)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(f, never()).apply(any());
+    }
+
+    @Test
+    public void mapperCrash() {
+        Single.just(1)
+        .flattenStreamAsObservable(v -> { throw new TestException(); })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Single.never().flattenStreamAsObservable(Stream::of));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingleToObservable(m -> m.flattenStreamAsObservable(Stream::of));
+    }
+
+    @Test
+    public void fusedEmpty() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        Single.just(1)
+        .flattenStreamAsObservable(v -> Stream.<Integer>of())
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+    }
+
+    @Test
+    public void fusedJust() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        Single.just(1)
+        .flattenStreamAsObservable(v -> Stream.<Integer>of(v))
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1);
+    }
+
+    @Test
+    public void fusedMany() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        Single.just(1)
+        .flattenStreamAsObservable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fusedManyRejected() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Single.just(1)
+        .flattenStreamAsObservable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fusedStreamAvailableLater() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        ss
+        .flattenStreamAsObservable(v -> Stream.<Integer>of(v, v + 1, v + 2))
+        .subscribe(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertEmpty();
+
+        ss.onSuccess(1);
+
+        to
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void fused() throws Throwable {
+        AtomicReference<QueueDisposable<Integer>> qdr = new AtomicReference<>();
+
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        ss
+        .flattenStreamAsObservable(Stream::of)
+        .subscribe(new Observer<Integer>() {
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            @SuppressWarnings("unchecked")
+            public void onSubscribe(Disposable d) {
+                qdr.set((QueueDisposable<Integer>)d);
+            }
+        });
+
+        QueueDisposable<Integer> qd = qdr.get();
+
+        assertEquals(QueueFuseable.ASYNC, qd.requestFusion(QueueFuseable.ASYNC));
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+
+        ss.onSuccess(1);
+
+        assertFalse(qd.isEmpty());
+        assertEquals(1, qd.poll().intValue());
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+
+        qd.dispose();
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+    }
+
+    @Test
+    public void fused2() throws Throwable {
+        AtomicReference<QueueDisposable<Integer>> qdr = new AtomicReference<>();
+
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        ss
+        .flattenStreamAsObservable(v -> Stream.of(v, v + 1))
+        .subscribe(new Observer<Integer>() {
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            @SuppressWarnings("unchecked")
+            public void onSubscribe(Disposable d) {
+                qdr.set((QueueDisposable<Integer>)d);
+            }
+        });
+
+        QueueDisposable<Integer> qd = qdr.get();
+
+        assertEquals(QueueFuseable.ASYNC, qd.requestFusion(QueueFuseable.ASYNC));
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+
+        ss.onSuccess(1);
+
+        assertFalse(qd.isEmpty());
+        assertEquals(1, qd.poll().intValue());
+
+        assertFalse(qd.isEmpty());
+        assertEquals(2, qd.poll().intValue());
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+
+        qd.dispose();
+
+        assertTrue(qd.isEmpty());
+        assertNull(qd.poll());
+    }
+
+    @Test
+    public void streamCloseCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Single.just(1)
+            .flattenStreamAsObservable(v -> Stream.of(v).onClose(() -> { throw new TestException(); }))
+            .test()
+            .assertResult(1);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void hasNextThrowsInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            int count;
+
+            @Override
+            public boolean hasNext() {
+                if (count++ > 0) {
+                    throw new TestException();
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Single.just(1)
+        .flattenStreamAsObservable(v -> stream)
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void nextThrowsInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                throw new TestException();
+            }
+        });
+
+        Single.just(1)
+        .flattenStreamAsObservable(v -> stream)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void cancelAfterHasNextInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+
+        TestObserver<Integer> to = new TestObserver<>();
+
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            int count;
+
+            @Override
+            public boolean hasNext() {
+                if (count++ > 0) {
+                    to.dispose();
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        });
+
+        Single.just(1)
+        .flattenStreamAsObservable(v -> stream)
+        .subscribeWith(to)
+        .assertValuesOnly(1);
+    }
+
+    @Test
+    public void cancelAfterNextInDrain() {
+        @SuppressWarnings("unchecked")
+        Stream<Integer> stream = mock(Stream.class);
+
+        TestObserver<Integer> to = new TestObserver<>();
+
+        when(stream.iterator()).thenReturn(new Iterator<Integer>() {
+
+            @Override
+            public boolean hasNext() {
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                to.dispose();
+                return 1;
+            }
+        });
+
+        Single.just(1)
+        .flattenStreamAsObservable(v -> stream)
+        .subscribeWith(to)
+        .assertEmpty();
+    }
+
+    @Test
+    public void cancelSuccessRace() {
+        for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
+            SingleSubject<Integer> ss = SingleSubject.create();
+
+            TestObserver<Integer> to = new TestObserver<>();
+
+            ss.flattenStreamAsObservable(Stream::of)
+            .subscribe(to);
+
+            Runnable r1 = () -> ss.onSuccess(1);
+            Runnable r2 = () -> to.dispose();
+
+            TestHelper.race(r1, r2);
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
index 2f16d05c14..1411295126 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
@@ -156,9 +156,9 @@ static final void scanForBadMethod(StringBuilder sourceCode, String annotation,
                                         ;
                                         int lc = lineNumber(sourceCode, idx);
 
-                                        e.append(" at io.reactivex.").append(baseClassName)
-                                        .append(" (").append(baseClassName).append(".java:")
-                                        .append(lc).append(")").append("\r\n\r\n");
+                                        e.append(" at io.reactivex.rxjava3.core.").append(baseClassName)
+                                        .append(".method(").append(baseClassName).append(".java:")
+                                        .append(lc).append(")").append("\r\n");
                                     }
                                 }
                             }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index 4a4baaf8ae..fc0d1db9cf 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -139,8 +139,11 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                     int idx = m.javadoc.indexOf("Flowable", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("Flowable")) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions Flowable but not in the signature\r\n at io.reactivex.rxjava3.core.")
-                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            Pattern p = Pattern.compile("@see\\s+#[A-Za-z0-9 _.,()]*Flowable");
+                            if (!p.matcher(m.javadoc).find()) {
+                                e.append("java.lang.RuntimeException: Maybe doc mentions Flowable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            }
                         }
                         jdx = idx + 6;
                     } else {
@@ -180,8 +183,11 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                     int idx = m.javadoc.indexOf("Observable", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("Observable")) {
-                            e.append("java.lang.RuntimeException: Maybe doc mentions Observable but not in the signature\r\n at io.reactivex.rxjava3.core.")
-                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            Pattern p = Pattern.compile("@see\\s+#[A-Za-z0-9 _.,()]*Observable");
+                            if (!p.matcher(m.javadoc).find()) {
+                                e.append("java.lang.RuntimeException: Maybe doc mentions Observable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                                .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            }
                         }
                         jdx = idx + 6;
                     } else {

From 641e8015494e8eae9732d4925b9a5962229e6954 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 31 Dec 2019 10:39:25 +0100
Subject: [PATCH 032/665] 3.x: Prettify Flowable javadoc + validator (#6806)

---
 .../io/reactivex/rxjava3/core/Flowable.java   | 6394 ++++++++---------
 .../validators/JavadocCodesAndLinks.java      |  375 +
 .../rxjava3/validators/JavadocWording.java    |  113 +
 3 files changed, 3684 insertions(+), 3198 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 97785c1f4c..e38004b214 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -38,14 +38,14 @@
 import io.reactivex.rxjava3.subscribers.*;
 
 /**
- * The Flowable class that implements the <a href="https://github.com/reactive-streams/reactive-streams-jvm">Reactive Streams</a>
+ * The {@code Flowable} class that implements the <a href="https://github.com/reactive-streams/reactive-streams-jvm">Reactive Streams</a> {@link Publisher}
  * Pattern and offers factory methods, intermediate operators and the ability to consume reactive dataflows.
  * <p>
- * Reactive Streams operates with {@link Publisher}s which {@code Flowable} extends. Many operators
+ * <em>Reactive Streams</em> operates with {@code Publisher}s which {@code Flowable} extends. Many operators
  * therefore accept general {@code Publisher}s directly and allow direct interoperation with other
- * Reactive Streams implementations.
+ * <em>Reactive Streams</em> implementations.
  * <p>
- * The Flowable hosts the default buffer size of 128 elements for operators, accessible via {@link #bufferSize()},
+ * The {@code Flowable} hosts the default buffer size of 128 elements for operators, accessible via {@link #bufferSize()},
  * that can be overridden globally via the system parameter {@code rx3.buffer-size}. Most operators, however, have
  * overloads that allow setting their internal buffer size explicitly.
  * <p>
@@ -62,7 +62,7 @@
  * Unlike the {@code Observable.subscribe()} of version 1.x, {@link #subscribe(Subscriber)} does not allow external cancellation
  * of a subscription and the {@link Subscriber} instance is expected to expose such capability if needed.
  * <p>
- * Flowables support backpressure and require {@link Subscriber}s to signal demand via {@link Subscription#request(long)}.
+ * {@code Flowable}s support backpressure and require {@code Subscriber}s to signal demand via {@link Subscription#request(long)}.
  * <p>
  * Example:
  * <pre><code>
@@ -90,13 +90,13 @@
  * d.dispose();
  * </code></pre>
  * <p>
- * The Reactive Streams specification is relatively strict when defining interactions between {@code Publisher}s and {@code Subscriber}s, so much so
+ * The <em>Reactive Streams</em> specification is relatively strict when defining interactions between {@code Publisher}s and {@code Subscriber}s, so much so
  * that there is a significant performance penalty due certain timing requirements and the need to prepare for invalid
  * request amounts via {@link Subscription#request(long)}.
  * Therefore, RxJava has introduced the {@link FlowableSubscriber} interface that indicates the consumer can be driven with relaxed rules.
  * All RxJava operators are implemented with these relaxed rules in mind.
- * If the subscribing {@code Subscriber} does not implement this interface, for example, due to it being from another Reactive Streams compliant
- * library, the Flowable will automatically apply a compliance wrapper around it.
+ * If the subscribing {@code Subscriber} does not implement this interface, for example, due to it being from another <em>Reactive Streams</em> compliant
+ * library, the {@code Flowable} will automatically apply a compliance wrapper around it.
  * <p>
  * {@code Flowable} is an abstract class, but it is not advised to implement sources and custom operators by extending the class directly due
  * to the large amounts of <a href="https://github.com/reactive-streams/reactive-streams-jvm#specification">Reactive Streams</a>
@@ -142,11 +142,10 @@
  * has to be explicitly expressed via operators such as {@link #subscribeOn(Scheduler)}, {@link #observeOn(Scheduler)} and {@link #parallel()}. In general,
  * operators featuring a {@link Scheduler} parameter are introducing this type of asynchrony into the flow.
  * <p>
- * For more information see the <a href="http://reactivex.io/documentation/Publisher.html">ReactiveX
- * documentation</a>.
+ * For more information see the <a href="http://reactivex.io/documentation/Publisher.html">ReactiveX documentation</a>.
  *
  * @param <T>
- *            the type of the items emitted by the Flowable
+ *            the type of the items emitted by the {@code Flowable}
  * @see Observable
  * @see ParallelFlowable
  * @see io.reactivex.rxjava3.subscribers.DisposableSubscriber
@@ -159,7 +158,7 @@ public abstract class Flowable<T> implements Publisher<T> {
     }
 
     /**
-     * Mirrors the one Publisher in an Iterable of several Publishers that first either emits an item or sends
+     * Mirrors the one {@link Publisher} in an {@link Iterable} of several {@code Publisher}s that first either emits an item or sends
      * a termination notification.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
@@ -173,9 +172,9 @@ public abstract class Flowable<T> implements Publisher<T> {
      *
      * @param <T> the common element type
      * @param sources
-     *            an Iterable of Publishers sources competing to react first. A subscription to each Publisher will
-     *            occur in the same order as in this Iterable.
-     * @return a Flowable that emits the same sequence as whichever of the source Publishers first
+     *            an {@code Iterable} of {@code Publisher}s sources competing to react first. A subscription to each {@code Publisher} will
+     *            occur in the same order as in this {@code Iterable}.
+     * @return a {@code Flowable} that emits the same sequence as whichever of the source {@code Publisher}s first
      *         emitted an item or sent a termination notification
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -189,7 +188,7 @@ public static <T> Flowable<T> amb(@NonNull Iterable<? extends Publisher<? extend
     }
 
     /**
-     * Mirrors the one Publisher in an array of several Publishers that first either emits an item or sends
+     * Mirrors the one {@link Publisher} in an array of several {@code Publisher}s that first either emits an item or sends
      * a termination notification.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
@@ -203,9 +202,9 @@ public static <T> Flowable<T> amb(@NonNull Iterable<? extends Publisher<? extend
      *
      * @param <T> the common element type
      * @param sources
-     *            an array of Publisher sources competing to react first. A subscription to each Publisher will
-     *            occur in the same order as in this Iterable.
-     * @return a Flowable that emits the same sequence as whichever of the source Publishers first
+     *            an array of {@code Publisher} sources competing to react first. A subscription to each {@code Publisher} will
+     *            occur in the same order as in this array.
+     * @return a {@code Flowable} that emits the same sequence as whichever of the source {@code Publisher}s first
      *         emitted an item or sent a termination notification
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -229,7 +228,7 @@ public static <T> Flowable<T> ambArray(Publisher<? extends T>... sources) {
     /**
      * Returns the default internal buffer size used by most async operators.
      * <p>The value can be overridden via system parameter {@code rx3.buffer-size}
-     * <em>before</em> the Flowable class is loaded.
+     * <em>before</em> the {@code Flowable} class is loaded.
      * @return the default internal buffer size.
      */
     @CheckReturnValue
@@ -238,26 +237,26 @@ public static int bufferSize() {
     }
 
     /**
-     * Combines a collection of source Publishers by emitting an item that aggregates the latest values of each of
-     * the source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines a collection of source {@link Publisher}s by emitting an item that aggregates the latest values of each of
+     * the source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided array of source Publishers is empty, the resulting sequence completes immediately without emitting
+     * If the provided array of source {@code Publisher}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -267,11 +266,11 @@ public static int bufferSize() {
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source Publishers
+     *            the collection of source {@code Publisher}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -283,26 +282,26 @@ public static int bufferSize() {
     }
 
     /**
-     * Combines a collection of source Publishers by emitting an item that aggregates the latest values of each of
-     * the source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines a collection of source {@link Publisher}s by emitting an item that aggregates the latest values of each of
+     * the source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided array of source Publishers is empty, the resulting sequence completes immediately without emitting
+     * If the provided array of source {@code Publisher}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -312,13 +311,13 @@ public static int bufferSize() {
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source Publishers
+     *            the collection of source {@code Publisher}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @param bufferSize
-     *            the internal buffer size and prefetch amount applied to every source Flowable
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -336,26 +335,26 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends
     }
 
     /**
-     * Combines a collection of source Publishers by emitting an item that aggregates the latest values of each of
-     * the source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines a collection of source {@link Publisher}s by emitting an item that aggregates the latest values of each of
+     * the source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided iterable of source Publishers is empty, the resulting sequence completes immediately without emitting
+     * If the provided iterable of source {@code Publisher}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -365,11 +364,11 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source Publishers
+     *            the collection of source {@code Publisher}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -382,26 +381,26 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends
     }
 
     /**
-     * Combines a collection of source Publishers by emitting an item that aggregates the latest values of each of
-     * the source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines a collection of source {@link Publisher}s by emitting an item that aggregates the latest values of each of
+     * the source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided iterable of source Publishers is empty, the resulting sequence completes immediately without emitting any items and
+     * If the provided iterable of source {@code Publisher}s is empty, the resulting sequence completes immediately without emitting any items and
      * without any calls to the combiner function.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -411,13 +410,13 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source Publishers
+     *            the collection of source {@code Publisher}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @param bufferSize
-     *            the internal buffer size and prefetch amount applied to every source Flowable
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -433,26 +432,26 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     }
 
     /**
-     * Combines a collection of source Publishers by emitting an item that aggregates the latest values of each of
-     * the source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines a collection of source {@link Publisher}s by emitting an item that aggregates the latest values of each of
+     * the source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided array of source Publishers is empty, the resulting sequence completes immediately without emitting
+     * If the provided array of source {@code Publisher}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -462,11 +461,11 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source Publishers
+     *            the collection of source {@code Publisher}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -479,27 +478,27 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     }
 
     /**
-     * Combines a collection of source Publishers by emitting an item that aggregates the latest values of each of
-     * the source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines a collection of source {@link Publisher}s by emitting an item that aggregates the latest values of each of
+     * the source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function and delays any error from the sources until
-     * all source Publishers terminate.
+     * all source {@code Publisher}s terminate.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided array of source Publishers is empty, the resulting sequence completes immediately without emitting
+     * If the provided array of source {@code Publisher}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -509,13 +508,13 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source Publishers
+     *            the collection of source {@code Publisher}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @param bufferSize
-     *            the internal buffer size and prefetch amount applied to every source Flowable
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -534,27 +533,27 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     }
 
     /**
-     * Combines a collection of source Publishers by emitting an item that aggregates the latest values of each of
-     * the source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines a collection of source {@link Publisher}s by emitting an item that aggregates the latest values of each of
+     * the source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function and delays any error from the sources until
-     * all source Publishers terminate.
+     * all source {@code Publisher}s terminate.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided iterable of source Publishers is empty, the resulting sequence completes immediately without emitting
+     * If the provided iterable of source {@code Publisher}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -564,11 +563,11 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source Publishers
+     *            the collection of source {@code Publisher}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -581,27 +580,27 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     }
 
     /**
-     * Combines a collection of source Publishers by emitting an item that aggregates the latest values of each of
-     * the source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines a collection of source {@link Publisher}s by emitting an item that aggregates the latest values of each of
+     * the source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function and delays any error from the sources until
-     * all source Publishers terminate.
+     * all source {@code Publisher}s terminate.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided iterable of source Publishers is empty, the resulting sequence completes immediately without emitting
+     * If the provided iterable of source {@code Publisher}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -611,13 +610,13 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source Publishers
+     *            the collection of source {@code Publisher}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @param bufferSize
-     *            the internal buffer size and prefetch amount applied to every source Flowable
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -633,8 +632,8 @@ public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? ext
     }
 
     /**
-     * Combines two source Publishers by emitting an item that aggregates the latest values of each of the
-     * source Publishers each time an item is received from either of the source Publishers, where this
+     * Combines two source {@link Publisher}s by emitting an item that aggregates the latest values of each of the
+     * source {@code Publisher}s each time an item is received from either of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -646,7 +645,7 @@ public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? ext
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -655,13 +654,13 @@ public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? ext
      * @param <T2> the element type of the second source
      * @param <R> the combined output type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            the second source Publisher
+     *            the second source {@code Publisher}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -679,8 +678,8 @@ public static <T1, T2, R> Flowable<R> combineLatest(
     }
 
     /**
-     * Combines three source Publishers by emitting an item that aggregates the latest values of each of the
-     * source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines three source {@link Publisher}s by emitting an item that aggregates the latest values of each of the
+     * source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -692,7 +691,7 @@ public static <T1, T2, R> Flowable<R> combineLatest(
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -702,15 +701,15 @@ public static <T1, T2, R> Flowable<R> combineLatest(
      * @param <T3> the element type of the third source
      * @param <R> the combined output type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            the second source Publisher
+     *            the second source {@code Publisher}
      * @param source3
-     *            the third source Publisher
+     *            the third source {@code Publisher}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -730,8 +729,8 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
     }
 
     /**
-     * Combines four source Publishers by emitting an item that aggregates the latest values of each of the
-     * source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines four source {@link Publisher}s by emitting an item that aggregates the latest values of each of the
+     * source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -743,7 +742,7 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -754,17 +753,17 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
      * @param <T4> the element type of the fourth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            the second source Publisher
+     *            the second source {@code Publisher}
      * @param source3
-     *            the third source Publisher
+     *            the third source {@code Publisher}
      * @param source4
-     *            the fourth source Publisher
+     *            the fourth source {@code Publisher}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -785,8 +784,8 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
     }
 
     /**
-     * Combines five source Publishers by emitting an item that aggregates the latest values of each of the
-     * source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines five source {@link Publisher}s by emitting an item that aggregates the latest values of each of the
+     * source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -798,7 +797,7 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -810,19 +809,19 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
      * @param <T5> the element type of the fifth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            the second source Publisher
+     *            the second source {@code Publisher}
      * @param source3
-     *            the third source Publisher
+     *            the third source {@code Publisher}
      * @param source4
-     *            the fourth source Publisher
+     *            the fourth source {@code Publisher}
      * @param source5
-     *            the fifth source Publisher
+     *            the fifth source {@code Publisher}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -845,8 +844,8 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
     }
 
     /**
-     * Combines six source Publishers by emitting an item that aggregates the latest values of each of the
-     * source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines six source {@link Publisher}s by emitting an item that aggregates the latest values of each of the
+     * source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -858,7 +857,7 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -871,21 +870,21 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
      * @param <T6> the element type of the sixth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            the second source Publisher
+     *            the second source {@code Publisher}
      * @param source3
-     *            the third source Publisher
+     *            the third source {@code Publisher}
      * @param source4
-     *            the fourth source Publisher
+     *            the fourth source {@code Publisher}
      * @param source5
-     *            the fifth source Publisher
+     *            the fifth source {@code Publisher}
      * @param source6
-     *            the sixth source Publisher
+     *            the sixth source {@code Publisher}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -909,8 +908,8 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
     }
 
     /**
-     * Combines seven source Publishers by emitting an item that aggregates the latest values of each of the
-     * source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines seven source {@link Publisher}s by emitting an item that aggregates the latest values of each of the
+     * source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -922,7 +921,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -936,23 +935,23 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
      * @param <T7> the element type of the seventh source
      * @param <R> the combined output type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            the second source Publisher
+     *            the second source {@code Publisher}
      * @param source3
-     *            the third source Publisher
+     *            the third source {@code Publisher}
      * @param source4
-     *            the fourth source Publisher
+     *            the fourth source {@code Publisher}
      * @param source5
-     *            the fifth source Publisher
+     *            the fifth source {@code Publisher}
      * @param source6
-     *            the sixth source Publisher
+     *            the sixth source {@code Publisher}
      * @param source7
-     *            the seventh source Publisher
+     *            the seventh source {@code Publisher}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -978,8 +977,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
     }
 
     /**
-     * Combines eight source Publishers by emitting an item that aggregates the latest values of each of the
-     * source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines eight source {@link Publisher}s by emitting an item that aggregates the latest values of each of the
+     * source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -991,7 +990,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -1006,25 +1005,25 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
      * @param <T8> the element type of the eighth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            the second source Publisher
+     *            the second source {@code Publisher}
      * @param source3
-     *            the third source Publisher
+     *            the third source {@code Publisher}
      * @param source4
-     *            the fourth source Publisher
+     *            the fourth source {@code Publisher}
      * @param source5
-     *            the fifth source Publisher
+     *            the fifth source {@code Publisher}
      * @param source6
-     *            the sixth source Publisher
+     *            the sixth source {@code Publisher}
      * @param source7
-     *            the seventh source Publisher
+     *            the seventh source {@code Publisher}
      * @param source8
-     *            the eighth source Publisher
+     *            the eighth source {@code Publisher}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -1051,8 +1050,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
     }
 
     /**
-     * Combines nine source Publishers by emitting an item that aggregates the latest values of each of the
-     * source Publishers each time an item is received from any of the source Publishers, where this
+     * Combines nine source {@link Publisher}s by emitting an item that aggregates the latest values of each of the
+     * source {@code Publisher}s each time an item is received from any of the source {@code Publisher}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -1064,7 +1063,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
-     *   {@code MissingBackpressureException}) and may lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -1080,27 +1079,27 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
      * @param <T9> the element type of the ninth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            the second source Publisher
+     *            the second source {@code Publisher}
      * @param source3
-     *            the third source Publisher
+     *            the third source {@code Publisher}
      * @param source4
-     *            the fourth source Publisher
+     *            the fourth source {@code Publisher}
      * @param source5
-     *            the fifth source Publisher
+     *            the fifth source {@code Publisher}
      * @param source6
-     *            the sixth source Publisher
+     *            the sixth source {@code Publisher}
      * @param source7
-     *            the seventh source Publisher
+     *            the seventh source {@code Publisher}
      * @param source8
-     *            the eighth source Publisher
+     *            the eighth source {@code Publisher}
      * @param source9
-     *            the ninth source Publisher
+     *            the ninth source {@code Publisher}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source Publishers
-     * @return a Flowable that emits items that are the result of combining the items emitted by the source
-     *         Publishers by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
+     *         {@code Publisher}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -1129,7 +1128,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
     }
 
     /**
-     * Concatenates elements of each Publisher provided via an Iterable sequence into a single sequence
+     * Concatenates elements of each {@link Publisher} provided via an {@link Iterable} sequence into a single sequence
      * of elements without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -1138,13 +1137,13 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the common value type of the sources
-     * @param sources the Iterable sequence of Publishers
-     * @return the new Flowable instance
+     * @param sources the {@code Iterable} sequence of {@code Publisher}s
+     * @return the new {@code Flowable} instance
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
@@ -1158,25 +1157,25 @@ public static <T> Flowable<T> concat(@NonNull Iterable<? extends Publisher<? ext
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by each of the Publishers emitted by the source
-     * Publisher, one after the other, without interleaving them.
+     * Returns a {@code Flowable} that emits the items emitted by each of the {@link Publisher}s emitted by the source
+     * {@code Publisher}, one after the other, without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}
      *  sources are expected to honor backpressure as well. If the outer violates this, a
-     *  {@code MissingBackpressureException} is signaled. If any of the inner {@code Publisher}s violates
-     *  this, it <em>may</em> throw an {@code IllegalStateException} when an inner {@code Publisher} completes.</dd>
+     *  {@link MissingBackpressureException} is signaled. If any of the inner {@code Publisher}s violates
+     *  this, it <em>may</em> throw an {@link IllegalStateException} when an inner {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param sources
-     *            a Publisher that emits Publishers
-     * @return a Flowable that emits items all of the items emitted by the Publishers emitted by
-     *         {@code Publishers}, one after the other, without interleaving them
+     *            a {@code Publisher} that emits {@code Publisher}s
+     * @return a {@code Flowable} that emits items all of the items emitted by the {@code Publisher}s emitted by
+     *         {@code Publisher}s, one after the other, without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -1188,27 +1187,27 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? ex
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by each of the Publishers emitted by the source
-     * Publisher, one after the other, without interleaving them.
+     * Returns a {@code Flowable} that emits the items emitted by each of the {@link Publisher}s emitted by the source
+     * {@code Publisher}, one after the other, without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}
      *  sources are expected to honor backpressure as well. If the outer violates this, a
-     *  {@code MissingBackpressureException} is signaled. If any of the inner {@code Publisher}s violates
-     *  this, it <em>may</em> throw an {@code IllegalStateException} when an inner {@code Publisher} completes.</dd>
+     *  {@link MissingBackpressureException} is signaled. If any of the inner {@code Publisher}s violates
+     *  this, it <em>may</em> throw an {@link IllegalStateException} when an inner {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param sources
-     *            a Publisher that emits Publishers
+     *            a {@code Publisher} that emits {@code Publisher}s
      * @param prefetch
-     *            the number of Publishers to prefetch from the sources sequence.
-     * @return a Flowable that emits items all of the items emitted by the Publishers emitted by
-     *         {@code Publishers}, one after the other, without interleaving them
+     *            the number of {@code Publisher}s to prefetch from the sources sequence.
+     * @return a {@code Flowable} that emits items all of the items emitted by the {@code Publisher}s emitted by
+     *         {@code Publisher}s, one after the other, without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -1221,7 +1220,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? ex
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by two Publishers, one after the other, without
+     * Returns a {@code Flowable} that emits the items emitted by two {@link Publisher}s, one after the other, without
      * interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -1230,17 +1229,17 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? ex
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param source1
-     *            a Publisher to be concatenated
+     *            a {@code Publisher} to be concatenated
      * @param source2
-     *            a Publisher to be concatenated
-     * @return a Flowable that emits items emitted by the two source Publishers, one after the other,
+     *            a {@code Publisher} to be concatenated
+     * @return a {@code Flowable} that emits items emitted by the two source {@code Publisher}s, one after the other,
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1255,7 +1254,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends T> source1, @N
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by three Publishers, one after the other, without
+     * Returns a {@code Flowable} that emits the items emitted by three {@link Publisher}s, one after the other, without
      * interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -1264,19 +1263,19 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends T> source1, @N
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param source1
-     *            a Publisher to be concatenated
+     *            a {@code Publisher} to be concatenated
      * @param source2
-     *            a Publisher to be concatenated
+     *            a {@code Publisher} to be concatenated
      * @param source3
-     *            a Publisher to be concatenated
-     * @return a Flowable that emits items emitted by the three source Publishers, one after the other,
+     *            a {@code Publisher} to be concatenated
+     * @return a {@code Flowable} that emits items emitted by the three source {@code Publisher}s, one after the other,
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1294,7 +1293,7 @@ public static <T> Flowable<T> concat(
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by four Publishers, one after the other, without
+     * Returns a {@code Flowable} that emits the items emitted by four {@link Publisher}s, one after the other, without
      * interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -1303,21 +1302,21 @@ public static <T> Flowable<T> concat(
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param source1
-     *            a Publisher to be concatenated
+     *            a {@code Publisher} to be concatenated
      * @param source2
-     *            a Publisher to be concatenated
+     *            a {@code Publisher} to be concatenated
      * @param source3
-     *            a Publisher to be concatenated
+     *            a {@code Publisher} to be concatenated
      * @param source4
-     *            a Publisher to be concatenated
-     * @return a Flowable that emits items emitted by the four source Publishers, one after the other,
+     *            a {@code Publisher} to be concatenated
+     * @return a {@code Flowable} that emits items emitted by the four source {@code Publisher}s, one after the other,
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1336,9 +1335,9 @@ public static <T> Flowable<T> concat(
     }
 
     /**
-     * Concatenates a variable number of Publisher sources.
+     * Concatenates a variable number of {@link Publisher} sources.
      * <p>
-     * Note: named this way because of overload conflict with concat(Publisher&lt;Publisher&gt;).
+     * Note: named this way because of overload conflict with {@code concat(Publisher<Publisher<T>>}).
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
      * <dl>
@@ -1346,14 +1345,14 @@ public static <T> Flowable<T> concat(
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param sources the array of sources
+     * @param sources the array of source {@code Publisher}s
      * @param <T> the common base value type
-     * @return the new Publisher instance
-     * @throws NullPointerException if sources is null
+     * @return the new {@code Publisher} instance
+     * @throws NullPointerException if sources is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1371,7 +1370,7 @@ public static <T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sou
     }
 
     /**
-     * Concatenates a variable number of Publisher sources and delays errors from any of them
+     * Concatenates a variable number of {@link Publisher} sources and delays errors from any of them
      * till all terminate.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -1380,14 +1379,14 @@ public static <T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sou
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param sources the array of sources
+     * @param sources the array of source {@code Publisher}s
      * @param <T> the common base value type
-     * @return the new Flowable instance
-     * @throws NullPointerException if sources is null
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if sources is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1405,25 +1404,25 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull Publisher<? extends
     }
 
     /**
-     * Concatenates an array of Publishers eagerly into a single stream of values.
+     * Concatenates an array of {@link Publisher}s eagerly into a single stream of values.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatArrayEager.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source Publishers. The operator buffers the values emitted by these Publishers and then drains them
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them
      * in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, the operator will signal a
-     *  {@code MissingBackpressureException}.</dd>
+     *  {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources an array of Publishers that need to be eagerly concatenated
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @param sources an array of {@code Publisher}s that need to be eagerly concatenated
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -1436,28 +1435,28 @@ public static <T> Flowable<T> concatArrayEager(@NonNull Publisher<? extends T>..
     }
 
     /**
-     * Concatenates an array of Publishers eagerly into a single stream of values.
+     * Concatenates an array of {@link Publisher}s eagerly into a single stream of values.
      * <p>
      * <img width="640" height="406" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatArrayEager.nn.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source Publishers. The operator buffers the values emitted by these Publishers and then drains them
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them
      * in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, the operator will signal a
-     *  {@code MissingBackpressureException}.</dd>
+     *  {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources an array of Publishers that need to be eagerly concatenated
+     * @param sources an array of {@code Publisher}s that need to be eagerly concatenated
      * @param maxConcurrency the maximum number of concurrent subscriptions at a time, {@link Integer#MAX_VALUE}
      *                       is interpreted as an indication to subscribe to all sources at once
-     * @param prefetch the number of elements to prefetch from each Publisher source
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @param prefetch the number of elements to prefetch from each {@code Publisher} source
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -1487,13 +1486,13 @@ public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch,
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, the operator will signal a
-     *  {@code MissingBackpressureException}.</dd>
+     *  {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
      * @param sources an array of {@code Publisher}s that need to be eagerly concatenated
-     * @return the new Flowable instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
      * @since 2.2.1 - experimental
      */
     @CheckReturnValue
@@ -1519,7 +1518,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<? ex
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, the operator will signal a
-     *  {@code MissingBackpressureException}.</dd>
+     *  {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -1528,7 +1527,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<? ex
      * @param maxConcurrency the maximum number of concurrent subscriptions at a time, {@link Integer#MAX_VALUE}
      *                       is interpreted as indication to subscribe to all sources at once
      * @param prefetch the number of elements to prefetch from each {@code Publisher} source
-     * @return the new Flowable instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
      * @since 2.2.1 - experimental
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -1542,22 +1541,22 @@ public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int
     }
 
     /**
-     * Concatenates the Iterable sequence of Publishers into a single sequence by subscribing to each Publisher,
-     * one after the other, one at a time and delays any errors till the all inner Publishers terminate.
+     * Concatenates the {@link Iterable} sequence of {@link Publisher}s into a single sequence by subscribing to each {@code Publisher},
+     * one after the other, one at a time and delays any errors till the all inner {@code Publisher}s terminate.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}
      *  sources are expected to honor backpressure as well. If the outer violates this, a
-     *  {@code MissingBackpressureException} is signaled. If any of the inner {@code Publisher}s violates
-     *  this, it <em>may</em> throw an {@code IllegalStateException} when an inner {@code Publisher} completes.</dd>
+     *  {@link MissingBackpressureException} is signaled. If any of the inner {@code Publisher}s violates
+     *  this, it <em>may</em> throw an {@link IllegalStateException} when an inner {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
-     * @param sources the Iterable sequence of Publishers
-     * @return the new Publisher with the concatenating behavior
+     * @param sources the {@code Iterable} sequence of {@code Publisher}s
+     * @return the new {@code Publisher} with the concatenating behavior
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
@@ -1570,8 +1569,8 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Publi
     }
 
     /**
-     * Concatenates the Publisher sequence of Publishers into a single sequence by subscribing to each inner Publisher,
-     * one after the other, one at a time and delays any errors till the all inner and the outer Publishers terminate.
+     * Concatenates the {@link Publisher} sequence of {@code Publisher}s into a single sequence by subscribing to each inner {@code Publisher},
+     * one after the other, one at a time and delays any errors till the all inner and the outer {@code Publisher}s terminate.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1581,8 +1580,8 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Publi
      * </dl>
      *
      * @param <T> the common element base type
-     * @param sources the Publisher sequence of Publishers
-     * @return the new Publisher with the concatenating behavior
+     * @param sources the {@code Publisher} sequence of {@code Publisher}s
+     * @return the new {@code Publisher} with the concatenating behavior
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1593,8 +1592,8 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publ
     }
 
     /**
-     * Concatenates the Publisher sequence of Publishers into a single sequence by subscribing to each inner Publisher,
-     * one after the other, one at a time and delays any errors till the all inner and the outer Publishers terminate.
+     * Concatenates the {@link Publisher} sequence of {@code Publisher}s into a single sequence by subscribing to each inner {@code Publisher},
+     * one after the other, one at a time and delays any errors till the all inner and the outer {@code Publisher}s terminate.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1604,11 +1603,11 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publ
      * </dl>
      *
      * @param <T> the common element base type
-     * @param sources the Publisher sequence of Publishers
-     * @param prefetch the number of elements to prefetch from the outer Publisher
-     * @param tillTheEnd if true exceptions from the outer and all inner Publishers are delayed to the end
-     *                   if false, exception from the outer Publisher is delayed till the current Publisher terminates
-     * @return the new Publisher with the concatenating behavior
+     * @param sources the {@code Publisher} sequence of {@code Publisher}s
+     * @param prefetch the number of elements to prefetch from the outer {@code Publisher}
+     * @param tillTheEnd if {@code true}, exceptions from the outer and all inner {@code Publisher}s are delayed to the end
+     *                   if {@code false}, exception from the outer {@code Publisher} is delayed till the current {@code Publisher} terminates
+     * @return the new {@code Publisher} with the concatenating behavior
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
@@ -1620,22 +1619,22 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publ
     }
 
     /**
-     * Concatenates a Publisher sequence of Publishers eagerly into a single stream of values.
+     * Concatenates a {@link Publisher} sequence of {@code Publisher}s eagerly into a single stream of values.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * emitted source Publishers as they are observed. The operator buffers the values emitted by these
-     * Publishers and then drains them in order, each one after the previous one completes.
+     * emitted source {@code Publisher}s as they are observed. The operator buffers the values emitted by these
+     * {@code Publisher}s and then drains them in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>Backpressure is honored towards the downstream and both the outer and inner Publishers are
+     *  <dd>Backpressure is honored towards the downstream and both the outer and inner {@code Publisher}s are
      *  expected to support backpressure. Violating this assumption, the operator will
-     *  signal {@code MissingBackpressureException}.</dd>
+     *  signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of Publishers that need to be eagerly concatenated
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -1647,25 +1646,25 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher
     }
 
     /**
-     * Concatenates a Publisher sequence of Publishers eagerly into a single stream of values.
+     * Concatenates a {@link Publisher} sequence of {@code Publisher}s eagerly into a single stream of values.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * emitted source Publishers as they are observed. The operator buffers the values emitted by these
-     * Publishers and then drains them in order, each one after the previous one completes.
+     * emitted source {@code Publisher}s as they are observed. The operator buffers the values emitted by these
+     * {@code Publisher}s and then drains them in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>Backpressure is honored towards the downstream and both the outer and inner Publishers are
+     *  <dd>Backpressure is honored towards the downstream and both the outer and inner {@code Publisher}s are
      *  expected to support backpressure. Violating this assumption, the operator will
-     *  signal {@code MissingBackpressureException}.</dd>
+     *  signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of Publishers that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrently running inner Publishers; {@link Integer#MAX_VALUE}
-     *                       is interpreted as all inner Publishers can be active at the same time
-     * @param prefetch the number of elements to prefetch from each inner Publisher source
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code Publisher}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code Publisher}s can be active at the same time
+     * @param prefetch the number of elements to prefetch from each inner {@code Publisher} source
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -1681,22 +1680,22 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher
     }
 
     /**
-     * Concatenates a sequence of Publishers eagerly into a single stream of values.
+     * Concatenates a sequence of {@link Publisher}s eagerly into a single stream of values.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source Publishers. The operator buffers the values emitted by these Publishers and then drains them
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them
      * in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>Backpressure is honored towards the downstream and the inner Publishers are
+     *  <dd>Backpressure is honored towards the downstream and the inner {@code Publisher}s are
      *  expected to support backpressure. Violating this assumption, the operator will
-     *  signal {@code MissingBackpressureException}.</dd>
+     *  signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of Publishers that need to be eagerly concatenated
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -1708,25 +1707,25 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<
     }
 
     /**
-     * Concatenates a sequence of Publishers eagerly into a single stream of values.
+     * Concatenates a sequence of {@link Publisher}s eagerly into a single stream of values.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source Publishers. The operator buffers the values emitted by these Publishers and then drains them
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them
      * in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>Backpressure is honored towards the downstream and both the outer and inner Publishers are
+     *  <dd>Backpressure is honored towards the downstream and both the outer and inner {@code Publisher}s are
      *  expected to support backpressure. Violating this assumption, the operator will
-     *  signal {@code MissingBackpressureException}.</dd>
+     *  signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of Publishers that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrently running inner Publishers; {@link Integer#MAX_VALUE}
-     *                       is interpreted as all inner Publishers can be active at the same time
-     * @param prefetch the number of elements to prefetch from each inner Publisher source
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code Publisher}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code Publisher}s can be active at the same time
+     * @param prefetch the number of elements to prefetch from each inner {@code Publisher} source
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -1742,7 +1741,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<
     }
 
     /**
-     * Provides an API (via a cold Flowable) that bridges the reactive world with the callback-style,
+     * Provides an API (via a cold {@code Flowable}) that bridges the reactive world with the callback-style,
      * generally non-backpressured world.
      * <p>
      * Example:
@@ -1773,10 +1772,11 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<
      * Whenever a {@link Subscriber} subscribes to the returned {@code Flowable}, the provided
      * {@link FlowableOnSubscribe} callback is invoked with a fresh instance of a {@link FlowableEmitter}
      * that will interact only with that specific {@code Subscriber}. If this {@code Subscriber}
-     * cancels the flow (making {@link FlowableEmitter#isCancelled} return true),
+     * cancels the flow (making {@link FlowableEmitter#isCancelled} return {@code true}),
      * other observers subscribed to the same returned {@code Flowable} are not affected.
      * <p>
-     * You should call the FlowableEmitter onNext, onError and onComplete methods in a serialized fashion. The
+     * You should call the {@link FlowableEmitter#onNext(Object)}, {@link FlowableEmitter#onError(Throwable)}
+     * and {@link FlowableEmitter#onComplete()} methods in a serialized fashion. The
      * rest of its methods are thread-safe.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1786,9 +1786,9 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<
      * </dl>
      *
      * @param <T> the element type
-     * @param source the emitter that is called when a Subscriber subscribes to the returned {@code Flowable}
-     * @param mode the backpressure mode to apply if the downstream Subscriber doesn't request (fast) enough
-     * @return the new Flowable instance
+     * @param source the emitter that is called when a {@code Subscriber} subscribes to the returned {@code Flowable}
+     * @param mode the backpressure mode to apply if the downstream {@code Subscriber} doesn't request (fast) enough
+     * @return the new {@code Flowable} instance
      * @see FlowableOnSubscribe
      * @see BackpressureStrategy
      * @see Cancellable
@@ -1804,14 +1804,14 @@ public static <T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @No
     }
 
     /**
-     * Returns a Flowable that calls a Publisher factory to create a Publisher for each new Subscriber
-     * that subscribes. That is, for each subscriber, the actual Publisher that subscriber observes is
+     * Returns a {@code Flowable} that calls a {@link Publisher} factory to create a {@code Publisher} for each new {@link Subscriber}
+     * that subscribes. That is, for each subscriber, the actual {@code Publisher} that subscriber observes is
      * determined by the factory function.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defer.png" alt="">
      * <p>
-     * The defer Subscriber allows you to defer or delay emitting items from a Publisher until such time as a
-     * Subscriber subscribes to the Publisher. This allows a {@link Subscriber} to easily obtain updates or a
+     * The defer {@code Subscriber} allows you to defer or delay emitting items from a {@code Publisher} until such time as a
+     * {@code Subscriber} subscribes to the {@code Publisher}. This allows a {@code Subscriber} to easily obtain updates or a
      * refreshed version of the sequence.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1822,12 +1822,12 @@ public static <T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @No
      * </dl>
      *
      * @param supplier
-     *            the Publisher factory function to invoke for each {@link Subscriber} that subscribes to the
-     *            resulting Publisher
+     *            the {@code Publisher} factory function to invoke for each {@code Subscriber} that subscribes to the
+     *            resulting {@code Publisher}
      * @param <T>
-     *            the type of the items emitted by the Publisher
-     * @return a Flowable whose {@link Subscriber}s' subscriptions trigger an invocation of the given
-     *         Publisher factory function
+     *            the type of the items emitted by the {@code Publisher}
+     * @return a {@code Flowable} whose {@code Subscriber}s' subscriptions trigger an invocation of the given
+     *         {@code Publisher} factory function
      * @see <a href="http://reactivex.io/documentation/operators/defer.html">ReactiveX operators documentation: Defer</a>
      */
     @CheckReturnValue
@@ -1840,7 +1840,7 @@ public static <T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<? exte
     }
 
     /**
-     * Returns a Flowable that emits no items to the {@link Subscriber} and immediately invokes its
+     * Returns a {@code Flowable} that emits no items to the {@link Subscriber} and immediately invokes its
      * {@link Subscriber#onComplete onComplete} method.
      * <p>
      * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/empty.png" alt="">
@@ -1852,9 +1852,9 @@ public static <T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<? exte
      * </dl>
      *
      * @param <T>
-     *            the type of the items (ostensibly) emitted by the Publisher
-     * @return a Flowable that emits no items to the {@link Subscriber} but immediately invokes the
-     *         {@link Subscriber}'s {@link Subscriber#onComplete() onComplete} method
+     *            the type of the items (ostensibly) emitted by the {@link Publisher}
+     * @return a {@code Flowable} that emits no items to the {@code Subscriber} but immediately invokes the
+     *         {@code Subscriber}'s {@link Subscriber#onComplete() onComplete} method
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Empty</a>
      */
     @CheckReturnValue
@@ -1867,8 +1867,8 @@ public static <T> Flowable<T> empty() {
     }
 
     /**
-     * Returns a Flowable that invokes a {@link Subscriber}'s {@link Subscriber#onError onError} method when the
-     * Subscriber subscribes to it.
+     * Returns a {@code Flowable} that invokes a {@link Subscriber}'s {@link Subscriber#onError onError} method when the
+     * {@code Subscriber} subscribes to it.
      * <p>
      * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.png" alt="">
      * <dl>
@@ -1879,11 +1879,11 @@ public static <T> Flowable<T> empty() {
      * </dl>
      *
      * @param supplier
-     *            a Supplier factory to return a Throwable for each individual Subscriber
+     *            a {@link Supplier} factory to return a {@link Throwable} for each individual {@code Subscriber}
      * @param <T>
-     *            the type of the items (ostensibly) emitted by the Publisher
-     * @return a Flowable that invokes the {@link Subscriber}'s {@link Subscriber#onError onError} method when
-     *         the Subscriber subscribes to it
+     *            the type of the items (ostensibly) emitted by the {@link Publisher}
+     * @return a {@code Flowable} that invokes the {@code Subscriber}'s {@link Subscriber#onError onError} method when
+     *         the {@code Subscriber} subscribes to it
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
@@ -1896,8 +1896,8 @@ public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> suppl
     }
 
     /**
-     * Returns a Flowable that invokes a {@link Subscriber}'s {@link Subscriber#onError onError} method when the
-     * Subscriber subscribes to it.
+     * Returns a {@code Flowable} that invokes a {@link Subscriber}'s {@link Subscriber#onError onError} method when the
+     * {@code Subscriber} subscribes to it.
      * <p>
      * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.png" alt="">
      * <dl>
@@ -1908,11 +1908,11 @@ public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> suppl
      * </dl>
      *
      * @param throwable
-     *            the particular Throwable to pass to {@link Subscriber#onError onError}
+     *            the particular {@link Throwable} to pass to {@link Subscriber#onError onError}
      * @param <T>
-     *            the type of the items (ostensibly) emitted by the Publisher
-     * @return a Flowable that invokes the {@link Subscriber}'s {@link Subscriber#onError onError} method when
-     *         the Subscriber subscribes to it
+     *            the type of the items (ostensibly) emitted by the {@link Publisher}
+     * @return a {@code Flowable} that invokes the {@code Subscriber}'s {@link Subscriber#onError onError} method when
+     *         the {@code Subscriber} subscribes to it
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
@@ -1925,7 +1925,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Converts an Array into a Publisher that emits the items in the Array.
+     * Converts an Array into a {@link Publisher} that emits the items in the Array.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.png" alt="">
      * <dl>
@@ -1939,8 +1939,8 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * @param items
      *            the array of elements
      * @param <T>
-     *            the type of items in the Array and the type of items to be emitted by the resulting Publisher
-     * @return a Flowable that emits each item in the source Array
+     *            the type of items in the Array and the type of items to be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits each item in the source Array
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -1960,13 +1960,13 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Returns a Flowable that, when a Subscriber subscribes to it, invokes a function you specify and then
+     * Returns a {@code Flowable} that, when a {@link Subscriber} subscribes to it, invokes a function you specify and then
      * emits the value returned from that function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCallable.png" alt="">
      * <p>
-     * This allows you to defer the execution of the function you specify until a Subscriber subscribes to the
-     * Publisher. That is to say, it makes the function "lazy."
+     * This allows you to defer the execution of the function you specify until a {@code Subscriber} subscribes to the
+     * {@link Publisher}. That is to say, it makes the function "lazy."
      * <dl>
      *   <dt><b>Backpressure:</b></dt>
      *   <dd>The operator honors backpressure from downstream.</dd>
@@ -1983,10 +1983,10 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *
      * @param supplier
      *         a function, the execution of which should be deferred; {@code fromCallable} will invoke this
-     *         function only when a Subscriber subscribes to the Publisher that {@code fromCallable} returns
+     *         function only when a {@code Subscriber} subscribes to the {@code Publisher} that {@code fromCallable} returns
      * @param <T>
-     *         the type of the item emitted by the Publisher
-     * @return a Flowable whose {@link Subscriber}s' subscriptions trigger an invocation of the given function
+     *         the type of the item emitted by the {@code Publisher}
+     * @return a {@code Flowable} whose {@code Subscriber}s' subscriptions trigger an invocation of the given function
      * @see #defer(Supplier)
      * @see #fromSupplier(Supplier)
      * @since 2.0
@@ -2001,21 +2001,21 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Converts a {@link Future} into a Publisher.
+     * Converts a {@link Future} into a {@link Publisher}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a Publisher that emits the
+     * You can convert any object that supports the {@code Future} interface into a {@code Publisher} that emits the
      * return value of the {@link Future#get} method of that object by passing the object into the {@code from}
      * method.
      * <p>
-     * <em>Important note:</em> This Publisher is blocking on the thread it gets subscribed on; you cannot cancel it.
+     * <em>Important note:</em> This {@code Publisher} is blocking on the thread it gets subscribed on; you cannot cancel it.
      * <p>
      * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
      * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
      * operator to convert and consume such sources in a non-blocking fashion instead.
      * <p>
-     * Unlike 1.x, canceling the Flowable won't cancel the future. If necessary, one can use composition to achieve the
+     * Unlike 1.x, canceling the {@code Flowable} won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -2025,11 +2025,11 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting Publisher
-     * @return a Flowable that emits the item from the source {@link Future}
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
+     *            the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the item from the source {@code Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromCompletionStage(CompletionStage)
      */
@@ -2043,18 +2043,18 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Converts a {@link Future} into a Publisher, with a timeout on the Future.
+     * Converts a {@link Future} into a {@link Publisher}, with a timeout on the {@code Future}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a Publisher that emits the
+     * You can convert any object that supports the {@code Future} interface into a {@code Publisher} that emits the
      * return value of the {@link Future#get} method of that object by passing the object into the {@code fromFuture}
      * method.
      * <p>
-     * Unlike 1.x, canceling the Flowable won't cancel the future. If necessary, one can use composition to achieve the
+     * Unlike 1.x, canceling the {@code Flowable} won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
      * <p>
-     * <em>Important note:</em> This Publisher is blocking on the thread it gets subscribed on; you cannot cancel it.
+     * <em>Important note:</em> This {@code Publisher} is blocking on the thread it gets subscribed on; you cannot cancel it.
      * <p>
      * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
      * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
@@ -2067,15 +2067,15 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param timeout
      *            the maximum time to wait before calling {@code get}
      * @param unit
      *            the {@link TimeUnit} of the {@code timeout} argument
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting Publisher
-     * @return a Flowable that emits the item from the source {@link Future}
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
+     *            the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the item from the source {@code Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromCompletionStage(CompletionStage)
      */
@@ -2090,18 +2090,18 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Converts a {@link Future} into a Publisher, with a timeout on the Future.
+     * Converts a {@link Future} into a {@link Publisher}, with a timeout on the {@code Future}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a Publisher that emits the
+     * You can convert any object that supports the {@code Future} interface into a {@code Publisher} that emits the
      * return value of the {@link Future#get} method of that object by passing the object into the {@code from}
      * method.
      * <p>
-     * Unlike 1.x, canceling the Flowable won't cancel the future. If necessary, one can use composition to achieve the
+     * Unlike 1.x, canceling the {@code Flowable} won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
      * <p>
-     * <em>Important note:</em> This Publisher is blocking; you cannot cancel it.
+     * <em>Important note:</em> This {@code Publisher} is blocking; you cannot cancel it.
      * <p>
      * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
      * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
@@ -2114,18 +2114,18 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param timeout
      *            the maximum time to wait before calling {@code get}
      * @param unit
      *            the {@link TimeUnit} of the {@code timeout} argument
      * @param scheduler
-     *            the {@link Scheduler} to wait for the Future on. Use a Scheduler such as
-     *            {@link Schedulers#io()} that can block and wait on the Future
+     *            the {@code Scheduler} to wait for the {@code Future} on. Use a {@code Scheduler} such as
+     *            {@link Schedulers#io()} that can block and wait on the {@code Future}
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting Publisher
-     * @return a Flowable that emits the item from the source {@link Future}
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
+     *            the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the item from the source {@code Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromCompletionStage(CompletionStage)
      */
@@ -2140,32 +2140,32 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Converts a {@link Future}, operating on a specified {@link Scheduler}, into a Publisher.
+     * Converts a {@link Future}, operating on a specified {@link Scheduler}, into a {@link Publisher}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.s.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a Publisher that emits the
+     * You can convert any object that supports the {@code Future} interface into a {@code Publisher} that emits the
      * return value of the {@link Future#get} method of that object by passing the object into the {@code from}
      * method.
      * <p>
-     * Unlike 1.x, canceling the Flowable won't cancel the future. If necessary, one can use composition to achieve the
+     * Unlike 1.x, canceling the {@code Flowable} won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param scheduler
-     *            the {@link Scheduler} to wait for the Future on. Use a Scheduler such as
-     *            {@link Schedulers#io()} that can block and wait on the Future
+     *            the {@code Scheduler} to wait for the {@code Future} on. Use a {@code Scheduler} such as
+     *            {@link Schedulers#io()} that can block and wait on the {@code Future}
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting Publisher
-     * @return a Flowable that emits the item from the source {@link Future}
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
+     *            the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the item from the source {@code Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @SuppressWarnings({ "unchecked" })
@@ -2179,7 +2179,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Converts an {@link Iterable} sequence into a Publisher that emits the items in the sequence.
+     * Converts an {@link Iterable} sequence into a {@link Publisher} that emits the items in the sequence.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.png" alt="">
      * <dl>
@@ -2191,11 +2191,11 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * </dl>
      *
      * @param source
-     *            the source {@link Iterable} sequence
+     *            the source {@code Iterable} sequence
      * @param <T>
-     *            the type of items in the {@link Iterable} sequence and the type of items to be emitted by the
-     *            resulting Publisher
-     * @return a Flowable that emits each item in the source {@link Iterable} sequence
+     *            the type of items in the {@code Iterable} sequence and the type of items to be emitted by the
+     *            resulting {@code Publisher}
+     * @return a {@code Flowable} that emits each item in the source {@code Iterable} sequence
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromStream(Stream)
      */
@@ -2209,17 +2209,17 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Converts an arbitrary Reactive Streams Publisher into a Flowable if not already a
-     * Flowable.
+     * Converts an arbitrary <em>Reactive Streams</em> {@link Publisher} into a {@code Flowable} if not already a
+     * {@code Flowable}.
      * <p>
-     * The {@link Publisher} must follow the
+     * The {@code Publisher} must follow the
      * <a href="https://github.com/reactive-streams/reactive-streams-jvm#reactive-streams">Reactive-Streams specification</a>.
      * Violating the specification may result in undefined behavior.
      * <p>
      * If possible, use {@link #create(FlowableOnSubscribe, BackpressureStrategy)} to create a
      * source-like {@code Flowable} instead.
      * <p>
-     * Note that even though {@link Publisher} appears to be a functional interface, it
+     * Note that even though {@code Publisher} appears to be a functional interface, it
      * is not recommended to implement it through a lambda as the specification requires
      * state management that is not achievable with a stateless lambda.
      * <dl>
@@ -2230,9 +2230,9 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *  <dd>{@code fromPublisher} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type of the flow
-     * @param source the Publisher to convert
-     * @return the new Flowable instance
-     * @throws NullPointerException if the {@code source} {@code Publisher} is null
+     * @param source the {@code Publisher} to convert
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if the {@code source} {@code Publisher} is {@code null}
      * @see #create(FlowableOnSubscribe, BackpressureStrategy)
      */
     @CheckReturnValue
@@ -2250,13 +2250,13 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> sour
     }
 
     /**
-     * Returns a Flowable that, when a Subscriber subscribes to it, invokes a supplier function you specify and then
+     * Returns a {@code Flowable} that, when a {@link Subscriber} subscribes to it, invokes a supplier function you specify and then
      * emits the value returned from that function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromSupplier.png" alt="">
      * <p>
-     * This allows you to defer the execution of the function you specify until a Subscriber subscribes to the
-     * Publisher. That is to say, it makes the function "lazy."
+     * This allows you to defer the execution of the function you specify until a {@code Subscriber} subscribes to the
+     * {@link Publisher}. That is to say, it makes the function "lazy."
      * <dl>
      *   <dt><b>Backpressure:</b></dt>
      *   <dd>The operator honors backpressure from downstream.</dd>
@@ -2273,10 +2273,10 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> sour
      *
      * @param supplier
      *         a function, the execution of which should be deferred; {@code fromSupplier} will invoke this
-     *         function only when a Subscriber subscribes to the Publisher that {@code fromSupplier} returns
+     *         function only when a {@code Subscriber} subscribes to the {@code Publisher} that {@code fromSupplier} returns
      * @param <T>
-     *         the type of the item emitted by the Publisher
-     * @return a Flowable whose {@link Subscriber}s' subscriptions trigger an invocation of the given function
+     *         the type of the item emitted by the {@code Publisher}
+     * @return a {@code Flowable} whose {@code Subscriber}s' subscriptions trigger an invocation of the given function
      * @see #defer(Supplier)
      * @see #fromCallable(Callable)
      * @since 3.0.0
@@ -2305,11 +2305,11 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> sour
      * </dl>
      *
      * @param <T> the generated value type
-     * @param generator the Consumer called whenever a particular downstream Subscriber has
+     * @param generator the {@link Consumer} called whenever a particular downstream {@link Subscriber} has
      * requested a value. The callback then should call {@code onNext}, {@code onError} or
      * {@code onComplete} to signal a value or a terminal event. Signaling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @return the new Flowable instance
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -2336,14 +2336,14 @@ public static <T> Flowable<T> generate(@NonNull Consumer<@NonNull Emitter<T>> ge
      *  <dd>{@code generate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <S> the type of the per-Subscriber state
+     * @param <S> the type of the per-{@link Subscriber} state
      * @param <T> the generated value type
-     * @param initialState the Supplier to generate the initial state for each Subscriber
-     * @param generator the Consumer called with the current state whenever a particular downstream Subscriber has
+     * @param initialState the {@link Supplier} to generate the initial state for each {@code Subscriber}
+     * @param generator the {@link Consumer} called with the current state whenever a particular downstream {@code Subscriber} has
      * requested a value. The callback then should call {@code onNext}, {@code onError} or
      * {@code onComplete} to signal a value or a terminal event. Signaling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @return the new Flowable instance
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -2369,16 +2369,16 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      *  <dd>{@code generate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <S> the type of the per-Subscriber state
+     * @param <S> the type of the per-{@link Subscriber} state
      * @param <T> the generated value type
-     * @param initialState the Supplier to generate the initial state for each Subscriber
-     * @param generator the Consumer called with the current state whenever a particular downstream Subscriber has
+     * @param initialState the {@link Supplier} to generate the initial state for each {@code Subscriber}
+     * @param generator the {@link Consumer} called with the current state whenever a particular downstream {@code Subscriber} has
      * requested a value. The callback then should call {@code onNext}, {@code onError} or
      * {@code onComplete} to signal a value or a terminal event. Signaling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @param disposeState the Consumer that is called with the current state when the generator
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @param disposeState the {@code Consumer} that is called with the current state when the generator
      * terminates the sequence or it gets canceled
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -2404,15 +2404,15 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      *  <dd>{@code generate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <S> the type of the per-Subscriber state
+     * @param <S> the type of the per-{@link Subscriber} state
      * @param <T> the generated value type
-     * @param initialState the Supplier to generate the initial state for each Subscriber
-     * @param generator the Function called with the current state whenever a particular downstream Subscriber has
+     * @param initialState the {@link Supplier} to generate the initial state for each {@code Subscriber}
+     * @param generator the {@link Function} called with the current state whenever a particular downstream {@code Subscriber} has
      * requested a value. The callback then should call {@code onNext}, {@code onError} or
      * {@code onComplete} to signal a value or a terminal event and should return a (new) state for
      * the next invocation. Signaling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @return the new Flowable instance
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2436,17 +2436,17 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      *  <dd>{@code generate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <S> the type of the per-Subscriber state
+     * @param <S> the type of the per-{@link Subscriber} state
      * @param <T> the generated value type
-     * @param initialState the Supplier to generate the initial state for each Subscriber
-     * @param generator the Function called with the current state whenever a particular downstream Subscriber has
+     * @param initialState the {@link Supplier} to generate the initial state for each {@code Subscriber}
+     * @param generator the {@link Function} called with the current state whenever a particular downstream {@code Subscriber} has
      * requested a value. The callback then should call {@code onNext}, {@code onError} or
      * {@code onComplete} to signal a value or a terminal event and should return a (new) state for
      * the next invocation. Signaling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @param disposeState the Consumer that is called with the current state when the generator
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @param disposeState the {@link Consumer} that is called with the current state when the generator
      * terminates the sequence or it gets canceled
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -2460,15 +2460,15 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
     }
 
     /**
-     * Returns a Flowable that emits a {@code 0L} after the {@code initialDelay} and ever-increasing numbers
+     * Returns a {@code Flowable} that emits a {@code 0L} after the {@code initialDelay} and ever-increasing numbers
      * after each {@code period} of time thereafter.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator generates values based on time and ignores downstream backpressure which
-     *  may lead to {@code MissingBackpressureException} at some point in the chain.
-     *  Consumers should consider applying one of the {@code onBackpressureXXX} operators as well.</dd>
+     *  may lead to {@link MissingBackpressureException} at some point in the chain.
+     *  Downstream consumers should consider applying one of the {@code onBackpressureXXX} operators as well.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code interval} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -2479,7 +2479,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      *            the period of time between emissions of the subsequent numbers
      * @param unit
      *            the time unit for both {@code initialDelay} and {@code period}
-     * @return a Flowable that emits a 0L after the {@code initialDelay} and ever-increasing numbers after
+     * @return a {@code Flowable} that emits a 0L after the {@code initialDelay} and ever-increasing numbers after
      *         each {@code period} of time thereafter
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      * @since 1.0.12
@@ -2493,17 +2493,17 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
     }
 
     /**
-     * Returns a Flowable that emits a {@code 0L} after the {@code initialDelay} and ever-increasing numbers
+     * Returns a {@code Flowable} that emits a {@code 0L} after the {@code initialDelay} and ever-increasing numbers
      * after each {@code period} of time thereafter, on a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.ps.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator generates values based on time and ignores downstream backpressure which
-     *  may lead to {@code MissingBackpressureException} at some point in the chain.
-     *  Consumers should consider applying one of the {@code onBackpressureXXX} operators as well.</dd>
+     *  may lead to {@link MissingBackpressureException} at some point in the chain.
+     *  Downstream consumers should consider applying one of the {@code onBackpressureXXX} operators as well.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param initialDelay
@@ -2513,9 +2513,9 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
      * @param unit
      *            the time unit for both {@code initialDelay} and {@code period}
      * @param scheduler
-     *            the Scheduler on which the waiting happens and items are emitted
-     * @return a Flowable that emits a 0L after the {@code initialDelay} and ever-increasing numbers after
-     *         each {@code period} of time thereafter, while running on the given Scheduler
+     *            the {@code Scheduler} on which the waiting happens and items are emitted
+     * @return a {@code Flowable} that emits a 0L after the {@code initialDelay} and ever-increasing numbers after
+     *         each {@code period} of time thereafter, while running on the given {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      * @since 1.0.12
      */
@@ -2530,12 +2530,12 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
     }
 
     /**
-     * Returns a Flowable that emits a sequential number every specified interval of time.
+     * Returns a {@code Flowable} that emits a sequential number every specified interval of time.
      * <p>
      * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator signals a {@code MissingBackpressureException} if the downstream
+     *  <dd>The operator signals a {@link MissingBackpressureException} if the downstream
      *  is not ready to receive the next value.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code interval} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -2545,7 +2545,7 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
      *            the period size in time units (see below)
      * @param unit
      *            time units to use for the interval size
-     * @return a Flowable that emits a sequential number each time interval
+     * @return a {@code Flowable} that emits a sequential number each time interval
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
     @CheckReturnValue
@@ -2557,17 +2557,17 @@ public static Flowable<Long> interval(long period, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that emits a sequential number every specified interval of time, on a
-     * specified Scheduler.
+     * Returns a {@code Flowable} that emits a sequential number every specified interval of time, on a
+     * specified {@link Scheduler}.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator generates values based on time and ignores downstream backpressure which
-     *  may lead to {@code MissingBackpressureException} at some point in the chain.
-     *  Consumers should consider applying one of the {@code onBackpressureXXX} operators as well.</dd>
+     *  may lead to {@link MissingBackpressureException} at some point in the chain.
+     *  Downstream consumers should consider applying one of the {@code onBackpressureXXX} operators as well.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param period
@@ -2575,8 +2575,8 @@ public static Flowable<Long> interval(long period, @NonNull TimeUnit unit) {
      * @param unit
      *            time units to use for the interval size
      * @param scheduler
-     *            the Scheduler to use for scheduling the items
-     * @return a Flowable that emits a sequential number each time interval
+     *            the {@code Scheduler} to use for scheduling the items
+     * @return a {@code Flowable} that emits a sequential number each time interval
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
     @CheckReturnValue
@@ -2590,19 +2590,19 @@ public static Flowable<Long> interval(long period, @NonNull TimeUnit unit, @NonN
     /**
      * Signals a range of long values, the first after some initial delay and the rest periodically after.
      * <p>
-     * The sequence completes immediately after the last value (start + count - 1) has been reached.
+     * The sequence completes immediately after the last value {@code (start + count - 1)} has been reached.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator signals a {@code MissingBackpressureException} if the downstream can't keep up.</dd>
+     *  <dd>The operator signals a {@link MissingBackpressureException} if the downstream can't keep up.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code intervalRange} by default operates on the {@link Schedulers#computation() computation} {@link Scheduler}.</dd>
      * </dl>
      * @param start that start value of the range
-     * @param count the number of values to emit in total, if zero, the operator emits an onComplete after the initial delay.
+     * @param count the number of values to emit in total, if zero, the operator emits an {@code onComplete} after the initial delay.
      * @param initialDelay the initial delay before signaling the first value (the start)
      * @param period the period between subsequent values
-     * @param unit the unit of measure of the initialDelay and period amounts
-     * @return the new Flowable instance
+     * @param unit the unit of measure of the {@code initialDelay} and {@code period} amounts
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
@@ -2618,17 +2618,17 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * The sequence completes immediately after the last value (start + count - 1) has been reached.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator signals a {@code MissingBackpressureException} if the downstream can't keep up.</dd>
+     *  <dd>The operator signals a {@link MissingBackpressureException} if the downstream can't keep up.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>you provide the {@link Scheduler}.</dd>
      * </dl>
      * @param start that start value of the range
-     * @param count the number of values to emit in total, if zero, the operator emits an onComplete after the initial delay.
+     * @param count the number of values to emit in total, if zero, the operator emits an {@code onComplete} after the initial delay.
      * @param initialDelay the initial delay before signaling the first value (the start)
      * @param period the period between subsequent values
-     * @param unit the unit of measure of the initialDelay and period amounts
-     * @param scheduler the target scheduler where the values and terminal signals will be emitted
-     * @return the new Flowable instance
+     * @param unit the unit of measure of the {@code initialDelay} and {@code period} amounts
+     * @param scheduler the target {@code Scheduler} where the values and terminal signals will be emitted
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -2653,12 +2653,12 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Returns a Flowable that signals the given (constant reference) item and then completes.
+     * Returns a {@code Flowable} that signals the given (constant reference) item and then completes.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.png" alt="">
      * <p>
      * Note that the item is taken and re-emitted as is and not computed by any means by {@code just}. Use {@link #fromCallable(Callable)}
-     * to generate a single item on demand (when {@code Subscriber}s subscribe to it).
+     * to generate a single item on demand (when {@link Subscriber}s subscribe to it).
      * <p>
      * See the multi-parameter overloads of {@code just} to emit more than one (constant reference) items one after the other.
      * Use {@link #fromArray(Object...)} to emit an arbitrary number of items that are known upfront.
@@ -2675,7 +2675,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            the item to emit
      * @param <T>
      *            the type of that item
-     * @return a Flowable that emits {@code value} as a single item and then completes
+     * @return a {@code Flowable} that emits {@code value} as a single item and then completes
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      * @see #just(Object, Object)
      * @see #fromCallable(Callable)
@@ -2692,7 +2692,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Converts two items into a Publisher that emits those items.
+     * Converts two items into a {@link Publisher} that emits those items.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
      * <dl>
@@ -2708,7 +2708,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            second item
      * @param <T>
      *            the type of these items
-     * @return a Flowable that emits each item
+     * @return a {@code Flowable} that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2723,7 +2723,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Converts three items into a Publisher that emits those items.
+     * Converts three items into a {@link Publisher} that emits those items.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
      * <dl>
@@ -2741,7 +2741,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            third item
      * @param <T>
      *            the type of these items
-     * @return a Flowable that emits each item
+     * @return a {@code Flowable} that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2757,7 +2757,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Converts four items into a Publisher that emits those items.
+     * Converts four items into a {@link Publisher} that emits those items.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
      * <dl>
@@ -2777,7 +2777,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            fourth item
      * @param <T>
      *            the type of these items
-     * @return a Flowable that emits each item
+     * @return a {@code Flowable} that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2794,7 +2794,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Converts five items into a Publisher that emits those items.
+     * Converts five items into a {@link Publisher} that emits those items.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
      * <dl>
@@ -2816,7 +2816,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            fifth item
      * @param <T>
      *            the type of these items
-     * @return a Flowable that emits each item
+     * @return a {@code Flowable} that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2834,7 +2834,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Converts six items into a Publisher that emits those items.
+     * Converts six items into a {@link Publisher} that emits those items.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
      * <dl>
@@ -2858,7 +2858,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            sixth item
      * @param <T>
      *            the type of these items
-     * @return a Flowable that emits each item
+     * @return a {@code Flowable} that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2877,7 +2877,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Converts seven items into a Publisher that emits those items.
+     * Converts seven items into a {@link Publisher} that emits those items.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
      * <dl>
@@ -2903,7 +2903,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            seventh item
      * @param <T>
      *            the type of these items
-     * @return a Flowable that emits each item
+     * @return a {@code Flowable} that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2923,7 +2923,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Converts eight items into a Publisher that emits those items.
+     * Converts eight items into a {@link Publisher} that emits those items.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
      * <dl>
@@ -2951,7 +2951,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            eighth item
      * @param <T>
      *            the type of these items
-     * @return a Flowable that emits each item
+     * @return a {@code Flowable} that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2972,7 +2972,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Converts nine items into a Publisher that emits those items.
+     * Converts nine items into a {@link Publisher} that emits those items.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
      * <dl>
@@ -3002,7 +3002,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            ninth item
      * @param <T>
      *            the type of these items
-     * @return a Flowable that emits each item
+     * @return a {@code Flowable} that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -3024,7 +3024,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Converts ten items into a Publisher that emits those items.
+     * Converts ten items into a {@link Publisher} that emits those items.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
      * <dl>
@@ -3056,7 +3056,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            tenth item
      * @param <T>
      *            the type of these items
-     * @return a Flowable that emits each item
+     * @return a {@code Flowable} that emits each item
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -3079,27 +3079,27 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     }
 
     /**
-     * Flattens an Iterable of Publishers into one Publisher, without any transformation, while limiting the
-     * number of concurrent subscriptions to these Publishers.
+     * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, without any transformation, while limiting the
+     * number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Iterable, int, int)} to merge sources and terminate only when all source {@code Publisher}s
@@ -3109,13 +3109,13 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of Publishers
+     *            the {@code Iterable} of {@code Publisher}s
      * @param maxConcurrency
-     *            the maximum number of Publishers that may be subscribed to concurrently
+     *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param bufferSize
-     *            the number of items to prefetch from each inner Publisher
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         Publishers in the Iterable
+     *            the number of items to prefetch from each inner {@code Publisher}
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code Publisher}s in the {@code Iterable}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3131,27 +3131,27 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
     }
 
     /**
-     * Flattens an Iterable of Publishers into one Publisher, without any transformation, while limiting the
-     * number of concurrent subscriptions to these Publishers.
+     * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, without any transformation, while limiting the
+     * number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArray} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeArrayDelayError(int, int, Publisher[])} to merge sources and terminate only when all source {@code Publisher}s
@@ -3161,13 +3161,13 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
      *
      * @param <T> the common element base type
      * @param sources
-     *            the array of Publishers
+     *            the array of {@code Publisher}s
      * @param maxConcurrency
-     *            the maximum number of Publishers that may be subscribed to concurrently
+     *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param bufferSize
-     *            the number of items to prefetch from each inner Publisher
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         Publishers in the Iterable
+     *            the number of items to prefetch from each inner {@code Publisher}
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code Publisher}s
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3184,26 +3184,26 @@ public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @No
     }
 
     /**
-     * Flattens an Iterable of Publishers into one Publisher, without any transformation.
+     * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Iterable)} to merge sources and terminate only when all source {@code Publisher}s
@@ -3213,9 +3213,9 @@ public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @No
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of Publishers
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         Publishers in the Iterable
+     *            the {@code Iterable} of {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code Publisher}s in the {@code Iterable}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable)
      */
@@ -3229,27 +3229,27 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
     }
 
     /**
-     * Flattens an Iterable of Publishers into one Publisher, without any transformation, while limiting the
-     * number of concurrent subscriptions to these Publishers.
+     * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, without any transformation, while limiting the
+     * number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Iterable, int)} to merge sources and terminate only when all source {@code Publisher}s
@@ -3259,11 +3259,11 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of Publishers
+     *            the {@code Iterable} of {@code Publisher}s
      * @param maxConcurrency
-     *            the maximum number of Publishers that may be subscribed to concurrently
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         Publishers in the Iterable
+     *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code Publisher}s in the {@code Iterable}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3279,28 +3279,28 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
     }
 
     /**
-     * Flattens a Publisher that emits Publishers into a single Publisher that emits the items emitted by
-     * those Publishers, without any transformation.
+     * Flattens a {@link Publisher} that emits {@code Publisher}s into a single {@code Publisher} that emits the items emitted by
+     * thos {@code Publisher}s , without any transformation.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed
      *  in unbounded mode (i.e., no backpressure is applied to it). The inner {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher)} to merge sources and terminate only when all source {@code Publisher}s
@@ -3310,9 +3310,9 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
      *
      * @param <T> the common element base type
      * @param sources
-     *            a Publisher that emits Publishers
-     * @return a Flowable that emits items that are the result of flattening the Publishers emitted by the
-     *         {@code source} Publisher
+     *            a {@code Publisher} that emits {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of flattening the {@code Publisher}s emitted by the
+     *         {@code source} {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher)
      */
@@ -3325,28 +3325,28 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? ext
     }
 
     /**
-     * Flattens a Publisher that emits Publishers into a single Publisher that emits the items emitted by
-     * those Publishers, without any transformation, while limiting the maximum number of concurrent
-     * subscriptions to these Publishers.
+     * Flattens a {@link Publisher} that emits {@code Publisher}s into a single {@code Publisher} that emits the items emitted by
+     * those {@code Publisher}s, without any transformation, while limiting the maximum number of concurrent
+     * subscriptions to these {@code Publisher}s.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher, int)} to merge sources and terminate only when all source {@code Publisher}s
@@ -3356,11 +3356,11 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? ext
      *
      * @param <T> the common element base type
      * @param sources
-     *            a Publisher that emits Publishers
+     *            a {@code Publisher} that emits {@code Publisher}s
      * @param maxConcurrency
-     *            the maximum number of Publishers that may be subscribed to concurrently
-     * @return a Flowable that emits items that are the result of flattening the Publishers emitted by the
-     *         {@code source} Publisher
+     *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
+     * @return a {@code Flowable} that emits items that are the result of flattening the {@code Publisher}s emitted by the
+     *         {@code source} {@code Publisher}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3377,26 +3377,26 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? ext
     }
 
     /**
-     * Flattens an Array of Publishers into one Publisher, without any transformation.
+     * Flattens an Array of {@link Publisher}s into one {@code Publisher}, without any transformation.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.io.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArray} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeArrayDelayError(Publisher...)} to merge sources and terminate only when all source {@code Publisher}s
@@ -3406,8 +3406,8 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? ext
      *
      * @param <T> the common element base type
      * @param sources
-     *            the array of Publishers
-     * @return a Flowable that emits all of the items emitted by the Publishers in the Array
+     *            the array of {@code Publisher}s
+     * @return a {@code Flowable} that emits all of the items emitted by the {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeArrayDelayError(Publisher...)
      */
@@ -3422,26 +3422,26 @@ public static <T> Flowable<T> mergeArray(@NonNull Publisher<? extends T>... sour
     }
 
     /**
-     * Flattens two Publishers into a single Publisher, without any transformation.
+     * Flattens two {@link Publisher}s into a single {@code Publisher}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher, Publisher)} to merge sources and terminate only when all source {@code Publisher}s
@@ -3451,10 +3451,10 @@ public static <T> Flowable<T> mergeArray(@NonNull Publisher<? extends T>... sour
      *
      * @param <T> the common element base type
      * @param source1
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source2
-     *            a Publisher to be merged
-     * @return a Flowable that emits all of the items emitted by the source Publishers
+     *            a {@code Publisher} to be merged
+     * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher, Publisher)
      */
@@ -3470,26 +3470,26 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @No
     }
 
     /**
-     * Flattens three Publishers into a single Publisher, without any transformation.
+     * Flattens three {@link Publisher}s into a single {@code Publisher}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher, Publisher, Publisher)} to merge sources and terminate only when all source {@code Publisher}s
@@ -3499,12 +3499,12 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @No
      *
      * @param <T> the common element base type
      * @param source1
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source2
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source3
-     *            a Publisher to be merged
-     * @return a Flowable that emits all of the items emitted by the source Publishers
+     *            a {@code Publisher} to be merged
+     * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher, Publisher, Publisher)
      */
@@ -3521,26 +3521,26 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @No
     }
 
     /**
-     * Flattens four Publishers into a single Publisher, without any transformation.
+     * Flattens four {@link Publisher}s into a single {@code Publisher}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code Publisher}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code Publisher}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code Publisher}s are canceled.
      *  If more than one {@code Publisher} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been canceled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher, Publisher, Publisher, Publisher)} to merge sources and terminate only when all source {@code Publisher}s
@@ -3550,14 +3550,14 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @No
      *
      * @param <T> the common element base type
      * @param source1
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source2
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source3
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source4
-     *            a Publisher to be merged
-     * @return a Flowable that emits all of the items emitted by the source Publishers
+     *            a {@code Publisher} to be merged
+     * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher, Publisher, Publisher, Publisher)
      */
@@ -3577,31 +3577,31 @@ public static <T> Flowable<T> merge(
     }
 
     /**
-     * Flattens an Iterable of Publishers into one Publisher, in a way that allows a Subscriber to receive all
-     * successfully emitted items from each of the source Publishers without being interrupted by an error
+     * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, in a way that allows a {@link Subscriber} to receive all
+     * successfully emitted items from each of the source {@code Publisher}s without being interrupted by an error
      * notification from one of them.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged Publishers notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code Publisher}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged Publishers have finished emitting items.
+     * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. All inner {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of Publishers
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         Publishers in the Iterable
+     *            the {@code Iterable} of {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code Publisher}s in the {@code Iterable}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3614,35 +3614,35 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publis
     }
 
     /**
-     * Flattens an Iterable of Publishers into one Publisher, in a way that allows a Subscriber to receive all
-     * successfully emitted items from each of the source Publishers without being interrupted by an error
-     * notification from one of them, while limiting the number of concurrent subscriptions to these Publishers.
+     * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, in a way that allows a {@link Subscriber} to receive all
+     * successfully emitted items from each of the source {@code Publisher}s without being interrupted by an error
+     * notification from one of them, while limiting the number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged Publishers notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code Publisher}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged Publishers have finished emitting items.
+     * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. All inner {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of Publishers
+     *            the {@code Iterable} of {@code Publisher}s
      * @param maxConcurrency
-     *            the maximum number of Publishers that may be subscribed to concurrently
+     *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param bufferSize
-     *            the number of items to prefetch from each inner Publisher
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         Publishers in the Iterable
+     *            the number of items to prefetch from each inner {@code Publisher}
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code Publisher}s in the {@code Iterable}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3655,35 +3655,35 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publis
     }
 
     /**
-     * Flattens an array of Publishers into one Publisher, in a way that allows a Subscriber to receive all
-     * successfully emitted items from each of the source Publishers without being interrupted by an error
-     * notification from one of them, while limiting the number of concurrent subscriptions to these Publishers.
+     * Flattens an array of {@link Publisher}s into one {@code Publisher}, in a way that allows a {@link Subscriber} to receive all
+     * successfully emitted items from each of the source {@code Publisher}s without being interrupted by an error
+     * notification from one of them, while limiting the number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged Publishers notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code Publisher}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged Publishers have finished emitting items.
+     * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. All source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param sources
-     *            the array of Publishers
+     *            the array of {@code Publisher}s
      * @param maxConcurrency
-     *            the maximum number of Publishers that may be subscribed to concurrently
+     *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param bufferSize
-     *            the number of items to prefetch from each inner Publisher
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         Publishers in the Iterable
+     *            the number of items to prefetch from each inner {@code Publisher}
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3697,33 +3697,33 @@ public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int buffe
     }
 
     /**
-     * Flattens an Iterable of Publishers into one Publisher, in a way that allows a Subscriber to receive all
-     * successfully emitted items from each of the source Publishers without being interrupted by an error
-     * notification from one of them, while limiting the number of concurrent subscriptions to these Publishers.
+     * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, in a way that allows a {@link Subscriber} to receive all
+     * successfully emitted items from each of the source {@code Publisher}s without being interrupted by an error
+     * notification from one of them, while limiting the number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged Publishers notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code Publisher}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged Publishers have finished emitting items.
+     * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. All inner {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of Publishers
+     *            the {@code Iterable} of {@code Publisher}s
      * @param maxConcurrency
-     *            the maximum number of Publishers that may be subscribed to concurrently
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         Publishers in the Iterable
+     *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code Publisher}s in the {@code Iterable}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3736,32 +3736,32 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publis
     }
 
     /**
-     * Flattens a Publisher that emits Publishers into one Publisher, in a way that allows a Subscriber to
-     * receive all successfully emitted items from all of the source Publishers without being interrupted by
+     * Flattens a {@link Publisher} that emits {@code Publisher}s into one {@code Publisher}, in a way that allows a {@link Subscriber} to
+     * receive all successfully emitted items from all of the source {@code Publisher}s without being interrupted by
      * an error notification from one of them.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged Publishers notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code Publisher}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged Publishers have finished emitting items.
+     * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed
      *  in unbounded mode (i.e., no backpressure is applied to it). The inner {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param sources
-     *            a Publisher that emits Publishers
-     * @return a Flowable that emits all of the items emitted by the Publishers emitted by the
-     *         {@code source} Publisher
+     *            a {@code Publisher} that emits {@code Publisher}s
+     * @return a {@code Flowable} that emits all of the items emitted by the {@code Publisher}s emitted by the
+     *         {@code source} {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @CheckReturnValue
@@ -3773,34 +3773,34 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publi
     }
 
     /**
-     * Flattens a Publisher that emits Publishers into one Publisher, in a way that allows a Subscriber to
-     * receive all successfully emitted items from all of the source Publishers without being interrupted by
+     * Flattens a {@link Publisher} that emits {@code Publisher}s into one {@code Publisher}, in a way that allows a {@link Subscriber} to
+     * receive all successfully emitted items from all of the source {@code Publisher}s without being interrupted by
      * an error notification from one of them, while limiting the
-     * number of concurrent subscriptions to these Publishers.
+     * number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged Publishers notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code Publisher}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged Publishers have finished emitting items.
+     * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param sources
-     *            a Publisher that emits Publishers
+     *            a {@code Publisher} that emits {@code Publisher}s
      * @param maxConcurrency
-     *            the maximum number of Publishers that may be subscribed to concurrently
-     * @return a Flowable that emits all of the items emitted by the Publishers emitted by the
-     *         {@code source} Publisher
+     *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
+     * @return a {@code Flowable} that emits all of the items emitted by the {@code Publisher}s emitted by the
+     *         {@code source} {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @since 2.0
      */
@@ -3814,31 +3814,31 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publi
     }
 
     /**
-     * Flattens an array of Publishers into one Flowable, in a way that allows a Subscriber to receive all
-     * successfully emitted items from each of the source Publishers without being interrupted by an error
+     * Flattens an array of {@link Publisher}s into one {@code Flowable}, in a way that allows a {@link Subscriber} to receive all
+     * successfully emitted items from each of the source {@code Publisher}s without being interrupted by an error
      * notification from one of them.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged Publishers notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code Publisher}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged Publishers have finished emitting items.
+     * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of Publishers
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         Publishers in the Iterable
+     *            the array of {@code Publisher}s
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3852,32 +3852,32 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<? extends
     }
 
     /**
-     * Flattens two Publishers into one Publisher, in a way that allows a Subscriber to receive all
-     * successfully emitted items from each of the source Publishers without being interrupted by an error
+     * Flattens two {@link Publisher}s into one {@code Publisher}, in a way that allows a {@link Subscriber} to receive all
+     * successfully emitted items from each of the source {@code Publisher}s without being interrupted by an error
      * notification from one of them.
      * <p>
-     * This behaves like {@link #merge(Publisher, Publisher)} except that if any of the merged Publishers
+     * This behaves like {@link #merge(Publisher, Publisher)} except that if any of the merged {@code Publisher}s
      * notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from
-     * propagating that error notification until all of the merged Publishers have finished emitting items.
+     * propagating that error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if both merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if both merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param source1
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source2
-     *            a Publisher to be merged
-     * @return a Flowable that emits all of the items that are emitted by the two source Publishers
+     *            a {@code Publisher} to be merged
+     * @return a {@code Flowable} that emits all of the items that are emitted by the two source {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3892,35 +3892,35 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> so
     }
 
     /**
-     * Flattens three Publishers into one Publisher, in a way that allows a Subscriber to receive all
-     * successfully emitted items from all of the source Publishers without being interrupted by an error
+     * Flattens three {@link Publisher}s into one {@code Publisher}, in a way that allows a {@link Subscriber} to receive all
+     * successfully emitted items from all of the source {@code Publisher}s without being interrupted by an error
      * notification from one of them.
      * <p>
      * This behaves like {@link #merge(Publisher, Publisher, Publisher)} except that if any of the merged
-     * Publishers notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain
-     * from propagating that error notification until all of the merged Publishers have finished emitting
+     * {@code Publisher}s notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain
+     * from propagating that error notification until all of the merged {@code Publisher}s have finished emitting
      * items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param source1
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source2
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source3
-     *            a Publisher to be merged
-     * @return a Flowable that emits all of the items that are emitted by the source Publishers
+     *            a {@code Publisher} to be merged
+     * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3936,37 +3936,37 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> so
     }
 
     /**
-     * Flattens four Publishers into one Publisher, in a way that allows a Subscriber to receive all
-     * successfully emitted items from all of the source Publishers without being interrupted by an error
+     * Flattens four {@link Publisher}s into one {@code Publisher}, in a way that allows a {@link Subscriber} to receive all
+     * successfully emitted items from all of the source {@code Publisher}s without being interrupted by an error
      * notification from one of them.
      * <p>
      * This behaves like {@link #merge(Publisher, Publisher, Publisher, Publisher)} except that if any of
-     * the merged Publishers notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError}
-     * will refrain from propagating that error notification until all of the merged Publishers have finished
+     * the merged {@code Publisher}s notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError}
+     * will refrain from propagating that error notification until all of the merged {@code Publisher}s have finished
      * emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Subscriber}s once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the common element base type
      * @param source1
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source2
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source3
-     *            a Publisher to be merged
+     *            a {@code Publisher} to be merged
      * @param source4
-     *            a Publisher to be merged
-     * @return a Flowable that emits all of the items that are emitted by the source Publishers
+     *            a {@code Publisher} to be merged
+     * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3985,11 +3985,11 @@ public static <T> Flowable<T> mergeDelayError(
     }
 
     /**
-     * Returns a Flowable that never sends any items or notifications to a {@link Subscriber}.
+     * Returns a {@code Flowable} that never sends any items or notifications to a {@link Subscriber}.
      * <p>
      * <img width="640" height="185" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/never.png" alt="">
      * <p>
-     * This Publisher is useful primarily for testing purposes.
+     * This {@link Publisher} is useful primarily for testing purposes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This source doesn't produce any elements and effectively ignores downstream backpressure.</dd>
@@ -3998,8 +3998,8 @@ public static <T> Flowable<T> mergeDelayError(
      * </dl>
      *
      * @param <T>
-     *            the type of items (not) emitted by the Publisher
-     * @return a Flowable that never emits any items or sends any notifications to a {@link Subscriber}
+     *            the type of items (not) emitted by the {@code Publisher}
+     * @return a {@code Flowable} that never emits any items or sends any notifications to a {@code Subscriber}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Never</a>
      */
     @CheckReturnValue
@@ -4012,7 +4012,7 @@ public static <T> Flowable<T> never() {
     }
 
     /**
-     * Returns a Flowable that emits a sequence of Integers within a specified range.
+     * Returns a {@code Flowable} that emits a sequence of {@link Integer}s within a specified range.
      * <p>
      * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/range.png" alt="">
      * <dl>
@@ -4023,10 +4023,10 @@ public static <T> Flowable<T> never() {
      * </dl>
      *
      * @param start
-     *            the value of the first Integer in the sequence
+     *            the value of the first {@code Integer} in the sequence
      * @param count
-     *            the number of sequential Integers to generate
-     * @return a Flowable that emits a range of sequential Integers
+     *            the number of sequential {@code Integer}s to generate
+     * @return a {@code Flowable} that emits a range of sequential {@code Integer}s
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Integer#MAX_VALUE}
@@ -4053,7 +4053,7 @@ public static Flowable<Integer> range(int start, int count) {
     }
 
     /**
-     * Returns a Flowable that emits a sequence of Longs within a specified range.
+     * Returns a {@code Flowable} that emits a sequence of {@link Long}s within a specified range.
      * <p>
      * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/range.png" alt="">
      * <dl>
@@ -4064,10 +4064,10 @@ public static Flowable<Integer> range(int start, int count) {
      * </dl>
      *
      * @param start
-     *            the value of the first Long in the sequence
+     *            the value of the first {@code Long} in the sequence
      * @param count
-     *            the number of sequential Longs to generate
-     * @return a Flowable that emits a range of sequential Longs
+     *            the number of sequential {@code Long}s to generate
+     * @return a {@code Flowable} that emits a range of sequential {@code Long}s
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Long#MAX_VALUE}
@@ -4099,25 +4099,25 @@ public static Flowable<Long> rangeLong(long start, long count) {
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two Publisher sequences are the
-     * same by comparing the items emitted by each Publisher pairwise.
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link Publisher} sequences are the
+     * same by comparing the items emitted by each {@code Publisher} pairwise.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator honors downstream backpressure and expects both of its sources
-     *  to honor backpressure as well. If violated, the operator will emit a MissingBackpressureException.</dd>
+     *  to honor backpressure as well. If violated, the operator will emit a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param source1
-     *            the first Publisher to compare
+     *            the first {@code Publisher} to compare
      * @param source2
-     *            the second Publisher to compare
+     *            the second {@code Publisher} to compare
      * @param <T>
-     *            the type of items emitted by each Publisher
-     * @return a Flowable that emits a Boolean value that indicates whether the two sequences are the same
+     *            the type of items emitted by each {@code Publisher}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -4129,28 +4129,28 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two Publisher sequences are the
-     * same by comparing the items emitted by each Publisher pairwise based on the results of a specified
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link Publisher} sequences are the
+     * same by comparing the items emitted by each {@code Publisher} pairwise based on the results of a specified
      * equality function.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator signals a {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator signals a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param source1
-     *            the first Publisher to compare
+     *            the first {@code Publisher} to compare
      * @param source2
-     *            the second Publisher to compare
+     *            the second {@code Publisher} to compare
      * @param isEqual
-     *            a function used to compare items emitted by each Publisher
+     *            a function used to compare items emitted by each {@code Publisher}
      * @param <T>
-     *            the type of items emitted by each Publisher
-     * @return a Single that emits a Boolean value that indicates whether the two Publisher sequences
+     *            the type of items emitted by each {@code Publisher}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code Publisher} sequences
      *         are the same according to the specified function
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
@@ -4164,30 +4164,30 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two Publisher sequences are the
-     * same by comparing the items emitted by each Publisher pairwise based on the results of a specified
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link Publisher} sequences are the
+     * same by comparing the items emitted by each {@code Publisher} pairwise based on the results of a specified
      * equality function.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator signals a {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator signals a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param source1
-     *            the first Publisher to compare
+     *            the first {@code Publisher} to compare
      * @param source2
-     *            the second Publisher to compare
+     *            the second {@code Publisher} to compare
      * @param isEqual
-     *            a function used to compare items emitted by each Publisher
+     *            a function used to compare items emitted by each {@code Publisher}
      * @param bufferSize
-     *            the number of items to prefetch from the first and second source Publisher
+     *            the number of items to prefetch from the first and second source {@code Publisher}
      * @param <T>
-     *            the type of items emitted by each Publisher
-     * @return a Single that emits a Boolean value that indicates whether the two Publisher sequences
+     *            the type of items emitted by each {@code Publisher}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code Publisher} sequences
      *         are the same according to the specified function
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
@@ -4205,27 +4205,27 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two Publisher sequences are the
-     * same by comparing the items emitted by each Publisher pairwise.
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link Publisher} sequences are the
+     * same by comparing the items emitted by each {@code Publisher} pairwise.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator honors downstream backpressure and expects both of its sources
-     *  to honor backpressure as well. If violated, the operator will emit a MissingBackpressureException.</dd>
+     *  to honor backpressure as well. If violated, the operator will emit a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param source1
-     *            the first Publisher to compare
+     *            the first {@code Publisher} to compare
      * @param source2
-     *            the second Publisher to compare
+     *            the second {@code Publisher} to compare
      * @param bufferSize
-     *            the number of items to prefetch from the first and second source Publisher
+     *            the number of items to prefetch from the first and second source {@code Publisher}
      * @param <T>
-     *            the type of items emitted by each Publisher
-     * @return a Single that emits a Boolean value that indicates whether the two sequences are the same
+     *            the type of items emitted by each {@code Publisher}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -4237,35 +4237,35 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
     }
 
     /**
-     * Converts a Publisher that emits Publishers into a Publisher that emits the items emitted by the
-     * most recently emitted of those Publishers.
+     * Converts a {@link Publisher} that emits {@code Publisher}s into a {@code Publisher} that emits the items emitted by the
+     * most recently emitted of those {@code Publisher}s.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
      * <p>
-     * {@code switchOnNext} subscribes to a Publisher that emits Publishers. Each time it observes one of
-     * these emitted Publishers, the Publisher returned by {@code switchOnNext} begins emitting the items
-     * emitted by that Publisher. When a new Publisher is emitted, {@code switchOnNext} stops emitting items
-     * from the earlier-emitted Publisher and begins emitting items from the new one.
+     * {@code switchOnNext} subscribes to a {@code Publisher} that emits {@code Publisher}s. Each time it observes one of
+     * these emitted {@code Publisher}s, the {@code Publisher} returned by {@code switchOnNext} begins emitting the items
+     * emitted by that {@code Publisher}. When a new {@code Publisher} is emitted, {@code switchOnNext} stops emitting items
+     * from the earlier-emitted {@code Publisher} and begins emitting items from the new one.
      * <p>
-     * The resulting Publisher completes if both the outer Publisher and the last inner Publisher, if any, complete.
-     * If the outer Publisher signals an onError, the inner Publisher is canceled and the error delivered in-sequence.
+     * The resulting {@code Publisher} completes if both the outer {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * If the outer {@code Publisher} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
      *  unbounded manner (i.e., without backpressure) and the inner {@code Publisher}s are expected to honor
-     *  backpressure but it is not enforced; the operator won't signal a {@code MissingBackpressureException}
-     *  but the violation <em>may</em> lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *  backpressure but it is not enforced; the operator won't signal a {@link MissingBackpressureException}
+     *  but the violation <em>may</em> lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchOnNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the item type
      * @param sources
-     *            the source Publisher that emits Publishers
+     *            the source {@code Publisher} that emits {@code Publisher}s
      * @param bufferSize
-     *            the number of items to prefetch from the inner Publishers
-     * @return a Flowable that emits the items emitted by the Publisher most recently emitted by the source
-     *         Publisher
+     *            the number of items to prefetch from the inner {@code Publisher}s
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -4278,33 +4278,33 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publishe
     }
 
     /**
-     * Converts a Publisher that emits Publishers into a Publisher that emits the items emitted by the
-     * most recently emitted of those Publishers.
+     * Converts a {@link Publisher} that emits {@code Publisher}s into a {@code Publisher} that emits the items emitted by the
+     * most recently emitted of those {@code Publisher}s.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
      * <p>
-     * {@code switchOnNext} subscribes to a Publisher that emits Publishers. Each time it observes one of
-     * these emitted Publishers, the Publisher returned by {@code switchOnNext} begins emitting the items
-     * emitted by that Publisher. When a new Publisher is emitted, {@code switchOnNext} stops emitting items
-     * from the earlier-emitted Publisher and begins emitting items from the new one.
+     * {@code switchOnNext} subscribes to a {@code Publisher} that emits {@code Publisher}s. Each time it observes one of
+     * these emitted {@code Publisher}s, the {@code Publisher} returned by {@code switchOnNext} begins emitting the items
+     * emitted by that {@code Publisher}. When a new {@code Publisher} is emitted, {@code switchOnNext} stops emitting items
+     * from the earlier-emitted {@code Publisher} and begins emitting items from the new one.
      * <p>
-     * The resulting Publisher completes if both the outer Publisher and the last inner Publisher, if any, complete.
-     * If the outer Publisher signals an onError, the inner Publisher is canceled and the error delivered in-sequence.
+     * The resulting {@code Publisher} completes if both the outer {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * If the outer {@code Publisher} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
      *  unbounded manner (i.e., without backpressure) and the inner {@code Publisher}s are expected to honor
-     *  backpressure but it is not enforced; the operator won't signal a {@code MissingBackpressureException}
-     *  but the violation <em>may</em> lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *  backpressure but it is not enforced; the operator won't signal a {@link MissingBackpressureException}
+     *  but the violation <em>may</em> lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchOnNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the item type
      * @param sources
-     *            the source Publisher that emits Publishers
-     * @return a Flowable that emits the items emitted by the Publisher most recently emitted by the source
-     *         Publisher
+     *            the source {@code Publisher} that emits {@code Publisher}s
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -4317,34 +4317,34 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publishe
     }
 
     /**
-     * Converts a Publisher that emits Publishers into a Publisher that emits the items emitted by the
-     * most recently emitted of those Publishers and delays any exception until all Publishers terminate.
+     * Converts a {@link Publisher} that emits {@code Publisher}s into a {@code Publisher} that emits the items emitted by the
+     * most recently emitted of those {@code Publisher}s and delays any exception until all {@code Publisher}s terminate.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
      * <p>
-     * {@code switchOnNext} subscribes to a Publisher that emits Publishers. Each time it observes one of
-     * these emitted Publishers, the Publisher returned by {@code switchOnNext} begins emitting the items
-     * emitted by that Publisher. When a new Publisher is emitted, {@code switchOnNext} stops emitting items
-     * from the earlier-emitted Publisher and begins emitting items from the new one.
+     * {@code switchOnNext} subscribes to a {@code Publisher} that emits {@code Publisher}s. Each time it observes one of
+     * these emitted {@code Publisher}s, the {@code Publisher} returned by {@code switchOnNext} begins emitting the items
+     * emitted by that {@code Publisher}. When a new {@code Publisher} is emitted, {@code switchOnNext} stops emitting items
+     * from the earlier-emitted {@code Publisher} and begins emitting items from the new one.
      * <p>
-     * The resulting Publisher completes if both the main Publisher and the last inner Publisher, if any, complete.
-     * If the main Publisher signals an onError, the termination of the last inner Publisher will emit that error as is
-     * or wrapped into a CompositeException along with the other possible errors the former inner Publishers signaled.
+     * The resulting {@code Publisher} completes if both the main {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * If the main {@code Publisher} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
+     * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
      *  unbounded manner (i.e., without backpressure) and the inner {@code Publisher}s are expected to honor
-     *  backpressure but it is not enforced; the operator won't signal a {@code MissingBackpressureException}
-     *  but the violation <em>may</em> lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *  backpressure but it is not enforced; the operator won't signal a {@link MissingBackpressureException}
+     *  but the violation <em>may</em> lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchOnNextDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the item type
      * @param sources
-     *            the source Publisher that emits Publishers
-     * @return a Flowable that emits the items emitted by the Publisher most recently emitted by the source
-     *         Publisher
+     *            the source {@code Publisher} that emits {@code Publisher}s
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      * @since 2.0
      */
@@ -4357,36 +4357,36 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extend
     }
 
     /**
-     * Converts a Publisher that emits Publishers into a Publisher that emits the items emitted by the
-     * most recently emitted of those Publishers and delays any exception until all Publishers terminate.
+     * Converts a {@link Publisher} that emits {@code Publisher}s into a {@code Publisher} that emits the items emitted by the
+     * most recently emitted of those {@code Publisher}s and delays any exception until all {@code Publisher}s terminate.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
      * <p>
-     * {@code switchOnNext} subscribes to a Publisher that emits Publishers. Each time it observes one of
-     * these emitted Publishers, the Publisher returned by {@code switchOnNext} begins emitting the items
-     * emitted by that Publisher. When a new Publisher is emitted, {@code switchOnNext} stops emitting items
-     * from the earlier-emitted Publisher and begins emitting items from the new one.
+     * {@code switchOnNext} subscribes to a {@code Publisher} that emits {@code Publisher}s. Each time it observes one of
+     * these emitted {@code Publisher}s, the {@code Publisher} returned by {@code switchOnNext} begins emitting the items
+     * emitted by that {@code Publisher}. When a new {@code Publisher} is emitted, {@code switchOnNext} stops emitting items
+     * from the earlier-emitted {@code Publisher} and begins emitting items from the new one.
      * <p>
-     * The resulting Publisher completes if both the main Publisher and the last inner Publisher, if any, complete.
-     * If the main Publisher signals an onError, the termination of the last inner Publisher will emit that error as is
-     * or wrapped into a CompositeException along with the other possible errors the former inner Publishers signaled.
+     * The resulting {@code Publisher} completes if both the main {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * If the main {@code Publisher} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
+     * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
      *  unbounded manner (i.e., without backpressure) and the inner {@code Publisher}s are expected to honor
-     *  backpressure but it is not enforced; the operator won't signal a {@code MissingBackpressureException}
-     *  but the violation <em>may</em> lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *  backpressure but it is not enforced; the operator won't signal a {@link MissingBackpressureException}
+     *  but the violation <em>may</em> lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchOnNextDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T> the item type
      * @param sources
-     *            the source Publisher that emits Publishers
+     *            the source {@code Publisher} that emits {@code Publisher}s
      * @param prefetch
-     *            the number of items to prefetch from the inner Publishers
-     * @return a Flowable that emits the items emitted by the Publisher most recently emitted by the source
-     *         Publisher
+     *            the number of items to prefetch from the inner {@code Publisher}s
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      * @since 2.0
      */
@@ -4399,7 +4399,7 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extend
     }
 
     /**
-     * Returns a Flowable that emits {@code 0L} after a specified delay, and then completes.
+     * Returns a {@code Flowable} that emits {@code 0L} after a specified delay, and then completes.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.png" alt="">
      * <dl>
@@ -4414,7 +4414,7 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extend
      *            the initial delay before emitting a single {@code 0L}
      * @param unit
      *            time units to use for {@code delay}
-     * @return a Flowable that emits {@code 0L} after a specified delay, and then completes
+     * @return a {@code Flowable} that emits {@code 0L} after a specified delay, and then completes
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
     @CheckReturnValue
@@ -4426,7 +4426,7 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that emits {@code 0L} after a specified delay, on a specified Scheduler, and then
+     * Returns a {@code Flowable} that emits {@code 0L} after a specified delay, on a specified {@link Scheduler}, and then
      * completes.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.s.png" alt="">
@@ -4435,7 +4435,7 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit) {
      *  <dd>This operator does not support backpressure as it uses time. If the downstream needs a slower rate
      *      it should slow the timer or use something like {@link #onBackpressureDrop}.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param delay
@@ -4443,8 +4443,8 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit) {
      * @param unit
      *            time units to use for {@code delay}
      * @param scheduler
-     *            the {@link Scheduler} to use for scheduling the item
-     * @return a Flowable that emits {@code 0L} after a specified delay, on a specified Scheduler, and then
+     *            the {@code Scheduler} to use for scheduling the item
+     * @return a {@code Flowable} that emits {@code 0L} after a specified delay, on a specified {@code Scheduler}, and then
      *         completes
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
@@ -4460,19 +4460,19 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Create a Flowable by wrapping a Publisher <em>which has to be implemented according
-     * to the Reactive Streams specification by handling backpressure and
-     * cancellation correctly; no safeguards are provided by the Flowable itself</em>.
+     * Create a {@code Flowable} by wrapping a {@link Publisher} <em>which has to be implemented according
+     * to the <em>Reactive Streams</em> specification by handling backpressure and
+     * cancellation correctly; no safeguards are provided by the {@code Flowable} itself</em>.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator is a pass-through for backpressure and the behavior is determined by the
-     *  provided Publisher implementation.</dd>
+     *  provided {@code Publisher} implementation.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code unsafeCreate} by default doesn't operate on any particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type emitted
-     * @param onSubscribe the Publisher instance to wrap
-     * @return the new Flowable instance
+     * @param onSubscribe the {@code Publisher} instance to wrap
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code onSubscribe} is a subclass of {@code Flowable}; such
      * instances don't need conversion and is possibly a port remnant from 1.x or one should use {@link #hide()}
      * instead.
@@ -4490,26 +4490,26 @@ public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
     }
 
     /**
-     * Constructs a Publisher that creates a dependent resource object which is disposed of on cancellation.
+     * Constructs a {@link Publisher} that creates a dependent resource object which is disposed of on cancellation.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and otherwise depends on the
-     *  backpressure support of the Publisher returned by the {@code resourceFactory}.</dd>
+     *  backpressure support of the {@code Publisher} returned by the {@code resourceFactory}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T> the element type of the generated Publisher
+     * @param <T> the element type of the generated {@code Publisher}
      * @param <D> the type of the resource associated with the output sequence
      * @param resourceSupplier
-     *            the factory function to create a resource object that depends on the Publisher
+     *            the factory function to create a resource object that depends on the {@code Publisher}
      * @param sourceSupplier
-     *            the factory function to create a Publisher
+     *            the factory function to create a {@code Publisher}
      * @param resourceDisposer
      *            the function that will dispose of the resource
-     * @return the Publisher whose lifetime controls the lifetime of the dependent resource object
+     * @return the {@code Publisher} whose lifetime controls the lifetime of the dependent resource object
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -4524,27 +4524,27 @@ public static <T, D> Flowable<T> using(
     }
 
     /**
-     * Constructs a Publisher that creates a dependent resource object which is disposed of just before
+     * Constructs a {@link Publisher} that creates a dependent resource object which is disposed of just before
      * termination if you have set {@code disposeEagerly} to {@code true} and cancellation does not occur
      * before termination. Otherwise, resource disposal will occur on cancellation.  Eager disposal is
-     * particularly appropriate for a synchronous Publisher that reuses resources. {@code disposeAction} will
+     * particularly appropriate for a synchronous {@code Publisher} that reuses resources. {@code disposeAction} will
      * only be called once per subscription.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and otherwise depends on the
-     *  backpressure support of the Publisher returned by the {@code resourceFactory}.</dd>
+     *  backpressure support of the {@code Publisher} returned by the {@code resourceFactory}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T> the element type of the generated Publisher
+     * @param <T> the element type of the generated {@code Publisher}
      * @param <D> the type of the resource associated with the output sequence
      * @param resourceSupplier
-     *            the factory function to create a resource object that depends on the Publisher
+     *            the factory function to create a resource object that depends on the {@code Publisher}
      * @param sourceSupplier
-     *            the factory function to create a Publisher
+     *            the factory function to create a {@code Publisher}
      * @param resourceDisposer
      *            the function that will dispose of the resource
      * @param eager
@@ -4552,7 +4552,7 @@ public static <T, D> Flowable<T> using(
      *            or just before the emission of a terminal event ({@code onComplete} or {@code onError}).
      *            If {@code false} the resource disposal will happen either on a {@code cancel()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
-     * @return the Publisher whose lifetime controls the lifetime of the dependent resource object
+     * @return the {@code Publisher} whose lifetime controls the lifetime of the dependent resource object
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      * @since 2.0
      */
@@ -4572,16 +4572,16 @@ public static <T, D> Flowable<T> using(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * items emitted, in sequence, by an Iterable of other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * items emitted, in sequence, by an {@link Iterable} of other {@link Publisher}s.
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
-     * will be the result of the function applied to the first item emitted by each of the source Publishers;
-     * the second item emitted by the new Publisher will be the result of the function applied to the second
-     * item emitted by each of those Publishers; and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
+     * will be the result of the function applied to the first item emitted by each of the source {@code Publisher}s;
+     * the second item emitted by the new {@code Publisher} will be the result of the function applied to the second
+     * item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@code onNext} as many times as
-     * the number of {@code onNext} invocations of the source Publisher that emits the fewest items.
+     * the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while canceling the other sources. Therefore, it
@@ -4599,7 +4599,7 @@ public static <T, D> Flowable<T> using(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4608,11 +4608,11 @@ public static <T, D> Flowable<T> using(
      * @param <T> the common value type
      * @param <R> the zipped result type
      * @param sources
-     *            an Iterable of source Publishers
+     *            an {@code Iterable} of source {@code Publisher}s
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4626,16 +4626,16 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * items emitted, in sequence, by an Iterable of other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * items emitted, in sequence, by an {@link Iterable} of other {@link Publisher}s.
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
-     * will be the result of the function applied to the first item emitted by each of the source Publishers;
-     * the second item emitted by the new Publisher will be the result of the function applied to the second
-     * item emitted by each of those Publishers; and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
+     * will be the result of the function applied to the first item emitted by each of the source {@code Publisher}s;
+     * the second item emitted by the new {@code Publisher} will be the result of the function applied to the second
+     * item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@code onNext} as many times as
-     * the number of {@code onNext} invocations of the source Publisher that emits the fewest items.
+     * the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while canceling the other sources. Therefore, it
@@ -4653,7 +4653,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4661,17 +4661,17 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
      *
      *
      * @param sources
-     *            an Iterable of source Publishers
+     *            an {@code Iterable} of source {@code Publisher}s
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
      * @param delayError
-     *            delay errors signaled by any of the source Publisher until all Publishers terminate
+     *            delay errors signaled by any of the source {@code Publisher} until all {@code Publisher}s terminate
      * @param bufferSize
-     *            the number of elements to prefetch from each source Publisher
+     *            the number of elements to prefetch from each source {@code Publisher}
      * @param <T> the common source value type
      * @param <R> the zipped result type
-     * @return a Flowable that emits the zipped results
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4688,18 +4688,18 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * two items emitted, in sequence, by two other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * two items emitted, in sequence, by two other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
-     * emitted by {@code o2}; the second item emitted by the new Publisher will be the result of the function
+     * emitted by {@code o2}; the second item emitted by the new {@code Publisher} will be the result of the function
      * applied to the second item emitted by {@code o1} and the second item emitted by {@code o2}; and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -4716,7 +4716,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4726,13 +4726,13 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
      * @param <T2> the value type of the second source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results
-     *            in an item that will be emitted by the resulting Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results
+     *            in an item that will be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4749,18 +4749,18 @@ public static <T1, T2, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * two items emitted, in sequence, by two other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * two items emitted, in sequence, by two other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
-     * emitted by {@code o2}; the second item emitted by the new Publisher will be the result of the function
+     * emitted by {@code o2}; the second item emitted by the new {@code Publisher} will be the result of the function
      * applied to the second item emitted by {@code o1} and the second item emitted by {@code o2}; and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -4777,7 +4777,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4787,14 +4787,14 @@ public static <T1, T2, R> Flowable<R> zip(
      * @param <T2> the value type of the second source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results
-     *            in an item that will be emitted by the resulting Publisher
-     * @param delayError delay errors from any of the source Publishers till the other terminates
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results
+     *            in an item that will be emitted by the resulting {@code Publisher}
+     * @param delayError delay errors from any of the source {@code Publisher}s till the other terminates
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4811,18 +4811,18 @@ public static <T1, T2, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * two items emitted, in sequence, by two other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * two items emitted, in sequence, by two other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
-     * emitted by {@code o2}; the second item emitted by the new Publisher will be the result of the function
+     * emitted by {@code o2}; the second item emitted by the new {@code Publisher} will be the result of the function
      * applied to the second item emitted by {@code o1} and the second item emitted by {@code o2}; and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -4839,7 +4839,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4849,15 +4849,15 @@ public static <T1, T2, R> Flowable<R> zip(
      * @param <T2> the value type of the second source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results
-     *            in an item that will be emitted by the resulting Publisher
-     * @param delayError delay errors from any of the source Publishers till the other terminates
-     * @param bufferSize the number of elements to prefetch from each source Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results
+     *            in an item that will be emitted by the resulting {@code Publisher}
+     * @param delayError delay errors from any of the source {@code Publisher}s till the other terminates
+     * @param bufferSize the number of elements to prefetch from each source {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4874,19 +4874,19 @@ public static <T1, T2, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * three items emitted, in sequence, by three other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * three items emitted, in sequence, by three other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
      * emitted by {@code o2}, and the first item emitted by {@code o3}; the second item emitted by the new
-     * Publisher will be the result of the function applied to the second item emitted by {@code o1}, the
+     * {@code Publisher} will be the result of the function applied to the second item emitted by {@code o1}, the
      * second item emitted by {@code o2}, and the second item emitted by {@code o3}; and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -4903,7 +4903,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4914,15 +4914,15 @@ public static <T1, T2, R> Flowable<R> zip(
      * @param <T3> the value type of the third source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param source3
-     *            a third source Publisher
+     *            a third source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4940,19 +4940,19 @@ public static <T1, T2, T3, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * four items emitted, in sequence, by four other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * four items emitted, in sequence, by four other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
      * emitted by {@code o2}, the first item emitted by {@code o3}, and the first item emitted by {@code 04};
-     * the second item emitted by the new Publisher will be the result of the function applied to the second
-     * item emitted by each of those Publishers; and so forth.
+     * the second item emitted by the new {@code Publisher} will be the result of the function applied to the second
+     * item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -4969,7 +4969,7 @@ public static <T1, T2, T3, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4981,17 +4981,17 @@ public static <T1, T2, T3, R> Flowable<R> zip(
      * @param <T4> the value type of the fourth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param source3
-     *            a third source Publisher
+     *            a third source {@code Publisher}
      * @param source4
-     *            a fourth source Publisher
+     *            a fourth source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5011,19 +5011,19 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * five items emitted, in sequence, by five other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * five items emitted, in sequence, by five other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
      * emitted by {@code o2}, the first item emitted by {@code o3}, the first item emitted by {@code o4}, and
-     * the first item emitted by {@code o5}; the second item emitted by the new Publisher will be the result of
-     * the function applied to the second item emitted by each of those Publishers; and so forth.
+     * the first item emitted by {@code o5}; the second item emitted by the new {@code Publisher} will be the result of
+     * the function applied to the second item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -5040,7 +5040,7 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5053,19 +5053,19 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
      * @param <T5> the value type of the fifth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param source3
-     *            a third source Publisher
+     *            a third source {@code Publisher}
      * @param source4
-     *            a fourth source Publisher
+     *            a fourth source {@code Publisher}
      * @param source5
-     *            a fifth source Publisher
+     *            a fifth source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5086,18 +5086,18 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * six items emitted, in sequence, by six other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * six items emitted, in sequence, by six other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
-     * will be the result of the function applied to the first item emitted by each source Publisher, the
-     * second item emitted by the new Publisher will be the result of the function applied to the second item
-     * emitted by each of those Publishers, and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
+     * will be the result of the function applied to the first item emitted by each source {@code Publisher}, the
+     * second item emitted by the new {@code Publisher} will be the result of the function applied to the second item
+     * emitted by each of those {@code Publisher}s, and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -5114,7 +5114,7 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5128,21 +5128,21 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
      * @param <T6> the value type of the sixth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param source3
-     *            a third source Publisher
+     *            a third source {@code Publisher}
      * @param source4
-     *            a fourth source Publisher
+     *            a fourth source {@code Publisher}
      * @param source5
-     *            a fifth source Publisher
+     *            a fifth source {@code Publisher}
      * @param source6
-     *            a sixth source Publisher
+     *            a sixth source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5164,18 +5164,18 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * seven items emitted, in sequence, by seven other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * seven items emitted, in sequence, by seven other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
-     * will be the result of the function applied to the first item emitted by each source Publisher, the
-     * second item emitted by the new Publisher will be the result of the function applied to the second item
-     * emitted by each of those Publishers, and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
+     * will be the result of the function applied to the first item emitted by each source {@code Publisher}, the
+     * second item emitted by the new {@code Publisher} will be the result of the function applied to the second item
+     * emitted by each of those {@code Publisher}s, and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -5192,7 +5192,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5207,23 +5207,23 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
      * @param <T7> the value type of the seventh source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param source3
-     *            a third source Publisher
+     *            a third source {@code Publisher}
      * @param source4
-     *            a fourth source Publisher
+     *            a fourth source {@code Publisher}
      * @param source5
-     *            a fifth source Publisher
+     *            a fifth source {@code Publisher}
      * @param source6
-     *            a sixth source Publisher
+     *            a sixth source {@code Publisher}
      * @param source7
-     *            a seventh source Publisher
+     *            a seventh source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5247,18 +5247,18 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * eight items emitted, in sequence, by eight other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * eight items emitted, in sequence, by eight other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
-     * will be the result of the function applied to the first item emitted by each source Publisher, the
-     * second item emitted by the new Publisher will be the result of the function applied to the second item
-     * emitted by each of those Publishers, and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
+     * will be the result of the function applied to the first item emitted by each source {@code Publisher}, the
+     * second item emitted by the new {@code Publisher} will be the result of the function applied to the second item
+     * emitted by each of those {@code Publisher}s, and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -5275,7 +5275,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5291,25 +5291,25 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
      * @param <T8> the value type of the eighth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param source3
-     *            a third source Publisher
+     *            a third source {@code Publisher}
      * @param source4
-     *            a fourth source Publisher
+     *            a fourth source {@code Publisher}
      * @param source5
-     *            a fifth source Publisher
+     *            a fifth source {@code Publisher}
      * @param source6
-     *            a sixth source Publisher
+     *            a sixth source {@code Publisher}
      * @param source7
-     *            a seventh source Publisher
+     *            a seventh source {@code Publisher}
      * @param source8
-     *            an eighth source Publisher
+     *            an eighth source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5334,18 +5334,18 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * nine items emitted, in sequence, by nine other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * nine items emitted, in sequence, by nine other {@link Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
-     * will be the result of the function applied to the first item emitted by each source Publisher, the
-     * second item emitted by the new Publisher will be the result of the function applied to the second item
-     * emitted by each of those Publishers, and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
+     * will be the result of the function applied to the first item emitted by each source {@code Publisher}, the
+     * second item emitted by the new {@code Publisher} will be the result of the function applied to the second item
+     * emitted by each of those {@code Publisher}s, and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source Publisher that emits the fewest
+     * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -5362,7 +5362,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5379,27 +5379,27 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
      * @param <T9> the value type of the ninth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source Publisher
+     *            the first source {@code Publisher}
      * @param source2
-     *            a second source Publisher
+     *            a second source {@code Publisher}
      * @param source3
-     *            a third source Publisher
+     *            a third source {@code Publisher}
      * @param source4
-     *            a fourth source Publisher
+     *            a fourth source {@code Publisher}
      * @param source5
-     *            a fifth source Publisher
+     *            a fifth source {@code Publisher}
      * @param source6
-     *            a sixth source Publisher
+     *            a sixth source {@code Publisher}
      * @param source7
-     *            a seventh source Publisher
+     *            a seventh source {@code Publisher}
      * @param source8
-     *            an eighth source Publisher
+     *            an eighth source {@code Publisher}
      * @param source9
-     *            a ninth source Publisher
+     *            a ninth source {@code Publisher}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
-     * @return a Flowable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5426,16 +5426,16 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified combiner function applied to combinations of
-     * items emitted, in sequence, by an array of other Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
+     * items emitted, in sequence, by an array of other {@link Publisher}s.
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new Publisher
-     * will be the result of the function applied to the first item emitted by each of the source Publishers;
-     * the second item emitted by the new Publisher will be the result of the function applied to the second
-     * item emitted by each of those Publishers; and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
+     * will be the result of the function applied to the first item emitted by each of the source {@code Publisher}s;
+     * the second item emitted by the new {@code Publisher} will be the result of the function applied to the second
+     * item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
      * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@code onNext} as many times as
-     * the number of {@code onNext} invocations of the source Publisher that emits the fewest items.
+     * the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while canceling the other sources. Therefore, it
@@ -5454,7 +5454,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zipArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5463,15 +5463,15 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
      * @param <T> the common element type
      * @param <R> the result type
      * @param sources
-     *            an array of source Publishers
+     *            an array of source {@code Publisher}s
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source Publishers, results in
-     *            an item that will be emitted by the resulting Publisher
+     *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
+     *            an item that will be emitted by the resulting {@code Publisher}
      * @param delayError
-     *            delay errors signaled by any of the source Publisher until all Publishers terminate
+     *            delay errors signaled by any of the source {@code Publisher} until all {@code Publisher}s terminate
      * @param bufferSize
-     *            the number of elements to prefetch from each source Publisher
-     * @return a Flowable that emits the zipped results
+     *            the number of elements to prefetch from each source {@code Publisher}
+     * @return a {@code Flowable} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5494,8 +5494,8 @@ public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ?
     // ***************************************************************************************************
 
     /**
-     * Returns a Single that emits a Boolean that indicates whether all of the items emitted by the source
-     * Publisher satisfy a condition.
+     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether all of the items emitted by the source
+     * {@link Publisher} satisfy a condition.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/all.png" alt="">
      * <dl>
@@ -5507,8 +5507,8 @@ public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ?
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates an item and returns a Boolean
-     * @return a Single that emits {@code true} if all items emitted by the source Publisher satisfy the
+     *            a function that evaluates an item and returns a {@code Boolean}
+     * @return a {@code Single} that emits {@code true} if all items emitted by the source {@code Publisher} satisfy the
      *         predicate; otherwise, {@code false}
      * @see <a href="http://reactivex.io/documentation/operators/all.html">ReactiveX operators documentation: All</a>
      */
@@ -5522,7 +5522,7 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Mirrors the Publisher (current or provided) that first either emits an item or sends a termination
+     * Mirrors the {@link Publisher} (current or provided) that first either emits an item or sends a termination
      * notification.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
@@ -5535,9 +5535,9 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
      * </dl>
      *
      * @param other
-     *            a Publisher competing to react first. A subscription to this provided Publisher will occur after subscribing
-     *            to the current Publisher.
-     * @return a Flowable that emits the same sequence as whichever of the source Publishers first
+     *            a {@code Publisher} competing to react first. A subscription to this provided {@code Publisher} will occur after subscribing
+     *            to the current {@code Publisher}.
+     * @return a {@code Flowable} that emits the same sequence as whichever of the source {@code Publisher}s first
      *         emitted an item or sent a termination notification
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -5551,9 +5551,9 @@ public final Flowable<T> ambWith(@NonNull Publisher<? extends T> other) {
     }
 
     /**
-     * Returns a Single that emits {@code true} if any item emitted by the source Publisher satisfies a
+     * Returns a {@link Single} that emits {@code true} if any item emitted by the source {@link Publisher} satisfies a
      * specified condition, otherwise {@code false}. <em>Note:</em> this always emits {@code false} if the
-     * source Publisher is empty.
+     * source {@code Publisher} is empty.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/exists.png" alt="">
      * <p>
@@ -5568,9 +5568,9 @@ public final Flowable<T> ambWith(@NonNull Publisher<? extends T> other) {
      * </dl>
      *
      * @param predicate
-     *            the condition to test items emitted by the source Publisher
-     * @return a Single that emits a Boolean that indicates whether any item emitted by the source
-     *         Publisher satisfies the {@code predicate}
+     *            the condition to test items emitted by the source {@code Publisher}
+     * @return a {@code Single} that emits a {@link Boolean} that indicates whether any item emitted by the source
+     *         {@code Publisher} satisfies the {@code predicate}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -5584,7 +5584,7 @@ public final Single<Boolean> any(@NonNull Predicate<? super T> predicate) {
 
     /**
      * Returns the first item emitted by this {@code Flowable}, or throws
-     * {@code NoSuchElementException} if it emits no items.
+     * {@link NoSuchElementException} if it emits no items.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
@@ -5650,7 +5650,7 @@ public final T blockingFirst(@NonNull T defaultItem) {
 
     /**
      * Consumes the upstream {@code Flowable} in a blocking fashion and invokes the given
-     * {@code Consumer} with each upstream item on the <em>current thread</em> until the
+     * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
      * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.forEach.png" alt="">
@@ -5674,10 +5674,10 @@ public final T blockingFirst(@NonNull T defaultItem) {
      * </dl>
      *
      * @param onNext
-     *            the {@link Consumer} to invoke for each item emitted by the {@code Flowable}
+     *            the {@code Consumer} to invoke for each item emitted by the {@code Flowable}
      * @throws RuntimeException
-     *             if an error occurs; {@link Error}s and {@link RuntimeException}s are rethrown
-     *             as they are, checked {@link Exception}s are wrapped into {@code RuntimeException}s
+     *             if an error occurs; {@code Error}s and {@code RuntimeException}s are rethrown
+     *             as they are, checked {@code Exception}s are wrapped into {@code RuntimeException}s
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX documentation: Subscribe</a>
      * @see #subscribe(Consumer)
      * @see #blockingForEach(Consumer, int)
@@ -5690,7 +5690,7 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
 
     /**
      * Consumes the upstream {@code Flowable} in a blocking fashion and invokes the given
-     * {@code Consumer} with each upstream item on the <em>current thread</em> until the
+     * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
      * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.forEach.png" alt="">
@@ -5714,12 +5714,12 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
      * </dl>
      *
      * @param onNext
-     *            the {@link Consumer} to invoke for each item emitted by the {@code Flowable}
+     *            the {@code Consumer} to invoke for each item emitted by the {@code Flowable}
      * @param bufferSize
      *            the number of items to prefetch upfront, then 75% of it after 75% received
      * @throws RuntimeException
-     *             if an error occurs; {@link Error}s and {@link RuntimeException}s are rethrown
-     *             as they are, checked {@link Exception}s are wrapped into {@code RuntimeException}s
+     *             if an error occurs; {@code Error}s and {@code RuntimeException}s are rethrown
+     *             as they are, checked {@code Exception}s are wrapped into {@code RuntimeException}s
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX documentation: Subscribe</a>
      * @see #subscribe(Consumer)
      */
@@ -5745,12 +5745,12 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext, int buffe
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to honor backpressure otherwise the returned
-     *  Iterable's iterator will throw a {@code MissingBackpressureException}.</dd>
+     *  {@code Iterable}'s iterator will throw a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@link Iterable} version of this {@code Flowable}
+     * @return an {@code Iterable} version of this {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -5768,14 +5768,14 @@ public final Iterable<T> blockingIterable() {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to honor backpressure otherwise the returned
-     *  Iterable's iterator will throw a {@code MissingBackpressureException}.
+     *  {@code Iterable}'s iterator will throw a {@link MissingBackpressureException}.
      *  </dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param bufferSize the number of items to prefetch from the current Flowable
-     * @return an {@link Iterable} version of this {@code Flowable}
+     * @param bufferSize the number of items to prefetch from the current {@code Flowable}
+     * @return an {@code Iterable} version of this {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -5789,7 +5789,7 @@ public final Iterable<T> blockingIterable(int bufferSize) {
 
     /**
      * Returns the last item emitted by this {@code Flowable}, or throws
-     * {@code NoSuchElementException} if this {@code Flowable} emits no items.
+     * {@link NoSuchElementException} if this {@code Flowable} emits no items.
      * <p>
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.last.png" alt="">
      * <dl>
@@ -5874,7 +5874,7 @@ public final T blockingLast(@NonNull T defaultItem) {
      *  <dd>{@code blockingLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Iterable that always returns the latest item emitted by this {@code Flowable}
+     * @return an {@code Iterable} that always returns the latest item emitted by this {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5899,9 +5899,9 @@ public final Iterable<T> blockingLatest() {
      * </dl>
      *
      * @param initialItem
-     *            the initial item that the {@link Iterable} sequence will yield if this
+     *            the initial item that the {@code Iterable} sequence will yield if this
      *            {@code Flowable} has not yet emitted an item
-     * @return an {@link Iterable} that on each iteration returns the item that this {@code Flowable}
+     * @return an {@code Iterable} that on each iteration returns the item that this {@code Flowable}
      *         has most recently emitted
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
@@ -5926,8 +5926,8 @@ public final Iterable<T> blockingMostRecent(@NonNull T initialItem) {
      *  <dd>{@code blockingNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@link Iterable} that blocks upon each iteration until this {@code Flowable} emits
-     *         a new item, whereupon the Iterable returns that item
+     * @return an {@code Iterable} that blocks upon each iteration until this {@code Flowable} emits
+     *         a new item, whereupon the {@code Iterable} returns that item
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -5940,7 +5940,7 @@ public final Iterable<T> blockingNext() {
 
     /**
      * If this {@code Flowable} completes after emitting a single item, return that item, otherwise
-     * throw a {@code NoSuchElementException}.
+     * throw a {@link NoSuchElementException}.
      * <p>
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.single.png" alt="">
      * <dl>
@@ -5968,7 +5968,7 @@ public final T blockingSingle() {
 
     /**
      * If this {@code Flowable} completes after emitting a single item, return that item; if it emits
-     * more than one item, throw an {@code IllegalArgumentException}; if it emits no items, return a default
+     * more than one item, throw an {@link IllegalArgumentException}; if it emits no items, return a default
      * value.
      * <p>
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.singleOrDefault.png" alt="">
@@ -6003,8 +6003,8 @@ public final T blockingSingle(@NonNull T defaultItem) {
      * <p>
      * <img width="640" height="324" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Flowable.toFuture.png" alt="">
      * <p>
-     * If the {@link Flowable} emits more than one item, {@link java.util.concurrent.Future} will receive an
-     * {@link java.lang.IndexOutOfBoundsException}. If the {@link Flowable} is empty, {@link java.util.concurrent.Future}
+     * If the {@code Flowable} emits more than one item, {@link java.util.concurrent.Future} will receive an
+     * {@link java.lang.IndexOutOfBoundsException}. If the {@code Flowable} is empty, {@link java.util.concurrent.Future}
      * will receive a {@link java.util.NoSuchElementException}. The {@code Flowable} source has to terminate in order
      * for the returned {@code Future} to terminate as well.
      * <p>
@@ -6017,7 +6017,7 @@ public final T blockingSingle(@NonNull T defaultItem) {
      *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Future} that expects a single item to be emitted by this {@code Flowable}
+     * @return a {@code Future} that expects a single item to be emitted by this {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -6029,7 +6029,7 @@ public final Future<T> toFuture() {
     }
 
     /**
-     * Runs the source Flowable to a terminal event, ignoring any values and rethrowing any exception.
+     * Runs the source {@code Flowable} to a terminal event, ignoring any values and rethrowing any exception.
      * <p>
      * Note that calling this method will block the caller thread until the upstream terminates
      * normally or with an error. Therefore, calling this method from special threads such as the
@@ -6055,9 +6055,9 @@ public final void blockingSubscribe() {
     /**
      * Subscribes to the source and calls the given callbacks <strong>on the current thread</strong>.
      * <p>
-     * If the Flowable emits an error, it is wrapped into an
+     * If the {@code Flowable} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * Using the overloads {@link #blockingSubscribe(Consumer, Consumer)}
      * or {@link #blockingSubscribe(Consumer, Consumer, Action)} instead is recommended.
      * <p>
@@ -6085,9 +6085,9 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext) {
     /**
      * Subscribes to the source and calls the given callbacks <strong>on the current thread</strong>.
      * <p>
-     * If the Flowable emits an error, it is wrapped into an
+     * If the {@code Flowable} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * Using the overloads {@link #blockingSubscribe(Consumer, Consumer)}
      * or {@link #blockingSubscribe(Consumer, Consumer, Action)} instead is recommended.
      * <p>
@@ -6241,17 +6241,17 @@ public final void blockingSubscribe(@NonNull Subscriber<? super T> subscriber) {
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping buffers, each containing {@code count} items. When the source
-     * Publisher completes, the resulting Publisher emits the current buffer and propagates the notification from the
-     * source Publisher. Note that if the source Publisher issues an onError notification the event is passed on
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping buffers, each containing {@code count} items. When the source
+     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
+     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects the source {@code Publisher} to honor it as
-     *  well, although not enforced; violation <em>may</em> lead to {@code MissingBackpressureException} somewhere
+     *  well, although not enforced; violation <em>may</em> lead to {@link MissingBackpressureException} somewhere
      *  downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6259,8 +6259,8 @@ public final void blockingSubscribe(@NonNull Subscriber<? super T> subscriber) {
      *
      * @param count
      *            the maximum number of items in each buffer before it should be emitted
-     * @return a Flowable that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the source Publisher
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers, each containing at most
+     *         {@code count} items from the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6272,17 +6272,17 @@ public final Flowable<List<T>> buffer(int count) {
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits buffers every {@code skip} items, each containing {@code count} items. When the source
-     * Publisher completes, the resulting Publisher emits the current buffer and propagates the notification from the
-     * source Publisher. Note that if the source Publisher issues an onError notification the event is passed on
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits buffers every {@code skip} items, each containing {@code count} items. When the source
+     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
+     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects the source {@code Publisher} to honor it as
-     *  well, although not enforced; violation <em>may</em> lead to {@code MissingBackpressureException} somewhere
+     *  well, although not enforced; violation <em>may</em> lead to {@link MissingBackpressureException} somewhere
      *  downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6291,10 +6291,10 @@ public final Flowable<List<T>> buffer(int count) {
      * @param count
      *            the maximum size of each buffer before it should be emitted
      * @param skip
-     *            how many items emitted by the source Publisher should be skipped before starting a new
+     *            how many items emitted by the source {@code Publisher} should be skipped before starting a new
      *            buffer. Note that when {@code skip} and {@code count} are equal, this is the same operation as
      *            {@link #buffer(int)}.
-     * @return a Flowable that emits buffers for every {@code skip} item from the source Publisher and
+     * @return a {@code Flowable} that emits buffers for every {@code skip} item from the source {@code Publisher} and
      *         containing at most {@code count} items
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6307,17 +6307,17 @@ public final Flowable<List<T>> buffer(int count, int skip) {
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits buffers every {@code skip} items, each containing {@code count} items. When the source
-     * Publisher completes, the resulting Publisher emits the current buffer and propagates the notification from the
-     * source Publisher. Note that if the source Publisher issues an onError notification the event is passed on
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits buffers every {@code skip} items, each containing {@code count} items. When the source
+     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
+     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects the source {@code Publisher} to honor it as
-     *  well, although not enforced; violation <em>may</em> lead to {@code MissingBackpressureException} somewhere
+     *  well, although not enforced; violation <em>may</em> lead to {@link MissingBackpressureException} somewhere
      *  downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6327,13 +6327,13 @@ public final Flowable<List<T>> buffer(int count, int skip) {
      * @param count
      *            the maximum size of each buffer before it should be emitted
      * @param skip
-     *            how many items emitted by the source Publisher should be skipped before starting a new
+     *            how many items emitted by the source {@code Publisher} should be skipped before starting a new
      *            buffer. Note that when {@code skip} and {@code count} are equal, this is the same operation as
      *            {@link #buffer(int)}.
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a Flowable that emits buffers for every {@code skip} item from the source Publisher and
+     * @return a {@code Flowable} that emits buffers for every {@code skip} item from the source {@code Publisher} and
      *         containing at most {@code count} items
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6349,17 +6349,17 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping buffers, each containing {@code count} items. When the source
-     * Publisher completes, the resulting Publisher emits the current buffer and propagates the notification from the
-     * source Publisher. Note that if the source Publisher issues an onError notification the event is passed on
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping buffers, each containing {@code count} items. When the source
+     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
+     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects the source {@code Publisher} to honor it as
-     *  well, although not enforced; violation <em>may</em> lead to {@code MissingBackpressureException} somewhere
+     *  well, although not enforced; violation <em>may</em> lead to {@link MissingBackpressureException} somewhere
      *  downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6371,8 +6371,8 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a Flowable that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the source Publisher
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers, each containing at most
+     *         {@code count} items from the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6384,11 +6384,11 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, @No
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher starts a new buffer periodically, as determined by the {@code timeskip} argument. It emits
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} starts a new buffer periodically, as determined by the {@code timeskip} argument. It emits
      * each buffer after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * Publisher completes, the resulting Publisher emits the current buffer and propagates the notification from the
-     * source Publisher. Note that if the source Publisher issues an onError notification the event is passed on
+     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
+     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.png" alt="">
@@ -6406,7 +6406,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, @No
      *            the period of time after which a new buffer will be created
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
-     * @return a Flowable that emits new buffers of items emitted by the source Publisher periodically after
+     * @return a {@code Flowable} that emits new buffers of items emitted by the source {@code Publisher} periodically after
      *         a fixed timespan has elapsed
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6419,11 +6419,11 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
      * specified {@code scheduler}. It emits each buffer after a fixed timespan, specified by the
-     * {@code timespan} argument. When the source Publisher completes, the resulting Publisher emits the current buffer
-     * and propagates the notification from the source Publisher. Note that if the source Publisher issues an onError
+     * {@code timespan} argument. When the source {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer
+     * and propagates the notification from the source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError}
      * notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
@@ -6443,8 +6443,8 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
-     * @return a Flowable that emits new buffers of items emitted by the source Publisher periodically after
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
+     * @return a {@code Flowable} that emits new buffers of items emitted by the source {@code Publisher} periodically after
      *         a fixed timespan has elapsed
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6457,11 +6457,11 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
      * specified {@code scheduler}. It emits each buffer after a fixed timespan, specified by the
-     * {@code timespan} argument. When the source Publisher completes, the resulting Publisher emits the current buffer
-     * and propagates the notification from the source Publisher. Note that if the source Publisher issues an onError
+     * {@code timespan} argument. When the source {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer
+     * and propagates the notification from the source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError}
      * notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
@@ -6482,11 +6482,11 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a Flowable that emits new buffers of items emitted by the source Publisher periodically after
+     * @return a {@code Flowable} that emits new buffers of items emitted by the source {@code Publisher} periodically after
      *         a fixed timespan has elapsed
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6503,10 +6503,10 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan,
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping buffers, each of a fixed duration specified by the
-     * {@code timespan} argument. When the source Publisher completes, the resulting Publisher emits the current buffer
-     * and propagates the notification from the source Publisher. Note that if the source Publisher issues an onError
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * {@code timespan} argument. When the source {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer
+     * and propagates the notification from the source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError}
      * notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
@@ -6524,8 +6524,8 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan,
      *            buffer
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
-     * @return a Flowable that emits connected, non-overlapping buffers of items emitted by the source
-     *         Publisher within a fixed duration
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
+     *         {@code Publisher} within a fixed duration
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6537,11 +6537,11 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source Publisher completes, the resulting Publisher emits the current buffer and propagates the
-     * notification from the source Publisher. Note that if the source Publisher issues an onError notification the event
+     * first). When the source {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the
+     * notification from the source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event
      * is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.png" alt="">
@@ -6560,8 +6560,8 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit) {
      *            the unit of time which applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return a Flowable that emits connected, non-overlapping buffers of items emitted by the source
-     *         Publisher, after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
+     *         {@code Publisher}, after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6574,12 +6574,12 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, int
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
      * {@code timespan} argument as measured on the specified {@code scheduler}, or a maximum size specified by
-     * the {@code count} argument (whichever is reached first). When the source Publisher completes, the resulting
-     * Publisher emits the current buffer and propagates the notification from the source Publisher. Note that if the
-     * source Publisher issues an onError notification the event is passed on immediately without first emitting the
+     * the {@code count} argument (whichever is reached first). When the source {@code Publisher} completes, the resulting
+     * {@code Publisher} emits the current buffer and propagates the notification from the source {@code Publisher}. Note that if the
+     * source {@code Publisher} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
@@ -6597,11 +6597,11 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, int
      * @param unit
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return a Flowable that emits connected, non-overlapping buffers of items emitted by the source
-     *         Publisher after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
+     *         {@code Publisher} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6614,12 +6614,12 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
      * {@code timespan} argument as measured on the specified {@code scheduler}, or a maximum size specified by
-     * the {@code count} argument (whichever is reached first). When the source Publisher completes, the resulting
-     * Publisher emits the current buffer and propagates the notification from the source Publisher. Note that if the
-     * source Publisher issues an onError notification the event is passed on immediately without first emitting the
+     * the {@code count} argument (whichever is reached first). When the source {@code Publisher} completes, the resulting
+     * {@code Publisher} emits the current buffer and propagates the notification from the source {@code Publisher}. Note that if the
+     * source {@code Publisher} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
@@ -6638,16 +6638,16 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
      * @param unit
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
      * @param count
      *            the maximum size of each buffer before it is emitted
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @param restartTimerOnMaxSize if true the time window is restarted when the max capacity of the current buffer
+     * @param restartTimerOnMaxSize if {@code true}, the time window is restarted when the max capacity of the current buffer
      *            is reached
-     * @return a Flowable that emits connected, non-overlapping buffers of items emitted by the source
-     *         Publisher after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
+     *         {@code Publisher} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6668,11 +6668,11 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping buffers, each of a fixed duration specified by the
-     * {@code timespan} argument and on the specified {@code scheduler}. When the source Publisher completes, the
-     * resulting Publisher emits the current buffer and propagates the notification from the source Publisher. Note that
-     * if the source Publisher issues an onError notification the event is passed on immediately without first emitting
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * {@code timespan} argument and on the specified {@code scheduler}. When the source {@code Publisher} completes, the
+     * resulting {@code Publisher} emits the current buffer and propagates the notification from the source {@code Publisher}. Note that
+     * if the source {@code Publisher} issues an {@code onError} notification the event is passed on immediately without first emitting
      * the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.s.png" alt="">
@@ -6690,9 +6690,9 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
      * @param unit
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
-     * @return a Flowable that emits connected, non-overlapping buffers of items emitted by the source
-     *         Publisher within a fixed duration
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
+     *         {@code Publisher} within a fixed duration
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6704,30 +6704,30 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits buffers that it creates when the specified {@code openingIndicator} Publisher emits an
-     * item, and closes when the Publisher returned from {@code closingIndicator} emits an item. If any of the source
-     * Publisher, {@code openingIndicator} or {@code closingIndicator} issues an onError notification the event is passed
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits buffers that it creates when the specified {@code openingIndicator} {@code Publisher} emits an
+     * item, and closes when the {@code Publisher} returned from {@code closingIndicator} emits an item. If any of the source
+     * {@code Publisher}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the event is passed
      * on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it is instead controlled by the given Publishers and
+     *  <dd>This operator does not support backpressure as it is instead controlled by the given {@code Publisher}s and
      *      buffers data. It requests {@link Long#MAX_VALUE} upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <TOpening> the element type of the buffer-opening Publisher
-     * @param <TClosing> the element type of the individual buffer-closing Publishers
+     * @param <TOpening> the element type of the buffer-opening {@code Publisher}
+     * @param <TClosing> the element type of the individual buffer-closing {@code Publisher}s
      * @param openingIndicator
-     *            the Publisher that, when it emits an item, causes a new buffer to be created
+     *            the {@code Publisher} that, when it emits an item, causes a new buffer to be created
      * @param closingIndicator
-     *            the {@link Function} that is used to produce a Publisher for every buffer created. When this
-     *            Publisher emits an item, the associated buffer is emitted.
-     * @return a Flowable that emits buffers, containing items from the source Publisher, that are created
-     *         and closed when the specified Publishers emit items
+     *            the {@link Function} that is used to produce a {@code Publisher} for every buffer created. When this
+     *            {@code Publisher} emits an item, the associated buffer is emitted.
+     * @return a {@code Flowable} that emits buffers, containing items from the source {@code Publisher}, that are created
+     *         and closed when the specified {@code Publisher}s emit items
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6741,34 +6741,34 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
     }
 
     /**
-     * Returns a Flowable that emits buffers of items it collects from the source Publisher. The resulting
-     * Publisher emits buffers that it creates when the specified {@code openingIndicator} Publisher emits an
-     * item, and closes when the Publisher returned from {@code closingIndicator} emits an item. If any of the source
-     * Publisher, {@code openingIndicator} or {@code closingIndicator} issues an onError notification the event is passed
+     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits buffers that it creates when the specified {@code openingIndicator} {@code Publisher} emits an
+     * item, and closes when the {@code Publisher} returned from {@code closingIndicator} emits an item. If any of the source
+     * {@code Publisher}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the event is passed
      * on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator does not support backpressure as it is instead controlled by the given Publishers and
+     *  <dd>This operator does not support backpressure as it is instead controlled by the given {@code Publisher}s and
      *      buffers data. It requests {@link Long#MAX_VALUE} upstream and does not obey downstream requests.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U> the collection subclass type to buffer into
-     * @param <TOpening> the element type of the buffer-opening Publisher
-     * @param <TClosing> the element type of the individual buffer-closing Publishers
+     * @param <TOpening> the element type of the buffer-opening {@code Publisher}
+     * @param <TClosing> the element type of the individual buffer-closing {@code Publisher}s
      * @param openingIndicator
-     *            the Publisher that, when it emits an item, causes a new buffer to be created
+     *            the {@code Publisher} that, when it emits an item, causes a new buffer to be created
      * @param closingIndicator
-     *            the {@link Function} that is used to produce a Publisher for every buffer created. When this
-     *            Publisher emits an item, the associated buffer is emitted.
+     *            the {@link Function} that is used to produce a {@code Publisher} for every buffer created. When this
+     *            {@code Publisher} emits an item, the associated buffer is emitted.
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a Flowable that emits buffers, containing items from the source Publisher, that are created
-     *         and closed when the specified Publishers emit items
+     * @return a {@code Flowable} that emits buffers, containing items from the source {@code Publisher}, that are created
+     *         and closed when the specified {@code Publisher}s emit items
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6786,13 +6786,13 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
     }
 
     /**
-     * Returns a Flowable that emits non-overlapping buffered items from the source Publisher each time the
-     * specified boundary Publisher emits an item.
+     * Returns a {@code Flowable} that emits non-overlapping buffered items from the source {@link Publisher} each time the
+     * specified boundary {@code Publisher} emits an item.
      * <p>
      * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
      * <p>
-     * Completion of either the source or the boundary Publisher causes the returned Publisher to emit the
-     * latest buffer and complete. If either the source Publisher or the boundary Publisher issues an onError notification
+     * Completion of either the source or the boundary {@code Publisher} causes the returned {@code Publisher} to emit the
+     * latest buffer and complete. If either the source {@code Publisher} or the boundary {@code Publisher} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -6806,8 +6806,8 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
      * @param <B>
      *            the boundary value type (ignored)
      * @param boundaryIndicator
-     *            the boundary Publisher
-     * @return a Flowable that emits buffered items from the source Publisher when the boundary Publisher
+     *            the boundary {@code Publisher}
+     * @return a {@code Flowable} that emits buffered items from the source {@code Publisher} when the boundary {@code Publisher}
      *         emits an item
      * @see #buffer(Publisher, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6821,13 +6821,13 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
     }
 
     /**
-     * Returns a Flowable that emits non-overlapping buffered items from the source Publisher each time the
-     * specified boundary Publisher emits an item.
+     * Returns a {@code Flowable} that emits non-overlapping buffered items from the source {@link Publisher} each time the
+     * specified boundary {@code Publisher} emits an item.
      * <p>
      * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
      * <p>
-     * Completion of either the source or the boundary Publisher causes the returned Publisher to emit the
-     * latest buffer and complete. If either the source Publisher or the boundary Publisher issues an onError notification
+     * Completion of either the source or the boundary {@code Publisher} causes the returned {@code Publisher} to emit the
+     * latest buffer and complete. If either the source {@code Publisher} or the boundary {@code Publisher} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -6841,10 +6841,10 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
      * @param <B>
      *            the boundary value type (ignored)
      * @param boundaryIndicator
-     *            the boundary Publisher
+     *            the boundary {@code Publisher}
      * @param initialCapacity
      *            the initial capacity of each buffer chunk
-     * @return a Flowable that emits buffered items from the source Publisher when the boundary Publisher
+     * @return a {@code Flowable} that emits buffered items from the source {@code Publisher} when the boundary {@code Publisher}
      *         emits an item
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      * @see #buffer(Publisher)
@@ -6859,13 +6859,13 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
     }
 
     /**
-     * Returns a Flowable that emits non-overlapping buffered items from the source Publisher each time the
-     * specified boundary Publisher emits an item.
+     * Returns a {@code Flowable} that emits non-overlapping buffered items from the source {@link Publisher} each time the
+     * specified boundary {@code Publisher} emits an item.
      * <p>
      * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
      * <p>
-     * Completion of either the source or the boundary Publisher causes the returned Publisher to emit the
-     * latest buffer and complete. If either the source Publisher or the boundary Publisher issues an onError notification
+     * Completion of either the source or the boundary {@code Publisher} causes the returned {@code Publisher} to emit the
+     * latest buffer and complete. If either the source {@code Publisher} or the boundary {@code Publisher} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -6880,11 +6880,11 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
      * @param <B>
      *            the boundary value type (ignored)
      * @param boundaryIndicator
-     *            the boundary Publisher
+     *            the boundary {@code Publisher}
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a Flowable that emits buffered items from the source Publisher when the boundary Publisher
+     * @return a {@code Flowable} that emits buffered items from the source {@code Publisher} when the boundary {@code Publisher}
      *         emits an item
      * @see #buffer(Publisher, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6900,23 +6900,23 @@ public final <B, U extends Collection<? super T>> Flowable<U> buffer(@NonNull Pu
     }
 
     /**
-     * Returns a Flowable that subscribes to this Publisher lazily, caches all of its events
+     * Returns a {@code Flowable} that subscribes to this {@link Publisher} lazily, caches all of its events
      * and replays them, in the same order as received, to all the downstream subscribers.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.png" alt="">
      * <p>
-     * This is useful when you want a Publisher to cache responses and you can't control the
+     * This is useful when you want a {@code Publisher} to cache responses and you can't control the
      * subscribe/cancel behavior of all the {@link Subscriber}s.
      * <p>
      * The operator subscribes only when the first downstream subscriber subscribes and maintains
-     * a single subscription towards this Publisher. In contrast, the operator family of {@link #replay()}
+     * a single subscription towards this {@code Publisher}. In contrast, the operator family of {@link #replay()}
      * that return a {@link ConnectableFlowable} require an explicit call to {@link ConnectableFlowable#connect()}.
      * <p>
      * <em>Note:</em> You sacrifice the ability to cancel the origin when you use the {@code cache}
-     * Subscriber so be careful not to use this Subscriber on Publishers that emit an infinite or very large number
+     * {@code Subscriber} so be careful not to use this {@code Subscriber} on {@code Publisher}s that emit an infinite or very large number
      * of items that will use up memory.
-     * A possible workaround is to apply `takeUntil` with a predicate or
-     * another source before (and perhaps after) the application of cache().
+     * A possible workaround is to apply {@link #takeUntil(Publisher)} with a predicate or
+     * another source before (and perhaps after) the application of {@code cache()}.
      * <pre><code>
      * AtomicBoolean shouldStop = new AtomicBoolean();
      *
@@ -6940,13 +6940,13 @@ public final <B, U extends Collection<? super T>> Flowable<U> buffer(@NonNull Pu
      * </code></pre>
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes this Publisher in an unbounded fashion but respects the backpressure
-     *  of each downstream Subscriber individually.</dd>
+     *  <dd>The operator consumes this {@code Publisher} in an unbounded fashion but respects the backpressure
+     *  of each downstream {@code Subscriber} individually.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code cache} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that, when first subscribed to, caches all of its items and notifications for the
+     * @return a {@code Flowable} that, when first subscribed to, caches all of its items and notifications for the
      *         benefit of subsequent subscribers
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -6959,23 +6959,23 @@ public final Flowable<T> cache() {
     }
 
     /**
-     * Returns a Flowable that subscribes to this Publisher lazily, caches all of its events
+     * Returns a {@code Flowable} that subscribes to this {@link Publisher} lazily, caches all of its events
      * and replays them, in the same order as received, to all the downstream subscribers.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.png" alt="">
      * <p>
-     * This is useful when you want a Publisher to cache responses and you can't control the
+     * This is useful when you want a {@code Publisher} to cache responses and you can't control the
      * subscribe/cancel behavior of all the {@link Subscriber}s.
      * <p>
      * The operator subscribes only when the first downstream subscriber subscribes and maintains
-     * a single subscription towards this Publisher. In contrast, the operator family of {@link #replay()}
+     * a single subscription towards this {@code Publisher}. In contrast, the operator family of {@link #replay()}
      * that return a {@link ConnectableFlowable} require an explicit call to {@link ConnectableFlowable#connect()}.
      * <p>
      * <em>Note:</em> You sacrifice the ability to cancel the origin when you use the {@code cache}
-     * Subscriber so be careful not to use this Subscriber on Publishers that emit an infinite or very large number
+     * {@code Subscriber} so be careful not to use this {@code Subscriber} on {@code Publisher}s that emit an infinite or very large number
      * of items that will use up memory.
-     * A possible workaround is to apply `takeUntil` with a predicate or
-     * another source before (and perhaps after) the application of cache().
+     * A possible workaround is to apply {@link #takeUntil(Publisher)} with a predicate or
+     * another source before (and perhaps after) the application of {@code cacheWithInitialCapacity()}.
      * <pre><code>
      * AtomicBoolean shouldStop = new AtomicBoolean();
      *
@@ -6999,8 +6999,8 @@ public final Flowable<T> cache() {
      * </code></pre>
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes this Publisher in an unbounded fashion but respects the backpressure
-     *  of each downstream Subscriber individually.</dd>
+     *  <dd>The operator consumes this {@code Publisher} in an unbounded fashion but respects the backpressure
+     *  of each downstream {@code Subscriber} individually.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code cacheWithInitialCapacity} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7009,7 +7009,7 @@ public final Flowable<T> cache() {
      * {@link #replay(int)} in combination with {@link ConnectableFlowable#autoConnect()} or similar.
      *
      * @param initialCapacity hint for number of items to cache (for optimizing underlying data structure)
-     * @return a Flowable that, when first subscribed to, caches all of its items and notifications for the
+     * @return a {@code Flowable} that, when first subscribed to, caches all of its items and notifications for the
      *         benefit of subsequent subscribers
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -7023,7 +7023,7 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by the source Publisher, converted to the specified
+     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher}, converted to the specified
      * type.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cast.png" alt="">
@@ -7037,9 +7037,9 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
      *
      * @param <U> the output value type cast to
      * @param clazz
-     *            the target class type that {@code cast} will cast the items emitted by the source Publisher
-     *            into before emitting them from the resulting Publisher
-     * @return a Flowable that emits each item from the source Publisher after converting it to the
+     *            the target class type that {@code cast} will cast the items emitted by the source {@code Publisher}
+     *            into before emitting them from the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits each item from the source {@code Publisher} after converting it to the
      *         specified type
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
@@ -7053,8 +7053,8 @@ public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
     }
 
     /**
-     * Collects items emitted by the finite source Publisher into a single mutable data structure and returns
-     * a Single that emits this structure.
+     * Collects items emitted by the finite source {@link Publisher} into a single mutable data structure and returns
+     * a {@link Single} that emits this structure.
      * <p>
      * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collect.png" alt="">
      * <p>
@@ -7062,7 +7062,7 @@ public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure because by intent it will receive all values and reduce
@@ -7077,7 +7077,7 @@ public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies {@code state}
      *           accordingly
-     * @return a Single that emits the result of collecting the values emitted by the source Publisher
+     * @return a {@code Single} that emits the result of collecting the values emitted by the source {@code Publisher}
      *         into a single mutable data structure
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see #collect(Collector)
@@ -7093,8 +7093,8 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
     }
 
     /**
-     * Collects items emitted by the finite source Publisher into a single mutable data structure and returns
-     * a Single that emits this structure.
+     * Collects items emitted by the finite source {@link Publisher} into a single mutable data structure and returns
+     * a {@link Single} that emits this structure.
      * <p>
      * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collect.png" alt="">
      * <p>
@@ -7102,7 +7102,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure because by intent it will receive all values and reduce
@@ -7117,7 +7117,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies {@code state}
      *           accordingly
-     * @return a Single that emits the result of collecting the values emitted by the source Publisher
+     * @return a {@code Single} that emits the result of collecting the values emitted by the source {@code Publisher}
      *         into a single mutable data structure
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      */
@@ -7131,13 +7131,13 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
     }
 
     /**
-     * Transform a Publisher by applying a particular Transformer function to it.
+     * Transform a {@link Publisher} by applying a particular Transformer function to it.
      * <p>
-     * This method operates on the Publisher itself whereas {@link #lift} operates on the Publisher's
-     * Subscribers or Subscribers.
+     * This method operates on the {@code Publisher} itself whereas {@link #lift} operates on the {@code Publisher}'s
+     * {@link Subscriber}s.
      * <p>
      * If the operator you are creating is designed to act on the individual items emitted by a source
-     * Publisher, use {@link #lift}. If your operator is designed to transform the source Publisher as a whole
+     * {@code Publisher}, use {@link #lift}. If your operator is designed to transform the source {@code Publisher} as a whole
      * (for instance, by applying a particular set of existing RxJava operators to it) use {@code compose}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7147,9 +7147,9 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      *  <dd>{@code compose} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the output Publisher
-     * @param composer implements the function that transforms the source Publisher
-     * @return the source Publisher, transformed by the transformer function
+     * @param <R> the value type of the output {@code Publisher}
+     * @param composer implements the function that transforms the source {@code Publisher}
+     * @return the source {@code Publisher}, transformed by the transformer function
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
      */
     @SuppressWarnings("unchecked")
@@ -7162,9 +7162,9 @@ public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? e
     }
 
     /**
-     * Returns a new Flowable that emits items resulting from applying a function that you supply to each item
-     * emitted by the source Publisher, where that function returns a Publisher, and then emitting the items
-     * that result from concatenating those resulting Publishers.
+     * Returns a new {@code Flowable} that emits items resulting from applying a function that you supply to each item
+     * emitted by the source {@link Publisher}, where that function returns a {@code Publisher}, and then emitting the items
+     * that result from concatenating those resulting {@code Publisher}s.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <p>
@@ -7175,19 +7175,19 @@ public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? e
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
-     *  backpressure, that <em>may</em> throw an {@code IllegalStateException} when that
+     *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
+     *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the type of the inner Publisher sources and thus the output type
+     * @param <R> the type of the inner {@code Publisher} sources and thus the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
-     * @return a Flowable that emits the result of applying the transformation function to each item emitted
-     *         by the source Publisher and concatenating the Publishers obtained from this transformation
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
+     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
+     *         by the source {@code Publisher} and concatenating the {@code Publisher}s obtained from this transformation
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -7199,9 +7199,9 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
     }
 
     /**
-     * Returns a new Flowable that emits items resulting from applying a function that you supply to each item
-     * emitted by the source Publisher, where that function returns a Publisher, and then emitting the items
-     * that result from concatenating those resulting Publishers.
+     * Returns a new {@code Flowable} that emits items resulting from applying a function that you supply to each item
+     * emitted by the source {@link Publisher}, where that function returns a {@code Publisher}, and then emitting the items
+     * that result from concatenating those resulting {@code Publisher}s.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <p>
@@ -7212,21 +7212,21 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
-     *  backpressure, that <em>may</em> throw an {@code IllegalStateException} when that
+     *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
+     *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the type of the inner Publisher sources and thus the output type
+     * @param <R> the type of the inner {@code Publisher} sources and thus the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
      * @param prefetch
-     *            the number of elements to prefetch from the current Flowable
-     * @return a Flowable that emits the result of applying the transformation function to each item emitted
-     *         by the source Publisher and concatenating the Publishers obtained from this transformation
+     *            the number of elements to prefetch from the current {@code Flowable}
+     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
+     *         by the source {@code Publisher} and concatenating the {@code Publisher}s obtained from this transformation
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #concatMap(Function, int, Scheduler)
      */
@@ -7249,9 +7249,9 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
     }
 
     /**
-     * Returns a new Flowable that emits items resulting from applying a function (on a designated scheduler)
-     * that you supply to each item emitted by the source Publisher, where that function returns a Publisher, and then emitting the items
-     * that result from concatenating those resulting Publishers.
+     * Returns a new {@code Flowable} that emits items resulting from applying a function (on a designated scheduler)
+     * that you supply to each item emitted by the source {@link Publisher}, where that function returns a {@code Publisher}, and then emitting the items
+     * that result from concatenating those resulting {@code Publisher}s.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <p>
@@ -7261,23 +7261,23 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
-     *  backpressure, that <em>may</em> throw an {@code IllegalStateException} when that
+     *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
+     *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMap} executes the given {@code mapper} function on the provided {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the type of the inner Publisher sources and thus the output type
+     * @param <R> the type of the inner {@code Publisher} sources and thus the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
      * @param prefetch
-     *            the number of elements to prefetch from the current Flowable
+     *            the number of elements to prefetch from the current {@code Flowable}
      * @param scheduler
      *            the scheduler where the {@code mapper} function will be executed
-     * @return a Flowable that emits the result of applying the transformation function to each item emitted
-     *         by the source Publisher and concatenating the Publishers obtained from this transformation
+     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
+     *         by the source {@code Publisher} and concatenating the {@code Publisher}s obtained from this transformation
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 3.0.0
      * @see #concatMap(Function, int)
@@ -7302,7 +7302,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7310,7 +7310,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      * @param mapper the function called with the upstream item and should return
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
-     * @return a new Completable instance
+     * @return a new {@link Completable} instance
      * @see #concatMapCompletableDelayError(Function)
      * @since 2.2
      */
@@ -7330,7 +7330,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7342,7 +7342,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      *                 ready to be mapped when a previous {@code CompletableSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code CompletableSource}s.
-     * @return a new Completable instance
+     * @return a new {@link Completable} instance
      * @see #concatMapCompletableDelayError(Function, boolean, int)
      * @since 2.2
      */
@@ -7365,7 +7365,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletableDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7373,7 +7373,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * @param mapper the function called with the upstream item and should return
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
-     * @return a new Completable instance
+     * @return a new {@link Completable} instance
      * @see #concatMapCompletable(Function, int)
      * @since 2.2
      */
@@ -7394,7 +7394,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletableDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7408,7 +7408,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *                   {@code Flowable} is delayed until the current inner
      *                   {@code CompletableSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new Completable instance
+     * @return a new {@link Completable} instance
      * @see #concatMapCompletable(Function)
      * @since 2.2
      */
@@ -7429,7 +7429,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletableDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7447,7 +7447,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *                 ready to be mapped when a previous {@code CompletableSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code CompletableSource}s.
-     * @return a new Completable instance
+     * @return a new {@link Completable} instance
      * @see #concatMapCompletable(Function, int)
      * @since 2.2
      */
@@ -7462,9 +7462,9 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
     }
 
     /**
-     * Maps each of the items into a Publisher, subscribes to them one after the other,
+     * Maps each of the items into a {@link Publisher}, subscribes to them one after the other,
      * one at a time and emits their values in order
-     * while delaying any error from either this or any of the inner Publishers
+     * while delaying any error from either this or any of the inner {@code Publisher}s
      * till all of them terminate.
      * <p>
      * Note that there is no guarantee where the given {@code mapper} function will be executed; it could be on the subscribing thread,
@@ -7474,16 +7474,16 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
-     *  backpressure, that <em>may</em> throw an {@code IllegalStateException} when that
+     *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
+     *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R> the result value type
-     * @param mapper the function that maps the items of this Publisher into the inner Publishers.
-     * @return the new Publisher instance with the concatenation behavior
+     * @param mapper the function that maps the items of this {@code Publisher} into the inner {@code Publisher}s.
+     * @return the new {@code Publisher} instance with the concatenation behavior
      * @see #concatMapDelayError(Function, boolean, int, Scheduler)
      */
     @CheckReturnValue
@@ -7495,9 +7495,9 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
     }
 
     /**
-     * Maps each of the items into a Publisher, subscribes to them one after the other,
+     * Maps each of the items into a {@link Publisher}, subscribes to them one after the other,
      * one at a time and emits their values in order
-     * while delaying any error from either this or any of the inner Publishers
+     * while delaying any error from either this or any of the inner {@code Publisher}s
      * till all of them terminate.
      * <p>
      * Note that there is no guarantee where the given {@code mapper} function will be executed; it could be on the subscribing thread,
@@ -7508,21 +7508,21 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
-     *  backpressure, that <em>may</em> throw an {@code IllegalStateException} when that
+     *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
+     *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R> the result value type
-     * @param mapper the function that maps the items of this Publisher into the inner Publishers.
+     * @param mapper the function that maps the items of this {@code Publisher} into the inner {@code Publisher}s.
      * @param tillTheEnd
-     *            if true, all errors from the outer and inner Publisher sources are delayed until the end,
-     *            if false, an error from the main source is signaled when the current Publisher source terminates
+     *            if {@code true}, all errors from the outer and inner {@code Publisher} sources are delayed until the end,
+     *            if {@code false}, an error from the main source is signaled when the current {@code Publisher} source terminates
      * @param prefetch
-     *            the number of elements to prefetch from the current Flowable
-     * @return the new Publisher instance with the concatenation behavior
+     *            the number of elements to prefetch from the current {@code Flowable}
+     * @return the new {@code Publisher} instance with the concatenation behavior
      * @see #concatMapDelayError(Function, boolean, int, Scheduler)
      */
     @CheckReturnValue
@@ -7545,10 +7545,10 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
     }
 
     /**
-     * Maps each of the upstream items into a Publisher, subscribes to them one after the other,
+     * Maps each of the upstream items into a {@link Publisher}, subscribes to them one after the other,
      * one at a time and emits their values in order
      * while executing the mapper function on the designated scheduler, delaying any error from either this or any of the
-     * inner Publishers till all of them terminate.
+     * inner {@code Publisher}s till all of them terminate.
      * <p>
      * The difference between {@link #concatMapDelayError(Function, boolean, int)} and this operator is that this operator guarantees the {@code mapper}
      * function is executed on the specified scheduler.
@@ -7557,23 +7557,23 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
-     *  backpressure, that <em>may</em> throw an {@code IllegalStateException} when that
+     *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
+     *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapDelayError} executes the given {@code mapper} function on the provided {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R> the result value type
-     * @param mapper the function that maps the items of this Publisher into the inner Publishers.
+     * @param mapper the function that maps the items of this {@code Publisher} into the inner {@code Publisher}s.
      * @param tillTheEnd
-     *            if true, all errors from the outer and inner Publisher sources are delayed until the end,
-     *            if false, an error from the main source is signaled when the current Publisher source terminates
+     *            if {@code true}, all errors from the outer and inner {@code Publisher} sources are delayed until the end,
+     *            if {@code false}, an error from the main source is signaled when the current {@code Publisher} source terminates
      * @param prefetch
-     *            the number of elements to prefetch from the current Flowable
+     *            the number of elements to prefetch from the current {@code Flowable}
      * @param scheduler
      *            the scheduler where the {@code mapper} function will be executed
-     * @return the new Publisher instance with the concatenation behavior
+     * @return the new {@code Publisher} instance with the concatenation behavior
      * @see #concatMapDelayError(Function, boolean, int)
      * @since 3.0.0
      */
@@ -7590,11 +7590,11 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
     }
 
     /**
-     * Maps a sequence of values into Publishers and concatenates these Publishers eagerly into a single
-     * Publisher.
+     * Maps a sequence of values into {@link Publisher}s and concatenates these {@code Publisher}s eagerly into a single
+     * {@code Publisher}.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source Publishers. The operator buffers the values emitted by these Publishers and then drains them in
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
      * order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7604,9 +7604,9 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the value type
-     * @param mapper the function that maps a sequence of values into a sequence of Publishers that will be
+     * @param mapper the function that maps a sequence of values into a sequence of {@code Publisher}s that will be
      *               eagerly concatenated
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -7618,11 +7618,11 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Maps a sequence of values into Publishers and concatenates these Publishers eagerly into a single
-     * Publisher.
+     * Maps a sequence of values into {@link Publisher}s and concatenates these {@code Publisher}s eagerly into a single
+     * {@code Publisher}.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source Publishers. The operator buffers the values emitted by these Publishers and then drains them in
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
      * order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7632,11 +7632,11 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the value type
-     * @param mapper the function that maps a sequence of values into a sequence of Publishers that will be
+     * @param mapper the function that maps a sequence of values into a sequence of {@code Publisher}s that will be
      *               eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrent subscribed Publishers
-     * @param prefetch hints about the number of expected values from each inner Publisher, must be positive
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @param maxConcurrency the maximum number of concurrent subscribed {@code Publisher}s
+     * @param prefetch hints about the number of expected values from each inner {@code Publisher}, must be positive
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -7652,11 +7652,11 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Maps a sequence of values into Publishers and concatenates these Publishers eagerly into a single
-     * Publisher.
+     * Maps a sequence of values into {@link Publisher}s and concatenates these {@code Publisher}s eagerly into a single
+     * {@code Publisher}.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source Publishers. The operator buffers the values emitted by these Publishers and then drains them in
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
      * order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7666,12 +7666,12 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the value type
-     * @param mapper the function that maps a sequence of values into a sequence of Publishers that will be
+     * @param mapper the function that maps a sequence of values into a sequence of {@code Publisher}s that will be
      *               eagerly concatenated
      * @param tillTheEnd
-     *            if true, all errors from the outer and inner Publisher sources are delayed until the end,
-     *            if false, an error from the main source is signaled when the current Publisher source terminates
-     * @return the new Publisher instance with the specified concatenation behavior
+     *            if {@code true}, all errors from the outer and inner {@code Publisher} sources are delayed until the end,
+     *            if {@code false}, an error from the main source is signaled when the current {@code Publisher} source terminates
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -7684,11 +7684,11 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
     }
 
     /**
-     * Maps a sequence of values into Publishers and concatenates these Publishers eagerly into a single
-     * Publisher.
+     * Maps a sequence of values into {@link Publisher}s and concatenates these {@code Publisher}s eagerly into a single
+     * {@code Publisher}.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source Publishers. The operator buffers the values emitted by these Publishers and then drains them in
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
      * order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7698,16 +7698,16 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the value type
-     * @param mapper the function that maps a sequence of values into a sequence of Publishers that will be
+     * @param mapper the function that maps a sequence of values into a sequence of {@code Publisher}s that will be
      *               eagerly concatenated
      * @param tillTheEnd
-     *               if true, exceptions from the current Flowable and all the inner Publishers are delayed until
-     *               all of them terminate, if false, exception from the current Flowable is delayed until the
-     *               currently running Publisher terminates
-     * @param maxConcurrency the maximum number of concurrent subscribed Publishers
+     *               if {@code true}, exceptions from the current {@code Flowable} and all the inner {@code Publisher}s are delayed until
+     *               all of them terminate, if {@code false}, exception from the current {@code Flowable} is delayed until the
+     *               currently running {@code Publisher} terminates
+     * @param maxConcurrency the maximum number of concurrent subscribed {@code Publisher}s
      * @param prefetch
-     *               the number of elements to prefetch from each source Publisher
-     * @return the new Publisher instance with the specified concatenation behavior
+     *               the number of elements to prefetch from each source {@code Publisher}
+     * @return the new {@code Publisher} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -7723,25 +7723,25 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
     }
 
     /**
-     * Returns a Flowable that concatenate each item emitted by the source Publisher with the values in an
-     * Iterable corresponding to that item that is generated by a selector.
+     * Returns a {@code Flowable} that concatenate each item emitted by the source {@link Publisher} with the values in an
+     * {@link Iterable} corresponding to that item that is generated by a selector.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting Publisher
+     *            the type of item emitted by the resulting {@code Publisher}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source Publisher
-     * @return a Flowable that emits the results of concatenating the items emitted by the source Publisher with
-     *         the values in the Iterables corresponding to those items, as generated by {@code collectionSelector}
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code Publisher}
+     * @return a {@code Flowable} that emits the results of concatenating the items emitted by the source {@code Publisher} with
+     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -7753,27 +7753,27 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Returns a Flowable that concatenate each item emitted by the source Publisher with the values in an
-     * Iterable corresponding to that item that is generated by a selector.
+     * Returns a {@code Flowable} that concatenate each item emitted by the source {@link Publisher} with the values in an
+     * {@link Iterable} corresponding to that item that is generated by a selector.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting Publisher
+     *            the type of item emitted by the resulting {@code Publisher}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source Publisher
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code Publisher}
      * @param prefetch
-     *            the number of elements to prefetch from the current Flowable
-     * @return a Flowable that emits the results of concatenating the items emitted by the source Publisher with
-     *         the values in the Iterables corresponding to those items, as generated by {@code collectionSelector}
+     *            the number of elements to prefetch from the current {@code Flowable}
+     * @return a {@code Flowable} that emits the results of concatenating the items emitted by the source {@code Publisher} with
+     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -7796,7 +7796,7 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7805,7 +7805,7 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapMaybeDelayError(Function)
      * @see #concatMapMaybe(Function, int)
      * @since 2.2
@@ -7828,7 +7828,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7841,7 +7841,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      *                 ready to be mapped when a previous {@code MaybeSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code MaybeSource}s.
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapMaybe(Function)
      * @see #concatMapMaybeDelayError(Function, boolean, int)
      * @since 2.2
@@ -7866,7 +7866,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7875,7 +7875,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapMaybe(Function)
      * @see #concatMapMaybeDelayError(Function, boolean)
      * @since 2.2
@@ -7898,7 +7898,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7913,7 +7913,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *                   {@code Flowable} is delayed until the current inner
      *                   {@code MaybeSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapMaybe(Function, int)
      * @see #concatMapMaybeDelayError(Function, boolean, int)
      * @since 2.2
@@ -7936,7 +7936,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7955,7 +7955,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *                 ready to be mapped when a previous {@code MaybeSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code MaybeSource}s.
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapMaybe(Function, int)
      * @since 2.2
      */
@@ -7979,7 +7979,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -7988,7 +7988,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapSingleDelayError(Function)
      * @see #concatMapSingle(Function, int)
      * @since 2.2
@@ -8011,7 +8011,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -8024,7 +8024,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      *                 ready to be mapped when a previous {@code SingleSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code SingleSource}s.
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapSingle(Function)
      * @see #concatMapSingleDelayError(Function, boolean, int)
      * @since 2.2
@@ -8049,7 +8049,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -8058,7 +8058,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapSingle(Function)
      * @see #concatMapSingleDelayError(Function, boolean)
      * @since 2.2
@@ -8081,7 +8081,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -8096,7 +8096,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *                   {@code Flowable} is delayed until the current inner
      *                   {@code SingleSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapSingle(Function, int)
      * @see #concatMapSingleDelayError(Function, boolean, int)
      * @since 2.2
@@ -8119,7 +8119,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
      *  the backpressure from downstream. If this {@code Flowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -8138,7 +8138,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *                 ready to be mapped when a previous {@code SingleSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code SingleSource}s.
-     * @return a new Flowable instance
+     * @return a new {@code Flowable} instance
      * @see #concatMapSingle(Function, int)
      * @since 2.2
      */
@@ -8153,7 +8153,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
     }
 
     /**
-     * Returns a Flowable that emits the items emitted from the current Publisher, then the next, one after
+     * Returns a {@code Flowable} that emits the items emitted from the current {@link Publisher}, then the next, one after
      * the other, without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -8161,14 +8161,14 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the {@code other} {@code Publisher}s
      *  are expected to honor backpressure as well. If any of then violates this rule, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param other
-     *            a Publisher to be concatenated after the current
-     * @return a Flowable that emits items emitted by the two source Publishers, one after the other,
+     *            a {@code Publisher} to be concatenated after the current
+     * @return a {@code Flowable} that emits items emitted by the two source {@code Publisher}s, one after the other,
      *         without interleaving them
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -8194,8 +8194,8 @@ public final Flowable<T> concatWith(@NonNull Publisher<? extends T> other) {
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.10 - experimental
-     * @param other the SingleSource whose signal should be emitted after this {@code Flowable} completes normally.
-     * @return the new Flowable instance
+     * @param other the {@code SingleSource} whose signal should be emitted after this {@code Flowable} completes normally.
+     * @return the new {@code Flowable} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -8220,8 +8220,8 @@ public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.10 - experimental
-     * @param other the MaybeSource whose signal should be emitted after this Flowable completes normally.
-     * @return the new Flowable instance
+     * @param other the {@code MaybeSource} whose signal should be emitted after this {@code Flowable} completes normally.
+     * @return the new {@code Flowable} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -8240,16 +8240,16 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator does not interfere with backpressure between the current Flowable and the
+     *  <dd>The operator does not interfere with backpressure between the current {@code Flowable} and the
      *  downstream consumer (i.e., acts as pass-through). When the operator switches to the
-     *  {@code Completable}, backpressure is no longer present because {@code Completable} doesn't
+     *  {@link Completable}, backpressure is no longer present because {@code Completable} doesn't
      *  have items to apply backpressure to.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.10 - experimental
      * @param other the {@code CompletableSource} to subscribe to once the current {@code Flowable} completes normally
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -8262,7 +8262,7 @@ public final Flowable<T> concatWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a Single that emits a Boolean that indicates whether the source Publisher emitted a
+     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether the source {@link Publisher} emitted a
      * specified item.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/contains.png" alt="">
@@ -8275,9 +8275,9 @@ public final Flowable<T> concatWith(@NonNull CompletableSource other) {
      * </dl>
      *
      * @param item
-     *            the item to search for in the emissions from the source Publisher
-     * @return a Flowable that emits {@code true} if the specified item is emitted by the source Publisher,
-     *         or {@code false} if the source Publisher completes without emitting that item
+     *            the item to search for in the emissions from the source {@code Publisher}
+     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the source {@code Publisher},
+     *         or {@code false} if the source {@code Publisher} completes without emitting that item
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -8290,8 +8290,8 @@ public final Single<Boolean> contains(@NonNull Object item) {
     }
 
     /**
-     * Returns a Single that counts the total number of items emitted by the source Publisher and emits
-     * this count as a 64-bit Long.
+     * Returns a {@link Single} that counts the total number of items emitted by the source {@link Publisher} and emits
+     * this count as a 64-bit {@link Long}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/longCount.png" alt="">
      * <dl>
@@ -8302,8 +8302,8 @@ public final Single<Boolean> contains(@NonNull Object item) {
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Single that emits a single item: the number of items emitted by the source Publisher as a
-     *         64-bit Long item
+     * @return a {@code Single} that emits a single item: the number of items emitted by the source {@code Publisher} as a
+     *         64-bit {@code Long} item
      * @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
      */
     @CheckReturnValue
@@ -8315,8 +8315,8 @@ public final Single<Long> count() {
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, except that it drops items emitted by the
-     * source Publisher that are followed by another item within a computed debounce duration.
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
+     * source {@code Publisher} that are followed by another item within a computed debounce duration.
      * <p>
      * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.f.png" alt="">
      * <p>
@@ -8339,7 +8339,7 @@ public final Single<Long> count() {
      *            the debounce value type (ignored)
      * @param debounceIndicator
      *            function to retrieve a sequence that indicates the throttle duration for each item
-     * @return a Flowable that omits items emitted by the source Publisher that are followed by another item
+     * @return a {@code Flowable} that omits items emitted by the source {@code Publisher} that are followed by another item
      *         within a computed debounce duration
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -8354,16 +8354,16 @@ public final <U> Flowable<T> debounce(@NonNull Function<? super T, ? extends Pub
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, except that it drops items emitted by the
-     * source Publisher that are followed by newer items before a timeout value expires. The timer resets on
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
+     * source {@code Publisher} that are followed by newer items before a timeout value expires. The timer resets on
      * each emission.
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source Publisher faster than the timeout then no items
-     * will be emitted by the resulting Publisher.
+     * <em>Note:</em> If items keep being emitted by the source {@code Publisher} faster than the timeout then no items
+     * will be emitted by the resulting {@code Publisher}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.png" alt="">
      * <p>
-     * Delivery of the item after the grace period happens on the {@code computation} {@code Scheduler}'s
+     * Delivery of the item after the grace period happens on the {@code computation} {@link Scheduler}'s
      * {@code Worker} which if takes too long, a newer item may arrive from the upstream, causing the
      * {@code Worker}'s task to get disposed, which may also interrupt any downstream blocking operation
      * (yielding an {@code InterruptedException}). It is recommended processing items
@@ -8373,16 +8373,16 @@ public final <U> Flowable<T> debounce(@NonNull Function<? super T, ? extends Pub
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code debounce} operates by default on the {@code computation} {@link Scheduler}.</dd>
+     *  <dd>{@code debounce} operates by default on the {@code computation} {@code Scheduler}.</dd>
      * </dl>
      *
      * @param timeout
      *            the length of the window of time that must pass after the emission of an item from the source
-     *            Publisher in which that Publisher emits no items in order for the item to be emitted by the
-     *            resulting Publisher
+     *            {@code Publisher} in which that {@code Publisher} emits no items in order for the item to be emitted by the
+     *            resulting {@code Publisher}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return a Flowable that filters out items from the source Publisher that are too quickly followed by
+     * @return a {@code Flowable} that filters out items from the source {@code Publisher} that are too quickly followed by
      *         newer items
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -8397,12 +8397,12 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, except that it drops items emitted by the
-     * source Publisher that are followed by newer items before a timeout value expires on a specified
-     * Scheduler. The timer resets on each emission.
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
+     * source {@code Publisher} that are followed by newer items before a timeout value expires on a specified
+     * {@link Scheduler}. The timer resets on each emission.
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source Publisher faster than the timeout then no items
-     * will be emitted by the resulting Publisher.
+     * <em>Note:</em> If items keep being emitted by the source {@code Publisher} faster than the timeout then no items
+     * will be emitted by the resulting {@code Publisher}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.s.png" alt="">
      * <p>
@@ -8416,18 +8416,18 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit) {
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
-     *            the time each item has to be "the most recent" of those emitted by the source Publisher to
+     *            the time each item has to be "the most recent" of those emitted by the source {@code Publisher} to
      *            ensure that it's not dropped
      * @param unit
      *            the unit of time for the specified {@code timeout}
      * @param scheduler
-     *            the {@link Scheduler} to use internally to manage the timers that handle the timeout for each
+     *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return a Flowable that filters out items from the source Publisher that are too quickly followed by
+     * @return a {@code Flowable} that filters out items from the source {@code Publisher} that are too quickly followed by
      *         newer items
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -8444,24 +8444,24 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by the source Publisher or a specified default item
-     * if the source Publisher is empty.
+     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} or a specified default item
+     * if the source {@code Publisher} is empty.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>If the source {@code Publisher} is empty, this operator is guaranteed to honor backpressure from downstream.
      *  If the source {@code Publisher} is non-empty, it is expected to honor backpressure as well; if the rule is violated,
-     *  a {@code MissingBackpressureException} <em>may</em> get signaled somewhere downstream.
+     *  a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.
      *  </dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code defaultIfEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param defaultItem
-     *            the item to emit if the source Publisher emits no items
-     * @return a Flowable that emits either the specified default item if the source Publisher emits no
-     *         items, or the items emitted by the source Publisher
+     *            the item to emit if the source {@code Publisher} emits no items
+     * @return a {@code Flowable} that emits either the specified default item if the source {@code Publisher} emits no
+     *         items, or the items emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/defaultifempty.html">ReactiveX operators documentation: DefaultIfEmpty</a>
      */
     @CheckReturnValue
@@ -8474,13 +8474,13 @@ public final Flowable<T> defaultIfEmpty(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Flowable that delays the emissions of the source Publisher via another Publisher on a
+     * Returns a {@code Flowable} that delays the emissions of the source {@link Publisher} via another {@code Publisher} on a
      * per-item basis.
      * <p>
      * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.o.png" alt="">
      * <p>
-     * <em>Note:</em> the resulting Publisher will immediately propagate any {@code onError} notification
-     * from the source Publisher.
+     * <em>Note:</em> the resulting {@code Publisher} will immediately propagate any {@code onError} notification
+     * from the source {@code Publisher}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.
@@ -8493,10 +8493,10 @@ public final Flowable<T> defaultIfEmpty(@NonNull T defaultItem) {
      * @param <U>
      *            the item delay value type (ignored)
      * @param itemDelayIndicator
-     *            a function that returns a Publisher for each item emitted by the source Publisher, which is
-     *            then used to delay the emission of that item by the resulting Publisher until the Publisher
+     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}, which is
+     *            then used to delay the emission of that item by the resulting {@code Publisher} until the {@code Publisher}
      *            returned from {@code itemDelay} emits an item
-     * @return a Flowable that delays the emissions of the source Publisher via another Publisher on a
+     * @return a {@code Flowable} that delays the emissions of the source {@code Publisher} via another {@code Publisher} on a
      *         per-item basis
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8510,8 +8510,8 @@ public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publis
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by the source Publisher shifted forward in time by a
-     * specified delay. Error notifications from the source Publisher are not delayed.
+     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} shifted forward in time by a
+     * specified delay. The {@code onError} notification from the source {@code Publisher} is not delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
      * <dl>
@@ -8525,7 +8525,7 @@ public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publis
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return the source Publisher shifted in time by the specified delay
+     * @return the source {@code Publisher} shifted in time by the specified delay
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8537,8 +8537,8 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by the source Publisher shifted forward in time by a
-     * specified delay. If {@code delayError} is true, error notifications will also be delayed.
+     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} shifted forward in time by a
+     * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
      * <dl>
@@ -8553,9 +8553,9 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit) {
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param delayError
-     *            if true, the upstream exception is signaled with the given delay, after all preceding normal elements,
-     *            if false, the upstream exception is signaled immediately
-     * @return the source Publisher shifted in time by the specified delay
+     *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
+     *            if {@code false}, the upstream exception is signaled immediately
+     * @return the source {@code Publisher} shifted in time by the specified delay
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8567,8 +8567,8 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, boolean delay
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by the source Publisher shifted forward in time by a
-     * specified delay. Error notifications from the source Publisher are not delayed.
+     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} shifted forward in time by a
+     * specified delay. The {@code onError} notification from the source {@code Publisher} is not delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
      * <dl>
@@ -8583,8 +8583,8 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, boolean delay
      * @param unit
      *            the time unit of {@code delay}
      * @param scheduler
-     *            the {@link Scheduler} to use for delaying
-     * @return the source Publisher shifted in time by the specified delay
+     *            the {@code Scheduler} to use for delaying
+     * @return the source {@code Publisher} shifted in time by the specified delay
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8596,8 +8596,8 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by the source Publisher shifted forward in time by a
-     * specified delay. If {@code delayError} is true, error notifications will also be delayed.
+     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} shifted forward in time by a
+     * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
      * <dl>
@@ -8612,11 +8612,11 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      * @param unit
      *            the time unit of {@code delay}
      * @param scheduler
-     *            the {@link Scheduler} to use for delaying
+     *            the {@code Scheduler} to use for delaying
      * @param delayError
-     *            if true, the upstream exception is signaled with the given delay, after all preceding normal elements,
-     *            if false, the upstream exception is signaled immediately
-     * @return the source Publisher shifted in time by the specified delay
+     *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
+     *            if {@code false}, the upstream exception is signaled immediately
+     * @return the source {@code Publisher} shifted in time by the specified delay
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8631,13 +8631,13 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
     }
 
     /**
-     * Returns a Flowable that delays the subscription to and emissions from the source Publisher via another
-     * Publisher on a per-item basis.
+     * Returns a {@code Flowable} that delays the subscription to and emissions from the source {@link Publisher} via another
+     * {@code Publisher} on a per-item basis.
      * <p>
      * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.oo.png" alt="">
      * <p>
-     * <em>Note:</em> the resulting Publisher will immediately propagate any {@code onError} notification
-     * from the source Publisher.
+     * <em>Note:</em> the resulting {@code Publisher} will immediately propagate any {@code onError} notification
+     * from the source {@code Publisher}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.
@@ -8652,14 +8652,14 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      * @param <V>
      *            the item delay value type (ignored)
      * @param subscriptionIndicator
-     *            a function that returns a Publisher that triggers the subscription to the source Publisher
+     *            a function that returns a {@code Publisher} that triggers the subscription to the source {@code Publisher}
      *            once it emits any item
      * @param itemDelayIndicator
-     *            a function that returns a Publisher for each item emitted by the source Publisher, which is
-     *            then used to delay the emission of that item by the resulting Publisher until the Publisher
+     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}, which is
+     *            then used to delay the emission of that item by the resulting {@code Publisher} until the {@code Publisher}
      *            returned from {@code itemDelay} emits an item
-     * @return a Flowable that delays the subscription and emissions of the source Publisher via another
-     *         Publisher on a per-item basis
+     * @return a {@code Flowable} that delays the subscription and emissions of the source {@code Publisher} via another
+     *         {@code Publisher} on a per-item basis
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8672,21 +8672,21 @@ public final <U, V> Flowable<T> delay(@NonNull Publisher<U> subscriptionIndicato
     }
 
     /**
-     * Returns a Flowable that delays the subscription to this Publisher
-     * until the other Publisher emits an element or completes normally.
+     * Returns a {@code Flowable} that delays the subscription to this {@link Publisher}
+     * until the other {@code Publisher} emits an element or completes normally.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator forwards the backpressure requests to this Publisher once
-     *  the subscription happens and requests {@link Long#MAX_VALUE} from the other Publisher</dd>
+     *  <dd>The operator forwards the backpressure requests to this {@code Publisher} once
+     *  the subscription happens and requests {@link Long#MAX_VALUE} from the other {@code Publisher}</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the value type of the other Publisher, irrelevant
-     * @param subscriptionIndicator the other Publisher that should trigger the subscription
-     *        to this Publisher.
-     * @return a Flowable that delays the subscription to this Publisher
-     *         until the other Publisher emits an element or completes normally.
+     * @param <U> the value type of the other {@code Publisher}, irrelevant
+     * @param subscriptionIndicator the other {@code Publisher} that should trigger the subscription
+     *        to this {@code Publisher}.
+     * @return a {@code Flowable} that delays the subscription to this {@code Publisher}
+     *         until the other {@code Publisher} emits an element or completes normally.
      * @since 2.0
      */
     @CheckReturnValue
@@ -8699,7 +8699,7 @@ public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptio
     }
 
     /**
-     * Returns a Flowable that delays the subscription to the source Publisher by a given amount of time.
+     * Returns a {@code Flowable} that delays the subscription to the source {@link Publisher} by a given amount of time.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.png" alt="">
      * <dl>
@@ -8713,7 +8713,7 @@ public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptio
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
-     * @return a Flowable that delays the subscription to the source Publisher by the given amount
+     * @return a {@code Flowable} that delays the subscription to the source {@code Publisher} by the given amount
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8725,15 +8725,15 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that delays the subscription to the source Publisher by a given amount of time,
-     * both waiting and subscribing on a given Scheduler.
+     * Returns a {@code Flowable} that delays the subscription to the source {@link Publisher} by a given amount of time,
+     * both waiting and subscribing on a given {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param delay
@@ -8741,9 +8741,9 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code delay}
      * @param scheduler
-     *            the Scheduler on which the waiting and subscription will happen
-     * @return a Flowable that delays the subscription to the source Publisher by a given
-     *         amount, waiting and subscribing on the given Scheduler
+     *            the {@code Scheduler} on which the waiting and subscription will happen
+     * @return a {@code Flowable} that delays the subscription to the source {@code Publisher} by a given
+     *         amount, waiting and subscribing on the given {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8755,9 +8755,9 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @
     }
 
     /**
-     * Returns a Flowable that reverses the effect of {@link #materialize materialize} by transforming the
+     * Returns a {@code Flowable} that reverses the effect of {@link #materialize materialize} by transforming the
      * {@link Notification} objects extracted from the source items via a selector function
-     * into their respective {@code Subscriber} signal types.
+     * into their respective {@link Subscriber} signal types.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/dematerialize.png" alt="">
      * <p>
@@ -8769,7 +8769,7 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @
      * <p>
      * When the upstream signals an {@link Notification#createOnError(Throwable) onError} or
      * {@link Notification#createOnComplete() onComplete} item, the
-     * returned Flowable cancels of the flow and terminates with that type of terminal event:
+     * returned {@code Flowable} cancels of the flow and terminates with that type of terminal event:
      * <pre><code>
      * Flowable.just(createOnNext(1), createOnComplete(), createOnNext(2))
      * .doOnCancel(() -&gt; System.out.println("Canceled!"));
@@ -8789,7 +8789,7 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @
      * with a {@link #never()} source.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code dematerialize} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8797,10 +8797,10 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @
      * <p>History: 2.2.4 - experimental
      *
      * @param <R> the output value type
-     * @param selector function that returns the upstream item and should return a Notification to signal
+     * @param selector function that returns the upstream item and should return a {@code Notification} to signal
      * the corresponding {@code Subscriber} event to the downstream.
-     * @return a Flowable that emits the items and notifications embedded in the {@link Notification} objects
-     *         selected from the items emitted by the source Flowable
+     * @return a {@code Flowable} that emits the items and notifications embedded in the {@code Notification} objects
+     *         selected from the items emitted by the source {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Dematerialize</a>
      * @since 3.0.0
      */
@@ -8814,7 +8814,7 @@ public final <R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T,
     }
 
     /**
-     * Returns a Flowable that emits all items emitted by the source Publisher that are distinct
+     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct
      * based on {@link Object#equals(Object)} comparison.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.png" alt="">
@@ -8822,13 +8822,13 @@ public final <R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T,
      * It is recommended the elements' class {@code T} in the flow overrides the default {@code Object.equals()} and {@link Object#hashCode()} to provide
      * a meaningful comparison between items as the default Java implementation only considers reference equivalence.
      * <p>
-     * By default, {@code distinct()} uses an internal {@link java.util.HashSet} per Subscriber to remember
+     * By default, {@code distinct()} uses an internal {@link java.util.HashSet} per {@link Subscriber} to remember
      * previously seen items and uses {@link java.util.Set#add(Object)} returning {@code false} as the
      * indicator for duplicates.
      * <p>
-     * Note that this internal {@code HashSet} may grow unbounded as items won't be removed from it by
+     * Note that this internal {@link HashSet} may grow unbounded as items won't be removed from it by
      * the operator. Therefore, using very long or infinite upstream (with very distinct elements) may lead
-     * to {@code OutOfMemoryError}.
+     * to {@link OutOfMemoryError}.
      * <p>
      * Customizing the retention policy can happen only by providing a custom {@link java.util.Collection} implementation
      * to the {@link #distinct(Function, Supplier)} overload.
@@ -8840,7 +8840,7 @@ public final <R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T,
      *  <dd>{@code distinct} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that emits only those items emitted by the source Publisher that are distinct from
+     * @return a {@code Flowable} that emits only those items emitted by the source {@code Publisher} that are distinct from
      *         each other
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function)
@@ -8856,7 +8856,7 @@ public final Flowable<T> distinct() {
     }
 
     /**
-     * Returns a Flowable that emits all items emitted by the source Publisher that are distinct according
+     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct according
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
@@ -8865,13 +8865,13 @@ public final Flowable<T> distinct() {
      * It is recommended the keys' class {@code K} overrides the default {@code Object.equals()} and {@link Object#hashCode()} to provide
      * a meaningful comparison between the key objects as the default Java implementation only considers reference equivalence.
      * <p>
-     * By default, {@code distinct()} uses an internal {@link java.util.HashSet} per Subscriber to remember
+     * By default, {@code distinct()} uses an internal {@link java.util.HashSet} per {@link Subscriber} to remember
      * previously seen keys and uses {@link java.util.Set#add(Object)} returning {@code false} as the
      * indicator for duplicates.
      * <p>
-     * Note that this internal {@code HashSet} may grow unbounded as keys won't be removed from it by
+     * Note that this internal {@link HashSet} may grow unbounded as keys won't be removed from it by
      * the operator. Therefore, using very long or infinite upstream (with very distinct keys) may lead
-     * to {@code OutOfMemoryError}.
+     * to {@link OutOfMemoryError}.
      * <p>
      * Customizing the retention policy can happen only by providing a custom {@link java.util.Collection} implementation
      * to the {@link #distinct(Function, Supplier)} overload.
@@ -8887,7 +8887,7 @@ public final Flowable<T> distinct() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return a Flowable that emits those items emitted by the source Publisher that have distinct keys
+     * @return a {@code Flowable} that emits those items emitted by the source {@code Publisher} that have distinct keys
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function, Supplier)
      */
@@ -8900,7 +8900,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
     }
 
     /**
-     * Returns a Flowable that emits all items emitted by the source Publisher that are distinct according
+     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct according
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
@@ -8921,9 +8921,9 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
      * @param collectionSupplier
-     *            function called for each individual Subscriber to return a Collection subtype for holding the extracted
+     *            function called for each individual {@link Subscriber} to return a {@link Collection} subtype for holding the extracted
      *            keys and whose add() method's return indicates uniqueness.
-     * @return a Flowable that emits those items emitted by the source Publisher that have distinct keys
+     * @return a {@code Flowable} that emits those items emitted by the source {@code Publisher} that have distinct keys
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
     @CheckReturnValue
@@ -8938,7 +8938,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
     }
 
     /**
-     * Returns a Flowable that emits all items emitted by the source Publisher that are distinct from their
+     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct from their
      * immediate predecessors based on {@link Object#equals(Object)} comparison.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
@@ -8954,7 +8954,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      * <p>
      * Note that if element type {@code T} in the flow is mutable, the comparison of the previous and current
      * item may yield unexpected results if the items are mutated externally. Common cases are mutable
-     * {@code CharSequence}s or {@code List}s where the objects will actually have the same
+     * {@link CharSequence}s or {@link List}s where the objects will actually have the same
      * references when they are modified and {@code distinctUntilChanged} will evaluate subsequent items as same.
      * To avoid such situation, it is recommended that mutable data is converted to an immutable one,
      * for example using {@code map(CharSequence::toString)} or {@code map(list -> Collections.unmodifiableList(new ArrayList<>(list)))}.
@@ -8966,7 +8966,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      *  <dd>{@code distinctUntilChanged} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that emits those items from the source Publisher that are distinct from their
+     * @return a {@code Flowable} that emits those items from the source {@code Publisher} that are distinct from their
      *         immediate predecessors
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinctUntilChanged(BiPredicate)
@@ -8980,7 +8980,7 @@ public final Flowable<T> distinctUntilChanged() {
     }
 
     /**
-     * Returns a Flowable that emits all items emitted by the source Publisher that are distinct from their
+     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct from their
      * immediate predecessors, according to a key selector function and based on {@link Object#equals(Object)} comparison
      * of those objects returned by the key selector function.
      * <p>
@@ -8998,7 +8998,7 @@ public final Flowable<T> distinctUntilChanged() {
      * <p>
      * Note that if element type {@code T} in the flow is mutable, the comparison of the previous and current
      * item may yield unexpected results if the items are mutated externally. Common cases are mutable
-     * {@code CharSequence}s or {@code List}s where the objects will actually have the same
+     * {@link CharSequence}s or {@link List}s where the objects will actually have the same
      * references when they are modified and {@code distinctUntilChanged} will evaluate subsequent items as same.
      * To avoid such situation, it is recommended that mutable data is converted to an immutable one,
      * for example using {@code map(CharSequence::toString)} or {@code map(list -> Collections.unmodifiableList(new ArrayList<>(list)))}.
@@ -9014,7 +9014,7 @@ public final Flowable<T> distinctUntilChanged() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return a Flowable that emits those items from the source Publisher whose keys are distinct from
+     * @return a {@code Flowable} that emits those items from the source {@code Publisher} whose keys are distinct from
      *         those of their immediate predecessors
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
@@ -9028,7 +9028,7 @@ public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K
     }
 
     /**
-     * Returns a Flowable that emits all items emitted by the source Publisher that are distinct from their
+     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct from their
      * immediate predecessors when compared with each other via the provided comparator function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
@@ -9038,7 +9038,7 @@ public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K
      * <p>
      * Note that if element type {@code T} in the flow is mutable, the comparison of the previous and current
      * item may yield unexpected results if the items are mutated externally. Common cases are mutable
-     * {@code CharSequence}s or {@code List}s where the objects will actually have the same
+     * {@link CharSequence}s or {@link List}s where the objects will actually have the same
      * references when they are modified and {@code distinctUntilChanged} will evaluate subsequent items as same.
      * To avoid such situation, it is recommended that mutable data is converted to an immutable one,
      * for example using {@code map(CharSequence::toString)} or {@code map(list -> Collections.unmodifiableList(new ArrayList<>(list)))}.
@@ -9051,8 +9051,8 @@ public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K
      * </dl>
      *
      * @param comparer the function that receives the previous item and the current item and is
-     *                   expected to return true if the two are equal, thus skipping the current value.
-     * @return a Flowable that emits those items from the source Publisher that are distinct from their
+     *                   expected to return {@code true} if the two are equal, thus skipping the current value.
+     * @return a {@code Flowable} that emits those items from the source {@code Publisher} that are distinct from their
      *         immediate predecessors
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @since 2.0
@@ -9067,7 +9067,7 @@ public final Flowable<T> distinctUntilChanged(@NonNull BiPredicate<? super T, ?
     }
 
     /**
-     * Calls the specified action after this Flowable signals onError or onCompleted or gets canceled by
+     * Calls the specified action after this {@code Flowable} signals {@code onError} or {@code onComplete} or gets canceled by
      * the downstream.
      * <p>In case of a race between a terminal event and a cancellation, the provided {@code onFinally} action
      * is executed once per subscription.
@@ -9075,17 +9075,17 @@ public final Flowable<T> distinctUntilChanged(@NonNull BiPredicate<? super T, ?
      * should be thread-safe.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doFinally} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Operator-fusion:</b></dt>
-     *  <dd>This operator supports normal and conditional Subscribers as well as boundary-limited
+     *  <dd>This operator supports normal and conditional {@link Subscriber}s as well as boundary-limited
      *  synchronous or asynchronous queue-fusion.</dd>
      * </dl>
      * <p>History: 2.0.1 - experimental
-     * @param onFinally the action called when this Flowable terminates or gets canceled
-     * @return the new Flowable instance
+     * @param onFinally the action called when this {@code Flowable} terminates or gets canceled
+     * @return the new {@code Flowable} instance
      * @since 2.1
      */
     @CheckReturnValue
@@ -9103,17 +9103,17 @@ public final Flowable<T> doFinally(@NonNull Action onFinally) {
      * should be thread-safe.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterNext} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Operator-fusion:</b></dt>
-     *  <dd>This operator supports normal and conditional Subscribers as well as boundary-limited
+     *  <dd>This operator supports normal and conditional {@link Subscriber}s as well as boundary-limited
      *  synchronous or asynchronous queue-fusion.</dd>
      * </dl>
      * <p>History: 2.0.1 - experimental
-     * @param onAfterNext the Consumer that will be called after emitting an item from upstream to the downstream
-     * @return the new Flowable instance
+     * @param onAfterNext the {@link Consumer} that will be called after emitting an item from upstream to the downstream
+     * @return the new {@code Flowable} instance
      * @since 2.1
      */
     @CheckReturnValue
@@ -9126,7 +9126,7 @@ public final Flowable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext) {
     }
 
     /**
-     * Registers an {@link Action} to be called when this Publisher invokes either
+     * Registers an {@link Action} to be called when this {@link Publisher} invokes either
      * {@link Subscriber#onComplete onComplete} or {@link Subscriber#onError onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/finallyDo.png" alt="">
@@ -9139,9 +9139,9 @@ public final Flowable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext) {
      * </dl>
      *
      * @param onAfterTerminate
-     *            an {@link Action} to be invoked when the source Publisher finishes
-     * @return a Flowable that emits the same items as the source Publisher, then invokes the
-     *         {@link Action}
+     *            an {@code Action} to be invoked when the source {@code Publisher} finishes
+     * @return a {@code Flowable} that emits the same items as the source {@code Publisher}, then invokes the
+     *         {@code Action}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doOnTerminate(Action)
      */
@@ -9155,17 +9155,15 @@ public final Flowable<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
     }
 
     /**
-     * Calls the cancel {@code Action} if the downstream cancels the sequence.
+     * Calls the cancel {@link Action} if the downstream cancels the sequence.
+     * <p>
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnUnsubscribe.png" alt="">
      * <p>
      * The action is shared between subscriptions and thus may be called concurrently from multiple
      * threads; the action must be thread-safe.
      * <p>
      * If the action throws a runtime exception, that exception is rethrown by the {@code onCancel()} call,
-     * sometimes as a {@code CompositeException} if there were multiple exceptions along the way.
-     * <p>
-     * Note that terminal events trigger the action unless the {@code Publisher} is subscribed to via {@code unsafeSubscribe()}.
-     * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnUnsubscribe.png" alt="">
+     * sometimes as a {@link CompositeException} if there were multiple exceptions along the way.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>{@code doOnCancel} does not interact with backpressure requests or value delivery; backpressure
@@ -9175,8 +9173,8 @@ public final Flowable<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
      * </dl>
      *
      * @param onCancel
-     *            the action that gets called when the source {@code Publisher}'s Subscription is canceled
-     * @return the source {@code Publisher} modified so as to call this Action when appropriate
+     *            the action that gets called when the source {@link Publisher}'s {@link Subscription} is canceled
+     * @return the source {@code Publisher} modified so as to call this {@code Action} when appropriate
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9188,7 +9186,7 @@ public final Flowable<T> doOnCancel(@NonNull Action onCancel) {
     }
 
     /**
-     * Modifies the source Publisher so that it invokes an action when it calls {@code onComplete}.
+     * Modifies the source {@link Publisher} so that it invokes an action when it calls {@code onComplete}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.png" alt="">
      * <dl>
@@ -9200,8 +9198,8 @@ public final Flowable<T> doOnCancel(@NonNull Action onCancel) {
      * </dl>
      *
      * @param onComplete
-     *            the action to invoke when the source Publisher calls {@code onComplete}
-     * @return the source Publisher with the side-effecting behavior applied
+     *            the action to invoke when the source {@code Publisher} calls {@code onComplete}
+     * @return the source {@code Publisher} with the side-effecting behavior applied
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9220,13 +9218,13 @@ public final Flowable<T> doOnComplete(@NonNull Action onComplete) {
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source Publisher with the side-effecting behavior applied
+     * @return the source {@code Publisher} with the side-effecting behavior applied
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9243,7 +9241,7 @@ private Flowable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Consu
     }
 
     /**
-     * Modifies the source Publisher so that it invokes an action for each item it emits.
+     * Modifies the source {@link Publisher} so that it invokes an action for each item it emits.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
      * <dl>
@@ -9255,8 +9253,8 @@ private Flowable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Consu
      * </dl>
      *
      * @param onNotification
-     *            the action to invoke for each item emitted by the source Publisher
-     * @return the source Publisher with the side-effecting behavior applied
+     *            the action to invoke for each item emitted by the source {@code Publisher}
+     * @return the source {@code Publisher} with the side-effecting behavior applied
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9274,11 +9272,11 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
     }
 
     /**
-     * Modifies the source Publisher so that it notifies a Subscriber for each item and terminal event it emits.
+     * Modifies the source {@link Publisher} so that it notifies a {@link Subscriber} for each item and terminal event it emits.
      * <p>
-     * In case the {@code onError} of the supplied Subscriber throws, the downstream will receive a composite
+     * In case the {@code onError} of the supplied {@code Subscriber} throws, the downstream will receive a composite
      * exception containing the original exception and the exception thrown by {@code onError}. If either the
-     * {@code onNext} or the {@code onComplete} method of the supplied Subscriber throws, the downstream will be
+     * {@code onNext} or the {@code onComplete} method of the supplied {@code Subscriber} throws, the downstream will be
      * terminated and will receive this thrown exception.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.o.png" alt="">
@@ -9291,9 +9289,9 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
      * </dl>
      *
      * @param subscriber
-     *            the Subscriber to be notified about onNext, onError and onComplete events on its
-     *            respective methods before the actual downstream Subscriber gets notified.
-     * @return the source Publisher with the side-effecting behavior applied
+     *            the {@code Subscriber} to be notified about {@code onNext}, {@code onError} and {@code onComplete} events on its
+     *            respective methods before the actual downstream {@code Subscriber} gets notified.
+     * @return the source {@code Publisher} with the side-effecting behavior applied
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9310,7 +9308,7 @@ public final Flowable<T> doOnEach(@NonNull Subscriber<? super T> subscriber) {
     }
 
     /**
-     * Modifies the source Publisher so that it invokes an action if it calls {@code onError}.
+     * Modifies the source {@link Publisher} so that it invokes an action if it calls {@code onError}.
      * <p>
      * In case the {@code onError} action throws, the downstream will receive a composite exception containing
      * the original exception and the exception thrown by {@code onError}.
@@ -9325,8 +9323,8 @@ public final Flowable<T> doOnEach(@NonNull Subscriber<? super T> subscriber) {
      * </dl>
      *
      * @param onError
-     *            the action to invoke if the source Publisher calls {@code onError}
-     * @return the source Publisher with the side-effecting behavior applied
+     *            the action to invoke if the source {@code Publisher} calls {@code onError}
+     * @return the source {@code Publisher} with the side-effecting behavior applied
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9339,25 +9337,25 @@ public final Flowable<T> doOnError(@NonNull Consumer<? super Throwable> onError)
     }
 
     /**
-     * Calls the appropriate onXXX method (shared between all Subscribers) for the lifecycle events of
+     * Calls the appropriate {@code onXXX} method (shared between all {@link Subscriber}s) for the lifecycle events of
      * the sequence (subscription, cancellation, requesting).
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnLifecycle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onSubscribe
-     *              a Consumer called with the Subscription sent via Subscriber.onSubscribe()
+     *              a {@link Consumer} called with the {@link Subscription} sent via {@link Subscriber#onSubscribe(Subscription)}
      * @param onRequest
-     *              a LongConsumer called with the request amount sent via Subscription.request()
+     *              a {@link LongConsumer} called with the request amount sent via {@link Subscription#request(long)}
      * @param onCancel
-     *              called when the downstream cancels the Subscription via cancel()
-     * @return the source Publisher with the side-effecting behavior applied
+     *              called when the downstream cancels the {@code Subscription} via {@link Subscription#cancel()}
+     * @return the source {@code Publisher} with the side-effecting behavior applied
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9373,7 +9371,7 @@ public final Flowable<T> doOnLifecycle(@NonNull Consumer<? super Subscription> o
     }
 
     /**
-     * Modifies the source Publisher so that it invokes an action when it calls {@code onNext}.
+     * Modifies the source {@link Publisher} so that it invokes an action when it calls {@code onNext}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.png" alt="">
      * <dl>
@@ -9385,8 +9383,8 @@ public final Flowable<T> doOnLifecycle(@NonNull Consumer<? super Subscription> o
      * </dl>
      *
      * @param onNext
-     *            the action to invoke when the source Publisher calls {@code onNext}
-     * @return the source Publisher with the side-effecting behavior applied
+     *            the action to invoke when the source {@code Publisher} calls {@code onNext}
+     * @return the source {@code Publisher} with the side-effecting behavior applied
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9399,7 +9397,7 @@ public final Flowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Modifies the source {@code Publisher} so that it invokes the given action when it receives a
+     * Modifies the source {@link Publisher} so that it invokes the given action when it receives a
      * request for more items.
      * <p>
      * <b>Note:</b> This operator is for tracing the internal behavior of back-pressure request
@@ -9413,9 +9411,9 @@ public final Flowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
      * </dl>
      *
      * @param onRequest
-     *            the action that gets called when a Subscriber requests items from this
+     *            the action that gets called when a {@link Subscriber} requests items from this
      *            {@code Publisher}
-     * @return the source {@code Publisher} modified so as to call this Action when appropriate
+     * @return the source {@code Publisher} modified so as to call this {@link Action} when appropriate
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators
      *      documentation: Do</a>
      * @since 2.0
@@ -9429,7 +9427,7 @@ public final Flowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
     }
 
     /**
-     * Modifies the source {@code Publisher} so that it invokes the given action when it is subscribed from
+     * Modifies the source {@link Publisher} so that it invokes the given action when it is subscribed from
      * its subscribers. Each subscription will result in an invocation of the given action except when the
      * source {@code Publisher} is reference counted, in which case the source {@code Publisher} will invoke
      * the given action for the first subscription.
@@ -9444,8 +9442,8 @@ public final Flowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
      * </dl>
      *
      * @param onSubscribe
-     *            the Consumer that gets called when a Subscriber subscribes to the current {@code Flowable}
-     * @return the source {@code Publisher} modified so as to call this Consumer when appropriate
+     *            the {@link Consumer} that gets called when a {@link Subscriber} subscribes to the current {@code Flowable}
+     * @return the source {@code Publisher} modified so as to call this {@code Consumer} when appropriate
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9457,7 +9455,7 @@ public final Flowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> o
     }
 
     /**
-     * Modifies the source Publisher so that it invokes an action when it calls {@code onComplete} or
+     * Modifies the source {@link Publisher} so that it invokes an action when it calls {@code onComplete} or
      * {@code onError}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.png" alt="">
@@ -9473,8 +9471,8 @@ public final Flowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> o
      * </dl>
      *
      * @param onTerminate
-     *            the action to invoke when the source Publisher calls {@code onComplete} or {@code onError}
-     * @return the source Publisher with the side-effecting behavior applied
+     *            the action to invoke when the source {@code Publisher} calls {@code onComplete} or {@code onError}
+     * @return the source {@code Publisher} with the side-effecting behavior applied
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doAfterTerminate(Action)
      */
@@ -9488,21 +9486,21 @@ public final Flowable<T> doOnTerminate(@NonNull Action onTerminate) {
     }
 
     /**
-     * Returns a Maybe that emits the single item at a specified index in a sequence of emissions from
-     * this Flowable or completes if this Flowable sequence has fewer elements than index.
+     * Returns a {@link Maybe} that emits the single item at a specified index in a sequence of emissions from
+     * this {@code Flowable} or completes if this {@code Flowable} sequence has fewer elements than index.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAt.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code elementAt} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param index
      *            the zero-based index of the item to retrieve
-     * @return a Maybe that emits a single item: the item at the specified position in the sequence of
-     *         those emitted by the source Publisher
+     * @return a {@code Maybe} that emits a single item: the item at the specified position in the sequence of
+     *         those emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
      */
     @CheckReturnValue
@@ -9517,13 +9515,13 @@ public final Maybe<T> elementAt(long index) {
     }
 
     /**
-     * Returns a Single that emits the item found at a specified index in a sequence of emissions from
-     * this Flowable, or a default item if that index is out of range.
+     * Returns a {@link Single} that emits the item found at a specified index in a sequence of emissions from
+     * this {@code Flowable}, or a default item if that index is out of range.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrDefault.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code elementAt} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -9532,8 +9530,8 @@ public final Maybe<T> elementAt(long index) {
      *            the zero-based index of the item to retrieve
      * @param defaultItem
      *            the default item
-     * @return a Single that emits the item at the specified position in the sequence emitted by the source
-     *         Publisher, or the default item if that index is outside the bounds of the source sequence
+     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the source
+     *         {@code Publisher}, or the default item if that index is outside the bounds of the source sequence
      * @throws IndexOutOfBoundsException
      *             if {@code index} is less than 0
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
@@ -9551,21 +9549,21 @@ public final Single<T> elementAt(long index, @NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Single that emits the item found at a specified index in a sequence of emissions from
-     * this Flowable or signals a {@link NoSuchElementException} if this Flowable has fewer elements than index.
+     * Returns a {@link Single} that emits the item found at a specified index in a sequence of emissions from
+     * this {@code Flowable} or signals a {@link NoSuchElementException} if this {@code Flowable} has fewer elements than index.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrDefault.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code elementAtOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param index
      *            the zero-based index of the item to retrieve
-     * @return a Single that emits the item at the specified position in the sequence emitted by the source
-     *         Publisher, or the default item if that index is outside the bounds of the source sequence
+     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the source
+     *         {@code Publisher}, or the default item if that index is outside the bounds of the source sequence
      * @throws IndexOutOfBoundsException
      *             if {@code index} is less than 0
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
@@ -9582,7 +9580,7 @@ public final Single<T> elementAtOrError(long index) {
     }
 
     /**
-     * Filters items emitted by a Publisher by only emitting those that satisfy a specified predicate.
+     * Filters items emitted by a {@link Publisher} by only emitting those that satisfy a specified predicate.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.png" alt="">
      * <dl>
@@ -9594,9 +9592,9 @@ public final Single<T> elementAtOrError(long index) {
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates each item emitted by the source Publisher, returning {@code true}
+     *            a function that evaluates each item emitted by the source {@code Publisher}, returning {@code true}
      *            if it passes the filter
-     * @return a Flowable that emits only those items emitted by the source Publisher that the filter
+     * @return a {@code Flowable} that emits only those items emitted by the source {@code Publisher} that the filter
      *         evaluates as {@code true}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
@@ -9610,18 +9608,18 @@ public final Flowable<T> filter(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns a Maybe that emits only the very first item emitted by this Flowable or
-     * completes if this Flowable is empty.
+     * Returns a {@link Maybe} that emits only the very first item emitted by this {@code Flowable} or
+     * completes if this {@code Flowable} is empty.
      * <p>
      * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstElement.m.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code firstElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -9633,21 +9631,21 @@ public final Maybe<T> firstElement() {
     }
 
     /**
-     * Returns a Single that emits only the very first item emitted by this Flowable, or a default
-     * item if this Flowable completes without emitting anything.
+     * Returns a {@link Single} that emits only the very first item emitted by this {@code Flowable}, or a default
+     * item if this {@code Flowable} completes without emitting anything.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code first} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param defaultItem
-     *            the default item to emit if the source Publisher doesn't emit anything
-     * @return a Single that emits only the very first item from the source, or a default item if the
-     *         source Publisher completes without emitting any items
+     *            the default item to emit if the source {@code Publisher} doesn't emit anything
+     * @return a {@code Single} that emits only the very first item from the source, or a default item if the
+     *         source {@code Publisher} completes without emitting any items
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -9659,18 +9657,18 @@ public final Single<T> first(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Single that emits only the very first item emitted by this Flowable or
-     * signals a {@link NoSuchElementException} if this Flowable is empty.
+     * Returns a {@link Single} that emits only the very first item emitted by this {@code Flowable} or
+     * signals a {@link NoSuchElementException} if this {@code Flowable} is empty.
      * <p>
      * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrError.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code firstOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -9682,27 +9680,27 @@ public final Single<T> firstOrError() {
     }
 
     /**
-     * Returns a Flowable that emits items based on applying a function that you supply to each item emitted
-     * by the source Publisher, where that function returns a Publisher, and then merging those resulting
-     * Publishers and emitting the results of this merger.
+     * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
+     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * {@code Publisher}s and emitting the results of this merger.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner Publishers and the output type
+     * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
-     * @return a Flowable that emits the result of applying the transformation function to each item emitted
-     *         by the source Publisher and merging the results of the Publishers obtained from this
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
+     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
+     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -9715,30 +9713,30 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a Flowable that emits items based on applying a function that you supply to each item emitted
-     * by the source Publisher, where that function returns a Publisher, and then merging those resulting
-     * Publishers and emitting the results of this merger.
+     * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
+     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * {@code Publisher}s and emitting the results of this merger.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner Publishers and the output type
+     * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
      * @param delayErrors
-     *            if true, exceptions from the current Flowable and all inner Publishers are delayed until all of them terminate
-     *            if false, the first one signaling an exception will terminate the whole sequence immediately
-     * @return a Flowable that emits the result of applying the transformation function to each item emitted
-     *         by the source Publisher and merging the results of the Publishers obtained from this
+     *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
+     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
+     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -9751,30 +9749,30 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a Flowable that emits items based on applying a function that you supply to each item emitted
-     * by the source Publisher, where that function returns a Publisher, and then merging those resulting
-     * Publishers and emitting the results of this merger, while limiting the maximum number of concurrent
-     * subscriptions to these Publishers.
+     * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
+     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * {@code Publisher}s and emitting the results of this merger, while limiting the maximum number of concurrent
+     * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner Publishers and the output type
+     * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
      * @param maxConcurrency
-     *         the maximum number of Publishers that may be subscribed to concurrently
-     * @return a Flowable that emits the result of applying the transformation function to each item emitted
-     *         by the source Publisher and merging the results of the Publishers obtained from this
+     *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
+     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
+     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
@@ -9788,33 +9786,33 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a Flowable that emits items based on applying a function that you supply to each item emitted
-     * by the source Publisher, where that function returns a Publisher, and then merging those resulting
-     * Publishers and emitting the results of this merger, while limiting the maximum number of concurrent
-     * subscriptions to these Publishers.
+     * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
+     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * {@code Publisher}s and emitting the results of this merger, while limiting the maximum number of concurrent
+     * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner Publishers and the output type
+     * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
      * @param maxConcurrency
-     *         the maximum number of Publishers that may be subscribed to concurrently
+     *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param delayErrors
-     *            if true, exceptions from the current Flowable and all inner Publishers are delayed until all of them terminate
-     *            if false, the first one signaling an exception will terminate the whole sequence immediately
-     * @return a Flowable that emits the result of applying the transformation function to each item emitted
-     *         by the source Publisher and merging the results of the Publishers obtained from this
+     *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
+     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
+     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
@@ -9828,35 +9826,35 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a Flowable that emits items based on applying a function that you supply to each item emitted
-     * by the source Publisher, where that function returns a Publisher, and then merging those resulting
-     * Publishers and emitting the results of this merger, while limiting the maximum number of concurrent
-     * subscriptions to these Publishers.
+     * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
+     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * {@code Publisher}s and emitting the results of this merger, while limiting the maximum number of concurrent
+     * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner Publishers and the output type
+     * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
      * @param maxConcurrency
-     *         the maximum number of Publishers that may be subscribed to concurrently
+     *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param delayErrors
-     *            if true, exceptions from the current Flowable and all inner Publishers are delayed until all of them terminate
-     *            if false, the first one signaling an exception will terminate the whole sequence immediately
+     *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @param bufferSize
-     *            the number of elements to prefetch from each inner Publisher
-     * @return a Flowable that emits the result of applying the transformation function to each item emitted
-     *         by the source Publisher and merging the results of the Publishers obtained from this
+     *            the number of elements to prefetch from each inner {@code Publisher}
+     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
+     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
@@ -9882,16 +9880,16 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a Flowable that applies a function to each item emitted or notification raised by the source
-     * Publisher and then flattens the Publishers returned from these functions and emits the resulting items.
+     * Returns a {@code Flowable} that applies a function to each item emitted or notification raised by the source
+     * {@link Publisher} and then flattens the {@code Publisher}s returned from these functions and emits the resulting items.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -9899,15 +9897,15 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * @param <R>
      *            the result type
      * @param onNextMapper
-     *            a function that returns a Publisher to merge for each item emitted by the source Publisher
+     *            a function that returns a {@code Publisher} to merge for each item emitted by the source {@code Publisher}
      * @param onErrorMapper
-     *            a function that returns a Publisher to merge for an onError notification from the source
-     *            Publisher
+     *            a function that returns a {@code Publisher} to merge for an {@code onError} notification from the source
+     *            {@code Publisher}
      * @param onCompleteSupplier
-     *            a function that returns a Publisher to merge for an onComplete notification from the source
-     *            Publisher
-     * @return a Flowable that emits the results of merging the Publishers returned from applying the
-     *         specified functions to the emissions and notifications of the source Publisher
+     *            a function that returns a {@code Publisher} to merge for an {@code onComplete} notification from the source
+     *            {@code Publisher}
+     * @return a {@code Flowable} that emits the results of merging the {@code Publisher}s returned from applying the
+     *         specified functions to the emissions and notifications of the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -9925,17 +9923,17 @@ public final <R> Flowable<R> flatMap(
     }
 
     /**
-     * Returns a Flowable that applies a function to each item emitted or notification raised by the source
-     * Publisher and then flattens the Publishers returned from these functions and emits the resulting items,
-     * while limiting the maximum number of concurrent subscriptions to these Publishers.
+     * Returns a {@code Flowable} that applies a function to each item emitted or notification raised by the source
+     * {@link Publisher} and then flattens the {@code Publisher}s returned from these functions and emits the resulting items,
+     * while limiting the maximum number of concurrent subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -9943,17 +9941,17 @@ public final <R> Flowable<R> flatMap(
      * @param <R>
      *            the result type
      * @param onNextMapper
-     *            a function that returns a Publisher to merge for each item emitted by the source Publisher
+     *            a function that returns a {@code Publisher} to merge for each item emitted by the source {@code Publisher}
      * @param onErrorMapper
-     *            a function that returns a Publisher to merge for an onError notification from the source
-     *            Publisher
+     *            a function that returns a {@code Publisher} to merge for an {@code onError} notification from the source
+     *            {@code Publisher}
      * @param onCompleteSupplier
-     *            a function that returns a Publisher to merge for an onComplete notification from the source
-     *            Publisher
+     *            a function that returns a {@code Publisher} to merge for an {@code onComplete} notification from the source
+     *            {@code Publisher}
      * @param maxConcurrency
-     *         the maximum number of Publishers that may be subscribed to concurrently
-     * @return a Flowable that emits the results of merging the Publishers returned from applying the
-     *         specified functions to the emissions and notifications of the source Publisher
+     *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
+     * @return a {@code Flowable} that emits the results of merging the {@code Publisher}s returned from applying the
+     *         specified functions to the emissions and notifications of the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -9974,31 +9972,31 @@ public final <R> Flowable<R> flatMap(
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified function to the pair of values emitted by the
-     * source Publisher and a specified collection Publisher.
+     * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
+     * source {@link Publisher} and a specified collection {@code Publisher}.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the inner Publishers
+     *            the type of items emitted by the inner {@code Publisher}s
      * @param <R>
      *            the type of items emitted by the combiner function
      * @param mapper
-     *            a function that returns a Publisher for each item emitted by the source Publisher
+     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
      * @param combiner
-     *            a function that combines one item emitted by each of the source and collection Publishers and
-     *            returns an item to be emitted by the resulting Publisher
-     * @return a Flowable that emits the results of applying a function to a pair of values emitted by the
-     *         source Publisher and the collection Publisher
+     *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
+     *            returns an item to be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
+     *         source {@code Publisher} and the collection {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10011,34 +10009,34 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified function to the pair of values emitted by the
-     * source Publisher and a specified collection Publisher.
+     * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
+     * source {@link Publisher} and a specified collection {@code Publisher}.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
      * <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the inner Publishers
+     *            the type of items emitted by the inner {@code Publisher}s
      * @param <R>
      *            the type of items emitted by the combiner functions
      * @param mapper
-     *            a function that returns a Publisher for each item emitted by the source Publisher
+     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
      * @param combiner
-     *            a function that combines one item emitted by each of the source and collection Publishers and
-     *            returns an item to be emitted by the resulting Publisher
+     *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
+     *            returns an item to be emitted by the resulting {@code Publisher}
      * @param delayErrors
-     *            if true, exceptions from the current Flowable and all inner Publishers are delayed until all of them terminate
-     *            if false, the first one signaling an exception will terminate the whole sequence immediately
-     * @return a Flowable that emits the results of applying a function to a pair of values emitted by the
-     *         source Publisher and the collection Publisher
+     *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
+     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
+     *         source {@code Publisher} and the collection {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10051,37 +10049,37 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified function to the pair of values emitted by the
-     * source Publisher and a specified collection Publisher, while limiting the maximum number of concurrent
-     * subscriptions to these Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
+     * source {@link Publisher} and a specified collection {@code Publisher}, while limiting the maximum number of concurrent
+     * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the inner Publishers
+     *            the type of items emitted by the inner {@code Publisher}s
      * @param <R>
      *            the type of items emitted by the combiner function
      * @param mapper
-     *            a function that returns a Publisher for each item emitted by the source Publisher
+     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
      * @param combiner
-     *            a function that combines one item emitted by each of the source and collection Publishers and
-     *            returns an item to be emitted by the resulting Publisher
+     *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
+     *            returns an item to be emitted by the resulting {@code Publisher}
      * @param maxConcurrency
-     *         the maximum number of Publishers that may be subscribed to concurrently
+     *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param delayErrors
-     *            if true, exceptions from the current Flowable and all inner Publishers are delayed until all of them terminate
-     *            if false, the first one signaling an exception will terminate the whole sequence immediately
-     * @return a Flowable that emits the results of applying a function to a pair of values emitted by the
-     *         source Publisher and the collection Publisher
+     *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
+     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
+     *         source {@code Publisher} and the collection {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -10095,39 +10093,39 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified function to the pair of values emitted by the
-     * source Publisher and a specified collection Publisher, while limiting the maximum number of concurrent
-     * subscriptions to these Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
+     * source {@link Publisher} and a specified collection {@code Publisher}, while limiting the maximum number of concurrent
+     * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@code maxConcurrency} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the inner Publishers
+     *            the type of items emitted by the inner {@code Publisher}s
      * @param <R>
      *            the type of items emitted by the combiner function
      * @param mapper
-     *            a function that returns a Publisher for each item emitted by the source Publisher
+     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
      * @param combiner
-     *            a function that combines one item emitted by each of the source and collection Publishers and
-     *            returns an item to be emitted by the resulting Publisher
+     *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
+     *            returns an item to be emitted by the resulting {@code Publisher}
      * @param maxConcurrency
-     *         the maximum number of Publishers that may be subscribed to concurrently
+     *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param delayErrors
-     *            if true, exceptions from the current Flowable and all inner Publishers are delayed until all of them terminate
-     *            if false, the first one signaling an exception will terminate the whole sequence immediately
+     *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @param bufferSize
-     *            the number of elements to prefetch from the inner Publishers.
-     * @return a Flowable that emits the results of applying a function to a pair of values emitted by the
-     *         source Publisher and the collection Publisher
+     *            the number of elements to prefetch from the inner {@code Publisher}s.
+     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
+     *         source {@code Publisher} and the collection {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -10145,34 +10143,34 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     }
 
     /**
-     * Returns a Flowable that emits the results of a specified function to the pair of values emitted by the
-     * source Publisher and a specified collection Publisher, while limiting the maximum number of concurrent
-     * subscriptions to these Publishers.
+     * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
+     * source {@link Publisher} and a specified collection {@code Publisher}, while limiting the maximum number of concurrent
+     * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The upstream Flowable is consumed
+     *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
      *  in a bounded manner (up to {@link #bufferSize()} outstanding request amount for items).
      *  The inner {@code Publisher}s are expected to honor backpressure; if violated,
-     *  the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the inner Publishers
+     *            the type of items emitted by the inner {@code Publisher}s
      * @param <R>
      *            the type of items emitted by the combiner function
      * @param mapper
-     *            a function that returns a Publisher for each item emitted by the source Publisher
+     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
      * @param combiner
-     *            a function that combines one item emitted by each of the source and collection Publishers and
-     *            returns an item to be emitted by the resulting Publisher
+     *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
+     *            returns an item to be emitted by the resulting {@code Publisher}
      * @param maxConcurrency
-     *         the maximum number of Publishers that may be subscribed to concurrently
-     * @return a Flowable that emits the results of applying a function to a pair of values emitted by the
-     *         source Publisher and the collection Publisher
+     *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
+     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
+     *         source {@code Publisher} and the collection {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -10186,16 +10184,16 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     }
 
     /**
-     * Maps each element of the upstream Flowable into CompletableSources, subscribes to them and
-     * waits until the upstream and all CompletableSources complete.
+     * Maps each element of the upstream {@code Flowable} into {@link CompletableSource}s, subscribes to them and
+     * waits until the upstream and all {@code CompletableSource}s complete.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the upstream in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param mapper the function that received each source value and transforms them into CompletableSources.
-     * @return the new Completable instance
+     * @param mapper the function that received each source value and transforms them into {@code CompletableSource}s.
+     * @return the new {@link Completable} instance
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -10206,8 +10204,8 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Maps each element of the upstream Flowable into CompletableSources, subscribes to them and
-     * waits until the upstream and all CompletableSources complete, optionally delaying all errors.
+     * Maps each element of the upstream {@code Flowable} into {@link CompletableSource}s, subscribes to them and
+     * waits until the upstream and all {@code CompletableSource}s complete, optionally delaying all errors.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>If {@code maxConcurrency == }{@link Integer#MAX_VALUE} the operator consumes the upstream in an unbounded manner.
@@ -10216,11 +10214,11 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param mapper the function that received each source value and transforms them into CompletableSources.
-     * @param delayErrors if true errors from the upstream and inner CompletableSources are delayed until each of them
+     * @param mapper the function that received each source value and transforms them into {@code CompletableSource}s.
+     * @param delayErrors if {@code true}, errors from the upstream and inner {@code CompletableSource}s are delayed until each of them
      * terminates.
-     * @param maxConcurrency the maximum number of active subscriptions to the CompletableSources.
-     * @return the new Completable instance
+     * @param maxConcurrency the maximum number of active subscriptions to the {@code CompletableSource}s.
+     * @return the new {@link Completable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -10233,26 +10231,26 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Returns a Flowable that merges each item emitted by the source Publisher with the values in an
-     * Iterable corresponding to that item that is generated by a selector.
+     * Returns a {@code Flowable} that merges each item emitted by the source {@link Publisher} with the values in an
+     * {@link Iterable} corresponding to that item that is generated by a selector.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting Iterable
+     *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source Publisher
-     * @return a Flowable that emits the results of merging the items emitted by the source Publisher with
-     *         the values in the Iterables corresponding to those items, as generated by {@code collectionSelector}
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code Publisher}
+     * @return a {@code Flowable} that emits the results of merging the items emitted by the source {@code Publisher} with
+     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10264,28 +10262,28 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
     }
 
     /**
-     * Returns a Flowable that merges each item emitted by the source Publisher with the values in an
-     * Iterable corresponding to that item that is generated by a selector.
+     * Returns a {@code Flowable} that merges each item emitted by the source {@link Publisher} with the values in an
+     * {@link Iterable} corresponding to that item that is generated by a selector.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting Iterable
+     *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source Publisher
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code Publisher}
      * @param bufferSize
-     *            the number of elements to prefetch from the current Flowable
-     * @return a Flowable that emits the results of merging the items emitted by the source Publisher with
-     *         the values in the Iterables corresponding to those items, as generated by {@code collectionSelector}
+     *            the number of elements to prefetch from the current {@code Flowable}
+     * @return a {@code Flowable} that emits the results of merging the items emitted by the source {@code Publisher} with
+     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10299,8 +10297,8 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
     }
 
     /**
-     * Returns a Flowable that emits the results of applying a function to the pair of values from the source
-     * Publisher and an Iterable corresponding to that item that is generated by a selector.
+     * Returns a {@code Flowable} that emits the results of applying a function to the pair of values from the source
+     * {@link Publisher} and an {@link Iterable} corresponding to that item that is generated by a selector.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.r.png" alt="">
      * <dl>
@@ -10314,15 +10312,15 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
      * @param <U>
      *            the collection element type
      * @param <V>
-     *            the type of item emitted by the resulting Iterable
+     *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for each item emitted by the source
-     *            Publisher
+     *            a function that returns an {@code Iterable} sequence of values for each item emitted by the source
+     *            {@code Publisher}
      * @param resultSelector
-     *            a function that returns an item based on the item emitted by the source Publisher and the
-     *            Iterable returned for that item by the {@code collectionSelector}
-     * @return a Flowable that emits the items returned by {@code resultSelector} for each item in the source
-     *         Publisher
+     *            a function that returns an item based on the item emitted by the source {@code Publisher} and the
+     *            {@code Iterable} returned for that item by the {@code collectionSelector}
+     * @return a {@code Flowable} that emits the items returned by {@code resultSelector} for each item in the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10337,34 +10335,34 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
     }
 
     /**
-     * Returns a Flowable that merges each item emitted by the source Publisher with the values in an
-     * Iterable corresponding to that item that is generated by a selector, while limiting the number of concurrent
-     * subscriptions to these Publishers.
+     * Returns a {@code Flowable} that merges each item emitted by the source {@link Publisher} with the values in an
+     * {@link Iterable} corresponding to that item that is generated by a selector, while limiting the number of concurrent
+     * subscriptions to these {@code Publisher}s.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.r.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
      *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the element type of the inner Iterable sequences
+     *            the element type of the inner {@code Iterable} sequences
      * @param <V>
-     *            the type of item emitted by the resulting Publisher
+     *            the type of item emitted by the resulting {@code Publisher}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source Publisher
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code Publisher}
      * @param resultSelector
-     *            a function that returns an item based on the item emitted by the source Publisher and the
-     *            Iterable returned for that item by the {@code collectionSelector}
+     *            a function that returns an item based on the item emitted by the source {@code Publisher} and the
+     *            {@code Iterable} returned for that item by the {@code collectionSelector}
      * @param prefetch
-     *            the number of elements to prefetch from the current Flowable
-     * @return a Flowable that emits the results of merging the items emitted by the source Publisher with
-     *         the values in the Iterables corresponding to those items, as generated by {@code collectionSelector}
+     *            the number of elements to prefetch from the current {@code Flowable}
+     * @return a {@code Flowable} that emits the results of merging the items emitted by the source {@code Publisher} with
+     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -10380,8 +10378,8 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
     }
 
     /**
-     * Maps each element of the upstream Flowable into MaybeSources, subscribes to all of them
-     * and merges their onSuccess values, in no particular order, into a single Flowable sequence.
+     * Maps each element of the upstream {@code Flowable} into {@link MaybeSource}s, subscribes to all of them
+     * and merges their {@code onSuccess} values, in no particular order, into a single {@code Flowable} sequence.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the upstream in an unbounded manner.</dd>
@@ -10389,8 +10387,8 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
      *  <dd>{@code flatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the result value type
-     * @param mapper the function that received each source value and transforms them into MaybeSources.
-     * @return the new Flowable instance
+     * @param mapper the function that received each source value and transforms them into {@code MaybeSource}s.
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -10401,9 +10399,9 @@ public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Maps each element of the upstream Flowable into MaybeSources, subscribes to at most
-     * {@code maxConcurrency} MaybeSources at a time and merges their onSuccess values,
-     * in no particular order, into a single Flowable sequence, optionally delaying all errors.
+     * Maps each element of the upstream {@code Flowable} into {@link MaybeSource}s, subscribes to at most
+     * {@code maxConcurrency} {@code MaybeSource}s at a time and merges their {@code onSuccess} values,
+     * in no particular order, into a single {@code Flowable} sequence, optionally delaying all errors.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>If {@code maxConcurrency == }{@link Integer#MAX_VALUE} the operator consumes the upstream in an unbounded manner.
@@ -10413,11 +10411,11 @@ public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends
      *  <dd>{@code flatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the result value type
-     * @param mapper the function that received each source value and transforms them into MaybeSources.
-     * @param delayErrors if true errors from the upstream and inner MaybeSources are delayed until each of them
+     * @param mapper the function that received each source value and transforms them into {@code MaybeSource}s.
+     * @param delayErrors if {@code true}, errors from the upstream and inner {@code MaybeSource}s are delayed until each of them
      * terminates.
-     * @param maxConcurrency the maximum number of active subscriptions to the MaybeSources.
-     * @return the new Flowable instance
+     * @param maxConcurrency the maximum number of active subscriptions to the {@code MaybeSource}s.
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -10430,8 +10428,8 @@ public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Maps each element of the upstream Flowable into SingleSources, subscribes to all of them
-     * and merges their onSuccess values, in no particular order, into a single Flowable sequence.
+     * Maps each element of the upstream {@code Flowable} into {@link SingleSource}s, subscribes to all of them
+     * and merges their {@code onSuccess} values, in no particular order, into a single {@code Flowable} sequence.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the upstream in an unbounded manner.</dd>
@@ -10439,8 +10437,8 @@ public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends
      *  <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the result value type
-     * @param mapper the function that received each source value and transforms them into SingleSources.
-     * @return the new Flowable instance
+     * @param mapper the function that received each source value and transforms them into {@code SingleSource}s.
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -10451,9 +10449,9 @@ public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extend
     }
 
     /**
-     * Maps each element of the upstream Flowable into SingleSources, subscribes to at most
-     * {@code maxConcurrency} SingleSources at a time and merges their onSuccess values,
-     * in no particular order, into a single Flowable sequence, optionally delaying all errors.
+     * Maps each element of the upstream {@code Flowable} into {@link SingleSource}s, subscribes to at most
+     * {@code maxConcurrency} {@code SingleSource}s at a time and merges their {@code onSuccess} values,
+     * in no particular order, into a single {@code Flowable} sequence, optionally delaying all errors.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>If {@code maxConcurrency == }{@link Integer#MAX_VALUE} the operator consumes the upstream in an unbounded manner.
@@ -10463,11 +10461,11 @@ public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extend
      *  <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the result value type
-     * @param mapper the function that received each source value and transforms them into SingleSources.
-     * @param delayErrors if true errors from the upstream and inner SingleSources are delayed until each of them
+     * @param mapper the function that received each source value and transforms them into {@code SingleSource}s.
+     * @param delayErrors if {@code true}, errors from the upstream and inner {@code SingleSources} are delayed until each of them
      * terminates.
-     * @param maxConcurrency the maximum number of active subscriptions to the SingleSources.
-     * @return the new Flowable instance
+     * @param maxConcurrency the maximum number of active subscriptions to the {@code SingleSource}s.
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -10494,9 +10492,9 @@ public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extend
      * @param onNext
      *            {@link Consumer} to execute for each item.
      * @return
-     *            a Disposable that allows canceling an asynchronous sequence
+     *            a {@link Disposable} that allows canceling an asynchronous sequence
      * @throws NullPointerException
-     *             if {@code onNext} is null
+     *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -10509,11 +10507,11 @@ public final Disposable forEach(@NonNull Consumer<? super T> onNext) {
 
     /**
      * Subscribes to the {@link Publisher} and receives notifications for each element until the
-     * onNext Predicate returns false.
+     * {@code onNext} Predicate returns {@code false}.
      * <p>
-     * If the Flowable emits an error, it is wrapped into an
+     * If the {@code Flowable} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
@@ -10527,7 +10525,7 @@ public final Disposable forEach(@NonNull Consumer<? super T> onNext) {
      * @return
      *            a {@link Disposable} that allows canceling an asynchronous sequence
      * @throws NullPointerException
-     *             if {@code onNext} is null
+     *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -10540,7 +10538,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext) {
 
     /**
      * Subscribes to the {@link Publisher} and receives notifications for each element and error events until the
-     * onNext Predicate returns false.
+     * {@code onNext} Predicate returns {@code false}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
@@ -10556,8 +10554,8 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext) {
      * @return
      *            a {@link Disposable} that allows canceling an asynchronous sequence
      * @throws NullPointerException
-     *             if {@code onNext} is null, or
-     *             if {@code onError} is null
+     *             if {@code onNext} is {@code null}, or
+     *             if {@code onError} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -10570,7 +10568,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
 
     /**
      * Subscribes to the {@link Publisher} and receives notifications for each element and the terminal events until the
-     * onNext Predicate returns false.
+     * {@code onNext} Predicate returns {@code false}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
@@ -10588,9 +10586,9 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      * @return
      *            a {@link Disposable} that allows canceling an asynchronous sequence
      * @throws NullPointerException
-     *             if {@code onNext} is null, or
-     *             if {@code onError} is null, or
-     *             if {@code onComplete} is null
+     *             if {@code onNext} is {@code null}, or
+     *             if {@code onError} is {@code null}, or
+     *             if {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -10609,20 +10607,20 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
     }
 
     /**
-     * Groups the items emitted by a {@code Publisher} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedPublisher} allows only a single
+     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedPublisher} emission.
+     * {@code GroupedFlowable} emission.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedFlowable} will cache the items it is to emit until such time as it
+     * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedPublisher}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedFlowable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
-     * Note that the {@link GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
+     * Note that the {@code GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
      * the unconsumed groups may starve other groups due to the internal backpressure
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
@@ -10652,8 +10650,8 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      *            a function that extracts the key for each item
      * @param <K>
      *            the key type
-     * @return a {@code Publisher} that emits {@link GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source Publisher that share that
+     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
      *         key value
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      * @see #groupBy(Function, boolean)
@@ -10668,20 +10666,20 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
     }
 
     /**
-     * Groups the items emitted by a {@code Publisher} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedPublisher} allows only a single
+     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedPublisher} emission.
+     * {@code GroupedFlowable} emission.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedFlowable} will cache the items it is to emit until such time as it
+     * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedPublisher}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedFlowable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
-     * Note that the {@link GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
+     * Note that the {@code GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
      * the unconsumed groups may starve other groups due to the internal backpressure
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
@@ -10712,10 +10710,10 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      * @param <K>
      *            the key type
      * @param delayError
-     *            if true, the exception from the current Flowable is delayed in each group until that specific group emitted
-     *            the normal values; if false, the exception bypasses values in the groups and is reported immediately.
-     * @return a {@code Publisher} that emits {@link GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source Publisher that share that
+     *            if {@code true}, the exception from the current {@code Flowable} is delayed in each group until that specific group emitted
+     *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
+     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
      *         key value
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
@@ -10728,20 +10726,20 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
     }
 
     /**
-     * Groups the items emitted by a {@code Publisher} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedPublisher} allows only a single
+     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedPublisher} emission.
+     * {@code GroupedFlowable} emission.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedFlowable} will cache the items it is to emit until such time as it
+     * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedPublisher}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedFlowable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
-     * Note that the {@link GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
+     * Note that the {@code GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
      * the unconsumed groups may starve other groups due to the internal backpressure
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
@@ -10775,8 +10773,8 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      *            the key type
      * @param <V>
      *            the element type
-     * @return a {@code Publisher} that emits {@link GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source Publisher that share that
+     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
      *         key value
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      * @see #groupBy(Function, Function, boolean)
@@ -10793,20 +10791,20 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     }
 
     /**
-     * Groups the items emitted by a {@code Publisher} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedPublisher} allows only a single
+     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedPublisher} emission.
+     * {@code GroupedFlowable} emission.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedFlowable} will cache the items it is to emit until such time as it
+     * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedPublisher}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedFlowable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
-     * Note that the {@link GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
+     * Note that the {@code GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
      * the unconsumed groups may starve other groups due to the internal backpressure
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
@@ -10841,10 +10839,10 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * @param <V>
      *            the element type
      * @param delayError
-     *            if true, the exception from the current Flowable is delayed in each group until that specific group emitted
-     *            the normal values; if false, the exception bypasses values in the groups and is reported immediately.
-     * @return a {@code Publisher} that emits {@link GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source Publisher that share that
+     *            if {@code true}, the exception from the current {@code Flowable} is delayed in each group until that specific group emitted
+     *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
+     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
      *         key value
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      * @see #groupBy(Function, Function, boolean, int)
@@ -10859,20 +10857,20 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     }
 
     /**
-     * Groups the items emitted by a {@code Publisher} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedPublisher} allows only a single
+     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedPublisher} emission.
+     * {@code GroupedFlowable} emission.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedFlowable} will cache the items it is to emit until such time as it
+     * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedPublisher}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedFlowable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
-     * Note that the {@link GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
+     * Note that the {@code GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
      * the unconsumed groups may starve other groups due to the internal backpressure
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
@@ -10903,16 +10901,16 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * @param valueSelector
      *            a function that extracts the return element for each item
      * @param delayError
-     *            if true, the exception from the current Flowable is delayed in each group until that specific group emitted
-     *            the normal values; if false, the exception bypasses values in the groups and is reported immediately.
+     *            if {@code true}, the exception from the current {@code Flowable} is delayed in each group until that specific group emitted
+     *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
      * @param bufferSize
-     *            the hint for how many {@link GroupedFlowable}s and element in each {@link GroupedFlowable} should be buffered
+     *            the hint for how many {@code GroupedFlowable}s and element in each {@code GroupedFlowable} should be buffered
      * @param <K>
      *            the key type
      * @param <V>
      *            the element type
-     * @return a {@code Publisher} that emits {@link GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source Publisher that share that
+     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
      *         key value
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
@@ -10931,20 +10929,20 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     }
 
     /**
-     * Groups the items emitted by a {@code Publisher} according to a specified criterion, and emits these
+     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
      * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedPublisher} emission. The {@code evictingMapFactory} is used to create a map that will
-     * be used to hold the {@link GroupedFlowable}s by key. The evicting map created by this factory must
+     * {@code GroupedFlowable} emission. The {@code evictingMapFactory} is used to create a map that will
+     * be used to hold the {@code GroupedFlowable}s by key. The evicting map created by this factory must
      * notify the provided {@code Consumer<Object>} with the entry value (not the key!) when an entry in this
      * map has been evicted. The next source emission will bring about the completion of the evicted
-     * {@link GroupedFlowable}s and the arrival of an item with the same key as a completed {@link GroupedFlowable}
-     * will prompt the creation and emission of a new {@link GroupedFlowable} with that key.
+     * {@code GroupedFlowable}s and the arrival of an item with the same key as a completed {@code GroupedFlowable}
+     * will prompt the creation and emission of a new {@code GroupedFlowable} with that key.
      *
      * <p>A use case for specifying an {@code evictingMapFactory} is where the source is infinite and fast and
      * over time the number of keys grows enough to be a concern in terms of the memory footprint of the
-     * internal hash map containing the {@link GroupedFlowable}s.
+     * internal hash map containing the {@code GroupedFlowable}s.
      *
      * <p>The map created by an {@code evictingMapFactory} must be thread-safe.
      *
@@ -10969,7 +10967,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      *
      * // Emit 1000 items but ensure that the
      * // internal map never has more than 3 items in it
-     * Flowable
+     * {@code Flowable}
      *   .range(1, 1000)
      *   // note that number of keys is 10
      *   .groupBy(x -&gt; x % 10, x -&gt; x, true, 16, evictingMapFactory)
@@ -10980,12 +10978,12 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedFlowable} will cache the items it is to emit until such time as it
+     * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
      * {@code GroupedFlowable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
-     * Note that the {@link GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
+     * Note that the {@code GroupedFlowable}s should be subscribed to as soon as possible, otherwise,
      * the unconsumed groups may starve other groups due to the internal backpressure
      * coordination of the {@code groupBy} operator. Such hangs can be usually avoided by using
      * {@link #flatMap(Function, int)} or {@link #concatMapEager(Function, int, int)} and overriding the default maximum concurrency
@@ -11016,22 +11014,22 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * @param valueSelector
      *            a function that extracts the return element for each item
      * @param delayError
-     *            if true, the exception from the current Flowable is delayed in each group until that specific group emitted
-     *            the normal values; if false, the exception bypasses values in the groups and is reported immediately.
+     *            if {@code true}, the exception from the current {@code Flowable} is delayed in each group until that specific group emitted
+     *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
      * @param bufferSize
-     *            the hint for how many {@link GroupedFlowable}s and element in each {@link GroupedFlowable} should be buffered
+     *            the hint for how many {@code GroupedFlowable}s and element in each {@code GroupedFlowable} should be buffered
      * @param evictingMapFactory
      *            The factory used to create a map that will be used by the implementation to hold the
-     *            {@link GroupedFlowable}s. The evicting map created by this factory must
+     *            {@code GroupedFlowable}s. The evicting map created by this factory must
      *            notify the provided {@code Consumer<Object>} with the entry value (not the key!) when
      *            an entry in this map has been evicted. The next source emission will bring about the
-     *            completion of the evicted {@link GroupedFlowable}s. See example above.
+     *            completion of the evicted {@code GroupedFlowable}s. See example above.
      * @param <K>
      *            the key type
      * @param <V>
      *            the element type
-     * @return a {@code Publisher} that emits {@link GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source Publisher that share that
+     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
      *         key value
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      *
@@ -11054,10 +11052,10 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     }
 
     /**
-     * Returns a Flowable that correlates two Publishers when they overlap in time and groups the results.
+     * Returns a {@code Flowable} that correlates two {@link Publisher}s when they overlap in time and groups the results.
      * <p>
      * There are no guarantees in what order the items get combined when multiple
-     * items from one or both source Publishers overlap.
+     * items from one or both source {@code Publisher}s overlap.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupJoin.png" alt="">
      * <dl>
@@ -11068,22 +11066,22 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      *  <dd>{@code groupJoin} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <TRight> the value type of the right Publisher source
-     * @param <TLeftEnd> the element type of the left duration Publishers
-     * @param <TRightEnd> the element type of the right duration Publishers
+     * @param <TRight> the value type of the right {@code Publisher} source
+     * @param <TLeftEnd> the element type of the left duration {@code Publisher}s
+     * @param <TRightEnd> the element type of the right duration {@code Publisher}s
      * @param <R> the result type
      * @param other
-     *            the other Publisher to correlate items from the source Publisher with
+     *            the other {@code Publisher} to correlate items from the source {@code Publisher} with
      * @param leftEnd
-     *            a function that returns a Publisher whose emissions indicate the duration of the values of
-     *            the source Publisher
+     *            a function that returns a {@code Publisher} whose emissions indicate the duration of the values of
+     *            the source {@code Publisher}
      * @param rightEnd
-     *            a function that returns a Publisher whose emissions indicate the duration of the values of
-     *            the {@code right} Publisher
+     *            a function that returns a {@code Publisher} whose emissions indicate the duration of the values of
+     *            the {@code right} {@code Publisher}
      * @param resultSelector
-     *            a function that takes an item emitted by each Publisher and returns the value to be emitted
-     *            by the resulting Publisher
-     * @return a Flowable that emits items based on combining those items emitted by the source Publishers
+     *            a function that takes an item emitted by each {@code Publisher} and returns the value to be emitted
+     *            by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits items based on combining those items emitted by the source {@code Publisher}s
      *         whose durations overlap
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
@@ -11105,7 +11103,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> groupJoin(
     }
 
     /**
-     * Hides the identity of this Flowable and its Subscription.
+     * Hides the identity of this {@code Flowable} and its {@link Subscription}.
      * <p>Allows hiding extra features such as {@link Processor}'s
      * {@link Subscriber} methods or preventing certain identity-based
      * optimizations (fusion).
@@ -11116,7 +11114,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> groupJoin(
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code hide} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      *
      * @since 2.0
      */
@@ -11129,7 +11127,7 @@ public final Flowable<T> hide() {
     }
 
     /**
-     * Ignores all items emitted by the source Publisher and only calls {@code onComplete} or {@code onError}.
+     * Ignores all items emitted by the source {@link Publisher} and only calls {@code onComplete} or {@code onError}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ignoreElements.png" alt="">
      * <dl>
@@ -11140,8 +11138,8 @@ public final Flowable<T> hide() {
      *  <dd>{@code ignoreElements} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Completable that only calls {@code onComplete} or {@code onError}, based on which one is
-     *         called by the source Publisher
+     * @return a {@link Completable} that only calls {@code onComplete} or {@code onError}, based on which one is
+     *         called by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/ignoreelements.html">ReactiveX operators documentation: IgnoreElements</a>
      */
     @CheckReturnValue
@@ -11153,9 +11151,9 @@ public final Completable ignoreElements() {
     }
 
     /**
-     * Returns a Single that emits {@code true} if the source Publisher is empty, otherwise {@code false}.
+     * Returns a {@link Single} that emits {@code true} if the source {@link Publisher} is empty, otherwise {@code false}.
      * <p>
-     * In Rx.Net this is negated as the {@code any} Subscriber but we renamed this in RxJava to better match Java
+     * In Rx.Net this is negated as the {@code any} {@link Subscriber} but we renamed this in RxJava to better match Java
      * naming idioms.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.png" alt="">
@@ -11167,7 +11165,7 @@ public final Completable ignoreElements() {
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that emits a Boolean
+     * @return a {@code Single} that emits a {@link Boolean}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -11179,10 +11177,10 @@ public final Single<Boolean> isEmpty() {
     }
 
     /**
-     * Correlates the items emitted by two Publishers based on overlapping durations.
+     * Correlates the items emitted by two {@link Publisher}s based on overlapping durations.
      * <p>
      * There are no guarantees in what order the items get combined when multiple
-     * items from one or both source Publishers overlap.
+     * items from one or both source {@code Publisher}s overlap.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/join_.png" alt="">
      * <dl>
@@ -11193,22 +11191,22 @@ public final Single<Boolean> isEmpty() {
      *  <dd>{@code join} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <TRight> the value type of the right Publisher source
-     * @param <TLeftEnd> the element type of the left duration Publishers
-     * @param <TRightEnd> the element type of the right duration Publishers
+     * @param <TRight> the value type of the right {@code Publisher} source
+     * @param <TLeftEnd> the element type of the left duration {@code Publisher}s
+     * @param <TRightEnd> the element type of the right duration {@code Publisher}s
      * @param <R> the result type
      * @param other
-     *            the second Publisher to join items from
+     *            the second {@code Publisher} to join items from
      * @param leftEnd
-     *            a function to select a duration for each item emitted by the source Publisher, used to
+     *            a function to select a duration for each item emitted by the source {@code Publisher}, used to
      *            determine overlap
      * @param rightEnd
-     *            a function to select a duration for each item emitted by the {@code right} Publisher, used to
+     *            a function to select a duration for each item emitted by the {@code right} {@code Publisher}, used to
      *            determine overlap
      * @param resultSelector
-     *            a function that computes an item to be emitted by the resulting Publisher for any two
-     *            overlapping items emitted by the two Publishers
-     * @return a Flowable that emits items correlating to items emitted by the source Publishers that have
+     *            a function that computes an item to be emitted by the resulting {@code Publisher} for any two
+     *            overlapping items emitted by the two {@code Publisher}s
+     * @return a {@code Flowable} that emits items correlating to items emitted by the source {@code Publisher}s that have
      *         overlapping durations
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
@@ -11230,19 +11228,19 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
     }
 
     /**
-     * Returns a Maybe that emits the last item emitted by this Flowable or completes if
-     * this Flowable is empty.
+     * Returns a {@link Maybe} that emits the last item emitted by this {@code Flowable} or completes if
+     * this {@code Flowable} is empty.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/last.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lastElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a new Maybe instance
+     * @return a new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
     @CheckReturnValue
@@ -11254,21 +11252,21 @@ public final Maybe<T> lastElement() {
     }
 
     /**
-     * Returns a Single that emits only the last item emitted by this Flowable, or a default item
-     * if this Flowable completes without emitting any items.
+     * Returns a {@link Single} that emits only the last item emitted by this {@code Flowable}, or a default item
+     * if this {@code Flowable} completes without emitting any items.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrDefault.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code last} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param defaultItem
-     *            the default item to emit if the source Publisher is empty
-     * @return the new Single instance
+     *            the default item to emit if the source {@code Publisher} is empty
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
     @CheckReturnValue
@@ -11281,19 +11279,19 @@ public final Single<T> last(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Single that emits only the last item emitted by this Flowable or signals
-     * a {@link NoSuchElementException} if this Flowable is empty.
+     * Returns a {@link Single} that emits only the last item emitted by this {@code Flowable} or signals
+     * a {@link NoSuchElementException} if this {@code Flowable} is empty.
      * <p>
      * <img width="640" height="236" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrError.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lastOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
     @CheckReturnValue
@@ -11309,7 +11307,7 @@ public final Single<T> lastOrError() {
      * other standard composition methods first;</strong>
      * Returns a {@code Flowable} which, when subscribed to, invokes the {@link FlowableOperator#apply(Subscriber) apply(Subscriber)} method
      * of the provided {@link FlowableOperator} for each individual downstream {@link Subscriber} and allows the
-     * insertion of a custom operator by accessing the downstream's {@link Subscriber} during this subscription phase
+     * insertion of a custom operator by accessing the downstream's {@code Subscriber} during this subscription phase
      * and providing a new {@code Subscriber}, containing the custom operator's intended business logic, that will be
      * used in the subscription process going further upstream.
      * <p>
@@ -11426,27 +11424,27 @@ public final Single<T> lastOrError() {
      * class and creating a {@link FlowableTransformer} with it is recommended.
      * <p>
      * Note also that it is not possible to stop the subscription phase in {@code lift()} as the {@code apply()} method
-     * requires a non-null {@code Subscriber} instance to be returned, which is then unconditionally subscribed to
+     * requires a non-{@code null} {@code Subscriber} instance to be returned, which is then unconditionally subscribed to
      * the upstream {@code Flowable}. For example, if the operator decided there is no reason to subscribe to the
      * upstream source because of some optimization possibility or a failure to prepare the operator, it still has to
-     * return a {@code Subscriber} that should immediately cancel the upstream's {@code Subscription} in its
+     * return a {@code Subscriber} that should immediately cancel the upstream's {@link Subscription} in its
      * {@code onSubscribe} method. Again, using a {@code FlowableTransformer} and extending the {@code Flowable} is
      * a better option as {@link #subscribeActual} can decide to not subscribe to its upstream after all.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The {@code Subscriber} instance returned by the {@link FlowableOperator} is responsible to be
-     *  backpressure-aware or document the fact that the consumer of the returned {@code Publisher} has to apply one of
+     *  <dd>The {@code Subscriber} instance returned by the {@code FlowableOperator} is responsible to be
+     *  backpressure-aware or document the fact that the consumer of the returned {@link Publisher} has to apply one of
      *  the {@code onBackpressureXXX} operators.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lift} does not operate by default on a particular {@link Scheduler}, however, the
-     *  {@link FlowableOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
+     *  {@code FlowableOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
      * </dl>
      *
      * @param <R> the output value type
-     * @param lifter the {@link FlowableOperator} that receives the downstream's {@code Subscriber} and should return
+     * @param lifter the {@code FlowableOperator} that receives the downstream's {@code Subscriber} and should return
      *               a {@code Subscriber} with custom behavior to be used as the consumer for the current
      *               {@code Flowable}.
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Writing-operators-for-2.0">RxJava wiki: Writing operators</a>
      * @see #compose(FlowableTransformer)
      */
@@ -11460,7 +11458,7 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
     }
 
     /**
-     * Returns a Flowable that applies a specified function to each item emitted by the source Publisher and
+     * Returns a {@code Flowable} that applies a specified function to each item emitted by the source {@link Publisher} and
      * emits the results of these function applications.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/map.png" alt="">
@@ -11474,8 +11472,8 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
      *
      * @param <R> the output type
      * @param mapper
-     *            a function to apply to each item emitted by the Publisher
-     * @return a Flowable that emits the items from the source Publisher, transformed by the specified
+     *            a function to apply to each item emitted by the {@code Publisher}
+     * @return a {@code Flowable} that emits the items from the source {@code Publisher}, transformed by the specified
      *         function
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      * @see #mapOptional(Function)
@@ -11490,20 +11488,20 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
     }
 
     /**
-     * Returns a Flowable that represents all of the emissions <em>and</em> notifications from the source
-     * Publisher into emissions marked with their original types within {@link Notification} objects.
+     * Returns a {@code Flowable} that represents all of the emissions <em>and</em> notifications from the source
+     * {@link Publisher} into emissions marked with their original types within {@link Notification} objects.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects it from the source {@code Publisher}.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that emits items that are the result of materializing the items and notifications
-     *         of the source Publisher
+     * @return a {@code Flowable} that emits items that are the result of materializing the items and notifications
+     *         of the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Materialize</a>
      * @see #dematerialize(Function)
      */
@@ -11516,23 +11514,23 @@ public final Flowable<Notification<T>> materialize() {
     }
 
     /**
-     * Flattens this and another Publisher into a single Publisher, without any transformation.
+     * Flattens this and another {@link Publisher} into a single {@code Publisher}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Publishers so that they appear as a single Publisher, by
+     * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code mergeWith} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. This and the other {@code Publisher}s are expected to honor
-     *  backpressure; if violated, the operator <em>may</em> signal {@code MissingBackpressureException}.</dd>
+     *  backpressure; if violated, the operator <em>may</em> signal {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param other
-     *            a Publisher to be merged
-     * @return a Flowable that emits all of the items emitted by the source Publishers
+     *            a {@code Publisher} to be merged
+     * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @CheckReturnValue
@@ -11545,7 +11543,7 @@ public final Flowable<T> mergeWith(@NonNull Publisher<? extends T> other) {
     }
 
     /**
-     * Merges the sequence of items of this Flowable with the success value of the other SingleSource.
+     * Merges the sequence of items of this {@code Flowable} with the success value of the other {@link SingleSource}.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
@@ -11560,7 +11558,7 @@ public final Flowable<T> mergeWith(@NonNull Publisher<? extends T> other) {
      * </dl>
      * <p>History: 2.1.10 - experimental
      * @param other the {@code SingleSource} whose success value to merge with
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -11573,8 +11571,8 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
     }
 
     /**
-     * Merges the sequence of items of this Flowable with the success value of the other MaybeSource
-     * or waits for both to complete normally if the MaybeSource is empty.
+     * Merges the sequence of items of this {@code Flowable} with the success value of the other {@link MaybeSource}
+     * or waits for both to complete normally if the {@code MaybeSource} is empty.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
@@ -11589,7 +11587,7 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
      * </dl>
      * <p>History: 2.1.10 - experimental
      * @param other the {@code MaybeSource} which provides a success value to merge with or completes
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -11602,20 +11600,20 @@ public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
     }
 
     /**
-     * Relays the items of this Flowable and completes only when the other CompletableSource completes
+     * Relays the items of this {@code Flowable} and completes only when the other {@link CompletableSource} completes
      * as well.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.10 - experimental
      * @param other the {@code CompletableSource} to await for completion
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -11628,22 +11626,22 @@ public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Modifies a Publisher to perform its emissions and notifications on a specified {@link Scheduler},
+     * Modifies a {@link Publisher} to perform its emissions and notifications on a specified {@link Scheduler},
      * asynchronously with a bounded buffer of {@link #bufferSize()} slots.
      *
-     * <p>Note that onError notifications will cut ahead of onNext notifications on the emission thread if Scheduler is truly
+     * <p>Note that {@code onError} notifications will cut ahead of {@code onNext} notifications on the emission thread if {@code Scheduler} is truly
      * asynchronous. If strict event ordering is required, consider using the {@link #observeOn(Scheduler, boolean)} overload.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
      * <p>
-     * This operator keeps emitting as many signals as it can on the given Scheduler's Worker thread,
+     * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s Worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
      * it does not allow per-signal fairness in case the worker runs on a shared underlying thread.
      * If such fairness and signal/work interleaving is preferred, use the delay operator with zero time instead.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator honors backpressure from downstream and expects it from the source {@code Publisher}. Violating this
-     *  expectation will lead to {@code MissingBackpressureException}. This is the most common operator where the exception
+     *  expectation will lead to {@link MissingBackpressureException}. This is the most common operator where the exception
      *  pops up; look for sources up the chain that don't support backpressure,
      *  such as {@link #interval(long, TimeUnit)}, {@link #timer(long, TimeUnit)},
      *  {@link io.reactivex.rxjava3.processors.PublishProcessor PublishProcessor} or
@@ -11656,13 +11654,13 @@ public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
      *  {@link #delay(long, TimeUnit, Scheduler)} with zero time instead.
      *  </dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to notify {@link Subscriber}s on
-     * @return the source Publisher modified so that its {@link Subscriber}s are notified on the specified
-     *         {@link Scheduler}
+     *            the {@code Scheduler} to notify {@link Subscriber}s on
+     * @return the source {@code Publisher} modified so that its {@code Subscriber}s are notified on the specified
+     *         {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -11679,19 +11677,19 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Modifies a Publisher to perform its emissions and notifications on a specified {@link Scheduler},
-     * asynchronously with a bounded buffer and optionally delays onError notifications.
+     * Modifies a {@link Publisher} to perform its emissions and notifications on a specified {@link Scheduler},
+     * asynchronously with a bounded buffer and optionally delays {@code onError} notifications.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
      * <p>
-     * This operator keeps emitting as many signals as it can on the given Scheduler's Worker thread,
+     * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s Worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
      * it does not allow per-signal fairness in case the worker runs on a shared underlying thread.
      * If such fairness and signal/work interleaving is preferred, use the delay operator with zero time instead.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator honors backpressure from downstream and expects it from the source {@code Publisher}. Violating this
-     *  expectation will lead to {@code MissingBackpressureException}. This is the most common operator where the exception
+     *  expectation will lead to {@link MissingBackpressureException}. This is the most common operator where the exception
      *  pops up; look for sources up the chain that don't support backpressure,
      *  such as {@link #interval(long, TimeUnit)}, {@link #timer(long, TimeUnit)},
      *  {@link io.reactivex.rxjava3.processors.PublishProcessor PublishProcessor} or
@@ -11704,17 +11702,17 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler) {
      *  {@link #delay(long, TimeUnit, Scheduler, boolean)} with zero time instead.
      *  </dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to notify {@link Subscriber}s on
+     *            the {@code Scheduler} to notify {@link Subscriber}s on
      * @param delayError
-     *            indicates if the onError notification may not cut ahead of onNext notification on the other side of the
-     *            scheduling boundary. If true a sequence ending in onError will be replayed in the same order as was received
+     *            indicates if the {@code onError} notification may not cut ahead of {@code onNext} notification on the other side of the
+     *            scheduling boundary. If {@code true} a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
-     * @return the source Publisher modified so that its {@link Subscriber}s are notified on the specified
-     *         {@link Scheduler}
+     * @return the source {@code Publisher} modified so that its {@code Subscriber}s are notified on the specified
+     *         {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -11731,19 +11729,19 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
     }
 
     /**
-     * Modifies a Publisher to perform its emissions and notifications on a specified {@link Scheduler},
-     * asynchronously with a bounded buffer of configurable size and optionally delays onError notifications.
+     * Modifies a {@link Publisher} to perform its emissions and notifications on a specified {@link Scheduler},
+     * asynchronously with a bounded buffer of configurable size and optionally delays {@code onError} notifications.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
      * <p>
-     * This operator keeps emitting as many signals as it can on the given Scheduler's Worker thread,
+     * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s Worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
      * it does not allow per-signal fairness in case the worker runs on a shared underlying thread.
      * If such fairness and signal/work interleaving is preferred, use the delay operator with zero time instead.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator honors backpressure from downstream and expects it from the source {@code Publisher}. Violating this
-     *  expectation will lead to {@code MissingBackpressureException}. This is the most common operator where the exception
+     *  expectation will lead to {@link MissingBackpressureException}. This is the most common operator where the exception
      *  pops up; look for sources up the chain that don't support backpressure,
      *  such as {@link #interval(long, TimeUnit)}, {@link #timer(long, TimeUnit)},
      *  {@link io.reactivex.rxjava3.processors.PublishProcessor PublishProcessor} or
@@ -11756,18 +11754,18 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      *  {@link #delay(long, TimeUnit, Scheduler, boolean)} with zero time instead.
      *  </dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to notify {@link Subscriber}s on
+     *            the {@code Scheduler} to notify {@link Subscriber}s on
      * @param delayError
-     *            indicates if the onError notification may not cut ahead of onNext notification on the other side of the
-     *            scheduling boundary. If true a sequence ending in onError will be replayed in the same order as was received
+     *            indicates if the {@code onError} notification may not cut ahead of {@code onNext} notification on the other side of the
+     *            scheduling boundary. If {@code true} a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
      * @param bufferSize the size of the buffer.
-     * @return the source Publisher modified so that its {@link Subscriber}s are notified on the specified
-     *         {@link Scheduler}
+     * @return the source {@code Publisher} modified so that its {@code Subscriber}s are notified on the specified
+     *         {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -11786,7 +11784,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
     }
 
     /**
-     * Filters the items emitted by a Publisher, only emitting those of the specified type.
+     * Filters the items emitted by a {@link Publisher}, only emitting those of the specified type.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.png" alt="">
      * <dl>
@@ -11799,8 +11797,8 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      *
      * @param <U> the output type
      * @param clazz
-     *            the class type to filter the items emitted by the source Publisher
-     * @return a Flowable that emits items from the source Publisher of type {@code clazz}
+     *            the class type to filter the items emitted by the source {@code Publisher}
+     * @return a {@code Flowable} that emits items from the source {@code Publisher} of type {@code clazz}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
     @CheckReturnValue
@@ -11813,7 +11811,7 @@ public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to buffer these
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer these
      * items indefinitely until they can be emitted.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
@@ -11825,7 +11823,7 @@ public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source Publisher modified to buffer items to the extent system resources allow
+     * @return the source {@code Publisher} modified to buffer items to the extent system resources allow
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      */
     @CheckReturnValue
@@ -11837,7 +11835,7 @@ public final Flowable<T> onBackpressureBuffer() {
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to buffer these
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer these
      * items indefinitely until they can be emitted.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
@@ -11849,10 +11847,10 @@ public final Flowable<T> onBackpressureBuffer() {
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param delayError
-     *                if true, an exception from the current Flowable is delayed until all buffered elements have been
-     *                consumed by the downstream; if false, an exception is immediately signaled to the downstream, skipping
+     *                if {@code true}, an exception from the current {@code Flowable} is delayed until all buffered elements have been
+     *                consumed by the downstream; if {@code false}, an exception is immediately signaled to the downstream, skipping
      *                any buffered element
-     * @return the source Publisher modified to buffer items to the extent system resources allow
+     * @return the source {@code Publisher} modified to buffer items to the extent system resources allow
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      */
     @CheckReturnValue
@@ -11864,8 +11862,8 @@ public final Flowable<T> onBackpressureBuffer(boolean delayError) {
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting Publisher will signal
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
+     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, and canceling the source.
      * <p>
@@ -11892,8 +11890,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity) {
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting Publisher will signal
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
+     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, and canceling the source.
      * <p>
@@ -11908,8 +11906,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity) {
      *
      * @param capacity number of slots available in the buffer.
      * @param delayError
-     *                if true, an exception from the current Flowable is delayed until all buffered elements have been
-     *                consumed by the downstream; if false, an exception is immediately signaled to the downstream, skipping
+     *                if {@code true}, an exception from the current {@code Flowable} is delayed until all buffered elements have been
+     *                consumed by the downstream; if {@code false}, an exception is immediately signaled to the downstream, skipping
      *                any buffered element
      * @return the source {@code Publisher} modified to buffer items up to the given capacity.
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
@@ -11924,8 +11922,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting Publisher will signal
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
+     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, and canceling the source.
      * <p>
@@ -11940,11 +11938,11 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
      *
      * @param capacity number of slots available in the buffer.
      * @param delayError
-     *                if true, an exception from the current Flowable is delayed until all buffered elements have been
-     *                consumed by the downstream; if false, an exception is immediately signaled to the downstream, skipping
+     *                if {@code true}, an exception from the current {@code Flowable} is delayed until all buffered elements have been
+     *                consumed by the downstream; if {@code false}, an exception is immediately signaled to the downstream, skipping
      *                any buffered element
      * @param unbounded
-     *                if true, the capacity value is interpreted as the internal "island" size of the unbounded buffer
+     *                if {@code true}, the capacity value is interpreted as the internal "island" size of the unbounded buffer
      * @return the source {@code Publisher} modified to buffer items up to the given capacity.
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
@@ -11959,8 +11957,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting Publisher will signal
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
+     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, canceling the source, and notifying the producer with {@code onOverflow}.
      * <p>
@@ -11975,11 +11973,11 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
      *
      * @param capacity number of slots available in the buffer.
      * @param delayError
-     *                if true, an exception from the current Flowable is delayed until all buffered elements have been
-     *                consumed by the downstream; if false, an exception is immediately signaled to the downstream, skipping
+     *                if {@code true}, an exception from the current {@code Flowable} is delayed until all buffered elements have been
+     *                consumed by the downstream; if {@code false}, an exception is immediately signaled to the downstream, skipping
      *                any buffered element
      * @param unbounded
-     *                if true, the capacity value is interpreted as the internal "island" size of the unbounded buffer
+     *                if {@code true}, the capacity value is interpreted as the internal "island" size of the unbounded buffer
      * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots.  Null is allowed.
      * @return the source {@code Publisher} modified to buffer items up to the given capacity
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
@@ -11997,8 +11995,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting Publisher will signal
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
+     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, canceling the source, and notifying the producer with {@code onOverflow}.
      * <p>
@@ -12026,8 +12024,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting Publisher will behave as determined
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
+     * a given amount of items until they can be emitted. The resulting {@code Publisher} will behave as determined
      * by {@code overflowStrategy} if the buffer capacity is exceeded.
      *
      * <ul>
@@ -12069,13 +12067,13 @@ public final Flowable<T> onBackpressureBuffer(long capacity, @NonNull Action onO
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to discard,
-     * rather than emit, those items that its Subscriber is not prepared to observe.
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to discard,
+     * rather than emit, those items that its {@code Subscriber} is not prepared to observe.
      * <p>
      * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.drop.png" alt="">
      * <p>
-     * If the downstream request count hits 0 then the Publisher will refrain from calling {@code onNext} until
-     * the Subscriber invokes {@code request(n)} again to increase the request count.
+     * If the downstream request count hits 0 then the {@code Publisher} will refrain from calling {@code onNext} until
+     * the {@code Subscriber} invokes {@code request(n)} again to increase the request count.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
@@ -12084,7 +12082,7 @@ public final Flowable<T> onBackpressureBuffer(long capacity, @NonNull Action onO
      *  <dd>{@code onBackpressureDrop} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source Publisher modified to drop {@code onNext} notifications on overflow
+     * @return the source {@code Publisher} modified to drop {@code onNext} notifications on overflow
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      */
     @CheckReturnValue
@@ -12096,13 +12094,13 @@ public final Flowable<T> onBackpressureDrop() {
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to discard,
-     * rather than emit, those items that its Subscriber is not prepared to observe.
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to discard,
+     * rather than emit, those items that its {@code Subscriber} is not prepared to observe.
      * <p>
      * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.drop.png" alt="">
      * <p>
-     * If the downstream request count hits 0 then the Publisher will refrain from calling {@code onNext} until
-     * the Subscriber invokes {@code request(n)} again to increase the request count.
+     * If the downstream request count hits 0 then the {@code Publisher} will refrain from calling {@code onNext} until
+     * the {@code Subscriber} invokes {@code request(n)} again to increase the request count.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
@@ -12111,8 +12109,8 @@ public final Flowable<T> onBackpressureDrop() {
      *  <dd>{@code onBackpressureDrop} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param onDrop the action to invoke for each item dropped. onDrop action should be fast and should never block.
-     * @return the source Publisher modified to drop {@code onNext} notifications on overflow
+     * @param onDrop the action to invoke for each item dropped, should be fast and should never block.
+     * @return the source {@code Publisher} modified to drop {@code onNext} notifications on overflow
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
      */
@@ -12126,7 +12124,7 @@ public final Flowable<T> onBackpressureDrop(@NonNull Consumer<? super T> onDrop)
     }
 
     /**
-     * Instructs a Publisher that is emitting items faster than its Subscriber can consume them to
+     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to
      * hold onto the latest value and emit that on request.
      * <p>
      * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.latest.png" alt="">
@@ -12134,11 +12132,11 @@ public final Flowable<T> onBackpressureDrop(@NonNull Consumer<? super T> onDrop)
      * Its behavior is logically equivalent to {@code blockingLatest()} with the exception that
      * the downstream is not blocking while requesting more values.
      * <p>
-     * Note that if the upstream Publisher does support backpressure, this operator ignores that capability
+     * Note that if the upstream {@code Publisher} does support backpressure, this operator ignores that capability
      * and doesn't propagate any backpressure requests from downstream.
      * <p>
      * Note that due to the nature of how backpressure requests are propagated through subscribeOn/observeOn,
-     * requesting more than 1 from downstream doesn't guarantee a continuous delivery of onNext events.
+     * requesting more than 1 from downstream doesn't guarantee a continuous delivery of {@code onNext} events.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
@@ -12147,7 +12145,7 @@ public final Flowable<T> onBackpressureDrop(@NonNull Consumer<? super T> onDrop)
      *  <dd>{@code onBackpressureLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source Publisher modified so that it emits the most recently-received item upon request
+     * @return the source {@code Publisher} modified so that it emits the most recently-received item upon request
      * @since 1.1.0
      */
     @CheckReturnValue
@@ -12159,19 +12157,19 @@ public final Flowable<T> onBackpressureLatest() {
     }
 
     /**
-     * Instructs a Publisher to pass control to another Publisher rather than invoking
+     * Instructs a {@link Publisher} to pass control to another {@code Publisher} rather than invoking
      * {@link Subscriber#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
-     * By default, when a Publisher encounters an error that prevents it from emitting the expected item to
-     * its {@link Subscriber}, the Publisher invokes its Subscriber's {@code onError} method, and then quits
-     * without invoking any more of its Subscriber's methods. The {@code onErrorResumeNext} method changes this
-     * behavior. If you pass a function that returns a Publisher ({@code resumeFunction}) to
-     * {@code onErrorResumeNext}, if the original Publisher encounters an error, instead of invoking its
-     * Subscriber's {@code onError} method, it will instead relinquish control to the Publisher returned from
-     * {@code resumeFunction}, which will invoke the Subscriber's {@link Subscriber#onNext onNext} method if it is
-     * able to do so. In such a case, because no Publisher necessarily invokes {@code onError}, the Subscriber
+     * By default, when a {@code Publisher} encounters an error that prevents it from emitting the expected item to
+     * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code Subscriber}'s methods. The {@code onErrorResumeNext} method changes this
+     * behavior. If you pass a function that returns a {@code Publisher} ({@code resumeFunction}) to
+     * {@code onErrorResumeNext}, if the original {@code Publisher} encounters an error, instead of invoking its
+     * {@code Subscriber}'s {@code onError} method, it will instead relinquish control to the {@code Publisher} returned from
+     * {@code resumeFunction}, which will invoke the {@code Subscriber}'s {@link Subscriber#onNext onNext} method if it is
+     * able to do so. In such a case, because no {@code Publisher} necessarily invokes {@code onError}, the {@code Subscriber}
      * may never know that an error happened.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -12181,16 +12179,16 @@ public final Flowable<T> onBackpressureLatest() {
      *  <dd>The operator honors backpressure from downstream. This and the resuming {@code Publisher}s
      *  are expected to honor backpressure as well.
      *  If any of them violate this expectation, the operator <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes or
-     *  a {@code MissingBackpressureException} is signaled somewhere downstream.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes or
+     *  a {@link MissingBackpressureException} is signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param resumeFunction
-     *            a function that returns a Publisher that will take over if the source Publisher encounters
+     *            a function that returns a {@code Publisher} that will take over if the source {@code Publisher} encounters
      *            an error
-     * @return the original Publisher, with appropriately modified behavior
+     * @return the original {@code Publisher}, with appropriately modified behavior
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -12203,19 +12201,19 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
     }
 
     /**
-     * Instructs a Publisher to pass control to another Publisher rather than invoking
+     * Instructs a {@link Publisher} to pass control to another {@code Publisher} rather than invoking
      * {@link Subscriber#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
-     * By default, when a Publisher encounters an error that prevents it from emitting the expected item to
-     * its {@link Subscriber}, the Publisher invokes its Subscriber's {@code onError} method, and then quits
-     * without invoking any more of its Subscriber's methods. The {@code onErrorResumeWith} method changes this
-     * behavior. If you pass another Publisher ({@code resumeSequence}) to a Publisher's
-     * {@code onErrorResumeWith} method, if the original Publisher encounters an error, instead of invoking its
-     * Subscriber's {@code onError} method, it will instead relinquish control to {@code resumeSequence} which
-     * will invoke the Subscriber's {@link Subscriber#onNext onNext} method if it is able to do so. In such a case,
-     * because no Publisher necessarily invokes {@code onError}, the Subscriber may never know that an error
+     * By default, when a {@code Publisher} encounters an error that prevents it from emitting the expected item to
+     * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code Subscriber}'s methods. The {@code onErrorResumeWith} method changes this
+     * behavior. If you pass another {@code Publisher} ({@code resumeSequence}) to a {@code Publisher}'s
+     * {@code onErrorResumeWith} method, if the original {@code Publisher} encounters an error, instead of invoking its
+     * {@code Subscriber}'s {@code onError} method, it will instead relinquish control to {@code resumeSequence} which
+     * will invoke the {@code Subscriber}'s {@link Subscriber#onNext onNext} method if it is able to do so. In such a case,
+     * because no {@code Publisher} necessarily invokes {@code onError}, the {@code Subscriber} may never know that an error
      * happened.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -12225,16 +12223,16 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
      *  <dd>The operator honors backpressure from downstream. This and the resuming {@code Publisher}s
      *  are expected to honor backpressure as well.
      *  If any of them violate this expectation, the operator <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes or
-     *  {@code MissingBackpressureException} is signaled somewhere downstream.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes or
+     *  {@link MissingBackpressureException} is signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorResumeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param next
-     *            the next Publisher source that will take over if the source Publisher encounters
+     *            the next {@code Publisher} source that will take over if the source {@code Publisher} encounters
      *            an error
-     * @return the original Publisher, with appropriately modified behavior
+     * @return the original {@code Publisher}, with appropriately modified behavior
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -12247,16 +12245,16 @@ public final Flowable<T> onErrorResumeWith(@NonNull Publisher<? extends T> next)
     }
 
     /**
-     * Instructs a Publisher to emit an item (returned by a specified function) rather than invoking
+     * Instructs a {@link Publisher} to emit an item (returned by a specified function) rather than invoking
      * {@link Subscriber#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
      * <p>
-     * By default, when a Publisher encounters an error that prevents it from emitting the expected item to
-     * its {@link Subscriber}, the Publisher invokes its Subscriber's {@code onError} method, and then quits
-     * without invoking any more of its Subscriber's methods. The {@code onErrorReturn} method changes this
-     * behavior. If you pass a function ({@code resumeFunction}) to a Publisher's {@code onErrorReturn}
-     * method, if the original Publisher encounters an error, instead of invoking its Subscriber's
+     * By default, when a {@code Publisher} encounters an error that prevents it from emitting the expected item to
+     * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code Subscriber}'s methods. The {@code onErrorReturn} method changes this
+     * behavior. If you pass a function ({@code resumeFunction}) to a {@code Publisher}'s {@code onErrorReturn}
+     * method, if the original {@code Publisher} encounters an error, instead of invoking its {@code Subscriber}'s
      * {@code onError} method, it will instead emit the return value of {@code resumeFunction}.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -12265,16 +12263,16 @@ public final Flowable<T> onErrorResumeWith(@NonNull Publisher<? extends T> next)
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is expected to honor
      *  backpressure as well. If it this expectation is violated, the operator <em>may</em> throw
-     *  {@code IllegalStateException} when the source {@code Publisher} completes or
-     *  {@code MissingBackpressureException} is signaled somewhere downstream.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes or
+     *  {@link MissingBackpressureException} is signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorReturn} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param valueSupplier
-     *            a function that returns a single value that will be emitted along with a regular onComplete in case
-     *            the current Flowable signals an onError event
-     * @return the original Publisher with appropriately modified behavior
+     *            a function that returns a single value that will be emitted along with a regular {@code onComplete} in case
+     *            the current {@code Flowable} signals an {@code onError} event
+     * @return the original {@code Publisher} with appropriately modified behavior
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -12287,16 +12285,16 @@ public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? ex
     }
 
     /**
-     * Instructs a Publisher to emit an item (returned by a specified function) rather than invoking
+     * Instructs a {@link Publisher} to emit an item (returned by a specified function) rather than invoking
      * {@link Subscriber#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
      * <p>
-     * By default, when a Publisher encounters an error that prevents it from emitting the expected item to
-     * its {@link Subscriber}, the Publisher invokes its Subscriber's {@code onError} method, and then quits
-     * without invoking any more of its Subscriber's methods. The {@code onErrorReturn} method changes this
-     * behavior. If you pass a function ({@code resumeFunction}) to a Publisher's {@code onErrorReturn}
-     * method, if the original Publisher encounters an error, instead of invoking its Subscriber's
+     * By default, when a {@code Publisher} encounters an error that prevents it from emitting the expected item to
+     * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code Subscriber}'s methods. The {@code onErrorReturn} method changes this
+     * behavior. If you pass a function ({@code resumeFunction}) to a {@code Publisher}'s {@code onErrorReturn}
+     * method, if the original {@code Publisher} encounters an error, instead of invoking its {@code Subscriber}'s
      * {@code onError} method, it will instead emit the return value of {@code resumeFunction}.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -12305,16 +12303,16 @@ public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? ex
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is expected to honor
      *  backpressure as well. If it this expectation is violated, the operator <em>may</em> throw
-     *  {@code IllegalStateException} when the source {@code Publisher} completes or
-     *  {@code MissingBackpressureException} is signaled somewhere downstream.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes or
+     *  {@link MissingBackpressureException} is signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorReturnItem} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param item
-     *            the value that is emitted along with a regular onComplete in case the current
-     *            Flowable signals an exception
-     * @return the original Publisher with appropriately modified behavior
+     *            the value that is emitted along with a regular {@code onComplete} in case the current
+     *            {@code Flowable} signals an exception
+     * @return the original {@code Publisher} with appropriately modified behavior
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -12327,16 +12325,16 @@ public final Flowable<T> onErrorReturnItem(@NonNull T item) {
     }
 
     /**
-     * Nulls out references to the upstream producer and downstream Subscriber if
+     * Nulls out references to the upstream producer and downstream {@link Subscriber} if
      * the sequence is terminated or downstream cancels.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a Flowable which nulls out references to the upstream producer and downstream Subscriber if
+     * @return a {@code Flowable} which {@code null}s out references to the upstream producer and downstream {@code Subscriber} if
      * the sequence is terminated or downstream cancels
      * @since 2.0
      */
@@ -12353,7 +12351,7 @@ public final Flowable<T> onTerminateDetach() {
      * and dispatches the upstream items to them in a round-robin fashion.
      * <p>
      * Note that the rails don't execute in parallel on their own and one needs to
-     * apply {@link ParallelFlowable#runOn(Scheduler)} to specify the Scheduler where
+     * apply {@link ParallelFlowable#runOn(Scheduler)} to specify the {@link Scheduler} where
      * each rail will execute.
      * <p>
      * To merge the parallel 'rails' back into a single sequence, use {@link ParallelFlowable#sequential()}.
@@ -12364,10 +12362,10 @@ public final Flowable<T> onTerminateDetach() {
      *  <dd>The operator requires the upstream to honor backpressure and each 'rail' honors backpressure
      *  as well.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code parallel} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code parallel} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.5 - experimental; 2.1 - beta
-     * @return the new ParallelFlowable instance
+     * @return the new {@link ParallelFlowable} instance
      * @since 2.2
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -12383,7 +12381,7 @@ public final ParallelFlowable<T> parallel() {
      * and dispatches the upstream items to them in a round-robin fashion.
      * <p>
      * Note that the rails don't execute in parallel on their own and one needs to
-     * apply {@link ParallelFlowable#runOn(Scheduler)} to specify the Scheduler where
+     * apply {@link ParallelFlowable#runOn(Scheduler)} to specify the {@link Scheduler} where
      * each rail will execute.
      * <p>
      * To merge the parallel 'rails' back into a single sequence, use {@link ParallelFlowable#sequential()}.
@@ -12394,11 +12392,11 @@ public final ParallelFlowable<T> parallel() {
      *  <dd>The operator requires the upstream to honor backpressure and each 'rail' honors backpressure
      *  as well.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code parallel} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code parallel} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.5 - experimental; 2.1 - beta
      * @param parallelism the number of 'rails' to use
-     * @return the new ParallelFlowable instance
+     * @return the new {@link ParallelFlowable} instance
      * @since 2.2
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -12416,7 +12414,7 @@ public final ParallelFlowable<T> parallel(int parallelism) {
      * uses the defined per-'rail' prefetch amount.
      * <p>
      * Note that the rails don't execute in parallel on their own and one needs to
-     * apply {@link ParallelFlowable#runOn(Scheduler)} to specify the Scheduler where
+     * apply {@link ParallelFlowable#runOn(Scheduler)} to specify the {@link Scheduler} where
      * each rail will execute.
      * <p>
      * To merge the parallel 'rails' back into a single sequence, use {@link ParallelFlowable#sequential()}.
@@ -12427,12 +12425,12 @@ public final ParallelFlowable<T> parallel(int parallelism) {
      *  <dd>The operator requires the upstream to honor backpressure and each 'rail' honors backpressure
      *  as well.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code parallel} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code parallel} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.5 - experimental; 2.1 - beta
      * @param parallelism the number of 'rails' to use
      * @param prefetch the number of items each 'rail' should prefetch
-     * @return the new ParallelFlowable instance
+     * @return the new {@link ParallelFlowable} instance
      * @since 2.2
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -12446,7 +12444,7 @@ public final ParallelFlowable<T> parallel(int parallelism, int prefetch) {
     }
 
     /**
-     * Returns a {@link ConnectableFlowable}, which is a variety of Publisher that waits until its
+     * Returns a {@link ConnectableFlowable}, which is a variety of {@link Publisher} that waits until its
      * {@link ConnectableFlowable#connect connect} method is called before it begins emitting items to those
      * {@link Subscriber}s that have subscribed to it.
      * <p>
@@ -12455,13 +12453,13 @@ public final ParallelFlowable<T> parallel(int parallelism, int prefetch) {
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code ConnectableFlowable} honors backpressure for each of its {@code Subscriber}s
      *  and expects the source {@code Publisher} to honor backpressure as well. If this expectation is violated,
-     *  the operator will signal a {@code MissingBackpressureException} to its {@code Subscriber}s and disconnect.</dd>
+     *  the operator will signal a {@link MissingBackpressureException} to its {@code Subscriber}s and disconnect.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link ConnectableFlowable} that upon connection causes the source Publisher to emit items
-     *         to its {@link Subscriber}s
+     * @return a {@code ConnectableFlowable} that upon connection causes the source {@code Publisher} to emit items
+     *         to its {@code Subscriber}s
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -12473,14 +12471,14 @@ public final ConnectableFlowable<T> publish() {
     }
 
     /**
-     * Returns a Flowable that emits the results of invoking a specified selector on items emitted by a
+     * Returns a {@code Flowable} that emits the results of invoking a specified selector on items emitted by a
      * {@link ConnectableFlowable} that shares a single subscription to the underlying sequence.
      * <p>
      * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator expects the source {@code Publisher} to honor backpressure and if this expectation is
-     *  violated, the operator will signal a {@code MissingBackpressureException} through the {@code Publisher}
+     *  <dd>The operator expects the source {@link Publisher} to honor backpressure and if this expectation is
+     *  violated, the operator will signal a {@link MissingBackpressureException} through the {@code Publisher}
      *  provided to the function. Since the {@code Publisher} returned by the {@code selector} may be
      *  independent of the provided {@code Publisher} to the function, the output's backpressure behavior
      *  is determined by this returned {@code Publisher}.</dd>
@@ -12489,12 +12487,12 @@ public final ConnectableFlowable<T> publish() {
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            a function that can use the multicasted source sequence as many times as needed, without
-     *            causing multiple subscriptions to the source sequence. Subscribers to the given source will
+     *            causing multiple subscriptions to the source sequence. {@link Subscriber}s to the given source will
      *            receive all notifications of the source from the time of the subscription forward.
-     * @return a Flowable that emits the results of invoking the selector on the items emitted by a {@link ConnectableFlowable} that shares a single subscription to the underlying sequence
+     * @return a {@code Flowable} that emits the results of invoking the selector on the items emitted by a {@code ConnectableFlowable} that shares a single subscription to the underlying sequence
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -12506,14 +12504,14 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
     }
 
     /**
-     * Returns a Flowable that emits the results of invoking a specified selector on items emitted by a
+     * Returns a {@code Flowable} that emits the results of invoking a specified selector on items emitted by a
      * {@link ConnectableFlowable} that shares a single subscription to the underlying sequence.
      * <p>
      * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator expects the source {@code Publisher} to honor backpressure and if this expectation is
-     *  violated, the operator will signal a {@code MissingBackpressureException} through the {@code Publisher}
+     *  <dd>The operator expects the source {@link Publisher} to honor backpressure and if this expectation is
+     *  violated, the operator will signal a {@link MissingBackpressureException} through the {@code Publisher}
      *  provided to the function. Since the {@code Publisher} returned by the {@code selector} may be
      *  independent of the provided {@code Publisher} to the function, the output's backpressure behavior
      *  is determined by this returned {@code Publisher}.</dd>
@@ -12522,14 +12520,14 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            a function that can use the multicasted source sequence as many times as needed, without
-     *            causing multiple subscriptions to the source sequence. Subscribers to the given source will
+     *            causing multiple subscriptions to the source sequence. {@link Subscriber}s to the given source will
      *            receive all notifications of the source from the time of the subscription forward.
      * @param prefetch
-     *            the number of elements to prefetch from the current Flowable
-     * @return a Flowable that emits the results of invoking the selector on the items emitted by a {@link ConnectableFlowable} that shares a single subscription to the underlying sequence
+     *            the number of elements to prefetch from the current {@code Flowable}
+     * @return a {@code Flowable} that emits the results of invoking the selector on the items emitted by a {@code ConnectableFlowable} that shares a single subscription to the underlying sequence
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -12543,7 +12541,7 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
     }
 
     /**
-     * Returns a {@link ConnectableFlowable}, which is a variety of Publisher that waits until its
+     * Returns a {@link ConnectableFlowable}, which is a variety of {@link Publisher} that waits until its
      * {@link ConnectableFlowable#connect connect} method is called before it begins emitting items to those
      * {@link Subscriber}s that have subscribed to it.
      * <p>
@@ -12552,15 +12550,15 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code ConnectableFlowable} honors backpressure for each of its {@code Subscriber}s
      *  and expects the source {@code Publisher} to honor backpressure as well. If this expectation is violated,
-     *  the operator will signal a {@code MissingBackpressureException} to its {@code Subscriber}s and disconnect.</dd>
+     *  the operator will signal a {@link MissingBackpressureException} to its {@code Subscriber}s and disconnect.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param bufferSize
-     *            the number of elements to prefetch from the current Flowable
-     * @return a {@link ConnectableFlowable} that upon connection causes the source Publisher to emit items
-     *         to its {@link Subscriber}s
+     *            the number of elements to prefetch from the current {@code Flowable}
+     * @return a {@code ConnectableFlowable} that upon connection causes the source {@code Publisher} to emit items
+     *         to its {@code Subscriber}s
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -12587,7 +12585,7 @@ public final ConnectableFlowable<T> publish(int bufferSize) {
      * </dl>
      *
      * @param n the initial request amount, further request will happen after 75% of this value
-     * @return the Publisher that rebatches request amounts from downstream
+     * @return the {@link Publisher} that rebatches request amounts from downstream
      * @since 2.0
      */
     @CheckReturnValue
@@ -12599,9 +12597,9 @@ public final Flowable<T> rebatchRequests(int n) {
     }
 
     /**
-     * Returns a Maybe that applies a specified accumulator function to the first item emitted by a source
-     * Publisher, then feeds the result of that function along with the second item emitted by the source
-     * Publisher into the same function, and so on until all items have been emitted by the finite source Publisher,
+     * Returns a {@link Maybe} that applies a specified accumulator function to the first item emitted by a source
+     * {@link Publisher}, then feeds the result of that function along with the second item emitted by the source
+     * {@code Publisher} into the same function, and so on until all items have been emitted by the finite source {@code Publisher},
      * and emits the final result from the final call to your function as its sole item.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduce.png" alt="">
@@ -12612,7 +12610,7 @@ public final Flowable<T> rebatchRequests(int n) {
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure of its downstream consumer and consumes the
@@ -12622,10 +12620,10 @@ public final Flowable<T> rebatchRequests(int n) {
      * </dl>
      *
      * @param reducer
-     *            an accumulator function to be invoked on each item emitted by the source Publisher, whose
+     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, whose
      *            result will be used in the next accumulator call
-     * @return a Maybe that emits a single item that is the result of accumulating the items emitted by
-     *         the source Flowable
+     * @return a {@code Maybe} that emits a single item that is the result of accumulating the items emitted by
+     *         the source {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
      */
@@ -12639,10 +12637,10 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     }
 
     /**
-     * Returns a Single that applies a specified accumulator function to the first item emitted by a source
-     * Publisher and a specified seed value, then feeds the result of that function along with the second item
-     * emitted by a Publisher into the same function, and so on until all items have been emitted by the
-     * finite source Publisher, emitting the final result from the final call to your function as its sole item.
+     * Returns a {@link Single} that applies a specified accumulator function to the first item emitted by a source
+     * {@link Publisher} and a specified seed value, then feeds the result of that function along with the second item
+     * emitted by a {@code Publisher} into the same function, and so on until all items have been emitted by the
+     * finite source {@code Publisher}, emitting the final result from the final call to your function as its sole item.
      * <p>
      * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.png" alt="">
      * <p>
@@ -12650,11 +12648,11 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
      * that does a similar operation on lists.
      * <p>
-     * Note that the {@code seed} is shared among all subscribers to the resulting Publisher
+     * Note that the {@code seed} is shared among all subscribers to the resulting {@code Publisher}
      * and may cause problems if it is mutable. To make sure each subscriber gets its own value, defer
      * the application of this operator via {@link #defer(Supplier)}:
      * <pre><code>
-     * Publisher&lt;T&gt; source = ...
+     * Flowable&lt;T&gt; source = ...
      * Single.defer(() -&gt; source.reduce(new ArrayList&lt;&gt;(), (list, item) -&gt; list.add(item)));
      *
      * // alternatively, by using compose to stay fluent
@@ -12670,7 +12668,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure of its downstream consumer and consumes the
@@ -12683,10 +12681,10 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * @param seed
      *            the initial (seed) accumulator value
      * @param reducer
-     *            an accumulator function to be invoked on each item emitted by the source Publisher, the
+     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, the
      *            result of which will be used in the next accumulator call
-     * @return a Single that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the source Publisher
+     * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
+     *         items emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
      * @see #reduceWith(Supplier, BiFunction)
@@ -12702,21 +12700,21 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     }
 
     /**
-     * Returns a Single that applies a specified accumulator function to the first item emitted by a source
-     * Publisher and a seed value derived from calling a specified seedSupplier, then feeds the result
-     * of that function along with the second item emitted by a Publisher into the same function, and so on until
-     * all items have been emitted by the finite source Publisher, emitting the final result from the final call to your
+     * Returns a {@link Single} that applies a specified accumulator function to the first item emitted by a source
+     * {@link Publisher} and a seed value derived from calling a specified {@code seedSupplier}, then feeds the result
+     * of that function along with the second item emitted by a {@code Publisher} into the same function, and so on until
+     * all items have been emitted by the finite source {@code Publisher}, emitting the final result from the final call to your
      * function as its sole item.
      * <p>
      * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.png" alt="">
      * <p>
-     * This technique, which is called "reduce" here, is sometimes called "aggregate," "fold," "accumulate,"
-     * "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
+     * This technique, which is called "reduce" here, is sometimes called "aggregate", "fold", "accumulate",
+     * "compress", or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
      * that does a similar operation on lists.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure of its downstream consumer and consumes the
@@ -12727,12 +12725,12 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      *
      * @param <R> the accumulator and output value type
      * @param seedSupplier
-     *            the Supplier that provides the initial (seed) accumulator value for each individual Subscriber
+     *            the {@link Supplier} that provides the initial (seed) accumulator value for each individual {@link Subscriber}
      * @param reducer
-     *            an accumulator function to be invoked on each item emitted by the source Publisher, the
+     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, the
      *            result of which will be used in the next accumulator call
-     * @return a Single that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the source Publisher
+     * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
+     *         items emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
      */
@@ -12747,18 +12745,18 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     }
 
     /**
-     * Returns a Flowable that repeats the sequence of items emitted by the source Publisher indefinitely.
+     * Returns a {@code Flowable} that repeats the sequence of items emitted by the source {@link Publisher} indefinitely.
      * <p>
      * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.o.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that emits the items emitted by the source Publisher repeatedly and in sequence
+     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} repeatedly and in sequence
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -12770,22 +12768,22 @@ public final Flowable<T> repeat() {
     }
 
     /**
-     * Returns a Flowable that repeats the sequence of items emitted by the source Publisher at most
+     * Returns a {@code Flowable} that repeats the sequence of items emitted by the source {@link Publisher} at most
      * {@code count} times.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param times
-     *            the number of times the source Publisher items are repeated, a count of 0 will yield an empty
+     *            the number of times the source {@code Publisher} items are repeated, a count of 0 will yield an empty
      *            sequence
-     * @return a Flowable that repeats the sequence of items emitted by the source Publisher at most
+     * @return a {@code Flowable} that repeats the sequence of items emitted by the source {@code Publisher} at most
      *         {@code count} times
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero
@@ -12806,24 +12804,24 @@ public final Flowable<T> repeat(long times) {
     }
 
     /**
-     * Returns a Flowable that repeats the sequence of items emitted by the source Publisher until
-     * the provided stop function returns true.
+     * Returns a {@code Flowable} that repeats the sequence of items emitted by the source {@link Publisher} until
+     * the provided stop function returns {@code true}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeatUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param stop
-     *                a boolean supplier that is called when the current Flowable completes and unless it returns
-     *                false, the current Flowable is resubscribed
-     * @return the new Flowable instance
+     *                a boolean supplier that is called when the current {@code Flowable} completes and unless it returns
+     *                {@code false}, the current {@code Flowable} is resubscribed
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException
-     *             if {@code stop} is null
+     *             if {@code stop} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -12836,25 +12834,25 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns a Flowable that emits the same values as the source Publisher with the exception of an
+     * Returns a {@code Flowable} that emits the same values as the source {@link Publisher} with the exception of an
      * {@code onComplete}. An {@code onComplete} notification from the source will result in the emission of
-     * a {@code void} item to the Publisher provided as an argument to the {@code notificationHandler}
-     * function. If that Publisher calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
-     * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, this Publisher will
-     * resubscribe to the source Publisher.
+     * a {@code void} item to the {@code Publisher} provided as an argument to the {@code notificationHandler}
+     * function. If that {@code Publisher} calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
+     * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
+     * resubscribe to the source {@code Publisher}.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeatWhen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param handler
-     *            receives a Publisher of notifications with which a user can complete or error, aborting the repeat.
-     * @return the source Publisher modified with repeat logic
+     *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the repeat.
+     * @return the source {@code Publisher} modified with repeat logic
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -12867,23 +12865,23 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the underlying Publisher
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the underlying {@link Publisher}
      * that will replay all of its items and notifications to any future {@link Subscriber}. A Connectable
-     * Publisher resembles an ordinary Publisher, except that it does not begin emitting items when it is
+     * {@code Publisher} resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@code Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link ConnectableFlowable} that upon connection causes the source Publisher to emit its
-     *         items to its {@link Subscriber}s
+     * @return a {@code ConnectableFlowable} that upon connection causes the source {@code Publisher} to emit its
+     *         items to its {@code Subscriber}s
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -12895,26 +12893,26 @@ public final ConnectableFlowable<T> replay() {
     }
 
     /**
-     * Returns a Flowable that emits items that are the results of invoking a specified selector on the items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source Publisher.
+     * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on the items
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher}.
      * <p>
      * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the Publisher
-     * @return a Flowable that emits items that are the results of invoking the selector on a
-     *         {@link ConnectableFlowable} that shares a single subscription to the source Publisher
+     *            causing multiple subscriptions to the {@code Publisher}
+     * @return a {@code Flowable} that emits items that are the results of invoking the selector on a
+     *         {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -12927,8 +12925,8 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a Flowable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
      * replaying {@code bufferSize} notifications.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -12938,21 +12936,21 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the Publisher
+     *            causing multiple subscriptions to the {@code Publisher}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable Publisher can replay
-     * @return a Flowable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableFlowable} that shares a single subscription to the source Publisher
+     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
+     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}
      *         replaying no more than {@code bufferSize} items
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, int, boolean)
@@ -12968,8 +12966,8 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a Flowable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
      * replaying {@code bufferSize} notifications.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -12979,24 +12977,24 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the Publisher
+     *            causing multiple subscriptions to the {@code Publisher}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable Publisher can replay
+     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a Flowable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableFlowable} that shares a single subscription to the source Publisher
+     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}
      *         replaying no more than {@code bufferSize} items
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13011,8 +13009,8 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a Flowable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
      * replaying no more than {@code bufferSize} items that were emitted within a specified time window.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -13022,25 +13020,25 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the Publisher
+     *            causing multiple subscriptions to the {@code Publisher}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable Publisher can replay
+     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a Flowable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableFlowable} that shares a single subscription to the source Publisher, and
+     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}, and
      *         replays no more than {@code bufferSize} items that were emitted within the window defined by
      *         {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -13054,8 +13052,8 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a Flowable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
      * replaying no more than {@code bufferSize} items that were emitted within a specified time window.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -13065,27 +13063,27 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the Publisher
+     *            causing multiple subscriptions to the {@code Publisher}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable Publisher can replay
+     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that is the time source for the window
-     * @return a Flowable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableFlowable} that shares a single subscription to the source Publisher, and
+     *            the {@code Scheduler} that is the time source for the window
+     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}, and
      *         replays no more than {@code bufferSize} items that were emitted within the window defined by
      *         {@code time}
      * @throws IllegalArgumentException
@@ -13107,8 +13105,8 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a Flowable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
      * replaying no more than {@code bufferSize} items that were emitted within a specified time window.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -13118,30 +13116,30 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the Publisher
+     *            causing multiple subscriptions to the {@code Publisher}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable Publisher can replay
+     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that is the time source for the window
+     *            the {@code Scheduler} that is the time source for the window
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize/age, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a Flowable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableFlowable} that shares a single subscription to the source Publisher, and
+     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}, and
      *         replays no more than {@code bufferSize} items that were emitted within the window defined by
      *         {@code time}
      * @throws IllegalArgumentException
@@ -13162,31 +13160,31 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a Flowable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
      * replaying all items that were emitted within a specified time window.
      * <p>
      * <img width="640" height="435" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ft.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the Publisher
+     *            causing multiple subscriptions to the {@code Publisher}
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a Flowable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher},
      *         replaying all items that were emitted within the window defined by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13199,33 +13197,33 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a Flowable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
      * replaying all items that were emitted within a specified time window.
      * <p>
      * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the Publisher
+     *            causing multiple subscriptions to the {@code Publisher}
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is the time source for the window
-     * @return a Flowable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher},
      *         replaying all items that were emitted within the window defined by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, long, TimeUnit, Scheduler, boolean)
@@ -13242,25 +13240,25 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a Flowable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
      * replaying all items that were emitted within a specified time window.
      * <p>
      * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the Publisher
+     *            causing multiple subscriptions to the {@code Publisher}
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
@@ -13268,10 +13266,10 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * @param scheduler
      *            the scheduler that is the time source for the window
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given age, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a Flowable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableFlowable} that shares a single subscription to the source Publisher,
+     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher},
      *         replaying all items that were emitted within the window defined by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13287,9 +13285,9 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source Publisher that
-     * replays at most {@code bufferSize} items emitted by that Publisher. A Connectable Publisher resembles
-     * an ordinary Publisher, except that it does not begin emitting items when it is subscribed to, but only
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} that
+     * replays at most {@code bufferSize} items emitted by that {@code Publisher}. A Connectable {@code Publisher} resembles
+     * an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to, but only
      * when its {@code connect} method is called.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -13301,16 +13299,16 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param bufferSize
      *            the buffer size that limits the number of items that can be replayed
-     * @return a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
-     *         replays at most {@code bufferSize} items emitted by that Publisher
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
+     *         replays at most {@code bufferSize} items emitted by that {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(int, boolean)
      */
@@ -13323,9 +13321,9 @@ public final ConnectableFlowable<T> replay(int bufferSize) {
         return FlowableReplay.create(this, bufferSize, false);
     }
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source Publisher that
-     * replays at most {@code bufferSize} items emitted by that Publisher. A Connectable Publisher resembles
-     * an ordinary Publisher, except that it does not begin emitting items when it is subscribed to, but only
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} that
+     * replays at most {@code bufferSize} items emitted by that {@code Publisher}. A Connectable {@code Publisher} resembles
+     * an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to, but only
      * when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.n.png" alt="">
@@ -13336,8 +13334,8 @@ public final ConnectableFlowable<T> replay(int bufferSize) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -13345,10 +13343,10 @@ public final ConnectableFlowable<T> replay(int bufferSize) {
      * @param bufferSize
      *            the buffer size that limits the number of items that can be replayed
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
-     *         replays at most {@code bufferSize} items emitted by that Publisher
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
+     *         replays at most {@code bufferSize} items emitted by that {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @since 3.0.0
      */
@@ -13362,9 +13360,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, boolean eagerTruncate
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
      * replays at most {@code bufferSize} items that were emitted during a specified time window. A Connectable
-     * Publisher resembles an ordinary Publisher, except that it does not begin emitting items when it is
+     * {@code Publisher} resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nt.png" alt="">
@@ -13376,8 +13374,8 @@ public final ConnectableFlowable<T> replay(int bufferSize, boolean eagerTruncate
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -13388,7 +13386,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, boolean eagerTruncate
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
      *         replays at most {@code bufferSize} items that were emitted during the window defined by
      *         {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -13403,9 +13401,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
      * that replays a maximum of {@code bufferSize} items that are emitted within a specified time window. A
-     * Connectable Publisher resembles an ordinary Publisher, except that it does not begin emitting items
+     * Connectable {@code Publisher} resembles an ordinary {@code Publisher}, except that it does not begin emitting items
      * when it is subscribed to, but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nts.png" alt="">
@@ -13417,8 +13415,8 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -13431,7 +13429,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is used as a time source for the window
-     * @return a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
      *         replays at most {@code bufferSize} items that were emitted during the window defined by
      *         {@code time}
      * @throws IllegalArgumentException
@@ -13452,9 +13450,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
      * that replays a maximum of {@code bufferSize} items that are emitted within a specified time window. A
-     * Connectable Publisher resembles an ordinary Publisher, except that it does not begin emitting items
+     * Connectable {@code Publisher} resembles an ordinary {@code Publisher}, except that it does not begin emitting items
      * when it is subscribed to, but only when its {@code connect} method is called.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -13465,8 +13463,8 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -13480,9 +13478,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * @param scheduler
      *            the scheduler that is used as a time source for the window
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize/age, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
      *         replays at most {@code bufferSize} items that were emitted during the window defined by
      *         {@code time}
      * @throws IllegalArgumentException
@@ -13503,9 +13501,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
-     * replays all items emitted by that Publisher within a specified time window. A Connectable Publisher
-     * resembles an ordinary Publisher, except that it does not begin emitting items when it is subscribed to,
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
+     * replays all items emitted by that {@code Publisher} within a specified time window. A Connectable {@code Publisher}
+     * resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.t.png" alt="">
@@ -13515,8 +13513,8 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -13525,7 +13523,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
      *         replays the items that were emitted during the window defined by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13538,9 +13536,9 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
-     * replays all items emitted by that Publisher within a specified time window. A Connectable Publisher
-     * resembles an ordinary Publisher, except that it does not begin emitting items when it is subscribed to,
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
+     * replays all items emitted by that {@code Publisher} within a specified time window. A Connectable {@code Publisher}
+     * resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ts.png" alt="">
@@ -13550,8 +13548,8 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -13561,8 +13559,8 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that is the time source for the window
-     * @return a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
+     *            the {@code Scheduler} that is the time source for the window
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
      *         replays the items that were emitted during the window defined by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(long, TimeUnit, Scheduler, boolean)
@@ -13578,9 +13576,9 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
-     * replays all items emitted by that Publisher within a specified time window. A Connectable Publisher
-     * resembles an ordinary Publisher, except that it does not begin emitting items when it is subscribed to,
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
+     * replays all items emitted by that {@code Publisher} within a specified time window. A Connectable {@code Publisher}
+     * resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ts.png" alt="">
@@ -13590,8 +13588,8 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  Subscriber which requests the largest amount: i.e., two child Subscribers with requests of 10 and 100 will
-     *  request 100 elements from the underlying Publisher sequence.</dd>
+     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -13601,11 +13599,11 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that is the time source for the window
+     *            the {@code Scheduler} that is the time source for the window
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize/age, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@link ConnectableFlowable} that shares a single subscription to the source Publisher and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
      *         replays the items that were emitted during the window defined by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13620,27 +13618,27 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, resubscribing to it if it calls {@code onError}
      * (infinite retry count).
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <p>
-     * If the source Publisher calls {@link Subscriber#onError}, this method will resubscribe to the source
-     * Publisher rather than propagating the {@code onError} call.
+     * If the source {@code Publisher} calls {@link Subscriber#onError}, this method will resubscribe to the source
+     * {@code Publisher} rather than propagating the {@code onError} call.
      * <p>
-     * Any and all items emitted by the source Publisher will be emitted by the resulting Publisher, even
-     * those emitted during failed subscriptions. For example, if a Publisher fails at first but emits
+     * Any and all items emitted by the source {@code Publisher} will be emitted by the resulting {@code Publisher}, even
+     * those emitted during failed subscriptions. For example, if a {@code Publisher} fails at first but emits
      * {@code [1, 2]} then succeeds the second time and emits {@code [1, 2, 3, 4, 5]} then the complete sequence
      * of emissions and notifications would be {@code [1, 2, 1, 2, 3, 4, 5, onComplete]}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source Publisher modified with retry logic
+     * @return the source {@code Publisher} modified with retry logic
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -13652,14 +13650,14 @@ public final Flowable<T> retry() {
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, resubscribing to it if it calls {@code onError}
-     * and the predicate returns true for that specific exception and retry count.
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, resubscribing to it if it calls {@code onError}
+     * and the predicate returns {@code true} for that specific exception and retry count.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -13667,7 +13665,7 @@ public final Flowable<T> retry() {
      * @param predicate
      *            the predicate that determines if a resubscription may happen in case of a specific exception
      *            and retry count
-     * @return the source Publisher modified with retry logic
+     * @return the source {@code Publisher} modified with retry logic
      * @see #retry()
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
@@ -13682,30 +13680,30 @@ public final Flowable<T> retry(@NonNull BiPredicate<@NonNull ? super Integer, @N
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, resubscribing to it if it calls {@code onError}
      * up to a specified number of retries.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <p>
-     * If the source Publisher calls {@link Subscriber#onError}, this method will resubscribe to the source
-     * Publisher for a maximum of {@code count} resubscriptions rather than propagating the
+     * If the source {@code Publisher} calls {@link Subscriber#onError}, this method will resubscribe to the source
+     * {@code Publisher} for a maximum of {@code count} resubscriptions rather than propagating the
      * {@code onError} call.
      * <p>
-     * Any and all items emitted by the source Publisher will be emitted by the resulting Publisher, even
-     * those emitted during failed subscriptions. For example, if a Publisher fails at first but emits
+     * Any and all items emitted by the source {@code Publisher} will be emitted by the resulting {@code Publisher}, even
+     * those emitted during failed subscriptions. For example, if a {@code Publisher} fails at first but emits
      * {@code [1, 2]} then succeeds the second time and emits {@code [1, 2, 3, 4, 5]} then the complete sequence
      * of emissions and notifications would be {@code [1, 2, 1, 2, 3, 4, 5, onComplete]}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param count
-     *            the number of times to resubscribe if the current Flowable fails
-     * @return the source Publisher modified with retry logic
+     *            the number of times to resubscribe if the current {@code Flowable} fails
+     * @return the source {@code Publisher} modified with retry logic
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -13717,18 +13715,18 @@ public final Flowable<T> retry(long count) {
     }
 
     /**
-     * Retries at most times or until the predicate returns false, whichever happens first.
+     * Retries at most times or until the predicate returns {@code false}, whichever happens first.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  <dd>The operator honors downstream backpressure and expects the source {@link Publisher} to honor backpressure as well.
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param times the number of times to resubscribe if the current Flowable fails
-     * @param predicate the predicate called with the failure Throwable and should return true to trigger a retry.
-     * @return the new Flowable instance
+     * @param times the number of times to resubscribe if the current {@code Flowable} fails
+     * @param predicate the predicate called with the failure {@link Throwable} and should return {@code true} to trigger a retry.
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -13744,17 +13742,17 @@ public final Flowable<T> retry(long times, @NonNull Predicate<@NonNull ? super T
     }
 
     /**
-     * Retries the current Flowable if the predicate returns true.
+     * Retries the current {@code Flowable} if the predicate returns {@code true}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  <dd>The operator honors downstream backpressure and expects the source {@link Publisher} to honor backpressure as well.
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param predicate the predicate that receives the failure Throwable and should return true to trigger a retry.
-     * @return the new Flowable instance
+     * @param predicate the predicate that receives the failure {@link Throwable} and should return {@code true} to trigger a retry.
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -13765,16 +13763,16 @@ public final Flowable<T> retry(@NonNull Predicate<@NonNull ? super Throwable> pr
     }
 
     /**
-     * Retries until the given stop function returns true.
+     * Retries until the given stop function returns {@code true}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  <dd>The operator honors downstream backpressure and expects the source {@link Publisher} to honor backpressure as well.
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retryUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param stop the function that should return true to stop retrying
-     * @return the new Flowable instance
+     * @param stop the function that should return {@code true} to stop retrying
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -13786,12 +13784,12 @@ public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns a Flowable that emits the same values as the source Publisher with the exception of an
+     * Returns a {@code Flowable} that emits the same values as the source {@link Publisher} with the exception of an
      * {@code onError}. An {@code onError} notification from the source will result in the emission of a
-     * {@link Throwable} item to the Publisher provided as an argument to the {@code notificationHandler}
-     * function. If that Publisher calls {@code onComplete} or {@code onError} then {@code retry} will call
-     * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this Publisher will
-     * resubscribe to the source Publisher.
+     * {@link Throwable} item to the {@code Publisher} provided as an argument to the {@code notificationHandler}
+     * function. If that {@code Publisher} calls {@code onComplete} or {@code onError} then {@code retry} will call
+     * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
+     * resubscribe to the source {@code Publisher}.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.png" alt="">
      * <p>
@@ -13826,7 +13824,7 @@ public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
      * Note that the inner {@code Publisher} returned by the handler function should signal
      * either {@code onNext}, {@code onError} or {@code onComplete} in response to the received
      * {@code Throwable} to indicate the operator should retry or terminate. If the upstream to
-     * the operator is asynchronous, signaling onNext followed by onComplete immediately may
+     * the operator is asynchronous, signaling {@code onNext} followed by {@code onComplete} immediately may
      * result in the sequence to be completed immediately. Similarly, if this inner
      * {@code Publisher} signals {@code onError} or {@code onComplete} while the upstream is
      * active, the sequence is terminated with the same signal immediately.
@@ -13851,15 +13849,15 @@ public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects both the source
      *  and inner {@code Publisher}s to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retryWhen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param handler
-     *            receives a Publisher of notifications with which a user can complete or error, aborting the
+     *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the
      *            retry
-     * @return the source Publisher modified with retry logic
+     * @return the source {@code Publisher} modified with retry logic
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -13874,18 +13872,18 @@ public final Flowable<T> retryWhen(
     }
 
     /**
-     * Subscribes to the current Flowable and wraps the given Subscriber into a SafeSubscriber
-     * (if not already a SafeSubscriber) that
-     * deals with exceptions thrown by a misbehaving Subscriber (that doesn't follow the
-     * Reactive Streams specification).
+     * Subscribes to the current {@code Flowable} and wraps the given {@link Subscriber} into a {@link SafeSubscriber}
+     * (if not already a {@code SafeSubscriber}) that
+     * deals with exceptions thrown by a misbehaving {@code Subscriber} (that doesn't follow the
+     * <em>Reactive Streams</em> specification).
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator leaves the reactive world and the backpressure behavior depends on the Subscriber's behavior.</dd>
+     *  <dd>This operator leaves the reactive world and the backpressure behavior depends on the {@code Subscriber}'s behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code safeSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param s the incoming Subscriber instance
-     * @throws NullPointerException if s is null
+     * @param s the incoming {@code Subscriber} instance
+     * @throws NullPointerException if s is {@code null}
      */
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -13899,7 +13897,7 @@ public final void safeSubscribe(@NonNull Subscriber<? super T> s) {
     }
 
     /**
-     * Returns a Flowable that emits the most recently emitted item (if any) emitted by the source Publisher
+     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the source {@link Publisher}
      * within periodic time intervals.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.png" alt="">
@@ -13914,7 +13912,7 @@ public final void safeSubscribe(@NonNull Subscriber<? super T> s) {
      *            the sampling rate
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return a Flowable that emits the results of sampling the items emitted by the source Publisher at
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the source {@code Publisher} at
      *         the specified time interval
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -13929,7 +13927,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that emits the most recently emitted item (if any) emitted by the source Publisher
+     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the source {@link Publisher}
      * within periodic time intervals and optionally emit the very last upstream item when the upstream completes.
      * <p>
      * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.emitlast.png" alt="">
@@ -13946,10 +13944,10 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit) {
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param emitLast
-     *            if true and the upstream completes while there is still an unsampled item available,
+     *            if {@code true}, and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
-     *            if false, an unsampled last item is ignored.
-     * @return a Flowable that emits the results of sampling the items emitted by the source Publisher at
+     *            if {@code false}, an unsampled last item is ignored.
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the source {@code Publisher} at
      *         the specified time interval
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -13965,15 +13963,15 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, boolean emi
     }
 
     /**
-     * Returns a Flowable that emits the most recently emitted item (if any) emitted by the source Publisher
-     * within periodic time intervals, where the intervals are defined on a particular Scheduler.
+     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the source {@link Publisher}
+     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param period
@@ -13981,8 +13979,8 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, boolean emi
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param scheduler
-     *            the {@link Scheduler} to use when sampling
-     * @return a Flowable that emits the results of sampling the items emitted by the source Publisher at
+     *            the {@code Scheduler} to use when sampling
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the source {@code Publisher} at
      *         the specified time interval
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -13999,8 +13997,8 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a Flowable that emits the most recently emitted item (if any) emitted by the source Publisher
-     * within periodic time intervals, where the intervals are defined on a particular Scheduler
+     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the source {@link Publisher}
+     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}
      * and optionally emit the very last upstream item when the upstream completes.
      * <p>
      * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.emitlast.png" alt="">
@@ -14008,7 +14006,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * <p>History: 2.0.5 - experimental
@@ -14017,12 +14015,12 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param scheduler
-     *            the {@link Scheduler} to use when sampling
+     *            the {@code Scheduler} to use when sampling
      * @param emitLast
-     *            if true and the upstream completes while there is still an unsampled item available,
+     *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
-     *            if false, an unsampled last item is ignored.
-     * @return a Flowable that emits the results of sampling the items emitted by the source Publisher at
+     *            if {@code false}, an unsampled last item is ignored.
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the source {@code Publisher} at
      *         the specified time interval
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -14040,24 +14038,24 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a Flowable that, when the specified {@code sampler} Publisher emits an item or completes,
-     * emits the most recently emitted item (if any) emitted by the source Publisher since the previous
-     * emission from the {@code sampler} Publisher.
+     * Returns a {@code Flowable} that, when the specified {@code sampler} {@link Publisher} emits an item or completes,
+     * emits the most recently emitted item (if any) emitted by the source {@code Publisher} since the previous
+     * emission from the {@code sampler} {@code Publisher}.
      * <p>
      * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.nolast.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses the emissions of the {@code sampler}
-     *      Publisher to control data flow.</dd>
+     *      {@code Publisher} to control data flow.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code sample} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the sampler Publisher
+     * @param <U> the element type of the sampler {@code Publisher}
      * @param sampler
-     *            the Publisher to use for sampling the source Publisher
-     * @return a Flowable that emits the results of sampling the items emitted by this Publisher whenever
-     *         the {@code sampler} Publisher emits an item or completes
+     *            the {@code Publisher} to use for sampling the source {@code Publisher}
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by this {@code Publisher} whenever
+     *         the {@code sampler} {@code Publisher} emits an item or completes
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      */
@@ -14071,30 +14069,30 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler) {
     }
 
     /**
-     * Returns a Flowable that, when the specified {@code sampler} Publisher emits an item or completes,
-     * emits the most recently emitted item (if any) emitted by the source Publisher since the previous
-     * emission from the {@code sampler} Publisher
-     * and optionally emit the very last upstream item when the upstream or other Publisher complete.
+     * Returns a {@code Flowable} that, when the specified {@code sampler} {@link Publisher} emits an item or completes,
+     * emits the most recently emitted item (if any) emitted by the source {@code Publisher} since the previous
+     * emission from the {@code sampler} {@code Publisher}
+     * and optionally emit the very last upstream item when the upstream or other {@code Publisher} complete.
      * <p>
      * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.emitlast.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses the emissions of the {@code sampler}
-     *      Publisher to control data flow.</dd>
+     *      {@code Publisher} to control data flow.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code sample} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * <p>History: 2.0.5 - experimental
-     * @param <U> the element type of the sampler Publisher
+     * @param <U> the element type of the sampler {@code Publisher}
      * @param sampler
-     *            the Publisher to use for sampling the source Publisher
+     *            the {@code Publisher} to use for sampling the source {@code Publisher}
      * @param emitLast
-     *            if true and the upstream completes while there is still an unsampled item available,
+     *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
-     *            if false, an unsampled last item is ignored.
-     * @return a Flowable that emits the results of sampling the items emitted by this Publisher whenever
-     *         the {@code sampler} Publisher emits an item or completes
+     *            if {@code false}, an unsampled last item is ignored.
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by this {@code Publisher} whenever
+     *         the {@code sampler} {@code Publisher} emits an item or completes
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @since 2.1
@@ -14109,9 +14107,9 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitL
     }
 
     /**
-     * Returns a Flowable that applies a specified accumulator function to the first item emitted by a source
-     * Publisher, then feeds the result of that function along with the second item emitted by the source
-     * Publisher into the same function, and so on until all items have been emitted by the source Publisher,
+     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by a source
+     * {@link Publisher}, then feeds the result of that function along with the second item emitted by the source
+     * {@code Publisher} into the same function, and so on until all items have been emitted by the source {@code Publisher},
      * emitting the result of each of these iterations.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.png" alt="">
@@ -14120,16 +14118,16 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitL
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  Violating this expectation, a {@code MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
+     *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code scan} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param accumulator
-     *            an accumulator function to be invoked on each item emitted by the source Publisher, whose
+     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, whose
      *            result will be emitted to {@link Subscriber}s via {@link Subscriber#onNext onNext} and used in the
      *            next accumulator call
-     * @return a Flowable that emits the results of each call to the accumulator function
+     * @return a {@code Flowable} that emits the results of each call to the accumulator function
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
     @CheckReturnValue
@@ -14142,19 +14140,19 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Returns a Flowable that applies a specified accumulator function to the first item emitted by a source
-     * Publisher and a seed value, then feeds the result of that function along with the second item emitted by
-     * the source Publisher into the same function, and so on until all items have been emitted by the source
-     * Publisher, emitting the result of each of these iterations.
+     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by a source
+     * {@link Publisher} and a seed value, then feeds the result of that function along with the second item emitted by
+     * the source {@code Publisher} into the same function, and so on until all items have been emitted by the source
+     * {@code Publisher}, emitting the result of each of these iterations.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
-     * Note that the Publisher that results from this method will emit {@code initialValue} as its first
+     * Note that the {@code Publisher} that results from this method will emit {@code initialValue} as its first
      * emitted item.
      * <p>
-     * Note that the {@code initialValue} is shared among all subscribers to the resulting Publisher
+     * Note that the {@code initialValue} is shared among all subscribers to the resulting {@code Publisher}
      * and may cause problems if it is mutable. To make sure each subscriber gets its own value, defer
      * the application of this operator via {@link #defer(Supplier)}:
      * <pre><code>
@@ -14170,7 +14168,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  Violating this expectation, a {@code MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
+     *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code scan} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -14179,10 +14177,10 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * @param initialValue
      *            the initial (seed) accumulator item
      * @param accumulator
-     *            an accumulator function to be invoked on each item emitted by the source Publisher, whose
+     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, whose
      *            result will be emitted to {@link Subscriber}s via {@link Subscriber#onNext onNext} and used in the
      *            next accumulator call
-     * @return a Flowable that emits {@code initialValue} followed by the results of each call to the
+     * @return a {@code Flowable} that emits {@code initialValue} followed by the results of each call to the
      *         accumulator function
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
@@ -14196,33 +14194,33 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Returns a Flowable that applies a specified accumulator function to the first item emitted by a source
-     * Publisher and a seed value, then feeds the result of that function along with the second item emitted by
-     * the source Publisher into the same function, and so on until all items have been emitted by the source
-     * Publisher, emitting the result of each of these iterations.
+     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by a source
+     * {@link Publisher} and a seed value, then feeds the result of that function along with the second item emitted by
+     * the source {@code Publisher} into the same function, and so on until all items have been emitted by the source
+     * {@code Publisher}, emitting the result of each of these iterations.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
-     * Note that the Publisher that results from this method will emit the value returned by
+     * Note that the {@code Publisher} that results from this method will emit the value returned by
      * the {@code seedSupplier} as its first item.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  Violating this expectation, a {@code MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
+     *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code scanWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R> the initial, accumulator and result type
      * @param seedSupplier
-     *            a Supplier that returns the initial (seed) accumulator item for each individual Subscriber
+     *            a {@link Supplier} that returns the initial (seed) accumulator item for each individual {@link Subscriber}
      * @param accumulator
-     *            an accumulator function to be invoked on each item emitted by the source Publisher, whose
-     *            result will be emitted to {@link Subscriber}s via {@link Subscriber#onNext onNext} and used in the
+     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, whose
+     *            result will be emitted to {@code Subscriber}s via {@link Subscriber#onNext onNext} and used in the
      *            next accumulator call
-     * @return a Flowable that emits {@code initialValue} followed by the results of each call to the
+     * @return a {@code Flowable} that emits {@code initialValue} followed by the results of each call to the
      *         accumulator function
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
@@ -14237,13 +14235,13 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Forces a Publisher's emissions and notifications to be serialized and for it to obey
-     * <a href="http://reactivex.io/documentation/contract.html">the Publisher contract</a> in other ways.
+     * Forces a {@link Publisher}'s emissions and notifications to be serialized and for it to obey
+     * <a href="http://reactivex.io/documentation/contract.html">the {@code Publisher} contract</a> in other ways.
      * <p>
-     * It is possible for a Publisher to invoke its Subscribers' methods asynchronously, perhaps from
-     * different threads. This could make such a Publisher poorly-behaved, in that it might try to invoke
+     * It is possible for a {@code Publisher} to invoke its {@link Subscriber}s' methods asynchronously, perhaps from
+     * different threads. This could make such a {@code Publisher} poorly-behaved, in that it might try to invoke
      * {@code onComplete} or {@code onError} before one of its {@code onNext} invocations, or it might call
-     * {@code onNext} from two different threads concurrently. You can force such a Publisher to be
+     * {@code onNext} from two different threads concurrently. You can force such a {@code Publisher} to be
      * well-behaved and sequential by applying the {@code serialize} method to it.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/synchronize.png" alt="">
@@ -14255,8 +14253,8 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      *  <dd>{@code serialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Publisher} that is guaranteed to be well-behaved and to make only serialized calls to
-     *         its Subscribers
+     * @return a {@code Publisher} that is guaranteed to be well-behaved and to make only serialized calls to
+     *         its {@code Subscriber}s
      * @see <a href="http://reactivex.io/documentation/operators/serialize.html">ReactiveX operators documentation: Serialize</a>
      */
     @CheckReturnValue
@@ -14268,9 +14266,9 @@ public final Flowable<T> serialize() {
     }
 
     /**
-     * Returns a new {@link Publisher} that multicasts (and shares a single subscription to) the original {@link Publisher}. As long as
-     * there is at least one {@link Subscriber} this {@link Publisher} will be subscribed and emitting data.
-     * When all subscribers have canceled it will cancel the source {@link Publisher}.
+     * Returns a new {@link Publisher} that multicasts (and shares a single subscription to) the original {@code Publisher}. As long as
+     * there is at least one {@link Subscriber} this {@code Publisher} will be subscribed and emitting data.
+     * When all subscribers have canceled it will cancel the source {@code Publisher}.
      * <p>
      * This is an alias for {@link #publish()}.{@link ConnectableFlowable#refCount() refCount()}.
      * <p>
@@ -14278,14 +14276,14 @@ public final Flowable<T> serialize() {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator will signal a {@code MissingBackpressureException} to
+     *  If this expectation is violated, the operator will signal a {@link MissingBackpressureException} to
      *  its {@code Subscriber}s.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code share} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @return a {@code Publisher} that upon connection causes the source {@code Publisher} to emit items
-     *         to its {@link Subscriber}s
+     *         to its {@code Subscriber}s
      * @see <a href="http://reactivex.io/documentation/operators/refcount.html">ReactiveX operators documentation: RefCount</a>
      */
     @CheckReturnValue
@@ -14297,20 +14295,20 @@ public final Flowable<T> share() {
     }
 
     /**
-     * Returns a Maybe that completes if this Flowable is empty, signals one item if this Flowable
-     * signals exactly one item or signals an {@code IllegalArgumentException} if this Flowable signals
+     * Returns a {@link Maybe} that completes if this {@code Flowable} is empty, signals one item if this {@code Flowable}
+     * signals exactly one item or signals an {@link IllegalArgumentException} if this {@code Flowable} signals
      * more than one item.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/single.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code singleElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Maybe that emits the single item emitted by the source Publisher
+     * @return a {@code Maybe} that emits the single item emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -14322,9 +14320,9 @@ public final Maybe<T> singleElement() {
     }
 
     /**
-     * Returns a Single that emits the single item emitted by the source Publisher, if that Publisher
-     * emits only a single item, or a default item if the source Publisher emits no items. If the source
-     * Publisher emits more than one item, an {@code IllegalArgumentException} is signaled instead.
+     * Returns a {@link Single} that emits the single item emitted by the source {@link Publisher}, if that {@code Publisher}
+     * emits only a single item, or a default item if the source {@code Publisher} emits no items. If the source
+     * {@code Publisher} emits more than one item, an {@link IllegalArgumentException} is signaled instead.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrDefault.png" alt="">
      * <dl>
@@ -14336,9 +14334,9 @@ public final Maybe<T> singleElement() {
      * </dl>
      *
      * @param defaultItem
-     *            a default value to emit if the source Publisher emits no item
-     * @return a Single that emits the single item emitted by the source Publisher, or a default item if
-     *         the source Publisher is empty
+     *            a default value to emit if the source {@code Publisher} emits no item
+     * @return a {@code Single} that emits the single item emitted by the source {@code Publisher}, or a default item if
+     *         the source {@code Publisher} is empty
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -14351,21 +14349,21 @@ public final Single<T> single(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Single that emits the single item emitted by this Flowable, if this Flowable
+     * Returns a {@link Single} that emits the single item emitted by this {@code Flowable}, if this {@code Flowable}
      * emits only a single item, otherwise
-     * if this Flowable completes without emitting any items a {@link NoSuchElementException} will be signaled and
-     * if this Flowable emits more than one item, an {@code IllegalArgumentException} will be signaled.
+     * if this {@code Flowable} completes without emitting any items a {@link NoSuchElementException} will be signaled and
+     * if this {@code Flowable} emits more than one item, an {@link IllegalArgumentException} will be signaled.
      * <p>
      * <img width="640" height="205" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrError.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code singleOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -14377,7 +14375,7 @@ public final Single<T> singleOrError() {
     }
 
     /**
-     * Returns a Flowable that skips the first {@code count} items emitted by the source Publisher and emits
+     * Returns a {@code Flowable} that skips the first {@code count} items emitted by the source {@link Publisher} and emits
      * the remainder.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.png" alt="">
@@ -14391,8 +14389,8 @@ public final Single<T> singleOrError() {
      *
      * @param count
      *            the number of items to skip
-     * @return a Flowable that is identical to the source Publisher except that it does not emit the first
-     *         {@code count} items that the source Publisher emits
+     * @return a {@code Flowable} that is identical to the source {@code Publisher} except that it does not emit the first
+     *         {@code count} items that the source {@code Publisher} emits
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
     @CheckReturnValue
@@ -14407,7 +14405,7 @@ public final Flowable<T> skip(long count) {
     }
 
     /**
-     * Returns a Flowable that skips values emitted by the source Publisher before a specified time window
+     * Returns a {@code Flowable} that skips values emitted by the source {@link Publisher} before a specified time window
      * elapses.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.t.png" alt="">
@@ -14424,7 +14422,7 @@ public final Flowable<T> skip(long count) {
      *            the length of the time window to skip
      * @param unit
      *            the time unit of {@code time}
-     * @return a Flowable that skips values emitted by the source Publisher before the time window defined
+     * @return a {@code Flowable} that skips values emitted by the source {@code Publisher} before the time window defined
      *         by {@code time} elapses and the emits the remainder
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
@@ -14437,7 +14435,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that skips values emitted by the source Publisher before a specified time window
+     * Returns a {@code Flowable} that skips values emitted by the source {@link Publisher} before a specified time window
      * on a specified {@link Scheduler} elapses.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.ts.png" alt="">
@@ -14446,7 +14444,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit) {
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
      *  thus has to consume the source {@code Publisher} in an unbounded manner (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use for the timed skipping</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use for the timed skipping</dd>
      * </dl>
      *
      * @param time
@@ -14454,8 +14452,8 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the {@link Scheduler} on which the timed wait happens
-     * @return a Flowable that skips values emitted by the source Publisher before the time window defined
+     *            the {@code Scheduler} on which the timed wait happens
+     * @return a {@code Flowable} that skips values emitted by the source {@code Publisher} before the time window defined
      *         by {@code time} and {@code scheduler} elapses, and then emits the remainder
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
@@ -14468,13 +14466,13 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Schedu
     }
 
     /**
-     * Returns a Flowable that drops a specified number of items from the end of the sequence emitted by the
-     * source Publisher.
+     * Returns a {@code Flowable} that drops a specified number of items from the end of the sequence emitted by the
+     * source {@link Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.png" alt="">
      * <p>
-     * This Subscriber accumulates a queue long enough to store the first {@code count} items. As more items are
-     * received, items are taken from the front of the queue and emitted by the returned Publisher. This causes
+     * This {@link Subscriber} accumulates a queue long enough to store the first {@code count} items. As more items are
+     * received, items are taken from the front of the queue and emitted by the returned {@code Publisher}. This causes
      * such items to be delayed.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -14486,7 +14484,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Schedu
      *
      * @param count
      *            number of items to drop from the end of the source sequence
-     * @return a Flowable that emits the items emitted by the source Publisher except for the dropped ones
+     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} except for the dropped ones
      *         at the end
      * @throws IndexOutOfBoundsException
      *             if {@code count} is less than zero
@@ -14507,7 +14505,7 @@ public final Flowable<T> skipLast(int count) {
     }
 
     /**
-     * Returns a Flowable that drops items emitted by the source Publisher during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
      * before the source completes.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
@@ -14526,7 +14524,7 @@ public final Flowable<T> skipLast(int count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a Flowable that drops those items emitted by the source Publisher in a time window before the
+     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
      *         source completes defined by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -14539,7 +14537,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that drops items emitted by the source Publisher during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
      * before the source completes.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
@@ -14559,9 +14557,9 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code time}
      * @param delayError
-     *            if true, an exception signaled by the current Flowable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signaled and all regular elements dropped
-     * @return a Flowable that drops those items emitted by the source Publisher in a time window before the
+     *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
+     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
      *         source completes defined by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -14574,7 +14572,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, boolean del
     }
 
     /**
-     * Returns a Flowable that drops items emitted by the source Publisher during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
@@ -14594,7 +14592,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, boolean del
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler used as the time source
-     * @return a Flowable that drops those items emitted by the source Publisher in a time window before the
+     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
      *         source completes defined by {@code time} and {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -14607,7 +14605,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a Flowable that drops items emitted by the source Publisher during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
@@ -14628,9 +14626,9 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * @param scheduler
      *            the scheduler used as the time source
      * @param delayError
-     *            if true, an exception signaled by the current Flowable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signaled and all regular elements dropped
-     * @return a Flowable that drops those items emitted by the source Publisher in a time window before the
+     *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
+     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
      *         source completes defined by {@code time} and {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -14643,7 +14641,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a Flowable that drops items emitted by the source Publisher during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
@@ -14664,11 +14662,11 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * @param scheduler
      *            the scheduler used as the time source
      * @param delayError
-     *            if true, an exception signaled by the current Flowable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signaled and all regular elements dropped
+     *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be skipped
-     * @return a Flowable that drops those items emitted by the source Publisher in a time window before the
+     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
      *         source completes defined by {@code time} and {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -14686,7 +14684,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a Flowable that skips items emitted by the source Publisher until a second Publisher emits
+     * Returns a {@code Flowable} that skips items emitted by the source {@link Publisher} until a second {@code Publisher} emits
      * an item.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipUntil.png" alt="">
@@ -14698,11 +14696,11 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      *  <dd>{@code skipUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the other Publisher
+     * @param <U> the element type of the other {@code Publisher}
      * @param other
-     *            the second Publisher that has to emit an item before the source Publisher's elements begin
-     *            to be mirrored by the resulting Publisher
-     * @return a Flowable that skips items from the source Publisher until the second Publisher emits an
+     *            the second {@code Publisher} that has to emit an item before the source {@code Publisher}'s elements begin
+     *            to be mirrored by the resulting {@code Publisher}
+     * @return a {@code Flowable} that skips items from the source {@code Publisher} until the second {@code Publisher} emits an
      *         item, then emits the remaining items
      * @see <a href="http://reactivex.io/documentation/operators/skipuntil.html">ReactiveX operators documentation: SkipUntil</a>
      */
@@ -14716,8 +14714,8 @@ public final <U> Flowable<T> skipUntil(@NonNull Publisher<U> other) {
     }
 
     /**
-     * Returns a Flowable that skips all items emitted by the source Publisher as long as a specified
-     * condition holds true, but emits all further source items as soon as the condition becomes false.
+     * Returns a {@code Flowable} that skips all items emitted by the source {@link Publisher} as long as a specified
+     * condition holds {@code true}, but emits all further source items as soon as the condition becomes {@code false}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipWhile.png" alt="">
      * <dl>
@@ -14729,9 +14727,9 @@ public final <U> Flowable<T> skipUntil(@NonNull Publisher<U> other) {
      * </dl>
      *
      * @param predicate
-     *            a function to test each item emitted from the source Publisher
-     * @return a Flowable that begins emitting items emitted by the source Publisher when the specified
-     *         predicate becomes false
+     *            a function to test each item emitted from the source {@code Publisher}
+     * @return a {@code Flowable} that begins emitting items emitted by the source {@code Publisher} when the specified
+     *         predicate becomes {@code false}
      * @see <a href="http://reactivex.io/documentation/operators/skipwhile.html">ReactiveX operators documentation: SkipWhile</a>
      */
     @CheckReturnValue
@@ -14743,12 +14741,12 @@ public final Flowable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
         return RxJavaPlugins.onAssembly(new FlowableSkipWhile<>(this, predicate));
     }
     /**
-     * Returns a Flowable that emits the events emitted by source Publisher, in a
-     * sorted order. Each item emitted by the Publisher must implement {@link Comparable} with respect to all
+     * Returns a {@code Flowable} that emits the events emitted by source {@link Publisher}, in a
+     * sorted order. Each item emitted by the {@code Publisher} must implement {@link Comparable} with respect to all
      * other items in the sequence.
      *
-     * <p>If any item emitted by this Flowable does not implement {@link Comparable} with respect to
-     *             all other items emitted by this Flowable, no items will be emitted and the
+     * <p>If any item emitted by this {@code Flowable} does not implement {@code Comparable} with respect to
+     *             all other items emitted by this {@code Flowable}, no items will be emitted and the
      *             sequence is terminated with a {@link ClassCastException}.
      * <p>Note that calling {@code sorted} with long, non-terminating or infinite sources
      * might cause {@link OutOfMemoryError}
@@ -14761,7 +14759,7 @@ public final Flowable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
      *  <dd>{@code sorted} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that emits the items emitted by the source Publisher in sorted order
+     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} in sorted order
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -14772,7 +14770,7 @@ public final Flowable<T> sorted() {
     }
 
     /**
-     * Returns a Flowable that emits the events emitted by source Publisher, in a
+     * Returns a {@code Flowable} that emits the events emitted by source {@link Publisher}, in a
      * sorted order based on a specified comparison function.
      *
      * <p>Note that calling {@code sorted} with long, non-terminating or infinite sources
@@ -14787,9 +14785,9 @@ public final Flowable<T> sorted() {
      * </dl>
      *
      * @param sortFunction
-     *            a function that compares two items emitted by the source Publisher and returns an Integer
+     *            a function that compares two items emitted by the source {@code Publisher} and returns an {@link Integer}
      *            that indicates their sort order
-     * @return a Flowable that emits the items emitted by the source Publisher in sorted order
+     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} in sorted order
      */
     @CheckReturnValue
     @NonNull
@@ -14801,23 +14799,23 @@ public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> sortFunc
     }
 
     /**
-     * Returns a Flowable that emits the items in a specified {@link Iterable} before it begins to emit items
-     * emitted by the source Publisher.
+     * Returns a {@code Flowable} that emits the items in a specified {@link Iterable} before it begins to emit items
+     * emitted by the source {@link Publisher}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}
      *  is expected to honor backpressure as well. If it violates this rule, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWithIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param items
-     *            an Iterable that contains the items you want the modified Publisher to emit first
-     * @return a Flowable that emits the items in the specified {@link Iterable} and then emits the items
-     *         emitted by the source Publisher
+     *            an {@code Iterable} that contains the items you want the modified {@code Publisher} to emit first
+     * @return a {@code Flowable} that emits the items in the specified {@code Iterable} and then emits the items
+     *         emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithArray(Object...)
      * @see #startWithItem(Object)
@@ -14832,23 +14830,23 @@ public final Flowable<T> startWithIterable(@NonNull Iterable<? extends T> items)
     }
 
     /**
-     * Returns a Flowable that emits the items in a specified {@link Publisher} before it begins to emit
-     * items emitted by the source Publisher.
+     * Returns a {@code Flowable} that emits the items in a specified {@link Publisher} before it begins to emit
+     * items emitted by the source {@code Publisher}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.o.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the {@code other} {@code Publisher}s
      *  are expected to honor backpressure as well. If any of then violates this rule, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param other
-     *            a Publisher that contains the items you want the modified Publisher to emit first
-     * @return a Flowable that emits the items in the specified {@link Publisher} and then emits the items
-     *         emitted by the source Publisher
+     *            a {@code Publisher} that contains the items you want the modified {@code Publisher} to emit first
+     * @return a {@code Flowable} that emits the items in the specified {@code Publisher} and then emits the items
+     *         emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      */
     @CheckReturnValue
@@ -14861,23 +14859,23 @@ public final Flowable<T> startWith(@NonNull Publisher<? extends T> other) {
     }
 
     /**
-     * Returns a Flowable that emits a specified item before it begins to emit items emitted by the source
-     * Publisher.
+     * Returns a {@code Flowable} that emits a specified item before it begins to emit items emitted by the source
+     * {@link Publisher}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}
      *  is expected to honor backpressure as well. If it violates this rule, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWithItem} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param item
      *            the item to emit first
-     * @return a Flowable that emits the specified item before it begins to emit items emitted by the source
-     *         Publisher
+     * @return a {@code Flowable} that emits the specified item before it begins to emit items emitted by the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithArray(Object...)
      * @see #startWithIterable(Iterable)
@@ -14893,23 +14891,23 @@ public final Flowable<T> startWithItem(@NonNull T item) {
     }
 
     /**
-     * Returns a Flowable that emits the specified items before it begins to emit items emitted by the source
-     * Publisher.
+     * Returns a {@code Flowable} that emits the specified items before it begins to emit items emitted by the source
+     * {@link Publisher}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}
      *  is expected to honor backpressure as well. If it violates this rule, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWithArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param items
      *            the array of values to emit first
-     * @return a Flowable that emits the specified items before it begins to emit items emitted by the source
-     *         Publisher
+     * @return a {@code Flowable} that emits the specified items before it begins to emit items emitted by the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithItem(Object)
      * @see #startWithIterable(Iterable)
@@ -14928,11 +14926,11 @@ public final Flowable<T> startWithArray(@NonNull T... items) {
     }
 
     /**
-     * Subscribes to a Publisher and ignores {@code onNext} and {@code onComplete} emissions.
+     * Subscribes to a {@link Publisher} and ignores {@code onNext} and {@code onComplete} emissions.
      * <p>
-     * If the Flowable emits an error, it is wrapped into an
+     * If the {@code Flowable} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
@@ -14942,7 +14940,7 @@ public final Flowable<T> startWithArray(@NonNull T... items) {
      * </dl>
      *
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the Publisher has finished sending them
+     *         the {@code Publisher} has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -14953,11 +14951,11 @@ public final Disposable subscribe() {
     }
 
     /**
-     * Subscribes to a Publisher and provides a callback to handle the items it emits.
+     * Subscribes to a {@link Publisher} and provides a callback to handle the items it emits.
      * <p>
-     * If the Flowable emits an error, it is wrapped into an
+     * If the {@code Flowable} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
@@ -14967,11 +14965,11 @@ public final Disposable subscribe() {
      * </dl>
      *
      * @param onNext
-     *             the {@code Consumer<T>} you have designed to accept emissions from the Publisher
+     *             the {@code Consumer<T>} you have designed to accept emissions from the {@code Publisher}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the Publisher has finished sending them
+     *         the {@code Publisher} has finished sending them
      * @throws NullPointerException
-     *             if {@code onNext} is null
+     *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -14983,7 +14981,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Subscribes to a Publisher and provides callbacks to handle the items it emits and any error
+     * Subscribes to a {@link Publisher} and provides callbacks to handle the items it emits and any error
      * notification it issues.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -14994,16 +14992,16 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
      * </dl>
      *
      * @param onNext
-     *             the {@code Consumer<T>} you have designed to accept emissions from the Publisher
+     *             the {@code Consumer<T>} you have designed to accept emissions from the {@code Publisher}
      * @param onError
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
-     *             Publisher
+     *             {@code Publisher}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the Publisher has finished sending them
+     *         the {@code Publisher} has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
-     *             if {@code onNext} is null, or
-     *             if {@code onError} is null
+     *             if {@code onNext} is {@code null}, or
+     *             if {@code onError} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -15014,7 +15012,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
     }
 
     /**
-     * Subscribes to a Publisher and provides callbacks to handle the items it emits and any error or
+     * Subscribes to a {@link Publisher} and provides callbacks to handle the items it emits and any error or
      * completion notification it issues.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -15025,19 +15023,19 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
      * </dl>
      *
      * @param onNext
-     *             the {@code Consumer<T>} you have designed to accept emissions from the Publisher
+     *             the {@code Consumer<T>} you have designed to accept emissions from the {@code Publisher}
      * @param onError
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
-     *             Publisher
+     *             {@code Publisher}
      * @param onComplete
-     *             the {@code Action} you have designed to accept a completion notification from the
-     *             Publisher
+     *             the {@link Action} you have designed to accept a completion notification from the
+     *             {@code Publisher}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the Publisher has finished sending them
+     *         the {@code Publisher} has finished sending them
      * @throws NullPointerException
-     *             if {@code onNext} is null, or
-     *             if {@code onError} is null, or
-     *             if {@code onComplete} is null
+     *             if {@code onNext} is {@code null}, or
+     *             if {@code onError} is {@code null}, or
+     *             if {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -15070,31 +15068,31 @@ public final void subscribe(@NonNull Subscriber<? super T> s) {
     }
 
     /**
-     * Establish a connection between this Flowable and the given FlowableSubscriber and
-     * start streaming events based on the demand of the FlowableSubscriber.
+     * Establish a connection between this {@code Flowable} and the given {@link FlowableSubscriber} and
+     * start streaming events based on the demand of the {@code FlowableSubscriber}.
      * <p>
      * This is a "factory method" and can be called multiple times, each time starting a new {@link Subscription}.
      * <p>
-     * Each {@link Subscription} will work for only a single {@link FlowableSubscriber}.
+     * Each {@code Subscription} will work for only a single {@code FlowableSubscriber}.
      * <p>
-     * If the same {@link FlowableSubscriber} instance is subscribed to multiple {@link Flowable}s and/or the
-     * same {@link Flowable} multiple times, it must ensure the serialization over its {@code onXXX}
+     * If the same {@code FlowableSubscriber} instance is subscribed to multiple {@code Flowable}s and/or the
+     * same {@code Flowable} multiple times, it must ensure the serialization over its {@code onXXX}
      * methods manually.
      * <p>
-     * If the {@link Flowable} rejects the subscription attempt or otherwise fails it will signal
+     * If the {@code Flowable} rejects the subscription attempt or otherwise fails it will signal
      * the error via {@link FlowableSubscriber#onError(Throwable)}.
      * <p>
-     * This subscribe method relaxes the following Reactive Streams rules:
+     * This subscribe method relaxes the following <em>Reactive Streams</em> rules:
      * <ul>
-     * <li>§1.3: onNext should not be called concurrently until onSubscribe returns.
-     *     <b>FlowableSubscriber.onSubscribe should make sure a sync or async call triggered by request() is safe.</b></li>
-     * <li>§2.3: onError or onComplete must not call cancel.
+     * <li>§1.3: {@code onNext} should not be called concurrently until {@code onSubscribe} returns.
+     *     <b>{@link FlowableSubscriber#onSubscribe(Subscription)} should make sure a sync or async call triggered by request() is safe.</b></li>
+     * <li>§2.3: {@code onError} or {@code onComplete} must not call cancel.
      *     <b>Calling request() or cancel() is NOP at this point.</b></li>
-     * <li>§2.12: onSubscribe must be called at most once on the same instance.
-     *     <b>FlowableSubscriber reuse is not checked and if happens, it is the responsibility of
-     *     the FlowableSubscriber to ensure proper serialization of its onXXX methods.</b></li>
-     * <li>§3.9: negative requests should emit an onError(IllegalArgumentException).
-     *     <b>Non-positive requests signal via RxJavaPlugins.onError and the stream is not affected.</b></li>
+     * <li>§2.12: {@code onSubscribe} must be called at most once on the same instance.
+     *     <b>{@code FlowableSubscriber} reuse is not checked and if happens, it is the responsibility of
+     *     the {@code FlowableSubscriber} to ensure proper serialization of its onXXX methods.</b></li>
+     * <li>§3.9: negative requests should emit an {@code onError(IllegalArgumentException)}.
+     *     <b>Non-positive requests signal via {@link RxJavaPlugins#onError(Throwable)} and the stream is not affected.</b></li>
      * </ul>
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -15103,7 +15101,7 @@ public final void subscribe(@NonNull Subscriber<? super T> s) {
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.7 - experimental; 2.1 - beta
-     * @param s the FlowableSubscriber that will consume signals from this Flowable
+     * @param s the {@code FlowableSubscriber} that will consume signals from this {@code Flowable}
      * @since 2.2
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
@@ -15136,13 +15134,13 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
      * <p>There is no need to call any of the plugin hooks on the current {@code Flowable} instance or
      * the {@code Subscriber}; all hooks and basic safeguards have been
      * applied by {@link #subscribe(Subscriber)} before this method gets called.
-     * @param s the incoming Subscriber, never null
+     * @param s the incoming {@code Subscriber}, never {@code null}
      */
     protected abstract void subscribeActual(@NonNull Subscriber<? super T> s);
 
     /**
-     * Subscribes a given Subscriber (subclass) to this Flowable and returns the given
-     * Subscriber as is.
+     * Subscribes a given {@link Subscriber} (subclass) to this {@code Flowable} and returns the given
+     * {@code Subscriber} as is.
      * <p>Usage example:
      * <pre><code>
      * Flowable&lt;Integer&gt; source = Flowable.range(1, 10);
@@ -15161,10 +15159,10 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <E> the type of the Subscriber to use and return
-     * @param subscriber the Subscriber (subclass) to use and return, not null
+     * @param <E> the type of the {@code Subscriber} to use and return
+     * @param subscriber the {@code Subscriber} (subclass) to use and return, not {@code null}
      * @return the input {@code subscriber}
-     * @throws NullPointerException if {@code subscriber} is null
+     * @throws NullPointerException if {@code subscriber} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -15177,7 +15175,7 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
     }
 
     /**
-     * Asynchronously subscribes Subscribers to this Publisher on the specified {@link Scheduler}.
+     * Asynchronously subscribes {@link Subscriber}s to this {@link Publisher} on the specified {@link Scheduler}.
      * <p>
      * If there is a {@link #create(FlowableOnSubscribe, BackpressureStrategy)} type source up in the
      * chain, it is recommended to use {@code subscribeOn(scheduler, false)} instead
@@ -15189,13 +15187,13 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
      *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to perform subscription actions on
-     * @return the source Publisher modified so that its subscriptions happen on the
-     *         specified {@link Scheduler}
+     *            the {@code Scheduler} to perform subscription actions on
+     * @return the source {@code Publisher} modified so that its subscriptions happen on the
+     *         specified {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #observeOn
@@ -15211,11 +15209,11 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Asynchronously subscribes Subscribers to this Publisher on the specified {@link Scheduler}
-     * optionally reroutes requests from other threads to the same {@link Scheduler} thread.
+     * Asynchronously subscribes {@link Subscriber}s to this {@link Publisher} on the specified {@link Scheduler}
+     * optionally reroutes requests from other threads to the same {@code Scheduler} thread.
      * <p>
      * If there is a {@link #create(FlowableOnSubscribe, BackpressureStrategy)} type source up in the
-     * chain, it is recommended to have {@code requestOn} false to avoid same-pool deadlock
+     * chain, it is recommended to have {@code requestOn} {@code false} to avoid same-pool deadlock
      * because requests may pile up behind an eager/blocking emitter.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.png" alt="">
@@ -15224,16 +15222,16 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
      *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      * <p>History: 2.1.1 - experimental
      * @param scheduler
-     *            the {@link Scheduler} to perform subscription actions on
-     * @param requestOn if true, requests are rerouted to the given Scheduler as well (strong pipelining)
-     *                  if false, requests coming from any thread are simply forwarded to
+     *            the {@code Scheduler} to perform subscription actions on
+     * @param requestOn if {@code true}, requests are rerouted to the given {@code Scheduler} as well (strong pipelining)
+     *                  if {@code false}, requests coming from any thread are simply forwarded to
      *                  the upstream on the same thread (weak pipelining)
-     * @return the source Publisher modified so that its subscriptions happen on the
-     *         specified {@link Scheduler}
+     * @return the source {@code Publisher} modified so that its subscriptions happen on the
+     *         specified {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #observeOn
@@ -15249,15 +15247,15 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by the source Publisher or the items of an alternate
-     * Publisher if the source Publisher is empty.
+     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} or the items of an alternate
+     * {@code Publisher} if the source {@code Publisher} is empty.
      * <p>
      * <img width="640" height="255" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>If the source {@code Publisher} is empty, the alternate {@code Publisher} is expected to honor backpressure.
      *  If the source {@code Publisher} is non-empty, it is expected to honor backpressure as instead.
-     *  In either case, if violated, a {@code MissingBackpressureException} <em>may</em> get
+     *  In either case, if violated, a {@link MissingBackpressureException} <em>may</em> get
      *  signaled somewhere downstream.
      *  </dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -15265,9 +15263,9 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
      * </dl>
      *
      * @param other
-     *              the alternate Publisher to subscribe to if the source does not emit any items
-     * @return  a Publisher that emits the items emitted by the source Publisher or the items of an
-     *          alternate Publisher if the source Publisher is empty.
+     *              the alternate {@code Publisher} to subscribe to if the source does not emit any items
+     * @return  a {@code Publisher} that emits the items emitted by the source {@code Publisher} or the items of an
+     *          alternate {@code Publisher} if the source {@code Publisher} is empty.
      * @since 1.1.0
      */
     @CheckReturnValue
@@ -15280,29 +15278,29 @@ public final Flowable<T> switchIfEmpty(@NonNull Publisher<? extends T> other) {
     }
 
     /**
-     * Returns a new Publisher by applying a function that you supply to each item emitted by the source
-     * Publisher that returns a Publisher, and then emitting the items emitted by the most recently emitted
-     * of these Publishers.
+     * Returns a new {@link Publisher} by applying a function that you supply to each item emitted by the source
+     * {@code Publisher} that returns a {@code Publisher}, and then emitting the items emitted by the most recently emitted
+     * of these {@code Publisher}s.
      * <p>
-     * The resulting Publisher completes if both the upstream Publisher and the last inner Publisher, if any, complete.
-     * If the upstream Publisher signals an onError, the inner Publisher is canceled and the error delivered in-sequence.
+     * The resulting {@code Publisher} completes if both the upstream {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * If the upstream {@code Publisher} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
      *  unbounded manner (i.e., without backpressure) and the inner {@code Publisher}s are expected to honor
-     *  backpressure but it is not enforced; the operator won't signal a {@code MissingBackpressureException}
-     *  but the violation <em>may</em> lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *  backpressure but it is not enforced; the operator won't signal a {@link MissingBackpressureException}
+     *  but the violation <em>may</em> lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the element type of the inner Publishers and the output
+     * @param <R> the element type of the inner {@code Publisher}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
-     * @return a Flowable that emits the items emitted by the Publisher returned from applying {@code func} to the most recently emitted item emitted by the source Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapDelayError(Function)
      */
@@ -15315,31 +15313,31 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
     }
 
     /**
-     * Returns a new Publisher by applying a function that you supply to each item emitted by the source
-     * Publisher that returns a Publisher, and then emitting the items emitted by the most recently emitted
-     * of these Publishers.
+     * Returns a new {@link Publisher} by applying a function that you supply to each item emitted by the source
+     * {@code Publisher} that returns a {@code Publisher}, and then emitting the items emitted by the most recently emitted
+     * of these {@code Publisher}s.
      * <p>
-     * The resulting Publisher completes if both the upstream Publisher and the last inner Publisher, if any, complete.
-     * If the upstream Publisher signals an onError, the inner Publisher is canceled and the error delivered in-sequence.
+     * The resulting {@code Publisher} completes if both the upstream {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * If the upstream {@code Publisher} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
      *  unbounded manner (i.e., without backpressure) and the inner {@code Publisher}s are expected to honor
-     *  backpressure but it is not enforced; the operator won't signal a {@code MissingBackpressureException}
-     *  but the violation <em>may</em> lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *  backpressure but it is not enforced; the operator won't signal a {@link MissingBackpressureException}
+     *  but the violation <em>may</em> lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the element type of the inner Publishers and the output
+     * @param <R> the element type of the inner {@code Publisher}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
      * @param bufferSize
-     *            the number of elements to prefetch from the current active inner Publisher
-     * @return a Flowable that emits the items emitted by the Publisher returned from applying {@code func} to the most recently emitted item emitted by the source Publisher
+     *            the number of elements to prefetch from the current active inner {@code Publisher}
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapDelayError(Function, int)
      */
@@ -15361,30 +15359,30 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
      * Since a {@code CompletableSource} doesn't produce any items, the resulting reactive type of
      * this operator is a {@link Completable} that can only indicate successful completion or
      * a failure in any of the inner {@code CompletableSource}s or the failure of the current
-     * {@link Flowable}.
+     * {@code Flowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the current {@link Flowable} in an unbounded manner and otherwise
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner and otherwise
      *  does not have backpressure in its return type because no items are ever produced.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
      *  <dd>If either this {@code Flowable} or the active {@code CompletableSource} signals an {@code onError},
-     *  the resulting {@code Completable} is terminated immediately with that {@code Throwable}.
+     *  the resulting {@code Completable} is terminated immediately with that {@link Throwable}.
      *  Use the {@link #switchMapCompletableDelayError(Function)} to delay such inner failures until
      *  every inner {@code CompletableSource}s and the main {@code Flowable} terminates in some fashion.
      *  If they fail concurrently, the operator may combine the {@code Throwable}s into a
      *  {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}
      *  and signal it to the downstream instead. If any inactivated (switched out) {@code CompletableSource}
      *  signals an {@code onError} late, the {@code Throwable}s will be signaled to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors.
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors.
      *  </dd>
      * </dl>
      * <p>History: 2.1.11 - experimental
      * @param mapper the function called with each upstream item and should return a
-     *               {@link CompletableSource} to be subscribed to and awaited for
+     *               {@code CompletableSource} to be subscribed to and awaited for
      *               (non blockingly) for its terminal event
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
      * @see #switchMapCompletableDelayError(Function)
      * @since 2.2
      */
@@ -15408,30 +15406,30 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
      * Since a {@code CompletableSource} doesn't produce any items, the resulting reactive type of
      * this operator is a {@link Completable} that can only indicate successful completion or
      * a failure in any of the inner {@code CompletableSource}s or the failure of the current
-     * {@link Flowable}.
+     * {@code Flowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the current {@link Flowable} in an unbounded manner and otherwise
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner and otherwise
      *  does not have backpressure in its return type because no items are ever produced.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapCompletableDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>Errors of this {@code Flowable} and all the {@code CompletableSource}s, who had the chance
+     *  <dd>The errors of this {@code Flowable} and all the {@code CompletableSource}s, who had the chance
      *  to run to their completion, are delayed until
      *  all of them terminate in some fashion. At this point, if there was only one failure, the respective
-     *  {@code Throwable} is emitted to the downstream. If there was more than one failure, the
+     *  {@link Throwable} is emitted to the downstream. If there was more than one failure, the
      *  operator combines all {@code Throwable}s into a {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}
      *  and signals that to the downstream.
      *  If any inactivated (switched out) {@code CompletableSource}
      *  signals an {@code onError} late, the {@code Throwable}s will be signaled to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors.
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors.
      *  </dd>
      * </dl>
      * <p>History: 2.1.11 - experimental
      * @param mapper the function called with each upstream item and should return a
-     *               {@link CompletableSource} to be subscribed to and awaited for
+     *               {@code CompletableSource} to be subscribed to and awaited for
      *               (non blockingly) for its terminal event
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
      * @see #switchMapCompletable(Function)
      * @since 2.2
      */
@@ -15445,30 +15443,30 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
     }
 
     /**
-     * Returns a new Publisher by applying a function that you supply to each item emitted by the source
-     * Publisher that returns a Publisher, and then emitting the items emitted by the most recently emitted
-     * of these Publishers and delays any error until all Publishers terminate.
+     * Returns a new {@link Publisher} by applying a function that you supply to each item emitted by the source
+     * {@code Publisher} that returns a {@code Publisher}, and then emitting the items emitted by the most recently emitted
+     * of these {@code Publisher}s and delays any error until all {@code Publisher}s terminate.
      * <p>
-     * The resulting Publisher completes if both the upstream Publisher and the last inner Publisher, if any, complete.
-     * If the upstream Publisher signals an onError, the termination of the last inner Publisher will emit that error as is
-     * or wrapped into a CompositeException along with the other possible errors the former inner Publishers signaled.
+     * The resulting {@code Publisher} completes if both the upstream {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * If the upstream {@code Publisher} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
+     * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
      *  unbounded manner (i.e., without backpressure) and the inner {@code Publisher}s are expected to honor
-     *  backpressure but it is not enforced; the operator won't signal a {@code MissingBackpressureException}
-     *  but the violation <em>may</em> lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *  backpressure but it is not enforced; the operator won't signal a {@link MissingBackpressureException}
+     *  but the violation <em>may</em> lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the element type of the inner Publishers and the output
+     * @param <R> the element type of the inner {@code Publisher}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
-     * @return a Flowable that emits the items emitted by the Publisher returned from applying {@code func} to the most recently emitted item emitted by the source Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMap(Function)
      * @since 2.0
@@ -15482,32 +15480,32 @@ public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ?
     }
 
     /**
-     * Returns a new Publisher by applying a function that you supply to each item emitted by the source
-     * Publisher that returns a Publisher, and then emitting the items emitted by the most recently emitted
-     * of these Publishers and delays any error until all Publishers terminate.
+     * Returns a new {@link Publisher} by applying a function that you supply to each item emitted by the source
+     * {@code Publisher} that returns a {@code Publisher}, and then emitting the items emitted by the most recently emitted
+     * of these {@code Publisher}s and delays any error until all {@code Publisher}s terminate.
      * <p>
-     * The resulting Publisher completes if both the upstream Publisher and the last inner Publisher, if any, complete.
-     * If the upstream Publisher signals an onError, the termination of the last inner Publisher will emit that error as is
-     * or wrapped into a CompositeException along with the other possible errors the former inner Publishers signaled.
+     * The resulting {@code Publisher} completes if both the upstream {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * If the upstream {@code Publisher} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
+     * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
      *  unbounded manner (i.e., without backpressure) and the inner {@code Publisher}s are expected to honor
-     *  backpressure but it is not enforced; the operator won't signal a {@code MissingBackpressureException}
-     *  but the violation <em>may</em> lead to {@code OutOfMemoryError} due to internal buffer bloat.</dd>
+     *  backpressure but it is not enforced; the operator won't signal a {@link MissingBackpressureException}
+     *  but the violation <em>may</em> lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the element type of the inner Publishers and the output
+     * @param <R> the element type of the inner {@code Publisher}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source Publisher, returns a
-     *            Publisher
+     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            {@code Publisher}
      * @param bufferSize
-     *            the number of elements to prefetch from the current active inner Publisher
-     * @return a Flowable that emits the items emitted by the Publisher returned from applying {@code func} to the most recently emitted item emitted by the source Publisher
+     *            the number of elements to prefetch from the current active inner {@code Publisher}
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMap(Function, int)
      * @since 2.0
@@ -15550,8 +15548,8 @@ <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<? extends R>>
      *  <dt><b>Error handling:</b></dt>
      *  <dd>This operator terminates with an {@code onError} if this {@code Flowable} or any of
      *  the inner {@code MaybeSource}s fail while they are active. When this happens concurrently, their
-     *  individual {@code Throwable} errors may get combined and emitted as a single
-     *  {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}. Otherwise, a late
+     *  individual {@link Throwable} errors may get combined and emitted as a single
+     *  {@link CompositeException}. Otherwise, a late
      *  (i.e., inactive or switched out) {@code onError} from this {@code Flowable} or from any of
      *  the inner {@code MaybeSource}s will be forwarded to the global error handler via
      *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} as
@@ -15562,7 +15560,7 @@ <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<? extends R>>
      * @param mapper the function called with the current upstream event and should
      *               return a {@code MaybeSource} to replace the current active inner source
      *               and get subscribed to.
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @see #switchMapMaybeDelayError(Function)
      * @since 2.2
      */
@@ -15593,7 +15591,7 @@ public final <R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? exten
      * @param mapper the function called with the current upstream event and should
      *               return a {@code MaybeSource} to replace the current active inner source
      *               and get subscribed to.
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @see #switchMapMaybe(Function)
      * @since 2.2
      */
@@ -15622,8 +15620,8 @@ public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super
      *  <dt><b>Error handling:</b></dt>
      *  <dd>This operator terminates with an {@code onError} if this {@code Flowable} or any of
      *  the inner {@code SingleSource}s fail while they are active. When this happens concurrently, their
-     *  individual {@code Throwable} errors may get combined and emitted as a single
-     *  {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}. Otherwise, a late
+     *  individual {@link Throwable} errors may get combined and emitted as a single
+     *  {@link CompositeException}. Otherwise, a late
      *  (i.e., inactive or switched out) {@code onError} from this {@code Flowable} or from any of
      *  the inner {@code SingleSource}s will be forwarded to the global error handler via
      *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} as
@@ -15634,7 +15632,7 @@ public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super
      * @param mapper the function called with the current upstream event and should
      *               return a {@code SingleSource} to replace the current active inner source
      *               and get subscribed to.
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @see #switchMapSingleDelayError(Function)
      * @since 2.2
      */
@@ -15665,7 +15663,7 @@ public final <R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? exte
      * @param mapper the function called with the current upstream event and should
      *               return a {@code SingleSource} to replace the current active inner source
      *               and get subscribed to.
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @see #switchMapSingle(Function)
      * @since 2.2
      */
@@ -15679,12 +15677,12 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
     }
 
     /**
-     * Returns a Flowable that emits only the first {@code count} items emitted by the source Publisher. If the source emits fewer than
+     * Returns a {@code Flowable} that emits only the first {@code count} items emitted by the source {@link Publisher}. If the source emits fewer than
      * {@code count} items then all of its items are emitted.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.png" alt="">
      * <p>
-     * This method returns a Publisher that will invoke a subscribing {@link Subscriber}'s
+     * This method returns a {@code Publisher} that will invoke a subscribing {@link Subscriber}'s
      * {@link Subscriber#onNext onNext} function a maximum of {@code count} times before invoking
      * {@link Subscriber#onComplete onComplete}.
      * <p>
@@ -15714,8 +15712,8 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
      *            the maximum number of items and the total request amount, non-negative.
      *            Zero will immediately cancel the upstream on subscription and complete
      *            the downstream.
-     * @return a Flowable that emits only the first {@code count} items emitted by the source Publisher, or
-     *         all of the items from the source Publisher if that Publisher emits fewer than {@code count} items
+     * @return a {@code Flowable} that emits only the first {@code count} items emitted by the source {@code Publisher}, or
+     *         all of the items from the source {@code Publisher} if that {@code Publisher} emits fewer than {@code count} items
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
     @CheckReturnValue
@@ -15730,7 +15728,7 @@ public final Flowable<T> take(long count) {
     }
 
     /**
-     * Returns a Flowable that emits those items emitted by source Publisher before a specified time runs
+     * Returns a {@code Flowable} that emits those items emitted by source {@link Publisher} before a specified time runs
      * out.
      * <p>
      * If time runs out before the {@code Flowable} completes normally, the {@code onComplete} event will be
@@ -15742,14 +15740,14 @@ public final Flowable<T> take(long count) {
      *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>This version of {@code take} operates by default on the {@code computation} {@link Scheduler}.</dd>
+     *  <dd>This version of {@code take} operates by default on the {@code computation} {@code Scheduler}.</dd>
      * </dl>
      *
      * @param time
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a Flowable that emits those items emitted by the source Publisher before the time runs out
+     * @return a {@code Flowable} that emits those items emitted by the source {@code Publisher} before the time runs out
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
     @CheckReturnValue
@@ -15761,11 +15759,11 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that emits those items emitted by source Publisher before a specified time (on a
-     * specified Scheduler) runs out.
+     * Returns a {@code Flowable} that emits those items emitted by source {@link Publisher} before a specified time (on a
+     * specified {@link Scheduler}) runs out.
      * <p>
      * If time runs out before the {@code Flowable} completes normally, the {@code onComplete} event will be
-     * signaled on the provided {@link Scheduler}.
+     * signaled on the provided {@code Scheduler}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.ts.png" alt="">
      * <dl>
@@ -15773,7 +15771,7 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit) {
      *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param time
@@ -15781,9 +15779,9 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler used for time source
-     * @return a Flowable that emits those items emitted by the source Publisher before the time runs out,
-     *         according to the specified Scheduler
+     *            the {@code Scheduler} used for time source
+     * @return a {@code Flowable} that emits those items emitted by the source {@code Publisher} before the time runs out,
+     *         according to the specified {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
     @CheckReturnValue
@@ -15795,7 +15793,7 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit, @NonNull Schedu
     }
 
     /**
-     * Returns a Flowable that emits at most the last {@code count} items emitted by the source Publisher. If the source emits fewer than
+     * Returns a {@code Flowable} that emits at most the last {@code count} items emitted by the source {@link Publisher}. If the source emits fewer than
      * {@code count} items then all of its items are emitted.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.n.png" alt="">
@@ -15809,8 +15807,8 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit, @NonNull Schedu
      *
      * @param count
      *            the maximum number of items to emit from the end of the sequence of items emitted by the source
-     *            Publisher
-     * @return a Flowable that emits at most the last {@code count} items emitted by the source Publisher
+     *            {@code Publisher}
+     * @return a {@code Flowable} that emits at most the last {@code count} items emitted by the source {@code Publisher}
      * @throws IndexOutOfBoundsException
      *             if {@code count} is less than zero
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -15833,8 +15831,8 @@ public final Flowable<T> takeLast(int count) {
     }
 
     /**
-     * Returns a Flowable that emits at most a specified number of items from the source Publisher that were
-     * emitted in a specified window of time before the Publisher completed.
+     * Returns a {@code Flowable} that emits at most a specified number of items from the source {@link Publisher} that were
+     * emitted in a specified window of time before the {@code Publisher} completed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tn.png" alt="">
      * <dl>
@@ -15852,8 +15850,8 @@ public final Flowable<T> takeLast(int count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a Flowable that emits at most {@code count} items from the source Publisher that were emitted
-     *         in a specified window of time before the Publisher completed
+     * @return a {@code Flowable} that emits at most {@code count} items from the source {@code Publisher} that were emitted
+     *         in a specified window of time before the {@code Publisher} completed
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -15865,9 +15863,9 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit)
     }
 
     /**
-     * Returns a Flowable that emits at most a specified number of items from the source Publisher that were
-     * emitted in a specified window of time before the Publisher completed, where the timing information is
-     * provided by a given Scheduler.
+     * Returns a {@code Flowable} that emits at most a specified number of items from the source {@link Publisher} that were
+     * emitted in a specified window of time before the {@code Publisher} completed, where the timing information is
+     * provided by a given {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
      * <dl>
@@ -15875,7 +15873,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit)
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
      *  unbounded manner (i.e., no backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use for tracking the current time</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use for tracking the current time</dd>
      * </dl>
      *
      * @param count
@@ -15885,9 +15883,9 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit)
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the {@link Scheduler} that provides the timestamps for the observed items
-     * @return a Flowable that emits at most {@code count} items from the source Publisher that were emitted
-     *         in a specified window of time before the Publisher completed, where the timing information is
+     *            the {@code Scheduler} that provides the timestamps for the observed items
+     * @return a {@code Flowable} that emits at most {@code count} items from the source {@code Publisher} that were emitted
+     *         in a specified window of time before the {@code Publisher} completed, where the timing information is
      *         provided by the given {@code scheduler}
      * @throws IndexOutOfBoundsException
      *             if {@code count} is less than zero
@@ -15902,9 +15900,9 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a Flowable that emits at most a specified number of items from the source Publisher that were
-     * emitted in a specified window of time before the Publisher completed, where the timing information is
-     * provided by a given Scheduler.
+     * Returns a {@code Flowable} that emits at most a specified number of items from the source {@link Publisher} that were
+     * emitted in a specified window of time before the {@code Publisher} completed, where the timing information is
+     * provided by a given {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
      * <dl>
@@ -15912,7 +15910,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
      *  unbounded manner (i.e., no backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use for tracking the current time</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use for tracking the current time</dd>
      * </dl>
      *
      * @param count
@@ -15922,14 +15920,14 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the {@link Scheduler} that provides the timestamps for the observed items
+     *            the {@code Scheduler} that provides the timestamps for the observed items
      * @param delayError
-     *            if true, an exception signaled by the current Flowable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signaled and all regular elements dropped
+     *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return a Flowable that emits at most {@code count} items from the source Publisher that were emitted
-     *         in a specified window of time before the Publisher completed, where the timing information is
+     * @return a {@code Flowable} that emits at most {@code count} items from the source {@code Publisher} that were emitted
+     *         in a specified window of time before the {@code Publisher} completed, where the timing information is
      *         provided by the given {@code scheduler}
      * @throws IndexOutOfBoundsException
      *             if {@code count} is less than zero
@@ -15950,15 +15948,15 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a Flowable that emits the items from the source Publisher that were emitted in a specified
-     * window of time before the Publisher completed.
+     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
+     * window of time before the {@code Publisher} completed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
-     *  lead to {@code OutOfMemoryError} due to internal buffer bloat.
+     *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit)} in this case.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code takeLast} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -15968,8 +15966,8 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a Flowable that emits the items from the source Publisher that were emitted in the window of
-     *         time before the Publisher completed specified by {@code time}
+     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
+     *         time before the {@code Publisher} completed specified by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -15981,15 +15979,15 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that emits the items from the source Publisher that were emitted in a specified
-     * window of time before the Publisher completed.
+     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
+     * window of time before the {@code Publisher} completed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
-     *  lead to {@code OutOfMemoryError} due to internal buffer bloat.
+     *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit)} in this case.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code takeLast} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -16000,10 +15998,10 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code time}
      * @param delayError
-     *            if true, an exception signaled by the current Flowable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signaled and all regular elements dropped
-     * @return a Flowable that emits the items from the source Publisher that were emitted in the window of
-     *         time before the Publisher completed specified by {@code time}
+     *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
+     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
+     *         time before the {@code Publisher} completed specified by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -16015,19 +16013,19 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, boolean del
     }
 
     /**
-     * Returns a Flowable that emits the items from the source Publisher that were emitted in a specified
-     * window of time before the Publisher completed, where the timing information is provided by a specified
-     * Scheduler.
+     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
+     * window of time before the {@code Publisher} completed, where the timing information is provided by a specified
+     * {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
-     *  lead to {@code OutOfMemoryError} due to internal buffer bloat.
+     *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit, Scheduler)} in this case.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param time
@@ -16035,9 +16033,9 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, boolean del
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that provides the timestamps for the Observed items
-     * @return a Flowable that emits the items from the source Publisher that were emitted in the window of
-     *         time before the Publisher completed specified by {@code time}, where the timing information is
+     *            the {@code Scheduler} that provides the timestamps for the observed items
+     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
+     *         time before the {@code Publisher} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -16050,19 +16048,19 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a Flowable that emits the items from the source Publisher that were emitted in a specified
-     * window of time before the Publisher completed, where the timing information is provided by a specified
-     * Scheduler.
+     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
+     * window of time before the {@code Publisher} completed, where the timing information is provided by a specified
+     * {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
-     *  lead to {@code OutOfMemoryError} due to internal buffer bloat.
+     *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit, Scheduler)} in this case.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param time
@@ -16070,12 +16068,12 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that provides the timestamps for the Observed items
+     *            the {@code Scheduler} that provides the timestamps for the observed items
      * @param delayError
-     *            if true, an exception signaled by the current Flowable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signaled and all regular elements dropped
-     * @return a Flowable that emits the items from the source Publisher that were emitted in the window of
-     *         time before the Publisher completed specified by {@code time}, where the timing information is
+     *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
+     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
+     *         time before the {@code Publisher} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -16088,19 +16086,19 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a Flowable that emits the items from the source Publisher that were emitted in a specified
-     * window of time before the Publisher completed, where the timing information is provided by a specified
-     * Scheduler.
+     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
+     * window of time before the {@code Publisher} completed, where the timing information is provided by a specified
+     * {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
-     *  lead to {@code OutOfMemoryError} due to internal buffer bloat.
+     *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit, Scheduler)} in this case.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param time
@@ -16108,14 +16106,14 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that provides the timestamps for the Observed items
+     *            the {@code Scheduler} that provides the timestamps for the observed items
      * @param delayError
-     *            if true, an exception signaled by the current Flowable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signaled and all regular elements dropped
+     *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return a Flowable that emits the items from the source Publisher that were emitted in the window of
-     *         time before the Publisher completed specified by {@code time}, where the timing information is
+     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
+     *         time before the {@code Publisher} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -16128,7 +16126,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a Flowable that emits items emitted by the source Publisher, checks the specified predicate
+     * Returns a {@code Flowable} that emits items emitted by the source {@link Publisher}, checks the specified predicate
      * for each item, and then completes when the condition is satisfied.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.p.png" alt="">
@@ -16145,8 +16143,8 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * </dl>
      *
      * @param stopPredicate
-     *            a function that evaluates an item emitted by the source Publisher and returns a Boolean
-     * @return a Flowable that first emits items emitted by the source Publisher, checks the specified
+     *            a function that evaluates an item emitted by the source {@code Publisher} and returns a {@link Boolean}
+     * @return a {@code Flowable} that first emits items emitted by the source {@code Publisher}, checks the specified
      *         condition after each item, and then completes when the condition is satisfied.
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      * @see Flowable#takeWhile(Predicate)
@@ -16162,7 +16160,7 @@ public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate)
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by the source Publisher until a second Publisher
+     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} until a second {@code Publisher}
      * emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
@@ -16175,11 +16173,11 @@ public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate)
      * </dl>
      *
      * @param other
-     *            the Publisher whose first emitted item will cause {@code takeUntil} to stop emitting items
-     *            from the source Publisher
+     *            the {@code Publisher} whose first emitted item will cause {@code takeUntil} to stop emitting items
+     *            from the source {@code Publisher}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return a Flowable that emits the items emitted by the source Publisher until such time as {@code other} emits its first item
+     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} until such time as {@code other} emits its first item
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
     @CheckReturnValue
@@ -16192,7 +16190,7 @@ public final <U> Flowable<T> takeUntil(@NonNull Publisher<U> other) {
     }
 
     /**
-     * Returns a Flowable that emits items emitted by the source Publisher so long as each item satisfied a
+     * Returns a {@code Flowable} that emits items emitted by the source {@link Publisher} so long as each item satisfied a
      * specified condition, and then completes as soon as this condition is not satisfied.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeWhile.png" alt="">
@@ -16205,8 +16203,8 @@ public final <U> Flowable<T> takeUntil(@NonNull Publisher<U> other) {
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates an item emitted by the source Publisher and returns a Boolean
-     * @return a Flowable that emits the items from the source Publisher so long as each item satisfies the
+     *            a function that evaluates an item emitted by the source {@code Publisher} and returns a {@link Boolean}
+     * @return a {@code Flowable} that emits the items from the source {@code Publisher} so long as each item satisfies the
      *         condition defined by {@code predicate}, then completes
      * @see <a href="http://reactivex.io/documentation/operators/takewhile.html">ReactiveX operators documentation: TakeWhile</a>
      * @see Flowable#takeUntil(Predicate)
@@ -16221,7 +16219,7 @@ public final Flowable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns a Flowable that emits only the first item emitted by the source Publisher during sequential
+     * Returns a {@code Flowable} that emits only the first item emitted by the source {@link Publisher} during sequential
      * time windows of a specified duration.
      * <p>
      * This differs from {@link #throttleLast} in that this only tracks the passage of time whereas
@@ -16239,7 +16237,7 @@ public final Flowable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
      *            time to wait before emitting another item after emitting the last item
      * @param unit
      *            the unit of time of {@code windowDuration}
-     * @return a Flowable that performs the throttle operation
+     * @return a {@code Flowable} that performs the throttle operation
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      */
@@ -16252,8 +16250,8 @@ public final Flowable<T> throttleFirst(long windowDuration, @NonNull TimeUnit un
     }
 
     /**
-     * Returns a Flowable that emits only the first item emitted by the source Publisher during sequential
-     * time windows of a specified duration, where the windows are managed by a specified Scheduler.
+     * Returns a {@code Flowable} that emits only the first item emitted by the source {@link Publisher} during sequential
+     * time windows of a specified duration, where the windows are managed by a specified {@link Scheduler}.
      * <p>
      * This differs from {@link #throttleLast} in that this only tracks the passage of time whereas
      * {@link #throttleLast} ticks at scheduled intervals.
@@ -16263,7 +16261,7 @@ public final Flowable<T> throttleFirst(long windowDuration, @NonNull TimeUnit un
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param skipDuration
@@ -16271,9 +16269,9 @@ public final Flowable<T> throttleFirst(long windowDuration, @NonNull TimeUnit un
      * @param unit
      *            the unit of time of {@code skipDuration}
      * @param scheduler
-     *            the {@link Scheduler} to use internally to manage the timers that handle timeout for each
+     *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
-     * @return a Flowable that performs the throttle operation
+     * @return a {@code Flowable} that performs the throttle operation
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      */
@@ -16288,7 +16286,7 @@ public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit
     }
 
     /**
-     * Returns a Flowable that emits only the last item emitted by the source Publisher during sequential
+     * Returns a {@code Flowable} that emits only the last item emitted by the source {@link Publisher} during sequential
      * time windows of a specified duration.
      * <p>
      * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
@@ -16303,11 +16301,11 @@ public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit
      * </dl>
      *
      * @param intervalDuration
-     *            duration of windows within which the last item emitted by the source Publisher will be
+     *            duration of windows within which the last item emitted by the source {@code Publisher} will be
      *            emitted
      * @param unit
      *            the unit of time of {@code intervalDuration}
-     * @return a Flowable that performs the throttle operation
+     * @return a {@code Flowable} that performs the throttle operation
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #sample(long, TimeUnit)
@@ -16321,8 +16319,8 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
     }
 
     /**
-     * Returns a Flowable that emits only the last item emitted by the source Publisher during sequential
-     * time windows of a specified duration, where the duration is governed by a specified Scheduler.
+     * Returns a {@code Flowable} that emits only the last item emitted by the source {@link Publisher} during sequential
+     * time windows of a specified duration, where the duration is governed by a specified {@link Scheduler}.
      * <p>
      * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
      * {@link #throttleFirst} does not tick, it just tracks the passage of time.
@@ -16332,18 +16330,18 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param intervalDuration
-     *            duration of windows within which the last item emitted by the source Publisher will be
+     *            duration of windows within which the last item emitted by the source {@code Publisher} will be
      *            emitted
      * @param unit
      *            the unit of time of {@code intervalDuration}
      * @param scheduler
-     *            the {@link Scheduler} to use internally to manage the timers that handle timeout for each
+     *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
-     * @return a Flowable that performs the throttle operation
+     * @return a {@code Flowable} that performs the throttle operation
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #sample(long, TimeUnit, Scheduler)
@@ -16381,7 +16379,7 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      * @param timeout the time to wait after an item emission towards the downstream
      *                before trying to emit the latest item from upstream again
      * @param unit    the time unit
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 2.2
      * @see #throttleLatest(long, TimeUnit, boolean)
      * @see #throttleLatest(long, TimeUnit, Scheduler)
@@ -16420,7 +16418,7 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit) {
      *                 immediately when the upstream completes, regardless if there is
      *                 a timeout window active or not. If {@code false}, the very last
      *                 upstream item is ignored and the flow terminates.
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @see #throttleLatest(long, TimeUnit, Scheduler, boolean)
      * @since 2.2
      */
@@ -16457,9 +16455,9 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, bo
      * @param timeout the time to wait after an item emission towards the downstream
      *                before trying to emit the latest item from upstream again
      * @param unit    the time unit
-     * @param scheduler the {@link Scheduler} where the timed wait and latest item
+     * @param scheduler the {@code Scheduler} where the timed wait and latest item
      *                  emission will be performed
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @see #throttleLatest(long, TimeUnit, Scheduler, boolean)
      * @since 2.2
      */
@@ -16493,13 +16491,13 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
      * @param timeout the time to wait after an item emission towards the downstream
      *                before trying to emit the latest item from upstream again
      * @param unit    the time unit
-     * @param scheduler the {@link Scheduler} where the timed wait and latest item
+     * @param scheduler the {@code Scheduler} where the timed wait and latest item
      *                  emission will be performed
      * @param emitLast If {@code true}, the very last item from the upstream will be emitted
      *                 immediately when the upstream completes, regardless if there is
      *                 a timeout window active or not. If {@code false}, the very last
      *                 upstream item is ignored and the flow terminates.
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -16513,12 +16511,12 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, except that it drops items emitted by the
-     * source Publisher that are followed by newer items before a timeout value expires. The timer resets on
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
+     * source {@code Publisher} that are followed by newer items before a timeout value expires. The timer resets on
      * each emission (alias to {@link #debounce(long, TimeUnit)}).
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source Publisher faster than the timeout then no items
-     * will be emitted by the resulting Publisher.
+     * <em>Note:</em> If items keep being emitted by the source {@code Publisher} faster than the timeout then no items
+     * will be emitted by the resulting {@code Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.png" alt="">
      * <dl>
@@ -16530,11 +16528,11 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
      *
      * @param timeout
      *            the length of the window of time that must pass after the emission of an item from the source
-     *            Publisher in which that Publisher emits no items in order for the item to be emitted by the
-     *            resulting Publisher
+     *            {@code Publisher} in which that {@code Publisher} emits no items in order for the item to be emitted by the
+     *            resulting {@code Publisher}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return a Flowable that filters out items from the source Publisher that are too quickly followed by
+     * @return a {@code Flowable} that filters out items from the source {@code Publisher} that are too quickly followed by
      *         newer items
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -16549,31 +16547,31 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, except that it drops items emitted by the
-     * source Publisher that are followed by newer items before a timeout value expires on a specified
-     * Scheduler. The timer resets on each emission (alias to {@link #debounce(long, TimeUnit, Scheduler)}).
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
+     * source {@code Publisher} that are followed by newer items before a timeout value expires on a specified
+     * {@link Scheduler}. The timer resets on each emission (alias to {@link #debounce(long, TimeUnit, Scheduler)}).
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source Publisher faster than the timeout then no items
-     * will be emitted by the resulting Publisher.
+     * <em>Note:</em> If items keep being emitted by the source {@code Publisher} faster than the timeout then no items
+     * will be emitted by the resulting {@code Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
      *            the length of the window of time that must pass after the emission of an item from the source
-     *            Publisher in which that Publisher emits no items in order for the item to be emitted by the
-     *            resulting Publisher
+     *            {@code Publisher} in which that {@code Publisher} emits no items in order for the item to be emitted by the
+     *            resulting {@code Publisher}
      * @param unit
      *            the unit of time for the specified {@code timeout}
      * @param scheduler
-     *            the {@link Scheduler} to use internally to manage the timers that handle the timeout for each
+     *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return a Flowable that filters out items from the source Publisher that are too quickly followed by
+     * @return a {@code Flowable} that filters out items from the source {@code Publisher} that are too quickly followed by
      *         newer items
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -16588,8 +16586,8 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
     }
 
     /**
-     * Returns a Flowable that emits records of the time interval between consecutive items emitted by the
-     * source Publisher.
+     * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
+     * source {@link Publisher}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
      * <dl>
@@ -16601,7 +16599,7 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
      *  from the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that emits time interval information items
+     * @return a {@code Flowable} that emits time interval information items
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -16613,8 +16611,8 @@ public final Flowable<Timed<T>> timeInterval() {
     }
 
     /**
-     * Returns a Flowable that emits records of the time interval between consecutive items emitted by the
-     * source Publisher, where this interval is computed on a specified Scheduler.
+     * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
+     * source {@link Publisher}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
      * <dl>
@@ -16622,13 +16620,13 @@ public final Flowable<Timed<T>> timeInterval() {
      *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>The operator does not operate on any particular scheduler but uses the current time
-     *  from the specified {@link Scheduler}.</dd>
+     *  <dd>{@code timeInterval} does not operate on any particular scheduler but uses the current time
+     *  from the specified {@code Scheduler}.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} used to compute time intervals
-     * @return a Flowable that emits time interval information items
+     *            the {@code Scheduler} used to compute time intervals
+     * @return a {@code Flowable} that emits time interval information items
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -16640,8 +16638,8 @@ public final Flowable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a Flowable that emits records of the time interval between consecutive items emitted by the
-     * source Publisher.
+     * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
+     * source {@link Publisher}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
      * <dl>
@@ -16654,7 +16652,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param unit the time unit for the current time
-     * @return a Flowable that emits time interval information items
+     * @return a {@code Flowable} that emits time interval information items
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -16666,8 +16664,8 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that emits records of the time interval between consecutive items emitted by the
-     * source Publisher, where this interval is computed on a specified Scheduler.
+     * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
+     * source {@link Publisher}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
      * <dl>
@@ -16675,14 +16673,14 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
      *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>The operator does not operate on any particular scheduler but uses the current time
-     *  from the specified {@link Scheduler}.</dd>
+     *  <dd>{@code timeInterval} does not operate on any particular scheduler but uses the current time
+     *  from the specified {@code Scheduler}.</dd>
      * </dl>
      *
      * @param unit the time unit for the current time
      * @param scheduler
-     *            the {@link Scheduler} used to compute time intervals
-     * @return a Flowable that emits time interval information items
+     *            the {@code Scheduler} used to compute time intervals
+     * @return a {@code Flowable} that emits time interval information items
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -16696,9 +16694,9 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, but notifies Subscribers of a
-     * {@code TimeoutException} if an item emitted by the source Publisher doesn't arrive within a window of
-     * time after the emission of the previous item, where that period of time is measured by a Publisher that
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, but notifies {@link Subscriber}s of a
+     * {@link TimeoutException} if an item emitted by the source {@code Publisher} doesn't arrive within a window of
+     * time after the emission of the previous item, where that period of time is measured by a {@code Publisher} that
      * is a function of the previous item.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout3.png" alt="">
@@ -16709,7 +16707,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Sc
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code immediate} {@link Scheduler}.</dd>
      * </dl>
@@ -16717,10 +16715,10 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Sc
      * @param <V>
      *            the timeout value type (ignored)
      * @param itemTimeoutIndicator
-     *            a function that returns a Publisher for each item emitted by the source
-     *            Publisher and that determines the timeout window for the subsequent item
-     * @return a Flowable that mirrors the source Publisher, but notifies Subscribers of a
-     *         {@code TimeoutException} if an item emitted by the source Publisher takes longer to arrive than
+     *            a function that returns a {@code Publisher} for each item emitted by the source
+     *            {@code Publisher} and that determines the timeout window for the subsequent item
+     * @return a {@code Flowable} that mirrors the source {@code Publisher}, but notifies {@code Subscriber}s of a
+     *         {@code TimeoutException} if an item emitted by the source {@code Publisher} takes longer to arrive than
      *         the time window defined by the selector for the previously emitted item
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -16733,9 +16731,9 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, but that switches to a fallback Publisher if
-     * an item emitted by the source Publisher doesn't arrive within a window of time after the emission of the
-     * previous item, where that period of time is measured by a Publisher that is a function of the previous
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, but that switches to a fallback {@code Publisher} if
+     * an item emitted by the source {@code Publisher} doesn't arrive within a window of time after the emission of the
+     * previous item, where that period of time is measured by a {@code Publisher} that is a function of the previous
      * item.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout4.png" alt="">
@@ -16746,7 +16744,7 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code immediate} {@link Scheduler}.</dd>
      * </dl>
@@ -16754,12 +16752,12 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      * @param <V>
      *            the timeout value type (ignored)
      * @param itemTimeoutIndicator
-     *            a function that returns a Publisher, for each item emitted by the source Publisher, that
+     *            a function that returns a {@code Publisher}, for each item emitted by the source {@code Publisher}, that
      *            determines the timeout window for the subsequent item
      * @param other
-     *            the fallback Publisher to switch to if the source Publisher times out
-     * @return a Flowable that mirrors the source Publisher, but switches to mirroring a fallback Publisher
-     *         if an item emitted by the source Publisher takes longer to arrive than the time window defined
+     *            the fallback {@code Publisher} to switch to if the source {@code Publisher} times out
+     * @return a {@code Flowable} that mirrors the source {@code Publisher}, but switches to mirroring a fallback {@code Publisher}
+     *         if an item emitted by the source {@code Publisher} takes longer to arrive than the time window defined
      *         by the selector for the previously emitted item
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -16773,9 +16771,9 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher but applies a timeout policy for each emitted
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
-     * the resulting Publisher terminates and notifies Subscribers of a {@code TimeoutException}.
+     * the resulting {@code Publisher} terminates and notifies {@link Subscriber}s of a {@link TimeoutException}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1.png" alt="">
      * <dl>
@@ -16790,7 +16788,7 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      *            maximum duration between emitted items before a timeout occurs
      * @param timeUnit
      *            the unit of time that applies to the {@code timeout} argument.
-     * @return the source Publisher modified to notify Subscribers of a {@code TimeoutException} in case of a
+     * @return the source {@code Publisher} modified to notify {@code Subscriber}s of a {@code TimeoutException} in case of a
      *         timeout
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -16803,9 +16801,9 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher but applies a timeout policy for each emitted
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
-     * the source Publisher is disposed and resulting Publisher begins instead to mirror a fallback Publisher.
+     * the source {@code Publisher} is disposed and resulting {@code Publisher} begins instead to mirror a fallback {@code Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
      * <dl>
@@ -16813,7 +16811,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -16823,8 +16821,8 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
      * @param timeUnit
      *            the unit of time that applies to the {@code timeout} argument
      * @param other
-     *            the fallback Publisher to use in case of a timeout
-     * @return the source Publisher modified to switch to the fallback Publisher in case of a timeout
+     *            the fallback {@code Publisher} to use in case of a timeout
+     * @return the source {@code Publisher} modified to switch to the fallback {@code Publisher} in case of a timeout
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -16837,10 +16835,10 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher but applies a timeout policy for each emitted
-     * item using a specified Scheduler. If the next item isn't emitted within the specified timeout duration
-     * starting from its predecessor, the source Publisher is disposed and resulting Publisher begins
-     * instead to mirror a fallback Publisher.
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher} but applies a timeout policy for each emitted
+     * item using a specified {@link Scheduler}. If the next item isn't emitted within the specified timeout duration
+     * starting from its predecessor, the source {@code Publisher} is disposed and resulting {@code Publisher} begins
+     * instead to mirror a fallback {@code Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
      * <dl>
@@ -16848,9 +16846,9 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
@@ -16858,10 +16856,10 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
      * @param timeUnit
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
-     *            the {@link Scheduler} to run the timeout timers on
+     *            the {@code Scheduler} to run the timeout timers on
      * @param other
-     *            the Publisher to use as the fallback in case of a timeout
-     * @return the source Publisher modified so that it will switch to the fallback Publisher in case of a
+     *            the {@code Publisher} to use as the fallback in case of a timeout
+     * @return the source {@code Publisher} modified so that it will switch to the fallback {@code Publisher} in case of a
      *         timeout
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -16875,10 +16873,10 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher but applies a timeout policy for each emitted
-     * item, where this policy is governed by a specified Scheduler. If the next item isn't emitted within the
-     * specified timeout duration starting from its predecessor, the resulting Publisher terminates and
-     * notifies Subscribers of a {@code TimeoutException}.
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher} but applies a timeout policy for each emitted
+     * item, where this policy is governed by a specified {@link Scheduler}. If the next item isn't emitted within the
+     * specified timeout duration starting from its predecessor, the resulting {@code Publisher} terminates and
+     * notifies {@link Subscriber}s of a {@link TimeoutException}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1s.png" alt="">
      * <dl>
@@ -16886,7 +16884,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
      *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
@@ -16894,8 +16892,8 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
      * @param timeUnit
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
-     *            the Scheduler to run the timeout timers on
-     * @return the source Publisher modified to notify Subscribers of a {@code TimeoutException} in case of a
+     *            the {@code Scheduler} to run the timeout timers on
+     * @return the source {@code Publisher} modified to notify {@code Subscriber}s of a {@code TimeoutException} in case of a
      *         timeout
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -16908,16 +16906,16 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, but notifies Subscribers of a
-     * {@code TimeoutException} if either the first item emitted by the source Publisher or any subsequent item
-     * doesn't arrive within time windows defined by other Publishers.
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, but notifies {@link Subscriber}s of a
+     * {@link TimeoutException} if either the first item emitted by the source {@code Publisher} or any subsequent item
+     * doesn't arrive within time windows defined by other {@code Publisher}s.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout5.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the returned {@code Publisher}s
      *  are expected to honor backpressure as well. If any of then violates this rule, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeout} does not operate by default on any {@link Scheduler}.</dd>
      * </dl>
@@ -16927,13 +16925,13 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
      * @param <V>
      *            the subsequent timeout value type (ignored)
      * @param firstTimeoutIndicator
-     *            a function that returns a Publisher that determines the timeout window for the first source
+     *            a function that returns a {@code Publisher} that determines the timeout window for the first source
      *            item
      * @param itemTimeoutIndicator
-     *            a function that returns a Publisher for each item emitted by the source Publisher and that
+     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
-     * @return a Flowable that mirrors the source Publisher, but notifies Subscribers of a
+     * @return a {@code Flowable} that mirrors the source {@code Publisher}, but notifies {@code Subscriber}s of a
      *         {@code TimeoutException} if either the first item or any subsequent item doesn't arrive within
      *         the time windows specified by the timeout selectors
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
@@ -16949,9 +16947,9 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
     }
 
     /**
-     * Returns a Flowable that mirrors the source Publisher, but switches to a fallback Publisher if either
-     * the first item emitted by the source Publisher or any subsequent item doesn't arrive within time windows
-     * defined by other Publishers.
+     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, but switches to a fallback {@code Publisher} if either
+     * the first item emitted by the source {@code Publisher} or any subsequent item doesn't arrive within time windows
+     * defined by other {@code Publisher}s.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout6.png" alt="">
      * <dl>
@@ -16959,7 +16957,7 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@code IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeout} does not operate by default on any {@link Scheduler}.</dd>
      * </dl>
@@ -16969,19 +16967,19 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
      * @param <V>
      *            the subsequent timeout value type (ignored)
      * @param firstTimeoutIndicator
-     *            a function that returns a Publisher which determines the timeout window for the first source
+     *            a function that returns a {@code Publisher} which determines the timeout window for the first source
      *            item
      * @param itemTimeoutIndicator
-     *            a function that returns a Publisher for each item emitted by the source Publisher and that
+     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
      * @param other
-     *            the fallback Publisher to switch to if the source Publisher times out
-     * @return a Flowable that mirrors the source Publisher, but switches to the {@code other} Publisher if
-     *         either the first item emitted by the source Publisher or any subsequent item doesn't arrive
+     *            the fallback {@code Publisher} to switch to if the source {@code Publisher} times out
+     * @return a {@code Flowable} that mirrors the source {@code Publisher}, but switches to the {@code other} {@code Publisher} if
+     *         either the first item emitted by the source {@code Publisher} or any subsequent item doesn't arrive
      *         within time windows defined by the timeout selectors
      * @throws NullPointerException
-     *             if {@code itemTimeoutIndicator} is null
+     *             if {@code itemTimeoutIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -17013,7 +17011,7 @@ private <U, V> Flowable<T> timeout0(
     }
 
     /**
-     * Returns a Flowable that emits each item emitted by the source Publisher, wrapped in a
+     * Returns a {@code Flowable} that emits each item emitted by the source {@link Publisher}, wrapped in a
      * {@link Timed} object.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
@@ -17026,7 +17024,7 @@ private <U, V> Flowable<T> timeout0(
      *  from the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that emits timestamped items from the source Publisher
+     * @return a {@code Flowable} that emits timestamped items from the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -17038,8 +17036,8 @@ public final Flowable<Timed<T>> timestamp() {
     }
 
     /**
-     * Returns a Flowable that emits each item emitted by the source Publisher, wrapped in a
-     * {@link Timed} object whose timestamps are provided by a specified Scheduler.
+     * Returns a {@code Flowable} that emits each item emitted by the source {@link Publisher}, wrapped in a
+     * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
      * <dl>
@@ -17048,12 +17046,12 @@ public final Flowable<Timed<T>> timestamp() {
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate on any particular scheduler but uses the current time
-     *  from the specified {@link Scheduler}.</dd>
+     *  from the specified {@code Scheduler}.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to use as a time source
-     * @return a Flowable that emits timestamped items from the source Publisher with timestamps provided by
+     *            the {@code Scheduler} to use as a time source
+     * @return a {@code Flowable} that emits timestamped items from the source {@code Publisher} with timestamps provided by
      *         the {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
@@ -17066,7 +17064,7 @@ public final Flowable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a Flowable that emits each item emitted by the source Publisher, wrapped in a
+     * Returns a {@code Flowable} that emits each item emitted by the source {@link Publisher}, wrapped in a
      * {@link Timed} object.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
@@ -17080,7 +17078,7 @@ public final Flowable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param unit the time unit for the current time
-     * @return a Flowable that emits timestamped items from the source Publisher
+     * @return a {@code Flowable} that emits timestamped items from the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -17092,8 +17090,8 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Flowable that emits each item emitted by the source Publisher, wrapped in a
-     * {@link Timed} object whose timestamps are provided by a specified Scheduler.
+     * Returns a {@code Flowable} that emits each item emitted by the source {@link Publisher}, wrapped in a
+     * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
      * <dl>
@@ -17102,13 +17100,13 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate on any particular scheduler but uses the current time
-     *  from the specified {@link Scheduler}.</dd>
+     *  from the specified {@code Scheduler}.</dd>
      * </dl>
      *
      * @param unit the time unit for the current time
      * @param scheduler
-     *            the {@link Scheduler} to use as a time source
-     * @return a Flowable that emits timestamped items from the source Publisher with timestamps provided by
+     *            the {@code Scheduler} to use as a time source
+     * @return a {@code Flowable} that emits timestamped items from the source {@code Publisher} with timestamps provided by
      *         the {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
@@ -17134,9 +17132,9 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Sched
      * </dl>
      * <p>History: 2.1.7 - experimental
      * @param <R> the resulting object type
-     * @param converter the function that receives the current Flowable instance and returns a value
+     * @param converter the function that receives the current {@code Flowable} instance and returns a value
      * @return the converted value
-     * @throws NullPointerException if converter is null
+     * @throws NullPointerException if converter is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -17147,20 +17145,20 @@ public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
     }
 
     /**
-     * Returns a Single that emits a single item, a list composed of all the items emitted by the
-     * finite upstream source Publisher.
+     * Returns a {@link Single} that emits a single item, a list composed of all the items emitted by the
+     * finite upstream source {@link Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.png" alt="">
      * <p>
-     * Normally, a Publisher that returns multiple items will do so by invoking its {@link Subscriber}'s
+     * Normally, a {@code Publisher} that returns multiple items will do so by invoking its {@link Subscriber}'s
      * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * Publisher to compose a list of all of these items and then to invoke the Subscriber's {@code onNext}
-     * function once, passing it the entire list, by calling the Publisher's {@code toList} method prior to
+     * {@code Publisher} to compose a list of all of these items and then to invoke the {@code Subscriber}'s {@code onNext}
+     * function once, passing it the entire list, by calling the {@code Publisher}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17169,8 +17167,8 @@ public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
      *  <dd>{@code toList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Single that emits a single item: a List containing all of the items emitted by the source
-     *         Publisher
+     * @return a {@code Single} that emits a single item: a {@link List} containing all of the items emitted by the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17182,20 +17180,20 @@ public final Single<List<T>> toList() {
     }
 
     /**
-     * Returns a Single that emits a single item, a list composed of all the items emitted by the
-     * finite source Publisher.
+     * Returns a {@link Single} that emits a single item, a list composed of all the items emitted by the
+     * finite source {@link Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.png" alt="">
      * <p>
-     * Normally, a Publisher that returns multiple items will do so by invoking its {@link Subscriber}'s
+     * Normally, a {@code Publisher} that returns multiple items will do so by invoking its {@link Subscriber}'s
      * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * Publisher to compose a list of all of these items and then to invoke the Subscriber's {@code onNext}
-     * function once, passing it the entire list, by calling the Publisher's {@code toList} method prior to
+     * {@code Publisher} to compose a list of all of these items and then to invoke the {@code Subscriber}'s {@code onNext}
+     * function once, passing it the entire list, by calling the {@code Publisher}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17205,9 +17203,9 @@ public final Single<List<T>> toList() {
      * </dl>
      *
      * @param capacityHint
-     *         the number of elements expected from the current Flowable
-     * @return a Flowable that emits a single item: a List containing all of the items emitted by the source
-     *         Publisher
+     *         the number of elements expected from the current {@code Flowable}
+     * @return a {@code Single} that emits a single item: a {@link List} containing all of the items emitted by the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17220,20 +17218,20 @@ public final Single<List<T>> toList(int capacityHint) {
     }
 
     /**
-     * Returns a Single that emits a single item, a list composed of all the items emitted by the
-     * finite source Publisher.
+     * Returns a {@link Single} that emits a single item, a list composed of all the items emitted by the
+     * finite source {@link Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.png" alt="">
      * <p>
-     * Normally, a Publisher that returns multiple items will do so by invoking its {@link Subscriber}'s
+     * Normally, a {@code Publisher} that returns multiple items will do so by invoking its {@link Subscriber}'s
      * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * Publisher to compose a list of all of these items and then to invoke the Subscriber's {@code onNext}
-     * function once, passing it the entire list, by calling the Publisher's {@code toList} method prior to
+     * {@code Publisher} to compose a list of all of these items and then to invoke the {@code Subscriber}'s {@code onNext}
+     * function once, passing it the entire list, by calling the {@code Publisher}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated collection to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17244,9 +17242,9 @@ public final Single<List<T>> toList(int capacityHint) {
      *
      * @param <U> the subclass of a collection of Ts
      * @param collectionSupplier
-     *               the Supplier returning the collection (for each individual Subscriber) to be filled in
-     * @return a Single that emits a single item: a List containing all of the items emitted by the source
-     *         Publisher
+     *               the {@link Supplier} returning the collection (for each individual {@code Subscriber}) to be filled in
+     * @return a {@code Single} that emits a single item: a {@link Collection} (subclass) containing all of the items emitted by the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17259,16 +17257,16 @@ public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplie
     }
 
     /**
-     * Returns a Single that emits a single HashMap containing all items emitted by the finite source Publisher,
+     * Returns a {@link Single} that emits a single {@link HashMap} containing all items emitted by the finite source {@link Publisher},
      * mapped by the keys returned by a specified {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.png" alt="">
      * <p>
-     * If more than one source item maps to the same key, the HashMap will contain the latest of those items.
+     * If more than one source item maps to the same key, the {@code HashMap} will contain the latest of those items.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17279,9 +17277,9 @@ public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplie
      *
      * @param <K> the key type of the Map
      * @param keySelector
-     *            the function that extracts the key from a source item to be used in the HashMap
-     * @return a Single that emits a single item: a HashMap containing the mapped items from the source
-     *         Publisher
+     *            the function that extracts the key from a source item to be used in the {@code HashMap}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17294,17 +17292,17 @@ public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Returns a Single that emits a single HashMap containing values corresponding to items emitted by the
-     * finite source Publisher, mapped by the keys returned by a specified {@code keySelector} function.
+     * Returns a {@link Single} that emits a single {@link HashMap} containing values corresponding to items emitted by the
+     * finite source {@link Publisher}, mapped by the keys returned by a specified {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.png" alt="">
      * <p>
-     * If more than one source item maps to the same key, the HashMap will contain a single entry that
+     * If more than one source item maps to the same key, the {@code HashMap} will contain a single entry that
      * corresponds to the latest of those items.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17316,11 +17314,11 @@ public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends
      * @param <K> the key type of the Map
      * @param <V> the value type of the Map
      * @param keySelector
-     *            the function that extracts the key from a source item to be used in the HashMap
+     *            the function that extracts the key from a source item to be used in the {@code HashMap}
      * @param valueSelector
-     *            the function that extracts the value from a source item to be used in the HashMap
-     * @return a Single that emits a single item: a HashMap containing the mapped items from the source
-     *         Publisher
+     *            the function that extracts the value from a source item to be used in the {@code HashMap}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17334,14 +17332,14 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Returns a Single that emits a single Map, returned by a specified {@code mapFactory} function, that
-     * contains keys and values extracted from the items emitted by the finite source Publisher.
+     * Returns a {@link Single} that emits a single {@link Map}, returned by a specified {@code mapFactory} function, that
+     * contains keys and values extracted from the items emitted by the finite source {@link Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17357,9 +17355,9 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
      * @param valueSelector
      *            the function that extracts the value from the source items to be used as value in the Map
      * @param mapSupplier
-     *            the function that returns a Map instance to be used
-     * @return a Flowable that emits a single item: a Map that contains the mapped items emitted by the
-     *         source Publisher
+     *            the function that returns a {@code Map} instance to be used
+     * @return a {@code Single} that emits a single item: a {@code Map} that contains the mapped items emitted by the
+     *         source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17375,14 +17373,14 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Returns a Single that emits a single HashMap that contains an ArrayList of items emitted by the
-     * finite source Publisher keyed by a specified {@code keySelector} function.
+     * Returns a {@link Single} that emits a single {@link HashMap} that contains an {@link ArrayList} of items emitted by the
+     * finite source {@link Publisher} keyed by a specified {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as by intent it is requesting and buffering everything.</dd>
@@ -17392,9 +17390,9 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
      *
      * @param <K> the key type of the Map
      * @param keySelector
-     *            the function that extracts the key from the source items to be used as key in the HashMap
-     * @return a Single that emits a single item: a HashMap that contains an ArrayList of items mapped from
-     *         the source Publisher
+     *            the function that extracts the key from the source items to be used as key in the {@code HashMap}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
+     *         the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17409,15 +17407,15 @@ public final <K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? su
     }
 
     /**
-     * Returns a Single that emits a single HashMap that contains an ArrayList of values extracted by a
-     * specified {@code valueSelector} function from items emitted by the finite source Publisher, keyed by a
+     * Returns a {@link Single} that emits a single {@link HashMap} that contains an {@link ArrayList} of values extracted by a
+     * specified {@code valueSelector} function from items emitted by the finite source {@link Publisher}, keyed by a
      * specified {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17429,11 +17427,11 @@ public final <K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? su
      * @param <K> the key type of the Map
      * @param <V> the value type of the Map
      * @param keySelector
-     *            the function that extracts a key from the source items to be used as key in the HashMap
+     *            the function that extracts a key from the source items to be used as key in the {@code HashMap}
      * @param valueSelector
-     *            the function that extracts a value from the source items to be used as value in the HashMap
-     * @return a Single that emits a single item: a HashMap that contains an ArrayList of items mapped from
-     *         the source Publisher
+     *            the function that extracts a value from the source items to be used as value in the {@code HashMap}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
+     *         the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17447,15 +17445,15 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<?
     }
 
     /**
-     * Returns a Single that emits a single Map, returned by a specified {@code mapFactory} function, that
+     * Returns a {@link Single} that emits a single {@link Map}, returned by a specified {@code mapFactory} function, that
      * contains a custom collection of values, extracted by a specified {@code valueSelector} function from
-     * items emitted by the finite source Publisher, and keyed by the {@code keySelector} function.
+     * items emitted by the finite source {@link Publisher}, and keyed by the {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17469,13 +17467,13 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<?
      * @param keySelector
      *            the function that extracts a key from the source items to be used as the key in the Map
      * @param valueSelector
-     *            the function that extracts a value from the source items to be used as the value in the Map
+     *            the function that extracts a value from the source items to be used as the value in the {@code Map}
      * @param mapSupplier
      *            the function that returns a Map instance to be used
      * @param collectionFactory
-     *            the function that returns a Collection instance for a particular key to be used in the Map
-     * @return a Single that emits a single item: a Map that contains the collection of mapped items from
-     *         the source Publisher
+     *            the function that returns a {@link Collection} instance for a particular key to be used in the {@code Map}
+     * @return a {@code Single} that emits a single item: a {@code Map} that contains the {@code Collection} of mapped items from
+     *         the source {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17495,15 +17493,15 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
     }
 
     /**
-     * Returns a Single that emits a single Map, returned by a specified {@code mapFactory} function, that
-     * contains an ArrayList of values, extracted by a specified {@code valueSelector} function from items
-     * emitted by the finite source Publisher and keyed by the {@code keySelector} function.
+     * Returns a {@link Single} that emits a single {@link Map}, returned by a specified {@code mapFactory} function, that
+     * contains an {@link ArrayList} of values, extracted by a specified {@code valueSelector} function from items
+     * emitted by the finite source {@link Publisher} and keyed by the {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17512,16 +17510,16 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
      *  <dd>{@code toMultimap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <K> the key type of the Map
-     * @param <V> the value type of the Map
+     * @param <K> the key type of the {@code Map}
+     * @param <V> the value type of the {@code Map}
      * @param keySelector
-     *            the function that extracts a key from the source items to be used as the key in the Map
+     *            the function that extracts a key from the source items to be used as the key in the {@code Map}
      * @param valueSelector
-     *            the function that extracts a value from the source items to be used as the value in the Map
+     *            the function that extracts a value from the source items to be used as the value in the {@code Map}
      * @param mapSupplier
-     *            the function that returns a Map instance to be used
-     * @return a Single that emits a single item: a Map that contains a list items mapped from the source
-     *         Publisher
+     *            the function that returns a {@code Map} instance to be used
+     * @return a {@code Single} that emits a single item: a {@code Map} that contains a list items mapped from the source
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17537,15 +17535,15 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
     }
 
     /**
-     * Converts the current Flowable into a non-backpressured {@link Observable}.
+     * Converts the current {@code Flowable} into a non-backpressured {@link Observable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>Observables don't support backpressure thus the current Flowable is consumed in an unbounded
+     *  <dd>{@code Observable}s don't support backpressure thus the current {@code Flowable} is consumed in an unbounded
      *  manner (by requesting {@link Long#MAX_VALUE}).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toObservable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -17557,19 +17555,19 @@ public final Observable<T> toObservable() {
     }
 
     /**
-     * Returns a Single that emits a list that contains the items emitted by the finite source Publisher, in a
-     * sorted order. Each item emitted by the Publisher must implement {@link Comparable} with respect to all
+     * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the finite source {@link Publisher}, in a
+     * sorted order. Each item emitted by the {@code Publisher} must implement {@link Comparable} with respect to all
      * other items in the sequence.
      *
-     * <p>If any item emitted by this Flowable does not implement {@link Comparable} with respect to
-     *             all other items emitted by this Flowable, no items will be emitted and the
+     * <p>If any item emitted by this {@code Flowable} does not implement {@code Comparable} with respect to
+     *             all other items emitted by this {@code Flowable}, no items will be emitted and the
      *             sequence is terminated with a {@link ClassCastException}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17577,7 +17575,7 @@ public final Observable<T> toObservable() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a Single that emits a list that contains the items emitted by the source Publisher in
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the source {@code Publisher} in
      *         sorted order
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17590,14 +17588,14 @@ public final Single<List<T>> toSortedList() {
     }
 
     /**
-     * Returns a Single that emits a list that contains the items emitted by the finite source Publisher, in a
+     * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the finite source {@link Publisher}, in a
      * sorted order based on a specified comparison function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17607,9 +17605,9 @@ public final Single<List<T>> toSortedList() {
      * </dl>
      *
      * @param comparator
-     *            a function that compares two items emitted by the source Publisher and returns an Integer
+     *            a function that compares two items emitted by the source {@code Publisher} and returns an {@code int}
      *            that indicates their sort order
-     * @return a Single that emits a list that contains the items emitted by the source Publisher in
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the source {@code Publisher} in
      *         sorted order
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17623,14 +17621,14 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
     }
 
     /**
-     * Returns a Single that emits a list that contains the items emitted by the finite source Publisher, in a
+     * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the finite source {@link Publisher}, in a
      * sorted order based on a specified comparison function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17640,11 +17638,11 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
      * </dl>
      *
      * @param comparator
-     *            a function that compares two items emitted by the source Publisher and returns an Integer
+     *            a function that compares two items emitted by the source {@code Publisher} and returns an {@code int}
      *            that indicates their sort order
      * @param capacityHint
-     *             the initial capacity of the ArrayList used to accumulate items before sorting
-     * @return a Single that emits a list that contains the items emitted by the source Publisher in
+     *             the initial capacity of the {@link ArrayList} used to accumulate items before sorting
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the source {@code Publisher} in
      *         sorted order
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      * @since 2.0
@@ -17659,19 +17657,19 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
     }
 
     /**
-     * Returns a Flowable that emits a list that contains the items emitted by the finite source Publisher, in a
-     * sorted order. Each item emitted by the Publisher must implement {@link Comparable} with respect to all
+     * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the finite source {@link Publisher}, in a
+     * sorted order. Each item emitted by the {@code Publisher} must implement {@link Comparable} with respect to all
      * other items in the sequence.
      *
-     * <p>If any item emitted by this Flowable does not implement {@link Comparable} with respect to
-     *             all other items emitted by this Flowable, no items will be emitted and the
+     * <p>If any item emitted by this {@code Flowable} does not implement {@code Comparable} with respect to
+     *             all other items emitted by this {@code Flowable}, no items will be emitted and the
      *             sequence is terminated with a {@link ClassCastException}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
@@ -17681,8 +17679,8 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
      * </dl>
      *
      * @param capacityHint
-     *             the initial capacity of the ArrayList used to accumulate items before sorting
-     * @return a Flowable that emits a list that contains the items emitted by the source Publisher in
+     *             the initial capacity of the {@link ArrayList} used to accumulate items before sorting
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the source {@code Publisher} in
      *         sorted order
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      * @since 2.0
@@ -17696,20 +17694,20 @@ public final Single<List<T>> toSortedList(int capacityHint) {
     }
 
     /**
-     * Modifies the source Publisher so that subscribers will cancel it on a specified
+     * Modifies the source {@link Publisher} so that subscribers will cancel it on a specified
      * {@link Scheduler}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to perform cancellation actions on
-     * @return the source Publisher modified so that its cancellations happen on the specified
-     *         {@link Scheduler}
+     *            the {@code Scheduler} to perform cancellation actions on
+     * @return the source {@code Publisher} modified so that its cancellations happen on the specified
+     *         {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      */
     @CheckReturnValue
@@ -17722,10 +17720,10 @@ public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping windows, each containing {@code count} items. When the source
-     * Publisher completes or encounters an error, the resulting Publisher emits the current window and
-     * propagates the notification from the source Publisher.
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping windows, each containing {@code count} items. When the source
+     * {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the current window and
+     * propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window3.png" alt="">
      * <p>
@@ -17734,7 +17732,7 @@ public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      * a trade-off between no-dataloss and ensuring upstream cancellation can happen.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner Publisher uses an
+     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner {@code Publisher} uses an
      *  unbounded buffer that may hold at most {@code count} elements.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17742,8 +17740,8 @@ public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      *
      * @param count
      *            the maximum size of each window before it should be emitted
-     * @return a Flowable that emits connected, non-overlapping windows, each containing at most
-     *         {@code count} items from the source Publisher
+     * @return a {@code Flowable} that emits connected, non-overlapping windows, each containing at most
+     *         {@code count} items from the source {@code Publisher}
      * @throws IllegalArgumentException if either count is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -17756,10 +17754,10 @@ public final Flowable<Flowable<T>> window(long count) {
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits windows every {@code skip} items, each containing no more than {@code count} items. When
-     * the source Publisher completes or encounters an error, the resulting Publisher emits the current window
-     * and propagates the notification from the source Publisher.
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits windows every {@code skip} items, each containing no more than {@code count} items. When
+     * the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the current window
+     * and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
      * <p>
@@ -17769,7 +17767,7 @@ public final Flowable<Flowable<T>> window(long count) {
      * a trade-off between no-dataloss and ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner Publisher uses an
+     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner {@code Publisher} uses an
      *  unbounded buffer that may hold at most {@code count} elements.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17780,8 +17778,8 @@ public final Flowable<Flowable<T>> window(long count) {
      * @param skip
      *            how many items need to be skipped before starting a new window. Note that if {@code skip} and
      *            {@code count} are equal this is the same operation as {@link #window(long)}.
-     * @return a Flowable that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the source Publisher
+     * @return a {@code Flowable} that emits windows every {@code skip} items containing at most {@code count} items
+     *         from the source {@code Publisher}
      * @throws IllegalArgumentException if either count or skip is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -17794,10 +17792,10 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits windows every {@code skip} items, each containing no more than {@code count} items. When
-     * the source Publisher completes or encounters an error, the resulting Publisher emits the current window
-     * and propagates the notification from the source Publisher.
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits windows every {@code skip} items, each containing no more than {@code count} items. When
+     * the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the current window
+     * and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
      * <p>
@@ -17807,7 +17805,7 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
      * a trade-off between no-dataloss and ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner Publisher uses an
+     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner {@code Publisher} uses an
      *  unbounded buffer that may hold at most {@code count} elements.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17820,8 +17818,8 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
      *            {@code count} are equal this is the same operation as {@link #window(long)}.
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a Flowable that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the source Publisher
+     * @return a {@code Flowable} that emits windows every {@code skip} items containing at most {@code count} items
+     *         from the source {@code Publisher}
      * @throws IllegalArgumentException if either count or skip is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -17837,11 +17835,11 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher starts a new window periodically, as determined by the {@code timeskip} argument. It emits
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
      * each window after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * Publisher completes or Publisher completes or encounters an error, the resulting Publisher emits the
-     * current window and propagates the notification from the source Publisher.
+     * {@code Publisher} completes or {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
+     * current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.png" alt="">
      * <p>
@@ -17854,7 +17852,7 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
      *  The returned {@code Publisher} doesn't support backpressure as it uses
      *  time to control the creation of windows. The returned inner {@code Publisher}s honor
-     *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@code OutOfMemoryError}
+     *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@link OutOfMemoryError}
      *  if left unconsumed.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -17866,7 +17864,7 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
      *            the period of time after which a new window will be created
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
-     * @return a Flowable that emits new windows periodically as a fixed timespan elapses
+     * @return a {@code Flowable} that emits new windows periodically as a fixed timespan elapses
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17878,11 +17876,11 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher starts a new window periodically, as determined by the {@code timeskip} argument. It emits
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
      * each window after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * Publisher completes or Publisher completes or encounters an error, the resulting Publisher emits the
-     * current window and propagates the notification from the source Publisher.
+     * {@code Publisher} completes or {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
+     * current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
      * <p>
@@ -17895,7 +17893,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
      *  The returned {@code Publisher} doesn't support backpressure as it uses
      *  time to control the creation of windows. The returned inner {@code Publisher}s honor
-     *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@code OutOfMemoryError}
+     *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@link OutOfMemoryError}
      *  if left unconsumed.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -17908,8 +17906,8 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
-     * @return a Flowable that emits new windows periodically as a fixed timespan elapses
+     *            the {@code Scheduler} to use when determining the end and start of a window
+     * @return a {@code Flowable} that emits new windows periodically as a fixed timespan elapses
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17921,11 +17919,11 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher starts a new window periodically, as determined by the {@code timeskip} argument. It emits
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
      * each window after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * Publisher completes or Publisher completes or encounters an error, the resulting Publisher emits the
-     * current window and propagates the notification from the source Publisher.
+     * {@code Publisher} completes or {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
+     * current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
      * <p>
@@ -17938,7 +17936,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
      *  The returned {@code Publisher} doesn't support backpressure as it uses
      *  time to control the creation of windows. The returned inner {@code Publisher}s honor
-     *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@code OutOfMemoryError}
+     *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@link OutOfMemoryError}
      *  if left unconsumed.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -17951,10 +17949,10 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
+     *            the {@code Scheduler} to use when determining the end and start of a window
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a Flowable that emits new windows periodically as a fixed timespan elapses
+     * @return a {@code Flowable} that emits new windows periodically as a fixed timespan elapses
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17971,10 +17969,10 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping windows, each of a fixed duration specified by the
-     * {@code timespan} argument. When the source Publisher completes or encounters an error, the resulting
-     * Publisher emits the current window and propagates the notification from the source Publisher.
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * {@code timespan} argument. When the source {@code Publisher} completes or encounters an error, the resulting
+     * {@code Publisher} emits the current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.png" alt="">
      * <p>
@@ -17997,8 +17995,8 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      *            new window
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
-     * @return a Flowable that emits connected, non-overlapping windows representing items emitted by the
-     *         source Publisher during fixed, consecutive durations
+     * @return a {@code Flowable} that emits connected, non-overlapping windows representing items emitted by the
+     *         source {@code Publisher} during fixed, consecutive durations
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18010,11 +18008,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit)
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping windows, each of a fixed duration as specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration as specified by the
      * {@code timespan} argument or a maximum size as specified by the {@code count} argument (whichever is
-     * reached first). When the source Publisher completes or encounters an error, the resulting Publisher
-     * emits the current window and propagates the notification from the source Publisher.
+     * reached first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher}
+     * emits the current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
      * <p>
@@ -18039,7 +18037,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit)
      *            the unit of time that applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each window before it should be emitted
-     * @return a Flowable that emits connected, non-overlapping windows of items from the source Publisher
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18054,11 +18052,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping windows, each of a fixed duration as specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration as specified by the
      * {@code timespan} argument or a maximum size as specified by the {@code count} argument (whichever is
-     * reached first). When the source Publisher completes or encounters an error, the resulting Publisher
-     * emits the current window and propagates the notification from the source Publisher.
+     * reached first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher}
+     * emits the current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
      * <p>
@@ -18084,8 +18082,8 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * @param count
      *            the maximum size of each window before it should be emitted
      * @param restart
-     *            if true, when a window reaches the capacity limit, the timer is restarted as well
-     * @return a Flowable that emits connected, non-overlapping windows of items from the source Publisher
+     *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18100,10 +18098,10 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping windows, each of a fixed duration as specified by the
-     * {@code timespan} argument. When the source Publisher completes or encounters an error, the resulting
-     * Publisher emits the current window and propagates the notification from the source Publisher.
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration as specified by the
+     * {@code timespan} argument. When the source {@code Publisher} completes or encounters an error, the resulting
+     * {@code Publisher} emits the current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.s.png" alt="">
      * <p>
@@ -18116,7 +18114,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
      *  The returned {@code Publisher} doesn't support backpressure as it uses
      *  time to control the creation of windows. The returned inner {@code Publisher}s honor
-     *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@code OutOfMemoryError}
+     *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@link OutOfMemoryError}
      *  if left unconsumed.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -18128,9 +18126,9 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * @param unit
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
-     * @return a Flowable that emits connected, non-overlapping windows containing items emitted by the
-     *         source Publisher within a fixed duration
+     *            the {@code Scheduler} to use when determining the end and start of a window
+     * @return a {@code Flowable} that emits connected, non-overlapping windows containing items emitted by the
+     *         source {@code Publisher} within a fixed duration
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18143,11 +18141,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source Publisher completes or encounters an error, the resulting Publisher emits the
-     * current window and propagates the notification from the source Publisher.
+     * first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
+     * current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
      * <p>
@@ -18173,8 +18171,8 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * @param count
      *            the maximum size of each window before it should be emitted
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
-     * @return a Flowable that emits connected, non-overlapping windows of items from the source Publisher
+     *            the {@code Scheduler} to use when determining the end and start of a window
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18189,11 +18187,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source Publisher completes or encounters an error, the resulting Publisher emits the
-     * current window and propagates the notification from the source Publisher.
+     * first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
+     * current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
      * <p>
@@ -18219,10 +18217,10 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * @param count
      *            the maximum size of each window before it should be emitted
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
+     *            the {@code Scheduler} to use when determining the end and start of a window
      * @param restart
-     *            if true, when a window reaches the capacity limit, the timer is restarted as well
-     * @return a Flowable that emits connected, non-overlapping windows of items from the source Publisher
+     *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18237,11 +18235,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source Publisher completes or encounters an error, the resulting Publisher emits the
-     * current window and propagates the notification from the source Publisher.
+     * first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
+     * current window and propagates the notification from the source {@code Publisher}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
      * <p>
@@ -18267,12 +18265,12 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * @param count
      *            the maximum size of each window before it should be emitted
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
+     *            the {@code Scheduler} to use when determining the end and start of a window
      * @param restart
-     *            if true, when a window reaches the capacity limit, the timer is restarted as well
+     *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a Flowable that emits connected, non-overlapping windows of items from the source Publisher
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18292,9 +18290,9 @@ public final Flowable<Flowable<T>> window(
     }
 
     /**
-     * Returns a Flowable that emits non-overlapping windows of items it collects from the source Publisher
+     * Returns a {@code Flowable} that emits non-overlapping windows of items it collects from the source {@link Publisher}
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
-     * Publisher.
+     * {@code Publisher}.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
      * <p>
@@ -18304,8 +18302,8 @@ public final Flowable<Flowable<T>> window(
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The outer Publisher of this operator does not support backpressure as it uses a {@code boundary} Publisher to control data
-     *      flow. The inner Publishers honor backpressure and buffer everything until the boundary signals the next element.</dd>
+     *  <dd>The outer {@code Publisher} of this operator does not support backpressure as it uses a {@code boundary} {@code Publisher} to control data
+     *      flow. The inner {@code Publisher}s honor backpressure and buffer everything until the boundary signals the next element.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -18313,10 +18311,10 @@ public final Flowable<Flowable<T>> window(
      * @param <B>
      *            the window element type (ignored)
      * @param boundaryIndicator
-     *            a Publisher whose emitted items close and open windows
-     * @return a Flowable that emits non-overlapping windows of items it collects from the source Publisher
+     *            a {@code Publisher} whose emitted items close and open windows
+     * @return a {@code Flowable} that emits non-overlapping windows of items it collects from the source {@code Publisher}
      *         where the boundary of each window is determined by the items emitted from the {@code boundary}
-     *         Publisher
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18328,9 +18326,9 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
     }
 
     /**
-     * Returns a Flowable that emits non-overlapping windows of items it collects from the source Publisher
+     * Returns a {@code Flowable} that emits non-overlapping windows of items it collects from the source {@link Publisher}
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
-     * Publisher.
+     * {@code Publisher}.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
      * <p>
@@ -18340,8 +18338,8 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The outer Publisher of this operator does not support backpressure as it uses a {@code boundary} Publisher to control data
-     *      flow. The inner Publishers honor backpressure and buffer everything until the boundary signals the next element.</dd>
+     *  <dd>The outer {@code Publisher} of this operator does not support backpressure as it uses a {@code boundary} {@code Publisher} to control data
+     *      flow. The inner {@code Publisher}s honor backpressure and buffer everything until the boundary signals the next element.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -18349,12 +18347,12 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      * @param <B>
      *            the window element type (ignored)
      * @param boundaryIndicator
-     *            a Publisher whose emitted items close and open windows
+     *            a {@code Publisher} whose emitted items close and open windows
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a Flowable that emits non-overlapping windows of items it collects from the source Publisher
+     * @return a {@code Flowable} that emits non-overlapping windows of items it collects from the source {@code Publisher}
      *         where the boundary of each window is determined by the items emitted from the {@code boundary}
-     *         Publisher
+     *         {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18368,9 +18366,9 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits windows that contain those items emitted by the source Publisher between the time when
-     * the {@code windowOpenings} Publisher emits an item and when the Publisher returned by
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits windows that contain those items emitted by the source {@code Publisher} between the time when
+     * the {@code windowOpenings} {@code Publisher} emits an item and when the {@code Publisher} returned by
      * {@code closingSelector} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
@@ -18381,23 +18379,23 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The outer Publisher of this operator doesn't support backpressure because the emission of new
-     *  inner Publishers are controlled by the {@code windowOpenings} Publisher.
-     *  The inner Publishers honor backpressure and buffer everything until the associated closing
-     *  Publisher signals or completes.</dd>
+     *  <dd>The outer {@code Publisher} of this operator doesn't support backpressure because the emission of new
+     *  inner {@code Publisher}s are controlled by the {@code windowOpenings} {@code Publisher}.
+     *  The inner {@code Publisher}s honor backpressure and buffer everything until the associated closing
+     *  {@code Publisher} signals or completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the window-opening Publisher
-     * @param <V> the element type of the window-closing Publishers
+     * @param <U> the element type of the window-opening {@code Publisher}
+     * @param <V> the element type of the window-closing {@code Publisher}s
      * @param openingIndicator
-     *            a Publisher that, when it emits an item, causes another window to be created
+     *            a {@code Publisher} that, when it emits an item, causes another window to be created
      * @param closingIndicator
-     *            a {@link Function} that produces a Publisher for every window created. When this Publisher
+     *            a {@link Function} that produces a {@code Publisher} for every window created. When this {@code Publisher}
      *            emits an item, the associated window is closed and emitted
-     * @return a Flowable that emits windows of items emitted by the source Publisher that are governed by
-     *         the specified window-governing Publishers
+     * @return a {@code Flowable} that emits windows of items emitted by the source {@code Publisher} that are governed by
+     *         the specified window-governing {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18411,9 +18409,9 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Returns a Flowable that emits windows of items it collects from the source Publisher. The resulting
-     * Publisher emits windows that contain those items emitted by the source Publisher between the time when
-     * the {@code windowOpenings} Publisher emits an item and when the Publisher returned by
+     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
+     * {@code Publisher} emits windows that contain those items emitted by the source {@code Publisher} between the time when
+     * the {@code windowOpenings} {@code Publisher} emits an item and when the {@code Publisher} returned by
      * {@code closingSelector} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
@@ -18424,25 +18422,25 @@ public final <U, V> Flowable<Flowable<T>> window(
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The outer Publisher of this operator doesn't support backpressure because the emission of new
-     *  inner Publishers are controlled by the {@code windowOpenings} Publisher.
-     *  The inner Publishers honor backpressure and buffer everything until the associated closing
-     *  Publisher signals or completes.</dd>
+     *  <dd>The outer {@code Publisher} of this operator doesn't support backpressure because the emission of new
+     *  inner {@code Publisher}s are controlled by the {@code windowOpenings} {@code Publisher}.
+     *  The inner {@code Publisher}s honor backpressure and buffer everything until the associated closing
+     *  {@code Publisher} signals or completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the window-opening Publisher
-     * @param <V> the element type of the window-closing Publishers
+     * @param <U> the element type of the window-opening {@code Publisher}
+     * @param <V> the element type of the window-closing {@code Publisher}s
      * @param openingIndicator
-     *            a Publisher that, when it emits an item, causes another window to be created
+     *            a {@code Publisher} that, when it emits an item, causes another window to be created
      * @param closingIndicator
-     *            a {@link Function} that produces a Publisher for every window created. When this Publisher
+     *            a {@link Function} that produces a {@code Publisher} for every window created. When this {@code Publisher}
      *            emits an item, the associated window is closed and emitted
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a Flowable that emits windows of items emitted by the source Publisher that are governed by
-     *         the specified window-governing Publishers
+     * @return a {@code Flowable} that emits windows of items emitted by the source {@code Publisher} that are governed by
+     *         the specified window-governing {@code Publisher}s
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18459,29 +18457,29 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Merges the specified Publisher into this Publisher sequence by using the {@code resultSelector}
-     * function only when the source Publisher (this instance) emits an item.
+     * Merges the specified {@link Publisher} into this {@code Publisher} sequence by using the {@code resultSelector}
+     * function only when the source {@code Publisher} (this instance) emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure: the backpressure support
-     *  depends on the upstream and downstream's backpressure behavior. The other Publisher
+     *  depends on the upstream and downstream's backpressure behavior. The other {@code Publisher}
      *  is consumed in an unbounded fashion.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator, by default, doesn't run any particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the other Publisher
+     * @param <U> the element type of the other {@code Publisher}
      * @param <R> the result type of the combination
      * @param other
-     *            the other Publisher
+     *            the other {@code Publisher}
      * @param combiner
-     *            the function to call when this Publisher emits an item and the other Publisher has already
-     *            emitted an item, to generate the item to be emitted by the resulting Publisher
-     * @return a Flowable that merges the specified Publisher into this Publisher by using the
-     *         {@code resultSelector} function only when the source Publisher sequence (this instance) emits an
+     *            the function to call when this {@code Publisher} emits an item and the other {@code Publisher} has already
+     *            emitted an item, to generate the item to be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that merges the specified {@code Publisher} into this {@code Publisher} by using the
+     *         {@code resultSelector} function only when the source {@code Publisher} sequence (this instance) emits an
      *         item
      * @since 2.0
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -18499,18 +18497,18 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this Publisher with the latest emissions from the
-     * other Publishers via a function to produce the output item.
+     * Combines the value emission from this {@link Publisher} with the latest emissions from the
+     * other {@code Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this Publisher emits (and
+     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
-     *  and the downstream Subscriber. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
+     *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -18518,10 +18516,10 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param <T1> the first other source's value type
      * @param <T2> the second other source's value type
      * @param <R> the result value type
-     * @param source1 the first other Publisher
-     * @param source2 the second other Publisher
-     * @param combiner the function called with an array of values from each participating Publisher
-     * @return the new Publisher instance
+     * @param source1 the first other {@code Publisher}
+     * @param source2 the second other {@code Publisher}
+     * @param combiner the function called with an array of values from each participating {@code Publisher}
+     * @return the new {@code Publisher} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -18538,18 +18536,18 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this Publisher with the latest emissions from the
-     * other Publishers via a function to produce the output item.
+     * Combines the value emission from this {@link Publisher} with the latest emissions from the
+     * other {@code Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this Publisher emits (and
+     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
-     *  and the downstream Subscriber. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
+     *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -18558,11 +18556,11 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param <T2> the second other source's value type
      * @param <T3> the third other source's value type
      * @param <R> the result value type
-     * @param source1 the first other Publisher
-     * @param source2 the second other Publisher
-     * @param source3 the third other Publisher
-     * @param combiner the function called with an array of values from each participating Publisher
-     * @return the new Publisher instance
+     * @param source1 the first other {@code Publisher}
+     * @param source2 the second other {@code Publisher}
+     * @param source3 the third other {@code Publisher}
+     * @param combiner the function called with an array of values from each participating {@code Publisher}
+     * @return the new {@code Publisher} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -18582,18 +18580,18 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this Publisher with the latest emissions from the
-     * other Publishers via a function to produce the output item.
+     * Combines the value emission from this {@link Publisher} with the latest emissions from the
+     * other {@code Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this Publisher emits (and
+     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
-     *  and the downstream Subscriber. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
+     *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -18603,12 +18601,12 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param <T3> the third other source's value type
      * @param <T4> the fourth other source's value type
      * @param <R> the result value type
-     * @param source1 the first other Publisher
-     * @param source2 the second other Publisher
-     * @param source3 the third other Publisher
-     * @param source4 the fourth other Publisher
-     * @param combiner the function called with an array of values from each participating Publisher
-     * @return the new Publisher instance
+     * @param source1 the first other {@code Publisher}
+     * @param source2 the second other {@code Publisher}
+     * @param source3 the third other {@code Publisher}
+     * @param source4 the fourth other {@code Publisher}
+     * @param combiner the function called with an array of values from each participating {@code Publisher}
+     * @return the new {@code Publisher} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -18629,26 +18627,26 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this Publisher with the latest emissions from the
-     * other Publishers via a function to produce the output item.
+     * Combines the value emission from this {@link Publisher} with the latest emissions from the
+     * other {@code Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this Publisher emits (and
+     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
-     *  and the downstream Subscriber. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
+     *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R> the result value type
      * @param others the array of other sources
-     * @param combiner the function called with an array of values from each participating Publisher
-     * @return the new Publisher instance
+     * @param combiner the function called with an array of values from each participating {@code Publisher}
+     * @return the new {@code Publisher} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -18662,26 +18660,26 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this Publisher with the latest emissions from the
-     * other Publishers via a function to produce the output item.
+     * Combines the value emission from this {@link Publisher} with the latest emissions from the
+     * other {@code Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this Publisher emits (and
+     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
-     *  and the downstream Subscriber. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
+     *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R> the result value type
      * @param others the iterable of other sources
-     * @param combiner the function called with an array of values from each participating Publisher
-     * @return the new Publisher instance
+     * @param combiner the function called with an array of values from each participating {@code Publisher}
+     * @return the new {@code Publisher} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -18695,32 +18693,32 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<? extends Publishe
     }
 
     /**
-     * Returns a Flowable that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source Publisher and a specified Iterable sequence.
+     * Returns a {@code Flowable} that emits items that are the result of applying a specified function to pairs of
+     * values, one each from the source {@link Publisher} and a specified {@link Iterable} sequence.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.i.png" alt="">
      * <p>
-     * Note that the {@code other} Iterable is evaluated as items are observed from the source Publisher; it is
+     * Note that the {@code other} {@code Iterable} is evaluated as items are observed from the source {@code Publisher}; it is
      * not pre-consumed. This allows you to zip infinite streams on either side.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zipWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of items in the {@code other} Iterable
+     *            the type of items in the {@code other} {@code Iterable}
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param other
-     *            the Iterable sequence
+     *            the {@code Iterable} sequence
      * @param zipper
-     *            a function that combines the pairs of items from the Publisher and the Iterable to generate
-     *            the items to be emitted by the resulting Publisher
-     * @return a Flowable that pairs up values from the source Publisher and the {@code other} Iterable
+     *            a function that combines the pairs of items from the {@code Publisher} and the {@code Iterable} to generate
+     *            the items to be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that pairs up values from the source {@code Publisher} and the {@code other} {@code Iterable}
      *         sequence and emits the results of {@code zipFunction} applied to these pairs
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -18735,8 +18733,8 @@ public final <U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull Bi
     }
 
     /**
-     * Returns a Flowable that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source Publisher and another specified Publisher.
+     * Returns a {@code Flowable} that emits items that are the result of applying a specified function to pairs of
+     * values, one each from the source {@link Publisher} and another specified {@code Publisher}.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while canceling the other sources. Therefore, it
@@ -18754,22 +18752,22 @@ public final <U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull Bi
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zipWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the {@code other} Publisher
+     *            the type of items emitted by the {@code other} {@code Publisher}
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param other
-     *            the other Publisher
+     *            the other {@code Publisher}
      * @param zipper
-     *            a function that combines the pairs of items from the two Publishers to generate the items to
-     *            be emitted by the resulting Publisher
-     * @return a Flowable that pairs up values from the source Publisher and the {@code other} Publisher
+     *            a function that combines the pairs of items from the two {@code Publisher}s to generate the items to
+     *            be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that pairs up values from the source {@code Publisher} and the {@code other} {@code Publisher}
      *         and emits the results of {@code zipFunction} applied to these pairs
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -18783,8 +18781,8 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other, @
     }
 
     /**
-     * Returns a Flowable that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source Publisher and another specified Publisher.
+     * Returns a {@code Flowable} that emits items that are the result of applying a specified function to pairs of
+     * values, one each from the source {@link Publisher} and another specified {@code Publisher}.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while canceling the other sources. Therefore, it
@@ -18802,24 +18800,24 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other, @
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zipWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the {@code other} Publisher
+     *            the type of items emitted by the {@code other} {@code Publisher}
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param other
-     *            the other Publisher
+     *            the other {@code Publisher}
      * @param zipper
-     *            a function that combines the pairs of items from the two Publishers to generate the items to
-     *            be emitted by the resulting Publisher
+     *            a function that combines the pairs of items from the two {@code Publisher}s to generate the items to
+     *            be emitted by the resulting {@code Publisher}
      * @param delayError
-     *            if true, errors from the current Flowable or the other Publisher is delayed until both terminate
-     * @return a Flowable that pairs up values from the source Publisher and the {@code other} Publisher
+     *            if {@code true}, errors from the current {@code Flowable} or the other {@code Publisher} is delayed until both terminate
+     * @return a {@code Flowable} that pairs up values from the source {@code Publisher} and the {@code other} {@code Publisher}
      *         and emits the results of {@code zipFunction} applied to these pairs
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      * @since 2.0
@@ -18834,8 +18832,8 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
     }
 
     /**
-     * Returns a Flowable that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source Publisher and another specified Publisher.
+     * Returns a {@code Flowable} that emits items that are the result of applying a specified function to pairs of
+     * values, one each from the source {@link Publisher} and another specified {@code Publisher}.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while canceling the other sources. Therefore, it
@@ -18853,26 +18851,26 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
-     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in MissingBackpressureException, use
+     *  (I.e., zipping with {@link #interval(long, TimeUnit)} may result in {@link MissingBackpressureException}, use
      *  one of the {@code onBackpressureX} to handle similar, backpressure-ignoring sources.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zipWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the {@code other} Publisher
+     *            the type of items emitted by the {@code other} {@code Publisher}
      * @param <R>
-     *            the type of items emitted by the resulting Publisher
+     *            the type of items emitted by the resulting {@code Publisher}
      * @param other
-     *            the other Publisher
+     *            the other {@code Publisher}
      * @param zipper
-     *            a function that combines the pairs of items from the two Publishers to generate the items to
-     *            be emitted by the resulting Publisher
+     *            a function that combines the pairs of items from the two {@code Publisher}s to generate the items to
+     *            be emitted by the resulting {@code Publisher}
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
      * @param delayError
-     *            if true, errors from the current Flowable or the other Publisher is delayed until both terminate
-     * @return a Flowable that pairs up values from the source Publisher and the {@code other} Publisher
+     *            if {@code true}, errors from the current {@code Flowable} or the other {@code Publisher} is delayed until both terminate
+     * @return a {@code Flowable} that pairs up values from the source {@code Publisher} and the {@code other} {@code Publisher}
      *         and emits the results of {@code zipFunction} applied to these pairs
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      * @since 2.0
@@ -18894,11 +18892,11 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
      * it to this {@code Flowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned TestSubscriber consumes this Flowable in an unbounded fashion.</dd>
+     *  <dd>The returned {@code TestSubscriber} consumes this {@code Flowable} in an unbounded fashion.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new TestSubscriber instance
+     * @return the new {@code TestSubscriber} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -18912,16 +18910,16 @@ public final TestSubscriber<T> test() { // NoPMD
     }
 
     /**
-     * Creates a TestSubscriber with the given initial request amount and subscribes
-     * it to this Flowable.
+     * Creates a {@link TestSubscriber} with the given initial request amount and subscribes
+     * it to this {@code Flowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned TestSubscriber requests the given {@code initialRequest} amount upfront.</dd>
+     *  <dd>The returned {@code TestSubscriber} requests the given {@code initialRequest} amount upfront.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param initialRequest the initial request amount, positive
-     * @return the new TestSubscriber instance
+     * @return the new {@code TestSubscriber} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -18935,18 +18933,18 @@ public final TestSubscriber<T> test(long initialRequest) { // NoPMD
     }
 
     /**
-     * Creates a TestSubscriber with the given initial request amount,
+     * Creates a {@link TestSubscriber} with the given initial request amount,
      * optionally cancels it before the subscription and subscribes
-     * it to this Flowable.
+     * it to this {@code Flowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned TestSubscriber requests the given {@code initialRequest} amount upfront.</dd>
+     *  <dd>The returned {@code TestSubscriber} requests the given {@code initialRequest} amount upfront.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param initialRequest the initial request amount, positive
-     * @param cancel should the TestSubscriber be canceled before the subscription?
-     * @return the new TestSubscriber instance
+     * @param cancel should the {@code TestSubscriber} be canceled before the subscription?
+     * @return the new {@code TestSubscriber} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -18986,7 +18984,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * </dl>
      * @param <T> the element type of the optional value
      * @param optional the optional value to convert into a {@code Flowable}
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 3.0.0
      * @see #just(Object)
      * @see #empty()
@@ -19023,9 +19021,9 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the element type of the CompletionStage
-     * @param stage the CompletionStage to convert to Flowable and signal its terminal value or error
-     * @return the new Flowable instance
+     * @param <T> the element type of the {@code CompletionStage}
+     * @param stage the {@code CompletionStage} to convert to {@code Flowable} and signal its terminal value or error
+     * @return the new {@code Flowable} instance
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -19042,7 +19040,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * <p>
      * <img width="640" height="347" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromStream.f.png" alt="">
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Any exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #fromIterable(Iterable)}:
      * <pre><code>
@@ -19070,7 +19068,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * </dl>
      * @param <T> the element type of the source {@code Stream}
      * @param stream the {@code Stream} of values to emit
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 3.0.0
      * @see #fromIterable(Iterable)
      */
@@ -19095,10 +19093,10 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <R> the non-null output type
+     * @param <R> the non-{@code null} output type
      * @param mapper the function that receives the upstream item and should return a <em>non-empty</em> {@code Optional}
      * to emit as the output or an <em>empty</em> {@code Optional} to skip to the next upstream value
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 3.0.0
      * @see #map(Function)
      * @see #filter(Predicate)
@@ -19113,7 +19111,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     }
 
     /**
-     * Collects the finite upstream's values into a container via a Stream {@link Collector} callback set and emits
+     * Collects the finite upstream's values into a container via a {@link Stream} {@link Collector} callback set and emits
      * it as the success result.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collector.f.png" alt="">
@@ -19124,11 +19122,11 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code collect} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <R> the non-null result type
+     * @param <R> the non-{@code null} result type
      * @param <A> the intermediate container type used for the accumulation
      * @param collector the interface defining the container supplier, accumulator and finisher functions;
      * see {@link Collectors} for some standard implementations
-     * @return the new Single instance
+     * @return the new {@link Single} instance
      * @since 3.0.0
      * @see Collectors
      * @see #collect(Supplier, BiConsumer)
@@ -19166,7 +19164,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      *  <dd>{@code firstStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param defaultItem the item to signal if the upstream is empty
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #firstOrErrorStage()
      */
@@ -19203,7 +19201,7 @@ public final CompletionStage<T> firstStage(@Nullable T defaultItem) {
      *  <dd>{@code singleStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param defaultItem the item to signal if the upstream is empty
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #singleOrErrorStage()
      */
@@ -19239,7 +19237,7 @@ public final CompletionStage<T> singleStage(@Nullable T defaultItem) {
      *  <dd>{@code lastStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param defaultItem the item to signal if the upstream is empty
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #lastOrErrorStage()
      */
@@ -19268,7 +19266,7 @@ public final CompletionStage<T> lastStage(@Nullable T defaultItem) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code firstOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #firstStage(Object)
      */
@@ -19298,7 +19296,7 @@ public final CompletionStage<T> firstOrErrorStage() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code singleOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #singleStage(Object)
      */
@@ -19327,7 +19325,7 @@ public final CompletionStage<T> singleOrErrorStage() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lastOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #lastStage(Object)
      */
@@ -19362,7 +19360,7 @@ public final CompletionStage<T> lastOrErrorStage() {
      *  <dd>{@code blockingStream} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Stream instance
+     * @return the new {@code Stream} instance
      * @since 3.0.0
      * @see #blockingStream(int)
      */
@@ -19399,7 +19397,7 @@ public final Stream<T> blockingStream() {
      *
      * @param prefetch the number of items to request from the upstream to limit the number of
      * in-flight items and item generation.
-     * @return the new Stream instance
+     * @return the new {@code Stream} instance
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -19417,11 +19415,11 @@ public final Stream<T> blockingStream(int prefetch) {
      * <p>
      * <img width="640" height="327" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapStream.f.png" alt="">
      * <p>
-     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * Due to the blocking and sequential nature of Java {@code Stream}s, the streams are mapped and consumed in a sequential fashion
      * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
      * {@code concatMapStream} are identical operators and are provided as aliases.
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Any exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #concatMapIterable(Function)}:
      * <pre><code>
@@ -19451,7 +19449,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * @param <R> the element type of the {@code Stream}s and the result
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 3.0.0
      * @see #concatMap(Function)
      * @see #concatMapIterable(Function)
@@ -19470,11 +19468,11 @@ public final Stream<T> blockingStream(int prefetch) {
      * <p>
      * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapStream.fi.png" alt="">
      * <p>
-     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * Due to the blocking and sequential nature of Java {@code Stream}s, the streams are mapped and consumed in a sequential fashion
      * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
      * {@code concatMapStream} are identical operators and are provided as aliases.
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Any exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #concatMapIterable(Function, int)}:
      * <pre><code>
@@ -19504,7 +19502,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
      * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 3.0.0
      * @see #concatMap(Function, int)
      * @see #concatMapIterable(Function, int)
@@ -19525,11 +19523,11 @@ public final Stream<T> blockingStream(int prefetch) {
      * <p>
      * <img width="640" height="328" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.f.png" alt="">
      * <p>
-     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * Due to the blocking and sequential nature of Java {@code Stream}s, the streams are mapped and consumed in a sequential fashion
      * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
      * {@code concatMapStream} are identical operators and are provided as aliases.
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Any exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function)}:
      * <pre><code>
@@ -19559,7 +19557,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * @param <R> the element type of the {@code Stream}s and the result
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 3.0.0
      * @see #flatMap(Function)
      * @see #flatMapIterable(Function)
@@ -19578,11 +19576,11 @@ public final Stream<T> blockingStream(int prefetch) {
      * <p>
      * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.fi.png" alt="">
      * <p>
-     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * Due to the blocking and sequential nature of Java {@code Stream}s, the streams are mapped and consumed in a sequential fashion
      * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
      * {@code concatMapStream} are identical operators and are provided as aliases.
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. Any exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function, int)}:
      * <pre><code>
@@ -19612,7 +19610,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
      * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 3.0.0
      * @see #flatMap(Function, int)
      * @see #flatMapIterable(Function, int)
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
new file mode 100644
index 0000000000..c748826c6a
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
@@ -0,0 +1,375 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.validators;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+/**
+ * Scan the Javadocs of a source and check if mentions of other classes,
+ * interfaces and enums are using at-link and at-code wrapping for style.
+ * <p>
+ * The check ignores html tag content on a line, &#64;see and &#64;throws entries
+ * and &lt;code&gt;&lt;/code&gt; lines.
+ */
+public class JavadocCodesAndLinks {
+
+    @Test
+    public void checkFlowable() throws Exception {
+        checkSource("Flowable");
+    }
+
+    static void checkSource(String baseClassName) throws Exception {
+        File f = TestHelper.findSource(baseClassName);
+        if (f == null) {
+            return;
+        }
+
+        StringBuilder errors = new StringBuilder(2048);
+        int errorCount = 0;
+
+        List<String> lines = Files.readAllLines(f.toPath());
+
+        List<String> docs = new ArrayList<>();
+
+        // i = 1 skip the header javadoc
+        for (int i = 1; i < lines.size(); i++) {
+
+            if (lines.get(i).trim().equals("/**")) {
+                docs.clear();
+
+                boolean skipCode = false;
+                for (int j = i + 1; j < lines.size(); j++) {
+                    String line = lines.get(j).trim();
+                    if (line.contains("<code>")) {
+                        skipCode = true;
+                    }
+                    if (line.equals("*/")) {
+                        break;
+                    }
+                    if (!skipCode) {
+                        // strip <a> </a>
+                        line = stripTags(line);
+                        if (line.startsWith("@see")) {
+                            docs.add("");
+                        }
+                        else if (line.startsWith("@throws") || line.startsWith("@param")) {
+                            int space = line.indexOf(' ');
+                            if (space < 0) {
+                                docs.add("");
+                            } else {
+                                space = line.indexOf(" ", space + 1);
+                                if (space < 0) {
+                                    docs.add("");
+                                } else {
+                                    docs.add(line.substring(space + 1));
+                                }
+                            }
+                        } else {
+                            docs.add(line);
+                        }
+                    } else {
+                        docs.add("");
+                    }
+                    if (line.contains("</code>")) {
+                        skipCode = false;
+                    }
+                }
+
+                for (String name : NAMES) {
+                    boolean isHostType = name.equals(baseClassName);
+                    boolean isAlwaysCode = ALWAYS_CODE.contains(name);
+                    String asLink = "{@link " + name + "}";
+                    String asCode = "{@code " + name + "}";
+                    boolean seenBefore = false;
+
+                    for (int j = 0; j < docs.size(); j++) {
+                        String line = docs.get(j);
+
+                        int idxLink = line.indexOf(asLink);
+                        if (idxLink >= 0 && !isHostType && !isAlwaysCode) {
+                            int k = idxLink + asLink.length();
+                            for (;;) {
+                                int jdxLink = line.indexOf(asLink, k);
+                                if (jdxLink < 0) {
+                                    break;
+                                }
+                                if (jdxLink >= 0) {
+                                    errorCount++;
+                                    errors.append("The subsequent mention should be code: ")
+                                    .append("{@code ").append(name)
+                                    .append("}\r\n at ")
+                                    .append(baseClassName)
+                                    .append(".method(")
+                                    .append(baseClassName)
+                                    .append(".java:")
+                                    .append(i + 2 + j)
+                                    .append(")\r\n");
+                                }
+                                k = jdxLink + asLink.length();
+                            }
+                        }
+                        if (seenBefore) {
+                            if (idxLink >= 0 && !isHostType && !isAlwaysCode) {
+                                errorCount++;
+                                errors.append("The subsequent mention should be code: ")
+                                .append("{@code ").append(name)
+                                .append("}\r\n at ")
+                                .append(baseClassName)
+                                .append(".method(")
+                                .append(baseClassName)
+                                .append(".java:")
+                                .append(i + 2 + j)
+                                .append(")\r\n");
+                            }
+                        } else {
+                            int idxCode = line.indexOf(asCode);
+
+                            if (isHostType) {
+                                if (idxLink >= 0) {
+                                    errorCount++;
+                                    errors.append("The host type mention should be code: ")
+                                    .append("{@code ").append(name)
+                                    .append("}\r\n at ")
+                                    .append(baseClassName)
+                                    .append(".method(")
+                                    .append(baseClassName)
+                                    .append(".java:")
+                                    .append(i + 2 + j)
+                                    .append(")\r\n");
+                                }
+                            } else {
+                                if ((idxLink < 0 && idxCode >= 0 && !isAlwaysCode)
+                                        || (idxLink >= 0 && idxCode >= 0 && idxCode < idxLink)) {
+                                    errorCount++;
+                                    if (isAlwaysCode) {
+                                        errors.append("The first mention should be code: ")
+                                        .append("{@code ")
+                                        ;
+                                    } else {
+                                        errors.append("The first mention should be link: ")
+                                        .append("{@link ")
+                                        ;
+                                    }
+                                    errors
+                                    .append(name)
+                                    .append("}\r\n at ")
+                                    .append(baseClassName)
+                                    .append(".method(")
+                                    .append(baseClassName)
+                                    .append(".java:")
+                                    .append(i + 2 + j)
+                                    .append(")\r\n");
+                                }
+                            }
+
+                            seenBefore = idxLink >= 0 || idxCode >= 0;
+                        }
+
+                        // strip out all existing {@code } and {@link } instances
+                        String noCurly = removeCurlies(line);
+
+                        int k = 0;
+
+                        for (;;) {
+                            int idx = noCurly.indexOf(name, k);
+                            if (idx < 0) {
+                                break;
+                            }
+                            k = idx + name.length();
+
+                            if (isHostType) {
+                                errorCount++;
+                                errors.append("The host type mention should be code: ")
+                                .append("{@code ").append(name)
+                                .append("}\r\n at ")
+                                .append(baseClassName)
+                                .append(".method(")
+                                .append(baseClassName)
+                                .append(".java:")
+                                .append(i + 2 + j)
+                                .append(")\r\n");
+                            }
+                            else if (!seenBefore) {
+                                errorCount++;
+                                if (isAlwaysCode) {
+                                    errors.append("The first mention should be code: ")
+                                    .append("{@code ");
+                                } else {
+                                    errors.append("The first mention should be link: ")
+                                    .append("{@link ");
+                                }
+                                errors
+                                .append(name)
+                                .append("}\r\n at ")
+                                .append(baseClassName)
+                                .append(".method(")
+                                .append(baseClassName)
+                                .append(".java:")
+                                .append(i + 2 + j)
+                                .append(")\r\n");
+                            } else {
+                                errorCount++;
+                                errors.append("The subsequent mention should be code: ")
+                                .append("{@code ").append(name)
+                                .append("}\r\n at ")
+                                .append(baseClassName)
+                                .append(".method(")
+                                .append(baseClassName)
+                                .append(".java:")
+                                .append(i + 2 + j)
+                                .append(")\r\n");
+                            }
+
+                            seenBefore = true;
+                        }
+                    }
+                }
+
+                i += docs.size();
+
+                if (errorCount >= ERROR_LIMIT) {
+                    break;
+                }
+            }
+        }
+
+        if (errorCount != 0) {
+            errors.insert(0, "Found " + (errorCount > ERROR_LIMIT ? ERROR_LIMIT + "+" : errorCount + "") + " cases\r\n");
+            throw new AssertionError(errors.toString());
+        }
+    }
+
+    static String removeCurlies(String input) {
+        StringBuilder result = new StringBuilder(input.length());
+
+        boolean skip = false;
+        for (int i = 0; i < input.length(); i++) {
+            char c = input.charAt(i);
+            if (c == '{') {
+                skip = true;
+            }
+            if (!skip) {
+                result.append(c);
+            }
+            if (c == '}') {
+                skip = false;
+            }
+        }
+
+        return result.toString();
+    }
+
+    static String stripTags(String input) {
+        StringBuilder result = new StringBuilder(input.length());
+        result.append(input, input.length() > 1 ? 2 : 1, input.length());
+
+        clearTag(result, "<a ", "</a>");
+        clearTag(result, "<b>", "</b>");
+        clearTag(result, "<strong>", "</strong>");
+        clearTag(result, "<em>", "</em>");
+        clearTag(result, "<img ", ">");
+
+        return result.toString();
+    }
+
+    static void clearTag(StringBuilder builder, String startTag, String endTag) {
+        int k = 0;
+        for (;;) {
+            int j = builder.indexOf(startTag, k);
+            if (j < 0) {
+                break;
+            }
+
+            int e = builder.indexOf(endTag, j);
+            if (e < 0) {
+                e = builder.length();
+            }
+
+            blankRange(builder, j, e);
+
+            k = e + endTag.length();
+        }
+    }
+
+    static void blankRange(StringBuilder builder, int start, int end) {
+        for (int i = start; i < end; i++) {
+            int c = builder.charAt(i);
+            if (c != '\r' && c != '\n') {
+                builder.setCharAt(i, ' ');
+            }
+        }
+    }
+
+    static final List<String> NAMES = Arrays.asList(
+            "Flowable", "Observable", "Maybe", "Single", "Completable", "ParallelFlowable",
+
+            "Publisher", "ObservableSource", "MaybeSource", "SingleSource", "CompletableSource",
+
+            "FlowableSubscriber", "Subscriber", "Observer", "MaybeObserver", "SingleObserver", "CompletableObserver",
+
+            "FlowableOperator", "ObservableOperator", "MaybeOperator", "SingleOperator", "CompletableOperator",
+
+            "FlowableOnSubscribe", "ObservableOnSubscribe", "MaybeOnSubscribe", "SingleOnSubscribe", "CompletableOnSubscribe",
+
+            "FlowableTransformer", "ObservableTransformer", "MaybeTransformer", "SingleTransformer", "CompletableTransformer", "ParallelTransformer",
+
+            "FlowableConverter", "ObservableConverter", "MaybeConverter", "SingleConverter", "CompletableConverter",
+
+            "FlowableEmitter", "ObservableEmitter", "MaybeEmitter", "SingleEmitter", "CompletableEmitter",
+
+            "Iterable", "Stream",
+
+            "Function", "BiFunction", "Function3", "Function4", "Function5", "Function6", "Function7", "Function8", "Function9",
+
+            "Action", "Runnable", "Disposable", "Subscription", "Consumer", "BiConsumer", "Future",
+
+            "Supplier", "Callable", "TimeUnit",
+
+            "BackpressureOverflowStrategy",
+
+            "Exception", "Throwable", "NullPointerException", "IllegalStateException", "IllegalArgumentException", "MissingBackpressureException", "UndeliverableException",
+            "OutOfMemoryError", "StackOverflowError", "NoSuchElementException", "ClassCastException", "CompositeException",
+            "RuntimeException", "Error", "TimeoutException",
+
+            "false", "true", "onNext", "onError", "onComplete", "onSuccess", "onSubscribe", "null",
+
+            "ConnectableFlowable", "ConnectableObservable", "Subject", "FlowableProcessor", "Processor", "Scheduler",
+
+            "Optional", "CompletionStage", "Collector", "Collectors", "Schedulers", "RxJavaPlugins", "CompletableFuture",
+
+            "Object", "Integer", "Long", "Boolean", "LongConsumer",
+
+            "GroupedFlowable", "GroupedObservable", "UnicastSubject", "UnicastProcessor",
+
+            "Notification", "Comparable", "Comparator", "Collection",
+
+            "SafeSubscriber", "SafeObserver",
+
+            "List", "ArrayList", "HashMap", "HashSet", "CharSequence",
+
+            "TestSubscriber", "TestObserver"
+    );
+
+    static final Set<String> ALWAYS_CODE = new HashSet<>(Arrays.asList(
+            "false", "true", "null", "onSuccess", "onNext", "onError", "onComplete", "onSubscribe"
+    ));
+
+    static final int ERROR_LIMIT = 5000;
+}
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index fc0d1db9cf..46390523e1 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -316,6 +316,67 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                         break;
                     }
                 }
+
+                if (m.signature.matches("(?s).*?\\sSingle\\<.*?\\>\\s+\\w+\\(.*")) {
+                    for (String at : AT_RETURN_WORDS) {
+                        int idx = m.javadoc.indexOf(at + "{@code Flowable");
+                        if (idx >= 0) {
+                            e.append("Returns Single but docs return Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Maybe");
+                        if (idx >= 0) {
+                            e.append("Returns Single but docs return Maybe\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Publisher");
+                        if (idx >= 0) {
+                            e.append("Returns Single but docs return Publisher\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                    }
+                }
+
+                if (m.signature.matches("(?s).*?\\sMaybe\\<.*\\>\\s+\\w+\\(.*")) {
+                    for (String at : AT_RETURN_WORDS) {
+                        int idx = m.javadoc.indexOf(at + "{@code Flowable");
+                        if (idx >= 0) {
+                            e.append("Returns Maybe but docs return Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Single");
+                        if (idx >= 0) {
+                            e.append("Returns Maybe but docs return Single\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Publisher");
+                        if (idx >= 0) {
+                            e.append("Returns Maybe but docs return Publisher\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                    }
+                }
+
+                if (m.signature.matches("(?s).*?\\sCompletable\\s+\\w+\\(.*")) {
+                    for (String at : AT_RETURN_WORDS) {
+                        int idx = m.javadoc.indexOf(at + "{@code Flowable");
+                        if (idx >= 0) {
+                            e.append("Returns Completable but docs return Flowable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Single");
+                        if (idx >= 0) {
+                            e.append("Returns Completable but docs return Single\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Maybe");
+                        if (idx >= 0) {
+                            e.append("Returns Completable but docs return Maybe\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                    }
+                }
+
                 aOrAn(e, m, "Flowable");
                 missingClosingDD(e, m, "Flowable");
                 backpressureMentionedWithoutAnnotation(e, m, "Flowable");
@@ -417,6 +478,56 @@ public void observableDocRefersToObservableTypes() throws Exception {
                         break;
                     }
                 }
+                if (m.signature.matches("(?s).*?\\sSingle\\<.*?\\>\\s+\\w+\\(.*")) {
+                    for (String at : AT_RETURN_WORDS) {
+                        int idx = m.javadoc.indexOf(at + "{@code Observable");
+                        if (idx >= 0) {
+                            e.append("Returns Single but docs return Observable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Maybe");
+                        if (idx >= 0) {
+                            e.append("Returns Single but docs return Maybe\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                    }
+                }
+
+                if (m.signature.matches("(?s).*?\\sMaybe\\<.*?\\>\\s+\\w+\\(.*")) {
+                    for (String at : AT_RETURN_WORDS) {
+                        int idx = m.javadoc.indexOf(at + "{@code Observable");
+                        if (idx >= 0) {
+                            e.append("Returns Maybe but docs return Observable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Single");
+                        if (idx >= 0) {
+                            e.append("Returns Maybe but docs return Single\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                    }
+                }
+
+                if (m.signature.matches("(?s).*?\\sCompletable\\s+\\w+\\(.*")) {
+                    for (String at : AT_RETURN_WORDS) {
+                        int idx = m.javadoc.indexOf(at + "{@code Observable");
+                        if (idx >= 0) {
+                            e.append("Returns Completable but docs return Observable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Single");
+                        if (idx >= 0) {
+                            e.append("Returns Completable but docs return Single\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        idx = m.javadoc.indexOf(at + "{@code Maybe");
+                        if (idx >= 0) {
+                            e.append("Returns Completable but docs return Maybe\r\n at io.reactivex.rxjava3.core.")
+                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                    }
+                }
+
                 aOrAn(e, m, "Observable");
                 missingClosingDD(e, m, "Observable");
                 backpressureMentionedWithoutAnnotation(e, m, "Observable");
@@ -949,4 +1060,6 @@ static void backpressureMentionedWithoutAnnotation(StringBuilder e, RxMethod m,
             .append(".java:").append(m.backpressureDocLine).append(")\r\n\r\n");
         }
     }
+
+    static final String[] AT_RETURN_WORDS = { "@return a ", "@return the new ", "@return a new " };
 }

From ecfb6b741d411de9d060b1c4b1fcd90ff7530854 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 1 Jan 2020 14:33:28 +0100
Subject: [PATCH 033/665] 3.x: Improve Javadocs of Completable and some others
 (#6809)

---
 .../reactivex/rxjava3/core/Completable.java   | 1092 +++++++++--------
 .../io/reactivex/rxjava3/core/Observable.java |    2 +-
 .../rxjava3/disposables/Disposable.java       |   16 +-
 .../flowables/ConnectableFlowable.java        |    2 +
 .../observables/ConnectableObservable.java    |    2 +
 .../rxjava3/processors/BehaviorProcessor.java |    1 +
 .../processors/MulticastProcessor.java        |    5 +-
 .../validators/JavadocCodesAndLinks.java      |    9 +-
 .../rxjava3/validators/JavadocWording.java    |  145 +--
 .../validators/ParamValidationNaming.java     |  129 +-
 10 files changed, 729 insertions(+), 674 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 9ce0ee1df8..1f24e413f5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -15,11 +15,11 @@
 import java.util.*;
 import java.util.concurrent.*;
 
-import org.reactivestreams.Publisher;
+import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
@@ -50,7 +50,7 @@
  * <p>
  * Note that as with the {@code Observable} protocol, {@code onError} and {@code onComplete} are mutually exclusive events.
  * <p>
- * Like {@link Observable}, a running {@code Completable} can be stopped through the {@link Disposable} instance
+ * Like {@code Observable}, a running {@code Completable} can be stopped through the {@link Disposable} instance
  * provided to consumers through {@link SingleObserver#onSubscribe}.
  * <p>
  * Like an {@code Observable}, a {@code Completable} is lazy, can be either "hot" or "cold", synchronous or
@@ -62,7 +62,7 @@
  * <p>
  * <img width="640" height="577" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.png" alt="">
  * <p>
- * See {@link Flowable} or {@link Observable} for the
+ * See {@link Flowable} or {@code Observable} for the
  * implementation of the Reactive Pattern for a stream or vector of values.
  * <p>
  * Example:
@@ -105,18 +105,18 @@
  */
 public abstract class Completable implements CompletableSource {
     /**
-     * Returns a Completable which terminates as soon as one of the source Completables
-     * terminates (normally or with an error) and disposes all other Completables.
+     * Returns a {@code Completable} which terminates as soon as one of the source {@code Completable}s
+     * terminates (normally or with an error) and disposes all other {@code Completable}s.
      * <p>
      * <img width="640" height="518" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.ambArray.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param sources the array of source Completables. A subscription to each source will
+     * @param sources the array of source {@code Completable}s. A subscription to each source will
      *            occur in the same order as in this array.
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -135,18 +135,18 @@ public static Completable ambArray(@NonNull CompletableSource... sources) {
     }
 
     /**
-     * Returns a Completable which terminates as soon as one of the source Completables
-     * terminates (normally or with an error) and disposes all other Completables.
+     * Returns a {@code Completable} which terminates as soon as one of the source {@code Completable}s in the {@link Iterable} sequence
+     * terminates (normally or with an error) and disposes all other {@code Completable}s.
      * <p>
      * <img width="640" height="518" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.amb.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code amb} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param sources the array of source Completables. A subscription to each source will
-     *            occur in the same order as in this Iterable.
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
+     * @param sources the {@code Iterable} of source {@code Completable}s. A subscription to each source will
+     *            occur in the same order as in this {@code Iterable}.
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -158,14 +158,14 @@ public static Completable amb(@NonNull Iterable<? extends CompletableSource> sou
     }
 
     /**
-     * Returns a Completable instance that completes immediately when subscribed to.
+     * Returns a {@code Completable} instance that completes immediately when subscribed to.
      * <p>
      * <img width="640" height="472" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.complete.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code complete} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a Completable instance that completes immediately
+     * @return a {@code Completable} instance that completes immediately
      */
     @CheckReturnValue
     @NonNull
@@ -175,7 +175,7 @@ public static Completable complete() {
     }
 
     /**
-     * Returns a Completable which completes only when all sources complete, one after another.
+     * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
      * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatArray.png" alt="">
      * <dl>
@@ -183,8 +183,8 @@ public static Completable complete() {
      *  <dd>{@code concatArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param sources the sources to concatenate
-     * @return the Completable instance which completes only when all sources complete
-     * @throws NullPointerException if sources is null
+     * @return the {@code Completable} instance which completes only when all sources complete
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -202,7 +202,7 @@ public static Completable concatArray(@NonNull CompletableSource... sources) {
     }
 
     /**
-     * Returns a Completable which completes only when all sources complete, one after another.
+     * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
      * <img width="640" height="303" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concat.png" alt="">
      * <dl>
@@ -210,8 +210,8 @@ public static Completable concatArray(@NonNull CompletableSource... sources) {
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param sources the sources to concatenate
-     * @return the Completable instance which completes only when all sources complete
-     * @throws NullPointerException if sources is null
+     * @return the {@code Completable} instance which completes only when all sources complete
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -223,19 +223,19 @@ public static Completable concat(@NonNull Iterable<? extends CompletableSource>
     }
 
     /**
-     * Returns a Completable which completes only when all sources complete, one after another.
+     * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
      * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concat.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
-     *  and expects the other {@code Publisher} to honor it as well.</dd>
+     *  and expects the other {@link Publisher} to honor it as well.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param sources the sources to concatenate
-     * @return the Completable instance which completes only when all sources complete
-     * @throws NullPointerException if sources is null
+     * @return the {@code Completable} instance which completes only when all sources complete
+     * @throws NullPointerException if sources is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -246,20 +246,21 @@ public static Completable concat(@NonNull Publisher<? extends CompletableSource>
     }
 
     /**
-     * Returns a Completable which completes only when all sources complete, one after another.
+     * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
      * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concat.pn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
-     *  and expects the other {@code Publisher} to honor it as well.</dd>
+     *  and expects the other {@link Publisher} to honor it as well.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param sources the sources to concatenate
      * @param prefetch the number of sources to prefetch from the sources
-     * @return the Completable instance which completes only when all sources complete
-     * @throws NullPointerException if sources is null
+     * @return the {@code Completable} instance which completes only when all sources complete
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -272,7 +273,7 @@ public static Completable concat(@NonNull Publisher<? extends CompletableSource>
     }
 
     /**
-     * Provides an API (via a cold Completable) that bridges the reactive world with the callback-style world.
+     * Provides an API (via a cold {@code Completable}) that bridges the reactive world with the callback-style world.
      * <p>
      * <img width="640" height="442" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.create.png" alt="">
      * <p>
@@ -301,14 +302,15 @@ public static Completable concat(@NonNull Publisher<? extends CompletableSource>
      * Whenever a {@link CompletableObserver} subscribes to the returned {@code Completable}, the provided
      * {@link CompletableOnSubscribe} callback is invoked with a fresh instance of a {@link CompletableEmitter}
      * that will interact only with that specific {@code CompletableObserver}. If this {@code CompletableObserver}
-     * disposes the flow (making {@link CompletableEmitter#isDisposed} return true),
+     * disposes the flow (making {@link CompletableEmitter#isDisposed} return {@code true}),
      * other observers subscribed to the same returned {@code Completable} are not affected.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code create} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param source the emitter that is called when a CompletableObserver subscribes to the returned {@code Completable}
-     * @return the new Completable instance
+     * @param source the emitter that is called when a {@code CompletableObserver} subscribes to the returned {@code Completable}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code source} is {@code null}
      * @see CompletableOnSubscribe
      * @see Cancellable
      */
@@ -321,7 +323,7 @@ public static Completable create(@NonNull CompletableOnSubscribe source) {
     }
 
     /**
-     * Constructs a Completable instance by wrapping the given source callback
+     * Constructs a {@code Completable} instance by wrapping the given source callback
      * <strong>without any safeguards; you should manage the lifecycle and response
      * to downstream disposal</strong>.
      * <p>
@@ -330,10 +332,10 @@ public static Completable create(@NonNull CompletableOnSubscribe source) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code unsafeCreate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param source the callback which will receive the CompletableObserver instances
-     * when the Completable is subscribed to.
-     * @return the created Completable instance
-     * @throws NullPointerException if source is null
+     * @param source the callback which will receive the {@link CompletableObserver} instances
+     * when the {@code Completable} is subscribed to.
+     * @return the created {@code Completable} instance
+     * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -347,15 +349,16 @@ public static Completable unsafeCreate(@NonNull CompletableSource source) {
     }
 
     /**
-     * Defers the subscription to a Completable instance returned by a supplier.
+     * Defers the subscription to a {@code Completable} instance returned by a supplier.
      * <p>
      * <img width="640" height="298" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.defer.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code defer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param completableSupplier the supplier that returns the Completable that will be subscribed to.
-     * @return the Completable instance
+     * @param completableSupplier the supplier that returns the {@code Completable} that will be subscribed to.
+     * @return the {@code Completable} instance
+     * @throws NullPointerException if {@code completableSupplier} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -366,20 +369,20 @@ public static Completable defer(@NonNull Supplier<? extends CompletableSource> c
     }
 
     /**
-     * Creates a Completable which calls the given error supplier for each subscriber
-     * and emits its returned Throwable.
+     * Creates a {@code Completable} which calls the given error supplier for each subscriber
+     * and emits its returned {@link Throwable}.
      * <p>
      * <img width="640" height="462" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.error.f.png" alt="">
      * <p>
-     * If the errorSupplier returns null, the child CompletableObservers will receive a
-     * NullPointerException.
+     * If the {@code errorSupplier} returns {@code null}, the downstream {@link CompletableObserver}s will receive a
+     * {@link NullPointerException}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param errorSupplier the error supplier, not null
-     * @return the new Completable instance
-     * @throws NullPointerException if errorSupplier is null
+     * @param errorSupplier the error supplier, not {@code null}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code errorSupplier} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -390,16 +393,16 @@ public static Completable error(@NonNull Supplier<? extends Throwable> errorSupp
     }
 
     /**
-     * Creates a Completable instance that emits the given Throwable exception to subscribers.
+     * Creates a {@code Completable} instance that emits the given {@link Throwable} exception to subscribers.
      * <p>
      * <img width="640" height="462" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.error.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param error the Throwable instance to emit, not null
-     * @return the new Completable instance
-     * @throws NullPointerException if error is null
+     * @param error the {@code Throwable} instance to emit, not {@code null}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code error} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -410,7 +413,7 @@ public static Completable error(@NonNull Throwable error) {
     }
 
     /**
-     * Returns a Completable instance that runs the given Action for each subscriber and
+     * Returns a {@code Completable} instance that runs the given {@link Action} for each subscriber and
      * emits either an unchecked exception or simply completes.
      * <p>
      * <img width="640" height="297" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromAction.png" alt="">
@@ -418,16 +421,16 @@ public static Completable error(@NonNull Throwable error) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromAction} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd> If the {@link Action} throws an exception, the respective {@link Throwable} is
+     *  <dd> If the {@code Action} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link CompletableObserver#onError(Throwable)},
      *  except when the downstream has disposed this {@code Completable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
      * </dl>
-     * @param run the runnable to run for each subscriber
-     * @return the new Completable instance
-     * @throws NullPointerException if run is null
+     * @param run the {@code Action} to run for each subscribing {@link CompletableObserver}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code run} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -438,23 +441,24 @@ public static Completable fromAction(@NonNull Action run) {
     }
 
     /**
-     * Returns a Completable which when subscribed, executes the callable function, ignores its
-     * normal result and emits onError or onComplete only.
+     * Returns a {@code Completable} which when subscribed, executes the {@link Callable} function, ignores its
+     * normal result and emits {@code onError} or {@code onComplete} only.
      * <p>
      * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromCallable.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromCallable} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd> If the {@link Callable} throws an exception, the respective {@link Throwable} is
+     *  <dd> If the {@code Callable} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link CompletableObserver#onError(Throwable)},
      *  except when the downstream has disposed this {@code Completable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
      * </dl>
-     * @param callable the callable instance to execute for each subscriber
-     * @return the new Completable instance
+     * @param callable the {@code Callable} instance to execute for each subscribing {@link CompletableObserver}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code callable} is {@code null}
      * @see #defer(Supplier)
      * @see #fromSupplier(Supplier)
      */
@@ -467,17 +471,20 @@ public static Completable fromCallable(@NonNull Callable<?> callable) {
     }
 
     /**
-     * Returns a Completable instance that reacts to the termination of the given Future in a blocking fashion.
+     * Returns a {@code Completable} instance that reacts to the termination of the given {@link Future} in a blocking fashion.
      * <p>
      * <img width="640" height="628" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromFuture.png" alt="">
      * <p>
-     * Note that if any of the observers to this Completable call dispose, this Completable will cancel the future.
+     * Note that disposing the {@code Completable} won't cancel the {@code Future}.
+     * Use {@link #doOnDispose(Action)} and call {@link Future#cancel(boolean)} in the
+     * {@link Action}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param future the future to react to
-     * @return the new Completable instance
+     * @param future the {@code Future} to react to
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code future} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -488,8 +495,8 @@ public static Completable fromFuture(@NonNull Future<?> future) {
     }
 
     /**
-     * Returns a Completable instance that when subscribed to, subscribes to the {@code Maybe} instance and
-     * emits a completion event if the maybe emits {@code onSuccess}/{@code onComplete} or forwards any
+     * Returns a {@code Completable} instance that when subscribed to, subscribes to the {@link Maybe} instance and
+     * emits an {@code onComplete} event if the maybe emits {@code onSuccess}/{@code onComplete} or forwards any
      * {@code onError} events.
      * <p>
      * <img width="640" height="235" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromMaybe.png" alt="">
@@ -499,9 +506,9 @@ public static Completable fromFuture(@NonNull Future<?> future) {
      * </dl>
      * <p>History: 2.1.17 - beta
      * @param <T> the value type of the {@link MaybeSource} element
-     * @param maybe the Maybe instance to subscribe to, not null
-     * @return the new Completable instance
-     * @throws NullPointerException if single is null
+     * @param maybe the {@code Maybe} instance to subscribe to, not {@code null}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code maybe} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -513,7 +520,7 @@ public static <T> Completable fromMaybe(@NonNull MaybeSource<T> maybe) {
     }
 
     /**
-     * Returns a Completable instance that runs the given Runnable for each subscriber and
+     * Returns a {@code Completable} instance that runs the given {@link Runnable} for each {@link CompletableObserver} and
      * emits either its exception or simply completes.
      * <p>
      * <img width="640" height="297" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromRunnable.png" alt="">
@@ -521,16 +528,16 @@ public static <T> Completable fromMaybe(@NonNull MaybeSource<T> maybe) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd> If the {@link Runnable} throws an exception, the respective {@link Throwable} is
+     *  <dd> If the {@code Runnable} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link CompletableObserver#onError(Throwable)},
      *  except when the downstream has disposed this {@code Completable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
      * </dl>
-     * @param run the runnable to run for each subscriber
-     * @return the new Completable instance
-     * @throws NullPointerException if run is null
+     * @param run the {@code Runnable} to run for each {@code CompletableObserver}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code run} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -541,7 +548,7 @@ public static Completable fromRunnable(@NonNull Runnable run) {
     }
 
     /**
-     * Returns a Completable instance that subscribes to the given Observable, ignores all values and
+     * Returns a {@code Completable} instance that subscribes to the given {@link ObservableSource}, ignores all values and
      * emits only the terminal event.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromObservable.png" alt="">
@@ -549,10 +556,10 @@ public static Completable fromRunnable(@NonNull Runnable run) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromObservable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the type of the Observable
-     * @param observable the Observable instance to subscribe to, not null
-     * @return the new Completable instance
-     * @throws NullPointerException if flowable is null
+     * @param <T> the type of the {@code ObservableSource}
+     * @param observable the {@code ObservableSource} instance to subscribe to, not {@code null}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code observable} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -563,19 +570,19 @@ public static <T> Completable fromObservable(@NonNull ObservableSource<T> observ
     }
 
     /**
-     * Returns a Completable instance that subscribes to the given publisher, ignores all values and
+     * Returns a {@code Completable} instance that subscribes to the given {@link Publisher}, ignores all values and
      * emits only the terminal event.
      * <p>
      * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromPublisher.png" alt="">
      * <p>
-     * The {@link Publisher} must follow the
+     * The {@code Publisher} must follow the
      * <a href="https://github.com/reactive-streams/reactive-streams-jvm#reactive-streams">Reactive-Streams specification</a>.
      * Violating the specification may result in undefined behavior.
      * <p>
      * If possible, use {@link #create(CompletableOnSubscribe)} to create a
      * source-like {@code Completable} instead.
      * <p>
-     * Note that even though {@link Publisher} appears to be a functional interface, it
+     * Note that even though {@code Publisher} appears to be a functional interface, it
      * is not recommended to implement it through a lambda as the specification requires
      * state management that is not achievable with a stateless lambda.
      * <dl>
@@ -585,10 +592,10 @@ public static <T> Completable fromObservable(@NonNull ObservableSource<T> observ
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromPublisher} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the type of the publisher
-     * @param publisher the Publisher instance to subscribe to, not null
-     * @return the new Completable instance
-     * @throws NullPointerException if publisher is null
+     * @param <T> the type of the {@code Publisher}
+     * @param publisher the {@code Publisher} instance to subscribe to, not {@code null}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code publisher} is {@code null}
      * @see #create(CompletableOnSubscribe)
      */
     @CheckReturnValue
@@ -601,18 +608,18 @@ public static <T> Completable fromPublisher(@NonNull Publisher<T> publisher) {
     }
 
     /**
-     * Returns a Completable instance that when subscribed to, subscribes to the Single instance and
-     * emits a completion event if the single emits onSuccess or forwards any onError events.
+     * Returns a {@code Completable} instance that when subscribed to, subscribes to the {@link SingleSource} instance and
+     * emits a completion event if the single emits {@code onSuccess} or forwards any {@code onError} events.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromSingle.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the value type of the Single
-     * @param single the Single instance to subscribe to, not null
-     * @return the new Completable instance
-     * @throws NullPointerException if single is null
+     * @param <T> the value type of the {@code SingleSource}
+     * @param single the {@code SingleSource} instance to subscribe to, not {@code null}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code single} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -623,23 +630,24 @@ public static <T> Completable fromSingle(@NonNull SingleSource<T> single) {
     }
 
     /**
-     * Returns a Completable which when subscribed, executes the supplier function, ignores its
-     * normal result and emits onError or onComplete only.
+     * Returns a {@code Completable} which when subscribed, executes the {@link Supplier} function, ignores its
+     * normal result and emits {@code onError} or {@code onComplete} only.
      * <p>
      * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromSupplier.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromSupplier} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd> If the {@link Supplier} throws an exception, the respective {@link Throwable} is
+     *  <dd> If the {@code Supplier} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link CompletableObserver#onError(Throwable)},
      *  except when the downstream has disposed this {@code Completable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
      * </dl>
-     * @param supplier the Supplier instance to execute for each subscriber
-     * @return the new Completable instance
+     * @param supplier the {@code Supplier} instance to execute for each {@link CompletableObserver}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see #defer(Supplier)
      * @see #fromCallable(Callable)
      * @since 3.0.0
@@ -653,30 +661,30 @@ public static Completable fromSupplier(@NonNull Supplier<?> supplier) {
     }
 
     /**
-     * Returns a Completable instance that subscribes to all sources at once and
-     * completes only when all source Completables complete or one of them emits an error.
+     * Returns a {@code Completable} instance that subscribes to all sources at once and
+     * completes only when all source {@link CompletableSource}s complete or one of them emits an error.
      * <p>
      * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.mergeArray.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArray} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code CompletableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code CompletableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Completable} terminates with that {@code Throwable} and all other source {@code CompletableSource}s are disposed.
      *  If more than one {@code CompletableSource} signals an error, the resulting {@code Completable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Completable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeArrayDelayError(CompletableSource...)} to merge sources and terminate only when all source {@code CompletableSource}s
      *  have completed or failed with an error.
      *  </dd>
      * </dl>
-     * @param sources the iterable sequence of sources.
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
+     * @param sources the array of {@code CompletableSource}s.
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see #mergeArrayDelayError(CompletableSource...)
      */
     @CheckReturnValue
@@ -695,30 +703,30 @@ public static Completable mergeArray(@NonNull CompletableSource... sources) {
     }
 
     /**
-     * Returns a Completable instance that subscribes to all sources at once and
-     * completes only when all source Completables complete or one of them emits an error.
+     * Returns a {@code Completable} instance that subscribes to all sources at once and
+     * completes only when all source {@link CompletableSource}s complete or one of them emits an error.
      * <p>
      * <img width="640" height="311" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.merge.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code CompletableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code CompletableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Completable} terminates with that {@code Throwable} and all other source {@code CompletableSource}s are disposed.
      *  If more than one {@code CompletableSource} signals an error, the resulting {@code Completable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Completable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Iterable)} to merge sources and terminate only when all source {@code CompletableSource}s
      *  have completed or failed with an error.
      *  </dd>
      * </dl>
-     * @param sources the iterable sequence of sources.
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
+     * @param sources the {@link Iterable} sequence of {@code CompletableSource}s.
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see #mergeDelayError(Iterable)
      */
     @CheckReturnValue
@@ -730,33 +738,33 @@ public static Completable merge(@NonNull Iterable<? extends CompletableSource> s
     }
 
     /**
-     * Returns a Completable instance that subscribes to all sources at once and
-     * completes only when all source Completables complete or one of them emits an error.
+     * Returns a {@code Completable} instance that subscribes to all sources at once and
+     * completes only when all source {@link CompletableSource}s complete or one of them emits an error.
      * <p>
      * <img width="640" height="336" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.merge.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
-     *  and expects the other {@code Publisher} to honor it as well.</dd>
+     *  <dd>The operator consumes the given {@link Publisher} in an unbounded manner
+     *  (requesting {@link Long#MAX_VALUE} upfront).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code CompletableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code CompletableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Completable} terminates with that {@code Throwable} and all other source {@code CompletableSource}s are disposed.
      *  If more than one {@code CompletableSource} signals an error, the resulting {@code Completable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Completable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher)} to merge sources and terminate only when all source {@code CompletableSource}s
      *  have completed or failed with an error.
      *  </dd>
      * </dl>
-     * @param sources the iterable sequence of sources.
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
+     * @param sources the {@code Publisher} sequence of {@code CompletableSource}s.
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see #mergeDelayError(Publisher)
      */
     @CheckReturnValue
@@ -768,35 +776,36 @@ public static Completable merge(@NonNull Publisher<? extends CompletableSource>
     }
 
     /**
-     * Returns a Completable instance that keeps subscriptions to a limited number of sources at once and
-     * completes only when all source Completables complete or one of them emits an error.
+     * Returns a {@code Completable} instance that keeps subscriptions to a limited number of sources at once and
+     * completes only when all source {@link CompletableSource}s complete or one of them emits an error.
      * <p>
      * <img width="640" height="269" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.merge.pn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
-     *  and expects the other {@code Publisher} to honor it as well.</dd>
+     *  <dd>The operator consumes the given {@link Publisher} in a bounded manner,
+     *  requesting {@code maxConcurrency} items first, then keeps requesting as
+     *  many more as the inner {@code CompletableSource}s terminate.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code CompletableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code CompletableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Completable} terminates with that {@code Throwable} and all other source {@code CompletableSource}s are disposed.
      *  If more than one {@code CompletableSource} signals an error, the resulting {@code Completable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Completable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher, int)} to merge sources and terminate only when all source {@code CompletableSource}s
      *  have completed or failed with an error.
      *  </dd>
      * </dl>
-     * @param sources the iterable sequence of sources.
+     * @param sources the {@code Publisher} sequence of {@code CompletableSource}s.
      * @param maxConcurrency the maximum number of concurrent subscriptions
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
-     * @throws IllegalArgumentException if maxConcurrency is less than 1
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is less than 1
      * @see #mergeDelayError(Publisher, int)
      */
     @CheckReturnValue
@@ -808,22 +817,23 @@ public static Completable merge(@NonNull Publisher<? extends CompletableSource>
     }
 
     /**
-     * Returns a Completable instance that keeps subscriptions to a limited number of sources at once and
-     * completes only when all source Completables terminate in one way or another, combining any exceptions
-     * thrown by either the sources Observable or the inner Completable instances.
+     * Returns a {@code Completable} instance that keeps subscriptions to a limited number of {@link CompletableSource}s at once and
+     * completes only when all source {@code CompletableSource}s terminate in one way or another, combining any exceptions
+     * signaled by either the source {@link Publisher} or the inner {@code CompletableSource} instances.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer
-     *  and expects the other {@code Publisher} to honor it as well.
+     *  <dd>The operator consumes the given {@code Publisher} in a bounded manner,
+     *  requesting {@code maxConcurrency} items first, then keeps requesting as
+     *  many more as the inner {@code CompletableSource}s terminate.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge0} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param sources the iterable sequence of sources.
+     * @param sources the {@code Publisher} sequence of {@code CompletableSource}s.
      * @param maxConcurrency the maximum number of concurrent subscriptions
-     * @param delayErrors delay all errors from the main source and from the inner Completables?
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
-     * @throws IllegalArgumentException if maxConcurrency is less than 1
+     * @param delayErrors delay all errors from the main source and from the inner {@code CompletableSource}s?
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is less than 1
      */
     @CheckReturnValue
     @NonNull
@@ -836,8 +846,8 @@ private static Completable merge0(@NonNull Publisher<? extends CompletableSource
     }
 
     /**
-     * Returns a CompletableConsumable that subscribes to all Completables in the source array and delays
-     * any error emitted by either the sources observable or any of the inner Completables until all of
+     * Returns a {@code Completable} that subscribes to all {@link CompletableSource}s in the source array and delays
+     * any error emitted by any of the inner {@code CompletableSource}s until all of
      * them terminate in a way or another.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.mergeArrayDelayError.png" alt="">
@@ -845,9 +855,9 @@ private static Completable merge0(@NonNull Publisher<? extends CompletableSource
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param sources the array of Completables
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
+     * @param sources the array of {@code CompletableSource}s
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -859,8 +869,8 @@ public static Completable mergeArrayDelayError(@NonNull CompletableSource... sou
     }
 
     /**
-     * Returns a Completable that subscribes to all Completables in the source sequence and delays
-     * any error emitted by either the sources observable or any of the inner Completables until all of
+     * Returns a {@code Completable} that subscribes to all {@link CompletableSource}s in the source sequence and delays
+     * any error emitted by any of the inner {@code CompletableSource}s until all of
      * them terminate in a way or another.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.mergeDelayError.png" alt="">
@@ -868,9 +878,9 @@ public static Completable mergeArrayDelayError(@NonNull CompletableSource... sou
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param sources the sequence of Completables
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
+     * @param sources the sequence of {@code CompletableSource}s
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -881,21 +891,21 @@ public static Completable mergeDelayError(@NonNull Iterable<? extends Completabl
     }
 
     /**
-     * Returns a Completable that subscribes to all Completables in the source sequence and delays
-     * any error emitted by either the sources observable or any of the inner Completables until all of
+     * Returns a {@code Completable} that subscribes to all {@link CompletableSource}s in the source sequence and delays
+     * any error emitted by either the sources {@link Publisher} or any of the inner {@code CompletableSource}s until all of
      * them terminate in a way or another.
      * <p>
      * <img width="640" height="466" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.mergeDelayError.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
-     *  and expects the other {@code Publisher} to honor it as well.</dd>
+     *  <dd>The operator consumes the {@code Publisher} in an unbounded manner
+     *  (requesting {@link Long#MAX_VALUE} from it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param sources the sequence of Completables
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
+     * @param sources the sequence of {@code CompletableSource}s
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -906,23 +916,24 @@ public static Completable mergeDelayError(@NonNull Publisher<? extends Completab
     }
 
     /**
-     * Returns a Completable that subscribes to a limited number of inner Completables at once in
+     * Returns a {@code Completable} that subscribes to a limited number of inner {@link CompletableSource}s at once in
      * the source sequence and delays any error emitted by either the sources
-     * observable or any of the inner Completables until all of
+     * {@link Publisher} or any of the inner {@code CompletableSource}s until all of
      * them terminate in a way or another.
      * <p>
      * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.mergeDelayError.pn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
-     *  and expects the other {@code Publisher} to honor it as well.</dd>
+     *  <dd>The operator requests {@code maxConcurrency} items from the {@code Publisher}
+     *  upfront and keeps requesting as many more as many inner {@code CompletableSource}s terminate.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param sources the sequence of Completables
-     * @param maxConcurrency the maximum number of concurrent subscriptions to Completables
-     * @return the new Completable instance
-     * @throws NullPointerException if sources is null
+     * @param sources the sequence of {@code CompletableSource}s
+     * @param maxConcurrency the maximum number of concurrent subscriptions to have
+     *                       at a time to the inner {@code CompletableSource}s
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -933,14 +944,14 @@ public static Completable mergeDelayError(@NonNull Publisher<? extends Completab
     }
 
     /**
-     * Returns a Completable that never calls onError or onComplete.
+     * Returns a {@code Completable} that never calls {@code onError} or {@code onComplete}.
      * <p>
      * <img width="640" height="512" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.never.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code never} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the singleton instance that never calls onError or onComplete
+     * @return the singleton instance that never calls {@code onError} or {@code onComplete}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -950,7 +961,7 @@ public static Completable never() {
     }
 
     /**
-     * Returns a Completable instance that fires its onComplete event after the given delay elapsed.
+     * Returns a {@code Completable} instance that fires its {@code onComplete} event after the given delay elapsed.
      * <p>
      * <img width="640" height="413" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.timer.png" alt="">
      * <dl>
@@ -959,7 +970,8 @@ public static Completable never() {
      * </dl>
      * @param delay the delay time
      * @param unit the delay unit
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
@@ -969,18 +981,19 @@ public static Completable timer(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Completable instance that fires its onComplete event after the given delay elapsed
-     * by using the supplied scheduler.
+     * Returns a {@code Completable} instance that fires its {@code onComplete} event after the given delay elapsed
+     * by using the supplied {@link Scheduler}.
      * <p>
      * <img width="640" height="413" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.timer.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code timer} operates on the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code timer} operates on the {@code Scheduler} you specify.</dd>
      * </dl>
      * @param delay the delay time
      * @param unit the delay unit
-     * @param scheduler the scheduler where to emit the complete event
-     * @return the new Completable instance
+     * @param scheduler the {@code Scheduler} where to emit the {@code onComplete} event
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -992,9 +1005,9 @@ public static Completable timer(long delay, @NonNull TimeUnit unit, @NonNull Sch
     }
 
     /**
-     * Creates a NullPointerException instance and sets the given Throwable as its initial cause.
-     * @param ex the Throwable instance to use as cause, not null (not verified)
-     * @return the created NullPointerException
+     * Creates a {@link NullPointerException} instance and sets the given {@link Throwable} as its initial cause.
+     * @param ex the {@code Throwable} instance to use as cause, not {@code null} (not verified)
+     * @return the created {@code NullPointerException}
      */
     private static NullPointerException toNpe(Throwable ex) {
         NullPointerException npe = new NullPointerException("Actually not, but can't pass out an exception otherwise...");
@@ -1003,8 +1016,8 @@ private static NullPointerException toNpe(Throwable ex) {
     }
 
     /**
-     * Returns a Completable instance which manages a resource along
-     * with a custom Completable instance while the subscription is active.
+     * Returns a {@code Completable} instance which manages a resource along
+     * with a custom {@link CompletableSource} instance while the subscription is active.
      * <p>
      * <img width="640" height="388" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.using.png" alt="">
      * <p>
@@ -1014,10 +1027,12 @@ private static NullPointerException toNpe(Throwable ex) {
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the resource type
-     * @param resourceSupplier the supplier that returns a resource to be managed.
-     * @param completableFunction the function that given a resource returns a Completable instance that will be subscribed to
-     * @param disposer the consumer that disposes the resource created by the resource supplier
-     * @return the new Completable instance
+     * @param resourceSupplier the {@link Supplier} that returns a resource to be managed.
+     * @param completableFunction the {@link Function} that given a resource returns a {@code CompletableSource} instance that will be subscribed to
+     * @param disposer the {@link Consumer} that disposes the resource created by the resource supplier
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code resourceSupplier}, {@code completableFunction}
+     *                              or {@code disposer} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1029,29 +1044,31 @@ public static <R> Completable using(@NonNull Supplier<R> resourceSupplier,
     }
 
     /**
-     * Returns a Completable instance which manages a resource along
-     * with a custom Completable instance while the subscription is active and performs eager or lazy
+     * Returns a {@code Completable} instance which manages a resource along
+     * with a custom {@link CompletableSource} instance while the subscription is active and performs eager or lazy
      * resource disposition.
      * <p>
      * <img width="640" height="332" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.using.b.png" alt="">
      * <p>
      * If this overload performs a lazy disposal after the terminal event is emitted.
-     * Exceptions thrown at this time will be delivered to RxJavaPlugins only.
+     * The exceptions thrown at this time will be delivered to the global {@link RxJavaPlugins#onError(Throwable)} handler only.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the resource type
-     * @param resourceSupplier the supplier that returns a resource to be managed
-     * @param completableFunction the function that given a resource returns a non-null
-     * Completable instance that will be subscribed to
-     * @param disposer the consumer that disposes the resource created by the resource supplier
+     * @param resourceSupplier the {@link Supplier} that returns a resource to be managed
+     * @param completableFunction the {@link Function} that given a resource returns a non-{@code null}
+     * {@code CompletableSource} instance that will be subscribed to
+     * @param disposer the {@link Consumer} that disposes the resource created by the resource supplier
      * @param eager
      *            If {@code true} then resource disposal will happen either on a {@code dispose()} call before the upstream is disposed
      *            or just before the emission of a terminal event ({@code onComplete} or {@code onError}).
      *            If {@code false} the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code resourceSupplier}, {@code completableFunction}
+     *                              or {@code disposer} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1069,8 +1086,8 @@ public static <R> Completable using(
     }
 
     /**
-     * Wraps the given CompletableSource into a Completable
-     * if not already Completable.
+     * Wraps the given {@link CompletableSource} into a {@code Completable}
+     * if not already {@code Completable}.
      * <p>
      * <img width="640" height="354" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.wrap.png" alt="">
      * <dl>
@@ -1078,8 +1095,8 @@ public static <R> Completable using(
      *  <dd>{@code wrap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param source the source to wrap
-     * @return the source or its wrapper Completable
-     * @throws NullPointerException if source is null
+     * @return the source or its wrapper {@code Completable}
+     * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1093,18 +1110,18 @@ public static Completable wrap(@NonNull CompletableSource source) {
     }
 
     /**
-     * Returns a Completable that emits the a terminated event of either this Completable
-     * or the other Completable whichever fires first.
+     * Returns a {@code Completable} that emits the a terminated event of either this {@code Completable}
+     * or the other {@link CompletableSource}, whichever fires first.
      * <p>
      * <img width="640" height="484" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.ambWith.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param other the other Completable, not null. A subscription to this provided source will occur after subscribing
+     * @param other the other {@code CompletableSource}, not {@code null}. A subscription to this provided source will occur after subscribing
      *            to the current source.
-     * @return the new Completable instance
-     * @throws NullPointerException if other is null
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1115,20 +1132,20 @@ public final Completable ambWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns an Observable which will subscribe to this Completable and once that is completed then
-     * will subscribe to the {@code next} ObservableSource. An error event from this Completable will be
-     * propagated to the downstream subscriber and will result in skipping the subscription of the
-     * Observable.
+     * Returns an {@link Observable} which will subscribe to this {@code Completable} and once that is completed then
+     * will subscribe to the {@code next} {@link ObservableSource}. An error event from this {@code Completable} will be
+     * propagated to the downstream observer and will result in skipping the subscription to the
+     * next {@code ObservableSource}.
      * <p>
      * <img width="640" height="278" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.andThen.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code andThen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the value type of the next ObservableSource
-     * @param next the Observable to subscribe after this Completable is completed, not null
-     * @return Observable that composes this Completable and next
-     * @throws NullPointerException if next is null
+     * @param <T> the value type of the next {@code ObservableSource}
+     * @param next the {@code ObservableSource} to subscribe after this {@code Completable} is completed, not {@code null}
+     * @return the new {@code Observable} that composes this {@code Completable} and the next {@code ObservableSource}
+     * @throws NullPointerException if {@code next} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1139,10 +1156,10 @@ public final Completable ambWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a Flowable which will subscribe to this Completable and once that is completed then
-     * will subscribe to the {@code next} Flowable. An error event from this Completable will be
-     * propagated to the downstream subscriber and will result in skipping the subscription of the
-     * Publisher.
+     * Returns a {@link Flowable} which will subscribe to this {@code Completable} and once that is completed then
+     * will subscribe to the {@code next} {@link Publisher}. An error event from this {@code Completable} will be
+     * propagated to the downstream subscriber and will result in skipping the subscription to the next
+     * {@code Publisher}.
      * <p>
      * <img width="640" height="249" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.andThen.p.png" alt="">
      * <dl>
@@ -1152,10 +1169,10 @@ public final Completable ambWith(@NonNull CompletableSource other) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code andThen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the value type of the next Publisher
-     * @param next the Publisher to subscribe after this Completable is completed, not null
-     * @return Flowable that composes this Completable and next
-     * @throws NullPointerException if next is null
+     * @param <T> the value type of the next {@code Publisher}
+     * @param next the {@code Publisher} to subscribe after this {@code Completable} is completed, not {@code null}
+     * @return the new {@code Flowable} that composes this {@code Completable} and the next {@code Publisher}
+     * @throws NullPointerException if {@code next} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1167,10 +1184,10 @@ public final Completable ambWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a Single which will subscribe to this Completable and once that is completed then
-     * will subscribe to the {@code next} SingleSource. An error event from this Completable will be
-     * propagated to the downstream subscriber and will result in skipping the subscription of the
-     * Single.
+     * Returns a {@link Single} which will subscribe to this {@code Completable} and once that is completed then
+     * will subscribe to the {@code next} {@link SingleSource}. An error event from this {@code Completable} will be
+     * propagated to the downstream observer and will result in skipping the subscription to the next
+     * {@code SingleSource}.
      * <p>
      * <img width="640" height="437" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.andThen.s.png" alt="">
      * <dl>
@@ -1178,9 +1195,10 @@ public final Completable ambWith(@NonNull CompletableSource other) {
      *  <dd>{@code andThen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T> the value type of the next SingleSource
-     * @param next the Single to subscribe after this Completable is completed, not null
-     * @return Single that composes this Completable and next
+     * @param <T> the value type of the next {@code SingleSource}
+     * @param next the {@code SingleSource} to subscribe after this {@code Completable} is completed, not {@code null}
+     * @return the new {@code Single} that composes this {@code Completable} and the next {@code SingleSource}
+     * @throws NullPointerException if {@code next} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1191,10 +1209,10 @@ public final Completable ambWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a {@link Maybe} which will subscribe to this Completable and once that is completed then
-     * will subscribe to the {@code next} MaybeSource. An error event from this Completable will be
-     * propagated to the downstream subscriber and will result in skipping the subscription of the
-     * Maybe.
+     * Returns a {@link Maybe} which will subscribe to this {@code Completable} and once that is completed then
+     * will subscribe to the {@code next} {@link MaybeSource}. An error event from this {@code Completable} will be
+     * propagated to the downstream observer and will result in skipping the subscription to the next
+     * {@code MaybeSource}.
      * <p>
      * <img width="640" height="280" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.andThen.m.png" alt="">
      * <dl>
@@ -1202,9 +1220,10 @@ public final Completable ambWith(@NonNull CompletableSource other) {
      *  <dd>{@code andThen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T> the value type of the next MaybeSource
-     * @param next the Maybe to subscribe after this Completable is completed, not null
-     * @return Maybe that composes this Completable and next
+     * @param <T> the value type of the next {@code MaybeSource}
+     * @param next the {@code MaybeSource} to subscribe after this {@code Completable} is completed, not {@code null}
+     * @return the new {@code Maybe} that composes this {@code Completable} and the next {@code MaybeSource}
+     * @throws NullPointerException if {@code next} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1215,8 +1234,10 @@ public final Completable ambWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a Completable that first runs this Completable
-     * and then the other completable.
+     * Returns a {@code Completable} that first runs this {@code Completable}
+     * and then the other {@link CompletableSource}. An error event from this {@code Completable} will be
+     * propagated to the downstream observer and will result in skipping the subscription to the next
+     * {@code CompletableSource}.
      * <p>
      * <img width="640" height="437" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.andThen.c.png" alt="">
      * <p>
@@ -1225,9 +1246,9 @@ public final Completable ambWith(@NonNull CompletableSource other) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code andThen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param next the other Completable, not null
-     * @return the new Completable instance
-     * @throws NullPointerException if other is null
+     * @param next the other {@code CompletableSource}, not {@code null}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code next} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1238,7 +1259,7 @@ public final Completable andThen(@NonNull CompletableSource next) {
     }
 
     /**
-     * Subscribes to and awaits the termination of this Completable instance in a blocking manner and
+     * Subscribes to and awaits the termination of this {@code Completable} instance in a blocking manner and
      * rethrows any exception emitted.
      * <p>
      * <img width="640" height="432" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.blockingAwait.png" alt="">
@@ -1250,7 +1271,7 @@ public final Completable andThen(@NonNull CompletableSource next) {
      *  into {@link RuntimeException} and throws that. Otherwise, {@code RuntimeException}s and
      *  {@link Error}s are rethrown as they are.</dd>
      * </dl>
-     * @throws RuntimeException wrapping an InterruptedException if the current thread is interrupted
+     * @throws RuntimeException wrapping an {@link InterruptedException} if the current thread is interrupted
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void blockingAwait() {
@@ -1260,7 +1281,7 @@ public final void blockingAwait() {
     }
 
     /**
-     * Subscribes to and awaits the termination of this Completable instance in a blocking manner
+     * Subscribes to and awaits the termination of this {@code Completable} instance in a blocking manner
      * with a specific timeout and rethrows any exception emitted within the timeout window.
      * <p>
      * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.blockingAwait.t.png" alt="">
@@ -1274,9 +1295,10 @@ public final void blockingAwait() {
      * </dl>
      * @param timeout the timeout value
      * @param unit the timeout unit
-     * @return true if the this Completable instance completed normally within the time limit,
-     * false if the timeout elapsed before this Completable terminated.
-     * @throws RuntimeException wrapping an InterruptedException if the current thread is interrupted
+     * @return {@code true} if the this {@code Completable} instance completed normally within the time limit,
+     * {@code false} if the timeout elapsed before this {@code Completable} terminated.
+     * @throws RuntimeException wrapping an {@link InterruptedException} if the current thread is interrupted
+     * @throws NullPointerException if {@code unit} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1288,8 +1310,8 @@ public final boolean blockingAwait(long timeout, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Subscribes to this Completable only once, when the first CompletableObserver
-     * subscribes to the result Completable, caches its terminal event
+     * Subscribes to this {@code Completable} only once, when the first {@link CompletableObserver}
+     * subscribes to the result {@code Completable}, caches its terminal event
      * and relays/replays it to observers.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.cache.png" alt="">
@@ -1301,7 +1323,7 @@ public final boolean blockingAwait(long timeout, @NonNull TimeUnit unit) {
      *  <dd>{@code cache} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.4 - experimental
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
      * @since 2.1
      */
     @CheckReturnValue
@@ -1313,16 +1335,16 @@ public final Completable cache() {
 
     /**
      * Calls the given transformer function with this instance and returns the function's resulting
-     * Completable.
+     * {@link CompletableSource} wrapped with {@link #wrap(CompletableSource)}.
      * <p>
      * <img width="640" height="625" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.compose.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code compose} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param transformer the transformer function, not null
-     * @return the Completable returned by the function
-     * @throws NullPointerException if transformer is null
+     * @param transformer the transformer function, not {@code null}
+     * @return a {@code Completable} wrapping the {@code CompletableSource} returned by the function via {@link #wrap(CompletableSource)}
+     * @throws NullPointerException if {@code transformer} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1332,16 +1354,20 @@ public final Completable compose(@NonNull CompletableTransformer transformer) {
     }
 
     /**
-     * Concatenates this Completable with another Completable.
+     * Concatenates this {@code Completable} with another {@link CompletableSource}.
+     * An error event from this {@code Completable} will be
+     * propagated to the downstream observer and will result in skipping the subscription to the next
+     * {@code CompletableSource}.
      * <p>
      * <img width="640" height="317" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatWith.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param other the other Completable, not null
-     * @return the new Completable which subscribes to this and then the other Completable
-     * @throws NullPointerException if other is null
+     * @param other the other {@code CompletableSource}, not {@code null}
+     * @return the new {@code Completable} which subscribes to this and then the other {@code CompletableSource}
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @see #andThen(CompletableSource)
      * @see #andThen(MaybeSource)
      * @see #andThen(ObservableSource)
      * @see #andThen(SingleSource)
@@ -1356,7 +1382,7 @@ public final Completable concatWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a Completable which delays the emission of the completion event by the given time.
+     * Returns a {@code Completable} which delays the emission of the completion event by the given time.
      * <p>
      * <img width="640" height="343" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.delay.png" alt="">
      * <dl>
@@ -1365,8 +1391,8 @@ public final Completable concatWith(@NonNull CompletableSource other) {
      * </dl>
      * @param delay the delay time
      * @param unit the delay unit
-     * @return the new Completable instance
-     * @throws NullPointerException if unit is null
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
@@ -1376,19 +1402,19 @@ public final Completable delay(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Completable which delays the emission of the completion event by the given time while
-     * running on the specified scheduler.
+     * Returns a {@code Completable} which delays the emission of the completion event by the given time while
+     * running on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="313" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.delay.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code delay} operates on the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code delay} operates on the {@code Scheduler} you specify.</dd>
      * </dl>
      * @param delay the delay time
      * @param unit the delay unit
-     * @param scheduler the scheduler to run the delayed completion on
-     * @return the new Completable instance
-     * @throws NullPointerException if unit or scheduler is null
+     * @param scheduler the {@code Scheduler} to run the delayed completion on
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
@@ -1398,20 +1424,20 @@ public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
     }
 
     /**
-     * Returns a Completable which delays the emission of the completion event, and optionally the error as well, by the given time while
-     * running on the specified scheduler.
+     * Returns a {@code Completable} which delays the emission of the completion event, and optionally the error as well, by the given time while
+     * running on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="253" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.delay.sb.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code delay} operates on the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code delay} operates on the {@code Scheduler} you specify.</dd>
      * </dl>
      * @param delay the delay time
      * @param unit the delay unit
-     * @param scheduler the scheduler to run the delayed completion on
+     * @param scheduler the {@code Scheduler} to run the delayed completion on
      * @param delayError delay the error emission as well?
-     * @return the new Completable instance
-     * @throws NullPointerException if unit or scheduler is null
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1423,7 +1449,7 @@ public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
     }
 
     /**
-     * Returns a Completable that delays the subscription to the source CompletableSource by a given amount of time.
+     * Returns a {@code Completable} that delays the subscription to the upstream by a given amount of time.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.delaySubscription.t.png" alt="">
      * <dl>
@@ -1434,7 +1460,8 @@ public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      *
      * @param delay the time to delay the subscription
      * @param unit  the time unit of {@code delay}
-     * @return a Completable that delays the subscription to the source CompletableSource by the given amount
+     * @return a {@code Completable} that delays the subscription to the upstream by the given amount
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @since 3.0.0
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -1446,20 +1473,21 @@ public final Completable delaySubscription(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Completable that delays the subscription to the source CompletableSource by a given amount of time,
-     * both waiting and subscribing on a given Scheduler.
+     * Returns a {@code Completable} that delays the subscription to the upstream by a given amount of time,
+     * both waiting and subscribing on a given {@link Scheduler}.
      * <p>
      * <img width="640" height="420" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.delaySubscription.ts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      * <p>History: 2.2.3 - experimental
      * @param delay     the time to delay the subscription
      * @param unit      the time unit of {@code delay}
-     * @param scheduler the Scheduler on which the waiting and subscription will happen
-     * @return a Completable that delays the subscription to the source CompletableSource by a given
-     * amount, waiting and subscribing on the given Scheduler
+     * @param scheduler the {@code Scheduler} on which the waiting and subscription will happen
+     * @return a {@code Completable} that delays the subscription to the upstream by a given
+     * amount of time, waiting and subscribing on the given {@code Scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 3.0.0
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -1471,16 +1499,16 @@ public final Completable delaySubscription(long delay, @NonNull TimeUnit unit, @
     }
 
     /**
-     * Returns a Completable which calls the given onComplete callback if this Completable completes.
+     * Returns a {@code Completable} which calls the given {@code onComplete} {@link Action} if this {@code Completable} completes.
      * <p>
      * <img width="640" height="304" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doOnComplete.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnComplete} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onComplete the callback to call when this emits an onComplete event
-     * @return the new Completable instance
-     * @throws NullPointerException if onComplete is null
+     * @param onComplete the {@code Action} to call when this emits an {@code onComplete} event
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onComplete} is {@code null}
      * @see #doFinally(Action)
      */
     @CheckReturnValue
@@ -1493,17 +1521,17 @@ public final Completable doOnComplete(@NonNull Action onComplete) {
     }
 
     /**
-     * Calls the shared {@code Action} if a CompletableObserver subscribed to the current
-     * Completable disposes the common Disposable it received via onSubscribe.
+     * Calls the shared {@link Action} if a {@link CompletableObserver} subscribed to the current
+     * {@code Completable} disposes the common {@link Disposable} it received via {@code onSubscribe}.
      * <p>
      * <img width="640" height="589" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doOnDispose.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnDispose} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onDispose the action to call when the child subscriber disposes the subscription
-     * @return the new Completable instance
-     * @throws NullPointerException if onDispose is null
+     * @param onDispose the {@code Action} to call when the downstream observer disposes the subscription
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onDispose} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1515,16 +1543,16 @@ public final Completable doOnDispose(@NonNull Action onDispose) {
     }
 
     /**
-     * Returns a Completable which calls the given onError callback if this Completable emits an error.
+     * Returns a {@code Completable} which calls the given {@code onError} {@link Consumer} if this {@code Completable} emits an error.
      * <p>
      * <img width="640" height="304" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doOnError.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onError the error callback
-     * @return the new Completable instance
-     * @throws NullPointerException if onError is null
+     * @param onError the error {@code Consumer} receiving the upstream {@link Throwable} if the upstream signals it via {@code onError}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onError} is {@code null}
      * @see #doFinally(Action)
      */
     @CheckReturnValue
@@ -1537,17 +1565,18 @@ public final Completable doOnError(@NonNull Consumer<? super Throwable> onError)
     }
 
     /**
-     * Returns a Completable which calls the given onEvent callback with the (throwable) for an onError
-     * or (null) for an onComplete signal from this Completable before delivering said signal to the downstream.
+     * Returns a {@code Completable} which calls the given {@code onEvent} {@link Consumer} with the {@link Throwable} for an {@code onError}
+     * or {@code null} for an {@code onComplete} signal from this {@code Completable} before delivering the signal to the downstream.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doOnEvent.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnEvent} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onEvent the event callback
-     * @return the new Completable instance
-     * @throws NullPointerException if onEvent is null
+     * @param onEvent the event {@code Consumer} that receives {@code null} for upstream
+     *                completion or a {@code Throwable} if the upstream signaled an error
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onEvent} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1558,18 +1587,20 @@ public final Completable doOnEvent(@NonNull Consumer<? super Throwable> onEvent)
     }
 
     /**
-     * Returns a Completable instance that calls the various callbacks on the specific
+     * Returns a {@code Completable} instance that calls the various callbacks upon the specific
      * lifecycle events.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnLifecycle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onSubscribe the consumer called when a CompletableSubscriber subscribes.
-     * @param onError the consumer called when this emits an onError event
-     * @param onComplete the runnable called just before when this Completable completes normally
-     * @param onAfterTerminate the runnable called after this Completable completes normally
-     * @param onDispose the runnable called when the child disposes the subscription
-     * @return the new Completable instance
+     * @param onSubscribe the consumer called when a {@link CompletableObserver} subscribes.
+     * @param onError the consumer called when this emits an {@code onError} event
+     * @param onComplete the runnable called just before when the upstream {@code Completable} completes normally
+     * @param onAfterTerminate the runnable called after this {@code Completable} completes normally
+     * @param onDispose the {@link Runnable} called when the downstream disposes the subscription
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onSubscribe}, {@code onError}, {@code onComplete}
+     * {@code onTerminate}, {@code onAfterTerminate} or {@code onDispose} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1591,17 +1622,17 @@ private Completable doOnLifecycle(
     }
 
     /**
-     * Returns a Completable instance that calls the given onSubscribe callback with the disposable
-     * that child subscribers receive on subscription.
+     * Returns a {@code Completable} instance that calls the given {@code onSubscribe} callback with the disposable
+     * that the downstream {@link CompletableObserver}s receive upon subscription.
      * <p>
      * <img width="640" height="304" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doOnSubscribe.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onSubscribe the callback called when a child subscriber subscribes
-     * @return the new Completable instance
-     * @throws NullPointerException if onSubscribe is null
+     * @param onSubscribe the {@link Consumer} called when a downstream {@code CompletableObserver} subscribes
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1613,7 +1644,7 @@ public final Completable doOnSubscribe(@NonNull Consumer<? super Disposable> onS
     }
 
     /**
-     * Returns a Completable instance that calls the given onTerminate callback just before this Completable
+     * Returns a {@code Completable} instance that calls the given {@code onTerminate} {@link Action} just before this {@code Completable}
      * completes normally or with an exception.
      * <p>
      * <img width="640" height="304" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doOnTerminate.png" alt="">
@@ -1621,8 +1652,8 @@ public final Completable doOnSubscribe(@NonNull Consumer<? super Disposable> onS
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnTerminate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onTerminate the callback to call just before this Completable terminates
-     * @return the new Completable instance
+     * @param onTerminate the {@code Action} to call just before this {@code Completable} terminates
+     * @return the new {@code Completable} instance
      * @see #doFinally(Action)
      */
     @CheckReturnValue
@@ -1635,7 +1666,7 @@ public final Completable doOnTerminate(@NonNull Action onTerminate) {
     }
 
     /**
-     * Returns a Completable instance that calls the given onTerminate callback after this Completable
+     * Returns a {@code Completable} instance that calls the given {@code onAfterTerminate}  {@link Action} after this {@code Completable}
      * completes normally or with an exception.
      * <p>
      * <img width="640" height="304" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doAfterTerminate.png" alt="">
@@ -1643,8 +1674,8 @@ public final Completable doOnTerminate(@NonNull Action onTerminate) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterTerminate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onAfterTerminate the callback to call after this Completable terminates
-     * @return the new Completable instance
+     * @param onAfterTerminate the {@code Action} to call after this {@code Completable} terminates
+     * @return the new {@code Completable} instance
      * @see #doFinally(Action)
      */
     @CheckReturnValue
@@ -1660,7 +1691,7 @@ public final Completable doAfterTerminate(@NonNull Action onAfterTerminate) {
                 Functions.EMPTY_ACTION);
     }
     /**
-     * Calls the specified action after this Completable signals onError or onComplete or gets disposed by
+     * Calls the specified {@link Action} after this {@code Completable} signals {@code onError} or {@code onComplete} or gets disposed by
      * the downstream.
      * <p>
      * <img width="640" height="331" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doFinally.png" alt="">
@@ -1675,8 +1706,9 @@ public final Completable doAfterTerminate(@NonNull Action onAfterTerminate) {
      *  <dd>{@code doFinally} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.1 - experimental
-     * @param onFinally the action called when this Completable terminates or gets disposed
-     * @return the new Completable instance
+     * @param onFinally the {@code Action} called when this {@code Completable} terminates or gets disposed
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onFinally} is {@code null}
      * @since 2.1
      */
     @CheckReturnValue
@@ -1798,22 +1830,23 @@ public final Completable doFinally(@NonNull Action onFinally) {
      * class and creating a {@link CompletableTransformer} with it is recommended.
      * <p>
      * Note also that it is not possible to stop the subscription phase in {@code lift()} as the {@code apply()} method
-     * requires a non-null {@code CompletableObserver} instance to be returned, which is then unconditionally subscribed to
+     * requires a non-{@code null} {@code CompletableObserver} instance to be returned, which is then unconditionally subscribed to
      * the upstream {@code Completable}. For example, if the operator decided there is no reason to subscribe to the
      * upstream source because of some optimization possibility or a failure to prepare the operator, it still has to
-     * return a {@code CompletableObserver} that should immediately dispose the upstream's {@code Disposable} in its
+     * return a {@code CompletableObserver} that should immediately dispose the upstream's {@link Disposable} in its
      * {@code onSubscribe} method. Again, using a {@code CompletableTransformer} and extending the {@code Completable} is
      * a better option as {@link #subscribeActual} can decide to not subscribe to its upstream after all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lift} does not operate by default on a particular {@link Scheduler}, however, the
-     *  {@link CompletableOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
+     *  {@code CompletableOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
      * </dl>
      *
-     * @param onLift the {@link CompletableOperator} that receives the downstream's {@code CompletableObserver} and should return
+     * @param onLift the {@code CompletableOperator} that receives the downstream's {@code CompletableObserver} and should return
      *               a {@code CompletableObserver} with custom behavior to be used as the consumer for the current
      *               {@code Completable}.
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onLift} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Writing-operators-for-2.0">RxJava wiki: Writing operators</a>
      * @see #compose(CompletableTransformer)
      */
@@ -1826,7 +1859,7 @@ public final Completable lift(@NonNull CompletableOperator onLift) {
     }
 
     /**
-     * Maps the signal types of this Completable into a {@link Notification} of the same kind
+     * Maps the signal types of this {@code Completable} into a {@link Notification} of the same kind
      * and emits it as a single success value to downstream.
      * <p>
      * <img width="640" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
@@ -1835,8 +1868,8 @@ public final Completable lift(@NonNull CompletableOperator onLift) {
      * <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.2.4 - experimental
-     * @param <T> the intended target element type of the notification
-     * @return the new Single instance
+     * @param <T> the intended target element type of the {@code Notification}
+     * @return the new {@link Single} instance
      * @since 3.0.0
      * @see Single#dematerialize(Function)
      */
@@ -1848,7 +1881,7 @@ public final <T> Single<Notification<T>> materialize() {
     }
 
     /**
-     * Returns a Completable which subscribes to this and the other Completable and completes
+     * Returns a {@code Completable} which subscribes to this and the other {@link CompletableSource} and completes
      * when both of them complete or one emits an error.
      * <p>
      * <img width="640" height="442" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.mergeWith.png" alt="">
@@ -1856,9 +1889,9 @@ public final <T> Single<Notification<T>> materialize() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param other the other Completable instance
-     * @return the new Completable instance
-     * @throws NullPointerException if other is null
+     * @param other the other {@code CompletableSource} instance
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1869,16 +1902,16 @@ public final Completable mergeWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a Completable which emits the terminal events from the thread of the specified scheduler.
+     * Returns a {@code Completable} which emits the terminal events from the thread of the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="523" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.observeOn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code observeOn} operates on a {@link Scheduler} you specify.</dd>
+     *  <dd>{@code observeOn} operates on a {@code Scheduler} you specify.</dd>
      * </dl>
-     * @param scheduler the scheduler to emit terminal events on
-     * @return the new Completable instance
-     * @throws NullPointerException if scheduler is null
+     * @param scheduler the {@code Scheduler} to emit terminal events on
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1889,15 +1922,15 @@ public final Completable observeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a Completable instance that if this Completable emits an error, it will emit an onComplete
-     * and swallow the throwable.
+     * Returns a {@code Completable} instance that if this {@code Completable} emits an error, it will emit an {@code onComplete}
+     * and swallow the upstream {@link Throwable}.
      * <p>
      * <img width="640" height="585" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.onErrorComplete.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1907,17 +1940,18 @@ public final Completable onErrorComplete() {
     }
 
     /**
-     * Returns a Completable instance that if this Completable emits an error and the predicate returns
-     * true, it will emit an onComplete and swallow the throwable.
+     * Returns a {@code Completable} instance that if this {@code Completable} emits an error and the {@link Predicate} returns
+     * {@code true}, it will emit an {@code onComplete} and swallow the {@link Throwable}.
      * <p>
      * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.onErrorComplete.f.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param predicate the predicate to call when an Throwable is emitted which should return true
-     * if the Throwable should be swallowed and replaced with an onComplete.
-     * @return the new Completable instance
+     * @param predicate the {@code Predicate} to call when a {@code Throwable} is emitted which should return {@code true}
+     * if the {@code Throwable} should be swallowed and replaced with an {@code onComplete}.
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1929,8 +1963,8 @@ public final Completable onErrorComplete(@NonNull Predicate<? super Throwable> p
     }
 
     /**
-     * Returns a Completable instance that when encounters an error from this Completable, calls the
-     * specified mapper function that returns another Completable instance for it and resumes the
+     * Returns a {@code Completable} instance that when encounters an error from this {@code Completable}, calls the
+     * specified {@code mapper} {@link Function} that returns a {@link CompletableSource} instance for it and resumes the
      * execution with it.
      * <p>
      * <img width="640" height="426" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.onErrorResumeNext.png" alt="">
@@ -1938,9 +1972,10 @@ public final Completable onErrorComplete(@NonNull Predicate<? super Throwable> p
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param errorMapper the mapper function that takes the error and should return a Completable as
+     * @param errorMapper the {@code mapper} {@code Function} that takes the error and should return a {@code CompletableSource} as
      * continuation.
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code errorMapper} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1951,8 +1986,8 @@ public final Completable onErrorResumeNext(@NonNull Function<? super Throwable,
     }
 
     /**
-     * Nulls out references to the upstream producer and downstream CompletableObserver if
-     * the sequence is terminated or downstream calls dispose().
+     * Nulls out references to the upstream producer and downstream {@link CompletableObserver} if
+     * the sequence is terminated or downstream calls {@code dispose()}.
      * <p>
      * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.onTerminateDetach.png" alt="">
      * <dl>
@@ -1960,8 +1995,8 @@ public final Completable onErrorResumeNext(@NonNull Function<? super Throwable,
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.5 - experimental
-     * @return a Completable which nulls out references to the upstream producer and downstream CompletableObserver if
-     * the sequence is terminated or downstream calls dispose()
+     * @return a {@code Completable} which {@code null}s out references to the upstream producer and downstream {@code CompletableObserver} if
+     * the sequence is terminated or downstream calls {@code dispose()}
      * @since 2.2
      */
     @CheckReturnValue
@@ -1972,14 +2007,14 @@ public final Completable onTerminateDetach() {
     }
 
     /**
-     * Returns a Completable that repeatedly subscribes to this Completable until disposed.
+     * Returns a {@code Completable} that repeatedly subscribes to this {@code Completable} until disposed.
      * <p>
      * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.repeat.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1989,15 +2024,15 @@ public final Completable repeat() {
     }
 
     /**
-     * Returns a Completable that subscribes repeatedly at most the given times to this Completable.
+     * Returns a {@code Completable} that subscribes repeatedly at most the given number of times to this {@code Completable}.
      * <p>
      * <img width="640" height="408" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.repeat.n.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param times the number of times the resubscription should happen
-     * @return the new Completable instance
+     * @param times the number of times the re-subscription should happen
+     * @return the new {@code Completable} instance
      * @throws IllegalArgumentException if times is less than zero
      */
     @CheckReturnValue
@@ -2008,17 +2043,17 @@ public final Completable repeat(long times) {
     }
 
     /**
-     * Returns a Completable that repeatedly subscribes to this Completable so long as the given
-     * stop supplier returns false.
+     * Returns a {@code Completable} that repeatedly subscribes to this {@code Completable} so long as the given
+     * stop {@link BooleanSupplier} returns {@code false}.
      * <p>
      * <img width="640" height="381" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.repeatUntil.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeatUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param stop the supplier that should return true to stop resubscribing.
-     * @return the new Completable instance
-     * @throws NullPointerException if stop is null
+     * @param stop the {@code BooleanSupplier} that should return {@code true} to stop resubscribing.
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code stop} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2028,19 +2063,19 @@ public final Completable repeatUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns a Completable instance that repeats when the Publisher returned by the handler
-     * emits an item or completes when this Publisher emits a completed event.
+     * Returns a {@code Completable} instance that repeats when the {@link Publisher} returned by the handler {@link Function}
+     * emits an item or completes when this {@code Publisher} emits an {@code onComplete} event.
      * <p>
      * <img width="640" height="586" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.repeatWhen.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeatWhen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param handler the function that transforms the stream of values indicating the completion of
-     * this Completable and returns a Publisher that emits items for repeating or completes to indicate the
+     * @param handler the {@code Function} that transforms the stream of values indicating the completion of
+     * this {@code Completable} and returns a {@code Publisher} that emits items for repeating or completes to indicate the
      * repetition should stop
-     * @return the new Completable instance
-     * @throws NullPointerException if stop is null
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code stop} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2050,14 +2085,14 @@ public final Completable repeatWhen(@NonNull Function<? super Flowable<Object>,
     }
 
     /**
-     * Returns a Completable that retries this Completable as long as it emits an onError event.
+     * Returns a {@code Completable} that retries this {@code Completable} as long as it emits an {@code onError} event.
      * <p>
      * <img width="640" height="368" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.retry.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2067,17 +2102,18 @@ public final Completable retry() {
     }
 
     /**
-     * Returns a Completable that retries this Completable in case of an error as long as the predicate
-     * returns true.
+     * Returns a {@code Completable} that retries this {@code Completable} in case of an error as long as the {@code predicate}
+     * returns {@code true}.
      * <p>
      * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.retry.ff.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param predicate the predicate called when this emits an error with the repeat count and the latest exception
-     * and should return true to retry.
-     * @return the new Completable instance
+     * @param predicate the {@link Predicate} called when this {@code Completable} emits an error with the repeat count and the latest {@link Throwable}
+     * and should return {@code true} to retry.
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2087,7 +2123,7 @@ public final Completable retry(@NonNull BiPredicate<? super Integer, ? super Thr
     }
 
     /**
-     * Returns a Completable that when this Completable emits an error, retries at most the given
+     * Returns a {@code Completable} that when this {@code Completable} emits an error, retries at most the given
      * number of times before giving up and emitting the last error.
      * <p>
      * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.retry.n.png" alt="">
@@ -2095,9 +2131,9 @@ public final Completable retry(@NonNull BiPredicate<? super Integer, ? super Thr
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param times the number of times to resubscribe if the current Completable fails
-     * @return the new Completable instance
-     * @throws IllegalArgumentException if times is negative
+     * @param times the number of times to resubscribe if the current {@code Completable} fails
+     * @return the new {@code Completable} instance
+     * @throws IllegalArgumentException if {@code times} is negative
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2107,8 +2143,8 @@ public final Completable retry(long times) {
     }
 
     /**
-     * Returns a Completable that when this Completable emits an error, retries at most times
-     * or until the predicate returns false, whichever happens first and emitting the last error.
+     * Returns a {@code Completable} that when this {@code Completable} emits an error, retries at most times
+     * or until the predicate returns {@code false}, whichever happens first and emitting the last error.
      * <p>
      * <img width="640" height="361" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.retry.nf.png" alt="">
      * <dl>
@@ -2116,12 +2152,12 @@ public final Completable retry(long times) {
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.8 - experimental
-     * @param times the number of times to resubscribe if the current Completable fails
-     * @param predicate the predicate that is called with the latest throwable and should return
-     * true to indicate the returned Completable should resubscribe to this Completable.
-     * @return the new Completable instance
-     * @throws NullPointerException if predicate is null
-     * @throws IllegalArgumentException if times is negative
+     * @param times the number of times to resubscribe if the current {@code Completable} fails
+     * @param predicate the {@link Predicate} that is called with the latest {@link Throwable} and should return
+     * {@code true} to indicate the returned {@code Completable} should resubscribe to this {@code Completable}.
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
+     * @throws IllegalArgumentException if {@code times} is negative
      * @since 2.2
      */
     @CheckReturnValue
@@ -2132,18 +2168,18 @@ public final Completable retry(long times, @NonNull Predicate<? super Throwable>
     }
 
     /**
-     * Returns a Completable that when this Completable emits an error, calls the given predicate with
-     * the latest exception to decide whether to resubscribe to this or not.
+     * Returns a {@code Completable} that when this {@code Completable} emits an error, calls the given predicate with
+     * the latest {@link Throwable} to decide whether to resubscribe to the upstream or not.
      * <p>
      * <img width="640" height="336" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.retry.f.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param predicate the predicate that is called with the latest throwable and should return
-     * true to indicate the returned Completable should resubscribe to this Completable.
-     * @return the new Completable instance
-     * @throws NullPointerException if predicate is null
+     * @param predicate the {@link Predicate} that is called with the latest {@code Throwable} and should return
+     * {@code true} to indicate the returned {@code Completable} should resubscribe to this {@code Completable}.
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2153,16 +2189,16 @@ public final Completable retry(@NonNull Predicate<? super Throwable> predicate)
     }
 
     /**
-     * Returns a Completable which given a Publisher and when this Completable emits an error, delivers
-     * that error through a Flowable and the Publisher should signal a value indicating a retry in response
+     * Returns a {@code Completable} which given a {@link Publisher} and when this {@code Completable} emits an error, delivers
+     * that error through a {@link Flowable} and the {@code Publisher} should signal a value indicating a retry in response
      * or a terminal event indicating a termination.
      * <p>
      * <img width="640" height="586" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.retryWhen.png" alt="">
      * <p>
      * Note that the inner {@code Publisher} returned by the handler function should signal
      * either {@code onNext}, {@code onError} or {@code onComplete} in response to the received
-     * {@code Throwable} to indicate the operator should retry or terminate. If the upstream to
-     * the operator is asynchronous, signalling onNext followed by onComplete immediately may
+     * {@link Throwable} to indicate the operator should retry or terminate. If the upstream to
+     * the operator is asynchronous, signaling {@code onNext} followed by {@code onComplete} immediately may
      * result in the sequence to be completed immediately. Similarly, if this inner
      * {@code Publisher} signals {@code onError} or {@code onComplete} while the upstream is
      * active, the sequence is terminated with the same signal immediately.
@@ -2187,10 +2223,10 @@ public final Completable retry(@NonNull Predicate<? super Throwable> predicate)
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retryWhen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param handler the handler that receives a Flowable delivering Throwables and should return a Publisher that
+     * @param handler the {@link Function} that receives a {@code Flowable} delivering {@code Throwable}s and should return a {@code Publisher} that
      * emits items to indicate retries or emits terminal events to indicate termination.
-     * @return the new Completable instance
-     * @throws NullPointerException if handler is null
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code handler} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2200,17 +2236,17 @@ public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>
     }
 
     /**
-     * Returns a Completable which first runs the other Completable
-     * then this completable if the other completed normally.
+     * Returns a {@code Completable} which first runs the other {@link CompletableSource}
+     * then this {@code Completable} if the other completed normally.
      * <p>
      * <img width="640" height="437" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.startWith.c.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param other the other completable to run first
-     * @return the new Completable instance
-     * @throws NullPointerException if other is null
+     * @param other the other {@code CompletableSource} to run first
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2221,8 +2257,8 @@ public final Completable startWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns an Observable which first delivers the events
-     * of the other Observable then runs this CompletableConsumable.
+     * Returns an {@link Observable} which first delivers the events
+     * of the other {@link ObservableSource} then runs this {@code Completable}.
      * <p>
      * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.startWith.o.png" alt="">
      * <dl>
@@ -2230,9 +2266,9 @@ public final Completable startWith(@NonNull CompletableSource other) {
      *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param other the other Observable to run first
-     * @return the new Observable instance
-     * @throws NullPointerException if other is null
+     * @param other the other {@code ObservableSource} to run first
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2242,8 +2278,8 @@ public final <T> Observable<T> startWith(@NonNull ObservableSource<T> other) {
         return Observable.wrap(other).concatWith(this.toObservable());
     }
     /**
-     * Returns a Flowable which first delivers the events
-     * of the other Publisher then runs this Completable.
+     * Returns a {@link Flowable} which first delivers the events
+     * of the other {@link Publisher} then runs this {@code Completable}.
      * <p>
      * <img width="640" height="250" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.startWith.p.png" alt="">
      * <dl>
@@ -2254,9 +2290,9 @@ public final <T> Observable<T> startWith(@NonNull ObservableSource<T> other) {
      *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param other the other Publisher to run first
-     * @return the new Flowable instance
-     * @throws NullPointerException if other is null
+     * @param other the other {@code Publisher} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2268,7 +2304,7 @@ public final <T> Flowable<T> startWith(@NonNull Publisher<T> other) {
     }
 
     /**
-     * Hides the identity of this Completable and its Disposable.
+     * Hides the identity of this {@code Completable} and its {@link Disposable}.
      * <p>
      * <img width="640" height="432" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.hide.png" alt="">
      * <p>
@@ -2278,7 +2314,7 @@ public final <T> Flowable<T> startWith(@NonNull Publisher<T> other) {
      *  <dd>{@code hide} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.5 - experimental
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
      * @since 2.1
      */
     @CheckReturnValue
@@ -2289,7 +2325,7 @@ public final Completable hide() {
     }
 
     /**
-     * Subscribes to this CompletableConsumable and returns a Disposable which can be used to dispose
+     * Subscribes to this {@code Completable} and returns a {@link Disposable} which can be used to dispose
      * the subscription.
      * <p>
      * <img width="640" height="352" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.subscribe.png" alt="">
@@ -2297,7 +2333,7 @@ public final Completable hide() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the Disposable that allows disposing the subscription
+     * @return the {@code Disposable} that allows disposing the subscription
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
@@ -2333,13 +2369,13 @@ public final void subscribe(@NonNull CompletableObserver observer) {
      * <p>There is no need to call any of the plugin hooks on the current {@code Completable} instance or
      * the {@code CompletableObserver}; all hooks and basic safeguards have been
      * applied by {@link #subscribe(CompletableObserver)} before this method gets called.
-     * @param observer the CompletableObserver instance, never null
+     * @param observer the {@code CompletableObserver} instance, never {@code null}
      */
     protected abstract void subscribeActual(@NonNull CompletableObserver observer);
 
     /**
-     * Subscribes a given CompletableObserver (subclass) to this Completable and returns the given
-     * CompletableObserver as is.
+     * Subscribes a given {@link CompletableObserver} (subclass) to this {@code Completable} and returns the given
+     * {@code CompletableObserver} as is.
      * <p>
      * <img width="640" height="349" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.subscribeWith.png" alt="">
      * <p>Usage example:
@@ -2357,10 +2393,10 @@ public final void subscribe(@NonNull CompletableObserver observer) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <E> the type of the CompletableObserver to use and return
-     * @param observer the CompletableObserver (subclass) to use and return, not null
+     * @param <E> the type of the {@code CompletableObserver} to use and return
+     * @param observer the {@code CompletableObserver} (subclass) to use and return, not {@code null}
      * @return the input {@code observer}
-     * @throws NullPointerException if {@code observer} is null
+     * @throws NullPointerException if {@code observer} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2372,17 +2408,17 @@ public final void subscribe(@NonNull CompletableObserver observer) {
     }
 
     /**
-     * Subscribes to this Completable and calls back either the onError or onComplete functions.
+     * Subscribes to this {@code Completable} and calls back either the {@code onError} or {@code onComplete} functions.
      * <p>
      * <img width="640" height="352" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.subscribe.ff.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onComplete the runnable that is called if the Completable completes normally
-     * @param onError the consumer that is called if this Completable emits an error
-     * @return the Disposable that can be used for disposing the subscription asynchronously
-     * @throws NullPointerException if either callback is null
+     * @param onComplete the {@link Action} that is called if the {@code Completable} completes normally
+     * @param onError the {@link Consumer} that is called if this {@code Completable} emits an error
+     * @return the {@link Disposable} that can be used for disposing the subscription asynchronously
+     * @throws NullPointerException if {@code onComplete} or {@code onError} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2397,20 +2433,21 @@ public final Disposable subscribe(@NonNull Action onComplete, @NonNull Consumer<
     }
 
     /**
-     * Subscribes to this Completable and calls the given Action when this Completable
+     * Subscribes to this {@code Completable} and calls the given {@link Action} when this {@code Completable}
      * completes normally.
      * <p>
      * <img width="640" height="352" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.subscribe.f.png" alt="">
      * <p>
-     * If the Completable emits an error, it is wrapped into an
-     * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * If the {@code Completable} emits an error, it is wrapped into an
+     * {@link OnErrorNotImplementedException}
+     * and routed to the global {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onComplete the runnable called when this Completable completes normally
-     * @return the Disposable that allows disposing the subscription
+     * @param onComplete the {@code Action} called when this {@code Completable} completes normally
+     * @return the {@link Disposable} that allows disposing the subscription
+     * @throws NullPointerException if {@code onComplete} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2424,17 +2461,17 @@ public final Disposable subscribe(@NonNull Action onComplete) {
     }
 
     /**
-     * Returns a Completable which subscribes the child subscriber on the specified scheduler, making
-     * sure the subscription side-effects happen on that specific thread of the scheduler.
+     * Returns a {@code Completable} which subscribes the downstream subscriber on the specified scheduler, making
+     * sure the subscription side-effects happen on that specific thread of the {@link Scheduler}.
      * <p>
      * <img width="640" height="686" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.subscribeOn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code subscribeOn} operates on a {@link Scheduler} you specify.</dd>
+     *  <dd>{@code subscribeOn} operates on a {@code Scheduler} you specify.</dd>
      * </dl>
-     * @param scheduler the Scheduler to subscribe on
-     * @return the new Completable instance
-     * @throws NullPointerException if scheduler is null
+     * @param scheduler the {@code Scheduler} to subscribe on
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2460,7 +2497,8 @@ public final Completable subscribeOn(@NonNull Scheduler scheduler) {
      * </dl>
      * <p>History: 2.1.17 - experimental
      * @param other the other completable source to observe for the terminal signals
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -2473,18 +2511,18 @@ public final Completable takeUntil(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a Completable that runs this Completable and emits a TimeoutException in case
-     * this Completable doesn't complete within the given time.
+     * Returns a {@code Completabl}e that runs this {@code Completable} and emits a {@link TimeoutException} in case
+     * this {@code Completable} doesn't complete within the given time.
      * <p>
      * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.timeout.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code timeout} signals the TimeoutException on the {@code computation} {@link Scheduler}.</dd>
+     *  <dd>{@code timeout} signals the {@code TimeoutException} on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      * @param timeout the timeout value
-     * @param unit the timeout unit
-     * @return the new Completable instance
-     * @throws NullPointerException if unit is null
+     * @param unit the unit of {@code timeout}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
@@ -2494,20 +2532,20 @@ public final Completable timeout(long timeout, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Completable that runs this Completable and switches to the other Completable
-     * in case this Completable doesn't complete within the given time.
+     * Returns a {@code Completable} that runs this {@code Completable} and switches to the other {@link CompletableSource}
+     * in case this {@code Completable} doesn't complete within the given time.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.timeout.c.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code timeout} subscribes to the other CompletableSource on
+     *  <dd>{@code timeout} subscribes to the other {@code CompletableSource} on
      *  the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      * @param timeout the timeout value
-     * @param unit the timeout unit
-     * @param other the other Completable instance to switch to in case of a timeout
-     * @return the new Completable instance
-     * @throws NullPointerException if unit or other is null
+     * @param unit the unit of {@code timeout}
+     * @param other the other {@code CompletableSource} instance to switch to in case of a timeout
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit} or {@code other} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2518,20 +2556,20 @@ public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns a Completable that runs this Completable and emits a TimeoutException in case
-     * this Completable doesn't complete within the given time while "waiting" on the specified
-     * Scheduler.
+     * Returns a {@code Completable} that runs this {@code Completable} and emits a {@link TimeoutException} in case
+     * this {@code Completable} doesn't complete within the given time while "waiting" on the specified
+     * {@link Scheduler}.
      * <p>
      * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.timeout.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code timeout} signals the TimeoutException on the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code timeout} signals the {@code TimeoutException} on the {@code Scheduler} you specify.</dd>
      * </dl>
      * @param timeout the timeout value
-     * @param unit the timeout unit
-     * @param scheduler the scheduler to use to wait for completion
-     * @return the new Completable instance
-     * @throws NullPointerException if unit or scheduler is null
+     * @param unit the unit of {@code timeout}
+     * @param scheduler the {@code Scheduler} to use to wait for completion and signal {@code TimeoutException}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
@@ -2541,22 +2579,22 @@ public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns a Completable that runs this Completable and switches to the other Completable
-     * in case this Completable doesn't complete within the given time while "waiting" on
-     * the specified scheduler.
+     * Returns a {@code Completable} that runs this {@code Completable} and switches to the other {@link CompletableSource}
+     * in case this {@code Completable} doesn't complete within the given time while "waiting" on
+     * the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.timeout.sc.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code timeout} subscribes to the other CompletableSource on
-     *  the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code timeout} subscribes to the other {@code CompletableSource} on
+     *  the {@code Scheduler} you specify.</dd>
      * </dl>
      * @param timeout the timeout value
-     * @param unit the timeout unit
-     * @param scheduler the scheduler to use to wait for completion
-     * @param other the other Completable instance to switch to in case of a timeout
-     * @return the new Completable instance
-     * @throws NullPointerException if unit, scheduler or other is null
+     * @param unit the unit of {@code timeout}
+     * @param scheduler the {@code Scheduler} to use to wait for completion
+     * @param other the other {@code Completable} instance to switch to in case of a timeout
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2567,20 +2605,20 @@ public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns a Completable that runs this Completable and optionally switches to the other Completable
-     * in case this Completable doesn't complete within the given time while "waiting" on
-     * the specified scheduler.
+     * Returns a {@code Completable} that runs this {@code Completable} and optionally switches to the other {@link CompletableSource}
+     * in case this {@code Completable} doesn't complete within the given time while "waiting" on
+     * the specified {@link Scheduler}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify the {@link Scheduler} this operator runs on.</dd>
+     *  <dd>You specify the {@code Scheduler} this operator runs on.</dd>
      * </dl>
      * @param timeout the timeout value
-     * @param unit the timeout unit
-     * @param scheduler the scheduler to use to wait for completion
-     * @param other the other Completable instance to switch to in case of a timeout,
-     * if null a TimeoutException is emitted instead
-     * @return the new Completable instance
-     * @throws NullPointerException if unit or scheduler
+     * @param unit the unit of {@code timeout}
+     * @param scheduler the {@code Scheduler} to use to wait for completion
+     * @param other the other {@code Completable} instance to switch to in case of a timeout,
+     * if {@code null} a {@link TimeoutException} is emitted instead
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler}
      */
     @CheckReturnValue
     @NonNull
@@ -2592,7 +2630,7 @@ private Completable timeout0(long timeout, TimeUnit unit, Scheduler scheduler, C
     }
 
     /**
-     * Calls the specified converter function during assembly time and returns its resulting value.
+     * Calls the specified {@link CompletableConverter} function during assembly time and returns its resulting value.
      * <p>
      * <img width="640" height="751" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.to.png" alt="">
      * <p>
@@ -2603,9 +2641,9 @@ private Completable timeout0(long timeout, TimeUnit unit, Scheduler scheduler, C
      * </dl>
      * <p>History: 2.1.7 - experimental
      * @param <R> the resulting object type
-     * @param converter the function that receives the current Completable instance and returns a value
+     * @param converter the {@code CompletableConverter} that receives the current {@code Completable} instance and returns a value to be the result of {@code to()}
      * @return the converted value
-     * @throws NullPointerException if converter is null
+     * @throws NullPointerException if {@code converter} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -2615,8 +2653,8 @@ public final <R> R to(@NonNull CompletableConverter<? extends R> converter) {
     }
 
     /**
-     * Returns a Flowable which when subscribed to subscribes to this Completable and
-     * relays the terminal events to the subscriber.
+     * Returns a {@link Flowable} which when subscribed to subscribes to this {@code Completable} and
+     * relays the terminal events to the downstream {@link Subscriber}.
      * <p>
      * <img width="640" height="585" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.toFlowable.png" alt="">
      * <dl>
@@ -2626,7 +2664,7 @@ public final <R> R to(@NonNull CompletableConverter<? extends R> converter) {
      *  <dd>{@code toFlowable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @SuppressWarnings("unchecked")
@@ -2641,7 +2679,7 @@ public final <T> Flowable<T> toFlowable() {
     }
 
     /**
-     * Converts this Completable into a {@link Maybe}.
+     * Converts this {@code Completable} into a {@link Maybe}.
      * <p>
      * <img width="640" height="585" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.toMaybe.png" alt="">
      * <dl>
@@ -2650,8 +2688,8 @@ public final <T> Flowable<T> toFlowable() {
      * </dl>
      *
      * @param <T> the value type
-     * @return a {@link Maybe} that only calls {@code onComplete} or {@code onError}, based on which one is
-     *         called by the source Completable.
+     * @return a {@code Maybe} that only calls {@code onComplete} or {@code onError}, based on which one is
+     *         called by the source {@code Completable}.
      */
     @CheckReturnValue
     @SuppressWarnings("unchecked")
@@ -2665,8 +2703,8 @@ public final <T> Maybe<T> toMaybe() {
     }
 
     /**
-     * Returns an Observable which when subscribed to subscribes to this Completable and
-     * relays the terminal events to the subscriber.
+     * Returns an {@link Observable} which when subscribed to subscribes to this {@code Completable} and
+     * relays the terminal events to the downstream {@link Observer}.
      * <p>
      * <img width="640" height="293" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.toObservable.png" alt="">
      * <dl>
@@ -2674,7 +2712,7 @@ public final <T> Maybe<T> toMaybe() {
      *  <dd>{@code toObservable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @return the new Observable created
+     * @return the new {@code Observable} created
      */
     @CheckReturnValue
     @SuppressWarnings("unchecked")
@@ -2688,8 +2726,8 @@ public final <T> Observable<T> toObservable() {
     }
 
     /**
-     * Converts this Completable into a Single which when this Completable completes normally,
-     * calls the given supplier and emits its returned value through onSuccess.
+     * Converts this {@code Completable} into a {@link Single} which when this {@code Completable} completes normally,
+     * calls the given {@link Supplier} and emits its returned value through {@code onSuccess}.
      * <p>
      * <img width="640" height="583" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.toSingle.png" alt="">
      * <dl>
@@ -2697,9 +2735,9 @@ public final <T> Observable<T> toObservable() {
      *  <dd>{@code toSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param completionValueSupplier the value supplier called when this Completable completes normally
-     * @return the new Single instance
-     * @throws NullPointerException if completionValueSupplier is null
+     * @param completionValueSupplier the value supplier called when this {@code Completable} completes normally
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code completionValueSupplier} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2710,8 +2748,8 @@ public final <T> Observable<T> toObservable() {
     }
 
     /**
-     * Converts this Completable into a Single which when this Completable completes normally,
-     * emits the given value through onSuccess.
+     * Converts this {@code Completable} into a {@link Single} which when this {@code Completable} completes normally,
+     * emits the given value through {@code onSuccess}.
      * <p>
      * <img width="640" height="583" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.toSingleDefault.png" alt="">
      * <dl>
@@ -2719,9 +2757,9 @@ public final <T> Observable<T> toObservable() {
      *  <dd>{@code toSingleDefault} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param completionValue the value to emit when this Completable completes normally
-     * @return the new Single instance
-     * @throws NullPointerException if completionValue is null
+     * @param completionValue the value to emit when this {@code Completable} completes normally
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code completionValue} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2732,17 +2770,17 @@ public final <T> Observable<T> toObservable() {
     }
 
     /**
-     * Returns a Completable which makes sure when a subscriber disposes the subscription, the
-     * dispose is called on the specified scheduler.
+     * Returns a {@code Completable} which makes sure when an observer disposes the subscription, the
+     * {@code dispose()} method is called on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="716" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.unsubscribeOn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code unsubscribeOn} calls dispose() of the upstream on the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code unsubscribeOn} calls {@code dispose()} of the upstream on the {@code Scheduler} you specify.</dd>
      * </dl>
-     * @param scheduler the target scheduler where to execute the disposing
-     * @return the new Completable instance
-     * @throws NullPointerException if scheduler is null
+     * @param scheduler the target {@code Scheduler} where to execute the disposing
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2756,15 +2794,15 @@ public final Completable unsubscribeOn(@NonNull Scheduler scheduler) {
     // -------------------------------------------------------------------------
 
     /**
-     * Creates a TestObserver and subscribes
-     * it to this Completable.
+     * Creates a {@link TestObserver} and subscribes
+     * it to this {@code Completable}.
      * <p>
      * <img width="640" height="458" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.test.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new TestObserver instance
+     * @return the new {@code TestObserver} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -2777,16 +2815,16 @@ public final TestObserver<Void> test() {
     }
 
     /**
-     * Creates a TestObserver optionally in cancelled state, then subscribes it to this Completable.
-     * @param dispose if true, the TestObserver will be cancelled before subscribing to this
-     * Completable.
+     * Creates a {@link TestObserver} optionally in cancelled state, then subscribes it to this {@code Completable}.
+     * @param dispose if {@code true}, the {@code TestObserver} will be cancelled before subscribing to this
+     * {@code Completable}.
      * <p>
      * <img width="640" height="499" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.test.b.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new TestObserver instance
+     * @return the new {@code TestObserver} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -2824,8 +2862,10 @@ public final TestObserver<Void> test(boolean dispose) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param stage the CompletionStage to convert to Maybe and signal its terminal value or error
-     * @return the new Completable instance
+     * @param stage the {@code CompletionStage} to convert to a {@code Completable} and
+     *              signal {@code onComplete} or {@code onError} when the {@code CompletionStage} terminates normally or with a failure
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code stage} is {@code null}
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -2858,8 +2898,8 @@ public static Completable fromCompletionStage(@NonNull CompletionStage<?> stage)
      *  <dd>{@code toCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the type of the default item to signal upon completion
-     * @param defaultItem the item to signal if the upstream is empty
-     * @return the new CompletionStage instance
+     * @param defaultItem the item to signal upon completion
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 7c2558036e..b165eeb0aa 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -5261,7 +5261,7 @@ public final Iterable<T> blockingIterable() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Iterable<T> blockingIterable(int capacityHint) {
-        ObjectHelper.verifyPositive(capacityHint, "bufferSize");
+        ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         return new BlockingObservableIterable<>(this, capacityHint);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
index 0b77c28c84..d71a452cb1 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
@@ -41,6 +41,7 @@ public interface Disposable {
      * executed exactly once when the {@code Disposable} is disposed.
      * @param run the Runnable to wrap
      * @return the new Disposable instance
+     * @throws NullPointerException if {@code run} is {@code null}
      * @since 3.0.0
      */
     @NonNull
@@ -52,14 +53,15 @@ static Disposable fromRunnable(@NonNull Runnable run) {
     /**
      * Construct a {@code Disposable} by wrapping a {@link Action} that is
      * executed exactly once when the {@code Disposable} is disposed.
-     * @param run the Action to wrap
+     * @param action the Action to wrap
      * @return the new Disposable instance
+     * @throws NullPointerException if {@code action} is {@code null}
      * @since 3.0.0
      */
     @NonNull
-    static Disposable fromAction(@NonNull Action run) {
-        Objects.requireNonNull(run, "run is null");
-        return new ActionDisposable(run);
+    static Disposable fromAction(@NonNull Action action) {
+        Objects.requireNonNull(action, "action is null");
+        return new ActionDisposable(action);
     }
 
     /**
@@ -69,6 +71,7 @@ static Disposable fromAction(@NonNull Action run) {
      * The {@code Future} is cancelled with {@code mayInterruptIfRunning == true}.
      * @param future the Future to wrap
      * @return the new Disposable instance
+     * @throws NullPointerException if {@code future} is {@code null}
      * @see #fromFuture(Future, boolean)
      * @since 3.0.0
      */
@@ -84,6 +87,7 @@ static Disposable fromFuture(@NonNull Future<?> future) {
      * @param future the Future to wrap
      * @param allowInterrupt if true, the future cancel happens via {@code Future.cancel(true)}
      * @return the new Disposable instance
+     * @throws NullPointerException if {@code future} is {@code null}
      * @since 3.0.0
      */
     @NonNull
@@ -97,6 +101,7 @@ static Disposable fromFuture(@NonNull Future<?> future, boolean allowInterrupt)
      * cancelled exactly once when the {@code Disposable} is disposed.
      * @param subscription the Runnable to wrap
      * @return the new Disposable instance
+     * @throws NullPointerException if {@code subscription} is {@code null}
      * @since 3.0.0
      */
     @NonNull
@@ -110,6 +115,7 @@ static Disposable fromSubscription(@NonNull Subscription subscription) {
      * closed exactly once when the {@code Disposable} is disposed.
      * @param autoCloseable the AutoCloseable to wrap
      * @return the new Disposable instance
+     * @throws NullPointerException if {@code autoCloseable} is {@code null}
      * @since 3.0.0
      */
     @NonNull
@@ -123,10 +129,12 @@ static Disposable fromAutoCloseable(@NonNull AutoCloseable autoCloseable) {
      * disposed when the returned {@code AutoCloseable} is closed.
      * @param disposable the Disposable instance
      * @return the new AutoCloseable instance
+     * @throws NullPointerException if {@code disposable} is {@code null}
      * @since 3.0.0
      */
     @NonNull
     static AutoCloseable toAutoCloseable(@NonNull Disposable disposable) {
+        Objects.requireNonNull(disposable, "disposable is null");
         return disposable::dispose;
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
index 3c51f1c3bc..7f0cfd1100 100644
--- a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
@@ -249,6 +249,8 @@ public final Flowable<T> refCount(int subscriberCount, long timeout, @NonNull Ti
      * @param unit the time unit of the timeout
      * @param scheduler the target scheduler to wait on before disconnecting
      * @return the new Flowable instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code subscriberCount} is non-positive
      * @since 2.2
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
index 192743187e..19a083d727 100644
--- a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
@@ -224,6 +224,8 @@ public final Observable<T> refCount(int subscriberCount, long timeout, @NonNull
      * @param unit the time unit of the timeout
      * @param scheduler the target scheduler to wait on before disconnecting
      * @return the new Observable instance
+     * @throws IllegalArgumentException if {@code subscriberCount} is non-positive
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index ea93669ca3..0b7e49ae2f 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -204,6 +204,7 @@ public static <T> BehaviorProcessor<T> create() {
      *            the item that will be emitted first to any {@link Subscriber} as long as the
      *            {@link BehaviorProcessor} has not yet observed any items from its source {@code Observable}
      * @return the constructed {@link BehaviorProcessor}
+     * @throws NullPointerException if {@code defaultValue} is {@code null}
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index 8a20c9140d..7a6809b5d2 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -192,10 +192,12 @@ public static <T> MulticastProcessor<T> create(boolean refCount) {
      * @param bufferSize the prefetch amount
      * @param <T> the input and output value type
      * @return the new MulticastProcessor instance
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> MulticastProcessor<T> create(int bufferSize) {
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return new MulticastProcessor<>(bufferSize, false);
     }
 
@@ -207,10 +209,12 @@ public static <T> MulticastProcessor<T> create(int bufferSize) {
      * is cancelled
      * @param <T> the input and output value type
      * @return the new MulticastProcessor instance
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> MulticastProcessor<T> create(int bufferSize, boolean refCount) {
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return new MulticastProcessor<>(bufferSize, refCount);
     }
 
@@ -223,7 +227,6 @@ public static <T> MulticastProcessor<T> create(int bufferSize, boolean refCount)
      */
     @SuppressWarnings("unchecked")
     MulticastProcessor(int bufferSize, boolean refCount) {
-        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         this.bufferSize = bufferSize;
         this.limit = bufferSize - (bufferSize >> 2);
         this.wip = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
index c748826c6a..93f8cbffc0 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
@@ -35,6 +35,11 @@ public void checkFlowable() throws Exception {
         checkSource("Flowable");
     }
 
+    @Test
+    public void checkCompletable() throws Exception {
+        checkSource("Completable");
+    }
+
     static void checkSource(String baseClassName) throws Exception {
         File f = TestHelper.findSource(baseClassName);
         if (f == null) {
@@ -346,7 +351,7 @@ static void blankRange(StringBuilder builder, int start, int end) {
 
             "Exception", "Throwable", "NullPointerException", "IllegalStateException", "IllegalArgumentException", "MissingBackpressureException", "UndeliverableException",
             "OutOfMemoryError", "StackOverflowError", "NoSuchElementException", "ClassCastException", "CompositeException",
-            "RuntimeException", "Error", "TimeoutException",
+            "RuntimeException", "Error", "TimeoutException", "OnErrorNotImplementedException",
 
             "false", "true", "onNext", "onError", "onComplete", "onSuccess", "onSubscribe", "null",
 
@@ -354,7 +359,7 @@ static void blankRange(StringBuilder builder, int start, int end) {
 
             "Optional", "CompletionStage", "Collector", "Collectors", "Schedulers", "RxJavaPlugins", "CompletableFuture",
 
-            "Object", "Integer", "Long", "Boolean", "LongConsumer",
+            "Object", "Integer", "Long", "Boolean", "LongConsumer", "BooleanSupplier",
 
             "GroupedFlowable", "GroupedObservable", "UnicastSubject", "UnicastProcessor",
 
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index 46390523e1..e5746cc69b 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -317,65 +317,7 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                     }
                 }
 
-                if (m.signature.matches("(?s).*?\\sSingle\\<.*?\\>\\s+\\w+\\(.*")) {
-                    for (String at : AT_RETURN_WORDS) {
-                        int idx = m.javadoc.indexOf(at + "{@code Flowable");
-                        if (idx >= 0) {
-                            e.append("Returns Single but docs return Flowable\r\n at io.reactivex.rxjava3.core.")
-                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Maybe");
-                        if (idx >= 0) {
-                            e.append("Returns Single but docs return Maybe\r\n at io.reactivex.rxjava3.core.")
-                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Publisher");
-                        if (idx >= 0) {
-                            e.append("Returns Single but docs return Publisher\r\n at io.reactivex.rxjava3.core.")
-                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                    }
-                }
-
-                if (m.signature.matches("(?s).*?\\sMaybe\\<.*\\>\\s+\\w+\\(.*")) {
-                    for (String at : AT_RETURN_WORDS) {
-                        int idx = m.javadoc.indexOf(at + "{@code Flowable");
-                        if (idx >= 0) {
-                            e.append("Returns Maybe but docs return Flowable\r\n at io.reactivex.rxjava3.core.")
-                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Single");
-                        if (idx >= 0) {
-                            e.append("Returns Maybe but docs return Single\r\n at io.reactivex.rxjava3.core.")
-                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Publisher");
-                        if (idx >= 0) {
-                            e.append("Returns Maybe but docs return Publisher\r\n at io.reactivex.rxjava3.core.")
-                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                    }
-                }
-
-                if (m.signature.matches("(?s).*?\\sCompletable\\s+\\w+\\(.*")) {
-                    for (String at : AT_RETURN_WORDS) {
-                        int idx = m.javadoc.indexOf(at + "{@code Flowable");
-                        if (idx >= 0) {
-                            e.append("Returns Completable but docs return Flowable\r\n at io.reactivex.rxjava3.core.")
-                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Single");
-                        if (idx >= 0) {
-                            e.append("Returns Completable but docs return Single\r\n at io.reactivex.rxjava3.core.")
-                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Maybe");
-                        if (idx >= 0) {
-                            e.append("Returns Completable but docs return Maybe\r\n at io.reactivex.rxjava3.core.")
-                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                    }
-                }
+                checkAtReturnAndSignatureMatch("Flowable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable");
 
                 aOrAn(e, m, "Flowable");
                 missingClosingDD(e, m, "Flowable");
@@ -478,55 +420,7 @@ public void observableDocRefersToObservableTypes() throws Exception {
                         break;
                     }
                 }
-                if (m.signature.matches("(?s).*?\\sSingle\\<.*?\\>\\s+\\w+\\(.*")) {
-                    for (String at : AT_RETURN_WORDS) {
-                        int idx = m.javadoc.indexOf(at + "{@code Observable");
-                        if (idx >= 0) {
-                            e.append("Returns Single but docs return Observable\r\n at io.reactivex.rxjava3.core.")
-                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Maybe");
-                        if (idx >= 0) {
-                            e.append("Returns Single but docs return Maybe\r\n at io.reactivex.rxjava3.core.")
-                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                    }
-                }
-
-                if (m.signature.matches("(?s).*?\\sMaybe\\<.*?\\>\\s+\\w+\\(.*")) {
-                    for (String at : AT_RETURN_WORDS) {
-                        int idx = m.javadoc.indexOf(at + "{@code Observable");
-                        if (idx >= 0) {
-                            e.append("Returns Maybe but docs return Observable\r\n at io.reactivex.rxjava3.core.")
-                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Single");
-                        if (idx >= 0) {
-                            e.append("Returns Maybe but docs return Single\r\n at io.reactivex.rxjava3.core.")
-                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                    }
-                }
-
-                if (m.signature.matches("(?s).*?\\sCompletable\\s+\\w+\\(.*")) {
-                    for (String at : AT_RETURN_WORDS) {
-                        int idx = m.javadoc.indexOf(at + "{@code Observable");
-                        if (idx >= 0) {
-                            e.append("Returns Completable but docs return Observable\r\n at io.reactivex.rxjava3.core.")
-                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Single");
-                        if (idx >= 0) {
-                            e.append("Returns Completable but docs return Single\r\n at io.reactivex.rxjava3.core.")
-                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                        idx = m.javadoc.indexOf(at + "{@code Maybe");
-                        if (idx >= 0) {
-                            e.append("Returns Completable but docs return Maybe\r\n at io.reactivex.rxjava3.core.")
-                            .append("Observable.method(Observable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
-                        }
-                    }
-                }
+                checkAtReturnAndSignatureMatch("Observable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable");
 
                 aOrAn(e, m, "Observable");
                 missingClosingDD(e, m, "Observable");
@@ -890,6 +784,9 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                         break;
                     }
                 }
+
+                checkAtReturnAndSignatureMatch("Completable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable");
+
                 aOrAn(e, m, "Completable");
                 missingClosingDD(e, m, "Completable");
                 backpressureMentionedWithoutAnnotation(e, m, "Completable");
@@ -903,6 +800,38 @@ public void completableDocRefersToCompletableTypes() throws Exception {
         }
     }
 
+    static void checkAtReturnAndSignatureMatch(String className, RxMethod m, StringBuilder e, String... types) {
+        for (String t : types) {
+            String regex;
+            if (t.contains("Completable")) {
+                regex = "(?s).*?\\s" + t + "\\s+\\w+\\(.*";
+            } else {
+                regex = "(?s).*?\\s" + t + "\\<.*?\\>\\s+\\w+\\(.*";
+            }
+            if (m.signature.matches(regex)) {
+                for (String at : AT_RETURN_WORDS) {
+                    for (String u : types) {
+                        if (!t.equals(u)) {
+                            int idx = m.javadoc.indexOf(at + "{@code " + u);
+                            if (idx >= 0) {
+                                e.append("Returns ").append(t)
+                                .append(" but docs return ")
+                                .append(u)
+                                .append("\r\n at io.reactivex.rxjava3.core.")
+                                .append(className)
+                                .append(".method(")
+                                .append(className)
+                                .append(".java:")
+                                .append(m.javadocLine + lineNumber(m.javadoc, idx) - 1)
+                                .append(")\r\n\r\n");
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     static void aOrAn(StringBuilder e, RxMethod m, String baseTypeName) {
         aOrAn(e, m, " an", "Single", baseTypeName);
         aOrAn(e, m, " an", "Maybe", baseTypeName);
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
index 6e66d4249e..7ab384f5d3 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -188,35 +188,90 @@ static void processFile(Class<?> clazz) throws Exception {
         for (int j = 0; j < lines.size(); j++) {
             String line = lines.get(j).trim();
 
-            for (String validatorStr : VALIDATOR_STRINGS)
-            if (line.startsWith(validatorStr)) {
-
-                int comma = line.indexOf(',');
-
-                String paramName = line.substring(validatorStr.length(), comma);
-
-                int quote = line.indexOf('"', comma);
-
-                String message = line.substring(quote + 1, quote + 2 + paramName.length());
-
-                if (!line.contains("The RxJavaPlugins")
-                        && !(message.startsWith(paramName)
-                        && (message.endsWith(" ") || message.endsWith("\"")))) {
-                    errorCount++;
-                    errors.append("L")
-                    .append(j)
-                    .append(" : Wrong validator message parameter name\r\n    ")
-                    .append(line)
-                    .append("\r\n")
-                    .append("    ").append(paramName).append(" != ").append(message)
-                    .append("\r\n at ")
-                    .append(fullClassName)
-                    .append(".method(")
-                    .append(f.getName())
-                    .append(":")
-                    .append(j + 1)
-                    .append(")\r\n")
-                    ;
+            for (ValidatorStrings validatorStr : VALIDATOR_STRINGS) {
+                if (line.startsWith(validatorStr.code)) {
+
+                    int comma = line.indexOf(',');
+
+                    String paramName = line.substring(validatorStr.code.length(), comma);
+
+                    int quote = line.indexOf('"', comma);
+
+                    String message = line.substring(quote + 1, quote + 2 + paramName.length());
+
+                    if (!line.contains("The RxJavaPlugins")
+                            && !(message.startsWith(paramName)
+                            && (message.endsWith(" ") || message.endsWith("\"")))) {
+                        errorCount++;
+                        errors.append("L")
+                        .append(j)
+                        .append(" : Wrong validator message parameter name\r\n    ")
+                        .append(line)
+                        .append("\r\n")
+                        .append("    ").append(paramName).append(" != ").append(message)
+                        .append("\r\n at ")
+                        .append(fullClassName)
+                        .append(".method(")
+                        .append(f.getName())
+                        .append(":")
+                        .append(j + 1)
+                        .append(")\r\n")
+                        ;
+                    }
+
+                    // FIXME enable for other types in separate PR!
+                    if (!baseClassName.equals("Completable")) {
+                        continue;
+                    }
+                    // find JavaDoc of throws
+                    boolean found = false;
+                    for (int k = j - 1; k >= 0; k--) {
+                        String linek = lines.get(k).trim();
+                        if (linek.startsWith("/**")) {
+                            break;
+                        }
+                        if (linek.startsWith("}")) {
+                            found = true; // no JavaDoc
+                            break;
+                        }
+                        if (linek.startsWith(validatorStr.javadoc)) {
+                            // see if a @code paramName is present
+                            String paramStr = "{@code " + paramName + "}";
+                            for (int m = k; m < lines.size(); m++) {
+                                String linem = lines.get(m).trim();
+                                if (linem.startsWith("* @see")
+                                        || linem.startsWith("* @since")
+                                        || linem.startsWith("*/")) {
+                                    break;
+                                }
+                                if (linem.contains(paramStr)) {
+                                    found = true;
+                                    break;
+                                }
+                            }
+                            break;
+                        }
+                    }
+
+                    if (!found) {
+                        errorCount++;
+                        errors.append("L")
+                        .append(j)
+                        .append(" : missing '")
+                        .append(validatorStr.javadoc)
+                        .append("' for argument validation: ")
+                        .append(paramName)
+                        .append("\r\n    ")
+                        .append(line)
+                        .append("\r\n at ")
+                        .append(fullClassName)
+                        .append(".method(")
+                        .append(f.getName())
+                        .append(":")
+                        .append(j + 1)
+                        .append(")\r\n")
+                        ;
+                    }
                 }
             }
         }
@@ -228,8 +283,18 @@ static void processFile(Class<?> clazz) throws Exception {
         }
     }
 
-    static final List<String> VALIDATOR_STRINGS = Arrays.asList(
-            "Objects.requireNonNull(",
-            "ObjectHelper.requirePositive("
+    static final class ValidatorStrings {
+        final String code;
+        final String javadoc;
+        ValidatorStrings(String code, String javadoc) {
+            this.code = code;
+            this.javadoc = javadoc;
+        }
+    }
+
+    static final List<ValidatorStrings> VALIDATOR_STRINGS = Arrays.asList(
+            new ValidatorStrings("Objects.requireNonNull(", "* @throws NullPointerException"),
+            new ValidatorStrings("ObjectHelper.verifyPositive(", "* @throws IllegalArgumentException")
     );
+
 }

From e54ea2d4906b9bcf1c4932d0f5695e5bb62d1595 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Wed, 1 Jan 2020 14:58:18 +0100
Subject: [PATCH 034/665] Fix minor Javadoc mistakes

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java   | 8 ++++----
 src/main/java/io/reactivex/rxjava3/core/Observable.java | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index e38004b214..c61ea17163 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -4461,7 +4461,7 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull
 
     /**
      * Create a {@code Flowable} by wrapping a {@link Publisher} <em>which has to be implemented according
-     * to the <em>Reactive Streams</em> specification by handling backpressure and
+     * to the <b>Reactive Streams</b> specification by handling backpressure and
      * cancellation correctly; no safeguards are provided by the {@code Flowable} itself</em>.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -10967,7 +10967,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      *
      * // Emit 1000 items but ensure that the
      * // internal map never has more than 3 items in it
-     * {@code Flowable}
+     *   Flowable
      *   .range(1, 1000)
      *   // note that number of keys is 10
      *   .groupBy(x -&gt; x % 10, x -&gt; x, true, 16, evictingMapFactory)
@@ -16322,8 +16322,8 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      * Returns a {@code Flowable} that emits only the last item emitted by the source {@link Publisher} during sequential
      * time windows of a specified duration, where the duration is governed by a specified {@link Scheduler}.
      * <p>
-     * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
-     * {@link #throttleFirst} does not tick, it just tracks the passage of time.
+     * This differs from {@link #throttleFirst(long, TimeUnit, Scheduler)} in that this ticks along at a scheduled interval whereas
+     * {@code throttleFirst} does not tick, it just tracks the passage of time.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.s.png" alt="">
      * <dl>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index b165eeb0aa..7a8d808072 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -16342,6 +16342,7 @@ public final Stream<T> blockingStream() {
      *     stream.limit(3).forEach(System.out::println);
      * }
      * </code></pre>
+     * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingStream} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>

From 4c8d49bba90faa83bb799319c785446aa75a8705 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 6 Jan 2020 22:38:06 +0100
Subject: [PATCH 035/665] 3.x: Improve Javadocs of Single (#6812)

---
 .../io/reactivex/rxjava3/core/Single.java     | 1611 +++++++++--------
 .../validators/JavadocCodesAndLinks.java      |   25 +-
 .../validators/JavadocForAnnotations.java     |   39 +-
 .../validators/ParamValidationNaming.java     |   10 +-
 4 files changed, 909 insertions(+), 776 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 28177cc9e3..ed676e44fb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -20,9 +20,8 @@
 import org.reactivestreams.Publisher;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
@@ -43,7 +42,7 @@
  * The {@code Single} class implements the Reactive Pattern for a single value response.
  * <p>
  * {@code Single} behaves similarly to {@link Observable} except that it can only emit either a single successful
- * value or an error (there is no "onComplete" notification as there is for an {@link Observable}).
+ * value or an error (there is no {@code onComplete} notification as there is for an {@code Observable}).
  * <p>
  * The {@code Single} class implements the {@link SingleSource} base interface and the default consumer
  * type it interacts with is the {@link SingleObserver} via the {@link #subscribe(SingleObserver)} method.
@@ -68,7 +67,7 @@
  * <p>
  * <img width="640" height="301" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.legend.png" alt="">
  * <p>
- * See {@link Flowable} or {@link Observable} for the
+ * See {@link Flowable} or {@code Observable} for the
  * implementation of the Reactive Pattern for a stream or vector of values.
  * <p>
  * For more information see the <a href="http://reactivex.io/documentation/single.html">ReactiveX
@@ -110,14 +109,14 @@
  * allow working with a {@code SingleObserver} (or subclass) instance to be applied with in
  * a fluent manner (such as in the example above).
  * @param <T>
- *            the type of the item emitted by the Single
+ *            the type of the item emitted by the {@code Single}
  * @since 2.0
  * @see io.reactivex.rxjava3.observers.DisposableSingleObserver
  */
 public abstract class Single<T> implements SingleSource<T> {
 
     /**
-     * Runs multiple SingleSources and signals the events of the first one that signals (disposing
+     * Runs multiple {@link SingleSource}s and signals the events of the first one that signals (disposing
      * the rest).
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.amb.png" alt="">
@@ -126,9 +125,10 @@ public abstract class Single<T> implements SingleSource<T> {
      * <dd>{@code amb} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the Iterable sequence of sources. A subscription to each source will
-     *            occur in the same order as in this Iterable.
-     * @return the new Single instance
+     * @param sources the {@link Iterable} sequence of sources. A subscription to each source will
+     *            occur in the same order as in this {@code Iterable}.
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -140,7 +140,7 @@ public static <T> Single<T> amb(@NonNull Iterable<? extends SingleSource<? exten
     }
 
     /**
-     * Runs multiple SingleSources and signals the events of the first one that signals (disposing
+     * Runs multiple {@link SingleSource}s and signals the events of the first one that signals (disposing
      * the rest).
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ambArray.png" alt="">
@@ -151,7 +151,7 @@ public static <T> Single<T> amb(@NonNull Iterable<? extends SingleSource<? exten
      * @param <T> the value type
      * @param sources the array of sources. A subscription to each source will
      *            occur in the same order as in this array.
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -171,19 +171,19 @@ public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sourc
     }
 
     /**
-     * Concatenate the single values, in a non-overlapping fashion, of the SingleSources provided by
-     * an Iterable sequence.
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided by
+     * an {@link Iterable} sequence.
      * <p>
      * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.i.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the Iterable sequence of SingleSource instances
-     * @return the new Flowable instance
+     * @param sources the {@code Iterable} sequence of {@code SingleSource} instances
+     * @return the new {@code Flowable} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -195,8 +195,8 @@ public static <T> Flowable<T> concat(@NonNull Iterable<? extends SingleSource<?
     }
 
     /**
-     * Concatenate the single values, in a non-overlapping fashion, of the SingleSources provided by
-     * an Observable sequence.
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided by
+     * an {@link ObservableSource} sequence.
      * <p>
      * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.o.png" alt="">
      * <dl>
@@ -204,8 +204,9 @@ public static <T> Flowable<T> concat(@NonNull Iterable<? extends SingleSource<?
      * <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the ObservableSource of SingleSource instances
-     * @return the new Observable instance
+     * @param sources the {@code ObservableSource} of {@code SingleSource} instances
+     * @return the new {@link Observable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -218,20 +219,20 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Singl
     }
 
     /**
-     * Concatenate the single values, in a non-overlapping fashion, of the SingleSources provided by
-     * a Publisher sequence.
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided by
+     * a {@link Publisher} sequence.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer
+     *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer
      *  and the sources {@code Publisher} is expected to honor it as well.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the Publisher of SingleSource instances
-     * @return the new Flowable instance
+     * @param sources the {@code Publisher} of {@code SingleSource} instances
+     * @return the new {@code Flowable} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -243,21 +244,23 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends SingleSource<?
     }
 
     /**
-     * Concatenate the single values, in a non-overlapping fashion, of the SingleSources provided by
-     * a Publisher sequence and prefetched by the specified amount.
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided by
+     * a {@link Publisher} sequence and prefetched by the specified amount.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.pn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer
+     *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer
      *  and the sources {@code Publisher} is expected to honor it as well.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the Publisher of SingleSource instances
-     * @param prefetch the number of SingleSources to prefetch from the Publisher
-     * @return the new Flowable instance
+     * @param sources the {@code Publisher} of {@code SingleSource} instances
+     * @param prefetch the number of {@code SingleSource}s to prefetch from the {@code Publisher}
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
@@ -272,7 +275,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends SingleSource<?
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by two Singles, one after the other.
+     * Returns a {@link Flowable} that emits the items emitted by two {@link SingleSource}s, one after the other.
      * <p>
      * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.png" alt="">
      * <dl>
@@ -284,10 +287,11 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends SingleSource<?
      *
      * @param <T> the common value type
      * @param source1
-     *            a Single to be concatenated
+     *            a {@code SingleSource} to be concatenated
      * @param source2
-     *            a Single to be concatenated
-     * @return a Flowable that emits items emitted by the two source Singles, one after the other.
+     *            a {@code SingleSource} to be concatenated
+     * @return a {@code Flowable} that emits items emitted by the two source {@code SingleSource}s, one after the other.
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -303,7 +307,7 @@ public static <T> Flowable<T> concat(
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by three Singles, one after the other.
+     * Returns a {@link Flowable} that emits the items emitted by three {@link SingleSource}s, one after the other.
      * <p>
      * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.o3.png" alt="">
      * <dl>
@@ -315,12 +319,13 @@ public static <T> Flowable<T> concat(
      *
      * @param <T> the common value type
      * @param source1
-     *            a Single to be concatenated
+     *            a {@code SingleSource} to be concatenated
      * @param source2
-     *            a Single to be concatenated
+     *            a {@code SingleSource} to be concatenated
      * @param source3
-     *            a Single to be concatenated
-     * @return a Flowable that emits items emitted by the three source Singles, one after the other.
+     *            a {@code SingleSource} to be concatenated
+     * @return a {@code Flowable} that emits items emitted by the three source {@code SingleSource}s, one after the other.
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -338,7 +343,7 @@ public static <T> Flowable<T> concat(
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by four Singles, one after the other.
+     * Returns a {@link Flowable} that emits the items emitted by four {@link SingleSource}s, one after the other.
      * <p>
      * <img width="640" height="362" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.o4.png" alt="">
      * <dl>
@@ -350,14 +355,15 @@ public static <T> Flowable<T> concat(
      *
      * @param <T> the common value type
      * @param source1
-     *            a Single to be concatenated
+     *            a {@code SingleSource} to be concatenated
      * @param source2
-     *            a Single to be concatenated
+     *            a {@code SingleSource} to be concatenated
      * @param source3
-     *            a Single to be concatenated
+     *            a {@code SingleSource} to be concatenated
      * @param source4
-     *            a Single to be concatenated
-     * @return a Flowable that emits items emitted by the four source Singles, one after the other.
+     *            a {@code SingleSource} to be concatenated
+     * @return a {@code Flowable} that emits items emitted by the four source {@code SingleSource}s, one after the other.
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -376,19 +382,19 @@ public static <T> Flowable<T> concat(
     }
 
     /**
-     * Concatenate the single values, in a non-overlapping fashion, of the SingleSources provided in
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided in
      * an array.
      * <p>
      * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatArray.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code concatArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the array of SingleSource instances
-     * @return the new Flowable instance
+     * @param sources the array of {@code SingleSource} instances
+     * @return the new {@code Flowable} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -402,13 +408,13 @@ public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>...
     }
 
     /**
-     * Concatenates a sequence of SingleSource eagerly into a single stream of values.
+     * Concatenates a sequence of {@link SingleSource} eagerly into a single stream of values.
      * <p>
      * <img width="640" height="257" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatArrayEager.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source SingleSources. The operator buffers the value emitted by these SingleSources and then drains them
-     * in order, each one after the previous one completes.
+     * source {@code SingleSource}s. The operator buffers the value emitted by these {@code SingleSource}s and then drains them
+     * in order, each one after the previous one succeeds.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -416,8 +422,8 @@ public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>...
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of Single that need to be eagerly concatenated
-     * @return the new Flowable instance with the specified concatenation behavior
+     * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -429,24 +435,24 @@ public static <T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T
     }
 
     /**
-     * Concatenates a Publisher sequence of SingleSources eagerly into a single stream of values.
+     * Concatenates a {@link Publisher} sequence of {@link SingleSource}s eagerly into a single stream of values.
      * <p>
      * <img width="640" height="307" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.p.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * emitted source Publishers as they are observed. The operator buffers the values emitted by these
-     * Publishers and then drains them in order, each one after the previous one completes.
+     * emitted source {@code SingleSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code SingleSource}s and then drains them in order, each one after the previous one succeeds.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>Backpressure is honored towards the downstream and the outer Publisher is
+     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
      *  expected to support backpressure. Violating this assumption, the operator will
      *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of Publishers that need to be eagerly concatenated
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -457,13 +463,13 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends SingleSou
     }
 
     /**
-     * Concatenates a sequence of SingleSources eagerly into a single stream of values.
+     * Concatenates an {@link Iterable} sequence of {@link SingleSource}s eagerly into a single stream of values.
      * <p>
      * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.i.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source SingleSources. The operator buffers the values emitted by these SingleSources and then drains them
-     * in order, each one after the previous one completes.
+     * source {@code SingleSource}s. The operator buffers the values emitted by these {@code SingleSource}s and then drains them
+     * in order, each one after the previous one succeeds.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>Backpressure is honored towards the downstream.</dd>
@@ -471,8 +477,8 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends SingleSou
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of SingleSource that need to be eagerly concatenated
-     * @return the new Flowable instance with the specified concatenation behavior
+     * @param sources an {@code Iterable} sequence of {@code SingleSource} that need to be eagerly concatenated
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -483,7 +489,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends SingleSour
     }
 
     /**
-     * Provides an API (via a cold Single) that bridges the reactive world with the callback-style world.
+     * Provides an API (via a cold {@code Single}) that bridges the reactive world with the callback-style world.
      * <p>
      * <img width="640" height="454" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.create.png" alt="">
      * <p>
@@ -512,15 +518,16 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends SingleSour
      * Whenever a {@link SingleObserver} subscribes to the returned {@code Single}, the provided
      * {@link SingleOnSubscribe} callback is invoked with a fresh instance of a {@link SingleEmitter}
      * that will interact only with that specific {@code SingleObserver}. If this {@code SingleObserver}
-     * disposes the flow (making {@link SingleEmitter#isDisposed} return true),
+     * disposes the flow (making {@link SingleEmitter#isDisposed} return {@code true}),
      * other observers subscribed to the same returned {@code Single} are not affected.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code create} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param source the emitter that is called when a SingleObserver subscribes to the returned {@code Single}
-     * @return the new Single instance
+     * @param source the emitter that is called when a {@code SingleObserver} subscribes to the returned {@code Single}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code source} is {@code null}
      * @see SingleOnSubscribe
      * @see Cancellable
      */
@@ -543,8 +550,9 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends SingleSour
      * </dl>
      * @param <T> the value type
      * @param singleSupplier the {@code Supplier} that is called for each individual {@code SingleObserver} and
-     * returns a SingleSource instance to subscribe to
-     * @return the new Single instance
+     * returns a {@code SingleSource} instance to subscribe to
+     * @throws NullPointerException if {@code singleSupplier} is {@code null}
+     * @return the new {@code Single} instance
      */
     @CheckReturnValue
     @NonNull
@@ -555,7 +563,7 @@ public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? ext
     }
 
     /**
-     * Signals a Throwable returned by the callback function for each individual SingleObserver.
+     * Signals a {@link Throwable} returned by the callback function for each individual {@link SingleObserver}.
      * <p>
      * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.error.c.png" alt="">
      * <dl>
@@ -563,9 +571,10 @@ public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? ext
      * <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param errorSupplier the Supplier that is called for each individual SingleObserver and
-     * returns a Throwable instance to be emitted.
-     * @return the new Single instance
+     * @param errorSupplier the {@link Supplier} that is called for each individual {@code SingleObserver} and
+     * returns a {@code Throwable} instance to be emitted.
+     * @throws NullPointerException if {@code errorSupplier} is {@code null}
+     * @return the new {@code Single} instance
      */
     @CheckReturnValue
     @NonNull
@@ -576,7 +585,7 @@ public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> errorSu
     }
 
     /**
-     * Returns a Single that invokes a subscriber's {@link SingleObserver#onError onError} method when the
+     * Returns a {@code Single} that invokes a subscriber's {@link SingleObserver#onError onError} method when the
      * subscriber subscribes to it.
      * <p>
      * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.error.png" alt="">
@@ -586,11 +595,12 @@ public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> errorSu
      * </dl>
      *
      * @param exception
-     *            the particular Throwable to pass to {@link SingleObserver#onError onError}
+     *            the particular {@link Throwable} to pass to {@link SingleObserver#onError onError}
      * @param <T>
-     *            the type of the item (ostensibly) emitted by the Single
-     * @return a Single that invokes the subscriber's {@link SingleObserver#onError onError} method when
+     *            the type of the item (ostensibly) emitted by the {@code Single}
+     * @return the new {@code Single} that invokes the subscriber's {@link SingleObserver#onError onError} method when
      *         the subscriber subscribes to it
+     * @throws NullPointerException if {@code exception} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
@@ -602,9 +612,10 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     }
 
     /**
-     * Returns a {@link Single} that invokes passed function and emits its result for each new SingleObserver that subscribes.
+     * Returns a {@code Single} that invokes the given {@link Callable} for each incoming {@link SingleObserver}
+     * and emits its value or exception to them.
      * <p>
-     * Allows you to defer execution of passed function until SingleObserver subscribes to the {@link Single}.
+     * Allows you to defer execution of passed function until {@code SingleObserver} subscribes to the {@code Single}.
      * It makes passed function "lazy".
      * Result of the function invocation will be emitted by the {@link Single}.
      * <p>
@@ -613,7 +624,7 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
      *   <dt><b>Scheduler:</b></dt>
      *   <dd>{@code fromCallable} does not operate by default on a particular {@link Scheduler}.</dd>
      *   <dt><b>Error handling:</b></dt>
-     *   <dd> If the {@link Callable} throws an exception, the respective {@link Throwable} is
+     *   <dd> If the {@code Callable} throws an exception, the respective {@link Throwable} is
      *   delivered to the downstream via {@link SingleObserver#onError(Throwable)},
      *   except when the downstream has disposed this {@code Single} source.
      *   In this latter case, the {@code Throwable} is delivered to the global error handler via
@@ -622,10 +633,11 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
      * </dl>
      *
      * @param callable
-     *         function which execution should be deferred, it will be invoked when SingleObserver will subscribe to the {@link Single}.
+     *         function which execution should be deferred, it will be invoked when {@code SingleObserver} will subscribe to the {@link Single}.
      * @param <T>
-     *         the type of the item emitted by the {@link Single}.
-     * @return a {@link Single} whose {@link SingleObserver}s' subscriptions trigger an invocation of the given function.
+     *         the type of the item emitted by the {@code Single}.
+     * @return the new {@code Single} whose {@code SingleObserver}s' subscriptions trigger an invocation of the given function.
+     * @throws NullPointerException if {@code callable} is {@code null}
      * @see #defer(Supplier)
      * @see #fromSupplier(Supplier)
      */
@@ -638,27 +650,32 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     }
 
     /**
-     * Converts a {@link Future} into a {@code Single}.
+     * Converts a {@link Future} into a {@code Single} and awaits its outcome in a blocking fashion.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a Single that emits the return
-     * value of the {@link Future#get} method of that object, by passing the object into the {@code from}
-     * method.
+     * The operator calls {@link Future#get()}, which is a blocking method, on the subscription thread.
+     * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
+     * background thread, and if the {@link Scheduler} supports it, interrupt the wait when the flow
+     * is disposed.
      * <p>
-     * <em>Important note:</em> This Single is blocking; you cannot dispose it.
+     * A non-{@code null} value is then emitted via {@code onSuccess} or any exception is emitted via
+     * {@code onError}. If the {@code Future} completes with {@code null}, a {@link NullPointerException}
+     * is signaled.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     * <dd>{@code fromFuture} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Single}
-     * @return a {@code Single} that emits the item from the source {@link Future}
+     * @return the new {@code Single} that emits the item from the source {@code Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromFuture(Future, long, TimeUnit)
+     * @see #fromCompletionStage(CompletionStage)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -668,30 +685,34 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     }
 
     /**
-     * Converts a {@link Future} into a {@code Single}, with a timeout on the Future.
+     * Converts a {@link Future} into a {@code Single} and awaits its outcome, or timeout, in a blocking fashion.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a {@code Single} that emits
-     * the return value of the {@link Future#get} method of that object, by passing the object into the
-     * {@code from} method.
      * <p>
-     * <em>Important note:</em> This {@code Single} is blocking; you cannot dispose it.
+     * The operator calls {@link Future#get(long, TimeUnit)}, which is a blocking method, on the subscription thread.
+     * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
+     * background thread, and if the {@link Scheduler} supports it, interrupt the wait when the flow
+     * is disposed.
+     * <p>
+     * A non-{@code null} value is then emitted via {@code onSuccess} or any exception is emitted via
+     * {@code onError}. If the {@code Future} completes with {@code null}, a {@link NullPointerException}
+     * is signaled.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     * <dd>{@code fromFuture} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param timeout
      *            the maximum time to wait before calling {@code get}
      * @param unit
      *            the {@link TimeUnit} of the {@code timeout} argument
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Single}
-     * @return a {@code Single} that emits the item from the source {@link Future}
+     * @return the new {@code Single} that emits the item from the source {@code Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -702,11 +723,11 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     }
 
     /**
-     * Converts a {@link Future} into a {@code Single}, with a timeout on the Future.
+     * Converts a {@link Future} into a {@code Single}, with a timeout on the {@code Future}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a {@code Single} that emits
+     * You can convert any object that supports the {@code Future} interface into a {@code Single} that emits
      * the return value of the {@link Future#get} method of that object, by passing the object into the
      * {@code from} method.
      * <p>
@@ -717,17 +738,17 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param timeout
      *            the maximum time to wait before calling {@code get}
      * @param unit
      *            the {@link TimeUnit} of the {@code timeout} argument
      * @param scheduler
-     *            the Scheduler to use for the blocking wait
+     *            the {@code Scheduler} to use for the blocking wait
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Single}
-     * @return a {@code Single} that emits the item from the source {@link Future}
+     * @return the new {@code Single} that emits the item from the source {@code Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -742,23 +763,23 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.s.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a {@code Single} that emits
+     * You can convert any object that supports the {@code Future} interface into a {@code Single} that emits
      * the return value of the {@link Future#get} method of that object, by passing the object into the
      * {@code from} method.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     * <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param scheduler
-     *            the {@link Scheduler} to wait for the Future on. Use a Scheduler such as
-     *            {@link Schedulers#io()} that can block and wait on the Future
+     *            the {@code Scheduler} to wait for the {@code Future} on. Use a {@code Scheduler} such as
+     *            {@link Schedulers#io()} that can block and wait on the {@code Future}
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Single}
-     * @return a {@code Single} that emits the item from the source {@link Future}
+     * @return the new {@code Single} that emits the item from the source {@code Future}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -769,22 +790,23 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     }
 
     /**
-     * Wraps a specific Publisher into a Single and signals its single element or error.
-     * <p>If the source Publisher is empty, a NoSuchElementException is signalled. If
-     * the source has more than one element, an IndexOutOfBoundsException is signalled.
+     * Wraps a specific {@link Publisher} into a {@code Single} and signals its single element or error.
+     * <p>
+     * <img width="640" height="322" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromPublisher.png" alt="">
      * <p>
-     * The {@link Publisher} must follow the
-     * <a href="https://github.com/reactive-streams/reactive-streams-jvm#reactive-streams">Reactive-Streams specification</a>.
+     * If the source {@code Publisher} is empty, a {@link NoSuchElementException} is signaled. If
+     * the source has more than one element, an {@link IndexOutOfBoundsException} is signaled.
+     * <p>
+     * The {@code Publisher} must follow the
+     * <a href="https://github.com/reactive-streams/reactive-streams-jvm#reactive-streams">Reactive Streams specification</a>.
      * Violating the specification may result in undefined behavior.
      * <p>
      * If possible, use {@link #create(SingleOnSubscribe)} to create a
      * source-like {@code Single} instead.
      * <p>
-     * Note that even though {@link Publisher} appears to be a functional interface, it
+     * Note that even though {@code Publisher} appears to be a functional interface, it
      * is not recommended to implement it through a lambda as the specification requires
      * state management that is not achievable with a stateless lambda.
-     * <p>
-     * <img width="640" height="322" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromPublisher.png" alt="">
      * <dl>
      * <dt><b>Backpressure:</b></dt>
      * <dd>The {@code publisher} is consumed in an unbounded fashion but will be cancelled
@@ -793,8 +815,9 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
      * <dd>{@code fromPublisher} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param publisher the source Publisher instance, not null
-     * @return the new Single instance
+     * @param publisher the source {@code Publisher} instance, not {@code null}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code publisher} is {@code null}
      * @see #create(SingleOnSubscribe)
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -807,20 +830,22 @@ public static <T> Single<T> fromPublisher(@NonNull Publisher<? extends T> publis
     }
 
     /**
-     * Wraps a specific ObservableSource into a Single and signals its single element or error.
-     * <p>If the ObservableSource is empty, a NoSuchElementException is signalled.
-     * If the source has more than one element, an IndexOutOfBoundsException is signalled.
+     * Wraps a specific {@link ObservableSource} into a {@code Single} and signals its single element or error.
      * <p>
      * <img width="640" height="343" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromObservable.png" alt="">
+     * <p>
+     * If the {@code ObservableSource} is empty, a {@link NoSuchElementException} is signaled.
+     * If the source has more than one element, an {@link IndexOutOfBoundsException} is signaled.
      * <dl>
      *   <dt><b>Scheduler:</b></dt>
      *   <dd>{@code fromObservable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param observableSource the source Observable, not null
+     * @param observableSource the source sequence to wrap, not {@code null}
      * @param <T>
-     *         the type of the item emitted by the {@link Single}.
-     * @return the new Single instance
+     *         the type of the item emitted by the {@code Single}.
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code observableSource} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -831,10 +856,10 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
     }
 
     /**
-     * Returns a {@link Single} that invokes passed supplier and emits its result
-     * for each new SingleObserver that subscribes.
+     * Returns a {@code Single} that invokes passed supplier and emits its result
+     * for each individual {@link SingleObserver} that subscribes.
      * <p>
-     * Allows you to defer execution of passed function until SingleObserver subscribes to the {@link Single}.
+     * Allows you to defer execution of passed function until a {@code SingleObserver} subscribes to the {@link Single}.
      * It makes passed function "lazy".
      * Result of the function invocation will be emitted by the {@link Single}.
      * <p>
@@ -852,10 +877,11 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
      * </dl>
      *
      * @param supplier
-     *         function which execution should be deferred, it will be invoked when SingleObserver will subscribe to the {@link Single}.
+     *         function which execution should be deferred, it will be invoked when {@code SingleObserver} subscribes to the {@code Single}.
      * @param <T>
-     *         the type of the item emitted by the {@link Single}.
-     * @return a {@link Single} whose {@link SingleObserver}s' subscriptions trigger an invocation of the given function.
+     *         the type of the item emitted by the {@code Single}.
+     * @return the new {@code Single} whose {@code SingleObserver}s' subscriptions trigger an invocation of the given function.
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see #defer(Supplier)
      * @see #fromCallable(Callable)
      * @since 3.0.0
@@ -884,7 +910,8 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
      *            the item to emit
      * @param <T>
      *            the type of that item
-     * @return a {@code Single} that emits {@code item}
+     * @return the new {@code Single} that emits {@code item}
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -896,8 +923,8 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
     }
 
     /**
-     * Merges an Iterable sequence of SingleSource instances into a single Flowable sequence,
-     * running all SingleSources at once.
+     * Merges an {@link Iterable} sequence of {@link SingleSource} instances into a single {@link Flowable} sequence,
+     * running all {@code SingleSource}s at once.
      * <p>
      * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.i.png" alt="">
      * <dl>
@@ -906,13 +933,13 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code SingleSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code SingleSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code SingleSource}s are disposed.
      *  If more than one {@code SingleSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Iterable)} to merge sources and terminate only when all source {@code SingleSource}s
@@ -920,8 +947,9 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
      *  </dd>
      * </dl>
      * @param <T> the common and resulting value type
-     * @param sources the Iterable sequence of SingleSource sources
-     * @return the new Flowable instance
+     * @param sources the {@code Iterable} sequence of {@code SingleSource} sources
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      * @see #mergeDelayError(Iterable)
      */
@@ -934,8 +962,8 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends SingleSource<? e
     }
 
     /**
-     * Merges a Flowable sequence of SingleSource instances into a single Flowable sequence,
-     * running all SingleSources at once.
+     * Merges a sequence of {@link SingleSource} instances emitted by a {@link Publisher} into a single {@link Flowable} sequence,
+     * running all {@code SingleSource}s at once.
      * <p>
      * <img width="640" height="307" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.p.png" alt="">
      * <dl>
@@ -944,13 +972,13 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends SingleSource<? e
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code SingleSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code SingleSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code SingleSource}s are disposed.
      *  If more than one {@code SingleSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher)} to merge sources and terminate only when all source {@code SingleSource}s
@@ -958,8 +986,9 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends SingleSource<? e
      *  </dd>
      * </dl>
      * @param <T> the common and resulting value type
-     * @param sources the Flowable sequence of SingleSource sources
-     * @return the new Flowable instance
+     * @param sources the {@code Publisher} emitting a sequence of {@code SingleSource}s
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see #mergeDelayError(Publisher)
      * @since 2.0
      */
@@ -974,15 +1003,15 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends SingleSource<?
     }
 
     /**
-     * Flattens a {@code Single} that emits a {@code Single} into a single {@code Single} that emits the item
-     * emitted by the nested {@code Single}, without any transformation.
+     * Flattens a {@link SingleSource} that emits a {@code SingleSingle} into a single {@code Single} that emits the item
+     * emitted by the nested {@code SingleSource}, without any transformation.
      * <p>
      * <img width="640" height="412" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.oo.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
-     * <dd>The resulting {@code Single} emits the outer source's or the inner {@code SingleSource}'s {@code Throwable} as is.
-     * Unlike the other {@code merge()} operators, this operator won't and can't produce a {@code CompositeException} because there is
+     * <dd>The resulting {@code Single} emits the outer source's or the inner {@code SingleSource}'s {@link Throwable} as is.
+     * Unlike the other {@code merge()} operators, this operator won't and can't produce a {@link CompositeException} because there is
      * only one possibility for the outer or the inner {@code SingleSource} to emit an {@code onError} signal.
      * Therefore, there is no need for a {@code mergeDelayError(SingleSource<SingleSource<T>>)} operator.
      * </dd>
@@ -991,8 +1020,9 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends SingleSource<?
      * @param <T> the value type of the sources and the output
      * @param source
      *            a {@code Single} that emits a {@code Single}
-     * @return a {@code Single} that emits the item that is the result of flattening the {@code Single} emitted
+     * @return the new {@code Single} that emits the item that is the result of flattening the {@code Single} emitted
      *         by {@code source}
+     * @throws NullPointerException if {@code source} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @CheckReturnValue
@@ -1004,11 +1034,11 @@ public static <T> Single<T> merge(@NonNull SingleSource<? extends SingleSource<?
     }
 
     /**
-     * Flattens two Singles into a single Flowable, without any transformation.
+     * Flattens two {@link SingleSource}s into one {@link Flowable} sequence, without any transformation.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Singles so that they appear as a single Flowable, by
+     * You can combine items emitted by multiple {@code SingleSource}s so that they appear as a single {@code Flowable}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1016,13 +1046,13 @@ public static <T> Single<T> merge(@NonNull SingleSource<? extends SingleSource<?
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code SingleSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code SingleSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code SingleSource}s are disposed.
      *  If more than one {@code SingleSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(SingleSource, SingleSource)} to merge sources and terminate only when all source {@code SingleSource}s
@@ -1032,10 +1062,11 @@ public static <T> Single<T> merge(@NonNull SingleSource<? extends SingleSource<?
      *
      * @param <T> the common value type
      * @param source1
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source2
-     *            a SingleSource to be merged
-     * @return a Flowable that emits all of the items emitted by the source Singles
+     *            a {@code SingleSource} to be merged
+     * @return the new {@code Flowable} that emits all of the items emitted by the source {@code SingleSource}s
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(SingleSource, SingleSource)
      */
@@ -1052,11 +1083,11 @@ public static <T> Flowable<T> merge(
     }
 
     /**
-     * Flattens three Singles into a single Flowable, without any transformation.
+     * Flattens three {@link SingleSource}s into one {@link Flowable} sequence, without any transformation.
      * <p>
      * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.o3.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Singles so that they appear as a single Flowable, by using
+     * You can combine items emitted by multiple {@code SingleSource}s so that they appear as a single {@code Flowable}, by
      * the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1064,13 +1095,13 @@ public static <T> Flowable<T> merge(
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code SingleSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code SingleSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code SingleSource}s are disposed.
      *  If more than one {@code SingleSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(SingleSource, SingleSource, SingleSource)} to merge sources and terminate only when all source {@code SingleSource}s
@@ -1080,12 +1111,13 @@ public static <T> Flowable<T> merge(
      *
      * @param <T> the common value type
      * @param source1
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source2
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source3
-     *            a SingleSource to be merged
-     * @return a Flowable that emits all of the items emitted by the source Singles
+     *            a {@code SingleSource} to be merged
+     * @return the new {@code Flowable} that emits all of the items emitted by the source {@code SingleSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(SingleSource, SingleSource, SingleSource)
      */
@@ -1104,11 +1136,11 @@ public static <T> Flowable<T> merge(
     }
 
     /**
-     * Flattens four Singles into a single Flowable, without any transformation.
+     * Flattens four {@link SingleSource}s into one {@link Flowable} sequence, without any transformation.
      * <p>
      * <img width="640" height="362" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.o4.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Singles so that they appear as a single Flowable, by using
+     * You can combine items emitted by multiple {@code SingleSource}s so that they appear as a single {@code Flowable}, by
      * the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1116,13 +1148,13 @@ public static <T> Flowable<T> merge(
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code SingleSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code SingleSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code SingleSource}s are disposed.
      *  If more than one {@code SingleSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(SingleSource, SingleSource, SingleSource, SingleSource)} to merge sources and terminate only when all source {@code SingleSource}s
@@ -1132,14 +1164,15 @@ public static <T> Flowable<T> merge(
      *
      * @param <T> the common value type
      * @param source1
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source2
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source3
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source4
-     *            a SingleSource to be merged
-     * @return a Flowable that emits all of the items emitted by the source Singles
+     *            a {@code SingleSource} to be merged
+     * @return the new {@code Flowable} that emits all of the items emitted by the source {@code SingleSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(SingleSource, SingleSource, SingleSource, SingleSource)
      */
@@ -1159,8 +1192,8 @@ public static <T> Flowable<T> merge(
     }
 
     /**
-     * Merges an Iterable sequence of SingleSource instances into a single Flowable sequence,
-     * running all SingleSources at once and delaying any error(s) until all sources succeed or fail.
+     * Merges an {@link Iterable} sequence of {@link SingleSource} instances into one {@link Flowable} sequence,
+     * running all {@code SingleSource}s at once and delaying any error(s) until all sources succeed or fail.
      * <p>
      * <img width="640" height="469" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeDelayError.i.png" alt="">
      * <dl>
@@ -1171,8 +1204,9 @@ public static <T> Flowable<T> merge(
      * </dl>
      * <p>History: 2.1.9 - experimental
      * @param <T> the common and resulting value type
-     * @param sources the Iterable sequence of SingleSource sources
-     * @return the new Flowable instance
+     * @param sources the {@code Iterable} sequence of {@code SingleSource}s
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see #merge(Iterable)
      * @since 2.2
      */
@@ -1185,8 +1219,8 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Single
     }
 
     /**
-     * Merges a Flowable sequence of SingleSource instances into a single Flowable sequence,
-     * running all SingleSources at once and delaying any error(s) until all sources succeed or fail.
+     * Merges a sequence of {@link SingleSource} instances emitted by a {@link Publisher} into a {@link Flowable} sequence,
+     * running all {@code SingleSource}s at once and delaying any error(s) until all sources succeed or fail.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeDelayError.p.png" alt="">
      * <dl>
@@ -1197,10 +1231,11 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Single
      * </dl>
      * <p>History: 2.1.9 - experimental
      * @param <T> the common and resulting value type
-     * @param sources the Flowable sequence of SingleSource sources
-     * @return the new Flowable instance
-     * @see #merge(Publisher)
+     * @param sources the {@code Flowable} sequence of {@code SingleSource}s
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.2
+     * @see #merge(Publisher)
      */
     @CheckReturnValue
     @NonNull
@@ -1213,12 +1248,12 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Singl
     }
 
     /**
-     * Flattens two Singles into a single Flowable, without any transformation, delaying
+     * Flattens two {@link SingleSource}s into one {@link Flowable}, without any transformation, delaying
      * any error(s) until all sources succeed or fail.
      * <p>
      * <img width="640" height="554" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeDelayError.2.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Singles so that they appear as a single Flowable, by
+     * You can combine items emitted by multiple {@code SingleSource}s so that they appear as one {@code Flowable}, by
      * using the {@code mergeDelayError} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1229,10 +1264,11 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Singl
      * <p>History: 2.1.9 - experimental
      * @param <T> the common value type
      * @param source1
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source2
-     *            a SingleSource to be merged
-     * @return a Flowable that emits all of the items emitted by the source Singles
+     *            a {@code SingleSource} to be merged
+     * @return the new {@code Flowable} that emits all of the items emitted by the source {@code SingleSource}s
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #merge(SingleSource, SingleSource)
      * @since 2.2
@@ -1250,12 +1286,12 @@ public static <T> Flowable<T> mergeDelayError(
     }
 
     /**
-     * Flattens three Singles into a single Flowable, without any transformation, delaying
+     * Flattens two {@link SingleSource}s into one {@link Flowable}, without any transformation, delaying
      * any error(s) until all sources succeed or fail.
      * <p>
      * <img width="640" height="496" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeDelayError.3.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Singles so that they appear as a single Flowable, by using
+     * You can combine items emitted by multiple {@code SingleSource}s so that they appear as one {@code Flowable}, by
      * the {@code mergeDelayError} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1266,12 +1302,13 @@ public static <T> Flowable<T> mergeDelayError(
      * <p>History: 2.1.9 - experimental
      * @param <T> the common value type
      * @param source1
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source2
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source3
-     *            a SingleSource to be merged
-     * @return a Flowable that emits all of the items emitted by the source Singles
+     *            a {@code SingleSource} to be merged
+     * @return the new {@code Flowable} that emits all of the items emitted by the source {@code SingleSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #merge(SingleSource, SingleSource, SingleSource)
      * @since 2.2
@@ -1291,12 +1328,12 @@ public static <T> Flowable<T> mergeDelayError(
     }
 
     /**
-     * Flattens four Singles into a single Flowable, without any transformation, delaying
+     * Flattens two {@link SingleSource}s into one {@link Flowable}, without any transformation, delaying
      * any error(s) until all sources succeed or fail.
      * <p>
      * <img width="640" height="509" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeDelayError.4.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Singles so that they appear as a single Flowable, by using
+     * You can combine items emitted by multiple {@code SingleSource}s so that they appear as one {@code Flowable}, by
      * the {@code mergeDelayError} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1307,14 +1344,15 @@ public static <T> Flowable<T> mergeDelayError(
      * <p>History: 2.1.9 - experimental
      * @param <T> the common value type
      * @param source1
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source2
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source3
-     *            a SingleSource to be merged
+     *            a {@code SingleSource} to be merged
      * @param source4
-     *            a SingleSource to be merged
-     * @return a Flowable that emits all of the items emitted by the source Singles
+     *            a {@code SingleSource} to be merged
+     * @return the new {@code Flowable} that emits all of the items emitted by the source {@code SingleSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #merge(SingleSource, SingleSource, SingleSource, SingleSource)
      * @since 2.2
@@ -1335,7 +1373,7 @@ public static <T> Flowable<T> mergeDelayError(
     }
 
     /**
-     * Returns a singleton instance of a never-signaling Single (only calls onSubscribe).
+     * Returns a singleton instance of a never-signaling {@code Single} (only calls {@code onSubscribe}).
      * <p>
      * <img width="640" height="244" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.never.png" alt="">
      * <dl>
@@ -1355,7 +1393,7 @@ public static <T> Single<T> never() {
     }
 
     /**
-     * Signals success with 0L value after the given delay for each SingleObserver.
+     * Signals success with 0L value after the given delay when a {@link SingleObserver} subscribes.
      * <p>
      * <img width="640" height="292" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timer.png" alt="">
      * <dl>
@@ -1364,7 +1402,7 @@ public static <T> Single<T> never() {
      * </dl>
      * @param delay the delay amount
      * @param unit the time unit of the delay
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -1375,20 +1413,21 @@ public static Single<Long> timer(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Signals success with 0L value after the given delay for each SingleObserver.
+     * Signals success with 0L value on the specified {@link Scheduler} after the given
+     * delay when a {@link SingleObserver} subscribes.
      * <p>
      * <img width="640" height="292" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timer.s.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>you specify the {@link Scheduler} to signal on.</dd>
+     * <dd>you specify the {@code Scheduler} to signal on.</dd>
      * </dl>
      * @param delay the delay amount
      * @param unit the time unit of the delay
-     * @param scheduler the scheduler where the single 0L will be emitted
-     * @return the new Single instance
+     * @param scheduler the {@code Scheduler} where the single 0L will be emitted
+     * @return the new {@code Single} instance
      * @throws NullPointerException
-     *             if unit is null, or
-     *             if scheduler is null
+     *             if {@code unit} is {@code null}, or
+     *             if {@code scheduler} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1401,7 +1440,7 @@ public static Single<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Compares two SingleSources and emits true if they emit the same value (compared via Object.equals).
+     * Compares two {@link SingleSource}s and emits {@code true} if they emit the same value (compared via {@link Object#equals(Object)}).
      * <p>
      * <img width="640" height="465" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.equals.png" alt="">
      * <dl>
@@ -1409,9 +1448,10 @@ public static Single<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Sc
      * <dd>{@code equals} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the common value type
-     * @param first the first SingleSource instance
-     * @param second the second SingleSource instance
-     * @return the new Single instance
+     * @param first the first {@code SingleSource} instance
+     * @param second the second {@code SingleSource} instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code first} or {@code second} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1424,8 +1464,8 @@ public static <T> Single<Boolean> equals(@NonNull SingleSource<? extends T> firs
     }
 
     /**
-     * <strong>Advanced use only:</strong> creates a Single instance without
-     * any safeguards by using a callback that is called with a SingleObserver.
+     * <strong>Advanced use only:</strong> creates a {@code Single} instance without
+     * any safeguards by using a callback that is called with a {@link SingleObserver}.
      * <p>
      * <img width="640" height="261" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.unsafeCreate.png" alt="">
      * <dl>
@@ -1433,8 +1473,9 @@ public static <T> Single<Boolean> equals(@NonNull SingleSource<? extends T> firs
      * <dd>{@code unsafeCreate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param onSubscribe the function that is called with the subscribing SingleObserver
-     * @return the new Single instance
+     * @param onSubscribe the function that is called with the subscribing {@code SingleObserver}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @throws IllegalArgumentException if {@code source} is a subclass of {@code Single}; such
      * instances don't need conversion and is possibly a port remnant from 1.x or one should use {@link #hide()}
      * instead.
@@ -1452,7 +1493,7 @@ public static <T> Single<T> unsafeCreate(@NonNull SingleSource<T> onSubscribe) {
     }
 
     /**
-     * Allows using and disposing a resource while running a SingleSource instance generated from
+     * Allows using and disposing a resource while running a {@link SingleSource} instance generated from
      * that resource (similar to a try-with-resources).
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.using.png" alt="">
@@ -1460,16 +1501,16 @@ public static <T> Single<T> unsafeCreate(@NonNull SingleSource<T> onSubscribe) {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the value type of the SingleSource generated
+     * @param <T> the value type of the {@code SingleSource} generated
      * @param <U> the resource type
-     * @param resourceSupplier the Supplier called for each SingleObserver to generate a resource Object
+     * @param resourceSupplier the {@link Supplier} called for each {@link SingleObserver} to generate a resource object
      * @param singleFunction the function called with the returned resource
-     *                  Object from {@code resourceSupplier} and should return a SingleSource instance
+     *                  object from {@code resourceSupplier} and should return a {@code SingleSource} instance
      *                  to be run by the operator
      * @param disposer the consumer of the generated resource that is called exactly once for
-     *                  that particular resource when the generated SingleSource terminates
+     *                  that particular resource when the generated {@code SingleSource} terminates
      *                  (successfully or with an error) or gets disposed.
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -1482,7 +1523,7 @@ public static <T, U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
     }
 
     /**
-     * Allows using and disposing a resource while running a SingleSource instance generated from
+     * Allows using and disposing a resource while running a {@link SingleSource} instance generated from
      * that resource (similar to a try-with-resources).
      * <p>
      * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.using.b.png" alt="">
@@ -1490,21 +1531,22 @@ public static <T, U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the value type of the SingleSource generated
+     * @param <T> the value type of the {@code SingleSource} generated
      * @param <U> the resource type
-     * @param resourceSupplier the Supplier called for each SingleObserver to generate a resource Object
+     * @param resourceSupplier the {@link Supplier} called for each {@link SingleObserver} to generate a resource object
      * @param singleFunction the function called with the returned resource
-     *                  Object from {@code resourceSupplier} and should return a SingleSource instance
+     *                  object from {@code resourceSupplier} and should return a {@code SingleSource} instance
      *                  to be run by the operator
      * @param disposer the consumer of the generated resource that is called exactly once for
-     *                  that particular resource when the generated SingleSource terminates
+     *                  that particular resource when the generated {@code SingleSource} terminates
      *                  (successfully or with an error) or gets disposed.
      * @param eager
      *            If {@code true} then resource disposal will happen either on a {@code dispose()} call before the upstream is disposed
      *            or just before the emission of a terminal event ({@code onSuccess} or {@code onError}).
      *            If {@code false} the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onSuccess} or {@code onError}).
-     * @return the new Single instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code resourceSupplier}, {@code singleFunction} or {@code disposer} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1523,7 +1565,7 @@ public static <T, U> Single<T> using(
     }
 
     /**
-     * Wraps a SingleSource instance into a new Single instance if not already a Single
+     * Wraps a {@link SingleSource} instance into a new {@code Single} instance if not already a {@code Single}
      * instance.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.wrap.png" alt="">
@@ -1533,7 +1575,8 @@ public static <T, U> Single<T> using(
      * </dl>
      * @param <T> the value type
      * @param source the source to wrap
-     * @return the Single wrapper or the source cast to Single (if possible)
+     * @return the {@code Single} wrapper or the source cast to {@code Single} (if possible)
+     * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1547,20 +1590,20 @@ public static <T> Single<T> wrap(@NonNull SingleSource<T> source) {
     }
 
     /**
-     * Waits until all SingleSource sources provided by the Iterable sequence signal a success
+     * Waits until all {@link SingleSource} sources provided by the {@link Iterable} sequence signal a success
      * value and calls a zipper function with an array of these values to return a result
-     * to be emitted to downstream.
+     * to be emitted to the downstream.
      * <p>
-     * If the {@code Iterable} of {@link SingleSource}s is empty a {@link NoSuchElementException} error is signalled after subscription.
+     * If the {@code Iterable} of {@code SingleSource}s is empty a {@link NoSuchElementException} error is signaled after subscription.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      *
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.i.png" alt="">
      * <p>
-     * If any of the SingleSources signal an error, all other SingleSources get disposed and the
+     * If any of the {@code SingleSources} signal an error, all other {@code SingleSource}s get disposed and the
      * error emitted to downstream immediately.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -1568,25 +1611,27 @@ public static <T> Single<T> wrap(@NonNull SingleSource<T> source) {
      * </dl>
      * @param <T> the common value type
      * @param <R> the result value type
-     * @param sources the Iterable sequence of SingleSource instances. An empty sequence will result in an
-     *                {@code onError} signal of {@link NoSuchElementException}.
-     * @param zipper the function that receives an array with values from each SingleSource
+     * @param sources the {@code Iterable} sequence of {@code SingleSource} instances. An empty sequence will result in an
+     *                {@code onError} signal of {@code NoSuchElementException}.
+     * @param zipper the function that receives an array with values from each {@code SingleSource}
      *               and should return a value to be emitted to downstream
-     * @return the new Single instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code zipper} or {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Single<R> zip(@NonNull Iterable<? extends SingleSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
+    public static <T, R> Single<R> zip(@NonNull Iterable<? extends SingleSource<? extends T>> sources,
+            @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new SingleZipIterable<>(sources, zipper));
     }
 
     /**
-     * Returns a Single that emits the results of a specified combiner function applied to two items emitted by
-     * two other Singles.
+     * Returns a {@code Single} that emits the results of a specified combiner function applied to two items emitted by
+     * two other {@link SingleSource}s.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
@@ -1594,17 +1639,18 @@ public static <T, R> Single<R> zip(@NonNull Iterable<? extends SingleSource<? ex
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T1> the first source Single's value type
-     * @param <T2> the second source Single's value type
+     * @param <T1> the first source {@code SingleSource}'s value type
+     * @param <T2> the second source {@code SingleSource}'s value type
      * @param <R> the result value type
      * @param source1
-     *            the first source Single
+     *            the first source {@code SingleSource}
      * @param source2
-     *            a second source Single
+     *            a second source {@code SingleSource}
      * @param zipper
-     *            a function that, when applied to the item emitted by each of the source Singles, results in an
-     *            item that will be emitted by the resulting Single
-     * @return a Single that emits the zipped results
+     *            a function that, when applied to the item emitted by each of the source {@code SingleSource}s, results in an
+     *            item that will be emitted by the resulting {@code Single}
+     * @return the new {@code Single} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1621,8 +1667,8 @@ public static <T1, T2, R> Single<R> zip(
     }
 
     /**
-     * Returns a Single that emits the results of a specified combiner function applied to three items emitted
-     * by three other Singles.
+     * Returns a {@code Single} that emits the results of a specified combiner function applied to three items emitted
+     * by three other {@link SingleSource}s.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
@@ -1630,20 +1676,21 @@ public static <T1, T2, R> Single<R> zip(
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T1> the first source Single's value type
-     * @param <T2> the second source Single's value type
-     * @param <T3> the third source Single's value type
+     * @param <T1> the first source {@code SingleSource}'s value type
+     * @param <T2> the second source {@code SingleSource}'s value type
+     * @param <T3> the third source {@code SingleSource}'s value type
      * @param <R> the result value type
      * @param source1
-     *            the first source Single
+     *            the first source {@code SingleSource}
      * @param source2
-     *            a second source Single
+     *            a second source {@code SingleSource}
      * @param source3
-     *            a third source Single
+     *            a third source {@code SingleSource}
      * @param zipper
-     *            a function that, when applied to the item emitted by each of the source Singles, results in an
-     *            item that will be emitted by the resulting Single
-     * @return a Single that emits the zipped results
+     *            a function that, when applied to the item emitted by each of the source {@code SingleSource}s, results in an
+     *            item that will be emitted by the resulting {@code Single}
+     * @return the new {@code Single} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1662,8 +1709,8 @@ public static <T1, T2, T3, R> Single<R> zip(
     }
 
     /**
-     * Returns a Single that emits the results of a specified combiner function applied to four items
-     * emitted by four other Singles.
+     * Returns a {@code Single} that emits the results of a specified combiner function applied to four items
+     * emitted by four other {@link SingleSource}s.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
@@ -1671,23 +1718,24 @@ public static <T1, T2, T3, R> Single<R> zip(
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T1> the first source Single's value type
-     * @param <T2> the second source Single's value type
-     * @param <T3> the third source Single's value type
-     * @param <T4> the fourth source Single's value type
+     * @param <T1> the first source {@code SingleSource}'s value type
+     * @param <T2> the second source {@code SingleSource}'s value type
+     * @param <T3> the third source {@code SingleSource}'s value type
+     * @param <T4> the fourth source {@code SingleSource}'s value type
      * @param <R> the result value type
      * @param source1
-     *            the first source Single
+     *            the first source {@code SingleSource}
      * @param source2
-     *            a second source Single
+     *            a second source {@code SingleSource}
      * @param source3
-     *            a third source Single
+     *            a third source {@code SingleSource}
      * @param source4
-     *            a fourth source Single
+     *            a fourth source {@code SingleSource}
      * @param zipper
-     *            a function that, when applied to the item emitted by each of the source Singles, results in an
-     *            item that will be emitted by the resulting Single
-     * @return a Single that emits the zipped results
+     *            a function that, when applied to the item emitted by each of the source {@code SingleSource}s, results in an
+     *            item that will be emitted by the resulting {@code Single}
+     * @return the new {@code Single} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3}, {@code source4} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1707,8 +1755,8 @@ public static <T1, T2, T3, T4, R> Single<R> zip(
     }
 
     /**
-     * Returns a Single that emits the results of a specified combiner function applied to five items
-     * emitted by five other Singles.
+     * Returns a {@code Single} that emits the results of a specified combiner function applied to five items
+     * emitted by five other {@link SingleSource}s.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
@@ -1716,26 +1764,28 @@ public static <T1, T2, T3, T4, R> Single<R> zip(
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T1> the first source Single's value type
-     * @param <T2> the second source Single's value type
-     * @param <T3> the third source Single's value type
-     * @param <T4> the fourth source Single's value type
-     * @param <T5> the fifth source Single's value type
+     * @param <T1> the first source {@code SingleSource}'s value type
+     * @param <T2> the second source {@code SingleSource}'s value type
+     * @param <T3> the third source {@code SingleSource}'s value type
+     * @param <T4> the fourth source {@code SingleSource}'s value type
+     * @param <T5> the fifth source {@code SingleSource}'s value type
      * @param <R> the result value type
      * @param source1
-     *            the first source Single
+     *            the first source {@code SingleSource}
      * @param source2
-     *            a second source Single
+     *            a second source {@code SingleSource}
      * @param source3
-     *            a third source Single
+     *            a third source {@code SingleSource}
      * @param source4
-     *            a fourth source Single
+     *            a fourth source {@code SingleSource}
      * @param source5
-     *            a fifth source Single
+     *            a fifth source {@code SingleSource}
      * @param zipper
-     *            a function that, when applied to the item emitted by each of the source Singles, results in an
-     *            item that will be emitted by the resulting Single
-     * @return a Single that emits the zipped results
+     *            a function that, when applied to the item emitted by each of the source {@code SingleSource}s, results in an
+     *            item that will be emitted by the resulting {@code Single}
+     * @return the new {@code Single} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3}, {@code source4}
+     *                              {@code source5} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1757,8 +1807,8 @@ public static <T1, T2, T3, T4, T5, R> Single<R> zip(
     }
 
     /**
-     * Returns a Single that emits the results of a specified combiner function applied to six items
-     * emitted by six other Singles.
+     * Returns a {@code Single} that emits the results of a specified combiner function applied to six items
+     * emitted by six other {@link SingleSource}s.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
@@ -1766,29 +1816,31 @@ public static <T1, T2, T3, T4, T5, R> Single<R> zip(
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T1> the first source Single's value type
-     * @param <T2> the second source Single's value type
-     * @param <T3> the third source Single's value type
-     * @param <T4> the fourth source Single's value type
-     * @param <T5> the fifth source Single's value type
-     * @param <T6> the sixth source Single's value type
+     * @param <T1> the first source {@code SingleSource}'s value type
+     * @param <T2> the second source {@code SingleSource}'s value type
+     * @param <T3> the third source {@code SingleSource}'s value type
+     * @param <T4> the fourth source {@code SingleSource}'s value type
+     * @param <T5> the fifth source {@code SingleSource}'s value type
+     * @param <T6> the sixth source {@code SingleSource}'s value type
      * @param <R> the result value type
      * @param source1
-     *            the first source Single
+     *            the first source {@code SingleSource}
      * @param source2
-     *            a second source Single
+     *            a second source {@code SingleSource}
      * @param source3
-     *            a third source Single
+     *            a third source {@code SingleSource}
      * @param source4
-     *            a fourth source Single
+     *            a fourth source {@code SingleSource}
      * @param source5
-     *            a fifth source Single
+     *            a fifth source {@code SingleSource}
      * @param source6
-     *            a sixth source Single
+     *            a sixth source {@code SingleSource}
      * @param zipper
-     *            a function that, when applied to the item emitted by each of the source Singles, results in an
-     *            item that will be emitted by the resulting Single
-     * @return a Single that emits the zipped results
+     *            a function that, when applied to the item emitted by each of the source {@code SingleSource}s, results in an
+     *            item that will be emitted by the resulting {@code Single}
+     * @return the new {@code Single} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3}, {@code source4}
+     *                              {@code source5}, {@code source6} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1811,8 +1863,8 @@ public static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(
     }
 
     /**
-     * Returns a Single that emits the results of a specified combiner function applied to seven items
-     * emitted by seven other Singles.
+     * Returns a {@code Single} that emits the results of a specified combiner function applied to seven items
+     * emitted by seven other {@link SingleSource}s.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
@@ -1820,32 +1872,34 @@ public static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T1> the first source Single's value type
-     * @param <T2> the second source Single's value type
-     * @param <T3> the third source Single's value type
-     * @param <T4> the fourth source Single's value type
-     * @param <T5> the fifth source Single's value type
-     * @param <T6> the sixth source Single's value type
-     * @param <T7> the seventh source Single's value type
+     * @param <T1> the first source {@code SingleSource}'s value type
+     * @param <T2> the second source {@code SingleSource}'s value type
+     * @param <T3> the third source {@code SingleSource}'s value type
+     * @param <T4> the fourth source {@code SingleSource}'s value type
+     * @param <T5> the fifth source {@code SingleSource}'s value type
+     * @param <T6> the sixth source {@code SingleSource}'s value type
+     * @param <T7> the seventh source {@code SingleSource}'s value type
      * @param <R> the result value type
      * @param source1
-     *            the first source Single
+     *            the first source {@code SingleSource}
      * @param source2
-     *            a second source Single
+     *            a second source {@code SingleSource}
      * @param source3
-     *            a third source Single
+     *            a third source {@code SingleSource}
      * @param source4
-     *            a fourth source Single
+     *            a fourth source {@code SingleSource}
      * @param source5
-     *            a fifth source Single
+     *            a fifth source {@code SingleSource}
      * @param source6
-     *            a sixth source Single
+     *            a sixth source {@code SingleSource}
      * @param source7
-     *            a seventh source Single
+     *            a seventh source {@code SingleSource}
      * @param zipper
-     *            a function that, when applied to the item emitted by each of the source Singles, results in an
-     *            item that will be emitted by the resulting Single
-     * @return a Single that emits the zipped results
+     *            a function that, when applied to the item emitted by each of the source {@code SingleSource}s, results in an
+     *            item that will be emitted by the resulting {@code Single}
+     * @return the new {@code Single} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3}, {@code source4}
+     *                              {@code source5}, {@code source6}, {@code source7} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1870,8 +1924,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(
     }
 
     /**
-     * Returns a Single that emits the results of a specified combiner function applied to eight items
-     * emitted by eight other Singles.
+     * Returns a {@code Single} that emits the results of a specified combiner function applied to eight items
+     * emitted by eight other {@link SingleSource}s.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
@@ -1879,35 +1933,37 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T1> the first source Single's value type
-     * @param <T2> the second source Single's value type
-     * @param <T3> the third source Single's value type
-     * @param <T4> the fourth source Single's value type
-     * @param <T5> the fifth source Single's value type
-     * @param <T6> the sixth source Single's value type
-     * @param <T7> the seventh source Single's value type
-     * @param <T8> the eighth source Single's value type
+     * @param <T1> the first source {@code SingleSource}'s value type
+     * @param <T2> the second source {@code SingleSource}'s value type
+     * @param <T3> the third source {@code SingleSource}'s value type
+     * @param <T4> the fourth source {@code SingleSource}'s value type
+     * @param <T5> the fifth source {@code SingleSource}'s value type
+     * @param <T6> the sixth source {@code SingleSource}'s value type
+     * @param <T7> the seventh source {@code SingleSource}'s value type
+     * @param <T8> the eighth source {@code SingleSource}'s value type
      * @param <R> the result value type
      * @param source1
-     *            the first source Single
+     *            the first source {@code SingleSource}
      * @param source2
-     *            a second source Single
+     *            a second source {@code SingleSource}
      * @param source3
-     *            a third source Single
+     *            a third source {@code SingleSource}
      * @param source4
-     *            a fourth source Single
+     *            a fourth source {@code SingleSource}
      * @param source5
-     *            a fifth source Single
+     *            a fifth source {@code SingleSource}
      * @param source6
-     *            a sixth source Single
+     *            a sixth source {@code SingleSource}
      * @param source7
-     *            a seventh source Single
+     *            a seventh source {@code SingleSource}
      * @param source8
-     *            an eighth source Single
+     *            an eighth source {@code SingleSource}
      * @param zipper
-     *            a function that, when applied to the item emitted by each of the source Singles, results in an
-     *            item that will be emitted by the resulting Single
-     * @return a Single that emits the zipped results
+     *            a function that, when applied to the item emitted by each of the source {@code SingleSource}s, results in an
+     *            item that will be emitted by the resulting {@code Single}
+     * @return the new {@code Single} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3}, {@code source4}
+     *                              {@code source5}, {@code source6}, {@code source7}, {@code source8} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1933,8 +1989,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(
     }
 
     /**
-     * Returns a Single that emits the results of a specified combiner function applied to nine items
-     * emitted by nine other Singles.
+     * Returns a {@code Single} that emits the results of a specified combiner function applied to nine items
+     * emitted by nine other {@link SingleSource}s.
      * <p>
      * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
@@ -1942,38 +1998,41 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T1> the first source Single's value type
-     * @param <T2> the second source Single's value type
-     * @param <T3> the third source Single's value type
-     * @param <T4> the fourth source Single's value type
-     * @param <T5> the fifth source Single's value type
-     * @param <T6> the sixth source Single's value type
-     * @param <T7> the seventh source Single's value type
-     * @param <T8> the eighth source Single's value type
-     * @param <T9> the ninth source Single's value type
+     * @param <T1> the first source {@code SingleSource}'s value type
+     * @param <T2> the second source {@code SingleSource}'s value type
+     * @param <T3> the third source {@code SingleSource}'s value type
+     * @param <T4> the fourth source {@code SingleSource}'s value type
+     * @param <T5> the fifth source {@code SingleSource}'s value type
+     * @param <T6> the sixth source {@code SingleSource}'s value type
+     * @param <T7> the seventh source {@code SingleSource}'s value type
+     * @param <T8> the eighth source {@code SingleSource}'s value type
+     * @param <T9> the ninth source {@code SingleSource}'s value type
      * @param <R> the result value type
      * @param source1
-     *            the first source Single
+     *            the first source {@code SingleSource}
      * @param source2
-     *            a second source Single
+     *            a second source {@code SingleSource}
      * @param source3
-     *            a third source Single
+     *            a third source {@code SingleSource}
      * @param source4
-     *            a fourth source Single
+     *            a fourth source {@code SingleSource}
      * @param source5
-     *            a fifth source Single
+     *            a fifth source {@code SingleSource}
      * @param source6
-     *            a sixth source Single
+     *            a sixth source {@code SingleSource}
      * @param source7
-     *            a seventh source Single
+     *            a seventh source {@code SingleSource}
      * @param source8
-     *            an eighth source Single
+     *            an eighth source {@code SingleSource}
      * @param source9
-     *            a ninth source Single
+     *            a ninth source {@code SingleSource}
      * @param zipper
-     *            a function that, when applied to the item emitted by each of the source Singles, results in an
-     *            item that will be emitted by the resulting Single
-     * @return a Single that emits the zipped results
+     *            a function that, when applied to the item emitted by each of the source {@code SingleSource}s, results in an
+     *            item that will be emitted by the resulting {@code Single}
+     * @return the new {@code Single} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3}, {@code source4}
+     *                              {@code source5}, {@code source6}, {@code source7}, {@code source8},
+     *                              {@code source9} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -2001,19 +2060,19 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(
     }
 
     /**
-     * Waits until all SingleSource sources provided via an array signal a success
+     * Waits until all {@link SingleSource} sources provided via an array signal a success
      * value and calls a zipper function with an array of these values to return a result
      * to be emitted to downstream.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zipArray.png" alt="">
      * <p>
-     * If the array of {@link SingleSource}s is empty a {@link NoSuchElementException} error is signalled immediately.
+     * If the array of {@code SingleSource}s is empty a {@link NoSuchElementException} error is signaled immediately.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
-     * If any of the SingleSources signal an error, all other SingleSources get disposed and the
+     * If any of the {@code SingleSource}s signal an error, all other {@code SingleSource}s get disposed and the
      * error emitted to downstream immediately.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -2021,11 +2080,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(
      * </dl>
      * @param <T> the common value type
      * @param <R> the result value type
-     * @param sources the array of SingleSource instances. An empty sequence will result in an
-     *                {@code onError} signal of {@link NoSuchElementException}.
-     * @param zipper the function that receives an array with values from each SingleSource
+     * @param sources the array of {@code SingleSource} instances. An empty sequence will result in an
+     *                {@code onError} signal of {@code NoSuchElementException}.
+     * @param zipper the function that receives an array with values from each {@code SingleSource}
      *               and should return a value to be emitted to downstream
-     * @return the new Single instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code zipper} or {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2042,16 +2102,17 @@ public static <T, R> Single<R> zipArray(@NonNull Function<? super Object[], ? ex
     }
 
     /**
-     * Signals the event of this or the other SingleSource whichever signals first.
+     * Signals the event of this or the other {@link SingleSource} whichever signals first.
      * <p>
      * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ambWith.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code ambWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param other the other SingleSource to race for the first emission of success or error
-     * @return the new Single instance. A subscription to this provided source will occur after subscribing
+     * @param other the other {@code SingleSource} to race for the first emission of success or error
+     * @return the new {@code Single} instance. A subscription to this provided source will occur after subscribing
      *            to the current source.
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2063,7 +2124,7 @@ public final Single<T> ambWith(@NonNull SingleSource<? extends T> other) {
     }
 
     /**
-     * Hides the identity of the current Single, including the Disposable that is sent
+     * Hides the identity of the current {@code Single}, including the {@link Disposable} that is sent
      * to the downstream via {@code onSubscribe()}.
      * <p>
      * <img width="640" height="458" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.hide.png" alt="">
@@ -2071,7 +2132,7 @@ public final Single<T> ambWith(@NonNull SingleSource<? extends T> other) {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code hide} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -2082,14 +2143,14 @@ public final Single<T> hide() {
     }
 
     /**
-     * Transform a Single by applying a particular Transformer function to it.
+     * Transform a {@code Single} by applying a particular {@link SingleTransformer} function to it.
      * <p>
      * <img width="640" height="612" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.compose.png" alt="">
      * <p>
-     * This method operates on the Single itself whereas {@link #lift} operates on the Single's SingleObservers.
+     * This method operates on the {@code Single} itself whereas {@link #lift} operates on {@link SingleObserver}s.
      * <p>
-     * If the operator you are creating is designed to act on the individual item emitted by a Single, use
-     * {@link #lift}. If your operator is designed to transform the source Single as a whole (for instance, by
+     * If the operator you are creating is designed to act on the individual item emitted by a {@code Single}, use
+     * {@link #lift}. If your operator is designed to transform the source {@code Single} as a whole (for instance, by
      * applying a particular set of existing RxJava operators to it) use {@code compose}.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -2097,8 +2158,9 @@ public final Single<T> hide() {
      * </dl>
      *
      * @param <R> the value type of the single returned by the transformer function
-     * @param transformer the transformer function, not null
-     * @return the source Single, transformed by the transformer function
+     * @param transformer the transformer function, not {@code null}
+     * @return a {@code Single} wrapped and returned by the transformer function
+     * @throws NullPointerException if {@code transformer} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
      */
     @SuppressWarnings("unchecked")
@@ -2110,17 +2172,17 @@ public final <R> Single<R> compose(@NonNull SingleTransformer<? super T, ? exten
     }
 
     /**
-     * Stores the success value or exception from the current Single and replays it to late SingleObservers.
+     * Stores the success value or exception from the current {@code Single} and replays it to late {@link SingleObserver}s.
      * <p>
      * <img width="640" height="363" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.cache.png" alt="">
      * <p>
-     * The returned Single subscribes to the current Single when the first SingleObserver subscribes.
+     * The returned {@code Single} subscribes to the current {@code Single} when the first {@code SingleObserver} subscribes.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code cache} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -2131,8 +2193,8 @@ public final Single<T> cache() {
     }
 
     /**
-     * Casts the success value of the current Single into the target type or signals a
-     * ClassCastException if not compatible.
+     * Casts the success value of the current {@code Single} into the target type or signals a
+     * {@link ClassCastException} if not compatible.
      * <p>
      * <img width="640" height="393" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.cast.png" alt="">
      * <dl>
@@ -2140,8 +2202,9 @@ public final Single<T> cache() {
      * <dd>{@code cast} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the target type
-     * @param clazz the type token to use for casting the success result from the current Single
-     * @return the new Single instance
+     * @param clazz the type token to use for casting the success result from the current {@code Single}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code clazz} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2153,8 +2216,8 @@ public final <U> Single<U> cast(@NonNull Class<? extends U> clazz) {
     }
 
     /**
-     * Returns a Flowable that emits the item emitted by the source Single, then the item emitted by the
-     * specified Single.
+     * Returns a {@link Flowable} that emits the item emitted by the source {@code Single}, then the item emitted by the
+     * specified {@link SingleSource}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatWith.png" alt="">
      * <dl>
@@ -2165,9 +2228,10 @@ public final <U> Single<U> cast(@NonNull Class<? extends U> clazz) {
      * </dl>
      *
      * @param other
-     *            a Single to be concatenated after the current
-     * @return a Flowable that emits the item emitted by the source Single, followed by the item emitted by
-     *         {@code t1}
+     *            a {@code SingleSource} to be concatenated after the current
+     * @return the new {@code Flowable} that emits the item emitted by the source {@code Single}, followed by the item emitted by
+     *         {@code other}
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2179,7 +2243,7 @@ public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
     }
 
     /**
-     * Delays the emission of the success signal from the current Single by the specified amount.
+     * Delays the emission of the success signal from the current {@code Single} by the specified amount.
      * An error signal will not be delayed.
      * <p>
      * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.png" alt="">
@@ -2190,8 +2254,9 @@ public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
      *
      * @param time the amount of time the success signal should be delayed for
      * @param unit the time unit
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 2.0
+     * @see #delay(long, TimeUnit, boolean)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
@@ -2201,7 +2266,7 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Delays the emission of the success or error signal from the current Single by the specified amount.
+     * Delays the emission of the success or error signal from the current {@code Single} by the specified amount.
      * <p>
      * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.e.png" alt="">
      * <dl>
@@ -2211,8 +2276,8 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit) {
      * <p>History: 2.1.5 - experimental
      * @param time the amount of time the success or error signal should be delayed for
      * @param unit the time unit
-     * @param delayError if true, both success and error signals are delayed. if false, only success signals are delayed.
-     * @return the new Single instance
+     * @param delayError if {@code true}, both success and error signals are delayed. if {@code false}, only success signals are delayed.
+     * @return the new {@code Single} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -2223,7 +2288,7 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit, boolean delayErr
     }
 
     /**
-     * Delays the emission of the success signal from the current Single by the specified amount.
+     * Delays the emission of the success signal from the current {@code Single} by the specified amount.
      * An error signal will not be delayed.
      * <p>
      * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.s.png" alt="">
@@ -2235,11 +2300,12 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit, boolean delayErr
      * @param time the amount of time the success signal should be delayed for
      * @param unit the time unit
      * @param scheduler the target scheduler to use for the non-blocking wait and emission
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @throws NullPointerException
-     *             if unit is null, or
-     *             if scheduler is null
+     *             if {@code unit} is {@code null}, or
+     *             if {@code scheduler} is {@code null}
      * @since 2.0
+     * @see #delay(long, TimeUnit, Scheduler, boolean)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
@@ -2249,7 +2315,7 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit, @NonNull Schedul
     }
 
     /**
-     * Delays the emission of the success or error signal from the current Single by the specified amount.
+     * Delays the emission of the success or error signal from the current {@code Single} by the specified amount.
      * <p>
      * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.se.png" alt="">
      * <dl>
@@ -2260,11 +2326,11 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit, @NonNull Schedul
      * @param time the amount of time the success or error signal should be delayed for
      * @param unit the time unit
      * @param scheduler the target scheduler to use for the non-blocking wait and emission
-     * @param delayError if true, both success and error signals are delayed. if false, only success signals are delayed.
-     * @return the new Single instance
+     * @param delayError if {@code true}, both success and error signals are delayed. if {@code false}, only success signals are delayed.
+     * @return the new {@code Single} instance
      * @throws NullPointerException
-     *             if unit is null, or
-     *             if scheduler is null
+     *             if {@code unit} is {@code null}, or
+     *             if {@code scheduler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -2277,19 +2343,20 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit, @NonNull Schedul
     }
 
     /**
-     * Delays the actual subscription to the current Single until the given other CompletableSource
+     * Delays the actual subscription to the current {@code Single} until the given other {@link CompletableSource}
      * completes.
      * <p>
      * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delaySubscription.c.png" alt="">
      * <p>If the delaying source signals an error, that error is re-emitted and no subscription
-     * to the current Single happens.
+     * to the current {@code Single} happens.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code delaySubscription} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param other the CompletableSource that has to complete before the subscription to the
-     *              current Single happens
-     * @return the new Single instance
+     * @param other the {@code CompletableSource} that has to complete before the subscription to the
+     *              current {@code Single} happens
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2301,20 +2368,21 @@ public final Single<T> delaySubscription(@NonNull CompletableSource other) {
     }
 
     /**
-     * Delays the actual subscription to the current Single until the given other SingleSource
+     * Delays the actual subscription to the current {@code Single} until the given other {@link SingleSource}
      * signals success.
      * <p>
      * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delaySubscription.s.png" alt="">
      * <p>If the delaying source signals an error, that error is re-emitted and no subscription
-     * to the current Single happens.
+     * to the current {@code Single} happens.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code delaySubscription} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the element type of the other source
-     * @param other the SingleSource that has to complete before the subscription to the
-     *              current Single happens
-     * @return the new Single instance
+     * @param other the {@code SingleSource} that has to complete before the subscription to the
+     *              current {@code Single} happens
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2326,20 +2394,21 @@ public final <U> Single<T> delaySubscription(@NonNull SingleSource<U> other) {
     }
 
     /**
-     * Delays the actual subscription to the current Single until the given other ObservableSource
+     * Delays the actual subscription to the current {@code Single} until the given other {@link ObservableSource}
      * signals its first value or completes.
      * <p>
      * <img width="640" height="214" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delaySubscription.o.png" alt="">
      * <p>If the delaying source signals an error, that error is re-emitted and no subscription
-     * to the current Single happens.
+     * to the current {@code Single} happens.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code delaySubscription} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the element type of the other source
-     * @param other the ObservableSource that has to signal a value or complete before the
-     *              subscription to the current Single happens
-     * @return the new Single instance
+     * @param other the {@code ObservableSource} that has to signal a value or complete before the
+     *              subscription to the current {@code Single} happens
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2351,12 +2420,12 @@ public final <U> Single<T> delaySubscription(@NonNull ObservableSource<U> other)
     }
 
     /**
-     * Delays the actual subscription to the current Single until the given other Publisher
+     * Delays the actual subscription to the current {@code Single} until the given other {@link Publisher}
      * signals its first value or completes.
      * <p>
      * <img width="640" height="214" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delaySubscription.p.png" alt="">
      * <p>If the delaying source signals an error, that error is re-emitted and no subscription
-     * to the current Single happens.
+     * to the current {@code Single} happens.
      * <p>The other source is consumed in an unbounded manner (requesting {@link Long#MAX_VALUE} from it).
      * <dl>
      * <dt><b>Backpressure:</b></dt>
@@ -2366,9 +2435,10 @@ public final <U> Single<T> delaySubscription(@NonNull ObservableSource<U> other)
      * <dd>{@code delaySubscription} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the element type of the other source
-     * @param other the Publisher that has to signal a value or complete before the
-     *              subscription to the current Single happens
-     * @return the new Single instance
+     * @param other the {@code Publisher} that has to signal a value or complete before the
+     *              subscription to the current {@code Single} happens
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2381,17 +2451,18 @@ public final <U> Single<T> delaySubscription(@NonNull Publisher<U> other) {
     }
 
     /**
-     * Delays the actual subscription to the current Single until the given time delay elapsed.
+     * Delays the actual subscription to the current {@code Single} until the given time delay elapsed.
      * <p>
      * <img width="640" height="472" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delaySubscription.t.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>{@code delaySubscription} does by default subscribe to the current Single
+     * <dd>{@code delaySubscription} does by default subscribe to the current {@code Single}
      * on the {@code computation} {@link Scheduler} after the delay.</dd>
      * </dl>
      * @param time the time amount to wait with the subscription
      * @param unit the time unit of the waiting
-     * @return the new Single instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2402,18 +2473,18 @@ public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Delays the actual subscription to the current Single until the given time delay elapsed.
+     * Delays the actual subscription to the current {@code Single} until the given time delay elapsed.
      * <p>
      * <img width="640" height="420" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delaySubscription.ts.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>{@code delaySubscription} does by default subscribe to the current Single
+     * <dd>{@code delaySubscription} does by default subscribe to the current {@code Single}
      * on the {@link Scheduler} you provided, after the delay.</dd>
      * </dl>
      * @param time the time amount to wait with the subscription
      * @param unit the time unit of the waiting
-     * @param scheduler the scheduler to wait on and subscribe on to the current Single
-     * @return the new Single instance
+     * @param scheduler the {@code Scheduler} to wait on and subscribe on to the current {@code Single}
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -2424,7 +2495,7 @@ public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit, @Non
     }
 
     /**
-     * Maps the {@link Notification} success value of this Single back into normal
+     * Maps the {@link Notification} success value of this {@code Single} back into normal
      * {@code onSuccess}, {@code onError} or {@code onComplete} signals as a
      * {@link Maybe} source.
      * <p>
@@ -2450,8 +2521,9 @@ public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit, @Non
      * <p>History: 2.2.4 - experimental
      * @param <R> the result type
      * @param selector the function called with the success item and should
-     * return a {@link Notification} instance.
-     * @return the new Maybe instance
+     * return a {@code Notification} instance.
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code selector} is {@code null}
      * @since 3.0.0
      * @see #materialize()
      */
@@ -2475,8 +2547,9 @@ public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit, @Non
      *  <dd>{@code doAfterSuccess} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.1 - experimental
-     * @param onAfterSuccess the Consumer that will be called after emitting an item from upstream to the downstream
-     * @return the new Single instance
+     * @param onAfterSuccess the {@link Consumer} that will be called after emitting an item from upstream to the downstream
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onAfterSuccess} is {@code null}
      * @since 2.1
      */
     @CheckReturnValue
@@ -2488,7 +2561,7 @@ public final Single<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSucces
     }
 
     /**
-     * Registers an {@link Action} to be called after this Single invokes either onSuccess or onError.
+     * Registers an {@link Action} to be called after this {@code Single} invokes either {@code onSuccess} or {@code onError}.
      * <p>
      * <img width="640" height="460" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doAfterTerminate.png" alt="">
      * <p>
@@ -2502,9 +2575,10 @@ public final Single<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSucces
      *
      * <p>History: 2.0.6 - experimental
      * @param onAfterTerminate
-     *            an {@link Action} to be invoked when the source Single finishes
-     * @return a Single that emits the same items as the source Single, then invokes the
-     *         {@link Action}
+     *            an {@code Action} to be invoked when the source {@code Single} finishes
+     * @return the new {@code Single} that emits the same items as the source {@code Single}, then invokes the
+     *         {@code Action}
+     * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @since 2.1
      */
@@ -2517,7 +2591,7 @@ public final Single<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
     }
 
     /**
-     * Calls the specified action after this Single signals onSuccess or onError or gets disposed by
+     * Calls the specified action after this {@code Single} signals {@code onSuccess} or {@code onError} or gets disposed by
      * the downstream.
      * <p>In case of a race between a terminal event and a dispose call, the provided {@code onFinally} action
      * is executed once per subscription.
@@ -2531,8 +2605,9 @@ public final Single<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
      *  <dd>{@code doFinally} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.1 - experimental
-     * @param onFinally the action called when this Single terminates or gets disposed
-     * @return the new Single instance
+     * @param onFinally the action called when this {@code Single} terminates or gets disposed
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onFinally} is {@code null}
      * @since 2.1
      */
     @CheckReturnValue
@@ -2544,8 +2619,8 @@ public final Single<T> doFinally(@NonNull Action onFinally) {
     }
 
     /**
-     * Calls the shared consumer with the Disposable sent through the onSubscribe for each
-     * SingleObserver that subscribes to the current Single.
+     * Calls the shared consumer with the {@link Disposable} sent through the {@code onSubscribe} for each
+     * {@link SingleObserver} that subscribes to the current {@code Single}.
      * <p>
      * <img width="640" height="347" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnSubscribe.png" alt="">
      * </p>
@@ -2553,8 +2628,9 @@ public final Single<T> doFinally(@NonNull Action onFinally) {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onSubscribe the consumer called with the Disposable sent via onSubscribe
-     * @return the new Single instance
+     * @param onSubscribe the consumer called with the {@code Disposable} sent via {@code onSubscribe}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2566,8 +2642,8 @@ public final Single<T> doOnSubscribe(@NonNull Consumer<? super Disposable> onSub
     }
 
     /**
-     * Returns a Single instance that calls the given onTerminate callback
-     * just before this Single completes normally or with an exception.
+     * Returns a {@code Single} instance that calls the given {@code onTerminate} callback
+     * just before this {@code Single} completes normally or with an exception.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.png" alt="">
      * <p>
@@ -2579,7 +2655,8 @@ public final Single<T> doOnSubscribe(@NonNull Consumer<? super Disposable> onSub
      * </dl>
      * <p>History: 2.2.7 - experimental
      * @param onTerminate the action to invoke when the consumer calls {@code onSuccess} or {@code onError}
-     * @return the new Single instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doOnTerminate(Action)
      * @since 3.0.0
@@ -2593,8 +2670,8 @@ public final Single<T> doOnTerminate(@NonNull Action onTerminate) {
     }
 
     /**
-     * Calls the shared consumer with the success value sent via onSuccess for each
-     * SingleObserver that subscribes to the current Single.
+     * Calls the shared consumer with the success value sent via {@code onSuccess} for each
+     * {@link SingleObserver} that subscribes to the current {@code Single}.
      * <p>
      * <img width="640" height="347" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnSuccess.2.png" alt="">
      * </p>
@@ -2602,8 +2679,9 @@ public final Single<T> doOnTerminate(@NonNull Action onTerminate) {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnSuccess} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onSuccess the consumer called with the success value of onSuccess
-     * @return the new Single instance
+     * @param onSuccess the consumer called with the success value of {@code onSuccess}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onSuccess} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2615,8 +2693,8 @@ public final Single<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
     }
 
     /**
-     * Calls the shared consumer with the error sent via onError or the value
-     * via onSuccess for each SingleObserver that subscribes to the current Single.
+     * Calls the shared consumer with the error sent via {@code onError} or the value
+     * via {@code onSuccess} for each {@link SingleObserver} that subscribes to the current {@code Single}.
      * <p>
      * <img width="640" height="264" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnEvent.png" alt="">
      * <dl>
@@ -2624,7 +2702,8 @@ public final Single<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
      * <dd>{@code doOnEvent} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param onEvent the consumer called with the success value of onEvent
-     * @return the new Single instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onEvent} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2636,8 +2715,8 @@ public final Single<T> doOnEvent(@NonNull BiConsumer<? super T, ? super Throwabl
     }
 
     /**
-     * Calls the shared consumer with the error sent via onError for each
-     * SingleObserver that subscribes to the current Single.
+     * Calls the shared consumer with the error sent via {@code onError} for each
+     * {@link SingleObserver} that subscribes to the current {@code Single}.
      * <p>
      * <img width="640" height="349" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnError.2.png" alt="">
      * </p>
@@ -2645,8 +2724,9 @@ public final Single<T> doOnEvent(@NonNull BiConsumer<? super T, ? super Throwabl
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onError the consumer called with the success value of onError
-     * @return the new Single instance
+     * @param onError the consumer called with the success value of {@code onError}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onError} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2658,8 +2738,8 @@ public final Single<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
     }
 
     /**
-     * Calls the shared {@code Action} if a SingleObserver subscribed to the current Single
-     * disposes the common Disposable it received via onSubscribe.
+     * Calls the shared {@link Action} if a {@link SingleObserver} subscribed to the current {@code Single}
+     * disposes the common {@link Disposable} it received via {@code onSubscribe}.
      * <p>
      * <img width="640" height="332" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnDispose.png" alt="">
      * </p>
@@ -2668,8 +2748,8 @@ public final Single<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
      * <dd>{@code doOnDispose} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param onDispose the action called when the subscription is disposed
-     * @return the new Single instance
-     * @throws NullPointerException if onDispose is null
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onDispose} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2681,8 +2761,8 @@ public final Single<T> doOnDispose(@NonNull Action onDispose) {
     }
 
     /**
-     * Filters the success item of the Single via a predicate function and emitting it if the predicate
-     * returns true, completing otherwise.
+     * Filters the success item of the {@code Single} via a predicate function and emitting it if the predicate
+     * returns {@code true}, completing otherwise.
      * <p>
      * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.filter.png" alt="">
      * <dl>
@@ -2691,10 +2771,11 @@ public final Single<T> doOnDispose(@NonNull Action onDispose) {
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates the item emitted by the source Maybe, returning {@code true}
+     *            a function that evaluates the item emitted by the source {@code Single}, returning {@code true}
      *            if it passes the filter
-     * @return a Maybe that emit the item emitted by the source Maybe that the filter
+     * @return the new {@link Maybe} that emit the item emitted by the source {@code Single} that the filter
      *         evaluates as {@code true}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
     @CheckReturnValue
@@ -2706,8 +2787,8 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns a Single that is based on applying a specified function to the item emitted by the source Single,
-     * where that function returns a SingleSource.
+     * Returns a {@code Single} that is based on applying a specified function to the item emitted by the source {@code Single},
+     * where that function returns a {@link SingleSource}.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMap.png" alt="">
      * <dl>
@@ -2717,8 +2798,9 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Single, returns a SingleSource
-     * @return the Single returned from {@code mapper} when applied to the item emitted by the source Single
+     *            a function that, when applied to the item emitted by the source {@code Single}, returns a {@code SingleSource}
+     * @return the new {@code Single} returned from {@code mapper} when applied to the item emitted by the source {@code Single}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -2730,8 +2812,8 @@ public final <R> Single<R> flatMap(@NonNull Function<? super T, ? extends Single
     }
 
     /**
-     * Returns a Maybe that is based on applying a specified function to the item emitted by the source Single,
-     * where that function returns a MaybeSource.
+     * Returns a {@link Maybe} that is based on applying a specified function to the item emitted by the source {@code Single},
+     * where that function returns a {@link MaybeSource}.
      * <p>
      * <img width="640" height="191" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapMaybe.png" alt="">
      * <dl>
@@ -2741,8 +2823,9 @@ public final <R> Single<R> flatMap(@NonNull Function<? super T, ? extends Single
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Single, returns a MaybeSource
-     * @return the Maybe returned from {@code mapper} when applied to the item emitted by the source Single
+     *            a function that, when applied to the item emitted by the source {@code Single}, returns a {@code MaybeSource}
+     * @return the new {@code Maybe} returned from {@code mapper} when applied to the item emitted by the source {@code Single}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -2754,8 +2837,8 @@ public final <R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends Ma
     }
 
     /**
-     * Returns a Flowable that emits items based on applying a specified function to the item emitted by the
-     * source Single, where that function returns a Publisher.
+     * Returns a {@link Flowable} that emits items based on applying a specified function to the item emitted by the
+     * source {@code Single}, where that function returns a {@link Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapPublisher.png" alt="">
      * <dl>
@@ -2768,9 +2851,10 @@ public final <R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends Ma
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Single, returns a
-     *            Flowable
-     * @return the Flowable returned from {@code func} when applied to the item emitted by the source Single
+     *            a function that, when applied to the item emitted by the source {@code Single}, returns a
+     *            {@code Publisher}
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2783,7 +2867,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
     }
 
     /**
-     * Maps the success value of the upstream {@link Single} into an {@link Iterable} and emits its items as a
+     * Maps the success value of the upstream {@code Single} into an {@link Iterable} and emits its items as a
      * {@link Flowable} sequence.
      * <p>
      * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenAsFlowable.png" alt="">
@@ -2795,11 +2879,12 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting Iterable
+     *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source Single
-     * @return the new Flowable instance
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code Single}
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #flattenStreamAsFlowable(Function)
      */
@@ -2813,7 +2898,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Maps the success value of the upstream {@link Single} into an {@link Iterable} and emits its items as an
+     * Maps the success value of the upstream {@code Single} into an {@link Iterable} and emits its items as an
      * {@link Observable} sequence.
      * <p>
      * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenAsObservable.png" alt="">
@@ -2823,11 +2908,12 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting Iterable
+     *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source Single
-     * @return the new Observable instance
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code Single}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #flattenStreamAsObservable(Function)
      */
@@ -2840,8 +2926,8 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Returns an Observable that is based on applying a specified function to the item emitted by the source Single,
-     * where that function returns an ObservableSource.
+     * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the source {@code Single},
+     * where that function returns an {@link ObservableSource}.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapObservable.png" alt="">
      * <dl>
@@ -2851,8 +2937,9 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Single, returns an ObservableSource
-     * @return the Observable returned from {@code func} when applied to the item emitted by the source Single
+     *            a function that, when applied to the item emitted by the source {@code Single}, returns an {@code ObservableSource}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -2865,7 +2952,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
 
     /**
      * Returns a {@link Completable} that completes based on applying a specified function to the item emitted by the
-     * source {@link Single}, where that function returns a {@link Completable}.
+     * source {@code Single}, where that function returns a {@link CompletableSource}.
      * <p>
      * <img width="640" height="267" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapCompletable.png" alt="">
      * <dl>
@@ -2874,9 +2961,10 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      * </dl>
      *
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Single, returns a
-     *            Completable
-     * @return the Completable returned from {@code func} when applied to the item emitted by the source Single
+     *            a function that, when applied to the item emitted by the source {@code Single}, returns a
+     *            {@code CompletableSource}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -2889,7 +2977,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Waits in a blocking fashion until the current Single signals a success value (which is returned) or
+     * Waits in a blocking fashion until the current {@code Single} signals a success value (which is returned) or
      * an exception (which is propagated).
      * <p>
      * <img width="640" height="429" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.blockingGet.png" alt="">
@@ -3035,23 +3123,24 @@ public final T blockingGet() {
      * class and creating a {@link SingleTransformer} with it is recommended.
      * <p>
      * Note also that it is not possible to stop the subscription phase in {@code lift()} as the {@code apply()} method
-     * requires a non-null {@code SingleObserver} instance to be returned, which is then unconditionally subscribed to
+     * requires a non-{@code null} {@code SingleObserver} instance to be returned, which is then unconditionally subscribed to
      * the upstream {@code Single}. For example, if the operator decided there is no reason to subscribe to the
      * upstream source because of some optimization possibility or a failure to prepare the operator, it still has to
-     * return a {@code SingleObserver} that should immediately dispose the upstream's {@code Disposable} in its
+     * return a {@code SingleObserver} that should immediately dispose the upstream's {@link Disposable} in its
      * {@code onSubscribe} method. Again, using a {@code SingleTransformer} and extending the {@code Single} is
      * a better option as {@link #subscribeActual} can decide to not subscribe to its upstream after all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lift} does not operate by default on a particular {@link Scheduler}, however, the
-     *  {@link SingleOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
+     *  {@code SingleOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
      * </dl>
      *
      * @param <R> the output value type
-     * @param lift the {@link SingleOperator} that receives the downstream's {@code SingleObserver} and should return
+     * @param lift the {@code SingleOperator} that receives the downstream's {@code SingleObserver} and should return
      *               a {@code SingleObserver} with custom behavior to be used as the consumer for the current
      *               {@code Single}.
-     * @return the new Single instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code lift} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Writing-operators-for-2.0">RxJava wiki: Writing operators</a>
      * @see #compose(SingleTransformer)
      */
@@ -3064,7 +3153,7 @@ public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T>
     }
 
     /**
-     * Returns a Single that applies a specified function to the item emitted by the source Single and
+     * Returns a {@code Single} that applies a specified function to the item emitted by the source {@code Single} and
      * emits the result of this function application.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.map.png" alt="">
@@ -3075,8 +3164,9 @@ public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T>
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function to apply to the item emitted by the Single
-     * @return a Single that emits the item from the source Single, transformed by the specified function
+     *            a function to apply to the item emitted by the {@code Single}
+     * @return the new {@code Single} that emits the item from the source {@code Single}, transformed by the specified function
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
     @CheckReturnValue
@@ -3088,7 +3178,7 @@ public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T>
     }
 
     /**
-     * Maps the signal types of this Single into a {@link Notification} of the same kind
+     * Maps the signal types of this {@code Single} into a {@link Notification} of the same kind
      * and emits it as a single success value to downstream.
      * <p>
      * <img width="640" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
@@ -3097,7 +3187,7 @@ public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T>
      * <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.2.4 - experimental
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 3.0.0
      * @see #dematerialize(Function)
      */
@@ -3109,7 +3199,7 @@ public final Single<Notification<T>> materialize() {
     }
 
     /**
-     * Signals true if the current Single signals a success value that is Object-equals with the value
+     * Signals {@code true} if the current {@code Single} signals a success value that is {@link Object#equals(Object)} with the value
      * provided.
      * <p>
      * <img width="640" height="400" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.contains.png" alt="">
@@ -3119,8 +3209,8 @@ public final Single<Notification<T>> materialize() {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code contains} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param value the value to compare against the success value of this Single
-     * @return the new Single instance
+     * @param value the value to compare against the success value of this {@code Single}
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -3131,18 +3221,19 @@ public final Single<Boolean> contains(@NonNull Object value) {
     }
 
     /**
-     * Signals true if the current Single signals a success value that is equal with
-     * the value provided by calling a bi-predicate.
+     * Signals {@code true} if the current {@code Single} signals a success value that is equal with
+     * the value provided by calling a {@link BiPredicate}.
      * <p>
      * <img width="640" height="401" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.contains.f.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code contains} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param value the value to compare against the success value of this Single
-     * @param comparer the function that receives the success value of this Single, the value provided
-     *                 and should return true if they are considered equal
-     * @return the new Single instance
+     * @param value the value to compare against the success value of this {@code Single}
+     * @param comparer the function that receives the success value of this {@code Single}, the value provided
+     *                 and should return {@code true} if they are considered equal
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code value} or {@code comparer} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -3155,11 +3246,11 @@ public final Single<Boolean> contains(@NonNull Object value, @NonNull BiPredicat
     }
 
     /**
-     * Flattens this and another Single into a single Flowable, without any transformation.
+     * Flattens this {@code Single} and another {@link SingleSource} into one {@link Flowable}, without any transformation.
      * <p>
      * <img width="640" height="415" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeWith.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Singles so that they appear as a single Flowable, by using
+     * You can combine items emitted by multiple {@code SingleSource}s so that they appear as one {@code Flowable}, by using
      * the {@code mergeWith} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -3169,8 +3260,9 @@ public final Single<Boolean> contains(@NonNull Object value, @NonNull BiPredicat
      * </dl>
      *
      * @param other
-     *            a SingleSource to be merged
-     * @return  that emits all of the items emitted by the source Singles
+     *            a {@code SingleSource} to be merged
+     * @return  that emits all of the items emitted by the source {@code Single}s
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3182,20 +3274,20 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
     }
 
     /**
-     * Modifies a Single to emit its item (or notify of its error) on a specified {@link Scheduler},
+     * Modifies a {@code Single} to emit its item (or notify of its error) on a specified {@link Scheduler},
      * asynchronously.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.observeOn.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>you specify which {@link Scheduler} this operator will use.</dd>
+     * <dd>you specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to notify subscribers on
-     * @return the source Single modified so that its subscribers are notified on the specified
-     *         {@link Scheduler}
-     * @throws NullPointerException if scheduler is null
+     *            the {@code Scheduler} to notify subscribers on
+     * @return the source {@code Single} modified so that its subscribers are notified on the specified
+     *         {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -3209,16 +3301,16 @@ public final Single<T> observeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Instructs a Single to emit an item (returned by a specified function) rather than invoking
+     * Instructs a {@code Single} to emit an item (returned by a specified function) rather than invoking
      * {@link SingleObserver#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturn.png" alt="">
      * <p>
-     * By default, when a Single encounters an error that prevents it from emitting the expected item to its
-     * subscriber, the Single invokes its subscriber's {@link SingleObserver#onError} method, and then quits
-     * without invoking any more of its subscriber's methods. The {@code onErrorReturn} method changes this
-     * behavior. If you pass a function ({@code resumeFunction}) to a Single's {@code onErrorReturn} method, if
-     * the original Single encounters an error, instead of invoking its subscriber's
+     * By default, when a {@code Single} encounters an error that prevents it from emitting the expected item to its
+     * subscriber, the {@code Single} invokes its subscriber's {@link SingleObserver#onError} method, and then quits
+     * without invoking any more of its observer's methods. The {@code onErrorReturn} method changes this
+     * behavior. If you pass a function ({@code resumeFunction}) to a {@code Single}'s {@code onErrorReturn} method, if
+     * the original {@code Single} encounters an error, instead of invoking its observer's
      * {@link SingleObserver#onError} method, it will instead emit the return value of {@code resumeFunction}.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -3229,9 +3321,10 @@ public final Single<T> observeOn(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param resumeFunction
-     *            a function that returns an item that the new Single will emit if the source Single encounters
+     *            a function that returns an item that the new {@code Single} will emit if the source {@code Single} encounters
      *            an error
-     * @return the original Single with appropriately modified behavior
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code resumeFunction} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -3243,15 +3336,16 @@ public final Single<T> onErrorReturn(@NonNull Function<Throwable, ? extends T> r
     }
 
     /**
-     * Signals the specified value as success in case the current Single signals an error.
+     * Signals the specified value as success in case the current {@code Single} signals an error.
      * <p>
      * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturnItem.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code onErrorReturnItem} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param value the value to signal if the current Single fails
-     * @return the new Single instance
+     * @param value the value to signal if the current {@code Single} fails
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code value} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -3263,19 +3357,19 @@ public final Single<T> onErrorReturnItem(@NonNull T value) {
     }
 
     /**
-     * Instructs a Single to pass control to another Single rather than invoking
+     * Instructs a {@code Single} to pass control to another {@code Single} rather than invoking
      * {@link SingleObserver#onError(Throwable)} if it encounters an error.
      * <p>
      * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeWith.png" alt="">
      * <p>
-     * By default, when a Single encounters an error that prevents it from emitting the expected item to
-     * its {@link SingleObserver}, the Single invokes its SingleObserver's {@code onError} method, and then quits
-     * without invoking any more of its SingleObserver's methods. The {@code onErrorResumeWith} method changes this
-     * behavior. If you pass another Single ({@code resumeSingleInCaseOfError}) to a Single's
-     * {@code onErrorResumeWith} method, if the original Single encounters an error, instead of invoking its
-     * SingleObserver's {@code onError} method, it will instead relinquish control to {@code resumeSingleInCaseOfError} which
-     * will invoke the SingleObserver's {@link SingleObserver#onSuccess onSuccess} method if it is able to do so. In such a case,
-     * because no Single necessarily invokes {@code onError}, the SingleObserver may never know that an error
+     * By default, when a {@code Single} encounters an error that prevents it from emitting the expected item to
+     * its {@link SingleObserver}, the {@code Single} invokes its {@code SingleObserver}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code SingleObserver}'s methods. The {@code onErrorResumeWith} method changes this
+     * behavior. If you pass another {@code Single} ({@code resumeSingleInCaseOfError}) to a {@code Single}'s
+     * {@code onErrorResumeWith} method, if the original {@code Single} encounters an error, instead of invoking its
+     * {@code SingleObserver}'s {@code onError} method, it will instead relinquish control to {@code resumeSingleInCaseOfError} which
+     * will invoke the {@code SingleObserver}'s {@link SingleObserver#onSuccess onSuccess} method if it is able to do so. In such a case,
+     * because no {@code Single} necessarily invokes {@code onError}, the {@code SingleObserver} may never know that an error
      * happened.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -3285,32 +3379,33 @@ public final Single<T> onErrorReturnItem(@NonNull T value) {
      * <dd>{@code onErrorResumeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param resumeSingleInCaseOfError a Single that will take control if source Single encounters an error.
-     * @return the original Single, with appropriately modified behavior.
+     * @param fallback a {@code Single} that will take control if source {@code Single} encounters an error.
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> onErrorResumeWith(@NonNull SingleSource<? extends T> resumeSingleInCaseOfError) {
-        Objects.requireNonNull(resumeSingleInCaseOfError, "resumeSingleInCaseOfError is null");
-        return onErrorResumeNext(Functions.justFunction(resumeSingleInCaseOfError));
+    public final Single<T> onErrorResumeWith(@NonNull SingleSource<? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return onErrorResumeNext(Functions.justFunction(fallback));
     }
 
     /**
-     * Instructs a Single to pass control to another Single rather than invoking
+     * Instructs a {@code Single} to pass control to another {@code Single} rather than invoking
      * {@link SingleObserver#onError(Throwable)} if it encounters an error.
      * <p>
      * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeNext.f.png" alt="">
      * <p>
-     * By default, when a Single encounters an error that prevents it from emitting the expected item to
-     * its {@link SingleObserver}, the Single invokes its SingleObserver's {@code onError} method, and then quits
-     * without invoking any more of its SingleObserver's methods. The {@code onErrorResumeNext} method changes this
-     * behavior. If you pass a function that will return another Single ({@code resumeFunctionInCaseOfError}) to a Single's
-     * {@code onErrorResumeNext} method, if the original Single encounters an error, instead of invoking its
-     * SingleObserver's {@code onError} method, it will instead relinquish control to {@code resumeSingleInCaseOfError} which
-     * will invoke the SingleObserver's {@link SingleObserver#onSuccess onSuccess} method if it is able to do so. In such a case,
-     * because no Single necessarily invokes {@code onError}, the SingleObserver may never know that an error
+     * By default, when a {@code Single} encounters an error that prevents it from emitting the expected item to
+     * its {@link SingleObserver}, the {@code Single} invokes its {@code SingleObserver}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code SingleObserver}'s methods. The {@code onErrorResumeNext} method changes this
+     * behavior. If you pass a function that will return another {@code Single} ({@code resumeFunctionInCaseOfError}) to a {@code Single}'s
+     * {@code onErrorResumeNext} method, if the original {@code Single} encounters an error, instead of invoking its
+     * {@code SingleObserver}'s {@code onError} method, it will instead relinquish control to {@code resumeSingleInCaseOfError} which
+     * will invoke the {@code SingleObserver}'s {@link SingleObserver#onSuccess onSuccess} method if it is able to do so. In such a case,
+     * because no {@code Single} necessarily invokes {@code onError}, the {@code SingleObserver} may never know that an error
      * happened.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -3320,8 +3415,9 @@ public final Single<T> onErrorResumeWith(@NonNull SingleSource<? extends T> resu
      * <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param resumeFunctionInCaseOfError a function that returns a Single that will take control if source Single encounters an error.
-     * @return the original Single, with appropriately modified behavior.
+     * @param fallback a function that returns a {@code Single} that will take control if source {@code Single} encounters an error.
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      * @since .20
      */
@@ -3329,14 +3425,14 @@ public final Single<T> onErrorResumeWith(@NonNull SingleSource<? extends T> resu
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> onErrorResumeNext(
-            @NonNull Function<? super Throwable, ? extends SingleSource<? extends T>> resumeFunctionInCaseOfError) {
-        Objects.requireNonNull(resumeFunctionInCaseOfError, "resumeFunctionInCaseOfError is null");
-        return RxJavaPlugins.onAssembly(new SingleResumeNext<>(this, resumeFunctionInCaseOfError));
+            @NonNull Function<? super Throwable, ? extends SingleSource<? extends T>> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return RxJavaPlugins.onAssembly(new SingleResumeNext<>(this, fallback));
     }
 
     /**
-     * Nulls out references to the upstream producer and downstream SingleObserver if
-     * the sequence is terminated or downstream calls dispose().
+     * Nulls out references to the upstream producer and downstream {@link SingleObserver} if
+     * the sequence is terminated or downstream calls {@code dispose()}.
      * <p>
      * <img width="640" height="346" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onTerminateDetach.png" alt="">
      * <dl>
@@ -3344,8 +3440,8 @@ public final Single<T> onErrorResumeNext(
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.5 - experimental
-     * @return a Single which nulls out references to the upstream producer and downstream SingleObserver if
-     * the sequence is terminated or downstream calls dispose()
+     * @return the new {@code Single} which {@code null}s out references to the upstream producer and downstream {@code SingleObserver} if
+     * the sequence is terminated or downstream calls {@code dispose()}
      * @since 2.2
      */
     @CheckReturnValue
@@ -3356,7 +3452,7 @@ public final Single<T> onTerminateDetach() {
     }
 
     /**
-     * Repeatedly re-subscribes to the current Single and emits each success value.
+     * Repeatedly re-subscribes to the current {@code Single} and emits each success value as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.png" alt="">
      * <dl>
@@ -3365,7 +3461,7 @@ public final Single<T> onTerminateDetach() {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3377,7 +3473,7 @@ public final Flowable<T> repeat() {
     }
 
     /**
-     * Re-subscribes to the current Single at most the given number of times and emits each success value.
+     * Re-subscribes to the current {@code Single} at most the given number of times and emits each success value as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.n.png" alt="">
      * <dl>
@@ -3386,8 +3482,8 @@ public final Flowable<T> repeat() {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param times the number of times to re-subscribe to the current Single
-     * @return the new Flowable instance
+     * @param times the number of times to re-subscribe to the current {@code Single}
+     * @return the new {@code Flowable} instance
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3399,9 +3495,9 @@ public final Flowable<T> repeat(long times) {
     }
 
     /**
-     * Re-subscribes to the current Single if
-     * the Publisher returned by the handler function signals a value in response to a
-     * value signalled through the Flowable the handle receives.
+     * Re-subscribes to the current {@code Single} if
+     * the {@link Publisher} returned by the handler function signals a value in response to a
+     * value signaled through the {@link Flowable} the handler receives.
      * <p>
      * <img width="640" height="1478" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeatWhen.png" alt="">
      * <dl>
@@ -3411,11 +3507,11 @@ public final Flowable<T> repeat(long times) {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code repeatWhen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param handler the function that is called with a Flowable that signals a value when the Single
-     *                signalled a success value and returns a Publisher that has to signal a value to
-     *                trigger a resubscription to the current Single, otherwise the terminal signal of
-     *                the Publisher will be the terminal signal of the sequence as well.
-     * @return the new Flowable instance
+     * @param handler the function that is called with a {@code Flowable} that signals a value when the {@code Single}
+     *                signaled a success value and returns a {@code Publisher} that has to signal a value to
+     *                trigger a resubscription to the current {@code Single}, otherwise the terminal signal of
+     *                the {@code Publisher} will be the terminal signal of the sequence as well.
+     * @return the new {@code Flowable} instance
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3427,7 +3523,8 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
     }
 
     /**
-     * Re-subscribes to the current Single until the given BooleanSupplier returns true.
+     * Re-subscribes to the current {@code Single} until the given {@link BooleanSupplier} returns {@code true}
+     * and emits the success items as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeatUntil.png" alt="">
      * <dl>
@@ -3436,9 +3533,9 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code repeatUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param stop the BooleanSupplier called after the current Single succeeds and if returns false,
-     *             the Single is re-subscribed; otherwise the sequence completes.
-     * @return the new Flowable instance
+     * @param stop the {@code BooleanSupplier} called after the current {@code Single} succeeds and if returns {@code false},
+     *             the {@code Single} is re-subscribed; otherwise the sequence completes.
+     * @return the new {@code Flowable} instance
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3450,14 +3547,14 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Repeatedly re-subscribes to the current Single indefinitely if it fails with an onError.
+     * Repeatedly re-subscribes to the current {@code Single} indefinitely if it fails with an {@code onError}.
      * <p>
      * <img width="640" height="399" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.retry.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -3468,16 +3565,16 @@ public final Single<T> retry() {
     }
 
     /**
-     * Repeatedly re-subscribe at most the specified times to the current Single
-     * if it fails with an onError.
+     * Repeatedly re-subscribe at most the specified times to the current {@code Single}
+     * if it fails with an {@code onError}.
      * <p>
      * <img width="640" height="329" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.retry.n.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param times the number of times to resubscribe if the current Single fails
-     * @return the new Single instance
+     * @param times the number of times to resubscribe if the current {@code Single} fails
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -3488,17 +3585,17 @@ public final Single<T> retry(long times) {
     }
 
     /**
-     * Re-subscribe to the current Single if the given predicate returns true when the Single fails
-     * with an onError.
+     * Re-subscribe to the current {@code Single} if the given predicate returns {@code true} when the {@code Single} fails
+     * with an {@code onError}.
      * <p>
      * <img width="640" height="230" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.retry.f2.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param predicate the predicate called with the resubscription count and the failure Throwable
-     *                  and should return true if a resubscription should happen
-     * @return the new Single instance
+     * @param predicate the predicate called with the resubscription count and the failure {@link Throwable}
+     *                  and should return {@code true} if a resubscription should happen
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -3509,8 +3606,8 @@ public final Single<T> retry(@NonNull BiPredicate<? super Integer, ? super Throw
     }
 
     /**
-     * Repeatedly re-subscribe at most times or until the predicate returns false, whichever happens first
-     * if it fails with an onError.
+     * Repeatedly re-subscribe at most times or until the predicate returns {@code false}, whichever happens first
+     * if it fails with an {@code onError}.
      * <p>
      * <img width="640" height="259" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.retry.nf.png" alt="">
      * <dl>
@@ -3518,10 +3615,10 @@ public final Single<T> retry(@NonNull BiPredicate<? super Integer, ? super Throw
      * <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.8 - experimental
-     * @param times the number of times to resubscribe if the current Single fails
-     * @param predicate the predicate called with the failure Throwable
-     *                  and should return true if a resubscription should happen
-     * @return the new Single instance
+     * @param times the number of times to resubscribe if the current {@code Single} fails
+     * @param predicate the predicate called with the failure {@link Throwable}
+     *                  and should return {@code true} if a resubscription should happen
+     * @return the new {@code Single} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -3532,17 +3629,17 @@ public final Single<T> retry(long times, @NonNull Predicate<? super Throwable> p
     }
 
     /**
-     * Re-subscribe to the current Single if the given predicate returns true when the Single fails
-     * with an onError.
+     * Re-subscribe to the current {@code Single} if the given predicate returns {@code true} when the {@code Single} fails
+     * with an {@code onError}.
      * <p>
      * <img width="640" height="240" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.retry.f.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param predicate the predicate called with the failure Throwable
-     *                  and should return true if a resubscription should happen
-     * @return the new Single instance
+     * @param predicate the predicate called with the failure {@link Throwable}
+     *                  and should return {@code true} if a resubscription should happen
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -3553,17 +3650,17 @@ public final Single<T> retry(@NonNull Predicate<? super Throwable> predicate) {
     }
 
     /**
-     * Re-subscribes to the current Single if and when the Publisher returned by the handler
+     * Re-subscribes to the current {@code Single} if and when the {@link Publisher} returned by the handler
      * function signals a value.
      * <p>
      * <img width="640" height="405" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.retryWhen.png" alt="">
      * <p>
-     * If the Publisher signals an {@code onComplete}, the resulting {@code Single} will signal a {@link NoSuchElementException}.
+     * If the {@code Publisher} signals an {@code onComplete}, the resulting {@code Single} will signal a {@link NoSuchElementException}.
      * <p>
      * Note that the inner {@code Publisher} returned by the handler function should signal
      * either {@code onNext}, {@code onError} or {@code onComplete} in response to the received
-     * {@code Throwable} to indicate the operator should retry or terminate. If the upstream to
-     * the operator is asynchronous, signaling onNext followed by onComplete immediately may
+     * {@link Throwable} to indicate the operator should retry or terminate. If the upstream to
+     * the operator is asynchronous, signaling {@code onNext} followed by {@code onComplete} immediately may
      * result in the sequence to be completed immediately. Similarly, if this inner
      * {@code Publisher} signals {@code onError} or {@code onComplete} while the upstream is
      * active, the sequence is terminated with the same signal immediately.
@@ -3589,11 +3686,11 @@ public final Single<T> retry(@NonNull Predicate<? super Throwable> predicate) {
      * <dd>{@code retryWhen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param handler the function that receives a Flowable of the error the Single emits and should
-     *                return a Publisher that should signal a normal value (in response to the
-     *                throwable the Flowable emits) to trigger a resubscription or signal an error to
-     *                be the output of the resulting Single
-     * @return the new Single instance
+     * @param handler the function that receives a {@link Flowable} of the error the {@code Single} emits and should
+     *                return a {@code Publisher} that should signal a normal value (in response to the
+     *                throwable the {@code Flowable} emits) to trigger a resubscription or signal an error to
+     *                be the output of the resulting {@code Single}
+     * @return the new {@code Single} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3603,13 +3700,13 @@ public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>,
     }
 
     /**
-     * Subscribes to a Single but ignore its emission or notification.
+     * Subscribes to a {@code Single} but ignore its emission or notification.
      * <p>
      * <img width="640" height="340" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.subscribe.png" alt="">
      * <p>
-     * If the Single emits an error, it is wrapped into an
+     * If the {@code Single} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3625,7 +3722,7 @@ public final Disposable subscribe() {
     }
 
     /**
-     * Subscribes to a Single and provides a composite callback to handle the item it emits
+     * Subscribes to a {@code Single} and provides a composite callback to handle the item it emits
      * or any error notification it issues.
      * <p>
      * <img width="640" height="340" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.subscribe.c2.png" alt="">
@@ -3635,12 +3732,12 @@ public final Disposable subscribe() {
      * </dl>
      *
      * @param onCallback
-     *            the callback that receives either the success value or the failure Throwable
-     *            (whichever is not null)
+     *            the callback that receives either the success value or the failure {@link Throwable}
+     *            (whichever is not {@code null})
      * @return a {@link Disposable} reference can request the {@link Single} stop work.
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
-     *             if {@code onCallback} is null
+     *             if {@code onCallback} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -3654,23 +3751,23 @@ public final Disposable subscribe(@NonNull BiConsumer<? super T, ? super Throwab
     }
 
     /**
-     * Subscribes to a Single and provides a callback to handle the item it emits.
+     * Subscribes to a {@code Single} and provides a callback to handle the item it emits.
      * <p>
      * <img width="640" height="341" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.subscribe.c.png" alt="">
      * <p>
-     * If the Single emits an error, it is wrapped into an
+     * If the {@code Single} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onSuccess
-     *            the {@code Consumer<T>} you have designed to accept the emission from the Single
+     *            the {@code Consumer<T>} you have designed to accept the emission from the {@code Single}
      * @return a {@link Disposable} reference can request the {@link Single} stop work.
      * @throws NullPointerException
-     *             if {@code onSuccess} is null
+     *             if {@code onSuccess} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -3681,7 +3778,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
     }
 
     /**
-     * Subscribes to a Single and provides callbacks to handle the item it emits or any error notification it
+     * Subscribes to a {@code Single} and provides callbacks to handle the item it emits or any error notification it
      * issues.
      * <p>
      * <img width="640" height="340" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.subscribe.cc.png" alt="">
@@ -3691,15 +3788,14 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
      * </dl>
      *
      * @param onSuccess
-     *            the {@code Consumer<T>} you have designed to accept the emission from the Single
+     *            the {@code Consumer<T>} you have designed to accept the emission from the {@code Single}
      * @param onError
      *            the {@code Consumer<Throwable>} you have designed to accept any error notification from the
-     *            Single
+     *            {@code Single}
      * @return a {@link Disposable} reference can request the {@link Single} stop work.
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
-     *             if {@code onSuccess} is null, or
-     *             if {@code onError} is null
+     *             if {@code onSuccess} or {@code onError} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -3739,13 +3835,13 @@ public final void subscribe(@NonNull SingleObserver<? super T> observer) {
      * <p>There is no need to call any of the plugin hooks on the current {@code Single} instance or
      * the {@code SingleObserver}; all hooks and basic safeguards have been
      * applied by {@link #subscribe(SingleObserver)} before this method gets called.
-     * @param observer the SingleObserver to handle, not null
+     * @param observer the {@code SingleObserver} to handle, not {@code null}
      */
     protected abstract void subscribeActual(@NonNull SingleObserver<? super T> observer);
 
     /**
-     * Subscribes a given SingleObserver (subclass) to this Single and returns the given
-     * SingleObserver as is.
+     * Subscribes a given {@link SingleObserver} (subclass) to this {@code Single} and returns the given
+     * {@code SingleObserver} as is.
      * <p>
      * <img width="640" height="338" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.subscribeWith.png" alt="">
      * <p>Usage example:
@@ -3763,10 +3859,10 @@ public final void subscribe(@NonNull SingleObserver<? super T> observer) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <E> the type of the SingleObserver to use and return
-     * @param observer the SingleObserver (subclass) to use and return, not null
+     * @param <E> the type of the {@code SingleObserver} to use and return
+     * @param observer the {@code SingleObserver} (subclass) to use and return, not {@code null}
      * @return the input {@code observer}
-     * @throws NullPointerException if {@code observer} is null
+     * @throws NullPointerException if {@code observer} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -3778,17 +3874,18 @@ public final void subscribe(@NonNull SingleObserver<? super T> observer) {
     }
 
     /**
-     * Asynchronously subscribes subscribers to this Single on the specified {@link Scheduler}.
+     * Asynchronously subscribes subscribers to this {@code Single} on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.subscribeOn.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     * <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to perform subscription actions on
-     * @return the source Single modified so that its subscriptions happen on the specified {@link Scheduler}
+     *            the {@code Scheduler} to perform subscription actions on
+     * @return the source {@code Single} modified so that its subscriptions happen on the specified {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #observeOn
@@ -3802,7 +3899,7 @@ public final Single<T> subscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a Single that emits the item emitted by the source Single until a Completable terminates. Upon
+     * Returns a {@code Single} that emits the item emitted by the source {@code Single} until a {@link CompletableSource} terminates. Upon
      * termination of {@code other}, this will emit a {@link CancellationException} rather than go to
      * {@link SingleObserver#onSuccess(Object)}.
      * <p>
@@ -3813,9 +3910,10 @@ public final Single<T> subscribeOn(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param other
-     *            the Completable whose termination will cause {@code takeUntil} to emit the item from the source
-     *            Single
-     * @return a Single that emits the item emitted by the source Single until such time as {@code other} terminates.
+     *            the {@code CompletableSource} whose termination will cause {@code takeUntil} to emit the item from the source
+     *            {@code Single}
+     * @return the new {@code Single} that emits the item emitted by the source {@code Single} until such time as {@code other} terminates.
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
     @CheckReturnValue
@@ -3827,7 +3925,7 @@ public final Single<T> takeUntil(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a Single that emits the item emitted by the source Single until a Publisher emits an item. Upon
+     * Returns a {@code Single} that emits the item emitted by the source {@code Single} until a {@link Publisher} emits an item or completes. Upon
      * emission of an item from {@code other}, this will emit a {@link CancellationException} rather than go to
      * {@link SingleObserver#onSuccess(Object)}.
      * <p>
@@ -3841,12 +3939,13 @@ public final Single<T> takeUntil(@NonNull CompletableSource other) {
      * </dl>
      *
      * @param other
-     *            the Publisher whose first emitted item will cause {@code takeUntil} to emit the item from the source
-     *            Single
+     *            the {@code Publisher} whose first emitted item or completion will cause {@code takeUntil} to emit {@code CancellationException}
+     *            if the upstream {@code Single} hasn't completed till then
      * @param <E>
      *            the type of items emitted by {@code other}
-     * @return a Single that emits the item emitted by the source Single until such time as {@code other} emits
+     * @return the new {@code Single} that emits the item emitted by the source {@code Single} until such time as {@code other} emits
      * its first item
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3859,7 +3958,7 @@ public final <E> Single<T> takeUntil(@NonNull Publisher<E> other) {
     }
 
     /**
-     * Returns a Single that emits the item emitted by the source Single until a second Single emits an item. Upon
+     * Returns a {@code Single} that emits the item emitted by the source {@code Single} until a second {@code Single} emits an item. Upon
      * emission of an item from {@code other}, this will emit a {@link CancellationException} rather than go to
      * {@link SingleObserver#onSuccess(Object)}.
      * <p>
@@ -3870,10 +3969,12 @@ public final <E> Single<T> takeUntil(@NonNull Publisher<E> other) {
      * </dl>
      *
      * @param other
-     *            the Single whose emitted item will cause {@code takeUntil} to emit the item from the source Single
+     *            the {@code Single} whose emitted item will cause {@code takeUntil} to emit {@code CancellationException}
+     *            if the upstream {@code Single} hasn't completed till then
      * @param <E>
      *            the type of item emitted by {@code other}
-     * @return a Single that emits the item emitted by the source Single until such time as {@code other} emits its item
+     * @return the new {@code Single} that emits the item emitted by the source {@code Single} until such time as {@code other} emits its item
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
     @CheckReturnValue
@@ -3885,17 +3986,17 @@ public final <E> Single<T> takeUntil(@NonNull SingleSource<? extends E> other) {
     }
 
     /**
-     * Signals a TimeoutException if the current Single doesn't signal a success value within the
+     * Signals a {@link TimeoutException} if the current {@code Single} doesn't signal a success value within the
      * specified timeout window.
      * <p>
      * <img width="640" height="364" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeout.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code timeout} signals the TimeoutException on the {@code computation} {@link Scheduler}.</dd>
+     *  <dd>{@code timeout} signals the {@code TimeoutException} on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      * @param timeout the timeout amount
      * @param unit the time unit
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -3906,19 +4007,19 @@ public final Single<T> timeout(long timeout, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Signals a TimeoutException if the current Single doesn't signal a success value within the
+     * Signals a {@link TimeoutException} if the current {@code Single} doesn't signal a success value within the
      * specified timeout window.
      * <p>
      * <img width="640" height="334" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeout.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code timeout} signals the TimeoutException on the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code timeout} signals the {@code TimeoutException} on the {@link Scheduler} you specify.</dd>
      * </dl>
      * @param timeout the timeout amount
      * @param unit the time unit
-     * @param scheduler the target scheduler where the timeout is awaited and the TimeoutException
-     *                  signalled
-     * @return the new Single instance
+     * @param scheduler the target {@code Scheduler} where the timeout is awaited and the {@code TimeoutException}
+     *                  signaled
+     * @return the new {@code Single} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -3929,61 +4030,60 @@ public final Single<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Runs the current Single and if it doesn't signal within the specified timeout window, it is
-     * disposed and the other SingleSource subscribed to.
+     * Runs the current {@code Single} and if it doesn't signal within the specified timeout window, it is
+     * disposed and the other {@link SingleSource} subscribed to.
      * <p>
      * <img width="640" height="283" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeout.sb.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code timeout} subscribes to the other SingleSource on the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code timeout} subscribes to the other {@code SingleSource} on the {@link Scheduler} you specify.</dd>
      * </dl>
      * @param timeout the timeout amount
      * @param unit the time unit
-     * @param scheduler the scheduler where the timeout is awaited and the subscription to other happens
-     * @param other the other SingleSource that gets subscribed to if the current Single times out
-     * @return the new Single instance
+     * @param scheduler the {@code Scheduler} where the timeout is awaited and the subscription to other happens
+     * @param fallback the other {@code SingleSource} that gets subscribed to if the current {@code Single} times out
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code fallback} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Single<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull SingleSource<? extends T> other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, unit, scheduler, other);
+    public final Single<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull SingleSource<? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(timeout, unit, scheduler, fallback);
     }
 
     /**
-     * Runs the current Single and if it doesn't signal within the specified timeout window, it is
-     * disposed and the other SingleSource subscribed to.
+     * Runs the current {@code Single} and if it doesn't signal within the specified timeout window, it is
+     * disposed and the other {@link SingleSource} subscribed to.
      * <p>
      * <img width="640" height="282" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeout.b.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code timeout} subscribes to the other SingleSource on
+     *  <dd>{@code timeout} subscribes to the other {@code SingleSource} on
      *  the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      * @param timeout the timeout amount
      * @param unit the time unit
-     * @param other the other SingleSource that gets subscribed to if the current Single times out
-     * @return the new Single instance
+     * @param fallback the other {@code SingleSource} that gets subscribed to if the current {@code Single} times out
+     * @return the new {@code Single} instance
      * @throws NullPointerException
-     *             if other is null, or
-     *             if unit is null, or
-     *             if scheduler is null
+     *             if {@code fallback} or {@code unit} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Single<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull SingleSource<? extends T> other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, unit, Schedulers.computation(), other);
+    public final Single<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull SingleSource<? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(timeout, unit, Schedulers.computation(), fallback);
     }
 
-    private Single<T> timeout0(final long timeout, final TimeUnit unit, final Scheduler scheduler, final SingleSource<? extends T> other) {
+    private Single<T> timeout0(final long timeout, final TimeUnit unit, final Scheduler scheduler, final SingleSource<? extends T> fallback) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new SingleTimeout<>(this, timeout, unit, scheduler, other));
+        return RxJavaPlugins.onAssembly(new SingleTimeout<>(this, timeout, unit, scheduler, fallback));
     }
 
     /**
@@ -3998,9 +4098,9 @@ private Single<T> timeout0(final long timeout, final TimeUnit unit, final Schedu
      * </dl>
      * <p>History: 2.1.7 - experimental
      * @param <R> the resulting object type
-     * @param converter the function that receives the current Single instance and returns a value
+     * @param converter the function that receives the current {@code Single} instance and returns a value
      * @return the converted value
-     * @throws NullPointerException if converter is null
+     * @throws NullPointerException if {@code converter} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -4010,7 +4110,7 @@ public final <R> R to(@NonNull SingleConverter<T, ? extends R> converter) {
     }
 
     /**
-     * Returns a {@link Completable} that ignores the success value of this {@link Single}
+     * Returns a {@link Completable} that ignores the success value of this {@code Single}
      * and signals {@code onComplete} instead.
      * <p>
      * <img width="640" height="436" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ignoreElement.png" alt="">
@@ -4019,7 +4119,7 @@ public final <R> R to(@NonNull SingleConverter<T, ? extends R> converter) {
      * <dd>{@code ignoreElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Completable} that signals {@code onComplete} on it's observer when the source {@link Single}
+     * @return a {@code Completable} that signals {@code onComplete} on it's observer when the source {@code Single}
      *         calls {@code onSuccess}.
      * @since 2.1.13
      */
@@ -4031,7 +4131,7 @@ public final Completable ignoreElement() {
     }
 
     /**
-     * Converts this Single into a {@link Flowable}.
+     * Converts this {@code Single} into a {@link Flowable}.
      * <p>
      * <img width="640" height="462" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.toFlowable.png" alt="">
      * <dl>
@@ -4041,7 +4141,7 @@ public final Completable ignoreElement() {
      * <dd>{@code toFlowable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Flowable} that emits a single item T or an error.
+     * @return a {@lcode Flowable} that emits a single item T or an error.
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -4064,7 +4164,7 @@ public final Flowable<T> toFlowable() {
      *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Future} that expects a single item to be emitted by this {@code Single}
+     * @return a {@code Future} that expects a single item to be emitted by this {@code Single}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -4075,7 +4175,7 @@ public final Future<T> toFuture() {
     }
 
     /**
-     * Converts this Single into a {@link Maybe}.
+     * Converts this {@code Single} into a {@link Maybe}.
      * <p>
      * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.toMaybe.png" alt="">
      * <dl>
@@ -4083,7 +4183,7 @@ public final Future<T> toFuture() {
      * <dd>{@code toMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Maybe} that emits a single item T or an error.
+     * @return a {@code Maybe} that emits a single item or an error.
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4096,7 +4196,7 @@ public final Maybe<T> toMaybe() {
         return RxJavaPlugins.onAssembly(new MaybeFromSingle<>(this));
     }
     /**
-     * Converts this Single into an {@link Observable}.
+     * Converts this {@code Single} into an {@link Observable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.toObservable.png" alt="">
      * <dl>
@@ -4104,7 +4204,7 @@ public final Maybe<T> toMaybe() {
      * <dd>{@code toObservable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@link Observable} that emits a single item T or an error.
+     * @return an {@code Observable} that emits a single item or an error.
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4118,18 +4218,18 @@ public final Observable<T> toObservable() {
     }
 
     /**
-     * Returns a Single which makes sure when a SingleObserver disposes the Disposable,
-     * that call is propagated up on the specified scheduler.
+     * Returns a {@code Single} which makes sure when a {@link SingleObserver} disposes the {@link Disposable},
+     * that call is propagated up on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="693" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.unsubscribeOn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code unsubscribeOn} calls dispose() of the upstream on the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code unsubscribeOn} calls {@code dispose()} of the upstream on the {@code Scheduler} you specify.</dd>
      * </dl>
      * <p>History: 2.0.9 - experimental
      * @param scheduler the target scheduler where to execute the disposal
-     * @return the new Single instance
-     * @throws NullPointerException if scheduler is null
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -4141,8 +4241,8 @@ public final Single<T> unsubscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a Single that emits the result of applying a specified function to the pair of items emitted by
-     * the source Single and another specified Single.
+     * Returns a {@code Single} that emits the result of applying a specified function to the pair of items emitted by
+     * the source {@code Single} and another specified {@link SingleSource}.
      * <p>
      * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zipWith.png" alt="">
      * <dl>
@@ -4151,15 +4251,15 @@ public final Single<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the {@code other} Single
+     *            the type of items emitted by the {@code other} {@code Single}
      * @param <R>
-     *            the type of items emitted by the resulting Single
+     *            the type of items emitted by the resulting {@code Single}
      * @param other
-     *            the other SingleSource
+     *            the other {@code SingleSource}
      * @param zipper
-     *            a function that combines the pairs of items from the two SingleSources to generate the items to
-     *            be emitted by the resulting Single
-     * @return a Single that pairs up values from the source Single and the {@code other} SingleSource
+     *            a function that combines the pairs of items from the two {@code SingleSource}s to generate the items to
+     *            be emitted by the resulting {@code Single}
+     * @return the new {@code Single} that pairs up values from the source {@code Single} and the {@code other} {@code SingleSource}
      *         and emits the results of {@code zipFunction} applied to these pairs
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -4174,15 +4274,14 @@ public final <U, R> Single<R> zipWith(@NonNull SingleSource<U> other, @NonNull B
     // Fluent test support, super handy and reduces test preparation boilerplate
     // -------------------------------------------------------------------------
     /**
-     * Creates a TestObserver and subscribes
-     * it to this Single.
+     * Creates a {@link TestObserver} and subscribes it to this {@code Single}.
      * <p>
      * <img width="640" height="442" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.test.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new TestObserver instance
+     * @return the new {@code TestObserver} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -4195,16 +4294,16 @@ public final TestObserver<T> test() {
     }
 
     /**
-     * Creates a TestObserver optionally in cancelled state, then subscribes it to this Single.
+     * Creates a {@link TestObserver} optionally in cancelled state, then subscribes it to this {@code Single}.
      * <p>
      * <img width="640" height="482" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.test.b.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param dispose if true, the TestObserver will be cancelled before subscribing to this
-     * Single.
-     * @return the new TestObserver instance
+     * @param dispose if {@code true}, the {@code TestObserver} will be cancelled before subscribing to this
+     * {@code Single}.
+     * @return the new {@code TestObserver} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -4251,9 +4350,10 @@ private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the element type of the CompletionStage
-     * @param stage the CompletionStage to convert to Single and signal its success value or error
-     * @return the new Single instance
+     * @param <T> the element type of the {@code CompletionStage}
+     * @param stage the {@code CompletionStage} to convert to {@code Single} and signal its success value or error
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code stage} is {@code null}
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -4265,7 +4365,7 @@ private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
     }
 
     /**
-     * Maps the upstream success value into an {@link Optional} and emits the contained item if not empty.
+     * Maps the upstream success value into an {@link Optional} and emits the contained item if not empty as a {@link Maybe}.
      * <p>
      * <img width="640" height="323" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mapOptional.s.png" alt="">
      *
@@ -4273,10 +4373,11 @@ private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <R> the non-null output type
+     * @param <R> the non-{@code null} output type
      * @param mapper the function that receives the upstream success item and should return a <em>non-empty</em> {@code Optional}
      * to emit as the success output or an <em>empty</em> {@code Optional} to complete the {@code Maybe}
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #map(Function)
      * @see #filter(Predicate)
@@ -4303,7 +4404,7 @@ private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -4318,7 +4419,7 @@ public final CompletionStage<T> toCompletionStage() {
      * items to the downstream consumer as a {@link Flowable}.
      * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsFlowable.s.png" alt="">
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsFlowable(Function)}:
      * <pre><code>
@@ -4342,7 +4443,8 @@ public final CompletionStage<T> toCompletionStage() {
      * @param <R> the element type of the {@code Stream} and the output {@code Flowable}
      * @param mapper the function that receives the upstream success item and should
      * return a {@code Stream} of values to emit.
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #flattenAsFlowable(Function)
      * @see #flattenStreamAsObservable(Function)
@@ -4362,7 +4464,7 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
      * <p>
      * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsObservable.s.png" alt="">
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsFlowable(Function)}:
      * <pre><code>
@@ -4383,7 +4485,8 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
      * @param <R> the element type of the {@code Stream} and the output {@code Observable}
      * @param mapper the function that receives the upstream success item and should
      * return a {@code Stream} of values to emit.
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #flattenAsObservable(Function)
      * @see #flattenStreamAsFlowable(Function)
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
index 93f8cbffc0..a3d7957a5d 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
@@ -32,15 +32,20 @@ public class JavadocCodesAndLinks {
 
     @Test
     public void checkFlowable() throws Exception {
-        checkSource("Flowable");
+        checkSource("Flowable", "io.reactivex.rxjava3.core");
     }
 
     @Test
     public void checkCompletable() throws Exception {
-        checkSource("Completable");
+        checkSource("Completable", "io.reactivex.rxjava3.core");
     }
 
-    static void checkSource(String baseClassName) throws Exception {
+    @Test
+    public void checkSingle() throws Exception {
+        checkSource("Single", "io.reactivex.rxjava3.core");
+    }
+
+    static void checkSource(String baseClassName, String packageName) throws Exception {
         File f = TestHelper.findSource(baseClassName);
         if (f == null) {
             return;
@@ -120,6 +125,8 @@ else if (line.startsWith("@throws") || line.startsWith("@param")) {
                                     errors.append("The subsequent mention should be code: ")
                                     .append("{@code ").append(name)
                                     .append("}\r\n at ")
+                                    .append(packageName)
+                                    .append(".")
                                     .append(baseClassName)
                                     .append(".method(")
                                     .append(baseClassName)
@@ -136,6 +143,8 @@ else if (line.startsWith("@throws") || line.startsWith("@param")) {
                                 errors.append("The subsequent mention should be code: ")
                                 .append("{@code ").append(name)
                                 .append("}\r\n at ")
+                                .append(packageName)
+                                .append(".")
                                 .append(baseClassName)
                                 .append(".method(")
                                 .append(baseClassName)
@@ -152,6 +161,8 @@ else if (line.startsWith("@throws") || line.startsWith("@param")) {
                                     errors.append("The host type mention should be code: ")
                                     .append("{@code ").append(name)
                                     .append("}\r\n at ")
+                                    .append(packageName)
+                                    .append(".")
                                     .append(baseClassName)
                                     .append(".method(")
                                     .append(baseClassName)
@@ -175,6 +186,8 @@ else if (line.startsWith("@throws") || line.startsWith("@param")) {
                                     errors
                                     .append(name)
                                     .append("}\r\n at ")
+                                    .append(packageName)
+                                    .append(".")
                                     .append(baseClassName)
                                     .append(".method(")
                                     .append(baseClassName)
@@ -204,6 +217,8 @@ else if (line.startsWith("@throws") || line.startsWith("@param")) {
                                 errors.append("The host type mention should be code: ")
                                 .append("{@code ").append(name)
                                 .append("}\r\n at ")
+                                .append(packageName)
+                                .append(".")
                                 .append(baseClassName)
                                 .append(".method(")
                                 .append(baseClassName)
@@ -223,6 +238,8 @@ else if (!seenBefore) {
                                 errors
                                 .append(name)
                                 .append("}\r\n at ")
+                                .append(packageName)
+                                .append(".")
                                 .append(baseClassName)
                                 .append(".method(")
                                 .append(baseClassName)
@@ -234,6 +251,8 @@ else if (!seenBefore) {
                                 errors.append("The subsequent mention should be code: ")
                                 .append("{@code ").append(name)
                                 .append("}\r\n at ")
+                                .append(packageName)
+                                .append(".")
                                 .append(baseClassName)
                                 .append(".method(")
                                 .append(baseClassName)
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
index 1411295126..9a63ea2b0d 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
@@ -125,7 +125,13 @@ static final void scanForBadMethod(StringBuilder sourceCode, String annotation,
                 if (k >= 0 && k <= idx) {
 
                     int ll = sourceCode.indexOf("You specify", k);
+                    if (ll < 0) {
+                        ll = sourceCode.indexOf("you specify", k);
+                    }
                     int lm = sourceCode.indexOf("This operator", k);
+                    if (lm < 0) {
+                        lm = sourceCode.indexOf("this operator", k);
+                    }
                     if ((ll < 0 || ll > idx) && (lm < 0 || lm > idx)) {
 
                         int n = sourceCode.indexOf("{@code ", k);
@@ -138,27 +144,30 @@ static final void scanForBadMethod(StringBuilder sourceCode, String annotation,
                             if (m < idx) {
                                 String mname = sourceCode.substring(n + 7, m);
 
-                                int q = sourceCode.indexOf("@SuppressWarnings({", idx);
+                                if (!"Scheduler".equals(mname)) {
 
-                                int o = sourceCode.indexOf("{", idx);
+                                    int q = sourceCode.indexOf("@SuppressWarnings({", idx);
 
-                                if (q + 18 == o) {
-                                    o = sourceCode.indexOf("{", q + 20);
-                                }
+                                    int o = sourceCode.indexOf("{", idx);
+
+                                    if (q + 18 == o) {
+                                        o = sourceCode.indexOf("{", q + 20);
+                                    }
 
-                                if (o >= 0) {
+                                    if (o >= 0) {
 
-                                    int p = sourceCode.indexOf(" " + mname + "(", idx);
+                                        int p = sourceCode.indexOf(" " + mname + "(", idx);
 
-                                    if (p < 0 || p > o) {
-                                        // when printed on the console, IDEs will create a clickable link to help navigate to the offending point
-                                        e.append("java.lang.RuntimeException: wrong method name in description of ").append(inDoc).append(" '").append(mname).append("'\r\n")
-                                        ;
-                                        int lc = lineNumber(sourceCode, idx);
+                                        if (p < 0 || p > o) {
+                                            // when printed on the console, IDEs will create a clickable link to help navigate to the offending point
+                                            e.append("java.lang.RuntimeException: wrong method name in description of ").append(inDoc).append(" '").append(mname).append("'\r\n")
+                                            ;
+                                            int lc = lineNumber(sourceCode, idx);
 
-                                        e.append(" at io.reactivex.rxjava3.core.").append(baseClassName)
-                                        .append(".method(").append(baseClassName).append(".java:")
-                                        .append(lc).append(")").append("\r\n");
+                                            e.append(" at io.reactivex.rxjava3.core.").append(baseClassName)
+                                            .append(".method(").append(baseClassName).append(".java:")
+                                            .append(lc).append(")").append("\r\n");
+                                        }
                                     }
                                 }
                             }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
index 7ab384f5d3..79fd425c5e 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -189,11 +189,12 @@ static void processFile(Class<?> clazz) throws Exception {
             String line = lines.get(j).trim();
 
             for (ValidatorStrings validatorStr : VALIDATOR_STRINGS) {
-                if (line.startsWith(validatorStr.code)) {
+                int strIdx = line.indexOf(validatorStr.code);
+                if (strIdx >= 0) {
 
-                    int comma = line.indexOf(',');
+                    int comma = line.indexOf(',', strIdx + validatorStr.code.length());
 
-                    String paramName = line.substring(validatorStr.code.length(), comma);
+                    String paramName = line.substring(strIdx + validatorStr.code.length(), comma);
 
                     int quote = line.indexOf('"', comma);
 
@@ -220,9 +221,10 @@ static void processFile(Class<?> clazz) throws Exception {
                     }
 
                     // FIXME enable for other types in separate PR!
-                    if (!baseClassName.equals("Completable")) {
+                    if (!baseClassName.equals("Completable") && !baseClassName.equals("Single")) {
                         continue;
                     }
+
                     // find JavaDoc of throws
                     boolean found = false;
                     for (int k = j - 1; k >= 0; k--) {

From a86459489c57b7cf61671fdd5afd591924d7fd88 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2020 08:45:56 +0100
Subject: [PATCH 036/665] Bump junit from 4.12 to 4.13 (#6810)

Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/master/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f21e95925a..056b784b68 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
   // ---------------------------------------
   
   ext.reactiveStreamsVersion = "1.0.3"
-  ext.junitVersion = "4.12"
+  ext.junitVersion = "4.13"
   ext.testNgVersion = "7.0.0"
   ext.mockitoVersion = "3.2.4"
   ext.jmhLibVersion = "1.21"

From 45c0b064dcaea7ac3d55249c04a62370ebf4b4a9 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 7 Jan 2020 09:33:23 +0100
Subject: [PATCH 037/665] 3.x: Fix Junit 4.13 deprecated API use (#6813)

---
 .../rxjava3/observers/TestObserverTest.java   | 196 +++++++--------
 .../subscribers/TestSubscriberTest.java       | 166 ++++++-------
 .../testsupport/TestObserverExTest.java       | 234 +++++++++---------
 .../testsupport/TestSubscriberExTest.java     | 192 +++++++-------
 4 files changed, 377 insertions(+), 411 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
index 1e4a287cee..01d6d76789 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
@@ -20,15 +20,14 @@
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
-import org.junit.rules.ExpectedException;
+import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Predicate;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -40,9 +39,6 @@
 
 public class TestObserverTest extends RxJavaTest {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     @Test
     public void assertTestObserver() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
@@ -56,50 +52,44 @@ public void assertTestObserver() {
 
     @Test
     public void assertNotMatchCount() {
-        Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> subscriber = new TestSubscriber<>();
-        oi.subscribe(subscriber);
-
-        thrown.expect(AssertionError.class);
-        // FIXME different message format
-//        thrown.expectMessage("Number of items does not match. Provided: 1  Actual: 2");
-
-        subscriber.assertValue(1);
-        subscriber.assertValueCount(2);
-        subscriber.assertComplete().assertNoErrors();
+        assertThrows(AssertionError.class, () -> {
+            Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
+            TestSubscriber<Integer> subscriber = new TestSubscriber<>();
+            oi.subscribe(subscriber);
+
+            subscriber.assertValue(1);
+            subscriber.assertValueCount(2);
+            subscriber.assertComplete().assertNoErrors();
+        });
     }
 
     @Test
     public void assertNotMatchValue() {
-        Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> subscriber = new TestSubscriber<>();
-        oi.subscribe(subscriber);
-
-        thrown.expect(AssertionError.class);
-        // FIXME different message format
-//        thrown.expectMessage("Value at index: 1 expected to be [3] (Integer) but was: [2] (Integer)");
-
-        subscriber.assertValues(1, 3);
-        subscriber.assertValueCount(2);
-        subscriber.assertComplete().assertNoErrors();
+        assertThrows(AssertionError.class, () -> {
+            Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
+            TestSubscriber<Integer> subscriber = new TestSubscriber<>();
+            oi.subscribe(subscriber);
+
+            subscriber.assertValues(1, 3);
+            subscriber.assertValueCount(2);
+            subscriber.assertComplete().assertNoErrors();
+        });
     }
 
     @Test
     public void assertTerminalEventNotReceived() {
-        PublishProcessor<Integer> p = PublishProcessor.create();
-        TestSubscriber<Integer> subscriber = new TestSubscriber<>();
-        p.subscribe(subscriber);
-
-        p.onNext(1);
-        p.onNext(2);
+        assertThrows(AssertionError.class, () -> {
+            PublishProcessor<Integer> p = PublishProcessor.create();
+            TestSubscriber<Integer> subscriber = new TestSubscriber<>();
+            p.subscribe(subscriber);
 
-        thrown.expect(AssertionError.class);
-        // FIXME different message format
-//        thrown.expectMessage("No terminal events received.");
+            p.onNext(1);
+            p.onNext(2);
 
-        subscriber.assertValues(1, 2);
-        subscriber.assertValueCount(2);
-        subscriber.assertComplete().assertNoErrors();
+            subscriber.assertValues(1, 2);
+            subscriber.assertValueCount(2);
+            subscriber.assertComplete().assertNoErrors();
+        });
     }
 
     @Test
@@ -853,16 +843,16 @@ public void errorMeansDisposed() {
 
     @Test
     public void assertValuePredicateEmpty() {
-        TestObserver<Object> to = new TestObserver<>();
+        assertThrows("No values", AssertionError.class, () -> {
+            TestObserver<Object> to = new TestObserver<>();
 
-        Observable.empty().subscribe(to);
+            Observable.empty().subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        to.assertValue(new Predicate<Object>() {
-            @Override public boolean test(final Object o) throws Exception {
-                return false;
-            }
+            to.assertValue(new Predicate<Object>() {
+                @Override public boolean test(final Object o) throws Exception {
+                    return false;
+                }
+            });
         });
     }
 
@@ -881,46 +871,46 @@ public void assertValuePredicateMatch() {
 
     @Test
     public void assertValuePredicateNoMatch() {
-        TestObserver<Integer> to = new TestObserver<>();
+        assertThrows("Value not present", AssertionError.class, () -> {
+            TestObserver<Integer> to = new TestObserver<>();
 
-        Observable.just(1).subscribe(to);
+            Observable.just(1).subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value not present");
-        to.assertValue(new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o != 1;
-            }
+            to.assertValue(new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o != 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        TestObserver<Integer> to = new TestObserver<>();
+        assertThrows("Value present but other values as well", AssertionError.class, () -> {
+            TestObserver<Integer> to = new TestObserver<>();
 
-        Observable.just(1, 2).subscribe(to);
+            Observable.just(1, 2).subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value present but other values as well");
-        to.assertValue(new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            to.assertValue(new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        TestObserver<Object> to = new TestObserver<>();
+        assertThrows("No values", AssertionError.class, () -> {
+            TestObserver<Object> to = new TestObserver<>();
 
-        Observable.empty().subscribe(to);
+            Observable.empty().subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        to.assertValueAt(0, new Predicate<Object>() {
-            @Override public boolean test(final Object o) throws Exception {
-                return false;
-            }
+            to.assertValueAt(0, new Predicate<Object>() {
+                @Override public boolean test(final Object o) throws Exception {
+                    return false;
+                }
+            });
         });
     }
 
@@ -939,43 +929,43 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        TestObserver<Integer> to = new TestObserver<>();
+        assertThrows("Value not present", AssertionError.class, () -> {
+            TestObserver<Integer> to = new TestObserver<>();
 
-        Observable.just(1, 2, 3).subscribe(to);
+            Observable.just(1, 2, 3).subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value not present");
-        to.assertValueAt(2, new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o != 3;
-            }
+            to.assertValueAt(2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o != 3;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtInvalidIndex() {
-        TestObserver<Integer> to = new TestObserver<>();
+        assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserver<Integer> to = new TestObserver<>();
 
-        Observable.just(1, 2).subscribe(to);
+            Observable.just(1, 2).subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)");
-        to.assertValueAt(2, new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            to.assertValueAt(2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtIndexEmpty() {
-        TestObserver<Object> to = new TestObserver<>();
+        assertThrows("No values", AssertionError.class, () -> {
+            TestObserver<Object> to = new TestObserver<>();
 
-        Observable.empty().subscribe(to);
+            Observable.empty().subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        to.assertValueAt(0, "a");
+            to.assertValueAt(0, "a");
+        });
     }
 
     @Test
@@ -989,24 +979,24 @@ public void assertValueAtIndexMatch() {
 
     @Test
     public void assertValueAtIndexNoMatch() {
-        TestObserver<String> to = new TestObserver<>();
+        assertThrows("expected: b (class: String) but was: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
 
-        Observable.just("a", "b", "c").subscribe(to);
+            Observable.just("a", "b", "c").subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("expected: b (class: String) but was: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)");
-        to.assertValueAt(2, "b");
+            to.assertValueAt(2, "b");
+        });
     }
 
     @Test
     public void assertValueAtIndexInvalidIndex() {
-        TestObserver<String> to = new TestObserver<>();
+        assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
 
-        Observable.just("a", "b").subscribe(to);
+            Observable.just("a", "b").subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)");
-        to.assertValueAt(2, "c");
+            to.assertValueAt(2, "c");
+        });
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
index 6127d31ff5..6ce4f4ed24 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
@@ -21,8 +21,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.*;
-import org.junit.rules.ExpectedException;
+import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
@@ -38,9 +37,6 @@
 
 public class TestSubscriberTest extends RxJavaTest {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     @Test
     public void assertTestSubscriber() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
@@ -55,53 +51,47 @@ public void assertTestSubscriber() {
 
     @Test
     public void assertNotMatchCount() {
-        Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> ts = new TestSubscriber<>();
-        oi.subscribe(ts);
-
-        thrown.expect(AssertionError.class);
-        // FIXME different message pattern
-        // thrown.expectMessage("Number of items does not match. Provided: 1  Actual: 2");
+        assertThrows(AssertionError.class, () -> {
+            Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+            oi.subscribe(ts);
 
-        ts.assertValues(1);
-        ts.assertValueCount(2);
-        ts.assertComplete();
-        ts.assertNoErrors();
+            ts.assertValues(1);
+            ts.assertValueCount(2);
+            ts.assertComplete();
+            ts.assertNoErrors();
+        });
     }
 
     @Test
     public void assertNotMatchValue() {
-        Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriber<Integer> ts = new TestSubscriber<>();
-        oi.subscribe(ts);
-
-        thrown.expect(AssertionError.class);
-        // FIXME different message pattern
-        // thrown.expectMessage("Value at index: 1 expected to be [3] (Integer) but was: [2] (Integer)");
+        assertThrows(AssertionError.class, () -> {
+            Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+            oi.subscribe(ts);
 
-        ts.assertValues(1, 3);
-        ts.assertValueCount(2);
-        ts.assertComplete();
-        ts.assertNoErrors();
+            ts.assertValues(1, 3);
+            ts.assertValueCount(2);
+            ts.assertComplete();
+            ts.assertNoErrors();
+        });
     }
 
     @Test
     public void assertTerminalEventNotReceived() {
-        PublishProcessor<Integer> p = PublishProcessor.create();
-        TestSubscriber<Integer> ts = new TestSubscriber<>();
-        p.subscribe(ts);
-
-        p.onNext(1);
-        p.onNext(2);
+        assertThrows(AssertionError.class, () -> {
+            PublishProcessor<Integer> p = PublishProcessor.create();
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+            p.subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        // FIXME different message pattern
-        // thrown.expectMessage("No terminal events received.");
+            p.onNext(1);
+            p.onNext(2);
 
-        ts.assertValues(1, 2);
-        ts.assertValueCount(2);
-        ts.assertComplete();
-        ts.assertNoErrors();
+            ts.assertValues(1, 2);
+            ts.assertValueCount(2);
+            ts.assertComplete();
+            ts.assertNoErrors();
+        });
     }
 
     @Test
@@ -1375,16 +1365,16 @@ public void onComplete() {
 
     @Test
     public void assertValuePredicateEmpty() {
-        TestSubscriber<Object> ts = new TestSubscriber<>();
+        assertThrows(AssertionError.class, () -> {
+            TestSubscriber<Object> ts = new TestSubscriber<>();
 
-        Flowable.empty().subscribe(ts);
+            Flowable.empty().subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        ts.assertValue(new Predicate<Object>() {
-            @Override public boolean test(final Object o) throws Exception {
-                return false;
-            }
+            ts.assertValue(new Predicate<Object>() {
+                @Override public boolean test(final Object o) throws Exception {
+                    return false;
+                }
+            });
         });
     }
 
@@ -1403,46 +1393,46 @@ public void assertValuePredicateMatch() {
 
     @Test
     public void assertValuePredicateNoMatch() {
-        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        assertThrows("Value not present", AssertionError.class, () -> {
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        Flowable.just(1).subscribe(ts);
+            Flowable.just(1).subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value not present");
-        ts.assertValue(new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o != 1;
-            }
+            ts.assertValue(new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o != 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        assertThrows("Value present but other values as well", AssertionError.class, () -> {
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        Flowable.just(1, 2).subscribe(ts);
+            Flowable.just(1, 2).subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value present but other values as well");
-        ts.assertValue(new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            ts.assertValue(new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        TestSubscriber<Object> ts = new TestSubscriber<>();
+        assertThrows("No values", AssertionError.class, () -> {
+            TestSubscriber<Object> ts = new TestSubscriber<>();
 
-        Flowable.empty().subscribe(ts);
+            Flowable.empty().subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        ts.assertValueAt(0, new Predicate<Object>() {
-            @Override public boolean test(final Object o) throws Exception {
-                return false;
-            }
+            ts.assertValueAt(0, new Predicate<Object>() {
+                @Override public boolean test(final Object o) throws Exception {
+                    return false;
+                }
+            });
         });
     }
 
@@ -1461,31 +1451,31 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        assertThrows("Value not present", AssertionError.class, () -> {
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        Flowable.just(1, 2, 3).subscribe(ts);
+            Flowable.just(1, 2, 3).subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value not present");
-        ts.assertValueAt(2, new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o != 3;
-            }
+            ts.assertValueAt(2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o != 3;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtInvalidIndex() {
-        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        Flowable.just(1, 2).subscribe(ts);
+            Flowable.just(1, 2).subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)");
-        ts.assertValueAt(2, new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            ts.assertValueAt(2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
index 0d6edd6c3d..6026501a1d 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
@@ -20,14 +20,13 @@
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.*;
-import org.junit.rules.ExpectedException;
+import org.junit.Test;
 import org.mockito.InOrder;
 
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -39,9 +38,6 @@
 
 public class TestObserverExTest extends RxJavaTest {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     @Test
     public void assertTestObserverEx() {
         Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
@@ -55,32 +51,28 @@ public void assertTestObserverEx() {
 
     @Test
     public void assertNotMatchCount() {
-        Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
-        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
-        oi.subscribe(subscriber);
-
-        thrown.expect(AssertionError.class);
-        // FIXME different message format
-//        thrown.expectMessage("Number of items does not match. Provided: 1  Actual: 2");
-
-        subscriber.assertValue(1);
-        subscriber.assertValueCount(2);
-        subscriber.assertTerminated();
+        assertThrows(AssertionError.class, () -> {
+            Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
+            TestObserverEx<Integer> subscriber = new TestObserverEx<>();
+            oi.subscribe(subscriber);
+
+            subscriber.assertValue(1);
+            subscriber.assertValueCount(2);
+            subscriber.assertTerminated();
+        });
     }
 
     @Test
     public void assertNotMatchValue() {
-        Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
-        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
-        oi.subscribe(subscriber);
-
-        thrown.expect(AssertionError.class);
-        // FIXME different message format
-//        thrown.expectMessage("Value at index: 1 expected to be [3] (Integer) but was: [2] (Integer)");
-
-        subscriber.assertValues(1, 3);
-        subscriber.assertValueCount(2);
-        subscriber.assertTerminated();
+        assertThrows(AssertionError.class, () -> {
+            Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
+            TestObserverEx<Integer> subscriber = new TestObserverEx<>();
+            oi.subscribe(subscriber);
+
+            subscriber.assertValues(1, 3);
+            subscriber.assertValueCount(2);
+            subscriber.assertTerminated();
+        });
     }
 
     @Test
@@ -96,34 +88,34 @@ public void assertNeverAtNotMatchingValue() {
 
     @Test
     public void assertNeverAtMatchingValue() {
-        Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
-        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
-        oi.subscribe(subscriber);
-
-        subscriber.assertValues(1, 2);
+        assertThrows(AssertionError.class, () -> {
+            Observable<Integer> oi = Observable.fromIterable(Arrays.asList(1, 2));
+            TestObserverEx<Integer> subscriber = new TestObserverEx<>();
+            oi.subscribe(subscriber);
 
-        thrown.expect(AssertionError.class);
+            subscriber.assertValues(1, 2);
 
-        subscriber.assertNever(2);
-        subscriber.assertValueCount(2);
-        subscriber.assertTerminated();
+            subscriber.assertNever(2);
+            subscriber.assertValueCount(2);
+            subscriber.assertTerminated();
+        });
     }
 
     @Test
     public void assertNeverAtMatchingPredicate() {
-        TestObserverEx<Integer> to = new TestObserverEx<>();
+        assertThrows(AssertionError.class, () -> {
+            TestObserverEx<Integer> to = new TestObserverEx<>();
 
-        Observable.just(1, 2).subscribe(to);
+            Observable.just(1, 2).subscribe(to);
 
-        to.assertValues(1, 2);
+            to.assertValues(1, 2);
 
-        thrown.expect(AssertionError.class);
-
-        to.assertNever(new Predicate<Integer>() {
-            @Override
-            public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            to.assertNever(new Predicate<Integer>() {
+                @Override
+                public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 
@@ -143,20 +135,18 @@ public boolean test(final Integer o) throws Exception {
 
     @Test
     public void assertTerminalEventNotReceived() {
-        PublishSubject<Integer> p = PublishSubject.create();
-        TestObserverEx<Integer> subscriber = new TestObserverEx<>();
-        p.subscribe(subscriber);
+        assertThrows(AssertionError.class, () -> {
+            PublishSubject<Integer> p = PublishSubject.create();
+            TestObserverEx<Integer> subscriber = new TestObserverEx<>();
+            p.subscribe(subscriber);
 
-        p.onNext(1);
-        p.onNext(2);
+            p.onNext(1);
+            p.onNext(2);
 
-        thrown.expect(AssertionError.class);
-        // FIXME different message format
-//        thrown.expectMessage("No terminal events received.");
-
-        subscriber.assertValues(1, 2);
-        subscriber.assertValueCount(2);
-        subscriber.assertTerminated();
+            subscriber.assertValues(1, 2);
+            subscriber.assertValueCount(2);
+            subscriber.assertTerminated();
+        });
     }
 
     @Test
@@ -1148,16 +1138,16 @@ public void asyncFusion() {
 
     @Test
     public void assertValuePredicateEmpty() {
-        TestObserverEx<Object> to = new TestObserverEx<>();
+        assertThrows("No values", AssertionError.class, () -> {
+            TestObserverEx<Object> to = new TestObserverEx<>();
 
-        Observable.empty().subscribe(to);
+            Observable.empty().subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        to.assertValue(new Predicate<Object>() {
-            @Override public boolean test(final Object o) throws Exception {
-                return false;
-            }
+            to.assertValue(new Predicate<Object>() {
+                @Override public boolean test(final Object o) throws Exception {
+                    return false;
+                }
+            });
         });
     }
 
@@ -1176,46 +1166,46 @@ public void assertValuePredicateMatch() {
 
     @Test
     public void assertValuePredicateNoMatch() {
-        TestObserverEx<Integer> to = new TestObserverEx<>();
+        assertThrows("Value not present", AssertionError.class, () -> {
+            TestObserverEx<Integer> to = new TestObserverEx<>();
 
-        Observable.just(1).subscribe(to);
+            Observable.just(1).subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value not present");
-        to.assertValue(new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o != 1;
-            }
+            to.assertValue(new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o != 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        TestObserverEx<Integer> to = new TestObserverEx<>();
+        assertThrows("Value present but other values as well", AssertionError.class, () -> {
+            TestObserverEx<Integer> to = new TestObserverEx<>();
 
-        Observable.just(1, 2).subscribe(to);
+            Observable.just(1, 2).subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value present but other values as well");
-        to.assertValue(new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            to.assertValue(new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        TestObserverEx<Object> to = new TestObserverEx<>();
+        assertThrows("No values", AssertionError.class, () -> {
+            TestObserverEx<Object> to = new TestObserverEx<>();
 
-        Observable.empty().subscribe(to);
+            Observable.empty().subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        to.assertValueAt(0, new Predicate<Object>() {
-            @Override public boolean test(final Object o) throws Exception {
-                return false;
-            }
+            to.assertValueAt(0, new Predicate<Object>() {
+                @Override public boolean test(final Object o) throws Exception {
+                    return false;
+                }
+            });
         });
     }
 
@@ -1234,43 +1224,43 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        TestObserverEx<Integer> to = new TestObserverEx<>();
+        assertThrows("Value not present", AssertionError.class, () -> {
+            TestObserverEx<Integer> to = new TestObserverEx<>();
 
-        Observable.just(1, 2, 3).subscribe(to);
+            Observable.just(1, 2, 3).subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value not present");
-        to.assertValueAt(2, new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o != 3;
-            }
+            to.assertValueAt(2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o != 3;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtInvalidIndex() {
-        TestObserverEx<Integer> to = new TestObserverEx<>();
+        assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserverEx<Integer> to = new TestObserverEx<>();
 
-        Observable.just(1, 2).subscribe(to);
+            Observable.just(1, 2).subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)");
-        to.assertValueAt(2, new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            to.assertValueAt(2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtIndexEmpty() {
-        TestObserverEx<Object> to = new TestObserverEx<>();
+        assertThrows("No values", AssertionError.class, () -> {
+            TestObserverEx<Object> to = new TestObserverEx<>();
 
-        Observable.empty().subscribe(to);
+            Observable.empty().subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        to.assertValueAt(0, "a");
+            to.assertValueAt(0, "a");
+        });
     }
 
     @Test
@@ -1284,24 +1274,24 @@ public void assertValueAtIndexMatch() {
 
     @Test
     public void assertValueAtIndexNoMatch() {
-        TestObserverEx<String> to = new TestObserverEx<>();
+        assertThrows("expected: b (class: String) but was: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserverEx<String> to = new TestObserverEx<>();
 
-        Observable.just("a", "b", "c").subscribe(to);
+            Observable.just("a", "b", "c").subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("expected: b (class: String) but was: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)");
-        to.assertValueAt(2, "b");
+            to.assertValueAt(2, "b");
+        });
     }
 
     @Test
     public void assertValueAtIndexInvalidIndex() {
-        TestObserverEx<String> to = new TestObserverEx<>();
+        assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserverEx<String> to = new TestObserverEx<>();
 
-        Observable.just("a", "b").subscribe(to);
+            Observable.just("a", "b").subscribe(to);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)");
-        to.assertValueAt(2, "c");
+            to.assertValueAt(2, "c");
+        });
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
index 308c10e041..0918c08e11 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
@@ -21,8 +21,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.*;
-import org.junit.rules.ExpectedException;
+import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
@@ -38,9 +37,6 @@
 
 public class TestSubscriberExTest extends RxJavaTest {
 
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     @Test
     public void assertTestSubscriberEx() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
@@ -54,28 +50,28 @@ public void assertTestSubscriberEx() {
 
     @Test
     public void assertNotMatchCount() {
-        Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
-        oi.subscribe(ts);
-
-        thrown.expect(AssertionError.class);
+        assertThrows(AssertionError.class, () -> {
+            Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+            oi.subscribe(ts);
 
-        ts.assertValues(1);
-        ts.assertValueCount(2);
-        ts.assertTerminated();
+            ts.assertValues(1);
+            ts.assertValueCount(2);
+            ts.assertTerminated();
+        });
     }
 
     @Test
     public void assertNotMatchValue() {
-        Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
-        oi.subscribe(ts);
-
-        thrown.expect(AssertionError.class);
+        assertThrows(AssertionError.class, () -> {
+            Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+            oi.subscribe(ts);
 
-        ts.assertValues(1, 3);
-        ts.assertValueCount(2);
-        ts.assertTerminated();
+            ts.assertValues(1, 3);
+            ts.assertValueCount(2);
+            ts.assertTerminated();
+        });
     }
 
     @Test
@@ -91,34 +87,34 @@ public void assertNeverAtNotMatchingValue() {
 
     @Test
     public void assertNeverAtMatchingValue() {
-        Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
-        oi.subscribe(ts);
+        assertThrows(AssertionError.class, () -> {
+            Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+            oi.subscribe(ts);
 
-        ts.assertValues(1, 2);
-
-        thrown.expect(AssertionError.class);
+            ts.assertValues(1, 2);
 
-        ts.assertNever(2);
-        ts.assertValueCount(2);
-        ts.assertTerminated();
+            ts.assertNever(2);
+            ts.assertValueCount(2);
+            ts.assertTerminated();
+        });
     }
 
     @Test
     public void assertNeverAtMatchingPredicate() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        assertThrows(AssertionError.class, () -> {
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-        Flowable.just(1, 2).subscribe(ts);
-
-        ts.assertValues(1, 2);
+            Flowable.just(1, 2).subscribe(ts);
 
-        thrown.expect(AssertionError.class);
+            ts.assertValues(1, 2);
 
-        ts.assertNever(new Predicate<Integer>() {
-            @Override
-            public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            ts.assertNever(new Predicate<Integer>() {
+                @Override
+                public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 
@@ -138,18 +134,18 @@ public boolean test(final Integer o) throws Exception {
 
     @Test
     public void assertTerminalEventNotReceived() {
-        PublishProcessor<Integer> p = PublishProcessor.create();
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
-        p.subscribe(ts);
-
-        p.onNext(1);
-        p.onNext(2);
+        assertThrows(AssertionError.class, () -> {
+            PublishProcessor<Integer> p = PublishProcessor.create();
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+            p.subscribe(ts);
 
-        thrown.expect(AssertionError.class);
+            p.onNext(1);
+            p.onNext(2);
 
-        ts.assertValues(1, 2);
-        ts.assertValueCount(2);
-        ts.assertTerminated();
+            ts.assertValues(1, 2);
+            ts.assertValueCount(2);
+            ts.assertTerminated();
+        });
     }
 
     @Test
@@ -1587,16 +1583,16 @@ public void asyncQueueThrows() {
 
     @Test
     public void assertValuePredicateEmpty() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        assertThrows("No values", AssertionError.class, () -> {
+            TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
 
-        Flowable.empty().subscribe(ts);
+            Flowable.empty().subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        ts.assertValue(new Predicate<Object>() {
-            @Override public boolean test(final Object o) throws Exception {
-                return false;
-            }
+            ts.assertValue(new Predicate<Object>() {
+                @Override public boolean test(final Object o) throws Exception {
+                    return false;
+                }
+            });
         });
     }
 
@@ -1615,46 +1611,46 @@ public void assertValuePredicateMatch() {
 
     @Test
     public void assertValuePredicateNoMatch() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        assertThrows("Value not present", AssertionError.class, () -> {
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-        Flowable.just(1).subscribe(ts);
+            Flowable.just(1).subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value not present");
-        ts.assertValue(new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o != 1;
-            }
+            ts.assertValue(new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o != 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        assertThrows("Value present but other values as well", AssertionError.class, () -> {
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-        Flowable.just(1, 2).subscribe(ts);
+            Flowable.just(1, 2).subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value present but other values as well");
-        ts.assertValue(new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            ts.assertValue(new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        assertThrows("No values", AssertionError.class, () -> {
+            TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
 
-        Flowable.empty().subscribe(ts);
+            Flowable.empty().subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("No values");
-        ts.assertValueAt(0, new Predicate<Object>() {
-            @Override public boolean test(final Object o) throws Exception {
-                return false;
-            }
+            ts.assertValueAt(0, new Predicate<Object>() {
+                @Override public boolean test(final Object o) throws Exception {
+                    return false;
+                }
+            });
         });
     }
 
@@ -1673,31 +1669,31 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        assertThrows("Value not present", AssertionError.class, () -> {
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-        Flowable.just(1, 2, 3).subscribe(ts);
+            Flowable.just(1, 2, 3).subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Value not present");
-        ts.assertValueAt(2, new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o != 3;
-            }
+            ts.assertValueAt(2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o != 3;
+                }
+            });
         });
     }
 
     @Test
     public void assertValueAtInvalidIndex() {
-        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
-        Flowable.just(1, 2).subscribe(ts);
+            Flowable.just(1, 2).subscribe(ts);
 
-        thrown.expect(AssertionError.class);
-        thrown.expectMessage("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)");
-        ts.assertValueAt(2, new Predicate<Integer>() {
-            @Override public boolean test(final Integer o) throws Exception {
-                return o == 1;
-            }
+            ts.assertValueAt(2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
         });
     }
 

From 9e2fa63aa044b67d28de351aee32685e4eaa8c2d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 7 Jan 2020 10:47:28 +0100
Subject: [PATCH 038/665] 3.x: Remove fromFuture(..., Scheduler) overloads
 (#6814)

---
 .../io/reactivex/rxjava3/core/Flowable.java   | 89 -------------------
 .../io/reactivex/rxjava3/core/Observable.java | 78 ----------------
 .../io/reactivex/rxjava3/core/Single.java     | 67 --------------
 .../rxjava3/flowable/FlowableNullTests.java   | 10 ---
 .../flowable/FlowableToFutureTest.java        |  4 +-
 .../observable/ObservableFromTest.java        |  3 +-
 .../observable/ObservableToFutureTest.java    |  2 +-
 .../operators/single/SingleFromTest.java      |  6 +-
 .../observable/ObservableNullTests.java       | 11 ---
 .../rxjava3/single/SingleNullTests.java       | 20 -----
 .../ParamValidationCheckerTest.java           |  3 -
 11 files changed, 9 insertions(+), 284 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index c61ea17163..b5135bf356 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -2089,95 +2089,6 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
         return RxJavaPlugins.onAssembly(new FlowableFromFuture<>(future, timeout, unit));
     }
 
-    /**
-     * Converts a {@link Future} into a {@link Publisher}, with a timeout on the {@code Future}.
-     * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
-     * <p>
-     * You can convert any object that supports the {@code Future} interface into a {@code Publisher} that emits the
-     * return value of the {@link Future#get} method of that object by passing the object into the {@code from}
-     * method.
-     * <p>
-     * Unlike 1.x, canceling the {@code Flowable} won't cancel the future. If necessary, one can use composition to achieve the
-     * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
-     * <p>
-     * <em>Important note:</em> This {@code Publisher} is blocking; you cannot cancel it.
-     * <p>
-     * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
-     * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
-     * operator to convert and consume such sources in a non-blocking fashion instead.
-     * <dl>
-     *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream.</dd>
-     *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
-     * </dl>
-     *
-     * @param future
-     *            the source {@code Future}
-     * @param timeout
-     *            the maximum time to wait before calling {@code get}
-     * @param unit
-     *            the {@link TimeUnit} of the {@code timeout} argument
-     * @param scheduler
-     *            the {@code Scheduler} to wait for the {@code Future} on. Use a {@code Scheduler} such as
-     *            {@link Schedulers#io()} that can block and wait on the {@code Future}
-     * @param <T>
-     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
-     *            the resulting {@code Publisher}
-     * @return a {@code Flowable} that emits the item from the source {@code Future}
-     * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
-     * @see #fromCompletionStage(CompletionStage)
-     */
-    @SuppressWarnings({ "unchecked" })
-    @CheckReturnValue
-    @NonNull
-    @BackpressureSupport(BackpressureKind.FULL)
-    @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <@NonNull T> Flowable<T> fromFuture(Future<? extends T> future, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        Objects.requireNonNull(scheduler, "scheduler is null");
-        return fromFuture((Future<T>)future, timeout, unit).subscribeOn(scheduler);
-    }
-
-    /**
-     * Converts a {@link Future}, operating on a specified {@link Scheduler}, into a {@link Publisher}.
-     * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.s.png" alt="">
-     * <p>
-     * You can convert any object that supports the {@code Future} interface into a {@code Publisher} that emits the
-     * return value of the {@link Future#get} method of that object by passing the object into the {@code from}
-     * method.
-     * <p>
-     * Unlike 1.x, canceling the {@code Flowable} won't cancel the future. If necessary, one can use composition to achieve the
-     * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
-     * <dl>
-     *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream.</dd>
-     *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
-     * </dl>
-     *
-     * @param future
-     *            the source {@code Future}
-     * @param scheduler
-     *            the {@code Scheduler} to wait for the {@code Future} on. Use a {@code Scheduler} such as
-     *            {@link Schedulers#io()} that can block and wait on the {@code Future}
-     * @param <T>
-     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
-     *            the resulting {@code Publisher}
-     * @return a {@code Flowable} that emits the item from the source {@code Future}
-     * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
-     */
-    @SuppressWarnings({ "unchecked" })
-    @CheckReturnValue
-    @NonNull
-    @BackpressureSupport(BackpressureKind.FULL)
-    @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <@NonNull T> Flowable<T> fromFuture(Future<? extends T> future, @NonNull Scheduler scheduler) {
-        Objects.requireNonNull(scheduler, "scheduler is null");
-        return fromFuture((Future<T>)future).subscribeOn(scheduler);
-    }
-
     /**
      * Converts an {@link Iterable} sequence into a {@link Publisher} that emits the items in the sequence.
      * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 7a8d808072..c8db1606e1 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -1839,84 +1839,6 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
         return RxJavaPlugins.onAssembly(new ObservableFromFuture<>(future, timeout, unit));
     }
 
-    /**
-     * Converts a {@link Future} into an ObservableSource, with a timeout on the Future.
-     * <p>
-     * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromFuture.timeout.scheduler.png" alt="">
-     * <p>
-     * You can convert any object that supports the {@link Future} interface into an ObservableSource that emits the
-     * return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
-     * method.
-     * <p>
-     * Unlike 1.x, disposing the Observable won't cancel the future. If necessary, one can use composition to achieve the
-     * cancellation effect: {@code futureObservableSource.doOnDispose(() -> future.cancel(true));}.
-     * <p>
-     * <em>Important note:</em> This ObservableSource is blocking; you cannot dispose it.
-     * <dl>
-     *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
-     * </dl>
-     *
-     * @param future
-     *            the source {@link Future}
-     * @param timeout
-     *            the maximum time to wait before calling {@code get}
-     * @param unit
-     *            the {@link TimeUnit} of the {@code timeout} argument
-     * @param scheduler
-     *            the {@link Scheduler} to wait for the Future on. Use a Scheduler such as
-     *            {@link Schedulers#io()} that can block and wait on the Future
-     * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting ObservableSource
-     * @return an Observable that emits the item from the source {@link Future}
-     * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
-     */
-    @CheckReturnValue
-    @NonNull
-    @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        Objects.requireNonNull(scheduler, "scheduler is null");
-        Observable<T> o = fromFuture(future, timeout, unit);
-        return o.subscribeOn(scheduler);
-    }
-
-    /**
-     * Converts a {@link Future}, operating on a specified {@link Scheduler}, into an ObservableSource.
-     * <p>
-     * <img width="640" height="294" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromFuture.scheduler.png" alt="">
-     * <p>
-     * You can convert any object that supports the {@link Future} interface into an ObservableSource that emits the
-     * return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
-     * method.
-     * <p>
-     * Unlike 1.x, disposing the Observable won't cancel the future. If necessary, one can use composition to achieve the
-     * cancellation effect: {@code futureObservableSource.doOnDispose(() -> future.cancel(true));}.
-     * <dl>
-     *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
-     * </dl>
-     *
-     * @param future
-     *            the source {@link Future}
-     * @param scheduler
-     *            the {@link Scheduler} to wait for the Future on. Use a Scheduler such as
-     *            {@link Schedulers#io()} that can block and wait on the Future
-     * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting ObservableSource
-     * @return an Observable that emits the item from the source {@link Future}
-     * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
-     */
-    @CheckReturnValue
-    @NonNull
-    @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future, @NonNull Scheduler scheduler) {
-        Objects.requireNonNull(scheduler, "scheduler is null");
-        Observable<T> o = fromFuture(future);
-        return o.subscribeOn(scheduler);
-    }
-
     /**
      * Converts an {@link Iterable} sequence into an ObservableSource that emits the items in the sequence.
      * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index ed676e44fb..8da48508cd 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -722,73 +722,6 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
         return toSingle(Flowable.fromFuture(future, timeout, unit));
     }
 
-    /**
-     * Converts a {@link Future} into a {@code Single}, with a timeout on the {@code Future}.
-     * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.png" alt="">
-     * <p>
-     * You can convert any object that supports the {@code Future} interface into a {@code Single} that emits
-     * the return value of the {@link Future#get} method of that object, by passing the object into the
-     * {@code from} method.
-     * <p>
-     * <em>Important note:</em> This {@code Single} is blocking; you cannot dispose it.
-     * <dl>
-     * <dt><b>Scheduler:</b></dt>
-     * <dd>You specify the {@link Scheduler} where the blocking wait will happen.</dd>
-     * </dl>
-     *
-     * @param future
-     *            the source {@code Future}
-     * @param timeout
-     *            the maximum time to wait before calling {@code get}
-     * @param unit
-     *            the {@link TimeUnit} of the {@code timeout} argument
-     * @param scheduler
-     *            the {@code Scheduler} to use for the blocking wait
-     * @param <T>
-     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
-     *            the resulting {@code Single}
-     * @return the new {@code Single} that emits the item from the source {@code Future}
-     * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
-     */
-    @CheckReturnValue
-    @SchedulerSupport(SchedulerSupport.CUSTOM)
-    @NonNull
-    public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return toSingle(Flowable.fromFuture(future, timeout, unit, scheduler));
-    }
-
-    /**
-     * Converts a {@link Future}, operating on a specified {@link Scheduler}, into a {@code Single}.
-     * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.s.png" alt="">
-     * <p>
-     * You can convert any object that supports the {@code Future} interface into a {@code Single} that emits
-     * the return value of the {@link Future#get} method of that object, by passing the object into the
-     * {@code from} method.
-     * <dl>
-     * <dt><b>Scheduler:</b></dt>
-     * <dd>You specify which {@code Scheduler} this operator will use.</dd>
-     * </dl>
-     *
-     * @param future
-     *            the source {@code Future}
-     * @param scheduler
-     *            the {@code Scheduler} to wait for the {@code Future} on. Use a {@code Scheduler} such as
-     *            {@link Schedulers#io()} that can block and wait on the {@code Future}
-     * @param <T>
-     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
-     *            the resulting {@code Single}
-     * @return the new {@code Single} that emits the item from the source {@code Future}
-     * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
-     */
-    @CheckReturnValue
-    @SchedulerSupport(SchedulerSupport.CUSTOM)
-    @NonNull
-    public static <@NonNull T> Single<T> fromFuture(@NonNull Future<? extends T> future, @NonNull Scheduler scheduler) {
-        return toSingle(Flowable.fromFuture(future, scheduler));
-    }
-
     /**
      * Wraps a specific {@link Publisher} into a {@code Single} and signals its single element or error.
      * <p>
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
index fd9712b64d..d76b90de70 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
@@ -252,11 +252,6 @@ public void fromFutureTimedUnitNull() {
         Flowable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, null);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureTimedSchedulerNull() {
-        Flowable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, TimeUnit.SECONDS, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedReturnsNull() {
       FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
@@ -264,11 +259,6 @@ public void fromFutureTimedReturnsNull() {
         Flowable.fromFuture(f, 1, TimeUnit.SECONDS).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureSchedulerNull() {
-        Flowable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromIterableNull() {
         Flowable.fromIterable(null);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
index 524a7216e1..4241dc8be9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
@@ -62,7 +62,7 @@ public void successOperatesOnSuppliedScheduler() throws Exception {
         TestScheduler scheduler = new TestScheduler();
         TestSubscriber<Object> ts = new TestSubscriber<>(subscriber);
 
-        Flowable.fromFuture(future, scheduler).subscribe(ts);
+        Flowable.fromFuture(future).subscribeOn(scheduler).subscribe(ts);
 
         verify(subscriber, never()).onNext(value);
 
@@ -234,7 +234,7 @@ public void run() {
 
         TestSubscriber<Integer> ts = TestSubscriber.create();
 
-        Flowable.fromFuture(task, Schedulers.computation()).subscribe(ts);
+        Flowable.fromFuture(task).subscribeOn(Schedulers.computation()).subscribe(ts);
 
         task.run();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
index 0bc7a09997..e3f6f91954 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
@@ -30,7 +30,8 @@ public class ObservableFromTest extends RxJavaTest {
     @Test
     public void fromFutureTimeout() throws Exception {
         Observable.fromFuture(Observable.never()
-        .toFuture(), 100, TimeUnit.MILLISECONDS, Schedulers.io())
+        .toFuture(), 100, TimeUnit.MILLISECONDS)
+        .subscribeOn(Schedulers.io())
         .test()
         .awaitDone(5, TimeUnit.SECONDS)
         .assertFailure(TimeoutException.class);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
index 164d7f6fd6..2631dfac4e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
@@ -61,7 +61,7 @@ public void successOperatesOnSuppliedScheduler() throws Exception {
         TestScheduler scheduler = new TestScheduler();
         TestObserver<Object> to = new TestObserver<>(o);
 
-        Observable.fromFuture(future, scheduler).subscribe(to);
+        Observable.fromFuture(future).subscribeOn(scheduler).subscribe(to);
 
         verify(o, never()).onNext(value);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java
index 46847bedd3..5c7bdfd5d2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java
@@ -24,7 +24,8 @@ public class SingleFromTest extends RxJavaTest {
 
     @Test
     public void fromFuture() throws Exception {
-        Single.fromFuture(Flowable.just(1).toFuture(), Schedulers.io())
+        Single.fromFuture(Flowable.just(1).toFuture())
+        .subscribeOn(Schedulers.io())
         .test()
         .awaitDone(5, TimeUnit.SECONDS)
         .assertResult(1);
@@ -32,7 +33,8 @@ public void fromFuture() throws Exception {
 
     @Test
     public void fromFutureTimeout() throws Exception {
-        Single.fromFuture(Flowable.never().toFuture(), 1, TimeUnit.SECONDS, Schedulers.io())
+        Single.fromFuture(Flowable.never().toFuture(), 1, TimeUnit.SECONDS)
+        .subscribeOn(Schedulers.io())
         .test()
         .awaitDone(5, TimeUnit.SECONDS)
         .assertFailure(TimeoutException.class);
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
index 0fa7c22711..d4bcd85cc9 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
@@ -299,11 +299,6 @@ public void fromFutureTimedUnitNull() {
         Observable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, null);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureTimedSchedulerNull() {
-        Observable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, TimeUnit.SECONDS, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedReturnsNull() {
         FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
@@ -311,12 +306,6 @@ public void fromFutureTimedReturnsNull() {
         Observable.fromFuture(f, 1, TimeUnit.SECONDS).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureSchedulerNull() {
-        FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
-        Observable.fromFuture(f, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromIterableNull() {
         Observable.fromIterable(null);
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
index 6ffdb2ebf8..712d93f1aa 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
@@ -194,16 +194,6 @@ public Object call() throws Exception {
         }), 1, null);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureTimedSchedulerNull() {
-        Single.fromFuture(new FutureTask<>(new Callable<Object>() {
-            @Override
-            public Object call() throws Exception {
-                return null;
-            }
-        }), 1, TimeUnit.SECONDS, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedReturnsNull() {
         FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
@@ -211,16 +201,6 @@ public void fromFutureTimedReturnsNull() {
         Single.fromFuture(f, 1, TimeUnit.SECONDS).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureSchedulerNull() {
-        Single.fromFuture(new FutureTask<>(new Callable<Object>() {
-            @Override
-            public Object call() throws Exception {
-                return null;
-            }
-        }), null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromPublisherNull() {
         Single.fromPublisher(null);
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index d8c3e32636..85a6c4b0bd 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -125,7 +125,6 @@ public void checkParallelFlowable() {
 
         // negative timeout is allowed
         addOverride(new ParamOverride(Flowable.class, 1, ParamMode.ANY, "fromFuture", Future.class, Long.TYPE, TimeUnit.class));
-        addOverride(new ParamOverride(Flowable.class, 1, ParamMode.ANY, "fromFuture", Future.class, Long.TYPE, TimeUnit.class, Scheduler.class));
 
         // null default is allowed
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "blockingLast", Object.class));
@@ -325,7 +324,6 @@ public void checkParallelFlowable() {
 
         // negative timeout is allowed
         addOverride(new ParamOverride(Single.class, 1, ParamMode.ANY, "fromFuture", Future.class, Long.TYPE, TimeUnit.class));
-        addOverride(new ParamOverride(Single.class, 1, ParamMode.ANY, "fromFuture", Future.class, Long.TYPE, TimeUnit.class, Scheduler.class));
 
         // negative time is considered as zero time
         addOverride(new ParamOverride(Single.class, 0, ParamMode.ANY, "delay", Long.TYPE, TimeUnit.class));
@@ -381,7 +379,6 @@ public void checkParallelFlowable() {
 
         // negative timeout is allowed
         addOverride(new ParamOverride(Observable.class, 1, ParamMode.ANY, "fromFuture", Future.class, Long.TYPE, TimeUnit.class));
-        addOverride(new ParamOverride(Observable.class, 1, ParamMode.ANY, "fromFuture", Future.class, Long.TYPE, TimeUnit.class, Scheduler.class));
 
         // null default is allowed
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "blockingLast", Object.class));

From ed4c081724b3f094b1aed94dc0789785a636fb6c Mon Sep 17 00:00:00 2001
From: slisaasquatch <slisaasquatch@users.noreply.github.com>
Date: Tue, 7 Jan 2020 10:40:15 -0800
Subject: [PATCH 039/665] Deleted Functions.naturalOrder (#6817)

---
 .../io/reactivex/rxjava3/core/Observable.java |  4 ++--
 .../rxjava3/internal/functions/Functions.java | 21 -------------------
 2 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index c8db1606e1..5c94b3f9e2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -14692,7 +14692,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Single<@NonNull List<T>> toSortedList() {
-        return toSortedList(Functions.naturalOrder());
+        return toSortedList(Functions.naturalComparator());
     }
 
     /**
@@ -14786,7 +14786,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Single<@NonNull List<T>> toSortedList(int capacityHint) {
-        return toSortedList(Functions.naturalOrder(), capacityHint);
+        return toSortedList(Functions.naturalComparator(), capacityHint);
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
index 1fee43d07e..1d3055eb2b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
@@ -124,8 +124,6 @@ public static <T> Consumer<T> emptyConsumer() {
 
     static final Supplier<Object> NULL_SUPPLIER = new NullProvider();
 
-    static final Comparator<Object> NATURAL_COMPARATOR = new NaturalObjectComparator();
-
     @SuppressWarnings("unchecked")
     @NonNull
     public static <T> Predicate<T> alwaysTrue() {
@@ -144,17 +142,6 @@ public static <T> Supplier<T> nullSupplier() {
         return (Supplier<T>)NULL_SUPPLIER;
     }
 
-    /**
-     * Returns a natural order comparator which casts the parameters to Comparable.
-     * @param <T> the value type
-     * @return a natural order comparator which casts the parameters to Comparable
-     */
-    @SuppressWarnings("unchecked")
-    @NonNull
-    public static <T> Comparator<T> naturalOrder() {
-        return (Comparator<T>)NATURAL_COMPARATOR;
-    }
-
     static final class FutureAction implements Action {
         final Future<?> future;
 
@@ -767,14 +754,6 @@ public Object get() {
         }
     }
 
-    static final class NaturalObjectComparator implements Comparator<Object> {
-        @SuppressWarnings({ "unchecked", "rawtypes" })
-        @Override
-        public int compare(Object a, Object b) {
-            return ((Comparable)a).compareTo(b);
-        }
-    }
-
     static final class MaxRequestSubscription implements Consumer<Subscription> {
         @Override
         public void accept(Subscription t) {

From 84677c56097c5cc3d1880165e092925d794e3e42 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 8 Jan 2020 09:02:36 +0100
Subject: [PATCH 040/665] 3.x: Improve JavaDocs of Maybe (#6815)

* 3.x: Improve JavaDocs of Maybe

* Fix a mistake in Single
---
 .../java/io/reactivex/rxjava3/core/Maybe.java | 1789 +++++++++--------
 .../io/reactivex/rxjava3/core/Single.java     |    3 +-
 .../validators/JavadocCodesAndLinks.java      |    7 +-
 .../validators/ParamValidationNaming.java     |    4 +-
 4 files changed, 962 insertions(+), 841 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 84a088d5c7..e8e01a15c7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -21,7 +21,7 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
@@ -46,10 +46,10 @@
  *     onSubscribe (onSuccess | onError | onComplete)?
  * </code></pre>
  * <p>
- * Note that {@code onSuccess}, {@code onError} and {@code onComplete} are mutually exclusive events; unlike {@code Observable},
+ * Note that {@code onSuccess}, {@code onError} and {@code onComplete} are mutually exclusive events; unlike {@link Observable},
  * {@code onSuccess} is never followed by {@code onError} or {@code onComplete}.
  * <p>
- * Like {@link Observable}, a running {@code Maybe} can be stopped through the {@link Disposable} instance
+ * Like {@code Observable}, a running {@code Maybe} can be stopped through the {@link Disposable} instance
  * provided to consumers through {@link MaybeObserver#onSubscribe}.
  * <p>
  * Like an {@code Observable}, a {@code Maybe} is lazy, can be either "hot" or "cold", synchronous or
@@ -61,7 +61,7 @@
  * <p>
  * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/maybe.png" alt="">
  * <p>
- * See {@link Flowable} or {@link Observable} for the
+ * See {@link Flowable} or {@code Observable} for the
  * implementation of the Reactive Pattern for a stream or vector of values.
  * <p>
  * Example:
@@ -112,8 +112,8 @@
 public abstract class Maybe<T> implements MaybeSource<T> {
 
     /**
-     * Runs multiple MaybeSources and signals the events of the first one that signals (disposing
-     * the rest).
+     * Runs multiple {@link MaybeSource}s provided by an {@link Iterable} sequence and
+     * signals the events of the first one that signals (disposing the rest).
      * <p>
      * <img width="640" height="519" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.amb.png" alt="">
      * <dl>
@@ -121,9 +121,10 @@ public abstract class Maybe<T> implements MaybeSource<T> {
      * <dd>{@code amb} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the Iterable sequence of sources. A subscription to each source will
-     *            occur in the same order as in the Iterable.
-     * @return the new Maybe instance
+     * @param sources the {@code Iterable} sequence of sources. A subscription to each source will
+     *            occur in the same order as in the {@code Iterable}.
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -134,7 +135,7 @@ public static <T> Maybe<T> amb(@NonNull Iterable<? extends MaybeSource<? extends
     }
 
     /**
-     * Runs multiple MaybeSources and signals the events of the first one that signals (disposing
+     * Runs multiple {@link MaybeSource}s and signals the events of the first one that signals (disposing
      * the rest).
      * <p>
      * <img width="640" height="519" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.ambArray.png" alt="">
@@ -145,7 +146,7 @@ public static <T> Maybe<T> amb(@NonNull Iterable<? extends MaybeSource<? extends
      * @param <T> the value type
      * @param sources the array of sources. A subscription to each source will
      *            occur in the same order as in the array.
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -164,8 +165,8 @@ public static <T> Maybe<T> ambArray(@NonNull MaybeSource<? extends T>... sources
     }
 
     /**
-     * Concatenate the single values, in a non-overlapping fashion, of the MaybeSource sources provided by
-     * an Iterable sequence.
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link MaybeSource} sources provided by
+     * an {@link Iterable} sequence as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="526" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.i.png" alt="">
      * <dl>
@@ -175,8 +176,9 @@ public static <T> Maybe<T> ambArray(@NonNull MaybeSource<? extends T>... sources
      * <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the Iterable sequence of MaybeSource instances
-     * @return the new Flowable instance
+     * @param sources the {@code Iterable} sequence of {@code MaybeSource} instances
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -188,7 +190,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<? extends MaybeSource<? e
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by two MaybeSources, one after the other.
+     * Returns a {@link Flowable} that emits the items emitted by two {@link MaybeSource}s, one after the other.
      * <p>
      * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.png" alt="">
      * <dl>
@@ -200,10 +202,11 @@ public static <T> Flowable<T> concat(@NonNull Iterable<? extends MaybeSource<? e
      *
      * @param <T> the common value type
      * @param source1
-     *            a MaybeSource to be concatenated
+     *            a {@code MaybeSource} to be concatenated
      * @param source2
-     *            a MaybeSource to be concatenated
-     * @return a Flowable that emits items emitted by the two source MaybeSources, one after the other.
+     *            a {@code MaybeSource} to be concatenated
+     * @return a {@code Flowable} that emits items emitted by the two source {@code MaybeSource}s, one after the other.
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -217,7 +220,7 @@ public static <T> Flowable<T> concat(@NonNull MaybeSource<? extends T> source1,
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by three MaybeSources, one after the other.
+     * Returns a {@link Flowable} that emits the items emitted by three {@link MaybeSource}s, one after the other.
      * <p>
      * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.png" alt="">
      * <dl>
@@ -229,12 +232,13 @@ public static <T> Flowable<T> concat(@NonNull MaybeSource<? extends T> source1,
      *
      * @param <T> the common value type
      * @param source1
-     *            a MaybeSource to be concatenated
+     *            a {@code MaybeSource} to be concatenated
      * @param source2
-     *            a MaybeSource to be concatenated
+     *            a {@code MaybeSource} to be concatenated
      * @param source3
-     *            a MaybeSource to be concatenated
-     * @return a Flowable that emits items emitted by the three source MaybeSources, one after the other.
+     *            a {@code MaybeSource} to be concatenated
+     * @return a {@code Flowable} that emits items emitted by the three source {@code MaybeSource}s, one after the other.
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -250,7 +254,7 @@ public static <T> Flowable<T> concat(
     }
 
     /**
-     * Returns a Flowable that emits the items emitted by four MaybeSources, one after the other.
+     * Returns a {@link Flowable} that emits the items emitted by four {@link MaybeSource}s, one after the other.
      * <p>
      * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.png" alt="">
      * <dl>
@@ -262,14 +266,15 @@ public static <T> Flowable<T> concat(
      *
      * @param <T> the common value type
      * @param source1
-     *            a MaybeSource to be concatenated
+     *            a {@code MaybeSource} to be concatenated
      * @param source2
-     *            a MaybeSource to be concatenated
+     *            a {@code MaybeSource} to be concatenated
      * @param source3
-     *            a MaybeSource to be concatenated
+     *            a {@code MaybeSource} to be concatenated
      * @param source4
-     *            a MaybeSource to be concatenated
-     * @return a Flowable that emits items emitted by the four source MaybeSources, one after the other.
+     *            a {@code MaybeSource} to be concatenated
+     * @return a {@code Flowable} that emits items emitted by the four source {@code MaybeSource}s, one after the other.
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -286,21 +291,21 @@ public static <T> Flowable<T> concat(
     }
 
     /**
-     * Concatenate the single values, in a non-overlapping fashion, of the MaybeSource sources provided by
-     * a Publisher sequence.
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link MaybeSource} sources provided by
+     * a {@link Publisher} sequence as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="416" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer and
      *  expects the {@code Publisher} to honor backpressure as well. If the sources {@code Publisher}
-     *  violates this, a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException} is signalled.</dd>
+     *  violates this, a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException} is signaled.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the Publisher of MaybeSource instances
-     * @return the new Flowable instance
+     * @param sources the {@code Publisher} of {@code MaybeSource} instances
+     * @return the new {@code Flowable} instance
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -311,22 +316,24 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends MaybeSource<?
     }
 
     /**
-     * Concatenate the single values, in a non-overlapping fashion, of the MaybeSource sources provided by
-     * a Publisher sequence.
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link MaybeSource} sources provided by
+     * a {@link Publisher} sequence as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="416" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.pn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer and
      *  expects the {@code Publisher} to honor backpressure as well. If the sources {@code Publisher}
-     *  violates this, a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException} is signalled.</dd>
+     *  violates this, a {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException} is signaled.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the Publisher of MaybeSource instances
-     * @param prefetch the number of MaybeSources to prefetch from the Publisher
-     * @return the new Flowable instance
+     * @param sources the {@code Publisher} of {@code MaybeSource} instances
+     * @param prefetch the number of {@code MaybeSource}s to prefetch from the {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
+     * @return the new {@code Flowable} instance
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -340,7 +347,8 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends MaybeSource<?
     }
 
     /**
-     * Concatenate the single values, in a non-overlapping fashion, of the MaybeSource sources in the array.
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link MaybeSource} sources in the array
+     * as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="526" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatArray.png" alt="">
      * <dl>
@@ -350,8 +358,9 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends MaybeSource<?
      *  <dd>{@code concatArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources the array of MaybeSource instances
-     * @return the new Flowable instance
+     * @param sources the array of {@code MaybeSource} instances
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -372,8 +381,8 @@ public static <T> Flowable<T> concatArray(@NonNull MaybeSource<? extends T>... s
     }
 
     /**
-     * Concatenates a variable number of MaybeSource sources and delays errors from any of them
-     * till all terminate.
+     * Concatenates a variable number of {@link MaybeSource} sources and delays errors from any of them
+     * till all terminate as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatArrayDelayError.png" alt="">
      * <dl>
@@ -384,8 +393,8 @@ public static <T> Flowable<T> concatArray(@NonNull MaybeSource<? extends T>... s
      * </dl>
      * @param sources the array of sources
      * @param <T> the common base value type
-     * @return the new Flowable instance
-     * @throws NullPointerException if sources is null
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -405,10 +414,10 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? exten
     }
 
     /**
-     * Concatenates a sequence of MaybeSource eagerly into a single stream of values.
+     * Concatenates a sequence of {@link MaybeSource} eagerly into a {@link Flowable} sequence.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source MaybeSources. The operator buffers the value emitted by these MaybeSources and then drains them
+     * source {@code MaybeSource}s. The operator buffers the value emitted by these {@code MaybeSource}s and then drains them
      * in order, each one after the previous one completes.
      * <p>
      * <img width="640" height="489" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatArrayEager.png" alt="">
@@ -419,8 +428,8 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? exten
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of MaybeSources that need to be eagerly concatenated
-     * @return the new Flowable instance with the specified concatenation behavior
+     * @param sources a sequence of {@code MaybeSource}s that need to be eagerly concatenated
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @BackpressureSupport(BackpressureKind.FULL)
@@ -433,8 +442,9 @@ public static <T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>
     }
 
     /**
-     * Concatenates the Iterable sequence of MaybeSources into a single sequence by subscribing to each MaybeSource,
-     * one after the other, one at a time and delays any errors till the all inner MaybeSources terminate.
+     * Concatenates the {@link Iterable} sequence of {@link MaybeSource}s into a single sequence by subscribing to each {@code MaybeSource},
+     * one after the other, one at a time and delays any errors till the all inner {@code MaybeSource}s terminate
+     * as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="469" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatDelayError.i.png" alt="">
      * <dl>
@@ -445,8 +455,9 @@ public static <T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>
      * </dl>
      *
      * @param <T> the common element base type
-     * @param sources the Iterable sequence of MaybeSources
-     * @return the new Flowable with the concatenating behavior
+     * @param sources the {@code Iterable} sequence of {@code MaybeSource}s
+     * @return the new {@code Flowable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @BackpressureSupport(BackpressureKind.FULL)
@@ -459,8 +470,9 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Maybe
     }
 
     /**
-     * Concatenates the Publisher sequence of Publishers into a single sequence by subscribing to each inner Publisher,
-     * one after the other, one at a time and delays any errors till the all inner and the outer Publishers terminate.
+     * Concatenates the {@link Publisher} sequence of {@link MaybeSource}s into a single sequence by subscribing to each inner {@code MaybeSource},
+     * one after the other, one at a time and delays any errors till the all inner and the outer {@code Publisher} terminate
+     * as a {@link Flowable} sequence.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatDelayError.p.png" alt="">
      * <dl>
@@ -471,8 +483,8 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Maybe
      * </dl>
      *
      * @param <T> the common element base type
-     * @param sources the Publisher sequence of Publishers
-     * @return the new Publisher with the concatenating behavior
+     * @param sources the {@code Publisher} sequence of {@code MaybeSource}s
+     * @return the new {@code Flowable} with the concatenating behavior
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @BackpressureSupport(BackpressureKind.FULL)
@@ -484,10 +496,10 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Mayb
     }
 
     /**
-     * Concatenates a sequence of MaybeSources eagerly into a single stream of values.
+     * Concatenates a sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source MaybeSources. The operator buffers the values emitted by these MaybeSources and then drains them
+     * source {@code MaybeSource}s. The operator buffers the values emitted by these {@code MaybeSource}s and then drains them
      * in order, each one after the previous one completes.
      * <p>
      * <img width="640" height="526" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEager.i.png" alt="">
@@ -498,8 +510,8 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Mayb
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of MaybeSource that need to be eagerly concatenated
-     * @return the new Flowable instance with the specified concatenation behavior
+     * @param sources a sequence of {@code MaybeSource} that need to be eagerly concatenated
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @BackpressureSupport(BackpressureKind.FULL)
@@ -511,24 +523,24 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends MaybeSourc
     }
 
     /**
-     * Concatenates a Publisher sequence of MaybeSources eagerly into a single stream of values.
+     * Concatenates a {@link Publisher} sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * emitted source Publishers as they are observed. The operator buffers the values emitted by these
-     * Publishers and then drains them in order, each one after the previous one completes.
+     * emitted source {@code MaybeSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code MaybeSource}s and then drains them in order, each one after the previous one completes.
      * <p>
      * <img width="640" height="511" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEager.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>Backpressure is honored towards the downstream and the outer Publisher is
+     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
      *  expected to support backpressure. Violating this assumption, the operator will
      *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of Publishers that need to be eagerly concatenated
-     * @return the new Publisher instance with the specified concatenation behavior
+     * @param sources a sequence of {@code MaybeSource}s that need to be eagerly concatenated
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @BackpressureSupport(BackpressureKind.FULL)
@@ -540,7 +552,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends MaybeSour
     }
 
     /**
-     * Provides an API (via a cold Maybe) that bridges the reactive world with the callback-style world.
+     * Provides an API (via a cold {@code Maybe}) that bridges the reactive world with the callback-style world.
      * <p>
      * Example:
      * <pre><code>
@@ -571,15 +583,16 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends MaybeSour
      * Whenever a {@link MaybeObserver} subscribes to the returned {@code Maybe}, the provided
      * {@link MaybeOnSubscribe} callback is invoked with a fresh instance of a {@link MaybeEmitter}
      * that will interact only with that specific {@code MaybeObserver}. If this {@code MaybeObserver}
-     * disposes the flow (making {@link MaybeEmitter#isDisposed} return true),
+     * disposes the flow (making {@link MaybeEmitter#isDisposed} return {@code true}),
      * other observers subscribed to the same returned {@code Maybe} are not affected.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code create} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param onSubscribe the emitter that is called when a MaybeObserver subscribes to the returned {@code Maybe}
-     * @return the new Maybe instance
+     * @param onSubscribe the emitter that is called when a {@code MaybeObserver} subscribes to the returned {@code Maybe}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @see MaybeOnSubscribe
      * @see Cancellable
      */
@@ -592,16 +605,17 @@ public static <T> Maybe<T> create(@NonNull MaybeOnSubscribe<T> onSubscribe) {
     }
 
     /**
-     * Calls a Supplier for each individual MaybeObserver to return the actual MaybeSource source to
+     * Calls a {@link Supplier} for each individual {@link MaybeObserver} to return the actual {@link MaybeSource} source to
      * be subscribed to.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code defer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param maybeSupplier the Supplier that is called for each individual MaybeObserver and
-     * returns a MaybeSource instance to subscribe to
-     * @return the new Maybe instance
+     * @param maybeSupplier the {@code Supplier} that is called for each individual {@code MaybeObserver} and
+     * returns a {@code MaybeSource} instance to subscribe to
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code maybeSupplier} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -612,7 +626,7 @@ public static <T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? exten
     }
 
     /**
-     * Returns a (singleton) Maybe instance that calls {@link MaybeObserver#onComplete onComplete}
+     * Returns a (singleton) {@code Maybe} instance that calls {@link MaybeObserver#onComplete onComplete}
      * immediately.
      * <p>
      * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/empty.png" alt="">
@@ -621,7 +635,7 @@ public static <T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? exten
      *  <dd>{@code empty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -632,7 +646,7 @@ public static <T> Maybe<T> empty() {
     }
 
     /**
-     * Returns a Maybe that invokes a subscriber's {@link MaybeObserver#onError onError} method when the
+     * Returns a {@code Maybe} that invokes a subscriber's {@link MaybeObserver#onError onError} method when the
      * subscriber subscribes to it.
      * <p>
      * <img width="640" height="447" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.error.png" alt="">
@@ -641,25 +655,26 @@ public static <T> Maybe<T> empty() {
      * <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param exception
-     *            the particular Throwable to pass to {@link MaybeObserver#onError onError}
+     * @param error
+     *            the particular {@link Throwable} to pass to {@link MaybeObserver#onError onError}
      * @param <T>
-     *            the type of the item (ostensibly) emitted by the Maybe
-     * @return a Maybe that invokes the subscriber's {@link MaybeObserver#onError onError} method when
+     *            the type of the item (ostensibly) emitted by the {@code Maybe}
+     * @return a {@code Maybe} that invokes the subscriber's {@link MaybeObserver#onError onError} method when
      *         the subscriber subscribes to it
+     * @throws NullPointerException if {@code error} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> error(@NonNull Throwable exception) {
-        Objects.requireNonNull(exception, "exception is null");
-        return RxJavaPlugins.onAssembly(new MaybeError<>(exception));
+    public static <T> Maybe<T> error(@NonNull Throwable error) {
+        Objects.requireNonNull(error, "error is null");
+        return RxJavaPlugins.onAssembly(new MaybeError<>(error));
     }
 
     /**
-     * Returns a Maybe that invokes a {@link MaybeObserver}'s {@link MaybeObserver#onError onError} method when the
-     * MaybeObserver subscribes to it.
+     * Returns a {@code Maybe} that invokes a {@link MaybeObserver}'s {@link MaybeObserver#onError onError} method when the
+     * {@code MaybeObserver} subscribes to it.
      * <p>
      * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.png" alt="">
      * <dl>
@@ -668,11 +683,12 @@ public static <T> Maybe<T> error(@NonNull Throwable exception) {
      * </dl>
      *
      * @param supplier
-     *            a Supplier factory to return a Throwable for each individual MaybeObserver
+     *            a {@link Supplier} factory to return a {@link Throwable} for each individual {@code MaybeObserver}
      * @param <T>
-     *            the type of the items (ostensibly) emitted by the Maybe
-     * @return a Maybe that invokes the {@link MaybeObserver}'s {@link MaybeObserver#onError onError} method when
-     *         the MaybeObserver subscribes to it
+     *            the type of the items (ostensibly) emitted by the {@code Maybe}
+     * @return a {@code Maybe} that invokes the {@code MaybeObserver.onError} method when
+     *         the {@code MaybeObserver} subscribes to it
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
@@ -684,13 +700,13 @@ public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier
     }
 
     /**
-     * Returns a Maybe instance that runs the given Action for each subscriber and
+     * Returns a {@code Maybe} instance that runs the given {@link Action} for each subscriber and
      * emits either its exception or simply completes.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromAction} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd> If the {@link Action} throws an exception, the respective {@link Throwable} is
+     *  <dd> If the {@code Action} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link MaybeObserver#onError(Throwable)},
      *  except when the downstream has disposed this {@code Maybe} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
@@ -698,29 +714,29 @@ public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier
      *  </dd>
      * </dl>
      * @param <T> the target type
-     * @param run the runnable to run for each subscriber
-     * @return the new Maybe instance
-     * @throws NullPointerException if run is null
+     * @param action the {@code Action} to run for each subscriber
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code action} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromAction(@NonNull Action run) {
-        Objects.requireNonNull(run, "run is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromAction<>(run));
+    public static <T> Maybe<T> fromAction(@NonNull Action action) {
+        Objects.requireNonNull(action, "action is null");
+        return RxJavaPlugins.onAssembly(new MaybeFromAction<>(action));
     }
 
     /**
-     * Wraps a CompletableSource into a Maybe.
+     * Wraps a {@link CompletableSource} into a {@code Maybe}.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the target type
-     * @param completableSource the CompletableSource to convert from
-     * @return the new Maybe instance
-     * @throws NullPointerException if completable is null
+     * @param completableSource the {@code CompletableSource} to convert from
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code completableSource} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -731,16 +747,16 @@ public static <T> Maybe<T> fromCompletable(@NonNull CompletableSource completabl
     }
 
     /**
-     * Wraps a SingleSource into a Maybe.
+     * Wraps a {@link SingleSource} into a {@code Maybe}.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the target type
-     * @param singleSource the SingleSource to convert from
-     * @return the new Maybe instance
-     * @throws NullPointerException if single is null
+     * @param singleSource the {@code SingleSource} to convert from
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code singleSource} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -751,17 +767,17 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
     }
 
     /**
-     * Returns a {@link Maybe} that invokes the given {@link Callable} for each individual {@link MaybeObserver} that
-     * subscribes and emits the resulting non-null item via {@code onSuccess} while
+     * Returns a {@code Maybe} that invokes the given {@link Callable} for each individual {@link MaybeObserver} that
+     * subscribes and emits the resulting non-{@code null} item via {@code onSuccess} while
      * considering a {@code null} result from the {@code Callable} as indication for valueless completion
      * via {@code onComplete}.
      * <p>
      * This operator allows you to defer the execution of the given {@code Callable} until a {@code MaybeObserver}
-     * subscribes to the  returned {@link Maybe}. In other terms, this source operator evaluates the given
+     * subscribes to the  returned {@code Maybe}. In other terms, this source operator evaluates the given
      * {@code Callable} "lazily".
      * <p>
      * Note that the {@code null} handling of this operator differs from the similar source operators in the other
-     * {@link io.reactivex.rxjava3.core base reactive classes}. Those operators signal a {@code NullPointerException} if the value returned by their
+     * {@link io.reactivex.rxjava3.core base reactive classes}. Those operators signal a {@link NullPointerException} if the value returned by their
      * {@code Callable} is {@code null} while this {@code fromCallable} considers it to indicate the
      * returned {@code Maybe} is empty.
      * <dl>
@@ -778,11 +794,12 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
      * </dl>
      *
      * @param callable
-     *         a {@link Callable} instance whose execution should be deferred and performed for each individual
-     *         {@code MaybeObserver} that subscribes to the returned {@link Maybe}.
+     *         a {@code Callable} instance whose execution should be deferred and performed for each individual
+     *         {@code MaybeObserver} that subscribes to the returned {@code Maybe}.
      * @param <T>
-     *         the type of the item emitted by the {@link Maybe}.
-     * @return a new Maybe instance
+     *         the type of the item emitted by the {@code Maybe}.
+     * @return a new {@code Maybe} instance
+     * @throws NullPointerException if {@code callable} is {@code null}
      * @see #defer(Supplier)
      * @see #fromSupplier(Supplier)
      */
@@ -795,29 +812,29 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
     }
 
     /**
-     * Converts a {@link Future} into a Maybe, treating a null result as an indication of emptiness.
+     * Converts a {@link Future} into a {@code Maybe}, treating a {@code null} result as an indication of emptiness.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a Maybe that emits the
-     * return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
-     * method.
+     * The operator calls {@link Future#get()}, which is a blocking method, on the subscription thread.
+     * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
+     * background thread, and if the {@link Scheduler} supports it, interrupt the wait when the flow
+     * is disposed.
      * <p>
-     * <em>Important note:</em> This Maybe is blocking; you cannot dispose it.
-     * <p>
-     * Unlike 1.x, disposing the Maybe won't cancel the future. If necessary, one can use composition to achieve the
+     * Unlike 1.x, disposing the {@code Maybe} won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futureMaybe.doOnDispose(() -> future.cancel(true));}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code fromFuture} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting Maybe
-     * @return a Maybe that emits the item from the source {@link Future}
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
+     *            the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the item from the source {@code Future}
+     * @throws NullPointerException if {@code future} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -829,33 +846,33 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
     }
 
     /**
-     * Converts a {@link Future} into a Maybe, with a timeout on the Future.
+     * Converts a {@link Future} into a {@code Maybe}, with a timeout on the {@code Future}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into a Maybe that emits the
-     * return value of the {@link Future#get} method of that object, by passing the object into the {@code fromFuture}
-     * method.
+     * The operator calls {@link Future#get(long, TimeUnit)}, which is a blocking method, on the subscription thread.
+     * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
+     * background thread, and if the {@link Scheduler} supports it, interrupt the wait when the flow
+     * is disposed.
      * <p>
-     * Unlike 1.x, disposing the Maybe won't cancel the future. If necessary, one can use composition to achieve the
+     * Unlike 1.x, disposing the {@code Maybe} won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futureMaybe.doOnCancel(() -> future.cancel(true));}.
-     * <p>
-     * <em>Important note:</em> This Maybe is blocking on the thread it gets subscribed on; you cannot dispose it.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code fromFuture} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param timeout
      *            the maximum time to wait before calling {@code get}
      * @param unit
      *            the {@link TimeUnit} of the {@code timeout} argument
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting Maybe
-     * @return a Maybe that emits the item from the source {@link Future}
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
+     *            the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the item from the source {@code Future}
+     * @throws NullPointerException if {@code future} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -868,16 +885,16 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
     }
 
     /**
-     * Returns a Maybe instance that runs the given Action for each subscriber and
+     * Returns a {@code Maybe} instance that runs the given {@link Runnable} for each subscriber and
      * emits either its exception or simply completes.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the target type
-     * @param run the runnable to run for each subscriber
-     * @return the new Maybe instance
-     * @throws NullPointerException if run is null
+     * @param run the {@code Runnable} to run for each subscriber
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code run} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -888,19 +905,19 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
     }
 
     /**
-     * Returns a {@link Maybe} that invokes the given {@link Supplier} for each individual {@link MaybeObserver} that
-     * subscribes and emits the resulting non-null item via {@code onSuccess} while
+     * Returns a {@code Maybe} that invokes the given {@link Supplier} for each individual {@link MaybeObserver} that
+     * subscribes and emits the resulting non-{@code null} item via {@code onSuccess} while
      * considering a {@code null} result from the {@code Supplier} as indication for valueless completion
      * via {@code onComplete}.
      * <p>
      * This operator allows you to defer the execution of the given {@code Supplier} until a {@code MaybeObserver}
-     * subscribes to the  returned {@link Maybe}. In other terms, this source operator evaluates the given
+     * subscribes to the  returned {@code Maybe}. In other terms, this source operator evaluates the given
      * {@code Supplier} "lazily".
      * <p>
      * <img width="640" height="311" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromSupplier.png" alt="">
      * <p>
      * Note that the {@code null} handling of this operator differs from the similar source operators in the other
-     * {@link io.reactivex.rxjava3.core base reactive classes}. Those operators signal a {@code NullPointerException} if the value returned by their
+     * {@link io.reactivex.rxjava3.core base reactive classes}. Those operators signal a {@link NullPointerException} if the value returned by their
      * {@code Supplier} is {@code null} while this {@code fromSupplier} considers it to indicate the
      * returned {@code Maybe} is empty.
      * <dl>
@@ -917,11 +934,12 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
      * </dl>
      *
      * @param supplier
-     *         a {@link Supplier} instance whose execution should be deferred and performed for each individual
-     *         {@code MaybeObserver} that subscribes to the returned {@link Maybe}.
+     *         a {@code Supplier} instance whose execution should be deferred and performed for each individual
+     *         {@code MaybeObserver} that subscribes to the returned {@code Maybe}.
      * @param <T>
-     *         the type of the item emitted by the {@link Maybe}.
-     * @return a new Maybe instance
+     *         the type of the item emitted by the {@code Maybe}.
+     * @return a new {@code Maybe} instance
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see #defer(Supplier)
      * @see #fromCallable(Callable)
      * @since 3.0.0
@@ -951,6 +969,7 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
      * @param <T>
      *            the type of that item
      * @return a {@code Maybe} that emits {@code item}
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -962,21 +981,21 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
     }
 
     /**
-     * Merges an Iterable sequence of MaybeSource instances into a single Flowable sequence,
-     * running all MaybeSources at once.
+     * Merges an {@link Iterable} sequence of {@link MaybeSource} instances into a single {@link Flowable} sequence,
+     * running all {@code MaybeSource}s at once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code MaybeSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code MaybeSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code MaybeSource}s are disposed.
      *  If more than one {@code MaybeSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Iterable)} to merge sources and terminate only when all source {@code MaybeSource}s
@@ -984,8 +1003,9 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
      *  </dd>
      * </dl>
      * @param <T> the common and resulting value type
-     * @param sources the Iterable sequence of MaybeSource sources
-     * @return the new Flowable instance
+     * @param sources the {@code Iterable} sequence of {@code MaybeSource} sources
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see #mergeDelayError(Iterable)
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -997,21 +1017,21 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends MaybeSource<? ex
     }
 
     /**
-     * Merges a Flowable sequence of MaybeSource instances into a single Flowable sequence,
-     * running all MaybeSources at once.
+     * Merges a {@link Publisher} sequence of {@link MaybeSource} instances into a single {@link Flowable} sequence,
+     * running all {@code MaybeSource}s at once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code MaybeSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code MaybeSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code MaybeSource}s are disposed.
      *  If more than one {@code MaybeSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher)} to merge sources and terminate only when all source {@code MaybeSource}s
@@ -1019,8 +1039,8 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends MaybeSource<? ex
      *  </dd>
      * </dl>
      * @param <T> the common and resulting value type
-     * @param sources the Flowable sequence of MaybeSource sources
-     * @return the new Flowable instance
+     * @param sources the {@code Flowable} sequence of {@code MaybeSource} sources
+     * @return the new {@code Flowable} instance
      * @see #mergeDelayError(Publisher)
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1032,21 +1052,21 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? e
     }
 
     /**
-     * Merges a Flowable sequence of MaybeSource instances into a single Flowable sequence,
-     * running at most maxConcurrency MaybeSources at once.
+     * Merges a {@link Publisher} sequence of {@link MaybeSource} instances into a single {@link Flowable} sequence,
+     * running at most maxConcurrency {@code MaybeSource}s at once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code MaybeSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code MaybeSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code MaybeSource}s are disposed.
      *  If more than one {@code MaybeSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Publisher, int)} to merge sources and terminate only when all source {@code MaybeSource}s
@@ -1054,9 +1074,11 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? e
      *  </dd>
      * </dl>
      * @param <T> the common and resulting value type
-     * @param sources the Flowable sequence of MaybeSource sources
-     * @param maxConcurrency the maximum number of concurrently running MaybeSources
-     * @return the new Flowable instance
+     * @param sources the {@code Flowable} sequence of {@code MaybeSource} sources
+     * @param maxConcurrency the maximum number of concurrently running {@code MaybeSource}s
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see #mergeDelayError(Publisher, int)
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1071,7 +1093,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? e
     }
 
     /**
-     * Flattens a {@code MaybeSource} that emits a {@code MaybeSource} into a single {@code MaybeSource} that emits the item
+     * Flattens a {@link MaybeSource} that emits a {@code MaybeSource} into a single {@code MaybeSource} that emits the item
      * emitted by the nested {@code MaybeSource}, without any transformation.
      * <p>
      * <img width="640" height="393" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.oo.png" alt="">
@@ -1079,8 +1101,8 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? e
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      * <dt><b>Error handling:</b></dt>
-     * <dd>The resulting {@code Maybe} emits the outer source's or the inner {@code MaybeSource}'s {@code Throwable} as is.
-     * Unlike the other {@code merge()} operators, this operator won't and can't produce a {@code CompositeException} because there is
+     * <dd>The resulting {@code Maybe} emits the outer source's or the inner {@code MaybeSource}'s {@link Throwable} as is.
+     * Unlike the other {@code merge()} operators, this operator won't and can't produce a {@link CompositeException} because there is
      * only one possibility for the outer or the inner {@code MaybeSource} to emit an {@code onError} signal.
      * Therefore, there is no need for a {@code mergeDelayError(MaybeSource<MaybeSource<T>>)} operator.
      * </dd>
@@ -1091,6 +1113,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? e
      *            a {@code MaybeSource} that emits a {@code MaybeSource}
      * @return a {@code Maybe} that emits the item that is the result of flattening the {@code MaybeSource} emitted
      *         by {@code source}
+     * @throws NullPointerException if {@code source} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @CheckReturnValue
@@ -1103,11 +1126,11 @@ public static <T> Maybe<T> merge(@NonNull MaybeSource<? extends MaybeSource<? ex
     }
 
     /**
-     * Flattens two MaybeSources into a single Flowable, without any transformation.
+     * Flattens two {@link MaybeSource}s into a single {@link Flowable}, without any transformation.
      * <p>
      * <img width="640" height="483" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple MaybeSources so that they appear as a single Flowable, by
+     * You can combine items emitted by multiple {@code MaybeSource}s so that they appear as a single {@code Flowable}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1115,13 +1138,13 @@ public static <T> Maybe<T> merge(@NonNull MaybeSource<? extends MaybeSource<? ex
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code MaybeSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code MaybeSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code MaybeSource}s are disposed.
      *  If more than one {@code MaybeSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(MaybeSource, MaybeSource)} to merge sources and terminate only when all source {@code MaybeSource}s
@@ -1131,10 +1154,11 @@ public static <T> Maybe<T> merge(@NonNull MaybeSource<? extends MaybeSource<? ex
      *
      * @param <T> the common value type
      * @param source1
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source2
-     *            a MaybeSource to be merged
-     * @return a Flowable that emits all of the items emitted by the source MaybeSources
+     *            a {@code MaybeSource} to be merged
+     * @return a {@code Flowable} that emits all of the items emitted by the source {@code MaybeSource}s
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(MaybeSource, MaybeSource)
      */
@@ -1151,11 +1175,11 @@ public static <T> Flowable<T> merge(
     }
 
     /**
-     * Flattens three MaybeSources into a single Flowable, without any transformation.
+     * Flattens three {@link MaybeSource}s into a single {@link Flowable}, without any transformation.
      * <p>
      * <img width="640" height="483" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple MaybeSources so that they appear as a single Flowable, by using
+     * You can combine items emitted by multiple {@code MaybeSource}s so that they appear as a single {@code Flowable}, by using
      * the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1163,13 +1187,13 @@ public static <T> Flowable<T> merge(
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code MaybeSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code MaybeSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code MaybeSource}s are disposed.
      *  If more than one {@code MaybeSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(MaybeSource, MaybeSource, MaybeSource)} to merge sources and terminate only when all source {@code MaybeSource}s
@@ -1179,12 +1203,13 @@ public static <T> Flowable<T> merge(
      *
      * @param <T> the common value type
      * @param source1
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source2
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source3
-     *            a MaybeSource to be merged
-     * @return a Flowable that emits all of the items emitted by the source MaybeSources
+     *            a {@code MaybeSource} to be merged
+     * @return a {@code Flowable} that emits all of the items emitted by the source {@code MaybeSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(MaybeSource, MaybeSource, MaybeSource)
      */
@@ -1203,11 +1228,11 @@ public static <T> Flowable<T> merge(
     }
 
     /**
-     * Flattens four MaybeSources into a single Flowable, without any transformation.
+     * Flattens four {@link MaybeSource}s into a single {@link Flowable}, without any transformation.
      * <p>
      * <img width="640" height="483" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple MaybeSources so that they appear as a single Flowable, by using
+     * You can combine items emitted by multiple {@code MaybeSource}s so that they appear as a single {@code Flowable}, by using
      * the {@code merge} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1215,13 +1240,13 @@ public static <T> Flowable<T> merge(
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code MaybeSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code MaybeSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code MaybeSource}s are disposed.
      *  If more than one {@code MaybeSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(MaybeSource, MaybeSource, MaybeSource, MaybeSource)} to merge sources and terminate only when all source {@code MaybeSource}s
@@ -1231,14 +1256,15 @@ public static <T> Flowable<T> merge(
      *
      * @param <T> the common value type
      * @param source1
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source2
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source3
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source4
-     *            a MaybeSource to be merged
-     * @return a Flowable that emits all of the items emitted by the source MaybeSources
+     *            a {@code MaybeSource} to be merged
+     * @return a {@code Flowable} that emits all of the items emitted by the source {@code MaybeSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(MaybeSource, MaybeSource, MaybeSource, MaybeSource)
      */
@@ -1258,21 +1284,21 @@ public static <T> Flowable<T> merge(
     }
 
     /**
-     * Merges an array sequence of MaybeSource instances into a single Flowable sequence,
-     * running all MaybeSources at once.
+     * Merges an array sequence of {@link MaybeSource} instances into a single {@link Flowable} sequence,
+     * running all {@code MaybeSource}s at once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code mergeArray} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code MaybeSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the source {@code MaybeSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code MaybeSource}s are disposed.
      *  If more than one {@code MaybeSource} signals an error, the resulting {@code Flowable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeArrayDelayError(MaybeSource...)} to merge sources and terminate only when all source {@code MaybeSource}s
@@ -1280,8 +1306,9 @@ public static <T> Flowable<T> merge(
      *  </dd>
      * </dl>
      * @param <T> the common and resulting value type
-     * @param sources the array sequence of MaybeSource sources
-     * @return the new Flowable instance
+     * @param sources the array sequence of {@code MaybeSource} sources
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see #mergeArrayDelayError(MaybeSource...)
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1303,18 +1330,18 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
     }
 
     /**
-     * Flattens an array of MaybeSources into one Flowable, in a way that allows a Subscriber to receive all
-     * successfully emitted items from each of the source MaybeSources without being interrupted by an error
+     * Flattens an array of {@link MaybeSource}s into one {@link Flowable}, in a way that allows a subscriber to receive all
+     * successfully emitted items from each of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged MaybeSources notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code MaybeSource}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged MaybeSources have finished emitting items.
+     * error notification until all of the merged {@code MaybeSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged MaybeSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its subscribers once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1324,9 +1351,10 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of MaybeSources
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         MaybeSources in the Iterable
+     *            the array of {@code MaybeSource}s
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code MaybeSource}s in the array
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -1343,18 +1371,18 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extend
     }
 
     /**
-     * Flattens an Iterable of MaybeSources into one Flowable, in a way that allows a Subscriber to receive all
-     * successfully emitted items from each of the source MaybeSources without being interrupted by an error
+     * Flattens an {@link Iterable} sequence of {@link MaybeSource}s into one {@link Flowable}, in a way that allows a subscriber to receive all
+     * successfully emitted items from each of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged MaybeSources notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code MaybeSource}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged MaybeSources have finished emitting items.
+     * error notification until all of the merged {@code MaybeSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged MaybeSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its subscribers once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1364,9 +1392,10 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extend
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of MaybeSources
-     * @return a Flowable that emits items that are the result of flattening the items emitted by the
-     *         MaybeSources in the Iterable
+     *            the {@code Iterable} of {@code MaybeSource}s
+     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
+     *         {@code MaybeSource}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -1379,18 +1408,18 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends MaybeS
     }
 
     /**
-     * Flattens a Publisher that emits MaybeSources into one Publisher, in a way that allows a Subscriber to
-     * receive all successfully emitted items from all of the source MaybeSources without being interrupted by
-     * an error notification from one of them or even the main Publisher.
+     * Flattens a {@link Publisher} that emits {@link MaybeSource}s into one {@link Flowable}, in a way that allows a subscriber to
+     * receive all successfully emitted items from all of the source {@code MaybeSource}s without being interrupted by
+     * an error notification from one of them or even the main {@code Publisher}.
      * <p>
-     * This behaves like {@link #merge(Publisher)} except that if any of the merged MaybeSources notify of an
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code MaybeSource}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged MaybeSources and the main Publisher have finished emitting items.
+     * error notification until all of the merged {@code MaybeSource}s and the main {@code Publisher} have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its subscribers once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed
@@ -1401,9 +1430,9 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends MaybeS
      *
      * @param <T> the common element base type
      * @param sources
-     *            a Publisher that emits MaybeSources
-     * @return a Flowable that emits all of the items emitted by the Publishers emitted by the
-     *         {@code source} Publisher
+     *            a {@code Publisher} that emits {@code MaybeSource}s
+     * @return a {@code Flowable} that emits all of the items emitted by the {@code MaybeSource}s emitted by the
+     *         {@code source} {@code Publisher}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1415,18 +1444,18 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Maybe
     }
 
     /**
-     * Flattens a Publisher that emits MaybeSources into one Publisher, in a way that allows a Subscriber to
-     * receive all successfully emitted items from all of the source MaybeSources without being interrupted by
-     * an error notification from one of them or even the main Publisher as well as limiting the total number of active MaybeSources.
+     * Flattens a {@link Publisher} that emits {@link MaybeSource}s into one {@link Flowable}, in a way that allows a subscriber to
+     * receive all successfully emitted items from all of the source {@code MaybeSource}s without being interrupted by
+     * an error notification from one of them or even the main {@code Publisher} as well as limiting the total number of active {@code MaybeSource}s.
      * <p>
-     * This behaves like {@link #merge(Publisher, int)} except that if any of the merged MaybeSources notify of an
+     * This behaves like {@link #merge(Publisher, int)} except that if any of the merged {@code MaybeSource}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged MaybeSources and the main Publisher have finished emitting items.
+     * error notification until all of the merged {@code MaybeSource}s and the main {@code Publisher} have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged Publishers send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its subscribers once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed
@@ -1437,10 +1466,12 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Maybe
      * <p>History: 2.1.9 - experimental
      * @param <T> the common element base type
      * @param sources
-     *            a Publisher that emits MaybeSources
-     * @param maxConcurrency the maximum number of active inner MaybeSources to be merged at a time
-     * @return a Flowable that emits all of the items emitted by the Publishers emitted by the
-     *         {@code source} Publisher
+     *            a {@code Publisher} that emits {@code MaybeSource}s
+     * @param maxConcurrency the maximum number of active inner {@code MaybeSource}s to be merged at a time
+     * @return a {@code Flowable} that emits all of the items emitted by the {@code MaybeSource}s emitted by the
+     *         {@code source} {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @since 2.2
      */
@@ -1456,18 +1487,18 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Maybe
     }
 
     /**
-     * Flattens two MaybeSources into one Flowable, in a way that allows a Subscriber to receive all
-     * successfully emitted items from each of the source MaybeSources without being interrupted by an error
+     * Flattens two {@link MaybeSource}s into one {@link Flowable}, in a way that allows a subscriber to receive all
+     * successfully emitted items from each of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
-     * This behaves like {@link #merge(MaybeSource, MaybeSource)} except that if any of the merged MaybeSources
+     * This behaves like {@link #merge(MaybeSource, MaybeSource)} except that if any of the merged {@code MaybeSource}s
      * notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from
-     * propagating that error notification until all of the merged MaybeSources have finished emitting items.
+     * propagating that error notification until all of the merged {@code MaybeSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if both merged MaybeSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if both merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its subscribers once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1477,10 +1508,11 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Maybe
      *
      * @param <T> the common element base type
      * @param source1
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source2
-     *            a MaybeSource to be merged
-     * @return a Flowable that emits all of the items that are emitted by the two source MaybeSources
+     *            a {@code MaybeSource} to be merged
+     * @return a {@code Flowable} that emits all of the items that are emitted by the two source {@code MaybeSource}s
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1494,19 +1526,19 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
     }
 
     /**
-     * Flattens three MaybeSource into one Flowable, in a way that allows a Subscriber to receive all
-     * successfully emitted items from all of the source MaybeSources without being interrupted by an error
+     * Flattens three {@link MaybeSource} into one {@link Flowable}, in a way that allows a subscriber to receive all
+     * successfully emitted items from all of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
      * This behaves like {@link #merge(MaybeSource, MaybeSource, MaybeSource)} except that if any of the merged
-     * MaybeSources notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain
-     * from propagating that error notification until all of the merged MaybeSources have finished emitting
+     * {@code MaybeSource}s notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain
+     * from propagating that error notification until all of the merged {@code MaybeSource}s have finished emitting
      * items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged MaybeSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its subscribers once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1516,12 +1548,13 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
      *
      * @param <T> the common element base type
      * @param source1
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source2
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source3
-     *            a MaybeSource to be merged
-     * @return a Flowable that emits all of the items that are emitted by the source MaybeSources
+     *            a {@code MaybeSource} to be merged
+     * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code MaybeSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1537,19 +1570,19 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
     }
 
     /**
-     * Flattens four MaybeSources into one Flowable, in a way that allows a Subscriber to receive all
-     * successfully emitted items from all of the source MaybeSources without being interrupted by an error
+     * Flattens four {@link MaybeSource}s into one {@link Flowable}, in a way that allows a subscriber to receive all
+     * successfully emitted items from all of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
      * This behaves like {@link #merge(MaybeSource, MaybeSource, MaybeSource, MaybeSource)} except that if any of
-     * the merged MaybeSources notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError}
-     * will refrain from propagating that error notification until all of the merged MaybeSources have finished
+     * the merged {@code MaybeSource}s notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError}
+     * will refrain from propagating that error notification until all of the merged {@code MaybeSource}s have finished
      * emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged MaybeSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Subscribers once.
+     * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its subscribers once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1559,14 +1592,15 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
      *
      * @param <T> the common element base type
      * @param source1
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source2
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source3
-     *            a MaybeSource to be merged
+     *            a {@code MaybeSource} to be merged
      * @param source4
-     *            a MaybeSource to be merged
-     * @return a Flowable that emits all of the items that are emitted by the source MaybeSources
+     *            a {@code MaybeSource} to be merged
+     * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code MaybeSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1584,19 +1618,19 @@ public static <T> Flowable<T> mergeDelayError(
     }
 
     /**
-     * Returns a Maybe that never sends any items or notifications to a {@link MaybeObserver}.
+     * Returns a {@code Maybe} that never sends any items or notifications to a {@link MaybeObserver}.
      * <p>
      * <img width="640" height="185" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/never.png" alt="">
      * <p>
-     * This Maybe is useful primarily for testing purposes.
+     * This {@code Maybe} is useful primarily for testing purposes.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code never} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T>
-     *            the type of items (not) emitted by the Maybe
-     * @return a Maybe that never emits any items or sends any notifications to a {@link MaybeObserver}
+     *            the type of items (not) emitted by the {@code Maybe}
+     * @return a {@code Maybe} that never emits any items or sends any notifications to a {@code MaybeObserver}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Never</a>
      */
     @CheckReturnValue
@@ -1608,8 +1642,8 @@ public static <T> Maybe<T> never() {
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two MaybeSource sequences are the
-     * same by comparing the items emitted by each MaybeSource pairwise.
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link MaybeSource} sequences are the
+     * same by comparing the items emitted by each {@code MaybeSource} pairwise.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
      * <dl>
@@ -1618,12 +1652,12 @@ public static <T> Maybe<T> never() {
      * </dl>
      *
      * @param source1
-     *            the first MaybeSource to compare
+     *            the first {@code MaybeSource} to compare
      * @param source2
-     *            the second MaybeSource to compare
+     *            the second {@code MaybeSource} to compare
      * @param <T>
-     *            the type of items emitted by each MaybeSource
-     * @return a Single that emits a Boolean value that indicates whether the two sequences are the same
+     *            the type of items emitted by each {@code MaybeSource}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -1634,8 +1668,8 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two MaybeSources are the
-     * same by comparing the items emitted by each MaybeSource pairwise based on the results of a specified
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link MaybeSource}s are the
+     * same by comparing the items emitted by each {@code MaybeSource} pairwise based on the results of a specified
      * equality function.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
@@ -1645,15 +1679,16 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
      * </dl>
      *
      * @param source1
-     *            the first MaybeSource to compare
+     *            the first {@code MaybeSource} to compare
      * @param source2
-     *            the second MaybeSource to compare
+     *            the second {@code MaybeSource} to compare
      * @param isEqual
-     *            a function used to compare items emitted by each MaybeSource
+     *            a function used to compare items emitted by each {@code MaybeSource}
      * @param <T>
-     *            the type of items emitted by each MaybeSource
-     * @return a Single that emits a Boolean value that indicates whether the two MaybeSource sequences
+     *            the type of items emitted by each {@code MaybeSource}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code MaybeSource} sequences
      *         are the same according to the specified function
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -1668,7 +1703,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
     }
 
     /**
-     * Returns a Maybe that emits {@code 0L} after a specified delay.
+     * Returns a {@code Maybe} that emits {@code 0L} after a specified delay.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.png" alt="">
      * <dl>
@@ -1680,7 +1715,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
      *            the initial delay before emitting a single {@code 0L}
      * @param unit
      *            time units to use for {@code delay}
-     * @return a Maybe that emits {@code 0L} after a specified delay
+     * @return a {@code Maybe} that emits {@code 0L} after a specified delay
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
     @CheckReturnValue
@@ -1691,12 +1726,12 @@ public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Maybe that emits {@code 0L} after a specified delay on a specified Scheduler.
+     * Returns a {@code Maybe} that emits {@code 0L} after a specified delay on a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param delay
@@ -1704,8 +1739,9 @@ public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit) {
      * @param unit
      *            time units to use for {@code delay}
      * @param scheduler
-     *            the {@link Scheduler} to use for scheduling the item
-     * @return a Maybe that emits {@code 0L} after a specified delay, on a specified Scheduler
+     *            the {@code Scheduler} to use for scheduling the item
+     * @return a {@code Maybe} that emits {@code 0L} after a specified delay, on a specified {@code Scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
     @CheckReturnValue
@@ -1719,15 +1755,15 @@ public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Sch
     }
 
     /**
-     * <strong>Advanced use only:</strong> creates a Maybe instance without
-     * any safeguards by using a callback that is called with a MaybeObserver.
+     * <strong>Advanced use only:</strong> creates a {@code Maybe} instance without
+     * any safeguards by using a callback that is called with a {@link MaybeObserver}.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code unsafeCreate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param onSubscribe the function that is called with the subscribing MaybeObserver
-     * @return the new Maybe instance
+     * @param onSubscribe the function that is called with the subscribing {@code MaybeObserver}
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @NonNull
@@ -1741,8 +1777,8 @@ public static <T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
     }
 
     /**
-     * Constructs a Maybe that creates a dependent resource object which is disposed of when the
-     * upstream terminates or the downstream calls dispose().
+     * Constructs a {@code Maybe} that creates a dependent resource object which is disposed of when the
+     * generated {@link MaybeSource} terminates or the downstream calls dispose().
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
      * <dl>
@@ -1750,15 +1786,15 @@ public static <T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T> the element type of the generated MaybeSource
+     * @param <T> the element type of the generated {@code MaybeSource}
      * @param <D> the type of the resource associated with the output sequence
      * @param resourceSupplier
-     *            the factory function to create a resource object that depends on the Maybe
+     *            the factory function to create a resource object that depends on the {@code Maybe}
      * @param sourceSupplier
-     *            the factory function to create a MaybeSource
+     *            the factory function to create a {@code MaybeSource}
      * @param resourceDisposer
      *            the function that will dispose of the resource
-     * @return the Maybe whose lifetime controls the lifetime of the dependent resource object
+     * @return the {@code Maybe} whose lifetime controls the lifetime of the dependent resource object
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -1771,24 +1807,24 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
     }
 
     /**
-     * Constructs a Maybe that creates a dependent resource object which is disposed of just before
-     * termination if you have set {@code disposeEagerly} to {@code true} and a downstream dispose() does not occur
-     * before termination. Otherwise resource disposal will occur on call to dispose().  Eager disposal is
-     * particularly appropriate for a synchronous Maybe that reuses resources. {@code disposeAction} will
-     * only be called once per subscription.
+     * Constructs a {@code Maybe} that creates a dependent resource object which is disposed first ({code eager == true})
+     * when the generated {@link MaybeSource} terminates or the downstream disposes; or after ({code eager == false}).
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
+     * <p>
+     * Eager disposal is particularly appropriate for a synchronous {@code Maybe} that reuses resources. {@code disposeAction} will
+     * only be called once per subscription.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T> the element type of the generated MaybeSource
+     * @param <T> the element type of the generated {@code MaybeSource}
      * @param <D> the type of the resource associated with the output sequence
      * @param resourceSupplier
-     *            the factory function to create a resource object that depends on the Maybe
+     *            the factory function to create a resource object that depends on the {@code Maybe}
      * @param sourceSupplier
-     *            the factory function to create a MaybeSource
+     *            the factory function to create a {@code MaybeSource}
      * @param resourceDisposer
      *            the function that will dispose of the resource
      * @param eager
@@ -1796,7 +1832,8 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
      *            or just before the emission of a terminal event ({@code onSuccess}, {@code onComplete} or {@code onError}).
      *            If {@code false} the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onSuccess}, {@code onComplete} or {@code onError}).
-     * @return the Maybe whose lifetime controls the lifetime of the dependent resource object
+     * @return the {@code Maybe} whose lifetime controls the lifetime of the dependent resource object
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceDisposer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -1812,7 +1849,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
     }
 
     /**
-     * Wraps a MaybeSource instance into a new Maybe instance if not already a Maybe
+     * Wraps a {@link MaybeSource} instance into a new {@code Maybe} instance if not already a {@code Maybe}
      * instance.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -1820,7 +1857,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
      * </dl>
      * @param <T> the value type
      * @param source the source to wrap
-     * @return the Maybe wrapper or the source cast to Maybe (if possible)
+     * @return the {@code Maybe} wrapper or the source cast to {@code Maybe} (if possible)
      */
     @CheckReturnValue
     @NonNull
@@ -1834,16 +1871,16 @@ public static <T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * items emitted, in sequence, by an Iterable of other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * items emitted, in sequence, by an {@link Iterable} of other {@link MaybeSource}s.
      * <p>
      * <img width="640" height="341" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zip.i.png" alt="">
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
-     * This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -1853,11 +1890,12 @@ public static <T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
      * @param <T> the common value type
      * @param <R> the zipped result type
      * @param sources
-     *            an Iterable of source MaybeSources
+     *            an {@code Iterable} of source {@code MaybeSource}s
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results in
-     *            an item that will be emitted by the resulting Maybe
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
+     *            an item that will be emitted by the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the zipped results
+     * @throws NullPointerException if {@code zipper} or {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1870,12 +1908,12 @@ public static <T, R> Maybe<R> zip(@NonNull Iterable<? extends MaybeSource<? exte
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * two items emitted, in sequence, by two other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * two items emitted, in sequence, by two other {@link MaybeSource}s.
      * <p>
      * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zip.n.png" alt="">
      * <p>
-     * This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -1886,13 +1924,14 @@ public static <T, R> Maybe<R> zip(@NonNull Iterable<? extends MaybeSource<? exte
      * @param <T2> the value type of the second source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source MaybeSource
+     *            the first source {@code MaybeSource}
      * @param source2
-     *            a second source MaybeSource
+     *            a second source {@code MaybeSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results
-     *            in an item that will be emitted by the resulting Maybe
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results
+     *            in an item that will be emitted by the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1908,12 +1947,12 @@ public static <T1, T2, R> Maybe<R> zip(
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * three items emitted, in sequence, by three other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * three items emitted, in sequence, by three other {@link MaybeSource}s.
      * <p>
      * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zip.n.png" alt="">
      * <p>
-     * This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -1925,15 +1964,16 @@ public static <T1, T2, R> Maybe<R> zip(
      * @param <T3> the value type of the third source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source MaybeSource
+     *            the first source {@code MaybeSource}
      * @param source2
-     *            a second source MaybeSource
+     *            a second source {@code MaybeSource}
      * @param source3
-     *            a third source MaybeSource
+     *            a third source {@code MaybeSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results in
-     *            an item that will be emitted by the resulting Maybe
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
+     *            an item that will be emitted by the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1950,12 +1990,12 @@ public static <T1, T2, T3, R> Maybe<R> zip(
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * four items emitted, in sequence, by four other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * four items emitted, in sequence, by four other {@link MaybeSource}s.
      * <p>
      * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zip.n.png" alt="">
      * <p>
-     * This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -1968,17 +2008,19 @@ public static <T1, T2, T3, R> Maybe<R> zip(
      * @param <T4> the value type of the fourth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source MaybeSource
+     *            the first source {@code MaybeSource}
      * @param source2
-     *            a second source MaybeSource
+     *            a second source {@code MaybeSource}
      * @param source3
-     *            a third source MaybeSource
+     *            a third source {@code MaybeSource}
      * @param source4
-     *            a fourth source MaybeSource
+     *            a fourth source {@code MaybeSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results in
-     *            an item that will be emitted by the resulting Maybe
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
+     *            an item that will be emitted by the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -1997,12 +2039,12 @@ public static <T1, T2, T3, T4, R> Maybe<R> zip(
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * five items emitted, in sequence, by five other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * five items emitted, in sequence, by five other {@link MaybeSource}s.
      * <p>
      * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zip.n.png" alt="">
      * <p>
-     * This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -2016,19 +2058,21 @@ public static <T1, T2, T3, T4, R> Maybe<R> zip(
      * @param <T5> the value type of the fifth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source MaybeSource
+     *            the first source {@code MaybeSource}
      * @param source2
-     *            a second source MaybeSource
+     *            a second source {@code MaybeSource}
      * @param source3
-     *            a third source MaybeSource
+     *            a third source {@code MaybeSource}
      * @param source4
-     *            a fourth source MaybeSource
+     *            a fourth source {@code MaybeSource}
      * @param source5
-     *            a fifth source MaybeSource
+     *            a fifth source {@code MaybeSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results in
-     *            an item that will be emitted by the resulting Maybe
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
+     *            an item that will be emitted by the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -2048,12 +2092,12 @@ public static <T1, T2, T3, T4, T5, R> Maybe<R> zip(
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * six items emitted, in sequence, by six other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * six items emitted, in sequence, by six other {@link MaybeSource}s.
      * <p>
      * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zip.n.png" alt="">
      * <p>
-     * This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -2068,21 +2112,23 @@ public static <T1, T2, T3, T4, T5, R> Maybe<R> zip(
      * @param <T6> the value type of the sixth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source MaybeSource
+     *            the first source {@code MaybeSource}
      * @param source2
-     *            a second source MaybeSource
+     *            a second source {@code MaybeSource}
      * @param source3
-     *            a third source MaybeSource
+     *            a third source {@code MaybeSource}
      * @param source4
-     *            a fourth source MaybeSource
+     *            a fourth source {@code MaybeSource}
      * @param source5
-     *            a fifth source MaybeSource
+     *            a fifth source {@code MaybeSource}
      * @param source6
-     *            a sixth source MaybeSource
+     *            a sixth source {@code MaybeSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results in
-     *            an item that will be emitted by the resulting Maybe
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
+     *            an item that will be emitted by the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -2103,12 +2149,12 @@ public static <T1, T2, T3, T4, T5, T6, R> Maybe<R> zip(
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * seven items emitted, in sequence, by seven other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * seven items emitted, in sequence, by seven other {@link MaybeSource}s.
      * <p>
      * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zip.n.png" alt="">
      * <p>
-     * This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -2124,23 +2170,26 @@ public static <T1, T2, T3, T4, T5, T6, R> Maybe<R> zip(
      * @param <T7> the value type of the seventh source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source MaybeSource
+     *            the first source {@code MaybeSource}
      * @param source2
-     *            a second source MaybeSource
+     *            a second source {@code MaybeSource}
      * @param source3
-     *            a third source MaybeSource
+     *            a third source {@code MaybeSource}
      * @param source4
-     *            a fourth source MaybeSource
+     *            a fourth source {@code MaybeSource}
      * @param source5
-     *            a fifth source MaybeSource
+     *            a fifth source {@code MaybeSource}
      * @param source6
-     *            a sixth source MaybeSource
+     *            a sixth source {@code MaybeSource}
      * @param source7
-     *            a seventh source MaybeSource
+     *            a seventh source {@code MaybeSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results in
-     *            an item that will be emitted by the resulting Maybe
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
+     *            an item that will be emitted by the resulting {@code Maybe}
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7} or {@code zipper} is {@code null}
+     * @return a {@code Maybe} that emits the zipped results
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -2163,12 +2212,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Maybe<R> zip(
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * eight items emitted, in sequence, by eight other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * eight items emitted, in sequence, by eight other {@link MaybeSource}s.
      * <p>
      * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zip.n.png" alt="">
      * <p>
-     * This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -2185,25 +2234,28 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Maybe<R> zip(
      * @param <T8> the value type of the eighth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source MaybeSource
+     *            the first source {@code MaybeSource}
      * @param source2
-     *            a second source MaybeSource
+     *            a second source {@code MaybeSource}
      * @param source3
-     *            a third source MaybeSource
+     *            a third source {@code MaybeSource}
      * @param source4
-     *            a fourth source MaybeSource
+     *            a fourth source {@code MaybeSource}
      * @param source5
-     *            a fifth source MaybeSource
+     *            a fifth source {@code MaybeSource}
      * @param source6
-     *            a sixth source MaybeSource
+     *            a sixth source {@code MaybeSource}
      * @param source7
-     *            a seventh source MaybeSource
+     *            a seventh source {@code MaybeSource}
      * @param source8
-     *            an eighth source MaybeSource
+     *            an eighth source {@code MaybeSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results in
-     *            an item that will be emitted by the resulting Maybe
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
+     *            an item that will be emitted by the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -2227,12 +2279,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Maybe<R> zip(
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * nine items emitted, in sequence, by nine other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * nine items emitted, in sequence, by nine other {@link MaybeSource}s.
      * <p>
      * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zip.n.png" alt="">
      * <p>
-     * This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -2249,27 +2301,30 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Maybe<R> zip(
      * @param <T9> the value type of the ninth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source MaybeSource
+     *            the first source {@code MaybeSource}
      * @param source2
-     *            a second source MaybeSource
+     *            a second source {@code MaybeSource}
      * @param source3
-     *            a third source MaybeSource
+     *            a third source {@code MaybeSource}
      * @param source4
-     *            a fourth source MaybeSource
+     *            a fourth source {@code MaybeSource}
      * @param source5
-     *            a fifth source MaybeSource
+     *            a fifth source {@code MaybeSource}
      * @param source6
-     *            a sixth source MaybeSource
+     *            a sixth source {@code MaybeSource}
      * @param source7
-     *            a seventh source MaybeSource
+     *            a seventh source {@code MaybeSource}
      * @param source8
-     *            an eighth source MaybeSource
+     *            an eighth source {@code MaybeSource}
      * @param source9
-     *            a ninth source MaybeSource
+     *            a ninth source {@code MaybeSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results in
-     *            an item that will be emitted by the resulting MaybeSource
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
+     *            an item that will be emitted by the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8}, {@code source9} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -2295,16 +2350,16 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified combiner function applied to combinations of
-     * items emitted, in sequence, by an array of other MaybeSources.
+     * Returns a {@code Maybe} that emits the results of a specified combiner function applied to combinations of
+     * items emitted, in sequence, by an array of other {@link MaybeSource}s.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      *
      * <p>
      * <img width="640" height="341" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zipArray.png" alt="">
-     * <p>This operator terminates eagerly if any of the source MaybeSources signal an onError or onComplete. This
+     * <p>This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -2314,11 +2369,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
      * @param <T> the common element type
      * @param <R> the result type
      * @param sources
-     *            an array of source MaybeSources
+     *            an array of source {@code MaybeSource}s
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source MaybeSources, results in
-     *            an item that will be emitted by the resulting MaybeSource
-     * @return a Maybe that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
+     *            an item that will be emitted by the resulting {@code Maybe}
+     * @return a {@code Maybe} that emits the zipped results
+     * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -2340,7 +2396,7 @@ public static <T, R> Maybe<R> zipArray(@NonNull Function<? super Object[], ? ext
     // ------------------------------------------------------------------
 
     /**
-     * Mirrors the MaybeSource (current or provided) that first signals an event.
+     * Mirrors the {@link MaybeSource} (current or provided) that first signals an event.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
      * <dl>
@@ -2349,10 +2405,11 @@ public static <T, R> Maybe<R> zipArray(@NonNull Function<? super Object[], ? ext
      * </dl>
      *
      * @param other
-     *            a MaybeSource competing to react first. A subscription to this provided source will occur after
+     *            a {@code MaybeSource} competing to react first. A subscription to this provided source will occur after
      *            subscribing to the current source.
-     * @return a Maybe that emits the same sequence as whichever of the source MaybeSources first
-     *         signalled
+     * @return a {@code Maybe} that emits the same sequence as whichever of the source {@code MaybeSource}s first
+     *         signaled
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
     @CheckReturnValue
@@ -2364,8 +2421,8 @@ public final Maybe<T> ambWith(@NonNull MaybeSource<? extends T> other) {
     }
 
     /**
-     * Waits in a blocking fashion until the current Maybe signals a success value (which is returned),
-     * null if completed or an exception (which is propagated).
+     * Waits in a blocking fashion until the current {@code Maybe} signals a success value (which is returned),
+     * {@code null} if completed or an exception (which is propagated).
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code blockingGet} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2386,7 +2443,7 @@ public final T blockingGet() {
     }
 
     /**
-     * Waits in a blocking fashion until the current Maybe signals a success value (which is returned),
+     * Waits in a blocking fashion until the current {@code Maybe} signals a success value (which is returned),
      * defaultValue if completed or an exception (which is propagated).
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -2396,13 +2453,14 @@ public final T blockingGet() {
      * into {@link RuntimeException} and throws that. Otherwise, {@code RuntimeException}s and
      * {@link Error}s are rethrown as they are.</dd>
      * </dl>
-     * @param defaultValue the default item to return if this Maybe is empty
+     * @param defaultValue the default item to return if this {@code Maybe} is empty
      * @return the success value
+     * @throws NullPointerException if {@code defaultValue} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    @Nullable
-    public final T blockingGet(@Nullable T defaultValue) {
+    @NonNull
+    public final T blockingGet(@NonNull T defaultValue) {
         Objects.requireNonNull(defaultValue, "defaultValue is null");
         BlockingMultiObserver<T> observer = new BlockingMultiObserver<>();
         subscribe(observer);
@@ -2410,13 +2468,13 @@ public final T blockingGet(@Nullable T defaultValue) {
     }
 
     /**
-     * Returns a Maybe that subscribes to this Maybe lazily, caches its event
+     * Returns a {@code Maybe} that subscribes to this {@code Maybe} lazily, caches its event
      * and replays it, to all the downstream subscribers.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.png" alt="">
      * <p>
      * The operator subscribes only when the first downstream subscriber subscribes and maintains
-     * a single subscription towards this Maybe.
+     * a single subscription towards this {@code Maybe}.
      * <p>
      * <em>Note:</em> You sacrifice the ability to dispose the origin when you use the {@code cache}.
      * <dl>
@@ -2424,7 +2482,7 @@ public final T blockingGet(@Nullable T defaultValue) {
      *  <dd>{@code cache} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Maybe that, when first subscribed to, caches all of its items and notifications for the
+     * @return a {@code Maybe} that, when first subscribed to, caches all of its items and notifications for the
      *         benefit of subsequent subscribers
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -2436,8 +2494,8 @@ public final Maybe<T> cache() {
     }
 
     /**
-     * Casts the success value of the current Maybe into the target type or signals a
-     * ClassCastException if not compatible.
+     * Casts the success value of the current {@code Maybe} into the target type or signals a
+     * {@link ClassCastException} if not compatible.
      * <p>
      * <img width="640" height="318" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.cast.png" alt="">
      * <dl>
@@ -2445,8 +2503,9 @@ public final Maybe<T> cache() {
      * <dd>{@code cast} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the target type
-     * @param clazz the type token to use for casting the success result from the current Maybe
-     * @return the new Maybe instance
+     * @param clazz the type token to use for casting the success result from the current {@code Maybe}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code clazz} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2457,21 +2516,22 @@ public final <U> Maybe<U> cast(@NonNull Class<? extends U> clazz) {
     }
 
     /**
-     * Transform a Maybe by applying a particular Transformer function to it.
+     * Transform a {@code Maybe} by applying a particular {@link MaybeTransformer} function to it.
      * <p>
-     * This method operates on the Maybe itself whereas {@link #lift} operates on the Maybe's MaybeObservers.
+     * This method operates on the {@code Maybe} itself whereas {@link #lift} operates on the {@code Maybe}'s {@link MaybeObserver}s.
      * <p>
-     * If the operator you are creating is designed to act on the individual item emitted by a Maybe, use
-     * {@link #lift}. If your operator is designed to transform the source Maybe as a whole (for instance, by
+     * If the operator you are creating is designed to act on the individual item emitted by a {@code Maybe}, use
+     * {@link #lift}. If your operator is designed to transform the source {@code Maybe} as a whole (for instance, by
      * applying a particular set of existing RxJava operators to it) use {@code compose}.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code compose} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the Maybe returned by the transformer function
-     * @param transformer the transformer function, not null
-     * @return a Maybe, transformed by the transformer function
+     * @param <R> the value type of the {@code Maybe} returned by the transformer function
+     * @param transformer the transformer function, not {@code null}
+     * @return a {@code Maybe}, transformed by the transformer function
+     * @throws NullPointerException if {@code transformer} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
      */
     @SuppressWarnings("unchecked")
@@ -2483,20 +2543,21 @@ public final <R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends
     }
 
     /**
-     * Returns a Maybe that is based on applying a specified function to the item emitted by the source Maybe,
-     * where that function returns a MaybeSource.
+     * Returns a {@code Maybe} that is based on applying a specified function to the item emitted by the source {@code Maybe},
+     * where that function returns a {@link MaybeSource}.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * <p>Note that flatMap and concatMap for Maybe is the same operation.
+     * <p>Note that flatMap and concatMap for {@code Maybe} is the same operation.
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Maybe, returns a MaybeSource
-     * @return the Maybe returned from {@code func} when applied to the item emitted by the source Maybe
+     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a {@code MaybeSource}
+     * @return the {@code Maybe} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2507,7 +2568,7 @@ public final <R> Maybe<R> concatMap(@NonNull Function<? super T, ? extends Maybe
     }
 
     /**
-     * Returns a Flowable that emits the items emitted from the current MaybeSource, then the next, one after
+     * Returns a {@link Flowable} that emits the items emitted from the current {@code Maybe}, then the {@code other} {@link MaybeSource}, one after
      * the other, without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -2519,9 +2580,10 @@ public final <R> Maybe<R> concatMap(@NonNull Function<? super T, ? extends Maybe
      * </dl>
      *
      * @param other
-     *            a MaybeSource to be concatenated after the current
-     * @return a Flowable that emits items emitted by the two source MaybeSources, one after the other,
+     *            a {@code MaybeSource} to be concatenated after the current
+     * @return a {@code Flowable} that emits items emitted by the two source {@code MaybeSource}s, one after the other,
      *         without interleaving them
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2534,7 +2596,7 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
     }
 
     /**
-     * Returns a Single that emits a Boolean that indicates whether the source Maybe emitted a
+     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether the source {@code Maybe} emitted a
      * specified item.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.contains.o.png" alt="">
@@ -2544,9 +2606,10 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
      * </dl>
      *
      * @param item
-     *            the item to search for in the emissions from the source Maybe, not null
-     * @return a Single that emits {@code true} if the specified item is emitted by the source Maybe,
-     *         or {@code false} if the source Maybe completes without emitting that item
+     *            the item to search for in the emissions from the source {@code Maybe}, not {@code null}
+     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the source {@code Maybe},
+     *         or {@code false} if the source {@code Maybe} completes without emitting that item
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -2558,8 +2621,8 @@ public final Single<Boolean> contains(@NonNull Object item) {
     }
 
     /**
-     * Returns a Single that counts the total number of items emitted (0 or 1) by the source Maybe and emits
-     * this count as a 64-bit Long.
+     * Returns a {@link Single} that counts the total number of items emitted (0 or 1) by the source {@code Maybe} and emits
+     * this count as a 64-bit {@link Long}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/longCount.png" alt="">
      * <dl>
@@ -2567,8 +2630,8 @@ public final Single<Boolean> contains(@NonNull Object item) {
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Single that emits a single item: the number of items emitted by the source Maybe as a
-     *         64-bit Long item
+     * @return a {@code Single} that emits a single item: the number of items emitted by the source {@code Maybe} as a
+     *         64-bit {@code Long} item
      * @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
      */
     @CheckReturnValue
@@ -2579,8 +2642,8 @@ public final Single<Long> count() {
     }
 
     /**
-     * Returns a Single that emits the item emitted by the source Maybe or a specified default item
-     * if the source Maybe is empty.
+     * Returns a {@link Single} that emits the item emitted by the source {@code Maybe} or a specified default item
+     * if the source {@code Maybe} is empty.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.png" alt="">
      * <dl>
@@ -2589,9 +2652,10 @@ public final Single<Long> count() {
      * </dl>
      *
      * @param defaultItem
-     *            the item to emit if the source Maybe emits no items
-     * @return a Single that emits either the specified default item if the source Maybe emits no
-     *         item, or the item emitted by the source Maybe
+     *            the item to emit if the source {@code Maybe} emits no items
+     * @return a {@code Single} that emits either the specified default item if the source {@code Maybe} emits no
+     *         item, or the item emitted by the source {@code Maybe}
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defaultifempty.html">ReactiveX operators documentation: DefaultIfEmpty</a>
      */
     @CheckReturnValue
@@ -2603,7 +2667,7 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Maybe that signals the events emitted by the source Maybe shifted forward in time by a
+     * Returns a {@code Maybe} that signals the events emitted by the source {@code Maybe} shifted forward in time by a
      * specified delay.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
@@ -2616,7 +2680,7 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      * @see #delay(long, TimeUnit, Scheduler)
      */
@@ -2628,13 +2692,13 @@ public final Maybe<T> delay(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Maybe that signals the events emitted by the source Maybe shifted forward in time by a
-     * specified delay running on the specified Scheduler.
+     * Returns a {@code Maybe} that signals the events emitted by the source {@code Maybe} shifted forward in time by a
+     * specified delay running on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>you specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>you specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param delay
@@ -2642,8 +2706,9 @@ public final Maybe<T> delay(long delay, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code delay}
      * @param scheduler
-     *            the {@link Scheduler} to use for delaying
-     * @return the new Maybe instance
+     *            the {@code Scheduler} to use for delaying
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -2656,7 +2721,7 @@ public final Maybe<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Schedul
     }
 
     /**
-     * Delays the emission of this Maybe until the given Publisher signals an item or completes.
+     * Delays the emission of this {@code Maybe} until the given {@link Publisher} signals an item or completes.
      * <p>
      * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.oo.png" alt="">
      * <dl>
@@ -2670,9 +2735,10 @@ public final Maybe<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Schedul
      * @param <U>
      *            the subscription delay value type (ignored)
      * @param delayIndicator
-     *            the Publisher that gets subscribed to when this Maybe signals an event and that
-     *            signal is emitted when the Publisher signals an item or completes
-     * @return the new Maybe instance
+     *            the {@code Publisher} that gets subscribed to when this {@code Maybe} signals an event and that
+     *            signal is emitted when the {@code Publisher} signals an item or completes
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code delayIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -2685,8 +2751,8 @@ public final <U> Maybe<T> delay(@NonNull Publisher<U> delayIndicator) {
     }
 
     /**
-     * Returns a Maybe that delays the subscription to this Maybe
-     * until the other Publisher emits an element or completes normally.
+     * Returns a {@code Maybe} that delays the subscription to this {@code Maybe}
+     * until the other {@link Publisher} emits an element or completes normally.
      * <p>
      * <img width="640" height="214" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delaySubscription.p.png" alt="">
      * <dl>
@@ -2696,11 +2762,12 @@ public final <U> Maybe<T> delay(@NonNull Publisher<U> delayIndicator) {
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the value type of the other Publisher, irrelevant
-     * @param subscriptionIndicator the other Publisher that should trigger the subscription
-     *        to this Publisher.
-     * @return a Maybe that delays the subscription to this Maybe
-     *         until the other Publisher emits an element or completes normally.
+     * @param <U> the value type of the other {@code Publisher}, irrelevant
+     * @param subscriptionIndicator the other {@code Publisher} that should trigger the subscription
+     *        to this {@code Publisher}.
+     * @throws NullPointerException if {@code subscriptionIndicator} is {@code null}
+     * @return a {@code Maybe} that delays the subscription to this {@code Maybe}
+     *         until the other {@code Publisher} emits an element or completes normally.
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @CheckReturnValue
@@ -2712,7 +2779,7 @@ public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIn
     }
 
     /**
-     * Returns a Maybe that delays the subscription to the source Maybe by a given amount of time.
+     * Returns a {@code Maybe} that delays the subscription to the source {@code Maybe} by a given amount of time.
      * <p>
      * <img width="640" height="471" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delaySubscription.t.png" alt="">
      * <dl>
@@ -2724,7 +2791,7 @@ public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIn
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
-     * @return a Maybe that delays the subscription to the source Maybe by the given amount
+     * @return a {@code Maybe} that delays the subscription to the source {@code Maybe} by the given amount
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      * @see #delaySubscription(long, TimeUnit, Scheduler)
      */
@@ -2736,13 +2803,13 @@ public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a Maybe that delays the subscription to the source Maybe by a given amount of time,
-     * both waiting and subscribing on a given Scheduler.
+     * Returns a {@code Maybe} that delays the subscription to the source {@code Maybe} by a given amount of time,
+     * both waiting and subscribing on a given {@link Scheduler}.
      * <p>
      * <img width="640" height="420" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delaySubscription.ts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param delay
@@ -2750,9 +2817,9 @@ public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code delay}
      * @param scheduler
-     *            the Scheduler on which the waiting and subscription will happen
-     * @return a Maybe that delays the subscription to the source Maybe by a given
-     *         amount, waiting and subscribing on the given Scheduler
+     *            the {@code Scheduler} on which the waiting and subscription will happen
+     * @return a {@code Maybe} that delays the subscription to the source {@code Maybe} by a given
+     *         amount, waiting and subscribing on the given {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -2763,16 +2830,17 @@ public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit, @Non
     }
 
     /**
-     * Calls the specified consumer with the success item after this item has been emitted to the downstream.
-     * <p>Note that the {@code onAfterNext} action is shared between subscriptions and as such
+     * Calls the specified {@link Consumer} with the success item after this item has been emitted to the downstream.
+     * <p>Note that the {@code onAfterSuccess} action is shared between subscriptions and as such
      * should be thread-safe.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterSuccess} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.1 - experimental
-     * @param onAfterSuccess the Consumer that will be called after emitting an item from upstream to the downstream
-     * @return the new Maybe instance
+     * @param onAfterSuccess the {@code Consumer} that will be called after emitting an item from upstream to the downstream
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onAfterSuccess} is {@code null}
      * @since 2.1
      */
     @CheckReturnValue
@@ -2784,7 +2852,7 @@ public final Maybe<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSuccess
     }
 
     /**
-     * Registers an {@link Action} to be called when this Maybe invokes either
+     * Registers an {@link Action} to be called when this {@code Maybe} invokes either
      * {@link MaybeObserver#onComplete onSuccess},
      * {@link MaybeObserver#onComplete onComplete} or {@link MaybeObserver#onError onError}.
      * <p>
@@ -2795,9 +2863,10 @@ public final Maybe<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSuccess
      * </dl>
      *
      * @param onAfterTerminate
-     *            an {@link Action} to be invoked when the source Maybe finishes
-     * @return a Maybe that emits the same items as the source Maybe, then invokes the
-     *         {@link Action}
+     *            an {@code Action} to be invoked when the source {@code Maybe} finishes
+     * @return a {@code Maybe} that emits the same items as the source {@code Maybe}, then invokes the
+     *         {@code Action}
+     * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -2815,7 +2884,7 @@ public final Maybe<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
     }
 
     /**
-     * Calls the specified action after this Maybe signals onSuccess, onError or onComplete or gets disposed by
+     * Calls the specified action after this {@code Maybe} signals {@code onSuccess}, {@code onError} or {@code onComplete} or gets disposed by
      * the downstream.
      * <p>In case of a race between a terminal event and a dispose call, the provided {@code onFinally} action
      * is executed once per subscription.
@@ -2826,8 +2895,9 @@ public final Maybe<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
      *  <dd>{@code doFinally} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.1 - experimental
-     * @param onFinally the action called when this Maybe terminates or gets disposed
-     * @return the new Maybe instance
+     * @param onFinally the action called when this {@code Maybe} terminates or gets disposed
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onFinally} is {@code null}
      * @since 2.1
      */
     @CheckReturnValue
@@ -2839,15 +2909,15 @@ public final Maybe<T> doFinally(@NonNull Action onFinally) {
     }
 
     /**
-     * Calls the shared {@code Action} if a MaybeObserver subscribed to the current Maybe
-     * disposes the common Disposable it received via onSubscribe.
+     * Calls the shared {@link Action} if a {@link MaybeObserver} subscribed to the current {@code Maybe}
+     * disposes the common {@link Disposable} it received via {@code onSubscribe}.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnDispose} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param onDispose the action called when the subscription is disposed
-     * @throws NullPointerException if onDispose is null
-     * @return the new Maybe instance
+     * @throws NullPointerException if {@code onDispose} is {@code null}
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @NonNull
@@ -2864,7 +2934,7 @@ public final Maybe<T> doOnDispose(@NonNull Action onDispose) {
     }
 
     /**
-     * Modifies the source Maybe so that it invokes an action when it calls {@code onComplete}.
+     * Modifies the source {@code Maybe} so that it invokes an action when it calls {@code onComplete}.
      * <p>
      * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.m.png" alt="">
      * <dl>
@@ -2873,8 +2943,9 @@ public final Maybe<T> doOnDispose(@NonNull Action onDispose) {
      * </dl>
      *
      * @param onComplete
-     *            the action to invoke when the source Maybe calls {@code onComplete}
-     * @return the new Maybe with the side-effecting behavior applied
+     *            the action to invoke when the source {@code Maybe} calls {@code onComplete}
+     * @return the new {@code Maybe} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -2892,16 +2963,17 @@ public final Maybe<T> doOnComplete(@NonNull Action onComplete) {
     }
 
     /**
-     * Calls the shared consumer with the error sent via onError for each
-     * MaybeObserver that subscribes to the current Maybe.
+     * Calls the shared {@link Consumer} with the error sent via {@code onError} for each
+     * {@link MaybeObserver} that subscribes to the current {@code Maybe}.
      * <p>
      * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnError.m.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onError the consumer called with the success value of onError
-     * @return the new Maybe instance
+     * @param onError the consumer called with the success value of {@code onError}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onError} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2918,20 +2990,21 @@ public final Maybe<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
     }
 
     /**
-     * Calls the given onEvent callback with the (success value, null) for an onSuccess, (null, throwable) for
-     * an onError or (null, null) for an onComplete signal from this Maybe before delivering said
+     * Calls the given {@code onEvent} callback with the (success value, {@code null}) for an {@code onSuccess}, ({@code null}, throwable) for
+     * an {@code onError} or ({@code null}, {@code null}) for an {@code onComplete} signal from this {@code Maybe} before delivering said
      * signal to the downstream.
      * <p>
      * <img width="640" height="297" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.doOnEvent.png" alt="">
      * <p>
-     * Exceptions thrown from the callback will override the event so the downstream receives the
+     * The exceptions thrown from the callback will override the event so the downstream receives the
      * error instead of the original signal.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnEvent} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onEvent the callback to call with the terminal event tuple
-     * @return the new Maybe instance
+     * @param onEvent the callback to call with the success value or the exception, whichever is not {@code null}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onEvent} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2942,14 +3015,15 @@ public final Maybe<T> doOnEvent(@NonNull BiConsumer<? super T, ? super Throwable
     }
 
     /**
-     * Calls the shared consumer with the Disposable sent through the onSubscribe for each
-     * MaybeObserver that subscribes to the current Maybe.
+     * Calls the shared {@link Consumer} with the {@link Disposable} sent through the {@code onSubscribe} for each
+     * {@link MaybeObserver} that subscribes to the current {@code Maybe}.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onSubscribe the consumer called with the Disposable sent via onSubscribe
-     * @return the new Maybe instance
+     * @param onSubscribe the {@code Consumer} called with the {@code Disposable} sent via {@code onSubscribe}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2966,8 +3040,8 @@ public final Maybe<T> doOnSubscribe(@NonNull Consumer<? super Disposable> onSubs
     }
 
     /**
-     * Returns a Maybe instance that calls the given onTerminate callback
-     * just before this Maybe completes normally or with an exception.
+     * Returns a {@code Maybe} instance that calls the given onTerminate callback
+     * just before this {@code Maybe} completes normally or with an exception.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.png" alt="">
      * <p>
@@ -2979,7 +3053,8 @@ public final Maybe<T> doOnSubscribe(@NonNull Consumer<? super Disposable> onSubs
      * </dl>
      * <p>History: 2.2.7 - experimental
      * @param onTerminate the action to invoke when the consumer calls {@code onComplete} or {@code onError}
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doOnTerminate(Action)
      * @since 3.0.0
@@ -2993,16 +3068,17 @@ public final Maybe<T> doOnTerminate(@NonNull Action onTerminate) {
     }
 
     /**
-     * Calls the shared consumer with the success value sent via onSuccess for each
-     * MaybeObserver that subscribes to the current Maybe.
+     * Calls the shared {@link Consumer} with the success value sent via {@code onSuccess} for each
+     * {@link MaybeObserver} that subscribes to the current {@code Maybe}.
      * <p>
      * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSuccess.m.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnSuccess} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onSuccess the consumer called with the success value of onSuccess
-     * @return the new Maybe instance
+     * @param onSuccess the {@code Consumer} called with the success value of the upstream
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onSuccess} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -3019,8 +3095,8 @@ public final Maybe<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
     }
 
     /**
-     * Filters the success item of the Maybe via a predicate function and emitting it if the predicate
-     * returns true, completing otherwise.
+     * Filters the success item of the {@code Maybe} via a predicate function and emitting it if the predicate
+     * returns {@code true}, completing otherwise.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.png" alt="">
      * <dl>
@@ -3029,10 +3105,11 @@ public final Maybe<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates the item emitted by the source Maybe, returning {@code true}
+     *            a function that evaluates the item emitted by the source {@code Maybe}, returning {@code true}
      *            if it passes the filter
-     * @return a Maybe that emit the item emitted by the source Maybe that the filter
+     * @return a {@code Maybe} that emit the item emitted by the source {@code Maybe} that the filter
      *         evaluates as {@code true}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
     @CheckReturnValue
@@ -3044,20 +3121,21 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns a Maybe that is based on applying a specified function to the item emitted by the source Maybe,
-     * where that function returns a MaybeSource.
+     * Returns a {@code Maybe} that is based on applying a specified function to the item emitted by the source {@code Maybe},
+     * where that function returns a {@link MaybeSource}.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * <p>Note that flatMap and concatMap for Maybe is the same operation.
+     * <p>Note that flatMap and concatMap for {@code Maybe} is the same operation.
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Maybe, returns a MaybeSource
-     * @return the Maybe returned from {@code func} when applied to the item emitted by the source Maybe
+     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a {@code MaybeSource}
+     * @return the {@code Maybe} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -3069,8 +3147,8 @@ public final <R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSo
     }
 
     /**
-     * Maps the onSuccess, onError or onComplete signals of this Maybe into MaybeSource and emits that
-     * MaybeSource's signals.
+     * Maps the {@code onSuccess}, {@code onError} or {@code onComplete} signals of this {@code Maybe} into {@link MaybeSource} and emits that
+     * {@code MaybeSource}'s signals.
      * <p>
      * <img width="640" height="354" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.mmm.png" alt="">
      * <dl>
@@ -3081,12 +3159,13 @@ public final <R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSo
      * @param <R>
      *            the result type
      * @param onSuccessMapper
-     *            a function that returns a MaybeSource to merge for the onSuccess item emitted by this Maybe
+     *            a function that returns a {@code MaybeSource} to merge for the {@code onSuccess} item emitted by this {@code Maybe}
      * @param onErrorMapper
-     *            a function that returns a MaybeSource to merge for an onError notification from this Maybe
+     *            a function that returns a {@code MaybeSource} to merge for an {@code onError} notification from this {@code Maybe}
      * @param onCompleteSupplier
-     *            a function that returns a MaybeSource to merge for an onComplete notification this Maybe
-     * @return the new Maybe instance
+     *            a function that returns a {@code MaybeSource} to merge for an {@code onComplete} notification this {@code Maybe}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onSuccessMapper}, {@code onErrorMapper} or {@code onCompleteSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -3103,8 +3182,8 @@ public final <R> Maybe<R> flatMap(
     }
 
     /**
-     * Returns a Maybe that emits the results of a specified function to the pair of values emitted by the
-     * source Maybe and a specified mapped MaybeSource.
+     * Returns a {@code Maybe} that emits the results of a specified function to the pair of values emitted by the
+     * source {@code Maybe} and a specified mapped {@link MaybeSource}.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
@@ -3113,15 +3192,16 @@ public final <R> Maybe<R> flatMap(
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the MaybeSource returned by the {@code mapper} function
+     *            the type of items emitted by the {@code MaybeSource} returned by the {@code mapper} function
      * @param <R>
-     *            the type of items emitted by the resulting Maybe
+     *            the type of items emitted by the resulting {@code Maybe}
      * @param mapper
-     *            a function that returns a MaybeSource for the item emitted by the source Maybe
+     *            a function that returns a {@code MaybeSource} for the item emitted by the source {@code Maybe}
      * @param resultSelector
-     *            a function that combines one item emitted by each of the source and collection MaybeSource and
-     *            returns an item to be emitted by the resulting MaybeSource
-     * @return the new Maybe instance
+     *            a function that combines one item emitted by each of the source and collection {@code MaybeSource} and
+     *            returns an item to be emitted by the resulting {@code MaybeSource}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code mapper} or {@code resultSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -3135,7 +3215,7 @@ public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends Mayb
     }
 
     /**
-     * Maps the success value of the upstream {@link Maybe} into an {@link Iterable} and emits its items as a
+     * Maps the success value of the upstream {@code Maybe} into an {@link Iterable} and emits its items as a
      * {@link Flowable} sequence.
      * <p>
      * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenAsFlowable.png" alt="">
@@ -3147,11 +3227,12 @@ public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends Mayb
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting Iterable
+     *            the type of item emitted by the inner {@code Iterable}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source Maybe
-     * @return the new Flowable instance
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code Maybe}
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #flattenStreamAsFlowable(Function)
      */
@@ -3165,7 +3246,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Maps the success value of the upstream {@link Maybe} into an {@link Iterable} and emits its items as an
+     * Maps the success value of the upstream {@code Maybe} into an {@link Iterable} and emits its items as an
      * {@link Observable} sequence.
      * <p>
      * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenAsObservable.png" alt="">
@@ -3175,11 +3256,12 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting Iterable
+     *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source Maybe
-     * @return the new Observable instance
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            source {@code Maybe}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -3191,8 +3273,8 @@ public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T,
     }
 
     /**
-     * Returns an Observable that is based on applying a specified function to the item emitted by the source Maybe,
-     * where that function returns an ObservableSource.
+     * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the source {@code Maybe},
+     * where that function returns an {@link ObservableSource}.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
      * <dl>
@@ -3202,8 +3284,9 @@ public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T,
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Maybe, returns an ObservableSource
-     * @return the Observable returned from {@code func} when applied to the item emitted by the source Maybe
+     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns an {@code ObservableSource}
+     * @return the {@code Observable} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -3215,22 +3298,23 @@ public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ?
     }
 
     /**
-     * Returns a Flowable that emits items based on applying a specified function to the item emitted by the
-     * source Maybe, where that function returns a Publisher.
+     * Returns a {@link Flowable} that emits items based on applying a specified function to the item emitted by the
+     * source {@code Maybe}, where that function returns a {@link Publisher}.
      * <p>
      * <img width="640" height="260" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapPublisher.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned Flowable honors the downstream backpressure.</dd>
+     *  <dd>The returned {@code Flowable} honors the downstream backpressure.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMapPublisher} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Maybe, returns a
-     *            Flowable
-     * @return the Flowable returned from {@code func} when applied to the item emitted by the source Maybe
+     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a
+     *            {@code Flowable}
+     * @return the {@code Flowable} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3244,8 +3328,8 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
 
     /**
      * Returns a {@link Single} based on applying a specified function to the item emitted by the
-     * source {@link Maybe}, where that function returns a {@link Single}.
-     * When this Maybe completes a {@link NoSuchElementException} will be thrown.
+     * source {@code Maybe}, where that function returns a {@code Single}.
+     * When this {@code Maybe} completes a {@link NoSuchElementException} will be thrown.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
      * <dl>
@@ -3255,9 +3339,10 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Maybe, returns a
-     *            Single
-     * @return the Single returned from {@code mapper} when applied to the item emitted by the source Maybe
+     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a
+     *            {@code Single}
+     * @return the {@code Single} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -3269,9 +3354,9 @@ public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Returns a {@link Maybe} based on applying a specified function to the item emitted by the
-     * source {@link Maybe}, where that function returns a {@link Single}.
-     * When this Maybe just completes the resulting {@code Maybe} completes as well.
+     * Returns a {@code Maybe} based on applying a specified function to the item emitted by the
+     * source {@code Maybe}, where that function returns a {@link Single}.
+     * When this {@code Maybe} just completes the resulting {@code Maybe} completes as well.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
      * <dl>
@@ -3282,9 +3367,10 @@ public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends
      * <p>History: 2.0.2 - experimental
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Maybe, returns a
-     *            Single
-     * @return the new Maybe instance
+     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a
+     *            {@code Single}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.1
      */
@@ -3298,7 +3384,7 @@ public final <R> Maybe<R> flatMapSingleElement(@NonNull Function<? super T, ? ex
 
     /**
      * Returns a {@link Completable} that completes based on applying a specified function to the item emitted by the
-     * source {@link Maybe}, where that function returns a {@link Completable}.
+     * source {@code Maybe}, where that function returns a {@code Completable}.
      * <p>
      * <img width="640" height="267" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapCompletable.png" alt="">
      * <dl>
@@ -3307,9 +3393,10 @@ public final <R> Maybe<R> flatMapSingleElement(@NonNull Function<? super T, ? ex
      * </dl>
      *
      * @param mapper
-     *            a function that, when applied to the item emitted by the source Maybe, returns a
-     *            Completable
-     * @return the Completable returned from {@code mapper} when applied to the item emitted by the source Maybe
+     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a
+     *            {@code Completable}
+     * @return the {@code Completable} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -3321,7 +3408,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Hides the identity of this Maybe and its Disposable.
+     * Hides the identity of this {@code Maybe} and its {@link Disposable}.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.hide.png" alt="">
      * <p>Allows preventing certain identity-based
@@ -3330,7 +3417,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code hide} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3340,7 +3427,7 @@ public final Maybe<T> hide() {
     }
 
     /**
-     * Ignores the item emitted by the source Maybe and only calls {@code onComplete} or {@code onError}.
+     * Returns a {@link Completable} that ignores the item emitted by the source {@code Maybe} and only calls {@code onComplete} or {@code onError}.
      * <p>
      * <img width="640" height="389" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.ignoreElement.png" alt="">
      * <dl>
@@ -3348,8 +3435,8 @@ public final Maybe<T> hide() {
      *  <dd>{@code ignoreElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an empty Completable that only calls {@code onComplete} or {@code onError}, based on which one is
-     *         called by the source Maybe
+     * @return an empty {@code Completable} that only calls {@code onComplete} or {@code onError}, based on which one is
+     *         called by the source {@code Maybe}
      * @see <a href="http://reactivex.io/documentation/operators/ignoreelements.html">ReactiveX operators documentation: IgnoreElements</a>
      */
     @CheckReturnValue
@@ -3360,7 +3447,7 @@ public final Completable ignoreElement() {
     }
 
     /**
-     * Returns a Single that emits {@code true} if the source Maybe is empty, otherwise {@code false}.
+     * Returns a {@link Single} that emits {@code true} if the source {@code Maybe} is empty, otherwise {@code false}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.png" alt="">
      * <dl>
@@ -3368,7 +3455,7 @@ public final Completable ignoreElement() {
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Single that emits a Boolean
+     * @return a {@code Single} that emits {@code true} if the source {@code Maybe} is empty.
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -3382,7 +3469,7 @@ public final Single<Boolean> isEmpty() {
      * <strong>This method requires advanced knowledge about building operators, please consider
      * other standard composition methods first;</strong>
      * Returns a {@code Maybe} which, when subscribed to, invokes the {@link MaybeOperator#apply(MaybeObserver) apply(MaybeObserver)} method
-     * of the provided {@link MaybeOperator} for each individual downstream {@link Maybe} and allows the
+     * of the provided {@link MaybeOperator} for each individual downstream {@code Maybe} and allows the
      * insertion of a custom operator by accessing the downstream's {@link MaybeObserver} during this subscription phase
      * and providing a new {@code MaybeObserver}, containing the custom operator's intended business logic, that will be
      * used in the subscription process going further upstream.
@@ -3435,7 +3522,7 @@ public final Single<Boolean> isEmpty() {
      *         if (str.length() &lt; 2) {
      *             downstream.onSuccess(str);
      *         } else {
-     *             // Maybe is usually expected to produce one of the onXXX events
+     *             // Maybe i {@code Maybe} ly expected to produce one of the onXXX events
      *             downstream.onComplete();
      *         }
      *     }
@@ -3507,23 +3594,24 @@ public final Single<Boolean> isEmpty() {
      * class and creating a {@link MaybeTransformer} with it is recommended.
      * <p>
      * Note also that it is not possible to stop the subscription phase in {@code lift()} as the {@code apply()} method
-     * requires a non-null {@code MaybeObserver} instance to be returned, which is then unconditionally subscribed to
+     * requires a non-{@code null} {@code MaybeObserver} instance to be returned, which is then unconditionally subscribed to
      * the upstream {@code Maybe}. For example, if the operator decided there is no reason to subscribe to the
      * upstream source because of some optimization possibility or a failure to prepare the operator, it still has to
-     * return a {@code MaybeObserver} that should immediately dispose the upstream's {@code Disposable} in its
+     * return a {@code MaybeObserver} that should immediately dispose the upstream's {@link Disposable} in its
      * {@code onSubscribe} method. Again, using a {@code MaybeTransformer} and extending the {@code Maybe} is
      * a better option as {@link #subscribeActual} can decide to not subscribe to its upstream after all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lift} does not operate by default on a particular {@link Scheduler}, however, the
-     *  {@link MaybeOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
+     *  {@code MaybeOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
      * </dl>
      *
      * @param <R> the output value type
-     * @param lift the {@link MaybeOperator} that receives the downstream's {@code MaybeObserver} and should return
+     * @param lift the {@code MaybeOperator} that receives the downstream's {@code MaybeObserver} and should return
      *               a {@code MaybeObserver} with custom behavior to be used as the consumer for the current
      *               {@code Maybe}.
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code lift} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Writing-operators-for-2.0">RxJava wiki: Writing operators</a>
      * @see #compose(MaybeTransformer)
      */
@@ -3536,7 +3624,7 @@ public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> li
     }
 
     /**
-     * Returns a Maybe that applies a specified function to the item emitted by the source Maybe and
+     * Returns a {@code Maybe} that applies a specified function to the item emitted by the source {@code Maybe} and
      * emits the result of this function application.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.map.png" alt="">
@@ -3547,8 +3635,9 @@ public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> li
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function to apply to the item emitted by the Maybe
-     * @return a Maybe that emits the item from the source Maybe, transformed by the specified function
+     *            a function to apply to the item emitted by the {@code Maybe}
+     * @return a {@code Maybe} that emits the item from the source {@code Maybe}, transformed by the specified function
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
     @CheckReturnValue
@@ -3560,8 +3649,8 @@ public final <R> Maybe<R> map(@NonNull Function<? super T, ? extends R> mapper)
     }
 
     /**
-     * Maps the signal types of this Maybe into a {@link Notification} of the same kind
-     * and emits it as a single success value to downstream.
+     * Maps the signal types of this {@code Maybe} into a {@link Notification} of the same kind
+     * and emits it as a {@link Single}'s {@code onSuccess} value to downstream.
      * <p>
      * <img width="640" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
      * <dl>
@@ -3569,7 +3658,7 @@ public final <R> Maybe<R> map(@NonNull Function<? super T, ? extends R> mapper)
      * <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.2.4 - experimental
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @since 3.0.0
      * @see Single#dematerialize(Function)
      */
@@ -3581,11 +3670,11 @@ public final Single<Notification<T>> materialize() {
     }
 
     /**
-     * Flattens this and another Maybe into a single Flowable, without any transformation.
+     * Flattens this {@code Maybe} and another {@link MaybeSource} into a single {@link Flowable}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple Maybes so that they appear as a single Flowable, by
+     * You can combine items emitted by multiple {@code Maybe}s so that they appear as a single {@code Flowable}, by
      * using the {@code mergeWith} method.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -3595,8 +3684,9 @@ public final Single<Notification<T>> materialize() {
      * </dl>
      *
      * @param other
-     *            a MaybeSource to be merged
-     * @return a new Flowable instance
+     *            a {@code MaybeSource} to be merged
+     * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3609,19 +3699,20 @@ public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
     }
 
     /**
-     * Wraps a Maybe to emit its item (or notify of its error) on a specified {@link Scheduler},
+     * Wraps a {@code Maybe} to emit its item (or notify of its error) on a specified {@link Scheduler},
      * asynchronously.
      * <p>
      * <img width="640" height="182" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.observeOn.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>you specify which {@link Scheduler} this operator will use.</dd>
+     * <dd>you specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to notify subscribers on
-     * @return the new Maybe instance that its subscribers are notified on the specified
-     *         {@link Scheduler}
+     *            the {@code Scheduler} to notify subscribers on
+     * @return the new {@code Maybe} instance that its subscribers are notified on the specified
+     *         {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -3635,8 +3726,8 @@ public final Maybe<T> observeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Filters the items emitted by a Maybe, only emitting its success value if that
-     * is an instance of the supplied Class.
+     * Filters the items emitted by a {@code Maybe}, only emitting its success value if that
+     * is an instance of the supplied {@link Class}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.png" alt="">
      * <dl>
@@ -3646,8 +3737,9 @@ public final Maybe<T> observeOn(@NonNull Scheduler scheduler) {
      *
      * @param <U> the output type
      * @param clazz
-     *            the class type to filter the items emitted by the source Maybe
-     * @return the new Maybe instance
+     *            the class type to filter the items emitted by the source {@code Maybe}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
     @CheckReturnValue
@@ -3668,9 +3760,9 @@ public final <U> Maybe<U> ofType(@NonNull Class<U> clazz) {
      * </dl>
      * <p>History: 2.1.7 - experimental
      * @param <R> the resulting object type
-     * @param converter the function that receives the current Maybe instance and returns a value
+     * @param converter the function that receives the current {@code Maybe} instance and returns a value
      * @return the converted value
-     * @throws NullPointerException if converter is null
+     * @throws NullPointerException if {@code converter} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -3680,15 +3772,15 @@ public final <R> R to(@NonNull MaybeConverter<T, ? extends R> converter) {
     }
 
     /**
-     * Converts this Maybe into a backpressure-aware Flowable instance composing cancellation
+     * Converts this {@code Maybe} into a backpressure-aware {@link Flowable} instance composing cancellation
      * through.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The returned Flowable honors the backpressure of the downstream.</dd>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toFlowable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      */
     @SuppressWarnings("unchecked")
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3703,13 +3795,13 @@ public final Flowable<T> toFlowable() {
     }
 
     /**
-     * Converts this Maybe into an Observable instance composing disposal
+     * Converts this {@code Maybe} into an {@link Observable} instance composing disposal
      * through.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toObservable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
      */
     @SuppressWarnings("unchecked")
     @CheckReturnValue
@@ -3723,13 +3815,13 @@ public final Observable<T> toObservable() {
     }
 
     /**
-     * Converts this Maybe into a Single instance composing disposal
-     * through and turning an empty Maybe into a signal of NoSuchElementException.
+     * Converts this {@code Maybe} into a {@link Single} instance composing disposal
+     * through and turning an empty {@code Maybe} into a signal of {@link NoSuchElementException}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3739,13 +3831,13 @@ public final Single<T> toSingle() {
     }
 
     /**
-     * Returns a Maybe instance that if this Maybe emits an error, it will emit an onComplete
+     * Returns a {@code Maybe} instance that if this {@code Maybe} emits an error, it will emit an {@code onComplete}
      * and swallow the throwable.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3755,15 +3847,16 @@ public final Maybe<T> onErrorComplete() {
     }
 
     /**
-     * Returns a Maybe instance that if this Maybe emits an error and the predicate returns
-     * true, it will emit an onComplete and swallow the throwable.
+     * Returns a {@code Maybe} instance that if this {@code Maybe} emits an error and the predicate returns
+     * {@code true}, it will emit an {@code onComplete} and swallow the throwable.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param predicate the predicate to call when an Throwable is emitted which should return true
-     * if the Throwable should be swallowed and replaced with an onComplete.
-     * @return the new Maybe instance
+     * @param predicate the predicate to call when an {@link Throwable} is emitted which should return {@code true}
+     * if the {@code Throwable} should be swallowed and replaced with an {@code onComplete}.
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -3775,7 +3868,7 @@ public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> pred
     }
 
     /**
-     * Instructs a Maybe to pass control to another {@link MaybeSource} rather than invoking
+     * Instructs a {@code Maybe} to pass control to another {@link MaybeSource} rather than invoking
      * {@link MaybeObserver#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
@@ -3788,9 +3881,10 @@ public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> pred
      * </dl>
      *
      * @param next
-     *            the next {@code MaybeSource} that will take over if the source Maybe encounters
+     *            the next {@code MaybeSource} that will take over if the source {@code Maybe} encounters
      *            an error
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code next} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -3802,7 +3896,7 @@ public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> next)
     }
 
     /**
-     * Instructs a Maybe to pass control to another Maybe rather than invoking
+     * Instructs a {@code Maybe} to pass control to another {@link MaybeSource} rather than invoking
      * {@link MaybeObserver#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
@@ -3815,9 +3909,10 @@ public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> next)
      * </dl>
      *
      * @param resumeFunction
-     *            a function that returns a MaybeSource that will take over if the source Maybe encounters
+     *            a function that returns a {@code MaybeSource} that will take over if the source {@code Maybe} encounters
      *            an error
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code resumeFunction} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -3829,7 +3924,7 @@ public final Maybe<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? e
     }
 
     /**
-     * Instructs a Maybe to emit an item (returned by a specified function) rather than invoking
+     * Instructs a {@code Maybe} to emit an item (returned by a specified function) rather than invoking
      * {@link MaybeObserver#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
@@ -3843,8 +3938,9 @@ public final Maybe<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? e
      *
      * @param valueSupplier
      *            a function that returns a single value that will be emitted as success value
-     *            the current Maybe signals an onError event
-     * @return the new Maybe instance
+     *            the current {@code Maybe} signals an {@code onError} event
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code valueSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -3856,7 +3952,7 @@ public final Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? exten
     }
 
     /**
-     * Instructs a Maybe to emit an item (returned by a specified function) rather than invoking
+     * Instructs a {@code Maybe} to emit an item (returned by a specified function) rather than invoking
      * {@link MaybeObserver#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
@@ -3869,8 +3965,9 @@ public final Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? exten
      * </dl>
      *
      * @param item
-     *            the value that is emitted as onSuccess in case this Maybe signals an onError
-     * @return the new Maybe instance
+     *            the value that is emitted as {@code onSuccess} in case this {@code Maybe} signals an {@code onError}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -3882,7 +3979,7 @@ public final Maybe<T> onErrorReturnItem(@NonNull T item) {
     }
 
     /**
-     * Instructs a Maybe to pass control to another MaybeSource rather than invoking
+     * Instructs a {@code Maybe} to pass control to another {@link MaybeSource} rather than invoking
      * {@link MaybeObserver#onError onError} if it encounters an {@link java.lang.Exception}.
      * <p>
      * This differs from {@link #onErrorResumeNext} in that this one does not handle {@link java.lang.Throwable}
@@ -3898,9 +3995,10 @@ public final Maybe<T> onErrorReturnItem(@NonNull T item) {
      * </dl>
      *
      * @param next
-     *            the next MaybeSource that will take over if the source Maybe encounters
+     *            the next {@code MaybeSource} that will take over if the source {@code Maybe} encounters
      *            an exception
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code next} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -3912,16 +4010,16 @@ public final Maybe<T> onExceptionResumeNext(@NonNull MaybeSource<? extends T> ne
     }
 
     /**
-     * Nulls out references to the upstream producer and downstream MaybeObserver if
-     * the sequence is terminated or downstream calls dispose().
+     * Nulls out references to the upstream producer and downstream {@link MaybeObserver} if
+     * the sequence is terminated or downstream calls {@code dispose()}.
      * <p>
      * <img width="640" height="263" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.onTerminateDetach.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a Maybe which nulls out references to the upstream producer and downstream MaybeObserver if
-     * the sequence is terminated or downstream calls dispose()
+     * @return a {@code Maybe} which {@code null}s out references to the upstream producer and downstream {@code MaybeObserver} if
+     * the sequence is terminated or downstream calls {@code dispose()}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3931,7 +4029,7 @@ public final Maybe<T> onTerminateDetach() {
     }
 
     /**
-     * Returns a Flowable that repeats the sequence of items emitted by the source Maybe indefinitely.
+     * Returns a {@link Flowable} that repeats the sequence of items emitted by the source {@code Maybe} indefinitely.
      * <p>
      * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.o.png" alt="">
      * <dl>
@@ -3941,7 +4039,7 @@ public final Maybe<T> onTerminateDetach() {
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that emits the items emitted by the source Maybe repeatedly and in sequence
+     * @return a {@code Flowable} that emits the items emitted by the source {@code Maybe} repeatedly and in sequence
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3953,7 +4051,7 @@ public final Flowable<T> repeat() {
     }
 
     /**
-     * Returns a Flowable that repeats the sequence of items emitted by the source Maybe at most
+     * Returns a {@link Flowable} that repeats the sequence of items emitted by the source {@code Maybe} at most
      * {@code count} times.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
@@ -3965,9 +4063,9 @@ public final Flowable<T> repeat() {
      * </dl>
      *
      * @param times
-     *            the number of times the source Maybe items are repeated, a count of 0 will yield an empty
+     *            the number of times the source {@code Maybe} items are repeated, a count of 0 will yield an empty
      *            sequence
-     * @return a Flowable that repeats the sequence of items emitted by the source Maybe at most
+     * @return a {@code Flowable} that repeats the sequence of items emitted by the source {@code Maybe} at most
      *         {@code count} times
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero
@@ -3982,8 +4080,8 @@ public final Flowable<T> repeat(long times) {
     }
 
     /**
-     * Returns a Flowable that repeats the sequence of items emitted by the source Maybe until
-     * the provided stop function returns true.
+     * Returns a {@link Flowable} that repeats the sequence of items emitted by the source {@code Maybe} until
+     * the provided stop function returns {@code true}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
      * <dl>
@@ -3994,11 +4092,11 @@ public final Flowable<T> repeat(long times) {
      * </dl>
      *
      * @param stop
-     *                a boolean supplier that is called when the current Flowable completes and unless it returns
-     *                false, the current Flowable is resubscribed
-     * @return the new Flowable instance
+     *                a boolean supplier that is called when the current {@code Flowable} completes and unless it returns
+     *                {@code false}, the current {@code Flowable} is resubscribed
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException
-     *             if {@code stop} is null
+     *             if {@code stop} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4010,25 +4108,25 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns a Flowable that emits the same values as the source Publisher with the exception of an
+     * Returns a {@link Flowable} that emits the same values as the source {@code Maybe} with the exception of an
      * {@code onComplete}. An {@code onComplete} notification from the source will result in the emission of
-     * a {@code void} item to the Publisher provided as an argument to the {@code notificationHandler}
-     * function. If that Publisher calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
-     * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, this Publisher will
-     * resubscribe to the source Publisher.
+     * a {@code void} item to the {@link Publisher} provided as an argument to the {@code notificationHandler}
+     * function. If that {@code Publisher} calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
+     * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
+     * resubscribe to the source {@code Publisher}.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
-     *  If this expectation is violated, the operator <em>may</em> throw an {@code IllegalStateException}.</dd>
+     *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeatWhen} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param handler
-     *            receives a Publisher of notifications with which a user can complete or error, aborting the repeat.
-     * @return the source Publisher modified with repeat logic
+     *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the repeat.
+     * @return the source {@code Publisher} modified with repeat logic
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4040,19 +4138,19 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
     }
 
     /**
-     * Returns a Maybe that mirrors the source Maybe, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Maybe} that mirrors the source {@code Maybe}, resubscribing to it if it calls {@code onError}
      * (infinite retry count).
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <p>
-     * If the source Maybe calls {@link MaybeObserver#onError}, this method will resubscribe to the source
-     * Maybe rather than propagating the {@code onError} call.
+     * If the source {@code Maybe} calls {@link MaybeObserver#onError}, this method will resubscribe to the source
+     * {@code Maybe} rather than propagating the {@code onError} call.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -4063,8 +4161,8 @@ public final Maybe<T> retry() {
     }
 
     /**
-     * Returns a Maybe that mirrors the source Maybe, resubscribing to it if it calls {@code onError}
-     * and the predicate returns true for that specific exception and retry count.
+     * Returns a {@code Maybe} that mirrors the source {@code Maybe}, resubscribing to it if it calls {@code onError}
+     * and the predicate returns {@code true} for that specific exception and retry count.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <dl>
@@ -4075,7 +4173,7 @@ public final Maybe<T> retry() {
      * @param predicate
      *            the predicate that determines if a resubscription may happen in case of a specific exception
      *            and retry count
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      * @see #retry()
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
@@ -4087,13 +4185,13 @@ public final Maybe<T> retry(@NonNull BiPredicate<? super Integer, ? super Throwa
     }
 
     /**
-     * Returns a Maybe that mirrors the source Maybe, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Maybe} that mirrors the source {@code Maybe}, resubscribing to it if it calls {@code onError}
      * up to a specified number of retries.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <p>
-     * If the source Maybe calls {@link MaybeObserver#onError}, this method will resubscribe to the source
-     * Maybe for a maximum of {@code count} resubscriptions rather than propagating the
+     * If the source {@code Maybe} calls {@link MaybeObserver#onError}, this method will resubscribe to the source
+     * {@code Maybe} for a maximum of {@code count} resubscriptions rather than propagating the
      * {@code onError} call.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -4101,8 +4199,8 @@ public final Maybe<T> retry(@NonNull BiPredicate<? super Integer, ? super Throwa
      * </dl>
      *
      * @param count
-     *            the number of times to resubscribe if the current Maybe fails
-     * @return the new Maybe instance
+     *            the number of times to resubscribe if the current {@code Maybe} fails
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -4113,15 +4211,15 @@ public final Maybe<T> retry(long count) {
     }
 
     /**
-     * Retries at most times or until the predicate returns false, whichever happens first.
+     * Retries at most {@code times} or until the predicate returns {@code false}, whichever happens first.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param times the number of times to resubscribe if the current Maybe fails
-     * @param predicate the predicate called with the failure Throwable and should return true to trigger a retry.
-     * @return the new Maybe instance
+     * @param times the number of times to resubscribe if the current {@code Maybe} fails
+     * @param predicate the predicate called with the failure {@link Throwable} and should return {@code true} to trigger a retry.
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4131,14 +4229,14 @@ public final Maybe<T> retry(long times, @NonNull Predicate<? super Throwable> pr
     }
 
     /**
-     * Retries the current Maybe if it fails and the predicate returns true.
+     * Retries the current {@code Maybe} if it fails and the predicate returns {@code true}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param predicate the predicate that receives the failure Throwable and should return true to trigger a retry.
-     * @return the new Maybe instance
+     * @param predicate the predicate that receives the failure {@link Throwable} and should return {@code true} to trigger a retry.
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4148,13 +4246,14 @@ public final Maybe<T> retry(@NonNull Predicate<? super Throwable> predicate) {
     }
 
     /**
-     * Retries until the given stop function returns true.
+     * Retries until the given stop function returns {@code true}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retryUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param stop the function that should return true to stop retrying
-     * @return the new Maybe instance
+     * @param stop the function that should return {@code true} to stop retrying
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code stop} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -4165,12 +4264,12 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns a Maybe that emits the same values as the source Maybe with the exception of an
+     * Returns a {@code Maybe} that emits the same values as the source {@code Maybe} with the exception of an
      * {@code onError}. An {@code onError} notification from the source will result in the emission of a
-     * {@link Throwable} item to the Publisher provided as an argument to the {@code notificationHandler}
-     * function. If that Publisher calls {@code onComplete} or {@code onError} then {@code retry} will call
-     * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this Publisher will
-     * resubscribe to the source Publisher.
+     * {@link Throwable} item to the {@link Publisher} provided as an argument to the {@code notificationHandler}
+     * function. If that {@code Publisher} calls {@code onComplete} or {@code onError} then {@code retry} will call
+     * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
+     * resubscribe to the source {@code Publisher}.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.png" alt="">
      * <p>
@@ -4205,7 +4304,7 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
      * Note that the inner {@code Publisher} returned by the handler function should signal
      * either {@code onNext}, {@code onError} or {@code onComplete} in response to the received
      * {@code Throwable} to indicate the operator should retry or terminate. If the upstream to
-     * the operator is asynchronous, signalling onNext followed by onComplete immediately may
+     * the operator is asynchronous, signalling {@code onNext} followed by {@code onComplete} immediately may
      * result in the sequence to be completed immediately. Similarly, if this inner
      * {@code Publisher} signals {@code onError} or {@code onComplete} while the upstream is
      * active, the sequence is terminated with the same signal immediately.
@@ -4232,9 +4331,9 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
      * </dl>
      *
      * @param handler
-     *            receives a Publisher of notifications with which a user can complete or error, aborting the
+     *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the
      *            retry
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -4246,18 +4345,18 @@ public final Maybe<T> retryWhen(
     }
 
     /**
-     * Subscribes to a Maybe and ignores {@code onSuccess} and {@code onComplete} emissions.
+     * Subscribes to a {@code Maybe} and ignores {@code onSuccess} and {@code onComplete} emissions.
      * <p>
-     * If the Maybe emits an error, it is wrapped into an
+     * If the {@code Maybe} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the Maybe has finished sending them
+     *         the {@code Maybe} has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4267,22 +4366,22 @@ public final Disposable subscribe() {
     }
 
     /**
-     * Subscribes to a Maybe and provides a callback to handle the items it emits.
+     * Subscribes to a {@code Maybe} and provides a callback to handle the items it emits.
      * <p>
-     * If the Maybe emits an error, it is wrapped into an
+     * If the {@code Maybe} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onSuccess
-     *             the {@code Consumer<T>} you have designed to accept a success value from the Maybe
+     *             the {@code Consumer<T>} you have designed to accept a success value from the {@code Maybe}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the Maybe has finished sending them
+     *         the {@code Maybe} has finished sending them
      * @throws NullPointerException
-     *             if {@code onSuccess} is null
+     *             if {@code onSuccess} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -4293,7 +4392,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
     }
 
     /**
-     * Subscribes to a Maybe and provides callbacks to handle the items it emits and any error
+     * Subscribes to a {@code Maybe} and provides callbacks to handle the items it emits and any error
      * notification it issues.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -4301,16 +4400,16 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
      * </dl>
      *
      * @param onSuccess
-     *             the {@code Consumer<T>} you have designed to accept a success value from the Maybe
+     *             the {@code Consumer<T>} you have designed to accept a success value from the {@code Maybe}
      * @param onError
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
-     *             Maybe
+     *             {@code Maybe}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the Maybe has finished sending them
+     *         the {@code Maybe} has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
-     *             if {@code onSuccess} is null, or
-     *             if {@code onError} is null
+     *             if {@code onSuccess} is {@code null}, or
+     *             if {@code onError} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4320,7 +4419,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNu
     }
 
     /**
-     * Subscribes to a Maybe and provides callbacks to handle the items it emits and any error or
+     * Subscribes to a {@code Maybe} and provides callbacks to handle the items it emits and any error or
      * completion notification it issues.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -4328,19 +4427,18 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNu
      * </dl>
      *
      * @param onSuccess
-     *             the {@code Consumer<T>} you have designed to accept a success value from the Maybe
+     *             the {@code Consumer<T>} you have designed to accept a success value from the {@code Maybe}
      * @param onError
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
-     *             Maybe
+     *             {@code Maybe}
      * @param onComplete
-     *             the {@code Action} you have designed to accept a completion notification from the
-     *             Maybe
+     *             the {@link Action} you have designed to accept a completion notification from the
+     *             {@code Maybe}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the Maybe has finished sending them
+     *         the {@code Maybe} has finished sending them
      * @throws NullPointerException
-     *             if {@code onSuccess} is null, or
-     *             if {@code onError} is null, or
-     *             if {@code onComplete} is null
+     *             if {@code onSuccess}, {@code onError} or
+     *             {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -4380,22 +4478,23 @@ public final void subscribe(@NonNull MaybeObserver<? super T> observer) {
      * <p>There is no need to call any of the plugin hooks on the current {@code Maybe} instance or
      * the {@code MaybeObserver}; all hooks and basic safeguards have been
      * applied by {@link #subscribe(MaybeObserver)} before this method gets called.
-     * @param observer the MaybeObserver to handle, not null
+     * @param observer the {@code MaybeObserver} to handle, not {@code null}
      */
     protected abstract void subscribeActual(@NonNull MaybeObserver<? super T> observer);
 
     /**
-     * Asynchronously subscribes subscribers to this Maybe on the specified {@link Scheduler}.
+     * Asynchronously subscribes subscribers to this {@code Maybe} on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="752" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.subscribeOn.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>you specify which {@link Scheduler} this operator will use.</dd>
+     * <dd>you specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to perform subscription actions on
-     * @return the new Maybe instance that its subscriptions happen on the specified {@link Scheduler}
+     *            the {@code Scheduler} to perform subscription actions on
+     * @return the new {@code Maybe} instance that its subscriptions happen on the specified {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #observeOn
@@ -4409,8 +4508,8 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Subscribes a given MaybeObserver (subclass) to this Maybe and returns the given
-     * MaybeObserver as is.
+     * Subscribes a given {@link MaybeObserver} (subclass) to this {@code Maybe} and returns the given
+     * {@code MaybeObserver} as is.
      * <p>Usage example:
      * <pre><code>
      * Maybe&lt;Integer&gt; source = Maybe.just(1);
@@ -4426,10 +4525,10 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <E> the type of the MaybeObserver to use and return
-     * @param observer the MaybeObserver (subclass) to use and return, not null
+     * @param <E> the type of the {@code MaybeObserver} to use and return
+     * @param observer the {@code MaybeObserver} (subclass) to use and return, not {@code null}
      * @return the input {@code subscriber}
-     * @throws NullPointerException if {@code subscriber} is null
+     * @throws NullPointerException if {@code subscriber} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4440,8 +4539,8 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a Maybe that emits the items emitted by the source Maybe or the items of an alternate
-     * MaybeSource if the current Maybe is empty.
+     * Returns a {@code Maybe} that emits the items emitted by the source {@code Maybe} or the items of an alternate
+     * {@link MaybeSource} if the current {@code Maybe} is empty.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
      * <dl>
@@ -4450,9 +4549,10 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param other
-     *              the alternate MaybeSource to subscribe to if the main does not emit any items
-     * @return  a Maybe that emits the items emitted by the source Maybe or the items of an
-     *          alternate MaybeSource if the source Maybe is empty.
+     *              the alternate {@code MaybeSource} to subscribe to if the main does not emit any items
+     * @return  a {@code Maybe} that emits the items emitted by the source {@code Maybe} or the items of an
+     *          alternate {@code MaybeSource} if the source {@code Maybe} is empty.
+     * @throws NullPointerException if {@code other} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -4463,8 +4563,8 @@ public final Maybe<T> switchIfEmpty(@NonNull MaybeSource<? extends T> other) {
     }
 
     /**
-     * Returns a Single that emits the items emitted by the source Maybe or the item of an alternate
-     * SingleSource if the current Maybe is empty.
+     * Returns a {@link Single} that emits the items emitted by the source {@code Maybe} or the item of an alternate
+     * {@link SingleSource} if the current {@code Maybe} is empty.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
      * <dl>
@@ -4473,9 +4573,10 @@ public final Maybe<T> switchIfEmpty(@NonNull MaybeSource<? extends T> other) {
      * </dl>
      * <p>History: 2.1.4 - experimental
      * @param other
-     *              the alternate SingleSource to subscribe to if the main does not emit any items
-     * @return  a Single that emits the items emitted by the source Maybe or the item of an
-     *          alternate SingleSource if the source Maybe is empty.
+     *              the alternate {@code SingleSource} to subscribe to if the main does not emit any items
+     * @return a {@code Single} that emits the items emitted by the source {@code Maybe} or the item of an
+     *         alternate {@code SingleSource} if the source {@code Maybe} is empty.
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -4487,7 +4588,7 @@ public final Single<T> switchIfEmpty(@NonNull SingleSource<? extends T> other) {
     }
 
     /**
-     * Returns a Maybe that emits the items emitted by the source Maybe until a second MaybeSource
+     * Returns a {@code Maybe} that emits the items emitted by the source {@code Maybe} until a second {@link MaybeSource}
      * emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
@@ -4497,11 +4598,12 @@ public final Single<T> switchIfEmpty(@NonNull SingleSource<? extends T> other) {
      * </dl>
      *
      * @param other
-     *            the MaybeSource whose first emitted item will cause {@code takeUntil} to stop emitting items
-     *            from the source Maybe
+     *            the {@code MaybeSource} whose first emitted item will cause {@code takeUntil} to stop emitting items
+     *            from the source {@code Maybe}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return a Maybe that emits the items emitted by the source Maybe until such time as {@code other} emits its first item
+     * @return a {@code Maybe} that emits the items emitted by the source {@code Maybe} until such time as {@code other} emits its first item
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
     @CheckReturnValue
@@ -4513,7 +4615,7 @@ public final <U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
     }
 
     /**
-     * Returns a Maybe that emits the item emitted by the source Maybe until a second Publisher
+     * Returns a {@code Maybe} that emits the item emitted by the source {@code Maybe} until a second {@link Publisher}
      * emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
@@ -4526,11 +4628,12 @@ public final <U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
      * </dl>
      *
      * @param other
-     *            the Publisher whose first emitted item will cause {@code takeUntil} to stop emitting items
-     *            from the source Publisher
+     *            the {@code Publisher} whose first emitted item will cause {@code takeUntil} to stop emitting items
+     *            from the source {@code Publisher}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return a Maybe that emits the items emitted by the source Maybe until such time as {@code other} emits its first item
+     * @return a {@code Maybe} that emits the items emitted by the source {@code Maybe} until such time as {@code other} emits its first item
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -4543,9 +4646,9 @@ public final <U> Maybe<T> takeUntil(@NonNull Publisher<U> other) {
     }
 
     /**
-     * Returns a Maybe that mirrors the source Maybe but applies a timeout policy for each emitted
+     * Returns a {@code Maybe} that mirrors the source {@code Maybe} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
-     * the resulting Maybe terminates and notifies MaybeObservers of a {@code TimeoutException}.
+     * the resulting {@code Maybe} terminates and notifies {@link MaybeObserver}s of a {@link TimeoutException}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1.png" alt="">
      * <dl>
@@ -4557,7 +4660,7 @@ public final <U> Maybe<T> takeUntil(@NonNull Publisher<U> other) {
      *            maximum duration between emitted items before a timeout occurs
      * @param timeUnit
      *            the unit of time that applies to the {@code timeout} argument.
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -4568,9 +4671,9 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
     }
 
     /**
-     * Returns a Maybe that mirrors the source Maybe but applies a timeout policy for each emitted
+     * Returns a {@code Maybe} that mirrors the source {@code Maybe} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
-     * the source MaybeSource is disposed and resulting Maybe begins instead to mirror a fallback MaybeSource.
+     * the source {@link MaybeSource} is disposed and resulting {@code Maybe} begins instead to mirror a fallback {@code MaybeSource}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
      * <dl>
@@ -4583,8 +4686,9 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
      * @param timeUnit
      *            the unit of time that applies to the {@code timeout} argument
      * @param fallback
-     *            the fallback MaybeSource to use in case of a timeout
-     * @return the new Maybe instance
+     *            the fallback {@code MaybeSource} to use in case of a timeout
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code timeUnit} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -4596,15 +4700,15 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull
     }
 
     /**
-     * Returns a Maybe that mirrors the source Maybe but applies a timeout policy for each emitted
-     * item using a specified Scheduler. If the next item isn't emitted within the specified timeout duration
-     * starting from its predecessor, the source MaybeSource is disposed and resulting Maybe begins instead
-     * to mirror a fallback MaybeSource.
+     * Returns a {@code Maybe} that mirrors the source {@code Maybe} but applies a timeout policy for each emitted
+     * item using a specified {@link Scheduler}. If the next item isn't emitted within the specified timeout duration
+     * starting from its predecessor, the source {@link MaybeSource} is disposed and resulting {@code Maybe} begins instead
+     * to mirror a fallback {@code MaybeSource}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
@@ -4612,10 +4716,11 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull
      * @param timeUnit
      *            the unit of time that applies to the {@code timeout} argument
      * @param fallback
-     *            the MaybeSource to use as the fallback in case of a timeout
+     *            the {@code MaybeSource} to use as the fallback in case of a timeout
      * @param scheduler
-     *            the {@link Scheduler} to run the timeout timers on
-     * @return the new Maybe instance
+     *            the {@code Scheduler} to run the timeout timers on
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code fallback}, {@code timeUnit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -4627,15 +4732,15 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull
     }
 
     /**
-     * Returns a Maybe that mirrors the source Maybe but applies a timeout policy for each emitted
-     * item, where this policy is governed on a specified Scheduler. If the next item isn't emitted within the
-     * specified timeout duration starting from its predecessor, the resulting Maybe terminates and
-     * notifies MaybeObservers of a {@code TimeoutException}.
+     * Returns a {@code Maybe} that mirrors the source {@code Maybe} but applies a timeout policy for each emitted
+     * item, where this policy is governed on a specified {@link Scheduler}. If the next item isn't emitted within the
+     * specified timeout duration starting from its predecessor, the resulting {@code Maybe} terminates and
+     * notifies {@link MaybeObserver}s of a {@link TimeoutException}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
@@ -4643,8 +4748,8 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull
      * @param timeUnit
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
-     *            the Scheduler to run the timeout timers on
-     * @return the new Maybe instance
+     *            the {@code Scheduler} to run the timeout timers on
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -4662,9 +4767,10 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull
      *  <dd>{@code timeout} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the value type of the
-     * @param timeoutIndicator the {@code MaybeSource} that indicates the timeout by signaling onSuccess
-     * or onComplete.
-     * @return the new Maybe instance
+     * @param timeoutIndicator the {@code MaybeSource} that indicates the timeout by signaling {@code onSuccess}
+     * or {@code onComplete}.
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code timeoutIndicator} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -4686,7 +4792,8 @@ public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator) {
      * @param timeoutIndicator the {@code MaybeSource} that indicates the timeout by signaling {@code onSuccess}
      * or {@code onComplete}.
      * @param fallback the {@code MaybeSource} that is subscribed to if the current {@code Maybe} times out
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code timeoutIndicator} or {@code fallback} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -4702,15 +4809,16 @@ public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator, @Non
      * {@link TimeoutException} is signaled instead.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The {@code timeoutIndicator} {@link Publisher} is consumed in an unbounded manner and
+     *  <dd>The {@code timeoutIndicator} {@code Publisher} is consumed in an unbounded manner and
      *  is cancelled after its first item.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeout} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the value type of the
-     * @param timeoutIndicator the {@code MaybeSource} that indicates the timeout by signaling {@code onSuccess}
+     * @param timeoutIndicator the {@code Publisher} that indicates the timeout by signaling {@code onSuccess}
      * or {@code onComplete}.
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code timeoutIndicator} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @CheckReturnValue
@@ -4723,11 +4831,11 @@ public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator) {
 
     /**
      * If the current {@code Maybe} didn't signal an event before the {@code timeoutIndicator} {@link Publisher} signals,
-     * the current {@code Maybe} is disposed and the {@code fallback} {@code MaybeSource} subscribed to
+     * the current {@code Maybe} is disposed and the {@code fallback} {@link MaybeSource} subscribed to
      * as a continuation.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The {@code timeoutIndicator} {@link Publisher} is consumed in an unbounded manner and
+     *  <dd>The {@code timeoutIndicator} {@code Publisher} is consumed in an unbounded manner and
      *  is cancelled after its first item.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeout} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4736,7 +4844,8 @@ public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator) {
      * @param timeoutIndicator the {@code MaybeSource} that indicates the timeout by signaling {@code onSuccess}
      * or {@code onComplete}
      * @param fallback the {@code MaybeSource} that is subscribed to if the current {@code Maybe} times out
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code timeoutIndicator} or {@code fallback} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @CheckReturnValue
@@ -4749,17 +4858,17 @@ public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator, @NonNu
     }
 
     /**
-     * Returns a Maybe which makes sure when a MaybeObserver disposes the Disposable,
-     * that call is propagated up on the specified scheduler.
+     * Returns a {@code Maybe} which makes sure when a {@link MaybeObserver} disposes the {@link Disposable},
+     * that call is propagated up on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="700" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.unsubscribeOn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code unsubscribeOn} calls dispose() of the upstream on the {@link Scheduler} you specify.</dd>
+     *  <dd>{@code unsubscribeOn} calls {@code dispose()} of the upstream on the {@code Scheduler} you specify.</dd>
      * </dl>
      * @param scheduler the target scheduler where to execute the disposal
-     * @return the new Maybe instance
-     * @throws NullPointerException if scheduler is null
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -4770,12 +4879,12 @@ public final Maybe<T> unsubscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Waits until this and the other MaybeSource signal a success value then applies the given BiFunction
-     * to those values and emits the BiFunction's resulting value to downstream.
+     * Waits until this and the other {@link MaybeSource} signal a success value then applies the given {@link BiFunction}
+     * to those values and emits the {@code BiFunction}'s resulting value to downstream.
      *
      * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zipWith.png" alt="">
      *
-     * <p>If either this or the other MaybeSource is empty or signals an error, the resulting Maybe will
+     * <p>If either this or the other {@code MaybeSource} is empty or signals an error, the resulting {@code Maybe} will
      * terminate immediately and dispose the other source.
      *
      * <dl>
@@ -4784,15 +4893,16 @@ public final Maybe<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the {@code other} MaybeSource
+     *            the type of items emitted by the {@code other} {@code MaybeSource}
      * @param <R>
-     *            the type of items emitted by the resulting Maybe
+     *            the type of items emitted by the resulting {@code Maybe}
      * @param other
-     *            the other MaybeSource
+     *            the other {@code MaybeSource}
      * @param zipper
-     *            a function that combines the pairs of items from the two MaybeSources to generate the items to
-     *            be emitted by the resulting Maybe
-     * @return the new Maybe instance
+     *            a function that combines the pairs of items from the two {@code MaybeSource}s to generate the items to
+     *            be emitted by the resulting {@code Maybe}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4808,13 +4918,13 @@ public final <U, R> Maybe<R> zipWith(@NonNull MaybeSource<? extends U> other, @N
     // ------------------------------------------------------------------
 
     /**
-     * Creates a TestObserver and subscribes
-     * it to this Maybe.
+     * Creates a {@link TestObserver} and subscribes
+     * it to this {@code Maybe}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new TestObserver instance
+     * @return the new {@code TestObserver} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4826,14 +4936,14 @@ public final TestObserver<T> test() {
     }
 
     /**
-     * Creates a TestObserver optionally in cancelled state, then subscribes it to this Maybe.
+     * Creates a {@link TestObserver} optionally in cancelled state, then subscribes it to this {@code Maybe}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param dispose if true, the TestObserver will be dispose before subscribing to this
-     * Maybe.
-     * @return the new TestObserver instance
+     * @param dispose if {@code true}, the {@code TestObserver} will be disposed before subscribing to this
+     * {@code Maybe}.
+     * @return the new {@code TestObserver} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4871,7 +4981,8 @@ public final TestObserver<T> test(boolean dispose) {
      * </dl>
      * @param <T> the element type of the optional value
      * @param optional the optional value to convert into a {@code Maybe}
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code optional} is {@code null}
      * @since 3.0.0
      * @see #just(Object)
      * @see #empty()
@@ -4904,9 +5015,10 @@ public final TestObserver<T> test(boolean dispose) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the element type of the CompletionStage
-     * @param stage the CompletionStage to convert to Maybe and signal its terminal value or error
-     * @return the new Maybe instance
+     * @param <T> the element type of the {@code CompletionStage}
+     * @param stage the {@code CompletionStage} to convert to {@code Maybe} and signal its terminal value or error
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code stage} is {@code null}
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -4926,10 +5038,11 @@ public final TestObserver<T> test(boolean dispose) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <R> the non-null output type
+     * @param <R> the non-{@code null} output type
      * @param mapper the function that receives the upstream success item and should return a <em>non-empty</em> {@code Optional}
      * to emit as the success output or an <em>empty</em> {@code Optional} to complete the {@code Maybe}
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #map(Function)
      * @see #filter(Predicate)
@@ -4964,7 +5077,7 @@ public final TestObserver<T> test(boolean dispose) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #toCompletionStage(Object)
      */
@@ -4997,7 +5110,7 @@ public final CompletionStage<T> toCompletionStage() {
      *  <dd>{@code toCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param defaultItem the item to signal if the upstream is empty
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -5013,7 +5126,7 @@ public final CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
      * <p>
      * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsFlowable.m.png" alt="">
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsFlowable(Function)}:
      * <pre><code>
@@ -5037,7 +5150,8 @@ public final CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
      * @param <R> the element type of the {@code Stream} and the output {@code Flowable}
      * @param mapper the function that receives the upstream success item and should
      * return a {@code Stream} of values to emit.
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #flattenAsFlowable(Function)
      * @see #flattenStreamAsObservable(Function)
@@ -5056,7 +5170,7 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
      * items to the downstream consumer as an {@link Observable}.
      * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsObservable.m.png" alt="">
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsObservable(Function)}:
      * <pre><code>
@@ -5077,7 +5191,8 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
      * @param <R> the element type of the {@code Stream} and the output {@code Observable}
      * @param mapper the function that receives the upstream success item and should
      * return a {@code Stream} of values to emit.
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #flattenAsObservable(Function)
      * @see #flattenStreamAsFlowable(Function)
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 8da48508cd..93779d4f5a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -689,7 +689,6 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.png" alt="">
      * <p>
-     * <p>
      * The operator calls {@link Future#get(long, TimeUnit)}, which is a blocking method, on the subscription thread.
      * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
      * background thread, and if the {@link Scheduler} supports it, interrupt the wait when the flow
@@ -4074,7 +4073,7 @@ public final Completable ignoreElement() {
      * <dd>{@code toFlowable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@lcode Flowable} that emits a single item T or an error.
+     * @return a {@code Flowable} that emits a single item T or an error.
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
index a3d7957a5d..222409ef3c 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
@@ -45,6 +45,11 @@ public void checkSingle() throws Exception {
         checkSource("Single", "io.reactivex.rxjava3.core");
     }
 
+    @Test
+    public void checkMaybe() throws Exception {
+        checkSource("Maybe", "io.reactivex.rxjava3.core");
+    }
+
     static void checkSource(String baseClassName, String packageName) throws Exception {
         File f = TestHelper.findSource(baseClassName);
         if (f == null) {
@@ -388,7 +393,7 @@ static void blankRange(StringBuilder builder, int start, int end) {
 
             "List", "ArrayList", "HashMap", "HashSet", "CharSequence",
 
-            "TestSubscriber", "TestObserver"
+            "TestSubscriber", "TestObserver", "Class"
     );
 
     static final Set<String> ALWAYS_CODE = new HashSet<>(Arrays.asList(
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
index 79fd425c5e..12b0d43dc4 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -221,7 +221,9 @@ static void processFile(Class<?> clazz) throws Exception {
                     }
 
                     // FIXME enable for other types in separate PR!
-                    if (!baseClassName.equals("Completable") && !baseClassName.equals("Single")) {
+                    if (!baseClassName.equals("Completable")
+                            && !baseClassName.equals("Single")
+                            && !baseClassName.equals("Maybe")) {
                         continue;
                     }
 

From 6030d83ce193cb08feb673e466b64c38ccb1c1bb Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 8 Jan 2020 20:08:43 +0100
Subject: [PATCH 041/665] 3.x: Fix Flowable.flatMap not canceling the inner
 sources on outer error (#6826)

---
 .../operators/flowable/FlowableFlatMap.java   |  5 +++
 .../flowable/FlowableFlatMapTest.java         | 34 ++++++++++++++++++
 .../observable/ObservableFlatMapTest.java     | 36 ++++++++++++++++++-
 3 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
index ea6a4f76ed..0a671cf88a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
@@ -321,6 +321,11 @@ public void onError(Throwable t) {
             }
             if (errors.tryAddThrowableOrReport(t)) {
                 done = true;
+                if (!delayErrors) {
+                    for (InnerSubscriber<?, ?> a : subscribers.getAndSet(CANCELLED)) {
+                        a.dispose();
+                    }
+                }
                 drain();
             }
         }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
index 068f652db0..6df4dc7211 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
@@ -1116,4 +1116,38 @@ public Publisher<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void mainErrorsInnerCancelled() {
+        PublishProcessor<Integer> pp1 = PublishProcessor.create();
+        PublishProcessor<Integer> pp2 = PublishProcessor.create();
+
+        pp1
+        .flatMap(v -> pp2)
+        .test();
+
+        pp1.onNext(1);
+        assertTrue("No subscribers?", pp2.hasSubscribers());
+
+        pp1.onError(new TestException());
+
+        assertFalse("Has subscribers?", pp2.hasSubscribers());
+    }
+
+    @Test
+    public void innerErrorsMainCancelled() {
+        PublishProcessor<Integer> pp1 = PublishProcessor.create();
+        PublishProcessor<Integer> pp2 = PublishProcessor.create();
+
+        pp1
+        .flatMap(v -> pp2)
+        .test();
+
+        pp1.onNext(1);
+        assertTrue("No subscribers?", pp2.hasSubscribers());
+
+        pp2.onError(new TestException());
+
+        assertFalse("Has subscribers?", pp1.hasSubscribers());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
index 00f2523a33..8dca948c81 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
@@ -26,7 +26,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -1079,4 +1079,38 @@ public Observable<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void mainErrorsInnerCancelled() {
+        PublishSubject<Integer> ps1 = PublishSubject.create();
+        PublishSubject<Integer> ps2 = PublishSubject.create();
+
+        ps1
+        .flatMap(v -> ps2)
+        .test();
+
+        ps1.onNext(1);
+        assertTrue("No subscribers?", ps2.hasObservers());
+
+        ps1.onError(new TestException());
+
+        assertFalse("Has subscribers?", ps2.hasObservers());
+    }
+
+    @Test
+    public void innerErrorsMainCancelled() {
+        PublishSubject<Integer> ps1 = PublishSubject.create();
+        PublishSubject<Integer> ps2 = PublishSubject.create();
+
+        ps1
+        .flatMap(v -> ps2)
+        .test();
+
+        ps1.onNext(1);
+        assertTrue("No subscribers?", ps2.hasObservers());
+
+        ps2.onError(new TestException());
+
+        assertFalse("Has subscribers?", ps1.hasObservers());
+    }
 }

From 1e4dbcf78a814993e80fa489a50d3369d7c4ecbd Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 10 Jan 2020 08:36:29 +0100
Subject: [PATCH 042/665] 3.x: Improve JavaDocs of Observable and fix similar
 issues elsewhere (#6831)

* 3.x: Javadoc cleanup of Observable

* Another set of cleanups (too many things to fix at once)

* 3.x: Improve JavaDocs of Observable and fix similar issues elsewhere
---
 .../reactivex/rxjava3/core/Completable.java   |    3 +-
 .../io/reactivex/rxjava3/core/Flowable.java   |  228 +-
 .../java/io/reactivex/rxjava3/core/Maybe.java |    9 +-
 .../io/reactivex/rxjava3/core/Observable.java | 6690 +++++++++--------
 .../io/reactivex/rxjava3/core/Single.java     |    2 +
 .../flowable/FlowableBlockingSubscribe.java   |   12 +-
 .../ObservableBlockingSubscribe.java          |    1 +
 .../rxjava3/parallel/ParallelFlowable.java    |   33 +-
 .../flowable/FlowableSkipLastTest.java        |    2 +-
 .../flowable/FlowableTakeLastTest.java        |    2 +-
 .../flowable/FlowableTakeLastTimedTest.java   |    2 +-
 .../ObservableConcatMapEagerTest.java         |    4 +-
 .../observable/ObservableSkipLastTest.java    |    2 +-
 .../observable/ObservableTakeLastTest.java    |    2 +-
 .../ObservableTakeLastTimedTest.java          |    2 +-
 .../validators/JavadocCodesAndLinks.java      |    7 +-
 .../rxjava3/validators/JavadocWording.java    |    2 +-
 .../ParamValidationCheckerTest.java           |    6 +
 .../validators/ParamValidationNaming.java     |   74 +-
 19 files changed, 3846 insertions(+), 3237 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 1f24e413f5..a51bb7399f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -336,6 +336,7 @@ public static Completable create(@NonNull CompletableOnSubscribe source) {
      * when the {@code Completable} is subscribed to.
      * @return the created {@code Completable} instance
      * @throws NullPointerException if {@code source} is {@code null}
+     * @throws IllegalArgumentException if {@code source} is a {@code Completable}
      */
     @CheckReturnValue
     @NonNull
@@ -364,7 +365,7 @@ public static Completable unsafeCreate(@NonNull CompletableSource source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static Completable defer(@NonNull Supplier<? extends CompletableSource> completableSupplier) {
-        Objects.requireNonNull(completableSupplier, "completableSupplier");
+        Objects.requireNonNull(completableSupplier, "completableSupplier is null");
         return RxJavaPlugins.onAssembly(new CompletableDefer(completableSupplier));
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index b5135bf356..f11415e0de 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -1352,7 +1352,7 @@ public static <T> Flowable<T> concat(
      * @param sources the array of source {@code Publisher}s
      * @param <T> the common base value type
      * @return the new {@code Publisher} instance
-     * @throws NullPointerException if sources is {@code null}
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1360,6 +1360,7 @@ public static <T> Flowable<T> concat(
     @SafeVarargs
     @NonNull
     public static <T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         } else
@@ -1386,7 +1387,7 @@ public static <T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sou
      * @param sources the array of source {@code Publisher}s
      * @param <T> the common base value type
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if sources is {@code null}
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1394,6 +1395,7 @@ public static <T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sou
     @SafeVarargs
     @NonNull
     public static <T> Flowable<T> concatArrayDelayError(@NonNull Publisher<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         } else
@@ -1925,7 +1927,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Converts an Array into a {@link Publisher} that emits the items in the Array.
+     * Converts an array into a {@link Publisher} that emits the items in the array.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.png" alt="">
      * <dl>
@@ -1939,8 +1941,8 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * @param items
      *            the array of elements
      * @param <T>
-     *            the type of items in the Array and the type of items to be emitted by the resulting {@code Publisher}
-     * @return a {@code Flowable} that emits each item in the source Array
+     *            the type of items in the array and the type of items to be emitted by the resulting {@code Publisher}
+     * @return a {@code Flowable} that emits each item in the source array
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -1981,7 +1983,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *   </dd>
      * </dl>
      *
-     * @param supplier
+     * @param callable
      *         a function, the execution of which should be deferred; {@code fromCallable} will invoke this
      *         function only when a {@code Subscriber} subscribes to the {@code Publisher} that {@code fromCallable} returns
      * @param <T>
@@ -1995,9 +1997,9 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Flowable<T> fromCallable(@NonNull Callable<? extends T> supplier) {
-        Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableFromCallable<>(supplier));
+    public static <@NonNull T> Flowable<T> fromCallable(@NonNull Callable<? extends T> callable) {
+        Objects.requireNonNull(callable, "callable is null");
+        return RxJavaPlugins.onAssembly(new FlowableFromCallable<>(callable));
     }
 
     /**
@@ -2005,11 +2007,10 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@code Future} interface into a {@code Publisher} that emits the
-     * return value of the {@link Future#get} method of that object by passing the object into the {@code from}
-     * method.
-     * <p>
-     * <em>Important note:</em> This {@code Publisher} is blocking on the thread it gets subscribed on; you cannot cancel it.
+     * The operator calls {@link Future#get()}, which is a blocking method, on the subscription thread.
+     * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
+     * background thread, and if the {@link Scheduler} supports it, interrupt the wait when the flow
+     * is disposed.
      * <p>
      * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
      * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
@@ -2021,7 +2022,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code fromFuture} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      *
      * @param future
@@ -2047,15 +2048,14 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
      * <p>
-     * You can convert any object that supports the {@code Future} interface into a {@code Publisher} that emits the
-     * return value of the {@link Future#get} method of that object by passing the object into the {@code fromFuture}
-     * method.
+     * The operator calls {@link Future#get(long, TimeUnit)}, which is a blocking method, on the subscription thread.
+     * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
+     * background thread, and if the {@link Scheduler} supports it, interrupt the wait when the flow
+     * is disposed.
      * <p>
      * Unlike 1.x, canceling the {@code Flowable} won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futurePublisher.doOnCancel(() -> future.cancel(true));}.
      * <p>
-     * <em>Important note:</em> This {@code Publisher} is blocking on the thread it gets subscribed on; you cannot cancel it.
-     * <p>
      * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
      * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
      * operator to convert and consume such sources in a non-blocking fashion instead.
@@ -2063,7 +2063,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code fromFuture} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      *
      * @param future
@@ -2540,6 +2540,9 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param unit the unit of measure of the {@code initialDelay} and {@code period} amounts
      * @param scheduler the target {@code Scheduler} where the values and terminal signals will be emitted
      * @return the new {@code Flowable} instance
+     * @throws IllegalArgumentException
+     *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
+     *             {@link Long#MAX_VALUE}
      */
     @CheckReturnValue
     @NonNull
@@ -3042,7 +3045,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
     }
 
     /**
-     * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, without any transformation, while limiting the
+     * Flattens an array of {@link Publisher}s into one {@code Publisher}, without any transformation, while limiting the
      * number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
@@ -3288,7 +3291,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? ext
     }
 
     /**
-     * Flattens an Array of {@link Publisher}s into one {@code Publisher}, without any transformation.
+     * Flattens an array of {@link Publisher}s into one {@code Publisher}, without any transformation.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.io.png" alt="">
      * <p>
@@ -4401,7 +4404,9 @@ public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
     }
 
     /**
-     * Constructs a {@link Publisher} that creates a dependent resource object which is disposed of on cancellation.
+     * Constructs a {@code Flowable} that creates a dependent resource object, a {@link Publisher} with
+     * that resource and calls the provided {@code resourceDisposer} function if this inner source terminates or the
+     * downstream cancels the flow.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
      * <dl>
@@ -4435,11 +4440,9 @@ public static <T, D> Flowable<T> using(
     }
 
     /**
-     * Constructs a {@link Publisher} that creates a dependent resource object which is disposed of just before
-     * termination if you have set {@code disposeEagerly} to {@code true} and cancellation does not occur
-     * before termination. Otherwise, resource disposal will occur on cancellation.  Eager disposal is
-     * particularly appropriate for a synchronous {@code Publisher} that reuses resources. {@code disposeAction} will
-     * only be called once per subscription.
+     * Constructs a {@code Flowable} that creates a dependent resource object, a {@link Publisher} with
+     * that resource and calls the provided {@code resourceDisposer} function if this inner source terminates or the
+     * downstream disposes the flow; doing it before these end-states have been reached if {@code eager == true}, after otherwise.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
      * <dl>
@@ -4459,7 +4462,7 @@ public static <T, D> Flowable<T> using(
      * @param resourceDisposer
      *            the function that will dispose of the resource
      * @param eager
-     *            If {@code true} then resource disposal will happen either on a {@code cancel()} call before the upstream is disposed
+     *            If {@code true}, the resource disposal will happen either on a {@code cancel()} call before the upstream is disposed
      *            or just before the emission of a terminal event ({@code onComplete} or {@code onError}).
      *            If {@code false} the resource disposal will happen either on a {@code cancel()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
@@ -5383,6 +5386,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
      * @param bufferSize
      *            the number of elements to prefetch from each source {@code Publisher}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5392,6 +5397,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
     @SafeVarargs
     public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper,
             boolean delayError, int bufferSize, @NonNull Publisher<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         }
@@ -5628,6 +5634,8 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
      *            the {@code Consumer} to invoke for each item emitted by the {@code Flowable}
      * @param bufferSize
      *            the number of items to prefetch upfront, then 75% of it after 75% received
+     * @throws NullPointerException if {@code onNext} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @throws RuntimeException
      *             if an error occurs; {@code Error}s and {@code RuntimeException}s are rethrown
      *             as they are, checked {@code Exception}s are wrapped into {@code RuntimeException}s
@@ -5637,6 +5645,7 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void blockingForEach(@NonNull Consumer<? super T> onNext, int bufferSize) {
+        Objects.requireNonNull(onNext, "onNext is null");
         Iterator<T> it = blockingIterable(bufferSize).iterator();
         while (it.hasNext()) {
             try {
@@ -6143,11 +6152,13 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      * </dl>
      * The cancellation and backpressure is composed through.
      * @param subscriber the subscriber to forward events and calls to in the current thread
+     * @throws NullPointerException if {@code subscriber} is {@code null}
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void blockingSubscribe(@NonNull Subscriber<? super T> subscriber) {
+        Objects.requireNonNull(subscriber, "subscriber is null");
         FlowableBlockingSubscribe.subscribe(this, subscriber);
     }
 
@@ -6824,7 +6835,7 @@ public final <B, U extends Collection<? super T>> Flowable<U> buffer(@NonNull Pu
      * that return a {@link ConnectableFlowable} require an explicit call to {@link ConnectableFlowable#connect()}.
      * <p>
      * <em>Note:</em> You sacrifice the ability to cancel the origin when you use the {@code cache}
-     * {@code Subscriber} so be careful not to use this {@code Subscriber} on {@code Publisher}s that emit an infinite or very large number
+     * operator so be careful not to use this operator on {@code Publisher}s that emit an infinite or very large number
      * of items that will use up memory.
      * A possible workaround is to apply {@link #takeUntil(Publisher)} with a predicate or
      * another source before (and perhaps after) the application of {@code cache()}.
@@ -6860,6 +6871,8 @@ public final <B, U extends Collection<? super T>> Flowable<U> buffer(@NonNull Pu
      * @return a {@code Flowable} that, when first subscribed to, caches all of its items and notifications for the
      *         benefit of subsequent subscribers
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
+     * @see #takeUntil(Predicate)
+     * @see #takeUntil(Publisher)
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -6883,7 +6896,7 @@ public final Flowable<T> cache() {
      * that return a {@link ConnectableFlowable} require an explicit call to {@link ConnectableFlowable#connect()}.
      * <p>
      * <em>Note:</em> You sacrifice the ability to cancel the origin when you use the {@code cache}
-     * {@code Subscriber} so be careful not to use this {@code Subscriber} on {@code Publisher}s that emit an infinite or very large number
+     * operator so be careful not to use this operator on {@code Publisher}s that emit an infinite or very large number
      * of items that will use up memory.
      * A possible workaround is to apply {@link #takeUntil(Publisher)} with a predicate or
      * another source before (and perhaps after) the application of {@code cacheWithInitialCapacity()}.
@@ -6923,6 +6936,8 @@ public final Flowable<T> cache() {
      * @return a {@code Flowable} that, when first subscribed to, caches all of its items and notifications for the
      *         benefit of subsequent subscribers
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
+     * @see #takeUntil(Predicate)
+     * @see #takeUntil(Publisher)
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -7201,7 +7216,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
     public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int prefetch, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        Objects.requireNonNull(scheduler, "scheduler");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapScheduler<>(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler));
     }
 
@@ -9412,6 +9427,7 @@ public final Flowable<T> doOnTerminate(@NonNull Action onTerminate) {
      *            the zero-based index of the item to retrieve
      * @return a {@code Maybe} that emits a single item: the item at the specified position in the sequence of
      *         those emitted by the source {@code Publisher}
+     * @throws IndexOutOfBoundsException if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
      */
     @CheckReturnValue
@@ -9444,7 +9460,7 @@ public final Maybe<T> elementAt(long index) {
      * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the source
      *         {@code Publisher}, or the default item if that index is outside the bounds of the source sequence
      * @throws IndexOutOfBoundsException
-     *             if {@code index} is less than 0
+     *             if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
      */
     @CheckReturnValue
@@ -10142,26 +10158,25 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Returns a {@code Flowable} that merges each item emitted by the source {@link Publisher} with the values in an
-     * {@link Iterable} corresponding to that item that is generated by a selector.
+     * Merges {@link Iterable}s generated by a mapper {@link Function} for each individual item emitted by
+     * the current {@code Flowable} into a single {@code Flowable} sequence.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}s is
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting {@code Iterable}
+     *            the output type and the element type of the {@code Iterable}s
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            source {@code Publisher}
-     * @return a {@code Flowable} that emits the results of merging the items emitted by the source {@code Publisher} with
-     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
+     *            current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10173,14 +10188,14 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
     }
 
     /**
-     * Returns a {@code Flowable} that merges each item emitted by the source {@link Publisher} with the values in an
-     * {@link Iterable} corresponding to that item that is generated by a selector.
+     * Merges {@link Iterable}s generated by a mapper {@link Function} for each individual item emitted by
+     * the current {@code Flowable} into a single {@code Flowable} sequence.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}s is
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10190,11 +10205,10 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
      *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            source {@code Publisher}
+     *            current {@code Flowable}
      * @param bufferSize
      *            the number of elements to prefetch from the current {@code Flowable}
-     * @return a {@code Flowable} that emits the results of merging the items emitted by the source {@code Publisher} with
-     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10208,30 +10222,32 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
     }
 
     /**
-     * Returns a {@code Flowable} that emits the results of applying a function to the pair of values from the source
-     * {@link Publisher} and an {@link Iterable} corresponding to that item that is generated by a selector.
+     * Merges {@link Iterable}s generated by a mapper {@link Function} for each individual item emitted by
+     * the current {@code Flowable} into a single {@code Flowable} sequence where the resulting items will
+     * be the combination of the original item and each inner item of the respective {@code Iterable} as returned
+     * by the {@code resultSelector} {@link BiFunction}.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.r.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and the source {@code Publisher}s is
-     *  consumed in an unbounded manner (i.e., no backpressure is applied to it).</dd>
+     *  <dd>The operator honors backpressure from downstream and the current {@code Flowable}s is
+     *  consumed in a bounded manner (requesting {@link #bufferSize()} items upfront, then 75% of it after 75% received).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the collection element type
+     *            the element type of the {@code Iterable}s
      * @param <V>
-     *            the type of item emitted by the resulting {@code Iterable}
+     *            the output type as determined by the {@code resultSelector} function
      * @param mapper
-     *            a function that returns an {@code Iterable} sequence of values for each item emitted by the source
-     *            {@code Publisher}
+     *            a function that returns an {@code Iterable} sequence of values for each item emitted by the current
+     *            {@code Flowable}
      * @param resultSelector
-     *            a function that returns an item based on the item emitted by the source {@code Publisher} and the
+     *            a function that returns an item based on the item emitted by the current {@code Flowable} and the
      *            {@code Iterable} returned for that item by the {@code collectionSelector}
-     * @return a {@code Flowable} that emits the items returned by {@code resultSelector} for each item in the source
-     *         {@code Publisher}
+     * @return a {@code Flowable} that emits the items returned by {@code resultSelector} for each item in the current
+     *         {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10246,15 +10262,16 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
     }
 
     /**
-     * Returns a {@code Flowable} that merges each item emitted by the source {@link Publisher} with the values in an
-     * {@link Iterable} corresponding to that item that is generated by a selector, while limiting the number of concurrent
-     * subscriptions to these {@code Publisher}s.
+     * Merges {@link Iterable}s generated by a mapper {@link Function} for each individual item emitted by
+     * the current {@code Flowable} into a single {@code Flowable} sequence where the resulting items will
+     * be the combination of the original item and each inner item of the respective {@code Iterable} as returned
+     * by the {@code resultSelector} {@link BiFunction}.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.r.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}s is
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10263,17 +10280,16 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
      * @param <U>
      *            the element type of the inner {@code Iterable} sequences
      * @param <V>
-     *            the type of item emitted by the resulting {@code Publisher}
+     *            the type of item emitted by the resulting {@code Flowable}
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            source {@code Publisher}
+     *            current {@code Flowable}
      * @param resultSelector
-     *            a function that returns an item based on the item emitted by the source {@code Publisher} and the
+     *            a function that returns an item based on the item emitted by the current {@code Flowable} and the
      *            {@code Iterable} returned for that item by the {@code collectionSelector}
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
-     * @return a {@code Flowable} that emits the results of merging the items emitted by the source {@code Publisher} with
-     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -11185,7 +11201,7 @@ public final Maybe<T> lastElement() {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> last(@NonNull T defaultItem) {
-        Objects.requireNonNull(defaultItem, "defaultItem");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new FlowableLastSingle<>(this, defaultItem));
     }
 
@@ -11620,7 +11636,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler) {
      *            the {@code Scheduler} to notify {@link Subscriber}s on
      * @param delayError
      *            indicates if the {@code onError} notification may not cut ahead of {@code onNext} notification on the other side of the
-     *            scheduling boundary. If {@code true} a sequence ending in {@code onError} will be replayed in the same order as was received
+     *            scheduling boundary. If {@code true}, a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
      * @return the source {@code Publisher} modified so that its {@code Subscriber}s are notified on the specified
      *         {@code Scheduler}
@@ -11672,7 +11688,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      *            the {@code Scheduler} to notify {@link Subscriber}s on
      * @param delayError
      *            indicates if the {@code onError} notification may not cut ahead of {@code onNext} notification on the other side of the
-     *            scheduling boundary. If {@code true} a sequence ending in {@code onError} will be replayed in the same order as was received
+     *            scheduling boundary. If {@code true}, a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
      * @param bufferSize the size of the buffer.
      * @return the source {@code Publisher} modified so that its {@code Subscriber}s are notified on the specified
@@ -11940,13 +11956,13 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
      * by {@code overflowStrategy} if the buffer capacity is exceeded.
      *
      * <ul>
-     *     <li>{@code BackpressureOverflow.Strategy.ON_OVERFLOW_ERROR} (default) will call {@code onError} dropping all undelivered items,
+     *     <li>{@link BackpressureOverflowStrategy#ERROR} (default) will call {@code onError} dropping all undelivered items,
      *     canceling the source, and notifying the producer with {@code onOverflow}. </li>
-     *     <li>{@code BackpressureOverflow.Strategy.ON_OVERFLOW_DROP_LATEST} will drop any new items emitted by the producer while
+     *     <li>{@link BackpressureOverflowStrategy#DROP_LATEST} will drop any new items emitted by the producer while
      *     the buffer is full, without generating any {@code onError}.  Each drop will, however, invoke {@code onOverflow}
      *     to signal the overflow to the producer.</li>
-     *     <li>{@code BackpressureOverflow.Strategy.ON_OVERFLOW_DROP_OLDEST} will drop the oldest items in the buffer in order to make
-     *     room for newly emitted ones. Overflow will not generate an{@code onError}, but each drop will invoke
+     *     <li>{@link BackpressureOverflowStrategy#DROP_OLDEST} will drop the oldest items in the buffer in order to make
+     *     room for newly emitted ones. Overflow will not generate an {@code onError}, but each drop will invoke
      *     {@code onOverflow} to signal the overflow to the producer.</li>
      * </ul>
      *
@@ -11961,8 +11977,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
      * </dl>
      *
      * @param capacity number of slots available in the buffer.
-     * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots.  Null is allowed.
-     * @param overflowStrategy how should the {@code Publisher} react to buffer overflows.  Null is not allowed.
+     * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots, {@code null} is allowed.
+     * @param overflowStrategy how should the {@code Publisher} react to buffer overflows, {@code null} is not allowed.
      * @return the source {@code Flowable} modified to buffer items up to the given capacity
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 2.0
@@ -11971,7 +11987,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onBackpressureBuffer(long capacity, @NonNull Action onOverflow, @NonNull BackpressureOverflowStrategy overflowStrategy) {
+    public final Flowable<T> onBackpressureBuffer(long capacity, @Nullable Action onOverflow, @NonNull BackpressureOverflowStrategy overflowStrategy) {
         Objects.requireNonNull(overflowStrategy, "overflowStrategy is null");
         ObjectHelper.verifyPositive(capacity, "capacity");
         return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBufferStrategy<>(this, capacity, onOverflow, overflowStrategy));
@@ -13637,6 +13653,7 @@ public final Flowable<T> retry(long count) {
      * </dl>
      * @param times the number of times to resubscribe if the current {@code Flowable} fails
      * @param predicate the predicate called with the failure {@link Throwable} and should return {@code true} to trigger a retry.
+     * @throws IllegalArgumentException if {@code times} is negative
      * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
@@ -14397,7 +14414,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Schedu
      *            number of items to drop from the end of the source sequence
      * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} except for the dropped ones
      *         at the end
-     * @throws IndexOutOfBoundsException
+     * @throws IllegalArgumentException
      *             if {@code count} is less than zero
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -14407,7 +14424,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Schedu
     @NonNull
     public final Flowable<T> skipLast(int count) {
         if (count < 0) {
-            throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
+            throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
         if (count == 0) {
             return RxJavaPlugins.onAssembly(this);
@@ -14705,7 +14722,7 @@ public final Flowable<T> sorted() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> sortFunction) {
-        Objects.requireNonNull(sortFunction, "sortFunction");
+        Objects.requireNonNull(sortFunction, "sortFunction is null");
         return toList().toFlowable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.identity());
     }
 
@@ -15625,6 +15642,7 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
      *            the downstream.
      * @return a {@code Flowable} that emits only the first {@code count} items emitted by the source {@code Publisher}, or
      *         all of the items from the source {@code Publisher} if that {@code Publisher} emits fewer than {@code count} items
+     * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
     @CheckReturnValue
@@ -15720,8 +15738,8 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit, @NonNull Schedu
      *            the maximum number of items to emit from the end of the sequence of items emitted by the source
      *            {@code Publisher}
      * @return a {@code Flowable} that emits at most the last {@code count} items emitted by the source {@code Publisher}
-     * @throws IndexOutOfBoundsException
-     *             if {@code count} is less than zero
+     * @throws IllegalArgumentException
+     *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -15730,7 +15748,7 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit, @NonNull Schedu
     @NonNull
     public final Flowable<T> takeLast(int count) {
         if (count < 0) {
-            throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
+            throw new IllegalArgumentException("count >= 0 required but it was " + count);
         } else
         if (count == 0) {
             return RxJavaPlugins.onAssembly(new FlowableIgnoreElements<>(this));
@@ -15798,7 +15816,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit)
      * @return a {@code Flowable} that emits at most {@code count} items from the source {@code Publisher} that were emitted
      *         in a specified window of time before the {@code Publisher} completed, where the timing information is
      *         provided by the given {@code scheduler}
-     * @throws IndexOutOfBoundsException
+     * @throws IllegalArgumentException
      *             if {@code count} is less than zero
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -15840,8 +15858,8 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      * @return a {@code Flowable} that emits at most {@code count} items from the source {@code Publisher} that were emitted
      *         in a specified window of time before the {@code Publisher} completed, where the timing information is
      *         provided by the given {@code scheduler}
-     * @throws IndexOutOfBoundsException
-     *             if {@code count} is less than zero
+     * @throws IllegalArgumentException
+     *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -15853,7 +15871,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (count < 0) {
-            throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
+            throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
         return RxJavaPlugins.onAssembly(new FlowableTakeLastTimed<>(this, count, time, unit, scheduler, bufferSize, delayError));
     }
@@ -16697,7 +16715,7 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      *
      * @param timeout
      *            maximum duration between emitted items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument.
      * @return the source {@code Publisher} modified to notify {@code Subscriber}s of a {@code TimeoutException} in case of a
      *         timeout
@@ -16707,8 +16725,8 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
-        return timeout0(timeout, timeUnit, null, Schedulers.computation());
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit) {
+        return timeout0(timeout, unit, null, Schedulers.computation());
     }
 
     /**
@@ -16729,7 +16747,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
      *
      * @param timeout
      *            maximum duration between items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument
      * @param other
      *            the fallback {@code Publisher} to use in case of a timeout
@@ -16740,9 +16758,9 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Publisher<? extends T> other) {
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, timeUnit, other, Schedulers.computation());
+        return timeout0(timeout, unit, other, Schedulers.computation());
     }
 
     /**
@@ -16764,7 +16782,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
      *
      * @param timeout
      *            maximum duration between items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
      *            the {@code Scheduler} to run the timeout timers on
@@ -16778,9 +16796,9 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler, @NonNull Publisher<? extends T> other) {
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, timeUnit, other, scheduler);
+        return timeout0(timeout, unit, other, scheduler);
     }
 
     /**
@@ -16800,7 +16818,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
      *
      * @param timeout
      *            maximum duration between items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
      *            the {@code Scheduler} to run the timeout timers on
@@ -16812,8 +16830,8 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonN
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler) {
-        return timeout0(timeout, timeUnit, null, scheduler);
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return timeout0(timeout, unit, null, scheduler);
     }
 
     /**
@@ -16906,11 +16924,11 @@ public final <U, V> Flowable<T> timeout(
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other);
     }
 
-    private Flowable<T> timeout0(long timeout, TimeUnit timeUnit, Publisher<? extends T> other,
+    private Flowable<T> timeout0(long timeout, TimeUnit unit, Publisher<? extends T> other,
             Scheduler scheduler) {
-        Objects.requireNonNull(timeUnit, "timeUnit is null");
+        Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableTimeoutTimed<>(this, timeout, timeUnit, scheduler, other));
+        return RxJavaPlugins.onAssembly(new FlowableTimeoutTimed<>(this, timeout, unit, scheduler, other));
     }
 
     private <U, V> Flowable<T> timeout0(
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index e8e01a15c7..441267389c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -147,12 +147,14 @@ public static <T> Maybe<T> amb(@NonNull Iterable<? extends MaybeSource<? extends
      * @param sources the array of sources. A subscription to each source will
      *            occur in the same order as in the array.
      * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
     public static <T> Maybe<T> ambArray(@NonNull MaybeSource<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         }
@@ -402,6 +404,7 @@ public static <T> Flowable<T> concatArray(@NonNull MaybeSource<? extends T>... s
     @SafeVarargs
     @NonNull
     public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return Flowable.empty();
         } else
@@ -1364,6 +1367,7 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
     @SafeVarargs
     @NonNull
     public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return Flowable.empty();
         }
@@ -1764,6 +1768,8 @@ public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Sch
      * @param <T> the value type
      * @param onSubscribe the function that is called with the subscribing {@code MaybeObserver}
      * @return the new {@code Maybe} instance
+     * @throws IllegalArgumentException if {@code onSubscribe} is a {@code Maybe}
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1858,6 +1864,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
      * @param <T> the value type
      * @param source the source to wrap
      * @return the {@code Maybe} wrapper or the source cast to {@code Maybe} (if possible)
+     * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -3522,7 +3529,7 @@ public final Single<Boolean> isEmpty() {
      *         if (str.length() &lt; 2) {
      *             downstream.onSuccess(str);
      *         } else {
-     *             // Maybe i {@code Maybe} ly expected to produce one of the onXXX events
+     *             // Maybe is expected to produce one of the onXXX events only
      *             downstream.onComplete();
      *         }
      *     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 5c94b3f9e2..2d75dee207 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -21,7 +21,7 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
@@ -37,14 +37,14 @@
 import io.reactivex.rxjava3.schedulers.*;
 
 /**
- * The Observable class is the non-backpressured, optionally multi-valued base reactive class that
+ * The {@code Observable} class is the non-backpressured, optionally multi-valued base reactive class that
  * offers factory methods, intermediate operators and the ability to consume synchronous
  * and/or asynchronous reactive dataflows.
  * <p>
- * Many operators in the class accept {@code ObservableSource}(s), the base reactive interface
+ * Many operators in the class accept {@link ObservableSource}(s), the base reactive interface
  * for such non-backpressured flows, which {@code Observable} itself implements as well.
  * <p>
- * The Observable's operators, by default, run with a buffer size of 128 elements (see {@link Flowable#bufferSize()}),
+ * The {@code Observable}'s operators, by default, run with a buffer size of 128 elements (see {@link Flowable#bufferSize()}),
  * that can be overridden globally via the system parameter {@code rx3.buffer-size}. Most operators, however, have
  * overloads that allow setting their internal buffer size explicitly.
  * <p>
@@ -67,7 +67,7 @@
  * {@code Observer.onSubscribe}.
  * <p>
  * Unlike the {@code Observable} of version 1.x, {@link #subscribe(Observer)} does not allow external disposal
- * of a subscription and the {@code Observer} instance is expected to expose such capability.
+ * of a subscription and the {@link Observer} instance is expected to expose such capability.
  * <p>Example:
  * <pre><code>
  * Disposable d = Observable.just("Hello world!")
@@ -93,14 +93,14 @@
  * </code></pre>
  *
  * @param <T>
- *            the type of the items emitted by the Observable
+ *            the type of the items emitted by the {@code Observable}
  * @see Flowable
  * @see io.reactivex.rxjava3.observers.DisposableObserver
  */
 public abstract class Observable<T> implements ObservableSource<T> {
 
     /**
-     * Mirrors the one ObservableSource in an Iterable of several ObservableSources that first either emits an item or sends
+     * Mirrors the one {@link ObservableSource} in an {@link Iterable} of several {@code ObservableSource}s that first either emits an item or sends
      * a termination notification.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
@@ -111,10 +111,11 @@ public abstract class Observable<T> implements ObservableSource<T> {
      *
      * @param <T> the common element type
      * @param sources
-     *            an Iterable of ObservableSource sources competing to react first. A subscription to each source will
-     *            occur in the same order as in the Iterable.
-     * @return an Observable that emits the same sequence as whichever of the source ObservableSources first
+     *            an {@code Iterable} of {@code ObservableSource} sources competing to react first. A subscription to each source will
+     *            occur in the same order as in the {@code Iterable}.
+     * @return an {@code Observable} that emits the same sequence as whichever of the returned {@code ObservableSource}s first
      *         emitted an item or sent a termination notification
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
     @CheckReturnValue
@@ -126,7 +127,7 @@ public static <T> Observable<T> amb(@NonNull Iterable<? extends ObservableSource
     }
 
     /**
-     * Mirrors the one ObservableSource in an array of several ObservableSources that first either emits an item or sends
+     * Mirrors the one {@link ObservableSource} in an array of several {@code ObservableSource}s that first either emits an item or sends
      * a termination notification.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
@@ -137,10 +138,11 @@ public static <T> Observable<T> amb(@NonNull Iterable<? extends ObservableSource
      *
      * @param <T> the common element type
      * @param sources
-     *            an array of ObservableSource sources competing to react first. A subscription to each source will
+     *            an array of {@code ObservableSource} sources competing to react first. A subscription to each source will
      *            occur in the same order as in the array.
-     * @return an Observable that emits the same sequence as whichever of the source ObservableSources first
+     * @return an {@code Observable} that emits the same sequence as whichever of the returned {@code ObservableSource}s first
      *         emitted an item or sent a termination notification
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
     @SuppressWarnings("unchecked")
@@ -173,19 +175,19 @@ public static int bufferSize() {
     }
 
     /**
-     * Combines a collection of source ObservableSources by emitting an item that aggregates the latest values of each of
-     * the source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines a collection of source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of
+     * the returned {@code ObservableSource}s each time an item is received from any of the returned {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided iterable of ObservableSources is empty, the resulting sequence completes immediately without emitting
+     * If the provided iterable of {@code ObservableSource}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <p>
@@ -200,11 +202,11 @@ public static int bufferSize() {
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source ObservableSources
+     *            the collection of source {@code ObservableSource}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the returned {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the returned
+     *         {@code ObservableSource}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -217,19 +219,19 @@ public static <T, R> Observable<R> combineLatest(
     }
 
     /**
-     * Combines a collection of source ObservableSources by emitting an item that aggregates the latest values of each of
-     * the source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines an {@link Iterable} of source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of
+     * the returned {@code ObservableSource}s each time an item is received from any of the returned {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided iterable of ObservableSources is empty, the resulting sequence completes immediately without emitting
+     * If the provided {@code Iterable} of {@code ObservableSource}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <p>
@@ -244,13 +246,15 @@ public static <T, R> Observable<R> combineLatest(
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source ObservableSources
+     *            the collection of source {@code ObservableSource}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
+     *            the aggregation function used to combine the items emitted by the returned {@code ObservableSource}s
      * @param bufferSize
-     *            the internal buffer size and prefetch amount applied to every source Observable
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the expected number of row combination items to be buffered internally
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the returned
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -269,19 +273,19 @@ public static <T, R> Observable<R> combineLatest(
     }
 
     /**
-     * Combines a collection of source ObservableSources by emitting an item that aggregates the latest values of each of
-     * the source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines an array of source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of
+     * the {@code ObservableSource}s each time an item is received from any of the returned {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided array of ObservableSources is empty, the resulting sequence completes immediately without emitting
+     * If the provided array of {@code ObservableSource}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <p>
@@ -296,11 +300,11 @@ public static <T, R> Observable<R> combineLatest(
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source ObservableSources
+     *            the collection of source {@code ObservableSource}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the returned
+     *         {@code ObservableSource}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -313,19 +317,19 @@ public static <T, R> Observable<R> combineLatestArray(
     }
 
     /**
-     * Combines a collection of source ObservableSources by emitting an item that aggregates the latest values of each of
-     * the source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines an array of source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of
+     * the {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided array of ObservableSources is empty, the resulting sequence completes immediately without emitting
+     * If the provided array of {@code ObservableSource}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <p>
@@ -340,13 +344,15 @@ public static <T, R> Observable<R> combineLatestArray(
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source ObservableSources
+     *            the collection of source {@code ObservableSource}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
      * @param bufferSize
-     *            the internal buffer size and prefetch amount applied to every source Observable
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the expected number of row combination items to be buffered internally
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -368,8 +374,8 @@ public static <T, R> Observable<R> combineLatestArray(
     }
 
     /**
-     * Combines two source ObservableSources by emitting an item that aggregates the latest values of each of the
-     * source ObservableSources each time an item is received from either of the source ObservableSources, where this
+     * Combines two source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of the
+     * {@code ObservableSource}s each time an item is received from either of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -386,13 +392,14 @@ public static <T, R> Observable<R> combineLatestArray(
      * @param <T2> the element type of the second source
      * @param <R> the combined output type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            the second source ObservableSource
+     *            the second source {@code ObservableSource}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -409,8 +416,8 @@ public static <T1, T2, R> Observable<R> combineLatest(
     }
 
     /**
-     * Combines three source ObservableSources by emitting an item that aggregates the latest values of each of the
-     * source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines three source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of the
+     * {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -428,15 +435,16 @@ public static <T1, T2, R> Observable<R> combineLatest(
      * @param <T3> the element type of the third source
      * @param <R> the combined output type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            the second source ObservableSource
+     *            the second source {@code ObservableSource}
      * @param source3
-     *            the third source ObservableSource
+     *            the third source {@code ObservableSource}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -455,8 +463,8 @@ public static <T1, T2, T3, R> Observable<R> combineLatest(
     }
 
     /**
-     * Combines four source ObservableSources by emitting an item that aggregates the latest values of each of the
-     * source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines four source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of the
+     * {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -475,17 +483,19 @@ public static <T1, T2, T3, R> Observable<R> combineLatest(
      * @param <T4> the element type of the fourth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            the second source ObservableSource
+     *            the second source {@code ObservableSource}
      * @param source3
-     *            the third source ObservableSource
+     *            the third source {@code ObservableSource}
      * @param source4
-     *            the fourth source ObservableSource
+     *            the fourth source {@code ObservableSource}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -505,8 +515,8 @@ public static <T1, T2, T3, T4, R> Observable<R> combineLatest(
     }
 
     /**
-     * Combines five source ObservableSources by emitting an item that aggregates the latest values of each of the
-     * source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines five source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of the
+     * {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -526,19 +536,21 @@ public static <T1, T2, T3, T4, R> Observable<R> combineLatest(
      * @param <T5> the element type of the fifth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            the second source ObservableSource
+     *            the second source {@code ObservableSource}
      * @param source3
-     *            the third source ObservableSource
+     *            the third source {@code ObservableSource}
      * @param source4
-     *            the fourth source ObservableSource
+     *            the fourth source {@code ObservableSource}
      * @param source5
-     *            the fifth source ObservableSource
+     *            the fifth source {@code ObservableSource}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -560,8 +572,8 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(
     }
 
     /**
-     * Combines six source ObservableSources by emitting an item that aggregates the latest values of each of the
-     * source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines six source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of the
+     * {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -582,21 +594,23 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(
      * @param <T6> the element type of the sixth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            the second source ObservableSource
+     *            the second source {@code ObservableSource}
      * @param source3
-     *            the third source ObservableSource
+     *            the third source {@code ObservableSource}
      * @param source4
-     *            the fourth source ObservableSource
+     *            the fourth source {@code ObservableSource}
      * @param source5
-     *            the fifth source ObservableSource
+     *            the fifth source {@code ObservableSource}
      * @param source6
-     *            the sixth source ObservableSource
+     *            the sixth source {@code ObservableSource}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -619,8 +633,8 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(
     }
 
     /**
-     * Combines seven source ObservableSources by emitting an item that aggregates the latest values of each of the
-     * source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines seven source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of the
+     * {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -642,23 +656,26 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(
      * @param <T7> the element type of the seventh source
      * @param <R> the combined output type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            the second source ObservableSource
+     *            the second source {@code ObservableSource}
      * @param source3
-     *            the third source ObservableSource
+     *            the third source {@code ObservableSource}
      * @param source4
-     *            the fourth source ObservableSource
+     *            the fourth source {@code ObservableSource}
      * @param source5
-     *            the fifth source ObservableSource
+     *            the fifth source {@code ObservableSource}
      * @param source6
-     *            the sixth source ObservableSource
+     *            the sixth source {@code ObservableSource}
      * @param source7
-     *            the seventh source ObservableSource
+     *            the seventh source {@code ObservableSource}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -683,8 +700,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
     }
 
     /**
-     * Combines eight source ObservableSources by emitting an item that aggregates the latest values of each of the
-     * source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines eight source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of the
+     * {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -707,25 +724,28 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
      * @param <T8> the element type of the eighth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            the second source ObservableSource
+     *            the second source {@code ObservableSource}
      * @param source3
-     *            the third source ObservableSource
+     *            the third source {@code ObservableSource}
      * @param source4
-     *            the fourth source ObservableSource
+     *            the fourth source {@code ObservableSource}
      * @param source5
-     *            the fifth source ObservableSource
+     *            the fifth source {@code ObservableSource}
      * @param source6
-     *            the sixth source ObservableSource
+     *            the sixth source {@code ObservableSource}
      * @param source7
-     *            the seventh source ObservableSource
+     *            the seventh source {@code ObservableSource}
      * @param source8
-     *            the eighth source ObservableSource
+     *            the eighth source {@code ObservableSource}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -751,8 +771,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
     }
 
     /**
-     * Combines nine source ObservableSources by emitting an item that aggregates the latest values of each of the
-     * source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines nine source {@link ObservableSource}s by emitting an item that aggregates the latest values of each of the
+     * {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
@@ -776,27 +796,30 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
      * @param <T9> the element type of the ninth source
      * @param <R> the combined output type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            the second source ObservableSource
+     *            the second source {@code ObservableSource}
      * @param source3
-     *            the third source ObservableSource
+     *            the third source {@code ObservableSource}
      * @param source4
-     *            the fourth source ObservableSource
+     *            the fourth source {@code ObservableSource}
      * @param source5
-     *            the fifth source ObservableSource
+     *            the fifth source {@code ObservableSource}
      * @param source6
-     *            the sixth source ObservableSource
+     *            the sixth source {@code ObservableSource}
      * @param source7
-     *            the seventh source ObservableSource
+     *            the seventh source {@code ObservableSource}
      * @param source8
-     *            the eighth source ObservableSource
+     *            the eighth source {@code ObservableSource}
      * @param source9
-     *            the ninth source ObservableSource
+     *            the ninth source {@code ObservableSource}
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8}, {@code source9} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -824,21 +847,21 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
     }
 
     /**
-     * Combines a collection of source ObservableSources by emitting an item that aggregates the latest values of each of
-     * the source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines an array of {@link ObservableSource}s by emitting an item that aggregates the latest values of each of
+     * the {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided array of ObservableSources is empty, the resulting sequence completes immediately without emitting
+     * If the provided array of {@code ObservableSource}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <dl>
@@ -851,11 +874,11 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source ObservableSources
+     *            the collection of source {@code ObservableSource}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -868,20 +891,20 @@ public static <T, R> Observable<R> combineLatestDelayError(
     }
 
     /**
-     * Combines a collection of source ObservableSources by emitting an item that aggregates the latest values of each of
-     * the source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines an array of {@link ObservableSource}s by emitting an item that aggregates the latest values of each of
+     * the {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function and delays any error from the sources until
-     * all source ObservableSources terminate.
+     * all source {@code ObservableSource}s terminate.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided array of ObservableSources is empty, the resulting sequence completes immediately without emitting
+     * If the provided array of {@code ObservableSource}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <p>
@@ -896,13 +919,15 @@ public static <T, R> Observable<R> combineLatestDelayError(
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source ObservableSources
+     *            the collection of source {@code ObservableSource}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
      * @param bufferSize
-     *            the internal buffer size and prefetch amount applied to every source Observable
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the expected number of row combination items to be buffered internally
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -910,8 +935,9 @@ public static <T, R> Observable<R> combineLatestDelayError(
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Observable<R> combineLatestDelayError(@NonNull ObservableSource<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
-        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (sources.length == 0) {
             return empty();
         }
@@ -921,20 +947,20 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull ObservableSo
     }
 
     /**
-     * Combines a collection of source ObservableSources by emitting an item that aggregates the latest values of each of
-     * the source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines an {@link Iterable} of {@link ObservableSource}s by emitting an item that aggregates the latest values of each of
+     * the {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function and delays any error from the sources until
-     * all source ObservableSources terminate.
+     * all source {@code ObservableSource}s terminate.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided iterable of ObservableSources is empty, the resulting sequence completes immediately without emitting
+     * If the provided iterable of {@code ObservableSource}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <p>
@@ -949,11 +975,11 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull ObservableSo
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source ObservableSources
+     *            the {@code Iterable} of source {@code ObservableSource}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -965,20 +991,20 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? e
     }
 
     /**
-     * Combines a collection of source ObservableSources by emitting an item that aggregates the latest values of each of
-     * the source ObservableSources each time an item is received from any of the source ObservableSources, where this
+     * Combines an {@link Iterable} of {@link ObservableSource}s by emitting an item that aggregates the latest values of each of
+     * the {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function and delays any error from the sources until
-     * all source ObservableSources terminate.
+     * all source {@code ObservableSource}s terminate.
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      * <p>
      * If any of the sources never produces an item but only terminates (normally or with an error), the
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * If the provided iterable of ObservableSources is empty, the resulting sequence completes immediately without emitting
+     * If the provided iterable of {@code ObservableSource}s is empty, the resulting sequence completes immediately without emitting
      * any items and without any calls to the combiner function.
      *
      * <p>
@@ -993,13 +1019,15 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? e
      * @param <R>
      *            the result type
      * @param sources
-     *            the collection of source ObservableSources
+     *            the collection of source {@code ObservableSource}s
      * @param combiner
-     *            the aggregation function used to combine the items emitted by the source ObservableSources
+     *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
      * @param bufferSize
-     *            the internal buffer size and prefetch amount applied to every source Observable
-     * @return an Observable that emits items that are the result of combining the items emitted by the source
-     *         ObservableSources by means of the given aggregation function
+     *            the expected number of row combination items to be buffered internally
+     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
+     *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -1017,7 +1045,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? e
     }
 
     /**
-     * Concatenates elements of each ObservableSource provided via an Iterable sequence into a single sequence
+     * Concatenates elements of each {@link ObservableSource} provided via an {@link Iterable} sequence into a single sequence
      * of elements without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -1026,8 +1054,9 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? e
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the common value type of the sources
-     * @param sources the Iterable sequence of ObservableSources
-     * @return the new Observable instance
+     * @param sources the {@code Iterable} sequence of {@code ObservableSource}s
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
@@ -1039,8 +1068,8 @@ public static <T> Observable<T> concat(@NonNull Iterable<? extends ObservableSou
     }
 
     /**
-     * Returns an Observable that emits the items emitted by each of the ObservableSources emitted by the source
-     * ObservableSource, one after the other, without interleaving them.
+     * Returns an {@code Observable} that emits the items emitted by each of the {@link ObservableSource}s emitted by the
+     * {@code ObservableSource}, one after the other, without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
      * <dl>
@@ -1050,9 +1079,10 @@ public static <T> Observable<T> concat(@NonNull Iterable<? extends ObservableSou
      *
      * @param <T> the common element base type
      * @param sources
-     *            an ObservableSource that emits ObservableSources
-     * @return an Observable that emits items all of the items emitted by the ObservableSources emitted by
-     *         {@code ObservableSources}, one after the other, without interleaving them
+     *            an {@code ObservableSource} that emits {@code ObservableSource}s
+     * @return an {@code Observable} that emits items all of the items emitted by the {@code ObservableSource}s emitted by
+     *         {@code ObservableSource}s, one after the other, without interleaving them
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -1063,8 +1093,8 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Obser
     }
 
     /**
-     * Returns an Observable that emits the items emitted by each of the ObservableSources emitted by the source
-     * ObservableSource, one after the other, without interleaving them.
+     * Returns an {@code Observable} that emits the items emitted by each of the {@link ObservableSource}s emitted by the outer
+     * {@code ObservableSource}, one after the other, without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
      * <dl>
@@ -1074,25 +1104,27 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Obser
      *
      * @param <T> the common element base type
      * @param sources
-     *            an ObservableSource that emits ObservableSources
-     * @param prefetch
-     *            the number of ObservableSources to prefetch from the sources sequence.
-     * @return an Observable that emits items all of the items emitted by the ObservableSources emitted by
-     *         {@code ObservableSources}, one after the other, without interleaving them
+     *            an {@code ObservableSource} that emits {@code ObservableSource}s
+     * @param bufferSize
+     *            the number of inner {@code ObservableSource}s expected to be buffered.
+     * @return an {@code Observable} that emits items all of the items emitted by the {@code ObservableSource}s emitted by
+     *         {@code ObservableSource}s, one after the other, without interleaving them
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch) {
+    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), prefetch, ErrorMode.IMMEDIATE));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), bufferSize, ErrorMode.IMMEDIATE));
     }
 
     /**
-     * Returns an Observable that emits the items emitted by two ObservableSources, one after the other, without
+     * Returns an {@code Observable} that emits the items emitted by two {@link ObservableSource}s, one after the other, without
      * interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -1103,11 +1135,12 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Obser
      *
      * @param <T> the common element base type
      * @param source1
-     *            an ObservableSource to be concatenated
+     *            an {@code ObservableSource} to be concatenated
      * @param source2
-     *            an ObservableSource to be concatenated
-     * @return an Observable that emits items emitted by the two source ObservableSources, one after the other,
+     *            an {@code ObservableSource} to be concatenated
+     * @return an {@code Observable} that emits items emitted by the two source {@code ObservableSource}s, one after the other,
      *         without interleaving them
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -1120,7 +1153,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends T> so
     }
 
     /**
-     * Returns an Observable that emits the items emitted by three ObservableSources, one after the other, without
+     * Returns an {@code Observable} that emits the items emitted by three {@link ObservableSource}s, one after the other, without
      * interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -1131,13 +1164,14 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends T> so
      *
      * @param <T> the common element base type
      * @param source1
-     *            an ObservableSource to be concatenated
+     *            an {@code ObservableSource} to be concatenated
      * @param source2
-     *            an ObservableSource to be concatenated
+     *            an {@code ObservableSource} to be concatenated
      * @param source3
-     *            an ObservableSource to be concatenated
-     * @return an Observable that emits items emitted by the three source ObservableSources, one after the other,
+     *            an {@code ObservableSource} to be concatenated
+     * @return an {@code Observable} that emits items emitted by the three source {@code ObservableSource}s, one after the other,
      *         without interleaving them
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -1153,7 +1187,7 @@ public static <T> Observable<T> concat(
     }
 
     /**
-     * Returns an Observable that emits the items emitted by four ObservableSources, one after the other, without
+     * Returns an {@code Observable} that emits the items emitted by four {@link ObservableSource}s, one after the other, without
      * interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -1164,15 +1198,16 @@ public static <T> Observable<T> concat(
      *
      * @param <T> the common element base type
      * @param source1
-     *            an ObservableSource to be concatenated
+     *            an {@code ObservableSource} to be concatenated
      * @param source2
-     *            an ObservableSource to be concatenated
+     *            an {@code ObservableSource} to be concatenated
      * @param source3
-     *            an ObservableSource to be concatenated
+     *            an {@code ObservableSource} to be concatenated
      * @param source4
-     *            an ObservableSource to be concatenated
-     * @return an Observable that emits items emitted by the four source ObservableSources, one after the other,
+     *            an {@code ObservableSource} to be concatenated
+     * @return an {@code Observable} that emits items emitted by the four source {@code ObservableSource}s, one after the other,
      *         without interleaving them
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -1189,9 +1224,9 @@ public static <T> Observable<T> concat(
     }
 
     /**
-     * Concatenates a variable number of ObservableSource sources.
+     * Concatenates a variable number of {@link ObservableSource} sources.
      * <p>
-     * Note: named this way because of overload conflict with concat(ObservableSource&lt;ObservableSource&gt;)
+     * Note: named this way because of overload conflict with {@code concat(ObservableSource<ObservableSource>)}
      * <p>
      * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArray.png" alt="">
      * <dl>
@@ -1200,8 +1235,8 @@ public static <T> Observable<T> concat(
      * </dl>
      * @param sources the array of sources
      * @param <T> the common base value type
-     * @return the new Observable instance
-     * @throws NullPointerException if sources is null
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
@@ -1209,6 +1244,7 @@ public static <T> Observable<T> concat(
     @NonNull
     @SafeVarargs
     public static <T> Observable<T> concatArray(@NonNull ObservableSource<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         }
@@ -1219,7 +1255,7 @@ public static <T> Observable<T> concatArray(@NonNull ObservableSource<? extends
     }
 
     /**
-     * Concatenates a variable number of ObservableSource sources and delays errors from any of them
+     * Concatenates a variable number of {@link ObservableSource} sources and delays errors from any of them
      * till all terminate.
      * <p>
      * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArray.png" alt="">
@@ -1229,14 +1265,15 @@ public static <T> Observable<T> concatArray(@NonNull ObservableSource<? extends
      * </dl>
      * @param sources the array of sources
      * @param <T> the common base value type
-     * @return the new Observable instance
-     * @throws NullPointerException if sources is null
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
     public static <T> Observable<T> concatArrayDelayError(@NonNull ObservableSource<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         }
@@ -1249,20 +1286,20 @@ public static <T> Observable<T> concatArrayDelayError(@NonNull ObservableSource<
     }
 
     /**
-     * Concatenates an array of ObservableSources eagerly into a single stream of values.
+     * Concatenates an array of {@link ObservableSource}s eagerly into a single stream of values.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArrayEager.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source ObservableSources. The operator buffers the values emitted by these ObservableSources and then drains them
+     * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them
      * in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources an array of ObservableSources that need to be eagerly concatenated
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     * @param sources an array of {@code ObservableSource}s that need to be eagerly concatenated
+     * @return the new {@code Observable} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -1274,23 +1311,23 @@ public static <T> Observable<T> concatArrayEager(@NonNull ObservableSource<? ext
     }
 
     /**
-     * Concatenates an array of ObservableSources eagerly into a single stream of values.
+     * Concatenates an array of {@link ObservableSource}s eagerly into a single stream of values.
      * <p>
      * <img width="640" height="495" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArrayEager.nn.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source ObservableSources. The operator buffers the values emitted by these ObservableSources and then drains them
+     * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them
      * in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources an array of ObservableSources that need to be eagerly concatenated
+     * @param sources an array of {@code ObservableSource}s that need to be eagerly concatenated
      * @param maxConcurrency the maximum number of concurrent subscriptions at a time, {@link Integer#MAX_VALUE}
      *                       is interpreted as indication to subscribe to all sources at once
-     * @param prefetch the number of elements to prefetch from each ObservableSource source
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     * @param bufferSize the number of elements expected from each {@code ObservableSource} to be buffered
+     * @return the new {@code Observable} instance with the specified concatenation behavior
      * @since 2.0
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -1298,8 +1335,8 @@ public static <T> Observable<T> concatArrayEager(@NonNull ObservableSource<? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> concatArrayEager(int maxConcurrency, int prefetch, @NonNull ObservableSource<? extends T>... sources) {
-        return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, prefetch);
+    public static <T> Observable<T> concatArrayEager(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
+        return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
     /**
@@ -1309,7 +1346,7 @@ public static <T> Observable<T> concatArrayEager(int maxConcurrency, int prefetc
      * <img width="640" height="354" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArrayEagerDelayError.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s
+     * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s
      * and then drains them in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -1317,7 +1354,7 @@ public static <T> Observable<T> concatArrayEager(int maxConcurrency, int prefetc
      * </dl>
      * @param <T> the value type
      * @param sources an array of {@code ObservableSource}s that need to be eagerly concatenated
-     * @return the new Observable instance with the specified concatenation behavior
+     * @return the new {@code Observable} instance with the specified concatenation behavior
      * @since 2.2.1 - experimental
      */
     @CheckReturnValue
@@ -1335,7 +1372,7 @@ public static <T> Observable<T> concatArrayEagerDelayError(@NonNull ObservableSo
      * <img width="640" height="460" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArrayEagerDelayError.nn.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s
+     * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s
      * and then drains them in order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -1345,8 +1382,8 @@ public static <T> Observable<T> concatArrayEagerDelayError(@NonNull ObservableSo
      * @param sources an array of {@code ObservableSource}s that need to be eagerly concatenated
      * @param maxConcurrency the maximum number of concurrent subscriptions at a time, {@link Integer#MAX_VALUE}
      *                       is interpreted as indication to subscribe to all sources at once
-     * @param prefetch the number of elements to prefetch from each {@code ObservableSource} source
-     * @return the new Observable instance with the specified concatenation behavior
+     * @param bufferSize the number of elements expected from each {@code ObservableSource} to be buffered
+     * @return the new {@code Observable} instance with the specified concatenation behavior
      * @since 2.2.1 - experimental
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -1354,13 +1391,14 @@ public static <T> Observable<T> concatArrayEagerDelayError(@NonNull ObservableSo
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, int prefetch, @NonNull ObservableSource<? extends T>... sources) {
-        return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, prefetch);
+    public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
+        return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
     /**
-     * Concatenates the Iterable sequence of ObservableSources into a single sequence by subscribing to each ObservableSource,
-     * one after the other, one at a time and delays any errors till the all inner ObservableSources terminate.
+     * Concatenates the {@link Iterable} sequence of {@link ObservableSource}s into a single {@code Observable} sequence
+     *  by subscribing to each {@code ObservableSource}, one after the other, one at a time and delays any errors till
+     *  the all inner {@code ObservableSource}s terminate.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatDelayError.png" alt="">
      * <dl>
@@ -1369,8 +1407,9 @@ public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, i
      * </dl>
      *
      * @param <T> the common element base type
-     * @param sources the Iterable sequence of ObservableSources
-     * @return the new ObservableSource with the concatenating behavior
+     * @param sources the {@code Iterable} sequence of {@code ObservableSource}s
+     * @return the new {@code Observable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1381,8 +1420,9 @@ public static <T> Observable<T> concatDelayError(@NonNull Iterable<? extends Obs
     }
 
     /**
-     * Concatenates the ObservableSource sequence of ObservableSources into a single sequence by subscribing to each inner ObservableSource,
-     * one after the other, one at a time and delays any errors till the all inner and the outer ObservableSources terminate.
+     * Concatenates the {@link ObservableSource} sequence of {@code ObservableSource}s into a single {@code Observable} sequence
+     * by subscribing to each inner {@code ObservableSource}, one after the other, one at a time and delays any errors till the
+     *  all inner and the outer {@code ObservableSource}s terminate.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatDelayError.png" alt="">
      * <dl>
@@ -1391,8 +1431,8 @@ public static <T> Observable<T> concatDelayError(@NonNull Iterable<? extends Obs
      * </dl>
      *
      * @param <T> the common element base type
-     * @param sources the ObservableSource sequence of ObservableSources
-     * @return the new ObservableSource with the concatenating behavior
+     * @param sources the {@code ObservableSource} sequence of {@code ObservableSource}s
+     * @return the new {@code Observable} with the concatenating behavior
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1402,8 +1442,8 @@ public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? ext
     }
 
     /**
-     * Concatenates the ObservableSource sequence of ObservableSources into a single sequence by subscribing to each inner ObservableSource,
-     * one after the other, one at a time and delays any errors till the all inner and the outer ObservableSources terminate.
+     * Concatenates the {@link ObservableSource} sequence of {@code ObservableSource}s into a single sequence by subscribing to each inner {@code ObservableSource},
+     * one after the other, one at a time and delays any errors till the all inner and the outer {@code ObservableSource}s terminate.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatDelayError.png" alt="">
      * <dl>
@@ -1412,28 +1452,30 @@ public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? ext
      * </dl>
      *
      * @param <T> the common element base type
-     * @param sources the ObservableSource sequence of ObservableSources
-     * @param prefetch the number of elements to prefetch from the outer ObservableSource
-     * @param tillTheEnd if true exceptions from the outer and all inner ObservableSources are delayed to the end
-     *                   if false, exception from the outer ObservableSource is delayed till the current ObservableSource terminates
-     * @return the new ObservableSource with the concatenating behavior
+     * @param sources the {@code ObservableSource} sequence of {@code ObservableSource}s
+     * @param bufferSize the number of inner {@code ObservableSource}s expected to be buffered
+     * @param tillTheEnd if {@code true}, exceptions from the outer and all inner {@code ObservableSource}s are delayed to the end
+     *                   if {@code false}, exception from the outer {@code ObservableSource} is delayed till the active {@code ObservableSource} terminates
+     * @return the new {@code Observable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch, boolean tillTheEnd) {
+    public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize, boolean tillTheEnd) {
         Objects.requireNonNull(sources, "sources is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch is null");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize is null");
+        return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), bufferSize, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
     }
 
     /**
-     * Concatenates an ObservableSource sequence of ObservableSources eagerly into a single stream of values.
+     * Concatenates an {@link ObservableSource} sequence of {@code ObservableSource}s eagerly into a single stream of values.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * emitted source ObservableSources as they are observed. The operator buffers the values emitted by these
-     * ObservableSources and then drains them in order, each one after the previous one completes.
+     * emitted source {@code ObservableSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code ObservableSource}s and then drains them in order, each one after the previous one completes.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatEager.png" alt="">
      * <dl>
@@ -1441,8 +1483,9 @@ public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? ext
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of ObservableSources that need to be eagerly concatenated
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1453,11 +1496,11 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
     }
 
     /**
-     * Concatenates an ObservableSource sequence of ObservableSources eagerly into a single stream of values.
+     * Concatenates an {@link ObservableSource} sequence of {@code ObservableSource}s eagerly into a single stream of values.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * emitted source ObservableSources as they are observed. The operator buffers the values emitted by these
-     * ObservableSources and then drains them in order, each one after the previous one completes.
+     * emitted source {@code ObservableSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code ObservableSource}s and then drains them in order, each one after the previous one completes.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatEager.png" alt="">
      * <dl>
@@ -1465,26 +1508,28 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of ObservableSources that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrently running inner ObservableSources; {@link Integer#MAX_VALUE}
-     *                       is interpreted as all inner ObservableSources can be active at the same time
-     * @param prefetch the number of elements to prefetch from each inner ObservableSource source
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code ObservableSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code ObservableSource}s can be active at the same time
+     * @param bufferSize the number of inner {@code ObservableSource} expected to be buffered
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @since 2.0
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int prefetch) {
-        return wrap(sources).concatMapEager((Function)Functions.identity(), maxConcurrency, prefetch);
+    public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+        return wrap(sources).concatMapEager((Function)Functions.identity(), maxConcurrency, bufferSize);
     }
 
     /**
-     * Concatenates a sequence of ObservableSources eagerly into a single stream of values.
+     * Concatenates a sequence of {@link ObservableSource}s eagerly into a single stream of values.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source ObservableSources. The operator buffers the values emitted by these ObservableSources and then drains them
+     * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them
      * in order, each one after the previous one completes.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatEager.png" alt="">
@@ -1493,8 +1538,8 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of ObservableSources that need to be eagerly concatenated
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
+     * @return the new {@code Observable} instance with the specified concatenation behavior
      * @since 2.0
      */
     @CheckReturnValue
@@ -1505,10 +1550,10 @@ public static <T> Observable<T> concatEager(@NonNull Iterable<? extends Observab
     }
 
     /**
-     * Concatenates a sequence of ObservableSources eagerly into a single stream of values.
+     * Concatenates a sequence of {@link ObservableSource}s eagerly into a single stream of values.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source ObservableSources. The operator buffers the values emitted by these ObservableSources and then drains them
+     * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them
      * in order, each one after the previous one completes.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatEager.png" alt="">
@@ -1517,23 +1562,23 @@ public static <T> Observable<T> concatEager(@NonNull Iterable<? extends Observab
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param sources a sequence of ObservableSources that need to be eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrently running inner ObservableSources; {@link Integer#MAX_VALUE}
-     *                       is interpreted as all inner ObservableSources can be active at the same time
-     * @param prefetch the number of elements to prefetch from each inner ObservableSource source
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code ObservableSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code ObservableSource}s can be active at the same time
+     * @param bufferSize the number of elements expected from each inner {@code ObservableSource} to be buffered
+     * @return the new {@code Observable} instance with the specified concatenation behavior
      * @since 2.0
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int prefetch) {
-        return fromIterable(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, prefetch);
+    public static <T> Observable<T> concatEager(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+        return fromIterable(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
     /**
-     * Provides an API (via a cold Observable) that bridges the reactive world with the callback-style world.
+     * Provides an API (via a cold {@code Observable}) that bridges the reactive world with the callback-style world.
      * <p>
      * Example:
      * <pre><code>
@@ -1563,12 +1608,12 @@ public static <T> Observable<T> concatEager(@NonNull Iterable<? extends Observab
      * Whenever an {@link Observer} subscribes to the returned {@code Observable}, the provided
      * {@link ObservableOnSubscribe} callback is invoked with a fresh instance of an {@link ObservableEmitter}
      * that will interact only with that specific {@code Observer}. If this {@code Observer}
-     * disposes the flow (making {@link ObservableEmitter#isDisposed} return true),
+     * disposes the flow (making {@link ObservableEmitter#isDisposed} return {@code true}),
      * other observers subscribed to the same returned {@code Observable} are not affected.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/create.png" alt="">
      * <p>
-     * You should call the ObservableEmitter's onNext, onError and onComplete methods in a serialized fashion. The
+     * You should call the {@code ObservableEmitter}'s {@code onNext}, {@code onError} and {@code onComplete} methods in a serialized fashion. The
      * rest of its methods are thread-safe.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -1576,8 +1621,9 @@ public static <T> Observable<T> concatEager(@NonNull Iterable<? extends Observab
      * </dl>
      *
      * @param <T> the element type
-     * @param source the emitter that is called when an Observer subscribes to the returned {@code Observable}
-     * @return the new Observable instance
+     * @param source the emitter that is called when an {@code Observer} subscribes to the returned {@code Observable}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code source} is {@code null}
      * @see ObservableOnSubscribe
      * @see ObservableEmitter
      * @see Cancellable
@@ -1591,14 +1637,14 @@ public static <T> Observable<T> create(@NonNull ObservableOnSubscribe<T> source)
     }
 
     /**
-     * Returns an Observable that calls an ObservableSource factory to create an ObservableSource for each new Observer
-     * that subscribes. That is, for each subscriber, the actual ObservableSource that subscriber observes is
+     * Returns an {@code Observable} that calls an {@link ObservableSource} factory to create an {@code ObservableSource} for each new {@link Observer}
+     * that subscribes. That is, for each subscriber, the actual {@code ObservableSource} that subscriber observes is
      * determined by the factory function.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defer.png" alt="">
      * <p>
-     * The defer Observer allows you to defer or delay emitting items from an ObservableSource until such time as an
-     * Observer subscribes to the ObservableSource. This allows an {@link Observer} to easily obtain updates or a
+     * The {@code defer} operator allows you to defer or delay emitting items from an {@code ObservableSource} until such time as an
+     * {@code Observer} subscribes to the {@code ObservableSource}. This allows an {@code Observer} to easily obtain updates or a
      * refreshed version of the sequence.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -1606,12 +1652,13 @@ public static <T> Observable<T> create(@NonNull ObservableOnSubscribe<T> source)
      * </dl>
      *
      * @param supplier
-     *            the ObservableSource factory function to invoke for each {@link Observer} that subscribes to the
-     *            resulting ObservableSource
+     *            the {@code ObservableSource} factory function to invoke for each {@code Observer} that subscribes to the
+     *            resulting {@code Observable}
      * @param <T>
-     *            the type of the items emitted by the ObservableSource
-     * @return an Observable whose {@link Observer}s' subscriptions trigger an invocation of the given
-     *         ObservableSource factory function
+     *            the type of the items emitted by the {@code ObservableSource}
+     * @return an {@code Observable} whose {@code Observer}s' subscriptions trigger an invocation of the given
+     *         {@code ObservableSource} factory function
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defer.html">ReactiveX operators documentation: Defer</a>
      */
     @CheckReturnValue
@@ -1623,7 +1670,7 @@ public static <T> Observable<T> defer(@NonNull Supplier<? extends ObservableSour
     }
 
     /**
-     * Returns an Observable that emits no items to the {@link Observer} and immediately invokes its
+     * Returns an {@code Observable} that emits no items to the {@link Observer} and immediately invokes its
      * {@link Observer#onComplete onComplete} method.
      * <p>
      * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/empty.png" alt="">
@@ -1633,9 +1680,9 @@ public static <T> Observable<T> defer(@NonNull Supplier<? extends ObservableSour
      * </dl>
      *
      * @param <T>
-     *            the type of the items (ostensibly) emitted by the ObservableSource
-     * @return an Observable that emits no items to the {@link Observer} but immediately invokes the
-     *         {@link Observer}'s {@link Observer#onComplete() onComplete} method
+     *            the type of the items (ostensibly) emitted by the {@code Observable}
+     * @return an {@code Observable} that emits no items to the {@code Observer} but immediately invokes the
+     *         {@code Observer}'s {@link Observer#onComplete() onComplete} method
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Empty</a>
      */
     @CheckReturnValue
@@ -1647,8 +1694,8 @@ public static <T> Observable<T> empty() {
     }
 
     /**
-     * Returns an Observable that invokes an {@link Observer}'s {@link Observer#onError onError} method when the
-     * Observer subscribes to it.
+     * Returns an {@code Observable} that invokes an {@link Observer}'s {@link Observer#onError onError} method when the
+     * {@code Observer} subscribes to it.
      * <p>
      * <img width="640" height="220" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.supplier.png" alt="">
      * <dl>
@@ -1657,11 +1704,12 @@ public static <T> Observable<T> empty() {
      * </dl>
      *
      * @param errorSupplier
-     *            a Supplier factory to return a Throwable for each individual Observer
+     *            a {@link Supplier} factory to return a {@link Throwable} for each individual {@code Observer}
      * @param <T>
-     *            the type of the items (ostensibly) emitted by the ObservableSource
-     * @return an Observable that invokes the {@link Observer}'s {@link Observer#onError onError} method when
-     *         the Observer subscribes to it
+     *            the type of the items (ostensibly) emitted by the {@code Observable}
+     * @return an {@code Observable} that invokes the {@code Observer}'s {@link Observer#onError onError} method when
+     *         the {@code Observer} subscribes to it
+     * @throws NullPointerException if {@code errorSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
@@ -1673,8 +1721,8 @@ public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> err
     }
 
     /**
-     * Returns an Observable that invokes an {@link Observer}'s {@link Observer#onError onError} method when the
-     * Observer subscribes to it.
+     * Returns an {@code Observable} that invokes an {@link Observer}'s {@link Observer#onError onError} method when the
+     * {@code Observer} subscribes to it.
      * <p>
      * <img width="640" height="220" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.item.png" alt="">
      * <dl>
@@ -1683,11 +1731,12 @@ public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> err
      * </dl>
      *
      * @param exception
-     *            the particular Throwable to pass to {@link Observer#onError onError}
+     *            the particular {@link Throwable} to pass to {@link Observer#onError onError}
      * @param <T>
-     *            the type of the items (ostensibly) emitted by the ObservableSource
-     * @return an Observable that invokes the {@link Observer}'s {@link Observer#onError onError} method when
-     *         the Observer subscribes to it
+     *            the type of the items (ostensibly) emitted by the {@code Observable}
+     * @return an {@code Observable} that invokes the {@code Observer}'s {@link Observer#onError onError} method when
+     *         the {@code Observer} subscribes to it
+     * @throws NullPointerException if {@code exception} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
@@ -1699,7 +1748,7 @@ public static <T> Observable<T> error(@NonNull Throwable exception) {
     }
 
     /**
-     * Converts an Array into an ObservableSource that emits the items in the Array.
+     * Converts an array into an {@link ObservableSource} that emits the items in the array.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.png" alt="">
      * <dl>
@@ -1710,8 +1759,9 @@ public static <T> Observable<T> error(@NonNull Throwable exception) {
      * @param items
      *            the array of elements
      * @param <T>
-     *            the type of items in the Array and the type of items to be emitted by the resulting ObservableSource
-     * @return an Observable that emits each item in the source Array
+     *            the type of items in the array and the type of items to be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits each item in the source array
+     * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -1730,30 +1780,31 @@ public static <T> Observable<T> fromArray(@NonNull T... items) {
     }
 
     /**
-     * Returns an Observable that, when an observer subscribes to it, invokes a function you specify and then
+     * Returns an {@code Observable} that, when an observer subscribes to it, invokes a function you specify and then
      * emits the value returned from that function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCallable.png" alt="">
      * <p>
      * This allows you to defer the execution of the function you specify until an observer subscribes to the
-     * ObservableSource. That is to say, it makes the function "lazy."
+     * {@code Observable}. That is to say, it makes the function "lazy."
      * <dl>
      *   <dt><b>Scheduler:</b></dt>
      *   <dd>{@code fromCallable} does not operate by default on a particular {@link Scheduler}.</dd>
      *   <dt><b>Error handling:</b></dt>
      *   <dd> If the {@link Callable} throws an exception, the respective {@link Throwable} is
      *   delivered to the downstream via {@link Observer#onError(Throwable)},
-     *   except when the downstream has disposed this {@code Observable} source.
+     *   except when the downstream has disposed the current {@code Observable} source.
      *   In this latter case, the {@code Throwable} is delivered to the global error handler via
-     *   {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
+     *   {@link RxJavaPlugins#onError(Throwable)} as an {@link UndeliverableException}.
      *   </dd>
      * </dl>
-     * @param supplier
+     * @param callable
      *         a function, the execution of which should be deferred; {@code fromCallable} will invoke this
-     *         function only when an observer subscribes to the ObservableSource that {@code fromCallable} returns
+     *         function only when an observer subscribes to the {@code Observable} that {@code fromCallable} returns
      * @param <T>
-     *         the type of the item emitted by the ObservableSource
-     * @return an Observable whose {@link Observer}s' subscriptions trigger an invocation of the given function
+     *         the type of the item returned by the {@code Callable} and emitted by the {@code Observable}
+     * @return an {@code Observable} whose {@link Observer}s' subscriptions trigger an invocation of the given function
+     * @throws NullPointerException if {@code callable} is {@code null}
      * @see #defer(Supplier)
      * @see #fromSupplier(Supplier)
      * @since 2.0
@@ -1761,35 +1812,39 @@ public static <T> Observable<T> fromArray(@NonNull T... items) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromCallable(@NonNull Callable<? extends T> supplier) {
-        Objects.requireNonNull(supplier, "supplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableFromCallable<>(supplier));
+    public static <T> Observable<T> fromCallable(@NonNull Callable<? extends T> callable) {
+        Objects.requireNonNull(callable, "callable is null");
+        return RxJavaPlugins.onAssembly(new ObservableFromCallable<>(callable));
     }
 
     /**
-     * Converts a {@link Future} into an ObservableSource.
+     * Converts a {@link Future} into an {@code Observable}.
      * <p>
      * <img width="640" height="284" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromFuture.noarg.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into an ObservableSource that emits the
-     * return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
-     * method.
-     * <p>
-     * <em>Important note:</em> This ObservableSource is blocking; you cannot dispose it.
+     * The operator calls {@link Future#get()}, which is a blocking method, on the subscription thread.
+     * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
+     * background thread, and if the {@link Scheduler} supports it, interrupt the wait when the flow
+     * is disposed.
      * <p>
-     * Unlike 1.x, disposing the Observable won't cancel the future. If necessary, one can use composition to achieve the
+     * Unlike 1.x, disposing the {@code Observable} won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futureObservableSource.doOnDispose(() -> future.cancel(true));}.
+     * <p>
+     * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
+     * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
+     * operator to convert and consume such sources in a non-blocking fashion instead.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code fromFuture} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting ObservableSource
-     * @return an Observable that emits the item from the source {@link Future}
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
+     *            the resulting {@code Observable}
+     * @return an {@code Observable} that emits the item from the source {@code Future}
+     * @throws NullPointerException if {@code future} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -1801,33 +1856,37 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future)
     }
 
     /**
-     * Converts a {@link Future} into an ObservableSource, with a timeout on the Future.
+     * Converts a {@link Future} into an {@code Observable}, with a timeout on the {@code Future}.
      * <p>
      * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromFuture.timeout.png" alt="">
      * <p>
-     * You can convert any object that supports the {@link Future} interface into an ObservableSource that emits the
-     * return value of the {@link Future#get} method of that object, by passing the object into the {@code from}
-     * method.
+     * The operator calls {@link Future#get(long, TimeUnit)}, which is a blocking method, on the subscription thread.
+     * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
+     * background thread, and if the {@link Scheduler} supports it, interrupt the wait when the flow
+     * is disposed.
      * <p>
-     * Unlike 1.x, disposing the Observable won't cancel the future. If necessary, one can use composition to achieve the
+     * Unlike 1.x, disposing the {@code Observable} won't cancel the future. If necessary, one can use composition to achieve the
      * cancellation effect: {@code futureObservableSource.doOnDispose(() -> future.cancel(true));}.
      * <p>
-     * <em>Important note:</em> This ObservableSource is blocking; you cannot dispose it.
+     * Also note that this operator will consume a {@link CompletionStage}-based {@code Future} subclass (such as
+     * {@link CompletableFuture}) in a blocking manner as well. Use the {@link #fromCompletionStage(CompletionStage)}
+     * operator to convert and consume such sources in a non-blocking fashion instead.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code fromFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code fromFuture} does not operate by default on a particular {@code Scheduler}.</dd>
      * </dl>
      *
      * @param future
-     *            the source {@link Future}
+     *            the source {@code Future}
      * @param timeout
      *            the maximum time to wait before calling {@code get}
      * @param unit
      *            the {@link TimeUnit} of the {@code timeout} argument
      * @param <T>
-     *            the type of object that the {@link Future} returns, and also the type of item to be emitted by
-     *            the resulting ObservableSource
-     * @return an Observable that emits the item from the source {@link Future}
+     *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
+     *            the resulting {@code Observable}
+     * @return an {@code Observable} that emits the item from the source {@code Future}
+     * @throws NullPointerException if {@code future} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -1840,7 +1899,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
     }
 
     /**
-     * Converts an {@link Iterable} sequence into an ObservableSource that emits the items in the sequence.
+     * Converts an {@link Iterable} sequence into an {@code Observable} that emits the items in the sequence.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromIterable.png" alt="">
      * <dl>
@@ -1849,11 +1908,12 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
      * </dl>
      *
      * @param source
-     *            the source {@link Iterable} sequence
+     *            the source {@code Iterable} sequence
      * @param <T>
-     *            the type of items in the {@link Iterable} sequence and the type of items to be emitted by the
-     *            resulting ObservableSource
-     * @return an Observable that emits each item in the source {@link Iterable} sequence
+     *            the type of items in the {@code Iterable} sequence and the type of items to be emitted by the
+     *            resulting {@code Observable}
+     * @return an {@code Observable} that emits each item in the source {@code Iterable} sequence
+     * @throws NullPointerException if {@code source} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromStream(Stream)
      */
@@ -1866,18 +1926,18 @@ public static <T> Observable<T> fromIterable(@NonNull Iterable<? extends T> sour
     }
 
     /**
-     * Converts an arbitrary Reactive-Streams Publisher into an Observable.
+     * Converts an arbitrary <em>Reactive Streams</em> {@link Publisher} into an {@code Observable}.
      * <p>
      * <img width="640" height="344" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromPublisher.o.png" alt="">
      * <p>
-     * The {@link Publisher} must follow the
+     * The {@code Publisher} must follow the
      * <a href="https://github.com/reactive-streams/reactive-streams-jvm#reactive-streams">Reactive-Streams specification</a>.
      * Violating the specification may result in undefined behavior.
      * <p>
      * If possible, use {@link #create(ObservableOnSubscribe)} to create a
      * source-like {@code Observable} instead.
      * <p>
-     * Note that even though {@link Publisher} appears to be a functional interface, it
+     * Note that even though {@code Publisher} appears to be a functional interface, it
      * is not recommended to implement it through a lambda as the specification requires
      * state management that is not achievable with a stateless lambda.
      * <dl>
@@ -1888,9 +1948,9 @@ public static <T> Observable<T> fromIterable(@NonNull Iterable<? extends T> sour
      *  <dd>{@code fromPublisher} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type of the flow
-     * @param publisher the Publisher to convert
-     * @return the new Observable instance
-     * @throws NullPointerException if publisher is null
+     * @param publisher the {@code Publisher} to convert
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code publisher} is {@code null}
      * @see #create(ObservableOnSubscribe)
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -1903,30 +1963,31 @@ public static <T> Observable<T> fromPublisher(@NonNull Publisher<? extends T> pu
     }
 
     /**
-     * Returns an Observable that, when an observer subscribes to it, invokes a supplier function you specify and then
+     * Returns an {@code Observable} that, when an observer subscribes to it, invokes a supplier function you specify and then
      * emits the value returned from that function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.fromSupplier.png" alt="">
      * <p>
      * This allows you to defer the execution of the function you specify until an observer subscribes to the
-     * ObservableSource. That is to say, it makes the function "lazy."
+     * {@code Observable}. That is to say, it makes the function "lazy."
      * <dl>
      *   <dt><b>Scheduler:</b></dt>
      *   <dd>{@code fromSupplier} does not operate by default on a particular {@link Scheduler}.</dd>
      *   <dt><b>Error handling:</b></dt>
      *   <dd> If the {@link Supplier} throws an exception, the respective {@link Throwable} is
      *   delivered to the downstream via {@link Observer#onError(Throwable)},
-     *   except when the downstream has disposed this {@code Observable} source.
+     *   except when the downstream has disposed the current {@code Observable} source.
      *   In this latter case, the {@code Throwable} is delivered to the global error handler via
-     *   {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
+     *   {@link RxJavaPlugins#onError(Throwable)} as an {@link UndeliverableException}.
      *   </dd>
      * </dl>
      * @param supplier
      *         a function, the execution of which should be deferred; {@code fromSupplier} will invoke this
-     *         function only when an observer subscribes to the ObservableSource that {@code fromSupplier} returns
+     *         function only when an observer subscribes to the {@code Observable} that {@code fromSupplier} returns
      * @param <T>
-     *         the type of the item emitted by the ObservableSource
-     * @return an Observable whose {@link Observer}s' subscriptions trigger an invocation of the given function
+     *         the type of the item emitted by the {@code Observable}
+     * @return an {@code Observable} whose {@link Observer}s' subscriptions trigger an invocation of the given function
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see #defer(Supplier)
      * @see #fromCallable(Callable)
      * @since 3.0.0
@@ -1954,11 +2015,12 @@ public static <T> Observable<T> fromSupplier(@NonNull Supplier<? extends T> supp
      * </dl>
      *
      * @param <T> the generated value type
-     * @param generator the Consumer called whenever a particular downstream Observer has
-     * requested a value. The callback then should call {@code onNext}, {@code onError} or
-     * {@code onComplete} to signal a value or a terminal event. Signalling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @return the new Observable instance
+     * @param generator the {@link Consumer} called in a loop after a downstream {@link Observer} has
+     * subscribed. The callback then should call {@code onNext}, {@code onError} or
+     * {@code onComplete} to signal a value or a terminal event. Signaling multiple {@code onNext}
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code generator} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1983,14 +2045,15 @@ public static <T> Observable<T> generate(@NonNull Consumer<Emitter<T>> generator
      *  <dd>{@code generate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <S> the type of the per-Observer state
+     * @param <S> the type of the per-{@link Observer} state
      * @param <T> the generated value type
-     * @param initialState the Supplier to generate the initial state for each Observer
-     * @param generator the Consumer called with the current state whenever a particular downstream Observer has
-     * requested a value. The callback then should call {@code onNext}, {@code onError} or
-     * {@code onComplete} to signal a value or a terminal event. Signalling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @return the new Observable instance
+     * @param initialState the {@link Supplier} to generate the initial state for each {@code Observer}
+     * @param generator the {@link BiConsumer} called in a loop after a downstream {@code Observer} has
+     * subscribed. The callback then should call {@code onNext}, {@code onError} or
+     * {@code onComplete} to signal a value or a terminal event. Signaling multiple {@code onNext}
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code initialState} or {@code generator} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2014,16 +2077,17 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
      *  <dd>{@code generate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <S> the type of the per-Observer state
+     * @param <S> the type of the per-{@link Observer} state
      * @param <T> the generated value type
-     * @param initialState the Supplier to generate the initial state for each Observer
-     * @param generator the Consumer called with the current state whenever a particular downstream Observer has
-     * requested a value. The callback then should call {@code onNext}, {@code onError} or
-     * {@code onComplete} to signal a value or a terminal event. Signalling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @param disposeState the Consumer that is called with the current state when the generator
+     * @param initialState the {@link Supplier} to generate the initial state for each {@code Observer}
+     * @param generator the {@link BiConsumer} called in a loop after a downstream {@code Observer} has
+     * subscribed. The callback then should call {@code onNext}, {@code onError} or
+     * {@code onComplete} to signal a value or a terminal event. Signaling multiple {@code onNext}
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @param disposeState the {@link Consumer} that is called with the current state when the generator
      * terminates the sequence or it gets disposed
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code initialState}, {@code generator} or {@code disposeState} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2050,15 +2114,16 @@ public static <T, S> Observable<T> generate(
      *  <dd>{@code generate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <S> the type of the per-Observer state
+     * @param <S> the type of the per-{@link Observer} state
      * @param <T> the generated value type
-     * @param initialState the Supplier to generate the initial state for each Observer
-     * @param generator the Function called with the current state whenever a particular downstream Observer has
-     * requested a value. The callback then should call {@code onNext}, {@code onError} or
+     * @param initialState the {@link Supplier} to generate the initial state for each {@code Observer}
+     * @param generator the {@link BiConsumer} called in a loop after a downstream {@code Observer} has
+     * subscribed. The callback then should call {@code onNext}, {@code onError} or
      * {@code onComplete} to signal a value or a terminal event and should return a (new) state for
-     * the next invocation. Signalling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @return the new Observable instance
+     * the next invocation. Signaling multiple {@code onNext}
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code initialState} or {@code generator} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2081,17 +2146,18 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
      *  <dd>{@code generate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <S> the type of the per-Observer state
+     * @param <S> the type of the per-{@link Observer} state
      * @param <T> the generated value type
-     * @param initialState the Supplier to generate the initial state for each Observer
-     * @param generator the Function called with the current state whenever a particular downstream Observer has
-     * requested a value. The callback then should call {@code onNext}, {@code onError} or
+     * @param initialState the {@link Supplier} to generate the initial state for each {@code Observer}
+     * @param generator the {@link BiConsumer} called in a loop after a downstream {@code Observer} has
+     * subscribed. The callback then should call {@code onNext}, {@code onError} or
      * {@code onComplete} to signal a value or a terminal event and should return a (new) state for
-     * the next invocation. Signalling multiple {@code onNext}
-     * in a call will make the operator signal {@code IllegalStateException}.
-     * @param disposeState the Consumer that is called with the current state when the generator
+     * the next invocation. Signaling multiple {@code onNext}
+     * in a call will make the operator signal {@link IllegalStateException}.
+     * @param disposeState the {@link Consumer} that is called with the current state when the generator
      * terminates the sequence or it gets disposed
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code initialState}, {@code generator} or {@code disposeState} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2105,7 +2171,7 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
     }
 
     /**
-     * Returns an Observable that emits a {@code 0L} after the {@code initialDelay} and ever increasing numbers
+     * Returns an {@code Observable} that emits a {@code 0L} after the {@code initialDelay} and ever increasing numbers
      * after each {@code period} of time thereafter.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.p.png" alt="">
@@ -2120,9 +2186,10 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
      *            the period of time between emissions of the subsequent numbers
      * @param unit
      *            the time unit for both {@code initialDelay} and {@code period}
-     * @return an Observable that emits a 0L after the {@code initialDelay} and ever increasing numbers after
+     * @return an {@code Observable} that emits a 0L after the {@code initialDelay} and ever increasing numbers after
      *         each {@code period} of time thereafter
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @since 1.0.12
      */
     @CheckReturnValue
@@ -2133,13 +2200,13 @@ public static Observable<Long> interval(long initialDelay, long period, @NonNull
     }
 
     /**
-     * Returns an Observable that emits a {@code 0L} after the {@code initialDelay} and ever increasing numbers
+     * Returns an {@code Observable} that emits a {@code 0L} after the {@code initialDelay} and ever increasing numbers
      * after each {@code period} of time thereafter, on a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.ps.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param initialDelay
@@ -2149,11 +2216,12 @@ public static Observable<Long> interval(long initialDelay, long period, @NonNull
      * @param unit
      *            the time unit for both {@code initialDelay} and {@code period}
      * @param scheduler
-     *            the Scheduler on which the waiting happens and items are emitted
-     * @return an Observable that emits a 0L after the {@code initialDelay} and ever increasing numbers after
-     *         each {@code period} of time thereafter, while running on the given Scheduler
+     *            the {@code Scheduler} on which the waiting happens and items are emitted
+     * @return an {@code Observable} that emits a 0L after the {@code initialDelay} and ever increasing numbers after
+     *         each {@code period} of time thereafter, while running on the given {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      * @since 1.0.12
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2166,7 +2234,7 @@ public static Observable<Long> interval(long initialDelay, long period, @NonNull
     }
 
     /**
-     * Returns an Observable that emits a sequential number every specified interval of time.
+     * Returns an {@code Observable} that emits a sequential number every specified interval of time.
      * <p>
      * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.png" alt="">
      * <dl>
@@ -2178,7 +2246,7 @@ public static Observable<Long> interval(long initialDelay, long period, @NonNull
      *            the period size in time units (see below)
      * @param unit
      *            time units to use for the interval size
-     * @return an Observable that emits a sequential number each time interval
+     * @return an {@code Observable} that emits a sequential number each time interval
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
     @CheckReturnValue
@@ -2189,13 +2257,13 @@ public static Observable<Long> interval(long period, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that emits a sequential number every specified interval of time, on a
-     * specified Scheduler.
+     * Returns an {@code Observable} that emits a sequential number every specified interval of time, on a
+     * specified {@link Scheduler}.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param period
@@ -2203,8 +2271,8 @@ public static Observable<Long> interval(long period, @NonNull TimeUnit unit) {
      * @param unit
      *            time units to use for the interval size
      * @param scheduler
-     *            the Scheduler to use for scheduling the items
-     * @return an Observable that emits a sequential number each time interval
+     *            the {@code Scheduler} to use for scheduling the items
+     * @return an {@code Observable} that emits a sequential number each time interval
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
     @CheckReturnValue
@@ -2225,11 +2293,11 @@ public static Observable<Long> interval(long period, @NonNull TimeUnit unit, @No
      *  <dd>{@code intervalRange} by default operates on the {@link Schedulers#computation() computation} {@link Scheduler}.</dd>
      * </dl>
      * @param start that start value of the range
-     * @param count the number of values to emit in total, if zero, the operator emits an onComplete after the initial delay.
-     * @param initialDelay the initial delay before signalling the first value (the start)
+     * @param count the number of values to emit in total, if zero, the operator emits an {@code onComplete} after the initial delay.
+     * @param initialDelay the initial delay before signaling the first value (the start)
      * @param period the period between subsequent values
-     * @param unit the unit of measure of the initialDelay and period amounts
-     * @return the new Observable instance
+     * @param unit the unit of measure of the {@code initialDelay} and {@code period} amounts
+     * @return the new {@code Observable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
@@ -2248,12 +2316,16 @@ public static Observable<Long> intervalRange(long start, long count, long initia
      *  <dd>you provide the {@link Scheduler}.</dd>
      * </dl>
      * @param start that start value of the range
-     * @param count the number of values to emit in total, if zero, the operator emits an onComplete after the initial delay.
-     * @param initialDelay the initial delay before signalling the first value (the start)
+     * @param count the number of values to emit in total, if zero, the operator emits an {@code onComplete} after the initial delay.
+     * @param initialDelay the initial delay before signaling the first value (the start)
      * @param period the period between subsequent values
-     * @param unit the unit of measure of the initialDelay and period amounts
+     * @param unit the unit of measure of the {@code initialDelay} and {@code period} amounts
      * @param scheduler the target scheduler where the values and terminal signals will be emitted
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException
+     *             if {@code count} is negative, or if {@code start} + {@code count} &minus; 1 exceeds
+     *             {@link Long#MAX_VALUE}
      */
     @CheckReturnValue
     @NonNull
@@ -2278,12 +2350,12 @@ public static Observable<Long> intervalRange(long start, long count, long initia
     }
 
     /**
-     * Returns an Observable that signals the given (constant reference) item and then completes.
+     * Returns an {@code Observable} that signals the given (constant reference) item and then completes.
      * <p>
      * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.item.png" alt="">
      * <p>
      * Note that the item is taken and re-emitted as is and not computed by any means by {@code just}. Use {@link #fromCallable(Callable)}
-     * to generate a single item on demand (when {@code Observer}s subscribe to it).
+     * to generate a single item on demand (when {@link Observer}s subscribe to it).
      * <p>
      * See the multi-parameter overloads of {@code just} to emit more than one (constant reference) items one after the other.
      * Use {@link #fromArray(Object...)} to emit an arbitrary number of items that are known upfront.
@@ -2298,7 +2370,8 @@ public static Observable<Long> intervalRange(long start, long count, long initia
      *            the item to emit
      * @param <T>
      *            the type of that item
-     * @return an Observable that emits {@code value} as a single item and then completes
+     * @return an {@code Observable} that emits {@code value} as a single item and then completes
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      * @see #just(Object, Object)
      * @see #fromCallable(Callable)
@@ -2314,7 +2387,7 @@ public static <T> Observable<T> just(@NonNull T item) {
     }
 
     /**
-     * Converts two items into an ObservableSource that emits those items.
+     * Converts two items into an {@code Observable} that emits those items.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.2.png" alt="">
      * <dl>
@@ -2328,7 +2401,8 @@ public static <T> Observable<T> just(@NonNull T item) {
      *            second item
      * @param <T>
      *            the type of these items
-     * @return an Observable that emits each item
+     * @return an {@code Observable} that emits each item
+     * @throws NullPointerException if {@code item1} or {@code item2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2342,7 +2416,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2) {
     }
 
     /**
-     * Converts three items into an ObservableSource that emits those items.
+     * Converts three items into an {@code Observable} that emits those items.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.3.png" alt="">
      * <dl>
@@ -2358,7 +2432,8 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2) {
      *            third item
      * @param <T>
      *            the type of these items
-     * @return an Observable that emits each item
+     * @return an {@code Observable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2} or {@code item3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2373,7 +2448,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     }
 
     /**
-     * Converts four items into an ObservableSource that emits those items.
+     * Converts four items into an {@code Observable} that emits those items.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.4.png" alt="">
      * <dl>
@@ -2391,7 +2466,8 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            fourth item
      * @param <T>
      *            the type of these items
-     * @return an Observable that emits each item
+     * @return an {@code Observable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3} or {@code item4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2407,7 +2483,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     }
 
     /**
-     * Converts five items into an ObservableSource that emits those items.
+     * Converts five items into an {@code Observable} that emits those items.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.5.png" alt="">
      * <dl>
@@ -2427,7 +2503,9 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            fifth item
      * @param <T>
      *            the type of these items
-     * @return an Observable that emits each item
+     * @return an {@code Observable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4} or {@code item5} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2444,7 +2522,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     }
 
     /**
-     * Converts six items into an ObservableSource that emits those items.
+     * Converts six items into an {@code Observable} that emits those items.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.6.png" alt="">
      * <dl>
@@ -2466,7 +2544,9 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            sixth item
      * @param <T>
      *            the type of these items
-     * @return an Observable that emits each item
+     * @return an {@code Observable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5} or {@code item6} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2484,7 +2564,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     }
 
     /**
-     * Converts seven items into an ObservableSource that emits those items.
+     * Converts seven items into an {@code Observable} that emits those items.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.7.png" alt="">
      * <dl>
@@ -2508,7 +2588,10 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            seventh item
      * @param <T>
      *            the type of these items
-     * @return an Observable that emits each item
+     * @return an {@code Observable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5}, {@code item6}
+     *                              or {@code item7} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2527,7 +2610,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     }
 
     /**
-     * Converts eight items into an ObservableSource that emits those items.
+     * Converts eight items into an {@code Observable} that emits those items.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.8.png" alt="">
      * <dl>
@@ -2553,7 +2636,10 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            eighth item
      * @param <T>
      *            the type of these items
-     * @return an Observable that emits each item
+     * @return an {@code Observable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5}, {@code item6}
+     *                              {@code item7} or {@code item8} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2573,7 +2659,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     }
 
     /**
-     * Converts nine items into an ObservableSource that emits those items.
+     * Converts nine items into an {@code Observable} that emits those items.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.9.png" alt="">
      * <dl>
@@ -2601,7 +2687,10 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            ninth item
      * @param <T>
      *            the type of these items
-     * @return an Observable that emits each item
+     * @return an {@code Observable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5}, {@code item6}
+     *                              {@code item7}, {@code item8} or {@code item9} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2622,7 +2711,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     }
 
     /**
-     * Converts ten items into an ObservableSource that emits those items.
+     * Converts ten items into an {@code Observable} that emits those items.
      * <p>
      * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.10.png" alt="">
      * <dl>
@@ -2652,7 +2741,11 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            tenth item
      * @param <T>
      *            the type of these items
-     * @return an Observable that emits each item
+     * @return an {@code Observable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5}, {@code item6}
+     *                              {@code item7}, {@code item8}, {@code item9}
+     *                              or {@code item10} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2674,24 +2767,24 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     }
 
     /**
-     * Flattens an Iterable of ObservableSources into one ObservableSource, without any transformation, while limiting the
-     * number of concurrent subscriptions to these ObservableSources.
+     * Flattens an {@link Iterable} of {@link ObservableSource}s into one {@code Observable}, without any transformation, while limiting the
+     * number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the returned {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Iterable, int, int)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -2701,13 +2794,13 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of ObservableSources
+     *            the {@code Iterable} of {@code ObservableSource}s
      * @param maxConcurrency
-     *            the maximum number of ObservableSources that may be subscribed to concurrently
+     *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param bufferSize
-     *            the number of items to prefetch from each inner ObservableSource
-     * @return an Observable that emits items that are the result of flattening the items emitted by the
-     *         ObservableSources in the Iterable
+     *            the number of items expected from each inner {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
+     *         {@code ObservableSource}s in the {@code Iterable}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrent} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -2722,24 +2815,24 @@ public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSour
     }
 
     /**
-     * Flattens an Iterable of ObservableSources into one ObservableSource, without any transformation, while limiting the
-     * number of concurrent subscriptions to these ObservableSources.
+     * Flattens an array of {@link ObservableSource}s into one {@code Observable}, without any transformation, while limiting the
+     * number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArray} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeArrayDelayError(int, int, ObservableSource...)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -2749,13 +2842,13 @@ public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSour
      *
      * @param <T> the common element base type
      * @param sources
-     *            the array of ObservableSources
+     *            the array of {@code ObservableSource}s
      * @param maxConcurrency
-     *            the maximum number of ObservableSources that may be subscribed to concurrently
+     *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param bufferSize
-     *            the number of items to prefetch from each inner ObservableSource
-     * @return an Observable that emits items that are the result of flattening the items emitted by the
-     *         ObservableSources in the Iterable
+     *            the number of items expected from each inner {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
+     *         {@code ObservableSource}s in the array
      * @throws IllegalArgumentException
      *             if {@code maxConcurrent} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -2771,23 +2864,23 @@ public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @
     }
 
     /**
-     * Flattens an Iterable of ObservableSources into one ObservableSource, without any transformation.
+     * Flattens an {@link Iterable} of {@link ObservableSource}s into one {@code Observable}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the returned {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Iterable)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -2797,9 +2890,9 @@ public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of ObservableSources
-     * @return an Observable that emits items that are the result of flattening the items emitted by the
-     *         ObservableSources in the Iterable
+     *            the {@code Iterable} of {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
+     *         {@code ObservableSource}s in the {@code Iterable}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable)
      */
@@ -2812,24 +2905,24 @@ public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSour
     }
 
     /**
-     * Flattens an Iterable of ObservableSources into one ObservableSource, without any transformation, while limiting the
-     * number of concurrent subscriptions to these ObservableSources.
+     * Flattens an {@link Iterable} of {@link ObservableSource}s into one {@code Observable}, without any transformation, while limiting the
+     * number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the returned {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(Iterable, int)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -2839,11 +2932,11 @@ public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSour
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of ObservableSources
+     *            the {@code Iterable} of {@code ObservableSource}s
      * @param maxConcurrency
-     *            the maximum number of ObservableSources that may be subscribed to concurrently
-     * @return an Observable that emits items that are the result of flattening the items emitted by the
-     *         ObservableSources in the Iterable
+     *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
+     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
+     *         {@code ObservableSource}s in the {@code Iterable}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrent} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -2858,24 +2951,24 @@ public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSour
     }
 
     /**
-     * Flattens an ObservableSource that emits ObservableSources into a single ObservableSource that emits the items emitted by
-     * those ObservableSources, without any transformation.
+     * Flattens an {@link ObservableSource} that emits {@code ObservableSource}s into a single {@code Observable} that emits the items emitted by
+     * those {@code ObservableSource}s, without any transformation.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the returned {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(ObservableSource)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -2885,10 +2978,11 @@ public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSour
      *
      * @param <T> the common element base type
      * @param sources
-     *            an ObservableSource that emits ObservableSources
-     * @return an Observable that emits items that are the result of flattening the ObservableSources emitted by the
-     *         {@code source} ObservableSource
+     *            an {@code ObservableSource} that emits {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of flattening the {@code ObservableSource}s emitted by the
+     *         {@code source} {@code ObservableSource}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see #mergeDelayError(ObservableSource)
      */
     @CheckReturnValue
@@ -2901,25 +2995,25 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
     }
 
     /**
-     * Flattens an ObservableSource that emits ObservableSources into a single ObservableSource that emits the items emitted by
-     * those ObservableSources, without any transformation, while limiting the maximum number of concurrent
-     * subscriptions to these ObservableSources.
+     * Flattens an {@link ObservableSource} that emits {@code ObservableSource}s into a single {@code Observable} that emits the items emitted by
+     * those {@code ObservableSource}s, without any transformation, while limiting the maximum number of concurrent
+     * subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.png" alt="">
      * <p>
-     * You can combine the items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the returned {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(ObservableSource, int)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -2929,13 +3023,14 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
      *
      * @param <T> the common element base type
      * @param sources
-     *            an ObservableSource that emits ObservableSources
+     *            an {@code ObservableSource} that emits {@code ObservableSource}s
      * @param maxConcurrency
-     *            the maximum number of ObservableSources that may be subscribed to concurrently
-     * @return an Observable that emits items that are the result of flattening the ObservableSources emitted by the
-     *         {@code source} ObservableSource
+     *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
+     * @return an {@code Observable} that emits items that are the result of flattening the {@code ObservableSource}s emitted by the
+     *         {@code source} {@code ObservableSource}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code maxConcurrent} is less than or equal to 0
+     *             if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @since 1.1.0
      * @see #mergeDelayError(ObservableSource, int)
@@ -2951,23 +3046,23 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
     }
 
     /**
-     * Flattens two ObservableSources into a single ObservableSource, without any transformation.
+     * Flattens two {@link ObservableSource}s into a single {@code Observable}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(ObservableSource, ObservableSource)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -2977,10 +3072,11 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
      *
      * @param <T> the common element base type
      * @param source1
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source2
-     *            an ObservableSource to be merged
-     * @return an Observable that emits all of the items emitted by the source ObservableSources
+     *            an {@code ObservableSource} to be merged
+     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(ObservableSource, ObservableSource)
      */
@@ -2995,23 +3091,23 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends T> sou
     }
 
     /**
-     * Flattens three ObservableSources into a single ObservableSource, without any transformation.
+     * Flattens three {@link ObservableSource}s into a single {@code Observable}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(ObservableSource, ObservableSource, ObservableSource)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -3021,12 +3117,13 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends T> sou
      *
      * @param <T> the common element base type
      * @param source1
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source2
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source3
-     *            an ObservableSource to be merged
-     * @return an Observable that emits all of the items emitted by the source ObservableSources
+     *            an {@code ObservableSource} to be merged
+     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(ObservableSource, ObservableSource, ObservableSource)
      */
@@ -3044,23 +3141,23 @@ public static <T> Observable<T> merge(
     }
 
     /**
-     * Flattens four ObservableSources into a single ObservableSource, without any transformation.
+     * Flattens four {@link ObservableSource}s into a single {@code Observable}, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeDelayError(ObservableSource, ObservableSource, ObservableSource, ObservableSource)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -3070,14 +3167,15 @@ public static <T> Observable<T> merge(
      *
      * @param <T> the common element base type
      * @param source1
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source2
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source3
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source4
-     *            an ObservableSource to be merged
-     * @return an Observable that emits all of the items emitted by the source ObservableSources
+     *            an {@code ObservableSource} to be merged
+     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(ObservableSource, ObservableSource, ObservableSource, ObservableSource)
      */
@@ -3096,23 +3194,23 @@ public static <T> Observable<T> merge(
     }
 
     /**
-     * Flattens an Array of ObservableSources into one ObservableSource, without any transformation.
+     * Flattens an array of {@link ObservableSource}s into one {@code Observable}, without any transformation.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.io.png" alt="">
      * <p>
-     * You can combine items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArray} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If any of the source {@code ObservableSource}s signal a {@code Throwable} via {@code onError}, the resulting
+     *  <dd>If any of the {@code ObservableSource}s signal a {@link Throwable} via {@code onError}, the resulting
      *  {@code Observable} terminates with that {@code Throwable} and all other source {@code ObservableSource}s are disposed.
      *  If more than one {@code ObservableSource} signals an error, the resulting {@code Observable} may terminate with the
      *  first one's error or, depending on the concurrency of the sources, may terminate with a
-     *  {@code CompositeException} containing two or more of the various error signals.
+     *  {@link CompositeException} containing two or more of the various error signals.
      *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
      *  signaled by source(s) after the returned {@code Observable} has been disposed or terminated with a
      *  (composite) error will be sent to the same global error handler.
      *  Use {@link #mergeArrayDelayError(ObservableSource...)} to merge sources and terminate only when all source {@code ObservableSource}s
@@ -3122,8 +3220,9 @@ public static <T> Observable<T> merge(
      *
      * @param <T> the common element base type
      * @param sources
-     *            the array of ObservableSources
-     * @return an Observable that emits all of the items emitted by the ObservableSources in the Array
+     *            the array of {@code ObservableSource}s
+     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s in the array
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeArrayDelayError(ObservableSource...)
      */
@@ -3137,18 +3236,18 @@ public static <T> Observable<T> mergeArray(@NonNull ObservableSource<? extends T
     }
 
     /**
-     * Flattens an Iterable of ObservableSources into one ObservableSource, in a way that allows an Observer to receive all
-     * successfully emitted items from each of the source ObservableSources without being interrupted by an error
+     * Flattens an {@link Iterable} of {@link ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to receive all
+     * successfully emitted items from each of the returned {@code ObservableSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
-     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged ObservableSources notify of an
+     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged {@code ObservableSource}s notify of an
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged ObservableSources have finished emitting items.
+     * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3156,9 +3255,10 @@ public static <T> Observable<T> mergeArray(@NonNull ObservableSource<? extends T
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of ObservableSources
-     * @return an Observable that emits items that are the result of flattening the items emitted by the
-     *         ObservableSources in the Iterable
+     *            the {@code Iterable} of {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
+     *         {@code ObservableSource}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3170,18 +3270,18 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends Obse
     }
 
     /**
-     * Flattens an Iterable of ObservableSources into one ObservableSource, in a way that allows an Observer to receive all
-     * successfully emitted items from each of the source ObservableSources without being interrupted by an error
-     * notification from one of them, while limiting the number of concurrent subscriptions to these ObservableSources.
+     * Flattens an {@link Iterable} of {@link ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to receive all
+     * successfully emitted items from each of the returned {@code ObservableSource}s without being interrupted by an error
+     * notification from one of them, while limiting the number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
-     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged ObservableSources notify of an
+     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged {@code ObservableSource}s notify of an
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged ObservableSources have finished emitting items.
+     * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3189,13 +3289,15 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends Obse
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of ObservableSources
+     *            the {@code Iterable} of {@code ObservableSource}s
      * @param maxConcurrency
-     *            the maximum number of ObservableSources that may be subscribed to concurrently
+     *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param bufferSize
-     *            the number of items to prefetch from each inner ObservableSource
-     * @return an Observable that emits items that are the result of flattening the items emitted by the
-     *         ObservableSources in the Iterable
+     *            the number of items expected from each inner {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
+     *         {@code ObservableSource}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3207,18 +3309,18 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends Obse
     }
 
     /**
-     * Flattens an array of ObservableSources into one ObservableSource, in a way that allows an Observer to receive all
-     * successfully emitted items from each of the source ObservableSources without being interrupted by an error
-     * notification from one of them, while limiting the number of concurrent subscriptions to these ObservableSources.
+     * Flattens an array of {@link ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to receive all
+     * successfully emitted items from each of the {@code ObservableSource}s without being interrupted by an error
+     * notification from one of them, while limiting the number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
-     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged ObservableSources notify of an
+     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged {@code ObservableSource}s notify of an
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged ObservableSources have finished emitting items.
+     * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3226,13 +3328,15 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends Obse
      *
      * @param <T> the common element base type
      * @param sources
-     *            the array of ObservableSources
+     *            the array of {@code ObservableSource}s
      * @param maxConcurrency
-     *            the maximum number of ObservableSources that may be subscribed to concurrently
+     *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param bufferSize
-     *            the number of items to prefetch from each inner ObservableSource
-     * @return an Observable that emits items that are the result of flattening the items emitted by the
-     *         ObservableSources in the Iterable
+     *            the number of items expected from each inner {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
+     *         {@code ObservableSource}s in the array
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3245,18 +3349,18 @@ public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int buf
     }
 
     /**
-     * Flattens an Iterable of ObservableSources into one ObservableSource, in a way that allows an Observer to receive all
-     * successfully emitted items from each of the source ObservableSources without being interrupted by an error
-     * notification from one of them, while limiting the number of concurrent subscriptions to these ObservableSources.
+     * Flattens an {@link Iterable} of {@link ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to receive all
+     * successfully emitted items from each of the returned {@code ObservableSource}s without being interrupted by an error
+     * notification from one of them, while limiting the number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
-     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged ObservableSources notify of an
+     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged {@code ObservableSource}s notify of an
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged ObservableSources have finished emitting items.
+     * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3264,11 +3368,11 @@ public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int buf
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of ObservableSources
+     *            the {@code Iterable} of {@code ObservableSource}s
      * @param maxConcurrency
-     *            the maximum number of ObservableSources that may be subscribed to concurrently
-     * @return an Observable that emits items that are the result of flattening the items emitted by the
-     *         ObservableSources in the Iterable
+     *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
+     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
+     *         {@code ObservableSource}s in the {@code Iterable}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3280,18 +3384,18 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends Obse
     }
 
     /**
-     * Flattens an ObservableSource that emits ObservableSources into one ObservableSource, in a way that allows an Observer to
-     * receive all successfully emitted items from all of the source ObservableSources without being interrupted by
+     * Flattens an {@link ObservableSource} that emits {@code ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to
+     * receive all successfully emitted items from all of the emitted {@code ObservableSource}s without being interrupted by
      * an error notification from one of them.
      * <p>
-     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged ObservableSources notify of an
+     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged {@code ObservableSource}s notify of an
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged ObservableSources have finished emitting items.
+     * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3299,9 +3403,10 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends Obse
      *
      * @param <T> the common element base type
      * @param sources
-     *            an ObservableSource that emits ObservableSources
-     * @return an Observable that emits all of the items emitted by the ObservableSources emitted by the
-     *         {@code source} ObservableSource
+     *            an {@code ObservableSource} that emits {@code ObservableSource}s
+     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s emitted by the
+     *         {@code source} {@code ObservableSource}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @CheckReturnValue
@@ -3314,19 +3419,19 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
     }
 
     /**
-     * Flattens an ObservableSource that emits ObservableSources into one ObservableSource, in a way that allows an Observer to
-     * receive all successfully emitted items from all of the source ObservableSources without being interrupted by
+     * Flattens an {@link ObservableSource} that emits {@code ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to
+     * receive all successfully emitted items from all of the emitted {@code ObservableSource}s without being interrupted by
      * an error notification from one of them, while limiting the
-     * number of concurrent subscriptions to these ObservableSources.
+     * number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
-     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged ObservableSources notify of an
+     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged {@code ObservableSource}s notify of an
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged ObservableSources have finished emitting items.
+     * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3334,11 +3439,13 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
      *
      * @param <T> the common element base type
      * @param sources
-     *            an ObservableSource that emits ObservableSources
+     *            an {@code ObservableSource} that emits {@code ObservableSource}s
      * @param maxConcurrency
-     *            the maximum number of ObservableSources that may be subscribed to concurrently
-     * @return an Observable that emits all of the items emitted by the ObservableSources emitted by the
-     *         {@code source} ObservableSource
+     *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
+     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s emitted by the
+     *         {@code source} {@code ObservableSource}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @since 2.0
      */
@@ -3353,18 +3460,18 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
     }
 
     /**
-     * Flattens two ObservableSources into one ObservableSource, in a way that allows an Observer to receive all
-     * successfully emitted items from each of the source ObservableSources without being interrupted by an error
+     * Flattens two {@link ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to receive all
+     * successfully emitted items from each of the {@code ObservableSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
-     * This behaves like {@link #merge(ObservableSource, ObservableSource)} except that if any of the merged ObservableSources
+     * This behaves like {@link #merge(ObservableSource, ObservableSource)} except that if any of the merged {@code ObservableSource}s
      * notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from
-     * propagating that error notification until all of the merged ObservableSources have finished emitting items.
+     * propagating that error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if both merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if both merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3372,10 +3479,11 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
      *
      * @param <T> the common element base type
      * @param source1
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source2
-     *            an ObservableSource to be merged
-     * @return an Observable that emits all of the items that are emitted by the two source ObservableSources
+     *            an {@code ObservableSource} to be merged
+     * @return an {@code Observable} that emits all of the items that are emitted by the two source {@code ObservableSource}s
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3390,19 +3498,19 @@ public static <T> Observable<T> mergeDelayError(
     }
 
     /**
-     * Flattens three ObservableSources into one ObservableSource, in a way that allows an Observer to receive all
-     * successfully emitted items from all of the source ObservableSources without being interrupted by an error
+     * Flattens three {@link ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to receive all
+     * successfully emitted items from all of the {@code ObservableSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
      * This behaves like {@link #merge(ObservableSource, ObservableSource, ObservableSource)} except that if any of the merged
-     * ObservableSources notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain
-     * from propagating that error notification until all of the merged ObservableSources have finished emitting
+     * {@code ObservableSource}s notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain
+     * from propagating that error notification until all of the merged {@code ObservableSource}s have finished emitting
      * items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3410,12 +3518,13 @@ public static <T> Observable<T> mergeDelayError(
      *
      * @param <T> the common element base type
      * @param source1
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source2
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source3
-     *            an ObservableSource to be merged
-     * @return an Observable that emits all of the items that are emitted by the source ObservableSources
+     *            an {@code ObservableSource} to be merged
+     * @return an {@code Observable} that emits all of the items that are emitted by the {@code ObservableSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3432,19 +3541,19 @@ public static <T> Observable<T> mergeDelayError(
     }
 
     /**
-     * Flattens four ObservableSources into one ObservableSource, in a way that allows an Observer to receive all
-     * successfully emitted items from all of the source ObservableSources without being interrupted by an error
+     * Flattens four {@link ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to receive all
+     * successfully emitted items from all of the {@code ObservableSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
      * This behaves like {@link #merge(ObservableSource, ObservableSource, ObservableSource, ObservableSource)} except that if any of
-     * the merged ObservableSources notify of an error via {@link Observer#onError onError}, {@code mergeDelayError}
-     * will refrain from propagating that error notification until all of the merged ObservableSources have finished
+     * the merged {@code ObservableSource}s notify of an error via {@link Observer#onError onError}, {@code mergeDelayError}
+     * will refrain from propagating that error notification until all of the merged {@code ObservableSource}s have finished
      * emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3452,14 +3561,15 @@ public static <T> Observable<T> mergeDelayError(
      *
      * @param <T> the common element base type
      * @param source1
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source2
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source3
-     *            an ObservableSource to be merged
+     *            an {@code ObservableSource} to be merged
      * @param source4
-     *            an ObservableSource to be merged
-     * @return an Observable that emits all of the items that are emitted by the source ObservableSources
+     *            an {@code ObservableSource} to be merged
+     * @return an {@code Observable} that emits all of the items that are emitted by the {@code ObservableSource}s
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3477,18 +3587,18 @@ public static <T> Observable<T> mergeDelayError(
     }
 
     /**
-     * Flattens an Iterable of ObservableSources into one ObservableSource, in a way that allows an Observer to receive all
-     * successfully emitted items from each of the source ObservableSources without being interrupted by an error
+     * Flattens an array of {@link ObservableSource}s into one {@code Observable}, in a way that allows an {@link Observer} to receive all
+     * successfully emitted items from each of the {@code ObservableSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
-     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged ObservableSources notify of an
+     * This behaves like {@link #merge(ObservableSource)} except that if any of the merged {@code ObservableSource}s notify of an
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
-     * error notification until all of the merged ObservableSources have finished emitting items.
+     * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
      * <p>
-     * Even if multiple merged ObservableSources send {@code onError} notifications, {@code mergeDelayError} will only
-     * invoke the {@code onError} method of its Observers once.
+     * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * invoke the {@code onError} method of its {@code Observer}s once.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3496,9 +3606,9 @@ public static <T> Observable<T> mergeDelayError(
      *
      * @param <T> the common element base type
      * @param sources
-     *            the Iterable of ObservableSources
-     * @return an Observable that emits items that are the result of flattening the items emitted by the
-     *         ObservableSources in the Iterable
+     *            the array of {@code ObservableSource}s
+     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
+     *         {@code ObservableSource}s in the array
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3511,19 +3621,19 @@ public static <T> Observable<T> mergeArrayDelayError(@NonNull ObservableSource<?
     }
 
     /**
-     * Returns an Observable that never sends any items or notifications to an {@link Observer}.
+     * Returns an {@code Observable} that never sends any items or notifications to an {@link Observer}.
      * <p>
      * <img width="640" height="185" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/never.png" alt="">
      * <p>
-     * This ObservableSource is useful primarily for testing purposes.
+     * The returned {@code Observable} is useful primarily for testing purposes.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code never} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T>
-     *            the type of items (not) emitted by the ObservableSource
-     * @return an Observable that never emits any items or sends any notifications to an {@link Observer}
+     *            the type of items (not) emitted by the {@code Observable}
+     * @return an {@code Observable} that never emits any items or sends any notifications to an {@code Observer}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Never</a>
      */
     @CheckReturnValue
@@ -3535,7 +3645,7 @@ public static <T> Observable<T> never() {
     }
 
     /**
-     * Returns an Observable that emits a sequence of Integers within a specified range.
+     * Returns an {@code Observable} that emits a sequence of {@link Integer}s within a specified range.
      * <p>
      * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/range.png" alt="">
      * <dl>
@@ -3544,12 +3654,12 @@ public static <T> Observable<T> never() {
      * </dl>
      *
      * @param start
-     *            the value of the first Integer in the sequence
+     *            the value of the first {@code Integer} in the sequence
      * @param count
-     *            the number of sequential Integers to generate
-     * @return an Observable that emits a range of sequential Integers
+     *            the number of sequential {@code Integer}s to generate
+     * @return an {@code Observable} that emits a range of sequential {@code Integer}s
      * @throws IllegalArgumentException
-     *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
+     *             if {@code count} is negative, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Integer#MAX_VALUE}
      * @see <a href="http://reactivex.io/documentation/operators/range.html">ReactiveX operators documentation: Range</a>
      */
@@ -3573,7 +3683,7 @@ public static Observable<Integer> range(int start, int count) {
     }
 
     /**
-     * Returns an Observable that emits a sequence of Longs within a specified range.
+     * Returns an {@code Observable} that emits a sequence of {@link Long}s within a specified range.
      * <p>
      * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/rangeLong.png" alt="">
      * <dl>
@@ -3582,12 +3692,12 @@ public static Observable<Integer> range(int start, int count) {
      * </dl>
      *
      * @param start
-     *            the value of the first Long in the sequence
+     *            the value of the first {@code Long} in the sequence
      * @param count
-     *            the number of sequential Longs to generate
-     * @return an Observable that emits a range of sequential Longs
+     *            the number of sequential {@code Long}s to generate
+     * @return an {@code Observable} that emits a range of sequential {@code Long}s
      * @throws IllegalArgumentException
-     *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
+     *             if {@code count} is negative, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Long#MAX_VALUE}
      * @see <a href="http://reactivex.io/documentation/operators/range.html">ReactiveX operators documentation: Range</a>
      */
@@ -3616,8 +3726,8 @@ public static Observable<Long> rangeLong(long start, long count) {
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two ObservableSource sequences are the
-     * same by comparing the items emitted by each ObservableSource pairwise.
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link ObservableSource} sequences are the
+     * same by comparing the items emitted by each {@code ObservableSource} pairwise.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.png" alt="">
      * <dl>
@@ -3626,12 +3736,12 @@ public static Observable<Long> rangeLong(long start, long count) {
      * </dl>
      *
      * @param source1
-     *            the first ObservableSource to compare
+     *            the first {@code ObservableSource} to compare
      * @param source2
-     *            the second ObservableSource to compare
+     *            the second {@code ObservableSource} to compare
      * @param <T>
-     *            the type of items emitted by each ObservableSource
-     * @return a Single that emits a Boolean value that indicates whether the two sequences are the same
+     *            the type of items emitted by each {@code ObservableSource}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -3642,8 +3752,8 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two ObservableSource sequences are the
-     * same by comparing the items emitted by each ObservableSource pairwise based on the results of a specified
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link ObservableSource} sequences are the
+     * same by comparing the items emitted by each {@code ObservableSource} pairwise based on the results of a specified
      * equality function.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.png" alt="">
@@ -3653,14 +3763,14 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
      * </dl>
      *
      * @param source1
-     *            the first ObservableSource to compare
+     *            the first {@code ObservableSource} to compare
      * @param source2
-     *            the second ObservableSource to compare
+     *            the second {@code ObservableSource} to compare
      * @param isEqual
-     *            a function used to compare items emitted by each ObservableSource
+     *            a function used to compare items emitted by each {@code ObservableSource}
      * @param <T>
-     *            the type of items emitted by each ObservableSource
-     * @return a Single that emits a Boolean value that indicates whether the two ObservableSource two sequences
+     *            the type of items emitted by each {@code ObservableSource}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code ObservableSource} two sequences
      *         are the same according to the specified function
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
@@ -3674,8 +3784,8 @@ public static <T> Single<Boolean> sequenceEqual(
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two ObservableSource sequences are the
-     * same by comparing the items emitted by each ObservableSource pairwise based on the results of a specified
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link ObservableSource} sequences are the
+     * same by comparing the items emitted by each {@code ObservableSource} pairwise based on the results of a specified
      * equality function.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.png" alt="">
@@ -3685,17 +3795,19 @@ public static <T> Single<Boolean> sequenceEqual(
      * </dl>
      *
      * @param source1
-     *            the first ObservableSource to compare
+     *            the first {@code ObservableSource} to compare
      * @param source2
-     *            the second ObservableSource to compare
+     *            the second {@code ObservableSource} to compare
      * @param isEqual
-     *            a function used to compare items emitted by each ObservableSource
+     *            a function used to compare items emitted by each {@code ObservableSource}
      * @param bufferSize
-     *            the number of items to prefetch from the first and second source ObservableSource
+     *            the number of items expected from the first and second source {@code ObservableSource} to be buffered
      * @param <T>
-     *            the type of items emitted by each ObservableSource
-     * @return an Observable that emits a Boolean value that indicates whether the two ObservableSource two sequences
+     *            the type of items emitted by each {@code ObservableSource}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code ObservableSource} two sequences
      *         are the same according to the specified function
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -3712,8 +3824,8 @@ public static <T> Single<Boolean> sequenceEqual(
     }
 
     /**
-     * Returns a Single that emits a Boolean value that indicates whether two ObservableSource sequences are the
-     * same by comparing the items emitted by each ObservableSource pairwise.
+     * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link ObservableSource} sequences are the
+     * same by comparing the items emitted by each {@code ObservableSource} pairwise.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.png" alt="">
      * <dl>
@@ -3722,14 +3834,14 @@ public static <T> Single<Boolean> sequenceEqual(
      * </dl>
      *
      * @param source1
-     *            the first ObservableSource to compare
+     *            the first {@code ObservableSource} to compare
      * @param source2
-     *            the second ObservableSource to compare
+     *            the second {@code ObservableSource} to compare
      * @param bufferSize
-     *            the number of items to prefetch from the first and second source ObservableSource
+     *            the number of items expected from the first and second source {@code ObservableSource} to be buffered
      * @param <T>
-     *            the type of items emitted by each ObservableSource
-     * @return a Single that emits a Boolean value that indicates whether the two sequences are the same
+     *            the type of items emitted by each {@code ObservableSource}
+     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -3741,18 +3853,18 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
     }
 
     /**
-     * Converts an ObservableSource that emits ObservableSources into an ObservableSource that emits the items emitted by the
-     * most recently emitted of those ObservableSources.
+     * Converts an {@link ObservableSource} that emits {@code ObservableSource}s into an {@code Observable} that emits the items emitted by the
+     * most recently emitted of those {@code ObservableSource}s.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
      * <p>
-     * {@code switchOnNext} subscribes to an ObservableSource that emits ObservableSources. Each time it observes one of
-     * these emitted ObservableSources, the ObservableSource returned by {@code switchOnNext} begins emitting the items
-     * emitted by that ObservableSource. When a new ObservableSource is emitted, {@code switchOnNext} stops emitting items
-     * from the earlier-emitted ObservableSource and begins emitting items from the new one.
+     * {@code switchOnNext} subscribes to an {@code ObservableSource} that emits {@code ObservableSource}s. Each time it observes one of
+     * these emitted {@code ObservableSource}s, the {@code ObservableSource} returned by {@code switchOnNext} begins emitting the items
+     * emitted by that {@code ObservableSource}. When a new inner {@code ObservableSource} is emitted, {@code switchOnNext} stops emitting items
+     * from the earlier-emitted {@code ObservableSource} and begins emitting items from the new one.
      * <p>
-     * The resulting ObservableSource completes if both the outer ObservableSource and the last inner ObservableSource, if any, complete.
-     * If the outer ObservableSource signals an onError, the inner ObservableSource is disposed and the error delivered in-sequence.
+     * The resulting {@code Observable} completes if both the outer {@code ObservableSource} and the last inner {@code ObservableSource}, if any, complete.
+     * If the outer {@code ObservableSource} signals an {@code onError}, the inner {@code ObservableSource} is disposed and the error delivered in-sequence.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchOnNext} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3760,11 +3872,13 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
      *
      * @param <T> the item type
      * @param sources
-     *            the source ObservableSource that emits ObservableSources
+     *            the {@code ObservableSource} that emits {@code ObservableSource}s
      * @param bufferSize
-     *            the number of items to prefetch from the inner ObservableSources
-     * @return an Observable that emits the items emitted by the ObservableSource most recently emitted by the source
-     *         ObservableSource
+     *            the expected number of items to cache from the inner {@code ObservableSource}s
+     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the
+     *         {@code sources} {@code ObservableSource}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -3778,18 +3892,18 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
     }
 
     /**
-     * Converts an ObservableSource that emits ObservableSources into an ObservableSource that emits the items emitted by the
-     * most recently emitted of those ObservableSources.
+     * Converts an {@link ObservableSource} that emits {@code ObservableSource}s into an {@code Observable} that emits the items emitted by the
+     * most recently emitted of those {@code ObservableSource}s.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
      * <p>
-     * {@code switchOnNext} subscribes to an ObservableSource that emits ObservableSources. Each time it observes one of
-     * these emitted ObservableSources, the ObservableSource returned by {@code switchOnNext} begins emitting the items
-     * emitted by that ObservableSource. When a new ObservableSource is emitted, {@code switchOnNext} stops emitting items
-     * from the earlier-emitted ObservableSource and begins emitting items from the new one.
+     * {@code switchOnNext} subscribes to an {@code ObservableSource} that emits {@code ObservableSource}s. Each time it observes one of
+     * these emitted {@code ObservableSource}s, the {@code ObservableSource} returned by {@code switchOnNext} begins emitting the items
+     * emitted by that {@code ObservableSource}. When a new inner {@code ObservableSource} is emitted, {@code switchOnNext} stops emitting items
+     * from the earlier-emitted {@code ObservableSource} and begins emitting items from the new one.
      * <p>
-     * The resulting ObservableSource completes if both the outer ObservableSource and the last inner ObservableSource, if any, complete.
-     * If the outer ObservableSource signals an onError, the inner ObservableSource is disposed and the error delivered in-sequence.
+     * The resulting {@code Observable} completes if both the outer {@code ObservableSource} and the last inner {@code ObservableSource}, if any, complete.
+     * If the outer {@code ObservableSource} signals an {@code onError}, the inner {@code ObservableSource} is disposed and the error delivered in-sequence.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchOnNext} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3797,9 +3911,9 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
      *
      * @param <T> the item type
      * @param sources
-     *            the source ObservableSource that emits ObservableSources
-     * @return an Observable that emits the items emitted by the ObservableSource most recently emitted by the source
-     *         ObservableSource
+     *            the {@code ObservableSource} that emits {@code ObservableSource}s
+     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the {@code sources}
+     *         {@code ObservableSource}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      */
     @CheckReturnValue
@@ -3810,19 +3924,19 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
     }
 
     /**
-     * Converts an ObservableSource that emits ObservableSources into an ObservableSource that emits the items emitted by the
-     * most recently emitted of those ObservableSources and delays any exception until all ObservableSources terminate.
+     * Converts an {@link ObservableSource} that emits {@code ObservableSource}s into an {@code Observable} that emits the items emitted by the
+     * most recently emitted of those {@code ObservableSource}s and delays any exception until all {@code ObservableSource}s terminate.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchOnNextDelayError.png" alt="">
      * <p>
-     * {@code switchOnNext} subscribes to an ObservableSource that emits ObservableSources. Each time it observes one of
-     * these emitted ObservableSources, the ObservableSource returned by {@code switchOnNext} begins emitting the items
-     * emitted by that ObservableSource. When a new ObservableSource is emitted, {@code switchOnNext} stops emitting items
-     * from the earlier-emitted ObservableSource and begins emitting items from the new one.
+     * {@code switchOnNext} subscribes to an {@code ObservableSource} that emits {@code ObservableSource}s. Each time it observes one of
+     * these emitted {@code ObservableSource}s, the {@code ObservableSource} returned by {@code switchOnNext} begins emitting the items
+     * emitted by that {@code ObservableSource}. When a new inner {@code ObservableSource} is emitted, {@code switchOnNext} stops emitting items
+     * from the earlier-emitted {@code ObservableSource} and begins emitting items from the new one.
      * <p>
-     * The resulting ObservableSource completes if both the main ObservableSource and the last inner ObservableSource, if any, complete.
-     * If the main ObservableSource signals an onError, the termination of the last inner ObservableSource will emit that error as is
-     * or wrapped into a CompositeException along with the other possible errors the former inner ObservableSources signalled.
+     * The resulting {@code Observable} completes if both the main {@code ObservableSource} and the last inner {@code ObservableSource}, if any, complete.
+     * If the main {@code ObservableSource} signals an {@code onError}, the termination of the last inner {@code ObservableSource} will emit that error as is
+     * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code ObservableSource}s signaled.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchOnNextDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3830,9 +3944,9 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
      *
      * @param <T> the item type
      * @param sources
-     *            the source ObservableSource that emits ObservableSources
-     * @return an Observable that emits the items emitted by the ObservableSource most recently emitted by the source
-     *         ObservableSource
+     *            the {@code ObservableSource} that emits {@code ObservableSource}s
+     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the {@code sources}
+     *         {@code ObservableSource}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      * @since 2.0
      */
@@ -3844,19 +3958,19 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
     }
 
     /**
-     * Converts an ObservableSource that emits ObservableSources into an ObservableSource that emits the items emitted by the
-     * most recently emitted of those ObservableSources and delays any exception until all ObservableSources terminate.
+     * Converts an {@link ObservableSource} that emits {@code ObservableSource}s into an {@code Observable} that emits the items emitted by the
+     * most recently emitted of those {@code ObservableSource}s and delays any exception until all {@code ObservableSource}s terminate.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchOnNextDelayError.png" alt="">
      * <p>
-     * {@code switchOnNext} subscribes to an ObservableSource that emits ObservableSources. Each time it observes one of
-     * these emitted ObservableSources, the ObservableSource returned by {@code switchOnNext} begins emitting the items
-     * emitted by that ObservableSource. When a new ObservableSource is emitted, {@code switchOnNext} stops emitting items
-     * from the earlier-emitted ObservableSource and begins emitting items from the new one.
+     * {@code switchOnNext} subscribes to an {@code ObservableSource} that emits {@code ObservableSource}s. Each time it observes one of
+     * these emitted {@code ObservableSource}s, the {@code ObservableSource} returned by {@code switchOnNext} begins emitting the items
+     * emitted by that {@code ObservableSource}. When a new inner {@code ObservableSource} is emitted, {@code switchOnNext} stops emitting items
+     * from the earlier-emitted {@code ObservableSource} and begins emitting items from the new one.
      * <p>
-     * The resulting ObservableSource completes if both the main ObservableSource and the last inner ObservableSource, if any, complete.
-     * If the main ObservableSource signals an onError, the termination of the last inner ObservableSource will emit that error as is
-     * or wrapped into a CompositeException along with the other possible errors the former inner ObservableSources signalled.
+     * The resulting {@code Observable} completes if both the main {@code ObservableSource} and the last inner {@code ObservableSource}, if any, complete.
+     * If the main {@code ObservableSource} signals an {@code onError}, the termination of the last inner {@code ObservableSource} will emit that error as is
+     * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code ObservableSource}s signaled.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchOnNextDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3864,11 +3978,13 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
      *
      * @param <T> the item type
      * @param sources
-     *            the source ObservableSource that emits ObservableSources
-     * @param prefetch
-     *            the number of items to prefetch from the inner ObservableSources
-     * @return an Observable that emits the items emitted by the ObservableSource most recently emitted by the source
-     *         ObservableSource
+     *            the {@code ObservableSource} that emits {@code ObservableSource}s
+     * @param bufferSize
+     *            the expected number of items to cache from the inner {@code ObservableSource}s
+     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the {@code sources}
+     *         {@code ObservableSource}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      * @since 2.0
      */
@@ -3876,14 +3992,14 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int prefetch) {
+    public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), prefetch, true));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), bufferSize, true));
     }
 
     /**
-     * Returns an Observable that emits {@code 0L} after a specified delay, and then completes.
+     * Returns an {@code Observable} that emits {@code 0L} after a specified delay, and then completes.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.png" alt="">
      * <dl>
@@ -3895,7 +4011,7 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
      *            the initial delay before emitting a single {@code 0L}
      * @param unit
      *            time units to use for {@code delay}
-     * @return an Observable that {@code 0L} after a specified delay, and then completes
+     * @return an {@code Observable} that {@code 0L} after a specified delay, and then completes
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
     @CheckReturnValue
@@ -3906,13 +4022,13 @@ public static Observable<Long> timer(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that emits {@code 0L} after a specified delay, on a specified Scheduler, and then
+     * Returns an {@code Observable} that emits {@code 0L} after a specified delay, on a specified {@link Scheduler}, and then
      * completes.
      * <p>
      * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param delay
@@ -3920,11 +4036,10 @@ public static Observable<Long> timer(long delay, @NonNull TimeUnit unit) {
      * @param unit
      *            time units to use for {@code delay}
      * @param scheduler
-     *            the {@link Scheduler} to use for scheduling the item
+     *            the {@code Scheduler} to use for scheduling the item
      * @throws NullPointerException
-     *             if {@code unit} is null, or
-     *             if {@code scheduler} is null
-     * @return an Observable that emits {@code 0L} after a specified delay, on a specified Scheduler, and then
+     *             if {@code unit} or {@code scheduler} is {@code null}
+     * @return an {@code Observable} that emits {@code 0L} after a specified delay, on a specified {@code Scheduler}, and then
      *         completes
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
@@ -3939,16 +4054,20 @@ public static Observable<Long> timer(long delay, @NonNull TimeUnit unit, @NonNul
     }
 
     /**
-     * Create an Observable by wrapping an ObservableSource <em>which has to be implemented according
-     * to the Reactive-Streams-based Observable specification by handling
-     * disposal correctly; no safeguards are provided by the Observable itself</em>.
+     * Create an {@code Observable} by wrapping an {@link ObservableSource} <em>which has to be implemented according
+     * to the {@code Observable} specification derived from the <b>Reactive Streams</b> specification by handling
+     * disposal correctly; no safeguards are provided by the {@code Observable} itself</em>.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code unsafeCreate} by default doesn't operate on any particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type emitted
-     * @param onSubscribe the ObservableSource instance to wrap
-     * @return the new Observable instance
+     * @param onSubscribe the {@code ObservableSource} instance to wrap
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
+     * @throws IllegalArgumentException if the {@code onSubscribe} is already an {@code Observable}, use
+     *                                  {@link #wrap(ObservableSource)} in this case
+     * @see #wrap(ObservableSource)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3962,8 +4081,9 @@ public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubs
     }
 
     /**
-     * Constructs an ObservableSource that creates a dependent resource object which is disposed of when the downstream
-     * calls dispose().
+     * Constructs an {@code Observable} that creates a dependent resource object, an {@link ObservableSource} with
+     * that resource and calls the provided {@code resourceDisposer} function if this inner source terminates or the
+     * downstream disposes the flow.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
      * <dl>
@@ -3971,15 +4091,15 @@ public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubs
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T> the element type of the generated ObservableSource
+     * @param <T> the element type of the generated {@code Observable}
      * @param <D> the type of the resource associated with the output sequence
      * @param resourceSupplier
-     *            the factory function to create a resource object that depends on the ObservableSource
+     *            the factory function to create a resource object that depends on the {@code ObservableSource}
      * @param sourceSupplier
-     *            the factory function to create an ObservableSource
-     * @param disposer
+     *            the factory function to create an {@code ObservableSource}
+     * @param resourceDisposer
      *            the function that will dispose of the resource
-     * @return the ObservableSource whose lifetime controls the lifetime of the dependent resource object
+     * @return the {@code ObservableSource} whose lifetime controls the lifetime of the dependent resource object
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -3988,16 +4108,14 @@ public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubs
     public static <T, D> Observable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier,
-            @NonNull Consumer<? super D> disposer) {
-        return using(resourceSupplier, sourceSupplier, disposer, true);
+            @NonNull Consumer<? super D> resourceDisposer) {
+        return using(resourceSupplier, sourceSupplier, resourceDisposer, true);
     }
 
     /**
-     * Constructs an ObservableSource that creates a dependent resource object which is disposed of just before
-     * termination if you have set {@code disposeEagerly} to {@code true} and a dispose() call does not occur
-     * before termination. Otherwise resource disposal will occur on a dispose() call.  Eager disposal is
-     * particularly appropriate for a synchronous ObservableSource that reuses resources. {@code disposeAction} will
-     * only be called once per subscription.
+     * Constructs an {@code Observable} that creates a dependent resource object, an {@link ObservableSource} with
+     * that resource and calls the provided {@code disposer} function if this inner source terminates or the
+     * downstream disposes the flow; doing it before these end-states have been reached if {@code eager == true}, after otherwise.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
      * <dl>
@@ -4005,20 +4123,21 @@ public static <T, D> Observable<T> using(
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <T> the element type of the generated ObservableSource
+     * @param <T> the element type of the generated {@code ObservableSource}
      * @param <D> the type of the resource associated with the output sequence
      * @param resourceSupplier
-     *            the factory function to create a resource object that depends on the ObservableSource
+     *            the factory function to create a resource object that depends on the {@code ObservableSource}
      * @param sourceSupplier
-     *            the factory function to create an ObservableSource
-     * @param disposer
+     *            the factory function to create an {@code ObservableSource}
+     * @param resourceDisposer
      *            the function that will dispose of the resource
      * @param eager
-     *            If {@code true} then resource disposal will happen either on a {@code dispose()} call before the upstream is disposed
+     *            If {@code true}, the resource disposal will happen either on a {@code dispose()} call before the upstream is disposed
      *            or just before the emission of a terminal event ({@code onComplete} or {@code onError}).
-     *            If {@code false} the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
+     *            If {@code false}, the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
-     * @return the ObservableSource whose lifetime controls the lifetime of the dependent resource object
+     * @return the {@code ObservableSource} whose lifetime controls the lifetime of the dependent resource object
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} and {@code resourceDisposer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      * @since 2.0
      */
@@ -4028,15 +4147,15 @@ public static <T, D> Observable<T> using(
     public static <T, D> Observable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier,
-            @NonNull Consumer<? super D> disposer, boolean eager) {
+            @NonNull Consumer<? super D> resourceDisposer, boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
-        Objects.requireNonNull(disposer, "disposer is null");
-        return RxJavaPlugins.onAssembly(new ObservableUsing<T, D>(resourceSupplier, sourceSupplier, disposer, eager));
+        Objects.requireNonNull(resourceDisposer, "resourceDisposer is null");
+        return RxJavaPlugins.onAssembly(new ObservableUsing<T, D>(resourceSupplier, sourceSupplier, resourceDisposer, eager));
     }
 
     /**
-     * Wraps an ObservableSource into an Observable if not already an Observable.
+     * Wraps an {@link ObservableSource} into an {@code Observable} if not already an {@code Observable}.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -4044,9 +4163,9 @@ public static <T, D> Observable<T> using(
      * </dl>
      *
      * @param <T> the value type
-     * @param source the source ObservableSource instance
-     * @return the new Observable instance or the same as the source
-     * @throws NullPointerException if source is null
+     * @param source the {@code ObservableSource} instance to wrap or cast to {@code Observable}
+     * @return the new {@code Observable} instance or the same as the source
+     * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4060,16 +4179,16 @@ public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * items emitted, in sequence, by an Iterable of other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * items emitted, in sequence, by an {@link Iterable} of other {@link ObservableSource}s.
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
-     * will be the result of the function applied to the first item emitted by each of the source ObservableSources;
-     * the second item emitted by the new ObservableSource will be the result of the function applied to the second
-     * item emitted by each of those ObservableSources; and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
+     * will be the result of the function applied to the first item emitted by each of the {@code ObservableSource}s;
+     * the second item emitted by the resulting {@code Observable} will be the result of the function applied to the second
+     * item emitted by each of those {@code ObservableSource}s; and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@code onNext} as many times as
-     * the number of {@code onNext} invocations of the source ObservableSource that emits the fewest items.
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@code onNext} as many times as
+     * the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while disposing the other sources. Therefore, it
@@ -4085,7 +4204,7 @@ public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      *
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
@@ -4097,11 +4216,12 @@ public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
      * @param <T> the common value type
      * @param <R> the zipped result type
      * @param sources
-     *            an Iterable of source ObservableSources
+     *            an {@code Iterable} of source {@code ObservableSource}s
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4114,16 +4234,16 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSou
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * items emitted, in sequence, by an Iterable of other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * items emitted, in sequence, by an {@link Iterable} of other {@link ObservableSource}s.
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
-     * will be the result of the function applied to the first item emitted by each of the source ObservableSources;
-     * the second item emitted by the new ObservableSource will be the result of the function applied to the second
-     * item emitted by each of those ObservableSources; and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
+     * will be the result of the function applied to the first item emitted by each of the {@code ObservableSource}s;
+     * the second item emitted by the resulting {@code Observable} will be the result of the function applied to the second
+     * item emitted by each of those {@code ObservableSource}s; and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@code onNext} as many times as
-     * the number of {@code onNext} invocations of the source ObservableSource that emits the fewest items.
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@code onNext} as many times as
+     * the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while disposing the other sources. Therefore, it
@@ -4139,7 +4259,7 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSou
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      *
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zipIterable.o.png" alt="">
@@ -4150,17 +4270,19 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSou
      *
      *
      * @param sources
-     *            an Iterable of source ObservableSources
+     *            an {@code Iterable} of source {@code ObservableSource}s
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
      * @param delayError
-     *            delay errors signalled by any of the source ObservableSource until all ObservableSources terminate
+     *            delay errors signaled by any of the {@code ObservableSource} until all {@code ObservableSource}s terminate
      * @param bufferSize
-     *            the number of elements to prefetch from each source ObservableSource
+     *            the number of elements expected from each source {@code ObservableSource} to be buffered
      * @param <T> the common source value type
      * @param <R> the zipped result type
-     * @return an Observable that emits the zipped results
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4176,18 +4298,18 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSou
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * two items emitted, in sequence, by two other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * two items emitted, in sequence, by two other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
-     * emitted by {@code o2}; the second item emitted by the new ObservableSource will be the result of the function
+     * emitted by {@code o2}; the second item emitted by the resulting {@code Observable} will be the result of the function
      * applied to the second item emitted by {@code o1} and the second item emitted by {@code o2}; and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4210,13 +4332,14 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSou
      * @param <T2> the value type of the second source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results
-     *            in an item that will be emitted by the resulting ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results
+     *            in an item that will be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4232,18 +4355,18 @@ public static <T1, T2, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * two items emitted, in sequence, by two other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * two items emitted, in sequence, by two other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
-     * emitted by {@code o2}; the second item emitted by the new ObservableSource will be the result of the function
+     * emitted by {@code o2}; the second item emitted by the resulting {@code Observable} will be the result of the function
      * applied to the second item emitted by {@code o1} and the second item emitted by {@code o2}; and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4266,14 +4389,15 @@ public static <T1, T2, R> Observable<R> zip(
      * @param <T2> the value type of the second source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results
-     *            in an item that will be emitted by the resulting ObservableSource
-     * @param delayError delay errors from any of the source ObservableSources till the other terminates
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results
+     *            in an item that will be emitted by the resulting {@code Observable}
+     * @param delayError delay errors from any of the {@code ObservableSource}s till the other terminates
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4289,18 +4413,18 @@ public static <T1, T2, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * two items emitted, in sequence, by two other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * two items emitted, in sequence, by two other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
-     * emitted by {@code o2}; the second item emitted by the new ObservableSource will be the result of the function
+     * emitted by {@code o2}; the second item emitted by the resulting {@code Observable} will be the result of the function
      * applied to the second item emitted by {@code o1} and the second item emitted by {@code o2}; and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4323,15 +4447,16 @@ public static <T1, T2, R> Observable<R> zip(
      * @param <T2> the value type of the second source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results
-     *            in an item that will be emitted by the resulting ObservableSource
-     * @param delayError delay errors from any of the source ObservableSources till the other terminates
-     * @param bufferSize the number of elements to prefetch from each source ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results
+     *            in an item that will be emitted by the resulting {@code Observable}
+     * @param delayError delay errors from any of the {@code ObservableSource}s till the other terminates
+     * @param bufferSize the number of elements expected from each source {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4347,19 +4472,19 @@ public static <T1, T2, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * three items emitted, in sequence, by three other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * three items emitted, in sequence, by three other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
-     * emitted by {@code o2}, and the first item emitted by {@code o3}; the second item emitted by the new
-     * ObservableSource will be the result of the function applied to the second item emitted by {@code o1}, the
+     * emitted by {@code o2}, and the first item emitted by {@code o3}; the second item emitted by the resulting
+     * {@code Observable} will be the result of the function applied to the second item emitted by {@code o1}, the
      * second item emitted by {@code o2}, and the second item emitted by {@code o3}; and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4383,15 +4508,16 @@ public static <T1, T2, R> Observable<R> zip(
      * @param <T3> the value type of the third source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param source3
-     *            a third source ObservableSource
+     *            a third source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4409,19 +4535,19 @@ public static <T1, T2, T3, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * four items emitted, in sequence, by four other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * four items emitted, in sequence, by four other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
      * emitted by {@code o2}, the first item emitted by {@code o3}, and the first item emitted by {@code 04};
-     * the second item emitted by the new ObservableSource will be the result of the function applied to the second
-     * item emitted by each of those ObservableSources; and so forth.
+     * the second item emitted by the resulting {@code Observable} will be the result of the function applied to the second
+     * item emitted by each of those {@code ObservableSource}s; and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4446,17 +4572,19 @@ public static <T1, T2, T3, R> Observable<R> zip(
      * @param <T4> the value type of the fourth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param source3
-     *            a third source ObservableSource
+     *            a third source {@code ObservableSource}
      * @param source4
-     *            a fourth source ObservableSource
+     *            a fourth source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4475,19 +4603,19 @@ public static <T1, T2, T3, T4, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * five items emitted, in sequence, by five other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * five items emitted, in sequence, by five other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
      * emitted by {@code o2}, the first item emitted by {@code o3}, the first item emitted by {@code o4}, and
-     * the first item emitted by {@code o5}; the second item emitted by the new ObservableSource will be the result of
-     * the function applied to the second item emitted by each of those ObservableSources; and so forth.
+     * the first item emitted by {@code o5}; the second item emitted by the resulting {@code Observable} will be the result of
+     * the function applied to the second item emitted by each of those {@code ObservableSource}s; and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4513,19 +4641,21 @@ public static <T1, T2, T3, T4, R> Observable<R> zip(
      * @param <T5> the value type of the fifth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param source3
-     *            a third source ObservableSource
+     *            a third source {@code ObservableSource}
      * @param source4
-     *            a fourth source ObservableSource
+     *            a fourth source {@code ObservableSource}
      * @param source5
-     *            a fifth source ObservableSource
+     *            a fifth source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4545,18 +4675,18 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * six items emitted, in sequence, by six other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * six items emitted, in sequence, by six other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
-     * will be the result of the function applied to the first item emitted by each source ObservableSource, the
-     * second item emitted by the new ObservableSource will be the result of the function applied to the second item
-     * emitted by each of those ObservableSources, and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
+     * will be the result of the function applied to the first item emitted by each source {@code ObservableSource}, the
+     * second item emitted by the resulting {@code Observable} will be the result of the function applied to the second item
+     * emitted by each of those {@code ObservableSource}s, and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4583,21 +4713,23 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
      * @param <T6> the value type of the sixth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param source3
-     *            a third source ObservableSource
+     *            a third source {@code ObservableSource}
      * @param source4
-     *            a fourth source ObservableSource
+     *            a fourth source {@code ObservableSource}
      * @param source5
-     *            a fifth source ObservableSource
+     *            a fifth source {@code ObservableSource}
      * @param source6
-     *            a sixth source ObservableSource
+     *            a sixth source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4618,18 +4750,18 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * seven items emitted, in sequence, by seven other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * seven items emitted, in sequence, by seven other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
-     * will be the result of the function applied to the first item emitted by each source ObservableSource, the
-     * second item emitted by the new ObservableSource will be the result of the function applied to the second item
-     * emitted by each of those ObservableSources, and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
+     * will be the result of the function applied to the first item emitted by each source {@code ObservableSource}, the
+     * second item emitted by the resulting {@code Observable} will be the result of the function applied to the second item
+     * emitted by each of those {@code ObservableSource}s, and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4657,23 +4789,26 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
      * @param <T7> the value type of the seventh source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param source3
-     *            a third source ObservableSource
+     *            a third source {@code ObservableSource}
      * @param source4
-     *            a fourth source ObservableSource
+     *            a fourth source {@code ObservableSource}
      * @param source5
-     *            a fifth source ObservableSource
+     *            a fifth source {@code ObservableSource}
      * @param source6
-     *            a sixth source ObservableSource
+     *            a sixth source {@code ObservableSource}
      * @param source7
-     *            a seventh source ObservableSource
+     *            a seventh source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4696,18 +4831,18 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * eight items emitted, in sequence, by eight other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * eight items emitted, in sequence, by eight other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
-     * will be the result of the function applied to the first item emitted by each source ObservableSource, the
-     * second item emitted by the new ObservableSource will be the result of the function applied to the second item
-     * emitted by each of those ObservableSources, and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
+     * will be the result of the function applied to the first item emitted by each source {@code ObservableSource}, the
+     * second item emitted by the resulting {@code Observable} will be the result of the function applied to the second item
+     * emitted by each of those {@code ObservableSource}s, and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4736,25 +4871,28 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
      * @param <T8> the value type of the eighth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param source3
-     *            a third source ObservableSource
+     *            a third source {@code ObservableSource}
      * @param source4
-     *            a fourth source ObservableSource
+     *            a fourth source {@code ObservableSource}
      * @param source5
-     *            a fifth source ObservableSource
+     *            a fifth source {@code ObservableSource}
      * @param source6
-     *            a sixth source ObservableSource
+     *            a sixth source {@code ObservableSource}
      * @param source7
-     *            a seventh source ObservableSource
+     *            a seventh source {@code ObservableSource}
      * @param source8
-     *            an eighth source ObservableSource
+     *            an eighth source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4778,18 +4916,18 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * nine items emitted, in sequence, by nine other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * nine items emitted, in sequence, by nine other {@link ObservableSource}s.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
-     * will be the result of the function applied to the first item emitted by each source ObservableSource, the
-     * second item emitted by the new ObservableSource will be the result of the function applied to the second item
-     * emitted by each of those ObservableSources, and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
+     * will be the result of the function applied to the first item emitted by each source {@code ObservableSource}, the
+     * second item emitted by the resulting {@code Observable} will be the result of the function applied to the second item
+     * emitted by each of those {@code ObservableSource}s, and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
-     * as many times as the number of {@code onNext} invocations of the source ObservableSource that emits the fewest
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@link Observer#onNext onNext}
+     * as many times as the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest
      * items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
@@ -4819,27 +4957,30 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
      * @param <T9> the value type of the ninth source
      * @param <R> the zipped result type
      * @param source1
-     *            the first source ObservableSource
+     *            the first source {@code ObservableSource}
      * @param source2
-     *            a second source ObservableSource
+     *            a second source {@code ObservableSource}
      * @param source3
-     *            a third source ObservableSource
+     *            a third source {@code ObservableSource}
      * @param source4
-     *            a fourth source ObservableSource
+     *            a fourth source {@code ObservableSource}
      * @param source5
-     *            a fifth source ObservableSource
+     *            a fifth source {@code ObservableSource}
      * @param source6
-     *            a sixth source ObservableSource
+     *            a sixth source {@code ObservableSource}
      * @param source7
-     *            a seventh source ObservableSource
+     *            a seventh source {@code ObservableSource}
      * @param source8
-     *            an eighth source ObservableSource
+     *            an eighth source {@code ObservableSource}
      * @param source9
-     *            a ninth source ObservableSource
+     *            a ninth source {@code ObservableSource}
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
-     * @return an Observable that emits the zipped results
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8}, {@code source9} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4864,16 +5005,16 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
     }
 
     /**
-     * Returns an Observable that emits the results of a specified combiner function applied to combinations of
-     * items emitted, in sequence, by an array of other ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
+     * items emitted, in sequence, by an array of other {@link ObservableSource}s.
      * <p>
-     * {@code zip} applies this function in strict sequence, so the first item emitted by the new ObservableSource
-     * will be the result of the function applied to the first item emitted by each of the source ObservableSources;
-     * the second item emitted by the new ObservableSource will be the result of the function applied to the second
-     * item emitted by each of those ObservableSources; and so forth.
+     * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
+     * will be the result of the function applied to the first item emitted by each of the {@code ObservableSource}s;
+     * the second item emitted by the resulting {@code Observable} will be the result of the function applied to the second
+     * item emitted by each of those {@code ObservableSource}s; and so forth.
      * <p>
-     * The resulting {@code ObservableSource<R>} returned from {@code zip} will invoke {@code onNext} as many times as
-     * the number of {@code onNext} invocations of the source ObservableSource that emits the fewest items.
+     * The resulting {@code Observable<R>} returned from {@code zip} will invoke {@code onNext} as many times as
+     * the number of {@code onNext} invocations of the {@code ObservableSource} that emits the fewest items.
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while disposing the other sources. Therefore, it
@@ -4890,7 +5031,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
-     * {@code Function<Integer[], R>} passed to the method would trigger a {@code ClassCastException}.
+     * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      *
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zipArray.o.png" alt="">
@@ -4902,15 +5043,17 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
      * @param <T> the common element type
      * @param <R> the result type
      * @param sources
-     *            an array of source ObservableSources
+     *            an array of source {@code ObservableSource}s
      * @param zipper
-     *            a function that, when applied to an item emitted by each of the source ObservableSources, results in
-     *            an item that will be emitted by the resulting ObservableSource
+     *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
+     *            an item that will be emitted by the resulting {@code Observable}
      * @param delayError
-     *            delay errors signalled by any of the source ObservableSource until all ObservableSources terminate
+     *            delay errors signaled by any of the {@code ObservableSource} until all {@code ObservableSource}s terminate
      * @param bufferSize
-     *            the number of elements to prefetch from each source ObservableSource
-     * @return an Observable that emits the zipped results
+     *            the number of elements expected from each source {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits the zipped results
+     * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4921,6 +5064,7 @@ public static <T, R> Observable<R> zipArray(
             @NonNull Function<? super Object[], ? extends R> zipper,
             boolean delayError, int bufferSize,
             @NonNull ObservableSource<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
         }
@@ -4934,8 +5078,8 @@ public static <T, R> Observable<R> zipArray(
     // ***************************************************************************************************
 
     /**
-     * Returns a Single that emits a Boolean that indicates whether all of the items emitted by the source
-     * ObservableSource satisfy a condition.
+     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether all of the items emitted by the current
+     * {@code Observable} satisfy a condition.
      * <p>
      * <img width="640" height="264" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/all.o.png" alt="">
      * <dl>
@@ -4944,9 +5088,10 @@ public static <T, R> Observable<R> zipArray(
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates an item and returns a Boolean
-     * @return a Single that emits {@code true} if all items emitted by the source ObservableSource satisfy the
+     *            a function that evaluates an item and returns a {@code Boolean}
+     * @return a {@code Single} that emits {@code true} if all items emitted by the current {@code Observable} satisfy the
      *         predicate; otherwise, {@code false}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/all.html">ReactiveX operators documentation: All</a>
      */
     @CheckReturnValue
@@ -4958,7 +5103,7 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Mirrors the ObservableSource (current or provided) that first either emits an item or sends a termination
+     * Mirrors the current {@code Observable} or the other {@link ObservableSource} provided of which the first either emits an item or sends a termination
      * notification.
      * <p>
      * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ambWith.o.png" alt="">
@@ -4968,10 +5113,11 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
      * </dl>
      *
      * @param other
-     *            an ObservableSource competing to react first. A subscription to this provided source will occur after
+     *            an {@code ObservableSource} competing to react first. A subscription to this provided source will occur after
      *            subscribing to the current source.
-     * @return an Observable that emits the same sequence as whichever of the source ObservableSources first
+     * @return an {@code Observable} that emits the same sequence as whichever of the current {@code Observable}s first
      *         emitted an item or sent a termination notification
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
     @CheckReturnValue
@@ -4983,13 +5129,13 @@ public final Observable<T> ambWith(@NonNull ObservableSource<? extends T> other)
     }
 
     /**
-     * Returns a Single that emits {@code true} if any item emitted by the source ObservableSource satisfies a
+     * Returns a {@link Single} that emits {@code true} if any item emitted by the current {@code Observable} satisfies a
      * specified condition, otherwise {@code false}. <em>Note:</em> this always emits {@code false} if the
-     * source ObservableSource is empty.
+     * current {@code Observable} is empty.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/any.2.png" alt="">
      * <p>
-     * In Rx.Net this is the {@code any} Observer but we renamed it in RxJava to better match Java naming
+     * In Rx.Net this is the {@code any} {@link Observer} but we renamed it in RxJava to better match Java naming
      * idioms.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -4997,9 +5143,10 @@ public final Observable<T> ambWith(@NonNull ObservableSource<? extends T> other)
      * </dl>
      *
      * @param predicate
-     *            the condition to test items emitted by the source ObservableSource
-     * @return a Single that emits a Boolean that indicates whether any item emitted by the source
-     *         ObservableSource satisfies the {@code predicate}
+     *            the condition to test items emitted by the current {@code Observable}
+     * @return a {@code Single} that emits a {@link Boolean} that indicates whether any item emitted by the current
+     *         {@code Observable} satisfies the {@code predicate}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -5011,8 +5158,8 @@ public final Single<Boolean> any(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns the first item emitted by this {@code Observable}, or throws
-     * {@code NoSuchElementException} if it emits no items.
+     * Returns the first item emitted by the current {@code Observable}, or throws
+     * {@link NoSuchElementException} if it emits no items.
      * <p>
      * <img width="640" height="412" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingFirst.o.png" alt="">
      * <dl>
@@ -5020,9 +5167,9 @@ public final Single<Boolean> any(@NonNull Predicate<? super T> predicate) {
      *  <dd>{@code blockingFirst} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the first item emitted by this {@code Observable}
+     * @return the first item emitted by the current {@code Observable}
      * @throws NoSuchElementException
-     *             if this {@code Observable} emits no items
+     *             if the current {@code Observable} emits no items
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5039,7 +5186,7 @@ public final T blockingFirst() {
     }
 
     /**
-     * Returns the first item emitted by this {@code Observable}, or a default value if it emits no
+     * Returns the first item emitted by the current {@code Observable}, or a default value if it emits no
      * items.
      * <p>
      * <img width="640" height="329" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingFirst.o.default.png" alt="">
@@ -5049,8 +5196,8 @@ public final T blockingFirst() {
      * </dl>
      *
      * @param defaultItem
-     *            a default value to return if this {@code Observable} emits no items
-     * @return the first item emitted by this {@code Observable}, or the default value if it emits no
+     *            a default value to return if the current {@code Observable} emits no items
+     * @return the first item emitted by the current {@code Observable}, or the default value if it emits no
      *         items
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
@@ -5065,8 +5212,8 @@ public final T blockingFirst(@NonNull T defaultItem) {
     }
 
     /**
-     * Consumes the upstream {@code Observable} in a blocking fashion and invokes the given
-     * {@code Consumer} with each upstream item on the <em>current thread</em> until the
+     * Consumes the current {@code Observable} in a blocking fashion and invokes the given
+     * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
      * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingForEach.o.png" alt="">
@@ -5087,7 +5234,7 @@ public final T blockingFirst(@NonNull T defaultItem) {
      * </dl>
      *
      * @param onNext
-     *            the {@link Consumer} to invoke for each item emitted by the {@code Observable}
+     *            the {@code Consumer} to invoke for each item emitted by the {@code Observable}
      * @throws RuntimeException
      *             if an error occurs
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX documentation: Subscribe</a>
@@ -5101,8 +5248,8 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Consumes the upstream {@code Observable} in a blocking fashion and invokes the given
-     * {@code Consumer} with each upstream item on the <em>current thread</em> until the
+     * Consumes the current {@code Observable} in a blocking fashion and invokes the given
+     * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
      * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingForEach.o.png" alt="">
@@ -5123,18 +5270,21 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
      * </dl>
      *
      * @param onNext
-     *            the {@link Consumer} to invoke for each item emitted by the {@code Observable}
+     *            the {@code Consumer} to invoke for each item emitted by the {@code Observable}
      * @param capacityHint
      *            the number of items expected to be buffered (allows reducing buffer reallocations)
+     * @throws NullPointerException if {@code onNext} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @throws RuntimeException
-     *             if an error occurs; {@link Error}s and {@link RuntimeException}s are rethrown
-     *             as they are, checked {@link Exception}s are wrapped into {@code RuntimeException}s
+     *             if an error occurs; {@code Error}s and {@code RuntimeException}s are rethrown
+     *             as they are, checked {@code Exception}s are wrapped into {@code RuntimeException}s
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX documentation: Subscribe</a>
      * @see #subscribe(Consumer)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final void blockingForEach(@NonNull Consumer<? super T> onNext, int capacityHint) {
+        Objects.requireNonNull(onNext, "onNext is null");
         Iterator<T> it = blockingIterable(capacityHint).iterator();
         while (it.hasNext()) {
             try {
@@ -5148,7 +5298,9 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext, int capac
     }
 
     /**
-     * Converts this {@code Observable} into an {@link Iterable}.
+     * Exposes the current {@code Observable} as an {@link Iterable} which, when iterated,
+     * subscribes to the current {@code Observable} and blocks
+     * until the current {@code Observable} emits items or terminates.
      * <p>
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingIterable.o.png" alt="">
      * <dl>
@@ -5156,7 +5308,7 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext, int capac
      *  <dd>{@code blockingIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@link Iterable} version of this {@code Observable}
+     * @return the new {@code Iterable} instance
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -5167,7 +5319,9 @@ public final Iterable<T> blockingIterable() {
     }
 
     /**
-     * Converts this {@code Observable} into an {@link Iterable}.
+     * Exposes the current {@code Observable} as an {@link Iterable} which, when iterated,
+     * subscribes to the current {@code Observable} and blocks
+     * until the current {@code Observable} emits items or terminates.
      * <p>
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingIterable.o.png" alt="">
      * <dl>
@@ -5176,7 +5330,8 @@ public final Iterable<T> blockingIterable() {
      * </dl>
      *
      * @param capacityHint the expected number of items to be buffered
-     * @return an {@link Iterable} version of this {@code Observable}
+     * @return the new {@code Iterable} instance
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -5188,8 +5343,8 @@ public final Iterable<T> blockingIterable(int capacityHint) {
     }
 
     /**
-     * Returns the last item emitted by this {@code Observable}, or throws
-     * {@code NoSuchElementException} if this {@code Observable} emits no items.
+     * Returns the last item emitted by the current {@code Observable}, or throws
+     * {@link NoSuchElementException} if the current {@code Observable} emits no items.
      * <p>
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingLast.o.png" alt="">
      * <dl>
@@ -5201,9 +5356,9 @@ public final Iterable<T> blockingIterable(int capacityHint) {
      *  {@link Error}s are rethrown as they are.</dd>
      * </dl>
      *
-     * @return the last item emitted by this {@code Observable}
+     * @return the last item emitted by the current {@code Observable}
      * @throws NoSuchElementException
-     *             if this {@code Observable} emits no items
+     *             if the current {@code Observable} emits no items
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX documentation: Last</a>
      */
     @CheckReturnValue
@@ -5220,7 +5375,7 @@ public final T blockingLast() {
     }
 
     /**
-     * Returns the last item emitted by this {@code Observable}, or a default value if it emits no
+     * Returns the last item emitted by the current {@code Observable}, or a default value if it emits no
      * items.
      * <p>
      * <img width="640" height="310" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingLastDefault.o.png" alt="">
@@ -5234,7 +5389,7 @@ public final T blockingLast() {
      * </dl>
      *
      * @param defaultItem
-     *            a default value to return if this {@code Observable} emits no items
+     *            a default value to return if the current {@code Observable} emits no items
      * @return the last item emitted by the {@code Observable}, or the default value if it emits no
      *         items
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX documentation: Last</a>
@@ -5250,12 +5405,12 @@ public final T blockingLast(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns an {@link Iterable} that returns the latest item emitted by this {@code Observable},
+     * Returns an {@link Iterable} that returns the latest item emitted by the current {@code Observable},
      * waiting if necessary for one to become available.
      * <p>
      * <img width="640" height="350" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingLatest.o.png" alt="">
      * <p>
-     * If this {@code Observable} produces items faster than {@code Iterator.next} takes them,
+     * If the current {@code Observable} produces items faster than {@code Iterator.next} takes them,
      * {@code onNext} events might be skipped, but {@code onError} or {@code onComplete} events are not.
      * <p>
      * Note also that an {@code onNext} directly followed by {@code onComplete} might hide the {@code onNext}
@@ -5265,7 +5420,7 @@ public final T blockingLast(@NonNull T defaultItem) {
      *  <dd>{@code blockingLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Iterable that always returns the latest item emitted by this {@code Observable}
+     * @return an {@code Iterable} that always returns the latest item emitted by the current {@code Observable}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5276,7 +5431,7 @@ public final Iterable<T> blockingLatest() {
     }
 
     /**
-     * Returns an {@link Iterable} that always returns the item most recently emitted by this
+     * Returns an {@link Iterable} that always returns the item most recently emitted by the current
      * {@code Observable}.
      * <p>
      * <img width="640" height="426" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingMostRecent.o.png" alt="">
@@ -5286,9 +5441,9 @@ public final Iterable<T> blockingLatest() {
      * </dl>
      *
      * @param initialValue
-     *            the initial value that the {@link Iterable} sequence will yield if this
+     *            the initial value that the {@code Iterable} sequence will yield if the current
      *            {@code Observable} has not yet emitted an item
-     * @return an {@link Iterable} that on each iteration returns the item that this {@code Observable}
+     * @return an {@code Iterable} that on each iteration returns the item that the current {@code Observable}
      *         has most recently emitted
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
@@ -5300,7 +5455,7 @@ public final Iterable<T> blockingMostRecent(@NonNull T initialValue) {
     }
 
     /**
-     * Returns an {@link Iterable} that blocks until this {@code Observable} emits another item, then
+     * Returns an {@link Iterable} that blocks until the current {@code Observable} emits another item, then
      * returns that item.
      * <p>
      * <img width="640" height="427" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingNext.o.png" alt="">
@@ -5309,8 +5464,8 @@ public final Iterable<T> blockingMostRecent(@NonNull T initialValue) {
      *  <dd>{@code blockingNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@link Iterable} that blocks upon each iteration until this {@code Observable} emits
-     *         a new item, whereupon the Iterable returns that item
+     * @return an {@code Iterable} that blocks upon each iteration until the current {@code Observable} emits
+     *         a new item, whereupon the {@code Iterable} returns that item
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -5321,8 +5476,8 @@ public final Iterable<T> blockingNext() {
     }
 
     /**
-     * If this {@code Observable} completes after emitting a single item, return that item, otherwise
-     * throw a {@code NoSuchElementException}.
+     * If the current {@code Observable} completes after emitting a single item, return that item, otherwise
+     * throw a {@link NoSuchElementException}.
      * <p>
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingSingle.o.png" alt="">
      * <dl>
@@ -5334,7 +5489,7 @@ public final Iterable<T> blockingNext() {
      *  {@link Error}s are rethrown as they are.</dd>
      * </dl>
      *
-     * @return the single item emitted by this {@code Observable}
+     * @return the single item emitted by the current {@code Observable}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5349,8 +5504,8 @@ public final T blockingSingle() {
     }
 
     /**
-     * If this {@code Observable} completes after emitting a single item, return that item; if it emits
-     * more than one item, throw an {@code IllegalArgumentException}; if it emits no items, return a default
+     * If the current {@code Observable} completes after emitting a single item, return that item; if it emits
+     * more than one item, throw an {@link IllegalArgumentException}; if it emits no items, return a default
      * value.
      * <p>
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingSingleDefault.o.png" alt="">
@@ -5364,8 +5519,8 @@ public final T blockingSingle() {
      * </dl>
      *
      * @param defaultItem
-     *            a default value to return if this {@code Observable} emits no items
-     * @return the single item emitted by this {@code Observable}, or the default value if it emits no
+     *            a default value to return if the current {@code Observable} emits no items
+     * @return the single item emitted by the current {@code Observable}, or the default value if it emits no
      *         items
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
@@ -5377,13 +5532,13 @@ public final T blockingSingle(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a {@link Future} representing the only value emitted by this {@code Observable}.
+     * Returns a {@link Future} representing the only value emitted by the current {@code Observable}.
      * <p>
      * <img width="640" height="312" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/toFuture.o.png" alt="">
      * <p>
-     * If the {@link Observable} emits more than one item, {@link java.util.concurrent.Future} will receive an
-     * {@link java.lang.IndexOutOfBoundsException}. If the {@link Observable} is empty, {@link java.util.concurrent.Future}
-     * will receive an {@link java.util.NoSuchElementException}. The {@code Observable} source has to terminate in order
+     * If the {@code Observable} emits more than one item, {@code Future} will receive an
+     * {@link IndexOutOfBoundsException}. If the {@code Observable} is empty, {@code Future}
+     * will receive an {@link NoSuchElementException}. The {@code Observable} source has to terminate in order
      * for the returned {@code Future} to terminate as well.
      * <p>
      * If the {@code Observable} may emit more than one item, use {@code Observable.toList().toFuture()}.
@@ -5392,8 +5547,9 @@ public final T blockingSingle(@NonNull T defaultItem) {
      *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Future} that expects a single item to be emitted by this {@code Observable}
+     * @return a {@code Future} that expects a single item to be emitted by the current {@code Observable}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
+     * @see #singleOrErrorStage()
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -5403,7 +5559,7 @@ public final Future<T> toFuture() {
     }
 
     /**
-     * Runs the source observable to a terminal event, ignoring any values and rethrowing any exception.
+     * Runs the current {@code Observable} to a terminal event, ignoring any values and rethrowing any exception.
      * <p>
      * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingSubscribe.o.0.png" alt="">
      * <p>
@@ -5430,8 +5586,8 @@ public final void blockingSubscribe() {
      * <img width="640" height="393" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingSubscribe.o.1.png" alt="">
      * <p>
      * If the {@code Observable} emits an error, it is wrapped into an
-     * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * {@link OnErrorNotImplementedException}
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * Using the overloads {@link #blockingSubscribe(Consumer, Consumer)}
      * or {@link #blockingSubscribe(Consumer, Consumer, Action)} instead is recommended.
      * <p>
@@ -5510,18 +5666,20 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      * </dl>
      * The a dispose() call is composed through.
      * @param observer the {@code Observer} instance to forward events and calls to in the current thread
+     * @throws NullPointerException if {@code observer} is {@code null}
      * @since 2.0
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
+        Objects.requireNonNull(observer, "observer is null");
         ObservableBlockingSubscribe.subscribe(this, observer);
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping buffers, each containing {@code count} items. When the source
-     * ObservableSource completes, the resulting ObservableSource emits the current buffer and propagates the notification
-     * from the source ObservableSource. Note that if the source ObservableSource issues an onError notification
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping buffers, each containing {@code count} items. When the current
+     * {@code Observable} completes, the resulting {@code Observable} emits the current buffer and propagates the notification
+     * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
@@ -5532,8 +5690,9 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
      *
      * @param count
      *            the maximum number of items in each buffer before it should be emitted
-     * @return an Observable that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the source ObservableSource
+     * @return an {@code Observable} that emits connected, non-overlapping buffers, each containing at most
+     *         {@code count} items from the current {@code Observable}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5544,10 +5703,10 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits buffers every {@code skip} items, each containing {@code count} items. When the source
-     * ObservableSource completes, the resulting ObservableSource emits the current buffer and propagates the notification
-     * from the source ObservableSource. Note that if the source ObservableSource issues an onError notification
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits buffers every {@code skip} items, each containing {@code count} items. When the current
+     * {@code Observable} completes, the resulting {@code Observable} emits the current buffer and propagates the notification
+     * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
@@ -5559,11 +5718,12 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
      * @param count
      *            the maximum size of each buffer before it should be emitted
      * @param skip
-     *            how many items emitted by the source ObservableSource should be skipped before starting a new
+     *            how many items emitted by the current {@code Observable} should be skipped before starting a new
      *            buffer. Note that when {@code skip} and {@code count} are equal, this is the same operation as
      *            {@link #buffer(int)}.
-     * @return an Observable that emits buffers for every {@code skip} item from the source ObservableSource and
+     * @return an {@code Observable} that emits buffers for every {@code skip} item from the current {@code Observable} and
      *         containing at most {@code count} items
+     * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5574,10 +5734,10 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits buffers every {@code skip} items, each containing {@code count} items. When the source
-     * ObservableSource completes, the resulting ObservableSource emits the current buffer and propagates the notification
-     * from the source ObservableSource. Note that if the source ObservableSource issues an onError notification
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits buffers every {@code skip} items, each containing {@code count} items. When the current
+     * {@code Observable} completes, the resulting {@code Observable} emits the current buffer and propagates the notification
+     * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
@@ -5590,14 +5750,16 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
      * @param count
      *            the maximum size of each buffer before it should be emitted
      * @param skip
-     *            how many items emitted by the source ObservableSource should be skipped before starting a new
+     *            how many items emitted by the current {@code Observable} should be skipped before starting a new
      *            buffer. Note that when {@code skip} and {@code count} are equal, this is the same operation as
      *            {@link #buffer(int)}.
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an Observable that emits buffers for every {@code skip} item from the source ObservableSource and
+     * @return an {@code Observable} that emits buffers for every {@code skip} item from the current {@code Observable} and
      *         containing at most {@code count} items
+     * @throws NullPointerException if {@code bufferSupplier} is {@code null}
+     * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5611,10 +5773,10 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping buffers, each containing {@code count} items. When the source
-     * ObservableSource completes, the resulting ObservableSource emits the current buffer and propagates the notification
-     * from the source ObservableSource. Note that if the source ObservableSource issues an onError notification
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping buffers, each containing {@code count} items. When the current
+     * {@code Observable} completes, the resulting {@code Observable} emits the current buffer and propagates the notification
+     * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
@@ -5629,8 +5791,10 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an Observable that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the source ObservableSource
+     * @return an {@code Observable} that emits connected, non-overlapping buffers, each containing at most
+     *         {@code count} items from the current {@code Observable}
+     * @throws NullPointerException if {@code bufferSupplier} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5641,11 +5805,11 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource starts a new buffer periodically, as determined by the {@code timeskip} argument. It emits
-     * each buffer after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * ObservableSource completes, the resulting ObservableSource emits the current buffer and propagates the notification
-     * from the source ObservableSource. Note that if the source ObservableSource issues an onError notification
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} starts a new buffer periodically, as determined by the {@code timeskip} argument. It emits
+     * each buffer after a fixed timespan, specified by the {@code timespan} argument. When the current
+     * {@code Observable} completes, the resulting {@code Observable} emits the current buffer and propagates the notification
+     * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.png" alt="">
@@ -5660,8 +5824,9 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the period of time after which a new buffer will be created
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
-     * @return an Observable that emits new buffers of items emitted by the source ObservableSource periodically after
+     * @return an {@code Observable} that emits new buffers of items emitted by the current {@code Observable} periodically after
      *         a fixed timespan has elapsed
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5672,12 +5837,12 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
      * specified {@code scheduler}. It emits each buffer after a fixed timespan, specified by the
-     * {@code timespan} argument. When the source ObservableSource completes, the resulting ObservableSource emits the
-     * current buffer and propagates the notification from the source ObservableSource. Note that if the source
-     * ObservableSource issues an onError notification the event is passed on immediately without first emitting the
+     * {@code timespan} argument. When the current {@code Observable} completes, the resulting {@code Observable} emits the
+     * current buffer and propagates the notification from the current {@code Observable}. Note that if the current
+     * {@code Observable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.png" alt="">
@@ -5693,9 +5858,10 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
-     * @return an Observable that emits new buffers of items emitted by the source ObservableSource periodically after
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
+     * @return an {@code Observable} that emits new buffers of items emitted by the current {@code Observable} periodically after
      *         a fixed timespan has elapsed
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5706,12 +5872,12 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
      * specified {@code scheduler}. It emits each buffer after a fixed timespan, specified by the
-     * {@code timespan} argument. When the source ObservableSource completes, the resulting ObservableSource emits the
-     * current buffer and propagates the notification from the source ObservableSource. Note that if the source
-     * ObservableSource issues an onError notification the event is passed on immediately without first emitting the
+     * {@code timespan} argument. When the current {@code Observable} completes, the resulting {@code Observable} emits the
+     * current buffer and propagates the notification from the current {@code Observable}. Note that if the current
+     * {@code Observable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.png" alt="">
@@ -5728,12 +5894,13 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an Observable that emits new buffers of items emitted by the source ObservableSource periodically after
+     * @return an {@code Observable} that emits new buffers of items emitted by the current {@code Observable} periodically after
      *         a fixed timespan has elapsed
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code bufferSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5747,11 +5914,11 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping buffers, each of a fixed duration specified by the
-     * {@code timespan} argument. When the source ObservableSource completes, the resulting ObservableSource emits the
-     * current buffer and propagates the notification from the source ObservableSource. Note that if the source
-     * ObservableSource issues an onError notification the event is passed on immediately without first emitting the
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * {@code timespan} argument. When the current {@code Observable} completes, the resulting {@code Observable} emits the
+     * current buffer and propagates the notification from the current {@code Observable}. Note that if the current
+     * {@code Observable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.png" alt="">
@@ -5765,8 +5932,8 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            buffer
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
-     * @return an Observable that emits connected, non-overlapping buffers of items emitted by the source
-     *         ObservableSource within a fixed duration
+     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Observable} within a fixed duration
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5777,12 +5944,12 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source ObservableSource completes, the resulting ObservableSource emits the current buffer and
-     * propagates the notification from the source ObservableSource. Note that if the source ObservableSource issues an
-     * onError notification the event is passed on immediately without first emitting the buffer it is in the process of
+     * first). When the current {@code Observable} completes, the resulting {@code Observable} emits the current buffer and
+     * propagates the notification from the current {@code Observable}. Note that if the current {@code Observable} issues an
+     * {@code onError} notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.png" alt="">
@@ -5798,8 +5965,8 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the unit of time which applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return an Observable that emits connected, non-overlapping buffers of items emitted by the source
-     *         ObservableSource, after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
+     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Observable}, after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -5811,12 +5978,12 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
      * {@code timespan} argument as measured on the specified {@code scheduler}, or a maximum size specified by
-     * the {@code count} argument (whichever is reached first). When the source ObservableSource completes, the resulting
-     * ObservableSource emits the current buffer and propagates the notification from the source ObservableSource. Note
-     * that if the source ObservableSource issues an onError notification the event is passed on immediately without
+     * the {@code count} argument (whichever is reached first). When the current {@code Observable} completes, the resulting
+     * {@code Observable} emits the current buffer and propagates the notification from the current {@code Observable}. Note
+     * that if the current {@code Observable} issues an {@code onError} notification the event is passed on immediately without
      * first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
@@ -5831,11 +5998,11 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param unit
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return an Observable that emits connected, non-overlapping buffers of items emitted by the source
-     *         ObservableSource after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
+     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Observable} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -5847,12 +6014,12 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
      * {@code timespan} argument as measured on the specified {@code scheduler}, or a maximum size specified by
-     * the {@code count} argument (whichever is reached first). When the source ObservableSource completes, the resulting
-     * ObservableSource emits the current buffer and propagates the notification from the source ObservableSource. Note
-     * that if the source ObservableSource issues an onError notification the event is passed on immediately without
+     * the {@code count} argument (whichever is reached first). When the current {@code Observable} completes, the resulting
+     * {@code Observable} emits the current buffer and propagates the notification from the current {@code Observable}. Note
+     * that if the current {@code Observable} issues an {@code onError} notification the event is passed on immediately without
      * first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
@@ -5868,17 +6035,19 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param unit
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
      * @param count
      *            the maximum size of each buffer before it is emitted
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @param restartTimerOnMaxSize if true the time window is restarted when the max capacity of the current buffer
+     * @param restartTimerOnMaxSize if {@code true}, the time window is restarted when the max capacity of the current buffer
      *            is reached
-     * @return an Observable that emits connected, non-overlapping buffers of items emitted by the source
-     *         ObservableSource after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
+     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Observable} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code bufferSupplier} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5897,11 +6066,11 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping buffers, each of a fixed duration specified by the
-     * {@code timespan} argument and on the specified {@code scheduler}. When the source ObservableSource completes,
-     * the resulting ObservableSource emits the current buffer and propagates the notification from the source
-     * ObservableSource. Note that if the source ObservableSource issues an onError notification the event is passed on
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * {@code timespan} argument and on the specified {@code scheduler}. When the current {@code Observable} completes,
+     * the resulting {@code Observable} emits the current buffer and propagates the notification from the current
+     * {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.s.png" alt="">
@@ -5916,9 +6085,10 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param unit
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a buffer
-     * @return an Observable that emits connected, non-overlapping buffers of items emitted by the source
-     *         ObservableSource within a fixed duration
+     *            the {@code Scheduler} to use when determining the end and start of a buffer
+     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Observable} within a fixed duration
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5929,10 +6099,10 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits buffers that it creates when the specified {@code openingIndicator} ObservableSource emits an
-     * item, and closes when the ObservableSource returned from {@code closingIndicator} emits an item. If any of the
-     * source ObservableSource, {@code openingIndicator} or {@code closingIndicator} issues an onError notification the
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits buffers that it creates when the specified {@code openingIndicator} {@link ObservableSource} emits an
+     * item, and closes when the {@code ObservableSource} returned from {@code closingIndicator} emits an item. If any of the
+     * current {@code Observable}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the
      * event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
@@ -5941,15 +6111,16 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <TOpening> the element type of the buffer-opening ObservableSource
-     * @param <TClosing> the element type of the individual buffer-closing ObservableSources
+     * @param <TOpening> the element type of the buffer-opening {@code ObservableSource}
+     * @param <TClosing> the element type of the individual buffer-closing {@code ObservableSource}s
      * @param openingIndicator
-     *            the ObservableSource that, when it emits an item, causes a new buffer to be created
+     *            the {@code ObservableSource} that, when it emits an item, causes a new buffer to be created
      * @param closingIndicator
-     *            the {@link Function} that is used to produce an ObservableSource for every buffer created. When this
-     *            ObservableSource emits an item, the associated buffer is emitted.
-     * @return an Observable that emits buffers, containing items from the source ObservableSource, that are created
-     *         and closed when the specified ObservableSources emit items
+     *            the {@link Function} that is used to produce an {@code ObservableSource} for every buffer created. When this indicator
+     *            {@code ObservableSource} emits an item, the associated buffer is emitted.
+     * @return an {@code Observable} that emits buffers, containing items from the current {@code Observable}, that are created
+     *         and closed when the specified {@code ObservableSource}s emit items
+     * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5962,10 +6133,10 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits buffers of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits buffers that it creates when the specified {@code openingIndicator} ObservableSource emits an
-     * item, and closes when the ObservableSource returned from {@code closingIndicator} emits an item. If any of the
-     * source ObservableSource, {@code openingIndicator} or {@code closingIndicator} issues an onError notification the
+     * Returns an {@code Observable} that emits buffers of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits buffers that it creates when the specified {@code openingIndicator} {@link ObservableSource} emits an
+     * item, and closes when the {@code ObservableSource} returned from {@code closingIndicator} emits an item. If any of the
+     * current {@code Observable}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the
      * event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
@@ -5975,18 +6146,19 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * </dl>
      *
      * @param <U> the collection subclass type to buffer into
-     * @param <TOpening> the element type of the buffer-opening ObservableSource
-     * @param <TClosing> the element type of the individual buffer-closing ObservableSources
+     * @param <TOpening> the element type of the buffer-opening {@code ObservableSource}
+     * @param <TClosing> the element type of the individual buffer-closing {@code ObservableSource}s
      * @param openingIndicator
-     *            the ObservableSource that, when it emits an item, causes a new buffer to be created
+     *            the {@code ObservableSource} that, when it emits an item, causes a new buffer to be created
      * @param closingIndicator
-     *            the {@link Function} that is used to produce an ObservableSource for every buffer created. When this
-     *            ObservableSource emits an item, the associated buffer is emitted.
+     *            the {@link Function} that is used to produce an {@code ObservableSource} for every buffer created. When this indicator
+     *            {@code ObservableSource} emits an item, the associated buffer is emitted.
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an Observable that emits buffers, containing items from the source ObservableSource, that are created
-     *         and closed when the specified ObservableSources emit items
+     * @return an {@code Observable} that emits buffers, containing items from the current {@code Observable}, that are created
+     *         and closed when the specified {@code ObservableSource}s emit items
+     * @throws NullPointerException if {@code openingIndicator}, {@code closingIndicator} or {@code bufferSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6003,14 +6175,14 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits non-overlapping buffered items from the source ObservableSource each time the
-     * specified boundary ObservableSource emits an item.
+     * Returns an {@code Observable} that emits non-overlapping buffered items from the current {@code Observable} each time the
+     * specified boundary {@link ObservableSource} emits an item.
      * <p>
      * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
      * <p>
-     * Completion of either the source or the boundary ObservableSource causes the returned ObservableSource to emit the
-     * latest buffer and complete. If either the source ObservableSource or the boundary ObservableSource issues an
-     * onError notification the event is passed on immediately without first emitting the buffer it is in the process of
+     * Completion of either the source or the boundary {@code ObservableSource} causes the returned {@code ObservableSource} to emit the
+     * latest buffer and complete. If either the current {@code Observable} or the boundary {@code ObservableSource} issues an
+     * {@code onError} notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -6020,8 +6192,8 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param <B>
      *            the boundary value type (ignored)
      * @param boundary
-     *            the boundary ObservableSource
-     * @return an Observable that emits buffered items from the source ObservableSource when the boundary ObservableSource
+     *            the boundary {@code ObservableSource}
+     * @return an {@code Observable} that emits buffered items from the current {@code Observable} when the boundary {@code ObservableSource}
      *         emits an item
      * @see #buffer(ObservableSource, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6034,14 +6206,14 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits non-overlapping buffered items from the source ObservableSource each time the
-     * specified boundary ObservableSource emits an item.
+     * Returns an {@code Observable} that emits non-overlapping buffered items from the current {@code Observable} each time the
+     * specified boundary {@link ObservableSource} emits an item.
      * <p>
      * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
      * <p>
-     * Completion of either the source or the boundary ObservableSource causes the returned ObservableSource to emit the
-     * latest buffer and complete. If either the source ObservableSource or the boundary ObservableSource issues an
-     * onError notification the event is passed on immediately without first emitting the buffer it is in the process of
+     * Completion of either the source or the boundary {@code ObservableSource} causes the returned {@code ObservableSource} to emit the
+     * latest buffer and complete. If either the current {@code Observable} or the boundary {@code ObservableSource} issues an
+     * {@code onError} notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -6051,12 +6223,14 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param <B>
      *            the boundary value type (ignored)
      * @param boundary
-     *            the boundary ObservableSource
+     *            the boundary {@code ObservableSource}
      * @param initialCapacity
      *            the initial capacity of each buffer chunk
-     * @return an Observable that emits buffered items from the source ObservableSource when the boundary ObservableSource
+     * @return an {@code Observable} that emits buffered items from the current {@code Observable} when the boundary {@code ObservableSource}
      *         emits an item
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
+     * @throws NullPointerException if {@code boundary} is {@code null}
+     * @throws IllegalArgumentException if {@code initialCapacity} is non-positive
      * @see #buffer(ObservableSource)
      */
     @CheckReturnValue
@@ -6068,14 +6242,14 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that emits non-overlapping buffered items from the source ObservableSource each time the
-     * specified boundary ObservableSource emits an item.
+     * Returns an {@code Observable} that emits non-overlapping buffered items from the current {@code Observable} each time the
+     * specified boundary {@link ObservableSource} emits an item.
      * <p>
      * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
      * <p>
-     * Completion of either the source or the boundary ObservableSource causes the returned ObservableSource to emit the
-     * latest buffer and complete. If either the source ObservableSource or the boundary ObservableSource issues an
-     * onError notification the event is passed on immediately without first emitting the buffer it is in the process of
+     * Completion of either the source or the boundary {@code ObservableSource} causes the returned {@code ObservableSource} to emit the
+     * latest buffer and complete. If either the current {@code Observable} or the boundary {@code ObservableSource} issues an
+     * {@code onError} notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -6086,12 +6260,13 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param <B>
      *            the boundary value type (ignored)
      * @param boundary
-     *            the boundary ObservableSource
+     *            the boundary {@code ObservableSource}
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an Observable that emits buffered items from the source ObservableSource when the boundary ObservableSource
+     * @return an {@code Observable} that emits buffered items from the current {@code Observable} when the boundary {@code ObservableSource}
      *         emits an item
+     * @throws NullPointerException if {@code boundary} or {@code bufferSupplier} is {@code null}
      * @see #buffer(ObservableSource, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6105,23 +6280,23 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     }
 
     /**
-     * Returns an Observable that subscribes to this ObservableSource lazily, caches all of its events
-     * and replays them, in the same order as received, to all the downstream subscribers.
+     * Returns an {@code Observable} that subscribes to the current {@code Observable} lazily, caches all of its events
+     * and replays them, in the same order as received, to all the downstream observers.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.png" alt="">
      * <p>
-     * This is useful when you want an ObservableSource to cache responses and you can't control the
+     * This is useful when you want an {@code Observable} to cache responses and you can't control the
      * subscribe/dispose behavior of all the {@link Observer}s.
      * <p>
-     * The operator subscribes only when the first downstream subscriber subscribes and maintains
-     * a single subscription towards this ObservableSource. In contrast, the operator family of {@link #replay()}
+     * The operator subscribes only when the first downstream observer subscribes and maintains
+     * a single subscription towards the current {@code Observable}. In contrast, the operator family of {@link #replay()}
      * that return a {@link ConnectableObservable} require an explicit call to {@link ConnectableObservable#connect()}.
      * <p>
      * <em>Note:</em> You sacrifice the ability to dispose the origin when you use the {@code cache}
-     * Observer so be careful not to use this Observer on ObservableSources that emit an infinite or very large number
+     * operator so be careful not to use this operator on {@code Observable}s that emit an infinite or very large number
      * of items that will use up memory.
-     * A possible workaround is to apply `takeUntil` with a predicate or
-     * another source before (and perhaps after) the application of cache().
+     * A possible workaround is to apply {@code takeUntil} with a predicate or
+     * another source before (and perhaps after) the application of {@code cache()}.
      * <pre><code>
      * AtomicBoolean shouldStop = new AtomicBoolean();
      *
@@ -6148,9 +6323,11 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *  <dd>{@code cache} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Observable that, when first subscribed to, caches all of its items and notifications for the
+     * @return an {@code Observable} that, when first subscribed to, caches all of its items and notifications for the
      *         benefit of subsequent subscribers
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
+     * @see #takeUntil(Predicate)
+     * @see #takeUntil(ObservableSource)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -6160,23 +6337,23 @@ public final Observable<T> cache() {
     }
 
     /**
-     * Returns an Observable that subscribes to this ObservableSource lazily, caches all of its events
-     * and replays them, in the same order as received, to all the downstream subscribers.
+     * Returns an {@code Observable} that subscribes to the current {@code Observable} lazily, caches all of its events
+     * and replays them, in the same order as received, to all the downstream observers.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cacheWithInitialCapacity.o.png" alt="">
      * <p>
-     * This is useful when you want an ObservableSource to cache responses and you can't control the
+     * This is useful when you want an {@code Observable} to cache responses and you can't control the
      * subscribe/dispose behavior of all the {@link Observer}s.
      * <p>
-     * The operator subscribes only when the first downstream subscriber subscribes and maintains
-     * a single subscription towards this ObservableSource. In contrast, the operator family of {@link #replay()}
+     * The operator subscribes only when the first downstream observer subscribes and maintains
+     * a single subscription towards the current {@code Observable}. In contrast, the operator family of {@link #replay()}
      * that return a {@link ConnectableObservable} require an explicit call to {@link ConnectableObservable#connect()}.
      * <p>
      * <em>Note:</em> You sacrifice the ability to dispose the origin when you use the {@code cache}
-     * Observer so be careful not to use this Observer on ObservableSources that emit an infinite or very large number
+     * operator so be careful not to use this operator on {@code Observable}s that emit an infinite or very large number
      * of items that will use up memory.
      * A possible workaround is to apply `takeUntil` with a predicate or
-     * another source before (and perhaps after) the application of cache().
+     * another source before (and perhaps after) the application of {@code cache()}.
      * <pre><code>
      * AtomicBoolean shouldStop = new AtomicBoolean();
      *
@@ -6207,9 +6384,12 @@ public final Observable<T> cache() {
      * {@link #replay(int)} in combination with {@link ConnectableObservable#autoConnect()} or similar.
      *
      * @param initialCapacity hint for number of items to cache (for optimizing underlying data structure)
-     * @return an Observable that, when first subscribed to, caches all of its items and notifications for the
+     * @return an {@code Observable} that, when first subscribed to, caches all of its items and notifications for the
      *         benefit of subsequent subscribers
+     * @throws IllegalArgumentException if {@code initialCapacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
+     * @see #takeUntil(Predicate)
+     * @see #takeUntil(ObservableSource)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -6220,7 +6400,7 @@ public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
     }
 
     /**
-     * Returns an Observable that emits the items emitted by the source ObservableSource, converted to the specified
+     * Returns an {@code Observable} that emits the items emitted by the current {@code Observable}, converted to the specified
      * type.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cast.png" alt="">
@@ -6231,10 +6411,11 @@ public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
      *
      * @param <U> the output value type cast to
      * @param clazz
-     *            the target class type that {@code cast} will cast the items emitted by the source ObservableSource
-     *            into before emitting them from the resulting ObservableSource
-     * @return an Observable that emits each item from the source ObservableSource after converting it to the
+     *            the target class type that {@code cast} will cast the items emitted by the current {@code Observable}
+     *            into before emitting them from the resulting {@code Observable}
+     * @return an {@code Observable} that emits each item from the current {@code Observable} after converting it to the
      *         specified type
+     * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
     @CheckReturnValue
@@ -6246,8 +6427,8 @@ public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
     }
 
     /**
-     * Collects items emitted by the finite source ObservableSource into a single mutable data structure and returns
-     * a Single that emits this structure.
+     * Collects items emitted by the finite source {@code Observable} into a single mutable data structure and returns
+     * a {@link Single} that emits this structure.
      * <p>
      * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collect.2.png" alt="">
      * <p>
@@ -6255,7 +6436,7 @@ public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code collect} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6265,10 +6446,11 @@ public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
      * @param initialValueSupplier
      *           the mutable data structure that will collect the items
      * @param collector
-     *           a function that accepts the {@code state} and an emitted item, and modifies {@code state}
+     *           a function that accepts the {@code state} and an emitted item, and modifies the accumulator accordingly
      *           accordingly
-     * @return a Single that emits the result of collecting the values emitted by the source ObservableSource
+     * @return a {@code Single} that emits the result of collecting the values emitted by the current {@code Observable}
      *         into a single mutable data structure
+     * @throws NullPointerException if {@code initialValueSupplier} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      */
     @CheckReturnValue
@@ -6281,8 +6463,8 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialValueSu
     }
 
     /**
-     * Collects items emitted by the finite source ObservableSource into a single mutable data structure and returns
-     * a Single that emits this structure.
+     * Collects items emitted by the finite source {@code Observable} into a single mutable data structure and returns
+     * a {@link Single} that emits this structure.
      * <p>
      * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collectInto.o.png" alt="">
      * <p>
@@ -6290,7 +6472,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialValueSu
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code collectInto} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6300,10 +6482,11 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialValueSu
      * @param initialValue
      *           the mutable data structure that will collect the items
      * @param collector
-     *           a function that accepts the {@code state} and an emitted item, and modifies {@code state}
+     *           a function that accepts the {@code state} and an emitted item, and modifies the accumulator accordingly
      *           accordingly
-     * @return a Single that emits the result of collecting the values emitted by the source ObservableSource
+     * @return a {@code Single} that emits the result of collecting the values emitted by the current {@code Observable}
      *         into a single mutable data structure
+     * @throws NullPointerException if {@code initialValue} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      */
     @CheckReturnValue
@@ -6315,22 +6498,23 @@ public final <U> Single<U> collectInto(@NonNull U initialValue, @NonNull BiConsu
     }
 
     /**
-     * Transform an ObservableSource by applying a particular Transformer function to it.
+     * Transform the current {@code Observable} by applying a particular {@link ObservableTransformer} function to it.
      * <p>
-     * This method operates on the ObservableSource itself whereas {@link #lift} operates on the ObservableSource's
-     * Observers.
+     * This method operates on the {@code Observable} itself whereas {@link #lift} operates on the {@link ObservableSource}'s
+     * {@link Observer}s.
      * <p>
-     * If the operator you are creating is designed to act on the individual items emitted by a source
-     * ObservableSource, use {@link #lift}. If your operator is designed to transform the source ObservableSource as a whole
+     * If the operator you are creating is designed to act on the individual items emitted by the current
+     * {@code Observable}, use {@link #lift}. If your operator is designed to transform the current {@code Observable} as a whole
      * (for instance, by applying a particular set of existing RxJava operators to it) use {@code compose}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code compose} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the output ObservableSource
-     * @param composer implements the function that transforms the source ObservableSource
-     * @return the source ObservableSource, transformed by the transformer function
+     * @param <R> the value type of the output {@code ObservableSource}
+     * @param composer implements the function that transforms the current {@code Observable}
+     * @return the current {@code Observable}, transformed by the transformer function
+     * @throws NullPointerException if {@code composer} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
      */
     @SuppressWarnings("unchecked")
@@ -6342,9 +6526,9 @@ public final <R> Observable<R> compose(@NonNull ObservableTransformer<? super T,
     }
 
     /**
-     * Returns a new Observable that emits items resulting from applying a function that you supply to each item
-     * emitted by the source ObservableSource, where that function returns an ObservableSource, and then emitting the items
-     * that result from concatenating those resulting ObservableSources.
+     * Returns a new {@code Observable} that emits items resulting from applying a function that you supply to each item
+     * emitted by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then emitting the items
+     * that result from concatenating those returned {@code ObservableSource}s.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <p>
@@ -6356,12 +6540,13 @@ public final <R> Observable<R> compose(@NonNull ObservableTransformer<? super T,
      *  <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the type of the inner ObservableSource sources and thus the output type
+     * @param <R> the type of the inner {@code ObservableSource} sources and thus the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
-     * @return an Observable that emits the result of applying the transformation function to each item emitted
-     *         by the source ObservableSource and concatenating the ObservableSources obtained from this transformation
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
+     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
+     *         by the current {@code Observable} and concatenating the {@code ObservableSource}s obtained from this transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #concatMap(Function, int, Scheduler)
      */
@@ -6373,9 +6558,9 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Returns a new Observable that emits items resulting from applying a function that you supply to each item
-     * emitted by the source ObservableSource, where that function returns an ObservableSource, and then emitting the items
-     * that result from concatenating those resulting ObservableSources.
+     * Returns a new {@code Observable} that emits items resulting from applying a function that you supply to each item
+     * emitted by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then emitting the items
+     * that result from concatenating those returned {@code ObservableSource}s.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <p>
@@ -6387,23 +6572,25 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
      *  <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the type of the inner ObservableSource sources and thus the output type
+     * @param <R> the type of the inner {@code ObservableSource} sources and thus the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
-     * @param prefetch
-     *            the number of elements to prefetch from the current Observable
-     * @return an Observable that emits the result of applying the transformation function to each item emitted
-     *         by the source ObservableSource and concatenating the ObservableSources obtained from this transformation
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
+     * @param bufferSize
+     *            the number of elements expected from the current {@code Observable} to be buffered
+     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
+     *         by the current {@code Observable} and concatenating the {@code ObservableSource}s obtained from this transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #concatMap(Function, int, Scheduler)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int prefetch) {
+    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
             @SuppressWarnings("unchecked")
             T v = ((ScalarSupplier<T>)this).get();
@@ -6412,13 +6599,13 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
             }
             return ObservableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new ObservableConcatMap<>(this, mapper, prefetch, ErrorMode.IMMEDIATE));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMap<>(this, mapper, bufferSize, ErrorMode.IMMEDIATE));
     }
 
     /**
-     * Returns a new Observable that emits items resulting from applying a function that you supply to each item
-     * emitted by the source ObservableSource, where that function returns an ObservableSource, and then emitting the items
-     * that result from concatenating those resulting ObservableSources.
+     * Returns a new {@code Observable} that emits items resulting from applying a function that you supply to each item
+     * emitted by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then emitting the items
+     * that result from concatenating those returned {@code ObservableSource}s.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <p>
@@ -6429,33 +6616,35 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
      *  <dd>{@code concatMap} executes the given {@code mapper} function on the provided {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the type of the inner ObservableSource sources and thus the output type
+     * @param <R> the type of the inner {@code ObservableSource} sources and thus the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
-     * @param prefetch
-     *            the number of elements to prefetch from the current Observable
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
+     * @param bufferSize
+     *            the number of elements expected from the current {@code Observable} to be buffered
      * @param scheduler
      *            the scheduler where the {@code mapper} function will be executed
-     * @return an Observable that emits the result of applying the transformation function to each item emitted
-     *         by the source ObservableSource and concatenating the ObservableSources obtained from this transformation
+     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
+     *         by the current {@code Observable} and concatenating the {@code ObservableSource}s obtained from this transformation
+     * @throws NullPointerException if {@code mapper} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @since 3.0.0
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int prefetch, @NonNull Scheduler scheduler) {
+    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<>(this, mapper, prefetch, ErrorMode.IMMEDIATE, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<>(this, mapper, bufferSize, ErrorMode.IMMEDIATE, scheduler));
     }
 
     /**
-     * Maps each of the items into an ObservableSource, subscribes to them one after the other,
+     * Maps each of the items into an {@link ObservableSource}, subscribes to them one after the other,
      * one at a time and emits their values in order
-     * while delaying any error from either this or any of the inner ObservableSources
+     * while delaying any error from either this or any of the inner {@code ObservableSource}s
      * till all of them terminate.
      * <p>
      * <img width="640" height="347" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapDelayError.o.png" alt="">
@@ -6469,8 +6658,9 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
      * </dl>
      *
      * @param <R> the result value type
-     * @param mapper the function that maps the items of this ObservableSource into the inner ObservableSources.
-     * @return the new ObservableSource instance with the concatenation behavior
+     * @param mapper the function that maps the items of the current {@code Observable} into the inner {@code ObservableSource}s.
+     * @return the new {@code Observable} instance with the concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapDelayError(Function, boolean, int, Scheduler)
      */
     @CheckReturnValue
@@ -6481,9 +6671,9 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
     }
 
     /**
-     * Maps each of the items into an ObservableSource, subscribes to them one after the other,
+     * Maps each of the items into an {@link ObservableSource}, subscribes to them one after the other,
      * one at a time and emits their values in order
-     * while delaying any error from either this or any of the inner ObservableSources
+     * while delaying any error from either this or any of the inner {@code ObservableSource}s
      * till all of them terminate.
      * <p>
      * <img width="640" height="347" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapDelayError.o.png" alt="">
@@ -6497,22 +6687,24 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
      * </dl>
      *
      * @param <R> the result value type
-     * @param mapper the function that maps the items of this ObservableSource into the inner ObservableSources.
+     * @param mapper the function that maps the items of the current {@code Observable} into the inner {@code ObservableSource}s.
      * @param tillTheEnd
-     *            if true, all errors from the outer and inner ObservableSource sources are delayed until the end,
-     *            if false, an error from the main source is signalled when the current ObservableSource source terminates
-     * @param prefetch
-     *            the number of elements to prefetch from the current Observable
-     * @return the new ObservableSource instance with the concatenation behavior
+     *            if {@code true}, all errors from the outer and inner {@code ObservableSource} sources are delayed until the end,
+     *            if {@code false}, an error from the main source is signaled when the current {@code Observable} source terminates
+     * @param bufferSize
+     *            the number of elements expected from the current {@code Observable} to be buffered
+     * @return the new {@code Observable} instance with the concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapDelayError(Function, boolean, int, Scheduler)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
-            boolean tillTheEnd, int prefetch) {
+            boolean tillTheEnd, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
             @SuppressWarnings("unchecked")
             T v = ((ScalarSupplier<T>)this).get();
@@ -6521,13 +6713,13 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
             }
             return ObservableScalarXMap.scalarXMap(v, mapper);
         }
-        return RxJavaPlugins.onAssembly(new ObservableConcatMap<>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMap<>(this, mapper, bufferSize, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
     }
 
     /**
-     * Maps each of the items into an ObservableSource, subscribes to them one after the other,
+     * Maps each of the items into an {@link ObservableSource}, subscribes to them one after the other,
      * one at a time and emits their values in order
-     * while delaying any error from either this or any of the inner ObservableSources
+     * while delaying any error from either this or any of the inner {@code ObservableSource}s
      * till all of them terminate.
      * <p>
      * <img width="640" height="347" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapDelayError.o.png" alt="">
@@ -6537,15 +6729,17 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
      * </dl>
      *
      * @param <R> the result value type
-     * @param mapper the function that maps the items of this ObservableSource into the inner ObservableSources.
+     * @param mapper the function that maps the items of the current {@code Observable} into the inner {@code ObservableSource}s.
      * @param tillTheEnd
-     *            if true, all errors from the outer and inner ObservableSource sources are delayed until the end,
-     *            if false, an error from the main source is signalled when the current ObservableSource source terminates
-     * @param prefetch
-     *            the number of elements to prefetch from the current Observable
+     *            if {@code true}, all errors from the outer and inner {@code ObservableSource} sources are delayed until the end,
+     *            if {@code false}, an error from the main source is signaled when the current {@code Observable} source terminates
+     * @param bufferSize
+     *            the number of elements expected from the current {@code Observable} to be buffered
      * @param scheduler
      *            the scheduler where the {@code mapper} function will be executed
-     * @return the new ObservableSource instance with the concatenation behavior
+     * @return the new {@code Observable} instance with the concatenation behavior
+     * @throws NullPointerException if {@code mapper} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapDelayError(Function, boolean, int)
      * @since 3.0.0
      */
@@ -6553,19 +6747,19 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
-            boolean tillTheEnd, int prefetch, @NonNull Scheduler scheduler) {
+            boolean tillTheEnd, int bufferSize, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<>(this, mapper, prefetch, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapScheduler<>(this, mapper, bufferSize, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, scheduler));
     }
 
     /**
-     * Maps a sequence of values into ObservableSources and concatenates these ObservableSources eagerly into a single
-     * ObservableSource.
+     * Maps a sequence of values into {@link ObservableSource}s and concatenates these {@code ObservableSource}s eagerly into a single
+     * {@code Observable} sequence.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source ObservableSources. The operator buffers the values emitted by these ObservableSources and then drains them in
+     * current {@code Observable}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them in
      * order, each one after the previous one completes.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapEager.o.png" alt="">
@@ -6574,9 +6768,10 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the value type
-     * @param mapper the function that maps a sequence of values into a sequence of ObservableSources that will be
+     * @param mapper the function that maps a sequence of values into a sequence of {@code ObservableSource}s that will be
      *               eagerly concatenated
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -6587,11 +6782,11 @@ public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? ext
     }
 
     /**
-     * Maps a sequence of values into ObservableSources and concatenates these ObservableSources eagerly into a single
-     * ObservableSource.
+     * Maps a sequence of values into {@link ObservableSource}s and concatenates these {@code ObservableSource}s eagerly into a single
+     * {@code Observable} sequence.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source ObservableSources. The operator buffers the values emitted by these ObservableSources and then drains them in
+     * current {@code Observable}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them in
      * order, each one after the previous one completes.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapEager.o.png" alt="">
@@ -6600,30 +6795,32 @@ public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? ext
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the value type
-     * @param mapper the function that maps a sequence of values into a sequence of ObservableSources that will be
+     * @param mapper the function that maps a sequence of values into a sequence of {@code ObservableSource}s that will be
      *               eagerly concatenated
-     * @param maxConcurrency the maximum number of concurrent subscribed ObservableSources
-     * @param prefetch hints about the number of expected values from each inner ObservableSource, must be positive
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     * @param maxConcurrency the maximum number of concurrent subscribed {@code ObservableSource}s
+     * @param bufferSize hints about the number of expected items from each inner {@code ObservableSource}, must be positive
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
-            int maxConcurrency, int prefetch) {
+            int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<>(this, mapper, ErrorMode.IMMEDIATE, maxConcurrency, prefetch));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<>(this, mapper, ErrorMode.IMMEDIATE, maxConcurrency, bufferSize));
     }
 
     /**
-     * Maps a sequence of values into ObservableSources and concatenates these ObservableSources eagerly into a single
-     * ObservableSource.
+     * Maps a sequence of values into {@link ObservableSource}s and concatenates these {@code ObservableSource}s eagerly into a single
+     * {@code Observable} sequence.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source ObservableSources. The operator buffers the values emitted by these ObservableSources and then drains them in
+     * current {@code Observable}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them in
      * order, each one after the previous one completes.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapEagerDelayError.o.png" alt="">
@@ -6632,12 +6829,13 @@ public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? ext
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the value type
-     * @param mapper the function that maps a sequence of values into a sequence of ObservableSources that will be
+     * @param mapper the function that maps a sequence of values into a sequence of {@code ObservableSource}s that will be
      *               eagerly concatenated
      * @param tillTheEnd
-     *            if true, all errors from the outer and inner ObservableSource sources are delayed until the end,
-     *            if false, an error from the main source is signalled when the current ObservableSource source terminates
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     *            if {@code true}, all errors from the outer and inner {@code ObservableSource} sources are delayed until the end,
+     *            if {@code false}, an error from the main source is signaled when the current {@code Observable} source terminates
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -6649,11 +6847,11 @@ public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? supe
     }
 
     /**
-     * Maps a sequence of values into ObservableSources and concatenates these ObservableSources eagerly into a single
-     * ObservableSource.
+     * Maps a sequence of values into {@link ObservableSource}s and concatenates these {@code ObservableSource}s eagerly into a single
+     * {@code Observable} sequence.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source ObservableSources. The operator buffers the values emitted by these ObservableSources and then drains them in
+     * current {@code Observable}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them in
      * order, each one after the previous one completes.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapEagerDelayError.o.png" alt="">
@@ -6662,32 +6860,34 @@ public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? supe
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the value type
-     * @param mapper the function that maps a sequence of values into a sequence of ObservableSources that will be
+     * @param mapper the function that maps a sequence of values into a sequence of {@code ObservableSource}s that will be
      *               eagerly concatenated
      * @param tillTheEnd
-     *               if true, exceptions from the current Observable and all the inner ObservableSources are delayed until
-     *               all of them terminate, if false, exception from the current Observable is delayed until the
-     *               currently running ObservableSource terminates
-     * @param maxConcurrency the maximum number of concurrent subscribed ObservableSources
-     * @param prefetch
-     *               the number of elements to prefetch from each source ObservableSource
-     * @return the new ObservableSource instance with the specified concatenation behavior
+     *               if {@code true}, exceptions from the current {@code Observable} and all the inner {@code ObservableSource}s are delayed until
+     *               all of them terminate, if {@code false}, exception from the current {@code Observable} is delayed until the
+     *               currently running {@code ObservableSource} terminates
+     * @param maxConcurrency the maximum number of concurrent subscribed {@code ObservableSource}s
+     * @param bufferSize
+     *               the number of elements expected from the current {@code Observable} and each inner {@code ObservableSource} to be buffered
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
-            boolean tillTheEnd, int maxConcurrency, int prefetch) {
+            boolean tillTheEnd, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, maxConcurrency, prefetch));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapEager<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, maxConcurrency, bufferSize));
     }
 
     /**
-     * Maps each element of the upstream Observable into CompletableSources, subscribes to them one at a time in
-     * order and waits until the upstream and all CompletableSources complete.
+     * Maps each element of the current {@code Observable} into {@link CompletableSource}s, subscribes to them one at a time in
+     * order and waits until the upstream and all {@code CompletableSource}s complete.
      * <p>
      * <img width="640" height="505" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapCompletable.o.png" alt="">
      * <dl>
@@ -6696,8 +6896,9 @@ public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? supe
      * </dl>
      * <p>History: 2.1.6 - experimental
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns a CompletableSource
-     * @return a Completable that signals {@code onComplete} when the upstream and all CompletableSources complete
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns a {@code CompletableSource}
+     * @return a {@link Completable} that signals {@code onComplete} when the upstream and all {@code CompletableSource}s complete
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -6708,8 +6909,8 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
     }
 
     /**
-     * Maps each element of the upstream Observable into CompletableSources, subscribes to them one at a time in
-     * order and waits until the upstream and all CompletableSources complete.
+     * Maps each element of the current {@code Observable} into {@link CompletableSource}s, subscribes to them one at a time in
+     * order and waits until the upstream and all {@code CompletableSource}s complete.
      * <p>
      * <img width="640" height="505" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapCompletable.o.png" alt="">
      * <dl>
@@ -6718,12 +6919,14 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * </dl>
      * <p>History: 2.1.6 - experimental
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns a CompletableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns a {@code CompletableSource}
      *
      * @param capacityHint
-     *            the number of upstream items expected to be buffered until the current CompletableSource,  mapped from
+     *            the number of upstream items expected to be buffered until the current {@code CompletableSource}, mapped from
      *            the current item, completes.
-     * @return a Completable that signals {@code onComplete} when the upstream and all CompletableSources complete
+     * @return a {@link Completable} that signals {@code onComplete} when the upstream and all {@code CompletableSources} complete
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @since 2.2
      */
     @CheckReturnValue
@@ -6737,7 +6940,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
 
     /**
      * Maps the upstream items into {@link CompletableSource}s and subscribes to them one after the
-     * other terminates, delaying all errors till both this {@code Observable} and all
+     * other terminates, delaying all errors till both the current {@code Observable} and all
      * inner {@code CompletableSource}s terminate.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
@@ -6749,7 +6952,8 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * @param mapper the function called with the upstream item and should return
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
-     * @return a new Completable instance
+     * @return a new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletable(Function, int)
      * @since 2.2
      */
@@ -6762,7 +6966,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
 
     /**
      * Maps the upstream items into {@link CompletableSource}s and subscribes to them one after the
-     * other terminates, optionally delaying all errors till both this {@code Observable} and all
+     * other terminates, optionally delaying all errors till both the current {@code Observable} and all
      * inner {@code CompletableSource}s terminate.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
@@ -6774,13 +6978,14 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * @param mapper the function called with the upstream item and should return
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
-     * @param tillTheEnd If {@code true}, errors from this {@code Observable} or any of the
+     * @param tillTheEnd If {@code true}, errors from the current {@code Observable} or any of the
      *                   inner {@code CompletableSource}s are delayed until all
-     *                   of them terminate. If {@code false}, an error from this
+     *                   of them terminate. If {@code false}, an error from the current
      *                   {@code Observable} is delayed until the current inner
      *                   {@code CompletableSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new Completable instance
+     * @return a new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletable(Function)
      * @since 2.2
      */
@@ -6793,7 +6998,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
 
     /**
      * Maps the upstream items into {@link CompletableSource}s and subscribes to them one after the
-     * other terminates, optionally delaying all errors till both this {@code Observable} and all
+     * other terminates, optionally delaying all errors till both the current {@code Observable} and all
      * inner {@code CompletableSource}s terminate.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
@@ -6805,32 +7010,32 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * @param mapper the function called with the upstream item and should return
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
-     * @param tillTheEnd If {@code true}, errors from this {@code Observable} or any of the
+     * @param tillTheEnd If {@code true}, errors from the current {@code Observable} or any of the
      *                   inner {@code CompletableSource}s are delayed until all
-     *                   of them terminate. If {@code false}, an error from this
+     *                   of them terminate. If {@code false}, an error from the current
      *                   {@code Observable} is delayed until the current inner
      *                   {@code CompletableSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @param prefetch The number of upstream items to prefetch so that fresh items are
+     * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code CompletableSource} terminates.
-     *                 The operator replenishes after half of the prefetch amount has been consumed
-     *                 and turned into {@code CompletableSource}s.
-     * @return a new Completable instance
+     * @return a new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapCompletable(Function, int)
      * @since 2.2
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Completable concatMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd, int prefetch) {
+    public final Completable concatMapCompletableDelayError(@NonNull Function<? super T, ? extends CompletableSource> mapper, boolean tillTheEnd, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapCompletable<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, bufferSize));
     }
 
     /**
-     * Returns an Observable that concatenate each item emitted by the source ObservableSource with the values in an
-     * Iterable corresponding to that item that is generated by a selector.
+     * Returns an {@code Observable} that concatenate each item emitted by the current {@code Observable} with the values in an
+     * {@link Iterable} corresponding to that item that is generated by a selector.
      * <p>
      * <img width="640" height="275" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapIterable.o.png" alt="">
      *
@@ -6840,12 +7045,13 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting ObservableSource
+     *            the type of item emitted by the resulting {@code Observable}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source ObservableSource
-     * @return an Observable that emits the results of concatenating the items emitted by the source ObservableSource with
-     *         the values in the Iterables corresponding to those items, as generated by {@code collectionSelector}
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            current {@code Observable}
+     * @return an {@code Observable} that emits the results of concatenating the items emitted by the current {@code Observable} with
+     *         the values in the {@code Iterable}s corresponding to those items
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -6857,8 +7063,8 @@ public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ?
     }
 
     /**
-     * Returns an Observable that concatenate each item emitted by the source ObservableSource with the values in an
-     * Iterable corresponding to that item that is generated by a selector.
+     * Returns an {@code Observable} that concatenate each item emitted by the current {@code Observable} with the values in an
+     * {@link Iterable} corresponding to that item that is generated by a selector.
      * <p>
      * <img width="640" height="275" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapIterable.o.png" alt="">
      *
@@ -6868,29 +7074,31 @@ public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ?
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting ObservableSource
+     *            the type of item emitted by the resulting {@code Observable}
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source ObservableSource
-     * @param prefetch
-     *            the number of elements to prefetch from the current Observable
-     * @return an Observable that emits the results of concatenating the items emitted by the source ObservableSource with
-     *         the values in the Iterables corresponding to those items, as generated by {@code collectionSelector}
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            current {@code Observable}
+     * @param bufferSize
+     *            the number of elements expected from the current {@code Observable} to be buffered
+     * @return an {@code Observable} that emits the results of concatenating the items emitted by the current {@code Observable} with
+     *         the values in the {@code Iterable}s corresponding to those items
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int prefetch) {
+    public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return concatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), prefetch);
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return concatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), bufferSize);
     }
 
     /**
      * Maps the upstream items into {@link MaybeSource}s and subscribes to them one after the
      * other succeeds or completes, emits their success value if available or terminates immediately if
-     * either this {@code Observable} or the current inner {@code MaybeSource} fail.
+     * either the current {@code Observable} or the current inner {@code MaybeSource} fail.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -6902,7 +7110,8 @@ public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ?
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybeDelayError(Function)
      * @see #concatMapMaybe(Function, int)
      * @since 2.2
@@ -6917,7 +7126,7 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
     /**
      * Maps the upstream items into {@link MaybeSource}s and subscribes to them one after the
      * other succeeds or completes, emits their success value if available or terminates immediately if
-     * either this {@code Observable} or the current inner {@code MaybeSource} fail.
+     * either the current {@code Observable} or the current inner {@code MaybeSource} fail.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -6929,11 +7138,11 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @param prefetch The number of upstream items to prefetch so that fresh items are
+     * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code MaybeSource} terminates.
-     *                 The operator replenishes after half of the prefetch amount has been consumed
-     *                 and turned into {@code MaybeSource}s.
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapMaybe(Function)
      * @see #concatMapMaybeDelayError(Function, boolean, int)
      * @since 2.2
@@ -6941,16 +7150,16 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
+    public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, ErrorMode.IMMEDIATE, bufferSize));
     }
 
     /**
      * Maps the upstream items into {@link MaybeSource}s and subscribes to them one after the
      * other terminates, emits their success value if available and delaying all errors
-     * till both this {@code Observable} and all inner {@code MaybeSource}s terminate.
+     * till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -6962,7 +7171,8 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybe(Function)
      * @see #concatMapMaybeDelayError(Function, boolean)
      * @since 2.2
@@ -6977,7 +7187,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
     /**
      * Maps the upstream items into {@link MaybeSource}s and subscribes to them one after the
      * other terminates, emits their success value if available and optionally delaying all errors
-     * till both this {@code Observable} and all inner {@code MaybeSource}s terminate.
+     * till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -6989,13 +7199,14 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @param tillTheEnd If {@code true}, errors from this {@code Observable} or any of the
+     * @param tillTheEnd If {@code true}, errors from the current {@code Observable} or any of the
      *                   inner {@code MaybeSource}s are delayed until all
-     *                   of them terminate. If {@code false}, an error from this
+     *                   of them terminate. If {@code false}, an error from the current
      *                   {@code Observable} is delayed until the current inner
      *                   {@code MaybeSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybe(Function, int)
      * @see #concatMapMaybeDelayError(Function, boolean, int)
      * @since 2.2
@@ -7010,7 +7221,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
     /**
      * Maps the upstream items into {@link MaybeSource}s and subscribes to them one after the
      * other terminates, emits their success value if available and optionally delaying all errors
-     * till both this {@code Observable} and all inner {@code MaybeSource}s terminate.
+     * till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -7022,33 +7233,33 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @param tillTheEnd If {@code true}, errors from this {@code Observable} or any of the
+     * @param tillTheEnd If {@code true}, errors from the current {@code Observable} or any of the
      *                   inner {@code MaybeSource}s are delayed until all
-     *                   of them terminate. If {@code false}, an error from this
+     *                   of them terminate. If {@code false}, an error from the current
      *                   {@code Observable} is delayed until the current inner
      *                   {@code MaybeSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @param prefetch The number of upstream items to prefetch so that fresh items are
+     * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code MaybeSource} terminates.
-     *                 The operator replenishes after half of the prefetch amount has been consumed
-     *                 and turned into {@code MaybeSource}s.
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapMaybe(Function, int)
      * @since 2.2
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
+    public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, bufferSize));
     }
 
     /**
      * Maps the upstream items into {@link SingleSource}s and subscribes to them one after the
      * other succeeds, emits their success values or terminates immediately if
-     * either this {@code Observable} or the current inner {@code SingleSource} fail.
+     * either the current {@code Observable} or the current inner {@code SingleSource} fail.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -7060,7 +7271,8 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingleDelayError(Function)
      * @see #concatMapSingle(Function, int)
      * @since 2.2
@@ -7075,7 +7287,7 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
     /**
      * Maps the upstream items into {@link SingleSource}s and subscribes to them one after the
      * other succeeds, emits their success values or terminates immediately if
-     * either this {@code Observable} or the current inner {@code SingleSource} fail.
+     * either the current {@code Observable} or the current inner {@code SingleSource} fail.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -7087,11 +7299,11 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @param prefetch The number of upstream items to prefetch so that fresh items are
+     * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code SingleSource} terminates.
-     *                 The operator replenishes after half of the prefetch amount has been consumed
-     *                 and turned into {@code SingleSource}s.
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapSingle(Function)
      * @see #concatMapSingleDelayError(Function, boolean, int)
      * @since 2.2
@@ -7099,16 +7311,16 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
+    public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, ErrorMode.IMMEDIATE, bufferSize));
     }
 
     /**
      * Maps the upstream items into {@link SingleSource}s and subscribes to them one after the
      * other succeeds or fails, emits their success values and delays all errors
-     * till both this {@code Observable} and all inner {@code SingleSource}s terminate.
+     * till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -7120,7 +7332,8 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingle(Function)
      * @see #concatMapSingleDelayError(Function, boolean)
      * @since 2.2
@@ -7135,7 +7348,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
     /**
      * Maps the upstream items into {@link SingleSource}s and subscribes to them one after the
      * other succeeds or fails, emits their success values and optionally delays all errors
-     * till both this {@code Observable} and all inner {@code SingleSource}s terminate.
+     * till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -7147,13 +7360,14 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @param tillTheEnd If {@code true}, errors from this {@code Observable} or any of the
+     * @param tillTheEnd If {@code true}, errors from the current {@code Observable} or any of the
      *                   inner {@code SingleSource}s are delayed until all
-     *                   of them terminate. If {@code false}, an error from this
+     *                   of them terminate. If {@code false}, an error from the current
      *                   {@code Observable} is delayed until the current inner
      *                   {@code SingleSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingle(Function, int)
      * @see #concatMapSingleDelayError(Function, boolean, int)
      * @since 2.2
@@ -7168,7 +7382,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
     /**
      * Maps the upstream items into {@link SingleSource}s and subscribes to them one after the
      * other succeeds or fails, emits their success values and optionally delays  errors
-     * till both this {@code Observable} and all inner {@code SingleSource}s terminate.
+     * till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <dl>
@@ -7180,32 +7394,32 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @param tillTheEnd If {@code true}, errors from this {@code Observable} or any of the
+     * @param tillTheEnd If {@code true}, errors from the current {@code Observable} or any of the
      *                   inner {@code SingleSource}s are delayed until all
-     *                   of them terminate. If {@code false}, an error from this
+     *                   of them terminate. If {@code false}, an error from the current
      *                   {@code Observable} is delayed until the current inner
      *                   {@code SingleSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @param prefetch The number of upstream items to prefetch so that fresh items are
+     * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code SingleSource} terminates.
-     *                 The operator replenishes after half of the prefetch amount has been consumed
-     *                 and turned into {@code SingleSource}s.
-     * @return a new Observable instance
+     * @return a new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapSingle(Function, int)
      * @since 2.2
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
+    public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
+        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, bufferSize));
     }
 
     /**
-     * Returns an Observable that emits the items emitted from the current ObservableSource, then the next, one after
-     * the other, without interleaving them.
+     * Returns an {@code Observable} that first emits the items emitted from the current {@code Observable}, then items
+     * from the {@code other} {@link ObservableSource} without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
      * <dl>
@@ -7214,9 +7428,10 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
      * </dl>
      *
      * @param other
-     *            an ObservableSource to be concatenated after the current
-     * @return an Observable that emits items emitted by the two source ObservableSources, one after the other,
+     *            an {@code ObservableSource} to be concatenated after the current
+     * @return an {@code Observable} that emits items emitted by the two source {@code ObservableSource}s, one after the other,
      *         without interleaving them
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -7228,8 +7443,8 @@ public final Observable<T> concatWith(@NonNull ObservableSource<? extends T> oth
     }
 
     /**
-     * Returns an {@code Observable} that emits the items from this {@code Observable} followed by the success item or error event
-     * of the other {@link SingleSource}.
+     * Returns an {@code Observable} that emits the items from the current {@code Observable} followed by the success item or error event
+     * of the {@code other} {@link SingleSource}.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
      * <dl>
@@ -7237,8 +7452,9 @@ public final Observable<T> concatWith(@NonNull ObservableSource<? extends T> oth
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.10 - experimental
-     * @param other the SingleSource whose signal should be emitted after this {@code Observable} completes normally.
-     * @return the new Observable instance
+     * @param other the {@code SingleSource} whose signal should be emitted after the current {@code Observable} completes normally.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -7250,7 +7466,7 @@ public final Observable<T> concatWith(@NonNull SingleSource<? extends T> other)
     }
 
     /**
-     * Returns an {@code Observable} that emits the items from this {@code Observable} followed by the success item or terminal events
+     * Returns an {@code Observable} that emits the items from the current {@code Observable} followed by the success item or terminal events
      * of the other {@link MaybeSource}.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -7259,8 +7475,9 @@ public final Observable<T> concatWith(@NonNull SingleSource<? extends T> other)
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.10 - experimental
-     * @param other the MaybeSource whose signal should be emitted after this Observable completes normally.
-     * @return the new Observable instance
+     * @param other the {@code MaybeSource} whose signal should be emitted after the current {@code Observable} completes normally.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -7272,7 +7489,7 @@ public final Observable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
     }
 
     /**
-     * Returns an {@code Observable} that emits items from this {@code Observable} and when it completes normally, the
+     * Returns an {@code Observable} that emits items from the current {@code Observable} and when it completes normally, the
      * other {@link CompletableSource} is subscribed to and the returned {@code Observable} emits its terminal events.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
@@ -7282,7 +7499,8 @@ public final Observable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
      * </dl>
      * <p>History: 2.1.10 - experimental
      * @param other the {@code CompletableSource} to subscribe to once the current {@code Observable} completes normally
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -7294,7 +7512,7 @@ public final Observable<T> concatWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a Single that emits a Boolean that indicates whether the source ObservableSource emitted a
+     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether the current {@code Observable} emitted a
      * specified item.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/contains.2.png" alt="">
@@ -7304,9 +7522,10 @@ public final Observable<T> concatWith(@NonNull CompletableSource other) {
      * </dl>
      *
      * @param element
-     *            the item to search for in the emissions from the source ObservableSource
-     * @return a Single that emits {@code true} if the specified item is emitted by the source ObservableSource,
-     *         or {@code false} if the source ObservableSource completes without emitting that item
+     *            the item to search for in the emissions from the current {@code Observable}
+     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the current {@code Observable},
+     *         or {@code false} if the current {@code Observable} completes without emitting that item
+     * @throws NullPointerException if {@code element} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -7318,8 +7537,8 @@ public final Single<Boolean> contains(@NonNull Object element) {
     }
 
     /**
-     * Returns a Single that counts the total number of items emitted by the source ObservableSource and emits
-     * this count as a 64-bit Long.
+     * Returns a {@link Single} that counts the total number of items emitted by the current {@code Observable} and emits
+     * this count as a 64-bit {@link Long}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/count.2.png" alt="">
      * <dl>
@@ -7327,8 +7546,8 @@ public final Single<Boolean> contains(@NonNull Object element) {
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Single that emits a single item: the number of items emitted by the source ObservableSource as a
-     *         64-bit Long item
+     * @return a {@code Single} that emits a single item: the number of items emitted by the current {@code Observable} as a
+     *         64-bit {@code Long} item
      * @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
      */
     @CheckReturnValue
@@ -7339,8 +7558,9 @@ public final Single<Long> count() {
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, except that it drops items emitted by the
-     * source ObservableSource that are followed by another item within a computed debounce duration.
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, except that it drops items emitted by the
+     * current {@code Observable} that are followed by another item within a computed debounce duration
+     * denoted by an item emission or completion from a generated inner {@link ObservableSource} for that original item.
      * <p>
      * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.f.png" alt="">
      * <p>
@@ -7359,9 +7579,10 @@ public final Single<Long> count() {
      * @param <U>
      *            the debounce value type (ignored)
      * @param debounceSelector
-     *            function to retrieve a sequence that indicates the throttle duration for each item
-     * @return an Observable that omits items emitted by the source ObservableSource that are followed by another item
+     *            function to return a sequence that indicates the throttle duration for each item via its own emission or completion
+     * @return an {@code Observable} that omits items emitted by the current {@code Observable} that are followed by another item
      *         within a computed debounce duration
+     * @throws NullPointerException if {@code debounceSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      */
     @CheckReturnValue
@@ -7373,16 +7594,16 @@ public final <U> Observable<T> debounce(@NonNull Function<? super T, ? extends O
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, except that it drops items emitted by the
-     * source ObservableSource that are followed by newer items before a timeout value expires. The timer resets on
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, except that it drops items emitted by the
+     * current {@code Observable} that are followed by newer items before a timeout value expires. The timer resets on
      * each emission.
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source ObservableSource faster than the timeout then no items
-     * will be emitted by the resulting ObservableSource.
+     * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Observable}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.png" alt="">
      * <p>
-     * Delivery of the item after the grace period happens on the {@code computation} {@code Scheduler}'s
+     * Delivery of the item after the grace period happens on the {@code computation} {@link Scheduler}'s
      * {@code Worker} which if takes too long, a newer item may arrive from the upstream, causing the
      * {@code Worker}'s task to get disposed, which may also interrupt any downstream blocking operation
      * (yielding an {@code InterruptedException}). It is recommended processing items
@@ -7390,17 +7611,18 @@ public final <U> Observable<T> debounce(@NonNull Function<? super T, ? extends O
      * {@code debounce} itself.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code debounce} operates by default on the {@code computation} {@link Scheduler}.</dd>
+     *  <dd>{@code debounce} operates by default on the {@code computation} {@code Scheduler}.</dd>
      * </dl>
      *
      * @param timeout
-     *            the length of the window of time that must pass after the emission of an item from the source
-     *            ObservableSource in which that ObservableSource emits no items in order for the item to be emitted by the
-     *            resulting ObservableSource
+     *            the length of the window of time that must pass after the emission of an item from the current
+     *            {@code Observable} in which the {@code Observable} emits no items in order for the item to be emitted by the
+     *            resulting {@code Observable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return an Observable that filters out items from the source ObservableSource that are too quickly followed by
+     * @return an {@code Observable} that filters out items from the current {@code Observable} that are too quickly followed by
      *         newer items
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see #throttleWithTimeout(long, TimeUnit)
      */
@@ -7412,12 +7634,12 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, except that it drops items emitted by the
-     * source ObservableSource that are followed by newer items before a timeout value expires on a specified
-     * Scheduler. The timer resets on each emission.
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, except that it drops items emitted by the
+     * current {@code Observable} that are followed by newer items before a timeout value expires on a specified
+     * {@link Scheduler}. The timer resets on each emission.
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source ObservableSource faster than the timeout then no items
-     * will be emitted by the resulting ObservableSource.
+     * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Observable}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.s.png" alt="">
      * <p>
@@ -7429,19 +7651,20 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit) {
      * {@code debounce} itself.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
-     *            the time each item has to be "the most recent" of those emitted by the source ObservableSource to
+     *            the time each item has to be "the most recent" of those emitted by the current {@code Observable} to
      *            ensure that it's not dropped
      * @param unit
      *            the unit of time for the specified {@code timeout}
      * @param scheduler
-     *            the {@link Scheduler} to use internally to manage the timers that handle the timeout for each
+     *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return an Observable that filters out items from the source ObservableSource that are too quickly followed by
+     * @return an {@code Observable} that filters out items from the current {@code Observable} that are too quickly followed by
      *         newer items
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see #throttleWithTimeout(long, TimeUnit, Scheduler)
      */
@@ -7455,8 +7678,8 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNu
     }
 
     /**
-     * Returns an Observable that emits the items emitted by the source ObservableSource or a specified default item
-     * if the source ObservableSource is empty.
+     * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} or a specified default item
+     * if the current {@code Observable} is empty.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.png" alt="">
      * <dl>
@@ -7465,9 +7688,10 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNu
      * </dl>
      *
      * @param defaultItem
-     *            the item to emit if the source ObservableSource emits no items
-     * @return an Observable that emits either the specified default item if the source ObservableSource emits no
-     *         items, or the items emitted by the source ObservableSource
+     *            the item to emit if the current {@code Observable} emits no items
+     * @return an {@code Observable} that emits either the specified default item if the current {@code Observable} emits no
+     *         items, or the items emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defaultifempty.html">ReactiveX operators documentation: DefaultIfEmpty</a>
      */
     @CheckReturnValue
@@ -7479,13 +7703,13 @@ public final Observable<T> defaultIfEmpty(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns an Observable that delays the emissions of the source ObservableSource via another ObservableSource on a
-     * per-item basis.
+     * Returns an {@code Observable} that delays the emissions of the current {@code Observable} via
+     * a per-item derived {@link ObservableSource}'s item emission or termination, on a per source item basis.
      * <p>
      * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.o.png" alt="">
      * <p>
-     * <em>Note:</em> the resulting ObservableSource will immediately propagate any {@code onError} notification
-     * from the source ObservableSource.
+     * <em>Note:</em> the resulting {@code Observable} will immediately propagate any {@code onError} notification
+     * from the current {@code Observable}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code delay} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7494,11 +7718,12 @@ public final Observable<T> defaultIfEmpty(@NonNull T defaultItem) {
      * @param <U>
      *            the item delay value type (ignored)
      * @param itemDelay
-     *            a function that returns an ObservableSource for each item emitted by the source ObservableSource, which is
-     *            then used to delay the emission of that item by the resulting ObservableSource until the ObservableSource
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}, which is
+     *            then used to delay the emission of that item by the resulting {@code Observable} until the {@code ObservableSource}
      *            returned from {@code itemDelay} emits an item
-     * @return an Observable that delays the emissions of the source ObservableSource via another ObservableSource on a
+     * @return an {@code Observable} that delays the emissions of the current {@code Observable} via another {@code ObservableSource} on a
      *         per-item basis
+     * @throws NullPointerException if {@code itemDelay} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -7510,8 +7735,8 @@ public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends Obse
     }
 
     /**
-     * Returns an Observable that emits the items emitted by the source ObservableSource shifted forward in time by a
-     * specified delay. Error notifications from the source ObservableSource are not delayed.
+     * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} shifted forward in time by a
+     * specified delay. An error notification from the current {@code Observable} is not delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
      * <dl>
@@ -7523,8 +7748,11 @@ public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends Obse
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return the source ObservableSource shifted in time by the specified delay
+     * @return the current {@code Observable} shifted in time by the specified delay
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
+     * @see #delay(long, TimeUnit, boolean)
+     * @see #delay(long, TimeUnit, Scheduler)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
@@ -7534,8 +7762,8 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that emits the items emitted by the source ObservableSource shifted forward in time by a
-     * specified delay. If {@code delayError} is true, error notifications will also be delayed.
+     * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} shifted forward in time by a
+     * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
      * <dl>
@@ -7548,10 +7776,12 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit) {
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param delayError
-     *            if true, the upstream exception is signalled with the given delay, after all preceding normal elements,
-     *            if false, the upstream exception is signalled immediately
-     * @return the source ObservableSource shifted in time by the specified delay
+     *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
+     *            if {@code false}, the upstream exception is signaled immediately
+     * @return the current {@code Observable} shifted in time by the specified delay
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
+     * @see #delay(long, TimeUnit, Scheduler, boolean)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
@@ -7561,8 +7791,8 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, boolean del
     }
 
     /**
-     * Returns an Observable that emits the items emitted by the source ObservableSource shifted forward in time by a
-     * specified delay. Error notifications from the source ObservableSource are not delayed.
+     * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} shifted forward in time by a
+     * specified delay. An error notification from the current {@code Observable} is not delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
      * <dl>
@@ -7575,8 +7805,9 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, boolean del
      * @param unit
      *            the time unit of {@code delay}
      * @param scheduler
-     *            the {@link Scheduler} to use for delaying
-     * @return the source ObservableSource shifted in time by the specified delay
+     *            the {@code Scheduler} to use for delaying
+     * @return the current {@code Observable} shifted in time by the specified delay
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -7587,8 +7818,8 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns an Observable that emits the items emitted by the source ObservableSource shifted forward in time by a
-     * specified delay. If {@code delayError} is true, error notifications will also be delayed.
+     * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} shifted forward in time by a
+     * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
      * <dl>
@@ -7601,11 +7832,12 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sc
      * @param unit
      *            the time unit of {@code delay}
      * @param scheduler
-     *            the {@link Scheduler} to use for delaying
+     *            the {@code Scheduler} to use for delaying
      * @param delayError
-     *            if true, the upstream exception is signalled with the given delay, after all preceding normal elements,
-     *            if false, the upstream exception is signalled immediately
-     * @return the source ObservableSource shifted in time by the specified delay
+     *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
+     *            if {@code false}, the upstream exception is signaled immediately
+     * @return the current {@code Observable} shifted in time by the specified delay
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -7619,13 +7851,13 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns an Observable that delays the subscription to and emissions from the source ObservableSource via another
-     * ObservableSource on a per-item basis.
+     * Returns an {@code Observable} that delays the subscription to and emissions from the current {@code Observable} via
+     * {@link ObservableSource}s for the subscription itself and on a per-item basis.
      * <p>
      * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.oo.png" alt="">
      * <p>
-     * <em>Note:</em> the resulting ObservableSource will immediately propagate any {@code onError} notification
-     * from the source ObservableSource.
+     * <em>Note:</em> the resulting {@code Observable} will immediately propagate any {@code onError} notification
+     * from the current {@code Observable}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code delay} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7636,14 +7868,15 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sc
      * @param <V>
      *            the item delay value type (ignored)
      * @param subscriptionDelay
-     *            a function that returns an ObservableSource that triggers the subscription to the source ObservableSource
+     *            a function that returns an {@code ObservableSource} that triggers the subscription to the current {@code Observable}
      *            once it emits any item
      * @param itemDelay
-     *            a function that returns an ObservableSource for each item emitted by the source ObservableSource, which is
-     *            then used to delay the emission of that item by the resulting ObservableSource until the ObservableSource
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}, which is
+     *            then used to delay the emission of that item by the resulting {@code Observable} until the {@code ObservableSource}
      *            returned from {@code itemDelay} emits an item
-     * @return an Observable that delays the subscription and emissions of the source ObservableSource via another
-     *         ObservableSource on a per-item basis
+     * @return an {@code Observable} that delays the subscription and emissions of the current {@code Observable} via another
+     *         {@code ObservableSource} on a per-item basis
+     * @throws NullPointerException if {@code subscriptionDelay} or {@code itemDelay} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -7655,8 +7888,8 @@ public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptio
     }
 
     /**
-     * Returns an Observable that delays the subscription to this Observable
-     * until the other Observable emits an element or completes normally.
+     * Returns an {@code Observable} that delays the subscription to the current {@code Observable}
+     * until the other {@link ObservableSource} emits an element or completes normally.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.o.png" alt="">
      * <dl>
@@ -7664,11 +7897,12 @@ public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptio
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the value type of the other Observable, irrelevant
-     * @param other the other Observable that should trigger the subscription
-     *        to this Observable.
-     * @return an Observable that delays the subscription to this Observable
-     *         until the other Observable emits an element or completes normally.
+     * @param <U> the value type of the other {@code Observable}, irrelevant
+     * @param other the other {@code ObservableSource} that should trigger the subscription
+     *        to the current {@code Observable}.
+     * @return an {@code Observable} that delays the subscription to the current {@code Observable}
+     *         until the other {@code ObservableSource} emits an element or completes normally.
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -7680,7 +7914,7 @@ public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> ot
     }
 
     /**
-     * Returns an Observable that delays the subscription to the source ObservableSource by a given amount of time.
+     * Returns an {@code Observable} that delays the subscription to the current {@code Observable} by a given amount of time.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.png" alt="">
      * <dl>
@@ -7692,7 +7926,8 @@ public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> ot
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
-     * @return an Observable that delays the subscription to the source ObservableSource by the given amount
+     * @return an {@code Observable} that delays the subscription to the current {@code Observable} by the given amount
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -7703,13 +7938,13 @@ public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit)
     }
 
     /**
-     * Returns an Observable that delays the subscription to the source ObservableSource by a given amount of time,
-     * both waiting and subscribing on a given Scheduler.
+     * Returns an {@code Observable} that delays the subscription to the current {@code Observable} by a given amount of time,
+     * both waiting and subscribing on a given {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param delay
@@ -7717,9 +7952,10 @@ public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit)
      * @param unit
      *            the time unit of {@code delay}
      * @param scheduler
-     *            the Scheduler on which the waiting and subscription will happen
-     * @return an Observable that delays the subscription to the source ObservableSource by a given
-     *         amount, waiting and subscribing on the given Scheduler
+     *            the {@code Scheduler} on which the waiting and subscription will happen
+     * @return an {@code Observable} that delays the subscription to the current {@code Observable} by a given
+     *         amount, waiting and subscribing on the given {@code Scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -7730,9 +7966,9 @@ public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns an Observable that reverses the effect of {@link #materialize materialize} by transforming the
+     * Returns an {@code Observable} that reverses the effect of {@link #materialize materialize} by transforming the
      * {@link Notification} objects extracted from the source items via a selector function
-     * into their respective {@code Observer} signal types.
+     * into their respective {@link Observer} signal types.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/dematerialize.png" alt="">
      * <p>
@@ -7744,7 +7980,7 @@ public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit,
      * <p>
      * When the upstream signals an {@link Notification#createOnError(Throwable) onError} or
      * {@link Notification#createOnComplete() onComplete} item, the
-     * returned Observable disposes of the flow and terminates with that type of terminal event:
+     * returned {@code Observable} disposes of the flow and terminates with that type of terminal event:
      * <pre><code>
      * Observable.just(createOnNext(1), createOnComplete(), createOnNext(2))
      * .doOnDispose(() -&gt; System.out.println("Disposed!"));
@@ -7769,10 +8005,11 @@ public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit,
      * <p>History: 2.2.4 - experimental
      *
      * @param <R> the output value type
-     * @param selector function that returns the upstream item and should return a Notification to signal
+     * @param selector function that returns the upstream item and should return a {@code Notification} to signal
      * the corresponding {@code Observer} event to the downstream.
-     * @return an Observable that emits the items and notifications embedded in the {@link Notification} objects
-     *         selected from the items emitted by the source ObservableSource
+     * @return an {@code Observable} that emits the items and notifications embedded in the {@code Notification} objects
+     *         selected from the items emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Dematerialize</a>
      * @since 3.0.0
      */
@@ -7785,7 +8022,7 @@ public final <R> Observable<R> dematerialize(@NonNull Function<? super T, Notifi
     }
 
     /**
-     * Returns an Observable that emits all items emitted by the source ObservableSource that are distinct
+     * Returns an {@code Observable} that emits all items emitted by the current {@code Observable} that are distinct
      * based on {@link Object#equals(Object)} comparison.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.png" alt="">
@@ -7794,13 +8031,13 @@ public final <R> Observable<R> dematerialize(@NonNull Function<? super T, Notifi
      * and {@link Object#hashCode()} to provide meaningful comparison between items as the default Java
      * implementation only considers reference equivalence.
      * <p>
-     * By default, {@code distinct()} uses an internal {@link java.util.HashSet} per Observer to remember
+     * By default, {@code distinct()} uses an internal {@link HashSet} per {@link Observer} to remember
      * previously seen items and uses {@link java.util.Set#add(Object)} returning {@code false} as the
      * indicator for duplicates.
      * <p>
      * Note that this internal {@code HashSet} may grow unbounded as items won't be removed from it by
      * the operator. Therefore, using very long or infinite upstream (with very distinct elements) may lead
-     * to {@code OutOfMemoryError}.
+     * to {@link OutOfMemoryError}.
      * <p>
      * Customizing the retention policy can happen only by providing a custom {@link java.util.Collection} implementation
      * to the {@link #distinct(Function, Supplier)} overload.
@@ -7809,7 +8046,7 @@ public final <R> Observable<R> dematerialize(@NonNull Function<? super T, Notifi
      *  <dd>{@code distinct} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Observable that emits only those items emitted by the source ObservableSource that are distinct from
+     * @return an {@code Observable} that emits only those items emitted by the current {@code Observable} that are distinct from
      *         each other
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function)
@@ -7823,7 +8060,7 @@ public final Observable<T> distinct() {
     }
 
     /**
-     * Returns an Observable that emits all items emitted by the source ObservableSource that are distinct according
+     * Returns an {@code Observable} that emits all items emitted by the current {@code Observable} that are distinct according
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
@@ -7833,13 +8070,13 @@ public final Observable<T> distinct() {
      * and {@link Object#hashCode()} to provide meaningful comparison between the key objects as the default
      * Java implementation only considers reference equivalence.
      * <p>
-     * By default, {@code distinct()} uses an internal {@link java.util.HashSet} per Observer to remember
+     * By default, {@code distinct()} uses an internal {@link HashSet} per {@link Observer} to remember
      * previously seen keys and uses {@link java.util.Set#add(Object)} returning {@code false} as the
      * indicator for duplicates.
      * <p>
      * Note that this internal {@code HashSet} may grow unbounded as keys won't be removed from it by
      * the operator. Therefore, using very long or infinite upstream (with very distinct keys) may lead
-     * to {@code OutOfMemoryError}.
+     * to {@link OutOfMemoryError}.
      * <p>
      * Customizing the retention policy can happen only by providing a custom {@link java.util.Collection} implementation
      * to the {@link #distinct(Function, Supplier)} overload.
@@ -7852,7 +8089,8 @@ public final Observable<T> distinct() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return an Observable that emits those items emitted by the source ObservableSource that have distinct keys
+     * @return an {@code Observable} that emits those items emitted by the current {@code Observable} that have distinct keys
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function, Supplier)
      */
@@ -7864,7 +8102,7 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
     }
 
     /**
-     * Returns an Observable that emits all items emitted by the source ObservableSource that are distinct according
+     * Returns an {@code Observable} that emits all items emitted by the current {@code Observable} that are distinct according
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
@@ -7883,9 +8121,10 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
      * @param collectionSupplier
-     *            function called for each individual Observer to return a Collection subtype for holding the extracted
-     *            keys and whose add() method's return indicates uniqueness.
-     * @return an Observable that emits those items emitted by the source ObservableSource that have distinct keys
+     *            function called for each individual {@link Observer} to return a {@link Collection} subtype for holding the extracted
+     *            keys and whose {@code add()} method's return indicates uniqueness.
+     * @return an {@code Observable} that emits those items emitted by the current {@code Observable} that have distinct keys
+     * @throws NullPointerException if {@code keySelector} or {@code collectionSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
     @CheckReturnValue
@@ -7898,7 +8137,7 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
     }
 
     /**
-     * Returns an Observable that emits all items emitted by the source ObservableSource that are distinct from their
+     * Returns an {@code Observable} that emits all items emitted by the current {@code Observable} that are distinct from their
      * immediate predecessors based on {@link Object#equals(Object)} comparison.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
@@ -7914,7 +8153,7 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
      * <p>
      * Note that if element type {@code T} in the flow is mutable, the comparison of the previous and current
      * item may yield unexpected results if the items are mutated externally. Common cases are mutable
-     * {@code CharSequence}s or {@code List}s where the objects will actually have the same
+     * {@link CharSequence}s or {@link List}s where the objects will actually have the same
      * references when they are modified and {@code distinctUntilChanged} will evaluate subsequent items as same.
      * To avoid such situation, it is recommended that mutable data is converted to an immutable one,
      * for example using {@code map(CharSequence::toString)} or {@code map(list -> Collections.unmodifiableList(new ArrayList<>(list)))}.
@@ -7923,7 +8162,7 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
      *  <dd>{@code distinctUntilChanged} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Observable that emits those items from the source ObservableSource that are distinct from their
+     * @return an {@code Observable} that emits those items from the current {@code Observable} that are distinct from their
      *         immediate predecessors
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinctUntilChanged(BiPredicate)
@@ -7936,7 +8175,7 @@ public final Observable<T> distinctUntilChanged() {
     }
 
     /**
-     * Returns an Observable that emits all items emitted by the source ObservableSource that are distinct from their
+     * Returns an {@code Observable} that emits all items emitted by the current {@code Observable} that are distinct from their
      * immediate predecessors, according to a key selector function and based on {@link Object#equals(Object)} comparison
      * of those objects returned by the key selector function.
      * <p>
@@ -7954,7 +8193,7 @@ public final Observable<T> distinctUntilChanged() {
      * <p>
      * Note that if element type {@code T} in the flow is mutable, the comparison of the previous and current
      * item may yield unexpected results if the items are mutated externally. Common cases are mutable
-     * {@code CharSequence}s or {@code List}s where the objects will actually have the same
+     * {@link CharSequence}s or {@link List}s where the objects will actually have the same
      * references when they are modified and {@code distinctUntilChanged} will evaluate subsequent items as same.
      * To avoid such situation, it is recommended that mutable data is converted to an immutable one,
      * for example using {@code map(CharSequence::toString)} or {@code map(list -> Collections.unmodifiableList(new ArrayList<>(list)))}.
@@ -7967,8 +8206,9 @@ public final Observable<T> distinctUntilChanged() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return an Observable that emits those items from the source ObservableSource whose keys are distinct from
+     * @return an {@code Observable} that emits those items from the current {@code Observable} whose keys are distinct from
      *         those of their immediate predecessors
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
     @CheckReturnValue
@@ -7980,7 +8220,7 @@ public final <K> Observable<T> distinctUntilChanged(@NonNull Function<? super T,
     }
 
     /**
-     * Returns an Observable that emits all items emitted by the source ObservableSource that are distinct from their
+     * Returns an {@code Observable} that emits all items emitted by the current {@code Observable} that are distinct from their
      * immediate predecessors when compared with each other via the provided comparator function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
@@ -7990,7 +8230,7 @@ public final <K> Observable<T> distinctUntilChanged(@NonNull Function<? super T,
      * <p>
      * Note that if element type {@code T} in the flow is mutable, the comparison of the previous and current
      * item may yield unexpected results if the items are mutated externally. Common cases are mutable
-     * {@code CharSequence}s or {@code List}s where the objects will actually have the same
+     * {@link CharSequence}s or {@link List}s where the objects will actually have the same
      * references when they are modified and {@code distinctUntilChanged} will evaluate subsequent items as same.
      * To avoid such situation, it is recommended that mutable data is converted to an immutable one,
      * for example using {@code map(CharSequence::toString)} or {@code map(list -> Collections.unmodifiableList(new ArrayList<>(list)))}.
@@ -8000,9 +8240,10 @@ public final <K> Observable<T> distinctUntilChanged(@NonNull Function<? super T,
      * </dl>
      *
      * @param comparer the function that receives the previous item and the current item and is
-     *                   expected to return true if the two are equal, thus skipping the current value.
-     * @return an Observable that emits those items from the source ObservableSource that are distinct from their
+     *                   expected to return {@code true} if the two are equal, thus skipping the current value.
+     * @return an {@code Observable} that emits those items from the current {@code Observable} that are distinct from their
      *         immediate predecessors
+     * @throws NullPointerException if {@code comparer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @since 2.0
      */
@@ -8015,8 +8256,9 @@ public final Observable<T> distinctUntilChanged(@NonNull BiPredicate<? super T,
     }
 
     /**
-     * Calls the specified consumer with the current item after this item has been emitted to the downstream.
-     * <p>Note that the {@code onAfterNext} action is shared between subscriptions and as such
+     * Calls the specified {@link Consumer} with the current item after this item has been emitted to the downstream.
+     * <p>
+     * Note that the {@code onAfterNext} action is shared between subscriptions and as such
      * should be thread-safe.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doAfterNext.o.png" alt="">
@@ -8027,8 +8269,9 @@ public final Observable<T> distinctUntilChanged(@NonNull BiPredicate<? super T,
      *  <dd>This operator supports boundary-limited synchronous or asynchronous queue-fusion.</dd>
      * </dl>
      * <p>History: 2.0.1 - experimental
-     * @param onAfterNext the Consumer that will be called after emitting an item from upstream to the downstream
-     * @return the new Observable instance
+     * @param onAfterNext the {@code Consumer} that will be called after emitting an item from upstream to the downstream
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code onAfterNext} is {@code null}
      * @since 2.1
      */
     @CheckReturnValue
@@ -8040,7 +8283,7 @@ public final Observable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext)
     }
 
     /**
-     * Registers an {@link Action} to be called when this ObservableSource invokes either
+     * Registers an {@link Action} to be called when the current {@code Observable} invokes either
      * {@link Observer#onComplete onComplete} or {@link Observer#onError onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doAfterTerminate.png" alt="">
@@ -8049,23 +8292,24 @@ public final Observable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext)
      *  <dd>{@code doAfterTerminate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param onFinally
-     *            an {@link Action} to be invoked when the source ObservableSource finishes
-     * @return an Observable that emits the same items as the source ObservableSource, then invokes the
-     *         {@link Action}
+     * @param onAfterTerminate
+     *            an {@code Action} to be invoked after the current {@code Observable} finishes
+     * @return an {@code Observable} that emits the same items as the current {@code Observable}, then invokes the
+     *         {@code Action}
+     * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doOnTerminate(Action)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Observable<T> doAfterTerminate(@NonNull Action onFinally) {
-        Objects.requireNonNull(onFinally, "onFinally is null");
-        return doOnEach(Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.EMPTY_ACTION, onFinally);
+    public final Observable<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
+        Objects.requireNonNull(onAfterTerminate, "onAfterTerminate is null");
+        return doOnEach(Functions.emptyConsumer(), Functions.emptyConsumer(), Functions.EMPTY_ACTION, onAfterTerminate);
     }
 
     /**
-     * Calls the specified action after this Observable signals onError or onCompleted or gets disposed by
+     * Calls the specified action after the current {@code Observable} signals {@code onError} or {@code onCompleted} or gets disposed by
      * the downstream.
      * <p>In case of a race between a terminal event and a dispose call, the provided {@code onFinally} action
      * is executed once per subscription.
@@ -8080,8 +8324,9 @@ public final Observable<T> doAfterTerminate(@NonNull Action onFinally) {
      *  <dd>This operator supports boundary-limited synchronous or asynchronous queue-fusion.</dd>
      * </dl>
      * <p>History: 2.0.1 - experimental
-     * @param onFinally the action called when this Observable terminates or gets disposed
-     * @return the new Observable instance
+     * @param onFinally the action called when the current {@code Observable} terminates or gets disposed
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code onFinally} is {@code null}
      * @since 2.1
      */
     @CheckReturnValue
@@ -8093,13 +8338,13 @@ public final Observable<T> doFinally(@NonNull Action onFinally) {
     }
 
     /**
-     * Calls the dispose {@code Action} if the downstream disposes the sequence.
+     * Calls the given shared {@link Action} if the downstream disposes the sequence.
      * <p>
      * The action is shared between subscriptions and thus may be called concurrently from multiple
      * threads; the action must be thread safe.
      * <p>
      * If the action throws a runtime exception, that exception is rethrown by the {@code dispose()} call,
-     * sometimes as a {@code CompositeException} if there were multiple exceptions along the way.
+     * sometimes as a {@link CompositeException} if there were multiple exceptions along the way.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnDispose.png" alt="">
      * <dl>
@@ -8108,9 +8353,9 @@ public final Observable<T> doFinally(@NonNull Action onFinally) {
      * </dl>
      *
      * @param onDispose
-     *            the action that gets called when the source {@code ObservableSource}'s Disposable is disposed
-     * @return the source {@code ObservableSource} modified so as to call this Action when appropriate
-     * @throws NullPointerException if onDispose is null
+     *            the action that gets called when the current {@code Observable}'s {@link Disposable} is disposed
+     * @return the current {@code Observable} modified so as to call this {@code Action} when appropriate
+     * @throws NullPointerException if {@code onDispose} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -8121,7 +8366,7 @@ public final Observable<T> doOnDispose(@NonNull Action onDispose) {
     }
 
     /**
-     * Modifies the source ObservableSource so that it invokes an action when it calls {@code onComplete}.
+     * Returns an {@code Observable} that invokes an {@link Action} when the current {@code Observable} calls {@code onComplete}.
      * <p>
      * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.o.png" alt="">
      * <dl>
@@ -8130,8 +8375,9 @@ public final Observable<T> doOnDispose(@NonNull Action onDispose) {
      * </dl>
      *
      * @param onComplete
-     *            the action to invoke when the source ObservableSource calls {@code onComplete}
-     * @return the source ObservableSource with the side-effecting behavior applied
+     *            the action to invoke when the current {@code Observable} calls {@code onComplete}
+     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -8142,8 +8388,8 @@ public final Observable<T> doOnComplete(@NonNull Action onComplete) {
     }
 
     /**
-     * Calls the appropriate onXXX consumer (shared between all subscribers) whenever a signal with the same type
-     * passes through, before forwarding them to downstream.
+     * Calls the appropriate {@code onXXX} consumer (shared between all {@link Observer}s) whenever a signal with the same type
+     * passes through, before forwarding them to the downstream.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
      * <dl>
@@ -8151,7 +8397,8 @@ public final Observable<T> doOnComplete(@NonNull Action onComplete) {
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source ObservableSource with the side-effecting behavior applied
+     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onNext}, {@code onError}, {@code onComplete} or {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -8166,7 +8413,8 @@ private Observable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Con
     }
 
     /**
-     * Modifies the source ObservableSource so that it invokes an action for each item it emits.
+     * Returns an {@code Observable} that invokes a {@link Consumer} with the appropriate {@link Notification}
+     * object when the current {@code Observable} signals an item or terminates.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
      * <dl>
@@ -8175,8 +8423,9 @@ private Observable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Con
      * </dl>
      *
      * @param onNotification
-     *            the action to invoke for each item emitted by the source ObservableSource
-     * @return the source ObservableSource with the side-effecting behavior applied
+     *            the action to invoke for each item emitted by the current {@code Observable}
+     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onNotification} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -8193,7 +8442,8 @@ public final Observable<T> doOnEach(@NonNull Consumer<? super Notification<T>> o
     }
 
     /**
-     * Modifies the source ObservableSource so that it notifies an Observer for each item and terminal event it emits.
+     * Returns an {@code Observable} that forwards the items and terminal events of the current
+     * {@code Observable} to its {@link Observer}s and to the given shared {@code Observer} instance.
      * <p>
      * In case the {@code onError} of the supplied observer throws, the downstream will receive a composite
      * exception containing the original exception and the exception thrown by {@code onError}. If either the
@@ -8207,9 +8457,10 @@ public final Observable<T> doOnEach(@NonNull Consumer<? super Notification<T>> o
      * </dl>
      *
      * @param observer
-     *            the observer to be notified about onNext, onError and onComplete events on its
-     *            respective methods before the actual downstream Observer gets notified.
-     * @return the source ObservableSource with the side-effecting behavior applied
+     *            the observer to be notified about {@code onNext}, {@code onError} and {@code onComplete} events on its
+     *            respective methods before the actual downstream {@code Observer} gets notified.
+     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code observer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -8225,7 +8476,7 @@ public final Observable<T> doOnEach(@NonNull Observer<? super T> observer) {
     }
 
     /**
-     * Modifies the source ObservableSource so that it invokes an action if it calls {@code onError}.
+     * Modifies the current {@code Observable} so that it invokes an action if it calls {@code onError}.
      * <p>
      * In case the {@code onError} action throws, the downstream will receive a composite exception containing
      * the original exception and the exception thrown by {@code onError}.
@@ -8237,8 +8488,9 @@ public final Observable<T> doOnEach(@NonNull Observer<? super T> observer) {
      * </dl>
      *
      * @param onError
-     *            the action to invoke if the source ObservableSource calls {@code onError}
-     * @return the source ObservableSource with the side-effecting behavior applied
+     *            the action to invoke if the current {@code Observable} calls {@code onError}
+     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onError} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -8249,7 +8501,7 @@ public final Observable<T> doOnError(@NonNull Consumer<? super Throwable> onErro
     }
 
     /**
-     * Calls the appropriate onXXX method (shared between all Observer) for the lifecycle events of
+     * Calls the appropriate {@code onXXX} method (shared between all {@link Observer}s) for the lifecycle events of
      * the sequence (subscription, disposal).
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnLifecycle.o.png" alt="">
@@ -8259,10 +8511,11 @@ public final Observable<T> doOnError(@NonNull Consumer<? super Throwable> onErro
      * </dl>
      *
      * @param onSubscribe
-     *              a Consumer called with the Disposable sent via Observer.onSubscribe()
+     *              a {@link Consumer} called with the {@link Disposable} sent via {@link Observer#onSubscribe(Disposable)}
      * @param onDispose
-     *              called when the downstream disposes the Disposable via dispose()
-     * @return the source ObservableSource with the side-effecting behavior applied
+     *              called when the downstream disposes the {@code Disposable} via {@code dispose()}
+     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onSubscribe} or {@code onDispose} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -8275,7 +8528,7 @@ public final Observable<T> doOnLifecycle(@NonNull Consumer<? super Disposable> o
     }
 
     /**
-     * Modifies the source ObservableSource so that it invokes an action when it calls {@code onNext}.
+     * Modifies the current {@code Observable} so that it invokes an action when it calls {@code onNext}.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.o.png" alt="">
      * <dl>
@@ -8284,8 +8537,9 @@ public final Observable<T> doOnLifecycle(@NonNull Consumer<? super Disposable> o
      * </dl>
      *
      * @param onNext
-     *            the action to invoke when the source ObservableSource calls {@code onNext}
-     * @return the source ObservableSource with the side-effecting behavior applied
+     *            the action to invoke when the current {@code Observable} calls {@code onNext}
+     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -8296,9 +8550,9 @@ public final Observable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Modifies the source {@code ObservableSource} so that it invokes the given action when it is subscribed from
-     * its subscribers. Each subscription will result in an invocation of the given action except when the
-     * source {@code ObservableSource} is reference counted, in which case the source {@code ObservableSource} will invoke
+     * Returns an {@code Observable} so that it invokes the given {@link Consumer} when the current {@code Observable} is subscribed from
+     * its {@link Observer}s. Each subscription will result in an invocation of the given action except when the
+     * current {@code Observable} is reference counted, in which case the current {@code Observable} will invoke
      * the given action for the first subscription.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSubscribe.png" alt="">
@@ -8308,8 +8562,9 @@ public final Observable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
      * </dl>
      *
      * @param onSubscribe
-     *            the Consumer that gets called when an Observer subscribes to the current {@code Observable}
-     * @return the source {@code ObservableSource} modified so as to call this Consumer when appropriate
+     *            the {@code Consumer} that gets called when an {@code Observer} subscribes to the current {@code Observable}
+     * @return the current {@code Observable} modified so as to call this {@code Consumer} whenever it gets subscribed
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -8320,7 +8575,7 @@ public final Observable<T> doOnSubscribe(@NonNull Consumer<? super Disposable> o
     }
 
     /**
-     * Modifies the source ObservableSource so that it invokes an action when it calls {@code onComplete} or
+     * Returns an {@code Observable} so that it invokes an action when the current {@code Observable} calls {@code onComplete} or
      * {@code onError}.
      * <p>
      * <img width="640" height="327" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.o.png" alt="">
@@ -8333,8 +8588,9 @@ public final Observable<T> doOnSubscribe(@NonNull Consumer<? super Disposable> o
      * </dl>
      *
      * @param onTerminate
-     *            the action to invoke when the source ObservableSource calls {@code onComplete} or {@code onError}
-     * @return the source ObservableSource with the side-effecting behavior applied
+     *            the action to invoke when the current {@code Observable} calls {@code onComplete} or {@code onError}
+     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doAfterTerminate(Action)
      */
@@ -8349,8 +8605,8 @@ public final Observable<T> doOnTerminate(@NonNull Action onTerminate) {
     }
 
     /**
-     * Returns a Maybe that emits the single item at a specified index in a sequence of emissions from
-     * this Observable or completes if this Observable signals fewer elements than index.
+     * Returns a {@link Maybe} that emits the single item at a specified index in a sequence of emissions from
+     * the current {@code Observable} or completes if the current {@code Observable} signals fewer elements than index.
      * <p>
      * <img width="640" height="363" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAt.o.png" alt="">
      * <dl>
@@ -8360,10 +8616,10 @@ public final Observable<T> doOnTerminate(@NonNull Action onTerminate) {
      *
      * @param index
      *            the zero-based index of the item to retrieve
-     * @return a Maybe that emits a single item: the item at the specified position in the sequence of
-     *         those emitted by the source ObservableSource
+     * @return a {@code Maybe} that emits a single item: the item at the specified position in the sequence of
+     *         those emitted by the current {@code Observable}
      * @throws IndexOutOfBoundsException
-     *             if {@code index} is less than 0
+     *             if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
      */
     @CheckReturnValue
@@ -8377,8 +8633,8 @@ public final Maybe<T> elementAt(long index) {
     }
 
     /**
-     * Returns a Single that emits the item found at a specified index in a sequence of emissions from
-     * this Observable, or a default item if that index is out of range.
+     * Returns a {@link Single} that emits the item found at a specified index in a sequence of emissions from
+     * the current {@code Observable}, or a default item if that index is out of range.
      * <p>
      * <img width="640" height="353" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtDefault.o.png" alt="">
      * <dl>
@@ -8390,10 +8646,11 @@ public final Maybe<T> elementAt(long index) {
      *            the zero-based index of the item to retrieve
      * @param defaultItem
      *            the default item
-     * @return a Single that emits the item at the specified position in the sequence emitted by the source
-     *         ObservableSource, or the default item if that index is outside the bounds of the source sequence
+     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the current
+     *         {@code Observable}, or the default item if that index is outside the bounds of the source sequence
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @throws IndexOutOfBoundsException
-     *             if {@code index} is less than 0
+     *             if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
      */
     @CheckReturnValue
@@ -8408,8 +8665,8 @@ public final Single<T> elementAt(long index, @NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Single that emits the item found at a specified index in a sequence of emissions from this Observable
-     * or signals a {@link NoSuchElementException} if this Observable signals fewer elements than index.
+     * Returns a {@link Single} that emits the item found at a specified index in a sequence of emissions from the current {@code Observable}
+     * or signals a {@link NoSuchElementException} if the current {@code Observable} signals fewer elements than index.
      * <p>
      * <img width="640" height="362" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrError.o.png" alt="">
      * <dl>
@@ -8419,10 +8676,10 @@ public final Single<T> elementAt(long index, @NonNull T defaultItem) {
      *
      * @param index
      *            the zero-based index of the item to retrieve
-     * @return a Single that emits the item at the specified position in the sequence emitted by the source
-     *         ObservableSource, or the default item if that index is outside the bounds of the source sequence
+     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the current
+     *         {@code Observable}, or the default item if that index is outside the bounds of the source sequence
      * @throws IndexOutOfBoundsException
-     *             if {@code index} is less than 0
+     *             if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
      */
     @CheckReturnValue
@@ -8436,7 +8693,7 @@ public final Single<T> elementAtOrError(long index) {
     }
 
     /**
-     * Filters items emitted by an ObservableSource by only emitting those that satisfy a specified predicate.
+     * Filters items emitted by the current {@code Observable} by only emitting those that satisfy a specified {@link Predicate}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.png" alt="">
      * <dl>
@@ -8445,10 +8702,11 @@ public final Single<T> elementAtOrError(long index) {
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates each item emitted by the source ObservableSource, returning {@code true}
+     *            a function that evaluates each item emitted by the current {@code Observable}, returning {@code true}
      *            if it passes the filter
-     * @return an Observable that emits only those items emitted by the source ObservableSource that the filter
+     * @return an {@code Observable} that emits only those items emitted by the current {@code Observable} that the filter
      *         evaluates as {@code true}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
     @CheckReturnValue
@@ -8460,8 +8718,8 @@ public final Observable<T> filter(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns a Maybe that emits only the very first item emitted by the source ObservableSource, or
-     * completes if the source ObservableSource is empty.
+     * Returns a {@link Maybe} that emits only the very first item emitted by the current {@code Observable}, or
+     * completes if the current {@code Observable} is empty.
      * <p>
      * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstElement.m.png" alt="">
      * <dl>
@@ -8469,7 +8727,7 @@ public final Observable<T> filter(@NonNull Predicate<? super T> predicate) {
      *  <dd>{@code firstElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Maybe instance
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -8480,8 +8738,8 @@ public final Maybe<T> firstElement() {
     }
 
     /**
-     * Returns a Single that emits only the very first item emitted by the source ObservableSource, or a default item
-     * if the source ObservableSource completes without emitting any items.
+     * Returns a {@link Single} that emits only the very first item emitted by the current {@code Observable}, or a default item
+     * if the current {@code Observable} completes without emitting any items.
      * <p>
      * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
      * <dl>
@@ -8490,8 +8748,9 @@ public final Maybe<T> firstElement() {
      * </dl>
      *
      * @param defaultItem
-     *            the default item to emit if the source ObservableSource doesn't emit anything
-     * @return the new Single instance
+     *            the default item to emit if the current {@code Observable} doesn't emit anything
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -8502,8 +8761,8 @@ public final Single<T> first(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Single that emits only the very first item emitted by this Observable or
-     * signals a {@link NoSuchElementException} if this Observable is empty.
+     * Returns a {@link Single} that emits only the very first item emitted by the current {@code Observable} or
+     * signals a {@link NoSuchElementException} if the current {@code Observable} is empty.
      * <p>
      * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrError.o.png" alt="">
      * <dl>
@@ -8511,7 +8770,7 @@ public final Single<T> first(@NonNull T defaultItem) {
      *  <dd>{@code firstOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -8522,9 +8781,9 @@ public final Single<T> firstOrError() {
     }
 
     /**
-     * Returns an Observable that emits items based on applying a function that you supply to each item emitted
-     * by the source ObservableSource, where that function returns an ObservableSource, and then merging those resulting
-     * ObservableSources and emitting the results of this merger.
+     * Returns an {@code Observable} that emits items based on applying a function that you supply to each item emitted
+     * by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then merging those returned
+     * {@code ObservableSource}s and emitting the results of this merger.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt="">
      * <dl>
@@ -8532,13 +8791,14 @@ public final Single<T> firstOrError() {
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner ObservableSources and the output type
+     * @param <R> the value type of the inner {@code ObservableSource}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
-     * @return an Observable that emits the result of applying the transformation function to each item emitted
-     *         by the source ObservableSource and merging the results of the ObservableSources obtained from this
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
+     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
+     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -8549,9 +8809,9 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     }
 
     /**
-     * Returns an Observable that emits items based on applying a function that you supply to each item emitted
-     * by the source ObservableSource, where that function returns an ObservableSource, and then merging those resulting
-     * ObservableSources and emitting the results of this merger.
+     * Returns an {@code Observable} that emits items based on applying a function that you supply to each item emitted
+     * by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then merging those returned
+     * {@code ObservableSource}s and emitting the results of this merger.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapDelayError.o.png" alt="">
      * <dl>
@@ -8559,16 +8819,17 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner ObservableSources and the output type
+     * @param <R> the value type of the inner {@code ObservableSource}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
      * @param delayErrors
-     *            if true, exceptions from the current Observable and all inner ObservableSources are delayed until all of them terminate
-     *            if false, the first one signalling an exception will terminate the whole sequence immediately
-     * @return an Observable that emits the result of applying the transformation function to each item emitted
-     *         by the source ObservableSource and merging the results of the ObservableSources obtained from this
+     *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
+     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
+     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -8579,10 +8840,10 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     }
 
     /**
-     * Returns an Observable that emits items based on applying a function that you supply to each item emitted
-     * by the source ObservableSource, where that function returns an ObservableSource, and then merging those resulting
-     * ObservableSources and emitting the results of this merger, while limiting the maximum number of concurrent
-     * subscriptions to these ObservableSources.
+     * Returns an {@code Observable} that emits items based on applying a function that you supply to each item emitted
+     * by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then merging those returned
+     * {@code ObservableSource}s and emitting the results of this merger, while limiting the maximum number of concurrent
+     * subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="441" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
      * <dl>
@@ -8590,18 +8851,20 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner ObservableSources and the output type
+     * @param <R> the value type of the inner {@code ObservableSource}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
      * @param maxConcurrency
-     *         the maximum number of ObservableSources that may be subscribed to concurrently
+     *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param delayErrors
-     *            if true, exceptions from the current Observable and all inner ObservableSources are delayed until all of them terminate
-     *            if false, the first one signalling an exception will terminate the whole sequence immediately
-     * @return an Observable that emits the result of applying the transformation function to each item emitted
-     *         by the source ObservableSource and merging the results of the ObservableSources obtained from this
+     *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
+     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
+     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -8613,10 +8876,10 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     }
 
     /**
-     * Returns an Observable that emits items based on applying a function that you supply to each item emitted
-     * by the source ObservableSource, where that function returns an ObservableSource, and then merging those resulting
-     * ObservableSources and emitting the results of this merger, while limiting the maximum number of concurrent
-     * subscriptions to these ObservableSources.
+     * Returns an {@code Observable} that emits items based on applying a function that you supply to each item emitted
+     * by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then merging those returned
+     * {@code ObservableSource}s and emitting the results of this merger, while limiting the maximum number of concurrent
+     * subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="441" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
      * <dl>
@@ -8624,20 +8887,22 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner ObservableSources and the output type
+     * @param <R> the value type of the inner {@code ObservableSource}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
      * @param maxConcurrency
-     *         the maximum number of ObservableSources that may be subscribed to concurrently
+     *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param delayErrors
-     *            if true, exceptions from the current Observable and all inner ObservableSources are delayed until all of them terminate
-     *            if false, the first one signalling an exception will terminate the whole sequence immediately
+     *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @param bufferSize
-     *            the number of elements to prefetch from each inner ObservableSource
-     * @return an Observable that emits the result of applying the transformation function to each item emitted
-     *         by the source ObservableSource and merging the results of the ObservableSources obtained from this
+     *            the number of elements expected from each inner {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
+     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -8661,8 +8926,8 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     }
 
     /**
-     * Returns an Observable that applies a function to each item emitted or notification raised by the source
-     * ObservableSource and then flattens the ObservableSources returned from these functions and emits the resulting items.
+     * Returns an {@code Observable} that applies a function to each item emitted or notification raised by the current
+     * {@code Observable} and then flattens the {@link ObservableSource}s returned from these functions and emits the resulting items.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt="">
      * <dl>
@@ -8673,15 +8938,16 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * @param <R>
      *            the result type
      * @param onNextMapper
-     *            a function that returns an ObservableSource to merge for each item emitted by the source ObservableSource
+     *            a function that returns an {@code ObservableSource} to merge for each item emitted by the current {@code Observable}
      * @param onErrorMapper
-     *            a function that returns an ObservableSource to merge for an onError notification from the source
-     *            ObservableSource
+     *            a function that returns an {@code ObservableSource} to merge for an {@code onError} notification from the current
+     *            {@code Observable}
      * @param onCompleteSupplier
-     *            a function that returns an ObservableSource to merge for an onComplete notification from the source
-     *            ObservableSource
-     * @return an Observable that emits the results of merging the ObservableSources returned from applying the
-     *         specified functions to the emissions and notifications of the source ObservableSource
+     *            a function that returns an {@code ObservableSource} to merge for an {@code onComplete} notification from the current
+     *            {@code Observable}
+     * @return an {@code Observable} that emits the results of merging the {@code ObservableSource}s returned from applying the
+     *         specified functions to the emissions and notifications of the current {@code Observable}
+     * @throws NullPointerException if {@code onNextMapper} or {@code onErrorMapper} or {@code onCompleteSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -8698,9 +8964,9 @@ public final <R> Observable<R> flatMap(
     }
 
     /**
-     * Returns an Observable that applies a function to each item emitted or notification raised by the source
-     * ObservableSource and then flattens the ObservableSources returned from these functions and emits the resulting items,
-     * while limiting the maximum number of concurrent subscriptions to these ObservableSources.
+     * Returns an {@code Observable} that applies a function to each item emitted or notification raised by the current
+     * {@code Observable} and then flattens the {@link ObservableSource}s returned from these functions and emits the resulting items,
+     * while limiting the maximum number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt="">
      * <dl>
@@ -8711,17 +8977,19 @@ public final <R> Observable<R> flatMap(
      * @param <R>
      *            the result type
      * @param onNextMapper
-     *            a function that returns an ObservableSource to merge for each item emitted by the source ObservableSource
+     *            a function that returns an {@code ObservableSource} to merge for each item emitted by the current {@code Observable}
      * @param onErrorMapper
-     *            a function that returns an ObservableSource to merge for an onError notification from the source
-     *            ObservableSource
+     *            a function that returns an {@code ObservableSource} to merge for an {@code onError} notification from the current
+     *            {@code Observable}
      * @param onCompleteSupplier
-     *            a function that returns an ObservableSource to merge for an onComplete notification from the source
-     *            ObservableSource
+     *            a function that returns an {@code ObservableSource} to merge for an {@code onComplete} notification from the current
+     *            {@code Observable}
      * @param maxConcurrency
-     *         the maximum number of ObservableSources that may be subscribed to concurrently
-     * @return an Observable that emits the results of merging the ObservableSources returned from applying the
-     *         specified functions to the emissions and notifications of the source ObservableSource
+     *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
+     * @return an {@code Observable} that emits the results of merging the {@code ObservableSource}s returned from applying the
+     *         specified functions to the emissions and notifications of the current {@code Observable}
+     * @throws NullPointerException if {@code onNextMapper} or {@code onErrorMapper} or {@code onCompleteSupplier} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -8740,10 +9008,10 @@ public final <R> Observable<R> flatMap(
     }
 
     /**
-     * Returns an Observable that emits items based on applying a function that you supply to each item emitted
-     * by the source ObservableSource, where that function returns an ObservableSource, and then merging those resulting
-     * ObservableSources and emitting the results of this merger, while limiting the maximum number of concurrent
-     * subscriptions to these ObservableSources.
+     * Returns an {@code Observable} that emits items based on applying a function that you supply to each item emitted
+     * by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then merging those returned
+     * {@code ObservableSource}s and emitting the results of this merger, while limiting the maximum number of concurrent
+     * subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="441" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
      * <dl>
@@ -8751,15 +9019,17 @@ public final <R> Observable<R> flatMap(
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the value type of the inner ObservableSources and the output type
+     * @param <R> the value type of the inner {@code ObservableSource}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
      * @param maxConcurrency
-     *         the maximum number of ObservableSources that may be subscribed to concurrently
-     * @return an Observable that emits the result of applying the transformation function to each item emitted
-     *         by the source ObservableSource and merging the results of the ObservableSources obtained from this
+     *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
+     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
+     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -8771,8 +9041,8 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     }
 
     /**
-     * Returns an Observable that emits the results of a specified function to the pair of values emitted by the
-     * source ObservableSource and a specified collection ObservableSource.
+     * Returns an {@code Observable} that emits the results of a specified function to the pair of values emitted by the
+     * current {@code Observable} and the mapped inner {@link ObservableSource}.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
@@ -8781,29 +9051,30 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the collection ObservableSource
+     *            the type of items emitted by the collection {@code ObservableSource}
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param mapper
-     *            a function that returns an ObservableSource for each item emitted by the source ObservableSource
-     * @param resultSelector
-     *            a function that combines one item emitted by each of the source and collection ObservableSources and
-     *            returns an item to be emitted by the resulting ObservableSource
-     * @return an Observable that emits the results of applying a function to a pair of values emitted by the
-     *         source ObservableSource and the collection ObservableSource
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}
+     * @param combiner
+     *            a function that combines one item emitted by each of the source and collection {@code ObservableSource}s and
+     *            returns an item to be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
+     *         current {@code Observable} and the inner {@code ObservableSource}s
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
-            @NonNull BiFunction<? super T, ? super U, ? extends R> resultSelector) {
-        return flatMap(mapper, resultSelector, false, bufferSize(), bufferSize());
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
+        return flatMap(mapper, combiner, false, bufferSize(), bufferSize());
     }
 
     /**
-     * Returns an Observable that emits the results of a specified function to the pair of values emitted by the
-     * source ObservableSource and a specified collection ObservableSource.
+     * Returns an {@code Observable} that emits the results of a specified function to the pair of values emitted by the
+     * current {@code Observable} and the mapped inner {@link ObservableSource}.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
@@ -8812,19 +9083,20 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the collection ObservableSource
+     *            the type of items emitted by the collection {@code ObservableSource}
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param mapper
-     *            a function that returns an ObservableSource for each item emitted by the source ObservableSource
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}
      * @param combiner
-     *            a function that combines one item emitted by each of the source and collection ObservableSources and
-     *            returns an item to be emitted by the resulting ObservableSource
+     *            a function that combines one item emitted by each of the source and collection {@code ObservableSource}s and
+     *            returns an item to be emitted by the resulting {@code Observable}
      * @param delayErrors
-     *            if true, exceptions from the current Observable and all inner ObservableSources are delayed until all of them terminate
-     *            if false, the first one signalling an exception will terminate the whole sequence immediately
-     * @return an Observable that emits the results of applying a function to a pair of values emitted by the
-     *         source ObservableSource and the collection ObservableSource
+     *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
+     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
+     *         current {@code Observable} and the inner {@code ObservableSource}s
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -8836,9 +9108,9 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Returns an Observable that emits the results of a specified function to the pair of values emitted by the
-     * source ObservableSource and a specified collection ObservableSource, while limiting the maximum number of concurrent
-     * subscriptions to these ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified function to the pair of values emitted by the
+     * current {@code Observable} and the mapped inner {@link ObservableSource}, while limiting the maximum number of concurrent
+     * subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
@@ -8847,21 +9119,23 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the collection ObservableSource
+     *            the type of items emitted by the collection {@code ObservableSource}
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param mapper
-     *            a function that returns an ObservableSource for each item emitted by the source ObservableSource
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}
      * @param combiner
-     *            a function that combines one item emitted by each of the source and collection ObservableSources and
-     *            returns an item to be emitted by the resulting ObservableSource
+     *            a function that combines one item emitted by each of the source and collection {@code ObservableSource}s and
+     *            returns an item to be emitted by the resulting {@code Observable}
      * @param maxConcurrency
-     *         the maximum number of ObservableSources that may be subscribed to concurrently
+     *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param delayErrors
-     *            if true, exceptions from the current Observable and all inner ObservableSources are delayed until all of them terminate
-     *            if false, the first one signalling an exception will terminate the whole sequence immediately
-     * @return an Observable that emits the results of applying a function to a pair of values emitted by the
-     *         source ObservableSource and the collection ObservableSource
+     *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
+     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
+     *         current {@code Observable} and the inner {@code ObservableSource}
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -8874,9 +9148,9 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Returns an Observable that emits the results of a specified function to the pair of values emitted by the
-     * source ObservableSource and a specified collection ObservableSource, while limiting the maximum number of concurrent
-     * subscriptions to these ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified function to the pair of values emitted by the
+     * current {@code Observable} and the mapped inner {@link ObservableSource}, while limiting the maximum number of concurrent
+     * subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
@@ -8885,23 +9159,25 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the collection ObservableSource
+     *            the type of items emitted by the collection {@code ObservableSource}
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param mapper
-     *            a function that returns an ObservableSource for each item emitted by the source ObservableSource
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}
      * @param combiner
-     *            a function that combines one item emitted by each of the source and collection ObservableSources and
-     *            returns an item to be emitted by the resulting ObservableSource
+     *            a function that combines one item emitted by each of the source and collection {@code ObservableSource}s and
+     *            returns an item to be emitted by the resulting {@code Observable}
      * @param maxConcurrency
-     *         the maximum number of ObservableSources that may be subscribed to concurrently
+     *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param delayErrors
-     *            if true, exceptions from the current Observable and all inner ObservableSources are delayed until all of them terminate
-     *            if false, the first one signalling an exception will terminate the whole sequence immediately
+     *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
+     *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @param bufferSize
-     *            the number of elements to prefetch from the inner ObservableSources.
-     * @return an Observable that emits the results of applying a function to a pair of values emitted by the
-     *         source ObservableSource and the collection ObservableSource
+     *            the number of elements expected from the inner {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
+     *         current {@code Observable} and the inner {@code ObservableSource}
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -8916,9 +9192,9 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Returns an Observable that emits the results of a specified function to the pair of values emitted by the
-     * source ObservableSource and a specified collection ObservableSource, while limiting the maximum number of concurrent
-     * subscriptions to these ObservableSources.
+     * Returns an {@code Observable} that emits the results of a specified function to the pair of values emitted by the
+     * current {@code Observable} and the mapped inner {@link ObservableSource}, while limiting the maximum number of concurrent
+     * subscriptions to these {@code ObservableSource}s.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
@@ -8927,18 +9203,20 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the collection ObservableSource
+     *            the type of items emitted by the collection {@code ObservableSource}
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param mapper
-     *            a function that returns an ObservableSource for each item emitted by the source ObservableSource
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}
      * @param combiner
-     *            a function that combines one item emitted by each of the source and collection ObservableSources and
-     *            returns an item to be emitted by the resulting ObservableSource
+     *            a function that combines one item emitted by each of the source and collection {@code ObservableSource}s and
+     *            returns an item to be emitted by the resulting {@code Observable}
      * @param maxConcurrency
-     *         the maximum number of ObservableSources that may be subscribed to concurrently
-     * @return an Observable that emits the results of applying a function to a pair of values emitted by the
-     *         source ObservableSource and the collection ObservableSource
+     *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
+     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
+     *         current {@code Observable} and the inner {@code ObservableSource}s
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -8951,16 +9229,17 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Maps each element of the upstream Observable into CompletableSources, subscribes to them and
-     * waits until the upstream and all CompletableSources complete.
+     * Maps each element of the current {@code Observable} into {@link CompletableSource}s, subscribes to them and
+     * waits until the upstream and all {@code CompletableSource}s complete.
      * <p>
      * <img width="640" height="424" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapCompletable.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param mapper the function that received each source value and transforms them into CompletableSources.
-     * @return the new Completable instance
+     * @param mapper the function that received each source value and transforms them into {@code CompletableSource}s.
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @return the new {@link Completable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -8970,18 +9249,19 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Maps each element of the upstream Observable into CompletableSources, subscribes to them and
-     * waits until the upstream and all CompletableSources complete, optionally delaying all errors.
+     * Maps each element of the current {@code Observable} into {@link CompletableSource}s, subscribes to them and
+     * waits until the upstream and all {@code CompletableSource}s complete, optionally delaying all errors.
      * <p>
      * <img width="640" height="361" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapCompletableDelayError.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param mapper the function that received each source value and transforms them into CompletableSources.
-     * @param delayErrors if true errors from the upstream and inner CompletableSources are delayed until each of them
-     * terminates.
-     * @return the new Completable instance
+     * @param mapper the function that received each source value and transforms them into {@code CompletableSource}s.
+     * @param delayErrors if {@code true}, errors from the upstream and inner {@code CompletableSource}s are delayed until all of them
+     * terminate.
+     * @return the new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -8992,8 +9272,8 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Returns an Observable that merges each item emitted by the source ObservableSource with the values in an
-     * Iterable corresponding to that item that is generated by a selector.
+     * Merges {@link Iterable}s generated by a mapper {@link Function} for each individual item emitted by
+     * the current {@code Observable} into a single {@code Observable} sequence.
      * <p>
      * <img width="640" height="343" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.o.png" alt="">
      * <dl>
@@ -9002,12 +9282,12 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting Iterable
+     *            the output type and the element type of the {@code Iterable}s
      * @param mapper
-     *            a function that returns an Iterable sequence of values for when given an item emitted by the
-     *            source ObservableSource
-     * @return an Observable that emits the results of merging the items emitted by the source ObservableSource with
-     *         the values in the Iterables corresponding to those items, as generated by {@code collectionSelector}
+     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
+     *            current {@code Observable}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -9019,8 +9299,10 @@ public final <U> Observable<U> flatMapIterable(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Returns an Observable that emits the results of applying a function to the pair of values from the source
-     * ObservableSource and an Iterable corresponding to that item that is generated by a selector.
+     * Merges {@link Iterable}s generated by a mapper {@link Function} for each individual item emitted by
+     * the current {@code Observable} into a single {@code Observable} sequence where the resulting items will
+     * be the combination of the original item and each inner item of the respective {@code Iterable} as returned
+     * by the {@code resultSelector} {@link BiFunction}.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.o.r.png" alt="">
      * <dl>
@@ -9029,32 +9311,32 @@ public final <U> Observable<U> flatMapIterable(@NonNull Function<? super T, ? ex
      * </dl>
      *
      * @param <U>
-     *            the collection element type
+     *            the element type of the {@code Iterable}s
      * @param <V>
-     *            the type of item emitted by the resulting Iterable
+     *            the output type as determined by the {@code resultSelector} function
      * @param mapper
-     *            a function that returns an Iterable sequence of values for each item emitted by the source
-     *            ObservableSource
-     * @param resultSelector
-     *            a function that returns an item based on the item emitted by the source ObservableSource and the
-     *            Iterable returned for that item by the {@code collectionSelector}
-     * @return an Observable that emits the items returned by {@code resultSelector} for each item in the source
-     *         ObservableSource
+     *            a function that returns an {@code Iterable} sequence of values for each item emitted by the current
+     *            {@code Observable}
+     * @param combiner
+     *            a function that returns an item based on the item emitted by the current {@code Observable} and the
+     *            next item of the {@code Iterable} returned for that original item by the {@code mapper}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <U, V> Observable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
-            @NonNull BiFunction<? super T, ? super U, ? extends V> resultSelector) {
+            @NonNull BiFunction<? super T, ? super U, ? extends V> combiner) {
         Objects.requireNonNull(mapper, "mapper is null");
-        Objects.requireNonNull(resultSelector, "resultSelector is null");
-        return flatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), bufferSize());
+        Objects.requireNonNull(combiner, "combiner is null");
+        return flatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), combiner, false, bufferSize(), bufferSize());
     }
 
     /**
-     * Maps each element of the upstream Observable into MaybeSources, subscribes to all of them
-     * and merges their onSuccess values, in no particular order, into a single Observable sequence.
+     * Maps each element of the current {@code Observable} into {@link MaybeSource}s, subscribes to all of them
+     * and merges their {@code onSuccess} values, in no particular order, into a single {@code Observable} sequence.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.png" alt="">
      * <dl>
@@ -9062,8 +9344,9 @@ public final <U, V> Observable<V> flatMapIterable(@NonNull Function<? super T, ?
      *  <dd>{@code flatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the result value type
-     * @param mapper the function that received each source value and transforms them into MaybeSources.
-     * @return the new Observable instance
+     * @param mapper the function that received each source value and transforms them into {@code MaybeSource}s.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -9073,8 +9356,8 @@ public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Maps each element of the upstream Observable into MaybeSources, subscribes to them
-     * and merges their onSuccess values, in no particular order, into a single Observable sequence,
+     * Maps each element of the current {@code Observable} into {@link MaybeSource}s, subscribes to them
+     * and merges their {@code onSuccess} values, in no particular order, into a single {@code Observable} sequence,
      * optionally delaying all errors.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.png" alt="">
@@ -9083,10 +9366,11 @@ public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? exten
      *  <dd>{@code flatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the result value type
-     * @param mapper the function that received each source value and transforms them into MaybeSources.
-     * @param delayErrors if true errors from the upstream and inner MaybeSources are delayed until each of them
-     * terminates.
-     * @return the new Observable instance
+     * @param mapper the function that received each source value and transforms them into {@code MaybeSource}s.
+     * @param delayErrors if {@code true}, errors from the upstream and inner {@code MaybeSource}s are delayed until all of them
+     * terminate.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -9097,8 +9381,8 @@ public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? exten
     }
 
     /**
-     * Maps each element of the upstream Observable into SingleSources, subscribes to all of them
-     * and merges their onSuccess values, in no particular order, into a single Observable sequence.
+     * Maps each element of the current {@code Observable} into {@link SingleSource}s, subscribes to all of them
+     * and merges their {@code onSuccess} values, in no particular order, into a single {@code Observable} sequence.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapSingle.png" alt="">
      * <dl>
@@ -9106,8 +9390,9 @@ public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? exten
      *  <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the result value type
-     * @param mapper the function that received each source value and transforms them into SingleSources.
-     * @return the new Observable instance
+     * @param mapper the function that received each source value and transforms them into {@code SingleSource}s.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -9117,8 +9402,8 @@ public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? exte
     }
 
     /**
-     * Maps each element of the upstream Observable into SingleSources, subscribes to them
-     * and merges their onSuccess values, in no particular order, into a single Observable sequence,
+     * Maps each element of the current {@code Observable} into {@link SingleSource}s, subscribes to them
+     * and merges their {@code onSuccess} values, in no particular order, into a single {@code Observable} sequence,
      * optionally delaying all errors.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapSingle.png" alt="">
@@ -9127,10 +9412,11 @@ public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? exte
      *  <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <R> the result value type
-     * @param mapper the function that received each source value and transforms them into SingleSources.
-     * @param delayErrors if true errors from the upstream and inner SingleSources are delayed until each of them
+     * @param mapper the function that received each source value and transforms them into {@code SingleSource}s.
+     * @param delayErrors if {@code true}, errors from the upstream and inner {@code SingleSource}s are delayed until each of them
      * terminates.
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -9141,7 +9427,8 @@ public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? exte
     }
 
     /**
-     * Subscribes to the {@link ObservableSource} and receives notifications for each element.
+     * Subscribes to the {@link ObservableSource} and calls a {@link Consumer} for each item of the current {@code Observable}
+     * on its emission thread.
      * <p>
      * <img width="640" height="264" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/forEach.o.png" alt="">
      * <p>
@@ -9152,11 +9439,11 @@ public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? exte
      * </dl>
      *
      * @param onNext
-     *            {@link Consumer} to execute for each item.
+     *            the {@code Consumer} to execute for each item.
      * @return
-     *            a Disposable that allows disposing of an asynchronous sequence
+     *            a {@link Disposable} that allows disposing the sequence if the current {@code Observable} runs asynchronously
      * @throws NullPointerException
-     *             if {@code onNext} is null
+     *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -9167,25 +9454,25 @@ public final Disposable forEach(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Subscribes to the {@link ObservableSource} and receives notifications for each element until the
-     * onNext Predicate returns false.
+     * Subscribes to the {@link ObservableSource} and calls a {@link Predicate} for each item of the current {@code Observable},
+     * on its emission thread, until the predicate returns {@code false}.
      * <p>
      * <img width="640" height="272" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/forEachWhile.o.png" alt="">
      * <p>
-     * If the Observable emits an error, it is wrapped into an
-     * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * If the {@code Observable} emits an error, it is wrapped into an
+     * {@link OnErrorNotImplementedException}
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code forEachWhile} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onNext
-     *            {@link Predicate} to execute for each item.
+     *            the {@code Predicate} to execute for each item.
      * @return
-     *            a Disposable that allows disposing of an asynchronous sequence
+     *            a {@link Disposable} that allows disposing the sequence if the current {@code Observable} runs asynchronously
      * @throws NullPointerException
-     *             if {@code onNext} is null
+     *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -9196,22 +9483,21 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext) {
     }
 
     /**
-     * Subscribes to the {@link ObservableSource} and receives notifications for each element and error events until the
-     * onNext Predicate returns false.
+     * Subscribes to the {@link ObservableSource} and calls a {@link Predicate} for each item or a {@link Consumer} with the error
+     * of the current {@code Observable}, on their original emission threads, until the predicate returns {@code false}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code forEachWhile} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onNext
-     *            {@link Predicate} to execute for each item.
+     *            the {@code Predicate} to execute for each item.
      * @param onError
-     *            {@link Consumer} to execute when an error is emitted.
+     *            the {@code Consumer} to execute when an error is emitted.
      * @return
-     *            a Disposable that allows disposing of an asynchronous sequence
+     *            a {@link Disposable} that allows disposing the sequence if the current {@code Observable} runs asynchronously
      * @throws NullPointerException
-     *             if {@code onNext} is null, or
-     *             if {@code onError} is null
+     *             if {@code onNext} or {@code onError} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -9222,25 +9508,24 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
     }
 
     /**
-     * Subscribes to the {@link ObservableSource} and receives notifications for each element and the terminal events until the
-     * onNext Predicate returns false.
+     * Subscribes to the {@link ObservableSource} and calls a {@link Predicate} for each item, a {@link Consumer} with the error
+     * or an {@link Action} upon completion of the current {@code Observable}, on their original emission threads,
+     * until the predicate returns {@code false}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code forEachWhile} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onNext
-     *            {@link Predicate} to execute for each item.
+     *            the {@code Predicate} to execute for each item.
      * @param onError
-     *            {@link Consumer} to execute when an error is emitted.
+     *            the {@code Consumer} to execute when an error is emitted.
      * @param onComplete
-     *            {@link Action} to execute when completion is signalled.
+     *            the {@code Action} to execute when completion is signaled.
      * @return
-     *            a Disposable that allows disposing of an asynchronous sequence
+     *            a {@link Disposable} that allows disposing the sequence if the current {@code Observable} runs asynchronously
      * @throws NullPointerException
-     *             if {@code onNext} is null, or
-     *             if {@code onError} is null, or
-     *             if {@code onComplete} is null
+     *             if {@code onNext} or {@code onError} or {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -9258,17 +9543,19 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
     }
 
     /**
-     * Groups the items emitted by an {@code ObservableSource} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedObservable}s. The emitted {@code GroupedObservableSource} allows only a single
-     * {@link Observer} during its lifetime and if this {@code Observer} calls dispose() before the
-     * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedObservableSource} emission.
+     * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedObservable}s.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedObservable} will cache the items it is to emit until such time as it
+     * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
+     * lifetime and if this {@code Observer} calls {@code dispose()} before the
+     * source terminates, the next emission by the source having the same key will trigger a new
+     * {@code GroupedObservable} emission.
+     * <p>
+     * <em>Note:</em> A {@code GroupedObservable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedObservableSource}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedObservable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
@@ -9285,9 +9572,10 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      *            a function that extracts the key for each item
      * @param <K>
      *            the key type
-     * @return an {@code ObservableSource} that emits {@link GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source ObservableSource that share that
+     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Observable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -9299,17 +9587,19 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
     }
 
     /**
-     * Groups the items emitted by an {@code ObservableSource} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedObservable}s. The emitted {@code GroupedObservableSource} allows only a single
-     * {@link Observer} during its lifetime and if this {@code Observer} calls dispose() before the
-     * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedObservableSource} emission.
+     * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedObservable}s.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedObservable} will cache the items it is to emit until such time as it
+     * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
+     * lifetime and if this {@code Observer} calls {@code dispose()} before the
+     * source terminates, the next emission by the source having the same key will trigger a new
+     * {@code GroupedObservable} emission.
+     * <p>
+     * <em>Note:</em> A {@code GroupedObservable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedObservableSource}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedObservable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
@@ -9327,11 +9617,12 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
      * @param <K>
      *            the key type
      * @param delayError
-     *            if true, the exception from the current Observable is delayed in each group until that specific group emitted
-     *            the normal values; if false, the exception bypasses values in the groups and is reported immediately.
-     * @return an {@code ObservableSource} that emits {@link GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source ObservableSource that share that
+     *            if {@code true}, the exception from the current {@code Observable} is delayed in each group until that specific group emitted
+     *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
+     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Observable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -9343,17 +9634,19 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
     }
 
     /**
-     * Groups the items emitted by an {@code ObservableSource} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedObservable}s. The emitted {@code GroupedObservableSource} allows only a single
-     * {@link Observer} during its lifetime and if this {@code Observer} calls dispose() before the
-     * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedObservableSource} emission.
+     * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedObservable}s.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedObservable} will cache the items it is to emit until such time as it
+     * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
+     * lifetime and if this {@code Observer} calls {@code dispose()} before the
+     * source terminates, the next emission by the source having the same key will trigger a new
+     * {@code GroupedObservable} emission.
+     * <p>
+     * <em>Note:</em> A {@code GroupedObservable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedObservableSource}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedObservable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
@@ -9374,9 +9667,10 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
      *            the key type
      * @param <V>
      *            the element type
-     * @return an {@code ObservableSource} that emits {@link GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source ObservableSource that share that
+     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Observable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
     @CheckReturnValue
@@ -9388,17 +9682,19 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
     }
 
     /**
-     * Groups the items emitted by an {@code ObservableSource} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedObservable}s. The emitted {@code GroupedObservableSource} allows only a single
-     * {@link Observer} during its lifetime and if this {@code Observer} calls dispose() before the
-     * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedObservableSource} emission.
+     * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedObservable}s.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedObservable} will cache the items it is to emit until such time as it
+     * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
+     * lifetime and if this {@code Observer} calls {@code dispose()} before the
+     * source terminates, the next emission by the source having the same key will trigger a new
+     * {@code GroupedObservable} emission.
+     * <p>
+     * <em>Note:</em> A {@code GroupedObservable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedObservableSource}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedObservable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
@@ -9420,10 +9716,10 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * @param <V>
      *            the element type
      * @param delayError
-     *            if true, the exception from the current Observable is delayed in each group until that specific group emitted
-     *            the normal values; if false, the exception bypasses values in the groups and is reported immediately.
-     * @return an {@code ObservableSource} that emits {@link GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source ObservableSource that share that
+     *            if {@code true}, the exception from the current {@code Observable} is delayed in each group until that specific group emitted
+     *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
+     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Observable} that share that
      *         key value
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
@@ -9436,17 +9732,19 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
     }
 
     /**
-     * Groups the items emitted by an {@code ObservableSource} according to a specified criterion, and emits these
-     * grouped items as {@link GroupedObservable}s. The emitted {@code GroupedObservableSource} allows only a single
-     * {@link Observer} during its lifetime and if this {@code Observer} calls dispose() before the
-     * source terminates, the next emission by the source having the same key will trigger a new
-     * {@code GroupedObservableSource} emission.
+     * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
+     * grouped items as {@link GroupedObservable}s.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
      * <p>
-     * <em>Note:</em> A {@link GroupedObservable} will cache the items it is to emit until such time as it
+     * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
+     * lifetime and if this {@code Observer} calls {@code dispose()} before the
+     * source terminates, the next emission by the source having the same key will trigger a new
+     * {@code GroupedObservable} emission.
+     * <p>
+     * <em>Note:</em> A {@code GroupedObservable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
-     * {@code GroupedObservableSource}s that do not concern you. Instead, you can signal to them that they may
+     * {@code GroupedObservable}s that do not concern you. Instead, you can signal to them that they may
      * discard their buffers by applying an operator like {@link #ignoreElements} to them.
      * <p>
      * Note also that ignoring groups or subscribing later (i.e., on another thread) will result in
@@ -9464,17 +9762,19 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * @param valueSelector
      *            a function that extracts the return element for each item
      * @param delayError
-     *            if true, the exception from the current Observable is delayed in each group until that specific group emitted
-     *            the normal values; if false, the exception bypasses values in the groups and is reported immediately.
+     *            if {@code true}, the exception from the current {@code Observable} is delayed in each group until that specific group emitted
+     *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
      * @param bufferSize
-     *            the hint for how many {@link GroupedObservable}s and element in each {@link GroupedObservable} should be buffered
+     *            the hint for how many {@code GroupedObservable}s and element in each {@code GroupedObservable} should be buffered
      * @param <K>
      *            the key type
      * @param <V>
      *            the element type
-     * @return an {@code ObservableSource} that emits {@link GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source ObservableSource that share that
+     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Observable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
     @CheckReturnValue
@@ -9491,10 +9791,10 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
     }
 
     /**
-     * Returns an Observable that correlates two ObservableSources when they overlap in time and groups the results.
+     * Returns an {@code Observable} that correlates two {@link ObservableSource}s when they overlap in time and groups the results.
      * <p>
      * There are no guarantees in what order the items get combined when multiple
-     * items from one or both source ObservableSources overlap.
+     * items from one or both source {@code ObservableSource}s overlap.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupJoin.png" alt="">
      * <dl>
@@ -9502,23 +9802,24 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      *  <dd>{@code groupJoin} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <TRight> the value type of the right ObservableSource source
-     * @param <TLeftEnd> the element type of the left duration ObservableSources
-     * @param <TRightEnd> the element type of the right duration ObservableSources
+     * @param <TRight> the value type of the right {@code ObservableSource} source
+     * @param <TLeftEnd> the element type of the left duration {@code ObservableSource}s
+     * @param <TRightEnd> the element type of the right duration {@code ObservableSource}s
      * @param <R> the result type
      * @param other
-     *            the other ObservableSource to correlate items from the source ObservableSource with
+     *            the other {@code ObservableSource} to correlate items from the current {@code Observable} with
      * @param leftEnd
-     *            a function that returns an ObservableSource whose emissions indicate the duration of the values of
-     *            the source ObservableSource
+     *            a function that returns an {@code ObservableSource} whose emissions indicate the duration of the values of
+     *            the current {@code Observable}
      * @param rightEnd
-     *            a function that returns an ObservableSource whose emissions indicate the duration of the values of
-     *            the {@code right} ObservableSource
+     *            a function that returns an {@code ObservableSource} whose emissions indicate the duration of the values of
+     *            the {@code right} {@code ObservableSource}
      * @param resultSelector
-     *            a function that takes an item emitted by each ObservableSource and returns the value to be emitted
-     *            by the resulting ObservableSource
-     * @return an Observable that emits items based on combining those items emitted by the source ObservableSources
+     *            a function that takes an item emitted by each {@code ObservableSource} and returns the value to be emitted
+     *            by the resulting {@code Observable}
+     * @return an {@code Observable} that emits items based on combining those items emitted by the current {@code Observable}s
      *         whose durations overlap
+     * @throws NullPointerException if {@code other}, {@code leftEnd}, {@code rightEnd} or {@code resultSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
     @CheckReturnValue
@@ -9539,8 +9840,9 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> groupJoin(
     }
 
     /**
-     * Hides the identity of this Observable and its Disposable.
-     * <p>Allows hiding extra features such as {@link io.reactivex.rxjava3.subjects.Subject}'s
+     * Hides the identity of the current {@code Observable} and its {@link Disposable}.
+     * <p>
+     * Allows hiding extra features such as {@link io.reactivex.rxjava3.subjects.Subject}'s
      * {@link Observer} methods or preventing certain identity-based
      * optimizations (fusion).
      * <p>
@@ -9549,7 +9851,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> groupJoin(
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code hide} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
      *
      * @since 2.0
      */
@@ -9561,7 +9863,7 @@ public final Observable<T> hide() {
     }
 
     /**
-     * Ignores all items emitted by the source ObservableSource and only calls {@code onComplete} or {@code onError}.
+     * Ignores all items emitted by the current {@code Observable} and only calls {@code onComplete} or {@code onError}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ignoreElements.2.png" alt="">
      * <dl>
@@ -9569,7 +9871,7 @@ public final Observable<T> hide() {
      *  <dd>{@code ignoreElements} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Completable instance
+     * @return the new {@link Completable} instance
      * @see <a href="http://reactivex.io/documentation/operators/ignoreelements.html">ReactiveX operators documentation: IgnoreElements</a>
      */
     @CheckReturnValue
@@ -9580,9 +9882,9 @@ public final Completable ignoreElements() {
     }
 
     /**
-     * Returns a Single that emits {@code true} if the source ObservableSource is empty, otherwise {@code false}.
+     * Returns a {@link Single} that emits {@code true} if the current {@code Observable} is empty, otherwise {@code false}.
      * <p>
-     * In Rx.Net this is negated as the {@code any} Observer but we renamed this in RxJava to better match Java
+     * In Rx.Net this is negated as the {@code any} {@link Observer} but we renamed this in RxJava to better match Java
      * naming idioms.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.2.png" alt="">
@@ -9591,7 +9893,7 @@ public final Completable ignoreElements() {
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Single that emits a Boolean
+     * @return a {@code Single} that emits a {@link Boolean}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -9602,10 +9904,10 @@ public final Single<Boolean> isEmpty() {
     }
 
     /**
-     * Correlates the items emitted by two ObservableSources based on overlapping durations.
+     * Correlates the items emitted by two {@link ObservableSource}s based on overlapping durations.
      * <p>
      * There are no guarantees in what order the items get combined when multiple
-     * items from one or both source ObservableSources overlap.
+     * items from one or both source {@code ObservableSource}s overlap.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/join_.png" alt="">
      * <dl>
@@ -9613,23 +9915,24 @@ public final Single<Boolean> isEmpty() {
      *  <dd>{@code join} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <TRight> the value type of the right ObservableSource source
-     * @param <TLeftEnd> the element type of the left duration ObservableSources
-     * @param <TRightEnd> the element type of the right duration ObservableSources
+     * @param <TRight> the value type of the right {@code ObservableSource} source
+     * @param <TLeftEnd> the element type of the left duration {@code ObservableSource}s
+     * @param <TRightEnd> the element type of the right duration {@code ObservableSource}s
      * @param <R> the result type
      * @param other
-     *            the second ObservableSource to join items from
+     *            the second {@code ObservableSource} to join items from
      * @param leftEnd
-     *            a function to select a duration for each item emitted by the source ObservableSource, used to
+     *            a function to select a duration for each item emitted by the current {@code Observable}, used to
      *            determine overlap
      * @param rightEnd
-     *            a function to select a duration for each item emitted by the {@code right} ObservableSource, used to
+     *            a function to select a duration for each item emitted by the {@code right} {@code ObservableSource}, used to
      *            determine overlap
      * @param resultSelector
-     *            a function that computes an item to be emitted by the resulting ObservableSource for any two
-     *            overlapping items emitted by the two ObservableSources
-     * @return an Observable that emits items correlating to items emitted by the source ObservableSources that have
+     *            a function that computes an item to be emitted by the resulting {@code Observable} for any two
+     *            overlapping items emitted by the two {@code ObservableSource}s
+     * @return an {@code Observable} that emits items correlating to items emitted by the current {@code Observable}s that have
      *         overlapping durations
+     * @throws NullPointerException if {@code other}, {@code leftEnd}, {@code rightEnd} or {@code resultSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
     @CheckReturnValue
@@ -9650,8 +9953,8 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> join(
     }
 
     /**
-     * Returns a Maybe that emits the last item emitted by this Observable or
-     * completes if this Observable is empty.
+     * Returns a {@link Maybe} that emits the last item emitted by the current {@code Observable} or
+     * completes if the current {@code Observable} is empty.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastElement.png" alt="">
      * <dl>
@@ -9659,7 +9962,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> join(
      *  <dd>{@code lastElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Maybe that emits the last item from the source ObservableSource or notifies observers of an
+     * @return a {@code Maybe} that emits the last item from the current {@code Observable} or notifies observers of an
      *         error
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
@@ -9671,8 +9974,8 @@ public final Maybe<T> lastElement() {
     }
 
     /**
-     * Returns a Single that emits only the last item emitted by this Observable, or a default item
-     * if this Observable completes without emitting any items.
+     * Returns a {@link Single} that emits only the last item emitted by the current {@code Observable}, or a default item
+     * if the current {@code Observable} completes without emitting any items.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/last.2.png" alt="">
      * <dl>
@@ -9681,9 +9984,10 @@ public final Maybe<T> lastElement() {
      * </dl>
      *
      * @param defaultItem
-     *            the default item to emit if the source ObservableSource is empty
-     * @return a Single that emits only the last item emitted by the source ObservableSource, or a default item
-     *         if the source ObservableSource is empty
+     *            the default item to emit if the current {@code Observable} is empty
+     * @return a {@code Single} that emits only the last item emitted by the current {@code Observable}, or a default item
+     *         if the current {@code Observable} is empty
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
     @CheckReturnValue
@@ -9695,8 +9999,8 @@ public final Single<T> last(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Single that emits only the last item emitted by this Observable or
-     * signals a {@link NoSuchElementException} if this Observable is empty.
+     * Returns a {@link Single} that emits only the last item emitted by the current {@code Observable} or
+     * signals a {@link NoSuchElementException} if the current {@code Observable} is empty.
      * <p>
      * <img width="640" height="236" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrError.png" alt="">
      * <dl>
@@ -9704,8 +10008,8 @@ public final Single<T> last(@NonNull T defaultItem) {
      *  <dd>{@code lastOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Single that emits only the last item emitted by the source ObservableSource.
-     *         If the source ObservableSource completes without emitting any items a {@link NoSuchElementException} will be thrown.
+     * @return a {@code Single} that emits only the last item emitted by the current {@code Observable}.
+     *         If the current {@code Observable} completes without emitting any items a {@code NoSuchElementException} will be thrown.
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
     @CheckReturnValue
@@ -9720,7 +10024,7 @@ public final Single<T> lastOrError() {
      * other standard composition methods first;</strong>
      * Returns an {@code Observable} which, when subscribed to, invokes the {@link ObservableOperator#apply(Observer) apply(Observer)} method
      * of the provided {@link ObservableOperator} for each individual downstream {@link Observer} and allows the
-     * insertion of a custom operator by accessing the downstream's {@link Observer} during this subscription phase
+     * insertion of a custom operator by accessing the downstream's {@code Observer} during this subscription phase
      * and providing a new {@code Observer}, containing the custom operator's intended business logic, that will be
      * used in the subscription process going further upstream.
      * <p>
@@ -9837,23 +10141,24 @@ public final Single<T> lastOrError() {
      * class and creating an {@link ObservableTransformer} with it is recommended.
      * <p>
      * Note also that it is not possible to stop the subscription phase in {@code lift()} as the {@code apply()} method
-     * requires a non-null {@code Observer} instance to be returned, which is then unconditionally subscribed to
-     * the upstream {@code Observable}. For example, if the operator decided there is no reason to subscribe to the
+     * requires a non-{@code null} {@code Observer} instance to be returned, which is then unconditionally subscribed to
+     * the current {@code Observable}. For example, if the operator decided there is no reason to subscribe to the
      * upstream source because of some optimization possibility or a failure to prepare the operator, it still has to
-     * return an {@code Observer} that should immediately dispose the upstream's {@code Disposable} in its
+     * return an {@code Observer} that should immediately dispose the upstream's {@link Disposable} in its
      * {@code onSubscribe} method. Again, using an {@code ObservableTransformer} and extending the {@code Observable} is
      * a better option as {@link #subscribeActual} can decide to not subscribe to its upstream after all.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lift} does not operate by default on a particular {@link Scheduler}, however, the
-     *  {@link ObservableOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
+     *  {@code ObservableOperator} may use a {@code Scheduler} to support its own asynchronous behavior.</dd>
      * </dl>
      *
      * @param <R> the output value type
-     * @param lifter the {@link ObservableOperator} that receives the downstream's {@code Observer} and should return
+     * @param lifter the {@code ObservableOperator} that receives the downstream's {@code Observer} and should return
      *               an {@code Observer} with custom behavior to be used as the consumer for the current
      *               {@code Observable}.
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code lifter} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Writing-operators-for-2.0">RxJava wiki: Writing operators</a>
      * @see #compose(ObservableTransformer)
      */
@@ -9866,7 +10171,7 @@ public final <R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? s
     }
 
     /**
-     * Returns an Observable that applies a specified function to each item emitted by the source ObservableSource and
+     * Returns an {@code Observable} that applies a specified function to each item emitted by the current {@code Observable} and
      * emits the results of these function applications.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/map.png" alt="">
@@ -9877,9 +10182,10 @@ public final <R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? s
      *
      * @param <R> the output type
      * @param mapper
-     *            a function to apply to each item emitted by the ObservableSource
-     * @return an Observable that emits the items from the source ObservableSource, transformed by the specified
+     *            a function to apply to each item emitted by the current {@code Observable}
+     * @return an {@code Observable} that emits the items from the current {@code Observable}, transformed by the specified
      *         function
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
     @CheckReturnValue
@@ -9891,8 +10197,8 @@ public final <R> Observable<R> map(@NonNull Function<? super T, ? extends R> map
     }
 
     /**
-     * Returns an Observable that represents all of the emissions <em>and</em> notifications from the source
-     * ObservableSource into emissions marked with their original types within {@link Notification} objects.
+     * Returns an {@code Observable} that represents all of the emissions <em>and</em> notifications from the current
+     * {@code Observable} into emissions marked with their original types within {@link Notification} objects.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
      * <dl>
@@ -9900,8 +10206,8 @@ public final <R> Observable<R> map(@NonNull Function<? super T, ? extends R> map
      *  <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Observable that emits items that are the result of materializing the items and notifications
-     *         of the source ObservableSource
+     * @return an {@code Observable} that emits items that are the result of materializing the items and notifications
+     *         of the current {@code Observable}
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Materialize</a>
      * @see #dematerialize(Function)
      */
@@ -9913,11 +10219,11 @@ public final Observable<Notification<T>> materialize() {
     }
 
     /**
-     * Flattens this and another ObservableSource into a single ObservableSource, without any transformation.
+     * Flattens the current {@code Observable} and another {@link ObservableSource} into a single {@code Observable} sequence, without any transformation.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * You can combine items emitted by multiple ObservableSources so that they appear as a single ObservableSource, by
+     * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code mergeWith} method.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -9925,8 +10231,9 @@ public final Observable<Notification<T>> materialize() {
      * </dl>
      *
      * @param other
-     *            an ObservableSource to be merged
-     * @return an Observable that emits all of the items emitted by the source ObservableSources
+     *            an {@code ObservableSource} to be merged
+     * @return an {@code Observable} that emits all of the items emitted by the current {@code Observable}s
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @CheckReturnValue
@@ -9938,11 +10245,11 @@ public final Observable<T> mergeWith(@NonNull ObservableSource<? extends T> othe
     }
 
     /**
-     * Merges the sequence of items of this Observable with the success value of the other SingleSource.
+     * Merges the sequence of items of the current {@code Observable} with the success value of the other {@link SingleSource}.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * The success value of the other {@code SingleSource} can get interleaved at any point of this
+     * The success value of the other {@code SingleSource} can get interleaved at any point of the current
      * {@code Observable} sequence.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -9950,7 +10257,8 @@ public final Observable<T> mergeWith(@NonNull ObservableSource<? extends T> othe
      * </dl>
      * <p>History: 2.1.10 - experimental
      * @param other the {@code SingleSource} whose success value to merge with
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -9962,12 +10270,12 @@ public final Observable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
     }
 
     /**
-     * Merges the sequence of items of this Observable with the success value of the other MaybeSource
-     * or waits both to complete normally if the MaybeSource is empty.
+     * Merges the sequence of items of the current {@code Observable} with the success value of the other {@link MaybeSource}
+     * or waits both to complete normally if the {@code MaybeSource} is empty.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <p>
-     * The success value of the other {@code MaybeSource} can get interleaved at any point of this
+     * The success value of the other {@code MaybeSource} can get interleaved at any point of the current
      * {@code Observable} sequence.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -9975,7 +10283,8 @@ public final Observable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
      * </dl>
      * <p>History: 2.1.10 - experimental
      * @param other the {@code MaybeSource} which provides a success value to merge with or completes
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -9987,7 +10296,7 @@ public final Observable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
     }
 
     /**
-     * Relays the items of this Observable and completes only when the other CompletableSource completes
+     * Relays the items of the current {@code Observable} and completes only when the other {@link CompletableSource} completes
      * as well.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
@@ -9997,7 +10306,8 @@ public final Observable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
      * </dl>
      * <p>History: 2.1.10 - experimental
      * @param other the {@code CompletableSource} to await for completion
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -10009,29 +10319,30 @@ public final Observable<T> mergeWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Modifies an ObservableSource to perform its emissions and notifications on a specified {@link Scheduler},
+     * Returns an {@code Observable} to perform the current {@code Observable}'s emissions and notifications on a specified {@link Scheduler},
      * asynchronously with an unbounded buffer with {@link Flowable#bufferSize()} "island size".
      *
-     * <p>Note that onError notifications will cut ahead of onNext notifications on the emission thread if Scheduler is truly
+     * <p>Note that {@code onError} notifications will cut ahead of {@code onNext} notifications on the emission thread if {@code Scheduler} is truly
      * asynchronous. If strict event ordering is required, consider using the {@link #observeOn(Scheduler, boolean)} overload.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
      * <p>
-     * This operator keeps emitting as many signals as it can on the given Scheduler's Worker thread,
+     * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
      * it does not allow per-signal fairness in case the worker runs on a shared underlying thread.
      * If such fairness and signal/work interleaving is preferred, use the delay operator with zero time instead.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      * <p>"Island size" indicates how large chunks the unbounded buffer allocates to store the excess elements waiting to be consumed
      * on the other side of the asynchronous boundary.
      *
      * @param scheduler
-     *            the {@link Scheduler} to notify {@link Observer}s on
-     * @return the source ObservableSource modified so that its {@link Observer}s are notified on the specified
-     *         {@link Scheduler}
+     *            the {@code Scheduler} to notify {@link Observer}s on
+     * @return the current {@code Observable} modified so that its {@code Observer}s are notified on the specified
+     *         {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -10047,30 +10358,30 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Modifies an ObservableSource to perform its emissions and notifications on a specified {@link Scheduler},
-     * asynchronously with an unbounded buffer with {@link Flowable#bufferSize()} "island size" and optionally delays onError notifications.
+     * Returns an {@code Observable} to perform the current {@code Observable}'s emissions and notifications on a specified {@link Scheduler},
+     * asynchronously with an unbounded buffer with {@link Flowable#bufferSize()} "island size" and optionally delays {@code onError} notifications.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
      * <p>
-     * This operator keeps emitting as many signals as it can on the given Scheduler's Worker thread,
+     * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
      * it does not allow per-signal fairness in case the worker runs on a shared underlying thread.
      * If such fairness and signal/work interleaving is preferred, use the delay operator with zero time instead.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      * <p>"Island size" indicates how large chunks the unbounded buffer allocates to store the excess elements waiting to be consumed
      * on the other side of the asynchronous boundary.
      *
      * @param scheduler
-     *            the {@link Scheduler} to notify {@link Observer}s on
+     *            the {@code Scheduler} to notify {@link Observer}s on
      * @param delayError
-     *            indicates if the onError notification may not cut ahead of onNext notification on the other side of the
-     *            scheduling boundary. If true a sequence ending in onError will be replayed in the same order as was received
-     *            from upstream
-     * @return the source ObservableSource modified so that its {@link Observer}s are notified on the specified
-     *         {@link Scheduler}
+     *            indicates if the {@code onError} notification may not cut ahead of {@code onNext} notification on the other side of the
+     *            scheduling boundary. If {@code true}, a sequence ending in {@code onError} will be replayed in the same order as was received
+     *            from the current {@code Observable}
+     * @return the current {@code Observable} modified so that its {@code Observer}s are notified on the specified
+     *         {@code Scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -10086,31 +10397,33 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delay
     }
 
     /**
-     * Modifies an ObservableSource to perform its emissions and notifications on a specified {@link Scheduler},
-     * asynchronously with an unbounded buffer of configurable "island size" and optionally delays onError notifications.
+     * Returns an {@code Observable} to perform the current {@code Observable}'s emissions and notifications on a specified {@link Scheduler},
+     * asynchronously with an unbounded buffer of configurable "island size" and optionally delays {@code onError} notifications.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
      * <p>
-     * This operator keeps emitting as many signals as it can on the given Scheduler's Worker thread,
+     * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
      * it does not allow per-signal fairness in case the worker runs on a shared underlying thread.
      * If such fairness and signal/work interleaving is preferred, use the delay operator with zero time instead.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      * <p>"Island size" indicates how large chunks the unbounded buffer allocates to store the excess elements waiting to be consumed
      * on the other side of the asynchronous boundary. Values below 16 are not recommended in performance sensitive scenarios.
      *
      * @param scheduler
-     *            the {@link Scheduler} to notify {@link Observer}s on
+     *            the {@code Scheduler} to notify {@link Observer}s on
      * @param delayError
-     *            indicates if the onError notification may not cut ahead of onNext notification on the other side of the
-     *            scheduling boundary. If true a sequence ending in onError will be replayed in the same order as was received
+     *            indicates if the {@code onError} notification may not cut ahead of {@code onNext} notification on the other side of the
+     *            scheduling boundary. If {@code true} a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
      * @param bufferSize the size of the buffer.
-     * @return the source ObservableSource modified so that its {@link Observer}s are notified on the specified
-     *         {@link Scheduler}
+     * @return the current {@code Observable} modified so that its {@code Observer}s are notified on the specified
+     *         {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -10128,7 +10441,7 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delay
     }
 
     /**
-     * Filters the items emitted by an ObservableSource, only emitting those of the specified type.
+     * Filters the items emitted by the current {@code Observable}, only emitting those of the specified type.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.png" alt="">
      * <dl>
@@ -10138,8 +10451,9 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delay
      *
      * @param <U> the output type
      * @param clazz
-     *            the class type to filter the items emitted by the source ObservableSource
-     * @return an Observable that emits items from the source ObservableSource of type {@code clazz}
+     *            the class type to filter the items emitted by the current {@code Observable}
+     * @return an {@code Observable} that emits items from the current {@code Observable} of type {@code clazz}
+     * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
     @CheckReturnValue
@@ -10151,19 +10465,19 @@ public final <U> Observable<U> ofType(@NonNull Class<U> clazz) {
     }
 
     /**
-     * Instructs an ObservableSource to pass control to another ObservableSource rather than invoking
+     * Instructs the current {@code Observable} to pass control to another {@link ObservableSource} rather than invoking
      * {@link Observer#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
-     * By default, when an ObservableSource encounters an error that prevents it from emitting the expected item to
-     * its {@link Observer}, the ObservableSource invokes its Observer's {@code onError} method, and then quits
-     * without invoking any more of its Observer's methods. The {@code onErrorResumeNext} method changes this
-     * behavior. If you pass a function that returns an ObservableSource ({@code resumeFunction}) to
-     * {@code onErrorResumeNext}, if the original ObservableSource encounters an error, instead of invoking its
-     * Observer's {@code onError} method, it will instead relinquish control to the ObservableSource returned from
-     * {@code resumeFunction}, which will invoke the Observer's {@link Observer#onNext onNext} method if it is
-     * able to do so. In such a case, because no ObservableSource necessarily invokes {@code onError}, the Observer
+     * By default, when an {@code ObservableSource} encounters an error that prevents it from emitting the expected item to
+     * its {@link Observer}, the {@code ObservableSource} invokes its {@code Observer}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code Observer}'s methods. The {@code onErrorResumeNext} method changes this
+     * behavior. If you pass a function that returns an {@code ObservableSource} ({@code resumeFunction}) to
+     * {@code onErrorResumeNext}, if the original {@code ObservableSource} encounters an error, instead of invoking its
+     * {@code Observer}'s {@code onError} method, it will instead relinquish control to the {@code ObservableSource} returned from
+     * {@code resumeFunction}, which will invoke the {@code Observer}'s {@link Observer#onNext onNext} method if it is
+     * able to do so. In such a case, because no {@code ObservableSource} necessarily invokes {@code onError}, the {@code Observer}
      * may never know that an error happened.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -10174,9 +10488,10 @@ public final <U> Observable<U> ofType(@NonNull Class<U> clazz) {
      * </dl>
      *
      * @param resumeFunction
-     *            a function that returns an ObservableSource that will take over if the source ObservableSource encounters
+     *            a function that returns an {@code ObservableSource} that will take over if the current {@code Observable} encounters
      *            an error
-     * @return the original ObservableSource, with appropriately modified behavior
+     * @return the original {@code ObservableSource}, with appropriately modified behavior
+     * @throws NullPointerException if {@code resumeFunction} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -10188,19 +10503,19 @@ public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable
     }
 
     /**
-     * Instructs an ObservableSource to pass control to another ObservableSource rather than invoking
+     * Instructs the current {@code Observable} to pass control to another {@link ObservableSource} rather than invoking
      * {@link Observer#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
-     * By default, when an ObservableSource encounters an error that prevents it from emitting the expected item to
-     * its {@link Observer}, the ObservableSource invokes its Observer's {@code onError} method, and then quits
-     * without invoking any more of its Observer's methods. The {@code onErrorResumeWith} method changes this
-     * behavior. If you pass another ObservableSource ({@code next}) to an ObservableSource's
-     * {@code onErrorResumeWith} method, if the original ObservableSource encounters an error, instead of invoking its
-     * Observer's {@code onError} method, it will instead relinquish control to {@code next} which
-     * will invoke the Observer's {@link Observer#onNext onNext} method if it is able to do so. In such a case,
-     * because no ObservableSource necessarily invokes {@code onError}, the Observer may never know that an error
+     * By default, when an {@code ObservableSource} encounters an error that prevents it from emitting the expected item to
+     * its {@link Observer}, the {@code ObservableSource} invokes its {@code Observer}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code Observer}'s methods. The {@code onErrorResumeWith} method changes this
+     * behavior. If you pass another {@code ObservableSource} ({@code next}) to an {@code ObservableSource}'s
+     * {@code onErrorResumeWith} method, if the original {@code ObservableSource} encounters an error, instead of invoking its
+     * {@code Observer}'s {@code onError} method, it will instead relinquish control to {@code next} which
+     * will invoke the {@code Observer}'s {@link Observer#onNext onNext} method if it is able to do so. In such a case,
+     * because no {@code ObservableSource} necessarily invokes {@code onError}, the {@code Observer} may never know that an error
      * happened.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -10211,9 +10526,10 @@ public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable
      * </dl>
      *
      * @param next
-     *            the next ObservableSource source that will take over if the source ObservableSource encounters
+     *            the next {@code ObservableSource} source that will take over if the current {@code Observable} encounters
      *            an error
-     * @return the original ObservableSource, with appropriately modified behavior
+     * @return the original {@code ObservableSource}, with appropriately modified behavior
+     * @throws NullPointerException if {@code next} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -10225,16 +10541,16 @@ public final Observable<T> onErrorResumeWith(@NonNull ObservableSource<? extends
     }
 
     /**
-     * Instructs an ObservableSource to emit an item (returned by a specified function) rather than invoking
-     * {@link Observer#onError onError} if it encounters an error.
+     * Instructs the current {@code Observable} to emit an item (returned by a specified function) and complete normally
+     * rather than invoking {@link Observer#onError onError} when it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.o.png" alt="">
      * <p>
-     * By default, when an ObservableSource encounters an error that prevents it from emitting the expected item to
-     * its {@link Observer}, the ObservableSource invokes its Observer's {@code onError} method, and then quits
-     * without invoking any more of its Observer's methods. The {@code onErrorReturn} method changes this
-     * behavior. If you pass a function ({@code resumeFunction}) to an ObservableSource's {@code onErrorReturn}
-     * method, if the original ObservableSource encounters an error, instead of invoking its Observer's
+     * By default, when an {@link ObservableSource} encounters an error that prevents it from emitting the expected item to
+     * its {@link Observer}, the {@code ObservableSource} invokes its {@code Observer}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code Observer}'s methods. The {@code onErrorReturn} method changes this
+     * behavior. If you pass a function ({@code resumeFunction}) to an {@code ObservableSource}'s {@code onErrorReturn}
+     * method, if the original {@code ObservableSource} encounters an error, instead of invoking its {@code Observer}'s
      * {@code onError} method, it will instead emit the return value of {@code resumeFunction}.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -10245,9 +10561,10 @@ public final Observable<T> onErrorResumeWith(@NonNull ObservableSource<? extends
      * </dl>
      *
      * @param valueSupplier
-     *            a function that returns a single value that will be emitted along with a regular onComplete in case
-     *            the current Observable signals an onError event
-     * @return the original ObservableSource with appropriately modified behavior
+     *            a function that returns a single value that will be emitted along with a regular {@code onComplete} in case
+     *            the current {@code Observable} signals an {@code onError} event
+     * @return the original {@code ObservableSource} with appropriately modified behavior
+     * @throws NullPointerException if {@code valueSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -10259,16 +10576,16 @@ public final Observable<T> onErrorReturn(@NonNull Function<? super Throwable, ?
     }
 
     /**
-     * Instructs an ObservableSource to emit an item (returned by a specified function) rather than invoking
-     * {@link Observer#onError onError} if it encounters an error.
+     * Instructs the current {@code Observable} to emit an item (returned by a specified function) and complete normally
+     * rather than invoking {@link Observer#onError onError} if it encounters an error.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturnItem.o.png" alt="">
      * <p>
-     * By default, when an ObservableSource encounters an error that prevents it from emitting the expected item to
-     * its {@link Observer}, the ObservableSource invokes its Observer's {@code onError} method, and then quits
-     * without invoking any more of its Observer's methods. The {@code onErrorReturn} method changes this
-     * behavior. If you pass a function ({@code resumeFunction}) to an ObservableSource's {@code onErrorReturn}
-     * method, if the original ObservableSource encounters an error, instead of invoking its Observer's
+     * By default, when an {@link ObservableSource} encounters an error that prevents it from emitting the expected item to
+     * its {@link Observer}, the {@code ObservableSource} invokes its {@code Observer}'s {@code onError} method, and then quits
+     * without invoking any more of its {@code Observer}'s methods. The {@code onErrorReturn} method changes this
+     * behavior. If you pass a function ({@code resumeFunction}) to an {@code ObservableSource}'s {@code onErrorReturn}
+     * method, if the original {@code ObservableSource} encounters an error, instead of invoking its {@code Observer}'s
      * {@code onError} method, it will instead emit the return value of {@code resumeFunction}.
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
@@ -10279,9 +10596,10 @@ public final Observable<T> onErrorReturn(@NonNull Function<? super Throwable, ?
      * </dl>
      *
      * @param item
-     *            the value that is emitted along with a regular onComplete in case the current
-     *            Observable signals an exception
-     * @return the original ObservableSource with appropriately modified behavior
+     *            the value that is emitted along with a regular {@code onComplete} in case the current
+     *            {@code Observable} signals an exception
+     * @return the original {@code ObservableSource} with appropriately modified behavior
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -10293,16 +10611,16 @@ public final Observable<T> onErrorReturnItem(@NonNull T item) {
     }
 
     /**
-     * Nulls out references to the upstream producer and downstream Observer if
-     * the sequence is terminated or downstream calls dispose().
+     * Nulls out references to the upstream producer and downstream {@link Observer} if
+     * the sequence is terminated or downstream calls {@code dispose()}.
      * <p>
      * <img width="640" height="246" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onTerminateDetach.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return an Observable which nulls out references to the upstream producer and downstream Observer if
-     * the sequence is terminated or downstream calls dispose()
+     * @return an {@code Observable} which {@code null}s out references to the upstream producer and downstream {@code Observer} if
+     * the sequence is terminated or downstream calls {@code dispose()}
      * @since 2.0
      */
     @CheckReturnValue
@@ -10313,7 +10631,7 @@ public final Observable<T> onTerminateDetach() {
     }
 
     /**
-     * Returns a {@link ConnectableObservable}, which is a variety of ObservableSource that waits until its
+     * Returns a {@link ConnectableObservable}, which is a variety of {@link ObservableSource} that waits until its
      * {@link ConnectableObservable#connect connect} method is called before it begins emitting items to those
      * {@link Observer}s that have subscribed to it.
      * <p>
@@ -10323,8 +10641,8 @@ public final Observable<T> onTerminateDetach() {
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link ConnectableObservable} that upon connection causes the source ObservableSource to emit items
-     *         to its {@link Observer}s
+     * @return a {@code ConnectableObservable} that upon connection causes the current {@code Observable} to emit items
+     *         to its {@code Observer}s
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -10335,8 +10653,8 @@ public final ConnectableObservable<T> publish() {
     }
 
     /**
-     * Returns an Observable that emits the results of invoking a specified selector on items emitted by a
-     * {@link ConnectableObservable} that shares a single subscription to the underlying sequence.
+     * Returns an {@code Observable} that emits the results of invoking a specified selector on items emitted by a
+     * {@link ConnectableObservable} that shares a single subscription to the current {@code Observable} sequence.
      * <p>
      * <img width="640" height="647" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishFunction.o.png" alt="">
      * <dl>
@@ -10345,12 +10663,14 @@ public final ConnectableObservable<T> publish() {
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            a function that can use the multicasted source sequence as many times as needed, without
-     *            causing multiple subscriptions to the source sequence. Observers to the given source will
+     *            causing multiple subscriptions to the source sequence. {@link Observer}s to the given source will
      *            receive all notifications of the source from the time of the subscription forward.
-     * @return an Observable that emits the results of invoking the selector on the items emitted by a {@link ConnectableObservable} that shares a single subscription to the underlying sequence
+     * @return an {@code Observable} that emits the results of invoking the selector on the items
+     *         emitted by a {@code ConnectableObservable} that shares a single subscription to the underlying sequence
+     * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -10362,9 +10682,9 @@ public final <R> Observable<R> publish(@NonNull Function<? super Observable<T>,
     }
 
     /**
-     * Returns a Maybe that applies a specified accumulator function to the first item emitted by a source
-     * ObservableSource, then feeds the result of that function along with the second item emitted by the source
-     * ObservableSource into the same function, and so on until all items have been emitted by the finite source ObservableSource,
+     * Returns a {@link Maybe} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Observable}, then feeds the result of that function along with the second item emitted by the current
+     * {@code Observable} into the same function, and so on until all items have been emitted by the current and finite {@code Observable},
      * and emits the final result from the final call to your function as its sole item.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduce.2.png" alt="">
@@ -10375,17 +10695,18 @@ public final <R> Observable<R> publish(@NonNull Function<? super Observable<T>,
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code reduce} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param reducer
-     *            an accumulator function to be invoked on each item emitted by the source ObservableSource, whose
+     *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, whose
      *            result will be used in the next accumulator call
-     * @return a Maybe that emits a single item that is the result of accumulating the items emitted by
-     *         the source ObservableSource
+     * @return a {@code Maybe} that emits a single item that is the result of accumulating the items emitted by
+     *         the current {@code Observable}
+     * @throws NullPointerException if {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
      */
@@ -10398,10 +10719,10 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     }
 
     /**
-     * Returns a Single that applies a specified accumulator function to the first item emitted by a source
-     * ObservableSource and a specified seed value, then feeds the result of that function along with the second item
-     * emitted by an ObservableSource into the same function, and so on until all items have been emitted by the
-     * finite source ObservableSource, emitting the final result from the final call to your function as its sole item.
+     * Returns a {@link Single} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Observable} and a specified seed value, then feeds the result of that function along with the second item
+     * emitted by the current {@code Observable} into the same function, and so on until all items have been emitted by the
+     * current and finite {@code Observable}, emitting the final result from the final call to your function as its sole item.
      * <p>
      * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.o.png" alt="">
      * <p>
@@ -10409,7 +10730,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
      * that does a similar operation on lists.
      * <p>
-     * Note that the {@code seed} is shared among all subscribers to the resulting ObservableSource
+     * Note that the {@code seed} is shared among all subscribers to the resulting {@code Observable}
      * and may cause problems if it is mutable. To make sure each subscriber gets its own value, defer
      * the application of this operator via {@link #defer(Supplier)}:
      * <pre><code>
@@ -10429,7 +10750,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code reduce} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10439,10 +10760,11 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * @param seed
      *            the initial (seed) accumulator value
      * @param reducer
-     *            an accumulator function to be invoked on each item emitted by the source ObservableSource, the
+     *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, the
      *            result of which will be used in the next accumulator call
-     * @return a Single that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the source ObservableSource
+     * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
+     *         items emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code seed} or {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
      * @see #reduceWith(Supplier, BiFunction)
@@ -10457,10 +10779,10 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     }
 
     /**
-     * Returns a Single that applies a specified accumulator function to the first item emitted by a source
-     * ObservableSource and a seed value derived from calling a specified seedSupplier, then feeds the result
-     * of that function along with the second item emitted by an ObservableSource into the same function,
-     * and so on until all items have been emitted by the finite source ObservableSource, emitting the final result
+     * Returns a {@link Single} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Observable} and a seed value derived from calling a specified {@code seedSupplier}, then feeds the result
+     * of that function along with the second item emitted by the current {@code Observable} into the same function,
+     * and so on until all items have been emitted by the current and finite {@code Observable}, emitting the final result
      * from the final call to your function as its sole item.
      * <p>
      * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceWith.o.png" alt="">
@@ -10471,7 +10793,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulator object to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code reduceWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10479,12 +10801,13 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      *
      * @param <R> the accumulator and output value type
      * @param seedSupplier
-     *            the Supplier that provides the initial (seed) accumulator value for each individual Observer
+     *            the {@link Supplier} that provides the initial (seed) accumulator value for each individual {@link Observer}
      * @param reducer
-     *            an accumulator function to be invoked on each item emitted by the source ObservableSource, the
+     *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, the
      *            result of which will be used in the next accumulator call
-     * @return a Single that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the source ObservableSource
+     * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
+     *         items emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code seedSupplier} or {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
      */
@@ -10498,7 +10821,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     }
 
     /**
-     * Returns an Observable that repeats the sequence of items emitted by the source ObservableSource indefinitely.
+     * Returns an {@code Observable} that repeats the sequence of items emitted by the current {@code Observable} indefinitely.
      * <p>
      * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatInf.o.png" alt="">
      * <dl>
@@ -10506,7 +10829,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Observable that emits the items emitted by the source ObservableSource repeatedly and in sequence
+     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} repeatedly and in sequence
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -10517,7 +10840,7 @@ public final Observable<T> repeat() {
     }
 
     /**
-     * Returns an Observable that repeats the sequence of items emitted by the source ObservableSource at most
+     * Returns an {@code Observable} that repeats the sequence of items emitted by the current {@code Observable} at most
      * {@code count} times.
      * <p>
      * <img width="640" height="336" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatCount.o.png" alt="">
@@ -10527,12 +10850,12 @@ public final Observable<T> repeat() {
      * </dl>
      *
      * @param times
-     *            the number of times the source ObservableSource items are repeated, a count of 0 will yield an empty
+     *            the number of times the current {@code Observable} items are repeated, a count of 0 will yield an empty
      *            sequence
-     * @return an Observable that repeats the sequence of items emitted by the source ObservableSource at most
+     * @return an {@code Observable} that repeats the sequence of items emitted by the current {@code Observable} at most
      *         {@code count} times
      * @throws IllegalArgumentException
-     *             if {@code count} is less than zero
+     *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -10549,8 +10872,8 @@ public final Observable<T> repeat(long times) {
     }
 
     /**
-     * Returns an Observable that repeats the sequence of items emitted by the source ObservableSource until
-     * the provided stop function returns true.
+     * Returns an {@code Observable} that repeats the sequence of items emitted by the current {@code Observable} until
+     * the provided stop function returns {@code true}.
      * <p>
      * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatUntil.o.png" alt="">
      * <dl>
@@ -10559,12 +10882,12 @@ public final Observable<T> repeat(long times) {
      * </dl>
      *
      * @param stop
-     *                a boolean supplier that is called when the current Observable completes;
-     *                if it returns true, the returned Observable completes; if it returns false,
-     *                the upstream Observable is resubscribed.
-     * @return the new Observable instance
+     *                a boolean supplier that is called when the current {@code Observable} completes;
+     *                if it returns {@code true}, the returned {@code Observable} completes; if it returns {@code false},
+     *                the current {@code Observable} is resubscribed.
+     * @return the new {@code Observable} instance
      * @throws NullPointerException
-     *             if {@code stop} is null
+     *             if {@code stop} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -10576,12 +10899,12 @@ public final Observable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns an Observable that emits the same values as the source ObservableSource with the exception of an
+     * Returns an {@code Observable} that emits the same values as the current {@code Observable} with the exception of an
      * {@code onComplete}. An {@code onComplete} notification from the source will result in the emission of
-     * a {@code void} item to the ObservableSource provided as an argument to the {@code notificationHandler}
-     * function. If that ObservableSource calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
-     * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, this ObservableSource will
-     * resubscribe to the source ObservableSource.
+     * a {@code void} item to the {@link ObservableSource} provided as an argument to the {@code notificationHandler}
+     * function. If that {@code ObservableSource} calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
+     * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, the current {@code Observable}
+     * will be resubscribed.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.png" alt="">
      * <dl>
@@ -10590,8 +10913,9 @@ public final Observable<T> repeatUntil(@NonNull BooleanSupplier stop) {
      * </dl>
      *
      * @param handler
-     *            receives an ObservableSource of notifications with which a user can complete or error, aborting the repeat.
-     * @return the source ObservableSource modified with repeat logic
+     *            receives an {@code ObservableSource} of notifications with which a user can complete or error, aborting the repeat.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -10603,9 +10927,9 @@ public final Observable<T> repeatWhen(@NonNull Function<? super Observable<Objec
     }
 
     /**
-     * Returns a {@link ConnectableObservable} that shares a single subscription to the underlying ObservableSource
-     * that will replay all of its items and notifications to any future {@link Observer}. A Connectable
-     * ObservableSource resembles an ordinary ObservableSource, except that it does not begin emitting items when it is
+     * Returns a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable}
+     * that will replay all of its items and notifications to any future {@link Observer}. A connectable
+     * {@code Observable} resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.png" alt="">
@@ -10614,8 +10938,8 @@ public final Observable<T> repeatWhen(@NonNull Function<? super Observable<Objec
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link ConnectableObservable} that upon connection causes the source ObservableSource to emit its
-     *         items to its {@link Observer}s
+     * @return a {@code ConnectableObservable} that upon connection causes the current {@code Observable} to emit its
+     *         items to its {@code Observer}s
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -10626,8 +10950,8 @@ public final ConnectableObservable<T> replay() {
     }
 
     /**
-     * Returns an Observable that emits items that are the results of invoking a specified selector on the items
-     * emitted by a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource.
+     * Returns an {@code Observable} that emits items that are the results of invoking a specified selector on the items
+     * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable}.
      * <p>
      * <img width="640" height="449" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.f.png" alt="">
      * <dl>
@@ -10636,12 +10960,13 @@ public final ConnectableObservable<T> replay() {
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the ObservableSource
-     * @return an Observable that emits items that are the results of invoking the selector on a
-     *         {@link ConnectableObservable} that shares a single subscription to the source ObservableSource
+     *            causing multiple subscriptions to the current {@code Observable}
+     * @return an {@code Observable} that emits items that are the results of invoking the selector on a
+     *         {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}
+     * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -10653,8 +10978,8 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     }
 
     /**
-     * Returns an Observable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * Returns an {@code Observable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying {@code bufferSize} notifications.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -10667,15 +10992,17 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the ObservableSource
+     *            causing multiple subscriptions to the current {@code Observable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable ObservableSource can replay
-     * @return an Observable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource
+     *            the buffer size that limits the number of items the connectable {@code Observable} can replay
+     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}
      *         replaying no more than {@code bufferSize} items
+     * @throws NullPointerException if {@code selector} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, int, boolean)
      */
@@ -10689,8 +11016,8 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     }
 
     /**
-     * Returns an Observable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * Returns an {@code Observable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying {@code bufferSize} notifications.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -10703,18 +11030,20 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the ObservableSource
+     *            causing multiple subscriptions to the current {@code Observable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable ObservableSource can replay
+     *            the buffer size that limits the number of items the connectable {@code Observable} can replay
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return an Observable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource
+     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}
      *         replaying no more than {@code bufferSize} items
+     * @throws NullPointerException if {@code selector} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -10727,8 +11056,8 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     }
 
     /**
-     * Returns an Observable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * Returns an {@code Observable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying no more than {@code bufferSize} items that were emitted within a specified time window.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -10741,20 +11070,22 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the ObservableSource
+     *            causing multiple subscriptions to the current {@code Observable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable ObservableSource can replay
+     *            the buffer size that limits the number of items the connectable {@code Observable} can replay
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return an Observable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource, and
+     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}, and
      *         replays no more than {@code bufferSize} items that were emitted within the window defined by
      *         {@code time}
+     * @throws NullPointerException if {@code selector} or {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -10765,8 +11096,8 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     }
 
     /**
-     * Returns an Observable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * Returns an {@code Observable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying no more than {@code bufferSize} items that were emitted within a specified time window.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -10779,24 +11110,26 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the ObservableSource
+     *            causing multiple subscriptions to the current {@code Observable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable ObservableSource can replay
+     *            the buffer size that limits the number of items the connectable {@code Observable} can replay
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that is the time source for the window
-     * @return an Observable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource, and
+     *            the {@code Scheduler} that is the time source for the window
+     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}, and
      *         replays no more than {@code bufferSize} items that were emitted within the window defined by
      *         {@code time}
      * @throws IllegalArgumentException
-     *             if {@code bufferSize} is less than zero
+     *             if {@code bufferSize} is non-positive
+     * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, int, long, TimeUnit, Scheduler, boolean)
      */
@@ -10811,9 +11144,10 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
         return ObservableReplay.multicastSelector(
                 ObservableInternalHelper.replaySupplier(this, bufferSize, time, unit, scheduler, false), selector);
     }
+
     /**
-     * Returns an Observable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * Returns an {@code Observable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying no more than {@code bufferSize} items that were emitted within a specified time window.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -10826,27 +11160,28 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the ObservableSource
+     *            causing multiple subscriptions to the current {@code Observable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable ObservableSource can replay
+     *            the buffer size that limits the number of items the connectable {@code Observable} can replay
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that is the time source for the window
+     *            the {@code Scheduler} that is the time source for the window
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize/age, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return an Observable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource, and
+     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}, and
      *         replays no more than {@code bufferSize} items that were emitted within the window defined by
      *         {@code time}
+     * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code bufferSize} is less than zero
+     *             if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -10862,8 +11197,8 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     }
 
     /**
-     * Returns an Observable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * Returns an {@code Observable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying all items that were emitted within a specified time window.
      * <p>
      * <img width="640" height="393" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ft.png" alt="">
@@ -10873,17 +11208,18 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the ObservableSource
+     *            causing multiple subscriptions to the current {@code Observable}
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return an Observable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable},
      *         replaying all items that were emitted within the window defined by {@code time}
+     * @throws NullPointerException if {@code selector} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -10894,8 +11230,8 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     }
 
     /**
-     * Returns an Observable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * Returns an {@code Observable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying all items that were emitted within a specified time window.
      * <p>
      * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fts.png" alt="">
@@ -10905,19 +11241,20 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the ObservableSource
+     *            causing multiple subscriptions to the current {@code Observable}
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is the time source for the window
-     * @return an Observable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable},
      *         replaying all items that were emitted within the window defined by {@code time}
+     * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, long, TimeUnit, Scheduler, boolean)
      */
@@ -10932,8 +11269,8 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     }
 
     /**
-     * Returns an Observable that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * Returns an {@code Observable} that emits items that are the results of invoking a specified selector on items
+     * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying all items that were emitted within a specified time window.
      * <p>
      * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fts.png" alt="">
@@ -10943,10 +11280,10 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the ObservableSource
+     *            causing multiple subscriptions to the current {@code Observable}
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
@@ -10954,11 +11291,12 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * @param scheduler
      *            the scheduler that is the time source for the window
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given age, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return an Observable that emits items that are the results of invoking the selector on items emitted by
-     *         a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource,
+     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
+     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable},
      *         replaying all items that were emitted within the window defined by {@code time}
+     * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -10972,9 +11310,9 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     }
 
     /**
-     * Returns a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource that
-     * replays at most {@code bufferSize} items emitted by that ObservableSource. A Connectable ObservableSource resembles
-     * an ordinary ObservableSource, except that it does not begin emitting items when it is subscribed to, but only
+     * Returns a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable} that
+     * replays at most {@code bufferSize} items emitted by the current {@code Observable}. A connectable {@code Observable} resembles
+     * an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to, but only
      * when its {@code connect} method is called.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.n.png" alt="">
@@ -10990,8 +11328,9 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      *
      * @param bufferSize
      *            the buffer size that limits the number of items that can be replayed
-     * @return a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
-     *         replays at most {@code bufferSize} items emitted by that ObservableSource
+     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
+     *         replays at most {@code bufferSize} items emitted by the current {@code Observable}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(int, boolean)
      */
@@ -11004,9 +11343,9 @@ public final ConnectableObservable<T> replay(int bufferSize) {
     }
 
     /**
-     * Returns a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource that
-     * replays at most {@code bufferSize} items emitted by that ObservableSource. A Connectable ObservableSource resembles
-     * an ordinary ObservableSource, except that it does not begin emitting items when it is subscribed to, but only
+     * Returns a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable} that
+     * replays at most {@code bufferSize} items emitted by the current {@code Observable}. A connectable {@code Observable} resembles
+     * an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to, but only
      * when its {@code connect} method is called.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.n.png" alt="">
@@ -11022,10 +11361,11 @@ public final ConnectableObservable<T> replay(int bufferSize) {
      * @param bufferSize
      *            the buffer size that limits the number of items that can be replayed
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize/age, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
-     *         replays at most {@code bufferSize} items emitted by that ObservableSource
+     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
+     *         replays at most {@code bufferSize} items emitted by the current {@code Observable}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -11037,9 +11377,9 @@ public final ConnectableObservable<T> replay(int bufferSize, boolean eagerTrunca
     }
 
     /**
-     * Returns a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
-     * replays at most {@code bufferSize} items that were emitted during a specified time window. A Connectable
-     * ObservableSource resembles an ordinary ObservableSource, except that it does not begin emitting items when it is
+     * Returns a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable} and
+     * replays at most {@code bufferSize} items that were emitted during a specified time window. A connectable
+     * {@code Observable} resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nt.png" alt="">
@@ -11059,9 +11399,11 @@ public final ConnectableObservable<T> replay(int bufferSize, boolean eagerTrunca
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
+     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
      *         replays at most {@code bufferSize} items that were emitted during the window defined by
      *         {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(int, long, TimeUnit, Scheduler, boolean)
      */
@@ -11073,9 +11415,9 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
     }
 
     /**
-     * Returns a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
+     * Returns a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable} and
      * that replays a maximum of {@code bufferSize} items that are emitted within a specified time window. A
-     * Connectable ObservableSource resembles an ordinary ObservableSource, except that it does not begin emitting items
+     * connectable {@code Observable} resembles an ordinary {@code Observable}, except that it does not begin emitting items
      * when it is subscribed to, but only when its {@code connect} method is called.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -11097,11 +11439,12 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is used as a time source for the window
-     * @return a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
+     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
      *         replays at most {@code bufferSize} items that were emitted during the window defined by
      *         {@code time}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code bufferSize} is less than zero
+     *             if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(int, long, TimeUnit, Scheduler, boolean)
      */
@@ -11116,9 +11459,9 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
     }
 
     /**
-     * Returns a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
+     * Returns a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable} and
      * that replays a maximum of {@code bufferSize} items that are emitted within a specified time window. A
-     * Connectable ObservableSource resembles an ordinary ObservableSource, except that it does not begin emitting items
+     * connectable {@code Observable} resembles an ordinary {@code Observable}, except that it does not begin emitting items
      * when it is subscribed to, but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nts.png" alt="">
@@ -11140,14 +11483,15 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is used as a time source for the window
-     * @return a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
+     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
      *         replays at most {@code bufferSize} items that were emitted during the window defined by
      *         {@code time}
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize/age, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code bufferSize} is less than zero
+     *             if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -11161,9 +11505,9 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
     }
 
     /**
-     * Returns a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
-     * replays all items emitted by that ObservableSource within a specified time window. A Connectable ObservableSource
-     * resembles an ordinary ObservableSource, except that it does not begin emitting items when it is subscribed to,
+     * Returns a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable} and
+     * replays all items emitted by the current {@code Observable} within a specified time window. A connectable {@code Observable}
+     * resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.t.png" alt="">
@@ -11176,8 +11520,9 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
+     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
      *         replays the items that were emitted during the window defined by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -11188,9 +11533,9 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit)
     }
 
     /**
-     * Returns a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
-     * replays all items emitted by that ObservableSource within a specified time window. A Connectable ObservableSource
-     * resembles an ordinary ObservableSource, except that it does not begin emitting items when it is subscribed to,
+     * Returns a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable} and
+     * replays all items emitted by the current {@code Observable} within a specified time window. A connectable {@code Observable}
+     * resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ts.png" alt="">
@@ -11207,9 +11552,10 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit)
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that is the time source for the window
-     * @return a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
+     *            the {@code Scheduler} that is the time source for the window
+     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
      *         replays the items that were emitted during the window defined by {@code time}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(long, TimeUnit, Scheduler, boolean)
      */
@@ -11223,9 +11569,9 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
-     * replays all items emitted by that ObservableSource within a specified time window. A Connectable ObservableSource
-     * resembles an ordinary ObservableSource, except that it does not begin emitting items when it is subscribed to,
+     * Returns a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable} and
+     * replays all items emitted by the current {@code Observable} within a specified time window. A connectable {@code Observable}
+     * resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ts.png" alt="">
@@ -11242,12 +11588,13 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit,
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that is the time source for the window
+     *            the {@code Scheduler} that is the time source for the window
      * @param eagerTruncate
-     *            if true, whenever the internal buffer is truncated to the given bufferSize/age, the
+     *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@link ConnectableObservable} that shares a single subscription to the source ObservableSource and
+     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
      *         replays the items that were emitted during the window defined by {@code time}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -11260,16 +11607,16 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, resubscribing to it if it calls {@code onError}
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, resubscribing to it if it calls {@code onError}
      * (infinite retry count).
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <p>
-     * If the source ObservableSource calls {@link Observer#onError}, this method will resubscribe to the source
-     * ObservableSource rather than propagating the {@code onError} call.
+     * If the current {@code Observable} calls {@link Observer#onError}, this method will resubscribe to the current
+     * {@code Observable} rather than propagating the {@code onError} call.
      * <p>
-     * Any and all items emitted by the source ObservableSource will be emitted by the resulting ObservableSource, even
-     * those emitted during failed subscriptions. For example, if an ObservableSource fails at first but emits
+     * Any and all items emitted by the current {@code Observable} will be emitted by the resulting {@code Observable}, even
+     * those emitted during failed subscriptions. For example, if the current {@code Observable} fails at first but emits
      * {@code [1, 2]} then succeeds the second time and emits {@code [1, 2, 3, 4, 5]} then the complete sequence
      * of emissions and notifications would be {@code [1, 2, 1, 2, 3, 4, 5, onComplete]}.
      * <dl>
@@ -11277,7 +11624,7 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit,
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source ObservableSource modified with retry logic
+     * @return the current {@code Observable} modified with retry logic
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -11288,8 +11635,8 @@ public final Observable<T> retry() {
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, resubscribing to it if it calls {@code onError}
-     * and the predicate returns true for that specific exception and retry count.
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, resubscribing to it if it calls {@code onError}
+     * and the predicate returns {@code true} for that specific exception and retry count.
      * <p>
      * <img width="640" height="235" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.ne.png" alt="">
      * <dl>
@@ -11300,7 +11647,8 @@ public final Observable<T> retry() {
      * @param predicate
      *            the predicate that determines if a resubscription may happen in case of a specific exception
      *            and retry count
-     * @return the source ObservableSource modified with retry logic
+     * @return the current {@code Observable} modified with retry logic
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see #retry()
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
@@ -11314,17 +11662,17 @@ public final Observable<T> retry(@NonNull BiPredicate<? super Integer, ? super T
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, resubscribing to it if it calls {@code onError}
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, resubscribing to it if it calls {@code onError}
      * up to a specified number of retries.
      * <p>
      * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.n.png" alt="">
      * <p>
-     * If the source ObservableSource calls {@link Observer#onError}, this method will resubscribe to the source
-     * ObservableSource for a maximum of {@code count} resubscriptions rather than propagating the
+     * If the current {@code Observable} calls {@link Observer#onError}, this method will resubscribe to the current
+     * {@code Observable} for a maximum of {@code count} resubscriptions rather than propagating the
      * {@code onError} call.
      * <p>
-     * Any and all items emitted by the source ObservableSource will be emitted by the resulting ObservableSource, even
-     * those emitted during failed subscriptions. For example, if an ObservableSource fails at first but emits
+     * Any and all items emitted by the current {@code Observable} will be emitted by the resulting {@code Observable}, even
+     * those emitted during failed subscriptions. For example, if the current {@code Observable} fails at first but emits
      * {@code [1, 2]} then succeeds the second time and emits {@code [1, 2, 3, 4, 5]} then the complete sequence
      * of emissions and notifications would be {@code [1, 2, 1, 2, 3, 4, 5, onComplete]}.
      * <dl>
@@ -11333,8 +11681,9 @@ public final Observable<T> retry(@NonNull BiPredicate<? super Integer, ? super T
      * </dl>
      *
      * @param times
-     *            the number of times to resubscribe if the current Observable fails
-     * @return the source ObservableSource modified with retry logic
+     *            the number of times to resubscribe if the current {@code Observable} fails
+     * @return the current {@code Observable} modified with retry logic
+     * @throws IllegalArgumentException if {@code times} is negative
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -11345,16 +11694,18 @@ public final Observable<T> retry(long times) {
     }
 
     /**
-     * Retries at most times or until the predicate returns false, whichever happens first.
+     * Retries at most times or until the predicate returns {@code false}, whichever happens first.
      * <p>
      * <img width="640" height="269" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.nfe.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param times the number of times to resubscribe if the current Observable fails
-     * @param predicate the predicate called with the failure Throwable and should return true to trigger a retry.
-     * @return the new Observable instance
+     * @param times the number of times to resubscribe if the current {@code Observable} fails
+     * @param predicate the predicate called with the failure {@link Throwable} and should return {@code true} to trigger a retry.
+     * @throws NullPointerException if {@code predicate} is {@code null}
+     * @throws IllegalArgumentException if {@code times} is negative
+     * @return the new {@code Observable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -11369,7 +11720,7 @@ public final Observable<T> retry(long times, @NonNull Predicate<? super Throwabl
     }
 
     /**
-     * Retries the current Observable if the predicate returns true.
+     * Retries the current {@code Observable} if the predicate returns {@code true}.
      * <p>
      * <img width="640" height="248" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.e.png" alt="">
      * <dl>
@@ -11377,8 +11728,9 @@ public final Observable<T> retry(long times, @NonNull Predicate<? super Throwabl
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param predicate the predicate that receives the failure Throwable and should return true to trigger a retry.
-     * @return the new Observable instance
+     * @param predicate the predicate that receives the failure {@link Throwable} and should return {@code true} to trigger a retry.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -11388,15 +11740,16 @@ public final Observable<T> retry(@NonNull Predicate<? super Throwable> predicate
     }
 
     /**
-     * Retries until the given stop function returns true.
+     * Retries until the given stop function returns {@code true}.
      * <p>
      * <img width="640" height="261" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryUntil.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retryUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param stop the function that should return true to stop retrying
-     * @return the new Observable instance
+     * @param stop the function that should return {@code true} to stop retrying
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code stop} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -11407,12 +11760,12 @@ public final Observable<T> retryUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns an Observable that emits the same values as the source ObservableSource with the exception of an
+     * Returns an {@code Observable} that emits the same values as the current {@code Observable} with the exception of an
      * {@code onError}. An {@code onError} notification from the source will result in the emission of a
-     * {@link Throwable} item to the ObservableSource provided as an argument to the {@code notificationHandler}
-     * function. If that ObservableSource calls {@code onComplete} or {@code onError} then {@code retry} will call
-     * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this ObservableSource will
-     * resubscribe to the source ObservableSource.
+     * {@link Throwable} item to the {@code Observable} provided as an argument to the {@code notificationHandler}
+     * function. If that {@code Observable} calls {@code onComplete} or {@code onError} then {@code retry} will call
+     * {@code onComplete} or {@code onError} on the child subscription. Otherwise, the current {@code Observable}
+     * will be resubscribed.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.png" alt="">
      * <p>
@@ -11444,10 +11797,10 @@ public final Observable<T> retryUntil(@NonNull BooleanSupplier stop) {
      * subscribing
      * } </pre>
      * <p>
-     * Note that the inner {@code ObservableSource} returned by the handler function should signal
+     * Note that the inner {@link ObservableSource} returned by the handler function should signal
      * either {@code onNext}, {@code onError} or {@code onComplete} in response to the received
      * {@code Throwable} to indicate the operator should retry or terminate. If the upstream to
-     * the operator is asynchronous, signalling onNext followed by onComplete immediately may
+     * the operator is asynchronous, signaling {@code onNext} followed by {@code onComplete} immediately may
      * result in the sequence to be completed immediately. Similarly, if this inner
      * {@code ObservableSource} signals {@code onError} or {@code onComplete} while the upstream is
      * active, the sequence is terminated with the same signal immediately.
@@ -11474,9 +11827,10 @@ public final Observable<T> retryUntil(@NonNull BooleanSupplier stop) {
      * </dl>
      *
      * @param handler
-     *            receives an ObservableSource of notifications with which a user can complete or error, aborting the
+     *            receives an {@code Observable} of notifications with which a user can complete or error, aborting the
      *            retry
-     * @return the source ObservableSource modified with retry logic
+     * @return the current {@code Observable} modified with retry logic
+     * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -11489,16 +11843,16 @@ public final Observable<T> retryWhen(
     }
 
     /**
-     * Subscribes to the current Observable and wraps the given Observer into a SafeObserver
-     * (if not already a SafeObserver) that
-     * deals with exceptions thrown by a misbehaving Observer (that doesn't follow the
-     * Reactive-Streams specification).
+     * Subscribes to the current {@code Observable} and wraps the given {@link Observer} into a {@link SafeObserver}
+     * (if not already a {@code SafeObserver}) that
+     * deals with exceptions thrown by a misbehaving {@code Observer} (that doesn't follow the
+     * <em>Reactive Streams</em> specification).
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code safeSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param observer the incoming Observer instance
-     * @throws NullPointerException if s is null
+     * @param observer the incoming {@code Observer} instance
+     * @throws NullPointerException if {@code observer} is {@code null}
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
@@ -11512,7 +11866,7 @@ public final void safeSubscribe(@NonNull Observer<? super T> observer) {
     }
 
     /**
-     * Returns an Observable that emits the most recently emitted item (if any) emitted by the source ObservableSource
+     * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
      * within periodic time intervals.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.png" alt="">
@@ -11525,8 +11879,9 @@ public final void safeSubscribe(@NonNull Observer<? super T> observer) {
      *            the sampling rate
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return an Observable that emits the results of sampling the items emitted by the source ObservableSource at
+     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} at
      *         the specified time interval
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit)
      */
@@ -11538,7 +11893,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that emits the most recently emitted item (if any) emitted by the source ObservableSource
+     * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
      * within periodic time intervals and optionally emit the very last upstream item when the upstream completes.
      * <p>
      * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.emitlast.png" alt="">
@@ -11552,12 +11907,12 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit) {
      *            the sampling rate
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return an Observable that emits the results of sampling the items emitted by the source ObservableSource at
+     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} at
      *         the specified time interval
      * @param emitLast
-     *            if true and the upstream completes while there is still an unsampled item available,
+     *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
-     *            if false, an unsampled last item is ignored.
+     *            if {@code false}, an unsampled last item is ignored.
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit)
      * @since 2.1
@@ -11570,13 +11925,13 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, boolean e
     }
 
     /**
-     * Returns an Observable that emits the most recently emitted item (if any) emitted by the source ObservableSource
-     * within periodic time intervals, where the intervals are defined on a particular Scheduler.
+     * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
+     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param period
@@ -11584,9 +11939,10 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, boolean e
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param scheduler
-     *            the {@link Scheduler} to use when sampling
-     * @return an Observable that emits the results of sampling the items emitted by the source ObservableSource at
+     *            the {@code Scheduler} to use when sampling
+     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} at
      *         the specified time interval
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit, Scheduler)
      */
@@ -11600,14 +11956,14 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns an Observable that emits the most recently emitted item (if any) emitted by the source ObservableSource
-     * within periodic time intervals, where the intervals are defined on a particular Scheduler
+     * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
+     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}
      *  and optionally emit the very last upstream item when the upstream completes.
      * <p>
      * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.emitlast.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * <p>History: 2.0.5 - experimental
@@ -11616,13 +11972,14 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param scheduler
-     *            the {@link Scheduler} to use when sampling
+     *            the {@code Scheduler} to use when sampling
      * @param emitLast
-     *            if true and the upstream completes while there is still an unsampled item available,
+     *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
-     *            if false, an unsampled last item is ignored.
-     * @return an Observable that emits the results of sampling the items emitted by the source ObservableSource at
+     *            if {@code false}, an unsampled last item is ignored.
+     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} at
      *         the specified time interval
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit, Scheduler)
      * @since 2.1
@@ -11637,9 +11994,9 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns an Observable that, when the specified {@code sampler} ObservableSource emits an item or completes,
-     * emits the most recently emitted item (if any) emitted by the source ObservableSource since the previous
-     * emission from the {@code sampler} ObservableSource.
+     * Returns an {@code Observable} that, when the specified {@code sampler} {@link ObservableSource} emits an item or completes,
+     * emits the most recently emitted item (if any) emitted by the current {@code Observable} since the previous
+     * emission from the {@code sampler} {@code ObservableSource}.
      * <p>
      * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.nolast.png" alt="">
      * <dl>
@@ -11647,11 +12004,12 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
      *  <dd>This version of {@code sample} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the sampler ObservableSource
+     * @param <U> the element type of the sampler {@code ObservableSource}
      * @param sampler
-     *            the ObservableSource to use for sampling the source ObservableSource
-     * @return an Observable that emits the results of sampling the items emitted by this ObservableSource whenever
-     *         the {@code sampler} ObservableSource emits an item or completes
+     *            the {@code ObservableSource} to use for sampling the current {@code Observable}
+     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} whenever
+     *         the {@code sampler} {@code ObservableSource} emits an item or completes
+     * @throws NullPointerException if {@code sampler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      */
     @CheckReturnValue
@@ -11663,10 +12021,10 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler) {
     }
 
     /**
-     * Returns an Observable that, when the specified {@code sampler} ObservableSource emits an item or completes,
-     * emits the most recently emitted item (if any) emitted by the source ObservableSource since the previous
-     * emission from the {@code sampler} ObservableSource
-     * and optionally emit the very last upstream item when the upstream or other ObservableSource complete.
+     * Returns an {@code Observable} that, when the specified {@code sampler} {@link ObservableSource} emits an item or completes,
+     * emits the most recently emitted item (if any) emitted by the current {@code Observable} since the previous
+     * emission from the {@code sampler} {@code ObservableSource}
+     * and optionally emit the very last upstream item when the upstream or other {@code ObservableSource} complete.
      * <p>
      * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.emitlast.png" alt="">
      * <dl>
@@ -11675,15 +12033,16 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler) {
      * </dl>
      *
      * <p>History: 2.0.5 - experimental
-     * @param <U> the element type of the sampler ObservableSource
+     * @param <U> the element type of the sampler {@code ObservableSource}
      * @param sampler
-     *            the ObservableSource to use for sampling the source ObservableSource
+     *            the {@code ObservableSource} to use for sampling the current {@code Observable}
      * @param emitLast
-     *            if true and the upstream completes while there is still an unsampled item available,
+     *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
-     *            if false, an unsampled last item is ignored.
-     * @return an Observable that emits the results of sampling the items emitted by this ObservableSource whenever
-     *         the {@code sampler} ObservableSource emits an item or completes
+     *            if {@code false}, an unsampled last item is ignored.
+     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} whenever
+     *         the {@code sampler} {@code ObservableSource} emits an item or completes
+     * @throws NullPointerException if {@code sampler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @since 2.1
      */
@@ -11696,9 +12055,9 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler, bool
     }
 
     /**
-     * Returns an Observable that applies a specified accumulator function to the first item emitted by a source
-     * ObservableSource, then feeds the result of that function along with the second item emitted by the source
-     * ObservableSource into the same function, and so on until all items have been emitted by the source ObservableSource,
+     * Returns an {@code Observable} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Observable}, then feeds the result of that function along with the second item emitted by the current
+     * {@code Observable} into the same function, and so on until all items have been emitted by the current {@code Observable},
      * emitting the result of each of these iterations.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.png" alt="">
@@ -11710,10 +12069,11 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler, bool
      * </dl>
      *
      * @param accumulator
-     *            an accumulator function to be invoked on each item emitted by the source ObservableSource, whose
+     *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, whose
      *            result will be emitted to {@link Observer}s via {@link Observer#onNext onNext} and used in the
      *            next accumulator call
-     * @return an Observable that emits the results of each call to the accumulator function
+     * @return an {@code Observable} that emits the results of each call to the accumulator function
+     * @throws NullPointerException if {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
     @CheckReturnValue
@@ -11725,19 +12085,19 @@ public final Observable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Returns an Observable that applies a specified accumulator function to the first item emitted by a source
-     * ObservableSource and a seed value, then feeds the result of that function along with the second item emitted by
-     * the source ObservableSource into the same function, and so on until all items have been emitted by the source
-     * ObservableSource, emitting the result of each of these iterations.
+     * Returns an {@code Observable} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Observable} and a seed value, then feeds the result of that function along with the second item emitted by
+     * the current {@code Observable} into the same function, and so on until all items have been emitted by the current
+     * {@code Observable}, emitting the result of each of these iterations.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
-     * Note that the ObservableSource that results from this method will emit {@code initialValue} as its first
+     * Note that the {@code Observable} that results from this method will emit {@code initialValue} as its first
      * emitted item.
      * <p>
-     * Note that the {@code initialValue} is shared among all subscribers to the resulting ObservableSource
+     * Note that the {@code initialValue} is shared among all subscribers to the resulting {@code Observable}
      * and may cause problems if it is mutable. To make sure each subscriber gets its own value, defer
      * the application of this operator via {@link #defer(Supplier)}:
      * <pre><code>
@@ -11759,11 +12119,12 @@ public final Observable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * @param initialValue
      *            the initial (seed) accumulator item
      * @param accumulator
-     *            an accumulator function to be invoked on each item emitted by the source ObservableSource, whose
+     *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, whose
      *            result will be emitted to {@link Observer}s via {@link Observer#onNext onNext} and used in the
      *            next accumulator call
-     * @return an Observable that emits {@code initialValue} followed by the results of each call to the
+     * @return an {@code Observable} that emits {@code initialValue} followed by the results of each call to the
      *         accumulator function
+     * @throws NullPointerException if {@code initialValue} or {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
     @CheckReturnValue
@@ -11775,16 +12136,16 @@ public final <R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction
     }
 
     /**
-     * Returns an Observable that applies a specified accumulator function to the first item emitted by a source
-     * ObservableSource and a seed value, then feeds the result of that function along with the second item emitted by
-     * the source ObservableSource into the same function, and so on until all items have been emitted by the source
-     * ObservableSource, emitting the result of each of these iterations.
+     * Returns an {@code Observable} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Observable} and a seed value, then feeds the result of that function along with the second item emitted by
+     * the current {@code Observable} into the same function, and so on until all items have been emitted by the current
+     * {@code Observable}, emitting the result of each of these iterations.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
-     * Note that the ObservableSource that results from this method will emit the value returned
+     * Note that the {@code Observable} that results from this method will emit the value returned
      * by the {@code seedSupplier} as its first item.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -11793,13 +12154,14 @@ public final <R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction
      *
      * @param <R> the initial, accumulator and result type
      * @param seedSupplier
-     *            a Supplier that returns the initial (seed) accumulator item for each individual Observer
+     *            a {@link Supplier} that returns the initial (seed) accumulator item for each individual {@link Observer}
      * @param accumulator
-     *            an accumulator function to be invoked on each item emitted by the source ObservableSource, whose
-     *            result will be emitted to {@link Observer}s via {@link Observer#onNext onNext} and used in the
+     *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, whose
+     *            result will be emitted to {@code Observer}s via {@link Observer#onNext onNext} and used in the
      *            next accumulator call
-     * @return an Observable that emits {@code initialValue} followed by the results of each call to the
+     * @return an {@code Observable} that emits {@code initialValue} followed by the results of each call to the
      *         accumulator function
+     * @throws NullPointerException if {@code seedSupplier} or {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
     @CheckReturnValue
@@ -11812,13 +12174,13 @@ public final <R> Observable<R> scanWith(@NonNull Supplier<R> seedSupplier, @NonN
     }
 
     /**
-     * Forces an ObservableSource's emissions and notifications to be serialized and for it to obey
-     * <a href="http://reactivex.io/documentation/contract.html">the ObservableSource contract</a> in other ways.
+     * Forces the current {@code Observable}'s emissions and notifications to be serialized and for it to obey
+     * <a href="http://reactivex.io/documentation/contract.html">the {@code ObservableSource} contract</a> in other ways.
      * <p>
-     * It is possible for an ObservableSource to invoke its Observers' methods asynchronously, perhaps from
-     * different threads. This could make such an ObservableSource poorly-behaved, in that it might try to invoke
+     * It is possible for an {@code Observable} to invoke its {@link Observer}s' methods asynchronously, perhaps from
+     * different threads. This could make such an {@code Observable} poorly-behaved, in that it might try to invoke
      * {@code onComplete} or {@code onError} before one of its {@code onNext} invocations, or it might call
-     * {@code onNext} from two different threads concurrently. You can force such an ObservableSource to be
+     * {@code onNext} from two different threads concurrently. You can force such an {@code Observable} to be
      * well-behaved and sequential by applying the {@code serialize} method to it.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/synchronize.png" alt="">
@@ -11827,7 +12189,7 @@ public final <R> Observable<R> scanWith(@NonNull Supplier<R> seedSupplier, @NonN
      *  <dd>{@code serialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@link ObservableSource} that is guaranteed to be well-behaved and to make only serialized calls to
+     * @return an {@code Observable} that is guaranteed to be well-behaved and to make only serialized calls to
      *         its observers
      * @see <a href="http://reactivex.io/documentation/operators/serialize.html">ReactiveX operators documentation: Serialize</a>
      */
@@ -11839,9 +12201,9 @@ public final Observable<T> serialize() {
     }
 
     /**
-     * Returns a new {@link ObservableSource} that multicasts (and shares a single subscription to) the original {@link ObservableSource}. As long as
-     * there is at least one {@link Observer} this {@link ObservableSource} will be subscribed and emitting data.
-     * When all subscribers have disposed it will dispose the source {@link ObservableSource}.
+     * Returns a new {@code Observable} that multicasts (and shares a single subscription to) the current {@code Observable}. As long as
+     * there is at least one {@link Observer}, the current {@code Observable} will stay subscribed and keep emitting signals.
+     * When all observers have disposed, the operator will dispose the subscription to the current {@code Observable}.
      * <p>
      * This is an alias for {@link #publish()}.{@link ConnectableObservable#refCount() refCount()}.
      * <p>
@@ -11851,8 +12213,8 @@ public final Observable<T> serialize() {
      *  <dd>{@code share} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code ObservableSource} that upon connection causes the source {@code ObservableSource} to emit items
-     *         to its {@link Observer}s
+     * @return an {@code Observable} that upon connection causes the current {@code Observable} to emit items
+     *         to its {@code Observer}s
      * @see <a href="http://reactivex.io/documentation/operators/refcount.html">ReactiveX operators documentation: RefCount</a>
      */
     @CheckReturnValue
@@ -11863,8 +12225,9 @@ public final Observable<T> share() {
     }
 
     /**
-     * Returns a Maybe that completes if this Observable is empty or emits the single item emitted by this Observable,
-     * or signals an {@code IllegalArgumentException} if this Observable emits more than one item.
+     * Returns a {@link Maybe} that completes if the current {@code Observable} is empty or emits the single item
+     * emitted by the current {@code Observable}, or signals an {@link IllegalArgumentException} if the current
+     * {@code Observable} emits more than one item.
      * <p>
      * <img width="640" height="217" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/singleElement.o.png" alt="">
      * <dl>
@@ -11872,7 +12235,7 @@ public final Observable<T> share() {
      *  <dd>{@code singleElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Maybe} that emits the single item emitted by the source ObservableSource
+     * @return a {@code Maybe} that emits the single item emitted by the current {@code Observable}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -11883,9 +12246,9 @@ public final Maybe<T> singleElement() {
     }
 
     /**
-     * Returns a Single that emits the single item emitted by this Observable, if this Observable
-     * emits only a single item, or a default item if the source ObservableSource emits no items. If the source
-     * ObservableSource emits more than one item, an {@code IllegalArgumentException} is signalled instead.
+     * Returns a {@link Single} that emits the single item emitted by the current {@code Observable}, if the current {@code Observable}
+     * emits only a single item, or a default item if the current {@code Observable} emits no items. If the current
+     * {@code Observable} emits more than one item, an {@link IllegalArgumentException} is signaled instead.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/single.2.png" alt="">
      * <dl>
@@ -11894,8 +12257,9 @@ public final Maybe<T> singleElement() {
      * </dl>
      *
      * @param defaultItem
-     *            a default value to emit if the source ObservableSource emits no item
-     * @return the new Single instance
+     *            a default value to emit if the current {@code Observable} emits no item
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -11907,10 +12271,10 @@ public final Single<T> single(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a Single that emits the single item emitted by this Observable if this Observable
+     * Returns a {@link Single} that emits the single item emitted by the current {@code Observable} if it
      * emits only a single item, otherwise
-     * if this Observable completes without emitting any items or emits more than one item a
-     * {@link NoSuchElementException} or {@code IllegalArgumentException} will be signalled respectively.
+     * if the current {@code Observable} completes without emitting any items or emits more than one item a
+     * {@link NoSuchElementException} or {@link IllegalArgumentException} will be signaled respectively.
      * <p>
      * <img width="640" height="228" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrError.png" alt="">
      * <dl>
@@ -11918,7 +12282,7 @@ public final Single<T> single(@NonNull T defaultItem) {
      *  <dd>{@code singleOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Single instance
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -11929,7 +12293,7 @@ public final Single<T> singleOrError() {
     }
 
     /**
-     * Returns an Observable that skips the first {@code count} items emitted by the source ObservableSource and emits
+     * Returns an {@code Observable} that skips the first {@code count} items emitted by the current {@code Observable} and emits
      * the remainder.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.png" alt="">
@@ -11940,8 +12304,8 @@ public final Single<T> singleOrError() {
      *
      * @param count
      *            the number of items to skip
-     * @return an Observable that is identical to the source ObservableSource except that it does not emit the first
-     *         {@code count} items that the source ObservableSource emits
+     * @return an {@code Observable} that is identical to the current {@code Observable} except that it does not emit the first
+     *         {@code count} items that the current {@code Observable} emits
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
     @CheckReturnValue
@@ -11955,7 +12319,7 @@ public final Observable<T> skip(long count) {
     }
 
     /**
-     * Returns an Observable that skips values emitted by the source ObservableSource before a specified time window
+     * Returns an {@code Observable} that skips values emitted by the current {@code Observable} before a specified time window
      * elapses.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.t.png" alt="">
@@ -11969,8 +12333,9 @@ public final Observable<T> skip(long count) {
      *            the length of the time window to skip
      * @param unit
      *            the time unit of {@code time}
-     * @return an Observable that skips values emitted by the source ObservableSource before the time window defined
+     * @return an {@code Observable} that skips values emitted by the current {@code Observable} before the time window defined
      *         by {@code time} elapses and the emits the remainder
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
     @CheckReturnValue
@@ -11981,13 +12346,13 @@ public final Observable<T> skip(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that skips values emitted by the source ObservableSource before a specified time window
+     * Returns an {@code Observable} that skips values emitted by the current {@code Observable} before a specified time window
      * on a specified {@link Scheduler} elapses.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.ts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use for the timed skipping</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use for the timed skipping</dd>
      * </dl>
      *
      * @param time
@@ -11995,9 +12360,10 @@ public final Observable<T> skip(long time, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the {@link Scheduler} on which the timed wait happens
-     * @return an Observable that skips values emitted by the source ObservableSource before the time window defined
+     *            the {@code Scheduler} on which the timed wait happens
+     * @return an {@code Observable} that skips values emitted by the current {@code Observable} before the time window defined
      *         by {@code time} and {@code scheduler} elapses, and then emits the remainder
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
     @CheckReturnValue
@@ -12008,13 +12374,13 @@ public final Observable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Sche
     }
 
     /**
-     * Returns an Observable that drops a specified number of items from the end of the sequence emitted by the
-     * source ObservableSource.
+     * Returns an {@code Observable} that drops a specified number of items from the end of the sequence emitted by the
+     * current {@code Observable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.png" alt="">
      * <p>
-     * This Observer accumulates a queue long enough to store the first {@code count} items. As more items are
-     * received, items are taken from the front of the queue and emitted by the returned ObservableSource. This causes
+     * This {@link Observer} accumulates a queue long enough to store the first {@code count} items. As more items are
+     * received, items are taken from the front of the queue and emitted by the returned {@code Observable}. This causes
      * such items to be delayed.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -12023,10 +12389,10 @@ public final Observable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Sche
      *
      * @param count
      *            number of items to drop from the end of the source sequence
-     * @return an Observable that emits the items emitted by the source ObservableSource except for the dropped ones
+     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} except for the dropped ones
      *         at the end
-     * @throws IndexOutOfBoundsException
-     *             if {@code count} is less than zero
+     * @throws IllegalArgumentException
+     *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -12034,7 +12400,7 @@ public final Observable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Sche
     @NonNull
     public final Observable<T> skipLast(int count) {
         if (count < 0) {
-            throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
+            throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
         if (count == 0) {
             return RxJavaPlugins.onAssembly(this);
@@ -12043,7 +12409,7 @@ public final Observable<T> skipLast(int count) {
     }
 
     /**
-     * Returns an Observable that drops items emitted by the source ObservableSource during a specified time window
+     * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * before the source completes.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
@@ -12052,15 +12418,16 @@ public final Observable<T> skipLast(int count) {
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code skipLast} does not operate on any particular scheduler but uses the current time
-     *  from the {@code computation} {@link Scheduler}.</dd>
+     *  from the {@code trampoline} {@link Scheduler}.</dd>
      * </dl>
      *
      * @param time
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return an Observable that drops those items emitted by the source ObservableSource in a time window before the
+     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
      *         source completes defined by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -12071,7 +12438,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that drops items emitted by the source ObservableSource during a specified time window
+     * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * before the source completes.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
@@ -12088,10 +12455,11 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code time}
      * @param delayError
-     *            if true, an exception signalled by the current Observable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signalled and all regular elements dropped
-     * @return an Observable that drops those items emitted by the source ObservableSource in a time window before the
+     *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
+     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
      *         source completes defined by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -12102,7 +12470,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, boolean d
     }
 
     /**
-     * Returns an Observable that drops items emitted by the source ObservableSource during a specified time window
+     * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
@@ -12119,8 +12487,9 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, boolean d
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler used as the time source
-     * @return an Observable that drops those items emitted by the source ObservableSource in a time window before the
+     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
      *         source completes defined by {@code time} and {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -12131,7 +12500,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns an Observable that drops items emitted by the source ObservableSource during a specified time window
+     * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
@@ -12149,10 +12518,11 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
      * @param scheduler
      *            the scheduler used as the time source
      * @param delayError
-     *            if true, an exception signalled by the current Observable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signalled and all regular elements dropped
-     * @return an Observable that drops those items emitted by the source ObservableSource in a time window before the
+     *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
+     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
      *         source completes defined by {@code time} and {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -12163,7 +12533,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns an Observable that drops items emitted by the source ObservableSource during a specified time window
+     * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
@@ -12181,12 +12551,14 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
      * @param scheduler
      *            the scheduler used as the time source
      * @param delayError
-     *            if true, an exception signalled by the current Observable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signalled and all regular elements dropped
+     *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be skipped
-     * @return an Observable that drops those items emitted by the source ObservableSource in a time window before the
+     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
      *         source completes defined by {@code time} and {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -12202,7 +12574,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns an Observable that skips items emitted by the source ObservableSource until a second ObservableSource emits
+     * Returns an {@code Observable} that skips items emitted by the current {@code Observable} until a second {@link ObservableSource} emits
      * an item.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipUntil.png" alt="">
@@ -12211,12 +12583,13 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
      *  <dd>{@code skipUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the other ObservableSource
+     * @param <U> the element type of the other {@code ObservableSource}
      * @param other
-     *            the second ObservableSource that has to emit an item before the source ObservableSource's elements begin
-     *            to be mirrored by the resulting ObservableSource
-     * @return an Observable that skips items from the source ObservableSource until the second ObservableSource emits an
+     *            the second {@code ObservableSource} that has to emit an item before the current {@code Observable}'s elements begin
+     *            to be mirrored by the resulting {@code Observable}
+     * @return an {@code Observable} that skips items from the current {@code Observable} until the second {@code ObservableSource} emits an
      *         item, then emits the remaining items
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skipuntil.html">ReactiveX operators documentation: SkipUntil</a>
      */
     @CheckReturnValue
@@ -12228,8 +12601,8 @@ public final <U> Observable<T> skipUntil(@NonNull ObservableSource<U> other) {
     }
 
     /**
-     * Returns an Observable that skips all items emitted by the source ObservableSource as long as a specified
-     * condition holds true, but emits all further source items as soon as the condition becomes false.
+     * Returns an {@code Observable} that skips all items emitted by the current {@code Observable} as long as a specified
+     * condition holds {@code true}, but emits all further source items as soon as the condition becomes {@code false}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipWhile.png" alt="">
      * <dl>
@@ -12238,9 +12611,10 @@ public final <U> Observable<T> skipUntil(@NonNull ObservableSource<U> other) {
      * </dl>
      *
      * @param predicate
-     *            a function to test each item emitted from the source ObservableSource
-     * @return an Observable that begins emitting items emitted by the source ObservableSource when the specified
-     *         predicate becomes false
+     *            a function to test each item emitted from the current {@code Observable}
+     * @return an {@code Observable} that begins emitting items emitted by the current {@code Observable} when the specified
+     *         predicate becomes {@code false}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skipwhile.html">ReactiveX operators documentation: SkipWhile</a>
      */
     @CheckReturnValue
@@ -12252,14 +12626,14 @@ public final Observable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns an Observable that emits the events emitted by source ObservableSource, in a
-     * sorted order. Each item emitted by the ObservableSource must implement {@link Comparable} with respect to all
+     * Returns an {@code Observable} that emits the events emitted by the current {@code Observable}, in a
+     * sorted order. Each item emitted by the current {@code Observable} must implement {@link Comparable} with respect to all
      * other items in the sequence.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sorted.png" alt="">
      * <p>
-     * If any item emitted by this Observable does not implement {@link Comparable} with respect to
-     * all other items emitted by this Observable, no items will be emitted and the
+     * If any item emitted by the current {@code Observable} does not implement {@code Comparable} with respect to
+     * all other items emitted by the current {@code Observable}, no items will be emitted and the
      * sequence is terminated with a {@link ClassCastException}.
      *
      * <p>Note that calling {@code sorted} with long, non-terminating or infinite sources
@@ -12269,7 +12643,7 @@ public final Observable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sorted} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return an Observable that emits the items emitted by the source ObservableSource in sorted order
+     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} in sorted order
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -12279,7 +12653,7 @@ public final Observable<T> sorted() {
     }
 
     /**
-     * Returns an Observable that emits the events emitted by source ObservableSource, in a
+     * Returns an {@code Observable} that emits the events emitted by the current {@code Observable}, in a
      * sorted order based on a specified comparison function.
      *
      * <p>Note that calling {@code sorted} with long, non-terminating or infinite sources
@@ -12291,9 +12665,10 @@ public final Observable<T> sorted() {
      * </dl>
      *
      * @param sortFunction
-     *            a function that compares two items emitted by the source ObservableSource and returns an Integer
+     *            a function that compares two items emitted by the current {@code Observable} and returns an {@code int}
      *            that indicates their sort order
-     * @return an Observable that emits the items emitted by the source ObservableSource in sorted order
+     * @throws NullPointerException if {@code sortFunction} is {@code null}
+     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} in sorted order
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -12304,8 +12679,8 @@ public final Observable<T> sorted(@NonNull Comparator<? super T> sortFunction) {
     }
 
     /**
-     * Returns an Observable that emits the items in a specified {@link Iterable} before it begins to emit items
-     * emitted by the source ObservableSource.
+     * Returns an {@code Observable} that emits the items in a specified {@link Iterable} before it begins to emit items
+     * emitted by the current {@code Observable}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
      * <dl>
@@ -12314,9 +12689,10 @@ public final Observable<T> sorted(@NonNull Comparator<? super T> sortFunction) {
      * </dl>
      *
      * @param items
-     *            an Iterable that contains the items you want the modified ObservableSource to emit first
-     * @return an Observable that emits the items in the specified {@link Iterable} and then emits the items
-     *         emitted by the source ObservableSource
+     *            an {@code Iterable} that contains the items you want the resulting {@code Observable} to emit first
+     * @return an {@code Observable} that emits the items in the specified {@code Iterable} and then emits the items
+     *         emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @since 3.0.0
      * @see #startWithItem(Object)
@@ -12330,8 +12706,8 @@ public final Observable<T> startWithIterable(@NonNull Iterable<? extends T> item
     }
 
     /**
-     * Returns an Observable that emits the items in a specified {@link ObservableSource} before it begins to emit
-     * items emitted by the source ObservableSource.
+     * Returns an {@code Observable} that emits the items in a specified {@link ObservableSource} before it begins to emit
+     * items emitted by the current {@code Observable}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.o.png" alt="">
      * <dl>
@@ -12340,9 +12716,10 @@ public final Observable<T> startWithIterable(@NonNull Iterable<? extends T> item
      * </dl>
      *
      * @param other
-     *            an ObservableSource that contains the items you want the modified ObservableSource to emit first
-     * @return an Observable that emits the items in the specified {@link ObservableSource} and then emits the items
-     *         emitted by the source ObservableSource
+     *            an {@code ObservableSource} that contains the items you want the modified {@code ObservableSource} to emit first
+     * @return an {@code Observable} that emits the items in the specified {@code ObservableSource} and then emits the items
+     *         emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      */
     @CheckReturnValue
@@ -12354,8 +12731,8 @@ public final Observable<T> startWith(@NonNull ObservableSource<? extends T> othe
     }
 
     /**
-     * Returns an Observable that emits a specified item before it begins to emit items emitted by the source
-     * ObservableSource.
+     * Returns an {@code Observable} that emits a specified item before it begins to emit items emitted by the current
+     * {@code Observable}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.item.png" alt="">
      * <dl>
@@ -12365,8 +12742,9 @@ public final Observable<T> startWith(@NonNull ObservableSource<? extends T> othe
      *
      * @param item
      *            the item to emit first
-     * @return an Observable that emits the specified item before it begins to emit items emitted by the source
-     *         ObservableSource
+     * @return an {@code Observable} that emits the specified item before it begins to emit items emitted by the current
+     *         {@code Observable}
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithArray(Object...)
      * @see #startWithIterable(Iterable)
@@ -12376,13 +12754,12 @@ public final Observable<T> startWith(@NonNull ObservableSource<? extends T> othe
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Observable<T> startWithItem(@NonNull T item) {
-        Objects.requireNonNull(item, "item is null");
         return concatArray(just(item), this);
     }
 
     /**
-     * Returns an Observable that emits the specified items before it begins to emit items emitted by the source
-     * ObservableSource.
+     * Returns an {@code Observable} that emits the specified items before it begins to emit items emitted by the current
+     * {@code Observable}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWithArray.png" alt="">
      * <dl>
@@ -12392,8 +12769,9 @@ public final Observable<T> startWithItem(@NonNull T item) {
      *
      * @param items
      *            the array of values to emit first
-     * @return an Observable that emits the specified items before it begins to emit items emitted by the source
-     *         ObservableSource
+     * @return an {@code Observable} that emits the specified items before it begins to emit items emitted by the current
+     *         {@code Observable}
+     * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithItem(Object)
      * @see #startWithIterable(Iterable)
@@ -12411,18 +12789,18 @@ public final Observable<T> startWithArray(@NonNull T... items) {
     }
 
     /**
-     * Subscribes to an ObservableSource and ignores {@code onNext} and {@code onComplete} emissions.
+     * Subscribes to the current {@code Observable} and ignores {@code onNext} and {@code onComplete} emissions.
      * <p>
-     * If the Observable emits an error, it is wrapped into an
-     * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * If the {@code Observable} emits an error, it is wrapped into an
+     * {@link OnErrorNotImplementedException}
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the ObservableSource has finished sending them
+     *         the current {@code Observable} has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -12432,22 +12810,22 @@ public final Disposable subscribe() {
     }
 
     /**
-     * Subscribes to an ObservableSource and provides a callback to handle the items it emits.
+     * Subscribes to the current {@code Observable} and provides a callback to handle the items it emits.
      * <p>
-     * If the Observable emits an error, it is wrapped into an
-     * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
-     * and routed to the RxJavaPlugins.onError handler.
+     * If the {@code Observable} emits an error, it is wrapped into an
+     * {@link OnErrorNotImplementedException}
+     * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onNext
-     *             the {@code Consumer<T>} you have designed to accept emissions from the ObservableSource
+     *             the {@code Consumer<T>} you have designed to accept emissions from the current {@code Observable}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the ObservableSource has finished sending them
+     *         the current {@code Observable} has finished sending them
      * @throws NullPointerException
-     *             if {@code onNext} is null
+     *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -12458,24 +12836,23 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Subscribes to an ObservableSource and provides callbacks to handle the items it emits and any error
-     * notification it issues.
+     * Subscribes to the current {@code Observable} and provides callbacks to handle the items it emits and any error
+     * notification it signals.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onNext
-     *             the {@code Consumer<T>} you have designed to accept emissions from the ObservableSource
+     *             the {@code Consumer<T>} you have designed to accept emissions from the current {@code Observable}
      * @param onError
-     *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
-     *             ObservableSource
+     *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the current
+     *             {@code Observable}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the ObservableSource has finished sending them
+     *         the current {@code Observable} has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
-     *             if {@code onNext} is null, or
-     *             if {@code onError} is null
+     *             if {@code onNext} or {@code onError} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -12485,27 +12862,25 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
     }
 
     /**
-     * Subscribes to an ObservableSource and provides callbacks to handle the items it emits and any error or
-     * completion notification it issues.
+     * Subscribes to the current {@code Observable} and provides callbacks to handle the items it emits and any error or
+     * completion notification it signals.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onNext
-     *             the {@code Consumer<T>} you have designed to accept emissions from the ObservableSource
+     *             the {@code Consumer<T>} you have designed to accept emissions from the current {@code Observable}
      * @param onError
-     *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
-     *             ObservableSource
+     *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the current
+     *             {@code Observable}
      * @param onComplete
-     *             the {@code Action} you have designed to accept a completion notification from the
-     *             ObservableSource
+     *             the {@link Action} you have designed to accept a completion notification from the current
+     *             {@code Observable}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the ObservableSource has finished sending them
+     *         the current {@code Observable} has finished sending them
      * @throws NullPointerException
-     *             if {@code onNext} is null, or
-     *             if {@code onError} is null, or
-     *             if {@code onComplete} is null
+     *             if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -12554,13 +12929,13 @@ public final void subscribe(@NonNull Observer<? super T> observer) {
      * <p>There is no need to call any of the plugin hooks on the current {@code Observable} instance or
      * the {@code Observer}; all hooks and basic safeguards have been
      * applied by {@link #subscribe(Observer)} before this method gets called.
-     * @param observer the incoming Observer, never null
+     * @param observer the incoming {@code Observer}, never {@code null}
      */
     protected abstract void subscribeActual(@NonNull Observer<? super T> observer);
 
     /**
-     * Subscribes a given Observer (subclass) to this Observable and returns the given
-     * Observer as is.
+     * Subscribes a given {@link Observer} (subclass) to the current {@code Observable} and returns the given
+     * {@code Observer} instance as is.
      * <p>Usage example:
      * <pre><code>
      * Observable&lt;Integer&gt; source = Observable.range(1, 10);
@@ -12576,10 +12951,10 @@ public final void subscribe(@NonNull Observer<? super T> observer) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <E> the type of the Observer to use and return
-     * @param observer the Observer (subclass) to use and return, not null
+     * @param <E> the type of the {@code Observer} to use and return
+     * @param observer the {@code Observer} (subclass) to use and return, not {@code null}
      * @return the input {@code observer}
-     * @throws NullPointerException if {@code observer} is null
+     * @throws NullPointerException if {@code observer} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -12591,18 +12966,19 @@ public final void subscribe(@NonNull Observer<? super T> observer) {
     }
 
     /**
-     * Asynchronously subscribes Observers to this ObservableSource on the specified {@link Scheduler}.
+     * Asynchronously subscribes {@link Observer}s to the current {@code Observable} on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to perform subscription actions on
-     * @return the source ObservableSource modified so that its subscriptions happen on the
-     *         specified {@link Scheduler}
+     *            the {@code Scheduler} to perform subscription actions on
+     * @return the current {@code Observable} modified so that its subscriptions happen on the
+     *         specified {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #observeOn
@@ -12616,8 +12992,8 @@ public final Observable<T> subscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns an Observable that emits the items emitted by the source ObservableSource or the items of an alternate
-     * ObservableSource if the source ObservableSource is empty.
+     * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} or the items of an alternate
+     * {@link ObservableSource} if the current {@code Observable} is empty.
      * <p>
      * <img width="640" height="255" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.png" alt="">
      * <dl>
@@ -12626,9 +13002,10 @@ public final Observable<T> subscribeOn(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param other
-     *              the alternate ObservableSource to subscribe to if the source does not emit any items
-     * @return  an ObservableSource that emits the items emitted by the source ObservableSource or the items of an
-     *          alternate ObservableSource if the source ObservableSource is empty.
+     *              the alternate {@code ObservableSource} to subscribe to if the source does not emit any items
+     * @return  an {@code Observable} that emits the items emitted by the current {@code Observable} or the items of an
+     *          alternate {@code ObservableSource} if the current {@code Observable} is empty.
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 1.1.0
      */
     @CheckReturnValue
@@ -12640,12 +13017,12 @@ public final Observable<T> switchIfEmpty(@NonNull ObservableSource<? extends T>
     }
 
     /**
-     * Returns a new ObservableSource by applying a function that you supply to each item emitted by the source
-     * ObservableSource that returns an ObservableSource, and then emitting the items emitted by the most recently emitted
-     * of these ObservableSources.
+     * Returns a new {@code Observable} by applying a function that you supply to each item emitted by the current
+     * {@code Observable} that returns an {@link ObservableSource}, and then emitting the items emitted by the most recently emitted
+     * of these {@code ObservableSource}s.
      * <p>
-     * The resulting ObservableSource completes if both the upstream ObservableSource and the last inner ObservableSource, if any, complete.
-     * If the upstream ObservableSource signals an onError, the inner ObservableSource is disposed and the error delivered in-sequence.
+     * The resulting {@code Observable} completes if both the current {@code Observable} and the last inner {@code ObservableSource}, if any, complete.
+     * If the current {@code Observable} signals an {@code onError}, the inner {@code ObservableSource} is disposed and the error delivered in-sequence.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
@@ -12653,11 +13030,12 @@ public final Observable<T> switchIfEmpty(@NonNull ObservableSource<? extends T>
      *  <dd>{@code switchMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the element type of the inner ObservableSources and the output
+     * @param <R> the element type of the inner {@code ObservableSource}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
-     * @return an Observable that emits the items emitted by the ObservableSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
+     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} returned from applying {@code mapper} to the most recently emitted item emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapDelayError(Function)
      */
@@ -12669,12 +13047,12 @@ public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Returns a new ObservableSource by applying a function that you supply to each item emitted by the source
-     * ObservableSource that returns an ObservableSource, and then emitting the items emitted by the most recently emitted
-     * of these ObservableSources.
+     * Returns a new {@code Observable} by applying a function that you supply to each item emitted by the current
+     * {@code Observable} that returns an {@link ObservableSource}, and then emitting the items emitted by the most recently emitted
+     * of these {@code ObservableSource}s.
      * <p>
-     * The resulting ObservableSource completes if both the upstream ObservableSource and the last inner ObservableSource, if any, complete.
-     * If the upstream ObservableSource signals an onError, the inner ObservableSource is disposed and the error delivered in-sequence.
+     * The resulting {@code Observable} completes if both the current {@code Observable} and the last inner {@code ObservableSource}, if any, complete.
+     * If the current {@code Observable} signals an {@code onError}, the inner {@code ObservableSource} is disposed and the error delivered in-sequence.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
@@ -12682,13 +13060,15 @@ public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends
      *  <dd>{@code switchMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the element type of the inner ObservableSources and the output
+     * @param <R> the element type of the inner {@code ObservableSource}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
      * @param bufferSize
-     *            the number of elements to prefetch from the current active inner ObservableSource
-     * @return an Observable that emits the items emitted by the ObservableSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
+     *            the number of elements expected from the current active inner {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} returned from applying {@code mapper} to the most recently emitted item emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapDelayError(Function, int)
      */
@@ -12710,7 +13090,7 @@ public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends
     }
 
     /**
-     * Maps the upstream values into {@link CompletableSource}s, subscribes to the newer one while
+     * Maps the items of the current {@code Observable} into {@link CompletableSource}s, subscribes to the newer one while
      * disposing the subscription to the previous {@code CompletableSource}, thus keeping at most one
      * active {@code CompletableSource} running.
      * <p>
@@ -12719,27 +13099,28 @@ public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends
      * Since a {@code CompletableSource} doesn't produce any items, the resulting reactive type of
      * this operator is a {@link Completable} that can only indicate successful completion or
      * a failure in any of the inner {@code CompletableSource}s or the failure of the current
-     * {@link Observable}.
+     * {@code Observable}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>If either this {@code Observable} or the active {@code CompletableSource} signals an {@code onError},
-     *  the resulting {@code Completable} is terminated immediately with that {@code Throwable}.
+     *  <dd>If either the current {@code Observable} or the active {@code CompletableSource} signals an {@code onError},
+     *  the resulting {@code Completable} is terminated immediately with that {@link Throwable}.
      *  Use the {@link #switchMapCompletableDelayError(Function)} to delay such inner failures until
      *  every inner {@code CompletableSource}s and the main {@code Observable} terminates in some fashion.
      *  If they fail concurrently, the operator may combine the {@code Throwable}s into a
-     *  {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}
+     *  {@link CompositeException}
      *  and signal it to the downstream instead. If any inactivated (switched out) {@code CompletableSource}
-     *  signals an {@code onError} late, the {@code Throwable}s will be signalled to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors.
+     *  signals an {@code onError} late, the {@code Throwable}s will be signaled to the global error handler via
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors.
      *  </dd>
      * </dl>
      * <p>History: 2.1.11 - experimental
      * @param mapper the function called with each upstream item and should return a
-     *               {@link CompletableSource} to be subscribed to and awaited for
+     *               {@code CompletableSource} to be subscribed to and awaited for
      *               (non blockingly) for its terminal event
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapCompletableDelayError(Function)
      * @since 2.2
      */
@@ -12762,27 +13143,28 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
      * Since a {@code CompletableSource} doesn't produce any items, the resulting reactive type of
      * this operator is a {@link Completable} that can only indicate successful completion or
      * a failure in any of the inner {@code CompletableSource}s or the failure of the current
-     * {@link Observable}.
+     * {@code Observable}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapCompletableDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>Errors of this {@code Observable} and all the {@code CompletableSource}s, who had the chance
+     *  <dd>The errors of the current {@code Observable} and all the {@code CompletableSource}s, who had the chance
      *  to run to their completion, are delayed until
      *  all of them terminate in some fashion. At this point, if there was only one failure, the respective
-     *  {@code Throwable} is emitted to the downstream. It there were more than one failures, the
-     *  operator combines all {@code Throwable}s into a {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}
+     *  {@link Throwable} is emitted to the downstream. It there were more than one failures, the
+     *  operator combines all {@code Throwable}s into a {@link CompositeException}
      *  and signals that to the downstream.
      *  If any inactivated (switched out) {@code CompletableSource}
-     *  signals an {@code onError} late, the {@code Throwable}s will be signalled to the global error handler via
-     *  {@link RxJavaPlugins#onError(Throwable)} method as {@code UndeliverableException} errors.
+     *  signals an {@code onError} late, the {@code Throwable}s will be signaled to the global error handler via
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors.
      *  </dd>
      * </dl>
      * <p>History: 2.1.11 - experimental
      * @param mapper the function called with each upstream item and should return a
-     *               {@link CompletableSource} to be subscribed to and awaited for
+     *               {@code CompletableSource} to be subscribed to and awaited for
      *               (non blockingly) for its terminal event
-     * @return the new Completable instance
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapCompletable(Function)
      * @since 2.2
      */
@@ -12795,9 +13177,9 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
     }
 
     /**
-     * Maps the upstream items into {@link MaybeSource}s and switches (subscribes) to the newer ones
+     * Maps the items of the current {@code Observable} into {@link MaybeSource}s and switches (subscribes) to the newer ones
      * while disposing the older ones (and ignoring their signals) and emits the latest success value of the current one if
-     * available while failing immediately if this {@code Observable} or any of the
+     * available while failing immediately if the current {@code Observable} or any of the
      * active inner {@code MaybeSource}s fail.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.o.png" alt="">
@@ -12805,21 +13187,22 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd>This operator terminates with an {@code onError} if this {@code Observable} or any of
+     *  <dd>This operator terminates with an {@code onError} if the current {@code Observable} or any of
      *  the inner {@code MaybeSource}s fail while they are active. When this happens concurrently, their
-     *  individual {@code Throwable} errors may get combined and emitted as a single
-     *  {@link io.reactivex.rxjava3.exceptions.CompositeException CompositeException}. Otherwise, a late
-     *  (i.e., inactive or switched out) {@code onError} from this {@code Observable} or from any of
+     *  individual {@link Throwable} errors may get combined and emitted as a single
+     *  {@link CompositeException}. Otherwise, a late
+     *  (i.e., inactive or switched out) {@code onError} from the current {@code Observable} or from any of
      *  the inner {@code MaybeSource}s will be forwarded to the global error handler via
-     *  {@link io.reactivex.rxjava3.plugins.RxJavaPlugins#onError(Throwable)} as
-     *  {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}</dd>
+     *  {@link RxJavaPlugins#onError(Throwable)} as
+     *  {@link UndeliverableException}</dd>
      * </dl>
      * <p>History: 2.1.11 - experimental
      * @param <R> the output value type
      * @param mapper the function called with the current upstream event and should
      *               return a {@code MaybeSource} to replace the current active inner source
      *               and get subscribed to.
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapMaybeDelayError(Function)
      * @since 2.2
      */
@@ -12834,7 +13217,7 @@ public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? ext
     /**
      * Maps the upstream items into {@link MaybeSource}s and switches (subscribes) to the newer ones
      * while disposing the older ones  (and ignoring their signals) and emits the latest success value of the current one if
-     * available, delaying errors from this {@code Observable} or the inner {@code MaybeSource}s until all terminate.
+     * available, delaying errors from the current {@code Observable} or the inner {@code MaybeSource}s until all terminate.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
@@ -12846,7 +13229,8 @@ public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? ext
      * @param mapper the function called with the current upstream event and should
      *               return a {@code MaybeSource} to replace the current active inner source
      *               and get subscribed to.
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapMaybe(Function)
      * @since 2.2
      */
@@ -12859,12 +13243,12 @@ public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? supe
     }
 
     /**
-     * Returns a new ObservableSource by applying a function that you supply to each item emitted by the source
-     * ObservableSource that returns a SingleSource, and then emitting the item emitted by the most recently emitted
-     * of these SingleSources.
+     * Returns a new {@code Observable} by applying a function that you supply to each item emitted by the current
+     * {@code Observable} that returns a {@link SingleSource}, and then emitting the item emitted by the most recently emitted
+     * of these {@code SingleSource}s.
      * <p>
-     * The resulting ObservableSource completes if both the upstream ObservableSource and the last inner SingleSource, if any, complete.
-     * If the upstream ObservableSource signals an onError, the inner SingleSource is disposed and the error delivered in-sequence.
+     * The resulting {@code Observable} completes if both the current {@code Observable} and the last inner {@code SingleSource}, if any, complete.
+     * If the current {@code Observable} signals an {@code onError}, the inner {@code SingleSource} is disposed and the error delivered in-sequence.
      * <p>
      * <img width="640" height="531" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapSingle.o.png" alt="">
      * <dl>
@@ -12872,11 +13256,12 @@ public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? supe
      *  <dd>{@code switchMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.8 - experimental
-     * @param <R> the element type of the inner SingleSources and the output
+     * @param <R> the element type of the inner {@code SingleSource}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns a
-     *            SingleSource
-     * @return an Observable that emits the item emitted by the SingleSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns a
+     *            {@code SingleSource}
+     * @return an {@code Observable} that emits the item emitted by the {@code SingleSource} returned from applying {@code mapper} to the most recently emitted item emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapSingleDelayError(Function)
      * @since 2.2
@@ -12890,13 +13275,13 @@ public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Returns a new ObservableSource by applying a function that you supply to each item emitted by the source
-     * ObservableSource that returns a SingleSource, and then emitting the item emitted by the most recently emitted
-     * of these SingleSources and delays any error until all SingleSources terminate.
+     * Returns a new {@code Observable} by applying a function that you supply to each item emitted by the current
+     * {@code Observable} that returns a {@link SingleSource}, and then emitting the item emitted by the most recently emitted
+     * of these {@code SingleSource}s and delays any error until all {@code SingleSource}s terminate.
      * <p>
-     * The resulting ObservableSource completes if both the upstream ObservableSource and the last inner SingleSource, if any, complete.
-     * If the upstream ObservableSource signals an onError, the termination of the last inner SingleSource will emit that error as is
-     * or wrapped into a CompositeException along with the other possible errors the former inner SingleSources signalled.
+     * The resulting {@code Observable} completes if both the current {@code Observable} and the last inner {@code SingleSource}, if any, complete.
+     * If the current {@code Observable} signals an {@code onError}, the termination of the last inner {@code SingleSource} will emit that error as is
+     * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code SingleSource}s signaled.
      * <p>
      * <img width="640" height="467" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapSingleDelayError.o.png" alt="">
      * <dl>
@@ -12904,11 +13289,13 @@ public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? ex
      *  <dd>{@code switchMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.8 - experimental
-     * @param <R> the element type of the inner SingleSources and the output
+     * @param <R> the element type of the inner {@code SingleSource}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns a
-     *            SingleSource
-     * @return an Observable that emits the item emitted by the SingleSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns a
+     *            {@code SingleSource}
+     * @return an {@code Observable} that emits the item emitted by the {@code SingleSource} returned from applying {@code mapper}
+     *         to the most recently emitted item emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapSingle(Function)
      * @since 2.2
@@ -12922,13 +13309,13 @@ public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? sup
     }
 
     /**
-     * Returns a new ObservableSource by applying a function that you supply to each item emitted by the source
-     * ObservableSource that returns an ObservableSource, and then emitting the items emitted by the most recently emitted
-     * of these ObservableSources and delays any error until all ObservableSources terminate.
+     * Returns a new {@code Observable} by applying a function that you supply to each item emitted by the current
+     * {@code Observable} that returns an {@link ObservableSource}, and then emitting the items emitted by the most recently emitted
+     * of these {@code ObservableSource}s and delays any error until all {@code ObservableSource}s terminate.
      * <p>
-     * The resulting ObservableSource completes if both the upstream ObservableSource and the last inner ObservableSource, if any, complete.
-     * If the upstream ObservableSource signals an onError, the termination of the last inner ObservableSource will emit that error as is
-     * or wrapped into a CompositeException along with the other possible errors the former inner ObservableSources signalled.
+     * The resulting {@code Observable} completes if both the current {@code Observable} and the last inner {@code ObservableSource}, if any, complete.
+     * If the current {@code Observable} signals an {@code onError}, the termination of the last inner {@code ObservableSource} will emit that error as is
+     * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code ObservableSource}s signaled.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
@@ -12936,11 +13323,13 @@ public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? sup
      *  <dd>{@code switchMapDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the element type of the inner ObservableSources and the output
+     * @param <R> the element type of the inner {@code ObservableSource}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
-     * @return an Observable that emits the items emitted by the ObservableSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
+     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} returned from applying {@code mapper}
+     *         to the most recently emitted item emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMap(Function)
      * @since 2.0
@@ -12953,13 +13342,13 @@ public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T,
     }
 
     /**
-     * Returns a new ObservableSource by applying a function that you supply to each item emitted by the source
-     * ObservableSource that returns an ObservableSource, and then emitting the items emitted by the most recently emitted
-     * of these ObservableSources and delays any error until all ObservableSources terminate.
+     * Returns a new {@code Observable} by applying a function that you supply to each item emitted by the current
+     * {@code Observable} that returns an {@link ObservableSource}, and then emitting the items emitted by the most recently emitted
+     * of these {@code ObservableSource}s and delays any error until all {@code ObservableSource}s terminate.
      * <p>
-     * The resulting ObservableSource completes if both the upstream ObservableSource and the last inner ObservableSource, if any, complete.
-     * If the upstream ObservableSource signals an onError, the termination of the last inner ObservableSource will emit that error as is
-     * or wrapped into a CompositeException along with the other possible errors the former inner ObservableSources signalled.
+     * The resulting {@code Observable} completes if both the current {@code Observable} and the last inner {@code ObservableSource}, if any, complete.
+     * If the current {@code Observable} signals an {@code onError}, the termination of the last inner {@code ObservableSource} will emit that error as is
+     * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code ObservableSource}s signaled.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
@@ -12967,13 +13356,15 @@ public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T,
      *  <dd>{@code switchMapDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <R> the element type of the inner ObservableSources and the output
+     * @param <R> the element type of the inner {@code ObservableSource}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source ObservableSource, returns an
-     *            ObservableSource
+     *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
+     *            {@code ObservableSource}
      * @param bufferSize
-     *            the number of elements to prefetch from the current active inner ObservableSource
-     * @return an Observable that emits the items emitted by the ObservableSource returned from applying {@code func} to the most recently emitted item emitted by the source ObservableSource
+     *            the number of elements expected from the current active inner {@code ObservableSource} to be buffered
+     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} returned from applying {@code mapper} to the most recently emitted item emitted by the current {@code Observable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMap(Function, int)
      * @since 2.0
@@ -12996,14 +13387,18 @@ public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T,
     }
 
     /**
-     * Returns an Observable that emits only the first {@code count} items emitted by the source ObservableSource. If the source emits fewer than
-     * {@code count} items then all of its items are emitted.
+     * Returns an {@code Observable} that emits only the first {@code count} items emitted by the current {@code Observable}.
+     * If the source emits fewer than {@code count} items then all of its items are emitted.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.png" alt="">
      * <p>
-     * This method returns an ObservableSource that will invoke a subscribing {@link Observer}'s
+     * This method returns an {@code Observable} that will invoke a subscribing {@link Observer}'s
      * {@link Observer#onNext onNext} function a maximum of {@code count} times before invoking
      * {@link Observer#onComplete onComplete}.
+     * <p>
+     * Taking {@code 0} items from the current {@code Observable} will still subscribe to it, allowing the
+     * subscription-time side-effects to happen there, but will be immediately disposed and the downstream completed
+     * without any item emission.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code take} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13011,8 +13406,9 @@ public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T,
      *
      * @param count
      *            the maximum number of items to emit
-     * @return an Observable that emits only the first {@code count} items emitted by the source ObservableSource, or
-     *         all of the items from the source ObservableSource if that ObservableSource emits fewer than {@code count} items
+     * @return an {@code Observable} that emits only the first {@code count} items emitted by the current {@code Observable}, or
+     *         all of the items from the current {@code Observable} if it emits fewer than {@code count} items
+     * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
     @CheckReturnValue
@@ -13026,7 +13422,7 @@ public final Observable<T> take(long count) {
     }
 
     /**
-     * Returns an Observable that emits those items emitted by source ObservableSource before a specified time runs
+     * Returns an {@code Observable} that emits those items emitted by the current {@code Observable} before a specified time runs
      * out.
      * <p>
      * If time runs out before the {@code Observable} completes normally, the {@code onComplete} event will be
@@ -13035,14 +13431,15 @@ public final Observable<T> take(long count) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.t.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>This version of {@code take} operates by default on the {@code computation} {@link Scheduler}.</dd>
+     *  <dd>This version of {@code take} operates by default on the {@code computation} {@code Scheduler}.</dd>
      * </dl>
      *
      * @param time
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return an Observable that emits those items emitted by the source ObservableSource before the time runs out
+     * @return an {@code Observable} that emits those items emitted by the current {@code Observable} before the time runs out
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
     @CheckReturnValue
@@ -13053,16 +13450,16 @@ public final Observable<T> take(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that emits those items emitted by source ObservableSource before a specified time (on a
-     * specified Scheduler) runs out.
+     * Returns an {@code Observable} that emits those items emitted by the current {@code Observable} before a specified time (on a
+     * specified {@link Scheduler}) runs out.
      * <p>
      * If time runs out before the {@code Observable} completes normally, the {@code onComplete} event will be
-     * signaled on the provided {@link Scheduler}.
+     * signaled on the provided {@code Scheduler}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.ts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param time
@@ -13070,9 +13467,10 @@ public final Observable<T> take(long time, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler used for time source
-     * @return an Observable that emits those items emitted by the source ObservableSource before the time runs out,
-     *         according to the specified Scheduler
+     *            the {@code Scheduler} used for time source
+     * @return an {@code Observable} that emits those items emitted by the current {@code Observable} before the time runs out,
+     *         according to the specified {@code Scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
     @CheckReturnValue
@@ -13083,8 +13481,8 @@ public final Observable<T> take(long time, @NonNull TimeUnit unit, @NonNull Sche
     }
 
     /**
-     * Returns an Observable that emits at most the last {@code count} items emitted by the source ObservableSource. If the source emits fewer than
-     * {@code count} items then all of its items are emitted.
+     * Returns an {@code Observable} that emits at most the last {@code count} items emitted by the current {@code Observable}.
+     * If the source emits fewer than {@code count} items then all of its items are emitted.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.n.png" alt="">
      * <dl>
@@ -13093,11 +13491,11 @@ public final Observable<T> take(long time, @NonNull TimeUnit unit, @NonNull Sche
      * </dl>
      *
      * @param count
-     *            the maximum number of items to emit from the end of the sequence of items emitted by the source
-     *            ObservableSource
-     * @return an Observable that emits at most the last {@code count} items emitted by the source ObservableSource
-     * @throws IndexOutOfBoundsException
-     *             if {@code count} is less than zero
+     *            the maximum number of items to emit from the end of the sequence of items emitted by the current
+     *            {@code Observable}
+     * @return an {@code Observable} that emits at most the last {@code count} items emitted by the current {@code Observable}
+     * @throws IllegalArgumentException
+     *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13105,7 +13503,7 @@ public final Observable<T> take(long time, @NonNull TimeUnit unit, @NonNull Sche
     @NonNull
     public final Observable<T> takeLast(int count) {
         if (count < 0) {
-            throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
+            throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
         if (count == 0) {
             return RxJavaPlugins.onAssembly(new ObservableIgnoreElements<>(this));
@@ -13117,14 +13515,14 @@ public final Observable<T> takeLast(int count) {
     }
 
     /**
-     * Returns an Observable that emits at most a specified number of items from the source ObservableSource that were
-     * emitted in a specified window of time before the ObservableSource completed.
+     * Returns an {@code Observable} that emits at most a specified number of items from the current {@code Observable} that were
+     * emitted in a specified window of time before the current {@code Observable} completed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeLast} does not operate on any particular scheduler but uses the current time
-     *  from the {@code computation} {@link Scheduler}.</dd>
+     *  from the {@code trampoline} {@link Scheduler}.</dd>
      * </dl>
      *
      * @param count
@@ -13133,8 +13531,9 @@ public final Observable<T> takeLast(int count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return an Observable that emits at most {@code count} items from the source ObservableSource that were emitted
-     *         in a specified window of time before the ObservableSource completed
+     * @return an {@code Observable} that emits at most {@code count} items from the current {@code Observable} that were emitted
+     *         in a specified window of time before the current {@code Observable} completed
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13145,14 +13544,14 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
     }
 
     /**
-     * Returns an Observable that emits at most a specified number of items from the source ObservableSource that were
-     * emitted in a specified window of time before the ObservableSource completed, where the timing information is
-     * provided by a given Scheduler.
+     * Returns an {@code Observable} that emits at most a specified number of items from the current {@code Observable} that were
+     * emitted in a specified window of time before the current {@code Observable} completed, where the timing information is
+     * provided by a given {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use for tracking the current time</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use for tracking the current time</dd>
      * </dl>
      *
      * @param count
@@ -13162,12 +13561,13 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the {@link Scheduler} that provides the timestamps for the observed items
-     * @return an Observable that emits at most {@code count} items from the source ObservableSource that were emitted
-     *         in a specified window of time before the ObservableSource completed, where the timing information is
-     *         provided by the given {@code scheduler}
-     * @throws IndexOutOfBoundsException
-     *             if {@code count} is less than zero
+     *            the {@code Scheduler} that provides the timestamps for the observed items
+     * @return an {@code Observable} that emits at most {@code count} items from the current {@code Observable} that were emitted
+     *         in a specified window of time before the current {@code Observable} completed, where the timing information is
+     *         provided by the given {@code Scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException
+     *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13178,14 +13578,14 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
     }
 
     /**
-     * Returns an Observable that emits at most a specified number of items from the source ObservableSource that were
-     * emitted in a specified window of time before the ObservableSource completed, where the timing information is
-     * provided by a given Scheduler.
+     * Returns an {@code Observable} that emits at most a specified number of items from the current {@code Observable} that were
+     * emitted in a specified window of time before the current {@code Observable} completed, where the timing information is
+     * provided by a given {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use for tracking the current time</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use for tracking the current time</dd>
      * </dl>
      *
      * @param count
@@ -13195,17 +13595,18 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the {@link Scheduler} that provides the timestamps for the observed items
+     *            the {@code Scheduler} that provides the timestamps for the observed items
      * @param delayError
-     *            if true, an exception signalled by the current Observable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signalled and all regular elements dropped
+     *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return an Observable that emits at most {@code count} items from the source ObservableSource that were emitted
-     *         in a specified window of time before the ObservableSource completed, where the timing information is
+     * @return an {@code Observable} that emits at most {@code count} items from the current {@code Observable} that were emitted
+     *         in a specified window of time before the current {@code Observable} completed, where the timing information is
      *         provided by the given {@code scheduler}
-     * @throws IndexOutOfBoundsException
-     *             if {@code count} is less than zero
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException
+     *             if {@code count} is negative or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13216,27 +13617,28 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (count < 0) {
-            throw new IndexOutOfBoundsException("count >= 0 required but it was " + count);
+            throw new IllegalArgumentException("count >= 0 required but it was " + count);
         }
         return RxJavaPlugins.onAssembly(new ObservableTakeLastTimed<>(this, count, time, unit, scheduler, bufferSize, delayError));
     }
 
     /**
-     * Returns an Observable that emits the items from the source ObservableSource that were emitted in a specified
-     * window of time before the ObservableSource completed.
+     * Returns an {@code Observable} that emits the items from the current {@code Observable} that were emitted in a specified
+     * window of time before the current {@code Observable} completed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>This version of {@code takeLast} operates by default on the {@code computation} {@link Scheduler}.</dd>
+     *  <dd>{@code takeLast} does not operate on any particular scheduler but uses the current time
+     *  from the {@code trampoline} {@link Scheduler}.</dd>
      * </dl>
      *
      * @param time
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return an Observable that emits the items from the source ObservableSource that were emitted in the window of
-     *         time before the ObservableSource completed specified by {@code time}
+     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
+     *         time before the current {@code Observable} completed specified by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13247,13 +13649,14 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that emits the items from the source ObservableSource that were emitted in a specified
-     * window of time before the ObservableSource completed.
+     * Returns an {@code Observable} that emits the items from the current {@code Observable} that were emitted in a specified
+     * window of time before the current {@code Observable} completed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>This version of {@code takeLast} operates by default on the {@code computation} {@link Scheduler}.</dd>
+     *  <dd>{@code takeLast} does not operate on any particular scheduler but uses the current time
+     *  from the {@code trampoline} {@link Scheduler}.</dd>
      * </dl>
      *
      * @param time
@@ -13261,10 +13664,10 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit) {
      * @param unit
      *            the time unit of {@code time}
      * @param delayError
-     *            if true, an exception signalled by the current Observable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signalled and all regular elements dropped
-     * @return an Observable that emits the items from the source ObservableSource that were emitted in the window of
-     *         time before the ObservableSource completed specified by {@code time}
+     *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
+     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
+     *         time before the current {@code Observable} completed specified by {@code time}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13275,14 +13678,14 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, boolean d
     }
 
     /**
-     * Returns an Observable that emits the items from the source ObservableSource that were emitted in a specified
-     * window of time before the ObservableSource completed, where the timing information is provided by a specified
-     * Scheduler.
+     * Returns an {@code Observable} that emits the items from the current {@code Observable} that were emitted in a specified
+     * window of time before the current {@code Observable} completed, where the timing information is provided by a specified
+     * {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param time
@@ -13290,9 +13693,9 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, boolean d
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that provides the timestamps for the Observed items
-     * @return an Observable that emits the items from the source ObservableSource that were emitted in the window of
-     *         time before the ObservableSource completed specified by {@code time}, where the timing information is
+     *            the {@code Scheduler} that provides the timestamps for the observed items
+     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
+     *         time before the current {@code Observable} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -13304,14 +13707,14 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns an Observable that emits the items from the source ObservableSource that were emitted in a specified
-     * window of time before the ObservableSource completed, where the timing information is provided by a specified
-     * Scheduler.
+     * Returns an {@code Observable} that emits the items from the current {@code Observable} that were emitted in a specified
+     * window of time before the current {@code Observable} completed, where the timing information is provided by a specified
+     * {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param time
@@ -13319,12 +13722,12 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that provides the timestamps for the Observed items
+     *            the {@code Scheduler} that provides the timestamps for the observed items
      * @param delayError
-     *            if true, an exception signalled by the current Observable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signalled and all regular elements dropped
-     * @return an Observable that emits the items from the source ObservableSource that were emitted in the window of
-     *         time before the ObservableSource completed specified by {@code time}, where the timing information is
+     *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
+     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
+     *         time before the current {@code Observable} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -13336,14 +13739,14 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns an Observable that emits the items from the source ObservableSource that were emitted in a specified
-     * window of time before the ObservableSource completed, where the timing information is provided by a specified
-     * Scheduler.
+     * Returns an {@code Observable} that emits the items from the current {@code Observable} that were emitted in a specified
+     * window of time before the current {@code Observable} completed, where the timing information is provided by a specified
+     * {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param time
@@ -13351,14 +13754,14 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      * @param unit
      *            the time unit of {@code time}
      * @param scheduler
-     *            the Scheduler that provides the timestamps for the Observed items
+     *            the {@code Scheduler} that provides the timestamps for the observed items
      * @param delayError
-     *            if true, an exception signalled by the current Observable is delayed until the regular elements are consumed
-     *            by the downstream; if false, an exception is immediately signalled and all regular elements dropped
+     *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
+     *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return an Observable that emits the items from the source ObservableSource that were emitted in the window of
-     *         time before the ObservableSource completed specified by {@code time}, where the timing information is
+     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
+     *         time before the current {@code Observable} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -13370,7 +13773,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns an Observable that emits the items emitted by the source Observable until a second ObservableSource
+     * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} until a second {@link ObservableSource}
      * emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
@@ -13380,11 +13783,12 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      * </dl>
      *
      * @param other
-     *            the ObservableSource whose first emitted item will cause {@code takeUntil} to stop emitting items
-     *            from the source Observable
+     *            the {@code ObservableSource} whose first emitted item will cause {@code takeUntil} to stop emitting items
+     *            from the current {@code Observable}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return an Observable that emits the items emitted by the source Observable until such time as {@code other} emits its first item
+     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} until such time as {@code other} emits its first item
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
     @CheckReturnValue
@@ -13396,7 +13800,7 @@ public final <U> Observable<T> takeUntil(@NonNull ObservableSource<U> other) {
     }
 
     /**
-     * Returns an Observable that emits items emitted by the source Observable, checks the specified predicate
+     * Returns an {@code Observable} that emits items emitted by the current {@code Observable}, checks the specified predicate
      * for each item, and then completes when the condition is satisfied.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.p.png" alt="">
@@ -13410,9 +13814,10 @@ public final <U> Observable<T> takeUntil(@NonNull ObservableSource<U> other) {
      * </dl>
      *
      * @param stopPredicate
-     *            a function that evaluates an item emitted by the source Observable and returns a Boolean
-     * @return an Observable that first emits items emitted by the source Observable, checks the specified
+     *            a function that evaluates an item emitted by the current {@code Observable} and returns a {@link Boolean}
+     * @return an {@code Observable} that first emits items emitted by the current {@code Observable}, checks the specified
      *         condition after each item, and then completes when the condition is satisfied.
+     * @throws NullPointerException if {@code stopPredicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      * @see Observable#takeWhile(Predicate)
      * @since 1.1.0
@@ -13426,7 +13831,7 @@ public final Observable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate
     }
 
     /**
-     * Returns an Observable that emits items emitted by the source ObservableSource so long as each item satisfied a
+     * Returns an {@code Observable} that emits items emitted by the current {@code Observable} so long as each item satisfied a
      * specified condition, and then completes as soon as this condition is not satisfied.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeWhile.png" alt="">
@@ -13436,9 +13841,10 @@ public final Observable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates an item emitted by the source ObservableSource and returns a Boolean
-     * @return an Observable that emits the items from the source ObservableSource so long as each item satisfies the
+     *            a function that evaluates an item emitted by the current {@code Observable} and returns a {@link Boolean}
+     * @return an {@code Observable} that emits the items from the current {@code Observable} so long as each item satisfies the
      *         condition defined by {@code predicate}, then completes
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takewhile.html">ReactiveX operators documentation: TakeWhile</a>
      * @see Observable#takeUntil(Predicate)
      */
@@ -13451,11 +13857,11 @@ public final Observable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns an Observable that emits only the first item emitted by the source ObservableSource during sequential
+     * Returns an {@code Observable} that emits only the first item emitted by the current {@code Observable} during sequential
      * time windows of a specified duration.
      * <p>
      * This differs from {@link #throttleLast} in that this only tracks passage of time whereas
-     * {@link #throttleLast} ticks at scheduled intervals.
+     * {@code throttleLast} ticks at scheduled intervals.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.png" alt="">
      * <dl>
@@ -13467,7 +13873,8 @@ public final Observable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
      *            time to wait before emitting another item after emitting the last item
      * @param unit
      *            the unit of time of {@code windowDuration}
-     * @return an Observable that performs the throttle operation
+     * @return an {@code Observable} that performs the throttle operation
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      */
     @CheckReturnValue
@@ -13478,16 +13885,16 @@ public final Observable<T> throttleFirst(long windowDuration, @NonNull TimeUnit
     }
 
     /**
-     * Returns an Observable that emits only the first item emitted by the source ObservableSource during sequential
-     * time windows of a specified duration, where the windows are managed by a specified Scheduler.
+     * Returns an {@code Observable} that emits only the first item emitted by the current {@code Observable} during sequential
+     * time windows of a specified duration, where the windows are managed by a specified {@link Scheduler}.
      * <p>
      * This differs from {@link #throttleLast} in that this only tracks passage of time whereas
-     * {@link #throttleLast} ticks at scheduled intervals.
+     * {@code throttleLast} ticks at scheduled intervals.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param skipDuration
@@ -13495,9 +13902,10 @@ public final Observable<T> throttleFirst(long windowDuration, @NonNull TimeUnit
      * @param unit
      *            the unit of time of {@code skipDuration}
      * @param scheduler
-     *            the {@link Scheduler} to use internally to manage the timers that handle timeout for each
+     *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
-     * @return an Observable that performs the throttle operation
+     * @return an {@code Observable} that performs the throttle operation
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      */
     @CheckReturnValue
@@ -13510,11 +13918,11 @@ public final Observable<T> throttleFirst(long skipDuration, @NonNull TimeUnit un
     }
 
     /**
-     * Returns an Observable that emits only the last item emitted by the source ObservableSource during sequential
+     * Returns an {@code Observable} that emits only the last item emitted by the current {@code Observable} during sequential
      * time windows of a specified duration.
      * <p>
      * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
-     * {@link #throttleFirst} does not tick, it just tracks passage of time.
+     * {@code throttleFirst} does not tick, it just tracks passage of time.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.png" alt="">
      * <dl>
@@ -13523,11 +13931,12 @@ public final Observable<T> throttleFirst(long skipDuration, @NonNull TimeUnit un
      * </dl>
      *
      * @param intervalDuration
-     *            duration of windows within which the last item emitted by the source ObservableSource will be
+     *            duration of windows within which the last item emitted by the current {@code Observable} will be
      *            emitted
      * @param unit
      *            the unit of time of {@code intervalDuration}
-     * @return an Observable that performs the throttle operation
+     * @return an {@code Observable} that performs the throttle operation
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #sample(long, TimeUnit)
      */
@@ -13539,27 +13948,28 @@ public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit
     }
 
     /**
-     * Returns an Observable that emits only the last item emitted by the source ObservableSource during sequential
-     * time windows of a specified duration, where the duration is governed by a specified Scheduler.
+     * Returns an {@code Observable} that emits only the last item emitted by the current {@code Observable} during sequential
+     * time windows of a specified duration, where the duration is governed by a specified {@link Scheduler}.
      * <p>
      * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
-     * {@link #throttleFirst} does not tick, it just tracks passage of time.
+     * {@code throttleFirst} does not tick, it just tracks passage of time.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param intervalDuration
-     *            duration of windows within which the last item emitted by the source ObservableSource will be
+     *            duration of windows within which the last item emitted by the current {@code Observable} will be
      *            emitted
      * @param unit
      *            the unit of time of {@code intervalDuration}
      * @param scheduler
-     *            the {@link Scheduler} to use internally to manage the timers that handle timeout for each
+     *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
-     * @return an Observable that performs the throttle operation
+     * @return an {@code Observable} that performs the throttle operation
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #sample(long, TimeUnit, Scheduler)
      */
@@ -13571,7 +13981,7 @@ public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit
     }
 
     /**
-     * Throttles items from the upstream {@code Observable} by first emitting the next
+     * Throttles items from the current {@code Observable} by first emitting the next
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
@@ -13590,7 +14000,8 @@ public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit
      * @param timeout the time to wait after an item emission towards the downstream
      *                before trying to emit the latest item from upstream again
      * @param unit    the time unit
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see #throttleLatest(long, TimeUnit, boolean)
      * @see #throttleLatest(long, TimeUnit, Scheduler)
      * @since 2.2
@@ -13603,7 +14014,7 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit)
     }
 
     /**
-     * Throttles items from the upstream {@code Observable} by first emitting the next
+     * Throttles items from the current {@code Observable} by first emitting the next
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
@@ -13623,7 +14034,8 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit)
      *                 immediately when the upstream completes, regardless if there is
      *                 a timeout window active or not. If {@code false}, the very last
      *                 upstream item is ignored and the flow terminates.
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see #throttleLatest(long, TimeUnit, Scheduler, boolean)
      * @since 2.2
      */
@@ -13635,7 +14047,7 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
     }
 
     /**
-     * Throttles items from the upstream {@code Observable} by first emitting the next
+     * Throttles items from the current {@code Observable} by first emitting the next
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
@@ -13654,9 +14066,10 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
      * @param timeout the time to wait after an item emission towards the downstream
      *                before trying to emit the latest item from upstream again
      * @param unit    the time unit
-     * @param scheduler the {@link Scheduler} where the timed wait and latest item
+     * @param scheduler the {@code Scheduler} where the timed wait and latest item
      *                  emission will be performed
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see #throttleLatest(long, TimeUnit, Scheduler, boolean)
      * @since 2.2
      */
@@ -13668,7 +14081,7 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
     }
 
     /**
-     * Throttles items from the upstream {@code Observable} by first emitting the next
+     * Throttles items from the current {@code Observable} by first emitting the next
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
@@ -13684,13 +14097,14 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
      * @param timeout the time to wait after an item emission towards the downstream
      *                before trying to emit the latest item from upstream again
      * @param unit    the time unit
-     * @param scheduler the {@link Scheduler} where the timed wait and latest item
+     * @param scheduler the {@code Scheduler} where the timed wait and latest item
      *                  emission will be performed
      * @param emitLast If {@code true}, the very last item from the upstream will be emitted
      *                 immediately when the upstream completes, regardless if there is
      *                 a timeout window active or not. If {@code false}, the very last
      *                 upstream item is ignored and the flow terminates.
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -13703,12 +14117,12 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, except that it drops items emitted by the
-     * source ObservableSource that are followed by newer items before a timeout value expires. The timer resets on
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, except that it drops items emitted by the
+     * current {@code Observable} that are followed by newer items before a timeout value expires. The timer resets on
      * each emission (alias to {@link #debounce(long, TimeUnit, Scheduler)}).
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source ObservableSource faster than the timeout then no items
-     * will be emitted by the resulting ObservableSource.
+     * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Observable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.png" alt="">
      * <dl>
@@ -13717,13 +14131,14 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
      * </dl>
      *
      * @param timeout
-     *            the length of the window of time that must pass after the emission of an item from the source
-     *            ObservableSource in which that ObservableSource emits no items in order for the item to be emitted by the
-     *            resulting ObservableSource
+     *            the length of the window of time that must pass after the emission of an item from the current
+     *            {@code Observable}, in which the current {@code Observable} emits no items, in order for the item to be emitted by the
+     *            resulting {@code Observable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return an Observable that filters out items from the source ObservableSource that are too quickly followed by
+     * @return an {@code Observable} that filters out items from the current {@code Observable} that are too quickly followed by
      *         newer items
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see #debounce(long, TimeUnit)
      */
@@ -13735,30 +14150,31 @@ public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit u
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, except that it drops items emitted by the
-     * source ObservableSource that are followed by newer items before a timeout value expires on a specified
-     * Scheduler. The timer resets on each emission (Alias to {@link #debounce(long, TimeUnit, Scheduler)}).
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, except that it drops items emitted by the
+     * current {@code Observable} that are followed by newer items before a timeout value expires on a specified
+     * {@link Scheduler}. The timer resets on each emission (Alias to {@link #debounce(long, TimeUnit, Scheduler)}).
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source ObservableSource faster than the timeout then no items
-     * will be emitted by the resulting ObservableSource.
+     * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Observable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
-     *            the length of the window of time that must pass after the emission of an item from the source
-     *            ObservableSource in which that ObservableSource emits no items in order for the item to be emitted by the
-     *            resulting ObservableSource
+     *            the length of the window of time that must pass after the emission of an item from the current
+     *            {@code Observable}, in which the current {@code Observable} emits no items, in order for the item to be emitted by the
+     *            resulting {@code Observable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
      * @param scheduler
-     *            the {@link Scheduler} to use internally to manage the timers that handle the timeout for each
+     *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return an Observable that filters out items from the source ObservableSource that are too quickly followed by
+     * @return an {@code Observable} that filters out items from the current {@code Observable} that are too quickly followed by
      *         newer items
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see #debounce(long, TimeUnit, Scheduler)
      */
@@ -13770,8 +14186,8 @@ public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit u
     }
 
     /**
-     * Returns an Observable that emits records of the time interval between consecutive items emitted by the
-     * source ObservableSource.
+     * Returns an {@code Observable} that emits records of the time interval between consecutive items emitted by the
+     * current {@code Observable}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
      * <dl>
@@ -13780,7 +14196,7 @@ public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit u
      *  from the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Observable that emits time interval information items
+     * @return an {@code Observable} that emits time interval information items
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -13791,19 +14207,20 @@ public final Observable<Timed<T>> timeInterval() {
     }
 
     /**
-     * Returns an Observable that emits records of the time interval between consecutive items emitted by the
-     * source ObservableSource, where this interval is computed on a specified Scheduler.
+     * Returns an {@code Observable} that emits records of the time interval between consecutive items emitted by the
+     * current {@code Observable}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>The operator does not operate on any particular scheduler but uses the current time
-     *  from the specified {@link Scheduler}.</dd>
+     *  from the specified {@code Scheduler}.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} used to compute time intervals
-     * @return an Observable that emits time interval information items
+     *            the {@code Scheduler} used to compute time intervals
+     * @return an {@code Observable} that emits time interval information items
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -13814,8 +14231,8 @@ public final Observable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns an Observable that emits records of the time interval between consecutive items emitted by the
-     * source ObservableSource.
+     * Returns an {@code Observable} that emits records of the time interval between consecutive items emitted by the
+     * current {@code Observable}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
      * <dl>
@@ -13825,7 +14242,8 @@ public final Observable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param unit the time unit for the current time
-     * @return an Observable that emits time interval information items
+     * @return an {@code Observable} that emits time interval information items
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -13836,20 +14254,21 @@ public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that emits records of the time interval between consecutive items emitted by the
-     * source ObservableSource, where this interval is computed on a specified Scheduler.
+     * Returns an {@code Observable} that emits records of the time interval between consecutive items emitted by the
+     * current {@code Observable}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>The operator does not operate on any particular scheduler but uses the current time
-     *  from the specified {@link Scheduler}.</dd>
+     *  from the specified {@code Scheduler}.</dd>
      * </dl>
      *
      * @param unit the time unit for the current time
      * @param scheduler
-     *            the {@link Scheduler} used to compute time intervals
-     * @return an Observable that emits time interval information items
+     *            the {@code Scheduler} used to compute time intervals
+     * @return an {@code Observable} that emits time interval information items
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -13862,9 +14281,9 @@ public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, but notifies observers of a
-     * {@code TimeoutException} if an item emitted by the source ObservableSource doesn't arrive within a window of
-     * time after the emission of the previous item, where that period of time is measured by an ObservableSource that
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, but notifies observers of a
+     * {@link TimeoutException} if an item emitted by the current {@code Observable} doesn't arrive within a window of
+     * time after the emission of the previous item, where that period of time is measured by an {@link ObservableSource} that
      * is a function of the previous item.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout3.png" alt="">
@@ -13878,11 +14297,12 @@ public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull
      * @param <V>
      *            the timeout value type (ignored)
      * @param itemTimeoutIndicator
-     *            a function that returns an ObservableSource for each item emitted by the source
-     *            ObservableSource and that determines the timeout window for the subsequent item
-     * @return an Observable that mirrors the source ObservableSource, but notifies observers of a
-     *         {@code TimeoutException} if an item emitted by the source ObservableSource takes longer to arrive than
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current
+     *            {@code Observable} and that determines the timeout window for the subsequent item
+     * @return an {@code Observable} that mirrors the current {@code Observable}, but notifies observers of a
+     *         {@code TimeoutException} if an item emitted by the current {@code Observable} takes longer to arrive than
      *         the time window defined by the selector for the previously emitted item
+     * @throws NullPointerException if {@code itemTimeoutIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -13893,9 +14313,9 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, but that switches to a fallback ObservableSource if
-     * an item emitted by the source ObservableSource doesn't arrive within a window of time after the emission of the
-     * previous item, where that period of time is measured by an ObservableSource that is a function of the previous
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, but that switches to a fallback {@link ObservableSource} if
+     * an item emitted by the current {@code Observable} doesn't arrive within a window of time after the emission of the
+     * previous item, where that period of time is measured by an {@code ObservableSource} that is a function of the previous
      * item.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout4.png" alt="">
@@ -13909,13 +14329,14 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
      * @param <V>
      *            the timeout value type (ignored)
      * @param itemTimeoutIndicator
-     *            a function that returns an ObservableSource, for each item emitted by the source ObservableSource, that
+     *            a function that returns an {@code ObservableSource}, for each item emitted by the current {@code Observable}, that
      *            determines the timeout window for the subsequent item
      * @param other
-     *            the fallback ObservableSource to switch to if the source ObservableSource times out
-     * @return an Observable that mirrors the source ObservableSource, but switches to mirroring a fallback ObservableSource
-     *         if an item emitted by the source ObservableSource takes longer to arrive than the time window defined
+     *            the fallback {@code ObservableSource} to switch to if the current {@code Observable} times out
+     * @return an {@code Observable} that mirrors the current {@code Observable}, but switches to mirroring a fallback {@code ObservableSource}
+     *         if an item emitted by the current {@code Observable} takes longer to arrive than the time window defined
      *         by the selector for the previously emitted item
+     * @throws NullPointerException if {@code itemTimeoutIndicator} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -13928,9 +14349,9 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource but applies a timeout policy for each emitted
+     * Returns an {@code Observable} that mirrors the current {@code Observable} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
-     * the resulting ObservableSource terminates and notifies observers of a {@code TimeoutException}.
+     * the resulting {@code Observable} terminates and notifies observers of a {@link TimeoutException}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1.png" alt="">
      * <dl>
@@ -13940,24 +14361,25 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
      *
      * @param timeout
      *            maximum duration between emitted items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument.
-     * @return the source ObservableSource modified to notify observers of a {@code TimeoutException} in case of a
+     * @return the current {@code Observable} modified to notify observers of a {@code TimeoutException} in case of a
      *         timeout
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
-        return timeout0(timeout, timeUnit, null, Schedulers.computation());
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit) {
+        return timeout0(timeout, unit, null, Schedulers.computation());
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource but applies a timeout policy for each emitted
+     * Returns an {@code Observable} that mirrors the current {@code Observable} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
-     * the source ObservableSource is disposed and resulting ObservableSource begins instead
-     * to mirror a fallback ObservableSource.
+     * the current {@code Observable} is disposed and the resulting {@code Observable} begins instead
+     * to mirror a fallback {@link ObservableSource}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
      * <dl>
@@ -13967,86 +14389,88 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
      *
      * @param timeout
      *            maximum duration between items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument
      * @param other
-     *            the fallback ObservableSource to use in case of a timeout
-     * @return the source ObservableSource modified to switch to the fallback ObservableSource in case of a timeout
+     *            the fallback {@code ObservableSource} to use in case of a timeout
+     * @return the current {@code Observable} modified to switch to the fallback {@code ObservableSource} in case of a timeout
+     * @throws NullPointerException if {@code unit} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull ObservableSource<? extends T> other) {
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, timeUnit, other, Schedulers.computation());
+        return timeout0(timeout, unit, other, Schedulers.computation());
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource but applies a timeout policy for each emitted
-     * item using a specified Scheduler. If the next item isn't emitted within the specified timeout duration
-     * starting from its predecessor, the source ObservableSource is disposed and resulting ObservableSource
-     * begins instead to mirror a fallback ObservableSource.
+     * Returns an {@code Observable} that mirrors the current {@code Observable} but applies a timeout policy for each emitted
+     * item using a specified {@link Scheduler}. If the next item isn't emitted within the specified timeout duration
+     * starting from its predecessor, the current {@code Observable} is disposed and returned {@code Observable}
+     * begins instead to mirror a fallback {@link ObservableSource}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
      *            maximum duration between items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
-     *            the {@link Scheduler} to run the timeout timers on
+     *            the {@code Scheduler} to run the timeout timers on
      * @param other
-     *            the ObservableSource to use as the fallback in case of a timeout
-     * @return the source ObservableSource modified so that it will switch to the fallback ObservableSource in case of a
+     *            the {@code ObservableSource} to use as the fallback in case of a timeout
+     * @return the current {@code Observable} modified so that it will switch to the fallback {@code ObservableSource} in case of a
      *         timeout
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler, @NonNull ObservableSource<? extends T> other) {
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull ObservableSource<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, timeUnit, other, scheduler);
+        return timeout0(timeout, unit, other, scheduler);
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource but applies a timeout policy for each emitted
-     * item, where this policy is governed on a specified Scheduler. If the next item isn't emitted within the
-     * specified timeout duration starting from its predecessor, the resulting ObservableSource terminates and
-     * notifies observers of a {@code TimeoutException}.
+     * Returns an {@code Observable} that mirrors the current {@code Observable} but applies a timeout policy for each emitted
+     * item, where this policy is governed on a specified {@link Scheduler}. If the next item isn't emitted within the
+     * specified timeout duration starting from its predecessor, the resulting {@code Observable} terminates and
+     * notifies observers of a {@link TimeoutException}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param timeout
      *            maximum duration between items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
-     *            the Scheduler to run the timeout timers on
-     * @return the source ObservableSource modified to notify observers of a {@code TimeoutException} in case of a
+     *            the {@code Scheduler} to run the timeout timers on
+     * @return the current {@code Observable} modified to notify observers of a {@code TimeoutException} in case of a
      *         timeout
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler) {
-        return timeout0(timeout, timeUnit, null, scheduler);
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return timeout0(timeout, unit, null, scheduler);
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, but notifies observers of a
-     * {@code TimeoutException} if either the first item emitted by the source ObservableSource or any subsequent item
-     * doesn't arrive within time windows defined by other ObservableSources.
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, but notifies observers of a
+     * {@link TimeoutException} if either the first item emitted by the current {@code Observable} or any subsequent item
+     * doesn't arrive within time windows defined by indicator {@link ObservableSource}s.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout5.png" alt="">
      * <dl>
@@ -14059,15 +14483,16 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @No
      * @param <V>
      *            the subsequent timeout value type (ignored)
      * @param firstTimeoutIndicator
-     *            a function that returns an ObservableSource that determines the timeout window for the first source
+     *            a function that returns an {@code ObservableSource} that determines the timeout window for the first source
      *            item
      * @param itemTimeoutIndicator
-     *            a function that returns an ObservableSource for each item emitted by the source ObservableSource and that
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
-     * @return an Observable that mirrors the source ObservableSource, but notifies observers of a
+     * @return an {@code Observable} that mirrors the current {@code Observable}, but notifies observers of a
      *         {@code TimeoutException} if either the first item or any subsequent item doesn't arrive within
      *         the time windows specified by the timeout selectors
+     * @throws NullPointerException if {@code firstTimeoutIndicator} or {@code itemTimeoutIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -14080,9 +14505,9 @@ public final <U, V> Observable<T> timeout(@NonNull ObservableSource<U> firstTime
     }
 
     /**
-     * Returns an Observable that mirrors the source ObservableSource, but switches to a fallback ObservableSource if either
-     * the first item emitted by the source ObservableSource or any subsequent item doesn't arrive within time windows
-     * defined by other ObservableSources.
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, but switches to a fallback {@link ObservableSource} if either
+     * the first item emitted by the current {@code Observable} or any subsequent item doesn't arrive within time windows
+     * defined by indicator {@code ObservableSource}s.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout6.png" alt="">
      * <dl>
@@ -14095,20 +14520,19 @@ public final <U, V> Observable<T> timeout(@NonNull ObservableSource<U> firstTime
      * @param <V>
      *            the subsequent timeout value type (ignored)
      * @param firstTimeoutIndicator
-     *            a function that returns an ObservableSource which determines the timeout window for the first source
+     *            a function that returns an {@code ObservableSource} which determines the timeout window for the first source
      *            item
      * @param itemTimeoutIndicator
-     *            a function that returns an ObservableSource for each item emitted by the source ObservableSource and that
+     *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
      * @param other
-     *            the fallback ObservableSource to switch to if the source ObservableSource times out
-     * @return an Observable that mirrors the source ObservableSource, but switches to the {@code other} ObservableSource if
-     *         either the first item emitted by the source ObservableSource or any subsequent item doesn't arrive
+     *            the fallback {@code ObservableSource} to switch to if the current {@code Observable} times out
+     * @return an {@code Observable} that mirrors the current {@code Observable}, but switches to the {@code other} {@code ObservableSource} if
+     *         either the first item emitted by the current {@code Observable} or any subsequent item doesn't arrive
      *         within time windows defined by the timeout selectors
      * @throws NullPointerException
-     *             if {@code itemTimeoutIndicator} is null, or
-     *             if {@code other} is null
+     *             if {@code firstTimeoutIndicator}, {@code itemTimeoutIndicator} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -14124,12 +14548,12 @@ public final <U, V> Observable<T> timeout(
     }
 
     @NonNull
-    private Observable<T> timeout0(long timeout, @NonNull TimeUnit timeUnit,
+    private Observable<T> timeout0(long timeout, @NonNull TimeUnit unit,
             @Nullable ObservableSource<? extends T> other,
             @NonNull Scheduler scheduler) {
-        Objects.requireNonNull(timeUnit, "timeUnit is null");
+        Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableTimeoutTimed<>(this, timeout, timeUnit, scheduler, other));
+        return RxJavaPlugins.onAssembly(new ObservableTimeoutTimed<>(this, timeout, unit, scheduler, other));
     }
 
     @NonNull
@@ -14142,7 +14566,7 @@ private <U, V> Observable<T> timeout0(
     }
 
     /**
-     * Returns an Observable that emits each item emitted by the source ObservableSource, wrapped in a
+     * Returns an {@code Observable} that emits each item emitted by the current {@code Observable}, wrapped in a
      * {@link Timed} object.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
@@ -14152,7 +14576,7 @@ private <U, V> Observable<T> timeout0(
      *  from the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Observable that emits timestamped items from the source ObservableSource
+     * @return an {@code Observable} that emits timestamped items from the current {@code Observable}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -14163,20 +14587,21 @@ public final Observable<Timed<T>> timestamp() {
     }
 
     /**
-     * Returns an Observable that emits each item emitted by the source ObservableSource, wrapped in a
-     * {@link Timed} object whose timestamps are provided by a specified Scheduler.
+     * Returns an {@code Observable} that emits each item emitted by the current {@code Observable}, wrapped in a
+     * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate on any particular scheduler but uses the current time
-     *  from the specified {@link Scheduler}.</dd>
+     *  from the specified {@code Scheduler}.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to use as a time source
-     * @return an Observable that emits timestamped items from the source ObservableSource with timestamps provided by
+     *            the {@code Scheduler} to use as a time source
+     * @return an {@code Observable} that emits timestamped items from the current {@code Observable} with timestamps provided by
      *         the {@code scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -14187,7 +14612,7 @@ public final Observable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns an Observable that emits each item emitted by the source ObservableSource, wrapped in a
+     * Returns an {@code Observable} that emits each item emitted by the current {@code Observable}, wrapped in a
      * {@link Timed} object.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
@@ -14198,7 +14623,8 @@ public final Observable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param unit the time unit for the current time
-     * @return an Observable that emits timestamped items from the source ObservableSource
+     * @return an {@code Observable} that emits timestamped items from the current {@code Observable}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -14209,21 +14635,22 @@ public final Observable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns an Observable that emits each item emitted by the source ObservableSource, wrapped in a
-     * {@link Timed} object whose timestamps are provided by a specified Scheduler.
+     * Returns an {@code Observable} that emits each item emitted by the current {@code Observable}, wrapped in a
+     * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate on any particular scheduler but uses the current time
-     *  from the specified {@link Scheduler}.</dd>
+     *  from the specified {@code Scheduler}.</dd>
      * </dl>
      *
      * @param unit the time unit for the current time
      * @param scheduler
-     *            the {@link Scheduler} to use as a time source
-     * @return an Observable that emits timestamped items from the source ObservableSource with timestamps provided by
+     *            the {@code Scheduler} to use as a time source
+     * @return an {@code Observable} that emits timestamped items from the current {@code Observable} with timestamps provided by
      *         the {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -14245,9 +14672,9 @@ public final Observable<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Sch
      * </dl>
      * <p>History: 2.1.7 - experimental
      * @param <R> the resulting object type
-     * @param converter the function that receives the current Observable instance and returns a value
+     * @param converter the function that receives the current {@code Observable} instance and returns a value
      * @return the converted value
-     * @throws NullPointerException if converter is null
+     * @throws NullPointerException if {@code converter} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -14258,27 +14685,27 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
     }
 
     /**
-     * Returns a Single that emits a single item, a list composed of all the items emitted by the
-     * finite source ObservableSource.
+     * Returns a {@link Single} that emits a single item, a {@link List} composed of all the items emitted by the
+     * current and finite {@code Observable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.2.png" alt="">
      * <p>
-     * Normally, an ObservableSource that returns multiple items will do so by invoking its {@link Observer}'s
+     * Normally, an {@link ObservableSource} that returns multiple items will do so by invoking its {@link Observer}'s
      * {@link Observer#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * ObservableSource to compose a list of all of these items and then to invoke the Observer's {@code onNext}
-     * function once, passing it the entire list, by calling the ObservableSource's {@code toList} method prior to
+     * {@code ObservableSource} to compose a list of all of these items and then to invoke the {@code Observer}'s {@code onNext}
+     * function once, passing it the entire list, by calling the {@code ObservableSource}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Single that emits a single item: a List containing all of the items emitted by the source
-     *         ObservableSource
+     * @return a {@code Single} that emits a single item: a {@code List} containing all of the items emitted by the current
+     *         {@code Observable}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14289,29 +14716,30 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
     }
 
     /**
-     * Returns a Single that emits a single item, a list composed of all the items emitted by the
-     * finite source ObservableSource.
+     * Returns a {@link Single} that emits a single item, a {@link List} composed of all the items emitted by the
+     * current and finite {@code Observable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.2.png" alt="">
      * <p>
-     * Normally, an ObservableSource that returns multiple items will do so by invoking its {@link Observer}'s
+     * Normally, an {@link ObservableSource} that returns multiple items will do so by invoking its {@link Observer}'s
      * {@link Observer#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * ObservableSource to compose a list of all of these items and then to invoke the Observer's {@code onNext}
-     * function once, passing it the entire list, by calling the ObservableSource's {@code toList} method prior to
+     * {@code ObservableSource} to compose a list of all of these items and then to invoke the {@code Observer}'s {@code onNext}
+     * function once, passing it the entire list, by calling the {@code ObservableSource}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param capacityHint
-     *         the number of elements expected from the current Observable
-     * @return a Single that emits a single item: a List containing all of the items emitted by the source
-     *         ObservableSource
+     *         the number of elements expected from the current {@code Observable}
+     * @return a {@code Single} that emits a single item: a {@code List} containing all of the items emitted by the current
+     *         {@code Observable}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14323,20 +14751,20 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
     }
 
     /**
-     * Returns a Single that emits a single item, a list composed of all the items emitted by the
-     * finite source ObservableSource.
+     * Returns a {@link Single} that emits a single item, a {@link Collection} (subclass) composed of all the items emitted by the
+     * finite upstream {@code Observable}.
      * <p>
      * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.o.c.png" alt="">
      * <p>
-     * Normally, an ObservableSource that returns multiple items will do so by invoking its {@link Observer}'s
+     * Normally, an {@link ObservableSource} that returns multiple items will do so by invoking its {@link Observer}'s
      * {@link Observer#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * ObservableSource to compose a list of all of these items and then to invoke the Observer's {@code onNext}
-     * function once, passing it the entire list, by calling the ObservableSource's {@code toList} method prior to
+     * {@code ObservableSource} to compose a list of all of these items and then to invoke the {@code Observer}'s {@code onNext}
+     * function once, passing it the entire list, by calling the {@code ObservableSource}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated collection to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toList} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14344,9 +14772,10 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      *
      * @param <U> the subclass of a collection of Ts
      * @param collectionSupplier
-     *               the Supplier returning the collection (for each individual Observer) to be filled in
-     * @return a Single that emits a single item: a List containing all of the items emitted by the source
-     *         ObservableSource
+     *               the {@link Supplier} returning the collection (for each individual {@code Observer}) to be filled in
+     * @return a {@code Single} that emits a single item: a {@code Collection} (subclass) containing all of the items emitted by the current
+     *         {@code Observable}
+     * @throws NullPointerException if {@code collectionSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14358,17 +14787,17 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
     }
 
     /**
-     * Returns a Single that emits a single HashMap containing all items emitted by the
-     * finite source ObservableSource, mapped by the keys returned by a specified
+     * Returns a {@link Single} that emits a single {@link HashMap} containing all items emitted by the
+     * current and finite {@code Observable}, mapped by the keys returned by a specified
      * {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.2.png" alt="">
      * <p>
-     * If more than one source item maps to the same key, the HashMap will contain the latest of those items.
+     * If more than one source item maps to the same key, the {@code HashMap} will contain the latest of those items.
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code HashMap} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14376,9 +14805,10 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      *
      * @param <K> the key type of the Map
      * @param keySelector
-     *            the function that extracts the key from a source item to be used in the HashMap
-     * @return a Single that emits a single item: a HashMap containing the mapped items from the source
-     *         ObservableSource
+     *            the function that extracts the key from a source item to be used in the {@code HashMap}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the current
+     *         {@code Observable}
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14390,30 +14820,31 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
     }
 
     /**
-     * Returns a Single that emits a single HashMap containing values corresponding to items emitted by the
-     * finite source ObservableSource, mapped by the keys returned by a specified {@code keySelector} function.
+     * Returns a {@link Single} that emits a single {@link HashMap} containing values corresponding to items emitted by the
+     * current and finite {@code Observable}, mapped by the keys and values returned by the given selector functions.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.2.png" alt="">
      * <p>
-     * If more than one source item maps to the same key, the HashMap will contain a single entry that
+     * If more than one source item maps to the same key, the {@code HashMap} will contain a single entry that
      * corresponds to the latest of those items.
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code HashMap} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <K> the key type of the Map
-     * @param <V> the value type of the Map
+     * @param <K> the key type of the {@code HashMap}
+     * @param <V> the value type of the {@code HashMap}
      * @param keySelector
-     *            the function that extracts the key from a source item to be used in the HashMap
+     *            the function that extracts the key from a source item to be used in the {@code HashMap}
      * @param valueSelector
-     *            the function that extracts the value from a source item to be used in the HashMap
-     * @return a Single that emits a single item: a HashMap containing the mapped items from the source
-     *         ObservableSource
+     *            the function that extracts the value from a source item to be used in the {@code HashMap}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the current
+     *         {@code Observable}
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14428,29 +14859,30 @@ public final <K, V> Single<Map<K, V>> toMap(
     }
 
     /**
-     * Returns a Single that emits a single Map, returned by a specified {@code mapFactory} function, that
-     * contains keys and values extracted from the items emitted by the finite source ObservableSource.
+     * Returns a {@link Single} that emits a single {@link Map} (subclass), returned by a specified {@code mapFactory} function, that
+     * contains keys and values extracted from the items, via selector functions, emitted by the current and finite {@code Observable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.2.png" alt="">
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code Map} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <K> the key type of the Map
-     * @param <V> the value type of the Map
+     * @param <K> the key type of the {@code Map}
+     * @param <V> the value type of the {@code Map}
      * @param keySelector
-     *            the function that extracts the key from a source item to be used in the Map
+     *            the function that extracts the key from a source item to be used in the {@code Map}
      * @param valueSelector
-     *            the function that extracts the value from the source items to be used as value in the Map
+     *            the function that extracts the value from the source items to be used as value in the {@code Map}
      * @param mapSupplier
-     *            the function that returns a Map instance to be used
-     * @return a Single that emits a single item: a Map that contains the mapped items emitted by the
-     *         source ObservableSource
+     *            the function that returns a {@code Map} instance to be used
+     * @return a {@code Single} that emits a single item: a {@code Map} (subclass) that contains the mapped items emitted by the
+     *         current {@code Observable}
+     * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code mapSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14467,24 +14899,25 @@ public final <K, V> Single<Map<K, V>> toMap(
     }
 
     /**
-     * Returns a Single that emits a single HashMap that contains an ArrayList of items emitted by the
-     * finite source ObservableSource keyed by a specified {@code keySelector} function.
+     * Returns a {@link Single} that emits a single {@link HashMap} that contains an {@link ArrayList} of items emitted by the
+     * current and finite {@code Observable} keyed by a specified {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.png" alt="">
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code HashMap} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMultimap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <K> the key type of the Map
+     * @param <K> the key type of the {@code HashMap}
      * @param keySelector
-     *            the function that extracts the key from the source items to be used as key in the HashMap
-     * @return a Single that emits a single item: a HashMap that contains an ArrayList of items mapped from
-     *         the source ObservableSource
+     *            the function that extracts the key from the source items to be used as key in the {@code HashMap}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
+     *         the current {@code Observable}
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14498,28 +14931,29 @@ public final <K, V> Single<Map<K, V>> toMap(
     }
 
     /**
-     * Returns a Single that emits a single HashMap that contains an ArrayList of values extracted by a
-     * specified {@code valueSelector} function from items emitted by the finite source ObservableSource,
+     * Returns a {@link Single} that emits a single {@link HashMap} that contains an {@link ArrayList} of values extracted by a
+     * specified {@code valueSelector} function from items emitted by the current and finite {@code Observable},
      * keyed by a specified {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.png" alt="">
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code HashMap} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMultimap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <K> the key type of the Map
-     * @param <V> the value type of the Map
+     * @param <K> the key type of the {@code HashMap}
+     * @param <V> the value type of the {@code HashMap}
      * @param keySelector
-     *            the function that extracts a key from the source items to be used as key in the HashMap
+     *            the function that extracts a key from the source items to be used as key in the {@code HashMap}
      * @param valueSelector
-     *            the function that extracts a value from the source items to be used as value in the HashMap
-     * @return a Single that emits a single item: a HashMap that contains an ArrayList of items mapped from
-     *         the source ObservableSource
+     *            the function that extracts a value from the source items to be used as value in the {@code HashMap}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
+     *         the current {@code Observable}
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14532,28 +14966,33 @@ public final <K, V> Single<Map<K, V>> toMap(
     }
 
     /**
-     * Returns a Single that emits a single Map, returned by a specified {@code mapFactory} function, that
-     * contains a custom collection of values, extracted by a specified {@code valueSelector} function from
-     * items emitted by the source ObservableSource, and keyed by the {@code keySelector} function.
+     * Returns a {@link Single} that emits a single {@code Map} (subclass), returned by a specified {@code mapFactory} function, that
+     * contains a custom {@link Collection} of values, extracted by a specified {@code valueSelector} function from
+     * items emitted by the current and finite {@code Observable}, and keyed by the {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.png" alt="">
+     * <p>
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code Map} to
+     * be emitted. Sources that are infinite and never complete will never emit anything through this
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMultimap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <K> the key type of the Map
-     * @param <V> the value type of the Map
+     * @param <K> the key type of the {@code Map}
+     * @param <V> the value type of the {@code Map}
      * @param keySelector
-     *            the function that extracts a key from the source items to be used as the key in the Map
+     *            the function that extracts a key from the source items to be used as the key in the {@code Map}
      * @param valueSelector
-     *            the function that extracts a value from the source items to be used as the value in the Map
+     *            the function that extracts a value from the source items to be used as the value in the {@code Map}
      * @param mapSupplier
-     *            the function that returns a Map instance to be used
+     *            the function that returns a {@code Map} instance to be used
      * @param collectionFactory
-     *            the function that returns a Collection instance for a particular key to be used in the Map
-     * @return a Single that emits a single item: a Map that contains the collection of mapped items from
-     *         the source ObservableSource
+     *            the function that returns a {@code Collection} instance for a particular key to be used in the {@code Map}
+     * @return a {@code Single} that emits a single item: a {@code Map} that contains the {@code Collection} of mapped items from
+     *         the current {@code Observable}
+     * @throws NullPointerException if {@code keySelector}, {@code valueSelector}, {@code mapSupplier} or {@code collectionFactory} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14572,30 +15011,31 @@ public final <K, V> Single<Map<K, V>> toMap(
     }
 
     /**
-     * Returns a Single that emits a single Map, returned by a specified {@code mapFactory} function, that
-     * contains an ArrayList of values, extracted by a specified {@code valueSelector} function from items
-     * emitted by the finite source ObservableSource and keyed by the {@code keySelector} function.
+     * Returns a {@link Single} that emits a single {@link Map} (subclass), returned by a specified {@code mapFactory} function, that
+     * contains an {@link ArrayList} of values, extracted by a specified {@code valueSelector} function from items
+     * emitted by the current and finite {@code Observable} and keyed by the {@code keySelector} function.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.png" alt="">
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code Map} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMultimap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <K> the key type of the Map
-     * @param <V> the value type of the Map
+     * @param <K> the key type of the {@code Map}
+     * @param <V> the value type of the {@code Map}
      * @param keySelector
-     *            the function that extracts a key from the source items to be used as the key in the Map
+     *            the function that extracts a key from the source items to be used as the key in the {@code Map}
      * @param valueSelector
-     *            the function that extracts a value from the source items to be used as the value in the Map
+     *            the function that extracts a value from the source items to be used as the value in the {@code Map}
      * @param mapSupplier
-     *            the function that returns a Map instance to be used
-     * @return a Single that emits a single item: a Map that contains a list items mapped from the source
-     *         ObservableSource
+     *            the function that returns a {@code Map} instance to be used
+     * @return a {@code Single} that emits a single item: a {@code Map} that contains an {@code ArrayList} items mapped from the current
+     *         {@code Observable}
+     * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code mapSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14610,7 +15050,7 @@ public final <K, V> Single<Map<K, V>> toMap(
     }
 
     /**
-     * Converts the current Observable into a Flowable by applying the specified backpressure strategy.
+     * Converts the current {@code Observable} into a {@link Flowable} by applying the specified backpressure strategy.
      * <p>
      * Marble diagrams for the various backpressure strategies are as follows:
      * <ul>
@@ -14643,15 +15083,16 @@ public final <K, V> Single<Map<K, V>> toMap(
      * </dl>
      *
      * @param strategy the backpressure strategy to apply
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code strategy} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
+        Objects.requireNonNull(strategy, "strategy is null");
         Flowable<T> f = new FlowableFromObservable<>(this);
-
         switch (strategy) {
             case DROP:
                 return f.onBackpressureDrop();
@@ -14667,26 +15108,29 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
     }
 
     /**
-     * Returns a Single that emits a list that contains the items emitted by the finite source ObservableSource, in a
-     * sorted order. Each item emitted by the ObservableSource must implement {@link Comparable} with respect to all
+     * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the current and finite {@code Observable}, in a
+     * sorted order. Each item emitted by the current {@code Observable} must implement {@link Comparable} with respect to all
      * other items in the sequence.
      *
-     * <p>If any item emitted by this Observable does not implement {@link Comparable} with respect to
-     *             all other items emitted by this Observable, no items will be emitted and the
-     *             sequence is terminated with a {@link ClassCastException}.
+     * <p>
+     * If any item emitted by the current {@code Observable} does not implement {@code Comparable} with respect to
+     * all other items emitted by the current {@code Observable}, no items will be emitted and the
+     * sequence is terminated with a {@link ClassCastException}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.2.png" alt="">
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code List} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a Single that emits a list that contains the items emitted by the source ObservableSource in
+     * @return a {@code Single} that emits a list that contains the items emitted by the current {@code Observable} in
      *         sorted order
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
+     * @see #toSortedList(int)
+     * @see #toSortedList(Comparator)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -14696,24 +15140,25 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
     }
 
     /**
-     * Returns a Single that emits a list that contains the items emitted by the finite source ObservableSource, in a
+     * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the current and finite {@code Observable}, in a
      * sorted order based on a specified comparison function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.2.png" alt="">
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code List} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param comparator
-     *            a function that compares two items emitted by the source ObservableSource and returns an Integer
+     *            a function that compares two items emitted by the current {@code Observable} and returns an {@code int}
      *            that indicates their sort order
-     * @return a Single that emits a list that contains the items emitted by the source ObservableSource in
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Observable} in
      *         sorted order
+     * @throws NullPointerException if {@code comparator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14725,26 +15170,28 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
     }
 
     /**
-     * Returns a Single that emits a list that contains the items emitted by the finite source ObservableSource, in a
+     * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the current and finite {@code Observable}, in a
      * sorted order based on a specified comparison function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.2.png" alt="">
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code List} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param comparator
-     *            a function that compares two items emitted by the source ObservableSource and returns an Integer
+     *            a function that compares two items emitted by the current {@code Observable} and returns an {@code int}
      *            that indicates their sort order
      * @param capacityHint
-     *             the initial capacity of the ArrayList used to accumulate items before sorting
-     * @return a Single that emits a list that contains the items emitted by the source ObservableSource in
+     *             the initial capacity of the {@code List} used to accumulate items before sorting
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Observable} in
      *         sorted order
+     * @throws NullPointerException if {@code comparator} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      * @since 2.0
      */
@@ -14757,30 +15204,32 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
     }
 
     /**
-     * Returns a Single that emits a list that contains the items emitted by the finite source ObservableSource, in a
-     * sorted order. Each item emitted by the ObservableSource must implement {@link Comparable} with respect to all
+     * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the current and finite {@code Observable}, in a
+     * sorted order. Each item emitted by the current {@code Observable} must implement {@link Comparable} with respect to all
      * other items in the sequence.
-     *
-     * <p>If any item emitted by this Observable does not implement {@link Comparable} with respect to
-     *             all other items emitted by this Observable, no items will be emitted and the
-     *             sequence is terminated with a {@link ClassCastException}.
+     * <p>
+     * If any item emitted by the current {@code Observable} does not implement {@code Comparable} with respect to
+     * all other items emitted by the current {@code Observable}, no items will be emitted and the
+     * sequence is terminated with a {@link ClassCastException}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.2.png" alt="">
      * <p>
-     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
+     * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code List} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
-     * operator and an infinite source may lead to a fatal {@code OutOfMemoryError}.
+     * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param capacityHint
-     *             the initial capacity of the ArrayList used to accumulate items before sorting
-     * @return a Single that emits a list that contains the items emitted by the source ObservableSource in
+     *             the initial capacity of the {@code List} used to accumulate items before sorting
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Observable} in
      *         sorted order
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      * @since 2.0
+     * @see #toSortedList(Comparator, int)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -14790,19 +15239,19 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
     }
 
     /**
-     * Modifies the source ObservableSource so that subscribers will dispose it on a specified
-     * {@link Scheduler}.
+     * Return an {@code Observable} that schedules the downstream {@link Observer}s' {@code dispose} calls
+     * aimed at the current {@code Observable} on the given {@link Scheduler}.
      * <p>
      * <img width="640" height="452" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/unsubscribeOn.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param scheduler
-     *            the {@link Scheduler} to perform the call to dispose() of the upstream Disposable
-     * @return the source ObservableSource modified so that its dispose() calls happen on the specified
-     *         {@link Scheduler}
+     *            the {@code Scheduler} to perform the call to {@code dispose()} of the upstream {@link Disposable}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      */
     @CheckReturnValue
@@ -14814,10 +15263,10 @@ public final Observable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping windows, each containing {@code count} items. When the source
-     * ObservableSource completes or encounters an error, the resulting ObservableSource emits the current window and
-     * propagates the notification from the source ObservableSource.
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping windows, each containing {@code count} items. When the current
+     * {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the current window and
+     * propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window3.png" alt="">
      * <dl>
@@ -14827,9 +15276,9 @@ public final Observable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      *
      * @param count
      *            the maximum size of each window before it should be emitted
-     * @return an Observable that emits connected, non-overlapping windows, each containing at most
-     *         {@code count} items from the source ObservableSource
-     * @throws IllegalArgumentException if either count is non-positive
+     * @return an {@code Observable} that emits connected, non-overlapping windows, each containing at most
+     *         {@code count} items from the current {@code Observable}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -14840,10 +15289,10 @@ public final Observable<Observable<T>> window(long count) {
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits windows every {@code skip} items, each containing no more than {@code count} items. When
-     * the source ObservableSource completes or encounters an error, the resulting ObservableSource emits the current window
-     * and propagates the notification from the source ObservableSource.
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits windows every {@code skip} items, each containing no more than {@code count} items. When
+     * the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the current window
+     * and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
      * <dl>
@@ -14856,9 +15305,9 @@ public final Observable<Observable<T>> window(long count) {
      * @param skip
      *            how many items need to be skipped before starting a new window. Note that if {@code skip} and
      *            {@code count} are equal this is the same operation as {@link #window(long)}.
-     * @return an Observable that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the source ObservableSource
-     * @throws IllegalArgumentException if either count or skip is non-positive
+     * @return an {@code Observable} that emits windows every {@code skip} items containing at most {@code count} items
+     *         from the current {@code Observable}
+     * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -14869,10 +15318,10 @@ public final Observable<Observable<T>> window(long count, long skip) {
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits windows every {@code skip} items, each containing no more than {@code count} items. When
-     * the source ObservableSource completes or encounters an error, the resulting ObservableSource emits the current window
-     * and propagates the notification from the source ObservableSource.
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits windows every {@code skip} items, each containing no more than {@code count} items. When
+     * the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the current window
+     * and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
      * <dl>
@@ -14887,9 +15336,9 @@ public final Observable<Observable<T>> window(long count, long skip) {
      *            {@code count} are equal this is the same operation as {@link #window(long)}.
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an Observable that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the source ObservableSource
-     * @throws IllegalArgumentException if either count or skip is non-positive
+     * @return an {@code Observable} that emits windows every {@code skip} items containing at most {@code count} items
+     *         from the current {@code Observable}
+     * @throws IllegalArgumentException if {@code count}, {@code skip} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -14903,11 +15352,11 @@ public final Observable<Observable<T>> window(long count, long skip, int bufferS
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource starts a new window periodically, as determined by the {@code timeskip} argument. It emits
-     * each window after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * ObservableSource completes or ObservableSource completes or encounters an error, the resulting ObservableSource emits the
-     * current window and propagates the notification from the source ObservableSource.
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
+     * each window after a fixed timespan, specified by the {@code timespan} argument. When the current
+     * {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
+     * current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.png" alt="">
      * <p>
@@ -14926,7 +15375,9 @@ public final Observable<Observable<T>> window(long count, long skip, int bufferS
      *            the period of time after which a new window will be created
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
-     * @return an Observable that emits new windows periodically as a fixed timespan elapses
+     * @return an {@code Observable} that emits new windows periodically as a fixed timespan elapses
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code timespan} or {@code timeskip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -14937,11 +15388,11 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource starts a new window periodically, as determined by the {@code timeskip} argument. It emits
-     * each window after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * ObservableSource completes or ObservableSource completes or encounters an error, the resulting ObservableSource emits the
-     * current window and propagates the notification from the source ObservableSource.
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
+     * each window after a fixed timespan, specified by the {@code timespan} argument. When the current
+     * {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
+     * current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
      * <p>
@@ -14961,8 +15412,10 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
-     * @return an Observable that emits new windows periodically as a fixed timespan elapses
+     *            the {@code Scheduler} to use when determining the end and start of a window
+     * @return an {@code Observable} that emits new windows periodically as a fixed timespan elapses
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code timespan} or {@code timeskip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -14973,11 +15426,11 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource starts a new window periodically, as determined by the {@code timeskip} argument. It emits
-     * each window after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * ObservableSource completes or ObservableSource completes or encounters an error, the resulting ObservableSource emits the
-     * current window and propagates the notification from the source ObservableSource.
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
+     * each window after a fixed timespan, specified by the {@code timespan} argument. When the current
+     * {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
+     * current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
      * <p>
@@ -14997,10 +15450,12 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
+     *            the {@code Scheduler} to use when determining the end and start of a window
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an Observable that emits new windows periodically as a fixed timespan elapses
+     * @return an {@code Observable} that emits new windows periodically as a fixed timespan elapses
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code timespan}, {@code timeskip} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15016,10 +15471,10 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping windows, each of a fixed duration specified by the
-     * {@code timespan} argument. When the source ObservableSource completes or encounters an error, the resulting
-     * ObservableSource emits the current window and propagates the notification from the source ObservableSource.
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * {@code timespan} argument. When the current {@code Observable} completes or encounters an error, the resulting
+     * {@code Observable} emits the current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.png" alt="">
      * <p>
@@ -15037,8 +15492,9 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      *            new window
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
-     * @return an Observable that emits connected, non-overlapping windows representing items emitted by the
-     *         source ObservableSource during fixed, consecutive durations
+     * @return an {@code Observable} that emits connected, non-overlapping windows representing items emitted by the
+     *         current {@code Observable} during fixed, consecutive durations
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15049,11 +15505,11 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping windows, each of a fixed duration as specified by the
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping windows, each of a fixed duration as specified by the
      * {@code timespan} argument or a maximum size as specified by the {@code count} argument (whichever is
-     * reached first). When the source ObservableSource completes or encounters an error, the resulting ObservableSource
-     * emits the current window and propagates the notification from the source ObservableSource.
+     * reached first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable}
+     * emits the current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
      * <p>
@@ -15073,9 +15529,11 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      *            the unit of time that applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each window before it should be emitted
-     * @return an Observable that emits connected, non-overlapping windows of items from the source ObservableSource
+     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15087,11 +15545,11 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping windows, each of a fixed duration as specified by the
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping windows, each of a fixed duration as specified by the
      * {@code timespan} argument or a maximum size as specified by the {@code count} argument (whichever is
-     * reached first). When the source ObservableSource completes or encounters an error, the resulting ObservableSource
-     * emits the current window and propagates the notification from the source ObservableSource.
+     * reached first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable}
+     * emits the current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
      * <p>
@@ -15112,10 +15570,12 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * @param count
      *            the maximum size of each window before it should be emitted
      * @param restart
-     *            if true, when a window reaches the capacity limit, the timer is restarted as well
-     * @return an Observable that emits connected, non-overlapping windows of items from the source ObservableSource
+     *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
+     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15127,10 +15587,10 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping windows, each of a fixed duration as specified by the
-     * {@code timespan} argument. When the source ObservableSource completes or encounters an error, the resulting
-     * ObservableSource emits the current window and propagates the notification from the source ObservableSource.
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping windows, each of a fixed duration as specified by the
+     * {@code timespan} argument. When the current {@code Observable} completes or encounters an error, the resulting
+     * {@code Observable} emits the current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.s.png" alt="">
      * <p>
@@ -15149,9 +15609,10 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * @param unit
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
-     * @return an Observable that emits connected, non-overlapping windows containing items emitted by the
-     *         source ObservableSource within a fixed duration
+     *            the {@code Scheduler} to use when determining the end and start of a window
+     * @return an {@code Observable} that emits connected, non-overlapping windows containing items emitted by the
+     *         current {@code Observable} within a fixed duration
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15163,11 +15624,11 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping windows, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source ObservableSource completes or encounters an error, the resulting ObservableSource emits the
-     * current window and propagates the notification from the source ObservableSource.
+     * first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
+     * current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
      * <p>
@@ -15188,10 +15649,12 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * @param count
      *            the maximum size of each window before it should be emitted
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
-     * @return an Observable that emits connected, non-overlapping windows of items from the source ObservableSource
+     *            the {@code Scheduler} to use when determining the end and start of a window
+     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15203,11 +15666,11 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping windows, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source ObservableSource completes or encounters an error, the resulting ObservableSource emits the
-     * current window and propagates the notification from the source ObservableSource.
+     * first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
+     * current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
      * <p>
@@ -15228,12 +15691,14 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * @param count
      *            the maximum size of each window before it should be emitted
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
+     *            the {@code Scheduler} to use when determining the end and start of a window
      * @param restart
-     *            if true, when a window reaches the capacity limit, the timer is restarted as well
-     * @return an Observable that emits connected, non-overlapping windows of items from the source ObservableSource
+     *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
+     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15245,11 +15710,11 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits connected, non-overlapping windows, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source ObservableSource completes or encounters an error, the resulting ObservableSource emits the
-     * current window and propagates the notification from the source ObservableSource.
+     * first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
+     * current window and propagates the notification from the current {@code Observable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
      * <p>
@@ -15270,14 +15735,16 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * @param count
      *            the maximum size of each window before it should be emitted
      * @param scheduler
-     *            the {@link Scheduler} to use when determining the end and start of a window
+     *            the {@code Scheduler} to use when determining the end and start of a window
      * @param restart
-     *            if true, when a window reaches the capacity limit, the timer is restarted as well
+     *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an Observable that emits connected, non-overlapping windows of items from the source ObservableSource
+     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code count} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15294,9 +15761,9 @@ public final Observable<Observable<T>> window(
     }
 
     /**
-     * Returns an Observable that emits non-overlapping windows of items it collects from the source ObservableSource
+     * Returns an {@code Observable} that emits non-overlapping windows of items it collects from the current {@code Observable}
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
-     * ObservableSource.
+     * {@link ObservableSource}.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
      * <p>
@@ -15312,10 +15779,11 @@ public final Observable<Observable<T>> window(
      * @param <B>
      *            the window element type (ignored)
      * @param boundary
-     *            an ObservableSource whose emitted items close and open windows
-     * @return an Observable that emits non-overlapping windows of items it collects from the source ObservableSource
+     *            an {@code ObservableSource} whose emitted items close and open windows
+     * @return an {@code Observable} that emits non-overlapping windows of items it collects from the current {@code Observable}
      *         where the boundary of each window is determined by the items emitted from the {@code boundary}
-     *         ObservableSource
+     *         {@code ObservableSource}
+     * @throws NullPointerException if {@code boundary} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15326,9 +15794,9 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
     }
 
     /**
-     * Returns an Observable that emits non-overlapping windows of items it collects from the source ObservableSource
+     * Returns an {@code Observable} that emits non-overlapping windows of items it collects from the current {@code Observable}
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
-     * ObservableSource.
+     * {@link ObservableSource}.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
      * <p>
@@ -15344,12 +15812,14 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
      * @param <B>
      *            the window element type (ignored)
      * @param boundary
-     *            an ObservableSource whose emitted items close and open windows
+     *            an {@code ObservableSource} whose emitted items close and open windows
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an Observable that emits non-overlapping windows of items it collects from the source ObservableSource
+     * @return an {@code Observable} that emits non-overlapping windows of items it collects from the current {@code Observable}
      *         where the boundary of each window is determined by the items emitted from the {@code boundary}
-     *         ObservableSource
+     *         {@code ObservableSource}
+     * @throws NullPointerException if {@code boundary} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15362,9 +15832,9 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits windows that contain those items emitted by the source ObservableSource between the time when
-     * the {@code openingIndicator} ObservableSource emits an item and when the ObservableSource returned by
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits windows that contain those items emitted by the current {@code Observable} between the time when
+     * the {@code openingIndicator} {@link ObservableSource} emits an item and when the {@code ObservableSource} returned by
      * {@code closingIndicator} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
@@ -15378,15 +15848,16 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the window-opening ObservableSource
-     * @param <V> the element type of the window-closing ObservableSources
+     * @param <U> the element type of the window-opening {@code ObservableSource}
+     * @param <V> the element type of the window-closing {@code ObservableSource}s
      * @param openingIndicator
-     *            an ObservableSource that, when it emits an item, causes another window to be created
+     *            an {@code ObservableSource} that, when it emits an item, causes another window to be created
      * @param closingIndicator
-     *            a {@link Function} that produces an ObservableSource for every window created. When this ObservableSource
-     *            emits an item, the associated window is closed and emitted
-     * @return an Observable that emits windows of items emitted by the source ObservableSource that are governed by
-     *         the specified window-governing ObservableSources
+     *            a {@link Function} that produces an {@code ObservableSource} for every window created. When this indicator {@code ObservableSource}
+     *            emits an item, the associated window is completed
+     * @return an {@code Observable} that emits windows of items emitted by the current {@code Observable} that are governed by
+     *         the specified window-governing {@code ObservableSource}s
+     * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15399,9 +15870,9 @@ public final <U, V> Observable<Observable<T>> window(
     }
 
     /**
-     * Returns an Observable that emits windows of items it collects from the source ObservableSource. The resulting
-     * ObservableSource emits windows that contain those items emitted by the source ObservableSource between the time when
-     * the {@code openingIndicator} ObservableSource emits an item and when the ObservableSource returned by
+     * Returns an {@code Observable} that emits windows of items it collects from the current {@code Observable}. The resulting
+     * {@code Observable} emits windows that contain those items emitted by the current {@code Observable} between the time when
+     * the {@code openingIndicator} {@link ObservableSource} emits an item and when the {@code ObservableSource} returned by
      * {@code closingIndicator} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
@@ -15415,17 +15886,19 @@ public final <U, V> Observable<Observable<T>> window(
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the window-opening ObservableSource
-     * @param <V> the element type of the window-closing ObservableSources
+     * @param <U> the element type of the window-opening {@code ObservableSource}
+     * @param <V> the element type of the window-closing {@code ObservableSource}s
      * @param openingIndicator
-     *            an ObservableSource that, when it emits an item, causes another window to be created
+     *            an {@code ObservableSource} that, when it emits an item, causes another window to be created
      * @param closingIndicator
-     *            a {@link Function} that produces an ObservableSource for every window created. When this ObservableSource
-     *            emits an item, the associated window is closed and emitted
+     *            a {@link Function} that produces an {@code ObservableSource} for every window created. When this indicator {@code ObservableSource}
+     *            emits an item, the associated window is completed
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an Observable that emits windows of items emitted by the source ObservableSource that are governed by
-     *         the specified window-governing ObservableSources
+     * @return an {@code Observable} that emits windows of items emitted by the current {@code Observable} that are governed by
+     *         the specified window-governing {@code ObservableSource}s
+     * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -15441,8 +15914,8 @@ public final <U, V> Observable<Observable<T>> window(
     }
 
     /**
-     * Merges the specified ObservableSource into this ObservableSource sequence by using the {@code resultSelector}
-     * function only when the source ObservableSource (this instance) emits an item.
+     * Merges the specified {@link ObservableSource} into the current {@code Observable} sequence by using the {@code resultSelector}
+     * function only when the current {@code Observable} emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
      *
@@ -15451,16 +15924,17 @@ public final <U, V> Observable<Observable<T>> window(
      *  <dd>This operator, by default, doesn't run any particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param <U> the element type of the other ObservableSource
+     * @param <U> the element type of the other {@code ObservableSource}
      * @param <R> the result type of the combination
      * @param other
-     *            the other ObservableSource
+     *            the other {@code ObservableSource}
      * @param combiner
-     *            the function to call when this ObservableSource emits an item and the other ObservableSource has already
-     *            emitted an item, to generate the item to be emitted by the resulting ObservableSource
-     * @return an Observable that merges the specified ObservableSource into this ObservableSource by using the
-     *         {@code resultSelector} function only when the source ObservableSource sequence (this instance) emits an
+     *            the function to call when the current {@code Observable} emits an item and the other {@code ObservableSource} has already
+     *            emitted an item, to generate the item to be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that merges the specified {@code ObservableSource} into the current {@code Observable} by using the
+     *         {@code resultSelector} function only when the current {@code Observable} sequence (this instance) emits an
      *         item
+     * @throws NullPointerException if {@code other} or {@code combiner} is {@code null}
      * @since 2.0
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -15475,12 +15949,12 @@ public final <U, R> Observable<R> withLatestFrom(@NonNull ObservableSource<? ext
     }
 
     /**
-     * Combines the value emission from this ObservableSource with the latest emissions from the
-     * other ObservableSources via a function to produce the output item.
+     * Combines the value emission from the current {@code Observable} with the latest emissions from the
+     * other {@link ObservableSource}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this ObservableSource emits (and
-     * not when any of the other sources emit, unlike combineLatest).
+     * least one value. The resulting emission only happens when the current {@code Observable} emits (and
+     * not when any of the other sources emit, unlike {@code combineLatest}).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
@@ -15492,10 +15966,11 @@ public final <U, R> Observable<R> withLatestFrom(@NonNull ObservableSource<? ext
      * @param <T1> the first other source's value type
      * @param <T2> the second other source's value type
      * @param <R> the result value type
-     * @param source1 the first other ObservableSource
-     * @param source2 the second other ObservableSource
-     * @param combiner the function called with an array of values from each participating ObservableSource
-     * @return the new ObservableSource instance
+     * @param source1 the first other {@code ObservableSource}
+     * @param source2 the second other {@code ObservableSource}
+     * @param combiner the function called with an array of values from each participating {@code ObservableSource}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -15512,11 +15987,11 @@ public final <T1, T2, R> Observable<R> withLatestFrom(
     }
 
     /**
-     * Combines the value emission from this ObservableSource with the latest emissions from the
-     * other ObservableSources via a function to produce the output item.
+     * Combines the value emission from the current {@code Observable} with the latest emissions from the
+     * other {@link ObservableSource}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this ObservableSource emits (and
+     * least one value. The resulting emission only happens when the current {@code Observable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
@@ -15530,11 +16005,12 @@ public final <T1, T2, R> Observable<R> withLatestFrom(
      * @param <T2> the second other source's value type
      * @param <T3> the third other source's value type
      * @param <R> the result value type
-     * @param source1 the first other ObservableSource
-     * @param source2 the second other ObservableSource
-     * @param source3 the third other ObservableSource
-     * @param combiner the function called with an array of values from each participating ObservableSource
-     * @return the new ObservableSource instance
+     * @param source1 the first other {@code ObservableSource}
+     * @param source2 the second other {@code ObservableSource}
+     * @param source3 the third other {@code ObservableSource}
+     * @param combiner the function called with an array of values from each participating {@code ObservableSource}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -15553,11 +16029,11 @@ public final <T1, T2, T3, R> Observable<R> withLatestFrom(
     }
 
     /**
-     * Combines the value emission from this ObservableSource with the latest emissions from the
-     * other ObservableSources via a function to produce the output item.
+     * Combines the value emission from the current {@code Observable} with the latest emissions from the
+     * other {@link ObservableSource}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this ObservableSource emits (and
+     * least one value. The resulting emission only happens when the current {@code Observable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
@@ -15572,12 +16048,14 @@ public final <T1, T2, T3, R> Observable<R> withLatestFrom(
      * @param <T3> the third other source's value type
      * @param <T4> the fourth other source's value type
      * @param <R> the result value type
-     * @param source1 the first other ObservableSource
-     * @param source2 the second other ObservableSource
-     * @param source3 the third other ObservableSource
-     * @param source4 the fourth other ObservableSource
-     * @param combiner the function called with an array of values from each participating ObservableSource
-     * @return the new ObservableSource instance
+     * @param source1 the first other {@code ObservableSource}
+     * @param source2 the second other {@code ObservableSource}
+     * @param source3 the third other {@code ObservableSource}
+     * @param source4 the fourth other {@code ObservableSource}
+     * @param combiner the function called with an array of values from each participating {@code ObservableSource}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -15597,11 +16075,11 @@ public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
     }
 
     /**
-     * Combines the value emission from this ObservableSource with the latest emissions from the
-     * other ObservableSources via a function to produce the output item.
+     * Combines the value emission from the current {@code Observable} with the latest emissions from the
+     * other {@link ObservableSource}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this ObservableSource emits (and
+     * least one value. The resulting emission only happens when the current {@code Observable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
@@ -15613,8 +16091,9 @@ public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
      *
      * @param <R> the result value type
      * @param others the array of other sources
-     * @param combiner the function called with an array of values from each participating ObservableSource
-     * @return the new ObservableSource instance
+     * @param combiner the function called with an array of values from each participating {@code ObservableSource}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code others} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -15627,12 +16106,12 @@ public final <R> Observable<R> withLatestFrom(@NonNull ObservableSource<?>[] oth
     }
 
     /**
-     * Combines the value emission from this ObservableSource with the latest emissions from the
-     * other ObservableSources via a function to produce the output item.
+     * Combines the value emission from the current {@code Observable} with the latest emissions from the
+     * other {@link ObservableSource}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this ObservableSource emits (and
-     * not when any of the other sources emit, unlike combineLatest).
+     * least one value. The resulting emission only happens when the current {@code Observable} emits (and
+     * not when any of the other sources emit, unlike {@code combineLatest}).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
@@ -15643,8 +16122,9 @@ public final <R> Observable<R> withLatestFrom(@NonNull ObservableSource<?>[] oth
      *
      * @param <R> the result value type
      * @param others the iterable of other sources
-     * @param combiner the function called with an array of values from each participating ObservableSource
-     * @return the new ObservableSource instance
+     * @param combiner the function called with an array of values from each participating {@code ObservableSource}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code others} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -15657,12 +16137,12 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<? extends Observ
     }
 
     /**
-     * Returns an Observable that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source ObservableSource and a specified Iterable sequence.
+     * Returns an {@code Observable} that emits items that are the result of applying a specified function to pairs of
+     * values, one each from the current {@code Observable} and a specified {@link Iterable} sequence.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.i.png" alt="">
      * <p>
-     * Note that the {@code other} Iterable is evaluated as items are observed from the source ObservableSource; it is
+     * Note that the {@code other} {@code Iterable} is evaluated as items are observed from the current {@code Observable}; it is
      * not pre-consumed. This allows you to zip infinite streams on either side.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -15670,16 +16150,17 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<? extends Observ
      * </dl>
      *
      * @param <U>
-     *            the type of items in the {@code other} Iterable
+     *            the type of items in the {@code other} {@code Iterable}
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param other
-     *            the Iterable sequence
+     *            the {@code Iterable} sequence
      * @param zipper
-     *            a function that combines the pairs of items from the ObservableSource and the Iterable to generate
-     *            the items to be emitted by the resulting ObservableSource
-     * @return an Observable that pairs up values from the source ObservableSource and the {@code other} Iterable
+     *            a function that combines the pairs of items from the current {@code Observable} and the {@code Iterable} to generate
+     *            the items to be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that pairs up values from the current {@code Observable} and the {@code other} {@code Iterable}
      *         sequence and emits the results of {@code zipFunction} applied to these pairs
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -15692,8 +16173,8 @@ public final <U, R> Observable<R> zipWith(@NonNull Iterable<U> other, @NonNull B
     }
 
     /**
-     * Returns an Observable that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source ObservableSource and another specified ObservableSource.
+     * Returns an {@code Observable} that emits items that are the result of applying a specified function to pairs of
+     * values, one each from the current {@code Observable} and another specified {@link ObservableSource}.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
@@ -15714,16 +16195,17 @@ public final <U, R> Observable<R> zipWith(@NonNull Iterable<U> other, @NonNull B
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the {@code other} ObservableSource
+     *            the type of items emitted by the {@code other} {@code ObservableSource}
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param other
-     *            the other ObservableSource
+     *            the other {@code ObservableSource}
      * @param zipper
-     *            a function that combines the pairs of items from the two ObservableSources to generate the items to
-     *            be emitted by the resulting ObservableSource
-     * @return an Observable that pairs up values from the source ObservableSource and the {@code other} ObservableSource
+     *            a function that combines the pairs of items from the current {@code Observable} and the other {@code ObservableSource} to generate the items to
+     *            be emitted by the resulting {@code Observable}
+     * @return an {@code Observable} that pairs up values from the current {@code Observable} and the {@code other} {@code ObservableSource}
      *         and emits the results of {@code zipFunction} applied to these pairs
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -15736,8 +16218,8 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
     }
 
     /**
-     * Returns an Observable that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source ObservableSource and another specified ObservableSource.
+     * Returns an {@code Observable} that emits items that are the result of applying a specified function to pairs of
+     * values, one each from the current {@code Observable} and another specified {@link ObservableSource}.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
@@ -15758,18 +16240,19 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the {@code other} ObservableSource
+     *            the type of items emitted by the {@code other} {@code ObservableSource}
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param other
-     *            the other ObservableSource
+     *            the other {@code ObservableSource}
      * @param zipper
-     *            a function that combines the pairs of items from the two ObservableSources to generate the items to
-     *            be emitted by the resulting ObservableSource
+     *            a function that combines the pairs of items from the current {@code Observable} and the other {@code ObservableSource} to generate the items to
+     *            be emitted by the resulting {@code Observable}
      * @param delayError
-     *            if true, errors from the current Observable or the other ObservableSource is delayed until both terminate
-     * @return an Observable that pairs up values from the source ObservableSource and the {@code other} ObservableSource
+     *            if {@code true}, errors from the current {@code Observable} or the other {@code ObservableSource} is delayed until both terminate
+     * @return an {@code Observable} that pairs up values from the current {@code Observable} and the {@code other} {@code ObservableSource}
      *         and emits the results of {@code zipFunction} applied to these pairs
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      * @since 2.0
      */
@@ -15782,8 +16265,8 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
     }
 
     /**
-     * Returns an Observable that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source ObservableSource and another specified ObservableSource.
+     * Returns an {@code Observable} that emits items that are the result of applying a specified function to pairs of
+     * values, one each from the current {@code Observable} and another specified {@link ObservableSource}.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
      * <p>
@@ -15804,21 +16287,23 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
      * </dl>
      *
      * @param <U>
-     *            the type of items emitted by the {@code other} ObservableSource
+     *            the type of items emitted by the {@code other} {@code ObservableSource}
      * @param <R>
-     *            the type of items emitted by the resulting ObservableSource
+     *            the type of items emitted by the resulting {@code Observable}
      * @param other
-     *            the other ObservableSource
+     *            the other {@code ObservableSource}
      * @param zipper
-     *            a function that combines the pairs of items from the two ObservableSources to generate the items to
-     *            be emitted by the resulting ObservableSource
+     *            a function that combines the pairs of items from the current {@code Observable} and the other {@code ObservableSource} to generate the items to
+     *            be emitted by the resulting {@code Observable}
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
      * @param delayError
-     *            if true, errors from the current Observable or the other ObservableSource is delayed until both terminate
-     * @return an Observable that pairs up values from the source ObservableSource and the {@code other} ObservableSource
+     *            if {@code true}, errors from the current {@code Observable} or the other {@code ObservableSource} is delayed until both terminate
+     * @return an {@code Observable} that pairs up values from the current {@code Observable} and the {@code other} {@code ObservableSource}
      *         and emits the results of {@code zipFunction} applied to these pairs
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
@@ -15833,13 +16318,12 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
     // Fluent test support, super handy and reduces test preparation boilerplate
     // -------------------------------------------------------------------------
     /**
-     * Creates a TestObserver and subscribes
-     * it to this Observable.
+     * Creates a {@link TestObserver} and subscribes it to the current {@code Observable}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new TestObserver instance
+     * @return the new {@code TestObserver} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -15852,15 +16336,16 @@ public final TestObserver<T> test() { // NoPMD
     }
 
     /**
-     * Creates a TestObserver, optionally disposes it and then subscribes
-     * it to this Observable.
+     * Creates a {@link TestObserver}, optionally disposes it and then subscribes
+     * it to the current {@code Observable}.
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code test} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param dispose dispose the TestObserver before it is subscribed to this Observable?
-     * @return the new TestObserver instance
+     * @param dispose indicates if the {@code TestObserver} should be disposed before
+     *                it is subscribed to the current {@code Observable}
+     * @return the new {@code TestObserver} instance
      * @since 2.0
      */
     @CheckReturnValue
@@ -15897,7 +16382,8 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      * </dl>
      * @param <T> the element type of the optional value
      * @param optional the optional value to convert into an {@code Observable}
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code optional} is {@code null}
      * @since 3.0.0
      * @see #just(Object)
      * @see #empty()
@@ -15930,9 +16416,10 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromCompletionStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <T> the element type of the CompletionStage
-     * @param stage the CompletionStage to convert to Observable and signal its terminal value or error
-     * @return the new Observable instance
+     * @param <T> the element type of the {@code CompletionStage}
+     * @param stage the {@code CompletionStage} to convert to {@code Observable} and signal its terminal value or error
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code stage} is {@code null}
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -15948,7 +16435,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      * <p>
      * <img width="640" height="407" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromStream.o.png" alt="">
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #fromIterable(Iterable)}:
      * <pre><code>
@@ -15973,7 +16460,8 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      * </dl>
      * @param <T> the element type of the source {@code Stream}
      * @param stream the {@code Stream} of values to emit
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code stream} is {@code null}
      * @since 3.0.0
      * @see #fromIterable(Iterable)
      */
@@ -15994,10 +16482,11 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mapOptional} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <R> the non-null output type
+     * @param <R> the non-{@code null} output type
      * @param mapper the function that receives the upstream item and should return a <em>non-empty</em> {@code Optional}
      * to emit as the output or an <em>empty</em> {@code Optional} to skip to the next upstream value
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #map(Function)
      * @see #filter(Predicate)
@@ -16011,8 +16500,8 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
     }
 
     /**
-     * Collects the finite upstream's values into a container via a Stream {@link Collector} callback set and emits
-     * it as the success result.
+     * Collects the finite upstream's values into a container via a {@link Stream} {@link Collector} callback set and emits
+     * it as the success result as a {@link Single}.
      * <p>
      * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collector.o.png" alt="">
      *
@@ -16020,11 +16509,12 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code collect} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param <R> the non-null result type
+     * @param <R> the non-{@code null} result type
      * @param <A> the intermediate container type used for the accumulation
      * @param collector the interface defining the container supplier, accumulator and finisher functions;
      * see {@link Collectors} for some standard implementations
-     * @return the new Single instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code collector} is {@code null}
      * @since 3.0.0
      * @see Collectors
      * @see #collect(Supplier, BiConsumer)
@@ -16059,7 +16549,8 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      *  <dd>{@code firstStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param defaultItem the item to signal if the upstream is empty
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @since 3.0.0
      * @see #firstOrErrorStage()
      */
@@ -16093,7 +16584,8 @@ public final CompletionStage<T> firstStage(@Nullable T defaultItem) {
      *  <dd>{@code singleStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param defaultItem the item to signal if the upstream is empty
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @since 3.0.0
      * @see #singleOrErrorStage()
      */
@@ -16126,7 +16618,8 @@ public final CompletionStage<T> singleStage(@Nullable T defaultItem) {
      *  <dd>{@code lastStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param defaultItem the item to signal if the upstream is empty
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @since 3.0.0
      * @see #lastOrErrorStage()
      */
@@ -16152,7 +16645,7 @@ public final CompletionStage<T> lastStage(@Nullable T defaultItem) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code firstOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #firstStage(Object)
      */
@@ -16179,7 +16672,7 @@ public final CompletionStage<T> firstOrErrorStage() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code singleOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #singleStage(Object)
      */
@@ -16205,7 +16698,7 @@ public final CompletionStage<T> singleOrErrorStage() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lastOrErrorStage} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new CompletionStage instance
+     * @return the new {@code CompletionStage} instance
      * @since 3.0.0
      * @see #lastStage(Object)
      */
@@ -16217,7 +16710,7 @@ public final CompletionStage<T> lastOrErrorStage() {
     }
 
     /**
-     * Creates a sequential {@link Stream} to consume or process this {@code Observable} in a blocking manner via
+     * Creates a sequential {@link Stream} to consume or process the current {@code Observable} in a blocking manner via
      * the Java {@code Stream} API.
      * <p>
      * <img width="640" height="399" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingStream.o.png" alt="">
@@ -16237,7 +16730,7 @@ public final CompletionStage<T> lastOrErrorStage() {
      *  <dd>{@code blockingStream} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the new Stream instance
+     * @return the new {@code Stream} instance
      * @since 3.0.0
      * @see #blockingStream(int)
      */
@@ -16249,7 +16742,7 @@ public final Stream<T> blockingStream() {
     }
 
     /**
-     * Creates a sequential {@link Stream} to consume or process this {@code Observable} in a blocking manner via
+     * Creates a sequential {@link Stream} to consume or process the current {@code Observable} in a blocking manner via
      * the Java {@code Stream} API.
      * <p>
      * <img width="640" height="399" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingStream.oi.png" alt="">
@@ -16270,7 +16763,8 @@ public final Stream<T> blockingStream() {
      * </dl>
      *
      * @param capacityHint the expected number of items to be buffered
-     * @return the new Stream instance
+     * @return the new {@code Stream} instance
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -16287,11 +16781,11 @@ public final Stream<T> blockingStream(int capacityHint) {
      * <p>
      * <img width="640" height="299" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapStream.o.png" alt="">
      * <p>
-     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * Due to the blocking and sequential nature of Java {@code Stream}s, the streams are mapped and consumed in a sequential fashion
      * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
      * {@code concatMapStream} are identical operators and are provided as aliases.
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #concatMapIterable(Function)}:
      * <pre><code>
@@ -16316,8 +16810,9 @@ public final Stream<T> blockingStream(int capacityHint) {
      * @param <R> the element type of the {@code Stream}s and the result
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
      * @since 3.0.0
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMap(Function)
      * @see #concatMapIterable(Function)
      * @see #flatMapStream(Function)
@@ -16334,11 +16829,11 @@ public final Stream<T> blockingStream(int capacityHint) {
      * <p>
      * <img width="640" height="299" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.o.png" alt="">
      * <p>
-     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * Due to the blocking and sequential nature of Java {@code Stream}s, the streams are mapped and consumed in a sequential fashion
      * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
      * {@code concatMapStream} are identical operators and are provided as aliases.
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function)}:
      * <pre><code>
@@ -16363,8 +16858,9 @@ public final Stream<T> blockingStream(int capacityHint) {
      * @param <R> the element type of the {@code Stream}s and the result
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
-     * @return the new Observable instance
+     * @return the new {@code Observable} instance
      * @since 3.0.0
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #flatMap(Function)
      * @see #flatMapIterable(Function)
      */
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 93779d4f5a..9b60269cd3 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -152,6 +152,7 @@ public static <T> Single<T> amb(@NonNull Iterable<? extends SingleSource<? exten
      * @param sources the array of sources. A subscription to each source will
      *            occur in the same order as in this array.
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -159,6 +160,7 @@ public static <T> Single<T> amb(@NonNull Iterable<? extends SingleSource<? exten
     @SafeVarargs
     @NonNull
     public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sources) {
+        Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return error(SingleInternalHelper.emptyThrower());
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
index 9caafbc8e5..26287a0ccc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
@@ -36,17 +36,17 @@ private FlowableBlockingSubscribe() {
     /**
      * Subscribes to the source and calls the Subscriber methods on the current thread.
      * <p>
-     * @param o the source publisher
+     * @param source the source publisher
      * The cancellation and backpressure is composed through.
      * @param subscriber the subscriber to forward events and calls to in the current thread
      * @param <T> the value type
      */
-    public static <T> void subscribe(Publisher<? extends T> o, Subscriber<? super T> subscriber) {
+    public static <T> void subscribe(Publisher<? extends T> source, Subscriber<? super T> subscriber) {
         final BlockingQueue<Object> queue = new LinkedBlockingQueue<>();
 
         BlockingSubscriber<T> bs = new BlockingSubscriber<>(queue);
 
-        o.subscribe(bs);
+        source.subscribe(bs);
 
         try {
             for (;;) {
@@ -77,15 +77,15 @@ public static <T> void subscribe(Publisher<? extends T> o, Subscriber<? super T>
 
     /**
      * Runs the source observable to a terminal event, ignoring any values and rethrowing any exception.
-     * @param o the source publisher
+     * @param source the source to await
      * @param <T> the value type
      */
-    public static <T> void subscribe(Publisher<? extends T> o) {
+    public static <T> void subscribe(Publisher<? extends T> source) {
         BlockingIgnoringReceiver callback = new BlockingIgnoringReceiver();
         LambdaSubscriber<T> ls = new LambdaSubscriber<>(Functions.emptyConsumer(),
         callback, callback, Functions.REQUEST_MAX);
 
-        o.subscribe(ls);
+        source.subscribe(ls);
 
         BlockingHelper.awaitForComplete(callback, ls);
         Throwable e = callback.error;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
index 2c88f007e9..fe06c2099f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
@@ -39,6 +39,7 @@ private ObservableBlockingSubscribe() {
      * The call to dispose() is composed through.
      * @param observer the subscriber to forward events and calls to in the current thread
      * @param <T> the value type
+     * @throws NullPointerException if {@code observer} is {@code null}
      */
     public static <T> void subscribe(ObservableSource<? extends T> o, Observer<? super T> observer) {
         final BlockingQueue<Object> queue = new LinkedBlockingQueue<>();
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index ea09fb53d4..df1861c032 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -72,8 +72,11 @@ public abstract class ParallelFlowable<@NonNull T> {
      *
      * @param subscribers the array of Subscribers
      * @return true if the number of subscribers equals to the parallelism level
+     * @throws NullPointerException if {@code subscribers} is {@code null}
+     * @throws IllegalArgumentException if {@code subscribers.length} is different from {@link #parallelism()}
      */
     protected final boolean validate(@NonNull Subscriber<?>[] subscribers) {
+        Objects.requireNonNull(subscribers, "subscribers is null");
         int p = parallelism();
         if (subscribers.length != p) {
             Throwable iae = new IllegalArgumentException("parallelism = " + p + ", subscribers = " + subscribers.length);
@@ -156,7 +159,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     @BackpressureSupport(BackpressureKind.FULL)
     public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source,
             int parallelism, int prefetch) {
-        Objects.requireNonNull(source, "source");
+        Objects.requireNonNull(source, "source is null");
         ObjectHelper.verifyPositive(parallelism, "parallelism");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
 
@@ -183,7 +186,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
-        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ParallelMap<>(this, mapper));
     }
 
@@ -212,7 +215,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull ParallelFailureHandling errorHandler) {
-        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTry<>(this, mapper, errorHandler));
     }
@@ -243,7 +246,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
-        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTry<>(this, mapper, errorHandler));
     }
@@ -267,7 +270,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate) {
-        Objects.requireNonNull(predicate, "predicate");
+        Objects.requireNonNull(predicate, "predicate is null");
         return RxJavaPlugins.onAssembly(new ParallelFilter<>(this, predicate));
     }
 
@@ -295,7 +298,7 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate)
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate, @NonNull ParallelFailureHandling errorHandler) {
-        Objects.requireNonNull(predicate, "predicate");
+        Objects.requireNonNull(predicate, "predicate is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelFilterTry<>(this, predicate, errorHandler));
     }
@@ -325,7 +328,7 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate,
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
-        Objects.requireNonNull(predicate, "predicate");
+        Objects.requireNonNull(predicate, "predicate is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelFilterTry<>(this, predicate, errorHandler));
     }
@@ -401,7 +404,7 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler, int prefetch) {
-        Objects.requireNonNull(scheduler, "scheduler");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ParallelRunOn<>(this, scheduler, prefetch));
     }
@@ -426,7 +429,7 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler, int prefetc
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
-        Objects.requireNonNull(reducer, "reducer");
+        Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new ParallelReduceFull<>(this, reducer));
     }
 
@@ -453,8 +456,8 @@ public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> reduce(@NonNull Supplier<R> initialSupplier, @NonNull BiFunction<R, ? super T, R> reducer) {
-        Objects.requireNonNull(initialSupplier, "initialSupplier");
-        Objects.requireNonNull(reducer, "reducer");
+        Objects.requireNonNull(initialSupplier, "initialSupplier is null");
+        Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new ParallelReduce<>(this, initialSupplier, reducer));
     }
 
@@ -1024,6 +1027,7 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
      * @param <T> the value type
      * @param publishers the array of publishers
      * @return the new ParallelFlowable instance
+     * @throws IllegalArgumentException if {@code publishers} is an empty array
      */
     @CheckReturnValue
     @NonNull
@@ -1031,6 +1035,7 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <@NonNull T> ParallelFlowable<T> fromArray(@NonNull Publisher<T>... publishers) {
+        Objects.requireNonNull(publishers, "publishers is null");
         if (publishers.length == 0) {
             throw new IllegalArgumentException("Zero publishers not supported");
         }
@@ -1427,7 +1432,7 @@ public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<? extends R>> mapper) {
-        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ParallelMapOptional<>(this, mapper));
     }
 
@@ -1456,7 +1461,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<? extends R>> mapper, @NonNull ParallelFailureHandling errorHandler) {
-        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTryOptional<>(this, mapper, errorHandler));
     }
@@ -1487,7 +1492,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<? extends R>> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
-        Objects.requireNonNull(mapper, "mapper");
+        Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTryOptional<>(this, mapper, errorHandler));
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
index 53e4e24a93..7b1fb2a45f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
@@ -97,7 +97,7 @@ public void skipLastWithBackpressure() {
 
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void skipLastWithNegativeCount() {
         Flowable.just("one").skipLast(-1);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
index c62ff85db0..de6a431844 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
@@ -89,7 +89,7 @@ public void takeLastWithZeroCount() {
         verify(subscriber, times(1)).onComplete();
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void takeLastWithNegativeCount() {
         Flowable.just("one").takeLast(-1);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
index 3f8c22a47f..836700d2aa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
@@ -32,7 +32,7 @@
 
 public class FlowableTakeLastTimedTest extends RxJavaTest {
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void takeLastTimedWithNegativeCount() {
         Flowable.just("one").takeLast(-1, 1, TimeUnit.SECONDS);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
index ab4ba0273f..e13124bf5d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
@@ -535,7 +535,7 @@ public void badCapacityHint() throws Exception {
         try {
             Observable.concatEager(Arrays.asList(source, source, source), 1, -99);
         } catch (IllegalArgumentException ex) {
-            assertEquals("prefetch > 0 required but it was -99", ex.getMessage());
+            assertEquals("bufferSize > 0 required but it was -99", ex.getMessage());
         }
 
     }
@@ -547,7 +547,7 @@ public void mappingBadCapacityHint() throws Exception {
         try {
             Observable.just(source, source, source).concatMapEager((Function)Functions.identity(), 10, -99);
         } catch (IllegalArgumentException ex) {
-            assertEquals("prefetch > 0 required but it was -99", ex.getMessage());
+            assertEquals("bufferSize > 0 required but it was -99", ex.getMessage());
         }
 
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
index 8edf026fe1..712da24ea9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
@@ -92,7 +92,7 @@ public void skipLastWithBackpressure() {
 
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void skipLastWithNegativeCount() {
         Observable.just("one").skipLast(-1);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
index 2aa9e37985..b9ed392381 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
@@ -83,7 +83,7 @@ public void takeLastWithZeroCount() {
         verify(observer, times(1)).onComplete();
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void takeLastWithNegativeCount() {
         Observable.just("one").takeLast(-1);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
index a81fd1d9cb..f8d17474c2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
@@ -30,7 +30,7 @@
 
 public class ObservableTakeLastTimedTest extends RxJavaTest {
 
-    @Test(expected = IndexOutOfBoundsException.class)
+    @Test(expected = IllegalArgumentException.class)
     public void takeLastTimedWithNegativeCount() {
         Observable.just("one").takeLast(-1, 1, TimeUnit.SECONDS);
     }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
index 222409ef3c..30dc074813 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
@@ -50,8 +50,13 @@ public void checkMaybe() throws Exception {
         checkSource("Maybe", "io.reactivex.rxjava3.core");
     }
 
+    @Test
+    public void checkObservable() throws Exception {
+        checkSource("Observable", "io.reactivex.rxjava3.core");
+    }
+
     static void checkSource(String baseClassName, String packageName) throws Exception {
-        File f = TestHelper.findSource(baseClassName);
+        File f = TestHelper.findSource(baseClassName, packageName);
         if (f == null) {
             return;
         }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index e5746cc69b..4bcb1c41c1 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -990,5 +990,5 @@ static void backpressureMentionedWithoutAnnotation(StringBuilder e, RxMethod m,
         }
     }
 
-    static final String[] AT_RETURN_WORDS = { "@return a ", "@return the new ", "@return a new " };
+    static final String[] AT_RETURN_WORDS = { "@return a ", "@return an ", "@return the new ", "@return a new " };
 }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 85a6c4b0bd..b46f59f42a 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -890,6 +890,12 @@ void checkClass(Class<?> clazz) {
                                 error = ex;
                             }
 
+                            if (!success && error.getCause() instanceof NullPointerException) {
+                                if (!error.getCause().toString().contains("is null")) {
+                                    fail++;
+                                    b.append("\r\nNPEs should indicate which argument failed: " + m + " # " + i + " = " + p + ", tag = " + tag + ", params = " + Arrays.toString(callParams2));
+                                }
+                            }
                             if (success != shouldSucceed) {
                                 fail++;
                                 if (shouldSucceed) {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
index 12b0d43dc4..e19048f473 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -223,19 +223,31 @@ static void processFile(Class<?> clazz) throws Exception {
                     // FIXME enable for other types in separate PR!
                     if (!baseClassName.equals("Completable")
                             && !baseClassName.equals("Single")
-                            && !baseClassName.equals("Maybe")) {
+                            && !baseClassName.equals("Maybe")
+                            && !baseClassName.equals("Observable")
+                    ) {
                         continue;
                     }
 
+                    int midx = j - 1;
+                    // find the method declaration
+                    for (; midx >= 0; midx--) {
+                        String linek = lines.get(midx).trim();
+                        if (linek.startsWith("public") || linek.startsWith("private")
+                                || linek.startsWith("protected")) {
+                            break;
+                        }
+                    }
+
                     // find JavaDoc of throws
                     boolean found = false;
-                    for (int k = j - 1; k >= 0; k--) {
+                    for (int k = midx - 1; k >= 0; k--) {
                         String linek = lines.get(k).trim();
                         if (linek.startsWith("/**")) {
                             break;
                         }
                         if (linek.startsWith("}")) {
-                            found = true; // no JavaDoc
+                            found = true; // no method JavaDoc present
                             break;
                         }
                         if (linek.startsWith(validatorStr.javadoc)) {
@@ -278,6 +290,56 @@ static void processFile(Class<?> clazz) throws Exception {
                     }
                 }
             }
+
+            for (ValidatorStrings validatorStr : EXCEPTION_STRINGS) {
+                int strIdx = line.indexOf(validatorStr.code);
+                if (strIdx >= 0) {
+
+                    int midx = j - 1;
+                    // find the method declaration
+                    for (; midx >= 0; midx--) {
+                        String linek = lines.get(midx).trim();
+                        if (linek.startsWith("public") || linek.startsWith("private")
+                                || linek.startsWith("protected")) {
+                            break;
+                        }
+                    }
+
+                    // find JavaDoc of throws
+                    boolean found = false;
+                    for (int k = midx - 1; k >= 0; k--) {
+                        String linek = lines.get(k).trim();
+                        if (linek.startsWith("/**")) {
+                            break;
+                        }
+                        if (linek.startsWith("}")) {
+                            found = true; // no JavaDoc
+                            break;
+                        }
+                        if (linek.startsWith(validatorStr.javadoc)) {
+                            found = true;
+                        }
+                    }
+
+                    if (!found) {
+                        errorCount++;
+                        errors.append("L")
+                        .append(j)
+                        .append(" : missing '")
+                        .append(validatorStr.javadoc)
+                        .append("' for exception\r\n    ")
+                        .append(line)
+                        .append("\r\n at ")
+                        .append(fullClassName)
+                        .append(".method(")
+                        .append(f.getName())
+                        .append(":")
+                        .append(j + 1)
+                        .append(")\r\n")
+                        ;
+                    }
+                }
+            }
         }
 
         if (errorCount != 0) {
@@ -301,4 +363,10 @@ static final class ValidatorStrings {
             new ValidatorStrings("ObjectHelper.verifyPositive(", "* @throws IllegalArgumentException")
     );
 
+    static final List<ValidatorStrings> EXCEPTION_STRINGS = Arrays.asList(
+            new ValidatorStrings("throw new NullPointerException(", "* @throws NullPointerException"),
+            new ValidatorStrings("throw new IllegalArgumentException(", "* @throws IllegalArgumentException"),
+            new ValidatorStrings("throw new IndexOutOfBoundsException(", "* @throws IndexOutOfBoundsException")
+    );
+
 }

From c67263fffe26a0c4970fd34789766fb18a7411a8 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 11 Jan 2020 12:24:55 +0100
Subject: [PATCH 043/665] 3.x: Cleanup javadoc for parameter validation all
 around (#6835)

* 3.x: Cleanup javadoc for parameter validation all around

* More cleanup

* Last set of intended changes
---
 .../reactivex/rxjava3/core/Completable.java   |   10 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 3095 ++++++++++-------
 .../java/io/reactivex/rxjava3/core/Maybe.java |   59 +-
 .../io/reactivex/rxjava3/core/Observable.java |   90 +-
 .../io/reactivex/rxjava3/core/Scheduler.java  |   11 +
 .../io/reactivex/rxjava3/core/Single.java     |   23 +
 .../disposables/CompositeDisposable.java      |   58 +-
 .../flowables/ConnectableFlowable.java        |    6 +
 .../observables/ConnectableObservable.java    |    8 +-
 .../rxjava3/parallel/ParallelFlowable.java    |  383 +-
 .../rxjava3/processors/ReplayProcessor.java   |   27 +-
 .../rxjava3/processors/UnicastProcessor.java  |   18 +-
 .../rxjava3/subjects/BehaviorSubject.java     |   20 +-
 .../rxjava3/subjects/ReplaySubject.java       |   27 +-
 .../rxjava3/subjects/UnicastSubject.java      |   22 +-
 .../operators/flowable/FlowableSkipTest.java  |    2 +-
 .../observable/ObservableSkipTest.java        |    2 +-
 .../validators/JavadocCodesAndLinks.java      |   12 +-
 .../ParamValidationCheckerTest.java           |   16 +-
 .../validators/ParamValidationNaming.java     |  192 +-
 20 files changed, 2506 insertions(+), 1575 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index a51bb7399f..9d785d96d5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -235,7 +235,7 @@ public static Completable concat(@NonNull Iterable<? extends CompletableSource>
      * </dl>
      * @param sources the sources to concatenate
      * @return the {@code Completable} instance which completes only when all sources complete
-     * @throws NullPointerException if sources is {@code null}
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1655,6 +1655,7 @@ public final Completable doOnSubscribe(@NonNull Consumer<? super Disposable> onS
      * </dl>
      * @param onTerminate the {@code Action} to call just before this {@code Completable} terminates
      * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onTerminate} is {@code null}
      * @see #doFinally(Action)
      */
     @CheckReturnValue
@@ -1677,6 +1678,7 @@ public final Completable doOnTerminate(@NonNull Action onTerminate) {
      * </dl>
      * @param onAfterTerminate the {@code Action} to call after this {@code Completable} terminates
      * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see #doFinally(Action)
      */
     @CheckReturnValue
@@ -2034,7 +2036,7 @@ public final Completable repeat() {
      * </dl>
      * @param times the number of times the re-subscription should happen
      * @return the new {@code Completable} instance
-     * @throws IllegalArgumentException if times is less than zero
+     * @throws IllegalArgumentException if {@code times} is negative
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2076,7 +2078,7 @@ public final Completable repeatUntil(@NonNull BooleanSupplier stop) {
      * this {@code Completable} and returns a {@code Publisher} that emits items for repeating or completes to indicate the
      * repetition should stop
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code stop} is {@code null}
+     * @throws NullPointerException if {@code handler} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -2619,7 +2621,7 @@ public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      * @param other the other {@code Completable} instance to switch to in case of a timeout,
      * if {@code null} a {@link TimeoutException} is emitted instead
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code unit} or {@code scheduler}
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index f11415e0de..699baef2e8 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -176,6 +176,7 @@ public abstract class Flowable<T> implements Publisher<T> {
      *            occur in the same order as in this {@code Iterable}.
      * @return a {@code Flowable} that emits the same sequence as whichever of the source {@code Publisher}s first
      *         emitted an item or sent a termination notification
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
     @CheckReturnValue
@@ -206,6 +207,7 @@ public static <T> Flowable<T> amb(@NonNull Iterable<? extends Publisher<? extend
      *            occur in the same order as in this array.
      * @return a {@code Flowable} that emits the same sequence as whichever of the source {@code Publisher}s first
      *         emitted an item or sent a termination notification
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
     @CheckReturnValue
@@ -271,6 +273,7 @@ public static int bufferSize() {
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -318,6 +321,8 @@ public static int bufferSize() {
      *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -369,6 +374,7 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -417,6 +423,8 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends
      *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -466,6 +474,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -515,6 +524,8 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -568,6 +579,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -617,6 +629,8 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -661,6 +675,7 @@ public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? ext
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -710,6 +725,7 @@ public static <T1, T2, R> Flowable<R> combineLatest(
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -764,6 +780,8 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -822,6 +840,8 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -885,6 +905,8 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -952,6 +974,9 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -1024,6 +1049,9 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -1100,6 +1128,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
      *         {@code Publisher}s by means of the given aggregation function
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8}, {@code source9}
+     *                              or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @SuppressWarnings("unchecked")
@@ -1137,13 +1169,14 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when that {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the common value type of the sources
      * @param sources the {@code Iterable} sequence of {@code Publisher}s
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
@@ -1176,6 +1209,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<? extends Publisher<? ext
      *            a {@code Publisher} that emits {@code Publisher}s
      * @return a {@code Flowable} that emits items all of the items emitted by the {@code Publisher}s emitted by
      *         {@code Publisher}s, one after the other, without interleaving them
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -1208,6 +1242,8 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? ex
      *            the number of {@code Publisher}s to prefetch from the sources sequence.
      * @return a {@code Flowable} that emits items all of the items emitted by the {@code Publisher}s emitted by
      *         {@code Publisher}s, one after the other, without interleaving them
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -1229,7 +1265,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? ex
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when that source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -1241,6 +1277,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? ex
      *            a {@code Publisher} to be concatenated
      * @return a {@code Flowable} that emits items emitted by the two source {@code Publisher}s, one after the other,
      *         without interleaving them
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -1263,7 +1300,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends T> source1, @N
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when that source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -1277,6 +1314,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends T> source1, @N
      *            a {@code Publisher} to be concatenated
      * @return a {@code Flowable} that emits items emitted by the three source {@code Publisher}s, one after the other,
      *         without interleaving them
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -1302,7 +1340,7 @@ public static <T> Flowable<T> concat(
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when that source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -1318,6 +1356,7 @@ public static <T> Flowable<T> concat(
      *            a {@code Publisher} to be concatenated
      * @return a {@code Flowable} that emits items emitted by the four source {@code Publisher}s, one after the other,
      *         without interleaving them
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -1345,13 +1384,13 @@ public static <T> Flowable<T> concat(
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when that source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param sources the array of source {@code Publisher}s
      * @param <T> the common base value type
-     * @return the new {@code Publisher} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
@@ -1380,7 +1419,7 @@ public static <T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sou
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
      *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when that source {@code Publisher} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -1424,7 +1463,8 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull Publisher<? extends
      * </dl>
      * @param <T> the value type
      * @param sources an array of {@code Publisher}s that need to be eagerly concatenated
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1458,7 +1498,9 @@ public static <T> Flowable<T> concatArrayEager(@NonNull Publisher<? extends T>..
      * @param maxConcurrency the maximum number of concurrent subscriptions at a time, {@link Integer#MAX_VALUE}
      *                       is interpreted as an indication to subscribe to all sources at once
      * @param prefetch the number of elements to prefetch from each {@code Publisher} source
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
@@ -1495,6 +1537,7 @@ public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch,
      * @param <T> the value type
      * @param sources an array of {@code Publisher}s that need to be eagerly concatenated
      * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.2.1 - experimental
      */
     @CheckReturnValue
@@ -1530,6 +1573,8 @@ public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<? ex
      *                       is interpreted as indication to subscribe to all sources at once
      * @param prefetch the number of elements to prefetch from each {@code Publisher} source
      * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
      * @since 2.2.1 - experimental
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -1558,7 +1603,8 @@ public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int
      *
      * @param <T> the common element base type
      * @param sources the {@code Iterable} sequence of {@code Publisher}s
-     * @return the new {@code Publisher} with the concatenating behavior
+     * @return the new {@code Flowable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
@@ -1583,7 +1629,8 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Publi
      *
      * @param <T> the common element base type
      * @param sources the {@code Publisher} sequence of {@code Publisher}s
-     * @return the new {@code Publisher} with the concatenating behavior
+     * @return the new {@code Flowable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1608,8 +1655,10 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publ
      * @param sources the {@code Publisher} sequence of {@code Publisher}s
      * @param prefetch the number of elements to prefetch from the outer {@code Publisher}
      * @param tillTheEnd if {@code true}, exceptions from the outer and all inner {@code Publisher}s are delayed to the end
-     *                   if {@code false}, exception from the outer {@code Publisher} is delayed till the current {@code Publisher} terminates
-     * @return the new {@code Publisher} with the concatenating behavior
+     *                   if {@code false}, exception from the outer {@code Publisher} is delayed till the current inner {@code Publisher} terminates
+     * @return the new {@code Flowable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is {@code null}
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
@@ -1636,7 +1685,8 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publ
      * </dl>
      * @param <T> the value type
      * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1666,7 +1716,9 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher
      * @param maxConcurrency the maximum number of concurrently running inner {@code Publisher}s; {@link Integer#MAX_VALUE}
      *                       is interpreted as all inner {@code Publisher}s can be active at the same time
      * @param prefetch the number of elements to prefetch from each inner {@code Publisher} source
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
@@ -1697,7 +1749,8 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher
      * </dl>
      * @param <T> the value type
      * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1727,7 +1780,9 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<
      * @param maxConcurrency the maximum number of concurrently running inner {@code Publisher}s; {@link Integer#MAX_VALUE}
      *                       is interpreted as all inner {@code Publisher}s can be active at the same time
      * @param prefetch the number of elements to prefetch from each inner {@code Publisher} source
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
@@ -1791,6 +1846,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<
      * @param source the emitter that is called when a {@code Subscriber} subscribes to the returned {@code Flowable}
      * @param mode the backpressure mode to apply if the downstream {@code Subscriber} doesn't request (fast) enough
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code source} or {@code mode} is {@code null}
      * @see FlowableOnSubscribe
      * @see BackpressureStrategy
      * @see Cancellable
@@ -1825,11 +1881,12 @@ public static <T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @No
      *
      * @param supplier
      *            the {@code Publisher} factory function to invoke for each {@code Subscriber} that subscribes to the
-     *            resulting {@code Publisher}
+     *            resulting {@code Flowable}
      * @param <T>
      *            the type of the items emitted by the {@code Publisher}
      * @return a {@code Flowable} whose {@code Subscriber}s' subscriptions trigger an invocation of the given
      *         {@code Publisher} factory function
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defer.html">ReactiveX operators documentation: Defer</a>
      */
     @CheckReturnValue
@@ -1886,6 +1943,7 @@ public static <T> Flowable<T> empty() {
      *            the type of the items (ostensibly) emitted by the {@link Publisher}
      * @return a {@code Flowable} that invokes the {@code Subscriber}'s {@link Subscriber#onError onError} method when
      *         the {@code Subscriber} subscribes to it
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
@@ -1915,6 +1973,7 @@ public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> suppl
      *            the type of the items (ostensibly) emitted by the {@link Publisher}
      * @return a {@code Flowable} that invokes the {@code Subscriber}'s {@link Subscriber#onError onError} method when
      *         the {@code Subscriber} subscribes to it
+     * @throws NullPointerException if {@code throwable} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
@@ -1941,8 +2000,9 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * @param items
      *            the array of elements
      * @param <T>
-     *            the type of items in the array and the type of items to be emitted by the resulting {@code Publisher}
+     *            the type of items in the array and the type of items to be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits each item in the source array
+     * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -1989,6 +2049,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * @param <T>
      *         the type of the item emitted by the {@code Publisher}
      * @return a {@code Flowable} whose {@code Subscriber}s' subscriptions trigger an invocation of the given function
+     * @throws NullPointerException if {@code callable} is {@code null}
      * @see #defer(Supplier)
      * @see #fromSupplier(Supplier)
      * @since 2.0
@@ -2029,8 +2090,9 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *            the source {@code Future}
      * @param <T>
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
-     *            the resulting {@code Publisher}
+     *            the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the item from the source {@code Future}
+     * @throws NullPointerException if {@code future} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromCompletionStage(CompletionStage)
      */
@@ -2074,8 +2136,9 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *            the {@link TimeUnit} of the {@code timeout} argument
      * @param <T>
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
-     *            the resulting {@code Publisher}
+     *            the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the item from the source {@code Future}
+     * @throws NullPointerException if {@code future} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromCompletionStage(CompletionStage)
      */
@@ -2105,8 +2168,9 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *            the source {@code Iterable} sequence
      * @param <T>
      *            the type of items in the {@code Iterable} sequence and the type of items to be emitted by the
-     *            resulting {@code Publisher}
+     *            resulting {@code Flowable}
      * @return a {@code Flowable} that emits each item in the source {@code Iterable} sequence
+     * @throws NullPointerException if {@code source} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromStream(Stream)
      */
@@ -2188,6 +2252,7 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> sour
      * @param <T>
      *         the type of the item emitted by the {@code Publisher}
      * @return a {@code Flowable} whose {@code Subscriber}s' subscriptions trigger an invocation of the given function
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see #defer(Supplier)
      * @see #fromCallable(Callable)
      * @since 3.0.0
@@ -2221,6 +2286,7 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> sour
      * {@code onComplete} to signal a value or a terminal event. Signaling multiple {@code onNext}
      * in a call will make the operator signal {@link IllegalStateException}.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code generator} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2255,6 +2321,7 @@ public static <T> Flowable<T> generate(@NonNull Consumer<@NonNull Emitter<T>> ge
      * {@code onComplete} to signal a value or a terminal event. Signaling multiple {@code onNext}
      * in a call will make the operator signal {@link IllegalStateException}.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code initialState} or {@code generator} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2290,6 +2357,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      * @param disposeState the {@code Consumer} that is called with the current state when the generator
      * terminates the sequence or it gets canceled
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code initialState}, {@code generator} or {@code disposeState} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2324,6 +2392,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      * the next invocation. Signaling multiple {@code onNext}
      * in a call will make the operator signal {@link IllegalStateException}.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code initialState} or {@code generator} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -2358,6 +2427,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      * @param disposeState the {@link Consumer} that is called with the current state when the generator
      * terminates the sequence or it gets canceled
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code initialState}, {@code generator} or {@code disposeState} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -2392,6 +2462,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      *            the time unit for both {@code initialDelay} and {@code period}
      * @return a {@code Flowable} that emits a 0L after the {@code initialDelay} and ever-increasing numbers after
      *         each {@code period} of time thereafter
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      * @since 1.0.12
      */
@@ -2427,6 +2498,7 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
      *            the {@code Scheduler} on which the waiting happens and items are emitted
      * @return a {@code Flowable} that emits a 0L after the {@code initialDelay} and ever-increasing numbers after
      *         each {@code period} of time thereafter, while running on the given {@code Scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      * @since 1.0.12
      */
@@ -2457,6 +2529,7 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
      * @param unit
      *            time units to use for the interval size
      * @return a {@code Flowable} that emits a sequential number each time interval
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
     @CheckReturnValue
@@ -2488,6 +2561,7 @@ public static Flowable<Long> interval(long period, @NonNull TimeUnit unit) {
      * @param scheduler
      *            the {@code Scheduler} to use for scheduling the items
      * @return a {@code Flowable} that emits a sequential number each time interval
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
     @CheckReturnValue
@@ -2514,6 +2588,10 @@ public static Flowable<Long> interval(long period, @NonNull TimeUnit unit, @NonN
      * @param period the period between subsequent values
      * @param unit the unit of measure of the {@code initialDelay} and {@code period} amounts
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException
+     *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
+     *             {@link Long#MAX_VALUE}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
@@ -2540,6 +2618,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param unit the unit of measure of the {@code initialDelay} and {@code period} amounts
      * @param scheduler the target {@code Scheduler} where the values and terminal signals will be emitted
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Long#MAX_VALUE}
@@ -2590,6 +2669,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of that item
      * @return a {@code Flowable} that emits {@code value} as a single item and then completes
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      * @see #just(Object, Object)
      * @see #fromCallable(Callable)
@@ -2623,6 +2703,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of these items
      * @return a {@code Flowable} that emits each item
+     * @throws NullPointerException if {@code item1} or {@code item2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2656,6 +2737,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of these items
      * @return a {@code Flowable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2} or {@code item3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2692,6 +2774,8 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of these items
      * @return a {@code Flowable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              or {@code item4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2731,6 +2815,8 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of these items
      * @return a {@code Flowable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4} or {@code item5} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2773,6 +2859,8 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of these items
      * @return a {@code Flowable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5} or {@code item6} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2818,6 +2906,9 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of these items
      * @return a {@code Flowable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5}, {@code item6}
+     *                              or {@code item7} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2866,6 +2957,9 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of these items
      * @return a {@code Flowable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5}, {@code item6},
+     *                              {@code item7} or {@code item8} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2917,6 +3011,9 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of these items
      * @return a {@code Flowable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5}, {@code item6},
+     *                              {@code item7}, {@code item8} or {@code item9} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -2971,6 +3068,10 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * @param <T>
      *            the type of these items
      * @return a {@code Flowable} that emits each item
+     * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
+     *                              {@code item4}, {@code item5}, {@code item6},
+     *                              {@code item7}, {@code item8}, {@code item9},
+     *                              or {@code item10} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
     @CheckReturnValue
@@ -3030,8 +3131,9 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            the number of items to prefetch from each inner {@code Publisher}
      * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
      *         {@code Publisher}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code maxConcurrency} is less than or equal to 0
+     *             if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable, int, int)
      */
@@ -3082,8 +3184,9 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
      *            the number of items to prefetch from each inner {@code Publisher}
      * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
      *         {@code Publisher}s
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code maxConcurrency} is less than or equal to 0
+     *             if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeArrayDelayError(int, int, Publisher...)
      */
@@ -3130,6 +3233,7 @@ public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @No
      *            the {@code Iterable} of {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
      *         {@code Publisher}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable)
      */
@@ -3178,6 +3282,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
      *         {@code Publisher}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3227,6 +3332,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
      *            a {@code Publisher} that emits {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of flattening the {@code Publisher}s emitted by the
      *         {@code source} {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher)
      */
@@ -3275,6 +3381,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? ext
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @return a {@code Flowable} that emits items that are the result of flattening the {@code Publisher}s emitted by the
      *         {@code source} {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3322,6 +3429,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? ext
      * @param sources
      *            the array of {@code Publisher}s
      * @return a {@code Flowable} that emits all of the items emitted by the {@code Publisher}s
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeArrayDelayError(Publisher...)
      */
@@ -3369,6 +3477,7 @@ public static <T> Flowable<T> mergeArray(@NonNull Publisher<? extends T>... sour
      * @param source2
      *            a {@code Publisher} to be merged
      * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher, Publisher)
      */
@@ -3419,6 +3528,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @No
      * @param source3
      *            a {@code Publisher} to be merged
      * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher, Publisher, Publisher)
      */
@@ -3472,6 +3582,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @No
      * @param source4
      *            a {@code Publisher} to be merged
      * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher, Publisher, Publisher, Publisher)
      */
@@ -3516,6 +3627,7 @@ public static <T> Flowable<T> merge(
      *            the {@code Iterable} of {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
      *         {@code Publisher}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3557,6 +3669,8 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publis
      *            the number of items to prefetch from each inner {@code Publisher}
      * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
      *         {@code Publisher}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3598,6 +3712,8 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publis
      *            the number of items to prefetch from each inner {@code Publisher}
      * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
      *         {@code Publisher}s
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3638,6 +3754,8 @@ public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int buffe
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
      *         {@code Publisher}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3676,6 +3794,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publis
      *            a {@code Publisher} that emits {@code Publisher}s
      * @return a {@code Flowable} that emits all of the items emitted by the {@code Publisher}s emitted by the
      *         {@code source} {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @CheckReturnValue
@@ -3715,6 +3834,8 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publi
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @return a {@code Flowable} that emits all of the items emitted by the {@code Publisher}s emitted by the
      *         {@code source} {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @since 2.0
      */
@@ -3753,6 +3874,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publi
      *            the array of {@code Publisher}s
      * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
      *         {@code Publisher}s
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3792,6 +3914,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<? extends
      * @param source2
      *            a {@code Publisher} to be merged
      * @return a {@code Flowable} that emits all of the items that are emitted by the two source {@code Publisher}s
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3835,6 +3958,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> so
      * @param source3
      *            a {@code Publisher} to be merged
      * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code Publisher}s
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3881,6 +4005,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> so
      * @param source4
      *            a {@code Publisher} to be merged
      * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code Publisher}s
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -4032,6 +4157,7 @@ public static Flowable<Long> rangeLong(long start, long count) {
      * @param <T>
      *            the type of items emitted by each {@code Publisher}
      * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -4066,6 +4192,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
      *            the type of items emitted by each {@code Publisher}
      * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code Publisher} sequences
      *         are the same according to the specified function
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -4103,6 +4230,8 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
      *            the type of items emitted by each {@code Publisher}
      * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code Publisher} sequences
      *         are the same according to the specified function
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -4140,6 +4269,8 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
      * @param <T>
      *            the type of items emitted by each {@code Publisher}
      * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -4161,7 +4292,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
      * emitted by that {@code Publisher}. When a new {@code Publisher} is emitted, {@code switchOnNext} stops emitting items
      * from the earlier-emitted {@code Publisher} and begins emitting items from the new one.
      * <p>
-     * The resulting {@code Publisher} completes if both the outer {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * The resulting {@code Flowable} completes if both the outer {@code Publisher} and the last inner {@code Publisher}, if any, complete.
      * If the outer {@code Publisher} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -4180,6 +4311,8 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
      *            the number of items to prefetch from the inner {@code Publisher}s
      * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
      *         {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -4202,7 +4335,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publishe
      * emitted by that {@code Publisher}. When a new {@code Publisher} is emitted, {@code switchOnNext} stops emitting items
      * from the earlier-emitted {@code Publisher} and begins emitting items from the new one.
      * <p>
-     * The resulting {@code Publisher} completes if both the outer {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * The resulting {@code Flowable} completes if both the outer {@code Publisher} and the last inner {@code Publisher}, if any, complete.
      * If the outer {@code Publisher} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -4219,6 +4352,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publishe
      *            the source {@code Publisher} that emits {@code Publisher}s
      * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
      *         {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -4241,7 +4375,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publishe
      * emitted by that {@code Publisher}. When a new {@code Publisher} is emitted, {@code switchOnNext} stops emitting items
      * from the earlier-emitted {@code Publisher} and begins emitting items from the new one.
      * <p>
-     * The resulting {@code Publisher} completes if both the main {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * The resulting {@code Flowable} completes if both the main {@code Publisher} and the last inner {@code Publisher}, if any, complete.
      * If the main {@code Publisher} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
      * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <dl>
@@ -4259,6 +4393,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publishe
      *            the source {@code Publisher} that emits {@code Publisher}s
      * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
      *         {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      * @since 2.0
      */
@@ -4281,7 +4416,7 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extend
      * emitted by that {@code Publisher}. When a new {@code Publisher} is emitted, {@code switchOnNext} stops emitting items
      * from the earlier-emitted {@code Publisher} and begins emitting items from the new one.
      * <p>
-     * The resulting {@code Publisher} completes if both the main {@code Publisher} and the last inner {@code Publisher}, if any, complete.
+     * The resulting {@code Flowable} completes if both the main {@code Publisher} and the last inner {@code Publisher}, if any, complete.
      * If the main {@code Publisher} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
      * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <dl>
@@ -4301,6 +4436,8 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extend
      *            the number of items to prefetch from the inner {@code Publisher}s
      * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
      *         {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      * @since 2.0
      */
@@ -4329,6 +4466,7 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extend
      * @param unit
      *            time units to use for {@code delay}
      * @return a {@code Flowable} that emits {@code 0L} after a specified delay, and then completes
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
     @CheckReturnValue
@@ -4360,6 +4498,7 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit) {
      *            the {@code Scheduler} to use for scheduling the item
      * @return a {@code Flowable} that emits {@code 0L} after a specified delay, on a specified {@code Scheduler}, and then
      *         completes
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
     @CheckReturnValue
@@ -4387,6 +4526,7 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull
      * @param <T> the value type emitted
      * @param onSubscribe the {@code Publisher} instance to wrap
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @throws IllegalArgumentException if {@code onSubscribe} is a subclass of {@code Flowable}; such
      * instances don't need conversion and is possibly a port remnant from 1.x or one should use {@link #hide()}
      * instead.
@@ -4425,7 +4565,8 @@ public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
      *            the factory function to create a {@code Publisher}
      * @param resourceDisposer
      *            the function that will dispose of the resource
-     * @return the {@code Publisher} whose lifetime controls the lifetime of the dependent resource object
+     * @return the {@code Flowable} whose lifetime controls the lifetime of the dependent resource object
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceDisposer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -4466,7 +4607,8 @@ public static <T, D> Flowable<T> using(
      *            or just before the emission of a terminal event ({@code onComplete} or {@code onError}).
      *            If {@code false} the resource disposal will happen either on a {@code cancel()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
-     * @return the {@code Publisher} whose lifetime controls the lifetime of the dependent resource object
+     * @return the {@code Flowable} whose lifetime controls the lifetime of the dependent resource object
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceDisposer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      * @since 2.0
      */
@@ -4494,7 +4636,7 @@ public static <T, D> Flowable<T> using(
      * the second item emitted by the new {@code Publisher} will be the result of the function applied to the second
      * item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@code onNext} as many times as
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@code onNext} as many times as
      * the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -4525,8 +4667,9 @@ public static <T, D> Flowable<T> using(
      *            an {@code Iterable} of source {@code Publisher}s
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4548,7 +4691,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
      * the second item emitted by the new {@code Publisher} will be the result of the function applied to the second
      * item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@code onNext} as many times as
+     * The resulting {@code Floawble} returned from {@code zip} will invoke {@code onNext} as many times as
      * the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -4578,7 +4721,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
      *            an {@code Iterable} of source {@code Publisher}s
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @param delayError
      *            delay errors signaled by any of the source {@code Publisher} until all {@code Publisher}s terminate
      * @param bufferSize
@@ -4586,6 +4729,8 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
      * @param <T> the common source value type
      * @param <R> the zipped result type
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4612,7 +4757,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
      * emitted by {@code o2}; the second item emitted by the new {@code Publisher} will be the result of the function
      * applied to the second item emitted by {@code o1} and the second item emitted by {@code o2}; and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -4645,8 +4790,9 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
      *            a second source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results
-     *            in an item that will be emitted by the resulting {@code Publisher}
+     *            in an item that will be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4673,7 +4819,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * emitted by {@code o2}; the second item emitted by the new {@code Publisher} will be the result of the function
      * applied to the second item emitted by {@code o1} and the second item emitted by {@code o2}; and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -4706,9 +4852,10 @@ public static <T1, T2, R> Flowable<R> zip(
      *            a second source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results
-     *            in an item that will be emitted by the resulting {@code Publisher}
+     *            in an item that will be emitted by the resulting {@code Flowable}
      * @param delayError delay errors from any of the source {@code Publisher}s till the other terminates
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4735,7 +4882,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * emitted by {@code o2}; the second item emitted by the new {@code Publisher} will be the result of the function
      * applied to the second item emitted by {@code o1} and the second item emitted by {@code o2}; and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -4768,10 +4915,12 @@ public static <T1, T2, R> Flowable<R> zip(
      *            a second source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results
-     *            in an item that will be emitted by the resulting {@code Publisher}
+     *            in an item that will be emitted by the resulting {@code Flowable}
      * @param delayError delay errors from any of the source {@code Publisher}s till the other terminates
      * @param bufferSize the number of elements to prefetch from each source {@code Publisher}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4799,7 +4948,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * {@code Publisher} will be the result of the function applied to the second item emitted by {@code o1}, the
      * second item emitted by {@code o2}, and the second item emitted by {@code o3}; and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -4835,8 +4984,9 @@ public static <T1, T2, R> Flowable<R> zip(
      *            a third source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4865,7 +5015,7 @@ public static <T1, T2, T3, R> Flowable<R> zip(
      * the second item emitted by the new {@code Publisher} will be the result of the function applied to the second
      * item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -4904,8 +5054,10 @@ public static <T1, T2, T3, R> Flowable<R> zip(
      *            a fourth source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -4936,7 +5088,7 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
      * the first item emitted by {@code o5}; the second item emitted by the new {@code Publisher} will be the result of
      * the function applied to the second item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -4978,8 +5130,10 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
      *            a fifth source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5010,7 +5164,7 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
      * second item emitted by the new {@code Publisher} will be the result of the function applied to the second item
      * emitted by each of those {@code Publisher}s, and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -5055,8 +5209,11 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
      *            a sixth source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6}
+     *                              or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5088,7 +5245,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
      * second item emitted by the new {@code Publisher} will be the result of the function applied to the second item
      * emitted by each of those {@code Publisher}s, and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -5136,8 +5293,11 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
      *            a seventh source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5171,7 +5331,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
      * second item emitted by the new {@code Publisher} will be the result of the function applied to the second item
      * emitted by each of those {@code Publisher}s, and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -5222,8 +5382,11 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
      *            an eighth source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5258,7 +5421,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
      * second item emitted by the new {@code Publisher} will be the result of the function applied to the second item
      * emitted by each of those {@code Publisher}s, and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@link Subscriber#onNext onNext}
      * as many times as the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest
      * items.
      * <p>
@@ -5312,8 +5475,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
      *            a ninth source {@code Publisher}
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the zipped results
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4}, {@code source5}, {@code source6},
+     *                              {@code source7}, {@code source8}, {@code source9}
+     *                              or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5348,7 +5515,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
      * the second item emitted by the new {@code Publisher} will be the result of the function applied to the second
      * item emitted by each of those {@code Publisher}s; and so forth.
      * <p>
-     * The resulting {@code Publisher<R>} returned from {@code zip} will invoke {@code onNext} as many times as
+     * The resulting {@code Flowable} returned from {@code zip} will invoke {@code onNext} as many times as
      * the number of {@code onNext} invocations of the source {@code Publisher} that emits the fewest items.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
@@ -5380,7 +5547,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
      *            an array of source {@code Publisher}s
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
-     *            an item that will be emitted by the resulting {@code Publisher}
+     *            an item that will be emitted by the resulting {@code Flowable}
      * @param delayError
      *            delay errors signaled by any of the source {@code Publisher} until all {@code Publisher}s terminate
      * @param bufferSize
@@ -5411,13 +5578,13 @@ public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ?
     // ***************************************************************************************************
 
     /**
-     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether all of the items emitted by the source
-     * {@link Publisher} satisfy a condition.
+     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether all of the items emitted by the current
+     * {@code Flowable} satisfy a condition.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/all.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code all} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5425,8 +5592,9 @@ public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ?
      *
      * @param predicate
      *            a function that evaluates an item and returns a {@code Boolean}
-     * @return a {@code Single} that emits {@code true} if all items emitted by the source {@code Publisher} satisfy the
+     * @return a {@code Single} that emits {@code true} if all items emitted by the current {@code Flowable} satisfy the
      *         predicate; otherwise, {@code false}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/all.html">ReactiveX operators documentation: All</a>
      */
     @CheckReturnValue
@@ -5453,9 +5621,10 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
      *
      * @param other
      *            a {@code Publisher} competing to react first. A subscription to this provided {@code Publisher} will occur after subscribing
-     *            to the current {@code Publisher}.
-     * @return a {@code Flowable} that emits the same sequence as whichever of the source {@code Publisher}s first
+     *            to the current {@code Flowable}.
+     * @return a {@code Flowable} that emits the same sequence as whichever of this or the other {@code Publisher} first
      *         emitted an item or sent a termination notification
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
     @CheckReturnValue
@@ -5468,9 +5637,9 @@ public final Flowable<T> ambWith(@NonNull Publisher<? extends T> other) {
     }
 
     /**
-     * Returns a {@link Single} that emits {@code true} if any item emitted by the source {@link Publisher} satisfies a
+     * Returns a {@link Single} that emits {@code true} if any item emitted by the current {@code Flowable} satisfies a
      * specified condition, otherwise {@code false}. <em>Note:</em> this always emits {@code false} if the
-     * source {@code Publisher} is empty.
+     * current {@code Flowable} is empty.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/exists.png" alt="">
      * <p>
@@ -5478,16 +5647,17 @@ public final Flowable<T> ambWith(@NonNull Publisher<? extends T> other) {
      * idioms.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded manner
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code any} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param predicate
-     *            the condition to test items emitted by the source {@code Publisher}
-     * @return a {@code Single} that emits a {@link Boolean} that indicates whether any item emitted by the source
-     *         {@code Publisher} satisfies the {@code predicate}
+     *            the condition to test items emitted by the current {@code Flowable}
+     * @return a {@code Single} that emits a {@link Boolean} that indicates whether any item emitted by the current
+     *         {@code Flowable} satisfies the {@code predicate}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -5504,7 +5674,7 @@ public final Single<Boolean> any(@NonNull Predicate<? super T> predicate) {
      * {@link NoSuchElementException} if it emits no items.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingFirst} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5538,7 +5708,7 @@ public final T blockingFirst() {
      * items.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingFirst} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5552,6 +5722,7 @@ public final T blockingFirst() {
      *            a default value to return if this {@code Flowable} emits no items
      * @return the first item emitted by this {@code Flowable}, or the default value if it emits no
      *         items
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5559,6 +5730,7 @@ public final T blockingFirst() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final T blockingFirst(@NonNull T defaultItem) {
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         BlockingFirstSubscriber<T> s = new BlockingFirstSubscriber<>();
         subscribe(s);
         T v = s.blockingGet();
@@ -5566,7 +5738,7 @@ public final T blockingFirst(@NonNull T defaultItem) {
     }
 
     /**
-     * Consumes the upstream {@code Flowable} in a blocking fashion and invokes the given
+     * Consumes the current {@code Flowable} in a blocking fashion and invokes the given
      * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
@@ -5592,6 +5764,7 @@ public final T blockingFirst(@NonNull T defaultItem) {
      *
      * @param onNext
      *            the {@code Consumer} to invoke for each item emitted by the {@code Flowable}
+     * @throws NullPointerException if {@code onNext} is {@code null}
      * @throws RuntimeException
      *             if an error occurs; {@code Error}s and {@code RuntimeException}s are rethrown
      *             as they are, checked {@code Exception}s are wrapped into {@code RuntimeException}s
@@ -5606,7 +5779,7 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Consumes the upstream {@code Flowable} in a blocking fashion and invokes the given
+     * Consumes the current {@code Flowable} in a blocking fashion and invokes the given
      * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
@@ -5696,6 +5869,7 @@ public final Iterable<T> blockingIterable() {
      *
      * @param bufferSize the number of items to prefetch from the current {@code Flowable}
      * @return an {@code Iterable} version of this {@code Flowable}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -5714,7 +5888,7 @@ public final Iterable<T> blockingIterable(int bufferSize) {
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.last.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingLast} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5750,7 +5924,7 @@ public final T blockingLast() {
      * <img width="640" height="310" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.lastOrDefault.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingLast} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5764,6 +5938,7 @@ public final T blockingLast() {
      *            a default value to return if this {@code Flowable} emits no items
      * @return the last item emitted by the {@code Flowable}, or the default value if it emits no
      *         items
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX documentation: Last</a>
      */
     @CheckReturnValue
@@ -5771,6 +5946,7 @@ public final T blockingLast() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final T blockingLast(@NonNull T defaultItem) {
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         BlockingLastSubscriber<T> s = new BlockingLastSubscriber<>();
         subscribe(s);
         T v = s.blockingGet();
@@ -5788,7 +5964,7 @@ public final T blockingLast(@NonNull T defaultItem) {
      * event.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5812,7 +5988,7 @@ public final Iterable<T> blockingLatest() {
      * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.mostRecent.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingMostRecent} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5840,7 +6016,7 @@ public final Iterable<T> blockingMostRecent(@NonNull T initialItem) {
      * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.next.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingNext} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5865,7 +6041,7 @@ public final Iterable<T> blockingNext() {
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.single.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5894,7 +6070,7 @@ public final T blockingSingle() {
      * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.singleOrDefault.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5908,6 +6084,7 @@ public final T blockingSingle() {
      *            a default value to return if this {@code Flowable} emits no items
      * @return the single item emitted by this {@code Flowable}, or the default value if it emits no
      *         items
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5931,7 +6108,7 @@ public final T blockingSingle(@NonNull T defaultItem) {
      * If the {@code Flowable} may emit more than one item, use {@code Flowable.toList().toFuture()}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5949,14 +6126,14 @@ public final Future<T> toFuture() {
     }
 
     /**
-     * Runs the source {@code Flowable} to a terminal event, ignoring any values and rethrowing any exception.
+     * Runs the current {@code Flowable} to a terminal event, ignoring any values and rethrowing any exception.
      * <p>
      * Note that calling this method will block the caller thread until the upstream terminates
      * normally or with an error. Therefore, calling this method from special threads such as the
      * Android Main Thread or the Swing Event Dispatch Thread is not recommended.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5986,12 +6163,13 @@ public final void blockingSubscribe() {
      * Android Main Thread or the Swing Event Dispatch Thread is not recommended.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param onNext the callback action for each source value
+     * @throws NullPointerException if {@code onNext} is {@code null}
      * @since 2.0
      * @see #blockingSubscribe(Consumer, Consumer)
      * @see #blockingSubscribe(Consumer, Consumer, Action)
@@ -6016,7 +6194,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext) {
      * Android Main Thread or the Swing Event Dispatch Thread is not recommended.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an bounded manner (up to bufferSize
+     *  <dd>The operator consumes the current {@code Flowable} in an bounded manner (up to bufferSize
      *  outstanding request amount for items).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6024,6 +6202,8 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext) {
      * <p>History: 2.1.15 - experimental
      * @param onNext the callback action for each source value
      * @param bufferSize the size of the buffer
+     * @throws NullPointerException if {@code onNext} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #blockingSubscribe(Consumer, Consumer)
      * @see #blockingSubscribe(Consumer, Consumer, Action)
      * @since 2.2
@@ -6042,13 +6222,14 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, int buf
      * Android Main Thread or the Swing Event Dispatch Thread is not recommended.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param onNext the callback action for each source value
      * @param onError the callback action for an error event
+     * @throws NullPointerException if {@code onNext} or {@code onError} is {@code null}
      * @since 2.0
      * @see #blockingSubscribe(Consumer, Consumer, Action)
      */
@@ -6066,7 +6247,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      * Android Main Thread or the Swing Event Dispatch Thread is not recommended.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an bounded manner (up to bufferSize
+     *  <dd>The operator consumes the current {@code Flowable} in an bounded manner (up to bufferSize
      *  outstanding request amount for items).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6075,6 +6256,8 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      * @param onNext the callback action for each source value
      * @param onError the callback action for an error event
      * @param bufferSize the size of the buffer
+     * @throws NullPointerException if {@code onNext} or {@code onError} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @since 2.2
      * @see #blockingSubscribe(Consumer, Consumer, Action)
      */
@@ -6093,7 +6276,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      * Android Main Thread or the Swing Event Dispatch Thread is not recommended.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an unbounded manner
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
      *  (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6101,6 +6284,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      * @param onNext the callback action for each source value
      * @param onError the callback action for an error event
      * @param onComplete the callback action for the completion event.
+     * @throws NullPointerException if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -6117,7 +6301,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      * Android Main Thread or the Swing Event Dispatch Thread is not recommended.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Flowable} in an bounded manner (up to bufferSize
+     *  <dd>The operator consumes the current {@code Flowable} in an bounded manner (up to bufferSize
      *  outstanding request amount for items).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6127,12 +6311,14 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      * @param onError the callback action for an error event
      * @param onComplete the callback action for the completion event.
      * @param bufferSize the size of the buffer
+     * @throws NullPointerException if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @since 2.2
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNull Consumer<? super Throwable> onError, @NonNull Action onComplete,
-        int bufferSize) {
+            int bufferSize) {
         FlowableBlockingSubscribe.subscribe(this, onNext, onError, onComplete, bufferSize);
     }
 
@@ -6163,16 +6349,16 @@ public final void blockingSubscribe(@NonNull Subscriber<? super T> subscriber) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping buffers, each containing {@code count} items. When the source
-     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
-     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping buffers, each containing {@code count} items. When the current
+     * {@code Flowable} completes, the resulting {@code Flowable} emits the current buffer and propagates the notification from the
+     * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and expects the source {@code Publisher} to honor it as
+     *  <dd>The operator honors backpressure from downstream and expects the current {@code Flowable} to honor it as
      *  well, although not enforced; violation <em>may</em> lead to {@link MissingBackpressureException} somewhere
      *  downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -6182,7 +6368,8 @@ public final void blockingSubscribe(@NonNull Subscriber<? super T> subscriber) {
      * @param count
      *            the maximum number of items in each buffer before it should be emitted
      * @return a {@code Flowable} that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the source {@code Publisher}
+     *         {@code count} items from the current {@code Flowable}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6194,16 +6381,16 @@ public final Flowable<List<T>> buffer(int count) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits buffers every {@code skip} items, each containing {@code count} items. When the source
-     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
-     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits buffers every {@code skip} items, each containing {@code count} items. When the current
+     * {@code Flowable} completes, the resulting {@code Flowable} emits the current buffer and propagates the notification from the
+     * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and expects the source {@code Publisher} to honor it as
+     *  <dd>The operator honors backpressure from downstream and expects the current {@code Flowable} to honor it as
      *  well, although not enforced; violation <em>may</em> lead to {@link MissingBackpressureException} somewhere
      *  downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -6213,11 +6400,12 @@ public final Flowable<List<T>> buffer(int count) {
      * @param count
      *            the maximum size of each buffer before it should be emitted
      * @param skip
-     *            how many items emitted by the source {@code Publisher} should be skipped before starting a new
+     *            how many items emitted by the current {@code Flowable} should be skipped before starting a new
      *            buffer. Note that when {@code skip} and {@code count} are equal, this is the same operation as
      *            {@link #buffer(int)}.
-     * @return a {@code Flowable} that emits buffers for every {@code skip} item from the source {@code Publisher} and
+     * @return a {@code Flowable} that emits buffers for every {@code skip} item from the current {@code Flowable} and
      *         containing at most {@code count} items
+     * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6229,16 +6417,16 @@ public final Flowable<List<T>> buffer(int count, int skip) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits buffers every {@code skip} items, each containing {@code count} items. When the source
-     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
-     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits buffers every {@code skip} items, each containing {@code count} items. When the current
+     * {@code Flowable} completes, the resulting {@code Flowable} emits the current buffer and propagates the notification from the
+     * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and expects the source {@code Publisher} to honor it as
+     *  <dd>The operator honors backpressure from downstream and expects the current {@code Flowable} to honor it as
      *  well, although not enforced; violation <em>may</em> lead to {@link MissingBackpressureException} somewhere
      *  downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -6249,14 +6437,16 @@ public final Flowable<List<T>> buffer(int count, int skip) {
      * @param count
      *            the maximum size of each buffer before it should be emitted
      * @param skip
-     *            how many items emitted by the source {@code Publisher} should be skipped before starting a new
+     *            how many items emitted by the current {@code Flowable} should be skipped before starting a new
      *            buffer. Note that when {@code skip} and {@code count} are equal, this is the same operation as
      *            {@link #buffer(int)}.
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a {@code Flowable} that emits buffers for every {@code skip} item from the source {@code Publisher} and
+     * @return a {@code Flowable} that emits buffers for every {@code skip} item from the current {@code Flowable} and
      *         containing at most {@code count} items
+     * @throws NullPointerException if {@code bufferSupplier} is {@code null}
+     * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6271,16 +6461,16 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping buffers, each containing {@code count} items. When the source
-     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
-     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping buffers, each containing {@code count} items. When the current
+     * {@code Flowable} completes, the resulting {@code Flowable} emits the current buffer and propagates the notification from the
+     * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and expects the source {@code Publisher} to honor it as
+     *  <dd>The operator honors backpressure from downstream and expects the current {@code Flowable} to honor it as
      *  well, although not enforced; violation <em>may</em> lead to {@link MissingBackpressureException} somewhere
      *  downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -6294,7 +6484,9 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
      * @return a {@code Flowable} that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the source {@code Publisher}
+     *         {@code count} items from the current {@code Flowable}
+     * @throws NullPointerException if {@code bufferSupplier} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6306,11 +6498,11 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, @No
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} starts a new buffer periodically, as determined by the {@code timeskip} argument. It emits
-     * each buffer after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the notification from the
-     * source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event is passed on
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} starts a new buffer periodically, as determined by the {@code timeskip} argument. It emits
+     * each buffer after a fixed timespan, specified by the {@code timespan} argument. When the current
+     * {@code Flowable} completes, the resulting {@code Flowable} emits the current buffer and propagates the notification from the
+     * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.png" alt="">
@@ -6328,8 +6520,9 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, @No
      *            the period of time after which a new buffer will be created
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
-     * @return a {@code Flowable} that emits new buffers of items emitted by the source {@code Publisher} periodically after
+     * @return a {@code Flowable} that emits new buffers of items emitted by the current {@code Flowable} periodically after
      *         a fixed timespan has elapsed
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6341,11 +6534,11 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
      * specified {@code scheduler}. It emits each buffer after a fixed timespan, specified by the
-     * {@code timespan} argument. When the source {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer
-     * and propagates the notification from the source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError}
+     * {@code timespan} argument. When the current {@code Flowable} completes, the resulting {@code Flowable} emits the current buffer
+     * and propagates the notification from the current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError}
      * notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
@@ -6366,8 +6559,9 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a buffer
-     * @return a {@code Flowable} that emits new buffers of items emitted by the source {@code Publisher} periodically after
+     * @return a {@code Flowable} that emits new buffers of items emitted by the current {@code Flowable} periodically after
      *         a fixed timespan has elapsed
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6379,11 +6573,11 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} starts a new buffer periodically, as determined by the {@code timeskip} argument, and on the
      * specified {@code scheduler}. It emits each buffer after a fixed timespan, specified by the
-     * {@code timespan} argument. When the source {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer
-     * and propagates the notification from the source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError}
+     * {@code timespan} argument. When the current {@code Flowable} completes, the resulting {@code Flowable} emits the current buffer
+     * and propagates the notification from the current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError}
      * notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
@@ -6408,8 +6602,9 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a {@code Flowable} that emits new buffers of items emitted by the source {@code Publisher} periodically after
+     * @return a {@code Flowable} that emits new buffers of items emitted by the current {@code Flowable} periodically after
      *         a fixed timespan has elapsed
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code bufferSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6425,10 +6620,10 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan,
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
-     * {@code timespan} argument. When the source {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer
-     * and propagates the notification from the source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError}
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * {@code timespan} argument. When the current {@code Flowable} completes, the resulting {@code Flowable} emits the current buffer
+     * and propagates the notification from the current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError}
      * notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
@@ -6446,8 +6641,9 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan,
      *            buffer
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
-     *         {@code Publisher} within a fixed duration
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Flowable} within a fixed duration
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6459,11 +6655,11 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source {@code Publisher} completes, the resulting {@code Publisher} emits the current buffer and propagates the
-     * notification from the source {@code Publisher}. Note that if the source {@code Publisher} issues an {@code onError} notification the event
+     * first). When the current {@code Flowable} completes, the resulting {@code Flowable} emits the current buffer and propagates the
+     * notification from the current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event
      * is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.png" alt="">
@@ -6482,9 +6678,11 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit) {
      *            the unit of time which applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
-     *         {@code Publisher}, after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Flowable}, after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6496,12 +6694,12 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, int
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
      * {@code timespan} argument as measured on the specified {@code scheduler}, or a maximum size specified by
-     * the {@code count} argument (whichever is reached first). When the source {@code Publisher} completes, the resulting
-     * {@code Publisher} emits the current buffer and propagates the notification from the source {@code Publisher}. Note that if the
-     * source {@code Publisher} issues an {@code onError} notification the event is passed on immediately without first emitting the
+     * the {@code count} argument (whichever is reached first). When the current {@code Flowable} completes, the resulting
+     * {@code Flowable} emits the current buffer and propagates the notification from the current {@code Flowable}. Note that if the
+     * current {@code Flowable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
@@ -6522,9 +6720,11 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, int
      *            the {@code Scheduler} to use when determining the end and start of a buffer
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
-     *         {@code Publisher} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Flowable} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6536,12 +6736,12 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
      * {@code timespan} argument as measured on the specified {@code scheduler}, or a maximum size specified by
-     * the {@code count} argument (whichever is reached first). When the source {@code Publisher} completes, the resulting
-     * {@code Publisher} emits the current buffer and propagates the notification from the source {@code Publisher}. Note that if the
-     * source {@code Publisher} issues an {@code onError} notification the event is passed on immediately without first emitting the
+     * the {@code count} argument (whichever is reached first). When the current {@code Flowable} completes, the resulting
+     * {@code Flowable} emits the current buffer and propagates the notification from the current {@code Flowable}. Note that if the
+     * current {@code Flowable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
@@ -6568,9 +6768,11 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
      *            as the buffer
      * @param restartTimerOnMaxSize if {@code true}, the time window is restarted when the max capacity of the current buffer
      *            is reached
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
-     *         {@code Publisher} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Flowable} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code bufferSupplier} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6590,11 +6792,11 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping buffers, each of a fixed duration specified by the
-     * {@code timespan} argument and on the specified {@code scheduler}. When the source {@code Publisher} completes, the
-     * resulting {@code Publisher} emits the current buffer and propagates the notification from the source {@code Publisher}. Note that
-     * if the source {@code Publisher} issues an {@code onError} notification the event is passed on immediately without first emitting
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping buffers, each of a fixed duration specified by the
+     * {@code timespan} argument and on the specified {@code scheduler}. When the current {@code Flowable} completes, the
+     * resulting {@code Flowable} emits the current buffer and propagates the notification from the current {@code Flowable}. Note that
+     * if the current {@code Flowable} issues an {@code onError} notification the event is passed on immediately without first emitting
      * the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.s.png" alt="">
@@ -6613,8 +6815,9 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a buffer
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the source
-     *         {@code Publisher} within a fixed duration
+     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
+     *         {@code Flowable} within a fixed duration
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6626,10 +6829,10 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits buffers that it creates when the specified {@code openingIndicator} {@code Publisher} emits an
-     * item, and closes when the {@code Publisher} returned from {@code closingIndicator} emits an item. If any of the source
-     * {@code Publisher}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the event is passed
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits buffers that it creates when the specified {@code openingIndicator} {@link Publisher} emits an
+     * item, and closes when the {@code Publisher} returned from {@code closingIndicator} emits an item. If any of the current
+     * {@code PFlowable}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the event is passed
      * on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
@@ -6648,8 +6851,9 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
      * @param closingIndicator
      *            the {@link Function} that is used to produce a {@code Publisher} for every buffer created. When this
      *            {@code Publisher} emits an item, the associated buffer is emitted.
-     * @return a {@code Flowable} that emits buffers, containing items from the source {@code Publisher}, that are created
+     * @return a {@code Flowable} that emits buffers, containing items from the current {@code Flowable}, that are created
      *         and closed when the specified {@code Publisher}s emit items
+     * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6663,10 +6867,10 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
     }
 
     /**
-     * Returns a {@code Flowable} that emits buffers of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits buffers that it creates when the specified {@code openingIndicator} {@code Publisher} emits an
-     * item, and closes when the {@code Publisher} returned from {@code closingIndicator} emits an item. If any of the source
-     * {@code Publisher}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the event is passed
+     * Returns a {@code Flowable} that emits buffers of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits buffers that it creates when the specified {@code openingIndicator} {@link Publisher} emits an
+     * item, and closes when the {@code Publisher} returned from {@code closingIndicator} emits an item. If any of the current
+     * {@code Flowable}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the event is passed
      * on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
      * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
@@ -6689,8 +6893,9 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a {@code Flowable} that emits buffers, containing items from the source {@code Publisher}, that are created
+     * @return a {@code Flowable} that emits buffers, containing items from the current {@code Flowable}, that are created
      *         and closed when the specified {@code Publisher}s emit items
+     * @throws NullPointerException if {@code openingIndicator}, {@code closingIndicator} or {@code bufferSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6708,13 +6913,13 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
     }
 
     /**
-     * Returns a {@code Flowable} that emits non-overlapping buffered items from the source {@link Publisher} each time the
-     * specified boundary {@code Publisher} emits an item.
+     * Returns a {@code Flowable} that emits non-overlapping buffered items from the current {@code Flowable} each time the
+     * specified boundary {@link Publisher} emits an item.
      * <p>
      * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
      * <p>
      * Completion of either the source or the boundary {@code Publisher} causes the returned {@code Publisher} to emit the
-     * latest buffer and complete. If either the source {@code Publisher} or the boundary {@code Publisher} issues an {@code onError} notification
+     * latest buffer and complete. If either the current {@code Flowable} or the boundary {@code Publisher} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -6729,8 +6934,9 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
      *            the boundary value type (ignored)
      * @param boundaryIndicator
      *            the boundary {@code Publisher}
-     * @return a {@code Flowable} that emits buffered items from the source {@code Publisher} when the boundary {@code Publisher}
+     * @return a {@code Flowable} that emits buffered items from the current {@code Flowable} when the boundary {@code Publisher}
      *         emits an item
+     * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @see #buffer(Publisher, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6743,13 +6949,13 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
     }
 
     /**
-     * Returns a {@code Flowable} that emits non-overlapping buffered items from the source {@link Publisher} each time the
-     * specified boundary {@code Publisher} emits an item.
+     * Returns a {@code Flowable} that emits non-overlapping buffered items from the current {@code Flowable} each time the
+     * specified boundary {@link Publisher} emits an item.
      * <p>
      * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
      * <p>
      * Completion of either the source or the boundary {@code Publisher} causes the returned {@code Publisher} to emit the
-     * latest buffer and complete. If either the source {@code Publisher} or the boundary {@code Publisher} issues an {@code onError} notification
+     * latest buffer and complete. If either the current {@code Flowable} or the boundary {@code Publisher} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -6766,8 +6972,10 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
      *            the boundary {@code Publisher}
      * @param initialCapacity
      *            the initial capacity of each buffer chunk
-     * @return a {@code Flowable} that emits buffered items from the source {@code Publisher} when the boundary {@code Publisher}
+     * @return a {@code Flowable} that emits buffered items from the current {@code Flowable} when the boundary {@code Publisher}
      *         emits an item
+     * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
+     * @throws IllegalArgumentException if {@code initialCapacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      * @see #buffer(Publisher)
      */
@@ -6781,13 +6989,13 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
     }
 
     /**
-     * Returns a {@code Flowable} that emits non-overlapping buffered items from the source {@link Publisher} each time the
-     * specified boundary {@code Publisher} emits an item.
+     * Returns a {@code Flowable} that emits non-overlapping buffered items from the current {@code Flowable} each time the
+     * specified boundary {@link Publisher} emits an item.
      * <p>
      * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
      * <p>
      * Completion of either the source or the boundary {@code Publisher} causes the returned {@code Publisher} to emit the
-     * latest buffer and complete. If either the source {@code Publisher} or the boundary {@code Publisher} issues an {@code onError} notification
+     * latest buffer and complete. If either the current {@code Flowable} or the boundary {@code Publisher} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -6806,8 +7014,9 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a {@code Flowable} that emits buffered items from the source {@code Publisher} when the boundary {@code Publisher}
+     * @return a {@code Flowable} that emits buffered items from the current {@code Flowable} when the boundary {@code Publisher}
      *         emits an item
+     * @throws NullPointerException if {@code boundaryIndicator} or {@code bufferSupplier} is {@code null}
      * @see #buffer(Publisher, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6935,6 +7144,7 @@ public final Flowable<T> cache() {
      * @param initialCapacity hint for number of items to cache (for optimizing underlying data structure)
      * @return a {@code Flowable} that, when first subscribed to, caches all of its items and notifications for the
      *         benefit of subsequent subscribers
+     * @throws IllegalArgumentException if {@code initialCapacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #takeUntil(Predicate)
      * @see #takeUntil(Publisher)
@@ -6949,13 +7159,13 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher}, converted to the specified
+     * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable}, converted to the specified
      * type.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cast.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code cast} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6963,10 +7173,11 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
      *
      * @param <U> the output value type cast to
      * @param clazz
-     *            the target class type that {@code cast} will cast the items emitted by the source {@code Publisher}
-     *            into before emitting them from the resulting {@code Publisher}
-     * @return a {@code Flowable} that emits each item from the source {@code Publisher} after converting it to the
+     *            the target class type that {@code cast} will cast the items emitted by the current {@code Flowable}
+     *            into before emitting them from the resulting {@code Flowable}
+     * @return a {@code Flowable} that emits each item from the current {@code Flowable} after converting it to the
      *         specified type
+     * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
     @CheckReturnValue
@@ -7003,8 +7214,9 @@ public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies {@code state}
      *           accordingly
-     * @return a {@code Single} that emits the result of collecting the values emitted by the source {@code Publisher}
+     * @return a {@code Single} that emits the result of collecting the values emitted by the current {@code Flowable}
      *         into a single mutable data structure
+     * @throws NullPointerException if {@code initialItemSupplier} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see #collect(Collector)
      */
@@ -7043,8 +7255,9 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies {@code state}
      *           accordingly
-     * @return a {@code Single} that emits the result of collecting the values emitted by the source {@code Publisher}
+     * @return a {@code Single} that emits the result of collecting the values emitted by the current {@code Flowable}
      *         into a single mutable data structure
+     * @throws NullPointerException if {@code initialItem} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      */
     @CheckReturnValue
@@ -7062,8 +7275,8 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      * This method operates on the {@code Publisher} itself whereas {@link #lift} operates on the {@code Publisher}'s
      * {@link Subscriber}s.
      * <p>
-     * If the operator you are creating is designed to act on the individual items emitted by a source
-     * {@code Publisher}, use {@link #lift}. If your operator is designed to transform the source {@code Publisher} as a whole
+     * If the operator you are creating is designed to act on the individual items emitted by a current
+     * {@code Flowable}, use {@link #lift}. If your operator is designed to transform the current {@code Flowable} as a whole
      * (for instance, by applying a particular set of existing RxJava operators to it) use {@code compose}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7074,8 +7287,9 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      * </dl>
      *
      * @param <R> the value type of the output {@code Publisher}
-     * @param composer implements the function that transforms the source {@code Publisher}
-     * @return the source {@code Publisher}, transformed by the transformer function
+     * @param composer implements the function that transforms the current {@code Flowable}
+     * @return the current {@code Flowable}, transformed by the transformer function
+     * @throws NullPointerException if {@code composer} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
      */
     @SuppressWarnings("unchecked")
@@ -7089,8 +7303,8 @@ public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? e
 
     /**
      * Returns a new {@code Flowable} that emits items resulting from applying a function that you supply to each item
-     * emitted by the source {@link Publisher}, where that function returns a {@code Publisher}, and then emitting the items
-     * that result from concatenating those resulting {@code Publisher}s.
+     * emitted by the current {@code Flowable}, where that function returns a {@link Publisher}, and then emitting the items
+     * that result from concatenating those returned {@code Publisher}s.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <p>
@@ -7100,7 +7314,7 @@ public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? e
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
      *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
@@ -7110,10 +7324,11 @@ public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? e
      *
      * @param <R> the type of the inner {@code Publisher} sources and thus the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the source {@code Publisher} and concatenating the {@code Publisher}s obtained from this transformation
+     *         by the current {@code Flowable} and concatenating the {@code Publisher}s obtained from this transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -7126,8 +7341,8 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
 
     /**
      * Returns a new {@code Flowable} that emits items resulting from applying a function that you supply to each item
-     * emitted by the source {@link Publisher}, where that function returns a {@code Publisher}, and then emitting the items
-     * that result from concatenating those resulting {@code Publisher}s.
+     * emitted by the current {@code Flowable}, where that function returns a {@link Publisher}, and then emitting the items
+     * that result from concatenating those returned {@code Publisher}s.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <p>
@@ -7137,7 +7352,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
      *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
@@ -7147,12 +7362,14 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      *
      * @param <R> the type of the inner {@code Publisher} sources and thus the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
      * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the source {@code Publisher} and concatenating the {@code Publisher}s obtained from this transformation
+     *         by the current {@code Flowable} and concatenating the {@code Publisher}s obtained from this transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #concatMap(Function, int, Scheduler)
      */
@@ -7176,8 +7393,8 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
 
     /**
      * Returns a new {@code Flowable} that emits items resulting from applying a function (on a designated scheduler)
-     * that you supply to each item emitted by the source {@link Publisher}, where that function returns a {@code Publisher}, and then emitting the items
-     * that result from concatenating those resulting {@code Publisher}s.
+     * that you supply to each item emitted by the current {@code Flowable}, where that function returns a {@link Publisher}, and then emitting the items
+     * that result from concatenating those returned {@code Publisher}s.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
      * <p>
@@ -7186,7 +7403,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
      *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
@@ -7196,14 +7413,16 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      *
      * @param <R> the type of the inner {@code Publisher} sources and thus the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
      * @param scheduler
      *            the scheduler where the {@code mapper} function will be executed
      * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the source {@code Publisher} and concatenating the {@code Publisher}s obtained from this transformation
+     *         by the current {@code Flowable} and concatenating the {@code Publisher}s obtained from this transformation
+     * @throws NullPointerException if {@code mapper} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 3.0.0
      * @see #concatMap(Function, int)
@@ -7237,6 +7456,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
      * @return a new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletableDelayError(Function)
      * @since 2.2
      */
@@ -7269,6 +7489,8 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code CompletableSource}s.
      * @return a new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapCompletableDelayError(Function, boolean, int)
      * @since 2.2
      */
@@ -7300,6 +7522,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
      * @return a new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletable(Function, int)
      * @since 2.2
      */
@@ -7335,6 +7558,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *                   {@code CompletableSource} terminates and only then is
      *                   it emitted to the downstream.
      * @return a new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletable(Function)
      * @since 2.2
      */
@@ -7374,6 +7598,8 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code CompletableSource}s.
      * @return a new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapCompletable(Function, int)
      * @since 2.2
      */
@@ -7399,7 +7625,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
      *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
@@ -7409,7 +7635,8 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *
      * @param <R> the result value type
      * @param mapper the function that maps the items of this {@code Publisher} into the inner {@code Publisher}s.
-     * @return the new {@code Publisher} instance with the concatenation behavior
+     * @return the new {@code Flowable} instance with the concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapDelayError(Function, boolean, int, Scheduler)
      */
     @CheckReturnValue
@@ -7433,7 +7660,7 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
      *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
@@ -7445,10 +7672,12 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
      * @param mapper the function that maps the items of this {@code Publisher} into the inner {@code Publisher}s.
      * @param tillTheEnd
      *            if {@code true}, all errors from the outer and inner {@code Publisher} sources are delayed until the end,
-     *            if {@code false}, an error from the main source is signaled when the current {@code Publisher} source terminates
+     *            if {@code false}, an error from the main source is signaled when the current inner {@code Publisher} source terminates
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
-     * @return the new {@code Publisher} instance with the concatenation behavior
+     * @return the new {@code Flowable} instance with the concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapDelayError(Function, boolean, int, Scheduler)
      */
     @CheckReturnValue
@@ -7482,7 +7711,7 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the inner {@code Publisher}s are
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}. If any of the inner {@code Publisher}s doesn't honor
      *  backpressure, that <em>may</em> throw an {@link IllegalStateException} when that
      *  {@code Publisher} completes.</dd>
@@ -7494,12 +7723,14 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
      * @param mapper the function that maps the items of this {@code Publisher} into the inner {@code Publisher}s.
      * @param tillTheEnd
      *            if {@code true}, all errors from the outer and inner {@code Publisher} sources are delayed until the end,
-     *            if {@code false}, an error from the main source is signaled when the current {@code Publisher} source terminates
+     *            if {@code false}, an error from the main source is signaled when the current inner {@code Publisher} source terminates
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
      * @param scheduler
      *            the scheduler where the {@code mapper} function will be executed
-     * @return the new {@code Publisher} instance with the concatenation behavior
+     * @return the new {@code Flowable} instance with the concatenation behavior
+     * @throws NullPointerException if {@code mapper} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapDelayError(Function, boolean, int)
      * @since 3.0.0
      */
@@ -7520,7 +7751,7 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
      * {@code Publisher}.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
+     * inner {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
      * order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7532,7 +7763,8 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
      * @param <R> the value type
      * @param mapper the function that maps a sequence of values into a sequence of {@code Publisher}s that will be
      *               eagerly concatenated
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -7548,7 +7780,7 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
      * {@code Publisher}.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
+     * inner {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
      * order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7562,7 +7794,9 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
      *               eagerly concatenated
      * @param maxConcurrency the maximum number of concurrent subscribed {@code Publisher}s
      * @param prefetch hints about the number of expected values from each inner {@code Publisher}, must be positive
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
@@ -7582,7 +7816,7 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
      * {@code Publisher}.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
+     * inner {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
      * order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7596,8 +7830,9 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
      *               eagerly concatenated
      * @param tillTheEnd
      *            if {@code true}, all errors from the outer and inner {@code Publisher} sources are delayed until the end,
-     *            if {@code false}, an error from the main source is signaled when the current {@code Publisher} source terminates
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     *            if {@code false}, an error from the main source is signaled when the current inner {@code Publisher} source terminates
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -7611,10 +7846,10 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
 
     /**
      * Maps a sequence of values into {@link Publisher}s and concatenates these {@code Publisher}s eagerly into a single
-     * {@code Publisher}.
+     * {@code Flowable} sequence.
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
+     * inner {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them in
      * order, each one after the previous one completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -7633,7 +7868,9 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
      * @param maxConcurrency the maximum number of concurrent subscribed {@code Publisher}s
      * @param prefetch
      *               the number of elements to prefetch from each source {@code Publisher}
-     * @return the new {@code Publisher} instance with the specified concatenation behavior
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
@@ -7649,25 +7886,26 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
     }
 
     /**
-     * Returns a {@code Flowable} that concatenate each item emitted by the source {@link Publisher} with the values in an
+     * Returns a {@code Flowable} that concatenate each item emitted by the current {@code Flowable} with the values in an
      * {@link Iterable} corresponding to that item that is generated by a selector.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}s is
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting {@code Publisher}
+     *            the type of item emitted by the resulting {@code Flowable}
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            source {@code Publisher}
-     * @return a {@code Flowable} that emits the results of concatenating the items emitted by the source {@code Publisher} with
+     *            current {@code Flowable}
+     * @return a {@code Flowable} that emits the results of concatenating the items emitted by the current {@code Flowable} with
      *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -7679,27 +7917,29 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Returns a {@code Flowable} that concatenate each item emitted by the source {@link Publisher} with the values in an
+     * Returns a {@code Flowable} that concatenate each item emitted by the current {@code Flowable} with the values in an
      * {@link Iterable} corresponding to that item that is generated by a selector.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is
-     *  expected to honor backpressure as well. If the source {@code Publisher} violates the rule, the operator will
+     *  <dd>The operator honors backpressure from downstream. The current {@code Flowable} is
+     *  expected to honor backpressure as well. If the current {@code Flowable} violates the rule, the operator will
      *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <U>
-     *            the type of item emitted by the resulting {@code Publisher}
+     *            the type of item emitted by the resulting {@code Flowable}
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            source {@code Publisher}
+     *            current {@code Flowable}
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
-     * @return a {@code Flowable} that emits the results of concatenating the items emitted by the source {@code Publisher} with
+     * @return a {@code Flowable} that emits the results of concatenating the items emitted by the current {@code Flowable} with
      *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -7732,6 +7972,7 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybeDelayError(Function)
      * @see #concatMapMaybe(Function, int)
      * @since 2.2
@@ -7768,6 +8009,8 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code MaybeSource}s.
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapMaybe(Function)
      * @see #concatMapMaybeDelayError(Function, boolean, int)
      * @since 2.2
@@ -7802,6 +8045,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybe(Function)
      * @see #concatMapMaybeDelayError(Function, boolean)
      * @since 2.2
@@ -7840,6 +8084,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *                   {@code MaybeSource} terminates and only then is
      *                   it emitted to the downstream.
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybe(Function, int)
      * @see #concatMapMaybeDelayError(Function, boolean, int)
      * @since 2.2
@@ -7882,6 +8127,8 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code MaybeSource}s.
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapMaybe(Function, int)
      * @since 2.2
      */
@@ -7915,6 +8162,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingleDelayError(Function)
      * @see #concatMapSingle(Function, int)
      * @since 2.2
@@ -7951,6 +8199,8 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code SingleSource}s.
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapSingle(Function)
      * @see #concatMapSingleDelayError(Function, boolean, int)
      * @since 2.2
@@ -7985,6 +8235,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingle(Function)
      * @see #concatMapSingleDelayError(Function, boolean)
      * @since 2.2
@@ -8023,6 +8274,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *                   {@code SingleSource} terminates and only then is
      *                   it emitted to the downstream.
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingle(Function, int)
      * @see #concatMapSingleDelayError(Function, boolean, int)
      * @since 2.2
@@ -8065,6 +8317,8 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code SingleSource}s.
      * @return a new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapSingle(Function, int)
      * @since 2.2
      */
@@ -8079,15 +8333,15 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted from the current {@link Publisher}, then the next, one after
+     * Returns a {@code Flowable} that emits the items emitted from the current {@code Flowable}, then the next, one after
      * the other, without interleaving them.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. Both this and the {@code other} {@code Publisher}s
+     *  <dd>The operator honors backpressure from downstream. Both this and the {@code other} {@link Publisher}s
      *  are expected to honor backpressure as well. If any of then violates this rule, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -8096,6 +8350,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *            a {@code Publisher} to be concatenated after the current
      * @return a {@code Flowable} that emits items emitted by the two source {@code Publisher}s, one after the other,
      *         without interleaving them
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
     @CheckReturnValue
@@ -8122,6 +8377,7 @@ public final Flowable<T> concatWith(@NonNull Publisher<? extends T> other) {
      * <p>History: 2.1.10 - experimental
      * @param other the {@code SingleSource} whose signal should be emitted after this {@code Flowable} completes normally.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -8148,6 +8404,7 @@ public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
      * <p>History: 2.1.10 - experimental
      * @param other the {@code MaybeSource} whose signal should be emitted after this {@code Flowable} completes normally.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -8176,6 +8433,7 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
      * <p>History: 2.1.10 - experimental
      * @param other the {@code CompletableSource} to subscribe to once the current {@code Flowable} completes normally
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -8188,22 +8446,23 @@ public final Flowable<T> concatWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether the source {@link Publisher} emitted a
+     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether the current {@code Flowable} emitted a
      * specified item.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/contains.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code contains} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param item
-     *            the item to search for in the emissions from the source {@code Publisher}
-     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the source {@code Publisher},
-     *         or {@code false} if the source {@code Publisher} completes without emitting that item
+     *            the item to search for in the emissions from the current {@code Flowable}
+     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the current {@code Flowable},
+     *         or {@code false} if the current {@code Flowable} completes without emitting that item
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -8216,19 +8475,19 @@ public final Single<Boolean> contains(@NonNull Object item) {
     }
 
     /**
-     * Returns a {@link Single} that counts the total number of items emitted by the source {@link Publisher} and emits
+     * Returns a {@link Single} that counts the total number of items emitted by the current {@code Flowable} and emits
      * this count as a 64-bit {@link Long}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/longCount.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a single item: the number of items emitted by the source {@code Publisher} as a
+     * @return a {@code Single} that emits a single item: the number of items emitted by the current {@code Flowable} as a
      *         64-bit {@code Long} item
      * @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
      */
@@ -8241,13 +8500,13 @@ public final Single<Long> count() {
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
-     * source {@code Publisher} that are followed by another item within a computed debounce duration.
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, except that it drops items emitted by the
+     * current {@code Flowable} that are followed by another item within a computed debounce duration.
      * <p>
      * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.f.png" alt="">
      * <p>
      * The delivery of the item happens on the thread of the first {@code onNext} or {@code onComplete}
-     * signal of the generated {@code Publisher} sequence,
+     * signal of the generated {@link Publisher} sequence,
      * which if takes too long, a newer item may arrive from the upstream, causing the
      * generated sequence to get cancelled, which may also interrupt any downstream blocking operation
      * (yielding an {@code InterruptedException}). It is recommended processing items
@@ -8265,8 +8524,9 @@ public final Single<Long> count() {
      *            the debounce value type (ignored)
      * @param debounceIndicator
      *            function to retrieve a sequence that indicates the throttle duration for each item
-     * @return a {@code Flowable} that omits items emitted by the source {@code Publisher} that are followed by another item
+     * @return a {@code Flowable} that omits items emitted by the current {@code Flowable} that are followed by another item
      *         within a computed debounce duration
+     * @throws NullPointerException if {@code debounceIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      */
@@ -8280,12 +8540,12 @@ public final <U> Flowable<T> debounce(@NonNull Function<? super T, ? extends Pub
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
-     * source {@code Publisher} that are followed by newer items before a timeout value expires. The timer resets on
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, except that it drops items emitted by the
+     * current {@code Flowable} that are followed by newer items before a timeout value expires. The timer resets on
      * each emission.
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source {@code Publisher} faster than the timeout then no items
-     * will be emitted by the resulting {@code Publisher}.
+     * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Flowable}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.png" alt="">
      * <p>
@@ -8303,13 +8563,14 @@ public final <U> Flowable<T> debounce(@NonNull Function<? super T, ? extends Pub
      * </dl>
      *
      * @param timeout
-     *            the length of the window of time that must pass after the emission of an item from the source
-     *            {@code Publisher} in which that {@code Publisher} emits no items in order for the item to be emitted by the
-     *            resulting {@code Publisher}
+     *            the length of the window of time that must pass after the emission of an item from the current
+     *            {@code Flowable} in which it emits no items in order for the item to be emitted by the
+     *            resulting {@code Flowable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return a {@code Flowable} that filters out items from the source {@code Publisher} that are too quickly followed by
+     * @return a {@code Flowable} that filters out items from the current {@code Flowable} that are too quickly followed by
      *         newer items
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #throttleWithTimeout(long, TimeUnit)
@@ -8323,12 +8584,12 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
-     * source {@code Publisher} that are followed by newer items before a timeout value expires on a specified
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, except that it drops items emitted by the
+     * current {@code Flowable} that are followed by newer items before a timeout value expires on a specified
      * {@link Scheduler}. The timer resets on each emission.
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source {@code Publisher} faster than the timeout then no items
-     * will be emitted by the resulting {@code Publisher}.
+     * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Flowable}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.s.png" alt="">
      * <p>
@@ -8346,15 +8607,16 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit) {
      * </dl>
      *
      * @param timeout
-     *            the time each item has to be "the most recent" of those emitted by the source {@code Publisher} to
+     *            the time each item has to be "the most recent" of those emitted by the current {@code Flowable} to
      *            ensure that it's not dropped
      * @param unit
      *            the unit of time for the specified {@code timeout}
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return a {@code Flowable} that filters out items from the source {@code Publisher} that are too quickly followed by
+     * @return a {@code Flowable} that filters out items from the current {@code Flowable} that are too quickly followed by
      *         newer items
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #throttleWithTimeout(long, TimeUnit, Scheduler)
@@ -8370,14 +8632,14 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} or a specified default item
-     * if the source {@code Publisher} is empty.
+     * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} or a specified default item
+     * if the current {@code Flowable} is empty.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>If the source {@code Publisher} is empty, this operator is guaranteed to honor backpressure from downstream.
-     *  If the source {@code Publisher} is non-empty, it is expected to honor backpressure as well; if the rule is violated,
+     *  <dd>If the current {@code Flowable} is empty, this operator is guaranteed to honor backpressure from downstream.
+     *  If the current {@code Flowable} is non-empty, it is expected to honor backpressure as well; if the rule is violated,
      *  a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.
      *  </dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -8385,9 +8647,10 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull
      * </dl>
      *
      * @param defaultItem
-     *            the item to emit if the source {@code Publisher} emits no items
-     * @return a {@code Flowable} that emits either the specified default item if the source {@code Publisher} emits no
-     *         items, or the items emitted by the source {@code Publisher}
+     *            the item to emit if the current {@code Flowable} emits no items
+     * @return a {@code Flowable} that emits either the specified default item if the current {@code Flowable} emits no
+     *         items, or the items emitted by the current {@code Flowable}
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defaultifempty.html">ReactiveX operators documentation: DefaultIfEmpty</a>
      */
     @CheckReturnValue
@@ -8400,16 +8663,16 @@ public final Flowable<T> defaultIfEmpty(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a {@code Flowable} that delays the emissions of the source {@link Publisher} via another {@code Publisher} on a
+     * Returns a {@code Flowable} that delays the emissions of the current {@code Flowable} via another {@link Publisher} on a
      * per-item basis.
      * <p>
      * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.o.png" alt="">
      * <p>
-     * <em>Note:</em> the resulting {@code Publisher} will immediately propagate any {@code onError} notification
-     * from the source {@code Publisher}.
+     * <em>Note:</em> the resulting {@code Flowable} will immediately propagate any {@code onError} notification
+     * from the current {@code Flowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.
+     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.
      *  All of the other {@code Publisher}s supplied by the function are consumed
      *  in an unbounded manner (i.e., no backpressure applied to them).</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -8419,11 +8682,12 @@ public final Flowable<T> defaultIfEmpty(@NonNull T defaultItem) {
      * @param <U>
      *            the item delay value type (ignored)
      * @param itemDelayIndicator
-     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}, which is
-     *            then used to delay the emission of that item by the resulting {@code Publisher} until the {@code Publisher}
+     *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable}, which is
+     *            then used to delay the emission of that item by the resulting {@code Flowable} until the {@code Publisher}
      *            returned from {@code itemDelay} emits an item
-     * @return a {@code Flowable} that delays the emissions of the source {@code Publisher} via another {@code Publisher} on a
+     * @return a {@code Flowable} that delays the emissions of the current {@code Flowable} via another {@code Publisher} on a
      *         per-item basis
+     * @throws NullPointerException if {@code itemDelayIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8436,13 +8700,13 @@ public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publis
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} shifted forward in time by a
-     * specified delay. The {@code onError} notification from the source {@code Publisher} is not delayed.
+     * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} shifted forward in time by a
+     * specified delay. The {@code onError} notification from the current {@code Flowable} is not delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.</dd>
+     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -8451,7 +8715,8 @@ public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publis
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return the source {@code Publisher} shifted in time by the specified delay
+     * @return the current {@code Flowable} shifted in time by the specified delay
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8463,13 +8728,13 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} shifted forward in time by a
+     * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} shifted forward in time by a
      * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.</dd>
+     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -8481,7 +8746,8 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit) {
      * @param delayError
      *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
      *            if {@code false}, the upstream exception is signaled immediately
-     * @return the source {@code Publisher} shifted in time by the specified delay
+     * @return the current {@code Flowable} shifted in time by the specified delay
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8493,13 +8759,13 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, boolean delay
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} shifted forward in time by a
-     * specified delay. The {@code onError} notification from the source {@code Publisher} is not delayed.
+     * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} shifted forward in time by a
+     * specified delay. The {@code onError} notification from the current {@code Flowable} is not delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.</dd>
+     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -8510,7 +8776,8 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, boolean delay
      *            the time unit of {@code delay}
      * @param scheduler
      *            the {@code Scheduler} to use for delaying
-     * @return the source {@code Publisher} shifted in time by the specified delay
+     * @return the current {@code Flowable} shifted in time by the specified delay
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8522,13 +8789,13 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} shifted forward in time by a
+     * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} shifted forward in time by a
      * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.</dd>
+     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -8542,7 +8809,8 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      * @param delayError
      *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
      *            if {@code false}, the upstream exception is signaled immediately
-     * @return the source {@code Publisher} shifted in time by the specified delay
+     * @return the current {@code Flowable} shifted in time by the specified delay
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8557,16 +8825,16 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
     }
 
     /**
-     * Returns a {@code Flowable} that delays the subscription to and emissions from the source {@link Publisher} via another
-     * {@code Publisher} on a per-item basis.
+     * Returns a {@code Flowable} that delays the subscription to and emissions from the current {@code Flowable} via another
+     * {@link Publisher} on a per-item basis.
      * <p>
      * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.oo.png" alt="">
      * <p>
-     * <em>Note:</em> the resulting {@code Publisher} will immediately propagate any {@code onError} notification
-     * from the source {@code Publisher}.
+     * <em>Note:</em> the resulting {@code Flowable} will immediately propagate any {@code onError} notification
+     * from the current {@code Flowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.
+     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.
      *  All of the other {@code Publisher}s supplied by the functions are consumed
      *  in an unbounded manner (i.e., no backpressure applied to them).</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -8578,13 +8846,13 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      * @param <V>
      *            the item delay value type (ignored)
      * @param subscriptionIndicator
-     *            a function that returns a {@code Publisher} that triggers the subscription to the source {@code Publisher}
+     *            a function that returns a {@code Publisher} that triggers the subscription to the current {@code Flowable}
      *            once it emits any item
      * @param itemDelayIndicator
-     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}, which is
-     *            then used to delay the emission of that item by the resulting {@code Publisher} until the {@code Publisher}
+     *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable}, which is
+     *            then used to delay the emission of that item by the resulting {@code Flowable} until the {@code Publisher}
      *            returned from {@code itemDelay} emits an item
-     * @return a {@code Flowable} that delays the subscription and emissions of the source {@code Publisher} via another
+     * @return a {@code Flowable} that delays the subscription and emissions of the current {@code Flowable} via another
      *         {@code Publisher} on a per-item basis
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8613,6 +8881,7 @@ public final <U, V> Flowable<T> delay(@NonNull Publisher<U> subscriptionIndicato
      *        to this {@code Publisher}.
      * @return a {@code Flowable} that delays the subscription to this {@code Publisher}
      *         until the other {@code Publisher} emits an element or completes normally.
+     * @throws NullPointerException if {@code subscriptionIndicator} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -8625,12 +8894,12 @@ public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptio
     }
 
     /**
-     * Returns a {@code Flowable} that delays the subscription to the source {@link Publisher} by a given amount of time.
+     * Returns a {@code Flowable} that delays the subscription to the current {@code Flowable} by a given amount of time.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.</dd>
+     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code delaySubscription} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -8639,7 +8908,8 @@ public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptio
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
-     * @return a {@code Flowable} that delays the subscription to the source {@code Publisher} by the given amount
+     * @return a {@code Flowable} that delays the subscription to the current {@code Flowable} by the given amount
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8651,13 +8921,13 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that delays the subscription to the source {@link Publisher} by a given amount of time,
+     * Returns a {@code Flowable} that delays the subscription to the current {@code Flowable} by a given amount of time,
      * both waiting and subscribing on a given {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the source {@code Publisher}.</dd>
+     *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
@@ -8668,8 +8938,9 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
      *            the time unit of {@code delay}
      * @param scheduler
      *            the {@code Scheduler} on which the waiting and subscription will happen
-     * @return a {@code Flowable} that delays the subscription to the source {@code Publisher} by a given
+     * @return a {@code Flowable} that delays the subscription to the current {@code Flowable} by a given
      *         amount, waiting and subscribing on the given {@code Scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8715,7 +8986,7 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @
      * with a {@link #never()} source.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code dematerialize} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8727,6 +8998,7 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @
      * the corresponding {@code Subscriber} event to the downstream.
      * @return a {@code Flowable} that emits the items and notifications embedded in the {@code Notification} objects
      *         selected from the items emitted by the source {@code Flowable}
+     * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Dematerialize</a>
      * @since 3.0.0
      */
@@ -8740,7 +9012,7 @@ public final <R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T,
     }
 
     /**
-     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct
+     * Returns a {@code Flowable} that emits all items emitted by the current {@code Flowable} that are distinct
      * based on {@link Object#equals(Object)} comparison.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.png" alt="">
@@ -8760,13 +9032,13 @@ public final <R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T,
      * to the {@link #distinct(Function, Supplier)} overload.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code distinct} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits only those items emitted by the source {@code Publisher} that are distinct from
+     * @return a {@code Flowable} that emits only those items emitted by the current {@code Flowable} that are distinct from
      *         each other
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function)
@@ -8782,7 +9054,7 @@ public final Flowable<T> distinct() {
     }
 
     /**
-     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct according
+     * Returns a {@code Flowable} that emits all items emitted by the current {@code Flowable} that are distinct according
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
@@ -8803,7 +9075,7 @@ public final Flowable<T> distinct() {
      * to the {@link #distinct(Function, Supplier)} overload.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code distinct} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8813,7 +9085,8 @@ public final Flowable<T> distinct() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return a {@code Flowable} that emits those items emitted by the source {@code Publisher} that have distinct keys
+     * @return a {@code Flowable} that emits those items emitted by the current {@code Flowable} that have distinct keys
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function, Supplier)
      */
@@ -8826,7 +9099,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
     }
 
     /**
-     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct according
+     * Returns a {@code Flowable} that emits all items emitted by the current {@code Flowable} that are distinct according
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
@@ -8836,7 +9109,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      * a meaningful comparison between the key objects as the default Java implementation only considers reference equivalence.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code distinct} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8849,7 +9122,8 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      * @param collectionSupplier
      *            function called for each individual {@link Subscriber} to return a {@link Collection} subtype for holding the extracted
      *            keys and whose add() method's return indicates uniqueness.
-     * @return a {@code Flowable} that emits those items emitted by the source {@code Publisher} that have distinct keys
+     * @return a {@code Flowable} that emits those items emitted by the current {@code Flowable} that have distinct keys
+     * @throws NullPointerException if {@code keySelector} or {@code collectionSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
     @CheckReturnValue
@@ -8864,7 +9138,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
     }
 
     /**
-     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct from their
+     * Returns a {@code Flowable} that emits all items emitted by the current {@code Flowable} that are distinct from their
      * immediate predecessors based on {@link Object#equals(Object)} comparison.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
@@ -8886,13 +9160,13 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      * for example using {@code map(CharSequence::toString)} or {@code map(list -> Collections.unmodifiableList(new ArrayList<>(list)))}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code distinctUntilChanged} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits those items from the source {@code Publisher} that are distinct from their
+     * @return a {@code Flowable} that emits those items from the current {@code Flowable} that are distinct from their
      *         immediate predecessors
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinctUntilChanged(BiPredicate)
@@ -8906,7 +9180,7 @@ public final Flowable<T> distinctUntilChanged() {
     }
 
     /**
-     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct from their
+     * Returns a {@code Flowable} that emits all items emitted by the current {@code Flowable} that are distinct from their
      * immediate predecessors, according to a key selector function and based on {@link Object#equals(Object)} comparison
      * of those objects returned by the key selector function.
      * <p>
@@ -8930,7 +9204,7 @@ public final Flowable<T> distinctUntilChanged() {
      * for example using {@code map(CharSequence::toString)} or {@code map(list -> Collections.unmodifiableList(new ArrayList<>(list)))}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code distinctUntilChanged} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8940,8 +9214,9 @@ public final Flowable<T> distinctUntilChanged() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return a {@code Flowable} that emits those items from the source {@code Publisher} whose keys are distinct from
+     * @return a {@code Flowable} that emits those items from the current {@code Flowable} whose keys are distinct from
      *         those of their immediate predecessors
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
     @CheckReturnValue
@@ -8954,7 +9229,7 @@ public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K
     }
 
     /**
-     * Returns a {@code Flowable} that emits all items emitted by the source {@link Publisher} that are distinct from their
+     * Returns a {@code Flowable} that emits all items emitted by the current {@code Flowable} that are distinct from their
      * immediate predecessors when compared with each other via the provided comparator function.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
@@ -8970,7 +9245,7 @@ public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K
      * for example using {@code map(CharSequence::toString)} or {@code map(list -> Collections.unmodifiableList(new ArrayList<>(list)))}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code distinctUntilChanged} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8978,8 +9253,9 @@ public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K
      *
      * @param comparer the function that receives the previous item and the current item and is
      *                   expected to return {@code true} if the two are equal, thus skipping the current value.
-     * @return a {@code Flowable} that emits those items from the source {@code Publisher} that are distinct from their
+     * @return a {@code Flowable} that emits those items from the current {@code Flowable} that are distinct from their
      *         immediate predecessors
+     * @throws NullPointerException if {@code comparer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @since 2.0
      */
@@ -9001,7 +9277,7 @@ public final Flowable<T> distinctUntilChanged(@NonNull BiPredicate<? super T, ?
      * should be thread-safe.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doFinally} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9011,6 +9287,7 @@ public final Flowable<T> distinctUntilChanged(@NonNull BiPredicate<? super T, ?
      * </dl>
      * <p>History: 2.0.1 - experimental
      * @param onFinally the action called when this {@code Flowable} terminates or gets canceled
+     * @throws NullPointerException if {@code onFinally} is {@code null}
      * @return the new {@code Flowable} instance
      * @since 2.1
      */
@@ -9029,7 +9306,7 @@ public final Flowable<T> doFinally(@NonNull Action onFinally) {
      * should be thread-safe.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterNext} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9039,6 +9316,7 @@ public final Flowable<T> doFinally(@NonNull Action onFinally) {
      * </dl>
      * <p>History: 2.0.1 - experimental
      * @param onAfterNext the {@link Consumer} that will be called after emitting an item from upstream to the downstream
+     * @throws NullPointerException if {@code onAfterNext} is {@code null}
      * @return the new {@code Flowable} instance
      * @since 2.1
      */
@@ -9058,16 +9336,17 @@ public final Flowable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext) {
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/finallyDo.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterTerminate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onAfterTerminate
-     *            an {@code Action} to be invoked when the source {@code Publisher} finishes
-     * @return a {@code Flowable} that emits the same items as the source {@code Publisher}, then invokes the
+     *            an {@code Action} to be invoked when the current {@code Flowable} finishes
+     * @return a {@code Flowable} that emits the same items as the current {@code Flowable}, then invokes the
      *         {@code Action}
+     * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doOnTerminate(Action)
      */
@@ -9099,8 +9378,9 @@ public final Flowable<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
      * </dl>
      *
      * @param onCancel
-     *            the action that gets called when the source {@link Publisher}'s {@link Subscription} is canceled
-     * @return the source {@code Publisher} modified so as to call this {@code Action} when appropriate
+     *            the action that gets called when the current {@code Flowable}'s {@link Subscription} is canceled
+     * @return the current {@code Flowable} modified so as to call this {@code Action} when appropriate
+     * @throws NullPointerException if {@code onCancel} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9112,20 +9392,21 @@ public final Flowable<T> doOnCancel(@NonNull Action onCancel) {
     }
 
     /**
-     * Modifies the source {@link Publisher} so that it invokes an action when it calls {@code onComplete}.
+     * Modifies the current {@code Flowable} so that it invokes an action when it calls {@code onComplete}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnComplete} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onComplete
-     *            the action to invoke when the source {@code Publisher} calls {@code onComplete}
-     * @return the source {@code Publisher} with the side-effecting behavior applied
+     *            the action to invoke when the current {@code Flowable} calls {@code onComplete}
+     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9144,13 +9425,14 @@ public final Flowable<T> doOnComplete(@NonNull Action onComplete) {
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source {@code Publisher} with the side-effecting behavior applied
+     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onNext}, {@code onError}, {@code onComplete} or {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9167,20 +9449,21 @@ private Flowable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Consu
     }
 
     /**
-     * Modifies the source {@link Publisher} so that it invokes an action for each item it emits.
+     * Modifies the current {@code Flowable} so that it invokes an action for each item it emits.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onNotification
-     *            the action to invoke for each item emitted by the source {@code Publisher}
-     * @return the source {@code Publisher} with the side-effecting behavior applied
+     *            the action to invoke for each item emitted by the current {@code Flowable}
+     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onNotification} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9198,7 +9481,7 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
     }
 
     /**
-     * Modifies the source {@link Publisher} so that it notifies a {@link Subscriber} for each item and terminal event it emits.
+     * Modifies the current {@code Flowable} so that it notifies a {@link Subscriber} for each item and terminal event it emits.
      * <p>
      * In case the {@code onError} of the supplied {@code Subscriber} throws, the downstream will receive a composite
      * exception containing the original exception and the exception thrown by {@code onError}. If either the
@@ -9208,7 +9491,7 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.o.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9217,7 +9500,8 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
      * @param subscriber
      *            the {@code Subscriber} to be notified about {@code onNext}, {@code onError} and {@code onComplete} events on its
      *            respective methods before the actual downstream {@code Subscriber} gets notified.
-     * @return the source {@code Publisher} with the side-effecting behavior applied
+     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code subscriber} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9234,7 +9518,7 @@ public final Flowable<T> doOnEach(@NonNull Subscriber<? super T> subscriber) {
     }
 
     /**
-     * Modifies the source {@link Publisher} so that it invokes an action if it calls {@code onError}.
+     * Modifies the current {@code Flowable} so that it invokes an action if it calls {@code onError}.
      * <p>
      * In case the {@code onError} action throws, the downstream will receive a composite exception containing
      * the original exception and the exception thrown by {@code onError}.
@@ -9242,15 +9526,16 @@ public final Flowable<T> doOnEach(@NonNull Subscriber<? super T> subscriber) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnError.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onError
-     *            the action to invoke if the source {@code Publisher} calls {@code onError}
-     * @return the source {@code Publisher} with the side-effecting behavior applied
+     *            the action to invoke if the current {@code Flowable} calls {@code onError}
+     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onError} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9269,7 +9554,7 @@ public final Flowable<T> doOnError(@NonNull Consumer<? super Throwable> onError)
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnLifecycle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9281,7 +9566,8 @@ public final Flowable<T> doOnError(@NonNull Consumer<? super Throwable> onError)
      *              a {@link LongConsumer} called with the request amount sent via {@link Subscription#request(long)}
      * @param onCancel
      *              called when the downstream cancels the {@code Subscription} via {@link Subscription#cancel()}
-     * @return the source {@code Publisher} with the side-effecting behavior applied
+     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onSubscribe}, {@code onRequest} or {@code onCancel} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9297,20 +9583,21 @@ public final Flowable<T> doOnLifecycle(@NonNull Consumer<? super Subscription> o
     }
 
     /**
-     * Modifies the source {@link Publisher} so that it invokes an action when it calls {@code onNext}.
+     * Modifies the current {@code Flowable} so that it invokes an action when it calls {@code onNext}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onNext
-     *            the action to invoke when the source {@code Publisher} calls {@code onNext}
-     * @return the source {@code Publisher} with the side-effecting behavior applied
+     *            the action to invoke when the current {@code Flowable} calls {@code onNext}
+     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9323,23 +9610,24 @@ public final Flowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Modifies the source {@link Publisher} so that it invokes the given action when it receives a
+     * Modifies the current {@code Flowable} so that it invokes the given action when it receives a
      * request for more items.
      * <p>
      * <b>Note:</b> This operator is for tracing the internal behavior of back-pressure request
      * patterns and generally intended for debugging use.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnRequest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onRequest
-     *            the action that gets called when a {@link Subscriber} requests items from this
-     *            {@code Publisher}
-     * @return the source {@code Publisher} modified so as to call this {@link Action} when appropriate
+     *            the action that gets called when a {@link Subscriber} requests items from the current
+     *            {@code Flowable}
+     * @return the current {@code Flowable} modified so as to call this {@link Action} when appropriate
+     * @throws NullPointerException if {@code onRequest} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators
      *      documentation: Do</a>
      * @since 2.0
@@ -9353,15 +9641,15 @@ public final Flowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
     }
 
     /**
-     * Modifies the source {@link Publisher} so that it invokes the given action when it is subscribed from
+     * Modifies the current {@code Flowable} so that it invokes the given action when it is subscribed from
      * its subscribers. Each subscription will result in an invocation of the given action except when the
-     * source {@code Publisher} is reference counted, in which case the source {@code Publisher} will invoke
+     * current {@code Flowable} is reference counted, in which case the current {@code Flowable} will invoke
      * the given action for the first subscription.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSubscribe.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9369,7 +9657,8 @@ public final Flowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
      *
      * @param onSubscribe
      *            the {@link Consumer} that gets called when a {@link Subscriber} subscribes to the current {@code Flowable}
-     * @return the source {@code Publisher} modified so as to call this {@code Consumer} when appropriate
+     * @return the current {@code Flowable} modified so as to call this {@code Consumer} when appropriate
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
     @CheckReturnValue
@@ -9381,7 +9670,7 @@ public final Flowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> o
     }
 
     /**
-     * Modifies the source {@link Publisher} so that it invokes an action when it calls {@code onComplete} or
+     * Modifies the current {@code Flowable} so that it invokes an action when it calls {@code onComplete} or
      * {@code onError}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.png" alt="">
@@ -9390,15 +9679,16 @@ public final Flowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> o
      * {@code onError} notification.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
      *  backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnTerminate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onTerminate
-     *            the action to invoke when the source {@code Publisher} calls {@code onComplete} or {@code onError}
-     * @return the source {@code Publisher} with the side-effecting behavior applied
+     *            the action to invoke when the current {@code Flowable} calls {@code onComplete} or {@code onError}
+     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @throws NullPointerException if {@code onTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doAfterTerminate(Action)
      */
@@ -9418,7 +9708,7 @@ public final Flowable<T> doOnTerminate(@NonNull Action onTerminate) {
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAt.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code elementAt} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -9426,7 +9716,7 @@ public final Flowable<T> doOnTerminate(@NonNull Action onTerminate) {
      * @param index
      *            the zero-based index of the item to retrieve
      * @return a {@code Maybe} that emits a single item: the item at the specified position in the sequence of
-     *         those emitted by the source {@code Publisher}
+     *         those emitted by the current {@code Flowable}
      * @throws IndexOutOfBoundsException if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
      */
@@ -9448,7 +9738,7 @@ public final Maybe<T> elementAt(long index) {
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrDefault.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code elementAt} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -9457,8 +9747,9 @@ public final Maybe<T> elementAt(long index) {
      *            the zero-based index of the item to retrieve
      * @param defaultItem
      *            the default item
-     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the source
-     *         {@code Publisher}, or the default item if that index is outside the bounds of the source sequence
+     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the current
+     *         {@code Flowable}, or the default item if that index is outside the bounds of the source sequence
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @throws IndexOutOfBoundsException
      *             if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
@@ -9482,15 +9773,15 @@ public final Single<T> elementAt(long index, @NonNull T defaultItem) {
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrDefault.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code elementAtOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param index
      *            the zero-based index of the item to retrieve
-     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the source
-     *         {@code Publisher}, or the default item if that index is outside the bounds of the source sequence
+     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the current
+     *         {@code Flowable}, or the default item if that index is outside the bounds of the source sequence
      * @throws IndexOutOfBoundsException
      *             if {@code index} is less than 0
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
@@ -9512,17 +9803,18 @@ public final Single<T> elementAtOrError(long index) {
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code filter} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates each item emitted by the source {@code Publisher}, returning {@code true}
+     *            a function that evaluates each item emitted by the current {@code Flowable}, returning {@code true}
      *            if it passes the filter
-     * @return a {@code Flowable} that emits only those items emitted by the source {@code Publisher} that the filter
+     * @return a {@code Flowable} that emits only those items emitted by the current {@code Flowable} that the filter
      *         evaluates as {@code true}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
     @CheckReturnValue
@@ -9541,7 +9833,7 @@ public final Flowable<T> filter(@NonNull Predicate<? super T> predicate) {
      * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstElement.m.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code firstElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -9564,15 +9856,16 @@ public final Maybe<T> firstElement() {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code first} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param defaultItem
-     *            the default item to emit if the source {@code Publisher} doesn't emit anything
+     *            the default item to emit if the current {@code Flowable} doesn't emit anything
      * @return a {@code Single} that emits only the very first item from the source, or a default item if the
-     *         source {@code Publisher} completes without emitting any items
+     *         current {@code Flowable} completes without emitting any items
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -9590,7 +9883,7 @@ public final Single<T> first(@NonNull T defaultItem) {
      * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrError.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in a bounded manner.</dd>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code firstOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -9608,7 +9901,7 @@ public final Single<T> firstOrError() {
 
     /**
      * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
-     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * by the current {@code Flowable}, where that function returns a {@link Publisher}, and then merging those resulting
      * {@code Publisher}s and emitting the results of this merger.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt="">
@@ -9624,11 +9917,12 @@ public final Single<T> firstOrError() {
      *
      * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
+     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -9641,7 +9935,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
 
     /**
      * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
-     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * by the current {@code Flowable}, where that function returns a {@link Publisher}, and then merging those resulting
      * {@code Publisher}s and emitting the results of this merger.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt="">
@@ -9657,14 +9951,15 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      *
      * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
+     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -9677,7 +9972,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
 
     /**
      * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
-     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * by the current {@code Flowable}, where that function returns a {@link Publisher}, and then merging those resulting
      * {@code Publisher}s and emitting the results of this merger, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
@@ -9694,13 +9989,15 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      *
      * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
+     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -9714,7 +10011,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
 
     /**
      * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
-     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * by the current {@code Flowable}, where that function returns a {@link Publisher}, and then merging those resulting
      * {@code Publisher}s and emitting the results of this merger, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
@@ -9731,7 +10028,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      *
      * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
@@ -9739,8 +10036,9 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
+     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -9754,7 +10052,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
 
     /**
      * Returns a {@code Flowable} that emits items based on applying a function that you supply to each item emitted
-     * by the source {@link Publisher}, where that function returns a {@code Publisher}, and then merging those resulting
+     * by the current {@code Flowable}, where that function returns a {@link Publisher}, and then merging those resulting
      * {@code Publisher}s and emitting the results of this merger, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
@@ -9771,7 +10069,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      *
      * @param <R> the value type of the inner {@code Publisher}s and the output type
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
@@ -9781,8 +10079,10 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * @param bufferSize
      *            the number of elements to prefetch from each inner {@code Publisher}
      * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the source {@code Publisher} and merging the results of the {@code Publisher}s obtained from this
+     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
      *         transformation
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -9807,8 +10107,8 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a {@code Flowable} that applies a function to each item emitted or notification raised by the source
-     * {@link Publisher} and then flattens the {@code Publisher}s returned from these functions and emits the resulting items.
+     * Returns a {@code Flowable} that applies a function to each item emitted or notification raised by the current
+     * {@code Flowable} and then flattens the {@link Publisher}s returned from these functions and emits the resulting items.
      * <p>
      * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt="">
      * <dl>
@@ -9824,15 +10124,16 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * @param <R>
      *            the result type
      * @param onNextMapper
-     *            a function that returns a {@code Publisher} to merge for each item emitted by the source {@code Publisher}
+     *            a function that returns a {@code Publisher} to merge for each item emitted by the current {@code Flowable}
      * @param onErrorMapper
-     *            a function that returns a {@code Publisher} to merge for an {@code onError} notification from the source
-     *            {@code Publisher}
+     *            a function that returns a {@code Publisher} to merge for an {@code onError} notification from the current
+     *            {@code Flowable}
      * @param onCompleteSupplier
-     *            a function that returns a {@code Publisher} to merge for an {@code onComplete} notification from the source
-     *            {@code Publisher}
+     *            a function that returns a {@code Publisher} to merge for an {@code onComplete} notification from the current
+     *            {@code Flowable}
      * @return a {@code Flowable} that emits the results of merging the {@code Publisher}s returned from applying the
-     *         specified functions to the emissions and notifications of the source {@code Publisher}
+     *         specified functions to the emissions and notifications of the current {@code Flowable}
+     * @throws NullPointerException if {@code onNextMapper}, {@code onErrorMapper} or {@code onCompleteSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -9850,8 +10151,8 @@ public final <R> Flowable<R> flatMap(
     }
 
     /**
-     * Returns a {@code Flowable} that applies a function to each item emitted or notification raised by the source
-     * {@link Publisher} and then flattens the {@code Publisher}s returned from these functions and emits the resulting items,
+     * Returns a {@code Flowable} that applies a function to each item emitted or notification raised by the current
+     * {@code Flowable} and then flattens the {@link Publisher}s returned from these functions and emits the resulting items,
      * while limiting the maximum number of concurrent subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt=""> -->
@@ -9868,17 +10169,19 @@ public final <R> Flowable<R> flatMap(
      * @param <R>
      *            the result type
      * @param onNextMapper
-     *            a function that returns a {@code Publisher} to merge for each item emitted by the source {@code Publisher}
+     *            a function that returns a {@code Publisher} to merge for each item emitted by the current {@code Flowable}
      * @param onErrorMapper
-     *            a function that returns a {@code Publisher} to merge for an {@code onError} notification from the source
-     *            {@code Publisher}
+     *            a function that returns a {@code Publisher} to merge for an {@code onError} notification from the current
+     *            {@code Flowable}
      * @param onCompleteSupplier
-     *            a function that returns a {@code Publisher} to merge for an {@code onComplete} notification from the source
-     *            {@code Publisher}
+     *            a function that returns a {@code Publisher} to merge for an {@code onComplete} notification from the current
+     *            {@code Flowable}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @return a {@code Flowable} that emits the results of merging the {@code Publisher}s returned from applying the
-     *         specified functions to the emissions and notifications of the source {@code Publisher}
+     *         specified functions to the emissions and notifications of the current {@code Flowable}
+     * @throws NullPointerException if {@code onNextMapper}, {@code onErrorMapper} or {@code onCompleteSupplier} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -9900,7 +10203,7 @@ public final <R> Flowable<R> flatMap(
 
     /**
      * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
-     * source {@link Publisher} and a specified collection {@code Publisher}.
+     * current {@code Flowable} and a specified collection {@link Publisher}.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
@@ -9918,12 +10221,13 @@ public final <R> Flowable<R> flatMap(
      * @param <R>
      *            the type of items emitted by the combiner function
      * @param mapper
-     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
+     *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable}
      * @param combiner
      *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
-     *            returns an item to be emitted by the resulting {@code Publisher}
+     *            returns an item to be emitted by the resulting {@code Flowable}
      * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         source {@code Publisher} and the collection {@code Publisher}
+     *         current {@code Flowable} and the collection {@code Publisher}
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -9937,7 +10241,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
 
     /**
      * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
-     * source {@link Publisher} and a specified collection {@code Publisher}.
+     * current {@code Flowable} and a specified inner {@link Publisher}.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
@@ -9955,15 +10259,16 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * @param <R>
      *            the type of items emitted by the combiner functions
      * @param mapper
-     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
+     *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable}
      * @param combiner
      *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
-     *            returns an item to be emitted by the resulting {@code Publisher}
+     *            returns an item to be emitted by the resulting {@code Flowable}
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         source {@code Publisher} and the collection {@code Publisher}
+     *         current {@code Flowable} and the collection {@code Publisher}
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -9977,7 +10282,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
 
     /**
      * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
-     * source {@link Publisher} and a specified collection {@code Publisher}, while limiting the maximum number of concurrent
+     * current {@code Flowable} and a specified collection {@link Publisher}, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt=""> -->
@@ -9996,17 +10301,19 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * @param <R>
      *            the type of items emitted by the combiner function
      * @param mapper
-     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
+     *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable}
      * @param combiner
      *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
-     *            returns an item to be emitted by the resulting {@code Publisher}
+     *            returns an item to be emitted by the resulting {@code Flowable}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         source {@code Publisher} and the collection {@code Publisher}
+     *         current {@code Flowable} and the collection {@code Publisher}
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -10021,7 +10328,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
 
     /**
      * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
-     * source {@link Publisher} and a specified collection {@code Publisher}, while limiting the maximum number of concurrent
+     * current {@code Flowable} and a specified collection {@link Publisher}, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt=""> -->
@@ -10040,10 +10347,10 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * @param <R>
      *            the type of items emitted by the combiner function
      * @param mapper
-     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
+     *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable}
      * @param combiner
      *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
-     *            returns an item to be emitted by the resulting {@code Publisher}
+     *            returns an item to be emitted by the resulting {@code Flowable}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param delayErrors
@@ -10052,7 +10359,9 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * @param bufferSize
      *            the number of elements to prefetch from the inner {@code Publisher}s.
      * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         source {@code Publisher} and the collection {@code Publisher}
+     *         current {@code Flowable} and the collection {@code Publisher}
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -10071,7 +10380,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
 
     /**
      * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
-     * source {@link Publisher} and a specified collection {@code Publisher}, while limiting the maximum number of concurrent
+     * current {@code Flowable} and a specified collection {@link Publisher}, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
      * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt=""> -->
@@ -10090,14 +10399,16 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * @param <R>
      *            the type of items emitted by the combiner function
      * @param mapper
-     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher}
+     *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable}
      * @param combiner
      *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
-     *            returns an item to be emitted by the resulting {@code Publisher}
+     *            returns an item to be emitted by the resulting {@code Flowable}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         source {@code Publisher} and the collection {@code Publisher}
+     *         current {@code Flowable} and the collection {@code Publisher}
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -10121,6 +10432,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * </dl>
      * @param mapper the function that received each source value and transforms them into {@code CompletableSource}s.
      * @return the new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -10146,6 +10458,8 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
      * terminates.
      * @param maxConcurrency the maximum number of active subscriptions to the {@code CompletableSource}s.
      * @return the new {@link Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -10177,6 +10491,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
      *            current {@code Flowable}
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10209,6 +10524,8 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
      * @param bufferSize
      *            the number of elements to prefetch from the current {@code Flowable}
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10243,11 +10560,12 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for each item emitted by the current
      *            {@code Flowable}
-     * @param resultSelector
+     * @param combiner
      *            a function that returns an item based on the item emitted by the current {@code Flowable} and the
      *            {@code Iterable} returned for that item by the {@code collectionSelector}
      * @return a {@code Flowable} that emits the items returned by {@code resultSelector} for each item in the current
      *         {@code Flowable}
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
@@ -10255,10 +10573,10 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
-            @NonNull BiFunction<? super T, ? super U, ? extends V> resultSelector) {
+            @NonNull BiFunction<? super T, ? super U, ? extends V> combiner) {
         Objects.requireNonNull(mapper, "mapper is null");
-        Objects.requireNonNull(resultSelector, "resultSelector is null");
-        return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), bufferSize());
+        Objects.requireNonNull(combiner, "combiner is null");
+        return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), combiner, false, bufferSize(), bufferSize());
     }
 
     /**
@@ -10284,12 +10602,14 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
      *            current {@code Flowable}
-     * @param resultSelector
+     * @param combiner
      *            a function that returns an item based on the item emitted by the current {@code Flowable} and the
      *            {@code Iterable} returned for that item by the {@code collectionSelector}
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
@@ -10298,10 +10618,10 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
-            @NonNull BiFunction<? super T, ? super U, ? extends V> resultSelector, int prefetch) {
+            @NonNull BiFunction<? super T, ? super U, ? extends V> combiner, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
-        Objects.requireNonNull(resultSelector, "resultSelector is null");
-        return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), resultSelector, false, bufferSize(), prefetch);
+        Objects.requireNonNull(combiner, "combiner is null");
+        return flatMap(FlowableInternalHelper.flatMapIntoIterable(mapper), combiner, false, bufferSize(), prefetch);
     }
 
     /**
@@ -10316,6 +10636,7 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
      * @param <R> the result value type
      * @param mapper the function that received each source value and transforms them into {@code MaybeSource}s.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -10343,6 +10664,8 @@ public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends
      * terminates.
      * @param maxConcurrency the maximum number of active subscriptions to the {@code MaybeSource}s.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -10366,6 +10689,7 @@ public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends
      * @param <R> the result value type
      * @param mapper the function that received each source value and transforms them into {@code SingleSource}s.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -10393,6 +10717,8 @@ public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extend
      * terminates.
      * @param maxConcurrency the maximum number of active subscriptions to the {@code SingleSource}s.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -10405,12 +10731,12 @@ public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extend
     }
 
     /**
-     * Subscribes to the {@link Publisher} and receives notifications for each element.
+     * Subscribes to the current {@code Flowable} and receives notifications for each element.
      * <p>
      * Alias to {@link #subscribe(Consumer)}
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no
      *  backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code forEach} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10433,7 +10759,7 @@ public final Disposable forEach(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Subscribes to the {@link Publisher} and receives notifications for each element until the
+     * Subscribes to the current {@code Flowable} and receives notifications for each element until the
      * {@code onNext} Predicate returns {@code false}.
      * <p>
      * If the {@code Flowable} emits an error, it is wrapped into an
@@ -10441,7 +10767,7 @@ public final Disposable forEach(@NonNull Consumer<? super T> onNext) {
      * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no
      *  backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code forEachWhile} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10464,11 +10790,11 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext) {
     }
 
     /**
-     * Subscribes to the {@link Publisher} and receives notifications for each element and error events until the
+     * Subscribes to the current {@code Flowable} and receives notifications for each element and error events until the
      * {@code onNext} Predicate returns {@code false}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no
      *  backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code forEachWhile} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10481,8 +10807,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext) {
      * @return
      *            a {@link Disposable} that allows canceling an asynchronous sequence
      * @throws NullPointerException
-     *             if {@code onNext} is {@code null}, or
-     *             if {@code onError} is {@code null}
+     *             if {@code onNext} or {@code onError} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -10494,11 +10819,11 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
     }
 
     /**
-     * Subscribes to the {@link Publisher} and receives notifications for each element and the terminal events until the
+     * Subscribes to the current {@code Flowable} and receives notifications for each element and the terminal events until the
      * {@code onNext} Predicate returns {@code false}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no
      *  backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code forEachWhile} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10513,9 +10838,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      * @return
      *            a {@link Disposable} that allows canceling an asynchronous sequence
      * @throws NullPointerException
-     *             if {@code onNext} is {@code null}, or
-     *             if {@code onError} is {@code null}, or
-     *             if {@code onComplete} is {@code null}
+     *             if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -10534,7 +10857,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
     }
 
     /**
-     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * Groups the items emitted by the current {@code Flowable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
@@ -10577,9 +10900,10 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      *            a function that extracts the key for each item
      * @param <K>
      *            the key type
-     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
+     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      * @see #groupBy(Function, boolean)
      * @see #groupBy(Function, Function)
@@ -10639,9 +10963,10 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      * @param delayError
      *            if {@code true}, the exception from the current {@code Flowable} is delayed in each group until that specific group emitted
      *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
-     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
+     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
     @CheckReturnValue
@@ -10700,9 +11025,10 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      *            the key type
      * @param <V>
      *            the element type
-     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
+     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      * @see #groupBy(Function, Function, boolean)
      * @see #groupBy(Function, Function, boolean, int)
@@ -10768,9 +11094,10 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * @param delayError
      *            if {@code true}, the exception from the current {@code Flowable} is delayed in each group until that specific group emitted
      *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
-     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
+     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      * @see #groupBy(Function, Function, boolean, int)
      */
@@ -10836,9 +11163,11 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      *            the key type
      * @param <V>
      *            the element type
-     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
+     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
     @CheckReturnValue
@@ -10955,9 +11284,11 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      *            the key type
      * @param <V>
      *            the element type
-     * @return a {@code Publisher} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the source {@code Publisher} that share that
+     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
+     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code evictingMapFactory} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      *
      * @since 2.2
@@ -10998,18 +11329,19 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * @param <TRightEnd> the element type of the right duration {@code Publisher}s
      * @param <R> the result type
      * @param other
-     *            the other {@code Publisher} to correlate items from the source {@code Publisher} with
+     *            the other {@code Publisher} to correlate items from the current {@code Flowable} with
      * @param leftEnd
      *            a function that returns a {@code Publisher} whose emissions indicate the duration of the values of
-     *            the source {@code Publisher}
+     *            the current {@code Flowable}
      * @param rightEnd
      *            a function that returns a {@code Publisher} whose emissions indicate the duration of the values of
      *            the {@code right} {@code Publisher}
      * @param resultSelector
      *            a function that takes an item emitted by each {@code Publisher} and returns the value to be emitted
-     *            by the resulting {@code Publisher}
-     * @return a {@code Flowable} that emits items based on combining those items emitted by the source {@code Publisher}s
+     *            by the resulting {@code Flowable}
+     * @return a {@code Flowable} that emits items based on combining those items emitted by the current {@code Flowable}s
      *         whose durations overlap
+     * @throws NullPointerException if {@code other}, {@code leftEnd}, {@code rightEnd} or {@code resultSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
     @CheckReturnValue
@@ -11054,19 +11386,19 @@ public final Flowable<T> hide() {
     }
 
     /**
-     * Ignores all items emitted by the source {@link Publisher} and only calls {@code onComplete} or {@code onError}.
+     * Ignores all items emitted by the current {@code Flowable} and only calls {@code onComplete} or {@code onError}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ignoreElements.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator ignores backpressure as it doesn't emit any elements and consumes the source {@code Publisher}
+     *  <dd>This operator ignores backpressure as it doesn't emit any elements and consumes the current {@code Flowable}
      *  in an unbounded manner (i.e., no backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ignoreElements} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @return a {@link Completable} that only calls {@code onComplete} or {@code onError}, based on which one is
-     *         called by the source {@code Publisher}
+     *         called by the current {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/ignoreelements.html">ReactiveX operators documentation: IgnoreElements</a>
      */
     @CheckReturnValue
@@ -11078,7 +11410,7 @@ public final Completable ignoreElements() {
     }
 
     /**
-     * Returns a {@link Single} that emits {@code true} if the source {@link Publisher} is empty, otherwise {@code false}.
+     * Returns a {@link Single} that emits {@code true} if the current {@code Flowable} is empty, otherwise {@code false}.
      * <p>
      * In Rx.Net this is negated as the {@code any} {@link Subscriber} but we renamed this in RxJava to better match Java
      * naming idioms.
@@ -11086,7 +11418,7 @@ public final Completable ignoreElements() {
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11125,16 +11457,17 @@ public final Single<Boolean> isEmpty() {
      * @param other
      *            the second {@code Publisher} to join items from
      * @param leftEnd
-     *            a function to select a duration for each item emitted by the source {@code Publisher}, used to
+     *            a function to select a duration for each item emitted by the current {@code Flowable}, used to
      *            determine overlap
      * @param rightEnd
      *            a function to select a duration for each item emitted by the {@code right} {@code Publisher}, used to
      *            determine overlap
      * @param resultSelector
-     *            a function that computes an item to be emitted by the resulting {@code Publisher} for any two
+     *            a function that computes an item to be emitted by the resulting {@code Flowable} for any two
      *            overlapping items emitted by the two {@code Publisher}s
-     * @return a {@code Flowable} that emits items correlating to items emitted by the source {@code Publisher}s that have
+     * @return a {@code Flowable} that emits items correlating to items emitted by the current {@code Flowable}s that have
      *         overlapping durations
+     * @throws NullPointerException if {@code other}, {@code leftEnd}, {@code rightEnd} or {@code resultSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
     @CheckReturnValue
@@ -11161,7 +11494,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/last.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lastElement} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11185,15 +11518,16 @@ public final Maybe<T> lastElement() {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrDefault.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code last} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param defaultItem
-     *            the default item to emit if the source {@code Publisher} is empty
+     *            the default item to emit if the current {@code Flowable} is empty
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
     @CheckReturnValue
@@ -11212,7 +11546,7 @@ public final Single<T> last(@NonNull T defaultItem) {
      * <img width="640" height="236" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrError.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lastOrError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11372,6 +11706,7 @@ public final Single<T> lastOrError() {
      *               a {@code Subscriber} with custom behavior to be used as the consumer for the current
      *               {@code Flowable}.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code lifter} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Writing-operators-for-2.0">RxJava wiki: Writing operators</a>
      * @see #compose(FlowableTransformer)
      */
@@ -11385,13 +11720,13 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
     }
 
     /**
-     * Returns a {@code Flowable} that applies a specified function to each item emitted by the source {@link Publisher} and
+     * Returns a {@code Flowable} that applies a specified function to each item emitted by the current {@code Flowable} and
      * emits the results of these function applications.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/map.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11399,9 +11734,10 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
      *
      * @param <R> the output type
      * @param mapper
-     *            a function to apply to each item emitted by the {@code Publisher}
-     * @return a {@code Flowable} that emits the items from the source {@code Publisher}, transformed by the specified
+     *            a function to apply to each item emitted by the current {@code Flowable}
+     * @return a {@code Flowable} that emits the items from the current {@code Flowable}, transformed by the specified
      *         function
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      * @see #mapOptional(Function)
      */
@@ -11415,20 +11751,20 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
     }
 
     /**
-     * Returns a {@code Flowable} that represents all of the emissions <em>and</em> notifications from the source
-     * {@link Publisher} into emissions marked with their original types within {@link Notification} objects.
+     * Returns a {@code Flowable} that represents all of the emissions <em>and</em> notifications from the current
+     * {@code Flowable} into emissions marked with their original types within {@link Notification} objects.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and expects it from the source {@code Publisher}.
+     *  <dd>The operator honors backpressure from downstream and expects it from the current {@code Flowable}.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @return a {@code Flowable} that emits items that are the result of materializing the items and notifications
-     *         of the source {@code Publisher}
+     *         of the current {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Materialize</a>
      * @see #dematerialize(Function)
      */
@@ -11457,7 +11793,8 @@ public final Flowable<Notification<T>> materialize() {
      *
      * @param other
      *            a {@code Publisher} to be merged
-     * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
+     * @return a {@code Flowable} that emits all of the items emitted by the current {@code Flowable}s
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @CheckReturnValue
@@ -11486,6 +11823,7 @@ public final Flowable<T> mergeWith(@NonNull Publisher<? extends T> other) {
      * <p>History: 2.1.10 - experimental
      * @param other the {@code SingleSource} whose success value to merge with
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -11515,6 +11853,7 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
      * <p>History: 2.1.10 - experimental
      * @param other the {@code MaybeSource} which provides a success value to merge with or completes
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -11533,7 +11872,7 @@ public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11541,6 +11880,7 @@ public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
      * <p>History: 2.1.10 - experimental
      * @param other the {@code CompletableSource} to await for completion
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -11567,7 +11907,7 @@ public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
      * If such fairness and signal/work interleaving is preferred, use the delay operator with zero time instead.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator honors backpressure from downstream and expects it from the source {@code Publisher}. Violating this
+     *  <dd>This operator honors backpressure from downstream and expects it from the current {@code Flowable}. Violating this
      *  expectation will lead to {@link MissingBackpressureException}. This is the most common operator where the exception
      *  pops up; look for sources up the chain that don't support backpressure,
      *  such as {@link #interval(long, TimeUnit)}, {@link #timer(long, TimeUnit)},
@@ -11586,8 +11926,9 @@ public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
      *
      * @param scheduler
      *            the {@code Scheduler} to notify {@link Subscriber}s on
-     * @return the source {@code Publisher} modified so that its {@code Subscriber}s are notified on the specified
+     * @return the current {@code Flowable} modified so that its {@code Subscriber}s are notified on the specified
      *         {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -11615,7 +11956,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler) {
      * If such fairness and signal/work interleaving is preferred, use the delay operator with zero time instead.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator honors backpressure from downstream and expects it from the source {@code Publisher}. Violating this
+     *  <dd>This operator honors backpressure from downstream and expects it from the current {@code Flowable}. Violating this
      *  expectation will lead to {@link MissingBackpressureException}. This is the most common operator where the exception
      *  pops up; look for sources up the chain that don't support backpressure,
      *  such as {@link #interval(long, TimeUnit)}, {@link #timer(long, TimeUnit)},
@@ -11638,8 +11979,9 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler) {
      *            indicates if the {@code onError} notification may not cut ahead of {@code onNext} notification on the other side of the
      *            scheduling boundary. If {@code true}, a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
-     * @return the source {@code Publisher} modified so that its {@code Subscriber}s are notified on the specified
+     * @return the current {@code Flowable} modified so that its {@code Subscriber}s are notified on the specified
      *         {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -11667,7 +12009,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      * If such fairness and signal/work interleaving is preferred, use the delay operator with zero time instead.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator honors backpressure from downstream and expects it from the source {@code Publisher}. Violating this
+     *  <dd>This operator honors backpressure from downstream and expects it from the current {@code Flowable}. Violating this
      *  expectation will lead to {@link MissingBackpressureException}. This is the most common operator where the exception
      *  pops up; look for sources up the chain that don't support backpressure,
      *  such as {@link #interval(long, TimeUnit)}, {@link #timer(long, TimeUnit)},
@@ -11691,8 +12033,10 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      *            scheduling boundary. If {@code true}, a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
      * @param bufferSize the size of the buffer.
-     * @return the source {@code Publisher} modified so that its {@code Subscriber}s are notified on the specified
+     * @return the current {@code Flowable} modified so that its {@code Subscriber}s are notified on the specified
      *         {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -11716,7 +12060,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ofType} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11724,8 +12068,9 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      *
      * @param <U> the output type
      * @param clazz
-     *            the class type to filter the items emitted by the source {@code Publisher}
-     * @return a {@code Flowable} that emits items from the source {@code Publisher} of type {@code clazz}
+     *            the class type to filter the items emitted by the current {@code Flowable}
+     * @return a {@code Flowable} that emits items from the current {@code Flowable} of type {@code clazz}
+     * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
     @CheckReturnValue
@@ -11744,13 +12089,13 @@ public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source {@code Publisher} modified to buffer items to the extent system resources allow
+     * @return the current {@code Flowable} modified to buffer items to the extent system resources allow
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      */
     @CheckReturnValue
@@ -11768,7 +12113,7 @@ public final Flowable<T> onBackpressureBuffer() {
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11777,7 +12122,7 @@ public final Flowable<T> onBackpressureBuffer() {
      *                if {@code true}, an exception from the current {@code Flowable} is delayed until all buffered elements have been
      *                consumed by the downstream; if {@code false}, an exception is immediately signaled to the downstream, skipping
      *                any buffered element
-     * @return the source {@code Publisher} modified to buffer items to the extent system resources allow
+     * @return the current {@code Flowable} modified to buffer items to the extent system resources allow
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      */
     @CheckReturnValue
@@ -11790,21 +12135,22 @@ public final Flowable<T> onBackpressureBuffer(boolean delayError) {
 
     /**
      * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
+     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, and canceling the source.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param capacity number of slots available in the buffer.
-     * @return the source {@code Publisher} modified to buffer items up to the given capacity.
+     * @return the current {@code Flowable} modified to buffer items up to the given capacity.
+     * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
      */
@@ -11818,14 +12164,14 @@ public final Flowable<T> onBackpressureBuffer(int capacity) {
 
     /**
      * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
+     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, and canceling the source.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11836,7 +12182,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity) {
      *                if {@code true}, an exception from the current {@code Flowable} is delayed until all buffered elements have been
      *                consumed by the downstream; if {@code false}, an exception is immediately signaled to the downstream, skipping
      *                any buffered element
-     * @return the source {@code Publisher} modified to buffer items up to the given capacity.
+     * @return the current {@code Flowable} modified to buffer items up to the given capacity.
+     * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
      */
@@ -11850,14 +12197,14 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
 
     /**
      * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
+     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, and canceling the source.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11870,7 +12217,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
      *                any buffered element
      * @param unbounded
      *                if {@code true}, the capacity value is interpreted as the internal "island" size of the unbounded buffer
-     * @return the source {@code Publisher} modified to buffer items up to the given capacity.
+     * @return the current {@code Flowable} modified to buffer items up to the given capacity.
+     * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
      */
@@ -11885,14 +12233,14 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
 
     /**
      * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
+     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, canceling the source, and notifying the producer with {@code onOverflow}.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11906,7 +12254,9 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
      * @param unbounded
      *                if {@code true}, the capacity value is interpreted as the internal "island" size of the unbounded buffer
      * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots.  Null is allowed.
-     * @return the source {@code Publisher} modified to buffer items up to the given capacity
+     * @return the current {@code Flowable} modified to buffer items up to the given capacity
+     * @throws NullPointerException if {@code onOverflow} is {@code null}
+     * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
      */
@@ -11923,14 +12273,14 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
 
     /**
      * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Publisher} will signal
+     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
      * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, canceling the source, and notifying the producer with {@code onOverflow}.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11938,7 +12288,9 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
      *
      * @param capacity number of slots available in the buffer.
      * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots.  Null is allowed.
-     * @return the source {@code Publisher} modified to buffer items up to the given capacity
+     * @return the current {@code Flowable} modified to buffer items up to the given capacity
+     * @throws NullPointerException if {@code onOverflow} is {@code null}
+     * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
      */
@@ -11952,7 +12304,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
 
     /**
      * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Publisher} will behave as determined
+     * a given amount of items until they can be emitted. The resulting {@code Flowable} will behave as determined
      * by {@code overflowStrategy} if the buffer capacity is exceeded.
      *
      * <ul>
@@ -11970,7 +12322,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11980,6 +12332,8 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
      * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots, {@code null} is allowed.
      * @param overflowStrategy how should the {@code Publisher} react to buffer overflows, {@code null} is not allowed.
      * @return the source {@code Flowable} modified to buffer items up to the given capacity
+     * @throws NullPointerException if {@code onOverflow} or {@code overflowStrategy} is {@code null}
+     * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 2.0
      */
@@ -12003,13 +12357,13 @@ public final Flowable<T> onBackpressureBuffer(long capacity, @Nullable Action on
      * the {@code Subscriber} invokes {@code request(n)} again to increase the request count.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureDrop} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source {@code Publisher} modified to drop {@code onNext} notifications on overflow
+     * @return the current {@code Flowable} modified to drop {@code onNext} notifications on overflow
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      */
     @CheckReturnValue
@@ -12030,14 +12384,15 @@ public final Flowable<T> onBackpressureDrop() {
      * the {@code Subscriber} invokes {@code request(n)} again to increase the request count.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureDrop} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param onDrop the action to invoke for each item dropped, should be fast and should never block.
-     * @return the source {@code Publisher} modified to drop {@code onNext} notifications on overflow
+     * @return the current {@code Flowable} modified to drop {@code onNext} notifications on overflow
+     * @throws NullPointerException if {@code onDrop} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
      */
@@ -12059,20 +12414,20 @@ public final Flowable<T> onBackpressureDrop(@NonNull Consumer<? super T> onDrop)
      * Its behavior is logically equivalent to {@code blockingLatest()} with the exception that
      * the downstream is not blocking while requesting more values.
      * <p>
-     * Note that if the upstream {@code Publisher} does support backpressure, this operator ignores that capability
+     * Note that if the current {@code Flowable} does support backpressure, this operator ignores that capability
      * and doesn't propagate any backpressure requests from downstream.
      * <p>
      * Note that due to the nature of how backpressure requests are propagated through subscribeOn/observeOn,
      * requesting more than 1 from downstream doesn't guarantee a continuous delivery of {@code onNext} events.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an unbounded
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
      *  manner (i.e., not applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source {@code Publisher} modified so that it emits the most recently-received item upon request
+     * @return the current {@code Flowable} modified so that it emits the most recently-received item upon request
      * @since 1.1.0
      */
     @CheckReturnValue
@@ -12106,16 +12461,17 @@ public final Flowable<T> onBackpressureLatest() {
      *  <dd>The operator honors backpressure from downstream. This and the resuming {@code Publisher}s
      *  are expected to honor backpressure as well.
      *  If any of them violate this expectation, the operator <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes or
+     *  {@link IllegalStateException} when the current {@code Flowable} completes or
      *  a {@link MissingBackpressureException} is signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param resumeFunction
-     *            a function that returns a {@code Publisher} that will take over if the source {@code Publisher} encounters
+     *            a function that returns a {@code Publisher} that will take over if the current {@code Flowable} encounters
      *            an error
      * @return the original {@code Publisher}, with appropriately modified behavior
+     * @throws NullPointerException if {@code resumeFunction} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -12150,16 +12506,17 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
      *  <dd>The operator honors backpressure from downstream. This and the resuming {@code Publisher}s
      *  are expected to honor backpressure as well.
      *  If any of them violate this expectation, the operator <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes or
+     *  {@link IllegalStateException} when the current {@code Flowable} completes or
      *  {@link MissingBackpressureException} is signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorResumeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param next
-     *            the next {@code Publisher} source that will take over if the source {@code Publisher} encounters
+     *            the next {@code Publisher} source that will take over if the current {@code Flowable} encounters
      *            an error
      * @return the original {@code Publisher}, with appropriately modified behavior
+     * @throws NullPointerException if {@code next} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -12188,9 +12545,9 @@ public final Flowable<T> onErrorResumeWith(@NonNull Publisher<? extends T> next)
      * encountered.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is expected to honor
+     *  <dd>The operator honors backpressure from downstream. The current {@code Flowable} is expected to honor
      *  backpressure as well. If it this expectation is violated, the operator <em>may</em> throw
-     *  {@link IllegalStateException} when the source {@code Publisher} completes or
+     *  {@link IllegalStateException} when the current {@code Flowable} completes or
      *  {@link MissingBackpressureException} is signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorReturn} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12200,6 +12557,7 @@ public final Flowable<T> onErrorResumeWith(@NonNull Publisher<? extends T> next)
      *            a function that returns a single value that will be emitted along with a regular {@code onComplete} in case
      *            the current {@code Flowable} signals an {@code onError} event
      * @return the original {@code Publisher} with appropriately modified behavior
+     * @throws NullPointerException if {@code valueSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -12228,9 +12586,9 @@ public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? ex
      * encountered.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s is expected to honor
+     *  <dd>The operator honors backpressure from downstream. The current {@code Flowable} is expected to honor
      *  backpressure as well. If it this expectation is violated, the operator <em>may</em> throw
-     *  {@link IllegalStateException} when the source {@code Publisher} completes or
+     *  {@link IllegalStateException} when the current {@code Flowable} completes or
      *  {@link MissingBackpressureException} is signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorReturnItem} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12240,6 +12598,7 @@ public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? ex
      *            the value that is emitted along with a regular {@code onComplete} in case the current
      *            {@code Flowable} signals an exception
      * @return the original {@code Publisher} with appropriately modified behavior
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
@@ -12256,7 +12615,7 @@ public final Flowable<T> onErrorReturnItem(@NonNull T item) {
      * the sequence is terminated or downstream cancels.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@link Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12324,6 +12683,7 @@ public final ParallelFlowable<T> parallel() {
      * <p>History: 2.0.5 - experimental; 2.1 - beta
      * @param parallelism the number of 'rails' to use
      * @return the new {@link ParallelFlowable} instance
+     * @throws IllegalArgumentException if {@code parallelism} is non-positive
      * @since 2.2
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -12331,7 +12691,6 @@ public final ParallelFlowable<T> parallel() {
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> parallel(int parallelism) {
-        ObjectHelper.verifyPositive(parallelism, "parallelism");
         return ParallelFlowable.from(this, parallelism);
     }
 
@@ -12358,6 +12717,7 @@ public final ParallelFlowable<T> parallel(int parallelism) {
      * @param parallelism the number of 'rails' to use
      * @param prefetch the number of items each 'rail' should prefetch
      * @return the new {@link ParallelFlowable} instance
+     * @throws IllegalArgumentException if {@code parallelism} or {@code prefetch} is non-positive
      * @since 2.2
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -12365,8 +12725,6 @@ public final ParallelFlowable<T> parallel(int parallelism) {
     @CheckReturnValue
     @NonNull
     public final ParallelFlowable<T> parallel(int parallelism, int prefetch) {
-        ObjectHelper.verifyPositive(parallelism, "parallelism");
-        ObjectHelper.verifyPositive(prefetch, "prefetch");
         return ParallelFlowable.from(this, parallelism, prefetch);
     }
 
@@ -12379,13 +12737,13 @@ public final ParallelFlowable<T> parallel(int parallelism, int prefetch) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code ConnectableFlowable} honors backpressure for each of its {@code Subscriber}s
-     *  and expects the source {@code Publisher} to honor backpressure as well. If this expectation is violated,
+     *  and expects the current {@code Flowable} to honor backpressure as well. If this expectation is violated,
      *  the operator will signal a {@link MissingBackpressureException} to its {@code Subscriber}s and disconnect.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code ConnectableFlowable} that upon connection causes the source {@code Publisher} to emit items
+     * @return a {@code ConnectableFlowable} that upon connection causes the current {@code Flowable} to emit items
      *         to its {@code Subscriber}s
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
@@ -12404,22 +12762,23 @@ public final ConnectableFlowable<T> publish() {
      * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator expects the source {@link Publisher} to honor backpressure and if this expectation is
-     *  violated, the operator will signal a {@link MissingBackpressureException} through the {@code Publisher}
-     *  provided to the function. Since the {@code Publisher} returned by the {@code selector} may be
-     *  independent of the provided {@code Publisher} to the function, the output's backpressure behavior
+     *  <dd>The operator expects the current {@code Flowable} to honor backpressure and if this expectation is
+     *  violated, the operator will signal a {@link MissingBackpressureException} through the {@code Flowable}
+     *  provided to the function. Since the {@link Publisher} returned by the {@code selector} may be
+     *  independent of the provided {@code Flowable} to the function, the output's backpressure behavior
      *  is determined by this returned {@code Publisher}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            a function that can use the multicasted source sequence as many times as needed, without
      *            causing multiple subscriptions to the source sequence. {@link Subscriber}s to the given source will
      *            receive all notifications of the source from the time of the subscription forward.
      * @return a {@code Flowable} that emits the results of invoking the selector on the items emitted by a {@code ConnectableFlowable} that shares a single subscription to the underlying sequence
+     * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -12437,17 +12796,17 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator expects the source {@link Publisher} to honor backpressure and if this expectation is
-     *  violated, the operator will signal a {@link MissingBackpressureException} through the {@code Publisher}
-     *  provided to the function. Since the {@code Publisher} returned by the {@code selector} may be
-     *  independent of the provided {@code Publisher} to the function, the output's backpressure behavior
+     *  <dd>The operator expects the current {@code Flowable} to honor backpressure and if this expectation is
+     *  violated, the operator will signal a {@link MissingBackpressureException} through the {@code Flowable}
+     *  provided to the function. Since the {@link Publisher} returned by the {@code selector} may be
+     *  independent of the provided {@code Flowable} to the function, the output's backpressure behavior
      *  is determined by this returned {@code Publisher}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            a function that can use the multicasted source sequence as many times as needed, without
      *            causing multiple subscriptions to the source sequence. {@link Subscriber}s to the given source will
@@ -12455,6 +12814,8 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
      * @return a {@code Flowable} that emits the results of invoking the selector on the items emitted by a {@code ConnectableFlowable} that shares a single subscription to the underlying sequence
+     * @throws NullPointerException if {@code selector} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -12476,7 +12837,7 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code ConnectableFlowable} honors backpressure for each of its {@code Subscriber}s
-     *  and expects the source {@code Publisher} to honor backpressure as well. If this expectation is violated,
+     *  and expects the current {@code Flowable} to honor backpressure as well. If this expectation is violated,
      *  the operator will signal a {@link MissingBackpressureException} to its {@code Subscriber}s and disconnect.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12484,8 +12845,9 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      *
      * @param bufferSize
      *            the number of elements to prefetch from the current {@code Flowable}
-     * @return a {@code ConnectableFlowable} that upon connection causes the source {@code Publisher} to emit items
+     * @return a {@code ConnectableFlowable} that upon connection causes the current {@code Flowable} to emit items
      *         to its {@code Subscriber}s
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -12512,7 +12874,8 @@ public final ConnectableFlowable<T> publish(int bufferSize) {
      * </dl>
      *
      * @param n the initial request amount, further request will happen after 75% of this value
-     * @return the {@link Publisher} that rebatches request amounts from downstream
+     * @return the {@code Flowable} that rebatches request amounts from downstream
+     * @throws IllegalArgumentException if {@code n} is non-positive
      * @since 2.0
      */
     @CheckReturnValue
@@ -12524,9 +12887,9 @@ public final Flowable<T> rebatchRequests(int n) {
     }
 
     /**
-     * Returns a {@link Maybe} that applies a specified accumulator function to the first item emitted by a source
-     * {@link Publisher}, then feeds the result of that function along with the second item emitted by the source
-     * {@code Publisher} into the same function, and so on until all items have been emitted by the finite source {@code Publisher},
+     * Returns a {@link Maybe} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Flowable}, then feeds the result of that function along with the second item emitted by the current
+     * {@code Flowable} into the same function, and so on until all items have been emitted by the current and finite {@code Flowable},
      * and emits the final result from the final call to your function as its sole item.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduce.png" alt="">
@@ -12547,10 +12910,11 @@ public final Flowable<T> rebatchRequests(int n) {
      * </dl>
      *
      * @param reducer
-     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, whose
+     *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, whose
      *            result will be used in the next accumulator call
      * @return a {@code Maybe} that emits a single item that is the result of accumulating the items emitted by
      *         the source {@code Flowable}
+     * @throws NullPointerException if {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
      */
@@ -12564,10 +12928,10 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     }
 
     /**
-     * Returns a {@link Single} that applies a specified accumulator function to the first item emitted by a source
-     * {@link Publisher} and a specified seed value, then feeds the result of that function along with the second item
-     * emitted by a {@code Publisher} into the same function, and so on until all items have been emitted by the
-     * finite source {@code Publisher}, emitting the final result from the final call to your function as its sole item.
+     * Returns a {@link Single} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Flowable} and a specified seed value, then feeds the result of that function along with the second item
+     * emitted by the current {@code Flowable} into the same function, and so on until all items have been emitted by the
+     * current and finite {@code Flowable}, emitting the final result from the final call to your function as its sole item.
      * <p>
      * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.png" alt="">
      * <p>
@@ -12575,7 +12939,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
      * that does a similar operation on lists.
      * <p>
-     * Note that the {@code seed} is shared among all subscribers to the resulting {@code Publisher}
+     * Note that the {@code seed} is shared among all subscribers to the resulting {@code Flowable}
      * and may cause problems if it is mutable. To make sure each subscriber gets its own value, defer
      * the application of this operator via {@link #defer(Supplier)}:
      * <pre><code>
@@ -12608,10 +12972,11 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * @param seed
      *            the initial (seed) accumulator value
      * @param reducer
-     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, the
+     *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, the
      *            result of which will be used in the next accumulator call
      * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the source {@code Publisher}
+     *         items emitted by the current {@code Flowable}
+     * @throws NullPointerException if {@code seed} or {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
      * @see #reduceWith(Supplier, BiFunction)
@@ -12627,10 +12992,10 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     }
 
     /**
-     * Returns a {@link Single} that applies a specified accumulator function to the first item emitted by a source
-     * {@link Publisher} and a seed value derived from calling a specified {@code seedSupplier}, then feeds the result
-     * of that function along with the second item emitted by a {@code Publisher} into the same function, and so on until
-     * all items have been emitted by the finite source {@code Publisher}, emitting the final result from the final call to your
+     * Returns a {@link Single} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Flowable} and a seed value derived from calling a specified {@code seedSupplier}, then feeds the result
+     * of that function along with the second item emitted by the current {@code Flowable} into the same function, and so on until
+     * all items have been emitted by the current and finite {@code Flowable}, emitting the final result from the final call to your
      * function as its sole item.
      * <p>
      * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.png" alt="">
@@ -12654,10 +13019,11 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * @param seedSupplier
      *            the {@link Supplier} that provides the initial (seed) accumulator value for each individual {@link Subscriber}
      * @param reducer
-     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, the
+     *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, the
      *            result of which will be used in the next accumulator call
      * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the source {@code Publisher}
+     *         items emitted by the current {@code Flowable}
+     * @throws NullPointerException if {@code seedSupplier} or {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
      */
@@ -12672,18 +13038,18 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     }
 
     /**
-     * Returns a {@code Flowable} that repeats the sequence of items emitted by the source {@link Publisher} indefinitely.
+     * Returns a {@code Flowable} that repeats the sequence of items emitted by the current {@code Flowable} indefinitely.
      * <p>
      * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.o.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} repeatedly and in sequence
+     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} repeatedly and in sequence
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -12695,25 +13061,25 @@ public final Flowable<T> repeat() {
     }
 
     /**
-     * Returns a {@code Flowable} that repeats the sequence of items emitted by the source {@link Publisher} at most
+     * Returns a {@code Flowable} that repeats the sequence of items emitted by the current {@code Flowable} at most
      * {@code count} times.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param times
-     *            the number of times the source {@code Publisher} items are repeated, a count of 0 will yield an empty
+     *            the number of times the current {@code Flowable} items are repeated, a count of 0 will yield an empty
      *            sequence
-     * @return a {@code Flowable} that repeats the sequence of items emitted by the source {@code Publisher} at most
+     * @return a {@code Flowable} that repeats the sequence of items emitted by the current {@code Flowable} at most
      *         {@code count} times
      * @throws IllegalArgumentException
-     *             if {@code count} is less than zero
+     *             if {@code times} is less than zero
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -12731,13 +13097,13 @@ public final Flowable<T> repeat(long times) {
     }
 
     /**
-     * Returns a {@code Flowable} that repeats the sequence of items emitted by the source {@link Publisher} until
+     * Returns a {@code Flowable} that repeats the sequence of items emitted by the current {@code Flowable} until
      * the provided stop function returns {@code true}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeatUntil} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12761,17 +13127,17 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits the same values as the source {@link Publisher} with the exception of an
+     * Returns a {@code Flowable} that emits the same values as the current {@code Flowable} with the exception of an
      * {@code onComplete}. An {@code onComplete} notification from the source will result in the emission of
-     * a {@code void} item to the {@code Publisher} provided as an argument to the {@code notificationHandler}
-     * function. If that {@code Publisher} calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
+     * a {@code void} item to the {@code Flowable} provided as an argument to the {@code notificationHandler}
+     * function. If that {@link Publisher} calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
      * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
-     * resubscribe to the source {@code Publisher}.
+     * resubscribe to the current {@code Flowable}.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeatWhen} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12779,7 +13145,8 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
      *
      * @param handler
      *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the repeat.
-     * @return the source {@code Publisher} modified with repeat logic
+     * @return the current {@code Flowable} modified with repeat logic
+     * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -12793,8 +13160,8 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
 
     /**
      * Returns a {@link ConnectableFlowable} that shares a single subscription to the underlying {@link Publisher}
-     * that will replay all of its items and notifications to any future {@link Subscriber}. A Connectable
-     * {@code Publisher} resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is
+     * that will replay all of its items and notifications to any future {@link Subscriber}. A connectable
+     * {@code Flowable} resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.png" alt="">
@@ -12802,12 +13169,12 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@code Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code ConnectableFlowable} that upon connection causes the source {@code Publisher} to emit its
+     * @return a {@code ConnectableFlowable} that upon connection causes the current {@code Flowable} to emit its
      *         items to its {@code Subscriber}s
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -12821,25 +13188,26 @@ public final ConnectableFlowable<T> replay() {
 
     /**
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on the items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher}.
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable}.
      * <p>
      * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the {@code Publisher}
+     *            causing multiple subscriptions to the current {@code Flowable}
      * @return a {@code Flowable} that emits items that are the results of invoking the selector on a
-     *         {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}
+     *         {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}
+     * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -12853,7 +13221,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
 
     /**
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying {@code bufferSize} notifications.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -12864,21 +13232,23 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the {@code Publisher}
+     *            causing multiple subscriptions to the current {@code Flowable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
+     *            the buffer size that limits the number of items the operator can replay
      * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}
+     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}
      *         replaying no more than {@code bufferSize} items
+     * @throws NullPointerException if {@code selector} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, int, boolean)
      */
@@ -12894,7 +13264,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
 
     /**
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying {@code bufferSize} notifications.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -12905,24 +13275,26 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the {@code Publisher}
+     *            causing multiple subscriptions to the current {@code Flowable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
+     *            the buffer size that limits the number of items the operator can replay
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
      * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}
+     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}
      *         replaying no more than {@code bufferSize} items
+     * @throws NullPointerException if {@code selector} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -12937,7 +13309,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
 
     /**
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying no more than {@code bufferSize} items that were emitted within a specified time window.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -12948,26 +13320,28 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the {@code Publisher}
+     *            causing multiple subscriptions to the current {@code Flowable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
+     *            the buffer size that limits the number of items the operator can replay
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
      * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}, and
+     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}, and
      *         replays no more than {@code bufferSize} items that were emitted within the window defined by
      *         {@code time}
+     * @throws NullPointerException if {@code selector} or {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -12980,7 +13354,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
 
     /**
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying no more than {@code bufferSize} items that were emitted within a specified time window.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -12991,18 +13365,18 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the {@code Publisher}
+     *            causing multiple subscriptions to the current {@code Flowable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
+     *            the buffer size that limits the number of items the operator can replay
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
@@ -13010,11 +13384,12 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * @param scheduler
      *            the {@code Scheduler} that is the time source for the window
      * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}, and
+     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}, and
      *         replays no more than {@code bufferSize} items that were emitted within the window defined by
      *         {@code time}
+     * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code bufferSize} is less than zero
+     *             if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, int, long, TimeUnit, Scheduler, boolean)
      */
@@ -13033,7 +13408,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
 
     /**
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying no more than {@code bufferSize} items that were emitted within a specified time window.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -13044,18 +13419,18 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the {@code Publisher}
+     *            causing multiple subscriptions to the current {@code Flowable}
      * @param bufferSize
-     *            the buffer size that limits the number of items the connectable {@code Publisher} can replay
+     *            the buffer size that limits the number of items the operator can replay
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
@@ -13066,9 +13441,10 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
      * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher}, and
+     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}, and
      *         replays no more than {@code bufferSize} items that were emitted within the window defined by
      *         {@code time}
+     * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code bufferSize} is less than zero
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -13088,7 +13464,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
 
     /**
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying all items that were emitted within a specified time window.
      * <p>
      * <img width="640" height="435" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ft.png" alt="">
@@ -13096,23 +13472,24 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the {@code Publisher}
+     *            causing multiple subscriptions to the current {@code Flowable}
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
      * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher},
+     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      *         replaying all items that were emitted within the window defined by {@code time}
+     * @throws NullPointerException if {@code selector} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -13125,7 +13502,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
 
     /**
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying all items that were emitted within a specified time window.
      * <p>
      * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fts.png" alt="">
@@ -13133,16 +13510,16 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the {@code Publisher}
+     *            causing multiple subscriptions to the current {@code Flowable}
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
@@ -13150,8 +13527,9 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * @param scheduler
      *            the scheduler that is the time source for the window
      * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher},
+     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      *         replaying all items that were emitted within the window defined by {@code time}
+     * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, long, TimeUnit, Scheduler, boolean)
      */
@@ -13168,7 +13546,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
 
     /**
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on items
-     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher},
+     * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying all items that were emitted within a specified time window.
      * <p>
      * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fts.png" alt="">
@@ -13176,16 +13554,16 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param selector
      *            a selector function, which can use the multicasted sequence as many times as needed, without
-     *            causing multiple subscriptions to the {@code Publisher}
+     *            causing multiple subscriptions to the current {@code Flowable}
      * @param time
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
@@ -13196,8 +13574,9 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *            if {@code true}, whenever the internal buffer is truncated to the given age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
      * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher},
+     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      *         replaying all items that were emitted within the window defined by {@code time}
+     * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -13212,9 +13591,9 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} that
-     * replays at most {@code bufferSize} items emitted by that {@code Publisher}. A Connectable {@code Publisher} resembles
-     * an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to, but only
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     * replays at most {@code bufferSize} items to late {@link Subscriber}s. A Connectable {@code Flowable} resembles
+     * an ordinary {@code Flowable}, except that it does not begin emitting items when it is subscribed to, but only
      * when its {@code connect} method is called.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -13226,16 +13605,17 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  {@code Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param bufferSize
      *            the buffer size that limits the number of items that can be replayed
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
-     *         replays at most {@code bufferSize} items emitted by that {@code Publisher}
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     *         replays at most {@code bufferSize} items emitted by the current {@code Flowable}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(int, boolean)
      */
@@ -13248,9 +13628,9 @@ public final ConnectableFlowable<T> replay(int bufferSize) {
         return FlowableReplay.create(this, bufferSize, false);
     }
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} that
-     * replays at most {@code bufferSize} items emitted by that {@code Publisher}. A Connectable {@code Publisher} resembles
-     * an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to, but only
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     * replays at most {@code bufferSize} items to late {@link Subscriber}s. A connectable {@code Flowable} resembles
+     * an ordinary {@code Flowable}, except that it does not begin emitting items when it is subscribed to, but only
      * when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.n.png" alt="">
@@ -13261,8 +13641,8 @@ public final ConnectableFlowable<T> replay(int bufferSize) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  {@code Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -13272,8 +13652,9 @@ public final ConnectableFlowable<T> replay(int bufferSize) {
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
-     *         replays at most {@code bufferSize} items emitted by that {@code Publisher}
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     *         replays at most {@code bufferSize} items emitted by the current {@code Flowable}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @since 3.0.0
      */
@@ -13287,9 +13668,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, boolean eagerTruncate
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
-     * replays at most {@code bufferSize} items that were emitted during a specified time window. A Connectable
-     * {@code Publisher} resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     * replays at most {@code bufferSize} items that were emitted during a specified time window. A connectable
+     * {@code Flowable} resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nt.png" alt="">
@@ -13302,7 +13683,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, boolean eagerTruncate
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
      *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -13313,9 +13694,11 @@ public final ConnectableFlowable<T> replay(int bufferSize, boolean eagerTruncate
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
      *         replays at most {@code bufferSize} items that were emitted during the window defined by
      *         {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(int, long, TimeUnit, Scheduler, boolean)
      */
@@ -13328,9 +13711,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
-     * that replays a maximum of {@code bufferSize} items that are emitted within a specified time window. A
-     * Connectable {@code Publisher} resembles an ordinary {@code Publisher}, except that it does not begin emitting items
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     * replays a maximum of {@code bufferSize} items that are emitted within a specified time window to late {@link Subscriber}s. A
+     * connectable {@code Flowable} resembles an ordinary {@code Flowable}, except that it does not begin emitting items
      * when it is subscribed to, but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nts.png" alt="">
@@ -13342,8 +13725,8 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  {@code Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -13356,11 +13739,11 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is used as a time source for the window
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
      *         replays at most {@code bufferSize} items that were emitted during the window defined by
      *         {@code time}
-     * @throws IllegalArgumentException
-     *             if {@code bufferSize} is less than zero
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(int, long, TimeUnit, Scheduler, boolean)
      */
@@ -13369,7 +13752,6 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -13377,9 +13759,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
-     * that replays a maximum of {@code bufferSize} items that are emitted within a specified time window. A
-     * Connectable {@code Publisher} resembles an ordinary {@code Publisher}, except that it does not begin emitting items
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     * replays a maximum of {@code bufferSize} items that are emitted within a specified time window to late {@link Subscriber}s. A
+     * connectable {@code Flowable} resembles an ordinary {@code Flowable}, except that it does not begin emitting items
      * when it is subscribed to, but only when its {@code connect} method is called.
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
@@ -13390,8 +13772,8 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  {@code Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -13407,11 +13789,11 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
      *         replays at most {@code bufferSize} items that were emitted during the window defined by
      *         {@code time}
-     * @throws IllegalArgumentException
-     *             if {@code bufferSize} is less than zero
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @since 3.0.0
      */
@@ -13420,7 +13802,6 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
     public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
-        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -13428,9 +13809,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
-     * replays all items emitted by that {@code Publisher} within a specified time window. A Connectable {@code Publisher}
-     * resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to,
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     * replays all items emitted by it within a specified time window to late {@link Subscriber}s. A connectable {@code Flowable}
+     * resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.t.png" alt="">
@@ -13440,8 +13821,8 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  {@code Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -13450,8 +13831,9 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
      *         replays the items that were emitted during the window defined by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -13463,9 +13845,9 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
-     * replays all items emitted by that {@code Publisher} within a specified time window. A Connectable {@code Publisher}
-     * resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to,
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     * replays all items emitted by it within a specified time window to late {@link Subscriber}s. A connectable {@code Flowable}
+     * resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ts.png" alt="">
@@ -13475,8 +13857,8 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  {@code Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -13487,8 +13869,9 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit) {
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that is the time source for the window
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
      *         replays the items that were emitted during the window defined by {@code time}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(long, TimeUnit, Scheduler, boolean)
      */
@@ -13503,9 +13886,9 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
     }
 
     /**
-     * Returns a {@link ConnectableFlowable} that shares a single subscription to the source {@link Publisher} and
-     * replays all items emitted by that {@code Publisher} within a specified time window. A Connectable {@code Publisher}
-     * resembles an ordinary {@code Publisher}, except that it does not begin emitting items when it is subscribed to,
+     * Returns a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
+     * replays all items emitted by it within a specified time window to late {@link Subscriber}s. A connectable {@code Flowable}
+     * resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ts.png" alt="">
@@ -13515,8 +13898,8 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
-     *  {@link Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
-     *  request 100 elements from the underlying {@code Publisher} sequence.</dd>
+     *  {@code Subscriber} which requests the largest amount: i.e., two child {@code Subscriber}s with requests of 10 and 100 will
+     *  request 100 elements from the current {@code Flowable} sequence.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -13530,8 +13913,9 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the source {@code Publisher} and
+     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
      *         replays the items that were emitted during the window defined by {@code time}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -13545,27 +13929,27 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, resubscribing to it if it calls {@code onError}
      * (infinite retry count).
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <p>
-     * If the source {@code Publisher} calls {@link Subscriber#onError}, this method will resubscribe to the source
-     * {@code Publisher} rather than propagating the {@code onError} call.
+     * If the current {@code Flowable} calls {@link Subscriber#onError}, this method will resubscribe to the current
+     * {@code Flowable} rather than propagating the {@code onError} call.
      * <p>
-     * Any and all items emitted by the source {@code Publisher} will be emitted by the resulting {@code Publisher}, even
-     * those emitted during failed subscriptions. For example, if a {@code Publisher} fails at first but emits
+     * Any and all items emitted by the current {@code Flowable} will be emitted by the resulting {@code Flowable}, even
+     * those emitted during failed subscriptions. For example, if the current {@code Flowable} fails at first but emits
      * {@code [1, 2]} then succeeds the second time and emits {@code [1, 2, 3, 4, 5]} then the complete sequence
      * of emissions and notifications would be {@code [1, 2, 1, 2, 3, 4, 5, onComplete]}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the source {@code Publisher} modified with retry logic
+     * @return the current {@code Flowable} modified with retry logic
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -13577,13 +13961,13 @@ public final Flowable<T> retry() {
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, resubscribing to it if it calls {@code onError}
      * and the predicate returns {@code true} for that specific exception and retry count.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13592,7 +13976,8 @@ public final Flowable<T> retry() {
      * @param predicate
      *            the predicate that determines if a resubscription may happen in case of a specific exception
      *            and retry count
-     * @return the source {@code Publisher} modified with retry logic
+     * @return the current {@code Flowable} modified with retry logic
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see #retry()
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
@@ -13607,38 +13992,39 @@ public final Flowable<T> retry(@NonNull BiPredicate<@NonNull ? super Integer, @N
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, resubscribing to it if it calls {@code onError}
      * up to a specified number of retries.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <p>
-     * If the source {@code Publisher} calls {@link Subscriber#onError}, this method will resubscribe to the source
-     * {@code Publisher} for a maximum of {@code count} resubscriptions rather than propagating the
+     * If the current {@code Flowable} calls {@link Subscriber#onError}, this method will resubscribe to the current
+     * {@code Flowable} for a maximum of {@code count} resubscriptions rather than propagating the
      * {@code onError} call.
      * <p>
-     * Any and all items emitted by the source {@code Publisher} will be emitted by the resulting {@code Publisher}, even
-     * those emitted during failed subscriptions. For example, if a {@code Publisher} fails at first but emits
+     * Any and all items emitted by the current {@code Flowable} will be emitted by the resulting {@code Flowable}, even
+     * those emitted during failed subscriptions. For example, if the current {@code Flowable} fails at first but emits
      * {@code [1, 2]} then succeeds the second time and emits {@code [1, 2, 3, 4, 5]} then the complete sequence
      * of emissions and notifications would be {@code [1, 2, 1, 2, 3, 4, 5, onComplete]}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param count
+     * @param times
      *            the number of times to resubscribe if the current {@code Flowable} fails
-     * @return the source {@code Publisher} modified with retry logic
+     * @return the current {@code Flowable} modified with retry logic
+     * @throws IllegalArgumentException if {@code times} is negative
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Flowable<T> retry(long count) {
-        return retry(count, Functions.alwaysTrue());
+    public final Flowable<T> retry(long times) {
+        return retry(times, Functions.alwaysTrue());
     }
 
     /**
@@ -13646,13 +14032,14 @@ public final Flowable<T> retry(long count) {
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@link Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param times the number of times to resubscribe if the current {@code Flowable} fails
      * @param predicate the predicate called with the failure {@link Throwable} and should return {@code true} to trigger a retry.
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @throws IllegalArgumentException if {@code times} is negative
      * @return the new {@code Flowable} instance
      */
@@ -13673,7 +14060,7 @@ public final Flowable<T> retry(long times, @NonNull Predicate<@NonNull ? super T
      * Retries the current {@code Flowable} if the predicate returns {@code true}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@link Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13681,6 +14068,7 @@ public final Flowable<T> retry(long times, @NonNull Predicate<@NonNull ? super T
      *
      * @param predicate the predicate that receives the failure {@link Throwable} and should return {@code true} to trigger a retry.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -13694,13 +14082,14 @@ public final Flowable<T> retry(@NonNull Predicate<@NonNull ? super Throwable> pr
      * Retries until the given stop function returns {@code true}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@link Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator <em>may</em> throw an {@link IllegalStateException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retryUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param stop the function that should return {@code true} to stop retrying
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code stop} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -13712,12 +14101,12 @@ public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits the same values as the source {@link Publisher} with the exception of an
+     * Returns a {@code Flowable} that emits the same values as the current {@code Flowable} with the exception of an
      * {@code onError}. An {@code onError} notification from the source will result in the emission of a
-     * {@link Throwable} item to the {@code Publisher} provided as an argument to the {@code notificationHandler}
-     * function. If that {@code Publisher} calls {@code onComplete} or {@code onError} then {@code retry} will call
+     * {@link Throwable} item to the {@code Flowable} provided as an argument to the {@code notificationHandler}
+     * function. If that {@link Publisher} calls {@code onComplete} or {@code onError} then {@code retry} will call
      * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
-     * resubscribe to the source {@code Publisher}.
+     * resubscribe to the current {@code Flowable}.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.png" alt="">
      * <p>
@@ -13785,7 +14174,8 @@ public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
      * @param handler
      *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the
      *            retry
-     * @return the source {@code Publisher} modified with retry logic
+     * @return the current {@code Flowable} modified with retry logic
+     * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -13810,22 +14200,22 @@ public final Flowable<T> retryWhen(
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code safeSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param s the incoming {@code Subscriber} instance
-     * @throws NullPointerException if s is {@code null}
+     * @param subscriber the incoming {@code Subscriber} instance
+     * @throws NullPointerException if {@code subscriber} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void safeSubscribe(@NonNull Subscriber<? super T> s) {
-        Objects.requireNonNull(s, "s is null");
-        if (s instanceof SafeSubscriber) {
-            subscribe((SafeSubscriber<? super T>)s);
+    public final void safeSubscribe(@NonNull Subscriber<? super T> subscriber) {
+        Objects.requireNonNull(subscriber, "subscriber is null");
+        if (subscriber instanceof SafeSubscriber) {
+            subscribe((SafeSubscriber<? super T>)subscriber);
         } else {
-            subscribe(new SafeSubscriber<>(s));
+            subscribe(new SafeSubscriber<>(subscriber));
         }
     }
 
     /**
-     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the source {@link Publisher}
+     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the current {@code Flowable}
      * within periodic time intervals.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.png" alt="">
@@ -13840,8 +14230,9 @@ public final void safeSubscribe(@NonNull Subscriber<? super T> s) {
      *            the sampling rate
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the source {@code Publisher} at
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} at
      *         the specified time interval
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #throttleLast(long, TimeUnit)
@@ -13855,7 +14246,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the source {@link Publisher}
+     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the current {@code Flowable}
      * within periodic time intervals and optionally emit the very last upstream item when the upstream completes.
      * <p>
      * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.emitlast.png" alt="">
@@ -13875,8 +14266,9 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit) {
      *            if {@code true}, and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the source {@code Publisher} at
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} at
      *         the specified time interval
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #throttleLast(long, TimeUnit)
@@ -13891,7 +14283,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, boolean emi
     }
 
     /**
-     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the source {@link Publisher}
+     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the current {@code Flowable}
      * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.png" alt="">
@@ -13908,8 +14300,9 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, boolean emi
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param scheduler
      *            the {@code Scheduler} to use when sampling
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the source {@code Publisher} at
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} at
      *         the specified time interval
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #throttleLast(long, TimeUnit, Scheduler)
@@ -13925,7 +14318,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the source {@link Publisher}
+     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the current {@code Flowable}
      * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}
      * and optionally emit the very last upstream item when the upstream completes.
      * <p>
@@ -13948,8 +14341,9 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the source {@code Publisher} at
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} at
      *         the specified time interval
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #throttleLast(long, TimeUnit, Scheduler)
@@ -13967,7 +14361,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
 
     /**
      * Returns a {@code Flowable} that, when the specified {@code sampler} {@link Publisher} emits an item or completes,
-     * emits the most recently emitted item (if any) emitted by the source {@code Publisher} since the previous
+     * emits the most recently emitted item (if any) emitted by the current {@code Flowable} since the previous
      * emission from the {@code sampler} {@code Publisher}.
      * <p>
      * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.nolast.png" alt="">
@@ -13981,9 +14375,10 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      *
      * @param <U> the element type of the sampler {@code Publisher}
      * @param sampler
-     *            the {@code Publisher} to use for sampling the source {@code Publisher}
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by this {@code Publisher} whenever
+     *            the {@code Publisher} to use for sampling the current {@code Flowable}
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} whenever
      *         the {@code sampler} {@code Publisher} emits an item or completes
+     * @throws NullPointerException if {@code sampler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      */
@@ -13998,7 +14393,7 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler) {
 
     /**
      * Returns a {@code Flowable} that, when the specified {@code sampler} {@link Publisher} emits an item or completes,
-     * emits the most recently emitted item (if any) emitted by the source {@code Publisher} since the previous
+     * emits the most recently emitted item (if any) emitted by the current {@code Flowable} since the previous
      * emission from the {@code sampler} {@code Publisher}
      * and optionally emit the very last upstream item when the upstream or other {@code Publisher} complete.
      * <p>
@@ -14014,13 +14409,14 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler) {
      * <p>History: 2.0.5 - experimental
      * @param <U> the element type of the sampler {@code Publisher}
      * @param sampler
-     *            the {@code Publisher} to use for sampling the source {@code Publisher}
+     *            the {@code Publisher} to use for sampling the current {@code Flowable}
      * @param emitLast
      *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by this {@code Publisher} whenever
+     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} whenever
      *         the {@code sampler} {@code Publisher} emits an item or completes
+     * @throws NullPointerException if {@code sampler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @since 2.1
@@ -14035,9 +14431,9 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitL
     }
 
     /**
-     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by a source
-     * {@link Publisher}, then feeds the result of that function along with the second item emitted by the source
-     * {@code Publisher} into the same function, and so on until all items have been emitted by the source {@code Publisher},
+     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Flowable}, then feeds the result of that function along with the second item emitted by the current
+     * {@code Floawble} into the same function, and so on until all items have been emitted by the current {@code Flowable},
      * emitting the result of each of these iterations.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.png" alt="">
@@ -14045,17 +14441,18 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitL
      * This sort of function is sometimes called an accumulator.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code scan} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param accumulator
-     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, whose
+     *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, whose
      *            result will be emitted to {@link Subscriber}s via {@link Subscriber#onNext onNext} and used in the
      *            next accumulator call
      * @return a {@code Flowable} that emits the results of each call to the accumulator function
+     * @throws NullPointerException if {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
     @CheckReturnValue
@@ -14068,19 +14465,19 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by a source
-     * {@link Publisher} and a seed value, then feeds the result of that function along with the second item emitted by
-     * the source {@code Publisher} into the same function, and so on until all items have been emitted by the source
-     * {@code Publisher}, emitting the result of each of these iterations.
+     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Flowable} and a seed value, then feeds the result of that function along with the second item emitted by
+     * the current {@code Flowable} into the same function, and so on until all items have been emitted by the current
+     * {@code Flowable}, emitting the result of each of these iterations.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
-     * Note that the {@code Publisher} that results from this method will emit {@code initialValue} as its first
+     * Note that the {@code Flowable} that results from this method will emit {@code initialValue} as its first
      * emitted item.
      * <p>
-     * Note that the {@code initialValue} is shared among all subscribers to the resulting {@code Publisher}
+     * Note that the {@code initialValue} is shared among all subscribers to the resulting {@code Flowable}
      * and may cause problems if it is mutable. To make sure each subscriber gets its own value, defer
      * the application of this operator via {@link #defer(Supplier)}:
      * <pre><code>
@@ -14095,7 +14492,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * </code></pre>
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code scan} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14105,11 +14502,12 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * @param initialValue
      *            the initial (seed) accumulator item
      * @param accumulator
-     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, whose
+     *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, whose
      *            result will be emitted to {@link Subscriber}s via {@link Subscriber#onNext onNext} and used in the
      *            next accumulator call
      * @return a {@code Flowable} that emits {@code initialValue} followed by the results of each call to the
      *         accumulator function
+     * @throws NullPointerException if {@code initialValue} or {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
     @CheckReturnValue
@@ -14122,20 +14520,20 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by a source
-     * {@link Publisher} and a seed value, then feeds the result of that function along with the second item emitted by
-     * the source {@code Publisher} into the same function, and so on until all items have been emitted by the source
-     * {@code Publisher}, emitting the result of each of these iterations.
+     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by the current
+     * {@code Flowable} and a seed value, then feeds the result of that function along with the second item emitted by
+     * the current {@code Flowable} into the same function, and so on until all items have been emitted by the current
+     * {@code Flowable}, emitting the result of each of these iterations.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
-     * Note that the {@code Publisher} that results from this method will emit the value returned by
+     * Note that the {@code Flowable} that results from this method will emit the value returned by
      * the {@code seedSupplier} as its first item.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code scanWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14145,11 +14543,12 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * @param seedSupplier
      *            a {@link Supplier} that returns the initial (seed) accumulator item for each individual {@link Subscriber}
      * @param accumulator
-     *            an accumulator function to be invoked on each item emitted by the source {@code Publisher}, whose
+     *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, whose
      *            result will be emitted to {@code Subscriber}s via {@link Subscriber#onNext onNext} and used in the
      *            next accumulator call
      * @return a {@code Flowable} that emits {@code initialValue} followed by the results of each call to the
      *         accumulator function
+     * @throws NullPointerException if {@code seedSupplier} or {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
     @CheckReturnValue
@@ -14175,13 +14574,13 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/synchronize.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code serialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Publisher} that is guaranteed to be well-behaved and to make only serialized calls to
+     * @return a {@code Flowable} that is guaranteed to be well-behaved and to make only serialized calls to
      *         its {@code Subscriber}s
      * @see <a href="http://reactivex.io/documentation/operators/serialize.html">ReactiveX operators documentation: Serialize</a>
      */
@@ -14194,23 +14593,23 @@ public final Flowable<T> serialize() {
     }
 
     /**
-     * Returns a new {@link Publisher} that multicasts (and shares a single subscription to) the original {@code Publisher}. As long as
-     * there is at least one {@link Subscriber} this {@code Publisher} will be subscribed and emitting data.
-     * When all subscribers have canceled it will cancel the source {@code Publisher}.
+     * Returns a new {@code Flowable} that multicasts (and shares a single subscription to) the current {@code Flowable}. As long as
+     * there is at least one {@link Subscriber}, the current {@code Flowable} will be subscribed and emitting data.
+     * When all subscribers have canceled it will cancel the current {@code Flowable}.
      * <p>
      * This is an alias for {@link #publish()}.{@link ConnectableFlowable#refCount() refCount()}.
      * <p>
      * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishRefCount.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure and expects the source {@code Publisher} to honor backpressure as well.
+     *  <dd>The operator honors backpressure and expects the current {@code Flowable} to honor backpressure as well.
      *  If this expectation is violated, the operator will signal a {@link MissingBackpressureException} to
      *  its {@code Subscriber}s.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code share} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Publisher} that upon connection causes the source {@code Publisher} to emit items
+     * @return a {@code Flowable} that upon connection causes the current {@code Flowable} to emit items
      *         to its {@code Subscriber}s
      * @see <a href="http://reactivex.io/documentation/operators/refcount.html">ReactiveX operators documentation: RefCount</a>
      */
@@ -14230,13 +14629,13 @@ public final Flowable<T> share() {
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/single.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code singleElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Maybe} that emits the single item emitted by the source {@code Publisher}
+     * @return a {@code Maybe} that emits the single item emitted by the current {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -14248,23 +14647,24 @@ public final Maybe<T> singleElement() {
     }
 
     /**
-     * Returns a {@link Single} that emits the single item emitted by the source {@link Publisher}, if that {@code Publisher}
-     * emits only a single item, or a default item if the source {@code Publisher} emits no items. If the source
-     * {@code Publisher} emits more than one item, an {@link IllegalArgumentException} is signaled instead.
+     * Returns a {@link Single} that emits the single item emitted by the current {@code Flowable} if it
+     * emits only a single item, or a default item if the current {@code Flowable} emits no items. If the current
+     * {@code Flowable} emits more than one item, an {@link IllegalArgumentException} is signaled instead.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrDefault.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code single} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param defaultItem
-     *            a default value to emit if the source {@code Publisher} emits no item
-     * @return a {@code Single} that emits the single item emitted by the source {@code Publisher}, or a default item if
-     *         the source {@code Publisher} is empty
+     *            a default value to emit if the current {@code Flowable} emits no item
+     * @return a {@code Single} that emits the single item emitted by the current {@code Flowable}, or a default item if
+     *         the current {@code Flowable} is empty
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -14285,7 +14685,7 @@ public final Single<T> single(@NonNull T defaultItem) {
      * <img width="640" height="205" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrError.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@link Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code singleOrError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14303,13 +14703,13 @@ public final Single<T> singleOrError() {
     }
 
     /**
-     * Returns a {@code Flowable} that skips the first {@code count} items emitted by the source {@link Publisher} and emits
+     * Returns a {@code Flowable} that skips the first {@code count} items emitted by the current {@code Flowable} and emits
      * the remainder.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code skip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14317,8 +14717,9 @@ public final Single<T> singleOrError() {
      *
      * @param count
      *            the number of items to skip
-     * @return a {@code Flowable} that is identical to the source {@code Publisher} except that it does not emit the first
-     *         {@code count} items that the source {@code Publisher} emits
+     * @return a {@code Flowable} that is identical to the current {@code Flowable} except that it does not emit the first
+     *         {@code count} items that the current {@code Flowable} emits
+     * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
     @CheckReturnValue
@@ -14326,21 +14727,24 @@ public final Single<T> singleOrError() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Flowable<T> skip(long count) {
-        if (count <= 0L) {
+        if (count < 0) {
+            throw new IllegalArgumentException("count >= 0 expected but it was " + count);
+        }
+        if (count == 0) {
             return RxJavaPlugins.onAssembly(this);
         }
         return RxJavaPlugins.onAssembly(new FlowableSkip<>(this, count));
     }
 
     /**
-     * Returns a {@code Flowable} that skips values emitted by the source {@link Publisher} before a specified time window
+     * Returns a {@code Flowable} that skips values emitted by the current {@code Flowable} before a specified time window
      * elapses.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.t.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
-     *  thus has to consume the source {@code Publisher} in an unbounded manner (i.e., no backpressure applied to it).</dd>
+     *  thus has to consume the current {@code Flowable} in an unbounded manner (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code skip} does not operate on any particular scheduler but uses the current time
      *  from the {@code computation} {@link Scheduler}.</dd>
@@ -14350,8 +14754,9 @@ public final Flowable<T> skip(long count) {
      *            the length of the time window to skip
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that skips values emitted by the source {@code Publisher} before the time window defined
+     * @return a {@code Flowable} that skips values emitted by the current {@code Flowable} before the time window defined
      *         by {@code time} elapses and the emits the remainder
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
     @CheckReturnValue
@@ -14363,14 +14768,14 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that skips values emitted by the source {@link Publisher} before a specified time window
+     * Returns a {@code Flowable} that skips values emitted by the current {@code Flowable} before a specified time window
      * on a specified {@link Scheduler} elapses.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.ts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
-     *  thus has to consume the source {@code Publisher} in an unbounded manner (i.e., no backpressure applied to it).</dd>
+     *  thus has to consume the current {@code Flowable} in an unbounded manner (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use for the timed skipping</dd>
      * </dl>
@@ -14381,8 +14786,9 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit) {
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} on which the timed wait happens
-     * @return a {@code Flowable} that skips values emitted by the source {@code Publisher} before the time window defined
+     * @return a {@code Flowable} that skips values emitted by the current {@code Flowable} before the time window defined
      *         by {@code time} and {@code scheduler} elapses, and then emits the remainder
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
     @CheckReturnValue
@@ -14395,16 +14801,16 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Schedu
 
     /**
      * Returns a {@code Flowable} that drops a specified number of items from the end of the sequence emitted by the
-     * source {@link Publisher}.
+     * current {@code Flowable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.png" alt="">
      * <p>
      * This {@link Subscriber} accumulates a queue long enough to store the first {@code count} items. As more items are
-     * received, items are taken from the front of the queue and emitted by the returned {@code Publisher}. This causes
+     * received, items are taken from the front of the queue and emitted by the resulting {@code Flowable}. This causes
      * such items to be delayed.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code skipLast} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14412,7 +14818,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Schedu
      *
      * @param count
      *            number of items to drop from the end of the source sequence
-     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} except for the dropped ones
+     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} except for the dropped ones
      *         at the end
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero
@@ -14433,7 +14839,7 @@ public final Flowable<T> skipLast(int count) {
     }
 
     /**
-     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * before the source completes.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
@@ -14442,7 +14848,7 @@ public final Flowable<T> skipLast(int count) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
-     *  thus has to consume the source {@code Publisher} in an unbounded manner (i.e., no backpressure applied to it).</dd>
+     *  thus has to consume the current {@code Flowable} in an unbounded manner (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code skipLast} does not operate on any particular scheduler but uses the current time
      *  from the {@code computation} {@link Scheduler}.</dd>
@@ -14452,8 +14858,9 @@ public final Flowable<T> skipLast(int count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
+     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
      *         source completes defined by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -14465,7 +14872,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * before the source completes.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
@@ -14474,7 +14881,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
-     *  thus has to consume the source {@code Publisher} in an unbounded manner (i.e., no backpressure applied to it).</dd>
+     *  thus has to consume the current {@code Flowable} in an unbounded manner (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code skipLast} does not operate on any particular scheduler but uses the current time
      *  from the {@code computation} {@link Scheduler}.</dd>
@@ -14487,8 +14894,9 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit) {
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
+     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
      *         source completes defined by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -14500,7 +14908,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, boolean del
     }
 
     /**
-     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
@@ -14509,7 +14917,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, boolean del
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
-     *  thus has to consume the source {@code Publisher} in an unbounded manner (i.e., no backpressure applied to it).</dd>
+     *  thus has to consume the current {@code Flowable} in an unbounded manner (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use for tracking the current time</dd>
      * </dl>
@@ -14520,8 +14928,9 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, boolean del
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler used as the time source
-     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
+     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
      *         source completes defined by {@code time} and {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -14533,7 +14942,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
@@ -14542,7 +14951,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
-     *  thus has to consume the source {@code Publisher} in an unbounded manner (i.e., no backpressure applied to it).</dd>
+     *  thus has to consume the current {@code Flowable} in an unbounded manner (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use to track the current time</dd>
      * </dl>
@@ -14556,8 +14965,9 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
+     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
      *         source completes defined by {@code time} and {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -14569,7 +14979,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a {@code Flowable} that drops items emitted by the source {@link Publisher} during a specified time window
+     * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
      * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
@@ -14578,7 +14988,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
-     *  thus has to consume the source {@code Publisher} in an unbounded manner (i.e., no backpressure applied to it).</dd>
+     *  thus has to consume the current {@code Flowable} in an unbounded manner (i.e., no backpressure applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
@@ -14594,8 +15004,10 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be skipped
-     * @return a {@code Flowable} that drops those items emitted by the source {@code Publisher} in a time window before the
+     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
      *         source completes defined by {@code time} and {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
     @CheckReturnValue
@@ -14612,13 +15024,13 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a {@code Flowable} that skips items emitted by the source {@link Publisher} until a second {@code Publisher} emits
+     * Returns a {@code Flowable} that skips items emitted by the current {@code Flowable} until a second {@link Publisher} emits
      * an item.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipUntil.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code skipUntil} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14626,10 +15038,11 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      *
      * @param <U> the element type of the other {@code Publisher}
      * @param other
-     *            the second {@code Publisher} that has to emit an item before the source {@code Publisher}'s elements begin
-     *            to be mirrored by the resulting {@code Publisher}
-     * @return a {@code Flowable} that skips items from the source {@code Publisher} until the second {@code Publisher} emits an
+     *            the second {@code Publisher} that has to emit an item before the current {@code Flowable}'s elements begin
+     *            to be mirrored by the resulting {@code Flowable}
+     * @return a {@code Flowable} that skips items from the current {@code Flowable} until the second {@code Publisher} emits an
      *         item, then emits the remaining items
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skipuntil.html">ReactiveX operators documentation: SkipUntil</a>
      */
     @CheckReturnValue
@@ -14642,22 +15055,23 @@ public final <U> Flowable<T> skipUntil(@NonNull Publisher<U> other) {
     }
 
     /**
-     * Returns a {@code Flowable} that skips all items emitted by the source {@link Publisher} as long as a specified
+     * Returns a {@code Flowable} that skips all items emitted by the current {@code Flowable} as long as a specified
      * condition holds {@code true}, but emits all further source items as soon as the condition becomes {@code false}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipWhile.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code skipWhile} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param predicate
-     *            a function to test each item emitted from the source {@code Publisher}
-     * @return a {@code Flowable} that begins emitting items emitted by the source {@code Publisher} when the specified
+     *            a function to test each item emitted from the current {@code Flowable}
+     * @return a {@code Flowable} that begins emitting items emitted by the current {@code Flowable} when the specified
      *         predicate becomes {@code false}
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skipwhile.html">ReactiveX operators documentation: SkipWhile</a>
      */
     @CheckReturnValue
@@ -14681,13 +15095,13 @@ public final Flowable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sorted} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} in sorted order
+     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} in sorted order
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -14706,44 +15120,46 @@ public final Flowable<T> sorted() {
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sorted} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param sortFunction
-     *            a function that compares two items emitted by the source {@code Publisher} and returns an {@link Integer}
+     * @param comparator
+     *            a function that compares two items emitted by the current {@code Flowable} and returns an {@link Integer}
      *            that indicates their sort order
-     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} in sorted order
+     * @throws NullPointerException if {@code comparator} is {@code null}
+     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} in sorted order
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> sortFunction) {
-        Objects.requireNonNull(sortFunction, "sortFunction is null");
-        return toList().toFlowable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.identity());
+    public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> comparator) {
+        Objects.requireNonNull(comparator, "comparator is null");
+        return toList().toFlowable().map(Functions.listSorter(comparator)).flatMapIterable(Functions.identity());
     }
 
     /**
      * Returns a {@code Flowable} that emits the items in a specified {@link Iterable} before it begins to emit items
-     * emitted by the source {@link Publisher}.
+     * emitted by the current {@code Flowable}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}
+     *  <dd>The operator honors backpressure from downstream. The Current {@code Flowable}
      *  is expected to honor backpressure as well. If it violates this rule, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWithIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param items
-     *            an {@code Iterable} that contains the items you want the modified {@code Publisher} to emit first
+     *            an {@code Iterable} that contains the items you want the resulting {@code Flowable} to emit first
      * @return a {@code Flowable} that emits the items in the specified {@code Iterable} and then emits the items
-     *         emitted by the source {@code Publisher}
+     *         emitted by the current {@code Flowable}
+     * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithArray(Object...)
      * @see #startWithItem(Object)
@@ -14759,14 +15175,14 @@ public final Flowable<T> startWithIterable(@NonNull Iterable<? extends T> items)
 
     /**
      * Returns a {@code Flowable} that emits the items in a specified {@link Publisher} before it begins to emit
-     * items emitted by the source {@code Publisher}.
+     * items emitted by the current {@code Flowable}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.o.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the {@code other} {@code Publisher}s
      *  are expected to honor backpressure as well. If any of then violates this rule, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -14774,7 +15190,8 @@ public final Flowable<T> startWithIterable(@NonNull Iterable<? extends T> items)
      * @param other
      *            a {@code Publisher} that contains the items you want the modified {@code Publisher} to emit first
      * @return a {@code Flowable} that emits the items in the specified {@code Publisher} and then emits the items
-     *         emitted by the source {@code Publisher}
+     *         emitted by the current {@code Flowable}
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      */
     @CheckReturnValue
@@ -14787,23 +15204,24 @@ public final Flowable<T> startWith(@NonNull Publisher<? extends T> other) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits a specified item before it begins to emit items emitted by the source
-     * {@link Publisher}.
+     * Returns a {@code Flowable} that emits a specified item before it begins to emit items emitted by the current
+     * {@code Flowable}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}
+     *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}
      *  is expected to honor backpressure as well. If it violates this rule, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWithItem} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param item
      *            the item to emit first
-     * @return a {@code Flowable} that emits the specified item before it begins to emit items emitted by the source
-     *         {@code Publisher}
+     * @return a {@code Flowable} that emits the specified item before it begins to emit items emitted by the current
+     *         {@code Flowable}
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithArray(Object...)
      * @see #startWithIterable(Iterable)
@@ -14819,23 +15237,24 @@ public final Flowable<T> startWithItem(@NonNull T item) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits the specified items before it begins to emit items emitted by the source
-     * {@link Publisher}.
+     * Returns a {@code Flowable} that emits the specified items before it begins to emit items emitted by the current
+     * {@code Flowable}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}
+     *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}
      *  is expected to honor backpressure as well. If it violates this rule, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWithArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param items
      *            the array of values to emit first
-     * @return a {@code Flowable} that emits the specified items before it begins to emit items emitted by the source
-     *         {@code Publisher}
+     * @return a {@code Flowable} that emits the specified items before it begins to emit items emitted by the current
+     *         {@code Flowable}
+     * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithItem(Object)
      * @see #startWithIterable(Iterable)
@@ -14861,7 +15280,7 @@ public final Flowable<T> startWithArray(@NonNull T... items) {
      * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no
      *  backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14886,7 +15305,7 @@ public final Disposable subscribe() {
      * and routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no
      *  backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14913,7 +15332,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
      * notification it issues.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no
      *  backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14928,8 +15347,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
      *         the {@code Publisher} has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
-     *             if {@code onNext} is {@code null}, or
-     *             if {@code onError} is {@code null}
+     *             if {@code onNext} or {@code onError} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -14944,7 +15362,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
      * completion notification it issues.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner (i.e., no
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no
      *  backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14961,9 +15379,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
      *         the {@code Publisher} has finished sending them
      * @throws NullPointerException
-     *             if {@code onNext} is {@code null}, or
-     *             if {@code onError} is {@code null}, or
-     *             if {@code onComplete} is {@code null}
+     *             if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
@@ -14986,12 +15402,12 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
-    public final void subscribe(@NonNull Subscriber<? super T> s) {
-        if (s instanceof FlowableSubscriber) {
-            subscribe((FlowableSubscriber<? super T>)s);
+    public final void subscribe(@NonNull Subscriber<? super T> subscriber) {
+        if (subscriber instanceof FlowableSubscriber) {
+            subscribe((FlowableSubscriber<? super T>)subscriber);
         } else {
-            Objects.requireNonNull(s, "s is null");
-            subscribe(new StrictSubscriber<>(s));
+            Objects.requireNonNull(subscriber, "subscriber is null");
+            subscribe(new StrictSubscriber<>(subscriber));
         }
     }
 
@@ -15029,19 +15445,20 @@ public final void subscribe(@NonNull Subscriber<? super T> s) {
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.7 - experimental; 2.1 - beta
-     * @param s the {@code FlowableSubscriber} that will consume signals from this {@code Flowable}
+     * @param subscriber the {@code FlowableSubscriber} that will consume signals from this {@code Flowable}
+     * @throws NullPointerException if {@code subscriber} is {@code null}
      * @since 2.2
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
-        Objects.requireNonNull(s, "s is null");
+    public final void subscribe(@NonNull FlowableSubscriber<? super T> subscriber) {
+        Objects.requireNonNull(subscriber, "subscriber is null");
         try {
-            Subscriber<? super T> z = RxJavaPlugins.onSubscribe(this, s);
+            Subscriber<? super T> flowableSubscriber = RxJavaPlugins.onSubscribe(this, subscriber);
 
-            Objects.requireNonNull(z, "The RxJavaPlugins.onSubscribe hook returned a null FlowableSubscriber. Please check the handler provided to RxJavaPlugins.setOnFlowableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
+            Objects.requireNonNull(flowableSubscriber, "The RxJavaPlugins.onSubscribe hook returned a null FlowableSubscriber. Please check the handler provided to RxJavaPlugins.setOnFlowableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
 
-            subscribeActual(z);
+            subscribeActual(flowableSubscriber);
         } catch (NullPointerException e) { // NOPMD
             throw e;
         } catch (Throwable e) {
@@ -15062,9 +15479,9 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
      * <p>There is no need to call any of the plugin hooks on the current {@code Flowable} instance or
      * the {@code Subscriber}; all hooks and basic safeguards have been
      * applied by {@link #subscribe(Subscriber)} before this method gets called.
-     * @param s the incoming {@code Subscriber}, never {@code null}
+     * @param subscriber the incoming {@code Subscriber}, never {@code null}
      */
-    protected abstract void subscribeActual(@NonNull Subscriber<? super T> s);
+    protected abstract void subscribeActual(@NonNull Subscriber<? super T> subscriber);
 
     /**
      * Subscribes a given {@link Subscriber} (subclass) to this {@code Flowable} and returns the given
@@ -15103,7 +15520,7 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
     }
 
     /**
-     * Asynchronously subscribes {@link Subscriber}s to this {@link Publisher} on the specified {@link Scheduler}.
+     * Asynchronously subscribes {@link Subscriber}s to the current {@code Flowable} on the specified {@link Scheduler}.
      * <p>
      * If there is a {@link #create(FlowableOnSubscribe, BackpressureStrategy)} type source up in the
      * chain, it is recommended to use {@code subscribeOn(scheduler, false)} instead
@@ -15112,7 +15529,7 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -15120,8 +15537,9 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> s) {
      *
      * @param scheduler
      *            the {@code Scheduler} to perform subscription actions on
-     * @return the source {@code Publisher} modified so that its subscriptions happen on the
+     * @return the current {@code Flowable} modified so that its subscriptions happen on the
      *         specified {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #observeOn
@@ -15137,7 +15555,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Asynchronously subscribes {@link Subscriber}s to this {@link Publisher} on the specified {@link Scheduler}
+     * Asynchronously subscribes {@link Subscriber}s to the current {@code Flowable} on the specified {@link Scheduler}
      * optionally reroutes requests from other threads to the same {@code Scheduler} thread.
      * <p>
      * If there is a {@link #create(FlowableOnSubscribe, BackpressureStrategy)} type source up in the
@@ -15147,7 +15565,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -15158,8 +15576,9 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
      * @param requestOn if {@code true}, requests are rerouted to the given {@code Scheduler} as well (strong pipelining)
      *                  if {@code false}, requests coming from any thread are simply forwarded to
      *                  the upstream on the same thread (weak pipelining)
-     * @return the source {@code Publisher} modified so that its subscriptions happen on the
+     * @return the current {@code Flowable} modified so that its subscriptions happen on the
      *         specified {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #observeOn
@@ -15175,14 +15594,14 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} or the items of an alternate
-     * {@code Publisher} if the source {@code Publisher} is empty.
+     * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} or the items of an alternate
+     * {@link Publisher} if the current {@code Flowable} is empty.
      * <p>
      * <img width="640" height="255" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>If the source {@code Publisher} is empty, the alternate {@code Publisher} is expected to honor backpressure.
-     *  If the source {@code Publisher} is non-empty, it is expected to honor backpressure as instead.
+     *  <dd>If the current {@code Flowable} is empty, the alternate {@code Publisher} is expected to honor backpressure.
+     *  If the current {@code Flowable} is non-empty, it is expected to honor backpressure as instead.
      *  In either case, if violated, a {@link MissingBackpressureException} <em>may</em> get
      *  signaled somewhere downstream.
      *  </dd>
@@ -15192,8 +15611,9 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
      *
      * @param other
      *              the alternate {@code Publisher} to subscribe to if the source does not emit any items
-     * @return  a {@code Publisher} that emits the items emitted by the source {@code Publisher} or the items of an
-     *          alternate {@code Publisher} if the source {@code Publisher} is empty.
+     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} or the items of an
+     *          alternate {@code Publisher} if the current {@code Flowable} is empty.
+     * @throws NullPointerException if {@code other} is {@code null}
      * @since 1.1.0
      */
     @CheckReturnValue
@@ -15206,12 +15626,12 @@ public final Flowable<T> switchIfEmpty(@NonNull Publisher<? extends T> other) {
     }
 
     /**
-     * Returns a new {@link Publisher} by applying a function that you supply to each item emitted by the source
-     * {@code Publisher} that returns a {@code Publisher}, and then emitting the items emitted by the most recently emitted
+     * Returns a new {@code Flowable} by applying a function that you supply to each item emitted by the current
+     * {@code Flowable} that returns a {@link Publisher}, and then emitting the items emitted by the most recently emitted
      * of these {@code Publisher}s.
      * <p>
-     * The resulting {@code Publisher} completes if both the upstream {@code Publisher} and the last inner {@code Publisher}, if any, complete.
-     * If the upstream {@code Publisher} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
+     * The resulting {@code Flowable} completes if both the current {@code Flowable} and the last inner {@code Publisher}, if any, complete.
+     * If the current {@code Flowable} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
@@ -15226,9 +15646,10 @@ public final Flowable<T> switchIfEmpty(@NonNull Publisher<? extends T> other) {
      *
      * @param <R> the element type of the inner {@code Publisher}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the source {@code Publisher}
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the current {@code Flowable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapDelayError(Function)
      */
@@ -15241,12 +15662,12 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
     }
 
     /**
-     * Returns a new {@link Publisher} by applying a function that you supply to each item emitted by the source
-     * {@code Publisher} that returns a {@code Publisher}, and then emitting the items emitted by the most recently emitted
+     * Returns a new {@code Flowable} by applying a function that you supply to each item emitted by the current
+     * {@code Flowable} that returns a {@link Publisher}, and then emitting the items emitted by the most recently emitted
      * of these {@code Publisher}s.
      * <p>
-     * The resulting {@code Publisher} completes if both the upstream {@code Publisher} and the last inner {@code Publisher}, if any, complete.
-     * If the upstream {@code Publisher} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
+     * The resulting {@code Flowable} completes if both the current {@code Flowable} and the last inner {@code Publisher}, if any, complete.
+     * If the current {@code Flowable} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
      * <dl>
@@ -15261,11 +15682,13 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
      *
      * @param <R> the element type of the inner {@code Publisher}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @param bufferSize
      *            the number of elements to prefetch from the current active inner {@code Publisher}
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the source {@code Publisher}
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the current {@code Flowable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapDelayError(Function, int)
      */
@@ -15311,6 +15734,7 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
      *               {@code CompletableSource} to be subscribed to and awaited for
      *               (non blockingly) for its terminal event
      * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapCompletableDelayError(Function)
      * @since 2.2
      */
@@ -15358,6 +15782,7 @@ public final Completable switchMapCompletable(@NonNull Function<? super T, ? ext
      *               {@code CompletableSource} to be subscribed to and awaited for
      *               (non blockingly) for its terminal event
      * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapCompletable(Function)
      * @since 2.2
      */
@@ -15371,12 +15796,12 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
     }
 
     /**
-     * Returns a new {@link Publisher} by applying a function that you supply to each item emitted by the source
-     * {@code Publisher} that returns a {@code Publisher}, and then emitting the items emitted by the most recently emitted
+     * Returns a new {@code Flowable} by applying a function that you supply to each item emitted by the current
+     * {@code Flowable} that returns a {@link Publisher}, and then emitting the items emitted by the most recently emitted
      * of these {@code Publisher}s and delays any error until all {@code Publisher}s terminate.
      * <p>
-     * The resulting {@code Publisher} completes if both the upstream {@code Publisher} and the last inner {@code Publisher}, if any, complete.
-     * If the upstream {@code Publisher} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
+     * The resulting {@code Flowable} completes if both the current {@code Flowable} and the last inner {@code Publisher}, if any, complete.
+     * If the current {@code Flowable} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
      * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
@@ -15392,9 +15817,10 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
      *
      * @param <R> the element type of the inner {@code Publisher}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the source {@code Publisher}
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the current {@code Flowable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMap(Function)
      * @since 2.0
@@ -15408,12 +15834,12 @@ public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ?
     }
 
     /**
-     * Returns a new {@link Publisher} by applying a function that you supply to each item emitted by the source
-     * {@code Publisher} that returns a {@code Publisher}, and then emitting the items emitted by the most recently emitted
+     * Returns a new {@code Flowable} by applying a function that you supply to each item emitted by the current
+     * {@code Flowable} that returns a {@link Publisher}, and then emitting the items emitted by the most recently emitted
      * of these {@code Publisher}s and delays any error until all {@code Publisher}s terminate.
      * <p>
-     * The resulting {@code Publisher} completes if both the upstream {@code Publisher} and the last inner {@code Publisher}, if any, complete.
-     * If the upstream {@code Publisher} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
+     * The resulting {@code Flowable} completes if both the current {@code Flowable} and the last inner {@code Publisher}, if any, complete.
+     * If the current {@code Flowable} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
      * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <p>
      * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
@@ -15429,11 +15855,13 @@ public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ?
      *
      * @param <R> the element type of the inner {@code Publisher}s and the output
      * @param mapper
-     *            a function that, when applied to an item emitted by the source {@code Publisher}, returns a
+     *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
      * @param bufferSize
      *            the number of elements to prefetch from the current active inner {@code Publisher}
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the source {@code Publisher}
+     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the current {@code Flowable}
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMap(Function, int)
      * @since 2.0
@@ -15489,6 +15917,7 @@ <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<? extends R>>
      *               return a {@code MaybeSource} to replace the current active inner source
      *               and get subscribed to.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapMaybeDelayError(Function)
      * @since 2.2
      */
@@ -15520,6 +15949,7 @@ public final <R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? exten
      *               return a {@code MaybeSource} to replace the current active inner source
      *               and get subscribed to.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapMaybe(Function)
      * @since 2.2
      */
@@ -15561,6 +15991,7 @@ public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super
      *               return a {@code SingleSource} to replace the current active inner source
      *               and get subscribed to.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapSingleDelayError(Function)
      * @since 2.2
      */
@@ -15592,6 +16023,7 @@ public final <R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? exte
      *               return a {@code SingleSource} to replace the current active inner source
      *               and get subscribed to.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #switchMapSingle(Function)
      * @since 2.2
      */
@@ -15605,12 +16037,12 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
     }
 
     /**
-     * Returns a {@code Flowable} that emits only the first {@code count} items emitted by the source {@link Publisher}. If the source emits fewer than
+     * Returns a {@code Flowable} that emits only the first {@code count} items emitted by the current {@code Flowable}. If the source emits fewer than
      * {@code count} items then all of its items are emitted.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.png" alt="">
      * <p>
-     * This method returns a {@code Publisher} that will invoke a subscribing {@link Subscriber}'s
+     * This method returns a {@code Flowable} that will invoke a subscribing {@link Subscriber}'s
      * {@link Subscriber#onNext onNext} function a maximum of {@code count} times before invoking
      * {@link Subscriber#onComplete onComplete}.
      * <p>
@@ -15631,7 +16063,7 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
      * default (128) elements from the given {@code source}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The source {@code Publisher} is consumed in a bounded manner.</dd>
+     *  <dd>The current {@code Flowable} is consumed in a bounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code take} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -15640,8 +16072,8 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
      *            the maximum number of items and the total request amount, non-negative.
      *            Zero will immediately cancel the upstream on subscription and complete
      *            the downstream.
-     * @return a {@code Flowable} that emits only the first {@code count} items emitted by the source {@code Publisher}, or
-     *         all of the items from the source {@code Publisher} if that {@code Publisher} emits fewer than {@code count} items
+     * @return a {@code Flowable} that emits only the first {@code count} items emitted by the current {@code Flowable}, or
+     *         all of the items from the current {@code Flowable} if it emits fewer than {@code count} items
      * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
@@ -15666,7 +16098,7 @@ public final Flowable<T> take(long count) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.t.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code take} operates by default on the {@code computation} {@code Scheduler}.</dd>
@@ -15676,7 +16108,8 @@ public final Flowable<T> take(long count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that emits those items emitted by the source {@code Publisher} before the time runs out
+     * @return a {@code Flowable} that emits those items emitted by the current {@code Flowable} before the time runs out
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
     @CheckReturnValue
@@ -15697,7 +16130,7 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.ts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -15709,8 +16142,9 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit) {
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} used for time source
-     * @return a {@code Flowable} that emits those items emitted by the source {@code Publisher} before the time runs out,
+     * @return a {@code Flowable} that emits those items emitted by the current {@code Flowable} before the time runs out,
      *         according to the specified {@code Scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
     @CheckReturnValue
@@ -15722,7 +16156,7 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit, @NonNull Schedu
     }
 
     /**
-     * Returns a {@code Flowable} that emits at most the last {@code count} items emitted by the source {@link Publisher}. If the source emits fewer than
+     * Returns a {@code Flowable} that emits at most the last {@code count} items emitted by the current {@code Flowable}. If the source emits fewer than
      * {@code count} items then all of its items are emitted.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.n.png" alt="">
@@ -15735,9 +16169,9 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit, @NonNull Schedu
      * </dl>
      *
      * @param count
-     *            the maximum number of items to emit from the end of the sequence of items emitted by the source
-     *            {@code Publisher}
-     * @return a {@code Flowable} that emits at most the last {@code count} items emitted by the source {@code Publisher}
+     *            the maximum number of items to emit from the end of the sequence of items emitted by the current
+     *            {@code Flowable}
+     * @return a {@code Flowable} that emits at most the last {@code count} items emitted by the current {@code Flowable}
      * @throws IllegalArgumentException
      *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -15760,13 +16194,13 @@ public final Flowable<T> takeLast(int count) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits at most a specified number of items from the source {@link Publisher} that were
-     * emitted in a specified window of time before the {@code Publisher} completed.
+     * Returns a {@code Flowable} that emits at most a specified number of items from the current {@code Flowable} that were
+     * emitted in a specified window of time before the current {@code Flowable} completed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., no backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeLast} does not operate on any particular scheduler but uses the current time
@@ -15779,8 +16213,10 @@ public final Flowable<T> takeLast(int count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that emits at most {@code count} items from the source {@code Publisher} that were emitted
-     *         in a specified window of time before the {@code Publisher} completed
+     * @return a {@code Flowable} that emits at most {@code count} items from the current {@code Flowable} that were emitted
+     *         in a specified window of time before the current {@code Flowable} completed
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -15792,14 +16228,14 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit)
     }
 
     /**
-     * Returns a {@code Flowable} that emits at most a specified number of items from the source {@link Publisher} that were
-     * emitted in a specified window of time before the {@code Publisher} completed, where the timing information is
+     * Returns a {@code Flowable} that emits at most a specified number of items from the current {@code Flowable} that were
+     * emitted in a specified window of time before the current {@code Flowable} completed, where the timing information is
      * provided by a given {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., no backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use for tracking the current time</dd>
@@ -15813,9 +16249,10 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit)
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that provides the timestamps for the observed items
-     * @return a {@code Flowable} that emits at most {@code count} items from the source {@code Publisher} that were emitted
-     *         in a specified window of time before the {@code Publisher} completed, where the timing information is
+     * @return a {@code Flowable} that emits at most {@code count} items from the current {@code Flowable} that were emitted
+     *         in a specified window of time before the current {@code Flowable} completed, where the timing information is
      *         provided by the given {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -15829,14 +16266,14 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a {@code Flowable} that emits at most a specified number of items from the source {@link Publisher} that were
-     * emitted in a specified window of time before the {@code Publisher} completed, where the timing information is
+     * Returns a {@code Flowable} that emits at most a specified number of items from the current {@code Flowable} that were
+     * emitted in a specified window of time before the current {@code Flowable} completed, where the timing information is
      * provided by a given {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., no backpressure is applied to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use for tracking the current time</dd>
@@ -15855,11 +16292,12 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return a {@code Flowable} that emits at most {@code count} items from the source {@code Publisher} that were emitted
-     *         in a specified window of time before the {@code Publisher} completed, where the timing information is
+     * @return a {@code Flowable} that emits at most {@code count} items from the current {@code Flowable} that were emitted
+     *         in a specified window of time before the current {@code Flowable} completed, where the timing information is
      *         provided by the given {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code count} is negative
+     *             if {@code count} is negative or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -15877,13 +16315,13 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
-     * window of time before the {@code Publisher} completed.
+     * Returns a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in a specified
+     * window of time before the current {@code Flowable} completed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
      *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit)} in this case.</dd>
@@ -15895,8 +16333,9 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
-     *         time before the {@code Publisher} completed specified by {@code time}
+     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
+     *         time before the current {@code Flowable} completed specified by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -15908,13 +16347,13 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
-     * window of time before the {@code Publisher} completed.
+     * Returns a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in a specified
+     * window of time before the current {@code Flowable} completed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
      *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit)} in this case.</dd>
@@ -15929,8 +16368,9 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit) {
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
-     *         time before the {@code Publisher} completed specified by {@code time}
+     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
+     *         time before the current {@code Flowable} completed specified by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -15942,14 +16382,14 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, boolean del
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
-     * window of time before the {@code Publisher} completed, where the timing information is provided by a specified
+     * Returns a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in a specified
+     * window of time before the current {@code Flowable} completed, where the timing information is provided by a specified
      * {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
      *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit, Scheduler)} in this case.</dd>
@@ -15963,9 +16403,10 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, boolean del
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that provides the timestamps for the observed items
-     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
-     *         time before the {@code Publisher} completed specified by {@code time}, where the timing information is
+     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
+     *         time before the current {@code Flowable} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -15977,14 +16418,14 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
-     * window of time before the {@code Publisher} completed, where the timing information is provided by a specified
+     * Returns a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in a specified
+     * window of time before the current {@code Flowable} completed, where the timing information is provided by a specified
      * {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
      *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit, Scheduler)} in this case.</dd>
@@ -16001,9 +16442,10 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
-     *         time before the {@code Publisher} completed specified by {@code time}, where the timing information is
+     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
+     *         time before the current {@code Flowable} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -16015,14 +16457,14 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items from the source {@link Publisher} that were emitted in a specified
-     * window of time before the {@code Publisher} completed, where the timing information is provided by a specified
+     * Returns a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in a specified
+     * window of time before the current {@code Flowable} completed, where the timing information is provided by a specified
      * {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., no backpressure is applied to it) but note that this <em>may</em>
      *  lead to {@link OutOfMemoryError} due to internal buffer bloat.
      *  Consider using {@link #takeLast(long, long, TimeUnit, Scheduler)} in this case.</dd>
@@ -16041,9 +16483,11 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return a {@code Flowable} that emits the items from the source {@code Publisher} that were emitted in the window of
-     *         time before the {@code Publisher} completed specified by {@code time}, where the timing information is
+     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
+     *         time before the current {@code Flowable} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -16055,7 +16499,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a {@code Flowable} that emits items emitted by the source {@link Publisher}, checks the specified predicate
+     * Returns a {@code Flowable} that emits items emitted by the current {@code Flowable}, checks the specified predicate
      * for each item, and then completes when the condition is satisfied.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.p.png" alt="">
@@ -16072,9 +16516,10 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * </dl>
      *
      * @param stopPredicate
-     *            a function that evaluates an item emitted by the source {@code Publisher} and returns a {@link Boolean}
-     * @return a {@code Flowable} that first emits items emitted by the source {@code Publisher}, checks the specified
+     *            a function that evaluates an item emitted by the current {@code Flowable} and returns a {@link Boolean}
+     * @return a {@code Flowable} that first emits items emitted by the current {@code Flowable}, checks the specified
      *         condition after each item, and then completes when the condition is satisfied.
+     * @throws NullPointerException if {@code stopPredicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      * @see Flowable#takeWhile(Predicate)
      * @since 1.1.0
@@ -16089,13 +16534,13 @@ public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate)
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted by the source {@link Publisher} until a second {@code Publisher}
+     * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} until a second {@link Publisher}
      * emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeUntil} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -16103,10 +16548,11 @@ public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate)
      *
      * @param other
      *            the {@code Publisher} whose first emitted item will cause {@code takeUntil} to stop emitting items
-     *            from the source {@code Publisher}
+     *            from the current {@code Flowable}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return a {@code Flowable} that emits the items emitted by the source {@code Publisher} until such time as {@code other} emits its first item
+     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} until such time as {@code other} emits its first item
+     * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
     @CheckReturnValue
@@ -16119,22 +16565,23 @@ public final <U> Flowable<T> takeUntil(@NonNull Publisher<U> other) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits items emitted by the source {@link Publisher} so long as each item satisfied a
+     * Returns a {@code Flowable} that emits items emitted by the current {@code Flowable} so long as each item satisfied a
      * specified condition, and then completes as soon as this condition is not satisfied.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeWhile.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeWhile} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates an item emitted by the source {@code Publisher} and returns a {@link Boolean}
-     * @return a {@code Flowable} that emits the items from the source {@code Publisher} so long as each item satisfies the
+     *            a function that evaluates an item emitted by the current {@code Flowable} and returns a {@link Boolean}
+     * @return a {@code Flowable} that emits the items from the current {@code Flowable} so long as each item satisfies the
      *         condition defined by {@code predicate}, then completes
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takewhile.html">ReactiveX operators documentation: TakeWhile</a>
      * @see Flowable#takeUntil(Predicate)
      */
@@ -16148,7 +16595,7 @@ public final Flowable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits only the first item emitted by the source {@link Publisher} during sequential
+     * Returns a {@code Flowable} that emits only the first item emitted by the current {@code Flowable} during sequential
      * time windows of a specified duration.
      * <p>
      * This differs from {@link #throttleLast} in that this only tracks the passage of time whereas
@@ -16167,6 +16614,7 @@ public final Flowable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
      * @param unit
      *            the unit of time of {@code windowDuration}
      * @return a {@code Flowable} that performs the throttle operation
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      */
@@ -16179,7 +16627,7 @@ public final Flowable<T> throttleFirst(long windowDuration, @NonNull TimeUnit un
     }
 
     /**
-     * Returns a {@code Flowable} that emits only the first item emitted by the source {@link Publisher} during sequential
+     * Returns a {@code Flowable} that emits only the first item emitted by the current {@code Flowable} during sequential
      * time windows of a specified duration, where the windows are managed by a specified {@link Scheduler}.
      * <p>
      * This differs from {@link #throttleLast} in that this only tracks the passage of time whereas
@@ -16201,6 +16649,7 @@ public final Flowable<T> throttleFirst(long windowDuration, @NonNull TimeUnit un
      *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
      * @return a {@code Flowable} that performs the throttle operation
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      */
@@ -16215,7 +16664,7 @@ public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit
     }
 
     /**
-     * Returns a {@code Flowable} that emits only the last item emitted by the source {@link Publisher} during sequential
+     * Returns a {@code Flowable} that emits only the last item emitted by the current {@code Flowable} during sequential
      * time windows of a specified duration.
      * <p>
      * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
@@ -16230,11 +16679,12 @@ public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit
      * </dl>
      *
      * @param intervalDuration
-     *            duration of windows within which the last item emitted by the source {@code Publisher} will be
+     *            duration of windows within which the last item emitted by the current {@code Flowable} will be
      *            emitted
      * @param unit
      *            the unit of time of {@code intervalDuration}
      * @return a {@code Flowable} that performs the throttle operation
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #sample(long, TimeUnit)
@@ -16248,7 +16698,7 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
     }
 
     /**
-     * Returns a {@code Flowable} that emits only the last item emitted by the source {@link Publisher} during sequential
+     * Returns a {@code Flowable} that emits only the last item emitted by the current {@code Flowable} during sequential
      * time windows of a specified duration, where the duration is governed by a specified {@link Scheduler}.
      * <p>
      * This differs from {@link #throttleFirst(long, TimeUnit, Scheduler)} in that this ticks along at a scheduled interval whereas
@@ -16263,7 +16713,7 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      * </dl>
      *
      * @param intervalDuration
-     *            duration of windows within which the last item emitted by the source {@code Publisher} will be
+     *            duration of windows within which the last item emitted by the current {@code Flowable} will be
      *            emitted
      * @param unit
      *            the unit of time of {@code intervalDuration}
@@ -16271,6 +16721,7 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
      * @return a {@code Flowable} that performs the throttle operation
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #sample(long, TimeUnit, Scheduler)
@@ -16309,6 +16760,7 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      *                before trying to emit the latest item from upstream again
      * @param unit    the time unit
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @since 2.2
      * @see #throttleLatest(long, TimeUnit, boolean)
      * @see #throttleLatest(long, TimeUnit, Scheduler)
@@ -16348,6 +16800,7 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit) {
      *                 a timeout window active or not. If {@code false}, the very last
      *                 upstream item is ignored and the flow terminates.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see #throttleLatest(long, TimeUnit, Scheduler, boolean)
      * @since 2.2
      */
@@ -16387,6 +16840,7 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, bo
      * @param scheduler the {@code Scheduler} where the timed wait and latest item
      *                  emission will be performed
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see #throttleLatest(long, TimeUnit, Scheduler, boolean)
      * @since 2.2
      */
@@ -16427,6 +16881,7 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
      *                 a timeout window active or not. If {@code false}, the very last
      *                 upstream item is ignored and the flow terminates.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -16440,12 +16895,12 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
-     * source {@code Publisher} that are followed by newer items before a timeout value expires. The timer resets on
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, except that it drops items emitted by the
+     * current {@code Flowable} that are followed by newer items before a timeout value expires. The timer resets on
      * each emission (alias to {@link #debounce(long, TimeUnit)}).
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source {@code Publisher} faster than the timeout then no items
-     * will be emitted by the resulting {@code Publisher}.
+     * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Flowable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.png" alt="">
      * <dl>
@@ -16456,13 +16911,14 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
      * </dl>
      *
      * @param timeout
-     *            the length of the window of time that must pass after the emission of an item from the source
-     *            {@code Publisher} in which that {@code Publisher} emits no items in order for the item to be emitted by the
-     *            resulting {@code Publisher}
+     *            the length of the window of time that must pass after the emission of an item from the current
+     *            {@code Flowable} in which it emits no items in order for the item to be emitted by the
+     *            resulting {@code Flowable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return a {@code Flowable} that filters out items from the source {@code Publisher} that are too quickly followed by
+     * @return a {@code Flowable} that filters out items from the current {@code Flowable} that are too quickly followed by
      *         newer items
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #debounce(long, TimeUnit)
@@ -16476,12 +16932,12 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, except that it drops items emitted by the
-     * source {@code Publisher} that are followed by newer items before a timeout value expires on a specified
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, except that it drops items emitted by the
+     * current {@code Flowable} that are followed by newer items before a timeout value expires on a specified
      * {@link Scheduler}. The timer resets on each emission (alias to {@link #debounce(long, TimeUnit, Scheduler)}).
      * <p>
-     * <em>Note:</em> If items keep being emitted by the source {@code Publisher} faster than the timeout then no items
-     * will be emitted by the resulting {@code Publisher}.
+     * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Flowable}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.s.png" alt="">
      * <dl>
@@ -16492,16 +16948,17 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
      * </dl>
      *
      * @param timeout
-     *            the length of the window of time that must pass after the emission of an item from the source
-     *            {@code Publisher} in which that {@code Publisher} emits no items in order for the item to be emitted by the
-     *            resulting {@code Publisher}
+     *            the length of the window of time that must pass after the emission of an item from the current
+     *            {@code Flowable} in which it emits no items in order for the item to be emitted by the
+     *            resulting {@code Flowable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return a {@code Flowable} that filters out items from the source {@code Publisher} that are too quickly followed by
+     * @return a {@code Flowable} that filters out items from the current {@code Flowable} that are too quickly followed by
      *         newer items
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #debounce(long, TimeUnit, Scheduler)
@@ -16516,12 +16973,12 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
 
     /**
      * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
-     * source {@link Publisher}.
+     * current {@code Flowable}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeInterval} does not operate on any particular scheduler but uses the current time
@@ -16541,12 +16998,12 @@ public final Flowable<Timed<T>> timeInterval() {
 
     /**
      * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
-     * source {@link Publisher}, where this interval is computed on a specified {@link Scheduler}.
+     * current {@code Flowable}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeInterval} does not operate on any particular scheduler but uses the current time
@@ -16556,6 +17013,7 @@ public final Flowable<Timed<T>> timeInterval() {
      * @param scheduler
      *            the {@code Scheduler} used to compute time intervals
      * @return a {@code Flowable} that emits time interval information items
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -16568,12 +17026,12 @@ public final Flowable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
 
     /**
      * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
-     * source {@link Publisher}.
+     * current {@code Flowable}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeInterval} does not operate on any particular scheduler but uses the current time
@@ -16582,6 +17040,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
      *
      * @param unit the time unit for the current time
      * @return a {@code Flowable} that emits time interval information items
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -16594,12 +17053,12 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
 
     /**
      * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
-     * source {@link Publisher}, where this interval is computed on a specified {@link Scheduler}.
+     * current {@code Flowable}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeInterval} does not operate on any particular scheduler but uses the current time
@@ -16610,6 +17069,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
      * @param scheduler
      *            the {@code Scheduler} used to compute time intervals
      * @return a {@code Flowable} that emits time interval information items
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -16623,9 +17083,9 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Sc
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, but notifies {@link Subscriber}s of a
-     * {@link TimeoutException} if an item emitted by the source {@code Publisher} doesn't arrive within a window of
-     * time after the emission of the previous item, where that period of time is measured by a {@code Publisher} that
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, but notifies {@link Subscriber}s of a
+     * {@link TimeoutException} if an item emitted by the current {@code Flowable} doesn't arrive within a window of
+     * time after the emission of the previous item, where that period of time is measured by a {@link Publisher} that
      * is a function of the previous item.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout3.png" alt="">
@@ -16635,8 +17095,8 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Sc
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
-     *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  If any of the current {@code Flowable}s violate this, it <em>may</em> throw an
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code immediate} {@link Scheduler}.</dd>
      * </dl>
@@ -16644,11 +17104,12 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Sc
      * @param <V>
      *            the timeout value type (ignored)
      * @param itemTimeoutIndicator
-     *            a function that returns a {@code Publisher} for each item emitted by the source
-     *            {@code Publisher} and that determines the timeout window for the subsequent item
-     * @return a {@code Flowable} that mirrors the source {@code Publisher}, but notifies {@code Subscriber}s of a
-     *         {@code TimeoutException} if an item emitted by the source {@code Publisher} takes longer to arrive than
+     *            a function that returns a {@code Publisher} for each item emitted by the current
+     *            {@code Flowable} and that determines the timeout window for the subsequent item
+     * @return a {@code Flowable} that mirrors the current {@code Flowable}, but notifies {@code Subscriber}s of a
+     *         {@code TimeoutException} if an item emitted by the current {@code Flowable} takes longer to arrive than
      *         the time window defined by the selector for the previously emitted item
+     * @throws NullPointerException if {@code itemTimeoutIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -16660,8 +17121,8 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, but that switches to a fallback {@code Publisher} if
-     * an item emitted by the source {@code Publisher} doesn't arrive within a window of time after the emission of the
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, but that switches to a fallback {@link Publisher} if
+     * an item emitted by the current {@code Flowable} doesn't arrive within a window of time after the emission of the
      * previous item, where that period of time is measured by a {@code Publisher} that is a function of the previous
      * item.
      * <p>
@@ -16672,8 +17133,8 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
-     *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  If any of the current {@code Flowable}s violate this, it <em>may</em> throw an
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code immediate} {@link Scheduler}.</dd>
      * </dl>
@@ -16681,13 +17142,14 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      * @param <V>
      *            the timeout value type (ignored)
      * @param itemTimeoutIndicator
-     *            a function that returns a {@code Publisher}, for each item emitted by the source {@code Publisher}, that
+     *            a function that returns a {@code Publisher}, for each item emitted by the current {@code Flowable}, that
      *            determines the timeout window for the subsequent item
      * @param other
-     *            the fallback {@code Publisher} to switch to if the source {@code Publisher} times out
-     * @return a {@code Flowable} that mirrors the source {@code Publisher}, but switches to mirroring a fallback {@code Publisher}
-     *         if an item emitted by the source {@code Publisher} takes longer to arrive than the time window defined
+     *            the fallback {@code Publisher} to switch to if the current {@code Flowable} times out
+     * @return a {@code Flowable} that mirrors the current {@code Flowable}, but switches to mirroring a fallback {@code Publisher}
+     *         if an item emitted by the current {@code Flowable} takes longer to arrive than the time window defined
      *         by the selector for the previously emitted item
+     * @throws NullPointerException if {@code itemTimeoutIndicator} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -16700,14 +17162,14 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher} but applies a timeout policy for each emitted
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
-     * the resulting {@code Publisher} terminates and notifies {@link Subscriber}s of a {@link TimeoutException}.
+     * the resulting {@code Flowable} terminates and notifies {@link Subscriber}s of a {@link TimeoutException}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -16717,8 +17179,9 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      *            maximum duration between emitted items before a timeout occurs
      * @param unit
      *            the unit of time that applies to the {@code timeout} argument.
-     * @return the source {@code Publisher} modified to notify {@code Subscriber}s of a {@code TimeoutException} in case of a
+     * @return the current {@code Flowable} modified to notify {@code Subscriber}s of a {@code TimeoutException} in case of a
      *         timeout
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -16730,17 +17193,17 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher} but applies a timeout policy for each emitted
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
-     * the source {@code Publisher} is disposed and resulting {@code Publisher} begins instead to mirror a fallback {@code Publisher}.
+     * the current {@code Flowable} is disposed and the resulting {@code Flowable} begins instead to mirror a fallback {@link Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
-     *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  If any of the current {@code Flowable}s violate this, it <em>may</em> throw an
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
@@ -16751,7 +17214,8 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit) {
      *            the unit of time that applies to the {@code timeout} argument
      * @param other
      *            the fallback {@code Publisher} to use in case of a timeout
-     * @return the source {@code Publisher} modified to switch to the fallback {@code Publisher} in case of a timeout
+     * @return the current {@code Flowable} modified to switch to the fallback {@code Publisher} in case of a timeout
+     * @throws NullPointerException if {@code unit} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -16764,18 +17228,18 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher} but applies a timeout policy for each emitted
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable} but applies a timeout policy for each emitted
      * item using a specified {@link Scheduler}. If the next item isn't emitted within the specified timeout duration
-     * starting from its predecessor, the source {@code Publisher} is disposed and resulting {@code Publisher} begins
-     * instead to mirror a fallback {@code Publisher}.
+     * starting from its predecessor, the current {@code Flowable} is disposed and the resulting {@code Flowable} begins
+     * instead to mirror a fallback {@link Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
-     *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  If any of the current {@code Flowable}s violate this, it <em>may</em> throw an
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
@@ -16788,8 +17252,9 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      *            the {@code Scheduler} to run the timeout timers on
      * @param other
      *            the {@code Publisher} to use as the fallback in case of a timeout
-     * @return the source {@code Publisher} modified so that it will switch to the fallback {@code Publisher} in case of a
+     * @return the current {@code Flowable} modified so that it will switch to the fallback {@code Publisher} in case of a
      *         timeout
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -16802,15 +17267,15 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher} but applies a timeout policy for each emitted
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable} but applies a timeout policy for each emitted
      * item, where this policy is governed by a specified {@link Scheduler}. If the next item isn't emitted within the
-     * specified timeout duration starting from its predecessor, the resulting {@code Publisher} terminates and
+     * specified timeout duration starting from its predecessor, the resulting {@code Flowable} terminates and
      * notifies {@link Subscriber}s of a {@link TimeoutException}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -16822,8 +17287,9 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
      *            the {@code Scheduler} to run the timeout timers on
-     * @return the source {@code Publisher} modified to notify {@code Subscriber}s of a {@code TimeoutException} in case of a
+     * @return the current {@code Flowable} modified to notify {@code Subscriber}s of a {@code TimeoutException} in case of a
      *         timeout
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -16835,9 +17301,9 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, but notifies {@link Subscriber}s of a
-     * {@link TimeoutException} if either the first item emitted by the source {@code Publisher} or any subsequent item
-     * doesn't arrive within time windows defined by other {@code Publisher}s.
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, but notifies {@link Subscriber}s of a
+     * {@link TimeoutException} if either the first item emitted by the current {@code Flowable} or any subsequent item
+     * doesn't arrive within time windows defined by other {@link Publisher}s.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout5.png" alt="">
      * <dl>
@@ -16857,12 +17323,13 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      *            a function that returns a {@code Publisher} that determines the timeout window for the first source
      *            item
      * @param itemTimeoutIndicator
-     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher} and that
+     *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
-     * @return a {@code Flowable} that mirrors the source {@code Publisher}, but notifies {@code Subscriber}s of a
+     * @return a {@code Flowable} that mirrors the current {@code Flowable}, but notifies {@code Subscriber}s of a
      *         {@code TimeoutException} if either the first item or any subsequent item doesn't arrive within
      *         the time windows specified by the timeout selectors
+     * @throws NullPointerException if {@code firstTimeoutIndicator} or {@code itemTimeoutIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -16876,8 +17343,8 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
     }
 
     /**
-     * Returns a {@code Flowable} that mirrors the source {@link Publisher}, but switches to a fallback {@code Publisher} if either
-     * the first item emitted by the source {@code Publisher} or any subsequent item doesn't arrive within time windows
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, but switches to a fallback {@link Publisher} if either
+     * the first item emitted by the current {@code Flowable} or any subsequent item doesn't arrive within time windows
      * defined by other {@code Publisher}s.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout6.png" alt="">
@@ -16885,8 +17352,8 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
      *  sources are expected to honor backpressure as well.
-     *  If any of the source {@code Publisher}s violate this, it <em>may</em> throw an
-     *  {@link IllegalStateException} when the source {@code Publisher} completes.</dd>
+     *  If any of the current {@code Flowable}s violate this, it <em>may</em> throw an
+     *  {@link IllegalStateException} when the current {@code Flowable} completes.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeout} does not operate by default on any {@link Scheduler}.</dd>
      * </dl>
@@ -16899,16 +17366,15 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
      *            a function that returns a {@code Publisher} which determines the timeout window for the first source
      *            item
      * @param itemTimeoutIndicator
-     *            a function that returns a {@code Publisher} for each item emitted by the source {@code Publisher} and that
+     *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
      * @param other
-     *            the fallback {@code Publisher} to switch to if the source {@code Publisher} times out
-     * @return a {@code Flowable} that mirrors the source {@code Publisher}, but switches to the {@code other} {@code Publisher} if
-     *         either the first item emitted by the source {@code Publisher} or any subsequent item doesn't arrive
+     *            the fallback {@code Publisher} to switch to if the current {@code Flowable} times out
+     * @return a {@code Flowable} that mirrors the current {@code Flowable}, but switches to the {@code other} {@code Publisher} if
+     *         either the first item emitted by the current {@code Flowable} or any subsequent item doesn't arrive
      *         within time windows defined by the timeout selectors
-     * @throws NullPointerException
-     *             if {@code itemTimeoutIndicator} is {@code null}
+     * @throws NullPointerException if {@code firstTimeoutIndicator}, {@code itemTimeoutIndicator} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -16940,20 +17406,20 @@ private <U, V> Flowable<T> timeout0(
     }
 
     /**
-     * Returns a {@code Flowable} that emits each item emitted by the source {@link Publisher}, wrapped in a
+     * Returns a {@code Flowable} that emits each item emitted by the current {@code Flowable}, wrapped in a
      * {@link Timed} object.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timestamp} does not operate on any particular scheduler but uses the current time
      *  from the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits timestamped items from the source {@code Publisher}
+     * @return a {@code Flowable} that emits timestamped items from the current {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -16965,13 +17431,13 @@ public final Flowable<Timed<T>> timestamp() {
     }
 
     /**
-     * Returns a {@code Flowable} that emits each item emitted by the source {@link Publisher}, wrapped in a
+     * Returns a {@code Flowable} that emits each item emitted by the current {@code Flowable}, wrapped in a
      * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate on any particular scheduler but uses the current time
@@ -16980,8 +17446,9 @@ public final Flowable<Timed<T>> timestamp() {
      *
      * @param scheduler
      *            the {@code Scheduler} to use as a time source
-     * @return a {@code Flowable} that emits timestamped items from the source {@code Publisher} with timestamps provided by
+     * @return a {@code Flowable} that emits timestamped items from the current {@code Flowable} with timestamps provided by
      *         the {@code scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -16993,13 +17460,13 @@ public final Flowable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits each item emitted by the source {@link Publisher}, wrapped in a
+     * Returns a {@code Flowable} that emits each item emitted by the current {@code Flowable}, wrapped in a
      * {@link Timed} object.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timestamp} does not operate on any particular scheduler but uses the current time
@@ -17007,7 +17474,8 @@ public final Flowable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param unit the time unit for the current time
-     * @return a {@code Flowable} that emits timestamped items from the source {@code Publisher}
+     * @return a {@code Flowable} that emits timestamped items from the current {@code Flowable}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -17019,13 +17487,13 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits each item emitted by the source {@link Publisher}, wrapped in a
+     * Returns a {@code Flowable} that emits each item emitted by the current {@code Flowable}, wrapped in a
      * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate on any particular scheduler but uses the current time
@@ -17035,8 +17503,9 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
      * @param unit the time unit for the current time
      * @param scheduler
      *            the {@code Scheduler} to use as a time source
-     * @return a {@code Flowable} that emits timestamped items from the source {@code Publisher} with timestamps provided by
+     * @return a {@code Flowable} that emits timestamped items from the current {@code Flowable} with timestamps provided by
      *         the {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -17063,7 +17532,7 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Sched
      * @param <R> the resulting object type
      * @param converter the function that receives the current {@code Flowable} instance and returns a value
      * @return the converted value
-     * @throws NullPointerException if converter is {@code null}
+     * @throws NullPointerException if {@code converter} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -17090,14 +17559,14 @@ public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a single item: a {@link List} containing all of the items emitted by the source
-     *         {@code Publisher}
+     * @return a {@code Single} that emits a single item: a {@link List} containing all of the items emitted by the current
+     *         {@code Flowable}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17125,7 +17594,7 @@ public final Single<List<T>> toList() {
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toList} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17133,8 +17602,9 @@ public final Single<List<T>> toList() {
      *
      * @param capacityHint
      *         the number of elements expected from the current {@code Flowable}
-     * @return a {@code Single} that emits a single item: a {@link List} containing all of the items emitted by the source
-     *         {@code Publisher}
+     * @return a {@code Single} that emits a single item: a {@link List} containing all of the items emitted by the current
+     *         {@code Flowable}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17163,7 +17633,7 @@ public final Single<List<T>> toList(int capacityHint) {
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toList} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17172,8 +17642,9 @@ public final Single<List<T>> toList(int capacityHint) {
      * @param <U> the subclass of a collection of Ts
      * @param collectionSupplier
      *               the {@link Supplier} returning the collection (for each individual {@code Subscriber}) to be filled in
-     * @return a {@code Single} that emits a single item: a {@link Collection} (subclass) containing all of the items emitted by the source
-     *         {@code Publisher}
+     * @return a {@code Single} that emits a single item: a {@link Collection} (subclass) containing all of the items emitted by the current
+     *         {@code Flowable}
+     * @throws NullPointerException if {@code collectionSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17198,7 +17669,7 @@ public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplie
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17207,8 +17678,9 @@ public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplie
      * @param <K> the key type of the Map
      * @param keySelector
      *            the function that extracts the key from a source item to be used in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the source
-     *         {@code Publisher}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the current
+     *         {@code Flowable}
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17234,7 +17706,7 @@ public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17246,8 +17718,9 @@ public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends
      *            the function that extracts the key from a source item to be used in the {@code HashMap}
      * @param valueSelector
      *            the function that extracts the value from a source item to be used in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the source
-     *         {@code Publisher}
+     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the current
+     *         {@code Flowable}
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17271,7 +17744,7 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17286,7 +17759,8 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
      * @param mapSupplier
      *            the function that returns a {@code Map} instance to be used
      * @return a {@code Single} that emits a single item: a {@code Map} that contains the mapped items emitted by the
-     *         source {@code Publisher}
+     *         current {@code Flowable}
+     * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code mapSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17321,7 +17795,8 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
      * @param keySelector
      *            the function that extracts the key from the source items to be used as key in the {@code HashMap}
      * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
-     *         the source {@code Publisher}
+     *         the current {@code Flowable}
+     * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17347,7 +17822,7 @@ public final <K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? su
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMultimap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17360,7 +17835,8 @@ public final <K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? su
      * @param valueSelector
      *            the function that extracts a value from the source items to be used as value in the {@code HashMap}
      * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
-     *         the source {@code Publisher}
+     *         the current {@code Flowable}
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17385,7 +17861,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<?
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMultimap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17402,7 +17878,8 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<?
      * @param collectionFactory
      *            the function that returns a {@link Collection} instance for a particular key to be used in the {@code Map}
      * @return a {@code Single} that emits a single item: a {@code Map} that contains the {@code Collection} of mapped items from
-     *         the source {@code Publisher}
+     *         the current {@code Flowable}
+     * @throws NullPointerException if {@code keySelector}, {@code valueSelector}, {@code mapSupplier} or {@code collectionFactory} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17433,7 +17910,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toMultimap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17447,8 +17924,9 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
      *            the function that extracts a value from the source items to be used as the value in the {@code Map}
      * @param mapSupplier
      *            the function that returns a {@code Map} instance to be used
-     * @return a {@code Single} that emits a single item: a {@code Map} that contains a list items mapped from the source
-     *         {@code Publisher}
+     * @return a {@code Single} that emits a single item: a {@code Map} that contains a list items mapped from the current
+     *         {@code Flowable}
+     * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code mapSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17499,12 +17977,12 @@ public final Observable<T> toObservable() {
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the source {@code Publisher} in
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Flowable} in
      *         sorted order
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17527,17 +18005,18 @@ public final Single<List<T>> toSortedList() {
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param comparator
-     *            a function that compares two items emitted by the source {@code Publisher} and returns an {@code int}
+     *            a function that compares two items emitted by the current {@code Flowable} and returns an {@code int}
      *            that indicates their sort order
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the source {@code Publisher} in
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Flowable} in
      *         sorted order
+     * @throws NullPointerException if {@code comparator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17560,19 +18039,21 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param comparator
-     *            a function that compares two items emitted by the source {@code Publisher} and returns an {@code int}
+     *            a function that compares two items emitted by the current {@code Flowable} and returns an {@code int}
      *            that indicates their sort order
      * @param capacityHint
      *             the initial capacity of the {@link ArrayList} used to accumulate items before sorting
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the source {@code Publisher} in
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Flowable} in
      *         sorted order
+     * @throws NullPointerException if {@code comparator} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      * @since 2.0
      */
@@ -17601,7 +18082,7 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
      * operator and an infinite source may lead to a fatal {@link OutOfMemoryError}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure from downstream and consumes the source {@code Publisher} in an
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
      *  unbounded manner (i.e., without applying backpressure to it).</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17609,8 +18090,9 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
      *
      * @param capacityHint
      *             the initial capacity of the {@link ArrayList} used to accumulate items before sorting
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the source {@code Publisher} in
+     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Flowable} in
      *         sorted order
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      * @since 2.0
      */
@@ -17623,11 +18105,11 @@ public final Single<List<T>> toSortedList(int capacityHint) {
     }
 
     /**
-     * Modifies the source {@link Publisher} so that subscribers will cancel it on a specified
+     * Modifies the current {@code Flowable} so that subscribers will cancel it on a specified
      * {@link Scheduler}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator doesn't interfere with backpressure which is determined by the source {@code Publisher}'s backpressure
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
      *  behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -17635,8 +18117,9 @@ public final Single<List<T>> toSortedList(int capacityHint) {
      *
      * @param scheduler
      *            the {@code Scheduler} to perform cancellation actions on
-     * @return the source {@code Publisher} modified so that its cancellations happen on the specified
+     * @return the current {@code Flowable} modified so that its cancellations happen on the specified
      *         {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      */
     @CheckReturnValue
@@ -17649,10 +18132,10 @@ public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping windows, each containing {@code count} items. When the source
-     * {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the current window and
-     * propagates the notification from the source {@code Publisher}.
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping windows, each containing {@code count} items. When the current
+     * {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the current window and
+     * propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window3.png" alt="">
      * <p>
@@ -17661,7 +18144,7 @@ public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      * a trade-off between no-dataloss and ensuring upstream cancellation can happen.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner {@code Publisher} uses an
+     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner {@code Flowable} uses an
      *  unbounded buffer that may hold at most {@code count} elements.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17670,8 +18153,8 @@ public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      * @param count
      *            the maximum size of each window before it should be emitted
      * @return a {@code Flowable} that emits connected, non-overlapping windows, each containing at most
-     *         {@code count} items from the source {@code Publisher}
-     * @throws IllegalArgumentException if either count is non-positive
+     *         {@code count} items from the current {@code Flowable}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17683,10 +18166,10 @@ public final Flowable<Flowable<T>> window(long count) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits windows every {@code skip} items, each containing no more than {@code count} items. When
-     * the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the current window
-     * and propagates the notification from the source {@code Publisher}.
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits windows every {@code skip} items, each containing no more than {@code count} items. When
+     * the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the current window
+     * and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
      * <p>
@@ -17696,7 +18179,7 @@ public final Flowable<Flowable<T>> window(long count) {
      * a trade-off between no-dataloss and ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner {@code Publisher} uses an
+     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner {@code Flowable} uses an
      *  unbounded buffer that may hold at most {@code count} elements.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17708,8 +18191,8 @@ public final Flowable<Flowable<T>> window(long count) {
      *            how many items need to be skipped before starting a new window. Note that if {@code skip} and
      *            {@code count} are equal this is the same operation as {@link #window(long)}.
      * @return a {@code Flowable} that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the source {@code Publisher}
-     * @throws IllegalArgumentException if either count or skip is non-positive
+     *         from the current {@code Flowable}
+     * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17721,10 +18204,10 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits windows every {@code skip} items, each containing no more than {@code count} items. When
-     * the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the current window
-     * and propagates the notification from the source {@code Publisher}.
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits windows every {@code skip} items, each containing no more than {@code count} items. When
+     * the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the current window
+     * and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
      * <p>
@@ -17734,7 +18217,7 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
      * a trade-off between no-dataloss and ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner {@code Publisher} uses an
+     *  <dd>The operator honors backpressure of its inner and outer subscribers, however, the inner {@code Flowable} uses an
      *  unbounded buffer that may hold at most {@code count} elements.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -17748,8 +18231,8 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
      * @return a {@code Flowable} that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the source {@code Publisher}
-     * @throws IllegalArgumentException if either count or skip is non-positive
+     *         from the current {@code Flowable}
+     * @throws IllegalArgumentException if {@code count}, {@code skip} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17764,11 +18247,11 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
-     * each window after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * {@code Publisher} completes or {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
-     * current window and propagates the notification from the source {@code Publisher}.
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
+     * each window after a fixed timespan, specified by the {@code timespan} argument. When the current
+     * {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
+     * current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.png" alt="">
      * <p>
@@ -17778,9 +18261,9 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The emitted inner {@code Flowable}s honor
      *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@link OutOfMemoryError}
      *  if left unconsumed.</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -17794,6 +18277,7 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @return a {@code Flowable} that emits new windows periodically as a fixed timespan elapses
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17805,11 +18289,11 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
-     * each window after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * {@code Publisher} completes or {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
-     * current window and propagates the notification from the source {@code Publisher}.
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
+     * each window after a fixed timespan, specified by the {@code timespan} argument. When the current
+     * {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
+     * current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
      * <p>
@@ -17819,9 +18303,9 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The returned inner {@code Flowable}s honor
      *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@link OutOfMemoryError}
      *  if left unconsumed.</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -17837,6 +18321,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a window
      * @return a {@code Flowable} that emits new windows periodically as a fixed timespan elapses
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17848,11 +18333,11 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
-     * each window after a fixed timespan, specified by the {@code timespan} argument. When the source
-     * {@code Publisher} completes or {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
-     * current window and propagates the notification from the source {@code Publisher}.
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} starts a new window periodically, as determined by the {@code timeskip} argument. It emits
+     * each window after a fixed timespan, specified by the {@code timespan} argument. When the current
+     * {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
+     * current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
      * <p>
@@ -17862,9 +18347,9 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The returned inner {@code Flowable}s honor
      *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@link OutOfMemoryError}
      *  if left unconsumed.</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -17882,6 +18367,8 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
      * @return a {@code Flowable} that emits new windows periodically as a fixed timespan elapses
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code timespan}, {@code timeskip} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17898,10 +18385,10 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration specified by the
-     * {@code timespan} argument. When the source {@code Publisher} completes or encounters an error, the resulting
-     * {@code Publisher} emits the current window and propagates the notification from the source {@code Publisher}.
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * {@code timespan} argument. When the current {@code Flowable} completes or encounters an error, the resulting
+     * {@code Flowable} emits the current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.png" alt="">
      * <p>
@@ -17911,9 +18398,9 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The emitted inner {@code Flowable}s honor
      *  backpressure and may hold up to {@code count} elements at most.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -17925,7 +18412,8 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
      * @return a {@code Flowable} that emits connected, non-overlapping windows representing items emitted by the
-     *         source {@code Publisher} during fixed, consecutive durations
+     *         current {@code Flowable} during fixed, consecutive durations
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17937,11 +18425,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit)
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration as specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping windows, each of a fixed duration as specified by the
      * {@code timespan} argument or a maximum size as specified by the {@code count} argument (whichever is
-     * reached first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher}
-     * emits the current window and propagates the notification from the source {@code Publisher}.
+     * reached first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable}
+     * emits the current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
      * <p>
@@ -17951,9 +18439,9 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit)
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The emitted inner {@code Flowable}s honor
      *  backpressure and may hold up to {@code count} elements at most.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -17966,9 +18454,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit)
      *            the unit of time that applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each window before it should be emitted
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -17981,11 +18471,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration as specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping windows, each of a fixed duration as specified by the
      * {@code timespan} argument or a maximum size as specified by the {@code count} argument (whichever is
-     * reached first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher}
-     * emits the current window and propagates the notification from the source {@code Publisher}.
+     * reached first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable}
+     * emits the current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
      * <p>
@@ -17995,9 +18485,9 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The emitted inner {@code Flowable}s honor
      *  backpressure and may hold up to {@code count} elements at most.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -18012,9 +18502,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *            the maximum size of each window before it should be emitted
      * @param restart
      *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18027,10 +18519,10 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration as specified by the
-     * {@code timespan} argument. When the source {@code Publisher} completes or encounters an error, the resulting
-     * {@code Publisher} emits the current window and propagates the notification from the source {@code Publisher}.
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping windows, each of a fixed duration as specified by the
+     * {@code timespan} argument. When the current {@code Flowable} completes or encounters an error, the resulting
+     * {@code Flowable} emits the current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.s.png" alt="">
      * <p>
@@ -18040,9 +18532,9 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The emitted inner {@code Flowable}s honor
      *  backpressure but have an unbounded inner buffer that <em>may</em> lead to {@link OutOfMemoryError}
      *  if left unconsumed.</dd>
      *  <dt><b>Scheduler:</b></dt>
@@ -18057,7 +18549,8 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a window
      * @return a {@code Flowable} that emits connected, non-overlapping windows containing items emitted by the
-     *         source {@code Publisher} within a fixed duration
+     *         current {@code Flowable} within a fixed duration
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18070,11 +18563,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping windows, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
-     * current window and propagates the notification from the source {@code Publisher}.
+     * first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
+     * current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
      * <p>
@@ -18084,9 +18577,9 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The emitted inner {@code Flowable}s honor
      *  backpressure and may hold up to {@code count} elements at most.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -18101,9 +18594,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *            the maximum size of each window before it should be emitted
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a window
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18116,11 +18611,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping windows, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
-     * current window and propagates the notification from the source {@code Publisher}.
+     * first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
+     * current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
      * <p>
@@ -18130,9 +18625,9 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The emitted inner {@code Flowable}s honor
      *  backpressure and may hold up to {@code count} elements at most.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -18149,9 +18644,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *            the {@code Scheduler} to use when determining the end and start of a window
      * @param restart
      *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18164,11 +18661,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits connected, non-overlapping windows, each of a fixed duration specified by the
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits connected, non-overlapping windows, each of a fixed duration specified by the
      * {@code timespan} argument or a maximum size specified by the {@code count} argument (whichever is reached
-     * first). When the source {@code Publisher} completes or encounters an error, the resulting {@code Publisher} emits the
-     * current window and propagates the notification from the source {@code Publisher}.
+     * first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
+     * current window and propagates the notification from the current {@code Flowable}.
      * <p>
      * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
      * <p>
@@ -18178,9 +18675,9 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * a trade-off for ensuring upstream cancellation can happen under some race conditions.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>The operator consumes the source {@code Publisher} in an unbounded manner.
-     *  The returned {@code Publisher} doesn't support backpressure as it uses
-     *  time to control the creation of windows. The returned inner {@code Publisher}s honor
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner.
+     *  The resulting {@code Flowable} doesn't support backpressure as it uses
+     *  time to control the creation of windows. The emitted inner {@code Flowable}s honor
      *  backpressure and may hold up to {@code count} elements at most.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -18199,9 +18696,11 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the source {@code Publisher}
+     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
      *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
      *         (whichever occurs first)
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code count}, {@code timespan} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18219,9 +18718,9 @@ public final Flowable<Flowable<T>> window(
     }
 
     /**
-     * Returns a {@code Flowable} that emits non-overlapping windows of items it collects from the source {@link Publisher}
+     * Returns a {@code Flowable} that emits non-overlapping windows of items it collects from the current {@code Flowable}
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
-     * {@code Publisher}.
+     * {@link Publisher}.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
      * <p>
@@ -18241,9 +18740,10 @@ public final Flowable<Flowable<T>> window(
      *            the window element type (ignored)
      * @param boundaryIndicator
      *            a {@code Publisher} whose emitted items close and open windows
-     * @return a {@code Flowable} that emits non-overlapping windows of items it collects from the source {@code Publisher}
+     * @return a {@code Flowable} that emits non-overlapping windows of items it collects from the current {@code Flowable}
      *         where the boundary of each window is determined by the items emitted from the {@code boundary}
      *         {@code Publisher}
+     * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18255,9 +18755,9 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
     }
 
     /**
-     * Returns a {@code Flowable} that emits non-overlapping windows of items it collects from the source {@link Publisher}
+     * Returns a {@code Flowable} that emits non-overlapping windows of items it collects from the current {@code Flowable}
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
-     * {@code Publisher}.
+     * {@link Publisher}.
      * <p>
      * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
      * <p>
@@ -18279,9 +18779,11 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      *            a {@code Publisher} whose emitted items close and open windows
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a {@code Flowable} that emits non-overlapping windows of items it collects from the source {@code Publisher}
+     * @return a {@code Flowable} that emits non-overlapping windows of items it collects from the current {@code Flowable}
      *         where the boundary of each window is determined by the items emitted from the {@code boundary}
      *         {@code Publisher}
+     * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18295,9 +18797,9 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits windows that contain those items emitted by the source {@code Publisher} between the time when
-     * the {@code windowOpenings} {@code Publisher} emits an item and when the {@code Publisher} returned by
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits windows that contain those items emitted by the current {@code Flowable} between the time when
+     * the {@code windowOpenings} {@link Publisher} emits an item and when the {@code Publisher} returned by
      * {@code closingSelector} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
@@ -18323,8 +18825,9 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      * @param closingIndicator
      *            a {@link Function} that produces a {@code Publisher} for every window created. When this {@code Publisher}
      *            emits an item, the associated window is closed and emitted
-     * @return a {@code Flowable} that emits windows of items emitted by the source {@code Publisher} that are governed by
+     * @return a {@code Flowable} that emits windows of items emitted by the current {@code Flowable} that are governed by
      *         the specified window-governing {@code Publisher}s
+     * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18338,9 +18841,9 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Returns a {@code Flowable} that emits windows of items it collects from the source {@link Publisher}. The resulting
-     * {@code Publisher} emits windows that contain those items emitted by the source {@code Publisher} between the time when
-     * the {@code windowOpenings} {@code Publisher} emits an item and when the {@code Publisher} returned by
+     * Returns a {@code Flowable} that emits windows of items it collects from the current {@code Flowable}. The resulting
+     * {@code Flowable} emits windows that contain those items emitted by the current {@code Flowable} between the time when
+     * the {@code windowOpenings} {@link Publisher} emits an item and when the {@code Publisher} returned by
      * {@code closingSelector} emits an item.
      * <p>
      * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
@@ -18368,8 +18871,10 @@ public final <U, V> Flowable<Flowable<T>> window(
      *            emits an item, the associated window is closed and emitted
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a {@code Flowable} that emits windows of items emitted by the source {@code Publisher} that are governed by
+     * @return a {@code Flowable} that emits windows of items emitted by the current {@code Flowable} that are governed by
      *         the specified window-governing {@code Publisher}s
+     * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
@@ -18386,8 +18891,8 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Merges the specified {@link Publisher} into this {@code Publisher} sequence by using the {@code resultSelector}
-     * function only when the source {@code Publisher} (this instance) emits an item.
+     * Merges the specified {@link Publisher} into the current {@code Flowable} sequence by using the {@code resultSelector}
+     * function only when the current {@code Flowable} (this instance) emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
      *
@@ -18405,11 +18910,12 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param other
      *            the other {@code Publisher}
      * @param combiner
-     *            the function to call when this {@code Publisher} emits an item and the other {@code Publisher} has already
-     *            emitted an item, to generate the item to be emitted by the resulting {@code Publisher}
-     * @return a {@code Flowable} that merges the specified {@code Publisher} into this {@code Publisher} by using the
-     *         {@code resultSelector} function only when the source {@code Publisher} sequence (this instance) emits an
+     *            the function to call when the current {@code Flowable} emits an item and the other {@code Publisher} has already
+     *            emitted an item, to generate the item to be emitted by the resulting {@code Flowable}
+     * @return a {@code Flowable} that merges the specified {@code Publisher} into the current {@code Flowable} by using the
+     *         {@code resultSelector} function only when the current {@code Flowable} sequence (this instance) emits an
      *         item
+     * @throws NullPointerException if {@code other} or {@code combiner} is {@code null}
      * @since 2.0
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -18426,17 +18932,17 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this {@link Publisher} with the latest emissions from the
-     * other {@code Publisher}s via a function to produce the output item.
+     * Combines the value emission from the current {@code Flowable} with the latest emissions from the
+     * other {@link Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
+     * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
+     *  <dd>This operator is a pass-through for backpressure behavior between the current {@code Flowable}
      *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -18448,7 +18954,8 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param source1 the first other {@code Publisher}
      * @param source2 the second other {@code Publisher}
      * @param combiner the function called with an array of values from each participating {@code Publisher}
-     * @return the new {@code Publisher} instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -18465,17 +18972,17 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this {@link Publisher} with the latest emissions from the
-     * other {@code Publisher}s via a function to produce the output item.
+     * Combines the value emission from the current {@code Flowable} with the latest emissions from the
+     * other {@link Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
+     * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
+     *  <dd>This operator is a pass-through for backpressure behavior between the current {@code Flowable}
      *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -18489,7 +18996,8 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param source2 the second other {@code Publisher}
      * @param source3 the third other {@code Publisher}
      * @param combiner the function called with an array of values from each participating {@code Publisher}
-     * @return the new {@code Publisher} instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -18509,17 +19017,17 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this {@link Publisher} with the latest emissions from the
-     * other {@code Publisher}s via a function to produce the output item.
+     * Combines the value emission from the current {@code Flowable} with the latest emissions from the
+     * other {@link Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
+     * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
+     *  <dd>This operator is a pass-through for backpressure behavior between the current {@code Flowable}
      *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -18535,7 +19043,9 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param source3 the third other {@code Publisher}
      * @param source4 the fourth other {@code Publisher}
      * @param combiner the function called with an array of values from each participating {@code Publisher}
-     * @return the new {@code Publisher} instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
+     *                              {@code source4} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -18556,17 +19066,17 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this {@link Publisher} with the latest emissions from the
-     * other {@code Publisher}s via a function to produce the output item.
+     * Combines the value emission from the current {@code Flowable} with the latest emissions from the
+     * other {@link Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
+     * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
+     *  <dd>This operator is a pass-through for backpressure behavior between the current {@code Flowable}
      *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -18575,7 +19085,8 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param <R> the result value type
      * @param others the array of other sources
      * @param combiner the function called with an array of values from each participating {@code Publisher}
-     * @return the new {@code Publisher} instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code others} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -18589,17 +19100,17 @@ public final <U, V> Flowable<Flowable<T>> window(
     }
 
     /**
-     * Combines the value emission from this {@link Publisher} with the latest emissions from the
-     * other {@code Publisher}s via a function to produce the output item.
+     * Combines the value emission from the current {@code Flowable} with the latest emissions from the
+     * other {@link Publisher}s via a function to produce the output item.
      *
      * <p>Note that this operator doesn't emit anything until all other sources have produced at
-     * least one value. The resulting emission only happens when this {@code Publisher} emits (and
+     * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
-     *  <dd>This operator is a pass-through for backpressure behavior between the source {@code Publisher}
+     *  <dd>This operator is a pass-through for backpressure behavior between the current {@code Flowable}
      *  and the downstream {@link Subscriber}. The other {@code Publisher}s are consumed in an unbounded manner.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -18608,7 +19119,8 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param <R> the result value type
      * @param others the iterable of other sources
      * @param combiner the function called with an array of values from each participating {@code Publisher}
-     * @return the new {@code Publisher} instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code others} or {@code combiner} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -18623,11 +19135,11 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<? extends Publishe
 
     /**
      * Returns a {@code Flowable} that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source {@link Publisher} and a specified {@link Iterable} sequence.
+     * values, one each from the current {@code Flowable} and a specified {@link Iterable} sequence.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.i.png" alt="">
      * <p>
-     * Note that the {@code other} {@code Iterable} is evaluated as items are observed from the source {@code Publisher}; it is
+     * Note that the {@code other} {@code Iterable} is evaluated as items are observed from the current {@code Flowable}; it is
      * not pre-consumed. This allows you to zip infinite streams on either side.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -18641,14 +19153,15 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<? extends Publishe
      * @param <U>
      *            the type of items in the {@code other} {@code Iterable}
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param other
      *            the {@code Iterable} sequence
      * @param zipper
-     *            a function that combines the pairs of items from the {@code Publisher} and the {@code Iterable} to generate
-     *            the items to be emitted by the resulting {@code Publisher}
-     * @return a {@code Flowable} that pairs up values from the source {@code Publisher} and the {@code other} {@code Iterable}
+     *            a function that combines the pairs of items from the current {@code Flowable} and the {@code Iterable} to generate
+     *            the items to be emitted by the resulting {@code Flowable}
+     * @return a {@code Flowable} that pairs up values from the current {@code Flowable} and the {@code other} {@code Iterable}
      *         sequence and emits the results of {@code zipFunction} applied to these pairs
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -18663,7 +19176,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull Bi
 
     /**
      * Returns a {@code Flowable} that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source {@link Publisher} and another specified {@code Publisher}.
+     * values, one each from the current {@code Flowable} and another specified {@link Publisher}.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while canceling the other sources. Therefore, it
@@ -18690,14 +19203,15 @@ public final <U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull Bi
      * @param <U>
      *            the type of items emitted by the {@code other} {@code Publisher}
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param other
      *            the other {@code Publisher}
      * @param zipper
      *            a function that combines the pairs of items from the two {@code Publisher}s to generate the items to
-     *            be emitted by the resulting {@code Publisher}
-     * @return a {@code Flowable} that pairs up values from the source {@code Publisher} and the {@code other} {@code Publisher}
+     *            be emitted by the resulting {@code Flowable}
+     * @return a {@code Flowable} that pairs up values from the current {@code Flowable} and the {@code other} {@code Publisher}
      *         and emits the results of {@code zipFunction} applied to these pairs
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -18711,7 +19225,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other, @
 
     /**
      * Returns a {@code Flowable} that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source {@link Publisher} and another specified {@code Publisher}.
+     * values, one each from the current {@code Flowable} and another specified {@link Publisher}.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while canceling the other sources. Therefore, it
@@ -18738,16 +19252,17 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other, @
      * @param <U>
      *            the type of items emitted by the {@code other} {@code Publisher}
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param other
      *            the other {@code Publisher}
      * @param zipper
      *            a function that combines the pairs of items from the two {@code Publisher}s to generate the items to
-     *            be emitted by the resulting {@code Publisher}
+     *            be emitted by the resulting {@code Flowable}
      * @param delayError
      *            if {@code true}, errors from the current {@code Flowable} or the other {@code Publisher} is delayed until both terminate
-     * @return a {@code Flowable} that pairs up values from the source {@code Publisher} and the {@code other} {@code Publisher}
+     * @return a {@code Flowable} that pairs up values from the current {@code Flowable} and the {@code other} {@code Publisher}
      *         and emits the results of {@code zipFunction} applied to these pairs
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      * @since 2.0
      */
@@ -18762,7 +19277,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
 
     /**
      * Returns a {@code Flowable} that emits items that are the result of applying a specified function to pairs of
-     * values, one each from the source {@link Publisher} and another specified {@code Publisher}.
+     * values, one each from the current {@code Flowable} and another specified {@link Publisher}.
      * <p>
      * The operator subscribes to its sources in the order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while canceling the other sources. Therefore, it
@@ -18789,18 +19304,20 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
      * @param <U>
      *            the type of items emitted by the {@code other} {@code Publisher}
      * @param <R>
-     *            the type of items emitted by the resulting {@code Publisher}
+     *            the type of items emitted by the resulting {@code Flowable}
      * @param other
      *            the other {@code Publisher}
      * @param zipper
      *            a function that combines the pairs of items from the two {@code Publisher}s to generate the items to
-     *            be emitted by the resulting {@code Publisher}
+     *            be emitted by the resulting {@code Flowable}
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
      * @param delayError
      *            if {@code true}, errors from the current {@code Flowable} or the other {@code Publisher} is delayed until both terminate
-     * @return a {@code Flowable} that pairs up values from the source {@code Publisher} and the {@code other} {@code Publisher}
+     * @return a {@code Flowable} that pairs up values from the current {@code Flowable} and the {@code other} {@code Publisher}
      *         and emits the results of {@code zipFunction} applied to these pairs
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      * @since 2.0
      */
@@ -18914,6 +19431,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * @param <T> the element type of the optional value
      * @param optional the optional value to convert into a {@code Flowable}
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code optional} is {@code null}
      * @since 3.0.0
      * @see #just(Object)
      * @see #empty()
@@ -18953,6 +19471,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * @param <T> the element type of the {@code CompletionStage}
      * @param stage the {@code CompletionStage} to convert to {@code Flowable} and signal its terminal value or error
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code stage} is {@code null}
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -18998,6 +19517,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * @param <T> the element type of the source {@code Stream}
      * @param stream the {@code Stream} of values to emit
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code stream} is {@code null}
      * @since 3.0.0
      * @see #fromIterable(Iterable)
      */
@@ -19026,6 +19546,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * @param mapper the function that receives the upstream item and should return a <em>non-empty</em> {@code Optional}
      * to emit as the output or an <em>empty</em> {@code Optional} to skip to the next upstream value
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #map(Function)
      * @see #filter(Predicate)
@@ -19056,6 +19577,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * @param collector the interface defining the container supplier, accumulator and finisher functions;
      * see {@link Collectors} for some standard implementations
      * @return the new {@link Single} instance
+     * @throws NullPointerException if {@code collector} is {@code null}
      * @since 3.0.0
      * @see Collectors
      * @see #collect(Supplier, BiConsumer)
@@ -19327,6 +19849,7 @@ public final Stream<T> blockingStream() {
      * @param prefetch the number of items to request from the upstream to limit the number of
      * in-flight items and item generation.
      * @return the new {@code Stream} instance
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -19379,6 +19902,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #concatMap(Function)
      * @see #concatMapIterable(Function)
@@ -19432,6 +19956,8 @@ public final Stream<T> blockingStream(int prefetch) {
      * will be emitted to the downstream
      * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @since 3.0.0
      * @see #concatMap(Function, int)
      * @see #concatMapIterable(Function, int)
@@ -19487,6 +20013,7 @@ public final Stream<T> blockingStream(int prefetch) {
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 3.0.0
      * @see #flatMap(Function)
      * @see #flatMapIterable(Function)
@@ -19540,6 +20067,8 @@ public final Stream<T> blockingStream(int prefetch) {
      * will be emitted to the downstream
      * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @since 3.0.0
      * @see #flatMap(Function, int)
      * @see #flatMapIterable(Function, int)
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 441267389c..4892aa3ab0 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -308,6 +308,7 @@ public static <T> Flowable<T> concat(
      * @param <T> the value type
      * @param sources the {@code Publisher} of {@code MaybeSource} instances
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -433,6 +434,7 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? exten
      * @param <T> the value type
      * @param sources a sequence of {@code MaybeSource}s that need to be eagerly concatenated
      * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @BackpressureSupport(BackpressureKind.FULL)
@@ -488,6 +490,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Maybe
      * @param <T> the common element base type
      * @param sources the {@code Publisher} sequence of {@code MaybeSource}s
      * @return the new {@code Flowable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @BackpressureSupport(BackpressureKind.FULL)
@@ -515,6 +518,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Mayb
      * @param <T> the value type
      * @param sources a sequence of {@code MaybeSource} that need to be eagerly concatenated
      * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @BackpressureSupport(BackpressureKind.FULL)
@@ -544,6 +548,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends MaybeSourc
      * @param <T> the value type
      * @param sources a sequence of {@code MaybeSource}s that need to be eagerly concatenated
      * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1044,6 +1049,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends MaybeSource<? ex
      * @param <T> the common and resulting value type
      * @param sources the {@code Flowable} sequence of {@code MaybeSource} sources
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see #mergeDelayError(Publisher)
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1437,6 +1443,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends MaybeS
      *            a {@code Publisher} that emits {@code MaybeSource}s
      * @return a {@code Flowable} that emits all of the items emitted by the {@code MaybeSource}s emitted by the
      *         {@code source} {@code Publisher}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1662,6 +1669,7 @@ public static <T> Maybe<T> never() {
      * @param <T>
      *            the type of items emitted by each {@code MaybeSource}
      * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -1720,6 +1728,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
      * @param unit
      *            time units to use for {@code delay}
      * @return a {@code Maybe} that emits {@code 0L} after a specified delay
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
     @CheckReturnValue
@@ -2688,6 +2697,7 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
      * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      * @see #delay(long, TimeUnit, Scheduler)
      */
@@ -2799,6 +2809,7 @@ public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIn
      * @param unit
      *            the time unit of {@code delay}
      * @return a {@code Maybe} that delays the subscription to the source {@code Maybe} by the given amount
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      * @see #delaySubscription(long, TimeUnit, Scheduler)
      */
@@ -2827,6 +2838,7 @@ public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
      *            the {@code Scheduler} on which the waiting and subscription will happen
      * @return a {@code Maybe} that delays the subscription to the source {@code Maybe} by a given
      *         amount, waiting and subscribing on the given {@code Scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -4075,7 +4087,7 @@ public final Flowable<T> repeat() {
      * @return a {@code Flowable} that repeats the sequence of items emitted by the source {@code Maybe} at most
      *         {@code count} times
      * @throws IllegalArgumentException
-     *             if {@code count} is less than zero
+     *             if {@code times} is negative
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4134,6 +4146,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
      * @param handler
      *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the repeat.
      * @return the source {@code Publisher} modified with repeat logic
+     * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4181,6 +4194,7 @@ public final Maybe<T> retry() {
      *            the predicate that determines if a resubscription may happen in case of a specific exception
      *            and retry count
      * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @see #retry()
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
@@ -4205,16 +4219,17 @@ public final Maybe<T> retry(@NonNull BiPredicate<? super Integer, ? super Throwa
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param count
+     * @param times
      *            the number of times to resubscribe if the current {@code Maybe} fails
      * @return the new {@code Maybe} instance
+     * @throws IllegalArgumentException if {@code times} is negative
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Maybe<T> retry(long count) {
-        return retry(count, Functions.alwaysTrue());
+    public final Maybe<T> retry(long times) {
+        return retry(times, Functions.alwaysTrue());
     }
 
     /**
@@ -4227,6 +4242,8 @@ public final Maybe<T> retry(long count) {
      * @param times the number of times to resubscribe if the current {@code Maybe} fails
      * @param predicate the predicate called with the failure {@link Throwable} and should return {@code true} to trigger a retry.
      * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
+     * @throws IllegalArgumentException if {@code times} is negative
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4244,6 +4261,7 @@ public final Maybe<T> retry(long times, @NonNull Predicate<? super Throwable> pr
      *
      * @param predicate the predicate that receives the failure {@link Throwable} and should return {@code true} to trigger a retry.
      * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4341,6 +4359,7 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
      *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the
      *            retry
      * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -4665,16 +4684,17 @@ public final <U> Maybe<T> takeUntil(@NonNull Publisher<U> other) {
      *
      * @param timeout
      *            maximum duration between emitted items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument.
      * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
-        return timeout(timeout, timeUnit, Schedulers.computation());
+    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit) {
+        return timeout(timeout, unit, Schedulers.computation());
     }
 
     /**
@@ -4690,20 +4710,20 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit) {
      *
      * @param timeout
      *            maximum duration between items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument
      * @param fallback
      *            the fallback {@code MaybeSource} to use in case of a timeout
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code timeUnit} or {@code fallback} is {@code null}
+     * @throws NullPointerException if {@code unit} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull MaybeSource<? extends T> fallback) {
+    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull MaybeSource<? extends T> fallback) {
         Objects.requireNonNull(fallback, "fallback is null");
-        return timeout(timeout, timeUnit, Schedulers.computation(), fallback);
+        return timeout(timeout, unit, Schedulers.computation(), fallback);
     }
 
     /**
@@ -4720,22 +4740,22 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull
      *
      * @param timeout
      *            maximum duration between items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument
      * @param fallback
      *            the {@code MaybeSource} to use as the fallback in case of a timeout
      * @param scheduler
      *            the {@code Scheduler} to run the timeout timers on
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code fallback}, {@code timeUnit} or {@code scheduler} is {@code null}
+     * @throws NullPointerException if {@code fallback}, {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler, @NonNull MaybeSource<? extends T> fallback) {
+    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull MaybeSource<? extends T> fallback) {
         Objects.requireNonNull(fallback, "fallback is null");
-        return timeout(timer(timeout, timeUnit, scheduler), fallback);
+        return timeout(timer(timeout, unit, scheduler), fallback);
     }
 
     /**
@@ -4752,18 +4772,19 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull
      *
      * @param timeout
      *            maximum duration between items before a timeout occurs
-     * @param timeUnit
+     * @param unit
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
      *            the {@code Scheduler} to run the timeout timers on
      * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit timeUnit, @NonNull Scheduler scheduler) {
-        return timeout(timer(timeout, timeUnit, scheduler));
+    public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return timeout(timer(timeout, unit, scheduler));
     }
 
     /**
@@ -4909,7 +4930,7 @@ public final Maybe<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      *            a function that combines the pairs of items from the two {@code MaybeSource}s to generate the items to
      *            be emitted by the resulting {@code Maybe}
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code other} is {@code null}
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 2d75dee207..b226ae8994 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -207,6 +207,7 @@ public static int bufferSize() {
      *            the aggregation function used to combine the items emitted by the returned {@code ObservableSource}s
      * @return an {@code Observable} that emits items that are the result of combining the items emitted by the returned
      *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -305,6 +306,7 @@ public static <T, R> Observable<R> combineLatest(
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
      * @return an {@code Observable} that emits items that are the result of combining the items emitted by the returned
      *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -879,6 +881,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
      * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
      *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -980,6 +983,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull ObservableSo
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
      * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
      *         {@code ObservableSource}s by means of the given aggregation function
+     * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
     @CheckReturnValue
@@ -1300,6 +1304,7 @@ public static <T> Observable<T> concatArrayDelayError(@NonNull ObservableSource<
      * @param <T> the value type
      * @param sources an array of {@code ObservableSource}s that need to be eagerly concatenated
      * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1328,6 +1333,8 @@ public static <T> Observable<T> concatArrayEager(@NonNull ObservableSource<? ext
      *                       is interpreted as indication to subscribe to all sources at once
      * @param bufferSize the number of elements expected from each {@code ObservableSource} to be buffered
      * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @since 2.0
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -1355,6 +1362,7 @@ public static <T> Observable<T> concatArrayEager(int maxConcurrency, int bufferS
      * @param <T> the value type
      * @param sources an array of {@code ObservableSource}s that need to be eagerly concatenated
      * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.2.1 - experimental
      */
     @CheckReturnValue
@@ -1384,6 +1392,8 @@ public static <T> Observable<T> concatArrayEagerDelayError(@NonNull ObservableSo
      *                       is interpreted as indication to subscribe to all sources at once
      * @param bufferSize the number of elements expected from each {@code ObservableSource} to be buffered
      * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @since 2.2.1 - experimental
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
@@ -1433,6 +1443,7 @@ public static <T> Observable<T> concatDelayError(@NonNull Iterable<? extends Obs
      * @param <T> the common element base type
      * @param sources the {@code ObservableSource} sequence of {@code ObservableSource}s
      * @return the new {@code Observable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1540,6 +1551,7 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
      * @param <T> the value type
      * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
      * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1567,6 +1579,8 @@ public static <T> Observable<T> concatEager(@NonNull Iterable<? extends Observab
      *                       is interpreted as all inner {@code ObservableSource}s can be active at the same time
      * @param bufferSize the number of elements expected from each inner {@code ObservableSource} to be buffered
      * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @since 2.0
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -2247,6 +2261,7 @@ public static Observable<Long> interval(long initialDelay, long period, @NonNull
      * @param unit
      *            time units to use for the interval size
      * @return an {@code Observable} that emits a sequential number each time interval
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
     @CheckReturnValue
@@ -2273,6 +2288,7 @@ public static Observable<Long> interval(long period, @NonNull TimeUnit unit) {
      * @param scheduler
      *            the {@code Scheduler} to use for scheduling the items
      * @return an {@code Observable} that emits a sequential number each time interval
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
     @CheckReturnValue
@@ -2298,6 +2314,10 @@ public static Observable<Long> interval(long period, @NonNull TimeUnit unit, @No
      * @param period the period between subsequent values
      * @param unit the unit of measure of the {@code initialDelay} and {@code period} amounts
      * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException
+     *             if {@code count} is negative, or if {@code start} + {@code count} &minus; 1 exceeds
+     *             {@link Long#MAX_VALUE}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
@@ -2801,8 +2821,9 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            the number of items expected from each inner {@code ObservableSource} to be buffered
      * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
      *         {@code ObservableSource}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code maxConcurrent} is less than or equal to 0
+     *             if {@code maxConcurrent} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable, int, int)
      */
@@ -2849,8 +2870,9 @@ public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSour
      *            the number of items expected from each inner {@code ObservableSource} to be buffered
      * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
      *         {@code ObservableSource}s in the array
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code maxConcurrent} is less than or equal to 0
+     *             if {@code maxConcurrent} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeArrayDelayError(int, int, ObservableSource...)
      */
@@ -2893,6 +2915,7 @@ public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @
      *            the {@code Iterable} of {@code ObservableSource}s
      * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
      *         {@code ObservableSource}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable)
      */
@@ -2937,8 +2960,9 @@ public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSour
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
      *         {@code ObservableSource}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code maxConcurrent} is less than or equal to 0
+     *             if {@code maxConcurrency} is less than or equal to 0
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable, int)
      */
@@ -3373,6 +3397,8 @@ public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int buf
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
      *         {@code ObservableSource}s in the {@code Iterable}
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3609,6 +3635,7 @@ public static <T> Observable<T> mergeDelayError(
      *            the array of {@code ObservableSource}s
      * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
      *         {@code ObservableSource}s in the array
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
@@ -3742,6 +3769,7 @@ public static Observable<Long> rangeLong(long start, long count) {
      * @param <T>
      *            the type of items emitted by each {@code ObservableSource}
      * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -3772,6 +3800,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
      *            the type of items emitted by each {@code ObservableSource}
      * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code ObservableSource} two sequences
      *         are the same according to the specified function
+     * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -3842,6 +3871,8 @@ public static <T> Single<Boolean> sequenceEqual(
      * @param <T>
      *            the type of items emitted by each {@code ObservableSource}
      * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
     @CheckReturnValue
@@ -3914,6 +3945,7 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
      *            the {@code ObservableSource} that emits {@code ObservableSource}s
      * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the {@code sources}
      *         {@code ObservableSource}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      */
     @CheckReturnValue
@@ -3947,6 +3979,7 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
      *            the {@code ObservableSource} that emits {@code ObservableSource}s
      * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the {@code sources}
      *         {@code ObservableSource}
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      * @since 2.0
      */
@@ -4012,6 +4045,7 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
      * @param unit
      *            time units to use for {@code delay}
      * @return an {@code Observable} that {@code 0L} after a specified delay, and then completes
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
     @CheckReturnValue
@@ -4457,6 +4491,7 @@ public static <T1, T2, R> Observable<R> zip(
      * @param bufferSize the number of elements expected from each source {@code ObservableSource} to be buffered
      * @return an {@code Observable} that emits the zipped results
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -5199,12 +5234,14 @@ public final T blockingFirst() {
      *            a default value to return if the current {@code Observable} emits no items
      * @return the first item emitted by the current {@code Observable}, or the default value if it emits no
      *         items
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final T blockingFirst(@NonNull T defaultItem) {
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         BlockingFirstObserver<T> observer = new BlockingFirstObserver<>();
         subscribe(observer);
         T v = observer.blockingGet();
@@ -5235,6 +5272,7 @@ public final T blockingFirst(@NonNull T defaultItem) {
      *
      * @param onNext
      *            the {@code Consumer} to invoke for each item emitted by the {@code Observable}
+     * @throws NullPointerException if {@code onNext} is {@code null}
      * @throws RuntimeException
      *             if an error occurs
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX documentation: Subscribe</a>
@@ -5392,12 +5430,14 @@ public final T blockingLast() {
      *            a default value to return if the current {@code Observable} emits no items
      * @return the last item emitted by the {@code Observable}, or the default value if it emits no
      *         items
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX documentation: Last</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final T blockingLast(@NonNull T defaultItem) {
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
         BlockingLastObserver<T> observer = new BlockingLastObserver<>();
         subscribe(observer);
         T v = observer.blockingGet();
@@ -5522,6 +5562,7 @@ public final T blockingSingle() {
      *            a default value to return if the current {@code Observable} emits no items
      * @return the single item emitted by the current {@code Observable}, or the default value if it emits no
      *         items
+     * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5599,6 +5640,7 @@ public final void blockingSubscribe() {
      *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param onNext the callback action for each source value
+     * @throws NullPointerException if {@code onNext} is {@code null}
      * @since 2.0
      * @see #blockingSubscribe(Consumer, Consumer)
      * @see #blockingSubscribe(Consumer, Consumer, Action)
@@ -5622,6 +5664,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext) {
      * </dl>
      * @param onNext the callback action for each source value
      * @param onError the callback action for an error event
+     * @throws NullPointerException if {@code onNext} or {@code onError} is {@code null}
      * @since 2.0
      * @see #blockingSubscribe(Consumer, Consumer, Action)
      */
@@ -5645,6 +5688,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      * @param onNext the callback action for each source value
      * @param onError the callback action for an error event
      * @param onComplete the callback action for the completion event.
+     * @throws NullPointerException if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @since 2.0
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -5934,6 +5978,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the unit of time that applies to the {@code timespan} argument
      * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
      *         {@code Observable} within a fixed duration
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -5968,6 +6013,8 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
      *         {@code Observable}, after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6004,6 +6051,8 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
      *         {@code Observable} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
      *         first)
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
@@ -6191,18 +6240,19 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *
      * @param <B>
      *            the boundary value type (ignored)
-     * @param boundary
+     * @param boundaryIndicator
      *            the boundary {@code ObservableSource}
      * @return an {@code Observable} that emits buffered items from the current {@code Observable} when the boundary {@code ObservableSource}
      *         emits an item
+     * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @see #buffer(ObservableSource, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundary) {
-        return buffer(boundary, ArrayListSupplier.asSupplier());
+    public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundaryIndicator) {
+        return buffer(boundaryIndicator, ArrayListSupplier.asSupplier());
     }
 
     /**
@@ -6222,23 +6272,23 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *
      * @param <B>
      *            the boundary value type (ignored)
-     * @param boundary
+     * @param boundaryIndicator
      *            the boundary {@code ObservableSource}
      * @param initialCapacity
      *            the initial capacity of each buffer chunk
      * @return an {@code Observable} that emits buffered items from the current {@code Observable} when the boundary {@code ObservableSource}
      *         emits an item
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
-     * @throws NullPointerException if {@code boundary} is {@code null}
+     * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @throws IllegalArgumentException if {@code initialCapacity} is non-positive
      * @see #buffer(ObservableSource)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundary, int initialCapacity) {
+    public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundaryIndicator, int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
-        return buffer(boundary, Functions.createArrayList(initialCapacity));
+        return buffer(boundaryIndicator, Functions.createArrayList(initialCapacity));
     }
 
     /**
@@ -9721,6 +9771,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
      *         unique key value and each of which emits those items from the current {@code Observable} that share that
      *         key value
+     * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
     @CheckReturnValue
@@ -10382,6 +10433,7 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler) {
      *            from the current {@code Observable}
      * @return the current {@code Observable} modified so that its {@code Observer}s are notified on the specified
      *         {@code Scheduler}
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
      * @see #subscribeOn
@@ -10855,7 +10907,7 @@ public final Observable<T> repeat() {
      * @return an {@code Observable} that repeats the sequence of items emitted by the current {@code Observable} at most
      *         {@code count} times
      * @throws IllegalArgumentException
-     *             if {@code count} is negative
+     *             if {@code times} is negative
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -11913,6 +11965,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit) {
      *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit)
      * @since 2.1
@@ -12306,13 +12359,17 @@ public final Single<T> singleOrError() {
      *            the number of items to skip
      * @return an {@code Observable} that is identical to the current {@code Observable} except that it does not emit the first
      *         {@code count} items that the current {@code Observable} emits
+     * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Observable<T> skip(long count) {
-        if (count <= 0) {
+        if (count < 0) {
+            throw new IllegalArgumentException("count >= 0 expected but it was " + count);
+        }
+        if (count == 0) {
             return RxJavaPlugins.onAssembly(this);
         }
         return RxJavaPlugins.onAssembly(new ObservableSkip<>(this, count));
@@ -13534,6 +13591,7 @@ public final Observable<T> takeLast(int count) {
      * @return an {@code Observable} that emits at most {@code count} items from the current {@code Observable} that were emitted
      *         in a specified window of time before the current {@code Observable} completed
      * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13639,6 +13697,7 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
      *            the time unit of {@code time}
      * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
      *         time before the current {@code Observable} completed specified by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13668,6 +13727,8 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit) {
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
      *         time before the current {@code Observable} completed specified by {@code time}
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13697,6 +13758,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, boolean d
      * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
      *         time before the current {@code Observable} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13729,6 +13791,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
      *         time before the current {@code Observable} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -13763,6 +13826,8 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
      *         time before the current {@code Observable} completed specified by {@code time}, where the timing information is
      *         provided by {@code scheduler}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -14458,6 +14523,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNul
      *            the {@code Scheduler} to run the timeout timers on
      * @return the current {@code Observable} modified to notify observers of a {@code TimeoutException} in case of a
      *         timeout
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
index 80eda093c4..7b96792bbe 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.core;
 
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import io.reactivex.rxjava3.annotations.*;
@@ -128,6 +129,7 @@ public static long clockDriftTolerance() {
      * Returns the 'current time' of the Scheduler in the specified time unit.
      * @param unit the time unit
      * @return the 'current time'
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @since 2.0
      */
     public long now(@NonNull TimeUnit unit) {
@@ -172,6 +174,7 @@ public void shutdown() {
      * @param run the task to execute
      *
      * @return the Disposable instance that let's one cancel this particular task.
+     * @throws NullPointerException if {@code run} is {@code null}
      * @since 2.0
      */
     @NonNull
@@ -190,6 +193,7 @@ public Disposable scheduleDirect(@NonNull Runnable run) {
      * @param delay the delay amount, non-positive values indicate non-delayed scheduling
      * @param unit the unit of measure of the delay amount
      * @return the Disposable that let's one cancel this particular delayed task.
+     * @throws NullPointerException if {@code run} or {@code unit} is {@code null}
      * @since 2.0
      */
     @NonNull
@@ -222,6 +226,7 @@ public Disposable scheduleDirect(@NonNull Runnable run, long delay, @NonNull Tim
      * @param period the period at which the task should be re-executed
      * @param unit the unit of measure of the delay amount
      * @return the Disposable that let's one cancel this particular delayed task.
+     * @throws NullPointerException if {@code run} or {@code unit} is {@code null}
      * @since 2.0
      */
     @NonNull
@@ -313,11 +318,13 @@ public Disposable schedulePeriodicallyDirect(@NonNull Runnable run, long initial
      * @param combine the function that takes a two-level nested Flowable sequence of a Completable and returns
      * the Completable that will be subscribed to and should trigger the execution of the scheduled Actions.
      * @return the Scheduler with the customized execution behavior
+     * @throws NullPointerException if {@code combine} is {@code null}
      * @since 2.1
      */
     @SuppressWarnings("unchecked")
     @NonNull
     public <S extends Scheduler & Disposable> S when(@NonNull Function<Flowable<Flowable<Completable>>, Completable> combine) {
+        Objects.requireNonNull(combine, "combine is null");
         return (S) new SchedulerWhen(combine, this);
     }
 
@@ -365,6 +372,7 @@ public abstract static class Worker implements Disposable {
          * @param run
          *            Runnable to schedule
          * @return a Disposable to be able to unsubscribe the action (cancel it if not executed)
+         * @throws NullPointerException if {@code run} is {@code null}
          */
         @NonNull
         public Disposable schedule(@NonNull Runnable run) {
@@ -386,6 +394,7 @@ public Disposable schedule(@NonNull Runnable run) {
          * @param unit
          *            the time unit of {@code delayTime}
          * @return a Disposable to be able to unsubscribe the action (cancel it if not executed)
+         * @throws NullPointerException if {@code run} or {@code unit} is {@code null}
          */
         @NonNull
         public abstract Disposable schedule(@NonNull Runnable run, long delay, @NonNull TimeUnit unit);
@@ -417,6 +426,7 @@ public Disposable schedule(@NonNull Runnable run) {
          * @param unit
          *            the time unit of {@code period}
          * @return a Disposable to be able to unsubscribe the action (cancel it if not executed)
+         * @throws NullPointerException if {@code run} or {@code unit} is {@code null}
          */
         @NonNull
         public Disposable schedulePeriodically(@NonNull Runnable run, final long initialDelay, final long period, @NonNull final TimeUnit unit) {
@@ -445,6 +455,7 @@ public Disposable schedulePeriodically(@NonNull Runnable run, final long initial
          * Returns the 'current time' of the Worker in the specified time unit.
          * @param unit the time unit
          * @return the 'current time'
+         * @throws NullPointerException if {@code unit} is {@code null}
          * @since 2.0
          */
         public long now(@NonNull TimeUnit unit) {
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 9b60269cd3..a1fae2e6fc 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -186,6 +186,7 @@ public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sourc
      * @param <T> the value type
      * @param sources the {@code Iterable} sequence of {@code SingleSource} instances
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -235,6 +236,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Singl
      * @param <T> the value type
      * @param sources the {@code Publisher} of {@code SingleSource} instances
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -397,6 +399,7 @@ public static <T> Flowable<T> concat(
      * @param <T> the value type
      * @param sources the array of {@code SingleSource} instances
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -426,6 +429,7 @@ public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>...
      * @param <T> the value type
      * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
      * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -455,6 +459,7 @@ public static <T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T
      * @param <T> the value type
      * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
      * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -481,6 +486,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends SingleSou
      * @param <T> the value type
      * @param sources an {@code Iterable} sequence of {@code SingleSource} that need to be eagerly concatenated
      * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -714,6 +720,7 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Single}
      * @return the new {@code Single} that emits the item from the source {@code Future}
+     * @throws NullPointerException if {@code future} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
     @CheckReturnValue
@@ -1337,6 +1344,7 @@ public static <T> Single<T> never() {
      * @param delay the delay amount
      * @param unit the time unit of the delay
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -2190,6 +2198,7 @@ public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
      * @param unit the time unit
      * @return the new {@code Single} instance
      * @since 2.0
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see #delay(long, TimeUnit, boolean)
      */
     @CheckReturnValue
@@ -2212,6 +2221,7 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit) {
      * @param unit the time unit
      * @param delayError if {@code true}, both success and error signals are delayed. if {@code false}, only success signals are delayed.
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -2419,6 +2429,7 @@ public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit) {
      * @param unit the time unit of the waiting
      * @param scheduler the {@code Scheduler} to wait on and subscribe on to the current {@code Single}
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -3418,6 +3429,7 @@ public final Flowable<T> repeat() {
      * </dl>
      * @param times the number of times to re-subscribe to the current {@code Single}
      * @return the new {@code Flowable} instance
+     * @throws IllegalArgumentException if {@code times} is negative
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3446,6 +3458,7 @@ public final Flowable<T> repeat(long times) {
      *                trigger a resubscription to the current {@code Single}, otherwise the terminal signal of
      *                the {@code Publisher} will be the terminal signal of the sequence as well.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code handler} is {@code null}
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3470,6 +3483,7 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
      * @param stop the {@code BooleanSupplier} called after the current {@code Single} succeeds and if returns {@code false},
      *             the {@code Single} is re-subscribed; otherwise the sequence completes.
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code stop} is {@code null}
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -3509,6 +3523,7 @@ public final Single<T> retry() {
      * </dl>
      * @param times the number of times to resubscribe if the current {@code Single} fails
      * @return the new {@code Single} instance
+     * @throws IllegalArgumentException if {@code times} is negative
      * @since 2.0
      */
     @CheckReturnValue
@@ -3530,6 +3545,7 @@ public final Single<T> retry(long times) {
      * @param predicate the predicate called with the resubscription count and the failure {@link Throwable}
      *                  and should return {@code true} if a resubscription should happen
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -3553,6 +3569,8 @@ public final Single<T> retry(@NonNull BiPredicate<? super Integer, ? super Throw
      * @param predicate the predicate called with the failure {@link Throwable}
      *                  and should return {@code true} if a resubscription should happen
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
+     * @throws IllegalArgumentException if {@code times} is negative
      * @since 2.2
      */
     @CheckReturnValue
@@ -3574,6 +3592,7 @@ public final Single<T> retry(long times, @NonNull Predicate<? super Throwable> p
      * @param predicate the predicate called with the failure {@link Throwable}
      *                  and should return {@code true} if a resubscription should happen
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -3625,6 +3644,7 @@ public final Single<T> retry(@NonNull Predicate<? super Throwable> predicate) {
      *                throwable the {@code Flowable} emits) to trigger a resubscription or signal an error to
      *                be the output of the resulting {@code Single}
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code handler} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3931,6 +3951,7 @@ public final <E> Single<T> takeUntil(@NonNull SingleSource<? extends E> other) {
      * @param timeout the timeout amount
      * @param unit the time unit
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -3954,6 +3975,7 @@ public final Single<T> timeout(long timeout, @NonNull TimeUnit unit) {
      * @param scheduler the target {@code Scheduler} where the timeout is awaited and the {@code TimeoutException}
      *                  signaled
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -4195,6 +4217,7 @@ public final Single<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      *            be emitted by the resulting {@code Single}
      * @return the new {@code Single} that pairs up values from the source {@code Single} and the {@code other} {@code SingleSource}
      *         and emits the results of {@code zipFunction} applied to these pairs
+     * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
index eaf067c177..f877dc1381 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
@@ -14,13 +14,14 @@
 
 import java.util.*;
 
-import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.util.*;
 
 /**
- * A disposable container that can hold onto multiple other disposables and
- * offers O(1) add and removal complexity.
+ * A disposable container that can hold onto multiple other {@link Disposable}s and
+ * offers <em>O(1)</em> time complexity for {@link #add(Disposable)}, {@link #remove(Disposable)} and {@link #delete(Disposable)}
+ * operations.
  */
 public final class CompositeDisposable implements Disposable, DisposableContainer {
 
@@ -29,14 +30,14 @@ public final class CompositeDisposable implements Disposable, DisposableContaine
     volatile boolean disposed;
 
     /**
-     * Creates an empty CompositeDisposable.
+     * Creates an empty {@code CompositeDisposable}.
      */
     public CompositeDisposable() {
     }
 
     /**
-     * Creates a CompositeDisposables with the given array of initial elements.
-     * @param disposables the array of Disposables to start with
+     * Creates a {@code CompositeDisposable} with the given array of initial {@link Disposable} elements.
+     * @param disposables the array of {@code Disposable}s to start with
      * @throws NullPointerException if {@code disposables} or any of its array items is {@code null}
      */
     public CompositeDisposable(@NonNull Disposable... disposables) {
@@ -49,8 +50,8 @@ public CompositeDisposable(@NonNull Disposable... disposables) {
     }
 
     /**
-     * Creates a CompositeDisposables with the given Iterable sequence of initial elements.
-     * @param disposables the Iterable sequence of Disposables to start with
+     * Creates a {@code CompositeDisposable} with the given {@link Iterable} sequence of initial {@link Disposable} elements.
+     * @param disposables the {@code Iterable} sequence of {@code Disposable} to start with
      * @throws NullPointerException if {@code disposables} or any of its items is {@code null}
      */
     public CompositeDisposable(@NonNull Iterable<? extends Disposable> disposables) {
@@ -86,10 +87,10 @@ public boolean isDisposed() {
     }
 
     /**
-     * Adds a disposable to this container or disposes it if the
+     * Adds a {@link Disposable} to this container or disposes it if the
      * container has been disposed.
-     * @param disposable the disposable to add, not null
-     * @return true if successful, false if this container has been disposed
+     * @param disposable the {@code Disposable} to add, not {@code null}
+     * @return {@code true} if successful, {@code false} if this container has been disposed
      * @throws NullPointerException if {@code disposable} is {@code null}
      */
     @Override
@@ -113,10 +114,10 @@ public boolean add(@NonNull Disposable disposable) {
     }
 
     /**
-     * Atomically adds the given array of Disposables to the container or
+     * Atomically adds the given array of {@link Disposable}s to the container or
      * disposes them all if the container has been disposed.
-     * @param disposables the array of Disposables
-     * @return true if the operation was successful, false if the container has been disposed
+     * @param disposables the array of {@code Disposable}s
+     * @return {@code true} if the operation was successful, {@code false} if the container has been disposed
      * @throws NullPointerException if {@code disposables} or any of its array items is {@code null}
      */
     public boolean addAll(@NonNull Disposable... disposables) {
@@ -144,10 +145,11 @@ public boolean addAll(@NonNull Disposable... disposables) {
     }
 
     /**
-     * Removes and disposes the given disposable if it is part of this
+     * Removes and disposes the given {@link Disposable} if it is part of this
      * container.
-     * @param disposable the disposable to remove and dispose, not null
-     * @return true if the operation was successful
+     * @param disposable the disposable to remove and dispose, not {@code null}
+     * @return {@code true} if the operation was successful
+     * @throws NullPointerException if {@code disposable} is {@code null}
      */
     @Override
     public boolean remove(@NonNull Disposable disposable) {
@@ -159,15 +161,15 @@ public boolean remove(@NonNull Disposable disposable) {
     }
 
     /**
-     * Removes (but does not dispose) the given disposable if it is part of this
+     * Removes (but does not dispose) the given {@link Disposable} if it is part of this
      * container.
-     * @param disposable the disposable to remove, not null
-     * @return true if the operation was successful
+     * @param disposable the disposable to remove, not {@code null}
+     * @return {@code true} if the operation was successful
      * @throws NullPointerException if {@code disposable} is {@code null}
      */
     @Override
     public boolean delete(@NonNull Disposable disposable) {
-        Objects.requireNonNull(disposable, "disposables is null");
+        Objects.requireNonNull(disposable, "disposable is null");
         if (disposed) {
             return false;
         }
@@ -185,7 +187,7 @@ public boolean delete(@NonNull Disposable disposable) {
     }
 
     /**
-     * Atomically clears the container, then disposes all the previously contained Disposables.
+     * Atomically clears the container, then disposes all the previously contained {@link Disposable}s.
      */
     public void clear() {
         if (disposed) {
@@ -205,8 +207,8 @@ public void clear() {
     }
 
     /**
-     * Returns the number of currently held Disposables.
-     * @return the number of currently held Disposables
+     * Returns the number of currently held {@link Disposable}s.
+     * @return the number of currently held {@code Disposable}s
      */
     public int size() {
         if (disposed) {
@@ -222,11 +224,11 @@ public int size() {
     }
 
     /**
-     * Dispose the contents of the OpenHashSet by suppressing non-fatal
-     * Throwables till the end.
-     * @param set the OpenHashSet to dispose elements of
+     * Dispose the contents of the {@link OpenHashSet} by suppressing non-fatal
+     * {@link Throwable}s till the end.
+     * @param set the {@code OpenHashSet} to dispose elements of
      */
-    void dispose(OpenHashSet<Disposable> set) {
+    void dispose(@Nullable OpenHashSet<Disposable> set) {
         if (set == null) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
index 7f0cfd1100..3e80c68ced 100644
--- a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
@@ -67,6 +67,7 @@ public abstract class ConnectableFlowable<T> extends Flowable<T> {
      * @param connection
      *          the action that receives the connection subscription before the subscription to source happens
      *          allowing the caller to synchronously disconnect a synchronous source
+     * @throws NullPointerException if {@code connection} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/connect.html">ReactiveX documentation: Connect</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -168,6 +169,7 @@ public final Flowable<T> refCount(int subscriberCount) {
      * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
      * @param unit the time unit of the timeout
      * @return the new Flowable instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see #refCount(long, TimeUnit, Scheduler)
      * @since 2.2
      */
@@ -195,6 +197,7 @@ public final Flowable<T> refCount(long timeout, @NonNull TimeUnit unit) {
      * @param unit the time unit of the timeout
      * @param scheduler the target scheduler to wait on before disconnecting
      * @return the new Flowable instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -221,6 +224,7 @@ public final Flowable<T> refCount(long timeout, @NonNull TimeUnit unit, @NonNull
      * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
      * @param unit the time unit of the timeout
      * @return the new Flowable instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see #refCount(int, long, TimeUnit, Scheduler)
      * @since 2.2
      */
@@ -364,12 +368,14 @@ public Flowable<T> autoConnect(int numberOfSubscribers) {
      * @return a Flowable that automatically connects to this ConnectableFlowable
      *         when the specified number of Subscribers subscribe to it and calls the
      *         specified callback with the Subscription associated with the established connection
+     * @throws NullPointerException if {@code connection} is {@code null}
      */
     @NonNull
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     public Flowable<T> autoConnect(int numberOfSubscribers, @NonNull Consumer<? super Disposable> connection) {
+        Objects.requireNonNull(connection, "connection is null");
         if (numberOfSubscribers <= 0) {
             this.connect(connection);
             return RxJavaPlugins.onAssembly(this);
diff --git a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
index 19a083d727..2221ac62b0 100644
--- a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
@@ -64,6 +64,7 @@ public abstract class ConnectableObservable<T> extends Observable<T> {
      * @param connection
      *          the action that receives the connection subscription before the subscription to source happens
      *          allowing the caller to synchronously disconnect a synchronous source
+     * @throws NullPointerException if {@code connection} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/connect.html">ReactiveX documentation: Connect</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -155,6 +156,7 @@ public final Observable<T> refCount(int subscriberCount) {
      * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
      * @param unit the time unit of the timeout
      * @return the new Observable instance
+     * @throws NullPointerException if {@code unit} is {@code null}
      * @see #refCount(long, TimeUnit, Scheduler)
      * @since 2.2
      */
@@ -178,6 +180,7 @@ public final Observable<T> refCount(long timeout, @NonNull TimeUnit unit) {
      * @param unit the time unit of the timeout
      * @param scheduler the target scheduler to wait on before disconnecting
      * @return the new Observable instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -200,6 +203,7 @@ public final Observable<T> refCount(long timeout, @NonNull TimeUnit unit, @NonNu
      * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
      * @param unit the time unit of the timeout
      * @return the new Observable instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see #refCount(int, long, TimeUnit, Scheduler)
      * @since 2.2
      */
@@ -224,8 +228,8 @@ public final Observable<T> refCount(int subscriberCount, long timeout, @NonNull
      * @param unit the time unit of the timeout
      * @param scheduler the target scheduler to wait on before disconnecting
      * @return the new Observable instance
-     * @throws IllegalArgumentException if {@code subscriberCount} is non-positive
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code subscriberCount} is non-positive
      * @since 2.2
      */
     @CheckReturnValue
@@ -326,11 +330,13 @@ public Observable<T> autoConnect(int numberOfSubscribers) {
      * @return an Observable that automatically connects to this ConnectableObservable
      *         when the specified number of Subscribers subscribe to it and calls the
      *         specified callback with the Subscription associated with the established connection
+     * @throws NullPointerException if {@code connection} is {@code null}
      */
     @NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     public Observable<T> autoConnect(int numberOfSubscribers, @NonNull Consumer<? super Disposable> connection) {
+        Objects.requireNonNull(connection, "connection is null");
         if (numberOfSubscribers <= 0) {
             this.connect(connection);
             return RxJavaPlugins.onAssembly(this);
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index df1861c032..17d22690ad 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -20,6 +20,7 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.jdk8.*;
@@ -42,7 +43,7 @@
 public abstract class ParallelFlowable<@NonNull T> {
 
     /**
-     * Subscribes an array of Subscribers to this ParallelFlowable and triggers
+     * Subscribes an array of {@link Subscriber}s to this {@code ParallelFlowable} and triggers
      * the execution chain for all 'rails'.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -52,7 +53,8 @@ public abstract class ParallelFlowable<@NonNull T> {
      * </dl>
      *
      * @param subscribers the subscribers array to run in parallel, the number
-     * of items must be equal to the parallelism level of this ParallelFlowable
+     * of items must be equal to the parallelism level of this {@code ParallelFlowable}
+     * @throws NullPointerException if {@code subscribers} is {@code null}
      * @see #parallelism()
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
@@ -60,18 +62,18 @@ public abstract class ParallelFlowable<@NonNull T> {
     public abstract void subscribe(@NonNull Subscriber<? super T>[] subscribers);
 
     /**
-     * Returns the number of expected parallel Subscribers.
-     * @return the number of expected parallel Subscribers
+     * Returns the number of expected parallel {@link Subscriber}s.
+     * @return the number of expected parallel {@code Subscriber}s
      */
     @CheckReturnValue
     public abstract int parallelism();
 
     /**
-     * Validates the number of subscribers and returns true if their number
-     * matches the parallelism level of this ParallelFlowable.
+     * Validates the number of subscribers and returns {@code true} if their number
+     * matches the parallelism level of this {@code ParallelFlowable}.
      *
-     * @param subscribers the array of Subscribers
-     * @return true if the number of subscribers equals to the parallelism level
+     * @param subscribers the array of {@link Subscriber}s
+     * @return {@code true} if the number of subscribers equals to the parallelism level
      * @throws NullPointerException if {@code subscribers} is {@code null}
      * @throws IllegalArgumentException if {@code subscribers.length} is different from {@link #parallelism()}
      */
@@ -89,7 +91,7 @@ protected final boolean validate(@NonNull Subscriber<?>[] subscribers) {
     }
 
     /**
-     * Take a Publisher and prepare to consume it on multiple 'rails' (number of CPUs)
+     * Take a {@link Publisher} and prepare to consume it on multiple 'rails' (number of CPUs)
      * in a round-robin fashion.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -100,8 +102,9 @@ protected final boolean validate(@NonNull Subscriber<?>[] subscribers) {
      *  <dd>{@code from} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param source the source Publisher
-     * @return the ParallelFlowable instance
+     * @param source the source {@code Publisher}
+     * @return the {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -112,7 +115,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     }
 
     /**
-     * Take a Publisher and prepare to consume it on parallelism number of 'rails' in a round-robin fashion.
+     * Take a {@link Publisher} and prepare to consume it on parallelism number of 'rails' in a round-robin fashion.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors the backpressure of the parallel rails and
@@ -122,9 +125,11 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
      *  <dd>{@code from} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param source the source Publisher
+     * @param source the source {@code Publisher}
      * @param parallelism the number of parallel rails
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code source} is {@code null}
+     * @throws IllegalArgumentException if {@code parallelism} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -135,9 +140,9 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     }
 
     /**
-     * Take a Publisher and prepare to consume it on parallelism number of 'rails' ,
+     * Take a {@link Publisher} and prepare to consume it on parallelism number of 'rails' ,
      * possibly ordered and round-robin fashion and use custom prefetch amount and queue
-     * for dealing with the source Publisher's values.
+     * for dealing with the source {@code Publisher}'s values.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors the backpressure of the parallel rails and
@@ -147,11 +152,13 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
      *  <dd>{@code from} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param source the source Publisher
+     * @param source the source {@code Publisher}
      * @param parallelism the number of parallel rails
      * @param prefetch the number of values to prefetch from the source
      * the source until there is a rail ready to process it.
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code source} is {@code null}
+     * @throws IllegalArgumentException if {@code parallelism} or {@code prefetch} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -169,7 +176,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     /**
      * Maps the source values on each 'rail' to another value.
      * <p>
-     * Note that the same mapper function may be called from multiple threads concurrently.
+     * Note that the same {@code mapper} function may be called from multiple threads concurrently.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and the behavior
@@ -179,7 +186,8 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
      * </dl>
      * @param <R> the output value type
      * @param mapper the mapper function turning Ts into Rs.
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -194,7 +202,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      * Maps the source values on each 'rail' to another value and
      * handles errors based on the given {@link ParallelFailureHandling} enumeration value.
      * <p>
-     * Note that the same mapper function may be called from multiple threads concurrently.
+     * Note that the same {@code mapper} function may be called from multiple threads concurrently.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and the behavior
@@ -206,8 +214,9 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      * @param <R> the output value type
      * @param mapper the mapper function turning Ts into Rs.
      * @param errorHandler the enumeration that defines how to handle errors thrown
-     *                     from the mapper function
-     * @return the new ParallelFlowable instance
+     *                     from the {@code mapper} function
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} or {@code errorHandler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -224,7 +233,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      * Maps the source values on each 'rail' to another value and
      * handles errors based on the returned value by the handler function.
      * <p>
-     * Note that the same mapper function may be called from multiple threads concurrently.
+     * Note that the same {@code mapper} function may be called from multiple threads concurrently.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and the behavior
@@ -236,9 +245,10 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      * @param <R> the output value type
      * @param mapper the mapper function turning Ts into Rs.
      * @param errorHandler the function called with the current repeat count and
-     *                     failure Throwable and should return one of the {@link ParallelFailureHandling}
+     *                     failure {@link Throwable} and should return one of the {@link ParallelFailureHandling}
      *                     enumeration values to indicate how to proceed.
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} or {@code errorHandler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -262,8 +272,9 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code filter} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param predicate the function returning true to keep a value or false to drop a value
-     * @return the new ParallelFlowable instance
+     * @param predicate the function returning {@code true} to keep a value or {@code false} to drop a value
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -287,10 +298,11 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate)
      *  <dd>{@code filter} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.8 - experimental
-     * @param predicate the function returning true to keep a value or false to drop a value
+     * @param predicate the function returning {@code true} to keep a value or {@code false} to drop a value
      * @param errorHandler the enumeration that defines how to handle errors thrown
-     *                     from the predicate
-     * @return the new ParallelFlowable instance
+     *                     from the {@code predicate}
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code predicate} or {@code errorHandler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -316,11 +328,12 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate,
      *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.8 - experimental
-     * @param predicate the function returning true to keep a value or false to drop a value
+     * @param predicate the function returning {@code true} to keep a value or {@code false} to drop a value
      * @param errorHandler the function called with the current repeat count and
-     *                     failure Throwable and should return one of the {@link ParallelFailureHandling}
+     *                     failure {@link Throwable} and should return one of the {@link ParallelFailureHandling}
      *                     enumeration values to indicate how to proceed.
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code predicate} or {@code errorHandler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -334,19 +347,19 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate,
     }
 
     /**
-     * Specifies where each 'rail' will observe its incoming values with
+     * Specifies where each 'rail' will observe its incoming values, specified via a {@link Scheduler}, with
      * no work-stealing and default prefetch amount.
      * <p>
-     * This operator uses the default prefetch size returned by {@code Flowable.bufferSize()}.
+     * This operator uses the default prefetch size returned by {@link Flowable#bufferSize()}.
      * <p>
-     * The operator will call {@code Scheduler.createWorker()} as many
-     * times as this ParallelFlowable's parallelism level is.
+     * The operator will call {@link Scheduler#createWorker()} as many
+     * times as this {@code ParallelFlowable}'s parallelism level is.
      * <p>
-     * No assumptions are made about the Scheduler's parallelism level,
-     * if the Scheduler's parallelism level is lower than the ParallelFlowable's,
+     * No assumptions are made about the {@code Scheduler}'s parallelism level,
+     * if the {@code Scheduler}'s parallelism level is lower than the {@code ParallelFlowable}'s,
      * some rails may end up on the same thread/worker.
      * <p>
-     * This operator doesn't require the Scheduler to be trampolining as it
+     * This operator doesn't require the {@code Scheduler} to be trampolining as it
      * does its own built-in trampolining logic.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -354,12 +367,13 @@ public final ParallelFlowable<T> filter(@NonNull Predicate<? super T> predicate,
      *  requests {@link Flowable#bufferSize} amount from the upstream, followed
      *  by 75% of that amount requested after every 75% received.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code runOn} drains the upstream rails on the specified {@link Scheduler}'s
+     *  <dd>{@code runOn} drains the upstream rails on the specified {@code Scheduler}'s
      *  {@link io.reactivex.rxjava3.core.Scheduler.Worker Worker}s.</dd>
      * </dl>
      *
      * @param scheduler the scheduler to use
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -370,19 +384,19 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Specifies where each 'rail' will observe its incoming values with
+     * Specifies where each 'rail' will observe its incoming values, specified via a {@link Scheduler}, with
      * possibly work-stealing and a given prefetch amount.
      * <p>
-     * This operator uses the default prefetch size returned by {@code Flowable.bufferSize()}.
+     * This operator uses the default prefetch size returned by {@link Flowable#bufferSize()}.
      * <p>
-     * The operator will call {@code Scheduler.createWorker()} as many
-     * times as this ParallelFlowable's parallelism level is.
+     * The operator will call {@link Scheduler#createWorker()} as many
+     * times as this {@code ParallelFlowable}'s parallelism level is.
      * <p>
-     * No assumptions are made about the Scheduler's parallelism level,
-     * if the Scheduler's parallelism level is lower than the ParallelFlowable's,
+     * No assumptions are made about the {@code Scheduler}'s parallelism level,
+     * if the {@code Scheduler}'s parallelism level is lower than the {@code ParallelFlowable}'s,
      * some rails may end up on the same thread/worker.
      * <p>
-     * This operator doesn't require the Scheduler to be trampolining as it
+     * This operator doesn't require the {@code Scheduler} to be trampolining as it
      * does its own built-in trampolining logic.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -390,14 +404,16 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler) {
      *  requests the {@code prefetch} amount from the upstream, followed
      *  by 75% of that amount requested after every 75% received.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code runOn} drains the upstream rails on the specified {@link Scheduler}'s
+     *  <dd>{@code runOn} drains the upstream rails on the specified {@code Scheduler}'s
      *  {@link io.reactivex.rxjava3.core.Scheduler.Worker Worker}s.</dd>
      * </dl>
      *
      * @param scheduler the scheduler to use
      * that rail's worker has run out of work.
      * @param prefetch the number of values to request on each 'rail' from the source
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -410,8 +426,8 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler, int prefetc
     }
 
     /**
-     * Reduces all values within a 'rail' and across 'rails' with a reducer function into a single
-     * sequential value.
+     * Reduces all values within a 'rail' and across 'rails' with a reducer function into one
+     * {@link Flowable} sequence.
      * <p>
      * Note that the same reducer function may be called from multiple threads concurrently.
      * <dl>
@@ -422,7 +438,8 @@ public final ParallelFlowable<T> runOn(@NonNull Scheduler scheduler, int prefetc
      *  <dd>{@code reduce} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param reducer the function to reduce two values into one.
-     * @return the new Flowable instance emitting the reduced value or empty if the ParallelFlowable was empty
+     * @return the new {@code Flowable} instance emitting the reduced value or empty if the current {@code ParallelFlowable} is empty
+     * @throws NullPointerException if {@code reducer} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -435,7 +452,7 @@ public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
 
     /**
      * Reduces all values within a 'rail' to a single value (with a possibly different type) via
-     * a reducer function that is initialized on each rail from an initialSupplier value.
+     * a reducer function that is initialized on each rail from an {@code initialSupplier} value.
      * <p>
      * Note that the same mapper function may be called from multiple threads concurrently.
      * <dl>
@@ -449,7 +466,8 @@ public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * @param initialSupplier the supplier for the initial value
      * @param reducer the function to reduce a previous output of reduce (or the initial value supplied)
      * with a current source value.
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code initialSupplier} or {@code reducer} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -463,7 +481,7 @@ public final <R> ParallelFlowable<R> reduce(@NonNull Supplier<R> initialSupplier
 
     /**
      * Merges the values from each 'rail' in a round-robin or same-order fashion and
-     * exposes it as a regular Publisher sequence, running with a default prefetch value
+     * exposes it as a regular {@link Flowable} sequence, running with a default prefetch value
      * for the rails.
      * <p>
      * This operator uses the default prefetch size returned by {@code Flowable.bufferSize()}.
@@ -476,7 +494,7 @@ public final <R> ParallelFlowable<R> reduce(@NonNull Supplier<R> initialSupplier
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequential} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @see ParallelFlowable#sequential(int)
      * @see ParallelFlowable#sequentialDelayError()
      */
@@ -490,7 +508,7 @@ public final Flowable<T> sequential() {
 
     /**
      * Merges the values from each 'rail' in a round-robin or same-order fashion and
-     * exposes it as a regular Publisher sequence, running with a give prefetch value
+     * exposes it as a regular {@link Flowable} sequence, running with a give prefetch value
      * for the rails.
      * <img width="640" height="602" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallelflowable.sequential.png" alt="">
      * <dl>
@@ -502,7 +520,8 @@ public final Flowable<T> sequential() {
      *  <dd>{@code sequential} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param prefetch the prefetch amount to use for each rail
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see ParallelFlowable#sequential()
      * @see ParallelFlowable#sequentialDelayError(int)
      */
@@ -517,7 +536,7 @@ public final Flowable<T> sequential(int prefetch) {
 
     /**
      * Merges the values from each 'rail' in a round-robin or same-order fashion and
-     * exposes it as a regular Flowable sequence, running with a default prefetch value
+     * exposes it as a regular {@link Flowable} sequence, running with a default prefetch value
      * for the rails and delaying errors from all rails till all terminate.
      * <p>
      * This operator uses the default prefetch size returned by {@code Flowable.bufferSize()}.
@@ -531,7 +550,7 @@ public final Flowable<T> sequential(int prefetch) {
      *  <dd>{@code sequentialDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.0.7 - experimental
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
      * @see ParallelFlowable#sequentialDelayError(int)
      * @see ParallelFlowable#sequential()
      * @since 2.2
@@ -546,7 +565,7 @@ public final Flowable<T> sequentialDelayError() {
 
     /**
      * Merges the values from each 'rail' in a round-robin or same-order fashion and
-     * exposes it as a regular Publisher sequence, running with a give prefetch value
+     * exposes it as a regular {@link Flowable} sequence, running with a give prefetch value
      * for the rails and delaying errors from all rails till all terminate.
      * <img width="640" height="602" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/parallelflowable.sequential.png" alt="">
      * <dl>
@@ -559,7 +578,8 @@ public final Flowable<T> sequentialDelayError() {
      * </dl>
      * <p>History: 2.0.7 - experimental
      * @param prefetch the prefetch amount to use for each rail
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see ParallelFlowable#sequential()
      * @see ParallelFlowable#sequentialDelayError()
      * @since 2.2
@@ -574,10 +594,10 @@ public final Flowable<T> sequentialDelayError(int prefetch) {
     }
 
     /**
-     * Sorts the 'rails' of this ParallelFlowable and returns a Publisher that sequentially
+     * Sorts the 'rails' of this {@code ParallelFlowable} and returns a {@link Flowable} that sequentially
      * picks the smallest next value from the rails.
      * <p>
-     * This operator requires a finite source ParallelFlowable.
+     * This operator requires a finite source {@code ParallelFlowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from the downstream and
@@ -587,7 +607,8 @@ public final Flowable<T> sequentialDelayError(int prefetch) {
      * </dl>
      *
      * @param comparator the comparator to use
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code comparator} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -598,10 +619,10 @@ public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator) {
     }
 
     /**
-     * Sorts the 'rails' of this ParallelFlowable and returns a Publisher that sequentially
+     * Sorts the 'rails' of this {@code ParallelFlowable} and returns a {@link Flowable} that sequentially
      * picks the smallest next value from the rails.
      * <p>
-     * This operator requires a finite source ParallelFlowable.
+     * This operator requires a finite source {@code ParallelFlowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from the downstream and
@@ -612,7 +633,9 @@ public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator) {
      *
      * @param comparator the comparator to use
      * @param capacityHint the expected number of total elements
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code comparator} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -629,9 +652,9 @@ public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator, int c
     }
 
     /**
-     * Sorts the 'rails' according to the comparator and returns a full sorted list as a Publisher.
+     * Sorts the 'rails' according to the comparator and returns a full sorted {@link List} as a {@link Flowable}.
      * <p>
-     * This operator requires a finite source ParallelFlowable.
+     * This operator requires a finite source {@code ParallelFlowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from the downstream and
@@ -641,7 +664,8 @@ public final Flowable<T> sorted(@NonNull Comparator<? super T> comparator, int c
      * </dl>
      *
      * @param comparator the comparator to compare elements
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code comparator} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -651,9 +675,9 @@ public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> compa
         return toSortedList(comparator, 16);
     }
     /**
-     * Sorts the 'rails' according to the comparator and returns a full sorted list as a Publisher.
+     * Sorts the 'rails' according to the comparator and returns a full sorted {@link List} as a {@link Flowable}.
      * <p>
-     * This operator requires a finite source ParallelFlowable.
+     * This operator requires a finite source {@code ParallelFlowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from the downstream and
@@ -664,7 +688,9 @@ public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> compa
      *
      * @param comparator the comparator to compare elements
      * @param capacityHint the expected number of total elements
-     * @return the new Flowable instance
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code comparator} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -694,7 +720,8 @@ public final Flowable<List<T>> toSortedList(@NonNull Comparator<? super T> compa
      * </dl>
      *
      * @param onNext the callback
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onNext} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -727,8 +754,9 @@ public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
      * <p>History: 2.0.8 - experimental
      * @param onNext the callback
      * @param errorHandler the enumeration that defines how to handle errors thrown
-     *                     from the onNext consumer
-     * @return the new ParallelFlowable instance
+     *                     from the {@code onNext} consumer
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onNext} or {@code errorHandler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -754,9 +782,10 @@ public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext, @
      * <p>History: 2.0.8 - experimental
      * @param onNext the callback
      * @param errorHandler the function called with the current repeat count and
-     *                     failure Throwable and should return one of the {@link ParallelFailureHandling}
+     *                     failure {@link Throwable} and should return one of the {@link ParallelFailureHandling}
      *                     enumeration values to indicate how to proceed.
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onNext} or {@code errorHandler} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -781,7 +810,8 @@ public final ParallelFlowable<T> doOnNext(@NonNull Consumer<? super T> onNext, @
      * </dl>
      *
      * @param onAfterNext the callback
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onAfterNext} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -812,7 +842,8 @@ public final ParallelFlowable<T> doAfterNext(@NonNull Consumer<? super T> onAfte
      * </dl>
      *
      * @param onError the callback
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onError} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -833,7 +864,7 @@ public final ParallelFlowable<T> doOnError(@NonNull Consumer<Throwable> onError)
     }
 
     /**
-     * Run the specified Action when a 'rail' completes.
+     * Run the specified {@link Action} when a 'rail' completes.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and the behavior
@@ -843,7 +874,8 @@ public final ParallelFlowable<T> doOnError(@NonNull Consumer<Throwable> onError)
      * </dl>
      *
      * @param onComplete the callback
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onComplete} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -864,7 +896,7 @@ public final ParallelFlowable<T> doOnComplete(@NonNull Action onComplete) {
     }
 
     /**
-     * Run the specified Action when a 'rail' completes or signals an error.
+     * Run the specified {@link Action} when a 'rail' completes or signals an error.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and the behavior
@@ -874,7 +906,8 @@ public final ParallelFlowable<T> doOnComplete(@NonNull Action onComplete) {
      * </dl>
      *
      * @param onAfterTerminate the callback
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -895,7 +928,7 @@ public final ParallelFlowable<T> doAfterTerminated(@NonNull Action onAfterTermin
     }
 
     /**
-     * Call the specified callback when a 'rail' receives a Subscription from its upstream.
+     * Call the specified callback when a 'rail' receives a {@link Subscription} from its upstream.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and the behavior
@@ -905,7 +938,8 @@ public final ParallelFlowable<T> doAfterTerminated(@NonNull Action onAfterTermin
      * </dl>
      *
      * @param onSubscribe the callback
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -936,7 +970,8 @@ public final ParallelFlowable<T> doOnSubscribe(@NonNull Consumer<? super Subscri
      * </dl>
      *
      * @param onRequest the callback
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onRequest} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -957,7 +992,7 @@ public final ParallelFlowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
     }
 
     /**
-     * Run the specified Action when a 'rail' receives a cancellation.
+     * Run the specified {@link Action} when a 'rail' receives a cancellation.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and the behavior
@@ -967,7 +1002,8 @@ public final ParallelFlowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
      * </dl>
      *
      * @param onCancel the callback
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code onCancel} is {@code null}
      */
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -988,7 +1024,7 @@ public final ParallelFlowable<T> doOnCancel(@NonNull Action onCancel) {
     }
 
     /**
-     * Collect the elements in each rail into a collection supplied via a collectionSupplier
+     * Collect the elements in each rail into a collection supplied via a {@code collectionSupplier}
      * and collected into with a collector action, emitting the collection at the end.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1001,7 +1037,8 @@ public final ParallelFlowable<T> doOnCancel(@NonNull Action onCancel) {
      * @param <C> the collection type
      * @param collectionSupplier the supplier of the collection in each rail
      * @param collector the collector, taking the per-rail collection and the current item
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code collectionSupplier} or {@code collector} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1014,7 +1051,7 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
     }
 
     /**
-     * Wraps multiple Publishers into a ParallelFlowable which runs them
+     * Wraps multiple {@link Publisher}s into a {@code ParallelFlowable} which runs them
      * in parallel and unordered.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1026,7 +1063,8 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
      *
      * @param <T> the value type
      * @param publishers the array of publishers
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code publishers} is {@code null}
      * @throws IllegalArgumentException if {@code publishers} is an empty array
      */
     @CheckReturnValue
@@ -1055,9 +1093,9 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
      * </dl>
      * <p>History: 2.1.7 - experimental
      * @param <R> the resulting object type
-     * @param converter the function that receives the current ParallelFlowable instance and returns a value
+     * @param converter the function that receives the current {@code ParallelFlowable} instance and returns a value
      * @return the converted value
-     * @throws NullPointerException if converter is null
+     * @throws NullPointerException if {@code converter} is {@code null}
      * @since 2.2
      */
     @CheckReturnValue
@@ -1069,8 +1107,8 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
     }
 
     /**
-     * Allows composing operators, in assembly time, on top of this ParallelFlowable
-     * and returns another ParallelFlowable with composed features.
+     * Allows composing operators, in assembly time, on top of this {@code ParallelFlowable}
+     * and returns another {@code ParallelFlowable} with composed features.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and the behavior
@@ -1080,8 +1118,9 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
      * </dl>
      *
      * @param <U> the output value type
-     * @param composer the composer function from ParallelFlowable (this) to another ParallelFlowable
-     * @return the ParallelFlowable returned by the function
+     * @param composer the composer function from {@code ParallelFlowable} (this) to another {@code ParallelFlowable}
+     * @return the {@code ParallelFlowable} returned by the function
+     * @throws NullPointerException if {@code composer} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1092,9 +1131,9 @@ public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U>
     }
 
     /**
-     * Generates and flattens Publishers on each 'rail'.
+     * Generates and flattens {@link Publisher}s on each 'rail'.
      * <p>
-     * Errors are not delayed and uses unbounded concurrency along with default inner prefetch.
+     * The errors are not delayed and uses unbounded concurrency along with default inner prefetch.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from the downstream rails and
@@ -1107,8 +1146,9 @@ public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U>
      * </dl>
      *
      * @param <R> the result type
-     * @param mapper the function to map each rail's value into a Publisher
-     * @return the new ParallelFlowable instance
+     * @param mapper the function to map each rail's value into a {@code Publisher}
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1119,7 +1159,7 @@ public final <R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, ? exte
     }
 
     /**
-     * Generates and flattens Publishers on each 'rail', optionally delaying errors.
+     * Generates and flattens {@link Publisher}s on each 'rail', optionally delaying errors.
      * <p>
      * It uses unbounded concurrency along with default inner prefetch.
      * <dl>
@@ -1135,9 +1175,10 @@ public final <R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, ? exte
      * </dl>
      *
      * @param <R> the result type
-     * @param mapper the function to map each rail's value into a Publisher
+     * @param mapper the function to map each rail's value into a {@code Publisher}
      * @param delayError should the errors from the main and the inner sources delayed till everybody terminates?
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1149,8 +1190,8 @@ public final <R> ParallelFlowable<R> flatMap(
     }
 
     /**
-     * Generates and flattens Publishers on each 'rail', optionally delaying errors
-     * and having a total number of simultaneous subscriptions to the inner Publishers.
+     * Generates and flattens {@link Publisher}s on each 'rail', optionally delaying errors
+     * and having a total number of simultaneous subscriptions to the inner {@code Publisher}s.
      * <p>
      * It uses a default inner prefetch.
      * <dl>
@@ -1166,10 +1207,12 @@ public final <R> ParallelFlowable<R> flatMap(
      * </dl>
      *
      * @param <R> the result type
-     * @param mapper the function to map each rail's value into a Publisher
+     * @param mapper the function to map each rail's value into a {@code Publisher}
      * @param delayError should the errors from the main and the inner sources delayed till everybody terminates?
-     * @param maxConcurrency the maximum number of simultaneous subscriptions to the generated inner Publishers
-     * @return the new ParallelFlowable instance
+     * @param maxConcurrency the maximum number of simultaneous subscriptions to the generated inner {@code Publisher}s
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -1181,9 +1224,9 @@ public final <R> ParallelFlowable<R> flatMap(
     }
 
     /**
-     * Generates and flattens Publishers on each 'rail', optionally delaying errors,
-     * having a total number of simultaneous subscriptions to the inner Publishers
-     * and using the given prefetch amount for the inner Publishers.
+     * Generates and flattens {@link Publisher}s on each 'rail', optionally delaying errors,
+     * having a total number of simultaneous subscriptions to the inner {@code Publisher}s
+     * and using the given prefetch amount for the inner {@code Publisher}s.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from the downstream rails and
@@ -1197,11 +1240,13 @@ public final <R> ParallelFlowable<R> flatMap(
      * </dl>
      *
      * @param <R> the result type
-     * @param mapper the function to map each rail's value into a Publisher
+     * @param mapper the function to map each rail's value into a {@code Publisher}
      * @param delayError should the errors from the main and the inner sources delayed till everybody terminates?
-     * @param maxConcurrency the maximum number of simultaneous subscriptions to the generated inner Publishers
-     * @param prefetch the number of items to prefetch from each inner Publisher
-     * @return the new ParallelFlowable instance
+     * @param maxConcurrency the maximum number of simultaneous subscriptions to the generated inner {@code Publisher}s
+     * @param prefetch the number of items to prefetch from each inner {@code Publisher}
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -1217,7 +1262,7 @@ public final <R> ParallelFlowable<R> flatMap(
     }
 
     /**
-     * Generates and concatenates Publishers on each 'rail', signalling errors immediately
+     * Generates and concatenates {@link Publisher}s on each 'rail', signalling errors immediately
      * and generating 2 publishers upfront.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1230,9 +1275,10 @@ public final <R> ParallelFlowable<R> flatMap(
      * </dl>
      *
      * @param <R> the result type
-     * @param mapper the function to map each rail's value into a Publisher
-     * source and the inner Publishers (immediate, boundary, end)
-     * @return the new ParallelFlowable instance
+     * @param mapper the function to map each rail's value into a {@code Publisher}
+     * source and the inner {@code Publisher}s (immediate, boundary, end)
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1244,8 +1290,8 @@ public final <R> ParallelFlowable<R> concatMap(
     }
 
     /**
-     * Generates and concatenates Publishers on each 'rail', signalling errors immediately
-     * and using the given prefetch amount for generating Publishers upfront.
+     * Generates and concatenates {@link Publisher}s on each 'rail', signalling errors immediately
+     * and using the given prefetch amount for generating {@code Publisher}s upfront.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from the downstream rails and
@@ -1258,10 +1304,12 @@ public final <R> ParallelFlowable<R> concatMap(
      * </dl>
      *
      * @param <R> the result type
-     * @param mapper the function to map each rail's value into a Publisher
-     * @param prefetch the number of items to prefetch from each inner Publisher
-     * source and the inner Publishers (immediate, boundary, end)
-     * @return the new ParallelFlowable instance
+     * @param mapper the function to map each rail's value into a {@code Publisher}
+     * @param prefetch the number of items to prefetch from each inner {@code Publisher}
+     * source and the inner {@code Publisher}s (immediate, boundary, end)
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -1276,7 +1324,7 @@ public final <R> ParallelFlowable<R> concatMap(
     }
 
     /**
-     * Generates and concatenates Publishers on each 'rail', optionally delaying errors
+     * Generates and concatenates {@link Publisher}s on each 'rail', optionally delaying errors
      * and generating 2 publishers upfront.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -1289,11 +1337,12 @@ public final <R> ParallelFlowable<R> concatMap(
      * </dl>
      *
      * @param <R> the result type
-     * @param mapper the function to map each rail's value into a Publisher
-     * @param tillTheEnd if true all errors from the upstream and inner Publishers are delayed
-     * till all of them terminate, if false, the error is emitted when an inner Publisher terminates.
-     * source and the inner Publishers (immediate, boundary, end)
-     * @return the new ParallelFlowable instance
+     * @param mapper the function to map each rail's value into a {@code Publisher}
+     * @param tillTheEnd if {@code true}, all errors from the upstream and inner {@code Publisher}s are delayed
+     * till all of them terminate, if {@code false}, the error is emitted when an inner {@code Publisher} terminates.
+     * source and the inner {@code Publisher}s (immediate, boundary, end)
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1306,8 +1355,8 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
     }
 
     /**
-     * Generates and concatenates Publishers on each 'rail', optionally delaying errors
-     * and using the given prefetch amount for generating Publishers upfront.
+     * Generates and concatenates {@link Publisher}s on each 'rail', optionally delaying errors
+     * and using the given prefetch amount for generating {@code Publisher}s upfront.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from the downstream rails and
@@ -1320,11 +1369,13 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
      * </dl>
      *
      * @param <R> the result type
-     * @param mapper the function to map each rail's value into a Publisher
-     * @param prefetch the number of items to prefetch from each inner Publisher
-     * @param tillTheEnd if true all errors from the upstream and inner Publishers are delayed
-     * till all of them terminate, if false, the error is emitted when an inner Publisher terminates.
-     * @return the new ParallelFlowable instance
+     * @param mapper the function to map each rail's value into a {@code Publisher}
+     * @param prefetch the number of items to prefetch from each inner {@code Publisher}
+     * @param tillTheEnd if {@code true}, all errors from the upstream and inner {@code Publisher}s are delayed
+     * till all of them terminate, if {@code false}, the error is emitted when an inner {@code Publisher} terminates.
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -1348,7 +1399,7 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from each downstream rail. The source {@code ParallelFlowable}s is
      *  expected to honor backpressure as well. If the source {@code ParallelFlowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -1358,10 +1409,11 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
      *            source {@code ParallelFlowable}
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #flatMapStream(Function)
      * @since 3.0.0
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -1373,14 +1425,14 @@ public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T
 
     /**
      * Returns a {@code ParallelFlowable} that merges each item emitted by the source {@code ParallelFlowable} with the values in an
-     * Iterable corresponding to that item that is generated by a selector.
+     * {@link Iterable} corresponding to that item that is generated by a selector.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from each downstream rail. The source {@code ParallelFlowable}s is
      *  expected to honor backpressure as well. If the source {@code ParallelFlowable} violates the rule, the operator will
-     *  signal a {@code MissingBackpressureException}.</dd>
+     *  signal a {@link MissingBackpressureException}.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -1396,6 +1448,8 @@ public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #flatMapStream(Function, int)
      * @since 3.0.0
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -1424,8 +1478,9 @@ public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T
      * </dl>
      * @param <R> the output value type
      * @param mapper the mapper function turning Ts into optional of Rs.
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
      * @since 3.0.0
+     * @throws NullPointerException if {@code mapper} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1453,8 +1508,9 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
      * @param mapper the mapper function turning Ts into optional of Rs.
      * @param errorHandler the enumeration that defines how to handle errors thrown
      *                     from the mapper function
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
      * @since 3.0.0
+     * @throws NullPointerException if {@code mapper} or {@code errorHandler} is {@code null}
      */
     @CheckReturnValue
     @NonNull
@@ -1482,9 +1538,10 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
      * @param <R> the output value type
      * @param mapper the mapper function turning Ts into optional of Rs.
      * @param errorHandler the function called with the current repeat count and
-     *                     failure Throwable and should return one of the {@link ParallelFailureHandling}
+     *                     failure {@link Throwable} and should return one of the {@link ParallelFailureHandling}
      *                     enumeration values to indicate how to proceed.
-     * @return the new ParallelFlowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} or {@code errorHandler} is {@code null}
      * @since 3.0.0
      */
     @CheckReturnValue
@@ -1502,11 +1559,11 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
      * <p>
      * <img width="640" height="328" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.f.png" alt="">
      * <p>
-     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * Due to the blocking and sequential nature of Java {@code Stream}s, the streams are mapped and consumed in a sequential fashion
      * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
      * {@code concatMapStream} are identical operators and are provided as aliases.
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function)}:
      * <pre><code>
@@ -1536,7 +1593,8 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
      * @param <R> the element type of the {@code Stream}s and the result
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
-     * @return the new Flowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #flatMap(Function)
      * @see #flatMapIterable(Function)
      * @see #flatMapStream(Function, int)
@@ -1555,11 +1613,11 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
      * <p>
      * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapStream.fi.png" alt="">
      * <p>
-     * Due to the blocking and sequential nature of Java {@link Stream}s, the streams are mapped and consumed in a sequential fashion
+     * Due to the blocking and sequential nature of Java {@code Stream}s, the streams are mapped and consumed in a sequential fashion
      * without interleaving (unlike a more general {@link #flatMap(Function)}). Therefore, {@code flatMapStream} and
      * {@code concatMapStream} are identical operators and are provided as aliases.
      * <p>
-     * The operator closes the {@code Stream} upon cancellation and when it terminates. Exceptions raised when
+     * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
      * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flatMapIterable(Function, int)}:
      * <pre><code>
@@ -1589,7 +1647,9 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
      * @param mapper the function that receives an upstream item and should return a {@code Stream} whose elements
      * will be emitted to the downstream
      * @param prefetch the number of upstream items to request upfront, then 75% of this amount after each 75% upstream items received
-     * @return the new Flowable instance
+     * @return the new {@code ParallelFlowable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #flatMap(Function, boolean, int)
      * @see #flatMapIterable(Function, int)
      * @since 3.0.0
@@ -1606,7 +1666,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
 
     /**
      * Reduces all values within a 'rail' and across 'rails' with a callbacks
-     * of the given {@link Collector} into a single sequential value.
+     * of the given {@link Collector} into one {@link Flowable} containing a single value.
      * <p>
      * Each parallel rail receives its own {@link Collector#accumulator()} and
      * {@link Collector#combiner()}.
@@ -1620,7 +1680,8 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
      * @param <A> the accumulator type
      * @param <R> the output value type
      * @param collector the {@code Collector} instance
-     * @return the new Flowable instance emitting the collected value.
+     * @return the new {@code Flowable} instance emitting the collected value.
+     * @throws NullPointerException if {@code collector} is {@code null}
      * @since 3.0.0
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index b7880d6833..6e903e5aab 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -190,10 +190,12 @@ public static <T> ReplayProcessor<T> create() {
      * @param capacityHint
      *          the initial buffer capacity
      * @return the created processor
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> create(int capacityHint) {
+        ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         return new ReplayProcessor<>(new UnboundedReplayBuffer<>(capacityHint));
     }
 
@@ -216,10 +218,12 @@ public static <T> ReplayProcessor<T> create(int capacityHint) {
      * @param maxSize
      *          the maximum number of buffered items
      * @return the created processor
+     * @throws IllegalArgumentException if {@code maxSize} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> createWithSize(int maxSize) {
+        ObjectHelper.verifyPositive(maxSize, "maxSize");
         return new ReplayProcessor<>(new SizeBoundReplayBuffer<>(maxSize));
     }
 
@@ -272,10 +276,15 @@ public static <T> ReplayProcessor<T> createWithSize(int maxSize) {
      * @param scheduler
      *          the {@link Scheduler} that provides the current time
      * @return the created processor
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code maxAge} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> createWithTime(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        ObjectHelper.verifyPositive(maxAge, "maxAge");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return new ReplayProcessor<>(new SizeAndTimeBoundReplayBuffer<>(Integer.MAX_VALUE, maxAge, unit, scheduler));
     }
 
@@ -312,10 +321,16 @@ public static <T> ReplayProcessor<T> createWithTime(long maxAge, @NonNull TimeUn
      * @param scheduler
      *          the {@link Scheduler} that provides the current time
      * @return the created processor
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code maxAge} or {@code maxSize} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> ReplayProcessor<T> createWithTimeAndSize(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int maxSize) {
+        ObjectHelper.verifyPositive(maxSize, "maxSize");
+        ObjectHelper.verifyPositive(maxAge, "maxAge");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return new ReplayProcessor<>(new SizeAndTimeBoundReplayBuffer<>(maxSize, maxAge, unit, scheduler));
     }
 
@@ -645,7 +660,7 @@ static final class UnboundedReplayBuffer<T>
         volatile int size;
 
         UnboundedReplayBuffer(int capacityHint) {
-            this.buffer = new ArrayList<>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
+            this.buffer = new ArrayList<>(capacityHint);
         }
 
         @Override
@@ -845,7 +860,7 @@ static final class SizeBoundReplayBuffer<T>
         volatile boolean done;
 
         SizeBoundReplayBuffer(int maxSize) {
-            this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize");
+            this.maxSize = maxSize;
             Node<T> h = new Node<>(null);
             this.tail = h;
             this.head = h;
@@ -1061,10 +1076,10 @@ static final class SizeAndTimeBoundReplayBuffer<T>
         volatile boolean done;
 
         SizeAndTimeBoundReplayBuffer(int maxSize, long maxAge, TimeUnit unit, Scheduler scheduler) {
-            this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize");
-            this.maxAge = ObjectHelper.verifyPositive(maxAge, "maxAge");
-            this.unit = Objects.requireNonNull(unit, "unit is null");
-            this.scheduler = Objects.requireNonNull(scheduler, "scheduler is null");
+            this.maxSize = maxSize;
+            this.maxAge = maxAge;
+            this.unit = unit;
+            this.scheduler = scheduler;
             TimedNode<T> h = new TimedNode<>(null, 0L);
             this.tail = h;
             this.head = h;
diff --git a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
index eab7da4f05..a1af942d8d 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
@@ -179,7 +179,7 @@ public final class UnicastProcessor<T> extends FlowableProcessor<T> {
     @CheckReturnValue
     @NonNull
     public static <T> UnicastProcessor<T> create() {
-        return create(bufferSize(), Functions.EMPTY_RUNNABLE, true);
+        return new UnicastProcessor<>(bufferSize(), null, true);
     }
 
     /**
@@ -187,11 +187,13 @@ public static <T> UnicastProcessor<T> create() {
      * @param <T> the value type
      * @param capacityHint the hint to size the internal unbounded buffer
      * @return an UnicastProcessor instance
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> UnicastProcessor<T> create(int capacityHint) {
-        return create(capacityHint, Functions.EMPTY_RUNNABLE, true);
+        ObjectHelper.verifyPositive(capacityHint, "capacityHint");
+        return new UnicastProcessor<>(capacityHint, null, true);
     }
 
     /**
@@ -205,7 +207,7 @@ public static <T> UnicastProcessor<T> create(int capacityHint) {
     @CheckReturnValue
     @NonNull
     public static <T> UnicastProcessor<T> create(boolean delayError) {
-        return create(bufferSize(), Functions.EMPTY_RUNNABLE, delayError);
+        return new UnicastProcessor<>(bufferSize(), null, delayError);
     }
 
     /**
@@ -220,6 +222,8 @@ public static <T> UnicastProcessor<T> create(boolean delayError) {
      * @param capacityHint the hint to size the internal unbounded buffer
      * @param onTerminate the non null callback
      * @return an UnicastProcessor instance
+     * @throws NullPointerException if {@code onTerminate} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      */
     @CheckReturnValue
     @NonNull
@@ -240,11 +244,15 @@ public static <T> UnicastProcessor<T> create(int capacityHint, @NonNull Runnable
      * @param onTerminate the non null callback
      * @param delayError deliver pending onNext events before onError
      * @return an UnicastProcessor instance
+     * @throws NullPointerException if {@code onTerminate} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @since 2.2
      */
     @CheckReturnValue
     @NonNull
     public static <T> UnicastProcessor<T> create(int capacityHint, @NonNull Runnable onTerminate, boolean delayError) {
+        Objects.requireNonNull(onTerminate, "onTerminate");
+        ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         return new UnicastProcessor<>(capacityHint, onTerminate, delayError);
     }
 
@@ -258,8 +266,8 @@ public static <T> UnicastProcessor<T> create(int capacityHint, @NonNull Runnable
      * @since 2.2
      */
     UnicastProcessor(int capacityHint, Runnable onTerminate, boolean delayError) {
-        this.queue = new SpscLinkedArrayQueue<>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
-        this.onTerminate = new AtomicReference<>(Objects.requireNonNull(onTerminate, "onTerminate"));
+        this.queue = new SpscLinkedArrayQueue<>(capacityHint);
+        this.onTerminate = new AtomicReference<>(onTerminate);
         this.delayError = delayError;
         this.downstream = new AtomicReference<>();
         this.once = new AtomicBoolean();
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
index d7f5516e7d..abc51887f8 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
@@ -176,7 +176,7 @@ public final class BehaviorSubject<T> extends Subject<T> {
     @CheckReturnValue
     @NonNull
     public static <T> BehaviorSubject<T> create() {
-        return new BehaviorSubject<>();
+        return new BehaviorSubject<>(null);
     }
 
     /**
@@ -189,38 +189,30 @@ public static <T> BehaviorSubject<T> create() {
      *            the item that will be emitted first to any {@link Observer} as long as the
      *            {@link BehaviorSubject} has not yet observed any items from its source {@code Observable}
      * @return the constructed {@link BehaviorSubject}
+     * @throws NullPointerException if {@code defaultValue} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     public static <@NonNull T> BehaviorSubject<T> createDefault(T defaultValue) {
+        Objects.requireNonNull(defaultValue, "defaultValue is null");
         return new BehaviorSubject<>(defaultValue);
     }
 
     /**
      * Constructs an empty BehaviorSubject.
+     * @param defaultValue the initial value, not null (verified)
      * @since 2.0
      */
     @SuppressWarnings("unchecked")
-    BehaviorSubject() {
+    BehaviorSubject(T defaultValue) {
         this.lock = new ReentrantReadWriteLock();
         this.readLock = lock.readLock();
         this.writeLock = lock.writeLock();
         this.subscribers = new AtomicReference<>(EMPTY);
-        this.value = new AtomicReference<>();
+        this.value = new AtomicReference<>(defaultValue);
         this.terminalEvent = new AtomicReference<>();
     }
 
-    /**
-     * Constructs a BehaviorSubject with the given initial value.
-     * @param defaultValue the initial value, not null (verified)
-     * @throws NullPointerException if {@code defaultValue} is {@code null}
-     * @since 2.0
-     */
-    BehaviorSubject(T defaultValue) {
-        this();
-        this.value.lazySet(Objects.requireNonNull(defaultValue, "defaultValue is null"));
-    }
-
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
         BehaviorDisposable<T> bs = new BehaviorDisposable<>(observer, this);
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
index efad31e669..a956035c3d 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
@@ -177,10 +177,12 @@ public static <T> ReplaySubject<T> create() {
      * @param capacityHint
      *          the initial buffer capacity
      * @return the created subject
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> create(int capacityHint) {
+        ObjectHelper.verifyPositive(capacityHint, "capacityHint");
         return new ReplaySubject<>(new UnboundedReplayBuffer<>(capacityHint));
     }
 
@@ -203,10 +205,12 @@ public static <T> ReplaySubject<T> create(int capacityHint) {
      * @param maxSize
      *          the maximum number of buffered items
      * @return the created subject
+     * @throws IllegalArgumentException if {@code maxSize} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> createWithSize(int maxSize) {
+        ObjectHelper.verifyPositive(maxSize, "maxSize");
         return new ReplaySubject<>(new SizeBoundReplayBuffer<>(maxSize));
     }
 
@@ -258,10 +262,15 @@ public static <T> ReplaySubject<T> createWithSize(int maxSize) {
      * @param scheduler
      *          the {@link Scheduler} that provides the current time
      * @return the created subject
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code maxAge} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> createWithTime(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        ObjectHelper.verifyPositive(maxAge, "maxAge");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return new ReplaySubject<>(new SizeAndTimeBoundReplayBuffer<>(Integer.MAX_VALUE, maxAge, unit, scheduler));
     }
 
@@ -298,10 +307,16 @@ public static <T> ReplaySubject<T> createWithTime(long maxAge, @NonNull TimeUnit
      * @param scheduler
      *          the {@link Scheduler} that provides the current time
      * @return the created subject
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code maxAge} or {@code maxSize} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> ReplaySubject<T> createWithTimeAndSize(long maxAge, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, int maxSize) {
+        ObjectHelper.verifyPositive(maxSize, "maxSize");
+        ObjectHelper.verifyPositive(maxAge, "maxAge");
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
         return new ReplaySubject<>(new SizeAndTimeBoundReplayBuffer<>(maxSize, maxAge, unit, scheduler));
     }
 
@@ -646,7 +661,7 @@ static final class UnboundedReplayBuffer<T>
         volatile int size;
 
         UnboundedReplayBuffer(int capacityHint) {
-            this.buffer = new ArrayList<>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
+            this.buffer = new ArrayList<>(capacityHint);
         }
 
         @Override
@@ -848,7 +863,7 @@ static final class SizeBoundReplayBuffer<T>
         volatile boolean done;
 
         SizeBoundReplayBuffer(int maxSize) {
-            this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize");
+            this.maxSize = maxSize;
             Node<Object> h = new Node<>(null);
             this.tail = h;
             this.head = h;
@@ -1061,10 +1076,10 @@ static final class SizeAndTimeBoundReplayBuffer<T>
         volatile boolean done;
 
         SizeAndTimeBoundReplayBuffer(int maxSize, long maxAge, TimeUnit unit, Scheduler scheduler) {
-            this.maxSize = ObjectHelper.verifyPositive(maxSize, "maxSize");
-            this.maxAge = ObjectHelper.verifyPositive(maxAge, "maxAge");
-            this.unit = Objects.requireNonNull(unit, "unit is null");
-            this.scheduler = Objects.requireNonNull(scheduler, "scheduler is null");
+            this.maxSize = maxSize;
+            this.maxAge = maxAge;
+            this.unit = unit;
+            this.scheduler = scheduler;
             TimedNode<Object> h = new TimedNode<>(null, 0L);
             this.tail = h;
             this.head = h;
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
index 5e19604eed..63afa9c335 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
@@ -180,7 +180,7 @@ public final class UnicastSubject<T> extends Subject<T> {
     @CheckReturnValue
     @NonNull
     public static <T> UnicastSubject<T> create() {
-        return create(bufferSize(), Functions.EMPTY_RUNNABLE, true);
+        return new UnicastSubject<>(bufferSize(), null, true);
     }
 
     /**
@@ -188,11 +188,13 @@ public static <T> UnicastSubject<T> create() {
      * @param <T> the value type
      * @param capacityHint the hint to size the internal unbounded buffer
      * @return an UnicastSubject instance
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> UnicastSubject<T> create(int capacityHint) {
-        return create(capacityHint, Functions.EMPTY_RUNNABLE, true);
+        ObjectHelper.verifyPositive(capacityHint, "capacityHint");
+        return new UnicastSubject<>(capacityHint, null, true);
     }
 
     /**
@@ -207,11 +209,15 @@ public static <T> UnicastSubject<T> create(int capacityHint) {
      * @param capacityHint the hint to size the internal unbounded buffer
      * @param onTerminate the callback to run when the Subject is terminated or cancelled, null not allowed
      * @return an UnicastSubject instance
+     * @throws NullPointerException if {@code onTerminate} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      */
     @CheckReturnValue
     @NonNull
     public static <T> UnicastSubject<T> create(int capacityHint, @NonNull Runnable onTerminate) {
-        return create(capacityHint, onTerminate, true);
+        ObjectHelper.verifyPositive(capacityHint, "capacityHint");
+        Objects.requireNonNull(onTerminate, "onTerminate");
+        return new UnicastSubject<>(capacityHint, onTerminate, true);
     }
 
     /**
@@ -227,11 +233,15 @@ public static <T> UnicastSubject<T> create(int capacityHint, @NonNull Runnable o
      * @param onTerminate the callback to run when the Subject is terminated or cancelled, null not allowed
      * @param delayError deliver pending onNext events before onError
      * @return an UnicastSubject instance
+     * @throws NullPointerException if {@code onTerminate} is {@code null}
+     * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @since 2.2
      */
     @CheckReturnValue
     @NonNull
     public static <T> UnicastSubject<T> create(int capacityHint, @NonNull Runnable onTerminate, boolean delayError) {
+        ObjectHelper.verifyPositive(capacityHint, "capacityHint");
+        Objects.requireNonNull(onTerminate, "onTerminate");
         return new UnicastSubject<>(capacityHint, onTerminate, delayError);
     }
 
@@ -249,7 +259,7 @@ public static <T> UnicastSubject<T> create(int capacityHint, @NonNull Runnable o
     @CheckReturnValue
     @NonNull
     public static <T> UnicastSubject<T> create(boolean delayError) {
-        return create(bufferSize(), Functions.EMPTY_RUNNABLE, delayError);
+        return new UnicastSubject<>(bufferSize(), null, delayError);
     }
 
     /**
@@ -262,8 +272,8 @@ public static <T> UnicastSubject<T> create(boolean delayError) {
      * @since 2.2
      */
     UnicastSubject(int capacityHint, Runnable onTerminate, boolean delayError) {
-        this.queue = new SpscLinkedArrayQueue<>(ObjectHelper.verifyPositive(capacityHint, "capacityHint"));
-        this.onTerminate = new AtomicReference<>(Objects.requireNonNull(onTerminate, "onTerminate"));
+        this.queue = new SpscLinkedArrayQueue<>(capacityHint);
+        this.onTerminate = new AtomicReference<>(onTerminate);
         this.delayError = delayError;
         this.downstream = new AtomicReference<>();
         this.once = new AtomicBoolean();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
index deb672124a..cb902082c3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
@@ -31,7 +31,7 @@
 
 public class FlowableSkipTest extends RxJavaTest {
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void skipNegativeElements() {
 
         Flowable<String> skip = Flowable.just("one", "two", "three").skip(-99);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
index fbd5572246..93c4694616 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
@@ -27,7 +27,7 @@
 
 public class ObservableSkipTest extends RxJavaTest {
 
-    @Test
+    @Test(expected = IllegalArgumentException.class)
     public void skipNegativeElements() {
 
         Observable<String> skip = Observable.just("one", "two", "three").skip(-99);
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
index 30dc074813..55cecb6097 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
@@ -55,6 +55,16 @@ public void checkObservable() throws Exception {
         checkSource("Observable", "io.reactivex.rxjava3.core");
     }
 
+    @Test
+    public void checkParallelFlowable() throws Exception {
+        checkSource("ParallelFlowable", "io.reactivex.rxjava3.parallel");
+    }
+
+    @Test
+    public void checkCompositeDisposable() throws Exception {
+        checkSource("CompositeDisposable", "io.reactivex.rxjava3.disposables");
+    }
+
     static void checkSource(String baseClassName, String packageName) throws Exception {
         File f = TestHelper.findSource(baseClassName, packageName);
         if (f == null) {
@@ -376,7 +386,7 @@ static void blankRange(StringBuilder builder, int start, int end) {
 
             "Supplier", "Callable", "TimeUnit",
 
-            "BackpressureOverflowStrategy",
+            "BackpressureOverflowStrategy", "ParallelFailureHandling",
 
             "Exception", "Throwable", "NullPointerException", "IllegalStateException", "IllegalArgumentException", "MissingBackpressureException", "UndeliverableException",
             "OutOfMemoryError", "StackOverflowError", "NoSuchElementException", "ClassCastException", "CompositeException",
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index b46f59f42a..f9becca37c 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -93,7 +93,7 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.NON_NEGATIVE, "elementAtOrError", Long.TYPE));
 
         // negative skip count is ignored
-        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "skip", Long.TYPE));
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.NON_NEGATIVE, "skip", Long.TYPE));
         // negative skip time is considered as zero skip time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "skip", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "skip", Long.TYPE, TimeUnit.class, Scheduler.class));
@@ -126,9 +126,6 @@ public void checkParallelFlowable() {
         // negative timeout is allowed
         addOverride(new ParamOverride(Flowable.class, 1, ParamMode.ANY, "fromFuture", Future.class, Long.TYPE, TimeUnit.class));
 
-        // null default is allowed
-        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "blockingLast", Object.class));
-
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "timer", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "timer", Long.TYPE, TimeUnit.class, Scheduler.class));
@@ -152,9 +149,6 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "delaySubscription", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "delaySubscription", Long.TYPE, TimeUnit.class, Scheduler.class));
 
-        // null default is allowed
-        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "blockingFirst", Object.class));
-
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class, Scheduler.class));
@@ -351,7 +345,7 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.NON_NEGATIVE, "elementAtOrError", Long.TYPE));
 
         // negative skip count is ignored
-        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "skip", Long.TYPE));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.NON_NEGATIVE, "skip", Long.TYPE));
         // negative skip time is considered as zero skip time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "skip", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "skip", Long.TYPE, TimeUnit.class, Scheduler.class));
@@ -380,9 +374,6 @@ public void checkParallelFlowable() {
         // negative timeout is allowed
         addOverride(new ParamOverride(Observable.class, 1, ParamMode.ANY, "fromFuture", Future.class, Long.TYPE, TimeUnit.class));
 
-        // null default is allowed
-        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "blockingLast", Object.class));
-
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "timer", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "timer", Long.TYPE, TimeUnit.class, Scheduler.class));
@@ -406,9 +397,6 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "delaySubscription", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "delaySubscription", Long.TYPE, TimeUnit.class, Scheduler.class));
 
-        // null default is allowed
-        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "blockingFirst", Object.class));
-
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class, Scheduler.class));
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
index e19048f473..fe6d215165 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -21,7 +21,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.flowables.ConnectableFlowable;
 import io.reactivex.rxjava3.observables.ConnectableObservable;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
@@ -172,6 +172,11 @@ public void checkMulticastProcessor() throws Exception {
         processFile(MulticastProcessor.class);
     }
 
+    @Test
+    public void checkCompositeDisposable() throws Exception {
+        processFile(CompositeDisposable.class);
+    }
+
     static void processFile(Class<?> clazz) throws Exception {
         String baseClassName = clazz.getSimpleName();
         File f = TestHelper.findSource(baseClassName, clazz.getPackage().getName());
@@ -200,7 +205,11 @@ static void processFile(Class<?> clazz) throws Exception {
 
                     String message = line.substring(quote + 1, quote + 2 + paramName.length());
 
-                    if (!line.contains("The RxJavaPlugins")
+                    if (line.contains("\"A Disposable")) {
+                        continue;
+                    }
+
+                    if (!line.contains("\"The RxJavaPlugins")
                             && !(message.startsWith(paramName)
                             && (message.endsWith(" ") || message.endsWith("\"")))) {
                         errorCount++;
@@ -220,25 +229,22 @@ static void processFile(Class<?> clazz) throws Exception {
                         ;
                     }
 
-                    // FIXME enable for other types in separate PR!
-                    if (!baseClassName.equals("Completable")
-                            && !baseClassName.equals("Single")
-                            && !baseClassName.equals("Maybe")
-                            && !baseClassName.equals("Observable")
-                    ) {
-                        continue;
-                    }
-
                     int midx = j - 1;
                     // find the method declaration
                     for (; midx >= 0; midx--) {
                         String linek = lines.get(midx).trim();
                         if (linek.startsWith("public") || linek.startsWith("private")
-                                || linek.startsWith("protected")) {
+                                || linek.startsWith("protected")
+                                || linek.startsWith("static")
+                                || linek.startsWith(baseClassName)) {
                             break;
                         }
                     }
 
+                    if (line.contains("\"The RxJavaPlugins")) {
+                        continue;
+                    }
+
                     // find JavaDoc of throws
                     boolean found = false;
                     for (int k = midx - 1; k >= 0; k--) {
@@ -300,7 +306,9 @@ static void processFile(Class<?> clazz) throws Exception {
                     for (; midx >= 0; midx--) {
                         String linek = lines.get(midx).trim();
                         if (linek.startsWith("public") || linek.startsWith("private")
-                                || linek.startsWith("protected")) {
+                                || linek.startsWith("protected")
+                                || linek.startsWith("static")
+                                || linek.startsWith(baseClassName)) {
                             break;
                         }
                     }
@@ -340,6 +348,78 @@ static void processFile(Class<?> clazz) throws Exception {
                     }
                 }
             }
+
+            if (line.startsWith("public") || line.startsWith("protected") || line.startsWith("final") || line.startsWith("private")
+                    || line.startsWith("static")) {
+                for (ValidatorStrings validatorStr : TYPICAL_ARGUMENT_STRINGS) {
+                    // find the method declaration ending {
+                    for (int i = j; i < lines.size(); i++) {
+                        String linei = lines.get(i).trim();
+
+                        // space + code for capturing type declarations
+                        String varPattern = " " + validatorStr.code;
+                        if (linei.contains(varPattern + ")")
+                                || linei.contains(varPattern + ",")
+                                || linei.endsWith(varPattern)) {
+                            // ignore nullable-annotated arguments
+                            if (!linei.matches(".*\\@Nullable\\s.*" + validatorStr.code + ".*")) {
+                                boolean found = false;
+                                for (int k = i - 1; k >= 0; k--) {
+                                    String linek = lines.get(k).trim();
+                                    if (linek.startsWith("/**")) {
+                                        break;
+                                    }
+                                    if (linek.startsWith("}")) {
+                                        found = true; // no method JavaDoc present
+                                        break;
+                                    }
+                                    if (linek.startsWith(validatorStr.javadoc)) {
+                                        // see if a @code paramName is present
+                                        String paramStr = "{@code " + validatorStr.code + "}";
+                                        for (int m = k; m < lines.size(); m++) {
+                                            String linem = lines.get(m).trim();
+                                            if (linem.startsWith("* @see")
+                                                    || linem.startsWith("* @since")
+                                                    || linem.startsWith("*/")) {
+                                                break;
+                                            }
+                                            if (linem.contains(paramStr)) {
+                                                found = true;
+                                                break;
+                                            }
+                                        }
+                                        break;
+                                    }
+                                }
+
+                                if (!found) {
+                                    errorCount++;
+                                    errors.append("L")
+                                    .append(j)
+                                    .append(" : missing '")
+                                    .append(validatorStr.javadoc)
+                                    .append("' for typical argument: ")
+                                    .append(validatorStr.code)
+                                    .append("\r\n    ")
+                                    .append(line)
+                                    .append("\r\n at ")
+                                    .append(fullClassName)
+                                    .append(".method(")
+                                    .append(f.getName())
+                                    .append(":")
+                                    .append(j + 1)
+                                    .append(")\r\n")
+                                    ;
+                                }
+                            }
+                        }
+
+                        if (linei.endsWith("{") || linei.endsWith(";")) {
+                            break;
+                        }
+                    }
+                }
+            }
         }
 
         if (errorCount != 0) {
@@ -369,4 +449,90 @@ static final class ValidatorStrings {
             new ValidatorStrings("throw new IndexOutOfBoundsException(", "* @throws IndexOutOfBoundsException")
     );
 
+    static final List<ValidatorStrings> TYPICAL_ARGUMENT_STRINGS = Arrays.asList(
+            new ValidatorStrings("source", "* @throws NullPointerException"),
+            new ValidatorStrings("source1", "* @throws NullPointerException"),
+            new ValidatorStrings("source2", "* @throws NullPointerException"),
+            new ValidatorStrings("source3", "* @throws NullPointerException"),
+            new ValidatorStrings("source4", "* @throws NullPointerException"),
+            new ValidatorStrings("source5", "* @throws NullPointerException"),
+            new ValidatorStrings("source6", "* @throws NullPointerException"),
+            new ValidatorStrings("source7", "* @throws NullPointerException"),
+            new ValidatorStrings("source8", "* @throws NullPointerException"),
+            new ValidatorStrings("source9", "* @throws NullPointerException"),
+            new ValidatorStrings("sources", "* @throws NullPointerException"),
+            new ValidatorStrings("mapper", "* @throws NullPointerException"),
+            new ValidatorStrings("combiner", "* @throws NullPointerException"),
+            new ValidatorStrings("zipper", "* @throws NullPointerException"),
+            new ValidatorStrings("predicate", "* @throws NullPointerException"),
+            new ValidatorStrings("item", "* @throws NullPointerException"),
+            new ValidatorStrings("item1", "* @throws NullPointerException"),
+            new ValidatorStrings("item2", "* @throws NullPointerException"),
+            new ValidatorStrings("item3", "* @throws NullPointerException"),
+            new ValidatorStrings("item4", "* @throws NullPointerException"),
+            new ValidatorStrings("item5", "* @throws NullPointerException"),
+            new ValidatorStrings("item6", "* @throws NullPointerException"),
+            new ValidatorStrings("item7", "* @throws NullPointerException"),
+            new ValidatorStrings("item8", "* @throws NullPointerException"),
+            new ValidatorStrings("item9", "* @throws NullPointerException"),
+            new ValidatorStrings("item10", "* @throws NullPointerException"),
+            new ValidatorStrings("unit", "* @throws NullPointerException"),
+            new ValidatorStrings("scheduler", "* @throws NullPointerException"),
+            new ValidatorStrings("other", "* @throws NullPointerException"),
+            new ValidatorStrings("fallback", "* @throws NullPointerException"),
+            new ValidatorStrings("defaultItem", "* @throws NullPointerException"),
+            new ValidatorStrings("defaultValue", "* @throws NullPointerException"),
+            new ValidatorStrings("stop", "* @throws NullPointerException"),
+            new ValidatorStrings("stopPredicate", "* @throws NullPointerException"),
+            new ValidatorStrings("handler", "* @throws NullPointerException"),
+            new ValidatorStrings("bufferSupplier", "* @throws NullPointerException"),
+            new ValidatorStrings("openingIndicator", "* @throws NullPointerException"),
+            new ValidatorStrings("closingIndicator", "* @throws NullPointerException"),
+            new ValidatorStrings("boundary", "* @throws NullPointerException"),
+            new ValidatorStrings("boundaryIndicator", "* @throws NullPointerException"),
+            new ValidatorStrings("selector", "* @throws NullPointerException"),
+            new ValidatorStrings("resultSelector", "* @throws NullPointerException"),
+            new ValidatorStrings("keySelector", "* @throws NullPointerException"),
+            new ValidatorStrings("valueSelector", "* @throws NullPointerException"),
+            new ValidatorStrings("valueSupplier", "* @throws NullPointerException"),
+            new ValidatorStrings("collectionSupplier", "* @throws NullPointerException"),
+            new ValidatorStrings("onNext", "* @throws NullPointerException"),
+            new ValidatorStrings("onError", "* @throws NullPointerException"),
+            new ValidatorStrings("onComplete", "* @throws NullPointerException"),
+            new ValidatorStrings("onEvent", "* @throws NullPointerException"),
+            new ValidatorStrings("onAfterNext", "* @throws NullPointerException"),
+            new ValidatorStrings("onAfterTerminate", "* @throws NullPointerException"),
+            new ValidatorStrings("onTerminate", "* @throws NullPointerException"),
+            new ValidatorStrings("onSuccess", "* @throws NullPointerException"),
+            new ValidatorStrings("onSubscribe", "* @throws NullPointerException"),
+            new ValidatorStrings("onNotification", "* @throws NullPointerException"),
+            new ValidatorStrings("onCancel", "* @throws NullPointerException"),
+            new ValidatorStrings("onDispose", "* @throws NullPointerException"),
+            new ValidatorStrings("onRequest", "* @throws NullPointerException"),
+            new ValidatorStrings("onNextMapper", "* @throws NullPointerException"),
+            new ValidatorStrings("onErrorMapper", "* @throws NullPointerException"),
+            new ValidatorStrings("onCompleteSupplier", "* @throws NullPointerException"),
+            new ValidatorStrings("clazz", "* @throws NullPointerException"),
+            new ValidatorStrings("next", "* @throws NullPointerException"),
+            new ValidatorStrings("reducer", "* @throws NullPointerException"),
+            new ValidatorStrings("seed", "* @throws NullPointerException"),
+            new ValidatorStrings("seedSupplier", "* @throws NullPointerException"),
+            new ValidatorStrings("mapSupplier", "* @throws NullPointerException"),
+            new ValidatorStrings("collectionFactory", "* @throws NullPointerException"),
+            new ValidatorStrings("factory", "* @throws NullPointerException"),
+            new ValidatorStrings("stage", "* @throws NullPointerException"),
+            new ValidatorStrings("stream", "* @throws NullPointerException"),
+            new ValidatorStrings("collector", "* @throws NullPointerException"),
+
+            new ValidatorStrings("parallelism", "* @throws IllegalArgumentException"),
+            new ValidatorStrings("prefetch", "* @throws IllegalArgumentException"),
+            new ValidatorStrings("bufferSize", "* @throws IllegalArgumentException"),
+            new ValidatorStrings("capacityHint", "* @throws IllegalArgumentException"),
+            new ValidatorStrings("capacity", "* @throws IllegalArgumentException"),
+            new ValidatorStrings("count", "* @throws IllegalArgumentException"),
+            new ValidatorStrings("skip", "* @throws IllegalArgumentException"),
+            new ValidatorStrings("times", "* @throws IllegalArgumentException"),
+            new ValidatorStrings("n", "* @throws IllegalArgumentException")
+    );
+
 }

From 479a7a28f982ccdf236c3afb494556decef9ab72 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 13 Jan 2020 13:17:18 +0100
Subject: [PATCH 044/665] 3.x: Remove a pointless concatMapIterable overload
 (#6837)

---
 .../io/reactivex/rxjava3/core/Observable.java | 33 -------------------
 .../observable/ObservableConcatTest.java      |  2 +-
 2 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index b226ae8994..a4b07af049 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -7112,39 +7112,6 @@ public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ?
         return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
     }
 
-    /**
-     * Returns an {@code Observable} that concatenate each item emitted by the current {@code Observable} with the values in an
-     * {@link Iterable} corresponding to that item that is generated by a selector.
-     * <p>
-     * <img width="640" height="275" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapIterable.o.png" alt="">
-     *
-     * <dl>
-     *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code concatMapIterable} does not operate by default on a particular {@link Scheduler}.</dd>
-     * </dl>
-     *
-     * @param <U>
-     *            the type of item emitted by the resulting {@code Observable}
-     * @param mapper
-     *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            current {@code Observable}
-     * @param bufferSize
-     *            the number of elements expected from the current {@code Observable} to be buffered
-     * @return an {@code Observable} that emits the results of concatenating the items emitted by the current {@code Observable} with
-     *         the values in the {@code Iterable}s corresponding to those items
-     * @throws NullPointerException if {@code mapper} is {@code null}
-     * @throws IllegalArgumentException if {@code bufferSize} is non-positive
-     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
-     */
-    @CheckReturnValue
-    @SchedulerSupport(SchedulerSupport.NONE)
-    @NonNull
-    public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int bufferSize) {
-        Objects.requireNonNull(mapper, "mapper is null");
-        ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return concatMap(ObservableInternalHelper.flatMapIntoIterable(mapper), bufferSize);
-    }
-
     /**
      * Maps the upstream items into {@link MaybeSource}s and subscribes to them one after the
      * other succeeds or completes, emits their success value if available or terminates immediately if
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
index b1c42a1175..90e3dc112b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
@@ -879,7 +879,7 @@ public void concatMapIterableBufferSize() {
             public Iterable<Integer> apply(Integer v) throws Exception {
                 return Arrays.asList(1, 2, 3, 4, 5);
             }
-        }, 1)
+        })
         .test()
         .assertResult(1, 2, 3, 4, 5, 1, 2, 3, 4, 5);
     }

From 4dd4a65fa0144c148f19f5632ae6915b3c7be315 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 13 Jan 2020 13:17:35 +0100
Subject: [PATCH 045/665] 3.x: Rename to combineLatestArrayDelayError (#6838)

---
 .../java/io/reactivex/rxjava3/core/Flowable.java     | 10 +++++-----
 .../java/io/reactivex/rxjava3/core/Observable.java   | 10 +++++-----
 .../flowable/FlowableCombineLatestTest.java          | 12 ++++++------
 .../observable/ObservableCombineLatestTest.java      | 10 +++++-----
 .../tck/CombineLatestArrayDelayErrorTckTest.java     |  2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 699baef2e8..56fa2e63f2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -461,7 +461,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
      *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T>
@@ -481,9 +481,9 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Publisher<? extends T>[] sources,
+    public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
-        return combineLatestDelayError(sources, combiner, bufferSize());
+        return combineLatestArrayDelayError(sources, combiner, bufferSize());
     }
 
     /**
@@ -509,7 +509,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
      *   are requested in a bounded manner, however, their backpressure is not enforced (the operator won't signal
      *   {@link MissingBackpressureException}) and may lead to {@link OutOfMemoryError} due to internal buffer bloat.</dd>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T>
@@ -532,7 +532,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Publisher<? extends T>[] sources,
+    public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index a4b07af049..788c758a4a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -868,7 +868,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T>
@@ -887,10 +887,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> combineLatestDelayError(
+    public static <T, R> Observable<R> combineLatestArrayDelayError(
             @NonNull ObservableSource<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
-        return combineLatestDelayError(sources, combiner, bufferSize());
+        return combineLatestArrayDelayError(sources, combiner, bufferSize());
     }
 
     /**
@@ -914,7 +914,7 @@ public static <T, R> Observable<R> combineLatestDelayError(
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param <T>
@@ -936,7 +936,7 @@ public static <T, R> Observable<R> combineLatestDelayError(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestDelayError(@NonNull ObservableSource<? extends T>[] sources,
+    public static <T, R> Observable<R> combineLatestArrayDelayError(@NonNull ObservableSource<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
index 6829c99986..302ae3757b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
@@ -1073,7 +1073,7 @@ public List<Object> apply(Object[] t) throws Exception {
             .test()
             .assertResult(expected);
 
-            Flowable.combineLatestDelayError(sources, new Function<Object[], List<Object>>() {
+            Flowable.combineLatestArrayDelayError(sources, new Function<Object[], List<Object>>() {
                 @Override
                 public List<Object> apply(Object[] t) throws Exception {
                     return Arrays.asList(t);
@@ -1104,7 +1104,7 @@ public Object apply(Object[] a) throws Exception {
     @SuppressWarnings("unchecked")
     public void combineLatestDelayErrorArrayOfSources() {
 
-        Flowable.combineLatestDelayError(new Flowable[] {
+        Flowable.combineLatestArrayDelayError(new Flowable[] {
                 Flowable.just(1), Flowable.just(2)
         }, new Function<Object[], Object>() {
             @Override
@@ -1120,7 +1120,7 @@ public Object apply(Object[] a) throws Exception {
     @SuppressWarnings("unchecked")
     public void combineLatestDelayErrorArrayOfSourcesWithError() {
 
-        Flowable.combineLatestDelayError(new Flowable[] {
+        Flowable.combineLatestArrayDelayError(new Flowable[] {
                 Flowable.just(1), Flowable.just(2).concatWith(Flowable.<Integer>error(new TestException()))
         }, new Function<Object[], Object>() {
             @Override
@@ -1171,7 +1171,7 @@ public void combineLatestArrayEmpty() {
     @SuppressWarnings("unchecked")
     @Test
     public void combineLatestDelayErrorEmpty() {
-        assertSame(Flowable.empty(), Flowable.combineLatestDelayError(new Flowable[0], Functions.<Object[]>identity(), 16));
+        assertSame(Flowable.empty(), Flowable.combineLatestArrayDelayError(new Flowable[0], Functions.<Object[]>identity(), 16));
     }
 
     @Test
@@ -1295,7 +1295,7 @@ public Object apply(Object a, Object b) throws Exception {
     @SuppressWarnings("unchecked")
     @Test
     public void errorDelayed() {
-        Flowable.combineLatestDelayError(
+        Flowable.combineLatestArrayDelayError(
                 new Publisher[] { Flowable.error(new TestException()), Flowable.just(1) },
                 new Function<Object[], Object>() {
                     @Override
@@ -1312,7 +1312,7 @@ public Object apply(Object[] a) throws Exception {
     @SuppressWarnings("unchecked")
     @Test
     public void errorDelayed2() {
-        Flowable.combineLatestDelayError(
+        Flowable.combineLatestArrayDelayError(
                 new Publisher[] { Flowable.error(new TestException()).startWithItem(1), Flowable.empty() },
                 new Function<Object[], Object>() {
                     @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
index 3096cdabd7..e304a27a33 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
@@ -789,7 +789,7 @@ public Object apply(Object[] a) throws Exception {
     @SuppressWarnings("unchecked")
     public void combineLatestDelayErrorArrayOfSources() {
 
-        Observable.combineLatestDelayError(new ObservableSource[] {
+        Observable.combineLatestArrayDelayError(new ObservableSource[] {
                 Observable.just(1), Observable.just(2)
         }, new Function<Object[], Object>() {
             @Override
@@ -805,7 +805,7 @@ public Object apply(Object[] a) throws Exception {
     @SuppressWarnings("unchecked")
     public void combineLatestDelayErrorArrayOfSourcesWithError() {
 
-        Observable.combineLatestDelayError(new ObservableSource[] {
+        Observable.combineLatestArrayDelayError(new ObservableSource[] {
                 Observable.just(1), Observable.just(2).concatWith(Observable.<Integer>error(new TestException()))
         }, new Function<Object[], Object>() {
             @Override
@@ -856,7 +856,7 @@ public void combineLatestArrayEmpty() {
     @SuppressWarnings("unchecked")
     @Test
     public void combineLatestDelayErrorEmpty() {
-        assertSame(Observable.empty(), Observable.combineLatestDelayError(new ObservableSource[0], Functions.<Object[]>identity(), 16));
+        assertSame(Observable.empty(), Observable.combineLatestArrayDelayError(new ObservableSource[0], Functions.<Object[]>identity(), 16));
     }
 
     @Test
@@ -923,7 +923,7 @@ public Object apply(Object a, Object b) throws Exception {
     @SuppressWarnings("unchecked")
     @Test
     public void errorDelayed() {
-        Observable.combineLatestDelayError(
+        Observable.combineLatestArrayDelayError(
                 new ObservableSource[] { Observable.error(new TestException()), Observable.just(1) },
                 new Function<Object[], Object>() {
                     @Override
@@ -940,7 +940,7 @@ public Object apply(Object[] a) throws Exception {
     @SuppressWarnings("unchecked")
     @Test
     public void errorDelayed2() {
-        Observable.combineLatestDelayError(
+        Observable.combineLatestArrayDelayError(
                 new ObservableSource[] { Observable.error(new TestException()).startWithItem(1), Observable.empty() },
                 new Function<Object[], Object>() {
                     @Override
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
index dcb5a94fe6..ec7005ea41 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
@@ -26,7 +26,7 @@ public class CombineLatestArrayDelayErrorTckTest extends BaseTck<Long> {
     @Override
     public Publisher<Long> createPublisher(long elements) {
         return
-            Flowable.combineLatestDelayError(
+            Flowable.combineLatestArrayDelayError(
                 new Publisher[] { Flowable.just(1L), Flowable.fromIterable(iterate(elements)) },
                 new Function<Object[], Long>() {
                     @Override

From 2a484a65a4924e0e93ed0249357d89afc9628858 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 13 Jan 2020 13:17:54 +0100
Subject: [PATCH 046/665] 3.x: enable javac parameter saving in class files
 (#6839)

---
 build.gradle                                  |  4 +++
 .../ParameterNamesInClassesTest.java          | 32 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 src/test/java/io/reactivex/rxjava3/validators/ParameterNamesInClassesTest.java

diff --git a/build.gradle b/build.gradle
index 056b784b68..2730a5a3c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,6 +87,10 @@ dependencies {
     testImplementation "com.google.guava:guava:$guavaVersion"
 }
 
+tasks.withType(JavaCompile) {
+    options.compilerArgs << "-parameters";
+}
+
 javadoc {
     failOnError = false
     exclude "**/internal/**"
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParameterNamesInClassesTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParameterNamesInClassesTest.java
new file mode 100644
index 0000000000..11e376a653
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParameterNamesInClassesTest.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.validators;
+
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
+
+public class ParameterNamesInClassesTest {
+    void method(int paramName) {
+        // deliberately empty
+    }
+
+    @Test
+    public void javacParametersEnabled() throws Exception {
+        assertEquals("Please enable saving parameter names via the -parameters javac argument",
+                "paramName",
+                getClass()
+                .getDeclaredMethod("method", Integer.TYPE)
+                .getParameters()[0].getName());
+    }
+}

From 04800ae75fa95dfb0e4c6f49c9318add95698eb7 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2020 13:18:09 +0100
Subject: [PATCH 047/665] Bump build-info-extractor-gradle from 4.12.0 to
 4.13.0 (#6808)

Bumps build-info-extractor-gradle from 4.12.0 to 4.13.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2730a5a3c9..ce041a954f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.0"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.4"
-  ext.jfrogExtractorVersion = "4.12.0"
+  ext.jfrogExtractorVersion = "4.13.0"
   ext.bndVersion = "4.3.1"
   ext.checkstyleVersion = "8.26"
 

From fb6dab6847d858b22fe6a36558cf3b62dc10627d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 14 Jan 2020 08:49:53 +0100
Subject: [PATCH 048/665] 3.x: Add nullability annotations to type arguments
 (#6840)

---
 .../reactivex/rxjava3/core/Completable.java   |  28 +-
 .../rxjava3/core/CompletableConverter.java    |   3 +-
 .../io/reactivex/rxjava3/core/Emitter.java    |   2 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 400 +++++++++---------
 .../rxjava3/core/FlowableConverter.java       |   3 +-
 .../rxjava3/core/FlowableEmitter.java         |   4 +-
 .../rxjava3/core/FlowableOnSubscribe.java     |   2 +-
 .../rxjava3/core/FlowableOperator.java        |   2 +-
 .../rxjava3/core/FlowableSubscriber.java      |   2 +-
 .../rxjava3/core/FlowableTransformer.java     |   2 +-
 .../java/io/reactivex/rxjava3/core/Maybe.java |  46 +-
 .../rxjava3/core/MaybeConverter.java          |   2 +-
 .../reactivex/rxjava3/core/MaybeEmitter.java  |   4 +-
 .../reactivex/rxjava3/core/MaybeObserver.java |   2 +-
 .../rxjava3/core/MaybeOnSubscribe.java        |   2 +-
 .../reactivex/rxjava3/core/MaybeOperator.java |   2 +-
 .../reactivex/rxjava3/core/MaybeSource.java   |   2 +-
 .../rxjava3/core/MaybeTransformer.java        |   2 +-
 .../io/reactivex/rxjava3/core/Observable.java |  56 +--
 .../rxjava3/core/ObservableConverter.java     |   3 +-
 .../rxjava3/core/ObservableEmitter.java       |   4 +-
 .../rxjava3/core/ObservableOnSubscribe.java   |   2 +-
 .../rxjava3/core/ObservableOperator.java      |   2 +-
 .../rxjava3/core/ObservableSource.java        |   2 +-
 .../rxjava3/core/ObservableTransformer.java   |   2 +-
 .../io/reactivex/rxjava3/core/Observer.java   |   2 +-
 .../io/reactivex/rxjava3/core/Single.java     |  42 +-
 .../rxjava3/core/SingleConverter.java         |   3 +-
 .../reactivex/rxjava3/core/SingleEmitter.java |   4 +-
 .../rxjava3/core/SingleObserver.java          |   2 +-
 .../rxjava3/core/SingleOnSubscribe.java       |   2 +-
 .../rxjava3/core/SingleOperator.java          |   2 +-
 .../reactivex/rxjava3/core/SingleSource.java  |   2 +-
 .../rxjava3/core/SingleTransformer.java       |   2 +-
 .../rxjava3/functions/BiConsumer.java         |   4 +-
 .../rxjava3/functions/BiFunction.java         |   5 +-
 .../rxjava3/functions/BiPredicate.java        |   2 +-
 .../reactivex/rxjava3/functions/Consumer.java |   4 +-
 .../reactivex/rxjava3/functions/Function.java |   4 +-
 .../rxjava3/functions/Function3.java          |   5 +-
 .../rxjava3/functions/Function4.java          |   5 +-
 .../rxjava3/functions/Function5.java          |   5 +-
 .../rxjava3/functions/Function6.java          |   5 +-
 .../rxjava3/functions/Function7.java          |   5 +-
 .../rxjava3/functions/Function8.java          |   5 +-
 .../rxjava3/functions/Function9.java          |   5 +-
 .../rxjava3/functions/IntFunction.java        |   3 +-
 .../rxjava3/functions/Predicate.java          |   4 +-
 .../reactivex/rxjava3/functions/Supplier.java |   4 +-
 .../fuseable/ConditionalSubscriber.java       |   5 +-
 .../internal/fuseable/FuseToFlowable.java     |   4 +-
 .../internal/fuseable/FuseToMaybe.java        |   4 +-
 .../internal/fuseable/FuseToObservable.java   |   4 +-
 .../HasUpstreamCompletableSource.java         |   2 +
 .../fuseable/HasUpstreamMaybeSource.java      |   4 +-
 .../fuseable/HasUpstreamObservableSource.java |   4 +-
 .../fuseable/HasUpstreamPublisher.java        |   5 +-
 .../fuseable/HasUpstreamSingleSource.java     |   4 +-
 .../internal/fuseable/QueueDisposable.java    |   3 +-
 .../internal/fuseable/QueueFuseable.java      |   4 +-
 .../internal/fuseable/QueueSubscription.java  |   4 +-
 .../internal/fuseable/ScalarSupplier.java     |   3 +-
 .../internal/fuseable/SimplePlainQueue.java   |   4 +-
 .../internal/fuseable/SimpleQueue.java        |   2 +-
 .../rxjava3/parallel/ParallelFlowable.java    |  46 +-
 .../rxjava3/parallel/ParallelTransformer.java |   2 +-
 .../rxjava3/plugins/RxJavaPlugins.java        |   2 +-
 .../rxjava3/processors/AsyncProcessor.java    |  10 +-
 .../rxjava3/processors/BehaviorProcessor.java |   8 +-
 .../rxjava3/processors/FlowableProcessor.java |   2 +-
 .../processors/MulticastProcessor.java        |   6 +-
 .../rxjava3/processors/PublishProcessor.java  |   8 +-
 .../rxjava3/processors/ReplayProcessor.java   |  12 +-
 .../rxjava3/processors/UnicastProcessor.java  |  12 +-
 .../validators/SourceAnnotationCheck.java     |  30 ++
 75 files changed, 474 insertions(+), 427 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 9d785d96d5..3e8c84835f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -151,7 +151,7 @@ public static Completable ambArray(@NonNull CompletableSource... sources) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable amb(@NonNull Iterable<? extends CompletableSource> sources) {
+    public static Completable amb(@NonNull Iterable<@NonNull ? extends CompletableSource> sources) {
         Objects.requireNonNull(sources, "sources is null");
 
         return RxJavaPlugins.onAssembly(new CompletableAmb(null, sources));
@@ -216,7 +216,7 @@ public static Completable concatArray(@NonNull CompletableSource... sources) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable concat(@NonNull Iterable<? extends CompletableSource> sources) {
+    public static Completable concat(@NonNull Iterable<@NonNull ? extends CompletableSource> sources) {
         Objects.requireNonNull(sources, "sources is null");
 
         return RxJavaPlugins.onAssembly(new CompletableConcatIterable(sources));
@@ -241,7 +241,7 @@ public static Completable concat(@NonNull Iterable<? extends CompletableSource>
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static Completable concat(@NonNull Publisher<? extends CompletableSource> sources) {
+    public static Completable concat(@NonNull Publisher<@NonNull ? extends CompletableSource> sources) {
         return concat(sources, 2);
     }
 
@@ -266,7 +266,7 @@ public static Completable concat(@NonNull Publisher<? extends CompletableSource>
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static Completable concat(@NonNull Publisher<? extends CompletableSource> sources, int prefetch) {
+    public static Completable concat(@NonNull Publisher<@NonNull ? extends CompletableSource> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new CompletableConcat(sources, prefetch));
@@ -733,7 +733,7 @@ public static Completable mergeArray(@NonNull CompletableSource... sources) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable merge(@NonNull Iterable<? extends CompletableSource> sources) {
+    public static Completable merge(@NonNull Iterable<@NonNull ? extends CompletableSource> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new CompletableMergeIterable(sources));
     }
@@ -772,7 +772,7 @@ public static Completable merge(@NonNull Iterable<? extends CompletableSource> s
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @NonNull
-    public static Completable merge(@NonNull Publisher<? extends CompletableSource> sources) {
+    public static Completable merge(@NonNull Publisher<@NonNull ? extends CompletableSource> sources) {
         return merge0(sources, Integer.MAX_VALUE, false);
     }
 
@@ -813,7 +813,7 @@ public static Completable merge(@NonNull Publisher<? extends CompletableSource>
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static Completable merge(@NonNull Publisher<? extends CompletableSource> sources, int maxConcurrency) {
+    public static Completable merge(@NonNull Publisher<@NonNull ? extends CompletableSource> sources, int maxConcurrency) {
         return merge0(sources, maxConcurrency, false);
     }
 
@@ -840,7 +840,7 @@ public static Completable merge(@NonNull Publisher<? extends CompletableSource>
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    private static Completable merge0(@NonNull Publisher<? extends CompletableSource> sources, int maxConcurrency, boolean delayErrors) {
+    private static Completable merge0(@NonNull Publisher<@NonNull ? extends CompletableSource> sources, int maxConcurrency, boolean delayErrors) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new CompletableMerge(sources, maxConcurrency, delayErrors));
@@ -886,7 +886,7 @@ public static Completable mergeArrayDelayError(@NonNull CompletableSource... sou
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable mergeDelayError(@NonNull Iterable<? extends CompletableSource> sources) {
+    public static Completable mergeDelayError(@NonNull Iterable<@NonNull ? extends CompletableSource> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new CompletableMergeDelayErrorIterable(sources));
     }
@@ -912,7 +912,7 @@ public static Completable mergeDelayError(@NonNull Iterable<? extends Completabl
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @NonNull
-    public static Completable mergeDelayError(@NonNull Publisher<? extends CompletableSource> sources) {
+    public static Completable mergeDelayError(@NonNull Publisher<@NonNull ? extends CompletableSource> sources) {
         return merge0(sources, Integer.MAX_VALUE, true);
     }
 
@@ -940,7 +940,7 @@ public static Completable mergeDelayError(@NonNull Publisher<? extends Completab
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static Completable mergeDelayError(@NonNull Publisher<? extends CompletableSource> sources, int maxConcurrency) {
+    public static Completable mergeDelayError(@NonNull Publisher<@NonNull ? extends CompletableSource> sources, int maxConcurrency) {
         return merge0(sources, maxConcurrency, true);
     }
 
@@ -1582,7 +1582,7 @@ public final Completable doOnError(@NonNull Consumer<? super Throwable> onError)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable doOnEvent(@NonNull Consumer<? super Throwable> onEvent) {
+    public final Completable doOnEvent(@NonNull Consumer<@Nullable ? super Throwable> onEvent) {
         Objects.requireNonNull(onEvent, "onEvent is null");
         return RxJavaPlugins.onAssembly(new CompletableDoOnEvent(this, onEvent));
     }
@@ -2083,7 +2083,7 @@ public final Completable repeatUntil(@NonNull BooleanSupplier stop) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Completable repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
+    public final Completable repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
         return fromPublisher(toFlowable().repeatWhen(handler));
     }
 
@@ -2234,7 +2234,7 @@ public final Completable retry(@NonNull Predicate<? super Throwable> predicate)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
+    public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
         return fromPublisher(toFlowable().retryWhen(handler));
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java b/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java
index bcc00f088b..83e8f693eb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java
@@ -23,13 +23,12 @@
  * @since 2.2
  */
 @FunctionalInterface
-public interface CompletableConverter<R> {
+public interface CompletableConverter<@NonNull R> {
     /**
      * Applies a function to the upstream Completable and returns a converted value of type {@code R}.
      *
      * @param upstream the upstream Completable instance
      * @return the converted value
      */
-    @NonNull
     R apply(@NonNull Completable upstream);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Emitter.java b/src/main/java/io/reactivex/rxjava3/core/Emitter.java
index 0fc2b47c0d..e9ea2a1827 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Emitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Emitter.java
@@ -25,7 +25,7 @@
  *
  * @param <T> the value type emitted
  */
-public interface Emitter<T> {
+public interface Emitter<@NonNull T> {
 
     /**
      * Signal a normal value.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 56fa2e63f2..486b0cb629 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -150,7 +150,7 @@
  * @see ParallelFlowable
  * @see io.reactivex.rxjava3.subscribers.DisposableSubscriber
  */
-public abstract class Flowable<T> implements Publisher<T> {
+public abstract class Flowable<@NonNull T> implements Publisher<T> {
     /** The default buffer size. */
     static final int BUFFER_SIZE;
     static {
@@ -183,7 +183,7 @@ public abstract class Flowable<T> implements Publisher<T> {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> amb(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> amb(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableAmb<>(null, sources));
     }
@@ -215,7 +215,7 @@ public static <T> Flowable<T> amb(@NonNull Iterable<? extends Publisher<? extend
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> ambArray(Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> ambArray(Publisher<@NonNull ? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         int len = sources.length;
         if (len == 0) {
@@ -280,7 +280,7 @@ public static int bufferSize() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, @NonNull R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner) {
+    public static <T, @NonNull R> Flowable<R> combineLatestArray(@NonNull Publisher<@NonNull ? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestArray(sources, combiner, bufferSize());
     }
 
@@ -329,7 +329,7 @@ public static int bufferSize() {
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<@NonNull ? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -381,7 +381,7 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, @NonNull R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+    public static <T, @NonNull R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatest(sources, combiner, bufferSize());
     }
@@ -431,7 +431,7 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+    public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -481,7 +481,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
+    public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<@NonNull ? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestArrayDelayError(sources, combiner, bufferSize());
     }
@@ -532,7 +532,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
+    public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<@NonNull ? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -586,7 +586,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+    public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestDelayError(sources, combiner, bufferSize());
     }
@@ -637,7 +637,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<? extends Publi
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+    public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -684,7 +684,7 @@ public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T1, T2, R> Flowable<R> combineLatest(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -734,8 +734,8 @@ public static <T1, T2, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, R> Flowable<R> combineLatest(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
-            @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T3> source3,
             @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -790,8 +790,8 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
-            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
             @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -850,9 +850,9 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
-            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
-            @NonNull Publisher<? extends T5> source5,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
+            @NonNull Publisher<@NonNull ? extends T5> source5,
             @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -915,9 +915,9 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
-            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
-            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
+            @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
             @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -985,10 +985,10 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
-            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
-            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
-            @NonNull Publisher<? extends T7> source7,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
+            @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
+            @NonNull Publisher<@NonNull ? extends T7> source7,
             @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1060,10 +1060,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
-            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
-            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
-            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
+            @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
+            @NonNull Publisher<@NonNull ? extends T7> source7, @NonNull Publisher<@NonNull ? extends T8> source8,
             @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1140,11 +1140,11 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
-            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
-            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
-            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8,
-            @NonNull Publisher<? extends T9> source9,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
+            @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
+            @NonNull Publisher<@NonNull ? extends T7> source7, @NonNull Publisher<@NonNull ? extends T8> source8,
+            @NonNull Publisher<@NonNull ? extends T9> source9,
             @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1183,7 +1183,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         // unlike general sources, fromIterable can only throw on a boundary because it is consumed only there
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, 2);
@@ -1216,7 +1216,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<? extends Publisher<? ext
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return concat(sources, bufferSize());
     }
 
@@ -1251,7 +1251,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? ex
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? extends T>> sources, int prefetch) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int prefetch) {
         return fromPublisher(sources).concatMap((Function)Functions.identity(), prefetch);
     }
 
@@ -1284,7 +1284,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends Publisher<? ex
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
@@ -1322,8 +1322,8 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends T> source1, @N
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concat(
-            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
-            @NonNull Publisher<? extends T> source3) {
+            @NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
+            @NonNull Publisher<@NonNull ? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1364,8 +1364,8 @@ public static <T> Flowable<T> concat(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concat(
-            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
-            @NonNull Publisher<? extends T> source3, @NonNull Publisher<? extends T> source4) {
+            @NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
+            @NonNull Publisher<@NonNull ? extends T> source3, @NonNull Publisher<@NonNull ? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1398,7 +1398,7 @@ public static <T> Flowable<T> concat(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> concatArray(@NonNull Publisher<@NonNull ? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -1433,7 +1433,7 @@ public static <T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sou
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArrayDelayError(@NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> concatArrayDelayError(@NonNull Publisher<@NonNull ? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -1472,7 +1472,7 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull Publisher<? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArrayEager(@NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> concatArrayEager(@NonNull Publisher<@NonNull ? extends T>... sources) {
         return concatArrayEager(bufferSize(), bufferSize(), sources);
     }
 
@@ -1509,7 +1509,7 @@ public static <T> Flowable<T> concatArrayEager(@NonNull Publisher<? extends T>..
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch, @NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch, @NonNull Publisher<@NonNull ? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1545,7 +1545,7 @@ public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch,
     @BackpressureSupport(BackpressureKind.FULL)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<@NonNull ? extends T>... sources) {
         return concatArrayEagerDelayError(bufferSize(), bufferSize(), sources);
     }
 
@@ -1583,7 +1583,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<? ex
     @BackpressureSupport(BackpressureKind.FULL)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int prefetch, @NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int prefetch, @NonNull Publisher<@NonNull ? extends T>... sources) {
         return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, prefetch);
     }
 
@@ -1611,7 +1611,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity());
     }
@@ -1636,7 +1636,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Publi
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return concatDelayError(sources, bufferSize(), true);
     }
 
@@ -1665,7 +1665,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources, int prefetch, boolean tillTheEnd) {
+    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int prefetch, boolean tillTheEnd) {
         return fromPublisher(sources).concatMapDelayError((Function)Functions.identity(), tillTheEnd, prefetch);
     }
 
@@ -1693,7 +1693,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1726,7 +1726,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1757,7 +1757,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends Publisher
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1790,7 +1790,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1893,7 +1893,7 @@ public static <T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @No
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<? extends T>> supplier) {
+    public static <T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<@NonNull ? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableDefer<>(supplier));
     }
@@ -2178,7 +2178,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Flowable<T> fromIterable(@NonNull Iterable<? extends T> source) {
+    public static <@NonNull T> Flowable<T> fromIterable(@NonNull Iterable<@NonNull ? extends T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new FlowableFromIterable<>(source));
     }
@@ -2215,7 +2215,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
-    public static <T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> source) {
+    public static <T> Flowable<T> fromPublisher(@NonNull Publisher<@NonNull ? extends T> source) {
         if (source instanceof Flowable) {
             return RxJavaPlugins.onAssembly((Flowable<T>)source);
         }
@@ -2327,7 +2327,7 @@ public static <T> Flowable<T> generate(@NonNull Consumer<@NonNull Emitter<T>> ge
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, @NonNull Emitter<T>> generator) {
+    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, FlowableInternalHelper.simpleBiGenerator(generator),
                 Functions.emptyConsumer());
@@ -2363,7 +2363,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, @NonNull Emitter<T>> generator,
+    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, Emitter<T>> generator,
             @NonNull Consumer<? super S> disposeState) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, FlowableInternalHelper.simpleBiGenerator(generator), disposeState);
@@ -3142,7 +3142,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -3196,7 +3196,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @NonNull Publisher<@NonNull ? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -3242,7 +3242,7 @@ public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @No
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity());
     }
 
@@ -3293,7 +3293,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency) {
+    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), maxConcurrency);
     }
 
@@ -3340,7 +3340,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends Publisher<? exte
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return merge(sources, bufferSize());
     }
 
@@ -3393,7 +3393,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? ext
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency) {
         return fromPublisher(sources).flatMap((Function)Functions.identity(), maxConcurrency);
     }
 
@@ -3439,7 +3439,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends Publisher<? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArray(@NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> mergeArray(@NonNull Publisher<@NonNull ? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), sources.length);
     }
 
@@ -3486,7 +3486,7 @@ public static <T> Flowable<T> mergeArray(@NonNull Publisher<? extends T>... sour
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), false, 2);
@@ -3537,7 +3537,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @No
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2, @NonNull Publisher<? extends T> source3) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2, @NonNull Publisher<@NonNull ? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3592,8 +3592,8 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @No
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> merge(
-            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
-            @NonNull Publisher<? extends T> source3, @NonNull Publisher<? extends T> source4) {
+            @NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
+            @NonNull Publisher<@NonNull ? extends T> source3, @NonNull Publisher<@NonNull ? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3635,7 +3635,7 @@ public static <T> Flowable<T> merge(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true);
     }
 
@@ -3678,7 +3678,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publis
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -3722,7 +3722,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publis
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, @NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, @NonNull Publisher<@NonNull ? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -3763,7 +3763,7 @@ public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int buffe
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publisher<? extends T>> sources, int maxConcurrency) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency);
     }
 
@@ -3801,7 +3801,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Publis
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return mergeDelayError(sources, bufferSize());
     }
 
@@ -3844,7 +3844,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publi
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources, int maxConcurrency) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency) {
         return fromPublisher(sources).flatMap((Function)Functions.identity(), true, maxConcurrency);
     }
 
@@ -3883,7 +3883,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Publi
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<? extends T>... sources) {
+    public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<@NonNull ? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, sources.length);
     }
 
@@ -3922,7 +3922,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), true, 2);
@@ -3966,7 +3966,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> so
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2, @NonNull Publisher<? extends T> source3) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2, @NonNull Publisher<@NonNull ? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -4014,8 +4014,8 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> so
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(
-            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
-            @NonNull Publisher<? extends T> source3, @NonNull Publisher<? extends T> source4) {
+            @NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
+            @NonNull Publisher<@NonNull ? extends T> source3, @NonNull Publisher<@NonNull ? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -4164,7 +4164,7 @@ public static Flowable<Long> rangeLong(long start, long count) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
+    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize());
     }
 
@@ -4199,7 +4199,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
             @NonNull BiPredicate<? super T, ? super T> isEqual) {
         return sequenceEqual(source1, source2, isEqual, bufferSize());
     }
@@ -4238,7 +4238,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
             @NonNull BiPredicate<? super T, ? super T> isEqual, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -4277,7 +4277,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2, int bufferSize) {
+    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2, int bufferSize) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize);
     }
 
@@ -4320,7 +4320,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publisher<? extends T>> sources, int bufferSize) {
+    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int bufferSize) {
         return fromPublisher(sources).switchMap((Function)Functions.identity(), bufferSize);
     }
 
@@ -4360,7 +4360,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publishe
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return fromPublisher(sources).switchMap((Function)Functions.identity());
     }
 
@@ -4401,7 +4401,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publishe
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources) {
+    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
         return switchOnNextDelayError(sources, bufferSize());
     }
 
@@ -4445,8 +4445,8 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extend
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<? extends Publisher<? extends T>> sources, int prefetch) {
-        return fromPublisher(sources).switchMapDelayError(Functions.<Publisher<? extends T>>identity(), prefetch);
+    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int prefetch) {
+        return fromPublisher(sources).switchMapDelayError(Functions.<Publisher<@NonNull ? extends T>>identity(), prefetch);
     }
 
     /**
@@ -4575,7 +4575,7 @@ public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
     @NonNull
     public static <T, D> Flowable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
-            @NonNull Function<? super D, ? extends Publisher<? extends T>> sourceSupplier,
+            @NonNull Function<? super D, ? extends Publisher<@NonNull ? extends T>> sourceSupplier,
             @NonNull Consumer<? super D> resourceDisposer) {
         return using(resourceSupplier, sourceSupplier, resourceDisposer, true);
     }
@@ -4618,7 +4618,7 @@ public static <T, D> Flowable<T> using(
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, D> Flowable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
-            @NonNull Function<? super D, ? extends Publisher<? extends T>> sourceSupplier,
+            @NonNull Function<? super D, ? extends Publisher<@NonNull ? extends T>> sourceSupplier,
             @NonNull Consumer<? super D> resourceDisposer,
             boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
@@ -4676,7 +4676,7 @@ public static <T, D> Flowable<T> using(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
+    public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableZip<>(null, sources, zipper, bufferSize(), false));
@@ -4737,7 +4737,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? extends T>> sources,
+    public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> zipper, boolean delayError,
             int bufferSize) {
         Objects.requireNonNull(zipper, "zipper is null");
@@ -4800,7 +4800,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<? extends Publisher<? ext
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -4863,7 +4863,7 @@ public static <T1, T2, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -4928,7 +4928,7 @@ public static <T1, T2, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -4994,7 +4994,7 @@ public static <T1, T2, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
             @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5065,8 +5065,8 @@ public static <T1, T2, T3, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
-            @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
+            @NonNull Publisher<@NonNull ? extends T4> source4,
             @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5141,8 +5141,8 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
-            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
+            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5,
             @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5221,8 +5221,8 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
-            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
+            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
             @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5305,9 +5305,9 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
-            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
-            @NonNull Publisher<? extends T7> source7,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
+            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
+            @NonNull Publisher<@NonNull ? extends T7> source7,
             @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5394,9 +5394,9 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
-            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
-            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
+            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
+            @NonNull Publisher<@NonNull ? extends T7> source7, @NonNull Publisher<@NonNull ? extends T8> source8,
             @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5488,9 +5488,9 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
-            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
-            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
-            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8, @NonNull Publisher<? extends T9> source9,
+            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
+            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
+            @NonNull Publisher<@NonNull ? extends T7> source7, @NonNull Publisher<@NonNull ? extends T8> source8, @NonNull Publisher<@NonNull ? extends T9> source9,
             @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
 
         Objects.requireNonNull(source1, "source1 is null");
@@ -5563,7 +5563,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper,
-            boolean delayError, int bufferSize, @NonNull Publisher<? extends T>... sources) {
+            boolean delayError, int bufferSize, @NonNull Publisher<@NonNull ? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -5631,7 +5631,7 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> ambWith(@NonNull Publisher<? extends T> other) {
+    public final Flowable<T> ambWith(@NonNull Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
@@ -6343,7 +6343,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(@NonNull Subscriber<? super T> subscriber) {
+    public final void blockingSubscribe(@NonNull Subscriber<@NonNull ? super T> subscriber) {
         Objects.requireNonNull(subscriber, "subscriber is null");
         FlowableBlockingSubscribe.subscribe(this, subscriber);
     }
@@ -6862,7 +6862,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
     @NonNull
     public final <TOpening, TClosing> Flowable<List<T>> buffer(
             @NonNull Flowable<? extends TOpening> openingIndicator,
-            @NonNull Function<? super TOpening, ? extends Publisher<? extends TClosing>> closingIndicator) {
+            @NonNull Function<? super TOpening, ? extends Publisher<@NonNull ? extends TClosing>> closingIndicator) {
         return buffer(openingIndicator, closingIndicator, ArrayListSupplier.asSupplier());
     }
 
@@ -6904,7 +6904,7 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
     @NonNull
     public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> buffer(
             @NonNull Flowable<? extends TOpening> openingIndicator,
-            @NonNull Function<? super TOpening, ? extends Publisher<? extends TClosing>> closingIndicator,
+            @NonNull Function<? super TOpening, ? extends Publisher<@NonNull ? extends TClosing>> closingIndicator,
             @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
         Objects.requireNonNull(closingIndicator, "closingIndicator is null");
@@ -7335,7 +7335,7 @@ public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? e
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         return concatMap(mapper, 2);
     }
 
@@ -7377,7 +7377,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int prefetch) {
+    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         if (this instanceof ScalarSupplier) {
@@ -7432,7 +7432,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int prefetch, @NonNull Scheduler scheduler) {
+    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int prefetch, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -7643,7 +7643,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         return concatMapDelayError(mapper, true, 2);
     }
 
@@ -7684,7 +7684,7 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
             boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -7738,7 +7738,7 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
             boolean tillTheEnd, int prefetch, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -7771,7 +7771,7 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         return concatMapEager(mapper, bufferSize(), bufferSize());
     }
 
@@ -7803,7 +7803,7 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
             int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -7839,7 +7839,7 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
             boolean tillTheEnd) {
         return concatMapEagerDelayError(mapper, tillTheEnd, bufferSize(), bufferSize());
     }
@@ -7877,7 +7877,7 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
             boolean tillTheEnd, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -7912,7 +7912,7 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
         return concatMapIterable(mapper, 2);
     }
 
@@ -7946,7 +7946,7 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int prefetch) {
+    public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<>(this, mapper, prefetch));
@@ -8357,7 +8357,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> concatWith(@NonNull Publisher<? extends T> other) {
+    public final Flowable<T> concatWith(@NonNull Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return concat(this, other);
     }
@@ -9508,7 +9508,7 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnEach(@NonNull Subscriber<? super T> subscriber) {
+    public final Flowable<T> doOnEach(@NonNull Subscriber<@NonNull ? super T> subscriber) {
         Objects.requireNonNull(subscriber, "subscriber is null");
         return doOnEach(
                 FlowableInternalHelper.subscriberOnNext(subscriber),
@@ -9929,7 +9929,7 @@ public final Single<T> firstOrError() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         return flatMap(mapper, false, bufferSize(), bufferSize());
     }
 
@@ -9966,7 +9966,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayErrors) {
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, boolean delayErrors) {
         return flatMap(mapper, delayErrors, bufferSize(), bufferSize());
     }
 
@@ -10005,7 +10005,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int maxConcurrency) {
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int maxConcurrency) {
         return flatMap(mapper, false, maxConcurrency, bufferSize());
     }
 
@@ -10046,7 +10046,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, delayErrors, maxConcurrency, bufferSize());
     }
 
@@ -10090,7 +10090,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
             boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -10141,9 +10141,9 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<? extends R>> onNextMapper,
-            @NonNull Function<? super Throwable, ? extends Publisher<? extends R>> onErrorMapper,
-            @NonNull Supplier<? extends Publisher<? extends R>> onCompleteSupplier) {
+            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> onNextMapper,
+            @NonNull Function<? super Throwable, ? extends Publisher<@NonNull ? extends R>> onErrorMapper,
+            @NonNull Supplier<? extends Publisher<@NonNull ? extends R>> onCompleteSupplier) {
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
         Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
@@ -10190,9 +10190,9 @@ public final <R> Flowable<R> flatMap(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Flowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<? extends R>> onNextMapper,
-            @NonNull Function<Throwable, ? extends Publisher<? extends R>> onErrorMapper,
-            @NonNull Supplier<? extends Publisher<? extends R>> onCompleteSupplier,
+            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> onNextMapper,
+            @NonNull Function<Throwable, ? extends Publisher<@NonNull ? extends R>> onErrorMapper,
+            @NonNull Supplier<? extends Publisher<@NonNull ? extends R>> onCompleteSupplier,
             int maxConcurrency) {
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
@@ -10234,7 +10234,7 @@ public final <R> Flowable<R> flatMap(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         return flatMap(mapper, combiner, false, bufferSize(), bufferSize());
     }
@@ -10275,7 +10275,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors) {
         return flatMap(mapper, combiner, delayErrors, bufferSize(), bufferSize());
     }
@@ -10321,7 +10321,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, combiner, delayErrors, maxConcurrency, bufferSize());
     }
@@ -10369,7 +10369,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -10416,7 +10416,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends U>> mapper,
+    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, int maxConcurrency) {
         return flatMap(mapper, combiner, false, maxConcurrency, bufferSize());
     }
@@ -10498,7 +10498,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
         return flatMapIterable(mapper, bufferSize());
     }
 
@@ -10532,7 +10532,7 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int bufferSize) {
+    public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<>(this, mapper, bufferSize));
@@ -10572,7 +10572,7 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
+    public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends V> combiner) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -10617,7 +10617,7 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
+    public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends V> combiner, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -11349,9 +11349,9 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> groupJoin(
-            @NonNull Publisher<? extends TRight> other,
-            @NonNull Function<? super T, ? extends Publisher<TLeftEnd>> leftEnd,
-            @NonNull Function<? super TRight, ? extends Publisher<TRightEnd>> rightEnd,
+            @NonNull Publisher<@NonNull ? extends TRight> other,
+            @NonNull Function<? super T, ? extends Publisher<@NonNull TLeftEnd>> leftEnd,
+            @NonNull Function<? super TRight, ? extends Publisher<@NonNull TRightEnd>> rightEnd,
             @NonNull BiFunction<? super T, ? super Flowable<TRight>, ? extends R> resultSelector) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(leftEnd, "leftEnd is null");
@@ -11475,9 +11475,9 @@ public final Single<Boolean> isEmpty() {
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
-            @NonNull Publisher<? extends TRight> other,
-            @NonNull Function<? super T, ? extends Publisher<TLeftEnd>> leftEnd,
-            @NonNull Function<? super TRight, ? extends Publisher<TRightEnd>> rightEnd,
+            @NonNull Publisher<@NonNull ? extends TRight> other,
+            @NonNull Function<? super T, ? extends Publisher<@NonNull TLeftEnd>> leftEnd,
+            @NonNull Function<? super TRight, ? extends Publisher<@NonNull TRightEnd>> rightEnd,
             @NonNull BiFunction<? super T, ? super TRight, ? extends R> resultSelector) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(leftEnd, "leftEnd is null");
@@ -11801,7 +11801,7 @@ public final Flowable<Notification<T>> materialize() {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> mergeWith(@NonNull Publisher<? extends T> other) {
+    public final Flowable<T> mergeWith(@NonNull Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return merge(this, other);
     }
@@ -12478,7 +12478,7 @@ public final Flowable<T> onBackpressureLatest() {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends Publisher<? extends T>> resumeFunction) {
+    public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends Publisher<@NonNull ? extends T>> resumeFunction) {
         Objects.requireNonNull(resumeFunction, "resumeFunction is null");
         return RxJavaPlugins.onAssembly(new FlowableOnErrorNext<>(this, resumeFunction));
     }
@@ -12523,7 +12523,7 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorResumeWith(@NonNull Publisher<? extends T> next) {
+    public final Flowable<T> onErrorResumeWith(@NonNull Publisher<@NonNull ? extends T> next) {
         Objects.requireNonNull(next, "next is null");
         return onErrorResumeNext(Functions.justFunction(next));
     }
@@ -12822,7 +12822,7 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? extends Publisher<? extends R>> selector, int prefetch) {
+    public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? extends Publisher<@NonNull ? extends R>> selector, int prefetch) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowablePublishMulticast<>(this, selector, prefetch, false));
@@ -13153,7 +13153,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
+    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
         return RxJavaPlugins.onAssembly(new FlowableRepeatWhen<>(this, handler));
     }
@@ -14183,7 +14183,7 @@ public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> retryWhen(
-            @NonNull Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
+            @NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
 
         return RxJavaPlugins.onAssembly(new FlowableRetryWhen<>(this, handler));
@@ -14205,10 +14205,10 @@ public final Flowable<T> retryWhen(
      */
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void safeSubscribe(@NonNull Subscriber<? super T> subscriber) {
+    public final void safeSubscribe(@NonNull Subscriber<@NonNull ? super T> subscriber) {
         Objects.requireNonNull(subscriber, "subscriber is null");
         if (subscriber instanceof SafeSubscriber) {
-            subscribe((SafeSubscriber<? super T>)subscriber);
+            subscribe((SafeSubscriber<@NonNull ? super T>)subscriber);
         } else {
             subscribe(new SafeSubscriber<>(subscriber));
         }
@@ -15169,7 +15169,7 @@ public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> comparat
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Flowable<T> startWithIterable(@NonNull Iterable<? extends T> items) {
+    public final Flowable<T> startWithIterable(@NonNull Iterable<@NonNull ? extends T> items) {
         return concatArray(fromIterable(items), this);
     }
 
@@ -15198,7 +15198,7 @@ public final Flowable<T> startWithIterable(@NonNull Iterable<? extends T> items)
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> startWith(@NonNull Publisher<? extends T> other) {
+    public final Flowable<T> startWith(@NonNull Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return concatArray(other, this);
     }
@@ -15402,9 +15402,9 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
-    public final void subscribe(@NonNull Subscriber<? super T> subscriber) {
+    public final void subscribe(@NonNull Subscriber<@NonNull ? super T> subscriber) {
         if (subscriber instanceof FlowableSubscriber) {
-            subscribe((FlowableSubscriber<? super T>)subscriber);
+            subscribe((FlowableSubscriber<@NonNull ? super T>)subscriber);
         } else {
             Objects.requireNonNull(subscriber, "subscriber is null");
             subscribe(new StrictSubscriber<>(subscriber));
@@ -15451,10 +15451,10 @@ public final void subscribe(@NonNull Subscriber<? super T> subscriber) {
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void subscribe(@NonNull FlowableSubscriber<? super T> subscriber) {
+    public final void subscribe(@NonNull FlowableSubscriber<@NonNull ? super T> subscriber) {
         Objects.requireNonNull(subscriber, "subscriber is null");
         try {
-            Subscriber<? super T> flowableSubscriber = RxJavaPlugins.onSubscribe(this, subscriber);
+            Subscriber<@NonNull ? super T> flowableSubscriber = RxJavaPlugins.onSubscribe(this, subscriber);
 
             Objects.requireNonNull(flowableSubscriber, "The RxJavaPlugins.onSubscribe hook returned a null FlowableSubscriber. Please check the handler provided to RxJavaPlugins.setOnFlowableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
 
@@ -15481,7 +15481,7 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> subscriber) {
      * applied by {@link #subscribe(Subscriber)} before this method gets called.
      * @param subscriber the incoming {@code Subscriber}, never {@code null}
      */
-    protected abstract void subscribeActual(@NonNull Subscriber<? super T> subscriber);
+    protected abstract void subscribeActual(@NonNull Subscriber<@NonNull ? super T> subscriber);
 
     /**
      * Subscribes a given {@link Subscriber} (subclass) to this {@code Flowable} and returns the given
@@ -15514,7 +15514,7 @@ public final void subscribe(@NonNull FlowableSubscriber<? super T> subscriber) {
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull E extends Subscriber<? super T>> E subscribeWith(E subscriber) {
+    public final <@NonNull E extends Subscriber<@NonNull ? super T>> E subscribeWith(E subscriber) {
         subscribe(subscriber);
         return subscriber;
     }
@@ -15620,7 +15620,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> switchIfEmpty(@NonNull Publisher<? extends T> other) {
+    public final Flowable<T> switchIfEmpty(@NonNull Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchIfEmpty<>(this, other));
     }
@@ -15657,7 +15657,7 @@ public final Flowable<T> switchIfEmpty(@NonNull Publisher<? extends T> other) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         return switchMap(mapper, bufferSize());
     }
 
@@ -15696,7 +15696,7 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int bufferSize) {
+    public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int bufferSize) {
         return switchMap0(mapper, bufferSize, false);
     }
 
@@ -15829,7 +15829,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         return switchMapDelayError(mapper, bufferSize());
     }
 
@@ -15870,11 +15870,11 @@ public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ?
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, int bufferSize) {
+    public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int bufferSize) {
         return switchMap0(mapper, bufferSize, true);
     }
 
-    <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<? extends R>> mapper, int bufferSize, boolean delayError) {
+    <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int bufferSize, boolean delayError) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
@@ -17156,7 +17156,7 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator, @NonNull Publisher<? extends T> other) {
+    public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publisher<@NonNull V>> itemTimeoutIndicator, @NonNull Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(null, itemTimeoutIndicator, other);
     }
@@ -17222,7 +17222,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Publisher<? extends T> other) {
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, other, Schedulers.computation());
     }
@@ -17261,7 +17261,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Publisher<? extends T> other) {
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return timeout0(timeout, unit, other, scheduler);
     }
@@ -17384,13 +17384,13 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
     public final <U, V> Flowable<T> timeout(
             @NonNull Publisher<U> firstTimeoutIndicator,
             @NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
-            @NonNull Publisher<? extends T> other) {
+            @NonNull Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         Objects.requireNonNull(other, "other is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other);
     }
 
-    private Flowable<T> timeout0(long timeout, TimeUnit unit, Publisher<? extends T> other,
+    private Flowable<T> timeout0(long timeout, TimeUnit unit, Publisher<@NonNull ? extends T> other,
             Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -17399,8 +17399,8 @@ private Flowable<T> timeout0(long timeout, TimeUnit unit, Publisher<? extends T>
 
     private <U, V> Flowable<T> timeout0(
             Publisher<U> firstTimeoutIndicator,
-            Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
-                    Publisher<? extends T> other) {
+            Function<? super T, ? extends Publisher<@NonNull V>> itemTimeoutIndicator,
+                    Publisher<@NonNull ? extends T> other) {
         Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
         return RxJavaPlugins.onAssembly(new FlowableTimeout<>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
     }
@@ -18923,7 +18923,7 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, @NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<? extends U> other,
+    public final <U, @NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<@NonNull ? extends U> other,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -19093,7 +19093,7 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <@NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<?>[] others, @NonNull Function<? super Object[], R> combiner) {
+    public final <@NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<@NonNull ?>[] others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany<>(this, others, combiner));
@@ -19127,7 +19127,7 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<? extends Publisher<?>> others, @NonNull Function<? super Object[], R> combiner) {
+    public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ?>> others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany<>(this, others, combiner));
@@ -19168,7 +19168,7 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<? extends Publishe
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <@NonNull U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(zipper, "zipper is null");
         return RxJavaPlugins.onAssembly(new FlowableZipIterable<>(this, other, zipper));
@@ -19218,7 +19218,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull Bi
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
     }
@@ -19270,7 +19270,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other, @
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
+    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U> other,
             @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError) {
         return zip(this, other, zipper, delayError);
     }
@@ -19325,7 +19325,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
+    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U> other,
             @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError, int bufferSize) {
         return zip(this, other, zipper, delayError, bufferSize);
     }
@@ -19912,7 +19912,7 @@ public final Stream<T> blockingStream(int prefetch) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper) {
         return flatMapStream(mapper, bufferSize());
     }
 
@@ -19967,7 +19967,7 @@ public final Stream<T> blockingStream(int prefetch) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper, int prefetch) {
+    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapStream<>(this, mapper, prefetch));
@@ -20023,7 +20023,7 @@ public final Stream<T> blockingStream(int prefetch) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper) {
         return flatMapStream(mapper, bufferSize());
     }
 
@@ -20078,7 +20078,7 @@ public final Stream<T> blockingStream(int prefetch) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper, int prefetch) {
+    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapStream<>(this, mapper, prefetch));
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
index 92733c3c1e..d0b1814fb8 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
@@ -24,13 +24,12 @@
  * @since 2.2
  */
 @FunctionalInterface
-public interface FlowableConverter<T, R> {
+public interface FlowableConverter<@NonNull T, @NonNull R> {
     /**
      * Applies a function to the upstream {@link Flowable} and returns a converted value of type {@code R}.
      *
      * @param upstream the upstream {@code Flowable} instance
      * @return the converted value
      */
-    @NonNull
     R apply(@NonNull Flowable<T> upstream);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java
index 1221721f29..8304edca71 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java
@@ -15,7 +15,7 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.functions.*;
 
 /**
  * Abstraction over a Reactive Streams {@link org.reactivestreams.Subscriber} that allows associating
@@ -48,7 +48,7 @@
  *
  * @param <T> the value type to emit
  */
-public interface FlowableEmitter<T> extends Emitter<T> {
+public interface FlowableEmitter<@NonNull T> extends Emitter<T> {
 
     /**
      * Sets a Disposable on this emitter; any previous {@link Disposable}
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
index 156b9f2dc7..129c6ac7b6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
@@ -22,7 +22,7 @@
  * @param <T> the value type pushed
  */
 @FunctionalInterface
-public interface FlowableOnSubscribe<T> {
+public interface FlowableOnSubscribe<@NonNull T> {
 
     /**
      * Called for each {@link org.reactivestreams.Subscriber Subscriber} that subscribes.
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
index 5b5855ea2f..aed58cff89 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
@@ -24,7 +24,7 @@
  * @param <Upstream> the value type of the upstream
  */
 @FunctionalInterface
-public interface FlowableOperator<Downstream, Upstream> {
+public interface FlowableOperator<@NonNull Downstream, @NonNull Upstream> {
     /**
      * Applies a function to the child {@link Subscriber} and returns a new parent {@code Subscriber}.
      * @param subscriber the child {@code Subscriber} instance
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
index 23449fbedc..38b5bf3459 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
@@ -25,7 +25,7 @@
  * @param <T> the value type
  * @since 2.2
  */
-public interface FlowableSubscriber<T> extends Subscriber<T> {
+public interface FlowableSubscriber<@NonNull T> extends Subscriber<T> {
 
     /**
      * Implementors of this method should make sure everything that needs
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
index 3b98a97dad..8aa444afcc 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
@@ -24,7 +24,7 @@
  * @param <Downstream> the downstream value type
  */
 @FunctionalInterface
-public interface FlowableTransformer<Upstream, Downstream> {
+public interface FlowableTransformer<@NonNull Upstream, @NonNull Downstream> {
     /**
      * Applies a function to the upstream {@link Flowable} and returns a {@link Publisher} with
      * optionally different element type.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 4892aa3ab0..6865558c05 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -129,7 +129,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> amb(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Maybe<T> amb(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeAmb<>(null, sources));
     }
@@ -186,7 +186,7 @@ public static <T> Maybe<T> ambArray(@NonNull MaybeSource<? extends T>... sources
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeConcatIterable<>(sources));
     }
@@ -314,7 +314,7 @@ public static <T> Flowable<T> concat(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concat(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return concat(sources, 2);
     }
 
@@ -343,7 +343,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends MaybeSource<?
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> concat(@NonNull Publisher<? extends MaybeSource<? extends T>> sources, int prefetch) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, MaybeToPublisher.instance(), prefetch, ErrorMode.IMMEDIATE));
@@ -469,7 +469,7 @@ public static <T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return Flowable.fromIterable(sources).concatMapDelayError((Function)MaybeToPublisher.instance());
     }
@@ -497,7 +497,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<? extends Maybe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapDelayError((Function)MaybeToPublisher.instance());
     }
 
@@ -525,7 +525,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<? extends Mayb
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapEager((Function)MaybeToPublisher.instance());
     }
 
@@ -555,7 +555,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends MaybeSourc
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapEager((Function)MaybeToPublisher.instance());
     }
 
@@ -1020,7 +1020,7 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return merge(Flowable.fromIterable(sources));
     }
 
@@ -1056,7 +1056,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends MaybeSource<? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return merge(sources, Integer.MAX_VALUE);
     }
 
@@ -1095,7 +1095,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? e
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> merge(@NonNull Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), false, maxConcurrency, 1));
@@ -1413,7 +1413,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extend
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).flatMap((Function)MaybeToPublisher.instance(), true);
     }
 
@@ -1450,7 +1450,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends MaybeS
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends MaybeSource<? extends T>> sources) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return mergeDelayError(sources, Integer.MAX_VALUE);
     }
 
@@ -1491,7 +1491,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends Maybe
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), true, maxConcurrency, 1));
@@ -1917,7 +1917,7 @@ public static <T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Maybe<R> zip(@NonNull Iterable<? extends MaybeSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
+    public static <T, R> Maybe<R> zip(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeZipIterable<>(sources, zipper));
@@ -3028,7 +3028,7 @@ public final Maybe<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Maybe<T> doOnEvent(@NonNull BiConsumer<? super T, ? super Throwable> onEvent) {
+    public final Maybe<T> doOnEvent(@NonNull BiConsumer<@Nullable ? super T, @Nullable ? super Throwable> onEvent) {
         Objects.requireNonNull(onEvent, "onEvent is null");
         return RxJavaPlugins.onAssembly(new MaybeDoOnEvent<>(this, onEvent));
     }
@@ -3259,7 +3259,7 @@ public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends Mayb
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableFlowable<>(this, mapper));
     }
@@ -3286,7 +3286,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableObservable<>(this, mapper));
     }
@@ -3340,7 +3340,7 @@ public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapPublisher<>(this, mapper));
     }
@@ -4153,7 +4153,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
+    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
         return toFlowable().repeatWhen(handler);
     }
 
@@ -4366,7 +4366,7 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Maybe<T> retryWhen(
-            @NonNull Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
+            @NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
         return toFlowable().retryWhen(handler).singleElement();
     }
 
@@ -5188,7 +5188,7 @@ public final CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
+    public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlattenStreamAsFlowable<>(this, mapper));
     }
@@ -5228,7 +5228,7 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
+    public final <R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlattenStreamAsObservable<>(this, mapper));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
index eefe8c0973..221e8a671a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
@@ -24,7 +24,7 @@
  * @since 2.2
  */
 @FunctionalInterface
-public interface MaybeConverter<T, R> {
+public interface MaybeConverter<@NonNull T, @NonNull R> {
     /**
      * Applies a function to the upstream {@link Maybe} and returns a converted value of type {@code R}.
      *
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java b/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java
index 7757e4b72a..eb7f1f7241 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java
@@ -15,7 +15,7 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.functions.*;
 
 /**
  * Abstraction over an RxJava {@link MaybeObserver} that allows associating
@@ -47,7 +47,7 @@
  *
  * @param <T> the value type to emit
  */
-public interface MaybeEmitter<T> {
+public interface MaybeEmitter<@NonNull T> {
 
     /**
      * Signal a success value.
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java b/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java
index 52bee5923a..b0974fa97c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java
@@ -53,7 +53,7 @@
  *          the type of item the MaybeObserver expects to observe
  * @since 2.0
  */
-public interface MaybeObserver<T> {
+public interface MaybeObserver<@NonNull T> {
 
     /**
      * Provides the {@link MaybeObserver} with the means of cancelling (disposing) the
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
index 350d17af5d..f02756199e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
@@ -22,7 +22,7 @@
  * @param <T> the value type pushed
  */
 @FunctionalInterface
-public interface MaybeOnSubscribe<T> {
+public interface MaybeOnSubscribe<@NonNull T> {
 
     /**
      * Called for each {@link MaybeObserver} that subscribes.
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
index 30da3286b6..4ddb18d1f7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
@@ -21,7 +21,7 @@
  * @param <Upstream> the value type of the upstream
  */
 @FunctionalInterface
-public interface MaybeOperator<Downstream, Upstream> {
+public interface MaybeOperator<@NonNull Downstream, @NonNull Upstream> {
     /**
      * Applies a function to the child {@link MaybeObserver} and returns a new parent {@code MaybeObserver}.
      * @param observer the child {@code MaybeObserver} instance
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
index f066e5d32e..da9dbf0658 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
@@ -25,7 +25,7 @@
  * @since 2.0
  */
 @FunctionalInterface
-public interface MaybeSource<T> {
+public interface MaybeSource<@NonNull T> {
 
     /**
      * Subscribes the given {@link MaybeObserver} to this {@link MaybeSource} instance.
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
index aebcb8353f..620076d722 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
@@ -22,7 +22,7 @@
  * @param <Downstream> the downstream value type
  */
 @FunctionalInterface
-public interface MaybeTransformer<Upstream, Downstream> {
+public interface MaybeTransformer<@NonNull Upstream, @NonNull Downstream> {
     /**
      * Applies a function to the upstream {@link Maybe} and returns a {@link MaybeSource} with
      * optionally different element type.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 788c758a4a..6b118b70b5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -97,7 +97,7 @@
  * @see Flowable
  * @see io.reactivex.rxjava3.observers.DisposableObserver
  */
-public abstract class Observable<T> implements ObservableSource<T> {
+public abstract class Observable<@NonNull T> implements ObservableSource<T> {
 
     /**
      * Mirrors the one {@link ObservableSource} in an {@link Iterable} of several {@code ObservableSource}s that first either emits an item or sends
@@ -121,7 +121,7 @@ public abstract class Observable<T> implements ObservableSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> amb(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
+    public static <T> Observable<T> amb(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableAmb<>(null, sources));
     }
@@ -214,7 +214,7 @@ public static int bufferSize() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T, R> Observable<R> combineLatest(
-            @NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+            @NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatest(sources, combiner, bufferSize());
     }
@@ -262,7 +262,7 @@ public static <T, R> Observable<R> combineLatest(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, R> Observable<R> combineLatest(
-            @NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+            @NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -989,7 +989,7 @@ public static <T, R> Observable<R> combineLatestArrayDelayError(@NonNull Observa
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+    public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestDelayError(sources, combiner, bufferSize());
     }
@@ -1037,7 +1037,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? e
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+    public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -1066,7 +1066,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<? e
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
+    public static <T> Observable<T> concat(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, bufferSize());
     }
@@ -1424,7 +1424,7 @@ public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, i
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
+    public static <T> Observable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return concatDelayError(fromIterable(sources));
     }
@@ -1557,7 +1557,7 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
+    public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1587,7 +1587,7 @@ public static <T> Observable<T> concatEager(@NonNull Iterable<? extends Observab
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -1934,7 +1934,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromIterable(@NonNull Iterable<? extends T> source) {
+    public static <T> Observable<T> fromIterable(@NonNull Iterable<@NonNull ? extends T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new ObservableFromIterable<>(source));
     }
@@ -1971,7 +1971,7 @@ public static <T> Observable<T> fromIterable(@NonNull Iterable<? extends T> sour
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromPublisher(@NonNull Publisher<? extends T> publisher) {
+    public static <T> Observable<T> fromPublisher(@NonNull Publisher<@NonNull ? extends T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new ObservableFromPublisher<>(publisher));
     }
@@ -2831,7 +2831,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -2923,7 +2923,7 @@ public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
+    public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity());
     }
 
@@ -2970,7 +2970,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSour
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), maxConcurrency);
     }
 
@@ -3289,7 +3289,7 @@ public static <T> Observable<T> mergeArray(@NonNull ObservableSource<? extends T
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources) {
+    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true);
     }
 
@@ -3328,7 +3328,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends Obse
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -3405,7 +3405,7 @@ public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int buf
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency);
     }
 
@@ -4261,7 +4261,7 @@ public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
+    public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableZip<>(null, sources, zipper, bufferSize(), false));
@@ -4322,7 +4322,7 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSou
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> zip(@NonNull Iterable<? extends ObservableSource<? extends T>> sources,
+    public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> zipper, boolean delayError,
             int bufferSize) {
         Objects.requireNonNull(zipper, "zipper is null");
@@ -7107,7 +7107,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
     }
@@ -9310,7 +9310,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Observable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
     }
@@ -9344,7 +9344,7 @@ public final <U> Observable<U> flatMapIterable(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Observable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper,
+    public final <U, V> Observable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends V> combiner) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -12725,7 +12725,7 @@ public final Observable<T> sorted(@NonNull Comparator<? super T> sortFunction) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Observable<T> startWithIterable(@NonNull Iterable<? extends T> items) {
+    public final Observable<T> startWithIterable(@NonNull Iterable<@NonNull ? extends T> items) {
         return concatArray(fromIterable(items), this);
     }
 
@@ -16163,7 +16163,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull ObservableSource<?>[] oth
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> withLatestFrom(@NonNull Iterable<? extends ObservableSource<?>> others, @NonNull Function<? super Object[], R> combiner) {
+    public final <R> Observable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends ObservableSource<?>> others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<>(this, others, combiner));
@@ -16199,7 +16199,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<? extends Observ
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> zipWith(@NonNull Iterable<U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <@NonNull U, R> Observable<R> zipWith(@NonNull Iterable<U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(zipper, "zipper is null");
         return RxJavaPlugins.onAssembly(new ObservableZipIterable<>(this, other, zipper));
@@ -16853,7 +16853,7 @@ public final Stream<T> blockingStream(int capacityHint) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Observable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper) {
         return flatMapStream(mapper);
     }
 
@@ -16900,7 +16900,7 @@ public final Stream<T> blockingStream(int capacityHint) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Observable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapStream<>(this, mapper));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
index acdde63b29..7ab3a30a74 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
@@ -24,13 +24,12 @@
  * @since 2.2
  */
 @FunctionalInterface
-public interface ObservableConverter<T, R> {
+public interface ObservableConverter<@NonNull T, @NonNull R> {
     /**
      * Applies a function to the upstream {@link Observable} and returns a converted value of type {@code R}.
      *
      * @param upstream the upstream {@code Observable} instance
      * @return the converted value
      */
-    @NonNull
     R apply(@NonNull Observable<T> upstream);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java
index 776d6963d9..1ce0b93687 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java
@@ -15,7 +15,7 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.functions.*;
 
 /**
  * Abstraction over an RxJava {@link Observer} that allows associating
@@ -47,7 +47,7 @@
  *
  * @param <T> the value type to emit
  */
-public interface ObservableEmitter<T> extends Emitter<T> {
+public interface ObservableEmitter<@NonNull T> extends Emitter<T> {
 
     /**
      * Sets a {@link Disposable} on this emitter; any previous {@code Disposable}
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
index bcde496462..de98fe0817 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
@@ -22,7 +22,7 @@
  * @param <T> the value type pushed
  */
 @FunctionalInterface
-public interface ObservableOnSubscribe<T> {
+public interface ObservableOnSubscribe<@NonNull T> {
 
     /**
      * Called for each {@link Observer} that subscribes.
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
index ff9dbc5852..749bfa1a70 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
@@ -22,7 +22,7 @@
  * @param <Upstream> the value type of the upstream
  */
 @FunctionalInterface
-public interface ObservableOperator<Downstream, Upstream> {
+public interface ObservableOperator<@NonNull Downstream, @NonNull Upstream> {
     /**
      * Applies a function to the child {@link Observer} and returns a new parent {@code Observer}.
      * @param observer the child {@code Observer} instance
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
index c2309e5b8d..89603f8e9c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
@@ -22,7 +22,7 @@
  * @since 2.0
  */
 @FunctionalInterface
-public interface ObservableSource<T> {
+public interface ObservableSource<@NonNull T> {
 
     /**
      * Subscribes the given {@link Observer} to this {@link ObservableSource} instance.
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
index 18ce5e02c9..e6686e2e97 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
@@ -22,7 +22,7 @@
  * @param <Downstream> the downstream value type
  */
 @FunctionalInterface
-public interface ObservableTransformer<Upstream, Downstream> {
+public interface ObservableTransformer<@NonNull Upstream, @NonNull Downstream> {
     /**
      * Applies a function to the upstream {@link Observable} and returns an {@link ObservableSource} with
      * optionally different element type.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observer.java b/src/main/java/io/reactivex/rxjava3/core/Observer.java
index de02f8ac88..dd4fb58711 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observer.java
@@ -73,7 +73,7 @@
  * @param <T>
  *          the type of item the Observer expects to observe
  */
-public interface Observer<T> {
+public interface Observer<@NonNull T> {
 
     /**
      * Provides the {@link Observer} with the means of cancelling (disposing) the
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index a1fae2e6fc..b5dde711ba 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -113,7 +113,7 @@
  * @since 2.0
  * @see io.reactivex.rxjava3.observers.DisposableSingleObserver
  */
-public abstract class Single<T> implements SingleSource<T> {
+public abstract class Single<@NonNull T> implements SingleSource<T> {
 
     /**
      * Runs multiple {@link SingleSource}s and signals the events of the first one that signals (disposing
@@ -134,7 +134,7 @@ public abstract class Single<T> implements SingleSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> amb(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Single<T> amb(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new SingleAmb<>(null, sources));
     }
@@ -193,7 +193,7 @@ public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sourc
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T> Flowable<T> concat(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return concat(Flowable.fromIterable(sources));
     }
 
@@ -243,7 +243,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Singl
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Publisher<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         return concat(sources, 2);
     }
 
@@ -272,7 +272,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<? extends SingleSource<?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> concat(@NonNull Publisher<? extends SingleSource<? extends T>> sources, int prefetch) {
+    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, SingleInternalHelper.toFlowable(), prefetch, ErrorMode.IMMEDIATE));
@@ -465,7 +465,7 @@ public static <T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.toFlowable());
     }
 
@@ -492,7 +492,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<? extends SingleSou
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapEager(SingleInternalHelper.toFlowable());
     }
 
@@ -765,7 +765,7 @@ public static <T> Single<T> error(@NonNull Throwable exception) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromPublisher(@NonNull Publisher<? extends T> publisher) {
+    public static <T> Single<T> fromPublisher(@NonNull Publisher<@NonNull ? extends T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new SingleFromPublisher<>(publisher));
     }
@@ -898,7 +898,7 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return merge(Flowable.fromIterable(sources));
     }
 
@@ -938,7 +938,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<? extends SingleSource<? e
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> merge(@NonNull Publisher<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), false, Integer.MAX_VALUE, Flowable.bufferSize()));
     }
@@ -1155,7 +1155,7 @@ public static <T> Flowable<T> merge(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return mergeDelayError(Flowable.fromIterable(sources));
     }
 
@@ -1183,7 +1183,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<? extends Single
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends SingleSource<? extends T>> sources) {
+    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), true, Integer.MAX_VALUE, Flowable.bufferSize()));
     }
@@ -1564,7 +1564,7 @@ public static <T> Single<T> wrap(@NonNull SingleSource<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Single<R> zip(@NonNull Iterable<? extends SingleSource<? extends T>> sources,
+    public static <T, R> Single<R> zip(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
@@ -2654,7 +2654,7 @@ public final Single<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> doOnEvent(@NonNull BiConsumer<? super T, ? super Throwable> onEvent) {
+    public final Single<T> doOnEvent(@NonNull BiConsumer<@Nullable ? super T, @Nullable ? super Throwable> onEvent) {
         Objects.requireNonNull(onEvent, "onEvent is null");
         return RxJavaPlugins.onAssembly(new SingleDoOnEvent<>(this, onEvent));
     }
@@ -2806,7 +2806,7 @@ public final <R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends Ma
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapPublisher<>(this, mapper));
     }
@@ -2837,7 +2837,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapIterableFlowable<>(this, mapper));
     }
@@ -2865,7 +2865,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <@NonNull U> Observable<U> flattenAsObservable(@NonNull Function<@NonNull ? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
+    public final <@NonNull U> Observable<U> flattenAsObservable(@NonNull Function<@NonNull ? super T, @NonNull ? extends Iterable<@NonNull ? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapIterableObservable<>(this, mapper));
     }
@@ -3465,7 +3465,7 @@ public final Flowable<T> repeat(long times) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<?>> handler) {
+    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
         return toFlowable().repeatWhen(handler);
     }
 
@@ -3649,7 +3649,7 @@ public final Single<T> retry(@NonNull Predicate<? super Throwable> predicate) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<?>> handler) {
+    public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
         return toSingle(toFlowable().retryWhen(handler));
     }
 
@@ -4410,7 +4410,7 @@ public final CompletionStage<T> toCompletionStage() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
+    public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlattenStreamAsFlowable<>(this, mapper));
     }
@@ -4451,7 +4451,7 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<? extends R>> mapper) {
+    public final <R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlattenStreamAsObservable<>(this, mapper));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
index eb100b6c87..ce3a446452 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
@@ -24,13 +24,12 @@
  * @since 2.2
  */
 @FunctionalInterface
-public interface SingleConverter<T, R> {
+public interface SingleConverter<@NonNull T, @NonNull R> {
     /**
      * Applies a function to the upstream {@link Single} and returns a converted value of type {@code R}.
      *
      * @param upstream the upstream {@code Single} instance
      * @return the converted value
      */
-    @NonNull
     R apply(@NonNull Single<T> upstream);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java b/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java
index bb3768243d..c8d0a79ec3 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java
@@ -15,7 +15,7 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.functions.*;
 
 /**
  * Abstraction over an RxJava {@link SingleObserver} that allows associating
@@ -47,7 +47,7 @@
  *
  * @param <T> the value type to emit
  */
-public interface SingleEmitter<T> {
+public interface SingleEmitter<@NonNull T> {
 
     /**
      * Signal a success value.
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java b/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java
index d2d788d38f..281c15e531 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java
@@ -50,7 +50,7 @@
  *          the type of item the SingleObserver expects to observe
  * @since 2.0
  */
-public interface SingleObserver<T> {
+public interface SingleObserver<@NonNull T> {
 
     /**
      * Provides the {@link SingleObserver} with the means of cancelling (disposing) the
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
index 7a6a5adf68..14ff5e1f97 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
@@ -22,7 +22,7 @@
  * @param <T> the value type pushed
  */
 @FunctionalInterface
-public interface SingleOnSubscribe<T> {
+public interface SingleOnSubscribe<@NonNull T> {
 
     /**
      * Called for each {@link SingleObserver} that subscribes.
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
index de2f38f23d..f3975b3a7f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
@@ -22,7 +22,7 @@
  * @param <Upstream> the value type of the upstream
  */
 @FunctionalInterface
-public interface SingleOperator<Downstream, Upstream> {
+public interface SingleOperator<@NonNull Downstream, @NonNull Upstream> {
     /**
      * Applies a function to the child {@link SingleObserver} and returns a new parent {@code SingleObserver}.
      * @param observer the child {@code SingleObserver} instance
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleSource.java b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
index b4c923905d..bbeeaac40b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
@@ -25,7 +25,7 @@
  * @since 2.0
  */
 @FunctionalInterface
-public interface SingleSource<T> {
+public interface SingleSource<@NonNull T> {
 
     /**
      * Subscribes the given {@link SingleObserver} to this {@link SingleSource} instance.
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
index 1f0d478a0e..f3edca3430 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
@@ -22,7 +22,7 @@
  * @param <Downstream> the downstream value type
  */
 @FunctionalInterface
-public interface SingleTransformer<Upstream, Downstream> {
+public interface SingleTransformer<@NonNull Upstream, @NonNull Downstream> {
     /**
      * Applies a function to the upstream {@link Single} and returns a {@link SingleSource} with
      * optionally different element type.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java b/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java
index 7fa60ef4c7..85ce3dbd17 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java
@@ -13,13 +13,15 @@
 
 package io.reactivex.rxjava3.functions;
 
+import io.reactivex.rxjava3.annotations.NonNull;
+
 /**
  * A functional interface (callback) that accepts two values (of possibly different types).
  * @param <T1> the first value type
  * @param <T2> the second value type
  */
 @FunctionalInterface
-public interface BiConsumer<T1, T2> {
+public interface BiConsumer<@NonNull T1, @NonNull T2> {
 
     /**
      * Performs an operation on the given values.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java b/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java
index 174cc3c6d9..0724ef5bd1 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java
@@ -22,7 +22,7 @@
  * @param <R> the result type
  */
 @FunctionalInterface
-public interface BiFunction<T1, T2, R> {
+public interface BiFunction<@NonNull T1, @NonNull T2, @NonNull R> {
 
     /**
      * Calculate a value based on the input values.
@@ -31,6 +31,5 @@ public interface BiFunction<T1, T2, R> {
      * @return the result value
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    @NonNull
-    R apply(@NonNull T1 t1, @NonNull T2 t2) throws Throwable;
+    R apply(T1 t1, T2 t2) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java b/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java
index fc41682ef5..393ec86ab7 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java
@@ -21,7 +21,7 @@
  * @param <T2> the second value
  */
 @FunctionalInterface
-public interface BiPredicate<T1, T2> {
+public interface BiPredicate<@NonNull T1, @NonNull T2> {
 
     /**
      * Test the given input values and return a boolean.
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Consumer.java b/src/main/java/io/reactivex/rxjava3/functions/Consumer.java
index 788622c170..bf245bdcb7 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Consumer.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Consumer.java
@@ -13,12 +13,14 @@
 
 package io.reactivex.rxjava3.functions;
 
+import io.reactivex.rxjava3.annotations.NonNull;
+
 /**
  * A functional interface (callback) that accepts a single value.
  * @param <T> the value type
  */
 @FunctionalInterface
-public interface Consumer<T> {
+public interface Consumer<@NonNull T> {
     /**
      * Consume the given value.
      * @param t the value
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function.java b/src/main/java/io/reactivex/rxjava3/functions/Function.java
index d81a2dec52..0f8b2fe39a 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function.java
@@ -23,12 +23,12 @@
  * @param <R> the output value type
  */
 @FunctionalInterface
-public interface Function<T, R> {
+public interface Function<@NonNull T, @NonNull R> {
     /**
      * Apply some calculation to the input value and return some other value.
      * @param t the input value
      * @return the output value
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    R apply(@NonNull T t) throws Throwable;
+    R apply(T t) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function3.java b/src/main/java/io/reactivex/rxjava3/functions/Function3.java
index cdc65112e7..fb1fe5aa76 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function3.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function3.java
@@ -23,7 +23,7 @@
  * @param <R> the result type
  */
 @FunctionalInterface
-public interface Function3<T1, T2, T3, R> {
+public interface Function3<@NonNull T1, @NonNull T2, @NonNull T3, @NonNull R> {
     /**
      * Calculate a value based on the input values.
      * @param t1 the first value
@@ -32,6 +32,5 @@ public interface Function3<T1, T2, T3, R> {
      * @return the result value
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    @NonNull
-    R apply(@NonNull T1 t1, @NonNull T2 t2, @NonNull T3 t3) throws Throwable;
+    R apply(T1 t1, T2 t2, T3 t3) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function4.java b/src/main/java/io/reactivex/rxjava3/functions/Function4.java
index 84c3ab1449..9c0af4737d 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function4.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function4.java
@@ -24,7 +24,7 @@
  * @param <R> the result type
  */
 @FunctionalInterface
-public interface Function4<T1, T2, T3, T4, R> {
+public interface Function4<@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull R> {
     /**
      * Calculate a value based on the input values.
      * @param t1 the first value
@@ -34,6 +34,5 @@ public interface Function4<T1, T2, T3, T4, R> {
      * @return the result value
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    @NonNull
-    R apply(@NonNull T1 t1, @NonNull T2 t2, @NonNull T3 t3, @NonNull T4 t4) throws Throwable;
+    R apply(T1 t1, T2 t2, T3 t3, T4 t4) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function5.java b/src/main/java/io/reactivex/rxjava3/functions/Function5.java
index 77f2ff7220..fddaa28152 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function5.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function5.java
@@ -25,7 +25,7 @@
  * @param <R> the result type
  */
 @FunctionalInterface
-public interface Function5<T1, T2, T3, T4, T5, R> {
+public interface Function5<@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull R> {
     /**
      * Calculate a value based on the input values.
      * @param t1 the first value
@@ -36,6 +36,5 @@ public interface Function5<T1, T2, T3, T4, T5, R> {
      * @return the result value
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    @NonNull
-    R apply(@NonNull T1 t1, @NonNull T2 t2, @NonNull T3 t3, @NonNull T4 t4, @NonNull T5 t5) throws Throwable;
+    R apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function6.java b/src/main/java/io/reactivex/rxjava3/functions/Function6.java
index 50c25f3df9..1f6ad10d20 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function6.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function6.java
@@ -26,7 +26,7 @@
  * @param <R> the result type
  */
 @FunctionalInterface
-public interface Function6<T1, T2, T3, T4, T5, T6, R> {
+public interface Function6<@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull R> {
     /**
      * Calculate a value based on the input values.
      * @param t1 the first value
@@ -38,6 +38,5 @@ public interface Function6<T1, T2, T3, T4, T5, T6, R> {
      * @return the result value
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    @NonNull
-    R apply(@NonNull T1 t1, @NonNull T2 t2, @NonNull T3 t3, @NonNull T4 t4, @NonNull T5 t5, @NonNull T6 t6) throws Throwable;
+    R apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function7.java b/src/main/java/io/reactivex/rxjava3/functions/Function7.java
index 613800a4c1..39a6b26916 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function7.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function7.java
@@ -27,7 +27,7 @@
  * @param <R> the result type
  */
 @FunctionalInterface
-public interface Function7<T1, T2, T3, T4, T5, T6, T7, R> {
+public interface Function7<@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull R> {
     /**
      * Calculate a value based on the input values.
      * @param t1 the first value
@@ -40,6 +40,5 @@ public interface Function7<T1, T2, T3, T4, T5, T6, T7, R> {
      * @return the result value
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    @NonNull
-    R apply(@NonNull T1 t1, @NonNull T2 t2, @NonNull T3 t3, @NonNull T4 t4, @NonNull T5 t5, @NonNull T6 t6, @NonNull T7 t7) throws Throwable;
+    R apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function8.java b/src/main/java/io/reactivex/rxjava3/functions/Function8.java
index 2fda54ea40..907c68cdfe 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function8.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function8.java
@@ -28,7 +28,7 @@
  * @param <R> the result type
  */
 @FunctionalInterface
-public interface Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> {
+public interface Function8<@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull R> {
     /**
      * Calculate a value based on the input values.
      * @param t1 the first value
@@ -42,6 +42,5 @@ public interface Function8<T1, T2, T3, T4, T5, T6, T7, T8, R> {
      * @return the result value
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    @NonNull
-    R apply(@NonNull T1 t1, @NonNull T2 t2, @NonNull T3 t3, @NonNull T4 t4, @NonNull T5 t5, @NonNull T6 t6, @NonNull T7 t7, @NonNull T8 t8) throws Throwable;
+    R apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function9.java b/src/main/java/io/reactivex/rxjava3/functions/Function9.java
index 3eb0779e30..a7f7518456 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function9.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function9.java
@@ -29,7 +29,7 @@
  * @param <R> the result type
  */
 @FunctionalInterface
-public interface Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> {
+public interface Function9<@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull T9, @NonNull R> {
     /**
      * Calculate a value based on the input values.
      * @param t1 the first value
@@ -44,6 +44,5 @@ public interface Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, R> {
      * @return the result value
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    @NonNull
-    R apply(@NonNull T1 t1, @NonNull T2 t2, @NonNull T3 t3, @NonNull T4 t4, @NonNull T5 t5, @NonNull T6 t6, @NonNull T7 t7, @NonNull T8 t8, @NonNull T9 t9) throws Throwable;
+    R apply(T1 t1, T2 t2, T3 t3, T4 t4, T5 t5, T6 t6, T7 t7, T8 t8, T9 t9) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java b/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java
index e01cc13ab5..9859bfd3c6 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java
@@ -19,13 +19,12 @@
  * @param <T> the returned value type
  */
 @FunctionalInterface
-public interface IntFunction<T> {
+public interface IntFunction<@NonNull T> {
     /**
      * Calculates a value based on a primitive integer input.
      * @param i the input value
      * @return the result Object
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    @NonNull
     T apply(int i) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Predicate.java b/src/main/java/io/reactivex/rxjava3/functions/Predicate.java
index 99450f865b..550a365e60 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Predicate.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Predicate.java
@@ -20,12 +20,12 @@
  * @param <T> the first value
  */
 @FunctionalInterface
-public interface Predicate<T> {
+public interface Predicate<@NonNull T> {
     /**
      * Test the given input value and return a boolean.
      * @param t the value
      * @return the boolean result
      * @throws Throwable if the implementation wishes to throw any type of exception
      */
-    boolean test(@NonNull T t) throws Throwable;
+    boolean test(T t) throws Throwable;
 }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Supplier.java b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
index af5052ab83..5a6245f05d 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
@@ -13,6 +13,8 @@
 
 package io.reactivex.rxjava3.functions;
 
+import io.reactivex.rxjava3.annotations.NonNull;
+
 /**
  * A functional interface (callback) that provides a single value or
  * throws an exception.
@@ -23,7 +25,7 @@
  * @since 3.0.0
  */
 @FunctionalInterface
-public interface Supplier<T> {
+public interface Supplier<@NonNull T> {
 
     /**
      * Produces a value or throws an exception.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java
index 2b4fe68be1..9db35aed02 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 
 /**
@@ -25,12 +26,12 @@
  *
  * @param <T> the value type
  */
-public interface ConditionalSubscriber<T> extends FlowableSubscriber<T> {
+public interface ConditionalSubscriber<@NonNull T> extends FlowableSubscriber<T> {
     /**
      * Conditionally takes the value.
      * @param t the value to deliver
      * @return true if the value has been accepted, false if the value has been rejected
      * and the next value can be sent immediately
      */
-    boolean tryOnNext(T t);
+    boolean tryOnNext(@NonNull T t);
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
index 2b7bb614e7..6ad462c706 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Flowable;
 
 /**
@@ -32,12 +33,13 @@
  *
  * @param <T> the value type
  */
-public interface FuseToFlowable<T> {
+public interface FuseToFlowable<@NonNull T> {
 
     /**
      * Returns a (direct) Flowable for the operator.
      * <p>The implementation should handle the necessary RxJavaPlugins wrapping.
      * @return the Flowable instance
      */
+    @NonNull
     Flowable<T> fuseToFlowable();
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
index c2db8c7de6..572255a7bc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Maybe;
 
 /**
@@ -32,12 +33,13 @@
  *
  * @param <T> the value type
  */
-public interface FuseToMaybe<T> {
+public interface FuseToMaybe<@NonNull T> {
 
     /**
      * Returns a (direct) Maybe for the operator.
      * <p>The implementation should handle the necessary RxJavaPlugins wrapping.
      * @return the Maybe instance
      */
+    @NonNull
     Maybe<T> fuseToMaybe();
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java
index 8488ccf6e8..567d3c9a7c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Observable;
 
 /**
@@ -32,12 +33,13 @@
  *
  * @param <T> the value type
  */
-public interface FuseToObservable<T> {
+public interface FuseToObservable<@NonNull T> {
 
     /**
      * Returns a (direct) Observable for the operator.
      * <p>The implementation should handle the necessary RxJavaPlugins wrapping.
      * @return the Observable instance
      */
+    @NonNull
     Observable<T> fuseToObservable();
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java
index 38f199b9dc..cb6c18edd5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.CompletableSource;
 
 /**
@@ -25,5 +26,6 @@ public interface HasUpstreamCompletableSource {
      * <p>Allows discovering the chain of observables.
      * @return the source CompletableSource
      */
+    @NonNull
     CompletableSource source();
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java
index 0a7d36ed86..6f4fcd9085 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.MaybeSource;
 
 /**
@@ -21,11 +22,12 @@
  *
  * @param <T> the value type
  */
-public interface HasUpstreamMaybeSource<T> {
+public interface HasUpstreamMaybeSource<@NonNull T> {
     /**
      * Returns the upstream source of this Maybe.
      * <p>Allows discovering the chain of observables.
      * @return the source MaybeSource
      */
+    @NonNull
     MaybeSource<T> source();
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java
index 0ab946c4c0..8bd340a6c0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.ObservableSource;
 
 /**
@@ -21,11 +22,12 @@
  *
  * @param <T> the value type
  */
-public interface HasUpstreamObservableSource<T> {
+public interface HasUpstreamObservableSource<@NonNull T> {
     /**
      * Returns the upstream source of this Observable.
      * <p>Allows discovering the chain of observables.
      * @return the source ObservableSource
      */
+    @NonNull
     ObservableSource<T> source();
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java
index 9afa5ce9e0..a412b37e1d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java
@@ -15,13 +15,15 @@
 
 import org.reactivestreams.Publisher;
 
+import io.reactivex.rxjava3.annotations.NonNull;
+
 /**
  * Interface indicating the implementor has an upstream Publisher-like source available
  * via {@link #source()} method.
  *
  * @param <T> the value type
  */
-public interface HasUpstreamPublisher<T> {
+public interface HasUpstreamPublisher<@NonNull T> {
     /**
      * Returns the source Publisher.
      * <p>
@@ -29,5 +31,6 @@ public interface HasUpstreamPublisher<T> {
      * graph of sequences.
      * @return the source Publisher
      */
+    @NonNull
     Publisher<T> source();
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java
index db94a572e1..dfab10fd9e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.SingleSource;
 
 /**
@@ -21,11 +22,12 @@
  *
  * @param <T> the value type
  */
-public interface HasUpstreamSingleSource<T> {
+public interface HasUpstreamSingleSource<@NonNull T> {
     /**
      * Returns the upstream source of this Single.
      * <p>Allows discovering the chain of observables.
      * @return the source SingleSource
      */
+    @NonNull
     SingleSource<T> source();
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java
index 2becb58d43..74124d918c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java
@@ -14,6 +14,7 @@
 
 import java.util.Queue;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
@@ -51,5 +52,5 @@
  * </ul>
  * @param <T> the value type transmitted through the queue
  */
-public interface QueueDisposable<T> extends QueueFuseable<T>, Disposable {
+public interface QueueDisposable<@NonNull T> extends QueueFuseable<T>, Disposable {
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java
index fadc824cc7..71b93a75ad 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java
@@ -13,11 +13,13 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
+
 /**
  * Represents a SimpleQueue plus the means and constants for requesting a fusion mode.
  * @param <T> the value type returned by the SimpleQueue.poll()
  */
-public interface QueueFuseable<T> extends SimpleQueue<T> {
+public interface QueueFuseable<@NonNull T> extends SimpleQueue<T> {
     /**
      * Returned by the {@link #requestFusion(int)} if the upstream doesn't support
      * the requested mode.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java
index 87599a6e40..923589377c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java
@@ -16,6 +16,8 @@
 
 import org.reactivestreams.Subscription;
 
+import io.reactivex.rxjava3.annotations.NonNull;
+
 /**
  * An interface extending Queue and Subscription and allows negotiating
  * the fusion mode between subsequent operators  of the {@code Flowable} base reactive type.
@@ -53,5 +55,5 @@
  * </ul>
  * @param <T> the value type transmitted through the queue
  */
-public interface QueueSubscription<T> extends QueueFuseable<T>, Subscription {
+public interface QueueSubscription<@NonNull T> extends QueueFuseable<T>, Subscription {
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
index fc0d12323f..eda6086f87 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
@@ -12,6 +12,7 @@
  */
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.functions.Supplier;
 
 /**
@@ -30,7 +31,7 @@
  * @param <T> the scalar value type held by the implementing reactive type
  */
 @FunctionalInterface
-public interface ScalarSupplier<T> extends Supplier<T> {
+public interface ScalarSupplier<@NonNull T> extends Supplier<T> {
 
     // overridden to remove the throws Throwable
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java
index 3708580270..c3122038c1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java
@@ -13,14 +13,14 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
-import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.annotations.*;
 
 /**
  * Override of the SimpleQueue interface with no throws Exception on poll().
  *
  * @param <T> the value type to offer and poll, not null
  */
-public interface SimplePlainQueue<T> extends SimpleQueue<T> {
+public interface SimplePlainQueue<@NonNull T> extends SimpleQueue<T> {
 
     @Nullable
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java
index 29af5299d8..49d893031b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java
@@ -20,7 +20,7 @@
  *
  * @param <T> the value type to offer and poll, not null
  */
-public interface SimpleQueue<T> {
+public interface SimpleQueue<@NonNull T> {
 
     /**
      * Atomically enqueue a single.
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index 17d22690ad..0fb07bac37 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -59,7 +59,7 @@ public abstract class ParallelFlowable<@NonNull T> {
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public abstract void subscribe(@NonNull Subscriber<? super T>[] subscribers);
+    public abstract void subscribe(@NonNull Subscriber<@NonNull ? super T>[] subscribers);
 
     /**
      * Returns the number of expected parallel {@link Subscriber}s.
@@ -77,12 +77,12 @@ public abstract class ParallelFlowable<@NonNull T> {
      * @throws NullPointerException if {@code subscribers} is {@code null}
      * @throws IllegalArgumentException if {@code subscribers.length} is different from {@link #parallelism()}
      */
-    protected final boolean validate(@NonNull Subscriber<?>[] subscribers) {
+    protected final boolean validate(@NonNull Subscriber<@NonNull ?>[] subscribers) {
         Objects.requireNonNull(subscribers, "subscribers is null");
         int p = parallelism();
         if (subscribers.length != p) {
             Throwable iae = new IllegalArgumentException("parallelism = " + p + ", subscribers = " + subscribers.length);
-            for (Subscriber<?> s : subscribers) {
+            for (Subscriber<@NonNull ?> s : subscribers) {
                 EmptySubscription.error(iae, s);
             }
             return false;
@@ -110,7 +110,7 @@ protected final boolean validate(@NonNull Subscriber<?>[] subscribers) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source) {
+    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<@NonNull ? extends T> source) {
         return from(source, Runtime.getRuntime().availableProcessors(), Flowable.bufferSize());
     }
 
@@ -135,7 +135,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source, int parallelism) {
+    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<@NonNull ? extends T> source, int parallelism) {
         return from(source, parallelism, Flowable.bufferSize());
     }
 
@@ -164,7 +164,7 @@ public static <T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> sourc
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source,
+    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<@NonNull ? extends T> source,
             int parallelism, int prefetch) {
         Objects.requireNonNull(source, "source is null");
         ObjectHelper.verifyPositive(parallelism, "parallelism");
@@ -849,7 +849,7 @@ public final ParallelFlowable<T> doAfterNext(@NonNull Consumer<? super T> onAfte
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final ParallelFlowable<T> doOnError(@NonNull Consumer<Throwable> onError) {
+    public final ParallelFlowable<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
         Objects.requireNonNull(onError, "onError is null");
         return RxJavaPlugins.onAssembly(new ParallelPeek<>(this,
                 Functions.emptyConsumer(),
@@ -1154,7 +1154,7 @@ public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U>
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+    public final <R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         return flatMap(mapper, false, Flowable.bufferSize(), Flowable.bufferSize());
     }
 
@@ -1185,7 +1185,7 @@ public final <R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, ? exte
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayError) {
+            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, boolean delayError) {
         return flatMap(mapper, delayError, Flowable.bufferSize(), Flowable.bufferSize());
     }
 
@@ -1219,7 +1219,7 @@ public final <R> ParallelFlowable<R> flatMap(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper, boolean delayError, int maxConcurrency) {
+            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, boolean delayError, int maxConcurrency) {
         return flatMap(mapper, delayError, maxConcurrency, Flowable.bufferSize());
     }
 
@@ -1253,7 +1253,7 @@ public final <R> ParallelFlowable<R> flatMap(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
             boolean delayError, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -1285,7 +1285,7 @@ public final <R> ParallelFlowable<R> flatMap(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> concatMap(
-            @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper) {
+            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
         return concatMap(mapper, 2);
     }
 
@@ -1316,7 +1316,7 @@ public final <R> ParallelFlowable<R> concatMap(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> concatMap(
-            @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
             int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1349,7 +1349,7 @@ public final <R> ParallelFlowable<R> concatMap(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> concatMapDelayError(
-            @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
                     boolean tillTheEnd) {
         return concatMapDelayError(mapper, 2, tillTheEnd);
     }
@@ -1382,7 +1382,7 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> ParallelFlowable<R> concatMapDelayError(
-            @NonNull Function<? super T, ? extends Publisher<? extends R>> mapper,
+            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
                     int prefetch, boolean tillTheEnd) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1419,7 +1419,7 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper) {
+    public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
         return flatMapIterable(mapper, Flowable.bufferSize());
     }
 
@@ -1455,7 +1455,7 @@ public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<? extends U>> mapper, int bufferSize) {
+    public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ParallelFlatMapIterable<>(this, mapper, bufferSize));
@@ -1486,7 +1486,7 @@ public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<? extends R>> mapper) {
+    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<@NonNull ? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ParallelMapOptional<>(this, mapper));
     }
@@ -1516,7 +1516,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<? extends R>> mapper, @NonNull ParallelFailureHandling errorHandler) {
+    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<@NonNull ? extends R>> mapper, @NonNull ParallelFailureHandling errorHandler) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTryOptional<>(this, mapper, errorHandler));
@@ -1548,7 +1548,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<? extends R>> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
+    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<@NonNull ? extends R>> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTryOptional<>(this, mapper, errorHandler));
@@ -1604,7 +1604,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
+    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
         return flatMapStream(mapper, Flowable.bufferSize());
     }
 
@@ -1658,7 +1658,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper, int prefetch) {
+    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ParallelFlatMapStream<>(this, mapper, prefetch));
@@ -1688,7 +1688,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <A, R> Flowable<R> collect(@NonNull Collector<T, A, R> collector) {
+    public final <A, @NonNull R> Flowable<R> collect(@NonNull Collector<T, A, R> collector) {
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ParallelCollector<>(this, collector));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
index 7e6a7734d0..a10a73ead4 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
@@ -23,7 +23,7 @@
  * @since 2.2
  */
 @FunctionalInterface
-public interface ParallelTransformer<Upstream, Downstream> {
+public interface ParallelTransformer<@NonNull Upstream, @NonNull Downstream> {
     /**
      * Applies a function to the upstream ParallelFlowable and returns a ParallelFlowable with
      * optionally different element type.
diff --git a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
index 9012e36f12..408eae8d36 100644
--- a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
@@ -918,7 +918,7 @@ public static void setOnSingleSubscribe(@Nullable BiFunction<? super Single, ? s
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> Subscriber<? super T> onSubscribe(@NonNull Flowable<T> source, @NonNull Subscriber<? super T> subscriber) {
+    public static <T> Subscriber<@NonNull ? super T> onSubscribe(@NonNull Flowable<T> source, @NonNull Subscriber<@NonNull ? super T> subscriber) {
         BiFunction<? super Flowable, ? super Subscriber, ? extends Subscriber> f = onFlowableSubscribe;
         if (f != null) {
             return apply(f, source, subscriber);
diff --git a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
index 3461c146d6..8037c67ffe 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
@@ -150,7 +150,7 @@ public static <T> AsyncProcessor<T> create() {
     }
 
     @Override
-    public void onSubscribe(Subscription s) {
+    public void onSubscribe(@NonNull Subscription s) {
         if (subscribers.get() == TERMINATED) {
             s.cancel();
             return;
@@ -160,7 +160,7 @@ public void onSubscribe(Subscription s) {
     }
 
     @Override
-    public void onNext(T t) {
+    public void onNext(@NonNull T t) {
         ExceptionHelper.nullCheck(t, "onNext called with a null value.");
         if (subscribers.get() == TERMINATED) {
             return;
@@ -170,7 +170,7 @@ public void onNext(T t) {
 
     @SuppressWarnings("unchecked")
     @Override
-    public void onError(Throwable t) {
+    public void onError(@NonNull Throwable t) {
         ExceptionHelper.nullCheck(t, "onError called with a null Throwable.");
         if (subscribers.get() == TERMINATED) {
             RxJavaPlugins.onError(t);
@@ -228,7 +228,7 @@ public Throwable getThrowable() {
     }
 
     @Override
-    protected void subscribeActual(Subscriber<? super T> s) {
+    protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> s) {
         AsyncSubscription<T> as = new AsyncSubscription<>(s, this);
         s.onSubscribe(as);
         if (add(as)) {
@@ -341,7 +341,7 @@ static final class AsyncSubscription<T> extends DeferredScalarSubscription<T> {
 
         final AsyncProcessor<T> parent;
 
-        AsyncSubscription(Subscriber<? super T> actual, AsyncProcessor<T> parent) {
+        AsyncSubscription(Subscriber<@NonNull ? super T> actual, AsyncProcessor<T> parent) {
             super(actual);
             this.parent = parent;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index 0b7e49ae2f..de5d744f3f 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -239,7 +239,7 @@ public static <T> BehaviorProcessor<T> create() {
     }
 
     @Override
-    protected void subscribeActual(@NonNull Subscriber<? super T> s) {
+    protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> s) {
         BehaviorSubscription<T> bs = new BehaviorSubscription<>(s, this);
         s.onSubscribe(bs);
         if (add(bs)) {
@@ -475,11 +475,11 @@ void setCurrent(Object o) {
         wl.unlock();
     }
 
-    static final class BehaviorSubscription<T> extends AtomicLong implements Subscription, NonThrowingPredicate<Object> {
+    static final class BehaviorSubscription<@NonNull T> extends AtomicLong implements Subscription, NonThrowingPredicate<Object> {
 
         private static final long serialVersionUID = 3293175281126227086L;
 
-        final Subscriber<? super T> downstream;
+        final Subscriber<@NonNull ? super T> downstream;
         final BehaviorProcessor<T> state;
 
         boolean next;
@@ -492,7 +492,7 @@ static final class BehaviorSubscription<T> extends AtomicLong implements Subscri
 
         long index;
 
-        BehaviorSubscription(Subscriber<? super T> actual, BehaviorProcessor<T> state) {
+        BehaviorSubscription(Subscriber<@NonNull ? super T> actual, BehaviorProcessor<T> state) {
             this.downstream = actual;
             this.state = state;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
index 80db65e652..86622298f6 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
@@ -26,7 +26,7 @@
  *
  * @param <T> the item value type
  */
-public abstract class FlowableProcessor<T> extends Flowable<T> implements Processor<T, T>, FlowableSubscriber<T> {
+public abstract class FlowableProcessor<@NonNull T> extends Flowable<T> implements Processor<T, T>, FlowableSubscriber<T> {
 
     /**
      * Returns true if the FlowableProcessor has subscribers.
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index 7a6809b5d2..7ef61d7959 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -375,7 +375,7 @@ public Throwable getThrowable() {
     }
 
     @Override
-    protected void subscribeActual(@NonNull Subscriber<? super T> s) {
+    protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> s) {
         MulticastSubscription<T> ms = new MulticastSubscription<>(s, this);
         s.onSubscribe(ms);
         if (add(ms)) {
@@ -593,13 +593,13 @@ static final class MulticastSubscription<T> extends AtomicLong implements Subscr
 
         private static final long serialVersionUID = -363282618957264509L;
 
-        final Subscriber<? super T> downstream;
+        final Subscriber<@NonNull ? super T> downstream;
 
         final MulticastProcessor<T> parent;
 
         long emitted;
 
-        MulticastSubscription(Subscriber<? super T> actual, MulticastProcessor<T> parent) {
+        MulticastSubscription(Subscriber<@NonNull ? super T> actual, MulticastProcessor<T> parent) {
             this.downstream = actual;
             this.parent = parent;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
index 0a73cf1bf8..b507a2225b 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
@@ -141,7 +141,7 @@ public static <T> PublishProcessor<T> create() {
     }
 
     @Override
-    protected void subscribeActual(@NonNull Subscriber<? super T> t) {
+    protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> t) {
         PublishSubscription<T> ps = new PublishSubscription<>(t, this);
         t.onSubscribe(ps);
         if (add(ps)) {
@@ -336,11 +336,11 @@ public boolean hasComplete() {
      *
      * @param <T> the value type
      */
-    static final class PublishSubscription<T> extends AtomicLong implements Subscription {
+    static final class PublishSubscription<@NonNull T> extends AtomicLong implements Subscription {
 
         private static final long serialVersionUID = 3562861878281475070L;
         /** The actual subscriber. */
-        final Subscriber<? super T> downstream;
+        final Subscriber<@NonNull ? super T> downstream;
         /** The parent processor servicing this subscriber. */
         final PublishProcessor<T> parent;
 
@@ -349,7 +349,7 @@ static final class PublishSubscription<T> extends AtomicLong implements Subscrip
          * @param actual the actual subscriber
          * @param parent the parent PublishProcessor
          */
-        PublishSubscription(Subscriber<? super T> actual, PublishProcessor<T> parent) {
+        PublishSubscription(Subscriber<@NonNull ? super T> actual, PublishProcessor<T> parent) {
             this.downstream = actual;
             this.parent = parent;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index 6e903e5aab..aa3402ec13 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -345,7 +345,7 @@ public static <T> ReplayProcessor<T> createWithTimeAndSize(long maxAge, @NonNull
     }
 
     @Override
-    protected void subscribeActual(Subscriber<? super T> s) {
+    protected void subscribeActual(Subscriber<@NonNull ? super T> s) {
         ReplaySubscription<T> rs = new ReplaySubscription<>(s, this);
         s.onSubscribe(rs);
 
@@ -615,7 +615,7 @@ interface ReplayBuffer<T> {
     static final class ReplaySubscription<T> extends AtomicInteger implements Subscription {
 
         private static final long serialVersionUID = 466549804534799122L;
-        final Subscriber<? super T> downstream;
+        final Subscriber<@NonNull ? super T> downstream;
         final ReplayProcessor<T> state;
 
         Object index;
@@ -626,7 +626,7 @@ static final class ReplaySubscription<T> extends AtomicInteger implements Subscr
 
         long emitted;
 
-        ReplaySubscription(Subscriber<? super T> actual, ReplayProcessor<T> state) {
+        ReplaySubscription(Subscriber<@NonNull ? super T> actual, ReplayProcessor<T> state) {
             this.downstream = actual;
             this.state = state;
             this.requested = new AtomicLong();
@@ -728,7 +728,7 @@ public void replay(ReplaySubscription<T> rs) {
 
             int missed = 1;
             final List<T> b = buffer;
-            final Subscriber<? super T> a = rs.downstream;
+            final Subscriber<@NonNull ? super T> a = rs.downstream;
 
             Integer indexObject = (Integer)rs.index;
             int index;
@@ -967,7 +967,7 @@ public void replay(ReplaySubscription<T> rs) {
             }
 
             int missed = 1;
-            final Subscriber<? super T> a = rs.downstream;
+            final Subscriber<@NonNull ? super T> a = rs.downstream;
 
             Node<T> index = (Node<T>)rs.index;
             if (index == null) {
@@ -1257,7 +1257,7 @@ public void replay(ReplaySubscription<T> rs) {
             }
 
             int missed = 1;
-            final Subscriber<? super T> a = rs.downstream;
+            final Subscriber<@NonNull ? super T> a = rs.downstream;
 
             TimedNode<T> index = (TimedNode<T>)rs.index;
             if (index == null) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
index a1af942d8d..7d7e20a075 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
@@ -159,7 +159,7 @@ public final class UnicastProcessor<T> extends FlowableProcessor<T> {
 
     Throwable error;
 
-    final AtomicReference<Subscriber<? super T>> downstream;
+    final AtomicReference<Subscriber<@NonNull ? super T>> downstream;
 
     volatile boolean cancelled;
 
@@ -282,7 +282,7 @@ void doTerminate() {
         }
     }
 
-    void drainRegular(Subscriber<? super T> a) {
+    void drainRegular(Subscriber<@NonNull ? super T> a) {
         int missed = 1;
 
         final SpscLinkedArrayQueue<T> q = queue;
@@ -326,7 +326,7 @@ void drainRegular(Subscriber<? super T> a) {
         }
     }
 
-    void drainFused(Subscriber<? super T> a) {
+    void drainFused(Subscriber<@NonNull ? super T> a) {
         int missed = 1;
 
         final SpscLinkedArrayQueue<T> q = queue;
@@ -374,7 +374,7 @@ void drain() {
 
         int missed = 1;
 
-        Subscriber<? super T> a = downstream.get();
+        Subscriber<@NonNull ? super T> a = downstream.get();
         for (;;) {
             if (a != null) {
 
@@ -394,7 +394,7 @@ void drain() {
         }
     }
 
-    boolean checkTerminated(boolean failFast, boolean d, boolean empty, Subscriber<? super T> a, SpscLinkedArrayQueue<T> q) {
+    boolean checkTerminated(boolean failFast, boolean d, boolean empty, Subscriber<@NonNull ? super T> a, SpscLinkedArrayQueue<T> q) {
         if (cancelled) {
             q.clear();
             downstream.lazySet(null);
@@ -475,7 +475,7 @@ public void onComplete() {
     }
 
     @Override
-    protected void subscribeActual(Subscriber<? super T> s) {
+    protected void subscribeActual(Subscriber<@NonNull ? super T> s) {
         if (!once.get() && once.compareAndSet(false, true)) {
 
             s.onSubscribe(wip);
diff --git a/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
index 6fb50a141b..ed1080023f 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
@@ -25,6 +25,7 @@
 import io.reactivex.rxjava3.flowables.ConnectableFlowable;
 import io.reactivex.rxjava3.observables.ConnectableObservable;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.*;
@@ -172,6 +173,11 @@ public void checkMulticastProcessor() throws Exception {
         processFile(MulticastProcessor.class);
     }
 
+    @Test
+    public void checkRxJavaPlugins() throws Exception {
+        processFile(RxJavaPlugins.class);
+    }
+
     static void processFile(Class<?> clazz) throws Exception {
         String baseClassName = clazz.getSimpleName();
         File f = TestHelper.findSource(baseClassName, clazz.getPackage().getName());
@@ -376,6 +382,26 @@ else if (skippingDepth == 0) {
                     ;
                 }
             }
+
+            for (String typeName : TYPES_REQUIRING_NONNULL_TYPEARG) {
+                String pattern = typeName + "<?";
+                if (line.contains(pattern)) {
+                    errorCount++;
+                    errors.append("L")
+                    .append(j)
+                    .append(" : Missing @NonNull type argument annotation on ")
+                    .append(typeName)
+                    .append("\r\n")
+                    .append(" at ")
+                    .append(fullClassName)
+                    .append(".method(")
+                    .append(f.getName())
+                    .append(":")
+                    .append(j + 1)
+                    .append(")\r\n")
+                    ;
+                }
+            }
         }
 
         if (errorCount != 0) {
@@ -417,4 +443,8 @@ else if (skippingDepth == 0) {
 
             "T", "R", "U", "V"
     );
+
+    static final List<String> TYPES_REQUIRING_NONNULL_TYPEARG = Arrays.asList(
+            "Iterable", "Stream", "Publisher", "Subscriber", "Processor"
+    );
 }

From 9ed54168db22da80c5c75495ab3dde9a64faa06d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 14 Jan 2020 12:47:15 +0100
Subject: [PATCH 049/665] 3.x: Improve wording of operators (#6843)

---
 .../reactivex/rxjava3/core/Completable.java   |   6 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 225 ++++++++++--------
 .../java/io/reactivex/rxjava3/core/Maybe.java | 225 +++++++++---------
 .../io/reactivex/rxjava3/core/Observable.java |  38 +--
 .../io/reactivex/rxjava3/core/Single.java     | 101 ++++----
 .../rxjava3/validators/JavadocWording.java    |  34 ++-
 6 files changed, 337 insertions(+), 292 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 3e8c84835f..7e788ea3b9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -1596,7 +1596,7 @@ public final Completable doOnEvent(@NonNull Consumer<@Nullable ? super Throwable
      * </dl>
      * @param onSubscribe the consumer called when a {@link CompletableObserver} subscribes.
      * @param onError the consumer called when this emits an {@code onError} event
-     * @param onComplete the runnable called just before when the upstream {@code Completable} completes normally
+     * @param onComplete the runnable called just before when the current {@code Completable} completes normally
      * @param onAfterTerminate the runnable called after this {@code Completable} completes normally
      * @param onDispose the {@link Runnable} called when the downstream disposes the subscription
      * @return the new {@code Completable} instance
@@ -1834,7 +1834,7 @@ public final Completable doFinally(@NonNull Action onFinally) {
      * <p>
      * Note also that it is not possible to stop the subscription phase in {@code lift()} as the {@code apply()} method
      * requires a non-{@code null} {@code CompletableObserver} instance to be returned, which is then unconditionally subscribed to
-     * the upstream {@code Completable}. For example, if the operator decided there is no reason to subscribe to the
+     * the current {@code Completable}. For example, if the operator decided there is no reason to subscribe to the
      * upstream source because of some optimization possibility or a failure to prepare the operator, it still has to
      * return a {@code CompletableObserver} that should immediately dispose the upstream's {@link Disposable} in its
      * {@code onSubscribe} method. Again, using a {@code CompletableTransformer} and extending the {@code Completable} is
@@ -2692,7 +2692,7 @@ public final <T> Flowable<T> toFlowable() {
      *
      * @param <T> the value type
      * @return a {@code Maybe} that only calls {@code onComplete} or {@code onError}, based on which one is
-     *         called by the source {@code Completable}.
+     *         called by the current {@code Completable}.
      */
     @CheckReturnValue
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 486b0cb629..c1f4338cd2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -7270,9 +7270,9 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
     }
 
     /**
-     * Transform a {@link Publisher} by applying a particular Transformer function to it.
+     * Transform the current {@code Flowable} by applying a particular {@link FlowableTransformer} function to it.
      * <p>
-     * This method operates on the {@code Publisher} itself whereas {@link #lift} operates on the {@code Publisher}'s
+     * This method operates on the {@code Flowable} itself whereas {@link #lift} operates on the {@code Flowable}'s
      * {@link Subscriber}s.
      * <p>
      * If the operator you are creating is designed to act on the individual items emitted by a current
@@ -7281,7 +7281,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with the backpressure behavior which only depends
-     *  on what kind of {@code Publisher} the transformer returns.</dd>
+     *  on what kind of {@link Publisher} the {@code FlowableTransformer} returns.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code compose} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -9392,7 +9392,7 @@ public final Flowable<T> doOnCancel(@NonNull Action onCancel) {
     }
 
     /**
-     * Modifies the current {@code Flowable} so that it invokes an action when it calls {@code onComplete}.
+     * Invokes an {@link Action} just before the current {@code Flowable} calls {@code onComplete}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.png" alt="">
      * <dl>
@@ -9449,7 +9449,8 @@ private Flowable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Consu
     }
 
     /**
-     * Modifies the current {@code Flowable} so that it invokes an action for each item it emits.
+     * Invokes a {@link Consumer} with a {@link Notification} instances matching the signals emitted by the current {@code Flowable}
+     * before they are forwarded to the downstream.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
      * <dl>
@@ -9481,7 +9482,8 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
     }
 
     /**
-     * Modifies the current {@code Flowable} so that it notifies a {@link Subscriber} for each item and terminal event it emits.
+     * Calls the appropriate methods of the given {@link Subscriber} when the current {@code Flowable} signals events before forwarding it
+     * to the downstream.
      * <p>
      * In case the {@code onError} of the supplied {@code Subscriber} throws, the downstream will receive a composite
      * exception containing the original exception and the exception thrown by {@code onError}. If either the
@@ -9518,7 +9520,8 @@ public final Flowable<T> doOnEach(@NonNull Subscriber<@NonNull ? super T> subscr
     }
 
     /**
-     * Modifies the current {@code Flowable} so that it invokes an action if it calls {@code onError}.
+     * Calls the given {@link Consumer} with the error {@link Throwable} if the current {@code Flowable} failed before forwarding it to
+     * the downstream.
      * <p>
      * In case the {@code onError} action throws, the downstream will receive a composite exception containing
      * the original exception and the exception thrown by {@code onError}.
@@ -9583,7 +9586,7 @@ public final Flowable<T> doOnLifecycle(@NonNull Consumer<? super Subscription> o
     }
 
     /**
-     * Modifies the current {@code Flowable} so that it invokes an action when it calls {@code onNext}.
+     * Calls the given {@link Consumer} with the value emitted by the current {@code Flowable} before forwarding it to the downstream.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.png" alt="">
      * <dl>
@@ -9599,6 +9602,7 @@ public final Flowable<T> doOnLifecycle(@NonNull Consumer<? super Subscription> o
      * @return the current {@code Flowable} with the side-effecting behavior applied
      * @throws NullPointerException if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
+     * @see #doAfterNext(Consumer)
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
@@ -9610,8 +9614,8 @@ public final Flowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Modifies the current {@code Flowable} so that it invokes the given action when it receives a
-     * request for more items.
+     * Calls the given {@link LongConsumer} with the request amount from the downstream before forwarding it
+     * to the current {@code Flowable}.
      * <p>
      * <b>Note:</b> This operator is for tracing the internal behavior of back-pressure request
      * patterns and generally intended for debugging use.
@@ -9641,10 +9645,9 @@ public final Flowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
     }
 
     /**
-     * Modifies the current {@code Flowable} so that it invokes the given action when it is subscribed from
-     * its subscribers. Each subscription will result in an invocation of the given action except when the
-     * current {@code Flowable} is reference counted, in which case the current {@code Flowable} will invoke
-     * the given action for the first subscription.
+     * Calls the given {@link Consumer} with the {@link Subscription} provided by the current {@code Flowable} upon
+     * subscription from the downstream before forwarding it to the subscriber's
+     * {@link Subscriber#onSubscribe(Subscription) onSubscribe} method.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSubscribe.png" alt="">
      * <dl>
@@ -9656,7 +9659,7 @@ public final Flowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
      * </dl>
      *
      * @param onSubscribe
-     *            the {@link Consumer} that gets called when a {@link Subscriber} subscribes to the current {@code Flowable}
+     *            the {@code Consumer} that gets called when a {@link Subscriber} subscribes to the current {@code Flowable}
      * @return the current {@code Flowable} modified so as to call this {@code Consumer} when appropriate
      * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
@@ -9670,8 +9673,8 @@ public final Flowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> o
     }
 
     /**
-     * Modifies the current {@code Flowable} so that it invokes an action when it calls {@code onComplete} or
-     * {@code onError}.
+     * Calls the given {@link Action} when the current {@code Flowable} completes normally or with an error before those signals
+     * are forwarded to the downstream.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.png" alt="">
      * <p>
@@ -9798,7 +9801,7 @@ public final Single<T> elementAtOrError(long index) {
     }
 
     /**
-     * Filters items emitted by a {@link Publisher} by only emitting those that satisfy a specified predicate.
+     * Filters items emitted by the current {@code Flowable} by only emitting those that satisfy a specified predicate.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.png" alt="">
      * <dl>
@@ -10917,7 +10920,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
     }
 
     /**
-     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * Groups the items emitted by the current {@code Flowable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
@@ -10978,7 +10981,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
     }
 
     /**
-     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * Groups the items emitted by the current {@code Flowable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
@@ -11044,7 +11047,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     }
 
     /**
-     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * Groups the items emitted by the current {@code Flowable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
@@ -11111,7 +11114,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     }
 
     /**
-     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * Groups the items emitted by the current {@code Flowable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
@@ -11185,7 +11188,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     }
 
     /**
-     * Groups the items emitted by a {@link Publisher} according to a specified criterion, and emits these
+     * Groups the items emitted by the current {@code Flowable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedFlowable}s. The emitted {@code GroupedFlowable} allows only a single
      * {@link Subscriber} during its lifetime and if this {@code Subscriber} cancels before the
      * source terminates, the next emission by the source having the same key will trigger a new
@@ -11893,7 +11896,7 @@ public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
     }
 
     /**
-     * Modifies a {@link Publisher} to perform its emissions and notifications on a specified {@link Scheduler},
+     * Signals the items and terminal signals of the current {@code Flowable} on the specified {@link Scheduler},
      * asynchronously with a bounded buffer of {@link #bufferSize()} slots.
      *
      * <p>Note that {@code onError} notifications will cut ahead of {@code onNext} notifications on the emission thread if {@code Scheduler} is truly
@@ -11945,7 +11948,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Modifies a {@link Publisher} to perform its emissions and notifications on a specified {@link Scheduler},
+     * Signals the items and terminal signals of the current {@code Flowable} on the specified {@link Scheduler},
      * asynchronously with a bounded buffer and optionally delays {@code onError} notifications.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
@@ -11998,7 +12001,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
     }
 
     /**
-     * Modifies a {@link Publisher} to perform its emissions and notifications on a specified {@link Scheduler},
+     * Signals the items and terminal signals of the current {@code Flowable} on the specified {@link Scheduler},
      * asynchronously with a bounded buffer of configurable size and optionally delays {@code onError} notifications.
      * <p>
      * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
@@ -12055,7 +12058,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
     }
 
     /**
-     * Filters the items emitted by a {@link Publisher}, only emitting those of the specified type.
+     * Filters the items emitted by the current {@code Flowable}, only emitting those of the specified type.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.png" alt="">
      * <dl>
@@ -12083,10 +12086,13 @@ public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer these
-     * items indefinitely until they can be emitted.
+     * Buffers an unlimited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <p>
+     * An error from the current {@code Flowable} will cut ahead of any unconsumed item. Use {@link #onBackpressureBuffer(boolean)}
+     * to have the operator keep the original signal order.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12097,6 +12103,7 @@ public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
      *
      * @return the current {@code Flowable} modified to buffer items to the extent system resources allow
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
+     * #see {@link #onBackpressureBuffer(boolean)}
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -12107,8 +12114,8 @@ public final Flowable<T> onBackpressureBuffer() {
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer these
-     * items indefinitely until they can be emitted.
+     * Buffers an unlimited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place, optionally delaying an error until all buffered items have been consumed.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
@@ -12134,12 +12141,15 @@ public final Flowable<T> onBackpressureBuffer(boolean delayError) {
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
-     * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
-     * items, and canceling the source.
+     * Buffers an limited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place, however, the resulting {@code Flowable} will signal a
+     * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
+     * items, and canceling the flow.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <p>
+     * An error from the current {@code Flowable} will cut ahead of any unconsumed item. Use {@link #onBackpressureBuffer(int, boolean)}
+     * to have the operator keep the original signal order.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12153,6 +12163,7 @@ public final Flowable<T> onBackpressureBuffer(boolean delayError) {
      * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
+     * @see #onBackpressureBuffer(long, Action, BackpressureOverflowStrategy)
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
@@ -12163,10 +12174,10 @@ public final Flowable<T> onBackpressureBuffer(int capacity) {
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
-     * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
-     * items, and canceling the source.
+     * Buffers an limited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place, however, the resulting {@code Flowable} will signal a
+     * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
+     * items, and canceling the flow.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
@@ -12196,10 +12207,11 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
-     * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
-     * items, and canceling the source.
+     * Buffers an optionally unlimited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place.
+     * If {@code unbounded} is {@code true}, the resulting {@code Flowable} will signal a
+     * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
+     * items, and canceling the flow.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
@@ -12232,10 +12244,11 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
-     * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
-     * items, canceling the source, and notifying the producer with {@code onOverflow}.
+     * Buffers an optionally unlimited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place.
+     * If {@code unbounded} is {@code true}, the resulting {@code Flowable} will signal a
+     * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
+     * items, canceling the flow and calling the {@code onOverflow} action.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
@@ -12253,7 +12266,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
      *                any buffered element
      * @param unbounded
      *                if {@code true}, the capacity value is interpreted as the internal "island" size of the unbounded buffer
-     * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots.  Null is allowed.
+     * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots.
      * @return the current {@code Flowable} modified to buffer items up to the given capacity
      * @throws NullPointerException if {@code onOverflow} is {@code null}
      * @throws IllegalArgumentException if {@code capacity} is non-positive
@@ -12272,10 +12285,10 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Flowable} will signal
-     * a {@code BufferOverflowException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
-     * items, canceling the source, and notifying the producer with {@code onOverflow}.
+     * Buffers an limited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place, however, the resulting {@code Flowable} will signal a
+     * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
+     * items, canceling the flow and calling the {@code onOverflow} action.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
      * <dl>
@@ -12303,10 +12316,9 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to buffer up to
-     * a given amount of items until they can be emitted. The resulting {@code Flowable} will behave as determined
-     * by {@code overflowStrategy} if the buffer capacity is exceeded.
-     *
+     * Buffers an optionally unlimited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place.
+     * The resulting {@code Flowable} will behave as determined by {@code overflowStrategy} if the buffer capacity is exceeded:
      * <ul>
      *     <li>{@link BackpressureOverflowStrategy#ERROR} (default) will call {@code onError} dropping all undelivered items,
      *     canceling the source, and notifying the producer with {@code onOverflow}. </li>
@@ -12330,7 +12342,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
      *
      * @param capacity number of slots available in the buffer.
      * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots, {@code null} is allowed.
-     * @param overflowStrategy how should the {@code Publisher} react to buffer overflows, {@code null} is not allowed.
+     * @param overflowStrategy how should the resulting {@code Flowable} react to buffer overflows, {@code null} is not allowed.
      * @return the source {@code Flowable} modified to buffer items up to the given capacity
      * @throws NullPointerException if {@code onOverflow} or {@code overflowStrategy} is {@code null}
      * @throws IllegalArgumentException if {@code capacity} is non-positive
@@ -12348,13 +12360,13 @@ public final Flowable<T> onBackpressureBuffer(long capacity, @Nullable Action on
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to discard,
-     * rather than emit, those items that its {@code Subscriber} is not prepared to observe.
+     * Drops items from the current {@code Flowable} if the downstream is not ready to receive new items (indicated
+     * by a lack of {@link Subscription#request(long)} calls from it).
      * <p>
      * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.drop.png" alt="">
      * <p>
-     * If the downstream request count hits 0 then the {@code Publisher} will refrain from calling {@code onNext} until
-     * the {@code Subscriber} invokes {@code request(n)} again to increase the request count.
+     * If the downstream request count hits 0 then the resulting {@code Flowable} will refrain from calling {@code onNext} until
+     * the {@link Subscriber} invokes {@code request(n)} again to increase the request count.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12375,13 +12387,14 @@ public final Flowable<T> onBackpressureDrop() {
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to discard,
-     * rather than emit, those items that its {@code Subscriber} is not prepared to observe.
+     * Drops items from the current {@code Flowable} if the downstream is not ready to receive new items (indicated
+     * by a lack of {@link Subscription#request(long)} calls from it) and calls the given {@link Consumer} with such
+     * dropped items.
      * <p>
      * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.drop.png" alt="">
      * <p>
-     * If the downstream request count hits 0 then the {@code Publisher} will refrain from calling {@code onNext} until
-     * the {@code Subscriber} invokes {@code request(n)} again to increase the request count.
+     * If the downstream request count hits 0 then the resulting {@code Flowable} will refrain from calling {@code onNext} until
+     * the {@link Subscriber} invokes {@code request(n)} again to increase the request count.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12406,8 +12419,9 @@ public final Flowable<T> onBackpressureDrop(@NonNull Consumer<? super T> onDrop)
     }
 
     /**
-     * Instructs a {@link Publisher} that is emitting items faster than its {@link Subscriber} can consume them to
-     * hold onto the latest value and emit that on request.
+     * Drops all but the latest item emitted by the current {@code Flowable} if the downstream is not ready to receive
+     * new items (indicated by a lack of {@link Subscription#request(long)} calls from it) and emits this latest
+     * item when the downstream becomes ready.
      * <p>
      * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.latest.png" alt="">
      * <p>
@@ -12439,8 +12453,8 @@ public final Flowable<T> onBackpressureLatest() {
     }
 
     /**
-     * Instructs a {@link Publisher} to pass control to another {@code Publisher} rather than invoking
-     * {@link Subscriber#onError onError} if it encounters an error.
+     * Resumes the flow with a {@link Publisher} returned for the failure {@link Throwable} of the current {@code Flowable} by a
+     * function instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
@@ -12484,8 +12498,8 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
     }
 
     /**
-     * Instructs a {@link Publisher} to pass control to another {@code Publisher} rather than invoking
-     * {@link Subscriber#onError onError} if it encounters an error.
+     * Resumes the flow with the given {@link Publisher} when the current {@code Flowable} fails instead of
+     * signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
@@ -12529,12 +12543,12 @@ public final Flowable<T> onErrorResumeWith(@NonNull Publisher<@NonNull ? extends
     }
 
     /**
-     * Instructs a {@link Publisher} to emit an item (returned by a specified function) rather than invoking
-     * {@link Subscriber#onError onError} if it encounters an error.
+     * Ends the flow with a last item returned by a function for the {@link Throwable} error signaled by the current
+     * {@code Flowable} instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
      * <p>
-     * By default, when a {@code Publisher} encounters an error that prevents it from emitting the expected item to
+     * By default, when a {@link Publisher} encounters an error that prevents it from emitting the expected item to
      * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
      * without invoking any more of its {@code Subscriber}'s methods. The {@code onErrorReturn} method changes this
      * behavior. If you pass a function ({@code resumeFunction}) to a {@code Publisher}'s {@code onErrorReturn}
@@ -12570,12 +12584,11 @@ public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? ex
     }
 
     /**
-     * Instructs a {@link Publisher} to emit an item (returned by a specified function) rather than invoking
-     * {@link Subscriber#onError onError} if it encounters an error.
+     * Ends the flow with the given last item when the current {@code Flowable} fails instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
      * <p>
-     * By default, when a {@code Publisher} encounters an error that prevents it from emitting the expected item to
+     * By default, when a {@link Publisher} encounters an error that prevents it from emitting the expected item to
      * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
      * without invoking any more of its {@code Subscriber}'s methods. The {@code onErrorReturn} method changes this
      * behavior. If you pass a function ({@code resumeFunction}) to a {@code Publisher}'s {@code onErrorReturn}
@@ -14562,10 +14575,10 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Forces a {@link Publisher}'s emissions and notifications to be serialized and for it to obey
+     * Forces the current {@code Flowable}'s emissions and notifications to be serialized and for it to obey
      * <a href="http://reactivex.io/documentation/contract.html">the {@code Publisher} contract</a> in other ways.
      * <p>
-     * It is possible for a {@code Publisher} to invoke its {@link Subscriber}s' methods asynchronously, perhaps from
+     * It is possible for a {@link Publisher} to invoke its {@link Subscriber}s' methods asynchronously, perhaps from
      * different threads. This could make such a {@code Publisher} poorly-behaved, in that it might try to invoke
      * {@code onComplete} or {@code onError} before one of its {@code onNext} invocations, or it might call
      * {@code onNext} from two different threads concurrently. You can force such a {@code Publisher} to be
@@ -15273,7 +15286,7 @@ public final Flowable<T> startWithArray(@NonNull T... items) {
     }
 
     /**
-     * Subscribes to a {@link Publisher} and ignores {@code onNext} and {@code onComplete} emissions.
+     * Subscribes to the current {@code Flowable} and ignores {@code onNext} and {@code onComplete} emissions.
      * <p>
      * If the {@code Flowable} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
@@ -15287,7 +15300,7 @@ public final Flowable<T> startWithArray(@NonNull T... items) {
      * </dl>
      *
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the {@code Publisher} has finished sending them
+     *         the current {@code Flowable} has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -15298,7 +15311,7 @@ public final Disposable subscribe() {
     }
 
     /**
-     * Subscribes to a {@link Publisher} and provides a callback to handle the items it emits.
+     * Subscribes to the current {@code Flowable} and provides a callback to handle the items it emits.
      * <p>
      * If the {@code Flowable} emits an error, it is wrapped into an
      * {@link io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException OnErrorNotImplementedException}
@@ -15312,9 +15325,9 @@ public final Disposable subscribe() {
      * </dl>
      *
      * @param onNext
-     *             the {@code Consumer<T>} you have designed to accept emissions from the {@code Publisher}
+     *             the {@code Consumer<T>} you have designed to accept emissions from the current {@code Flowable}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the {@code Publisher} has finished sending them
+     *         the current {@code Flowable} has finished sending them
      * @throws NullPointerException
      *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
@@ -15328,7 +15341,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
     }
 
     /**
-     * Subscribes to a {@link Publisher} and provides callbacks to handle the items it emits and any error
+     * Subscribes to the current {@code Flowable} and provides callbacks to handle the items it emits and any error
      * notification it issues.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -15339,12 +15352,12 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
      * </dl>
      *
      * @param onNext
-     *             the {@code Consumer<T>} you have designed to accept emissions from the {@code Publisher}
+     *             the {@code Consumer<T>} you have designed to accept emissions from the current {@code Flowable}
      * @param onError
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
-     *             {@code Publisher}
+     *             current {@code Flowable}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the {@code Publisher} has finished sending them
+     *         the current {@code Flowable} has finished sending them
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onNext} or {@code onError} is {@code null}
@@ -15358,7 +15371,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
     }
 
     /**
-     * Subscribes to a {@link Publisher} and provides callbacks to handle the items it emits and any error or
+     * Subscribes to the current {@code Flowable} and provides callbacks to handle the items it emits and any error or
      * completion notification it issues.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -15369,15 +15382,15 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
      * </dl>
      *
      * @param onNext
-     *             the {@code Consumer<T>} you have designed to accept emissions from the {@code Publisher}
+     *             the {@code Consumer<T>} you have designed to accept emissions from the current {@code Flowable}
      * @param onError
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
-     *             {@code Publisher}
+     *             current {@code Flowable}
      * @param onComplete
      *             the {@link Action} you have designed to accept a completion notification from the
-     *             {@code Publisher}
+     *             the current {@code Flowable}
      * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the {@code Publisher} has finished sending them
+     *         the current {@code Flowable} has finished sending them
      * @throws NullPointerException
      *             if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
@@ -17549,9 +17562,9 @@ public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.png" alt="">
      * <p>
      * Normally, a {@code Publisher} that returns multiple items will do so by invoking its {@link Subscriber}'s
-     * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * {@code Publisher} to compose a list of all of these items and then to invoke the {@code Subscriber}'s {@code onNext}
-     * function once, passing it the entire list, by calling the {@code Publisher}'s {@code toList} method prior to
+     * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior by having the
+     * operator compose a list of all of these items and then to invoke the {@link SingleObserver}'s {@code onSuccess}
+     * method once, passing it the entire list, by calling the {@code Flowable}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
@@ -17584,9 +17597,9 @@ public final Single<List<T>> toList() {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.png" alt="">
      * <p>
      * Normally, a {@code Publisher} that returns multiple items will do so by invoking its {@link Subscriber}'s
-     * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * {@code Publisher} to compose a list of all of these items and then to invoke the {@code Subscriber}'s {@code onNext}
-     * function once, passing it the entire list, by calling the {@code Publisher}'s {@code toList} method prior to
+     * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior by having the
+     * operator compose a list of all of these items and then to invoke the {@link SingleObserver}'s {@code onSuccess}
+     * method once, passing it the entire list, by calling the {@code Flowable}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
@@ -17623,9 +17636,9 @@ public final Single<List<T>> toList(int capacityHint) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.png" alt="">
      * <p>
      * Normally, a {@code Publisher} that returns multiple items will do so by invoking its {@link Subscriber}'s
-     * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * {@code Publisher} to compose a list of all of these items and then to invoke the {@code Subscriber}'s {@code onNext}
-     * function once, passing it the entire list, by calling the {@code Publisher}'s {@code toList} method prior to
+     * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior by having the
+     * operator compose a collection of all of these items and then to invoke the {@link SingleObserver}'s {@code onSuccess}
+     * method once, passing it the entire collection, by calling the {@code Flowable}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated collection to
@@ -18105,8 +18118,12 @@ public final Single<List<T>> toSortedList(int capacityHint) {
     }
 
     /**
-     * Modifies the current {@code Flowable} so that subscribers will cancel it on a specified
-     * {@link Scheduler}.
+     * Cancels the current {@code Flowable} asynchronously by invoking {@link Subscription#cancel()}
+     * on the specified {@link Scheduler}.
+     * <p>
+     * The operator suppresses signals from the current {@code Flowable} immediately when the
+     * downstream cancels the flow because the actual cancellation itself could take an arbitrary amount of time
+     * to take effect and make the flow stop producing items.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 6865558c05..ad4e824893 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -420,7 +420,7 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? exten
     /**
      * Concatenates a sequence of {@link MaybeSource} eagerly into a {@link Flowable} sequence.
      * <p>
-     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * Eager concatenation means that once an observer subscribes, this operator subscribes to all of the
      * source {@code MaybeSource}s. The operator buffers the value emitted by these {@code MaybeSource}s and then drains them
      * in order, each one after the previous one completes.
      * <p>
@@ -504,7 +504,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     /**
      * Concatenates a sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence.
      * <p>
-     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * Eager concatenation means that once an observer subscribes, this operator subscribes to all of the
      * source {@code MaybeSource}s. The operator buffers the values emitted by these {@code MaybeSource}s and then drains them
      * in order, each one after the previous one completes.
      * <p>
@@ -2537,7 +2537,7 @@ public final <U> Maybe<U> cast(@NonNull Class<? extends U> clazz) {
      * This method operates on the {@code Maybe} itself whereas {@link #lift} operates on the {@code Maybe}'s {@link MaybeObserver}s.
      * <p>
      * If the operator you are creating is designed to act on the individual item emitted by a {@code Maybe}, use
-     * {@link #lift}. If your operator is designed to transform the source {@code Maybe} as a whole (for instance, by
+     * {@link #lift}. If your operator is designed to transform the current {@code Maybe} as a whole (for instance, by
      * applying a particular set of existing RxJava operators to it) use {@code compose}.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -2559,7 +2559,7 @@ public final <R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends
     }
 
     /**
-     * Returns a {@code Maybe} that is based on applying a specified function to the item emitted by the source {@code Maybe},
+     * Returns a {@code Maybe} that is based on applying a specified function to the item emitted by the current {@code Maybe},
      * where that function returns a {@link MaybeSource}.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
@@ -2570,8 +2570,8 @@ public final <R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends
      * <p>Note that flatMap and concatMap for {@code Maybe} is the same operation.
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a {@code MaybeSource}
-     * @return the {@code Maybe} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a {@code MaybeSource}
+     * @return the {@code Maybe} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @throws NullPointerException if {@code mapper} is {@code null}
      */
@@ -2612,7 +2612,7 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
     }
 
     /**
-     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether the source {@code Maybe} emitted a
+     * Returns a {@link Single} that emits a {@link Boolean} that indicates whether the current {@code Maybe} emitted a
      * specified item.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.contains.o.png" alt="">
@@ -2622,9 +2622,9 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
      * </dl>
      *
      * @param item
-     *            the item to search for in the emissions from the source {@code Maybe}, not {@code null}
-     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the source {@code Maybe},
-     *         or {@code false} if the source {@code Maybe} completes without emitting that item
+     *            the item to search for in the emissions from the current {@code Maybe}, not {@code null}
+     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the current {@code Maybe},
+     *         or {@code false} if the current {@code Maybe} completes without emitting that item
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
@@ -2637,7 +2637,7 @@ public final Single<Boolean> contains(@NonNull Object item) {
     }
 
     /**
-     * Returns a {@link Single} that counts the total number of items emitted (0 or 1) by the source {@code Maybe} and emits
+     * Returns a {@link Single} that counts the total number of items emitted (0 or 1) by the current {@code Maybe} and emits
      * this count as a 64-bit {@link Long}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/longCount.png" alt="">
@@ -2646,7 +2646,7 @@ public final Single<Boolean> contains(@NonNull Object item) {
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a single item: the number of items emitted by the source {@code Maybe} as a
+     * @return a {@code Single} that emits a single item: the number of items emitted by the current {@code Maybe} as a
      *         64-bit {@code Long} item
      * @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
      */
@@ -2658,8 +2658,8 @@ public final Single<Long> count() {
     }
 
     /**
-     * Returns a {@link Single} that emits the item emitted by the source {@code Maybe} or a specified default item
-     * if the source {@code Maybe} is empty.
+     * Returns a {@link Single} that emits the item emitted by the current {@code Maybe} or a specified default item
+     * if the current {@code Maybe} is empty.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.png" alt="">
      * <dl>
@@ -2668,9 +2668,9 @@ public final Single<Long> count() {
      * </dl>
      *
      * @param defaultItem
-     *            the item to emit if the source {@code Maybe} emits no items
-     * @return a {@code Single} that emits either the specified default item if the source {@code Maybe} emits no
-     *         item, or the item emitted by the source {@code Maybe}
+     *            the item to emit if the current {@code Maybe} emits no items
+     * @return a {@code Single} that emits either the specified default item if the current {@code Maybe} emits no
+     *         item, or the item emitted by the current {@code Maybe}
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defaultifempty.html">ReactiveX operators documentation: DefaultIfEmpty</a>
      */
@@ -2683,7 +2683,7 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
     }
 
     /**
-     * Returns a {@code Maybe} that signals the events emitted by the source {@code Maybe} shifted forward in time by a
+     * Returns a {@code Maybe} that signals the events emitted by the current {@code Maybe} shifted forward in time by a
      * specified delay.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
@@ -2709,7 +2709,7 @@ public final Maybe<T> delay(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Maybe} that signals the events emitted by the source {@code Maybe} shifted forward in time by a
+     * Returns a {@code Maybe} that signals the events emitted by the current {@code Maybe} shifted forward in time by a
      * specified delay running on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
@@ -2796,7 +2796,7 @@ public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIn
     }
 
     /**
-     * Returns a {@code Maybe} that delays the subscription to the source {@code Maybe} by a given amount of time.
+     * Returns a {@code Maybe} that delays the subscription to the current {@code Maybe} by a given amount of time.
      * <p>
      * <img width="640" height="471" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delaySubscription.t.png" alt="">
      * <dl>
@@ -2808,7 +2808,7 @@ public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIn
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
-     * @return a {@code Maybe} that delays the subscription to the source {@code Maybe} by the given amount
+     * @return a {@code Maybe} that delays the subscription to the current {@code Maybe} by the given amount
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      * @see #delaySubscription(long, TimeUnit, Scheduler)
@@ -2821,7 +2821,7 @@ public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Maybe} that delays the subscription to the source {@code Maybe} by a given amount of time,
+     * Returns a {@code Maybe} that delays the subscription to the current {@code Maybe} by a given amount of time,
      * both waiting and subscribing on a given {@link Scheduler}.
      * <p>
      * <img width="640" height="420" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delaySubscription.ts.png" alt="">
@@ -2836,7 +2836,7 @@ public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
      *            the time unit of {@code delay}
      * @param scheduler
      *            the {@code Scheduler} on which the waiting and subscription will happen
-     * @return a {@code Maybe} that delays the subscription to the source {@code Maybe} by a given
+     * @return a {@code Maybe} that delays the subscription to the current {@code Maybe} by a given
      *         amount, waiting and subscribing on the given {@code Scheduler}
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
@@ -2882,8 +2882,8 @@ public final Maybe<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSuccess
      * </dl>
      *
      * @param onAfterTerminate
-     *            an {@code Action} to be invoked when the source {@code Maybe} finishes
-     * @return a {@code Maybe} that emits the same items as the source {@code Maybe}, then invokes the
+     *            an {@code Action} to be invoked when the current {@code Maybe} finishes
+     * @return a {@code Maybe} that emits the same items as the current {@code Maybe}, then invokes the
      *         {@code Action}
      * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
@@ -2953,7 +2953,7 @@ public final Maybe<T> doOnDispose(@NonNull Action onDispose) {
     }
 
     /**
-     * Modifies the source {@code Maybe} so that it invokes an action when it calls {@code onComplete}.
+     * Invokes an {@link Action} just before the current {@code Maybe} calls {@code onComplete}.
      * <p>
      * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.m.png" alt="">
      * <dl>
@@ -2962,7 +2962,7 @@ public final Maybe<T> doOnDispose(@NonNull Action onDispose) {
      * </dl>
      *
      * @param onComplete
-     *            the action to invoke when the source {@code Maybe} calls {@code onComplete}
+     *            the action to invoke when the current {@code Maybe} calls {@code onComplete}
      * @return the new {@code Maybe} with the side-effecting behavior applied
      * @throws NullPointerException if {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
@@ -3124,9 +3124,9 @@ public final Maybe<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates the item emitted by the source {@code Maybe}, returning {@code true}
+     *            a function that evaluates the item emitted by the current {@code Maybe}, returning {@code true}
      *            if it passes the filter
-     * @return a {@code Maybe} that emit the item emitted by the source {@code Maybe} that the filter
+     * @return a {@code Maybe} that emit the item emitted by the current {@code Maybe} that the filter
      *         evaluates as {@code true}
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
@@ -3140,7 +3140,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns a {@code Maybe} that is based on applying a specified function to the item emitted by the source {@code Maybe},
+     * Returns a {@code Maybe} that is based on applying a specified function to the item emitted by the current {@code Maybe},
      * where that function returns a {@link MaybeSource}.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
@@ -3152,8 +3152,8 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a {@code MaybeSource}
-     * @return the {@code Maybe} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a {@code MaybeSource}
+     * @return the {@code Maybe} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3202,7 +3202,7 @@ public final <R> Maybe<R> flatMap(
 
     /**
      * Returns a {@code Maybe} that emits the results of a specified function to the pair of values emitted by the
-     * source {@code Maybe} and a specified mapped {@link MaybeSource}.
+     * current {@code Maybe} and a specified mapped {@link MaybeSource}.
      * <p>
      * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
      * <dl>
@@ -3215,7 +3215,7 @@ public final <R> Maybe<R> flatMap(
      * @param <R>
      *            the type of items emitted by the resulting {@code Maybe}
      * @param mapper
-     *            a function that returns a {@code MaybeSource} for the item emitted by the source {@code Maybe}
+     *            a function that returns a {@code MaybeSource} for the item emitted by the current {@code Maybe}
      * @param resultSelector
      *            a function that combines one item emitted by each of the source and collection {@code MaybeSource} and
      *            returns an item to be emitted by the resulting {@code MaybeSource}
@@ -3234,7 +3234,7 @@ public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends Mayb
     }
 
     /**
-     * Maps the success value of the upstream {@code Maybe} into an {@link Iterable} and emits its items as a
+     * Maps the success value of the current {@code Maybe} into an {@link Iterable} and emits its items as a
      * {@link Flowable} sequence.
      * <p>
      * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenAsFlowable.png" alt="">
@@ -3249,7 +3249,7 @@ public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends Mayb
      *            the type of item emitted by the inner {@code Iterable}
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            source {@code Maybe}
+     *            current {@code Maybe}
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -3265,7 +3265,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Maps the success value of the upstream {@code Maybe} into an {@link Iterable} and emits its items as an
+     * Maps the success value of the current {@code Maybe} into an {@link Iterable} and emits its items as an
      * {@link Observable} sequence.
      * <p>
      * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenAsObservable.png" alt="">
@@ -3278,7 +3278,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            source {@code Maybe}
+     *            current {@code Maybe}
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -3292,7 +3292,7 @@ public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T,
     }
 
     /**
-     * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the source {@code Maybe},
+     * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the current {@code Maybe},
      * where that function returns an {@link ObservableSource}.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
@@ -3303,8 +3303,8 @@ public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T,
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns an {@code ObservableSource}
-     * @return the {@code Observable} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns an {@code ObservableSource}
+     * @return the {@code Observable} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3318,7 +3318,7 @@ public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ?
 
     /**
      * Returns a {@link Flowable} that emits items based on applying a specified function to the item emitted by the
-     * source {@code Maybe}, where that function returns a {@link Publisher}.
+     * current {@code Maybe}, where that function returns a {@link Publisher}.
      * <p>
      * <img width="640" height="260" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapPublisher.png" alt="">
      * <dl>
@@ -3330,9 +3330,9 @@ public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ?
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a
+     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
      *            {@code Flowable}
-     * @return the {@code Flowable} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     * @return the {@code Flowable} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3347,7 +3347,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
 
     /**
      * Returns a {@link Single} based on applying a specified function to the item emitted by the
-     * source {@code Maybe}, where that function returns a {@code Single}.
+     * current {@code Maybe}, where that function returns a {@code Single}.
      * When this {@code Maybe} completes a {@link NoSuchElementException} will be thrown.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
@@ -3358,9 +3358,9 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a
+     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
      *            {@code Single}
-     * @return the {@code Single} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     * @return the {@code Single} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3374,7 +3374,7 @@ public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends
 
     /**
      * Returns a {@code Maybe} based on applying a specified function to the item emitted by the
-     * source {@code Maybe}, where that function returns a {@link Single}.
+     * current {@code Maybe}, where that function returns a {@link Single}.
      * When this {@code Maybe} just completes the resulting {@code Maybe} completes as well.
      * <p>
      * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
@@ -3386,7 +3386,7 @@ public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends
      * <p>History: 2.0.2 - experimental
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a
+     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
      *            {@code Single}
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
@@ -3403,7 +3403,7 @@ public final <R> Maybe<R> flatMapSingleElement(@NonNull Function<? super T, ? ex
 
     /**
      * Returns a {@link Completable} that completes based on applying a specified function to the item emitted by the
-     * source {@code Maybe}, where that function returns a {@code Completable}.
+     * current {@code Maybe}, where that function returns a {@code Completable}.
      * <p>
      * <img width="640" height="267" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapCompletable.png" alt="">
      * <dl>
@@ -3412,9 +3412,9 @@ public final <R> Maybe<R> flatMapSingleElement(@NonNull Function<? super T, ? ex
      * </dl>
      *
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Maybe}, returns a
+     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
      *            {@code Completable}
-     * @return the {@code Completable} returned from {@code mapper} when applied to the item emitted by the source {@code Maybe}
+     * @return the {@code Completable} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3446,7 +3446,7 @@ public final Maybe<T> hide() {
     }
 
     /**
-     * Returns a {@link Completable} that ignores the item emitted by the source {@code Maybe} and only calls {@code onComplete} or {@code onError}.
+     * Returns a {@link Completable} that ignores the item emitted by the current {@code Maybe} and only calls {@code onComplete} or {@code onError}.
      * <p>
      * <img width="640" height="389" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.ignoreElement.png" alt="">
      * <dl>
@@ -3455,7 +3455,7 @@ public final Maybe<T> hide() {
      * </dl>
      *
      * @return an empty {@code Completable} that only calls {@code onComplete} or {@code onError}, based on which one is
-     *         called by the source {@code Maybe}
+     *         called by the current {@code Maybe}
      * @see <a href="http://reactivex.io/documentation/operators/ignoreelements.html">ReactiveX operators documentation: IgnoreElements</a>
      */
     @CheckReturnValue
@@ -3466,7 +3466,7 @@ public final Completable ignoreElement() {
     }
 
     /**
-     * Returns a {@link Single} that emits {@code true} if the source {@code Maybe} is empty, otherwise {@code false}.
+     * Returns a {@link Single} that emits {@code true} if the current {@code Maybe} is empty, otherwise {@code false}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.png" alt="">
      * <dl>
@@ -3474,7 +3474,7 @@ public final Completable ignoreElement() {
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits {@code true} if the source {@code Maybe} is empty.
+     * @return a {@code Single} that emits {@code true} if the current {@code Maybe} is empty.
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -3614,7 +3614,7 @@ public final Single<Boolean> isEmpty() {
      * <p>
      * Note also that it is not possible to stop the subscription phase in {@code lift()} as the {@code apply()} method
      * requires a non-{@code null} {@code MaybeObserver} instance to be returned, which is then unconditionally subscribed to
-     * the upstream {@code Maybe}. For example, if the operator decided there is no reason to subscribe to the
+     * the current {@code Maybe}. For example, if the operator decided there is no reason to subscribe to the
      * upstream source because of some optimization possibility or a failure to prepare the operator, it still has to
      * return a {@code MaybeObserver} that should immediately dispose the upstream's {@link Disposable} in its
      * {@code onSubscribe} method. Again, using a {@code MaybeTransformer} and extending the {@code Maybe} is
@@ -3643,7 +3643,7 @@ public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> li
     }
 
     /**
-     * Returns a {@code Maybe} that applies a specified function to the item emitted by the source {@code Maybe} and
+     * Returns a {@code Maybe} that applies a specified function to the item emitted by the current {@code Maybe} and
      * emits the result of this function application.
      * <p>
      * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.map.png" alt="">
@@ -3655,7 +3655,7 @@ public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> li
      * @param <R> the result value type
      * @param mapper
      *            a function to apply to the item emitted by the {@code Maybe}
-     * @return a {@code Maybe} that emits the item from the source {@code Maybe}, transformed by the specified function
+     * @return a {@code Maybe} that emits the item from the current {@code Maybe}, transformed by the specified function
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
@@ -3756,7 +3756,7 @@ public final Maybe<T> observeOn(@NonNull Scheduler scheduler) {
      *
      * @param <U> the output type
      * @param clazz
-     *            the class type to filter the items emitted by the source {@code Maybe}
+     *            the class type to filter the items emitted by the current {@code Maybe}
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
@@ -3887,8 +3887,8 @@ public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> pred
     }
 
     /**
-     * Instructs a {@code Maybe} to pass control to another {@link MaybeSource} rather than invoking
-     * {@link MaybeObserver#onError onError} if it encounters an error.
+     * Resumes the flow with the given {@link MaybeSource} when the current {@code Maybe} fails instead of
+     * signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
@@ -3900,7 +3900,7 @@ public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> pred
      * </dl>
      *
      * @param next
-     *            the next {@code MaybeSource} that will take over if the source {@code Maybe} encounters
+     *            the next {@code MaybeSource} that will take over if the current {@code Maybe} encounters
      *            an error
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code next} is {@code null}
@@ -3915,8 +3915,8 @@ public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> next)
     }
 
     /**
-     * Instructs a {@code Maybe} to pass control to another {@link MaybeSource} rather than invoking
-     * {@link MaybeObserver#onError onError} if it encounters an error.
+     * Resumes the flow with a {@link MaybeSource} returned for the failure {@link Throwable} of the current {@code Maybe} by a
+     * function instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
@@ -3928,7 +3928,7 @@ public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> next)
      * </dl>
      *
      * @param resumeFunction
-     *            a function that returns a {@code MaybeSource} that will take over if the source {@code Maybe} encounters
+     *            a function that returns a {@code MaybeSource} that will take over if the current {@code Maybe} encounters
      *            an error
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code resumeFunction} is {@code null}
@@ -3943,8 +3943,8 @@ public final Maybe<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? e
     }
 
     /**
-     * Instructs a {@code Maybe} to emit an item (returned by a specified function) rather than invoking
-     * {@link MaybeObserver#onError onError} if it encounters an error.
+     * Ends the flow with a success item returned by a function for the {@link Throwable} error signaled by the current
+     * {@code Maybe} instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
      * <p>
@@ -3971,8 +3971,7 @@ public final Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? exten
     }
 
     /**
-     * Instructs a {@code Maybe} to emit an item (returned by a specified function) rather than invoking
-     * {@link MaybeObserver#onError onError} if it encounters an error.
+     * Ends the flow with the given success item when the current {@code Maybe} fails instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
      * <p>
@@ -3998,8 +3997,8 @@ public final Maybe<T> onErrorReturnItem(@NonNull T item) {
     }
 
     /**
-     * Instructs a {@code Maybe} to pass control to another {@link MaybeSource} rather than invoking
-     * {@link MaybeObserver#onError onError} if it encounters an {@link java.lang.Exception}.
+     * Resumes the flow with the given {@link MaybeSource} when the current {@code Maybe} fails
+     * with an {@link Exception} subclass instead of signaling the error via {@code onError}.
      * <p>
      * This differs from {@link #onErrorResumeNext} in that this one does not handle {@link java.lang.Throwable}
      * or {@link java.lang.Error} but lets those continue through.
@@ -4014,7 +4013,7 @@ public final Maybe<T> onErrorReturnItem(@NonNull T item) {
      * </dl>
      *
      * @param next
-     *            the next {@code MaybeSource} that will take over if the source {@code Maybe} encounters
+     *            the next {@code MaybeSource} that will take over if the current {@code Maybe} encounters
      *            an exception
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code next} is {@code null}
@@ -4048,7 +4047,7 @@ public final Maybe<T> onTerminateDetach() {
     }
 
     /**
-     * Returns a {@link Flowable} that repeats the sequence of items emitted by the source {@code Maybe} indefinitely.
+     * Returns a {@link Flowable} that repeats the sequence of items emitted by the current {@code Maybe} indefinitely.
      * <p>
      * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.o.png" alt="">
      * <dl>
@@ -4058,7 +4057,7 @@ public final Maybe<T> onTerminateDetach() {
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits the items emitted by the source {@code Maybe} repeatedly and in sequence
+     * @return a {@code Flowable} that emits the items emitted by the current {@code Maybe} repeatedly and in sequence
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4070,7 +4069,7 @@ public final Flowable<T> repeat() {
     }
 
     /**
-     * Returns a {@link Flowable} that repeats the sequence of items emitted by the source {@code Maybe} at most
+     * Returns a {@link Flowable} that repeats the sequence of items emitted by the current {@code Maybe} at most
      * {@code count} times.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
@@ -4082,9 +4081,9 @@ public final Flowable<T> repeat() {
      * </dl>
      *
      * @param times
-     *            the number of times the source {@code Maybe} items are repeated, a count of 0 will yield an empty
+     *            the number of times the current {@code Maybe} items are repeated, a count of 0 will yield an empty
      *            sequence
-     * @return a {@code Flowable} that repeats the sequence of items emitted by the source {@code Maybe} at most
+     * @return a {@code Flowable} that repeats the sequence of items emitted by the current {@code Maybe} at most
      *         {@code count} times
      * @throws IllegalArgumentException
      *             if {@code times} is negative
@@ -4099,7 +4098,7 @@ public final Flowable<T> repeat(long times) {
     }
 
     /**
-     * Returns a {@link Flowable} that repeats the sequence of items emitted by the source {@code Maybe} until
+     * Returns a {@link Flowable} that repeats the sequence of items emitted by the current {@code Maybe} until
      * the provided stop function returns {@code true}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
@@ -4127,12 +4126,12 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns a {@link Flowable} that emits the same values as the source {@code Maybe} with the exception of an
+     * Returns a {@link Flowable} that emits the same values as the current {@code Maybe} with the exception of an
      * {@code onComplete}. An {@code onComplete} notification from the source will result in the emission of
-     * a {@code void} item to the {@link Publisher} provided as an argument to the {@code notificationHandler}
-     * function. If that {@code Publisher} calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
-     * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
-     * resubscribe to the source {@code Publisher}.
+     * a {@code void} item to the {@code Flowable} provided as an argument to the {@code notificationHandler}
+     * function. If that {@link Publisher} calls {@code onComplete} or {@code onError} then {@code repeatWhen} will
+     * call {@code onComplete} or {@code onError} on the child observer. Otherwise, this operator will
+     * resubscribe to the current {@code Maybe}.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.png" alt="">
      * <dl>
@@ -4145,7 +4144,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
      *
      * @param handler
      *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the repeat.
-     * @return the source {@code Publisher} modified with repeat logic
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
@@ -4158,12 +4157,12 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
     }
 
     /**
-     * Returns a {@code Maybe} that mirrors the source {@code Maybe}, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Maybe} that mirrors the current {@code Maybe}, resubscribing to it if it calls {@code onError}
      * (infinite retry count).
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <p>
-     * If the source {@code Maybe} calls {@link MaybeObserver#onError}, this method will resubscribe to the source
+     * If the current {@code Maybe} calls {@link MaybeObserver#onError}, this operator will resubscribe to the current
      * {@code Maybe} rather than propagating the {@code onError} call.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -4181,7 +4180,7 @@ public final Maybe<T> retry() {
     }
 
     /**
-     * Returns a {@code Maybe} that mirrors the source {@code Maybe}, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Maybe} that mirrors the current {@code Maybe}, resubscribing to it if it calls {@code onError}
      * and the predicate returns {@code true} for that specific exception and retry count.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
@@ -4206,12 +4205,12 @@ public final Maybe<T> retry(@NonNull BiPredicate<? super Integer, ? super Throwa
     }
 
     /**
-     * Returns a {@code Maybe} that mirrors the source {@code Maybe}, resubscribing to it if it calls {@code onError}
+     * Returns a {@code Maybe} that mirrors the current {@code Maybe}, resubscribing to it if it calls {@code onError}
      * up to a specified number of retries.
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
      * <p>
-     * If the source {@code Maybe} calls {@link MaybeObserver#onError}, this method will resubscribe to the source
+     * If the current {@code Maybe} calls {@link MaybeObserver#onError}, this operator will resubscribe to the current
      * {@code Maybe} for a maximum of {@code count} resubscriptions rather than propagating the
      * {@code onError} call.
      * <dl>
@@ -4289,12 +4288,12 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
     }
 
     /**
-     * Returns a {@code Maybe} that emits the same values as the source {@code Maybe} with the exception of an
+     * Returns a {@code Maybe} that emits the same values as the current {@code Maybe} with the exception of an
      * {@code onError}. An {@code onError} notification from the source will result in the emission of a
-     * {@link Throwable} item to the {@link Publisher} provided as an argument to the {@code notificationHandler}
-     * function. If that {@code Publisher} calls {@code onComplete} or {@code onError} then {@code retry} will call
-     * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
-     * resubscribe to the source {@code Publisher}.
+     * {@link Throwable} item to the {@link Flowable} provided as an argument to the {@code notificationHandler}
+     * function. If the returned {@link Publisher} calls {@code onComplete} or {@code onError} then {@code retry} will call
+     * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this operator will
+     * resubscribe to the current {@code Maybe}.
      * <p>
      * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.png" alt="">
      * <p>
@@ -4565,7 +4564,7 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a {@code Maybe} that emits the items emitted by the source {@code Maybe} or the items of an alternate
+     * Returns a {@code Maybe} that emits the items emitted by the current {@code Maybe} or the items of an alternate
      * {@link MaybeSource} if the current {@code Maybe} is empty.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
@@ -4576,8 +4575,8 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
      *
      * @param other
      *              the alternate {@code MaybeSource} to subscribe to if the main does not emit any items
-     * @return  a {@code Maybe} that emits the items emitted by the source {@code Maybe} or the items of an
-     *          alternate {@code MaybeSource} if the source {@code Maybe} is empty.
+     * @return  a {@code Maybe} that emits the items emitted by the current {@code Maybe} or the items of an
+     *          alternate {@code MaybeSource} if the current {@code Maybe} is empty.
      * @throws NullPointerException if {@code other} is {@code null}
      */
     @CheckReturnValue
@@ -4589,7 +4588,7 @@ public final Maybe<T> switchIfEmpty(@NonNull MaybeSource<? extends T> other) {
     }
 
     /**
-     * Returns a {@link Single} that emits the items emitted by the source {@code Maybe} or the item of an alternate
+     * Returns a {@link Single} that emits the items emitted by the current {@code Maybe} or the item of an alternate
      * {@link SingleSource} if the current {@code Maybe} is empty.
      * <p>
      * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
@@ -4600,8 +4599,8 @@ public final Maybe<T> switchIfEmpty(@NonNull MaybeSource<? extends T> other) {
      * <p>History: 2.1.4 - experimental
      * @param other
      *              the alternate {@code SingleSource} to subscribe to if the main does not emit any items
-     * @return a {@code Single} that emits the items emitted by the source {@code Maybe} or the item of an
-     *         alternate {@code SingleSource} if the source {@code Maybe} is empty.
+     * @return a {@code Single} that emits the items emitted by the current {@code Maybe} or the item of an
+     *         alternate {@code SingleSource} if the current {@code Maybe} is empty.
      * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
@@ -4614,7 +4613,7 @@ public final Single<T> switchIfEmpty(@NonNull SingleSource<? extends T> other) {
     }
 
     /**
-     * Returns a {@code Maybe} that emits the items emitted by the source {@code Maybe} until a second {@link MaybeSource}
+     * Returns a {@code Maybe} that emits the items emitted by the current {@code Maybe} until a second {@link MaybeSource}
      * emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
@@ -4625,10 +4624,10 @@ public final Single<T> switchIfEmpty(@NonNull SingleSource<? extends T> other) {
      *
      * @param other
      *            the {@code MaybeSource} whose first emitted item will cause {@code takeUntil} to stop emitting items
-     *            from the source {@code Maybe}
+     *            from the current {@code Maybe}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return a {@code Maybe} that emits the items emitted by the source {@code Maybe} until such time as {@code other} emits its first item
+     * @return a {@code Maybe} that emits the items emitted by the current {@code Maybe} until such time as {@code other} emits its first item
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
@@ -4641,7 +4640,7 @@ public final <U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
     }
 
     /**
-     * Returns a {@code Maybe} that emits the item emitted by the source {@code Maybe} until a second {@link Publisher}
+     * Returns a {@code Maybe} that emits the item emitted by the current {@code Maybe} until a second {@link Publisher}
      * emits an item.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
@@ -4658,7 +4657,7 @@ public final <U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
      *            from the source {@code Publisher}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return a {@code Maybe} that emits the items emitted by the source {@code Maybe} until such time as {@code other} emits its first item
+     * @return a {@code Maybe} that emits the items emitted by the current {@code Maybe} until such time as {@code other} emits its first item
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
@@ -4672,7 +4671,7 @@ public final <U> Maybe<T> takeUntil(@NonNull Publisher<U> other) {
     }
 
     /**
-     * Returns a {@code Maybe} that mirrors the source {@code Maybe} but applies a timeout policy for each emitted
+     * Returns a {@code Maybe} that mirrors the current {@code Maybe} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
      * the resulting {@code Maybe} terminates and notifies {@link MaybeObserver}s of a {@link TimeoutException}.
      * <p>
@@ -4698,9 +4697,9 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit) {
     }
 
     /**
-     * Returns a {@code Maybe} that mirrors the source {@code Maybe} but applies a timeout policy for each emitted
+     * Returns a {@code Maybe} that mirrors the current {@code Maybe} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
-     * the source {@link MaybeSource} is disposed and resulting {@code Maybe} begins instead to mirror a fallback {@code MaybeSource}.
+     * the current {@code Maybe} is disposed and resulting {@code Maybe} begins instead to mirror a fallback {@link MaybeSource}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
      * <dl>
@@ -4727,10 +4726,10 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull May
     }
 
     /**
-     * Returns a {@code Maybe} that mirrors the source {@code Maybe} but applies a timeout policy for each emitted
+     * Returns a {@code Maybe} that mirrors the current {@code Maybe} but applies a timeout policy for each emitted
      * item using a specified {@link Scheduler}. If the next item isn't emitted within the specified timeout duration
-     * starting from its predecessor, the source {@link MaybeSource} is disposed and resulting {@code Maybe} begins instead
-     * to mirror a fallback {@code MaybeSource}.
+     * starting from its predecessor, the current {@code Maybe} is disposed and resulting {@code Maybe} begins instead
+     * to mirror a fallback {@link MaybeSource}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
      * <dl>
@@ -4759,7 +4758,7 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Sch
     }
 
     /**
-     * Returns a {@code Maybe} that mirrors the source {@code Maybe} but applies a timeout policy for each emitted
+     * Returns a {@code Maybe} that mirrors the current {@code Maybe} but applies a timeout policy for each emitted
      * item, where this policy is governed on a specified {@link Scheduler}. If the next item isn't emitted within the
      * specified timeout duration starting from its predecessor, the resulting {@code Maybe} terminates and
      * notifies {@link MaybeObserver}s of a {@link TimeoutException}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 6b118b70b5..2123f8e328 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -8493,7 +8493,8 @@ public final Observable<T> doOnEach(@NonNull Observer<? super T> observer) {
     }
 
     /**
-     * Modifies the current {@code Observable} so that it invokes an action if it calls {@code onError}.
+     * Calls the given {@link Consumer} with the error {@link Throwable} if the current {@code Observable} failed before forwarding it to
+     * the downstream.
      * <p>
      * In case the {@code onError} action throws, the downstream will receive a composite exception containing
      * the original exception and the exception thrown by {@code onError}.
@@ -8545,7 +8546,7 @@ public final Observable<T> doOnLifecycle(@NonNull Consumer<? super Disposable> o
     }
 
     /**
-     * Modifies the current {@code Observable} so that it invokes an action when it calls {@code onNext}.
+     * Calls the given {@link Consumer} with the value emitted by the current {@code Observable} before forwarding it to the downstream.
      * <p>
      * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.o.png" alt="">
      * <dl>
@@ -10484,8 +10485,8 @@ public final <U> Observable<U> ofType(@NonNull Class<U> clazz) {
     }
 
     /**
-     * Instructs the current {@code Observable} to pass control to another {@link ObservableSource} rather than invoking
-     * {@link Observer#onError onError} if it encounters an error.
+     * Resumes the flow with an {@link ObservableSource} returned for the failure {@link Throwable} of the current {@code Observable} by a
+     * function instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
@@ -10522,8 +10523,8 @@ public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable
     }
 
     /**
-     * Instructs the current {@code Observable} to pass control to another {@link ObservableSource} rather than invoking
-     * {@link Observer#onError onError} if it encounters an error.
+     * Resumes the flow with the given {@link ObservableSource} when the current {@code Observable} fails instead of
+     * signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
      * <p>
@@ -10560,8 +10561,8 @@ public final Observable<T> onErrorResumeWith(@NonNull ObservableSource<? extends
     }
 
     /**
-     * Instructs the current {@code Observable} to emit an item (returned by a specified function) and complete normally
-     * rather than invoking {@link Observer#onError onError} when it encounters an error.
+     * Ends the flow with a last item returned by a function for the {@link Throwable} error signaled by the current
+     * {@code Observable} instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.o.png" alt="">
      * <p>
@@ -10595,8 +10596,7 @@ public final Observable<T> onErrorReturn(@NonNull Function<? super Throwable, ?
     }
 
     /**
-     * Instructs the current {@code Observable} to emit an item (returned by a specified function) and complete normally
-     * rather than invoking {@link Observer#onError onError} if it encounters an error.
+     * Ends the flow with the given last item when the current {@code Observable} fails instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturnItem.o.png" alt="">
      * <p>
@@ -14724,9 +14724,9 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.2.png" alt="">
      * <p>
      * Normally, an {@link ObservableSource} that returns multiple items will do so by invoking its {@link Observer}'s
-     * {@link Observer#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * {@code ObservableSource} to compose a list of all of these items and then to invoke the {@code Observer}'s {@code onNext}
-     * function once, passing it the entire list, by calling the {@code ObservableSource}'s {@code toList} method prior to
+     * {@link Observer#onNext onNext} method for each such item. You can change this behavior by having the
+     * operator to compose a list of all of these items and then to invoke the {@link SingleObserver}'s {@code onSuccess}
+     * method once, passing it the entire list, by calling the {@code Observable}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
@@ -14755,9 +14755,9 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.2.png" alt="">
      * <p>
      * Normally, an {@link ObservableSource} that returns multiple items will do so by invoking its {@link Observer}'s
-     * {@link Observer#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * {@code ObservableSource} to compose a list of all of these items and then to invoke the {@code Observer}'s {@code onNext}
-     * function once, passing it the entire list, by calling the {@code ObservableSource}'s {@code toList} method prior to
+     * {@link Observer#onNext onNext} method for each such item. You can change this behavior by having the
+     * operator to compose a list of all of these items and then to invoke the {@link SingleObserver}'s {@code onSuccess}
+     * method once, passing it the entire list, by calling the {@code Observable}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
@@ -14790,9 +14790,9 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.o.c.png" alt="">
      * <p>
      * Normally, an {@link ObservableSource} that returns multiple items will do so by invoking its {@link Observer}'s
-     * {@link Observer#onNext onNext} method for each such item. You can change this behavior, instructing the
-     * {@code ObservableSource} to compose a list of all of these items and then to invoke the {@code Observer}'s {@code onNext}
-     * function once, passing it the entire list, by calling the {@code ObservableSource}'s {@code toList} method prior to
+     * {@link Observer#onNext onNext} method for each such item. You can change this behavior by having the
+     * operator to compose a collection of all of these items and then to invoke the {@link SingleObserver}'s {@code onSuccess}
+     * method once, passing it the entire collection, by calling the {@code Observable}'s {@code toList} method prior to
      * calling its {@link #subscribe} method.
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated collection to
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index b5dde711ba..4b22be8dcf 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -2092,7 +2092,7 @@ public final Single<T> hide() {
      * This method operates on the {@code Single} itself whereas {@link #lift} operates on {@link SingleObserver}s.
      * <p>
      * If the operator you are creating is designed to act on the individual item emitted by a {@code Single}, use
-     * {@link #lift}. If your operator is designed to transform the source {@code Single} as a whole (for instance, by
+     * {@link #lift}. If your operator is designed to transform the current {@code Single} as a whole (for instance, by
      * applying a particular set of existing RxJava operators to it) use {@code compose}.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -2158,7 +2158,7 @@ public final <U> Single<U> cast(@NonNull Class<? extends U> clazz) {
     }
 
     /**
-     * Returns a {@link Flowable} that emits the item emitted by the source {@code Single}, then the item emitted by the
+     * Returns a {@link Flowable} that emits the item emitted by the current {@code Single}, then the item emitted by the
      * specified {@link SingleSource}.
      * <p>
      * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatWith.png" alt="">
@@ -2171,7 +2171,7 @@ public final <U> Single<U> cast(@NonNull Class<? extends U> clazz) {
      *
      * @param other
      *            a {@code SingleSource} to be concatenated after the current
-     * @return the new {@code Flowable} that emits the item emitted by the source {@code Single}, followed by the item emitted by
+     * @return the new {@code Flowable} that emits the item emitted by the current {@code Single}, followed by the item emitted by
      *         {@code other}
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
@@ -2520,8 +2520,8 @@ public final Single<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSucces
      *
      * <p>History: 2.0.6 - experimental
      * @param onAfterTerminate
-     *            an {@code Action} to be invoked when the source {@code Single} finishes
-     * @return the new {@code Single} that emits the same items as the source {@code Single}, then invokes the
+     *            an {@code Action} to be invoked when the current {@code Single} finishes
+     * @return the new {@code Single} that emits the same items as the current {@code Single}, then invokes the
      *         {@code Action}
      * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
@@ -2716,9 +2716,9 @@ public final Single<T> doOnDispose(@NonNull Action onDispose) {
      * </dl>
      *
      * @param predicate
-     *            a function that evaluates the item emitted by the source {@code Single}, returning {@code true}
+     *            a function that evaluates the item emitted by the current {@code Single}, returning {@code true}
      *            if it passes the filter
-     * @return the new {@link Maybe} that emit the item emitted by the source {@code Single} that the filter
+     * @return the new {@link Maybe} that emit the item emitted by the current {@code Single} that the filter
      *         evaluates as {@code true}
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
@@ -2732,7 +2732,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
     }
 
     /**
-     * Returns a {@code Single} that is based on applying a specified function to the item emitted by the source {@code Single},
+     * Returns a {@code Single} that is based on applying a specified function to the item emitted by the current {@code Single},
      * where that function returns a {@link SingleSource}.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMap.png" alt="">
@@ -2743,8 +2743,8 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Single}, returns a {@code SingleSource}
-     * @return the new {@code Single} returned from {@code mapper} when applied to the item emitted by the source {@code Single}
+     *            a function that, when applied to the item emitted by the current {@code Single}, returns a {@code SingleSource}
+     * @return the new {@code Single} returned from {@code mapper} when applied to the item emitted by the current {@code Single}
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -2757,7 +2757,7 @@ public final <R> Single<R> flatMap(@NonNull Function<? super T, ? extends Single
     }
 
     /**
-     * Returns a {@link Maybe} that is based on applying a specified function to the item emitted by the source {@code Single},
+     * Returns a {@link Maybe} that is based on applying a specified function to the item emitted by the current {@code Single},
      * where that function returns a {@link MaybeSource}.
      * <p>
      * <img width="640" height="191" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapMaybe.png" alt="">
@@ -2768,8 +2768,8 @@ public final <R> Single<R> flatMap(@NonNull Function<? super T, ? extends Single
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Single}, returns a {@code MaybeSource}
-     * @return the new {@code Maybe} returned from {@code mapper} when applied to the item emitted by the source {@code Single}
+     *            a function that, when applied to the item emitted by the current {@code Single}, returns a {@code MaybeSource}
+     * @return the new {@code Maybe} returned from {@code mapper} when applied to the item emitted by the current {@code Single}
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -2783,7 +2783,7 @@ public final <R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends Ma
 
     /**
      * Returns a {@link Flowable} that emits items based on applying a specified function to the item emitted by the
-     * source {@code Single}, where that function returns a {@link Publisher}.
+     * current {@code Single}, where that function returns a {@link Publisher}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapPublisher.png" alt="">
      * <dl>
@@ -2796,7 +2796,7 @@ public final <R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends Ma
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Single}, returns a
+     *            a function that, when applied to the item emitted by the current {@code Single}, returns a
      *            {@code Publisher}
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
@@ -2812,7 +2812,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
     }
 
     /**
-     * Maps the success value of the upstream {@code Single} into an {@link Iterable} and emits its items as a
+     * Maps the success value of the current {@code Single} into an {@link Iterable} and emits its items as a
      * {@link Flowable} sequence.
      * <p>
      * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenAsFlowable.png" alt="">
@@ -2827,7 +2827,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
      *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            source {@code Single}
+     *            current {@code Single}
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -2843,7 +2843,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Maps the success value of the upstream {@code Single} into an {@link Iterable} and emits its items as an
+     * Maps the success value of the current {@code Single} into an {@link Iterable} and emits its items as an
      * {@link Observable} sequence.
      * <p>
      * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenAsObservable.png" alt="">
@@ -2856,7 +2856,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      *            the type of item emitted by the resulting {@code Iterable}
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
-     *            source {@code Single}
+     *            current {@code Single}
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -2871,7 +2871,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     }
 
     /**
-     * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the source {@code Single},
+     * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the current {@code Single},
      * where that function returns an {@link ObservableSource}.
      * <p>
      * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapObservable.png" alt="">
@@ -2882,7 +2882,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      *
      * @param <R> the result value type
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Single}, returns an {@code ObservableSource}
+     *            a function that, when applied to the item emitted by the current {@code Single}, returns an {@code ObservableSource}
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -2897,7 +2897,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
 
     /**
      * Returns a {@link Completable} that completes based on applying a specified function to the item emitted by the
-     * source {@code Single}, where that function returns a {@link CompletableSource}.
+     * current {@code Single}, where that function returns a {@link CompletableSource}.
      * <p>
      * <img width="640" height="267" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapCompletable.png" alt="">
      * <dl>
@@ -2906,7 +2906,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      * </dl>
      *
      * @param mapper
-     *            a function that, when applied to the item emitted by the source {@code Single}, returns a
+     *            a function that, when applied to the item emitted by the current {@code Single}, returns a
      *            {@code CompletableSource}
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
@@ -3069,7 +3069,7 @@ public final T blockingGet() {
      * <p>
      * Note also that it is not possible to stop the subscription phase in {@code lift()} as the {@code apply()} method
      * requires a non-{@code null} {@code SingleObserver} instance to be returned, which is then unconditionally subscribed to
-     * the upstream {@code Single}. For example, if the operator decided there is no reason to subscribe to the
+     * the current {@code Single}. For example, if the operator decided there is no reason to subscribe to the
      * upstream source because of some optimization possibility or a failure to prepare the operator, it still has to
      * return a {@code SingleObserver} that should immediately dispose the upstream's {@link Disposable} in its
      * {@code onSubscribe} method. Again, using a {@code SingleTransformer} and extending the {@code Single} is
@@ -3098,7 +3098,7 @@ public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T>
     }
 
     /**
-     * Returns a {@code Single} that applies a specified function to the item emitted by the source {@code Single} and
+     * Returns a {@code Single} that applies a specified function to the item emitted by the current {@code Single} and
      * emits the result of this function application.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.map.png" alt="">
@@ -3110,7 +3110,7 @@ public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T>
      * @param <R> the result value type
      * @param mapper
      *            a function to apply to the item emitted by the {@code Single}
-     * @return the new {@code Single} that emits the item from the source {@code Single}, transformed by the specified function
+     * @return the new {@code Single} that emits the item from the current {@code Single}, transformed by the specified function
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
@@ -3206,7 +3206,7 @@ public final Single<Boolean> contains(@NonNull Object value, @NonNull BiPredicat
      *
      * @param other
      *            a {@code SingleSource} to be merged
-     * @return  that emits all of the items emitted by the source {@code Single}s
+     * @return  that emits all of the items emitted by the current {@code Single}s
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3219,7 +3219,7 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
     }
 
     /**
-     * Modifies a {@code Single} to emit its item (or notify of its error) on a specified {@link Scheduler},
+     * Signals the success item or the terminal signals of the current {@code Single} on the specified {@link Scheduler},
      * asynchronously.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.observeOn.png" alt="">
@@ -3230,8 +3230,7 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
      *
      * @param scheduler
      *            the {@code Scheduler} to notify subscribers on
-     * @return the source {@code Single} modified so that its subscribers are notified on the specified
-     *         {@code Scheduler}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -3246,8 +3245,8 @@ public final Single<T> observeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Instructs a {@code Single} to emit an item (returned by a specified function) rather than invoking
-     * {@link SingleObserver#onError onError} if it encounters an error.
+     * Ends the flow with a success item returned by a function for the {@link Throwable} error signaled by the current
+     * {@code Single} instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturn.png" alt="">
      * <p>
@@ -3266,7 +3265,7 @@ public final Single<T> observeOn(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param resumeFunction
-     *            a function that returns an item that the new {@code Single} will emit if the source {@code Single} encounters
+     *            a function that returns an item that the new {@code Single} will emit if the current {@code Single} encounters
      *            an error
      * @return the new {@code Single} instance
      * @throws NullPointerException if {@code resumeFunction} is {@code null}
@@ -3302,8 +3301,8 @@ public final Single<T> onErrorReturnItem(@NonNull T value) {
     }
 
     /**
-     * Instructs a {@code Single} to pass control to another {@code Single} rather than invoking
-     * {@link SingleObserver#onError(Throwable)} if it encounters an error.
+     * Resumes the flow with the given {@link SingleSource} when the current {@code Single} fails instead of
+     * signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeWith.png" alt="">
      * <p>
@@ -3338,8 +3337,8 @@ public final Single<T> onErrorResumeWith(@NonNull SingleSource<? extends T> fall
     }
 
     /**
-     * Instructs a {@code Single} to pass control to another {@code Single} rather than invoking
-     * {@link SingleObserver#onError(Throwable)} if it encounters an error.
+     * Resumes the flow with a {@link SingleSource} returned for the failure {@link Throwable} of the current {@code Single} by a
+     * function instead of signaling the error via {@code onError}.
      * <p>
      * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeNext.f.png" alt="">
      * <p>
@@ -3828,7 +3827,7 @@ public final void subscribe(@NonNull SingleObserver<? super T> observer) {
     }
 
     /**
-     * Asynchronously subscribes subscribers to this {@code Single} on the specified {@link Scheduler}.
+     * Asynchronously subscribes {@link SingleObserver}s to this {@code Single} on the specified {@link Scheduler}.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.subscribeOn.png" alt="">
      * <dl>
@@ -3838,7 +3837,7 @@ public final void subscribe(@NonNull SingleObserver<? super T> observer) {
      *
      * @param scheduler
      *            the {@code Scheduler} to perform subscription actions on
-     * @return the source {@code Single} modified so that its subscriptions happen on the specified {@code Scheduler}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -3853,7 +3852,7 @@ public final Single<T> subscribeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Returns a {@code Single} that emits the item emitted by the source {@code Single} until a {@link CompletableSource} terminates. Upon
+     * Returns a {@code Single} that emits the item emitted by the current {@code Single} until a {@link CompletableSource} terminates. Upon
      * termination of {@code other}, this will emit a {@link CancellationException} rather than go to
      * {@link SingleObserver#onSuccess(Object)}.
      * <p>
@@ -3864,9 +3863,9 @@ public final Single<T> subscribeOn(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param other
-     *            the {@code CompletableSource} whose termination will cause {@code takeUntil} to emit the item from the source
+     *            the {@code CompletableSource} whose termination will cause {@code takeUntil} to emit the item from the current
      *            {@code Single}
-     * @return the new {@code Single} that emits the item emitted by the source {@code Single} until such time as {@code other} terminates.
+     * @return the new {@code Single} that emits the item emitted by the current {@code Single} until such time as {@code other} terminates.
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
@@ -3879,7 +3878,7 @@ public final Single<T> takeUntil(@NonNull CompletableSource other) {
     }
 
     /**
-     * Returns a {@code Single} that emits the item emitted by the source {@code Single} until a {@link Publisher} emits an item or completes. Upon
+     * Returns a {@code Single} that emits the item emitted by the current {@code Single} until a {@link Publisher} emits an item or completes. Upon
      * emission of an item from {@code other}, this will emit a {@link CancellationException} rather than go to
      * {@link SingleObserver#onSuccess(Object)}.
      * <p>
@@ -3894,10 +3893,10 @@ public final Single<T> takeUntil(@NonNull CompletableSource other) {
      *
      * @param other
      *            the {@code Publisher} whose first emitted item or completion will cause {@code takeUntil} to emit {@code CancellationException}
-     *            if the upstream {@code Single} hasn't completed till then
+     *            if the current {@code Single} hasn't completed till then
      * @param <E>
      *            the type of items emitted by {@code other}
-     * @return the new {@code Single} that emits the item emitted by the source {@code Single} until such time as {@code other} emits
+     * @return the new {@code Single} that emits the item emitted by the current {@code Single} until such time as {@code other} emits
      * its first item
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
@@ -3912,7 +3911,7 @@ public final <E> Single<T> takeUntil(@NonNull Publisher<E> other) {
     }
 
     /**
-     * Returns a {@code Single} that emits the item emitted by the source {@code Single} until a second {@code Single} emits an item. Upon
+     * Returns a {@code Single} that emits the item emitted by the current {@code Single} until a second {@code Single} emits an item. Upon
      * emission of an item from {@code other}, this will emit a {@link CancellationException} rather than go to
      * {@link SingleObserver#onSuccess(Object)}.
      * <p>
@@ -3924,10 +3923,10 @@ public final <E> Single<T> takeUntil(@NonNull Publisher<E> other) {
      *
      * @param other
      *            the {@code Single} whose emitted item will cause {@code takeUntil} to emit {@code CancellationException}
-     *            if the upstream {@code Single} hasn't completed till then
+     *            if the current {@code Single} hasn't completed till then
      * @param <E>
      *            the type of item emitted by {@code other}
-     * @return the new {@code Single} that emits the item emitted by the source {@code Single} until such time as {@code other} emits its item
+     * @return the new {@code Single} that emits the item emitted by the current {@code Single} until such time as {@code other} emits its item
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
@@ -4075,7 +4074,7 @@ public final <R> R to(@NonNull SingleConverter<T, ? extends R> converter) {
      * <dd>{@code ignoreElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Completable} that signals {@code onComplete} on it's observer when the source {@code Single}
+     * @return a {@code Completable} that signals {@code onComplete} on it's observer when the current {@code Single}
      *         calls {@code onSuccess}.
      * @since 2.1.13
      */
@@ -4198,7 +4197,7 @@ public final Single<T> unsubscribeOn(@NonNull Scheduler scheduler) {
 
     /**
      * Returns a {@code Single} that emits the result of applying a specified function to the pair of items emitted by
-     * the source {@code Single} and another specified {@link SingleSource}.
+     * the current {@code Single} and another specified {@link SingleSource}.
      * <p>
      * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zipWith.png" alt="">
      * <dl>
@@ -4215,7 +4214,7 @@ public final Single<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      * @param zipper
      *            a function that combines the pairs of items from the two {@code SingleSource}s to generate the items to
      *            be emitted by the resulting {@code Single}
-     * @return the new {@code Single} that pairs up values from the source {@code Single} and the {@code other} {@code SingleSource}
+     * @return the new {@code Single} that pairs up values from the current {@code Single} and the {@code other} {@code SingleSource}
      *         and emits the results of {@code zipFunction} applied to these pairs
      * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index 4bcb1c41c1..a20245d10b 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -250,11 +250,41 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                 }
                 jdx = 0;
                 for (;;) {
-                    int idx = m.javadoc.indexOf("Observer", jdx);
+                    int idx = m.javadoc.indexOf(" Observer", jdx);
                     if (idx >= 0) {
                         if (!m.signature.contains("ObservableSource")
                                 && !m.signature.contains("Observable")) {
-                            e.append("java.lang.RuntimeException: Flowable doc mentions Observer but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                            e.append("java.lang.RuntimeException: Flowable doc mentions Observer but not using Observable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+
+                        jdx = idx + 6;
+                    } else {
+                        break;
+                    }
+                }
+                jdx = 0;
+                for (;;) {
+                    int idx = m.javadoc.indexOf(" SingleObserver", jdx);
+                    if (idx >= 0) {
+                        if (!m.signature.contains("SingleSource")
+                                && !m.signature.contains("Single")) {
+                            e.append("java.lang.RuntimeException: Flowable doc mentions SingleObserver but not using Single\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+
+                        jdx = idx + 6;
+                    } else {
+                        break;
+                    }
+                }
+                jdx = 0;
+                for (;;) {
+                    int idx = m.javadoc.indexOf(" MaybeObserver", jdx);
+                    if (idx >= 0) {
+                        if (!m.signature.contains("MaybeSource")
+                                && !m.signature.contains("Maybe")) {
+                            e.append("java.lang.RuntimeException: Flowable doc mentions MaybeObserver but not using Maybe\r\n at io.reactivex.rxjava3.core.")
                             .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
 

From 1cf5b9d072b912a6bcb3ba6a16368ed3a55d3c84 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 14 Jan 2020 14:16:06 +0100
Subject: [PATCH 050/665] 3.x: Remove Maybe.onExceptionResumeNext (#6844)

---
 .../java/io/reactivex/rxjava3/core/Maybe.java | 33 +------------------
 .../operators/maybe/MaybeOnErrorNext.java     | 18 ++--------
 .../operators/maybe/MaybeOnErrorXTest.java    | 16 ---------
 3 files changed, 4 insertions(+), 63 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index ad4e824893..251127071f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -3939,7 +3939,7 @@ public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> next)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Maybe<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction) {
         Objects.requireNonNull(resumeFunction, "resumeFunction is null");
-        return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<>(this, resumeFunction, true));
+        return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<>(this, resumeFunction));
     }
 
     /**
@@ -3996,37 +3996,6 @@ public final Maybe<T> onErrorReturnItem(@NonNull T item) {
         return onErrorReturn(Functions.justFunction(item));
     }
 
-    /**
-     * Resumes the flow with the given {@link MaybeSource} when the current {@code Maybe} fails
-     * with an {@link Exception} subclass instead of signaling the error via {@code onError}.
-     * <p>
-     * This differs from {@link #onErrorResumeNext} in that this one does not handle {@link java.lang.Throwable}
-     * or {@link java.lang.Error} but lets those continue through.
-     * <p>
-     * <img width="640" height="333" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onExceptionResumeNextViaMaybe.png" alt="">
-     * <p>
-     * You can use this to prevent exceptions from propagating or to supply fallback data should exceptions be
-     * encountered.
-     * <dl>
-     *  <dt><b>Scheduler:</b></dt>
-     *  <dd>{@code onExceptionResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
-     * </dl>
-     *
-     * @param next
-     *            the next {@code MaybeSource} that will take over if the current {@code Maybe} encounters
-     *            an exception
-     * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code next} is {@code null}
-     * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
-     */
-    @CheckReturnValue
-    @NonNull
-    @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onExceptionResumeNext(@NonNull MaybeSource<? extends T> next) {
-        Objects.requireNonNull(next, "next is null");
-        return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<>(this, Functions.justFunction(next), false));
-    }
-
     /**
      * Nulls out references to the upstream producer and downstream {@link MaybeObserver} if
      * the sequence is terminated or downstream calls {@code dispose()}.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
index 434685c074..97fdd7b537 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
@@ -31,19 +31,15 @@ public final class MaybeOnErrorNext<T> extends AbstractMaybeWithUpstream<T, T> {
 
     final Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction;
 
-    final boolean allowFatal;
-
     public MaybeOnErrorNext(MaybeSource<T> source,
-            Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction,
-                    boolean allowFatal) {
+            Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction) {
         super(source);
         this.resumeFunction = resumeFunction;
-        this.allowFatal = allowFatal;
     }
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new OnErrorNextMaybeObserver<>(observer, resumeFunction, allowFatal));
+        source.subscribe(new OnErrorNextMaybeObserver<>(observer, resumeFunction));
     }
 
     static final class OnErrorNextMaybeObserver<T>
@@ -56,14 +52,10 @@ static final class OnErrorNextMaybeObserver<T>
 
         final Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction;
 
-        final boolean allowFatal;
-
         OnErrorNextMaybeObserver(MaybeObserver<? super T> actual,
-                Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction,
-                        boolean allowFatal) {
+                Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction) {
             this.downstream = actual;
             this.resumeFunction = resumeFunction;
-            this.allowFatal = allowFatal;
         }
 
         @Override
@@ -90,10 +82,6 @@ public void onSuccess(T value) {
 
         @Override
         public void onError(Throwable e) {
-            if (!allowFatal && !(e instanceof Exception)) {
-                downstream.onError(e);
-                return;
-            }
             MaybeSource<? extends T> m;
 
             try {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
index f3a9b9345c..403d73db66 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
@@ -98,22 +98,6 @@ public void onErrorResumeNext() {
         .assertResult(1);
     }
 
-    @Test
-    public void onExceptionResumeNext() {
-        Maybe.error(new TestException())
-        .onExceptionResumeNext(Maybe.just(1))
-        .test()
-        .assertResult(1);
-    }
-
-    @Test
-    public void onExceptionResumeNextPassthrough() {
-        Maybe.error(new AssertionError())
-        .onExceptionResumeNext(Maybe.just(1))
-        .test()
-        .assertFailure(AssertionError.class);
-    }
-
     @Test
     public void onErrorResumeNextFunctionThrows() {
         TestHelper.assertCompositeExceptions(Maybe.error(new TestException())

From 050c57a5104980ce1927ca0c2a601a8d3f27c79d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 14 Jan 2020 14:23:18 +0100
Subject: [PATCH 051/665] 3.x: Add operator matrix wiki + auto-extractor
 (#6845)

* 3.x: Add operator matrix wiki + auto-extractor

* Skip Object methods

* Only declared in that class

* Remove onExceptionResumeNext
---
 docs/Operator-Matrix.md                       | 242 ++++++++++++++++++
 docs/_Sidebar.md                              |   1 +
 .../util/OperatorMatrixGenerator.java         |  93 +++++++
 3 files changed, 336 insertions(+)
 create mode 100644 docs/Operator-Matrix.md
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
new file mode 100644
index 0000000000..d965d67232
--- /dev/null
+++ b/docs/Operator-Matrix.md
@@ -0,0 +1,242 @@
+Operator | `Flowable` | `Observable` | `Maybe` | `Single` | `Completable` |
+-----|:---:|:---:|:---:|:---:|:---:|
+`all`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`amb`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`ambArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`ambWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`andThen`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`any`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingAwait`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`blockingFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingForEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingGet`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingMostRecent`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`blockingSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`buffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`cache`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`cacheWithInitialCapacity`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`cast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`collect`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`collectInto`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`combineLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`combineLatestArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`combineLatestArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`combineLatestDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`complete`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`compose`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`concat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`concatArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`concatArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatArrayEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatArrayEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`concatWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`contains`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`count`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`create`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`debounce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`defaultIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`defer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`delay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`delaySubscription`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`doAfterSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`doAfterTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`doFinally`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`doOnCancel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`doOnComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`doOnDispose`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`doOnError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`doOnLifecycle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`doOnSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`doOnSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`doOnTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`equals`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`error`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`firstElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`firstOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`firstOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`firstStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flatMapObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flatMapPublisher`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flatMapSingleElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flattenAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flattenAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flattenStreamAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`forEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`forEachWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`fromAction`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`fromArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`fromCallable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`fromCompletable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`fromCompletionStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`fromFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`fromIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`fromMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`fromObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`fromOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`fromPublisher`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`fromRunnable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`fromSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`fromStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`fromSupplier`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`generate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`groupBy`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`groupJoin`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`hide`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`ignoreElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`ignoreElements`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`interval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`intervalRange`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`isEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`join`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`just`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`last`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`lastElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`lastOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`lastOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`lastStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`lift`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`map`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`mapOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`materialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`merge`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`mergeArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`mergeArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`mergeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`mergeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`never`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`observeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`onErrorComplete`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`onErrorResumeNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`onErrorResumeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`onErrorReturn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`onErrorReturnItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`onTerminateDetach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`parallel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`publish`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`range`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`rangeLong`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`rebatchRequests`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`reduce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`reduceWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`repeat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`repeatUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`repeatWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`replay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`retry`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`retryWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`singleElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`singleOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`singleOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`singleStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`skip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`skipLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`skipUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`skipWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`sorted`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`startWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`startWithArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`startWithItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`startWithIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`subscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`subscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`subscribeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`switchIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`switchOnNextDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`takeUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`takeWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`test`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`throttleFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`timeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`timer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`to`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`toFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`toList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`toMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`toMultimap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`toObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`toSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`toSingleDefault`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`toSortedList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`unsafeCreate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`unsubscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`using`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`window`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`withLatestFrom`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`wrap`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+esent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md
index 1fe0339407..32e201fc46 100644
--- a/docs/_Sidebar.md
+++ b/docs/_Sidebar.md
@@ -21,6 +21,7 @@
   * [Transformation](https://github.com/ReactiveX/RxJava/wiki/Transforming-Observables)
   * [Utility](https://github.com/ReactiveX/RxJava/wiki/Observable-Utility-Operators)
   * [Notable 3rd party Operators (Alphabetical List)](https://github.com/ReactiveX/RxJava/wiki/Alphabetical-List-of-3rd-party-Operators)
+  * [Operator matrix](https://github.com/ReactiveX/RxJava/wiki/Operator-Matrix)
 * [Plugins](https://github.com/ReactiveX/RxJava/wiki/Plugins)
 * [How to Contribute](https://github.com/ReactiveX/RxJava/wiki/How-to-Contribute)
 * [Writing operators](https://github.com/ReactiveX/RxJava/wiki/Writing-operators-for-2.0)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
new file mode 100644
index 0000000000..81aef207e6
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.util;
+
+import java.io.*;
+import java.lang.reflect.Method;
+import java.nio.file.*;
+import java.util.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+
+/**
+ * Generate a table of available operators across base classes in {@code Operator-Matrix.md}.
+ * 
+ * Should be run with the main project directory as working directory where the {@code docs}
+ * folder is.
+ */
+public final class OperatorMatrixGenerator {
+
+    private OperatorMatrixGenerator() {
+        throw new IllegalStateException("No instances!");
+    }
+
+    static final String PRESENT = "![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)";
+    static final String ABSENT = "![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)";
+
+    static final Class<?>[] CLASSES = {
+            Flowable.class, Observable.class, Maybe.class, Single.class, Completable.class
+    };
+
+    public static void main(String[] args) throws IOException {
+        Set<String> operatorSet = new HashSet<>();
+        Map<Class<?>, Set<String>> operatorMap = new HashMap<>();
+
+        for (Class<?> clazz : CLASSES) {
+            Set<String> set = operatorMap.computeIfAbsent(clazz, c -> new HashSet<String>());
+
+            for (Method m : clazz.getMethods()) {
+                String name = m.getName();
+                if (!name.equals("bufferSize")
+                        && m.getDeclaringClass() == clazz
+                        && !m.isSynthetic()) {
+                    operatorSet.add(m.getName());
+                    set.add(m.getName());
+                }
+            }
+        }
+
+        List<String> sortedOperators = new ArrayList<>(operatorSet);
+        sortedOperators.sort(Comparator.naturalOrder());
+
+        try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Paths.get("docs", "Operator-Matrix.md"), StandardOpenOption.CREATE))) {
+            out.print("Operator |");
+            for (Class<?> clazz : CLASSES) {
+                out.print(" `");
+                out.print(clazz.getSimpleName());
+                out.print("` |");
+            }
+            out.println();
+            out.print("-----|");
+            for (int i = 0; i < CLASSES.length; i++) {
+                out.print(":---:|");
+            }
+            out.println();
+            for (String operatorName : sortedOperators) {
+                out.print("`");
+                out.print(operatorName);
+                out.print("`|");
+                for (Class<?> clazz : CLASSES) {
+                    if (operatorMap.get(clazz).contains(operatorName)) {
+                        out.print(PRESENT);
+                    } else {
+                        out.print(ABSENT);
+                    }
+                    out.print("|");
+                }
+                out.println();
+            }
+        }
+    }
+}

From 336ecb8999d9c8206e242abcd90dd9465f20b21f Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Tue, 14 Jan 2020 14:29:50 +0100
Subject: [PATCH 052/665] Fix a minor mistake in the generator and docs

---
 docs/Operator-Matrix.md                                         | 2 --
 docs/_Sidebar.md.md                                             | 1 +
 .../rxjava3/internal/util/OperatorMatrixGenerator.java          | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index d965d67232..ded48d8509 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -238,5 +238,3 @@ Operator | `Flowable` | `Observable` | `Maybe` | `Single` | `Completable` |
 `zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
 `zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
 `zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-esent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
diff --git a/docs/_Sidebar.md.md b/docs/_Sidebar.md.md
index 1fe0339407..32e201fc46 100644
--- a/docs/_Sidebar.md.md
+++ b/docs/_Sidebar.md.md
@@ -21,6 +21,7 @@
   * [Transformation](https://github.com/ReactiveX/RxJava/wiki/Transforming-Observables)
   * [Utility](https://github.com/ReactiveX/RxJava/wiki/Observable-Utility-Operators)
   * [Notable 3rd party Operators (Alphabetical List)](https://github.com/ReactiveX/RxJava/wiki/Alphabetical-List-of-3rd-party-Operators)
+  * [Operator matrix](https://github.com/ReactiveX/RxJava/wiki/Operator-Matrix)
 * [Plugins](https://github.com/ReactiveX/RxJava/wiki/Plugins)
 * [How to Contribute](https://github.com/ReactiveX/RxJava/wiki/How-to-Contribute)
 * [Writing operators](https://github.com/ReactiveX/RxJava/wiki/Writing-operators-for-2.0)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index 81aef207e6..1528568e7e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -61,7 +61,7 @@ public static void main(String[] args) throws IOException {
         List<String> sortedOperators = new ArrayList<>(operatorSet);
         sortedOperators.sort(Comparator.naturalOrder());
 
-        try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Paths.get("docs", "Operator-Matrix.md"), StandardOpenOption.CREATE))) {
+        try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Paths.get("docs", "Operator-Matrix.md"), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING))) {
             out.print("Operator |");
             for (Class<?> clazz : CLASSES) {
                 out.print(" `");

From 9fec1c729c096ba7d7b4613efc310e3a6bd7572d Mon Sep 17 00:00:00 2001
From: slisaasquatch <slisaasquatch@users.noreply.github.com>
Date: Tue, 14 Jan 2020 13:24:00 -0800
Subject: [PATCH 053/665] Deleted unnecessary NPE tests (#6846)

* Deleted unnecessary NPE tests

* Deleted unnecessary NPE tests
---
 .../rxjava3/completable/CompletableTest.java  |  394 -----
 .../rxjava3/flowable/FlowableNullTests.java   | 1560 +----------------
 .../rxjava3/flowable/FlowableTests.java       |    7 -
 .../CompletableAndThenCompletableabTest.java  |    6 -
 .../completable/CompletableAndThenTest.java   |    6 -
 .../completable/CompletableCreateTest.java    |    5 -
 .../completable/CompletableDoFinallyTest.java |    5 -
 .../CompletableFromActionTest.java            |    5 -
 .../CompletableFromCallableTest.java          |    5 -
 .../completable/CompletableFromMaybeTest.java |    5 -
 .../CompletableFromObservableTest.java        |    5 -
 .../CompletableFromPublisherTest.java         |    5 -
 .../CompletableFromRunnableTest.java          |    5 -
 .../CompletableFromSingleTest.java            |    5 -
 .../CompletableFromSupplierTest.java          |    5 -
 .../flowable/FlowableCreateTest.java          |   18 -
 .../FlowableDelaySubscriptionOtherTest.java   |    5 -
 .../flowable/FlowableDoAfterNextTest.java     |    5 -
 .../flowable/FlowableDoFinallyTest.java       |    5 -
 .../flowable/FlowableFromIterableTest.java    |    5 -
 .../FlowableOnBackpressureBufferTest.java     |    8 -
 .../operators/maybe/MaybeDelayTest.java       |   10 -
 .../maybe/MaybeDoAfterSuccessTest.java        |    5 -
 .../operators/maybe/MaybeDoFinallyTest.java   |    5 -
 .../maybe/MaybeDoOnTerminateTest.java         |    5 -
 .../maybe/MaybeFlatMapSingleElementTest.java  |    6 -
 .../maybe/MaybeFlatMapSingleTest.java         |    6 -
 .../operators/maybe/MaybeFromActionTest.java  |    5 -
 .../maybe/MaybeFromCallableTest.java          |    5 -
 .../maybe/MaybeFromCompletableTest.java       |    5 -
 .../maybe/MaybeFromRunnableTest.java          |    5 -
 .../operators/maybe/MaybeFromSingleTest.java  |    5 -
 .../maybe/MaybeFromSupplierTest.java          |    5 -
 .../observable/ObservableCreateTest.java      |    5 -
 .../observable/ObservableDoAfterNextTest.java |    5 -
 .../observable/ObservableDoFinallyTest.java   |    5 -
 .../ObservableFromIterableTest.java           |    5 -
 .../observable/ObservableSwitchTest.java      |    6 -
 .../operators/single/SingleCreateTest.java    |    5 -
 .../single/SingleDoAfterSuccessTest.java      |    5 -
 .../single/SingleDoAfterTerminateTest.java    |    5 -
 .../operators/single/SingleDoFinallyTest.java |    5 -
 .../single/SingleDoOnTerminateTest.java       |    5 -
 .../single/SingleFlatMapMaybeTest.java        |    6 -
 .../operators/single/SingleFlatMapTest.java   |   11 -
 .../operators/single/SingleMapTest.java       |    5 -
 .../rxjava3/maybe/MaybeCreateTest.java        |    5 -
 .../io/reactivex/rxjava3/maybe/MaybeTest.java |   90 -
 .../observable/ObservableNullTests.java       | 1455 +--------------
 .../rxjava3/observable/ObservableTest.java    |    7 -
 .../rxjava3/single/SingleNullTests.java       |  409 -----
 51 files changed, 89 insertions(+), 4086 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
index d319e48861..904a31701a 100644
--- a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
@@ -26,7 +26,6 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
-import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
@@ -156,11 +155,6 @@ public void complete() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatNull() {
-        Completable.concatArray((Completable[])null);
-    }
-
     @Test
     public void concatEmpty() {
         Completable c = Completable.concatArray();
@@ -214,11 +208,6 @@ public void concatIterableEmpty() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatIterableNull() {
-        Completable.concat((Iterable<Completable>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatIterableIteratorNull() {
         Completable c = Completable.concat(new Iterable<Completable>() {
@@ -231,13 +220,6 @@ public Iterator<Completable> iterator() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatIterableWithNull() {
-        Completable c = Completable.concat(Arrays.asList(normal.completable, (Completable)null));
-
-        c.blockingAwait();
-    }
-
     @Test
     public void concatIterableSingle() {
         Completable c = Completable.concat(Collections.singleton(normal.completable));
@@ -367,11 +349,6 @@ public void accept(long v) {
         Assert.assertEquals(Arrays.asList(5L, 4L, 4L), requested);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void createNull() {
-        Completable.unsafeCreate(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void createOnSubscribeThrowsNPE() {
         Completable c = Completable.unsafeCreate(new CompletableSource() {
@@ -424,11 +401,6 @@ public Completable get() {
         normal.assertSubscriptions(1);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void deferNull() {
-        Completable.defer(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void deferReturnsNull() {
         Completable c = Completable.defer(new Supplier<Completable>() {
@@ -463,11 +435,6 @@ public Completable get() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void errorSupplierNull() {
-        Completable.error((Supplier<Throwable>)null);
-    }
-
     @Test(expected = TestException.class)
     public void errorSupplierNormal() {
         Completable c = Completable.error(new Supplier<Throwable>() {
@@ -502,11 +469,6 @@ public void errorSupplierThrows() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void errorNull() {
-        Completable.error((Throwable)null);
-    }
-
     @Test(expected = TestException.class)
     public void errorNormal() {
         Completable c = Completable.error(new TestException());
@@ -514,11 +476,6 @@ public void errorNormal() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromCallableNull() {
-        Completable.fromCallable(null);
-    }
-
     @Test
     public void fromCallableNormal() {
         final AtomicInteger calls = new AtomicInteger();
@@ -545,11 +502,6 @@ public void fromCallableThrows() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFlowableNull() {
-        Completable.fromPublisher(null);
-    }
-
     @Test
     public void fromFlowableEmpty() {
         Completable c = Completable.fromPublisher(Flowable.empty());
@@ -578,11 +530,6 @@ public Throwable get() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromObservableNull() {
-        Completable.fromObservable(null);
-    }
-
     @Test
     public void fromObservableEmpty() {
         Completable c = Completable.fromObservable(Observable.empty());
@@ -611,11 +558,6 @@ public Throwable get() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromActionNull() {
-        Completable.fromAction(null);
-    }
-
     @Test
     public void fromActionNormal() {
         final AtomicInteger calls = new AtomicInteger();
@@ -642,11 +584,6 @@ public void fromActionThrows() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromSingleNull() {
-        Completable.fromSingle(null);
-    }
-
     @Test
     public void fromSingleNormal() {
         Completable c = Completable.fromSingle(Single.just(1));
@@ -666,11 +603,6 @@ public Throwable get() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeNull() {
-        Completable.mergeArray((Completable[])null);
-    }
-
     @Test
     public void mergeEmpty() {
         Completable c = Completable.mergeArray();
@@ -724,11 +656,6 @@ public void mergeIterableEmpty() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeIterableNull() {
-        Completable.merge((Iterable<Completable>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mergeIterableIteratorNull() {
         Completable c = Completable.merge(new Iterable<Completable>() {
@@ -741,13 +668,6 @@ public Iterator<Completable> iterator() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeIterableWithNull() {
-        Completable c = Completable.merge(Arrays.asList(normal.completable, (Completable)null));
-
-        c.blockingAwait();
-    }
-
     @Test
     public void mergeIterableSingle() {
         Completable c = Completable.merge(Collections.singleton(normal.completable));
@@ -878,11 +798,6 @@ public void accept(long v) {
         Assert.assertEquals(Arrays.asList(5L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L), requested);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeDelayErrorNull() {
-        Completable.mergeArrayDelayError((Completable[])null);
-    }
-
     @Test
     public void mergeDelayErrorEmpty() {
         Completable c = Completable.mergeArrayDelayError();
@@ -940,11 +855,6 @@ public void mergeDelayErrorIterableEmpty() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeDelayErrorIterableNull() {
-        Completable.mergeDelayError((Iterable<Completable>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mergeDelayErrorIterableIteratorNull() {
         Completable c = Completable.mergeDelayError(new Iterable<Completable>() {
@@ -957,13 +867,6 @@ public Iterator<Completable> iterator() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeDelayErrorIterableWithNull() {
-        Completable c = Completable.mergeDelayError(Arrays.asList(normal.completable, (Completable)null));
-
-        c.blockingAwait();
-    }
-
     @Test
     public void mergeDelayErrorIterableSingle() {
         Completable c = Completable.mergeDelayError(Collections.singleton(normal.completable));
@@ -1204,16 +1107,6 @@ public void onComplete() {
         Assert.assertEquals(0, calls.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void timerUnitNull() {
-        Completable.timer(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timerSchedulerNull() {
-        Completable.timer(1, TimeUnit.SECONDS, null);
-    }
-
     @Test
     public void usingNormalEager() {
         final AtomicInteger dispose = new AtomicInteger();
@@ -1398,32 +1291,6 @@ public void onComplete() {
         Assert.assertFalse(complete.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void usingResourceSupplierNull() {
-        Completable.using(null, new Function<Object, Completable>() {
-            @Override
-            public Completable apply(Object v) {
-                return normal.completable;
-            }
-        }, new Consumer<Object>() {
-            @Override
-            public void accept(Object v) { }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void usingMapperNull() {
-        Completable.using(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, null, new Consumer<Object>() {
-            @Override
-            public void accept(Object v) { }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void usingMapperReturnsNull() {
         Completable c = Completable.using(new Supplier<Object>() {
@@ -1444,21 +1311,6 @@ public void accept(Object v) { }
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void usingDisposeNull() {
-        Completable.using(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, new Function<Object, Completable>() {
-            @Override
-            public Completable apply(Object v) {
-                return normal.completable;
-            }
-        }, null);
-    }
-
     @Test(expected = TestException.class)
     public void usingResourceThrows() {
         Completable c = Completable.using(new Supplier<Object>() {
@@ -1530,11 +1382,6 @@ public Completable apply(Completable n) {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void composeNull() {
-        error.completable.compose(null);
-    }
-
     @Test
     public void concatWithNormal() {
         Completable c = normal.completable.concatWith(normal.completable);
@@ -1551,21 +1398,6 @@ public void concatWithError() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatWithNull() {
-        normal.completable.concatWith(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayUnitNull() {
-        normal.completable.delay(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySchedulerNull() {
-        normal.completable.delay(1, TimeUnit.SECONDS, null);
-    }
-
     @Test
     public void delayNormal() throws InterruptedException {
         Completable c = normal.completable.delay(250, TimeUnit.MILLISECONDS);
@@ -1712,11 +1544,6 @@ public void run() {
         Assert.assertEquals(0, calls.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnCompleteNull() {
-        normal.completable.doOnComplete(null);
-    }
-
     @Test(expected = TestException.class)
     public void doOnCompleteThrows() {
         Completable c = normal.completable.doOnComplete(new Action() {
@@ -1794,11 +1621,6 @@ public void onComplete() {
         Assert.assertEquals(1, calls.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnDisposeNull() {
-        normal.completable.doOnDispose(null);
-    }
-
     @Test
     public void doOnDisposeThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -1868,11 +1690,6 @@ public void accept(Throwable e) {
         Assert.assertTrue(err.get() instanceof TestException);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnErrorNull() {
-        normal.completable.doOnError(null);
-    }
-
     @Test
     public void doOnErrorThrows() {
         Completable c = error.completable.doOnError(new Consumer<Throwable>() {
@@ -1908,11 +1725,6 @@ public void accept(Disposable d) {
         Assert.assertEquals(10, calls.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnSubscribeNull() {
-        normal.completable.doOnSubscribe(null);
-    }
-
     @Test(expected = TestException.class)
     public void doOnSubscribeThrows() {
         Completable c = normal.completable.doOnSubscribe(new Consumer<Disposable>() {
@@ -1960,11 +1772,6 @@ public void run() {
         Assert.assertEquals(1, calls.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void liftNull() {
-        normal.completable.lift(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void liftReturnsNull() {
         Completable c = normal.completable.lift(new CompletableOperator() {
@@ -2015,11 +1822,6 @@ public void liftOnErrorComplete() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeWithNull() {
-        normal.completable.mergeWith(null);
-    }
-
     @Test
     public void mergeWithNormal() {
         Completable c = normal.completable.mergeWith(normal.completable);
@@ -2029,11 +1831,6 @@ public void mergeWithNormal() {
         normal.assertSubscriptions(2);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void observeOnNull() {
-        normal.completable.observeOn(null);
-    }
-
     @Test
     public void observeOnNormal() throws InterruptedException {
         final AtomicReference<String> name = new AtomicReference<>();
@@ -2120,16 +1917,6 @@ public boolean test(Throwable e) {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void onErrorCompleteNull() {
-        error.completable.onErrorComplete(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorResumeNextNull() {
-        error.completable.onErrorResumeNext(null);
-    }
-
     @Test
     public void onErrorResumeNextFunctionReturnsNull() {
         Completable c = error.completable.onErrorResumeNext(new Function<Throwable, Completable>() {
@@ -2314,16 +2101,6 @@ public boolean getAsBoolean() {
         Assert.assertEquals(5, calls.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void repeatUntilNull() {
-        normal.completable.repeatUntil(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void repeatWhenNull() {
-        normal.completable.repeatWhen(null);
-    }
-
     @Test
     public void retryNormal() {
         Completable c = normal.completable.retry();
@@ -2402,11 +2179,6 @@ public boolean test(Throwable e) {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void retryPredicateNull() {
-        error.completable.retry((Predicate<Throwable>)null);
-    }
-
     @Test
     public void retryPredicate5Times() {
         final AtomicInteger calls = new AtomicInteger(5);
@@ -2538,22 +2310,6 @@ public void accept(Throwable e) {
         Assert.assertFalse("Not completed", complete.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void subscribeTwoCallbacksFirstNull() {
-        normal.completable.subscribe(new Action() {
-            @Override
-            public void run() { }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeTwoCallbacksSecondNull() {
-        normal.completable.subscribe(new Action() {
-            @Override
-            public void run() { }
-        }, null);
-    }
-
     @Test
     public void subscribeTwoCallbacksCompleteThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -2651,26 +2407,6 @@ public void run() {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void subscribeActionNull() {
-        normal.completable.subscribe((Action)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeSubscriberNull() {
-        normal.completable.toFlowable().subscribe((Subscriber<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeObserverNull() {
-        normal.completable.toObservable().subscribe((Observer<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeCompletableSubscriberNull() {
-        normal.completable.subscribe((CompletableObserver)null);
-    }
-
     @Test
     public void subscribeSubscriberNormal() {
         TestSubscriber<Object> ts = new TestSubscriber<>();
@@ -2693,11 +2429,6 @@ public void subscribeSubscriberError() {
         ts.assertError(TestException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnNull() {
-        normal.completable.subscribeOn(null);
-    }
-
     @Test
     public void subscribeOnNormal() {
         final AtomicReference<String> name = new AtomicReference<>();
@@ -2763,21 +2494,6 @@ public Object call() throws Exception {
         normal.assertSubscriptions(0);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void timeoutUnitNull() {
-        normal.completable.timeout(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutSchedulerNull() {
-        normal.completable.timeout(1, TimeUnit.SECONDS, (Scheduler)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutOtherNull() {
-        normal.completable.timeout(1, TimeUnit.SECONDS, (Completable)null);
-    }
-
     @Test
     public void toNormal() {
         normal.completable
@@ -2818,11 +2534,6 @@ public Flowable<Integer> apply(Completable v) {
         .assertComplete();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toNull() {
-        normal.completable.to(null);
-    }
-
     @Test
     public void toFlowableNormal() {
         normal.completable.toFlowable().blockingForEach(Functions.emptyConsumer());
@@ -2863,11 +2574,6 @@ public Object get() {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toSingleSupplierNull() {
-        normal.completable.toSingle(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void toSingleSupplierReturnsNull() {
         normal.completable.toSingle(new Supplier<Object>() {
@@ -2896,11 +2602,6 @@ public void toSingleDefaultNormal() {
         Assert.assertEquals((Integer)1, normal.completable.toSingleDefault(1).blockingGet());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toSingleDefaultNull() {
-        normal.completable.toSingleDefault(null);
-    }
-
     @Test
     public void unsubscribeOnNormal() throws InterruptedException {
         final AtomicReference<String> name = new AtomicReference<>();
@@ -2942,11 +2643,6 @@ public void onComplete() {
         Assert.assertTrue(name.get().startsWith("RxComputation"));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void ambArrayNull() {
-        Completable.ambArray((Completable[])null);
-    }
-
     @Test
     public void ambArrayEmpty() {
         Completable c = Completable.ambArray();
@@ -3106,11 +2802,6 @@ public void ambIterableEmpty() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void ambIterableNull() {
-        Completable.amb((Iterable<Completable>)null);
-    }
-
     @Test
     public void ambIterableIteratorNull() {
         Completable.amb(new Iterable<Completable>() {
@@ -3184,11 +2875,6 @@ public void ambIterableIteratorNextThrows() {
                 .assertError(TestException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void ambWithNull() {
-        normal.completable.ambWith(null);
-    }
-
     @Test
     public void ambWithArrayOneFires() {
         PublishProcessor<Object> pp1 = PublishProcessor.create();
@@ -3424,21 +3110,6 @@ public void startWithObservableError() {
         to.assertNotComplete();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void startWithCompletableNull() {
-        normal.completable.startWith((Completable)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithFlowableNull() {
-        normal.completable.startWith((Flowable<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithObservableNull() {
-        normal.completable.startWith((Observable<Object>)null);
-    }
-
     @Test
     public void andThen() {
         TestSubscriber<String> ts = new TestSubscriber<>(0);
@@ -3830,11 +3501,6 @@ public void run() {
         Assert.assertEquals(0, calls.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnCompletedNull() {
-        normal.completable.doOnComplete(null);
-    }
-
     @Test(expected = TestException.class)
     public void doOnCompletedThrows() {
         Completable c = normal.completable.doOnComplete(new Action() {
@@ -3901,11 +3567,6 @@ public void run() {
         Assert.assertTrue("Closure not called", doneAfter.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doAfterTerminateNull() {
-        normal.completable.doAfterTerminate(null);
-    }
-
     @Test
     public void subscribeEmptyOnError() {
         expectUncaughtTestException(new Action() {
@@ -3939,16 +3600,6 @@ public void run() {
         });
     }
 
-    @Test(expected = NullPointerException.class)
-    public void andThenCompletableNull() {
-        normal.completable.andThen((Completable)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void andThenFlowableNull() {
-        normal.completable.andThen((Observable<Object>)null);
-    }
-
     @Test
     public void andThenCompletableNormal() {
         final AtomicBoolean run = new AtomicBoolean();
@@ -4286,11 +3937,6 @@ public void andThenSingle() {
         ts.assertNoErrors();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureNull() {
-        Completable.fromFuture(null);
-    }
-
     @Test
     public void fromFutureNormal() {
         ExecutorService exec = Executors.newSingleThreadExecutor();
@@ -4333,11 +3979,6 @@ public void run() {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromRunnableNull() {
-        Completable.fromRunnable(null);
-    }
-
     @Test
     public void fromRunnableNormal() {
         final AtomicInteger calls = new AtomicInteger();
@@ -4364,41 +4005,6 @@ public void fromRunnableThrows() {
         c.blockingAwait();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnErrorNullValue() {
-        Completable.complete().doOnError(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnSubscribeNullValue() {
-        Completable.complete().doOnSubscribe(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doAfterTerminateNullValue() {
-        Completable.complete().doAfterTerminate(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnTerminateNullValue() {
-        Completable.complete().doOnTerminate(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnCompleteNullValue() {
-        Completable.complete().doOnComplete(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnDisposeNullValue() {
-        Completable.complete().doOnDispose(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnEventNullValue() {
-        Completable.complete().doOnEvent(null);
-    }
-
     @Test
     public void doOnEventComplete() {
         final AtomicInteger atomicInteger = new AtomicInteger(0);
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
index d76b90de70..b08d6824e5 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
@@ -42,21 +42,11 @@ public class FlowableNullTests extends RxJavaTest {
     // Static methods
     //***********************************************************
 
-    @Test(expected = NullPointerException.class)
-    public void ambVarargsNull() {
-        Flowable.ambArray((Publisher<Object>[])null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void ambVarargsOneIsNull() {
         Flowable.ambArray(Flowable.never(), null).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void ambIterableNull() {
-        Flowable.amb((Iterable<Publisher<Object>>)null);
-    }
-
     @Test
     public void ambIterableIteratorNull() {
         Flowable.amb(new Iterable<Publisher<Object>>() {
@@ -74,16 +64,6 @@ public void ambIterableOneIsNull() {
                 .assertError(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void combineLatestIterableNull() {
-        Flowable.combineLatestDelayError((Iterable<Publisher<Object>>)null, new Function<Object[], Object>() {
-            @Override
-            public Object apply(Object[] v) {
-                return 1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableIteratorNull() {
         Flowable.combineLatestDelayError(new Iterable<Publisher<Object>>() {
@@ -109,11 +89,6 @@ public Object apply(Object[] v) {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void combineLatestIterableFunctionNull() {
-        Flowable.combineLatestDelayError(Arrays.asList(just1), null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableFunctionReturnsNull() {
         Flowable.combineLatestDelayError(Arrays.asList(just1), new Function<Object[], Object>() {
@@ -124,11 +99,6 @@ public Object apply(Object[] v) {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatIterableNull() {
-        Flowable.concat((Iterable<Publisher<Object>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatIterableIteratorNull() {
         Flowable.concat(new Iterable<Publisher<Object>>() {
@@ -144,32 +114,11 @@ public void concatIterableOneIsNull() {
         Flowable.concat(Arrays.asList(just1, null)).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatPublisherNull() {
-        Flowable.concat((Publisher<Publisher<Object>>)null);
-
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void concatArrayNull() {
-        Flowable.concatArray((Publisher<Object>[])null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatArrayOneIsNull() {
         Flowable.concatArray(just1, null).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void createNull() {
-        Flowable.unsafeCreate(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void deferFunctionNull() {
-        Flowable.defer(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void deferFunctionReturnsNull() {
         Flowable.defer(new Supplier<Publisher<Object>>() {
@@ -180,11 +129,6 @@ public Publisher<Object> get() {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void errorFunctionNull() {
-        Flowable.error((Supplier<Throwable>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void errorFunctionReturnsNull() {
         Flowable.error(new Supplier<Throwable>() {
@@ -195,26 +139,11 @@ public Throwable get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void errorThrowableNull() {
-        Flowable.error((Throwable)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void fromArrayNull() {
-        Flowable.fromArray((Object[])null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromArrayOneIsNull() {
         Flowable.fromArray(1, null).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromCallableNull() {
-        Flowable.fromCallable(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromCallableReturnsNull() {
         Flowable.fromCallable(new Callable<Object>() {
@@ -225,11 +154,6 @@ public Object call() throws Exception {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureNull() {
-        Flowable.fromFuture(null);
-    }
-
     @Test
     public void fromFutureReturnsNull() {
         FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
@@ -242,16 +166,6 @@ public void fromFutureReturnsNull() {
         ts.assertError(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureTimedFutureNull() {
-        Flowable.fromFuture(null, 1, TimeUnit.SECONDS);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void fromFutureTimedUnitNull() {
-        Flowable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedReturnsNull() {
       FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
@@ -259,11 +173,6 @@ public void fromFutureTimedReturnsNull() {
         Flowable.fromFuture(f, 1, TimeUnit.SECONDS).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromIterableNull() {
-        Flowable.fromIterable(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromIterableIteratorNull() {
         Flowable.fromIterable(new Iterable<Object>() {
@@ -279,16 +188,6 @@ public void fromIterableValueNull() {
         Flowable.fromIterable(Arrays.asList(1, null)).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromPublisherNull() {
-        Flowable.fromPublisher(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void generateConsumerNull() {
-        Flowable.generate(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void generateConsumerEmitsNull() {
         Flowable.generate(new Consumer<Emitter<Object>>() {
@@ -361,66 +260,6 @@ public Object apply(Object s, Emitter<Object> o) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void generateConsumerDisposeNull() {
-        BiConsumer<Integer, Emitter<Integer>> generator = new BiConsumer<Integer, Emitter<Integer>>() {
-            @Override
-            public void accept(Integer s, Emitter<Integer> o) {
-                o.onNext(1);
-            }
-        };
-        Flowable.generate(new Supplier<Integer>() {
-            @Override
-            public Integer get() {
-                return 1;
-            }
-        }, generator, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void generateFunctionDisposeNull() {
-        Flowable.generate(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, new BiFunction<Object, Emitter<Object>, Object>() {
-            @Override
-            public Object apply(Object s, Emitter<Object> o) {
-                o.onNext(1); return s;
-            }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void intervalUnitNull() {
-        Flowable.interval(1, null);
-    }
-
-    public void intervalSchedulerNull() {
-        Flowable.interval(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void intervalPeriodUnitNull() {
-        Flowable.interval(1, 1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void intervalPeriodSchedulerNull() {
-        Flowable.interval(1, 1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void intervalRangeUnitNull() {
-        Flowable.intervalRange(1, 1, 1, 1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void intervalRangeSchedulerNull() {
-        Flowable.intervalRange(1, 1, 1, 1, TimeUnit.SECONDS, null);
-    }
-
     @Test
     public void justNull() throws Exception {
         @SuppressWarnings("rawtypes")
@@ -448,11 +287,6 @@ public void justNull() throws Exception {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeIterableNull() {
-        Flowable.merge((Iterable<Publisher<Object>>)null, 128, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mergeIterableIteratorNull() {
         Flowable.merge(new Iterable<Publisher<Object>>() {
@@ -468,21 +302,11 @@ public void mergeIterableOneIsNull() {
         Flowable.merge(Arrays.asList(just1, null), 128, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeArrayNull() {
-        Flowable.mergeArray(128, 128, (Publisher<Object>[])null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mergeArrayOneIsNull() {
         Flowable.mergeArray(128, 128, just1, null).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeDelayErrorIterableNull() {
-        Flowable.mergeDelayError((Iterable<Publisher<Object>>)null, 128, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mergeDelayErrorIterableIteratorNull() {
         Flowable.mergeDelayError(new Iterable<Publisher<Object>>() {
@@ -498,66 +322,11 @@ public void mergeDelayErrorIterableOneIsNull() {
         Flowable.mergeDelayError(Arrays.asList(just1, null), 128, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeDelayErrorArrayNull() {
-        Flowable.mergeArrayDelayError(128, 128, (Publisher<Object>[])null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mergeDelayErrorArrayOneIsNull() {
         Flowable.mergeArrayDelayError(128, 128, just1, null).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void sequenceEqualFirstNull() {
-        Flowable.sequenceEqual(null, just1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sequenceEqualSecondNull() {
-        Flowable.sequenceEqual(just1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sequenceEqualComparatorNull() {
-        Flowable.sequenceEqual(just1, just1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void switchOnNextNull() {
-        Flowable.switchOnNext(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timerUnitNull() {
-        Flowable.timer(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timerSchedulerNull() {
-        Flowable.timer(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void usingResourceSupplierNull() {
-        Flowable.using(null, new Function<Object, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Object d) {
-                return just1;
-            }
-        }, Functions.emptyConsumer());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void usingFlowableSupplierNull() {
-        Flowable.using(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, null, Functions.emptyConsumer());
-    }
-
     @Test(expected = NullPointerException.class)
     public void usingFlowableSupplierReturnsNull() {
         Flowable.using(new Supplier<Object>() {
@@ -573,31 +342,6 @@ public Publisher<Object> apply(Object d) {
         }, Functions.emptyConsumer()).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void usingDisposeNull() {
-        Flowable.using(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, new Function<Object, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Object d) {
-                return just1;
-            }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zipIterableNull() {
-        Flowable.zip((Iterable<Publisher<Object>>)null, new Function<Object[], Object>() {
-            @Override
-            public Object apply(Object[] v) {
-                return 1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterableIteratorNull() {
         Flowable.zip(new Iterable<Publisher<Object>>() {
@@ -613,11 +357,6 @@ public Object apply(Object[] v) {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipIterableFunctionNull() {
-        Flowable.zip(Arrays.asList(just1, just1), null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterableFunctionReturnsNull() {
         Flowable.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
@@ -653,11 +392,6 @@ public Object apply(Object[] a) {
         }, true, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipIterable2FunctionNull() {
-        Flowable.zip(Arrays.asList(just1, just1), null, true, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterable2FunctionReturnsNull() {
         Flowable.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
@@ -672,26 +406,6 @@ public Object apply(Object[] a) {
     // Instance methods
     //*************************************************************
 
-    @Test(expected = NullPointerException.class)
-    public void allPredicateNull() {
-        just1.all(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void ambWithNull() {
-        just1.ambWith(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void anyPredicateNull() {
-        just1.any(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferSupplierNull() {
-        just1.buffer(1, 1, (Supplier<List<Integer>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void bufferSupplierReturnsNull() {
         just1.buffer(1, 1, new Supplier<Collection<Integer>>() {
@@ -702,21 +416,6 @@ public Collection<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void bufferTimedUnitNull() {
-        just1.buffer(1L, 1L, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferTimedSchedulerNull() {
-        just1.buffer(1L, 1L, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferTimedSupplierNull() {
-        just1.buffer(1L, 1L, TimeUnit.SECONDS, Schedulers.single(), null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void bufferTimedSupplierReturnsNull() {
         just1.buffer(1L, 1L, TimeUnit.SECONDS, Schedulers.single(), new Supplier<Collection<Integer>>() {
@@ -727,21 +426,6 @@ public Collection<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void bufferOpenCloseOpenNull() {
-        just1.buffer(null, new Function<Object, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Object o) {
-                return just1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferOpenCloseCloseNull() {
-        just1.buffer(just1, (Function<Integer, Publisher<Object>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void bufferOpenCloseCloseReturnsNull() {
         just1.buffer(just1, new Function<Integer, Publisher<Object>>() {
@@ -752,16 +436,6 @@ public Publisher<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void bufferBoundaryNull() {
-        just1.buffer((Publisher<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferBoundarySupplierNull() {
-        just1.buffer(just1, (Supplier<List<Integer>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void bufferBoundarySupplierReturnsNull() {
         just1.buffer(just1, new Supplier<Collection<Integer>>() {
@@ -772,19 +446,6 @@ public Collection<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void castNull() {
-        just1.cast(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void collectInitialSupplierNull() {
-        just1.collect((Supplier<Integer>)null, new BiConsumer<Integer, Integer>() {
-            @Override
-            public void accept(Integer a, Integer b) { }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void collectInitialSupplierReturnsNull() {
         just1.collect(new Supplier<Object>() {
@@ -798,39 +459,6 @@ public void accept(Object a, Integer b) { }
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void collectInitialCollectorNull() {
-        just1.collect(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void collectIntoInitialNull() {
-        just1.collectInto(null, new BiConsumer<Object, Integer>() {
-            @Override
-            public void accept(Object a, Integer b) { }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void collectIntoCollectorNull() {
-        just1.collectInto(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void composeNull() {
-        just1.compose(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void concatMapNull() {
-        just1.concatMap(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatMapReturnsNull() {
         just1.concatMap(new Function<Integer, Publisher<Object>>() {
@@ -841,11 +469,6 @@ public Publisher<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatMapIterableNull() {
-        just1.concatMapIterable(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatMapIterableReturnNull() {
         just1.concatMapIterable(new Function<Integer, Iterable<Object>>() {
@@ -871,21 +494,6 @@ public Iterator<Object> iterator() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatWithNull() {
-        just1.concatWith((Publisher<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void containsNull() {
-        just1.contains(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void debounceFunctionNull() {
-        just1.debounce(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void debounceFunctionReturnsNull() {
         just1.debounce(new Function<Integer, Publisher<Object>>() {
@@ -896,26 +504,6 @@ public Publisher<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void debounceTimedUnitNull() {
-        just1.debounce(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void debounceTimedSchedulerNull() {
-        just1.debounce(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void defaultIfEmptyNull() {
-        just1.defaultIfEmpty(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayWithFunctionNull() {
-        just1.delay(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void delayWithFunctionReturnsNull() {
         just1.delay(new Function<Integer, Publisher<Object>>() {
@@ -926,61 +514,6 @@ public Publisher<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void delayTimedUnitNull() {
-        just1.delay(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayTimedSchedulerNull() {
-        just1.delay(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySubscriptionTimedUnitNull() {
-        just1.delaySubscription(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySubscriptionTimedSchedulerNull() {
-        just1.delaySubscription(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySubscriptionSupplierNull() {
-        just1.delaySubscription((Publisher<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySubscriptionFunctionNull() {
-        just1.delaySubscription((Publisher<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayBothInitialSupplierNull() {
-        just1.delay(null, new Function<Integer, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Integer v) {
-                return just1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayBothInitialSupplierReturnsNull() {
-        just1.delay(null, new Function<Integer, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Integer v) {
-                return just1;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayBothItemSupplierNull() {
-        just1.delay(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void delayBothItemSupplierReturnsNull() {
         just1.delay(just1, new Function<Integer, Publisher<Object>>() {
@@ -991,21 +524,6 @@ public Publisher<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void distinctFunctionNull() {
-        just1.distinct(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void distinctSupplierNull() {
-        just1.distinct(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void distinctSupplierReturnsNull() {
         just1.distinct(new Function<Integer, Object>() {
@@ -1031,16 +549,6 @@ public Object apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void distinctUntilChangedFunctionNull() {
-        just1.distinctUntilChanged((Function<Integer, Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void distinctUntilChangedBiPredicateNull() {
-        just1.distinctUntilChanged((BiPredicate<Integer, Integer>)null);
-    }
-
     @Test
     public void distinctUntilChangedFunctionReturnsNull() {
         Flowable.range(1, 2).distinctUntilChanged(new Function<Integer, Object>() {
@@ -1051,109 +559,6 @@ public Object apply(Integer v) {
         }).test().assertResult(1);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnCancelNull() {
-        just1.doOnCancel(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnCompleteNull() {
-        just1.doOnComplete(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnEachSupplierNull() {
-        just1.doOnEach((Consumer<Notification<Integer>>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnEachSubscriberNull() {
-        just1.doOnEach((Subscriber<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnErrorNull() {
-        just1.doOnError(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnLifecycleOnSubscribeNull() {
-        just1.doOnLifecycle(null, new LongConsumer() {
-            @Override
-            public void accept(long v) { }
-        }, new Action() {
-            @Override
-            public void run() { }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnLifecycleOnRequestNull() {
-        just1.doOnLifecycle(new Consumer<Subscription>() {
-            @Override
-            public void accept(Subscription s) { }
-        }, null, new Action() {
-            @Override
-            public void run() { }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnLifecycleOnCancelNull() {
-        just1.doOnLifecycle(new Consumer<Subscription>() {
-            @Override
-            public void accept(Subscription s) { }
-        }, new LongConsumer() {
-            @Override
-            public void accept(long v) { }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnNextNull() {
-        just1.doOnNext(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnRequestNull() {
-        just1.doOnRequest(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnSubscribeNull() {
-        just1.doOnSubscribe(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnTerminatedNull() {
-        just1.doOnTerminate(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void elementAtNull() {
-        just1.elementAt(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void filterNull() {
-        just1.filter(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doAfterTerminateNull() {
-        just1.doAfterTerminate(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void firstNull() {
-        just1.first(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void flatMapNull() {
-        just1.flatMap(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapFunctionReturnsNull() {
         just1.flatMap(new Function<Integer, Publisher<Object>>() {
@@ -1164,21 +569,6 @@ public Publisher<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapNotificationOnNextNull() {
-        just1.flatMap(null, new Function<Throwable, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Throwable e) {
-                return just1;
-            }
-        }, new Supplier<Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> get() {
-                return just1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapNotificationOnNextReturnsNull() {
         just1.flatMap(new Function<Integer, Publisher<Integer>>() {
@@ -1199,36 +589,6 @@ public Publisher<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapNotificationOnErrorNull() {
-        just1.flatMap(new Function<Integer, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Integer v) {
-                return just1;
-            }
-        }, null, new Supplier<Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> get() {
-                return just1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void flatMapNotificationOnCompleteNull() {
-        just1.flatMap(new Function<Integer, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Integer v) {
-                return just1;
-            }
-        }, new Function<Throwable, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Throwable e) {
-                return just1;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapNotificationOnCompleteReturnsNull() {
         just1.flatMap(new Function<Integer, Publisher<Integer>>() {
@@ -1249,16 +609,6 @@ public Publisher<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapCombinerMapperNull() {
-        just1.flatMap(null, new BiFunction<Integer, Object, Object>() {
-            @Override
-            public Object apply(Integer a, Object b) {
-                return 1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapCombinerMapperReturnsNull() {
         just1.flatMap(new Function<Integer, Publisher<Object>>() {
@@ -1274,16 +624,6 @@ public Object apply(Integer a, Object b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapCombinerCombinerNull() {
-        just1.flatMap(new Function<Integer, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Integer v) {
-                return just1;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapCombinerCombinerReturnsNull() {
         just1.flatMap(new Function<Integer, Publisher<Integer>>() {
@@ -1299,11 +639,6 @@ public Object apply(Integer a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapIterableMapperNull() {
-        just1.flatMapIterable(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapIterableMapperReturnsNull() {
         just1.flatMapIterable(new Function<Integer, Iterable<Object>>() {
@@ -1339,16 +674,6 @@ public Iterable<Integer> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapIterableCombinerNull() {
-        just1.flatMapIterable(new Function<Integer, Iterable<Integer>>() {
-            @Override
-            public Iterable<Integer> apply(Integer v) {
-                return Arrays.asList(1);
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapIterableCombinerReturnsNull() {
         just1.flatMapIterable(new Function<Integer, Iterable<Integer>>() {
@@ -1364,44 +689,6 @@ public Object apply(Integer a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void forEachNull() {
-        just1.forEach(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void forEachWhileNull() {
-        just1.forEachWhile(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void forEachWhileOnErrorNull() {
-        just1.forEachWhile(new Predicate<Integer>() {
-            @Override
-            public boolean test(Integer v) {
-                return true;
-            }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void forEachWhileOnCompleteNull() {
-        just1.forEachWhile(new Predicate<Integer>() {
-            @Override
-            public boolean test(Integer v) {
-                return true;
-            }
-        }, new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable e) { }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void groupByNull() {
-        just1.groupBy(null);
-    }
-
     public void groupByKeyNull() {
         just1.groupBy(new Function<Integer, Object>() {
             @Override
@@ -1411,16 +698,6 @@ public Object apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void groupByValueNull() {
-        just1.groupBy(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void groupByValueReturnsNull() {
         just1.groupBy(new Function<Integer, Object>() {
@@ -1436,16 +713,6 @@ public Object apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void lastNull() {
-        just1.last(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void liftNull() {
-        just1.lift(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void liftReturnsNull() {
         just1.lift(new FlowableOperator<Object, Integer>() {
@@ -1456,11 +723,6 @@ public Subscriber<? super Integer> apply(Subscriber<? super Object> s) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mapNull() {
-        just1.map(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mapReturnsNull() {
         just1.map(new Function<Integer, Object>() {
@@ -1471,36 +733,6 @@ public Object apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeWithNull() {
-        just1.mergeWith((Publisher<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void observeOnNull() {
-        just1.observeOn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void ofTypeNull() {
-        just1.ofType(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onBackpressureBufferOverflowNull() {
-        just1.onBackpressureBuffer(10, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onBackpressureDropActionNull() {
-        just1.onBackpressureDrop(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorResumeNextNull() {
-        just1.onErrorResumeNext(null);
-    }
-
     @Test
     public void onErrorResumeNextFunctionReturnsNull() {
         try {
@@ -1519,21 +751,6 @@ public Publisher<Object> apply(Throwable e) {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void onErrorResumeWithNull() {
-        just1.onErrorResumeWith(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorReturnFunctionNull() {
-        just1.onErrorReturn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorReturnValueNull() {
-        just1.onErrorReturnItem(null);
-    }
-
     @Test
     public void onErrorReturnFunctionReturnsNull() {
         try {
@@ -1552,11 +769,6 @@ public Object apply(Throwable e) {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void publishFunctionNull() {
-        just1.publish(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void publishFunctionReturnsNull() {
         just1.publish(new Function<Flowable<Integer>, Publisher<Object>>() {
@@ -1567,11 +779,6 @@ public Publisher<Object> apply(Flowable<Integer> v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void reduceFunctionNull() {
-        just1.reduce(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void reduceFunctionReturnsNull() {
         Flowable.just(1, 1).reduce(new BiFunction<Integer, Integer, Integer>() {
@@ -1582,21 +789,6 @@ public Integer apply(Integer a, Integer b) {
         }).toFlowable().blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void reduceSeedNull() {
-        just1.reduce(null, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void reduceSeedFunctionNull() {
-        just1.reduce(1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void reduceSeedFunctionReturnsNull() {
         just1.reduce(1, new BiFunction<Integer, Integer, Integer>() {
@@ -1632,16 +824,6 @@ public Object apply(Object a, Integer b) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void repeatUntilNull() {
-        just1.repeatUntil(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void repeatWhenNull() {
-        just1.repeatWhen(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void repeatWhenFunctionReturnsNull() {
         just1.repeatWhen(new Function<Flowable<Object>, Publisher<Object>>() {
@@ -1667,454 +849,124 @@ public Publisher<Object> apply(Flowable<Integer> f) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void replayBoundedSelectorNull() {
-        just1.replay((Function<Flowable<Integer>, Flowable<Integer>>)null, 1, 1, TimeUnit.SECONDS);
-    }
-
     @Test(expected = NullPointerException.class)
     public void replayBoundedSelectorReturnsNull() {
         just1.replay(new Function<Flowable<Integer>, Publisher<Object>>() {
-            @Override
-            public Publisher<Object> apply(Flowable<Integer> v) {
-                return null;
-            }
-        }, 1, 1, TimeUnit.SECONDS).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayBoundedUnitNull() {
-        just1.replay(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Flowable<Integer> v) {
-                return v;
-            }
-        }, 1, 1, null).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayBoundedSchedulerNull() {
-        just1.replay(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Flowable<Integer> v) {
-                return v;
-            }
-        }, 1, 1, TimeUnit.SECONDS, null).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeBoundedSelectorNull() {
-        just1.replay(null, 1, TimeUnit.SECONDS, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeBoundedSelectorReturnsNull() {
-        just1.replay(new Function<Flowable<Integer>, Publisher<Object>>() {
-            @Override
-            public Publisher<Object> apply(Flowable<Integer> v) {
-                return null;
-            }
-        }, 1, TimeUnit.SECONDS, Schedulers.single()).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replaySelectorTimeBoundedUnitNull() {
-        just1.replay(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Flowable<Integer> v) {
-                return v;
-            }
-        }, 1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replaySelectorTimeBoundedSchedulerNull() {
-        just1.replay(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Flowable<Integer> v) {
-                return v;
-            }
-        }, 1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeSizeBoundedUnitNull() {
-        just1.replay(1, 1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeSizeBoundedSchedulerNull() {
-        just1.replay(1, 1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeBoundedUnitNull() {
-        just1.replay(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeBoundedSchedulerNull() {
-        just1.replay(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryFunctionNull() {
-        just1.retry((BiPredicate<Integer, Throwable>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryCountFunctionNull() {
-        just1.retry(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryPredicateNull() {
-        just1.retry((Predicate<Throwable>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryWhenFunctionNull() {
-        just1.retryWhen(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryWhenFunctionReturnsNull() {
-        Flowable.error(new TestException()).retryWhen(new Function<Flowable<? extends Throwable>, Publisher<Object>>() {
-            @Override
-            public Publisher<Object> apply(Flowable<? extends Throwable> f) {
-                return null;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryUntil() {
-        just1.retryUntil(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void safeSubscribeNull() {
-        just1.safeSubscribe(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sampleUnitNull() {
-        just1.sample(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sampleSchedulerNull() {
-        just1.sample(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void samplePublisherNull() {
-        just1.sample(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanFunctionNull() {
-        just1.scan(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanFunctionReturnsNull() {
-        Flowable.just(1, 1).scan(new BiFunction<Integer, Integer, Integer>() {
-            @Override
-            public Integer apply(Integer a, Integer b) {
-                return null;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanSeedNull() {
-        just1.scan(null, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanSeedFunctionNull() {
-        just1.scan(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanSeedFunctionReturnsNull() {
-        just1.scan(1, new BiFunction<Integer, Integer, Integer>() {
-            @Override
-            public Integer apply(Integer a, Integer b) {
-                return null;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanSeedSupplierNull() {
-        just1.scanWith(null, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanSeedSupplierReturnsNull() {
-        just1.scanWith(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return null;
-            }
-        }, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return 1;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanSeedSupplierFunctionNull() {
-        just1.scanWith(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanSeedSupplierFunctionReturnsNull() {
-        just1.scanWith(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return null;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void singleNull() {
-        just1.single(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipTimedUnitNull() {
-        just1.skip(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipTimedSchedulerNull() {
-        just1.skip(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipLastTimedUnitNull() {
-        just1.skipLast(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipLastTimedSchedulerNull() {
-        just1.skipLast(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipUntilNull() {
-        just1.skipUntil(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipWhileNull() {
-        just1.skipWhile(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithIterableNull() {
-        just1.startWithIterable((Iterable<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithIterableIteratorNull() {
-        just1.startWithIterable(new Iterable<Integer>() {
-            @Override
-            public Iterator<Integer> iterator() {
-                return null;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithIterableOneNull() {
-        just1.startWithIterable(Arrays.asList(1, null)).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithSingleNull() {
-        just1.startWithItem((Integer)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithPublisherNull() {
-        just1.startWith((Publisher<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithArrayNull() {
-        just1.startWithArray((Integer[])null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithArrayOneNull() {
-        just1.startWithArray(1, null).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnNextNull() {
-        just1.subscribe((Consumer<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnErrorNull() {
-        just1.subscribe(Functions.emptyConsumer(), null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnCompleteNull() {
-        just1.subscribe(Functions.emptyConsumer(), Functions.emptyConsumer(), null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeNull() {
-        just1.subscribe((Subscriber<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeNull2() {
-        just1.subscribe((FlowableSubscriber<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnNull() {
-        just1.subscribeOn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void switchIfEmptyNull() {
-        just1.switchIfEmpty(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void switchMapNull() {
-        just1.switchMap(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void switchMapFunctionReturnsNull() {
-        just1.switchMap(new Function<Integer, Publisher<Object>>() {
-            @Override
-            public Publisher<Object> apply(Integer v) {
-                return null;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeTimedUnitNull() {
-        just1.take(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeTimedSchedulerNull() {
-        just1.take(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeLastTimedUnitNull() {
-        just1.takeLast(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeLastSizeTimedUnitNull() {
-        just1.takeLast(1, 1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeLastTimedSchedulerNull() {
-        just1.takeLast(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeLastSizeTimedSchedulerNull() {
-        just1.takeLast(1, 1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeUntilPredicateNull() {
-        just1.takeUntil((Predicate<Integer>)null);
+            @Override
+            public Publisher<Object> apply(Flowable<Integer> v) {
+                return null;
+            }
+        }, 1, 1, TimeUnit.SECONDS).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void takeUntilPublisherNull() {
-        just1.takeUntil((Publisher<Integer>)null);
+    public void replayTimeBoundedSelectorReturnsNull() {
+        just1.replay(new Function<Flowable<Integer>, Publisher<Object>>() {
+            @Override
+            public Publisher<Object> apply(Flowable<Integer> v) {
+                return null;
+            }
+        }, 1, TimeUnit.SECONDS, Schedulers.single()).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void takeWhileNull() {
-        just1.takeWhile(null);
+    public void retryWhenFunctionReturnsNull() {
+        Flowable.error(new TestException()).retryWhen(new Function<Flowable<? extends Throwable>, Publisher<Object>>() {
+            @Override
+            public Publisher<Object> apply(Flowable<? extends Throwable> f) {
+                return null;
+            }
+        }).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void throttleFirstUnitNull() {
-        just1.throttleFirst(1, null, Schedulers.single());
+    public void scanFunctionReturnsNull() {
+        Flowable.just(1, 1).scan(new BiFunction<Integer, Integer, Integer>() {
+            @Override
+            public Integer apply(Integer a, Integer b) {
+                return null;
+            }
+        }).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void throttleFirstSchedulerNull() {
-        just1.throttleFirst(1, TimeUnit.SECONDS, null);
+    public void scanSeedNull() {
+        just1.scan(null, new BiFunction<Object, Integer, Object>() {
+            @Override
+            public Object apply(Object a, Integer b) {
+                return 1;
+            }
+        });
     }
 
     @Test(expected = NullPointerException.class)
-    public void throttleLastUnitNull() {
-        just1.throttleLast(1, null, Schedulers.single());
+    public void scanSeedFunctionReturnsNull() {
+        just1.scan(1, new BiFunction<Integer, Integer, Integer>() {
+            @Override
+            public Integer apply(Integer a, Integer b) {
+                return null;
+            }
+        }).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void throttleLastSchedulerNull() {
-        just1.throttleLast(1, TimeUnit.SECONDS, null);
+    public void scanSeedSupplierReturnsNull() {
+        just1.scanWith(new Supplier<Object>() {
+            @Override
+            public Object get() {
+                return null;
+            }
+        }, new BiFunction<Object, Integer, Object>() {
+            @Override
+            public Object apply(Object a, Integer b) {
+                return 1;
+            }
+        }).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void throttleWithTimeoutUnitNull() {
-        just1.throttleWithTimeout(1, null, Schedulers.single());
+    public void scanSeedSupplierFunctionReturnsNull() {
+        just1.scanWith(new Supplier<Object>() {
+            @Override
+            public Object get() {
+                return 1;
+            }
+        }, new BiFunction<Object, Integer, Object>() {
+            @Override
+            public Object apply(Object a, Integer b) {
+                return null;
+            }
+        }).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void throttleWithTimeoutSchedulerNull() {
-        just1.throttleWithTimeout(1, TimeUnit.SECONDS, null);
+    public void startWithIterableIteratorNull() {
+        just1.startWithIterable(new Iterable<Integer>() {
+            @Override
+            public Iterator<Integer> iterator() {
+                return null;
+            }
+        }).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void timeIntervalUnitNull() {
-        just1.timeInterval(null, Schedulers.single());
+    public void startWithIterableOneNull() {
+        just1.startWithIterable(Arrays.asList(1, null)).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void timeIntervalSchedulerNull() {
-        just1.timeInterval(TimeUnit.SECONDS, null);
+    public void startWithArrayOneNull() {
+        just1.startWithArray(1, null).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
-    public void timeoutSelectorNull() {
-        just1.timeout(null);
+    public void switchMapFunctionReturnsNull() {
+        just1.switchMap(new Function<Integer, Publisher<Object>>() {
+            @Override
+            public Publisher<Object> apply(Integer v) {
+                return null;
+            }
+        }).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
@@ -2137,36 +989,6 @@ public Publisher<Integer> apply(Integer v) {
         }, null);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void timeoutUnitNull() {
-        just1.timeout(1, null, Schedulers.single(), just1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeouOtherNull() {
-        just1.timeout(1, TimeUnit.SECONDS, Schedulers.single(), null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeouSchedulerNull() {
-        just1.timeout(1, TimeUnit.SECONDS, null, just1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutFirstNull() {
-        just1.timeout((Publisher<Integer>)null, new Function<Integer, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Integer v) {
-                return just1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutFirstItemNull() {
-        just1.timeout(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void timeoutFirstItemReturnsNull() {
         just1.timeout(Flowable.never(), new Function<Integer, Publisher<Object>>() {
@@ -2187,16 +1009,6 @@ public void timestampSchedulerNull() {
         just1.timestamp(TimeUnit.SECONDS, null);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toNull() {
-        just1.to(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toListNull() {
-        just1.toList(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void toListSupplierReturnsNull() {
         just1.toList(new Supplier<Collection<Integer>>() {
@@ -2217,26 +1029,6 @@ public Collection<Integer> get() {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toSortedListNull() {
-        just1.toSortedList(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toMapKeyNullAllowed() {
-        just1.toMap(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toMapValueNull() {
-        just1.toMap(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test
     public void toMapValueSelectorReturnsNull() {
         just1.toMap(new Function<Integer, Object>() {
@@ -2252,21 +1044,6 @@ public Object apply(Integer v) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toMapMapSupplierNull() {
-        just1.toMap(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void toMapMapSupplierReturnsNull() {
         just1.toMap(new Function<Integer, Object>() {
@@ -2287,21 +1064,6 @@ public Map<Object, Object> get() {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toMultimapKeyNull() {
-        just1.toMultimap(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toMultimapValueNull() {
-        just1.toMultimap(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test
     public void toMultiMapValueSelectorReturnsNullAllowed() {
         just1.toMap(new Function<Integer, Object>() {
@@ -2317,21 +1079,6 @@ public Object apply(Integer v) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toMultimapMapMapSupplierNull() {
-        just1.toMultimap(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void toMultimapMapSupplierReturnsNull() {
         just1.toMultimap(new Function<Integer, Object>() {
@@ -2352,26 +1099,6 @@ public Map<Object, Collection<Object>> get() {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toMultimapMapMapCollectionSupplierNull() {
-        just1.toMultimap(new Function<Integer, Integer>() {
-            @Override
-            public Integer apply(Integer v) {
-                return v;
-            }
-        }, new Function<Integer, Integer>() {
-            @Override
-            public Integer apply(Integer v) {
-                return v;
-            }
-        }, new Supplier<Map<Integer, Collection<Integer>>>() {
-            @Override
-            public Map<Integer, Collection<Integer>> get() {
-                return new HashMap<>();
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void toMultimapMapCollectionSupplierReturnsNull() {
         just1.toMultimap(new Function<Integer, Integer>() {
@@ -2397,36 +1124,6 @@ public Collection<Integer> apply(Integer v) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void unsubscribeOnNull() {
-        just1.unsubscribeOn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowTimedUnitNull() {
-        just1.window(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowSizeTimedUnitNull() {
-        just1.window(1, null, Schedulers.single(), 1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowTimedSchedulerNull() {
-        just1.window(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowSizeTimedSchedulerNull() {
-        just1.window(1, TimeUnit.SECONDS, null, 1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowBoundaryNull() {
-        just1.window((Publisher<Integer>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void windowOpenCloseOpenNull() {
         just1.window(null, new Function<Object, Publisher<Integer>>() {
@@ -2437,11 +1134,6 @@ public Publisher<Integer> apply(Object v) {
         });
     }
 
-    @Test(expected = NullPointerException.class)
-    public void windowOpenCloseCloseNull() {
-        just1.window(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void windowOpenCloseCloseReturnsNull() {
         Flowable.never().window(just1, new Function<Integer, Publisher<Object>>() {
@@ -2462,11 +1154,6 @@ public Object apply(Integer a, Object b) {
         });
     }
 
-    @Test(expected = NullPointerException.class)
-    public void withLatestFromCombinerNull() {
-        just1.withLatestFrom(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void withLatestFromCombinerReturnsNull() {
         just1.withLatestFrom(just1, new BiFunction<Integer, Integer, Object>() {
@@ -2487,11 +1174,6 @@ public Object apply(Integer a, Integer b) {
         });
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipWithIterableCombinerNull() {
-        just1.zipWith(Arrays.asList(1), null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipWithIterableCombinerReturnsNull() {
         just1.zipWith(Arrays.asList(1), new BiFunction<Integer, Integer, Object>() {
@@ -2537,11 +1219,6 @@ public Object apply(Integer a, Integer b) {
         });
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipWithCombinerNull() {
-        just1.zipWith(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipWithCombinerReturnsNull() {
         just1.zipWith(just1, new BiFunction<Integer, Integer, Object>() {
@@ -2626,34 +1303,6 @@ public void serializedSubjectOnErrorNull() {
         processor.blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnLifecycleOnDisposeNull() {
-        just1.doOnLifecycle(new Consumer<Subscription>() {
-            @Override
-            public void accept(Subscription s) { }
-        },
-        new LongConsumer() {
-            @Override
-            public void accept(long v) throws Exception { }
-        },
-        null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zipWithFlowableNull() {
-        just1.zipWith((Flowable<Integer>)null, new BiFunction<Integer, Integer, Object>() {
-            @Override
-            public Object apply(Integer a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void unsafeSubscribeNull() {
-        just1.subscribe((FlowableSubscriber<Object>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableFunctionReturnsNull() {
         Flowable.combineLatestDelayError(Arrays.asList(just1), new Function<Object[], Object>() {
@@ -2664,26 +1313,6 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void combineLatestDelayErrorIterableFunctionNull() {
-        Flowable.combineLatestDelayError(Arrays.asList(just1), null, 128);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void concatFlowableNull() {
-        Flowable.concat((Flowable<Flowable<Object>>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void combineLatestDelayErrorIterableNull() {
-        Flowable.combineLatestDelayError((Iterable<Flowable<Object>>)null, new Function<Object[], Object>() {
-            @Override
-            public Object apply(Object[] v) {
-                return 1;
-            }
-        }, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableIteratorNull() {
         Flowable.combineLatestDelayError(new Iterable<Flowable<Object>>() {
@@ -2699,11 +1328,6 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnDisposeNull() {
-        just1.doOnCancel(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableOneIsNull() {
         Flowable.combineLatestDelayError(Arrays.asList(Flowable.never(), null), new Function<Object[], Object>() {
@@ -2713,24 +1337,4 @@ public Object apply(Object[] v) {
             }
         }, 128).blockingLast();
     }
-
-    @Test(expected = NullPointerException.class)
-    public void takeUntilFlowableNull() {
-        just1.takeUntil((Flowable<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithFlowableNull() {
-        just1.startWith((Flowable<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySubscriptionOtherNull() {
-        just1.delaySubscription((Flowable<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sampleFlowableNull() {
-        just1.sample(null);
-    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
index 3d462efe0b..7662f3ebdf 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
@@ -999,13 +999,6 @@ public void emptyIsEmpty() {
         verify(w, never()).onError(any(Throwable.class));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void forEachWithNull() {
-        Flowable.error(new Exception("boo"))
-        //
-        .forEach(null);
-    }
-
     @Test
     public void extend() {
         final TestSubscriber<Object> subscriber = new TestSubscriber<>();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
index c6b201be51..a98f3b5abb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
@@ -28,12 +28,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableAndThenCompletableabTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void andThenCompletableCompleteNull() {
-        Completable.complete()
-                .andThen((Completable) null);
-    }
-
     @Test
     public void andThenCompletableCompleteComplete() {
         Completable.complete()
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java
index 41656dbf33..b72fda422c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java
@@ -19,12 +19,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableAndThenTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void andThenMaybeNull() {
-        Completable.complete()
-            .andThen((Maybe<Object>) null);
-    }
-
     @Test
     public void andThenMaybeCompleteValue() {
         Completable.complete()
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
index 2ee2550872..d0323011fb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
@@ -29,11 +29,6 @@
 
 public class CompletableCreateTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void nullArgument() {
-        Completable.create(null);
-    }
-
     @Test
     public void basic() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java
index cd0df19aaf..815482b02f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java
@@ -65,11 +65,6 @@ public Completable apply(Completable f) throws Exception {
         });
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullAction() {
-        Completable.complete().doFinally(null);
-    }
-
     @Test
     public void actionThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
index fb45fc3bad..56354fc448 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
@@ -24,11 +24,6 @@
 import io.reactivex.rxjava3.functions.Action;
 
 public class CompletableFromActionTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromActionNull() {
-        Completable.fromAction(null);
-    }
-
     @Test
     public void fromAction() {
         final AtomicInteger atomicInteger = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
index 6cf88ce667..7bd5011ca7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
@@ -32,11 +32,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableFromCallableTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromCallableNull() {
-        Completable.fromCallable(null);
-    }
-
     @Test
     public void fromCallable() {
         final AtomicInteger atomicInteger = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java
index 9158d449c3..2651f04f2c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java
@@ -18,11 +18,6 @@
 import io.reactivex.rxjava3.core.*;
 
 public class CompletableFromMaybeTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromMaybeNull() {
-        Completable.fromMaybe(null);
-    }
-
     @Test
     public void fromMaybe() {
         Completable.fromMaybe(Maybe.just(1))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java
index 9869ed04db..ab72061437 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java
@@ -18,11 +18,6 @@
 import io.reactivex.rxjava3.core.*;
 
 public class CompletableFromObservableTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromObservableNull() {
-        Completable.fromObservable(null);
-    }
-
     @Test
     public void fromObservable() {
         Completable.fromObservable(Observable.just(1))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java
index 7cfd899262..c6d37d738d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java
@@ -20,11 +20,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableFromPublisherTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromPublisherNull() {
-        Completable.fromPublisher(null);
-    }
-
     @Test
     public void fromPublisher() {
         Completable.fromPublisher(Flowable.just(1))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
index 276ae320b6..5d6473077f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
@@ -23,11 +23,6 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 
 public class CompletableFromRunnableTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromRunnableNull() {
-        Completable.fromRunnable(null);
-    }
-
     @Test
     public void fromRunnable() {
         final AtomicInteger atomicInteger = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java
index f9c6e82676..e8595f299e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java
@@ -18,11 +18,6 @@
 import io.reactivex.rxjava3.core.*;
 
 public class CompletableFromSingleTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromSingleNull() {
-        Completable.fromSingle(null);
-    }
-
     @Test
     public void fromSingle() {
         Completable.fromSingle(Single.just(1))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
index 73dda447c8..bcad666785 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
@@ -34,11 +34,6 @@
 
 public class CompletableFromSupplierTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void fromSupplierNull() {
-        Completable.fromSupplier(null);
-    }
-
     @Test
     public void fromSupplier() {
         final AtomicInteger atomicInteger = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
index d0c0adfb70..38b05b0920 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
@@ -31,19 +31,6 @@
 
 public class FlowableCreateTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void sourceNull() {
-        Flowable.create(null, BackpressureStrategy.BUFFER);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void modeNull() {
-        Flowable.create(new FlowableOnSubscribe<Object>() {
-            @Override
-            public void subscribe(FlowableEmitter<Object> s) throws Exception { }
-        }, null);
-    }
-
     @Test
     public void basic() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -767,11 +754,6 @@ public void subscribe(FlowableEmitter<Integer> e) throws Exception {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullArgument() {
-        Flowable.create(null, BackpressureStrategy.MISSING);
-    }
-
     @Test
     public void onErrorCrash() {
         for (BackpressureStrategy m : BackpressureStrategy.values()) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
index fde11b5ea1..bb9faa4bca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
@@ -308,11 +308,6 @@ public void accept(Subscription s) {
         Assert.assertFalse(subscribed.get());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void otherNull() {
-        Flowable.just(1).delaySubscription((Flowable<Integer>)null);
-    }
-
     @Test
     public void badSourceOther() {
         TestHelper.checkBadSourceFlowable(new Function<Flowable<Integer>, Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
index 47f0d74e0b..2ef5d0e082 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
@@ -133,11 +133,6 @@ public void asyncFused() {
         assertEquals(Arrays.asList(-1, -2, -3, -4, -5), values);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void consumerNull() {
-        Flowable.just(1).doAfterNext(null);
-    }
-
     @Test
     public void justConditional() {
         Flowable.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
index 8249383dca..850c531203 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
@@ -297,11 +297,6 @@ public void asyncFusedBoundaryConditional() {
         assertEquals(1, calls);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullAction() {
-        Flowable.just(1).doFinally(null);
-    }
-
     @Test
     public void actionThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
index 6385d58d95..d49111c25b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
@@ -38,11 +38,6 @@
 
 public class FlowableFromIterableTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void nullValue() {
-        Flowable.fromIterable(null);
-    }
-
     @Test
     public void listIterable() {
         Flowable<String> flowable = Flowable.fromIterable(Arrays.<String> asList("one", "two", "three"));
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
index a877b1a390..cc5992862b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
@@ -215,14 +215,6 @@ public void fixBackpressureBufferZeroCapacity2() throws InterruptedException {
         Flowable.empty().onBackpressureBuffer(0);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fixBackpressureBufferNullStrategy() throws InterruptedException {
-        Flowable.empty().onBackpressureBuffer(10, new Action() {
-            @Override
-            public void run() { }
-        }, null);
-    }
-
     @Test
     public void noDelayError() {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
index da75df361c..747b96faf1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
@@ -53,16 +53,6 @@ public void complete() {
         .assertResult();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullUnit() {
-        Maybe.just(1).delay(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void nullScheduler() {
-        Maybe.just(1).delay(1, TimeUnit.MILLISECONDS, null);
-    }
-
     @Test
     public void disposeDuringDelay() {
         TestScheduler scheduler = new TestScheduler();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
index d772193241..045f23de64 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
@@ -77,11 +77,6 @@ public void empty() {
         assertTrue(values.isEmpty());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void consumerNull() {
-        Maybe.just(1).doAfterSuccess(null);
-    }
-
     @Test
     public void justConditional() {
         Maybe.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java
index 1be982960e..fe54a5a299 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java
@@ -115,11 +115,6 @@ public void normalErrorConditional() {
         assertEquals(1, calls);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullAction() {
-        Maybe.just(1).doFinally(null);
-    }
-
     @Test
     public void actionThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java
index 8f93185207..cfcb6a548f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java
@@ -27,11 +27,6 @@
 
 public class MaybeDoOnTerminateTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void doOnTerminate() {
-        Maybe.just(1).doOnTerminate(null);
-    }
-
     @Test
     public void doOnTerminateSuccess() {
         final AtomicBoolean atomicBoolean = new AtomicBoolean();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
index c3409aed66..3d85785add 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
@@ -21,12 +21,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFlatMapSingleElementTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void flatMapSingleElementNull() {
-        Maybe.just(1)
-            .flatMapSingleElement(null);
-    }
-
     @Test
     public void flatMapSingleElementValue() {
         Maybe.just(1).flatMapSingleElement(new Function<Integer, SingleSource<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
index 60b1a98f3b..c4cef0d351 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
@@ -23,12 +23,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFlatMapSingleTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void flatMapSingleNull() {
-        Maybe.just(1)
-            .flatMapSingle(null);
-    }
-
     @Test
     public void flatMapSingleValue() {
         Maybe.just(1).flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
index ccd87877cd..4f1cc27355 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
@@ -30,11 +30,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromActionTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromActionNull() {
-        Maybe.fromAction(null);
-    }
-
     @Test
     public void fromAction() {
         final AtomicInteger atomicInteger = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
index b934f98fdf..70c432f5ae 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
@@ -34,11 +34,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromCallableTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromCallableNull() {
-        Maybe.fromCallable(null);
-    }
-
     @Test
     public void fromCallable() {
         final AtomicInteger atomicInteger = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java
index 3549901863..c891714b69 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java
@@ -24,11 +24,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromCompletableTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromCompletableNull() {
-        Maybe.fromCompletable(null);
-    }
-
     @Test
     public void fromCompletable() {
         Maybe.fromCompletable(Completable.complete())
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
index b5bc8d9727..37325c69c8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
@@ -30,11 +30,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromRunnableTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromRunnableNull() {
-        Maybe.fromRunnable(null);
-    }
-
     @Test
     public void fromRunnable() {
         final AtomicInteger atomicInteger = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java
index 989bb78985..108c38d30f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java
@@ -24,11 +24,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeFromSingleTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void fromSingleNull() {
-        Maybe.fromSingle(null);
-    }
-
     @Test
     public void fromSingle() {
         Maybe.fromSingle(Single.just(1))
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
index b8196e3917..247021b12b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
@@ -35,11 +35,6 @@
 
 public class MaybeFromSupplierTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void fromSupplierNull() {
-        Maybe.fromSupplier(null);
-    }
-
     @Test
     public void fromSupplier() {
         final AtomicInteger atomicInteger = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
index f5be343b40..a0faf3179b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
@@ -29,11 +29,6 @@
 
 public class ObservableCreateTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void nullArgument() {
-        Observable.create(null);
-    }
-
     @Test
     public void basic() {
         final Disposable d = Disposable.empty();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
index 411989a0f1..9c750bba88 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
@@ -145,11 +145,6 @@ public void asyncFused() {
         assertEquals(Arrays.asList(-1, -2, -3, -4, -5), values);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void consumerNull() {
-        Observable.just(1).doAfterNext(null);
-    }
-
     @Test
     public void justConditional() {
         Observable.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
index 0cc21b8f13..6328a1ba4f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
@@ -299,11 +299,6 @@ public void asyncFusedBoundaryConditional() {
         assertEquals(1, calls);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullAction() {
-        Observable.just(1).doFinally(null);
-    }
-
     @Test
     public void actionThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
index d744472b66..a3c546933a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
@@ -36,11 +36,6 @@
 
 public class ObservableFromIterableTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void nullValue() {
-        Observable.fromIterable(null);
-    }
-
     @Test
     public void listIterable() {
         Observable<String> o = Observable.fromIterable(Arrays.<String> asList("one", "two", "three"));
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
index 88f43e7452..2a1b1dad6e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
@@ -651,12 +651,6 @@ public SingleSource<Integer> apply(Object v) throws Exception {
         .assertError(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void switchMapSingleMapperIsNull() {
-        Observable.just(0)
-        .switchMapSingle(null);
-    }
-
     @Test
     public void switchMapSingleFunctionDoesntReturnSingle() {
         Observable.just(0)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
index 489744b708..79cb58c63b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
@@ -29,11 +29,6 @@
 
 public class SingleCreateTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void nullArgument() {
-        Single.create(null);
-    }
-
     @Test
     public void basic() {
         final Disposable d = Disposable.empty();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
index 2090015950..8c2070f736 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
@@ -67,11 +67,6 @@ public void error() {
         assertTrue(values.isEmpty());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void consumerNull() {
-        Single.just(1).doAfterSuccess(null);
-    }
-
     @Test
     public void justConditional() {
         Single.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
index b4c8c1e7ca..f4c3adb720 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
@@ -61,11 +61,6 @@ public void error() {
         assertAfterTerminateCalledOnce();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void afterTerminateActionNull() {
-        Single.just(1).doAfterTerminate(null);
-    }
-
     @Test
     public void justConditional() {
         Single.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java
index 22f6e45c29..365b34f185 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java
@@ -65,11 +65,6 @@ public Single<Object> apply(Single<Object> f) throws Exception {
         });
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullAction() {
-        Single.just(1).doFinally(null);
-    }
-
     @Test
     public void actionThrows() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java
index 58ba686e81..584c976d41 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java
@@ -27,11 +27,6 @@
 
 public class SingleDoOnTerminateTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void doOnTerminate() {
-        Single.just(1).doOnTerminate(null);
-    }
-
     @Test
     public void doOnTerminateSuccess() {
         final AtomicBoolean atomicBoolean = new AtomicBoolean();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java
index b98bf5537f..c11780324f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java
@@ -21,12 +21,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleFlatMapMaybeTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void flatMapMaybeNull() {
-        Single.just(1)
-            .flatMapMaybe(null);
-    }
-
     @Test
     public void flatMapMaybeValue() {
         Single.just(1).flatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java
index 1845a4967d..ea02529556 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java
@@ -129,11 +129,6 @@ public Publisher<Integer> apply(Integer v) throws Exception {
         .assertResult(1, 2, 3, 4, 5);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapPublisherMapperNull() {
-        Single.just(1).flatMapPublisher(null);
-    }
-
     @Test
     public void flatMapPublisherMapperThrows() {
         final TestException ex = new TestException();
@@ -215,12 +210,6 @@ public void run() throws Exception {
         ts.assertNotTerminated();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapNull() {
-        Single.just(1)
-            .flatMap(null);
-    }
-
     @Test
     public void flatMapValue() {
         Single.just(1).flatMap(new Function<Integer, SingleSource<Integer>>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java
index 1ae83e9158..625c4f1f5b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java
@@ -21,11 +21,6 @@
 
 public class SingleMapTest extends RxJavaTest {
 
-    @Test(expected = NullPointerException.class)
-    public void mapNull() {
-        Single.just(1).map(null);
-    }
-
     @Test
     public void mapValue() {
         Single.just(1).map(new Function<Integer, Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
index ee97e25015..152a297e8d 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
@@ -27,11 +27,6 @@
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeCreateTest extends RxJavaTest {
-    @Test(expected = NullPointerException.class)
-    public void nullArgument() {
-        Maybe.create(null);
-    }
-
     @Test
     public void basic() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index b5a03ede3b..7a0fe1ae7d 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -172,11 +172,6 @@ public void just() {
         .assertResult(1);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void justNull() {
-        Maybe.just(null);
-    }
-
     @Test
     public void empty() {
         Maybe.empty()
@@ -194,16 +189,6 @@ public void never() {
         .assertNotComplete();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void errorNull() {
-        Maybe.error((Throwable)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void errorSupplierNull() {
-        Maybe.error((Supplier<Throwable>)null);
-    }
-
     @Test
     public void error() {
         Maybe.error(new TestException())
@@ -243,11 +228,6 @@ public void wrapMaybe() {
         assertSame(Maybe.empty(), Maybe.wrap(Maybe.empty()));
     }
 
-    @Test(expected = NullPointerException.class)
-    public void wrapNull() {
-        Maybe.wrap(null);
-    }
-
     @Test
     public void emptySingleton() {
         assertSame(Maybe.empty(), Maybe.empty());
@@ -258,11 +238,6 @@ public void neverSingleton() {
         assertSame(Maybe.never(), Maybe.never());
     }
 
-    @Test(expected = NullPointerException.class)
-    public void liftNull() {
-        Maybe.just(1).lift(null);
-    }
-
     @Test
     public void liftJust() {
         Maybe.just(1).lift(new MaybeOperator<Integer, Integer>() {
@@ -287,11 +262,6 @@ public MaybeObserver<? super Integer> apply(MaybeObserver<? super Integer> t) th
         .assertFailure(TestException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void deferNull() {
-        Maybe.defer(null);
-    }
-
     @Test
     public void deferThrows() {
         Maybe.defer(new Supplier<Maybe<Integer>>() {
@@ -364,11 +334,6 @@ public void subscribe(MaybeObserver<? super Integer> observer) {
         .assertResult(1);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void unsafeCreateNull() {
-        Maybe.unsafeCreate(null);
-    }
-
     @Test
     public void to() {
         Maybe.just(1).to(new MaybeConverter<Integer, Flowable<Integer>>() {
@@ -393,16 +358,6 @@ public Flowable<Integer> apply(Maybe<Integer> v) {
         .assertResult(1);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toNull() {
-        Maybe.just(1).to(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void asNull() {
-        Maybe.just(1).to(null);
-    }
-
     @Test
     public void compose() {
         Maybe.just(1).compose(new MaybeTransformer<Integer, Integer>() {
@@ -420,16 +375,6 @@ public Integer apply(Integer w) throws Exception {
         .assertResult(2);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void composeNull() {
-        Maybe.just(1).compose(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void mapNull() {
-        Maybe.just(1).map(null);
-    }
-
     @Test
     public void mapReturnNull() {
         Maybe.just(1).map(new Function<Integer, Object>() {
@@ -460,11 +405,6 @@ public String apply(Integer v) throws Exception {
         }).test().assertResult("1");
     }
 
-    @Test(expected = NullPointerException.class)
-    public void filterNull() {
-        Maybe.just(1).filter(null);
-    }
-
     @Test
     public void filterThrows() {
         Maybe.just(1).filter(new Predicate<Integer>() {
@@ -505,11 +445,6 @@ public boolean test(Integer v) throws Exception {
         }).test().assertResult();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void singleFilterNull() {
-        Single.just(1).filter(null);
-    }
-
     @Test
     public void singleFilterThrows() {
         Single.just(1).filter(new Predicate<Integer>() {
@@ -547,16 +482,6 @@ public void cast() {
         to.assertResult((Number)1);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void observeOnNull() {
-        Maybe.just(1).observeOn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnNull() {
-        Maybe.just(1).observeOn(null);
-    }
-
     @Test
     public void observeOnSuccess() {
         String main = Thread.currentThread().getName();
@@ -1488,11 +1413,6 @@ public void concatPublisherPrefetch() {
         Maybe.concat(Flowable.just(Maybe.just(1), Maybe.just(2)), 1).test().assertResult(1, 2);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void nullArgument() {
-        Maybe.create(null);
-    }
-
     @Test
     public void basic() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -1928,11 +1848,6 @@ public void ambIterable2SignalsComplete() {
         to.assertResult();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void ambIterableNull() {
-        Maybe.amb((Iterable<Maybe<Integer>>)null);
-    }
-
     @Test
     public void ambIterableIteratorNull() {
         Maybe.amb(new Iterable<Maybe<Object>>() {
@@ -2392,11 +2307,6 @@ public void accept(Integer v, Throwable e) throws Exception {
         assertEquals(Arrays.asList(null, null), list);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnEventNull() {
-        Maybe.just(1).doOnEvent(null);
-    }
-
     @Test
     public void doOnEventSuccessThrows() {
         Maybe.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
index d4bcd85cc9..4189438e32 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
@@ -22,7 +22,6 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -40,21 +39,6 @@ public class ObservableNullTests extends RxJavaTest {
     // Static methods
     //***********************************************************
 
-    @Test(expected = NullPointerException.class)
-    public void ambVarargsNull() {
-        Observable.ambArray((Observable<Object>[])null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void ambVarargsOneIsNull() {
-        Observable.ambArray(Observable.never(), null).blockingLast();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void ambIterableNull() {
-        Observable.amb((Iterable<Observable<Object>>)null);
-    }
-
     @Test
     public void ambIterableIteratorNull() {
         Observable.amb(new Iterable<Observable<Object>>() {
@@ -72,16 +56,6 @@ public void ambIterableOneIsNull() {
                 .assertError(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void combineLatestIterableNull() {
-        Observable.combineLatest((Iterable<Observable<Object>>)null, new Function<Object[], Object>() {
-            @Override
-            public Object apply(Object[] v) {
-                return 1;
-            }
-        }, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableIteratorNull() {
         Observable.combineLatest(new Iterable<Observable<Object>>() {
@@ -107,11 +81,6 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void combineLatestIterableFunctionNull() {
-        Observable.combineLatest(Arrays.asList(just1), null, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void combineLatestIterableFunctionReturnsNull() {
         Observable.combineLatest(Arrays.asList(just1), new Function<Object[], Object>() {
@@ -122,16 +91,6 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void combineLatestDelayErrorIterableNull() {
-        Observable.combineLatestDelayError((Iterable<Observable<Object>>)null, new Function<Object[], Object>() {
-            @Override
-            public Object apply(Object[] v) {
-                return 1;
-            }
-        }, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableIteratorNull() {
         Observable.combineLatestDelayError(new Iterable<Observable<Object>>() {
@@ -157,11 +116,6 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void combineLatestDelayErrorIterableFunctionNull() {
-        Observable.combineLatestDelayError(Arrays.asList(just1), null, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void combineLatestDelayErrorIterableFunctionReturnsNull() {
         Observable.combineLatestDelayError(Arrays.asList(just1), new Function<Object[], Object>() {
@@ -172,11 +126,6 @@ public Object apply(Object[] v) {
         }, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatIterableNull() {
-        Observable.concat((Iterable<Observable<Object>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatIterableIteratorNull() {
         Observable.concat(new Iterable<Observable<Object>>() {
@@ -192,31 +141,11 @@ public void concatIterableOneIsNull() {
         Observable.concat(Arrays.asList(just1, null)).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatObservableNull() {
-        Observable.concat((Observable<Observable<Object>>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void concatArrayNull() {
-        Observable.concatArray((Observable<Object>[])null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatArrayOneIsNull() {
         Observable.concatArray(just1, null).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void createNull() {
-        Observable.unsafeCreate(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void deferFunctionNull() {
-        Observable.defer(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void deferFunctionReturnsNull() {
         Observable.defer(new Supplier<Observable<Object>>() {
@@ -227,11 +156,6 @@ public Observable<Object> get() {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void errorFunctionNull() {
-        Observable.error((Supplier<Throwable>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void errorFunctionReturnsNull() {
         Observable.error(new Supplier<Throwable>() {
@@ -242,26 +166,11 @@ public Throwable get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void errorThrowableNull() {
-        Observable.error((Throwable)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void fromArrayNull() {
-        Observable.fromArray((Object[])null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromArrayOneIsNull() {
         Observable.fromArray(1, null).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromCallableNull() {
-        Observable.fromCallable(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromCallableReturnsNull() {
         Observable.fromCallable(new Callable<Object>() {
@@ -272,11 +181,6 @@ public Object call() throws Exception {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureNull() {
-        Observable.fromFuture(null);
-    }
-
     @Test
     public void fromFutureReturnsNull() {
         FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
@@ -289,16 +193,6 @@ public void fromFutureReturnsNull() {
         to.assertError(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureTimedFutureNull() {
-        Observable.fromFuture(null, 1, TimeUnit.SECONDS);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void fromFutureTimedUnitNull() {
-        Observable.fromFuture(new FutureTask<>(Functions.EMPTY_RUNNABLE, null), 1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedReturnsNull() {
         FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
@@ -306,11 +200,6 @@ public void fromFutureTimedReturnsNull() {
         Observable.fromFuture(f, 1, TimeUnit.SECONDS).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromIterableNull() {
-        Observable.fromIterable(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromIterableIteratorNull() {
         Observable.fromIterable(new Iterable<Object>() {
@@ -326,11 +215,6 @@ public void fromIterableValueNull() {
         Observable.fromIterable(Arrays.asList(1, null)).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void generateConsumerNull() {
-        Observable.generate(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void generateConsumerEmitsNull() {
         Observable.generate(new Consumer<Emitter<Object>>() {
@@ -341,35 +225,6 @@ public void accept(Emitter<Object> s) {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void generateStateConsumerInitialStateNull() {
-        BiConsumer<Integer, Emitter<Integer>> generator = new BiConsumer<Integer, Emitter<Integer>>() {
-            @Override
-            public void accept(Integer s, Emitter<Integer> o) {
-                o.onNext(1);
-            }
-        };
-        Observable.generate(null, generator);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void generateStateFunctionInitialStateNull() {
-        Observable.generate(null, new BiFunction<Object, Emitter<Object>, Object>() {
-            @Override
-            public Object apply(Object s, Emitter<Object> o) { o.onNext(1); return s; }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void generateStateConsumerNull() {
-        Observable.generate(new Supplier<Integer>() {
-            @Override
-            public Integer get() {
-                return 1;
-            }
-        }, (BiConsumer<Integer, Emitter<Object>>)null);
-    }
-
     @Test
     public void generateConsumerStateNullAllowed() {
         BiConsumer<Integer, Emitter<Integer>> generator = new BiConsumer<Integer, Emitter<Integer>>() {
@@ -399,64 +254,10 @@ public Object get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void generateConsumerDisposeNull() {
-        BiConsumer<Integer, Emitter<Integer>> generator = new BiConsumer<Integer, Emitter<Integer>>() {
-            @Override
-            public void accept(Integer s, Emitter<Integer> o) {
-                o.onNext(1);
-            }
-        };
-        Observable.generate(new Supplier<Integer>() {
-            @Override
-            public Integer get() {
-                return 1;
-            }
-        }, generator, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void generateFunctionDisposeNull() {
-        Observable.generate(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, new BiFunction<Object, Emitter<Object>, Object>() {
-            @Override
-            public Object apply(Object s, Emitter<Object> o) { o.onNext(1); return s; }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void intervalUnitNull() {
-        Observable.interval(1, null);
-    }
-
     public void intervalSchedulerNull() {
         Observable.interval(1, TimeUnit.SECONDS, null);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void intervalPeriodUnitNull() {
-        Observable.interval(1, 1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void intervalPeriodSchedulerNull() {
-        Observable.interval(1, 1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void intervalRangeUnitNull() {
-        Observable.intervalRange(1, 1, 1, 1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void intervalRangeSchedulerNull() {
-        Observable.intervalRange(1, 1, 1, 1, TimeUnit.SECONDS, null);
-    }
-
     @Test
     public void justNull() throws Exception {
         @SuppressWarnings("rawtypes")
@@ -484,11 +285,6 @@ public void justNull() throws Exception {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeIterableNull() {
-        Observable.merge((Iterable<Observable<Object>>)null, 128, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mergeIterableIteratorNull() {
         Observable.merge(new Iterable<Observable<Object>>() {
@@ -504,21 +300,6 @@ public void mergeIterableOneIsNull() {
         Observable.merge(Arrays.asList(just1, null), 128, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeArrayNull() {
-        Observable.mergeArray(128, 128, (Observable<Object>[])null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void mergeArrayOneIsNull() {
-        Observable.mergeArray(128, 128, just1, null).blockingLast();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void mergeDelayErrorIterableNull() {
-        Observable.mergeDelayError((Iterable<Observable<Object>>)null, 128, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mergeDelayErrorIterableIteratorNull() {
         Observable.mergeDelayError(new Iterable<Observable<Object>>() {
@@ -534,72 +315,6 @@ public void mergeDelayErrorIterableOneIsNull() {
         Observable.mergeDelayError(Arrays.asList(just1, null), 128, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeDelayErrorArrayNull() {
-        Observable.mergeArrayDelayError(128, 128, (Observable<Object>[])null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void mergeDelayErrorArrayOneIsNull() {
-        Observable.mergeArrayDelayError(128, 128, just1, null).blockingLast();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sequenceEqualFirstNull() {
-        Observable.sequenceEqual(null, just1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sequenceEqualSecondNull() {
-        Observable.sequenceEqual(just1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sequenceEqualComparatorNull() {
-        Observable.sequenceEqual(just1, just1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void switchOnNextNull() {
-        Observable.switchOnNext(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timerUnitNull() {
-        Observable.timer(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timerSchedulerNull() {
-        Observable.timer(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void usingResourceSupplierNull() {
-        Observable.using(null, new Function<Object, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Object d) {
-                return just1;
-            }
-        }, new Consumer<Object>() {
-            @Override
-            public void accept(Object d) { }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void usingObservableSupplierNull() {
-        Observable.using(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, null, new Consumer<Object>() {
-            @Override
-            public void accept(Object d) { }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void usingObservableSupplierReturnsNull() {
         Observable.using(new Supplier<Object>() {
@@ -618,31 +333,6 @@ public void accept(Object d) { }
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void usingDisposeNull() {
-        Observable.using(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, new Function<Object, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Object d) {
-                return just1;
-            }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zipIterableNull() {
-        Observable.zip((Iterable<Observable<Object>>)null, new Function<Object[], Object>() {
-            @Override
-            public Object apply(Object[] v) {
-                return 1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterableIteratorNull() {
         Observable.zip(new Iterable<Observable<Object>>() {
@@ -658,11 +348,6 @@ public Object apply(Object[] v) {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipIterableFunctionNull() {
-        Observable.zip(Arrays.asList(just1, just1), null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterableFunctionReturnsNull() {
         Observable.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
@@ -673,16 +358,6 @@ public Object apply(Object[] a) {
         }).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipIterable2Null() {
-        Observable.zip((Iterable<Observable<Object>>)null, new Function<Object[], Object>() {
-            @Override
-            public Object apply(Object[] a) {
-                return 1;
-            }
-        }, true, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterable2IteratorNull() {
         Observable.zip(new Iterable<Observable<Object>>() {
@@ -698,11 +373,6 @@ public Object apply(Object[] a) {
         }, true, 128).blockingLast();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipIterable2FunctionNull() {
-        Observable.zip(Arrays.asList(just1, just1), null, true, 128);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterable2FunctionReturnsNull() {
         Observable.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
@@ -717,26 +387,6 @@ public Object apply(Object[] a) {
     // Instance methods
     //*************************************************************
 
-    @Test(expected = NullPointerException.class)
-    public void allPredicateNull() {
-        just1.all(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void ambWithNull() {
-        just1.ambWith(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void anyPredicateNull() {
-        just1.any(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferSupplierNull() {
-        just1.buffer(1, 1, (Supplier<List<Integer>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void bufferSupplierReturnsNull() {
         just1.buffer(1, 1, new Supplier<Collection<Integer>>() {
@@ -747,21 +397,6 @@ public Collection<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void bufferTimedUnitNull() {
-        just1.buffer(1L, 1L, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferTimedSchedulerNull() {
-        just1.buffer(1L, 1L, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferTimedSupplierNull() {
-        just1.buffer(1L, 1L, TimeUnit.SECONDS, Schedulers.single(), null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void bufferTimedSupplierReturnsNull() {
         just1.buffer(1L, 1L, TimeUnit.SECONDS, Schedulers.single(), new Supplier<Collection<Integer>>() {
@@ -772,21 +407,6 @@ public Collection<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void bufferOpenCloseOpenNull() {
-        just1.buffer(null, new Function<Object, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Object o) {
-                return just1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferOpenCloseCloseNull() {
-        just1.buffer(just1, (Function<Integer, Observable<Object>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void bufferOpenCloseCloseReturnsNull() {
         just1.buffer(just1, new Function<Integer, Observable<Object>>() {
@@ -797,16 +417,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void bufferBoundaryNull() {
-        just1.buffer((Observable<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void bufferBoundarySupplierNull() {
-        just1.buffer(just1, (Supplier<List<Integer>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void bufferBoundarySupplierReturnsNull() {
         just1.buffer(just1, new Supplier<Collection<Integer>>() {
@@ -817,19 +427,6 @@ public Collection<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void castNull() {
-        just1.cast(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void collectInitialSupplierNull() {
-        just1.collect((Supplier<Integer>)null, new BiConsumer<Integer, Integer>() {
-            @Override
-            public void accept(Integer a, Integer b) { }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void collectInitialSupplierReturnsNull() {
         just1.collect(new Supplier<Object>() {
@@ -853,29 +450,6 @@ public Object get() {
         }, null);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void collectIntoInitialNull() {
-        just1.collectInto(null, new BiConsumer<Object, Integer>() {
-            @Override
-            public void accept(Object a, Integer b) { }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void collectIntoCollectorNull() {
-        just1.collectInto(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void composeNull() {
-        just1.compose(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void concatMapNull() {
-        just1.concatMap(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatMapReturnsNull() {
         just1.concatMap(new Function<Integer, Observable<Object>>() {
@@ -886,11 +460,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatMapIterableNull() {
-        just1.concatMapIterable(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatMapIterableReturnNull() {
         just1.concatMapIterable(new Function<Integer, Iterable<Object>>() {
@@ -916,21 +485,6 @@ public Iterator<Object> iterator() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatWithNull() {
-        just1.concatWith((ObservableSource<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void containsNull() {
-        just1.contains(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void debounceFunctionNull() {
-        just1.debounce(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void debounceFunctionReturnsNull() {
         just1.debounce(new Function<Integer, Observable<Object>>() {
@@ -941,26 +495,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void debounceTimedUnitNull() {
-        just1.debounce(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void debounceTimedSchedulerNull() {
-        just1.debounce(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void defaultIfEmptyNull() {
-        just1.defaultIfEmpty(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayWithFunctionNull() {
-        just1.delay(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void delayWithFunctionReturnsNull() {
         just1.delay(new Function<Integer, Observable<Object>>() {
@@ -971,61 +505,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void delayTimedUnitNull() {
-        just1.delay(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayTimedSchedulerNull() {
-        just1.delay(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySubscriptionTimedUnitNull() {
-        just1.delaySubscription(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySubscriptionTimedSchedulerNull() {
-        just1.delaySubscription(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySubscriptionOtherNull() {
-        just1.delaySubscription((Observable<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySubscriptionFunctionNull() {
-        just1.delaySubscription((Observable<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayBothInitialSupplierNull() {
-        just1.delay(null, new Function<Integer, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Integer v) {
-                return just1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayBothInitialSupplierReturnsNull() {
-        just1.delay(null, new Function<Integer, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Integer v) {
-                return just1;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayBothItemSupplierNull() {
-        just1.delay(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void delayBothItemSupplierReturnsNull() {
         just1.delay(just1
@@ -1037,21 +516,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void distinctFunctionNull() {
-        just1.distinct(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void distinctSupplierNull() {
-        just1.distinct(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void distinctSupplierReturnsNull() {
         just1.distinct(new Function<Integer, Object>() {
@@ -1077,16 +541,6 @@ public Object apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void distinctUntilChangedFunctionNull() {
-        just1.distinctUntilChanged((Function<Object, Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void distinctUntilChangedBiPredicateNull() {
-        just1.distinctUntilChanged((BiPredicate<Object, Object>)null);
-    }
-
     @Test
     public void distinctUntilChangedFunctionReturnsNull() {
         Observable.range(1, 2).distinctUntilChanged(new Function<Integer, Object>() {
@@ -1097,84 +551,6 @@ public Object apply(Integer v) {
         }).test().assertResult(1);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void doOnDisposeNull() {
-        just1.doOnDispose(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnCompleteNull() {
-        just1.doOnComplete(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnEachSupplierNull() {
-        just1.doOnEach((Consumer<Notification<Integer>>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnEachSubscriberNull() {
-        just1.doOnEach((Observer<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnErrorNull() {
-        just1.doOnError(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnLifecycleOnSubscribeNull() {
-        just1.doOnLifecycle(null, Functions.EMPTY_ACTION);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnLifecycleOnDisposeNull() {
-        just1.doOnLifecycle(new Consumer<Disposable>() {
-            @Override
-            public void accept(Disposable d) { }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnNextNull() {
-        just1.doOnNext(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnSubscribeNull() {
-        just1.doOnSubscribe(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnTerminatedNull() {
-        just1.doOnTerminate(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void elementAtNull() {
-        just1.elementAt(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void filterNull() {
-        just1.filter(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doAfterTerminateNull() {
-        just1.doAfterTerminate(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void firstNull() {
-        just1.first(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void flatMapNull() {
-        just1.flatMap(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapFunctionReturnsNull() {
         just1.flatMap(new Function<Integer, Observable<Object>>() {
@@ -1185,21 +561,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapNotificationOnNextNull() {
-        just1.flatMap(null, new Function<Throwable, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Throwable e) {
-                return just1;
-            }
-        }, new Supplier<Observable<Integer>>() {
-            @Override
-            public Observable<Integer> get() {
-                return just1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapNotificationOnNextReturnsNull() {
         just1.flatMap(new Function<Integer, Observable<Integer>>() {
@@ -1220,36 +581,6 @@ public Observable<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapNotificationOnErrorNull() {
-        just1.flatMap(new Function<Integer, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Integer v) {
-                return just1;
-            }
-        }, null, new Supplier<Observable<Integer>>() {
-            @Override
-            public Observable<Integer> get() {
-                return just1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void flatMapNotificationOnCompleteNull() {
-        just1.flatMap(new Function<Integer, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Integer v) {
-                return just1;
-            }
-        }, new Function<Throwable, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Throwable e) {
-                return just1;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapNotificationOnCompleteReturnsNull() {
         just1.flatMap(new Function<Integer, Observable<Integer>>() {
@@ -1270,16 +601,6 @@ public Observable<Integer> get() {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapCombinerMapperNull() {
-        just1.flatMap(null, new BiFunction<Integer, Object, Object>() {
-            @Override
-            public Object apply(Integer a, Object b) {
-                return 1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapCombinerMapperReturnsNull() {
         just1.flatMap(new Function<Integer, Observable<Object>>() {
@@ -1295,16 +616,6 @@ public Object apply(Integer a, Object b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapCombinerCombinerNull() {
-        just1.flatMap(new Function<Integer, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Integer v) {
-                return just1;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapCombinerCombinerReturnsNull() {
         just1.flatMap(new Function<Integer, Observable<Integer>>() {
@@ -1320,11 +631,6 @@ public Object apply(Integer a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapIterableMapperNull() {
-        just1.flatMapIterable(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapIterableMapperReturnsNull() {
         just1.flatMapIterable(new Function<Integer, Iterable<Integer>>() {
@@ -1360,16 +666,6 @@ public Iterable<Integer> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapIterableCombinerNull() {
-        just1.flatMapIterable(new Function<Integer, Iterable<Integer>>() {
-            @Override
-            public Iterable<Integer> apply(Integer v) {
-                return Arrays.asList(1);
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapIterableCombinerReturnsNull() {
         just1.flatMapIterable(new Function<Integer, Iterable<Integer>>() {
@@ -1385,44 +681,6 @@ public Object apply(Integer a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void forEachNull() {
-        just1.forEach(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void forEachWhileNull() {
-        just1.forEachWhile(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void forEachWhileOnErrorNull() {
-        just1.forEachWhile(new Predicate<Integer>() {
-            @Override
-            public boolean test(Integer v) {
-                return true;
-            }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void forEachWhileOnCompleteNull() {
-        just1.forEachWhile(new Predicate<Integer>() {
-            @Override
-            public boolean test(Integer v) {
-                return true;
-            }
-        }, new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable e) { }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void groupByNull() {
-        just1.groupBy(null);
-    }
-
     public void groupByKeyNull() {
         just1.groupBy(new Function<Integer, Object>() {
             @Override
@@ -1432,16 +690,6 @@ public Object apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void groupByValueNull() {
-        just1.groupBy(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void groupByValueReturnsNull() {
         just1.groupBy(new Function<Integer, Object>() {
@@ -1457,16 +705,6 @@ public Object apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void lastNull() {
-        just1.last(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void liftNull() {
-        just1.lift(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void liftReturnsNull() {
         just1.lift(new ObservableOperator<Object, Integer>() {
@@ -1477,11 +715,6 @@ public Observer<? super Integer> apply(Observer<? super Object> observer) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mapNull() {
-        just1.map(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mapReturnsNull() {
         just1.map(new Function<Integer, Object>() {
@@ -1493,48 +726,13 @@ public Object apply(Integer v) {
     }
 
     @Test(expected = NullPointerException.class)
-    public void mergeWithNull() {
-        just1.mergeWith((ObservableSource<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void observeOnNull() {
-        just1.observeOn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void ofTypeNull() {
-        just1.ofType(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorResumeNextFunctionNull() {
-        just1.onErrorResumeNext(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorResumeNextFunctionReturnsNull() {
-        Observable.error(new TestException()).onErrorResumeNext(new Function<Throwable, Observable<Object>>() {
-            @Override
-            public Observable<Object> apply(Throwable e) {
-                return null;
-            }
-        }).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorResumeNextObservableNull() {
-        just1.onErrorResumeWith(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorReturnFunctionNull() {
-        just1.onErrorReturn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorReturnValueNull() {
-        just1.onErrorReturnItem(null);
+    public void onErrorResumeNextFunctionReturnsNull() {
+        Observable.error(new TestException()).onErrorResumeNext(new Function<Throwable, Observable<Object>>() {
+            @Override
+            public Observable<Object> apply(Throwable e) {
+                return null;
+            }
+        }).blockingSubscribe();
     }
 
     @Test(expected = NullPointerException.class)
@@ -1547,11 +745,6 @@ public Object apply(Throwable e) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void publishFunctionNull() {
-        just1.publish(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void publishFunctionReturnsNull() {
         just1.publish(new Function<Observable<Integer>, Observable<Object>>() {
@@ -1562,11 +755,6 @@ public Observable<Object> apply(Observable<Integer> v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void reduceFunctionNull() {
-        just1.reduce(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void reduceFunctionReturnsNull() {
         Observable.just(1, 1).reduce(new BiFunction<Integer, Integer, Integer>() {
@@ -1577,21 +765,6 @@ public Integer apply(Integer a, Integer b) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void reduceSeedNull() {
-        just1.reduce(null, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void reduceSeedFunctionNull() {
-        just1.reduce(1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void reduceSeedFunctionReturnsNull() {
         just1.reduce(1, new BiFunction<Integer, Integer, Integer>() {
@@ -1602,16 +775,6 @@ public Integer apply(Integer a, Integer b) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void reduceWithSeedNull() {
-        just1.reduceWith(null, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void reduceWithSeedReturnsNull() {
         just1.reduceWith(new Supplier<Object>() {
@@ -1627,16 +790,6 @@ public Object apply(Object a, Integer b) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void repeatUntilNull() {
-        just1.repeatUntil(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void repeatWhenNull() {
-        just1.repeatWhen(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void repeatWhenFunctionReturnsNull() {
         just1.repeatWhen(new Function<Observable<Object>, Observable<Object>>() {
@@ -1647,11 +800,6 @@ public Observable<Object> apply(Observable<Object> v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void replaySelectorNull() {
-        just1.replay((Function<Observable<Integer>, Observable<Integer>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void replaySelectorReturnsNull() {
         just1.replay(new Function<Observable<Integer>, Observable<Object>>() {
@@ -1662,11 +810,6 @@ public Observable<Object> apply(Observable<Integer> o) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void replayBoundedSelectorNull() {
-        just1.replay((Function<Observable<Integer>, Observable<Integer>>)null, 1, 1, TimeUnit.SECONDS);
-    }
-
     @Test(expected = NullPointerException.class)
     public void replayBoundedSelectorReturnsNull() {
         just1.replay(new Function<Observable<Integer>, Observable<Object>>() {
@@ -1677,31 +820,6 @@ public Observable<Object> apply(Observable<Integer> v) {
         }, 1, 1, TimeUnit.SECONDS).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void replayBoundedUnitNull() {
-        just1.replay(new Function<Observable<Integer>, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Observable<Integer> v) {
-                return v;
-            }
-        }, 1, 1, null).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayBoundedSchedulerNull() {
-        just1.replay(new Function<Observable<Integer>, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Observable<Integer> v) {
-                return v;
-            }
-        }, 1, 1, TimeUnit.SECONDS, null).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeBoundedSelectorNull() {
-        just1.replay(null, 1, TimeUnit.SECONDS, Schedulers.single());
-    }
-
     @Test(expected = NullPointerException.class)
     public void replayTimeBoundedSelectorReturnsNull() {
         just1.replay(new Function<Observable<Integer>, Observable<Object>>() {
@@ -1712,66 +830,6 @@ public Observable<Object> apply(Observable<Integer> v) {
         }, 1, TimeUnit.SECONDS, Schedulers.single()).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void replaySelectorTimeBoundedUnitNull() {
-        just1.replay(new Function<Observable<Integer>, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Observable<Integer> v) {
-                return v;
-            }
-        }, 1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replaySelectorTimeBoundedSchedulerNull() {
-        just1.replay(new Function<Observable<Integer>, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Observable<Integer> v) {
-                return v;
-            }
-        }, 1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeSizeBoundedUnitNull() {
-        just1.replay(1, 1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeSizeBoundedSchedulerNull() {
-        just1.replay(1, 1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeBoundedUnitNull() {
-        just1.replay(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void replayTimeBoundedSchedulerNull() {
-        just1.replay(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryFunctionNull() {
-        just1.retry((BiPredicate<Integer, Throwable>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryCountFunctionNull() {
-        just1.retry(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryPredicateNull() {
-        just1.retry((Predicate<Throwable>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryWhenFunctionNull() {
-        just1.retryWhen(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void retryWhenFunctionReturnsNull() {
         Observable.error(new TestException()).retryWhen(new Function<Observable<? extends Throwable>, Observable<Object>>() {
@@ -1782,36 +840,6 @@ public Observable<Object> apply(Observable<? extends Throwable> f) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void retryUntil() {
-        just1.retryUntil(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void safeSubscribeNull() {
-        just1.safeSubscribe(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sampleUnitNull() {
-        just1.sample(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sampleSchedulerNull() {
-        just1.sample(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void sampleObservableNull() {
-        just1.sample(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanFunctionNull() {
-        just1.scan(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void scanFunctionReturnsNull() {
         Observable.just(1, 1).scan(new BiFunction<Integer, Integer, Integer>() {
@@ -1822,21 +850,6 @@ public Integer apply(Integer a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void scanSeedNull() {
-        just1.scan(null, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void scanSeedFunctionNull() {
-        just1.scan(1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void scanSeedFunctionReturnsNull() {
         just1.scan(1, new BiFunction<Integer, Integer, Integer>() {
@@ -1847,16 +860,6 @@ public Integer apply(Integer a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void scanSeedSupplierNull() {
-        just1.scanWith(null, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void scanSeedSupplierReturnsNull() {
         just1.scanWith(new Supplier<Object>() {
@@ -1872,16 +875,6 @@ public Object apply(Object a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void scanSeedSupplierFunctionNull() {
-        just1.scanWith(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void scanSeedSupplierFunctionReturnsNull() {
         just1.scanWith(new Supplier<Object>() {
@@ -1897,46 +890,6 @@ public Object apply(Object a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void singleNull() {
-        just1.single(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipTimedUnitNull() {
-        just1.skip(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipTimedSchedulerNull() {
-        just1.skip(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipLastTimedUnitNull() {
-        just1.skipLast(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipLastTimedSchedulerNull() {
-        just1.skipLast(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipUntilNull() {
-        just1.skipUntil(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void skipWhileNull() {
-        just1.skipWhile(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithIterableNull() {
-        just1.startWithIterable((Iterable<Integer>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void startWithIterableIteratorNull() {
         just1.startWithIterable(new Iterable<Integer>() {
@@ -1952,70 +905,6 @@ public void startWithIterableOneNull() {
         just1.startWithIterable(Arrays.asList(1, null)).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void startWithSingleNull() {
-        just1.startWithItem((Integer)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithObservableNull() {
-        just1.startWith((Observable<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithArrayNull() {
-        just1.startWithArray((Integer[])null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void startWithArrayOneNull() {
-        just1.startWithArray(1, null).blockingSubscribe();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnNextNull() {
-        just1.subscribe((Consumer<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnErrorNull() {
-        just1.subscribe(new Consumer<Integer>() {
-            @Override
-            public void accept(Integer e) { }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnCompleteNull() {
-        just1.subscribe(new Consumer<Integer>() {
-            @Override
-            public void accept(Integer e) { }
-        }, new Consumer<Throwable>() {
-            @Override
-            public void accept(Throwable e) { }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeNull() {
-        just1.subscribe((Observer<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnNull() {
-        just1.subscribeOn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void switchIfEmptyNull() {
-        just1.switchIfEmpty(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void switchMapNull() {
-        just1.switchMap(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void switchMapFunctionReturnsNull() {
         just1.switchMap(new Function<Integer, Observable<Object>>() {
@@ -2026,96 +915,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void takeTimedUnitNull() {
-        just1.take(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeTimedSchedulerNull() {
-        just1.take(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeLastTimedUnitNull() {
-        just1.takeLast(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeLastSizeTimedUnitNull() {
-        just1.takeLast(1, 1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeLastTimedSchedulerNull() {
-        just1.takeLast(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeLastSizeTimedSchedulerNull() {
-        just1.takeLast(1, 1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeUntilPredicateNull() {
-        just1.takeUntil((Predicate<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeUntilObservableNull() {
-        just1.takeUntil((Observable<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void takeWhileNull() {
-        just1.takeWhile(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void throttleFirstUnitNull() {
-        just1.throttleFirst(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void throttleFirstSchedulerNull() {
-        just1.throttleFirst(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void throttleLastUnitNull() {
-        just1.throttleLast(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void throttleLastSchedulerNull() {
-        just1.throttleLast(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void throttleWithTimeoutUnitNull() {
-        just1.throttleWithTimeout(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void throttleWithTimeoutSchedulerNull() {
-        just1.throttleWithTimeout(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeIntervalUnitNull() {
-        just1.timeInterval(null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeIntervalSchedulerNull() {
-        just1.timeInterval(TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutSelectorNull() {
-        just1.timeout(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void timeoutSelectorReturnsNull() {
         just1.timeout(new Function<Integer, Observable<Object>>() {
@@ -2126,46 +925,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void timeoutSelectorOtherNull() {
-        just1.timeout(new Function<Integer, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Integer v) {
-                return just1;
-            }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutUnitNull() {
-        just1.timeout(1, null, Schedulers.single(), just1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeouOtherNull() {
-        just1.timeout(1, TimeUnit.SECONDS, Schedulers.single(), null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeouSchedulerNull() {
-        just1.timeout(1, TimeUnit.SECONDS, null, just1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutFirstNull() {
-        just1.timeout((Observable<Integer>)null, new Function<Integer, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Integer v) {
-                return just1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutFirstItemNull() {
-        just1.timeout(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void timeoutFirstItemReturnsNull() {
         Observable.just(1, 1).timeout(Observable.never(), new Function<Integer, Observable<Object>>() {
@@ -2176,26 +935,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void timestampUnitNull() {
-        just1.timestamp(null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timestampSchedulerNull() {
-        just1.timestamp(TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toNull() {
-        just1.to(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toListNull() {
-        just1.toList(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void toListSupplierReturnsNull() {
         just1.toList(new Supplier<Collection<Integer>>() {
@@ -2206,26 +945,6 @@ public Collection<Integer> get() {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toSortedListNull() {
-        just1.toSortedList(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toMapKeyNull() {
-        just1.toMap(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toMapValueNull() {
-        just1.toMap(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test
     public void toMapValueSelectorReturnsNull() {
         just1.toMap(new Function<Integer, Object>() {
@@ -2241,21 +960,6 @@ public Object apply(Integer v) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toMapMapSupplierNull() {
-        just1.toMap(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void toMapMapSupplierReturnsNull() {
         just1.toMap(new Function<Integer, Object>() {
@@ -2276,21 +980,6 @@ public Map<Object, Object> get() {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toMultimapKeyNull() {
-        just1.toMultimap(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toMultimapValueNull() {
-        just1.toMultimap(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test
     public void toMultiMapValueSelectorReturnsNullAllowed() {
         just1.toMap(new Function<Integer, Object>() {
@@ -2306,21 +995,6 @@ public Object apply(Integer v) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toMultimapMapMapSupplierNull() {
-        just1.toMultimap(new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, new Function<Integer, Object>() {
-            @Override
-            public Object apply(Integer v) {
-                return v;
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void toMultimapMapSupplierReturnsNull() {
         just1.toMultimap(new Function<Integer, Object>() {
@@ -2341,26 +1015,6 @@ public Map<Object, Collection<Object>> get() {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void toMultimapMapMapCollectionSupplierNull() {
-        just1.toMultimap(new Function<Integer, Integer>() {
-            @Override
-            public Integer apply(Integer v) {
-                return v;
-            }
-        }, new Function<Integer, Integer>() {
-            @Override
-            public Integer apply(Integer v) {
-                return v;
-            }
-        }, new Supplier<Map<Integer, Collection<Integer>>>() {
-            @Override
-            public Map<Integer, Collection<Integer>> get() {
-                return new HashMap<>();
-            }
-        }, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void toMultimapMapCollectionSupplierReturnsNull() {
         just1.toMultimap(new Function<Integer, Integer>() {
@@ -2386,56 +1040,6 @@ public Collection<Integer> apply(Integer v) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void unsafeSubscribeNull() {
-        just1.subscribe((Observer<Object>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void unsubscribeOnNull() {
-        just1.unsubscribeOn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowTimedUnitNull() {
-        just1.window(1, null, Schedulers.single());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowSizeTimedUnitNull() {
-        just1.window(1, null, Schedulers.single(), 1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowTimedSchedulerNull() {
-        just1.window(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowSizeTimedSchedulerNull() {
-        just1.window(1, TimeUnit.SECONDS, null, 1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowBoundaryNull() {
-        just1.window((Observable<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowOpenCloseOpenNull() {
-        just1.window(null, new Function<Object, Observable<Integer>>() {
-            @Override
-            public Observable<Integer> apply(Object v) {
-                return just1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void windowOpenCloseCloseNull() {
-        just1.window(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void windowOpenCloseCloseReturnsNull() {
         Observable.never().window(just1, new Function<Integer, Observable<Object>>() {
@@ -2446,21 +1050,6 @@ public Observable<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void withLatestFromOtherNull() {
-        just1.withLatestFrom(null, new BiFunction<Integer, Object, Object>() {
-            @Override
-            public Object apply(Integer a, Object b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void withLatestFromCombinerNull() {
-        just1.withLatestFrom(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void withLatestFromCombinerReturnsNull() {
         just1.withLatestFrom(just1, new BiFunction<Integer, Integer, Object>() {
@@ -2471,21 +1060,6 @@ public Object apply(Integer a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipWithIterableNull() {
-        just1.zipWith((Iterable<Integer>)null, new BiFunction<Integer, Integer, Object>() {
-            @Override
-            public Object apply(Integer a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zipWithIterableCombinerNull() {
-        just1.zipWith(Arrays.asList(1), null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipWithIterableCombinerReturnsNull() {
         just1.zipWith(Arrays.asList(1), new BiFunction<Integer, Integer, Object>() {
@@ -2521,21 +1095,6 @@ public Object apply(Integer a, Integer b) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipWithObservableNull() {
-        just1.zipWith((Observable<Integer>)null, new BiFunction<Integer, Integer, Object>() {
-            @Override
-            public Object apply(Integer a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zipWithCombinerNull() {
-        just1.zipWith(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipWithCombinerReturnsNull() {
         just1.zipWith(just1, new BiFunction<Integer, Integer, Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
index c3110eac3f..030687e989 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
@@ -1039,13 +1039,6 @@ public void emptyIsEmpty() {
 //            }});
 //    }
 
-    @Test(expected = NullPointerException.class)
-    public void forEachWithNull() {
-        Observable.error(new Exception("boo"))
-        //
-        .forEach(null);
-    }
-
     @Test
     public void extend() {
         final TestObserver<Object> to = new TestObserver<>();
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
index 712d93f1aa..a6133bd720 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
@@ -26,7 +26,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class SingleNullTests extends RxJavaTest {
 
@@ -34,11 +33,6 @@ public class SingleNullTests extends RxJavaTest {
 
     Single<Integer> error = Single.error(new TestException());
 
-    @Test(expected = NullPointerException.class)
-    public void ambIterableNull() {
-        Single.amb((Iterable<Single<Integer>>)null);
-    }
-
     @Test
     public void ambIterableIteratorNull() {
         Single.amb(new Iterable<Single<Object>>() {
@@ -56,11 +50,6 @@ public void ambIterableOneIsNull() {
                 .assertError(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void ambArrayNull() {
-        Single.ambArray((Single<Integer>[])null);
-    }
-
     @Test
     public void ambArrayOneIsNull() {
         Single.ambArray(null, just1)
@@ -68,11 +57,6 @@ public void ambArrayOneIsNull() {
             .assertError(NullPointerException.class);
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatIterableNull() {
-        Single.concat((Iterable<Single<Integer>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void concatIterableIteratorNull() {
         Single.concat(new Iterable<Single<Object>>() {
@@ -88,11 +72,6 @@ public void concatIterableOneIsNull() {
         Single.concat(Arrays.asList(just1, null)).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void concatObservableNull() {
-        Single.concat((Flowable<Single<Integer>>)null);
-    }
-
     @Test
     public void concatNull() throws Exception {
         int maxArgs = 4;
@@ -122,41 +101,16 @@ public void concatNull() throws Exception {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void createNull() {
-        Single.unsafeCreate(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void deferNull() {
-        Single.defer(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void deferReturnsNull() {
         Single.defer(Functions.<Single<Object>>nullSupplier()).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void errorSupplierNull() {
-        Single.error((Supplier<Throwable>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void errorSupplierReturnsNull() {
         Single.error(Functions.<Throwable>nullSupplier()).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void errorNull() {
-        Single.error((Throwable)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void fromCallableNull() {
-        Single.fromCallable(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromCallableReturnsNull() {
         Single.fromCallable(new Callable<Object>() {
@@ -167,11 +121,6 @@ public Object call() throws Exception {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureNull() {
-        Single.fromFuture((Future<Integer>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromFutureReturnsNull() {
         FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
@@ -179,21 +128,6 @@ public void fromFutureReturnsNull() {
         Single.fromFuture(f).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromFutureTimedFutureNull() {
-        Single.fromFuture(null, 1, TimeUnit.SECONDS);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void fromFutureTimedUnitNull() {
-        Single.fromFuture(new FutureTask<>(new Callable<Object>() {
-            @Override
-            public Object call() throws Exception {
-                return null;
-            }
-        }), 1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void fromFutureTimedReturnsNull() {
         FutureTask<Object> f = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
@@ -201,21 +135,6 @@ public void fromFutureTimedReturnsNull() {
         Single.fromFuture(f, 1, TimeUnit.SECONDS).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void fromPublisherNull() {
-        Single.fromPublisher(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void justNull() {
-        Single.just(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void mergeIterableNull() {
-        Single.merge((Iterable<Single<Integer>>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void mergeIterableIteratorNull() {
         Single.merge(new Iterable<Single<Object>>() {
@@ -231,11 +150,6 @@ public void mergeIterableOneIsNull() {
         Single.merge(Arrays.asList(null, just1)).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void mergeSingleNull() {
-        Single.merge((Single<Single<Integer>>)null);
-    }
-
     @Test
     public void mergeNull() throws Exception {
         int maxArgs = 4;
@@ -265,46 +179,6 @@ public void mergeNull() throws Exception {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void timerUnitNull() {
-        Single.timer(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timerSchedulerNull() {
-        Single.timer(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void equalsFirstNull() {
-        Single.equals(null, just1);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void equalsSecondNull() {
-        Single.equals(just1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void usingResourceSupplierNull() {
-        Single.using(null, new Function<Object, Single<Integer>>() {
-            @Override
-            public Single<Integer> apply(Object d) {
-                return just1;
-            }
-        }, Functions.emptyConsumer());
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void usingSingleSupplierNull() {
-        Single.using(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, null, Functions.emptyConsumer());
-    }
-
     @Test(expected = NullPointerException.class)
     public void usingSingleSupplierReturnsNull() {
         Single.using(new Supplier<Object>() {
@@ -320,31 +194,6 @@ public Single<Object> apply(Object d) {
         }, Functions.emptyConsumer()).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void usingDisposeNull() {
-        Single.using(new Supplier<Object>() {
-            @Override
-            public Object get() {
-                return 1;
-            }
-        }, new Function<Object, Single<Integer>>() {
-            @Override
-            public Single<Integer> apply(Object d) {
-                return just1;
-            }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zipIterableNull() {
-        Single.zip((Iterable<Single<Integer>>)null, new Function<Object[], Object>() {
-            @Override
-            public Object apply(Object[] v) {
-                return 1;
-            }
-        });
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterableIteratorNull() {
         Single.zip(new Iterable<Single<Object>>() {
@@ -370,11 +219,6 @@ public Object apply(Object[] v) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipIterableOneFunctionNull() {
-        Single.zip(Arrays.asList(just1, just1), null).blockingGet();
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterableOneFunctionReturnsNull() {
         Single.zip(Arrays.asList(just1, just1), new Function<Object[], Object>() {
@@ -457,51 +301,6 @@ public Object invoke(Object o, Method m1, Object[] a) throws Throwable {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zip2FirstNull() {
-        Single.zip(null, just1, new BiFunction<Object, Integer, Object>() {
-            @Override
-            public Object apply(Object a, Integer b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zip2SecondNull() {
-        Single.zip(just1, null, new BiFunction<Integer, Object, Object>() {
-            @Override
-            public Object apply(Integer a, Object b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zip2ZipperNull() {
-        Single.zip(just1, just1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zip2ZipperReturnsdNull() {
-        Single.zip(just1, null, new BiFunction<Integer, Object, Object>() {
-            @Override
-            public Object apply(Integer a, Object b) {
-                return null;
-            }
-        }).blockingGet();
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zipArrayNull() {
-        Single.zipArray(new Function<Object[], Object>() {
-            @Override
-            public Object apply(Object[] v) {
-                return 1;
-            }
-        }, (Single<Integer>[])null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipIterableTwoIsNull() {
         Single.zip(Arrays.asList(just1, null), new Function<Object[], Object>() {
@@ -524,11 +323,6 @@ public Object apply(Object[] v) {
         .blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void zipArrayFunctionNull() {
-        Single.zipArray(null, just1, just1);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipArrayFunctionReturnsNull() {
         Single.zipArray(new Function<Object[], Object>() {
@@ -543,61 +337,6 @@ public Object apply(Object[] v) {
     // Instance methods
     //**************************************************
 
-    @Test(expected = NullPointerException.class)
-    public void ambWithNull() {
-        just1.ambWith(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void composeNull() {
-        just1.compose(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void castNull() {
-        just1.cast(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void concatWith() {
-        just1.concatWith(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delayUnitNull() {
-        just1.delay(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void delaySchedulerNull() {
-        just1.delay(1, TimeUnit.SECONDS, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnSubscribeNull() {
-        just1.doOnSubscribe(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnSuccess() {
-        just1.doOnSuccess(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnError() {
-        error.doOnError(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void doOnDisposeNull() {
-        just1.doOnDispose(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void flatMapNull() {
-        just1.flatMap(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapFunctionReturnsNull() {
         just1.flatMap(new Function<Integer, Single<Object>>() {
@@ -608,11 +347,6 @@ public Single<Object> apply(Integer v) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void flatMapPublisherNull() {
-        just1.flatMapPublisher(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void flatMapPublisherFunctionReturnsNull() {
         just1.flatMapPublisher(new Function<Integer, Publisher<Object>>() {
@@ -623,11 +357,6 @@ public Publisher<Object> apply(Integer v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void liftNull() {
-        just1.lift(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void liftFunctionReturnsNull() {
         just1.lift(new SingleOperator<Object, Integer>() {
@@ -638,31 +367,6 @@ public SingleObserver<? super Integer> apply(SingleObserver<? super Object> obse
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void containsNull() {
-        just1.contains(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void containsComparerNull() {
-        just1.contains(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void mergeWithNull() {
-        just1.mergeWith(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void observeOnNull() {
-        just1.observeOn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorReturnSupplierNull() {
-        just1.onErrorReturn((Function<Throwable, Integer>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void onErrorReturnsSupplierReturnsNull() {
         error.onErrorReturn(new Function<Throwable, Integer>() {
@@ -673,21 +377,6 @@ public Integer apply(Throwable t) throws Exception {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void onErrorReturnValueNull() {
-        error.onErrorReturnItem(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorResumeWithSingleNull() {
-        error.onErrorResumeWith(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void onErrorResumeNextNull() {
-        error.onErrorResumeNext(null);
-    }
-
     @Test
     public void onErrorResumeNextFunctionReturnsNull() {
         try {
@@ -702,11 +391,6 @@ public Single<Integer> apply(Throwable e) {
         }
     }
 
-    @Test(expected = NullPointerException.class)
-    public void repeatWhenNull() {
-        error.repeatWhen(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void repeatWhenFunctionReturnsNull() {
         error.repeatWhen(new Function<Flowable<Object>, Publisher<Object>>() {
@@ -717,26 +401,6 @@ public Publisher<Object> apply(Flowable<Object> v) {
         }).blockingSubscribe();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void repeatUntilNull() {
-        error.repeatUntil(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryBiPreducateNull() {
-        error.retry((BiPredicate<Integer, Throwable>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryPredicateNull() {
-        error.retry((Predicate<Throwable>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void retryWhenNull() {
-        error.retryWhen(null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void retryWhenFunctionReturnsNull() {
         error.retryWhen(new Function<Flowable<? extends Throwable>, Publisher<Object>>() {
@@ -747,21 +411,6 @@ public Publisher<Object> apply(Flowable<? extends Throwable> e) {
         }).blockingGet();
     }
 
-    @Test(expected = NullPointerException.class)
-    public void subscribeBiConsumerNull() {
-        just1.subscribe((BiConsumer<Integer, Throwable>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeConsumerNull() {
-        just1.subscribe((Consumer<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeSingeSubscriberNull() {
-        just1.subscribe((SingleObserver<Integer>)null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void subscribeOnSuccessNull() {
         just1.subscribe(null, new Consumer<Throwable>() {
@@ -770,64 +419,6 @@ public void accept(Throwable e) { }
         });
     }
 
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnErrorNull() {
-        just1.subscribe(new Consumer<Integer>() {
-            @Override
-            public void accept(Integer v) { }
-        }, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeSubscriberNull() {
-        just1.toFlowable().subscribe((Subscriber<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void subscribeOnNull() {
-        just1.subscribeOn(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutUnitNull() {
-        just1.timeout(1, null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutSchedulerNull() {
-        just1.timeout(1, TimeUnit.SECONDS, (Scheduler)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutOtherNull() {
-        just1.timeout(1, TimeUnit.SECONDS, Schedulers.single(), null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void timeoutOther2Null() {
-        just1.timeout(1, TimeUnit.SECONDS, (Single<Integer>)null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void toNull() {
-        just1.to(null);
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zipWithNull() {
-        just1.zipWith(null, new BiFunction<Integer, Object, Object>() {
-            @Override
-            public Object apply(Integer a, Object b) {
-                return 1;
-            }
-        });
-    }
-
-    @Test(expected = NullPointerException.class)
-    public void zipWithFunctionNull() {
-        just1.zipWith(just1, null);
-    }
-
     @Test(expected = NullPointerException.class)
     public void zipWithFunctionReturnsNull() {
         just1.zipWith(just1, new BiFunction<Integer, Integer, Object>() {

From 148eeb09420527fbf3407d87ce23d6ee4ded8f88 Mon Sep 17 00:00:00 2001
From: Jonathan Leitschuh <jonathan.leitschuh@gmail.com>
Date: Wed, 15 Jan 2020 14:56:01 -0500
Subject: [PATCH 054/665] Official Gradle Wrapper Validation GitHub Action
 (#6848)

See: https://github.com/gradle/wrapper-validation-action
---
 .github/workflows/gradle-wrapper-validation.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/workflows/gradle-wrapper-validation.yml

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
new file mode 100644
index 0000000000..f552c8dc65
--- /dev/null
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -0,0 +1,10 @@
+name: "Validate Gradle Wrapper"
+on: [push]
+
+jobs:
+  validation:
+    name: "Validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: gradle/wrapper-validation-action@v1

From 68a12c88c48970c26c33b5d8397db191b5d1a7da Mon Sep 17 00:00:00 2001
From: Jonathan Leitschuh <jonathan.leitschuh@gmail.com>
Date: Thu, 16 Jan 2020 02:01:23 -0500
Subject: [PATCH 055/665] Add `pull_request` to Wrapper Validation Triggers
 (#6849)

---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index f552c8dc65..405a2b3065 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,5 +1,5 @@
 name: "Validate Gradle Wrapper"
-on: [push]
+on: [push, pull_request]
 
 jobs:
   validation:

From 021d07b4c602a8c86605f1e218aa81466b5f36b8 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 16 Jan 2020 09:08:32 +0100
Subject: [PATCH 056/665] 3.x: Simplify @return sentences in Flowable JavaDocs
 (#6847)

* 3.x: Simplify @return sentences in Flowable

* Clear Completable

* Clear Single

* Clean Maybe

* Clean Observable
---
 .../reactivex/rxjava3/core/Completable.java   |   37 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 1068 ++++++-----------
 .../java/io/reactivex/rxjava3/core/Maybe.java |  178 ++-
 .../io/reactivex/rxjava3/core/Observable.java | 1005 ++++++----------
 .../io/reactivex/rxjava3/core/Single.java     |   31 +-
 .../rxjava3/parallel/ParallelFlowable.java    |    4 +-
 .../util/OperatorMatrixGenerator.java         |    2 +-
 .../rxjava3/validators/JavadocWording.java    |  169 ++-
 8 files changed, 1018 insertions(+), 1476 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 7e788ea3b9..ee3af955a9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -165,7 +165,7 @@ public static Completable amb(@NonNull Iterable<@NonNull ? extends CompletableSo
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code complete} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a {@code Completable} instance that completes immediately
+     * @return the shared {@code Completable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -183,7 +183,7 @@ public static Completable complete() {
      *  <dd>{@code concatArray} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param sources the sources to concatenate
-     * @return the {@code Completable} instance which completes only when all sources complete
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
@@ -210,7 +210,7 @@ public static Completable concatArray(@NonNull CompletableSource... sources) {
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param sources the sources to concatenate
-     * @return the {@code Completable} instance which completes only when all sources complete
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
@@ -234,7 +234,7 @@ public static Completable concat(@NonNull Iterable<@NonNull ? extends Completabl
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param sources the sources to concatenate
-     * @return the {@code Completable} instance which completes only when all sources complete
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      */
     @CheckReturnValue
@@ -258,7 +258,7 @@ public static Completable concat(@NonNull Publisher<@NonNull ? extends Completab
      * </dl>
      * @param sources the sources to concatenate
      * @param prefetch the number of sources to prefetch from the sources
-     * @return the {@code Completable} instance which completes only when all sources complete
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      */
@@ -334,7 +334,7 @@ public static Completable create(@NonNull CompletableOnSubscribe source) {
      * </dl>
      * @param source the callback which will receive the {@link CompletableObserver} instances
      * when the {@code Completable} is subscribed to.
-     * @return the created {@code Completable} instance
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code source} is {@code null}
      * @throws IllegalArgumentException if {@code source} is a {@code Completable}
      */
@@ -358,7 +358,7 @@ public static Completable unsafeCreate(@NonNull CompletableSource source) {
      *  <dd>{@code defer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param completableSupplier the supplier that returns the {@code Completable} that will be subscribed to.
-     * @return the {@code Completable} instance
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code completableSupplier} is {@code null}
      */
     @CheckReturnValue
@@ -1008,7 +1008,7 @@ public static Completable timer(long delay, @NonNull TimeUnit unit, @NonNull Sch
     /**
      * Creates a {@link NullPointerException} instance and sets the given {@link Throwable} as its initial cause.
      * @param ex the {@code Throwable} instance to use as cause, not {@code null} (not verified)
-     * @return the created {@code NullPointerException}
+     * @return the new {@code NullPointerException}
      */
     private static NullPointerException toNpe(Throwable ex) {
         NullPointerException npe = new NullPointerException("Actually not, but can't pass out an exception otherwise...");
@@ -1096,7 +1096,7 @@ public static <R> Completable using(
      *  <dd>{@code wrap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param source the source to wrap
-     * @return the source or its wrapper {@code Completable}
+     * @return the new wrapped or cast {@code Completable} instance
      * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
@@ -1344,7 +1344,7 @@ public final Completable cache() {
      *  <dd>{@code compose} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param transformer the transformer function, not {@code null}
-     * @return a {@code Completable} wrapping the {@code CompletableSource} returned by the function via {@link #wrap(CompletableSource)}
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code transformer} is {@code null}
      */
     @CheckReturnValue
@@ -1461,7 +1461,7 @@ public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      *
      * @param delay the time to delay the subscription
      * @param unit  the time unit of {@code delay}
-     * @return a {@code Completable} that delays the subscription to the upstream by the given amount
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @since 3.0.0
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
@@ -1486,8 +1486,7 @@ public final Completable delaySubscription(long delay, @NonNull TimeUnit unit) {
      * @param delay     the time to delay the subscription
      * @param unit      the time unit of {@code delay}
      * @param scheduler the {@code Scheduler} on which the waiting and subscription will happen
-     * @return a {@code Completable} that delays the subscription to the upstream by a given
-     * amount of time, waiting and subscribing on the given {@code Scheduler}
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 3.0.0
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
@@ -1998,8 +1997,7 @@ public final Completable onErrorResumeNext(@NonNull Function<? super Throwable,
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.5 - experimental
-     * @return a {@code Completable} which {@code null}s out references to the upstream producer and downstream {@code CompletableObserver} if
-     * the sequence is terminated or downstream calls {@code dispose()}
+     * @return the new {@code Completable} instance
      * @since 2.2
      */
     @CheckReturnValue
@@ -2336,7 +2334,7 @@ public final Completable hide() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return the {@code Disposable} that allows disposing the subscription
+     * @return the new {@code Disposable} that can be used for disposing the subscription at any time
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
@@ -2420,7 +2418,7 @@ public final void subscribe(@NonNull CompletableObserver observer) {
      * </dl>
      * @param onComplete the {@link Action} that is called if the {@code Completable} completes normally
      * @param onError the {@link Consumer} that is called if this {@code Completable} emits an error
-     * @return the {@link Disposable} that can be used for disposing the subscription asynchronously
+     * @return the new {@link Disposable} that can be used for disposing the subscription at any time
      * @throws NullPointerException if {@code onComplete} or {@code onError} is {@code null}
      */
     @CheckReturnValue
@@ -2449,7 +2447,7 @@ public final Disposable subscribe(@NonNull Action onComplete, @NonNull Consumer<
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param onComplete the {@code Action} called when this {@code Completable} completes normally
-     * @return the {@link Disposable} that allows disposing the subscription
+     * @return the new {@link Disposable} that can be used for disposing the subscription at any time
      * @throws NullPointerException if {@code onComplete} is {@code null}
      */
     @CheckReturnValue
@@ -2691,8 +2689,7 @@ public final <T> Flowable<T> toFlowable() {
      * </dl>
      *
      * @param <T> the value type
-     * @return a {@code Maybe} that only calls {@code onComplete} or {@code onError}, based on which one is
-     *         called by the current {@code Completable}.
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @SuppressWarnings("unchecked")
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index c1f4338cd2..54bc24fca0 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -174,8 +174,7 @@ public abstract class Flowable<@NonNull T> implements Publisher<T> {
      * @param sources
      *            an {@code Iterable} of {@code Publisher}s sources competing to react first. A subscription to each {@code Publisher} will
      *            occur in the same order as in this {@code Iterable}.
-     * @return a {@code Flowable} that emits the same sequence as whichever of the source {@code Publisher}s first
-     *         emitted an item or sent a termination notification
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -205,8 +204,7 @@ public static <T> Flowable<T> amb(@NonNull Iterable<@NonNull ? extends Publisher
      * @param sources
      *            an array of {@code Publisher} sources competing to react first. A subscription to each {@code Publisher} will
      *            occur in the same order as in this array.
-     * @return a {@code Flowable} that emits the same sequence as whichever of the source {@code Publisher}s first
-     *         emitted an item or sent a termination notification
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -271,8 +269,7 @@ public static int bufferSize() {
      *            the collection of source {@code Publisher}s
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -319,8 +316,7 @@ public static int bufferSize() {
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @param bufferSize
      *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -372,8 +368,7 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<@NonNull
      *            the collection of source {@code Publisher}s
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -421,8 +416,7 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<@NonNull
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @param bufferSize
      *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -472,8 +466,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? exte
      *            the collection of source {@code Publisher}s
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -522,8 +515,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? exte
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @param bufferSize
      *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -577,8 +569,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? exte
      *            the collection of source {@code Publisher}s
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -627,8 +618,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? exte
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
      * @param bufferSize
      *            the internal buffer size and prefetch amount applied to every source {@code Flowable}
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -673,8 +663,7 @@ public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<@NonN
      *            the second source {@code Publisher}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -723,8 +712,7 @@ public static <T1, T2, R> Flowable<R> combineLatest(
      *            the third source {@code Publisher}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -778,8 +766,7 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
      *            the fourth source {@code Publisher}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -838,8 +825,7 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
      *            the fifth source {@code Publisher}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -903,8 +889,7 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
      *            the sixth source {@code Publisher}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -972,8 +957,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
      *            the seventh source {@code Publisher}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7} or {@code combiner} is {@code null}
@@ -1047,8 +1031,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
      *            the eighth source {@code Publisher}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8} or {@code combiner} is {@code null}
@@ -1126,8 +1109,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
      *            the ninth source {@code Publisher}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the source {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of combining the items emitted by the source
-     *         {@code Publisher}s by means of the given aggregation function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8}, {@code source9}
@@ -1207,8 +1189,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends Publis
      * @param <T> the common element base type
      * @param sources
      *            a {@code Publisher} that emits {@code Publisher}s
-     * @return a {@code Flowable} that emits items all of the items emitted by the {@code Publisher}s emitted by
-     *         {@code Publisher}s, one after the other, without interleaving them
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1240,8 +1221,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publi
      *            a {@code Publisher} that emits {@code Publisher}s
      * @param prefetch
      *            the number of {@code Publisher}s to prefetch from the sources sequence.
-     * @return a {@code Flowable} that emits items all of the items emitted by the {@code Publisher}s emitted by
-     *         {@code Publisher}s, one after the other, without interleaving them
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
@@ -1275,8 +1255,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publi
      *            a {@code Publisher} to be concatenated
      * @param source2
      *            a {@code Publisher} to be concatenated
-     * @return a {@code Flowable} that emits items emitted by the two source {@code Publisher}s, one after the other,
-     *         without interleaving them
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1312,8 +1291,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends T> so
      *            a {@code Publisher} to be concatenated
      * @param source3
      *            a {@code Publisher} to be concatenated
-     * @return a {@code Flowable} that emits items emitted by the three source {@code Publisher}s, one after the other,
-     *         without interleaving them
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1354,8 +1332,7 @@ public static <T> Flowable<T> concat(
      *            a {@code Publisher} to be concatenated
      * @param source4
      *            a {@code Publisher} to be concatenated
-     * @return a {@code Flowable} that emits items emitted by the four source {@code Publisher}s, one after the other,
-     *         without interleaving them
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1884,8 +1861,7 @@ public static <T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @No
      *            resulting {@code Flowable}
      * @param <T>
      *            the type of the items emitted by the {@code Publisher}
-     * @return a {@code Flowable} whose {@code Subscriber}s' subscriptions trigger an invocation of the given
-     *         {@code Publisher} factory function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defer.html">ReactiveX operators documentation: Defer</a>
      */
@@ -1912,8 +1888,7 @@ public static <T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<@NonNu
      *
      * @param <T>
      *            the type of the items (ostensibly) emitted by the {@link Publisher}
-     * @return a {@code Flowable} that emits no items to the {@code Subscriber} but immediately invokes the
-     *         {@code Subscriber}'s {@link Subscriber#onComplete() onComplete} method
+     * @return the shared {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Empty</a>
      */
     @CheckReturnValue
@@ -1941,8 +1916,7 @@ public static <T> Flowable<T> empty() {
      *            a {@link Supplier} factory to return a {@link Throwable} for each individual {@code Subscriber}
      * @param <T>
      *            the type of the items (ostensibly) emitted by the {@link Publisher}
-     * @return a {@code Flowable} that invokes the {@code Subscriber}'s {@link Subscriber#onError onError} method when
-     *         the {@code Subscriber} subscribes to it
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
@@ -1971,8 +1945,7 @@ public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> suppl
      *            the particular {@link Throwable} to pass to {@link Subscriber#onError onError}
      * @param <T>
      *            the type of the items (ostensibly) emitted by the {@link Publisher}
-     * @return a {@code Flowable} that invokes the {@code Subscriber}'s {@link Subscriber#onError onError} method when
-     *         the {@code Subscriber} subscribes to it
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code throwable} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
@@ -2001,7 +1974,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *            the array of elements
      * @param <T>
      *            the type of items in the array and the type of items to be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits each item in the source array
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
@@ -2048,7 +2021,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *         function only when a {@code Subscriber} subscribes to the {@code Publisher} that {@code fromCallable} returns
      * @param <T>
      *         the type of the item emitted by the {@code Publisher}
-     * @return a {@code Flowable} whose {@code Subscriber}s' subscriptions trigger an invocation of the given function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code callable} is {@code null}
      * @see #defer(Supplier)
      * @see #fromSupplier(Supplier)
@@ -2091,7 +2064,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * @param <T>
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the item from the source {@code Future}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code future} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromCompletionStage(CompletionStage)
@@ -2137,7 +2110,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * @param <T>
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the item from the source {@code Future}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code future} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromCompletionStage(CompletionStage)
@@ -2169,7 +2142,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * @param <T>
      *            the type of items in the {@code Iterable} sequence and the type of items to be emitted by the
      *            resulting {@code Flowable}
-     * @return a {@code Flowable} that emits each item in the source {@code Iterable} sequence
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromStream(Stream)
@@ -2251,7 +2224,7 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<@NonNull ? extend
      *         function only when a {@code Subscriber} subscribes to the {@code Publisher} that {@code fromSupplier} returns
      * @param <T>
      *         the type of the item emitted by the {@code Publisher}
-     * @return a {@code Flowable} whose {@code Subscriber}s' subscriptions trigger an invocation of the given function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code supplier} is {@code null}
      * @see #defer(Supplier)
      * @see #fromCallable(Callable)
@@ -2460,8 +2433,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      *            the period of time between emissions of the subsequent numbers
      * @param unit
      *            the time unit for both {@code initialDelay} and {@code period}
-     * @return a {@code Flowable} that emits a 0L after the {@code initialDelay} and ever-increasing numbers after
-     *         each {@code period} of time thereafter
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      * @since 1.0.12
@@ -2496,8 +2468,7 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
      *            the time unit for both {@code initialDelay} and {@code period}
      * @param scheduler
      *            the {@code Scheduler} on which the waiting happens and items are emitted
-     * @return a {@code Flowable} that emits a 0L after the {@code initialDelay} and ever-increasing numbers after
-     *         each {@code period} of time thereafter, while running on the given {@code Scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      * @since 1.0.12
@@ -2528,7 +2499,7 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
      *            the period size in time units (see below)
      * @param unit
      *            time units to use for the interval size
-     * @return a {@code Flowable} that emits a sequential number each time interval
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
@@ -2560,7 +2531,7 @@ public static Flowable<Long> interval(long period, @NonNull TimeUnit unit) {
      *            time units to use for the interval size
      * @param scheduler
      *            the {@code Scheduler} to use for scheduling the items
-     * @return a {@code Flowable} that emits a sequential number each time interval
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
@@ -2668,7 +2639,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            the item to emit
      * @param <T>
      *            the type of that item
-     * @return a {@code Flowable} that emits {@code value} as a single item and then completes
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      * @see #just(Object, Object)
@@ -2702,7 +2673,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            second item
      * @param <T>
      *            the type of these items
-     * @return a {@code Flowable} that emits each item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item1} or {@code item2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
@@ -2736,7 +2707,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            third item
      * @param <T>
      *            the type of these items
-     * @return a {@code Flowable} that emits each item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item1}, {@code item2} or {@code item3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
@@ -2773,7 +2744,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            fourth item
      * @param <T>
      *            the type of these items
-     * @return a {@code Flowable} that emits each item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              or {@code item4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
@@ -2814,7 +2785,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            fifth item
      * @param <T>
      *            the type of these items
-     * @return a {@code Flowable} that emits each item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4} or {@code item5} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
@@ -2858,7 +2829,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            sixth item
      * @param <T>
      *            the type of these items
-     * @return a {@code Flowable} that emits each item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5} or {@code item6} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
@@ -2905,7 +2876,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            seventh item
      * @param <T>
      *            the type of these items
-     * @return a {@code Flowable} that emits each item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5}, {@code item6}
      *                              or {@code item7} is {@code null}
@@ -2956,7 +2927,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            eighth item
      * @param <T>
      *            the type of these items
-     * @return a {@code Flowable} that emits each item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5}, {@code item6},
      *                              {@code item7} or {@code item8} is {@code null}
@@ -3010,7 +2981,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            ninth item
      * @param <T>
      *            the type of these items
-     * @return a {@code Flowable} that emits each item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5}, {@code item6},
      *                              {@code item7}, {@code item8} or {@code item9} is {@code null}
@@ -3067,7 +3038,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            tenth item
      * @param <T>
      *            the type of these items
-     * @return a {@code Flowable} that emits each item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5}, {@code item6},
      *                              {@code item7}, {@code item8}, {@code item9},
@@ -3129,8 +3100,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param bufferSize
      *            the number of items to prefetch from each inner {@code Publisher}
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code Publisher}s in the {@code Iterable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} or {@code bufferSize} is non-positive
@@ -3182,8 +3152,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publish
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param bufferSize
      *            the number of items to prefetch from each inner {@code Publisher}
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} or {@code bufferSize} is non-positive
@@ -3231,8 +3200,7 @@ public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @No
      * @param <T> the common element base type
      * @param sources
      *            the {@code Iterable} of {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code Publisher}s in the {@code Iterable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable)
@@ -3280,8 +3248,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publish
      *            the {@code Iterable} of {@code Publisher}s
      * @param maxConcurrency
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code Publisher}s in the {@code Iterable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is less than or equal to 0
@@ -3330,8 +3297,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publish
      * @param <T> the common element base type
      * @param sources
      *            a {@code Publisher} that emits {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of flattening the {@code Publisher}s emitted by the
-     *         {@code source} {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher)
@@ -3379,8 +3345,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publis
      *            a {@code Publisher} that emits {@code Publisher}s
      * @param maxConcurrency
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
-     * @return a {@code Flowable} that emits items that are the result of flattening the {@code Publisher}s emitted by the
-     *         {@code source} {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is less than or equal to 0
@@ -3428,7 +3393,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publis
      * @param <T> the common element base type
      * @param sources
      *            the array of {@code Publisher}s
-     * @return a {@code Flowable} that emits all of the items emitted by the {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeArrayDelayError(Publisher...)
@@ -3476,7 +3441,7 @@ public static <T> Flowable<T> mergeArray(@NonNull Publisher<@NonNull ? extends T
      *            a {@code Publisher} to be merged
      * @param source2
      *            a {@code Publisher} to be merged
-     * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher, Publisher)
@@ -3527,7 +3492,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> sou
      *            a {@code Publisher} to be merged
      * @param source3
      *            a {@code Publisher} to be merged
-     * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher, Publisher, Publisher)
@@ -3581,7 +3546,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> sou
      *            a {@code Publisher} to be merged
      * @param source4
      *            a {@code Publisher} to be merged
-     * @return a {@code Flowable} that emits all of the items emitted by the source {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Publisher, Publisher, Publisher, Publisher)
@@ -3625,8 +3590,7 @@ public static <T> Flowable<T> merge(
      * @param <T> the common element base type
      * @param sources
      *            the {@code Iterable} of {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code Publisher}s in the {@code Iterable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3667,8 +3631,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param bufferSize
      *            the number of items to prefetch from each inner {@code Publisher}
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code Publisher}s in the {@code Iterable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3710,8 +3673,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
      * @param bufferSize
      *            the number of items to prefetch from each inner {@code Publisher}
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3752,8 +3714,7 @@ public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int buffe
      *            the {@code Iterable} of {@code Publisher}s
      * @param maxConcurrency
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code Publisher}s in the {@code Iterable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3792,8 +3753,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
      * @param <T> the common element base type
      * @param sources
      *            a {@code Publisher} that emits {@code Publisher}s
-     * @return a {@code Flowable} that emits all of the items emitted by the {@code Publisher}s emitted by the
-     *         {@code source} {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3832,8 +3792,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      *            a {@code Publisher} that emits {@code Publisher}s
      * @param maxConcurrency
      *            the maximum number of {@code Publisher}s that may be subscribed to concurrently
-     * @return a {@code Flowable} that emits all of the items emitted by the {@code Publisher}s emitted by the
-     *         {@code source} {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3872,8 +3831,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      * @param <T> the common element base type
      * @param sources
      *            the array of {@code Publisher}s
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3913,7 +3871,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<@NonNull ?
      *            a {@code Publisher} to be merged
      * @param source2
      *            a {@code Publisher} to be merged
-     * @return a {@code Flowable} that emits all of the items that are emitted by the two source {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3957,7 +3915,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      *            a {@code Publisher} to be merged
      * @param source3
      *            a {@code Publisher} to be merged
-     * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -4004,7 +3962,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      *            a {@code Publisher} to be merged
      * @param source4
      *            a {@code Publisher} to be merged
-     * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -4038,7 +3996,7 @@ public static <T> Flowable<T> mergeDelayError(
      *
      * @param <T>
      *            the type of items (not) emitted by the {@code Publisher}
-     * @return a {@code Flowable} that never emits any items or sends any notifications to a {@code Subscriber}
+     * @return the shared {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Never</a>
      */
     @CheckReturnValue
@@ -4065,7 +4023,7 @@ public static <T> Flowable<T> never() {
      *            the value of the first {@code Integer} in the sequence
      * @param count
      *            the number of sequential {@code Integer}s to generate
-     * @return a {@code Flowable} that emits a range of sequential {@code Integer}s
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Integer#MAX_VALUE}
@@ -4106,7 +4064,7 @@ public static Flowable<Integer> range(int start, int count) {
      *            the value of the first {@code Long} in the sequence
      * @param count
      *            the number of sequential {@code Long}s to generate
-     * @return a {@code Flowable} that emits a range of sequential {@code Long}s
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Long#MAX_VALUE}
@@ -4156,7 +4114,7 @@ public static Flowable<Long> rangeLong(long start, long count) {
      *            the second {@code Publisher} to compare
      * @param <T>
      *            the type of items emitted by each {@code Publisher}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
@@ -4190,8 +4148,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
      *            a function used to compare items emitted by each {@code Publisher}
      * @param <T>
      *            the type of items emitted by each {@code Publisher}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code Publisher} sequences
-     *         are the same according to the specified function
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
@@ -4228,8 +4185,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
      *            the number of items to prefetch from the first and second source {@code Publisher}
      * @param <T>
      *            the type of items emitted by each {@code Publisher}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code Publisher} sequences
-     *         are the same according to the specified function
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
@@ -4268,7 +4224,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
      *            the number of items to prefetch from the first and second source {@code Publisher}
      * @param <T>
      *            the type of items emitted by each {@code Publisher}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
@@ -4309,8 +4265,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
      *            the source {@code Publisher} that emits {@code Publisher}s
      * @param bufferSize
      *            the number of items to prefetch from the inner {@code Publisher}s
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
-     *         {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
@@ -4350,8 +4305,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends
      * @param <T> the item type
      * @param sources
      *            the source {@code Publisher} that emits {@code Publisher}s
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
-     *         {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      */
@@ -4391,8 +4345,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends
      * @param <T> the item type
      * @param sources
      *            the source {@code Publisher} that emits {@code Publisher}s
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
-     *         {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      * @since 2.0
@@ -4434,8 +4387,7 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull
      *            the source {@code Publisher} that emits {@code Publisher}s
      * @param prefetch
      *            the number of items to prefetch from the inner {@code Publisher}s
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} most recently emitted by the source
-     *         {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
@@ -4465,7 +4417,7 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull
      *            the initial delay before emitting a single {@code 0L}
      * @param unit
      *            time units to use for {@code delay}
-     * @return a {@code Flowable} that emits {@code 0L} after a specified delay, and then completes
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
@@ -4496,8 +4448,7 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit) {
      *            time units to use for {@code delay}
      * @param scheduler
      *            the {@code Scheduler} to use for scheduling the item
-     * @return a {@code Flowable} that emits {@code 0L} after a specified delay, on a specified {@code Scheduler}, and then
-     *         completes
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
@@ -4565,7 +4516,7 @@ public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
      *            the factory function to create a {@code Publisher}
      * @param resourceDisposer
      *            the function that will dispose of the resource
-     * @return the {@code Flowable} whose lifetime controls the lifetime of the dependent resource object
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceDisposer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
@@ -4607,7 +4558,7 @@ public static <T, D> Flowable<T> using(
      *            or just before the emission of a terminal event ({@code onComplete} or {@code onError}).
      *            If {@code false} the resource disposal will happen either on a {@code cancel()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
-     * @return the {@code Flowable} whose lifetime controls the lifetime of the dependent resource object
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceDisposer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      * @since 2.0
@@ -4668,7 +4619,7 @@ public static <T, D> Flowable<T> using(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
      *            an item that will be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -4728,7 +4679,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publis
      *            the number of elements to prefetch from each source {@code Publisher}
      * @param <T> the common source value type
      * @param <R> the zipped result type
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -4791,7 +4742,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publis
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results
      *            in an item that will be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -4854,7 +4805,7 @@ public static <T1, T2, R> Flowable<R> zip(
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results
      *            in an item that will be emitted by the resulting {@code Flowable}
      * @param delayError delay errors from any of the source {@code Publisher}s till the other terminates
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -4918,7 +4869,7 @@ public static <T1, T2, R> Flowable<R> zip(
      *            in an item that will be emitted by the resulting {@code Flowable}
      * @param delayError delay errors from any of the source {@code Publisher}s till the other terminates
      * @param bufferSize the number of elements to prefetch from each source {@code Publisher}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -4985,7 +4936,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
      *            an item that will be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -5055,7 +5006,7 @@ public static <T1, T2, T3, R> Flowable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
      *            an item that will be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -5131,7 +5082,7 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
      *            an item that will be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -5210,7 +5161,7 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
      *            an item that will be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6}
      *                              or {@code zipper} is {@code null}
@@ -5294,7 +5245,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
      *            an item that will be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7} or {@code zipper} is {@code null}
@@ -5383,7 +5334,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
      *            an item that will be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8} or {@code zipper} is {@code null}
@@ -5476,7 +5427,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code Publisher}s, results in
      *            an item that will be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8}, {@code source9}
@@ -5552,7 +5503,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
      *            delay errors signaled by any of the source {@code Publisher} until all {@code Publisher}s terminate
      * @param bufferSize
      *            the number of elements to prefetch from each source {@code Publisher}
-     * @return a {@code Flowable} that emits the zipped results
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -5592,8 +5543,7 @@ public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ?
      *
      * @param predicate
      *            a function that evaluates an item and returns a {@code Boolean}
-     * @return a {@code Single} that emits {@code true} if all items emitted by the current {@code Flowable} satisfy the
-     *         predicate; otherwise, {@code false}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/all.html">ReactiveX operators documentation: All</a>
      */
@@ -5622,8 +5572,7 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
      * @param other
      *            a {@code Publisher} competing to react first. A subscription to this provided {@code Publisher} will occur after subscribing
      *            to the current {@code Flowable}.
-     * @return a {@code Flowable} that emits the same sequence as whichever of this or the other {@code Publisher} first
-     *         emitted an item or sent a termination notification
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -5655,8 +5604,7 @@ public final Flowable<T> ambWith(@NonNull Publisher<@NonNull ? extends T> other)
      *
      * @param predicate
      *            the condition to test items emitted by the current {@code Flowable}
-     * @return a {@code Single} that emits a {@link Boolean} that indicates whether any item emitted by the current
-     *         {@code Flowable} satisfies the {@code predicate}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
@@ -5684,7 +5632,7 @@ public final Single<Boolean> any(@NonNull Predicate<? super T> predicate) {
      *  {@link Error}s are rethrown as they are.</dd>
      * </dl>
      *
-     * @return the first item emitted by this {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NoSuchElementException
      *             if this {@code Flowable} emits no items
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
@@ -5720,8 +5668,7 @@ public final T blockingFirst() {
      *
      * @param defaultItem
      *            a default value to return if this {@code Flowable} emits no items
-     * @return the first item emitted by this {@code Flowable}, or the default value if it emits no
-     *         items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
@@ -5843,7 +5790,7 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext, int buffe
      *  <dd>{@code blockingIterable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Iterable} version of this {@code Flowable}
+     * @return the new {@code Iterable} instance
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -5868,7 +5815,7 @@ public final Iterable<T> blockingIterable() {
      * </dl>
      *
      * @param bufferSize the number of items to prefetch from the current {@code Flowable}
-     * @return an {@code Iterable} version of this {@code Flowable}
+     * @return the new {@code Iterable} instance
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
@@ -5898,7 +5845,7 @@ public final Iterable<T> blockingIterable(int bufferSize) {
      *  {@link Error}s are rethrown as they are.</dd>
      * </dl>
      *
-     * @return the last item emitted by this {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NoSuchElementException
      *             if this {@code Flowable} emits no items
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX documentation: Last</a>
@@ -5936,8 +5883,7 @@ public final T blockingLast() {
      *
      * @param defaultItem
      *            a default value to return if this {@code Flowable} emits no items
-     * @return the last item emitted by the {@code Flowable}, or the default value if it emits no
-     *         items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX documentation: Last</a>
      */
@@ -5970,7 +5916,7 @@ public final T blockingLast(@NonNull T defaultItem) {
      *  <dd>{@code blockingLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Iterable} that always returns the latest item emitted by this {@code Flowable}
+     * @return the new {@code Iterable} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5997,8 +5943,7 @@ public final Iterable<T> blockingLatest() {
      * @param initialItem
      *            the initial item that the {@code Iterable} sequence will yield if this
      *            {@code Flowable} has not yet emitted an item
-     * @return an {@code Iterable} that on each iteration returns the item that this {@code Flowable}
-     *         has most recently emitted
+     * @return the new {@code Iterable} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -6022,8 +5967,7 @@ public final Iterable<T> blockingMostRecent(@NonNull T initialItem) {
      *  <dd>{@code blockingNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Iterable} that blocks upon each iteration until this {@code Flowable} emits
-     *         a new item, whereupon the {@code Iterable} returns that item
+     * @return the new {@code Iterable} instance
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -6051,7 +5995,7 @@ public final Iterable<T> blockingNext() {
      *  {@link Error}s are rethrown as they are.</dd>
      * </dl>
      *
-     * @return the single item emitted by this {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -6082,8 +6026,7 @@ public final T blockingSingle() {
      *
      * @param defaultItem
      *            a default value to return if this {@code Flowable} emits no items
-     * @return the single item emitted by this {@code Flowable}, or the default value if it emits no
-     *         items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
@@ -6114,7 +6057,7 @@ public final T blockingSingle(@NonNull T defaultItem) {
      *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Future} that expects a single item to be emitted by this {@code Flowable}
+     * @return the new {@code Future} instance
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -6367,8 +6310,7 @@ public final void blockingSubscribe(@NonNull Subscriber<@NonNull ? super T> subs
      *
      * @param count
      *            the maximum number of items in each buffer before it should be emitted
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6403,8 +6345,7 @@ public final Flowable<List<T>> buffer(int count) {
      *            how many items emitted by the current {@code Flowable} should be skipped before starting a new
      *            buffer. Note that when {@code skip} and {@code count} are equal, this is the same operation as
      *            {@link #buffer(int)}.
-     * @return a {@code Flowable} that emits buffers for every {@code skip} item from the current {@code Flowable} and
-     *         containing at most {@code count} items
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6443,8 +6384,7 @@ public final Flowable<List<T>> buffer(int count, int skip) {
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a {@code Flowable} that emits buffers for every {@code skip} item from the current {@code Flowable} and
-     *         containing at most {@code count} items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code bufferSupplier} is {@code null}
      * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6483,8 +6423,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code bufferSupplier} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6520,8 +6459,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, @No
      *            the period of time after which a new buffer will be created
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
-     * @return a {@code Flowable} that emits new buffers of items emitted by the current {@code Flowable} periodically after
-     *         a fixed timespan has elapsed
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6559,8 +6497,7 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a buffer
-     * @return a {@code Flowable} that emits new buffers of items emitted by the current {@code Flowable} periodically after
-     *         a fixed timespan has elapsed
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6602,8 +6539,7 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a {@code Flowable} that emits new buffers of items emitted by the current {@code Flowable} periodically after
-     *         a fixed timespan has elapsed
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code bufferSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6641,8 +6577,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan,
      *            buffer
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Flowable} within a fixed duration
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6678,9 +6613,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit) {
      *            the unit of time which applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Flowable}, after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
-     *         first)
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6720,9 +6653,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, int
      *            the {@code Scheduler} to use when determining the end and start of a buffer
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Flowable} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
-     *         first)
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6768,9 +6699,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
      *            as the buffer
      * @param restartTimerOnMaxSize if {@code true}, the time window is restarted when the max capacity of the current buffer
      *            is reached
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Flowable} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
-     *         first)
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code bufferSupplier} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6815,8 +6744,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a buffer
-     * @return a {@code Flowable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Flowable} within a fixed duration
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6851,8 +6779,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
      * @param closingIndicator
      *            the {@link Function} that is used to produce a {@code Publisher} for every buffer created. When this
      *            {@code Publisher} emits an item, the associated buffer is emitted.
-     * @return a {@code Flowable} that emits buffers, containing items from the current {@code Flowable}, that are created
-     *         and closed when the specified {@code Publisher}s emit items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6893,8 +6820,7 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a {@code Flowable} that emits buffers, containing items from the current {@code Flowable}, that are created
-     *         and closed when the specified {@code Publisher}s emit items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code openingIndicator}, {@code closingIndicator} or {@code bufferSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6934,8 +6860,7 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
      *            the boundary value type (ignored)
      * @param boundaryIndicator
      *            the boundary {@code Publisher}
-     * @return a {@code Flowable} that emits buffered items from the current {@code Flowable} when the boundary {@code Publisher}
-     *         emits an item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @see #buffer(Publisher, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6972,8 +6897,7 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
      *            the boundary {@code Publisher}
      * @param initialCapacity
      *            the initial capacity of each buffer chunk
-     * @return a {@code Flowable} that emits buffered items from the current {@code Flowable} when the boundary {@code Publisher}
-     *         emits an item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @throws IllegalArgumentException if {@code initialCapacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -7014,8 +6938,7 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return a {@code Flowable} that emits buffered items from the current {@code Flowable} when the boundary {@code Publisher}
-     *         emits an item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code boundaryIndicator} or {@code bufferSupplier} is {@code null}
      * @see #buffer(Publisher, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -7077,8 +7000,7 @@ public final <B, U extends Collection<? super T>> Flowable<U> buffer(@NonNull Pu
      *  <dd>{@code cache} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that, when first subscribed to, caches all of its items and notifications for the
-     *         benefit of subsequent subscribers
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #takeUntil(Predicate)
      * @see #takeUntil(Publisher)
@@ -7142,8 +7064,7 @@ public final Flowable<T> cache() {
      * {@link #replay(int)} in combination with {@link ConnectableFlowable#autoConnect()} or similar.
      *
      * @param initialCapacity hint for number of items to cache (for optimizing underlying data structure)
-     * @return a {@code Flowable} that, when first subscribed to, caches all of its items and notifications for the
-     *         benefit of subsequent subscribers
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code initialCapacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #takeUntil(Predicate)
@@ -7175,8 +7096,7 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
      * @param clazz
      *            the target class type that {@code cast} will cast the items emitted by the current {@code Flowable}
      *            into before emitting them from the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits each item from the current {@code Flowable} after converting it to the
-     *         specified type
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
@@ -7214,8 +7134,7 @@ public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies {@code state}
      *           accordingly
-     * @return a {@code Single} that emits the result of collecting the values emitted by the current {@code Flowable}
-     *         into a single mutable data structure
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code initialItemSupplier} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see #collect(Collector)
@@ -7255,8 +7174,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies {@code state}
      *           accordingly
-     * @return a {@code Single} that emits the result of collecting the values emitted by the current {@code Flowable}
-     *         into a single mutable data structure
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code initialItem} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      */
@@ -7288,7 +7206,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      *
      * @param <R> the value type of the output {@code Publisher}
      * @param composer implements the function that transforms the current {@code Flowable}
-     * @return the current {@code Flowable}, transformed by the transformer function
+     * @return the new composed {@code Flowable} instance
      * @throws NullPointerException if {@code composer} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
      */
@@ -7326,8 +7244,7 @@ public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? e
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
-     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Flowable} and concatenating the {@code Publisher}s obtained from this transformation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -7366,8 +7283,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      *            {@code Publisher}
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
-     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Flowable} and concatenating the {@code Publisher}s obtained from this transformation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -7419,8 +7335,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      *            the number of elements to prefetch from the current {@code Flowable}
      * @param scheduler
      *            the scheduler where the {@code mapper} function will be executed
-     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Flowable} and concatenating the {@code Publisher}s obtained from this transformation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -7455,7 +7370,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      * @param mapper the function called with the upstream item and should return
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
-     * @return a new {@link Completable} instance
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletableDelayError(Function)
      * @since 2.2
@@ -7488,7 +7403,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      *                 ready to be mapped when a previous {@code CompletableSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code CompletableSource}s.
-     * @return a new {@link Completable} instance
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapCompletableDelayError(Function, boolean, int)
@@ -7521,7 +7436,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * @param mapper the function called with the upstream item and should return
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
-     * @return a new {@link Completable} instance
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletable(Function, int)
      * @since 2.2
@@ -7557,7 +7472,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *                   {@code Flowable} is delayed until the current inner
      *                   {@code CompletableSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new {@link Completable} instance
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletable(Function)
      * @since 2.2
@@ -7597,7 +7512,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *                 ready to be mapped when a previous {@code CompletableSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code CompletableSource}s.
-     * @return a new {@link Completable} instance
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapCompletable(Function, int)
@@ -7903,8 +7818,7 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
      *            current {@code Flowable}
-     * @return a {@code Flowable} that emits the results of concatenating the items emitted by the current {@code Flowable} with
-     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -7936,8 +7850,7 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
      *            current {@code Flowable}
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
-     * @return a {@code Flowable} that emits the results of concatenating the items emitted by the current {@code Flowable} with
-     *         the values in the {@code Iterable}s corresponding to those items, as generated by {@code collectionSelector}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -7971,7 +7884,7 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybeDelayError(Function)
      * @see #concatMapMaybe(Function, int)
@@ -8008,7 +7921,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      *                 ready to be mapped when a previous {@code MaybeSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code MaybeSource}s.
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapMaybe(Function)
@@ -8044,7 +7957,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybe(Function)
      * @see #concatMapMaybeDelayError(Function, boolean)
@@ -8083,7 +7996,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *                   {@code Flowable} is delayed until the current inner
      *                   {@code MaybeSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybe(Function, int)
      * @see #concatMapMaybeDelayError(Function, boolean, int)
@@ -8126,7 +8039,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      *                 ready to be mapped when a previous {@code MaybeSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code MaybeSource}s.
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapMaybe(Function, int)
@@ -8161,7 +8074,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingleDelayError(Function)
      * @see #concatMapSingle(Function, int)
@@ -8198,7 +8111,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      *                 ready to be mapped when a previous {@code SingleSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code SingleSource}s.
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapSingle(Function)
@@ -8234,7 +8147,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingle(Function)
      * @see #concatMapSingleDelayError(Function, boolean)
@@ -8273,7 +8186,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *                   {@code Flowable} is delayed until the current inner
      *                   {@code SingleSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingle(Function, int)
      * @see #concatMapSingleDelayError(Function, boolean, int)
@@ -8316,7 +8229,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *                 ready to be mapped when a previous {@code SingleSource} terminates.
      *                 The operator replenishes after half of the prefetch amount has been consumed
      *                 and turned into {@code SingleSource}s.
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see #concatMapSingle(Function, int)
@@ -8348,8 +8261,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      *
      * @param other
      *            a {@code Publisher} to be concatenated after the current
-     * @return a {@code Flowable} that emits items emitted by the two source {@code Publisher}s, one after the other,
-     *         without interleaving them
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -8460,8 +8372,7 @@ public final Flowable<T> concatWith(@NonNull CompletableSource other) {
      *
      * @param item
      *            the item to search for in the emissions from the current {@code Flowable}
-     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the current {@code Flowable},
-     *         or {@code false} if the current {@code Flowable} completes without emitting that item
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
@@ -8487,8 +8398,7 @@ public final Single<Boolean> contains(@NonNull Object item) {
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a single item: the number of items emitted by the current {@code Flowable} as a
-     *         64-bit {@code Long} item
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
      */
     @CheckReturnValue
@@ -8524,8 +8434,7 @@ public final Single<Long> count() {
      *            the debounce value type (ignored)
      * @param debounceIndicator
      *            function to retrieve a sequence that indicates the throttle duration for each item
-     * @return a {@code Flowable} that omits items emitted by the current {@code Flowable} that are followed by another item
-     *         within a computed debounce duration
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code debounceIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -8568,8 +8477,7 @@ public final <U> Flowable<T> debounce(@NonNull Function<? super T, ? extends Pub
      *            resulting {@code Flowable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return a {@code Flowable} that filters out items from the current {@code Flowable} that are too quickly followed by
-     *         newer items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -8614,8 +8522,7 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit) {
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return a {@code Flowable} that filters out items from the current {@code Flowable} that are too quickly followed by
-     *         newer items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -8648,8 +8555,7 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull
      *
      * @param defaultItem
      *            the item to emit if the current {@code Flowable} emits no items
-     * @return a {@code Flowable} that emits either the specified default item if the current {@code Flowable} emits no
-     *         items, or the items emitted by the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defaultifempty.html">ReactiveX operators documentation: DefaultIfEmpty</a>
      */
@@ -8685,8 +8591,7 @@ public final Flowable<T> defaultIfEmpty(@NonNull T defaultItem) {
      *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable}, which is
      *            then used to delay the emission of that item by the resulting {@code Flowable} until the {@code Publisher}
      *            returned from {@code itemDelay} emits an item
-     * @return a {@code Flowable} that delays the emissions of the current {@code Flowable} via another {@code Publisher} on a
-     *         per-item basis
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code itemDelayIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8715,7 +8620,7 @@ public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publis
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return the current {@code Flowable} shifted in time by the specified delay
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8746,7 +8651,7 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit) {
      * @param delayError
      *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
      *            if {@code false}, the upstream exception is signaled immediately
-     * @return the current {@code Flowable} shifted in time by the specified delay
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8776,7 +8681,7 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, boolean delay
      *            the time unit of {@code delay}
      * @param scheduler
      *            the {@code Scheduler} to use for delaying
-     * @return the current {@code Flowable} shifted in time by the specified delay
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8809,7 +8714,7 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      * @param delayError
      *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
      *            if {@code false}, the upstream exception is signaled immediately
-     * @return the current {@code Flowable} shifted in time by the specified delay
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8852,8 +8757,7 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable}, which is
      *            then used to delay the emission of that item by the resulting {@code Flowable} until the {@code Publisher}
      *            returned from {@code itemDelay} emits an item
-     * @return a {@code Flowable} that delays the subscription and emissions of the current {@code Flowable} via another
-     *         {@code Publisher} on a per-item basis
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
@@ -8879,8 +8783,7 @@ public final <U, V> Flowable<T> delay(@NonNull Publisher<U> subscriptionIndicato
      * @param <U> the value type of the other {@code Publisher}, irrelevant
      * @param subscriptionIndicator the other {@code Publisher} that should trigger the subscription
      *        to this {@code Publisher}.
-     * @return a {@code Flowable} that delays the subscription to this {@code Publisher}
-     *         until the other {@code Publisher} emits an element or completes normally.
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code subscriptionIndicator} is {@code null}
      * @since 2.0
      */
@@ -8908,7 +8811,7 @@ public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptio
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
-     * @return a {@code Flowable} that delays the subscription to the current {@code Flowable} by the given amount
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8938,8 +8841,7 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
      *            the time unit of {@code delay}
      * @param scheduler
      *            the {@code Scheduler} on which the waiting and subscription will happen
-     * @return a {@code Flowable} that delays the subscription to the current {@code Flowable} by a given
-     *         amount, waiting and subscribing on the given {@code Scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8996,8 +8898,7 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @
      * @param <R> the output value type
      * @param selector function that returns the upstream item and should return a {@code Notification} to signal
      * the corresponding {@code Subscriber} event to the downstream.
-     * @return a {@code Flowable} that emits the items and notifications embedded in the {@code Notification} objects
-     *         selected from the items emitted by the source {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Dematerialize</a>
      * @since 3.0.0
@@ -9038,8 +8939,7 @@ public final <R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T,
      *  <dd>{@code distinct} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits only those items emitted by the current {@code Flowable} that are distinct from
-     *         each other
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function)
      * @see #distinct(Function, Supplier)
@@ -9085,7 +8985,7 @@ public final Flowable<T> distinct() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return a {@code Flowable} that emits those items emitted by the current {@code Flowable} that have distinct keys
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function, Supplier)
@@ -9122,7 +9022,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      * @param collectionSupplier
      *            function called for each individual {@link Subscriber} to return a {@link Collection} subtype for holding the extracted
      *            keys and whose add() method's return indicates uniqueness.
-     * @return a {@code Flowable} that emits those items emitted by the current {@code Flowable} that have distinct keys
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code keySelector} or {@code collectionSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
@@ -9166,8 +9066,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      *  <dd>{@code distinctUntilChanged} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits those items from the current {@code Flowable} that are distinct from their
-     *         immediate predecessors
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinctUntilChanged(BiPredicate)
      */
@@ -9214,8 +9113,7 @@ public final Flowable<T> distinctUntilChanged() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return a {@code Flowable} that emits those items from the current {@code Flowable} whose keys are distinct from
-     *         those of their immediate predecessors
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
@@ -9253,8 +9151,7 @@ public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K
      *
      * @param comparer the function that receives the previous item and the current item and is
      *                   expected to return {@code true} if the two are equal, thus skipping the current value.
-     * @return a {@code Flowable} that emits those items from the current {@code Flowable} that are distinct from their
-     *         immediate predecessors
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code comparer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @since 2.0
@@ -9344,8 +9241,7 @@ public final Flowable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext) {
      *
      * @param onAfterTerminate
      *            an {@code Action} to be invoked when the current {@code Flowable} finishes
-     * @return a {@code Flowable} that emits the same items as the current {@code Flowable}, then invokes the
-     *         {@code Action}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doOnTerminate(Action)
@@ -9379,7 +9275,7 @@ public final Flowable<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
      *
      * @param onCancel
      *            the action that gets called when the current {@code Flowable}'s {@link Subscription} is canceled
-     * @return the current {@code Flowable} modified so as to call this {@code Action} when appropriate
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onCancel} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -9405,7 +9301,7 @@ public final Flowable<T> doOnCancel(@NonNull Action onCancel) {
      *
      * @param onComplete
      *            the action to invoke when the current {@code Flowable} calls {@code onComplete}
-     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -9431,7 +9327,7 @@ public final Flowable<T> doOnComplete(@NonNull Action onComplete) {
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onNext}, {@code onError}, {@code onComplete} or {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -9463,7 +9359,7 @@ private Flowable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Consu
      *
      * @param onNotification
      *            the action to invoke for each item emitted by the current {@code Flowable}
-     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onNotification} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -9502,7 +9398,7 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
      * @param subscriber
      *            the {@code Subscriber} to be notified about {@code onNext}, {@code onError} and {@code onComplete} events on its
      *            respective methods before the actual downstream {@code Subscriber} gets notified.
-     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code subscriber} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -9537,7 +9433,7 @@ public final Flowable<T> doOnEach(@NonNull Subscriber<@NonNull ? super T> subscr
      *
      * @param onError
      *            the action to invoke if the current {@code Flowable} calls {@code onError}
-     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onError} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -9569,7 +9465,7 @@ public final Flowable<T> doOnError(@NonNull Consumer<? super Throwable> onError)
      *              a {@link LongConsumer} called with the request amount sent via {@link Subscription#request(long)}
      * @param onCancel
      *              called when the downstream cancels the {@code Subscription} via {@link Subscription#cancel()}
-     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onSubscribe}, {@code onRequest} or {@code onCancel} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -9599,7 +9495,7 @@ public final Flowable<T> doOnLifecycle(@NonNull Consumer<? super Subscription> o
      *
      * @param onNext
      *            the action to invoke when the current {@code Flowable} calls {@code onNext}
-     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doAfterNext(Consumer)
@@ -9630,7 +9526,7 @@ public final Flowable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
      * @param onRequest
      *            the action that gets called when a {@link Subscriber} requests items from the current
      *            {@code Flowable}
-     * @return the current {@code Flowable} modified so as to call this {@link Action} when appropriate
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onRequest} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators
      *      documentation: Do</a>
@@ -9660,7 +9556,7 @@ public final Flowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
      *
      * @param onSubscribe
      *            the {@code Consumer} that gets called when a {@link Subscriber} subscribes to the current {@code Flowable}
-     * @return the current {@code Flowable} modified so as to call this {@code Consumer} when appropriate
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -9690,7 +9586,7 @@ public final Flowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> o
      *
      * @param onTerminate
      *            the action to invoke when the current {@code Flowable} calls {@code onComplete} or {@code onError}
-     * @return the current {@code Flowable} with the side-effecting behavior applied
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doAfterTerminate(Action)
@@ -9718,8 +9614,7 @@ public final Flowable<T> doOnTerminate(@NonNull Action onTerminate) {
      *
      * @param index
      *            the zero-based index of the item to retrieve
-     * @return a {@code Maybe} that emits a single item: the item at the specified position in the sequence of
-     *         those emitted by the current {@code Flowable}
+     * @return the new {@code Maybe} instance
      * @throws IndexOutOfBoundsException if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
      */
@@ -9750,8 +9645,7 @@ public final Maybe<T> elementAt(long index) {
      *            the zero-based index of the item to retrieve
      * @param defaultItem
      *            the default item
-     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the current
-     *         {@code Flowable}, or the default item if that index is outside the bounds of the source sequence
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @throws IndexOutOfBoundsException
      *             if {@code index} is negative
@@ -9783,8 +9677,7 @@ public final Single<T> elementAt(long index, @NonNull T defaultItem) {
      *
      * @param index
      *            the zero-based index of the item to retrieve
-     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the current
-     *         {@code Flowable}, or the default item if that index is outside the bounds of the source sequence
+     * @return the new {@code Single} instance
      * @throws IndexOutOfBoundsException
      *             if {@code index} is less than 0
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
@@ -9815,8 +9708,7 @@ public final Single<T> elementAtOrError(long index) {
      * @param predicate
      *            a function that evaluates each item emitted by the current {@code Flowable}, returning {@code true}
      *            if it passes the filter
-     * @return a {@code Flowable} that emits only those items emitted by the current {@code Flowable} that the filter
-     *         evaluates as {@code true}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
@@ -9866,8 +9758,7 @@ public final Maybe<T> firstElement() {
      *
      * @param defaultItem
      *            the default item to emit if the current {@code Flowable} doesn't emit anything
-     * @return a {@code Single} that emits only the very first item from the source, or a default item if the
-     *         current {@code Flowable} completes without emitting any items
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
@@ -9922,9 +9813,7 @@ public final Single<T> firstOrError() {
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
-     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
-     *         transformation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -9959,9 +9848,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
-     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
-     *         transformation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -9996,9 +9883,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      *            {@code Publisher}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
-     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
-     *         transformation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -10038,9 +9923,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
-     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
-     *         transformation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
@@ -10081,9 +9964,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @param bufferSize
      *            the number of elements to prefetch from each inner {@code Publisher}
-     * @return a {@code Flowable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Flowable} and merging the results of the {@code Publisher}s obtained from this
-     *         transformation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -10134,8 +10015,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * @param onCompleteSupplier
      *            a function that returns a {@code Publisher} to merge for an {@code onComplete} notification from the current
      *            {@code Flowable}
-     * @return a {@code Flowable} that emits the results of merging the {@code Publisher}s returned from applying the
-     *         specified functions to the emissions and notifications of the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onNextMapper}, {@code onErrorMapper} or {@code onCompleteSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -10181,8 +10061,7 @@ public final <R> Flowable<R> flatMap(
      *            {@code Flowable}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
-     * @return a {@code Flowable} that emits the results of merging the {@code Publisher}s returned from applying the
-     *         specified functions to the emissions and notifications of the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onNextMapper}, {@code onErrorMapper} or {@code onCompleteSupplier} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -10228,8 +10107,7 @@ public final <R> Flowable<R> flatMap(
      * @param combiner
      *            a function that combines one item emitted by each of the source and collection {@code Publisher}s and
      *            returns an item to be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Flowable} and the collection {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -10269,8 +10147,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
-     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Flowable} and the collection {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -10313,8 +10190,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Flowable} and all inner {@code Publisher}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
-     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Flowable} and the collection {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -10361,8 +10237,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @param bufferSize
      *            the number of elements to prefetch from the inner {@code Publisher}s.
-     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Flowable} and the collection {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -10408,8 +10283,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      *            returns an item to be emitted by the resulting {@code Flowable}
      * @param maxConcurrency
      *         the maximum number of {@code Publisher}s that may be subscribed to concurrently
-     * @return a {@code Flowable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Flowable} and the collection {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -10566,8 +10440,7 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
      * @param combiner
      *            a function that returns an item based on the item emitted by the current {@code Flowable} and the
      *            {@code Iterable} returned for that item by the {@code collectionSelector}
-     * @return a {@code Flowable} that emits the items returned by {@code resultSelector} for each item in the current
-     *         {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -10903,9 +10776,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      *            a function that extracts the key for each item
      * @param <K>
      *            the key type
-     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
-     *         key value
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      * @see #groupBy(Function, boolean)
@@ -10966,9 +10837,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      * @param delayError
      *            if {@code true}, the exception from the current {@code Flowable} is delayed in each group until that specific group emitted
      *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
-     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
-     *         key value
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
@@ -11028,9 +10897,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      *            the key type
      * @param <V>
      *            the element type
-     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
-     *         key value
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      * @see #groupBy(Function, Function, boolean)
@@ -11097,9 +10964,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * @param delayError
      *            if {@code true}, the exception from the current {@code Flowable} is delayed in each group until that specific group emitted
      *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
-     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
-     *         key value
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      * @see #groupBy(Function, Function, boolean, int)
@@ -11166,9 +11031,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      *            the key type
      * @param <V>
      *            the element type
-     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
-     *         key value
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
@@ -11287,9 +11150,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      *            the key type
      * @param <V>
      *            the element type
-     * @return a {@code Flowable} that emits {@code GroupedFlowable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Flowable} that share that
-     *         key value
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code evictingMapFactory} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
@@ -11342,8 +11203,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * @param resultSelector
      *            a function that takes an item emitted by each {@code Publisher} and returns the value to be emitted
      *            by the resulting {@code Flowable}
-     * @return a {@code Flowable} that emits items based on combining those items emitted by the current {@code Flowable}s
-     *         whose durations overlap
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other}, {@code leftEnd}, {@code rightEnd} or {@code resultSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
@@ -11400,8 +11260,7 @@ public final Flowable<T> hide() {
      *  <dd>{@code ignoreElements} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Completable} that only calls {@code onComplete} or {@code onError}, based on which one is
-     *         called by the current {@code Flowable}
+     * @return the new {@link Completable} instance
      * @see <a href="http://reactivex.io/documentation/operators/ignoreelements.html">ReactiveX operators documentation: IgnoreElements</a>
      */
     @CheckReturnValue
@@ -11427,7 +11286,7 @@ public final Completable ignoreElements() {
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a {@link Boolean}
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -11468,8 +11327,7 @@ public final Single<Boolean> isEmpty() {
      * @param resultSelector
      *            a function that computes an item to be emitted by the resulting {@code Flowable} for any two
      *            overlapping items emitted by the two {@code Publisher}s
-     * @return a {@code Flowable} that emits items correlating to items emitted by the current {@code Flowable}s that have
-     *         overlapping durations
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other}, {@code leftEnd}, {@code rightEnd} or {@code resultSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
@@ -11503,7 +11361,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
      *  <dd>{@code lastElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a new {@code Maybe} instance
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
     @CheckReturnValue
@@ -11738,8 +11596,7 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
      * @param <R> the output type
      * @param mapper
      *            a function to apply to each item emitted by the current {@code Flowable}
-     * @return a {@code Flowable} that emits the items from the current {@code Flowable}, transformed by the specified
-     *         function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      * @see #mapOptional(Function)
@@ -11766,8 +11623,7 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
      *  <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits items that are the result of materializing the items and notifications
-     *         of the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Materialize</a>
      * @see #dematerialize(Function)
      */
@@ -11796,7 +11652,7 @@ public final Flowable<Notification<T>> materialize() {
      *
      * @param other
      *            a {@code Publisher} to be merged
-     * @return a {@code Flowable} that emits all of the items emitted by the current {@code Flowable}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -11929,8 +11785,7 @@ public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
      *
      * @param scheduler
      *            the {@code Scheduler} to notify {@link Subscriber}s on
-     * @return the current {@code Flowable} modified so that its {@code Subscriber}s are notified on the specified
-     *         {@code Scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -11982,8 +11837,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler) {
      *            indicates if the {@code onError} notification may not cut ahead of {@code onNext} notification on the other side of the
      *            scheduling boundary. If {@code true}, a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
-     * @return the current {@code Flowable} modified so that its {@code Subscriber}s are notified on the specified
-     *         {@code Scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -12036,8 +11890,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      *            scheduling boundary. If {@code true}, a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
      * @param bufferSize the size of the buffer.
-     * @return the current {@code Flowable} modified so that its {@code Subscriber}s are notified on the specified
-     *         {@code Scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
@@ -12072,7 +11925,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      * @param <U> the output type
      * @param clazz
      *            the class type to filter the items emitted by the current {@code Flowable}
-     * @return a {@code Flowable} that emits items from the current {@code Flowable} of type {@code clazz}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
@@ -12101,7 +11954,7 @@ public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
      *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the current {@code Flowable} modified to buffer items to the extent system resources allow
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * #see {@link #onBackpressureBuffer(boolean)}
      */
@@ -12129,7 +11982,7 @@ public final Flowable<T> onBackpressureBuffer() {
      *                if {@code true}, an exception from the current {@code Flowable} is delayed until all buffered elements have been
      *                consumed by the downstream; if {@code false}, an exception is immediately signaled to the downstream, skipping
      *                any buffered element
-     * @return the current {@code Flowable} modified to buffer items to the extent system resources allow
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      */
     @CheckReturnValue
@@ -12159,7 +12012,7 @@ public final Flowable<T> onBackpressureBuffer(boolean delayError) {
      * </dl>
      *
      * @param capacity number of slots available in the buffer.
-     * @return the current {@code Flowable} modified to buffer items up to the given capacity.
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
@@ -12193,7 +12046,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity) {
      *                if {@code true}, an exception from the current {@code Flowable} is delayed until all buffered elements have been
      *                consumed by the downstream; if {@code false}, an exception is immediately signaled to the downstream, skipping
      *                any buffered element
-     * @return the current {@code Flowable} modified to buffer items up to the given capacity.
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
@@ -12229,7 +12082,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
      *                any buffered element
      * @param unbounded
      *                if {@code true}, the capacity value is interpreted as the internal "island" size of the unbounded buffer
-     * @return the current {@code Flowable} modified to buffer items up to the given capacity.
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
@@ -12267,7 +12120,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
      * @param unbounded
      *                if {@code true}, the capacity value is interpreted as the internal "island" size of the unbounded buffer
      * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots.
-     * @return the current {@code Flowable} modified to buffer items up to the given capacity
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onOverflow} is {@code null}
      * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
@@ -12301,7 +12154,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
      *
      * @param capacity number of slots available in the buffer.
      * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots.  Null is allowed.
-     * @return the current {@code Flowable} modified to buffer items up to the given capacity
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onOverflow} is {@code null}
      * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
@@ -12343,7 +12196,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
      * @param capacity number of slots available in the buffer.
      * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots, {@code null} is allowed.
      * @param overflowStrategy how should the resulting {@code Flowable} react to buffer overflows, {@code null} is not allowed.
-     * @return the source {@code Flowable} modified to buffer items up to the given capacity
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onOverflow} or {@code overflowStrategy} is {@code null}
      * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
@@ -12375,7 +12228,7 @@ public final Flowable<T> onBackpressureBuffer(long capacity, @Nullable Action on
      *  <dd>{@code onBackpressureDrop} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the current {@code Flowable} modified to drop {@code onNext} notifications on overflow
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      */
     @CheckReturnValue
@@ -12404,7 +12257,7 @@ public final Flowable<T> onBackpressureDrop() {
      * </dl>
      *
      * @param onDrop the action to invoke for each item dropped, should be fast and should never block.
-     * @return the current {@code Flowable} modified to drop {@code onNext} notifications on overflow
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onDrop} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
      * @since 1.1.0
@@ -12441,7 +12294,7 @@ public final Flowable<T> onBackpressureDrop(@NonNull Consumer<? super T> onDrop)
      *  <dd>{@code onBackpressureLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the current {@code Flowable} modified so that it emits the most recently-received item upon request
+     * @return the new {@code Flowable} instance
      * @since 1.1.0
      */
     @CheckReturnValue
@@ -12484,7 +12337,7 @@ public final Flowable<T> onBackpressureLatest() {
      * @param resumeFunction
      *            a function that returns a {@code Publisher} that will take over if the current {@code Flowable} encounters
      *            an error
-     * @return the original {@code Publisher}, with appropriately modified behavior
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code resumeFunction} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
@@ -12529,7 +12382,7 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
      * @param next
      *            the next {@code Publisher} source that will take over if the current {@code Flowable} encounters
      *            an error
-     * @return the original {@code Publisher}, with appropriately modified behavior
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code next} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
@@ -12570,7 +12423,7 @@ public final Flowable<T> onErrorResumeWith(@NonNull Publisher<@NonNull ? extends
      * @param valueSupplier
      *            a function that returns a single value that will be emitted along with a regular {@code onComplete} in case
      *            the current {@code Flowable} signals an {@code onError} event
-     * @return the original {@code Publisher} with appropriately modified behavior
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code valueSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
@@ -12610,7 +12463,7 @@ public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? ex
      * @param item
      *            the value that is emitted along with a regular {@code onComplete} in case the current
      *            {@code Flowable} signals an exception
-     * @return the original {@code Publisher} with appropriately modified behavior
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
@@ -12633,7 +12486,7 @@ public final Flowable<T> onErrorReturnItem(@NonNull T item) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a {@code Flowable} which {@code null}s out references to the upstream producer and downstream {@code Subscriber} if
+     * @return the new {@code Flowable} instance
      * the sequence is terminated or downstream cancels
      * @since 2.0
      */
@@ -12756,8 +12609,7 @@ public final ParallelFlowable<T> parallel(int parallelism, int prefetch) {
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code ConnectableFlowable} that upon connection causes the current {@code Flowable} to emit items
-     *         to its {@code Subscriber}s
+     * @return the new {@code ConnectableFlowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -12790,7 +12642,7 @@ public final ConnectableFlowable<T> publish() {
      *            a function that can use the multicasted source sequence as many times as needed, without
      *            causing multiple subscriptions to the source sequence. {@link Subscriber}s to the given source will
      *            receive all notifications of the source from the time of the subscription forward.
-     * @return a {@code Flowable} that emits the results of invoking the selector on the items emitted by a {@code ConnectableFlowable} that shares a single subscription to the underlying sequence
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
@@ -12826,7 +12678,7 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      *            receive all notifications of the source from the time of the subscription forward.
      * @param prefetch
      *            the number of elements to prefetch from the current {@code Flowable}
-     * @return a {@code Flowable} that emits the results of invoking the selector on the items emitted by a {@code ConnectableFlowable} that shares a single subscription to the underlying sequence
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
@@ -12858,8 +12710,7 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      *
      * @param bufferSize
      *            the number of elements to prefetch from the current {@code Flowable}
-     * @return a {@code ConnectableFlowable} that upon connection causes the current {@code Flowable} to emit items
-     *         to its {@code Subscriber}s
+     * @return the new {@code ConnectableFlowable} instance
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
@@ -12887,7 +12738,7 @@ public final ConnectableFlowable<T> publish(int bufferSize) {
      * </dl>
      *
      * @param n the initial request amount, further request will happen after 75% of this value
-     * @return the {@code Flowable} that rebatches request amounts from downstream
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code n} is non-positive
      * @since 2.0
      */
@@ -12925,8 +12776,7 @@ public final Flowable<T> rebatchRequests(int n) {
      * @param reducer
      *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, whose
      *            result will be used in the next accumulator call
-     * @return a {@code Maybe} that emits a single item that is the result of accumulating the items emitted by
-     *         the source {@code Flowable}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
@@ -12987,8 +12837,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * @param reducer
      *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, the
      *            result of which will be used in the next accumulator call
-     * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the current {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code seed} or {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
@@ -13034,8 +12883,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * @param reducer
      *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, the
      *            result of which will be used in the next accumulator call
-     * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the current {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code seedSupplier} or {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
@@ -13062,7 +12910,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} repeatedly and in sequence
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -13089,8 +12937,7 @@ public final Flowable<T> repeat() {
      * @param times
      *            the number of times the current {@code Flowable} items are repeated, a count of 0 will yield an empty
      *            sequence
-     * @return a {@code Flowable} that repeats the sequence of items emitted by the current {@code Flowable} at most
-     *         {@code count} times
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException
      *             if {@code times} is less than zero
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
@@ -13158,7 +13005,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
      *
      * @param handler
      *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the repeat.
-     * @return the current {@code Flowable} modified with repeat logic
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
@@ -13187,8 +13034,7 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code ConnectableFlowable} that upon connection causes the current {@code Flowable} to emit its
-     *         items to its {@code Subscriber}s
+     * @return the new {@code ConnectableFlowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -13218,8 +13064,7 @@ public final ConnectableFlowable<T> replay() {
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
      *            causing multiple subscriptions to the current {@code Flowable}
-     * @return a {@code Flowable} that emits items that are the results of invoking the selector on a
-     *         {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13257,9 +13102,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *            causing multiple subscriptions to the current {@code Flowable}
      * @param bufferSize
      *            the buffer size that limits the number of items the operator can replay
-     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}
-     *         replaying no more than {@code bufferSize} items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -13303,9 +13146,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}
-     *         replaying no more than {@code bufferSize} items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -13349,10 +13190,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}, and
-     *         replays no more than {@code bufferSize} items that were emitted within the window defined by
-     *         {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector} or {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -13396,10 +13234,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that is the time source for the window
-     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}, and
-     *         replays no more than {@code bufferSize} items that were emitted within the window defined by
-     *         {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code bufferSize} is non-positive
@@ -13453,10 +13288,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable}, and
-     *         replays no more than {@code bufferSize} items that were emitted within the window defined by
-     *         {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code bufferSize} is less than zero
@@ -13499,9 +13331,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
-     *         replaying all items that were emitted within the window defined by {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13539,9 +13369,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is the time source for the window
-     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
-     *         replaying all items that were emitted within the window defined by {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, long, TimeUnit, Scheduler, boolean)
@@ -13586,9 +13414,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code Flowable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
-     *         replaying all items that were emitted within the window defined by {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13626,8 +13452,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      *
      * @param bufferSize
      *            the buffer size that limits the number of items that can be replayed
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
-     *         replays at most {@code bufferSize} items emitted by the current {@code Flowable}
+     * @return the new {@code ConnectableFlowable} instance
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(int, boolean)
@@ -13665,8 +13490,7 @@ public final ConnectableFlowable<T> replay(int bufferSize) {
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
-     *         replays at most {@code bufferSize} items emitted by the current {@code Flowable}
+     * @return the new {@code ConnectableFlowable} instance
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @since 3.0.0
@@ -13707,9 +13531,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, boolean eagerTruncate
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
-     *         replays at most {@code bufferSize} items that were emitted during the window defined by
-     *         {@code time}
+     * @return the new {@code ConnectableFlowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -13752,9 +13574,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is used as a time source for the window
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
-     *         replays at most {@code bufferSize} items that were emitted during the window defined by
-     *         {@code time}
+     * @return the new {@code ConnectableFlowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -13802,9 +13622,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
-     *         replays at most {@code bufferSize} items that were emitted during the window defined by
-     *         {@code time}
+     * @return the new {@code ConnectableFlowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -13844,8 +13662,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
-     *         replays the items that were emitted during the window defined by {@code time}
+     * @return the new {@code ConnectableFlowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13882,8 +13699,7 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit) {
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that is the time source for the window
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
-     *         replays the items that were emitted during the window defined by {@code time}
+     * @return the new {@code ConnectableFlowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(long, TimeUnit, Scheduler, boolean)
@@ -13926,8 +13742,7 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code ConnectableFlowable} that shares a single subscription to the current {@code Flowable} and
-     *         replays the items that were emitted during the window defined by {@code time}
+     * @return the new {@code ConnectableFlowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -13962,7 +13777,7 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the current {@code Flowable} modified with retry logic
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -13989,7 +13804,7 @@ public final Flowable<T> retry() {
      * @param predicate
      *            the predicate that determines if a resubscription may happen in case of a specific exception
      *            and retry count
-     * @return the current {@code Flowable} modified with retry logic
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see #retry()
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
@@ -14028,7 +13843,7 @@ public final Flowable<T> retry(@NonNull BiPredicate<@NonNull ? super Integer, @N
      *
      * @param times
      *            the number of times to resubscribe if the current {@code Flowable} fails
-     * @return the current {@code Flowable} modified with retry logic
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code times} is negative
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
@@ -14187,7 +14002,7 @@ public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
      * @param handler
      *            receives a {@code Publisher} of notifications with which a user can complete or error, aborting the
      *            retry
-     * @return the current {@code Flowable} modified with retry logic
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
@@ -14243,8 +14058,7 @@ public final void safeSubscribe(@NonNull Subscriber<@NonNull ? super T> subscrib
      *            the sampling rate
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} at
-     *         the specified time interval
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -14279,8 +14093,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit) {
      *            if {@code true}, and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} at
-     *         the specified time interval
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -14313,8 +14126,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, boolean emi
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param scheduler
      *            the {@code Scheduler} to use when sampling
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} at
-     *         the specified time interval
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -14354,8 +14166,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} at
-     *         the specified time interval
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -14389,8 +14200,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      * @param <U> the element type of the sampler {@code Publisher}
      * @param sampler
      *            the {@code Publisher} to use for sampling the current {@code Flowable}
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} whenever
-     *         the {@code sampler} {@code Publisher} emits an item or completes
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sampler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -14427,8 +14237,7 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler) {
      *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
-     * @return a {@code Flowable} that emits the results of sampling the items emitted by the current {@code Flowable} whenever
-     *         the {@code sampler} {@code Publisher} emits an item or completes
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sampler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -14464,7 +14273,7 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitL
      *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, whose
      *            result will be emitted to {@link Subscriber}s via {@link Subscriber#onNext onNext} and used in the
      *            next accumulator call
-     * @return a {@code Flowable} that emits the results of each call to the accumulator function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
@@ -14518,8 +14327,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, whose
      *            result will be emitted to {@link Subscriber}s via {@link Subscriber#onNext onNext} and used in the
      *            next accumulator call
-     * @return a {@code Flowable} that emits {@code initialValue} followed by the results of each call to the
-     *         accumulator function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code initialValue} or {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
@@ -14559,8 +14367,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      *            an accumulator function to be invoked on each item emitted by the current {@code Flowable}, whose
      *            result will be emitted to {@code Subscriber}s via {@link Subscriber#onNext onNext} and used in the
      *            next accumulator call
-     * @return a {@code Flowable} that emits {@code initialValue} followed by the results of each call to the
-     *         accumulator function
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code seedSupplier} or {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
@@ -14593,8 +14400,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      *  <dd>{@code serialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that is guaranteed to be well-behaved and to make only serialized calls to
-     *         its {@code Subscriber}s
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/serialize.html">ReactiveX operators documentation: Serialize</a>
      */
     @CheckReturnValue
@@ -14622,8 +14428,7 @@ public final Flowable<T> serialize() {
      *  <dd>{@code share} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that upon connection causes the current {@code Flowable} to emit items
-     *         to its {@code Subscriber}s
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/refcount.html">ReactiveX operators documentation: RefCount</a>
      */
     @CheckReturnValue
@@ -14648,7 +14453,7 @@ public final Flowable<T> share() {
      *  <dd>{@code singleElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Maybe} that emits the single item emitted by the current {@code Flowable}
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -14675,8 +14480,7 @@ public final Maybe<T> singleElement() {
      *
      * @param defaultItem
      *            a default value to emit if the current {@code Flowable} emits no item
-     * @return a {@code Single} that emits the single item emitted by the current {@code Flowable}, or a default item if
-     *         the current {@code Flowable} is empty
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
@@ -14730,8 +14534,7 @@ public final Single<T> singleOrError() {
      *
      * @param count
      *            the number of items to skip
-     * @return a {@code Flowable} that is identical to the current {@code Flowable} except that it does not emit the first
-     *         {@code count} items that the current {@code Flowable} emits
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
@@ -14767,8 +14570,7 @@ public final Flowable<T> skip(long count) {
      *            the length of the time window to skip
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that skips values emitted by the current {@code Flowable} before the time window defined
-     *         by {@code time} elapses and the emits the remainder
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
@@ -14799,8 +14601,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit) {
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} on which the timed wait happens
-     * @return a {@code Flowable} that skips values emitted by the current {@code Flowable} before the time window defined
-     *         by {@code time} and {@code scheduler} elapses, and then emits the remainder
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
@@ -14831,8 +14632,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Schedu
      *
      * @param count
      *            number of items to drop from the end of the source sequence
-     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} except for the dropped ones
-     *         at the end
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
@@ -14871,8 +14671,7 @@ public final Flowable<T> skipLast(int count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
-     *         source completes defined by {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -14907,8 +14706,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit) {
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
-     *         source completes defined by {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -14941,8 +14739,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, boolean del
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler used as the time source
-     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
-     *         source completes defined by {@code time} and {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -14978,8 +14775,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
-     *         source completes defined by {@code time} and {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -15017,8 +14813,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be skipped
-     * @return a {@code Flowable} that drops those items emitted by the current {@code Flowable} in a time window before the
-     *         source completes defined by {@code time} and {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
@@ -15053,8 +14848,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * @param other
      *            the second {@code Publisher} that has to emit an item before the current {@code Flowable}'s elements begin
      *            to be mirrored by the resulting {@code Flowable}
-     * @return a {@code Flowable} that skips items from the current {@code Flowable} until the second {@code Publisher} emits an
-     *         item, then emits the remaining items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skipuntil.html">ReactiveX operators documentation: SkipUntil</a>
      */
@@ -15082,8 +14876,7 @@ public final <U> Flowable<T> skipUntil(@NonNull Publisher<U> other) {
      *
      * @param predicate
      *            a function to test each item emitted from the current {@code Flowable}
-     * @return a {@code Flowable} that begins emitting items emitted by the current {@code Flowable} when the specified
-     *         predicate becomes {@code false}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skipwhile.html">ReactiveX operators documentation: SkipWhile</a>
      */
@@ -15114,7 +14907,7 @@ public final Flowable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
      *  <dd>{@code sorted} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} in sorted order
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
@@ -15143,7 +14936,7 @@ public final Flowable<T> sorted() {
      *            a function that compares two items emitted by the current {@code Flowable} and returns an {@link Integer}
      *            that indicates their sort order
      * @throws NullPointerException if {@code comparator} is {@code null}
-     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} in sorted order
+     * @return the new {@code Flowable} instance
      */
     @CheckReturnValue
     @NonNull
@@ -15170,8 +14963,7 @@ public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> comparat
      *
      * @param items
      *            an {@code Iterable} that contains the items you want the resulting {@code Flowable} to emit first
-     * @return a {@code Flowable} that emits the items in the specified {@code Iterable} and then emits the items
-     *         emitted by the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithArray(Object...)
@@ -15202,8 +14994,7 @@ public final Flowable<T> startWithIterable(@NonNull Iterable<@NonNull ? extends
      *
      * @param other
      *            a {@code Publisher} that contains the items you want the modified {@code Publisher} to emit first
-     * @return a {@code Flowable} that emits the items in the specified {@code Publisher} and then emits the items
-     *         emitted by the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      */
@@ -15232,8 +15023,7 @@ public final Flowable<T> startWith(@NonNull Publisher<@NonNull ? extends T> othe
      *
      * @param item
      *            the item to emit first
-     * @return a {@code Flowable} that emits the specified item before it begins to emit items emitted by the current
-     *         {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithArray(Object...)
@@ -15265,8 +15055,7 @@ public final Flowable<T> startWithItem(@NonNull T item) {
      *
      * @param items
      *            the array of values to emit first
-     * @return a {@code Flowable} that emits the specified items before it begins to emit items emitted by the current
-     *         {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithItem(Object)
@@ -15299,8 +15088,7 @@ public final Flowable<T> startWithArray(@NonNull T... items) {
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the current {@code Flowable} has finished sending them
+     * @return the new {@link Disposable} instance that allows cancelling the flow
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -15326,8 +15114,7 @@ public final Disposable subscribe() {
      *
      * @param onNext
      *             the {@code Consumer<T>} you have designed to accept emissions from the current {@code Flowable}
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the current {@code Flowable} has finished sending them
+     * @return the new {@link Disposable} instance that allows cancelling the flow
      * @throws NullPointerException
      *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
@@ -15356,8 +15143,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
      * @param onError
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
      *             current {@code Flowable}
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the current {@code Flowable} has finished sending them
+     * @return the new {@link Disposable} instance that allows cancelling the flow
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onNext} or {@code onError} is {@code null}
@@ -15389,8 +15175,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
      * @param onComplete
      *             the {@link Action} you have designed to accept a completion notification from the
      *             the current {@code Flowable}
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the current {@code Flowable} has finished sending them
+     * @return the new {@link Disposable} instance that allows cancelling the flow
      * @throws NullPointerException
      *             if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
@@ -15550,8 +15335,7 @@ public final void subscribe(@NonNull FlowableSubscriber<@NonNull ? super T> subs
      *
      * @param scheduler
      *            the {@code Scheduler} to perform subscription actions on
-     * @return the current {@code Flowable} modified so that its subscriptions happen on the
-     *         specified {@code Scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -15589,8 +15373,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
      * @param requestOn if {@code true}, requests are rerouted to the given {@code Scheduler} as well (strong pipelining)
      *                  if {@code false}, requests coming from any thread are simply forwarded to
      *                  the upstream on the same thread (weak pipelining)
-     * @return the current {@code Flowable} modified so that its subscriptions happen on the
-     *         specified {@code Scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -15624,8 +15407,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
      *
      * @param other
      *              the alternate {@code Publisher} to subscribe to if the source does not emit any items
-     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} or the items of an
-     *          alternate {@code Publisher} if the current {@code Flowable} is empty.
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @since 1.1.0
      */
@@ -15661,7 +15443,7 @@ public final Flowable<T> switchIfEmpty(@NonNull Publisher<@NonNull ? extends T>
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapDelayError(Function)
@@ -15699,7 +15481,7 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
      *            {@code Publisher}
      * @param bufferSize
      *            the number of elements to prefetch from the current active inner {@code Publisher}
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -15832,7 +15614,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Flowable}, returns a
      *            {@code Publisher}
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMap(Function)
@@ -15872,7 +15654,7 @@ public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ?
      *            {@code Publisher}
      * @param bufferSize
      *            the number of elements to prefetch from the current active inner {@code Publisher}
-     * @return a {@code Flowable} that emits the items emitted by the {@code Publisher} returned from applying {@code func} to the most recently emitted item emitted by the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -16085,8 +15867,7 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
      *            the maximum number of items and the total request amount, non-negative.
      *            Zero will immediately cancel the upstream on subscription and complete
      *            the downstream.
-     * @return a {@code Flowable} that emits only the first {@code count} items emitted by the current {@code Flowable}, or
-     *         all of the items from the current {@code Flowable} if it emits fewer than {@code count} items
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
@@ -16121,7 +15902,7 @@ public final Flowable<T> take(long count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that emits those items emitted by the current {@code Flowable} before the time runs out
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
@@ -16155,8 +15936,7 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit) {
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} used for time source
-     * @return a {@code Flowable} that emits those items emitted by the current {@code Flowable} before the time runs out,
-     *         according to the specified {@code Scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
@@ -16184,7 +15964,7 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit, @NonNull Schedu
      * @param count
      *            the maximum number of items to emit from the end of the sequence of items emitted by the current
      *            {@code Flowable}
-     * @return a {@code Flowable} that emits at most the last {@code count} items emitted by the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException
      *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -16226,8 +16006,7 @@ public final Flowable<T> takeLast(int count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that emits at most {@code count} items from the current {@code Flowable} that were emitted
-     *         in a specified window of time before the current {@code Flowable} completed
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -16262,9 +16041,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit)
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that provides the timestamps for the observed items
-     * @return a {@code Flowable} that emits at most {@code count} items from the current {@code Flowable} that were emitted
-     *         in a specified window of time before the current {@code Flowable} completed, where the timing information is
-     *         provided by the given {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero
@@ -16305,9 +16082,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return a {@code Flowable} that emits at most {@code count} items from the current {@code Flowable} that were emitted
-     *         in a specified window of time before the current {@code Flowable} completed, where the timing information is
-     *         provided by the given {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code count} is negative or {@code bufferSize} is non-positive
@@ -16346,8 +16121,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
-     *         time before the current {@code Flowable} completed specified by {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -16381,8 +16155,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit) {
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
-     *         time before the current {@code Flowable} completed specified by {@code time}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -16416,9 +16189,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, boolean del
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that provides the timestamps for the observed items
-     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
-     *         time before the current {@code Flowable} completed specified by {@code time}, where the timing information is
-     *         provided by {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -16455,9 +16226,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Flowable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
-     *         time before the current {@code Flowable} completed specified by {@code time}, where the timing information is
-     *         provided by {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -16496,9 +16265,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in the window of
-     *         time before the current {@code Flowable} completed specified by {@code time}, where the timing information is
-     *         provided by {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -16530,8 +16297,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      *
      * @param stopPredicate
      *            a function that evaluates an item emitted by the current {@code Flowable} and returns a {@link Boolean}
-     * @return a {@code Flowable} that first emits items emitted by the current {@code Flowable}, checks the specified
-     *         condition after each item, and then completes when the condition is satisfied.
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code stopPredicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      * @see Flowable#takeWhile(Predicate)
@@ -16564,7 +16330,7 @@ public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate)
      *            from the current {@code Flowable}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return a {@code Flowable} that emits the items emitted by the current {@code Flowable} until such time as {@code other} emits its first item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
@@ -16592,8 +16358,7 @@ public final <U> Flowable<T> takeUntil(@NonNull Publisher<U> other) {
      *
      * @param predicate
      *            a function that evaluates an item emitted by the current {@code Flowable} and returns a {@link Boolean}
-     * @return a {@code Flowable} that emits the items from the current {@code Flowable} so long as each item satisfies the
-     *         condition defined by {@code predicate}, then completes
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takewhile.html">ReactiveX operators documentation: TakeWhile</a>
      * @see Flowable#takeUntil(Predicate)
@@ -16626,7 +16391,7 @@ public final Flowable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
      *            time to wait before emitting another item after emitting the last item
      * @param unit
      *            the unit of time of {@code windowDuration}
-     * @return a {@code Flowable} that performs the throttle operation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -16661,7 +16426,7 @@ public final Flowable<T> throttleFirst(long windowDuration, @NonNull TimeUnit un
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
-     * @return a {@code Flowable} that performs the throttle operation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -16696,7 +16461,7 @@ public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit
      *            emitted
      * @param unit
      *            the unit of time of {@code intervalDuration}
-     * @return a {@code Flowable} that performs the throttle operation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -16733,7 +16498,7 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
-     * @return a {@code Flowable} that performs the throttle operation
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -16929,8 +16694,7 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
      *            resulting {@code Flowable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return a {@code Flowable} that filters out items from the current {@code Flowable} that are too quickly followed by
-     *         newer items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -16969,8 +16733,7 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return a {@code Flowable} that filters out items from the current {@code Flowable} that are too quickly followed by
-     *         newer items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
@@ -16998,7 +16761,7 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
      *  from the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits time interval information items
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -17025,7 +16788,7 @@ public final Flowable<Timed<T>> timeInterval() {
      *
      * @param scheduler
      *            the {@code Scheduler} used to compute time intervals
-     * @return a {@code Flowable} that emits time interval information items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
@@ -17052,7 +16815,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param unit the time unit for the current time
-     * @return a {@code Flowable} that emits time interval information items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
@@ -17081,7 +16844,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
      * @param unit the time unit for the current time
      * @param scheduler
      *            the {@code Scheduler} used to compute time intervals
-     * @return a {@code Flowable} that emits time interval information items
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
@@ -17119,9 +16882,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Sc
      * @param itemTimeoutIndicator
      *            a function that returns a {@code Publisher} for each item emitted by the current
      *            {@code Flowable} and that determines the timeout window for the subsequent item
-     * @return a {@code Flowable} that mirrors the current {@code Flowable}, but notifies {@code Subscriber}s of a
-     *         {@code TimeoutException} if an item emitted by the current {@code Flowable} takes longer to arrive than
-     *         the time window defined by the selector for the previously emitted item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code itemTimeoutIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -17159,9 +16920,7 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      *            determines the timeout window for the subsequent item
      * @param other
      *            the fallback {@code Publisher} to switch to if the current {@code Flowable} times out
-     * @return a {@code Flowable} that mirrors the current {@code Flowable}, but switches to mirroring a fallback {@code Publisher}
-     *         if an item emitted by the current {@code Flowable} takes longer to arrive than the time window defined
-     *         by the selector for the previously emitted item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code itemTimeoutIndicator} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -17192,8 +16951,7 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      *            maximum duration between emitted items before a timeout occurs
      * @param unit
      *            the unit of time that applies to the {@code timeout} argument.
-     * @return the current {@code Flowable} modified to notify {@code Subscriber}s of a {@code TimeoutException} in case of a
-     *         timeout
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -17227,7 +16985,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit) {
      *            the unit of time that applies to the {@code timeout} argument
      * @param other
      *            the fallback {@code Publisher} to use in case of a timeout
-     * @return the current {@code Flowable} modified to switch to the fallback {@code Publisher} in case of a timeout
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -17265,8 +17023,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      *            the {@code Scheduler} to run the timeout timers on
      * @param other
      *            the {@code Publisher} to use as the fallback in case of a timeout
-     * @return the current {@code Flowable} modified so that it will switch to the fallback {@code Publisher} in case of a
-     *         timeout
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -17300,8 +17057,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
      *            the {@code Scheduler} to run the timeout timers on
-     * @return the current {@code Flowable} modified to notify {@code Subscriber}s of a {@code TimeoutException} in case of a
-     *         timeout
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -17339,9 +17095,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
-     * @return a {@code Flowable} that mirrors the current {@code Flowable}, but notifies {@code Subscriber}s of a
-     *         {@code TimeoutException} if either the first item or any subsequent item doesn't arrive within
-     *         the time windows specified by the timeout selectors
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code firstTimeoutIndicator} or {@code itemTimeoutIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -17384,9 +17138,7 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
      *            continue the sequence
      * @param other
      *            the fallback {@code Publisher} to switch to if the current {@code Flowable} times out
-     * @return a {@code Flowable} that mirrors the current {@code Flowable}, but switches to the {@code other} {@code Publisher} if
-     *         either the first item emitted by the current {@code Flowable} or any subsequent item doesn't arrive
-     *         within time windows defined by the timeout selectors
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code firstTimeoutIndicator}, {@code itemTimeoutIndicator} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -17432,7 +17184,7 @@ private <U, V> Flowable<T> timeout0(
      *  from the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits timestamped items from the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -17459,8 +17211,7 @@ public final Flowable<Timed<T>> timestamp() {
      *
      * @param scheduler
      *            the {@code Scheduler} to use as a time source
-     * @return a {@code Flowable} that emits timestamped items from the current {@code Flowable} with timestamps provided by
-     *         the {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
@@ -17487,7 +17238,7 @@ public final Flowable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param unit the time unit for the current time
-     * @return a {@code Flowable} that emits timestamped items from the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
@@ -17516,8 +17267,7 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
      * @param unit the time unit for the current time
      * @param scheduler
      *            the {@code Scheduler} to use as a time source
-     * @return a {@code Flowable} that emits timestamped items from the current {@code Flowable} with timestamps provided by
-     *         the {@code scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
@@ -17578,8 +17328,7 @@ public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
      *  <dd>{@code toList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a single item: a {@link List} containing all of the items emitted by the current
-     *         {@code Flowable}
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -17615,8 +17364,7 @@ public final Single<List<T>> toList() {
      *
      * @param capacityHint
      *         the number of elements expected from the current {@code Flowable}
-     * @return a {@code Single} that emits a single item: a {@link List} containing all of the items emitted by the current
-     *         {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17655,8 +17403,7 @@ public final Single<List<T>> toList(int capacityHint) {
      * @param <U> the subclass of a collection of Ts
      * @param collectionSupplier
      *               the {@link Supplier} returning the collection (for each individual {@code Subscriber}) to be filled in
-     * @return a {@code Single} that emits a single item: a {@link Collection} (subclass) containing all of the items emitted by the current
-     *         {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code collectionSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17691,8 +17438,7 @@ public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplie
      * @param <K> the key type of the Map
      * @param keySelector
      *            the function that extracts the key from a source item to be used in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the current
-     *         {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17731,8 +17477,7 @@ public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends
      *            the function that extracts the key from a source item to be used in the {@code HashMap}
      * @param valueSelector
      *            the function that extracts the value from a source item to be used in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the current
-     *         {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17771,8 +17516,7 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
      *            the function that extracts the value from the source items to be used as value in the Map
      * @param mapSupplier
      *            the function that returns a {@code Map} instance to be used
-     * @return a {@code Single} that emits a single item: a {@code Map} that contains the mapped items emitted by the
-     *         current {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code mapSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17807,8 +17551,7 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
      * @param <K> the key type of the Map
      * @param keySelector
      *            the function that extracts the key from the source items to be used as key in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
-     *         the current {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17847,8 +17590,7 @@ public final <K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? su
      *            the function that extracts a key from the source items to be used as key in the {@code HashMap}
      * @param valueSelector
      *            the function that extracts a value from the source items to be used as value in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
-     *         the current {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17890,8 +17632,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<?
      *            the function that returns a Map instance to be used
      * @param collectionFactory
      *            the function that returns a {@link Collection} instance for a particular key to be used in the {@code Map}
-     * @return a {@code Single} that emits a single item: a {@code Map} that contains the {@code Collection} of mapped items from
-     *         the current {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector}, {@code valueSelector}, {@code mapSupplier} or {@code collectionFactory} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17937,8 +17678,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
      *            the function that extracts a value from the source items to be used as the value in the {@code Map}
      * @param mapSupplier
      *            the function that returns a {@code Map} instance to be used
-     * @return a {@code Single} that emits a single item: a {@code Map} that contains a list items mapped from the current
-     *         {@code Flowable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code mapSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -17995,8 +17735,7 @@ public final Observable<T> toObservable() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Flowable} in
-     *         sorted order
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -18027,8 +17766,7 @@ public final Single<List<T>> toSortedList() {
      * @param comparator
      *            a function that compares two items emitted by the current {@code Flowable} and returns an {@code int}
      *            that indicates their sort order
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Flowable} in
-     *         sorted order
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code comparator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -18063,8 +17801,7 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
      *            that indicates their sort order
      * @param capacityHint
      *             the initial capacity of the {@link ArrayList} used to accumulate items before sorting
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Flowable} in
-     *         sorted order
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code comparator} is {@code null}
      * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
@@ -18103,8 +17840,7 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
      *
      * @param capacityHint
      *             the initial capacity of the {@link ArrayList} used to accumulate items before sorting
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Flowable} in
-     *         sorted order
+     * @return the new {@code Single} instance
      * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      * @since 2.0
@@ -18134,8 +17870,7 @@ public final Single<List<T>> toSortedList(int capacityHint) {
      *
      * @param scheduler
      *            the {@code Scheduler} to perform cancellation actions on
-     * @return the current {@code Flowable} modified so that its cancellations happen on the specified
-     *         {@code Scheduler}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      */
@@ -18169,8 +17904,7 @@ public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      *
      * @param count
      *            the maximum size of each window before it should be emitted
-     * @return a {@code Flowable} that emits connected, non-overlapping windows, each containing at most
-     *         {@code count} items from the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -18207,8 +17941,7 @@ public final Flowable<Flowable<T>> window(long count) {
      * @param skip
      *            how many items need to be skipped before starting a new window. Note that if {@code skip} and
      *            {@code count} are equal this is the same operation as {@link #window(long)}.
-     * @return a {@code Flowable} that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -18247,8 +17980,7 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
      *            {@code count} are equal this is the same operation as {@link #window(long)}.
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a {@code Flowable} that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the current {@code Flowable}
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException if {@code count}, {@code skip} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -18293,7 +18025,7 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
      *            the period of time after which a new window will be created
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
-     * @return a {@code Flowable} that emits new windows periodically as a fixed timespan elapses
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -18337,7 +18069,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a window
-     * @return a {@code Flowable} that emits new windows periodically as a fixed timespan elapses
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -18383,7 +18115,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      *            the {@code Scheduler} to use when determining the end and start of a window
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a {@code Flowable} that emits new windows periodically as a fixed timespan elapses
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code timespan}, {@code timeskip} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18428,8 +18160,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      *            new window
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
-     * @return a {@code Flowable} that emits connected, non-overlapping windows representing items emitted by the
-     *         current {@code Flowable} during fixed, consecutive durations
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -18471,9 +18202,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit)
      *            the unit of time that applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each window before it should be emitted
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18519,9 +18248,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *            the maximum size of each window before it should be emitted
      * @param restart
      *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18565,8 +18292,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a window
-     * @return a {@code Flowable} that emits connected, non-overlapping windows containing items emitted by the
-     *         current {@code Flowable} within a fixed duration
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -18611,9 +18337,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *            the maximum size of each window before it should be emitted
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a window
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18661,9 +18385,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *            the {@code Scheduler} to use when determining the end and start of a window
      * @param restart
      *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18713,9 +18435,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a {@code Flowable} that emits connected, non-overlapping windows of items from the current {@code Flowable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code count}, {@code timespan} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18757,9 +18477,7 @@ public final Flowable<Flowable<T>> window(
      *            the window element type (ignored)
      * @param boundaryIndicator
      *            a {@code Publisher} whose emitted items close and open windows
-     * @return a {@code Flowable} that emits non-overlapping windows of items it collects from the current {@code Flowable}
-     *         where the boundary of each window is determined by the items emitted from the {@code boundary}
-     *         {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -18796,9 +18514,7 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      *            a {@code Publisher} whose emitted items close and open windows
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a {@code Flowable} that emits non-overlapping windows of items it collects from the current {@code Flowable}
-     *         where the boundary of each window is determined by the items emitted from the {@code boundary}
-     *         {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18842,8 +18558,7 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      * @param closingIndicator
      *            a {@link Function} that produces a {@code Publisher} for every window created. When this {@code Publisher}
      *            emits an item, the associated window is closed and emitted
-     * @return a {@code Flowable} that emits windows of items emitted by the current {@code Flowable} that are governed by
-     *         the specified window-governing {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -18888,8 +18603,7 @@ public final <U, V> Flowable<Flowable<T>> window(
      *            emits an item, the associated window is closed and emitted
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return a {@code Flowable} that emits windows of items emitted by the current {@code Flowable} that are governed by
-     *         the specified window-governing {@code Publisher}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -18929,9 +18643,7 @@ public final <U, V> Flowable<Flowable<T>> window(
      * @param combiner
      *            the function to call when the current {@code Flowable} emits an item and the other {@code Publisher} has already
      *            emitted an item, to generate the item to be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that merges the specified {@code Publisher} into the current {@code Flowable} by using the
-     *         {@code resultSelector} function only when the current {@code Flowable} sequence (this instance) emits an
-     *         item
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} or {@code combiner} is {@code null}
      * @since 2.0
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -19176,8 +18888,7 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends
      * @param zipper
      *            a function that combines the pairs of items from the current {@code Flowable} and the {@code Iterable} to generate
      *            the items to be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that pairs up values from the current {@code Flowable} and the {@code other} {@code Iterable}
-     *         sequence and emits the results of {@code zipFunction} applied to these pairs
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -19226,8 +18937,7 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends
      * @param zipper
      *            a function that combines the pairs of items from the two {@code Publisher}s to generate the items to
      *            be emitted by the resulting {@code Flowable}
-     * @return a {@code Flowable} that pairs up values from the current {@code Flowable} and the {@code other} {@code Publisher}
-     *         and emits the results of {@code zipFunction} applied to these pairs
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -19277,8 +18987,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U>
      *            be emitted by the resulting {@code Flowable}
      * @param delayError
      *            if {@code true}, errors from the current {@code Flowable} or the other {@code Publisher} is delayed until both terminate
-     * @return a {@code Flowable} that pairs up values from the current {@code Flowable} and the {@code other} {@code Publisher}
-     *         and emits the results of {@code zipFunction} applied to these pairs
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      * @since 2.0
@@ -19331,8 +19040,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U>
      *            the capacity hint for the buffer in the inner windows
      * @param delayError
      *            if {@code true}, errors from the current {@code Flowable} or the other {@code Publisher} is delayed until both terminate
-     * @return a {@code Flowable} that pairs up values from the current {@code Flowable} and the {@code other} {@code Publisher}
-     *         and emits the results of {@code zipFunction} applied to these pairs
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 251127071f..82cb7545c2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -207,7 +207,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends MaybeS
      *            a {@code MaybeSource} to be concatenated
      * @param source2
      *            a {@code MaybeSource} to be concatenated
-     * @return a {@code Flowable} that emits items emitted by the two source {@code MaybeSource}s, one after the other.
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -239,7 +239,7 @@ public static <T> Flowable<T> concat(@NonNull MaybeSource<? extends T> source1,
      *            a {@code MaybeSource} to be concatenated
      * @param source3
      *            a {@code MaybeSource} to be concatenated
-     * @return a {@code Flowable} that emits items emitted by the three source {@code MaybeSource}s, one after the other.
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -275,7 +275,7 @@ public static <T> Flowable<T> concat(
      *            a {@code MaybeSource} to be concatenated
      * @param source4
      *            a {@code MaybeSource} to be concatenated
-     * @return a {@code Flowable} that emits items emitted by the four source {@code MaybeSource}s, one after the other.
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -643,7 +643,7 @@ public static <T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? exten
      *  <dd>{@code empty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @return the new {@code Maybe} instance
+     * @return the shared {@code Maybe} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -667,8 +667,7 @@ public static <T> Maybe<T> empty() {
      *            the particular {@link Throwable} to pass to {@link MaybeObserver#onError onError}
      * @param <T>
      *            the type of the item (ostensibly) emitted by the {@code Maybe}
-     * @return a {@code Maybe} that invokes the subscriber's {@link MaybeObserver#onError onError} method when
-     *         the subscriber subscribes to it
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code error} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
@@ -694,8 +693,7 @@ public static <T> Maybe<T> error(@NonNull Throwable error) {
      *            a {@link Supplier} factory to return a {@link Throwable} for each individual {@code MaybeObserver}
      * @param <T>
      *            the type of the items (ostensibly) emitted by the {@code Maybe}
-     * @return a {@code Maybe} that invokes the {@code MaybeObserver.onError} method when
-     *         the {@code MaybeObserver} subscribes to it
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
@@ -806,7 +804,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
      *         {@code MaybeObserver} that subscribes to the returned {@code Maybe}.
      * @param <T>
      *         the type of the item emitted by the {@code Maybe}.
-     * @return a new {@code Maybe} instance
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code callable} is {@code null}
      * @see #defer(Supplier)
      * @see #fromSupplier(Supplier)
@@ -841,7 +839,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
      * @param <T>
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the item from the source {@code Future}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code future} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
@@ -879,7 +877,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
      * @param <T>
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the item from the source {@code Future}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code future} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
@@ -946,7 +944,7 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
      *         {@code MaybeObserver} that subscribes to the returned {@code Maybe}.
      * @param <T>
      *         the type of the item emitted by the {@code Maybe}.
-     * @return a new {@code Maybe} instance
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code supplier} is {@code null}
      * @see #defer(Supplier)
      * @see #fromCallable(Callable)
@@ -976,7 +974,7 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
      *            the item to emit
      * @param <T>
      *            the type of that item
-     * @return a {@code Maybe} that emits {@code item}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
@@ -1120,8 +1118,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeS
      * @param <T> the value type of the sources and the output
      * @param source
      *            a {@code MaybeSource} that emits a {@code MaybeSource}
-     * @return a {@code Maybe} that emits the item that is the result of flattening the {@code MaybeSource} emitted
-     *         by {@code source}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code source} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -1166,7 +1163,7 @@ public static <T> Maybe<T> merge(@NonNull MaybeSource<? extends MaybeSource<? ex
      *            a {@code MaybeSource} to be merged
      * @param source2
      *            a {@code MaybeSource} to be merged
-     * @return a {@code Flowable} that emits all of the items emitted by the source {@code MaybeSource}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(MaybeSource, MaybeSource)
@@ -1217,7 +1214,7 @@ public static <T> Flowable<T> merge(
      *            a {@code MaybeSource} to be merged
      * @param source3
      *            a {@code MaybeSource} to be merged
-     * @return a {@code Flowable} that emits all of the items emitted by the source {@code MaybeSource}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(MaybeSource, MaybeSource, MaybeSource)
@@ -1272,7 +1269,7 @@ public static <T> Flowable<T> merge(
      *            a {@code MaybeSource} to be merged
      * @param source4
      *            a {@code MaybeSource} to be merged
-     * @return a {@code Flowable} that emits all of the items emitted by the source {@code MaybeSource}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(MaybeSource, MaybeSource, MaybeSource, MaybeSource)
@@ -1361,8 +1358,7 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
      * @param <T> the common element base type
      * @param sources
      *            the array of {@code MaybeSource}s
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code MaybeSource}s in the array
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -1403,8 +1399,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extend
      * @param <T> the common element base type
      * @param sources
      *            the {@code Iterable} of {@code MaybeSource}s
-     * @return a {@code Flowable} that emits items that are the result of flattening the items emitted by the
-     *         {@code MaybeSource}s in the {@code Iterable}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -1441,8 +1436,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
      * @param <T> the common element base type
      * @param sources
      *            a {@code Publisher} that emits {@code MaybeSource}s
-     * @return a {@code Flowable} that emits all of the items emitted by the {@code MaybeSource}s emitted by the
-     *         {@code source} {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -1479,8 +1473,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      * @param sources
      *            a {@code Publisher} that emits {@code MaybeSource}s
      * @param maxConcurrency the maximum number of active inner {@code MaybeSource}s to be merged at a time
-     * @return a {@code Flowable} that emits all of the items emitted by the {@code MaybeSource}s emitted by the
-     *         {@code source} {@code Publisher}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -1522,7 +1515,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      *            a {@code MaybeSource} to be merged
      * @param source2
      *            a {@code MaybeSource} to be merged
-     * @return a {@code Flowable} that emits all of the items that are emitted by the two source {@code MaybeSource}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -1564,7 +1557,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
      *            a {@code MaybeSource} to be merged
      * @param source3
      *            a {@code MaybeSource} to be merged
-     * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code MaybeSource}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -1610,7 +1603,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
      *            a {@code MaybeSource} to be merged
      * @param source4
      *            a {@code MaybeSource} to be merged
-     * @return a {@code Flowable} that emits all of the items that are emitted by the source {@code MaybeSource}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -1641,7 +1634,7 @@ public static <T> Flowable<T> mergeDelayError(
      *
      * @param <T>
      *            the type of items (not) emitted by the {@code Maybe}
-     * @return a {@code Maybe} that never emits any items or sends any notifications to a {@code MaybeObserver}
+     * @return the shared {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Never</a>
      */
     @CheckReturnValue
@@ -1668,7 +1661,7 @@ public static <T> Maybe<T> never() {
      *            the second {@code MaybeSource} to compare
      * @param <T>
      *            the type of items emitted by each {@code MaybeSource}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
@@ -1698,8 +1691,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
      *            a function used to compare items emitted by each {@code MaybeSource}
      * @param <T>
      *            the type of items emitted by each {@code MaybeSource}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code MaybeSource} sequences
-     *         are the same according to the specified function
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
@@ -1727,7 +1719,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
      *            the initial delay before emitting a single {@code 0L}
      * @param unit
      *            time units to use for {@code delay}
-     * @return a {@code Maybe} that emits {@code 0L} after a specified delay
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
@@ -1753,7 +1745,7 @@ public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit) {
      *            time units to use for {@code delay}
      * @param scheduler
      *            the {@code Scheduler} to use for scheduling the item
-     * @return a {@code Maybe} that emits {@code 0L} after a specified delay, on a specified {@code Scheduler}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
@@ -1809,7 +1801,7 @@ public static <T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
      *            the factory function to create a {@code MaybeSource}
      * @param resourceDisposer
      *            the function that will dispose of the resource
-     * @return the {@code Maybe} whose lifetime controls the lifetime of the dependent resource object
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -1847,7 +1839,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
      *            or just before the emission of a terminal event ({@code onSuccess}, {@code onComplete} or {@code onError}).
      *            If {@code false} the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onSuccess}, {@code onComplete} or {@code onError}).
-     * @return the {@code Maybe} whose lifetime controls the lifetime of the dependent resource object
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceDisposer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
@@ -1872,7 +1864,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
      * </dl>
      * @param <T> the value type
      * @param source the source to wrap
-     * @return the {@code Maybe} wrapper or the source cast to {@code Maybe} (if possible)
+     * @return the new wrapped or cast {@code Maybe} instance
      * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
@@ -1910,7 +1902,7 @@ public static <T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
      *            an item that will be emitted by the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code zipper} or {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -1946,7 +1938,7 @@ public static <T, R> Maybe<R> zip(@NonNull Iterable<@NonNull ? extends MaybeSour
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results
      *            in an item that will be emitted by the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -1988,7 +1980,7 @@ public static <T1, T2, R> Maybe<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
      *            an item that will be emitted by the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -2034,7 +2026,7 @@ public static <T1, T2, T3, R> Maybe<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
      *            an item that will be emitted by the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -2086,7 +2078,7 @@ public static <T1, T2, T3, T4, R> Maybe<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
      *            an item that will be emitted by the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -2142,7 +2134,7 @@ public static <T1, T2, T3, T4, T5, R> Maybe<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
      *            an item that will be emitted by the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -2205,7 +2197,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Maybe<R> zip(
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7} or {@code zipper} is {@code null}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
     @CheckReturnValue
@@ -2268,7 +2260,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Maybe<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
      *            an item that will be emitted by the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8} or {@code zipper} is {@code null}
@@ -2337,7 +2329,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Maybe<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
      *            an item that will be emitted by the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8}, {@code source9} or {@code zipper} is {@code null}
@@ -2389,7 +2381,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the source {@code MaybeSource}s, results in
      *            an item that will be emitted by the resulting {@code Maybe}
-     * @return a {@code Maybe} that emits the zipped results
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -2423,8 +2415,7 @@ public static <T, R> Maybe<R> zipArray(@NonNull Function<? super Object[], ? ext
      * @param other
      *            a {@code MaybeSource} competing to react first. A subscription to this provided source will occur after
      *            subscribing to the current source.
-     * @return a {@code Maybe} that emits the same sequence as whichever of the source {@code MaybeSource}s first
-     *         signaled
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -2498,8 +2489,7 @@ public final T blockingGet(@NonNull T defaultValue) {
      *  <dd>{@code cache} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Maybe} that, when first subscribed to, caches all of its items and notifications for the
-     *         benefit of subsequent subscribers
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -2546,7 +2536,7 @@ public final <U> Maybe<U> cast(@NonNull Class<? extends U> clazz) {
      *
      * @param <R> the value type of the {@code Maybe} returned by the transformer function
      * @param transformer the transformer function, not {@code null}
-     * @return a {@code Maybe}, transformed by the transformer function
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code transformer} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
      */
@@ -2571,7 +2561,7 @@ public final <R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends
      * @param <R> the result value type
      * @param mapper
      *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a {@code MaybeSource}
-     * @return the {@code Maybe} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @throws NullPointerException if {@code mapper} is {@code null}
      */
@@ -2597,8 +2587,7 @@ public final <R> Maybe<R> concatMap(@NonNull Function<? super T, ? extends Maybe
      *
      * @param other
      *            a {@code MaybeSource} to be concatenated after the current
-     * @return a {@code Flowable} that emits items emitted by the two source {@code MaybeSource}s, one after the other,
-     *         without interleaving them
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -2623,8 +2612,7 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
      *
      * @param item
      *            the item to search for in the emissions from the current {@code Maybe}, not {@code null}
-     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the current {@code Maybe},
-     *         or {@code false} if the current {@code Maybe} completes without emitting that item
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
@@ -2646,8 +2634,7 @@ public final Single<Boolean> contains(@NonNull Object item) {
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a single item: the number of items emitted by the current {@code Maybe} as a
-     *         64-bit {@code Long} item
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
      */
     @CheckReturnValue
@@ -2669,8 +2656,7 @@ public final Single<Long> count() {
      *
      * @param defaultItem
      *            the item to emit if the current {@code Maybe} emits no items
-     * @return a {@code Single} that emits either the specified default item if the current {@code Maybe} emits no
-     *         item, or the item emitted by the current {@code Maybe}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defaultifempty.html">ReactiveX operators documentation: DefaultIfEmpty</a>
      */
@@ -2783,8 +2769,7 @@ public final <U> Maybe<T> delay(@NonNull Publisher<U> delayIndicator) {
      * @param subscriptionIndicator the other {@code Publisher} that should trigger the subscription
      *        to this {@code Publisher}.
      * @throws NullPointerException if {@code subscriptionIndicator} is {@code null}
-     * @return a {@code Maybe} that delays the subscription to this {@code Maybe}
-     *         until the other {@code Publisher} emits an element or completes normally.
+     * @return the new {@code Maybe} instance
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @CheckReturnValue
@@ -2808,7 +2793,7 @@ public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIn
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
-     * @return a {@code Maybe} that delays the subscription to the current {@code Maybe} by the given amount
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      * @see #delaySubscription(long, TimeUnit, Scheduler)
@@ -2836,8 +2821,7 @@ public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
      *            the time unit of {@code delay}
      * @param scheduler
      *            the {@code Scheduler} on which the waiting and subscription will happen
-     * @return a {@code Maybe} that delays the subscription to the current {@code Maybe} by a given
-     *         amount, waiting and subscribing on the given {@code Scheduler}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -2883,8 +2867,7 @@ public final Maybe<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSuccess
      *
      * @param onAfterTerminate
      *            an {@code Action} to be invoked when the current {@code Maybe} finishes
-     * @return a {@code Maybe} that emits the same items as the current {@code Maybe}, then invokes the
-     *         {@code Action}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -3126,8 +3109,7 @@ public final Maybe<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
      * @param predicate
      *            a function that evaluates the item emitted by the current {@code Maybe}, returning {@code true}
      *            if it passes the filter
-     * @return a {@code Maybe} that emit the item emitted by the current {@code Maybe} that the filter
-     *         evaluates as {@code true}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
@@ -3153,7 +3135,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
      * @param <R> the result value type
      * @param mapper
      *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a {@code MaybeSource}
-     * @return the {@code Maybe} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3304,7 +3286,7 @@ public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T,
      * @param <R> the result value type
      * @param mapper
      *            a function that, when applied to the item emitted by the current {@code Maybe}, returns an {@code ObservableSource}
-     * @return the {@code Observable} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3332,7 +3314,7 @@ public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ?
      * @param mapper
      *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
      *            {@code Flowable}
-     * @return the {@code Flowable} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3360,7 +3342,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
      * @param mapper
      *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
      *            {@code Single}
-     * @return the {@code Single} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3414,7 +3396,7 @@ public final <R> Maybe<R> flatMapSingleElement(@NonNull Function<? super T, ? ex
      * @param mapper
      *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
      *            {@code Completable}
-     * @return the {@code Completable} returned from {@code mapper} when applied to the item emitted by the current {@code Maybe}
+     * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -3454,8 +3436,7 @@ public final Maybe<T> hide() {
      *  <dd>{@code ignoreElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an empty {@code Completable} that only calls {@code onComplete} or {@code onError}, based on which one is
-     *         called by the current {@code Maybe}
+     * @return the new {@code Completable} instance
      * @see <a href="http://reactivex.io/documentation/operators/ignoreelements.html">ReactiveX operators documentation: IgnoreElements</a>
      */
     @CheckReturnValue
@@ -3474,7 +3455,7 @@ public final Completable ignoreElement() {
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits {@code true} if the current {@code Maybe} is empty.
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -3655,7 +3636,7 @@ public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> li
      * @param <R> the result value type
      * @param mapper
      *            a function to apply to the item emitted by the {@code Maybe}
-     * @return a {@code Maybe} that emits the item from the current {@code Maybe}, transformed by the specified function
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
@@ -3704,7 +3685,7 @@ public final Single<Notification<T>> materialize() {
      *
      * @param other
      *            a {@code MaybeSource} to be merged
-     * @return a new {@code Flowable} instance
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -4005,7 +3986,7 @@ public final Maybe<T> onErrorReturnItem(@NonNull T item) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a {@code Maybe} which {@code null}s out references to the upstream producer and downstream {@code MaybeObserver} if
+     * @return the new {@code Maybe} instance
      * the sequence is terminated or downstream calls {@code dispose()}
      */
     @CheckReturnValue
@@ -4026,7 +4007,7 @@ public final Maybe<T> onTerminateDetach() {
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits the items emitted by the current {@code Maybe} repeatedly and in sequence
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @BackpressureSupport(BackpressureKind.FULL)
@@ -4052,8 +4033,7 @@ public final Flowable<T> repeat() {
      * @param times
      *            the number of times the current {@code Maybe} items are repeated, a count of 0 will yield an empty
      *            sequence
-     * @return a {@code Flowable} that repeats the sequence of items emitted by the current {@code Maybe} at most
-     *         {@code count} times
+     * @return the new {@code Flowable} instance
      * @throws IllegalArgumentException
      *             if {@code times} is negative
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
@@ -4349,8 +4329,7 @@ public final Maybe<T> retryWhen(
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the {@code Maybe} has finished sending them
+     * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4372,8 +4351,7 @@ public final Disposable subscribe() {
      *
      * @param onSuccess
      *             the {@code Consumer<T>} you have designed to accept a success value from the {@code Maybe}
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the {@code Maybe} has finished sending them
+     * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @throws NullPointerException
      *             if {@code onSuccess} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
@@ -4398,8 +4376,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
      * @param onError
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
      *             {@code Maybe}
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the {@code Maybe} has finished sending them
+     * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onSuccess} is {@code null}, or
@@ -4428,8 +4405,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNu
      * @param onComplete
      *             the {@link Action} you have designed to accept a completion notification from the
      *             {@code Maybe}
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the {@code Maybe} has finished sending them
+     * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @throws NullPointerException
      *             if {@code onSuccess}, {@code onError} or
      *             {@code onComplete} is {@code null}
@@ -4487,7 +4463,7 @@ public final void subscribe(@NonNull MaybeObserver<? super T> observer) {
      *
      * @param scheduler
      *            the {@code Scheduler} to perform subscription actions on
-     * @return the new {@code Maybe} instance that its subscriptions happen on the specified {@code Scheduler}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -4521,8 +4497,8 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
      * </dl>
      * @param <E> the type of the {@code MaybeObserver} to use and return
      * @param observer the {@code MaybeObserver} (subclass) to use and return, not {@code null}
-     * @return the input {@code subscriber}
-     * @throws NullPointerException if {@code subscriber} is {@code null}
+     * @return the input {@code observer}
+     * @throws NullPointerException if {@code observer} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4544,8 +4520,7 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
      *
      * @param other
      *              the alternate {@code MaybeSource} to subscribe to if the main does not emit any items
-     * @return  a {@code Maybe} that emits the items emitted by the current {@code Maybe} or the items of an
-     *          alternate {@code MaybeSource} if the current {@code Maybe} is empty.
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code other} is {@code null}
      */
     @CheckReturnValue
@@ -4568,8 +4543,7 @@ public final Maybe<T> switchIfEmpty(@NonNull MaybeSource<? extends T> other) {
      * <p>History: 2.1.4 - experimental
      * @param other
      *              the alternate {@code SingleSource} to subscribe to if the main does not emit any items
-     * @return a {@code Single} that emits the items emitted by the current {@code Maybe} or the item of an
-     *         alternate {@code SingleSource} if the current {@code Maybe} is empty.
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.2
      */
@@ -4596,7 +4570,7 @@ public final Single<T> switchIfEmpty(@NonNull SingleSource<? extends T> other) {
      *            from the current {@code Maybe}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return a {@code Maybe} that emits the items emitted by the current {@code Maybe} until such time as {@code other} emits its first item
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
@@ -4626,7 +4600,7 @@ public final <U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
      *            from the source {@code Publisher}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return a {@code Maybe} that emits the items emitted by the current {@code Maybe} until such time as {@code other} emits its first item
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 2123f8e328..0ea4c18b47 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -113,8 +113,7 @@ public abstract class Observable<@NonNull T> implements ObservableSource<T> {
      * @param sources
      *            an {@code Iterable} of {@code ObservableSource} sources competing to react first. A subscription to each source will
      *            occur in the same order as in the {@code Iterable}.
-     * @return an {@code Observable} that emits the same sequence as whichever of the returned {@code ObservableSource}s first
-     *         emitted an item or sent a termination notification
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -140,8 +139,7 @@ public static <T> Observable<T> amb(@NonNull Iterable<@NonNull ? extends Observa
      * @param sources
      *            an array of {@code ObservableSource} sources competing to react first. A subscription to each source will
      *            occur in the same order as in the array.
-     * @return an {@code Observable} that emits the same sequence as whichever of the returned {@code ObservableSource}s first
-     *         emitted an item or sent a termination notification
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -205,8 +203,7 @@ public static int bufferSize() {
      *            the collection of source {@code ObservableSource}s
      * @param combiner
      *            the aggregation function used to combine the items emitted by the returned {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the returned
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -252,8 +249,7 @@ public static <T, R> Observable<R> combineLatest(
      *            the aggregation function used to combine the items emitted by the returned {@code ObservableSource}s
      * @param bufferSize
      *            the expected number of row combination items to be buffered internally
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the returned
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -304,8 +300,7 @@ public static <T, R> Observable<R> combineLatest(
      *            the collection of source {@code ObservableSource}s
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the returned
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -351,8 +346,7 @@ public static <T, R> Observable<R> combineLatestArray(
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
      * @param bufferSize
      *            the expected number of row combination items to be buffered internally
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -399,8 +393,7 @@ public static <T, R> Observable<R> combineLatestArray(
      *            the second source {@code ObservableSource}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -444,8 +437,7 @@ public static <T1, T2, R> Observable<R> combineLatest(
      *            the third source {@code ObservableSource}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -494,8 +486,7 @@ public static <T1, T2, T3, R> Observable<R> combineLatest(
      *            the fourth source {@code ObservableSource}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -549,8 +540,7 @@ public static <T1, T2, T3, T4, R> Observable<R> combineLatest(
      *            the fifth source {@code ObservableSource}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -609,8 +599,7 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(
      *            the sixth source {@code ObservableSource}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -673,8 +662,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(
      *            the seventh source {@code ObservableSource}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7} or {@code combiner} is {@code null}
@@ -743,8 +731,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
      *            the eighth source {@code ObservableSource}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8} or {@code combiner} is {@code null}
@@ -817,8 +804,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
      *            the ninth source {@code ObservableSource}
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8}, {@code source9} or {@code combiner} is {@code null}
@@ -879,8 +865,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
      *            the collection of source {@code ObservableSource}s
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -927,8 +912,7 @@ public static <T, R> Observable<R> combineLatestArrayDelayError(
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
      * @param bufferSize
      *            the expected number of row combination items to be buffered internally
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -981,8 +965,7 @@ public static <T, R> Observable<R> combineLatestArrayDelayError(@NonNull Observa
      *            the {@code Iterable} of source {@code ObservableSource}s
      * @param combiner
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
      */
@@ -1028,8 +1011,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<@No
      *            the aggregation function used to combine the items emitted by the {@code ObservableSource}s
      * @param bufferSize
      *            the expected number of row combination items to be buffered internally
-     * @return an {@code Observable} that emits items that are the result of combining the items emitted by the
-     *         {@code ObservableSource}s by means of the given aggregation function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -1084,8 +1066,7 @@ public static <T> Observable<T> concat(@NonNull Iterable<@NonNull ? extends Obse
      * @param <T> the common element base type
      * @param sources
      *            an {@code ObservableSource} that emits {@code ObservableSource}s
-     * @return an {@code Observable} that emits items all of the items emitted by the {@code ObservableSource}s emitted by
-     *         {@code ObservableSource}s, one after the other, without interleaving them
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1111,8 +1092,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Obser
      *            an {@code ObservableSource} that emits {@code ObservableSource}s
      * @param bufferSize
      *            the number of inner {@code ObservableSource}s expected to be buffered.
-     * @return an {@code Observable} that emits items all of the items emitted by the {@code ObservableSource}s emitted by
-     *         {@code ObservableSource}s, one after the other, without interleaving them
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
@@ -1142,8 +1122,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Obser
      *            an {@code ObservableSource} to be concatenated
      * @param source2
      *            an {@code ObservableSource} to be concatenated
-     * @return an {@code Observable} that emits items emitted by the two source {@code ObservableSource}s, one after the other,
-     *         without interleaving them
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1173,8 +1152,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends T> so
      *            an {@code ObservableSource} to be concatenated
      * @param source3
      *            an {@code ObservableSource} to be concatenated
-     * @return an {@code Observable} that emits items emitted by the three source {@code ObservableSource}s, one after the other,
-     *         without interleaving them
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1209,8 +1187,7 @@ public static <T> Observable<T> concat(
      *            an {@code ObservableSource} to be concatenated
      * @param source4
      *            an {@code ObservableSource} to be concatenated
-     * @return an {@code Observable} that emits items emitted by the four source {@code ObservableSource}s, one after the other,
-     *         without interleaving them
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1670,8 +1647,7 @@ public static <T> Observable<T> create(@NonNull ObservableOnSubscribe<T> source)
      *            resulting {@code Observable}
      * @param <T>
      *            the type of the items emitted by the {@code ObservableSource}
-     * @return an {@code Observable} whose {@code Observer}s' subscriptions trigger an invocation of the given
-     *         {@code ObservableSource} factory function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defer.html">ReactiveX operators documentation: Defer</a>
      */
@@ -1695,8 +1671,7 @@ public static <T> Observable<T> defer(@NonNull Supplier<? extends ObservableSour
      *
      * @param <T>
      *            the type of the items (ostensibly) emitted by the {@code Observable}
-     * @return an {@code Observable} that emits no items to the {@code Observer} but immediately invokes the
-     *         {@code Observer}'s {@link Observer#onComplete() onComplete} method
+     * @return the shared {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Empty</a>
      */
     @CheckReturnValue
@@ -1721,8 +1696,7 @@ public static <T> Observable<T> empty() {
      *            a {@link Supplier} factory to return a {@link Throwable} for each individual {@code Observer}
      * @param <T>
      *            the type of the items (ostensibly) emitted by the {@code Observable}
-     * @return an {@code Observable} that invokes the {@code Observer}'s {@link Observer#onError onError} method when
-     *         the {@code Observer} subscribes to it
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code errorSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
@@ -1748,8 +1722,7 @@ public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> err
      *            the particular {@link Throwable} to pass to {@link Observer#onError onError}
      * @param <T>
      *            the type of the items (ostensibly) emitted by the {@code Observable}
-     * @return an {@code Observable} that invokes the {@code Observer}'s {@link Observer#onError onError} method when
-     *         the {@code Observer} subscribes to it
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code exception} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
@@ -1774,7 +1747,7 @@ public static <T> Observable<T> error(@NonNull Throwable exception) {
      *            the array of elements
      * @param <T>
      *            the type of items in the array and the type of items to be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits each item in the source array
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
@@ -1817,7 +1790,7 @@ public static <T> Observable<T> fromArray(@NonNull T... items) {
      *         function only when an observer subscribes to the {@code Observable} that {@code fromCallable} returns
      * @param <T>
      *         the type of the item returned by the {@code Callable} and emitted by the {@code Observable}
-     * @return an {@code Observable} whose {@link Observer}s' subscriptions trigger an invocation of the given function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code callable} is {@code null}
      * @see #defer(Supplier)
      * @see #fromSupplier(Supplier)
@@ -1857,7 +1830,7 @@ public static <T> Observable<T> fromCallable(@NonNull Callable<? extends T> call
      * @param <T>
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Observable}
-     * @return an {@code Observable} that emits the item from the source {@code Future}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code future} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
@@ -1899,7 +1872,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future)
      * @param <T>
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Observable}
-     * @return an {@code Observable} that emits the item from the source {@code Future}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code future} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      */
@@ -1926,7 +1899,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
      * @param <T>
      *            the type of items in the {@code Iterable} sequence and the type of items to be emitted by the
      *            resulting {@code Observable}
-     * @return an {@code Observable} that emits each item in the source {@code Iterable} sequence
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromStream(Stream)
@@ -2000,7 +1973,7 @@ public static <T> Observable<T> fromPublisher(@NonNull Publisher<@NonNull ? exte
      *         function only when an observer subscribes to the {@code Observable} that {@code fromSupplier} returns
      * @param <T>
      *         the type of the item emitted by the {@code Observable}
-     * @return an {@code Observable} whose {@link Observer}s' subscriptions trigger an invocation of the given function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code supplier} is {@code null}
      * @see #defer(Supplier)
      * @see #fromCallable(Callable)
@@ -2200,8 +2173,7 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
      *            the period of time between emissions of the subsequent numbers
      * @param unit
      *            the time unit for both {@code initialDelay} and {@code period}
-     * @return an {@code Observable} that emits a 0L after the {@code initialDelay} and ever increasing numbers after
-     *         each {@code period} of time thereafter
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      * @throws NullPointerException if {@code unit} is {@code null}
      * @since 1.0.12
@@ -2231,8 +2203,7 @@ public static Observable<Long> interval(long initialDelay, long period, @NonNull
      *            the time unit for both {@code initialDelay} and {@code period}
      * @param scheduler
      *            the {@code Scheduler} on which the waiting happens and items are emitted
-     * @return an {@code Observable} that emits a 0L after the {@code initialDelay} and ever increasing numbers after
-     *         each {@code period} of time thereafter, while running on the given {@code Scheduler}
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      * @since 1.0.12
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
@@ -2260,7 +2231,7 @@ public static Observable<Long> interval(long initialDelay, long period, @NonNull
      *            the period size in time units (see below)
      * @param unit
      *            time units to use for the interval size
-     * @return an {@code Observable} that emits a sequential number each time interval
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
@@ -2287,7 +2258,7 @@ public static Observable<Long> interval(long period, @NonNull TimeUnit unit) {
      *            time units to use for the interval size
      * @param scheduler
      *            the {@code Scheduler} to use for scheduling the items
-     * @return an {@code Observable} that emits a sequential number each time interval
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/interval.html">ReactiveX operators documentation: Interval</a>
      */
@@ -2390,7 +2361,7 @@ public static Observable<Long> intervalRange(long start, long count, long initia
      *            the item to emit
      * @param <T>
      *            the type of that item
-     * @return an {@code Observable} that emits {@code value} as a single item and then completes
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      * @see #just(Object, Object)
@@ -2421,7 +2392,7 @@ public static <T> Observable<T> just(@NonNull T item) {
      *            second item
      * @param <T>
      *            the type of these items
-     * @return an {@code Observable} that emits each item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item1} or {@code item2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
@@ -2452,7 +2423,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2) {
      *            third item
      * @param <T>
      *            the type of these items
-     * @return an {@code Observable} that emits each item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item1}, {@code item2} or {@code item3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
@@ -2486,7 +2457,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            fourth item
      * @param <T>
      *            the type of these items
-     * @return an {@code Observable} that emits each item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3} or {@code item4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
      */
@@ -2523,7 +2494,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            fifth item
      * @param <T>
      *            the type of these items
-     * @return an {@code Observable} that emits each item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4} or {@code item5} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
@@ -2564,7 +2535,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            sixth item
      * @param <T>
      *            the type of these items
-     * @return an {@code Observable} that emits each item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5} or {@code item6} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/just.html">ReactiveX operators documentation: Just</a>
@@ -2608,7 +2579,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            seventh item
      * @param <T>
      *            the type of these items
-     * @return an {@code Observable} that emits each item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5}, {@code item6}
      *                              or {@code item7} is {@code null}
@@ -2656,7 +2627,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            eighth item
      * @param <T>
      *            the type of these items
-     * @return an {@code Observable} that emits each item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5}, {@code item6}
      *                              {@code item7} or {@code item8} is {@code null}
@@ -2707,7 +2678,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            ninth item
      * @param <T>
      *            the type of these items
-     * @return an {@code Observable} that emits each item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5}, {@code item6}
      *                              {@code item7}, {@code item8} or {@code item9} is {@code null}
@@ -2761,7 +2732,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            tenth item
      * @param <T>
      *            the type of these items
-     * @return an {@code Observable} that emits each item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item1}, {@code item2}, {@code item3},
      *                              {@code item4}, {@code item5}, {@code item6}
      *                              {@code item7}, {@code item8}, {@code item9}
@@ -2819,8 +2790,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param bufferSize
      *            the number of items expected from each inner {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
-     *         {@code ObservableSource}s in the {@code Iterable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrent} or {@code bufferSize} is non-positive
@@ -2868,8 +2838,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param bufferSize
      *            the number of items expected from each inner {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
-     *         {@code ObservableSource}s in the array
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrent} or {@code bufferSize} is non-positive
@@ -2913,8 +2882,7 @@ public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @
      * @param <T> the common element base type
      * @param sources
      *            the {@code Iterable} of {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
-     *         {@code ObservableSource}s in the {@code Iterable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable)
@@ -2958,8 +2926,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
      *            the {@code Iterable} of {@code ObservableSource}s
      * @param maxConcurrency
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
-     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
-     *         {@code ObservableSource}s in the {@code Iterable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is less than or equal to 0
@@ -3003,8 +2970,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
      * @param <T> the common element base type
      * @param sources
      *            an {@code ObservableSource} that emits {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of flattening the {@code ObservableSource}s emitted by the
-     *         {@code source} {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see #mergeDelayError(ObservableSource)
@@ -3050,8 +3016,7 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
      *            an {@code ObservableSource} that emits {@code ObservableSource}s
      * @param maxConcurrency
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
-     * @return an {@code Observable} that emits items that are the result of flattening the {@code ObservableSource}s emitted by the
-     *         {@code source} {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code maxConcurrency} is non-positive
@@ -3099,7 +3064,7 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
      *            an {@code ObservableSource} to be merged
      * @param source2
      *            an {@code ObservableSource} to be merged
-     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(ObservableSource, ObservableSource)
@@ -3146,7 +3111,7 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends T> sou
      *            an {@code ObservableSource} to be merged
      * @param source3
      *            an {@code ObservableSource} to be merged
-     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(ObservableSource, ObservableSource, ObservableSource)
@@ -3198,7 +3163,7 @@ public static <T> Observable<T> merge(
      *            an {@code ObservableSource} to be merged
      * @param source4
      *            an {@code ObservableSource} to be merged
-     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(ObservableSource, ObservableSource, ObservableSource, ObservableSource)
@@ -3245,7 +3210,7 @@ public static <T> Observable<T> merge(
      * @param <T> the common element base type
      * @param sources
      *            the array of {@code ObservableSource}s
-     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s in the array
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeArrayDelayError(ObservableSource...)
@@ -3280,8 +3245,7 @@ public static <T> Observable<T> mergeArray(@NonNull ObservableSource<? extends T
      * @param <T> the common element base type
      * @param sources
      *            the {@code Iterable} of {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
-     *         {@code ObservableSource}s in the {@code Iterable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3318,8 +3282,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? ext
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param bufferSize
      *            the number of items expected from each inner {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
-     *         {@code ObservableSource}s in the {@code Iterable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3357,8 +3320,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? ext
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
      * @param bufferSize
      *            the number of items expected from each inner {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
-     *         {@code ObservableSource}s in the array
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3395,8 +3357,7 @@ public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int buf
      *            the {@code Iterable} of {@code ObservableSource}s
      * @param maxConcurrency
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
-     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
-     *         {@code ObservableSource}s in the {@code Iterable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3430,8 +3391,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? ext
      * @param <T> the common element base type
      * @param sources
      *            an {@code ObservableSource} that emits {@code ObservableSource}s
-     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s emitted by the
-     *         {@code source} {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3468,8 +3428,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
      *            an {@code ObservableSource} that emits {@code ObservableSource}s
      * @param maxConcurrency
      *            the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
-     * @return an {@code Observable} that emits all of the items emitted by the {@code ObservableSource}s emitted by the
-     *         {@code source} {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
@@ -3508,7 +3467,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
      *            an {@code ObservableSource} to be merged
      * @param source2
      *            an {@code ObservableSource} to be merged
-     * @return an {@code Observable} that emits all of the items that are emitted by the two source {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3549,7 +3508,7 @@ public static <T> Observable<T> mergeDelayError(
      *            an {@code ObservableSource} to be merged
      * @param source3
      *            an {@code ObservableSource} to be merged
-     * @return an {@code Observable} that emits all of the items that are emitted by the {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3594,7 +3553,7 @@ public static <T> Observable<T> mergeDelayError(
      *            an {@code ObservableSource} to be merged
      * @param source4
      *            an {@code ObservableSource} to be merged
-     * @return an {@code Observable} that emits all of the items that are emitted by the {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3633,8 +3592,7 @@ public static <T> Observable<T> mergeDelayError(
      * @param <T> the common element base type
      * @param sources
      *            the array of {@code ObservableSource}s
-     * @return an {@code Observable} that emits items that are the result of flattening the items emitted by the
-     *         {@code ObservableSource}s in the array
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3660,7 +3618,7 @@ public static <T> Observable<T> mergeArrayDelayError(@NonNull ObservableSource<?
      *
      * @param <T>
      *            the type of items (not) emitted by the {@code Observable}
-     * @return an {@code Observable} that never emits any items or sends any notifications to an {@code Observer}
+     * @return the shared {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Never</a>
      */
     @CheckReturnValue
@@ -3684,7 +3642,7 @@ public static <T> Observable<T> never() {
      *            the value of the first {@code Integer} in the sequence
      * @param count
      *            the number of sequential {@code Integer}s to generate
-     * @return an {@code Observable} that emits a range of sequential {@code Integer}s
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException
      *             if {@code count} is negative, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Integer#MAX_VALUE}
@@ -3722,7 +3680,7 @@ public static Observable<Integer> range(int start, int count) {
      *            the value of the first {@code Long} in the sequence
      * @param count
      *            the number of sequential {@code Long}s to generate
-     * @return an {@code Observable} that emits a range of sequential {@code Long}s
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException
      *             if {@code count} is negative, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Long#MAX_VALUE}
@@ -3768,7 +3726,7 @@ public static Observable<Long> rangeLong(long start, long count) {
      *            the second {@code ObservableSource} to compare
      * @param <T>
      *            the type of items emitted by each {@code ObservableSource}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
@@ -3798,8 +3756,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
      *            a function used to compare items emitted by each {@code ObservableSource}
      * @param <T>
      *            the type of items emitted by each {@code ObservableSource}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code ObservableSource} two sequences
-     *         are the same according to the specified function
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
      */
@@ -3833,8 +3790,7 @@ public static <T> Single<Boolean> sequenceEqual(
      *            the number of items expected from the first and second source {@code ObservableSource} to be buffered
      * @param <T>
      *            the type of items emitted by each {@code ObservableSource}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two {@code ObservableSource} two sequences
-     *         are the same according to the specified function
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code isEqual} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
@@ -3870,7 +3826,7 @@ public static <T> Single<Boolean> sequenceEqual(
      *            the number of items expected from the first and second source {@code ObservableSource} to be buffered
      * @param <T>
      *            the type of items emitted by each {@code ObservableSource}
-     * @return a {@code Single} that emits a {@code Boolean} value that indicates whether the two sequences are the same
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/sequenceequal.html">ReactiveX operators documentation: SequenceEqual</a>
@@ -3906,8 +3862,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
      *            the {@code ObservableSource} that emits {@code ObservableSource}s
      * @param bufferSize
      *            the expected number of items to cache from the inner {@code ObservableSource}s
-     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the
-     *         {@code sources} {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
@@ -3943,8 +3898,7 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
      * @param <T> the item type
      * @param sources
      *            the {@code ObservableSource} that emits {@code ObservableSource}s
-     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the {@code sources}
-     *         {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      */
@@ -3977,8 +3931,7 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
      * @param <T> the item type
      * @param sources
      *            the {@code ObservableSource} that emits {@code ObservableSource}s
-     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the {@code sources}
-     *         {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
      * @since 2.0
@@ -4014,8 +3967,7 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
      *            the {@code ObservableSource} that emits {@code ObservableSource}s
      * @param bufferSize
      *            the expected number of items to cache from the inner {@code ObservableSource}s
-     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} most recently emitted by the {@code sources}
-     *         {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
@@ -4044,7 +3996,7 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
      *            the initial delay before emitting a single {@code 0L}
      * @param unit
      *            time units to use for {@code delay}
-     * @return an {@code Observable} that {@code 0L} after a specified delay, and then completes
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
@@ -4073,8 +4025,7 @@ public static Observable<Long> timer(long delay, @NonNull TimeUnit unit) {
      *            the {@code Scheduler} to use for scheduling the item
      * @throws NullPointerException
      *             if {@code unit} or {@code scheduler} is {@code null}
-     * @return an {@code Observable} that emits {@code 0L} after a specified delay, on a specified {@code Scheduler}, and then
-     *         completes
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/timer.html">ReactiveX operators documentation: Timer</a>
      */
     @CheckReturnValue
@@ -4133,7 +4084,7 @@ public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubs
      *            the factory function to create an {@code ObservableSource}
      * @param resourceDisposer
      *            the function that will dispose of the resource
-     * @return the {@code ObservableSource} whose lifetime controls the lifetime of the dependent resource object
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -4170,7 +4121,7 @@ public static <T, D> Observable<T> using(
      *            or just before the emission of a terminal event ({@code onComplete} or {@code onError}).
      *            If {@code false}, the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
-     * @return the {@code ObservableSource} whose lifetime controls the lifetime of the dependent resource object
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} and {@code resourceDisposer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      * @since 2.0
@@ -4254,7 +4205,7 @@ public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
      * @param zipper
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
      *            an item that will be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -4314,7 +4265,7 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends Obse
      *            the number of elements expected from each source {@code ObservableSource} to be buffered
      * @param <T> the common source value type
      * @param <R> the zipped result type
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -4372,7 +4323,7 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends Obse
      * @param zipper
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results
      *            in an item that will be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -4430,7 +4381,7 @@ public static <T1, T2, R> Observable<R> zip(
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results
      *            in an item that will be emitted by the resulting {@code Observable}
      * @param delayError delay errors from any of the {@code ObservableSource}s till the other terminates
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -4489,7 +4440,7 @@ public static <T1, T2, R> Observable<R> zip(
      *            in an item that will be emitted by the resulting {@code Observable}
      * @param delayError delay errors from any of the {@code ObservableSource}s till the other terminates
      * @param bufferSize the number of elements expected from each source {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code zipper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -4551,7 +4502,7 @@ public static <T1, T2, R> Observable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
      *            an item that will be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -4617,7 +4568,7 @@ public static <T1, T2, T3, R> Observable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
      *            an item that will be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -4688,7 +4639,7 @@ public static <T1, T2, T3, T4, R> Observable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
      *            an item that will be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -4762,7 +4713,7 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
      *            an item that will be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -4840,7 +4791,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
      *            an item that will be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7} or {@code zipper} is {@code null}
@@ -4924,7 +4875,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
      *            an item that will be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8} or {@code zipper} is {@code null}
@@ -5012,7 +4963,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
      * @param zipper
      *            a function that, when applied to an item emitted by each of the {@code ObservableSource}s, results in
      *            an item that will be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3},
      *                              {@code source4}, {@code source5}, {@code source6},
      *                              {@code source7}, {@code source8}, {@code source9} or {@code zipper} is {@code null}
@@ -5086,7 +5037,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
      *            delay errors signaled by any of the {@code ObservableSource} until all {@code ObservableSource}s terminate
      * @param bufferSize
      *            the number of elements expected from each source {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits the zipped results
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} or {@code zipper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
@@ -5124,8 +5075,7 @@ public static <T, R> Observable<R> zipArray(
      *
      * @param predicate
      *            a function that evaluates an item and returns a {@code Boolean}
-     * @return a {@code Single} that emits {@code true} if all items emitted by the current {@code Observable} satisfy the
-     *         predicate; otherwise, {@code false}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/all.html">ReactiveX operators documentation: All</a>
      */
@@ -5150,8 +5100,7 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
      * @param other
      *            an {@code ObservableSource} competing to react first. A subscription to this provided source will occur after
      *            subscribing to the current source.
-     * @return an {@code Observable} that emits the same sequence as whichever of the current {@code Observable}s first
-     *         emitted an item or sent a termination notification
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/amb.html">ReactiveX operators documentation: Amb</a>
      */
@@ -5179,8 +5128,7 @@ public final Observable<T> ambWith(@NonNull ObservableSource<? extends T> other)
      *
      * @param predicate
      *            the condition to test items emitted by the current {@code Observable}
-     * @return a {@code Single} that emits a {@link Boolean} that indicates whether any item emitted by the current
-     *         {@code Observable} satisfies the {@code predicate}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
@@ -5460,7 +5408,7 @@ public final T blockingLast(@NonNull T defaultItem) {
      *  <dd>{@code blockingLatest} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Iterable} that always returns the latest item emitted by the current {@code Observable}
+     * @return the new {@code Iterable} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5483,8 +5431,7 @@ public final Iterable<T> blockingLatest() {
      * @param initialValue
      *            the initial value that the {@code Iterable} sequence will yield if the current
      *            {@code Observable} has not yet emitted an item
-     * @return an {@code Iterable} that on each iteration returns the item that the current {@code Observable}
-     *         has most recently emitted
+     * @return the new {@code Iterable} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5504,8 +5451,7 @@ public final Iterable<T> blockingMostRecent(@NonNull T initialValue) {
      *  <dd>{@code blockingNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Iterable} that blocks upon each iteration until the current {@code Observable} emits
-     *         a new item, whereupon the {@code Iterable} returns that item
+     * @return the new {@code Iterable} instance
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX documentation: TakeLast</a>
      */
     @CheckReturnValue
@@ -5588,7 +5534,7 @@ public final T blockingSingle(@NonNull T defaultItem) {
      *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Future} that expects a single item to be emitted by the current {@code Observable}
+     * @return the new {@code Future} instance
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      * @see #singleOrErrorStage()
      */
@@ -5734,8 +5680,7 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
      *
      * @param count
      *            the maximum number of items in each buffer before it should be emitted
-     * @return an {@code Observable} that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -5765,8 +5710,7 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
      *            how many items emitted by the current {@code Observable} should be skipped before starting a new
      *            buffer. Note that when {@code skip} and {@code count} are equal, this is the same operation as
      *            {@link #buffer(int)}.
-     * @return an {@code Observable} that emits buffers for every {@code skip} item from the current {@code Observable} and
-     *         containing at most {@code count} items
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -5800,8 +5744,7 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an {@code Observable} that emits buffers for every {@code skip} item from the current {@code Observable} and
-     *         containing at most {@code count} items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code bufferSupplier} is {@code null}
      * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -5835,8 +5778,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an {@code Observable} that emits connected, non-overlapping buffers, each containing at most
-     *         {@code count} items from the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code bufferSupplier} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -5868,8 +5810,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the period of time after which a new buffer will be created
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
-     * @return an {@code Observable} that emits new buffers of items emitted by the current {@code Observable} periodically after
-     *         a fixed timespan has elapsed
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -5903,8 +5844,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a buffer
-     * @return an {@code Observable} that emits new buffers of items emitted by the current {@code Observable} periodically after
-     *         a fixed timespan has elapsed
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -5942,8 +5882,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an {@code Observable} that emits new buffers of items emitted by the current {@code Observable} periodically after
-     *         a fixed timespan has elapsed
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code bufferSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -5976,8 +5915,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            buffer
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
-     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Observable} within a fixed duration
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6010,9 +5948,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the unit of time which applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Observable}, after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
-     *         first)
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6048,9 +5984,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the {@code Scheduler} to use when determining the end and start of a buffer
      * @param count
      *            the maximum size of each buffer before it is emitted
-     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Observable} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
-     *         first)
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6092,9 +6026,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            as the buffer
      * @param restartTimerOnMaxSize if {@code true}, the time window is restarted when the max capacity of the current buffer
      *            is reached
-     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Observable} after a fixed duration or when the buffer reaches maximum capacity (whichever occurs
-     *         first)
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code bufferSupplier} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6135,8 +6067,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a buffer
-     * @return an {@code Observable} that emits connected, non-overlapping buffers of items emitted by the current
-     *         {@code Observable} within a fixed duration
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6167,8 +6098,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param closingIndicator
      *            the {@link Function} that is used to produce an {@code ObservableSource} for every buffer created. When this indicator
      *            {@code ObservableSource} emits an item, the associated buffer is emitted.
-     * @return an {@code Observable} that emits buffers, containing items from the current {@code Observable}, that are created
-     *         and closed when the specified {@code ObservableSource}s emit items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6205,8 +6135,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an {@code Observable} that emits buffers, containing items from the current {@code Observable}, that are created
-     *         and closed when the specified {@code ObservableSource}s emit items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code openingIndicator}, {@code closingIndicator} or {@code bufferSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
@@ -6242,8 +6171,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the boundary value type (ignored)
      * @param boundaryIndicator
      *            the boundary {@code ObservableSource}
-     * @return an {@code Observable} that emits buffered items from the current {@code Observable} when the boundary {@code ObservableSource}
-     *         emits an item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @see #buffer(ObservableSource, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6276,8 +6204,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *            the boundary {@code ObservableSource}
      * @param initialCapacity
      *            the initial capacity of each buffer chunk
-     * @return an {@code Observable} that emits buffered items from the current {@code Observable} when the boundary {@code ObservableSource}
-     *         emits an item
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @throws IllegalArgumentException if {@code initialCapacity} is non-positive
@@ -6314,8 +6241,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
-     * @return an {@code Observable} that emits buffered items from the current {@code Observable} when the boundary {@code ObservableSource}
-     *         emits an item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code boundary} or {@code bufferSupplier} is {@code null}
      * @see #buffer(ObservableSource, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
@@ -6373,8 +6299,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      *  <dd>{@code cache} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that, when first subscribed to, caches all of its items and notifications for the
-     *         benefit of subsequent subscribers
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #takeUntil(Predicate)
      * @see #takeUntil(ObservableSource)
@@ -6434,8 +6359,7 @@ public final Observable<T> cache() {
      * {@link #replay(int)} in combination with {@link ConnectableObservable#autoConnect()} or similar.
      *
      * @param initialCapacity hint for number of items to cache (for optimizing underlying data structure)
-     * @return an {@code Observable} that, when first subscribed to, caches all of its items and notifications for the
-     *         benefit of subsequent subscribers
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException if {@code initialCapacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #takeUntil(Predicate)
@@ -6463,8 +6387,7 @@ public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
      * @param clazz
      *            the target class type that {@code cast} will cast the items emitted by the current {@code Observable}
      *            into before emitting them from the resulting {@code Observable}
-     * @return an {@code Observable} that emits each item from the current {@code Observable} after converting it to the
-     *         specified type
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
@@ -6498,8 +6421,7 @@ public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies the accumulator accordingly
      *           accordingly
-     * @return a {@code Single} that emits the result of collecting the values emitted by the current {@code Observable}
-     *         into a single mutable data structure
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code initialValueSupplier} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      */
@@ -6534,8 +6456,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialValueSu
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies the accumulator accordingly
      *           accordingly
-     * @return a {@code Single} that emits the result of collecting the values emitted by the current {@code Observable}
-     *         into a single mutable data structure
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code initialValue} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      */
@@ -6563,7 +6484,7 @@ public final <U> Single<U> collectInto(@NonNull U initialValue, @NonNull BiConsu
      *
      * @param <R> the value type of the output {@code ObservableSource}
      * @param composer implements the function that transforms the current {@code Observable}
-     * @return the current {@code Observable}, transformed by the transformer function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code composer} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
      */
@@ -6594,8 +6515,7 @@ public final <R> Observable<R> compose(@NonNull ObservableTransformer<? super T,
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
      *            {@code ObservableSource}
-     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Observable} and concatenating the {@code ObservableSource}s obtained from this transformation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #concatMap(Function, int, Scheduler)
@@ -6628,8 +6548,7 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
      *            {@code ObservableSource}
      * @param bufferSize
      *            the number of elements expected from the current {@code Observable} to be buffered
-     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Observable} and concatenating the {@code ObservableSource}s obtained from this transformation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -6674,8 +6593,7 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
      *            the number of elements expected from the current {@code Observable} to be buffered
      * @param scheduler
      *            the scheduler where the {@code mapper} function will be executed
-     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Observable} and concatenating the {@code ObservableSource}s obtained from this transformation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @since 3.0.0
@@ -6947,7 +6865,7 @@ public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? supe
      * <p>History: 2.1.6 - experimental
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Observable}, returns a {@code CompletableSource}
-     * @return a {@link Completable} that signals {@code onComplete} when the upstream and all {@code CompletableSource}s complete
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @since 2.2
      */
@@ -6974,7 +6892,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * @param capacityHint
      *            the number of upstream items expected to be buffered until the current {@code CompletableSource}, mapped from
      *            the current item, completes.
-     * @return a {@link Completable} that signals {@code onComplete} when the upstream and all {@code CompletableSources} complete
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @since 2.2
@@ -7002,7 +6920,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * @param mapper the function called with the upstream item and should return
      *               a {@code CompletableSource} to become the next source to
      *               be subscribed to
-     * @return a new {@link Completable} instance
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletable(Function, int)
      * @since 2.2
@@ -7034,7 +6952,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *                   {@code Observable} is delayed until the current inner
      *                   {@code CompletableSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new {@link Completable} instance
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapCompletable(Function)
      * @since 2.2
@@ -7068,7 +6986,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      *                   it emitted to the downstream.
      * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code CompletableSource} terminates.
-     * @return a new {@link Completable} instance
+     * @return the new {@link Completable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapCompletable(Function, int)
@@ -7099,8 +7017,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * @param mapper
      *            a function that returns an {@code Iterable} sequence of values for when given an item emitted by the
      *            current {@code Observable}
-     * @return an {@code Observable} that emits the results of concatenating the items emitted by the current {@code Observable} with
-     *         the values in the {@code Iterable}s corresponding to those items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -7127,7 +7044,7 @@ public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ?
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybeDelayError(Function)
      * @see #concatMapMaybe(Function, int)
@@ -7157,7 +7074,7 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
      *               be subscribed to
      * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code MaybeSource} terminates.
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapMaybe(Function)
@@ -7188,7 +7105,7 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
      * @param mapper the function called with the upstream item and should return
      *               a {@code MaybeSource} to become the next source to
      *               be subscribed to
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybe(Function)
      * @see #concatMapMaybeDelayError(Function, boolean)
@@ -7222,7 +7139,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
      *                   {@code Observable} is delayed until the current inner
      *                   {@code MaybeSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapMaybe(Function, int)
      * @see #concatMapMaybeDelayError(Function, boolean, int)
@@ -7258,7 +7175,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
      *                   it emitted to the downstream.
      * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code MaybeSource} terminates.
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapMaybe(Function, int)
@@ -7288,7 +7205,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingleDelayError(Function)
      * @see #concatMapSingle(Function, int)
@@ -7318,7 +7235,7 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
      *               be subscribed to
      * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code SingleSource} terminates.
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapSingle(Function)
@@ -7349,7 +7266,7 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
      * @param mapper the function called with the upstream item and should return
      *               a {@code SingleSource} to become the next source to
      *               be subscribed to
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingle(Function)
      * @see #concatMapSingleDelayError(Function, boolean)
@@ -7383,7 +7300,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
      *                   {@code Observable} is delayed until the current inner
      *                   {@code SingleSource} terminates and only then is
      *                   it emitted to the downstream.
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see #concatMapSingle(Function, int)
      * @see #concatMapSingleDelayError(Function, boolean, int)
@@ -7419,7 +7336,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
      *                   it emitted to the downstream.
      * @param bufferSize The number of upstream items expected to be buffered so that fresh items are
      *                 ready to be mapped when a previous {@code SingleSource} terminates.
-     * @return a new {@code Observable} instance
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see #concatMapSingle(Function, int)
@@ -7446,8 +7363,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
      *
      * @param other
      *            an {@code ObservableSource} to be concatenated after the current
-     * @return an {@code Observable} that emits items emitted by the two source {@code ObservableSource}s, one after the other,
-     *         without interleaving them
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -7540,8 +7456,7 @@ public final Observable<T> concatWith(@NonNull CompletableSource other) {
      *
      * @param element
      *            the item to search for in the emissions from the current {@code Observable}
-     * @return a {@code Single} that emits {@code true} if the specified item is emitted by the current {@code Observable},
-     *         or {@code false} if the current {@code Observable} completes without emitting that item
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code element} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
@@ -7563,8 +7478,7 @@ public final Single<Boolean> contains(@NonNull Object element) {
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a single item: the number of items emitted by the current {@code Observable} as a
-     *         64-bit {@code Long} item
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/count.html">ReactiveX operators documentation: Count</a>
      */
     @CheckReturnValue
@@ -7597,8 +7511,7 @@ public final Single<Long> count() {
      *            the debounce value type (ignored)
      * @param debounceSelector
      *            function to return a sequence that indicates the throttle duration for each item via its own emission or completion
-     * @return an {@code Observable} that omits items emitted by the current {@code Observable} that are followed by another item
-     *         within a computed debounce duration
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code debounceSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      */
@@ -7637,8 +7550,7 @@ public final <U> Observable<T> debounce(@NonNull Function<? super T, ? extends O
      *            resulting {@code Observable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return an {@code Observable} that filters out items from the current {@code Observable} that are too quickly followed by
-     *         newer items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see #throttleWithTimeout(long, TimeUnit)
@@ -7679,8 +7591,7 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit) {
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return an {@code Observable} that filters out items from the current {@code Observable} that are too quickly followed by
-     *         newer items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see #throttleWithTimeout(long, TimeUnit, Scheduler)
@@ -7706,8 +7617,7 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNu
      *
      * @param defaultItem
      *            the item to emit if the current {@code Observable} emits no items
-     * @return an {@code Observable} that emits either the specified default item if the current {@code Observable} emits no
-     *         items, or the items emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/defaultifempty.html">ReactiveX operators documentation: DefaultIfEmpty</a>
      */
@@ -7738,8 +7648,7 @@ public final Observable<T> defaultIfEmpty(@NonNull T defaultItem) {
      *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}, which is
      *            then used to delay the emission of that item by the resulting {@code Observable} until the {@code ObservableSource}
      *            returned from {@code itemDelay} emits an item
-     * @return an {@code Observable} that delays the emissions of the current {@code Observable} via another {@code ObservableSource} on a
-     *         per-item basis
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code itemDelay} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -7765,7 +7674,7 @@ public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends Obse
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return the current {@code Observable} shifted in time by the specified delay
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      * @see #delay(long, TimeUnit, boolean)
@@ -7795,7 +7704,7 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit) {
      * @param delayError
      *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
      *            if {@code false}, the upstream exception is signaled immediately
-     * @return the current {@code Observable} shifted in time by the specified delay
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      * @see #delay(long, TimeUnit, Scheduler, boolean)
@@ -7823,7 +7732,7 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, boolean del
      *            the time unit of {@code delay}
      * @param scheduler
      *            the {@code Scheduler} to use for delaying
-     * @return the current {@code Observable} shifted in time by the specified delay
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -7853,7 +7762,7 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sc
      * @param delayError
      *            if {@code true}, the upstream exception is signaled with the given delay, after all preceding normal elements,
      *            if {@code false}, the upstream exception is signaled immediately
-     * @return the current {@code Observable} shifted in time by the specified delay
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -7891,8 +7800,7 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sc
      *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}, which is
      *            then used to delay the emission of that item by the resulting {@code Observable} until the {@code ObservableSource}
      *            returned from {@code itemDelay} emits an item
-     * @return an {@code Observable} that delays the subscription and emissions of the current {@code Observable} via another
-     *         {@code ObservableSource} on a per-item basis
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code subscriptionDelay} or {@code itemDelay} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -7917,8 +7825,7 @@ public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptio
      * @param <U> the value type of the other {@code Observable}, irrelevant
      * @param other the other {@code ObservableSource} that should trigger the subscription
      *        to the current {@code Observable}.
-     * @return an {@code Observable} that delays the subscription to the current {@code Observable}
-     *         until the other {@code ObservableSource} emits an element or completes normally.
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @since 2.0
      */
@@ -7943,7 +7850,7 @@ public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> ot
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
-     * @return an {@code Observable} that delays the subscription to the current {@code Observable} by the given amount
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -7970,8 +7877,7 @@ public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit)
      *            the time unit of {@code delay}
      * @param scheduler
      *            the {@code Scheduler} on which the waiting and subscription will happen
-     * @return an {@code Observable} that delays the subscription to the current {@code Observable} by a given
-     *         amount, waiting and subscribing on the given {@code Scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
@@ -8024,8 +7930,7 @@ public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit,
      * @param <R> the output value type
      * @param selector function that returns the upstream item and should return a {@code Notification} to signal
      * the corresponding {@code Observer} event to the downstream.
-     * @return an {@code Observable} that emits the items and notifications embedded in the {@code Notification} objects
-     *         selected from the items emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Dematerialize</a>
      * @since 3.0.0
@@ -8063,8 +7968,7 @@ public final <R> Observable<R> dematerialize(@NonNull Function<? super T, Notifi
      *  <dd>{@code distinct} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that emits only those items emitted by the current {@code Observable} that are distinct from
-     *         each other
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function)
      * @see #distinct(Function, Supplier)
@@ -8106,7 +8010,7 @@ public final Observable<T> distinct() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return an {@code Observable} that emits those items emitted by the current {@code Observable} that have distinct keys
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinct(Function, Supplier)
@@ -8140,7 +8044,7 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
      * @param collectionSupplier
      *            function called for each individual {@link Observer} to return a {@link Collection} subtype for holding the extracted
      *            keys and whose {@code add()} method's return indicates uniqueness.
-     * @return an {@code Observable} that emits those items emitted by the current {@code Observable} that have distinct keys
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code keySelector} or {@code collectionSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
@@ -8179,8 +8083,7 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
      *  <dd>{@code distinctUntilChanged} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that emits those items from the current {@code Observable} that are distinct from their
-     *         immediate predecessors
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @see #distinctUntilChanged(BiPredicate)
      */
@@ -8223,8 +8126,7 @@ public final Observable<T> distinctUntilChanged() {
      * @param keySelector
      *            a function that projects an emitted item to a key value that is used to decide whether an item
      *            is distinct from another one or not
-     * @return an {@code Observable} that emits those items from the current {@code Observable} whose keys are distinct from
-     *         those of their immediate predecessors
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      */
@@ -8258,8 +8160,7 @@ public final <K> Observable<T> distinctUntilChanged(@NonNull Function<? super T,
      *
      * @param comparer the function that receives the previous item and the current item and is
      *                   expected to return {@code true} if the two are equal, thus skipping the current value.
-     * @return an {@code Observable} that emits those items from the current {@code Observable} that are distinct from their
-     *         immediate predecessors
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code comparer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/distinct.html">ReactiveX operators documentation: Distinct</a>
      * @since 2.0
@@ -8311,8 +8212,7 @@ public final Observable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext)
      *
      * @param onAfterTerminate
      *            an {@code Action} to be invoked after the current {@code Observable} finishes
-     * @return an {@code Observable} that emits the same items as the current {@code Observable}, then invokes the
-     *         {@code Action}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doOnTerminate(Action)
@@ -8371,7 +8271,7 @@ public final Observable<T> doFinally(@NonNull Action onFinally) {
      *
      * @param onDispose
      *            the action that gets called when the current {@code Observable}'s {@link Disposable} is disposed
-     * @return the current {@code Observable} modified so as to call this {@code Action} when appropriate
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onDispose} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -8393,7 +8293,7 @@ public final Observable<T> doOnDispose(@NonNull Action onDispose) {
      *
      * @param onComplete
      *            the action to invoke when the current {@code Observable} calls {@code onComplete}
-     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -8414,7 +8314,7 @@ public final Observable<T> doOnComplete(@NonNull Action onComplete) {
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onNext}, {@code onError}, {@code onComplete} or {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -8441,7 +8341,7 @@ private Observable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Con
      *
      * @param onNotification
      *            the action to invoke for each item emitted by the current {@code Observable}
-     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onNotification} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -8476,7 +8376,7 @@ public final Observable<T> doOnEach(@NonNull Consumer<? super Notification<T>> o
      * @param observer
      *            the observer to be notified about {@code onNext}, {@code onError} and {@code onComplete} events on its
      *            respective methods before the actual downstream {@code Observer} gets notified.
-     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code observer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -8507,7 +8407,7 @@ public final Observable<T> doOnEach(@NonNull Observer<? super T> observer) {
      *
      * @param onError
      *            the action to invoke if the current {@code Observable} calls {@code onError}
-     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onError} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -8532,7 +8432,7 @@ public final Observable<T> doOnError(@NonNull Consumer<? super Throwable> onErro
      *              a {@link Consumer} called with the {@link Disposable} sent via {@link Observer#onSubscribe(Disposable)}
      * @param onDispose
      *              called when the downstream disposes the {@code Disposable} via {@code dispose()}
-     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onSubscribe} or {@code onDispose} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -8556,7 +8456,7 @@ public final Observable<T> doOnLifecycle(@NonNull Consumer<? super Disposable> o
      *
      * @param onNext
      *            the action to invoke when the current {@code Observable} calls {@code onNext}
-     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -8581,7 +8481,7 @@ public final Observable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
      *
      * @param onSubscribe
      *            the {@code Consumer} that gets called when an {@code Observer} subscribes to the current {@code Observable}
-     * @return the current {@code Observable} modified so as to call this {@code Consumer} whenever it gets subscribed
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      */
@@ -8607,7 +8507,7 @@ public final Observable<T> doOnSubscribe(@NonNull Consumer<? super Disposable> o
      *
      * @param onTerminate
      *            the action to invoke when the current {@code Observable} calls {@code onComplete} or {@code onError}
-     * @return the current {@code Observable} with the side-effecting behavior applied
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
      * @see #doAfterTerminate(Action)
@@ -8634,8 +8534,7 @@ public final Observable<T> doOnTerminate(@NonNull Action onTerminate) {
      *
      * @param index
      *            the zero-based index of the item to retrieve
-     * @return a {@code Maybe} that emits a single item: the item at the specified position in the sequence of
-     *         those emitted by the current {@code Observable}
+     * @return the new {@code Maybe} instance
      * @throws IndexOutOfBoundsException
      *             if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
@@ -8664,8 +8563,7 @@ public final Maybe<T> elementAt(long index) {
      *            the zero-based index of the item to retrieve
      * @param defaultItem
      *            the default item
-     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the current
-     *         {@code Observable}, or the default item if that index is outside the bounds of the source sequence
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @throws IndexOutOfBoundsException
      *             if {@code index} is negative
@@ -8694,8 +8592,7 @@ public final Single<T> elementAt(long index, @NonNull T defaultItem) {
      *
      * @param index
      *            the zero-based index of the item to retrieve
-     * @return a {@code Single} that emits the item at the specified position in the sequence emitted by the current
-     *         {@code Observable}, or the default item if that index is outside the bounds of the source sequence
+     * @return the new {@code Single} instance
      * @throws IndexOutOfBoundsException
      *             if {@code index} is negative
      * @see <a href="http://reactivex.io/documentation/operators/elementat.html">ReactiveX operators documentation: ElementAt</a>
@@ -8722,8 +8619,7 @@ public final Single<T> elementAtOrError(long index) {
      * @param predicate
      *            a function that evaluates each item emitted by the current {@code Observable}, returning {@code true}
      *            if it passes the filter
-     * @return an {@code Observable} that emits only those items emitted by the current {@code Observable} that the filter
-     *         evaluates as {@code true}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
@@ -8813,9 +8709,7 @@ public final Single<T> firstOrError() {
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
      *            {@code ObservableSource}
-     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
-     *         transformation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -8844,9 +8738,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
-     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
-     *         transformation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -8878,9 +8770,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
-     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
-     *         transformation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -8916,9 +8806,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @param bufferSize
      *            the number of elements expected from each inner {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
-     *         transformation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -8963,8 +8851,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * @param onCompleteSupplier
      *            a function that returns an {@code ObservableSource} to merge for an {@code onComplete} notification from the current
      *            {@code Observable}
-     * @return an {@code Observable} that emits the results of merging the {@code ObservableSource}s returned from applying the
-     *         specified functions to the emissions and notifications of the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onNextMapper} or {@code onErrorMapper} or {@code onCompleteSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -9004,8 +8891,7 @@ public final <R> Observable<R> flatMap(
      *            {@code Observable}
      * @param maxConcurrency
      *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
-     * @return an {@code Observable} that emits the results of merging the {@code ObservableSource}s returned from applying the
-     *         specified functions to the emissions and notifications of the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onNextMapper} or {@code onErrorMapper} or {@code onCompleteSupplier} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -9043,9 +8929,7 @@ public final <R> Observable<R> flatMap(
      *            {@code ObservableSource}
      * @param maxConcurrency
      *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
-     * @return an {@code Observable} that emits the result of applying the transformation function to each item emitted
-     *         by the current {@code Observable} and merging the results of the {@code ObservableSource}s obtained from this
-     *         transformation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -9077,8 +8961,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * @param combiner
      *            a function that combines one item emitted by each of the source and collection {@code ObservableSource}s and
      *            returns an item to be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Observable} and the inner {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -9112,8 +8995,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
-     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Observable} and the inner {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
@@ -9150,8 +9032,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * @param delayErrors
      *            if {@code true}, exceptions from the current {@code Observable} and all inner {@code ObservableSource}s are delayed until all of them terminate
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
-     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Observable} and the inner {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -9192,8 +9073,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @param bufferSize
      *            the number of elements expected from the inner {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Observable} and the inner {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -9231,8 +9111,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      *            returns an item to be emitted by the resulting {@code Observable}
      * @param maxConcurrency
      *         the maximum number of {@code ObservableSource}s that may be subscribed to concurrently
-     * @return an {@code Observable} that emits the results of applying a function to a pair of values emitted by the
-     *         current {@code Observable} and the inner {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -9590,9 +9469,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      *            a function that extracts the key for each item
      * @param <K>
      *            the key type
-     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Observable} that share that
-     *         key value
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
@@ -9637,9 +9514,7 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
      * @param delayError
      *            if {@code true}, the exception from the current {@code Observable} is delayed in each group until that specific group emitted
      *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
-     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Observable} that share that
-     *         key value
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
@@ -9685,9 +9560,7 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
      *            the key type
      * @param <V>
      *            the element type
-     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Observable} that share that
-     *         key value
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
@@ -9736,9 +9609,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * @param delayError
      *            if {@code true}, the exception from the current {@code Observable} is delayed in each group until that specific group emitted
      *            the normal values; if {@code false}, the exception bypasses values in the groups and is reported immediately.
-     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Observable} that share that
-     *         key value
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
      */
@@ -9789,9 +9660,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      *            the key type
      * @param <V>
      *            the element type
-     * @return an {@code Observable} that emits {@code GroupedObservable}s, each of which corresponds to a
-     *         unique key value and each of which emits those items from the current {@code Observable} that share that
-     *         key value
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/groupby.html">ReactiveX operators documentation: GroupBy</a>
@@ -9836,8 +9705,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * @param resultSelector
      *            a function that takes an item emitted by each {@code ObservableSource} and returns the value to be emitted
      *            by the resulting {@code Observable}
-     * @return an {@code Observable} that emits items based on combining those items emitted by the current {@code Observable}s
-     *         whose durations overlap
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other}, {@code leftEnd}, {@code rightEnd} or {@code resultSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
@@ -9912,7 +9780,7 @@ public final Completable ignoreElements() {
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a {@link Boolean}
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
@@ -9949,8 +9817,7 @@ public final Single<Boolean> isEmpty() {
      * @param resultSelector
      *            a function that computes an item to be emitted by the resulting {@code Observable} for any two
      *            overlapping items emitted by the two {@code ObservableSource}s
-     * @return an {@code Observable} that emits items correlating to items emitted by the current {@code Observable}s that have
-     *         overlapping durations
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other}, {@code leftEnd}, {@code rightEnd} or {@code resultSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/join.html">ReactiveX operators documentation: Join</a>
      */
@@ -9981,8 +9848,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> join(
      *  <dd>{@code lastElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Maybe} that emits the last item from the current {@code Observable} or notifies observers of an
-     *         error
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
     @CheckReturnValue
@@ -10004,8 +9870,7 @@ public final Maybe<T> lastElement() {
      *
      * @param defaultItem
      *            the default item to emit if the current {@code Observable} is empty
-     * @return a {@code Single} that emits only the last item emitted by the current {@code Observable}, or a default item
-     *         if the current {@code Observable} is empty
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code defaultItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
@@ -10027,8 +9892,7 @@ public final Single<T> last(@NonNull T defaultItem) {
      *  <dd>{@code lastOrError} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits only the last item emitted by the current {@code Observable}.
-     *         If the current {@code Observable} completes without emitting any items a {@code NoSuchElementException} will be thrown.
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/last.html">ReactiveX operators documentation: Last</a>
      */
     @CheckReturnValue
@@ -10202,8 +10066,7 @@ public final <R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? s
      * @param <R> the output type
      * @param mapper
      *            a function to apply to each item emitted by the current {@code Observable}
-     * @return an {@code Observable} that emits the items from the current {@code Observable}, transformed by the specified
-     *         function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
      */
@@ -10225,8 +10088,7 @@ public final <R> Observable<R> map(@NonNull Function<? super T, ? extends R> map
      *  <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that emits items that are the result of materializing the items and notifications
-     *         of the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/materialize-dematerialize.html">ReactiveX operators documentation: Materialize</a>
      * @see #dematerialize(Function)
      */
@@ -10251,7 +10113,7 @@ public final Observable<Notification<T>> materialize() {
      *
      * @param other
      *            an {@code ObservableSource} to be merged
-     * @return an {@code Observable} that emits all of the items emitted by the current {@code Observable}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -10359,8 +10221,7 @@ public final Observable<T> mergeWith(@NonNull CompletableSource other) {
      *
      * @param scheduler
      *            the {@code Scheduler} to notify {@link Observer}s on
-     * @return the current {@code Observable} modified so that its {@code Observer}s are notified on the specified
-     *         {@code Scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -10399,8 +10260,7 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler) {
      *            indicates if the {@code onError} notification may not cut ahead of {@code onNext} notification on the other side of the
      *            scheduling boundary. If {@code true}, a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from the current {@code Observable}
-     * @return the current {@code Observable} modified so that its {@code Observer}s are notified on the specified
-     *         {@code Scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -10440,8 +10300,7 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delay
      *            scheduling boundary. If {@code true} a sequence ending in {@code onError} will be replayed in the same order as was received
      *            from upstream
      * @param bufferSize the size of the buffer.
-     * @return the current {@code Observable} modified so that its {@code Observer}s are notified on the specified
-     *         {@code Scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/observeon.html">ReactiveX operators documentation: ObserveOn</a>
@@ -10472,7 +10331,7 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delay
      * @param <U> the output type
      * @param clazz
      *            the class type to filter the items emitted by the current {@code Observable}
-     * @return an {@code Observable} that emits items from the current {@code Observable} of type {@code clazz}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
      */
@@ -10510,7 +10369,7 @@ public final <U> Observable<U> ofType(@NonNull Class<U> clazz) {
      * @param resumeFunction
      *            a function that returns an {@code ObservableSource} that will take over if the current {@code Observable} encounters
      *            an error
-     * @return the original {@code ObservableSource}, with appropriately modified behavior
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code resumeFunction} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
@@ -10548,7 +10407,7 @@ public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable
      * @param next
      *            the next {@code ObservableSource} source that will take over if the current {@code Observable} encounters
      *            an error
-     * @return the original {@code ObservableSource}, with appropriately modified behavior
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code next} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
@@ -10583,7 +10442,7 @@ public final Observable<T> onErrorResumeWith(@NonNull ObservableSource<? extends
      * @param valueSupplier
      *            a function that returns a single value that will be emitted along with a regular {@code onComplete} in case
      *            the current {@code Observable} signals an {@code onError} event
-     * @return the original {@code ObservableSource} with appropriately modified behavior
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code valueSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
@@ -10617,7 +10476,7 @@ public final Observable<T> onErrorReturn(@NonNull Function<? super Throwable, ?
      * @param item
      *            the value that is emitted along with a regular {@code onComplete} in case the current
      *            {@code Observable} signals an exception
-     * @return the original {@code ObservableSource} with appropriately modified behavior
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
@@ -10638,7 +10497,7 @@ public final Observable<T> onErrorReturnItem(@NonNull T item) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return an {@code Observable} which {@code null}s out references to the upstream producer and downstream {@code Observer} if
+     * @return the new {@code Observable} instance
      * the sequence is terminated or downstream calls {@code dispose()}
      * @since 2.0
      */
@@ -10660,8 +10519,7 @@ public final Observable<T> onTerminateDetach() {
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code ConnectableObservable} that upon connection causes the current {@code Observable} to emit items
-     *         to its {@code Observer}s
+     * @return the new {@code ConnectableObservable} instance
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
     @CheckReturnValue
@@ -10687,8 +10545,7 @@ public final ConnectableObservable<T> publish() {
      *            a function that can use the multicasted source sequence as many times as needed, without
      *            causing multiple subscriptions to the source sequence. {@link Observer}s to the given source will
      *            receive all notifications of the source from the time of the subscription forward.
-     * @return an {@code Observable} that emits the results of invoking the selector on the items
-     *         emitted by a {@code ConnectableObservable} that shares a single subscription to the underlying sequence
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/publish.html">ReactiveX operators documentation: Publish</a>
      */
@@ -10723,8 +10580,7 @@ public final <R> Observable<R> publish(@NonNull Function<? super Observable<T>,
      * @param reducer
      *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, whose
      *            result will be used in the next accumulator call
-     * @return a {@code Maybe} that emits a single item that is the result of accumulating the items emitted by
-     *         the current {@code Observable}
+     * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
@@ -10781,8 +10637,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * @param reducer
      *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, the
      *            result of which will be used in the next accumulator call
-     * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the current {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code seed} or {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
@@ -10824,8 +10679,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * @param reducer
      *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, the
      *            result of which will be used in the next accumulator call
-     * @return a {@code Single} that emits a single item that is the result of accumulating the output from the
-     *         items emitted by the current {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code seedSupplier} or {@code reducer} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      * @see <a href="http://en.wikipedia.org/wiki/Fold_(higher-order_function)">Wikipedia: Fold (higher-order function)</a>
@@ -10848,7 +10702,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      *  <dd>{@code repeat} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} repeatedly and in sequence
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
      */
     @CheckReturnValue
@@ -10871,8 +10725,7 @@ public final Observable<T> repeat() {
      * @param times
      *            the number of times the current {@code Observable} items are repeated, a count of 0 will yield an empty
      *            sequence
-     * @return an {@code Observable} that repeats the sequence of items emitted by the current {@code Observable} at most
-     *         {@code count} times
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException
      *             if {@code times} is negative
      * @see <a href="http://reactivex.io/documentation/operators/repeat.html">ReactiveX operators documentation: Repeat</a>
@@ -10957,8 +10810,7 @@ public final Observable<T> repeatWhen(@NonNull Function<? super Observable<Objec
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code ConnectableObservable} that upon connection causes the current {@code Observable} to emit its
-     *         items to its {@code Observer}s
+     * @return the new {@code ConnectableObservable} instance
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
     @CheckReturnValue
@@ -10983,8 +10835,7 @@ public final ConnectableObservable<T> replay() {
      * @param selector
      *            the selector function, which can use the multicasted sequence as many times as needed, without
      *            causing multiple subscriptions to the current {@code Observable}
-     * @return an {@code Observable} that emits items that are the results of invoking the selector on a
-     *         {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -11017,9 +10868,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      *            causing multiple subscriptions to the current {@code Observable}
      * @param bufferSize
      *            the buffer size that limits the number of items the connectable {@code Observable} can replay
-     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}
-     *         replaying no more than {@code bufferSize} items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -11058,9 +10907,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}
-     *         replaying no more than {@code bufferSize} items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -11099,10 +10946,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}, and
-     *         replays no more than {@code bufferSize} items that were emitted within the window defined by
-     *         {@code time}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector} or {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -11141,10 +10985,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that is the time source for the window
-     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}, and
-     *         replays no more than {@code bufferSize} items that were emitted within the window defined by
-     *         {@code time}
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException
      *             if {@code bufferSize} is non-positive
      * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
@@ -11194,10 +11035,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable}, and
-     *         replays no more than {@code bufferSize} items that were emitted within the window defined by
-     *         {@code time}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code bufferSize} is non-positive
@@ -11235,9 +11073,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable},
-     *         replaying all items that were emitted within the window defined by {@code time}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -11270,9 +11106,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is the time source for the window
-     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable},
-     *         replaying all items that were emitted within the window defined by {@code time}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(Function, long, TimeUnit, Scheduler, boolean)
@@ -11312,9 +11146,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return an {@code Observable} that emits items that are the results of invoking the selector on items emitted by
-     *         a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable},
-     *         replaying all items that were emitted within the window defined by {@code time}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code selector}, {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -11347,8 +11179,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      *
      * @param bufferSize
      *            the buffer size that limits the number of items that can be replayed
-     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
-     *         replays at most {@code bufferSize} items emitted by the current {@code Observable}
+     * @return the new {@code ConnectableObservable} instance
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(int, boolean)
@@ -11382,8 +11213,7 @@ public final ConnectableObservable<T> replay(int bufferSize) {
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
-     *         replays at most {@code bufferSize} items emitted by the current {@code Observable}
+     * @return the new {@code ConnectableObservable} instance
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -11418,9 +11248,7 @@ public final ConnectableObservable<T> replay(int bufferSize, boolean eagerTrunca
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
-     *         replays at most {@code bufferSize} items that were emitted during the window defined by
-     *         {@code time}
+     * @return the new {@code ConnectableObservable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
@@ -11458,9 +11286,7 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is used as a time source for the window
-     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
-     *         replays at most {@code bufferSize} items that were emitted during the window defined by
-     *         {@code time}
+     * @return the new {@code ConnectableObservable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code bufferSize} is non-positive
@@ -11502,9 +11328,7 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler that is used as a time source for the window
-     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
-     *         replays at most {@code bufferSize} items that were emitted during the window defined by
-     *         {@code time}
+     * @return the new {@code ConnectableObservable} instance
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
@@ -11539,8 +11363,7 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
      *            the duration of the window in which the replayed items must have been emitted
      * @param unit
      *            the time unit of {@code time}
-     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
-     *         replays the items that were emitted during the window defined by {@code time}
+     * @return the new {@code ConnectableObservable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -11572,8 +11395,7 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit)
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that is the time source for the window
-     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
-     *         replays the items that were emitted during the window defined by {@code time}
+     * @return the new {@code ConnectableObservable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      * @see #replay(long, TimeUnit, Scheduler, boolean)
@@ -11611,8 +11433,7 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit,
      * @param eagerTruncate
      *            if {@code true}, whenever the internal buffer is truncated to the given bufferSize/age, the
      *            oldest item will be guaranteed dereferenced, thus avoiding unexpected retention
-     * @return a {@code ConnectableObservable} that shares a single subscription to the current {@code Observable} and
-     *         replays the items that were emitted during the window defined by {@code time}
+     * @return the new {@code ConnectableObservable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/replay.html">ReactiveX operators documentation: Replay</a>
      */
@@ -11643,7 +11464,7 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit,
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return the current {@code Observable} modified with retry logic
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
     @CheckReturnValue
@@ -11666,7 +11487,7 @@ public final Observable<T> retry() {
      * @param predicate
      *            the predicate that determines if a resubscription may happen in case of a specific exception
      *            and retry count
-     * @return the current {@code Observable} modified with retry logic
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see #retry()
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
@@ -11701,7 +11522,7 @@ public final Observable<T> retry(@NonNull BiPredicate<? super Integer, ? super T
      *
      * @param times
      *            the number of times to resubscribe if the current {@code Observable} fails
-     * @return the current {@code Observable} modified with retry logic
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException if {@code times} is negative
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
@@ -11848,7 +11669,7 @@ public final Observable<T> retryUntil(@NonNull BooleanSupplier stop) {
      * @param handler
      *            receives an {@code Observable} of notifications with which a user can complete or error, aborting the
      *            retry
-     * @return the current {@code Observable} modified with retry logic
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code handler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/retry.html">ReactiveX operators documentation: Retry</a>
      */
@@ -11898,8 +11719,7 @@ public final void safeSubscribe(@NonNull Observer<? super T> observer) {
      *            the sampling rate
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} at
-     *         the specified time interval
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit)
@@ -11926,12 +11746,11 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit) {
      *            the sampling rate
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
-     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} at
-     *         the specified time interval
      * @param emitLast
      *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit)
@@ -11960,8 +11779,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, boolean e
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param scheduler
      *            the {@code Scheduler} to use when sampling
-     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} at
-     *         the specified time interval
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit, Scheduler)
@@ -11997,8 +11815,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
      *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
-     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} at
-     *         the specified time interval
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit, Scheduler)
@@ -12027,8 +11844,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
      * @param <U> the element type of the sampler {@code ObservableSource}
      * @param sampler
      *            the {@code ObservableSource} to use for sampling the current {@code Observable}
-     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} whenever
-     *         the {@code sampler} {@code ObservableSource} emits an item or completes
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sampler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      */
@@ -12060,8 +11876,7 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler) {
      *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
-     * @return an {@code Observable} that emits the results of sampling the items emitted by the current {@code Observable} whenever
-     *         the {@code sampler} {@code ObservableSource} emits an item or completes
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sampler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @since 2.1
@@ -12092,7 +11907,7 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler, bool
      *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, whose
      *            result will be emitted to {@link Observer}s via {@link Observer#onNext onNext} and used in the
      *            next accumulator call
-     * @return an {@code Observable} that emits the results of each call to the accumulator function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
@@ -12142,8 +11957,7 @@ public final Observable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, whose
      *            result will be emitted to {@link Observer}s via {@link Observer#onNext onNext} and used in the
      *            next accumulator call
-     * @return an {@code Observable} that emits {@code initialValue} followed by the results of each call to the
-     *         accumulator function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code initialValue} or {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
@@ -12179,8 +11993,7 @@ public final <R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction
      *            an accumulator function to be invoked on each item emitted by the current {@code Observable}, whose
      *            result will be emitted to {@code Observer}s via {@link Observer#onNext onNext} and used in the
      *            next accumulator call
-     * @return an {@code Observable} that emits {@code initialValue} followed by the results of each call to the
-     *         accumulator function
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code seedSupplier} or {@code accumulator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/scan.html">ReactiveX operators documentation: Scan</a>
      */
@@ -12209,8 +12022,7 @@ public final <R> Observable<R> scanWith(@NonNull Supplier<R> seedSupplier, @NonN
      *  <dd>{@code serialize} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that is guaranteed to be well-behaved and to make only serialized calls to
-     *         its observers
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/serialize.html">ReactiveX operators documentation: Serialize</a>
      */
     @CheckReturnValue
@@ -12233,8 +12045,7 @@ public final Observable<T> serialize() {
      *  <dd>{@code share} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that upon connection causes the current {@code Observable} to emit items
-     *         to its {@code Observer}s
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/refcount.html">ReactiveX operators documentation: RefCount</a>
      */
     @CheckReturnValue
@@ -12255,7 +12066,7 @@ public final Observable<T> share() {
      *  <dd>{@code singleElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Maybe} that emits the single item emitted by the current {@code Observable}
+     * @return the new {@code Maybe} instance
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX operators documentation: First</a>
      */
     @CheckReturnValue
@@ -12324,8 +12135,7 @@ public final Single<T> singleOrError() {
      *
      * @param count
      *            the number of items to skip
-     * @return an {@code Observable} that is identical to the current {@code Observable} except that it does not emit the first
-     *         {@code count} items that the current {@code Observable} emits
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
@@ -12357,8 +12167,7 @@ public final Observable<T> skip(long count) {
      *            the length of the time window to skip
      * @param unit
      *            the time unit of {@code time}
-     * @return an {@code Observable} that skips values emitted by the current {@code Observable} before the time window defined
-     *         by {@code time} elapses and the emits the remainder
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
@@ -12385,8 +12194,7 @@ public final Observable<T> skip(long time, @NonNull TimeUnit unit) {
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} on which the timed wait happens
-     * @return an {@code Observable} that skips values emitted by the current {@code Observable} before the time window defined
-     *         by {@code time} and {@code scheduler} elapses, and then emits the remainder
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skip.html">ReactiveX operators documentation: Skip</a>
      */
@@ -12413,8 +12221,7 @@ public final Observable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Sche
      *
      * @param count
      *            number of items to drop from the end of the source sequence
-     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} except for the dropped ones
-     *         at the end
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException
      *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
@@ -12449,8 +12256,7 @@ public final Observable<T> skipLast(int count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
-     *         source completes defined by {@code time}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -12481,8 +12287,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit) {
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
-     *         source completes defined by {@code time}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -12511,8 +12316,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, boolean d
      *            the time unit of {@code time}
      * @param scheduler
      *            the scheduler used as the time source
-     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
-     *         source completes defined by {@code time} and {@code scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -12544,8 +12348,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
-     *         source completes defined by {@code time} and {@code scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
      */
@@ -12579,8 +12382,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be skipped
-     * @return an {@code Observable} that drops those items emitted by the current {@code Observable} in a time window before the
-     *         source completes defined by {@code time} and {@code scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/skiplast.html">ReactiveX operators documentation: SkipLast</a>
@@ -12611,8 +12413,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
      * @param other
      *            the second {@code ObservableSource} that has to emit an item before the current {@code Observable}'s elements begin
      *            to be mirrored by the resulting {@code Observable}
-     * @return an {@code Observable} that skips items from the current {@code Observable} until the second {@code ObservableSource} emits an
-     *         item, then emits the remaining items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skipuntil.html">ReactiveX operators documentation: SkipUntil</a>
      */
@@ -12636,8 +12437,7 @@ public final <U> Observable<T> skipUntil(@NonNull ObservableSource<U> other) {
      *
      * @param predicate
      *            a function to test each item emitted from the current {@code Observable}
-     * @return an {@code Observable} that begins emitting items emitted by the current {@code Observable} when the specified
-     *         predicate becomes {@code false}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/skipwhile.html">ReactiveX operators documentation: SkipWhile</a>
      */
@@ -12667,7 +12467,7 @@ public final Observable<T> skipWhile(@NonNull Predicate<? super T> predicate) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sorted} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} in sorted order
+     * @return the new {@code Observable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -12692,7 +12492,7 @@ public final Observable<T> sorted() {
      *            a function that compares two items emitted by the current {@code Observable} and returns an {@code int}
      *            that indicates their sort order
      * @throws NullPointerException if {@code sortFunction} is {@code null}
-     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} in sorted order
+     * @return the new {@code Observable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -12714,8 +12514,7 @@ public final Observable<T> sorted(@NonNull Comparator<? super T> sortFunction) {
      *
      * @param items
      *            an {@code Iterable} that contains the items you want the resulting {@code Observable} to emit first
-     * @return an {@code Observable} that emits the items in the specified {@code Iterable} and then emits the items
-     *         emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @since 3.0.0
@@ -12741,8 +12540,7 @@ public final Observable<T> startWithIterable(@NonNull Iterable<@NonNull ? extend
      *
      * @param other
      *            an {@code ObservableSource} that contains the items you want the modified {@code ObservableSource} to emit first
-     * @return an {@code Observable} that emits the items in the specified {@code ObservableSource} and then emits the items
-     *         emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      */
@@ -12766,8 +12564,7 @@ public final Observable<T> startWith(@NonNull ObservableSource<? extends T> othe
      *
      * @param item
      *            the item to emit first
-     * @return an {@code Observable} that emits the specified item before it begins to emit items emitted by the current
-     *         {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithArray(Object...)
@@ -12793,8 +12590,7 @@ public final Observable<T> startWithItem(@NonNull T item) {
      *
      * @param items
      *            the array of values to emit first
-     * @return an {@code Observable} that emits the specified items before it begins to emit items emitted by the current
-     *         {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code items} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/startwith.html">ReactiveX operators documentation: StartWith</a>
      * @see #startWithItem(Object)
@@ -12823,8 +12619,7 @@ public final Observable<T> startWithArray(@NonNull T... items) {
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the current {@code Observable} has finished sending them
+     * @return the new {@link Disposable} instance that can be used to dispose the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -12846,8 +12641,7 @@ public final Disposable subscribe() {
      *
      * @param onNext
      *             the {@code Consumer<T>} you have designed to accept emissions from the current {@code Observable}
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the current {@code Observable} has finished sending them
+     * @return the new {@link Disposable} instance that can be used to dispose the subscription at any time
      * @throws NullPointerException
      *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
@@ -12872,8 +12666,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
      * @param onError
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the current
      *             {@code Observable}
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the current {@code Observable} has finished sending them
+     * @return the new {@link Disposable} instance that can be used to dispose the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onNext} or {@code onError} is {@code null}
@@ -12901,8 +12694,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
      * @param onComplete
      *             the {@link Action} you have designed to accept a completion notification from the current
      *             {@code Observable}
-     * @return a {@link Disposable} reference with which the caller can stop receiving items before
-     *         the current {@code Observable} has finished sending them
+     * @return the new {@link Disposable} instance that can be used to dispose the subscription at any time
      * @throws NullPointerException
      *             if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
@@ -13000,8 +12792,7 @@ public final void subscribe(@NonNull Observer<? super T> observer) {
      *
      * @param scheduler
      *            the {@code Scheduler} to perform subscription actions on
-     * @return the current {@code Observable} modified so that its subscriptions happen on the
-     *         specified {@code Scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribeon.html">ReactiveX operators documentation: SubscribeOn</a>
      * @see <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a>
@@ -13027,8 +12818,7 @@ public final Observable<T> subscribeOn(@NonNull Scheduler scheduler) {
      *
      * @param other
      *              the alternate {@code ObservableSource} to subscribe to if the source does not emit any items
-     * @return  an {@code Observable} that emits the items emitted by the current {@code Observable} or the items of an
-     *          alternate {@code ObservableSource} if the current {@code Observable} is empty.
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @since 1.1.0
      */
@@ -13058,7 +12848,7 @@ public final Observable<T> switchIfEmpty(@NonNull ObservableSource<? extends T>
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
      *            {@code ObservableSource}
-     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} returned from applying {@code mapper} to the most recently emitted item emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapDelayError(Function)
@@ -13090,7 +12880,7 @@ public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends
      *            {@code ObservableSource}
      * @param bufferSize
      *            the number of elements expected from the current active inner {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} returned from applying {@code mapper} to the most recently emitted item emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -13284,7 +13074,7 @@ public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? supe
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Observable}, returns a
      *            {@code SingleSource}
-     * @return an {@code Observable} that emits the item emitted by the {@code SingleSource} returned from applying {@code mapper} to the most recently emitted item emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapSingleDelayError(Function)
@@ -13317,8 +13107,7 @@ public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? ex
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Observable}, returns a
      *            {@code SingleSource}
-     * @return an {@code Observable} that emits the item emitted by the {@code SingleSource} returned from applying {@code mapper}
-     *         to the most recently emitted item emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMapSingle(Function)
@@ -13351,8 +13140,7 @@ public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? sup
      * @param mapper
      *            a function that, when applied to an item emitted by the current {@code Observable}, returns an
      *            {@code ObservableSource}
-     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} returned from applying {@code mapper}
-     *         to the most recently emitted item emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @see #switchMap(Function)
@@ -13386,7 +13174,7 @@ public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T,
      *            {@code ObservableSource}
      * @param bufferSize
      *            the number of elements expected from the current active inner {@code ObservableSource} to be buffered
-     * @return an {@code Observable} that emits the items emitted by the {@code ObservableSource} returned from applying {@code mapper} to the most recently emitted item emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
@@ -13430,8 +13218,7 @@ public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T,
      *
      * @param count
      *            the maximum number of items to emit
-     * @return an {@code Observable} that emits only the first {@code count} items emitted by the current {@code Observable}, or
-     *         all of the items from the current {@code Observable} if it emits fewer than {@code count} items
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
@@ -13462,7 +13249,7 @@ public final Observable<T> take(long count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return an {@code Observable} that emits those items emitted by the current {@code Observable} before the time runs out
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
@@ -13492,8 +13279,7 @@ public final Observable<T> take(long time, @NonNull TimeUnit unit) {
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} used for time source
-     * @return an {@code Observable} that emits those items emitted by the current {@code Observable} before the time runs out,
-     *         according to the specified {@code Scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/take.html">ReactiveX operators documentation: Take</a>
      */
@@ -13517,7 +13303,7 @@ public final Observable<T> take(long time, @NonNull TimeUnit unit, @NonNull Sche
      * @param count
      *            the maximum number of items to emit from the end of the sequence of items emitted by the current
      *            {@code Observable}
-     * @return an {@code Observable} that emits at most the last {@code count} items emitted by the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException
      *             if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -13555,8 +13341,7 @@ public final Observable<T> takeLast(int count) {
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return an {@code Observable} that emits at most {@code count} items from the current {@code Observable} that were emitted
-     *         in a specified window of time before the current {@code Observable} completed
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code count} is negative
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -13587,9 +13372,7 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that provides the timestamps for the observed items
-     * @return an {@code Observable} that emits at most {@code count} items from the current {@code Observable} that were emitted
-     *         in a specified window of time before the current {@code Observable} completed, where the timing information is
-     *         provided by the given {@code Scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code count} is negative
@@ -13626,9 +13409,7 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return an {@code Observable} that emits at most {@code count} items from the current {@code Observable} that were emitted
-     *         in a specified window of time before the current {@code Observable} completed, where the timing information is
-     *         provided by the given {@code scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException
      *             if {@code count} is negative or {@code bufferSize} is non-positive
@@ -13662,8 +13443,7 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
      *            the length of the time window
      * @param unit
      *            the time unit of {@code time}
-     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
-     *         time before the current {@code Observable} completed specified by {@code time}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -13692,8 +13472,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit) {
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
-     *         time before the current {@code Observable} completed specified by {@code time}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -13722,9 +13501,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, boolean d
      *            the time unit of {@code time}
      * @param scheduler
      *            the {@code Scheduler} that provides the timestamps for the observed items
-     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
-     *         time before the current {@code Observable} completed specified by {@code time}, where the timing information is
-     *         provided by {@code scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -13755,9 +13532,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      * @param delayError
      *            if {@code true}, an exception signaled by the current {@code Observable} is delayed until the regular elements are consumed
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
-     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
-     *         time before the current {@code Observable} completed specified by {@code time}, where the timing information is
-     *         provided by {@code scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
      */
@@ -13790,9 +13565,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      *            by the downstream; if {@code false}, an exception is immediately signaled and all regular elements dropped
      * @param bufferSize
      *            the hint about how many elements to expect to be last
-     * @return an {@code Observable} that emits the items from the current {@code Observable} that were emitted in the window of
-     *         time before the current {@code Observable} completed specified by {@code time}, where the timing information is
-     *         provided by {@code scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/takelast.html">ReactiveX operators documentation: TakeLast</a>
@@ -13819,7 +13592,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      *            from the current {@code Observable}
      * @param <U>
      *            the type of items emitted by {@code other}
-     * @return an {@code Observable} that emits the items emitted by the current {@code Observable} until such time as {@code other} emits its first item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      */
@@ -13847,8 +13620,7 @@ public final <U> Observable<T> takeUntil(@NonNull ObservableSource<U> other) {
      *
      * @param stopPredicate
      *            a function that evaluates an item emitted by the current {@code Observable} and returns a {@link Boolean}
-     * @return an {@code Observable} that first emits items emitted by the current {@code Observable}, checks the specified
-     *         condition after each item, and then completes when the condition is satisfied.
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code stopPredicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takeuntil.html">ReactiveX operators documentation: TakeUntil</a>
      * @see Observable#takeWhile(Predicate)
@@ -13874,8 +13646,7 @@ public final Observable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate
      *
      * @param predicate
      *            a function that evaluates an item emitted by the current {@code Observable} and returns a {@link Boolean}
-     * @return an {@code Observable} that emits the items from the current {@code Observable} so long as each item satisfies the
-     *         condition defined by {@code predicate}, then completes
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code predicate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/takewhile.html">ReactiveX operators documentation: TakeWhile</a>
      * @see Observable#takeUntil(Predicate)
@@ -13905,7 +13676,7 @@ public final Observable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
      *            time to wait before emitting another item after emitting the last item
      * @param unit
      *            the unit of time of {@code windowDuration}
-     * @return an {@code Observable} that performs the throttle operation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      */
@@ -13936,7 +13707,7 @@ public final Observable<T> throttleFirst(long windowDuration, @NonNull TimeUnit
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
-     * @return an {@code Observable} that performs the throttle operation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      */
@@ -13967,7 +13738,7 @@ public final Observable<T> throttleFirst(long skipDuration, @NonNull TimeUnit un
      *            emitted
      * @param unit
      *            the unit of time of {@code intervalDuration}
-     * @return an {@code Observable} that performs the throttle operation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #sample(long, TimeUnit)
@@ -14000,7 +13771,7 @@ public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
      *            event
-     * @return an {@code Observable} that performs the throttle operation
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #sample(long, TimeUnit, Scheduler)
@@ -14168,8 +13939,7 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
      *            resulting {@code Observable}
      * @param unit
      *            the unit of time for the specified {@code timeout}
-     * @return an {@code Observable} that filters out items from the current {@code Observable} that are too quickly followed by
-     *         newer items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see #debounce(long, TimeUnit)
@@ -14204,8 +13974,7 @@ public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit u
      * @param scheduler
      *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
      *            item
-     * @return an {@code Observable} that filters out items from the current {@code Observable} that are too quickly followed by
-     *         newer items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see #debounce(long, TimeUnit, Scheduler)
@@ -14228,7 +13997,7 @@ public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit u
      *  from the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that emits time interval information items
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
     @CheckReturnValue
@@ -14251,7 +14020,7 @@ public final Observable<Timed<T>> timeInterval() {
      *
      * @param scheduler
      *            the {@code Scheduler} used to compute time intervals
-     * @return an {@code Observable} that emits time interval information items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
@@ -14274,7 +14043,7 @@ public final Observable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param unit the time unit for the current time
-     * @return an {@code Observable} that emits time interval information items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
@@ -14299,7 +14068,7 @@ public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
      * @param unit the time unit for the current time
      * @param scheduler
      *            the {@code Scheduler} used to compute time intervals
-     * @return an {@code Observable} that emits time interval information items
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeinterval.html">ReactiveX operators documentation: TimeInterval</a>
      */
@@ -14331,9 +14100,7 @@ public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull
      * @param itemTimeoutIndicator
      *            a function that returns an {@code ObservableSource} for each item emitted by the current
      *            {@code Observable} and that determines the timeout window for the subsequent item
-     * @return an {@code Observable} that mirrors the current {@code Observable}, but notifies observers of a
-     *         {@code TimeoutException} if an item emitted by the current {@code Observable} takes longer to arrive than
-     *         the time window defined by the selector for the previously emitted item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code itemTimeoutIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -14365,9 +14132,7 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
      *            determines the timeout window for the subsequent item
      * @param other
      *            the fallback {@code ObservableSource} to switch to if the current {@code Observable} times out
-     * @return an {@code Observable} that mirrors the current {@code Observable}, but switches to mirroring a fallback {@code ObservableSource}
-     *         if an item emitted by the current {@code Observable} takes longer to arrive than the time window defined
-     *         by the selector for the previously emitted item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code itemTimeoutIndicator} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -14395,8 +14160,7 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
      *            maximum duration between emitted items before a timeout occurs
      * @param unit
      *            the unit of time that applies to the {@code timeout} argument.
-     * @return the current {@code Observable} modified to notify observers of a {@code TimeoutException} in case of a
-     *         timeout
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -14425,7 +14189,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit) {
      *            the unit of time that applies to the {@code timeout} argument
      * @param other
      *            the fallback {@code ObservableSource} to use in case of a timeout
-     * @return the current {@code Observable} modified to switch to the fallback {@code ObservableSource} in case of a timeout
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -14457,8 +14221,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNul
      *            the {@code Scheduler} to run the timeout timers on
      * @param other
      *            the {@code ObservableSource} to use as the fallback in case of a timeout
-     * @return the current {@code Observable} modified so that it will switch to the fallback {@code ObservableSource} in case of a
-     *         timeout
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -14488,8 +14251,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNul
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
      *            the {@code Scheduler} to run the timeout timers on
-     * @return the current {@code Observable} modified to notify observers of a {@code TimeoutException} in case of a
-     *         timeout
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -14522,9 +14284,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNul
      *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
-     * @return an {@code Observable} that mirrors the current {@code Observable}, but notifies observers of a
-     *         {@code TimeoutException} if either the first item or any subsequent item doesn't arrive within
-     *         the time windows specified by the timeout selectors
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code firstTimeoutIndicator} or {@code itemTimeoutIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
@@ -14561,9 +14321,7 @@ public final <U, V> Observable<T> timeout(@NonNull ObservableSource<U> firstTime
      *            continue the sequence
      * @param other
      *            the fallback {@code ObservableSource} to switch to if the current {@code Observable} times out
-     * @return an {@code Observable} that mirrors the current {@code Observable}, but switches to the {@code other} {@code ObservableSource} if
-     *         either the first item emitted by the current {@code Observable} or any subsequent item doesn't arrive
-     *         within time windows defined by the timeout selectors
+     * @return the new {@code Observable} instance
      * @throws NullPointerException
      *             if {@code firstTimeoutIndicator}, {@code itemTimeoutIndicator} or {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
@@ -14609,7 +14367,7 @@ private <U, V> Observable<T> timeout0(
      *  from the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that emits timestamped items from the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
     @CheckReturnValue
@@ -14632,8 +14390,7 @@ public final Observable<Timed<T>> timestamp() {
      *
      * @param scheduler
      *            the {@code Scheduler} to use as a time source
-     * @return an {@code Observable} that emits timestamped items from the current {@code Observable} with timestamps provided by
-     *         the {@code scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
@@ -14656,7 +14413,7 @@ public final Observable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
      * </dl>
      *
      * @param unit the time unit for the current time
-     * @return an {@code Observable} that emits timestamped items from the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
@@ -14681,8 +14438,7 @@ public final Observable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
      * @param unit the time unit for the current time
      * @param scheduler
      *            the {@code Scheduler} to use as a time source
-     * @return an {@code Observable} that emits timestamped items from the current {@code Observable} with timestamps provided by
-     *         the {@code scheduler}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timestamp.html">ReactiveX operators documentation: Timestamp</a>
      */
@@ -14737,8 +14493,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      *  <dd>{@code toList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Single} that emits a single item: a {@code List} containing all of the items emitted by the current
-     *         {@code Observable}
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
     @CheckReturnValue
@@ -14770,8 +14525,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      *
      * @param capacityHint
      *         the number of elements expected from the current {@code Observable}
-     * @return a {@code Single} that emits a single item: a {@code List} containing all of the items emitted by the current
-     *         {@code Observable}
+     * @return the new {@code Single} instance
      * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -14806,8 +14560,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      * @param <U> the subclass of a collection of Ts
      * @param collectionSupplier
      *               the {@link Supplier} returning the collection (for each individual {@code Observer}) to be filled in
-     * @return a {@code Single} that emits a single item: a {@code Collection} (subclass) containing all of the items emitted by the current
-     *         {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code collectionSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -14839,8 +14592,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      * @param <K> the key type of the Map
      * @param keySelector
      *            the function that extracts the key from a source item to be used in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the current
-     *         {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -14875,8 +14627,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      *            the function that extracts the key from a source item to be used in the {@code HashMap}
      * @param valueSelector
      *            the function that extracts the value from a source item to be used in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} containing the mapped items from the current
-     *         {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -14913,8 +14664,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      *            the function that extracts the value from the source items to be used as value in the {@code Map}
      * @param mapSupplier
      *            the function that returns a {@code Map} instance to be used
-     * @return a {@code Single} that emits a single item: a {@code Map} (subclass) that contains the mapped items emitted by the
-     *         current {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code mapSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -14948,8 +14698,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      * @param <K> the key type of the {@code HashMap}
      * @param keySelector
      *            the function that extracts the key from the source items to be used as key in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
-     *         the current {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -14984,8 +14733,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      *            the function that extracts a key from the source items to be used as key in the {@code HashMap}
      * @param valueSelector
      *            the function that extracts a value from the source items to be used as value in the {@code HashMap}
-     * @return a {@code Single} that emits a single item: a {@code HashMap} that contains an {@code ArrayList} of items mapped from
-     *         the current {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector} or {@code valueSelector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -15023,8 +14771,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      *            the function that returns a {@code Map} instance to be used
      * @param collectionFactory
      *            the function that returns a {@code Collection} instance for a particular key to be used in the {@code Map}
-     * @return a {@code Single} that emits a single item: a {@code Map} that contains the {@code Collection} of mapped items from
-     *         the current {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector}, {@code valueSelector}, {@code mapSupplier} or {@code collectionFactory} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -15066,8 +14813,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      *            the function that extracts a value from the source items to be used as the value in the {@code Map}
      * @param mapSupplier
      *            the function that returns a {@code Map} instance to be used
-     * @return a {@code Single} that emits a single item: a {@code Map} that contains an {@code ArrayList} items mapped from the current
-     *         {@code Observable}
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code keySelector}, {@code valueSelector} or {@code mapSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -15159,8 +14905,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSortedList} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a {@code Single} that emits a list that contains the items emitted by the current {@code Observable} in
-     *         sorted order
+     * @return the new {@code Single} instance
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      * @see #toSortedList(int)
      * @see #toSortedList(Comparator)
@@ -15189,8 +14934,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
      * @param comparator
      *            a function that compares two items emitted by the current {@code Observable} and returns an {@code int}
      *            that indicates their sort order
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Observable} in
-     *         sorted order
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code comparator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      */
@@ -15221,8 +14965,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
      *            that indicates their sort order
      * @param capacityHint
      *             the initial capacity of the {@code List} used to accumulate items before sorting
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Observable} in
-     *         sorted order
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code comparator} is {@code null}
      * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
@@ -15257,8 +15000,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
      *
      * @param capacityHint
      *             the initial capacity of the {@code List} used to accumulate items before sorting
-     * @return a {@code Single} that emits a {@code List} that contains the items emitted by the current {@code Observable} in
-     *         sorted order
+     * @return the new {@code Single} instance
      * @throws IllegalArgumentException if {@code capacityHint} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX operators documentation: To</a>
      * @since 2.0
@@ -15309,8 +15051,7 @@ public final Observable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      *
      * @param count
      *            the maximum size of each window before it should be emitted
-     * @return an {@code Observable} that emits connected, non-overlapping windows, each containing at most
-     *         {@code count} items from the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -15338,8 +15079,7 @@ public final Observable<Observable<T>> window(long count) {
      * @param skip
      *            how many items need to be skipped before starting a new window. Note that if {@code skip} and
      *            {@code count} are equal this is the same operation as {@link #window(long)}.
-     * @return an {@code Observable} that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException if {@code count} or {@code skip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -15369,8 +15109,7 @@ public final Observable<Observable<T>> window(long count, long skip) {
      *            {@code count} are equal this is the same operation as {@link #window(long)}.
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an {@code Observable} that emits windows every {@code skip} items containing at most {@code count} items
-     *         from the current {@code Observable}
+     * @return the new {@code Observable} instance
      * @throws IllegalArgumentException if {@code count}, {@code skip} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -15408,7 +15147,7 @@ public final Observable<Observable<T>> window(long count, long skip, int bufferS
      *            the period of time after which a new window will be created
      * @param unit
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
-     * @return an {@code Observable} that emits new windows periodically as a fixed timespan elapses
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code timespan} or {@code timeskip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15446,7 +15185,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      *            the unit of time that applies to the {@code timespan} and {@code timeskip} arguments
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a window
-     * @return an {@code Observable} that emits new windows periodically as a fixed timespan elapses
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code timespan} or {@code timeskip} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15486,7 +15225,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      *            the {@code Scheduler} to use when determining the end and start of a window
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an {@code Observable} that emits new windows periodically as a fixed timespan elapses
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code timespan}, {@code timeskip} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15525,8 +15264,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      *            new window
      * @param unit
      *            the unit of time that applies to the {@code timespan} argument
-     * @return an {@code Observable} that emits connected, non-overlapping windows representing items emitted by the
-     *         current {@code Observable} during fixed, consecutive durations
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -15562,9 +15300,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      *            the unit of time that applies to the {@code timespan} argument
      * @param count
      *            the maximum size of each window before it should be emitted
-     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15604,9 +15340,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      *            the maximum size of each window before it should be emitted
      * @param restart
      *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
-     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15643,8 +15377,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      *            the unit of time which applies to the {@code timespan} argument
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a window
-     * @return an {@code Observable} that emits connected, non-overlapping windows containing items emitted by the
-     *         current {@code Observable} within a fixed duration
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -15683,9 +15416,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      *            the maximum size of each window before it should be emitted
      * @param scheduler
      *            the {@code Scheduler} to use when determining the end and start of a window
-     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15727,9 +15458,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      *            the {@code Scheduler} to use when determining the end and start of a window
      * @param restart
      *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
-     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code count} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15773,9 +15502,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      *            if {@code true}, when a window reaches the capacity limit, the timer is restarted as well
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an {@code Observable} that emits connected, non-overlapping windows of items from the current {@code Observable}
-     *         that were emitted during a fixed duration of time or when the window has reached maximum capacity
-     *         (whichever occurs first)
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code count} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15813,9 +15540,7 @@ public final Observable<Observable<T>> window(
      *            the window element type (ignored)
      * @param boundary
      *            an {@code ObservableSource} whose emitted items close and open windows
-     * @return an {@code Observable} that emits non-overlapping windows of items it collects from the current {@code Observable}
-     *         where the boundary of each window is determined by the items emitted from the {@code boundary}
-     *         {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code boundary} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -15848,9 +15573,7 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
      *            an {@code ObservableSource} whose emitted items close and open windows
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an {@code Observable} that emits non-overlapping windows of items it collects from the current {@code Observable}
-     *         where the boundary of each window is determined by the items emitted from the {@code boundary}
-     *         {@code ObservableSource}
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code boundary} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15888,8 +15611,7 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
      * @param closingIndicator
      *            a {@link Function} that produces an {@code ObservableSource} for every window created. When this indicator {@code ObservableSource}
      *            emits an item, the associated window is completed
-     * @return an {@code Observable} that emits windows of items emitted by the current {@code Observable} that are governed by
-     *         the specified window-governing {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
@@ -15928,8 +15650,7 @@ public final <U, V> Observable<Observable<T>> window(
      *            emits an item, the associated window is completed
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
-     * @return an {@code Observable} that emits windows of items emitted by the current {@code Observable} that are governed by
-     *         the specified window-governing {@code ObservableSource}s
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code openingIndicator} or {@code closingIndicator} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
@@ -15964,9 +15685,7 @@ public final <U, V> Observable<Observable<T>> window(
      * @param combiner
      *            the function to call when the current {@code Observable} emits an item and the other {@code ObservableSource} has already
      *            emitted an item, to generate the item to be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that merges the specified {@code ObservableSource} into the current {@code Observable} by using the
-     *         {@code resultSelector} function only when the current {@code Observable} sequence (this instance) emits an
-     *         item
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} or {@code combiner} is {@code null}
      * @since 2.0
      * @see <a href="http://reactivex.io/documentation/operators/combinelatest.html">ReactiveX operators documentation: CombineLatest</a>
@@ -16191,8 +15910,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<@NonNull ? exten
      * @param zipper
      *            a function that combines the pairs of items from the current {@code Observable} and the {@code Iterable} to generate
      *            the items to be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that pairs up values from the current {@code Observable} and the {@code other} {@code Iterable}
-     *         sequence and emits the results of {@code zipFunction} applied to these pairs
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -16236,8 +15954,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<@NonNull ? exten
      * @param zipper
      *            a function that combines the pairs of items from the current {@code Observable} and the other {@code ObservableSource} to generate the items to
      *            be emitted by the resulting {@code Observable}
-     * @return an {@code Observable} that pairs up values from the current {@code Observable} and the {@code other} {@code ObservableSource}
-     *         and emits the results of {@code zipFunction} applied to these pairs
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      */
@@ -16283,8 +16000,7 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
      *            be emitted by the resulting {@code Observable}
      * @param delayError
      *            if {@code true}, errors from the current {@code Observable} or the other {@code ObservableSource} is delayed until both terminate
-     * @return an {@code Observable} that pairs up values from the current {@code Observable} and the {@code other} {@code ObservableSource}
-     *         and emits the results of {@code zipFunction} applied to these pairs
+     * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      * @since 2.0
@@ -16332,8 +16048,7 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
      *            the capacity hint for the buffer in the inner windows
      * @param delayError
      *            if {@code true}, errors from the current {@code Observable} or the other {@code ObservableSource} is delayed until both terminate
-     * @return an {@code Observable} that pairs up values from the current {@code Observable} and the {@code other} {@code ObservableSource}
-     *         and emits the results of {@code zipFunction} applied to these pairs
+     * @return the new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/zip.html">ReactiveX operators documentation: Zip</a>
      * @throws NullPointerException if {@code other} or {@code zipper} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 4b22be8dcf..eb90b83fcb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -294,7 +294,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Singl
      *            a {@code SingleSource} to be concatenated
      * @param source2
      *            a {@code SingleSource} to be concatenated
-     * @return a {@code Flowable} that emits items emitted by the two source {@code SingleSource}s, one after the other.
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -328,7 +328,7 @@ public static <T> Flowable<T> concat(
      *            a {@code SingleSource} to be concatenated
      * @param source3
      *            a {@code SingleSource} to be concatenated
-     * @return a {@code Flowable} that emits items emitted by the three source {@code SingleSource}s, one after the other.
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2} or {@code source3} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -366,7 +366,7 @@ public static <T> Flowable<T> concat(
      *            a {@code SingleSource} to be concatenated
      * @param source4
      *            a {@code SingleSource} to be concatenated
-     * @return a {@code Flowable} that emits items emitted by the four source {@code SingleSource}s, one after the other.
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code source1}, {@code source2}, {@code source3} or {@code source4} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/concat.html">ReactiveX operators documentation: Concat</a>
      */
@@ -1517,7 +1517,7 @@ public static <T, U> Single<T> using(
      * </dl>
      * @param <T> the value type
      * @param source the source to wrap
-     * @return the {@code Single} wrapper or the source cast to {@code Single} (if possible)
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
@@ -2101,7 +2101,7 @@ public final Single<T> hide() {
      *
      * @param <R> the value type of the single returned by the transformer function
      * @param transformer the transformer function, not {@code null}
-     * @return a {@code Single} wrapped and returned by the transformer function
+     * @return the new {@code Single} instance
      * @throws NullPointerException if {@code transformer} is {@code null}
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Implementing-Your-Own-Operators">RxJava wiki: Implementing Your Own Operators</a>
      */
@@ -3206,7 +3206,7 @@ public final Single<Boolean> contains(@NonNull Object value, @NonNull BiPredicat
      *
      * @param other
      *            a {@code SingleSource} to be merged
-     * @return  that emits all of the items emitted by the current {@code Single}s
+     * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code other} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
@@ -3665,7 +3665,7 @@ public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>,
      * <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@link Disposable} reference can request the {@link Single} stop work.
+     * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3687,7 +3687,7 @@ public final Disposable subscribe() {
      * @param onCallback
      *            the callback that receives either the success value or the failure {@link Throwable}
      *            (whichever is not {@code null})
-     * @return a {@link Disposable} reference can request the {@link Single} stop work.
+     * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onCallback} is {@code null}
@@ -3718,7 +3718,7 @@ public final Disposable subscribe(@NonNull BiConsumer<? super T, ? super Throwab
      *
      * @param onSuccess
      *            the {@code Consumer<T>} you have designed to accept the emission from the {@code Single}
-     * @return a {@link Disposable} reference can request the {@link Single} stop work.
+     * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @throws NullPointerException
      *             if {@code onSuccess} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
@@ -3745,7 +3745,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
      * @param onError
      *            the {@code Consumer<Throwable>} you have designed to accept any error notification from the
      *            {@code Single}
-     * @return a {@link Disposable} reference can request the {@link Single} stop work.
+     * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onSuccess} or {@code onError} is {@code null}
@@ -4074,8 +4074,7 @@ public final <R> R to(@NonNull SingleConverter<T, ? extends R> converter) {
      * <dd>{@code ignoreElement} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Completable} that signals {@code onComplete} on it's observer when the current {@code Single}
-     *         calls {@code onSuccess}.
+     * @return the new {@code Completable} instance
      * @since 2.1.13
      */
     @CheckReturnValue
@@ -4096,7 +4095,7 @@ public final Completable ignoreElement() {
      * <dd>{@code toFlowable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Flowable} that emits a single item T or an error.
+     * @return the new {@code Flowable} instance
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
@@ -4119,7 +4118,7 @@ public final Flowable<T> toFlowable() {
      *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Future} that expects a single item to be emitted by this {@code Single}
+     * @return the new {@code Future} instance
      * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
      */
     @CheckReturnValue
@@ -4138,7 +4137,7 @@ public final Future<T> toFuture() {
      * <dd>{@code toMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a {@code Maybe} that emits a single item or an error.
+     * @return the new {@code Maybe} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4159,7 +4158,7 @@ public final Maybe<T> toMaybe() {
      * <dd>{@code toObservable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an {@code Observable} that emits a single item or an error.
+     * @return the new {@code Observable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index 0fb07bac37..403f69b1a0 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -103,7 +103,7 @@ protected final boolean validate(@NonNull Subscriber<@NonNull ?>[] subscribers)
      * </dl>
      * @param <T> the value type
      * @param source the source {@code Publisher}
-     * @return the {@code ParallelFlowable} instance
+     * @return the new {@code ParallelFlowable} instance
      * @throws NullPointerException if {@code source} is {@code null}
      */
     @CheckReturnValue
@@ -1140,7 +1140,7 @@ public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U>
      *  requests {@link Flowable#bufferSize()} amount from each rail upfront
      *  and keeps requesting as many items per rail as many inner sources on
      *  that rail completed. The inner sources are requested {@link Flowable#bufferSize()}
-     *  amount upfront, then 75% of this amount requested after 75% received.
+     *  amount upfront, then 75% of this amount requested after 75% received.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index 1528568e7e..42ea23dd1d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -45,7 +45,7 @@ public static void main(String[] args) throws IOException {
         Map<Class<?>, Set<String>> operatorMap = new HashMap<>();
 
         for (Class<?> clazz : CLASSES) {
-            Set<String> set = operatorMap.computeIfAbsent(clazz, c -> new HashSet<String>());
+            Set<String> set = operatorMap.computeIfAbsent(clazz, c -> new HashSet<>());
 
             for (Method m : clazz.getMethods()) {
                 String name = m.getName();
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index a20245d10b..d351e7809d 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -207,8 +207,11 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                         break;
                     }
                 }
+
+                checkAtReturnAndSignatureMatch("Maybe", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable", "Disposable", "Iterable", "Stream", "Future", "CompletionStage");
+
                 aOrAn(e, m, "Maybe");
-                missingClosingDD(e, m, "Maybe");
+                missingClosingDD(e, m, "Maybe", "io.reactivex.rxjava3.core");
                 backpressureMentionedWithoutAnnotation(e, m, "Maybe");
             }
         }
@@ -347,10 +350,10 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                     }
                 }
 
-                checkAtReturnAndSignatureMatch("Flowable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable");
+                checkAtReturnAndSignatureMatch("Flowable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable", "ConnectableFlowable", "ParallelFlowable", "Disposable", "Iterable", "Stream", "Future", "CompletionStage");
 
                 aOrAn(e, m, "Flowable");
-                missingClosingDD(e, m, "Flowable");
+                missingClosingDD(e, m, "Flowable", "io.reactivex.rxjava3.core");
                 backpressureMentionedWithoutAnnotation(e, m, "Flowable");
             }
         }
@@ -362,6 +365,148 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
         }
     }
 
+    @Test
+    public void parallelFlowableDocRefersToCorrectTypes() throws Exception {
+        List<RxMethod> list = BaseTypeParser.parse(TestHelper.findSource("ParallelFlowable", "io.reactivex.rxjava3.parallel"), "ParallelFlowable");
+
+        assertFalse(list.isEmpty());
+
+        StringBuilder e = new StringBuilder();
+
+        for (RxMethod m : list) {
+            int jdx;
+            if (m.javadoc != null) {
+                jdx = 0;
+                for (;;) {
+                    int idx = m.javadoc.indexOf("onSuccess", jdx);
+                    if (idx >= 0) {
+                        if (!m.signature.contains("Maybe")
+                                && !m.signature.contains("MaybeSource")
+                                && !m.signature.contains("Single")
+                                && !m.signature.contains("SingleSource")) {
+                            e.append("java.lang.RuntimeException: Flowable doc mentions onSuccess\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+
+                        jdx = idx + 6;
+                    } else {
+                        break;
+                    }
+                }
+                jdx = 0;
+                for (;;) {
+                    int idx = m.javadoc.indexOf(" Observer", jdx);
+                    if (idx >= 0) {
+                        if (!m.signature.contains("ObservableSource")
+                                && !m.signature.contains("Observable")) {
+                            e.append("java.lang.RuntimeException: Flowable doc mentions Observer but not using Observable\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+
+                        jdx = idx + 6;
+                    } else {
+                        break;
+                    }
+                }
+                jdx = 0;
+                for (;;) {
+                    int idx = m.javadoc.indexOf(" SingleObserver", jdx);
+                    if (idx >= 0) {
+                        if (!m.signature.contains("SingleSource")
+                                && !m.signature.contains("Single")) {
+                            e.append("java.lang.RuntimeException: Flowable doc mentions SingleObserver but not using Single\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+
+                        jdx = idx + 6;
+                    } else {
+                        break;
+                    }
+                }
+                jdx = 0;
+                for (;;) {
+                    int idx = m.javadoc.indexOf(" MaybeObserver", jdx);
+                    if (idx >= 0) {
+                        if (!m.signature.contains("MaybeSource")
+                                && !m.signature.contains("Maybe")) {
+                            e.append("java.lang.RuntimeException: Flowable doc mentions MaybeObserver but not using Maybe\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+
+                        jdx = idx + 6;
+                    } else {
+                        break;
+                    }
+                }
+                jdx = 0;
+                for (;;) {
+                    int idx = m.javadoc.indexOf(" Disposable", jdx);
+                    if (idx >= 0) {
+                        if (!m.signature.contains("Observable")
+                                && !m.signature.contains("ObservableSource")
+                                && !m.signature.contains("Single")
+                                && !m.signature.contains("SingleSource")
+                                && !m.signature.contains("Completable")
+                                && !m.signature.contains("CompletableSource")
+                                && !m.signature.contains("Maybe")
+                                && !m.signature.contains("MaybeSource")
+                                && !m.signature.contains("Disposable")
+                        ) {
+                            CharSequence subSequence = m.javadoc.subSequence(idx - 6, idx + 11);
+                            if (idx < 6 || !subSequence.equals("{@link Disposable")) {
+                                e.append("java.lang.RuntimeException: Flowable doc mentions Disposable but not using Flowable\r\n at io.reactivex.rxjava3.core.")
+                                .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            }
+                        }
+
+                        jdx = idx + 6;
+                    } else {
+                        break;
+                    }
+                }
+                jdx = 0;
+                for (;;) {
+                    int idx = m.javadoc.indexOf("Observable", jdx);
+                    if (idx >= 0) {
+                        if (!m.signature.contains("Observable")) {
+                            e.append("java.lang.RuntimeException: Flowable doc mentions Observable but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+
+                        jdx = idx + 6;
+                    } else {
+                        break;
+                    }
+                }
+                jdx = 0;
+                for (;;) {
+                    int idx = m.javadoc.indexOf("ObservableSource", jdx);
+                    if (idx >= 0) {
+                        if (!m.signature.contains("ObservableSource")) {
+                            e.append("java.lang.RuntimeException: Flowable doc mentions ObservableSource but not in the signature\r\n at io.reactivex.rxjava3.core.")
+                            .append("Flowable.method(Flowable.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                        }
+                        jdx = idx + 6;
+                    } else {
+                        break;
+                    }
+                }
+
+                checkAtReturnAndSignatureMatch("ParallelFlowable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable", "ConnectableFlowable", "ParallelFlowable", "Disposable", "Iterable", "Stream", "Future", "CompletionStage");
+
+                aOrAn(e, m, "ParallelFlowable");
+                missingClosingDD(e, m, "ParallelFlowable", "io.reactivex.rxjava3.parallel");
+                backpressureMentionedWithoutAnnotation(e, m, "ParallelFlowable");
+            }
+        }
+
+        if (e.length() != 0) {
+            System.out.println(e);
+
+            fail(e.toString());
+        }
+    }
+
     @Test
     public void observableDocRefersToObservableTypes() throws Exception {
         List<RxMethod> list = BaseTypeParser.parse(TestHelper.findSource("Observable"), "Observable");
@@ -450,10 +595,10 @@ public void observableDocRefersToObservableTypes() throws Exception {
                         break;
                     }
                 }
-                checkAtReturnAndSignatureMatch("Observable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable");
+                checkAtReturnAndSignatureMatch("Observable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable", "ConnectableObservable", "Disposable", "Iterable", "Stream", "Future", "CompletionStage");
 
                 aOrAn(e, m, "Observable");
-                missingClosingDD(e, m, "Observable");
+                missingClosingDD(e, m, "Observable", "io.reactivex.rxjava3.core");
                 backpressureMentionedWithoutAnnotation(e, m, "Observable");
             }
         }
@@ -626,8 +771,10 @@ public void singleDocRefersToSingleTypes() throws Exception {
                     }
                 }
 
+                checkAtReturnAndSignatureMatch("Single", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable", "Disposable", "Iterable", "Stream", "Future", "CompletionStage");
+
                 aOrAn(e, m, "Single");
-                missingClosingDD(e, m, "Single");
+                missingClosingDD(e, m, "Single", "io.reactivex.rxjava3.core");
                 backpressureMentionedWithoutAnnotation(e, m, "Single");
             }
         }
@@ -815,10 +962,10 @@ public void completableDocRefersToCompletableTypes() throws Exception {
                     }
                 }
 
-                checkAtReturnAndSignatureMatch("Completable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable");
+                checkAtReturnAndSignatureMatch("Completable", m, e, "Flowable", "Observable", "Maybe", "Single", "Completable", "Disposable", "Iterable", "Stream", "Future", "CompletionStage");
 
                 aOrAn(e, m, "Completable");
-                missingClosingDD(e, m, "Completable");
+                missingClosingDD(e, m, "Completable", "io.reactivex.rxjava3.core");
                 backpressureMentionedWithoutAnnotation(e, m, "Completable");
             }
         }
@@ -983,7 +1130,7 @@ static void aOrAn(StringBuilder e, RxMethod m, String wrongPre, String word, Str
         }
     }
 
-    static void missingClosingDD(StringBuilder e, RxMethod m, String baseTypeName) {
+    static void missingClosingDD(StringBuilder e, RxMethod m, String baseTypeName, String packageName) {
         int jdx = 0;
         for (;;) {
             int idx1 = m.javadoc.indexOf("<dd>", jdx);
@@ -999,7 +1146,9 @@ static void missingClosingDD(StringBuilder e, RxMethod m, String baseTypeName) {
                 jdx = idx2 + 5;
             } else {
                 e.append("java.lang.RuntimeException: unbalanced <dd></dd> ")
-                .append("\r\n at io.reactivex.rxjava3.core.")
+                .append("\r\n at ")
+                .append(packageName)
+                .append(".")
                 .append(baseTypeName)
                 .append(".method(")
                 .append(baseTypeName)

From 0c84f4017f576bd250e4408d8410f6647507027c Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 21 Jan 2020 14:26:15 +0100
Subject: [PATCH 057/665] 3.x: Fix method argument naming across types (#6853)

* 3.x: Fix method argument naming across types

* Remove outdated null-test of blockingMostRecent
---
 .../reactivex/rxjava3/core/Completable.java   | 152 +++++-----
 .../io/reactivex/rxjava3/core/Flowable.java   | 148 +++++-----
 .../java/io/reactivex/rxjava3/core/Maybe.java | 111 ++++----
 .../io/reactivex/rxjava3/core/Observable.java | 269 +++++++++---------
 .../io/reactivex/rxjava3/core/Single.java     | 154 +++++-----
 .../BlockingFlowableMostRecentTest.java       |   4 -
 .../BlockingObservableMostRecentTest.java     |   4 -
 .../internal/util/OperatorArgumentNaming.java | 169 +++++++++++
 .../ParamValidationCheckerTest.java           |   6 -
 .../validators/ParamValidationNaming.java     |   2 +-
 10 files changed, 591 insertions(+), 428 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/util/OperatorArgumentNaming.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index ee3af955a9..1266255315 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -332,21 +332,21 @@ public static Completable create(@NonNull CompletableOnSubscribe source) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code unsafeCreate} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param source the callback which will receive the {@link CompletableObserver} instances
+     * @param onSubscribe the callback which will receive the {@link CompletableObserver} instances
      * when the {@code Completable} is subscribed to.
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code source} is {@code null}
+     * @throws NullPointerException if {@code onSubscribe} is {@code null}
      * @throws IllegalArgumentException if {@code source} is a {@code Completable}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable unsafeCreate(@NonNull CompletableSource source) {
-        Objects.requireNonNull(source, "source is null");
-        if (source instanceof Completable) {
+    public static Completable unsafeCreate(@NonNull CompletableSource onSubscribe) {
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
+        if (onSubscribe instanceof Completable) {
             throw new IllegalArgumentException("Use of unsafeCreate(Completable)!");
         }
-        return RxJavaPlugins.onAssembly(new CompletableFromUnsafeSource(source));
+        return RxJavaPlugins.onAssembly(new CompletableFromUnsafeSource(onSubscribe));
     }
 
     /**
@@ -357,16 +357,16 @@ public static Completable unsafeCreate(@NonNull CompletableSource source) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code defer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param completableSupplier the supplier that returns the {@code Completable} that will be subscribed to.
+     * @param supplier the supplier that returns the {@code Completable} that will be subscribed to.
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code completableSupplier} is {@code null}
+     * @throws NullPointerException if {@code supplier} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable defer(@NonNull Supplier<? extends CompletableSource> completableSupplier) {
-        Objects.requireNonNull(completableSupplier, "completableSupplier is null");
-        return RxJavaPlugins.onAssembly(new CompletableDefer(completableSupplier));
+    public static Completable defer(@NonNull Supplier<? extends CompletableSource> supplier) {
+        Objects.requireNonNull(supplier, "supplier is null");
+        return RxJavaPlugins.onAssembly(new CompletableDefer(supplier));
     }
 
     /**
@@ -381,16 +381,16 @@ public static Completable defer(@NonNull Supplier<? extends CompletableSource> c
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param errorSupplier the error supplier, not {@code null}
+     * @param supplier the error supplier, not {@code null}
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code errorSupplier} is {@code null}
+     * @throws NullPointerException if {@code supplier} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable error(@NonNull Supplier<? extends Throwable> errorSupplier) {
-        Objects.requireNonNull(errorSupplier, "errorSupplier is null");
-        return RxJavaPlugins.onAssembly(new CompletableErrorSupplier(errorSupplier));
+    public static Completable error(@NonNull Supplier<? extends Throwable> supplier) {
+        Objects.requireNonNull(supplier, "supplier is null");
+        return RxJavaPlugins.onAssembly(new CompletableErrorSupplier(supplier));
     }
 
     /**
@@ -401,16 +401,16 @@ public static Completable error(@NonNull Supplier<? extends Throwable> errorSupp
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param error the {@code Throwable} instance to emit, not {@code null}
+     * @param throwable the {@code Throwable} instance to emit, not {@code null}
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code error} is {@code null}
+     * @throws NullPointerException if {@code throwable} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable error(@NonNull Throwable error) {
-        Objects.requireNonNull(error, "error is null");
-        return RxJavaPlugins.onAssembly(new CompletableError(error));
+    public static Completable error(@NonNull Throwable throwable) {
+        Objects.requireNonNull(throwable, "throwable is null");
+        return RxJavaPlugins.onAssembly(new CompletableError(throwable));
     }
 
     /**
@@ -429,16 +429,16 @@ public static Completable error(@NonNull Throwable error) {
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
      * </dl>
-     * @param run the {@code Action} to run for each subscribing {@link CompletableObserver}
+     * @param action the {@code Action} to run for each subscribing {@link CompletableObserver}
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code run} is {@code null}
+     * @throws NullPointerException if {@code action} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable fromAction(@NonNull Action run) {
-        Objects.requireNonNull(run, "run is null");
-        return RxJavaPlugins.onAssembly(new CompletableFromAction(run));
+    public static Completable fromAction(@NonNull Action action) {
+        Objects.requireNonNull(action, "action is null");
+        return RxJavaPlugins.onAssembly(new CompletableFromAction(action));
     }
 
     /**
@@ -1029,19 +1029,19 @@ private static NullPointerException toNpe(Throwable ex) {
      * </dl>
      * @param <R> the resource type
      * @param resourceSupplier the {@link Supplier} that returns a resource to be managed.
-     * @param completableFunction the {@link Function} that given a resource returns a {@code CompletableSource} instance that will be subscribed to
-     * @param disposer the {@link Consumer} that disposes the resource created by the resource supplier
+     * @param sourceSupplier the {@link Function} that given a resource returns a {@code CompletableSource} instance that will be subscribed to
+     * @param resourceCleanup the {@link Consumer} that disposes the resource created by the resource supplier
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code resourceSupplier}, {@code completableFunction}
-     *                              or {@code disposer} is {@code null}
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier}
+     *                              or {@code resourceCleanup} is {@code null}
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <R> Completable using(@NonNull Supplier<R> resourceSupplier,
-            @NonNull Function<? super R, ? extends CompletableSource> completableFunction,
-            @NonNull Consumer<? super R> disposer) {
-        return using(resourceSupplier, completableFunction, disposer, true);
+            @NonNull Function<? super R, ? extends CompletableSource> sourceSupplier,
+            @NonNull Consumer<? super R> resourceCleanup) {
+        return using(resourceSupplier, sourceSupplier, resourceCleanup, true);
     }
 
     /**
@@ -1059,31 +1059,31 @@ public static <R> Completable using(@NonNull Supplier<R> resourceSupplier,
      * </dl>
      * @param <R> the resource type
      * @param resourceSupplier the {@link Supplier} that returns a resource to be managed
-     * @param completableFunction the {@link Function} that given a resource returns a non-{@code null}
+     * @param sourceSupplier the {@link Function} that given a resource returns a non-{@code null}
      * {@code CompletableSource} instance that will be subscribed to
-     * @param disposer the {@link Consumer} that disposes the resource created by the resource supplier
+     * @param resourceCleanup the {@link Consumer} that disposes the resource created by the resource supplier
      * @param eager
      *            If {@code true} then resource disposal will happen either on a {@code dispose()} call before the upstream is disposed
      *            or just before the emission of a terminal event ({@code onComplete} or {@code onError}).
      *            If {@code false} the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code resourceSupplier}, {@code completableFunction}
-     *                              or {@code disposer} is {@code null}
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier}
+     *                              or {@code resourceCleanup} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <R> Completable using(
             @NonNull Supplier<R> resourceSupplier,
-            @NonNull Function<? super R, ? extends CompletableSource> completableFunction,
-            @NonNull Consumer<? super R> disposer,
+            @NonNull Function<? super R, ? extends CompletableSource> sourceSupplier,
+            @NonNull Consumer<? super R> resourceCleanup,
             boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
-        Objects.requireNonNull(completableFunction, "completableFunction is null");
-        Objects.requireNonNull(disposer, "disposer is null");
+        Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
+        Objects.requireNonNull(resourceCleanup, "resourceCleanup is null");
 
-        return RxJavaPlugins.onAssembly(new CompletableUsing<>(resourceSupplier, completableFunction, disposer, eager));
+        return RxJavaPlugins.onAssembly(new CompletableUsing<>(resourceSupplier, sourceSupplier, resourceCleanup, eager));
     }
 
     /**
@@ -1390,7 +1390,7 @@ public final Completable concatWith(@NonNull CompletableSource other) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code delay} does operate by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
-     * @param delay the delay time
+     * @param time the delay time
      * @param unit the delay unit
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
@@ -1398,8 +1398,8 @@ public final Completable concatWith(@NonNull CompletableSource other) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Completable delay(long delay, @NonNull TimeUnit unit) {
-        return delay(delay, unit, Schedulers.computation(), false);
+    public final Completable delay(long time, @NonNull TimeUnit unit) {
+        return delay(time, unit, Schedulers.computation(), false);
     }
 
     /**
@@ -1411,7 +1411,7 @@ public final Completable delay(long delay, @NonNull TimeUnit unit) {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code delay} operates on the {@code Scheduler} you specify.</dd>
      * </dl>
-     * @param delay the delay time
+     * @param time the delay time
      * @param unit the delay unit
      * @param scheduler the {@code Scheduler} to run the delayed completion on
      * @return the new {@code Completable} instance
@@ -1420,8 +1420,8 @@ public final Completable delay(long delay, @NonNull TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return delay(delay, unit, scheduler, false);
+    public final Completable delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return delay(time, unit, scheduler, false);
     }
 
     /**
@@ -1433,7 +1433,7 @@ public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code delay} operates on the {@code Scheduler} you specify.</dd>
      * </dl>
-     * @param delay the delay time
+     * @param time the delay time
      * @param unit the delay unit
      * @param scheduler the {@code Scheduler} to run the delayed completion on
      * @param delayError delay the error emission as well?
@@ -1443,10 +1443,10 @@ public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
+    public final Completable delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new CompletableDelay(this, delay, unit, scheduler, delayError));
+        return RxJavaPlugins.onAssembly(new CompletableDelay(this, time, unit, scheduler, delayError));
     }
 
     /**
@@ -1459,7 +1459,7 @@ public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      * </dl>
      * <p>History: 2.2.3 - experimental
      *
-     * @param delay the time to delay the subscription
+     * @param time the time to delay the subscription
      * @param unit  the time unit of {@code delay}
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
@@ -1469,8 +1469,8 @@ public final Completable delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Completable delaySubscription(long delay, @NonNull TimeUnit unit) {
-        return delaySubscription(delay, unit, Schedulers.computation());
+    public final Completable delaySubscription(long time, @NonNull TimeUnit unit) {
+        return delaySubscription(time, unit, Schedulers.computation());
     }
 
     /**
@@ -1483,7 +1483,7 @@ public final Completable delaySubscription(long delay, @NonNull TimeUnit unit) {
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      * <p>History: 2.2.3 - experimental
-     * @param delay     the time to delay the subscription
+     * @param time     the time to delay the subscription
      * @param unit      the time unit of {@code delay}
      * @param scheduler the {@code Scheduler} on which the waiting and subscription will happen
      * @return the new {@code Completable} instance
@@ -1494,8 +1494,8 @@ public final Completable delaySubscription(long delay, @NonNull TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Completable delaySubscription(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return Completable.timer(delay, unit, scheduler).andThen(this);
+    public final Completable delaySubscription(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return Completable.timer(time, unit, scheduler).andThen(this);
     }
 
     /**
@@ -1974,17 +1974,17 @@ public final Completable onErrorComplete(@NonNull Predicate<? super Throwable> p
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param errorMapper the {@code mapper} {@code Function} that takes the error and should return a {@code CompletableSource} as
+     * @param fallbackSupplier the {@code mapper} {@code Function} that takes the error and should return a {@code CompletableSource} as
      * continuation.
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code errorMapper} is {@code null}
+     * @throws NullPointerException if {@code fallbackSupplier} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Completable onErrorResumeNext(@NonNull Function<? super Throwable, ? extends CompletableSource> errorMapper) {
-        Objects.requireNonNull(errorMapper, "errorMapper is null");
-        return RxJavaPlugins.onAssembly(new CompletableResumeNext(this, errorMapper));
+    public final Completable onErrorResumeNext(@NonNull Function<? super Throwable, ? extends CompletableSource> fallbackSupplier) {
+        Objects.requireNonNull(fallbackSupplier, "fallbackSupplier is null");
+        return RxJavaPlugins.onAssembly(new CompletableResumeNext(this, fallbackSupplier));
     }
 
     /**
@@ -2544,16 +2544,16 @@ public final Completable timeout(long timeout, @NonNull TimeUnit unit) {
      * </dl>
      * @param timeout the timeout value
      * @param unit the unit of {@code timeout}
-     * @param other the other {@code CompletableSource} instance to switch to in case of a timeout
+     * @param fallback the other {@code CompletableSource} instance to switch to in case of a timeout
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code unit} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code unit} or {@code fallback} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull CompletableSource other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, unit, Schedulers.computation(), other);
+    public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull CompletableSource fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(timeout, unit, Schedulers.computation(), fallback);
     }
 
     /**
@@ -2593,16 +2593,16 @@ public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      * @param timeout the timeout value
      * @param unit the unit of {@code timeout}
      * @param scheduler the {@code Scheduler} to use to wait for completion
-     * @param other the other {@code Completable} instance to switch to in case of a timeout
+     * @param fallback the other {@code Completable} instance to switch to in case of a timeout
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code fallback} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull CompletableSource other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, unit, scheduler, other);
+    public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull CompletableSource fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(timeout, unit, scheduler, fallback);
     }
 
     /**
@@ -2616,18 +2616,18 @@ public final Completable timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      * @param timeout the timeout value
      * @param unit the unit of {@code timeout}
      * @param scheduler the {@code Scheduler} to use to wait for completion
-     * @param other the other {@code Completable} instance to switch to in case of a timeout,
+     * @param fallback the other {@code Completable} instance to switch to in case of a timeout,
      * if {@code null} a {@link TimeoutException} is emitted instead
      * @return the new {@code Completable} instance
-     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code fallback} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    private Completable timeout0(long timeout, TimeUnit unit, Scheduler scheduler, CompletableSource other) {
+    private Completable timeout0(long timeout, TimeUnit unit, Scheduler scheduler, CompletableSource fallback) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new CompletableTimeout(this, timeout, unit, scheduler, other));
+        return RxJavaPlugins.onAssembly(new CompletableTimeout(this, timeout, unit, scheduler, fallback));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 54bc24fca0..038c3f680b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -2178,9 +2178,9 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *  <dd>{@code fromPublisher} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type of the flow
-     * @param source the {@code Publisher} to convert
+     * @param publisher the {@code Publisher} to convert
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if the {@code source} {@code Publisher} is {@code null}
+     * @throws NullPointerException if {@code publisher} is {@code null}
      * @see #create(FlowableOnSubscribe, BackpressureStrategy)
      */
     @CheckReturnValue
@@ -2188,13 +2188,13 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
-    public static <T> Flowable<T> fromPublisher(@NonNull Publisher<@NonNull ? extends T> source) {
-        if (source instanceof Flowable) {
-            return RxJavaPlugins.onAssembly((Flowable<T>)source);
+    public static <T> Flowable<T> fromPublisher(@NonNull Publisher<@NonNull ? extends T> publisher) {
+        if (publisher instanceof Flowable) {
+            return RxJavaPlugins.onAssembly((Flowable<T>)publisher);
         }
-        Objects.requireNonNull(source, "source is null");
+        Objects.requireNonNull(publisher, "publisher is null");
 
-        return RxJavaPlugins.onAssembly(new FlowableFromPublisher<>(source));
+        return RxJavaPlugins.onAssembly(new FlowableFromPublisher<>(publisher));
     }
 
     /**
@@ -4514,10 +4514,10 @@ public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
      *            the factory function to create a resource object that depends on the {@code Publisher}
      * @param sourceSupplier
      *            the factory function to create a {@code Publisher}
-     * @param resourceDisposer
+     * @param resourceCleanup
      *            the function that will dispose of the resource
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceDisposer} is {@code null}
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceCleanup} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -4527,8 +4527,8 @@ public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
     public static <T, D> Flowable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends Publisher<@NonNull ? extends T>> sourceSupplier,
-            @NonNull Consumer<? super D> resourceDisposer) {
-        return using(resourceSupplier, sourceSupplier, resourceDisposer, true);
+            @NonNull Consumer<? super D> resourceCleanup) {
+        return using(resourceSupplier, sourceSupplier, resourceCleanup, true);
     }
 
     /**
@@ -4551,7 +4551,7 @@ public static <T, D> Flowable<T> using(
      *            the factory function to create a resource object that depends on the {@code Publisher}
      * @param sourceSupplier
      *            the factory function to create a {@code Publisher}
-     * @param resourceDisposer
+     * @param resourceCleanup
      *            the function that will dispose of the resource
      * @param eager
      *            If {@code true}, the resource disposal will happen either on a {@code cancel()} call before the upstream is disposed
@@ -4559,7 +4559,7 @@ public static <T, D> Flowable<T> using(
      *            If {@code false} the resource disposal will happen either on a {@code cancel()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceDisposer} is {@code null}
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceCleanup} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      * @since 2.0
      */
@@ -4570,12 +4570,12 @@ public static <T, D> Flowable<T> using(
     public static <T, D> Flowable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends Publisher<@NonNull ? extends T>> sourceSupplier,
-            @NonNull Consumer<? super D> resourceDisposer,
+            @NonNull Consumer<? super D> resourceCleanup,
             boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
-        Objects.requireNonNull(resourceDisposer, "resourceDisposer is null");
-        return RxJavaPlugins.onAssembly(new FlowableUsing<T, D>(resourceSupplier, sourceSupplier, resourceDisposer, eager));
+        Objects.requireNonNull(resourceCleanup, "resourceCleanup is null");
+        return RxJavaPlugins.onAssembly(new FlowableUsing<T, D>(resourceSupplier, sourceSupplier, resourceCleanup, eager));
     }
 
     /**
@@ -5944,6 +5944,7 @@ public final Iterable<T> blockingLatest() {
      *            the initial item that the {@code Iterable} sequence will yield if this
      *            {@code Flowable} has not yet emitted an item
      * @return the new {@code Iterable} instance
+     * @throws NullPointerException if {@code initialItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
@@ -5951,6 +5952,7 @@ public final Iterable<T> blockingLatest() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Iterable<T> blockingMostRecent(@NonNull T initialItem) {
+        Objects.requireNonNull(initialItem, "initialItem is null");
         return new BlockingFlowableMostRecent<>(this, initialItem);
     }
 
@@ -8616,7 +8618,7 @@ public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publis
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
@@ -8628,8 +8630,8 @@ public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publis
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Flowable<T> delay(long delay, @NonNull TimeUnit unit) {
-        return delay(delay, unit, Schedulers.computation(), false);
+    public final Flowable<T> delay(long time, @NonNull TimeUnit unit) {
+        return delay(time, unit, Schedulers.computation(), false);
     }
 
     /**
@@ -8644,7 +8646,7 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit) {
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
@@ -8659,8 +8661,8 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, boolean delayError) {
-        return delay(delay, unit, Schedulers.computation(), delayError);
+    public final Flowable<T> delay(long time, @NonNull TimeUnit unit, boolean delayError) {
+        return delay(time, unit, Schedulers.computation(), delayError);
     }
 
     /**
@@ -8675,7 +8677,7 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, boolean delay
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the time unit of {@code delay}
@@ -8689,8 +8691,8 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, boolean delay
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return delay(delay, unit, scheduler, false);
+    public final Flowable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return delay(time, unit, scheduler, false);
     }
 
     /**
@@ -8705,7 +8707,7 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the time unit of {@code delay}
@@ -8722,11 +8724,11 @@ public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sche
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
+    public final Flowable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
 
-        return RxJavaPlugins.onAssembly(new FlowableDelay<>(this, Math.max(0L, delay), unit, scheduler, delayError));
+        return RxJavaPlugins.onAssembly(new FlowableDelay<>(this, Math.max(0L, time), unit, scheduler, delayError));
     }
 
     /**
@@ -8807,7 +8809,7 @@ public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptio
      *  <dd>This version of {@code delaySubscription} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
@@ -8819,8 +8821,8 @@ public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptio
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
-        return delaySubscription(delay, unit, Schedulers.computation());
+    public final Flowable<T> delaySubscription(long time, @NonNull TimeUnit unit) {
+        return delaySubscription(time, unit, Schedulers.computation());
     }
 
     /**
@@ -8835,7 +8837,7 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
@@ -8849,8 +8851,8 @@ public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Flowable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return delaySubscription(timer(delay, unit, scheduler));
+    public final Flowable<T> delaySubscription(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return delaySubscription(timer(time, unit, scheduler));
     }
 
     /**
@@ -12334,20 +12336,20 @@ public final Flowable<T> onBackpressureLatest() {
      *  <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param resumeFunction
+     * @param fallbackSupplier
      *            a function that returns a {@code Publisher} that will take over if the current {@code Flowable} encounters
      *            an error
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if {@code resumeFunction} is {@code null}
+     * @throws NullPointerException if {@code fallbackSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends Publisher<@NonNull ? extends T>> resumeFunction) {
-        Objects.requireNonNull(resumeFunction, "resumeFunction is null");
-        return RxJavaPlugins.onAssembly(new FlowableOnErrorNext<>(this, resumeFunction));
+    public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends Publisher<@NonNull ? extends T>> fallbackSupplier) {
+        Objects.requireNonNull(fallbackSupplier, "fallbackSupplier is null");
+        return RxJavaPlugins.onAssembly(new FlowableOnErrorNext<>(this, fallbackSupplier));
     }
 
     /**
@@ -12379,20 +12381,20 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
      *  <dd>{@code onErrorResumeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param next
+     * @param fallback
      *            the next {@code Publisher} source that will take over if the current {@code Flowable} encounters
      *            an error
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if {@code next} is {@code null}
+     * @throws NullPointerException if {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorResumeWith(@NonNull Publisher<@NonNull ? extends T> next) {
-        Objects.requireNonNull(next, "next is null");
-        return onErrorResumeNext(Functions.justFunction(next));
+    public final Flowable<T> onErrorResumeWith(@NonNull Publisher<@NonNull ? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return onErrorResumeNext(Functions.justFunction(fallback));
     }
 
     /**
@@ -12420,20 +12422,20 @@ public final Flowable<T> onErrorResumeWith(@NonNull Publisher<@NonNull ? extends
      *  <dd>{@code onErrorReturn} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param valueSupplier
+     * @param itemSupplier
      *            a function that returns a single value that will be emitted along with a regular {@code onComplete} in case
      *            the current {@code Flowable} signals an {@code onError} event
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if {@code valueSupplier} is {@code null}
+     * @throws NullPointerException if {@code itemSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> valueSupplier) {
-        Objects.requireNonNull(valueSupplier, "valueSupplier is null");
-        return RxJavaPlugins.onAssembly(new FlowableOnErrorReturn<>(this, valueSupplier));
+    public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> itemSupplier) {
+        Objects.requireNonNull(itemSupplier, "itemSupplier is null");
+        return RxJavaPlugins.onAssembly(new FlowableOnErrorReturn<>(this, itemSupplier));
     }
 
     /**
@@ -16918,19 +16920,19 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      * @param itemTimeoutIndicator
      *            a function that returns a {@code Publisher}, for each item emitted by the current {@code Flowable}, that
      *            determines the timeout window for the subsequent item
-     * @param other
+     * @param fallback
      *            the fallback {@code Publisher} to switch to if the current {@code Flowable} times out
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if {@code itemTimeoutIndicator} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code itemTimeoutIndicator} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publisher<@NonNull V>> itemTimeoutIndicator, @NonNull Publisher<@NonNull ? extends T> other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(null, itemTimeoutIndicator, other);
+    public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publisher<@NonNull V>> itemTimeoutIndicator, @NonNull Publisher<@NonNull ? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(null, itemTimeoutIndicator, fallback);
     }
 
     /**
@@ -16983,19 +16985,19 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit) {
      *            maximum duration between items before a timeout occurs
      * @param unit
      *            the unit of time that applies to the {@code timeout} argument
-     * @param other
+     * @param fallback
      *            the fallback {@code Publisher} to use in case of a timeout
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if {@code unit} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code unit} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Publisher<@NonNull ? extends T> other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, unit, other, Schedulers.computation());
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Publisher<@NonNull ? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(timeout, unit, fallback, Schedulers.computation());
     }
 
     /**
@@ -17021,19 +17023,19 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
      *            the {@code Scheduler} to run the timeout timers on
-     * @param other
+     * @param fallback
      *            the {@code Publisher} to use as the fallback in case of a timeout
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Publisher<@NonNull ? extends T> other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, unit, other, scheduler);
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Publisher<@NonNull ? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(timeout, unit, fallback, scheduler);
     }
 
     /**
@@ -17136,10 +17138,10 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
      *            a function that returns a {@code Publisher} for each item emitted by the current {@code Flowable} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
-     * @param other
+     * @param fallback
      *            the fallback {@code Publisher} to switch to if the current {@code Flowable} times out
      * @return the new {@code Flowable} instance
-     * @throws NullPointerException if {@code firstTimeoutIndicator}, {@code itemTimeoutIndicator} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code firstTimeoutIndicator}, {@code itemTimeoutIndicator} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -17149,25 +17151,25 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
     public final <U, V> Flowable<T> timeout(
             @NonNull Publisher<U> firstTimeoutIndicator,
             @NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
-            @NonNull Publisher<@NonNull ? extends T> other) {
+            @NonNull Publisher<@NonNull ? extends T> fallback) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other);
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, fallback);
     }
 
-    private Flowable<T> timeout0(long timeout, TimeUnit unit, Publisher<@NonNull ? extends T> other,
+    private Flowable<T> timeout0(long timeout, TimeUnit unit, Publisher<@NonNull ? extends T> fallback,
             Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableTimeoutTimed<>(this, timeout, unit, scheduler, other));
+        return RxJavaPlugins.onAssembly(new FlowableTimeoutTimed<>(this, timeout, unit, scheduler, fallback));
     }
 
     private <U, V> Flowable<T> timeout0(
             Publisher<U> firstTimeoutIndicator,
             Function<? super T, ? extends Publisher<@NonNull V>> itemTimeoutIndicator,
-                    Publisher<@NonNull ? extends T> other) {
+                    Publisher<@NonNull ? extends T> fallback) {
         Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
-        return RxJavaPlugins.onAssembly(new FlowableTimeout<>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
+        return RxJavaPlugins.onAssembly(new FlowableTimeout<>(this, firstTimeoutIndicator, itemTimeoutIndicator, fallback));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 82cb7545c2..4322afaa93 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -620,17 +620,17 @@ public static <T> Maybe<T> create(@NonNull MaybeOnSubscribe<T> onSubscribe) {
      * <dd>{@code defer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param maybeSupplier the {@code Supplier} that is called for each individual {@code MaybeObserver} and
+     * @param supplier the {@code Supplier} that is called for each individual {@code MaybeObserver} and
      * returns a {@code MaybeSource} instance to subscribe to
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code maybeSupplier} is {@code null}
+     * @throws NullPointerException if {@code supplier} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? extends T>> maybeSupplier) {
-        Objects.requireNonNull(maybeSupplier, "maybeSupplier is null");
-        return RxJavaPlugins.onAssembly(new MaybeDefer<>(maybeSupplier));
+    public static <T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? extends T>> supplier) {
+        Objects.requireNonNull(supplier, "supplier is null");
+        return RxJavaPlugins.onAssembly(new MaybeDefer<>(supplier));
     }
 
     /**
@@ -663,20 +663,20 @@ public static <T> Maybe<T> empty() {
      * <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param error
+     * @param throwable
      *            the particular {@link Throwable} to pass to {@link MaybeObserver#onError onError}
      * @param <T>
      *            the type of the item (ostensibly) emitted by the {@code Maybe}
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code error} is {@code null}
+     * @throws NullPointerException if {@code throwable} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> error(@NonNull Throwable error) {
-        Objects.requireNonNull(error, "error is null");
-        return RxJavaPlugins.onAssembly(new MaybeError<>(error));
+    public static <T> Maybe<T> error(@NonNull Throwable throwable) {
+        Objects.requireNonNull(throwable, "throwable is null");
+        return RxJavaPlugins.onAssembly(new MaybeError<>(throwable));
     }
 
     /**
@@ -760,16 +760,16 @@ public static <T> Maybe<T> fromCompletable(@NonNull CompletableSource completabl
      *  <dd>{@code fromSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the target type
-     * @param singleSource the {@code SingleSource} to convert from
+     * @param single the {@code SingleSource} to convert from
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code singleSource} is {@code null}
+     * @throws NullPointerException if {@code single} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> singleSource) {
-        Objects.requireNonNull(singleSource, "singleSource is null");
-        return RxJavaPlugins.onAssembly(new MaybeFromSingle<>(singleSource));
+    public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
+        Objects.requireNonNull(single, "single is null");
+        return RxJavaPlugins.onAssembly(new MaybeFromSingle<>(single));
     }
 
     /**
@@ -1799,9 +1799,10 @@ public static <T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
      *            the factory function to create a resource object that depends on the {@code Maybe}
      * @param sourceSupplier
      *            the factory function to create a {@code MaybeSource}
-     * @param resourceDisposer
+     * @param resourceCleanup
      *            the function that will dispose of the resource
      * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceCleanup} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -1809,8 +1810,8 @@ public static <T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
     @NonNull
     public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends MaybeSource<? extends T>> sourceSupplier,
-            @NonNull Consumer<? super D> resourceDisposer) {
-        return using(resourceSupplier, sourceSupplier, resourceDisposer, true);
+            @NonNull Consumer<? super D> resourceCleanup) {
+        return using(resourceSupplier, sourceSupplier, resourceCleanup, true);
     }
 
     /**
@@ -1832,7 +1833,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
      *            the factory function to create a resource object that depends on the {@code Maybe}
      * @param sourceSupplier
      *            the factory function to create a {@code MaybeSource}
-     * @param resourceDisposer
+     * @param resourceCleanup
      *            the function that will dispose of the resource
      * @param eager
      *            If {@code true} then resource disposal will happen either on a {@code dispose()} call before the upstream is disposed
@@ -1840,7 +1841,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
      *            If {@code false} the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onSuccess}, {@code onComplete} or {@code onError}).
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceDisposer} is {@code null}
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceCleanup} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -1848,11 +1849,11 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends MaybeSource<? extends T>> sourceSupplier,
-            @NonNull Consumer<? super D> resourceDisposer, boolean eager) {
+            @NonNull Consumer<? super D> resourceCleanup, boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
-        Objects.requireNonNull(resourceDisposer, "resourceDisposer is null");
-        return RxJavaPlugins.onAssembly(new MaybeUsing<T, D>(resourceSupplier, sourceSupplier, resourceDisposer, eager));
+        Objects.requireNonNull(resourceCleanup, "resourceCleanup is null");
+        return RxJavaPlugins.onAssembly(new MaybeUsing<T, D>(resourceSupplier, sourceSupplier, resourceCleanup, eager));
     }
 
     /**
@@ -2678,7 +2679,7 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
@@ -2690,8 +2691,8 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Maybe<T> delay(long delay, @NonNull TimeUnit unit) {
-        return delay(delay, unit, Schedulers.computation());
+    public final Maybe<T> delay(long time, @NonNull TimeUnit unit) {
+        return delay(time, unit, Schedulers.computation());
     }
 
     /**
@@ -2704,7 +2705,7 @@ public final Maybe<T> delay(long delay, @NonNull TimeUnit unit) {
      *  <dd>you specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the time unit of {@code delay}
@@ -2717,10 +2718,10 @@ public final Maybe<T> delay(long delay, @NonNull TimeUnit unit) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+    public final Maybe<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new MaybeDelay<>(this, Math.max(0L, delay), unit, scheduler));
+        return RxJavaPlugins.onAssembly(new MaybeDelay<>(this, Math.max(0L, time), unit, scheduler));
     }
 
     /**
@@ -2789,7 +2790,7 @@ public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIn
      *  <dd>This version of {@code delaySubscription} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
@@ -2801,8 +2802,8 @@ public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIn
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
-        return delaySubscription(delay, unit, Schedulers.computation());
+    public final Maybe<T> delaySubscription(long time, @NonNull TimeUnit unit) {
+        return delaySubscription(time, unit, Schedulers.computation());
     }
 
     /**
@@ -2815,7 +2816,7 @@ public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
@@ -2828,8 +2829,8 @@ public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Maybe<T> delaySubscription(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return delaySubscription(Flowable.timer(delay, unit, scheduler));
+    public final Maybe<T> delaySubscription(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return delaySubscription(Flowable.timer(time, unit, scheduler));
     }
 
     /**
@@ -3198,21 +3199,21 @@ public final <R> Maybe<R> flatMap(
      *            the type of items emitted by the resulting {@code Maybe}
      * @param mapper
      *            a function that returns a {@code MaybeSource} for the item emitted by the current {@code Maybe}
-     * @param resultSelector
+     * @param combiner
      *            a function that combines one item emitted by each of the source and collection {@code MaybeSource} and
      *            returns an item to be emitted by the resulting {@code MaybeSource}
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code mapper} or {@code resultSelector} is {@code null}
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends U>> mapper,
-            @NonNull BiFunction<? super T, ? super U, ? extends R> resultSelector) {
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         Objects.requireNonNull(mapper, "mapper is null");
-        Objects.requireNonNull(resultSelector, "resultSelector is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapBiSelector<>(this, mapper, resultSelector));
+        Objects.requireNonNull(combiner, "combiner is null");
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapBiSelector<>(this, mapper, combiner));
     }
 
     /**
@@ -3880,19 +3881,19 @@ public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> pred
      *  <dd>{@code onErrorResumeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param next
+     * @param fallback
      *            the next {@code MaybeSource} that will take over if the current {@code Maybe} encounters
      *            an error
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code next} is {@code null}
+     * @throws NullPointerException if {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> next) {
-        Objects.requireNonNull(next, "next is null");
-        return onErrorResumeNext(Functions.justFunction(next));
+    public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return onErrorResumeNext(Functions.justFunction(fallback));
     }
 
     /**
@@ -3908,19 +3909,19 @@ public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> next)
      *  <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param resumeFunction
+     * @param fallbackSupplier
      *            a function that returns a {@code MaybeSource} that will take over if the current {@code Maybe} encounters
      *            an error
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code resumeFunction} is {@code null}
+     * @throws NullPointerException if {@code fallbackSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends MaybeSource<? extends T>> resumeFunction) {
-        Objects.requireNonNull(resumeFunction, "resumeFunction is null");
-        return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<>(this, resumeFunction));
+    public final Maybe<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends MaybeSource<? extends T>> fallbackSupplier) {
+        Objects.requireNonNull(fallbackSupplier, "fallbackSupplier is null");
+        return RxJavaPlugins.onAssembly(new MaybeOnErrorNext<>(this, fallbackSupplier));
     }
 
     /**
@@ -3936,19 +3937,19 @@ public final Maybe<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? e
      *  <dd>{@code onErrorReturn} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param valueSupplier
+     * @param itemSupplier
      *            a function that returns a single value that will be emitted as success value
      *            the current {@code Maybe} signals an {@code onError} event
      * @return the new {@code Maybe} instance
-     * @throws NullPointerException if {@code valueSupplier} is {@code null}
+     * @throws NullPointerException if {@code itemSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> valueSupplier) {
-        Objects.requireNonNull(valueSupplier, "valueSupplier is null");
-        return RxJavaPlugins.onAssembly(new MaybeOnErrorReturn<>(this, valueSupplier));
+    public final Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> itemSupplier) {
+        Objects.requireNonNull(itemSupplier, "itemSupplier is null");
+        return RxJavaPlugins.onAssembly(new MaybeOnErrorReturn<>(this, itemSupplier));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 0ea4c18b47..57456a9545 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -1692,20 +1692,20 @@ public static <T> Observable<T> empty() {
      *  <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param errorSupplier
+     * @param supplier
      *            a {@link Supplier} factory to return a {@link Throwable} for each individual {@code Observer}
      * @param <T>
      *            the type of the items (ostensibly) emitted by the {@code Observable}
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code errorSupplier} is {@code null}
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> errorSupplier) {
-        Objects.requireNonNull(errorSupplier, "errorSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableError<>(errorSupplier));
+    public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+        Objects.requireNonNull(supplier, "supplier is null");
+        return RxJavaPlugins.onAssembly(new ObservableError<>(supplier));
     }
 
     /**
@@ -1718,20 +1718,20 @@ public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> err
      *  <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param exception
+     * @param throwable
      *            the particular {@link Throwable} to pass to {@link Observer#onError onError}
      * @param <T>
      *            the type of the items (ostensibly) emitted by the {@code Observable}
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code exception} is {@code null}
+     * @throws NullPointerException if {@code throwable} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> error(@NonNull Throwable exception) {
-        Objects.requireNonNull(exception, "exception is null");
-        return error(Functions.justSupplier(exception));
+    public static <T> Observable<T> error(@NonNull Throwable throwable) {
+        Objects.requireNonNull(throwable, "throwable is null");
+        return error(Functions.justSupplier(throwable));
     }
 
     /**
@@ -4082,9 +4082,10 @@ public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubs
      *            the factory function to create a resource object that depends on the {@code ObservableSource}
      * @param sourceSupplier
      *            the factory function to create an {@code ObservableSource}
-     * @param resourceDisposer
+     * @param resourceCleanup
      *            the function that will dispose of the resource
      * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceCleanup} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      */
     @CheckReturnValue
@@ -4093,8 +4094,8 @@ public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubs
     public static <T, D> Observable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier,
-            @NonNull Consumer<? super D> resourceDisposer) {
-        return using(resourceSupplier, sourceSupplier, resourceDisposer, true);
+            @NonNull Consumer<? super D> resourceCleanup) {
+        return using(resourceSupplier, sourceSupplier, resourceCleanup, true);
     }
 
     /**
@@ -4114,7 +4115,7 @@ public static <T, D> Observable<T> using(
      *            the factory function to create a resource object that depends on the {@code ObservableSource}
      * @param sourceSupplier
      *            the factory function to create an {@code ObservableSource}
-     * @param resourceDisposer
+     * @param resourceCleanup
      *            the function that will dispose of the resource
      * @param eager
      *            If {@code true}, the resource disposal will happen either on a {@code dispose()} call before the upstream is disposed
@@ -4122,7 +4123,7 @@ public static <T, D> Observable<T> using(
      *            If {@code false}, the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onComplete} or {@code onError}).
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} and {@code resourceDisposer} is {@code null}
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} and {@code resourceCleanup} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/using.html">ReactiveX operators documentation: Using</a>
      * @since 2.0
      */
@@ -4132,11 +4133,11 @@ public static <T, D> Observable<T> using(
     public static <T, D> Observable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier,
-            @NonNull Consumer<? super D> resourceDisposer, boolean eager) {
+            @NonNull Consumer<? super D> resourceCleanup, boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
         Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
-        Objects.requireNonNull(resourceDisposer, "resourceDisposer is null");
-        return RxJavaPlugins.onAssembly(new ObservableUsing<T, D>(resourceSupplier, sourceSupplier, resourceDisposer, eager));
+        Objects.requireNonNull(resourceCleanup, "resourceCleanup is null");
+        return RxJavaPlugins.onAssembly(new ObservableUsing<T, D>(resourceSupplier, sourceSupplier, resourceCleanup, eager));
     }
 
     /**
@@ -5428,17 +5429,19 @@ public final Iterable<T> blockingLatest() {
      *  <dd>{@code blockingMostRecent} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param initialValue
+     * @param initialItem
      *            the initial value that the {@code Iterable} sequence will yield if the current
      *            {@code Observable} has not yet emitted an item
      * @return the new {@code Iterable} instance
+     * @throws NullPointerException if {@code initialItem} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/first.html">ReactiveX documentation: First</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Iterable<T> blockingMostRecent(@NonNull T initialValue) {
-        return new BlockingObservableMostRecent<>(this, initialValue);
+    public final Iterable<T> blockingMostRecent(@NonNull T initialItem) {
+        Objects.requireNonNull(initialItem, "initialItem is null");
+        return new BlockingObservableMostRecent<>(this, initialItem);
     }
 
     /**
@@ -6236,23 +6239,23 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * @param <U> the collection subclass type to buffer into
      * @param <B>
      *            the boundary value type (ignored)
-     * @param boundary
+     * @param boundaryIndicator
      *            the boundary {@code ObservableSource}
      * @param bufferSupplier
      *            a factory function that returns an instance of the collection subclass to be used and returned
      *            as the buffer
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code boundary} or {@code bufferSupplier} is {@code null}
+     * @throws NullPointerException if {@code boundaryIndicator} or {@code bufferSupplier} is {@code null}
      * @see #buffer(ObservableSource, int)
      * @see <a href="http://reactivex.io/documentation/operators/buffer.html">ReactiveX operators documentation: Buffer</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B, @NonNull U extends Collection<? super T>> Observable<U> buffer(@NonNull ObservableSource<B> boundary, @NonNull Supplier<U> bufferSupplier) {
-        Objects.requireNonNull(boundary, "boundary is null");
+    public final <B, @NonNull U extends Collection<? super T>> Observable<U> buffer(@NonNull ObservableSource<B> boundaryIndicator, @NonNull Supplier<U> bufferSupplier) {
+        Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableBufferExactBoundary<>(this, boundary, bufferSupplier));
+        return RxJavaPlugins.onAssembly(new ObservableBufferExactBoundary<>(this, boundaryIndicator, bufferSupplier));
     }
 
     /**
@@ -6416,22 +6419,22 @@ public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
      * </dl>
      *
      * @param <U> the accumulator and output type
-     * @param initialValueSupplier
+     * @param initialItemSupplier
      *           the mutable data structure that will collect the items
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies the accumulator accordingly
      *           accordingly
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code initialValueSupplier} or {@code collector} is {@code null}
+     * @throws NullPointerException if {@code initialItemSupplier} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialValueSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
-        Objects.requireNonNull(initialValueSupplier, "initialValueSupplier is null");
+    public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
+        Objects.requireNonNull(initialItemSupplier, "initialItemSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
-        return RxJavaPlugins.onAssembly(new ObservableCollectSingle<>(this, initialValueSupplier, collector));
+        return RxJavaPlugins.onAssembly(new ObservableCollectSingle<>(this, initialItemSupplier, collector));
     }
 
     /**
@@ -6451,21 +6454,21 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialValueSu
      * </dl>
      *
      * @param <U> the accumulator and output type
-     * @param initialValue
+     * @param initialItem
      *           the mutable data structure that will collect the items
      * @param collector
      *           a function that accepts the {@code state} and an emitted item, and modifies the accumulator accordingly
      *           accordingly
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code initialValue} or {@code collector} is {@code null}
+     * @throws NullPointerException if {@code initialItem} or {@code collector} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/reduce.html">ReactiveX operators documentation: Reduce</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Single<U> collectInto(@NonNull U initialValue, @NonNull BiConsumer<? super U, ? super T> collector) {
-        Objects.requireNonNull(initialValue, "initialValue is null");
-        return collect(Functions.justSupplier(initialValue), collector);
+    public final <U> Single<U> collectInto(@NonNull U initialItem, @NonNull BiConsumer<? super U, ? super T> collector) {
+        Objects.requireNonNull(initialItem, "initialItem is null");
+        return collect(Functions.justSupplier(initialItem), collector);
     }
 
     /**
@@ -7454,18 +7457,18 @@ public final Observable<T> concatWith(@NonNull CompletableSource other) {
      *  <dd>{@code contains} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param element
+     * @param item
      *            the item to search for in the emissions from the current {@code Observable}
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code element} is {@code null}
+     * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/contains.html">ReactiveX operators documentation: Contains</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Single<Boolean> contains(@NonNull Object element) {
-        Objects.requireNonNull(element, "element is null");
-        return any(Functions.equalsWith(element));
+    public final Single<Boolean> contains(@NonNull Object item) {
+        Objects.requireNonNull(item, "item is null");
+        return any(Functions.equalsWith(item));
     }
 
     /**
@@ -7509,18 +7512,18 @@ public final Single<Long> count() {
      *
      * @param <U>
      *            the debounce value type (ignored)
-     * @param debounceSelector
+     * @param debounceIndicator
      *            function to return a sequence that indicates the throttle duration for each item via its own emission or completion
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code debounceSelector} is {@code null}
+     * @throws NullPointerException if {@code debounceIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> debounce(@NonNull Function<? super T, ? extends ObservableSource<U>> debounceSelector) {
-        Objects.requireNonNull(debounceSelector, "debounceSelector is null");
-        return RxJavaPlugins.onAssembly(new ObservableDebounce<>(this, debounceSelector));
+    public final <U> Observable<T> debounce(@NonNull Function<? super T, ? extends ObservableSource<U>> debounceIndicator) {
+        Objects.requireNonNull(debounceIndicator, "debounceIndicator is null");
+        return RxJavaPlugins.onAssembly(new ObservableDebounce<>(this, debounceIndicator));
     }
 
     /**
@@ -7644,20 +7647,20 @@ public final Observable<T> defaultIfEmpty(@NonNull T defaultItem) {
      *
      * @param <U>
      *            the item delay value type (ignored)
-     * @param itemDelay
+     * @param itemDelayIndicator
      *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}, which is
      *            then used to delay the emission of that item by the resulting {@code Observable} until the {@code ObservableSource}
      *            returned from {@code itemDelay} emits an item
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code itemDelay} is {@code null}
+     * @throws NullPointerException if {@code itemDelayIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends ObservableSource<U>> itemDelay) {
-        Objects.requireNonNull(itemDelay, "itemDelay is null");
-        return flatMap(ObservableInternalHelper.itemDelay(itemDelay));
+    public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends ObservableSource<U>> itemDelayIndicator) {
+        Objects.requireNonNull(itemDelayIndicator, "itemDelayIndicator is null");
+        return flatMap(ObservableInternalHelper.itemDelay(itemDelayIndicator));
     }
 
     /**
@@ -7670,7 +7673,7 @@ public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends Obse
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
@@ -7683,8 +7686,8 @@ public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends Obse
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Observable<T> delay(long delay, @NonNull TimeUnit unit) {
-        return delay(delay, unit, Schedulers.computation(), false);
+    public final Observable<T> delay(long time, @NonNull TimeUnit unit) {
+        return delay(time, unit, Schedulers.computation(), false);
     }
 
     /**
@@ -7697,7 +7700,7 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit) {
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
@@ -7712,8 +7715,8 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Observable<T> delay(long delay, @NonNull TimeUnit unit, boolean delayError) {
-        return delay(delay, unit, Schedulers.computation(), delayError);
+    public final Observable<T> delay(long time, @NonNull TimeUnit unit, boolean delayError) {
+        return delay(time, unit, Schedulers.computation(), delayError);
     }
 
     /**
@@ -7726,7 +7729,7 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, boolean del
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the time unit of {@code delay}
@@ -7739,8 +7742,8 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, boolean del
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return delay(delay, unit, scheduler, false);
+    public final Observable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return delay(time, unit, scheduler, false);
     }
 
     /**
@@ -7753,7 +7756,7 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sc
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the delay to shift the source by
      * @param unit
      *            the time unit of {@code delay}
@@ -7769,11 +7772,11 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sc
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
+    public final Observable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
 
-        return RxJavaPlugins.onAssembly(new ObservableDelay<>(this, delay, unit, scheduler, delayError));
+        return RxJavaPlugins.onAssembly(new ObservableDelay<>(this, time, unit, scheduler, delayError));
     }
 
     /**
@@ -7793,23 +7796,23 @@ public final Observable<T> delay(long delay, @NonNull TimeUnit unit, @NonNull Sc
      *            the subscription delay value type (ignored)
      * @param <V>
      *            the item delay value type (ignored)
-     * @param subscriptionDelay
+     * @param subscriptionIndicator
      *            a function that returns an {@code ObservableSource} that triggers the subscription to the current {@code Observable}
      *            once it emits any item
-     * @param itemDelay
+     * @param itemDelayIndicator
      *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable}, which is
      *            then used to delay the emission of that item by the resulting {@code Observable} until the {@code ObservableSource}
      *            returned from {@code itemDelay} emits an item
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code subscriptionDelay} or {@code itemDelay} is {@code null}
+     * @throws NullPointerException if {@code subscriptionIndicator} or {@code itemDelayIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptionDelay,
-            @NonNull Function<? super T, ? extends ObservableSource<V>> itemDelay) {
-        return delaySubscription(subscriptionDelay).delay(itemDelay);
+    public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptionIndicator,
+            @NonNull Function<? super T, ? extends ObservableSource<V>> itemDelayIndicator) {
+        return delaySubscription(subscriptionIndicator).delay(itemDelayIndicator);
     }
 
     /**
@@ -7823,18 +7826,18 @@ public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptio
      * </dl>
      *
      * @param <U> the value type of the other {@code Observable}, irrelevant
-     * @param other the other {@code ObservableSource} that should trigger the subscription
+     * @param subscriptionIndicator the other {@code ObservableSource} that should trigger the subscription
      *        to the current {@code Observable}.
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code other} is {@code null}
+     * @throws NullPointerException if {@code subscriptionIndicator} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> other) {
-        Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new ObservableDelaySubscriptionOther<>(this, other));
+    public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> subscriptionIndicator) {
+        Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
+        return RxJavaPlugins.onAssembly(new ObservableDelaySubscriptionOther<>(this, subscriptionIndicator));
     }
 
     /**
@@ -7846,7 +7849,7 @@ public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> ot
      *  <dd>This version of {@code delaySubscription} operates by default on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
@@ -7857,8 +7860,8 @@ public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> ot
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit) {
-        return delaySubscription(delay, unit, Schedulers.computation());
+    public final Observable<T> delaySubscription(long time, @NonNull TimeUnit unit) {
+        return delaySubscription(time, unit, Schedulers.computation());
     }
 
     /**
@@ -7871,7 +7874,7 @@ public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit)
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * @param delay
+     * @param time
      *            the time to delay the subscription
      * @param unit
      *            the time unit of {@code delay}
@@ -7884,8 +7887,8 @@ public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> delaySubscription(long delay, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        return delaySubscription(timer(delay, unit, scheduler));
+    public final Observable<T> delaySubscription(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return delaySubscription(timer(time, unit, scheduler));
     }
 
     /**
@@ -10366,19 +10369,19 @@ public final <U> Observable<U> ofType(@NonNull Class<U> clazz) {
      *  <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param resumeFunction
+     * @param fallbackSupplier
      *            a function that returns an {@code ObservableSource} that will take over if the current {@code Observable} encounters
      *            an error
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code resumeFunction} is {@code null}
+     * @throws NullPointerException if {@code fallbackSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends ObservableSource<? extends T>> resumeFunction) {
-        Objects.requireNonNull(resumeFunction, "resumeFunction is null");
-        return RxJavaPlugins.onAssembly(new ObservableOnErrorNext<>(this, resumeFunction));
+    public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends ObservableSource<? extends T>> fallbackSupplier) {
+        Objects.requireNonNull(fallbackSupplier, "fallbackSupplier is null");
+        return RxJavaPlugins.onAssembly(new ObservableOnErrorNext<>(this, fallbackSupplier));
     }
 
     /**
@@ -10404,19 +10407,19 @@ public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable
      *  <dd>{@code onErrorResumeWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param next
+     * @param fallback
      *            the next {@code ObservableSource} source that will take over if the current {@code Observable} encounters
      *            an error
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code next} is {@code null}
+     * @throws NullPointerException if {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Observable<T> onErrorResumeWith(@NonNull ObservableSource<? extends T> next) {
-        Objects.requireNonNull(next, "next is null");
-        return onErrorResumeNext(Functions.justFunction(next));
+    public final Observable<T> onErrorResumeWith(@NonNull ObservableSource<? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return onErrorResumeNext(Functions.justFunction(fallback));
     }
 
     /**
@@ -10439,19 +10442,19 @@ public final Observable<T> onErrorResumeWith(@NonNull ObservableSource<? extends
      *  <dd>{@code onErrorReturn} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param valueSupplier
+     * @param itemSupplier
      *            a function that returns a single value that will be emitted along with a regular {@code onComplete} in case
      *            the current {@code Observable} signals an {@code onError} event
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code valueSupplier} is {@code null}
+     * @throws NullPointerException if {@code itemSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Observable<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> valueSupplier) {
-        Objects.requireNonNull(valueSupplier, "valueSupplier is null");
-        return RxJavaPlugins.onAssembly(new ObservableOnErrorReturn<>(this, valueSupplier));
+    public final Observable<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> itemSupplier) {
+        Objects.requireNonNull(itemSupplier, "itemSupplier is null");
+        return RxJavaPlugins.onAssembly(new ObservableOnErrorReturn<>(this, itemSupplier));
     }
 
     /**
@@ -12488,18 +12491,18 @@ public final Observable<T> sorted() {
      *  <dd>{@code sorted} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param sortFunction
+     * @param comparator
      *            a function that compares two items emitted by the current {@code Observable} and returns an {@code int}
      *            that indicates their sort order
-     * @throws NullPointerException if {@code sortFunction} is {@code null}
+     * @throws NullPointerException if {@code comparator} is {@code null}
      * @return the new {@code Observable} instance
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Observable<T> sorted(@NonNull Comparator<? super T> sortFunction) {
-        Objects.requireNonNull(sortFunction, "sortFunction is null");
-        return toList().toObservable().map(Functions.listSorter(sortFunction)).flatMapIterable(Functions.identity());
+    public final Observable<T> sorted(@NonNull Comparator<? super T> comparator) {
+        Objects.requireNonNull(comparator, "comparator is null");
+        return toList().toObservable().map(Functions.listSorter(comparator)).flatMapIterable(Functions.identity());
     }
 
     /**
@@ -14130,19 +14133,19 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
      * @param itemTimeoutIndicator
      *            a function that returns an {@code ObservableSource}, for each item emitted by the current {@code Observable}, that
      *            determines the timeout window for the subsequent item
-     * @param other
+     * @param fallback
      *            the fallback {@code ObservableSource} to switch to if the current {@code Observable} times out
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code itemTimeoutIndicator} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code itemTimeoutIndicator} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
-            @NonNull ObservableSource<? extends T> other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(null, itemTimeoutIndicator, other);
+            @NonNull ObservableSource<? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(null, itemTimeoutIndicator, fallback);
     }
 
     /**
@@ -14187,18 +14190,18 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit) {
      *            maximum duration between items before a timeout occurs
      * @param unit
      *            the unit of time that applies to the {@code timeout} argument
-     * @param other
+     * @param fallback
      *            the fallback {@code ObservableSource} to use in case of a timeout
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code unit} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code unit} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull ObservableSource<? extends T> other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, unit, other, Schedulers.computation());
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull ObservableSource<? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(timeout, unit, fallback, Schedulers.computation());
     }
 
     /**
@@ -14219,18 +14222,18 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNul
      *            the unit of time that applies to the {@code timeout} argument
      * @param scheduler
      *            the {@code Scheduler} to run the timeout timers on
-     * @param other
+     * @param fallback
      *            the {@code ObservableSource} to use as the fallback in case of a timeout
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code other} is {@code null}
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull ObservableSource<? extends T> other) {
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(timeout, unit, other, scheduler);
+    public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull ObservableSource<? extends T> fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(timeout, unit, fallback, scheduler);
     }
 
     /**
@@ -14319,11 +14322,11 @@ public final <U, V> Observable<T> timeout(@NonNull ObservableSource<U> firstTime
      *            a function that returns an {@code ObservableSource} for each item emitted by the current {@code Observable} and that
      *            determines the timeout window in which the subsequent source item must arrive in order to
      *            continue the sequence
-     * @param other
+     * @param fallback
      *            the fallback {@code ObservableSource} to switch to if the current {@code Observable} times out
      * @return the new {@code Observable} instance
      * @throws NullPointerException
-     *             if {@code firstTimeoutIndicator}, {@code itemTimeoutIndicator} or {@code other} is {@code null}
+     *             if {@code firstTimeoutIndicator}, {@code itemTimeoutIndicator} or {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/timeout.html">ReactiveX operators documentation: Timeout</a>
      */
     @CheckReturnValue
@@ -14332,28 +14335,28 @@ public final <U, V> Observable<T> timeout(@NonNull ObservableSource<U> firstTime
     public final <U, V> Observable<T> timeout(
             @NonNull ObservableSource<U> firstTimeoutIndicator,
             @NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
-            @NonNull ObservableSource<? extends T> other) {
+            @NonNull ObservableSource<? extends T> fallback) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
-        Objects.requireNonNull(other, "other is null");
-        return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, other);
+        Objects.requireNonNull(fallback, "fallback is null");
+        return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, fallback);
     }
 
     @NonNull
     private Observable<T> timeout0(long timeout, @NonNull TimeUnit unit,
-            @Nullable ObservableSource<? extends T> other,
+            @Nullable ObservableSource<? extends T> fallback,
             @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableTimeoutTimed<>(this, timeout, unit, scheduler, other));
+        return RxJavaPlugins.onAssembly(new ObservableTimeoutTimed<>(this, timeout, unit, scheduler, fallback));
     }
 
     @NonNull
     private <U, V> Observable<T> timeout0(
             @NonNull ObservableSource<U> firstTimeoutIndicator,
             @NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
-            @Nullable ObservableSource<? extends T> other) {
+            @Nullable ObservableSource<? extends T> fallback) {
         Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
-        return RxJavaPlugins.onAssembly(new ObservableTimeout<>(this, firstTimeoutIndicator, itemTimeoutIndicator, other));
+        return RxJavaPlugins.onAssembly(new ObservableTimeout<>(this, firstTimeoutIndicator, itemTimeoutIndicator, fallback));
     }
 
     /**
@@ -15538,17 +15541,17 @@ public final Observable<Observable<T>> window(
      *
      * @param <B>
      *            the window element type (ignored)
-     * @param boundary
+     * @param boundaryIndicator
      *            an {@code ObservableSource} whose emitted items close and open windows
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code boundary} is {@code null}
+     * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundary) {
-        return window(boundary, bufferSize());
+    public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundaryIndicator) {
+        return window(boundaryIndicator, bufferSize());
     }
 
     /**
@@ -15569,22 +15572,22 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
      *
      * @param <B>
      *            the window element type (ignored)
-     * @param boundary
+     * @param boundaryIndicator
      *            an {@code ObservableSource} whose emitted items close and open windows
      * @param bufferSize
      *            the capacity hint for the buffer in the inner windows
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code boundary} is {@code null}
+     * @throws NullPointerException if {@code boundaryIndicator} is {@code null}
      * @throws IllegalArgumentException if {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/window.html">ReactiveX operators documentation: Window</a>
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundary, int bufferSize) {
-        Objects.requireNonNull(boundary, "boundary is null");
+    public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundaryIndicator, int bufferSize) {
+        Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
-        return RxJavaPlugins.onAssembly(new ObservableWindowBoundary<>(this, boundary, bufferSize));
+        return RxJavaPlugins.onAssembly(new ObservableWindowBoundary<>(this, boundaryIndicator, bufferSize));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index eb90b83fcb..0541ce8657 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -557,17 +557,17 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends S
      * <dd>{@code defer} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param singleSupplier the {@code Supplier} that is called for each individual {@code SingleObserver} and
+     * @param supplier the {@code Supplier} that is called for each individual {@code SingleObserver} and
      * returns a {@code SingleSource} instance to subscribe to
-     * @throws NullPointerException if {@code singleSupplier} is {@code null}
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @return the new {@code Single} instance
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? extends T>> singleSupplier) {
-        Objects.requireNonNull(singleSupplier, "singleSupplier is null");
-        return RxJavaPlugins.onAssembly(new SingleDefer<>(singleSupplier));
+    public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? extends T>> supplier) {
+        Objects.requireNonNull(supplier, "supplier is null");
+        return RxJavaPlugins.onAssembly(new SingleDefer<>(supplier));
     }
 
     /**
@@ -579,17 +579,17 @@ public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? ext
      * <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the value type
-     * @param errorSupplier the {@link Supplier} that is called for each individual {@code SingleObserver} and
+     * @param supplier the {@link Supplier} that is called for each individual {@code SingleObserver} and
      * returns a {@code Throwable} instance to be emitted.
-     * @throws NullPointerException if {@code errorSupplier} is {@code null}
+     * @throws NullPointerException if {@code supplier} is {@code null}
      * @return the new {@code Single} instance
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> errorSupplier) {
-        Objects.requireNonNull(errorSupplier, "errorSupplier is null");
-        return RxJavaPlugins.onAssembly(new SingleError<>(errorSupplier));
+    public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+        Objects.requireNonNull(supplier, "supplier is null");
+        return RxJavaPlugins.onAssembly(new SingleError<>(supplier));
     }
 
     /**
@@ -602,21 +602,21 @@ public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> errorSu
      * <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param exception
+     * @param throwable
      *            the particular {@link Throwable} to pass to {@link SingleObserver#onError onError}
      * @param <T>
      *            the type of the item (ostensibly) emitted by the {@code Single}
      * @return the new {@code Single} that invokes the subscriber's {@link SingleObserver#onError onError} method when
      *         the subscriber subscribes to it
-     * @throws NullPointerException if {@code exception} is {@code null}
+     * @throws NullPointerException if {@code throwable} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> error(@NonNull Throwable exception) {
-        Objects.requireNonNull(exception, "exception is null");
-        return error(Functions.justSupplier(exception));
+    public static <T> Single<T> error(@NonNull Throwable throwable) {
+        Objects.requireNonNull(throwable, "throwable is null");
+        return error(Functions.justSupplier(throwable));
     }
 
     /**
@@ -782,18 +782,18 @@ public static <T> Single<T> fromPublisher(@NonNull Publisher<@NonNull ? extends
      *   <dd>{@code fromObservable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param observableSource the source sequence to wrap, not {@code null}
+     * @param observable the source sequence to wrap, not {@code null}
      * @param <T>
      *         the type of the item emitted by the {@code Single}.
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code observableSource} is {@code null}
+     * @throws NullPointerException if {@code observable} is {@code null}
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T> observableSource) {
-        Objects.requireNonNull(observableSource, "observableSource is null");
-        return RxJavaPlugins.onAssembly(new ObservableSingleSingle<>(observableSource, null));
+    public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T> observable) {
+        Objects.requireNonNull(observable, "observable is null");
+        return RxJavaPlugins.onAssembly(new ObservableSingleSingle<>(observable, null));
     }
 
     /**
@@ -1446,22 +1446,23 @@ public static <T> Single<T> unsafeCreate(@NonNull SingleSource<T> onSubscribe) {
      * @param <T> the value type of the {@code SingleSource} generated
      * @param <U> the resource type
      * @param resourceSupplier the {@link Supplier} called for each {@link SingleObserver} to generate a resource object
-     * @param singleFunction the function called with the returned resource
+     * @param sourceSupplier the function called with the returned resource
      *                  object from {@code resourceSupplier} and should return a {@code SingleSource} instance
      *                  to be run by the operator
-     * @param disposer the consumer of the generated resource that is called exactly once for
+     * @param resourceCleanup the consumer of the generated resource that is called exactly once for
      *                  that particular resource when the generated {@code SingleSource} terminates
      *                  (successfully or with an error) or gets disposed.
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} and {@code resourceCleanup} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T, U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
-            @NonNull Function<? super U, ? extends SingleSource<? extends T>> singleFunction,
-            @NonNull Consumer<? super U> disposer) {
-        return using(resourceSupplier, singleFunction, disposer, true);
+            @NonNull Function<? super U, ? extends SingleSource<? extends T>> sourceSupplier,
+            @NonNull Consumer<? super U> resourceCleanup) {
+        return using(resourceSupplier, sourceSupplier, resourceCleanup, true);
     }
 
     /**
@@ -1476,10 +1477,10 @@ public static <T, U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
      * @param <T> the value type of the {@code SingleSource} generated
      * @param <U> the resource type
      * @param resourceSupplier the {@link Supplier} called for each {@link SingleObserver} to generate a resource object
-     * @param singleFunction the function called with the returned resource
+     * @param sourceSupplier the function called with the returned resource
      *                  object from {@code resourceSupplier} and should return a {@code SingleSource} instance
      *                  to be run by the operator
-     * @param disposer the consumer of the generated resource that is called exactly once for
+     * @param resourceCleanup the consumer of the generated resource that is called exactly once for
      *                  that particular resource when the generated {@code SingleSource} terminates
      *                  (successfully or with an error) or gets disposed.
      * @param eager
@@ -1488,7 +1489,7 @@ public static <T, U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
      *            If {@code false} the resource disposal will happen either on a {@code dispose()} call after the upstream is disposed
      *            or just after the emission of a terminal event ({@code onSuccess} or {@code onError}).
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code resourceSupplier}, {@code singleFunction} or {@code disposer} is {@code null}
+     * @throws NullPointerException if {@code resourceSupplier}, {@code sourceSupplier} or {@code resourceCleanup} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
@@ -1496,14 +1497,14 @@ public static <T, U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T, U> Single<T> using(
             @NonNull Supplier<U> resourceSupplier,
-            @NonNull Function<? super U, ? extends SingleSource<? extends T>> singleFunction,
-            @NonNull Consumer<? super U> disposer,
+            @NonNull Function<? super U, ? extends SingleSource<? extends T>> sourceSupplier,
+            @NonNull Consumer<? super U> resourceCleanup,
             boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
-        Objects.requireNonNull(singleFunction, "singleFunction is null");
-        Objects.requireNonNull(disposer, "disposer is null");
+        Objects.requireNonNull(sourceSupplier, "sourceSupplier is null");
+        Objects.requireNonNull(resourceCleanup, "resourceCleanup is null");
 
-        return RxJavaPlugins.onAssembly(new SingleUsing<>(resourceSupplier, singleFunction, disposer, eager));
+        return RxJavaPlugins.onAssembly(new SingleUsing<>(resourceSupplier, sourceSupplier, resourceCleanup, eager));
     }
 
     /**
@@ -2297,18 +2298,18 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit, @NonNull Schedul
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code delaySubscription} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param other the {@code CompletableSource} that has to complete before the subscription to the
+     * @param subscriptionIndicator the {@code CompletableSource} that has to complete before the subscription to the
      *              current {@code Single} happens
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code other} is {@code null}
+     * @throws NullPointerException if {@code subscriptionIndicator} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> delaySubscription(@NonNull CompletableSource other) {
-        Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable<>(this, other));
+    public final Single<T> delaySubscription(@NonNull CompletableSource subscriptionIndicator) {
+        Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
+        return RxJavaPlugins.onAssembly(new SingleDelayWithCompletable<>(this, subscriptionIndicator));
     }
 
     /**
@@ -2323,18 +2324,18 @@ public final Single<T> delaySubscription(@NonNull CompletableSource other) {
      * <dd>{@code delaySubscription} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the element type of the other source
-     * @param other the {@code SingleSource} that has to complete before the subscription to the
+     * @param subscriptionIndicator the {@code SingleSource} that has to complete before the subscription to the
      *              current {@code Single} happens
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code other} is {@code null}
+     * @throws NullPointerException if {@code subscriptionIndicator} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<T> delaySubscription(@NonNull SingleSource<U> other) {
-        Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new SingleDelayWithSingle<>(this, other));
+    public final <U> Single<T> delaySubscription(@NonNull SingleSource<U> subscriptionIndicator) {
+        Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
+        return RxJavaPlugins.onAssembly(new SingleDelayWithSingle<>(this, subscriptionIndicator));
     }
 
     /**
@@ -2349,18 +2350,18 @@ public final <U> Single<T> delaySubscription(@NonNull SingleSource<U> other) {
      * <dd>{@code delaySubscription} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the element type of the other source
-     * @param other the {@code ObservableSource} that has to signal a value or complete before the
+     * @param subscriptionIndicator the {@code ObservableSource} that has to signal a value or complete before the
      *              subscription to the current {@code Single} happens
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code other} is {@code null}
+     * @throws NullPointerException if {@code subscriptionIndicator} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<T> delaySubscription(@NonNull ObservableSource<U> other) {
-        Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new SingleDelayWithObservable<>(this, other));
+    public final <U> Single<T> delaySubscription(@NonNull ObservableSource<U> subscriptionIndicator) {
+        Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
+        return RxJavaPlugins.onAssembly(new SingleDelayWithObservable<>(this, subscriptionIndicator));
     }
 
     /**
@@ -2379,19 +2380,19 @@ public final <U> Single<T> delaySubscription(@NonNull ObservableSource<U> other)
      * <dd>{@code delaySubscription} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <U> the element type of the other source
-     * @param other the {@code Publisher} that has to signal a value or complete before the
+     * @param subscriptionIndicator the {@code Publisher} that has to signal a value or complete before the
      *              subscription to the current {@code Single} happens
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code other} is {@code null}
+     * @throws NullPointerException if {@code subscriptionIndicator} is {@code null}
      * @since 2.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<T> delaySubscription(@NonNull Publisher<U> other) {
-        Objects.requireNonNull(other, "other is null");
-        return RxJavaPlugins.onAssembly(new SingleDelayWithPublisher<>(this, other));
+    public final <U> Single<T> delaySubscription(@NonNull Publisher<U> subscriptionIndicator) {
+        Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
+        return RxJavaPlugins.onAssembly(new SingleDelayWithPublisher<>(this, subscriptionIndicator));
     }
 
     /**
@@ -3154,15 +3155,16 @@ public final Single<Notification<T>> materialize() {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code contains} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param value the value to compare against the success value of this {@code Single}
+     * @param item the value to compare against the success value of this {@code Single}
      * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code item} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Single<Boolean> contains(@NonNull Object value) {
-        return contains(value, ObjectHelper.equalsPredicate());
+    public final Single<Boolean> contains(@NonNull Object item) {
+        return contains(item, ObjectHelper.equalsPredicate());
     }
 
     /**
@@ -3174,20 +3176,20 @@ public final Single<Boolean> contains(@NonNull Object value) {
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code contains} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param value the value to compare against the success value of this {@code Single}
+     * @param item the value to compare against the success value of this {@code Single}
      * @param comparer the function that receives the success value of this {@code Single}, the value provided
      *                 and should return {@code true} if they are considered equal
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code value} or {@code comparer} is {@code null}
+     * @throws NullPointerException if {@code item} or {@code comparer} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<Boolean> contains(@NonNull Object value, @NonNull BiPredicate<Object, Object> comparer) {
-        Objects.requireNonNull(value, "value is null");
+    public final Single<Boolean> contains(@NonNull Object item, @NonNull BiPredicate<Object, Object> comparer) {
+        Objects.requireNonNull(item, "item is null");
         Objects.requireNonNull(comparer, "comparer is null");
-        return RxJavaPlugins.onAssembly(new SingleContains<>(this, value, comparer));
+        return RxJavaPlugins.onAssembly(new SingleContains<>(this, item, comparer));
     }
 
     /**
@@ -3264,19 +3266,19 @@ public final Single<T> observeOn(@NonNull Scheduler scheduler) {
      * <dd>{@code onErrorReturn} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param resumeFunction
+     * @param itemSupplier
      *            a function that returns an item that the new {@code Single} will emit if the current {@code Single} encounters
      *            an error
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code resumeFunction} is {@code null}
+     * @throws NullPointerException if {@code itemSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> onErrorReturn(@NonNull Function<Throwable, ? extends T> resumeFunction) {
-        Objects.requireNonNull(resumeFunction, "resumeFunction is null");
-        return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<>(this, resumeFunction, null));
+    public final Single<T> onErrorReturn(@NonNull Function<Throwable, ? extends T> itemSupplier) {
+        Objects.requireNonNull(itemSupplier, "itemSupplier is null");
+        return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<>(this, itemSupplier, null));
     }
 
     /**
@@ -3287,17 +3289,17 @@ public final Single<T> onErrorReturn(@NonNull Function<Throwable, ? extends T> r
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code onErrorReturnItem} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param value the value to signal if the current {@code Single} fails
+     * @param item the value to signal if the current {@code Single} fails
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code value} is {@code null}
+     * @throws NullPointerException if {@code item} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Single<T> onErrorReturnItem(@NonNull T value) {
-        Objects.requireNonNull(value, "value is null");
-        return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<>(this, null, value));
+    public final Single<T> onErrorReturnItem(@NonNull T item) {
+        Objects.requireNonNull(item, "item is null");
+        return RxJavaPlugins.onAssembly(new SingleOnErrorReturn<>(this, null, item));
     }
 
     /**
@@ -3359,9 +3361,9 @@ public final Single<T> onErrorResumeWith(@NonNull SingleSource<? extends T> fall
      * <dd>{@code onErrorResumeNext} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param fallback a function that returns a {@code Single} that will take control if source {@code Single} encounters an error.
+     * @param fallbackSupplier a function that returns a {@code SingleSource} that will take control if source {@code Single} encounters an error.
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code fallback} is {@code null}
+     * @throws NullPointerException if {@code fallbackSupplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
      * @since .20
      */
@@ -3369,9 +3371,9 @@ public final Single<T> onErrorResumeWith(@NonNull SingleSource<? extends T> fall
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Single<T> onErrorResumeNext(
-            @NonNull Function<? super Throwable, ? extends SingleSource<? extends T>> fallback) {
-        Objects.requireNonNull(fallback, "fallback is null");
-        return RxJavaPlugins.onAssembly(new SingleResumeNext<>(this, fallback));
+            @NonNull Function<? super Throwable, ? extends SingleSource<? extends T>> fallbackSupplier) {
+        Objects.requireNonNull(fallbackSupplier, "fallbackSupplier is null");
+        return RxJavaPlugins.onAssembly(new SingleResumeNext<>(this, fallbackSupplier));
     }
 
     /**
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java
index f652e9fbf6..82ae58730f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java
@@ -26,10 +26,6 @@
 import io.reactivex.rxjava3.schedulers.TestScheduler;
 
 public class BlockingFlowableMostRecentTest extends RxJavaTest {
-    @Test
-    public void mostRecentNull() {
-        assertNull(Flowable.<Void>never().blockingMostRecent(null).iterator().next());
-    }
 
     @Test
     public void mostRecent() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java
index 6ffd920f24..cc04638ee7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java
@@ -27,10 +27,6 @@
 import io.reactivex.rxjava3.subjects.*;
 
 public class BlockingObservableMostRecentTest extends RxJavaTest {
-    @Test
-    public void mostRecentNull() {
-        assertNull(Observable.<Void>never().blockingMostRecent(null).iterator().next());
-    }
 
     static <T> Iterable<T> mostRecent(Observable<T> source, T initialValue) {
         return source.blockingMostRecent(initialValue);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorArgumentNaming.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorArgumentNaming.java
new file mode 100644
index 0000000000..727b522d05
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorArgumentNaming.java
@@ -0,0 +1,169 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.util;
+
+import java.lang.reflect.*;
+import java.util.*;
+
+import org.reactivestreams.*;
+
+import com.google.common.base.Strings;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.core.Observable;
+
+/**
+ * Compare method argument naming across base classes.
+ * This is not a full test because some naming mismatch is legitimate, such as singular in Maybe/Single and
+ * plural in Flowable/Observable
+ */
+public final class OperatorArgumentNaming {
+
+    private OperatorArgumentNaming() {
+        throw new IllegalStateException("No instances!");
+    }
+
+    /** Classes to compare with each other. */
+    static final Class<?>[] CLASSES = { Flowable.class, Observable.class, Maybe.class, Single.class, Completable.class };
+
+    /** Types that refer to a reactive type and is generally matching the parent class; for comparison, these have to be unified. */
+    static final Set<Class<?>> BASE_TYPE_SET = new HashSet<>(Arrays.asList(
+            Flowable.class, Publisher.class, Subscriber.class, FlowableSubscriber.class,
+            Observable.class, ObservableSource.class, Observer.class,
+            Maybe.class, MaybeSource.class, MaybeObserver.class,
+            Single.class, SingleSource.class, SingleObserver.class,
+            Completable.class, CompletableSource.class, CompletableObserver.class
+    ));
+
+    public static void main(String[] args) {
+        // className -> methodName -> overloads -> arguments
+        Map<String, Map<String, List<List<ArgumentNameAndType>>>> map = new HashMap<>();
+
+        for (Class<?> clazz : CLASSES) {
+            Map<String, List<List<ArgumentNameAndType>>> classMethods = map.computeIfAbsent(clazz.getSimpleName(), v -> new HashMap<>());
+            for (Method method : clazz.getDeclaredMethods()) {
+                if (method.getDeclaringClass() == clazz && method.getParameterCount() != 0) {
+                    List<List<ArgumentNameAndType>> overloads = classMethods.computeIfAbsent(method.getName(), v -> new ArrayList<>());
+
+                    List<ArgumentNameAndType> overload = new ArrayList<>();
+                    overloads.add(overload);
+
+                    for (Parameter param : method.getParameters()) {
+                        String typeName;
+                        Class<?> type = param.getType();
+                        if (type.isArray()) {
+                            Class<?> componentType = type.getComponentType();
+                            if (BASE_TYPE_SET.contains(componentType)) {
+                                typeName = "BaseType";
+                            } else {
+                                typeName = type.getComponentType().getSimpleName() + "[]";
+                            }
+                        } else
+                        if (BASE_TYPE_SET.contains(type)) {
+                            typeName = "BaseType";
+                        } else {
+                            typeName = type.getSimpleName();
+                        }
+                        String name = param.getName();
+                        if (name.equals("bufferSize") || name.equals("prefetch") || name.equals("capacityHint")) {
+                            name = "bufferSize|prefetch|capacityHint";
+                        }
+                        if (name.equals("subscriber") || name.equals("observer")) {
+                            name = "subscriber|observer";
+                        }
+                        if (name.contains("onNext")) {
+                            name = name.replace("onNext", "onNext|onSuccess");
+                        } else
+                        if (name.contains("onSuccess")) {
+                            name = name.replace("onSuccess", "onNext|onSuccess");
+                        }
+                        overload.add(new ArgumentNameAndType(typeName, name));
+                    }
+                }
+            }
+        }
+
+        int counter = 0;
+
+        for (int i = 0; i < CLASSES.length - 1; i++) {
+            String firstName = CLASSES[i].getSimpleName();
+            Map<String, List<List<ArgumentNameAndType>>> firstClassMethods = map.get(firstName);
+            for (int j = i + 1; j < CLASSES.length; j++) {
+                String secondName = CLASSES[j].getSimpleName();
+                Map<String, List<List<ArgumentNameAndType>>> secondClassMethods = map.get(secondName);
+
+                for (Map.Entry<String, List<List<ArgumentNameAndType>>> methodOverloadsFirst : firstClassMethods.entrySet()) {
+
+                    List<List<ArgumentNameAndType>> methodOverloadsSecond = secondClassMethods.get(methodOverloadsFirst.getKey());
+
+                    if (methodOverloadsSecond != null) {
+                        for (List<ArgumentNameAndType> overloadFirst : methodOverloadsFirst.getValue()) {
+                            for (List<ArgumentNameAndType> overloadSecond : methodOverloadsSecond) {
+                                if (overloadFirst.size() == overloadSecond.size()) {
+                                    // Argument types match?
+                                    boolean match = true;
+                                    for (int k = 0; k < overloadFirst.size(); k++) {
+                                        if (!overloadFirst.get(k).type.equals(overloadSecond.get(k).type)) {
+                                            match = false;
+                                            break;
+                                        }
+                                    }
+                                    // Argument names match?
+                                    if (match) {
+                                        for (int k = 0; k < overloadFirst.size(); k++) {
+                                            if (!overloadFirst.get(k).name.equals(overloadSecond.get(k).name)) {
+                                                System.out.print("Argument naming mismatch #");
+                                                System.out.println(++counter);
+
+                                                System.out.print("  ");
+                                                System.out.print(Strings.padEnd(firstName, Math.max(firstName.length(), secondName.length()) + 1, ' '));
+                                                System.out.print(methodOverloadsFirst.getKey());
+                                                System.out.print("  ");
+                                                System.out.println(overloadFirst);
+
+                                                System.out.print("  ");
+                                                System.out.print(Strings.padEnd(secondName, Math.max(firstName.length(), secondName.length()) + 1, ' '));
+                                                System.out.print(methodOverloadsFirst.getKey());
+                                                System.out.print("  ");
+                                                System.out.println(overloadSecond);
+                                                System.out.println();
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    static final class ArgumentNameAndType {
+        final String type;
+        final String name;
+
+        ArgumentNameAndType(String type, String name) {
+            this.type = type;
+            this.name = name;
+        }
+
+        @Override
+        public String toString() {
+            return type + " " + name;
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index f9becca37c..403a83964a 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -142,9 +142,6 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "delay", Long.TYPE, TimeUnit.class, Scheduler.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "delay", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE));
 
-        // null default is allowed
-        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "blockingMostRecent", Object.class));
-
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "delaySubscription", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "delaySubscription", Long.TYPE, TimeUnit.class, Scheduler.class));
@@ -390,9 +387,6 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "delay", Long.TYPE, TimeUnit.class, Scheduler.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "delay", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE));
 
-        // null default is allowed
-        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "blockingMostRecent", Object.class));
-
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "delaySubscription", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "delaySubscription", Long.TYPE, TimeUnit.class, Scheduler.class));
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
index fe6d215165..ba307d394d 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -203,7 +203,7 @@ static void processFile(Class<?> clazz) throws Exception {
 
                     int quote = line.indexOf('"', comma);
 
-                    String message = line.substring(quote + 1, quote + 2 + paramName.length());
+                    String message = line.substring(quote + 1, Math.min(line.length(), quote + 2 + paramName.length()));
 
                     if (line.contains("\"A Disposable")) {
                         continue;

From 13ffa189bb16149eec7a2fe23c03c5b35037f737 Mon Sep 17 00:00:00 2001
From: slisaasquatch <slisaasquatch@users.noreply.github.com>
Date: Tue, 21 Jan 2020 13:21:08 -0800
Subject: [PATCH 058/665] Rename Single.equals to Single.sequenceEqual (#6856)

* Rename Single.equals to Single.sequenceEqual

* Rename Single.sequenceEqual arguments

* Update mentions of renamed parameters
---
 .../java/io/reactivex/rxjava3/core/Single.java   | 16 ++++++++--------
 .../operators/single/SingleEqualsTest.java       |  2 +-
 .../operators/single/SingleMiscTest.java         |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 0541ce8657..f915bdc5b2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -1387,22 +1387,22 @@ public static Single<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Sc
      * <img width="640" height="465" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.equals.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>{@code equals} does not operate by default on a particular {@link Scheduler}.</dd>
+     * <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the common value type
-     * @param first the first {@code SingleSource} instance
-     * @param second the second {@code SingleSource} instance
+     * @param source1 the first {@code SingleSource} instance
+     * @param source2 the second {@code SingleSource} instance
      * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code first} or {@code second} is {@code null}
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
      * @since 2.0
      */
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> equals(@NonNull SingleSource<? extends T> first, @NonNull SingleSource<? extends T> second) { // NOPMD
-        Objects.requireNonNull(first, "first is null");
-        Objects.requireNonNull(second, "second is null");
-        return RxJavaPlugins.onAssembly(new SingleEquals<>(first, second));
+    public static <T> Single<Boolean> sequenceEqual(@NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2) { // NOPMD
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        return RxJavaPlugins.onAssembly(new SingleEquals<>(source1, source2));
     }
 
     /**
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
index c664784869..6c1bf14f30 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
@@ -28,7 +28,7 @@ public class SingleEqualsTest extends RxJavaTest {
     public void bothError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            Single.equals(Single.error(new TestException("One")), Single.error(new TestException("Two")))
+            Single.sequenceEqual(Single.error(new TestException("One")), Single.error(new TestException("Two")))
             .to(TestHelper.<Boolean>testConsumer())
             .assertFailureAndMessage(TestException.class, "One");
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
index ca2ccacdc2..dad1322b22 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
@@ -280,11 +280,11 @@ public void toObservable() {
 
     @Test
     public void equals() {
-        Single.equals(Single.just(1), Single.just(1).hide())
+        Single.sequenceEqual(Single.just(1), Single.just(1).hide())
         .test()
         .assertResult(true);
 
-        Single.equals(Single.just(1), Single.just(2))
+        Single.sequenceEqual(Single.just(1), Single.just(2))
         .test()
         .assertResult(false);
     }

From b6aceec436ee1dcc9ff904bb14be6698f65130e7 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 22 Jan 2020 14:03:30 +0100
Subject: [PATCH 059/665] 3.x: Verify the use of base interfaces in operator
 inputs & lambdas (#6858)

* 3.x: Verify the use of base interfaces in operator inputs & lambdas

* Add @NonNull annotations too.
---
 .../io/reactivex/rxjava3/core/Flowable.java   |   4 +-
 .../validators/OperatorsUseInterfaces.java    | 189 ++++++++++++++++++
 2 files changed, 191 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 038c3f680b..5f5aff68c6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -6790,7 +6790,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <TOpening, TClosing> Flowable<List<T>> buffer(
-            @NonNull Flowable<? extends TOpening> openingIndicator,
+            @NonNull Publisher<@NonNull ? extends TOpening> openingIndicator,
             @NonNull Function<? super TOpening, ? extends Publisher<@NonNull ? extends TClosing>> closingIndicator) {
         return buffer(openingIndicator, closingIndicator, ArrayListSupplier.asSupplier());
     }
@@ -6831,7 +6831,7 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> buffer(
-            @NonNull Flowable<? extends TOpening> openingIndicator,
+            @NonNull Publisher<@NonNull ? extends TOpening> openingIndicator,
             @NonNull Function<? super TOpening, ? extends Publisher<@NonNull ? extends TClosing>> closingIndicator,
             @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
diff --git a/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java b/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java
new file mode 100644
index 0000000000..e521c15b6e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java
@@ -0,0 +1,189 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.validators;
+
+import static org.junit.Assert.*;
+
+import java.lang.reflect.*;
+import java.util.*;
+import java.util.Observable;
+import java.util.concurrent.Callable;
+
+import org.junit.Test;
+import org.reactivestreams.Publisher;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+
+/**
+ * Verify that an operator method uses base interfaces as its direct input or
+ * has lambdas returning base interfaces.
+ */
+public class OperatorsUseInterfaces {
+
+    @Test
+    public void checkFlowable() {
+        checkClass(Flowable.class);
+    }
+
+    @Test
+    public void checkObservable() {
+        checkClass(Observable.class);
+    }
+
+    @Test
+    public void checkMaybe() {
+        checkClass(Maybe.class);
+    }
+
+    @Test
+    public void checkSingle() {
+        checkClass(Single.class);
+    }
+
+    @Test
+    public void checkCompletable() {
+        checkClass(Completable.class);
+    }
+
+    @Test
+    public void checkParallelFlowable() {
+        checkClass(ParallelFlowable.class);
+    }
+
+    void checkClass(Class<?> clazz) {
+        StringBuilder error = new StringBuilder();
+        int errors = 0;
+
+        for (Method method : clazz.getMethods()) {
+            if (method.getDeclaringClass() == clazz) {
+                int pidx = 1;
+                for (Parameter param : method.getParameters()) {
+                    Class<?> type = param.getType();
+                    if (type.isArray()) {
+                        type = type.getComponentType();
+                    }
+                    if (CLASSES.contains(type)) {
+                        errors++;
+                        error.append("Non-interface input parameter #")
+                        .append(pidx)
+                        .append(": ")
+                        .append(type)
+                        .append("\r\n")
+                        .append("    ")
+                        .append(method)
+                        .append("\r\n")
+                        ;
+                    }
+                    if (CAN_RETURN.contains(type)) {
+                        Type gtype = method.getGenericParameterTypes()[pidx - 1];
+                        if (gtype instanceof GenericArrayType) {
+                            gtype = ((GenericArrayType)gtype).getGenericComponentType();
+                        }
+                        ParameterizedType ptype = (ParameterizedType)gtype;
+                        for (;;) {
+                            Type[] parameterArgTypes = ptype.getActualTypeArguments();
+                            Type argType = parameterArgTypes[parameterArgTypes.length - 1];
+                            if (argType instanceof GenericArrayType) {
+                                argType = ((GenericArrayType)argType).getGenericComponentType();
+                            }
+                            if (argType instanceof ParameterizedType) {
+                                ParameterizedType lastArg = (ParameterizedType)argType;
+
+                                if (CLASSES.contains(lastArg.getRawType())) {
+                                    errors++;
+                                    error.append("Non-interface lambda return #")
+                                    .append(pidx)
+                                    .append(": ")
+                                    .append(type)
+                                    .append("\r\n")
+                                    .append("    ")
+                                    .append(method)
+                                    .append("\r\n")
+                                    ;
+                                }
+
+                                if (CAN_RETURN.contains(lastArg.getRawType())) {
+                                    ptype = lastArg;
+                                    continue;
+                                }
+                            }
+                            break;
+                        }
+                    }
+                    pidx++;
+                }
+            }
+        }
+
+        if (errors != 0) {
+            error.insert(0, "Found " + errors + " issues\r\n");
+            fail(error.toString());
+        }
+    }
+
+    public void method1(Flowable<?> f) {
+        // self-test
+    }
+
+    public void method2(Callable<Flowable<?>> c) {
+        // self-test
+    }
+
+    public void method3(Supplier<Publisher<Flowable<?>>> c) {
+        // self-test
+    }
+
+    public void method4(Flowable<?>[] array) {
+        // self-test
+    }
+
+    public void method5(Callable<Flowable<?>[]> c) {
+        // self-test
+    }
+
+    public void method6(Callable<Publisher<Flowable<?>[]>> c) {
+        // self-test
+    }
+
+    @Test
+    public void checkSelf() {
+        try {
+            checkClass(OperatorsUseInterfaces.class);
+            throw new RuntimeException("Should have failed");
+        } catch (AssertionError expected) {
+            assertTrue(expected.toString(), expected.toString().contains("method1"));
+            assertTrue(expected.toString(), expected.toString().contains("method2"));
+            assertTrue(expected.toString(), expected.toString().contains("method3"));
+            assertTrue(expected.toString(), expected.toString().contains("method4"));
+            assertTrue(expected.toString(), expected.toString().contains("method5"));
+            assertTrue(expected.toString(), expected.toString().contains("method6"));
+        }
+    }
+
+    static final Set<Class<?>> CLASSES = new HashSet<>(Arrays.asList(
+            Flowable.class, Observable.class,
+            Maybe.class, Single.class,
+            Completable.class
+    ));
+
+    static final Set<Class<?>> CAN_RETURN = new HashSet<>(Arrays.asList(
+            Callable.class, Supplier.class,
+            Function.class, BiFunction.class, Function3.class, Function4.class,
+            Function5.class, Function6.class, Function7.class, Function8.class,
+            Function9.class,
+            Publisher.class, ObservableSource.class, MaybeSource.class, SingleSource.class
+    ));
+}

From 99de2aa77c9b29620177397190ded1211e4fc772 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 22 Jan 2020 14:03:53 +0100
Subject: [PATCH 060/665] 3.x: [Wiki] Improve Operator-Matrix with links and
 notes (#6857)

---
 docs/Operator-Matrix.md                       | 587 +++++++++++-------
 .../util/OperatorMatrixGenerator.java         | 385 +++++++++++-
 2 files changed, 727 insertions(+), 245 deletions(-)

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index ded48d8509..832d64311d 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -1,240 +1,347 @@
-Operator | `Flowable` | `Observable` | `Maybe` | `Single` | `Completable` |
------|:---:|:---:|:---:|:---:|:---:|
-`all`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`amb`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`ambArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`ambWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`andThen`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`any`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingAwait`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`blockingFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingForEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingGet`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingMostRecent`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`blockingSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`buffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`cache`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`cacheWithInitialCapacity`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`cast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`collect`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`collectInto`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`combineLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`combineLatestArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`combineLatestArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`combineLatestDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`complete`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`compose`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`concat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`concatArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`concatArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatArrayEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatArrayEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`concatWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`contains`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`count`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`create`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`debounce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`defaultIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`defer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`delay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`delaySubscription`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`doAfterSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`doAfterTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`doFinally`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`doOnCancel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`doOnComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`doOnDispose`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`doOnError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`doOnLifecycle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`doOnSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`doOnSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`doOnTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`equals`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`error`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`firstElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`firstOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`firstOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`firstStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flatMapObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flatMapPublisher`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flatMapSingleElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flattenAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flattenAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flattenStreamAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`forEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`forEachWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`fromAction`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`fromArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`fromCallable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`fromCompletable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`fromCompletionStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`fromFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`fromIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`fromMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`fromObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`fromOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`fromPublisher`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`fromRunnable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`fromSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`fromStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`fromSupplier`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`generate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`groupBy`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`groupJoin`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`hide`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`ignoreElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`ignoreElements`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`interval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`intervalRange`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`isEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`join`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`just`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`last`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`lastElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`lastOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`lastOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`lastStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`lift`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`map`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`mapOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`materialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`merge`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`mergeArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`mergeArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`mergeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`mergeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`never`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`observeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`onErrorComplete`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`onErrorResumeNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`onErrorResumeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`onErrorReturn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`onErrorReturnItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`onTerminateDetach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`parallel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`publish`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`range`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`rangeLong`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`rebatchRequests`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`reduce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`reduceWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`repeat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`repeatUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`repeatWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`replay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`retry`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`retryWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`singleElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`singleOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`singleOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`singleStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`skip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`skipLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`skipUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`skipWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`sorted`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`startWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`startWithArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`startWithItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`startWithIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`subscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`subscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`subscribeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`switchIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`switchOnNextDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`takeUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`takeWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`test`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`throttleFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`timeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`timer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`to`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`toFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`toList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`toMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`toMultimap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`toObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`toSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`toSingleDefault`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`toSortedList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`unsafeCreate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`unsubscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`using`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`window`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`withLatestFrom`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`wrap`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmatrix-flowable.png) | ![Observable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmatrix-observable.png) | ![Maybe](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmatrix-maybe.png) | ![Single](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmatrix-single.png) | ![Completable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmatrix-completable.png) |
+-----|---|---|---|---|---|
+<a name='all'></a>`all`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use contains().'>([1](#notes-1))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use contains().'>([1](#notes-1))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='amb'></a>`amb`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='ambArray'></a>`ambArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='ambWith'></a>`ambWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='andThen'></a>`andThen`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatWith.'>([3](#notes-3))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatWith.'>([3](#notes-3))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatWith.'>([3](#notes-3))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatWith.'>([3](#notes-3))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='any'></a>`any`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use contains().'>([1](#notes-1))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use contains().'>([1](#notes-1))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='blockingAwait'></a>`blockingAwait`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use blockingFirst().'>([4](#notes-4))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use blockingFirst().'>([4](#notes-4))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use blockingGet().'>([5](#notes-5))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use blockingGet().'>([5](#notes-5))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='blockingFirst'></a>`blockingFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
+<a name='blockingForEach'></a>`blockingForEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use blockingSubscribe()'>([8](#notes-8))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use blockingSubscribe()'>([8](#notes-8))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use blockingSubscribe()'>([8](#notes-8))</sup>|
+<a name='blockingGet'></a>`blockingGet`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use blockingFirst().'>([4](#notes-4))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use blockingFirst().'>([4](#notes-4))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
+<a name='blockingIterable'></a>`blockingIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
+<a name='blockingLast'></a>`blockingLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
+<a name='blockingLatest'></a>`blockingLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
+<a name='blockingMostRecent'></a>`blockingMostRecent`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
+<a name='blockingNext'></a>`blockingNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
+<a name='blockingSingle'></a>`blockingSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
+<a name='blockingStream'></a>`blockingStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
+<a name='blockingSubscribe'></a>`blockingSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='buffer'></a>`buffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a list/collection.'>([9](#notes-9))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a list/collection.'>([10](#notes-10))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a list/collection.'>([11](#notes-11))</sup>|
+<a name='cache'></a>`cache`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='cacheWithInitialCapacity'></a>`cacheWithInitialCapacity`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to store. Use cache().'>([12](#notes-12))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to store. Use cache().'>([12](#notes-12))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to store. Use cache().'>([12](#notes-12))</sup>|
+<a name='cast'></a>`cast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='collect'></a>`collect`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
+<a name='collectInto'></a>`collectInto`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
+<a name='combineLatest'></a>`combineLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use merge().'>([17](#notes-17))</sup>|
+<a name='combineLatestArray'></a>`combineLatestArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zipArray().'>([18](#notes-18))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zipArray().'>([18](#notes-18))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use mergeArray().'>([19](#notes-19))</sup>|
+<a name='combineLatestArrayDelayError'></a>`combineLatestArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zipArray().'>([18](#notes-18))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zipArray().'>([18](#notes-18))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use mergeArrayDelayError().'>([20](#notes-20))</sup>|
+<a name='combineLatestDelayError'></a>`combineLatestDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use mergeDelayError().'>([21](#notes-21))</sup>|
+<a name='complete'></a>`complete`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use empty().'>([22](#notes-22))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use empty().'>([22](#notes-22))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use empty().'>([22](#notes-22))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='compose'></a>`compose`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='concat'></a>`concat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='concatArray'></a>`concatArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='concatArrayDelayError'></a>`concatArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='concatArrayEager'></a>`concatArrayEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArray().'>([24](#notes-24))</sup>|
+<a name='concatArrayEagerDelayError'></a>`concatArrayEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArrayDelayError().'>([25](#notes-25))</sup>|
+<a name='concatDelayError'></a>`concatDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='concatEager'></a>`concatEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use merge().'>([26](#notes-26))</sup>|
+<a name='concatMap'></a>`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapCompletable'></a>`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapCompletableDelayError'></a>`concatMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapDelayError'></a>`concatMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='concatMapEager'></a>`concatMapEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='concatMapEagerDelayError'></a>`concatMapEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='concatMapIterable'></a>`concatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapMaybe'></a>`concatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapMaybeDelayError'></a>`concatMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapSingle'></a>`concatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapSingleDelayError'></a>`concatMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapStream'></a>`concatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatWith'></a>`concatWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='contains'></a>`contains`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='count'></a>`count`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty thus always 1.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus always 0.'>([31](#notes-31))</sup>|
+<a name='create'></a>`create`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='debounce'></a>`debounce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='defaultIfEmpty'></a>`defaultIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
+<a name='defer'></a>`defer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='delay'></a>`delay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='delaySubscription'></a>`delaySubscription`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='dematerialize'></a>`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='distinct'></a>`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='distinctUntilChanged'></a>`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='doAfterNext'></a>`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='doAfterSuccess'></a>`doAfterSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([37](#notes-37))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([37](#notes-37))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='doAfterTerminate'></a>`doAfterTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doFinally'></a>`doFinally`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnCancel'></a>`doOnCancel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([38](#notes-38))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([38](#notes-38))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([38](#notes-38))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([38](#notes-38))</sup>|
+<a name='doOnComplete'></a>`doOnComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always succeeds or fails, there is no onComplete signal.'>([39](#notes-39))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnDispose'></a>`doOnDispose`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnCancel().'>([40](#notes-40))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnEach'></a>`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([41](#notes-41))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([41](#notes-41))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='doOnError'></a>`doOnError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnEvent'></a>`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([42](#notes-42))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnLifecycle'></a>`doOnLifecycle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='doOnNext'></a>`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='doOnRequest'></a>`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
+<a name='doOnSubscribe'></a>`doOnSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnSuccess'></a>`doOnSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([45](#notes-45))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='doOnTerminate'></a>`doOnTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='elementAt'></a>`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use defaultIfEmpty.'>([46](#notes-46))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([47](#notes-47))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='elementAtOrError'></a>`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use toSingle.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='empty'></a>`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use complete().'>([49](#notes-49))</sup>|
+<a name='equals'></a>`equals`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='error'></a>`error`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='filter'></a>`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='first'></a>`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
+<a name='firstElement'></a>`firstElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='firstOrError'></a>`firstOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([54](#notes-54))</sup>|
+<a name='firstOrErrorStage'></a>`firstOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([56](#notes-56))</sup>|
+<a name='firstStage'></a>`firstStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|
+<a name='flatMap'></a>`flatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapCompletable'></a>`flatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapIterable'></a>`flatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapMaybe'></a>`flatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapObservable'></a>`flatMapObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([58](#notes-58))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapPublisher'></a>`flatMapPublisher`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([59](#notes-59))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapSingle'></a>`flatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapSingleElement'></a>`flatMapSingleElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([60](#notes-60))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapStream'></a>`flatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenAsFlowable'></a>`flattenAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([61](#notes-61))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenAsObservable'></a>`flattenAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([61](#notes-61))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenStreamAsFlowable'></a>`flattenStreamAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([62](#notes-62))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenStreamAsObservable'></a>`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([62](#notes-62))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='forEach'></a>`forEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|
+<a name='forEachWhile'></a>`forEachWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|
+<a name='fromAction'></a>`fromAction`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromArray'></a>`fromArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([64](#notes-64))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
+<a name='fromCallable'></a>`fromCallable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromCompletable'></a>`fromCompletable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always error.'>([67](#notes-67))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([68](#notes-68))</sup>|
+<a name='fromCompletionStage'></a>`fromCompletionStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromFuture'></a>`fromFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromIterable'></a>`fromIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([64](#notes-64))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
+<a name='fromMaybe'></a>`fromMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromObservable'></a>`fromObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromOptional'></a>`fromOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
+<a name='fromPublisher'></a>`fromPublisher`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromRunnable'></a>`fromRunnable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromSingle'></a>`fromSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromStream'></a>`fromStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([64](#notes-64))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
+<a name='fromSupplier'></a>`fromSupplier`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='generate'></a>`generate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([69](#notes-69))</sup>|
+<a name='groupBy'></a>`groupBy`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to group.'>([71](#notes-71))</sup>|
+<a name='groupJoin'></a>`groupJoin`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([72](#notes-72))</sup>|
+<a name='hide'></a>`hide`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='ignoreElement'></a>`ignoreElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='ignoreElements'></a>`ignoreElements`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='interval'></a>`interval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|
+<a name='intervalRange'></a>`intervalRange`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|
+<a name='isEmpty'></a>`isEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='join'></a>`join`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([76](#notes-76))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([76](#notes-76))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([72](#notes-72))</sup>|
+<a name='just'></a>`just`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='last'></a>`last`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
+<a name='lastElement'></a>`lastElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='lastOrError'></a>`lastOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([54](#notes-54))</sup>|
+<a name='lastOrErrorStage'></a>`lastOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([56](#notes-56))</sup>|
+<a name='lastStage'></a>`lastStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|
+<a name='lift'></a>`lift`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='map'></a>`map`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='mapOptional'></a>`mapOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='materialize'></a>`materialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='merge'></a>`merge`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='mergeArray'></a>`mergeArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='mergeArrayDelayError'></a>`mergeArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='mergeDelayError'></a>`mergeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='mergeWith'></a>`mergeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='never'></a>`never`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='observeOn'></a>`observeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='ofType'></a>`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to filter.'>([77](#notes-77))</sup>|
+<a name='onBackpressureBuffer'></a>`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
+<a name='onBackpressureDrop'></a>`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
+<a name='onBackpressureLatest'></a>`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
+<a name='onErrorComplete'></a>`onErrorComplete`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='onErrorResumeNext'></a>`onErrorResumeNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='onErrorResumeWith'></a>`onErrorResumeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='onErrorReturn'></a>`onErrorReturn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='onErrorReturnItem'></a>`onErrorReturnItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='onTerminateDetach'></a>`onTerminateDetach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='parallel'></a>`parallel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([78](#notes-78))</sup>|
+<a name='publish'></a>`publish`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([81](#notes-81))</sup>|
+<a name='range'></a>`range`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
+<a name='rangeLong'></a>`rangeLong`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
+<a name='rebatchRequests'></a>`rebatchRequests`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
+<a name='reduce'></a>`reduce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
+<a name='reduceWith'></a>`reduceWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
+<a name='repeat'></a>`repeat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='repeatUntil'></a>`repeatUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='repeatWhen'></a>`repeatWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='replay'></a>`replay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([81](#notes-81))</sup>|
+<a name='retry'></a>`retry`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='retryUntil'></a>`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='retryWhen'></a>`retryWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='safeSubscribe'></a>`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='scan'></a>`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
+<a name='scanWith'></a>`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
+<a name='sequenceEqual'></a>`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='serialize'></a>`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([85](#notes-85))</sup>|
+<a name='share'></a>`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([81](#notes-81))</sup>|
+<a name='single'></a>`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
+<a name='singleElement'></a>`singleElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='singleOrError'></a>`singleOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([54](#notes-54))</sup>|
+<a name='singleOrErrorStage'></a>`singleOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([56](#notes-56))</sup>|
+<a name='singleStage'></a>`singleStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|
+<a name='skip'></a>`skip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|
+<a name='skipLast'></a>`skipLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|
+<a name='skipUntil'></a>`skipUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([86](#notes-86))</sup>|
+<a name='skipWhile'></a>`skipWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='sorted'></a>`sorted`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|
+<a name='startWith'></a>`startWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='startWithArray'></a>`startWithArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([88](#notes-88))</sup>|
+<a name='startWithItem'></a>`startWithItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([89](#notes-89))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([89](#notes-89))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([89](#notes-89))</sup>|
+<a name='startWithIterable'></a>`startWithIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([90](#notes-90))</sup>|
+<a name='subscribe'></a>`subscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='subscribeOn'></a>`subscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='subscribeWith'></a>`subscribeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='switchIfEmpty'></a>`switchIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use defaultIfEmpty().'>([91](#notes-91))</sup>|
+<a name='switchMap'></a>`switchMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapCompletable'></a>`switchMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapCompletableDelayError'></a>`switchMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapDelayError'></a>`switchMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapMaybe'></a>`switchMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapMaybeDelayError'></a>`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapSingle'></a>`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapSingleDelayError'></a>`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchOnNext'></a>`switchOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='switchOnNextDelayError'></a>`switchOnNextDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='take'></a>`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|
+<a name='takeLast'></a>`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|
+<a name='takeUntil'></a>`takeUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='takeWhile'></a>`takeWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='test'></a>`test`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='throttleFirst'></a>`throttleFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='throttleLast'></a>`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='throttleLatest'></a>`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='throttleWithTimeout'></a>`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='timeInterval'></a>`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='timeout'></a>`timeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='timer'></a>`timer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='to'></a>`to`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toCompletionStage'></a>`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([93](#notes-93))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toFuture'></a>`toFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='toList'></a>`toList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
+<a name='toMap'></a>`toMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
+<a name='toMaybe'></a>`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([95](#notes-95))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toMultimap'></a>`toMultimap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
+<a name='toObservable'></a>`toObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([95](#notes-95))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toSingle'></a>`toSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([96](#notes-96))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([96](#notes-96))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([95](#notes-95))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toSingleDefault'></a>`toSingleDefault`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use defaultIfEmpty().'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([95](#notes-95))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toSortedList'></a>`toSortedList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
+<a name='unsafeCreate'></a>`unsafeCreate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='unsubscribeOn'></a>`unsubscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='using'></a>`using`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='window'></a>`window`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([99](#notes-99))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a nested source.'>([101](#notes-101))</sup>|
+<a name='withLatestFrom'></a>`withLatestFrom`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use merge().'>([17](#notes-17))</sup>|
+<a name='wrap'></a>`wrap`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromPublisher().'>([102](#notes-102))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([103](#notes-103))</sup>|
+<a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([104](#notes-104))</sup>|
+<a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([105](#notes-105))</sup>|
+
+#### Notes
+<a name='notes-1'></a><sup>1</sup> Use [`contains()`](#contains).<br/>
+<a name='notes-2'></a><sup>2</sup> Always empty.<br/>
+<a name='notes-3'></a><sup>3</sup> Use [`concatWith`](#concatWith).<br/>
+<a name='notes-4'></a><sup>4</sup> Use [`blockingFirst()`](#blockingFirst), [`blockingSingle()`](#blockingSingle) or [`blockingLast()`](#blockingLast).<br/>
+<a name='notes-5'></a><sup>5</sup> Use [`blockingGet()`](#blockingGet).<br/>
+<a name='notes-6'></a><sup>6</sup> At most one element to get. Use [`blockingGet()`](#blockingGet).<br/>
+<a name='notes-7'></a><sup>7</sup> No elements to get. Use [`blockingAwait()`](#blockingAwait).<br/>
+<a name='notes-8'></a><sup>8</sup> Use [`blockingSubscribe()`](#blockingSubscribe)<br/>
+<a name='notes-9'></a><sup>9</sup> Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.<br/>
+<a name='notes-10'></a><sup>10</sup> Use [`map()`](#map) to transform into a list/collection.<br/>
+<a name='notes-11'></a><sup>11</sup> Always empty. Use [`andThen()`](#andThen) to bring in a list/collection.<br/>
+<a name='notes-12'></a><sup>12</sup> At most one element to store. Use [`cache()`](#cache).<br/>
+<a name='notes-13'></a><sup>13</sup> At most one element to collect. Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.<br/>
+<a name='notes-14'></a><sup>14</sup> One element to collect. Use [`map()`](#map) to transform into a list/collection.<br/>
+<a name='notes-15'></a><sup>15</sup> Always empty. Use [`andThen()`](#andThen) to bring in a collection.<br/>
+<a name='notes-16'></a><sup>16</sup> At most one element per source. Use [`zip()`](#zip).<br/>
+<a name='notes-17'></a><sup>17</sup> Always empty. Use [`merge()`](#merge).<br/>
+<a name='notes-18'></a><sup>18</sup> At most one element per source. Use [`zipArray()`](#zipArray).<br/>
+<a name='notes-19'></a><sup>19</sup> Always empty. Use [`mergeArray()`](#mergeArray).<br/>
+<a name='notes-20'></a><sup>20</sup> Always empty. Use [`mergeArrayDelayError()`](#mergeArrayDelayError).<br/>
+<a name='notes-21'></a><sup>21</sup> Always empty. Use [`mergeDelayError()`](#mergeDelayError).<br/>
+<a name='notes-22'></a><sup>22</sup> Use [`empty()`](#empty).<br/>
+<a name='notes-23'></a><sup>23</sup> Never empty.<br/>
+<a name='notes-24'></a><sup>24</sup> No items to keep ordered. Use [`mergeArray()`](#mergeArray).<br/>
+<a name='notes-25'></a><sup>25</sup> No items to keep ordered. Use [`mergeArrayDelayError()`](#mergeArrayDelayError).<br/>
+<a name='notes-26'></a><sup>26</sup> No items to keep ordered. Use [`merge()`](#merge).<br/>
+<a name='notes-27'></a><sup>27</sup> Always empty thus no items to map.<br/>
+<a name='notes-28'></a><sup>28</sup> At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).<br/>
+<a name='notes-29'></a><sup>29</sup> At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).<br/>
+<a name='notes-30'></a><sup>30</sup> Never empty thus always 1.<br/>
+<a name='notes-31'></a><sup>31</sup> Always empty thus always 0.<br/>
+<a name='notes-32'></a><sup>32</sup> At most one item signaled so no subsequent items to work with.<br/>
+<a name='notes-33'></a><sup>33</sup> Always empty thus no items to work with.<br/>
+<a name='notes-34'></a><sup>34</sup> Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.<br/>
+<a name='notes-35'></a><sup>35</sup> At most one item, always distinct.<br/>
+<a name='notes-36'></a><sup>36</sup> Different terminology. Use [`doAfterSuccess()`](#doAfterSuccess).<br/>
+<a name='notes-37'></a><sup>37</sup> Different terminology. Use [`doAfterNext()`](#doAfterNext).<br/>
+<a name='notes-38'></a><sup>38</sup> Different terminology. Use [`doOnDispose()`](#doOnDispose).<br/>
+<a name='notes-39'></a><sup>39</sup> Always succeeds or fails, there is no `onComplete` signal.<br/>
+<a name='notes-40'></a><sup>40</sup> Different terminology. Use [`doOnCancel()`](#doOnCancel).<br/>
+<a name='notes-41'></a><sup>41</sup> At most one item. Use [`doOnEvent()`](#doOnEvent).<br/>
+<a name='notes-42'></a><sup>42</sup> Use [`doOnEach()`](#doOnEach).<br/>
+<a name='notes-43'></a><sup>43</sup> Different terminology. Use [`doOnSuccess()`](#doOnSuccess).<br/>
+<a name='notes-44'></a><sup>44</sup> Backpressure related and not supported outside `Flowable`.<br/>
+<a name='notes-45'></a><sup>45</sup> Different terminology. Use [`doOnNext()`](#doOnNext).<br/>
+<a name='notes-46'></a><sup>46</sup> At most one item with index 0. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
+<a name='notes-47'></a><sup>47</sup> Always one item with index 0.<br/>
+<a name='notes-48'></a><sup>48</sup> At most one item with index 0. Use [`toSingle`](#toSingle).<br/>
+<a name='notes-49'></a><sup>49</sup> Use [`complete()`](#complete).<br/>
+<a name='notes-50'></a><sup>50</sup> At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
+<a name='notes-51'></a><sup>51</sup> Always one item.<br/>
+<a name='notes-52'></a><sup>52</sup> At most one item, would be no-op.<br/>
+<a name='notes-53'></a><sup>53</sup> Always one item, would be no-op.<br/>
+<a name='notes-54'></a><sup>54</sup> Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).<br/>
+<a name='notes-55'></a><sup>55</sup> At most one item. Use [`toCompletionStage()`](#toCompletionStage).<br/>
+<a name='notes-56'></a><sup>56</sup> Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).<br/>
+<a name='notes-57'></a><sup>57</sup> Not supported. Use [`flatMap`](#flatMap) and [`toFlowable()`](#toFlowable).<br/>
+<a name='notes-58'></a><sup>58</sup> Use [`flatMap`](#flatMap).<br/>
+<a name='notes-59'></a><sup>59</sup> Not supported. Use [`flatMap`](#flatMap) and [`toObservable()`](#toFlowable).<br/>
+<a name='notes-60'></a><sup>60</sup> Use [`flatMapSingle`](#flatMapSingle).<br/>
+<a name='notes-61'></a><sup>61</sup> Use [`flatMapIterable()`](#flatMapIterable).<br/>
+<a name='notes-62'></a><sup>62</sup> Use [`flatMapStream()`](#flatMapStream).<br/>
+<a name='notes-63'></a><sup>63</sup> Use [`subscribe()`](#subscribe).<br/>
+<a name='notes-64'></a><sup>64</sup> At most one item. Use [`just()`](#just) or [`empty()`](#empty).<br/>
+<a name='notes-65'></a><sup>65</sup> Always one item. Use [`just()`](#just).<br/>
+<a name='notes-66'></a><sup>66</sup> Always empty. Use [`complete()`](#complete).<br/>
+<a name='notes-67'></a><sup>67</sup> Always error.<br/>
+<a name='notes-68'></a><sup>68</sup> Use [`wrap()`](#wrap).<br/>
+<a name='notes-69'></a><sup>69</sup> Use [`fromSupplier()`](#fromSupplier).<br/>
+<a name='notes-70'></a><sup>70</sup> At most one item.<br/>
+<a name='notes-71'></a><sup>71</sup> Always empty thus no items to group.<br/>
+<a name='notes-72'></a><sup>72</sup> Always empty thus no items to join.<br/>
+<a name='notes-73'></a><sup>73</sup> Use [`ignoreElements()`](#ignoreElements).<br/>
+<a name='notes-74'></a><sup>74</sup> Use [`ignoreElement()`](#ignoreElement).<br/>
+<a name='notes-75'></a><sup>75</sup> At most one item. Use [`timer()`](#timer).<br/>
+<a name='notes-76'></a><sup>76</sup> At most one item. Use [`zip()`](#zip)<br/>
+<a name='notes-77'></a><sup>77</sup> Always empty thus no items to filter.<br/>
+<a name='notes-78'></a><sup>78</sup> Needs backpressure thus not supported outside `Flowable`.<br/>
+<a name='notes-79'></a><sup>79</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `MaybeSubject`.<br/>
+<a name='notes-80'></a><sup>80</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `SingleSubject`.<br/>
+<a name='notes-81'></a><sup>81</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `ConnectableSubject`.<br/>
+<a name='notes-82'></a><sup>82</sup> At most one item. Use [`just()`](#just).<br/>
+<a name='notes-83'></a><sup>83</sup> At most one item. Use [`map()`](#map).<br/>
+<a name='notes-84'></a><sup>84</sup> Always empty thus no items to reduce.<br/>
+<a name='notes-85'></a><sup>85</sup> At most one signal type.<br/>
+<a name='notes-86'></a><sup>86</sup> At most one item. Use [`takeUntil()`](#takeUntil).<br/>
+<a name='notes-87'></a><sup>87</sup> At most one item. Use [`filter()`](#filter).<br/>
+<a name='notes-88'></a><sup>88</sup> Use [`startWith()`](#startWith) and [`fromArray()`](#fromArray) of `Flowable` or `Observable`.<br/>
+<a name='notes-89'></a><sup>89</sup> Use [`startWith()`](#startWith) and [`just()`](#just) of another reactive type.<br/>
+<a name='notes-90'></a><sup>90</sup> Use [`startWith()`](#startWith) and [`fromIterable()`](#fromArray) of `Flowable` or `Observable`.<br/>
+<a name='notes-91'></a><sup>91</sup> Always empty. Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
+<a name='notes-92'></a><sup>92</sup> At most one item. Use [`flatMap()`](#flatMap).<br/>
+<a name='notes-93'></a><sup>93</sup> Use [`firstStage`](#firstStage), [`lastStage`](#lastStage) or [`singleStage`](#singleStage).<br/>
+<a name='notes-94'></a><sup>94</sup> Use [`firstElement`](#firstElement), [`lastElement`](#lastElement) or [`singleElement`](#singleElement).<br/>
+<a name='notes-95'></a><sup>95</sup> Would be no-op.<br/>
+<a name='notes-96'></a><sup>96</sup> Use [`firstOrError`](#firstOrError), [`lastOrError`](#lastOrError) or [`singleOrError`](#singleOrError).<br/>
+<a name='notes-97'></a><sup>97</sup> Use [`first`](#first), [`last`](#last) or [`single`](#single).<br/>
+<a name='notes-98'></a><sup>98</sup> Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
+<a name='notes-99'></a><sup>99</sup> Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a nested source.<br/>
+<a name='notes-100'></a><sup>100</sup> Use [`map()`](#map) to transform into a nested source.<br/>
+<a name='notes-101'></a><sup>101</sup> Always empty. Use [`andThen()`](#andThen) to bring in a nested source.<br/>
+<a name='notes-102'></a><sup>102</sup> Use [`fromPublisher()`](#fromPublisher).<br/>
+<a name='notes-103'></a><sup>103</sup> Use [`merge()`](#merge).<br/>
+<a name='notes-104'></a><sup>104</sup> Use [`mergeArray()`](#mergeArray).<br/>
+<a name='notes-105'></a><sup>105</sup> Use [`mergeWith()`](#mergeWith).<br/>
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index 42ea23dd1d..1273a5b441 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -40,6 +40,10 @@ private OperatorMatrixGenerator() {
             Flowable.class, Observable.class, Maybe.class, Single.class, Completable.class
     };
 
+    static String header(String type) {
+        return "![" + type + "](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmatrix-" + type.toLowerCase() + ".png)";
+    }
+
     public static void main(String[] args) throws IOException {
         Set<String> operatorSet = new HashSet<>();
         Map<Class<?>, Set<String>> operatorMap = new HashMap<>();
@@ -64,18 +68,24 @@ public static void main(String[] args) throws IOException {
         try (PrintWriter out = new PrintWriter(Files.newBufferedWriter(Paths.get("docs", "Operator-Matrix.md"), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING))) {
             out.print("Operator |");
             for (Class<?> clazz : CLASSES) {
-                out.print(" `");
-                out.print(clazz.getSimpleName());
-                out.print("` |");
+                out.print(" ");
+                out.print(header(clazz.getSimpleName()));
+                out.print(" |");
             }
             out.println();
             out.print("-----|");
             for (int i = 0; i < CLASSES.length; i++) {
-                out.print(":---:|");
+                out.print("---|");
             }
             out.println();
+
+            Map<String, Integer> notesMap = new HashMap<>();
+            List<String> notesList = new ArrayList<>();
+
             for (String operatorName : sortedOperators) {
-                out.print("`");
+                out.print("<a name='");
+                out.print(operatorName);
+                out.print("'></a>`");
                 out.print(operatorName);
                 out.print("`|");
                 for (Class<?> clazz : CLASSES) {
@@ -83,11 +93,376 @@ public static void main(String[] args) throws IOException {
                         out.print(PRESENT);
                     } else {
                         out.print(ABSENT);
+                        String notes = findNotes(clazz.getSimpleName(), operatorName);
+                        if (notes != null) {
+                            Integer index = notesMap.get(notes);
+                            if (index == null) {
+                                index = notesMap.size() + 1;
+                                notesMap.put(notes, index);
+                                notesList.add(notes);
+                            }
+                            out.print(" <sup title='");
+                            out.print(notes.replace("`", "").replace("[", "").replace("]", "").replaceAll("\\(#.+\\)", ""));
+                            out.print("'>([");
+                            out.print(index);
+                            out.print("](#notes-");
+                            out.print(index);
+                            out.print("))</sup>");
+                        }
                     }
                     out.print("|");
                 }
                 out.println();
             }
+
+            if (!notesList.isEmpty()) {
+                out.println();
+                out.println("#### Notes");
+
+                for (int i = 0; i < notesList.size(); i++) {
+                    out.print("<a name='notes-");
+                    out.print(i + 1);
+                    out.print("'></a><sup>");
+                    out.print(i + 1);
+                    out.print("</sup> ");
+                    out.print(notesList.get(i));
+                    out.println("<br/>");
+                }
+            }
+        }
+    }
+
+    static String findNotes(String clazzName, String operatorName) {
+        Map<String, String> classNotes = NOTES_MAP.get(operatorName);
+        if (classNotes != null) {
+            return classNotes.get(clazzName.substring(0, 1));
+        }
+        switch (operatorName) {
+            case "empty": {
+                if ("Completable".equals(clazzName)) {
+                    return "Use [`complete()`](#complete).";
+                }
+                if ("Single".equals(clazzName)) {
+                    return "Never empty.";
+                }
+                break;
+            }
+        }
+        return null;
+    }
+
+    static final String[] NOTES = {
+            // Format
+            // FOMSC methodName note
+            "  MS  all                                  Use [`contains()`](#contains).",
+            "    C all                                  Always empty.",
+            "FOMS  andThen                              Use [`concatWith`](#concatWith).",
+            "  MS  any                                  Use [`contains()`](#contains).",
+            "    C any                                  Always empty.",
+            "FO    blockingAwait                        Use [`blockingFirst()`](#blockingFirst), [`blockingSingle()`](#blockingSingle) or [`blockingLast()`](#blockingLast).",
+            "  MS  blockingAwait                        Use [`blockingGet()`](#blockingGet).",
+            "  MS  blockingFirst                        At most one element to get. Use [`blockingGet()`](#blockingGet).",
+            "    C blockingFirst                        No elements to get. Use [`blockingAwait()`](#blockingAwait).",
+            "  MSC blockingForEach                      Use [`blockingSubscribe()`](#blockingSubscribe)",
+            "FO    blockingGet                          Use [`blockingFirst()`](#blockingFirst), [`blockingSingle()`](#blockingSingle) or [`blockingLast()`](#blockingLast).",
+            "    C blockingGet                          No elements to get. Use [`blockingAwait()`](#blockingAwait).",
+            "  MS  blockingIterable                     At most one element to get. Use [`blockingGet()`](#blockingGet).",
+            "    C blockingIterable                     No elements to get. Use [`blockingAwait()`](#blockingAwait).",
+            "  MS  blockingLast                         At most one element to get. Use [`blockingGet()`](#blockingGet).",
+            "    C blockingLast                         No elements to get. Use [`blockingAwait()`](#blockingAwait).",
+            "  MS  blockingLatest                       At most one element to get. Use [`blockingGet()`](#blockingGet).",
+            "    C blockingLatest                       No elements to get. Use [`blockingAwait()`](#blockingAwait).",
+            "  MS  blockingMostRecent                   At most one element to get. Use [`blockingGet()`](#blockingGet).",
+            "    C blockingMostRecent                   No elements to get. Use [`blockingAwait()`](#blockingAwait).",
+            "  MS  blockingNext                         At most one element to get. Use [`blockingGet()`](#blockingGet).",
+            "    C blockingNext                         No elements to get. Use [`blockingAwait()`](#blockingAwait).",
+            "  MS  blockingSingle                       At most one element to get. Use [`blockingGet()`](#blockingGet).",
+            "    C blockingSingle                       No elements to get. Use [`blockingAwait()`](#blockingAwait).",
+            "  MS  blockingStream                       At most one element to get. Use [`blockingGet()`](#blockingGet).",
+            "    C blockingStream                       No elements to get. Use [`blockingAwait()`](#blockingAwait).",
+            "  M   buffer                               Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.",
+            "   S  buffer                               Use [`map()`](#map) to transform into a list/collection.",
+            "    C buffer                               Always empty. Use [`andThen()`](#andThen) to bring in a list/collection.",
+            "  MSC cacheWithInitialCapacity             At most one element to store. Use [`cache()`](#cache).",
+            "    C cast                                 Always empty.",
+            "  M   collect                              At most one element to collect. Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.",
+            "   S  collect                              One element to collect. Use [`map()`](#map) to transform into a list/collection.",
+            "    C collect                              Always empty. Use [`andThen()`](#andThen) to bring in a collection.",
+            "  M   collectInto                          At most one element to collect. Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.",
+            "   S  collectInto                          One element to collect. Use [`map()`](#map) to transform into a list/collection.",
+            "    C collectInto                          Always empty. Use [`andThen()`](#andThen) to bring in a collection.",
+            "  MS  combineLatest                        At most one element per source. Use [`zip()`](#zip).",
+            "    C combineLatest                        Always empty. Use [`merge()`](#merge).",
+            "  MS  combineLatestArray                   At most one element per source. Use [`zipArray()`](#zipArray).",
+            "    C combineLatestArray                   Always empty. Use [`mergeArray()`](#mergeArray).",
+            "  MS  combineLatestDelayError              At most one element per source. Use [`zip()`](#zip).",
+            "    C combineLatestDelayError              Always empty. Use [`mergeDelayError()`](#mergeDelayError).",
+            "  MS  combineLatestArrayDelayError         At most one element per source. Use [`zipArray()`](#zipArray).",
+            "    C combineLatestArrayDelayError         Always empty. Use [`mergeArrayDelayError()`](#mergeArrayDelayError).",
+            "FOM   complete                             Use [`empty()`](#empty).",
+            "   S  complete                             Never empty.",
+            "    C concatArrayEager                     No items to keep ordered. Use [`mergeArray()`](#mergeArray).",
+            "    C concatArrayEagerDelayError           No items to keep ordered. Use [`mergeArrayDelayError()`](#mergeArrayDelayError).",
+            "    C concatEager                          No items to keep ordered. Use [`merge()`](#merge).",
+            "    C concatEagerDelayError                No items to keep ordered. Use [`mergeDelayError()`](#mergeDelayError).",
+            "    C concatMap                            Always empty thus no items to map.",
+            "    C concatMapCompletable                 Always empty thus no items to map.",
+            "    C concatMapCompletableDelayError       Always empty thus no items to map.",
+            "    C concatMapIterable                    Always empty thus no items to map.",
+            "    C concatMapMaybe                       Always empty thus no items to map.",
+            "    C concatMapMaybeDelayError             Always empty thus no items to map.",
+            "    C concatMapSingle                      Always empty thus no items to map.",
+            "    C concatMapSingleDelayError            Always empty thus no items to map.",
+            "    C concatMapStream                      Always empty thus no items to map.",
+            "  MS  concatMapIterable                    At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).",
+            "  MS  concatMapStream                      At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).",
+            "    C contains                             Always empty.",
+            "   S  count                                Never empty thus always 1.",
+            "    C count                                Always empty thus always 0.",
+            "  MS  debounce                             At most one item signaled so no subsequent items to work with.",
+            "    C debounce                             Always empty thus no items to work with.",
+            "   S  defaultIfEmpty                       Never empty.",
+            "    C defaultIfEmpty                       Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.",
+            "    C dematerialize                        Always empty thus no items to work with.",
+            "  MS  distinct                             At most one item, always distinct.",
+            "    C distinct                             Always empty thus no items to work with.",
+            "  MS  distinctUntilChanged                 At most one item, always distinct.",
+            "    C distinctUntilChanged                 Always empty thus no items to work with.",
+            "  MS  doAfterNext                          Different terminology. Use [`doAfterSuccess()`](#doAfterSuccess).",
+            "    C doAfterNext                          Always empty.",
+            "FO    doAfterSuccess                       Different terminology. Use [`doAfterNext()`](#doAfterNext).",
+            "    C doAfterSuccess                       Always empty thus no items to work with.",
+            " OMSC doOnCancel                           Different terminology. Use [`doOnDispose()`](#doOnDispose).",
+            "   S  doOnComplete                         Always succeeds or fails, there is no `onComplete` signal.",
+            "F     doOnDispose                          Different terminology. Use [`doOnCancel()`](#doOnCancel).",
+            "  MS  doOnEach                             At most one item. Use [`doOnEvent()`](#doOnEvent).",
+            "    C doOnEach                             Always empty thus no items to work with.",
+            "FO    doOnEvent                            Use [`doOnEach()`](#doOnEach).",
+            "  MS  doOnNext                             Different terminology. Use [`doOnSuccess()`](#doOnSuccess).",
+            "    C doOnNext                             Always empty thus no items to work with.",
+            " OMSC doOnRequest                          Backpressure related and not supported outside `Flowable`.",
+            "FO    doOnSuccess                          Different terminology. Use [`doOnNext()`](#doOnNext).",
+            "    C doOnSuccess                          Always empty thus no items to work with.",
+            "  M   elementAt                            At most one item with index 0. Use [`defaultIfEmpty`](#defaultIfEmpty).",
+            "   S  elementAt                            Always one item with index 0.",
+            "    C elementAt                            Always empty thus no items to work with.",
+            "  M   elementAtOrError                     At most one item with index 0. Use [`toSingle`](#toSingle).",
+            "   S  empty                                Never empty.",
+            "    C empty                                Use [`complete()`](#complete).",
+            "    C filter                               Always empty thus no items to work with.",
+            "  M   first                                At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).",
+            "   S  first                                Always one item.",
+            "    C first                                Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.",
+            "  M   firstElement                         At most one item, would be no-op.",
+            "   S  firstElement                         Always one item, would be no-op.",
+            "    C firstElement                         Always empty.",
+            "  M   firstOrError                         At most one item, would be no-op.",
+            "   S  firstOrError                         Always one item, would be no-op.",
+            "    C firstOrError                         Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).",
+            "  MS  firstOrErrorStage                    At most one item. Use [`toCompletionStage()`](#toCompletionStage).",
+            "    C firstOrErrorStage                    Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).",
+            "  MSC firstStage                           At most one item. Use [`toCompletionStage()`](#toCompletionStage).",
+            "    C flatMap                              Always empty thus no items to map.",
+            "    C flatMapCompletable                   Always empty thus no items to map.",
+            "    C flatMapCompletableDelayError         Always empty thus no items to map.",
+            "    C flatMapIterable                      Always empty thus no items to map.",
+            "    C flatMapMaybe                         Always empty thus no items to map.",
+            "    C flatMapMaybeDelayError               Always empty thus no items to map.",
+            "    C flatMapSingle                        Always empty thus no items to map.",
+            "    C flatMapSingleDelayError              Always empty thus no items to map.",
+            "    C flatMapStream                        Always empty thus no items to map.",
+            "  MS  flatMapIterable                      At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).",
+            "  MS  flatMapStream                        At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).",
+            "F     flatMapObservable                    Not supported. Use [`flatMap`](#flatMap) and [`toFlowable()`](#toFlowable).",
+            " O    flatMapObservable                    Use [`flatMap`](#flatMap).",
+            "    C flatMapObservable                    Always empty thus no items to map.",
+            " O    flatMapPublisher                     Not supported. Use [`flatMap`](#flatMap) and [`toObservable()`](#toFlowable).",
+            "F     flatMapPublisher                     Use [`flatMap`](#flatMap).",
+            "    C flatMapPublisher                     Always empty thus no items to map.",
+            "FO    flatMapSingleElement                 Use [`flatMapSingle`](#flatMapSingle).",
+            "   S  flatMapSingleElement                 Use [`flatMap`](#flatMap).",
+            "    C flatMapSingleElement                 Always empty thus no items to map.",
+            "FO    flattenAsFlowable                    Use [`flatMapIterable()`](#flatMapIterable).",
+            "    C flattenAsFlowable                    Always empty thus no items to map.",
+            "FO    flattenAsObservable                  Use [`flatMapIterable()`](#flatMapIterable).",
+            "    C flattenAsObservable                  Always empty thus no items to map.",
+            "FO    flattenStreamAsFlowable              Use [`flatMapStream()`](#flatMapStream).",
+            "    C flattenStreamAsFlowable              Always empty thus no items to map.",
+            "FO    flattenStreamAsObservable            Use [`flatMapStream()`](#flatMapStream).",
+            "    C flattenStreamAsObservable            Always empty thus no items to map.",
+            "  MSC forEach                              Use [`subscribe()`](#subscribe).",
+            "  MSC forEachWhile                         Use [`subscribe()`](#subscribe).",
+            "  M   fromArray                            At most one item. Use [`just()`](#just) or [`empty()`](#empty).",
+            "   S  fromArray                            Always one item. Use [`just()`](#just).",
+            "    C fromArray                            Always empty. Use [`complete()`](#complete).",
+            "   S  fromCompletable                      Always error.",
+            "    C fromCompletable                      Use [`wrap()`](#wrap).",
+            "  M   fromIterable                         At most one item. Use [`just()`](#just) or [`empty()`](#empty).",
+            "   S  fromIterable                         Always one item. Use [`just()`](#just).",
+            "    C fromIterable                         Always empty. Use [`complete()`](#complete).",
+            "  M   fromMaybe                            Use [`wrap()`](#wrap).",
+            " O    fromObservable                       Use [`wrap()`](#wrap).",
+            "   S  fromOptional                         Always one item. Use [`just()`](#just).",
+            "    C fromOptional                         Always empty. Use [`complete()`](#complete).",
+            "  M   fromStream                           At most one item. Use [`just()`](#just) or [`empty()`](#empty).",
+            "   S  fromStream                           Always one item. Use [`just()`](#just).",
+            "    C fromStream                           Always empty. Use [`complete()`](#complete).",
+            "  MSC generate                             Use [`fromSupplier()`](#fromSupplier).",
+            "  MS  groupBy                              At most one item.",
+            "    C groupBy                              Always empty thus no items to group.",
+            "  MS  groupJoin                            At most one item.",
+            "    C groupJoin                            Always empty thus no items to join.",
+            "FO    ignoreElement                        Use [`ignoreElements()`](#ignoreElements).",
+            "    C ignoreElement                        Always empty.",
+            "  MS  ignoreElements                       Use [`ignoreElement()`](#ignoreElement).",
+            "    C ignoreElements                       Always empty.",
+            "  MSC interval                             At most one item. Use [`timer()`](#timer).",
+            "  MSC intervalRange                        At most one item. Use [`timer()`](#timer).",
+            "   S  isEmpty                              Always one item.",
+            "    C isEmpty                              Always empty.",
+            "  MS  join                                 At most one item. Use [`zip()`](#zip)",
+            "    C join                                 Always empty thus no items to join.",
+            "  M   last                                 At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).",
+            "   S  last                                 Always one item.",
+            "    C last                                 Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.",
+            "  M   lastElement                          At most one item, would be no-op.",
+            "   S  lastElement                          Always one item, would be no-op.",
+            "    C lastElement                          Always empty.",
+            "  M   lastOrError                          At most one item, would be no-op.",
+            "   S  lastOrError                          Always one item, would be no-op.",
+            "    C lastOrError                          Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).",
+            "  MS  lastOrErrorStage                     At most one item. Use [`toCompletionStage()`](#toCompletionStage).",
+            "    C lastOrErrorStage                     Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).",
+            "  MSC lastStage                            At most one item. Use [`toCompletionStage()`](#toCompletionStage).",
+            "    C map                                  Always empty thus no items to map.",
+            "    C mapOptional                          Always empty thus no items to map.",
+            "    C ofType                               Always empty thus no items to filter.",
+            " OMSC onBackpressureBuffer                 Backpressure related and not supported outside `Flowable`.",
+            " OMSC onBackpressureDrop                   Backpressure related and not supported outside `Flowable`.",
+            " OMSC onBackpressureLatest                 Backpressure related and not supported outside `Flowable`.",
+            " OMSC parallel                             Needs backpressure thus not supported outside `Flowable`.",
+            "  M   publish                              Connectable sources not supported outside `Flowable` and `Observable`. Use a `MaybeSubject`.",
+            "   S  publish                              Connectable sources not supported outside `Flowable` and `Observable`. Use a `SingleSubject`.",
+            "    C publish                              Connectable sources not supported outside `Flowable` and `Observable`. Use a `ConnectableSubject`.",
+            "  MS  range                                At most one item. Use [`just()`](#just).",
+            "    C range                                Always empty. Use [`complete()`](#complete).",
+            "  MS  rangeLong                            At most one item. Use [`just()`](#just).",
+            "    C rangeLong                            Always empty. Use [`complete()`](#complete).",
+            " OMSC rebatchRequests                      Backpressure related and not supported outside `Flowable`.",
+            "  MS  reduce                               At most one item. Use [`map()`](#map).",
+            "    C reduce                               Always empty thus no items to reduce.",
+            "  MS  reduceWith                           At most one item. Use [`map()`](#map).",
+            "    C reduceWith                           Always empty thus no items to reduce.",
+            "  M   replay                               Connectable sources not supported outside `Flowable` and `Observable`. Use a `MaybeSubject`.",
+            "   S  replay                               Connectable sources not supported outside `Flowable` and `Observable`. Use a `SingleSubject`.",
+            "    C replay                               Connectable sources not supported outside `Flowable` and `Observable`. Use a `ConnectableSubject`.",
+            "  MS  sample                               At most one item, would be no-op.",
+            "    C sample                               Always empty thus no items to work with.",
+            "  MS  scan                                 At most one item. Use [`map()`](#map).",
+            "    C scan                                 Always empty thus no items to reduce.",
+            "  MS  scanWith                             At most one item. Use [`map()`](#map).",
+            "    C scanWith                             Always empty thus no items to reduce.",
+            "  MSC serialize                            At most one signal type.",
+            "  M   share                                Connectable sources not supported outside `Flowable` and `Observable`. Use a `MaybeSubject`.",
+            "   S  share                                Connectable sources not supported outside `Flowable` and `Observable`. Use a `SingleSubject`.",
+            "    C share                                Connectable sources not supported outside `Flowable` and `Observable`. Use a `ConnectableSubject`.",
+            "  M   single                               At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).",
+            "   S  single                               Always one item.",
+            "    C single                               Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.",
+            "  M   singleElement                        At most one item, would be no-op.",
+            "   S  singleElement                        Always one item, would be no-op.",
+            "    C singleElement                        Always empty.",
+            "  M   singleOrError                        At most one item, would be no-op.",
+            "   S  singleOrError                        Always one item, would be no-op.",
+            "    C singleOrError                        Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).",
+            "  MS  singleOrErrorStage                   At most one item. Use [`toCompletionStage()`](#toCompletionStage).",
+            "    C singleOrErrorStage                   Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).",
+            "  MSC singleStage                          At most one item. Use [`toCompletionStage()`](#toCompletionStage).",
+            "  MSC skip                                 At most one item, would be no-op.",
+            "  MSC skipLast                             At most one item, would be no-op.",
+            "  MS  skipWhile                            At most one item. Use [`filter()`](#filter).",
+            "    C skipWhile                            Always empty.",
+            "  MSC skipUntil                            At most one item. Use [`takeUntil()`](#takeUntil).",
+            "  MSC sorted                               At most one item.",
+            "  MSC startWithArray                       Use [`startWith()`](#startWith) and [`fromArray()`](#fromArray) of `Flowable` or `Observable`.",
+            "  MSC startWithItem                        Use [`startWith()`](#startWith) and [`just()`](#just) of another reactive type.",
+            "  MSC startWithIterable                    Use [`startWith()`](#startWith) and [`fromIterable()`](#fromArray) of `Flowable` or `Observable`.",
+            "   S  switchIfEmpty                        Never empty.",
+            "    C switchIfEmpty                        Always empty. Use [`defaultIfEmpty()`](#defaultIfEmpty).",
+            "  MS  switchMap                            At most one item. Use [`flatMap()`](#flatMap).",
+            "    C switchMap                            Always empty thus no items to map.",
+            "  MS  switchMapDelayError                  At most one item. Use [`flatMap()`](#flatMap).",
+            "    C switchMapDelayError                  Always empty thus no items to map.",
+            "  MS  switchMapCompletable                 At most one item. Use [`flatMap()`](#flatMap).",
+            "    C switchMapCompletable                 Always empty thus no items to map.",
+            "  MS  switchMapCompletableDelayError       At most one item. Use [`flatMap()`](#flatMap).",
+            "    C switchMapCompletableDelayError       Always empty thus no items to map.",
+            "  MS  switchMapMaybe                       At most one item. Use [`flatMap()`](#flatMap).",
+            "    C switchMapMaybe                       Always empty thus no items to map.",
+            "  MS  switchMapMaybeDelayError             At most one item. Use [`flatMap()`](#flatMap).",
+            "    C switchMapMaybeDelayError             Always empty thus no items to map.",
+            "  MS  switchMapSingle                      At most one item. Use [`flatMap()`](#flatMap).",
+            "    C switchMapSingle                      Always empty thus no items to map.",
+            "  MS  switchMapSingleDelayError            At most one item. Use [`flatMap()`](#flatMap).",
+            "    C switchMapSingleDelayError            Always empty thus no items to map.",
+            "  MSC take                                 At most one item, would be no-op.",
+            "  MSC takeLast                             At most one item, would be no-op.",
+            "  MS  takeWhile                            At most one item. Use [`filter()`](#filter).",
+            "    C takeWhile                            Always empty.",
+            "  MS  throttleFirst                        At most one item signaled so no subsequent items to work with.",
+            "    C throttleFirst                        Always empty thus no items to work with.",
+            "  MS  throttleLast                         At most one item signaled so no subsequent items to work with.",
+            "    C throttleLast                         Always empty thus no items to work with.",
+            "  MS  throttleLatest                       At most one item signaled so no subsequent items to work with.",
+            "    C throttleLatest                       Always empty thus no items to work with.",
+            "  MS  throttleWithTimeout                  At most one item signaled so no subsequent items to work with.",
+            "    C throttleWithTimeout                  Always empty thus no items to work with.",
+            "    C timestamp                            Always empty thus no items to work with.",
+            "FO    toCompletionStage                    Use [`firstStage`](#firstStage), [`lastStage`](#lastStage) or [`singleStage`](#singleStage).",
+            "  M   toList                               At most one element to collect. Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.",
+            "   S  toList                               One element to collect. Use [`map()`](#map) to transform into a list/collection.",
+            "    C toList                               Always empty. Use [`andThen()`](#andThen) to bring in a collection.",
+            "  M   toMap                                At most one element to collect. Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.",
+            "   S  toMap                                One element to collect. Use [`map()`](#map) to transform into a list/collection.",
+            "    C toMap                                Always empty. Use [`andThen()`](#andThen) to bring in a collection.",
+            "  M   toMultimap                           At most one element to collect. Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.",
+            "   S  toMultimap                           One element to collect. Use [`map()`](#map) to transform into a list/collection.",
+            "    C toMultimap                           Always empty. Use [`andThen()`](#andThen) to bring in a collection.",
+            "FO    toMaybe                              Use [`firstElement`](#firstElement), [`lastElement`](#lastElement) or [`singleElement`](#singleElement).",
+            "  M   toMaybe                              Would be no-op.",
+            " O    toObservable                         Would be no-op.",
+            "FO    toSingle                             Use [`firstOrError`](#firstOrError), [`lastOrError`](#lastOrError) or [`singleOrError`](#singleOrError).",
+            "   S  toSingle                             Would be no-op.",
+            "FO    toSingleDefault                      Use [`first`](#first), [`last`](#last) or [`single`](#single).",
+            "  M   toSingleDefault                      Use [`defaultIfEmpty()`](#defaultIfEmpty).",
+            "   S  toSingleDefault                      Would be no-op.",
+            "  M   toSortedList                         At most one element to collect. Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.",
+            "   S  toSortedList                         One element to collect. Use [`map()`](#map) to transform into a list/collection.",
+            "    C toSortedList                         Always empty. Use [`andThen()`](#andThen) to bring in a collection.",
+            "  M   window                               Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a nested source.",
+            "   S  window                               Use [`map()`](#map) to transform into a nested source.",
+            "    C window                               Always empty. Use [`andThen()`](#andThen) to bring in a nested source.",
+            "  MS  withLatestFrom                       At most one element per source. Use [`zip()`](#zip).",
+            "    C withLatestFrom                       Always empty. Use [`merge()`](#merge).",
+            "F     wrap                                 Use [`fromPublisher()`](#fromPublisher).",
+            "    C zip                                  Use [`merge()`](#merge).",
+            "    C zipArray                             Use [`mergeArray()`](#mergeArray).",
+            "    C zipWith                              Use [`mergeWith()`](#mergeWith).",
+    };
+
+    static final Map<String, Map<String, String>> NOTES_MAP;
+    static {
+        NOTES_MAP = new HashMap<>();
+        for (String s : NOTES) {
+            char[] classes = s.substring(0, 5).trim().toCharArray();
+            int idx = s.indexOf(' ', 7);
+            String method = s.substring(6, idx);
+            String note = s.substring(idx).trim();
+
+            for (char c : classes) {
+                NOTES_MAP.computeIfAbsent(method, v -> new HashMap<>())
+                .put(String.valueOf(c), note);
+            }
         }
     }
 }

From e8d59c52c5c5391a668f33c6128f27766d8d79b3 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Wed, 22 Jan 2020 14:22:11 +0100
Subject: [PATCH 061/665] Minor fix to the operator matrix.

---
 docs/Operator-Matrix.md                         | 17 ++++++++---------
 .../internal/util/OperatorMatrixGenerator.java  |  1 +
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index 832d64311d..3c3ef2c765 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -80,7 +80,6 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='elementAt'></a>`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use defaultIfEmpty.'>([46](#notes-46))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([47](#notes-47))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
 <a name='elementAtOrError'></a>`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use toSingle.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
 <a name='empty'></a>`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use complete().'>([49](#notes-49))</sup>|
-<a name='equals'></a>`equals`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
 <a name='error'></a>`error`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='filter'></a>`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
 <a name='first'></a>`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
@@ -173,7 +172,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
 <a name='scan'></a>`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
 <a name='scanWith'></a>`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
-<a name='sequenceEqual'></a>`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='sequenceEqual'></a>`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
 <a name='serialize'></a>`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([85](#notes-85))</sup>|
 <a name='share'></a>`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([81](#notes-81))</sup>|
 <a name='single'></a>`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
@@ -219,15 +218,15 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
 <a name='to'></a>`to`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toCompletionStage'></a>`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([93](#notes-93))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toFuture'></a>`toFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
 <a name='toList'></a>`toList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
 <a name='toMap'></a>`toMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
-<a name='toMaybe'></a>`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([95](#notes-95))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toMaybe'></a>`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toMultimap'></a>`toMultimap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
-<a name='toObservable'></a>`toObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([95](#notes-95))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toSingle'></a>`toSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([96](#notes-96))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([96](#notes-96))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([95](#notes-95))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toSingleDefault'></a>`toSingleDefault`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use defaultIfEmpty().'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([95](#notes-95))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toObservable'></a>`toObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toSingle'></a>`toSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([96](#notes-96))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([96](#notes-96))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toSingleDefault'></a>`toSingleDefault`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use defaultIfEmpty().'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toSortedList'></a>`toSortedList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
 <a name='unsafeCreate'></a>`unsafeCreate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='unsubscribeOn'></a>`unsubscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -333,8 +332,8 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='notes-91'></a><sup>91</sup> Always empty. Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
 <a name='notes-92'></a><sup>92</sup> At most one item. Use [`flatMap()`](#flatMap).<br/>
 <a name='notes-93'></a><sup>93</sup> Use [`firstStage`](#firstStage), [`lastStage`](#lastStage) or [`singleStage`](#singleStage).<br/>
-<a name='notes-94'></a><sup>94</sup> Use [`firstElement`](#firstElement), [`lastElement`](#lastElement) or [`singleElement`](#singleElement).<br/>
-<a name='notes-95'></a><sup>95</sup> Would be no-op.<br/>
+<a name='notes-94'></a><sup>94</sup> Would be no-op.<br/>
+<a name='notes-95'></a><sup>95</sup> Use [`firstElement`](#firstElement), [`lastElement`](#lastElement) or [`singleElement`](#singleElement).<br/>
 <a name='notes-96'></a><sup>96</sup> Use [`firstOrError`](#firstOrError), [`lastOrError`](#lastOrError) or [`singleOrError`](#singleOrError).<br/>
 <a name='notes-97'></a><sup>97</sup> Use [`first`](#first), [`last`](#last) or [`single`](#single).<br/>
 <a name='notes-98'></a><sup>98</sup> Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index 1273a5b441..970d6e36bb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -419,6 +419,7 @@ static String findNotes(String clazzName, String operatorName) {
             "    C throttleWithTimeout                  Always empty thus no items to work with.",
             "    C timestamp                            Always empty thus no items to work with.",
             "FO    toCompletionStage                    Use [`firstStage`](#firstStage), [`lastStage`](#lastStage) or [`singleStage`](#singleStage).",
+            "F     toFlowable                           Would be no-op.",
             "  M   toList                               At most one element to collect. Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a list/collection.",
             "   S  toList                               One element to collect. Use [`map()`](#map) to transform into a list/collection.",
             "    C toList                               Always empty. Use [`andThen()`](#andThen) to bring in a collection.",

From 5dbc2a84f970bf0bb8670bec13ab2aa836ebad66 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 22 Jan 2020 17:37:14 +0100
Subject: [PATCH 062/665] 3.x: Add last missing throws tag to JavaDocs (#6860)

---
 .../io/reactivex/rxjava3/core/Flowable.java   |  7 +-
 .../io/reactivex/rxjava3/core/Single.java     |  1 +
 .../internal/util/JavadocNoThrows.java        | 72 +++++++++++++++++++
 .../validators/ParamValidationNaming.java     |  3 +
 4 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/util/JavadocNoThrows.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 5f5aff68c6..0106f42ce9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -213,7 +213,7 @@ public static <T> Flowable<T> amb(@NonNull Iterable<@NonNull ? extends Publisher
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> ambArray(Publisher<@NonNull ? extends T>... sources) {
+    public static <T> Flowable<T> ambArray(@NonNull Publisher<@NonNull ? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         int len = sources.length;
         if (len == 0) {
@@ -1915,7 +1915,7 @@ public static <T> Flowable<T> empty() {
      * @param supplier
      *            a {@link Supplier} factory to return a {@link Throwable} for each individual {@code Subscriber}
      * @param <T>
-     *            the type of the items (ostensibly) emitted by the {@link Publisher}
+     *            the type of the items (ostensibly) emitted by the resulting {@code Flowable}
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code supplier} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
@@ -1944,7 +1944,7 @@ public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> suppl
      * @param throwable
      *            the particular {@link Throwable} to pass to {@link Subscriber#onError onError}
      * @param <T>
-     *            the type of the items (ostensibly) emitted by the {@link Publisher}
+     *            the type of the items (ostensibly) emitted by the resulting {@code Flowable}
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code throwable} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/empty-never-throw.html">ReactiveX operators documentation: Throw</a>
@@ -8760,6 +8760,7 @@ public final Flowable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Sched
      *            then used to delay the emission of that item by the resulting {@code Flowable} until the {@code Publisher}
      *            returned from {@code itemDelay} emits an item
      * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code subscriptionIndicator} and {@code itemDelayIndicator} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      */
     @CheckReturnValue
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index f915bdc5b2..c93bfa9282 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -681,6 +681,7 @@ public static <T> Single<T> error(@NonNull Throwable throwable) {
      *            the type of object that the {@code Future} returns, and also the type of item to be emitted by
      *            the resulting {@code Single}
      * @return the new {@code Single} that emits the item from the source {@code Future}
+     * @throws NullPointerException if {@code future} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
      * @see #fromFuture(Future, long, TimeUnit)
      * @see #fromCompletionStage(CompletionStage)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/JavadocNoThrows.java b/src/test/java/io/reactivex/rxjava3/internal/util/JavadocNoThrows.java
new file mode 100644
index 0000000000..985ac202c3
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/JavadocNoThrows.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.util;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.List;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+/**
+ * Scan the JavaDocs of the base classes and list those which do not have the {@code @throws} tag.
+ * The lack is not an error by itself but worth looking at.
+ */
+public final class JavadocNoThrows {
+
+    private JavadocNoThrows() {
+        throw new IllegalArgumentException("No instances!");
+    }
+
+    public static void main(String[] args) throws Exception {
+        for (Class<?> clazz : CLASSES) {
+            String clazzName = clazz.getSimpleName();
+            String packageName = clazz.getPackage().getName();
+            File f = TestHelper.findSource(clazzName, packageName);
+
+            List<String> lines = Files.readAllLines(f.toPath());
+
+            for (int i = 1; i < lines.size(); i++) {
+                String line = lines.get(i).trim();
+
+                if (line.startsWith("/**")) {
+                    boolean found = false;
+                    for (int j = i + 1; j < lines.size(); j++) {
+
+                        String line2 = lines.get(j).trim();
+                        if (line2.startsWith("public")) {
+                            if (line2.endsWith("() {")) {
+                                found = true;
+                            }
+                            break;
+                        }
+                        if (line2.startsWith("* @throws")) {
+                            found = true;
+                            break;
+                        }
+                    }
+
+                    if (!found) {
+                        System.out.printf(" at %s.%s.method(%s.java:%s)%n%n", packageName, clazzName, clazzName, i + 1);
+                    }
+                }
+            }
+        }
+    }
+
+    static final Class<?>[] CLASSES = {
+            Flowable.class, Observable.class, Maybe.class, Single.class, Completable.class, ParallelFlowable.class
+    };
+}
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
index ba307d394d..2ce716e342 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -523,6 +523,9 @@ static final class ValidatorStrings {
             new ValidatorStrings("stage", "* @throws NullPointerException"),
             new ValidatorStrings("stream", "* @throws NullPointerException"),
             new ValidatorStrings("collector", "* @throws NullPointerException"),
+            new ValidatorStrings("subscriptionIndicator", "* @throws NullPointerException"),
+            new ValidatorStrings("itemDelayIndicator", "* @throws NullPointerException"),
+            new ValidatorStrings("future", "* @throws NullPointerException"),
 
             new ValidatorStrings("parallelism", "* @throws IllegalArgumentException"),
             new ValidatorStrings("prefetch", "* @throws IllegalArgumentException"),

From 49f1a6d0f0540d6b98e2c11d70ad54ff0c4bc18f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2020 09:50:48 +0100
Subject: [PATCH 063/665] Bump biz.aQute.bnd.gradle from 4.3.1 to 5.0.0 (#6861)

Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 4.3.1 to 5.0.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ce041a954f..b0a12f1c79 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.4"
   ext.jfrogExtractorVersion = "4.13.0"
-  ext.bndVersion = "4.3.1"
+  ext.bndVersion = "5.0.0"
   ext.checkstyleVersion = "8.26"
 
   // --------------------------------------

From bb3260ec3729d9d9c0934a958f3added8ca65408 Mon Sep 17 00:00:00 2001
From: Paul Estrada <2215585+pestrada@users.noreply.github.com>
Date: Fri, 24 Jan 2020 01:41:40 -0600
Subject: [PATCH 064/665] add delayError to Maybe.delay (#6864)

---
 .../java/io/reactivex/rxjava3/core/Maybe.java | 65 +++++++++++++++++--
 .../internal/operators/maybe/MaybeDelay.java  | 20 ++++--
 .../operators/maybe/MaybeDelayTest.java       | 28 ++++++++
 .../ParamValidationCheckerTest.java           |  2 +
 4 files changed, 102 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 4322afaa93..6260f3e206 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -2672,6 +2672,7 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
     /**
      * Returns a {@code Maybe} that signals the events emitted by the current {@code Maybe} shifted forward in time by a
      * specified delay.
+     * An error signal will not be delayed.
      * <p>
      * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
      * <dl>
@@ -2682,17 +2683,68 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
      * @param time
      *            the delay to shift the source by
      * @param unit
-     *            the {@link TimeUnit} in which {@code period} is defined
+     *            the {@link TimeUnit} in which {@code time} is defined
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
-     * @see #delay(long, TimeUnit, Scheduler)
+     * @see #delay(long, TimeUnit, Scheduler, boolean)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
     public final Maybe<T> delay(long time, @NonNull TimeUnit unit) {
-        return delay(time, unit, Schedulers.computation());
+        return delay(time, unit, Schedulers.computation(), false);
+    }
+
+    /**
+     * Returns a {@code Maybe} that signals the events emitted by the current {@code Maybe} shifted forward in time by a
+     * specified delay.
+     * <p>
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
+     * <dl>
+     *   <dt><b>Scheduler:</b></dt>
+     *   <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param time the delay to shift the source by
+     * @param unit the {@link TimeUnit} in which {@code time} is defined
+     * @param delayError if {@code true}, both success and error signals are delayed. if {@code false}, only success signals are delayed.
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
+     * @see #delay(long, TimeUnit, Scheduler, boolean)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
+    @NonNull
+    public final Maybe<T> delay(long time, @NonNull TimeUnit unit, boolean delayError) {
+        return delay(time, unit, Schedulers.computation(), delayError);
+    }
+
+    /**
+     * Returns a {@code Maybe} that signals the events emitted by the current {@code Maybe} shifted forward in time by a
+     * specified delay.
+     * An error signal will not be delayed.
+     * <p>
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
+     * <dl>
+     *   <dt><b>Scheduler:</b></dt>
+     *   <dd>you specify the {@link Scheduler} where the non-blocking wait and emission happens</dd>
+     * </dl>
+     *
+     * @param time the delay to shift the source by
+     * @param unit the {@link TimeUnit} in which {@code time} is defined
+     * @param scheduler the {@code Scheduler} to use for delaying
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
+     * @see #delay(long, TimeUnit, Scheduler, boolean)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
+    public final Maybe<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        return delay(time, unit, scheduler, false);
     }
 
     /**
@@ -2708,9 +2760,10 @@ public final Maybe<T> delay(long time, @NonNull TimeUnit unit) {
      * @param time
      *            the delay to shift the source by
      * @param unit
-     *            the time unit of {@code delay}
+     *            the {@link TimeUnit} in which {@code time} is defined
      * @param scheduler
      *            the {@code Scheduler} to use for delaying
+     * @param delayError if {@code true}, both success and error signals are delayed. if {@code false}, only success signals are delayed.
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
@@ -2718,10 +2771,10 @@ public final Maybe<T> delay(long time, @NonNull TimeUnit unit) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Maybe<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+    public final Maybe<T> delay(long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean delayError) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new MaybeDelay<>(this, Math.max(0L, time), unit, scheduler));
+        return RxJavaPlugins.onAssembly(new MaybeDelay<>(this, Math.max(0L, time), unit, scheduler, delayError));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java
index 6885763cbd..3e6922a339 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java
@@ -33,16 +33,19 @@ public final class MaybeDelay<T> extends AbstractMaybeWithUpstream<T, T> {
 
     final Scheduler scheduler;
 
-    public MaybeDelay(MaybeSource<T> source, long delay, TimeUnit unit, Scheduler scheduler) {
+    final boolean delayError;
+
+    public MaybeDelay(MaybeSource<T> source, long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) {
         super(source);
         this.delay = delay;
         this.unit = unit;
         this.scheduler = scheduler;
+        this.delayError = delayError;
     }
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new DelayMaybeObserver<>(observer, delay, unit, scheduler));
+        source.subscribe(new DelayMaybeObserver<>(observer, delay, unit, scheduler, delayError));
     }
 
     static final class DelayMaybeObserver<T>
@@ -59,15 +62,18 @@ static final class DelayMaybeObserver<T>
 
         final Scheduler scheduler;
 
+        final boolean delayError;
+
         T value;
 
         Throwable error;
 
-        DelayMaybeObserver(MaybeObserver<? super T> actual, long delay, TimeUnit unit, Scheduler scheduler) {
+        DelayMaybeObserver(MaybeObserver<? super T> actual, long delay, TimeUnit unit, Scheduler scheduler, boolean delayError) {
             this.downstream = actual;
             this.delay = delay;
             this.unit = unit;
             this.scheduler = scheduler;
+            this.delayError = delayError;
         }
 
         @Override
@@ -105,21 +111,21 @@ public void onSubscribe(Disposable d) {
         @Override
         public void onSuccess(T value) {
             this.value = value;
-            schedule();
+            schedule(delay);
         }
 
         @Override
         public void onError(Throwable e) {
             this.error = e;
-            schedule();
+            schedule(delayError ? delay : 0);
         }
 
         @Override
         public void onComplete() {
-            schedule();
+            schedule(delay);
         }
 
-        void schedule() {
+        void schedule(long delay) {
             DisposableHelper.replace(this, scheduler.scheduleDirect(this, delay, unit));
         }
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
index 747b96faf1..14448c3f2c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
@@ -96,4 +96,32 @@ public Maybe<Object> apply(Maybe<Object> f) throws Exception {
             }
         });
     }
+
+    @Test
+    public void delayedErrorOnSuccess() {
+        final TestScheduler scheduler = new TestScheduler();
+        final TestObserver<Integer> observer = Maybe.just(1)
+                .delay(5, TimeUnit.SECONDS, scheduler, true)
+                .test();
+
+        scheduler.advanceTimeTo(2, TimeUnit.SECONDS);
+        observer.assertNoValues();
+
+        scheduler.advanceTimeTo(5, TimeUnit.SECONDS);
+        observer.assertValue(1);
+    }
+
+    @Test
+    public void delayedErrorOnError() {
+        final TestScheduler scheduler = new TestScheduler();
+        final TestObserver<?> observer = Maybe.error(new TestException())
+                .delay(5, TimeUnit.SECONDS, scheduler, true)
+                .test();
+
+        scheduler.advanceTimeTo(2, TimeUnit.SECONDS);
+        observer.assertNoErrors();
+
+        scheduler.advanceTimeTo(5, TimeUnit.SECONDS);
+        observer.assertError(TestException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 403a83964a..7eff55d15e 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -289,6 +289,8 @@ public void checkParallelFlowable() {
         // negative time is considered as zero time
         addOverride(new ParamOverride(Maybe.class, 0, ParamMode.ANY, "delay", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Maybe.class, 0, ParamMode.ANY, "delay", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Maybe.class, 0, ParamMode.ANY, "delay", Long.TYPE, TimeUnit.class, Boolean.TYPE));
+        addOverride(new ParamOverride(Maybe.class, 0, ParamMode.ANY, "delay", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE));
 
         // zero repeat is allowed
         addOverride(new ParamOverride(Maybe.class, 0, ParamMode.NON_NEGATIVE, "repeat", Long.TYPE));

From 33a1dcfab98463d41d5b1502e66fa82b6d9ae3c6 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 24 Jan 2020 17:35:55 +0100
Subject: [PATCH 065/665] 3.x: Add Maybe/Single/Completable blockingSubscribe
 (#6862)

* 3.x: Add Maybe/Single/Completable blockingSubscribe

* Update marble dimensions
---
 .../reactivex/rxjava3/core/Completable.java   | 100 ++++
 .../java/io/reactivex/rxjava3/core/Maybe.java | 131 ++++-
 .../io/reactivex/rxjava3/core/Single.java     | 100 ++++
 .../BlockingDisposableMultiObserver.java      | 154 ++++++
 .../observers/BlockingMultiObserver.java      |  38 ++
 .../CompletableBlockingSubscribeTest.java     | 331 ++++++++++++
 .../maybe/MaybeBlockingSubscribeTest.java     | 502 ++++++++++++++++++
 .../single/SingleBlockingSubscribeTest.java   | 343 ++++++++++++
 8 files changed, 1698 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/observers/BlockingDisposableMultiObserver.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableBlockingSubscribeTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeBlockingSubscribeTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleBlockingSubscribeTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 1266255315..0913ac398d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -1310,6 +1310,106 @@ public final boolean blockingAwait(long timeout, @NonNull TimeUnit unit) {
         return observer.blockingAwait(timeout, unit);
     }
 
+    /**
+     * Subscribes to the current {@code Completable} and <em>blocks the current thread</em> until it terminates.
+     * <p>
+     * <img width="640" height="346" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.blockingSubscribe.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If the current {@code Completable} signals an error,
+     *  the {@link Throwable} is routed to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, an {@link InterruptedException} is routed to the same global error handler.
+     *  </dd>
+     * </dl>
+     * @since 3.0.0
+     * @see #blockingSubscribe(Action)
+     * @see #blockingSubscribe(Action, Consumer)
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe() {
+        blockingSubscribe(Functions.EMPTY_ACTION, Functions.ERROR_CONSUMER);
+    }
+
+    /**
+     * Subscribes to the current {@code Completable} and calls given {@code onComplete} callback on the <em>current thread</em>
+     * when it completes normally.
+     * <p>
+     * <img width="640" height="351" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.blockingSubscribe.a.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If either the current {@code Completable} signals an error or {@code onComplete} throws,
+     *  the respective {@link Throwable} is routed to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, an {@link InterruptedException} is routed to the same global error handler.
+     *  </dd>
+     * </dl>
+     * @param onComplete the {@link Action} to call if the current {@code Completable} completes normally
+     * @throws NullPointerException if {@code onComplete} is {@code null}
+     * @since 3.0.0
+     * @see #blockingSubscribe(Action, Consumer)
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull Action onComplete) {
+        blockingSubscribe(onComplete, Functions.ERROR_CONSUMER);
+    }
+
+    /**
+     * Subscribes to the current {@code Completable} and calls the appropriate callback on the <em>current thread</em>
+     * when it terminates.
+     * <p>
+     * <img width="640" height="352" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.blockingSubscribe.ac.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If either {@code onComplete} or {@code onError} throw, the {@link Throwable} is routed to the
+     *  global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, the {@code onError} consumer is called with an {@link InterruptedException}.
+     *  </dd>
+     * </dl>
+     * @param onComplete the {@link Action} to call if the current {@code Completable} completes normally
+     * @param onError the {@link Consumer} to call if the current {@code Completable} signals an error
+     * @throws NullPointerException if {@code onComplete} or {@code onError} is {@code null}
+     * @since 3.0.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull Action onComplete, @NonNull Consumer<? super Throwable> onError) {
+        Objects.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onError, "onError is null");
+        BlockingMultiObserver<Void> observer = new BlockingMultiObserver<>();
+        subscribe(observer);
+        observer.blockingConsume(Functions.emptyConsumer(), onError, onComplete);
+    }
+
+    /**
+     * Subscribes to the current {@code Completable} and calls the appropriate {@link CompletableObserver} method on the <em>current thread</em>.
+     * <p>
+     * <img width="640" height="468" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.blockingSubscribe.o.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>An {@code onError} signal is delivered to the {@link CompletableObserver#onError(Throwable)} method.
+     *  If any of the {@code CompletableObserver}'s methods throw, the {@link RuntimeException} is propagated to the caller of this method.
+     *  If the current thread is interrupted, an {@link InterruptedException} is delivered to {@code observer.onError}.
+     *  </dd>
+     * </dl>
+     * @param observer the {@code CompletableObserver} to call methods on the current thread
+     * @throws NullPointerException if {@code observer} is {@code null}
+     * @since 3.0.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull CompletableObserver observer) {
+        Objects.requireNonNull(observer, "observer is null");
+        BlockingDisposableMultiObserver<Void> blockingObserver = new BlockingDisposableMultiObserver<>();
+        observer.onSubscribe(blockingObserver);
+        subscribe(blockingObserver);
+        blockingObserver.blockingConsume(observer);
+    }
+
     /**
      * Subscribes to this {@code Completable} only once, when the first {@link CompletableObserver}
      * subscribes to the result {@code Completable}, caches its terminal event
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 6260f3e206..0d0d6f5473 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -26,7 +26,7 @@
 import io.reactivex.rxjava3.internal.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.jdk8.*;
-import io.reactivex.rxjava3.internal.observers.BlockingMultiObserver;
+import io.reactivex.rxjava3.internal.observers.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.*;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
@@ -2475,6 +2475,135 @@ public final T blockingGet(@NonNull T defaultValue) {
         return observer.blockingGet(defaultValue);
     }
 
+    /**
+     * Subscribes to the current {@code Maybe} and <em>blocks the current thread</em> until it terminates.
+     * <p>
+     * <img width="640" height="238" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.blockingSubscribe.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If the current {@code Maybe} signals an error,
+     *  the {@link Throwable} is routed to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, an {@link InterruptedException} is routed to the same global error handler.
+     *  </dd>
+     * </dl>
+     * @since 3.0.0
+     * @see #blockingSubscribe(Consumer)
+     * @see #blockingSubscribe(Consumer, Consumer)
+     * @see #blockingSubscribe(Consumer, Consumer, Action)
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe() {
+        blockingSubscribe(Functions.emptyConsumer(), Functions.ERROR_CONSUMER, Functions.EMPTY_ACTION);
+    }
+
+    /**
+     * Subscribes to the current {@code Maybe} and calls given {@code onSuccess} callback on the <em>current thread</em>
+     * when it completes normally.
+     * <p>
+     * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.blockingSubscribe.c.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If either the current {@code Maybe} signals an error or {@code onSuccess} throws,
+     *  the respective {@link Throwable} is routed to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, an {@link InterruptedException} is routed to the same global error handler.
+     *  </dd>
+     * </dl>
+     * @param onSuccess the {@link Consumer} to call if the current {@code Maybe} succeeds
+     * @throws NullPointerException if {@code onSuccess} is {@code null}
+     * @since 3.0.0
+     * @see #blockingSubscribe(Consumer, Consumer)
+     * @see #blockingSubscribe(Consumer, Consumer, Action)
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onSuccess) {
+        blockingSubscribe(onSuccess, Functions.ERROR_CONSUMER, Functions.EMPTY_ACTION);
+    }
+
+    /**
+     * Subscribes to the current {@code Maybe} and calls the appropriate callback on the <em>current thread</em>
+     * when it terminates.
+     * <p>
+     * <img width="640" height="256" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.blockingSubscribe.cc.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If either {@code onSuccess} or {@code onError} throw, the {@link Throwable} is routed to the
+     *  global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, the {@code onError} consumer is called with an {@link InterruptedException}.
+     *  </dd>
+     * </dl>
+     * @param onSuccess the {@link Consumer} to call if the current {@code Maybe} succeeds
+     * @param onError the {@code Consumer} to call if the current {@code Maybe} signals an error
+     * @throws NullPointerException if {@code onSuccess} or {@code onError} is {@code null}
+     * @since 3.0.0
+     * @see #blockingSubscribe(Consumer, Consumer, Action)
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onSuccess, @NonNull Consumer<? super Throwable> onError) {
+        blockingSubscribe(onSuccess, onError, Functions.EMPTY_ACTION);
+    }
+
+    /**
+     * Subscribes to the current {@code Maybe} and calls the appropriate callback on the <em>current thread</em>
+     * when it terminates.
+     * <p>
+     * <img width="640" height="251" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.blockingSubscribe.cca.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If either {@code onSuccess}, {@code onError} or {@code onComplete} throw, the {@link Throwable} is routed to the
+     *  global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, the {@code onError} consumer is called with an {@link InterruptedException}.
+     *  </dd>
+     * </dl>
+     * @param onSuccess the {@link Consumer} to call if the current {@code Maybe} succeeds
+     * @param onError the {@code Consumer} to call if the current {@code Maybe} signals an error
+     * @param onComplete the {@linnk Action} to call if the current {@code Maybe} completes without a value
+     * @throws NullPointerException if {@code onSuccess}, {@code onError} or {@code onComplete} is {@code null}
+     * @since 3.0.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onSuccess, @NonNull Consumer<? super Throwable> onError, @NonNull Action onComplete) {
+        Objects.requireNonNull(onSuccess, "onSuccess is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
+        BlockingMultiObserver<T> observer = new BlockingMultiObserver<>();
+        subscribe(observer);
+        observer.blockingConsume(onSuccess, onError, onComplete);
+    }
+
+    /**
+     * Subscribes to the current {@code Maybe} and calls the appropriate {@link MaybeObserver} method on the <em>current thread</em>.
+     * <p>
+     * <img width="640" height="398" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.blockingSubscribe.o.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>An {@code onError} signal is delivered to the {@link MaybeObserver#onError(Throwable)} method.
+     *  If any of the {@code MaybeObserver}'s methods throw, the {@link RuntimeException} is propagated to the caller of this method.
+     *  If the current thread is interrupted, an {@link InterruptedException} is delivered to {@code observer.onError}.
+     *  </dd>
+     * </dl>
+     * @param observer the {@code MaybeObserver} to call methods on the current thread
+     * @throws NullPointerException if {@code observer} is {@code null}
+     * @since 3.0.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull MaybeObserver<? super T> observer) {
+        Objects.requireNonNull(observer, "observer is null");
+        BlockingDisposableMultiObserver<T> blockingObserver = new BlockingDisposableMultiObserver<>();
+        observer.onSubscribe(blockingObserver);
+        subscribe(blockingObserver);
+        blockingObserver.blockingConsume(observer);
+    }
+
     /**
      * Returns a {@code Maybe} that subscribes to this {@code Maybe} lazily, caches its event
      * and replays it, to all the downstream subscribers.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index c93bfa9282..216d3deb87 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -2947,6 +2947,106 @@ public final T blockingGet() {
         return observer.blockingGet();
     }
 
+    /**
+     * Subscribes to the current {@code Single} and <em>blocks the current thread</em> until it terminates.
+     * <p>
+     * <img width="640" height="329" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.blockingSubscribe.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If the current {@code Single} signals an error,
+     *  the {@link Throwable} is routed to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, an {@link InterruptedException} is routed to the same global error handler.
+     *  </dd>
+     * </dl>
+     * @since 3.0.0
+     * @see #blockingSubscribe(Consumer)
+     * @see #blockingSubscribe(Consumer, Consumer)
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe() {
+        blockingSubscribe(Functions.emptyConsumer(), Functions.ERROR_CONSUMER);
+    }
+
+    /**
+     * Subscribes to the current {@code Single} and calls given {@code onSuccess} callback on the <em>current thread</em>
+     * when it completes normally.
+     * <p>
+     * <img width="640" height="351" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.blockingSubscribe.c.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If either the current {@code Single} signals an error or {@code onSuccess} throws,
+     *  the respective {@link Throwable} is routed to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, an {@link InterruptedException} is routed to the same global error handler.
+     *  </dd>
+     * </dl>
+     * @param onSuccess the {@link Consumer} to call if the current {@code Single} succeeds
+     * @throws NullPointerException if {@code onSuccess} is {@code null}
+     * @since 3.0.0
+     * @see #blockingSubscribe(Consumer, Consumer)
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onSuccess) {
+        blockingSubscribe(onSuccess, Functions.ERROR_CONSUMER);
+    }
+
+    /**
+     * Subscribes to the current {@code Single} and calls the appropriate callback on the <em>current thread</em>
+     * when it terminates.
+     * <p>
+     * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.blockingSubscribe.cc.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If either {@code onSuccess} or {@code onError} throw, the {@link Throwable} is routed to the
+     *  global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  If the current thread is interrupted, the {@code onError} consumer is called with an {@link InterruptedException}.
+     *  </dd>
+     * </dl>
+     * @param onSuccess the {@link Consumer} to call if the current {@code Single} succeeds
+     * @param onError the {@code Consumer} to call if the current {@code Single} signals an error
+     * @throws NullPointerException if {@code onSuccess} or {@code onError} is {@code null}
+     * @since 3.0.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull Consumer<? super T> onSuccess, @NonNull Consumer<? super Throwable> onError) {
+        Objects.requireNonNull(onSuccess, "onSuccess is null");
+        Objects.requireNonNull(onError, "onError is null");
+        BlockingMultiObserver<T> observer = new BlockingMultiObserver<>();
+        subscribe(observer);
+        observer.blockingConsume(onSuccess, onError, Functions.EMPTY_ACTION);
+    }
+
+    /**
+     * Subscribes to the current {@code Single} and calls the appropriate {@link SingleObserver} method on the <em>current thread</em>.
+     * <p>
+     * <img width="640" height="479" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.blockingSubscribe.o.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code blockingSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>An {@code onError} signal is delivered to the {@link SingleObserver#onError(Throwable)} method.
+     *  If any of the {@code SingleObserver}'s methods throw, the {@link RuntimeException} is propagated to the caller of this method.
+     *  If the current thread is interrupted, an {@link InterruptedException} is delivered to {@code observer.onError}.
+     *  </dd>
+     * </dl>
+     * @param observer the {@code SingleObserver} to call methods on the current thread
+     * @throws NullPointerException if {@code observer} is {@code null}
+     * @since 3.0.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void blockingSubscribe(@NonNull SingleObserver<? super T> observer) {
+        Objects.requireNonNull(observer, "observer is null");
+        BlockingDisposableMultiObserver<T> blockingObserver = new BlockingDisposableMultiObserver<>();
+        observer.onSubscribe(blockingObserver);
+        subscribe(blockingObserver);
+        blockingObserver.blockingConsume(observer);
+    }
+
     /**
      * <strong>This method requires advanced knowledge about building operators, please consider
      * other standard composition methods first;</strong>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingDisposableMultiObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingDisposableMultiObserver.java
new file mode 100644
index 0000000000..da7e289e27
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingDisposableMultiObserver.java
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import java.util.concurrent.CountDownLatch;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.internal.util.BlockingHelper;
+
+/**
+ * Blocks until the upstream terminates and dispatches the outcome to
+ * the actual observer.
+ *
+ * @param <T> the element type of the source
+ * @since 3.0.0
+ */
+public final class BlockingDisposableMultiObserver<T>
+extends CountDownLatch
+implements MaybeObserver<T>, SingleObserver<T>, CompletableObserver, Disposable {
+
+    T value;
+    Throwable error;
+
+    final SequentialDisposable upstream;
+
+    public BlockingDisposableMultiObserver() {
+        super(1);
+        upstream = new SequentialDisposable();
+    }
+
+    @Override
+    public void dispose() {
+        upstream.dispose();
+        countDown();
+    }
+
+    @Override
+    public boolean isDisposed() {
+        return upstream.isDisposed();
+    }
+
+    @Override
+    public void onSubscribe(@NonNull Disposable d) {
+        DisposableHelper.setOnce(upstream, d);
+    }
+
+    @Override
+    public void onSuccess(@NonNull T t) {
+        this.value = t;
+        upstream.lazySet(Disposable.disposed());
+        countDown();
+    }
+
+    @Override
+    public void onError(@NonNull Throwable e) {
+        this.error = e;
+        upstream.lazySet(Disposable.disposed());
+        countDown();
+    }
+
+    @Override
+    public void onComplete() {
+        upstream.lazySet(Disposable.disposed());
+        countDown();
+    }
+
+    public void blockingConsume(CompletableObserver observer) {
+        if (getCount() != 0) {
+            try {
+                BlockingHelper.verifyNonBlocking();
+                await();
+            } catch (InterruptedException ex) {
+                dispose();
+                observer.onError(ex);
+                return;
+            }
+        }
+        if (isDisposed()) {
+            return;
+        }
+
+        Throwable ex = error;
+        if (ex != null) {
+            observer.onError(ex);
+        } else {
+            observer.onComplete();
+        }
+    }
+
+    public void blockingConsume(SingleObserver<? super T> observer) {
+        if (getCount() != 0) {
+            try {
+                BlockingHelper.verifyNonBlocking();
+                await();
+            } catch (InterruptedException ex) {
+                dispose();
+                observer.onError(ex);
+                return;
+            }
+        }
+        if (isDisposed()) {
+            return;
+        }
+
+        Throwable ex = error;
+        if (ex != null) {
+            observer.onError(ex);
+        } else {
+            observer.onSuccess(value);
+        }
+    }
+
+    public void blockingConsume(MaybeObserver<? super T> observer) {
+        if (getCount() != 0) {
+            try {
+                BlockingHelper.verifyNonBlocking();
+                await();
+            } catch (InterruptedException ex) {
+                dispose();
+                observer.onError(ex);
+                return;
+            }
+        }
+        if (isDisposed()) {
+            return;
+        }
+
+        Throwable ex = error;
+        if (ex != null) {
+            observer.onError(ex);
+        } else {
+            T v = value;
+            if (v == null) {
+                observer.onComplete();
+            } else {
+                observer.onSuccess(v);
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java
index 1f4ee305bd..4945730ab5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java
@@ -17,7 +17,10 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * A combined Observer that awaits the success or error signal via a CountDownLatch.
@@ -143,4 +146,39 @@ public boolean blockingAwait(long timeout, TimeUnit unit) {
         }
         return true;
     }
+
+    /**
+     * Blocks until the source completes and calls the appropriate callback.
+     * @param onSuccess for a succeeding source
+     * @param onError for a failing source
+     * @param onComplete for an empty source
+     */
+    public void blockingConsume(Consumer<? super T> onSuccess, Consumer<? super Throwable> onError, Action onComplete) {
+        try {
+            if (getCount() != 0) {
+                try {
+                    BlockingHelper.verifyNonBlocking();
+                    await();
+                } catch (InterruptedException ex) {
+                    dispose();
+                    onError.accept(ex);
+                    return;
+                }
+            }
+            Throwable ex = error;
+            if (ex != null) {
+                onError.accept(ex);
+                return;
+            }
+            T v = value;
+            if (v != null) {
+                onSuccess.accept(v);
+            } else {
+                onComplete.run();
+            }
+        } catch (Throwable t) {
+            Exceptions.throwIfFatal(t);
+            RxJavaPlugins.onError(t);
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableBlockingSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableBlockingSubscribeTest.java
new file mode 100644
index 0000000000..e70aac7157
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableBlockingSubscribeTest.java
@@ -0,0 +1,331 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class CompletableBlockingSubscribeTest {
+
+    @Test
+    public void noArgComplete() {
+        Completable.complete()
+        .blockingSubscribe();
+    }
+
+    @Test
+    public void noArgCompleteAsync() {
+        Completable.complete()
+        .delay(100, TimeUnit.MILLISECONDS)
+        .blockingSubscribe();
+    }
+
+    @Test
+    public void noArgError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Completable.error(new TestException())
+            .blockingSubscribe();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void noArgErrorAsync() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Completable.error(new TestException())
+            .delay(100, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+            .blockingSubscribe();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void oneArgComplete() throws Throwable {
+        Action action = mock(Action.class);
+
+        Completable.complete()
+        .blockingSubscribe(action);
+
+        verify(action).run();
+    }
+
+    @Test
+    public void oneArgCompleteAsync() throws Throwable {
+        Action action = mock(Action.class);
+
+        Completable.complete()
+        .delay(50, TimeUnit.MILLISECONDS)
+        .blockingSubscribe(action);
+
+        verify(action).run();
+    }
+
+    @Test
+    public void oneArgCompleteFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action action = mock(Action.class);
+            doThrow(new TestException()).when(action).run();
+
+            Completable.complete()
+            .blockingSubscribe(action);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(action).run();
+        });
+    }
+
+    @Test
+    public void oneArgError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action action = mock(Action.class);
+
+            Completable.error(new TestException())
+            .blockingSubscribe(action);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(action, never()).run();
+        });
+    }
+
+    @Test
+    public void oneArgErrorAsync() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action action = mock(Action.class);
+
+            Completable.error(new TestException())
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+            .blockingSubscribe(action);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(action, never()).run();
+        });
+    }
+
+    @Test
+    public void twoArgComplete() throws Throwable {
+        Action action = mock(Action.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+        Completable.complete()
+        .blockingSubscribe(action, consumer);
+
+        verify(action).run();
+        verify(consumer, never()).accept(any());
+    }
+
+    @Test
+    public void twoArgCompleteAsync() throws Throwable {
+        Action action = mock(Action.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+        Completable.complete()
+        .delay(50, TimeUnit.MILLISECONDS)
+        .blockingSubscribe(action, consumer);
+
+        verify(action).run();
+        verify(consumer, never()).accept(any());
+    }
+
+    @Test
+    public void twoArgCompleteFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action action = mock(Action.class);
+            doThrow(new TestException()).when(action).run();
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Completable.complete()
+            .blockingSubscribe(action, consumer);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(action).run();
+            verify(consumer, never()).accept(any());
+        });
+    }
+
+    @Test
+    public void twoArgError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action action = mock(Action.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Completable.error(new TestException())
+            .blockingSubscribe(action, consumer);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(action, never()).run();
+            verify(consumer).accept(any(TestException.class));
+        });
+    }
+
+    @Test
+    public void twoArgErrorAsync() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action action = mock(Action.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Completable.error(new TestException())
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+            .blockingSubscribe(action, consumer);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(action, never()).run();
+            verify(consumer).accept(any(TestException.class));
+        });
+    }
+
+    @Test
+    public void twoArgErrorFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action action = mock(Action.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+            doThrow(new TestException()).when(consumer).accept(any());
+
+            Completable.error(new TestException())
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+            .blockingSubscribe(action, consumer);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(action, never()).run();
+            verify(consumer).accept(any(TestException.class));
+        });
+    }
+
+    @Test
+    public void twoArgInterrupted() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action onDispose = mock(Action.class);
+
+            Action action = mock(Action.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Thread.currentThread().interrupt();
+
+            Completable.never()
+            .doOnDispose(onDispose)
+            .blockingSubscribe(action, consumer);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(onDispose).run();
+            verify(action, never()).run();
+            verify(consumer).accept(any(InterruptedException.class));
+        });
+    }
+
+    @Test
+    public void observerComplete() {
+        TestObserver<Void> to = new TestObserver<>();
+
+        Completable.complete()
+        .blockingSubscribe(to);
+
+        to.assertResult();
+    }
+
+    @Test
+    public void observerCompleteAsync() {
+        TestObserver<Void> to = new TestObserver<>();
+
+        Completable.complete()
+        .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+        .blockingSubscribe(to);
+
+        to.assertResult();
+    }
+
+    @Test
+    public void observerError() {
+        TestObserver<Void> to = new TestObserver<>();
+
+        Completable.error(new TestException())
+        .blockingSubscribe(to);
+
+        to.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void observerErrorAsync() {
+        TestObserver<Void> to = new TestObserver<>();
+
+        Completable.error(new TestException())
+        .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+        .blockingSubscribe(to);
+
+        to.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void observerDispose() throws Throwable {
+        Action onDispose = mock(Action.class);
+
+        TestObserver<Void> to = new TestObserver<>();
+        to.dispose();
+
+        Completable.never()
+        .doOnDispose(onDispose)
+        .blockingSubscribe(to);
+
+        to.assertEmpty();
+
+        verify(onDispose).run();
+    }
+
+    @Test
+    public void ovserverInterrupted() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action onDispose = mock(Action.class);
+
+            TestObserver<Void> to = new TestObserver<>();
+
+            Thread.currentThread().interrupt();
+
+            Completable.never()
+            .doOnDispose(onDispose)
+            .blockingSubscribe(to);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(onDispose).run();
+            to.assertFailure(InterruptedException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeBlockingSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeBlockingSubscribeTest.java
new file mode 100644
index 0000000000..647d385eef
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeBlockingSubscribeTest.java
@@ -0,0 +1,502 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeBlockingSubscribeTest {
+
+    @Test
+    public void noArgSuccess() {
+        Maybe.just(1)
+        .blockingSubscribe();
+    }
+
+    @Test
+    public void noArgSuccessAsync() {
+        Maybe.just(1)
+        .delay(100, TimeUnit.MILLISECONDS)
+        .blockingSubscribe();
+    }
+
+    @Test
+    public void noArgEmpty() {
+        Maybe.empty()
+        .blockingSubscribe();
+    }
+
+    @Test
+    public void noArgEmptyAsync() {
+        Maybe.empty()
+        .delay(100, TimeUnit.MILLISECONDS)
+        .blockingSubscribe();
+    }
+
+    @Test
+    public void noArgError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Maybe.error(new TestException())
+            .blockingSubscribe();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void noArgErrorAsync() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Maybe.error(new TestException())
+            .delay(100, TimeUnit.MILLISECONDS, Schedulers.computation())
+            .blockingSubscribe();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void oneArgSuccess() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+
+        Maybe.just(1)
+        .blockingSubscribe(success);
+
+        verify(success).accept(1);
+    }
+
+    @Test
+    public void oneArgSuccessAsync() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+
+        Maybe.just(1)
+        .delay(50, TimeUnit.MILLISECONDS)
+        .blockingSubscribe(success);
+
+        verify(success).accept(1);
+    }
+
+    @Test
+    public void oneArgEmpty() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+
+        Maybe.<Integer>empty()
+        .blockingSubscribe(success);
+
+        verify(success, never()).accept(any());
+    }
+
+    @Test
+    public void oneArgEmptyAsync() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+
+        Maybe.<Integer>empty()
+        .delay(50, TimeUnit.MILLISECONDS)
+        .blockingSubscribe(success);
+
+        verify(success, never()).accept(any());
+    }
+
+    @Test
+    public void oneArgSuccessFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            doThrow(new TestException()).when(success).accept(any());
+
+            Maybe.just(1)
+            .blockingSubscribe(success);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success).accept(1);
+        });
+    }
+
+    @Test
+    public void oneArgError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+
+            Maybe.<Integer>error(new TestException())
+            .blockingSubscribe(success);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success, never()).accept(any());
+        });
+    }
+
+    @Test
+    public void oneArgErrorAsync() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+
+            Maybe.<Integer>error(new TestException())
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation())
+            .blockingSubscribe(success);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success, never()).accept(any());
+        });
+    }
+
+    @Test
+    public void twoArgSuccess() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+        Maybe.just(1)
+        .blockingSubscribe(success, consumer);
+
+        verify(success).accept(1);
+        verify(consumer, never()).accept(any());
+    }
+
+    @Test
+    public void twoArgSuccessAsync() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+        Maybe.just(1)
+        .delay(50, TimeUnit.MILLISECONDS)
+        .blockingSubscribe(success, consumer);
+
+        verify(success).accept(any());
+        verify(consumer, never()).accept(any());
+    }
+
+    @Test
+    public void twoArgEmpty() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+        Maybe.<Integer>empty()
+        .blockingSubscribe(success, consumer);
+
+        verify(success, never()).accept(any());
+        verify(consumer, never()).accept(any());
+    }
+
+    @Test
+    public void twoArgEmptyAsync() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+        Maybe.<Integer>empty()
+        .delay(50, TimeUnit.MILLISECONDS)
+        .blockingSubscribe(success, consumer);
+
+        verify(success, never()).accept(any());
+        verify(consumer, never()).accept(any());
+    }
+
+    @Test
+    public void twoArgSuccessFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            doThrow(new TestException()).when(success).accept(any());
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Maybe.just(1)
+            .blockingSubscribe(success, consumer);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success).accept(any());
+            verify(consumer, never()).accept(any());
+        });
+    }
+
+    @Test
+    public void twoArgError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Maybe.<Integer>error(new TestException())
+            .blockingSubscribe(success, consumer);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(success, never()).accept(any());
+            verify(consumer).accept(any(TestException.class));
+        });
+    }
+
+    @Test
+    public void twoArgErrorAsync() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Maybe.<Integer>error(new TestException())
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation())
+            .blockingSubscribe(success, consumer);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(success, never()).accept(any());
+            verify(consumer).accept(any(TestException.class));
+        });
+    }
+
+    @Test
+    public void twoArgErrorFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+            doThrow(new TestException()).when(consumer).accept(any());
+
+            Maybe.<Integer>error(new TestException())
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation())
+            .blockingSubscribe(success, consumer);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success, never()).accept(any());
+            verify(consumer).accept(any(TestException.class));
+        });
+    }
+
+    @Test
+    public void threeArgSuccess() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+        Action action = mock(Action.class);
+
+        Maybe.just(1)
+        .blockingSubscribe(success, consumer, action);
+
+        verify(success).accept(any());
+        verify(consumer, never()).accept(any(Throwable.class));
+        verify(action, never()).run();
+    }
+
+    @Test
+    public void threeArgEmpty() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+        Action action = mock(Action.class);
+
+        Maybe.<Integer>empty()
+        .blockingSubscribe(success, consumer, action);
+
+        verify(success, never()).accept(any());
+        verify(consumer, never()).accept(any(Throwable.class));
+        verify(action).run();
+    }
+
+    @Test
+    public void threeArgError() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+        Action action = mock(Action.class);
+
+        Maybe.<Integer>error(new TestException())
+        .blockingSubscribe(success, consumer, action);
+
+        verify(success, never()).accept(any());
+        verify(consumer).accept(any(TestException.class));
+        verify(action, never()).run();
+    }
+
+    @Test
+    public void threeArgEmptyFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Action action = mock(Action.class);
+            doThrow(new TestException()).when(action).run();
+
+            Maybe.<Integer>empty()
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation())
+            .blockingSubscribe(success, consumer, action);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success, never()).accept(any());
+            verify(consumer, never()).accept(any());
+            verify(action).run();
+        });
+    }
+
+    @Test
+    public void threeArgInterrupted() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action onDispose = mock(Action.class);
+
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+            Action action = mock(Action.class);
+
+            Thread.currentThread().interrupt();
+
+            Maybe.<Integer>never()
+            .doOnDispose(onDispose)
+            .blockingSubscribe(success, consumer, action);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(onDispose).run();
+            verify(success, never()).accept(any());
+            verify(action, never()).run();
+            verify(consumer).accept(any(InterruptedException.class));
+        });
+    }
+
+    @Test
+    public void observerSuccess() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Maybe.just(1)
+        .blockingSubscribe(to);
+
+        to.assertResult(1);
+    }
+
+    @Test
+    public void observerSuccessAsync() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Maybe.just(1)
+        .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation())
+        .blockingSubscribe(to);
+
+        to.assertResult(1);
+    }
+
+    @Test
+    public void observerEmpty() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Maybe.<Integer>empty()
+        .blockingSubscribe(to);
+
+        to.assertResult();
+    }
+
+    @Test
+    public void observerEmptyAsync() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Maybe.<Integer>empty()
+        .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation())
+        .blockingSubscribe(to);
+
+        to.assertResult();
+    }
+
+    @Test
+    public void observerError() {
+        TestObserver<Object> to = new TestObserver<>();
+
+        Maybe.error(new TestException())
+        .blockingSubscribe(to);
+
+        to.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void observerErrorAsync() {
+        TestObserver<Object> to = new TestObserver<>();
+
+        Maybe.error(new TestException())
+        .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation())
+        .blockingSubscribe(to);
+
+        to.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void observerDispose() throws Throwable {
+        Action onDispose = mock(Action.class);
+
+        TestObserver<Object> to = new TestObserver<>();
+        to.dispose();
+
+        Maybe.never()
+        .doOnDispose(onDispose)
+        .blockingSubscribe(to);
+
+        to.assertEmpty();
+
+        verify(onDispose).run();
+    }
+
+    @Test
+    public void ovserverInterrupted() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action onDispose = mock(Action.class);
+
+            TestObserver<Object> to = new TestObserver<>();
+
+            Thread.currentThread().interrupt();
+
+            Maybe.never()
+            .doOnDispose(onDispose)
+            .blockingSubscribe(to);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(onDispose).run();
+            to.assertFailure(InterruptedException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleBlockingSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleBlockingSubscribeTest.java
new file mode 100644
index 0000000000..50eceede5c
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleBlockingSubscribeTest.java
@@ -0,0 +1,343 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleBlockingSubscribeTest {
+
+    @Test
+    public void noArgSuccess() {
+        Single.just(1)
+        .blockingSubscribe();
+    }
+
+    @Test
+    public void noArgSuccessAsync() {
+        Single.just(1)
+        .delay(100, TimeUnit.MILLISECONDS)
+        .blockingSubscribe();
+    }
+
+    @Test
+    public void noArgError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Single.error(new TestException())
+            .blockingSubscribe();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void noArgErrorAsync() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Single.error(new TestException())
+            .delay(100, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+            .blockingSubscribe();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void oneArgSuccess() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+
+        Single.just(1)
+        .blockingSubscribe(success);
+
+        verify(success).accept(1);
+    }
+
+    @Test
+    public void oneArgSuccessAsync() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+
+        Single.just(1)
+        .delay(50, TimeUnit.MILLISECONDS)
+        .blockingSubscribe(success);
+
+        verify(success).accept(1);
+    }
+
+    @Test
+    public void oneArgSuccessFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            doThrow(new TestException()).when(success).accept(any());
+
+            Single.just(1)
+            .blockingSubscribe(success);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success).accept(1);
+        });
+    }
+
+    @Test
+    public void oneArgError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+
+            Single.<Integer>error(new TestException())
+            .blockingSubscribe(success);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success, never()).accept(any());
+        });
+    }
+
+    @Test
+    public void oneArgErrorAsync() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+
+            Single.<Integer>error(new TestException())
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+            .blockingSubscribe(success);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success, never()).accept(any());
+        });
+    }
+
+    @Test
+    public void twoArgSuccess() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+        Single.just(1)
+        .blockingSubscribe(success, consumer);
+
+        verify(success).accept(1);
+        verify(consumer, never()).accept(any());
+    }
+
+    @Test
+    public void twoArgSuccessAsync() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> success = mock(Consumer.class);
+        @SuppressWarnings("unchecked")
+        Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+        Single.just(1)
+        .delay(50, TimeUnit.MILLISECONDS)
+        .blockingSubscribe(success, consumer);
+
+        verify(success).accept(any());
+        verify(consumer, never()).accept(any());
+    }
+
+    @Test
+    public void twoArgSuccessFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            doThrow(new TestException()).when(success).accept(any());
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Single.just(1)
+            .blockingSubscribe(success, consumer);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success).accept(any());
+            verify(consumer, never()).accept(any());
+        });
+    }
+
+    @Test
+    public void twoArgError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Single.<Integer>error(new TestException())
+            .blockingSubscribe(success, consumer);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(success, never()).accept(any());
+            verify(consumer).accept(any(TestException.class));
+        });
+    }
+
+    @Test
+    public void twoArgErrorAsync() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Single.<Integer>error(new TestException())
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+            .blockingSubscribe(success, consumer);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(success, never()).accept(any());
+            verify(consumer).accept(any(TestException.class));
+        });
+    }
+
+    @Test
+    public void twoArgErrorFails() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+            doThrow(new TestException()).when(consumer).accept(any());
+
+            Single.<Integer>error(new TestException())
+            .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+            .blockingSubscribe(success, consumer);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            verify(success, never()).accept(any());
+            verify(consumer).accept(any(TestException.class));
+        });
+    }
+
+    @Test
+    public void twoArgInterrupted() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action onDispose = mock(Action.class);
+
+            @SuppressWarnings("unchecked")
+            Consumer<Integer> success = mock(Consumer.class);
+            @SuppressWarnings("unchecked")
+            Consumer<? super Throwable> consumer = mock(Consumer.class);
+
+            Thread.currentThread().interrupt();
+
+            Single.<Integer>never()
+            .doOnDispose(onDispose)
+            .blockingSubscribe(success, consumer);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(onDispose).run();
+            verify(success, never()).accept(any());
+            verify(consumer).accept(any(InterruptedException.class));
+        });
+    }
+
+    @Test
+    public void observerSuccess() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Single.just(1)
+        .blockingSubscribe(to);
+
+        to.assertResult(1);
+    }
+
+    @Test
+    public void observerSuccessAsync() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Single.just(1)
+        .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+        .blockingSubscribe(to);
+
+        to.assertResult(1);
+    }
+
+    @Test
+    public void observerError() {
+        TestObserver<Object> to = new TestObserver<>();
+
+        Single.error(new TestException())
+        .blockingSubscribe(to);
+
+        to.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void observerErrorAsync() {
+        TestObserver<Object> to = new TestObserver<>();
+
+        Single.error(new TestException())
+        .delay(50, TimeUnit.MILLISECONDS, Schedulers.computation(), true)
+        .blockingSubscribe(to);
+
+        to.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void observerDispose() throws Throwable {
+        Action onDispose = mock(Action.class);
+
+        TestObserver<Object> to = new TestObserver<>();
+        to.dispose();
+
+        Single.never()
+        .doOnDispose(onDispose)
+        .blockingSubscribe(to);
+
+        to.assertEmpty();
+
+        verify(onDispose).run();
+    }
+
+    @Test
+    public void ovserverInterrupted() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Action onDispose = mock(Action.class);
+
+            TestObserver<Object> to = new TestObserver<>();
+
+            Thread.currentThread().interrupt();
+
+            Single.never()
+            .doOnDispose(onDispose)
+            .blockingSubscribe(to);
+
+            assertTrue("" + errors, errors.isEmpty());
+
+            verify(onDispose).run();
+            to.assertFailure(InterruptedException.class);
+        });
+    }
+}

From 13473da61366945f49aed5a29729841836abf2ab Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 24 Jan 2020 17:36:18 +0100
Subject: [PATCH 066/665] 3.x: Fix many marbles in Maybe (#6866)

---
 .../java/io/reactivex/rxjava3/core/Maybe.java | 80 ++++++++++++-------
 1 file changed, 53 insertions(+), 27 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 0d0d6f5473..375a439e65 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -562,6 +562,8 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
     /**
      * Provides an API (via a cold {@code Maybe}) that bridges the reactive world with the callback-style world.
      * <p>
+     * <img width="640" height="499" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.create.png" alt="">
+     * <p>
      * Example:
      * <pre><code>
      * Maybe.&lt;Event&gt;create(emitter -&gt; {
@@ -615,6 +617,8 @@ public static <T> Maybe<T> create(@NonNull MaybeOnSubscribe<T> onSubscribe) {
     /**
      * Calls a {@link Supplier} for each individual {@link MaybeObserver} to return the actual {@link MaybeSource} source to
      * be subscribed to.
+     * <p>
+     * <img width="640" height="498" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.defer.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code defer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -683,7 +687,7 @@ public static <T> Maybe<T> error(@NonNull Throwable throwable) {
      * Returns a {@code Maybe} that invokes a {@link MaybeObserver}'s {@link MaybeObserver#onError onError} method when the
      * {@code MaybeObserver} subscribes to it.
      * <p>
-     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.png" alt="">
+     * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.error.f.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -708,6 +712,8 @@ public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier
     /**
      * Returns a {@code Maybe} instance that runs the given {@link Action} for each subscriber and
      * emits either its exception or simply completes.
+     * <p>
+     * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromAction.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromAction} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -734,7 +740,8 @@ public static <T> Maybe<T> fromAction(@NonNull Action action) {
 
     /**
      * Wraps a {@link CompletableSource} into a {@code Maybe}.
-     *
+     * <p>
+     * <img width="640" height="280" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromCompletable.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -754,7 +761,8 @@ public static <T> Maybe<T> fromCompletable(@NonNull CompletableSource completabl
 
     /**
      * Wraps a {@link SingleSource} into a {@code Maybe}.
-     *
+     * <p>
+     * <img width="640" height="344" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromSingle.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -778,6 +786,8 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
      * considering a {@code null} result from the {@code Callable} as indication for valueless completion
      * via {@code onComplete}.
      * <p>
+     * <img width="640" height="183" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromCallable.png" alt="">
+     * <p>
      * This operator allows you to defer the execution of the given {@code Callable} until a {@code MaybeObserver}
      * subscribes to the  returned {@code Maybe}. In other terms, this source operator evaluates the given
      * {@code Callable} "lazily".
@@ -820,7 +830,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
     /**
      * Converts a {@link Future} into a {@code Maybe}, treating a {@code null} result as an indication of emptiness.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
+     * <img width="640" height="204" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromFuture.png" alt="">
      * <p>
      * The operator calls {@link Future#get()}, which is a blocking method, on the subscription thread.
      * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
@@ -854,7 +864,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
     /**
      * Converts a {@link Future} into a {@code Maybe}, with a timeout on the {@code Future}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
+     * <img width="640" height="176" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromFuture.t.png" alt="">
      * <p>
      * The operator calls {@link Future#get(long, TimeUnit)}, which is a blocking method, on the subscription thread.
      * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
@@ -893,6 +903,8 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
     /**
      * Returns a {@code Maybe} instance that runs the given {@link Runnable} for each subscriber and
      * emits either its exception or simply completes.
+     * <p>
+     * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromRunnable.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -989,6 +1001,8 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
     /**
      * Merges an {@link Iterable} sequence of {@link MaybeSource} instances into a single {@link Flowable} sequence,
      * running all {@code MaybeSource}s at once.
+     * <p>
+     * <img width="640" height="301" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.i.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1025,6 +1039,8 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends MaybeSo
     /**
      * Merges a {@link Publisher} sequence of {@link MaybeSource} instances into a single {@link Flowable} sequence,
      * running all {@code MaybeSource}s at once.
+     * <p>
+     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1061,6 +1077,8 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeS
     /**
      * Merges a {@link Publisher} sequence of {@link MaybeSource} instances into a single {@link Flowable} sequence,
      * running at most maxConcurrency {@code MaybeSource}s at once.
+     * <p>
+     * <img width="640" height="260" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.pn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1134,7 +1152,7 @@ public static <T> Maybe<T> merge(@NonNull MaybeSource<? extends MaybeSource<? ex
     /**
      * Flattens two {@link MaybeSource}s into a single {@link Flowable}, without any transformation.
      * <p>
-     * <img width="640" height="483" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.png" alt="">
+     * <img width="640" height="279" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.2.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code MaybeSource}s so that they appear as a single {@code Flowable}, by
      * using the {@code merge} method.
@@ -1183,7 +1201,7 @@ public static <T> Flowable<T> merge(
     /**
      * Flattens three {@link MaybeSource}s into a single {@link Flowable}, without any transformation.
      * <p>
-     * <img width="640" height="483" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.png" alt="">
+     * <img width="640" height="301" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code MaybeSource}s so that they appear as a single {@code Flowable}, by using
      * the {@code merge} method.
@@ -1236,7 +1254,7 @@ public static <T> Flowable<T> merge(
     /**
      * Flattens four {@link MaybeSource}s into a single {@link Flowable}, without any transformation.
      * <p>
-     * <img width="640" height="483" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.png" alt="">
+     * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.4.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code MaybeSource}s so that they appear as a single {@code Flowable}, by using
      * the {@code merge} method.
@@ -1292,6 +1310,8 @@ public static <T> Flowable<T> merge(
     /**
      * Merges an array sequence of {@link MaybeSource} instances into a single {@link Flowable} sequence,
      * running all {@code MaybeSource}s at once.
+     * <p>
+     * <img width="640" height="272" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeArray.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1340,12 +1360,12 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
      * successfully emitted items from each of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
+     * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeArrayDelayError.png" alt="">
+     * <p>
      * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code MaybeSource}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code MaybeSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
-     * <p>
      * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its subscribers once.
      * <dl>
@@ -1381,11 +1401,13 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extend
      * successfully emitted items from each of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
+     * <img width="640" height="467" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeDelayError.i.png" alt="">
+     * <p>
      * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code MaybeSource}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code MaybeSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="467" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeDelayError.i.png" alt="">
      * <p>
      * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its subscribers once.
@@ -1417,12 +1439,12 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
      * receive all successfully emitted items from all of the source {@code MaybeSource}s without being interrupted by
      * an error notification from one of them or even the main {@code Publisher}.
      * <p>
+     * <img width="640" height="456" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeDelayError.p.png" alt="">
+     * <p>
      * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code MaybeSource}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code MaybeSource}s and the main {@code Publisher} have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
-     * <p>
      * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its subscribers once.
      * <dl>
@@ -1453,12 +1475,12 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      * receive all successfully emitted items from all of the source {@code MaybeSource}s without being interrupted by
      * an error notification from one of them or even the main {@code Publisher} as well as limiting the total number of active {@code MaybeSource}s.
      * <p>
+     * <img width="640" height="429" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeDelayError.pn.png" alt="">
+     * <p>
      * This behaves like {@link #merge(Publisher, int)} except that if any of the merged {@code MaybeSource}s notify of an
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code MaybeSource}s and the main {@code Publisher} have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
-     * <p>
      * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its subscribers once.
      * <dl>
@@ -1495,12 +1517,12 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      * successfully emitted items from each of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
+     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeDelayError.2.png" alt="">
+     * <p>
      * This behaves like {@link #merge(MaybeSource, MaybeSource)} except that if any of the merged {@code MaybeSource}s
      * notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from
      * propagating that error notification until all of the merged {@code MaybeSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
-     * <p>
      * Even if both merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its subscribers once.
      * <dl>
@@ -1534,13 +1556,13 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
      * successfully emitted items from all of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
+     * <img width="640" height="467" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeDelayError.3.png" alt="">
+     * <p>
      * This behaves like {@link #merge(MaybeSource, MaybeSource, MaybeSource)} except that if any of the merged
      * {@code MaybeSource}s notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain
      * from propagating that error notification until all of the merged {@code MaybeSource}s have finished emitting
      * items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
-     * <p>
      * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its subscribers once.
      * <dl>
@@ -1578,13 +1600,13 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
      * successfully emitted items from all of the source {@code MaybeSource}s without being interrupted by an error
      * notification from one of them.
      * <p>
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeDelayError.4.png" alt="">
+     * <p>
      * This behaves like {@link #merge(MaybeSource, MaybeSource, MaybeSource, MaybeSource)} except that if any of
      * the merged {@code MaybeSource}s notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError}
      * will refrain from propagating that error notification until all of the merged {@code MaybeSource}s have finished
      * emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
-     * <p>
      * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its subscribers once.
      * <dl>
@@ -1649,7 +1671,7 @@ public static <T> Maybe<T> never() {
      * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link MaybeSource} sequences are the
      * same by comparing the items emitted by each {@code MaybeSource} pairwise.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
+     * <img width="640" height="196" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.sequenceEqual.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1677,7 +1699,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
      * same by comparing the items emitted by each {@code MaybeSource} pairwise based on the results of a specified
      * equality function.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
+     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.sequenceEqual.f.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1709,7 +1731,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
     /**
      * Returns a {@code Maybe} that emits {@code 0L} after a specified delay.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.png" alt="">
+     * <img width="640" height="391" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timer.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timer} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -1733,7 +1755,7 @@ public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit) {
     /**
      * Returns a {@code Maybe} that emits {@code 0L} after a specified delay on a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.s.png" alt="">
+     * <img width="640" height="392" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timer.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -1762,6 +1784,8 @@ public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Sch
     /**
      * <strong>Advanced use only:</strong> creates a {@code Maybe} instance without
      * any safeguards by using a callback that is called with a {@link MaybeObserver}.
+     * <p>
+     * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.unsafeCreate.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code unsafeCreate} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1787,7 +1811,7 @@ public static <T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
      * Constructs a {@code Maybe} that creates a dependent resource object which is disposed of when the
      * generated {@link MaybeSource} terminates or the downstream calls dispose().
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
+     * <img width="640" height="378" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.using.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1818,7 +1842,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
      * Constructs a {@code Maybe} that creates a dependent resource object which is disposed first ({code eager == true})
      * when the generated {@link MaybeSource} terminates or the downstream disposes; or after ({code eager == false}).
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
+     * <img width="640" height="323" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.using.b.png" alt="">
      * <p>
      * Eager disposal is particularly appropriate for a synchronous {@code Maybe} that reuses resources. {@code disposeAction} will
      * only be called once per subscription.
@@ -1859,6 +1883,8 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
     /**
      * Wraps a {@link MaybeSource} instance into a new {@code Maybe} instance if not already a {@code Maybe}
      * instance.
+     * <p>
+     * <img width="640" height="232" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.wrap.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code wrap} does not operate by default on a particular {@link Scheduler}.</dd>

From ad1840b1b591206e5eeb10c07b1b126fbbac3560 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 24 Jan 2020 22:44:22 +0100
Subject: [PATCH 067/665] 3.x: Add onErrorComplete to Flowable, Observable and
 Single (#6867)

* 3.x: Add onErrorComplete to F/O/S

* Add version tags.
---
 .../io/reactivex/rxjava3/core/Flowable.java   |  54 ++++++-
 .../java/io/reactivex/rxjava3/core/Maybe.java |   4 +
 .../io/reactivex/rxjava3/core/Observable.java |  43 ++++++
 .../io/reactivex/rxjava3/core/Single.java     |  43 ++++++
 .../flowable/FlowableOnErrorComplete.java     | 107 +++++++++++++
 .../operators/maybe/MaybeOnErrorComplete.java |   7 +-
 .../observable/ObservableOnErrorComplete.java | 106 +++++++++++++
 .../single/SingleOnErrorComplete.java         |  43 ++++++
 .../flowable/FlowableOnErrorCompleteTest.java | 143 ++++++++++++++++++
 .../ObservableOnErrorCompleteTest.java        | 134 ++++++++++++++++
 .../single/SingleOnErrorCompleteTest.java     | 113 ++++++++++++++
 11 files changed, 793 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorComplete.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorComplete.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorComplete.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorCompleteTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorCompleteTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorCompleteTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 0106f42ce9..a627eb3474 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -19,6 +19,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.flowables.*;
@@ -28,7 +29,7 @@
 import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
-import io.reactivex.rxjava3.internal.operators.observable.ObservableFromPublisher;
+import io.reactivex.rxjava3.internal.operators.observable.*;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscribers.*;
 import io.reactivex.rxjava3.internal.util.*;
@@ -12308,6 +12309,57 @@ public final Flowable<T> onBackpressureLatest() {
         return RxJavaPlugins.onAssembly(new FlowableOnBackpressureLatest<>(this));
     }
 
+    /**
+     * Returns a {@code Flowable} instance that if the current {@code Flowable} emits an error, it will emit an {@code onComplete}
+     * and swallow the throwable.
+     * <p>
+     * <img width="640" height="372" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.onErrorComplete.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
+     *  behavior.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new {@code Flowable} instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @NonNull
+    public final Flowable<T> onErrorComplete() {
+        return onErrorComplete(Functions.alwaysTrue());
+    }
+
+    /**
+     * Returns a {@code Flowable} instance that if the current {@code Flowable} emits an error and the predicate returns
+     * {@code true}, it will emit an {@code onComplete} and swallow the throwable.
+     * <p>
+     * <img width="640" height="201" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.onErrorComplete.f.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
+     *  behavior.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param predicate the predicate to call when an {@link Throwable} is emitted which should return {@code true}
+     * if the {@code Throwable} should be swallowed and replaced with an {@code onComplete}.
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Flowable<T> onErrorComplete(@NonNull Predicate<? super Throwable> predicate) {
+        Objects.requireNonNull(predicate, "predicate is null");
+
+        return RxJavaPlugins.onAssembly(new FlowableOnErrorComplete<>(this, predicate));
+    }
+
     /**
      * Resumes the flow with a {@link Publisher} returned for the failure {@link Throwable} of the current {@code Flowable} by a
      * function instead of signaling the error via {@code onError}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 375a439e65..1d385ce148 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -4042,6 +4042,8 @@ public final Single<T> toSingle() {
     /**
      * Returns a {@code Maybe} instance that if this {@code Maybe} emits an error, it will emit an {@code onComplete}
      * and swallow the throwable.
+     * <p>
+     * <img width="640" height="372" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.onErrorComplete.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4058,6 +4060,8 @@ public final Maybe<T> onErrorComplete() {
     /**
      * Returns a {@code Maybe} instance that if this {@code Maybe} emits an error and the predicate returns
      * {@code true}, it will emit an {@code onComplete} and swallow the throwable.
+     * <p>
+     * <img width="640" height="220" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.onErrorComplete.f.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 57456a9545..f599ce0eeb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -10346,6 +10346,49 @@ public final <U> Observable<U> ofType(@NonNull Class<U> clazz) {
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
 
+    /**
+     * Returns an {@code Observable} instance that if the current {@code Observable} emits an error, it will emit an {@code onComplete}
+     * and swallow the throwable.
+     * <p>
+     * <img width="640" height="373" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.onErrorComplete.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new {@code Observable} instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Observable<T> onErrorComplete() {
+        return onErrorComplete(Functions.alwaysTrue());
+    }
+
+    /**
+     * Returns an {@code Observable} instance that if the current {@code Observable} emits an error and the predicate returns
+     * {@code true}, it will emit an {@code onComplete} and swallow the throwable.
+     * <p>
+     * <img width="640" height="215" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.onErrorComplete.f.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param predicate the predicate to call when an {@link Throwable} is emitted which should return {@code true}
+     * if the {@code Throwable} should be swallowed and replaced with an {@code onComplete}.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Observable<T> onErrorComplete(@NonNull Predicate<? super Throwable> predicate) {
+        Objects.requireNonNull(predicate, "predicate is null");
+
+        return RxJavaPlugins.onAssembly(new ObservableOnErrorComplete<>(this, predicate));
+    }
+
     /**
      * Resumes the flow with an {@link ObservableSource} returned for the failure {@link Throwable} of the current {@code Observable} by a
      * function instead of signaling the error via {@code onError}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 216d3deb87..f6e41cee5c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -3439,6 +3439,49 @@ public final Single<T> onErrorResumeWith(@NonNull SingleSource<? extends T> fall
         return onErrorResumeNext(Functions.justFunction(fallback));
     }
 
+    /**
+     * Returns a {@link Maybe} instance that if the current {@code Single} emits an error, it will emit an {@code onComplete}
+     * and swallow the throwable.
+     * <p>
+     * <img width="640" height="554" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorComplete.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @return the new {@code Maybe} instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Maybe<T> onErrorComplete() {
+        return onErrorComplete(Functions.alwaysTrue());
+    }
+
+    /**
+     * Returns a {@link Maybe} instance that if this {@code Single} emits an error and the predicate returns
+     * {@code true}, it will emit an {@code onComplete} and swallow the throwable.
+     * <p>
+     * <img width="640" height="220" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorComplete.f.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param predicate the predicate to call when an {@link Throwable} is emitted which should return {@code true}
+     * if the {@code Throwable} should be swallowed and replaced with an {@code onComplete}.
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code predicate} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> predicate) {
+        Objects.requireNonNull(predicate, "predicate is null");
+
+        return RxJavaPlugins.onAssembly(new SingleOnErrorComplete<>(this, predicate));
+    }
+
     /**
      * Resumes the flow with a {@link SingleSource} returned for the failure {@link Throwable} of the current {@code Single} by a
      * function instead of signaling the error via {@code onError}.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorComplete.java
new file mode 100644
index 0000000000..c477917f35
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorComplete.java
@@ -0,0 +1,107 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+
+/**
+ * Emits an onComplete if the source emits an onError and the predicate returns true for
+ * that Throwable.
+ * 
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class FlowableOnErrorComplete<T> extends AbstractFlowableWithUpstream<T, T> {
+
+    final Predicate<? super Throwable> predicate;
+
+    public FlowableOnErrorComplete(Flowable<T> source,
+            Predicate<? super Throwable> predicate) {
+        super(source);
+        this.predicate = predicate;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super T> observer) {
+        source.subscribe(new OnErrorCompleteSubscriber<>(observer, predicate));
+    }
+
+    public static final class OnErrorCompleteSubscriber<T>
+    implements FlowableSubscriber<T>, Subscription {
+
+        final Subscriber<? super T> downstream;
+
+        final Predicate<? super Throwable> predicate;
+
+        Subscription upstream;
+
+        public OnErrorCompleteSubscriber(Subscriber<? super T> actual, Predicate<? super Throwable> predicate) {
+            this.downstream = actual;
+            this.predicate = predicate;
+        }
+
+        @Override
+        public void onSubscribe(Subscription s) {
+            if (SubscriptionHelper.validate(this.upstream, s)) {
+                this.upstream = s;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onNext(T value) {
+            downstream.onNext(value);
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            boolean b;
+
+            try {
+                b = predicate.test(e);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(new CompositeException(e, ex));
+                return;
+            }
+
+            if (b) {
+                downstream.onComplete();
+            } else {
+                downstream.onError(e);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            downstream.onComplete();
+        }
+
+        @Override
+        public void cancel() {
+            upstream.cancel();
+        }
+
+        @Override
+        public void request(long n) {
+            upstream.request(n);
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java
index 8792a93cc5..277e207eaf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java
@@ -37,10 +37,11 @@ public MaybeOnErrorComplete(MaybeSource<T> source,
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new OnErrorCompleteMaybeObserver<>(observer, predicate));
+        source.subscribe(new OnErrorCompleteMultiObserver<>(observer, predicate));
     }
 
-    static final class OnErrorCompleteMaybeObserver<T> implements MaybeObserver<T>, Disposable {
+    public static final class OnErrorCompleteMultiObserver<T>
+    implements MaybeObserver<T>, SingleObserver<T>, Disposable {
 
         final MaybeObserver<? super T> downstream;
 
@@ -48,7 +49,7 @@ static final class OnErrorCompleteMaybeObserver<T> implements MaybeObserver<T>,
 
         Disposable upstream;
 
-        OnErrorCompleteMaybeObserver(MaybeObserver<? super T> actual, Predicate<? super Throwable> predicate) {
+        public OnErrorCompleteMultiObserver(MaybeObserver<? super T> actual, Predicate<? super Throwable> predicate) {
             this.downstream = actual;
             this.predicate = predicate;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorComplete.java
new file mode 100644
index 0000000000..6854a5ce6d
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorComplete.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+
+/**
+ * Emits an onComplete if the source emits an onError and the predicate returns true for
+ * that Throwable.
+ * 
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class ObservableOnErrorComplete<T> extends AbstractObservableWithUpstream<T, T> {
+
+    final Predicate<? super Throwable> predicate;
+
+    public ObservableOnErrorComplete(ObservableSource<T> source,
+            Predicate<? super Throwable> predicate) {
+        super(source);
+        this.predicate = predicate;
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super T> observer) {
+        source.subscribe(new OnErrorCompleteObserver<>(observer, predicate));
+    }
+
+    public static final class OnErrorCompleteObserver<T>
+    implements Observer<T>, Disposable {
+
+        final Observer<? super T> downstream;
+
+        final Predicate<? super Throwable> predicate;
+
+        Disposable upstream;
+
+        public OnErrorCompleteObserver(Observer<? super T> actual, Predicate<? super Throwable> predicate) {
+            this.downstream = actual;
+            this.predicate = predicate;
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onNext(T value) {
+            downstream.onNext(value);
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            boolean b;
+
+            try {
+                b = predicate.test(e);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(new CompositeException(e, ex));
+                return;
+            }
+
+            if (b) {
+                downstream.onComplete();
+            } else {
+                downstream.onError(e);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            downstream.onComplete();
+        }
+
+        @Override
+        public void dispose() {
+            upstream.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorComplete.java
new file mode 100644
index 0000000000..7be9bd817c
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorComplete.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Predicate;
+import io.reactivex.rxjava3.internal.operators.maybe.MaybeOnErrorComplete;
+
+/**
+ * Emits an onComplete if the source emits an onError and the predicate returns true for
+ * that Throwable.
+ * 
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class SingleOnErrorComplete<T> extends Maybe<T> {
+
+    final Single<T> source;
+
+    final Predicate<? super Throwable> predicate;
+
+    public SingleOnErrorComplete(Single<T> source,
+            Predicate<? super Throwable> predicate) {
+        this.source = source;
+        this.predicate = predicate;
+    }
+
+    @Override
+    protected void subscribeActual(MaybeObserver<? super T> observer) {
+        source.subscribe(new MaybeOnErrorComplete.OnErrorCompleteMultiObserver<T>(observer, predicate));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorCompleteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorCompleteTest.java
new file mode 100644
index 0000000000..c1c89cbe27
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorCompleteTest.java
@@ -0,0 +1,143 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class FlowableOnErrorCompleteTest {
+
+    @Test
+    public void normal() {
+        Flowable.range(1, 10)
+        .onErrorComplete()
+        .test()
+        .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void normalBackpressured() {
+        Flowable.range(1, 10)
+        .onErrorComplete()
+        .test(0)
+        .assertEmpty()
+        .requestMore(3)
+        .assertValuesOnly(1, 2, 3)
+        .requestMore(3)
+        .assertValuesOnly(1, 2, 3, 4, 5, 6)
+        .requestMore(4)
+        .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void empty() {
+        Flowable.empty()
+        .onErrorComplete()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void error() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable.error(new TestException())
+            .onErrorComplete()
+            .test()
+            .assertResult();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void errorMatches() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable.error(new TestException())
+            .onErrorComplete(error -> error instanceof TestException)
+            .test()
+            .assertResult();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void errorNotMatches() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable.error(new IOException())
+            .onErrorComplete(error -> error instanceof TestException)
+            .test()
+            .assertFailure(IOException.class);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void errorPredicateCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestSubscriberEx<Object> ts = Flowable.error(new IOException())
+            .onErrorComplete(error -> { throw new TestException(); })
+            .subscribeWith(new TestSubscriberEx<>())
+            .assertFailure(CompositeException.class);
+
+            TestHelper.assertError(ts, 0, IOException.class);
+            TestHelper.assertError(ts, 1, TestException.class);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void itemsThenError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable.range(1, 5)
+            .map(v -> 4 / (3 - v))
+            .onErrorComplete()
+            .test()
+            .assertResult(2, 4);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void cancel() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp
+                .onErrorComplete()
+                .test();
+
+        assertTrue("No subscribers?!", pp.hasSubscribers());
+
+        ts.cancel();
+
+        assertFalse("Still subscribers?!", pp.hasSubscribers());
+    }
+
+    @Test
+    public void onSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.onErrorComplete());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorCompleteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorCompleteTest.java
new file mode 100644
index 0000000000..4c37745834
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorCompleteTest.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class ObservableOnErrorCompleteTest {
+
+    @Test
+    public void normal() {
+        Observable.range(1, 10)
+        .onErrorComplete()
+        .test()
+        .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void empty() {
+        Observable.empty()
+        .onErrorComplete()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void error() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Observable.error(new TestException())
+            .onErrorComplete()
+            .test()
+            .assertResult();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void errorMatches() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Observable.error(new TestException())
+            .onErrorComplete(error -> error instanceof TestException)
+            .test()
+            .assertResult();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void errorNotMatches() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Observable.error(new IOException())
+            .onErrorComplete(error -> error instanceof TestException)
+            .test()
+            .assertFailure(IOException.class);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void errorPredicateCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestObserverEx<Object> to = Observable.error(new IOException())
+            .onErrorComplete(error -> { throw new TestException(); })
+            .subscribeWith(new TestObserverEx<>())
+            .assertFailure(CompositeException.class);
+
+            TestHelper.assertError(to, 0, IOException.class);
+            TestHelper.assertError(to, 1, TestException.class);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void itemsThenError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Observable.range(1, 5)
+            .map(v -> 4 / (3 - v))
+            .onErrorComplete()
+            .test()
+            .assertResult(2, 4);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void dispose() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps
+                .onErrorComplete()
+                .test();
+
+        assertTrue("No subscribers?!", ps.hasObservers());
+
+        to.dispose();
+
+        assertFalse("Still subscribers?!", ps.hasObservers());
+    }
+
+    @Test
+    public void onSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(f -> f.onErrorComplete());
+    }
+
+    @Test
+    public void isDisposed() {
+        TestHelper.checkDisposed(PublishSubject.create().onErrorComplete());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorCompleteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorCompleteTest.java
new file mode 100644
index 0000000000..189759d6c6
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorCompleteTest.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.*;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class SingleOnErrorCompleteTest {
+
+    @Test
+    public void normal() {
+        Single.just(1)
+        .onErrorComplete()
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void error() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Single.error(new TestException())
+            .onErrorComplete()
+            .test()
+            .assertResult();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void errorMatches() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Single.error(new TestException())
+            .onErrorComplete(error -> error instanceof TestException)
+            .test()
+            .assertResult();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void errorNotMatches() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Single.error(new IOException())
+            .onErrorComplete(error -> error instanceof TestException)
+            .test()
+            .assertFailure(IOException.class);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void errorPredicateCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestObserverEx<Object> to = Single.error(new IOException())
+            .onErrorComplete(error -> { throw new TestException(); })
+            .subscribeWith(new TestObserverEx<>())
+            .assertFailure(CompositeException.class);
+
+            TestHelper.assertError(to, 0, IOException.class);
+            TestHelper.assertError(to, 1, TestException.class);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void dispose() {
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        TestObserver<Integer> to = ss
+                .onErrorComplete()
+                .test();
+
+        assertTrue("No subscribers?!", ss.hasObservers());
+
+        to.dispose();
+
+        assertFalse("Still subscribers?!", ss.hasObservers());
+    }
+
+    @Test
+    public void onSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingleToMaybe(f -> f.onErrorComplete());
+    }
+
+    @Test
+    public void isDisposed() {
+        TestHelper.checkDisposed(SingleSubject.create().onErrorComplete());
+    }
+}

From b157b8684d812fa58e14250f1570925539df096c Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 25 Jan 2020 00:06:05 +0100
Subject: [PATCH 068/665] 3.x: Add Completable.onErrorResumeWith (#6868)

---
 .../reactivex/rxjava3/core/Completable.java   | 27 +++++++++++++++++
 .../java/io/reactivex/rxjava3/core/Maybe.java |  4 +--
 .../CompletableResumeNextTest.java            | 29 +++++++++++++++++--
 3 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 0913ac398d..4a5bd55c39 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2086,6 +2086,33 @@ public final Completable onErrorResumeNext(@NonNull Function<? super Throwable,
         Objects.requireNonNull(fallbackSupplier, "fallbackSupplier is null");
         return RxJavaPlugins.onAssembly(new CompletableResumeNext(this, fallbackSupplier));
     }
+    /**
+     * Resumes the flow with the given {@link CompletableSource} when the current {@code Completable} fails instead of
+     * signaling the error via {@code onError}.
+     * <p>
+     * <img width="640" height="409" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.onErrorResumeWith.png" alt="">
+     * <p>
+     * You can use this to prevent errors from propagating or to supply fallback data should errors be
+     * encountered.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onErrorResumeWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param fallback
+     *            the next {@code CompletableSource} that will take over if the current {@code Completable} encounters
+     *            an error
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code fallback} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Completable onErrorResumeWith(@NonNull CompletableSource fallback) {
+        Objects.requireNonNull(fallback, "fallback is null");
+        return onErrorResumeNext(Functions.justFunction(fallback));
+    }
 
     /**
      * Nulls out references to the upstream producer and downstream {@link CompletableObserver} if
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 1d385ce148..7bdfe05ee5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -4084,7 +4084,7 @@ public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> pred
      * Resumes the flow with the given {@link MaybeSource} when the current {@code Maybe} fails instead of
      * signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
+     * <img width="640" height="298" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.onErrorResumeWith.png" alt="">
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
      * encountered.
@@ -4112,7 +4112,7 @@ public final Maybe<T> onErrorResumeWith(@NonNull MaybeSource<? extends T> fallba
      * Resumes the flow with a {@link MaybeSource} returned for the failure {@link Throwable} of the current {@code Maybe} by a
      * function instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
+     * <img width="640" height="298" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.onErrorResumeNext.png" alt="">
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
      * encountered.
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java
index 5670264378..fb5390cdcc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java
@@ -13,18 +13,19 @@
 
 package io.reactivex.rxjava3.internal.operators.completable;
 
+import static org.mockito.Mockito.*;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableResumeNextTest extends RxJavaTest {
 
     @Test
-    public void resumeWithError() {
+    public void resumeNextError() {
         Completable.error(new TestException())
         .onErrorResumeNext(Functions.justFunction(Completable.error(new TestException("second"))))
         .to(TestHelper.<Object>testConsumer())
@@ -58,4 +59,28 @@ public void disposed() {
                 .onErrorResumeNext(Functions.justFunction(Completable.never()))
         );
     }
+
+    @Test
+    public void resumeWithNoError() throws Throwable {
+        Action action = mock(Action.class);
+
+        Completable.complete()
+        .onErrorResumeWith(Completable.fromAction(action))
+        .test()
+        .assertResult();
+
+        verify(action, never()).run();
+    }
+
+    @Test
+    public void resumeWithError() throws Throwable {
+        Action action = mock(Action.class);
+
+        Completable.error(new TestException())
+        .onErrorResumeWith(Completable.fromAction(action))
+        .test()
+        .assertResult();
+
+        verify(action).run();
+    }
 }

From 320a675ec124cde872124d3bafd685e6a8998d0a Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Sat, 25 Jan 2020 00:08:49 +0100
Subject: [PATCH 069/665] Update Operator-Matrix generator and output

---
 docs/Operator-Matrix.md                       | 535 ++++++++++--------
 .../reactivex/rxjava3/core/Completable.java   |   1 +
 .../util/OperatorMatrixGenerator.java         |  30 +-
 3 files changed, 333 insertions(+), 233 deletions(-)

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index 3c3ef2c765..1259584fea 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -17,7 +17,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='blockingNext'></a>`blockingNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
 <a name='blockingSingle'></a>`blockingSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
 <a name='blockingStream'></a>`blockingStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to get. Use blockingGet().'>([6](#notes-6))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No elements to get. Use blockingAwait().'>([7](#notes-7))</sup>|
-<a name='blockingSubscribe'></a>`blockingSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='blockingSubscribe'></a>`blockingSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='buffer'></a>`buffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a list/collection.'>([9](#notes-9))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a list/collection.'>([10](#notes-10))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a list/collection.'>([11](#notes-11))</sup>|
 <a name='cache'></a>`cache`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='cacheWithInitialCapacity'></a>`cacheWithInitialCapacity`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to store. Use cache().'>([12](#notes-12))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to store. Use cache().'>([12](#notes-12))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to store. Use cache().'>([12](#notes-12))</sup>|
@@ -32,211 +32,211 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='compose'></a>`compose`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='concat'></a>`concat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='concatArray'></a>`concatArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='concatArrayDelayError'></a>`concatArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='concatArrayDelayError'></a>`concatArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='concatArrayEager'></a>`concatArrayEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArray().'>([24](#notes-24))</sup>|
-<a name='concatArrayEagerDelayError'></a>`concatArrayEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArrayDelayError().'>([25](#notes-25))</sup>|
-<a name='concatDelayError'></a>`concatDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='concatArrayEagerDelayError'></a>`concatArrayEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArrayDelayError().'>([25](#notes-25))</sup>|
+<a name='concatDelayError'></a>`concatDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='concatEager'></a>`concatEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use merge().'>([26](#notes-26))</sup>|
-<a name='concatMap'></a>`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapCompletable'></a>`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapCompletableDelayError'></a>`concatMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapDelayError'></a>`concatMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='concatMapEager'></a>`concatMapEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='concatMapEagerDelayError'></a>`concatMapEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='concatMapIterable'></a>`concatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapMaybe'></a>`concatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapMaybeDelayError'></a>`concatMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapSingle'></a>`concatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapSingleDelayError'></a>`concatMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapStream'></a>`concatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMap'></a>`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapCompletable'></a>`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapCompletableDelayError'></a>`concatMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use concatMapCompletable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use concatMapCompletable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapDelayError'></a>`concatMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMap.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMap.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapEager'></a>`concatMapEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='concatMapEagerDelayError'></a>`concatMapEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='concatMapIterable'></a>`concatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapMaybe'></a>`concatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapMaybeDelayError'></a>`concatMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapSingle'></a>`concatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapSingleDelayError'></a>`concatMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapStream'></a>`concatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='concatWith'></a>`concatWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='contains'></a>`contains`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='count'></a>`count`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty thus always 1.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus always 0.'>([31](#notes-31))</sup>|
+<a name='count'></a>`count`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty thus always 1.'>([34](#notes-34))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus always 0.'>([35](#notes-35))</sup>|
 <a name='create'></a>`create`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='debounce'></a>`debounce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='defaultIfEmpty'></a>`defaultIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
+<a name='debounce'></a>`debounce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='defaultIfEmpty'></a>`defaultIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([38](#notes-38))</sup>|
 <a name='defer'></a>`defer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='delay'></a>`delay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='delaySubscription'></a>`delaySubscription`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='dematerialize'></a>`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='distinct'></a>`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='distinctUntilChanged'></a>`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='doAfterNext'></a>`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='doAfterSuccess'></a>`doAfterSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([37](#notes-37))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([37](#notes-37))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='dematerialize'></a>`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='distinct'></a>`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='distinctUntilChanged'></a>`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='doAfterNext'></a>`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='doAfterSuccess'></a>`doAfterSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([41](#notes-41))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([41](#notes-41))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='doAfterTerminate'></a>`doAfterTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='doFinally'></a>`doFinally`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnCancel'></a>`doOnCancel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([38](#notes-38))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([38](#notes-38))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([38](#notes-38))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([38](#notes-38))</sup>|
-<a name='doOnComplete'></a>`doOnComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always succeeds or fails, there is no onComplete signal.'>([39](#notes-39))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnDispose'></a>`doOnDispose`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnCancel().'>([40](#notes-40))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnEach'></a>`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([41](#notes-41))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([41](#notes-41))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='doOnCancel'></a>`doOnCancel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([42](#notes-42))</sup>|
+<a name='doOnComplete'></a>`doOnComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always succeeds or fails, there is no onComplete signal.'>([43](#notes-43))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnDispose'></a>`doOnDispose`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnCancel().'>([44](#notes-44))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnEach'></a>`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='doOnError'></a>`doOnError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnEvent'></a>`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([42](#notes-42))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnLifecycle'></a>`doOnLifecycle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='doOnNext'></a>`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='doOnRequest'></a>`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
+<a name='doOnEvent'></a>`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([46](#notes-46))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([46](#notes-46))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnLifecycle'></a>`doOnLifecycle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='doOnNext'></a>`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([47](#notes-47))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([47](#notes-47))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='doOnRequest'></a>`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
 <a name='doOnSubscribe'></a>`doOnSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnSuccess'></a>`doOnSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([45](#notes-45))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='doOnSuccess'></a>`doOnSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([49](#notes-49))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([49](#notes-49))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='doOnTerminate'></a>`doOnTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='elementAt'></a>`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use defaultIfEmpty.'>([46](#notes-46))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([47](#notes-47))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='elementAtOrError'></a>`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use toSingle.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='empty'></a>`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use complete().'>([49](#notes-49))</sup>|
+<a name='elementAt'></a>`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='elementAtOrError'></a>`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use toSingle.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='empty'></a>`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use complete().'>([53](#notes-53))</sup>|
 <a name='error'></a>`error`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='filter'></a>`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='first'></a>`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
-<a name='firstElement'></a>`firstElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='firstOrError'></a>`firstOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([54](#notes-54))</sup>|
-<a name='firstOrErrorStage'></a>`firstOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([56](#notes-56))</sup>|
-<a name='firstStage'></a>`firstStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|
+<a name='filter'></a>`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='first'></a>`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([38](#notes-38))</sup>|
+<a name='firstElement'></a>`firstElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='firstOrError'></a>`firstOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([58](#notes-58))</sup>|
+<a name='firstOrErrorStage'></a>`firstOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([60](#notes-60))</sup>|
+<a name='firstStage'></a>`firstStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|
 <a name='flatMap'></a>`flatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='flatMapCompletable'></a>`flatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapIterable'></a>`flatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapMaybe'></a>`flatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapObservable'></a>`flatMapObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([58](#notes-58))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapPublisher'></a>`flatMapPublisher`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([59](#notes-59))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapSingle'></a>`flatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapSingleElement'></a>`flatMapSingleElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([60](#notes-60))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapStream'></a>`flatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenAsFlowable'></a>`flattenAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([61](#notes-61))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenAsObservable'></a>`flattenAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([61](#notes-61))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenStreamAsFlowable'></a>`flattenStreamAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([62](#notes-62))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenStreamAsObservable'></a>`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([62](#notes-62))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='forEach'></a>`forEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|
-<a name='forEachWhile'></a>`forEachWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([63](#notes-63))</sup>|
-<a name='fromAction'></a>`fromAction`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromArray'></a>`fromArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([64](#notes-64))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
+<a name='flatMapIterable'></a>`flatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapMaybe'></a>`flatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([61](#notes-61))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapObservable'></a>`flatMapObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([63](#notes-63))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapPublisher'></a>`flatMapPublisher`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([64](#notes-64))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapSingle'></a>`flatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapSingleElement'></a>`flatMapSingleElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([65](#notes-65))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapStream'></a>`flatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenAsFlowable'></a>`flattenAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([66](#notes-66))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([66](#notes-66))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenAsObservable'></a>`flattenAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([66](#notes-66))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([66](#notes-66))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenStreamAsFlowable'></a>`flattenStreamAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenStreamAsObservable'></a>`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='forEach'></a>`forEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|
+<a name='forEachWhile'></a>`forEachWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|
+<a name='fromAction'></a>`fromAction`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromArray'></a>`fromArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
 <a name='fromCallable'></a>`fromCallable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromCompletable'></a>`fromCompletable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always error.'>([67](#notes-67))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([68](#notes-68))</sup>|
+<a name='fromCompletable'></a>`fromCompletable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always error.'>([72](#notes-72))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|
 <a name='fromCompletionStage'></a>`fromCompletionStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='fromFuture'></a>`fromFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromIterable'></a>`fromIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([64](#notes-64))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
-<a name='fromMaybe'></a>`fromMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromObservable'></a>`fromObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromOptional'></a>`fromOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
-<a name='fromPublisher'></a>`fromPublisher`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromRunnable'></a>`fromRunnable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromSingle'></a>`fromSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromStream'></a>`fromStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([64](#notes-64))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
+<a name='fromIterable'></a>`fromIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
+<a name='fromMaybe'></a>`fromMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromObservable'></a>`fromObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromOptional'></a>`fromOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
+<a name='fromPublisher'></a>`fromPublisher`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromRunnable'></a>`fromRunnable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromSingle'></a>`fromSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromStream'></a>`fromStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
 <a name='fromSupplier'></a>`fromSupplier`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='generate'></a>`generate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([69](#notes-69))</sup>|
-<a name='groupBy'></a>`groupBy`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to group.'>([71](#notes-71))</sup>|
-<a name='groupJoin'></a>`groupJoin`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([72](#notes-72))</sup>|
+<a name='generate'></a>`generate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([74](#notes-74))</sup>|
+<a name='groupBy'></a>`groupBy`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to group.'>([76](#notes-76))</sup>|
+<a name='groupJoin'></a>`groupJoin`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([77](#notes-77))</sup>|
 <a name='hide'></a>`hide`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='ignoreElement'></a>`ignoreElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='ignoreElements'></a>`ignoreElements`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='interval'></a>`interval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|
-<a name='intervalRange'></a>`intervalRange`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([75](#notes-75))</sup>|
-<a name='isEmpty'></a>`isEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='join'></a>`join`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([76](#notes-76))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([76](#notes-76))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([72](#notes-72))</sup>|
-<a name='just'></a>`just`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='last'></a>`last`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
-<a name='lastElement'></a>`lastElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='lastOrError'></a>`lastOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([54](#notes-54))</sup>|
-<a name='lastOrErrorStage'></a>`lastOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([56](#notes-56))</sup>|
-<a name='lastStage'></a>`lastStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|
+<a name='ignoreElement'></a>`ignoreElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([78](#notes-78))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='ignoreElements'></a>`ignoreElements`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='interval'></a>`interval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|
+<a name='intervalRange'></a>`intervalRange`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|
+<a name='isEmpty'></a>`isEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='join'></a>`join`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([81](#notes-81))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([81](#notes-81))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([77](#notes-77))</sup>|
+<a name='just'></a>`just`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='last'></a>`last`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([38](#notes-38))</sup>|
+<a name='lastElement'></a>`lastElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='lastOrError'></a>`lastOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([58](#notes-58))</sup>|
+<a name='lastOrErrorStage'></a>`lastOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([60](#notes-60))</sup>|
+<a name='lastStage'></a>`lastStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|
 <a name='lift'></a>`lift`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='map'></a>`map`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='mapOptional'></a>`mapOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='materialize'></a>`materialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='merge'></a>`merge`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='mergeArray'></a>`mergeArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='mergeArrayDelayError'></a>`mergeArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='mergeArray'></a>`mergeArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='mergeArrayDelayError'></a>`mergeArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='mergeDelayError'></a>`mergeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='mergeWith'></a>`mergeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='never'></a>`never`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='observeOn'></a>`observeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='ofType'></a>`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to filter.'>([77](#notes-77))</sup>|
-<a name='onBackpressureBuffer'></a>`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
-<a name='onBackpressureDrop'></a>`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
-<a name='onBackpressureLatest'></a>`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
-<a name='onErrorComplete'></a>`onErrorComplete`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='ofType'></a>`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to filter.'>([82](#notes-82))</sup>|
+<a name='onBackpressureBuffer'></a>`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
+<a name='onBackpressureDrop'></a>`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
+<a name='onBackpressureLatest'></a>`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
+<a name='onErrorComplete'></a>`onErrorComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='onErrorResumeNext'></a>`onErrorResumeNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='onErrorResumeWith'></a>`onErrorResumeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='onErrorReturn'></a>`onErrorReturn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='onErrorReturnItem'></a>`onErrorReturnItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='onErrorResumeWith'></a>`onErrorResumeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='onErrorReturn'></a>`onErrorReturn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='onErrorReturnItem'></a>`onErrorReturnItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='onTerminateDetach'></a>`onTerminateDetach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='parallel'></a>`parallel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([78](#notes-78))</sup>|
-<a name='publish'></a>`publish`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([81](#notes-81))</sup>|
-<a name='range'></a>`range`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
-<a name='rangeLong'></a>`rangeLong`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([66](#notes-66))</sup>|
-<a name='rebatchRequests'></a>`rebatchRequests`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([44](#notes-44))</sup>|
-<a name='reduce'></a>`reduce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
-<a name='reduceWith'></a>`reduceWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
+<a name='parallel'></a>`parallel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([83](#notes-83))</sup>|
+<a name='publish'></a>`publish`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([86](#notes-86))</sup>|
+<a name='range'></a>`range`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
+<a name='rangeLong'></a>`rangeLong`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
+<a name='rebatchRequests'></a>`rebatchRequests`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
+<a name='reduce'></a>`reduce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([89](#notes-89))</sup>|
+<a name='reduceWith'></a>`reduceWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([89](#notes-89))</sup>|
 <a name='repeat'></a>`repeat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='repeatUntil'></a>`repeatUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='repeatWhen'></a>`repeatWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='replay'></a>`replay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([81](#notes-81))</sup>|
+<a name='replay'></a>`replay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([86](#notes-86))</sup>|
 <a name='retry'></a>`retry`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='retryUntil'></a>`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='retryUntil'></a>`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='retryWhen'></a>`retryWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='safeSubscribe'></a>`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='scan'></a>`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
-<a name='scanWith'></a>`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([84](#notes-84))</sup>|
-<a name='sequenceEqual'></a>`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='serialize'></a>`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([85](#notes-85))</sup>|
-<a name='share'></a>`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([81](#notes-81))</sup>|
-<a name='single'></a>`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([34](#notes-34))</sup>|
-<a name='singleElement'></a>`singleElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='singleOrError'></a>`singleOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([54](#notes-54))</sup>|
-<a name='singleOrErrorStage'></a>`singleOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([56](#notes-56))</sup>|
-<a name='singleStage'></a>`singleStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([55](#notes-55))</sup>|
-<a name='skip'></a>`skip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|
-<a name='skipLast'></a>`skipLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|
-<a name='skipUntil'></a>`skipUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([86](#notes-86))</sup>|
-<a name='skipWhile'></a>`skipWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='sorted'></a>`sorted`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([70](#notes-70))</sup>|
-<a name='startWith'></a>`startWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='startWithArray'></a>`startWithArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([88](#notes-88))</sup>|
-<a name='startWithItem'></a>`startWithItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([89](#notes-89))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([89](#notes-89))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([89](#notes-89))</sup>|
-<a name='startWithIterable'></a>`startWithIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([90](#notes-90))</sup>|
+<a name='safeSubscribe'></a>`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='scan'></a>`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([89](#notes-89))</sup>|
+<a name='scanWith'></a>`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([89](#notes-89))</sup>|
+<a name='sequenceEqual'></a>`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='serialize'></a>`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([90](#notes-90))</sup>|
+<a name='share'></a>`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([86](#notes-86))</sup>|
+<a name='single'></a>`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([38](#notes-38))</sup>|
+<a name='singleElement'></a>`singleElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='singleOrError'></a>`singleOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([58](#notes-58))</sup>|
+<a name='singleOrErrorStage'></a>`singleOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([60](#notes-60))</sup>|
+<a name='singleStage'></a>`singleStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|
+<a name='skip'></a>`skip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
+<a name='skipLast'></a>`skipLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
+<a name='skipUntil'></a>`skipUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([91](#notes-91))</sup>|
+<a name='skipWhile'></a>`skipWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='sorted'></a>`sorted`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|
+<a name='startWith'></a>`startWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='startWithArray'></a>`startWithArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([93](#notes-93))</sup>|
+<a name='startWithItem'></a>`startWithItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([94](#notes-94))</sup>|
+<a name='startWithIterable'></a>`startWithIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([95](#notes-95))</sup>|
 <a name='subscribe'></a>`subscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='subscribeOn'></a>`subscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='subscribeWith'></a>`subscribeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='switchIfEmpty'></a>`switchIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use defaultIfEmpty().'>([91](#notes-91))</sup>|
-<a name='switchMap'></a>`switchMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapCompletable'></a>`switchMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapCompletableDelayError'></a>`switchMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapDelayError'></a>`switchMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapMaybe'></a>`switchMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapMaybeDelayError'></a>`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapSingle'></a>`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapSingleDelayError'></a>`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchOnNext'></a>`switchOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='switchOnNextDelayError'></a>`switchOnNextDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
-<a name='take'></a>`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|
-<a name='takeLast'></a>`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([52](#notes-52))</sup>|
+<a name='switchIfEmpty'></a>`switchIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use defaultIfEmpty().'>([96](#notes-96))</sup>|
+<a name='switchMap'></a>`switchMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapCompletable'></a>`switchMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapCompletableDelayError'></a>`switchMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapDelayError'></a>`switchMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapMaybe'></a>`switchMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapMaybeDelayError'></a>`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapSingle'></a>`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapSingleDelayError'></a>`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchOnNext'></a>`switchOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='switchOnNextDelayError'></a>`switchOnNextDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='take'></a>`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
+<a name='takeLast'></a>`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
 <a name='takeUntil'></a>`takeUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='takeWhile'></a>`takeWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='takeWhile'></a>`takeWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
 <a name='test'></a>`test`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='throttleFirst'></a>`throttleFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='throttleLast'></a>`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='throttleLatest'></a>`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='throttleWithTimeout'></a>`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
-<a name='timeInterval'></a>`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='throttleFirst'></a>`throttleFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='throttleLast'></a>`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='throttleLatest'></a>`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='throttleWithTimeout'></a>`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='timeInterval'></a>`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='timeout'></a>`timeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='timer'></a>`timer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([33](#notes-33))</sup>|
+<a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='to'></a>`to`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toCompletionStage'></a>`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([93](#notes-93))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toFuture'></a>`toFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)|
+<a name='toCompletionStage'></a>`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([98](#notes-98))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toFuture'></a>`toFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='toList'></a>`toList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
 <a name='toMap'></a>`toMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
-<a name='toMaybe'></a>`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toMaybe'></a>`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toMultimap'></a>`toMultimap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
-<a name='toObservable'></a>`toObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toSingle'></a>`toSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([96](#notes-96))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([96](#notes-96))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toSingleDefault'></a>`toSingleDefault`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use defaultIfEmpty().'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([94](#notes-94))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toObservable'></a>`toObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toSingle'></a>`toSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([101](#notes-101))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([101](#notes-101))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toSingleDefault'></a>`toSingleDefault`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([102](#notes-102))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([102](#notes-102))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use defaultIfEmpty().'>([103](#notes-103))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toSortedList'></a>`toSortedList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
 <a name='unsafeCreate'></a>`unsafeCreate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='unsubscribeOn'></a>`unsubscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='using'></a>`using`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='window'></a>`window`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([99](#notes-99))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a nested source.'>([101](#notes-101))</sup>|
+<a name='window'></a>`window`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([104](#notes-104))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([105](#notes-105))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a nested source.'>([106](#notes-106))</sup>|
 <a name='withLatestFrom'></a>`withLatestFrom`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use merge().'>([17](#notes-17))</sup>|
-<a name='wrap'></a>`wrap`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromPublisher().'>([102](#notes-102))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([103](#notes-103))</sup>|
-<a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([104](#notes-104))</sup>|
-<a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([105](#notes-105))</sup>|
+<a name='wrap'></a>`wrap`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromPublisher().'>([107](#notes-107))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([108](#notes-108))</sup>|
+<a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([109](#notes-109))</sup>|
+<a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([110](#notes-110))</sup>|
 
 #### Notes
 <a name='notes-1'></a><sup>1</sup> Use [`contains()`](#contains).<br/>
@@ -266,81 +266,154 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='notes-25'></a><sup>25</sup> No items to keep ordered. Use [`mergeArrayDelayError()`](#mergeArrayDelayError).<br/>
 <a name='notes-26'></a><sup>26</sup> No items to keep ordered. Use [`merge()`](#merge).<br/>
 <a name='notes-27'></a><sup>27</sup> Always empty thus no items to map.<br/>
-<a name='notes-28'></a><sup>28</sup> At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).<br/>
-<a name='notes-29'></a><sup>29</sup> At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).<br/>
-<a name='notes-30'></a><sup>30</sup> Never empty thus always 1.<br/>
-<a name='notes-31'></a><sup>31</sup> Always empty thus always 0.<br/>
-<a name='notes-32'></a><sup>32</sup> At most one item signaled so no subsequent items to work with.<br/>
-<a name='notes-33'></a><sup>33</sup> Always empty thus no items to work with.<br/>
-<a name='notes-34'></a><sup>34</sup> Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.<br/>
-<a name='notes-35'></a><sup>35</sup> At most one item, always distinct.<br/>
-<a name='notes-36'></a><sup>36</sup> Different terminology. Use [`doAfterSuccess()`](#doAfterSuccess).<br/>
-<a name='notes-37'></a><sup>37</sup> Different terminology. Use [`doAfterNext()`](#doAfterNext).<br/>
-<a name='notes-38'></a><sup>38</sup> Different terminology. Use [`doOnDispose()`](#doOnDispose).<br/>
-<a name='notes-39'></a><sup>39</sup> Always succeeds or fails, there is no `onComplete` signal.<br/>
-<a name='notes-40'></a><sup>40</sup> Different terminology. Use [`doOnCancel()`](#doOnCancel).<br/>
-<a name='notes-41'></a><sup>41</sup> At most one item. Use [`doOnEvent()`](#doOnEvent).<br/>
-<a name='notes-42'></a><sup>42</sup> Use [`doOnEach()`](#doOnEach).<br/>
-<a name='notes-43'></a><sup>43</sup> Different terminology. Use [`doOnSuccess()`](#doOnSuccess).<br/>
-<a name='notes-44'></a><sup>44</sup> Backpressure related and not supported outside `Flowable`.<br/>
-<a name='notes-45'></a><sup>45</sup> Different terminology. Use [`doOnNext()`](#doOnNext).<br/>
-<a name='notes-46'></a><sup>46</sup> At most one item with index 0. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
-<a name='notes-47'></a><sup>47</sup> Always one item with index 0.<br/>
-<a name='notes-48'></a><sup>48</sup> At most one item with index 0. Use [`toSingle`](#toSingle).<br/>
-<a name='notes-49'></a><sup>49</sup> Use [`complete()`](#complete).<br/>
-<a name='notes-50'></a><sup>50</sup> At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
-<a name='notes-51'></a><sup>51</sup> Always one item.<br/>
-<a name='notes-52'></a><sup>52</sup> At most one item, would be no-op.<br/>
-<a name='notes-53'></a><sup>53</sup> Always one item, would be no-op.<br/>
-<a name='notes-54'></a><sup>54</sup> Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).<br/>
-<a name='notes-55'></a><sup>55</sup> At most one item. Use [`toCompletionStage()`](#toCompletionStage).<br/>
-<a name='notes-56'></a><sup>56</sup> Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).<br/>
-<a name='notes-57'></a><sup>57</sup> Not supported. Use [`flatMap`](#flatMap) and [`toFlowable()`](#toFlowable).<br/>
-<a name='notes-58'></a><sup>58</sup> Use [`flatMap`](#flatMap).<br/>
-<a name='notes-59'></a><sup>59</sup> Not supported. Use [`flatMap`](#flatMap) and [`toObservable()`](#toFlowable).<br/>
-<a name='notes-60'></a><sup>60</sup> Use [`flatMapSingle`](#flatMapSingle).<br/>
-<a name='notes-61'></a><sup>61</sup> Use [`flatMapIterable()`](#flatMapIterable).<br/>
-<a name='notes-62'></a><sup>62</sup> Use [`flatMapStream()`](#flatMapStream).<br/>
-<a name='notes-63'></a><sup>63</sup> Use [`subscribe()`](#subscribe).<br/>
-<a name='notes-64'></a><sup>64</sup> At most one item. Use [`just()`](#just) or [`empty()`](#empty).<br/>
-<a name='notes-65'></a><sup>65</sup> Always one item. Use [`just()`](#just).<br/>
-<a name='notes-66'></a><sup>66</sup> Always empty. Use [`complete()`](#complete).<br/>
-<a name='notes-67'></a><sup>67</sup> Always error.<br/>
-<a name='notes-68'></a><sup>68</sup> Use [`wrap()`](#wrap).<br/>
-<a name='notes-69'></a><sup>69</sup> Use [`fromSupplier()`](#fromSupplier).<br/>
-<a name='notes-70'></a><sup>70</sup> At most one item.<br/>
-<a name='notes-71'></a><sup>71</sup> Always empty thus no items to group.<br/>
-<a name='notes-72'></a><sup>72</sup> Always empty thus no items to join.<br/>
-<a name='notes-73'></a><sup>73</sup> Use [`ignoreElements()`](#ignoreElements).<br/>
-<a name='notes-74'></a><sup>74</sup> Use [`ignoreElement()`](#ignoreElement).<br/>
-<a name='notes-75'></a><sup>75</sup> At most one item. Use [`timer()`](#timer).<br/>
-<a name='notes-76'></a><sup>76</sup> At most one item. Use [`zip()`](#zip)<br/>
-<a name='notes-77'></a><sup>77</sup> Always empty thus no items to filter.<br/>
-<a name='notes-78'></a><sup>78</sup> Needs backpressure thus not supported outside `Flowable`.<br/>
-<a name='notes-79'></a><sup>79</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `MaybeSubject`.<br/>
-<a name='notes-80'></a><sup>80</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `SingleSubject`.<br/>
-<a name='notes-81'></a><sup>81</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `ConnectableSubject`.<br/>
-<a name='notes-82'></a><sup>82</sup> At most one item. Use [`just()`](#just).<br/>
-<a name='notes-83'></a><sup>83</sup> At most one item. Use [`map()`](#map).<br/>
-<a name='notes-84'></a><sup>84</sup> Always empty thus no items to reduce.<br/>
-<a name='notes-85'></a><sup>85</sup> At most one signal type.<br/>
-<a name='notes-86'></a><sup>86</sup> At most one item. Use [`takeUntil()`](#takeUntil).<br/>
-<a name='notes-87'></a><sup>87</sup> At most one item. Use [`filter()`](#filter).<br/>
-<a name='notes-88'></a><sup>88</sup> Use [`startWith()`](#startWith) and [`fromArray()`](#fromArray) of `Flowable` or `Observable`.<br/>
-<a name='notes-89'></a><sup>89</sup> Use [`startWith()`](#startWith) and [`just()`](#just) of another reactive type.<br/>
-<a name='notes-90'></a><sup>90</sup> Use [`startWith()`](#startWith) and [`fromIterable()`](#fromArray) of `Flowable` or `Observable`.<br/>
-<a name='notes-91'></a><sup>91</sup> Always empty. Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
-<a name='notes-92'></a><sup>92</sup> At most one item. Use [`flatMap()`](#flatMap).<br/>
-<a name='notes-93'></a><sup>93</sup> Use [`firstStage`](#firstStage), [`lastStage`](#lastStage) or [`singleStage`](#singleStage).<br/>
-<a name='notes-94'></a><sup>94</sup> Would be no-op.<br/>
-<a name='notes-95'></a><sup>95</sup> Use [`firstElement`](#firstElement), [`lastElement`](#lastElement) or [`singleElement`](#singleElement).<br/>
-<a name='notes-96'></a><sup>96</sup> Use [`firstOrError`](#firstOrError), [`lastOrError`](#lastOrError) or [`singleOrError`](#singleOrError).<br/>
-<a name='notes-97'></a><sup>97</sup> Use [`first`](#first), [`last`](#last) or [`single`](#single).<br/>
-<a name='notes-98'></a><sup>98</sup> Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
-<a name='notes-99'></a><sup>99</sup> Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a nested source.<br/>
-<a name='notes-100'></a><sup>100</sup> Use [`map()`](#map) to transform into a nested source.<br/>
-<a name='notes-101'></a><sup>101</sup> Always empty. Use [`andThen()`](#andThen) to bring in a nested source.<br/>
-<a name='notes-102'></a><sup>102</sup> Use [`fromPublisher()`](#fromPublisher).<br/>
-<a name='notes-103'></a><sup>103</sup> Use [`merge()`](#merge).<br/>
-<a name='notes-104'></a><sup>104</sup> Use [`mergeArray()`](#mergeArray).<br/>
-<a name='notes-105'></a><sup>105</sup> Use [`mergeWith()`](#mergeWith).<br/>
+<a name='notes-28'></a><sup>28</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use [`concatMapCompletable`](#concatMapCompletable).<br/>
+<a name='notes-29'></a><sup>29</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMap`](#concatMap).<br/>
+<a name='notes-30'></a><sup>30</sup> At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).<br/>
+<a name='notes-31'></a><sup>31</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapMaybe`](#concatMapMaybe).<br/>
+<a name='notes-32'></a><sup>32</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapSingle`](#concatMapSingle).<br/>
+<a name='notes-33'></a><sup>33</sup> At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).<br/>
+<a name='notes-34'></a><sup>34</sup> Never empty thus always 1.<br/>
+<a name='notes-35'></a><sup>35</sup> Always empty thus always 0.<br/>
+<a name='notes-36'></a><sup>36</sup> At most one item signaled so no subsequent items to work with.<br/>
+<a name='notes-37'></a><sup>37</sup> Always empty thus no items to work with.<br/>
+<a name='notes-38'></a><sup>38</sup> Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.<br/>
+<a name='notes-39'></a><sup>39</sup> At most one item, always distinct.<br/>
+<a name='notes-40'></a><sup>40</sup> Different terminology. Use [`doAfterSuccess()`](#doAfterSuccess).<br/>
+<a name='notes-41'></a><sup>41</sup> Different terminology. Use [`doAfterNext()`](#doAfterNext).<br/>
+<a name='notes-42'></a><sup>42</sup> Different terminology. Use [`doOnDispose()`](#doOnDispose).<br/>
+<a name='notes-43'></a><sup>43</sup> Always succeeds or fails, there is no `onComplete` signal.<br/>
+<a name='notes-44'></a><sup>44</sup> Different terminology. Use [`doOnCancel()`](#doOnCancel).<br/>
+<a name='notes-45'></a><sup>45</sup> At most one item. Use [`doOnEvent()`](#doOnEvent).<br/>
+<a name='notes-46'></a><sup>46</sup> Use [`doOnEach()`](#doOnEach).<br/>
+<a name='notes-47'></a><sup>47</sup> Different terminology. Use [`doOnSuccess()`](#doOnSuccess).<br/>
+<a name='notes-48'></a><sup>48</sup> Backpressure related and not supported outside `Flowable`.<br/>
+<a name='notes-49'></a><sup>49</sup> Different terminology. Use [`doOnNext()`](#doOnNext).<br/>
+<a name='notes-50'></a><sup>50</sup> At most one item with index 0. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
+<a name='notes-51'></a><sup>51</sup> Always one item with index 0.<br/>
+<a name='notes-52'></a><sup>52</sup> At most one item with index 0. Use [`toSingle`](#toSingle).<br/>
+<a name='notes-53'></a><sup>53</sup> Use [`complete()`](#complete).<br/>
+<a name='notes-54'></a><sup>54</sup> At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
+<a name='notes-55'></a><sup>55</sup> Always one item.<br/>
+<a name='notes-56'></a><sup>56</sup> At most one item, would be no-op.<br/>
+<a name='notes-57'></a><sup>57</sup> Always one item, would be no-op.<br/>
+<a name='notes-58'></a><sup>58</sup> Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).<br/>
+<a name='notes-59'></a><sup>59</sup> At most one item. Use [`toCompletionStage()`](#toCompletionStage).<br/>
+<a name='notes-60'></a><sup>60</sup> Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).<br/>
+<a name='notes-61'></a><sup>61</sup> Use [`flatMap()`](#flatMap).<br/>
+<a name='notes-62'></a><sup>62</sup> Not supported. Use [`flatMap`](#flatMap) and [`toFlowable()`](#toFlowable).<br/>
+<a name='notes-63'></a><sup>63</sup> Use [`flatMap`](#flatMap).<br/>
+<a name='notes-64'></a><sup>64</sup> Not supported. Use [`flatMap`](#flatMap) and [`toObservable()`](#toFlowable).<br/>
+<a name='notes-65'></a><sup>65</sup> Use [`flatMapSingle`](#flatMapSingle).<br/>
+<a name='notes-66'></a><sup>66</sup> Use [`flatMapIterable()`](#flatMapIterable).<br/>
+<a name='notes-67'></a><sup>67</sup> Use [`flatMapStream()`](#flatMapStream).<br/>
+<a name='notes-68'></a><sup>68</sup> Use [`subscribe()`](#subscribe).<br/>
+<a name='notes-69'></a><sup>69</sup> At most one item. Use [`just()`](#just) or [`empty()`](#empty).<br/>
+<a name='notes-70'></a><sup>70</sup> Always one item. Use [`just()`](#just).<br/>
+<a name='notes-71'></a><sup>71</sup> Always empty. Use [`complete()`](#complete).<br/>
+<a name='notes-72'></a><sup>72</sup> Always error.<br/>
+<a name='notes-73'></a><sup>73</sup> Use [`wrap()`](#wrap).<br/>
+<a name='notes-74'></a><sup>74</sup> Use [`fromSupplier()`](#fromSupplier).<br/>
+<a name='notes-75'></a><sup>75</sup> At most one item.<br/>
+<a name='notes-76'></a><sup>76</sup> Always empty thus no items to group.<br/>
+<a name='notes-77'></a><sup>77</sup> Always empty thus no items to join.<br/>
+<a name='notes-78'></a><sup>78</sup> Use [`ignoreElements()`](#ignoreElements).<br/>
+<a name='notes-79'></a><sup>79</sup> Use [`ignoreElement()`](#ignoreElement).<br/>
+<a name='notes-80'></a><sup>80</sup> At most one item. Use [`timer()`](#timer).<br/>
+<a name='notes-81'></a><sup>81</sup> At most one item. Use [`zip()`](#zip)<br/>
+<a name='notes-82'></a><sup>82</sup> Always empty thus no items to filter.<br/>
+<a name='notes-83'></a><sup>83</sup> Needs backpressure thus not supported outside `Flowable`.<br/>
+<a name='notes-84'></a><sup>84</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `MaybeSubject`.<br/>
+<a name='notes-85'></a><sup>85</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `SingleSubject`.<br/>
+<a name='notes-86'></a><sup>86</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `ConnectableSubject`.<br/>
+<a name='notes-87'></a><sup>87</sup> At most one item. Use [`just()`](#just).<br/>
+<a name='notes-88'></a><sup>88</sup> At most one item. Use [`map()`](#map).<br/>
+<a name='notes-89'></a><sup>89</sup> Always empty thus no items to reduce.<br/>
+<a name='notes-90'></a><sup>90</sup> At most one signal type.<br/>
+<a name='notes-91'></a><sup>91</sup> At most one item. Use [`takeUntil()`](#takeUntil).<br/>
+<a name='notes-92'></a><sup>92</sup> At most one item. Use [`filter()`](#filter).<br/>
+<a name='notes-93'></a><sup>93</sup> Use [`startWith()`](#startWith) and [`fromArray()`](#fromArray) of `Flowable` or `Observable`.<br/>
+<a name='notes-94'></a><sup>94</sup> Use [`startWith()`](#startWith) and [`just()`](#just) of another reactive type.<br/>
+<a name='notes-95'></a><sup>95</sup> Use [`startWith()`](#startWith) and [`fromIterable()`](#fromArray) of `Flowable` or `Observable`.<br/>
+<a name='notes-96'></a><sup>96</sup> Always empty. Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
+<a name='notes-97'></a><sup>97</sup> At most one item. Use [`flatMap()`](#flatMap).<br/>
+<a name='notes-98'></a><sup>98</sup> Use [`firstStage`](#firstStage), [`lastStage`](#lastStage) or [`singleStage`](#singleStage).<br/>
+<a name='notes-99'></a><sup>99</sup> Would be no-op.<br/>
+<a name='notes-100'></a><sup>100</sup> Use [`firstElement`](#firstElement), [`lastElement`](#lastElement) or [`singleElement`](#singleElement).<br/>
+<a name='notes-101'></a><sup>101</sup> Use [`firstOrError`](#firstOrError), [`lastOrError`](#lastOrError) or [`singleOrError`](#singleOrError).<br/>
+<a name='notes-102'></a><sup>102</sup> Use [`first`](#first), [`last`](#last) or [`single`](#single).<br/>
+<a name='notes-103'></a><sup>103</sup> Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
+<a name='notes-104'></a><sup>104</sup> Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a nested source.<br/>
+<a name='notes-105'></a><sup>105</sup> Use [`map()`](#map) to transform into a nested source.<br/>
+<a name='notes-106'></a><sup>106</sup> Always empty. Use [`andThen()`](#andThen) to bring in a nested source.<br/>
+<a name='notes-107'></a><sup>107</sup> Use [`fromPublisher()`](#fromPublisher).<br/>
+<a name='notes-108'></a><sup>108</sup> Use [`merge()`](#merge).<br/>
+<a name='notes-109'></a><sup>109</sup> Use [`mergeArray()`](#mergeArray).<br/>
+<a name='notes-110'></a><sup>110</sup> Use [`mergeWith()`](#mergeWith).<br/>
+
+#### Under development
+
+1. Single.concatArrayDelayError()
+2. Completable.concatArrayDelayError()
+3. Maybe.concatArrayEagerDelayError()
+4. Single.concatArrayEagerDelayError()
+5. Single.concatDelayError()
+6. Completable.concatDelayError()
+7. Single.concatMap()
+8. Maybe.concatMapCompletable()
+9. Single.concatMapCompletable()
+10. Maybe.concatMapEager()
+11. Single.concatMapEager()
+12. Completable.concatMapEager()
+13. Maybe.concatMapEagerDelayError()
+14. Single.concatMapEagerDelayError()
+15. Completable.concatMapEagerDelayError()
+16. Maybe.concatMapMaybe()
+17. Single.concatMapMaybe()
+18. Maybe.concatMapSingle()
+19. Single.concatMapSingle()
+20. Maybe.dematerialize()
+21. Maybe.doOnLifecycle()
+22. Single.doOnLifecycle()
+23. Completable.doOnLifecycle()
+24. Flowable.fromAction()
+25. Observable.fromAction()
+26. Single.fromAction()
+27. Flowable.fromCompletable()
+28. Observable.fromCompletable()
+29. Flowable.fromMaybe()
+30. Observable.fromMaybe()
+31. Single.fromMaybe()
+32. Flowable.fromObservable()
+33. Maybe.fromObservable()
+34. Maybe.fromPublisher()
+35. Flowable.fromRunnable()
+36. Observable.fromRunnable()
+37. Single.fromRunnable()
+38. Flowable.fromSingle()
+39. Observable.fromSingle()
+40. Single.mergeArray()
+41. Single.mergeArrayDelayError()
+42. Single.ofType()
+43. Completable.onErrorReturn()
+44. Completable.onErrorReturnItem()
+45. Single.retryUntil()
+46. Completable.retryUntil()
+47. Maybe.safeSubscribe()
+48. Single.safeSubscribe()
+49. Completable.safeSubscribe()
+50. Completable.sequenceEqual()
+51. Maybe.startWith()
+52. Single.startWith()
+53. Maybe.switchOnNext()
+54. Single.switchOnNext()
+55. Completable.switchOnNext()
+56. Maybe.switchOnNextDelayError()
+57. Single.switchOnNextDelayError()
+58. Completable.switchOnNextDelayError()
+59. Maybe.timeInterval()
+60. Single.timeInterval()
+61. Completable.timeInterval()
+62. Maybe.timestamp()
+63. Single.timestamp()
+64. Maybe.toFuture()
+65. Completable.toFuture()
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 4a5bd55c39..f0b1f2bea0 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2105,6 +2105,7 @@ public final Completable onErrorResumeNext(@NonNull Function<? super Throwable,
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code fallback} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
+     * @since 3.0.0
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index 970d6e36bb..d99202adef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -35,6 +35,7 @@ private OperatorMatrixGenerator() {
 
     static final String PRESENT = "![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)";
     static final String ABSENT = "![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png)";
+    static final String TBD = "![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)";
 
     static final Class<?>[] CLASSES = {
             Flowable.class, Observable.class, Maybe.class, Single.class, Completable.class
@@ -81,6 +82,7 @@ public static void main(String[] args) throws IOException {
 
             Map<String, Integer> notesMap = new HashMap<>();
             List<String> notesList = new ArrayList<>();
+            List<String> tbdList = new ArrayList<>();
 
             for (String operatorName : sortedOperators) {
                 out.print("<a name='");
@@ -92,9 +94,9 @@ public static void main(String[] args) throws IOException {
                     if (operatorMap.get(clazz).contains(operatorName)) {
                         out.print(PRESENT);
                     } else {
-                        out.print(ABSENT);
                         String notes = findNotes(clazz.getSimpleName(), operatorName);
                         if (notes != null) {
+                            out.print(ABSENT);
                             Integer index = notesMap.get(notes);
                             if (index == null) {
                                 index = notesMap.size() + 1;
@@ -108,6 +110,9 @@ public static void main(String[] args) throws IOException {
                             out.print("](#notes-");
                             out.print(index);
                             out.print("))</sup>");
+                        } else {
+                            out.print(TBD);
+                            tbdList.add(clazz.getSimpleName() + "." + operatorName + "()");
                         }
                     }
                     out.print("|");
@@ -129,6 +134,17 @@ public static void main(String[] args) throws IOException {
                     out.println("<br/>");
                 }
             }
+            if (!tbdList.isEmpty()) {
+                out.println();
+                out.println("#### Under development");
+                out.println();
+
+                for (int i = 0; i < tbdList.size(); i++) {
+                    out.print(i + 1);
+                    out.print(". ");
+                    out.println(tbdList.get(i));
+                }
+            }
         }
     }
 
@@ -207,11 +223,16 @@ static String findNotes(String clazzName, String operatorName) {
             "    C concatEagerDelayError                No items to keep ordered. Use [`mergeDelayError()`](#mergeDelayError).",
             "    C concatMap                            Always empty thus no items to map.",
             "    C concatMapCompletable                 Always empty thus no items to map.",
+            "  MS  concatMapCompletableDelayError       Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use [`concatMapCompletable`](#concatMapCompletable).",
             "    C concatMapCompletableDelayError       Always empty thus no items to map.",
+            "  MS  concatMapDelayError                  Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMap`](#concatMap).",
+            "    C concatMapDelayError                  Always empty thus no items to map.",
             "    C concatMapIterable                    Always empty thus no items to map.",
             "    C concatMapMaybe                       Always empty thus no items to map.",
+            "  MS  concatMapMaybeDelayError             Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapMaybe`](#concatMapMaybe).",
             "    C concatMapMaybeDelayError             Always empty thus no items to map.",
             "    C concatMapSingle                      Always empty thus no items to map.",
+            "  MS  concatMapSingleDelayError            Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapSingle`](#concatMapSingle).",
             "    C concatMapSingleDelayError            Always empty thus no items to map.",
             "    C concatMapStream                      Always empty thus no items to map.",
             "  MS  concatMapIterable                    At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).",
@@ -247,6 +268,8 @@ static String findNotes(String clazzName, String operatorName) {
             "   S  elementAt                            Always one item with index 0.",
             "    C elementAt                            Always empty thus no items to work with.",
             "  M   elementAtOrError                     At most one item with index 0. Use [`toSingle`](#toSingle).",
+            "   S  elementAtOrError                     Always one item with index 0.",
+            "    C elementAtOrError                     Always empty thus no items to work with.",
             "   S  empty                                Never empty.",
             "    C empty                                Use [`complete()`](#complete).",
             "    C filter                               Always empty thus no items to work with.",
@@ -266,10 +289,11 @@ static String findNotes(String clazzName, String operatorName) {
             "    C flatMapCompletable                   Always empty thus no items to map.",
             "    C flatMapCompletableDelayError         Always empty thus no items to map.",
             "    C flatMapIterable                      Always empty thus no items to map.",
+            "  M   flatMapMaybe                         Use [`flatMap()`](#flatMap).",
             "    C flatMapMaybe                         Always empty thus no items to map.",
             "    C flatMapMaybeDelayError               Always empty thus no items to map.",
+            "   S  flatMapSingle                        Use [`flatMap()`](#flatMap).",
             "    C flatMapSingle                        Always empty thus no items to map.",
-            "    C flatMapSingleDelayError              Always empty thus no items to map.",
             "    C flatMapStream                        Always empty thus no items to map.",
             "  MS  flatMapIterable                      At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).",
             "  MS  flatMapStream                        At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).",
@@ -304,6 +328,7 @@ static String findNotes(String clazzName, String operatorName) {
             " O    fromObservable                       Use [`wrap()`](#wrap).",
             "   S  fromOptional                         Always one item. Use [`just()`](#just).",
             "    C fromOptional                         Always empty. Use [`complete()`](#complete).",
+            "   S  fromSingle                           Use [`wrap()`](#wrap).",
             "  M   fromStream                           At most one item. Use [`just()`](#just) or [`empty()`](#empty).",
             "   S  fromStream                           Always one item. Use [`just()`](#just).",
             "    C fromStream                           Always empty. Use [`complete()`](#complete).",
@@ -322,6 +347,7 @@ static String findNotes(String clazzName, String operatorName) {
             "    C isEmpty                              Always empty.",
             "  MS  join                                 At most one item. Use [`zip()`](#zip)",
             "    C join                                 Always empty thus no items to join.",
+            "    C just                                 Always empty.",
             "  M   last                                 At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).",
             "   S  last                                 Always one item.",
             "    C last                                 Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.",

From 0ed3572c8961dfdfa7dc73dd0419b5f789d1d1ad Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 25 Jan 2020 10:56:11 +0100
Subject: [PATCH 070/665] 3.x: Add S/C retryUntil + marbles (#6869)

---
 .../reactivex/rxjava3/core/Completable.java   | 20 +++++++
 .../java/io/reactivex/rxjava3/core/Maybe.java |  2 +
 .../io/reactivex/rxjava3/core/Single.java     | 20 +++++++
 .../completable/CompletableRetryTest.java     | 39 +++++++++++++
 .../rxjava3/maybe/MaybeRetryTest.java         | 55 +++++++++++++++++++
 .../rxjava3/single/SingleRetryTest.java       | 39 +++++++++++++
 6 files changed, 175 insertions(+)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index f0b1f2bea0..81028f726e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2317,6 +2317,26 @@ public final Completable retry(@NonNull Predicate<? super Throwable> predicate)
         return fromPublisher(toFlowable().retry(predicate));
     }
 
+    /**
+     * Retries until the given stop function returns {@code true}.
+     * <p>
+     * <img width="640" height="354" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.retryUntil.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code retryUntil} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param stop the function that should return {@code true} to stop retrying
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code stop} is {@code null}
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Completable retryUntil(@NonNull BooleanSupplier stop) {
+        Objects.requireNonNull(stop, "stop is null");
+        return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop));
+    }
+
     /**
      * Returns a {@code Completable} which given a {@link Publisher} and when this {@code Completable} emits an error, delivers
      * that error through a {@link Flowable} and the {@code Publisher} should signal a value indicating a retry in response
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 7bdfe05ee5..98065a40d5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -4433,6 +4433,8 @@ public final Maybe<T> retry(@NonNull Predicate<? super Throwable> predicate) {
 
     /**
      * Retries until the given stop function returns {@code true}.
+     * <p>
+     * <img width="640" height="285" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.retryUntil.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retryUntil} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index f6e41cee5c..e17ff9e8ec 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -3747,6 +3747,26 @@ public final Single<T> retry(@NonNull Predicate<? super Throwable> predicate) {
         return toSingle(toFlowable().retry(predicate));
     }
 
+    /**
+     * Retries until the given stop function returns {@code true}.
+     * <p>
+     * <img width="640" height="364" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.retryUntil.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code retryUntil} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param stop the function that should return {@code true} to stop retrying
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code stop} is {@code null}
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Single<T> retryUntil(@NonNull BooleanSupplier stop) {
+        Objects.requireNonNull(stop, "stop is null");
+        return retry(Long.MAX_VALUE, Functions.predicateReverseFor(stop));
+    }
+
     /**
      * Re-subscribes to the current {@code Single} if and when the {@link Publisher} returned by the handler
      * function signals a value.
diff --git a/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java
index 909ce35669..c805f68c6f 100644
--- a/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java
@@ -20,6 +20,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 
@@ -113,4 +114,42 @@ public void retryTimesPredicateWithZeroRetries() {
 
         assertEquals(1, numberOfSubscribeCalls.get());
     }
+
+    @Test
+    public void untilTrueEmpty() {
+        Completable.complete()
+        .retryUntil(() -> true)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void untilFalseEmpty() {
+        Completable.complete()
+        .retryUntil(() -> false)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void untilTrueError() {
+        Completable.error(new TestException())
+        .retryUntil(() -> true)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void untilFalseError() {
+        AtomicInteger counter = new AtomicInteger();
+        Completable.defer(() -> {
+            if (counter.getAndIncrement() == 0) {
+                return Completable.error(new TestException());
+            }
+            return Completable.complete();
+        })
+        .retryUntil(() -> false)
+        .test()
+        .assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java
index f260a78a82..6c88f8501c 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java
@@ -21,6 +21,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Predicate;
 import io.reactivex.rxjava3.internal.functions.Functions;
 
@@ -120,4 +121,58 @@ public void retryTimesPredicateWithZeroRetries() {
 
         assertEquals(1, numberOfSubscribeCalls.get());
     }
+
+    @Test
+    public void untilTrueJust() {
+        Maybe.just(1)
+        .retryUntil(() -> true)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void untilFalseJust() {
+        Maybe.just(1)
+        .retryUntil(() -> false)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void untilTrueEmpty() {
+        Maybe.empty()
+        .retryUntil(() -> true)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void untilFalseEmpty() {
+        Maybe.empty()
+        .retryUntil(() -> false)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void untilTrueError() {
+        Maybe.error(new TestException())
+        .retryUntil(() -> true)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void untilFalseError() {
+        AtomicInteger counter = new AtomicInteger();
+        Maybe.defer(() -> {
+            if (counter.getAndIncrement() == 0) {
+                return Maybe.error(new TestException());
+            }
+            return Maybe.just(1);
+        })
+        .retryUntil(() -> false)
+        .test()
+        .assertResult(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java
index 1d5a1bff33..2fe5fa9f49 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java
@@ -21,6 +21,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Predicate;
 import io.reactivex.rxjava3.internal.functions.Functions;
 
@@ -120,4 +121,42 @@ public void retryTimesPredicateWithZeroRetries() {
 
         assertEquals(1, numberOfSubscribeCalls.get());
     }
+
+    @Test
+    public void untilTrueJust() {
+        Single.just(1)
+        .retryUntil(() -> true)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void untilFalseJust() {
+        Single.just(1)
+        .retryUntil(() -> false)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void untilTrueError() {
+        Single.error(new TestException())
+        .retryUntil(() -> true)
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void untilFalseError() {
+        AtomicInteger counter = new AtomicInteger();
+        Single.defer(() -> {
+            if (counter.getAndIncrement() == 0) {
+                return Single.error(new TestException());
+            }
+            return Single.just(1);
+        })
+        .retryUntil(() -> false)
+        .test()
+        .assertResult(1);
+    }
 }

From 2fafcb03dd3e420b184608b13a40a5a3482f3cd7 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 25 Jan 2020 13:36:49 +0100
Subject: [PATCH 071/665] 3.x: Add Maybe/Single/Completable switchOnNext &
 switchOnNextDelayError (#6870)

* 3.x: Add M/S/C switchOnNext[DelayError]

* Fix wording of the Completable variant
---
 .../reactivex/rxjava3/core/Completable.java   |  66 +++++++++
 .../java/io/reactivex/rxjava3/core/Maybe.java |  71 ++++++++++
 .../io/reactivex/rxjava3/core/Single.java     |  72 +++++++++-
 ...FlowableSwitchMapCompletablePublisher.java |  46 ++++++
 .../FlowableSwitchMapMaybePublisher.java      |  48 +++++++
 .../FlowableSwitchMapSinglePublisher.java     |  48 +++++++
 .../CompletableSwitchOnNextTest.java          | 132 ++++++++++++++++++
 .../maybe/MaybeSwitchOnNextTest.java          | 123 ++++++++++++++++
 .../single/SingleSwitchOnNextTest.java        | 123 ++++++++++++++++
 9 files changed, 728 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletablePublisher.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybePublisher.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSinglePublisher.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSwitchOnNextTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchOnNextTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSwitchOnNextTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 81028f726e..779d04d1d2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -1016,6 +1016,71 @@ private static NullPointerException toNpe(Throwable ex) {
         return npe;
     }
 
+    /**
+     * Switches between {@link CompletableSource}s emitted by the source {@link Publisher} whenever
+     * a new {@code CompletableSource} is emitted, disposing the previously running {@code CompletableSource},
+     * exposing the setup as a {@code Completable} sequence.
+     * <p>
+     * <img width="640" height="518" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.switchOnNext.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The {@code sources} {@code Publisher} is consumed in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code switchOnNext} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>The returned sequence fails with the first error signaled by the {@code sources} {@code Publisher}
+     *  or the currently running {@code CompletableSource}, disposing the rest. Late errors are
+     *  forwarded to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.</dd>
+     * </dl>
+     * @param sources the {@code Publisher} sequence of inner {@code CompletableSource}s to switch between
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     * @see #switchOnNextDelayError(Publisher)
+     * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    public static Completable switchOnNext(@NonNull Publisher<@NonNull ? extends CompletableSource> sources) {
+        Objects.requireNonNull(sources, "sources is null");
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletablePublisher<>(sources, Functions.identity(), false));
+    }
+
+    /**
+     * Switches between {@link CompletableSource}s emitted by the source {@link Publisher} whenever
+     * a new {@code CompletableSource} is emitted, disposing the previously running {@code CompletableSource},
+     * exposing the setup as a {@code Completable} sequence and delaying all errors from
+     * all of them until all terminate.
+     * <p>
+     * <img width="640" height="415" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.switchOnNextDelayError.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The {@code sources} {@code Publisher} is consumed in an unbounded manner (requesting {@link Long#MAX_VALUE}).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code switchOnNextDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>The returned {@code Completable} collects all errors emitted by either the {@code sources}
+     *  {@code Publisher} or any inner {@code CompletableSource} and emits them as a {@link CompositeException}
+     *  when all sources terminate. If only one source ever failed, its error is emitted as-is at the end.</dd>
+     * </dl>
+     * @param sources the {@code Publisher} sequence of inner {@code CompletableSource}s to switch between
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     * @see #switchOnNext(Publisher)
+     * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    public static Completable switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends CompletableSource> sources) {
+        Objects.requireNonNull(sources, "sources is null");
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapCompletablePublisher<>(sources, Functions.identity(), true));
+    }
+
     /**
      * Returns a {@code Completable} instance which manages a resource along
      * with a custom {@link CompletableSource} instance while the subscription is active.
@@ -2328,6 +2393,7 @@ public final Completable retry(@NonNull Predicate<? super Throwable> predicate)
      * @param stop the function that should return {@code true} to stop retrying
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code stop} is {@code null}
+     * @since 3.0.0
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 98065a40d5..048b5ec713 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -1728,6 +1728,75 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
         return RxJavaPlugins.onAssembly(new MaybeEqualSingle<>(source1, source2, isEqual));
     }
 
+    /**
+     * Switches between {@link MaybeSource}s emitted by the source {@link Publisher} whenever
+     * a new {@code MaybeSource} is emitted, disposing the previously running {@code MaybeSource},
+     * exposing the success items as a {@link Flowable} sequence.
+     * <p>
+     * <img width="640" height="521" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.switchOnNext.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The {@code sources} {@code Publisher} is consumed in an unbounded manner (requesting {@link Long#MAX_VALUE}).
+     *  The returned {@code Flowable} respects the backpressure from the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code switchOnNext} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>The returned sequence fails with the first error signaled by the {@code sources} {@code Publisher}
+     *  or the currently running {@code MaybeSource}, disposing the rest. Late errors are
+     *  forwarded to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.</dd>
+     * </dl>
+     * @param <T> the element type of the {@code MaybeSource}s
+     * @param sources the {@code Publisher} sequence of inner {@code MaybeSource}s to switch between
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     * @see #switchOnNextDelayError(Publisher)
+     * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
+     */
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+        Objects.requireNonNull(sources, "sources is null");
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybePublisher<>(sources, Functions.identity(), false));
+    }
+
+    /**
+     * Switches between {@link MaybeSource}s emitted by the source {@link Publisher} whenever
+     * a new {@code MaybeSource} is emitted, disposing the previously running {@code MaybeSource},
+     * exposing the success items as a {@link Flowable} sequence and delaying all errors from
+     * all of them until all terminate.
+     * <p>
+     * <img width="640" height="423" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.switchOnNextDelayError.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The {@code sources} {@code Publisher} is consumed in an unbounded manner (requesting {@link Long#MAX_VALUE}).
+     *  The returned {@code Flowable} respects the backpressure from the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code switchOnNextDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>The returned {@code Flowable} collects all errors emitted by either the {@code sources}
+     *  {@code Publisher} or any inner {@code MaybeSource} and emits them as a {@link CompositeException}
+     *  when all sources terminate. If only one source ever failed, its error is emitted as-is at the end.</dd>
+     * </dl>
+     * @param <T> the element type of the {@code MaybeSource}s
+     * @param sources the {@code Publisher} sequence of inner {@code MaybeSource}s to switch between
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     * @see #switchOnNext(Publisher)
+     * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+        Objects.requireNonNull(sources, "sources is null");
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybePublisher<>(sources, Functions.identity(), true));
+    }
+
     /**
      * Returns a {@code Maybe} that emits {@code 0L} after a specified delay.
      * <p>
@@ -2868,6 +2937,7 @@ public final Maybe<T> delay(long time, @NonNull TimeUnit unit) {
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
      * @see #delay(long, TimeUnit, Scheduler, boolean)
+     * @since 3.0.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
@@ -2922,6 +2992,7 @@ public final Maybe<T> delay(long time, @NonNull TimeUnit unit, @NonNull Schedule
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/delay.html">ReactiveX operators documentation: Delay</a>
+     * @since 3.0.0
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index e17ff9e8ec..719719520f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -30,7 +30,7 @@
 import io.reactivex.rxjava3.internal.operators.completable.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.*;
-import io.reactivex.rxjava3.internal.operators.mixed.SingleFlatMapObservable;
+import io.reactivex.rxjava3.internal.operators.mixed.*;
 import io.reactivex.rxjava3.internal.operators.observable.*;
 import io.reactivex.rxjava3.internal.operators.single.*;
 import io.reactivex.rxjava3.internal.util.ErrorMode;
@@ -1406,6 +1406,75 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull SingleSource<? extends
         return RxJavaPlugins.onAssembly(new SingleEquals<>(source1, source2));
     }
 
+    /**
+     * Switches between {@link SingleSource}s emitted by the source {@link Publisher} whenever
+     * a new {@code SingleSource} is emitted, disposing the previously running {@code SingleSource},
+     * exposing the success items as a {@link Flowable} sequence.
+     * <p>
+     * <img width="640" height="521" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.switchOnNext.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The {@code sources} {@code Publisher} is consumed in an unbounded manner (requesting {@link Long#MAX_VALUE}).
+     *  The returned {@code Flowable} respects the backpressure from the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code switchOnNext} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>The returned sequence fails with the first error signaled by the {@code sources} {@code Publisher}
+     *  or the currently running {@code SingleSource}, disposing the rest. Late errors are
+     *  forwarded to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.</dd>
+     * </dl>
+     * @param <T> the element type of the {@code SingleSource}s
+     * @param sources the {@code Publisher} sequence of inner {@code SingleSource}s to switch between
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     * @see #switchOnNextDelayError(Publisher)
+     * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+        Objects.requireNonNull(sources, "sources is null");
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapSinglePublisher<>(sources, Functions.identity(), false));
+    }
+
+    /**
+     * Switches between {@link SingleSource}s emitted by the source {@link Publisher} whenever
+     * a new {@code SingleSource} is emitted, disposing the previously running {@code SingleSource},
+     * exposing the success items as a {@link Flowable} sequence and delaying all errors from
+     * all of them until all terminate.
+     * <p>
+     * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.switchOnNextDelayError.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The {@code sources} {@code Publisher} is consumed in an unbounded manner (requesting {@link Long#MAX_VALUE}).
+     *  The returned {@code Flowable} respects the backpressure from the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code switchOnNextDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>The returned {@code Flowable} collects all errors emitted by either the {@code sources}
+     *  {@code Publisher} or any inner {@code SingleSource} and emits them as a {@link CompositeException}
+     *  when all sources terminate. If only one source ever failed, its error is emitted as-is at the end.</dd>
+     * </dl>
+     * @param <T> the element type of the {@code SingleSource}s
+     * @param sources the {@code Publisher} sequence of inner {@code SingleSource}s to switch between
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     * @see #switchOnNext(Publisher)
+     * @see <a href="http://reactivex.io/documentation/operators/switch.html">ReactiveX operators documentation: Switch</a>
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+        Objects.requireNonNull(sources, "sources is null");
+        return RxJavaPlugins.onAssembly(new FlowableSwitchMapSinglePublisher<>(sources, Functions.identity(), true));
+    }
+
     /**
      * <strong>Advanced use only:</strong> creates a {@code Single} instance without
      * any safeguards by using a callback that is called with a {@link SingleObserver}.
@@ -3758,6 +3827,7 @@ public final Single<T> retry(@NonNull Predicate<? super Throwable> predicate) {
      * @param stop the function that should return {@code true} to stop retrying
      * @return the new {@code Single} instance
      * @throws NullPointerException if {@code stop} is {@code null}
+     * @since 3.0.0
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletablePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletablePublisher.java
new file mode 100644
index 0000000000..5752027c23
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletablePublisher.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.mixed;
+
+import org.reactivestreams.Publisher;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+
+/**
+ * Switch between subsequent {@link CompletableSource}s emitted by a {@link Publisher}.
+ * Reuses {@link FlowableSwitchMapCompletable} internals.
+ * @param <T> the upstream value type
+ * @since 3.0.0
+ */
+public final class FlowableSwitchMapCompletablePublisher<T> extends Completable {
+
+    final Publisher<T> source;
+
+    final Function<? super T, ? extends CompletableSource> mapper;
+
+    final boolean delayErrors;
+
+    public FlowableSwitchMapCompletablePublisher(Publisher<T> source,
+            Function<? super T, ? extends CompletableSource> mapper, boolean delayErrors) {
+        this.source = source;
+        this.mapper = mapper;
+        this.delayErrors = delayErrors;
+    }
+
+    @Override
+    protected void subscribeActual(CompletableObserver observer) {
+        source.subscribe(new FlowableSwitchMapCompletable.SwitchMapCompletableObserver<>(observer, mapper, delayErrors));
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybePublisher.java
new file mode 100644
index 0000000000..41696133e9
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybePublisher.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.mixed;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+
+/**
+ * Switch between subsequent {@link MaybeSource}s emitted by a {@link Publisher}.
+ * Reuses {@link FlowableSwitchMapMaybe} internals.
+ * @param <T> the upstream value type
+ * @param <R> the downstream value type
+ * @since 3.0.0
+ */
+public final class FlowableSwitchMapMaybePublisher<T, R> extends Flowable<R> {
+
+    final Publisher<T> source;
+
+    final Function<? super T, ? extends MaybeSource<? extends R>> mapper;
+
+    final boolean delayErrors;
+
+    public FlowableSwitchMapMaybePublisher(Publisher<T> source,
+            Function<? super T, ? extends MaybeSource<? extends R>> mapper,
+            boolean delayErrors) {
+        this.source = source;
+        this.mapper = mapper;
+        this.delayErrors = delayErrors;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super R> s) {
+        source.subscribe(new FlowableSwitchMapMaybe.SwitchMapMaybeSubscriber<>(s, mapper, delayErrors));
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSinglePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSinglePublisher.java
new file mode 100644
index 0000000000..e64f839046
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSinglePublisher.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.mixed;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+
+/**
+ * Switch between subsequent {@link SingleSource}s emitted by a {@link Publisher}.
+ * Reuses {@link FlowableSwitchMapSingle} internals.
+ * @param <T> the upstream value type
+ * @param <R> the downstream value type
+ * @since 3.0.0
+ */
+public final class FlowableSwitchMapSinglePublisher<T, R> extends Flowable<R> {
+
+    final Publisher<T> source;
+
+    final Function<? super T, ? extends SingleSource<? extends R>> mapper;
+
+    final boolean delayErrors;
+
+    public FlowableSwitchMapSinglePublisher(Publisher<T> source,
+            Function<? super T, ? extends SingleSource<? extends R>> mapper,
+            boolean delayErrors) {
+        this.source = source;
+        this.mapper = mapper;
+        this.delayErrors = delayErrors;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super R> s) {
+        source.subscribe(new FlowableSwitchMapSingle.SwitchMapSingleSubscriber<>(s, mapper, delayErrors));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSwitchOnNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSwitchOnNextTest.java
new file mode 100644
index 0000000000..ad6147fef5
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSwitchOnNextTest.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+
+public class CompletableSwitchOnNextTest extends RxJavaTest {
+
+    @Test
+    public void normal() {
+        Runnable run = mock(Runnable.class);
+
+        Completable.switchOnNext(
+                Flowable.range(1, 10)
+                .map(v -> {
+                    if (v % 2 == 0) {
+                        return Completable.fromRunnable(run);
+                    }
+                    return Completable.complete();
+                })
+        )
+        .test()
+        .assertResult();
+
+        verify(run, times(5)).run();
+    }
+
+    @Test
+    public void normalDelayError() {
+        Runnable run = mock(Runnable.class);
+
+        Completable.switchOnNextDelayError(
+                Flowable.range(1, 10)
+                .map(v -> {
+                    if (v % 2 == 0) {
+                        return Completable.fromRunnable(run);
+                    }
+                    return Completable.complete();
+                })
+        )
+        .test()
+        .assertResult();
+
+        verify(run, times(5)).run();
+    }
+
+    @Test
+    public void noDelaySwitch() {
+        PublishProcessor<Completable> pp = PublishProcessor.create();
+
+        TestObserver<Void> to = Completable.switchOnNext(pp).test();
+
+        assertTrue(pp.hasSubscribers());
+
+        to.assertEmpty();
+
+        CompletableSubject cs1 = CompletableSubject.create();
+        CompletableSubject cs2 = CompletableSubject.create();
+
+        pp.onNext(cs1);
+
+        assertTrue(cs1.hasObservers());
+
+        pp.onNext(cs2);
+
+        assertFalse(cs1.hasObservers());
+        assertTrue(cs2.hasObservers());
+
+        pp.onComplete();
+
+        assertTrue(cs2.hasObservers());
+
+        cs2.onComplete();
+
+        to.assertResult();
+    }
+
+    @Test
+    public void delaySwitch() {
+        PublishProcessor<Completable> pp = PublishProcessor.create();
+
+        TestObserver<Void> to = Completable.switchOnNextDelayError(pp).test();
+
+        assertTrue(pp.hasSubscribers());
+
+        to.assertEmpty();
+
+        CompletableSubject cs1 = CompletableSubject.create();
+        CompletableSubject cs2 = CompletableSubject.create();
+
+        pp.onNext(cs1);
+
+        assertTrue(cs1.hasObservers());
+
+        pp.onNext(cs2);
+
+        assertFalse(cs1.hasObservers());
+        assertTrue(cs2.hasObservers());
+
+        assertTrue(cs2.hasObservers());
+
+        cs2.onError(new TestException());
+
+        assertTrue(pp.hasSubscribers());
+
+        to.assertEmpty();
+
+        pp.onComplete();
+
+        to.assertFailure(TestException.class);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchOnNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchOnNextTest.java
new file mode 100644
index 0000000000..6b217aa680
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchOnNextTest.java
@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+
+public class MaybeSwitchOnNextTest extends RxJavaTest {
+
+    @Test
+    public void normal() {
+        Maybe.switchOnNext(
+                Flowable.range(1, 10)
+                .map(v -> {
+                    if (v % 2 == 0) {
+                        return Maybe.just(v);
+                    }
+                    return Maybe.empty();
+                })
+        )
+        .test()
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void normalDelayError() {
+        Maybe.switchOnNextDelayError(
+                Flowable.range(1, 10)
+                .map(v -> {
+                    if (v % 2 == 0) {
+                        return Maybe.just(v);
+                    }
+                    return Maybe.empty();
+                })
+        )
+        .test()
+        .assertResult(2, 4, 6, 8, 10);
+    }
+
+    @Test
+    public void noDelaySwitch() {
+        PublishProcessor<Maybe<Integer>> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = Maybe.switchOnNext(pp).test();
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.assertEmpty();
+
+        MaybeSubject<Integer> ms1 = MaybeSubject.create();
+        MaybeSubject<Integer> ms2 = MaybeSubject.create();
+
+        pp.onNext(ms1);
+
+        assertTrue(ms1.hasObservers());
+
+        pp.onNext(ms2);
+
+        assertFalse(ms1.hasObservers());
+        assertTrue(ms2.hasObservers());
+
+        pp.onComplete();
+
+        assertTrue(ms2.hasObservers());
+
+        ms2.onSuccess(1);
+
+        ts.assertResult(1);
+    }
+
+    @Test
+    public void delaySwitch() {
+        PublishProcessor<Maybe<Integer>> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = Maybe.switchOnNextDelayError(pp).test();
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.assertEmpty();
+
+        MaybeSubject<Integer> ms1 = MaybeSubject.create();
+        MaybeSubject<Integer> ms2 = MaybeSubject.create();
+
+        pp.onNext(ms1);
+
+        assertTrue(ms1.hasObservers());
+
+        pp.onNext(ms2);
+
+        assertFalse(ms1.hasObservers());
+        assertTrue(ms2.hasObservers());
+
+        assertTrue(ms2.hasObservers());
+
+        ms2.onError(new TestException());
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.assertEmpty();
+
+        pp.onComplete();
+
+        ts.assertFailure(TestException.class);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSwitchOnNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSwitchOnNextTest.java
new file mode 100644
index 0000000000..63c97f14ec
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSwitchOnNextTest.java
@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+
+public class SingleSwitchOnNextTest extends RxJavaTest {
+
+    @Test
+    public void normal() {
+        Single.switchOnNext(
+                Flowable.range(1, 5)
+                .map(v -> {
+                    if (v % 2 == 0) {
+                        return Single.just(v);
+                    }
+                    return Single.just(10 + v);
+                })
+        )
+        .test()
+        .assertResult(11, 2, 13, 4, 15);
+    }
+
+    @Test
+    public void normalDelayError() {
+        Single.switchOnNextDelayError(
+                Flowable.range(1, 5)
+                .map(v -> {
+                    if (v % 2 == 0) {
+                        return Single.just(v);
+                    }
+                    return Single.just(10 + v);
+                })
+        )
+        .test()
+        .assertResult(11, 2, 13, 4, 15);
+    }
+
+    @Test
+    public void noDelaySwitch() {
+        PublishProcessor<Single<Integer>> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = Single.switchOnNext(pp).test();
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.assertEmpty();
+
+        SingleSubject<Integer> ss1 = SingleSubject.create();
+        SingleSubject<Integer> ss2 = SingleSubject.create();
+
+        pp.onNext(ss1);
+
+        assertTrue(ss1.hasObservers());
+
+        pp.onNext(ss2);
+
+        assertFalse(ss1.hasObservers());
+        assertTrue(ss2.hasObservers());
+
+        pp.onComplete();
+
+        assertTrue(ss2.hasObservers());
+
+        ss2.onSuccess(1);
+
+        ts.assertResult(1);
+    }
+
+    @Test
+    public void delaySwitch() {
+        PublishProcessor<Single<Integer>> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = Single.switchOnNextDelayError(pp).test();
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.assertEmpty();
+
+        SingleSubject<Integer> ss1 = SingleSubject.create();
+        SingleSubject<Integer> ss2 = SingleSubject.create();
+
+        pp.onNext(ss1);
+
+        assertTrue(ss1.hasObservers());
+
+        pp.onNext(ss2);
+
+        assertFalse(ss1.hasObservers());
+        assertTrue(ss2.hasObservers());
+
+        assertTrue(ss2.hasObservers());
+
+        ss2.onError(new TestException());
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.assertEmpty();
+
+        pp.onComplete();
+
+        ts.assertFailure(TestException.class);
+    }
+}

From 611bb3f04dd99bfb141500f304d7a0c44fbfd5db Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Sat, 25 Jan 2020 13:41:04 +0100
Subject: [PATCH 072/665] Fix minor JavaDocs syntax errors

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java | 2 +-
 src/main/java/io/reactivex/rxjava3/core/Maybe.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index a627eb3474..d1b17e8b84 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -11960,7 +11960,7 @@ public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
      *
      * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
-     * #see {@link #onBackpressureBuffer(boolean)}
+     * @see #onBackpressureBuffer(boolean)
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 048b5ec713..8699d60e16 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -2659,7 +2659,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onSuccess, @Non
      * </dl>
      * @param onSuccess the {@link Consumer} to call if the current {@code Maybe} succeeds
      * @param onError the {@code Consumer} to call if the current {@code Maybe} signals an error
-     * @param onComplete the {@linnk Action} to call if the current {@code Maybe} completes without a value
+     * @param onComplete the {@link Action} to call if the current {@code Maybe} completes without a value
      * @throws NullPointerException if {@code onSuccess}, {@code onError} or {@code onComplete} is {@code null}
      * @since 3.0.0
      */

From 53ba4352c447562ccbba507f4d4f5493a07ab889 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Sat, 25 Jan 2020 13:44:29 +0100
Subject: [PATCH 073/665] Refresh operator-matrix

---
 docs/Operator-Matrix.md | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index 1259584fea..3eaaa51221 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -166,7 +166,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='repeatWhen'></a>`repeatWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='replay'></a>`replay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([86](#notes-86))</sup>|
 <a name='retry'></a>`retry`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='retryUntil'></a>`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='retryUntil'></a>`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='retryWhen'></a>`retryWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='safeSubscribe'></a>`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
@@ -201,8 +201,8 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='switchMapMaybeDelayError'></a>`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='switchMapSingle'></a>`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='switchMapSingleDelayError'></a>`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchOnNext'></a>`switchOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
-<a name='switchOnNextDelayError'></a>`switchOnNextDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='switchOnNext'></a>`switchOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='switchOnNextDelayError'></a>`switchOnNextDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='take'></a>`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
 <a name='takeLast'></a>`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
 <a name='takeUntil'></a>`takeUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -396,24 +396,16 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 42. Single.ofType()
 43. Completable.onErrorReturn()
 44. Completable.onErrorReturnItem()
-45. Single.retryUntil()
-46. Completable.retryUntil()
-47. Maybe.safeSubscribe()
-48. Single.safeSubscribe()
-49. Completable.safeSubscribe()
-50. Completable.sequenceEqual()
-51. Maybe.startWith()
-52. Single.startWith()
-53. Maybe.switchOnNext()
-54. Single.switchOnNext()
-55. Completable.switchOnNext()
-56. Maybe.switchOnNextDelayError()
-57. Single.switchOnNextDelayError()
-58. Completable.switchOnNextDelayError()
-59. Maybe.timeInterval()
-60. Single.timeInterval()
-61. Completable.timeInterval()
-62. Maybe.timestamp()
-63. Single.timestamp()
-64. Maybe.toFuture()
-65. Completable.toFuture()
+45. Maybe.safeSubscribe()
+46. Single.safeSubscribe()
+47. Completable.safeSubscribe()
+48. Completable.sequenceEqual()
+49. Maybe.startWith()
+50. Single.startWith()
+51. Maybe.timeInterval()
+52. Single.timeInterval()
+53. Completable.timeInterval()
+54. Maybe.timestamp()
+55. Single.timestamp()
+56. Maybe.toFuture()
+57. Completable.toFuture()

From ea8ab3bbd5617af2e0f5342c72a42a0eeae941ee Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 25 Jan 2020 16:58:59 +0100
Subject: [PATCH 074/665] 3.x: Add Maybe.dematerialize (#6871)

---
 .../java/io/reactivex/rxjava3/core/Maybe.java |  41 ++++++
 .../io/reactivex/rxjava3/core/Single.java     |   2 +-
 .../operators/maybe/MaybeDematerialize.java   | 108 ++++++++++++++++
 .../maybe/MaybeDematerializeTest.java         | 122 ++++++++++++++++++
 4 files changed, 272 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerialize.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerializeTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 8699d60e16..a9435534f6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -2893,6 +2893,47 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
         return RxJavaPlugins.onAssembly(new MaybeToSingle<>(this, defaultItem));
     }
 
+    /**
+     * Maps the {@link Notification} success value of the current {@code Maybe} back into normal
+     * {@code onSuccess}, {@code onError} or {@code onComplete} signals.
+     * <p>
+     * <img width="640" height="268" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.dematerialize.png" alt="">
+     * <p>
+     * The intended use of the {@code selector} function is to perform a
+     * type-safe identity mapping (see example) on a source that is already of type
+     * {@code Notification<T>}. The Java language doesn't allow
+     * limiting instance methods to a certain generic argument shape, therefore,
+     * a function is used to ensure the conversion remains type safe.
+     * <p>
+     * Regular {@code onError} or {@code onComplete} signals from the current {@code Maybe} are passed along to the downstream.
+     * <dl>
+     * <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code dematerialize} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * <p>
+     * Example:
+     * <pre><code>
+     * Maybe.just(Notification.createOnNext(1))
+     * .dematerialize(notification -&gt; notification)
+     * .test()
+     * .assertResult(1);
+     * </code></pre>
+     * @param <R> the result type
+     * @param selector the function called with the success item and should
+     * return a {@code Notification} instance.
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code selector} is {@code null}
+     * @since 3.0.0
+     * @see #materialize()
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <@NonNull R> Maybe<R> dematerialize(@NonNull Function<? super T, @NonNull Notification<R>> selector) {
+        Objects.requireNonNull(selector, "selector is null");
+        return RxJavaPlugins.onAssembly(new MaybeDematerialize<>(this, selector));
+    }
+
     /**
      * Returns a {@code Maybe} that signals the events emitted by the current {@code Maybe} shifted forward in time by a
      * specified delay.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 719719520f..3bfcd78a9c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -2511,7 +2511,7 @@ public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit, @Non
     }
 
     /**
-     * Maps the {@link Notification} success value of this {@code Single} back into normal
+     * Maps the {@link Notification} success value of the current {@code Single} back into normal
      * {@code onSuccess}, {@code onError} or {@code onComplete} signals as a
      * {@link Maybe} source.
      * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerialize.java
new file mode 100644
index 0000000000..d5d3ed25cd
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerialize.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+
+import java.util.Objects;
+
+/**
+ * Maps the success value of the source to a Notification, then
+ * maps it back to the corresponding signal type.
+ * <p>History: 2.2.4 - experimental
+ * @param <T> the element type of the source
+ * @param <R> the element type of the Notification and result
+ * @since 3.0.0
+ */
+public final class MaybeDematerialize<T, R> extends AbstractMaybeWithUpstream<T, R> {
+
+    final Function<? super T, Notification<R>> selector;
+
+    public MaybeDematerialize(Maybe<T> source, Function<? super T, Notification<R>> selector) {
+        super(source);
+        this.selector = selector;
+    }
+
+    @Override
+    protected void subscribeActual(MaybeObserver<? super R> observer) {
+        source.subscribe(new DematerializeObserver<>(observer, selector));
+    }
+
+    static final class DematerializeObserver<T, R> implements MaybeObserver<T>, Disposable {
+
+        final MaybeObserver<? super R> downstream;
+
+        final Function<? super T, Notification<R>> selector;
+
+        Disposable upstream;
+
+        DematerializeObserver(MaybeObserver<? super R> downstream,
+                Function<? super T, Notification<R>> selector) {
+            this.downstream = downstream;
+            this.selector = selector;
+        }
+
+        @Override
+        public void dispose() {
+            upstream.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            if (DisposableHelper.validate(upstream, d)) {
+                upstream = d;
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(T t) {
+            Notification<R> notification;
+
+            try {
+                notification = Objects.requireNonNull(selector.apply(t), "The selector returned a null Notification");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+            if (notification.isOnNext()) {
+                downstream.onSuccess(notification.getValue());
+            } else if (notification.isOnComplete()) {
+                downstream.onComplete();
+            } else {
+                downstream.onError(notification.getError());
+            }
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            downstream.onError(e);
+        }
+
+        @Override
+        public void onComplete() {
+            downstream.onComplete();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerializeTest.java
new file mode 100644
index 0000000000..5c75a92a10
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerializeTest.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.mockito.Mockito.*;
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeDematerializeTest extends RxJavaTest {
+
+    @Test
+    public void success() {
+        Maybe.just(Notification.createOnNext(1))
+        .dematerialize(Functions.<Notification<Integer>>identity())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void empty() {
+        Maybe.just(Notification.<Integer>createOnComplete())
+        .dematerialize(Functions.<Notification<Integer>>identity())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void emptySource() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Function<Notification<Integer>, Notification<Integer>> function = mock(Function.class);
+
+        Maybe.<Notification<Integer>>empty()
+        .dematerialize(function)
+        .test()
+        .assertResult();
+
+        verify(function, never()).apply(any());
+    }
+
+    @Test
+    public void error() {
+        Maybe.<Notification<Integer>>error(new TestException())
+        .dematerialize(Functions.<Notification<Integer>>identity())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void errorNotification() {
+        Maybe.just(Notification.<Integer>createOnError(new TestException()))
+        .dematerialize(Functions.<Notification<Integer>>identity())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybe(new Function<Maybe<Object>, MaybeSource<Object>>() {
+            @SuppressWarnings({ "unchecked", "rawtypes" })
+            @Override
+            public MaybeSource<Object> apply(Maybe<Object> v) throws Exception {
+                return v.dematerialize((Function)Functions.identity());
+            }
+        });
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(MaybeSubject.<Notification<Integer>>create().dematerialize(Functions.<Notification<Integer>>identity()));
+    }
+
+    @Test
+    public void selectorCrash() {
+        Maybe.just(Notification.createOnNext(1))
+        .dematerialize(new Function<Notification<Integer>, Notification<Integer>>() {
+            @Override
+            public Notification<Integer> apply(Notification<Integer> v) throws Exception {
+                throw new TestException();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void selectorNull() {
+        Maybe.just(Notification.createOnNext(1))
+        .dematerialize(Functions.justFunction((Notification<Integer>)null))
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void selectorDifferentType() {
+        Maybe.just(Notification.createOnNext(1))
+        .dematerialize(new Function<Notification<Integer>, Notification<String>>() {
+            @Override
+            public Notification<String> apply(Notification<Integer> v) throws Exception {
+                return Notification.createOnNext("Value-" + 1);
+            }
+        })
+        .test()
+        .assertResult("Value-1");
+    }
+}

From 26dacd72f1929c78d84da41ec80dc1ae3996c9f9 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 25 Jan 2020 22:07:48 +0100
Subject: [PATCH 075/665] 3.x: Add many fromX operators + marbles (#6873)

---
 docs/Operator-Matrix.md                       |  67 +++---
 .../reactivex/rxjava3/core/Completable.java   |   6 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 209 ++++++++++++++++-
 .../java/io/reactivex/rxjava3/core/Maybe.java |  61 ++++-
 .../io/reactivex/rxjava3/core/Observable.java | 130 +++++++++++
 .../io/reactivex/rxjava3/core/Single.java     |  50 ++++
 .../fuseable/AbstractEmptyQueueFuseable.java  |  76 ++++++
 .../fuseable/CancellableQueueFuseable.java    |  42 ++++
 .../SubscriberCompletableObserver.java        |  59 -----
 .../completable/CompletableFromAction.java    |  24 +-
 .../completable/CompletableFromRunnable.java  |  24 +-
 .../completable/CompletableToFlowable.java    |   5 +-
 .../completable/CompletableToObservable.java  |  66 +-----
 .../FlowableElementAtMaybePublisher.java      |  42 ++++
 .../flowable/FlowableFromAction.java          |  68 ++++++
 .../flowable/FlowableFromCompletable.java     |  86 +++++++
 .../flowable/FlowableFromObservable.java      |   5 +-
 .../flowable/FlowableFromRunnable.java        |  68 ++++++
 .../operators/maybe/MaybeFromCompletable.java |   2 +-
 .../operators/maybe/MaybeToSingle.java        |   2 +-
 .../observable/ObservableFromAction.java      |  66 ++++++
 .../observable/ObservableFromCompletable.java |  89 +++++++
 .../observable/ObservableFromRunnable.java    |  66 ++++++
 .../CancellableQueueFuseableTest.java         |  75 ++++++
 .../CompletableAndThenCompletableabTest.java  |   2 +-
 .../CompletableFromActionTest.java            |  16 +-
 .../CompletableFromRunnableTest.java          |  16 +-
 .../CompletableToObservableTest.java          |  38 ---
 .../flowable/FlowableFromActionTest.java      | 214 +++++++++++++++++
 .../flowable/FlowableFromCompletableTest.java | 196 ++++++++++++++++
 .../flowable/FlowableFromMaybeTest.java       |  93 ++++++++
 .../flowable/FlowableFromObservableTest.java  |  10 +
 .../flowable/FlowableFromRunnableTest.java    | 220 ++++++++++++++++++
 .../flowable/FlowableFromSingleTest.java      |  86 +++++++
 .../maybe/MaybeFromObservableTest.java        |  50 ++++
 .../maybe/MaybeFromPubisherTest.java          |  50 ++++
 .../observable/ObservableFromActionTest.java  | 214 +++++++++++++++++
 .../ObservableFromCompletableTest.java        | 195 ++++++++++++++++
 .../observable/ObservableFromMaybeTest.java   |  93 ++++++++
 .../ObservableFromRunnableTest.java           | 220 ++++++++++++++++++
 .../observable/ObservableFromSingleTest.java  |  86 +++++++
 .../operators/single/SingleFromMaybeTest.java |  72 ++++++
 .../util/OperatorMatrixGenerator.java         |  15 ++
 .../validators/InternalWrongNaming.java       |   5 +-
 44 files changed, 3032 insertions(+), 247 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java
 delete mode 100644 src/main/java/io/reactivex/rxjava3/internal/observers/SubscriberCompletableObserver.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybePublisher.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromAction.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletable.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnable.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromAction.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletable.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnable.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromObservableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromPubisherTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromMaybeTest.java

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index 3eaaa51221..81e1f7878d 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -102,19 +102,19 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='flattenStreamAsObservable'></a>`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='forEach'></a>`forEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|
 <a name='forEachWhile'></a>`forEachWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|
-<a name='fromAction'></a>`fromAction`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromAction'></a>`fromAction`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='fromArray'></a>`fromArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
 <a name='fromCallable'></a>`fromCallable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromCompletable'></a>`fromCompletable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always error.'>([72](#notes-72))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|
+<a name='fromCompletable'></a>`fromCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always error.'>([72](#notes-72))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|
 <a name='fromCompletionStage'></a>`fromCompletionStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='fromFuture'></a>`fromFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='fromIterable'></a>`fromIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
-<a name='fromMaybe'></a>`fromMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromObservable'></a>`fromObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromMaybe'></a>`fromMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromObservable'></a>`fromObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='fromOptional'></a>`fromOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
-<a name='fromPublisher'></a>`fromPublisher`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromRunnable'></a>`fromRunnable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromSingle'></a>`fromSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromPublisher'></a>`fromPublisher`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromRunnable'></a>`fromRunnable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromSingle'></a>`fromSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='fromStream'></a>`fromStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
 <a name='fromSupplier'></a>`fromSupplier`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='generate'></a>`generate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([74](#notes-74))</sup>|
@@ -237,6 +237,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([108](#notes-108))</sup>|
 <a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([109](#notes-109))</sup>|
 <a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([110](#notes-110))</sup>|
+<a name='total'></a>**237 operators** | **215** | **209** | **108** | **93** | **76** |
 
 #### Notes
 <a name='notes-1'></a><sup>1</sup> Use [`contains()`](#contains).<br/>
@@ -375,37 +376,21 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 21. Maybe.doOnLifecycle()
 22. Single.doOnLifecycle()
 23. Completable.doOnLifecycle()
-24. Flowable.fromAction()
-25. Observable.fromAction()
-26. Single.fromAction()
-27. Flowable.fromCompletable()
-28. Observable.fromCompletable()
-29. Flowable.fromMaybe()
-30. Observable.fromMaybe()
-31. Single.fromMaybe()
-32. Flowable.fromObservable()
-33. Maybe.fromObservable()
-34. Maybe.fromPublisher()
-35. Flowable.fromRunnable()
-36. Observable.fromRunnable()
-37. Single.fromRunnable()
-38. Flowable.fromSingle()
-39. Observable.fromSingle()
-40. Single.mergeArray()
-41. Single.mergeArrayDelayError()
-42. Single.ofType()
-43. Completable.onErrorReturn()
-44. Completable.onErrorReturnItem()
-45. Maybe.safeSubscribe()
-46. Single.safeSubscribe()
-47. Completable.safeSubscribe()
-48. Completable.sequenceEqual()
-49. Maybe.startWith()
-50. Single.startWith()
-51. Maybe.timeInterval()
-52. Single.timeInterval()
-53. Completable.timeInterval()
-54. Maybe.timestamp()
-55. Single.timestamp()
-56. Maybe.toFuture()
-57. Completable.toFuture()
+24. Single.mergeArray()
+25. Single.mergeArrayDelayError()
+26. Single.ofType()
+27. Completable.onErrorReturn()
+28. Completable.onErrorReturnItem()
+29. Maybe.safeSubscribe()
+30. Single.safeSubscribe()
+31. Completable.safeSubscribe()
+32. Completable.sequenceEqual()
+33. Maybe.startWith()
+34. Single.startWith()
+35. Maybe.timeInterval()
+36. Single.timeInterval()
+37. Completable.timeInterval()
+38. Maybe.timestamp()
+39. Single.timestamp()
+40. Maybe.toFuture()
+41. Completable.toFuture()
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 779d04d1d2..e965855e00 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -496,7 +496,7 @@ public static Completable fromFuture(@NonNull Future<?> future) {
     }
 
     /**
-     * Returns a {@code Completable} instance that when subscribed to, subscribes to the {@link Maybe} instance and
+     * Returns a {@code Completable} instance that when subscribed to, subscribes to the {@link MaybeSource} instance and
      * emits an {@code onComplete} event if the maybe emits {@code onSuccess}/{@code onComplete} or forwards any
      * {@code onError} events.
      * <p>
@@ -506,8 +506,8 @@ public static Completable fromFuture(@NonNull Future<?> future) {
      *  <dd>{@code fromMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.17 - beta
-     * @param <T> the value type of the {@link MaybeSource} element
-     * @param maybe the {@code Maybe} instance to subscribe to, not {@code null}
+     * @param <T> the value type of the {@code MaybeSource} element
+     * @param maybe the {@code MaybeSource} instance to subscribe to, not {@code null}
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code maybe} is {@code null}
      * @since 2.2
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index d1b17e8b84..3d83d477c5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -19,7 +19,6 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.flowables.*;
@@ -28,8 +27,10 @@
 import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
 import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
+import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
-import io.reactivex.rxjava3.internal.operators.observable.*;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableFromPublisher;
+import io.reactivex.rxjava3.internal.operators.single.SingleToFlowable;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscribers.*;
 import io.reactivex.rxjava3.internal.util.*;
@@ -1959,6 +1960,39 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
         return error(Functions.justSupplier(throwable));
     }
 
+    /**
+     * Returns a {@code Flowable} instance that runs the given {@link Action} for each subscriber and
+     * emits either its exception or simply completes.
+     * <p>
+     * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromAction.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>This source doesn't produce any elements and effectively ignores downstream backpressure.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromAction} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd> If the {@code Action} throws an exception, the respective {@link Throwable} is
+     *  delivered to the downstream via {@link Subscriber#onError(Throwable)},
+     *  except when the downstream has canceled the resulting {@code Flowable} source.
+     *  In this latter case, the {@code Throwable} is delivered to the global error handler via
+     *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
+     *  </dd>
+     * </dl>
+     * @param <T> the target type
+     * @param action the {@code Action} to run for each subscriber
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code action} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    public static <T> Flowable<T> fromAction(@NonNull Action action) {
+        Objects.requireNonNull(action, "action is null");
+        return RxJavaPlugins.onAssembly(new FlowableFromAction<>(action));
+    }
+
     /**
      * Converts an array into a {@link Publisher} that emits the items in the array.
      * <p>
@@ -2037,6 +2071,30 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
         return RxJavaPlugins.onAssembly(new FlowableFromCallable<>(callable));
     }
 
+    /**
+     * Wraps a {@link CompletableSource} into a {@code Flowable}.
+     * <p>
+     * <img width="640" height="278" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromCompletable.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>This source doesn't produce any elements and effectively ignores downstream backpressure.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the target type
+     * @param completableSource the {@code CompletableSource} to convert from
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code completableSource} is {@code null}
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    public static <T> Flowable<T> fromCompletable(@NonNull CompletableSource completableSource) {
+        Objects.requireNonNull(completableSource, "completableSource is null");
+        return RxJavaPlugins.onAssembly(new FlowableFromCompletable<>(completableSource));
+    }
+
     /**
      * Converts a {@link Future} into a {@link Publisher}.
      * <p>
@@ -2157,6 +2215,94 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
         return RxJavaPlugins.onAssembly(new FlowableFromIterable<>(source));
     }
 
+    /**
+     * Returns a {@code Flowable} instance that when subscribed to, subscribes to the {@link MaybeSource} instance and
+     * emits {@code onSuccess} as a single item or forwards any {@code onComplete} or
+     * {@code onError} signal.
+     * <p>
+     * <img width="640" height="226" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromMaybe.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type of the {@code MaybeSource} element
+     * @param maybe the {@code MaybeSource} instance to subscribe to, not {@code null}
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code maybe} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public static <T> Flowable<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
+        Objects.requireNonNull(maybe, "maybe is null");
+        return RxJavaPlugins.onAssembly(new MaybeToFlowable<>(maybe));
+    }
+
+    /**
+     * Converts the given {@link ObservableSource} into a {@code Flowable} by applying the specified backpressure strategy.
+     * <p>
+     * Marble diagrams for the various backpressure strategies are as follows:
+     * <ul>
+     * <li>{@link BackpressureStrategy#BUFFER}
+     * <p>
+     * <img width="640" height="264" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromObservable.buffer.png" alt="">
+     * </li>
+     * <li>{@link BackpressureStrategy#DROP}
+     * <p>
+     * <img width="640" height="374" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromObservable.drop.png" alt="">
+     * </li>
+     * <li>{@link BackpressureStrategy#LATEST}
+     * <p>
+     * <img width="640" height="284" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromObservable.latest.png" alt="">
+     * </li>
+     * <li>{@link BackpressureStrategy#ERROR}
+     * <p>
+     * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromObservable.error.png" alt="">
+     * </li>
+     * <li>{@link BackpressureStrategy#MISSING}
+     * <p>
+     * <img width="640" height="397" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromObservable.missing.png" alt="">
+     * </li>
+     * </ul>
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator applies the chosen backpressure strategy of {@link BackpressureStrategy} enum.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromObservable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <T> the element type of the source and resulting sequence
+     * @param source the {@code ObservableSource} to convert
+     * @param strategy the backpressure strategy to apply
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code source} or {@code strategy} is {@code null}
+     */
+    @BackpressureSupport(BackpressureKind.SPECIAL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> fromObservable(@NonNull ObservableSource<T> source, @NonNull BackpressureStrategy strategy) {
+        Objects.requireNonNull(source, "source is null");
+        Objects.requireNonNull(strategy, "strategy is null");
+        Flowable<T> f = new FlowableFromObservable<>(source);
+        switch (strategy) {
+            case DROP:
+                return f.onBackpressureDrop();
+            case LATEST:
+                return f.onBackpressureLatest();
+            case MISSING:
+                return f;
+            case ERROR:
+                return RxJavaPlugins.onAssembly(new FlowableOnBackpressureError<>(f));
+            default:
+                return f.onBackpressureBuffer();
+        }
+    }
+
     /**
      * Converts an arbitrary <em>Reactive Streams</em> {@link Publisher} into a {@code Flowable} if not already a
      * {@code Flowable}.
@@ -2198,6 +2344,65 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<@NonNull ? extend
         return RxJavaPlugins.onAssembly(new FlowableFromPublisher<>(publisher));
     }
 
+    /**
+     * Returns a {@code Flowable} instance that runs the given {@link Runnable} for each subscriber and
+     * emits either its exception or simply completes.
+     * <p>
+     * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromRunnable.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>This source doesn't produce any elements and effectively ignores downstream backpressure.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd> If the {@code Runnable} throws an exception, the respective {@link Throwable} is
+     *  delivered to the downstream via {@link Subscriber#onError(Throwable)},
+     *  except when the downstream has canceled the resulting {@code Flowable} source.
+     *  In this latter case, the {@code Throwable} is delivered to the global error handler via
+     *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
+     *  </dd>
+     * </dl>
+     * @param <T> the target type
+     * @param run the {@code Runnable} to run for each subscriber
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code run} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.PASS_THROUGH)
+    public static <T> Flowable<T> fromRunnable(@NonNull Runnable run) {
+        Objects.requireNonNull(run, "run is null");
+        return RxJavaPlugins.onAssembly(new FlowableFromRunnable<>(run));
+    }
+
+    /**
+     * Returns a {@code Flowable} instance that when subscribed to, subscribes to the {@link SingleSource} instance and
+     * emits {@code onSuccess} as a single item or forwards the {@code onError} signal.
+     * <p>
+     * <img width="640" height="341" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromSingle.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromSingle} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type of the {@code SingleSource} element
+     * @param source the {@code SingleSource} instance to subscribe to, not {@code null}
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code source} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public static <T> Flowable<T> fromSingle(@NonNull SingleSource<T> source) {
+        Objects.requireNonNull(source, "source is null");
+        return RxJavaPlugins.onAssembly(new SingleToFlowable<>(source));
+    }
+
     /**
      * Returns a {@code Flowable} that, when a {@link Subscriber} subscribes to it, invokes a supplier function you specify and then
      * emits the value returned from that function.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index a9435534f6..12ab3678e2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -30,6 +30,7 @@
 import io.reactivex.rxjava3.internal.operators.flowable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.*;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableElementAtMaybe;
 import io.reactivex.rxjava3.internal.util.ErrorMode;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -710,7 +711,7 @@ public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier
     }
 
     /**
-     * Returns a {@code Maybe} instance that runs the given {@link Action} for each subscriber and
+     * Returns a {@code Maybe} instance that runs the given {@link Action} for each observer and
      * emits either its exception or simply completes.
      * <p>
      * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromAction.png" alt="">
@@ -720,13 +721,13 @@ public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier
      *  <dt><b>Error handling:</b></dt>
      *  <dd> If the {@code Action} throws an exception, the respective {@link Throwable} is
      *  delivered to the downstream via {@link MaybeObserver#onError(Throwable)},
-     *  except when the downstream has disposed this {@code Maybe} source.
+     *  except when the downstream has disposed the resulting {@code Maybe} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
      * </dl>
      * @param <T> the target type
-     * @param action the {@code Action} to run for each subscriber
+     * @param action the {@code Action} to run for each observer
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code action} is {@code null}
      */
@@ -901,7 +902,57 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
     }
 
     /**
-     * Returns a {@code Maybe} instance that runs the given {@link Runnable} for each subscriber and
+     * Wraps an {@link ObservableSource} into a {@code Maybe} and emits the very first item
+     * or completes if the source is empty.
+     * <p>
+     * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromObservable.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromObservable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the target type
+     * @param source the {@code ObservableSource} to convert from
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code source} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Maybe<T> fromObservable(@NonNull ObservableSource<T> source) {
+        Objects.requireNonNull(source, "source is null");
+        return RxJavaPlugins.onAssembly(new ObservableElementAtMaybe<>(source, 0L));
+    }
+
+    /**
+     * Wraps a {@link Publisher} into a {@code Maybe} and emits the very first item
+     * or completes if the source is empty.
+     * <p>
+     * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromPublisher.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator consumes the given {@code Publisher} in an unbounded manner
+     *  (requesting {@link Long#MAX_VALUE}) but cancels it after one item received.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromPublisher} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the target type
+     * @param source the {@code Publisher} to convert from
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code source} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    public static <T> Maybe<T> fromPublisher(@NonNull Publisher<T> source) {
+        Objects.requireNonNull(source, "source is null");
+        return RxJavaPlugins.onAssembly(new FlowableElementAtMaybePublisher<>(source, 0L));
+    }
+
+    /**
+     * Returns a {@code Maybe} instance that runs the given {@link Runnable} for each observer and
      * emits either its exception or simply completes.
      * <p>
      * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromRunnable.png" alt="">
@@ -910,7 +961,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
      *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param <T> the target type
-     * @param run the {@code Runnable} to run for each subscriber
+     * @param run the {@code Runnable} to run for each observer
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code run} is {@code null}
      */
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index f599ce0eeb..89de9dd63e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -28,8 +28,10 @@
 import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.observers.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
+import io.reactivex.rxjava3.internal.operators.maybe.MaybeToObservable;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
 import io.reactivex.rxjava3.internal.operators.observable.*;
+import io.reactivex.rxjava3.internal.operators.single.SingleToObservable;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.observables.*;
 import io.reactivex.rxjava3.observers.*;
@@ -1734,6 +1736,36 @@ public static <T> Observable<T> error(@NonNull Throwable throwable) {
         return error(Functions.justSupplier(throwable));
     }
 
+    /**
+     * Returns an {@code Observable} instance that runs the given {@link Action} for each subscriber and
+     * emits either its exception or simply completes.
+     * <p>
+     * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromAction.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromAction} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd> If the {@code Action} throws an exception, the respective {@link Throwable} is
+     *  delivered to the downstream via {@link Observer#onError(Throwable)},
+     *  except when the downstream has canceled the resulting {@code Observable} source.
+     *  In this latter case, the {@code Throwable} is delivered to the global error handler via
+     *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
+     *  </dd>
+     * </dl>
+     * @param <T> the target type
+     * @param action the {@code Action} to run for each subscriber
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code action} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Observable<T> fromAction(@NonNull Action action) {
+        Objects.requireNonNull(action, "action is null");
+        return RxJavaPlugins.onAssembly(new ObservableFromAction<>(action));
+    }
+
     /**
      * Converts an array into an {@link ObservableSource} that emits the items in the array.
      * <p>
@@ -1804,6 +1836,27 @@ public static <T> Observable<T> fromCallable(@NonNull Callable<? extends T> call
         return RxJavaPlugins.onAssembly(new ObservableFromCallable<>(callable));
     }
 
+    /**
+     * Wraps a {@link CompletableSource} into an {@code Observable}.
+     * <p>
+     * <img width="640" height="278" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.fromCompletable.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the target type
+     * @param completableSource the {@code CompletableSource} to convert from
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code completableSource} is {@code null}
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Observable<T> fromCompletable(@NonNull CompletableSource completableSource) {
+        Objects.requireNonNull(completableSource, "completableSource is null");
+        return RxJavaPlugins.onAssembly(new ObservableFromCompletable<>(completableSource));
+    }
+
     /**
      * Converts a {@link Future} into an {@code Observable}.
      * <p>
@@ -1912,6 +1965,30 @@ public static <T> Observable<T> fromIterable(@NonNull Iterable<@NonNull ? extend
         return RxJavaPlugins.onAssembly(new ObservableFromIterable<>(source));
     }
 
+    /**
+     * Returns an {@code Observable} instance that when subscribed to, subscribes to the {@link MaybeSource} instance and
+     * emits {@code onSuccess} as a single item or forwards any {@code onComplete} or
+     * {@code onError} signal.
+     * <p>
+     * <img width="640" height="226" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.fromMaybe.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type of the {@code MaybeSource} element
+     * @param maybe the {@code MaybeSource} instance to subscribe to, not {@code null}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code maybe} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Observable<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
+        Objects.requireNonNull(maybe, "maybe is null");
+        return RxJavaPlugins.onAssembly(new MaybeToObservable<>(maybe));
+    }
+
     /**
      * Converts an arbitrary <em>Reactive Streams</em> {@link Publisher} into an {@code Observable}.
      * <p>
@@ -1949,6 +2026,59 @@ public static <T> Observable<T> fromPublisher(@NonNull Publisher<@NonNull ? exte
         return RxJavaPlugins.onAssembly(new ObservableFromPublisher<>(publisher));
     }
 
+    /**
+     * Returns an {@code Observable} instance that runs the given {@link Runnable} for each observer and
+     * emits either its exception or simply completes.
+     * <p>
+     * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.fromRunnable.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd> If the {@code Runnable} throws an exception, the respective {@link Throwable} is
+     *  delivered to the downstream via {@link Observer#onError(Throwable)},
+     *  except when the downstream has canceled the resulting {@code Observable} source.
+     *  In this latter case, the {@code Throwable} is delivered to the global error handler via
+     *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
+     *  </dd>
+     * </dl>
+     * @param <T> the target type
+     * @param run the {@code Runnable} to run for each observer
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code run} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Observable<T> fromRunnable(@NonNull Runnable run) {
+        Objects.requireNonNull(run, "run is null");
+        return RxJavaPlugins.onAssembly(new ObservableFromRunnable<>(run));
+    }
+
+    /**
+     * Returns an {@code Observable} instance that when subscribed to, subscribes to the {@link SingleSource} instance and
+     * emits {@code onSuccess} as a single item or forwards the {@code onError} signal.
+     * <p>
+     * <img width="640" height="341" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.fromSingle.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromSingle} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type of the {@code SingleSource} element
+     * @param source the {@code SingleSource} instance to subscribe to, not {@code null}
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code source} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Observable<T> fromSingle(@NonNull SingleSource<T> source) {
+        Objects.requireNonNull(source, "source is null");
+        return RxJavaPlugins.onAssembly(new SingleToObservable<>(source));
+    }
+
     /**
      * Returns an {@code Observable} that, when an observer subscribes to it, invokes a supplier function you specify and then
      * emits the value returned from that function.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 3bfcd78a9c..a3b536b1f7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -731,6 +731,56 @@ public static <T> Single<T> error(@NonNull Throwable throwable) {
         return toSingle(Flowable.fromFuture(future, timeout, unit));
     }
 
+    /**
+     * Returns a {@code Single} instance that when subscribed to, subscribes to the {@link MaybeSource} instance and
+     * emits {@code onSuccess} as a single item, turns an {@code onComplete} into {@link NoSuchElementException} error signal or
+     * forwards the {@code onError} signal.
+     * <p>
+     * <img width="640" height="241" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromMaybe.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type of the {@code MaybeSource} element
+     * @param maybe the {@code MaybeSource} instance to subscribe to, not {@code null}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code maybe} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Single<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
+        Objects.requireNonNull(maybe, "maybe is null");
+        return RxJavaPlugins.onAssembly(new MaybeToSingle<>(maybe, null));
+    }
+
+    /**
+     * Returns a {@code Single} instance that when subscribed to, subscribes to the {@link MaybeSource} instance and
+     * emits {@code onSuccess} as a single item, emits the {@code defaultItem} for an {@code onComplete} signal or
+     * forwards the {@code onError} signal.
+     * <p>
+     * <img width="640" height="353" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromMaybe.v.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code fromMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type of the {@code MaybeSource} element
+     * @param maybe the {@code MaybeSource} instance to subscribe to, not {@code null}
+     * @param defaultItem the item to signal if the current {@code MaybeSource} is empty
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code maybe} or {@code defaultItem} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Single<T> fromMaybe(@NonNull MaybeSource<T> maybe, @NonNull T defaultItem) {
+        Objects.requireNonNull(maybe, "maybe is null");
+        Objects.requireNonNull(defaultItem, "defaultItem is null");
+        return RxJavaPlugins.onAssembly(new MaybeToSingle<>(maybe, defaultItem));
+    }
+
     /**
      * Wraps a specific {@link Publisher} into a {@code Single} and signals its single element or error.
      * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java
new file mode 100644
index 0000000000..071db9fff8
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.fuseable;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+
+/**
+ * Represents an empty, async-only {@link QueueFuseable} instance.
+ *
+ * @param <T> the output value type
+ * @since 3.0.0
+ */
+public abstract class AbstractEmptyQueueFuseable<T>
+implements QueueSubscription<T>, QueueDisposable<T> {
+
+    @Override
+    public final int requestFusion(int mode) {
+        return mode & ASYNC;
+    }
+
+    @Override
+    public final boolean offer(@NonNull T value) {
+        throw new UnsupportedOperationException("Should not be called!");
+    }
+
+    @Override
+    public final boolean offer(@NonNull T v1, @NonNull T v2) {
+        throw new UnsupportedOperationException("Should not be called!");
+    }
+
+    @Override
+    public final T poll() throws Throwable {
+        return null; // always empty
+    }
+
+    @Override
+    public final boolean isEmpty() {
+        return true; // always empty
+    }
+
+    @Override
+    public final void clear() {
+        // always empty
+    }
+
+    @Override
+    public final void request(long n) {
+        // no items to request
+    }
+
+    @Override
+    public void cancel() {
+        // default No-op
+    }
+
+    @Override
+    public void dispose() {
+        // default No-op
+    }
+
+    @Override
+    public boolean isDisposed() {
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java
new file mode 100644
index 0000000000..8f9e12d3cb
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.fuseable;
+
+/**
+ * Represents an empty, async-only {@link QueueFuseable} instance that tracks and exposes a
+ * canceled/disposed state.
+ *
+ * @param <T> the output value type
+ * @since 3.0.0
+ */
+public final class CancellableQueueFuseable<T>
+extends AbstractEmptyQueueFuseable<T> {
+
+    volatile boolean disposed;
+
+    @Override
+    public void cancel() {
+        disposed = true;
+    }
+
+    @Override
+    public void dispose() {
+        disposed = true;
+    }
+
+    @Override
+    public boolean isDisposed() {
+        return disposed;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/SubscriberCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/SubscriberCompletableObserver.java
deleted file mode 100644
index 2bbc5128d6..0000000000
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/SubscriberCompletableObserver.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2016-present, RxJava Contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
- * the License for the specific language governing permissions and limitations under the License.
- */
-
-package io.reactivex.rxjava3.internal.observers;
-
-import org.reactivestreams.*;
-
-import io.reactivex.rxjava3.core.CompletableObserver;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-
-public final class SubscriberCompletableObserver<T> implements CompletableObserver, Subscription {
-    final Subscriber<? super T> subscriber;
-
-    Disposable upstream;
-
-    public SubscriberCompletableObserver(Subscriber<? super T> subscriber) {
-        this.subscriber = subscriber;
-    }
-
-    @Override
-    public void onComplete() {
-        subscriber.onComplete();
-    }
-
-    @Override
-    public void onError(Throwable e) {
-        subscriber.onError(e);
-    }
-
-    @Override
-    public void onSubscribe(Disposable d) {
-        if (DisposableHelper.validate(this.upstream, d)) {
-            this.upstream = d;
-
-            subscriber.onSubscribe(this);
-        }
-    }
-
-    @Override
-    public void request(long n) {
-        // ignored, no values emitted anyway
-    }
-
-    @Override
-    public void cancel() {
-        upstream.dispose();
-    }
-}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java
index 4cd7fb479c..82bec67c92 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java
@@ -31,19 +31,21 @@ public CompletableFromAction(Action run) {
     protected void subscribeActual(CompletableObserver observer) {
         Disposable d = Disposable.empty();
         observer.onSubscribe(d);
-        try {
-            run.run();
-        } catch (Throwable e) {
-            Exceptions.throwIfFatal(e);
+        if (!d.isDisposed()) {
+            try {
+                run.run();
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                if (!d.isDisposed()) {
+                    observer.onError(e);
+                } else {
+                    RxJavaPlugins.onError(e);
+                }
+                return;
+            }
             if (!d.isDisposed()) {
-                observer.onError(e);
-            } else {
-                RxJavaPlugins.onError(e);
+                observer.onComplete();
             }
-            return;
-        }
-        if (!d.isDisposed()) {
-            observer.onComplete();
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java
index e94d650310..60332d8db2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java
@@ -30,19 +30,21 @@ public CompletableFromRunnable(Runnable runnable) {
     protected void subscribeActual(CompletableObserver observer) {
         Disposable d = Disposable.empty();
         observer.onSubscribe(d);
-        try {
-            runnable.run();
-        } catch (Throwable e) {
-            Exceptions.throwIfFatal(e);
+        if (!d.isDisposed()) {
+            try {
+                runnable.run();
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                if (!d.isDisposed()) {
+                    observer.onError(e);
+                } else {
+                    RxJavaPlugins.onError(e);
+                }
+                return;
+            }
             if (!d.isDisposed()) {
-                observer.onError(e);
-            } else {
-                RxJavaPlugins.onError(e);
+                observer.onComplete();
             }
-            return;
-        }
-        if (!d.isDisposed()) {
-            observer.onComplete();
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java
index 9ad0d0a8d8..9a6c0326a1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java
@@ -16,7 +16,7 @@
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.observers.SubscriberCompletableObserver;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableFromCompletable;
 
 public final class CompletableToFlowable<T> extends Flowable<T> {
 
@@ -28,7 +28,6 @@ public CompletableToFlowable(CompletableSource source) {
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        SubscriberCompletableObserver<T> os = new SubscriberCompletableObserver<>(s);
-        source.subscribe(os);
+        source.subscribe(new FlowableFromCompletable.FromCompletableObserver<>(s));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java
index 095a975dbf..84eea97c8d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java
@@ -14,9 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.completable;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.observers.BasicQueueDisposable;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableFromCompletable;
 
 /**
  * Wraps a Completable and exposes it as an Observable.
@@ -33,66 +31,6 @@ public CompletableToObservable(CompletableSource source) {
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new ObserverCompletableObserver(observer));
-    }
-
-    static final class ObserverCompletableObserver extends BasicQueueDisposable<Void>
-    implements CompletableObserver {
-
-        final Observer<?> observer;
-
-        Disposable upstream;
-
-        ObserverCompletableObserver(Observer<?> observer) {
-            this.observer = observer;
-        }
-
-        @Override
-        public void onComplete() {
-            observer.onComplete();
-        }
-
-        @Override
-        public void onError(Throwable e) {
-            observer.onError(e);
-        }
-
-        @Override
-        public void onSubscribe(Disposable d) {
-            if (DisposableHelper.validate(upstream, d)) {
-                this.upstream = d;
-                observer.onSubscribe(this);
-            }
-        }
-
-        @Override
-        public int requestFusion(int mode) {
-            return mode & ASYNC;
-        }
-
-        @Override
-        public Void poll() {
-            return null; // always empty
-        }
-
-        @Override
-        public boolean isEmpty() {
-            return true;
-        }
-
-        @Override
-        public void clear() {
-            // always empty
-        }
-
-        @Override
-        public void dispose() {
-            upstream.dispose();
-        }
-
-        @Override
-        public boolean isDisposed() {
-            return upstream.isDisposed();
-        }
+        source.subscribe(new ObservableFromCompletable.FromCompletableObserver<>(observer));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybePublisher.java
new file mode 100644
index 0000000000..a474b03280
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybePublisher.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import org.reactivestreams.Publisher;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableElementAtMaybe.ElementAtSubscriber;
+
+/**
+ * Emits the indexth element from a Publisher as a Maybe.
+ *
+ * @param <T> the element type of the source
+ * @since 3.0.0
+ */
+public final class FlowableElementAtMaybePublisher<T> extends Maybe<T> {
+
+    final Publisher<T> source;
+
+    final long index;
+
+    public FlowableElementAtMaybePublisher(Publisher<T> source, long index) {
+        this.source = source;
+        this.index = index;
+    }
+
+    @Override
+    protected void subscribeActual(MaybeObserver<? super T> observer) {
+        source.subscribe(new ElementAtSubscriber<>(observer, index));
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromAction.java
new file mode 100644
index 0000000000..2d683e7601
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromAction.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.CancellableQueueFuseable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Executes an {@link Action} and signals its exception or completes normally.
+ *
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class FlowableFromAction<T> extends Flowable<T> implements Supplier<T> {
+
+    final Action action;
+
+    public FlowableFromAction(Action action) {
+        this.action = action;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super T> subscriber) {
+        CancellableQueueFuseable<T> qs = new CancellableQueueFuseable<>();
+        subscriber.onSubscribe(qs);
+
+        if (!qs.isDisposed()) {
+
+            try {
+                action.run();
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                if (!qs.isDisposed()) {
+                    subscriber.onError(ex);
+                } else {
+                    RxJavaPlugins.onError(ex);
+                }
+                return;
+            }
+
+            if (!qs.isDisposed()) {
+                subscriber.onComplete();
+            }
+        }
+    }
+
+    @Override
+    public T get() throws Throwable {
+        action.run();
+        return null; // considered as onComplete()
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletable.java
new file mode 100644
index 0000000000..78b37325ca
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletable.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.fuseable.*;
+
+/**
+ * Wrap a Completable into a Flowable.
+ *
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class FlowableFromCompletable<T> extends Flowable<T> implements HasUpstreamCompletableSource {
+
+    final CompletableSource source;
+
+    public FlowableFromCompletable(CompletableSource source) {
+        this.source = source;
+    }
+
+    @Override
+    public CompletableSource source() {
+        return source;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super T> observer) {
+        source.subscribe(new FromCompletableObserver<T>(observer));
+    }
+
+    public static final class FromCompletableObserver<T>
+    extends AbstractEmptyQueueFuseable<T>
+    implements CompletableObserver {
+
+        final Subscriber<? super T> downstream;
+
+        Disposable upstream;
+
+        public FromCompletableObserver(Subscriber<? super T> downstream) {
+            this.downstream = downstream;
+        }
+
+        @Override
+        public void cancel() {
+            upstream.dispose();
+            upstream = DisposableHelper.DISPOSED;
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            upstream = DisposableHelper.DISPOSED;
+            downstream.onComplete();
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            upstream = DisposableHelper.DISPOSED;
+            downstream.onError(e);
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java
index 105c6b6ee2..459228f549 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java
@@ -18,9 +18,10 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 
 public final class FlowableFromObservable<T> extends Flowable<T> {
-    private final Observable<T> upstream;
 
-    public FlowableFromObservable(Observable<T> upstream) {
+    private final ObservableSource<T> upstream;
+
+    public FlowableFromObservable(ObservableSource<T> upstream) {
         this.upstream = upstream;
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnable.java
new file mode 100644
index 0000000000..b163f1b7ee
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnable.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.internal.fuseable.CancellableQueueFuseable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Executes an {@link Runnable} and signals its exception or completes normally.
+ *
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class FlowableFromRunnable<T> extends Flowable<T> implements Supplier<T> {
+
+    final Runnable run;
+
+    public FlowableFromRunnable(Runnable run) {
+        this.run = run;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super T> subscriber) {
+        CancellableQueueFuseable<T> qs = new CancellableQueueFuseable<>();
+        subscriber.onSubscribe(qs);
+
+        if (!qs.isDisposed()) {
+
+            try {
+                run.run();
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                if (!qs.isDisposed()) {
+                    subscriber.onError(ex);
+                } else {
+                    RxJavaPlugins.onError(ex);
+                }
+                return;
+            }
+
+            if (!qs.isDisposed()) {
+                subscriber.onComplete();
+            }
+        }
+    }
+
+    @Override
+    public T get() throws Throwable {
+        run.run();
+        return null; // considered as onComplete()
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java
index bdbc2ec03b..5cb73e821c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java
@@ -19,7 +19,7 @@
 import io.reactivex.rxjava3.internal.fuseable.HasUpstreamCompletableSource;
 
 /**
- * Wrap a Single into a Maybe.
+ * Wrap a Completable into a Maybe.
  *
  * @param <T> the value type
  */
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java
index 3199521639..807b9cac51 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java
@@ -22,7 +22,7 @@
 
 /**
  * Wraps a MaybeSource and exposes its onSuccess and onError signals and signals
- * NoSuchElementException for onComplete.
+ * NoSuchElementException for onComplete if {@code defaultValue} is null.
  *
  * @param <T> the value type
  */
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromAction.java
new file mode 100644
index 0000000000..cccb5b5d38
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromAction.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.CancellableQueueFuseable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Executes an {@link Action} and signals its exception or completes normally.
+ *
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class ObservableFromAction<T> extends Observable<T> implements Supplier<T> {
+
+    final Action action;
+
+    public ObservableFromAction(Action action) {
+        this.action = action;
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super T> observer) {
+        CancellableQueueFuseable<T> qs = new CancellableQueueFuseable<>();
+        observer.onSubscribe(qs);
+
+        if (!qs.isDisposed()) {
+
+            try {
+                action.run();
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                if (!qs.isDisposed()) {
+                    observer.onError(ex);
+                } else {
+                    RxJavaPlugins.onError(ex);
+                }
+                return;
+            }
+
+            if (!qs.isDisposed()) {
+                observer.onComplete();
+            }
+        }
+    }
+
+    @Override
+    public T get() throws Throwable {
+        action.run();
+        return null; // considered as onComplete()
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletable.java
new file mode 100644
index 0000000000..4748e6a625
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletable.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.fuseable.*;
+
+/**
+ * Wrap a Completable into an Observable.
+ *
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class ObservableFromCompletable<T> extends Observable<T> implements HasUpstreamCompletableSource {
+
+    final CompletableSource source;
+
+    public ObservableFromCompletable(CompletableSource source) {
+        this.source = source;
+    }
+
+    @Override
+    public CompletableSource source() {
+        return source;
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super T> observer) {
+        source.subscribe(new FromCompletableObserver<T>(observer));
+    }
+
+    public static final class FromCompletableObserver<T>
+    extends AbstractEmptyQueueFuseable<T>
+    implements CompletableObserver {
+
+        final Observer<? super T> downstream;
+
+        Disposable upstream;
+
+        public FromCompletableObserver(Observer<? super T> downstream) {
+            this.downstream = downstream;
+        }
+
+        @Override
+        public void dispose() {
+            upstream.dispose();
+            upstream = DisposableHelper.DISPOSED;
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            upstream = DisposableHelper.DISPOSED;
+            downstream.onComplete();
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            upstream = DisposableHelper.DISPOSED;
+            downstream.onError(e);
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnable.java
new file mode 100644
index 0000000000..0dc37a8993
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnable.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.internal.fuseable.CancellableQueueFuseable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Executes an {@link Runnable} and signals its exception or completes normally.
+ *
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class ObservableFromRunnable<T> extends Observable<T> implements Supplier<T> {
+
+    final Runnable run;
+
+    public ObservableFromRunnable(Runnable run) {
+        this.run = run;
+    }
+
+    @Override
+    protected void subscribeActual(Observer<? super T> observer) {
+        CancellableQueueFuseable<T> qs = new CancellableQueueFuseable<>();
+        observer.onSubscribe(qs);
+
+        if (!qs.isDisposed()) {
+
+            try {
+                run.run();
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                if (!qs.isDisposed()) {
+                    observer.onError(ex);
+                } else {
+                    RxJavaPlugins.onError(ex);
+                }
+                return;
+            }
+
+            if (!qs.isDisposed()) {
+                observer.onComplete();
+            }
+        }
+    }
+
+    @Override
+    public T get() throws Throwable {
+        run.run();
+        return null; // considered as onComplete()
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java b/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
new file mode 100644
index 0000000000..ed4718fd1c
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.fuseable;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class CancellableQueueFuseableTest {
+
+    @Test
+    public void offer() {
+        TestHelper.assertNoOffer(new CancellableQueueFuseable<>());
+    }
+
+    @Test
+    public void cancel() {
+        CancellableQueueFuseable<Object> qs = new CancellableQueueFuseable<>();
+
+        assertFalse(qs.isDisposed());
+
+        qs.cancel();
+
+        assertTrue(qs.isDisposed());
+
+        qs.cancel();
+
+        assertTrue(qs.isDisposed());
+    }
+
+    @Test
+    public void dispose() {
+        CancellableQueueFuseable<Object> qs = new CancellableQueueFuseable<>();
+
+        assertFalse(qs.isDisposed());
+
+        qs.dispose();
+
+        assertTrue(qs.isDisposed());
+
+        qs.dispose();
+
+        assertTrue(qs.isDisposed());
+    }
+
+    @Test
+    public void cancel2() {
+        AbstractEmptyQueueFuseable<Object> qs = new AbstractEmptyQueueFuseable<Object>() {};
+
+        assertFalse(qs.isDisposed());
+
+        qs.cancel();
+    }
+
+    @Test
+    public void dispose2() {
+        AbstractEmptyQueueFuseable<Object> qs = new AbstractEmptyQueueFuseable<Object>() {};
+
+        assertFalse(qs.isDisposed());
+
+        qs.dispose();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
index a98f3b5abb..051dd4e364 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
@@ -102,7 +102,7 @@ public void run() {
                 .andThen(Completable.complete())
                 .test(true)
                 .assertEmpty();
-        assertEquals(1, completableRunCount.get());
+        assertEquals(0, completableRunCount.get());
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
index 56354fc448..1f4df16f44 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -108,7 +109,7 @@ public void run() throws Exception {
         .test(true)
         .assertEmpty();
 
-        assertEquals(1, calls.get());
+        assertEquals(0, calls.get());
     }
 
     @Test
@@ -124,6 +125,17 @@ public void run() throws Exception {
         .test(true)
         .assertEmpty();
 
-        assertEquals(1, calls.get());
+        assertEquals(0, calls.get());
+    }
+
+    @Test
+    public void disposedUpfront() throws Throwable {
+        Action run = mock(Action.class);
+
+        Completable.fromAction(run)
+        .test(true)
+        .assertEmpty();
+
+        verify(run, never()).run();
     }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
index 5d6473077f..2559f09187 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
@@ -14,6 +14,7 @@
 package io.reactivex.rxjava3.internal.operators.completable;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.*;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -107,7 +108,7 @@ public void run() {
         .test(true)
         .assertEmpty();
 
-        assertEquals(1, calls.get());
+        assertEquals(0, calls.get());
     }
 
     @Test
@@ -123,6 +124,17 @@ public void run() {
         .test(true)
         .assertEmpty();
 
-        assertEquals(1, calls.get());
+        assertEquals(0, calls.get());
+    }
+
+    @Test
+    public void disposedUpfront() throws Throwable {
+        Runnable run = mock(Runnable.class);
+
+        Completable.fromRunnable(run)
+        .test(true)
+        .assertEmpty();
+
+        verify(run, never()).run();
     }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
index f1bbda0353..96404e8167 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
@@ -13,16 +13,10 @@
 
 package io.reactivex.rxjava3.internal.operators.completable;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
-import io.reactivex.rxjava3.internal.operators.completable.CompletableToObservable.ObserverCompletableObserver;
-import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableToObservableTest extends RxJavaTest {
@@ -37,36 +31,4 @@ public Observable<?> apply(Completable c) throws Exception {
         });
     }
 
-    @Test
-    public void fusion() throws Exception {
-        TestObserver<Void> to = new TestObserver<>();
-
-        ObserverCompletableObserver co = new ObserverCompletableObserver(to);
-
-        Disposable d = Disposable.empty();
-
-        co.onSubscribe(d);
-
-        assertEquals(QueueFuseable.NONE, co.requestFusion(QueueFuseable.SYNC));
-
-        assertEquals(QueueFuseable.ASYNC, co.requestFusion(QueueFuseable.ASYNC));
-
-        assertEquals(QueueFuseable.ASYNC, co.requestFusion(QueueFuseable.ANY));
-
-        assertTrue(co.isEmpty());
-
-        assertNull(co.poll());
-
-        co.clear();
-
-        assertFalse(co.isDisposed());
-
-        co.dispose();
-
-        assertTrue(d.isDisposed());
-
-        assertTrue(co.isDisposed());
-
-        TestHelper.assertNoOffer(co);
-    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java
new file mode 100644
index 0000000000..b19a03159c
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java
@@ -0,0 +1,214 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class FlowableFromActionTest extends RxJavaTest {
+    @Test
+    public void fromAction() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Flowable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        })
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromActionTwice() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Action run = new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        };
+
+        Flowable.fromAction(run)
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+
+        Flowable.fromAction(run)
+            .test()
+            .assertResult();
+
+        assertEquals(2, atomicInteger.get());
+    }
+
+    @Test
+    public void fromActionInvokesLazy() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Flowable<Object> source = Flowable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        });
+
+        assertEquals(0, atomicInteger.get());
+
+        source
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromActionThrows() {
+        Flowable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                throw new UnsupportedOperationException();
+            }
+        })
+            .test()
+            .assertFailure(UnsupportedOperationException.class);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void callable() throws Throwable {
+        final int[] counter = { 0 };
+
+        Flowable<Void> m = Flowable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                counter[0]++;
+            }
+        });
+
+        assertTrue(m.getClass().toString(), m instanceof Supplier);
+
+        assertNull(((Supplier<Void>)m).get());
+
+        assertEquals(1, counter[0]);
+    }
+
+    @Test
+    public void noErrorLoss() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            final CountDownLatch cdl1 = new CountDownLatch(1);
+            final CountDownLatch cdl2 = new CountDownLatch(1);
+
+            TestSubscriber<Object> ts = Flowable.fromAction(new Action() {
+                @Override
+                public void run() throws Exception {
+                    cdl1.countDown();
+                    cdl2.await(5, TimeUnit.SECONDS);
+                }
+            }).subscribeOn(Schedulers.single()).test();
+
+            assertTrue(cdl1.await(5, TimeUnit.SECONDS));
+
+            ts.cancel();
+
+            int timeout = 10;
+
+            while (timeout-- > 0 && errors.isEmpty()) {
+                Thread.sleep(100);
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, InterruptedException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void disposedUpfront() throws Throwable {
+        Action run = mock(Action.class);
+
+        Flowable.fromAction(run)
+        .test(1L, true)
+        .assertEmpty();
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void cancelWhileRunning() {
+        final TestSubscriber<Object> ts = new TestSubscriber<>();
+
+        Flowable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                ts.cancel();
+            }
+        })
+        .subscribeWith(ts)
+        .assertEmpty();
+
+        assertTrue(ts.isCancelled());
+    }
+
+    @Test
+    public void asyncFused() throws Throwable {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Action action = mock(Action.class);
+
+        Flowable.fromAction(action)
+        .subscribe(ts);
+
+        ts.assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+
+        verify(action).run();
+    }
+
+    @Test
+    public void syncFusedRejected() throws Throwable {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Action action = mock(Action.class);
+
+        Flowable.fromAction(action)
+        .subscribe(ts);
+
+        ts.assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+
+        verify(action).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
new file mode 100644
index 0000000000..47c0b815fb
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
@@ -0,0 +1,196 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class FlowableFromCompletableTest extends RxJavaTest {
+    @Test
+    public void fromCompletable() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Flowable.fromCompletable(Completable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        }))
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromCompletableTwice() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Action run = new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        };
+
+        Flowable.fromCompletable(Completable.fromAction(run))
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+
+        Flowable.fromCompletable(Completable.fromAction(run))
+            .test()
+            .assertResult();
+
+        assertEquals(2, atomicInteger.get());
+    }
+
+    @Test
+    public void fromCompletableInvokesLazy() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Flowable<Object> source = Flowable.fromCompletable(Completable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        }));
+
+        assertEquals(0, atomicInteger.get());
+
+        source
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromCompletableThrows() {
+        Flowable.fromCompletable(Completable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                throw new UnsupportedOperationException();
+            }
+        }))
+            .test()
+            .assertFailure(UnsupportedOperationException.class);
+    }
+
+    @Test
+    public void noErrorLoss() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            final CountDownLatch cdl1 = new CountDownLatch(1);
+            final CountDownLatch cdl2 = new CountDownLatch(1);
+
+            TestSubscriber<Object> ts = Flowable.fromCompletable(Completable.fromAction(new Action() {
+                @Override
+                public void run() throws Exception {
+                    cdl1.countDown();
+                    cdl2.await(5, TimeUnit.SECONDS);
+                }
+            }))
+            .subscribeOn(Schedulers.single()).test();
+
+            assertTrue(cdl1.await(5, TimeUnit.SECONDS));
+
+            ts.cancel();
+
+            int timeout = 10;
+
+            while (timeout-- > 0 && errors.isEmpty()) {
+                Thread.sleep(100);
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, InterruptedException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void disposedUpfront() throws Throwable {
+        Action run = mock(Action.class);
+
+        Flowable.fromCompletable(Completable.fromAction(run))
+        .test(1L, true)
+        .assertEmpty();
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void cancelWhileRunning() {
+        final TestSubscriber<Object> ts = new TestSubscriber<>();
+
+        Flowable.fromCompletable(Completable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                ts.cancel();
+            }
+        }))
+        .subscribeWith(ts)
+        .assertEmpty();
+
+        assertTrue(ts.isCancelled());
+    }
+
+    @Test
+    public void asyncFused() throws Throwable {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Action action = mock(Action.class);
+
+        Flowable.fromCompletable(Completable.fromAction(action))
+        .subscribe(ts);
+
+        ts.assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+
+        verify(action).run();
+    }
+
+    @Test
+    public void syncFusedRejected() throws Throwable {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Action action = mock(Action.class);
+
+        Flowable.fromCompletable(Completable.fromAction(action))
+        .subscribe(ts);
+
+        ts.assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+
+        verify(action).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java
new file mode 100644
index 0000000000..5eca34f9cb
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
+
+public class FlowableFromMaybeTest extends RxJavaTest {
+
+    @Test
+    public void success() {
+        Flowable.fromMaybe(Maybe.just(1).hide())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void empty() {
+        Flowable.fromMaybe(Maybe.empty().hide())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void error() {
+        Flowable.fromMaybe(Maybe.error(new TestException()).hide())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void cancelComposes() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        TestSubscriber<Integer> ts = Flowable.fromMaybe(ms)
+        .test();
+
+        ts.assertEmpty();
+
+        assertTrue(ms.hasObservers());
+
+        ts.cancel();
+
+        assertFalse(ms.hasObservers());
+    }
+
+    @Test
+    public void asyncFusion() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Flowable.fromMaybe(Maybe.just(1))
+        .subscribe(ts);
+
+        ts
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1);
+    }
+
+    @Test
+    public void syncFusionRejected() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Flowable.fromMaybe(Maybe.just(1))
+        .subscribe(ts);
+
+        ts
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java
index 5689eadf49..0ef64d192c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java
@@ -32,4 +32,14 @@ public void error() {
         .test()
         .assertFailure(TestException.class);
     }
+
+    @Test
+    public void all() {
+        for (BackpressureStrategy mode : BackpressureStrategy.values()) {
+            Flowable.fromObservable(Observable.range(1, 5), mode)
+            .test()
+            .withTag("mode: " + mode)
+            .assertResult(1, 2, 3, 4, 5);
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java
new file mode 100644
index 0000000000..f133c8fb99
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java
@@ -0,0 +1,220 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class FlowableFromRunnableTest extends RxJavaTest {
+    @Test
+    public void fromRunnable() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Flowable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                atomicInteger.incrementAndGet();
+            }
+        })
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromRunnableTwice() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Runnable run = new Runnable() {
+            @Override
+            public void run() {
+                atomicInteger.incrementAndGet();
+            }
+        };
+
+        Flowable.fromRunnable(run)
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+
+        Flowable.fromRunnable(run)
+            .test()
+            .assertResult();
+
+        assertEquals(2, atomicInteger.get());
+    }
+
+    @Test
+    public void fromRunnableInvokesLazy() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Flowable<Object> source = Flowable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                atomicInteger.incrementAndGet();
+            }
+        });
+
+        assertEquals(0, atomicInteger.get());
+
+        source
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromRunnableThrows() {
+        Flowable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                throw new UnsupportedOperationException();
+            }
+        })
+            .test()
+            .assertFailure(UnsupportedOperationException.class);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void callable() throws Throwable {
+        final int[] counter = { 0 };
+
+        Flowable<Void> m = Flowable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                counter[0]++;
+            }
+        });
+
+        assertTrue(m.getClass().toString(), m instanceof Supplier);
+
+        assertNull(((Supplier<Void>)m).get());
+
+        assertEquals(1, counter[0]);
+    }
+
+    @Test
+    public void noErrorLoss() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            final CountDownLatch cdl1 = new CountDownLatch(1);
+            final CountDownLatch cdl2 = new CountDownLatch(1);
+
+            TestSubscriber<Object> ts = Flowable.fromRunnable(new Runnable() {
+                @Override
+                public void run() {
+                    cdl1.countDown();
+                    try {
+                        cdl2.await(5, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                        throw new TestException(e);
+                    }
+                }
+            }).subscribeOn(Schedulers.single()).test();
+
+            assertTrue(cdl1.await(5, TimeUnit.SECONDS));
+
+            ts.cancel();
+
+            int timeout = 10;
+
+            while (timeout-- > 0 && errors.isEmpty()) {
+                Thread.sleep(100);
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void disposedUpfront() throws Throwable {
+        Runnable run = mock(Runnable.class);
+
+        Flowable.fromRunnable(run)
+        .test(1L, true)
+        .assertEmpty();
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void cancelWhileRunning() {
+        final TestSubscriber<Object> ts = new TestSubscriber<>();
+
+        Flowable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                ts.cancel();
+            }
+        })
+        .subscribeWith(ts)
+        .assertEmpty();
+
+        assertTrue(ts.isCancelled());
+    }
+
+    @Test
+    public void asyncFused() throws Throwable {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Runnable action = mock(Runnable.class);
+
+        Flowable.fromRunnable(action)
+        .subscribe(ts);
+
+        ts.assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+
+        verify(action).run();
+    }
+
+    @Test
+    public void syncFusedRejected() throws Throwable {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Runnable action = mock(Runnable.class);
+
+        Flowable.fromRunnable(action)
+        .subscribe(ts);
+
+        ts.assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+
+        verify(action).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java
new file mode 100644
index 0000000000..01f6b1661f
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
+
+public class FlowableFromSingleTest extends RxJavaTest {
+
+    @Test
+    public void success() {
+        Flowable.fromSingle(Single.just(1).hide())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void error() {
+        Flowable.fromSingle(Single.error(new TestException()).hide())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void cancelComposes() {
+        SingleSubject<Integer> ms = SingleSubject.create();
+
+        TestSubscriber<Integer> ts = Flowable.fromSingle(ms)
+        .test();
+
+        ts.assertEmpty();
+
+        assertTrue(ms.hasObservers());
+
+        ts.cancel();
+
+        assertFalse(ms.hasObservers());
+    }
+
+    @Test
+    public void asyncFusion() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Flowable.fromSingle(Single.just(1))
+        .subscribe(ts);
+
+        ts
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1);
+    }
+
+    @Test
+    public void syncFusionRejected() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Flowable.fromSingle(Single.just(1))
+        .subscribe(ts);
+
+        ts
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromObservableTest.java
new file mode 100644
index 0000000000..de2039a4d0
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromObservableTest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class MaybeFromObservableTest extends RxJavaTest {
+
+    @Test
+    public void empty() {
+        Maybe.fromObservable(Observable.empty().hide())
+            .test()
+            .assertResult();
+    }
+
+    @Test
+    public void just() {
+        Maybe.fromObservable(Observable.just(1).hide())
+            .test()
+            .assertResult(1);
+    }
+
+    @Test
+    public void range() {
+        Maybe.fromObservable(Observable.range(1, 5).hide())
+            .test()
+            .assertResult(1);
+    }
+
+    @Test
+    public void error() {
+        Maybe.fromObservable(Observable.error(new TestException()).hide())
+            .test()
+            .assertFailure(TestException.class);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromPubisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromPubisherTest.java
new file mode 100644
index 0000000000..bcbef3dc9f
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromPubisherTest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class MaybeFromPubisherTest extends RxJavaTest {
+
+    @Test
+    public void empty() {
+        Maybe.fromPublisher(Flowable.empty().hide())
+            .test()
+            .assertResult();
+    }
+
+    @Test
+    public void just() {
+        Maybe.fromPublisher(Flowable.just(1).hide())
+            .test()
+            .assertResult(1);
+    }
+
+    @Test
+    public void range() {
+        Maybe.fromPublisher(Flowable.range(1, 5).hide())
+            .test()
+            .assertResult(1);
+    }
+
+    @Test
+    public void error() {
+        Maybe.fromPublisher(Flowable.error(new TestException()).hide())
+            .test()
+            .assertFailure(TestException.class);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java
new file mode 100644
index 0000000000..2b6d80896a
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java
@@ -0,0 +1,214 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class ObservableFromActionTest extends RxJavaTest {
+    @Test
+    public void fromAction() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Observable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        })
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromActionTwice() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Action run = new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        };
+
+        Observable.fromAction(run)
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+
+        Observable.fromAction(run)
+            .test()
+            .assertResult();
+
+        assertEquals(2, atomicInteger.get());
+    }
+
+    @Test
+    public void fromActionInvokesLazy() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Observable<Object> source = Observable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        });
+
+        assertEquals(0, atomicInteger.get());
+
+        source
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromActionThrows() {
+        Observable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                throw new UnsupportedOperationException();
+            }
+        })
+            .test()
+            .assertFailure(UnsupportedOperationException.class);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void callable() throws Throwable {
+        final int[] counter = { 0 };
+
+        Observable<Void> m = Observable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                counter[0]++;
+            }
+        });
+
+        assertTrue(m.getClass().toString(), m instanceof Supplier);
+
+        assertNull(((Supplier<Void>)m).get());
+
+        assertEquals(1, counter[0]);
+    }
+
+    @Test
+    public void noErrorLoss() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            final CountDownLatch cdl1 = new CountDownLatch(1);
+            final CountDownLatch cdl2 = new CountDownLatch(1);
+
+            TestObserver<Object> to = Observable.fromAction(new Action() {
+                @Override
+                public void run() throws Exception {
+                    cdl1.countDown();
+                    cdl2.await(5, TimeUnit.SECONDS);
+                }
+            }).subscribeOn(Schedulers.single()).test();
+
+            assertTrue(cdl1.await(5, TimeUnit.SECONDS));
+
+            to.dispose();
+
+            int timeout = 10;
+
+            while (timeout-- > 0 && errors.isEmpty()) {
+                Thread.sleep(100);
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, InterruptedException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void disposedUpfront() throws Throwable {
+        Action run = mock(Action.class);
+
+        Observable.fromAction(run)
+        .test(true)
+        .assertEmpty();
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void cancelWhileRunning() {
+        final TestObserver<Object> to = new TestObserver<>();
+
+        Observable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                to.dispose();
+            }
+        })
+        .subscribeWith(to)
+        .assertEmpty();
+
+        assertTrue(to.isDisposed());
+    }
+
+    @Test
+    public void asyncFused() throws Throwable {
+        TestObserverEx<Object> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Action action = mock(Action.class);
+
+        Observable.fromAction(action)
+        .subscribe(to);
+
+        to.assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+
+        verify(action).run();
+    }
+
+    @Test
+    public void syncFusedRejected() throws Throwable {
+        TestObserverEx<Object> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Action action = mock(Action.class);
+
+        Observable.fromAction(action)
+        .subscribe(to);
+
+        to.assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+
+        verify(action).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
new file mode 100644
index 0000000000..6cdc0108d6
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
@@ -0,0 +1,195 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class ObservableFromCompletableTest extends RxJavaTest {
+    @Test
+    public void fromCompletable() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Observable.fromCompletable(Completable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        }))
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromCompletableTwice() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Action run = new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        };
+
+        Observable.fromCompletable(Completable.fromAction(run))
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+
+        Observable.fromCompletable(Completable.fromAction(run))
+            .test()
+            .assertResult();
+
+        assertEquals(2, atomicInteger.get());
+    }
+
+    @Test
+    public void fromCompletableInvokesLazy() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Observable<Object> source = Observable.fromCompletable(Completable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                atomicInteger.incrementAndGet();
+            }
+        }));
+
+        assertEquals(0, atomicInteger.get());
+
+        source
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromCompletableThrows() {
+        Observable.fromCompletable(Completable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                throw new UnsupportedOperationException();
+            }
+        }))
+            .test()
+            .assertFailure(UnsupportedOperationException.class);
+    }
+
+    @Test
+    public void noErrorLoss() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            final CountDownLatch cdl1 = new CountDownLatch(1);
+            final CountDownLatch cdl2 = new CountDownLatch(1);
+
+            TestObserver<Object> to = Observable.fromCompletable(Completable.fromAction(new Action() {
+                @Override
+                public void run() throws Exception {
+                    cdl1.countDown();
+                    cdl2.await(5, TimeUnit.SECONDS);
+                }
+            })).subscribeOn(Schedulers.single()).test();
+
+            assertTrue(cdl1.await(5, TimeUnit.SECONDS));
+
+            to.dispose();
+
+            int timeout = 10;
+
+            while (timeout-- > 0 && errors.isEmpty()) {
+                Thread.sleep(100);
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, InterruptedException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void disposedUpfront() throws Throwable {
+        Action run = mock(Action.class);
+
+        Observable.fromCompletable(Completable.fromAction(run))
+        .test(true)
+        .assertEmpty();
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void cancelWhileRunning() {
+        final TestObserver<Object> to = new TestObserver<>();
+
+        Observable.fromCompletable(Completable.fromAction(new Action() {
+            @Override
+            public void run() throws Exception {
+                to.dispose();
+            }
+        }))
+        .subscribeWith(to)
+        .assertEmpty();
+
+        assertTrue(to.isDisposed());
+    }
+
+    @Test
+    public void asyncFused() throws Throwable {
+        TestObserverEx<Object> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Action action = mock(Action.class);
+
+        Observable.fromCompletable(Completable.fromAction(action))
+        .subscribe(to);
+
+        to.assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+
+        verify(action).run();
+    }
+
+    @Test
+    public void syncFusedRejected() throws Throwable {
+        TestObserverEx<Object> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Action action = mock(Action.class);
+
+        Observable.fromCompletable(Completable.fromAction(action))
+        .subscribe(to);
+
+        to.assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+
+        verify(action).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java
new file mode 100644
index 0000000000..185b363d57
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.TestObserverEx;
+
+public class ObservableFromMaybeTest extends RxJavaTest {
+
+    @Test
+    public void success() {
+        Observable.fromMaybe(Maybe.just(1).hide())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void empty() {
+        Observable.fromMaybe(Maybe.empty().hide())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void error() {
+        Observable.fromMaybe(Maybe.error(new TestException()).hide())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void cancelComposes() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        TestObserver<Integer> to = Observable.fromMaybe(ms)
+        .test();
+
+        to.assertEmpty();
+
+        assertTrue(ms.hasObservers());
+
+        to.dispose();
+
+        assertFalse(ms.hasObservers());
+    }
+
+    @Test
+    public void asyncFusion() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Observable.fromMaybe(Maybe.just(1))
+        .subscribe(to);
+
+        to
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1);
+    }
+
+    @Test
+    public void syncFusionRejected() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Observable.fromMaybe(Maybe.just(1))
+        .subscribe(to);
+
+        to
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java
new file mode 100644
index 0000000000..834abbd978
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java
@@ -0,0 +1,220 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class ObservableFromRunnableTest extends RxJavaTest {
+    @Test
+    public void fromRunnable() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Observable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                atomicInteger.incrementAndGet();
+            }
+        })
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromRunnableTwice() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Runnable run = new Runnable() {
+            @Override
+            public void run() {
+                atomicInteger.incrementAndGet();
+            }
+        };
+
+        Observable.fromRunnable(run)
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+
+        Observable.fromRunnable(run)
+            .test()
+            .assertResult();
+
+        assertEquals(2, atomicInteger.get());
+    }
+
+    @Test
+    public void fromRunnableInvokesLazy() {
+        final AtomicInteger atomicInteger = new AtomicInteger();
+
+        Observable<Object> source = Observable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                atomicInteger.incrementAndGet();
+            }
+        });
+
+        assertEquals(0, atomicInteger.get());
+
+        source
+            .test()
+            .assertResult();
+
+        assertEquals(1, atomicInteger.get());
+    }
+
+    @Test
+    public void fromRunnableThrows() {
+        Observable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                throw new UnsupportedOperationException();
+            }
+        })
+            .test()
+            .assertFailure(UnsupportedOperationException.class);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void callable() throws Throwable {
+        final int[] counter = { 0 };
+
+        Observable<Void> m = Observable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                counter[0]++;
+            }
+        });
+
+        assertTrue(m.getClass().toString(), m instanceof Supplier);
+
+        assertNull(((Supplier<Void>)m).get());
+
+        assertEquals(1, counter[0]);
+    }
+
+    @Test
+    public void noErrorLoss() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            final CountDownLatch cdl1 = new CountDownLatch(1);
+            final CountDownLatch cdl2 = new CountDownLatch(1);
+
+            TestObserver<Object> to = Observable.fromRunnable(new Runnable() {
+                @Override
+                public void run() {
+                    cdl1.countDown();
+                    try {
+                        cdl2.await(5, TimeUnit.SECONDS);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                        throw new TestException(e);
+                    }
+                }
+            }).subscribeOn(Schedulers.single()).test();
+
+            assertTrue(cdl1.await(5, TimeUnit.SECONDS));
+
+            to.dispose();
+
+            int timeout = 10;
+
+            while (timeout-- > 0 && errors.isEmpty()) {
+                Thread.sleep(100);
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void disposedUpfront() throws Throwable {
+        Runnable run = mock(Runnable.class);
+
+        Observable.fromRunnable(run)
+        .test(true)
+        .assertEmpty();
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void cancelWhileRunning() {
+        final TestObserver<Object> to = new TestObserver<>();
+
+        Observable.fromRunnable(new Runnable() {
+            @Override
+            public void run() {
+                to.dispose();
+            }
+        })
+        .subscribeWith(to)
+        .assertEmpty();
+
+        assertTrue(to.isDisposed());
+    }
+
+    @Test
+    public void asyncFused() throws Throwable {
+        TestObserverEx<Object> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Runnable action = mock(Runnable.class);
+
+        Observable.fromRunnable(action)
+        .subscribe(to);
+
+        to.assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult();
+
+        verify(action).run();
+    }
+
+    @Test
+    public void syncFusedRejected() throws Throwable {
+        TestObserverEx<Object> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Runnable action = mock(Runnable.class);
+
+        Observable.fromRunnable(action)
+        .subscribe(to);
+
+        to.assertFusionMode(QueueFuseable.NONE)
+        .assertResult();
+
+        verify(action).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java
new file mode 100644
index 0000000000..d77498cea8
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java
@@ -0,0 +1,86 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.TestObserverEx;
+
+public class ObservableFromSingleTest extends RxJavaTest {
+
+    @Test
+    public void success() {
+        Observable.fromSingle(Single.just(1).hide())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void error() {
+        Observable.fromSingle(Single.error(new TestException()).hide())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void cancelComposes() {
+        SingleSubject<Integer> ms = SingleSubject.create();
+
+        TestObserver<Integer> to = Observable.fromSingle(ms)
+        .test();
+
+        to.assertEmpty();
+
+        assertTrue(ms.hasObservers());
+
+        to.dispose();
+
+        assertFalse(ms.hasObservers());
+    }
+
+    @Test
+    public void asyncFusion() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ASYNC);
+
+        Observable.fromSingle(Single.just(1))
+        .subscribe(to);
+
+        to
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(1);
+    }
+
+    @Test
+    public void syncFusionRejected() {
+        TestObserverEx<Integer> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Observable.fromSingle(Single.just(1))
+        .subscribe(to);
+
+        to
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE)
+        .assertResult(1);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromMaybeTest.java
new file mode 100644
index 0000000000..50eed426a7
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromMaybeTest.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.*;
+
+import java.util.NoSuchElementException;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+
+public class SingleFromMaybeTest extends RxJavaTest {
+
+    @Test
+    public void success() {
+        Single.fromMaybe(Maybe.just(1).hide())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void empty() {
+        Single.fromMaybe(Maybe.empty().hide())
+        .test()
+        .assertFailure(NoSuchElementException.class);
+    }
+
+    @Test
+    public void emptyDefault() {
+        Single.fromMaybe(Maybe.empty().hide(), 1)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void error() {
+        Single.fromMaybe(Maybe.error(new TestException()).hide())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void cancelComposes() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        TestObserver<Integer> to = Single.fromMaybe(ms)
+        .test();
+
+        to.assertEmpty();
+
+        assertTrue(ms.hasObservers());
+
+        to.dispose();
+
+        assertFalse(ms.hasObservers());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index d99202adef..60b5a11fb6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -83,6 +83,7 @@ public static void main(String[] args) throws IOException {
             Map<String, Integer> notesMap = new HashMap<>();
             List<String> notesList = new ArrayList<>();
             List<String> tbdList = new ArrayList<>();
+            int[] counters = new int[CLASSES.length];
 
             for (String operatorName : sortedOperators) {
                 out.print("<a name='");
@@ -90,9 +91,11 @@ public static void main(String[] args) throws IOException {
                 out.print("'></a>`");
                 out.print(operatorName);
                 out.print("`|");
+                int m = 0;
                 for (Class<?> clazz : CLASSES) {
                     if (operatorMap.get(clazz).contains(operatorName)) {
                         out.print(PRESENT);
+                        counters[m]++;
                     } else {
                         String notes = findNotes(clazz.getSimpleName(), operatorName);
                         if (notes != null) {
@@ -116,9 +119,19 @@ public static void main(String[] args) throws IOException {
                         }
                     }
                     out.print("|");
+                    m++;
                 }
                 out.println();
             }
+            out.print("<a name='total'></a>**");
+            out.print(sortedOperators.size());
+            out.print(" operators** |");
+            for (int m = 0; m < counters.length; m++) {
+                out.print(" **");
+                out.print(counters[m]);
+                out.print("** |");
+            }
+            out.println();
 
             if (!notesList.isEmpty()) {
                 out.println();
@@ -316,6 +329,7 @@ static String findNotes(String clazzName, String operatorName) {
             "    C flattenStreamAsObservable            Always empty thus no items to map.",
             "  MSC forEach                              Use [`subscribe()`](#subscribe).",
             "  MSC forEachWhile                         Use [`subscribe()`](#subscribe).",
+            "   S  fromAction                           Never empty.",
             "  M   fromArray                            At most one item. Use [`just()`](#just) or [`empty()`](#empty).",
             "   S  fromArray                            Always one item. Use [`just()`](#just).",
             "    C fromArray                            Always empty. Use [`complete()`](#complete).",
@@ -328,6 +342,7 @@ static String findNotes(String clazzName, String operatorName) {
             " O    fromObservable                       Use [`wrap()`](#wrap).",
             "   S  fromOptional                         Always one item. Use [`just()`](#just).",
             "    C fromOptional                         Always empty. Use [`complete()`](#complete).",
+            "   S  fromRunnable                         Never empty.",
             "   S  fromSingle                           Use [`wrap()`](#wrap).",
             "  M   fromStream                           At most one item. Use [`just()`](#just) or [`empty()`](#empty).",
             "   S  fromStream                           Always one item. Use [`just()`](#just).",
diff --git a/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java b/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
index 14d937502f..a1ad772f05 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
@@ -62,7 +62,7 @@ static void checkInternalOperatorNaming(String baseClassName, String consumerCla
                         fail.append("java.lang.RuntimeException: " + g.getName() + " mentions " + consumerClassName)
                         .append("\r\n at io.reactivex.internal.operators.")
                         .append(baseClassName.toLowerCase()).append(".").append(g.getName().replace(".java", ""))
-                        .append(" (").append(g.getName()).append(":").append(i + 1).append(")\r\n\r\n");
+                        .append(".method(").append(g.getName()).append(":").append(i + 1).append(")\r\n\r\n");
 
                         count++;
                     }
@@ -170,6 +170,9 @@ public void flowableNoObserver() throws Exception {
                 "FlowableCountSingle",
                 "FlowableElementAtMaybe",
                 "FlowableElementAtSingle",
+                "FlowableElementAtMaybePublisher",
+                "FlowableElementAtSinglePublisher",
+                "FlowableFromCompletable",
                 "FlowableSingleSingle",
                 "FlowableSingleMaybe",
                 "FlowableLastMaybe",

From d5449b2fd63c73dea06fbbd5d584bab7b9cfde5d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 26 Jan 2020 10:25:53 +0100
Subject: [PATCH 076/665] 3.x: Add timeInterval & timestamp to M/S (#6874)

* 3.x: Add timeInterval & timestamp to M/S

* Fix null not allowed in Timed

* Fix Timed coverage
---
 docs/Operator-Matrix.md                       |  46 ++--
 .../java/io/reactivex/rxjava3/core/Maybe.java | 228 +++++++++++++++++-
 .../io/reactivex/rxjava3/core/Single.java     | 228 +++++++++++++++++-
 .../operators/maybe/MaybeTimeInterval.java    | 105 ++++++++
 .../operators/single/SingleTimeInterval.java  | 100 ++++++++
 .../reactivex/rxjava3/schedulers/Timed.java   |   6 +-
 .../maybe/MaybeTimeIntervalTest.java          | 111 +++++++++
 .../operators/maybe/MaybeTimestampTest.java   | 111 +++++++++
 .../single/SingleTimeIntervalTest.java        | 103 ++++++++
 .../operators/single/SingleTimestampTest.java | 103 ++++++++
 .../util/OperatorMatrixGenerator.java         |   1 +
 .../rxjava3/schedulers/TimedTest.java         |   2 +-
 .../rxjava3/validators/JavadocWording.java    |   4 +-
 13 files changed, 1114 insertions(+), 34 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeInterval.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeInterval.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeIntervalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimestampTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeIntervalTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimestampTest.java

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index 81e1f7878d..10427533cc 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -58,7 +58,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='defer'></a>`defer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='delay'></a>`delay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='delaySubscription'></a>`delaySubscription`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='dematerialize'></a>`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='dematerialize'></a>`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='distinct'></a>`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='distinctUntilChanged'></a>`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='doAfterNext'></a>`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
@@ -212,10 +212,10 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='throttleLast'></a>`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='throttleLatest'></a>`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='throttleWithTimeout'></a>`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='timeInterval'></a>`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='timeInterval'></a>`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='timeout'></a>`timeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='timer'></a>`timer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='to'></a>`to`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toCompletionStage'></a>`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([98](#notes-98))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -237,7 +237,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([108](#notes-108))</sup>|
 <a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([109](#notes-109))</sup>|
 <a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([110](#notes-110))</sup>|
-<a name='total'></a>**237 operators** | **215** | **209** | **108** | **93** | **76** |
+<a name='total'></a>**237 operators** | **215** | **209** | **111** | **95** | **76** |
 
 #### Notes
 <a name='notes-1'></a><sup>1</sup> Use [`contains()`](#contains).<br/>
@@ -372,25 +372,19 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 17. Single.concatMapMaybe()
 18. Maybe.concatMapSingle()
 19. Single.concatMapSingle()
-20. Maybe.dematerialize()
-21. Maybe.doOnLifecycle()
-22. Single.doOnLifecycle()
-23. Completable.doOnLifecycle()
-24. Single.mergeArray()
-25. Single.mergeArrayDelayError()
-26. Single.ofType()
-27. Completable.onErrorReturn()
-28. Completable.onErrorReturnItem()
-29. Maybe.safeSubscribe()
-30. Single.safeSubscribe()
-31. Completable.safeSubscribe()
-32. Completable.sequenceEqual()
-33. Maybe.startWith()
-34. Single.startWith()
-35. Maybe.timeInterval()
-36. Single.timeInterval()
-37. Completable.timeInterval()
-38. Maybe.timestamp()
-39. Single.timestamp()
-40. Maybe.toFuture()
-41. Completable.toFuture()
+20. Maybe.doOnLifecycle()
+21. Single.doOnLifecycle()
+22. Completable.doOnLifecycle()
+23. Single.mergeArray()
+24. Single.mergeArrayDelayError()
+25. Single.ofType()
+26. Completable.onErrorReturn()
+27. Completable.onErrorReturnItem()
+28. Maybe.safeSubscribe()
+29. Single.safeSubscribe()
+30. Completable.safeSubscribe()
+31. Completable.sequenceEqual()
+32. Maybe.startWith()
+33. Single.startWith()
+34. Maybe.toFuture()
+35. Completable.toFuture()
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 12ab3678e2..03e73abe65 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -34,7 +34,7 @@
 import io.reactivex.rxjava3.internal.util.ErrorMode;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.*;
 
 /**
  * The {@code Maybe} class represents a deferred computation and emission of a single value, no value at all or an exception.
@@ -4991,6 +4991,232 @@ public final <U> Maybe<T> takeUntil(@NonNull Publisher<U> other) {
         return RxJavaPlugins.onAssembly(new MaybeTakeUntilPublisher<>(this, other));
     }
 
+    /**
+     * Measures the time (in milliseconds) between the subscription and success item emission
+     * of the current {@code Maybe} and signals it as a tuple ({@link Timed})
+     * success value.
+     * <p>
+     * <img width="640" height="352" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeInterval.png" alt="">
+     * <p>
+     * If the current {@code Maybe} is empty or fails, the resulting {@code Maybe} will
+     * pass along the signals to the downstream. To measure the time to termination,
+     * use {@link #materialize()} and apply {@link Single#timeInterval()}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timeInterval} uses the {@code computation} {@link Scheduler}
+     *  for determining the current time upon subscription and upon receiving the
+     *  success item from the current {@code Maybe}.</dd>
+     * </dl>
+     * @return the new {@code Maybe} instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
+    public final Maybe<Timed<T>> timeInterval() {
+        return timeInterval(TimeUnit.MILLISECONDS, Schedulers.computation());
+    }
+
+    /**
+     * Measures the time (in milliseconds) between the subscription and success item emission
+     * of the current {@code Maybe} and signals it as a tuple ({@link Timed})
+     * success value.
+     * <p>
+     * <img width="640" height="355" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeInterval.s.png" alt="">
+     * <p>
+     * If the current {@code Maybe} is empty or fails, the resulting {@code Maybe} will
+     * pass along the signals to the downstream. To measure the time to termination,
+     * use {@link #materialize()} and apply {@link Single#timeInterval(Scheduler)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timeInterval} uses the provided {@link Scheduler}
+     *  for determining the current time upon subscription and upon receiving the
+     *  success item from the current {@code Maybe}.</dd>
+     * </dl>
+     * @param scheduler the {@code Scheduler} used for providing the current time
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Maybe<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
+        return timeInterval(TimeUnit.MILLISECONDS, scheduler);
+    }
+
+    /**
+     * Measures the time between the subscription and success item emission
+     * of the current {@code Maybe} and signals it as a tuple ({@link Timed})
+     * success value.
+     * <p>
+     * <img width="640" height="352" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeInterval.png" alt="">
+     * <p>
+     * If the current {@code Maybe} is empty or fails, the resulting {@code Maybe} will
+     * pass along the signals to the downstream. To measure the time to termination,
+     * use {@link #materialize()} and apply {@link Single#timeInterval(TimeUnit)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timeInterval} uses the {@code computation} {@link Scheduler}
+     *  for determining the current time upon subscription and upon receiving the
+     *  success item from the current {@code Maybe}.</dd>
+     * </dl>
+     * @param unit the time unit for measurement
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
+    public final Maybe<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
+        return timeInterval(unit, Schedulers.computation());
+    }
+
+    /**
+     * Measures the time between the subscription and success item emission
+     * of the current {@code Maybe} and signals it as a tuple ({@link Timed})
+     * success value.
+     * <p>
+     * <img width="640" height="355" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeInterval.s.png" alt="">
+     * <p>
+     * If the current {@code Maybe} is empty or fails, the resulting {@code Maybe} will
+     * pass along the signals to the downstream. To measure the time to termination,
+     * use {@link #materialize()} and apply {@link Single#timeInterval(TimeUnit, Scheduler)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timeInterval} uses the provided {@link Scheduler}
+     *  for determining the current time upon subscription and upon receiving the
+     *  success item from the current {@code Maybe}.</dd>
+     * </dl>
+     * @param unit the time unit for measurement
+     * @param scheduler the {@code Scheduler} used for providing the current time
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Maybe<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        return RxJavaPlugins.onAssembly(new MaybeTimeInterval<>(this, unit, scheduler, true));
+    }
+
+    /**
+     * Combines the success value from the current {@code Maybe} with the current time (in milliseconds) of
+     * its reception, using the {@code computation} {@link Scheduler} as time source,
+     * then signals them as a {@link Timed} instance.
+     * <p>
+     * <img width="640" height="352" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timestamp.png" alt="">
+     * <p>
+     * If the current {@code Maybe} is empty or fails, the resulting {@code Maybe} will
+     * pass along the signals to the downstream. To measure the time to termination,
+     * use {@link #materialize()} and apply {@link Single#timestamp()}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timestamp} uses the {@code computation} {@code Scheduler}
+     *  for determining the current time upon receiving the
+     *  success item from the current {@code Maybe}.</dd>
+     * </dl>
+     * @return the new {@code Maybe} instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
+    public final Maybe<Timed<T>> timestamp() {
+        return timestamp(TimeUnit.MILLISECONDS, Schedulers.computation());
+    }
+
+    /**
+     * Combines the success value from the current {@code Maybe} with the current time (in milliseconds) of
+     * its reception, using the given {@link Scheduler} as time source,
+     * then signals them as a {@link Timed} instance.
+     * <p>
+     * <img width="640" height="355" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timestamp.s.png" alt="">
+     * <p>
+     * If the current {@code Maybe} is empty or fails, the resulting {@code Maybe} will
+     * pass along the signals to the downstream. To measure the time to termination,
+     * use {@link #materialize()} and apply {@link Single#timestamp(Scheduler)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timestamp} uses the provided {@code Scheduler}
+     *  for determining the current time upon receiving the
+     *  success item from the current {@code Maybe}.</dd>
+     * </dl>
+     * @param scheduler the {@code Scheduler} used for providing the current time
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Maybe<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
+        return timestamp(TimeUnit.MILLISECONDS, scheduler);
+    }
+
+    /**
+     * Combines the success value from the current {@code Maybe} with the current time of
+     * its reception, using the {@code computation} {@link Scheduler} as time source,
+     * then signals it as a {@link Timed} instance.
+     * <p>
+     * <img width="640" height="352" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timestamp.png" alt="">
+     * <p>
+     * If the current {@code Maybe} is empty or fails, the resulting {@code Maybe} will
+     * pass along the signals to the downstream. To measure the time to termination,
+     * use {@link #materialize()} and apply {@link Single#timestamp(TimeUnit)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timestamp} uses the {@code computation} {@code Scheduler},
+     *  for determining the current time upon receiving the
+     *  success item from the current {@code Maybe}.</dd>
+     * </dl>
+     * @param unit the time unit for measurement
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
+    public final Maybe<Timed<T>> timestamp(@NonNull TimeUnit unit) {
+        return timestamp(unit, Schedulers.computation());
+    }
+
+    /**
+     * Combines the success value from the current {@code Maybe} with the current time of
+     * its reception, using the given {@link Scheduler} as time source,
+     * then signals it as a {@link Timed} instance.
+     * <p>
+     * <img width="640" height="355" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timestamp.s.png" alt="">
+     * <p>
+     * If the current {@code Maybe} is empty or fails, the resulting {@code Maybe} will
+     * pass along the signals to the downstream. To measure the time to termination,
+     * use {@link #materialize()} and apply {@link Single#timestamp(TimeUnit, Scheduler)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timestamp} uses the provided {@code Scheduler},
+     *  which is used for determining the current time upon receiving the
+     *  success item from the current {@code Maybe}.</dd>
+     * </dl>
+     * @param unit the time unit for measurement
+     * @param scheduler the {@code Scheduler} used for providing the current time
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Maybe<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        return RxJavaPlugins.onAssembly(new MaybeTimeInterval<>(this, unit, scheduler, false));
+    }
+
     /**
      * Returns a {@code Maybe} that mirrors the current {@code Maybe} but applies a timeout policy for each emitted
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index a3b536b1f7..697c1355b5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -36,7 +36,7 @@
 import io.reactivex.rxjava3.internal.util.ErrorMode;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.schedulers.*;
 
 /**
  * The {@code Single} class implements the Reactive Pattern for a single value response.
@@ -4137,6 +4137,232 @@ public final Single<T> subscribeOn(@NonNull Scheduler scheduler) {
         return RxJavaPlugins.onAssembly(new SingleSubscribeOn<>(this, scheduler));
     }
 
+    /**
+     * Measures the time (in milliseconds) between the subscription and success item emission
+     * of the current {@code Single} and signals it as a tuple ({@link Timed})
+     * success value.
+     * <p>
+     * <img width="640" height="466" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeInterval.png" alt="">
+     * <p>
+     * If the current {@code Single} fails, the resulting {@code Single} will
+     * pass along the signal to the downstream. To measure the time to error,
+     * use {@link #materialize()} and apply {@link #timeInterval()}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timeInterval} uses the {@code computation} {@link Scheduler}
+     *  for determining the current time upon subscription and upon receiving the
+     *  success item from the current {@code Single}.</dd>
+     * </dl>
+     * @return the new {@code Single} instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
+    public final Single<Timed<T>> timeInterval() {
+        return timeInterval(TimeUnit.MILLISECONDS, Schedulers.computation());
+    }
+
+    /**
+     * Measures the time (in milliseconds) between the subscription and success item emission
+     * of the current {@code Single} and signals it as a tuple ({@link Timed})
+     * success value.
+     * <p>
+     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeInterval.s.png" alt="">
+     * <p>
+     * If the current {@code Single} fails, the resulting {@code Single} will
+     * pass along the signal to the downstream. To measure the time to error,
+     * use {@link #materialize()} and apply {@link #timeInterval(Scheduler)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timeInterval} uses the provided {@link Scheduler}
+     *  for determining the current time upon subscription and upon receiving the
+     *  success item from the current {@code Single}.</dd>
+     * </dl>
+     * @param scheduler the {@code Scheduler} used for providing the current time
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Single<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
+        return timeInterval(TimeUnit.MILLISECONDS, scheduler);
+    }
+
+    /**
+     * Measures the time between the subscription and success item emission
+     * of the current {@code Single} and signals it as a tuple ({@link Timed})
+     * success value.
+     * <p>
+     * <img width="640" height="466" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeInterval.png" alt="">
+     * <p>
+     * If the current {@code Single} fails, the resulting {@code Single} will
+     * pass along the signals to the downstream. To measure the time to error,
+     * use {@link #materialize()} and apply {@link #timeInterval(TimeUnit, Scheduler)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timeInterval} uses the {@code computation} {@link Scheduler}
+     *  for determining the current time upon subscription and upon receiving the
+     *  success item from the current {@code Single}.</dd>
+     * </dl>
+     * @param unit the time unit for measurement
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
+    public final Single<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
+        return timeInterval(unit, Schedulers.computation());
+    }
+
+    /**
+     * Measures the time between the subscription and success item emission
+     * of the current {@code Single} and signals it as a tuple ({@link Timed})
+     * success value.
+     * <p>
+     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeInterval.s.png" alt="">
+     * <p>
+     * If the current {@code Single} is empty or fails, the resulting {@code Single} will
+     * pass along the signals to the downstream. To measure the time to termination,
+     * use {@link #materialize()} and apply {@link #timeInterval(TimeUnit, Scheduler)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timeInterval} uses the provided {@link Scheduler}
+     *  for determining the current time upon subscription and upon receiving the
+     *  success item from the current {@code Single}.</dd>
+     * </dl>
+     * @param unit the time unit for measurement
+     * @param scheduler the {@code Scheduler} used for providing the current time
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Single<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        return RxJavaPlugins.onAssembly(new SingleTimeInterval<>(this, unit, scheduler, true));
+    }
+
+    /**
+     * Combines the success value from the current {@code Single} with the current time (in milliseconds) of
+     * its reception, using the {@code computation} {@link Scheduler} as time source,
+     * then signals them as a {@link Timed} instance.
+     * <p>
+     * <img width="640" height="465" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timestamp.png" alt="">
+     * <p>
+     * If the current {@code Single} is empty or fails, the resulting {@code Single} will
+     * pass along the signals to the downstream. To get the timestamp of the error,
+     * use {@link #materialize()} and apply {@link #timestamp()}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timestamp} uses the {@code computation} {@code Scheduler}
+     *  for determining the current time upon receiving the
+     *  success item from the current {@code Single}.</dd>
+     * </dl>
+     * @return the new {@code Single} instance
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
+    public final Single<Timed<T>> timestamp() {
+        return timestamp(TimeUnit.MILLISECONDS, Schedulers.computation());
+    }
+
+    /**
+     * Combines the success value from the current {@code Single} with the current time (in milliseconds) of
+     * its reception, using the given {@link Scheduler} as time source,
+     * then signals them as a {@link Timed} instance.
+     * <p>
+     * <img width="640" height="465" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timestamp.s.png" alt="">
+     * <p>
+     * If the current {@code Single} is empty or fails, the resulting {@code Single} will
+     * pass along the signals to the downstream. To get the timestamp of the error,
+     * use {@link #materialize()} and apply {@link #timestamp(Scheduler)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timestamp} uses the provided {@code Scheduler}
+     *  for determining the current time upon receiving the
+     *  success item from the current {@code Single}.</dd>
+     * </dl>
+     * @param scheduler the {@code Scheduler} used for providing the current time
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code scheduler} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Single<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
+        return timestamp(TimeUnit.MILLISECONDS, scheduler);
+    }
+
+    /**
+     * Combines the success value from the current {@code Single} with the current time of
+     * its reception, using the {@code computation} {@link Scheduler} as time source,
+     * then signals it as a {@link Timed} instance.
+     * <p>
+     * <img width="640" height="465" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timestamp.png" alt="">
+     * <p>
+     * If the current {@code Single} is empty or fails, the resulting {@code Single} will
+     * pass along the signals to the downstream. To get the timestamp of the error,
+     * use {@link #materialize()} and apply {@link #timestamp(TimeUnit)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timestamp} uses the {@code computation} {@code Scheduler},
+     *  for determining the current time upon receiving the
+     *  success item from the current {@code Single}.</dd>
+     * </dl>
+     * @param unit the time unit for measurement
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
+    public final Single<Timed<T>> timestamp(@NonNull TimeUnit unit) {
+        return timestamp(unit, Schedulers.computation());
+    }
+
+    /**
+     * Combines the success value from the current {@code Single} with the current time of
+     * its reception, using the given {@link Scheduler} as time source,
+     * then signals it as a {@link Timed} instance.
+     * <p>
+     * <img width="640" height="465" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timestamp.s.png" alt="">
+     * <p>
+     * If the current {@code Single} is empty or fails, the resulting {@code Single} will
+     * pass along the signals to the downstream. To get the timestamp of the error,
+     * use {@link #materialize()} and apply {@link #timestamp(TimeUnit, Scheduler)}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code timestamp} uses the provided {@code Scheduler},
+     *  which is used for determining the current time upon receiving the
+     *  success item from the current {@code Single}.</dd>
+     * </dl>
+     * @param unit the time unit for measurement
+     * @param scheduler the {@code Scheduler} used for providing the current time
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Single<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        return RxJavaPlugins.onAssembly(new SingleTimeInterval<>(this, unit, scheduler, false));
+    }
+
     /**
      * Returns a {@code Single} that emits the item emitted by the current {@code Single} until a {@link CompletableSource} terminates. Upon
      * termination of {@code other}, this will emit a {@link CancellationException} rather than go to
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeInterval.java
new file mode 100644
index 0000000000..af30ee3a1d
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeInterval.java
@@ -0,0 +1,105 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.schedulers.Timed;
+
+/**
+ * Measures the time between subscription and the success item emission
+ * from the upstream and emits this as a {@link Timed} success value.
+ * @param <T> the element type of the sequence
+ * @since 3.0.0
+ */
+public final class MaybeTimeInterval<T> extends Maybe<Timed<T>> {
+
+    final MaybeSource<T> source;
+
+    final TimeUnit unit;
+
+    final Scheduler scheduler;
+
+    final boolean start;
+
+    public MaybeTimeInterval(MaybeSource<T> source, TimeUnit unit, Scheduler scheduler, boolean start) {
+        this.source = source;
+        this.unit = unit;
+        this.scheduler = scheduler;
+        this.start = start;
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull MaybeObserver<? super @NonNull Timed<T>> observer) {
+        source.subscribe(new TimeIntervalMaybeObserver<>(observer, unit, scheduler, start));
+    }
+
+    static final class TimeIntervalMaybeObserver<T> implements MaybeObserver<T>, Disposable {
+
+        final MaybeObserver<? super Timed<T>> downstream;
+
+        final TimeUnit unit;
+
+        final Scheduler scheduler;
+
+        final long startTime;
+
+        Disposable upstream;
+
+        TimeIntervalMaybeObserver(MaybeObserver<? super Timed<T>> downstream, TimeUnit unit, Scheduler scheduler, boolean start) {
+            this.downstream = downstream;
+            this.unit = unit;
+            this.scheduler = scheduler;
+            this.startTime = start ? scheduler.now(unit) : 0L;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(@NonNull T t) {
+            downstream.onSuccess(new Timed<>(t, scheduler.now(unit) - startTime, unit));
+        }
+
+        @Override
+        public void onError(@NonNull Throwable e) {
+            downstream.onError(e);
+        }
+
+        @Override
+        public void onComplete() {
+            downstream.onComplete();
+        }
+
+        @Override
+        public void dispose() {
+            upstream.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeInterval.java
new file mode 100644
index 0000000000..2eac3bbc3a
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeInterval.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import java.util.concurrent.TimeUnit;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.schedulers.Timed;
+
+/**
+ * Measures the time between subscription and the success item emission
+ * from the upstream and emits this as a {@link Timed} success value.
+ * @param <T> the element type of the sequence
+ * @since 3.0.0
+ */
+public final class SingleTimeInterval<T> extends Single<Timed<T>> {
+
+    final SingleSource<T> source;
+
+    final TimeUnit unit;
+
+    final Scheduler scheduler;
+
+    final boolean start;
+
+    public SingleTimeInterval(SingleSource<T> source, TimeUnit unit, Scheduler scheduler, boolean start) {
+        this.source = source;
+        this.unit = unit;
+        this.scheduler = scheduler;
+        this.start = start;
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull SingleObserver<? super @NonNull Timed<T>> observer) {
+        source.subscribe(new TimeIntervalSingleObserver<>(observer, unit, scheduler, start));
+    }
+
+    static final class TimeIntervalSingleObserver<T> implements SingleObserver<T>, Disposable {
+
+        final SingleObserver<? super Timed<T>> downstream;
+
+        final TimeUnit unit;
+
+        final Scheduler scheduler;
+
+        final long startTime;
+
+        Disposable upstream;
+
+        TimeIntervalSingleObserver(SingleObserver<? super Timed<T>> downstream, TimeUnit unit, Scheduler scheduler, boolean start) {
+            this.downstream = downstream;
+            this.unit = unit;
+            this.scheduler = scheduler;
+            this.startTime = start ? scheduler.now(unit) : 0L;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(@NonNull T t) {
+            downstream.onSuccess(new Timed<>(t, scheduler.now(unit) - startTime, unit));
+        }
+
+        @Override
+        public void onError(@NonNull Throwable e) {
+            downstream.onError(e);
+        }
+
+        @Override
+        public void dispose() {
+            upstream.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
index 814b223dcf..a7b6cc46e7 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
@@ -33,10 +33,10 @@ public final class Timed<T> {
      * @param value the value to hold
      * @param time the time to hold
      * @param unit the time unit, not null
-     * @throws NullPointerException if unit is {@code null}
+     * @throws NullPointerException if {@code value} or {@code unit} is {@code null}
      */
     public Timed(@NonNull T value, long time, @NonNull TimeUnit unit) {
-        this.value = value;
+        this.value = Objects.requireNonNull(value, "value is null");
         this.time = time;
         this.unit = Objects.requireNonNull(unit, "unit is null");
     }
@@ -89,7 +89,7 @@ public boolean equals(Object other) {
 
     @Override
     public int hashCode() {
-         int h = value != null ? value.hashCode() : 0;
+         int h = value.hashCode();
          h = h * 31 + (int)((time >>> 31) ^ time);
          h = h * 31 + unit.hashCode();
          return h;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeIntervalTest.java
new file mode 100644
index 0000000000..30b770aed4
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeIntervalTest.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeTimeIntervalTest {
+
+    @Test
+    public void just() {
+        Maybe.just(1)
+        .timeInterval()
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void empty() {
+        Maybe.empty()
+        .timeInterval()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void error() {
+        Maybe.error(new TestException())
+        .timeInterval()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void justSeconds() {
+        Maybe.just(1)
+        .timeInterval(TimeUnit.SECONDS)
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void justScheduler() {
+        Maybe.just(1)
+        .timeInterval(Schedulers.single())
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void justSecondsScheduler() {
+        Maybe.just(1)
+        .timeInterval(TimeUnit.SECONDS, Schedulers.single())
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybe(m -> m.timeInterval());
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(MaybeSubject.create().timeInterval());
+    }
+
+    @Test
+    public void timeInfo() {
+        TestScheduler scheduler = new TestScheduler();
+
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        TestObserver<Timed<Integer>> to = ms
+        .timeInterval(scheduler)
+        .test();
+
+        scheduler.advanceTimeBy(1000, TimeUnit.MILLISECONDS);
+
+        ms.onSuccess(1);
+
+        to.assertResult(new Timed<>(1, 1000L, TimeUnit.MILLISECONDS));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimestampTest.java
new file mode 100644
index 0000000000..1ce230f8d0
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimestampTest.java
@@ -0,0 +1,111 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeTimestampTest {
+
+    @Test
+    public void just() {
+        Maybe.just(1)
+        .timestamp()
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void empty() {
+        Maybe.empty()
+        .timestamp()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void error() {
+        Maybe.error(new TestException())
+        .timestamp()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void justSeconds() {
+        Maybe.just(1)
+        .timestamp(TimeUnit.SECONDS)
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void justScheduler() {
+        Maybe.just(1)
+        .timestamp(Schedulers.single())
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void justSecondsScheduler() {
+        Maybe.just(1)
+        .timestamp(TimeUnit.SECONDS, Schedulers.single())
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybe(m -> m.timestamp());
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(MaybeSubject.create().timestamp());
+    }
+
+    @Test
+    public void timeInfo() {
+        TestScheduler scheduler = new TestScheduler();
+
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        TestObserver<Timed<Integer>> to = ms
+        .timestamp(scheduler)
+        .test();
+
+        scheduler.advanceTimeBy(1000, TimeUnit.MILLISECONDS);
+
+        ms.onSuccess(1);
+
+        to.assertResult(new Timed<>(1, 1000L, TimeUnit.MILLISECONDS));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeIntervalTest.java
new file mode 100644
index 0000000000..09dd26eeba
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeIntervalTest.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleTimeIntervalTest {
+
+    @Test
+    public void just() {
+        Single.just(1)
+        .timestamp()
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void error() {
+        Single.error(new TestException())
+        .timestamp()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void justSeconds() {
+        Single.just(1)
+        .timestamp(TimeUnit.SECONDS)
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void justScheduler() {
+        Single.just(1)
+        .timestamp(Schedulers.single())
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void justSecondsScheduler() {
+        Single.just(1)
+        .timestamp(TimeUnit.SECONDS, Schedulers.single())
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingle(m -> m.timestamp());
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(SingleSubject.create().timestamp());
+    }
+
+    @Test
+    public void timeInfo() {
+        TestScheduler scheduler = new TestScheduler();
+
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        TestObserver<Timed<Integer>> to = ss
+        .timestamp(scheduler)
+        .test();
+
+        scheduler.advanceTimeBy(1000, TimeUnit.MILLISECONDS);
+
+        ss.onSuccess(1);
+
+        to.assertResult(new Timed<>(1, 1000L, TimeUnit.MILLISECONDS));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimestampTest.java
new file mode 100644
index 0000000000..a282c0345e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimestampTest.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.schedulers.*;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleTimestampTest {
+
+    @Test
+    public void just() {
+        Single.just(1)
+        .timeInterval()
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void error() {
+        Single.error(new TestException())
+        .timeInterval()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void justSeconds() {
+        Single.just(1)
+        .timeInterval(TimeUnit.SECONDS)
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void justScheduler() {
+        Single.just(1)
+        .timeInterval(Schedulers.single())
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void justSecondsScheduler() {
+        Single.just(1)
+        .timeInterval(TimeUnit.SECONDS, Schedulers.single())
+        .test()
+        .assertValueCount(1)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingle(m -> m.timeInterval());
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(SingleSubject.create().timeInterval());
+    }
+
+    @Test
+    public void timeInfo() {
+        TestScheduler scheduler = new TestScheduler();
+
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        TestObserver<Timed<Integer>> to = ss
+        .timeInterval(scheduler)
+        .test();
+
+        scheduler.advanceTimeBy(1000, TimeUnit.MILLISECONDS);
+
+        ss.onSuccess(1);
+
+        to.assertResult(new Timed<>(1, 1000L, TimeUnit.MILLISECONDS));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index 60b5a11fb6..a0ba3e52e4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -458,6 +458,7 @@ static String findNotes(String clazzName, String operatorName) {
             "    C throttleLatest                       Always empty thus no items to work with.",
             "  MS  throttleWithTimeout                  At most one item signaled so no subsequent items to work with.",
             "    C throttleWithTimeout                  Always empty thus no items to work with.",
+            "    C timeInterval                         Always empty thus no items to work with.",
             "    C timestamp                            Always empty thus no items to work with.",
             "FO    toCompletionStage                    Use [`firstStage`](#firstStage), [`lastStage`](#lastStage) or [`singleStage`](#singleStage).",
             "F     toFlowable                           Would be no-op.",
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
index d7a5eb752e..ce117c2fb7 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
@@ -39,7 +39,7 @@ public void hashCodeOf() {
 
         assertEquals(TimeUnit.SECONDS.hashCode() + 31 * (5 + 31 * 1), t1.hashCode());
 
-        Timed<Integer> t2 = new Timed<>(null, 5, TimeUnit.SECONDS);
+        Timed<Integer> t2 = new Timed<>(0, 5, TimeUnit.SECONDS);
 
         assertEquals(TimeUnit.SECONDS.hashCode() + 31 * (5 + 31 * 0), t2.hashCode());
     }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index d351e7809d..e22fdd9521 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -153,12 +153,12 @@ public void maybeDocRefersToMaybeTypes() throws Exception {
                 jdx = 0;
                 for (;;) {
                     int idx = m.javadoc.indexOf("Single", jdx);
-                    if (idx >= 0) {
+                    if (idx >= 0 && m.javadoc.indexOf("Single#", jdx) != idx) {
                         int j = m.javadoc.indexOf("#toSingle", jdx);
                         int k = m.javadoc.indexOf("{@code Single", jdx);
                         if (!m.signature.contains("Single") && (j + 3 != idx && k + 7 != idx)) {
                             e.append("java.lang.RuntimeException: Maybe doc mentions Single but not in the signature\r\n at io.reactivex.rxjava3.core.")
-                            .append("Maybe(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
+                            .append("Maybe.method(Maybe.java:").append(m.javadocLine + lineNumber(m.javadoc, idx) - 1).append(")\r\n\r\n");
                         }
                         jdx = idx + 6;
                     } else {

From 8c85f5a52115b419beeb84b0e2dc9bb4aa6bcd0f Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 26 Jan 2020 12:36:52 +0100
Subject: [PATCH 077/665] 3.x: Add Maybe/Completable toFuture (#6875)

* 3.x: Add Maybe/Completable toFuture

* Fix copy-paste mistakes
---
 .../reactivex/rxjava3/core/Completable.java   | 22 +++++
 .../io/reactivex/rxjava3/core/Flowable.java   |  2 +-
 .../java/io/reactivex/rxjava3/core/Maybe.java | 23 +++++
 .../io/reactivex/rxjava3/core/Observable.java |  2 +-
 .../io/reactivex/rxjava3/core/Single.java     |  4 +-
 ...Observer.java => FutureMultiObserver.java} | 18 +++-
 .../completable/CompletableToFutureTest.java  | 76 +++++++++++++++++
 .../operators/maybe/MaybeToFutureTest.java    | 84 +++++++++++++++++++
 8 files changed, 224 insertions(+), 7 deletions(-)
 rename src/main/java/io/reactivex/rxjava3/internal/observers/{FutureSingleObserver.java => FutureMultiObserver.java} (89%)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFutureTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFutureTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index e965855e00..1c6214e1da 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2892,6 +2892,28 @@ public final <T> Flowable<T> toFlowable() {
         }
         return RxJavaPlugins.onAssembly(new CompletableToFlowable<>(this));
     }
+    /**
+     * Returns a {@link Future} representing the termination of the current {@code Completable}
+     * via a {@code null} value.
+     * <p>
+     * <img width="640" height="433" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Completable.toFuture.png" alt="">
+     * <p>
+     * Cancelling the {@code Future} will cancel the subscription to the current {@code Completable}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @return the new {@code Future} instance
+     * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Future<Void> toFuture() {
+        return subscribeWith(new FutureMultiObserver<>());
+    }
 
     /**
      * Converts this {@code Completable} into a {@link Maybe}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 3d83d477c5..a994e526c5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -6249,7 +6249,7 @@ public final T blockingSingle(@NonNull T defaultItem) {
     /**
      * Returns a {@link Future} representing the only value emitted by this {@code Flowable}.
      * <p>
-     * <img width="640" height="324" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Flowable.toFuture.png" alt="">
+     * <img width="640" height="311" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Flowable.toFuture.png" alt="">
      * <p>
      * If the {@code Flowable} emits more than one item, {@link java.util.concurrent.Future} will receive an
      * {@link java.lang.IndexOutOfBoundsException}. If the {@code Flowable} is empty, {@link java.util.concurrent.Future}
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 03e73abe65..8b1b569aeb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -4166,6 +4166,29 @@ public final Flowable<T> toFlowable() {
         return RxJavaPlugins.onAssembly(new MaybeToFlowable<>(this));
     }
 
+    /**
+     * Returns a {@link Future} representing the single value emitted by the current {@code Maybe}
+     * or {@code null} if the current {@code Maybe} is empty.
+     * <p>
+     * <img width="640" height="292" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Maybe.toFuture.png" alt="">
+     * <p>
+     * Cancelling the {@code Future} will cancel the subscription to the current {@code Maybe}.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @return the new {@code Future} instance
+     * @see <a href="http://reactivex.io/documentation/operators/to.html">ReactiveX documentation: To</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Future<T> toFuture() {
+        return subscribeWith(new FutureMultiObserver<>());
+    }
+
     /**
      * Converts this {@code Maybe} into an {@link Observable} instance composing disposal
      * through.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 89de9dd63e..3ab0be1ab9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -5654,7 +5654,7 @@ public final T blockingSingle(@NonNull T defaultItem) {
     /**
      * Returns a {@link Future} representing the only value emitted by the current {@code Observable}.
      * <p>
-     * <img width="640" height="312" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/toFuture.o.png" alt="">
+     * <img width="640" height="299" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/toFuture.o.png" alt="">
      * <p>
      * If the {@code Observable} emits more than one item, {@code Future} will receive an
      * {@link IndexOutOfBoundsException}. If the {@code Observable} is empty, {@code Future}
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 697c1355b5..a283d9eef0 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -4625,6 +4625,8 @@ public final Flowable<T> toFlowable() {
      * Returns a {@link Future} representing the single value emitted by this {@code Single}.
      * <p>
      * <img width="640" height="467" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Single.toFuture.png" alt="">
+     * <p>
+     * Cancelling the {@code Future} will cancel the subscription to the current {@code Single}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toFuture} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4637,7 +4639,7 @@ public final Flowable<T> toFlowable() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Future<T> toFuture() {
-        return subscribeWith(new FutureSingleObserver<>());
+        return subscribeWith(new FutureMultiObserver<>());
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserver.java
similarity index 89%
rename from src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java
rename to src/main/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserver.java
index 3e55963bea..e2f2aeea5a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserver.java
@@ -19,7 +19,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.core.SingleObserver;
+import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 import io.reactivex.rxjava3.internal.util.BlockingHelper;
@@ -31,15 +31,15 @@
  *
  * @param <T> the value type
  */
-public final class FutureSingleObserver<T> extends CountDownLatch
-implements SingleObserver<T>, Future<T>, Disposable {
+public final class FutureMultiObserver<T> extends CountDownLatch
+implements MaybeObserver<T>, SingleObserver<T>, CompletableObserver, Future<T>, Disposable {
 
     T value;
     Throwable error;
 
     final AtomicReference<Disposable> upstream;
 
-    public FutureSingleObserver() {
+    public FutureMultiObserver() {
         super(1);
         this.upstream = new AtomicReference<>();
     }
@@ -141,6 +141,16 @@ public void onError(Throwable t) {
         }
     }
 
+    @Override
+    public void onComplete() {
+        Disposable a = upstream.get();
+        if (a == DisposableHelper.DISPOSED) {
+            return;
+        }
+        upstream.compareAndSet(a, this);
+        countDown();
+    }
+
     @Override
     public void dispose() {
         // ignoring as `this` means a finished Disposable only
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFutureTest.java
new file mode 100644
index 0000000000..7501a2fe85
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFutureTest.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.junit.Assert.*;
+
+import java.util.concurrent.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+
+public class CompletableToFutureTest extends RxJavaTest {
+
+    @Test
+    public void empty() throws Exception {
+        assertNull(Completable.complete()
+        .subscribeOn(Schedulers.computation())
+        .toFuture()
+        .get());
+    }
+
+    @Test
+    public void error() throws InterruptedException {
+        try {
+            Completable.error(new TestException())
+            .subscribeOn(Schedulers.computation())
+            .toFuture()
+            .get();
+
+            fail("Should have thrown!");
+        } catch (ExecutionException ex) {
+            assertTrue("" + ex.getCause(), ex.getCause() instanceof TestException);
+        }
+    }
+
+    @Test
+    public void cancel() {
+        CompletableSubject cs = CompletableSubject.create();
+
+        Future<Void> f = cs.toFuture();
+
+        assertTrue(cs.hasObservers());
+
+        f.cancel(true);
+
+        assertFalse(cs.hasObservers());
+    }
+
+    @Test
+    public void cancel2() {
+        CompletableSubject cs = CompletableSubject.create();
+
+        Future<Void> f = cs.toFuture();
+
+        assertTrue(cs.hasObservers());
+
+        f.cancel(false);
+
+        assertFalse(cs.hasObservers());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFutureTest.java
new file mode 100644
index 0000000000..37723dc656
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFutureTest.java
@@ -0,0 +1,84 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.junit.Assert.*;
+
+import java.util.concurrent.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+
+public class MaybeToFutureTest extends RxJavaTest {
+
+    @Test
+    public void success() throws Exception {
+        assertEquals((Integer)1, Maybe.just(1)
+        .subscribeOn(Schedulers.computation())
+        .toFuture()
+        .get());
+    }
+
+    @Test
+    public void empty() throws Exception {
+        assertNull(Maybe.empty()
+        .subscribeOn(Schedulers.computation())
+        .toFuture()
+        .get());
+    }
+
+    @Test
+    public void error() throws InterruptedException {
+        try {
+            Maybe.error(new TestException())
+            .subscribeOn(Schedulers.computation())
+            .toFuture()
+            .get();
+
+            fail("Should have thrown!");
+        } catch (ExecutionException ex) {
+            assertTrue("" + ex.getCause(), ex.getCause() instanceof TestException);
+        }
+    }
+
+    @Test
+    public void cancel() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        Future<Integer> f = ms.toFuture();
+
+        assertTrue(ms.hasObservers());
+
+        f.cancel(true);
+
+        assertFalse(ms.hasObservers());
+    }
+
+    @Test
+    public void cancel2() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        Future<Integer> f = ms.toFuture();
+
+        assertTrue(ms.hasObservers());
+
+        f.cancel(false);
+
+        assertFalse(ms.hasObservers());
+    }
+}

From db0bd715bb512976fb0cac20a89af8176b1e1b22 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 26 Jan 2020 15:44:47 +0100
Subject: [PATCH 078/665] 3.x: Add Single.ofType (#6876)

---
 .../java/io/reactivex/rxjava3/core/Maybe.java |  6 +-
 .../io/reactivex/rxjava3/core/Single.java     | 24 +++++
 .../operators/single/SingleOfTypeTest.java    | 96 +++++++++++++++++++
 .../rxjava3/testsupport/TestHelper.java       | 24 +++++
 4 files changed, 147 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOfTypeTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 8b1b569aeb..b2a6465eae 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -3472,7 +3472,7 @@ public final Maybe<T> doOnSuccess(@NonNull Consumer<? super T> onSuccess) {
      * Filters the success item of the {@code Maybe} via a predicate function and emitting it if the predicate
      * returns {@code true}, completing otherwise.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.png" alt="">
+     * <img width="640" height="291" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.filter.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code filter} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4098,10 +4098,10 @@ public final Maybe<T> observeOn(@NonNull Scheduler scheduler) {
     }
 
     /**
-     * Filters the items emitted by a {@code Maybe}, only emitting its success value if that
+     * Filters the items emitted by the current {@code Maybe}, only emitting its success value if that
      * is an instance of the supplied {@link Class}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.png" alt="">
+     * <img width="640" height="291" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.ofType.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ofType} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index a283d9eef0..12400b1fd0 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -3439,6 +3439,30 @@ public final Single<Boolean> contains(@NonNull Object item, @NonNull BiPredicate
     public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
         return merge(this, other);
     }
+    /**
+     * Filters the items emitted by the current {@code Single}, only emitting its success value if that
+     * is an instance of the supplied {@link Class}.
+     * <p>
+     * <img width="640" height="399" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ofType.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code ofType} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <U> the output type
+     * @param clazz
+     *            the class type to filter the items emitted by the current {@code Single}
+     * @return the new {@link Maybe} instance
+     * @throws NullPointerException if {@code clazz} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <U> Maybe<U> ofType(@NonNull Class<U> clazz) {
+        Objects.requireNonNull(clazz, "clazz is null");
+        return filter(Functions.isInstanceOf(clazz)).cast(clazz);
+    }
 
     /**
      * Signals the success item or the terminal signals of the current {@code Single} on the specified {@link Scheduler},
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOfTypeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOfTypeTest.java
new file mode 100644
index 0000000000..3ce3a0d15e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOfTypeTest.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleOfTypeTest extends RxJavaTest {
+
+    @Test
+    public void normal() {
+        Single.just(1).ofType(Integer.class)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void normalDowncast() {
+        TestObserver<Number> to = Single.just(1)
+        .ofType(Number.class)
+        .test();
+        // don't make this fluent, target type required!
+        to.assertResult((Number)1);
+    }
+
+    @Test
+    public void notInstance() {
+        TestObserver<String> to = Single.just(1)
+        .ofType(String.class)
+        .test();
+        // don't make this fluent, target type required!
+        to.assertResult();
+    }
+
+    @Test
+    public void error() {
+        TestObserver<Number> to = Single.<Integer>error(new TestException())
+        .ofType(Number.class)
+        .test();
+        // don't make this fluent, target type required!
+        to.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void errorNotInstance() {
+        TestObserver<String> to = Single.<Integer>error(new TestException())
+        .ofType(String.class)
+        .test();
+        // don't make this fluent, target type required!
+        to.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposedSingleToMaybe(new Function<Single<Object>, Maybe<Object>>() {
+            @Override
+            public Maybe<Object> apply(Single<Object> m) throws Exception {
+                return m.ofType(Object.class);
+            }
+        });
+    }
+
+    @Test
+    public void isDisposed() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestHelper.checkDisposed(pp.singleElement().ofType(Object.class));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingleToMaybe(new Function<Single<Object>, Maybe<Object>>() {
+            @Override
+            public Maybe<Object> apply(Single<Object> f) throws Exception {
+                return f.ofType(Object.class);
+            }
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index f50354b6a5..bb6608e96d 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -2248,6 +2248,30 @@ public static <T, U> void checkDisposedMaybeToSingle(Function<Maybe<T>, ? extend
         assertFalse(pp.hasSubscribers());
     }
 
+    /**
+     * Check if the operator applied to a Maybe source propagates dispose properly.
+     * @param <T> the source value type
+     * @param <U> the output value type
+     * @param composer the function to apply an operator to the provided Maybe source
+     */
+    public static <T, U> void checkDisposedSingleToMaybe(Function<Single<T>, ? extends MaybeSource<U>> composer) {
+        PublishProcessor<T> pp = PublishProcessor.create();
+
+        TestSubscriber<U> ts = new TestSubscriber<>();
+
+        try {
+            new MaybeToFlowable<>(composer.apply(pp.singleOrError())).subscribe(ts);
+        } catch (Throwable ex) {
+            throw ExceptionHelper.wrapOrThrow(ex);
+        }
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.cancel();
+
+        assertFalse(pp.hasSubscribers());
+    }
+
     /**
      * Check if the TestSubscriber has a CompositeException with the specified class
      * of Throwables in the given order.

From 4257ef563a3bf017e0703c00057daf12b54738ba Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 26 Jan 2020 17:50:26 +0100
Subject: [PATCH 079/665] 3.x: Add doOnLifecycle to M/S/C (#6877)

---
 docs/Operator-Matrix.md                       |  34 ++--
 .../reactivex/rxjava3/core/Completable.java   |  29 +++
 .../java/io/reactivex/rxjava3/core/Maybe.java |  28 +++
 .../io/reactivex/rxjava3/core/Single.java     |  29 +++
 .../operators/maybe/MaybeDoOnLifecycle.java   | 125 +++++++++++++
 .../operators/single/SingleDoOnLifecycle.java | 119 +++++++++++++
 .../CompletableDoOnLifecycleTest.java         | 153 ++++++++++++++++
 .../maybe/MaybeDoOnLifecycleTest.java         | 168 ++++++++++++++++++
 .../single/SingleDoOnLifecycleTest.java       | 152 ++++++++++++++++
 9 files changed, 817 insertions(+), 20 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycle.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycle.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnLifecycleTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycleTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycleTest.java

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index 10427533cc..a44eed94ec 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -71,7 +71,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='doOnEach'></a>`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='doOnError'></a>`doOnError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='doOnEvent'></a>`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([46](#notes-46))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([46](#notes-46))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnLifecycle'></a>`doOnLifecycle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='doOnLifecycle'></a>`doOnLifecycle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='doOnNext'></a>`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([47](#notes-47))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([47](#notes-47))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
 <a name='doOnRequest'></a>`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
 <a name='doOnSubscribe'></a>`doOnSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -144,7 +144,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='mergeWith'></a>`mergeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='never'></a>`never`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='observeOn'></a>`observeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='ofType'></a>`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to filter.'>([82](#notes-82))</sup>|
+<a name='ofType'></a>`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to filter.'>([82](#notes-82))</sup>|
 <a name='onBackpressureBuffer'></a>`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
 <a name='onBackpressureDrop'></a>`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
 <a name='onBackpressureLatest'></a>`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
@@ -219,7 +219,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='to'></a>`to`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toCompletionStage'></a>`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([98](#notes-98))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toFuture'></a>`toFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='toFuture'></a>`toFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toList'></a>`toList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
 <a name='toMap'></a>`toMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
 <a name='toMaybe'></a>`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -237,7 +237,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([108](#notes-108))</sup>|
 <a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([109](#notes-109))</sup>|
 <a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([110](#notes-110))</sup>|
-<a name='total'></a>**237 operators** | **215** | **209** | **111** | **95** | **76** |
+<a name='total'></a>**237 operators** | **215** | **209** | **113** | **97** | **78** |
 
 #### Notes
 <a name='notes-1'></a><sup>1</sup> Use [`contains()`](#contains).<br/>
@@ -372,19 +372,13 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 17. Single.concatMapMaybe()
 18. Maybe.concatMapSingle()
 19. Single.concatMapSingle()
-20. Maybe.doOnLifecycle()
-21. Single.doOnLifecycle()
-22. Completable.doOnLifecycle()
-23. Single.mergeArray()
-24. Single.mergeArrayDelayError()
-25. Single.ofType()
-26. Completable.onErrorReturn()
-27. Completable.onErrorReturnItem()
-28. Maybe.safeSubscribe()
-29. Single.safeSubscribe()
-30. Completable.safeSubscribe()
-31. Completable.sequenceEqual()
-32. Maybe.startWith()
-33. Single.startWith()
-34. Maybe.toFuture()
-35. Completable.toFuture()
+20. Single.mergeArray()
+21. Single.mergeArrayDelayError()
+22. Completable.onErrorReturn()
+23. Completable.onErrorReturnItem()
+24. Maybe.safeSubscribe()
+25. Single.safeSubscribe()
+26. Completable.safeSubscribe()
+27. Completable.sequenceEqual()
+28. Maybe.startWith()
+29. Single.startWith()
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 1c6214e1da..9febbd1204 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -18,6 +18,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
@@ -1751,6 +1752,34 @@ public final Completable doOnEvent(@NonNull Consumer<@Nullable ? super Throwable
         return RxJavaPlugins.onAssembly(new CompletableDoOnEvent(this, onEvent));
     }
 
+    /**
+     * Calls the appropriate {@code onXXX} method (shared between all {@link CompletableObserver}s) for the lifecycle events of
+     * the sequence (subscription, disposal).
+     * <p>
+     * <img width="640" height="257" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doOnLifecycle.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code doOnLifecycle} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param onSubscribe
+     *              a {@link Consumer} called with the {@link Disposable} sent via {@link CompletableObserver#onSubscribe(Disposable)}
+     * @param onDispose
+     *              called when the downstream disposes the {@code Disposable} via {@code dispose()}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code onSubscribe} or {@code onDispose} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Completable doOnLifecycle(@NonNull Consumer<? super Disposable> onSubscribe, @NonNull Action onDispose) {
+        return doOnLifecycle(onSubscribe, Functions.emptyConsumer(),
+                Functions.EMPTY_ACTION, Functions.EMPTY_ACTION,
+                Functions.EMPTY_ACTION, onDispose);
+    }
+
     /**
      * Returns a {@code Completable} instance that calls the various callbacks upon the specific
      * lifecycle events.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index b2a6465eae..b3ed8213d4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -3388,6 +3388,34 @@ public final Maybe<T> doOnEvent(@NonNull BiConsumer<@Nullable ? super T, @Nullab
         return RxJavaPlugins.onAssembly(new MaybeDoOnEvent<>(this, onEvent));
     }
 
+    /**
+     * Calls the appropriate {@code onXXX} method (shared between all {@link MaybeObserver}s) for the lifecycle events of
+     * the sequence (subscription, disposal).
+     * <p>
+     * <img width="640" height="183" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.doOnLifecycle.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code doOnLifecycle} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param onSubscribe
+     *              a {@link Consumer} called with the {@link Disposable} sent via {@link MaybeObserver#onSubscribe(Disposable)}
+     * @param onDispose
+     *              called when the downstream disposes the {@code Disposable} via {@code dispose()}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code onSubscribe} or {@code onDispose} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Maybe<T> doOnLifecycle(@NonNull Consumer<? super Disposable> onSubscribe, @NonNull Action onDispose) {
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onDispose, "onDispose is null");
+        return RxJavaPlugins.onAssembly(new MaybeDoOnLifecycle<>(this, onSubscribe, onDispose));
+    }
+
     /**
      * Calls the shared {@link Consumer} with the {@link Disposable} sent through the {@code onSubscribe} for each
      * {@link MaybeObserver} that subscribes to the current {@code Maybe}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 12400b1fd0..81b0aaaffe 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -2684,6 +2684,34 @@ public final Single<T> doFinally(@NonNull Action onFinally) {
         return RxJavaPlugins.onAssembly(new SingleDoFinally<>(this, onFinally));
     }
 
+    /**
+     * Calls the appropriate {@code onXXX} method (shared between all {@link SingleObserver}s) for the lifecycle events of
+     * the sequence (subscription, disposal).
+     * <p>
+     * <img width="640" height="232" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnLifecycle.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code doOnLifecycle} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param onSubscribe
+     *              a {@link Consumer} called with the {@link Disposable} sent via {@link SingleObserver#onSubscribe(Disposable)}
+     * @param onDispose
+     *              called when the downstream disposes the {@code Disposable} via {@code dispose()}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onSubscribe} or {@code onDispose} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Single<T> doOnLifecycle(@NonNull Consumer<? super Disposable> onSubscribe, @NonNull Action onDispose) {
+        Objects.requireNonNull(onSubscribe, "onSubscribe is null");
+        Objects.requireNonNull(onDispose, "onDispose is null");
+        return RxJavaPlugins.onAssembly(new SingleDoOnLifecycle<>(this, onSubscribe, onDispose));
+    }
+
     /**
      * Calls the shared consumer with the {@link Disposable} sent through the {@code onSubscribe} for each
      * {@link SingleObserver} that subscribes to the current {@code Single}.
@@ -3455,6 +3483,7 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
      * @return the new {@link Maybe} instance
      * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/filter.html">ReactiveX operators documentation: Filter</a>
+     * @since 3.0.0
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycle.java
new file mode 100644
index 0000000000..3355c79014
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycle.java
@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Invokes callbacks upon {@code onSubscribe} from upstream and
+ * {@code dispose} from downstream.
+ *
+ * @param <T> the element type of the flow
+ * @since 3.0.0
+ */
+public final class MaybeDoOnLifecycle<T> extends AbstractMaybeWithUpstream<T, T> {
+
+    final Consumer<? super Disposable> onSubscribe;
+
+    final Action onDispose;
+
+    public MaybeDoOnLifecycle(Maybe<T> upstream, Consumer<? super Disposable> onSubscribe,
+            Action onDispose) {
+        super(upstream);
+        this.onSubscribe = onSubscribe;
+        this.onDispose = onDispose;
+    }
+
+    @Override
+    protected void subscribeActual(MaybeObserver<? super T> observer) {
+        source.subscribe(new MaybeLifecycleObserver<>(observer, onSubscribe, onDispose));
+    }
+
+    static final class MaybeLifecycleObserver<T> implements MaybeObserver<T>, Disposable {
+
+        final MaybeObserver<? super T> downstream;
+
+        final Consumer<? super Disposable> onSubscribe;
+
+        final Action onDispose;
+
+        Disposable upstream;
+
+        MaybeLifecycleObserver(MaybeObserver<? super T> downstream, Consumer<? super Disposable> onSubscribe, Action onDispose) {
+            this.downstream = downstream;
+            this.onSubscribe = onSubscribe;
+            this.onDispose = onDispose;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Disposable d) {
+            // this way, multiple calls to onSubscribe can show up in tests that use doOnSubscribe to validate behavior
+            try {
+                onSubscribe.accept(d);
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                d.dispose();
+                this.upstream = DisposableHelper.DISPOSED;
+                EmptyDisposable.error(e, downstream);
+                return;
+            }
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(@NonNull T t) {
+            if (upstream != DisposableHelper.DISPOSED) {
+                upstream = DisposableHelper.DISPOSED;
+                downstream.onSuccess(t);
+            }
+        }
+
+        @Override
+        public void onError(@NonNull Throwable e) {
+            if (upstream != DisposableHelper.DISPOSED) {
+                upstream = DisposableHelper.DISPOSED;
+                downstream.onError(e);
+            } else {
+                RxJavaPlugins.onError(e);
+            }
+        }
+
+        @Override
+        public void onComplete() {
+            if (upstream != DisposableHelper.DISPOSED) {
+                upstream = DisposableHelper.DISPOSED;
+                downstream.onComplete();
+            }
+        }
+
+        @Override
+        public void dispose() {
+            try {
+                onDispose.run();
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                RxJavaPlugins.onError(e);
+            }
+            upstream.dispose();
+            upstream = DisposableHelper.DISPOSED;
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycle.java
new file mode 100644
index 0000000000..288e8970cd
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycle.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.operators.single;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Invokes callbacks upon {@code onSubscribe} from upstream and
+ * {@code dispose} from downstream.
+ *
+ * @param <T> the element type of the flow
+ * @since 3.0.0
+ */
+public final class SingleDoOnLifecycle<T> extends Single<T> {
+
+    final Single<T> source;
+
+    final Consumer<? super Disposable> onSubscribe;
+
+    final Action onDispose;
+
+    public SingleDoOnLifecycle(Single<T> upstream, Consumer<? super Disposable> onSubscribe,
+            Action onDispose) {
+        this.source = upstream;
+        this.onSubscribe = onSubscribe;
+        this.onDispose = onDispose;
+    }
+
+    @Override
+    protected void subscribeActual(SingleObserver<? super T> observer) {
+        source.subscribe(new SingleLifecycleObserver<>(observer, onSubscribe, onDispose));
+    }
+
+    static final class SingleLifecycleObserver<T> implements SingleObserver<T>, Disposable {
+
+        final SingleObserver<? super T> downstream;
+
+        final Consumer<? super Disposable> onSubscribe;
+
+        final Action onDispose;
+
+        Disposable upstream;
+
+        SingleLifecycleObserver(SingleObserver<? super T> downstream, Consumer<? super Disposable> onSubscribe, Action onDispose) {
+            this.downstream = downstream;
+            this.onSubscribe = onSubscribe;
+            this.onDispose = onDispose;
+        }
+
+        @Override
+        public void onSubscribe(@NonNull Disposable d) {
+            // this way, multiple calls to onSubscribe can show up in tests that use doOnSubscribe to validate behavior
+            try {
+                onSubscribe.accept(d);
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                d.dispose();
+                this.upstream = DisposableHelper.DISPOSED;
+                EmptyDisposable.error(e, downstream);
+                return;
+            }
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(@NonNull T t) {
+            if (upstream != DisposableHelper.DISPOSED) {
+                upstream = DisposableHelper.DISPOSED;
+                downstream.onSuccess(t);
+            }
+        }
+
+        @Override
+        public void onError(@NonNull Throwable e) {
+            if (upstream != DisposableHelper.DISPOSED) {
+                upstream = DisposableHelper.DISPOSED;
+                downstream.onError(e);
+            } else {
+                RxJavaPlugins.onError(e);
+            }
+        }
+
+        @Override
+        public void dispose() {
+            try {
+                onDispose.run();
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                RxJavaPlugins.onError(e);
+            }
+            upstream.dispose();
+            upstream = DisposableHelper.DISPOSED;
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnLifecycleTest.java
new file mode 100644
index 0000000000..3e85e1e027
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnLifecycleTest.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class CompletableDoOnLifecycleTest extends RxJavaTest {
+
+    @Test
+    public void empty() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        Completable.complete()
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test()
+        .assertResult();
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose, never()).run();
+    }
+
+    @Test
+    public void error() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        Completable.error(new TestException())
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose, never()).run();
+    }
+
+    @Test
+    public void onSubscribeCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+            Action onDispose = mock(Action.class);
+
+            doThrow(new TestException("First")).when(onSubscribe).accept(any());
+
+            Disposable bs = Disposable.empty();
+
+            new Completable() {
+                @Override
+                protected void subscribeActual(CompletableObserver observer) {
+                    observer.onSubscribe(bs);
+                    observer.onError(new TestException("Second"));
+                    observer.onComplete();
+                }
+            }
+            .doOnLifecycle(onSubscribe, onDispose)
+            .to(TestHelper.<Integer>testConsumer())
+            .assertFailureAndMessage(TestException.class, "First");
+
+            assertTrue(bs.isDisposed());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class, "Second");
+
+            verify(onSubscribe).accept(any());
+            verify(onDispose, never()).run();
+        });
+    }
+
+    @Test
+    public void onDisposeCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+            Action onDispose = mock(Action.class);
+
+            doThrow(new TestException("First")).when(onDispose).run();
+
+            CompletableSubject cs = CompletableSubject.create();
+
+            TestObserver<Void> to = cs
+            .doOnLifecycle(onSubscribe, onDispose)
+            .test();
+
+            assertTrue(cs.hasObservers());
+
+            to.dispose();
+
+            assertFalse(cs.hasObservers());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class, "First");
+
+            verify(onSubscribe).accept(any());
+            verify(onDispose).run();
+        });
+    }
+
+    @Test
+    public void dispose() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        CompletableSubject cs = CompletableSubject.create();
+
+        TestObserver<Void> to = cs
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test();
+
+        assertTrue(cs.hasObservers());
+
+        to.dispose();
+
+        assertFalse(cs.hasObservers());
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose).run();
+    }
+
+    @Test
+    public void isDisposed() {
+        TestHelper.checkDisposed(CompletableSubject.create().doOnLifecycle(d -> { }, () -> { }));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeCompletable(m -> m.doOnLifecycle(d -> { }, () -> { }));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycleTest.java
new file mode 100644
index 0000000000..b8921b7eb9
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycleTest.java
@@ -0,0 +1,168 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeDoOnLifecycleTest extends RxJavaTest {
+
+    @Test
+    public void success() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        Maybe.just(1)
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test()
+        .assertResult(1);
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose, never()).run();
+    }
+
+    @Test
+    public void empty() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        Maybe.empty()
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test()
+        .assertResult();
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose, never()).run();
+    }
+
+    @Test
+    public void error() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        Maybe.error(new TestException())
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose, never()).run();
+    }
+
+    @Test
+    public void onSubscribeCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+            Action onDispose = mock(Action.class);
+
+            doThrow(new TestException("First")).when(onSubscribe).accept(any());
+
+            Disposable bs = Disposable.empty();
+
+            new Maybe<Integer>() {
+                @Override
+                protected void subscribeActual(MaybeObserver<? super Integer> observer) {
+                    observer.onSubscribe(bs);
+                    observer.onError(new TestException("Second"));
+                    observer.onComplete();
+                    observer.onSuccess(1);
+                }
+            }
+            .doOnLifecycle(onSubscribe, onDispose)
+            .to(TestHelper.<Integer>testConsumer())
+            .assertFailureAndMessage(TestException.class, "First");
+
+            assertTrue(bs.isDisposed());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class, "Second");
+
+            verify(onSubscribe).accept(any());
+            verify(onDispose, never()).run();
+        });
+    }
+
+    @Test
+    public void onDisposeCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+            Action onDispose = mock(Action.class);
+
+            doThrow(new TestException("First")).when(onDispose).run();
+
+            MaybeSubject<Integer> ms = MaybeSubject.create();
+
+            TestObserver<Integer> to = ms
+            .doOnLifecycle(onSubscribe, onDispose)
+            .test();
+
+            assertTrue(ms.hasObservers());
+
+            to.dispose();
+
+            assertFalse(ms.hasObservers());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class, "First");
+
+            verify(onSubscribe).accept(any());
+            verify(onDispose).run();
+        });
+    }
+
+    @Test
+    public void dispose() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        TestObserver<Integer> to = ms
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test();
+
+        assertTrue(ms.hasObservers());
+
+        to.dispose();
+
+        assertFalse(ms.hasObservers());
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose).run();
+    }
+
+    @Test
+    public void isDisposed() {
+        TestHelper.checkDisposed(MaybeSubject.create().doOnLifecycle(d -> { }, () -> { }));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybe(m -> m.doOnLifecycle(d -> { }, () -> { }));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycleTest.java
new file mode 100644
index 0000000000..9208ab2be8
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycleTest.java
@@ -0,0 +1,152 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleDoOnLifecycleTest extends RxJavaTest {
+
+    @Test
+    public void success() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        Single.just(1)
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test()
+        .assertResult(1);
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose, never()).run();
+    }
+
+    @Test
+    public void error() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        Single.error(new TestException())
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose, never()).run();
+    }
+
+    @Test
+    public void onSubscribeCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+            Action onDispose = mock(Action.class);
+
+            doThrow(new TestException("First")).when(onSubscribe).accept(any());
+
+            Disposable bs = Disposable.empty();
+
+            new Single<Integer>() {
+                @Override
+                protected void subscribeActual(SingleObserver<? super Integer> observer) {
+                    observer.onSubscribe(bs);
+                    observer.onError(new TestException("Second"));
+                    observer.onSuccess(1);
+                }
+            }
+            .doOnLifecycle(onSubscribe, onDispose)
+            .to(TestHelper.<Integer>testConsumer())
+            .assertFailureAndMessage(TestException.class, "First");
+
+            assertTrue(bs.isDisposed());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class, "Second");
+
+            verify(onSubscribe).accept(any());
+            verify(onDispose, never()).run();
+        });
+    }
+
+    @Test
+    public void onDisposeCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+            Action onDispose = mock(Action.class);
+
+            doThrow(new TestException("First")).when(onDispose).run();
+
+            SingleSubject<Integer> ss = SingleSubject.create();
+
+            TestObserver<Integer> to = ss
+            .doOnLifecycle(onSubscribe, onDispose)
+            .test();
+
+            assertTrue(ss.hasObservers());
+
+            to.dispose();
+
+            assertFalse(ss.hasObservers());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class, "First");
+
+            verify(onSubscribe).accept(any());
+            verify(onDispose).run();
+        });
+    }
+
+    @Test
+    public void dispose() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Consumer<? super Disposable> onSubscribe = mock(Consumer.class);
+        Action onDispose = mock(Action.class);
+
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        TestObserver<Integer> to = ss
+        .doOnLifecycle(onSubscribe, onDispose)
+        .test();
+
+        assertTrue(ss.hasObservers());
+
+        to.dispose();
+
+        assertFalse(ss.hasObservers());
+
+        verify(onSubscribe).accept(any());
+        verify(onDispose).run();
+    }
+
+    @Test
+    public void isDisposed() {
+        TestHelper.checkDisposed(SingleSubject.create().doOnLifecycle(d -> { }, () -> { }));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingle(m -> m.doOnLifecycle(d -> { }, () -> { }));
+    }
+}

From 57bd1a9272464a1b4b201faa2bab7a929a0ae7f3 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 26 Jan 2020 20:13:17 +0100
Subject: [PATCH 080/665] 3.x: Add concatMapX operators (aliases) (#6879)

---
 docs/Operator-Matrix.md                       | 458 +++++++++---------
 .../java/io/reactivex/rxjava3/core/Maybe.java |  70 ++-
 .../io/reactivex/rxjava3/core/Single.java     |  80 +++
 .../maybe/MaybeConcatMapCompletableTest.java  |  60 +++
 .../maybe/MaybeConcatMapSingleTest.java       | 142 ++++++
 .../operators/maybe/MaybeConcatMapTest.java   | 101 ++++
 .../SingleConcatMapCompletableTest.java       | 114 +++++
 .../single/SingleConcatMapMaybeTest.java      | 141 ++++++
 .../operators/single/SingleConcatMapTest.java | 132 +++++
 .../util/OperatorMatrixGenerator.java         |   6 +
 10 files changed, 1063 insertions(+), 241 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapCompletableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapSingleTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapCompletableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapMaybeTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapTest.java

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index a44eed94ec..cd71558ddb 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -37,102 +37,102 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='concatArrayEagerDelayError'></a>`concatArrayEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArrayDelayError().'>([25](#notes-25))</sup>|
 <a name='concatDelayError'></a>`concatDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='concatEager'></a>`concatEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use merge().'>([26](#notes-26))</sup>|
-<a name='concatMap'></a>`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapCompletable'></a>`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMap'></a>`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapCompletable'></a>`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='concatMapCompletableDelayError'></a>`concatMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use concatMapCompletable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use concatMapCompletable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='concatMapDelayError'></a>`concatMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMap.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMap.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapEager'></a>`concatMapEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
-<a name='concatMapEagerDelayError'></a>`concatMapEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
-<a name='concatMapIterable'></a>`concatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapMaybe'></a>`concatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapMaybeDelayError'></a>`concatMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapSingle'></a>`concatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapSingleDelayError'></a>`concatMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapStream'></a>`concatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapEager'></a>`concatMapEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapEagerDelayError'></a>`concatMapEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapIterable'></a>`concatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapMaybe'></a>`concatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatMap.'>([32](#notes-32))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapMaybeDelayError'></a>`concatMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapSingle'></a>`concatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatMap().'>([34](#notes-34))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapSingleDelayError'></a>`concatMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatMapStream'></a>`concatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='concatWith'></a>`concatWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='contains'></a>`contains`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='count'></a>`count`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty thus always 1.'>([34](#notes-34))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus always 0.'>([35](#notes-35))</sup>|
+<a name='count'></a>`count`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty thus always 1.'>([37](#notes-37))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus always 0.'>([38](#notes-38))</sup>|
 <a name='create'></a>`create`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='debounce'></a>`debounce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='defaultIfEmpty'></a>`defaultIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([38](#notes-38))</sup>|
+<a name='debounce'></a>`debounce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='defaultIfEmpty'></a>`defaultIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([41](#notes-41))</sup>|
 <a name='defer'></a>`defer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='delay'></a>`delay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='delaySubscription'></a>`delaySubscription`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='dematerialize'></a>`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='distinct'></a>`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='distinctUntilChanged'></a>`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='doAfterNext'></a>`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='doAfterSuccess'></a>`doAfterSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([41](#notes-41))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([41](#notes-41))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='dematerialize'></a>`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='distinct'></a>`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='distinctUntilChanged'></a>`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='doAfterNext'></a>`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='doAfterSuccess'></a>`doAfterSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([44](#notes-44))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
 <a name='doAfterTerminate'></a>`doAfterTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='doFinally'></a>`doFinally`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnCancel'></a>`doOnCancel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([42](#notes-42))</sup>|
-<a name='doOnComplete'></a>`doOnComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always succeeds or fails, there is no onComplete signal.'>([43](#notes-43))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnDispose'></a>`doOnDispose`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnCancel().'>([44](#notes-44))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnEach'></a>`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='doOnCancel'></a>`doOnCancel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([45](#notes-45))</sup>|
+<a name='doOnComplete'></a>`doOnComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always succeeds or fails, there is no onComplete signal.'>([46](#notes-46))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnDispose'></a>`doOnDispose`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnCancel().'>([47](#notes-47))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnEach'></a>`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
 <a name='doOnError'></a>`doOnError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnEvent'></a>`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([46](#notes-46))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([46](#notes-46))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnEvent'></a>`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([49](#notes-49))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([49](#notes-49))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='doOnLifecycle'></a>`doOnLifecycle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnNext'></a>`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([47](#notes-47))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([47](#notes-47))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='doOnRequest'></a>`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
+<a name='doOnNext'></a>`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='doOnRequest'></a>`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
 <a name='doOnSubscribe'></a>`doOnSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnSuccess'></a>`doOnSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([49](#notes-49))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([49](#notes-49))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='doOnSuccess'></a>`doOnSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([52](#notes-52))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
 <a name='doOnTerminate'></a>`doOnTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='elementAt'></a>`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use defaultIfEmpty.'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='elementAtOrError'></a>`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use toSingle.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='empty'></a>`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use complete().'>([53](#notes-53))</sup>|
+<a name='elementAt'></a>`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use defaultIfEmpty.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='elementAtOrError'></a>`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use toSingle.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='empty'></a>`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use complete().'>([56](#notes-56))</sup>|
 <a name='error'></a>`error`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='filter'></a>`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='first'></a>`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([38](#notes-38))</sup>|
-<a name='firstElement'></a>`firstElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='firstOrError'></a>`firstOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([58](#notes-58))</sup>|
-<a name='firstOrErrorStage'></a>`firstOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([60](#notes-60))</sup>|
-<a name='firstStage'></a>`firstStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|
+<a name='filter'></a>`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='first'></a>`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([41](#notes-41))</sup>|
+<a name='firstElement'></a>`firstElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='firstOrError'></a>`firstOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([61](#notes-61))</sup>|
+<a name='firstOrErrorStage'></a>`firstOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([63](#notes-63))</sup>|
+<a name='firstStage'></a>`firstStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|
 <a name='flatMap'></a>`flatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='flatMapCompletable'></a>`flatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapIterable'></a>`flatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapMaybe'></a>`flatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([61](#notes-61))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapObservable'></a>`flatMapObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([63](#notes-63))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapPublisher'></a>`flatMapPublisher`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([64](#notes-64))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapSingle'></a>`flatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapSingleElement'></a>`flatMapSingleElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([65](#notes-65))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapStream'></a>`flatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenAsFlowable'></a>`flattenAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([66](#notes-66))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([66](#notes-66))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenAsObservable'></a>`flattenAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([66](#notes-66))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([66](#notes-66))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenStreamAsFlowable'></a>`flattenStreamAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenStreamAsObservable'></a>`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([67](#notes-67))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='forEach'></a>`forEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|
-<a name='forEachWhile'></a>`forEachWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([68](#notes-68))</sup>|
+<a name='flatMapIterable'></a>`flatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapMaybe'></a>`flatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([64](#notes-64))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapObservable'></a>`flatMapObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([66](#notes-66))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapPublisher'></a>`flatMapPublisher`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([66](#notes-66))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([67](#notes-67))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapSingle'></a>`flatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([64](#notes-64))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapSingleElement'></a>`flatMapSingleElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([68](#notes-68))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([66](#notes-66))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flatMapStream'></a>`flatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenAsFlowable'></a>`flattenAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenAsObservable'></a>`flattenAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenStreamAsFlowable'></a>`flattenStreamAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='flattenStreamAsObservable'></a>`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='forEach'></a>`forEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|
+<a name='forEachWhile'></a>`forEachWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|
 <a name='fromAction'></a>`fromAction`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromArray'></a>`fromArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
+<a name='fromArray'></a>`fromArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([72](#notes-72))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([74](#notes-74))</sup>|
 <a name='fromCallable'></a>`fromCallable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromCompletable'></a>`fromCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always error.'>([72](#notes-72))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|
+<a name='fromCompletable'></a>`fromCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always error.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([76](#notes-76))</sup>|
 <a name='fromCompletionStage'></a>`fromCompletionStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='fromFuture'></a>`fromFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromIterable'></a>`fromIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
-<a name='fromMaybe'></a>`fromMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromObservable'></a>`fromObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromOptional'></a>`fromOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
+<a name='fromIterable'></a>`fromIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([72](#notes-72))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([74](#notes-74))</sup>|
+<a name='fromMaybe'></a>`fromMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([76](#notes-76))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromObservable'></a>`fromObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([76](#notes-76))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromOptional'></a>`fromOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([74](#notes-74))</sup>|
 <a name='fromPublisher'></a>`fromPublisher`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='fromRunnable'></a>`fromRunnable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromSingle'></a>`fromSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([73](#notes-73))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='fromStream'></a>`fromStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
+<a name='fromSingle'></a>`fromSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use wrap().'>([76](#notes-76))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='fromStream'></a>`fromStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([72](#notes-72))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item. Use just().'>([73](#notes-73))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([74](#notes-74))</sup>|
 <a name='fromSupplier'></a>`fromSupplier`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='generate'></a>`generate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([74](#notes-74))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([74](#notes-74))</sup>|
-<a name='groupBy'></a>`groupBy`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to group.'>([76](#notes-76))</sup>|
-<a name='groupJoin'></a>`groupJoin`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([77](#notes-77))</sup>|
+<a name='generate'></a>`generate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([77](#notes-77))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([77](#notes-77))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromSupplier().'>([77](#notes-77))</sup>|
+<a name='groupBy'></a>`groupBy`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to group.'>([79](#notes-79))</sup>|
+<a name='groupJoin'></a>`groupJoin`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([80](#notes-80))</sup>|
 <a name='hide'></a>`hide`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='ignoreElement'></a>`ignoreElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([78](#notes-78))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='ignoreElements'></a>`ignoreElements`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([79](#notes-79))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='interval'></a>`interval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|
-<a name='intervalRange'></a>`intervalRange`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([80](#notes-80))</sup>|
-<a name='isEmpty'></a>`isEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='join'></a>`join`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([81](#notes-81))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([81](#notes-81))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([77](#notes-77))</sup>|
+<a name='ignoreElement'></a>`ignoreElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([81](#notes-81))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElements().'>([81](#notes-81))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='ignoreElements'></a>`ignoreElements`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='interval'></a>`interval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|
+<a name='intervalRange'></a>`intervalRange`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|
+<a name='isEmpty'></a>`isEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='join'></a>`join`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([80](#notes-80))</sup>|
 <a name='just'></a>`just`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='last'></a>`last`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([38](#notes-38))</sup>|
-<a name='lastElement'></a>`lastElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='lastOrError'></a>`lastOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([58](#notes-58))</sup>|
-<a name='lastOrErrorStage'></a>`lastOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([60](#notes-60))</sup>|
-<a name='lastStage'></a>`lastStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|
+<a name='last'></a>`last`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([41](#notes-41))</sup>|
+<a name='lastElement'></a>`lastElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='lastOrError'></a>`lastOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([61](#notes-61))</sup>|
+<a name='lastOrErrorStage'></a>`lastOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([63](#notes-63))</sup>|
+<a name='lastStage'></a>`lastStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|
 <a name='lift'></a>`lift`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='map'></a>`map`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='mapOptional'></a>`mapOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
@@ -144,100 +144,100 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='mergeWith'></a>`mergeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='never'></a>`never`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='observeOn'></a>`observeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='ofType'></a>`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to filter.'>([82](#notes-82))</sup>|
-<a name='onBackpressureBuffer'></a>`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
-<a name='onBackpressureDrop'></a>`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
-<a name='onBackpressureLatest'></a>`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
+<a name='ofType'></a>`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to filter.'>([85](#notes-85))</sup>|
+<a name='onBackpressureBuffer'></a>`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
+<a name='onBackpressureDrop'></a>`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
+<a name='onBackpressureLatest'></a>`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
 <a name='onErrorComplete'></a>`onErrorComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='onErrorResumeNext'></a>`onErrorResumeNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='onErrorResumeWith'></a>`onErrorResumeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='onErrorReturn'></a>`onErrorReturn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='onErrorReturnItem'></a>`onErrorReturnItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
 <a name='onTerminateDetach'></a>`onTerminateDetach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='parallel'></a>`parallel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([83](#notes-83))</sup>|
-<a name='publish'></a>`publish`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([86](#notes-86))</sup>|
-<a name='range'></a>`range`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
-<a name='rangeLong'></a>`rangeLong`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([71](#notes-71))</sup>|
-<a name='rebatchRequests'></a>`rebatchRequests`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([48](#notes-48))</sup>|
-<a name='reduce'></a>`reduce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([89](#notes-89))</sup>|
-<a name='reduceWith'></a>`reduceWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([89](#notes-89))</sup>|
+<a name='parallel'></a>`parallel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([86](#notes-86))</sup>|
+<a name='publish'></a>`publish`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([89](#notes-89))</sup>|
+<a name='range'></a>`range`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([74](#notes-74))</sup>|
+<a name='rangeLong'></a>`rangeLong`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([74](#notes-74))</sup>|
+<a name='rebatchRequests'></a>`rebatchRequests`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
+<a name='reduce'></a>`reduce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
+<a name='reduceWith'></a>`reduceWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
 <a name='repeat'></a>`repeat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='repeatUntil'></a>`repeatUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='repeatWhen'></a>`repeatWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='replay'></a>`replay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([86](#notes-86))</sup>|
+<a name='replay'></a>`replay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([89](#notes-89))</sup>|
 <a name='retry'></a>`retry`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='retryUntil'></a>`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='retryWhen'></a>`retryWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='safeSubscribe'></a>`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
-<a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='scan'></a>`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([89](#notes-89))</sup>|
-<a name='scanWith'></a>`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([89](#notes-89))</sup>|
+<a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='scan'></a>`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
+<a name='scanWith'></a>`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
 <a name='sequenceEqual'></a>`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
-<a name='serialize'></a>`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([90](#notes-90))</sup>|
-<a name='share'></a>`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([85](#notes-85))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([86](#notes-86))</sup>|
-<a name='single'></a>`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([38](#notes-38))</sup>|
-<a name='singleElement'></a>`singleElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='singleOrError'></a>`singleOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([58](#notes-58))</sup>|
-<a name='singleOrErrorStage'></a>`singleOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([60](#notes-60))</sup>|
-<a name='singleStage'></a>`singleStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([59](#notes-59))</sup>|
-<a name='skip'></a>`skip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
-<a name='skipLast'></a>`skipLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
-<a name='skipUntil'></a>`skipUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([91](#notes-91))</sup>|
-<a name='skipWhile'></a>`skipWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='sorted'></a>`sorted`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([75](#notes-75))</sup>|
+<a name='serialize'></a>`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([93](#notes-93))</sup>|
+<a name='share'></a>`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([89](#notes-89))</sup>|
+<a name='single'></a>`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([41](#notes-41))</sup>|
+<a name='singleElement'></a>`singleElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='singleOrError'></a>`singleOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([61](#notes-61))</sup>|
+<a name='singleOrErrorStage'></a>`singleOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([63](#notes-63))</sup>|
+<a name='singleStage'></a>`singleStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|
+<a name='skip'></a>`skip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|
+<a name='skipLast'></a>`skipLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|
+<a name='skipUntil'></a>`skipUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([94](#notes-94))</sup>|
+<a name='skipWhile'></a>`skipWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='sorted'></a>`sorted`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|
 <a name='startWith'></a>`startWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='startWithArray'></a>`startWithArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([93](#notes-93))</sup>|
-<a name='startWithItem'></a>`startWithItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([94](#notes-94))</sup>|
-<a name='startWithIterable'></a>`startWithIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([95](#notes-95))</sup>|
+<a name='startWithArray'></a>`startWithArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([96](#notes-96))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([96](#notes-96))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([96](#notes-96))</sup>|
+<a name='startWithItem'></a>`startWithItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([97](#notes-97))</sup>|
+<a name='startWithIterable'></a>`startWithIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([98](#notes-98))</sup>|
 <a name='subscribe'></a>`subscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='subscribeOn'></a>`subscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='subscribeWith'></a>`subscribeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='switchIfEmpty'></a>`switchIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use defaultIfEmpty().'>([96](#notes-96))</sup>|
-<a name='switchMap'></a>`switchMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapCompletable'></a>`switchMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapCompletableDelayError'></a>`switchMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapDelayError'></a>`switchMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapMaybe'></a>`switchMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapMaybeDelayError'></a>`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapSingle'></a>`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapSingleDelayError'></a>`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchIfEmpty'></a>`switchIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use defaultIfEmpty().'>([99](#notes-99))</sup>|
+<a name='switchMap'></a>`switchMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapCompletable'></a>`switchMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapCompletableDelayError'></a>`switchMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapDelayError'></a>`switchMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapMaybe'></a>`switchMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapMaybeDelayError'></a>`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapSingle'></a>`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMapSingleDelayError'></a>`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='switchOnNext'></a>`switchOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='switchOnNextDelayError'></a>`switchOnNextDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='take'></a>`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
-<a name='takeLast'></a>`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([56](#notes-56))</sup>|
+<a name='take'></a>`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|
+<a name='takeLast'></a>`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|
 <a name='takeUntil'></a>`takeUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='takeWhile'></a>`takeWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([92](#notes-92))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='takeWhile'></a>`takeWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
 <a name='test'></a>`test`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='throttleFirst'></a>`throttleFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='throttleLast'></a>`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='throttleLatest'></a>`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='throttleWithTimeout'></a>`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
-<a name='timeInterval'></a>`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='throttleFirst'></a>`throttleFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='throttleLast'></a>`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='throttleLatest'></a>`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='throttleWithTimeout'></a>`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='timeInterval'></a>`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
 <a name='timeout'></a>`timeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='timer'></a>`timer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([37](#notes-37))</sup>|
+<a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
 <a name='to'></a>`to`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toCompletionStage'></a>`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([98](#notes-98))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toCompletionStage'></a>`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([101](#notes-101))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([101](#notes-101))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([102](#notes-102))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toFuture'></a>`toFuture`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toList'></a>`toList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
 <a name='toMap'></a>`toMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
-<a name='toMaybe'></a>`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toMaybe'></a>`toMaybe`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([103](#notes-103))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstElement.'>([103](#notes-103))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([102](#notes-102))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toMultimap'></a>`toMultimap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
-<a name='toObservable'></a>`toObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toSingle'></a>`toSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([101](#notes-101))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([101](#notes-101))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='toSingleDefault'></a>`toSingleDefault`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([102](#notes-102))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([102](#notes-102))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use defaultIfEmpty().'>([103](#notes-103))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([99](#notes-99))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toObservable'></a>`toObservable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([102](#notes-102))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toSingle'></a>`toSingle`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([104](#notes-104))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstOrError.'>([104](#notes-104))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([102](#notes-102))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='toSingleDefault'></a>`toSingleDefault`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([105](#notes-105))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use first.'>([105](#notes-105))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use defaultIfEmpty().'>([106](#notes-106))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([102](#notes-102))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toSortedList'></a>`toSortedList`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element to collect. Use map() to transform into a list/collection.'>([13](#notes-13))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='One element to collect. Use map() to transform into a list/collection.'>([14](#notes-14))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a collection.'>([15](#notes-15))</sup>|
 <a name='unsafeCreate'></a>`unsafeCreate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='unsubscribeOn'></a>`unsubscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='using'></a>`using`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='window'></a>`window`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([104](#notes-104))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([105](#notes-105))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a nested source.'>([106](#notes-106))</sup>|
+<a name='window'></a>`window`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([107](#notes-107))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use map() to transform into a nested source.'>([108](#notes-108))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to bring in a nested source.'>([109](#notes-109))</sup>|
 <a name='withLatestFrom'></a>`withLatestFrom`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one element per source. Use zip().'>([16](#notes-16))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use merge().'>([17](#notes-17))</sup>|
-<a name='wrap'></a>`wrap`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromPublisher().'>([107](#notes-107))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([108](#notes-108))</sup>|
-<a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([109](#notes-109))</sup>|
-<a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([110](#notes-110))</sup>|
-<a name='total'></a>**237 operators** | **215** | **209** | **113** | **97** | **78** |
+<a name='wrap'></a>`wrap`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use fromPublisher().'>([110](#notes-110))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([111](#notes-111))</sup>|
+<a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([112](#notes-112))</sup>|
+<a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([113](#notes-113))</sup>|
+<a name='total'></a>**237 operators** | **215** | **209** | **115** | **100** | **78** |
 
 #### Notes
 <a name='notes-1'></a><sup>1</sup> Use [`contains()`](#contains).<br/>
@@ -269,87 +269,90 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='notes-27'></a><sup>27</sup> Always empty thus no items to map.<br/>
 <a name='notes-28'></a><sup>28</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use [`concatMapCompletable`](#concatMapCompletable).<br/>
 <a name='notes-29'></a><sup>29</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMap`](#concatMap).<br/>
-<a name='notes-30'></a><sup>30</sup> At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).<br/>
-<a name='notes-31'></a><sup>31</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapMaybe`](#concatMapMaybe).<br/>
-<a name='notes-32'></a><sup>32</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapSingle`](#concatMapSingle).<br/>
-<a name='notes-33'></a><sup>33</sup> At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).<br/>
-<a name='notes-34'></a><sup>34</sup> Never empty thus always 1.<br/>
-<a name='notes-35'></a><sup>35</sup> Always empty thus always 0.<br/>
-<a name='notes-36'></a><sup>36</sup> At most one item signaled so no subsequent items to work with.<br/>
-<a name='notes-37'></a><sup>37</sup> Always empty thus no items to work with.<br/>
-<a name='notes-38'></a><sup>38</sup> Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.<br/>
-<a name='notes-39'></a><sup>39</sup> At most one item, always distinct.<br/>
-<a name='notes-40'></a><sup>40</sup> Different terminology. Use [`doAfterSuccess()`](#doAfterSuccess).<br/>
-<a name='notes-41'></a><sup>41</sup> Different terminology. Use [`doAfterNext()`](#doAfterNext).<br/>
-<a name='notes-42'></a><sup>42</sup> Different terminology. Use [`doOnDispose()`](#doOnDispose).<br/>
-<a name='notes-43'></a><sup>43</sup> Always succeeds or fails, there is no `onComplete` signal.<br/>
-<a name='notes-44'></a><sup>44</sup> Different terminology. Use [`doOnCancel()`](#doOnCancel).<br/>
-<a name='notes-45'></a><sup>45</sup> At most one item. Use [`doOnEvent()`](#doOnEvent).<br/>
-<a name='notes-46'></a><sup>46</sup> Use [`doOnEach()`](#doOnEach).<br/>
-<a name='notes-47'></a><sup>47</sup> Different terminology. Use [`doOnSuccess()`](#doOnSuccess).<br/>
-<a name='notes-48'></a><sup>48</sup> Backpressure related and not supported outside `Flowable`.<br/>
-<a name='notes-49'></a><sup>49</sup> Different terminology. Use [`doOnNext()`](#doOnNext).<br/>
-<a name='notes-50'></a><sup>50</sup> At most one item with index 0. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
-<a name='notes-51'></a><sup>51</sup> Always one item with index 0.<br/>
-<a name='notes-52'></a><sup>52</sup> At most one item with index 0. Use [`toSingle`](#toSingle).<br/>
-<a name='notes-53'></a><sup>53</sup> Use [`complete()`](#complete).<br/>
-<a name='notes-54'></a><sup>54</sup> At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
-<a name='notes-55'></a><sup>55</sup> Always one item.<br/>
-<a name='notes-56'></a><sup>56</sup> At most one item, would be no-op.<br/>
-<a name='notes-57'></a><sup>57</sup> Always one item, would be no-op.<br/>
-<a name='notes-58'></a><sup>58</sup> Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).<br/>
-<a name='notes-59'></a><sup>59</sup> At most one item. Use [`toCompletionStage()`](#toCompletionStage).<br/>
-<a name='notes-60'></a><sup>60</sup> Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).<br/>
-<a name='notes-61'></a><sup>61</sup> Use [`flatMap()`](#flatMap).<br/>
-<a name='notes-62'></a><sup>62</sup> Not supported. Use [`flatMap`](#flatMap) and [`toFlowable()`](#toFlowable).<br/>
-<a name='notes-63'></a><sup>63</sup> Use [`flatMap`](#flatMap).<br/>
-<a name='notes-64'></a><sup>64</sup> Not supported. Use [`flatMap`](#flatMap) and [`toObservable()`](#toFlowable).<br/>
-<a name='notes-65'></a><sup>65</sup> Use [`flatMapSingle`](#flatMapSingle).<br/>
-<a name='notes-66'></a><sup>66</sup> Use [`flatMapIterable()`](#flatMapIterable).<br/>
-<a name='notes-67'></a><sup>67</sup> Use [`flatMapStream()`](#flatMapStream).<br/>
-<a name='notes-68'></a><sup>68</sup> Use [`subscribe()`](#subscribe).<br/>
-<a name='notes-69'></a><sup>69</sup> At most one item. Use [`just()`](#just) or [`empty()`](#empty).<br/>
-<a name='notes-70'></a><sup>70</sup> Always one item. Use [`just()`](#just).<br/>
-<a name='notes-71'></a><sup>71</sup> Always empty. Use [`complete()`](#complete).<br/>
-<a name='notes-72'></a><sup>72</sup> Always error.<br/>
-<a name='notes-73'></a><sup>73</sup> Use [`wrap()`](#wrap).<br/>
-<a name='notes-74'></a><sup>74</sup> Use [`fromSupplier()`](#fromSupplier).<br/>
-<a name='notes-75'></a><sup>75</sup> At most one item.<br/>
-<a name='notes-76'></a><sup>76</sup> Always empty thus no items to group.<br/>
-<a name='notes-77'></a><sup>77</sup> Always empty thus no items to join.<br/>
-<a name='notes-78'></a><sup>78</sup> Use [`ignoreElements()`](#ignoreElements).<br/>
-<a name='notes-79'></a><sup>79</sup> Use [`ignoreElement()`](#ignoreElement).<br/>
-<a name='notes-80'></a><sup>80</sup> At most one item. Use [`timer()`](#timer).<br/>
-<a name='notes-81'></a><sup>81</sup> At most one item. Use [`zip()`](#zip)<br/>
-<a name='notes-82'></a><sup>82</sup> Always empty thus no items to filter.<br/>
-<a name='notes-83'></a><sup>83</sup> Needs backpressure thus not supported outside `Flowable`.<br/>
-<a name='notes-84'></a><sup>84</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `MaybeSubject`.<br/>
-<a name='notes-85'></a><sup>85</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `SingleSubject`.<br/>
-<a name='notes-86'></a><sup>86</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `ConnectableSubject`.<br/>
-<a name='notes-87'></a><sup>87</sup> At most one item. Use [`just()`](#just).<br/>
-<a name='notes-88'></a><sup>88</sup> At most one item. Use [`map()`](#map).<br/>
-<a name='notes-89'></a><sup>89</sup> Always empty thus no items to reduce.<br/>
-<a name='notes-90'></a><sup>90</sup> At most one signal type.<br/>
-<a name='notes-91'></a><sup>91</sup> At most one item. Use [`takeUntil()`](#takeUntil).<br/>
-<a name='notes-92'></a><sup>92</sup> At most one item. Use [`filter()`](#filter).<br/>
-<a name='notes-93'></a><sup>93</sup> Use [`startWith()`](#startWith) and [`fromArray()`](#fromArray) of `Flowable` or `Observable`.<br/>
-<a name='notes-94'></a><sup>94</sup> Use [`startWith()`](#startWith) and [`just()`](#just) of another reactive type.<br/>
-<a name='notes-95'></a><sup>95</sup> Use [`startWith()`](#startWith) and [`fromIterable()`](#fromArray) of `Flowable` or `Observable`.<br/>
-<a name='notes-96'></a><sup>96</sup> Always empty. Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
-<a name='notes-97'></a><sup>97</sup> At most one item. Use [`flatMap()`](#flatMap).<br/>
-<a name='notes-98'></a><sup>98</sup> Use [`firstStage`](#firstStage), [`lastStage`](#lastStage) or [`singleStage`](#singleStage).<br/>
-<a name='notes-99'></a><sup>99</sup> Would be no-op.<br/>
-<a name='notes-100'></a><sup>100</sup> Use [`firstElement`](#firstElement), [`lastElement`](#lastElement) or [`singleElement`](#singleElement).<br/>
-<a name='notes-101'></a><sup>101</sup> Use [`firstOrError`](#firstOrError), [`lastOrError`](#lastOrError) or [`singleOrError`](#singleOrError).<br/>
-<a name='notes-102'></a><sup>102</sup> Use [`first`](#first), [`last`](#last) or [`single`](#single).<br/>
-<a name='notes-103'></a><sup>103</sup> Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
-<a name='notes-104'></a><sup>104</sup> Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a nested source.<br/>
-<a name='notes-105'></a><sup>105</sup> Use [`map()`](#map) to transform into a nested source.<br/>
-<a name='notes-106'></a><sup>106</sup> Always empty. Use [`andThen()`](#andThen) to bring in a nested source.<br/>
-<a name='notes-107'></a><sup>107</sup> Use [`fromPublisher()`](#fromPublisher).<br/>
-<a name='notes-108'></a><sup>108</sup> Use [`merge()`](#merge).<br/>
-<a name='notes-109'></a><sup>109</sup> Use [`mergeArray()`](#mergeArray).<br/>
-<a name='notes-110'></a><sup>110</sup> Use [`mergeWith()`](#mergeWith).<br/>
+<a name='notes-30'></a><sup>30</sup> At most one item to map. Use [`concatMap()`](#concatMap).<br/>
+<a name='notes-31'></a><sup>31</sup> At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).<br/>
+<a name='notes-32'></a><sup>32</sup> Use [`concatMap`](#concatMap).<br/>
+<a name='notes-33'></a><sup>33</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapMaybe`](#concatMapMaybe).<br/>
+<a name='notes-34'></a><sup>34</sup> Use [`concatMap()`](#concatMap).<br/>
+<a name='notes-35'></a><sup>35</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapSingle`](#concatMapSingle).<br/>
+<a name='notes-36'></a><sup>36</sup> At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).<br/>
+<a name='notes-37'></a><sup>37</sup> Never empty thus always 1.<br/>
+<a name='notes-38'></a><sup>38</sup> Always empty thus always 0.<br/>
+<a name='notes-39'></a><sup>39</sup> At most one item signaled so no subsequent items to work with.<br/>
+<a name='notes-40'></a><sup>40</sup> Always empty thus no items to work with.<br/>
+<a name='notes-41'></a><sup>41</sup> Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.<br/>
+<a name='notes-42'></a><sup>42</sup> At most one item, always distinct.<br/>
+<a name='notes-43'></a><sup>43</sup> Different terminology. Use [`doAfterSuccess()`](#doAfterSuccess).<br/>
+<a name='notes-44'></a><sup>44</sup> Different terminology. Use [`doAfterNext()`](#doAfterNext).<br/>
+<a name='notes-45'></a><sup>45</sup> Different terminology. Use [`doOnDispose()`](#doOnDispose).<br/>
+<a name='notes-46'></a><sup>46</sup> Always succeeds or fails, there is no `onComplete` signal.<br/>
+<a name='notes-47'></a><sup>47</sup> Different terminology. Use [`doOnCancel()`](#doOnCancel).<br/>
+<a name='notes-48'></a><sup>48</sup> At most one item. Use [`doOnEvent()`](#doOnEvent).<br/>
+<a name='notes-49'></a><sup>49</sup> Use [`doOnEach()`](#doOnEach).<br/>
+<a name='notes-50'></a><sup>50</sup> Different terminology. Use [`doOnSuccess()`](#doOnSuccess).<br/>
+<a name='notes-51'></a><sup>51</sup> Backpressure related and not supported outside `Flowable`.<br/>
+<a name='notes-52'></a><sup>52</sup> Different terminology. Use [`doOnNext()`](#doOnNext).<br/>
+<a name='notes-53'></a><sup>53</sup> At most one item with index 0. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
+<a name='notes-54'></a><sup>54</sup> Always one item with index 0.<br/>
+<a name='notes-55'></a><sup>55</sup> At most one item with index 0. Use [`toSingle`](#toSingle).<br/>
+<a name='notes-56'></a><sup>56</sup> Use [`complete()`](#complete).<br/>
+<a name='notes-57'></a><sup>57</sup> At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
+<a name='notes-58'></a><sup>58</sup> Always one item.<br/>
+<a name='notes-59'></a><sup>59</sup> At most one item, would be no-op.<br/>
+<a name='notes-60'></a><sup>60</sup> Always one item, would be no-op.<br/>
+<a name='notes-61'></a><sup>61</sup> Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).<br/>
+<a name='notes-62'></a><sup>62</sup> At most one item. Use [`toCompletionStage()`](#toCompletionStage).<br/>
+<a name='notes-63'></a><sup>63</sup> Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).<br/>
+<a name='notes-64'></a><sup>64</sup> Use [`flatMap()`](#flatMap).<br/>
+<a name='notes-65'></a><sup>65</sup> Not supported. Use [`flatMap`](#flatMap) and [`toFlowable()`](#toFlowable).<br/>
+<a name='notes-66'></a><sup>66</sup> Use [`flatMap`](#flatMap).<br/>
+<a name='notes-67'></a><sup>67</sup> Not supported. Use [`flatMap`](#flatMap) and [`toObservable()`](#toFlowable).<br/>
+<a name='notes-68'></a><sup>68</sup> Use [`flatMapSingle`](#flatMapSingle).<br/>
+<a name='notes-69'></a><sup>69</sup> Use [`flatMapIterable()`](#flatMapIterable).<br/>
+<a name='notes-70'></a><sup>70</sup> Use [`flatMapStream()`](#flatMapStream).<br/>
+<a name='notes-71'></a><sup>71</sup> Use [`subscribe()`](#subscribe).<br/>
+<a name='notes-72'></a><sup>72</sup> At most one item. Use [`just()`](#just) or [`empty()`](#empty).<br/>
+<a name='notes-73'></a><sup>73</sup> Always one item. Use [`just()`](#just).<br/>
+<a name='notes-74'></a><sup>74</sup> Always empty. Use [`complete()`](#complete).<br/>
+<a name='notes-75'></a><sup>75</sup> Always error.<br/>
+<a name='notes-76'></a><sup>76</sup> Use [`wrap()`](#wrap).<br/>
+<a name='notes-77'></a><sup>77</sup> Use [`fromSupplier()`](#fromSupplier).<br/>
+<a name='notes-78'></a><sup>78</sup> At most one item.<br/>
+<a name='notes-79'></a><sup>79</sup> Always empty thus no items to group.<br/>
+<a name='notes-80'></a><sup>80</sup> Always empty thus no items to join.<br/>
+<a name='notes-81'></a><sup>81</sup> Use [`ignoreElements()`](#ignoreElements).<br/>
+<a name='notes-82'></a><sup>82</sup> Use [`ignoreElement()`](#ignoreElement).<br/>
+<a name='notes-83'></a><sup>83</sup> At most one item. Use [`timer()`](#timer).<br/>
+<a name='notes-84'></a><sup>84</sup> At most one item. Use [`zip()`](#zip)<br/>
+<a name='notes-85'></a><sup>85</sup> Always empty thus no items to filter.<br/>
+<a name='notes-86'></a><sup>86</sup> Needs backpressure thus not supported outside `Flowable`.<br/>
+<a name='notes-87'></a><sup>87</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `MaybeSubject`.<br/>
+<a name='notes-88'></a><sup>88</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `SingleSubject`.<br/>
+<a name='notes-89'></a><sup>89</sup> Connectable sources not supported outside `Flowable` and `Observable`. Use a `ConnectableSubject`.<br/>
+<a name='notes-90'></a><sup>90</sup> At most one item. Use [`just()`](#just).<br/>
+<a name='notes-91'></a><sup>91</sup> At most one item. Use [`map()`](#map).<br/>
+<a name='notes-92'></a><sup>92</sup> Always empty thus no items to reduce.<br/>
+<a name='notes-93'></a><sup>93</sup> At most one signal type.<br/>
+<a name='notes-94'></a><sup>94</sup> At most one item. Use [`takeUntil()`](#takeUntil).<br/>
+<a name='notes-95'></a><sup>95</sup> At most one item. Use [`filter()`](#filter).<br/>
+<a name='notes-96'></a><sup>96</sup> Use [`startWith()`](#startWith) and [`fromArray()`](#fromArray) of `Flowable` or `Observable`.<br/>
+<a name='notes-97'></a><sup>97</sup> Use [`startWith()`](#startWith) and [`just()`](#just) of another reactive type.<br/>
+<a name='notes-98'></a><sup>98</sup> Use [`startWith()`](#startWith) and [`fromIterable()`](#fromArray) of `Flowable` or `Observable`.<br/>
+<a name='notes-99'></a><sup>99</sup> Always empty. Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
+<a name='notes-100'></a><sup>100</sup> At most one item. Use [`flatMap()`](#flatMap).<br/>
+<a name='notes-101'></a><sup>101</sup> Use [`firstStage`](#firstStage), [`lastStage`](#lastStage) or [`singleStage`](#singleStage).<br/>
+<a name='notes-102'></a><sup>102</sup> Would be no-op.<br/>
+<a name='notes-103'></a><sup>103</sup> Use [`firstElement`](#firstElement), [`lastElement`](#lastElement) or [`singleElement`](#singleElement).<br/>
+<a name='notes-104'></a><sup>104</sup> Use [`firstOrError`](#firstOrError), [`lastOrError`](#lastOrError) or [`singleOrError`](#singleOrError).<br/>
+<a name='notes-105'></a><sup>105</sup> Use [`first`](#first), [`last`](#last) or [`single`](#single).<br/>
+<a name='notes-106'></a><sup>106</sup> Use [`defaultIfEmpty()`](#defaultIfEmpty).<br/>
+<a name='notes-107'></a><sup>107</sup> Use [`map()`](#map) and [`switchIfEmpty()`](#switchIfEmpty) to transform into a nested source.<br/>
+<a name='notes-108'></a><sup>108</sup> Use [`map()`](#map) to transform into a nested source.<br/>
+<a name='notes-109'></a><sup>109</sup> Always empty. Use [`andThen()`](#andThen) to bring in a nested source.<br/>
+<a name='notes-110'></a><sup>110</sup> Use [`fromPublisher()`](#fromPublisher).<br/>
+<a name='notes-111'></a><sup>111</sup> Use [`merge()`](#merge).<br/>
+<a name='notes-112'></a><sup>112</sup> Use [`mergeArray()`](#mergeArray).<br/>
+<a name='notes-113'></a><sup>113</sup> Use [`mergeWith()`](#mergeWith).<br/>
 
 #### Under development
 
@@ -359,26 +362,13 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 4. Single.concatArrayEagerDelayError()
 5. Single.concatDelayError()
 6. Completable.concatDelayError()
-7. Single.concatMap()
-8. Maybe.concatMapCompletable()
-9. Single.concatMapCompletable()
-10. Maybe.concatMapEager()
-11. Single.concatMapEager()
-12. Completable.concatMapEager()
-13. Maybe.concatMapEagerDelayError()
-14. Single.concatMapEagerDelayError()
-15. Completable.concatMapEagerDelayError()
-16. Maybe.concatMapMaybe()
-17. Single.concatMapMaybe()
-18. Maybe.concatMapSingle()
-19. Single.concatMapSingle()
-20. Single.mergeArray()
-21. Single.mergeArrayDelayError()
-22. Completable.onErrorReturn()
-23. Completable.onErrorReturnItem()
-24. Maybe.safeSubscribe()
-25. Single.safeSubscribe()
-26. Completable.safeSubscribe()
-27. Completable.sequenceEqual()
-28. Maybe.startWith()
-29. Single.startWith()
+7. Single.mergeArray()
+8. Single.mergeArrayDelayError()
+9. Completable.onErrorReturn()
+10. Completable.onErrorReturnItem()
+11. Maybe.safeSubscribe()
+12. Single.safeSubscribe()
+13. Completable.safeSubscribe()
+14. Completable.sequenceEqual()
+15. Maybe.startWith()
+16. Single.startWith()
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index b3ed8213d4..6754f65e7b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -2828,12 +2828,13 @@ public final <R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends
      * Returns a {@code Maybe} that is based on applying a specified function to the item emitted by the current {@code Maybe},
      * where that function returns a {@link MaybeSource}.
      * <p>
-     * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
+     * <img width="640" height="216" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatMap.png" alt="">
+     * <p>
+     * Note that flatMap and concatMap for {@code Maybe} is the same operation.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * <p>Note that flatMap and concatMap for {@code Maybe} is the same operation.
      * @param <R> the result value type
      * @param mapper
      *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a {@code MaybeSource}
@@ -2845,8 +2846,63 @@ public final <R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> concatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
-        Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatten<>(this, mapper));
+        return flatMap(mapper);
+    }
+
+    /**
+     * Returns a {@link Completable} that completes based on applying a specified function to the item emitted by the
+     * current {@code Maybe}, where that function returns a {@code Completable}.
+     * <p>
+     * <img width="640" height="304" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatMapCompletable.png" alt="">
+     * <p>
+     * This operator is an alias for {@link #flatMapCompletable(Function)}.
+     * <dl>
+     * <dt><b>Scheduler:</b></dt>
+     * <dd>{@code concatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param mapper
+     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
+     *            {@code Completable}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Completable concatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
+        return flatMapCompletable(mapper);
+    }
+
+    /**
+     * Returns a {@code Maybe} based on applying a specified function to the item emitted by the
+     * current {@code Maybe}, where that function returns a {@link Single}.
+     * When this {@code Maybe} just completes the resulting {@code Maybe} completes as well.
+     * <p>
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatMapSingle.png" alt="">
+     * <p>
+     * This operator is an alias for {@link #flatMapSingleElement(Function)}.
+     * <dl>
+     * <dt><b>Scheduler:</b></dt>
+     * <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the result value type
+     * @param mapper
+     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
+     *            {@code Single}
+     * @return the new {@code Maybe} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <R> Maybe<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+        return flatMapSingleElement(mapper);
     }
 
     /**
@@ -3732,7 +3788,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
      * current {@code Maybe}, where that function returns a {@code Single}.
      * When this {@code Maybe} completes a {@link NoSuchElementException} will be thrown.
      * <p>
-     * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
+     * <img width="640" height="346" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3759,7 +3815,7 @@ public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends
      * current {@code Maybe}, where that function returns a {@link Single}.
      * When this {@code Maybe} just completes the resulting {@code Maybe} completes as well.
      * <p>
-     * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMapSingleElement} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3787,7 +3843,7 @@ public final <R> Maybe<R> flatMapSingleElement(@NonNull Function<? super T, ? ex
      * Returns a {@link Completable} that completes based on applying a specified function to the item emitted by the
      * current {@code Maybe}, where that function returns a {@code Completable}.
      * <p>
-     * <img width="640" height="267" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapCompletable.png" alt="">
+     * <img width="640" height="303" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapCompletable3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 81b0aaaffe..0a1d872b14 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -2278,6 +2278,86 @@ public final <U> Single<U> cast(@NonNull Class<? extends U> clazz) {
         return map(Functions.castFunction(clazz));
     }
 
+    /**
+     * Returns a {@code Single} that is based on applying a specified function to the item emitted by the current {@code Single},
+     * where that function returns a {@link SingleSource}.
+     * <p>
+     * <img width="640" height="313" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatMap.png" alt="">
+     * <p>
+     * The operator is an alias for {@link #flatMap(Function)}
+     * <dl>
+     * <dt><b>Scheduler:</b></dt>
+     * <dd>{@code concatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the result value type
+     * @param mapper
+     *            a function that, when applied to the item emitted by the current {@code Single}, returns a {@code SingleSource}
+     * @return the new {@code Single} returned from {@code mapper} when applied to the item emitted by the current {@code Single}
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <R> Single<R> concatMap(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        return RxJavaPlugins.onAssembly(new SingleFlatMap<>(this, mapper));
+    }
+
+    /**
+     * Returns a {@link Completable} that completes based on applying a specified function to the item emitted by the
+     * current {@code Single}, where that function returns a {@link CompletableSource}.
+     * <p>
+     * <img width="640" height="298" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatMapCompletable.png" alt="">
+     * <p>
+     * The operator is an alias for {@link #flatMapCompletable(Function)}.
+     * <dl>
+     * <dt><b>Scheduler:</b></dt>
+     * <dd>{@code concatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param mapper
+     *            a function that, when applied to the item emitted by the current {@code Single}, returns a
+     *            {@code CompletableSource}
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Completable concatMapCompletable(@NonNull Function<? super T, ? extends CompletableSource> mapper) {
+        return flatMapCompletable(mapper);
+    }
+
+    /**
+     * Returns a {@link Maybe} that is based on applying a specified function to the item emitted by the current {@code Single},
+     * where that function returns a {@link MaybeSource}.
+     * <p>
+     * <img width="640" height="254" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatMapMaybe.png" alt="">
+     * <p>
+     * The operator is an alias for {@link #flatMapMaybe(Function)}.
+     * <dl>
+     * <dt><b>Scheduler:</b></dt>
+     * <dd>{@code concatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R> the result value type
+     * @param mapper
+     *            a function that, when applied to the item emitted by the current {@code Single}, returns a {@code MaybeSource}
+     * @return the new {@code Maybe} returned from {@code mapper} when applied to the item emitted by the current {@code Single}
+     * @throws NullPointerException if {@code mapper} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <R> Maybe<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+        return flatMapMaybe(mapper);
+    }
+
     /**
      * Returns a {@link Flowable} that emits the item emitted by the current {@code Single}, then the item emitted by the
      * specified {@link SingleSource}.
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapCompletableTest.java
new file mode 100644
index 0000000000..e902bbf4df
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapCompletableTest.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeConcatMapCompletableTest extends RxJavaTest {
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Maybe.just(1).concatMapCompletable(new Function<Integer, Completable>() {
+            @Override
+            public Completable apply(Integer v) throws Exception {
+                return Completable.complete();
+            }
+        }));
+    }
+
+    @Test
+    public void mapperThrows() {
+        Maybe.just(1)
+        .concatMapCompletable(new Function<Integer, Completable>() {
+            @Override
+            public Completable apply(Integer v) throws Exception {
+                throw new TestException();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mapperReturnsNull() {
+        Maybe.just(1)
+        .concatMapCompletable(new Function<Integer, Completable>() {
+            @Override
+            public Completable apply(Integer v) throws Exception {
+                return null;
+            }
+        })
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapSingleTest.java
new file mode 100644
index 0000000000..2626b18e26
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapSingleTest.java
@@ -0,0 +1,142 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeConcatMapSingleTest extends RxJavaTest {
+    @Test
+    public void flatMapSingleElementValue() {
+        Maybe.just(1).concatMapSingle(new Function<Integer, SingleSource<Integer>>() {
+            @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                if (integer == 1) {
+                    return Single.just(2);
+                }
+
+                return Single.just(1);
+            }
+        })
+            .test()
+            .assertResult(2);
+    }
+
+    @Test
+    public void flatMapSingleElementValueDifferentType() {
+        Maybe.just(1).concatMapSingle(new Function<Integer, SingleSource<String>>() {
+            @Override public SingleSource<String> apply(final Integer integer) throws Exception {
+                if (integer == 1) {
+                    return Single.just("2");
+                }
+
+                return Single.just("1");
+            }
+        })
+            .test()
+            .assertResult("2");
+    }
+
+    @Test
+    public void flatMapSingleElementValueNull() {
+        Maybe.just(1).concatMapSingle(new Function<Integer, SingleSource<Integer>>() {
+            @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                return null;
+            }
+        })
+            .to(TestHelper.<Integer>testConsumer())
+            .assertNoValues()
+            .assertError(NullPointerException.class)
+            .assertErrorMessage("The mapper returned a null SingleSource");
+    }
+
+    @Test
+    public void flatMapSingleElementValueErrorThrown() {
+        Maybe.just(1).concatMapSingle(new Function<Integer, SingleSource<Integer>>() {
+            @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                throw new RuntimeException("something went terribly wrong!");
+            }
+        })
+            .to(TestHelper.<Integer>testConsumer())
+            .assertNoValues()
+            .assertError(RuntimeException.class)
+            .assertErrorMessage("something went terribly wrong!");
+    }
+
+    @Test
+    public void flatMapSingleElementError() {
+        RuntimeException exception = new RuntimeException("test");
+
+        Maybe.error(exception).concatMapSingle(new Function<Object, SingleSource<Object>>() {
+            @Override public SingleSource<Object> apply(final Object integer) throws Exception {
+                return Single.just(new Object());
+            }
+        })
+            .test()
+            .assertError(exception);
+    }
+
+    @Test
+    public void flatMapSingleElementEmpty() {
+        Maybe.<Integer>empty().concatMapSingle(new Function<Integer, SingleSource<Integer>>() {
+            @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                return Single.just(2);
+            }
+        })
+            .test()
+            .assertNoValues()
+            .assertResult();
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Maybe.just(1).concatMapSingle(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                return Single.just(2);
+            }
+        }));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybe(new Function<Maybe<Integer>, Maybe<Integer>>() {
+            @Override
+            public Maybe<Integer> apply(Maybe<Integer> m) throws Exception {
+                return m.concatMapSingle(new Function<Integer, SingleSource<Integer>>() {
+                    @Override
+                    public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                        return Single.just(2);
+                    }
+                });
+            }
+        });
+    }
+
+    @Test
+    public void singleErrors() {
+        Maybe.just(1)
+        .concatMapSingle(new Function<Integer, SingleSource<Integer>>() {
+                    @Override
+                    public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                        return Single.error(new TestException());
+                    }
+                })
+        .test()
+        .assertFailure(TestException.class);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapTest.java
new file mode 100644
index 0000000000..7504117df4
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapTest.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeConcatMapTest extends RxJavaTest {
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Maybe.just(1).concatMap(new Function<Integer, MaybeSource<Integer>>() {
+            @Override
+            public MaybeSource<Integer> apply(Integer v) throws Exception {
+                return Maybe.just(2);
+            }
+        }));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybe(new Function<Maybe<Integer>, MaybeSource<Integer>>() {
+            @Override
+            public MaybeSource<Integer> apply(Maybe<Integer> v) throws Exception {
+                return v.concatMap(new Function<Integer, MaybeSource<Integer>>() {
+                    @Override
+                    public MaybeSource<Integer> apply(Integer v) throws Exception {
+                        return Maybe.just(2);
+                    }
+                });
+            }
+        });
+    }
+
+    @Test
+    public void mainError() {
+        Maybe.<Integer>error(new TestException())
+        .concatMap(new Function<Integer, MaybeSource<Integer>>() {
+                    @Override
+                    public MaybeSource<Integer> apply(Integer v) throws Exception {
+                        return Maybe.just(2);
+                    }
+                })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mainEmpty() {
+        Maybe.<Integer>empty()
+        .concatMap(new Function<Integer, MaybeSource<Integer>>() {
+                    @Override
+                    public MaybeSource<Integer> apply(Integer v) throws Exception {
+                        return Maybe.just(2);
+                    }
+                })
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void mapperThrows() {
+        Maybe.just(1)
+        .concatMap(new Function<Integer, MaybeSource<Integer>>() {
+                    @Override
+                    public MaybeSource<Integer> apply(Integer v) throws Exception {
+                        throw new TestException();
+                    }
+                })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mapperReturnsNull() {
+        Maybe.just(1)
+        .concatMap(new Function<Integer, MaybeSource<Integer>>() {
+                    @Override
+                    public MaybeSource<Integer> apply(Integer v) throws Exception {
+                        return null;
+                    }
+                })
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapCompletableTest.java
new file mode 100644
index 0000000000..1a160f6465
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapCompletableTest.java
@@ -0,0 +1,114 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleConcatMapCompletableTest extends RxJavaTest {
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Single.just(1).concatMapCompletable(new Function<Integer, Completable>() {
+            @Override
+            public Completable apply(Integer v) throws Exception {
+                return Completable.complete();
+            }
+        }));
+    }
+
+    @Test
+    public void normal() {
+        final boolean[] b = { false };
+
+        Single.just(1)
+        .concatMapCompletable(new Function<Integer, Completable>() {
+            @Override
+            public Completable apply(Integer t) throws Exception {
+                return Completable.complete().doOnComplete(new Action() {
+                    @Override
+                    public void run() throws Exception {
+                        b[0] = true;
+                    }
+                });
+            }
+        })
+        .test()
+        .assertResult();
+
+        assertTrue(b[0]);
+    }
+
+    @Test
+    public void error() {
+        final boolean[] b = { false };
+
+        Single.<Integer>error(new TestException())
+        .concatMapCompletable(new Function<Integer, Completable>() {
+            @Override
+            public Completable apply(Integer t) throws Exception {
+                return Completable.complete().doOnComplete(new Action() {
+                    @Override
+                    public void run() throws Exception {
+                        b[0] = true;
+                    }
+                });
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(b[0]);
+    }
+
+    @Test
+    public void mapperThrows() {
+        final boolean[] b = { false };
+
+        Single.just(1)
+        .concatMapCompletable(new Function<Integer, Completable>() {
+            @Override
+            public Completable apply(Integer t) throws Exception {
+                throw new TestException();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+
+        assertFalse(b[0]);
+    }
+
+    @Test
+    public void mapperReturnsNull() {
+        final boolean[] b = { false };
+
+        Single.just(1)
+        .concatMapCompletable(new Function<Integer, Completable>() {
+            @Override
+            public Completable apply(Integer t) throws Exception {
+                return null;
+            }
+        })
+        .test()
+        .assertFailure(NullPointerException.class);
+
+        assertFalse(b[0]);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapMaybeTest.java
new file mode 100644
index 0000000000..dd25e7a53f
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapMaybeTest.java
@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleConcatMapMaybeTest extends RxJavaTest {
+    @Test
+    public void concatMapMaybeValue() {
+        Single.just(1).concatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
+            @Override public MaybeSource<Integer> apply(final Integer integer) throws Exception {
+                if (integer == 1) {
+                    return Maybe.just(2);
+                }
+
+                return Maybe.just(1);
+            }
+        })
+            .test()
+            .assertResult(2);
+    }
+
+    @Test
+    public void concatMapMaybeValueDifferentType() {
+        Single.just(1).concatMapMaybe(new Function<Integer, MaybeSource<String>>() {
+            @Override public MaybeSource<String> apply(final Integer integer) throws Exception {
+                if (integer == 1) {
+                    return Maybe.just("2");
+                }
+
+                return Maybe.just("1");
+            }
+        })
+            .test()
+            .assertResult("2");
+    }
+
+    @Test
+    public void concatMapMaybeValueNull() {
+        Single.just(1).concatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
+            @Override public MaybeSource<Integer> apply(final Integer integer) throws Exception {
+                return null;
+            }
+        })
+            .to(TestHelper.<Integer>testConsumer())
+            .assertNoValues()
+            .assertError(NullPointerException.class)
+            .assertErrorMessage("The mapper returned a null MaybeSource");
+    }
+
+    @Test
+    public void concatMapMaybeValueErrorThrown() {
+        Single.just(1).concatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
+            @Override public MaybeSource<Integer> apply(final Integer integer) throws Exception {
+                throw new RuntimeException("something went terribly wrong!");
+            }
+        })
+            .to(TestHelper.<Integer>testConsumer())
+            .assertNoValues()
+            .assertError(RuntimeException.class)
+            .assertErrorMessage("something went terribly wrong!");
+    }
+
+    @Test
+    public void concatMapMaybeError() {
+        RuntimeException exception = new RuntimeException("test");
+
+        Single.error(exception).concatMapMaybe(new Function<Object, MaybeSource<Object>>() {
+            @Override public MaybeSource<Object> apply(final Object integer) throws Exception {
+                return Maybe.just(new Object());
+            }
+        })
+            .test()
+            .assertError(exception);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Single.just(1).concatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
+            @Override
+            public MaybeSource<Integer> apply(Integer v) throws Exception {
+                return Maybe.just(1);
+            }
+        }));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingleToMaybe(new Function<Single<Integer>, MaybeSource<Integer>>() {
+            @Override
+            public MaybeSource<Integer> apply(Single<Integer> v) throws Exception {
+                return v.concatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
+                    @Override
+                    public MaybeSource<Integer> apply(Integer v) throws Exception {
+                        return Maybe.just(1);
+                    }
+                });
+            }
+        });
+    }
+
+    @Test
+    public void mapsToError() {
+        Single.just(1).concatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
+            @Override
+            public MaybeSource<Integer> apply(Integer v) throws Exception {
+                return Maybe.error(new TestException());
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mapsToEmpty() {
+        Single.just(1).concatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
+            @Override
+            public MaybeSource<Integer> apply(Integer v) throws Exception {
+                return Maybe.empty();
+            }
+        })
+        .test()
+        .assertResult();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapTest.java
new file mode 100644
index 0000000000..b0b5af17a6
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapTest.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleConcatMapTest extends RxJavaTest {
+
+    @Test
+    public void concatMapValue() {
+        Single.just(1).concatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                if (integer == 1) {
+                    return Single.just(2);
+                }
+
+                return Single.just(1);
+            }
+        })
+            .test()
+            .assertResult(2);
+    }
+
+    @Test
+    public void concatMapValueDifferentType() {
+        Single.just(1).concatMap(new Function<Integer, SingleSource<String>>() {
+            @Override public SingleSource<String> apply(final Integer integer) throws Exception {
+                if (integer == 1) {
+                    return Single.just("2");
+                }
+
+                return Single.just("1");
+            }
+        })
+            .test()
+            .assertResult("2");
+    }
+
+    @Test
+    public void concatMapValueNull() {
+        Single.just(1).concatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                return null;
+            }
+        })
+        .to(TestHelper.<Integer>testConsumer())
+            .assertNoValues()
+            .assertError(NullPointerException.class)
+            .assertErrorMessage("The single returned by the mapper is null");
+    }
+
+    @Test
+    public void concatMapValueErrorThrown() {
+        Single.just(1).concatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
+                throw new RuntimeException("something went terribly wrong!");
+            }
+        })
+            .to(TestHelper.<Integer>testConsumer())
+            .assertNoValues()
+            .assertError(RuntimeException.class)
+            .assertErrorMessage("something went terribly wrong!");
+    }
+
+    @Test
+    public void concatMapError() {
+        RuntimeException exception = new RuntimeException("test");
+
+        Single.error(exception).concatMap(new Function<Object, SingleSource<Object>>() {
+            @Override public SingleSource<Object> apply(final Object integer) throws Exception {
+                return Single.just(new Object());
+            }
+        })
+            .test()
+            .assertError(exception);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Single.just(1).concatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                return Single.just(2);
+            }
+        }));
+    }
+
+    @Test
+    public void mappedSingleOnError() {
+        Single.just(1).concatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                return Single.error(new TestException());
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingle(new Function<Single<Object>, SingleSource<Object>>() {
+            @Override
+            public SingleSource<Object> apply(Single<Object> s)
+                    throws Exception {
+                return s.concatMap(new Function<Object, SingleSource<? extends Object>>() {
+                    @Override
+                    public SingleSource<? extends Object> apply(Object v)
+                            throws Exception {
+                        return Single.just(v);
+                    }
+                });
+            }
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index a0ba3e52e4..0e2c0ada16 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -240,10 +240,16 @@ static String findNotes(String clazzName, String operatorName) {
             "    C concatMapCompletableDelayError       Always empty thus no items to map.",
             "  MS  concatMapDelayError                  Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMap`](#concatMap).",
             "    C concatMapDelayError                  Always empty thus no items to map.",
+            "  MS  concatMapEager                       At most one item to map. Use [`concatMap()`](#concatMap).",
+            "    C concatMapEager                       Always empty thus no items to map.",
+            "  MS  concatMapEagerDelayError             At most one item to map. Use [`concatMap()`](#concatMap).",
+            "    C concatMapEagerDelayError             Always empty thus no items to map.",
             "    C concatMapIterable                    Always empty thus no items to map.",
+            "  M   concatMapMaybe                       Use [`concatMap`](#concatMap).",
             "    C concatMapMaybe                       Always empty thus no items to map.",
             "  MS  concatMapMaybeDelayError             Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapMaybe`](#concatMapMaybe).",
             "    C concatMapMaybeDelayError             Always empty thus no items to map.",
+            "   S  concatMapSingle                      Use [`concatMap()`](#concatMap).",
             "    C concatMapSingle                      Always empty thus no items to map.",
             "  MS  concatMapSingleDelayError            Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapSingle`](#concatMapSingle).",
             "    C concatMapSingleDelayError            Always empty thus no items to map.",

From 9283700d3a04d495b0845f947ed119c1ed10ee94 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 27 Jan 2020 11:09:30 +0100
Subject: [PATCH 081/665] 3.x: Add various concatXDelayError operators (#6881)

---
 docs/Operator-Matrix.md                       |  34 ++---
 .../reactivex/rxjava3/core/Completable.java   |  91 +++++++++++
 .../java/io/reactivex/rxjava3/core/Maybe.java |  68 ++++++++-
 .../io/reactivex/rxjava3/core/Single.java     | 144 +++++++++++++++++-
 .../CompletableConcatArrayDelayErrorTest.java |  43 ++++++
 .../CompletableConcatDelayErrorTest.java      |  82 ++++++++++
 .../MaybeConcatArrayEagerDelayErrorTest.java  |  34 +++++
 .../SingleConcatArrayDelayErrorTest.java      |  34 +++++
 .../SingleConcatArrayEagerDelayErrorTest.java |  34 +++++
 .../single/SingleConcatDelayErrorTest.java    |  58 +++++++
 .../io/reactivex/rxjava3/maybe/MaybeTest.java |  11 ++
 11 files changed, 605 insertions(+), 28 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatDelayErrorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayDelayErrorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatDelayErrorTest.java

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index cd71558ddb..2ddd1cf21f 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -32,10 +32,10 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='compose'></a>`compose`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='concat'></a>`concat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='concatArray'></a>`concatArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='concatArrayDelayError'></a>`concatArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='concatArrayDelayError'></a>`concatArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='concatArrayEager'></a>`concatArrayEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArray().'>([24](#notes-24))</sup>|
-<a name='concatArrayEagerDelayError'></a>`concatArrayEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArrayDelayError().'>([25](#notes-25))</sup>|
-<a name='concatDelayError'></a>`concatDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='concatArrayEagerDelayError'></a>`concatArrayEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArrayDelayError().'>([25](#notes-25))</sup>|
+<a name='concatDelayError'></a>`concatDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='concatEager'></a>`concatEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use merge().'>([26](#notes-26))</sup>|
 <a name='concatMap'></a>`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='concatMapCompletable'></a>`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
@@ -237,7 +237,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([111](#notes-111))</sup>|
 <a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([112](#notes-112))</sup>|
 <a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([113](#notes-113))</sup>|
-<a name='total'></a>**237 operators** | **215** | **209** | **115** | **100** | **78** |
+<a name='total'></a>**237 operators** | **215** | **209** | **116** | **103** | **80** |
 
 #### Notes
 <a name='notes-1'></a><sup>1</sup> Use [`contains()`](#contains).<br/>
@@ -356,19 +356,13 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 
 #### Under development
 
-1. Single.concatArrayDelayError()
-2. Completable.concatArrayDelayError()
-3. Maybe.concatArrayEagerDelayError()
-4. Single.concatArrayEagerDelayError()
-5. Single.concatDelayError()
-6. Completable.concatDelayError()
-7. Single.mergeArray()
-8. Single.mergeArrayDelayError()
-9. Completable.onErrorReturn()
-10. Completable.onErrorReturnItem()
-11. Maybe.safeSubscribe()
-12. Single.safeSubscribe()
-13. Completable.safeSubscribe()
-14. Completable.sequenceEqual()
-15. Maybe.startWith()
-16. Single.startWith()
+1. Single.mergeArray()
+2. Single.mergeArrayDelayError()
+3. Completable.onErrorReturn()
+4. Completable.onErrorReturnItem()
+5. Maybe.safeSubscribe()
+6. Single.safeSubscribe()
+7. Completable.safeSubscribe()
+8. Completable.sequenceEqual()
+9. Maybe.startWith()
+10. Single.startWith()
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 9febbd1204..253610ef80 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -202,6 +202,27 @@ public static Completable concatArray(@NonNull CompletableSource... sources) {
         return RxJavaPlugins.onAssembly(new CompletableConcatArray(sources));
     }
 
+    /**
+     * Returns a {@code Completable} which completes only when all sources complete, one after another.
+     * <p>
+     * <img width="640" height="322" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatArrayDelayError.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param sources the sources to concatenate
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
+    public static Completable concatArrayDelayError(@NonNull CompletableSource... sources) {
+        return Flowable.fromArray(sources).concatMapCompletableDelayError(Functions.identity(), true, 2);
+    }
+
     /**
      * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
@@ -273,6 +294,76 @@ public static Completable concat(@NonNull Publisher<@NonNull ? extends Completab
         return RxJavaPlugins.onAssembly(new CompletableConcat(sources, prefetch));
     }
 
+    /**
+     * Returns a {@code Completable} which completes only when all sources complete, one after another.
+     * <p>
+     * <img width="640" height="361" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatDelayError.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param sources the sources to concatenate
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static Completable concatDelayError(@NonNull Iterable<@NonNull ? extends CompletableSource> sources) {
+        return Flowable.fromIterable(sources).concatMapCompletableDelayError(Functions.identity());
+    }
+
+    /**
+     * Returns a {@code Completable} which completes only when all sources complete, one after another.
+     * <p>
+     * <img width="640" height="396" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatDelayError.p.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
+     *  and expects the other {@link Publisher} to honor it as well.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param sources the sources to concatenate
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    @NonNull
+    public static Completable concatDelayError(@NonNull Publisher<@NonNull ? extends CompletableSource> sources) {
+        return concatDelayError(sources, 2);
+    }
+
+    /**
+     * Returns a {@code Completable} which completes only when all sources complete, one after another.
+     * <p>
+     * <img width="640" height="359" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatDelayError.pn.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
+     *  and expects the other {@link Publisher} to honor it as well.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param sources the sources to concatenate
+     * @param prefetch the number of sources to prefetch from the sources
+     * @return the new {@code Completable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public static Completable concatDelayError(@NonNull Publisher<@NonNull ? extends CompletableSource> sources, int prefetch) {
+        return Flowable.fromPublisher(sources).concatMapCompletableDelayError(Functions.identity(), true, prefetch);
+    }
+
     /**
      * Provides an API (via a cold {@code Completable}) that bridges the reactive world with the callback-style world.
      * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 6754f65e7b..ce02849d56 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -446,13 +446,42 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? exten
     public static <T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>... sources) {
         return Flowable.fromArray(sources).concatMapEager((Function)MaybeToPublisher.instance());
     }
+    /**
+     * Concatenates a sequence of {@link MaybeSource} eagerly into a {@link Flowable} sequence.
+     * <p>
+     * Eager concatenation means that once an observer subscribes, this operator subscribes to all of the
+     * source {@code MaybeSource}s. The operator buffers the value emitted by these {@code MaybeSource}s and then drains them
+     * in order, each one after the previous one completes.
+     * <p>
+     * <img width="640" height="428" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatArrayEagerDelayError.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code MaybeSource}s that need to be eagerly concatenated
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    @SafeVarargs
+    public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull MaybeSource<? extends T>... sources) {
+        return Flowable.fromArray(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true);
+    }
 
     /**
      * Concatenates the {@link Iterable} sequence of {@link MaybeSource}s into a single sequence by subscribing to each {@code MaybeSource},
      * one after the other, one at a time and delays any errors till the all inner {@code MaybeSource}s terminate
      * as a {@link Flowable} sequence.
      * <p>
-     * <img width="640" height="469" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatDelayError.i.png" alt="">
+     * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatDelayError3.i.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -465,14 +494,12 @@ public static <T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>
      * @return the new {@code Flowable} with the concatenating behavior
      * @throws NullPointerException if {@code sources} is {@code null}
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
-        Objects.requireNonNull(sources, "sources is null");
-        return Flowable.fromIterable(sources).concatMapDelayError((Function)MaybeToPublisher.instance());
+        return Flowable.fromIterable(sources).concatMapMaybeDelayError(Functions.identity());
     }
 
     /**
@@ -493,13 +520,42 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? exte
      * @return the new {@code Flowable} with the concatenating behavior
      * @throws NullPointerException if {@code sources} is {@code null}
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
-        return Flowable.fromPublisher(sources).concatMapDelayError((Function)MaybeToPublisher.instance());
+        return Flowable.fromPublisher(sources).concatMapMaybeDelayError(Functions.identity());
+    }
+    /**
+     * Concatenates the {@link Publisher} sequence of {@link MaybeSource}s into a single sequence by subscribing to each inner {@code MaybeSource},
+     * one after the other, one at a time and delays any errors till the all inner and the outer {@code Publisher} terminate
+     * as a {@link Flowable} sequence.
+     * <p>
+     * <img width="640" height="299" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatDelayError.pn.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>{@code concatDelayError} fully supports backpressure.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <T> the common element base type
+     * @param sources the {@code Publisher} sequence of {@code MaybeSource}s
+     * @param prefetch The number of upstream items to prefetch so that fresh items are
+     *                 ready to be mapped when a previous {@code MaybeSource} terminates.
+     *                 The operator replenishes after half of the prefetch amount has been consumed
+     *                 and turned into {@code MaybeSource}s.
+     * @return the new {@code Flowable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int prefetch) {
+        return Flowable.fromPublisher(sources).concatMapMaybeDelayError(Functions.identity(), true, prefetch);
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 0a1d872b14..9f5c3446c5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -406,10 +406,35 @@ public static <T> Flowable<T> concat(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @SafeVarargs
     public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>... sources) {
-        return RxJavaPlugins.onAssembly(new FlowableConcatMap(Flowable.fromArray(sources), SingleInternalHelper.toFlowable(), 2, ErrorMode.BOUNDARY));
+        return Flowable.fromArray(sources).concatMap(SingleInternalHelper.toFlowable(), 2);
+    }
+
+    /**
+     * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided in
+     * an array.
+     * <p>
+     * <img width="640" height="408" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatArrayDelayError.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer.</dd>
+     * <dt><b>Scheduler:</b></dt>
+     * <dd>{@code concatArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources the array of {@code SingleSource} instances
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
+    public static <T> Flowable<T> concatArrayDelayError(@NonNull SingleSource<? extends T>... sources) {
+        return Flowable.fromArray(sources).concatMapDelayError(SingleInternalHelper.toFlowable(), true, 2);
     }
 
     /**
@@ -440,6 +465,35 @@ public static <T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T
         return Flowable.fromArray(sources).concatMapEager(SingleInternalHelper.toFlowable());
     }
 
+    /**
+     * Concatenates a sequence of {@link SingleSource} eagerly into a single stream of values.
+     * <p>
+     * <img width="640" height="426" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatArrayEagerDelayError.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * source {@code SingleSource}s. The operator buffers the value emitted by these {@code SingleSource}s and then drains them
+     * in order, each one after the previous one succeeds.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
+    public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull SingleSource<? extends T>... sources) {
+        return Flowable.fromArray(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true);
+    }
+
     /**
      * Concatenates a {@link Publisher} sequence of {@link SingleSource}s eagerly into a single stream of values.
      * <p>
@@ -469,6 +523,92 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
         return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.toFlowable());
     }
 
+    /**
+     * Concatenates the {@link Iterable} sequence of {@link SingleSource}s into a single sequence by subscribing to each {@code SingleSource},
+     * one after the other, one at a time and delays any errors till the all inner {@code SingleSource}s terminate
+     * as a {@link Flowable} sequence.
+     * <p>
+     * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatDelayError.i.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <T> the common element base type
+     * @param sources the {@code Iterable} sequence of {@code SingleSource}s
+     * @return the new {@code Flowable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
+        return Flowable.fromIterable(sources).concatMapSingleDelayError(Functions.identity());
+    }
+
+    /**
+     * Concatenates the {@link Publisher} sequence of {@link SingleSource}s into a single sequence by subscribing to each inner {@code SingleSource},
+     * one after the other, one at a time and delays any errors till the all inner and the outer {@code Publisher} terminate
+     * as a {@link Flowable} sequence.
+     * <p>
+     * <img width="640" height="345" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatDelayError.p.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>{@code concatDelayError} fully supports backpressure.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <T> the common element base type
+     * @param sources the {@code Publisher} sequence of {@code SingleSource}s
+     * @return the new {@code Flowable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+        return Flowable.fromPublisher(sources).concatMapSingleDelayError(Functions.identity());
+    }
+
+    /**
+     * Concatenates the {@link Publisher} sequence of {@link SingleSource}s into a single sequence by subscribing to each inner {@code SingleSource},
+     * one after the other, one at a time and delays any errors till the all inner and the outer {@code Publisher} terminate
+     * as a {@link Flowable} sequence.
+     * <p>
+     * <img width="640" height="299" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatDelayError.pn.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>{@code concatDelayError} fully supports backpressure.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <T> the common element base type
+     * @param sources the {@code Publisher} sequence of {@code SingleSource}s
+     * @param prefetch The number of upstream items to prefetch so that fresh items are
+     *                 ready to be mapped when a previous {@code SingleSource} terminates.
+     *                 The operator replenishes after half of the prefetch amount has been consumed
+     *                 and turned into {@code SingleSource}s.
+     * @return the new {@code Flowable} with the concatenating behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code prefetch} is non-positive
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int prefetch) {
+        return Flowable.fromPublisher(sources).concatMapSingleDelayError(Functions.identity(), true, prefetch);
+    }
+
     /**
      * Concatenates an {@link Iterable} sequence of {@link SingleSource}s eagerly into a single stream of values.
      * <p>
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java
new file mode 100644
index 0000000000..229d00acc6
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.mockito.Mockito.*;
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+
+public class CompletableConcatArrayDelayErrorTest {
+
+    @Test
+    public void normal() throws Throwable {
+        Action action1 = mock(Action.class);
+        Action action2 = mock(Action.class);
+
+        Completable.concatArrayDelayError(
+                Completable.fromAction(action1),
+                Completable.error(new TestException()),
+                Completable.fromAction(action2)
+        )
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(action1).run();
+
+        verify(action2).run();
+    }
+
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatDelayErrorTest.java
new file mode 100644
index 0000000000..fd3124a96c
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatDelayErrorTest.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.mockito.Mockito.*;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
+
+public class CompletableConcatDelayErrorTest {
+
+    @Test
+    public void normalIterable() throws Throwable {
+        Action action1 = mock(Action.class);
+        Action action2 = mock(Action.class);
+
+        Completable.concatDelayError(Arrays.asList(
+                Completable.fromAction(action1),
+                Completable.error(new TestException()),
+                Completable.fromAction(action2)
+        ))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(action1).run();
+
+        verify(action2).run();
+    }
+
+    @Test
+    public void normalPublisher() throws Throwable {
+        Action action1 = mock(Action.class);
+        Action action2 = mock(Action.class);
+
+        Completable.concatDelayError(Flowable.fromArray(
+                Completable.fromAction(action1),
+                Completable.error(new TestException()),
+                Completable.fromAction(action2)
+        ))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(action1).run();
+
+        verify(action2).run();
+    }
+
+    @Test
+    public void normalPublisherPrefetch() throws Throwable {
+        Action action1 = mock(Action.class);
+        Action action2 = mock(Action.class);
+
+        Completable.concatDelayError(Flowable.fromArray(
+                Completable.fromAction(action1),
+                Completable.error(new TestException()),
+                Completable.fromAction(action2)
+        ), 1)
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(action1).run();
+
+        verify(action2).run();
+    }
+
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java
new file mode 100644
index 0000000000..6608fbc424
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Maybe;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class MaybeConcatArrayEagerDelayErrorTest {
+
+    @Test
+    public void normal() {
+        Maybe.concatArrayEagerDelayError(
+                Maybe.just(1),
+                Maybe.<Integer>error(new TestException()),
+                Maybe.empty(),
+                Maybe.just(2)
+        )
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayDelayErrorTest.java
new file mode 100644
index 0000000000..10fec20410
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayDelayErrorTest.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class SingleConcatArrayDelayErrorTest {
+
+    @Test
+    public void normal() {
+        Single.concatArrayDelayError(
+                Single.just(1),
+                Single.<Integer>error(new TestException()),
+                Single.just(2)
+        )
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java
new file mode 100644
index 0000000000..ce0df373bb
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class SingleConcatArrayEagerDelayErrorTest {
+
+    @Test
+    public void normal() {
+        Single.concatArrayEagerDelayError(
+                Single.just(1),
+                Single.<Integer>error(new TestException()),
+                Single.just(2)
+        )
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatDelayErrorTest.java
new file mode 100644
index 0000000000..83ae9cbf9e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatDelayErrorTest.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class SingleConcatDelayErrorTest {
+
+    @Test
+    public void normalIterable() {
+        Single.concatDelayError(Arrays.asList(
+                Single.just(1),
+                Single.<Integer>error(new TestException()),
+                Single.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void normalPublisher() {
+        Single.concatDelayError(Flowable.fromArray(
+                Single.just(1),
+                Single.<Integer>error(new TestException()),
+                Single.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void normalPublisherPrefetch() {
+        Single.concatDelayError(Flowable.fromArray(
+                Single.just(1),
+                Single.<Integer>error(new TestException()),
+                Single.just(2)
+        ), 1)
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+}
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index 7a0fe1ae7d..94cf62d641 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -2388,6 +2388,17 @@ public void concatPublisherDelayError() {
         .assertFailure(TestException.class, 1);
     }
 
+    @Test
+    public void concatPublisherDelayErrorPrefetch() {
+        Maybe.concatDelayError(Flowable.just(Maybe.empty(), Maybe.just(1), Maybe.error(new TestException())), 1)
+        .test()
+        .assertFailure(TestException.class, 1);
+
+        Maybe.concatDelayError(Flowable.just(Maybe.error(new TestException()), Maybe.empty(), Maybe.just(1)), 1)
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
     @Test
     public void concatEagerArray() {
         PublishProcessor<Integer> pp1 = PublishProcessor.create();

From 78c70d6a5365cb8db532d23397d5a0b4c114b72a Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 27 Jan 2020 12:42:57 +0100
Subject: [PATCH 082/665] 3.x: Add Single.mergeArray & mergeArrayDelayError
 (#6882)

* 3.x: Add Single.mergeArray & mergeArrayDelayError

* Remove unnecessary shortcut
---
 .../java/io/reactivex/rxjava3/core/Maybe.java |  6 +-
 .../io/reactivex/rxjava3/core/Single.java     | 77 ++++++++++++++++++-
 .../CancellableQueueFuseableTest.java         |  4 +-
 .../single/SingleMergeArrayTest.java          | 50 ++++++++++++
 4 files changed, 131 insertions(+), 6 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeArrayTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index ce02849d56..5e676681ff 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -1415,7 +1415,7 @@ public static <T> Flowable<T> merge(
     }
 
     /**
-     * Merges an array sequence of {@link MaybeSource} instances into a single {@link Flowable} sequence,
+     * Merges an array of {@link MaybeSource} instances into a single {@link Flowable} sequence,
      * running all {@code MaybeSource}s at once.
      * <p>
      * <img width="640" height="272" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeArray.png" alt="">
@@ -1470,10 +1470,10 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
      * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeArrayDelayError.png" alt="">
      * <p>
      * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code MaybeSource}s notify of an
-     * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
+     * error via {@link Subscriber#onError onError}, {@code mergeArrayDelayError} will refrain from propagating that
      * error notification until all of the merged {@code MaybeSource}s have finished emitting items.
      * <p>
-     * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeDelayError} will only
+     * Even if multiple merged {@code MaybeSource}s send {@code onError} notifications, {@code mergeArrayDelayError} will only
      * invoke the {@code onError} method of its subscribers once.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 9f5c3446c5..5e9b084ad2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -17,7 +17,7 @@
 import java.util.concurrent.*;
 import java.util.stream.*;
 
-import org.reactivestreams.Publisher;
+import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.disposables.Disposable;
@@ -1323,6 +1323,81 @@ public static <T> Flowable<T> merge(
         return merge(Flowable.fromArray(source1, source2, source3, source4));
     }
 
+    /**
+     * Merges an array of {@link SingleSource} instances into a single {@link Flowable} sequence,
+     * running all {@code SingleSource}s at once.
+     * <p>
+     * <img width="640" height="272" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeArray.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream.</dd>
+     * <dt><b>Scheduler:</b></dt>
+     * <dd>{@code mergeArray} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If any of the source {@code SingleSource}s signal a {@link Throwable} via {@code onError}, the resulting
+     *  {@code Flowable} terminates with that {@code Throwable} and all other source {@code SingleSource}s are disposed.
+     *  If more than one {@code SingleSource} signals an error, the resulting {@code Flowable} may terminate with the
+     *  first one's error or, depending on the concurrency of the sources, may terminate with a
+     *  {@link CompositeException} containing two or more of the various error signals.
+     *  {@code Throwable}s that didn't make into the composite will be sent (individually) to the global error handler via
+     *  {@link RxJavaPlugins#onError(Throwable)} method as {@link UndeliverableException} errors. Similarly, {@code Throwable}s
+     *  signaled by source(s) after the returned {@code Flowable} has been cancelled or terminated with a
+     *  (composite) error will be sent to the same global error handler.
+     *  Use {@link #mergeArrayDelayError(SingleSource...)} to merge sources and terminate only when all source {@code SingleSource}s
+     *  have completed or failed with an error.
+     *  </dd>
+     * </dl>
+     * @param <T> the common and resulting value type
+     * @param sources the array sequence of {@code SingleSource} sources
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @see #mergeArrayDelayError(SingleSource...)
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
+    public static <T> Flowable<T> mergeArray(SingleSource<? extends T>... sources) {
+        return Flowable.fromArray(sources).flatMapSingle(Functions.identity(), false, sources.length);
+    }
+
+    /**
+     * Flattens an array of {@link SingleSource}s into one {@link Flowable}, in a way that allows a subscriber to receive all
+     * successfully emitted items from each of the source {@code SingleSource}s without being interrupted by an error
+     * notification from one of them.
+     * <p>
+     * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeArrayDelayError.png" alt="">
+     * <p>
+     * This behaves like {@link #merge(Publisher)} except that if any of the merged {@code SingleSource}s notify of an
+     * error via {@link Subscriber#onError onError}, {@code mergeArrayDelayError} will refrain from propagating that
+     * error notification until all of the merged {@code SingleSource}s have finished emitting items.
+     * <p>
+     * Even if multiple merged {@code SingleSource}s send {@code onError} notifications, {@code mergeArrayDelayError} will only
+     * invoke the {@code onError} method of its subscribers once.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code mergeArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <T> the common element base type
+     * @param sources
+     *            the array of {@code SingleSource}s
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @SafeVarargs
+    @NonNull
+    public static <T> Flowable<T> mergeArrayDelayError(@NonNull SingleSource<? extends T>... sources) {
+        return Flowable.fromArray(sources).flatMapSingle(Functions.identity(), true, sources.length);
+    }
+
     /**
      * Merges an {@link Iterable} sequence of {@link SingleSource} instances into one {@link Flowable} sequence,
      * running all {@code SingleSource}s at once and delaying any error(s) until all sources succeed or fail.
diff --git a/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java b/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
index ed4718fd1c..e87bfd315a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
@@ -57,7 +57,7 @@ public void dispose() {
 
     @Test
     public void cancel2() {
-        AbstractEmptyQueueFuseable<Object> qs = new AbstractEmptyQueueFuseable<Object>() {};
+        AbstractEmptyQueueFuseable<Object> qs = new AbstractEmptyQueueFuseable<Object>() { };
 
         assertFalse(qs.isDisposed());
 
@@ -66,7 +66,7 @@ public void cancel2() {
 
     @Test
     public void dispose2() {
-        AbstractEmptyQueueFuseable<Object> qs = new AbstractEmptyQueueFuseable<Object>() {};
+        AbstractEmptyQueueFuseable<Object> qs = new AbstractEmptyQueueFuseable<Object>() { };
 
         assertFalse(qs.isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeArrayTest.java
new file mode 100644
index 0000000000..9434a4fcc1
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeArrayTest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class SingleMergeArrayTest extends RxJavaTest {
+
+    @Test
+    public void normal() {
+        Single.mergeArray(Single.just(1), Single.just(2), Single.just(3))
+        .test()
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void error() {
+        Single.mergeArray(Single.just(1), Single.error(new TestException()), Single.just(3))
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void normalDelayError() {
+        Single.mergeArrayDelayError(Single.just(1), Single.just(2), Single.just(3))
+        .test()
+        .assertResult(1, 2, 3);
+    }
+
+    @Test
+    public void errorDelayError() {
+        Single.mergeArrayDelayError(Single.just(1), Single.error(new TestException()), Single.just(3))
+        .test()
+        .assertFailure(TestException.class, 1, 3);
+    }
+}

From c4d995d57dce44c52f2e687689752cacaae8ec8f Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 27 Jan 2020 15:30:22 +0100
Subject: [PATCH 083/665] 3.x: Add Completable.sequenceEqual (#6884)

---
 .../reactivex/rxjava3/core/Completable.java   | 25 ++++++++++-
 .../CompletableSequenceEqualTest.java         | 43 +++++++++++++++++++
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSequenceEqualTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 253610ef80..e1787b9b46 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -29,7 +29,7 @@
 import io.reactivex.rxjava3.internal.operators.completable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.*;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
-import io.reactivex.rxjava3.internal.operators.single.SingleDelayWithCompletable;
+import io.reactivex.rxjava3.internal.operators.single.*;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -414,6 +414,29 @@ public static Completable create(@NonNull CompletableOnSubscribe source) {
         return RxJavaPlugins.onAssembly(new CompletableCreate(source));
     }
 
+    /**
+     * Compares two {@link CompletableSource}s and emits {@code true} via a {@link Single} if both complete.
+     * <p>
+     * <img width="640" height="187" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.sequenceEqual.png" alt="">
+     * <dl>
+     * <dt><b>Scheduler:</b></dt>
+     * <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param source1 the first {@code CompletableSource} instance
+     * @param source2 the second {@code CompletableSource} instance
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code source1} or {@code source2} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static Single<Boolean> sequenceEqual(@NonNull CompletableSource source1, @NonNull CompletableSource source2) { // NOPMD
+        Objects.requireNonNull(source1, "source1 is null");
+        Objects.requireNonNull(source2, "source2 is null");
+        return mergeArrayDelayError(source1, source2).andThen(Single.just(true));
+    }
+
     /**
      * Constructs a {@code Completable} instance by wrapping the given source callback
      * <strong>without any safeguards; you should manage the lifecycle and response
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSequenceEqualTest.java
new file mode 100644
index 0000000000..b7b68ad321
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSequenceEqualTest.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class CompletableSequenceEqualTest {
+
+    @Test
+    public void bothComplete() {
+        Completable.sequenceEqual(Completable.complete(), Completable.complete())
+        .test()
+        .assertResult(true);
+    }
+
+    @Test
+    public void firstFails() {
+        Completable.sequenceEqual(Completable.error(new TestException()), Completable.complete())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void secondFails() {
+        Completable.sequenceEqual(Completable.complete(), Completable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+    }
+}

From f86753aa4c15717740556ec34418e86edea1b146 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 27 Jan 2020 15:48:37 +0100
Subject: [PATCH 084/665] 3.x: Add missing startWith overloads (#6885)

* 3.x: Add missing startWith overloads

* Fix Javadocs copy-paste mistakes
---
 .../reactivex/rxjava3/core/Completable.java   |  59 +++++-
 .../io/reactivex/rxjava3/core/Flowable.java   |  75 +++++++
 .../java/io/reactivex/rxjava3/core/Maybe.java | 124 +++++++++++
 .../io/reactivex/rxjava3/core/Observable.java |  66 ++++++
 .../io/reactivex/rxjava3/core/Single.java     | 124 +++++++++++
 .../completable/CompletableStartWithTest.java |  67 ++++++
 .../flowable/FlowableStartWithTest.java       | 153 ++++++++++++++
 .../operators/maybe/MaybeStartWithTest.java   | 197 ++++++++++++++++++
 .../observable/ObservableStartWithTest.java   | 153 ++++++++++++++
 .../operators/single/SingleStartWithTest.java | 126 +++++++++++
 10 files changed, 1141 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableStartWithTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableStartWithTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeStartWithTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableStartWithTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleStartWithTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index e1787b9b46..2ab23028bd 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2595,7 +2595,7 @@ public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>
 
     /**
      * Returns a {@code Completable} which first runs the other {@link CompletableSource}
-     * then this {@code Completable} if the other completed normally.
+     * then the current {@code Completable} if the other completed normally.
      * <p>
      * <img width="640" height="437" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.startWith.c.png" alt="">
      * <dl>
@@ -2614,9 +2614,61 @@ public final Completable startWith(@NonNull CompletableSource other) {
         return concatArray(other, this);
     }
 
+    /**
+     * Returns a {@link Flowable} which first runs the other {@link SingleSource}
+     * then the current {@code Completable} if the other succeeded normally.
+     * <p>
+     * <img width="640" height="388" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.startWith.s.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the {@code other} {@code SingleSource}.
+     * @param other the other {@code SingleSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final <T> Flowable<T> startWith(@NonNull SingleSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Single.wrap(other).toFlowable(), toFlowable());
+    }
+
+    /**
+     * Returns a {@link Flowable} which first runs the other {@link MaybeSource}
+     * then the current {@code Completable} if the other succeeded or completed normally.
+     * <p>
+     * <img width="640" height="266" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.startWith.m.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the element type of the {@code other} {@code MaybeSource}.
+     * @param other the other {@code MaybeSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final <T> Flowable<T> startWith(@NonNull MaybeSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Maybe.wrap(other).toFlowable(), toFlowable());
+    }
+
     /**
      * Returns an {@link Observable} which first delivers the events
-     * of the other {@link ObservableSource} then runs this {@code Completable}.
+     * of the other {@link ObservableSource} then runs the current {@code Completable}.
      * <p>
      * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.startWith.o.png" alt="">
      * <dl>
@@ -2635,9 +2687,10 @@ public final <T> Observable<T> startWith(@NonNull ObservableSource<T> other) {
         Objects.requireNonNull(other, "other is null");
         return Observable.wrap(other).concatWith(this.toObservable());
     }
+
     /**
      * Returns a {@link Flowable} which first delivers the events
-     * of the other {@link Publisher} then runs this {@code Completable}.
+     * of the other {@link Publisher} then runs the current {@code Completable}.
      * <p>
      * <img width="640" height="250" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.startWith.p.png" alt="">
      * <dl>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index a994e526c5..453c9e4bba 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -15238,6 +15238,81 @@ public final Flowable<T> startWithIterable(@NonNull Iterable<@NonNull ? extends
         return concatArray(fromIterable(items), this);
     }
 
+    /**
+     * Returns a {@code Flowable} which first runs the other {@link CompletableSource}
+     * then the current {@code Flowable} if the other completed normally.
+     * <p>
+     * <img width="640" height="268" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.startWith.c.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code CompletableSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final Flowable<T> startWith(@NonNull CompletableSource other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Completable.wrap(other).<T>toFlowable(), this);
+    }
+
+    /**
+     * Returns a {@code Flowable} which first runs the other {@link SingleSource}
+     * then the current {@code Flowable} if the other succeeded normally.
+     * <p>
+     * <img width="640" height="248" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.startWith.s.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code SingleSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final Flowable<T> startWith(@NonNull SingleSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Single.wrap(other).toFlowable(), this);
+    }
+
+    /**
+     * Returns a {@code Flowable} which first runs the other {@link MaybeSource}
+     * then the current {@code Flowable} if the other succeeded or completed normally.
+     * <p>
+     * <img width="640" height="168" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.startWith.m.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code MaybeSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final Flowable<T> startWith(@NonNull MaybeSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Maybe.wrap(other).toFlowable(), this);
+    }
+
     /**
      * Returns a {@code Flowable} that emits the items in a specified {@link Publisher} before it begins to emit
      * items emitted by the current {@code Flowable}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 5e676681ff..96ff14c1e9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -20,6 +20,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
@@ -4859,6 +4860,129 @@ public final Maybe<T> retryWhen(
         return toFlowable().retryWhen(handler).singleElement();
     }
 
+    /**
+     * Returns a {@link Flowable} which first runs the other {@link CompletableSource}
+     * then the current {@code Maybe} if the other completed normally.
+     * <p>
+     * <img width="640" height="268" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.startWith.c.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code CompletableSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final Flowable<T> startWith(@NonNull CompletableSource other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Completable.wrap(other).<T>toFlowable(), toFlowable());
+    }
+
+    /**
+     * Returns a {@link Flowable} which first runs the other {@link SingleSource}
+     * then the current {@code Maybe} if the other succeeded normally.
+     * <p>
+     * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.startWith.s.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code SingleSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final Flowable<T> startWith(@NonNull SingleSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Single.wrap(other).toFlowable(), toFlowable());
+    }
+
+    /**
+     * Returns a {@link Flowable} which first runs the other {@link MaybeSource}
+     * then the current {@code Maybe} if the other succeeded or completed normally.
+     * <p>
+     * <img width="640" height="178" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.startWith.m.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code MaybeSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final Flowable<T> startWith(@NonNull MaybeSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Maybe.wrap(other).toFlowable(), toFlowable());
+    }
+
+    /**
+     * Returns an {@link Observable} which first delivers the events
+     * of the other {@link ObservableSource} then runs the current {@code Maybe}.
+     * <p>
+     * <img width="640" height="179" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.startWith.o.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code ObservableSource} to run first
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Observable<T> startWith(@NonNull ObservableSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Observable.wrap(other).concatWith(this.toObservable());
+    }
+
+    /**
+     * Returns a {@link Flowable} which first delivers the events
+     * of the other {@link Publisher} then runs the current {@code Maybe}.
+     * <p>
+     * <img width="640" height="179" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.startWith.p.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer
+     *  and expects the other {@code Publisher} to honor it as well.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code Publisher} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Flowable<T> startWith(@NonNull Publisher<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return toFlowable().startWith(other);
+    }
+
     /**
      * Subscribes to a {@code Maybe} and ignores {@code onSuccess} and {@code onComplete} emissions.
      * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 3ab0be1ab9..6db7ce3cc1 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -12704,6 +12704,72 @@ public final Observable<T> startWithIterable(@NonNull Iterable<@NonNull ? extend
         return concatArray(fromIterable(items), this);
     }
 
+    /**
+     * Returns an {@code Observable} which first runs the other {@link CompletableSource}
+     * then the current {@code Observable} if the other completed normally.
+     * <p>
+     * <img width="640" height="437" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.startWith.c.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code CompletableSource} to run first
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Observable<T> startWith(@NonNull CompletableSource other) {
+        Objects.requireNonNull(other, "other is null");
+        return Observable.concat(Completable.wrap(other).<T>toObservable(), this);
+    }
+
+    /**
+     * Returns an {@code Observable} which first runs the other {@link SingleSource}
+     * then the current {@code Observable} if the other succeeded normally.
+     * <p>
+     * <img width="640" height="248" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.startWith.s.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code SingleSource} to run first
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Observable<T> startWith(@NonNull SingleSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Observable.concat(Single.wrap(other).toObservable(), this);
+    }
+
+    /**
+     * Returns an {@code Observable} which first runs the other {@link MaybeSource}
+     * then the current {@code Observable} if the other succeeded or completed normally.
+     * <p>
+     * <img width="640" height="168" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.startWith.m.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code MaybeSource} to run first
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Observable<T> startWith(@NonNull MaybeSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Observable.concat(Maybe.wrap(other).toObservable(), this);
+    }
+
     /**
      * Returns an {@code Observable} that emits the items in a specified {@link ObservableSource} before it begins to emit
      * items emitted by the current {@code Observable}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 5e9b084ad2..5911000d28 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -20,6 +20,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
@@ -4286,6 +4287,129 @@ public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>,
         return toSingle(toFlowable().retryWhen(handler));
     }
 
+    /**
+     * Returns a {@link Flowable} which first runs the other {@link CompletableSource}
+     * then the current {@code Single} if the other completed normally.
+     * <p>
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.startWith.c.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code CompletableSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final Flowable<T> startWith(@NonNull CompletableSource other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Completable.wrap(other).<T>toFlowable(), toFlowable());
+    }
+
+    /**
+     * Returns a {@link Flowable} which first runs the other {@link SingleSource}
+     * then the current {@code Single} if the other succeeded normally.
+     * <p>
+     * <img width="640" height="341" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.startWith.s.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code SingleSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final Flowable<T> startWith(@NonNull SingleSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Single.wrap(other).toFlowable(), toFlowable());
+    }
+
+    /**
+     * Returns a {@link Flowable} which first runs the other {@link MaybeSource}
+     * then the current {@code Single} if the other succeeded or completed normally.
+     * <p>
+     * <img width="640" height="232" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.startWith.m.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code MaybeSource} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @BackpressureSupport(BackpressureKind.FULL)
+    public final Flowable<T> startWith(@NonNull MaybeSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Flowable.concat(Maybe.wrap(other).toFlowable(), toFlowable());
+    }
+
+    /**
+     * Returns an {@link Observable} which first delivers the events
+     * of the other {@link ObservableSource} then runs the current {@code Single}.
+     * <p>
+     * <img width="640" height="175" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.startWith.o.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code ObservableSource} to run first
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Observable<T> startWith(@NonNull ObservableSource<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return Observable.wrap(other).concatWith(this.toObservable());
+    }
+
+    /**
+     * Returns a {@link Flowable} which first delivers the events
+     * of the other {@link Publisher} then runs the current {@code Single}.
+     * <p>
+     * <img width="640" height="175" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.startWith.p.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer
+     *  and expects the other {@code Publisher} to honor it as well.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param other the other {@code Publisher} to run first
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code other} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final Flowable<T> startWith(@NonNull Publisher<T> other) {
+        Objects.requireNonNull(other, "other is null");
+        return toFlowable().startWith(other);
+    }
+
     /**
      * Subscribes to a {@code Single} but ignore its emission or notification.
      * <p>
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableStartWithTest.java
new file mode 100644
index 0000000000..065a600a0e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableStartWithTest.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.mockito.Mockito.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class CompletableStartWithTest {
+
+    @Test
+    public void singleNormal() {
+        Completable.complete().startWith(Single.just(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void singleError() {
+        Runnable run = mock(Runnable.class);
+
+        Completable.fromRunnable(run).startWith(Single.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void maybeNormal() {
+        Completable.complete().startWith(Maybe.just(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void maybeEmptyNormal() {
+        Completable.complete().startWith(Maybe.empty())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void maybeError() {
+        Runnable run = mock(Runnable.class);
+
+        Completable.fromRunnable(run).startWith(Maybe.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableStartWithTest.java
new file mode 100644
index 0000000000..68f4ee6272
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableStartWithTest.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import static org.mockito.Mockito.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class FlowableStartWithTest {
+
+    @Test
+    public void justCompletableComplete() {
+        Flowable.just(1).startWith(Completable.complete())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void emptyCompletableComplete() {
+        Flowable.empty().startWith(Completable.complete())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void runCompletableError() {
+        Runnable run = mock(Runnable.class);
+
+        Flowable.fromRunnable(run).startWith(Completable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justSingleJust() {
+        Flowable.just(1).startWith(Single.just(2))
+        .test()
+        .assertResult(2, 1);
+    }
+
+    @Test
+    public void emptySingleJust() {
+        Runnable run = mock(Runnable.class);
+
+        Flowable.fromRunnable(run)
+        .startWith(Single.just(2))
+        .test()
+        .assertResult(2);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void runSingleError() {
+        Runnable run = mock(Runnable.class);
+
+        Flowable.fromRunnable(run).startWith(Single.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justMaybeJust() {
+        Flowable.just(1).startWith(Maybe.just(2))
+        .test()
+        .assertResult(2, 1);
+    }
+
+    @Test
+    public void emptyMaybeJust() {
+        Runnable run = mock(Runnable.class);
+
+        Flowable.fromRunnable(run)
+        .startWith(Maybe.just(2))
+        .test()
+        .assertResult(2);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void runMaybeError() {
+        Runnable run = mock(Runnable.class);
+
+        Flowable.fromRunnable(run).startWith(Maybe.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justFlowableJust() {
+        Flowable.just(1).startWith(Flowable.just(2, 3, 4, 5))
+        .test()
+        .assertResult(2, 3, 4, 5, 1);
+    }
+
+    @Test
+    public void emptyFlowableJust() {
+        Runnable run = mock(Runnable.class);
+
+        Flowable.fromRunnable(run)
+        .startWith(Flowable.just(2, 3, 4, 5))
+        .test()
+        .assertResult(2, 3, 4, 5);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void emptyFlowableEmpty() {
+        Runnable run = mock(Runnable.class);
+        Runnable run2 = mock(Runnable.class);
+
+        Flowable.fromRunnable(run)
+        .startWith(Flowable.fromRunnable(run2))
+        .test()
+        .assertResult();
+
+        verify(run).run();
+        verify(run2).run();
+    }
+
+    @Test
+    public void runFlowableError() {
+        Runnable run = mock(Runnable.class);
+
+        Flowable.fromRunnable(run).startWith(Flowable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeStartWithTest.java
new file mode 100644
index 0000000000..87969974d4
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeStartWithTest.java
@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.mockito.Mockito.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class MaybeStartWithTest {
+
+    @Test
+    public void justCompletableComplete() {
+        Maybe.just(1).startWith(Completable.complete())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void emptyCompletableComplete() {
+        Maybe.empty().startWith(Completable.complete())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void runCompletableError() {
+        Runnable run = mock(Runnable.class);
+
+        Maybe.fromRunnable(run).startWith(Completable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justSingleJust() {
+        Maybe.just(1).startWith(Single.just(2))
+        .test()
+        .assertResult(2, 1);
+    }
+
+    @Test
+    public void emptySingleJust() {
+        Runnable run = mock(Runnable.class);
+
+        Maybe.fromRunnable(run)
+        .startWith(Single.just(2))
+        .test()
+        .assertResult(2);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void runSingleError() {
+        Runnable run = mock(Runnable.class);
+
+        Maybe.fromRunnable(run).startWith(Single.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justMaybeJust() {
+        Maybe.just(1).startWith(Maybe.just(2))
+        .test()
+        .assertResult(2, 1);
+    }
+
+    @Test
+    public void emptyMaybeJust() {
+        Runnable run = mock(Runnable.class);
+
+        Maybe.fromRunnable(run)
+        .startWith(Maybe.just(2))
+        .test()
+        .assertResult(2);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void runMaybeError() {
+        Runnable run = mock(Runnable.class);
+
+        Maybe.fromRunnable(run).startWith(Maybe.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justObservableJust() {
+        Maybe.just(1).startWith(Observable.just(2, 3, 4, 5))
+        .test()
+        .assertResult(2, 3, 4, 5, 1);
+    }
+
+    @Test
+    public void emptyObservableJust() {
+        Runnable run = mock(Runnable.class);
+
+        Maybe.fromRunnable(run)
+        .startWith(Observable.just(2, 3, 4, 5))
+        .test()
+        .assertResult(2, 3, 4, 5);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void emptyObservableEmpty() {
+        Runnable run = mock(Runnable.class);
+        Runnable run2 = mock(Runnable.class);
+
+        Maybe.fromRunnable(run)
+        .startWith(Observable.fromRunnable(run2))
+        .test()
+        .assertResult();
+
+        verify(run).run();
+        verify(run2).run();
+    }
+
+    @Test
+    public void runObservableError() {
+        Runnable run = mock(Runnable.class);
+
+        Maybe.fromRunnable(run).startWith(Observable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justFlowableJust() {
+        Maybe.just(1).startWith(Flowable.just(2, 3, 4, 5))
+        .test()
+        .assertResult(2, 3, 4, 5, 1);
+    }
+
+    @Test
+    public void emptyFlowableJust() {
+        Runnable run = mock(Runnable.class);
+
+        Maybe.fromRunnable(run)
+        .startWith(Flowable.just(2, 3, 4, 5))
+        .test()
+        .assertResult(2, 3, 4, 5);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void emptyFlowableEmpty() {
+        Runnable run = mock(Runnable.class);
+        Runnable run2 = mock(Runnable.class);
+
+        Maybe.fromRunnable(run)
+        .startWith(Flowable.fromRunnable(run2))
+        .test()
+        .assertResult();
+
+        verify(run).run();
+        verify(run2).run();
+    }
+
+    @Test
+    public void runFlowableError() {
+        Runnable run = mock(Runnable.class);
+
+        Maybe.fromRunnable(run).startWith(Flowable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableStartWithTest.java
new file mode 100644
index 0000000000..47cf4dc962
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableStartWithTest.java
@@ -0,0 +1,153 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.observable;
+
+import static org.mockito.Mockito.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class ObservableStartWithTest {
+
+    @Test
+    public void justCompletableComplete() {
+        Observable.just(1).startWith(Completable.complete())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void emptyCompletableComplete() {
+        Observable.empty().startWith(Completable.complete())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void runCompletableError() {
+        Runnable run = mock(Runnable.class);
+
+        Observable.fromRunnable(run).startWith(Completable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justSingleJust() {
+        Observable.just(1).startWith(Single.just(2))
+        .test()
+        .assertResult(2, 1);
+    }
+
+    @Test
+    public void emptySingleJust() {
+        Runnable run = mock(Runnable.class);
+
+        Observable.fromRunnable(run)
+        .startWith(Single.just(2))
+        .test()
+        .assertResult(2);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void runSingleError() {
+        Runnable run = mock(Runnable.class);
+
+        Observable.fromRunnable(run).startWith(Single.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justMaybeJust() {
+        Observable.just(1).startWith(Maybe.just(2))
+        .test()
+        .assertResult(2, 1);
+    }
+
+    @Test
+    public void emptyMaybeJust() {
+        Runnable run = mock(Runnable.class);
+
+        Observable.fromRunnable(run)
+        .startWith(Maybe.just(2))
+        .test()
+        .assertResult(2);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void runMaybeError() {
+        Runnable run = mock(Runnable.class);
+
+        Observable.fromRunnable(run).startWith(Maybe.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+
+    @Test
+    public void justObservableJust() {
+        Observable.just(1).startWith(Observable.just(2, 3, 4, 5))
+        .test()
+        .assertResult(2, 3, 4, 5, 1);
+    }
+
+    @Test
+    public void emptyObservableJust() {
+        Runnable run = mock(Runnable.class);
+
+        Observable.fromRunnable(run)
+        .startWith(Observable.just(2, 3, 4, 5))
+        .test()
+        .assertResult(2, 3, 4, 5);
+
+        verify(run).run();
+    }
+
+    @Test
+    public void emptyObservableEmpty() {
+        Runnable run = mock(Runnable.class);
+        Runnable run2 = mock(Runnable.class);
+
+        Observable.fromRunnable(run)
+        .startWith(Observable.fromRunnable(run2))
+        .test()
+        .assertResult();
+
+        verify(run).run();
+        verify(run2).run();
+    }
+
+    @Test
+    public void runObservableError() {
+        Runnable run = mock(Runnable.class);
+
+        Observable.fromRunnable(run).startWith(Observable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+
+        verify(run, never()).run();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleStartWithTest.java
new file mode 100644
index 0000000000..a3f7e7225a
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleStartWithTest.java
@@ -0,0 +1,126 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class SingleStartWithTest {
+
+    @Test
+    public void justCompletableComplete() {
+        Single.just(1)
+        .startWith(Completable.complete())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void justCompletableError() {
+        Single.just(1)
+        .startWith(Completable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void justSingleJust() {
+        Single.just(1)
+        .startWith(Single.just(0))
+        .test()
+        .assertResult(0, 1);
+    }
+
+    @Test
+    public void justSingleError() {
+        Single.just(1)
+        .startWith(Single.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void justMaybeJust() {
+        Single.just(1)
+        .startWith(Maybe.just(0))
+        .test()
+        .assertResult(0, 1);
+    }
+
+    @Test
+    public void justMaybeEmpty() {
+        Single.just(1)
+        .startWith(Maybe.empty())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void justMaybeError() {
+        Single.just(1)
+        .startWith(Maybe.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void justObservableJust() {
+        Single.just(1)
+        .startWith(Observable.just(-1, 0))
+        .test()
+        .assertResult(-1, 0, 1);
+    }
+
+    @Test
+    public void justObservableEmpty() {
+        Single.just(1)
+        .startWith(Observable.empty())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void justObservableError() {
+        Single.just(1)
+        .startWith(Observable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void justFlowableJust() {
+        Single.just(1)
+        .startWith(Flowable.just(-1, 0))
+        .test()
+        .assertResult(-1, 0, 1);
+    }
+
+    @Test
+    public void justFlowableEmpty() {
+        Single.just(1)
+        .startWith(Observable.empty())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void justFlowableError() {
+        Single.just(1)
+        .startWith(Flowable.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+    }
+}

From e077ed832678f5efeb15748d2a4aa4aafd29ef5a Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 28 Jan 2020 10:51:11 +0100
Subject: [PATCH 085/665] 3.x: Add Completable.onErrorReturn[Item] (#6886)

---
 .../reactivex/rxjava3/core/Completable.java   | 58 +++++++++++
 .../java/io/reactivex/rxjava3/core/Maybe.java |  6 +-
 .../completable/CompletableOnErrorReturn.java | 99 +++++++++++++++++++
 .../operators/maybe/MaybeOnErrorReturn.java   | 14 +--
 .../completable/CompletableOnErrorXTest.java  | 57 +++++++++++
 5 files changed, 224 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorReturn.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 2ab23028bd..7e28439ae2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2323,6 +2323,64 @@ public final Completable onErrorResumeWith(@NonNull CompletableSource fallback)
         return onErrorResumeNext(Functions.justFunction(fallback));
     }
 
+    /**
+     * Ends the flow with a success item returned by a function for the {@link Throwable} error signaled by the current
+     * {@code Completable} instead of signaling the error via {@code onError}.
+     * <p>
+     * <img width="640" height="567" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.onErrorReturn.png" alt="">
+     * <p>
+     * You can use this to prevent errors from propagating or to supply fallback data should errors be
+     * encountered.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onErrorReturn} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <T> the item type to return on error
+     * @param itemSupplier
+     *            a function that returns a single value that will be emitted as success value
+     *            the current {@code Completable} signals an {@code onError} event
+     * @return the new {@link Maybe} instance
+     * @throws NullPointerException if {@code itemSupplier} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <T> Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> itemSupplier) {
+        Objects.requireNonNull(itemSupplier, "itemSupplier is null");
+        return RxJavaPlugins.onAssembly(new CompletableOnErrorReturn<>(this, itemSupplier));
+    }
+
+    /**
+     * Ends the flow with the given success item when the current {@code Completable}
+     * fails instead of signaling the error via {@code onError}.
+     * <p>
+     * <img width="640" height="567" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.onErrorReturnItem.png" alt="">
+     * <p>
+     * You can use this to prevent errors from propagating or to supply fallback data should errors be
+     * encountered.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onErrorReturnItem} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <T> the item type to return on error
+     * @param item
+     *            the value that is emitted as {@code onSuccess} in case the current {@code Completable} signals an {@code onError}
+     * @return the new {@link Maybe} instance
+     * @throws NullPointerException if {@code item} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <T> Maybe<T> onErrorReturnItem(@NonNull T item) {
+        Objects.requireNonNull(item, "item is null");
+        return onErrorReturn(Functions.justFunction(item));
+    }
+
     /**
      * Nulls out references to the upstream producer and downstream {@link CompletableObserver} if
      * the sequence is terminated or downstream calls {@code dispose()}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 96ff14c1e9..40902efa53 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -4467,7 +4467,7 @@ public final Maybe<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? e
      * Ends the flow with a success item returned by a function for the {@link Throwable} error signaled by the current
      * {@code Maybe} instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
+     * <img width="640" height="377" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.onErrorReturn.png" alt="">
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
      * encountered.
@@ -4494,7 +4494,7 @@ public final Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? exten
     /**
      * Ends the flow with the given success item when the current {@code Maybe} fails instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
+     * <img width="640" height="377" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.onErrorReturnItem.png" alt="">
      * <p>
      * You can use this to prevent errors from propagating or to supply fallback data should errors be
      * encountered.
@@ -4504,7 +4504,7 @@ public final Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? exten
      * </dl>
      *
      * @param item
-     *            the value that is emitted as {@code onSuccess} in case this {@code Maybe} signals an {@code onError}
+     *            the value that is emitted as {@code onSuccess} in case the current {@code Maybe} signals an {@code onError}
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code item} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/catch.html">ReactiveX operators documentation: Catch</a>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorReturn.java
new file mode 100644
index 0000000000..c8fa43499f
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorReturn.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+
+import java.util.Objects;
+
+/**
+ * Returns a value generated via a function if the main source signals an onError.
+ * @param <T> the value type
+ * @since 3.0.0
+ */
+public final class CompletableOnErrorReturn<T> extends Maybe<T> {
+
+    final CompletableSource source;
+
+    final Function<? super Throwable, ? extends T> valueSupplier;
+
+    public CompletableOnErrorReturn(CompletableSource source,
+            Function<? super Throwable, ? extends T> valueSupplier) {
+        this.source = source;
+        this.valueSupplier = valueSupplier;
+    }
+
+    @Override
+    protected void subscribeActual(MaybeObserver<? super T> observer) {
+        source.subscribe(new OnErrorReturnMaybeObserver<>(observer, valueSupplier));
+    }
+
+    static final class OnErrorReturnMaybeObserver<T> implements CompletableObserver, Disposable {
+
+        final MaybeObserver<? super T> downstream;
+
+        final Function<? super Throwable, ? extends T> itemSupplier;
+
+        Disposable upstream;
+
+        OnErrorReturnMaybeObserver(MaybeObserver<? super T> actual,
+                Function<? super Throwable, ? extends T> itemSupplier) {
+            this.downstream = actual;
+            this.itemSupplier = itemSupplier;
+        }
+
+        @Override
+        public void dispose() {
+            upstream.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return upstream.isDisposed();
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            T v;
+
+            try {
+                v = Objects.requireNonNull(itemSupplier.apply(e), "The itemSupplier returned a null value");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(new CompositeException(e, ex));
+                return;
+            }
+
+            downstream.onSuccess(v);
+        }
+
+        @Override
+        public void onComplete() {
+            downstream.onComplete();
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
index 1a75120e84..190856d5c7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
@@ -27,31 +27,31 @@
  */
 public final class MaybeOnErrorReturn<T> extends AbstractMaybeWithUpstream<T, T> {
 
-    final Function<? super Throwable, ? extends T> valueSupplier;
+    final Function<? super Throwable, ? extends T> itemSupplier;
 
     public MaybeOnErrorReturn(MaybeSource<T> source,
-            Function<? super Throwable, ? extends T> valueSupplier) {
+            Function<? super Throwable, ? extends T> itemSupplier) {
         super(source);
-        this.valueSupplier = valueSupplier;
+        this.itemSupplier = itemSupplier;
     }
 
     @Override
     protected void subscribeActual(MaybeObserver<? super T> observer) {
-        source.subscribe(new OnErrorReturnMaybeObserver<>(observer, valueSupplier));
+        source.subscribe(new OnErrorReturnMaybeObserver<>(observer, itemSupplier));
     }
 
     static final class OnErrorReturnMaybeObserver<T> implements MaybeObserver<T>, Disposable {
 
         final MaybeObserver<? super T> downstream;
 
-        final Function<? super Throwable, ? extends T> valueSupplier;
+        final Function<? super Throwable, ? extends T> itemSupplier;
 
         Disposable upstream;
 
         OnErrorReturnMaybeObserver(MaybeObserver<? super T> actual,
                 Function<? super Throwable, ? extends T> valueSupplier) {
             this.downstream = actual;
-            this.valueSupplier = valueSupplier;
+            this.itemSupplier = valueSupplier;
         }
 
         @Override
@@ -83,7 +83,7 @@ public void onError(Throwable e) {
             T v;
 
             try {
-                v = Objects.requireNonNull(valueSupplier.apply(e), "The valueSupplier returned a null value");
+                v = Objects.requireNonNull(itemSupplier.apply(e), "The itemSupplier returned a null value");
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
                 downstream.onError(new CompositeException(e, ex));
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java
index 4a1333b530..531f13b8cc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java
@@ -15,10 +15,16 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.IOException;
+
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableOnErrorXTest extends RxJavaTest {
 
@@ -46,4 +52,55 @@ public CompletableSource apply(Throwable e) throws Exception {
 
         assertEquals(0, call[0]);
     }
+
+    @Test
+    public void onErrorReturnConst() {
+        Completable.error(new TestException())
+        .onErrorReturnItem(1)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void onErrorReturn() {
+        Completable.error(new TestException())
+        .onErrorReturn(Functions.justFunction(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void onErrorReturnFunctionThrows() {
+        TestHelper.assertCompositeExceptions(Completable.error(new TestException())
+        .onErrorReturn(new Function<Throwable, Object>() {
+            @Override
+            public Object apply(Throwable v) throws Exception {
+                throw new IOException();
+            }
+        })
+        .to(TestHelper.testConsumer()), TestException.class, IOException.class);
+    }
+
+    @Test
+    public void onErrorReturnEmpty() {
+        Completable.complete()
+        .onErrorReturnItem(2)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void onErrorReturnDispose() {
+        TestHelper.checkDisposed(CompletableSubject.create().onErrorReturnItem(1));
+    }
+
+    @Test
+    public void onErrorReturnDoubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeCompletableToMaybe(new Function<Completable, MaybeSource<Object>>() {
+            @Override
+            public MaybeSource<Object> apply(Completable v) throws Exception {
+                return v.onErrorReturnItem(1);
+            }
+        });
+    }
 }

From 2d8660e070fe65b8089855ba1a58ef49d7c1b70a Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 28 Jan 2020 12:06:37 +0100
Subject: [PATCH 086/665] 3.x: Add safeSubscribe to Maybe, Single & Completable
 (#6887)

---
 docs/Operator-Matrix.md                       |  27 +--
 .../reactivex/rxjava3/core/Completable.java   |  25 +++
 .../java/io/reactivex/rxjava3/core/Maybe.java |  25 +++
 .../io/reactivex/rxjava3/core/Single.java     |  25 +++
 .../observers/SafeCompletableObserver.java    |  78 +++++++
 .../internal/observers/SafeMaybeObserver.java |  91 ++++++++
 .../observers/SafeSingleObserver.java         |  79 +++++++
 .../CompletableSafeSubscribeTest.java         | 148 +++++++++++++
 .../maybe/MaybeSafeSubscribeTest.java         | 197 ++++++++++++++++++
 .../single/SingleSafeSubscribeTest.java       | 154 ++++++++++++++
 .../util/OperatorMatrixGenerator.java         |   7 +-
 11 files changed, 837 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/observers/SafeCompletableObserver.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/observers/SafeMaybeObserver.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/observers/SafeSingleObserver.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSafeSubscribeTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSafeSubscribeTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSafeSubscribeTest.java

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index 2ddd1cf21f..dfa16162e7 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -138,8 +138,8 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='mapOptional'></a>`mapOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
 <a name='materialize'></a>`materialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='merge'></a>`merge`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='mergeArray'></a>`mergeArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='mergeArrayDelayError'></a>`mergeArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='mergeArray'></a>`mergeArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='mergeArrayDelayError'></a>`mergeArrayDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='mergeDelayError'></a>`mergeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='mergeWith'></a>`mergeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='never'></a>`never`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -151,8 +151,8 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='onErrorComplete'></a>`onErrorComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='onErrorResumeNext'></a>`onErrorResumeNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='onErrorResumeWith'></a>`onErrorResumeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='onErrorReturn'></a>`onErrorReturn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
-<a name='onErrorReturnItem'></a>`onErrorReturnItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='onErrorReturn'></a>`onErrorReturn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='onErrorReturnItem'></a>`onErrorReturnItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='onTerminateDetach'></a>`onTerminateDetach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='parallel'></a>`parallel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([86](#notes-86))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Needs backpressure thus not supported outside Flowable.'>([86](#notes-86))</sup>|
 <a name='publish'></a>`publish`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([89](#notes-89))</sup>|
@@ -168,11 +168,11 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='retry'></a>`retry`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='retryUntil'></a>`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='retryWhen'></a>`retryWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='safeSubscribe'></a>`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='safeSubscribe'></a>`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
 <a name='scan'></a>`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
 <a name='scanWith'></a>`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
-<a name='sequenceEqual'></a>`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|
+<a name='sequenceEqual'></a>`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='serialize'></a>`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([93](#notes-93))</sup>|
 <a name='share'></a>`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([89](#notes-89))</sup>|
 <a name='single'></a>`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([41](#notes-41))</sup>|
@@ -185,7 +185,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='skipUntil'></a>`skipUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([94](#notes-94))</sup>|
 <a name='skipWhile'></a>`skipWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
 <a name='sorted'></a>`sorted`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|
-<a name='startWith'></a>`startWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_half.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='startWith'></a>`startWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='startWithArray'></a>`startWithArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([96](#notes-96))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([96](#notes-96))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([96](#notes-96))</sup>|
 <a name='startWithItem'></a>`startWithItem`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([97](#notes-97))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of another reactive type.'>([97](#notes-97))</sup>|
 <a name='startWithIterable'></a>`startWithIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([98](#notes-98))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use startWith() of Flowable or Observable.'>([98](#notes-98))</sup>|
@@ -237,7 +237,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([111](#notes-111))</sup>|
 <a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([112](#notes-112))</sup>|
 <a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([113](#notes-113))</sup>|
-<a name='total'></a>**237 operators** | **215** | **209** | **116** | **103** | **80** |
+<a name='total'></a>**237 operators** | **215** | **209** | **118** | **107** | **84** |
 
 #### Notes
 <a name='notes-1'></a><sup>1</sup> Use [`contains()`](#contains).<br/>
@@ -356,13 +356,4 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 
 #### Under development
 
-1. Single.mergeArray()
-2. Single.mergeArrayDelayError()
-3. Completable.onErrorReturn()
-4. Completable.onErrorReturnItem()
-5. Maybe.safeSubscribe()
-6. Single.safeSubscribe()
-7. Completable.safeSubscribe()
-8. Completable.sequenceEqual()
-9. Maybe.startWith()
-10. Single.startWith()
+*Currently, all intended operators are implemented.*
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 7e28439ae2..83e7848a51 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2651,6 +2651,31 @@ public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>
         return fromPublisher(toFlowable().retryWhen(handler));
     }
 
+    /**
+     * Wraps the given {@link CompletableObserver}, catches any {@link RuntimeException}s thrown by its
+     * {@link CompletableObserver#onSubscribe(Disposable)}, {@link CompletableObserver#onError(Throwable)}
+     * or {@link CompletableObserver#onComplete()} methods and routes those to the global
+     * error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     * <p>
+     * By default, the {@code Completable} protocol forbids the {@code onXXX} methods to throw, but some
+     * {@code CompletableObserver} implementation may do it anyway, causing undefined behavior in the
+     * upstream. This method and the underlying safe wrapper ensures such misbehaving consumers don't
+     * disrupt the protocol.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code safeSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param observer the potentially misbehaving {@code CompletableObserver}
+     * @throws NullPointerException if {@code observer} is {@code null}
+     * @see #subscribe(Action, Consumer)
+     * @since 3.0.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void safeSubscribe(@NonNull CompletableObserver observer) {
+        Objects.requireNonNull(observer, "observer is null");
+        subscribe(new SafeCompletableObserver(observer));
+    }
+
     /**
      * Returns a {@code Completable} which first runs the other {@link CompletableSource}
      * then the current {@code Completable} if the other completed normally.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 40902efa53..ba42452513 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -4860,6 +4860,31 @@ public final Maybe<T> retryWhen(
         return toFlowable().retryWhen(handler).singleElement();
     }
 
+    /**
+     * Wraps the given {@link MaybeObserver}, catches any {@link RuntimeException}s thrown by its
+     * {@link MaybeObserver#onSubscribe(Disposable)}, {@link MaybeObserver#onSuccess(Object)},
+     * {@link MaybeObserver#onError(Throwable)} or {@link MaybeObserver#onComplete()} methods
+     * and routes those to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     * <p>
+     * By default, the {@code Maybe} protocol forbids the {@code onXXX} methods to throw, but some
+     * {@code MaybeObserver} implementation may do it anyway, causing undefined behavior in the
+     * upstream. This method and the underlying safe wrapper ensures such misbehaving consumers don't
+     * disrupt the protocol.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code safeSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param observer the potentially misbehaving {@code MaybeObserver}
+     * @throws NullPointerException if {@code observer} is {@code null}
+     * @see #subscribe(Consumer,Consumer, Action)
+     * @since 3.0.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void safeSubscribe(@NonNull MaybeObserver<? super T> observer) {
+        Objects.requireNonNull(observer, "observer is null");
+        subscribe(new SafeMaybeObserver<>(observer));
+    }
+
     /**
      * Returns a {@link Flowable} which first runs the other {@link CompletableSource}
      * then the current {@code Maybe} if the other completed normally.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 5911000d28..12431fedb6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -4287,6 +4287,31 @@ public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>,
         return toSingle(toFlowable().retryWhen(handler));
     }
 
+    /**
+     * Wraps the given {@link SingleObserver}, catches any {@link RuntimeException}s thrown by its
+     * {@link SingleObserver#onSubscribe(Disposable)}, {@link SingleObserver#onSuccess(Object)} or
+     * {@link SingleObserver#onError(Throwable)} methods* and routes those to the global error handler
+     * via {@link RxJavaPlugins#onError(Throwable)}.
+     * <p>
+     * By default, the {@code Single} protocol forbids the {@code onXXX} methods to throw, but some
+     * {@code SingleObserver} implementation may do it anyway, causing undefined behavior in the
+     * upstream. This method and the underlying safe wrapper ensures such misbehaving consumers don't
+     * disrupt the protocol.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code safeSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param observer the potentially misbehaving {@code SingleObserver}
+     * @throws NullPointerException if {@code observer} is {@code null}
+     * @see #subscribe(Consumer,Consumer)
+     * @since 3.0.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final void safeSubscribe(@NonNull SingleObserver<? super T> observer) {
+        Objects.requireNonNull(observer, "observer is null");
+        subscribe(new SafeSingleObserver<>(observer));
+    }
+
     /**
      * Returns a {@link Flowable} which first runs the other {@link CompletableSource}
      * then the current {@code Single} if the other completed normally.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/SafeCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeCompletableObserver.java
new file mode 100644
index 0000000000..d9e929c234
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeCompletableObserver.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.CompletableObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Wraps another {@link CompletableObserver} and catches exceptions thrown by its
+ * {@code onSubscribe}, {@code onError} or
+ * {@code onComplete} methods despite the protocol forbids it.
+ * <p>
+ * Such exceptions are routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
+ *
+ * @since 3.0.0
+ */
+public final class SafeCompletableObserver implements CompletableObserver {
+
+    final CompletableObserver downstream;
+
+    boolean onSubscribeFailed;
+
+    public SafeCompletableObserver(CompletableObserver downstream) {
+        this.downstream = downstream;
+    }
+
+    @Override
+    public void onSubscribe(@NonNull Disposable d) {
+        try {
+            downstream.onSubscribe(d);
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            onSubscribeFailed = true;
+            d.dispose();
+            RxJavaPlugins.onError(ex);
+        }
+    }
+
+    @Override
+    public void onError(@NonNull Throwable e) {
+        if (onSubscribeFailed) {
+            RxJavaPlugins.onError(e);
+        } else {
+            try {
+                downstream.onError(e);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                RxJavaPlugins.onError(new CompositeException(e, ex));
+            }
+        }
+    }
+
+    @Override
+    public void onComplete() {
+        if (!onSubscribeFailed) {
+            try {
+                downstream.onComplete();
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                RxJavaPlugins.onError(ex);
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/SafeMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeMaybeObserver.java
new file mode 100644
index 0000000000..a6e794b1fd
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeMaybeObserver.java
@@ -0,0 +1,91 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.MaybeObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Wraps another {@link MaybeObserver} and catches exceptions thrown by its
+ * {@code onSubscribe}, {@code onSuccess}, {@code onError} or
+ * {@code onComplete} methods despite the protocol forbids it.
+ * <p>
+ * Such exceptions are routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
+ *
+ * @param <T> the element type of the sequence
+ * @since 3.0.0
+ */
+public final class SafeMaybeObserver<T> implements MaybeObserver<T> {
+
+    final MaybeObserver<? super T> downstream;
+
+    boolean onSubscribeFailed;
+
+    public SafeMaybeObserver(MaybeObserver<? super T> downstream) {
+        this.downstream = downstream;
+    }
+
+    @Override
+    public void onSubscribe(@NonNull Disposable d) {
+        try {
+            downstream.onSubscribe(d);
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            onSubscribeFailed = true;
+            d.dispose();
+            RxJavaPlugins.onError(ex);
+        }
+    }
+
+    @Override
+    public void onSuccess(@NonNull T t) {
+        if (!onSubscribeFailed) {
+            try {
+                downstream.onSuccess(t);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                RxJavaPlugins.onError(ex);
+            }
+        }
+    }
+
+    @Override
+    public void onError(@NonNull Throwable e) {
+        if (onSubscribeFailed) {
+            RxJavaPlugins.onError(e);
+        } else {
+            try {
+                downstream.onError(e);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                RxJavaPlugins.onError(new CompositeException(e, ex));
+            }
+        }
+    }
+
+    @Override
+    public void onComplete() {
+        if (!onSubscribeFailed) {
+            try {
+                downstream.onComplete();
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                RxJavaPlugins.onError(ex);
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/SafeSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeSingleObserver.java
new file mode 100644
index 0000000000..6757350756
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeSingleObserver.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.SingleObserver;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Wraps another {@link SingleObserver} and catches exceptions thrown by its
+ * {@code onSubscribe}, {@code onSuccess} or {@code onError} methods despite
+ * the protocol forbids it.
+ * <p>
+ * Such exceptions are routed to the {@link RxJavaPlugins#onError(Throwable)} handler.
+ *
+ * @param <T> the element type of the sequence
+ * @since 3.0.0
+ */
+public final class SafeSingleObserver<T> implements SingleObserver<T> {
+
+    final SingleObserver<? super T> downstream;
+
+    boolean onSubscribeFailed;
+
+    public SafeSingleObserver(SingleObserver<? super T> downstream) {
+        this.downstream = downstream;
+    }
+
+    @Override
+    public void onSubscribe(@NonNull Disposable d) {
+        try {
+            downstream.onSubscribe(d);
+        } catch (Throwable ex) {
+            Exceptions.throwIfFatal(ex);
+            onSubscribeFailed = true;
+            d.dispose();
+            RxJavaPlugins.onError(ex);
+        }
+    }
+
+    @Override
+    public void onSuccess(@NonNull T t) {
+        if (!onSubscribeFailed) {
+            try {
+                downstream.onSuccess(t);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                RxJavaPlugins.onError(ex);
+            }
+        }
+    }
+
+    @Override
+    public void onError(@NonNull Throwable e) {
+        if (onSubscribeFailed) {
+            RxJavaPlugins.onError(e);
+        } else {
+            try {
+                downstream.onError(e);
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                RxJavaPlugins.onError(new CompositeException(e, ex));
+            }
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSafeSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSafeSubscribeTest.java
new file mode 100644
index 0000000000..234fb0290c
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSafeSubscribeTest.java
@@ -0,0 +1,148 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.completable;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.mockito.InOrder;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class CompletableSafeSubscribeTest {
+
+    @Test
+    public void normalError() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            CompletableObserver consumer = mock(CompletableObserver.class);
+
+            Completable.error(new TestException())
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onError(any(TestException.class));
+            order.verifyNoMoreInteractions();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void normalEmpty() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            CompletableObserver consumer = mock(CompletableObserver.class);
+
+            Completable.complete()
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onComplete();
+            order.verifyNoMoreInteractions();
+        });
+    }
+
+    @Test
+    public void onSubscribeCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            CompletableObserver consumer = mock(CompletableObserver.class);
+            doThrow(new TestException()).when(consumer).onSubscribe(any());
+
+            Disposable d = Disposable.empty();
+
+            new Completable() {
+                @Override
+                protected void subscribeActual(@NonNull CompletableObserver observer) {
+                    observer.onSubscribe(d);
+                    // none of the following should arrive at the consumer
+                    observer.onError(new IOException());
+                    observer.onComplete();
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verifyNoMoreInteractions();
+
+            assertTrue(d.isDisposed());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+            TestHelper.assertUndeliverable(errors, 1, IOException.class);
+        });
+    }
+
+    @Test
+    public void onErrorCrash() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            CompletableObserver consumer = mock(CompletableObserver.class);
+            doThrow(new TestException()).when(consumer).onError(any());
+
+            new Completable() {
+                @Override
+                protected void subscribeActual(@NonNull CompletableObserver observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    // none of the following should arrive at the consumer
+                    observer.onError(new IOException());
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onError(any(IOException.class));
+            order.verifyNoMoreInteractions();
+
+            TestHelper.assertError(errors, 0, CompositeException.class);
+
+            CompositeException compositeException = (CompositeException)errors.get(0);
+            TestHelper.assertError(compositeException.getExceptions(), 0, IOException.class);
+            TestHelper.assertError(compositeException.getExceptions(), 1, TestException.class);
+        });
+    }
+
+    @Test
+    public void onCompleteCrash() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            CompletableObserver consumer = mock(CompletableObserver.class);
+            doThrow(new TestException()).when(consumer).onComplete();
+
+            new Completable() {
+                @Override
+                protected void subscribeActual(@NonNull CompletableObserver observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    // none of the following should arrive at the consumer
+                    observer.onComplete();
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onComplete();
+            order.verifyNoMoreInteractions();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSafeSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSafeSubscribeTest.java
new file mode 100644
index 0000000000..5083c20f2c
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSafeSubscribeTest.java
@@ -0,0 +1,197 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.mockito.InOrder;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeSafeSubscribeTest {
+
+    @Test
+    public void normalSuccess() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            MaybeObserver<Integer> consumer = mock(MaybeObserver.class);
+
+            Maybe.just(1)
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onSuccess(1);
+            order.verifyNoMoreInteractions();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void normalError() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            MaybeObserver<Integer> consumer = mock(MaybeObserver.class);
+
+            Maybe.<Integer>error(new TestException())
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onError(any(TestException.class));
+            order.verifyNoMoreInteractions();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void normalEmpty() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            MaybeObserver<Integer> consumer = mock(MaybeObserver.class);
+
+            Maybe.<Integer>empty()
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onComplete();
+            order.verifyNoMoreInteractions();
+        });
+    }
+
+    @Test
+    public void onSubscribeCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            MaybeObserver<Integer> consumer = mock(MaybeObserver.class);
+            doThrow(new TestException()).when(consumer).onSubscribe(any());
+
+            Disposable d = Disposable.empty();
+
+            new Maybe<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull MaybeObserver<? super Integer> observer) {
+                    observer.onSubscribe(d);
+                    // none of the following should arrive at the consumer
+                    observer.onSuccess(1);
+                    observer.onError(new IOException());
+                    observer.onComplete();
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verifyNoMoreInteractions();
+
+            assertTrue(d.isDisposed());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+            TestHelper.assertUndeliverable(errors, 1, IOException.class);
+        });
+    }
+
+    @Test
+    public void onSuccessCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            MaybeObserver<Integer> consumer = mock(MaybeObserver.class);
+            doThrow(new TestException()).when(consumer).onSuccess(any());
+
+            new Maybe<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull MaybeObserver<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSuccess(1);
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onSuccess(1);
+            order.verifyNoMoreInteractions();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void onErrorCrash() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            MaybeObserver<Integer> consumer = mock(MaybeObserver.class);
+            doThrow(new TestException()).when(consumer).onError(any());
+
+            new Maybe<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull MaybeObserver<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    // none of the following should arrive at the consumer
+                    observer.onError(new IOException());
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onError(any(IOException.class));
+            order.verifyNoMoreInteractions();
+
+            TestHelper.assertError(errors, 0, CompositeException.class);
+
+            CompositeException compositeException = (CompositeException)errors.get(0);
+            TestHelper.assertError(compositeException.getExceptions(), 0, IOException.class);
+            TestHelper.assertError(compositeException.getExceptions(), 1, TestException.class);
+        });
+    }
+
+    @Test
+    public void onCompleteCrash() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            MaybeObserver<Integer> consumer = mock(MaybeObserver.class);
+            doThrow(new TestException()).when(consumer).onComplete();
+
+            new Maybe<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull MaybeObserver<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    // none of the following should arrive at the consumer
+                    observer.onComplete();
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onComplete();
+            order.verifyNoMoreInteractions();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSafeSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSafeSubscribeTest.java
new file mode 100644
index 0000000000..80abb4cb1a
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSafeSubscribeTest.java
@@ -0,0 +1,154 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.mockito.InOrder;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleSafeSubscribeTest {
+
+    @Test
+    public void normalSuccess() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            SingleObserver<Integer> consumer = mock(SingleObserver.class);
+
+            Single.just(1)
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onSuccess(1);
+            order.verifyNoMoreInteractions();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void normalError() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            SingleObserver<Integer> consumer = mock(SingleObserver.class);
+
+            Single.<Integer>error(new TestException())
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onError(any(TestException.class));
+            order.verifyNoMoreInteractions();
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void onSubscribeCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            SingleObserver<Integer> consumer = mock(SingleObserver.class);
+            doThrow(new TestException()).when(consumer).onSubscribe(any());
+
+            Disposable d = Disposable.empty();
+
+            new Single<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull SingleObserver<? super Integer> observer) {
+                    observer.onSubscribe(d);
+                    // none of the following should arrive at the consumer
+                    observer.onSuccess(1);
+                    observer.onError(new IOException());
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verifyNoMoreInteractions();
+
+            assertTrue(d.isDisposed());
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+            TestHelper.assertUndeliverable(errors, 1, IOException.class);
+        });
+    }
+
+    @Test
+    public void onSuccessCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            SingleObserver<Integer> consumer = mock(SingleObserver.class);
+            doThrow(new TestException()).when(consumer).onSuccess(any());
+
+            new Single<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull SingleObserver<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onSuccess(1);
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onSuccess(1);
+            order.verifyNoMoreInteractions();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void onErrorCrash() throws Throwable  {
+        TestHelper.withErrorTracking(errors -> {
+            @SuppressWarnings("unchecked")
+            SingleObserver<Integer> consumer = mock(SingleObserver.class);
+            doThrow(new TestException()).when(consumer).onError(any());
+
+            new Single<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull SingleObserver<? super Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    // none of the following should arrive at the consumer
+                    observer.onError(new IOException());
+                }
+            }
+            .safeSubscribe(consumer);
+
+            InOrder order = inOrder(consumer);
+            order.verify(consumer).onSubscribe(any(Disposable.class));
+            order.verify(consumer).onError(any(IOException.class));
+            order.verifyNoMoreInteractions();
+
+            TestHelper.assertError(errors, 0, CompositeException.class);
+
+            CompositeException compositeException = (CompositeException)errors.get(0);
+            TestHelper.assertError(compositeException.getExceptions(), 0, IOException.class);
+            TestHelper.assertError(compositeException.getExceptions(), 1, TestException.class);
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index 0e2c0ada16..714a6809f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -147,7 +147,12 @@ public static void main(String[] args) throws IOException {
                     out.println("<br/>");
                 }
             }
-            if (!tbdList.isEmpty()) {
+            if (tbdList.isEmpty()) {
+                out.println();
+                out.println("#### Under development");
+                out.println();
+                out.println("*Currently, all intended operators are implemented.*");
+            } else {
                 out.println();
                 out.println("#### Under development");
                 out.println();

From 1ede60786a1a8f00f1fb3968d0701a323ed86f2f Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 28 Jan 2020 15:59:54 +0100
Subject: [PATCH 087/665] 3.x: Use more appropriate operators when delegating
 to Flowable ops (#6888)

* 3.x: Use more appropriate operators when delegating to Flowable ops

* Remove now-unused classes
---
 .../java/io/reactivex/rxjava3/core/Maybe.java | 20 ++-----
 .../io/reactivex/rxjava3/core/Single.java     | 47 +++++++---------
 ...ava => FlowableFlatMapMaybePublisher.java} | 32 ++++++-----
 .../FlowableFlatMapSinglePublisher.java       | 49 +++++++++++++++++
 .../FlowableConcatMapMaybePublisher.java}     | 38 +++++++------
 .../FlowableConcatMapSinglePublisher.java     | 55 +++++++++++++++++++
 .../mixed/ObservableConcatMapSingle.java      |  4 +-
 .../single/SingleInternalHelper.java          | 16 ------
 .../single/SingleInternalHelperTest.java      |  6 --
 .../io/reactivex/rxjava3/maybe/MaybeTest.java |  2 -
 10 files changed, 173 insertions(+), 96 deletions(-)
 rename src/main/java/io/reactivex/rxjava3/internal/operators/flowable/{FlowableFlatMapPublisher.java => FlowableFlatMapMaybePublisher.java} (53%)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSinglePublisher.java
 rename src/main/java/io/reactivex/rxjava3/internal/operators/{flowable/FlowableConcatMapPublisher.java => mixed/FlowableConcatMapMaybePublisher.java} (51%)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSinglePublisher.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index ba42452513..d4116406b4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -344,11 +344,10 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Maybe
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, MaybeToPublisher.instance(), prefetch, ErrorMode.IMMEDIATE));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybePublisher<>(sources, Functions.identity(), ErrorMode.IMMEDIATE, prefetch));
     }
 
     /**
@@ -1141,7 +1140,7 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
-        return merge(Flowable.fromIterable(sources));
+        return Flowable.fromIterable(sources).flatMapMaybe(Functions.identity(), false, Integer.MAX_VALUE);
     }
 
     /**
@@ -1218,11 +1217,10 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeS
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
-        return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), false, maxConcurrency, 1));
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapMaybePublisher<>(sources, Functions.identity(), false, maxConcurrency));
     }
 
     /**
@@ -1490,7 +1488,6 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -1498,10 +1495,7 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
     @NonNull
     public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
-        if (sources.length == 0) {
-            return Flowable.empty();
-        }
-        return Flowable.fromArray(sources).flatMap((Function)MaybeToPublisher.instance(), true, sources.length);
+        return Flowable.fromArray(sources).flatMapMaybe(Functions.identity(), true, Math.max(1, sources.length));
     }
 
     /**
@@ -1533,13 +1527,12 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extend
      * @throws NullPointerException if {@code sources} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
-        return Flowable.fromIterable(sources).flatMap((Function)MaybeToPublisher.instance(), true);
+        return Flowable.fromIterable(sources).flatMapMaybe(Functions.identity(), true, Integer.MAX_VALUE);
     }
 
     /**
@@ -1609,7 +1602,6 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @since 2.2
      */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue
     @NonNull
@@ -1617,7 +1609,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
     public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
-        return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, MaybeToPublisher.instance(), true, maxConcurrency, 1));
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapMaybePublisher<>(sources, Functions.identity(), true, maxConcurrency));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 12431fedb6..7db69e5bc5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -20,7 +20,6 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
@@ -32,7 +31,7 @@
 import io.reactivex.rxjava3.internal.operators.flowable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.*;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
-import io.reactivex.rxjava3.internal.operators.observable.*;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableSingleSingle;
 import io.reactivex.rxjava3.internal.operators.single.*;
 import io.reactivex.rxjava3.internal.util.ErrorMode;
 import io.reactivex.rxjava3.observers.TestObserver;
@@ -195,7 +194,7 @@ public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sourc
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
-        return concat(Flowable.fromIterable(sources));
+        return Flowable.fromIterable(sources).concatMapSingleDelayError(Functions.identity(), false);
     }
 
     /**
@@ -216,10 +215,9 @@ public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends Single
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Observable<T> concat(@NonNull ObservableSource<? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, SingleInternalHelper.toObservable(), 2, ErrorMode.IMMEDIATE));
+        return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(sources, Functions.identity(), ErrorMode.IMMEDIATE, 2));
     }
 
     /**
@@ -272,11 +270,10 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Singl
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapPublisher(sources, SingleInternalHelper.toFlowable(), prefetch, ErrorMode.IMMEDIATE));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapSinglePublisher<>(sources, Functions.identity(), ErrorMode.IMMEDIATE, prefetch));
     }
 
     /**
@@ -308,7 +305,7 @@ public static <T> Flowable<T> concat(
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
-        return concat(Flowable.fromArray(source1, source2));
+        return Flowable.fromArray(source1, source2).concatMapSingleDelayError(Functions.identity(), false);
     }
 
     /**
@@ -344,7 +341,7 @@ public static <T> Flowable<T> concat(
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
-        return concat(Flowable.fromArray(source1, source2, source3));
+        return Flowable.fromArray(source1, source2, source3).concatMapSingleDelayError(Functions.identity(), false);
     }
 
     /**
@@ -383,7 +380,7 @@ public static <T> Flowable<T> concat(
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
-        return concat(Flowable.fromArray(source1, source2, source3, source4));
+        return Flowable.fromArray(source1, source2, source3, source4).concatMapSingleDelayError(Functions.identity(), false);
     }
 
     /**
@@ -409,7 +406,7 @@ public static <T> Flowable<T> concat(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>... sources) {
-        return Flowable.fromArray(sources).concatMap(SingleInternalHelper.toFlowable(), 2);
+        return Flowable.fromArray(sources).concatMapSingleDelayError(Functions.identity(), false);
     }
 
     /**
@@ -435,7 +432,7 @@ public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>...
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T> Flowable<T> concatArrayDelayError(@NonNull SingleSource<? extends T>... sources) {
-        return Flowable.fromArray(sources).concatMapDelayError(SingleInternalHelper.toFlowable(), true, 2);
+        return Flowable.fromArray(sources).concatMapSingleDelayError(Functions.identity(), true);
     }
 
     /**
@@ -1091,7 +1088,7 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
-        return merge(Flowable.fromIterable(sources));
+        return Flowable.fromIterable(sources).flatMapSingle(Functions.identity());
     }
 
     /**
@@ -1129,10 +1126,9 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends SingleS
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), false, Integer.MAX_VALUE, Flowable.bufferSize()));
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapSinglePublisher<>(sources, Functions.identity(), false, Integer.MAX_VALUE));
     }
 
     /**
@@ -1212,7 +1208,7 @@ public static <T> Flowable<T> merge(
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
-        return merge(Flowable.fromArray(source1, source2));
+        return Flowable.fromArray(source1, source2).flatMapSingle(Functions.identity(), false, Integer.MAX_VALUE);
     }
 
     /**
@@ -1265,7 +1261,7 @@ public static <T> Flowable<T> merge(
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
-        return merge(Flowable.fromArray(source1, source2, source3));
+        return Flowable.fromArray(source1, source2, source3).flatMapSingle(Functions.identity(), false, Integer.MAX_VALUE);
     }
 
     /**
@@ -1321,7 +1317,7 @@ public static <T> Flowable<T> merge(
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
-        return merge(Flowable.fromArray(source1, source2, source3, source4));
+        return Flowable.fromArray(source1, source2, source3, source4).flatMapSingle(Functions.identity(), false, Integer.MAX_VALUE);
     }
 
     /**
@@ -1360,7 +1356,7 @@ public static <T> Flowable<T> merge(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     public static <T> Flowable<T> mergeArray(SingleSource<? extends T>... sources) {
-        return Flowable.fromArray(sources).flatMapSingle(Functions.identity(), false, sources.length);
+        return Flowable.fromArray(sources).flatMapSingle(Functions.identity(), false, Math.max(1, sources.length));
     }
 
     /**
@@ -1396,7 +1392,7 @@ public static <T> Flowable<T> mergeArray(SingleSource<? extends T>... sources) {
     @SafeVarargs
     @NonNull
     public static <T> Flowable<T> mergeArrayDelayError(@NonNull SingleSource<? extends T>... sources) {
-        return Flowable.fromArray(sources).flatMapSingle(Functions.identity(), true, sources.length);
+        return Flowable.fromArray(sources).flatMapSingle(Functions.identity(), true, Math.max(1, sources.length));
     }
 
     /**
@@ -1423,7 +1419,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull SingleSource<? exten
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
-        return mergeDelayError(Flowable.fromIterable(sources));
+        return Flowable.fromIterable(sources).flatMapSingle(Functions.identity(), true, Integer.MAX_VALUE);
     }
 
     /**
@@ -1449,10 +1445,9 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    @SuppressWarnings({ "unchecked", "rawtypes" })
     public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new FlowableFlatMapPublisher(sources, SingleInternalHelper.toFlowable(), true, Integer.MAX_VALUE, Flowable.bufferSize()));
+        return RxJavaPlugins.onAssembly(new FlowableFlatMapSinglePublisher<>(sources, Functions.identity(), true, Integer.MAX_VALUE));
     }
 
     /**
@@ -1490,7 +1485,7 @@ public static <T> Flowable<T> mergeDelayError(
      ) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
-        return mergeDelayError(Flowable.fromArray(source1, source2));
+        return Flowable.fromArray(source1, source2).flatMapSingle(Functions.identity(), true, Integer.MAX_VALUE);
     }
 
     /**
@@ -1532,7 +1527,7 @@ public static <T> Flowable<T> mergeDelayError(
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
-        return mergeDelayError(Flowable.fromArray(source1, source2, source3));
+        return Flowable.fromArray(source1, source2, source3).flatMapSingle(Functions.identity(), true, Integer.MAX_VALUE);
     }
 
     /**
@@ -1577,7 +1572,7 @@ public static <T> Flowable<T> mergeDelayError(
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
         Objects.requireNonNull(source4, "source4 is null");
-        return mergeDelayError(Flowable.fromArray(source1, source2, source3, source4));
+        return Flowable.fromArray(source1, source2, source3, source4).flatMapSingle(Functions.identity(), true, Integer.MAX_VALUE);
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybePublisher.java
similarity index 53%
rename from src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapPublisher.java
rename to src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybePublisher.java
index 0f5be8917d..f300607052 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybePublisher.java
@@ -15,31 +15,35 @@
 
 import org.reactivestreams.*;
 
-import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableFlatMapMaybe.FlatMapMaybeSubscriber;
+
+/**
+ * Maps upstream values into MaybeSources and merges their signals into one sequence.
+ * @param <T> the source value type
+ * @param <R> the result value type
+ */
+public final class FlowableFlatMapMaybePublisher<T, R> extends Flowable<R> {
 
-public final class FlowableFlatMapPublisher<T, U> extends Flowable<U> {
     final Publisher<T> source;
-    final Function<? super T, ? extends Publisher<? extends U>> mapper;
+
+    final Function<? super T, ? extends MaybeSource<? extends R>> mapper;
+
     final boolean delayErrors;
+
     final int maxConcurrency;
-    final int bufferSize;
 
-    public FlowableFlatMapPublisher(Publisher<T> source,
-            Function<? super T, ? extends Publisher<? extends U>> mapper,
-            boolean delayErrors, int maxConcurrency, int bufferSize) {
+    public FlowableFlatMapMaybePublisher(Publisher<T> source, Function<? super T, ? extends MaybeSource<? extends R>> mapper,
+            boolean delayError, int maxConcurrency) {
         this.source = source;
         this.mapper = mapper;
-        this.delayErrors = delayErrors;
+        this.delayErrors = delayError;
         this.maxConcurrency = maxConcurrency;
-        this.bufferSize = bufferSize;
     }
 
     @Override
-    protected void subscribeActual(Subscriber<? super U> s) {
-        if (FlowableScalarXMap.tryScalarXMapSubscribe(source, s, mapper)) {
-            return;
-        }
-        source.subscribe(FlowableFlatMap.subscribe(s, mapper, delayErrors, maxConcurrency, bufferSize));
+    protected void subscribeActual(Subscriber<? super R> s) {
+        source.subscribe(new FlatMapMaybeSubscriber<>(s, mapper, delayErrors, maxConcurrency));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSinglePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSinglePublisher.java
new file mode 100644
index 0000000000..457a728523
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSinglePublisher.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableFlatMapSingle.FlatMapSingleSubscriber;
+
+/**
+ * Maps upstream values into SingleSources and merges their signals into one sequence.
+ * @param <T> the source value type
+ * @param <R> the result value type
+ */
+public final class FlowableFlatMapSinglePublisher<T, R> extends Flowable<R> {
+
+    final Publisher<T> source;
+
+    final Function<? super T, ? extends SingleSource<? extends R>> mapper;
+
+    final boolean delayErrors;
+
+    final int maxConcurrency;
+
+    public FlowableFlatMapSinglePublisher(Publisher<T> source, Function<? super T, ? extends SingleSource<? extends R>> mapper,
+            boolean delayError, int maxConcurrency) {
+        this.source = source;
+        this.mapper = mapper;
+        this.delayErrors = delayError;
+        this.maxConcurrency = maxConcurrency;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super R> s) {
+        source.subscribe(new FlatMapSingleSubscriber<>(s, mapper, delayErrors, maxConcurrency));
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybePublisher.java
similarity index 51%
rename from src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapPublisher.java
rename to src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybePublisher.java
index 8ee6afcd87..8651cdcb60 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybePublisher.java
@@ -10,40 +10,46 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
-package io.reactivex.rxjava3.internal.operators.flowable;
+
+package io.reactivex.rxjava3.internal.operators.mixed;
 
 import org.reactivestreams.*;
 
-import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.operators.mixed.FlowableConcatMapMaybe.ConcatMapMaybeSubscriber;
 import io.reactivex.rxjava3.internal.util.ErrorMode;
 
-public final class FlowableConcatMapPublisher<T, R> extends Flowable<R> {
+/**
+ * Maps each upstream item into a {@link MaybeSource}, subscribes to them one after the other terminates
+ * and relays their success values, optionally delaying any errors till the main and inner sources
+ * terminate.
+ * <p>History: 2.1.11 - experimental
+ * @param <T> the upstream element type
+ * @param <R> the output element type
+ * @since 2.2
+ */
+public final class FlowableConcatMapMaybePublisher<T, R> extends Flowable<R> {
 
     final Publisher<T> source;
 
-    final Function<? super T, ? extends Publisher<? extends R>> mapper;
-
-    final int prefetch;
+    final Function<? super T, ? extends MaybeSource<? extends R>> mapper;
 
     final ErrorMode errorMode;
 
-    public FlowableConcatMapPublisher(Publisher<T> source,
-            Function<? super T, ? extends Publisher<? extends R>> mapper,
-            int prefetch, ErrorMode errorMode) {
+    final int prefetch;
+
+    public FlowableConcatMapMaybePublisher(Publisher<T> source,
+            Function<? super T, ? extends MaybeSource<? extends R>> mapper,
+                    ErrorMode errorMode, int prefetch) {
         this.source = source;
         this.mapper = mapper;
-        this.prefetch = prefetch;
         this.errorMode = errorMode;
+        this.prefetch = prefetch;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super R> s) {
-
-        if (FlowableScalarXMap.tryScalarXMapSubscribe(source, s, mapper)) {
-            return;
-        }
-
-        source.subscribe(FlowableConcatMap.subscribe(s, mapper, prefetch, errorMode));
+        source.subscribe(new ConcatMapMaybeSubscriber<>(s, mapper, prefetch, errorMode));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSinglePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSinglePublisher.java
new file mode 100644
index 0000000000..5b34314d81
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSinglePublisher.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.mixed;
+
+import org.reactivestreams.*;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.operators.mixed.FlowableConcatMapSingle.ConcatMapSingleSubscriber;
+import io.reactivex.rxjava3.internal.util.ErrorMode;
+
+/**
+ * Maps each upstream item into a {@link SingleSource}, subscribes to them one after the other terminates
+ * and relays their success values, optionally delaying any errors till the main and inner sources
+ * terminate.
+ * <p>History: 2.1.11 - experimental
+ * @param <T> the upstream element type
+ * @param <R> the output element type
+ * @since 2.2
+ */
+public final class FlowableConcatMapSinglePublisher<T, R> extends Flowable<R> {
+
+    final Publisher<T> source;
+
+    final Function<? super T, ? extends SingleSource<? extends R>> mapper;
+
+    final ErrorMode errorMode;
+
+    final int prefetch;
+
+    public FlowableConcatMapSinglePublisher(Publisher<T> source,
+            Function<? super T, ? extends SingleSource<? extends R>> mapper,
+                    ErrorMode errorMode, int prefetch) {
+        this.source = source;
+        this.mapper = mapper;
+        this.errorMode = errorMode;
+        this.prefetch = prefetch;
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super R> s) {
+        source.subscribe(new ConcatMapSingleSubscriber<>(s, mapper, prefetch, errorMode));
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
index 5fc6b8a520..70d913cd42 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
@@ -36,7 +36,7 @@
  */
 public final class ObservableConcatMapSingle<T, R> extends Observable<R> {
 
-    final Observable<T> source;
+    final ObservableSource<T> source;
 
     final Function<? super T, ? extends SingleSource<? extends R>> mapper;
 
@@ -44,7 +44,7 @@ public final class ObservableConcatMapSingle<T, R> extends Observable<R> {
 
     final int prefetch;
 
-    public ObservableConcatMapSingle(Observable<T> source,
+    public ObservableConcatMapSingle(ObservableSource<T> source,
             Function<? super T, ? extends SingleSource<? extends R>> mapper,
                     ErrorMode errorMode, int prefetch) {
         this.source = source;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
index 95ed46144c..47f8bf1e88 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
@@ -19,7 +19,6 @@
 import org.reactivestreams.Publisher;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.functions.*;
 
 /**
@@ -105,19 +104,4 @@ public Iterator<Flowable<T>> iterator() {
     public static <T> Iterable<? extends Flowable<T>> iterableToFlowable(final Iterable<? extends SingleSource<? extends T>> sources) {
         return new ToFlowableIterable<>(sources);
     }
-
-    @SuppressWarnings("rawtypes")
-    enum ToObservable implements Function<SingleSource, Observable> {
-        INSTANCE;
-        @SuppressWarnings("unchecked")
-        @Override
-        public Observable apply(SingleSource v) {
-            return new SingleToObservable(v);
-        }
-    }
-
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Function<SingleSource<? extends T>, Observable<? extends T>> toObservable() {
-        return (Function)ToObservable.INSTANCE;
-    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
index e551b882d1..5d5e152c1b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
@@ -41,12 +41,6 @@ public void toFlowableEnum() {
         assertNotNull(SingleInternalHelper.ToFlowable.valueOf("INSTANCE"));
     }
 
-    @Test
-    public void toObservableEnum() {
-        assertEquals(1, SingleInternalHelper.ToObservable.values().length);
-        assertNotNull(SingleInternalHelper.ToObservable.valueOf("INSTANCE"));
-    }
-
     @Test
     public void singleIterableToFlowableIterable() {
         Iterable<? extends Flowable<Integer>> it = SingleInternalHelper.iterableToFlowable(
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index 94cf62d641..401bdcc918 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -2514,8 +2514,6 @@ public void mergeArrayDelayError() {
         Maybe.mergeArrayDelayError(Maybe.error(new TestException()), Maybe.empty(), Maybe.just(1))
         .test()
         .assertFailure(TestException.class, 1);
-
-        assertSame(Flowable.empty(), Maybe.mergeArrayDelayError());
     }
 
     @Test

From b3516b2fbf76643d4fce2bb077de64deaf959f90 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 28 Jan 2020 16:32:12 +0100
Subject: [PATCH 088/665] 3.x: Fix marble dimensions, add program that checks
 them (#6890)

* 3.x: Fix marble dimensions, add program that checks them

* Remove an empty line.
---
 .../reactivex/rxjava3/core/Completable.java   |  26 ++--
 .../io/reactivex/rxjava3/core/Flowable.java   |  34 +++---
 .../java/io/reactivex/rxjava3/core/Maybe.java |  40 +++---
 .../io/reactivex/rxjava3/core/Observable.java | 114 +++++++++---------
 .../io/reactivex/rxjava3/core/Single.java     |  54 ++++-----
 .../rxjava3/parallel/ParallelFlowable.java    |   4 +-
 .../internal/util/MarbleDimensions.java       | 106 ++++++++++++++++
 7 files changed, 242 insertions(+), 136 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 83e7848a51..cfdd87067d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -178,7 +178,7 @@ public static Completable complete() {
     /**
      * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
-     * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatArray.png" alt="">
+     * <img width="640" height="284" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatArray.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -205,7 +205,7 @@ public static Completable concatArray(@NonNull CompletableSource... sources) {
     /**
      * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
-     * <img width="640" height="322" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatArrayDelayError.png" alt="">
+     * <img width="640" height="324" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatArrayDelayError.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -247,7 +247,7 @@ public static Completable concat(@NonNull Iterable<@NonNull ? extends Completabl
     /**
      * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
-     * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concat.p.png" alt="">
+     * <img width="640" height="238" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concat.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
@@ -270,7 +270,7 @@ public static Completable concat(@NonNull Publisher<@NonNull ? extends Completab
     /**
      * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
-     * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concat.pn.png" alt="">
+     * <img width="640" height="238" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concat.pn.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Completable} honors the backpressure of the downstream consumer
@@ -297,7 +297,7 @@ public static Completable concat(@NonNull Publisher<@NonNull ? extends Completab
     /**
      * Returns a {@code Completable} which completes only when all sources complete, one after another.
      * <p>
-     * <img width="640" height="361" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatDelayError.png" alt="">
+     * <img width="640" height="361" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.concatDelayError.i.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -989,7 +989,7 @@ public static Completable mergeArrayDelayError(@NonNull CompletableSource... sou
      * any error emitted by any of the inner {@code CompletableSource}s until all of
      * them terminate in a way or another.
      * <p>
-     * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.mergeDelayError.png" alt="">
+     * <img width="640" height="476" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.mergeDelayError.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1200,7 +1200,7 @@ public static Completable switchOnNextDelayError(@NonNull Publisher<@NonNull ? e
      * Returns a {@code Completable} instance which manages a resource along
      * with a custom {@link CompletableSource} instance while the subscription is active.
      * <p>
-     * <img width="640" height="388" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.using.png" alt="">
+     * <img width="640" height="389" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.using.png" alt="">
      * <p>
      * This overload disposes eagerly before the terminal event is emitted.
      * <dl>
@@ -1294,7 +1294,7 @@ public static Completable wrap(@NonNull CompletableSource source) {
      * Returns a {@code Completable} that emits the a terminated event of either this {@code Completable}
      * or the other {@link CompletableSource}, whichever fires first.
      * <p>
-     * <img width="640" height="484" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.ambWith.png" alt="">
+     * <img width="640" height="485" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.ambWith.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1395,7 +1395,7 @@ public final Completable ambWith(@NonNull CompletableSource other) {
      * propagated to the downstream observer and will result in skipping the subscription to the next
      * {@code MaybeSource}.
      * <p>
-     * <img width="640" height="280" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.andThen.m.png" alt="">
+     * <img width="640" height="281" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.andThen.m.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code andThen} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1443,7 +1443,7 @@ public final Completable andThen(@NonNull CompletableSource next) {
      * Subscribes to and awaits the termination of this {@code Completable} instance in a blocking manner and
      * rethrows any exception emitted.
      * <p>
-     * <img width="640" height="432" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.blockingAwait.png" alt="">
+     * <img width="640" height="433" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.blockingAwait.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingAwait} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1665,7 +1665,7 @@ public final Completable concatWith(@NonNull CompletableSource other) {
     /**
      * Returns a {@code Completable} which delays the emission of the completion event by the given time.
      * <p>
-     * <img width="640" height="343" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.delay.png" alt="">
+     * <img width="640" height="344" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.delay.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code delay} does operate by default on the {@code computation} {@link Scheduler}.</dd>
@@ -1955,7 +1955,7 @@ public final Completable doOnSubscribe(@NonNull Consumer<? super Disposable> onS
      * Returns a {@code Completable} instance that calls the given {@code onTerminate} {@link Action} just before this {@code Completable}
      * completes normally or with an exception.
      * <p>
-     * <img width="640" height="304" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doOnTerminate.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doOnTerminate.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnTerminate} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1978,7 +1978,7 @@ public final Completable doOnTerminate(@NonNull Action onTerminate) {
      * Returns a {@code Completable} instance that calls the given {@code onAfterTerminate}  {@link Action} after this {@code Completable}
      * completes normally or with an exception.
      * <p>
-     * <img width="640" height="304" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doAfterTerminate.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.doAfterTerminate.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterTerminate} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 453c9e4bba..58ffd3d6f8 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -1964,7 +1964,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      * Returns a {@code Flowable} instance that runs the given {@link Action} for each subscriber and
      * emits either its exception or simply completes.
      * <p>
-     * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromAction.png" alt="">
+     * <img width="640" height="285" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromAction.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This source doesn't produce any elements and effectively ignores downstream backpressure.</dd>
@@ -9934,7 +9934,7 @@ public final Flowable<T> filter(@NonNull Predicate<? super T> predicate) {
      * Returns a {@link Maybe} that emits only the very first item emitted by this {@code Flowable} or
      * completes if this {@code Flowable} is empty.
      * <p>
-     * <img width="640" height="237" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstElement.m.png" alt="">
+     * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstElement.m.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
@@ -9957,7 +9957,7 @@ public final Maybe<T> firstElement() {
      * Returns a {@link Single} that emits only the very first item emitted by this {@code Flowable}, or a default
      * item if this {@code Flowable} completes without emitting anything.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
+     * <img width="640" height="285" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
@@ -10561,7 +10561,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
      * Merges {@link Iterable}s generated by a mapper {@link Function} for each individual item emitted by
      * the current {@code Flowable} into a single {@code Flowable} sequence.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
+     * <img width="640" height="342" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}s is
@@ -10592,7 +10592,7 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
      * Merges {@link Iterable}s generated by a mapper {@link Function} for each individual item emitted by
      * the current {@code Flowable} into a single {@code Flowable} sequence.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
+     * <img width="640" height="342" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}s is
@@ -14336,7 +14336,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the current {@code Flowable}
      * within periodic time intervals and optionally emit the very last upstream item when the upstream completes.
      * <p>
-     * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.emitlast.png" alt="">
+     * <img width="640" height="277" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.emitlast.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -14407,7 +14407,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}
      * and optionally emit the very last upstream item when the upstream completes.
      * <p>
-     * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.emitlast.png" alt="">
+     * <img width="640" height="277" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.emitlast.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -14448,7 +14448,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      * emits the most recently emitted item (if any) emitted by the current {@code Flowable} since the previous
      * emission from the {@code sampler} {@code Publisher}.
      * <p>
-     * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.nolast.png" alt="">
+     * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.nolast.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses the emissions of the {@code sampler}
@@ -14480,7 +14480,7 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler) {
      * emission from the {@code sampler} {@code Publisher}
      * and optionally emit the very last upstream item when the upstream or other {@code Publisher} complete.
      * <p>
-     * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.emitlast.png" alt="">
+     * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.emitlast.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses the emissions of the {@code sampler}
@@ -14759,7 +14759,7 @@ public final Single<T> single(@NonNull T defaultItem) {
      * if this {@code Flowable} completes without emitting any items a {@link NoSuchElementException} will be signaled and
      * if this {@code Flowable} emits more than one item, an {@link IllegalArgumentException} will be signaled.
      * <p>
-     * <img width="640" height="205" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrError.png" alt="">
+     * <img width="640" height="206" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrError.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -15728,7 +15728,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
      * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} or the items of an alternate
      * {@link Publisher} if the current {@code Flowable} is empty.
      * <p>
-     * <img width="640" height="255" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.png" alt="">
+     * <img width="640" height="256" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>If the current {@code Flowable} is empty, the alternate {@code Publisher} is expected to honor backpressure.
@@ -15835,7 +15835,7 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
      * disposing the subscription to the previous {@code CompletableSource}, thus keeping at most one
      * active {@code CompletableSource} running.
      * <p>
-     * <img width="640" height="521" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapCompletable.f.png" alt="">
+     * <img width="640" height="522" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapCompletable.f.png" alt="">
      * <p>
      * Since a {@code CompletableSource} doesn't produce any items, the resulting reactive type of
      * this operator is a {@link Completable} that can only indicate successful completion or
@@ -16852,7 +16852,7 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.png" alt="">
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.png" alt="">
      * <p>
      * Unlike the option with {@link #throttleLatest(long, TimeUnit, boolean)}, the very last item being held back
      * (if any) is not emitted when the upstream completes.
@@ -16891,7 +16891,7 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit) {
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.e.png" alt="">
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.e.png" alt="">
      * <p>
      * If no items were emitted from the upstream during this timeout phase, the next
      * upstream item is emitted immediately and the timeout window starts from then.
@@ -16930,7 +16930,7 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, bo
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.s.png" alt="">
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.s.png" alt="">
      * <p>
      * Unlike the option with {@link #throttleLatest(long, TimeUnit, Scheduler, boolean)}, the very last item being held back
      * (if any) is not emitted when the upstream completes.
@@ -16970,7 +16970,7 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.se.png" alt="">
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.se.png" alt="">
      * <p>
      * If no items were emitted from the upstream during this timeout phase, the next
      * upstream item is emitted immediately and the timeout window starts from then.
@@ -19764,7 +19764,7 @@ public final CompletionStage<T> lastStage(@Nullable T defaultItem) {
      * Signals the first upstream item or a {@link NoSuchElementException} if the upstream is empty via
      * a {@link CompletionStage}.
      * <p>
-     * <img width="640" height="338" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrErrorStage.f.png" alt="">
+     * <img width="640" height="343" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrErrorStage.f.png" alt="">
      * <p>
      * The upstream can be canceled by converting the resulting {@code CompletionStage} into
      * {@link CompletableFuture} via {@link CompletionStage#toCompletableFuture()} and
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index d4116406b4..37ce1e99e2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -117,7 +117,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
      * Runs multiple {@link MaybeSource}s provided by an {@link Iterable} sequence and
      * signals the events of the first one that signals (disposing the rest).
      * <p>
-     * <img width="640" height="519" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.amb.png" alt="">
+     * <img width="640" height="518" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.amb.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code amb} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -196,7 +196,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends MaybeS
     /**
      * Returns a {@link Flowable} that emits the items emitted by two {@link MaybeSource}s, one after the other.
      * <p>
-     * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.png" alt="">
+     * <img width="640" height="423" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -226,7 +226,7 @@ public static <T> Flowable<T> concat(@NonNull MaybeSource<? extends T> source1,
     /**
      * Returns a {@link Flowable} that emits the items emitted by three {@link MaybeSource}s, one after the other.
      * <p>
-     * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.png" alt="">
+     * <img width="640" height="423" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -260,7 +260,7 @@ public static <T> Flowable<T> concat(
     /**
      * Returns a {@link Flowable} that emits the items emitted by four {@link MaybeSource}s, one after the other.
      * <p>
-     * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.png" alt="">
+     * <img width="640" height="423" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concat.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -425,7 +425,7 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? exten
      * source {@code MaybeSource}s. The operator buffers the value emitted by these {@code MaybeSource}s and then drains them
      * in order, each one after the previous one completes.
      * <p>
-     * <img width="640" height="489" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatArrayEager.png" alt="">
+     * <img width="640" height="490" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatArrayEager.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -1227,7 +1227,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeS
      * Flattens a {@link MaybeSource} that emits a {@code MaybeSource} into a single {@code MaybeSource} that emits the item
      * emitted by the nested {@code MaybeSource}, without any transformation.
      * <p>
-     * <img width="640" height="393" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.oo.png" alt="">
+     * <img width="640" height="394" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.merge.oo.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1771,7 +1771,7 @@ public static <T> Maybe<T> never() {
      * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link MaybeSource} sequences are the
      * same by comparing the items emitted by each {@code MaybeSource} pairwise.
      * <p>
-     * <img width="640" height="196" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.sequenceEqual.png" alt="">
+     * <img width="640" height="187" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.sequenceEqual.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2562,7 +2562,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
      * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      *
      * <p>
-     * <img width="640" height="341" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zipArray.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.zipArray.png" alt="">
      * <p>This operator terminates eagerly if any of the source {@code MaybeSource}s signal an {@code onError} or {@code onComplete}. This
      * also means it is possible some sources may not get subscribed to at all.
      * <dl>
@@ -3630,7 +3630,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
      * Returns a {@code Maybe} that is based on applying a specified function to the item emitted by the current {@code Maybe},
      * where that function returns a {@link MaybeSource}.
      * <p>
-     * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
+     * <img width="640" height="357" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3782,7 +3782,7 @@ public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T,
      * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the current {@code Maybe},
      * where that function returns an {@link ObservableSource}.
      * <p>
-     * <img width="640" height="356" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
+     * <img width="640" height="357" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMapObservable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3807,7 +3807,7 @@ public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ?
      * Returns a {@link Flowable} that emits items based on applying a specified function to the item emitted by the
      * current {@code Maybe}, where that function returns a {@link Publisher}.
      * <p>
-     * <img width="640" height="260" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapPublisher.png" alt="">
+     * <img width="640" height="261" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapPublisher.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the downstream backpressure.</dd>
@@ -3864,7 +3864,7 @@ public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends
      * current {@code Maybe}, where that function returns a {@link Single}.
      * When this {@code Maybe} just completes the resulting {@code Maybe} completes as well.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
+     * <img width="640" height="357" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMapSingleElement} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3935,7 +3935,7 @@ public final Maybe<T> hide() {
     /**
      * Returns a {@link Completable} that ignores the item emitted by the current {@code Maybe} and only calls {@code onComplete} or {@code onError}.
      * <p>
-     * <img width="640" height="389" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.ignoreElement.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.ignoreElement.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ignoreElement} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4207,7 +4207,7 @@ public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
      * Wraps a {@code Maybe} to emit its item (or notify of its error) on a specified {@link Scheduler},
      * asynchronously.
      * <p>
-     * <img width="640" height="182" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.observeOn.png" alt="">
+     * <img width="640" height="183" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.observeOn.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>you specify which {@code Scheduler} this operator will use.</dd>
@@ -5137,7 +5137,7 @@ public final void subscribe(@NonNull MaybeObserver<? super T> observer) {
     /**
      * Asynchronously subscribes subscribers to this {@code Maybe} on the specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="752" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.subscribeOn.png" alt="">
+     * <img width="640" height="753" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.subscribeOn.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>you specify which {@code Scheduler} this operator will use.</dd>
@@ -5194,7 +5194,7 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
      * Returns a {@code Maybe} that emits the items emitted by the current {@code Maybe} or the items of an alternate
      * {@link MaybeSource} if the current {@code Maybe} is empty.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
+     * <img width="640" height="446" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchIfEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5217,7 +5217,7 @@ public final Maybe<T> switchIfEmpty(@NonNull MaybeSource<? extends T> other) {
      * Returns a {@link Single} that emits the items emitted by the current {@code Maybe} or the item of an alternate
      * {@link SingleSource} if the current {@code Maybe} is empty.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
+     * <img width="640" height="446" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchIfEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5739,7 +5739,7 @@ public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator, @NonNu
      * Returns a {@code Maybe} which makes sure when a {@link MaybeObserver} disposes the {@link Disposable},
      * that call is propagated up on the specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="700" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.unsubscribeOn.png" alt="">
+     * <img width="640" height="693" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.unsubscribeOn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code unsubscribeOn} calls {@code dispose()} of the upstream on the {@code Scheduler} you specify.</dd>
@@ -6002,7 +6002,7 @@ public final CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
      * Maps the upstream succecss value into a Java {@link Stream} and emits its
      * items to the downstream consumer as a {@link Flowable}.
      * <p>
-     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsFlowable.m.png" alt="">
+     * <img width="640" height="246" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsFlowable.m.png" alt="">
      * <p>
      * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
@@ -6046,7 +6046,7 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
     /**
      * Maps the upstream succecss value into a Java {@link Stream} and emits its
      * items to the downstream consumer as an {@link Observable}.
-     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsObservable.m.png" alt="">
+     * <img width="640" height="241" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsObservable.m.png" alt="">
      * <p>
      * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 6db7ce3cc1..9eeb169871 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -1271,7 +1271,7 @@ public static <T> Observable<T> concatArrayDelayError(@NonNull ObservableSource<
     /**
      * Concatenates an array of {@link ObservableSource}s eagerly into a single stream of values.
      * <p>
-     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArrayEager.png" alt="">
+     * <img width="640" height="411" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArrayEager.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them
@@ -1688,7 +1688,7 @@ public static <T> Observable<T> empty() {
      * Returns an {@code Observable} that invokes an {@link Observer}'s {@link Observer#onError onError} method when the
      * {@code Observer} subscribes to it.
      * <p>
-     * <img width="640" height="220" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.supplier.png" alt="">
+     * <img width="640" height="221" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.supplier.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1714,7 +1714,7 @@ public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> sup
      * Returns an {@code Observable} that invokes an {@link Observer}'s {@link Observer#onError onError} method when the
      * {@code Observer} subscribes to it.
      * <p>
-     * <img width="640" height="220" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.item.png" alt="">
+     * <img width="640" height="221" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.item.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1740,7 +1740,7 @@ public static <T> Observable<T> error(@NonNull Throwable throwable) {
      * Returns an {@code Observable} instance that runs the given {@link Action} for each subscriber and
      * emits either its exception or simply completes.
      * <p>
-     * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromAction.png" alt="">
+     * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromAction.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromAction} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1941,7 +1941,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
     /**
      * Converts an {@link Iterable} sequence into an {@code Observable} that emits the items in the sequence.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromIterable.png" alt="">
+     * <img width="640" height="187" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromIterable.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromIterable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5198,7 +5198,7 @@ public static <T, R> Observable<R> zipArray(
      * Returns a {@link Single} that emits a {@link Boolean} that indicates whether all of the items emitted by the current
      * {@code Observable} satisfy a condition.
      * <p>
-     * <img width="640" height="264" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/all.o.png" alt="">
+     * <img width="640" height="265" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/all.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code all} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5275,7 +5275,7 @@ public final Single<Boolean> any(@NonNull Predicate<? super T> predicate) {
      * Returns the first item emitted by the current {@code Observable}, or throws
      * {@link NoSuchElementException} if it emits no items.
      * <p>
-     * <img width="640" height="412" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingFirst.o.png" alt="">
+     * <img width="640" height="413" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingFirst.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingFirst} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5703,7 +5703,7 @@ public final void blockingSubscribe() {
     /**
      * Subscribes to the source and calls the given callbacks <strong>on the current thread</strong>.
      * <p>
-     * <img width="640" height="393" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingSubscribe.o.1.png" alt="">
+     * <img width="640" height="394" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingSubscribe.o.1.png" alt="">
      * <p>
      * If the {@code Observable} emits an error, it is wrapped into an
      * {@link OnErrorNotImplementedException}
@@ -5732,7 +5732,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext) {
     /**
      * Subscribes to the source and calls the given callbacks <strong>on the current thread</strong>.
      * <p>
-     * <img width="640" height="396" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingSubscribe.o.2.png" alt="">
+     * <img width="640" height="397" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/blockingSubscribe.o.2.png" alt="">
      * <p>
      * Note that calling this method will block the caller thread until the upstream terminates
      * normally or with an error. Therefore, calling this method from special threads such as the
@@ -6748,7 +6748,7 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
      * while delaying any error from either this or any of the inner {@code ObservableSource}s
      * till all of them terminate.
      * <p>
-     * <img width="640" height="347" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapDelayError.o.png" alt="">
+     * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapDelayError.o.png" alt="">
      * <p>
      * Note that there is no guarantee where the given {@code mapper} function will be executed; it could be on the subscribing thread,
      * on the upstream thread signaling the new item to be mapped or on the thread where the inner source terminates. To ensure
@@ -6777,7 +6777,7 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
      * while delaying any error from either this or any of the inner {@code ObservableSource}s
      * till all of them terminate.
      * <p>
-     * <img width="640" height="347" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapDelayError.o.png" alt="">
+     * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapDelayError.o.png" alt="">
      * <p>
      * Note that there is no guarantee where the given {@code mapper} function will be executed; it could be on the subscribing thread,
      * on the upstream thread signaling the new item to be mapped or on the thread where the inner source terminates. To ensure
@@ -6823,7 +6823,7 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
      * while delaying any error from either this or any of the inner {@code ObservableSource}s
      * till all of them terminate.
      * <p>
-     * <img width="640" height="347" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapDelayError.o.png" alt="">
+     * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapDelayError.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6863,7 +6863,7 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
      * current {@code Observable}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them in
      * order, each one after the previous one completes.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapEager.o.png" alt="">
+     * <img width="640" height="361" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapEager.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6890,7 +6890,7 @@ public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? ext
      * current {@code Observable}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them in
      * order, each one after the previous one completes.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapEager.o.png" alt="">
+     * <img width="640" height="361" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapEager.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6990,7 +6990,7 @@ public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? supe
      * Maps each element of the current {@code Observable} into {@link CompletableSource}s, subscribes to them one at a time in
      * order and waits until the upstream and all {@code CompletableSource}s complete.
      * <p>
-     * <img width="640" height="505" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapCompletable.o.png" alt="">
+     * <img width="640" height="506" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapCompletable.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7013,7 +7013,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * Maps each element of the current {@code Observable} into {@link CompletableSource}s, subscribes to them one at a time in
      * order and waits until the upstream and all {@code CompletableSource}s complete.
      * <p>
-     * <img width="640" height="505" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapCompletable.o.png" alt="">
+     * <img width="640" height="506" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapCompletable.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8366,7 +8366,7 @@ public final Observable<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
      * <p>Note that the {@code onFinally} action is shared between subscriptions and as such
      * should be thread-safe.
      * <p>
-     * <img width="640" height="281" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doFinally.o.png" alt="">
+     * <img width="640" height="282" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doFinally.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doFinally} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8686,7 +8686,7 @@ public final Maybe<T> elementAt(long index) {
      * Returns a {@link Single} that emits the item found at a specified index in a sequence of emissions from
      * the current {@code Observable}, or a default item if that index is out of range.
      * <p>
-     * <img width="640" height="353" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtDefault.o.png" alt="">
+     * <img width="640" height="354" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtDefault.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code elementAt} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8788,7 +8788,7 @@ public final Maybe<T> firstElement() {
      * Returns a {@link Single} that emits only the very first item emitted by the current {@code Observable}, or a default item
      * if the current {@code Observable} completes without emitting any items.
      * <p>
-     * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
+     * <img width="640" height="285" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code first} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8811,7 +8811,7 @@ public final Single<T> first(@NonNull T defaultItem) {
      * Returns a {@link Single} that emits only the very first item emitted by the current {@code Observable} or
      * signals a {@link NoSuchElementException} if the current {@code Observable} is empty.
      * <p>
-     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrError.o.png" alt="">
+     * <img width="640" height="435" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/firstOrError.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code firstOrError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8888,7 +8888,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * {@code ObservableSource}s and emitting the results of this merger, while limiting the maximum number of concurrent
      * subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="441" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
+     * <img width="640" height="442" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8922,7 +8922,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * {@code ObservableSource}s and emitting the results of this merger, while limiting the maximum number of concurrent
      * subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="441" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
+     * <img width="640" height="442" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9050,7 +9050,7 @@ public final <R> Observable<R> flatMap(
      * {@code ObservableSource}s and emitting the results of this merger, while limiting the maximum number of concurrent
      * subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="441" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
+     * <img width="640" height="442" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaxConcurrency.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9282,7 +9282,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
      * Maps each element of the current {@code Observable} into {@link CompletableSource}s, subscribes to them and
      * waits until the upstream and all {@code CompletableSource}s complete, optionally delaying all errors.
      * <p>
-     * <img width="640" height="361" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapCompletableDelayError.o.png" alt="">
+     * <img width="640" height="362" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapCompletableDelayError.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapCompletable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9487,7 +9487,7 @@ public final Disposable forEach(@NonNull Consumer<? super T> onNext) {
      * Subscribes to the {@link ObservableSource} and calls a {@link Predicate} for each item of the current {@code Observable},
      * on its emission thread, until the predicate returns {@code false}.
      * <p>
-     * <img width="640" height="272" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/forEachWhile.o.png" alt="">
+     * <img width="640" height="273" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/forEachWhile.o.png" alt="">
      * <p>
      * If the {@code Observable} emits an error, it is wrapped into an
      * {@link OnErrorNotImplementedException}
@@ -10668,7 +10668,7 @@ public final Observable<T> onErrorReturnItem(@NonNull T item) {
      * Nulls out references to the upstream producer and downstream {@link Observer} if
      * the sequence is terminated or downstream calls {@code dispose()}.
      * <p>
-     * <img width="640" height="246" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onTerminateDetach.o.png" alt="">
+     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onTerminateDetach.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onTerminateDetach} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10923,7 +10923,7 @@ public final Observable<T> repeat(long times) {
      * Returns an {@code Observable} that repeats the sequence of items emitted by the current {@code Observable} until
      * the provided stop function returns {@code true}.
      * <p>
-     * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatUntil.o.png" alt="">
+     * <img width="640" height="263" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatUntil.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeatUntil} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11031,7 +11031,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
      * <p>
-     * <img width="640" height="391" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fn.png" alt="">
+     * <img width="640" height="392" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11067,7 +11067,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
      * <p>
-     * <img width="640" height="391" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fn.png" alt="">
+     * <img width="640" height="392" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fn.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11142,7 +11142,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
      * <p>
-     * <img width="640" height="328" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fnts.png" alt="">
+     * <img width="640" height="329" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fnts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -11189,7 +11189,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
      * <p>
-     * <img width="640" height="328" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fnts.png" alt="">
+     * <img width="640" height="329" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fnts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -11234,7 +11234,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying all items that were emitted within a specified time window.
      * <p>
-     * <img width="640" height="393" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ft.png" alt="">
+     * <img width="640" height="394" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ft.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -11265,7 +11265,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying all items that were emitted within a specified time window.
      * <p>
-     * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fts.png" alt="">
+     * <img width="640" height="367" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -11302,7 +11302,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * emitted by a {@link ConnectableObservable} that shares a single subscription to the current {@code Observable},
      * replaying all items that were emitted within a specified time window.
      * <p>
-     * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fts.png" alt="">
+     * <img width="640" height="367" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.fts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -11654,7 +11654,7 @@ public final Observable<T> retry() {
      * Returns an {@code Observable} that mirrors the current {@code Observable}, resubscribing to it if it calls {@code onError}
      * and the predicate returns {@code true} for that specific exception and retry count.
      * <p>
-     * <img width="640" height="235" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.ne.png" alt="">
+     * <img width="640" height="236" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.ne.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11681,7 +11681,7 @@ public final Observable<T> retry(@NonNull BiPredicate<? super Integer, ? super T
      * Returns an {@code Observable} that mirrors the current {@code Observable}, resubscribing to it if it calls {@code onError}
      * up to a specified number of retries.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.n.png" alt="">
+     * <img width="640" height="327" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.n.png" alt="">
      * <p>
      * If the current {@code Observable} calls {@link Observer#onError}, this method will resubscribe to the current
      * {@code Observable} for a maximum of {@code count} resubscriptions rather than propagating the
@@ -11712,7 +11712,7 @@ public final Observable<T> retry(long times) {
     /**
      * Retries at most times or until the predicate returns {@code false}, whichever happens first.
      * <p>
-     * <img width="640" height="269" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.nfe.png" alt="">
+     * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.nfe.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11738,7 +11738,7 @@ public final Observable<T> retry(long times, @NonNull Predicate<? super Throwabl
     /**
      * Retries the current {@code Observable} if the predicate returns {@code true}.
      * <p>
-     * <img width="640" height="248" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.e.png" alt="">
+     * <img width="640" height="249" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.e.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11758,7 +11758,7 @@ public final Observable<T> retry(@NonNull Predicate<? super Throwable> predicate
     /**
      * Retries until the given stop function returns {@code true}.
      * <p>
-     * <img width="640" height="261" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryUntil.o.png" alt="">
+     * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryUntil.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retryUntil} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11911,7 +11911,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit) {
      * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
      * within periodic time intervals and optionally emit the very last upstream item when the upstream completes.
      * <p>
-     * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.emitlast.png" alt="">
+     * <img width="640" height="277" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.emitlast.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sample} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -11974,7 +11974,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
      * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}
      *  and optionally emit the very last upstream item when the upstream completes.
      * <p>
-     * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.emitlast.png" alt="">
+     * <img width="640" height="277" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.emitlast.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -12011,7 +12011,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
      * emits the most recently emitted item (if any) emitted by the current {@code Observable} since the previous
      * emission from the {@code sampler} {@code ObservableSource}.
      * <p>
-     * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.nolast.png" alt="">
+     * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.nolast.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code sample} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12038,7 +12038,7 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler) {
      * emission from the {@code sampler} {@code ObservableSource}
      * and optionally emit the very last upstream item when the upstream or other {@code ObservableSource} complete.
      * <p>
-     * <img width="640" height="289" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.emitlast.png" alt="">
+     * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.o.emitlast.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code sample} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12283,7 +12283,7 @@ public final Single<T> single(@NonNull T defaultItem) {
      * if the current {@code Observable} completes without emitting any items or emits more than one item a
      * {@link NoSuchElementException} or {@link IllegalArgumentException} will be signaled respectively.
      * <p>
-     * <img width="640" height="228" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrError.png" alt="">
+     * <img width="640" height="206" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrError.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code singleOrError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12708,7 +12708,7 @@ public final Observable<T> startWithIterable(@NonNull Iterable<@NonNull ? extend
      * Returns an {@code Observable} which first runs the other {@link CompletableSource}
      * then the current {@code Observable} if the other completed normally.
      * <p>
-     * <img width="640" height="437" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.startWith.c.png" alt="">
+     * <img width="640" height="268" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.startWith.c.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13052,7 +13052,7 @@ public final Observable<T> subscribeOn(@NonNull Scheduler scheduler) {
      * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} or the items of an alternate
      * {@link ObservableSource} if the current {@code Observable} is empty.
      * <p>
-     * <img width="640" height="255" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.png" alt="">
+     * <img width="640" height="256" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchIfEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13150,7 +13150,7 @@ public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends
      * disposing the subscription to the previous {@code CompletableSource}, thus keeping at most one
      * active {@code CompletableSource} running.
      * <p>
-     * <img width="640" height="521" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapCompletable.f.png" alt="">
+     * <img width="640" height="522" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapCompletable.f.png" alt="">
      * <p>
      * Since a {@code CompletableSource} doesn't produce any items, the resulting reactive type of
      * this operator is a {@link Completable} that can only indicate successful completion or
@@ -13238,7 +13238,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
      * available while failing immediately if the current {@code Observable} or any of the
      * active inner {@code MaybeSource}s fail.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.o.png" alt="">
+     * <img width="640" height="531" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapMaybe.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13275,7 +13275,7 @@ public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? ext
      * while disposing the older ones  (and ignoring their signals) and emits the latest success value of the current one if
      * available, delaying errors from the current {@code Observable} or the inner {@code MaybeSource}s until all terminate.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="469" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapMaybeDelayError.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13306,7 +13306,7 @@ public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? supe
      * The resulting {@code Observable} completes if both the current {@code Observable} and the last inner {@code SingleSource}, if any, complete.
      * If the current {@code Observable} signals an {@code onError}, the inner {@code SingleSource} is disposed and the error delivered in-sequence.
      * <p>
-     * <img width="640" height="531" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapSingle.o.png" alt="">
+     * <img width="640" height="532" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMapSingle.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14030,7 +14030,7 @@ public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.png" alt="">
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.png" alt="">
      * <p>
      * Unlike the option with {@link #throttleLatest(long, TimeUnit, boolean)}, the very last item being held back
      * (if any) is not emitted when the upstream completes.
@@ -14063,7 +14063,7 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit)
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.e.png" alt="">
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.e.png" alt="">
      * <p>
      * If no items were emitted from the upstream during this timeout phase, the next
      * upstream item is emitted immediately and the timeout window starts from then.
@@ -14096,7 +14096,7 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.s.png" alt="">
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.s.png" alt="">
      * <p>
      * Unlike the option with {@link #throttleLatest(long, TimeUnit, Scheduler, boolean)}, the very last item being held back
      * (if any) is not emitted when the upstream completes.
@@ -14130,7 +14130,7 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
      * item from upstream, then periodically emitting the latest item (if any) when
      * the specified timeout elapses between them.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.se.png" alt="">
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.se.png" alt="">
      * <p>
      * If no items were emitted from the upstream during this timeout phase, the next
      * upstream item is emitted immediately and the timeout window starts from then.
@@ -15085,7 +15085,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      * </li>
      * <li>{@link BackpressureStrategy#LATEST}
      * <p>
-     * <img width="640" height="296" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toFlowable.o.latest.png" alt="">
+     * <img width="640" height="297" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toFlowable.o.latest.png" alt="">
      * </li>
      * <li>{@link BackpressureStrategy#ERROR}
      * <p>
@@ -15093,7 +15093,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      * </li>
      * <li>{@link BackpressureStrategy#MISSING}
      * <p>
-     * <img width="640" height="411" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toFlowable.o.missing.png" alt="">
+     * <img width="640" height="412" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toFlowable.o.missing.png" alt="">
      * </li>
      * </ul>
      * <dl>
@@ -15259,7 +15259,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
      * Return an {@code Observable} that schedules the downstream {@link Observer}s' {@code dispose} calls
      * aimed at the current {@code Observable} on the given {@link Scheduler}.
      * <p>
-     * <img width="640" height="452" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/unsubscribeOn.o.png" alt="">
+     * <img width="640" height="453" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/unsubscribeOn.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 7db69e5bc5..cab4d3c073 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -119,7 +119,7 @@ public abstract class Single<@NonNull T> implements SingleSource<T> {
      * Runs multiple {@link SingleSource}s and signals the events of the first one that signals (disposing
      * the rest).
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.amb.png" alt="">
+     * <img width="640" height="516" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.amb.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code amb} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -143,7 +143,7 @@ public static <T> Single<T> amb(@NonNull Iterable<@NonNull ? extends SingleSourc
      * Runs multiple {@link SingleSource}s and signals the events of the first one that signals (disposing
      * the rest).
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ambArray.png" alt="">
+     * <img width="640" height="516" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ambArray.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code ambArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -224,7 +224,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Singl
      * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided by
      * a {@link Publisher} sequence.
      * <p>
-     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.p.png" alt="">
+     * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer
@@ -1707,7 +1707,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends
      * exposing the success items as a {@link Flowable} sequence and delaying all errors from
      * all of them until all terminate.
      * <p>
-     * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.switchOnNextDelayError.png" alt="">
+     * <img width="640" height="423" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.switchOnNextDelayError.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The {@code sources} {@code Publisher} is consumed in an unbounded manner (requesting {@link Long#MAX_VALUE}).
@@ -1907,7 +1907,7 @@ public static <T, R> Single<R> zip(@NonNull Iterable<@NonNull ? extends SingleSo
      * Returns a {@code Single} that emits the results of a specified combiner function applied to two items emitted by
      * two other {@link SingleSource}s.
      * <p>
-     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1944,7 +1944,7 @@ public static <T1, T2, R> Single<R> zip(
      * Returns a {@code Single} that emits the results of a specified combiner function applied to three items emitted
      * by three other {@link SingleSource}s.
      * <p>
-     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1986,7 +1986,7 @@ public static <T1, T2, T3, R> Single<R> zip(
      * Returns a {@code Single} that emits the results of a specified combiner function applied to four items
      * emitted by four other {@link SingleSource}s.
      * <p>
-     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2032,7 +2032,7 @@ public static <T1, T2, T3, T4, R> Single<R> zip(
      * Returns a {@code Single} that emits the results of a specified combiner function applied to five items
      * emitted by five other {@link SingleSource}s.
      * <p>
-     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2084,7 +2084,7 @@ public static <T1, T2, T3, T4, T5, R> Single<R> zip(
      * Returns a {@code Single} that emits the results of a specified combiner function applied to six items
      * emitted by six other {@link SingleSource}s.
      * <p>
-     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2140,7 +2140,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(
      * Returns a {@code Single} that emits the results of a specified combiner function applied to seven items
      * emitted by seven other {@link SingleSource}s.
      * <p>
-     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2201,7 +2201,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(
      * Returns a {@code Single} that emits the results of a specified combiner function applied to eight items
      * emitted by eight other {@link SingleSource}s.
      * <p>
-     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2266,7 +2266,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(
      * Returns a {@code Single} that emits the results of a specified combiner function applied to nine items
      * emitted by nine other {@link SingleSource}s.
      * <p>
-     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.zip.n.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2895,7 +2895,7 @@ public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit, @Non
     /**
      * Calls the specified consumer with the success item after this item has been emitted to the downstream.
      * <p>
-     * <img width="640" height="460" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doAfterSuccess.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doAfterSuccess.png" alt="">
      * <p>
      * Note that the {@code doAfterSuccess} action is shared between subscriptions and as such
      * should be thread-safe.
@@ -2920,7 +2920,7 @@ public final Single<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSucces
     /**
      * Registers an {@link Action} to be called after this {@code Single} invokes either {@code onSuccess} or {@code onError}.
      * <p>
-     * <img width="640" height="460" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doAfterTerminate.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doAfterTerminate.png" alt="">
      * <p>
      * Note that the {@code doAfterTerminate} action is shared between subscriptions and as such
      * should be thread-safe.</p>
@@ -3314,7 +3314,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the current {@code Single},
      * where that function returns an {@link ObservableSource}.
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapObservable.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapObservable.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMapObservable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3687,7 +3687,7 @@ public final Single<Notification<T>> materialize() {
      * Signals {@code true} if the current {@code Single} signals a success value that is {@link Object#equals(Object)} with the value
      * provided.
      * <p>
-     * <img width="640" height="400" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.contains.png" alt="">
+     * <img width="640" height="401" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.contains.png" alt="">
      * <p>
      * <img width="640" height="401" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.contains.png" alt="">
      * <dl>
@@ -3734,7 +3734,7 @@ public final Single<Boolean> contains(@NonNull Object item, @NonNull BiPredicate
     /**
      * Flattens this {@code Single} and another {@link SingleSource} into one {@link Flowable}, without any transformation.
      * <p>
-     * <img width="640" height="415" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeWith.png" alt="">
+     * <img width="640" height="416" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeWith.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code SingleSource}s so that they appear as one {@code Flowable}, by using
      * the {@code mergeWith} method.
@@ -3814,7 +3814,7 @@ public final Single<T> observeOn(@NonNull Scheduler scheduler) {
      * Ends the flow with a success item returned by a function for the {@link Throwable} error signaled by the current
      * {@code Single} instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturn.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturn.png" alt="">
      * <p>
      * By default, when a {@code Single} encounters an error that prevents it from emitting the expected item to its
      * subscriber, the {@code Single} invokes its subscriber's {@link SingleObserver#onError} method, and then quits
@@ -3848,7 +3848,7 @@ public final Single<T> onErrorReturn(@NonNull Function<Throwable, ? extends T> i
     /**
      * Signals the specified value as success in case the current {@code Single} signals an error.
      * <p>
-     * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturnItem.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturnItem.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code onErrorReturnItem} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3870,7 +3870,7 @@ public final Single<T> onErrorReturnItem(@NonNull T item) {
      * Resumes the flow with the given {@link SingleSource} when the current {@code Single} fails instead of
      * signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeWith.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeWith.png" alt="">
      * <p>
      * By default, when a {@code Single} encounters an error that prevents it from emitting the expected item to
      * its {@link SingleObserver}, the {@code Single} invokes its {@code SingleObserver}'s {@code onError} method, and then quits
@@ -3925,7 +3925,7 @@ public final Maybe<T> onErrorComplete() {
      * Returns a {@link Maybe} instance that if this {@code Single} emits an error and the predicate returns
      * {@code true}, it will emit an {@code onComplete} and swallow the throwable.
      * <p>
-     * <img width="640" height="220" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorComplete.f.png" alt="">
+     * <img width="640" height="270" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorComplete.f.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onErrorComplete} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3949,7 +3949,7 @@ public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> pred
      * Resumes the flow with a {@link SingleSource} returned for the failure {@link Throwable} of the current {@code Single} by a
      * function instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="451" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeNext.f.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeNext.f.png" alt="">
      * <p>
      * By default, when a {@code Single} encounters an error that prevents it from emitting the expected item to
      * its {@link SingleObserver}, the {@code Single} invokes its {@code SingleObserver}'s {@code onError} method, and then quits
@@ -4007,7 +4007,7 @@ public final Single<T> onTerminateDetach() {
     /**
      * Repeatedly re-subscribes to the current {@code Single} and emits each success value as a {@link Flowable} sequence.
      * <p>
-     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.png" alt="">
+     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -4028,7 +4028,7 @@ public final Flowable<T> repeat() {
     /**
      * Re-subscribes to the current {@code Single} at most the given number of times and emits each success value as a {@link Flowable} sequence.
      * <p>
-     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.n.png" alt="">
+     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.n.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -4053,7 +4053,7 @@ public final Flowable<T> repeat(long times) {
      * the {@link Publisher} returned by the handler function signals a value in response to a
      * value signaled through the {@link Flowable} the handler receives.
      * <p>
-     * <img width="640" height="1478" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeatWhen.png" alt="">
+     * <img width="640" height="1480" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeatWhen.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.
@@ -4946,7 +4946,7 @@ public final <E> Single<T> takeUntil(@NonNull SingleSource<? extends E> other) {
      * Signals a {@link TimeoutException} if the current {@code Single} doesn't signal a success value within the
      * specified timeout window.
      * <p>
-     * <img width="640" height="364" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeout.png" alt="">
+     * <img width="640" height="334" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timeout.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeout} signals the {@code TimeoutException} on the {@code computation} {@link Scheduler}.</dd>
@@ -5423,7 +5423,7 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
      * Maps the upstream succecss value into a Java {@link Stream} and emits its
      * items to the downstream consumer as an {@link Observable}.
      * <p>
-     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsObservable.s.png" alt="">
+     * <img width="640" height="241" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flattenStreamAsObservable.s.png" alt="">
      * <p>
      * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index 403f69b1a0..58152e2400 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -1394,7 +1394,7 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
      * Returns a {@code ParallelFlowable} that merges each item emitted by the source on each rail with the values in an
      * {@link Iterable} corresponding to that item that is generated by a selector.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
+     * <img width="640" height="342" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from each downstream rail. The source {@code ParallelFlowable}s is
@@ -1427,7 +1427,7 @@ public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T
      * Returns a {@code ParallelFlowable} that merges each item emitted by the source {@code ParallelFlowable} with the values in an
      * {@link Iterable} corresponding to that item that is generated by a selector.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
+     * <img width="640" height="342" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapIterable.f.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from each downstream rail. The source {@code ParallelFlowable}s is
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java b/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java
new file mode 100644
index 0000000000..5c0886ea9d
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java
@@ -0,0 +1,106 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+package io.reactivex.rxjava3.internal.util;
+
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.net.URL;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.regex.*;
+
+import javax.imageio.ImageIO;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+/**
+ * Parses the main sources, locates the {@code <img>} tags, downloads
+ * the referenced image and checks if the scaled dimensions are correct.
+ */
+public final class MarbleDimensions {
+
+    /** Helper program. */
+    private MarbleDimensions() {
+        throw new IllegalStateException("No instances!");
+    }
+
+    public static void main(String[] args) throws Throwable {
+        Pattern p = Pattern.compile("\\s*\\*\\s*\\<img\\s+width\\=('|\")(\\d+)('|\")\\s+height\\=('|\")(\\d+)('|\")\\s+src\\=('|\")(.+?)('|\").*");
+
+        Map<String, Integer[]> dimensions = new HashMap<>();
+
+        for (Class<?> clazz : CLASSES) {
+            String simpleName = clazz.getSimpleName();
+            System.out.println(simpleName);
+            System.out.println("----");
+            String packageName = clazz.getPackage().getName();
+
+            File f = TestHelper.findSource(clazz.getSimpleName(), packageName);
+            if (f == null) {
+                System.err.println("Unable to locate " + clazz);
+                continue;
+            }
+
+            List<String> lines = Files.readAllLines(f.toPath());
+
+            for (int i = 0; i < lines.size(); i++) {
+                Matcher m = p.matcher(lines.get(i));
+                if (m.matches()) {
+                    int width = Integer.parseInt(m.group(2));
+                    int height = Integer.parseInt(m.group(5));
+                    String url = m.group(8);
+
+                    Integer[] imageDim = dimensions.get(url);
+                    if (imageDim == null) {
+                        Thread.sleep(SLEEP_PER_IMAGE_MILLIS);
+
+                        try {
+                            BufferedImage bimg = ImageIO.read(new URL(url));
+
+                            if (bimg == null) {
+                                throw new IOException("not found");
+                            }
+                            imageDim = new Integer[] { 0, 0 };
+                            imageDim[0] = bimg.getWidth();
+                            imageDim[1] = bimg.getHeight();
+
+                            dimensions.put(url, imageDim);
+                        } catch (IOException ex) {
+                            System.err.printf("%s => %s%n", url, ex);
+                            System.err.printf(" at %s.%s.method(%s.java:%d)%n", packageName, simpleName, simpleName, i + 1);
+                        }
+                    }
+
+                    if (imageDim != null) {
+                        int expectedHeight = (int)Math.round(1.0 * width / imageDim[0] * imageDim[1]);
+
+                        if (expectedHeight != height) {
+                            System.out.printf("    %d => %d%n", height, expectedHeight);
+                            System.out.printf(" at %s.%s.method(%s.java:%d)%n", packageName, simpleName, simpleName, i + 1);
+                        }
+                    }
+                    // System.out.printf("%d: %d x %d => %s%n", i + 1, width, height, url);
+                }
+            }
+        }
+    }
+
+    static final int SLEEP_PER_IMAGE_MILLIS = 100;
+
+    static final Class<?>[] CLASSES = {
+            Flowable.class, Observable.class, Maybe.class, Single.class, Completable.class, ParallelFlowable.class
+    };
+}

From f1a795da0d4cdfb3133206ad8e3887bdb8ba948b Mon Sep 17 00:00:00 2001
From: slisaasquatch <slisaasquatch@users.noreply.github.com>
Date: Tue, 28 Jan 2020 12:32:19 -0800
Subject: [PATCH 089/665] 3.x: Swap Maybe.flatMapSingle and
 Maybe.flatMapSingleElement (#6891)

* Deleted Maybe.flatMapSingle

And replaced tests with flatMapSingle().toSingle()

* Renamed Maybe.flatMapSingleElement to flatMapSingle

* Deleted unused MaybeFlatMapSingle operator

* Renamed operator MaybeFlatMapSingleElement to MaybeFlatMapSingle

* Add Ignore to XFlatMapTest.maybeSingle
---
 .../java/io/reactivex/rxjava3/core/Maybe.java |  37 +----
 .../operators/maybe/MaybeFlatMapSingle.java   |  21 ++-
 .../maybe/MaybeFlatMapSingleElement.java      | 132 ------------------
 .../reactivex/rxjava3/core/XFlatMapTest.java  |   2 +
 .../maybe/MaybeFlatMapSingleElementTest.java  |  30 ++--
 .../maybe/MaybeFlatMapSingleTest.java         |  11 +-
 6 files changed, 41 insertions(+), 192 deletions(-)
 delete mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 37ce1e99e2..f8cbdcdbe7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -2932,7 +2932,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * <p>
      * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatMapSingle.png" alt="">
      * <p>
-     * This operator is an alias for {@link #flatMapSingleElement(Function)}.
+     * This operator is an alias for {@link #flatMapSingle(Function)}.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2951,7 +2951,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final <R> Maybe<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        return flatMapSingleElement(mapper);
+        return flatMapSingle(mapper);
     }
 
     /**
@@ -3832,33 +3832,6 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
         return RxJavaPlugins.onAssembly(new MaybeFlatMapPublisher<>(this, mapper));
     }
 
-    /**
-     * Returns a {@link Single} based on applying a specified function to the item emitted by the
-     * current {@code Maybe}, where that function returns a {@code Single}.
-     * When this {@code Maybe} completes a {@link NoSuchElementException} will be thrown.
-     * <p>
-     * <img width="640" height="346" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle3.png" alt="">
-     * <dl>
-     * <dt><b>Scheduler:</b></dt>
-     * <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
-     * </dl>
-     *
-     * @param <R> the result value type
-     * @param mapper
-     *            a function that, when applied to the item emitted by the current {@code Maybe}, returns a
-     *            {@code Single}
-     * @return the new {@code Single} instance
-     * @throws NullPointerException if {@code mapper} is {@code null}
-     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
-     */
-    @CheckReturnValue
-    @NonNull
-    @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapSingle<>(this, mapper));
-    }
-
     /**
      * Returns a {@code Maybe} based on applying a specified function to the item emitted by the
      * current {@code Maybe}, where that function returns a {@link Single}.
@@ -3867,7 +3840,7 @@ public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends
      * <img width="640" height="357" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapSingle.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
-     * <dd>{@code flatMapSingleElement} does not operate by default on a particular {@link Scheduler}.</dd>
+     * <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * <p>History: 2.0.2 - experimental
@@ -3883,9 +3856,9 @@ public final <R> Single<R> flatMapSingle(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> flatMapSingleElement(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <R> Maybe<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
-        return RxJavaPlugins.onAssembly(new MaybeFlatMapSingleElement<>(this, mapper));
+        return RxJavaPlugins.onAssembly(new MaybeFlatMapSingle<>(this, mapper));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
index 2199ea470b..aed71dc855 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
@@ -13,7 +13,6 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
-import java.util.NoSuchElementException;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -25,10 +24,12 @@
 
 /**
  * Maps the success value of the source MaybeSource into a Single.
+ * <p>History: 2.0.2 - experimental
  * @param <T> the input value type
  * @param <R> the result value type
+ * @since 2.1
  */
-public final class MaybeFlatMapSingle<T, R> extends Single<R> {
+public final class MaybeFlatMapSingle<T, R> extends Maybe<R> {
 
     final MaybeSource<T> source;
 
@@ -40,7 +41,7 @@ public MaybeFlatMapSingle(MaybeSource<T> source, Function<? super T, ? extends S
     }
 
     @Override
-    protected void subscribeActual(SingleObserver<? super R> downstream) {
+    protected void subscribeActual(MaybeObserver<? super R> downstream) {
         source.subscribe(new FlatMapMaybeObserver<>(downstream, mapper));
     }
 
@@ -50,11 +51,11 @@ static final class FlatMapMaybeObserver<T, R>
 
         private static final long serialVersionUID = 4827726964688405508L;
 
-        final SingleObserver<? super R> downstream;
+        final MaybeObserver<? super R> downstream;
 
         final Function<? super T, ? extends SingleSource<? extends R>> mapper;
 
-        FlatMapMaybeObserver(SingleObserver<? super R> actual, Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+        FlatMapMaybeObserver(MaybeObserver<? super R> actual, Function<? super T, ? extends SingleSource<? extends R>> mapper) {
             this.downstream = actual;
             this.mapper = mapper;
         }
@@ -88,9 +89,7 @@ public void onSuccess(T value) {
                 return;
             }
 
-            if (!isDisposed()) {
-                ss.subscribe(new FlatMapSingleObserver<R>(this, downstream));
-            }
+            ss.subscribe(new FlatMapSingleObserver<R>(this, downstream));
         }
 
         @Override
@@ -100,7 +99,7 @@ public void onError(Throwable e) {
 
         @Override
         public void onComplete() {
-            downstream.onError(new NoSuchElementException());
+            downstream.onComplete();
         }
     }
 
@@ -108,9 +107,9 @@ static final class FlatMapSingleObserver<R> implements SingleObserver<R> {
 
         final AtomicReference<Disposable> parent;
 
-        final SingleObserver<? super R> downstream;
+        final MaybeObserver<? super R> downstream;
 
-        FlatMapSingleObserver(AtomicReference<Disposable> parent, SingleObserver<? super R> downstream) {
+        FlatMapSingleObserver(AtomicReference<Disposable> parent, MaybeObserver<? super R> downstream) {
             this.parent = parent;
             this.downstream = downstream;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java
deleted file mode 100644
index 49b7100575..0000000000
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElement.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Copyright (c) 2016-present, RxJava Contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
- * the License for the specific language governing permissions and limitations under the License.
- */
-
-package io.reactivex.rxjava3.internal.operators.maybe;
-
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicReference;
-
-import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-
-/**
- * Maps the success value of the source MaybeSource into a Single.
- * <p>History: 2.0.2 - experimental
- * @param <T> the input value type
- * @param <R> the result value type
- * @since 2.1
- */
-public final class MaybeFlatMapSingleElement<T, R> extends Maybe<R> {
-
-    final MaybeSource<T> source;
-
-    final Function<? super T, ? extends SingleSource<? extends R>> mapper;
-
-    public MaybeFlatMapSingleElement(MaybeSource<T> source, Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-        this.source = source;
-        this.mapper = mapper;
-    }
-
-    @Override
-    protected void subscribeActual(MaybeObserver<? super R> downstream) {
-        source.subscribe(new FlatMapMaybeObserver<>(downstream, mapper));
-    }
-
-    static final class FlatMapMaybeObserver<T, R>
-    extends AtomicReference<Disposable>
-    implements MaybeObserver<T>, Disposable {
-
-        private static final long serialVersionUID = 4827726964688405508L;
-
-        final MaybeObserver<? super R> downstream;
-
-        final Function<? super T, ? extends SingleSource<? extends R>> mapper;
-
-        FlatMapMaybeObserver(MaybeObserver<? super R> actual, Function<? super T, ? extends SingleSource<? extends R>> mapper) {
-            this.downstream = actual;
-            this.mapper = mapper;
-        }
-
-        @Override
-        public void dispose() {
-            DisposableHelper.dispose(this);
-        }
-
-        @Override
-        public boolean isDisposed() {
-            return DisposableHelper.isDisposed(get());
-        }
-
-        @Override
-        public void onSubscribe(Disposable d) {
-            if (DisposableHelper.setOnce(this, d)) {
-                downstream.onSubscribe(this);
-            }
-        }
-
-        @Override
-        public void onSuccess(T value) {
-            SingleSource<? extends R> ss;
-
-            try {
-                ss = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null SingleSource");
-            } catch (Throwable ex) {
-                Exceptions.throwIfFatal(ex);
-                onError(ex);
-                return;
-            }
-
-            ss.subscribe(new FlatMapSingleObserver<R>(this, downstream));
-        }
-
-        @Override
-        public void onError(Throwable e) {
-            downstream.onError(e);
-        }
-
-        @Override
-        public void onComplete() {
-            downstream.onComplete();
-        }
-    }
-
-    static final class FlatMapSingleObserver<R> implements SingleObserver<R> {
-
-        final AtomicReference<Disposable> parent;
-
-        final MaybeObserver<? super R> downstream;
-
-        FlatMapSingleObserver(AtomicReference<Disposable> parent, MaybeObserver<? super R> downstream) {
-            this.parent = parent;
-            this.downstream = downstream;
-        }
-
-        @Override
-        public void onSubscribe(final Disposable d) {
-            DisposableHelper.replace(parent, d);
-        }
-
-        @Override
-        public void onSuccess(final R value) {
-            downstream.onSuccess(value);
-        }
-
-        @Override
-        public void onError(final Throwable e) {
-            downstream.onError(e);
-        }
-    }
-}
diff --git a/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
index 7efeee401d..6e80b57904 100644
--- a/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
@@ -505,6 +505,7 @@ public Completable apply(Integer v) throws Exception {
     }
 
     @Test
+    @Ignore
     public void maybeSingle() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -517,6 +518,7 @@ public Single<Integer> apply(Integer v) throws Exception {
                     return Single.<Integer>error(new TestException());
                 }
             })
+            .toSingle()
             .test();
 
             cb.await();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
index 3d85785add..cc92e023ab 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
@@ -22,8 +22,8 @@
 
 public class MaybeFlatMapSingleElementTest extends RxJavaTest {
     @Test
-    public void flatMapSingleElementValue() {
-        Maybe.just(1).flatMapSingleElement(new Function<Integer, SingleSource<Integer>>() {
+    public void flatMapSingleValue() {
+        Maybe.just(1).flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
             @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
                 if (integer == 1) {
                     return Single.just(2);
@@ -37,8 +37,8 @@ public void flatMapSingleElementValue() {
     }
 
     @Test
-    public void flatMapSingleElementValueDifferentType() {
-        Maybe.just(1).flatMapSingleElement(new Function<Integer, SingleSource<String>>() {
+    public void flatMapSingleValueDifferentType() {
+        Maybe.just(1).flatMapSingle(new Function<Integer, SingleSource<String>>() {
             @Override public SingleSource<String> apply(final Integer integer) throws Exception {
                 if (integer == 1) {
                     return Single.just("2");
@@ -52,8 +52,8 @@ public void flatMapSingleElementValueDifferentType() {
     }
 
     @Test
-    public void flatMapSingleElementValueNull() {
-        Maybe.just(1).flatMapSingleElement(new Function<Integer, SingleSource<Integer>>() {
+    public void flatMapSingleValueNull() {
+        Maybe.just(1).flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
             @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
                 return null;
             }
@@ -65,8 +65,8 @@ public void flatMapSingleElementValueNull() {
     }
 
     @Test
-    public void flatMapSingleElementValueErrorThrown() {
-        Maybe.just(1).flatMapSingleElement(new Function<Integer, SingleSource<Integer>>() {
+    public void flatMapSingleValueErrorThrown() {
+        Maybe.just(1).flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
             @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
                 throw new RuntimeException("something went terribly wrong!");
             }
@@ -78,10 +78,10 @@ public void flatMapSingleElementValueErrorThrown() {
     }
 
     @Test
-    public void flatMapSingleElementError() {
+    public void flatMapSingleError() {
         RuntimeException exception = new RuntimeException("test");
 
-        Maybe.error(exception).flatMapSingleElement(new Function<Object, SingleSource<Object>>() {
+        Maybe.error(exception).flatMapSingle(new Function<Object, SingleSource<Object>>() {
             @Override public SingleSource<Object> apply(final Object integer) throws Exception {
                 return Single.just(new Object());
             }
@@ -91,8 +91,8 @@ public void flatMapSingleElementError() {
     }
 
     @Test
-    public void flatMapSingleElementEmpty() {
-        Maybe.<Integer>empty().flatMapSingleElement(new Function<Integer, SingleSource<Integer>>() {
+    public void flatMapSingleEmpty() {
+        Maybe.<Integer>empty().flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
             @Override public SingleSource<Integer> apply(final Integer integer) throws Exception {
                 return Single.just(2);
             }
@@ -104,7 +104,7 @@ public void flatMapSingleElementEmpty() {
 
     @Test
     public void dispose() {
-        TestHelper.checkDisposed(Maybe.just(1).flatMapSingleElement(new Function<Integer, SingleSource<Integer>>() {
+        TestHelper.checkDisposed(Maybe.just(1).flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
             @Override
             public SingleSource<Integer> apply(final Integer integer) throws Exception {
                 return Single.just(2);
@@ -117,7 +117,7 @@ public void doubleOnSubscribe() {
         TestHelper.checkDoubleOnSubscribeMaybe(new Function<Maybe<Integer>, Maybe<Integer>>() {
             @Override
             public Maybe<Integer> apply(Maybe<Integer> m) throws Exception {
-                return m.flatMapSingleElement(new Function<Integer, SingleSource<Integer>>() {
+                return m.flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
                     @Override
                     public SingleSource<Integer> apply(final Integer integer) throws Exception {
                         return Single.just(2);
@@ -130,7 +130,7 @@ public SingleSource<Integer> apply(final Integer integer) throws Exception {
     @Test
     public void singleErrors() {
         Maybe.just(1)
-        .flatMapSingleElement(new Function<Integer, SingleSource<Integer>>() {
+        .flatMapSingle(new Function<Integer, SingleSource<Integer>>() {
                     @Override
                     public SingleSource<Integer> apply(final Integer integer) throws Exception {
                         return Single.error(new TestException());
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
index c4cef0d351..4904678a61 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
@@ -34,6 +34,7 @@ public void flatMapSingleValue() {
                 return Single.just(1);
             }
         })
+            .toSingle()
             .test()
             .assertResult(2);
     }
@@ -49,6 +50,7 @@ public void flatMapSingleValueDifferentType() {
                 return Single.just("1");
             }
         })
+            .toSingle()
             .test()
             .assertResult("2");
     }
@@ -60,6 +62,7 @@ public void flatMapSingleValueNull() {
                 return null;
             }
         })
+        .toSingle()
         .to(TestHelper.<Integer>testConsumer())
             .assertNoValues()
             .assertError(NullPointerException.class)
@@ -73,6 +76,7 @@ public void flatMapSingleValueErrorThrown() {
                 throw new RuntimeException("something went terribly wrong!");
             }
         })
+        .toSingle()
         .to(TestHelper.<Integer>testConsumer())
             .assertNoValues()
             .assertError(RuntimeException.class)
@@ -88,6 +92,7 @@ public void flatMapSingleError() {
                 return Single.just(new Object());
             }
         })
+            .toSingle()
             .test()
             .assertError(exception);
     }
@@ -99,6 +104,7 @@ public void flatMapSingleEmpty() {
                 return Single.just(2);
             }
         })
+            .toSingle()
             .test()
             .assertNoValues()
             .assertError(NoSuchElementException.class);
@@ -111,7 +117,7 @@ public void dispose() {
             public SingleSource<Integer> apply(final Integer integer) throws Exception {
                 return Single.just(2);
             }
-        }));
+        }).toSingle());
     }
 
     @Test
@@ -124,7 +130,7 @@ public SingleSource<Integer> apply(Maybe<Integer> m) throws Exception {
                     public SingleSource<Integer> apply(final Integer integer) throws Exception {
                         return Single.just(2);
                     }
-                });
+                }).toSingle();
             }
         });
     }
@@ -138,6 +144,7 @@ public SingleSource<Integer> apply(final Integer integer) throws Exception {
                         return Single.error(new TestException());
                     }
                 })
+        .toSingle()
         .test()
         .assertFailure(TestException.class);
     }

From 5f6aafcbaa97f330ad2007f4ad02c5e33db8914b Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 29 Jan 2020 11:57:40 +0100
Subject: [PATCH 090/665] 3.x: Fix groupBy not requesting more if a group is
 cancelled w/ items (#6895)

---
 .../operators/flowable/FlowableGroupBy.java   |  1 +
 .../flowable/FlowableGroupByTest.java         | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
index 3cb84d4d6b..9a42e927bc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
@@ -401,6 +401,7 @@ public void request(long n) {
         public void cancel() {
             if (cancelled.compareAndSet(false, true)) {
                 cancelParent();
+                drain();
             }
         }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index f20f0ae0c7..ddc34f1d98 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -2444,4 +2444,38 @@ public void accept(Integer v) throws Throwable {
         .assertNoErrors()
         .assertComplete();
     }
+
+    @Test
+    public void cancelledGroupResumesRequesting() {
+        final List<TestSubscriber<Integer>> tss = new ArrayList<>();
+        final AtomicInteger counter = new AtomicInteger();
+        final AtomicBoolean done = new AtomicBoolean();
+        Flowable.range(1, 1000)
+                .doOnNext(new Consumer<Integer>() {
+                    @Override
+                    public void accept(Integer v) throws Exception {
+                        counter.getAndIncrement();
+                    }
+                })
+                .groupBy(Functions.justFunction(1))
+                .subscribe(new Consumer<GroupedFlowable<Integer, Integer>>() {
+                    @Override
+                    public void accept(GroupedFlowable<Integer, Integer> v) throws Exception {
+                        TestSubscriber<Integer> ts = TestSubscriber.create(0L);
+                        tss.add(ts);
+                        v.subscribe(ts);
+                    }
+                }, Functions.emptyConsumer(), new Action() {
+                    @Override
+                    public void run() throws Exception {
+                        done.set(true);
+                    }
+                });
+
+        while (!done.get()) {
+            tss.remove(0).cancel();
+        }
+
+        assertEquals(1000, counter.get());
+    }
 }

From c181169bf238a841c54e8957055ca31c02fd495d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 29 Jan 2020 12:52:12 +0100
Subject: [PATCH 091/665] 3.x: Reenable XFlatMapTest.maybeSingle, add missing
 Single operators (#6893)

---
 .../java/io/reactivex/rxjava3/core/Maybe.java |   4 +-
 .../io/reactivex/rxjava3/core/Single.java     |  66 +++
 .../maybe/MaybeFlatMapNotification.java       |  12 +-
 .../operators/maybe/MaybeFlatMapSingle.java   |   4 +-
 .../mixed/MaybeFlatMapObservable.java         |   4 +-
 .../mixed/MaybeFlatMapPublisher.java          |   4 +-
 .../mixed/SingleFlatMapObservable.java        |   4 +-
 .../single/SingleFlatMapBiSelector.java       | 156 ++++++
 .../single/SingleFlatMapNotification.java     | 147 ++++++
 .../single/SingleFlatMapPublisher.java        |   4 +-
 .../reactivex/rxjava3/core/XFlatMapTest.java  | 443 +++++++++++++++++-
 .../single/SingleFlatMapBiSelectorTest.java   | 205 ++++++++
 .../single/SingleFlatMapNotificationTest.java | 113 +++++
 13 files changed, 1153 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelector.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotification.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelectorTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotificationTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index f8cbdcdbe7..20e52f2f5f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -3653,7 +3653,7 @@ public final <R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSo
     }
 
     /**
-     * Maps the {@code onSuccess}, {@code onError} or {@code onComplete} signals of this {@code Maybe} into {@link MaybeSource} and emits that
+     * Maps the {@code onSuccess}, {@code onError} or {@code onComplete} signals of the current {@code Maybe} into a {@link MaybeSource} and emits that
      * {@code MaybeSource}'s signals.
      * <p>
      * <img width="640" height="354" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.mmm.png" alt="">
@@ -3691,7 +3691,7 @@ public final <R> Maybe<R> flatMap(
      * Returns a {@code Maybe} that emits the results of a specified function to the pair of values emitted by the
      * current {@code Maybe} and a specified mapped {@link MaybeSource}.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
+     * <img width="640" height="268" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.combiner.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index cab4d3c073..667125b08b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -3196,6 +3196,72 @@ public final <R> Single<R> flatMap(@NonNull Function<? super T, ? extends Single
         return RxJavaPlugins.onAssembly(new SingleFlatMap<>(this, mapper));
     }
 
+    /**
+     * Returns a {@code Single} that emits the results of a specified function to the pair of values emitted by the
+     * current {@code Single} and a specified mapped {@link SingleSource}.
+     * <p>
+     * <img width="640" height="268" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMap.combiner.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <U>
+     *            the type of items emitted by the {@code SingleSource} returned by the {@code mapper} function
+     * @param <R>
+     *            the type of items emitted by the resulting {@code Single}
+     * @param mapper
+     *            a function that returns a {@code SingleSource} for the item emitted by the current {@code Single}
+     * @param combiner
+     *            a function that combines one item emitted by each of the source and collection {@code SingleSource} and
+     *            returns an item to be emitted by the resulting {@code SingleSource}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code mapper} or {@code combiner} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <U, R> Single<R> flatMap(@NonNull Function<? super T, ? extends SingleSource<? extends U>> mapper,
+            @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
+        Objects.requireNonNull(mapper, "mapper is null");
+        Objects.requireNonNull(combiner, "combiner is null");
+        return RxJavaPlugins.onAssembly(new SingleFlatMapBiSelector<>(this, mapper, combiner));
+    }
+
+    /**
+     * Maps the {@code onSuccess} or {@code onError} signals of the current {@code Single} into a {@link SingleSource} and emits that
+     * {@code SingleSource}'s signals.
+     * <p>
+     * <img width="640" height="449" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMap.notification.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param <R>
+     *            the result type
+     * @param onSuccessMapper
+     *            a function that returns a {@code SingleSource} to merge for the {@code onSuccess} item emitted by this {@code Single}
+     * @param onErrorMapper
+     *            a function that returns a {@code SingleSource} to merge for an {@code onError} notification from this {@code Single}
+     * @return the new {@code Single} instance
+     * @throws NullPointerException if {@code onSuccessMapper} or {@code onErrorMapper} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public final <R> Single<R> flatMap(
+            @NonNull Function<? super T, ? extends SingleSource<? extends R>> onSuccessMapper,
+            @NonNull Function<? super Throwable, ? extends SingleSource<? extends R>> onErrorMapper) {
+        Objects.requireNonNull(onSuccessMapper, "onSuccessMapper is null");
+        Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
+        return RxJavaPlugins.onAssembly(new SingleFlatMapNotification<>(this, onSuccessMapper, onErrorMapper));
+    }
+
     /**
      * Returns a {@link Maybe} that is based on applying a specified function to the item emitted by the current {@code Single},
      * where that function returns a {@link MaybeSource}.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
index e357938db2..ffe6ee5e20 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
@@ -109,7 +109,9 @@ public void onSuccess(T value) {
                 return;
             }
 
-            source.subscribe(new InnerObserver());
+            if (!isDisposed()) {
+                source.subscribe(new InnerObserver());
+            }
         }
 
         @Override
@@ -124,7 +126,9 @@ public void onError(Throwable e) {
                 return;
             }
 
-            source.subscribe(new InnerObserver());
+            if (!isDisposed()) {
+                source.subscribe(new InnerObserver());
+            }
         }
 
         @Override
@@ -139,7 +143,9 @@ public void onComplete() {
                 return;
             }
 
-            source.subscribe(new InnerObserver());
+            if (!isDisposed()) {
+                source.subscribe(new InnerObserver());
+            }
         }
 
         final class InnerObserver implements MaybeObserver<R> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
index aed71dc855..999b22f836 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
@@ -89,7 +89,9 @@ public void onSuccess(T value) {
                 return;
             }
 
-            ss.subscribe(new FlatMapSingleObserver<R>(this, downstream));
+            if (!isDisposed()) {
+                ss.subscribe(new FlatMapSingleObserver<R>(this, downstream));
+            }
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
index ae42405f74..ef1dc5f023 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
@@ -106,7 +106,9 @@ public void onSuccess(T t) {
                 return;
             }
 
-            o.subscribe(this);
+            if (!isDisposed()) {
+                o.subscribe(this);
+            }
         }
 
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
index c590755704..82a6d5da7d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
@@ -116,7 +116,9 @@ public void onSuccess(T t) {
                 return;
             }
 
-            p.subscribe(this);
+            if (get() != SubscriptionHelper.CANCELLED) {
+                p.subscribe(this);
+            }
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
index c3dd9b59c1..b2562d8dba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
@@ -106,7 +106,9 @@ public void onSuccess(T t) {
                 return;
             }
 
-            o.subscribe(this);
+            if (!isDisposed()) {
+                o.subscribe(this);
+            }
         }
 
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelector.java
new file mode 100644
index 0000000000..d1051f3357
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelector.java
@@ -0,0 +1,156 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+
+/**
+ * Maps a source item to another SingleSource then calls a BiFunction with the
+ * original item and the secondary item to generate the final result.
+ *
+ * @param <T> the main value type
+ * @param <U> the second value type
+ * @param <R> the result value type
+ * @since 3.0.0
+ */
+public final class SingleFlatMapBiSelector<T, U, R> extends Single<R> {
+
+    final SingleSource<T> source;
+
+    final Function<? super T, ? extends SingleSource<? extends U>> mapper;
+
+    final BiFunction<? super T, ? super U, ? extends R> resultSelector;
+
+    public SingleFlatMapBiSelector(SingleSource<T> source,
+            Function<? super T, ? extends SingleSource<? extends U>> mapper,
+            BiFunction<? super T, ? super U, ? extends R> resultSelector) {
+        this.source = source;
+        this.mapper = mapper;
+        this.resultSelector = resultSelector;
+    }
+
+    @Override
+    protected void subscribeActual(SingleObserver<? super R> observer) {
+        source.subscribe(new FlatMapBiMainObserver<T, U, R>(observer, mapper, resultSelector));
+    }
+
+    static final class FlatMapBiMainObserver<T, U, R>
+    implements SingleObserver<T>, Disposable {
+
+        final Function<? super T, ? extends SingleSource<? extends U>> mapper;
+
+        final InnerObserver<T, U, R> inner;
+
+        FlatMapBiMainObserver(SingleObserver<? super R> actual,
+                Function<? super T, ? extends SingleSource<? extends U>> mapper,
+                BiFunction<? super T, ? super U, ? extends R> resultSelector) {
+            this.inner = new InnerObserver<>(actual, resultSelector);
+            this.mapper = mapper;
+        }
+
+        @Override
+        public void dispose() {
+            DisposableHelper.dispose(inner);
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return DisposableHelper.isDisposed(inner.get());
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            if (DisposableHelper.setOnce(inner, d)) {
+                inner.downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(T value) {
+            SingleSource<? extends U> next;
+
+            try {
+                next = Objects.requireNonNull(mapper.apply(value), "The mapper returned a null MaybeSource");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                inner.downstream.onError(ex);
+                return;
+            }
+
+            if (DisposableHelper.replace(inner, null)) {
+                inner.value = value;
+                next.subscribe(inner);
+            }
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            inner.downstream.onError(e);
+        }
+
+        static final class InnerObserver<T, U, R>
+        extends AtomicReference<Disposable>
+        implements SingleObserver<U> {
+
+            private static final long serialVersionUID = -2897979525538174559L;
+
+            final SingleObserver<? super R> downstream;
+
+            final BiFunction<? super T, ? super U, ? extends R> resultSelector;
+
+            T value;
+
+            InnerObserver(SingleObserver<? super R> actual,
+                    BiFunction<? super T, ? super U, ? extends R> resultSelector) {
+                this.downstream = actual;
+                this.resultSelector = resultSelector;
+            }
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                DisposableHelper.setOnce(this, d);
+            }
+
+            @Override
+            public void onSuccess(U value) {
+                T t = this.value;
+                this.value = null;
+
+                R r;
+
+                try {
+                    r = Objects.requireNonNull(resultSelector.apply(t, value), "The resultSelector returned a null value");
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    downstream.onError(ex);
+                    return;
+                }
+
+                downstream.onSuccess(r);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                downstream.onError(e);
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotification.java
new file mode 100644
index 0000000000..1ba9796b7c
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotification.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+
+/**
+ * Maps a value into a SingleSource and relays its signal.
+ *
+ * @param <T> the source value type
+ * @param <R> the result value type
+ * @since 3.0.0
+ */
+public final class SingleFlatMapNotification<T, R> extends Single<R> {
+
+    final SingleSource<T> source;
+
+    final Function<? super T, ? extends SingleSource<? extends R>> onSuccessMapper;
+
+    final Function<? super Throwable, ? extends SingleSource<? extends R>> onErrorMapper;
+
+    public SingleFlatMapNotification(SingleSource<T> source,
+            Function<? super T, ? extends SingleSource<? extends R>> onSuccessMapper,
+            Function<? super Throwable, ? extends SingleSource<? extends R>> onErrorMapper) {
+        this.source = source;
+        this.onSuccessMapper = onSuccessMapper;
+        this.onErrorMapper = onErrorMapper;
+    }
+
+    @Override
+    protected void subscribeActual(SingleObserver<? super R> observer) {
+        source.subscribe(new FlatMapSingleObserver<>(observer, onSuccessMapper, onErrorMapper));
+    }
+
+    static final class FlatMapSingleObserver<T, R>
+    extends AtomicReference<Disposable>
+    implements SingleObserver<T>, Disposable {
+
+        private static final long serialVersionUID = 4375739915521278546L;
+
+        final SingleObserver<? super R> downstream;
+
+        final Function<? super T, ? extends SingleSource<? extends R>> onSuccessMapper;
+
+        final Function<? super Throwable, ? extends SingleSource<? extends R>> onErrorMapper;
+
+        Disposable upstream;
+
+        FlatMapSingleObserver(SingleObserver<? super R> actual,
+                Function<? super T, ? extends SingleSource<? extends R>> onSuccessMapper,
+                Function<? super Throwable, ? extends SingleSource<? extends R>> onErrorMapper) {
+            this.downstream = actual;
+            this.onSuccessMapper = onSuccessMapper;
+            this.onErrorMapper = onErrorMapper;
+        }
+
+        @Override
+        public void dispose() {
+            DisposableHelper.dispose(this);
+            upstream.dispose();
+        }
+
+        @Override
+        public boolean isDisposed() {
+            return DisposableHelper.isDisposed(get());
+        }
+
+        @Override
+        public void onSubscribe(Disposable d) {
+            if (DisposableHelper.validate(this.upstream, d)) {
+                this.upstream = d;
+
+                downstream.onSubscribe(this);
+            }
+        }
+
+        @Override
+        public void onSuccess(T value) {
+            SingleSource<? extends R> source;
+
+            try {
+                source = Objects.requireNonNull(onSuccessMapper.apply(value), "The onSuccessMapper returned a null SingleSource");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(ex);
+                return;
+            }
+
+            if (!isDisposed()) {
+                source.subscribe(new InnerObserver());
+            }
+        }
+
+        @Override
+        public void onError(Throwable e) {
+            SingleSource<? extends R> source;
+
+            try {
+                source = Objects.requireNonNull(onErrorMapper.apply(e), "The onErrorMapper returned a null SingleSource");
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                downstream.onError(new CompositeException(e, ex));
+                return;
+            }
+
+            if (!isDisposed()) {
+                source.subscribe(new InnerObserver());
+            }
+        }
+
+        final class InnerObserver implements SingleObserver<R> {
+
+            @Override
+            public void onSubscribe(Disposable d) {
+                DisposableHelper.setOnce(FlatMapSingleObserver.this, d);
+            }
+
+            @Override
+            public void onSuccess(R value) {
+                downstream.onSuccess(value);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                downstream.onError(e);
+            }
+        }
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
index f474830e40..c89913791d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
@@ -92,7 +92,9 @@ public void onSuccess(S value) {
                 downstream.onError(e);
                 return;
             }
-            f.subscribe(this);
+            if (parent.get() != SubscriptionHelper.CANCELLED) {
+                f.subscribe(this);
+            }
         }
 
         @Override
diff --git a/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
index 6e80b57904..06394de7ab 100644
--- a/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
@@ -22,7 +22,7 @@
 import org.reactivestreams.Publisher;
 
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -224,7 +224,7 @@ public Completable apply(Integer v) throws Exception {
     }
 
     @Test
-    public void observableFlowable() throws Exception {
+    public void observableObservable() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
             TestObserver<Integer> to = Observable.just(1)
@@ -505,7 +505,179 @@ public Completable apply(Integer v) throws Exception {
     }
 
     @Test
-    @Ignore
+    public void singlePublisher() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestSubscriber<Integer> ts = Single.just(1)
+            .subscribeOn(Schedulers.io())
+            .flatMapPublisher(new Function<Integer, Publisher<Integer>>() {
+                @Override
+                public Publisher<Integer> apply(Integer v) throws Exception {
+                    sleep();
+                    return Flowable.<Integer>error(new TestException());
+                }
+            })
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(ts);
+
+            ts.cancel();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            ts.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void singleCombiner() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Single.just(1)
+            .subscribeOn(Schedulers.io())
+            .flatMap(new Function<Integer, Single<Integer>>() {
+                @Override
+                public Single<Integer> apply(Integer v) throws Exception {
+                    sleep();
+                    return Single.<Integer>error(new TestException());
+                }
+            }, (a, b) -> a + b)
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void singleObservable() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Single.just(1)
+            .subscribeOn(Schedulers.io())
+            .flatMapObservable(new Function<Integer, Observable<Integer>>() {
+                @Override
+                public Observable<Integer> apply(Integer v) throws Exception {
+                    sleep();
+                    return Observable.<Integer>error(new TestException());
+                }
+            })
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void singleNotificationSuccess() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Single.just(1)
+            .subscribeOn(Schedulers.io())
+            .flatMap(
+                new Function<Integer, Single<Integer>>() {
+                    @Override
+                    public Single<Integer> apply(Integer v) throws Exception {
+                        sleep();
+                        return Single.<Integer>error(new TestException());
+                    }
+                },
+                new Function<Throwable, Single<Integer>>() {
+                    @Override
+                    public Single<Integer> apply(Throwable v) throws Exception {
+                        sleep();
+                        return Single.<Integer>error(new TestException());
+                    }
+                }
+            )
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void singleNotificationError() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Single.<Integer>error(new TestException())
+            .subscribeOn(Schedulers.io())
+            .flatMap(
+                new Function<Integer, Single<Integer>>() {
+                    @Override
+                    public Single<Integer> apply(Integer v) throws Exception {
+                        sleep();
+                        return Single.<Integer>error(new TestException());
+                    }
+                },
+                new Function<Throwable, Single<Integer>>() {
+                    @Override
+                    public Single<Integer> apply(Throwable v) throws Exception {
+                        sleep();
+                        return Single.<Integer>error(new TestException());
+                    }
+                }
+            )
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
     public void maybeSingle() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
@@ -537,6 +709,37 @@ public Single<Integer> apply(Integer v) throws Exception {
         }
     }
 
+    @Test
+    public void maybeSingle2() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Maybe.just(1)
+            .subscribeOn(Schedulers.io())
+            .flatMapSingle(new Function<Integer, Single<Integer>>() {
+                @Override
+                public Single<Integer> apply(Integer v) throws Exception {
+                    sleep();
+                    return Single.<Integer>error(new TestException());
+                }
+            })
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
     @Test
     public void maybeMaybe() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -568,6 +771,240 @@ public Maybe<Integer> apply(Integer v) throws Exception {
         }
     }
 
+    @Test
+    public void maybePublisher() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestSubscriber<Integer> ts = Maybe.just(1)
+            .subscribeOn(Schedulers.io())
+            .flatMapPublisher(new Function<Integer, Publisher<Integer>>() {
+                @Override
+                public Publisher<Integer> apply(Integer v) throws Exception {
+                    sleep();
+                    return Flowable.<Integer>error(new TestException());
+                }
+            })
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(ts);
+
+            ts.cancel();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            ts.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void maybeObservable() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Maybe.just(1)
+            .subscribeOn(Schedulers.io())
+            .flatMapObservable(new Function<Integer, Observable<Integer>>() {
+                @Override
+                public Observable<Integer> apply(Integer v) throws Exception {
+                    sleep();
+                    return Observable.<Integer>error(new TestException());
+                }
+            })
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void maybeNotificationSuccess() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Maybe.just(1)
+            .subscribeOn(Schedulers.io())
+            .flatMap(
+                new Function<Integer, Maybe<Integer>>() {
+                    @Override
+                    public Maybe<Integer> apply(Integer v) throws Exception {
+                        sleep();
+                        return Maybe.<Integer>error(new TestException());
+                    }
+                },
+                new Function<Throwable, Maybe<Integer>>() {
+                    @Override
+                    public Maybe<Integer> apply(Throwable v) throws Exception {
+                        sleep();
+                        return Maybe.<Integer>error(new TestException());
+                    }
+                },
+                new Supplier<Maybe<Integer>>() {
+                    @Override
+                    public Maybe<Integer> get() throws Exception {
+                        sleep();
+                        return Maybe.<Integer>error(new TestException());
+                    }
+                }
+            )
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void maybeNotificationError() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Maybe.<Integer>error(new TestException())
+            .subscribeOn(Schedulers.io())
+            .flatMap(
+                new Function<Integer, Maybe<Integer>>() {
+                    @Override
+                    public Maybe<Integer> apply(Integer v) throws Exception {
+                        sleep();
+                        return Maybe.<Integer>error(new TestException());
+                    }
+                },
+                new Function<Throwable, Maybe<Integer>>() {
+                    @Override
+                    public Maybe<Integer> apply(Throwable v) throws Exception {
+                        sleep();
+                        return Maybe.<Integer>error(new TestException());
+                    }
+                },
+                new Supplier<Maybe<Integer>>() {
+                    @Override
+                    public Maybe<Integer> get() throws Exception {
+                        sleep();
+                        return Maybe.<Integer>error(new TestException());
+                    }
+                }
+            )
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void maybeNotificationEmpty() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Maybe.<Integer>empty()
+            .subscribeOn(Schedulers.io())
+            .flatMap(
+                new Function<Integer, Maybe<Integer>>() {
+                    @Override
+                    public Maybe<Integer> apply(Integer v) throws Exception {
+                        sleep();
+                        return Maybe.<Integer>error(new TestException());
+                    }
+                },
+                new Function<Throwable, Maybe<Integer>>() {
+                    @Override
+                    public Maybe<Integer> apply(Throwable v) throws Exception {
+                        sleep();
+                        return Maybe.<Integer>error(new TestException());
+                    }
+                },
+                new Supplier<Maybe<Integer>>() {
+                    @Override
+                    public Maybe<Integer> get() throws Exception {
+                        sleep();
+                        return Maybe.<Integer>error(new TestException());
+                    }
+                }
+            )
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void maybeCombiner() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            TestObserver<Integer> to = Maybe.just(1)
+            .subscribeOn(Schedulers.io())
+            .flatMap(new Function<Integer, Maybe<Integer>>() {
+                @Override
+                public Maybe<Integer> apply(Integer v) throws Exception {
+                    sleep();
+                    return Maybe.<Integer>error(new TestException());
+                }
+            }, (a, b) -> a + b)
+            .test();
+
+            cb.await();
+
+            beforeCancelSleep(to);
+
+            to.dispose();
+
+            Thread.sleep(SLEEP_AFTER_CANCEL);
+
+            to.assertEmpty();
+
+            assertTrue(errors.toString(), errors.isEmpty());
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
     @Test
     public void maybeCompletable() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelectorTest.java
new file mode 100644
index 0000000000..84a2a650c4
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelectorTest.java
@@ -0,0 +1,205 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleFlatMapBiSelectorTest extends RxJavaTest {
+
+    BiFunction<Integer, Integer, String> stringCombine() {
+        return new BiFunction<Integer, Integer, String>() {
+            @Override
+            public String apply(Integer a, Integer b) throws Exception {
+                return a + ":" + b;
+            }
+        };
+    }
+
+    @Test
+    public void normal() {
+        Single.just(1)
+        .flatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                return Single.just(2);
+            }
+        }, stringCombine())
+        .test()
+        .assertResult("1:2");
+    }
+
+    @Test
+    public void errorWithJust() {
+        final int[] call = { 0 };
+
+        Single.<Integer>error(new TestException())
+        .flatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                call[0]++;
+                return Single.just(1);
+            }
+        }, stringCombine())
+        .test()
+        .assertFailure(TestException.class);
+
+        assertEquals(0, call[0]);
+    }
+
+    @Test
+    public void justWithError() {
+        final int[] call = { 0 };
+
+        Single.just(1)
+        .flatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                call[0]++;
+                return Single.<Integer>error(new TestException());
+            }
+        }, stringCombine())
+        .test()
+        .assertFailure(TestException.class);
+
+        assertEquals(1, call[0]);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(SingleSubject.create()
+                .flatMap(new Function<Object, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Object v) throws Exception {
+                return Single.just(1);
+            }
+        }, new BiFunction<Object, Integer, Object>() {
+            @Override
+            public Object apply(Object a, Integer b) throws Exception {
+                return b;
+            }
+        }));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingle(new Function<Single<Object>, SingleSource<Object>>() {
+            @Override
+            public SingleSource<Object> apply(Single<Object> v) throws Exception {
+                return v.flatMap(new Function<Object, SingleSource<Integer>>() {
+                    @Override
+                    public SingleSource<Integer> apply(Object v) throws Exception {
+                        return Single.just(1);
+                    }
+                }, new BiFunction<Object, Integer, Object>() {
+                    @Override
+                    public Object apply(Object a, Integer b) throws Exception {
+                        return b;
+                    }
+                });
+            }
+        });
+    }
+
+    @Test
+    public void mapperThrows() {
+        Single.just(1)
+        .flatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                throw new TestException();
+            }
+        }, stringCombine())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mapperReturnsNull() {
+        Single.just(1)
+        .flatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                return null;
+            }
+        }, stringCombine())
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void resultSelectorThrows() {
+        Single.just(1)
+        .flatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                return Single.just(2);
+            }
+        }, new BiFunction<Integer, Integer, Object>() {
+            @Override
+            public Object apply(Integer a, Integer b) throws Exception {
+                throw new TestException();
+            }
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void resultSelectorReturnsNull() {
+        Single.just(1)
+        .flatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                return Single.just(2);
+            }
+        }, new BiFunction<Integer, Integer, Object>() {
+            @Override
+            public Object apply(Integer a, Integer b) throws Exception {
+                return null;
+            }
+        })
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void mapperCancels() {
+        final TestObserver<Integer> to = new TestObserver<>();
+
+        Single.just(1)
+        .flatMap(new Function<Integer, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Integer v) throws Exception {
+                to.dispose();
+                return Single.just(2);
+            }
+        }, new BiFunction<Integer, Integer, Integer>() {
+            @Override
+            public Integer apply(Integer a, Integer b) throws Exception {
+                throw new IllegalStateException();
+            }
+        })
+        .subscribeWith(to)
+        .assertEmpty();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotificationTest.java
new file mode 100644
index 0000000000..266acc93f2
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotificationTest.java
@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.testsupport.*;
+
+public class SingleFlatMapNotificationTest extends RxJavaTest {
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Single.just(1)
+                .flatMap(Functions.justFunction(Single.just(1)),
+                        Functions.justFunction(Single.just(1))));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingle(new Function<Single<Integer>, SingleSource<Integer>>() {
+            @Override
+            public SingleSource<Integer> apply(Single<Integer> m) throws Exception {
+                return m
+                        .flatMap(Functions.justFunction(Single.just(1)),
+                                Functions.justFunction(Single.just(1)));
+            }
+        });
+    }
+
+    @Test
+    public void onSuccessNull() {
+        Single.just(1)
+        .flatMap(Functions.justFunction((Single<Integer>)null),
+                Functions.justFunction(Single.just(1)))
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void onErrorNull() {
+        TestObserverEx<Integer> to = Single.<Integer>error(new TestException())
+        .flatMap(Functions.justFunction(Single.just(1)),
+                Functions.justFunction((Single<Integer>)null))
+        .to(TestHelper.<Integer>testConsumer())
+        .assertFailure(CompositeException.class);
+
+        List<Throwable> ce = TestHelper.compositeList(to.errors().get(0));
+
+        TestHelper.assertError(ce, 0, TestException.class);
+        TestHelper.assertError(ce, 1, NullPointerException.class);
+    }
+
+    @Test
+    public void onSuccessError() {
+        Single.just(1)
+        .flatMap(Functions.justFunction(Single.<Integer>error(new TestException())),
+                Functions.justFunction((Single<Integer>)null))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void onSucccessSuccess() {
+        Single.just(1)
+        .flatMap(v -> Single.just(2), e -> Single.just(3))
+        .test()
+        .assertResult(2);
+    }
+
+    @Test
+    public void onErrorSuccess() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Single.error(new TestException())
+            .flatMap(v -> Single.just(2), e -> Single.just(3))
+            .test()
+            .assertResult(3);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+
+    @Test
+    public void onErrorError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Single.error(new TestException())
+            .flatMap(v -> Single.just(2), e -> Single.<Integer>error(new IOException()))
+            .test()
+            .assertFailure(IOException.class);
+
+            assertTrue("" + errors, errors.isEmpty());
+        });
+    }
+}

From 7e4bb8b0a076c3b5a4c0c3b2fb559f0ba836c88f Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 29 Jan 2020 18:42:51 +0100
Subject: [PATCH 092/665] 3.x: Add remaining Maybe marbles (+50) (#6897)

---
 .../java/io/reactivex/rxjava3/core/Maybe.java | 103 ++++++++++++------
 1 file changed, 69 insertions(+), 34 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 20e52f2f5f..66d5ad143d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -2602,7 +2602,7 @@ public static <T, R> Maybe<R> zipArray(@NonNull Function<? super Object[], ? ext
     /**
      * Mirrors the {@link MaybeSource} (current or provided) that first signals an event.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.ambWith.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2626,6 +2626,8 @@ public final Maybe<T> ambWith(@NonNull MaybeSource<? extends T> other) {
     /**
      * Waits in a blocking fashion until the current {@code Maybe} signals a success value (which is returned),
      * {@code null} if completed or an exception (which is propagated).
+     * <p>
+     * <img width="640" height="285" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.blockingGet.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code blockingGet} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2648,6 +2650,8 @@ public final T blockingGet() {
     /**
      * Waits in a blocking fashion until the current {@code Maybe} signals a success value (which is returned),
      * defaultValue if completed or an exception (which is propagated).
+     * <p>
+     * <img width="640" height="297" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.blockingGet.v.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code blockingGet} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2803,7 +2807,7 @@ public final void blockingSubscribe(@NonNull MaybeObserver<? super T> observer)
      * Returns a {@code Maybe} that subscribes to this {@code Maybe} lazily, caches its event
      * and replays it, to all the downstream subscribers.
      * <p>
-     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.png" alt="">
+     * <img width="640" height="244" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.cache.png" alt="">
      * <p>
      * The operator subscribes only when the first downstream subscriber subscribes and maintains
      * a single subscription towards this {@code Maybe}.
@@ -2849,6 +2853,8 @@ public final <U> Maybe<U> cast(@NonNull Class<? extends U> clazz) {
     /**
      * Transform a {@code Maybe} by applying a particular {@link MaybeTransformer} function to it.
      * <p>
+     * <img width="640" height="615" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.compose.png" alt="">
+     * <p>
      * This method operates on the {@code Maybe} itself whereas {@link #lift} operates on the {@code Maybe}'s {@link MaybeObserver}s.
      * <p>
      * If the operator you are creating is designed to act on the individual item emitted by a {@code Maybe}, use
@@ -2958,7 +2964,7 @@ public final <R> Maybe<R> concatMapSingle(@NonNull Function<? super T, ? extends
      * Returns a {@link Flowable} that emits the items emitted from the current {@code Maybe}, then the {@code other} {@link MaybeSource}, one after
      * the other, without interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="172" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatWith.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream.</dd>
@@ -3009,7 +3015,7 @@ public final Single<Boolean> contains(@NonNull Object item) {
      * Returns a {@link Single} that counts the total number of items emitted (0 or 1) by the current {@code Maybe} and emits
      * this count as a 64-bit {@link Long}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/longCount.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.count.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3029,7 +3035,7 @@ public final Single<Long> count() {
      * Returns a {@link Single} that emits the item emitted by the current {@code Maybe} or a specified default item
      * if the current {@code Maybe} is empty.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.defaultIfEmpty.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code defaultIfEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3095,7 +3101,7 @@ public final Single<T> defaultIfEmpty(@NonNull T defaultItem) {
      * specified delay.
      * An error signal will not be delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delay.t.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -3121,7 +3127,7 @@ public final Maybe<T> delay(long time, @NonNull TimeUnit unit) {
      * Returns a {@code Maybe} that signals the events emitted by the current {@code Maybe} shifted forward in time by a
      * specified delay.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delay.tb.png" alt="">
      * <dl>
      *   <dt><b>Scheduler:</b></dt>
      *   <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -3148,7 +3154,7 @@ public final Maybe<T> delay(long time, @NonNull TimeUnit unit, boolean delayErro
      * specified delay.
      * An error signal will not be delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
+     * <img width="640" height="434" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delay.ts.png" alt="">
      * <dl>
      *   <dt><b>Scheduler:</b></dt>
      *   <dd>you specify the {@link Scheduler} where the non-blocking wait and emission happens</dd>
@@ -3173,7 +3179,7 @@ public final Maybe<T> delay(long time, @NonNull TimeUnit unit, @NonNull Schedule
      * Returns a {@code Maybe} that signals the events emitted by the current {@code Maybe} shifted forward in time by a
      * specified delay running on the specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
+     * <img width="640" height="352" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delay.tsb.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>you specify which {@code Scheduler} this operator will use.</dd>
@@ -3203,7 +3209,7 @@ public final Maybe<T> delay(long time, @NonNull TimeUnit unit, @NonNull Schedule
     /**
      * Delays the emission of this {@code Maybe} until the given {@link Publisher} signals an item or completes.
      * <p>
-     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.oo.png" alt="">
+     * <img width="640" height="175" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.delay.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The {@code delayIndicator} is consumed in an unbounded manner but is cancelled after
@@ -3313,6 +3319,8 @@ public final Maybe<T> delaySubscription(long time, @NonNull TimeUnit unit, @NonN
      * Calls the specified {@link Consumer} with the success item after this item has been emitted to the downstream.
      * <p>Note that the {@code onAfterSuccess} action is shared between subscriptions and as such
      * should be thread-safe.
+     * <p>
+     * <img width="640" height="527" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.doAfterSuccess.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterSuccess} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3336,7 +3344,7 @@ public final Maybe<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSuccess
      * {@link MaybeObserver#onComplete onSuccess},
      * {@link MaybeObserver#onComplete onComplete} or {@link MaybeObserver#onError onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/finallyDo.png" alt="">
+     * <img width="640" height="249" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.doAfterTerminate.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterTerminate} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3365,7 +3373,10 @@ public final Maybe<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
     /**
      * Calls the specified action after this {@code Maybe} signals {@code onSuccess}, {@code onError} or {@code onComplete} or gets disposed by
      * the downstream.
-     * <p>In case of a race between a terminal event and a dispose call, the provided {@code onFinally} action
+     * <p>
+     * <img width="640" height="247" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.doFinally.png" alt="">
+     * <p>
+     * In case of a race between a terminal event and a dispose call, the provided {@code onFinally} action
      * is executed once per subscription.
      * <p>Note that the {@code onFinally} action is shared between subscriptions and as such
      * should be thread-safe.
@@ -3390,6 +3401,8 @@ public final Maybe<T> doFinally(@NonNull Action onFinally) {
     /**
      * Calls the shared {@link Action} if a {@link MaybeObserver} subscribed to the current {@code Maybe}
      * disposes the common {@link Disposable} it received via {@code onSubscribe}.
+     * <p>
+     * <img width="640" height="277" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.doOnDispose.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnDispose} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3524,6 +3537,8 @@ public final Maybe<T> doOnLifecycle(@NonNull Consumer<? super Disposable> onSubs
     /**
      * Calls the shared {@link Consumer} with the {@link Disposable} sent through the {@code onSubscribe} for each
      * {@link MaybeObserver} that subscribes to the current {@code Maybe}.
+     * <p>
+     * <img width="640" height="506" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.doOnSubscribe.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3550,7 +3565,7 @@ public final Maybe<T> doOnSubscribe(@NonNull Consumer<? super Disposable> onSubs
      * Returns a {@code Maybe} instance that calls the given onTerminate callback
      * just before this {@code Maybe} completes normally or with an exception.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.png" alt="">
+     * <img width="640" height="249" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.doOnTerminate.png" alt="">
      * <p>
      * This differs from {@code doAfterTerminate} in that this happens <em>before</em> the {@code onComplete} or
      * {@code onError} notification.
@@ -3782,7 +3797,7 @@ public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T,
      * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the current {@code Maybe},
      * where that function returns an {@link ObservableSource}.
      * <p>
-     * <img width="640" height="357" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMap.png" alt="">
+     * <img width="640" height="302" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapObservable.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMapObservable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3807,7 +3822,7 @@ public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ?
      * Returns a {@link Flowable} that emits items based on applying a specified function to the item emitted by the
      * current {@code Maybe}, where that function returns a {@link Publisher}.
      * <p>
-     * <img width="640" height="261" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapPublisher.png" alt="">
+     * <img width="640" height="312" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.flatMapPublisher.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the downstream backpressure.</dd>
@@ -3927,7 +3942,7 @@ public final Completable ignoreElement() {
     /**
      * Returns a {@link Single} that emits {@code true} if the current {@code Maybe} is empty, otherwise {@code false}.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.png" alt="">
+     * <img width="640" height="444" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.isEmpty.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4150,7 +4165,7 @@ public final Single<Notification<T>> materialize() {
     /**
      * Flattens this {@code Maybe} and another {@link MaybeSource} into a single {@link Flowable}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="218" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.mergeWith.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code Maybe}s so that they appear as a single {@code Flowable}, by
      * using the {@code mergeWith} method.
@@ -4231,6 +4246,8 @@ public final <U> Maybe<U> ofType(@NonNull Class<U> clazz) {
     /**
      * Calls the specified converter function during assembly time and returns its resulting value.
      * <p>
+     * <img width="640" height="731" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.to.png" alt="">
+     * <p>
      * This allows fluent conversion to any other type.
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -4252,6 +4269,8 @@ public final <R> R to(@NonNull MaybeConverter<T, ? extends R> converter) {
     /**
      * Converts this {@code Maybe} into a backpressure-aware {@link Flowable} instance composing cancellation
      * through.
+     * <p>
+     * <img width="640" height="346" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.toFlowable.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream.</dd>
@@ -4298,6 +4317,8 @@ public final Future<T> toFuture() {
     /**
      * Converts this {@code Maybe} into an {@link Observable} instance composing disposal
      * through.
+     * <p>
+     * <img width="640" height="346" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.toObservable.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toObservable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4318,11 +4339,14 @@ public final Observable<T> toObservable() {
     /**
      * Converts this {@code Maybe} into a {@link Single} instance composing disposal
      * through and turning an empty {@code Maybe} into a signal of {@link NoSuchElementException}.
+     * <p>
+     * <img width="640" height="361" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.toSingle.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code toSingle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @return the new {@code Single} instance
+     * @see #defaultIfEmpty(Object)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4504,7 +4528,7 @@ public final Maybe<T> onTerminateDetach() {
     /**
      * Returns a {@link Flowable} that repeats the sequence of items emitted by the current {@code Maybe} indefinitely.
      * <p>
-     * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.o.png" alt="">
+     * <img width="640" height="276" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.repeat.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure.</dd>
@@ -4527,7 +4551,7 @@ public final Flowable<T> repeat() {
      * Returns a {@link Flowable} that repeats the sequence of items emitted by the current {@code Maybe} at most
      * {@code count} times.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
+     * <img width="640" height="294" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.repeat.n.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator honors downstream backpressure.</dd>
@@ -4555,7 +4579,7 @@ public final Flowable<T> repeat(long times) {
      * Returns a {@link Flowable} that repeats the sequence of items emitted by the current {@code Maybe} until
      * the provided stop function returns {@code true}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
+     * <img width="640" height="329" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.repeatUntil.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator honors downstream backpressure.</dd>
@@ -4587,7 +4611,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
      * call {@code onComplete} or {@code onError} on the child observer. Otherwise, this operator will
      * resubscribe to the current {@code Maybe}.
      * <p>
-     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.png" alt="">
+     * <img width="640" height="562" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.repeatWhen.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the source {@code Publisher} to honor backpressure as well.
@@ -4614,7 +4638,7 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
      * Returns a {@code Maybe} that mirrors the current {@code Maybe}, resubscribing to it if it calls {@code onError}
      * (infinite retry count).
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
+     * <img width="640" height="393" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.retry.png" alt="">
      * <p>
      * If the current {@code Maybe} calls {@link MaybeObserver#onError}, this operator will resubscribe to the current
      * {@code Maybe} rather than propagating the {@code onError} call.
@@ -4637,7 +4661,7 @@ public final Maybe<T> retry() {
      * Returns a {@code Maybe} that mirrors the current {@code Maybe}, resubscribing to it if it calls {@code onError}
      * and the predicate returns {@code true} for that specific exception and retry count.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
+     * <img width="640" height="230" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.retry.f.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4662,7 +4686,7 @@ public final Maybe<T> retry(@NonNull BiPredicate<? super Integer, ? super Throwa
      * Returns a {@code Maybe} that mirrors the current {@code Maybe}, resubscribing to it if it calls {@code onError}
      * up to a specified number of retries.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
+     * <img width="640" height="329" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.retry.n.png" alt="">
      * <p>
      * If the current {@code Maybe} calls {@link MaybeObserver#onError}, this operator will resubscribe to the current
      * {@code Maybe} for a maximum of {@code count} resubscriptions rather than propagating the
@@ -4687,7 +4711,8 @@ public final Maybe<T> retry(long times) {
 
     /**
      * Retries at most {@code times} or until the predicate returns {@code false}, whichever happens first.
-     *
+     * <p>
+     * <img width="640" height="259" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.retry.nf.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4707,6 +4732,8 @@ public final Maybe<T> retry(long times, @NonNull Predicate<? super Throwable> pr
 
     /**
      * Retries the current {@code Maybe} if it fails and the predicate returns {@code true}.
+     * <p>
+     * <img width="640" height="240" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.retry.g.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code retry} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4751,7 +4778,7 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
      * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this operator will
      * resubscribe to the current {@code Maybe}.
      * <p>
-     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.png" alt="">
+     * <img width="640" height="405" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.retryWhen.png" alt="">
      * <p>
      * Example:
      *
@@ -5167,7 +5194,7 @@ public final Maybe<T> subscribeOn(@NonNull Scheduler scheduler) {
      * Returns a {@code Maybe} that emits the items emitted by the current {@code Maybe} or the items of an alternate
      * {@link MaybeSource} if the current {@code Maybe} is empty.
      * <p>
-     * <img width="640" height="446" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
+     * <img width="640" height="222" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.switchIfEmpty.m.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchIfEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5190,7 +5217,7 @@ public final Maybe<T> switchIfEmpty(@NonNull MaybeSource<? extends T> other) {
      * Returns a {@link Single} that emits the items emitted by the current {@code Maybe} or the item of an alternate
      * {@link SingleSource} if the current {@code Maybe} is empty.
      * <p>
-     * <img width="640" height="446" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchifempty.m.png" alt="">
+     * <img width="640" height="312" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.switchIfEmpty.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchIfEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5214,7 +5241,7 @@ public final Single<T> switchIfEmpty(@NonNull SingleSource<? extends T> other) {
      * Returns a {@code Maybe} that emits the items emitted by the current {@code Maybe} until a second {@link MaybeSource}
      * emits an item.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
+     * <img width="640" height="219" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.takeUntil.m.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeUntil} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5241,7 +5268,7 @@ public final <U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
      * Returns a {@code Maybe} that emits the item emitted by the current {@code Maybe} until a second {@link Publisher}
      * emits an item.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
+     * <img width="640" height="199" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.takeUntil.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The {@code Publisher} is consumed in an unbounded fashion and is cancelled after the first item
@@ -5499,7 +5526,7 @@ public final Maybe<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Schedule
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
      * the resulting {@code Maybe} terminates and notifies {@link MaybeObserver}s of a {@link TimeoutException}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1.png" alt="">
+     * <img width="640" height="261" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeout.t.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -5525,7 +5552,7 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit) {
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
      * the current {@code Maybe} is disposed and resulting {@code Maybe} begins instead to mirror a fallback {@link MaybeSource}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
+     * <img width="640" height="226" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeout.tm.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -5555,7 +5582,7 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull May
      * starting from its predecessor, the current {@code Maybe} is disposed and resulting {@code Maybe} begins instead
      * to mirror a fallback {@link MaybeSource}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
+     * <img width="640" height="227" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeout.tsm.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -5587,7 +5614,7 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Sch
      * specified timeout duration starting from its predecessor, the resulting {@code Maybe} terminates and
      * notifies {@link MaybeObserver}s of a {@link TimeoutException}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1s.png" alt="">
+     * <img width="640" height="261" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeout.ts.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -5613,6 +5640,8 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Sch
     /**
      * If the current {@code Maybe} didn't signal an event before the {@code timeoutIndicator} {@link MaybeSource} signals, a
      * {@link TimeoutException} is signaled instead.
+     * <p>
+     * <img width="640" height="235" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeout.m.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeout} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5635,6 +5664,8 @@ public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator) {
      * If the current {@code Maybe} didn't signal an event before the {@code timeoutIndicator} {@link MaybeSource} signals,
      * the current {@code Maybe} is disposed and the {@code fallback} {@code MaybeSource} subscribed to
      * as a continuation.
+     * <p>
+     * <img width="640" height="194" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeout.mm.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeout} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5658,6 +5689,8 @@ public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator, @Non
     /**
      * If the current {@code Maybe} source didn't signal an event before the {@code timeoutIndicator} {@link Publisher} signals, a
      * {@link TimeoutException} is signaled instead.
+     * <p>
+     * <img width="640" height="212" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeout.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The {@code timeoutIndicator} {@code Publisher} is consumed in an unbounded manner and
@@ -5684,6 +5717,8 @@ public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator) {
      * If the current {@code Maybe} didn't signal an event before the {@code timeoutIndicator} {@link Publisher} signals,
      * the current {@code Maybe} is disposed and the {@code fallback} {@link MaybeSource} subscribed to
      * as a continuation.
+     * <p>
+     * <img width="640" height="169" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.timeout.pm.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The {@code timeoutIndicator} {@code Publisher} is consumed in an unbounded manner and

From 81f0569a8b9b7d27059f127b90fd7335118b2ee4 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 30 Jan 2020 16:14:12 +0100
Subject: [PATCH 093/665] 3.x: Add concatEagerDelayError across (#6899)

* 3.x: Add concatEagerDelayError across

* Add more since 3.0.0 tags
---
 docs/Operator-Matrix.md                       | 258 +++++++++---------
 .../reactivex/rxjava3/core/Completable.java   |   1 +
 .../io/reactivex/rxjava3/core/Flowable.java   | 171 +++++++++++-
 .../java/io/reactivex/rxjava3/core/Maybe.java | 206 +++++++++++++-
 .../io/reactivex/rxjava3/core/Observable.java | 156 +++++++++--
 .../io/reactivex/rxjava3/core/Single.java     | 252 +++++++++++++++--
 .../flowable/FlowableConcatMapEagerTest.java  |  46 +++-
 .../operators/maybe/MaybeConcatEagerTest.java | 152 +++++++++++
 .../ObservableConcatMapEagerTest.java         |  44 +++
 .../single/SingleConcatEagerTest.java         | 141 ++++++++++
 .../internal/util/MarbleDimensions.java       |   2 +-
 .../validators/ParamValidationNaming.java     |   1 +
 12 files changed, 1238 insertions(+), 192 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatEagerTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatEagerTest.java

diff --git a/docs/Operator-Matrix.md b/docs/Operator-Matrix.md
index dfa16162e7..afeb8e4182 100644
--- a/docs/Operator-Matrix.md
+++ b/docs/Operator-Matrix.md
@@ -37,69 +37,69 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='concatArrayEagerDelayError'></a>`concatArrayEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeArrayDelayError().'>([25](#notes-25))</sup>|
 <a name='concatDelayError'></a>`concatDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='concatEager'></a>`concatEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use merge().'>([26](#notes-26))</sup>|
-<a name='concatMap'></a>`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapCompletable'></a>`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapCompletableDelayError'></a>`concatMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use concatMapCompletable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use concatMapCompletable.'>([28](#notes-28))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapDelayError'></a>`concatMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMap.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMap.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapEager'></a>`concatMapEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapEagerDelayError'></a>`concatMapEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapIterable'></a>`concatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapMaybe'></a>`concatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatMap.'>([32](#notes-32))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapMaybeDelayError'></a>`concatMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([33](#notes-33))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapSingle'></a>`concatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatMap().'>([34](#notes-34))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapSingleDelayError'></a>`concatMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='concatMapStream'></a>`concatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='concatEagerDelayError'></a>`concatEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='No items to keep ordered. Use mergeDelayError().'>([27](#notes-27))</sup>|
+<a name='concatMap'></a>`concatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapCompletable'></a>`concatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapCompletableDelayError'></a>`concatMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use concatMapCompletable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use concatMapCompletable.'>([29](#notes-29))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapDelayError'></a>`concatMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMap.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMap.'>([30](#notes-30))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapEager'></a>`concatMapEager`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapEagerDelayError'></a>`concatMapEagerDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item to map. Use concatMap().'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapIterable'></a>`concatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapMaybe'></a>`concatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatMap.'>([33](#notes-33))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapMaybeDelayError'></a>`concatMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([34](#notes-34))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapMaybe.'>([34](#notes-34))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapSingle'></a>`concatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use concatMap().'>([35](#notes-35))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapSingleDelayError'></a>`concatMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use concatMapSingle.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='concatMapStream'></a>`concatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([37](#notes-37))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([37](#notes-37))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
 <a name='concatWith'></a>`concatWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='contains'></a>`contains`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='count'></a>`count`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty thus always 1.'>([37](#notes-37))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus always 0.'>([38](#notes-38))</sup>|
+<a name='count'></a>`count`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty thus always 1.'>([38](#notes-38))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus always 0.'>([39](#notes-39))</sup>|
 <a name='create'></a>`create`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='debounce'></a>`debounce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='defaultIfEmpty'></a>`defaultIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([41](#notes-41))</sup>|
+<a name='debounce'></a>`debounce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='defaultIfEmpty'></a>`defaultIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([42](#notes-42))</sup>|
 <a name='defer'></a>`defer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='delay'></a>`delay`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='delaySubscription'></a>`delaySubscription`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='dematerialize'></a>`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='distinct'></a>`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='distinctUntilChanged'></a>`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([42](#notes-42))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='doAfterNext'></a>`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='doAfterSuccess'></a>`doAfterSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([44](#notes-44))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='dematerialize'></a>`dematerialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='distinct'></a>`distinct`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='distinctUntilChanged'></a>`distinctUntilChanged`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, always distinct.'>([43](#notes-43))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='doAfterNext'></a>`doAfterNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterSuccess().'>([44](#notes-44))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='doAfterSuccess'></a>`doAfterSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doAfterNext().'>([45](#notes-45))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
 <a name='doAfterTerminate'></a>`doAfterTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='doFinally'></a>`doFinally`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnCancel'></a>`doOnCancel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([45](#notes-45))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([45](#notes-45))</sup>|
-<a name='doOnComplete'></a>`doOnComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always succeeds or fails, there is no onComplete signal.'>([46](#notes-46))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnDispose'></a>`doOnDispose`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnCancel().'>([47](#notes-47))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnEach'></a>`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([48](#notes-48))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='doOnCancel'></a>`doOnCancel`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([46](#notes-46))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([46](#notes-46))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([46](#notes-46))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnDispose().'>([46](#notes-46))</sup>|
+<a name='doOnComplete'></a>`doOnComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always succeeds or fails, there is no onComplete signal.'>([47](#notes-47))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnDispose'></a>`doOnDispose`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnCancel().'>([48](#notes-48))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnEach'></a>`doOnEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([49](#notes-49))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use doOnEvent().'>([49](#notes-49))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
 <a name='doOnError'></a>`doOnError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnEvent'></a>`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([49](#notes-49))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([49](#notes-49))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
+<a name='doOnEvent'></a>`doOnEvent`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use doOnEach().'>([50](#notes-50))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='doOnLifecycle'></a>`doOnLifecycle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnNext'></a>`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([50](#notes-50))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='doOnRequest'></a>`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
+<a name='doOnNext'></a>`doOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnSuccess().'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='doOnRequest'></a>`doOnRequest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|
 <a name='doOnSubscribe'></a>`doOnSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='doOnSuccess'></a>`doOnSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([52](#notes-52))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='doOnSuccess'></a>`doOnSuccess`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Different terminology. Use doOnNext().'>([53](#notes-53))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
 <a name='doOnTerminate'></a>`doOnTerminate`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='elementAt'></a>`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use defaultIfEmpty.'>([53](#notes-53))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='elementAtOrError'></a>`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use toSingle.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='empty'></a>`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use complete().'>([56](#notes-56))</sup>|
+<a name='elementAt'></a>`elementAt`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use defaultIfEmpty.'>([54](#notes-54))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='elementAtOrError'></a>`elementAtOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item with index 0. Use toSingle.'>([56](#notes-56))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item with index 0.'>([55](#notes-55))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='empty'></a>`empty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use complete().'>([57](#notes-57))</sup>|
 <a name='error'></a>`error`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='filter'></a>`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='first'></a>`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([41](#notes-41))</sup>|
-<a name='firstElement'></a>`firstElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='firstOrError'></a>`firstOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([61](#notes-61))</sup>|
-<a name='firstOrErrorStage'></a>`firstOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([63](#notes-63))</sup>|
-<a name='firstStage'></a>`firstStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|
-<a name='flatMap'></a>`flatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapCompletable'></a>`flatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapIterable'></a>`flatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([31](#notes-31))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapMaybe'></a>`flatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([64](#notes-64))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapObservable'></a>`flatMapObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([66](#notes-66))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapPublisher'></a>`flatMapPublisher`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([66](#notes-66))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([67](#notes-67))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapSingle'></a>`flatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([64](#notes-64))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapSingleElement'></a>`flatMapSingleElement`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([68](#notes-68))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapSingle.'>([68](#notes-68))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([66](#notes-66))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flatMapStream'></a>`flatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([36](#notes-36))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenAsFlowable'></a>`flattenAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenAsObservable'></a>`flattenAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenStreamAsFlowable'></a>`flattenStreamAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='flattenStreamAsObservable'></a>`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='filter'></a>`filter`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='first'></a>`first`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([42](#notes-42))</sup>|
+<a name='firstElement'></a>`firstElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='firstOrError'></a>`firstOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([62](#notes-62))</sup>|
+<a name='firstOrErrorStage'></a>`firstOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([64](#notes-64))</sup>|
+<a name='firstStage'></a>`firstStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|
+<a name='flatMap'></a>`flatMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flatMapCompletable'></a>`flatMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flatMapIterable'></a>`flatMapIterable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenAsFlowable.'>([32](#notes-32))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flatMapMaybe'></a>`flatMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([65](#notes-65))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flatMapObservable'></a>`flatMapObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([66](#notes-66))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([67](#notes-67))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flatMapPublisher'></a>`flatMapPublisher`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap.'>([67](#notes-67))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Not supported. Use flatMap.'>([68](#notes-68))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flatMapSingle'></a>`flatMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMap().'>([65](#notes-65))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flatMapStream'></a>`flatMapStream`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([37](#notes-37))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flattenStreamAsFlowable.'>([37](#notes-37))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flattenAsFlowable'></a>`flattenAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flattenAsObservable'></a>`flattenAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapIterable().'>([69](#notes-69))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flattenStreamAsFlowable'></a>`flattenStreamAsFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='flattenStreamAsObservable'></a>`flattenStreamAsObservable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use flatMapStream().'>([70](#notes-70))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
 <a name='forEach'></a>`forEach`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|
 <a name='forEachWhile'></a>`forEachWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use subscribe().'>([71](#notes-71))</sup>|
 <a name='fromAction'></a>`fromAction`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -125,17 +125,17 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='ignoreElements'></a>`ignoreElements`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use ignoreElement().'>([82](#notes-82))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
 <a name='interval'></a>`interval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|
 <a name='intervalRange'></a>`intervalRange`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use timer().'>([83](#notes-83))</sup>|
-<a name='isEmpty'></a>`isEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='isEmpty'></a>`isEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
 <a name='join'></a>`join`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use zip()'>([84](#notes-84))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to join.'>([80](#notes-80))</sup>|
 <a name='just'></a>`just`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='last'></a>`last`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([41](#notes-41))</sup>|
-<a name='lastElement'></a>`lastElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='lastOrError'></a>`lastOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([61](#notes-61))</sup>|
-<a name='lastOrErrorStage'></a>`lastOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([63](#notes-63))</sup>|
-<a name='lastStage'></a>`lastStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|
+<a name='last'></a>`last`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([42](#notes-42))</sup>|
+<a name='lastElement'></a>`lastElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='lastOrError'></a>`lastOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([62](#notes-62))</sup>|
+<a name='lastOrErrorStage'></a>`lastOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([64](#notes-64))</sup>|
+<a name='lastStage'></a>`lastStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|
 <a name='lift'></a>`lift`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='map'></a>`map`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='mapOptional'></a>`mapOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='map'></a>`map`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='mapOptional'></a>`mapOptional`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
 <a name='materialize'></a>`materialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='merge'></a>`merge`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='mergeArray'></a>`mergeArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -145,9 +145,9 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='never'></a>`never`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='observeOn'></a>`observeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='ofType'></a>`ofType`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to filter.'>([85](#notes-85))</sup>|
-<a name='onBackpressureBuffer'></a>`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
-<a name='onBackpressureDrop'></a>`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
-<a name='onBackpressureLatest'></a>`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
+<a name='onBackpressureBuffer'></a>`onBackpressureBuffer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|
+<a name='onBackpressureDrop'></a>`onBackpressureDrop`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|
+<a name='onBackpressureLatest'></a>`onBackpressureLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|
 <a name='onErrorComplete'></a>`onErrorComplete`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='onErrorResumeNext'></a>`onErrorResumeNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='onErrorResumeWith'></a>`onErrorResumeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -158,7 +158,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='publish'></a>`publish`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([89](#notes-89))</sup>|
 <a name='range'></a>`range`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([74](#notes-74))</sup>|
 <a name='rangeLong'></a>`rangeLong`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use just().'>([90](#notes-90))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use complete().'>([74](#notes-74))</sup>|
-<a name='rebatchRequests'></a>`rebatchRequests`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([51](#notes-51))</sup>|
+<a name='rebatchRequests'></a>`rebatchRequests`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Backpressure related and not supported outside Flowable.'>([52](#notes-52))</sup>|
 <a name='reduce'></a>`reduce`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
 <a name='reduceWith'></a>`reduceWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
 <a name='repeat'></a>`repeat`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -169,19 +169,19 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='retryUntil'></a>`retryUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='retryWhen'></a>`retryWhen`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='safeSubscribe'></a>`safeSubscribe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='sample'></a>`sample`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
 <a name='scan'></a>`scan`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
 <a name='scanWith'></a>`scanWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use map().'>([91](#notes-91))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to reduce.'>([92](#notes-92))</sup>|
 <a name='sequenceEqual'></a>`sequenceEqual`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='serialize'></a>`serialize`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([93](#notes-93))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one signal type.'>([93](#notes-93))</sup>|
 <a name='share'></a>`share`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a MaybeSubject.'>([87](#notes-87))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a SingleSubject.'>([88](#notes-88))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Connectable sources not supported outside Flowable and Observable. Use a ConnectableSubject.'>([89](#notes-89))</sup>|
-<a name='single'></a>`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([57](#notes-57))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([41](#notes-41))</sup>|
-<a name='singleElement'></a>`singleElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
-<a name='singleOrError'></a>`singleOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([61](#notes-61))</sup>|
-<a name='singleOrErrorStage'></a>`singleOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([63](#notes-63))</sup>|
-<a name='singleStage'></a>`singleStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([62](#notes-62))</sup>|
-<a name='skip'></a>`skip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|
-<a name='skipLast'></a>`skipLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|
+<a name='single'></a>`single`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use defaultIfEmpty.'>([58](#notes-58))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen() to chose the follow-up sequence.'>([42](#notes-42))</sup>|
+<a name='singleElement'></a>`singleElement`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
+<a name='singleOrError'></a>`singleOrError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always one item, would be no-op.'>([61](#notes-61))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([62](#notes-62))</sup>|
+<a name='singleOrErrorStage'></a>`singleOrErrorStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use andThen().'>([64](#notes-64))</sup>|
+<a name='singleStage'></a>`singleStage`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use toCompletionStage().'>([63](#notes-63))</sup>|
+<a name='skip'></a>`skip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|
+<a name='skipLast'></a>`skipLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|
 <a name='skipUntil'></a>`skipUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([94](#notes-94))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use takeUntil().'>([94](#notes-94))</sup>|
 <a name='skipWhile'></a>`skipWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
 <a name='sorted'></a>`sorted`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item.'>([78](#notes-78))</sup>|
@@ -193,29 +193,29 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='subscribeOn'></a>`subscribeOn`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='subscribeWith'></a>`subscribeWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='switchIfEmpty'></a>`switchIfEmpty`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Never empty.'>([23](#notes-23))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty. Use defaultIfEmpty().'>([99](#notes-99))</sup>|
-<a name='switchMap'></a>`switchMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapCompletable'></a>`switchMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapCompletableDelayError'></a>`switchMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapDelayError'></a>`switchMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapMaybe'></a>`switchMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapMaybeDelayError'></a>`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapSingle'></a>`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
-<a name='switchMapSingleDelayError'></a>`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([27](#notes-27))</sup>|
+<a name='switchMap'></a>`switchMap`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='switchMapCompletable'></a>`switchMapCompletable`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='switchMapCompletableDelayError'></a>`switchMapCompletableDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='switchMapDelayError'></a>`switchMapDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='switchMapMaybe'></a>`switchMapMaybe`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='switchMapMaybeDelayError'></a>`switchMapMaybeDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='switchMapSingle'></a>`switchMapSingle`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
+<a name='switchMapSingleDelayError'></a>`switchMapSingleDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use flatMap().'>([100](#notes-100))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to map.'>([28](#notes-28))</sup>|
 <a name='switchOnNext'></a>`switchOnNext`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='switchOnNextDelayError'></a>`switchOnNextDelayError`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='take'></a>`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|
-<a name='takeLast'></a>`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([59](#notes-59))</sup>|
+<a name='take'></a>`take`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|
+<a name='takeLast'></a>`takeLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item, would be no-op.'>([60](#notes-60))</sup>|
 <a name='takeUntil'></a>`takeUntil`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='takeWhile'></a>`takeWhile`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item. Use filter().'>([95](#notes-95))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty.'>([2](#notes-2))</sup>|
 <a name='test'></a>`test`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='throttleFirst'></a>`throttleFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='throttleLast'></a>`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='throttleLatest'></a>`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='throttleWithTimeout'></a>`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([39](#notes-39))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
-<a name='timeInterval'></a>`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='throttleFirst'></a>`throttleFirst`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='throttleLast'></a>`throttleLast`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='throttleLatest'></a>`throttleLatest`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='throttleWithTimeout'></a>`throttleWithTimeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='At most one item signaled so no subsequent items to work with.'>([40](#notes-40))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
+<a name='timeInterval'></a>`timeInterval`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
 <a name='timeout'></a>`timeout`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='timer'></a>`timer`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
-<a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([40](#notes-40))</sup>|
+<a name='timestamp'></a>`timestamp`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Always empty thus no items to work with.'>([41](#notes-41))</sup>|
 <a name='to'></a>`to`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toCompletionStage'></a>`toCompletionStage`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([101](#notes-101))</sup>|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use firstStage.'>([101](#notes-101))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
 <a name='toFlowable'></a>`toFlowable`|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Would be no-op.'>([102](#notes-102))</sup>|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|
@@ -237,7 +237,7 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='zip'></a>`zip`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use merge().'>([111](#notes-111))</sup>|
 <a name='zipArray'></a>`zipArray`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeArray().'>([112](#notes-112))</sup>|
 <a name='zipWith'></a>`zipWith`|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![present](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png)|![absent](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) <sup title='Use mergeWith().'>([113](#notes-113))</sup>|
-<a name='total'></a>**237 operators** | **215** | **209** | **118** | **107** | **84** |
+<a name='total'></a>**237 operators** | **216** | **210** | **118** | **108** | **84** |
 
 #### Notes
 <a name='notes-1'></a><sup>1</sup> Use [`contains()`](#contains).<br/>
@@ -266,48 +266,48 @@ Operator | ![Flowable](https://raw.github.com/wiki/ReactiveX/RxJava/images/opmat
 <a name='notes-24'></a><sup>24</sup> No items to keep ordered. Use [`mergeArray()`](#mergeArray).<br/>
 <a name='notes-25'></a><sup>25</sup> No items to keep ordered. Use [`mergeArrayDelayError()`](#mergeArrayDelayError).<br/>
 <a name='notes-26'></a><sup>26</sup> No items to keep ordered. Use [`merge()`](#merge).<br/>
-<a name='notes-27'></a><sup>27</sup> Always empty thus no items to map.<br/>
-<a name='notes-28'></a><sup>28</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use [`concatMapCompletable`](#concatMapCompletable).<br/>
-<a name='notes-29'></a><sup>29</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMap`](#concatMap).<br/>
-<a name='notes-30'></a><sup>30</sup> At most one item to map. Use [`concatMap()`](#concatMap).<br/>
-<a name='notes-31'></a><sup>31</sup> At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).<br/>
-<a name='notes-32'></a><sup>32</sup> Use [`concatMap`](#concatMap).<br/>
-<a name='notes-33'></a><sup>33</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapMaybe`](#concatMapMaybe).<br/>
-<a name='notes-34'></a><sup>34</sup> Use [`concatMap()`](#concatMap).<br/>
-<a name='notes-35'></a><sup>35</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapSingle`](#concatMapSingle).<br/>
-<a name='notes-36'></a><sup>36</sup> At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).<br/>
-<a name='notes-37'></a><sup>37</sup> Never empty thus always 1.<br/>
-<a name='notes-38'></a><sup>38</sup> Always empty thus always 0.<br/>
-<a name='notes-39'></a><sup>39</sup> At most one item signaled so no subsequent items to work with.<br/>
-<a name='notes-40'></a><sup>40</sup> Always empty thus no items to work with.<br/>
-<a name='notes-41'></a><sup>41</sup> Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.<br/>
-<a name='notes-42'></a><sup>42</sup> At most one item, always distinct.<br/>
-<a name='notes-43'></a><sup>43</sup> Different terminology. Use [`doAfterSuccess()`](#doAfterSuccess).<br/>
-<a name='notes-44'></a><sup>44</sup> Different terminology. Use [`doAfterNext()`](#doAfterNext).<br/>
-<a name='notes-45'></a><sup>45</sup> Different terminology. Use [`doOnDispose()`](#doOnDispose).<br/>
-<a name='notes-46'></a><sup>46</sup> Always succeeds or fails, there is no `onComplete` signal.<br/>
-<a name='notes-47'></a><sup>47</sup> Different terminology. Use [`doOnCancel()`](#doOnCancel).<br/>
-<a name='notes-48'></a><sup>48</sup> At most one item. Use [`doOnEvent()`](#doOnEvent).<br/>
-<a name='notes-49'></a><sup>49</sup> Use [`doOnEach()`](#doOnEach).<br/>
-<a name='notes-50'></a><sup>50</sup> Different terminology. Use [`doOnSuccess()`](#doOnSuccess).<br/>
-<a name='notes-51'></a><sup>51</sup> Backpressure related and not supported outside `Flowable`.<br/>
-<a name='notes-52'></a><sup>52</sup> Different terminology. Use [`doOnNext()`](#doOnNext).<br/>
-<a name='notes-53'></a><sup>53</sup> At most one item with index 0. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
-<a name='notes-54'></a><sup>54</sup> Always one item with index 0.<br/>
-<a name='notes-55'></a><sup>55</sup> At most one item with index 0. Use [`toSingle`](#toSingle).<br/>
-<a name='notes-56'></a><sup>56</sup> Use [`complete()`](#complete).<br/>
-<a name='notes-57'></a><sup>57</sup> At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
-<a name='notes-58'></a><sup>58</sup> Always one item.<br/>
-<a name='notes-59'></a><sup>59</sup> At most one item, would be no-op.<br/>
-<a name='notes-60'></a><sup>60</sup> Always one item, would be no-op.<br/>
-<a name='notes-61'></a><sup>61</sup> Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).<br/>
-<a name='notes-62'></a><sup>62</sup> At most one item. Use [`toCompletionStage()`](#toCompletionStage).<br/>
-<a name='notes-63'></a><sup>63</sup> Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).<br/>
-<a name='notes-64'></a><sup>64</sup> Use [`flatMap()`](#flatMap).<br/>
-<a name='notes-65'></a><sup>65</sup> Not supported. Use [`flatMap`](#flatMap) and [`toFlowable()`](#toFlowable).<br/>
-<a name='notes-66'></a><sup>66</sup> Use [`flatMap`](#flatMap).<br/>
-<a name='notes-67'></a><sup>67</sup> Not supported. Use [`flatMap`](#flatMap) and [`toObservable()`](#toFlowable).<br/>
-<a name='notes-68'></a><sup>68</sup> Use [`flatMapSingle`](#flatMapSingle).<br/>
+<a name='notes-27'></a><sup>27</sup> No items to keep ordered. Use [`mergeDelayError()`](#mergeDelayError).<br/>
+<a name='notes-28'></a><sup>28</sup> Always empty thus no items to map.<br/>
+<a name='notes-29'></a><sup>29</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both. Use [`concatMapCompletable`](#concatMapCompletable).<br/>
+<a name='notes-30'></a><sup>30</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMap`](#concatMap).<br/>
+<a name='notes-31'></a><sup>31</sup> At most one item to map. Use [`concatMap()`](#concatMap).<br/>
+<a name='notes-32'></a><sup>32</sup> At most one item. Use [`flattenAsFlowable`](#flattenAsFlowable) or [`flattenAsObservable`](#flattenAsObservable).<br/>
+<a name='notes-33'></a><sup>33</sup> Use [`concatMap`](#concatMap).<br/>
+<a name='notes-34'></a><sup>34</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapMaybe`](#concatMapMaybe).<br/>
+<a name='notes-35'></a><sup>35</sup> Use [`concatMap()`](#concatMap).<br/>
+<a name='notes-36'></a><sup>36</sup> Either the upstream fails (thus no inner) or the mapped-in source, but never both.  Use [`concatMapSingle`](#concatMapSingle).<br/>
+<a name='notes-37'></a><sup>37</sup> At most one item. Use [`flattenStreamAsFlowable`](#flattenStreamAsFlowable) or [`flattenStreamAsObservable`](#flattenStreamAsObservable).<br/>
+<a name='notes-38'></a><sup>38</sup> Never empty thus always 1.<br/>
+<a name='notes-39'></a><sup>39</sup> Always empty thus always 0.<br/>
+<a name='notes-40'></a><sup>40</sup> At most one item signaled so no subsequent items to work with.<br/>
+<a name='notes-41'></a><sup>41</sup> Always empty thus no items to work with.<br/>
+<a name='notes-42'></a><sup>42</sup> Always empty. Use [`andThen()`](#andThen) to chose the follow-up sequence.<br/>
+<a name='notes-43'></a><sup>43</sup> At most one item, always distinct.<br/>
+<a name='notes-44'></a><sup>44</sup> Different terminology. Use [`doAfterSuccess()`](#doAfterSuccess).<br/>
+<a name='notes-45'></a><sup>45</sup> Different terminology. Use [`doAfterNext()`](#doAfterNext).<br/>
+<a name='notes-46'></a><sup>46</sup> Different terminology. Use [`doOnDispose()`](#doOnDispose).<br/>
+<a name='notes-47'></a><sup>47</sup> Always succeeds or fails, there is no `onComplete` signal.<br/>
+<a name='notes-48'></a><sup>48</sup> Different terminology. Use [`doOnCancel()`](#doOnCancel).<br/>
+<a name='notes-49'></a><sup>49</sup> At most one item. Use [`doOnEvent()`](#doOnEvent).<br/>
+<a name='notes-50'></a><sup>50</sup> Use [`doOnEach()`](#doOnEach).<br/>
+<a name='notes-51'></a><sup>51</sup> Different terminology. Use [`doOnSuccess()`](#doOnSuccess).<br/>
+<a name='notes-52'></a><sup>52</sup> Backpressure related and not supported outside `Flowable`.<br/>
+<a name='notes-53'></a><sup>53</sup> Different terminology. Use [`doOnNext()`](#doOnNext).<br/>
+<a name='notes-54'></a><sup>54</sup> At most one item with index 0. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
+<a name='notes-55'></a><sup>55</sup> Always one item with index 0.<br/>
+<a name='notes-56'></a><sup>56</sup> At most one item with index 0. Use [`toSingle`](#toSingle).<br/>
+<a name='notes-57'></a><sup>57</sup> Use [`complete()`](#complete).<br/>
+<a name='notes-58'></a><sup>58</sup> At most one item. Use [`defaultIfEmpty`](#defaultIfEmpty).<br/>
+<a name='notes-59'></a><sup>59</sup> Always one item.<br/>
+<a name='notes-60'></a><sup>60</sup> At most one item, would be no-op.<br/>
+<a name='notes-61'></a><sup>61</sup> Always one item, would be no-op.<br/>
+<a name='notes-62'></a><sup>62</sup> Always empty. Use [`andThen()`](#andThen) and [`error()`](#error).<br/>
+<a name='notes-63'></a><sup>63</sup> At most one item. Use [`toCompletionStage()`](#toCompletionStage).<br/>
+<a name='notes-64'></a><sup>64</sup> Always empty. Use [`andThen()`](#andThen), [`error()`](#error) and [`toCompletionStage()`](#toCompletionStage).<br/>
+<a name='notes-65'></a><sup>65</sup> Use [`flatMap()`](#flatMap).<br/>
+<a name='notes-66'></a><sup>66</sup> Not supported. Use [`flatMap`](#flatMap) and [`toFlowable()`](#toFlowable).<br/>
+<a name='notes-67'></a><sup>67</sup> Use [`flatMap`](#flatMap).<br/>
+<a name='notes-68'></a><sup>68</sup> Not supported. Use [`flatMap`](#flatMap) and [`toObservable()`](#toFlowable).<br/>
 <a name='notes-69'></a><sup>69</sup> Use [`flatMapIterable()`](#flatMapIterable).<br/>
 <a name='notes-70'></a><sup>70</sup> Use [`flatMapStream()`](#flatMapStream).<br/>
 <a name='notes-71'></a><sup>71</sup> Use [`subscribe()`](#subscribe).<br/>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index cfdd87067d..682a493849 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -1050,6 +1050,7 @@ public static Completable mergeDelayError(@NonNull Publisher<@NonNull ? extends
      *                       at a time to the inner {@code CompletableSource}s
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 58ffd3d6f8..ddf5b3cf7b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -1648,9 +1648,80 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
         return fromPublisher(sources).concatMapDelayError((Function)Functions.identity(), tillTheEnd, prefetch);
     }
 
+    /**
+     * Concatenates a sequence of {@link Publisher}s eagerly into a single stream of values.
+     * <p>
+     * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatEager.i.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them
+     * in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and the inner {@code Publisher}s are
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 2.0
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+        return concatEager(sources, bufferSize(), bufferSize());
+    }
+
+    /**
+     * Concatenates a sequence of {@link Publisher}s eagerly into a single stream of values and
+     * runs a limited number of inner sequences at once.
+     * <p>
+     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatEager.in.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them
+     * in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and both the outer and inner {@code Publisher}s are
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code Publisher}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code Publisher}s can be active at the same time
+     * @param prefetch the number of elements to prefetch from each inner {@code Publisher} source
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
+     * @since 2.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
+        Objects.requireNonNull(sources, "sources is null");
+        ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
+        ObjectHelper.verifyPositive(prefetch, "prefetch");
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapEager(new FlowableFromIterable(sources), Functions.identity(), maxConcurrency, prefetch, ErrorMode.BOUNDARY));
+    }
+
     /**
      * Concatenates a {@link Publisher} sequence of {@code Publisher}s eagerly into a single stream of values.
      * <p>
+     * <img width="640" height="490" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatEager.p.png" alt="">
+     * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * emitted source {@code Publisher}s as they are observed. The operator buffers the values emitted by these
      * {@code Publisher}s and then drains them in order, each one after the previous one completes.
@@ -1677,7 +1748,10 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
     }
 
     /**
-     * Concatenates a {@link Publisher} sequence of {@code Publisher}s eagerly into a single stream of values.
+     * Concatenates a {@link Publisher} sequence of {@code Publisher}s eagerly into a single stream of values and
+     * runs a limited number of inner sequences at once.
+     * <p>
+     * <img width="640" height="421" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatEager.pn.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * emitted source {@code Publisher}s as they are observed. The operator buffers the values emitted by these
@@ -1713,7 +1787,10 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
     }
 
     /**
-     * Concatenates a sequence of {@link Publisher}s eagerly into a single stream of values.
+     * Concatenates a sequence of {@link Publisher}s eagerly into a single stream of values,
+     * delaying errors until all the inner sequences terminate.
+     * <p>
+     * <img width="640" height="428" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatEagerDelayError.i.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them
@@ -1730,18 +1807,22 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
      * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
      * @return the new {@code Flowable} instance with the specified concatenation behavior
      * @throws NullPointerException if {@code sources} is {@code null}
-     * @since 2.0
+     * @since 3.0.0
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
-        return concatEager(sources, bufferSize(), bufferSize());
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+        return concatEagerDelayError(sources, bufferSize(), bufferSize());
     }
 
     /**
-     * Concatenates a sequence of {@link Publisher}s eagerly into a single stream of values.
+     * Concatenates a sequence of {@link Publisher}s eagerly into a single stream of values,
+     * delaying errors until all the inner sequences terminate and runs a limited number
+     * of inner sequences at once.
+     * <p>
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatEagerDelayError.in.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * source {@code Publisher}s. The operator buffers the values emitted by these {@code Publisher}s and then drains them
@@ -1762,18 +1843,89 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends P
      * @return the new {@code Flowable} instance with the specified concatenation behavior
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
-     * @since 2.0
+     * @since 3.0.0
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
-        return RxJavaPlugins.onAssembly(new FlowableConcatMapEager(new FlowableFromIterable(sources), Functions.identity(), maxConcurrency, prefetch, ErrorMode.IMMEDIATE));
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapEager(new FlowableFromIterable(sources), Functions.identity(), maxConcurrency, prefetch, ErrorMode.END));
+    }
+
+    /**
+     * Concatenates a {@link Publisher} sequence of {@code Publisher}s eagerly into a single stream of values,
+     * delaying errors until all the inner and the outer sequences terminate.
+     * <p>
+     * <img width="640" height="496" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatEagerDelayError.p.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code Publisher}s as they are observed. The operator buffers the values emitted by these
+     * {@code Publisher}s and then drains them in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and both the outer and inner {@code Publisher}s are
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+        return concatEagerDelayError(sources, bufferSize(), bufferSize());
+    }
+
+    /**
+     * Concatenates a {@link Publisher} sequence of {@code Publisher}s eagerly into a single stream of values,
+     * delaying errors until all the inner and outer sequences terminate and runs a limited number of inner
+     * sequences at once.
+     * <p>
+     * <img width="640" height="421" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.concatEagerDelayError.pn.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code Publisher}s as they are observed. The operator buffers the values emitted by these
+     * {@code Publisher}s and then drains them in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and both the outer and inner {@code Publisher}s are
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code Publisher}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code Publisher}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code Publisher}s can be active at the same time
+     * @param prefetch the number of elements to prefetch from each inner {@code Publisher} source
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code prefetch} is non-positive
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.FULL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
+        Objects.requireNonNull(sources, "sources is null");
+        ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
+        ObjectHelper.verifyPositive(prefetch, "prefetch");
+        return RxJavaPlugins.onAssembly(new FlowableConcatMapEagerPublisher(sources, Functions.identity(), maxConcurrency, prefetch, ErrorMode.END));
     }
 
     /**
@@ -10134,6 +10286,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      *            if {@code false}, the first one signaling an exception will terminate the whole sequence immediately
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code mapper} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
      * @since 2.0
      */
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 66d5ad143d..784343922d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -561,11 +561,11 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     /**
      * Concatenates a sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence.
      * <p>
+     * <img width="640" height="526" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEager.i.png" alt="">
+     * <p>
      * Eager concatenation means that once an observer subscribes, this operator subscribes to all of the
      * source {@code MaybeSource}s. The operator buffers the values emitted by these {@code MaybeSource}s and then drains them
      * in order, each one after the previous one completes.
-     * <p>
-     * <img width="640" height="526" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEager.i.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>Backpressure is honored towards the downstream.</dd>
@@ -583,7 +583,40 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
-        return Flowable.fromIterable(sources).concatMapEager((Function)MaybeToPublisher.instance());
+        return Flowable.fromIterable(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), false);
+    }
+
+    /**
+     * Concatenates a sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence and
+     * runs a limited number of the inner sequences at once.
+     * <p>
+     * <img width="640" height="439" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEager.in.png" alt="">
+     * <p>
+     * Eager concatenation means that once an observer subscribes, this operator subscribes to all of the
+     * source {@code MaybeSource}s. The operator buffers the values emitted by these {@code MaybeSource}s and then drains them
+     * in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code MaybeSource} that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code MaybeSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code MaybeSource}s can be active at the same time
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
+     * @since 3.0.0
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+        return Flowable.fromIterable(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), false, maxConcurrency, 1);
     }
 
     /**
@@ -616,6 +649,173 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
         return Flowable.fromPublisher(sources).concatMapEager((Function)MaybeToPublisher.instance());
     }
 
+    /**
+     * Concatenates a {@link Publisher} sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence,
+     * running at most the given number of inner {@code MaybeSource}s at once.
+     * <p>
+     * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEager.pn.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code MaybeSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code MaybeSource}s and then drains them in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code MaybeSource}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code MaybeSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code MaybeSource}s can be active at the same time
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
+     * @since 3.0.0
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+        return Flowable.fromPublisher(sources).concatMapEager((Function)MaybeToPublisher.instance(), maxConcurrency, 1);
+    }
+
+    /**
+     * Concatenates a sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence,
+     * delaying errors until all inner {@code MaybeSource}s terminate.
+     * <p>
+     * <img width="640" height="428" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEagerDelayError.i.png" alt="">
+     * <p>
+     * Eager concatenation means that once an observer subscribes, this operator subscribes to all of the
+     * source {@code MaybeSource}s. The operator buffers the values emitted by these {@code MaybeSource}s and then drains them
+     * in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code MaybeSource} that need to be eagerly concatenated
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
+        return Flowable.fromIterable(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true);
+    }
+
+    /**
+     * Concatenates a sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence,
+     * delaying errors until all inner {@code MaybeSource}s terminate and
+     * runs a limited number of inner {@code MaybeSource}s at once.
+     * <p>
+     * <img width="640" height="379" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEagerDelayError.in.png" alt="">
+     * <p>
+     * Eager concatenation means that once an observer subscribes, this operator subscribes to all of the
+     * source {@code MaybeSource}s. The operator buffers the values emitted by these {@code MaybeSource}s and then drains them
+     * in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code MaybeSource} that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code MaybeSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code MaybeSource}s can be active at the same time
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
+     * @since 3.0.0
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+        return Flowable.fromIterable(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true, maxConcurrency, 1);
+    }
+
+    /**
+     * Concatenates a {@link Publisher} sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence,
+     * delaying errors until all the inner and the outer sequence terminate.
+     * <p>
+     * <img width="640" height="495" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEagerDelayError.p.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code MaybeSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code MaybeSource}s and then drains them in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code MaybeSource}s that need to be eagerly concatenated
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+        return Flowable.fromPublisher(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true);
+    }
+
+    /**
+     * Concatenates a {@link Publisher} sequence of {@link MaybeSource}s eagerly into a {@link Flowable} sequence,
+     * delaying errors until all the inner and the outer sequence terminate and
+     * runs a limited number of the inner {@code MaybeSource}s at once.
+     * <p>
+     * <img width="640" height="421" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.concatEagerDelayError.pn.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code MaybeSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code MaybeSource}s and then drains them in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code MaybeSource}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code MaybeSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code MaybeSource}s can be active at the same time
+     * @return the new {@code Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
+     * @since 3.0.0
+     */
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+        return Flowable.fromPublisher(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true, maxConcurrency, 1);
+    }
+
     /**
      * Provides an API (via a cold {@code Maybe}) that bridges the reactive world with the callback-style world.
      * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 9eeb169871..033d12bdff 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -1460,14 +1460,70 @@ public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? ext
         return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), bufferSize, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
     }
 
+    /**
+     * Concatenates a sequence of {@link ObservableSource}s eagerly into a single stream of values.
+     * <p>
+     * <img width="640" height="422" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.concatEager.i.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them
+     * in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 2.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
+        return concatEager(sources, bufferSize(), bufferSize());
+    }
+
+    /**
+     * Concatenates a sequence of {@link ObservableSource}s eagerly into a single stream of values and
+     * runs a limited number of inner sequences at once.
+     * <p>
+     * <img width="640" height="379" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.concatEager.in.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them
+     * in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code ObservableSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code ObservableSource}s can be active at the same time
+     * @param bufferSize the number of elements expected from each inner {@code ObservableSource} to be buffered
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
+     * @since 2.0
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+        return fromIterable(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, bufferSize);
+    }
+
     /**
      * Concatenates an {@link ObservableSource} sequence of {@code ObservableSource}s eagerly into a single stream of values.
      * <p>
+     * <img width="640" height="495" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.concatEager.o.png" alt="">
+     * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * emitted source {@code ObservableSource}s as they are observed. The operator buffers the values emitted by these
      * {@code ObservableSource}s and then drains them in order, each one after the previous one completes.
-     * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatEager.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1486,13 +1542,15 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
     }
 
     /**
-     * Concatenates an {@link ObservableSource} sequence of {@code ObservableSource}s eagerly into a single stream of values.
+     * Concatenates an {@link ObservableSource} sequence of {@code ObservableSource}s eagerly into a single stream of values
+     * and runs a limited number of inner sequences at once.
+     * 
+     * <p>
+     * <img width="640" height="442" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.concatEager.on.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * emitted source {@code ObservableSource}s as they are observed. The operator buffers the values emitted by these
      * {@code ObservableSource}s and then drains them in order, each one after the previous one completes.
-     * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatEager.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1516,13 +1574,14 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
     }
 
     /**
-     * Concatenates a sequence of {@link ObservableSource}s eagerly into a single stream of values.
+     * Concatenates a sequence of {@link ObservableSource}s eagerly into a single stream of values,
+     * delaying errors until all the inner sequences terminate.
+     * <p>
+     * <img width="640" height="428" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.concatEagerDelayError.i.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them
      * in order, each one after the previous one completes.
-     * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatEager.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1531,23 +1590,25 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
      * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
      * @return the new {@code Observable} instance with the specified concatenation behavior
      * @throws NullPointerException if {@code sources} is {@code null}
-     * @since 2.0
+     * @since 3.0.0
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
-        return concatEager(sources, bufferSize(), bufferSize());
+    public static <T> Observable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
+        return concatEagerDelayError(sources, bufferSize(), bufferSize());
     }
 
     /**
-     * Concatenates a sequence of {@link ObservableSource}s eagerly into a single stream of values.
+     * Concatenates a sequence of {@link ObservableSource}s eagerly into a single stream of values,
+     * delaying errors until all the inner sequences terminate and runs a limited number of inner
+     * sequences at once.
+     * <p>
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.concatEagerDelayError.in.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * {@code ObservableSource}s. The operator buffers the values emitted by these {@code ObservableSource}s and then drains them
      * in order, each one after the previous one completes.
-     * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatEager.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1560,14 +1621,71 @@ public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends
      * @return the new {@code Observable} instance with the specified concatenation behavior
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
-     * @since 2.0
+     * @since 3.0.0
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
-        return fromIterable(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, bufferSize);
+    public static <T> Observable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+        return fromIterable(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, bufferSize);
+    }
+
+    /**
+     * Concatenates an {@link ObservableSource} sequence of {@code ObservableSource}s eagerly into a single stream of values,
+     * delaying errors until all the inner and the outer sequence terminate.
+     * <p>
+     * <img width="640" height="496" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.concatEagerDelayError.o.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code ObservableSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code ObservableSource}s and then drains them in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Observable<T> concatEagerDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
+        return concatEagerDelayError(sources, bufferSize(), bufferSize());
+    }
+
+    /**
+     * Concatenates an {@link ObservableSource} sequence of {@code ObservableSource}s eagerly into a single stream of values,
+     * delaying errors until all the inner and the outer sequence terminate and runs a limited number of inner sequences at once.
+     * <p>
+     * <img width="640" height="421" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.concatEagerDelayError.on.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code ObservableSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code ObservableSource}s and then drains them in order, each one after the previous one completes.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code ObservableSource}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code ObservableSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code ObservableSource}s can be active at the same time
+     * @param bufferSize the number of inner {@code ObservableSource} expected to be buffered
+     * @return the new {@code Observable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} or {@code bufferSize} is non-positive
+     * @since 3.0.0
+     */
+    @SuppressWarnings({ "unchecked", "rawtypes" })
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public static <T> Observable<T> concatEagerDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+        return wrap(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
     /**
@@ -2923,7 +3041,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code maxConcurrent} or {@code bufferSize} is non-positive
+     *             if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeDelayError(Iterable, int, int)
      */
@@ -2971,7 +3089,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException
-     *             if {@code maxConcurrent} or {@code bufferSize} is non-positive
+     *             if {@code maxConcurrency} or {@code bufferSize} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/merge.html">ReactiveX operators documentation: Merge</a>
      * @see #mergeArrayDelayError(int, int, ObservableSource...)
      */
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 667125b08b..09c67ef5a1 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -492,35 +492,6 @@ public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull SingleSource<?
         return Flowable.fromArray(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true);
     }
 
-    /**
-     * Concatenates a {@link Publisher} sequence of {@link SingleSource}s eagerly into a single stream of values.
-     * <p>
-     * <img width="640" height="307" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.p.png" alt="">
-     * <p>
-     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
-     * emitted source {@code SingleSource}s as they are observed. The operator buffers the values emitted by these
-     * {@code SingleSource}s and then drains them in order, each one after the previous one succeeds.
-     * <dl>
-     *  <dt><b>Backpressure:</b></dt>
-     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
-     *  expected to support backpressure. Violating this assumption, the operator will
-     *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
-     *  <dt><b>Scheduler:</b></dt>
-     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
-     * </dl>
-     * @param <T> the value type
-     * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
-     * @return the new {@link Flowable} instance with the specified concatenation behavior
-     * @throws NullPointerException if {@code sources} is {@code null}
-     */
-    @BackpressureSupport(BackpressureKind.FULL)
-    @CheckReturnValue
-    @NonNull
-    @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
-        return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.toFlowable());
-    }
-
     /**
      * Concatenates the {@link Iterable} sequence of {@link SingleSource}s into a single sequence by subscribing to each {@code SingleSource},
      * one after the other, one at a time and delays any errors till the all inner {@code SingleSource}s terminate
@@ -631,7 +602,228 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
-        return Flowable.fromIterable(sources).concatMapEager(SingleInternalHelper.toFlowable());
+        return Flowable.fromIterable(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), false);
+    }
+
+    /**
+     * Concatenates an {@link Iterable} sequence of {@link SingleSource}s eagerly into a single stream of values and
+     * runs a limited number of the inner sources at once.
+     * <p>
+     * <img width="640" height="439" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.in.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * source {@code SingleSource}s. The operator buffers the values emitted by these {@code SingleSource}s and then drains them
+     * in order, each one after the previous one succeeds.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources an {@code Iterable} sequence of {@code SingleSource} that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code SingleSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code SingleSource}s can be active at the same time
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
+        return Flowable.fromIterable(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), false, maxConcurrency, 1);
+    }
+
+    /**
+     * Concatenates a {@link Publisher} sequence of {@link SingleSource}s eagerly into a single stream of values.
+     * <p>
+     * <img width="640" height="307" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.p.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code SingleSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code SingleSource}s and then drains them in order, each one after the previous one succeeds.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+        return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.toFlowable());
+    }
+
+    /**
+     * Concatenates a {@link Publisher} sequence of {@link SingleSource}s eagerly into a single stream of values and
+     * runs a limited number of those inner {@code SingleSource}s at once.
+     * <p>
+     * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.pn.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code SingleSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code SingleSource}s and then drains them in order, each one after the previous one succeeds.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code SingleSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code SingleSource}s can be active at the same time
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
+        return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.toFlowable(), maxConcurrency, 1);
+    }
+
+    /**
+     * Concatenates an {@link Iterable} sequence of {@link SingleSource}s eagerly into a single stream of values,
+     * delaying errors until all the inner sources terminate.
+     * <p>
+     * <img width="640" height="431" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEagerDelayError.i.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * source {@code SingleSource}s. The operator buffers the values emitted by these {@code SingleSource}s and then drains them
+     * in order, each one after the previous one succeeds.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources an {@code Iterable} sequence of {@code SingleSource} that need to be eagerly concatenated
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
+        return Flowable.fromIterable(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true);
+    }
+
+    /**
+     * Concatenates an {@link Iterable} sequence of {@link SingleSource}s eagerly into a single stream of values,
+     * delaying errors until all the inner sources terminate.
+     * <p>
+     * <img width="640" height="378" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEagerDelayError.in.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * source {@code SingleSource}s. The operator buffers the values emitted by these {@code SingleSource}s and then drains them
+     * in order, each one after the previous one succeeds.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources an {@code Iterable} sequence of {@code SingleSource} that need to be eagerly concatenated
+     * @param maxConcurrency the maximum number of concurrently running inner {@code SingleSource}s; {@link Integer#MAX_VALUE}
+     *                       is interpreted as all inner {@code SingleSource}s can be active at the same time
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
+        return Flowable.fromIterable(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true, maxConcurrency, 1);
+    }
+
+    /**
+     * Concatenates a {@link Publisher} sequence of {@link SingleSource}s eagerly into a single stream of values,
+     * delaying errors until all the inner and the outer sequence terminate.
+     * <p>
+     * <img width="640" height="444" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEagerDelayError.p.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code SingleSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code SingleSource}s and then drains them in order, each one after the previous one succeeds.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+        return Flowable.fromPublisher(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true);
+    }
+
+    /**
+     * Concatenates a {@link Publisher} sequence of {@link SingleSource}s eagerly into a single stream of values,
+     * running at most the specified number of those inner {@code SingleSource}s at once and
+     * delaying errors until all the inner and the outer sequence terminate.
+     * <p>
+     * <img width="640" height="421" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEagerDelayError.pn.png" alt="">
+     * <p>
+     * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
+     * emitted source {@code SingleSource}s as they are observed. The operator buffers the values emitted by these
+     * {@code SingleSource}s and then drains them in order, each one after the previous one succeeds.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>Backpressure is honored towards the downstream and the outer {@code Publisher} is
+     *  expected to support backpressure. Violating this assumption, the operator will
+     *  signal {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException}.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param <T> the value type
+     * @param sources a sequence of {@code SingleSource}s that need to be eagerly concatenated
+     * @param maxConcurrency the number of inner {@code SingleSource}s to run at once
+     * @return the new {@link Flowable} instance with the specified concatenation behavior
+     * @throws NullPointerException if {@code sources} is {@code null}
+     * @throws IllegalArgumentException if {@code maxConcurrency} is non-positive
+     * @since 3.0.0
+     */
+    @BackpressureSupport(BackpressureKind.FULL)
+    @CheckReturnValue
+    @NonNull
+    @SchedulerSupport(SchedulerSupport.NONE)
+    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
+        return Flowable.fromPublisher(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true, maxConcurrency, 1);
     }
 
     /**
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
index 0adfd655b0..b8c2eaaff3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
@@ -744,7 +744,7 @@ public void Flowable() {
     }
 
     @Test
-    public void ObservableCapacityHint() {
+    public void publisherCapacityHint() {
         Flowable<Integer> source = Flowable.just(1);
         TestSubscriber<Integer> ts = TestSubscriber.create();
 
@@ -1351,4 +1351,48 @@ public Flowable<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void iterableDelayError() {
+        Flowable.concatEagerDelayError(Arrays.asList(
+                Flowable.range(1, 2),
+                Flowable.error(new TestException()),
+                Flowable.range(3, 3)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void iterableDelayErrorMaxConcurrency() {
+        Flowable.concatEagerDelayError(Arrays.asList(
+                Flowable.range(1, 2),
+                Flowable.error(new TestException()),
+                Flowable.range(3, 3)
+        ), 1, 1)
+        .test()
+        .assertFailure(TestException.class, 1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void publisherDelayError() {
+        Flowable.concatEagerDelayError(Flowable.fromArray(
+                Flowable.range(1, 2),
+                Flowable.error(new TestException()),
+                Flowable.range(3, 3)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void publisherDelayErrorMaxConcurrency() {
+        Flowable.concatEagerDelayError(Flowable.fromArray(
+                Flowable.range(1, 2),
+                Flowable.error(new TestException()),
+                Flowable.range(3, 3)
+        ), 1, 1)
+        .test()
+        .assertFailure(TestException.class, 1, 2, 3, 4, 5);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatEagerTest.java
new file mode 100644
index 0000000000..5a1b42bb15
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatEagerTest.java
@@ -0,0 +1,152 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.maybe;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class MaybeConcatEagerTest {
+
+    @Test
+    public void iterableNormal() {
+        Maybe.concatEager(Arrays.asList(
+                Maybe.just(1),
+                Maybe.empty(),
+                Maybe.just(2)
+        ))
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void iterableNormalMaxConcurrency() {
+        Maybe.concatEager(Arrays.asList(
+                Maybe.just(1),
+                Maybe.empty(),
+                Maybe.just(2)
+        ), 1)
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void iterableError() {
+        Maybe.concatEager(Arrays.asList(
+                Maybe.just(1),
+                Maybe.error(new TestException()),
+                Maybe.empty(),
+                Maybe.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void iterableErrorMaxConcurrency() {
+        Maybe.concatEager(Arrays.asList(
+                Maybe.just(1),
+                Maybe.error(new TestException()),
+                Maybe.empty(),
+                Maybe.just(2)
+        ), 1)
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void publisherNormal() {
+        Maybe.concatEager(Flowable.fromArray(
+                Maybe.just(1),
+                Maybe.empty(),
+                Maybe.just(2)
+        ))
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void publisherNormalMaxConcurrency() {
+        Maybe.concatEager(Flowable.fromArray(
+                Maybe.just(1),
+                Maybe.empty(),
+                Maybe.just(2)
+        ), 1)
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void publisherError() {
+        Maybe.concatEager(Flowable.fromArray(
+                Maybe.just(1),
+                Maybe.error(new TestException()),
+                Maybe.empty(),
+                Maybe.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void iterableDelayError() {
+        Maybe.concatEagerDelayError(Arrays.asList(
+                Maybe.just(1),
+                Maybe.error(new TestException()),
+                Maybe.empty(),
+                Maybe.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void iterableDelayErrorMaxConcurrency() {
+        Maybe.concatEagerDelayError(Arrays.asList(
+                Maybe.just(1),
+                Maybe.error(new TestException()),
+                Maybe.empty(),
+                Maybe.just(2)
+        ), 1)
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void publisherDelayError() {
+        Maybe.concatEagerDelayError(Flowable.fromArray(
+                Maybe.just(1),
+                Maybe.error(new TestException()),
+                Maybe.empty(),
+                Maybe.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void publisherDelayErrorMaxConcurrency() {
+        Maybe.concatEagerDelayError(Flowable.fromArray(
+                Maybe.just(1),
+                Maybe.error(new TestException()),
+                Maybe.empty(),
+                Maybe.just(2)
+        ), 1)
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
index e13124bf5d..054ab91d8f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
@@ -1034,4 +1034,48 @@ public Observable<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void iterableDelayError() {
+        Observable.concatEagerDelayError(Arrays.asList(
+                Observable.range(1, 2),
+                Observable.error(new TestException()),
+                Observable.range(3, 3)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void iterableDelayErrorMaxConcurrency() {
+        Observable.concatEagerDelayError(Arrays.asList(
+                Observable.range(1, 2),
+                Observable.error(new TestException()),
+                Observable.range(3, 3)
+        ), 1, 1)
+        .test()
+        .assertFailure(TestException.class, 1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void observerDelayError() {
+        Observable.concatEagerDelayError(Observable.fromArray(
+                Observable.range(1, 2),
+                Observable.error(new TestException()),
+                Observable.range(3, 3)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void observerDelayErrorMaxConcurrency() {
+        Observable.concatEagerDelayError(Observable.fromArray(
+                Observable.range(1, 2),
+                Observable.error(new TestException()),
+                Observable.range(3, 3)
+        ), 1, 1)
+        .test()
+        .assertFailure(TestException.class, 1, 2, 3, 4, 5);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatEagerTest.java
new file mode 100644
index 0000000000..c21c5347d4
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatEagerTest.java
@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.single;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.TestException;
+
+public class SingleConcatEagerTest {
+
+    @Test
+    public void iterableNormal() {
+        Single.concatEager(Arrays.asList(
+                Single.just(1),
+                Single.just(2)
+        ))
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void iterableNormalMaxConcurrency() {
+        Single.concatEager(Arrays.asList(
+                Single.just(1),
+                Single.just(2)
+        ), 1)
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void iterableError() {
+        Single.concatEager(Arrays.asList(
+                Single.just(1),
+                Single.error(new TestException()),
+                Single.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void iterableErrorMaxConcurrency() {
+        Single.concatEager(Arrays.asList(
+                Single.just(1),
+                Single.error(new TestException()),
+                Single.just(2)
+        ), 1)
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void publisherNormal() {
+        Single.concatEager(Flowable.fromArray(
+                Single.just(1),
+                Single.just(2)
+        ))
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void publisherNormalMaxConcurrency() {
+        Single.concatEager(Flowable.fromArray(
+                Single.just(1),
+                Single.just(2)
+        ), 1)
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void publisherError() {
+        Single.concatEager(Flowable.fromArray(
+                Single.just(1),
+                Single.error(new TestException()),
+                Single.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1);
+    }
+
+    @Test
+    public void iterableDelayError() {
+        Single.concatEagerDelayError(Arrays.asList(
+                Single.just(1),
+                Single.error(new TestException()),
+                Single.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void iterableDelayErrorMaxConcurrency() {
+        Single.concatEagerDelayError(Arrays.asList(
+                Single.just(1),
+                Single.error(new TestException()),
+                Single.just(2)
+        ), 1)
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void publisherDelayError() {
+        Single.concatEagerDelayError(Flowable.fromArray(
+                Single.just(1),
+                Single.error(new TestException()),
+                Single.just(2)
+        ))
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void publisherDelayErrorMaxConcurrency() {
+        Single.concatEagerDelayError(Flowable.fromArray(
+                Single.just(1),
+                Single.error(new TestException()),
+                Single.just(2)
+        ), 1)
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java b/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java
index 5c0886ea9d..aa388a684a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java
@@ -98,7 +98,7 @@ public static void main(String[] args) throws Throwable {
         }
     }
 
-    static final int SLEEP_PER_IMAGE_MILLIS = 100;
+    static final int SLEEP_PER_IMAGE_MILLIS = 25;
 
     static final Class<?>[] CLASSES = {
             Flowable.class, Observable.class, Maybe.class, Single.class, Completable.class, ParallelFlowable.class
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
index 2ce716e342..0445bfbe71 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -527,6 +527,7 @@ static final class ValidatorStrings {
             new ValidatorStrings("itemDelayIndicator", "* @throws NullPointerException"),
             new ValidatorStrings("future", "* @throws NullPointerException"),
 
+            new ValidatorStrings("maxConcurrency", "* @throws IllegalArgumentException"),
             new ValidatorStrings("parallelism", "* @throws IllegalArgumentException"),
             new ValidatorStrings("prefetch", "* @throws IllegalArgumentException"),
             new ValidatorStrings("bufferSize", "* @throws IllegalArgumentException"),

From 38eda0c02c2fcca33caa77399d818e846a319ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Juli=C3=A1n=20Garc=C3=ADa=20Granado?=
 <vjgarciaw@gmail.com>
Date: Sun, 9 Feb 2020 17:31:19 +0100
Subject: [PATCH 094/665] 3.x: Add 'Error handling' section to
 Observable.blockingFirst documentation (#6900) (#6903)

---
 src/main/java/io/reactivex/rxjava3/core/Observable.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 033d12bdff..c37da859fd 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -5397,6 +5397,10 @@ public final Single<Boolean> any(@NonNull Predicate<? super T> predicate) {
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingFirst} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If the source signals an error, the operator wraps a checked {@link Exception}
+     *  into {@link RuntimeException} and throws that. Otherwise, {@code RuntimeException}s and
+     *  {@link Error}s are rethrown as they are.</dd>
      * </dl>
      *
      * @return the first item emitted by the current {@code Observable}
@@ -5425,6 +5429,10 @@ public final T blockingFirst() {
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingFirst} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>If the source signals an error, the operator wraps a checked {@link Exception}
+     *  into {@link RuntimeException} and throws that. Otherwise, {@code RuntimeException}s and
+     *  {@link Error}s are rethrown as they are.</dd>
      * </dl>
      *
      * @param defaultItem

From b3ad0752de398f4536bb88a7b1c77b0b9fbecb87 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 12 Feb 2020 16:26:52 +0100
Subject: [PATCH 095/665] 3.x: Add missing coverage, fix unused/inconsistent
 ops (#6901)

* 3.x: Add missing coverage, fix unused/inconsistent ops

* More coverage improvements and cleanup

* Some more coverage

* Observable coverage and cleanup

* Improve Flowable internals and coverage

* More Flowable operator coverage and fixes

* Last set of coverage & cleanup for Flowable operators

* Fix wrong use of j.u.Observable
---
 .../reactivex/rxjava3/core/Completable.java   |   2 +-
 .../rxjava3/internal/functions/Functions.java |  16 +-
 .../internal/observers/FutureObserver.java    |  36 +-
 .../observers/InnerQueuedObserver.java        |   4 -
 .../observers/QueueDrainObserver.java         |   4 -
 .../completable/CompletableConcat.java        |   5 +-
 .../completable/CompletableMergeArray.java    |   5 +-
 ...a => CompletableMergeArrayDelayError.java} |   4 +-
 .../CompletableMergeDelayErrorIterable.java   |   2 +-
 .../completable/CompletableMergeIterable.java |   5 +-
 .../flowable/BlockingFlowableNext.java        |   7 +-
 .../operators/flowable/FlowableBuffer.java    |   6 +-
 .../flowable/FlowableCombineLatest.java       |  88 ++---
 .../operators/flowable/FlowableConcatMap.java |  34 +-
 .../flowable/FlowableConcatMapEager.java      |   2 +-
 .../flowable/FlowableConcatMapScheduler.java  |  12 +-
 .../operators/flowable/FlowableFlatMap.java   |  98 ++----
 .../flowable/FlowableFlatMapCompletable.java  |   4 +-
 ...FlowableFlatMapCompletableCompletable.java |   4 +-
 .../flowable/FlowableFlatMapMaybe.java        |  25 +-
 .../flowable/FlowableFlatMapSingle.java       |  17 +-
 .../flowable/FlowableFromIterable.java        |  29 +-
 .../operators/flowable/FlowableGroupJoin.java |   2 +-
 .../operators/flowable/FlowableJoin.java      |   2 +-
 .../operators/flowable/FlowableObserveOn.java |  41 +--
 .../operators/flowable/FlowablePublish.java   |   8 -
 .../operators/flowable/FlowableReplay.java    | 121 ++-----
 .../operators/flowable/FlowableSwitchMap.java |  51 ++-
 .../operators/flowable/FlowableTakeLast.java  |   8 +-
 .../operators/flowable/FlowableWindow.java    |  16 +-
 .../operators/flowable/FlowableZip.java       |  58 +--
 .../operators/observable/ObservableAmb.java   |   3 +-
 .../observable/ObservableBufferTimed.java     |   6 +-
 .../observable/ObservableCombineLatest.java   |  24 +-
 .../observable/ObservableCreate.java          |   6 +-
 .../observable/ObservableFlatMap.java         |  61 +---
 .../ObservableFlatMapCompletable.java         |   4 +-
 ...servableFlatMapCompletableCompletable.java |   4 +-
 .../observable/ObservableFlatMapMaybe.java    |  17 +-
 .../observable/ObservableFlatMapSingle.java   |  17 +-
 .../observable/ObservableGroupJoin.java       |   2 +-
 .../observable/ObservableIntervalRange.java   |   4 +-
 .../observable/ObservableReplay.java          |  29 +-
 .../observable/ObservableSwitchMap.java       |  28 +-
 .../observable/ObservableTakeLast.java        |   4 +-
 .../ObservableThrottleFirstTimed.java         |  21 +-
 .../observable/ObservableToList.java          |   7 -
 .../parallel/ParallelFromPublisher.java       |   4 -
 .../operators/parallel/ParallelJoin.java      |  37 +-
 .../operators/parallel/ParallelRunOn.java     |  17 +-
 .../parallel/ParallelSortedJoin.java          |  59 ++--
 .../single/SingleDelayWithObservable.java     |   2 +-
 .../operators/single/SingleEquals.java        |  19 +-
 .../single/SingleFlatMapIterableFlowable.java |   4 +-
 .../single/SingleInternalHelper.java          |  10 +-
 .../schedulers/ComputationScheduler.java      |  12 +-
 .../schedulers/ExecutorScheduler.java         |   4 +-
 .../internal/schedulers/IoScheduler.java      |  21 +-
 .../internal/schedulers/SchedulerWhen.java    |  16 +-
 .../internal/schedulers/SingleScheduler.java  |   7 +-
 .../subscribers/FutureSubscriber.java         |  29 +-
 .../subscribers/InnerQueuedSubscriber.java    |  12 -
 .../rxjava3/internal/util/HalfSerializer.java |   9 +-
 .../rxjava3/processors/BehaviorProcessor.java |  11 +-
 .../processors/MulticastProcessor.java        |  47 +--
 .../rxjava3/processors/ReplayProcessor.java   |   4 -
 .../rxjava3/subjects/BehaviorSubject.java     |  26 +-
 .../rxjava3/subjects/ReplaySubject.java       |  31 +-
 .../rxjava3/subscribers/TestSubscriber.java   |   7 +-
 .../rxjava3/core/NotificationTest.java        |  11 +
 .../internal/functions/FunctionsTest.java     |   6 +-
 .../CancellableQueueFuseableTest.java         |  10 +
 .../DeferredScalarDisposableTest.java         |  35 ++
 .../observers/FutureMultiObserverTest.java    |  46 +++
 .../observers/FutureObserverTest.java         |  46 ++-
 .../observers/InnerQueuedObserverTest.java    |  27 ++
 ...=> CompletableAndThenCompletableTest.java} |   7 +-
 .../completable/CompletableConcatTest.java    |   5 +
 .../completable/CompletableDisposeOnTest.java |   7 +-
 .../CompletableFromActionTest.java            |  29 ++
 .../CompletableFromRunnableTest.java          |  29 ++
 .../CompletableMergeIterableTest.java         |   8 +
 .../completable/CompletableMergeTest.java     |  32 ++
 .../operators/flowable/FlowableAmbTest.java   |  31 ++
 .../flowable/FlowableBufferTest.java          | 110 +++++-
 .../operators/flowable/FlowableCacheTest.java |  14 +
 .../flowable/FlowableCombineLatestTest.java   | 233 +++++++++++-
 .../flowable/FlowableConcatMapEagerTest.java  |  36 ++
 .../FlowableConcatMapSchedulerTest.java       | 142 +++++++-
 .../flowable/FlowableConcatMapTest.java       |  20 ++
 .../flowable/FlowableConcatTest.java          |  27 +-
 .../flowable/FlowableCreateTest.java          |  66 +++-
 .../FlowableDelaySubscriptionOtherTest.java   |  15 +
 .../flowable/FlowableDematerializeTest.java   |  18 +-
 .../flowable/FlowableDoFinallyTest.java       |  37 +-
 .../FlowableFlatMapCompletableTest.java       |  78 +++-
 .../flowable/FlowableFlatMapMaybeTest.java    |  56 ++-
 .../flowable/FlowableFlatMapSingleTest.java   |  38 +-
 .../flowable/FlowableFlatMapTest.java         | 332 +++++++++++++++++-
 .../flowable/FlowableForEachTest.java         |   8 +
 .../flowable/FlowableFromCompletableTest.java |   9 +-
 .../flowable/FlowableFromIterableTest.java    | 258 +++++++++++++-
 .../flowable/FlowableGenerateTest.java        |  13 +
 .../flowable/FlowableGroupByTest.java         | 244 ++++++++-----
 .../flowable/FlowableGroupJoinTest.java       |  53 ++-
 .../flowable/FlowableIntervalRangeTest.java   |   8 +
 .../operators/flowable/FlowableJoinTest.java  |  31 ++
 .../flowable/FlowableMergeWithMaybeTest.java  |  20 +-
 .../flowable/FlowableMergeWithSingleTest.java |  18 +
 .../flowable/FlowableObserveOnTest.java       | 126 +++++++
 ...wableOnBackpressureBufferStrategyTest.java |  19 +
 .../FlowableOnBackpressureBufferTest.java     |  10 +
 .../flowable/FlowablePublishTest.java         |  79 +++++
 .../flowable/FlowableRangeLongTest.java       |  40 +++
 .../operators/flowable/FlowableRangeTest.java |  24 ++
 .../flowable/FlowableReduceTest.java          |   5 +
 .../flowable/FlowableRefCountTest.java        |  20 +-
 .../FlowableReplayEagerTruncateTest.java      |   9 +-
 .../flowable/FlowableReplayTest.java          | 205 ++++++++++-
 .../flowable/FlowableSampleTest.java          |   6 +
 .../flowable/FlowableScalarXMapTest.java      |   8 +
 .../operators/flowable/FlowableScanTest.java  |  23 ++
 .../flowable/FlowableSequenceEqualTest.java   |  22 ++
 .../flowable/FlowableSingleTest.java          |   5 +
 .../flowable/FlowableSkipLastTimedTest.java   |  23 ++
 .../flowable/FlowableSubscribeOnTest.java     |   6 +
 .../flowable/FlowableSwitchTest.java          | 110 +++++-
 .../flowable/FlowableTakeLastTest.java        |  53 ++-
 .../flowable/FlowableThrottleFirstTest.java   |  10 +
 .../flowable/FlowableTimeoutTests.java        |   7 +-
 .../FlowableTimeoutWithSelectorTest.java      |  10 +
 .../operators/flowable/FlowableTimerTest.java |   5 +
 .../flowable/FlowableUnsubscribeOnTest.java   |   6 +
 .../flowable/FlowableWindowWithSizeTest.java  | 116 ++++++
 ...lowableWindowWithStartEndFlowableTest.java | 186 +++++++++-
 .../flowable/FlowableWindowWithTimeTest.java  |  22 ++
 .../operators/flowable/FlowableZipTest.java   |  26 ++
 .../operators/maybe/MaybeConcatArrayTest.java |  78 +++-
 .../maybe/MaybeConcatIterableTest.java        |   9 +
 .../maybe/MaybeDelaySubscriptionTest.java     |   5 +
 .../MaybeFlatMapIterableFlowableTest.java     |  45 ++-
 .../maybe/MaybeFromCallableTest.java          |  14 +
 .../maybe/MaybeFromSupplierTest.java          |  19 +
 .../operators/maybe/MaybeMergeArrayTest.java  |  25 +-
 .../maybe/MaybeTimeoutPublisherTest.java      |  27 ++
 .../operators/maybe/MaybeTimeoutTest.java     |  20 ++
 .../operators/maybe/MaybeZipArrayTest.java    |  55 ++-
 .../BlockingObservableToIteratorTest.java     |  11 +-
 .../observable/ObservableAllTest.java         |  10 +
 .../observable/ObservableBufferTest.java      |  29 +-
 .../observable/ObservableCacheTest.java       |  16 +-
 .../ObservableCombineLatestTest.java          |  74 +++-
 .../ObservableConcatMapEagerTest.java         |   9 +
 .../ObservableConcatMapSchedulerTest.java     |  70 +++-
 .../observable/ObservableConcatMapTest.java   | 107 +++++-
 .../observable/ObservableCreateTest.java      |  97 ++++-
 .../observable/ObservableDebounceTest.java    |   5 +
 .../ObservableDematerializeTest.java          |   9 +-
 .../observable/ObservableDoFinallyTest.java   |  12 +
 .../ObservableFlatMapCompletableTest.java     |  57 ++-
 .../ObservableFlatMapMaybeTest.java           |  64 +++-
 .../ObservableFlatMapSingleTest.java          |  69 +++-
 .../observable/ObservableFlatMapTest.java     | 127 +++++++
 .../ObservableFlattenIterableTest.java        |   5 +
 .../ObservableFromCompletableTest.java        |  14 +-
 .../ObservableFromIterableTest.java           |  24 ++
 .../observable/ObservableGenerateTest.java    |  13 +
 .../observable/ObservableGroupByTest.java     |  68 +++-
 .../observable/ObservableGroupJoinTest.java   |  38 ++
 .../ObservableIntervalRangeTest.java          |   8 +
 .../observable/ObservableJoinTest.java        |  23 ++
 .../observable/ObservableRefCountTest.java    |  20 +-
 .../observable/ObservableReplayTest.java      |  28 +-
 .../observable/ObservableSampleTest.java      |   4 +
 .../observable/ObservableScalarXMapTest.java  |  10 +
 .../ObservableSequenceEqualTest.java          |  73 ++++
 .../ObservableSkipLastTimedTest.java          | 201 ++++++++++-
 .../observable/ObservableSwitchTest.java      | 150 +++++++-
 .../ObservableTakeLastTimedTest.java          |   5 +
 .../ObservableThrottleFirstTest.java          |  29 +-
 .../ObservableUnsubscribeOnTest.java          |   6 +
 ...vableWindowWithStartEndObservableTest.java | 175 ++++++++-
 .../ObservableWindowWithTimeTest.java         |  22 ++
 .../operators/single/SingleDelayTest.java     |  16 +-
 .../operators/single/SingleEqualsTest.java    |  28 ++
 .../SingleFlatMapIterableFlowableTest.java    |  50 ++-
 .../single/SingleInternalHelperTest.java      |   4 +-
 .../operators/single/SingleTimeoutTest.java   |  38 +-
 .../operators/single/SingleZipArrayTest.java  |  20 ++
 .../schedulers/IoSchedulerInternalTest.java   |  95 +++++
 .../schedulers/SingleSchedulerTest.java       |  22 +-
 .../TrampolineSchedulerInternalTest.java      |  30 +-
 ...asicFuseableConditionalSubscriberTest.java | 180 +++++++++-
 .../BasicFuseableSubscriberTest.java          |  36 +-
 .../subscribers/BoundedSubscriberTest.java    |  33 ++
 .../subscribers/FutureSubscriberTest.java     |  16 +
 .../rxjava3/internal/util/MiscUtilTest.java   |   4 +
 .../observers/SerializedObserverTest.java     |  26 +-
 .../rxjava3/observers/TestObserverTest.java   |  30 ++
 .../rxjava3/parallel/ParallelCollectTest.java |   7 +
 .../parallel/ParallelDoOnNextTryTest.java     |  19 +
 .../rxjava3/parallel/ParallelFilterTest.java  |  41 +++
 .../parallel/ParallelFilterTryTest.java       |  41 +++
 .../parallel/ParallelFlatMapIterableTest.java |   3 +-
 .../parallel/ParallelFromPublisherTest.java   | 106 +++++-
 .../rxjava3/parallel/ParallelJoinTest.java    | 197 +++++++++++
 .../rxjava3/parallel/ParallelMapTest.java     |  27 +-
 .../rxjava3/parallel/ParallelPeekTest.java    |   9 +
 .../parallel/ParallelReduceFullTest.java      |   9 +-
 .../rxjava3/parallel/ParallelReduceTest.java  |   7 +
 .../rxjava3/parallel/ParallelRunOnTest.java   |  56 +++
 .../parallel/ParallelSortedJoinTest.java      |  29 ++
 .../processors/AsyncProcessorTest.java        |   5 +
 .../processors/BehaviorProcessorTest.java     |  30 ++
 .../processors/ReplayProcessorTest.java       |  47 +++
 .../processors/SerializedProcessorTest.java   |  24 ++
 .../schedulers/ExecutorSchedulerTest.java     |  42 ++-
 .../rxjava3/subjects/AsyncSubjectTest.java    |   7 +-
 .../rxjava3/subjects/BehaviorSubjectTest.java |  15 +
 .../subjects/SerializedSubjectTest.java       |  50 ++-
 .../rxjava3/subjects/UnicastSubjectTest.java  |  16 +
 .../subscribers/SerializedSubscriberTest.java |  24 ++
 .../subscribers/TestSubscriberTest.java       |  36 ++
 .../rxjava3/testsupport/TestHelper.java       | 260 +++++++++++++-
 .../validators/OperatorsUseInterfaces.java    |   2 +-
 225 files changed, 7358 insertions(+), 1093 deletions(-)
 rename src/main/java/io/reactivex/rxjava3/internal/operators/completable/{CompletableMergeDelayErrorArray.java => CompletableMergeArrayDelayError.java} (96%)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserverTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverTest.java
 rename src/test/java/io/reactivex/rxjava3/internal/operators/completable/{CompletableAndThenCompletableabTest.java => CompletableAndThenCompletableTest.java} (96%)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/schedulers/IoSchedulerInternalTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 682a493849..708818db92 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -981,7 +981,7 @@ private static Completable merge0(@NonNull Publisher<@NonNull ? extends Completa
     @SafeVarargs
     public static Completable mergeArrayDelayError(@NonNull CompletableSource... sources) {
         Objects.requireNonNull(sources, "sources is null");
-        return RxJavaPlugins.onAssembly(new CompletableMergeDelayErrorArray(sources));
+        return RxJavaPlugins.onAssembly(new CompletableMergeArrayDelayError(sources));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
index 1d3055eb2b..659bcbcb2e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
@@ -281,13 +281,8 @@ public static <T> Predicate<T> equalsWith(T value) {
         return new EqualsPredicate<>(value);
     }
 
-    enum HashSetCallable implements Supplier<Set<Object>>, Callable<Set<Object>> {
+    enum HashSetSupplier implements Supplier<Set<Object>> {
         INSTANCE;
-        @Override
-        public Set<Object> call() {
-            return new HashSet<>();
-        }
-
         @Override
         public Set<Object> get() {
             return new HashSet<>();
@@ -296,7 +291,7 @@ public Set<Object> get() {
 
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public static <T> Supplier<Set<T>> createHashSet() {
-        return (Supplier)HashSetCallable.INSTANCE;
+        return (Supplier)HashSetSupplier.INSTANCE;
     }
 
     static final class NotificationOnNext<T> implements Consumer<T> {
@@ -742,12 +737,7 @@ public boolean test(Object o) {
         }
     }
 
-    static final class NullProvider implements Callable<Object>, Supplier<Object> {
-        @Override
-        public Object call() {
-            return null;
-        }
-
+    static final class NullProvider implements Supplier<Object> {
         @Override
         public Object get() {
             return null;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java
index 515e23e6bf..5c25e3f59c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java
@@ -128,22 +128,15 @@ public void onNext(T t) {
     @Override
     public void onError(Throwable t) {
         if (error == null) {
-            error = t;
-
-            for (;;) {
-                Disposable a = upstream.get();
-                if (a == this || a == DisposableHelper.DISPOSED) {
-                    RxJavaPlugins.onError(t);
-                    return;
-                }
-                if (upstream.compareAndSet(a, this)) {
-                    countDown();
-                    return;
-                }
+            Disposable a = upstream.get();
+            if (a != this && a != DisposableHelper.DISPOSED
+                    && upstream.compareAndSet(a, this)) {
+                error = t;
+                countDown();
+                return;
             }
-        } else {
-            RxJavaPlugins.onError(t);
         }
+        RxJavaPlugins.onError(t);
     }
 
     @Override
@@ -152,15 +145,12 @@ public void onComplete() {
             onError(new NoSuchElementException("The source is empty"));
             return;
         }
-        for (;;) {
-            Disposable a = upstream.get();
-            if (a == this || a == DisposableHelper.DISPOSED) {
-                return;
-            }
-            if (upstream.compareAndSet(a, this)) {
-                countDown();
-                return;
-            }
+        Disposable a = upstream.get();
+        if (a == this || a == DisposableHelper.DISPOSED) {
+            return;
+        }
+        if (upstream.compareAndSet(a, this)) {
+            countDown();
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java
index db89a98f6e..f7ad3e3350 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java
@@ -114,8 +114,4 @@ public void setDone() {
     public SimpleQueue<T> queue() {
         return queue;
     }
-
-    public int fusionMode() {
-        return fusionMode;
-    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java
index 67bc900d17..6f1cad3c34 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java
@@ -57,10 +57,6 @@ public final boolean enter() {
         return wip.getAndIncrement() == 0;
     }
 
-    public final boolean fastEnter() {
-        return wip.get() == 0 && wip.compareAndSet(0, 1);
-    }
-
     protected final void fastPathEmit(U value, boolean delayError, Disposable dispose) {
         final Observer<? super V> observer = downstream;
         final SimplePlainQueue<U> q = queue;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
index c16b847c58..c3458e4cd3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
@@ -182,9 +182,8 @@ void drain() {
                     boolean empty = cs == null;
 
                     if (d && empty) {
-                        if (once.compareAndSet(false, true)) {
-                            downstream.onComplete();
-                        }
+                        // errors never set done or call drain.
+                        downstream.onComplete();
                         return;
                     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java
index ec9c675210..49037b4c65 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java
@@ -86,9 +86,8 @@ public void onError(Throwable e) {
         @Override
         public void onComplete() {
             if (decrementAndGet() == 0) {
-                if (once.compareAndSet(false, true)) {
-                    downstream.onComplete();
-                }
+                // errors don't decrement this
+                downstream.onComplete();
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArrayDelayError.java
similarity index 96%
rename from src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorArray.java
rename to src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArrayDelayError.java
index 549fd10a48..b939396c9f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArrayDelayError.java
@@ -19,11 +19,11 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 
-public final class CompletableMergeDelayErrorArray extends Completable {
+public final class CompletableMergeArrayDelayError extends Completable {
 
     final CompletableSource[] sources;
 
-    public CompletableMergeDelayErrorArray(CompletableSource[] sources) {
+    public CompletableMergeArrayDelayError(CompletableSource[] sources) {
         this.sources = sources;
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java
index 55efbd8915..f7f4c068a6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java
@@ -20,7 +20,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.operators.completable.CompletableMergeDelayErrorArray.*;
+import io.reactivex.rxjava3.internal.operators.completable.CompletableMergeArrayDelayError.*;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 
 public final class CompletableMergeDelayErrorIterable extends Completable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java
index b0e5b87bf7..728b372a30 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java
@@ -128,9 +128,8 @@ public void onError(Throwable e) {
         @Override
         public void onComplete() {
             if (wip.decrementAndGet() == 0) {
-                if (compareAndSet(false, true)) {
-                    downstream.onComplete();
-                }
+                // errors don't decrement wip
+                downstream.onComplete();
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
index 57ca264f0c..6972bcc777 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
@@ -99,11 +99,8 @@ private boolean moveToNext() {
                 if (nextNotification.isOnComplete()) {
                     return false;
                 }
-                if (nextNotification.isOnError()) {
-                    error = nextNotification.getError();
-                    throw ExceptionHelper.wrapOrThrow(error);
-                }
-                throw new IllegalStateException("Should not reach here");
+                error = nextNotification.getError();
+                throw ExceptionHelper.wrapOrThrow(error);
             } catch (InterruptedException e) {
                 subscriber.dispose();
                 error = e;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
index 04f5ae182e..3fe2fb1a96 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
@@ -133,6 +133,7 @@ public void onError(Throwable t) {
                 RxJavaPlugins.onError(t);
                 return;
             }
+            buffer = null;
             done = true;
             downstream.onError(t);
         }
@@ -145,8 +146,9 @@ public void onComplete() {
             done = true;
 
             C b = buffer;
+            buffer = null;
 
-            if (b != null && !b.isEmpty()) {
+            if (b != null) {
                 downstream.onNext(b);
             }
             downstream.onComplete();
@@ -390,7 +392,7 @@ public void onNext(T t) {
 
             C b = bs.peek();
 
-            if (b != null && b.size() + 1 == size) {
+            if (b.size() + 1 == size) {
                 bs.poll();
 
                 b.add(t);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
index 392de62d22..8a1fea8346 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
@@ -13,7 +13,6 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
-import java.util.Iterator;
 import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
@@ -73,75 +72,46 @@ public FlowableCombineLatest(@NonNull Iterable<? extends Publisher<? extends T>>
     @SuppressWarnings("unchecked")
     @Override
     public void subscribeActual(Subscriber<? super R> s) {
-        Publisher<? extends T>[] a = array;
-        int n;
-        if (a == null) {
-            n = 0;
-            a = new Publisher[8];
-
-            Iterator<? extends Publisher<? extends T>> it;
+        Publisher<? extends T>[] sources = array;
+        int count;
+        if (sources == null) {
+            count = 0;
+            sources = new Publisher[8];
 
             try {
-                it = Objects.requireNonNull(iterable.iterator(), "The iterator returned is null");
-            } catch (Throwable e) {
-                Exceptions.throwIfFatal(e);
-                EmptySubscription.error(e, s);
-                return;
-            }
-
-            for (;;) {
-
-                boolean b;
-
-                try {
-                    b = it.hasNext();
-                } catch (Throwable e) {
-                    Exceptions.throwIfFatal(e);
-                    EmptySubscription.error(e, s);
-                    return;
-                }
-
-                if (!b) {
-                    break;
-                }
-
-                Publisher<? extends T> p;
-
-                try {
-                    p = Objects.requireNonNull(it.next(), "The publisher returned by the iterator is null");
-                } catch (Throwable e) {
-                    Exceptions.throwIfFatal(e);
-                    EmptySubscription.error(e, s);
-                    return;
-                }
-
-                if (n == a.length) {
-                    Publisher<? extends T>[] c = new Publisher[n + (n >> 2)];
-                    System.arraycopy(a, 0, c, 0, n);
-                    a = c;
+                for (Publisher<? extends T> p : iterable) {
+                    if (count == sources.length) {
+                        Publisher<? extends T>[] b = new Publisher[count + (count >> 2)];
+                        System.arraycopy(sources, 0, b, 0, count);
+                        sources = b;
+                    }
+                    sources[count++] = Objects.requireNonNull(p, "The Iterator returned a null Publisher");
                 }
-                a[n++] = p;
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                EmptySubscription.error(ex, s);
+                return;
             }
 
         } else {
-            n = a.length;
+            count = sources.length;
         }
 
-        if (n == 0) {
+        if (count == 0) {
             EmptySubscription.complete(s);
             return;
         }
-        if (n == 1) {
-            a[0].subscribe(new MapSubscriber<>(s, new SingletonArrayFunc()));
+        if (count == 1) {
+            sources[0].subscribe(new MapSubscriber<>(s, new SingletonArrayFunc()));
             return;
         }
 
         CombineLatestCoordinator<T, R> coordinator =
-                new CombineLatestCoordinator<>(s, combiner, n, bufferSize, delayErrors);
+                new CombineLatestCoordinator<>(s, combiner, count, bufferSize, delayErrors);
 
         s.onSubscribe(coordinator);
 
-        coordinator.subscribe(a, n);
+        coordinator.subscribe(sources, count);
     }
 
     static final class CombineLatestCoordinator<T, R>
@@ -173,7 +143,7 @@ static final class CombineLatestCoordinator<T, R>
 
         volatile boolean done;
 
-        final AtomicReference<Throwable> error;
+        final AtomicThrowable error;
 
         CombineLatestCoordinator(Subscriber<? super R> actual,
                 Function<? super Object[], ? extends R> combiner, int n,
@@ -189,7 +159,7 @@ static final class CombineLatestCoordinator<T, R>
             this.latest = new Object[n];
             this.queue = new SpscLinkedArrayQueue<>(bufferSize);
             this.requested = new AtomicLong();
-            this.error = new  AtomicReference<>();
+            this.error = new  AtomicThrowable();
             this.delayErrors = delayErrors;
         }
 
@@ -205,6 +175,7 @@ public void request(long n) {
         public void cancel() {
             cancelled = true;
             cancelAll();
+            drain();
         }
 
         void subscribe(Publisher<? extends T>[] sources, int n) {
@@ -411,6 +382,7 @@ boolean checkTerminated(boolean d, boolean empty, Subscriber<?> a, SpscLinkedArr
             if (cancelled) {
                 cancelAll();
                 q.clear();
+                error.tryTerminateAndReport();
                 return true;
             }
 
@@ -418,13 +390,7 @@ boolean checkTerminated(boolean d, boolean empty, Subscriber<?> a, SpscLinkedArr
                 if (delayErrors) {
                     if (empty) {
                         cancelAll();
-                        Throwable e = ExceptionHelper.terminate(error);
-
-                        if (e != null && e != ExceptionHelper.TERMINATED) {
-                            a.onError(e);
-                        } else {
-                            a.onComplete();
-                        }
+                        error.tryTerminateConsumer(a);
                         return true;
                     }
                 } else {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
index 98d8ea4410..aea261f5aa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
@@ -195,35 +195,19 @@ void subscribeActual() {
 
         @Override
         public void onError(Throwable t) {
-            if (errors.tryAddThrowableOrReport(t)) {
-                inner.cancel();
-
-                if (getAndIncrement() == 0) {
-                    errors.tryTerminateConsumer(downstream);
-                }
-            }
+            inner.cancel();
+            HalfSerializer.onError(downstream, t, this, errors);
         }
 
         @Override
         public void innerNext(R value) {
-            if (get() == 0 && compareAndSet(0, 1)) {
-                downstream.onNext(value);
-                if (compareAndSet(1, 0)) {
-                    return;
-                }
-                errors.tryTerminateConsumer(downstream);
-            }
+            HalfSerializer.onNext(downstream, value, this, errors);
         }
 
         @Override
         public void innerError(Throwable e) {
-            if (errors.tryAddThrowableOrReport(e)) {
-                upstream.cancel();
-
-                if (getAndIncrement() == 0) {
-                    errors.tryTerminateConsumer(downstream);
-                }
-            }
+            upstream.cancel();
+            HalfSerializer.onError(downstream, e, this, errors);
         }
 
         @Override
@@ -318,12 +302,8 @@ void drain() {
                                 }
 
                                 if (inner.isUnbounded()) {
-                                    if (get() == 0 && compareAndSet(0, 1)) {
-                                        downstream.onNext(vr);
-                                        if (!compareAndSet(1, 0)) {
-                                            errors.tryTerminateConsumer(downstream);
-                                            return;
-                                        }
+                                    if (!HalfSerializer.onNext(downstream, vr, this, errors)) {
+                                        return;
                                     }
                                     continue;
                                 } else {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
index ea39af45a2..ead625a829 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
@@ -318,7 +318,7 @@ public void drain() {
 
                             e++;
 
-                            inner.requestOne();
+                            inner.request(1L);
                         }
 
                         if (e == r) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
index d59677efa1..3dfcd38b9d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
@@ -204,9 +204,13 @@ public void onError(Throwable t) {
             }
         }
 
+        boolean tryEnter() {
+            return get() == 0 && compareAndSet(0, 1);
+        }
+
         @Override
         public void innerNext(R value) {
-            if (get() == 0 && compareAndSet(0, 1)) {
+            if (tryEnter()) {
                 downstream.onNext(value);
                 if (compareAndSet(1, 0)) {
                     return;
@@ -325,12 +329,12 @@ public void run() {
                                 return;
                             }
 
-                            if (vr == null) {
+                            if (vr == null || cancelled) {
                                 continue;
                             }
 
                             if (inner.isUnbounded()) {
-                                if (get() == 0 && compareAndSet(0, 1)) {
+                                if (tryEnter()) {
                                     downstream.onNext(vr);
                                     if (!compareAndSet(1, 0)) {
                                         errors.tryTerminateConsumer(downstream);
@@ -515,7 +519,7 @@ public void run() {
                                 vr = null;
                             }
 
-                            if (vr == null) {
+                            if (vr == null || cancelled) {
                                 continue;
                             }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
index 0a671cf88a..184efcc203 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
@@ -150,14 +150,14 @@ public void onNext(T t) {
                 if (u != null) {
                     tryEmitScalar(u);
                 } else {
-                    if (maxConcurrency != Integer.MAX_VALUE && !cancelled
-                            && ++scalarEmitted == scalarLimit) {
+                    if (maxConcurrency != Integer.MAX_VALUE
+                            && !cancelled && ++scalarEmitted == scalarLimit) {
                         scalarEmitted = 0;
                         upstream.request(scalarLimit);
                     }
                 }
             } else {
-                InnerSubscriber<T, U> inner = new InnerSubscriber<>(this, uniqueId++);
+                InnerSubscriber<T, U> inner = new InnerSubscriber<>(this, bufferSize, uniqueId++);
                 if (addInner(inner)) {
                     p.subscribe(inner);
                 }
@@ -234,8 +234,8 @@ void tryEmitScalar(U value) {
                     if (r != Long.MAX_VALUE) {
                         requested.decrementAndGet();
                     }
-                    if (maxConcurrency != Integer.MAX_VALUE && !cancelled
-                            && ++scalarEmitted == scalarLimit) {
+                    if (maxConcurrency != Integer.MAX_VALUE
+                            && !cancelled && ++scalarEmitted == scalarLimit) {
                         scalarEmitted = 0;
                         upstream.request(scalarLimit);
                     }
@@ -244,8 +244,7 @@ void tryEmitScalar(U value) {
                         q = getMainQueue();
                     }
                     if (!q.offer(value)) {
-                        onError(new IllegalStateException("Scalar queue full?!"));
-                        return;
+                        onError(new MissingBackpressureException("Scalar queue full?!"));
                     }
                 }
                 if (decrementAndGet() == 0) {
@@ -254,7 +253,7 @@ void tryEmitScalar(U value) {
             } else {
                 SimpleQueue<U> q = getMainQueue();
                 if (!q.offer(value)) {
-                    onError(new IllegalStateException("Scalar queue full?!"));
+                    onError(new MissingBackpressureException("Scalar queue full?!"));
                     return;
                 }
                 if (getAndIncrement() != 0) {
@@ -264,15 +263,6 @@ void tryEmitScalar(U value) {
             drainLoop();
         }
 
-        SimpleQueue<U> getInnerQueue(InnerSubscriber<T, U> inner) {
-            SimpleQueue<U> q = inner.queue;
-            if (q == null) {
-                q = new SpscArrayQueue<>(bufferSize);
-                inner.queue = q;
-            }
-            return q;
-        }
-
         void tryEmit(U value, InnerSubscriber<T, U> inner) {
             if (get() == 0 && compareAndSet(0, 1)) {
                 long r = requested.get();
@@ -285,11 +275,11 @@ void tryEmit(U value, InnerSubscriber<T, U> inner) {
                     inner.requestMore(1);
                 } else {
                     if (q == null) {
-                        q = getInnerQueue(inner);
+                        q = new SpscArrayQueue<>(bufferSize);
+                        inner.queue = q;
                     }
                     if (!q.offer(value)) {
                         onError(new MissingBackpressureException("Inner queue full?!"));
-                        return;
                     }
                 }
                 if (decrementAndGet() == 0) {
@@ -384,35 +374,30 @@ void drainLoop() {
                 long replenishMain = 0;
 
                 if (svq != null) {
-                    for (;;) {
-                        long scalarEmission = 0;
-                        U o = null;
-                        while (r != 0L) {
-                            o = svq.poll();
+                    long scalarEmission = 0;
+                    U o = null;
+                    while (r != 0L) {
+                        o = svq.poll();
 
-                            if (checkTerminate()) {
-                                return;
-                            }
-                            if (o == null) {
-                                break;
-                            }
-
-                            child.onNext(o);
-
-                            replenishMain++;
-                            scalarEmission++;
-                            r--;
-                        }
-                        if (scalarEmission != 0L) {
-                            if (unbounded) {
-                                r = Long.MAX_VALUE;
-                            } else {
-                                r = requested.addAndGet(-scalarEmission);
-                            }
+                        if (checkTerminate()) {
+                            return;
                         }
-                        if (r == 0L || o == null) {
+                        if (o == null) {
                             break;
                         }
+
+                        child.onNext(o);
+
+                        replenishMain++;
+                        scalarEmission++;
+                        r--;
+                    }
+                    if (scalarEmission != 0L) {
+                        if (unbounded) {
+                            r = Long.MAX_VALUE;
+                        } else {
+                            r = requested.addAndGet(-scalarEmission);
+                        }
                     }
                 }
 
@@ -462,15 +447,15 @@ void drainLoop() {
 
                         U o = null;
                         for (;;) {
-                            if (checkTerminate()) {
-                                return;
-                            }
                             SimpleQueue<U> q = is.queue;
                             if (q == null) {
                                 break;
                             }
                             long produced = 0;
                             while (r != 0L) {
+                                if (checkTerminate()) {
+                                    return;
+                                }
 
                                 try {
                                     o = q.poll();
@@ -495,10 +480,6 @@ void drainLoop() {
 
                                 child.onNext(o);
 
-                                if (checkTerminate()) {
-                                    return;
-                                }
-
                                 r--;
                                 produced++;
                             }
@@ -571,15 +552,12 @@ void clearScalarQueue() {
         }
 
         void disposeAll() {
-            InnerSubscriber<?, ?>[] a = subscribers.get();
+            InnerSubscriber<?, ?>[] a = subscribers.getAndSet(CANCELLED);
             if (a != CANCELLED) {
-                a = subscribers.getAndSet(CANCELLED);
-                if (a != CANCELLED) {
-                    for (InnerSubscriber<?, ?> inner : a) {
-                        inner.dispose();
-                    }
-                    errors.tryTerminateAndReport();
+                for (InnerSubscriber<?, ?> inner : a) {
+                    inner.dispose();
                 }
+                errors.tryTerminateAndReport();
             }
         }
 
@@ -611,10 +589,10 @@ static final class InnerSubscriber<T, U> extends AtomicReference<Subscription>
         long produced;
         int fusionMode;
 
-        InnerSubscriber(MergeSubscriber<T, U> parent, long id) {
+        InnerSubscriber(MergeSubscriber<T, U> parent, int bufferSize, long id) {
             this.id = id;
             this.parent = parent;
-            this.bufferSize = parent.bufferSize;
+            this.bufferSize = bufferSize;
             this.limit = bufferSize >> 2;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
index 945e6a877e..2960cfc510 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
@@ -138,9 +138,7 @@ public void onError(Throwable e) {
                     cancelled = true;
                     upstream.cancel();
                     set.dispose();
-                    if (getAndSet(0) > 0) {
-                        errors.tryTerminateConsumer(downstream);
-                    }
+                    errors.tryTerminateConsumer(downstream);
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
index 00445c8018..6032dcdd33 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
@@ -146,9 +146,7 @@ public void onError(Throwable e) {
                     disposed = true;
                     upstream.cancel();
                     set.dispose();
-                    if (getAndSet(0) > 0) {
-                        errors.tryTerminateConsumer(downstream);
-                    }
+                    errors.tryTerminateConsumer(downstream);
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
index 1036e73973..ffb5763f14 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
@@ -174,7 +174,7 @@ void innerSuccess(InnerObserver inner, R value) {
 
                     SpscLinkedArrayQueue<R> q = queue.get();
 
-                    if (d && (q == null || q.isEmpty())) {
+                    if (checkTerminate(d, q)) {
                         errors.tryTerminateConsumer(downstream);
                         return;
                     }
@@ -205,16 +205,15 @@ void innerSuccess(InnerObserver inner, R value) {
         }
 
         SpscLinkedArrayQueue<R> getOrCreateQueue() {
-            for (;;) {
-                SpscLinkedArrayQueue<R> current = queue.get();
-                if (current != null) {
-                    return current;
-                }
-                current = new SpscLinkedArrayQueue<>(Flowable.bufferSize());
-                if (queue.compareAndSet(null, current)) {
-                    return current;
-                }
+            SpscLinkedArrayQueue<R> current = queue.get();
+            if (current != null) {
+                return current;
             }
+            current = new SpscLinkedArrayQueue<>(Flowable.bufferSize());
+            if (queue.compareAndSet(null, current)) {
+                return current;
+            }
+            return queue.get();
         }
 
         void innerError(InnerObserver inner, Throwable e) {
@@ -240,7 +239,7 @@ void innerComplete(InnerObserver inner) {
                 boolean d = active.decrementAndGet() == 0;
                 SpscLinkedArrayQueue<R> q = queue.get();
 
-                if (d && (q == null || q.isEmpty())) {
+                if (checkTerminate(d, q)) {
                     errors.tryTerminateConsumer(downstream);
                     return;
                 }
@@ -261,6 +260,10 @@ void innerComplete(InnerObserver inner) {
             }
         }
 
+        static boolean checkTerminate(boolean d, SpscLinkedArrayQueue<?> q) {
+            return d && (q == null || q.isEmpty());
+        }
+
         void drain() {
             if (getAndIncrement() == 0) {
                 drainLoop();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
index d0c9002669..f733eb7fa5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
@@ -205,16 +205,15 @@ void innerSuccess(InnerObserver inner, R value) {
         }
 
         SpscLinkedArrayQueue<R> getOrCreateQueue() {
-            for (;;) {
-                SpscLinkedArrayQueue<R> current = queue.get();
-                if (current != null) {
-                    return current;
-                }
-                current = new SpscLinkedArrayQueue<>(Flowable.bufferSize());
-                if (queue.compareAndSet(null, current)) {
-                    return current;
-                }
+            SpscLinkedArrayQueue<R> current = queue.get();
+            if (current != null) {
+                return current;
+            }
+            current = new SpscLinkedArrayQueue<>(Flowable.bufferSize());
+            if (queue.compareAndSet(null, current)) {
+                return current;
             }
+            return queue.get();
         }
 
         void innerError(InnerObserver inner, Throwable e) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
index 7ae3f3e7d1..5c0642021d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
@@ -73,14 +73,14 @@ public static <T> void subscribe(Subscriber<? super T> s, Iterator<? extends T>
     abstract static class BaseRangeSubscription<T> extends BasicQueueSubscription<T> {
         private static final long serialVersionUID = -2252972430506210021L;
 
-        Iterator<? extends T> it;
+        Iterator<? extends T> iterator;
 
         volatile boolean cancelled;
 
         boolean once;
 
         BaseRangeSubscription(Iterator<? extends T> it) {
-            this.it = it;
+            this.iterator = it;
         }
 
         @Override
@@ -91,27 +91,34 @@ public final int requestFusion(int mode) {
         @Nullable
         @Override
         public final T poll() {
-            if (it == null) {
+            if (iterator == null) {
                 return null;
             }
             if (!once) {
                 once = true;
             } else {
-                if (!it.hasNext()) {
+                if (!iterator.hasNext()) {
                     return null;
                 }
             }
-            return Objects.requireNonNull(it.next(), "Iterator.next() returned a null value");
+            return Objects.requireNonNull(iterator.next(), "Iterator.next() returned a null value");
         }
 
         @Override
         public final boolean isEmpty() {
-            return it == null || !it.hasNext();
+            Iterator<? extends T> it = this.iterator;
+            if (it != null) {
+                if (!once || it.hasNext()) {
+                    return false;
+                }
+                clear();
+            }
+            return true;
         }
 
         @Override
         public final void clear() {
-            it = null;
+            iterator = null;
         }
 
         @Override
@@ -150,7 +157,7 @@ static final class IteratorSubscription<T> extends BaseRangeSubscription<T> {
 
         @Override
         void fastPath() {
-            Iterator<? extends T> it = this.it;
+            Iterator<? extends T> it = this.iterator;
             Subscriber<? super T> a = downstream;
             for (;;) {
                 if (cancelled) {
@@ -204,7 +211,7 @@ void fastPath() {
         @Override
         void slowPath(long r) {
             long e = 0L;
-            Iterator<? extends T> it = this.it;
+            Iterator<? extends T> it = this.iterator;
             Subscriber<? super T> a = downstream;
 
             for (;;) {
@@ -286,7 +293,7 @@ static final class IteratorConditionalSubscription<T> extends BaseRangeSubscript
 
         @Override
         void fastPath() {
-            Iterator<? extends T> it = this.it;
+            Iterator<? extends T> it = this.iterator;
             ConditionalSubscriber<? super T> a = downstream;
             for (;;) {
                 if (cancelled) {
@@ -340,7 +347,7 @@ void fastPath() {
         @Override
         void slowPath(long r) {
             long e = 0L;
-            Iterator<? extends T> it = this.it;
+            Iterator<? extends T> it = this.iterator;
             ConditionalSubscriber<? super T> a = downstream;
 
             for (;;) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
index a950de7a96..e832cf8950 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
@@ -330,7 +330,7 @@ else if (mode == LEFT_CLOSE) {
                             up.onComplete();
                         }
                     }
-                    else if (mode == RIGHT_CLOSE) {
+                    else {
                         LeftRightEndSubscriber end = (LeftRightEndSubscriber)val;
 
                         rights.remove(end.index);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
index 01cf71023f..3406b7411d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
@@ -339,7 +339,7 @@ else if (mode == LEFT_CLOSE) {
                         lefts.remove(end.index);
                         disposables.remove(end);
                     }
-                    else if (mode == RIGHT_CLOSE) {
+                    else {
                         LeftRightEndSubscriber end = (LeftRightEndSubscriber)val;
 
                         rights.remove(end.index);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
index 3a4f237e5b..1ec41a6374 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
@@ -350,15 +350,10 @@ void runSync() {
                     return;
                 }
 
-                int w = get();
-                if (missed == w) {
-                    produced = e;
-                    missed = addAndGet(-missed);
-                    if (missed == 0) {
-                        break;
-                    }
-                } else {
-                    missed = w;
+                produced = e;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    break;
                 }
             }
         }
@@ -593,15 +588,10 @@ void runSync() {
                     return;
                 }
 
-                int w = get();
-                if (missed == w) {
-                    produced = e;
-                    missed = addAndGet(-missed);
-                    if (missed == 0) {
-                        break;
-                    }
-                } else {
-                    missed = w;
+                produced = e;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    break;
                 }
             }
         }
@@ -662,16 +652,11 @@ void runAsync() {
                     return;
                 }
 
-                int w = get();
-                if (missed == w) {
-                    produced = emitted;
-                    consumed = polled;
-                    missed = addAndGet(-missed);
-                    if (missed == 0) {
-                        break;
-                    }
-                } else {
-                    missed = w;
+                produced = emitted;
+                consumed = polled;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    break;
                 }
             }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
index 49e75fc1fd..c1d5675cf1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
@@ -60,14 +60,6 @@ public Publisher<T> source() {
         return source;
     }
 
-    /**
-     * The internal buffer size of this FlowablePublishAlt operator.
-     * @return The internal buffer size of this FlowablePublishAlt operator.
-     */
-    public int publishBufferSize() {
-        return bufferSize;
-    }
-
     @Override
     public void connect(Consumer<? super Disposable> connection) {
         PublishConnection<T> conn;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
index db8718a433..258db5f3bc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
@@ -246,10 +246,8 @@ static final class ReplaySubscriber<T>
 
         final AtomicInteger management;
 
-        /** Contains the maximum element index the child Subscribers requested so far. Accessed while emitting is true. */
-        long maxChildRequested;
-        /** Counts the outstanding upstream requests until the producer arrives. */
-        long maxUpstreamRequested;
+        /** Tracks the amount already requested from the upstream. */
+        long requestedFromUpstream;
 
         @SuppressWarnings("unchecked")
         ReplaySubscriber(ReplayBuffer<T> buffer) {
@@ -284,9 +282,6 @@ public void dispose() {
          */
         @SuppressWarnings("unchecked")
         boolean add(InnerSubscription<T> producer) {
-            if (producer == null) {
-                throw new NullPointerException();
-            }
             // the state can change so we do a CAS loop to achieve atomicity
             for (;;) {
                 // get the current producer array
@@ -415,7 +410,8 @@ public void onComplete() {
          * Coordinates the request amounts of various child Subscribers.
          */
         void manageRequests() {
-            if (management.getAndIncrement() != 0) {
+            AtomicInteger m = management;
+            if (m.getAndIncrement() != 0) {
                 return;
             }
             int missed = 1;
@@ -424,46 +420,29 @@ void manageRequests() {
                 if (isDisposed()) {
                     return;
                 }
+                Subscription p = get();
 
-                InnerSubscription<T>[] a = subscribers.get();
-
-                long ri = maxChildRequested;
-                long maxTotalRequests = ri;
-
-                for (InnerSubscription<T> rp : a) {
-                    maxTotalRequests = Math.max(maxTotalRequests, rp.totalRequested.get());
-                }
+                // only request when there is an upstream Subscription available
+                if (p != null) {
+                    // how many items were requested so far
+                    long alreadyRequested = requestedFromUpstream;
+                    long downstreamMaxRequest = alreadyRequested;
 
-                long ur = maxUpstreamRequested;
-                Subscription p = get();
+                    // find out the maximum total requested of the current subscribers
+                    for (InnerSubscription<T> rp : subscribers.get()) {
+                        downstreamMaxRequest = Math.max(downstreamMaxRequest, rp.totalRequested.get());
+                    }
 
-                long diff = maxTotalRequests - ri;
-                if (diff != 0L) {
-                    maxChildRequested = maxTotalRequests;
-                    if (p != null) {
-                        if (ur != 0L) {
-                            maxUpstreamRequested = 0L;
-                            p.request(ur + diff);
-                        } else {
-                            p.request(diff);
-                        }
-                    } else {
-                        // collect upstream request amounts until there is a producer for them
-                        long u = ur + diff;
-                        if (u < 0) {
-                            u = Long.MAX_VALUE;
-                        }
-                        maxUpstreamRequested = u;
+                    // how much more to request from the upstream
+                    long diff = downstreamMaxRequest - alreadyRequested;
+                    if (diff != 0L) {
+                        // save the new maximum requested
+                        requestedFromUpstream = downstreamMaxRequest;
+                        p.request(diff);
                     }
-                } else
-                // if there were outstanding upstream requests and we have a producer
-                if (ur != 0L && p != null) {
-                    maxUpstreamRequested = 0L;
-                    // fire the accumulated requests
-                    p.request(ur);
                 }
 
-                missed = management.addAndGet(-missed);
+                missed = m.addAndGet(-missed);
                 if (missed == 0) {
                     break;
                 }
@@ -668,6 +647,8 @@ public void replay(InnerSubscription<T> output) {
                         output.dispose();
                         if (!NotificationLite.isError(o) && !NotificationLite.isComplete(o)) {
                             child.onError(err);
+                        } else {
+                            RxJavaPlugins.onError(err);
                         }
                         return;
                     }
@@ -717,7 +698,7 @@ static final class Node extends AtomicReference<Node> {
      *
      * @param <T> the value type
      */
-    static class BoundedReplayBuffer<T> extends AtomicReference<Node> implements ReplayBuffer<T> {
+    abstract static class BoundedReplayBuffer<T> extends AtomicReference<Node> implements ReplayBuffer<T> {
 
         private static final long serialVersionUID = 2346567790059478686L;
 
@@ -829,11 +810,6 @@ public final void replay(InnerSubscription<T> output) {
                 output.emitting = true;
             }
             for (;;) {
-                if (output.isDisposed()) {
-                    output.index = null;
-                    return;
-                }
-
                 long r = output.get();
                 boolean unbounded = r == Long.MAX_VALUE; // NOPMD
                 long e = 0L;
@@ -847,6 +823,11 @@ public final void replay(InnerSubscription<T> output) {
                 }
 
                 while (r != 0) {
+                    if (output.isDisposed()) {
+                        output.index = null;
+                        return;
+                    }
+
                     Node v = node.get();
                     if (v != null) {
                         Object o = leaveTransform(v.value);
@@ -861,6 +842,8 @@ public final void replay(InnerSubscription<T> output) {
                             output.dispose();
                             if (!NotificationLite.isError(o) && !NotificationLite.isComplete(o)) {
                                 output.child.onError(err);
+                            } else {
+                                RxJavaPlugins.onError(err);
                             }
                             return;
                         }
@@ -870,10 +853,11 @@ public final void replay(InnerSubscription<T> output) {
                     } else {
                         break;
                     }
-                    if (output.isDisposed()) {
-                        output.index = null;
-                        return;
-                    }
+                }
+
+                if (r == 0 && output.isDisposed()) {
+                    output.index = null;
+                    return;
                 }
 
                 if (e != 0L) {
@@ -917,9 +901,7 @@ Object leaveTransform(Object value) {
          * Override this method to truncate a non-terminated buffer
          * based on its current properties.
          */
-        void truncate() {
-
-        }
+        abstract void truncate();
         /**
          * Override this method to truncate a terminated buffer
          * based on its properties (i.e., truncate but the very last node).
@@ -1021,7 +1003,7 @@ void truncate() {
 
             int e = 0;
             for (;;) {
-                if (next != null && size > 1) { // never truncate the very last item just added
+                if (size > 1) { // never truncate the very last item just added
                     if (size > limit) {
                         e++;
                         size--;
@@ -1056,7 +1038,7 @@ void truncateFinal() {
 
             int e = 0;
             for (;;) {
-                if (next != null && size > 1) {
+                if (size > 1) {
                     Timed<?> v = (Timed<?>)next.value;
                     if (v.time() <= timeLimit) {
                         e++;
@@ -1149,31 +1131,6 @@ public void accept(Disposable r) {
         }
     }
 
-    static final class ConnectableFlowableReplay<T> extends ConnectableFlowable<T> {
-        private final ConnectableFlowable<T> cf;
-        private final Flowable<T> flowable;
-
-        ConnectableFlowableReplay(ConnectableFlowable<T> cf, Flowable<T> flowable) {
-            this.cf = cf;
-            this.flowable = flowable;
-        }
-
-        @Override
-        public void connect(Consumer<? super Disposable> connection) {
-            cf.connect(connection);
-        }
-
-        @Override
-        public void reset() {
-            cf.reset();
-        }
-
-        @Override
-        protected void subscribeActual(Subscriber<? super T> s) {
-            flowable.subscribe(s);
-        }
-    }
-
     static final class ReplayBufferSupplier<T> implements Supplier<ReplayBuffer<T>> {
 
         final int bufferSize;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
index 7c6c1006ca..8e8ff3f0a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
@@ -180,12 +180,9 @@ public void cancel() {
 
         @SuppressWarnings("unchecked")
         void disposeInner() {
-            SwitchMapInnerSubscriber<T, R> a = active.get();
-            if (a != CANCELLED) {
-                a = active.getAndSet((SwitchMapInnerSubscriber<T, R>)CANCELLED);
-                if (a != CANCELLED && a != null) {
-                    a.cancel();
-                }
+            SwitchMapInnerSubscriber<T, R> a = active.getAndSet((SwitchMapInnerSubscriber<T, R>)CANCELLED);
+            if (a != CANCELLED && a != null) {
+                a.cancel();
             }
         }
 
@@ -228,26 +225,6 @@ void drain() {
                 SwitchMapInnerSubscriber<T, R> inner = active.get();
                 SimpleQueue<R> q = inner != null ? inner.queue : null;
                 if (q != null) {
-                    if (inner.done) {
-                        if (!delayErrors) {
-                            Throwable err = errors.get();
-                            if (err != null) {
-                                disposeInner();
-                                errors.tryTerminateConsumer(a);
-                                return;
-                            } else
-                            if (q.isEmpty()) {
-                                active.compareAndSet(inner, null);
-                                continue;
-                            }
-                        } else {
-                            if (q.isEmpty()) {
-                                active.compareAndSet(inner, null);
-                                continue;
-                            }
-                        }
-                    }
-
                     long r = requested.get();
                     long e = 0L;
                     boolean retry = false;
@@ -306,6 +283,28 @@ void drain() {
                         e++;
                     }
 
+                    if (e == r) {
+                        if (inner.done) {
+                            if (!delayErrors) {
+                                Throwable err = errors.get();
+                                if (err != null) {
+                                    disposeInner();
+                                    errors.tryTerminateConsumer(a);
+                                    return;
+                                } else
+                                if (q.isEmpty()) {
+                                    active.compareAndSet(inner, null);
+                                    continue;
+                                }
+                            } else {
+                                if (q.isEmpty()) {
+                                    active.compareAndSet(inner, null);
+                                    continue;
+                                }
+                            }
+                        }
+                    }
+
                     if (e != 0L) {
                         if (!cancelled) {
                             if (r != Long.MAX_VALUE) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java
index 062135b47c..5098b589fd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java
@@ -119,8 +119,12 @@ void drain() {
                             a.onNext(v);
                             e++;
                         }
-                        if (e != 0L && r != Long.MAX_VALUE) {
-                            r = requested.addAndGet(-e);
+                        if (isEmpty()) {
+                            a.onComplete();
+                            return;
+                        }
+                        if (e != 0L) {
+                            r = BackpressureHelper.produced(requested, e);
                         }
                     }
                 } while (wip.decrementAndGet() != 0);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
index e00ed99edf..1f139bad1c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
@@ -22,8 +22,7 @@
 import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
-import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.processors.*;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
 
 public final class FlowableWindow<T> extends AbstractFlowableWithUpstream<T, Flowable<T>> {
     final long size;
@@ -358,10 +357,6 @@ public void onSubscribe(Subscription s) {
 
         @Override
         public void onNext(T t) {
-            if (done) {
-                return;
-            }
-
             long i = index;
 
             UnicastProcessor<T> newWindow = null;
@@ -407,11 +402,6 @@ public void onNext(T t) {
 
         @Override
         public void onError(Throwable t) {
-            if (done) {
-                RxJavaPlugins.onError(t);
-                return;
-            }
-
             for (Processor<T, T> w : windows) {
                 w.onError(t);
             }
@@ -424,10 +414,6 @@ public void onError(Throwable t) {
 
         @Override
         public void onComplete() {
-            if (done) {
-                return;
-            }
-
             for (Processor<T, T> w : windows) {
                 w.onComplete();
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
index 77011a5a2d..d3da152716 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
@@ -191,23 +191,12 @@ void drain() {
                     for (int j = 0; j < n; j++) {
                         ZipSubscriber<T, R> inner = qs[j];
                         if (values[j] == null) {
+                            boolean d = inner.done;
+                            SimpleQueue<T> q = inner.queue;
+                            T v = null;
                             try {
-                                boolean d = inner.done;
-                                SimpleQueue<T> q = inner.queue;
 
-                                T v = q != null ? q.poll() : null;
-
-                                boolean sourceEmpty = v == null;
-                                if (d && sourceEmpty) {
-                                    cancelAll();
-                                    errors.tryTerminateConsumer(a);
-                                    return;
-                                }
-                                if (!sourceEmpty) {
-                                    values[j] = v;
-                                } else {
-                                    empty = true;
-                                }
+                                v = q != null ? q.poll() : null;
                             } catch (Throwable ex) {
                                 Exceptions.throwIfFatal(ex);
 
@@ -217,6 +206,18 @@ void drain() {
                                     errors.tryTerminateConsumer(a);
                                     return;
                                 }
+                                d = true;
+                            }
+
+                            boolean sourceEmpty = v == null;
+                            if (d && sourceEmpty) {
+                                cancelAll();
+                                errors.tryTerminateConsumer(a);
+                                return;
+                            }
+                            if (!sourceEmpty) {
+                                values[j] = v;
+                            } else {
                                 empty = true;
                             }
                         }
@@ -259,20 +260,11 @@ void drain() {
                     for (int j = 0; j < n; j++) {
                         ZipSubscriber<T, R> inner = qs[j];
                         if (values[j] == null) {
+                            boolean d = inner.done;
+                            SimpleQueue<T> q = inner.queue;
+                            T v = null;
                             try {
-                                boolean d = inner.done;
-                                SimpleQueue<T> q = inner.queue;
-                                T v = q != null ? q.poll() : null;
-
-                                boolean empty = v == null;
-                                if (d && empty) {
-                                    cancelAll();
-                                    errors.tryTerminateConsumer(a);
-                                    return;
-                                }
-                                if (!empty) {
-                                    values[j] = v;
-                                }
+                                v = q != null ? q.poll() : null;
                             } catch (Throwable ex) {
                                 Exceptions.throwIfFatal(ex);
                                 errors.tryAddThrowableOrReport(ex);
@@ -281,6 +273,16 @@ void drain() {
                                     errors.tryTerminateConsumer(a);
                                     return;
                                 }
+                                d = true;
+                            }
+                            boolean empty = v == null;
+                            if (d && empty) {
+                                cancelAll();
+                                errors.tryTerminateConsumer(a);
+                                return;
+                            }
+                            if (!empty) {
+                                values[j] = v;
                             }
                         }
                     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java
index 8bc43aa41c..ffab752652 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java
@@ -115,9 +115,8 @@ public boolean win(int index) {
                     }
                     return true;
                 }
-                return false;
             }
-            return w == index;
+            return false;
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
index 8a7becc241..e5e4383956 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
@@ -121,11 +121,9 @@ public void onSubscribe(Disposable d) {
 
                 downstream.onSubscribe(this);
 
-                if (!cancelled) {
+                if (!DisposableHelper.isDisposed(timer.get())) {
                     Disposable task = scheduler.schedulePeriodicallyDirect(this, timespan, timespan, unit);
-                    if (!timer.compareAndSet(null, task)) {
-                        task.dispose();
-                    }
+                    DisposableHelper.set(timer, task);
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
index 34dce80431..646ab80690 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
@@ -49,13 +49,19 @@ public void subscribeActual(Observer<? super R> observer) {
         int count = 0;
         if (sources == null) {
             sources = new ObservableSource[8];
-            for (ObservableSource<? extends T> p : sourcesIterable) {
-                if (count == sources.length) {
-                    ObservableSource<? extends T>[] b = new ObservableSource[count + (count >> 2)];
-                    System.arraycopy(sources, 0, b, 0, count);
-                    sources = b;
+            try {
+                for (ObservableSource<? extends T> p : sourcesIterable) {
+                    if (count == sources.length) {
+                        ObservableSource<? extends T>[] b = new ObservableSource[count + (count >> 2)];
+                        System.arraycopy(sources, 0, b, 0, count);
+                        sources = b;
+                    }
+                    sources[count++] = Objects.requireNonNull(p, "The Iterator returned a null ObservableSource");
                 }
-                sources[count++] = p;
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                EmptyDisposable.error(ex, observer);
+                return;
             }
         } else {
             count = sources.length;
@@ -122,9 +128,7 @@ public void dispose() {
             if (!cancelled) {
                 cancelled = true;
                 cancelSources();
-                if (getAndIncrement() == 0) {
-                    clear(queue);
-                }
+                drain();
             }
         }
 
@@ -161,6 +165,7 @@ void drain() {
                 for (;;) {
                     if (cancelled) {
                         clear(q);
+                        errors.tryTerminateAndReport();
                         return;
                     }
 
@@ -240,7 +245,6 @@ void innerError(int index, Throwable ex) {
                         if (latest == null) {
                             return;
                         }
-
                         cancelOthers = latest[index] == null;
                         if (cancelOthers || ++complete == latest.length) {
                             done = true;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
index 66445bc8d1..f05faf7eda 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
@@ -159,7 +159,7 @@ static final class SerializedEmitter<T>
 
         @Override
         public void onNext(T t) {
-            if (emitter.isDisposed() || done) {
+            if (done || emitter.isDisposed()) {
                 return;
             }
             if (t == null) {
@@ -192,7 +192,7 @@ public void onError(Throwable t) {
 
         @Override
         public boolean tryOnError(Throwable t) {
-            if (emitter.isDisposed() || done) {
+            if (done || emitter.isDisposed()) {
                 return false;
             }
             if (t == null) {
@@ -208,7 +208,7 @@ public boolean tryOnError(Throwable t) {
 
         @Override
         public void onComplete() {
-            if (emitter.isDisposed() || done) {
+            if (done || emitter.isDisposed()) {
                 return;
             }
             done = true;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
index a169627ed3..d2ca19c31a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
@@ -69,7 +69,7 @@ static final class MergeObserver<T, U> extends AtomicInteger implements Disposab
 
         final AtomicThrowable errors = new AtomicThrowable();
 
-        volatile boolean cancelled;
+        volatile boolean disposed;
 
         final AtomicReference<InnerObserver<?, ?>[]> observers;
 
@@ -80,7 +80,6 @@ static final class MergeObserver<T, U> extends AtomicInteger implements Disposab
         Disposable upstream;
 
         long uniqueId;
-        long lastId;
         int lastIndex;
 
         Queue<ObservableSource<? extends U>> sources;
@@ -188,9 +187,6 @@ void removeInner(InnerObserver<T, U> inner) {
             for (;;) {
                 InnerObserver<?, ?>[] a = observers.get();
                 int n = a.length;
-                if (n == 0) {
-                    return;
-                }
                 int j = -1;
                 for (int i = 0; i < n; i++) {
                     if (a[i] == inner) {
@@ -246,10 +242,7 @@ boolean tryEmitScalar(Supplier<? extends U> value) {
                     queue = q;
                 }
 
-                if (!q.offer(u)) {
-                    onError(new IllegalStateException("Scalar queue full?!"));
-                    return true;
-                }
+                q.offer(u);
                 if (getAndIncrement() != 0) {
                     return false;
                 }
@@ -301,17 +294,15 @@ public void onComplete() {
 
         @Override
         public void dispose() {
-            if (!cancelled) {
-                cancelled = true;
-                if (disposeAll()) {
-                    errors.tryTerminateAndReport();
-                }
+            disposed = true;
+            if (disposeAll()) {
+                errors.tryTerminateAndReport();
             }
         }
 
         @Override
         public boolean isDisposed() {
-            return cancelled;
+            return disposed;
         }
 
         void drain() {
@@ -364,29 +355,8 @@ void drainLoop() {
 
                 int innerCompleted = 0;
                 if (n != 0) {
-                    long startId = lastId;
-                    int index = lastIndex;
-
-                    if (n <= index || inner[index].id != startId) {
-                        if (n <= index) {
-                            index = 0;
-                        }
-                        int j = index;
-                        for (int i = 0; i < n; i++) {
-                            if (inner[j].id == startId) {
-                                break;
-                            }
-                            j++;
-                            if (j == n) {
-                                j = 0;
-                            }
-                        }
-                        index = j;
-                        lastIndex = j;
-                        lastId = inner[j].id;
-                    }
+                    int j = Math.min(n - 1, lastIndex);
 
-                    int j = index;
                     sourceLoop:
                     for (int i = 0; i < n; i++) {
                         if (checkTerminate()) {
@@ -432,9 +402,6 @@ void drainLoop() {
                         SimpleQueue<U> innerQueue = is.queue;
                         if (innerDone && (innerQueue == null || innerQueue.isEmpty())) {
                             removeInner(is);
-                            if (checkTerminate()) {
-                                return;
-                            }
                             innerCompleted++;
                         }
 
@@ -444,7 +411,6 @@ void drainLoop() {
                         }
                     }
                     lastIndex = j;
-                    lastId = inner[j].id;
                 }
 
                 if (innerCompleted != 0) {
@@ -471,7 +437,7 @@ void drainLoop() {
         }
 
         boolean checkTerminate() {
-            if (cancelled) {
+            if (disposed) {
                 return true;
             }
             Throwable e = errors.get();
@@ -485,15 +451,12 @@ boolean checkTerminate() {
 
         boolean disposeAll() {
             upstream.dispose();
-            InnerObserver<?, ?>[] a = observers.get();
+            InnerObserver<?, ?>[] a = observers.getAndSet(CANCELLED);
             if (a != CANCELLED) {
-                a = observers.getAndSet(CANCELLED);
-                if (a != CANCELLED) {
-                    for (InnerObserver<?, ?> inner : a) {
-                        inner.dispose();
-                    }
-                    return true;
+                for (InnerObserver<?, ?> inner : a) {
+                    inner.dispose();
                 }
+                return true;
             }
             return false;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
index 729e8cf6c5..1db5b140e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
@@ -116,9 +116,7 @@ public void onError(Throwable e) {
                     disposed = true;
                     upstream.dispose();
                     set.dispose();
-                    if (getAndSet(0) > 0) {
-                        errors.tryTerminateConsumer(downstream);
-                    }
+                    errors.tryTerminateConsumer(downstream);
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
index 2d488ac2c5..039be4ffb7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
@@ -122,9 +122,7 @@ public void onError(Throwable e) {
                     disposed = true;
                     upstream.dispose();
                     set.dispose();
-                    if (getAndSet(0) > 0) {
-                        errors.tryTerminateConsumer(downstream);
-                    }
+                    errors.tryTerminateConsumer(downstream);
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
index 7ac5ca6f3c..3547769267 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
@@ -172,16 +172,15 @@ void innerSuccess(InnerObserver inner, R value) {
         }
 
         SpscLinkedArrayQueue<R> getOrCreateQueue() {
-            for (;;) {
-                SpscLinkedArrayQueue<R> current = queue.get();
-                if (current != null) {
-                    return current;
-                }
-                current = new SpscLinkedArrayQueue<>(Observable.bufferSize());
-                if (queue.compareAndSet(null, current)) {
-                    return current;
-                }
+            SpscLinkedArrayQueue<R> current = queue.get();
+            if (current != null) {
+                return current;
+            }
+            current = new SpscLinkedArrayQueue<>(Observable.bufferSize());
+            if (queue.compareAndSet(null, current)) {
+                return current;
             }
+            return queue.get();
         }
 
         void innerError(InnerObserver inner, Throwable e) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
index 8ed45d5f39..e93051fd0c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
@@ -172,16 +172,15 @@ void innerSuccess(InnerObserver inner, R value) {
         }
 
         SpscLinkedArrayQueue<R> getOrCreateQueue() {
-            for (;;) {
-                SpscLinkedArrayQueue<R> current = queue.get();
-                if (current != null) {
-                    return current;
-                }
-                current = new SpscLinkedArrayQueue<>(Observable.bufferSize());
-                if (queue.compareAndSet(null, current)) {
-                    return current;
-                }
+            SpscLinkedArrayQueue<R> current = queue.get();
+            if (current != null) {
+                return current;
+            }
+            current = new SpscLinkedArrayQueue<>(Observable.bufferSize());
+            if (queue.compareAndSet(null, current)) {
+                return current;
             }
+            return queue.get();
         }
 
         void innerError(InnerObserver inner, Throwable e) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
index 3605ee5203..2a553fd1b1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
@@ -319,7 +319,7 @@ else if (mode == LEFT_CLOSE) {
                             up.onComplete();
                         }
                     }
-                    else if (mode == RIGHT_CLOSE) {
+                    else  {
                         LeftRightEndObserver end = (LeftRightEndObserver)val;
 
                         rights.remove(end.index);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java
index 96d113663e..54576298a7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java
@@ -90,8 +90,10 @@ public void run() {
                 downstream.onNext(c);
 
                 if (c == end) {
+                    if (!isDisposed()) {
+                        downstream.onComplete();
+                    }
                     DisposableHelper.dispose(this);
-                    downstream.onComplete();
                     return;
                 }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
index 7dabfcc72d..f7937b0509 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
@@ -846,7 +846,7 @@ void truncate() {
 
             int e = 0;
             for (;;) {
-                if (next != null && size > 1) { // never truncate the very last item just added
+                if (size > 1) { // never truncate the very last item just added
                     if (size > limit) {
                         e++;
                         size--;
@@ -881,7 +881,7 @@ void truncateFinal() {
 
             int e = 0;
             for (;;) {
-                if (next != null && size > 1) {
+                if (size > 1) {
                     Timed<?> v = (Timed<?>)next.value;
                     if (v.time() <= timeLimit) {
                         e++;
@@ -1069,29 +1069,4 @@ protected void subscribeActual(Observer<? super R> child) {
             co.connect(new DisposeConsumer<>(srw));
         }
     }
-
-    static final class Replay<T> extends ConnectableObservable<T> {
-        private final ConnectableObservable<T> co;
-        private final Observable<T> observable;
-
-        Replay(ConnectableObservable<T> co, Observable<T> observable) {
-            this.co = co;
-            this.observable = observable;
-        }
-
-        @Override
-        public void connect(Consumer<? super Disposable> connection) {
-            co.connect(connection);
-        }
-
-        @Override
-        public void reset() {
-            co.reset();
-        }
-
-        @Override
-        protected void subscribeActual(Observer<? super T> observer) {
-            observable.subscribe(observer);
-        }
-    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
index e533834541..dbbb3da35a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
@@ -169,12 +169,9 @@ public boolean isDisposed() {
 
         @SuppressWarnings("unchecked")
         void disposeInner() {
-            SwitchMapInnerObserver<T, R> a = active.get();
-            if (a != CANCELLED) {
-                a = active.getAndSet((SwitchMapInnerObserver<T, R>)CANCELLED);
-                if (a != CANCELLED && a != null) {
-                    a.cancel();
-                }
+            SwitchMapInnerObserver<T, R> a = active.getAndSet((SwitchMapInnerObserver<T, R>)CANCELLED);
+            if (a != null) {
+                a.cancel();
             }
         }
 
@@ -226,25 +223,6 @@ void drain() {
                     SimpleQueue<R> q = inner.queue;
 
                     if (q != null) {
-                        if (inner.done) {
-                            boolean empty = q.isEmpty();
-                            if (delayErrors) {
-                                if (empty) {
-                                    active.compareAndSet(inner, null);
-                                    continue;
-                                }
-                            } else {
-                                Throwable ex = errors.get();
-                                if (ex != null) {
-                                    errors.tryTerminateConsumer(a);
-                                    return;
-                                }
-                                if (empty) {
-                                    active.compareAndSet(inner, null);
-                                    continue;
-                                }
-                            }
-                        }
 
                         boolean retry = false;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java
index bfa2ee0bdd..80f408de32 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java
@@ -77,9 +77,7 @@ public void onComplete() {
                 }
                 T v = poll();
                 if (v == null) {
-                    if (!cancelled) {
-                        a.onComplete();
-                    }
+                    a.onComplete();
                     return;
                 }
                 a.onNext(v);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
index 041ce80840..138cb3f869 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
@@ -21,7 +21,6 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 import io.reactivex.rxjava3.observers.SerializedObserver;
-import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableThrottleFirstTimed<T> extends AbstractObservableWithUpstream<T, T> {
     final long timeout;
@@ -57,8 +56,6 @@ static final class DebounceTimedObserver<T>
 
         volatile boolean gate;
 
-        boolean done;
-
         DebounceTimedObserver(Observer<? super T> actual, long timeout, TimeUnit unit, Worker worker) {
             this.downstream = actual;
             this.timeout = timeout;
@@ -76,7 +73,7 @@ public void onSubscribe(Disposable d) {
 
         @Override
         public void onNext(T t) {
-            if (!gate && !done) {
+            if (!gate) {
                 gate = true;
 
                 downstream.onNext(t);
@@ -96,22 +93,14 @@ public void run() {
 
         @Override
         public void onError(Throwable t) {
-            if (done) {
-                RxJavaPlugins.onError(t);
-            } else {
-                done = true;
-                downstream.onError(t);
-                worker.dispose();
-            }
+            downstream.onError(t);
+            worker.dispose();
         }
 
         @Override
         public void onComplete() {
-            if (!done) {
-                done = true;
-                downstream.onComplete();
-                worker.dispose();
-            }
+            downstream.onComplete();
+            worker.dispose();
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java
index 6a3c5322f2..ed64de962a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java
@@ -20,7 +20,6 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 
 public final class ObservableToList<T, U extends Collection<? super T>>
@@ -28,12 +27,6 @@ public final class ObservableToList<T, U extends Collection<? super T>>
 
     final Supplier<U> collectionSupplier;
 
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public ObservableToList(ObservableSource<T> source, final int defaultCapacityHint) {
-        super(source);
-        this.collectionSupplier = (Supplier)Functions.createArrayList(defaultCapacityHint);
-    }
-
     public ObservableToList(ObservableSource<T> source, Supplier<U> collectionSupplier) {
         super(source);
         this.collectionSupplier = collectionSupplier;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
index 0d4fb9a4c5..1d9bab143b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
@@ -150,10 +150,6 @@ void setupSubscribers() {
             final int m = subs.length;
 
             for (int i = 0; i < m; i++) {
-                if (cancelled) {
-                    return;
-                }
-
                 subscriberCount.lazySet(i + 1);
 
                 subs[i].onSubscribe(new RailSubscription(i, m));
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
index 4545b133f5..57f82230a0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
@@ -298,18 +298,13 @@ void drainLoop() {
                     }
                 }
 
-                if (e != 0 && r != Long.MAX_VALUE) {
-                    requested.addAndGet(-e);
+                if (e != 0) {
+                    BackpressureHelper.produced(requested, e);
                 }
 
-                int w = get();
-                if (w == missed) {
-                    missed = addAndGet(-missed);
-                    if (missed == 0) {
-                        break;
-                    }
-                } else {
-                    missed = w;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    break;
                 }
             }
         }
@@ -350,10 +345,9 @@ void onNext(JoinInnerSubscriber<T> inner, T value) {
                 SimplePlainQueue<T> q = inner.getQueue();
 
                 if (!q.offer(value)) {
-                    if (inner.cancel()) {
-                        errors.tryAddThrowableOrReport(new MissingBackpressureException("Queue full?!"));
-                        done.decrementAndGet();
-                    }
+                    inner.cancel();
+                    errors.tryAddThrowableOrReport(new MissingBackpressureException("Queue full?!"));
+                    done.decrementAndGet();
                 }
 
                 if (getAndIncrement() != 0) {
@@ -464,18 +458,13 @@ void drainLoop() {
                     }
                 }
 
-                if (e != 0 && r != Long.MAX_VALUE) {
-                    requested.addAndGet(-e);
+                if (e != 0) {
+                    BackpressureHelper.produced(requested, e);
                 }
 
-                int w = get();
-                if (w == missed) {
-                    missed = addAndGet(-missed);
-                    if (missed == 0) {
-                        break;
-                    }
-                } else {
-                    missed = w;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    break;
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
index ceb2a7665a..46d3bcdc1a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
@@ -430,19 +430,14 @@ public void run() {
                     }
                 }
 
-                if (e != 0L && r != Long.MAX_VALUE) {
-                    requested.addAndGet(-e);
+                if (e != 0L) {
+                    BackpressureHelper.produced(requested, e);
                 }
 
-                int w = get();
-                if (w == missed) {
-                    consumed = c;
-                    missed = addAndGet(-missed);
-                    if (missed == 0) {
-                        break;
-                    }
-                } else {
-                    missed = w;
+                consumed = c;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    break;
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java
index 7994abf697..3d4347d283 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java
@@ -215,48 +215,41 @@ void drain() {
                     e++;
                 }
 
-                if (e == r) {
-                    if (cancelled) {
-                        Arrays.fill(lists, null);
-                        return;
-                    }
+                if (cancelled) {
+                    Arrays.fill(lists, null);
+                    return;
+                }
 
-                    Throwable ex = error.get();
-                    if (ex != null) {
-                        cancelAll();
-                        Arrays.fill(lists, null);
-                        a.onError(ex);
-                        return;
-                    }
+                Throwable ex = error.get();
+                if (ex != null) {
+                    cancelAll();
+                    Arrays.fill(lists, null);
+                    a.onError(ex);
+                    return;
+                }
 
-                    boolean empty = true;
+                boolean empty = true;
 
-                    for (int i = 0; i < n; i++) {
-                        if (indexes[i] != lists[i].size()) {
-                            empty = false;
-                            break;
-                        }
+                for (int i = 0; i < n; i++) {
+                    if (indexes[i] != lists[i].size()) {
+                        empty = false;
+                        break;
                     }
+                }
 
-                    if (empty) {
-                        Arrays.fill(lists, null);
-                        a.onComplete();
-                        return;
-                    }
+                if (empty) {
+                    Arrays.fill(lists, null);
+                    a.onComplete();
+                    return;
                 }
 
-                if (e != 0 && r != Long.MAX_VALUE) {
-                    requested.addAndGet(-e);
+                if (e != 0) {
+                    BackpressureHelper.produced(requested, e);
                 }
 
-                int w = get();
-                if (w == missed) {
-                    missed = addAndGet(-missed);
-                    if (missed == 0) {
-                        break;
-                    }
-                } else {
-                    missed = w;
+                missed = addAndGet(-missed);
+                if (missed == 0) {
+                    break;
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java
index a0eb8ab860..44dbc50ecf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java
@@ -56,7 +56,7 @@ static final class OtherSubscriber<T, U>
 
         @Override
         public void onSubscribe(Disposable d) {
-            if (DisposableHelper.set(this, d)) {
+            if (DisposableHelper.setOnce(this, d)) {
 
                 downstream.onSubscribe(this);
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
index 0a839ab747..5d56487570 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
@@ -74,20 +74,13 @@ public void onSuccess(T value) {
 
         @Override
         public void onError(Throwable e) {
-            for (;;) {
-                int state = count.get();
-                if (state >= 2) {
-                    RxJavaPlugins.onError(e);
-                    return;
-                }
-                if (count.compareAndSet(state, 2)) {
-                    set.dispose();
-                    downstream.onError(e);
-                    return;
-                }
+            int state = count.getAndSet(-1);
+            if (state == 0 || state == 1) {
+                set.dispose();
+                downstream.onError(e);
+            } else {
+                RxJavaPlugins.onError(e);
             }
         }
-
     }
-
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
index 9e05a25ef8..cd16312620 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
@@ -154,7 +154,7 @@ void drain() {
                     long e = 0L;
 
                     if (r == Long.MAX_VALUE) {
-                        slowPath(a, iterator);
+                        fastPath(a, iterator);
                         return;
                     }
 
@@ -213,7 +213,7 @@ void drain() {
             }
         }
 
-        void slowPath(Subscriber<? super R> a, Iterator<? extends R> iterator) {
+        void fastPath(Subscriber<? super R> a, Iterator<? extends R> iterator) {
             for (;;) {
                 if (cancelled) {
                     return;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
index 47f8bf1e88..30d1192a17 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
@@ -14,7 +14,6 @@
 package io.reactivex.rxjava3.internal.operators.single;
 
 import java.util.*;
-import java.util.concurrent.Callable;
 
 import org.reactivestreams.Publisher;
 
@@ -31,14 +30,9 @@ private SingleInternalHelper() {
         throw new IllegalStateException("No instances!");
     }
 
-    enum NoSuchElementCallable implements Supplier<NoSuchElementException>, Callable<NoSuchElementException> {
+    enum NoSuchElementSupplier implements Supplier<NoSuchElementException> {
         INSTANCE;
 
-        @Override
-        public NoSuchElementException call() {
-            return new NoSuchElementException();
-        }
-
         @Override
         public NoSuchElementException get() {
             return new NoSuchElementException();
@@ -46,7 +40,7 @@ public NoSuchElementException get() {
     }
 
     public static Supplier<NoSuchElementException> emptyThrower() {
-        return NoSuchElementCallable.INSTANCE;
+        return NoSuchElementSupplier.INSTANCE;
     }
 
     @SuppressWarnings("rawtypes")
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java
index e0bf388772..cdbdda3d83 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java
@@ -175,15 +175,9 @@ public void start() {
 
     @Override
     public void shutdown() {
-        for (;;) {
-            FixedSchedulerPool curr = pool.get();
-            if (curr == NONE) {
-                return;
-            }
-            if (pool.compareAndSet(curr, NONE)) {
-                curr.shutdown();
-                return;
-            }
+        FixedSchedulerPool curr = pool.getAndSet(NONE);
+        if (curr != NONE) {
+            curr.shutdown();
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
index a9547e64e1..6387069548 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
@@ -257,9 +257,7 @@ void runFair() {
             }
 
             Runnable run = q.poll();
-            if (run != null) {
-                run.run();
-            }
+            run.run(); // never null because of offer + increment happens first
 
             if (disposed) {
                 q.clear();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
index 3a4bac58b2..6d63715770 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
@@ -93,7 +93,7 @@ static final class CachedWorkerPool implements Runnable {
 
         @Override
         public void run() {
-            evictExpiredWorkers();
+            evictExpiredWorkers(expiringWorkerQueue, allWorkers);
         }
 
         ThreadWorker get() {
@@ -120,7 +120,7 @@ void release(ThreadWorker threadWorker) {
             expiringWorkerQueue.offer(threadWorker);
         }
 
-        void evictExpiredWorkers() {
+        static void evictExpiredWorkers(ConcurrentLinkedQueue<ThreadWorker> expiringWorkerQueue, CompositeDisposable allWorkers) {
             if (!expiringWorkerQueue.isEmpty()) {
                 long currentTimestamp = now();
 
@@ -138,7 +138,7 @@ void evictExpiredWorkers() {
             }
         }
 
-        long now() {
+        static long now() {
             return System.nanoTime();
         }
 
@@ -178,15 +178,9 @@ public void start() {
 
     @Override
     public void shutdown() {
-        for (;;) {
-            CachedWorkerPool curr = pool.get();
-            if (curr == NONE) {
-                return;
-            }
-            if (pool.compareAndSet(curr, NONE)) {
-                curr.shutdown();
-                return;
-            }
+        CachedWorkerPool curr = pool.getAndSet(NONE);
+        if (curr != NONE) {
+            curr.shutdown();
         }
     }
 
@@ -241,7 +235,8 @@ public Disposable schedule(@NonNull Runnable action, long delayTime, @NonNull Ti
     }
 
     static final class ThreadWorker extends NewThreadWorker {
-        private long expirationTime;
+
+        long expirationTime;
 
         ThreadWorker(ThreadFactory threadFactory) {
             super(threadFactory);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
index ddff75388b..57033f4563 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
@@ -187,21 +187,7 @@ public boolean isDisposed() {
 
         @Override
         public void dispose() {
-            Disposable oldState;
-            // no matter what the current state is the new state is going to be
-            Disposable newState = DISPOSED;
-            do {
-                oldState = get();
-                if (oldState == DISPOSED) {
-                    // the action has already been unsubscribed
-                    return;
-                }
-            } while (!compareAndSet(oldState, newState));
-
-            if (oldState != SUBSCRIBED) {
-                // the action was scheduled. stop it.
-                oldState.dispose();
-            }
+            getAndSet(DISPOSED).dispose();
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
index 13c7430f94..2f42acbf35 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
@@ -90,12 +90,9 @@ public void start() {
 
     @Override
     public void shutdown() {
-        ScheduledExecutorService current = executor.get();
+        ScheduledExecutorService current =  executor.getAndSet(SHUTDOWN);
         if (current != SHUTDOWN) {
-            current = executor.getAndSet(SHUTDOWN);
-            if (current != SHUTDOWN) {
-                current.shutdownNow();
-            }
+            current.shutdownNow();
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java
index 59edd4f80d..d44e4a0dd0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java
@@ -19,9 +19,9 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.rxjava3.annotations.NonNull;
 import org.reactivestreams.Subscription;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BlockingHelper;
@@ -128,18 +128,16 @@ public void onNext(T t) {
 
     @Override
     public void onError(Throwable t) {
-        for (;;) {
+        if (error == null) {
             Subscription a = upstream.get();
-            if (a == this || a == SubscriptionHelper.CANCELLED) {
-                RxJavaPlugins.onError(t);
-                return;
-            }
-            error = t;
-            if (upstream.compareAndSet(a, this)) {
+            if (a != this && a != SubscriptionHelper.CANCELLED
+                    && upstream.compareAndSet(a, this)) {
+                error = t;
                 countDown();
                 return;
             }
         }
+        RxJavaPlugins.onError(t);
     }
 
     @Override
@@ -148,15 +146,12 @@ public void onComplete() {
             onError(new NoSuchElementException("The source is empty"));
             return;
         }
-        for (;;) {
-            Subscription a = upstream.get();
-            if (a == this || a == SubscriptionHelper.CANCELLED) {
-                return;
-            }
-            if (upstream.compareAndSet(a, this)) {
-                countDown();
-                return;
-            }
+        Subscription a = upstream.get();
+        if (a == this || a == SubscriptionHelper.CANCELLED) {
+            return;
+        }
+        if (upstream.compareAndSet(a, this)) {
+            countDown();
         }
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java
index c53138e3d7..955f9d87b1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java
@@ -115,18 +115,6 @@ public void request(long n) {
         }
     }
 
-    public void requestOne() {
-        if (fusionMode != QueueSubscription.SYNC) {
-            long p = produced + 1;
-            if (p == limit) {
-                produced = 0L;
-                get().request(p);
-            } else {
-                produced = p;
-            }
-        }
-    }
-
     @Override
     public void cancel() {
         SubscriptionHelper.cancel(this);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java b/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java
index 54f787f55a..378327ea4c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java
@@ -37,15 +37,18 @@ private HalfSerializer() {
      * @param value the value to emit
      * @param wip the serialization work-in-progress counter/indicator
      * @param errors the holder of Throwables
+     * @return true if the operation succeeded, false if there sequence completed
      */
-    public static <T> void onNext(Subscriber<? super T> subscriber, T value,
+    public static <T> boolean onNext(Subscriber<? super T> subscriber, T value,
             AtomicInteger wip, AtomicThrowable errors) {
         if (wip.get() == 0 && wip.compareAndSet(0, 1)) {
             subscriber.onNext(value);
-            if (wip.decrementAndGet() != 0) {
-                errors.tryTerminateConsumer(subscriber);
+            if (wip.decrementAndGet() == 0) {
+                return true;
             }
+            errors.tryTerminateConsumer(subscriber);
         }
+        return false;
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index de5d744f3f..54f16af80d 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -455,16 +455,9 @@ void remove(BehaviorSubscription<T> rs) {
     @SuppressWarnings("unchecked")
     BehaviorSubscription<T>[] terminate(Object terminalValue) {
 
-        BehaviorSubscription<T>[] a = subscribers.get();
-        if (a != TERMINATED) {
-            a = subscribers.getAndSet(TERMINATED);
-            if (a != TERMINATED) {
-                // either this or atomics with lots of allocation
-                setCurrent(terminalValue);
-            }
-        }
+        setCurrent(terminalValue);
 
-        return a;
+        return subscribers.getAndSet(TERMINATED);
     }
 
     void setCurrent(Object o) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index 7ef61d7959..c1e47500a1 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -23,7 +23,7 @@
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.queue.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
-import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
@@ -138,8 +138,6 @@ public final class MulticastProcessor<T> extends FlowableProcessor<T> {
 
     final AtomicReference<MulticastSubscription<T>[]> subscribers;
 
-    final AtomicBoolean once;
-
     final int bufferSize;
 
     final int limit;
@@ -233,7 +231,6 @@ public static <T> MulticastProcessor<T> create(int bufferSize, boolean refCount)
         this.subscribers = new AtomicReference<>(EMPTY);
         this.upstream = new AtomicReference<>();
         this.refcount = refCount;
-        this.once = new AtomicBoolean();
     }
 
     /**
@@ -292,7 +289,7 @@ public void onSubscribe(@NonNull Subscription s) {
 
     @Override
     public void onNext(@NonNull T t) {
-        if (once.get()) {
+        if (done) {
             return;
         }
         if (fusionMode == QueueSubscription.NONE) {
@@ -317,7 +314,7 @@ public void onNext(@NonNull T t) {
     @CheckReturnValue
     public boolean offer(@NonNull T t) {
         ExceptionHelper.nullCheck(t, "offer called with a null value.");
-        if (once.get()) {
+        if (done) {
             return false;
         }
         if (fusionMode == QueueSubscription.NONE) {
@@ -333,21 +330,19 @@ public boolean offer(@NonNull T t) {
     @Override
     public void onError(@NonNull Throwable t) {
         ExceptionHelper.nullCheck(t, "onError called with a null Throwable.");
-        if (once.compareAndSet(false, true)) {
+        if (!done) {
             error = t;
             done = true;
             drain();
-        } else {
-            RxJavaPlugins.onError(t);
+            return;
         }
+        RxJavaPlugins.onError(t);
     }
 
     @Override
     public void onComplete() {
-        if (once.compareAndSet(false, true)) {
-            done = true;
-            drain();
-        }
+        done = true;
+        drain();
     }
 
     @Override
@@ -359,19 +354,19 @@ public boolean hasSubscribers() {
     @Override
     @CheckReturnValue
     public boolean hasThrowable() {
-        return once.get() && error != null;
+        return done && error != null;
     }
 
     @Override
     @CheckReturnValue
     public boolean hasComplete() {
-        return once.get() && error == null;
+        return done && error == null;
     }
 
     @Override
     @CheckReturnValue
     public Throwable getThrowable() {
-        return once.get() ? error : null;
+        return done ? error : null;
     }
 
     @Override
@@ -385,7 +380,7 @@ protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> s) {
                 drain();
             }
         } else {
-            if (once.get() || !refcount) {
+            if (done) {
                 Throwable ex = error;
                 if (ex != null) {
                     s.onError(ex);
@@ -438,7 +433,7 @@ void remove(MulticastSubscription<T> inner) {
                 if (refcount) {
                     if (subscribers.compareAndSet(a, TERMINATED)) {
                         SubscriptionHelper.cancel(upstream);
-                        once.set(true);
+                        done = true;
                         break;
                     }
                 } else {
@@ -607,19 +602,9 @@ static final class MulticastSubscription<T> extends AtomicLong implements Subscr
         @Override
         public void request(long n) {
             if (SubscriptionHelper.validate(n)) {
-                for (;;) {
-                    long r = get();
-                    if (r == Long.MIN_VALUE || r == Long.MAX_VALUE) {
-                        break;
-                    }
-                    long u = r + n;
-                    if (u < 0L) {
-                        u = Long.MAX_VALUE;
-                    }
-                    if (compareAndSet(r, u)) {
-                        parent.drain();
-                        break;
-                    }
+                long r = BackpressureHelper.addCancel(this, n);
+                if (r != Long.MIN_VALUE && r != Long.MAX_VALUE) {
+                    parent.drain();
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index aa3402ec13..1c92e9d0ef 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -1101,10 +1101,6 @@ void trim() {
                     break;
                 }
                 TimedNode<T> next = h.get();
-                if (next == null) {
-                    head = h;
-                    break;
-                }
 
                 if (next.time > limit) {
                     head = h;
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
index abc51887f8..61cf92cba3 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
@@ -151,7 +151,7 @@ public final class BehaviorSubject<T> extends Subject<T> {
 
     final AtomicReference<Object> value;
 
-    final AtomicReference<BehaviorDisposable<T>[]> subscribers;
+    final AtomicReference<BehaviorDisposable<T>[]> observers;
 
     @SuppressWarnings("rawtypes")
     static final BehaviorDisposable[] EMPTY = new BehaviorDisposable[0];
@@ -208,7 +208,7 @@ public static <T> BehaviorSubject<T> create() {
         this.lock = new ReentrantReadWriteLock();
         this.readLock = lock.readLock();
         this.writeLock = lock.writeLock();
-        this.subscribers = new AtomicReference<>(EMPTY);
+        this.observers = new AtomicReference<>(EMPTY);
         this.value = new AtomicReference<>(defaultValue);
         this.terminalEvent = new AtomicReference<>();
     }
@@ -249,7 +249,7 @@ public void onNext(T t) {
         }
         Object o = NotificationLite.next(t);
         setCurrent(o);
-        for (BehaviorDisposable<T> bs : subscribers.get()) {
+        for (BehaviorDisposable<T> bs : observers.get()) {
             bs.emitNext(o, index);
         }
     }
@@ -281,12 +281,12 @@ public void onComplete() {
     @Override
     @CheckReturnValue
     public boolean hasObservers() {
-        return subscribers.get().length != 0;
+        return observers.get().length != 0;
     }
 
     @CheckReturnValue
     /* test support*/ int subscriberCount() {
-        return subscribers.get().length;
+        return observers.get().length;
     }
 
     @Override
@@ -342,7 +342,7 @@ public boolean hasValue() {
 
     boolean add(BehaviorDisposable<T> rs) {
         for (;;) {
-            BehaviorDisposable<T>[] a = subscribers.get();
+            BehaviorDisposable<T>[] a = observers.get();
             if (a == TERMINATED) {
                 return false;
             }
@@ -351,7 +351,7 @@ boolean add(BehaviorDisposable<T> rs) {
             BehaviorDisposable<T>[] b = new BehaviorDisposable[len + 1];
             System.arraycopy(a, 0, b, 0, len);
             b[len] = rs;
-            if (subscribers.compareAndSet(a, b)) {
+            if (observers.compareAndSet(a, b)) {
                 return true;
             }
         }
@@ -360,7 +360,7 @@ boolean add(BehaviorDisposable<T> rs) {
     @SuppressWarnings("unchecked")
     void remove(BehaviorDisposable<T> rs) {
         for (;;) {
-            BehaviorDisposable<T>[] a = subscribers.get();
+            BehaviorDisposable<T>[] a = observers.get();
             int len = a.length;
             if (len == 0) {
                 return;
@@ -384,7 +384,7 @@ void remove(BehaviorDisposable<T> rs) {
                 System.arraycopy(a, 0, b, 0, j);
                 System.arraycopy(a, j + 1, b, j, len - j - 1);
             }
-            if (subscribers.compareAndSet(a, b)) {
+            if (observers.compareAndSet(a, b)) {
                 return;
             }
         }
@@ -393,13 +393,9 @@ void remove(BehaviorDisposable<T> rs) {
     @SuppressWarnings("unchecked")
     BehaviorDisposable<T>[] terminate(Object terminalValue) {
 
-        BehaviorDisposable<T>[] a = subscribers.getAndSet(TERMINATED);
-        if (a != TERMINATED) {
-            // either this or atomics with lots of allocation
-            setCurrent(terminalValue);
-        }
+        setCurrent(terminalValue);
 
-        return a;
+        return observers.getAndSet(TERMINATED);
     }
 
     void setCurrent(Object o) {
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
index a956035c3d..dfa3032ad3 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
@@ -335,15 +335,13 @@ protected void subscribeActual(Observer<? super T> observer) {
         ReplayDisposable<T> rs = new ReplayDisposable<>(observer, this);
         observer.onSubscribe(rs);
 
-        if (!rs.cancelled) {
-            if (add(rs)) {
-                if (rs.cancelled) {
-                    remove(rs);
-                    return;
-                }
+        if (add(rs)) {
+            if (rs.cancelled) {
+                remove(rs);
+                return;
             }
-            buffer.replay(rs);
         }
+        buffer.replay(rs);
     }
 
     @Override
@@ -571,10 +569,8 @@ void remove(ReplayDisposable<T> rs) {
 
     @SuppressWarnings("unchecked")
     ReplayDisposable<T>[] terminate(Object terminalValue) {
-        if (buffer.compareAndSet(null, terminalValue)) {
-            return observers.getAndSet(TERMINATED);
-        }
-        return TERMINATED;
+        buffer.compareAndSet(null, terminalValue);
+        return observers.getAndSet(TERMINATED);
     }
 
     /**
@@ -1101,10 +1097,6 @@ void trim() {
                     break;
                 }
                 TimedNode<Object> next = h.get();
-                if (next == null) {
-                    head = h;
-                    break;
-                }
 
                 if (next.time > limit) {
                     head = h;
@@ -1284,11 +1276,6 @@ public void replay(ReplayDisposable<T> rs) {
 
             for (;;) {
 
-                if (rs.cancelled) {
-                    rs.index = null;
-                    return;
-                }
-
                 for (;;) {
                     if (rs.cancelled) {
                         rs.index = null;
@@ -1322,10 +1309,6 @@ public void replay(ReplayDisposable<T> rs) {
                     index = n;
                 }
 
-                if (index.get() != null) {
-                    continue;
-                }
-
                 rs.index = index;
 
                 missed = rs.addAndGet(-missed);
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
index cbc9d10320..b3a67a89fe 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
@@ -179,15 +179,16 @@ public void onError(@NonNull Throwable t) {
         if (!checkSubscriptionOnce) {
             checkSubscriptionOnce = true;
             if (upstream.get() == null) {
-                errors.add(new NullPointerException("onSubscribe not called in proper order"));
+                errors.add(new IllegalStateException("onSubscribe not called in proper order"));
             }
         }
         try {
             lastThread = Thread.currentThread();
-            errors.add(t);
 
             if (t == null) {
-                errors.add(new IllegalStateException("onError received a null Throwable"));
+                errors.add(new NullPointerException("onError received a null Throwable"));
+            } else {
+                errors.add(t);
             }
 
             downstream.onError(t);
diff --git a/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java b/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java
index 1c1a6adf59..1cebd84f0d 100644
--- a/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java
@@ -42,10 +42,21 @@ public void valueOfOnCompleteIsNull() {
     public void notEqualsToObject() {
         Notification<Integer> n1 = Notification.createOnNext(0);
         assertNotEquals(0, n1);
+        assertNotEquals(n1, 0);
         Notification<Integer> n2 = Notification.createOnError(new TestException());
         assertNotEquals(0, n2);
+        assertNotEquals(n2, 0);
         Notification<Integer> n3 = Notification.createOnComplete();
         assertNotEquals(0, n3);
+        assertNotEquals(n3, 0);
+    }
+
+    @Test
+    public void twoEqual() {
+        Notification<Integer> n1 = Notification.createOnNext(0);
+        Notification<Integer> n2 = Notification.createOnNext(0);
+        assertEquals(n1, n2);
+        assertEquals(n2, n1);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java b/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
index 72e188fe99..d919e8dfc8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
@@ -39,12 +39,12 @@ public void utilityClass() {
     public void hashSetCallableEnum() {
         // inlined TestHelper.checkEnum due to access restrictions
         try {
-            Method m = Functions.HashSetCallable.class.getMethod("values");
+            Method m = Functions.HashSetSupplier.class.getMethod("values");
             m.setAccessible(true);
-            Method e = Functions.HashSetCallable.class.getMethod("valueOf", String.class);
+            Method e = Functions.HashSetSupplier.class.getMethod("valueOf", String.class);
             e.setAccessible(true);
 
-            for (Enum<HashSetCallable> o : (Enum<HashSetCallable>[])m.invoke(null)) {
+            for (Enum<HashSetSupplier> o : (Enum<HashSetSupplier>[])m.invoke(null)) {
                 assertSame(o, e.invoke(null, o.name()));
             }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java b/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
index e87bfd315a..abc3332381 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
@@ -25,6 +25,16 @@ public void offer() {
         TestHelper.assertNoOffer(new CancellableQueueFuseable<>());
     }
 
+    @Test
+    public void pollClear() throws Throwable {
+        CancellableQueueFuseable<Object> qs = new CancellableQueueFuseable<>();
+
+        assertNull(qs.poll());
+
+        qs.clear();
+        assertNull(qs.poll());
+    }
+
     @Test
     public void cancel() {
         CancellableQueueFuseable<Object> qs = new CancellableQueueFuseable<>();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposableTest.java
new file mode 100644
index 0000000000..5604005992
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposableTest.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.observers.TestObserver;
+
+public class DeferredScalarDisposableTest extends RxJavaTest {
+
+    @Test
+    public void tryDispose() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        DeferredScalarDisposable<Integer> d = new DeferredScalarDisposable<>(to);
+        to.onSubscribe(d);
+
+        assertTrue(d.tryDispose());
+        assertFalse(d.tryDispose());
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserverTest.java
new file mode 100644
index 0000000000..69b4524123
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserverTest.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.Disposable;
+
+public class FutureMultiObserverTest extends RxJavaTest {
+
+    @Test
+    public void cancelBeforeOnSubscribe() {
+        FutureMultiObserver<Integer> f = new FutureMultiObserver<>();
+
+        assertTrue(f.cancel(true));
+
+        Disposable d = Disposable.empty();
+
+        f.onSubscribe(d);
+
+        assertTrue(d.isDisposed());
+    }
+
+    @Test
+    public void onCompleteJustAfterDispose() {
+        FutureMultiObserver<Integer> f = new FutureMultiObserver<>();
+        Disposable d = Disposable.empty();
+        f.onSubscribe(d);
+        assertTrue(f.cancel(true));
+
+        f.onComplete();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
index a4a8f353c2..e74efba8bd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
@@ -22,11 +22,9 @@
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.subscribers.FutureSubscriber;
-import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.TestHelper;
@@ -157,7 +155,7 @@ public void onSubscribe() throws Exception {
     @Test
     public void cancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final FutureSubscriber<Integer> fo = new FutureSubscriber<>();
+            final FutureObserver<Integer> fo = new FutureObserver<>();
 
             Runnable r = new Runnable() {
                 @Override
@@ -188,7 +186,7 @@ public void onErrorCancelRace() {
         RxJavaPlugins.setErrorHandler(Functions.emptyConsumer());
         try {
             for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-                final FutureSubscriber<Integer> fo = new FutureSubscriber<>();
+                final FutureObserver<Integer> fo = new FutureObserver<>();
 
                 final TestException ex = new TestException();
 
@@ -218,10 +216,10 @@ public void onCompleteCancelRace() {
         RxJavaPlugins.setErrorHandler(Functions.emptyConsumer());
         try {
             for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-                final FutureSubscriber<Integer> fo = new FutureSubscriber<>();
+                final FutureObserver<Integer> fo = new FutureObserver<>();
 
                 if (i % 3 == 0) {
-                    fo.onSubscribe(new BooleanSubscription());
+                    fo.onSubscribe(Disposable.empty());
                 }
 
                 if (i % 2 == 0) {
@@ -288,6 +286,22 @@ public void onCompleteOnError() throws Exception {
         }
     }
 
+    @Test
+    public void onNextCompleteOnError() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            fo.onNext(1);
+            fo.onComplete();
+            fo.onError(new TestException("One"));
+
+            assertEquals((Integer)1, fo.get(5, TimeUnit.MILLISECONDS));
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
     @Test
     public void cancelOnError() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -364,4 +378,22 @@ public void getTimedOut() throws Exception {
             assertEquals(timeoutMessage(1, TimeUnit.NANOSECONDS), expected.getMessage());
         }
     }
+
+    @Test
+    public void cancelOnSubscribeRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            final FutureObserver<Integer> fo = new FutureObserver<>();
+
+            Runnable r = new Runnable() {
+                @Override
+                public void run() {
+                    fo.cancel(false);
+                }
+            };
+
+            Disposable d = Disposable.empty();
+
+            TestHelper.race(r, () -> fo.onSubscribe(d));
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverTest.java
new file mode 100644
index 0000000000..84b9d14360
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverTest.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class InnerQueuedObserverTest extends RxJavaTest {
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(new InnerQueuedObserver<>(null, 1));
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableTest.java
similarity index 96%
rename from src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
rename to src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableTest.java
index 051dd4e364..f32196364d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableabTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableTest.java
@@ -27,7 +27,7 @@
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
-public class CompletableAndThenCompletableabTest extends RxJavaTest {
+public class CompletableAndThenCompletableTest extends RxJavaTest {
     @Test
     public void andThenCompletableCompleteComplete() {
         Completable.complete()
@@ -177,4 +177,9 @@ public void run() throws Exception {
             assertFalse("The second Completable was interrupted!", interrupted[0]);
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeCompletable(c -> c.andThen(c));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
index b41086ce3b..aaf925df78 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
@@ -300,4 +300,9 @@ public void run() throws Exception {
             assertFalse("The second Completable was interrupted!", interrupted[0]);
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.<Completable>checkDoubleOnSubscribeFlowableToCompletable(f -> Completable.concat(f));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java
index 32b5a85aa9..3ef469b121 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java
@@ -25,7 +25,7 @@
 import io.reactivex.rxjava3.functions.Action;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subjects.PublishSubject;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
@@ -138,4 +138,9 @@ public void run() throws Exception {
 
         assertEquals(0, call[0]);
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeCompletable(c -> c.unsubscribeOn(Schedulers.computation()));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
index 1f4df16f44..7c979d4881 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
@@ -23,6 +23,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableFromActionTest extends RxJavaTest {
     @Test
@@ -138,4 +140,31 @@ public void disposedUpfront() throws Throwable {
 
         verify(run, never()).run();
     }
+
+    @Test
+    public void disposeWhileRunningComplete() {
+        TestObserver<Void> to = new TestObserver<>();
+
+        Completable.fromAction(() -> {
+            to.dispose();
+        })
+        .subscribeWith(to)
+        .assertEmpty();
+    }
+
+    @Test
+    public void disposeWhileRunningError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestObserver<Void> to = new TestObserver<>();
+
+            Completable.fromAction(() -> {
+                to.dispose();
+                throw new TestException();
+            })
+            .subscribeWith(to)
+            .assertEmpty();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
index 2559f09187..a1a7298e03 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
@@ -22,6 +22,8 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class CompletableFromRunnableTest extends RxJavaTest {
     @Test
@@ -137,4 +139,31 @@ public void disposedUpfront() throws Throwable {
 
         verify(run, never()).run();
     }
+
+    @Test
+    public void disposeWhileRunningComplete() {
+        TestObserver<Void> to = new TestObserver<>();
+
+        Completable.fromRunnable(() -> {
+            to.dispose();
+        })
+        .subscribeWith(to)
+        .assertEmpty();
+    }
+
+    @Test
+    public void disposeWhileRunningError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestObserver<Void> to = new TestObserver<>();
+
+            Completable.fromRunnable(() -> {
+                to.dispose();
+                throw new TestException();
+            })
+            .subscribeWith(to)
+            .assertEmpty();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
index bacfc8521a..1f392a9f7c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
@@ -14,11 +14,14 @@
 package io.reactivex.rxjava3.internal.operators.completable;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.operators.completable.CompletableMergeIterable.MergeCompletableObserver;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.PublishSubject;
@@ -124,4 +127,9 @@ public void remove() {
 
         to.assertEmpty();
     }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(new MergeCompletableObserver(new TestObserver<Void>(), new CompositeDisposable(), new AtomicInteger()));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
index 3482a53409..80f43a7a35 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
@@ -16,6 +16,7 @@
 import static org.junit.Assert.*;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
@@ -25,9 +26,11 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.AtomicThrowable;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class CompletableMergeTest extends RxJavaTest {
@@ -593,4 +596,33 @@ public Completable apply(Flowable<Integer> upstream) {
             }
         });
     }
+
+    @Test
+    public void iterableCompleteLater() {
+        CompletableSubject cs = CompletableSubject.create();
+
+        TestObserver<Void> to = Completable.mergeDelayError(Arrays.asList(cs, cs, cs))
+        .test();
+
+        to.assertEmpty();
+
+        cs.onComplete();
+
+        to.assertResult();
+    }
+
+    @Test
+    public void terminalDisposed() {
+        TestHelper.checkDisposed(new CompletableMergeArrayDelayError.TryTerminateAndReportDisposable(new AtomicThrowable()));
+    }
+
+    @Test
+    public void innerDisposed() {
+        TestHelper.checkDisposed(new CompletableMergeArray.InnerCompletableObserver(new TestObserver<Void>(), new AtomicBoolean(), new CompositeDisposable(), 1));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.<Completable>checkDoubleOnSubscribeFlowableToCompletable(f -> Completable.merge(f));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
index 0657a15474..bae0033d30 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
@@ -25,6 +25,7 @@
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.exceptions.TestException;
@@ -660,4 +661,34 @@ public void subscribe(Subscriber<? super Integer> subscriber) {
         .test()
         .assertResult(1);
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.amb(Arrays.asList(Flowable.never(), Flowable.never())));
+    }
+
+    @Test
+    public void requestAfterCancel() {
+        Flowable.amb(Arrays.asList(Flowable.never(), Flowable.never()))
+        .subscribe(new FlowableSubscriber<Object>() {
+
+            @Override
+            public void onNext(@NonNull Object t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                s.cancel();
+                s.request(1);
+            }
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
index 87a0eeaf38..5abdd7bf9d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
@@ -34,7 +34,7 @@
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableBufferTimed.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subscribers.*;
 import io.reactivex.rxjava3.testsupport.TestHelper;
@@ -2388,4 +2388,112 @@ public List<Object> get() throws Exception {
                 .assertFailure(TestException.class)
         ;
     }
+
+    @Test
+    public void exactBadRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().buffer(1));
+    }
+
+    @Test
+    public void skipBadRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().buffer(1, 2));
+    }
+
+    @Test
+    public void overlapBadRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().buffer(2, 1));
+    }
+
+    @Test
+    public void bufferExactBoundedOnNextAfterDispose() {
+        TestSubscriber<Object> ts = new TestSubscriber<>();
+
+        Flowable.unsafeCreate(s -> {
+            s.onSubscribe(new BooleanSubscription());
+            ts.cancel();
+            s.onNext(1);
+        })
+        .buffer(1, TimeUnit.MINUTES, 2)
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
+
+    @Test
+    public void boundaryCloseCompleteRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            BehaviorProcessor<Integer> bp = BehaviorProcessor.createDefault(1);
+            PublishProcessor<Integer> pp = PublishProcessor.create();
+
+            TestSubscriber<List<Integer>> ts = bp
+                    .buffer(BehaviorProcessor.createDefault(0), v -> pp)
+                    .test();
+
+            TestHelper.race(
+                    () -> bp.onComplete(),
+                    () -> pp.onComplete()
+            );
+
+            ts.assertResult(Arrays.asList(1));
+        }
+    }
+
+    @Test
+    public void doubleOnSubscribeStartEnd() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.buffer(Flowable.never(), v -> Flowable.never()));
+    }
+
+    @Test
+    public void cancel() {
+        TestHelper.checkDisposed(Flowable.never().buffer(Flowable.never(), v -> Flowable.never()));
+    }
+
+    @Test
+    public void startEndCancelAfterOneBuffer() {
+        BehaviorProcessor.createDefault(1)
+        .buffer(BehaviorProcessor.createDefault(2), v -> Flowable.just(1))
+        .takeUntil(v -> true)
+        .test()
+        .assertResult(Arrays.asList());
+    }
+
+    @Test
+    public void startEndCompleteOnBoundary() {
+        Flowable.empty()
+        .buffer(Flowable.never(), v -> Flowable.just(1))
+        .take(1)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void startEndBackpressure() {
+        BehaviorProcessor.createDefault(1)
+        .buffer(BehaviorProcessor.createDefault(2), v -> Flowable.just(1))
+        .test(1L)
+        .assertValuesOnly(Arrays.asList());
+    }
+
+    @Test
+    public void startEndBackpressureMoreWork() {
+        PublishProcessor<Integer> bp = PublishProcessor.create();
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+        AtomicInteger counter = new AtomicInteger();
+
+        TestSubscriber<List<Integer>> ts = bp
+        .buffer(pp, v -> Flowable.just(1))
+        .doOnNext(v -> {
+            if (counter.getAndIncrement() == 0) {
+                pp.onNext(2);
+                pp.onComplete();
+            }
+        })
+        .test(1L);
+
+        pp.onNext(1);
+        bp.onNext(1);
+
+        ts
+        .assertValuesOnly(Arrays.asList());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
index a317055889..b736b48122 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
@@ -511,4 +511,18 @@ public void backpressure() {
         .requestMore(3)
         .assertResult(1, 2, 3, 4, 5);
     }
+
+    @Test
+    public void addRemoveRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            Flowable<Object> f = Flowable.never().cache();
+
+            TestSubscriber<Object> ts = f.test();
+
+            TestHelper.race(
+                    () -> ts.cancel(),
+                    () -> f.test()
+            );
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
index 302ae3757b..06b29eadbe 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
@@ -32,6 +32,7 @@
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableZipTest.ArgsToString;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.*;
@@ -1394,7 +1395,7 @@ public Object apply(Object[] a) throws Exception {
     public void combine2Flowable2Errors() throws Exception {
         List<Throwable> errors = TestHelper.trackPluginErrors();
         try {
-            TestSubscriber<Object> testObserver = TestSubscriber.create();
+            TestSubscriber<Object> testSubscriber = TestSubscriber.create();
 
             TestScheduler testScheduler = new TestScheduler();
 
@@ -1459,11 +1460,11 @@ public void run() throws Exception {
                             System.out.println("combineLatestDelayError: doFinally");
                         }
                     })
-                    .subscribe(testObserver);
+                    .subscribe(testSubscriber);
 
             testScheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);
 
-            testObserver.awaitDone(5, TimeUnit.SECONDS);
+            testSubscriber.awaitDone(5, TimeUnit.SECONDS);
 
             assertTrue(errors.toString(), errors.isEmpty());
         } finally {
@@ -1558,4 +1559,230 @@ public Integer apply(Object[] t) throws Throwable {
         .test()
         .assertResult(2);
     }
+
+    @Test
+    public void FlowableSourcesInIterable() {
+        Flowable<Integer> source = new Flowable<Integer>() {
+            @Override
+            public void subscribeActual(Subscriber<? super Integer> s) {
+                Flowable.just(1).subscribe(s);
+            }
+        };
+
+        Flowable.combineLatest(Arrays.asList(source, source), new Function<Object[], Integer>() {
+            @Override
+            public Integer apply(Object[] t) throws Throwable {
+                return 2;
+            }
+        })
+        .test()
+        .assertResult(2);
+    }
+
+    @Test
+    public void onCompleteDisposeRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+            PublishProcessor<Integer> pp = PublishProcessor.create();
+
+            Flowable.combineLatest(pp, Flowable.never(), (a, b) -> a)
+            .subscribe(ts);
+
+            TestHelper.race(() -> pp.onComplete(), () -> ts.cancel());
+        }
+    }
+
+    @Test
+    public void onErrorDisposeDelayErrorRace() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestException ex = new TestException();
+
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+
+                TestSubscriberEx<Object[]> ts = new TestSubscriberEx<>();
+                AtomicReference<Subscriber<? super Object>> ref = new AtomicReference<>();
+                Flowable<Object> f = new Flowable<Object>() {
+                    @Override
+                    public void subscribeActual(Subscriber<? super Object> s) {
+                        ref.set(s);
+                    }
+                };
+
+                Flowable.combineLatestDelayError(Arrays.asList(f, Flowable.never()), (a) -> a)
+                .subscribe(ts);
+
+                ref.get().onSubscribe(new BooleanSubscription());
+
+                TestHelper.race(() -> ref.get().onError(ex), () -> ts.cancel());
+
+                if (ts.errors().isEmpty()) {
+                    TestHelper.assertUndeliverable(errors, 0, TestException.class);
+                }
+            }
+        });
+    }
+
+    @Test
+    public void doneButNotEmpty() {
+        PublishProcessor<Integer> pp1 = PublishProcessor.create();
+        PublishProcessor<Integer> pp2 = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = Flowable.combineLatest(pp1, pp2, (a, b) -> a + b)
+        .doOnNext(v -> {
+            if (v == 2) {
+                pp2.onNext(3);
+                pp2.onComplete();
+                pp1.onComplete();
+            }
+        })
+        .test();
+
+        pp1.onNext(1);
+        pp2.onNext(1);
+
+        ts.assertResult(2, 4);
+    }
+
+    @Test
+    public void iterableNullPublisher() {
+        Flowable.combineLatest(Arrays.asList(Flowable.never(), null), (a) -> a)
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.combineLatest(Flowable.never(), Flowable.never(), (a, b) -> a));
+    }
+
+    @Test
+    public void syncFusionRejected() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.SYNC);
+
+        Flowable.combineLatest(Flowable.never(), Flowable.never(), (a, b) -> a)
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE);
+    }
+
+    @Test
+    public void bounderyFusionRejected() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY | QueueFuseable.BOUNDARY);
+
+        Flowable.combineLatest(Flowable.never(), Flowable.never(), (a, b) -> a)
+        .subscribe(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE);
+    }
+
+    @Test
+    public void fusedNormal() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Flowable.combineLatest(Flowable.just(1), Flowable.just(2), (a, b) -> a + b)
+        .subscribeWith(ts)
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertResult(3);
+    }
+
+    @Test
+    public void fusedToParallel() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Flowable.combineLatest(Flowable.just(1), Flowable.just(2), (a, b) -> a + b)
+        .parallel()
+        .sequential()
+        .subscribeWith(ts)
+        .assertResult(3);
+    }
+
+    @Test
+    public void fusedToParallel2() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Flowable.combineLatest(Flowable.just(1), Flowable.just(2), (a, b) -> a + b)
+        .compose(TestHelper.flowableStripBoundary())
+        .parallel()
+        .sequential()
+        .subscribeWith(ts)
+        .assertResult(3);
+    }
+
+    @Test
+    public void fusedError() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Flowable.combineLatest(Flowable.just(1), Flowable.<Integer>error(new TestException()), (a, b) -> a + b)
+        .subscribeWith(ts)
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void nonFusedMoreWorkBeforeTermination() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = Flowable.combineLatest(pp, Flowable.just(1), (a, b) -> a + b)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+                pp.onComplete();
+            }
+        })
+        .test();
+
+        pp.onNext(0);
+
+        ts.assertResult(1, 3);
+    }
+
+    @Test
+    public void nonFusedDelayErrorMoreWorkBeforeTermination() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<List<Object>> ts = Flowable.combineLatestDelayError(Arrays.asList(pp, Flowable.just(1)), a -> Arrays.asList(a))
+        .doOnNext(v -> {
+            if (((Integer)v.get(0)) == 0) {
+                pp.onNext(2);
+                pp.onComplete();
+            }
+        })
+        .test();
+
+        pp.onNext(0);
+
+        ts.assertResult(Arrays.asList(0, 1), Arrays.asList(2, 1));
+    }
+
+    @Test
+    public void fusedCombinerCrashError() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        Flowable.combineLatest(Flowable.just(1), Flowable.just(1), (a, b) -> { throw new TestException(); })
+        .subscribeWith(ts)
+        .assertFuseable()
+        .assertFusionMode(QueueFuseable.ASYNC)
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void fusedCombinerCrashError2() {
+        Flowable.combineLatest(Flowable.just(1), Flowable.just(1), (a, b) -> { throw new TestException(); })
+        .compose(TestHelper.flowableStripBoundary())
+        .rebatchRequests(10)
+        .test()
+        .assertFailure(TestException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
index b8c2eaaff3..7d6392b318 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
@@ -1395,4 +1395,40 @@ public void publisherDelayErrorMaxConcurrency() {
         .test()
         .assertFailure(TestException.class, 1, 2, 3, 4, 5);
     }
+
+    @Test
+    public void innerSyncFused() {
+        Flowable.just(1)
+        .hide()
+        .concatMapEagerDelayError(v -> Flowable.range(1, 10), true, 1, 1)
+        .test()
+        .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().concatMapEagerDelayError(v -> Flowable.never(), false));
+    }
+
+    @Test
+    public void cancelAfterOnNext() {
+        Flowable.just(1)
+        .hide()
+        .concatMapEagerDelayError(v -> Flowable.range(1, 5).hide(), true)
+        .takeUntil(v -> true)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void noInnerQueue() {
+        Flowable.just(1)
+        .hide()
+        .concatMapEagerDelayError(v -> Flowable.fromPublisher(s -> { }), true)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(1L)
+        .assertEmpty()
+        ;
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
index 0cd7562199..bb01b50a20 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
@@ -18,17 +18,18 @@
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.*;
 
 import org.junit.Test;
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
-import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -1088,4 +1089,141 @@ public Publisher<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void fusionRejected() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+
+        TestHelper.rejectFlowableFusion()
+        .concatMap(v -> Flowable.never(), 2, ImmediateThinScheduler.INSTANCE)
+        .subscribe(ts);
+    }
+
+    @Test
+    public void fusionRejectedDelayErrorr() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+
+        TestHelper.rejectFlowableFusion()
+        .concatMapDelayError(v -> Flowable.never(), true, 2, ImmediateThinScheduler.INSTANCE)
+        .subscribe(ts);
+    }
+
+    @Test
+    public void scalarInnerJustDispose() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.just(1)
+        .hide()
+        .concatMap(v -> Flowable.fromCallable(() -> {
+            ts.cancel();
+            return 1;
+        }), 2, ImmediateThinScheduler.INSTANCE)
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
+
+    @Test
+    public void scalarInnerJustDisposeDelayError() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.just(1)
+        .hide()
+        .concatMapDelayError(v -> Flowable.fromCallable(() -> {
+            ts.cancel();
+            return 1;
+        }), true, 2, ImmediateThinScheduler.INSTANCE)
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
+
+    static final class EmptyDisposingFlowable extends Flowable<Object>
+    implements Supplier<Object> {
+        final TestSubscriber<Object> ts;
+        EmptyDisposingFlowable(TestSubscriber<Object> ts) {
+            this.ts = ts;
+        }
+
+        @Override
+        protected void subscribeActual(@NonNull Subscriber<? super @NonNull Object> subscriber) {
+            EmptySubscription.complete(subscriber);
+        }
+
+        @Override
+        public @NonNull Object get() throws Throwable {
+            ts.cancel();
+            return null;
+        }
+    }
+
+    @Test
+    public void scalarInnerEmptyDisposeDelayError() {
+        TestSubscriber<Object> ts = new TestSubscriber<>();
+
+        Flowable.just(1)
+        .hide()
+        .concatMapDelayError(v -> new EmptyDisposingFlowable(ts),
+                true, 2, ImmediateThinScheduler.INSTANCE
+        )
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
+
+    @Test
+    public void mainErrorInnerNextIgnoreCancel() {
+        AtomicReference<Subscriber<? super Integer>> ref = new AtomicReference<>();
+
+        Flowable.just(1).concatWith(Flowable.<Integer>error(new TestException()))
+        .concatMap(v -> Flowable.<Integer>fromPublisher(ref::set), 2, ImmediateThinScheduler.INSTANCE)
+        .doOnError(e -> {
+            ref.get().onSubscribe(new BooleanSubscription());
+            ref.get().onNext(1);
+        })
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void scalarSupplierMainError() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp.concatMap(v -> Flowable.fromCallable(() -> {
+            pp.onError(new TestException());
+            return 2;
+        }), 2, ImmediateThinScheduler.INSTANCE)
+        .test()
+        ;
+
+        pp.onNext(1);
+
+        ts.assertFailure(TestException.class);
+    }
+
+    @Test
+    public void mainErrorInnerErrorRace() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestException ex1 = new TestException();
+            TestException ex2 = new TestException();
+
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+                AtomicReference<Subscriber<? super Integer>> ref1 = new AtomicReference<>();
+                AtomicReference<Subscriber<? super Integer>> ref2 = new AtomicReference<>();
+
+                TestSubscriber<Integer> ts = Flowable.<Integer>fromPublisher(ref1::set)
+                .concatMap(v -> Flowable.<Integer>fromPublisher(ref2::set), 2, ImmediateThinScheduler.INSTANCE)
+                .test();
+
+                ref1.get().onSubscribe(new BooleanSubscription());
+                ref1.get().onNext(1);
+                ref2.get().onSubscribe(new BooleanSubscription());
+
+                TestHelper.race(() -> ref1.get().onError(ex1), () -> ref2.get().onError(ex2));
+
+                ts.assertError(RuntimeException.class);
+                errors.clear();
+            }
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
index e815c3675e..4ff32a9eb4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
@@ -25,6 +25,7 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.WeakScalarSubscription;
+import io.reactivex.rxjava3.processors.UnicastProcessor;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
@@ -252,4 +253,23 @@ public Publisher<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void asyncFusedSource() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        up.onNext(1);
+        up.onComplete();
+
+        up.concatMap(v -> Flowable.just(1).hide())
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void scalarCallableSource() {
+        Flowable.fromCallable(() -> 1)
+        .concatMap(v -> Flowable.just(1))
+        .test()
+        .assertResult(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
index 208f7b1b51..282179b9fe 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
@@ -17,6 +17,7 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.concurrent.*;
@@ -27,7 +28,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -1644,4 +1645,28 @@ public void run() throws Exception {
 
         assertEquals(0, counter.get());
     }
+
+    @Test
+    public void arrayDelayErrorMultipleErrors() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+
+        Flowable.concatArrayDelayError(Flowable.error(new IOException()), Flowable.error(new TestException()))
+        .subscribe(ts);
+
+        ts.assertFailure(CompositeException.class);
+
+        TestHelper.assertCompositeExceptions(ts, IOException.class, TestException.class);
+    }
+
+    @Test
+    public void arrayDelayErrorMultipleNullErrors() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+
+        Flowable.concatArrayDelayError(null, null)
+        .subscribe(ts);
+
+        ts.assertFailure(CompositeException.class);
+
+        TestHelper.assertCompositeExceptions(ts, NullPointerException.class, NullPointerException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
index 38b05b0920..8ca745dc0b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
@@ -17,16 +17,18 @@
 
 import java.io.IOException;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Cancellable;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableCreateTest extends RxJavaTest {
@@ -1063,4 +1065,66 @@ public void subscribe(FlowableEmitter<Object> emitter) throws Exception {
             }, entry.getKey()).test().assertEmpty();
         }
     }
+
+    @Test
+    public void serializedMissingMoreWorkWithComplete() {
+        AtomicReference<FlowableEmitter<Integer>> ref = new AtomicReference<>();
+
+        Flowable.<Integer>create(emitter -> {
+            emitter = emitter.serialize();
+            ref.set(emitter);
+            assertEquals(Long.MAX_VALUE, emitter.requested());
+            emitter.onNext(1);
+        }, BackpressureStrategy.MISSING)
+        .doOnNext(v -> {
+            if (v == 1) {
+                ref.get().onNext(2);
+                ref.get().onComplete();
+            }
+        })
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.create(e -> { }, BackpressureStrategy.BUFFER));
+    }
+
+    @Test
+    public void tryOnErrorNull() {
+        Flowable.create(emitter -> emitter.tryOnError(null), BackpressureStrategy.MISSING)
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void serializedCompleteOnNext() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.<Integer>create(emitter -> {
+            emitter = emitter.serialize();
+
+            emitter.onComplete();
+            emitter.onNext(1);
+        }, BackpressureStrategy.MISSING)
+        .subscribe(ts);
+
+        ts.assertResult();
+    }
+
+    @Test
+    public void serializedCancelOnNext() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.<Integer>create(emitter -> {
+            emitter = emitter.serialize();
+
+            ts.cancel();
+            emitter.onNext(1);
+        }, BackpressureStrategy.MISSING)
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
index bb9faa4bca..fba8aedbac 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
@@ -343,4 +343,19 @@ public void subscribe(FlowableEmitter<Boolean> emitter) throws Exception {
             exec.shutdown();
         }
     }
+
+    @Test
+    public void doubleOnSubscribeMain() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.delaySubscription(Flowable.empty()));
+    }
+
+    @Test
+    public void doubleOnSubscribeOther() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> PublishProcessor.create().delaySubscription(f));
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(PublishProcessor.create().delaySubscription(Flowable.empty()));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
index d4578db529..2571dc481e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
@@ -223,7 +223,7 @@ protected void subscribeActual(Subscriber<? super Notification<Object>> subscrib
     }
 
     @Test
-    public void nonNotificationInstanceAfterDispose() {
+    public void notificationInstanceAfterDispose() {
         new Flowable<Notification<Object>>() {
             @Override
             protected void subscribeActual(Subscriber<? super Notification<Object>> subscriber) {
@@ -236,4 +236,20 @@ protected void subscribeActual(Subscriber<? super Notification<Object>> subscrib
         .test()
         .assertResult();
     }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void nonNotificationInstanceAfterDispose() {
+        new Flowable<Object>() {
+            @Override
+            protected void subscribeActual(Subscriber<? super Object> subscriber) {
+                subscriber.onSubscribe(new BooleanSubscription());
+                subscriber.onNext(Notification.createOnComplete());
+                subscriber.onNext(1);
+            }
+        }
+        .dematerialize(v -> (Notification<Object>)v)
+        .test()
+        .assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
index 850c531203..3610593751 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
@@ -208,7 +208,7 @@ public void syncFusedConditional() {
 
         Flowable.range(1, 5)
         .doFinally(this)
-        .filter(Functions.alwaysTrue())
+        .compose(TestHelper.conditional())
         .subscribe(ts);
 
         ts.assertFusionMode(QueueFuseable.SYNC)
@@ -237,7 +237,7 @@ public void nonFusedConditional() {
 
         Flowable.range(1, 5).hide()
         .doFinally(this)
-        .filter(Functions.alwaysTrue())
+        .compose(TestHelper.conditional())
         .subscribe(ts);
 
         ts.assertFusionMode(QueueFuseable.NONE)
@@ -252,7 +252,7 @@ public void syncFusedBoundaryConditional() {
 
         Flowable.range(1, 5)
         .doFinally(this)
-        .filter(Functions.alwaysTrue())
+        .compose(TestHelper.conditional())
         .subscribe(ts);
 
         ts.assertFusionMode(QueueFuseable.NONE)
@@ -270,7 +270,7 @@ public void asyncFusedConditional() {
 
         up
         .doFinally(this)
-        .filter(Functions.alwaysTrue())
+        .compose(TestHelper.conditional())
         .subscribe(ts);
 
         ts.assertFusionMode(QueueFuseable.ASYNC)
@@ -288,7 +288,7 @@ public void asyncFusedBoundaryConditional() {
 
         up
         .doFinally(this)
-        .filter(Functions.alwaysTrue())
+        .compose(TestHelper.conditional())
         .subscribe(ts);
 
         ts.assertFusionMode(QueueFuseable.NONE)
@@ -512,4 +512,31 @@ public void run() throws Exception {
 
         assertEquals(Arrays.asList("onNext", "onComplete", "finally"), list);
     }
+
+    @Test
+    public void fusionRejected() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        TestHelper.rejectFlowableFusion()
+        .doFinally(() -> { })
+        .subscribeWith(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE);
+    }
+
+    @Test
+    public void fusionRejectedConditional() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>();
+        ts.setInitialFusionMode(QueueFuseable.ANY);
+
+        TestHelper.rejectFlowableFusion()
+        .doFinally(() -> { })
+        .compose(TestHelper.conditional())
+        .subscribeWith(ts);
+
+        ts.assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
index 1c87d6f3b3..3d14dd0eb2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
@@ -16,15 +16,15 @@
 import static org.junit.Assert.*;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.TestObserver;
@@ -510,6 +510,23 @@ protected void subscribeActual(CompletableObserver observer) {
 
     @Test
     public void delayErrorMaxConcurrency() {
+        Flowable.range(1, 3)
+        .flatMapCompletable(new Function<Integer, CompletableSource>() {
+            @Override
+            public CompletableSource apply(Integer v) throws Exception {
+                if (v == 2) {
+                    return Completable.error(new TestException());
+                }
+                return Completable.complete();
+            }
+        }, true, 1)
+        .toFlowable()
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void delayErrorMaxConcurrencyCompletable() {
         Flowable.range(1, 3)
         .flatMapCompletable(new Function<Integer, CompletableSource>() {
             @Override
@@ -570,4 +587,59 @@ public Completable apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.flatMapCompletable(v -> Completable.never()).toFlowable());
+    }
+
+    @Test
+    public void doubleOnSubscribeCompletable() {
+        TestHelper.checkDoubleOnSubscribeFlowableToCompletable(f -> f.flatMapCompletable(v -> Completable.never()));
+    }
+
+    @Test
+    public void cancelWhileMapping() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishProcessor<Integer> pp1 = PublishProcessor.create();
+
+            TestSubscriber<Object> ts = new TestSubscriber<>();
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            pp1.flatMapCompletable(v -> {
+                TestHelper.raceOther(() -> {
+                    ts.cancel();
+                }, cdl);
+                return Completable.complete();
+            })
+            .toFlowable()
+            .subscribe(ts);
+
+            pp1.onNext(1);
+
+            cdl.await();
+        }
+    }
+
+    @Test
+    public void cancelWhileMappingCompletable() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishProcessor<Integer> pp1 = PublishProcessor.create();
+
+            TestObserver<Void> to = new TestObserver<>();
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            pp1.flatMapCompletable(v -> {
+                TestHelper.raceOther(() -> {
+                    to.dispose();
+                }, cdl);
+                return Completable.complete();
+            })
+            .subscribe(to);
+
+            pp1.onNext(1);
+
+            cdl.await();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
index 8faad86fef..14a0418d15 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
@@ -22,7 +22,7 @@
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -30,6 +30,7 @@
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -641,4 +642,57 @@ public Maybe<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().flatMapMaybe(v -> Maybe.never()));
+    }
+
+    @Test
+    public void successRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            MaybeSubject<Integer> ss1 = MaybeSubject.create();
+            MaybeSubject<Integer> ss2 = MaybeSubject.create();
+
+            TestSubscriber<Integer> ts = Flowable.just(ss1, ss2).flatMapMaybe(v -> v)
+            .test();
+
+            TestHelper.race(
+                    () -> ss1.onSuccess(1),
+                    () -> ss2.onSuccess(1)
+            );
+
+            ts.assertResult(1, 1);
+        }
+    }
+
+    @Test
+    public void successCompleteRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            MaybeSubject<Integer> ss1 = MaybeSubject.create();
+            MaybeSubject<Integer> ss2 = MaybeSubject.create();
+
+            TestSubscriber<Integer> ts = Flowable.just(ss1, ss2).flatMapMaybe(v -> v)
+            .test();
+
+            TestHelper.race(
+                    () -> ss1.onSuccess(1),
+                    () -> ss2.onComplete()
+            );
+
+            ts.assertResult(1);
+        }
+    }
+
+    @Test
+    public void successShortcut() {
+        MaybeSubject<Integer> ss1 = MaybeSubject.create();
+
+        TestSubscriber<Integer> ts = Flowable.just(ss1).hide().flatMapMaybe(v -> v)
+        .test();
+
+        ss1.onSuccess(1);
+
+        ts.assertResult(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
index 1a0cd3854f..cd34417ea9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
@@ -22,7 +22,7 @@
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -30,6 +30,7 @@
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.SingleSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -541,4 +542,39 @@ public Single<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().flatMapSingle(v -> Single.never()));
+    }
+
+    @Test
+    public void successRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            SingleSubject<Integer> ss1 = SingleSubject.create();
+            SingleSubject<Integer> ss2 = SingleSubject.create();
+
+            TestSubscriber<Integer> ts = Flowable.just(ss1, ss2).flatMapSingle(v -> v)
+            .test();
+
+            TestHelper.race(
+                    () -> ss1.onSuccess(1),
+                    () -> ss2.onSuccess(1)
+            );
+
+            ts.assertResult(1, 1);
+        }
+    }
+
+    @Test
+    public void successShortcut() {
+        SingleSubject<Integer> ss1 = SingleSubject.create();
+
+        TestSubscriber<Integer> ts = Flowable.just(ss1).hide().flatMapSingle(v -> v)
+        .test();
+
+        ss1.onSuccess(1);
+
+        ts.assertResult(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
index 6df4dc7211..1687c2dd79 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
@@ -17,19 +17,22 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
+import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.*;
 
 import org.junit.*;
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
@@ -1150,4 +1153,329 @@ public void innerErrorsMainCancelled() {
 
         assertFalse("Has subscribers?", pp1.hasSubscribers());
     }
+
+    @Test
+    public void innerIsDisposed() {
+        FlowableFlatMap.InnerSubscriber<Integer, Integer> inner = new FlowableFlatMap.InnerSubscriber<>(null, 10, 0L);
+
+        assertFalse(inner.isDisposed());
+
+        inner.dispose();
+
+        assertTrue(inner.isDisposed());
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().flatMap(v -> Flowable.never()));
+    }
+
+    @Test
+    public void signalsAfterMapperCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            new Flowable<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull Subscriber<? super @NonNull Integer> s) {
+                    s.onSubscribe(new BooleanSubscription());
+                    s.onNext(1);
+                    s.onNext(2);
+                    s.onComplete();
+                    s.onError(new IOException());
+                }
+            }
+            .flatMap(v -> {
+                throw new TestException();
+            })
+            .test()
+            .assertFailure(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        });
+    }
+
+    @Test
+    public void scalarQueueTerminate() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        pp
+        .flatMap(v -> Flowable.just(v))
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+                pp.onNext(3);
+            }
+        })
+        .take(2)
+        .subscribe(ts);
+
+        pp.onNext(1);
+
+        ts.assertResult(1, 2);
+    }
+
+    @Test
+    public void scalarQueueCompleteMain() throws Exception {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        CountDownLatch cdl = new CountDownLatch(1);
+        pp
+        .flatMap(v -> Flowable.just(v))
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+                TestHelper.raceOther(() -> pp.onComplete(), cdl);
+            }
+        })
+        .subscribe(ts);
+
+        pp.onNext(1);
+
+        cdl.await();
+        ts.assertResult(1, 2);
+    }
+
+    @Test
+    public void fusedInnerCrash() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = Flowable.just(
+                pp,
+                up.map(v -> {
+                    if (v == 10) {
+                        throw new TestException();
+                    }
+                    return v;
+                })
+                .compose(TestHelper.flowableStripBoundary())
+        )
+        .flatMap(v -> v, true)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+                up.onNext(10);
+            }
+        })
+        .test();
+
+        pp.onNext(1);
+        pp.onComplete();
+
+        ts.assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void fusedInnerCrash2() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = Flowable.just(
+                up.map(v -> {
+                    if (v == 10) {
+                        throw new TestException();
+                    }
+                    return v;
+                })
+                .compose(TestHelper.flowableStripBoundary())
+                , pp
+        )
+        .flatMap(v -> v, true)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+                up.onNext(10);
+            }
+        })
+        .test();
+
+        pp.onNext(1);
+        pp.onComplete();
+
+        ts.assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.flatMap(v -> Flowable.never()));
+    }
+
+    @Test
+    public void allConcurrency() {
+        Flowable.just(1)
+        .hide()
+        .flatMap(v -> Flowable.just(2).hide(), Integer.MAX_VALUE)
+        .test()
+        .assertResult(2);
+    }
+
+    @Test
+    public void allConcurrencyScalarInner() {
+        Flowable.just(1)
+        .hide()
+        .flatMap(v -> Flowable.just(2), Integer.MAX_VALUE)
+        .test()
+        .assertResult(2);
+    }
+
+    @Test
+    public void allConcurrencyScalarInnerEmpty() {
+        Flowable.just(1)
+        .hide()
+        .flatMap(v -> Flowable.empty(), Integer.MAX_VALUE)
+        .test()
+        .assertResult();
+    }
+
+    static final class ScalarEmptyCancel extends Flowable<Integer> implements Supplier<Integer> {
+        final TestSubscriber<?> ts;
+
+        ScalarEmptyCancel(TestSubscriber<?> ts) {
+            this.ts = ts;
+        }
+
+        @Override
+        public @NonNull Integer get() throws Throwable {
+            ts.cancel();
+            return null;
+        }
+
+        @Override
+        protected void subscribeActual(@NonNull Subscriber<@NonNull ? super @NonNull Integer> subscriber) {
+            EmptySubscription.complete(subscriber);
+        }
+    }
+
+    @Test
+    public void someConcurrencyScalarInnerCancel() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.just(1)
+        .hide()
+        .flatMap(v -> new ScalarEmptyCancel(ts))
+        .subscribeWith(ts)
+        .assertEmpty();
+    }
+
+    @Test
+    public void allConcurrencyBackpressured() {
+        Flowable.just(1)
+        .hide()
+        .flatMap(v -> Flowable.just(2), Integer.MAX_VALUE)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(1)
+        .assertResult(2);
+    }
+
+    @Test
+    public void someConcurrencyInnerScalarCancel() {
+        Flowable.just(1)
+        .hide()
+        .flatMap(v -> Flowable.just(2), 2)
+        .takeUntil(v -> true)
+        .test()
+        .assertResult(2);
+    }
+
+    @Test
+    public void scalarInnerOuterOverflow() {
+        new Flowable<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull Subscriber<@NonNull ? super @NonNull Integer> subscriber) {
+                subscriber.onSubscribe(new BooleanSubscription());
+                subscriber.onNext(1);
+                subscriber.onNext(2);
+                subscriber.onNext(3);
+            }
+        }
+        .flatMap(v -> Flowable.just(v), 1)
+        .test(0L)
+        .assertFailure(MissingBackpressureException.class);
+    }
+
+    @Test
+    public void scalarInnerOuterOverflowSlowPath() {
+        AtomicReference<Subscriber<? super Integer>> ref = new AtomicReference<>();
+        new Flowable<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull Subscriber<@NonNull ? super @NonNull Integer> subscriber) {
+                subscriber.onSubscribe(new BooleanSubscription());
+                ref.set(subscriber);
+                subscriber.onNext(1);
+            }
+        }
+        .flatMap(v -> Flowable.just(v), 1)
+        .doOnNext(v -> {
+            if (v == 1) {
+                ref.get().onNext(2);
+                ref.get().onNext(3);
+            }
+        })
+        .test()
+        .assertFailure(MissingBackpressureException.class, 1);
+    }
+
+    @Test
+    public void innerFastPathEmitOverflow() {
+        Flowable.just(1)
+        .hide()
+        .flatMap(v -> new Flowable<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull Subscriber<@NonNull ? super @NonNull Integer> subscriber) {
+                subscriber.onSubscribe(new BooleanSubscription());
+                subscriber.onNext(1);
+                subscriber.onNext(2);
+                subscriber.onNext(3);
+            }
+        }, false, 1, 1)
+        .test(0L)
+        .assertFailure(MissingBackpressureException.class);
+    }
+
+    @Test
+    public void takeFromScalarQueue() {
+        Flowable.just(1)
+        .hide()
+        .flatMap(v -> Flowable.just(2), 2)
+        .takeUntil(v -> true)
+        .test(0L)
+        .requestMore(2)
+        .assertResult(2);
+    }
+
+    @Test
+    public void scalarInnerQueueEmpty() {
+        Flowable.just(1)
+        .concatWith(Flowable.never())
+        .hide()
+        .flatMap(v -> Flowable.just(2), 2)
+        .test(0L)
+        .requestMore(2)
+        .assertValuesOnly(2);
+    }
+
+    @Test
+    public void innerCompletesAfterOnNextInDrainThenCancels() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0L);
+
+        Flowable.just(1)
+        .hide()
+        .flatMap(v -> pp)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onComplete();
+                ts.cancel();
+            }
+        })
+        .subscribe(ts);
+
+        pp.onNext(1);
+
+        ts
+        .requestMore(1)
+        .assertValuesOnly(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
index d9ff63257c..0064f61c3f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
@@ -22,6 +22,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableForEachTest extends RxJavaTest {
 
@@ -72,4 +73,11 @@ public void accept(Throwable e) throws Exception {
         assertEquals(Arrays.asList(1, 2, 3, 4, 5, 100), list);
     }
 
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(
+                Flowable.never()
+                .forEachWhile(v -> true)
+        );
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
index 47c0b815fb..5e05936816 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
@@ -24,7 +24,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
@@ -193,4 +193,11 @@ public void syncFusedRejected() throws Throwable {
 
         verify(action).run();
     }
+
+    @Test
+    public void upstream() {
+        Flowable<?> f = Flowable.fromCompletable(Completable.never());
+        assertTrue(f instanceof HasUpstreamCompletableSource);
+        assertSame(Completable.never(), ((HasUpstreamCompletableSource)f).source());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
index d49111c25b..1880d2be43 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
@@ -19,12 +19,13 @@
 
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.*;
 
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
@@ -962,4 +963,259 @@ public void remove() {
         .assertNoErrors()
         .assertNotComplete();
     }
+
+    @Test
+    public void hasNextCancelsAndCompletesFastPath() {
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.fromIterable(new Iterable<Integer>() {
+            @Override
+            public Iterator<Integer> iterator() {
+                return new Iterator<Integer>() {
+                    int count;
+
+                    @Override
+                    public boolean hasNext() {
+                        if (++count == 2) {
+                            ts.cancel();
+                            return false;
+                        }
+                        return true;
+                    }
+
+                    @Override
+                    public Integer next() {
+                        return 1;
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+        })
+        .subscribe(ts);
+
+        ts.assertValue(1)
+        .assertNoErrors()
+        .assertNotComplete();
+    }
+
+    @Test
+    public void hasNextCancelsAndCompletesSlowPath() {
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(10L);
+
+        Flowable.fromIterable(new Iterable<Integer>() {
+            @Override
+            public Iterator<Integer> iterator() {
+                return new Iterator<Integer>() {
+                    int count;
+
+                    @Override
+                    public boolean hasNext() {
+                        if (++count == 2) {
+                            ts.cancel();
+                            return false;
+                        }
+                        return true;
+                    }
+
+                    @Override
+                    public Integer next() {
+                        return 1;
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+        })
+        .subscribe(ts);
+
+        ts.assertValue(1)
+        .assertNoErrors()
+        .assertNotComplete();
+    }
+
+    @Test
+    public void hasNextCancelsAndCompletesFastPathConditional() {
+        final TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.fromIterable(new Iterable<Integer>() {
+            @Override
+            public Iterator<Integer> iterator() {
+                return new Iterator<Integer>() {
+                    int count;
+
+                    @Override
+                    public boolean hasNext() {
+                        if (++count == 2) {
+                            ts.cancel();
+                            return false;
+                        }
+                        return true;
+                    }
+
+                    @Override
+                    public Integer next() {
+                        return 1;
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+        })
+        .filter(v -> true)
+        .subscribe(ts);
+
+        ts.assertValue(1)
+        .assertNoErrors()
+        .assertNotComplete();
+    }
+
+    @Test
+    public void hasNextCancelsAndCompletesSlowPathConditional() {
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(10);
+
+        Flowable.fromIterable(new Iterable<Integer>() {
+            @Override
+            public Iterator<Integer> iterator() {
+                return new Iterator<Integer>() {
+                    int count;
+
+                    @Override
+                    public boolean hasNext() {
+                        if (++count == 2) {
+                            ts.cancel();
+                            return false;
+                        }
+                        return true;
+                    }
+
+                    @Override
+                    public Integer next() {
+                        return 1;
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+        })
+        .filter(v -> true)
+        .subscribe(ts);
+
+        ts.assertValue(1)
+        .assertNoErrors()
+        .assertNotComplete();
+    }
+
+    @Test
+    public void fusedPoll() throws Throwable {
+        AtomicReference<SimpleQueue<?>> queue = new AtomicReference<>();
+
+        Flowable.fromIterable(Arrays.asList(1))
+        .subscribe(new FlowableSubscriber<Integer>() {
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                queue.set((SimpleQueue<?>)s);
+                ((QueueSubscription<?>)s).requestFusion(QueueFuseable.ANY);
+            }
+
+            @Override
+            public void onNext(Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+        });
+
+        SimpleQueue<?> q = queue.get();
+
+        assertFalse(q.isEmpty());
+
+        assertEquals(1, q.poll());
+
+        assertTrue(q.isEmpty());
+
+        q.clear();
+
+        assertTrue(q.isEmpty());
+    }
+
+    @Test
+    public void disposeWhileIteratorNext() {
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(10);
+
+        Flowable.fromIterable(new Iterable<Integer>() {
+            @Override
+            public Iterator<Integer> iterator() {
+                return new Iterator<Integer>() {
+                    @Override
+                    public boolean hasNext() {
+                        return true;
+                    }
+
+                    @Override
+                    public Integer next() {
+                        ts.cancel();
+                        return 1;
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+        })
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
+
+    @Test
+    public void disposeWhileIteratorNextConditional() {
+        final TestSubscriber<Integer> ts = new TestSubscriber<>(10);
+
+        Flowable.fromIterable(new Iterable<Integer>() {
+            @Override
+            public Iterator<Integer> iterator() {
+                return new Iterator<Integer>() {
+                    @Override
+                    public boolean hasNext() {
+                        return true;
+                    }
+
+                    @Override
+                    public Integer next() {
+                        ts.cancel();
+                        return 1;
+                    }
+
+                    @Override
+                    public void remove() {
+                        throw new UnsupportedOperationException();
+                    }
+                };
+            }
+        })
+        .filter(v -> true)
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java
index ecd965a4f8..23989c717b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java
@@ -282,4 +282,17 @@ public void accept(Emitter<Object> e) throws Exception {
         .test(1)
         .assertResult();
     }
+
+    @Test
+    public void onNextAfterOnComplete() {
+        Flowable.generate(new Consumer<Emitter<Object>>() {
+            @Override
+            public void accept(Emitter<Object> e) throws Exception {
+                e.onComplete();
+                e.onNext(1);
+            }
+        })
+        .test()
+        .assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index ddc34f1d98..21b7f8fb24 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -45,6 +45,15 @@
 
 public class FlowableGroupByTest extends RxJavaTest {
 
+    static Function<GroupedFlowable<Integer, Integer>, Flowable<Integer>> FLATTEN_INTEGER = new Function<GroupedFlowable<Integer, Integer>, Flowable<Integer>>() {
+
+        @Override
+        public Flowable<Integer> apply(GroupedFlowable<Integer, Integer> t) {
+            return t;
+        }
+
+    };
+
     final Function<String, Integer> length = new Function<String, Integer>() {
         @Override
         public Integer apply(String s) {
@@ -1350,15 +1359,6 @@ public String apply(Integer l) {
         ts.assertNoErrors();
     }
 
-    static Function<GroupedFlowable<Integer, Integer>, Flowable<Integer>> FLATTEN_INTEGER = new Function<GroupedFlowable<Integer, Integer>, Flowable<Integer>>() {
-
-        @Override
-        public Flowable<Integer> apply(GroupedFlowable<Integer, Integer> t) {
-            return t;
-        }
-
-    };
-
     @Test
     public void groupByWithNullKey() {
         final String[] key = new String[]{"uninitialized"};
@@ -1805,10 +1805,21 @@ public Object apply(Flowable<Object> f) throws Exception {
 
     @Test
     public void badRequest() {
-        TestHelper.assertBadRequestReported(Flowable.just(1)
+        TestHelper.assertBadRequestReported(Flowable.just(1).hide()
                 .groupBy(Functions.justFunction(1)));
     }
 
+    @Test
+    public void badRequestInner() {
+        Flowable.just(1).hide()
+        .groupBy(Functions.justFunction(1))
+        .doOnNext(g -> {
+            TestHelper.assertBadRequestReported(g);
+        })
+        .test()
+        .assertNoErrors();
+    }
+
     @Test
     public void doubleOnSubscribe() {
         TestHelper.checkDoubleOnSubscribeFlowable(new Function<Flowable<Object>, Publisher<GroupedFlowable<Integer, Object>>>() {
@@ -1883,6 +1894,39 @@ public Map<Integer, Object> apply(final Consumer<Object> notify) throws Exceptio
           .assertNoValues()
           .assertError(ex);
     }
+    // -----------------------------------------------------------------------------------------------------------------------
+
+    private static final Function<Integer, Integer> mod5 = new Function<Integer, Integer>() {
+
+        @Override
+        public Integer apply(Integer n) throws Exception {
+            return n % 5;
+        }
+    };
+
+    private static Function<GroupedFlowable<Integer, Integer>, Publisher<? extends Integer>> addCompletedKey(
+            final List<Integer> completed) {
+        return new Function<GroupedFlowable<Integer, Integer>, Publisher<? extends Integer>>() {
+            @Override
+            public Publisher<? extends Integer> apply(final GroupedFlowable<Integer, Integer> g) throws Exception {
+                return g.doOnComplete(new Action() {
+                    @Override
+                    public void run() throws Exception {
+                        completed.add(g.getKey());
+                    }
+                });
+            }
+        };
+    }
+
+    private static final class TestTicker extends Ticker {
+        long tick;
+
+        @Override
+        public long read() {
+            return tick;
+        }
+    }
 
     @Test
     public void mapFactoryExpiryCompletesGroupedFlowable() {
@@ -1905,32 +1949,6 @@ public void mapFactoryExpiryCompletesGroupedFlowable() {
         ts.assertValueCount(3);
     }
 
-    private static final Function<Integer, Integer> mod5 = new Function<Integer, Integer>() {
-
-        @Override
-        public Integer apply(Integer n) throws Exception {
-            return n % 5;
-        }
-    };
-
-    @Test
-    public void mapFactoryWithExpiringGuavaCacheDemonstrationCodeForUseInJavadoc() {
-        //javadoc will be a version of this using lambdas and without assertions
-        final List<Integer> completed = new CopyOnWriteArrayList<>();
-        //size should be less than 5 to notice the effect
-        Function<Consumer<Object>, Map<Integer, Object>> evictingMapFactory = createEvictingMapFactoryGuava(3);
-        int numValues = 1000;
-        TestSubscriber<Integer> ts =
-            Flowable.range(1, numValues)
-                .groupBy(mod5, Functions.<Integer>identity(), true, 16, evictingMapFactory)
-                .flatMap(addCompletedKey(completed))
-                .test()
-                .assertComplete();
-        ts.assertValueCount(numValues);
-        //the exact eviction behaviour of the guava cache is not specified so we make some approximate tests
-        assertTrue(completed.size() > numValues * 0.9);
-    }
-
     @Test
     public void mapFactoryEvictionQueueClearedOnErrorCoverageOnly() {
         Function<Consumer<Object>, Map<Integer, Object>> evictingMapFactory = createEvictingMapFactorySynchronousOnly(1);
@@ -1952,28 +1970,28 @@ public Publisher<Integer> apply(GroupedFlowable<Integer, Integer> g) throws Exce
           .assertError(ex);
     }
 
-    private static Function<GroupedFlowable<Integer, Integer>, Publisher<? extends Integer>> addCompletedKey(
-            final List<Integer> completed) {
-        return new Function<GroupedFlowable<Integer, Integer>, Publisher<? extends Integer>>() {
-            @Override
-            public Publisher<? extends Integer> apply(final GroupedFlowable<Integer, Integer> g) throws Exception {
-                return g.doOnComplete(new Action() {
-                    @Override
-                    public void run() throws Exception {
-                        completed.add(g.getKey());
-                    }
-                });
-            }
-        };
-    }
+    @Test
+    public void mapFactoryWithExpiringGuavaCacheDemonstrationCodeForUseInJavadoc() {
+        //javadoc will be a version of this using lambdas and without assertions
+        final List<Integer> completed = new CopyOnWriteArrayList<>();
 
-    private static final class TestTicker extends Ticker {
-        long tick;
+        AtomicReference<Cache<Integer, Object>> cacheOut = new AtomicReference<>();
 
-        @Override
-        public long read() {
-            return tick;
-        }
+        //size should be less than 5 to notice the effect
+        Function<Consumer<Object>, Map<Integer, Object>> evictingMapFactory = createEvictingMapFactoryGuava(3, cacheOut);
+        int numValues = 1000;
+        TestSubscriber<Integer> ts =
+            Flowable.range(1, numValues)
+                .groupBy(mod5, Functions.<Integer>identity(), true, 16, evictingMapFactory)
+                .flatMap(addCompletedKey(completed))
+                .test()
+                .assertComplete()
+                ;
+        ts.assertValueCount(numValues);
+        //the exact eviction behaviour of the guava cache is not specified so we make some approximate tests
+        assertTrue(completed.size() > numValues * 0.9);
+
+        cacheOut.get().invalidateAll();
     }
 
     @Test
@@ -2066,28 +2084,6 @@ public void run() throws Exception {
         ), list);
     }
 
-    @Test
-    public void cancellationOfUpstreamWhenGroupedFlowableCompletes() {
-        final AtomicBoolean cancelled = new AtomicBoolean();
-        Flowable.just(1).repeat().doOnCancel(new Action() {
-            @Override
-            public void run() throws Exception {
-                cancelled.set(true);
-            }
-        })
-        .groupBy(Functions.<Integer>identity(), Functions.<Integer>identity()) //
-        .flatMap(new Function<GroupedFlowable<Integer, Integer>, Publisher<? extends Object>>() {
-            @Override
-            public Publisher<? extends Object> apply(GroupedFlowable<Integer, Integer> g) throws Exception {
-                return g.first(0).toFlowable();
-            }
-        })
-        .take(4) //
-        .test() //
-        .assertComplete();
-        assertTrue(cancelled.get());
-    }
-
     //not thread safe
     private static final class SingleThreadEvictingHashMap<K, V> implements Map<K, V> {
 
@@ -2185,13 +2181,14 @@ public Set<Entry<K, V>> entrySet() {
         }
     }
 
-    private static Function<Consumer<Object>, Map<Integer, Object>> createEvictingMapFactoryGuava(final int maxSize) {
+    private static Function<Consumer<Object>, Map<Integer, Object>> createEvictingMapFactoryGuava(final int maxSize,
+            final AtomicReference<Cache<Integer, Object>> cacheOut) {
         Function<Consumer<Object>, Map<Integer, Object>> evictingMapFactory =  //
                 new Function<Consumer<Object>, Map<Integer, Object>>() {
 
             @Override
             public Map<Integer, Object> apply(final Consumer<Object> notify) throws Exception {
-                return CacheBuilder.newBuilder() //
+                Cache<Integer, Object> cache = CacheBuilder.newBuilder() //
                         .maximumSize(maxSize) //
                         .removalListener(new RemovalListener<Integer, Object>() {
                             @Override
@@ -2202,8 +2199,9 @@ public void onRemoval(RemovalNotification<Integer, Object> notification) {
                                     throw new RuntimeException(e);
                                 }
                             }})
-                        .<Integer, Object> build()
-                        .asMap();
+                        .<Integer, Object> build();
+                cacheOut.set(cache);
+                return cache.asMap();
             }};
         return evictingMapFactory;
     }
@@ -2228,6 +2226,30 @@ public void accept(Object object) {
         return evictingMapFactory;
     }
 
+    // -----------------------------------------------------------------------------------------------------------------------
+
+    @Test
+    public void cancellationOfUpstreamWhenGroupedFlowableCompletes() {
+        final AtomicBoolean cancelled = new AtomicBoolean();
+        Flowable.just(1).repeat().doOnCancel(new Action() {
+            @Override
+            public void run() throws Exception {
+                cancelled.set(true);
+            }
+        })
+        .groupBy(Functions.<Integer>identity(), Functions.<Integer>identity()) //
+        .flatMap(new Function<GroupedFlowable<Integer, Integer>, Publisher<? extends Object>>() {
+            @Override
+            public Publisher<? extends Object> apply(GroupedFlowable<Integer, Integer> g) throws Exception {
+                return g.first(0).toFlowable();
+            }
+        })
+        .take(4) //
+        .test() //
+        .assertComplete();
+        assertTrue(cancelled.get());
+    }
+
     @Test
     public void cancelOverFlatmapRace() {
         for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
@@ -2478,4 +2500,62 @@ public void run() throws Exception {
 
         assertEquals(1000, counter.get());
     }
+
+    @Test
+    public void delayErrorCompleteMoreWorkInGroup() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp.groupBy(v -> 1, true)
+        .flatMap(g -> g.doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+                pp.onComplete();
+            }
+        })
+        )
+        .test()
+        ;
+
+        pp.onNext(1);
+
+        ts.assertResult(1, 2);
+    }
+
+    @Test
+    public void groupSyncFusionRejected() {
+        Flowable.just(1)
+        .groupBy(v -> 1)
+        .doOnNext(g -> {
+            g.subscribeWith(new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.SYNC))
+            .assertFuseable()
+            .assertFusionMode(QueueFuseable.NONE);
+        })
+        .test()
+        .assertComplete();
+    }
+
+    @Test
+    public void subscribeAbandonRace() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishProcessor<Integer> pp = PublishProcessor.create();
+
+            TestSubscriber<Integer> ts = TestSubscriber.create();
+
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            pp.groupBy(v -> 1)
+            .doOnNext(g -> {
+                TestHelper.raceOther(() -> {
+                    g.subscribe(ts);
+                }, cdl);
+            })
+            .test();
+
+            pp.onNext(1);
+
+            cdl.await();
+
+            ts.assertValueCount(1);
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
index bed0686923..2e7eba8d1a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
@@ -31,7 +31,7 @@
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableGroupJoin.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -732,4 +732,55 @@ public void leftRightEndState() {
 
         verify(js).innerClose(false, o);
     }
+
+    @Test
+    public void disposeAfterOnNext() {
+        PublishProcessor<Integer> pp1 = PublishProcessor.create();
+        PublishProcessor<Integer> pp2 = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        pp1.groupJoin(pp2, v -> Flowable.never(), v -> Flowable.never(), (a, b) -> a)
+        .doOnNext(v -> {
+            ts.cancel();
+        })
+        .subscribe(ts);
+
+        pp2.onNext(1);
+        pp1.onNext(1);
+    }
+
+    @Test
+    public void completeWithMoreWork() {
+        PublishProcessor<Integer> pp1 = PublishProcessor.create();
+        PublishProcessor<Integer> pp2 = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        pp1.groupJoin(pp2, v -> Flowable.never(), v -> Flowable.never(), (a, b) -> a)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp2.onNext(2);
+                pp1.onComplete();
+                pp2.onComplete();
+            }
+        })
+        .subscribe(ts);
+
+        pp2.onNext(1);
+        pp1.onNext(1);
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().groupJoin(Flowable.never(), v -> Flowable.never(), v -> Flowable.never(), (a, b) -> a));
+    }
+
+    @Test
+    public void missingBackpressure() {
+        Flowable.just(1)
+        .groupJoin(Flowable.never(), v -> BehaviorProcessor.createDefault(1), v -> Flowable.never(), (a, b) -> a)
+        .test(0)
+        .assertFailure(MissingBackpressureException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java
index 46cf13229b..70156bcd81 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java
@@ -118,4 +118,12 @@ public void cancel() {
         .test()
         .assertResult(0L, 1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L, 9L);
     }
+
+    @Test
+    public void takeSameAsRange() {
+        Flowable.intervalRange(0, 2, 1, 1, TimeUnit.MILLISECONDS, Schedulers.trampoline())
+        .take(2)
+        .test()
+        .assertResult(0L, 1L);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
index 7c33df579c..080be1bb59 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
@@ -487,4 +487,35 @@ public Object apply(Integer a, Integer b) throws Exception {
 
         ts.assertFailure(MissingBackpressureException.class);
     }
+
+    @Test
+    public void badRequest() {
+        PublishProcessor<Integer> pp1 = PublishProcessor.create();
+        PublishProcessor<Integer> pp2 = PublishProcessor.create();
+
+        TestHelper.assertBadRequestReported(pp1.join(pp2, Functions.justFunction(Flowable.never()), Functions.justFunction(Flowable.never()), (a, b) -> a + b));
+    }
+
+    @Test
+    public void bothTerminateWithWorkRemaining() {
+        PublishProcessor<Integer> pp1 = PublishProcessor.create();
+        PublishProcessor<Integer> pp2 = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp1.join(
+                pp2,
+                v -> Flowable.never(),
+                v -> Flowable.never(),
+                (a, b) -> a + b)
+        .doOnNext(v -> {
+            pp1.onComplete();
+            pp2.onNext(2);
+            pp2.onComplete();
+        })
+        .test();
+
+        pp1.onNext(0);
+        pp2.onNext(1);
+
+        ts.assertComplete();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
index e5ef48a426..655d75fe08 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
@@ -28,7 +28,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
-import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
@@ -448,4 +448,22 @@ public Flowable<Integer> apply(Flowable<Integer> upstream) {
             }
         });
     }
+
+    @Test
+    public void drainMoreWorkBeforeCancel() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.range(1, 5).mergeWith(ms)
+        .doOnNext(v -> {
+            if (v == 1) {
+                ms.onSuccess(6);
+                ts.cancel();
+            }
+        })
+        .subscribe(ts);
+
+        ts.assertValuesOnly(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
index a48ee16fef..c187880426 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
@@ -444,4 +444,22 @@ public Flowable<Integer> apply(Flowable<Integer> upstream) {
             }
         });
     }
+
+    @Test
+    public void drainMoreWorkBeforeCancel() {
+        SingleSubject<Integer> ss = SingleSubject.create();
+
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.range(1, 5).mergeWith(ss)
+        .doOnNext(v -> {
+            if (v == 1) {
+                ss.onSuccess(6);
+                ts.cancel();
+            }
+        })
+        .subscribe(ts);
+
+        ts.assertValuesOnly(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
index 7fbf19fa60..a2bf5505ce 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
@@ -1154,6 +1154,16 @@ public Flowable<Object> apply(Flowable<Object> f) throws Exception {
         });
     }
 
+    @Test
+    public void doubleOnSubscribeConditional() {
+        TestHelper.checkDoubleOnSubscribeFlowable(new Function<Flowable<Object>, Flowable<Object>>() {
+            @Override
+            public Flowable<Object> apply(Flowable<Object> f) throws Exception {
+                return f.observeOn(new TestScheduler()).compose(TestHelper.conditional());
+            }
+        });
+    }
+
     @Test
     public void badSource() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
@@ -1988,4 +1998,120 @@ public void fusedParallelProcessing() {
         .assertComplete()
         .assertNoErrors();
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().observeOn(ImmediateThinScheduler.INSTANCE));
+    }
+
+    @Test
+    public void syncFusedCancelAfterPoll() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.just(1)
+        .map(v -> {
+            ts.cancel();
+            return v + 1;
+        })
+        .compose(TestHelper.flowableStripBoundary())
+        .observeOn(ImmediateThinScheduler.INSTANCE)
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
+
+    @Test
+    public void syncFusedCancelAfterPollConditional() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.just(1)
+        .map(v -> {
+            ts.cancel();
+            return v + 1;
+        })
+        .compose(TestHelper.flowableStripBoundary())
+        .observeOn(ImmediateThinScheduler.INSTANCE)
+        .compose(TestHelper.conditional())
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
+
+    @Test
+    public void backFusedMoreWork() {
+        final TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
+
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        pp.observeOn(ImmediateThinScheduler.INSTANCE)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+            }
+        })
+        .subscribe(ts);
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1, 2);
+    }
+
+    @Test
+    public void moreWorkInRunAsync() {
+        final TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        pp.observeOn(ImmediateThinScheduler.INSTANCE)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+            }
+        })
+        .subscribe(ts);
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1, 2);
+    }
+
+    @Test
+    public void backFusedConditionalMoreWork() {
+        final TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
+
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        pp.observeOn(ImmediateThinScheduler.INSTANCE)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+            }
+        })
+        .compose(TestHelper.conditional())
+        .subscribe(ts);
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1, 2);
+    }
+
+    @Test
+    public void conditionalMoreWorkInRunAsync() {
+        final TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        pp.observeOn(ImmediateThinScheduler.INSTANCE)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+            }
+        })
+        .compose(TestHelper.conditional())
+        .subscribe(ts);
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
index 327078ad60..000d504211 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
@@ -206,4 +206,23 @@ public void justTake() {
         .test()
         .assertResult(1);
     }
+
+    @Test
+    public void overflowNullAction() {
+        Flowable.range(1, 5)
+        .onBackpressureBuffer(1, null, BackpressureOverflowStrategy.DROP_OLDEST)
+        .test(0L)
+        .assertEmpty();
+    }
+
+    @Test
+    public void cancelOnDrain() {
+        Flowable.range(1, 5)
+        .onBackpressureBuffer(10, null, BackpressureOverflowStrategy.DROP_OLDEST)
+        .takeUntil(v -> true)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(10)
+        .assertResult(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
index cc5992862b..588127bae4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
@@ -340,4 +340,14 @@ public void fusedNoConcurrentCleanDueToCancel() {
             }
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.onBackpressureBuffer());
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().onBackpressureBuffer());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
index 0dffd13798..6e701e5fc3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
@@ -1697,4 +1697,83 @@ public void disposeResets() {
 
         ts.assertValuesOnly(1);
     }
+
+    @Test(expected = TestException.class)
+    public void connectDisposeCrash() {
+        ConnectableFlowable<Object> cf = Flowable.never().publish();
+
+        cf.connect();
+
+        cf.connect(d ->  { throw new TestException(); });
+    }
+
+    @Test
+    public void resetWhileNotConnectedIsNoOp() {
+        ConnectableFlowable<Object> cf = Flowable.never().publish();
+
+        cf.reset();
+    }
+
+    @Test
+    public void resetWhileActiveIsNoOp() {
+        ConnectableFlowable<Object> cf = Flowable.never().publish();
+
+        cf.connect();
+
+        cf.reset();
+    }
+
+    @Test
+    public void crossCancelOnComplete() {
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>();
+        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
+            @Override
+            public void onComplete() {
+                super.onComplete();
+                ts1.cancel();
+            }
+        };
+
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.publish();
+
+        cf.subscribe(ts2);
+        cf.subscribe(ts1);
+
+        cf.connect();
+
+        pp.onComplete();
+
+        ts2.assertResult();
+
+        ts1.assertEmpty();
+    }
+
+    @Test
+    public void crossCancelOnError() {
+        TestSubscriber<Integer> ts1 = new TestSubscriber<>();
+        TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
+            @Override
+            public void onError(Throwable t) {
+                super.onError(t);
+                ts1.cancel();
+            }
+        };
+
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.publish();
+
+        cf.subscribe(ts2);
+        cf.subscribe(ts1);
+
+        cf.connect();
+
+        pp.onError(new TestException());
+
+        ts2.assertFailure(TestException.class);
+
+        ts1.assertEmpty();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
index 96401918ef..d22cecfe5b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
@@ -539,4 +539,44 @@ public boolean test(Long v) throws Exception {
 
         ts.assertResult(2L, 4L);
     }
+
+    @Test
+    public void slowPathCancelBeforeComplete() {
+        Flowable.rangeLong(1, 2)
+        .take(2)
+        .test()
+        .assertResult(1L, 2L);
+    }
+
+    @Test
+    public void conditionalFastPathCancelBeforeComplete() {
+        TestSubscriber<Long> ts = new TestSubscriber<>();
+
+        Flowable.rangeLong(1, 2)
+        .compose(TestHelper.conditional())
+        .doOnNext(v -> {
+            if (v == 2L) {
+                ts.cancel();
+            }
+        })
+        .subscribe(ts);
+
+        ts.assertValuesOnly(1L, 2L);
+    }
+
+    @Test
+    public void conditionalSlowPathTake() {
+        TestSubscriber<Long> ts = new TestSubscriber<>(4);
+
+        Flowable.rangeLong(1, 3)
+        .compose(TestHelper.conditional())
+        .doOnNext(v -> {
+            if (v == 2L) {
+                ts.cancel();
+            }
+        })
+        .subscribe(ts);
+
+        ts.assertValuesOnly(1L, 2L);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
index 39ab84ad63..628edd30c0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
@@ -590,4 +590,28 @@ public void onNext(Integer t) {
 
         ts.assertResult(1, 2);
     }
+
+    @Test
+    public void slowPathCancelBeforeComplete() {
+        Flowable.range(1, 2)
+        .take(2)
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void conditionalFastPatchCancelBeforeComplete() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+        Flowable.range(1, 2)
+        .compose(TestHelper.conditional())
+        .doOnNext(v -> {
+            if (v == 2) {
+                ts.cancel();
+            }
+        })
+        .subscribe(ts);
+
+        ts.assertValuesOnly(1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java
index bc7d1e8ece..170b826bd7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java
@@ -530,4 +530,9 @@ public Integer apply(Integer a, Integer b) throws Exception {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribeFlowable() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.reduce((a, b) -> a).toFlowable());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
index 169409ed1b..02a730b610 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
@@ -45,7 +45,25 @@
 public class FlowableRefCountTest extends RxJavaTest {
 
     @Test
-    public void refCountAsync() {
+    public void refCountAsync() throws InterruptedException {
+        // Flaky
+        for (int i = 0; i < 10; i++) {
+            try {
+                refCountAsyncActual();
+                return;
+            } catch (AssertionError ex) {
+                if (i == 9) {
+                    throw ex;
+                }
+                Thread.sleep((int)(200 * (Math.random() * 10 + 1)));
+            }
+        }
+    }
+
+    /**
+     * Tries to coordinate async counting but it is flaky due to the low 10s of milliseconds.
+     */
+    void refCountAsyncActual() {
         final AtomicInteger subscribeCount = new AtomicInteger();
         final AtomicInteger nextCount = new AtomicInteger();
         Flowable<Long> r = Flowable.interval(0, 20, TimeUnit.MILLISECONDS)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
index f263b98f66..ce2cf5a564 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
@@ -732,7 +732,14 @@ public boolean isDisposed() {
 
     @Test
     public void boundedReplayBuffer() {
-        BoundedReplayBuffer<Integer> buf = new BoundedReplayBuffer<>(true);
+        BoundedReplayBuffer<Integer> buf = new BoundedReplayBuffer<Integer>(true) {
+            private static final long serialVersionUID = -9081211580719235896L;
+
+            @Override
+            void truncate() {
+            }
+        };
+
         buf.addLast(new Node(1, 0));
         buf.addLast(new Node(2, 1));
         buf.addLast(new Node(3, 2));
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
index 67763fce0b..e151dd07f1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
@@ -17,6 +17,7 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
+import java.io.IOException;
 import java.lang.management.*;
 import java.util.*;
 import java.util.concurrent.*;
@@ -37,6 +38,7 @@
 import io.reactivex.rxjava3.internal.fuseable.HasUpstreamPublisher;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableReplay.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.*;
@@ -44,6 +46,7 @@
 import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableReplayTest extends RxJavaTest {
+
     @Test
     public void bufferedReplay() {
         PublishProcessor<Integer> source = PublishProcessor.create();
@@ -732,7 +735,14 @@ public boolean isDisposed() {
 
     @Test
     public void boundedReplayBuffer() {
-        BoundedReplayBuffer<Integer> buf = new BoundedReplayBuffer<>(false);
+        BoundedReplayBuffer<Integer> buf = new BoundedReplayBuffer<Integer>(false) {
+            private static final long serialVersionUID = -9081211580719235896L;
+
+            @Override
+            void truncate() {
+            }
+        };
+
         buf.addLast(new Node(1, 0));
         buf.addLast(new Node(2, 1));
         buf.addLast(new Node(3, 2));
@@ -760,6 +770,19 @@ public void boundedReplayBuffer() {
 
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void boundedRemoveFirstOneItemOnly() {
+        BoundedReplayBuffer<Integer> buf = new BoundedReplayBuffer<Integer>(false) {
+            private static final long serialVersionUID = -9081211580719235896L;
+
+            @Override
+            void truncate() {
+            }
+        };
+
+        buf.removeFirst();
+    }
+
     @Test
     public void timedAndSizedTruncation() {
         TestScheduler test = new TestScheduler();
@@ -965,7 +988,9 @@ public void take() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
 
         Flowable<Integer> cached = Flowable.range(1, 100).replay().autoConnect();
-        cached.take(10).subscribe(ts);
+        cached
+        .take(10)
+        .subscribe(ts);
 
         ts.assertNoErrors();
         ts.assertTerminated();
@@ -1079,7 +1104,7 @@ public void valuesAndThenError() {
     }
 
     @Test
-    public void unsafeChildThrows() {
+    public void unsafeChildOnNextThrows() {
         final AtomicInteger count = new AtomicInteger();
 
         Flowable<Integer> source = Flowable.range(1, 100)
@@ -1107,6 +1132,52 @@ public void onNext(Integer t) {
         ts.assertError(TestException.class);
     }
 
+    @Test
+    public void unsafeChildOnErrorThrows() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable<Integer> source = Flowable.<Integer>error(new IOException())
+                    .replay()
+                    .autoConnect();
+
+                    TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+                        @Override
+                        public void onError(Throwable t) {
+                            super.onError(t);
+                            throw new TestException();
+                        }
+                    };
+
+                    source.subscribe(ts);
+
+                    ts.assertFailure(IOException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void unsafeChildOnCompleteThrows() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable<Integer> source = Flowable.<Integer>empty()
+                    .replay()
+                    .autoConnect();
+
+                    TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+                        @Override
+                        public void onComplete() {
+                            super.onComplete();
+                            throw new TestException();
+                        }
+                    };
+
+                    source.subscribe(ts);
+
+                    ts.assertResult();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
     @Test
     public void unboundedLeavesEarly() {
         PublishProcessor<Integer> source = PublishProcessor.create();
@@ -1992,4 +2063,132 @@ public void accept(byte[] v) throws Exception {
                     + " -> " + after.get() / 1024.0 / 1024.0);
         }
     }
+
+    @Test
+    public void unsafeChildOnNextThrowsSizeBound() {
+        final AtomicInteger count = new AtomicInteger();
+
+        Flowable<Integer> source = Flowable.range(1, 100)
+        .doOnNext(new Consumer<Integer>() {
+            @Override
+            public void accept(Integer t) {
+                count.getAndIncrement();
+            }
+        })
+        .replay(1000).autoConnect();
+
+        TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+            @Override
+            public void onNext(Integer t) {
+                throw new TestException();
+            }
+        };
+
+        source.subscribe(ts);
+
+        Assert.assertEquals(100, count.get());
+
+        ts.assertNoValues();
+        ts.assertNotComplete();
+        ts.assertError(TestException.class);
+    }
+
+    @Test
+    public void unsafeChildOnErrorThrowsSizeBound() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable<Integer> source = Flowable.<Integer>error(new IOException())
+                    .replay(1000)
+                    .autoConnect();
+
+                    TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+                        @Override
+                        public void onError(Throwable t) {
+                            super.onError(t);
+                            throw new TestException();
+                        }
+                    };
+
+                    source.subscribe(ts);
+
+                    ts.assertFailure(IOException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void unsafeChildOnCompleteThrowsSizeBound() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable<Integer> source = Flowable.<Integer>empty()
+                    .replay(1000)
+                    .autoConnect();
+
+                    TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+                        @Override
+                        public void onComplete() {
+                            super.onComplete();
+                            throw new TestException();
+                        }
+                    };
+
+                    source.subscribe(ts);
+
+                    ts.assertResult();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test(expected = TestException.class)
+    public void connectDisposeCrash() {
+        ConnectableFlowable<Object> cf = Flowable.never().replay();
+
+        cf.connect();
+
+        cf.connect(d ->  { throw new TestException(); });
+    }
+
+    @Test
+    public void resetWhileNotConnectedIsNoOp() {
+        ConnectableFlowable<Object> cf = Flowable.never().replay();
+
+        cf.reset();
+    }
+
+    @Test
+    public void resetWhileActiveIsNoOp() {
+        ConnectableFlowable<Object> cf = Flowable.never().replay();
+
+        cf.connect();
+
+        cf.reset();
+    }
+
+    @Test
+    public void delayedUpstreamSubscription() {
+        AtomicReference<Subscriber<? super Integer>> ref = new AtomicReference<>();
+        Flowable<Integer> f = Flowable.<Integer>unsafeCreate(ref::set);
+
+        TestSubscriber<Integer> ts = f.replay()
+        .autoConnect()
+        .test();
+
+        AtomicLong requested = new AtomicLong();
+
+        ref.get().onSubscribe(new Subscription() {
+            @Override
+            public void request(long n) {
+                BackpressureHelper.add(requested, n);
+            }
+
+            @Override
+            public void cancel() {
+            }
+        });
+
+        assertEquals(Long.MAX_VALUE, requested.get());
+        ref.get().onComplete();
+
+        ts.assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java
index f9ed6509db..3c47d264ca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java
@@ -481,4 +481,10 @@ public void badRequest() {
         TestHelper.assertBadRequestReported(PublishProcessor.create()
                 .sample(PublishProcessor.create()));
     }
+
+    @Test
+    public void badRequestTimed() {
+        TestHelper.assertBadRequestReported(PublishProcessor.create()
+                .sample(1, TimeUnit.MINUTES));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
index a4abfce00c..5a47a46d9b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
@@ -243,4 +243,12 @@ public void cancelled() {
 
         assertTrue(scalar.isCancelled());
     }
+
+    @Test
+    public void mapToNonScalar() {
+        Flowable.fromCallable(() -> 1)
+        .concatMap(v -> Flowable.range(1, 5))
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
index 2988da7570..6ebac502b0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
@@ -676,4 +676,27 @@ public Integer apply(Integer a, Integer b) throws Exception {
             }
         }
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.<Integer>never().scanWith(() -> 1, (a, b) -> a + b));
+    }
+
+    @Test
+    public void drainMoreWork() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp.scanWith(() -> 0, (a, b) -> a + b)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(2);
+                pp.onComplete();
+            }
+        })
+        .test();
+
+        pp.onNext(1);
+
+        ts.assertResult(0, 1, 3);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
index e5e74e8227..a3e997d882 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
@@ -591,4 +591,26 @@ public Flowable<Boolean> apply(Flowable<Integer> upstream) {
             }
         });
     }
+
+    @Test
+    public void fusionRejected() {
+        Flowable.sequenceEqual(TestHelper.rejectFlowableFusion(), Flowable.never())
+        .test()
+        .assertEmpty();
+    }
+
+    @Test
+    public void fusionRejectedFlowable() {
+        Flowable.sequenceEqual(TestHelper.rejectFlowableFusion(), Flowable.never())
+        .toFlowable()
+        .test()
+        .assertEmpty();
+    }
+
+    @Test
+    public void asyncSourceCompare() {
+        Flowable.sequenceEqual(Flowable.fromCallable(() -> 1), Flowable.just(1))
+        .test()
+        .assertResult(true);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
index 099f63f049..0eb0853c0a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
@@ -805,4 +805,9 @@ public void singleOrError() {
         .test()
         .assertFailure(NoSuchElementException.class);
     }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(PublishProcessor.create().single(1));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java
index 87f4ddf881..66d9aa86b6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java
@@ -250,4 +250,27 @@ public void observeOn() {
         .assertComplete()
         .assertNoErrors();
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().skipLast(1, TimeUnit.MINUTES));
+    }
+
+    @Test
+    public void delayErrorMoreWork() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp.skipLast(0, TimeUnit.MILLISECONDS, true)
+        .doOnNext(v -> {
+            if (v == 1) {
+                pp.onNext(1);
+                pp.onComplete();
+            }
+        })
+        .test();
+
+        pp.onNext(1);
+
+        ts.assertComplete();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
index a9f66d733e..1554345f61 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
@@ -27,6 +27,7 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableSubscribeOn.SubscribeOnSubscriber;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subscribers.*;
@@ -406,4 +407,9 @@ public void subscribe(FlowableEmitter<Object> s) throws Exception {
         .assertNoErrors()
         .assertComplete();
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().subscribeOn(ImmediateThinScheduler.INSTANCE));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
index fb571c1109..4726d9bfcc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
@@ -32,7 +32,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subscribers.*;
 import io.reactivex.rxjava3.testsupport.*;
@@ -1229,4 +1229,112 @@ public Publisher<Integer> apply(Integer v)
         .test()
         .assertResult(10, 20);
     }
+
+    @Test
+    public void asyncFusedInner() {
+        Flowable.just(1)
+        .hide()
+        .switchMap(v -> Flowable.fromCallable(() -> 1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void innerIgnoresCancelAndErrors() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            PublishProcessor<Integer> pp = PublishProcessor.create();
+
+            TestSubscriber<Object> ts = pp
+            .switchMap(v -> {
+                if (v == 1) {
+                    return Flowable.unsafeCreate(s -> {
+                        s.onSubscribe(new BooleanSubscription());
+                        pp.onNext(2);
+                        s.onError(new TestException());
+                    });
+                }
+                return Flowable.never();
+            })
+            .test();
+
+            pp.onNext(1);
+
+            ts.assertEmpty();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.switchMap(v -> Flowable.never()));
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().switchMap(v -> Flowable.never()));
+    }
+
+    @Test
+    public void innerFailed() {
+        BehaviorProcessor.createDefault(Flowable.error(new TestException()))
+        .switchMap(v -> v)
+        .test()
+        .assertFailure(TestException.class)
+        ;
+    }
+
+    @Test
+    public void innerCompleted() {
+        BehaviorProcessor.createDefault(Flowable.empty().hide())
+        .switchMap(v -> v)
+        .test()
+        .assertEmpty()
+        ;
+    }
+
+    @Test
+    public void innerCompletedBackpressureBoundary() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = BehaviorProcessor.createDefault(pp)
+        .onBackpressureBuffer()
+        .switchMap(v -> v)
+        .test(1L)
+        ;
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+        pp.onComplete();
+
+        ts.assertValuesOnly(1);
+    }
+
+    @Test
+    public void innerCompletedDelayError() {
+        BehaviorProcessor.createDefault(Flowable.empty().hide())
+        .switchMapDelayError(v -> v)
+        .test()
+        .assertEmpty()
+        ;
+    }
+
+    @Test
+    public void innerCompletedBackpressureBoundaryDelayError() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = BehaviorProcessor.createDefault(pp)
+        .onBackpressureBuffer()
+        .switchMapDelayError(v -> v)
+        .test(1L)
+        ;
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+        pp.onComplete();
+
+        ts.assertValuesOnly(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
index de6a431844..9c413985aa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
@@ -23,8 +23,9 @@
 
 import org.junit.Test;
 import org.mockito.InOrder;
-import org.reactivestreams.Subscriber;
+import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
@@ -340,4 +341,54 @@ public void takeLastTake() {
         .test()
         .assertResult(6, 7);
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().takeLast(2));
+    }
+
+    @Test
+    public void cancelThenRequest() {
+        Flowable.never().takeLast(2)
+        .subscribe(new FlowableSubscriber<Object>() {
+
+            @Override
+            public void onNext(@NonNull Object t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                s.cancel();
+                s.request(1);
+            }
+        });
+    }
+
+    @Test
+    public void noRequestEmpty() {
+        Flowable.empty()
+        .takeLast(2)
+        .test(0L)
+        .assertResult();
+    }
+
+    @Test
+    public void moreValuesRemainingThanRequested() {
+        Flowable.range(1, 4)
+        .takeLast(3)
+        .test(0L)
+        .assertEmpty()
+        .requestMore(2)
+        .assertValuesOnly(2, 3)
+        .requestMore(2)
+        .assertResult(2, 3, 4);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
index d26d49019a..4c26b2a9f8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
@@ -200,4 +200,14 @@ public void backpressureNoRequest() {
         .test(0L)
         .assertFailure(MissingBackpressureException.class);
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().throttleFirst(1, TimeUnit.MINUTES));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.throttleFirst(1, TimeUnit.MINUTES));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
index 88a3bc2253..de0dcec14c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
@@ -30,7 +30,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
-import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -528,4 +528,9 @@ public void run() {
             }
         }
     }
+
+    @Test
+    public void doubleOnSubscribeFallback() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.timeout(1, TimeUnit.MINUTES, Flowable.<Object>never()));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
index 7e55fa0d77..db09c48872 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
@@ -32,6 +32,7 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableTimeout.TimeoutConsumer;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.*;
@@ -894,4 +895,13 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void timeoutConsumerIsDisposed() {
+        TimeoutConsumer consumer = new TimeoutConsumer(0, null);
+
+        assertFalse(consumer.isDisposed());
+        consumer.dispose();
+        assertTrue(consumer.isDisposed());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
index e23228f943..4e299dcbd1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
@@ -380,4 +380,9 @@ public Long apply(Long v) throws Exception {
             exec.shutdown();
         }
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.timer(1, TimeUnit.MINUTES));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
index 1f37dbddce..281b74e463 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
@@ -26,6 +26,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -274,4 +275,9 @@ protected void subscribeActual(Subscriber<? super Integer> subscriber) {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.unsubscribeOn(ImmediateThinScheduler.INSTANCE));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
index fbefcc953e..b8ae0b35c9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
@@ -605,4 +605,120 @@ public void accept(Flowable<Integer> v) throws Throwable {
 
         inner.get().test().assertResult(1);
     }
+
+    @Test
+    public void badRequestExact() {
+        TestHelper.assertBadRequestReported(Flowable.never().window(1));
+    }
+
+    @Test
+    public void badRequestSkip() {
+        TestHelper.assertBadRequestReported(Flowable.never().window(1, 2));
+    }
+
+    @Test
+    public void badRequestOverlap() {
+        TestHelper.assertBadRequestReported(Flowable.never().window(2, 1));
+    }
+
+    @Test
+    public void skipEmpty() {
+        Flowable.empty()
+        .window(1, 2)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void exactEmpty() {
+        Flowable.empty()
+        .window(2)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void skipMultipleRequests() {
+        Flowable.range(1, 10)
+        .window(1, 2)
+        .doOnNext(w -> w.test())
+        .rebatchRequests(1)
+        .test()
+        .assertComplete();
+    }
+
+    @Test
+    public void skipOne() {
+        Flowable.just(1)
+        .window(2, 3)
+        .flatMap(v -> v)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void overlapMultipleRequests() {
+        Flowable.range(1, 10)
+        .window(2, 1)
+        .doOnNext(w -> w.test())
+        .rebatchRequests(1)
+        .test()
+        .assertComplete();
+    }
+
+    @Test
+    public void overlapCancelAfterWindow() {
+        Flowable.range(1, 10)
+        .window(2, 1)
+        .takeUntil(v -> true)
+        .doOnNext(w -> w.test())
+        .test(0L)
+        .requestMore(10)
+        .assertComplete();
+    }
+
+    @Test
+    public void overlapEmpty() {
+        Flowable.empty()
+        .window(2, 1)
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void overlapEmptyNoRequest() {
+        Flowable.empty()
+        .window(2, 1)
+        .test(0L)
+        .assertResult();
+    }
+
+    @Test
+    public void overlapMoreWorkAfterOnNext() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+        AtomicBoolean once = new AtomicBoolean();
+
+        TestSubscriber<Flowable<Integer>> ts = pp.window(2, 1)
+        .doOnNext(v -> {
+            v.test();
+            if (once.compareAndSet(false, true)) {
+                pp.onNext(2);
+                pp.onComplete();
+            }
+        })
+        .test();
+
+        pp.onNext(1);
+
+        ts.assertComplete();
+    }
+
+    @Test
+    public void moreQueuedClean() {
+        Flowable.range(1, 10)
+        .window(5, 1)
+        .doOnNext(w -> w.test())
+        .test(3)
+        .cancel();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
index 023f6848d5..a9a5a7e821 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
@@ -15,6 +15,7 @@
 
 import static org.junit.Assert.*;
 
+import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
@@ -233,20 +234,20 @@ public void dispose() {
 
     @Test
     public void reentrant() {
-        final FlowableProcessor<Integer> ps = PublishProcessor.<Integer>create();
+        final FlowableProcessor<Integer> pp = PublishProcessor.<Integer>create();
 
         TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
             @Override
             public void onNext(Integer t) {
                 super.onNext(t);
                 if (t == 1) {
-                    ps.onNext(2);
-                    ps.onComplete();
+                    pp.onNext(2);
+                    pp.onComplete();
                 }
             }
         };
 
-        ps.window(BehaviorProcessor.createDefault(1), Functions.justFunction(Flowable.never()))
+        pp.window(BehaviorProcessor.createDefault(1), Functions.justFunction(Flowable.never()))
         .flatMap(new Function<Flowable<Integer>, Flowable<Integer>>() {
             @Override
             public Flowable<Integer> apply(Flowable<Integer> v) throws Exception {
@@ -255,7 +256,7 @@ public Flowable<Integer> apply(Flowable<Integer> v) throws Exception {
         })
         .subscribe(ts);
 
-        ps.onNext(1);
+        pp.onNext(1);
 
         ts
         .awaitDone(1, TimeUnit.SECONDS)
@@ -539,4 +540,179 @@ public Publisher<Object> apply(Integer end) throws Throwable {
         assertFalse(boundary.hasSubscribers());
 
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(o -> o.window(Flowable.never(), v -> Flowable.never()));
+    }
+
+    @Test
+    public void openError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestException ex1 = new TestException();
+            TestException ex2 = new TestException();
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+                AtomicReference<Subscriber<? super Integer>> ref1 = new AtomicReference<>();
+                AtomicReference<Subscriber<? super Integer>> ref2 = new AtomicReference<>();
+
+                Flowable<Integer> f1 = Flowable.<Integer>fromPublisher(ref1::set);
+                Flowable<Integer> f2 = Flowable.<Integer>fromPublisher(ref2::set);
+
+                TestSubscriber<Flowable<Integer>> ts = BehaviorProcessor.createDefault(1)
+                .window(f1, v -> f2)
+                .doOnNext(w -> w.test())
+                .test();
+
+                ref1.get().onSubscribe(new BooleanSubscription());
+                ref1.get().onNext(1);
+                ref2.get().onSubscribe(new BooleanSubscription());
+
+                TestHelper.race(
+                        () -> ref1.get().onError(ex1),
+                        () -> ref2.get().onError(ex2)
+                );
+
+                ts.assertError(RuntimeException.class);
+
+                if (!errors.isEmpty()) {
+                    TestHelper.assertUndeliverable(errors, 0, TestException.class);
+                }
+
+                errors.clear();
+            }
+        });
+    }
+
+    @Test
+    public void closeError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            AtomicReference<Subscriber<? super Integer>> ref1 = new AtomicReference<>();
+            AtomicReference<Subscriber<? super Integer>> ref2 = new AtomicReference<>();
+
+            Flowable<Integer> f1 = Flowable.<Integer>unsafeCreate(ref1::set);
+            Flowable<Integer> f2 = Flowable.<Integer>unsafeCreate(ref2::set);
+
+            TestSubscriber<Integer> ts = BehaviorProcessor.createDefault(1)
+            .window(f1, v -> f2)
+            .flatMap(v -> v)
+            .test();
+
+            ref1.get().onSubscribe(new BooleanSubscription());
+            ref1.get().onNext(1);
+            ref2.get().onSubscribe(new BooleanSubscription());
+
+            ref2.get().onError(new TestException());
+            ref2.get().onError(new TestException());
+
+            ts.assertFailure(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void upstreamFailsBeforeFirstWindow() {
+        Flowable.error(new TestException())
+        .window(Flowable.never(), v -> Flowable.never())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void windowOpenMainCompletes() {
+        AtomicReference<Subscriber<? super Integer>> ref1 = new AtomicReference<>();
+
+        PublishProcessor<Object> pp = PublishProcessor.create();
+        Flowable<Integer> f1 = Flowable.<Integer>unsafeCreate(ref1::set);
+
+        AtomicInteger counter = new AtomicInteger();
+
+        TestSubscriber<Flowable<Object>> ts = pp
+        .window(f1, v -> Flowable.never())
+        .doOnNext(w -> {
+            if (counter.getAndIncrement() == 0) {
+                ref1.get().onNext(2);
+                pp.onNext(1);
+                pp.onComplete();
+            }
+            w.test();
+        })
+        .test();
+
+        ref1.get().onSubscribe(new BooleanSubscription());
+        ref1.get().onNext(1);
+
+        ts.assertComplete();
+    }
+
+    @Test
+    public void windowOpenMainError() {
+        AtomicReference<Subscriber<? super Integer>> ref1 = new AtomicReference<>();
+
+        PublishProcessor<Object> pp = PublishProcessor.create();
+        Flowable<Integer> f1 = Flowable.<Integer>unsafeCreate(ref1::set);
+
+        AtomicInteger counter = new AtomicInteger();
+
+        TestSubscriber<Flowable<Object>> ts = pp
+        .window(f1, v -> Flowable.never())
+        .doOnNext(w -> {
+            if (counter.getAndIncrement() == 0) {
+                ref1.get().onNext(2);
+                pp.onNext(1);
+                pp.onError(new TestException());
+            }
+            w.test();
+        })
+        .test();
+
+        ref1.get().onSubscribe(new BooleanSubscription());
+        ref1.get().onNext(1);
+
+        ts.assertError(TestException.class);
+    }
+
+    @Test
+    public void windowOpenIgnoresDispose() {
+        AtomicReference<Subscriber<? super Integer>> ref1 = new AtomicReference<>();
+
+        PublishProcessor<Object> pp = PublishProcessor.create();
+        Flowable<Integer> f1 = Flowable.<Integer>unsafeCreate(ref1::set);
+
+        TestSubscriber<Flowable<Object>> ts = pp
+        .window(f1, v -> Flowable.never())
+        .take(1)
+        .doOnNext(w -> {
+            w.test();
+        })
+        .test();
+
+        ref1.get().onSubscribe(new BooleanSubscription());
+        ref1.get().onNext(1);
+        ref1.get().onNext(2);
+
+        ts.assertValueCount(1);
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().window(Flowable.never(), v -> Flowable.never()));
+    }
+
+    @Test
+    public void mainIgnoresCancelBeforeOnError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Flowable.fromPublisher(s -> {
+                s.onSubscribe(new BooleanSubscription());
+                s.onNext(1);
+                s.onError(new IOException());
+            })
+            .window(BehaviorProcessor.createDefault(1), v -> Flowable.error(new TestException()))
+            .doOnNext(w -> w.test())
+            .test()
+            .assertError(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
index e3d9466b3e..bf6a271b84 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
@@ -1321,5 +1321,27 @@ public void accept(Flowable<Integer> v) throws Throwable {
 
         inner.get().test().assertResult();
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().window(1, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void timedBoundarySignalAndDisposeRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            TestScheduler scheduler = new TestScheduler();
+
+            PublishProcessor<Integer> pp = PublishProcessor.create();
+
+            TestSubscriber<Flowable<Integer>> ts = pp.window(1, TimeUnit.MINUTES, scheduler, 1)
+            .test();
+
+            TestHelper.race(
+                    () -> pp.onNext(1),
+                    () -> ts.cancel()
+            );
+        }
+    }
 }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
index 614dc28aaa..bc012f9713 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
@@ -1914,4 +1914,30 @@ public Integer apply(Object[] t) throws Throwable {
         .test()
         .assertResult(2);
     }
+
+    @Test
+    public void fusedInnerPollCrashDelayError() {
+        Flowable.zip(
+                Flowable.range(1, 5),
+                Flowable.just(1)
+                .<Integer>map(v -> { throw new TestException(); })
+                .compose(TestHelper.flowableStripBoundary()),
+                (a, b) -> a + b, true
+        )
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void fusedInnerPollCrashRequestBoundaryDelayError() {
+        Flowable.zip(
+                Flowable.range(1, 5),
+                Flowable.just(1)
+                .<Integer>map(v -> { throw new TestException(); })
+                .compose(TestHelper.flowableStripBoundary()),
+                (a, b) -> a + b, true
+        )
+        .test(0L)
+        .assertFailure(TestException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
index 301a8a35f5..681748c39d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
@@ -18,12 +18,13 @@
 import java.io.IOException;
 import java.util.List;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
@@ -188,4 +189,79 @@ public void subscribe(MaybeEmitter<Integer> s) throws Exception {
 
         assertEquals(1, calls[0]);
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Maybe.concatArray(MaybeSubject.create(), MaybeSubject.create()));
+    }
+
+    @Test
+    public void badRequestDelayError() {
+        TestHelper.assertBadRequestReported(Maybe.concatArrayDelayError(MaybeSubject.create(), MaybeSubject.create()));
+    }
+
+    @Test
+    public void mixed() {
+        Maybe.concatArray(
+                Maybe.just(1),
+                Maybe.empty(),
+                Maybe.just(2),
+                Maybe.empty(),
+                Maybe.empty()
+        )
+        .test()
+        .assertResult(1, 2);
+    }
+
+    @Test
+    public void requestBeforeSuccess() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+        TestSubscriber<Integer> ts = Maybe.concatArray(ms, ms)
+        .test();
+
+        ts.assertEmpty();
+
+        ms.onSuccess(1);
+
+        ts.assertResult(1, 1);
+    }
+
+    @Test
+    public void requestBeforeComplete() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+        TestSubscriber<Integer> ts = Maybe.concatArray(ms, ms)
+        .test();
+
+        ts.assertEmpty();
+
+        ms.onComplete();
+
+        ts.assertResult();
+    }
+
+    @Test
+    public void requestBeforeSuccessDelayError() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+        TestSubscriber<Integer> ts = Maybe.concatArrayDelayError(ms, ms)
+        .test();
+
+        ts.assertEmpty();
+
+        ms.onSuccess(1);
+
+        ts.assertResult(1, 1);
+    }
+
+    @Test
+    public void requestBeforeCompleteDelayError() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+        TestSubscriber<Integer> ts = Maybe.concatArrayDelayError(ms, ms)
+        .test();
+
+        ts.assertEmpty();
+
+        ms.onComplete();
+
+        ts.assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
index 7450dc993b..7b9c33db99 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
@@ -24,6 +24,7 @@
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.util.CrashingMappedIterable;
 import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
@@ -158,4 +159,12 @@ public void subscribe(MaybeEmitter<Integer> s) throws Exception {
 
         assertEquals(1, calls[0]);
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Maybe.concat(Arrays.asList(
+                MaybeSubject.create(),
+                MaybeSubject.create()
+        )));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java
index bca4023f83..cc7a981050 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java
@@ -141,4 +141,9 @@ protected void subscribeActual(Subscriber<? super Integer> subscriber) {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribePublisher() {
+        TestHelper.checkDoubleOnSubscribeFlowableToMaybe(f -> Maybe.just(1).delaySubscription(f));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
index 1c840a2295..aed3f49199 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
@@ -27,7 +27,7 @@
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.CrashingIterable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -120,6 +120,20 @@ public Iterable<Integer> apply(Integer v) throws Exception {
         .assertResult(1);
     }
 
+    @Test
+    public void take2() {
+        Maybe.just(1).flattenAsFlowable(new Function<Integer, Iterable<Integer>>() {
+            @Override
+            public Iterable<Integer> apply(Integer v) throws Exception {
+                return Arrays.asList(v, v + 1);
+            }
+        })
+        .doOnSubscribe(s -> s.request(Long.MAX_VALUE))
+        .take(1)
+        .test()
+        .assertResult(1);
+    }
+
     @Test
     public void fused() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>().setInitialFusionMode(QueueFuseable.ANY);
@@ -562,4 +576,33 @@ public void remove() {
         ts.request(Long.MAX_VALUE);
         ts.assertValues(1, 1).assertNoErrors().assertNotComplete();
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(MaybeSubject.create().flattenAsFlowable(v -> Arrays.asList(v)));
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeMaybeToFlowable(m -> m.flattenAsFlowable(v -> Arrays.asList(v)));
+    }
+
+    @Test
+    public void onSuccessRequestRace() {
+        List<Object> list = Arrays.asList(1);
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+
+            MaybeSubject<Integer> ms = MaybeSubject.create();
+
+            TestSubscriber<Object> ts = ms.flattenAsFlowable(v -> list)
+            .test(0L);
+
+            TestHelper.race(
+                    () -> ms.onSuccess(1),
+                    () -> ts.request(1)
+            );
+
+            ts.assertResult(1);
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
index 70c432f5ae..28284b0a78 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
@@ -213,4 +213,18 @@ public String answer(InvocationOnMock invocation) throws Throwable {
         verify(observer).onSubscribe(any(Disposable.class));
         verifyNoMoreInteractions(observer);
     }
+
+    @Test
+    public void disposeUpfront() {
+        Maybe.fromCallable(() -> 1)
+        .test(true)
+        .assertEmpty();
+    }
+
+    @Test
+    public void success() {
+        Maybe.fromCallable(() -> 1)
+        .test()
+        .assertResult(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
index 247021b12b..a9a74f46a5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
@@ -214,4 +214,23 @@ public String answer(InvocationOnMock invocation) throws Throwable {
         verify(observer).onSubscribe(any(Disposable.class));
         verifyNoMoreInteractions(observer);
     }
+
+    @Test
+    public void success() {
+        Maybe.fromSupplier(() -> 1)
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void disposeUpfront() throws Throwable {
+        @SuppressWarnings("unchecked")
+        Supplier<Integer> supplier = mock(Supplier.class);
+
+        Maybe.fromSupplier(supplier)
+        .test(true)
+        .assertEmpty();
+
+        verify(supplier, never()).get();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
index 6b886fd894..0ddc2eefe1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
@@ -17,16 +17,16 @@
 
 import java.util.*;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeMergeArray.MergeMaybeObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -250,4 +250,25 @@ public void onComplete() {
             }
         });
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(
+                Maybe.mergeArray(MaybeSubject.create(), MaybeSubject.create())
+        );
+    }
+
+    @Test
+    public void cancel2() {
+        TestHelper.checkDisposed(Maybe.mergeArray(MaybeSubject.create(), MaybeSubject.create()));
+    }
+
+    @Test
+    public void take() {
+        Maybe.mergeArray(Maybe.just(1), Maybe.empty(), Maybe.just(2))
+        .doOnSubscribe(s -> s.request(Long.MAX_VALUE))
+        .take(1)
+        .test()
+        .assertResult(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java
index 188db93597..22e99bf9aa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java
@@ -19,7 +19,9 @@
 
 import org.junit.Test;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.observers.TestObserver;
@@ -231,4 +233,29 @@ public Object apply(Flowable<Integer> f) throws Exception {
             }
         }, false, null, 1, 1);
     }
+
+    @Test
+    public void mainSuccessAfterOtherSignal() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        new Maybe<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull MaybeObserver<? super Integer> observer) {
+                observer.onSubscribe(Disposable.empty());
+                pp.onNext(2);
+                observer.onSuccess(1);
+            }
+        }
+        .timeout(pp)
+        .test()
+        .assertFailure(TimeoutException.class);
+    }
+
+    @Test
+    public void mainSuccess() {
+        Maybe.just(1)
+        .timeout(Flowable.never())
+        .test()
+        .assertResult(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java
index 7e30ce6a49..ba806c5a32 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java
@@ -19,12 +19,15 @@
 
 import org.junit.Test;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class MaybeTimeoutTest extends RxJavaTest {
@@ -341,4 +344,21 @@ public void run() {
             }
         }
     }
+
+    @Test
+    public void mainSuccessAfterOtherSignal() {
+        MaybeSubject<Integer> ms = MaybeSubject.create();
+
+        new Maybe<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull MaybeObserver<? super Integer> observer) {
+                observer.onSubscribe(Disposable.empty());
+                ms.onSuccess(2);
+                observer.onSuccess(1);
+            }
+        }
+        .timeout(ms)
+        .test()
+        .assertFailure(TimeoutException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
index c685e79cae..1407886997 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
@@ -15,17 +15,21 @@
 
 import static org.junit.Assert.*;
 
-import java.util.List;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class MaybeZipArrayTest extends RxJavaTest {
@@ -168,4 +172,53 @@ public void singleSourceZipperReturnsNull() {
         .to(TestHelper.<Object>testConsumer())
         .assertFailureAndMessage(NullPointerException.class, "The zipper returned a null value");
     }
+
+    @Test
+    public void dispose2() {
+        TestHelper.checkDisposed(Maybe.zipArray(v -> v, MaybeSubject.create(), MaybeSubject.create()));
+    }
+
+    @Test
+    public void bothComplete() {
+        AtomicReference<MaybeObserver<? super Integer>> ref1 = new AtomicReference<>();
+        AtomicReference<MaybeObserver<? super Integer>> ref2 = new AtomicReference<>();
+
+        Maybe<Integer> m1 = new Maybe<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull MaybeObserver<? super Integer> observer) {
+                ref1.set(observer);
+            }
+        };
+        Maybe<Integer> m2 = new Maybe<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull MaybeObserver<? super Integer> observer) {
+                ref2.set(observer);
+            }
+        };
+
+        TestObserver<Object[]> to = Maybe.zipArray(v -> v, m1, m2)
+        .test();
+
+        ref1.get().onSubscribe(Disposable.empty());
+        ref2.get().onSubscribe(Disposable.empty());
+
+        ref1.get().onComplete();
+        ref2.get().onComplete();
+
+        to.assertResult();
+    }
+
+    @Test
+    public void bothSucceed() {
+        Maybe.zipArray(v -> Arrays.asList(v), Maybe.just(1), Maybe.just(2))
+        .test()
+        .assertResult(Arrays.asList(1, 2));
+    }
+
+    @Test
+    public void oneSourceOnly() {
+        Maybe.zipArray(v -> Arrays.asList(v), Maybe.just(1))
+        .test()
+        .assertResult(Arrays.asList(1));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
index 4b6e2bc5cd..2eb25e0dab 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
@@ -23,7 +23,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.operators.observable.BlockingObservableIterable.BlockingObservableIterator;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -131,4 +131,13 @@ public void run() {
 
         assertFalse(it.hasNext());
     }
+
+    @Test(expected = TestException.class)
+    public void errorAfterDispose() {
+        Iterator<Object> it = Observable.error(new TestException()).blockingIterable().iterator();
+
+        ((Disposable)it).dispose();
+
+        it.hasNext();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
index 293607d66b..9883764f28 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
@@ -364,4 +364,14 @@ public boolean test(Integer v) throws Exception {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservableToSingle(o -> o.all(v -> true));
+    }
+
+    @Test
+    public void doubleOnSubscribeObservable() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.all(v -> true).toObservable());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
index af4e7a9415..30c9efd221 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
@@ -37,7 +37,7 @@
 import io.reactivex.rxjava3.observers.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.*;
-import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableBufferTest extends RxJavaTest {
@@ -1788,4 +1788,31 @@ public List<Object> get() throws Exception {
                 .assertFailure(TestException.class)
         ;
     }
+
+    @Test
+    public void timedUnboundedCancelUpfront() {
+        Observable.never()
+        .buffer(1, TimeUnit.SECONDS)
+        .test(true)
+        .assertEmpty();
+    }
+
+    @Test
+    public void boundaryCloseCompleteRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            BehaviorSubject<Integer> bs = BehaviorSubject.createDefault(1);
+            PublishSubject<Integer> ps = PublishSubject.create();
+
+            TestObserver<List<Integer>> to = bs
+                    .buffer(BehaviorSubject.createDefault(0), v -> ps)
+                    .test();
+
+            TestHelper.race(
+                    () -> bs.onComplete(),
+                    () -> ps.onComplete()
+            );
+
+            to.assertResult(Arrays.asList(1));
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
index 8f4440e41b..3ad0f0ef67 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
@@ -20,12 +20,12 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.observers.TestObserver;
@@ -341,4 +341,18 @@ public Object call() throws Exception {
 
         assertEquals(1, call.get());
     }
+
+    @Test
+    public void addRemoveRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            Observable<Object> o = Observable.never().cache();
+
+            TestObserver<Object> to = o.test();
+
+            TestHelper.race(
+                    () -> to.dispose(),
+                    () -> o.test()
+            );
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
index e304a27a33..d8f35d38d1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
@@ -19,7 +19,7 @@
 
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.*;
 
 import org.junit.Test;
 import org.mockito.*;
@@ -1226,4 +1226,76 @@ public Integer apply(Object[] t) throws Throwable {
         .test()
         .assertResult(2);
     }
+
+    @Test
+    public void onCompleteDisposeRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+
+            TestObserver<Integer> to = new TestObserver<>();
+            PublishSubject<Integer> ps = PublishSubject.create();
+
+            Observable.combineLatest(ps, Observable.never(), (a, b) -> a)
+            .subscribe(to);
+
+            TestHelper.race(() -> ps.onComplete(), () -> to.dispose());
+        }
+    }
+
+    @Test
+    public void onErrorDisposeDelayErrorRace() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestException ex = new TestException();
+
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+
+                TestObserverEx<Object[]> to = new TestObserverEx<>();
+                AtomicReference<Observer<? super Object>> ref = new AtomicReference<>();
+                Observable<Object> o = new Observable<Object>() {
+                    @Override
+                    public void subscribeActual(Observer<? super Object> observer) {
+                        ref.set(observer);
+                    }
+                };
+
+                Observable.combineLatestDelayError(Arrays.asList(o, Observable.never()), (a) -> a)
+                .subscribe(to);
+
+                ref.get().onSubscribe(Disposable.empty());
+
+                TestHelper.race(() -> ref.get().onError(ex), () -> to.dispose());
+
+                if (to.errors().isEmpty()) {
+                    TestHelper.assertUndeliverable(errors, 0, TestException.class);
+                }
+            }
+        });
+    }
+
+    @Test
+    public void doneButNotEmpty() {
+        PublishSubject<Integer> ps1 = PublishSubject.create();
+        PublishSubject<Integer> ps2 = PublishSubject.create();
+
+        TestObserver<Integer> to = Observable.combineLatest(ps1, ps2, (a, b) -> a + b)
+        .doOnNext(v -> {
+            if (v == 2) {
+                ps2.onNext(3);
+                ps2.onComplete();
+                ps1.onComplete();
+            }
+        })
+        .test();
+
+        ps1.onNext(1);
+        ps2.onNext(1);
+
+        to.assertResult(2, 4);
+    }
+
+    @Test
+    public void iterableNullPublisher() {
+        Observable.combineLatest(Arrays.asList(Observable.never(), null), (a) -> a)
+        .test()
+        .assertFailure(NullPointerException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
index 054ab91d8f..079a8c8a47 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
@@ -1078,4 +1078,13 @@ public void observerDelayErrorMaxConcurrency() {
         .test()
         .assertFailure(TestException.class, 1, 2, 3, 4, 5);
     }
+
+    @Test
+    public void innerFusionRejected() {
+        Observable.just(1)
+        .hide()
+        .concatMapEager(v -> TestHelper.rejectObservableFusion())
+        .test()
+        .assertEmpty();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
index a82553b9a4..48ab5a2fc1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
@@ -20,14 +20,16 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.observers.*;
@@ -1049,4 +1051,70 @@ public Observable<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void fusionRejected() {
+        TestObserverEx<Object> to = new TestObserverEx<>();
+
+        TestHelper.rejectObservableFusion()
+        .concatMap(v -> Observable.never(), 2, ImmediateThinScheduler.INSTANCE)
+        .subscribe(to);
+    }
+
+    @Test
+    public void fusionRejectedDelayErrorr() {
+        TestObserverEx<Object> to = new TestObserverEx<>();
+
+        TestHelper.rejectObservableFusion()
+        .concatMapDelayError(v -> Observable.never(), true, 2, ImmediateThinScheduler.INSTANCE)
+        .subscribe(to);
+    }
+
+    @Test
+    public void scalarInnerJustDisposeDelayError() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Observable.just(1)
+        .hide()
+        .concatMapDelayError(v -> Observable.fromCallable(() -> {
+            to.dispose();
+            return 1;
+        }), true, 2, ImmediateThinScheduler.INSTANCE)
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
+
+    static final class EmptyDisposingObservable extends Observable<Object>
+    implements Supplier<Object> {
+        final TestObserver<Object> to;
+        EmptyDisposingObservable(TestObserver<Object> to) {
+            this.to = to;
+        }
+
+        @Override
+        protected void subscribeActual(@NonNull Observer<? super @NonNull Object> observer) {
+            EmptyDisposable.complete(observer);
+        }
+
+        @Override
+        public @NonNull Object get() throws Throwable {
+            to.dispose();
+            return null;
+        }
+    }
+
+    @Test
+    public void scalarInnerEmptyDisposeDelayError() {
+        TestObserver<Object> to = new TestObserver<>();
+
+        Observable.just(1)
+        .hide()
+        .concatMapDelayError(v -> new EmptyDisposingObservable(to),
+                true, 2, ImmediateThinScheduler.INSTANCE
+        )
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
index a5d2a6aa4c..f8aa2cf42b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
@@ -22,10 +22,11 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.observable.ObservableConcatMapSchedulerTest.EmptyDisposingObservable;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.*;
@@ -565,4 +566,108 @@ public Observable<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.concatMap(v -> Observable.never()));
+    }
+
+    @Test
+    public void doubleOnSubscribeDelayError() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.concatMapDelayError(v -> Observable.never()));
+    }
+
+    @Test
+    public void scalarXMap() {
+        Observable.fromCallable(() -> 1)
+        .concatMap(v -> Observable.just(2).hide())
+        .test()
+        .assertResult(2);
+    }
+
+    @Test
+    public void rejectedFusion() {
+        TestHelper.rejectObservableFusion()
+        .concatMap(v  -> Observable.never())
+        .test();
+    }
+
+    @Test
+    public void rejectedFusionDelayError() {
+        TestHelper.rejectObservableFusion()
+        .concatMapDelayError(v  -> Observable.never())
+        .test();
+    }
+
+    @Test
+    public void asyncFusedDelayError() {
+        UnicastSubject<Integer> uc = UnicastSubject.create();
+
+        TestObserver<Integer> to = uc.concatMapDelayError(v -> Observable.just(v).hide())
+        .test();
+
+        uc.onNext(1);
+        uc.onComplete();
+
+        to.assertResult(1);
+    }
+
+    @Test
+    public void scalarInnerJustDelayError() {
+        Observable.just(1)
+        .hide()
+        .concatMapDelayError(v -> Observable.just(v))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void scalarInnerEmptyDelayError() {
+        Observable.just(1)
+        .hide()
+        .concatMapDelayError(v -> Observable.empty())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void scalarInnerJustDisposeDelayError() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Observable.just(1)
+        .hide()
+        .concatMapDelayError(v -> Observable.fromCallable(() -> {
+            to.dispose();
+            return 1;
+        }))
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
+
+    @Test
+    public void scalarInnerEmptyDisposeDelayError() {
+        TestObserver<Object> to = new TestObserver<>();
+
+        Observable.just(1)
+        .hide()
+        .concatMapDelayError(v -> new EmptyDisposingObservable(to))
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
+
+    @Test
+    public void delayErrorInnerActive() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = Observable.range(1, 5)
+        .hide()
+        .concatMapDelayError(v -> ps)
+        .test();
+
+        ps.onComplete();
+
+        to.assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
index a0faf3179b..9f25879a60 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
@@ -17,13 +17,16 @@
 
 import java.io.IOException;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Cancellable;
+import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -654,4 +657,96 @@ public void subscribe(ObservableEmitter<Object> emitter) throws Exception {
             }
         }).test().assertEmpty();
     }
+
+    @Test
+    public void emptySerialized() {
+        Observable.create(emitter -> emitter.serialize().onComplete())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void serializedDisposedBeforeOnNext() {
+        TestObserver<Object> to = new TestObserver<>();
+
+        Observable.create(emitter -> {
+            to.dispose();
+            emitter.serialize().onNext(1);
+        })
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
+
+    @Test
+    public void serializedOnNextAfterComplete() {
+        TestObserver<Object> to = new TestObserver<>();
+
+        Observable.create(emitter -> {
+            emitter = emitter.serialize();
+
+            emitter.onComplete();
+            emitter.onNext(1);
+        })
+        .subscribe(to);
+
+        to.assertResult();
+    }
+
+    @Test
+    public void serializedEnqueueAndDrainRace() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            TestObserver<Integer> to = new TestObserver<>();
+            AtomicReference<ObservableEmitter<Integer>> ref = new AtomicReference<>();
+
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            Observable.<Integer>create(emitter -> {
+                emitter = emitter.serialize();
+                ref.set(emitter);
+                emitter.onNext(1);
+            })
+            .doOnNext(v -> {
+                if (v == 1) {
+                    TestHelper.raceOther(() -> {
+                        ref.get().onNext(2);
+                    }, cdl);
+                    ref.get().onNext(3);
+                }
+            })
+            .subscribe(to);
+
+            cdl.await();
+
+            to.assertValueCount(3);
+        }
+    }
+
+    @Test
+    public void serializedDrainDoneButNotEmpty() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            TestObserver<Integer> to = new TestObserver<>();
+            AtomicReference<ObservableEmitter<Integer>> ref = new AtomicReference<>();
+
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            Observable.<Integer>create(emitter -> {
+                emitter = emitter.serialize();
+                ref.set(emitter);
+                emitter.onNext(1);
+            })
+            .doOnNext(v -> {
+                if (v == 1) {
+                    TestHelper.raceOther(() -> {
+                        ref.get().onNext(2);
+                        ref.get().onComplete();
+                    }, cdl);
+                    ref.get().onNext(3);
+                }
+            })
+            .subscribe(to);
+
+            cdl.await();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
index d59431a677..4b3a64def7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
@@ -517,4 +517,9 @@ public ObservableSource<Object> apply(Object o) {
             }
         }).subscribe();
     }
+
+    @Test
+    public void doubleOnSubscribeTime() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.debounce(1, TimeUnit.SECONDS));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
index 8c7b6017ab..bc041cb1be 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
@@ -221,16 +221,17 @@ protected void subscribeActual(Observer<? super Notification<Object>> observer)
     }
 
     @Test
+    @SuppressWarnings("unchecked")
     public void nonNotificationInstanceAfterDispose() {
-        new Observable<Notification<Object>>() {
+        new Observable<Object>() {
             @Override
-            protected void subscribeActual(Observer<? super Notification<Object>> observer) {
+            protected void subscribeActual(Observer<? super Object> observer) {
                 observer.onSubscribe(Disposable.empty());
                 observer.onNext(Notification.createOnComplete());
-                observer.onNext(Notification.<Object>createOnNext(1));
+                observer.onNext(1);
             }
         }
-        .dematerialize(Functions.<Notification<Object>>identity())
+        .dematerialize(v -> (Notification<Object>)v)
         .test()
         .assertResult();
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
index 6328a1ba4f..d3a11c186d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
@@ -519,4 +519,16 @@ public void run() throws Exception {
         assertEquals(Arrays.asList("onNext", "onComplete", "finally"), list);
     }
 
+    @Test
+    public void fusionRejected() {
+        TestObserverEx<Object> to = new TestObserverEx<>();
+        to.setInitialFusionMode(QueueFuseable.ANY);
+
+        TestHelper.rejectObservableFusion()
+        .doFinally(() -> { })
+        .subscribeWith(to);
+
+        to.assertFuseable()
+        .assertFusionMode(QueueFuseable.NONE);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
index 95baba1448..169186da49 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
@@ -16,7 +16,7 @@
 import static org.junit.Assert.*;
 
 import java.util.List;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 import org.junit.Test;
 
@@ -506,4 +506,59 @@ public Completable apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.flatMapCompletable(v -> Completable.never()).toObservable());
+    }
+
+    @Test
+    public void doubleOnSubscribeCompletable() {
+        TestHelper.checkDoubleOnSubscribeObservableToCompletable(o -> o.flatMapCompletable(v -> Completable.never()));
+    }
+
+    @Test
+    public void cancelWhileMapping() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishSubject<Integer> ps1 = PublishSubject.create();
+
+            TestObserver<Object> to = new TestObserver<>();
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            ps1.flatMapCompletable(v -> {
+                TestHelper.raceOther(() -> {
+                    to.dispose();
+                }, cdl);
+                return Completable.complete();
+            })
+            .toObservable()
+            .subscribe(to);
+
+            ps1.onNext(1);
+
+            cdl.await();
+        }
+    }
+
+    @Test
+    public void cancelWhileMappingCompletable() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishSubject<Integer> ps1 = PublishSubject.create();
+
+            TestObserver<Void> to = new TestObserver<>();
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            ps1.flatMapCompletable(v -> {
+                TestHelper.raceOther(() -> {
+                    to.dispose();
+                }, cdl);
+                return Completable.complete();
+            })
+            .subscribe(to);
+
+            ps1.onNext(1);
+
+            cdl.await();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
index a1540dcfca..6bb2b40dc3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
@@ -21,14 +21,14 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFlatMapMaybeTest extends RxJavaTest {
@@ -483,4 +483,64 @@ public Maybe<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void cancelWhileMapping() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishSubject<Integer> ps1 = PublishSubject.create();
+
+            TestObserver<Integer> to = new TestObserver<>();
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            ps1.flatMapMaybe(v -> {
+                TestHelper.raceOther(() -> {
+                    to.dispose();
+                }, cdl);
+                return Maybe.just(1);
+            })
+            .subscribe(to);
+
+            ps1.onNext(1);
+
+            cdl.await();
+        }
+    }
+
+    @Test
+    public void successCompleteRace() {
+        for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
+            MaybeSubject<Integer> ms1 = MaybeSubject.create();
+            MaybeSubject<Integer> ms2 = MaybeSubject.create();
+
+            TestObserver<Integer> to = Observable.just(1, 2)
+            .flatMapMaybe(v -> v == 1 ? ms1 : ms2)
+            .test();
+
+            TestHelper.race(
+                    () -> ms1.onComplete(),
+                    () -> ms2.onSuccess(1)
+            );
+
+            to.assertResult(1);
+        }
+    }
+
+    @Test
+    public void successCompleteRace2() {
+        for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
+            MaybeSubject<Integer> ms1 = MaybeSubject.create();
+            MaybeSubject<Integer> ms2 = MaybeSubject.create();
+
+            TestObserver<Integer> to = Observable.just(1, 2)
+            .flatMapMaybe(v -> v == 1 ? ms1 : ms2)
+            .test();
+
+            TestHelper.race(
+                    () -> ms2.onSuccess(1),
+                    () -> ms1.onComplete()
+            );
+
+            to.assertResult(1);
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
index b990bd407c..5eefbacb4a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
@@ -21,14 +21,14 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFlatMapSingleTest extends RxJavaTest {
@@ -398,4 +398,69 @@ public Single<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void innerErrorOuterCompleteRace() {
+        TestException ex = new TestException();
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishSubject<Integer> ps1 = PublishSubject.create();
+            SingleSubject<Integer> ps2 = SingleSubject.create();
+
+            TestObserver<Integer> to = ps1.flatMapSingle(v -> ps2)
+            .test();
+
+            ps1.onNext(1);
+
+            TestHelper.race(
+                    () -> ps1.onComplete(),
+                    () -> ps2.onError(ex)
+            );
+
+            to.assertFailure(TestException.class);
+        }
+    }
+
+    @Test
+    public void cancelWhileMapping() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishSubject<Integer> ps1 = PublishSubject.create();
+
+            TestObserver<Integer> to = new TestObserver<>();
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            ps1.flatMapSingle(v -> {
+                TestHelper.raceOther(() -> {
+                    to.dispose();
+                }, cdl);
+                return Single.just(1);
+            })
+            .subscribe(to);
+
+            ps1.onNext(1);
+
+            cdl.await();
+        }
+    }
+
+    @Test
+    public void onNextDrainCancel() {
+        SingleSubject<Integer> ss1 = SingleSubject.create();
+        SingleSubject<Integer> ss2 = SingleSubject.create();
+
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Observable.just(1, 2)
+        .flatMapSingle(v -> v == 1 ? ss1 : ss2)
+        .doOnNext(v -> {
+            if (v == 1) {
+                ss2.onSuccess(2);
+                to.dispose();
+            }
+        })
+        .subscribe(to);
+
+        ss1.onSuccess(1);
+
+        to.assertValuesOnly(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
index 8dca948c81..165aa9dabf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
@@ -17,12 +17,14 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
+import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
@@ -1113,4 +1115,129 @@ public void innerErrorsMainCancelled() {
 
         assertFalse("Has subscribers?", ps1.hasObservers());
     }
+
+    @Test
+    public void signalsAfterMapperCrash() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull Observer<? super @NonNull Integer> observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onNext(1);
+                    observer.onNext(2);
+                    observer.onComplete();
+                    observer.onError(new IOException());
+                }
+            }
+            .flatMap(v -> {
+                throw new TestException();
+            })
+            .test()
+            .assertFailure(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        });
+    }
+
+    @Test
+    public void scalarQueueTerminate() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+        TestObserver<Integer> to = new TestObserver<>();
+
+        ps
+        .flatMap(v -> Observable.just(v))
+        .doOnNext(v -> {
+            if (v == 1) {
+                ps.onNext(2);
+                ps.onNext(3);
+            }
+        })
+        .take(2)
+        .subscribe(to);
+
+        ps.onNext(1);
+
+        to.assertResult(1, 2);
+    }
+
+    @Test
+    public void scalarQueueCompleteMain() throws Exception {
+        PublishSubject<Integer> ps = PublishSubject.create();
+        TestObserver<Integer> to = new TestObserver<>();
+        CountDownLatch cdl = new CountDownLatch(1);
+        ps
+        .flatMap(v -> Observable.just(v))
+        .doOnNext(v -> {
+            if (v == 1) {
+                ps.onNext(2);
+                TestHelper.raceOther(() -> ps.onComplete(), cdl);
+            }
+        })
+        .subscribe(to);
+
+        ps.onNext(1);
+
+        cdl.await();
+        to.assertResult(1, 2);
+    }
+
+    @Test
+    public void fusedInnerCrash() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = Observable.just(
+                ps,
+                us.map(v -> {
+                    if (v == 10) {
+                        throw new TestException();
+                    }
+                    return v;
+                })
+                .compose(TestHelper.observableStripBoundary())
+        )
+        .flatMap(v -> v, true)
+        .doOnNext(v -> {
+            if (v == 1) {
+                ps.onNext(2);
+                us.onNext(10);
+            }
+        })
+        .test();
+
+        ps.onNext(1);
+        ps.onComplete();
+
+        to.assertFailure(TestException.class, 1, 2);
+    }
+
+    @Test
+    public void fusedInnerCrash2() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = Observable.just(
+                us.map(v -> {
+                    if (v == 10) {
+                        throw new TestException();
+                    }
+                    return v;
+                })
+                .compose(TestHelper.observableStripBoundary())
+                , ps
+        )
+        .flatMap(v -> v, true)
+        .doOnNext(v -> {
+            if (v == 1) {
+                ps.onNext(2);
+                us.onNext(10);
+            }
+        })
+        .test();
+
+        ps.onNext(1);
+        ps.onComplete();
+
+        to.assertFailure(TestException.class, 1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java
index 2fdf6b24f3..8a2de4cf48 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java
@@ -96,4 +96,9 @@ public void remove() {
 
         assertEquals(1, counter.get());
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.flatMapIterable(v -> Collections.singletonList(v)));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
index 6cdc0108d6..68c9f10292 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
@@ -24,7 +24,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -192,4 +192,16 @@ public void syncFusedRejected() throws Throwable {
 
         verify(action).run();
     }
+
+    @Test
+    public void disposed() {
+        TestHelper.checkDisposed(Observable.fromCompletable(Completable.never()));
+    }
+
+    @Test
+    public void upstream() {
+        Observable<?> o = Observable.fromCompletable(Completable.never());
+        assertTrue(o instanceof HasUpstreamCompletableSource);
+        assertSame(Completable.never(), ((HasUpstreamCompletableSource)o).source());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
index a3c546933a..ec6b70e31b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
@@ -345,4 +345,28 @@ public void onComplete() {
             }
         });
     }
+
+    @Test
+    public void disposeAfterHasNext() {
+        TestObserver<Integer> to = new TestObserver<>();
+
+        Observable.fromIterable(() -> new Iterator<Integer>() {
+            int count;
+            @Override
+            public boolean hasNext() {
+                if (count++ == 2) {
+                    to.dispose();
+                    return false;
+                }
+                return true;
+            }
+
+            @Override
+            public Integer next() {
+                return 1;
+            }
+        })
+        .subscribeWith(to)
+        .assertValuesOnly(1, 1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java
index 19735a3ad4..f6beca1800 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java
@@ -194,4 +194,17 @@ public void accept(Emitter<Object> e) throws Exception {
         .test()
         .assertResult();
     }
+
+    @Test
+    public void onNextAfterOnComplete() {
+        Observable.generate(new Consumer<Emitter<Object>>() {
+            @Override
+            public void accept(Emitter<Object> e) throws Exception {
+                e.onComplete();
+                e.onNext(1);
+            }
+        })
+        .test()
+        .assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
index 28d3f2d643..22a56a3356 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
@@ -27,14 +27,14 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.observables.GroupedObservable;
 import io.reactivex.rxjava3.observers.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableGroupByTest extends RxJavaTest {
@@ -1672,4 +1672,68 @@ public void accept(GroupedObservable<Integer, Object> g) throws Throwable {
 
         to2.assertFailure(TestException.class, 1);
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.groupBy(v -> v));
+    }
+
+    @Test
+    public void nullKeyDisposeGroup() {
+        Observable.just(1)
+        .groupBy(v -> null)
+        .flatMap(v -> v.take(1))
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void groupSubscribeOnNextRace() throws Throwable {
+        for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
+            BehaviorSubject<Integer> bs = BehaviorSubject.createDefault(1);
+            CountDownLatch cdl = new CountDownLatch(1);
+
+            bs.groupBy(v -> 1)
+            .doOnNext(g -> {
+                TestHelper.raceOther(() -> {
+                    g.test();
+                }, cdl);
+            })
+            .test();
+
+            cdl.await();
+        }
+    }
+
+    @Test
+    public void abandonedGroupDispose() {
+        AtomicReference<Observable<Integer>> ref = new AtomicReference<>();
+
+        Observable.just(1)
+        .groupBy(v -> 1)
+        .doOnNext(ref::set)
+        .test();
+
+        ref.get().take(1).test().assertResult(1);
+    }
+
+    @Test
+    public void delayErrorCompleteMoreWorkInGroup() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.groupBy(v -> 1, true)
+        .flatMap(g -> g.doOnNext(v -> {
+            if (v == 1) {
+                ps.onNext(2);
+                ps.onComplete();
+            }
+        })
+        )
+        .test()
+        ;
+
+        ps.onNext(1);
+
+        to.assertResult(1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
index 5998e37a64..3f01c05cb4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
@@ -726,4 +726,42 @@ public void leftRightEndState() {
 
         verify(js).innerClose(false, o);
     }
+
+    @Test
+    public void disposeAfterOnNext() {
+        PublishSubject<Integer> ps1 = PublishSubject.create();
+        PublishSubject<Integer> ps2 = PublishSubject.create();
+
+        TestObserver<Integer> to = new TestObserver<>();
+
+        ps1.groupJoin(ps2, v -> Observable.never(), v -> Observable.never(), (a, b) -> a)
+        .doOnNext(v -> {
+            to.dispose();
+        })
+        .subscribe(to);
+
+        ps2.onNext(1);
+        ps1.onNext(1);
+    }
+
+    @Test
+    public void completeWithMoreWork() {
+        PublishSubject<Integer> ps1 = PublishSubject.create();
+        PublishSubject<Integer> ps2 = PublishSubject.create();
+
+        TestObserver<Integer> to = new TestObserver<>();
+
+        ps1.groupJoin(ps2, v -> Observable.never(), v -> Observable.never(), (a, b) -> a)
+        .doOnNext(v -> {
+            if (v == 1) {
+                ps2.onNext(2);
+                ps1.onComplete();
+                ps2.onComplete();
+            }
+        })
+        .subscribe(to);
+
+        ps2.onNext(1);
+        ps1.onNext(1);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java
index 95f26637bf..db42957fa5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java
@@ -85,4 +85,12 @@ public void cancel() {
         .test()
         .assertResult(0L, 1L, 2L, 3L, 4L, 5L, 6L, 7L, 8L, 9L);
     }
+
+    @Test
+    public void takeSameAsRange() {
+        Observable.intervalRange(0, 2, 1, 1, TimeUnit.MILLISECONDS, Schedulers.trampoline())
+        .take(2)
+        .test()
+        .assertResult(0L, 1L);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
index aa17361026..54c2822395 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
@@ -446,4 +446,27 @@ public Integer apply(Integer a, Integer b) throws Exception {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void bothTerminateWithWorkRemaining() {
+        PublishSubject<Integer> ps1 = PublishSubject.create();
+        PublishSubject<Integer> ps2 = PublishSubject.create();
+
+        TestObserver<Integer> to = ps1.join(
+                ps2,
+                v -> Observable.never(),
+                v -> Observable.never(),
+                (a, b) -> a + b)
+        .doOnNext(v -> {
+            ps1.onComplete();
+            ps2.onNext(2);
+            ps2.onComplete();
+        })
+        .test();
+
+        ps1.onNext(0);
+        ps2.onNext(1);
+
+        to.assertComplete();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
index d9b98de8f9..09b0bf0cfe 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
@@ -45,7 +45,25 @@
 public class ObservableRefCountTest extends RxJavaTest {
 
     @Test
-    public void refCountAsync() {
+    public void refCountAsync() throws InterruptedException {
+        // Flaky
+        for (int i = 0; i < 10; i++) {
+            try {
+                refCountAsyncActual();
+                return;
+            } catch (AssertionError ex) {
+                if (i == 9) {
+                    throw ex;
+                }
+                Thread.sleep((int)(200 * (Math.random() * 10 + 1)));
+            }
+        }
+    }
+
+    /**
+     * Tries to coordinate async counting but it is flaky due to the low 10s of milliseconds.
+     */
+    void refCountAsyncActual() {
         final AtomicInteger subscribeCount = new AtomicInteger();
         final AtomicInteger nextCount = new AtomicInteger();
         Observable<Long> r = Observable.interval(0, 25, TimeUnit.MILLISECONDS)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
index 9b31f51e8d..cbaf961149 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
@@ -1698,4 +1698,30 @@ public void accept(byte[] v) throws Exception {
             Assert.fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0)
                     + " -> " + after.get() / 1024.0 / 1024.0);
         }
-    }}
+    }
+
+    @Test(expected = TestException.class)
+    public void connectDisposeCrash() {
+        ConnectableObservable<Object> co = Observable.never().replay();
+
+        co.connect();
+
+        co.connect(d ->  { throw new TestException(); });
+    }
+
+    @Test
+    public void resetWhileNotConnectedIsNoOp() {
+        ConnectableObservable<Object> co = Observable.never().replay();
+
+        co.reset();
+    }
+
+    @Test
+    public void resetWhileActiveIsNoOp() {
+        ConnectableObservable<Object> co = Observable.never().replay();
+
+        co.connect();
+
+        co.reset();
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
index 0861fc2596..3e842e67ed 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
@@ -439,4 +439,8 @@ public Observable<Object> apply(Observable<Object> o)
         });
     }
 
+    @Test
+    public void doubleOnSubscribeObservable() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.sample(Observable.never()));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
index bffd568b70..4bfee7eb01 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
@@ -21,6 +21,7 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.testsupport.TestHelper;
@@ -234,4 +235,13 @@ public void run() {
             TestHelper.race(r1, r2);
         }
     }
+
+    @Test
+    public void scalarDisposbleWrongFusion() {
+        TestObserver<Integer> to = new TestObserver<>();
+        final ScalarDisposable<Integer> sd = new ScalarDisposable<>(to, 1);
+        to.onSubscribe(sd);
+
+        assertEquals(QueueFuseable.NONE, sd.requestFusion(QueueFuseable.ASYNC));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java
index 3d805ec79a..da75e3ee94 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java
@@ -336,4 +336,77 @@ public void run() {
             to.assertEmpty();
         }
     }
+
+    @Test
+    public void firstCompletesBeforeSecond() {
+        Observable.sequenceEqual(Observable.just(1), Observable.empty())
+        .test()
+        .assertResult(false);
+    }
+
+    @Test
+    public void secondCompletesBeforeFirst() {
+        Observable.sequenceEqual(Observable.empty(), Observable.just(1))
+        .test()
+        .assertResult(false);
+    }
+
+    @Test
+    public void bothEmpty() {
+        Observable.sequenceEqual(Observable.empty(), Observable.empty())
+        .test()
+        .assertResult(true);
+    }
+
+    @Test
+    public void bothJust() {
+        Observable.sequenceEqual(Observable.just(1), Observable.just(1))
+        .test()
+        .assertResult(true);
+    }
+
+    @Test
+    public void bothCompleteWhileComparing() {
+        PublishSubject<Integer> ps1 = PublishSubject.create();
+        PublishSubject<Integer> ps2 = PublishSubject.create();
+
+        TestObserver<Boolean> to = Observable.sequenceEqual(ps1, ps2, (a, b) -> {
+            ps1.onNext(1);
+            ps1.onComplete();
+
+            ps2.onNext(1);
+            ps2.onComplete();
+            return a.equals(b);
+        })
+        .test()
+        ;
+
+        ps1.onNext(0);
+        ps2.onNext(0);
+
+        to.assertResult(true);
+    }
+
+    @Test
+    public void bothCompleteWhileComparingAsObservable() {
+        PublishSubject<Integer> ps1 = PublishSubject.create();
+        PublishSubject<Integer> ps2 = PublishSubject.create();
+
+        TestObserver<Boolean> to = Observable.sequenceEqual(ps1, ps2, (a, b) -> {
+            ps1.onNext(1);
+            ps1.onComplete();
+
+            ps2.onNext(1);
+            ps2.onComplete();
+            return a.equals(b);
+        })
+        .toObservable()
+        .test()
+        ;
+
+        ps1.onNext(0);
+        ps2.onNext(0);
+
+        to.assertResult(true);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java
index d0a1b24fa2..650575e7f3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java
@@ -194,7 +194,7 @@ public ObservableSource<Object> apply(Observable<Object> o) throws Exception {
     }
 
     @Test
-    public void onNextDisposeRace() {
+    public void onCompleteDisposeRace() {
         TestScheduler scheduler = new TestScheduler();
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final PublishSubject<Integer> ps = PublishSubject.create();
@@ -219,6 +219,32 @@ public void run() {
         }
     }
 
+    @Test
+    public void onCompleteDisposeDelayErrorRace() {
+        TestScheduler scheduler = new TestScheduler();
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            final PublishSubject<Integer> ps = PublishSubject.create();
+
+            final TestObserver<Integer> to = ps.skipLast(1, TimeUnit.DAYS, scheduler, true).test();
+
+            Runnable r1 = new Runnable() {
+                @Override
+                public void run() {
+                    ps.onComplete();
+                }
+            };
+
+            Runnable r2 = new Runnable() {
+                @Override
+                public void run() {
+                    to.dispose();
+                }
+            };
+
+            TestHelper.race(r1, r2);
+        }
+    }
+
     @Test
     public void errorDelayed() {
         Observable.error(new TestException())
@@ -236,4 +262,177 @@ public void take() {
         .awaitDone(5, TimeUnit.SECONDS)
         .assertResult(1);
     }
+
+    @Test
+    public void onNextDisposeRace() {
+        TestScheduler scheduler = new TestScheduler();
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            final PublishSubject<Integer> ps = PublishSubject.create();
+
+            final TestObserver<Integer> to = ps.skipLast(1, TimeUnit.DAYS, scheduler).test();
+
+            Runnable r1 = new Runnable() {
+                @Override
+                public void run() {
+                    ps.onNext(1);
+                }
+            };
+
+            Runnable r2 = new Runnable() {
+                @Override
+                public void run() {
+                    to.dispose();
+                }
+            };
+
+            TestHelper.race(r1, r2);
+        }
+    }
+
+    @Test
+    public void onNextOnCompleteDisposeDelayErrorRace() {
+        TestScheduler scheduler = new TestScheduler();
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            final PublishSubject<Integer> ps = PublishSubject.create();
+
+            final TestObserver<Integer> to = ps.skipLast(1, TimeUnit.DAYS, scheduler, true).test();
+
+            Runnable r1 = new Runnable() {
+                @Override
+                public void run() {
+                    ps.onNext(1);
+                    ps.onComplete();
+                }
+            };
+
+            Runnable r2 = new Runnable() {
+                @Override
+                public void run() {
+                    to.dispose();
+                }
+            };
+
+            TestHelper.race(r1, r2);
+        }
+    }
+
+    @Test
+    public void skipLastTimedDelayError() {
+        TestScheduler scheduler = new TestScheduler();
+
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        // FIXME the timeunit now matters due to rounding
+        Observable<Integer> result = source.skipLast(1000, TimeUnit.MILLISECONDS, scheduler, true);
+
+        Observer<Object> o = TestHelper.mockObserver();
+
+        result.subscribe(o);
+
+        source.onNext(1);
+        source.onNext(2);
+        source.onNext(3);
+
+        scheduler.advanceTimeBy(500, TimeUnit.MILLISECONDS);
+
+        source.onNext(4);
+        source.onNext(5);
+        source.onNext(6);
+
+        scheduler.advanceTimeBy(950, TimeUnit.MILLISECONDS);
+        source.onComplete();
+
+        InOrder inOrder = inOrder(o);
+        inOrder.verify(o).onNext(1);
+        inOrder.verify(o).onNext(2);
+        inOrder.verify(o).onNext(3);
+        inOrder.verify(o, never()).onNext(4);
+        inOrder.verify(o, never()).onNext(5);
+        inOrder.verify(o, never()).onNext(6);
+        inOrder.verify(o).onComplete();
+        inOrder.verifyNoMoreInteractions();
+
+        verify(o, never()).onError(any(Throwable.class));
+    }
+
+    @Test
+    public void skipLastTimedErrorBeforeTimeDelayError() {
+        TestScheduler scheduler = new TestScheduler();
+
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        Observable<Integer> result = source.skipLast(1, TimeUnit.SECONDS, scheduler, true);
+
+        Observer<Object> o = TestHelper.mockObserver();
+
+        result.subscribe(o);
+
+        source.onNext(1);
+        source.onNext(2);
+        source.onNext(3);
+        source.onError(new TestException());
+
+        scheduler.advanceTimeBy(1050, TimeUnit.MILLISECONDS);
+
+        verify(o).onError(any(TestException.class));
+
+        verify(o, never()).onComplete();
+        verify(o, never()).onNext(any());
+    }
+
+    @Test
+    public void skipLastTimedCompleteBeforeTimeDelayError() {
+        TestScheduler scheduler = new TestScheduler();
+
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        Observable<Integer> result = source.skipLast(1, TimeUnit.SECONDS, scheduler, true);
+
+        Observer<Object> o = TestHelper.mockObserver();
+
+        result.subscribe(o);
+
+        source.onNext(1);
+        source.onNext(2);
+        source.onNext(3);
+
+        scheduler.advanceTimeBy(500, TimeUnit.MILLISECONDS);
+
+        source.onComplete();
+
+        InOrder inOrder = inOrder(o);
+        inOrder.verify(o).onComplete();
+        inOrder.verifyNoMoreInteractions();
+
+        verify(o, never()).onNext(any());
+        verify(o, never()).onError(any(Throwable.class));
+    }
+
+    @Test
+    public void skipLastTimedWhenAllElementsAreValidDelayError() {
+        TestScheduler scheduler = new TestScheduler();
+
+        PublishSubject<Integer> source = PublishSubject.create();
+
+        Observable<Integer> result = source.skipLast(1, TimeUnit.MILLISECONDS, scheduler, true);
+
+        Observer<Object> o = TestHelper.mockObserver();
+
+        result.subscribe(o);
+
+        source.onNext(1);
+        source.onNext(2);
+        source.onNext(3);
+
+        scheduler.advanceTimeBy(500, TimeUnit.MILLISECONDS);
+
+        source.onComplete();
+
+        InOrder inOrder = inOrder(o);
+        inOrder.verify(o).onNext(1);
+        inOrder.verify(o).onNext(2);
+        inOrder.verify(o).onNext(3);
+        inOrder.verify(o).onComplete();
+        inOrder.verifyNoMoreInteractions();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
index 2a1b1dad6e..a68dd46f08 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
@@ -24,10 +24,11 @@
 import org.junit.*;
 import org.mockito.InOrder;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -1250,4 +1251,151 @@ public Observable<Integer> apply(Integer v)
         .test()
         .assertResult(10, 20);
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(f -> f.switchMap(v -> Observable.never()));
+    }
+
+    @Test
+    public void mainCompleteCancelRace() {
+        for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
+            AtomicReference<Observer<? super Integer>> ref = new AtomicReference<>();
+            Observable<Integer> o = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull Observer<? super @NonNull Integer> observer) {
+                    ref.set(observer);
+                }
+            };
+
+            TestObserver<Object> to = o.switchMap(v -> Observable.never())
+            .test();
+
+            ref.get().onSubscribe(Disposable.empty());
+
+            TestHelper.race(
+                    () -> ref.get().onComplete(),
+                    () -> to.dispose()
+            );
+        }
+    }
+
+    @Test
+    public void mainCompleteInnerErrorRace() {
+        TestException ex = new TestException();
+
+        for (int i = 0; i < TestHelper.RACE_LONG_LOOPS; i++) {
+            AtomicReference<Observer<? super Integer>> ref1 = new AtomicReference<>();
+            Observable<Integer> o1 = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull Observer<? super @NonNull Integer> observer) {
+                    ref1.set(observer);
+                }
+            };
+            AtomicReference<Observer<? super Integer>> ref2 = new AtomicReference<>();
+            Observable<Integer> o2 = new Observable<Integer>() {
+                @Override
+                protected void subscribeActual(@NonNull Observer<? super @NonNull Integer> observer) {
+                    ref2.set(observer);
+                }
+            };
+
+            o1.switchMap(v -> o2)
+            .test();
+
+            ref1.get().onSubscribe(Disposable.empty());
+            ref1.get().onNext(1);
+            ref2.get().onSubscribe(Disposable.empty());
+
+            TestHelper.race(
+                    () -> ref1.get().onComplete(),
+                    () -> ref2.get().onError(ex)
+            );
+        }
+    }
+
+    @Test
+    public void innerNoSubscriptionYet() {
+        AtomicReference<Observer<? super Integer>> ref1 = new AtomicReference<>();
+        Observable<Integer> o1 = new Observable<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull Observer<? super @NonNull Integer> observer) {
+                ref1.set(observer);
+            }
+        };
+        AtomicReference<Observer<? super Integer>> ref2 = new AtomicReference<>();
+        Observable<Integer> o2 = new Observable<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull Observer<? super @NonNull Integer> observer) {
+                ref2.set(observer);
+            }
+        };
+
+        o1.switchMap(v -> o2)
+        .test();
+
+        ref1.get().onSubscribe(Disposable.empty());
+        ref1.get().onNext(1);
+        ref1.get().onComplete();
+    }
+
+    @Test
+    public void switchDuringOnNext() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Integer> to = ps.switchMap(v -> Observable.range(v, 5))
+        .doOnNext(v -> {
+            if (v == 1) {
+                ps.onNext(2);
+            }
+        })
+        .test();
+
+        ps.onNext(1);
+
+        to
+        .assertValuesOnly(1, 2, 3, 4, 5, 6);
+    }
+
+    @Test
+    public void mainCompleteWhileInnerActive() {
+        PublishSubject<Integer> ps1 = PublishSubject.create();
+        PublishSubject<Integer> ps2 = PublishSubject.create();
+
+        TestObserver<Integer> to = ps1.switchMapDelayError(v -> ps2)
+        .test();
+
+        ps1.onNext(1);
+        ps1.onComplete();
+
+        ps2.onComplete();
+
+        to.assertResult();
+    }
+
+    @Test
+    public void innerIgnoresCancelAndErrors() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            PublishSubject<Integer> ps = PublishSubject.create();
+
+            TestObserver<Object> to = ps
+            .switchMap(v -> {
+                if (v == 1) {
+                    return Observable.unsafeCreate(s -> {
+                        s.onSubscribe(Disposable.empty());
+                        ps.onNext(2);
+                        s.onError(new TestException());
+                    });
+                }
+                return Observable.never();
+            })
+            .test();
+
+            ps.onNext(1);
+
+            to.assertEmpty();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
index f8d17474c2..3c671695ff 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
@@ -300,4 +300,9 @@ public void lastWindowIsFixedInTime() {
 
         to.assertResult(1, 2, 3, 4);
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.takeLast(1, TimeUnit.SECONDS));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
index c8eedc72bd..4aa693978e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
@@ -16,16 +16,14 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
-import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 import org.mockito.InOrder;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.TestScheduler;
 import io.reactivex.rxjava3.subjects.PublishSubject;
 import io.reactivex.rxjava3.testsupport.TestHelper;
@@ -167,28 +165,7 @@ public void dispose() {
     }
 
     @Test
-    public void badSource() {
-        List<Throwable> errors = TestHelper.trackPluginErrors();
-        try {
-            new Observable<Integer>() {
-                @Override
-                protected void subscribeActual(Observer<? super Integer> observer) {
-                    observer.onSubscribe(Disposable.empty());
-                    observer.onNext(1);
-                    observer.onNext(2);
-                    observer.onComplete();
-                    observer.onNext(3);
-                    observer.onError(new TestException());
-                    observer.onComplete();
-                }
-            }
-            .throttleFirst(1, TimeUnit.DAYS)
-            .test()
-            .assertResult(1);
-
-            TestHelper.assertUndeliverable(errors, 0, TestException.class);
-        } finally {
-            RxJavaPlugins.reset();
-        }
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.throttleFirst(1, TimeUnit.SECONDS));
     }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
index da58ffdb2a..59b1a16da2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
@@ -26,6 +26,7 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
@@ -265,4 +266,9 @@ protected void subscribeActual(Observer<? super Integer> observer) {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.unsubscribeOn(ImmediateThinScheduler.INSTANCE));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
index af67c36bf2..ee0c112a25 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
@@ -15,16 +15,17 @@
 
 import static org.junit.Assert.*;
 
+import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -530,4 +531,174 @@ public void mainError() {
         .test()
         .assertFailure(TestException.class);
     }
-}
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.window(Observable.never(), v -> Observable.never()));
+    }
+
+    @Test
+    public void openError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestException ex1 = new TestException();
+            TestException ex2 = new TestException();
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+                AtomicReference<Observer<? super Integer>> ref1 = new AtomicReference<>();
+                AtomicReference<Observer<? super Integer>> ref2 = new AtomicReference<>();
+
+                Observable<Integer> o1 = Observable.<Integer>unsafeCreate(ref1::set);
+                Observable<Integer> o2 = Observable.<Integer>unsafeCreate(ref2::set);
+
+                TestObserver<Observable<Integer>> to = BehaviorSubject.createDefault(1)
+                .window(o1, v -> o2)
+                .doOnNext(w -> w.test())
+                .test();
+
+                ref1.get().onSubscribe(Disposable.empty());
+                ref1.get().onNext(1);
+                ref2.get().onSubscribe(Disposable.empty());
+
+                TestHelper.race(
+                        () -> ref1.get().onError(ex1),
+                        () -> ref2.get().onError(ex2)
+                );
+
+                to.assertError(RuntimeException.class);
+
+                if (!errors.isEmpty()) {
+                    TestHelper.assertUndeliverable(errors, 0, TestException.class);
+                }
+
+                errors.clear();
+            }
+        });
+    }
+
+    @Test
+    public void closeError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            AtomicReference<Observer<? super Integer>> ref1 = new AtomicReference<>();
+            AtomicReference<Observer<? super Integer>> ref2 = new AtomicReference<>();
+
+            Observable<Integer> o1 = Observable.<Integer>unsafeCreate(ref1::set);
+            Observable<Integer> o2 = Observable.<Integer>unsafeCreate(ref2::set);
+
+            TestObserver<Integer> to = BehaviorSubject.createDefault(1)
+            .window(o1, v -> o2)
+            .flatMap(v -> v)
+            .test();
+
+            ref1.get().onSubscribe(Disposable.empty());
+            ref1.get().onNext(1);
+            ref2.get().onSubscribe(Disposable.empty());
+
+            ref2.get().onError(new TestException());
+            ref2.get().onError(new TestException());
+
+            to.assertFailure(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
+
+    @Test
+    public void upstreamFailsBeforeFirstWindow() {
+        Observable.error(new TestException())
+        .window(Observable.never(), v -> Observable.never())
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void windowOpenMainCompletes() {
+        AtomicReference<Observer<? super Integer>> ref1 = new AtomicReference<>();
+
+        PublishSubject<Object> ps = PublishSubject.create();
+        Observable<Integer> o1 = Observable.<Integer>unsafeCreate(ref1::set);
+
+        AtomicInteger counter = new AtomicInteger();
+
+        TestObserver<Observable<Object>> to = ps
+        .window(o1, v -> Observable.never())
+        .doOnNext(w -> {
+            if (counter.getAndIncrement() == 0) {
+                ref1.get().onNext(2);
+                ps.onNext(1);
+                ps.onComplete();
+            }
+            w.test();
+        })
+        .test();
+
+        ref1.get().onSubscribe(Disposable.empty());
+        ref1.get().onNext(1);
+
+        to.assertComplete();
+    }
+
+    @Test
+    public void windowOpenMainError() {
+        AtomicReference<Observer<? super Integer>> ref1 = new AtomicReference<>();
+
+        PublishSubject<Object> ps = PublishSubject.create();
+        Observable<Integer> o1 = Observable.<Integer>unsafeCreate(ref1::set);
+
+        AtomicInteger counter = new AtomicInteger();
+
+        TestObserver<Observable<Object>> to = ps
+        .window(o1, v -> Observable.never())
+        .doOnNext(w -> {
+            if (counter.getAndIncrement() == 0) {
+                ref1.get().onNext(2);
+                ps.onNext(1);
+                ps.onError(new TestException());
+            }
+            w.test();
+        })
+        .test();
+
+        ref1.get().onSubscribe(Disposable.empty());
+        ref1.get().onNext(1);
+
+        to.assertError(TestException.class);
+    }
+
+    @Test
+    public void windowOpenIgnoresDispose() {
+        AtomicReference<Observer<? super Integer>> ref1 = new AtomicReference<>();
+
+        PublishSubject<Object> ps = PublishSubject.create();
+        Observable<Integer> o1 = Observable.<Integer>unsafeCreate(ref1::set);
+
+        TestObserver<Observable<Object>> to = ps
+        .window(o1, v -> Observable.never())
+        .take(1)
+        .doOnNext(w -> {
+            w.test();
+        })
+        .test();
+
+        ref1.get().onSubscribe(Disposable.empty());
+        ref1.get().onNext(1);
+        ref1.get().onNext(2);
+
+        to.assertValueCount(1);
+    }
+
+    @Test
+    public void mainIgnoresCancelBeforeOnError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Observable.unsafeCreate(s -> {
+                s.onSubscribe(Disposable.empty());
+                s.onNext(1);
+                s.onError(new IOException());
+            })
+            .window(BehaviorSubject.createDefault(1), v -> Observable.error(new TestException()))
+            .doOnNext(w -> w.test())
+            .test()
+            .assertError(TestException.class);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        });
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
index 13f662c88e..56ee06ff24 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
@@ -1099,4 +1099,26 @@ public void accept(Observable<Integer> v) throws Throwable {
 
         inner.get().test().assertResult();
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservable(o -> o.window(1, TimeUnit.SECONDS));
+    }
+
+    @Test
+    public void timedBoundarySignalAndDisposeRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            TestScheduler scheduler = new TestScheduler();
+
+            PublishSubject<Integer> ps = PublishSubject.create();
+
+            TestObserver<Observable<Integer>> to = ps.window(1, TimeUnit.MINUTES, scheduler, 1)
+            .test();
+
+            TestHelper.race(
+                    () -> ps.onNext(1),
+                    () -> to.dispose()
+            );
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
index 555b53e30a..619a6c1241 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
@@ -19,18 +19,18 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.*;
-import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleDelayTest extends RxJavaTest {
@@ -270,4 +270,16 @@ public Single<Object> apply(Single<Object> s) throws Exception {
         });
 
     }
+
+    @Test
+    public void withPublisherDoubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowableToSingle(
+                f -> SingleSubject.create().delaySubscription(f));
+    }
+
+    @Test
+    public void withObservableDoubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeObservableToSingle(
+                o -> SingleSubject.create().delaySubscription(o));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
index 6c1bf14f30..14bd931d76 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
@@ -24,6 +24,34 @@
 
 public class SingleEqualsTest extends RxJavaTest {
 
+    @Test
+    public void bothSucceedEqual() {
+        Single.sequenceEqual(Single.just(1), Single.just(1))
+        .test()
+        .assertResult(true);
+    }
+
+    @Test
+    public void bothSucceedNotEqual() {
+        Single.sequenceEqual(Single.just(1), Single.just(2))
+        .test()
+        .assertResult(false);
+    }
+
+    @Test
+    public void firstSucceedOtherError() {
+        Single.sequenceEqual(Single.just(1), Single.error(new TestException()))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
+    @Test
+    public void firstErrorOtherSucceed() {
+        Single.sequenceEqual(Single.error(new TestException()), Single.just(1))
+        .test()
+        .assertFailure(TestException.class);
+    }
+
     @Test
     public void bothError() {
         List<Throwable> errors = TestHelper.trackPluginErrors();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
index 4643d61303..d308998e6e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
@@ -21,13 +21,14 @@
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.CrashingIterable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -585,4 +586,51 @@ public void run() {
             TestHelper.race(r1, r2);
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeSingleToFlowable(s -> s.flattenAsFlowable(v -> Collections.emptyList()));
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(SingleSubject.create().flattenAsFlowable(v -> Collections.emptyList()));
+    }
+
+    @Test
+    public void slowPatchCancelAfterOnNext() {
+        TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+            @Override
+            public void onNext(@NonNull Integer t) {
+                super.onNext(t);
+                cancel();
+                onComplete();
+            }
+        };
+
+        Single.just(1)
+        .flattenAsFlowable(v -> Arrays.asList(1, 2))
+        .subscribe(ts);
+
+        ts.assertResult(1);
+    }
+
+    @Test
+    public void onSuccessRequestRace() {
+        List<Object> list = Arrays.asList(1);
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+
+            SingleSubject<Integer> ss = SingleSubject.create();
+
+            TestSubscriber<Object> ts = ss.flattenAsFlowable(v -> list)
+            .test(0L);
+
+            TestHelper.race(
+                    () -> ss.onSuccess(1),
+                    () -> ts.request(1)
+            );
+
+            ts.assertResult(1);
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
index 5d5e152c1b..7756ef5783 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
@@ -31,8 +31,8 @@ public void utilityClass() {
 
     @Test
     public void noSuchElementCallableEnum() {
-        assertEquals(1, SingleInternalHelper.NoSuchElementCallable.values().length);
-        assertNotNull(SingleInternalHelper.NoSuchElementCallable.valueOf("INSTANCE"));
+        assertEquals(1, SingleInternalHelper.NoSuchElementSupplier.values().length);
+        assertNotNull(SingleInternalHelper.NoSuchElementSupplier.valueOf("INSTANCE"));
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
index 7c51e8be91..c544fd3ae9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
@@ -21,7 +21,9 @@
 
 import org.junit.Test;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Action;
 import io.reactivex.rxjava3.observers.TestObserver;
@@ -216,9 +218,41 @@ public void run() {
     public void mainTimedOut() {
         Single
                 .never()
-                .timeout(1, TimeUnit.NANOSECONDS)
+                .timeout(1, TimeUnit.MILLISECONDS)
                 .to(TestHelper.<Object>testConsumer())
                 .awaitDone(5, TimeUnit.SECONDS)
-                .assertFailureAndMessage(TimeoutException.class, timeoutMessage(1, TimeUnit.NANOSECONDS));
+                .assertFailureAndMessage(TimeoutException.class, timeoutMessage(1, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void mainTimeoutFallbackSuccess() {
+        Single.never()
+        .timeout(1, TimeUnit.MILLISECONDS, Single.just(1))
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertResult(1);
+    }
+
+    @Test
+    public void timeoutBeforeOnSubscribeFromMain() {
+        Disposable d = Disposable.empty();
+
+        new Single<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull SingleObserver<? super @NonNull Integer> observer) {
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                observer.onSubscribe(d);
+            }
+        }
+        .timeout(1, TimeUnit.MILLISECONDS, Single.just(1))
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertResult(1);
+
+        assertTrue(d.isDisposed());
     }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
index 50989db3ec..2720cd4559 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
@@ -26,6 +26,7 @@
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.subjects.SingleSubject;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SingleZipArrayTest extends RxJavaTest {
@@ -193,4 +194,23 @@ public void singleSourceZipperReturnsNull() {
         .to(TestHelper.<Object>testConsumer())
         .assertFailureAndMessage(NullPointerException.class, "The zipper returned a null value");
     }
+
+    @Test
+    public void singleSourceZipperReturnsNull2() {
+        Single.zipArray(Functions.justFunction(null), Single.just(1), Single.just(2))
+        .to(TestHelper.<Object>testConsumer())
+        .assertFailureAndMessage(NullPointerException.class, "The zipper returned a null value");
+    }
+
+    @Test
+    public void dispose2() {
+        TestHelper.checkDisposed(Single.zipArray(Functions.justFunction(1), SingleSubject.create(), SingleSubject.create()));
+    }
+
+    @Test
+    public void bothSucceed() {
+        Single.zipArray(a -> Arrays.asList(a), Single.just(1), Single.just(2))
+        .test()
+        .assertResult(Arrays.asList(1, 2));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoSchedulerInternalTest.java
new file mode 100644
index 0000000000..77f638a2be
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoSchedulerInternalTest.java
@@ -0,0 +1,95 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.schedulers;
+
+import static org.junit.Assert.*;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.disposables.CompositeDisposable;
+import io.reactivex.rxjava3.internal.schedulers.IoScheduler.*;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class IoSchedulerInternalTest extends RxJavaTest {
+
+    @Test
+    public void expiredQueueEmpty() {
+        ConcurrentLinkedQueue<ThreadWorker> expire = new ConcurrentLinkedQueue<>();
+        CompositeDisposable cd = new CompositeDisposable();
+
+        CachedWorkerPool.evictExpiredWorkers(expire, cd);
+    }
+
+    @Test
+    public void expiredWorkerRemoved() {
+        ConcurrentLinkedQueue<ThreadWorker> expire = new ConcurrentLinkedQueue<>();
+        CompositeDisposable cd = new CompositeDisposable();
+
+        ThreadWorker tw = new ThreadWorker(new RxThreadFactory("IoExpiryTest"));
+
+        try {
+            expire.add(tw);
+            cd.add(tw);
+
+            CachedWorkerPool.evictExpiredWorkers(expire, cd);
+
+            assertTrue(tw.isDisposed());
+            assertTrue(expire.isEmpty());
+        } finally {
+            tw.dispose();
+        }
+    }
+
+    @Test
+    public void noExpiredWorker() {
+        ConcurrentLinkedQueue<ThreadWorker> expire = new ConcurrentLinkedQueue<>();
+        CompositeDisposable cd = new CompositeDisposable();
+
+        ThreadWorker tw = new ThreadWorker(new RxThreadFactory("IoExpiryTest"));
+        tw.setExpirationTime(System.nanoTime() + 10_000_000_000L);
+
+        try {
+            expire.add(tw);
+            cd.add(tw);
+
+            CachedWorkerPool.evictExpiredWorkers(expire, cd);
+
+            assertFalse(tw.isDisposed());
+            assertFalse(expire.isEmpty());
+        } finally {
+            tw.dispose();
+        }
+    }
+
+    @Test
+    public void expireReuseRace() {
+        ConcurrentLinkedQueue<ThreadWorker> expire = new ConcurrentLinkedQueue<>();
+        CompositeDisposable cd = new CompositeDisposable();
+
+        ThreadWorker tw = new ThreadWorker(new RxThreadFactory("IoExpiryTest"));
+        tw.dispose();
+
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            expire.add(tw);
+            cd.add(tw);
+
+            TestHelper.race(
+                    () -> CachedWorkerPool.evictExpiredWorkers(expire, cd),
+                    () -> expire.remove(tw)
+            );
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
index f6dfe5e455..ad568225e6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
@@ -14,16 +14,18 @@
 package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
 
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.schedulers.SingleScheduler.ScheduledWorker;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
@@ -123,4 +125,20 @@ public void runnableDisposedAsyncTimed() throws Exception {
         return Schedulers.single();
     }
 
+    @Test
+    public void zeroPeriodRejectedExecution() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            Scheduler s = RxJavaPlugins.createSingleScheduler(new RxThreadFactory("Test"));
+            s.shutdown();
+            Runnable run = mock(Runnable.class);
+
+            s.schedulePeriodicallyDirect(run, 1, 0, TimeUnit.MILLISECONDS);
+
+            Thread.sleep(100);
+
+            verify(run, never()).run();
+
+            TestHelper.assertUndeliverable(errors, 0, RejectedExecutionException.class);
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
index e30400214c..f114623bc4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
@@ -20,15 +20,18 @@
 import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.Test;
 
-import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class TrampolineSchedulerInternalTest extends RxJavaTest {
 
@@ -209,4 +212,29 @@ public void run() {
 
         verify(r, never()).run();
     }
+
+    @Test
+    public void submitAndDisposeNextTask() {
+        Scheduler.Worker w = Schedulers.trampoline().createWorker();
+
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            Runnable run = mock(Runnable.class);
+
+            AtomicInteger sync = new AtomicInteger(2);
+
+            w.schedule(() -> {
+                Disposable d = w.schedule(run);
+
+                Schedulers.single().scheduleDirect(() -> {
+                    if (sync.decrementAndGet() != 0) {
+                        while (sync.get() != 0) { }
+                    }
+                    d.dispose();
+                });
+                if (sync.decrementAndGet() != 0) {
+                    while (sync.get() != 0) { }
+                }
+            });
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
index c84e380701..f8d40aaa14 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
@@ -14,15 +14,17 @@
 package io.reactivex.rxjava3.internal.subscribers;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
 
 import org.junit.Test;
 import org.reactivestreams.Subscription;
 
-import io.reactivex.rxjava3.annotations.Nullable;
-import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
-import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.annotations.*;
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class BasicFuseableConditionalSubscriberTest extends RxJavaTest {
 
@@ -83,4 +85,172 @@ public Integer poll() throws Exception {
         fcs.clear();
         assertTrue(fcs.isEmpty());
     }
+
+    @Test
+    public void implementationStopsOnSubscribe() {
+        @SuppressWarnings("unchecked")
+        ConditionalSubscriber<Integer> ts = mock(ConditionalSubscriber.class);
+
+        BasicFuseableConditionalSubscriber<Integer, Integer> bfs = new BasicFuseableConditionalSubscriber<Integer, Integer>(ts) {
+
+            @Override
+            protected boolean beforeDownstream() {
+                return false;
+            }
+
+            @Override
+            public void onNext(@NonNull Integer t) {
+                ts.onNext(t);
+            }
+
+            @Override
+            public int requestFusion(int mode) {
+                // TODO Auto-generated method stub
+                return 0;
+            }
+
+            @Override
+            public boolean tryOnNext(@NonNull Integer t) {
+                // TODO Auto-generated method stub
+                return false;
+            }
+
+            @Override
+            public @Nullable Integer poll() throws Throwable {
+                return null;
+            }
+        };
+
+        bfs.onSubscribe(new BooleanSubscription());
+
+        verify(ts, never()).onSubscribe(any());
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f
+                .map(v -> v)
+                .filter(v -> true)
+            );
+    }
+
+    @Test
+    public void transitiveBoundaryFusionNone() {
+        @SuppressWarnings("unchecked")
+        ConditionalSubscriber<Integer> ts = mock(ConditionalSubscriber.class);
+
+        BasicFuseableConditionalSubscriber<Integer, Integer> bfs = new BasicFuseableConditionalSubscriber<Integer, Integer>(ts) {
+
+            @Override
+            protected boolean beforeDownstream() {
+                return false;
+            }
+
+            @Override
+            public void onNext(@NonNull Integer t) {
+                ts.onNext(t);
+            }
+
+            @Override
+            public int requestFusion(int mode) {
+                // TODO Auto-generated method stub
+                return 0;
+            }
+
+            @Override
+            public boolean tryOnNext(@NonNull Integer t) {
+                // TODO Auto-generated method stub
+                return false;
+            }
+
+            @Override
+            public @Nullable Integer poll() throws Throwable {
+                return null;
+            }
+        };
+
+        bfs.onSubscribe(new BooleanSubscription());
+
+        assertEquals(QueueFuseable.NONE, bfs.transitiveBoundaryFusion(QueueFuseable.ANY));
+    }
+
+    @Test
+    public void transitiveBoundaryFusionAsync() {
+        @SuppressWarnings("unchecked")
+        ConditionalSubscriber<Integer> ts = mock(ConditionalSubscriber.class);
+
+        BasicFuseableConditionalSubscriber<Integer, Integer> bfs = new BasicFuseableConditionalSubscriber<Integer, Integer>(ts) {
+
+            @Override
+            protected boolean beforeDownstream() {
+                return false;
+            }
+
+            @Override
+            public void onNext(@NonNull Integer t) {
+                ts.onNext(t);
+            }
+
+            @Override
+            public int requestFusion(int mode) {
+                // TODO Auto-generated method stub
+                return 0;
+            }
+
+            @Override
+            public boolean tryOnNext(@NonNull Integer t) {
+                // TODO Auto-generated method stub
+                return false;
+            }
+
+            @Override
+            public @Nullable Integer poll() throws Throwable {
+                return null;
+            }
+        };
+
+        bfs.onSubscribe(EmptySubscription.INSTANCE);
+
+        assertEquals(QueueFuseable.ASYNC, bfs.transitiveBoundaryFusion(QueueFuseable.ANY));
+    }
+
+    @Test
+    public void transitiveBoundaryFusionAsyncBoundary() {
+        @SuppressWarnings("unchecked")
+        ConditionalSubscriber<Integer> ts = mock(ConditionalSubscriber.class);
+
+        BasicFuseableConditionalSubscriber<Integer, Integer> bfs = new BasicFuseableConditionalSubscriber<Integer, Integer>(ts) {
+
+            @Override
+            protected boolean beforeDownstream() {
+                return false;
+            }
+
+            @Override
+            public void onNext(@NonNull Integer t) {
+                ts.onNext(t);
+            }
+
+            @Override
+            public int requestFusion(int mode) {
+                // TODO Auto-generated method stub
+                return 0;
+            }
+
+            @Override
+            public boolean tryOnNext(@NonNull Integer t) {
+                // TODO Auto-generated method stub
+                return false;
+            }
+
+            @Override
+            public @Nullable Integer poll() throws Throwable {
+                return null;
+            }
+        };
+
+        bfs.onSubscribe(EmptySubscription.INSTANCE);
+
+        assertEquals(QueueFuseable.NONE, bfs.transitiveBoundaryFusion(QueueFuseable.ANY | QueueFuseable.BOUNDARY));
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
index 87ccd91b92..afc79d2b2d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
@@ -17,9 +17,9 @@
 
 import org.junit.Test;
 
-import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription;
+import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
@@ -53,4 +53,36 @@ public Integer poll() throws Exception {
         fcs.clear();
         assertTrue(fcs.isEmpty());
     }
+
+    @Test
+    public void implementationStopsOnSubscribe() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>();
+        BasicFuseableSubscriber<Integer, Integer> bfs = new BasicFuseableSubscriber<Integer, Integer>(ts) {
+
+            @Override
+            protected boolean beforeDownstream() {
+                return false;
+            }
+
+            @Override
+            public void onNext(@NonNull Integer t) {
+                ts.onNext(t);
+            }
+
+            @Override
+            public int requestFusion(int mode) {
+                // TODO Auto-generated method stub
+                return 0;
+            }
+
+            @Override
+            public @Nullable Integer poll() throws Throwable {
+                return null;
+            }
+        };
+
+        bfs.onSubscribe(new BooleanSubscription());
+
+        assertFalse(ts.hasSubscription());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
index d6b80cc873..19bb7104ab 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
@@ -378,4 +378,37 @@ public void customOnErrorShouldReportCustomOnError() {
 
         assertTrue(subscriber.hasCustomOnError());
     }
+
+    @Test
+    public void cancel() {
+        BoundedSubscriber<Integer> subscriber = new BoundedSubscriber<>(Functions.<Integer>emptyConsumer(),
+                Functions.<Throwable>emptyConsumer(),
+                Functions.EMPTY_ACTION,
+                Functions.<Subscription>boundedConsumer(128), 128);
+
+        BooleanSubscription bs = new BooleanSubscription();
+        subscriber.onSubscribe(bs);
+
+        subscriber.cancel();
+
+        assertTrue(bs.isCancelled());
+    }
+
+    @Test
+    public void dispose() {
+        BoundedSubscriber<Integer> subscriber = new BoundedSubscriber<>(Functions.<Integer>emptyConsumer(),
+                Functions.<Throwable>emptyConsumer(),
+                Functions.EMPTY_ACTION,
+                Functions.<Subscription>boundedConsumer(128), 128);
+
+        BooleanSubscription bs = new BooleanSubscription();
+        subscriber.onSubscribe(bs);
+
+        assertFalse(subscriber.isDisposed());
+
+        subscriber.dispose();
+
+        assertTrue(bs.isCancelled());
+        assertTrue(subscriber.isDisposed());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
index 69450f2ad0..5c923949e8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
@@ -292,4 +292,20 @@ public void getTimedOut() throws Exception {
             assertEquals(timeoutMessage(1, TimeUnit.NANOSECONDS), expected.getMessage());
         }
     }
+
+    @Test
+    public void onNextCompleteOnError() throws Exception {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            fs.onNext(1);
+            fs.onComplete();
+            fs.onError(new TestException("One"));
+
+            assertEquals((Integer)1, fs.get(5, TimeUnit.MILLISECONDS));
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
index b27279eb43..0ea0868e24 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
@@ -60,9 +60,13 @@ public void errorModeEnum() {
     @Test
     public void linkedArrayList() {
         LinkedArrayList list = new LinkedArrayList(2);
+        assertEquals(0, list.size());
         list.add(1);
+        assertEquals(1, list.size());
         list.add(2);
+        assertEquals(2, list.size());
         list.add(3);
+        assertEquals(3, list.size());
         assertEquals("[1, 2, 3]", list.toString());
     }
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
index e581012d9b..48bd28aaf8 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
@@ -24,7 +24,7 @@
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -1142,4 +1142,28 @@ public void nullOnNext() {
 
         to.assertFailureAndMessage(NullPointerException.class, ExceptionHelper.nullWarning("onNext called with a null value."));
     }
+
+    @Test
+    public void onErrorQueuedUp() {
+        AtomicReference<SerializedObserver<Integer>> soRef = new AtomicReference<>();
+        TestObserverEx<Integer> to = new TestObserverEx<Integer>() {
+            @Override
+            public void onNext(Integer t) {
+                super.onNext(t);
+                soRef.get().onNext(2);
+                soRef.get().onError(new TestException());
+            }
+        };
+
+        final SerializedObserver<Integer> so = new SerializedObserver<>(to, true);
+        soRef.set(so);
+
+        Disposable d = Disposable.empty();
+
+        so.onSubscribe(d);
+
+        so.onNext(1);
+
+        to.assertFailure(TestException.class, 1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
index 01d6d76789..31e66d808b 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
@@ -1076,4 +1076,34 @@ public void assertValuesOnlyThrowsWhenErrored() {
             // expected
         }
     }
+
+    @Test
+    public void onErrorIsNull() {
+        TestObserver<Integer> to = TestObserver.create();
+        to.onSubscribe(Disposable.empty());
+
+        to.onError(null);
+
+        to.assertFailure(NullPointerException.class);
+    }
+
+    @Test
+    public void awaitCountTimeout() {
+        TestObserver<Integer> to = TestObserver.create();
+        to.onSubscribe(Disposable.empty());
+        to.awaitCount(1);
+        assertTrue(to.timeout);
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void awaitCountInterrupted() {
+        try {
+            TestObserver<Integer> to = TestObserver.create();
+            to.onSubscribe(Disposable.empty());
+            Thread.currentThread().interrupt();
+            to.awaitCount(1);
+        } finally {
+            Thread.interrupted();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
index 1a94b3c247..a9509a46a5 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
@@ -163,4 +163,11 @@ public void accept(List<Object> a, Object b) throws Exception {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeParallel(
+                pf -> pf.collect(ArrayList::new, ArrayList::add)
+        );
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
index 0ba01a05fd..14f585d9d0 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
@@ -384,4 +384,23 @@ public void filterInvalidSourceConditional() {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f ->
+            ParallelFlowable.fromArray(f)
+            .doOnNext(v -> { }, ParallelFailureHandling.SKIP)
+            .sequential()
+        );
+    }
+
+    @Test
+    public void doubleOnSubscribeConditional() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f ->
+            ParallelFlowable.fromArray(f)
+            .doOnNext(v -> { }, ParallelFailureHandling.SKIP)
+            .filter(v -> true, ParallelFailureHandling.SKIP)
+            .sequential()
+        );
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java
index 1b77450986..93e3fb33c7 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java
@@ -119,4 +119,45 @@ public boolean test(Integer v) throws Exception {
         .test()
         .assertFailure(TestException.class);
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f ->
+            ParallelFlowable.fromArray(f)
+            .filter(v -> true)
+            .sequential()
+        );
+    }
+
+    @Test
+    public void doubleOnSubscribeConditional() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f ->
+            ParallelFlowable.fromArray(f)
+            .filter(v -> true)
+            .filter(v -> true)
+            .sequential()
+        );
+    }
+
+    @Test
+    public void conditionalFalseTrue() {
+        Flowable.just(1)
+        .parallel()
+        .filter(v -> false)
+        .filter(v -> true)
+        .sequential()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void conditionalTrueFalse() {
+        Flowable.just(1)
+        .parallel()
+        .filter(v -> true)
+        .filter(v -> false)
+        .sequential()
+        .test()
+        .assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
index 084566a0a5..37377bab52 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
@@ -373,4 +373,45 @@ public void filterInvalidSourceConditional() {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f ->
+            ParallelFlowable.fromArray(f)
+            .filter(v -> true, ParallelFailureHandling.SKIP)
+            .sequential()
+        );
+    }
+
+    @Test
+    public void doubleOnSubscribeConditional() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f ->
+            ParallelFlowable.fromArray(f)
+            .filter(v -> true, ParallelFailureHandling.SKIP)
+            .filter(v -> true, ParallelFailureHandling.SKIP)
+            .sequential()
+        );
+    }
+
+    @Test
+    public void conditionalFalseTrue() {
+        Flowable.just(1)
+        .parallel()
+        .filter(v -> false, ParallelFailureHandling.SKIP)
+        .filter(v -> true, ParallelFailureHandling.SKIP)
+        .sequential()
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void conditionalTrueFalse() {
+        Flowable.just(1)
+        .parallel()
+        .filter(v -> true, ParallelFailureHandling.SKIP)
+        .filter(v -> false, ParallelFailureHandling.SKIP)
+        .sequential()
+        .test()
+        .assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java
index 916d3651b9..4b5aeb0c78 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java
@@ -14,7 +14,6 @@
 package io.reactivex.rxjava3.parallel;
 
 import java.util.Arrays;
-import java.util.stream.Stream;
 
 import org.junit.Test;
 
@@ -25,7 +24,7 @@ public class ParallelFlatMapIterableTest extends RxJavaTest {
     @Test
     public void subscriberCount() {
         ParallelFlowableTest.checkSubscriberCount(Flowable.range(1, 5).parallel()
-        .flatMapStream(v -> Stream.of(1, 2, 3)));
+        .flatMapIterable(v -> Arrays.asList(1, 2, 3)));
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
index c790201d98..981781cd9f 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
@@ -21,6 +21,7 @@
 import org.junit.Test;
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
@@ -28,7 +29,7 @@
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
-import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -187,4 +188,107 @@ public Object apply(Integer v) throws Exception {
             assertTrue(map.toString(), e.contains("RxComputationThreadPool"));
         }
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(PublishProcessor.create().parallel());
+    }
+
+    @Test
+    public void syncFusedEmptyPoll() {
+        Flowable.just(1, 2)
+        .filter(v -> v == 1)
+        .compose(TestHelper.flowableStripBoundary())
+        .parallel(1)
+        .sequential()
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void asyncFusedEmptyPoll() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        up.onNext(1);
+        up.onNext(2);
+        up.onComplete();
+
+        up
+        .filter(v -> v == 1)
+        .compose(TestHelper.flowableStripBoundary())
+        .parallel(1)
+        .sequential()
+        .test()
+        .assertResult(1);
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.parallel().sequential());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void requestUnboundedRace() {
+        FlowableSubscriber<Integer> fs = new FlowableSubscriber<Integer>() {
+
+            @Override
+            public void onNext(@NonNull Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+                    TestHelper.race(
+                            () -> s.request(Long.MAX_VALUE),
+                            () -> s.request(Long.MAX_VALUE)
+                    );
+                }
+            }
+        };
+
+        PublishProcessor.create()
+        .parallel(1)
+        .subscribe(new FlowableSubscriber[] { fs });
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void requestRace() {
+        FlowableSubscriber<Integer> fs = new FlowableSubscriber<Integer>() {
+
+            @Override
+            public void onNext(@NonNull Integer t) {
+            }
+
+            @Override
+            public void onError(Throwable t) {
+            }
+
+            @Override
+            public void onComplete() {
+            }
+
+            @Override
+            public void onSubscribe(@NonNull Subscription s) {
+                for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+                    TestHelper.race(
+                            () -> s.request(1),
+                            () -> s.request(1)
+                    );
+                }
+            }
+        };
+
+        PublishProcessor.create()
+        .parallel(1)
+        .subscribe(new FlowableSubscriber[] { fs });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
index fb50a775f8..8741eb1168 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
@@ -14,14 +14,17 @@
 package io.reactivex.rxjava3.parallel;
 
 import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -326,4 +329,198 @@ public Integer apply(Integer v) throws Exception {
         .test()
         .assertFailure(TestException.class, 2, 3, 4);
     }
+
+    @Test
+    public void takeUntil() {
+        Flowable.range(1, 10)
+        .parallel(1)
+        .sequential()
+        .takeUntil(v -> true)
+        .test(0L)
+        .requestMore(100)
+        .assertResult(1);
+    }
+
+    @Test
+    public void takeUntilDelayError() {
+        Flowable.range(1, 10)
+        .parallel(1)
+        .sequentialDelayError()
+        .takeUntil(v -> true)
+        .test(0L)
+        .requestMore(100)
+        .assertResult(1);
+    }
+
+    @Test
+    public void oneItemNext() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp.parallel(1)
+        .sequential()
+        .test(0L);
+
+        pp.onNext(1);
+
+        ts.requestMore(10)
+        .assertValuesOnly(1);
+    }
+
+    @Test
+    public void delayErrorOneItemNext() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = pp.parallel(1)
+        .sequentialDelayError()
+        .test(0L);
+
+        pp.onNext(1);
+
+        ts.requestMore(10)
+        .assertValuesOnly(1);
+    }
+
+    @Test
+    public void onNextWhileProcessingSlowPath() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+            @Override
+            public void onNext(@NonNull Integer t) {
+                super.onNext(t);
+                if (t == 1) {
+                    pp.onNext(2);
+                }
+            }
+        };
+
+        ParallelFlowable.fromArray(pp)
+        .sequential()
+        .subscribeWith(ts);
+
+        pp.onNext(1);
+
+        ts
+        .assertValuesOnly(1, 2);
+    }
+
+    @Test
+    public void delayErrorOnNextWhileProcessingSlowPath() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+            @Override
+            public void onNext(@NonNull Integer t) {
+                super.onNext(t);
+                if (t == 1) {
+                    pp.onNext(2);
+                }
+            }
+        };
+
+        ParallelFlowable.fromArray(pp)
+        .sequentialDelayError()
+        .subscribeWith(ts);
+
+        pp.onNext(1);
+
+        ts
+        .assertValuesOnly(1, 2);
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(
+                ParallelFlowable.fromArray(PublishProcessor.create())
+                .sequential()
+        );
+    }
+
+    @Test
+    public void onNextMissingBackpressureRace() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+
+                AtomicReference<Subscriber<? super Integer>> ref1 = new AtomicReference<>();
+                AtomicReference<Subscriber<? super Integer>> ref2 = new AtomicReference<>();
+
+                Flowable<Integer> f1 = new Flowable<Integer>() {
+                    @Override
+                    public void subscribeActual(Subscriber<? super Integer> s) {
+                        s.onSubscribe(new BooleanSubscription());
+                        ref1.set(s);
+                    }
+                };
+                Flowable<Integer> f2 = new Flowable<Integer>() {
+                    @Override
+                    public void subscribeActual(Subscriber<? super Integer> s) {
+                        s.onSubscribe(new BooleanSubscription());
+                        ref2.set(s);
+                    }
+                };
+
+                ParallelFlowable.fromArray(f1, f2)
+                .sequential(1)
+                .test(0)
+                ;
+
+                TestHelper.race(
+                        () -> {
+                            ref1.get().onNext(1);
+                            ref1.get().onNext(2);
+                        },
+                        () -> {
+                            ref2.get().onNext(3);
+                            ref2.get().onNext(4);
+                        }
+                );
+
+                errors.clear();
+            }
+        });
+    }
+
+    @Test
+    public void onNextMissingBackpressureDelayErrorRace() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+
+                AtomicReference<Subscriber<? super Integer>> ref1 = new AtomicReference<>();
+                AtomicReference<Subscriber<? super Integer>> ref2 = new AtomicReference<>();
+
+                Flowable<Integer> f1 = new Flowable<Integer>() {
+                    @Override
+                    public void subscribeActual(Subscriber<? super Integer> s) {
+                        s.onSubscribe(new BooleanSubscription());
+                        ref1.set(s);
+                    }
+                };
+                Flowable<Integer> f2 = new Flowable<Integer>() {
+                    @Override
+                    public void subscribeActual(Subscriber<? super Integer> s) {
+                        s.onSubscribe(new BooleanSubscription());
+                        ref2.set(s);
+                    }
+                };
+
+                ParallelFlowable.fromArray(f1, f2)
+                .sequentialDelayError(1)
+                .test(0)
+                ;
+
+                TestHelper.race(
+                        () -> {
+                            ref1.get().onNext(1);
+                            ref1.get().onNext(2);
+                        },
+                        () -> {
+                            ref2.get().onNext(3);
+                            ref2.get().onNext(4);
+                        }
+                );
+
+                errors.clear();
+            }
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
index e45034d416..5432c10a76 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
@@ -15,15 +15,19 @@
 
 import static org.junit.Assert.*;
 
-import java.util.*;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
+import org.reactivestreams.Subscriber;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.TestHelper;
@@ -199,4 +203,25 @@ public void doubleOnSubscribe() {
                 .filter(v -> true)
             );
     }
+
+    @Test
+    public void conditionalCancelIgnored() {
+        Flowable<Integer> f = new Flowable<Integer>() {
+            @Override
+            protected void subscribeActual(@NonNull Subscriber<@NonNull ? super @NonNull Integer> s) {
+                @SuppressWarnings("unchecked")
+                ConditionalSubscriber<Integer> subscriber = (ConditionalSubscriber<Integer>)s;
+                subscriber.onSubscribe(new BooleanSubscription());
+                subscriber.tryOnNext(1);
+                subscriber.tryOnNext(2);
+            }
+        };
+
+        ParallelFlowable.fromArray(f)
+        .map(v -> { throw new TestException(); })
+        .filter(v -> true)
+        .sequential()
+        .test()
+        .assertFailure(TestException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
index 85b311847a..ebdd2fd8cc 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
@@ -194,4 +194,13 @@ public void run() throws Exception {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f ->
+            ParallelFlowable.fromArray(f)
+            .doOnComplete(() -> { })
+            .sequential()
+        );
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
index 25d72af909..625fb8a42e 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
@@ -16,7 +16,7 @@
 import static org.junit.Assert.*;
 
 import java.io.IOException;
-import java.util.List;
+import java.util.*;
 
 import org.junit.Test;
 
@@ -164,4 +164,11 @@ public Integer apply(Integer a, Integer b) throws Exception {
         .test()
         .assertFailure(TestException.class);
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeParallelToFlowable(
+                pf -> pf.reduce((a, b) -> a)
+        );
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
index 5646b176b1..3e906ef01b 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
@@ -169,4 +169,11 @@ public List<Object> apply(List<Object> a, Object b) throws Exception {
             RxJavaPlugins.reset();
         }
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeParallel(
+                pf -> pf.reduce(ArrayList::new, (a, b) -> a)
+        );
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
index 907b0bb889..44ce7960d1 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
@@ -322,4 +322,60 @@ public void onNext(Integer t) {
 
         ts.assertResult(1);
     }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeParallel(pf -> pf.runOn(ImmediateThinScheduler.INSTANCE));
+    }
+
+    @Test
+    public void doubleOnSubscribeConditional() {
+        TestHelper.checkDoubleOnSubscribeParallel(pf ->
+            pf.runOn(ImmediateThinScheduler.INSTANCE)
+            .filter(v -> true)
+        );
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(
+                ParallelFlowable.fromArray(PublishProcessor.create())
+                .runOn(ImmediateThinScheduler.INSTANCE)
+        );
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void asManyItemsAsRequested() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
+
+        Flowable.range(1, 5)
+        .parallel(1)
+        .runOn(ImmediateThinScheduler.INSTANCE)
+        .subscribe(new Subscriber[] {
+                ts
+        });
+
+        ts
+        .requestMore(5)
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Test
+    public void asManyItemsAsRequestedConditional() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>(0);
+
+        Flowable.range(1, 5)
+        .parallel(1)
+        .runOn(ImmediateThinScheduler.INSTANCE)
+        .filter(v -> true)
+        .subscribe(new Subscriber[] {
+                ts
+        });
+
+        ts
+        .requestMore(5)
+        .assertResult(1, 2, 3, 4, 5);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
index e7b5cda9b0..1f3950c112 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
@@ -24,6 +24,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.operators.parallel.ParallelSortedJoin;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -207,4 +208,32 @@ public void run() {
             TestHelper.race(r1, r2);
         }
     }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(PublishProcessor.<Integer>create().parallel().sorted(Functions.naturalComparator()));
+    }
+
+    @Test
+    public void comparatorCrashWhileMainOnError() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            PublishProcessor<List<Integer>> pp1 = PublishProcessor.create();
+            PublishProcessor<List<Integer>> pp2 = PublishProcessor.create();
+
+            new ParallelSortedJoin<>(ParallelFlowable.fromArray(pp1, pp2)
+            , (a, b) -> {
+                pp1.onError(new IOException());
+                throw new TestException();
+            })
+            .test();
+
+            pp1.onNext(Arrays.asList(1));
+            pp2.onNext(Arrays.asList(2));
+
+            pp1.onComplete();
+            pp2.onComplete();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
index 6daaf15245..3fa8554a7d 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
@@ -523,4 +523,9 @@ public void onComplete() {
         ts1.assertResult();
         ts2.assertEmpty();
     }
+
+    @Test
+    public void cancel() {
+        TestHelper.checkDisposed(AsyncProcessor.create());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
index d49ba5f565..0d0acb2796 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
@@ -612,6 +612,36 @@ public void run() {
         }
     }
 
+    @Test
+    public void multipleSubscribersRemoveSomeRace() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            final BehaviorProcessor<Object> p = BehaviorProcessor.create();
+
+            final TestSubscriber<Object> ts1 = p.test();
+            final TestSubscriber<Object> ts2 = p.test();
+            final TestSubscriber<Object> ts3 = p.test();
+
+            Runnable r1 = new Runnable() {
+                @Override
+                public void run() {
+                    ts1.cancel();
+                }
+            };
+
+            Runnable r2 = new Runnable() {
+                @Override
+                public void run() {
+                    ts2.cancel();
+                }
+            };
+
+            TestHelper.race(r1, r2);
+
+            p.onNext(1);
+            ts3.assertValuesOnly(1);
+        }
+    }
+
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @Test
     public void subscribeOnNextRace() {
diff --git a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
index bb4b97e68b..74b8fac206 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
@@ -26,6 +26,7 @@
 import org.mockito.*;
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
@@ -1199,6 +1200,30 @@ public void takeSizeAndTime() {
         .assertResult(2);
     }
 
+    @Test
+    public void takeSizeAndTime2() {
+        TestScheduler scheduler = new TestScheduler();
+
+        ReplayProcessor<Integer> rp = ReplayProcessor.createWithTimeAndSize(1, TimeUnit.SECONDS, scheduler, 2);
+
+        rp.onNext(1);
+        rp.onNext(2);
+        rp.onNext(3);
+
+        TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+            @Override
+            public void onNext(@NonNull Integer t) {
+                super.onNext(t);
+                cancel();
+                onComplete();
+            }
+        };
+
+        rp
+        .subscribeWith(ts)
+        .assertResult(2);
+    }
+
     @Test
     public void takeSize() {
         ReplayProcessor<Integer> rp = ReplayProcessor.createWithSize(2);
@@ -1213,6 +1238,28 @@ public void takeSize() {
         .assertResult(2);
     }
 
+    @Test
+    public void takeSize2() {
+        ReplayProcessor<Integer> rp = ReplayProcessor.createWithSize(2);
+
+        rp.onNext(1);
+        rp.onNext(2);
+        rp.onNext(3);
+
+        TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+            @Override
+            public void onNext(@NonNull Integer t) {
+                super.onNext(t);
+                cancel();
+                onComplete();
+            }
+        };
+
+        rp
+        .subscribeWith(ts)
+        .assertResult(2);
+    }
+
     @Test
     public void reentrantDrain() {
         TestScheduler scheduler = new TestScheduler();
diff --git a/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
index fc50ade3ef..b2bd9bac19 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
@@ -20,6 +20,7 @@
 
 import org.junit.Test;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
@@ -664,4 +665,27 @@ public void run() {
             ts.assertEmpty();
         }
     }
+
+    @Test
+    public void onErrorQueued() {
+        FlowableProcessor<Integer> sp = PublishProcessor.<Integer>create().toSerialized();
+
+        TestSubscriber<Integer> ts = new TestSubscriber<Integer>() {
+            @Override
+            public void onNext(@NonNull Integer t) {
+                super.onNext(t);
+                if (t == 1) {
+                    sp.onNext(2);
+                    sp.onSubscribe(new BooleanSubscription());
+                    sp.onError(new TestException());
+                }
+            }
+        };
+
+        sp.subscribe(ts);
+
+        sp.onNext(1);
+
+        ts.assertFailure(TestException.class, 1); // errors skip ahead
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
index b2e90cdb00..9910c03148 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
@@ -18,14 +18,14 @@
 import java.lang.management.*;
 import java.util.List;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.*;
 
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.Scheduler;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.internal.disposables.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.schedulers.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -509,4 +509,42 @@ public void run() {
 
         assertSame(Functions.EMPTY_RUNNABLE, wrapper.getWrappedRunnable());
     }
+
+    @Test
+    public void interruptibleRunnableRunDisposeRace() {
+        ExecutorService exec = Executors.newSingleThreadExecutor();
+        try {
+            Scheduler s = Schedulers.from(r -> exec.execute(r), true);
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+                SequentialDisposable sd = new SequentialDisposable();
+
+                TestHelper.race(
+                        () -> sd.update(s.scheduleDirect(() -> { })),
+                        () -> sd.dispose()
+                );
+            }
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void interruptibleRunnableRunDispose() {
+        try {
+            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+                AtomicReference<Runnable> runRef = new AtomicReference<>();
+                Scheduler s = Schedulers.from(r -> {
+                    runRef.set(r);
+                }, true);
+
+                Disposable d = s.scheduleDirect(() -> { });
+                TestHelper.race(
+                        () -> runRef.get().run(),
+                        () -> d.dispose()
+                );
+            }
+        } finally {
+            Thread.interrupted();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
index 395300e292..96d63b3ab2 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
@@ -24,7 +24,7 @@
 import org.mockito.*;
 
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
@@ -517,4 +517,9 @@ public void onComplete() {
         to1.assertResult();
         to2.assertEmpty();
     }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(AsyncSubject.create());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
index 8e472ec4c5..25e239e378 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
@@ -833,4 +833,19 @@ public void emittingEmitNext() {
 
         assertNotNull(bd.queue);
     }
+
+    @Test
+    public void hasObservers() {
+        BehaviorSubject<Integer> bs = BehaviorSubject.create();
+
+        assertFalse(bs.hasObservers());
+
+        TestObserver<Integer> to = bs.test();
+
+        assertTrue(bs.hasObservers());
+
+        to.dispose();
+
+        assertFalse(bs.hasObservers());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
index bf74ac5998..86589cd25d 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
@@ -20,9 +20,10 @@
 
 import org.junit.Test;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -665,4 +666,51 @@ public void run() {
             to.assertEmpty();
         }
     }
+
+    @Test
+    public void onErrorQueued() {
+        Subject<Integer> sp = PublishSubject.<Integer>create().toSerialized();
+
+        TestObserver<Integer> to = new TestObserver<Integer>() {
+            @Override
+            public void onNext(@NonNull Integer t) {
+                super.onNext(t);
+                if (t == 1) {
+                    sp.onNext(2);
+                    sp.onNext(3);
+                    sp.onSubscribe(Disposable.empty());
+                    sp.onError(new TestException());
+                }
+            }
+        };
+
+        sp.subscribe(to);
+
+        sp.onNext(1);
+
+        to.assertFailure(TestException.class, 1); // errors skip ahead
+    }
+
+    @Test
+    public void onCompleteQueued() {
+        Subject<Integer> sp = PublishSubject.<Integer>create().toSerialized();
+
+        TestObserver<Integer> to = new TestObserver<Integer>() {
+            @Override
+            public void onNext(@NonNull Integer t) {
+                super.onNext(t);
+                if (t == 1) {
+                    sp.onNext(2);
+                    sp.onNext(3);
+                    sp.onComplete();
+                }
+            }
+        };
+
+        sp.subscribe(to);
+
+        sp.onNext(1);
+
+        to.assertResult(1, 2, 3);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
index ac000e4228..0c05dbbf9f 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
@@ -495,4 +495,20 @@ public void fusedNoConcurrentCleanDueToCancel() {
             }
         }
     }
+
+    @Test
+    public void withCapacityHint() {
+        UnicastSubject<Integer> us = UnicastSubject.create(16);
+
+        TestObserver<Integer> to = us.test();
+
+        for (int i = 0; i < 256; i++) {
+            us.onNext(i);
+        }
+        us.onComplete();
+
+        to.assertValueCount(256)
+        .assertComplete()
+        .assertNoErrors();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
index 00c7ae2103..ee842fcf02 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
@@ -1134,4 +1134,28 @@ public void nullOnNext() {
 
         ts.assertFailureAndMessage(NullPointerException.class, ExceptionHelper.nullWarning("onNext called with a null value."));
     }
+
+    @Test
+    public void onErrorQueuedUp() {
+        AtomicReference<SerializedSubscriber<Integer>> ssRef = new AtomicReference<>();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>() {
+            @Override
+            public void onNext(Integer t) {
+                super.onNext(t);
+                ssRef.get().onNext(2);
+                ssRef.get().onError(new TestException());
+            }
+        };
+
+        final SerializedSubscriber<Integer> so = new SerializedSubscriber<>(ts, true);
+        ssRef.set(so);
+
+        BooleanSubscription bs = new BooleanSubscription();
+
+        so.onSubscribe(bs);
+
+        so.onNext(1);
+
+        ts.assertFailure(TestException.class, 1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
index 6ce4f4ed24..48bb722585 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
@@ -1661,4 +1661,40 @@ public void assertValuesOnlyThrowsWhenErrored() {
             // expected
         }
     }
+
+    @Test
+    public void onErrorIsNull() {
+        TestSubscriber<Integer> ts = TestSubscriber.create();
+        ts.onSubscribe(new BooleanSubscription());
+
+        ts.onError(null);
+
+        ts.assertFailure(NullPointerException.class);
+    }
+
+    static final class TestSubscriberImpl<T> extends TestSubscriber<T> {
+        public boolean isTimeout() {
+            return timeout;
+        }
+    }
+
+    @Test
+    public void awaitCountTimeout() {
+        TestSubscriberImpl<Integer> ts = new TestSubscriberImpl<>();
+        ts.onSubscribe(new BooleanSubscription());
+        ts.awaitCount(1);
+        assertTrue(ts.isTimeout());
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void awaitCountInterrupted() {
+        try {
+            TestSubscriber<Integer> ts = TestSubscriber.create();
+            ts.onSubscribe(new BooleanSubscription());
+            Thread.currentThread().interrupt();
+            ts.awaitCount(1);
+        } finally {
+            Thread.interrupted();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index bb6608e96d..dfaccd6ac5 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -30,6 +30,7 @@
 import org.mockito.stubbing.Answer;
 import org.reactivestreams.*;
 
+import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
@@ -40,7 +41,7 @@
 import io.reactivex.rxjava3.internal.operators.completable.CompletableToFlowable;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable;
 import io.reactivex.rxjava3.internal.operators.single.SingleToFlowable;
-import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.observers.BaseTestConsumer;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
@@ -356,6 +357,68 @@ public void onComplete() {
             RxJavaPlugins.setErrorHandler(null);
         }
     }
+
+    /**
+     * Assert that by consuming the Publisher with a bad request amount, it is
+     * reported to the plugin error handler promptly.
+     * @param source the source to consume
+     */
+    public static void assertBadRequestReported(ParallelFlowable<?> source) {
+        List<Throwable> list = trackPluginErrors();
+        try {
+            final CountDownLatch cdl = new CountDownLatch(1);
+
+            FlowableSubscriber<Object> bad = new FlowableSubscriber<Object>() {
+
+                @Override
+                public void onSubscribe(Subscription s) {
+                    try {
+                        s.request(-99);
+                        s.cancel();
+                        s.cancel();
+                    } finally {
+                        cdl.countDown();
+                    }
+                }
+
+                @Override
+                public void onNext(Object t) {
+
+                }
+
+                @Override
+                public void onError(Throwable t) {
+
+                }
+
+                @Override
+                public void onComplete() {
+
+                }
+
+            };
+
+            @SuppressWarnings("unchecked")
+            FlowableSubscriber<Object>[] subs = new FlowableSubscriber[source.parallelism()];
+            subs[0] = bad;
+            for (int i = 1; i < subs.length; i++) {
+                subs[i] = NoOpConsumer.INSTANCE;
+            }
+            source.subscribe(subs);
+
+            try {
+                assertTrue(cdl.await(5, TimeUnit.SECONDS));
+            } catch (InterruptedException ex) {
+                throw new AssertionError(ex.getMessage());
+            }
+
+            assertTrue(list.toString(), list.get(0) instanceof IllegalArgumentException);
+            assertEquals("n > 0 required but it was -99", list.get(0).getMessage());
+        } finally {
+            RxJavaPlugins.setErrorHandler(null);
+        }
+    }
+
     /**
      * Synchronizes the execution of two runnables (as much as possible)
      * to test race conditions.
@@ -616,6 +679,18 @@ public static void doubleOnSubscribe(MaybeObserver<?> observer) {
         }
     }
 
+    public static void checkDisposed(Disposable d) {
+        assertFalse("Disposed upfront?!", d.isDisposed());
+
+        d.dispose();
+
+        assertTrue("Not disposed?!", d.isDisposed());
+
+        d.dispose();
+
+        assertTrue("Not disposed again?!", d.isDisposed());
+    }
+
     /**
      * Checks if the upstream's Subscription sent through the onSubscribe reports
      * isCancelled properly before and after calling dispose.
@@ -1485,6 +1560,69 @@ public int parallelism() {
             RxJavaPlugins.reset();
         }
     }
+    /**
+     * Check if the given transformed reactive type reports multiple onSubscribe calls to
+     * RxJavaPlugins.
+     * @param <T> the input value type
+     * @param transform the transform to drive an operator
+     */
+    public static <T> void checkDoubleOnSubscribeParallelToFlowable(Function<ParallelFlowable<T>, ? extends Flowable<?>> transform) {
+        List<Throwable> errors = trackPluginErrors();
+        try {
+            final Boolean[] b = { null, null, null, null };
+            final CountDownLatch cdl = new CountDownLatch(2);
+
+            ParallelFlowable<T> source = new ParallelFlowable<T>() {
+                @Override
+                public void subscribe(Subscriber<? super T>[] subscribers) {
+                    for (int i = 0; i < subscribers.length; i++) {
+                        try {
+                            BooleanSubscription bs1 = new BooleanSubscription();
+
+                            subscribers[i].onSubscribe(bs1);
+
+                            BooleanSubscription bs2 = new BooleanSubscription();
+
+                            subscribers[i].onSubscribe(bs2);
+
+                            b[i * 2 + 0] = bs1.isCancelled();
+                            b[i * 2 + 1] = bs2.isCancelled();
+                        } finally {
+                            cdl.countDown();
+                        }
+                    }
+                }
+
+                @Override
+                public int parallelism() {
+                    return 2;
+                }
+            };
+
+            Flowable<?> out = transform.apply(source);
+
+            out.subscribe(NoOpConsumer.INSTANCE);
+
+            try {
+                assertTrue("Timed out", cdl.await(5, TimeUnit.SECONDS));
+            } catch (InterruptedException ex) {
+                throw ExceptionHelper.wrapOrThrow(ex);
+            }
+
+            assertEquals("Rail 1 First disposed?", false, b[0]);
+            assertEquals("Rail 1 Second not disposed?", true, b[1]);
+
+            assertEquals("Rail 2 First disposed?", false, b[2]);
+            assertEquals("Rail 2 Second not disposed?", true, b[3]);
+
+            assertError(errors, 0, IllegalStateException.class, "Subscription already set!");
+            assertError(errors, 1, IllegalStateException.class, "Subscription already set!");
+        } catch (Throwable ex) {
+            throw ExceptionHelper.wrapOrThrow(ex);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
 
     /**
      * Check if the given transformed reactive type reports multiple onSubscribe calls to
@@ -3581,4 +3719,124 @@ public static void assertError(CompletableFuture<?> cf, Class<? extends Throwabl
             }
         }
     }
+
+    /**
+     * Syncs the execution of the given runnable with the execution of the
+     * current thread.
+     * @param run the other task to run in sync with the current thread
+     * @param resume the latch to count down after the {@code run}
+     */
+    public static void raceOther(Runnable run, CountDownLatch resume) {
+        AtomicInteger sync = new AtomicInteger(2);
+
+        Schedulers.single().scheduleDirect(() -> {
+            if (sync.decrementAndGet() != 0) {
+                while (sync.get() != 0) { }
+            }
+
+            run.run();
+
+            resume.countDown();
+        });
+
+        if (sync.decrementAndGet() != 0) {
+            while (sync.get() != 0) { }
+        }
+    }
+
+    /**
+     * Inserts a ConditionalSubscriber into the chain to trigger the conditional paths
+     * without interfering with the requestFusion parts.
+     * @param <T> the element type
+     * @return the new FlowableTransformer instance
+     */
+    public static <T> FlowableTransformer<T, T> conditional() {
+        return f -> new Flowable<T>() {
+            @Override
+            protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> subscriber) {
+                f.subscribe(new ForwardingConditionalSubscriber<>(subscriber));
+            }
+        };
+    }
+
+    /**
+     * Wraps a Subscriber and exposes it as a fuseable conditional subscriber without interfering with
+     * requestFusion.
+     * @param <T> the element type
+     */
+    static final class ForwardingConditionalSubscriber<T> extends BasicQueueSubscription<T> implements ConditionalSubscriber<T> {
+
+        private static final long serialVersionUID = 365317603608134078L;
+
+        final Subscriber<? super T> downstream;
+
+        Subscription upstream;
+
+        QueueSubscription<T> qs;
+
+        ForwardingConditionalSubscriber(Subscriber<? super T> downstream) {
+            this.downstream = downstream;
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        public void onSubscribe(@NonNull Subscription s) {
+            this.upstream = s;
+            if (s instanceof QueueSubscription) {
+                this.qs = (QueueSubscription<T>)s;
+            }
+            downstream.onSubscribe(this);
+        }
+
+        @Override
+        public void onNext(@NonNull T t) {
+            downstream.onNext(t);
+        }
+
+        @Override
+        public boolean tryOnNext(@NonNull T t) {
+            downstream.onNext(t);
+            return true;
+        }
+
+        @Override
+        public void onError(Throwable t) {
+            downstream.onError(t);
+        }
+
+        @Override
+        public void onComplete() {
+            downstream.onComplete();
+        }
+
+        @Override
+        public int requestFusion(int mode) {
+            return qs != null ? qs.requestFusion(mode) : 0;
+        }
+
+        @Override
+        public @Nullable T poll() throws Throwable {
+            return qs.poll();
+        }
+
+        @Override
+        public boolean isEmpty() {
+            return qs.isEmpty();
+        }
+
+        @Override
+        public void clear() {
+            qs.clear();
+        }
+
+        @Override
+        public void request(long n) {
+            upstream.request(n);
+        }
+
+        @Override
+        public void cancel() {
+            upstream.cancel();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java b/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java
index e521c15b6e..a603a589fc 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java
@@ -17,13 +17,13 @@
 
 import java.lang.reflect.*;
 import java.util.*;
-import java.util.Observable;
 import java.util.concurrent.Callable;
 
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 

From 6b2cf341c3ec2e27449b1270396e3cb7d562273b Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Thu, 13 Feb 2020 17:35:23 +0100
Subject: [PATCH 096/665] Missing version tag from Single.concatMaps

---
 src/main/java/io/reactivex/rxjava3/core/Single.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 09c67ef5a1..e830589e23 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -2699,6 +2699,7 @@ public final <U> Single<U> cast(@NonNull Class<? extends U> clazz) {
      * @return the new {@code Single} returned from {@code mapper} when applied to the item emitted by the current {@code Single}
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @since 3.0.0
      */
     @CheckReturnValue
     @NonNull
@@ -2753,6 +2754,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * @return the new {@code Maybe} returned from {@code mapper} when applied to the item emitted by the current {@code Single}
      * @throws NullPointerException if {@code mapper} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/flatmap.html">ReactiveX operators documentation: FlatMap</a>
+     * @since 3.0.0
      */
     @CheckReturnValue
     @NonNull

From e793bc1d1a29dca18be795cf4a7628e2d44a4234 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Thu, 13 Feb 2020 18:13:56 +0100
Subject: [PATCH 097/665] More missing version tags

---
 src/main/java/io/reactivex/rxjava3/core/Maybe.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 784343922d..de0f840326 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -549,6 +549,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
      * @return the new {@code Flowable} with the concatenating behavior
      * @throws NullPointerException if {@code sources} is {@code null}
      * @throws IllegalArgumentException if {@code prefetch} is non-positive
+     * @since 3.0.0
      */
     @BackpressureSupport(BackpressureKind.FULL)
     @CheckReturnValue

From 1c17f3669bcfc7651925f7dc977a9561ace84d7d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 14 Feb 2020 14:19:22 +0100
Subject: [PATCH 098/665] Update 2.x maintenance date, include 3.0 wiki

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 698aa96f40..eb6b23dea9 100644
--- a/README.md
+++ b/README.md
@@ -22,10 +22,11 @@ It extends the [observer pattern](http://en.wikipedia.org/wiki/Observer_pattern)
 
 Learn more about RxJava in general on the <a href="https://github.com/ReactiveX/RxJava/wiki">Wiki Home</a>.
 
+:information_source: Please read the [What's different in 3.0](https://github.com/ReactiveX/RxJava/wiki/What's-different-in-3.0) for details on the changes and migration information when upgrading from 2.x.
+
 #### Version 2.x
 
-The [2.x version](https://github.com/ReactiveX/RxJava/tree/2.x) will be supported with bugfixes and important documentation updates until
-**December 31, 2020**. No new features will be added to 2.x.
+The [2.x version](https://github.com/ReactiveX/RxJava/tree/2.x) is in maintenance mode and will be supported with only through bugfixes until **February 28, 2021**. No new features will be added to 2.x.
 
 #### Version 1.x
 

From 042dee38fc9b1655f68a2296ee94035ba5e6efa1 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 14 Feb 2020 14:20:41 +0100
Subject: [PATCH 099/665] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eb6b23dea9..ed7ad4a5de 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Learn more about RxJava in general on the <a href="https://github.com/ReactiveX/
 
 #### Version 2.x
 
-The [2.x version](https://github.com/ReactiveX/RxJava/tree/2.x) is in maintenance mode and will be supported with only through bugfixes until **February 28, 2021**. No new features will be added to 2.x.
+The [2.x version](https://github.com/ReactiveX/RxJava/tree/2.x) is in maintenance mode and will be supported only through bugfixes until **February 28, 2021**. No new features, behavior changes or documentation adjustments will be accepted or applied to 2.x.
 
 #### Version 1.x
 

From b34e5f664f6f567890471a3ca3b8239d3f270f80 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 27 Feb 2020 20:48:19 +0100
Subject: [PATCH 100/665] 3.x: Fix switchMap not canceling properly during
 onNext-cancel races (#6917)

---
 .../operators/flowable/FlowableSwitchMap.java |  1 -
 .../flowable/FlowableSwitchTest.java          | 42 ++++++++++++++++++-
 .../observable/ObservableSwitchTest.java      | 42 ++++++++++++++++++-
 3 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
index 8e8ff3f0a5..f7e2764460 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
@@ -198,7 +198,6 @@ void drain() {
             for (;;) {
 
                 if (cancelled) {
-                    active.lazySet(null);
                     return;
                 }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
index 4726d9bfcc..e7cd7c3db0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
@@ -19,7 +19,7 @@
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.*;
 
 import org.junit.*;
 import org.mockito.InOrder;
@@ -1337,4 +1337,44 @@ public void innerCompletedBackpressureBoundaryDelayError() {
 
         ts.assertValuesOnly(1);
     }
+
+    @Test
+    public void cancellationShouldTriggerInnerCancellationRace() throws Throwable {
+        AtomicInteger outer = new AtomicInteger();
+        AtomicInteger inner = new AtomicInteger();
+
+        int n = 10_000;
+        for (int i = 0; i < n; i++) {
+            Flowable.<Integer>create(it -> {
+                it.onNext(0);
+            }, BackpressureStrategy.MISSING)
+            .switchMap(v -> createFlowable(inner))
+            .observeOn(Schedulers.computation())
+            .doFinally(() -> {
+                outer.incrementAndGet();
+            })
+            .take(1)
+            .blockingSubscribe(v -> { }, Throwable::printStackTrace);
+        }
+
+        Thread.sleep(100);
+        assertEquals(inner.get(), outer.get());
+        assertEquals(n, inner.get());
+    }
+
+    Flowable<Integer> createFlowable(AtomicInteger inner) {
+        return Flowable.<Integer>unsafeCreate(s -> {
+            SerializedSubscriber<Integer> it = new SerializedSubscriber<>(s);
+            it.onSubscribe(new BooleanSubscription());
+            Schedulers.io().scheduleDirect(() -> {
+                it.onNext(1);
+            }, 0, TimeUnit.MILLISECONDS);
+            Schedulers.io().scheduleDirect(() -> {
+                it.onNext(2);
+            }, 0, TimeUnit.MILLISECONDS);
+        })
+        .doFinally(() -> {
+            inner.incrementAndGet();
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
index a68dd46f08..3587c58aec 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
@@ -34,7 +34,7 @@
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
-import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.observers.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subjects.PublishSubject;
@@ -1398,4 +1398,44 @@ public void innerIgnoresCancelAndErrors() throws Throwable {
             TestHelper.assertUndeliverable(errors, 0, TestException.class);
         });
     }
+
+    @Test
+    public void cancellationShouldTriggerInnerCancellationRace() throws Throwable {
+        AtomicInteger outer = new AtomicInteger();
+        AtomicInteger inner = new AtomicInteger();
+
+        int n = 10_000;
+        for (int i = 0; i < n; i++) {
+            Observable.<Integer>create(it -> {
+                it.onNext(0);
+            })
+            .switchMap(v -> createObservable(inner))
+            .observeOn(Schedulers.computation())
+            .doFinally(() -> {
+                outer.incrementAndGet();
+            })
+            .take(1)
+            .blockingSubscribe(v -> { }, Throwable::printStackTrace);
+        }
+
+        Thread.sleep(100);
+        assertEquals(inner.get(), outer.get());
+        assertEquals(n, inner.get());
+    }
+
+    Observable<Integer> createObservable(AtomicInteger inner) {
+        return Observable.<Integer>unsafeCreate(s -> {
+            SerializedObserver<Integer> it = new SerializedObserver<>(s);
+            it.onSubscribe(Disposable.empty());
+            Schedulers.io().scheduleDirect(() -> {
+                it.onNext(1);
+            }, 0, TimeUnit.MILLISECONDS);
+            Schedulers.io().scheduleDirect(() -> {
+                it.onNext(2);
+            }, 0, TimeUnit.MILLISECONDS);
+        })
+        .doFinally(() -> {
+            inner.incrementAndGet();
+        });
+    }
 }

From 47b513d71a4585eefdc62ee44195693371b43772 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 29 Feb 2020 14:02:28 +0100
Subject: [PATCH 101/665] 3.x: Fix replay() not resetting when the connection
 is disposed (#6921)

---
 .../operators/flowable/FlowableReplay.java    |  14 +-
 .../observable/ObservableReplay.java          |  14 +-
 .../flowable/FlowablePublishTest.java         |  27 ++++
 .../FlowableReplayEagerTruncateTest.java      |  94 ++++++++++++--
 .../flowable/FlowableReplayTest.java          | 121 ++++++++++++++++--
 .../observable/ObservablePublishTest.java     |  27 ++++
 .../ObservableReplayEagerTruncateTest.java    |  83 +++++++++++-
 .../observable/ObservableReplayTest.java      |  27 ++++
 8 files changed, 368 insertions(+), 39 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
index 258db5f3bc..4423747632 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
@@ -179,7 +179,7 @@ public void connect(Consumer<? super Disposable> connection) {
                 }
 
                 // create a new subscriber-to-source
-                ReplaySubscriber<T> u = new ReplaySubscriber<>(buf);
+                ReplaySubscriber<T> u = new ReplaySubscriber<>(buf, current);
                 // try setting it as the current subscriber-to-source
                 if (!current.compareAndSet(ps, u)) {
                     // did not work, perhaps a new subscriber arrived
@@ -249,9 +249,13 @@ static final class ReplaySubscriber<T>
         /** Tracks the amount already requested from the upstream. */
         long requestedFromUpstream;
 
+        /** The current connection. */
+        final AtomicReference<ReplaySubscriber<T>> current;
+
         @SuppressWarnings("unchecked")
-        ReplaySubscriber(ReplayBuffer<T> buffer) {
+        ReplaySubscriber(ReplayBuffer<T> buffer, AtomicReference<ReplaySubscriber<T>> current) {
             this.buffer = buffer;
+            this.current = current;
             this.management = new AtomicInteger();
             this.subscribers = new AtomicReference<>(EMPTY);
             this.shouldConnect = new AtomicBoolean();
@@ -266,9 +270,7 @@ public boolean isDisposed() {
         @Override
         public void dispose() {
             subscribers.set(TERMINATED);
-            // unlike OperatorPublish, we can't null out the terminated so
-            // late subscribers can still get replay
-            // current.compareAndSet(ReplaySubscriber.this, null);
+            current.compareAndSet(ReplaySubscriber.this, null);
             // we don't care if it fails because it means the current has
             // been replaced in the meantime
             SubscriptionHelper.cancel(this);
@@ -1198,7 +1200,7 @@ public void subscribe(Subscriber<? super T> child) {
                         return;
                     }
                     // create a new subscriber to source
-                    ReplaySubscriber<T> u = new ReplaySubscriber<>(buf);
+                    ReplaySubscriber<T> u = new ReplaySubscriber<>(buf, curr);
                     // let's try setting it as the current subscriber-to-source
                     if (!curr.compareAndSet(null, u)) {
                         // didn't work, maybe someone else did it or the current subscriber
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
index f7937b0509..3b7bff1673 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
@@ -174,7 +174,7 @@ public void connect(Consumer<? super Disposable> connection) {
                 // create a new subscriber-to-source
                 ReplayBuffer<T> buf = bufferFactory.call();
 
-                ReplayObserver<T> u = new ReplayObserver<>(buf);
+                ReplayObserver<T> u = new ReplayObserver<>(buf, current);
                 // try setting it as the current subscriber-to-source
                 if (!current.compareAndSet(ps, u)) {
                     // did not work, perhaps a new subscriber arrived
@@ -240,8 +240,12 @@ static final class ReplayObserver<T>
          */
         final AtomicBoolean shouldConnect;
 
-        ReplayObserver(ReplayBuffer<T> buffer) {
+        /** The current connection. */
+        final AtomicReference<ReplayObserver<T>> current;
+
+        ReplayObserver(ReplayBuffer<T> buffer, AtomicReference<ReplayObserver<T>> current) {
             this.buffer = buffer;
+            this.current = current;
 
             this.observers = new AtomicReference<>(EMPTY);
             this.shouldConnect = new AtomicBoolean();
@@ -255,9 +259,7 @@ public boolean isDisposed() {
         @Override
         public void dispose() {
             observers.set(TERMINATED);
-            // unlike OperatorPublish, we can't null out the terminated so
-            // late observers can still get replay
-            // current.compareAndSet(ReplayObserver.this, null);
+            current.compareAndSet(ReplayObserver.this, null);
             // we don't care if it fails because it means the current has
             // been replaced in the meantime
             DisposableHelper.dispose(this);
@@ -1004,7 +1006,7 @@ public void subscribe(Observer<? super T> child) {
                     // create a new subscriber to source
                     ReplayBuffer<T> buf = bufferFactory.call();
 
-                    ReplayObserver<T> u = new ReplayObserver<>(buf);
+                    ReplayObserver<T> u = new ReplayObserver<>(buf, curr);
                     // let's try setting it as the current subscriber-to-source
                     if (!curr.compareAndSet(null, u)) {
                         // didn't work, maybe someone else did it or the current subscriber
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
index 6e701e5fc3..a3fb489e9f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
@@ -1776,4 +1776,31 @@ public void onError(Throwable t) {
 
         ts1.assertEmpty();
     }
+
+    @Test
+    public void disposeNoNeedForReset() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.publish();
+
+        TestSubscriber<Integer> ts = cf.test();
+
+        Disposable d = cf.connect();
+
+        pp.onNext(1);
+
+        d.dispose();
+
+        ts = cf.test();
+
+        ts.assertEmpty();
+
+        cf.connect();
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
index ce2cf5a564..62612f886b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
@@ -1923,19 +1923,6 @@ public ReplayBuffer<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @Test
-    public void currentDisposedWhenConnecting() {
-        FlowableReplay<Integer> fr = (FlowableReplay<Integer>)FlowableReplay.create(Flowable.<Integer>never(), 16, true);
-        fr.connect();
-
-        fr.current.get().dispose();
-        assertTrue(fr.current.get().isDisposed());
-
-        fr.connect();
-
-        assertFalse(fr.current.get().isDisposed());
-    }
-
     @Test
     public void noBoundedRetentionViaThreadLocal() throws Exception {
         Flowable<byte[]> source = Flowable.range(1, 200)
@@ -2275,4 +2262,85 @@ public void timeAndSizeNoTerminalTruncationOnTimechange() {
         .assertComplete()
         .assertNoErrors();
     }
+
+    @Test
+    public void disposeNoNeedForResetSizeBound() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.replay(10, true);
+
+        TestSubscriber<Integer> ts = cf.test();
+
+        Disposable d = cf.connect();
+
+        pp.onNext(1);
+
+        d.dispose();
+
+        ts = cf.test();
+
+        ts.assertEmpty();
+
+        cf.connect();
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(2);
+    }
+
+    @Test
+    public void disposeNoNeedForResetTimeBound() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.replay(10, TimeUnit.MINUTES, Schedulers.single(), true);
+
+        TestSubscriber<Integer> ts = cf.test();
+
+        Disposable d = cf.connect();
+
+        pp.onNext(1);
+
+        d.dispose();
+
+        ts = cf.test();
+
+        ts.assertEmpty();
+
+        cf.connect();
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(2);
+    }
+
+    @Test
+    public void disposeNoNeedForResetTimeAndSIzeBound() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.replay(10, 10, TimeUnit.MINUTES, Schedulers.single(), true);
+
+        TestSubscriber<Integer> ts = cf.test();
+
+        Disposable d = cf.connect();
+
+        pp.onNext(1);
+
+        d.dispose();
+
+        ts = cf.test();
+
+        ts.assertEmpty();
+
+        cf.connect();
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
index e151dd07f1..2a799af71f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
@@ -1988,19 +1988,6 @@ public ReplayBuffer<Integer> get() throws Exception {
         .assertFailure(TestException.class);
     }
 
-    @Test
-    public void currentDisposedWhenConnecting() {
-        FlowableReplay<Integer> fr = (FlowableReplay<Integer>)FlowableReplay.create(Flowable.<Integer>never(), 16, false);
-        fr.connect();
-
-        fr.current.get().dispose();
-        assertTrue(fr.current.get().isDisposed());
-
-        fr.connect();
-
-        assertFalse(fr.current.get().isDisposed());
-    }
-
     @Test
     public void noBoundedRetentionViaThreadLocal() throws Exception {
         Flowable<byte[]> source = Flowable.range(1, 200)
@@ -2191,4 +2178,112 @@ public void cancel() {
 
         ts.assertResult();
     }
+
+    @Test
+    public void disposeNoNeedForReset() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.replay();
+
+        TestSubscriber<Integer> ts = cf.test();
+
+        Disposable d = cf.connect();
+
+        pp.onNext(1);
+
+        d.dispose();
+
+        ts = cf.test();
+
+        ts.assertEmpty();
+
+        cf.connect();
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(2);
+    }
+
+    @Test
+    public void disposeNoNeedForResetSizeBound() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.replay(10);
+
+        TestSubscriber<Integer> ts = cf.test();
+
+        Disposable d = cf.connect();
+
+        pp.onNext(1);
+
+        d.dispose();
+
+        ts = cf.test();
+
+        ts.assertEmpty();
+
+        cf.connect();
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(2);
+    }
+
+    @Test
+    public void disposeNoNeedForResetTimeBound() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.replay(10, TimeUnit.MINUTES);
+
+        TestSubscriber<Integer> ts = cf.test();
+
+        Disposable d = cf.connect();
+
+        pp.onNext(1);
+
+        d.dispose();
+
+        ts = cf.test();
+
+        ts.assertEmpty();
+
+        cf.connect();
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(2);
+    }
+
+    @Test
+    public void disposeNoNeedForResetTimeAndSIzeBound() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        ConnectableFlowable<Integer> cf = pp.replay(10, 10, TimeUnit.MINUTES);
+
+        TestSubscriber<Integer> ts = cf.test();
+
+        Disposable d = cf.connect();
+
+        pp.onNext(1);
+
+        d.dispose();
+
+        ts = cf.test();
+
+        ts.assertEmpty();
+
+        cf.connect();
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
index 16cb03d00e..a83372c03e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
@@ -866,4 +866,31 @@ public void disposeResets() {
 
         to.assertValuesOnly(1);
     }
+
+    @Test
+    public void disposeNoNeedForReset() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        ConnectableObservable<Integer> co = ps.publish();
+
+        TestObserver<Integer> to = co.test();
+
+        Disposable d = co.connect();
+
+        ps.onNext(1);
+
+        d.dispose();
+
+        to = co.test();
+
+        to.assertEmpty();
+
+        co.connect();
+
+        to.assertEmpty();
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
index fe2c59d088..cf473d6e78 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
@@ -30,7 +30,7 @@
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -1976,4 +1976,85 @@ public void timeAndSizeNoTerminalTruncationOnTimechange() {
         .assertComplete()
         .assertNoErrors();
     }
+
+    @Test
+    public void disposeNoNeedForResetSizeBound() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        ConnectableObservable<Integer> co = ps.replay(10, true);
+
+        TestObserver<Integer> to = co.test();
+
+        Disposable d = co.connect();
+
+        ps.onNext(1);
+
+        d.dispose();
+
+        to = co.test();
+
+        to.assertEmpty();
+
+        co.connect();
+
+        to.assertEmpty();
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(2);
+    }
+
+    @Test
+    public void disposeNoNeedForResetTimeBound() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        ConnectableObservable<Integer> co = ps.replay(10, TimeUnit.MINUTES, Schedulers.single(), true);
+
+        TestObserver<Integer> to = co.test();
+
+        Disposable d = co.connect();
+
+        ps.onNext(1);
+
+        d.dispose();
+
+        to = co.test();
+
+        to.assertEmpty();
+
+        co.connect();
+
+        to.assertEmpty();
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(2);
+    }
+
+    @Test
+    public void disposeNoNeedForResetTimeAndSIzeBound() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        ConnectableObservable<Integer> co = ps.replay(10, 10, TimeUnit.MINUTES, Schedulers.single(), true);
+
+        TestObserver<Integer> to = co.test();
+
+        Disposable d = co.connect();
+
+        ps.onNext(1);
+
+        d.dispose();
+
+        to = co.test();
+
+        to.assertEmpty();
+
+        co.connect();
+
+        to.assertEmpty();
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
index cbaf961149..94a7a6087f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
@@ -1724,4 +1724,31 @@ public void resetWhileActiveIsNoOp() {
 
         co.reset();
     }
+
+    @Test
+    public void disposeNoNeedForReset() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        ConnectableObservable<Integer> co = ps.replay();
+
+        TestObserver<Integer> to = co.test();
+
+        Disposable d = co.connect();
+
+        ps.onNext(1);
+
+        d.dispose();
+
+        to = co.test();
+
+        to.assertEmpty();
+
+        co.connect();
+
+        to.assertEmpty();
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(2);
+    }
 }

From a29e7e4560782660afe93edf0cade858c9344add Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 2 Mar 2020 09:33:01 +0100
Subject: [PATCH 102/665] Bump build-info-extractor-gradle from 4.13.0 to
 4.14.1 (#6924)

Bumps build-info-extractor-gradle from 4.13.0 to 4.14.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b0a12f1c79..cd274b5adf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.0"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.4"
-  ext.jfrogExtractorVersion = "4.13.0"
+  ext.jfrogExtractorVersion = "4.14.1"
   ext.bndVersion = "5.0.0"
   ext.checkstyleVersion = "8.26"
 

From fd496db9a64320fcb9f9b4d110018bcd41e46c82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juhos=20Istv=C3=A1n?= <stewemetal@gmail.com>
Date: Sun, 8 Mar 2020 22:24:20 +0100
Subject: [PATCH 103/665] Fix typos in Backpressure.md (#6927)

Fix lower case generic type declaration in reactive pull backpressure's code sample
Fix typo in the Further reading section
---
 docs/Backpressure.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Backpressure.md b/docs/Backpressure.md
index bfe90330bb..eadcfff263 100644
--- a/docs/Backpressure.md
+++ b/docs/Backpressure.md
@@ -128,7 +128,7 @@ someObservable.subscribe(new Subscriber<T>() {
     }
 
     @Override
-    public void onNext(t n) {
+    public void onNext(T n) {
       // do something with the emitted item "n"
       // request another item:
       request(1);
@@ -169,7 +169,7 @@ If you do not apply any of these operators to an Observable that does not suppor
 
 # Further reading
 
-If the standard operators are providing the expected behavior, [one can write custom operators in RxJava](https://github.com/ReactiveX/RxJava/wiki/Implementing-custom-operators-(draft)).
+If the standard operators aren't providing the expected behavior, [one can write custom operators in RxJava](https://github.com/ReactiveX/RxJava/wiki/Implementing-custom-operators-(draft)).
 
 # See also
 * [RxJava 0.20.0-RC1 release notes](https://github.com/ReactiveX/RxJava/releases/tag/0.20.0-RC1)

From 61ea483727aa5d40bb1424b25b187cc2ac5470a3 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2020 09:56:12 +0100
Subject: [PATCH 104/665] Bump mockito-core from 3.2.4 to 3.3.3 (#6935)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.2.4 to 3.3.3.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.2.4...v3.3.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index cd274b5adf..19fbe0b71f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.0.0"
-  ext.mockitoVersion = "3.2.4"
+  ext.mockitoVersion = "3.3.3"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "28.2-jre"

From cceb5d700acd534e2b39ce76f6f0e7b4f16d2147 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 17 Mar 2020 09:30:13 +0100
Subject: [PATCH 105/665] Bump build-info-extractor-gradle from 4.14.1 to
 4.15.0 (#6937)

Bumps build-info-extractor-gradle from 4.14.1 to 4.15.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 19fbe0b71f..5ea92ab891 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.0"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.4"
-  ext.jfrogExtractorVersion = "4.14.1"
+  ext.jfrogExtractorVersion = "4.15.0"
   ext.bndVersion = "5.0.0"
   ext.checkstyleVersion = "8.26"
 

From f863a4ec849f8b1721ae5142b7572d8c13fc84ef Mon Sep 17 00:00:00 2001
From: Volodymyr <vovochkastelmashchuk@gmail.com>
Date: Thu, 19 Mar 2020 10:57:53 +0200
Subject: [PATCH 106/665] Add see annotation for range operators (#6934)

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java   | 5 ++++-
 src/main/java/io/reactivex/rxjava3/core/Observable.java | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index ddf5b3cf7b..33c89e1343 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -2921,11 +2921,12 @@ public static Flowable<Long> interval(long period, @NonNull TimeUnit unit, @NonN
      * @throws IllegalArgumentException
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Long#MAX_VALUE}
+     * @see #range(int, int)
      */
     @CheckReturnValue
+    @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    @NonNull
     public static Flowable<Long> intervalRange(long start, long count, long initialDelay, long period, @NonNull TimeUnit unit) {
         return intervalRange(start, count, initialDelay, period, unit, Schedulers.computation());
     }
@@ -4386,6 +4387,8 @@ public static <T> Flowable<T> never() {
      *             if {@code count} is less than zero, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Integer#MAX_VALUE}
      * @see <a href="http://reactivex.io/documentation/operators/range.html">ReactiveX operators documentation: Range</a>
+     * @see #rangeLong(long, long)
+     * @see #intervalRange(long, long, long, long, TimeUnit)
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index c37da859fd..9972112585 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -2537,10 +2537,11 @@ public static Observable<Long> interval(long period, @NonNull TimeUnit unit, @No
      * @throws IllegalArgumentException
      *             if {@code count} is negative, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Long#MAX_VALUE}
+     * @see #range(int, int)
      */
     @CheckReturnValue
-    @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
+    @SchedulerSupport(SchedulerSupport.COMPUTATION)
     public static Observable<Long> intervalRange(long start, long count, long initialDelay, long period, @NonNull TimeUnit unit) {
         return intervalRange(start, count, initialDelay, period, unit, Schedulers.computation());
     }
@@ -3895,6 +3896,8 @@ public static <T> Observable<T> never() {
      *             if {@code count} is negative, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Integer#MAX_VALUE}
      * @see <a href="http://reactivex.io/documentation/operators/range.html">ReactiveX operators documentation: Range</a>
+     * @see #rangeLong(long, long)
+     * @see #intervalRange(long, long, long, long, TimeUnit)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -3933,6 +3936,7 @@ public static Observable<Integer> range(int start, int count) {
      *             if {@code count} is negative, or if {@code start} + {@code count} &minus; 1 exceeds
      *             {@link Long#MAX_VALUE}
      * @see <a href="http://reactivex.io/documentation/operators/range.html">ReactiveX operators documentation: Range</a>
+     * @see #intervalRange(long, long, long, long, TimeUnit)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)

From dff00abbf878840016ff797b7c17ba6a280f3155 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 20 Mar 2020 08:35:58 +0100
Subject: [PATCH 107/665] Bump build-info-extractor-gradle from 4.15.0 to
 4.15.1 (#6940)

Bumps build-info-extractor-gradle from 4.15.0 to 4.15.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5ea92ab891..18517522a6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.0"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.4"
-  ext.jfrogExtractorVersion = "4.15.0"
+  ext.jfrogExtractorVersion = "4.15.1"
   ext.bndVersion = "5.0.0"
   ext.checkstyleVersion = "8.26"
 

From 73604160a227166ba0d107438c6a321c5ecfc718 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Karnok?= <akarnokd@gmail.com>
Date: Fri, 20 Mar 2020 09:23:47 +0100
Subject: [PATCH 108/665] Remove unused imports

---
 src/main/java/io/reactivex/rxjava3/core/Completable.java | 1 -
 src/main/java/io/reactivex/rxjava3/core/Maybe.java       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 708818db92..6662dceb0c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -18,7 +18,6 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index de0f840326..dba5a15219 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -20,7 +20,6 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;

From a2128ae70dc98410d3b009943cd46f1b0e73049b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 25 Mar 2020 10:18:12 +0100
Subject: [PATCH 109/665] Bump biz.aQute.bnd.gradle from 5.0.0 to 5.0.1 (#6941)

Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 18517522a6..f51d004ee4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.4"
   ext.jfrogExtractorVersion = "4.15.1"
-  ext.bndVersion = "5.0.0"
+  ext.bndVersion = "5.0.1"
   ext.checkstyleVersion = "8.26"
 
   // --------------------------------------

From 14a95255e1b98f49a5344c0f7f793b530282ff66 Mon Sep 17 00:00:00 2001
From: Tomislav Hofman <tomislav.hofman@gmail.com>
Date: Thu, 2 Apr 2020 14:19:56 +0200
Subject: [PATCH 110/665] Update image urls to non-transparent version. (#6944)

---
 docs/Backpressure.md                          |  22 +-
 docs/Blocking-Observable-Operators.md         |   2 +-
 docs/Connectable-Observable-Operators.md      |   2 +-
 docs/How-To-Use-RxJava.md                     |   6 +-
 docs/Phantom-Operators.md                     |  28 +-
 .../reactivex/rxjava3/core/Completable.java   |   2 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 746 +++++++++---------
 .../java/io/reactivex/rxjava3/core/Maybe.java |  14 +-
 .../io/reactivex/rxjava3/core/Observable.java | 702 ++++++++--------
 .../io/reactivex/rxjava3/core/Single.java     | 144 ++--
 .../flowables/ConnectableFlowable.java        |   2 +-
 .../flowable/BlockingFlowableMostRecent.java  |   2 +-
 .../flowable/BlockingFlowableNext.java        |   2 +-
 .../BlockingObservableMostRecent.java         |   2 +-
 .../observable/BlockingObservableNext.java    |   2 +-
 .../single/SingleFlatMapPublisher.java        |   2 +-
 .../observables/ConnectableObservable.java    |   2 +-
 .../rxjava3/subjects/BehaviorSubject.java     |   2 +-
 18 files changed, 842 insertions(+), 842 deletions(-)

diff --git a/docs/Backpressure.md b/docs/Backpressure.md
index eadcfff263..8529ec0995 100644
--- a/docs/Backpressure.md
+++ b/docs/Backpressure.md
@@ -20,7 +20,7 @@ Cold Observables are ideal for the reactive pull model of backpressure described
 
 Your first line of defense against the problems of over-producing Observables is to use some of the ordinary set of Observable operators to reduce the number of emitted items to a more manageable number. The examples in this section will show how you might use such operators to handle a bursty Observable like the one illustrated in the following marble diagram:
 
-<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.bursty.png" width="640" height="35" />​
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.bursty.v3.png" width="640" height="35" />​
 
 By fine-tuning the parameters to these operators you can ensure that a slow-consuming observer is not overwhelmed by a fast-producing Observable.
 
@@ -33,7 +33,7 @@ The following diagrams show how you could use each of these operators on the bur
 ### sample (or throttleLast)
 The `sample` operator periodically "dips" into the sequence and emits only the most recently emitted item during each dip:
 
-<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.sample.png" width="640" height="260" />​
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.sample.v3.png" width="640" height="260" />​
 ```java
 Observable<Integer> burstySampled = bursty.sample(500, TimeUnit.MILLISECONDS);
 ```
@@ -41,7 +41,7 @@ Observable<Integer> burstySampled = bursty.sample(500, TimeUnit.MILLISECONDS);
 ### throttleFirst
 The `throttleFirst` operator is similar, but emits not the most recently emitted item, but the first item that was emitted after the previous "dip":
 
-<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.throttleFirst.png" width="640" height="260" />​
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.throttleFirst.v3.png" width="640" height="260" />​
 ```java
 Observable<Integer> burstyThrottled = bursty.throttleFirst(500, TimeUnit.MILLISECONDS);
 ```
@@ -49,7 +49,7 @@ Observable<Integer> burstyThrottled = bursty.throttleFirst(500, TimeUnit.MILLISE
 ### debounce (or throttleWithTimeout)
 The `debounce` operator emits only those items from the source Observable that are not followed by another item within a specified duration:
 
-<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.debounce.png" width="640" height="240" />​
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.debounce.v3.png" width="640" height="240" />​
 ```java
 Observable<Integer> burstyDebounced = bursty.debounce(10, TimeUnit.MILLISECONDS);
 ```
@@ -64,14 +64,14 @@ The following diagrams show how you could use each of these operators on the bur
 
 You could, for example, close and emit a buffer of items from the bursty Observable periodically, at a regular interval of time:
 
-<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.buffer2.png" width="640" height="270" />​
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.buffer2.v3.png" width="640" height="270" />​
 ```java
 Observable<List<Integer>> burstyBuffered = bursty.buffer(500, TimeUnit.MILLISECONDS);
 ```
 
 Or you could get fancy, and collect items in buffers during the bursty periods and emit them at the end of each burst, by using the `debounce` operator to emit a buffer closing indicator to the `buffer` operator:
 
-<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.buffer1.png" width="640" height="500" />​
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.buffer1.v3.png" width="640" height="500" />​
 ```java
 // we have to multicast the original bursty Observable so we can use it
 // both as our source and as the source for our buffer closing selector:
@@ -86,14 +86,14 @@ Observable<List<Integer>> burstyBuffered = burstyMulticast.buffer(burstyDebounce
 
 `window` is similar to `buffer`. One variant of `window` allows you to periodically emit Observable windows of items at a regular interval of time:
 
-<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.window1.png" width="640" height="325" />​
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.window1.v3.png" width="640" height="325" />​
 ```java
 Observable<Observable<Integer>> burstyWindowed = bursty.window(500, TimeUnit.MILLISECONDS);
 ````
 
 You could also choose to emit a new window each time you have collected a particular number of items from the source Observable:
 
-<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.window2.png" width="640" height="325" />​
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.window2.v3.png" width="640" height="325" />​
 ```java
 Observable<Observable<Integer>> burstyWindowed = bursty.window(5);
 ```
@@ -158,11 +158,11 @@ For this to work, though, Observables _A_ and _B_ must respond correctly to the
 
 <dl>
  <dt><tt>onBackpressureBuffer</tt></dt>
-  <dd>maintains a buffer of all emissions from the source Observable and emits them to downstream Subscribers according to the <tt>request</tt>s they generate<br /><img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.obp.buffer.png" width="640" height="300" /><br />an experimental version of this operator (not available in RxJava 1.0) allows you to set the capacity of the buffer; applying this operator will cause the resulting Observable to terminate with an error if this buffer is overrun​</dd>
+  <dd>maintains a buffer of all emissions from the source Observable and emits them to downstream Subscribers according to the <tt>request</tt>s they generate<br /><img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.obp.buffer.v3.png" width="640" height="300" /><br />an experimental version of this operator (not available in RxJava 1.0) allows you to set the capacity of the buffer; applying this operator will cause the resulting Observable to terminate with an error if this buffer is overrun​</dd>
  <dt><tt>onBackpressureDrop</tt></dt>
-  <dd>drops emissions from the source Observable unless there is a pending <tt>request</tt> from a downstream Subscriber, in which case it will emit enough items to fulfill the request<br /><img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.obp.drop.png" width="640" height="245" />​</dd>
+  <dd>drops emissions from the source Observable unless there is a pending <tt>request</tt> from a downstream Subscriber, in which case it will emit enough items to fulfill the request<br /><img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.obp.drop.v3.png" width="640" height="245" />​</dd>
  <dt><tt>onBackpressureBlock</tt> <em style="color: #f00;">(experimental, not in RxJava 1.0)</em></dt>
-  <dd>blocks the thread on which the source Observable is operating until such time as a Subscriber issues a <tt>request</tt> for items, and then unblocks the thread only so long as there are pending requests<br /><img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.obp.block.png" width="640" height="245" /></dd>
+  <dd>blocks the thread on which the source Observable is operating until such time as a Subscriber issues a <tt>request</tt> for items, and then unblocks the thread only so long as there are pending requests<br /><img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/bp.obp.block.v3.png" width="640" height="245" /></dd>
 </dl>
 
 If you do not apply any of these operators to an Observable that does not support backpressure, _and_ if either you as the Subscriber or some operator between you and the Observable attempts to apply reactive pull backpressure, you will encounter a `MissingBackpressureException` which you will be notified of via your `onError()` callback.
diff --git a/docs/Blocking-Observable-Operators.md b/docs/Blocking-Observable-Operators.md
index 64d6e1b40a..fe2a640f49 100644
--- a/docs/Blocking-Observable-Operators.md
+++ b/docs/Blocking-Observable-Operators.md
@@ -18,7 +18,7 @@ To transform an `Observable` into a `BlockingObservable`, use the [`Observable.t
 
 > This documentation accompanies its explanations with a modified form of "marble diagrams." Here is how these marble diagrams represent Blocking Observables:
 
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/B.legend.png" width="640" height="301" />
+<img src="/ReactiveX/RxJava/wiki/images/rx-operators/B.legend.v3.png" width="640" height="301" />
 
 #### see also:
 * javadoc: <a href="http://reactivex.io/RxJava/javadoc/rx/observables/BlockingObservable.html">`BlockingObservable`</a>
diff --git a/docs/Connectable-Observable-Operators.md b/docs/Connectable-Observable-Operators.md
index a048547529..582f0fac12 100644
--- a/docs/Connectable-Observable-Operators.md
+++ b/docs/Connectable-Observable-Operators.md
@@ -7,7 +7,7 @@ This section explains the [`ConnectableObservable`](http://reactivex.io/RxJava/j
 
 A Connectable Observable resembles an ordinary Observable, except that it does not begin emitting items when it is subscribed to, but only when its `connect()` method is called. In this way you can wait for all intended Subscribers to subscribe to the Observable before the Observable begins emitting items.
 
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.png" width="640" height="510" />
+<img src="/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.v3.png" width="640" height="510" />
 
 The following example code shows two Subscribers subscribing to the same Observable. In the first case, they subscribe to an ordinary Observable; in the second case, they subscribe to a Connectable Observable that only connects after both Subscribers subscribe. Note the difference in the output:
 
diff --git a/docs/How-To-Use-RxJava.md b/docs/How-To-Use-RxJava.md
index ad309496b9..2d091bdce4 100644
--- a/docs/How-To-Use-RxJava.md
+++ b/docs/How-To-Use-RxJava.md
@@ -285,7 +285,7 @@ onNext => value_14_xform
 
 Here is a marble diagram that illustrates this transformation:
 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/Composition.1.png" width="640" height="536" />
+<img src="/Netflix/RxJava/wiki/images/rx-operators/Composition.1.v3.png" width="640" height="536" />
 
 This next example, in Clojure, consumes three asynchronous Observables, including a dependency from one to another, and emits a single response item by combining the items emitted by each of the three Observables with the [`zip`](http://reactivex.io/documentation/operators/zip.html) operator and then transforming the result with [`map`](http://reactivex.io/documentation/operators/map.html):
 
@@ -333,7 +333,7 @@ The response looks like this:
 
 And here is a marble diagram that illustrates how that code produces that response:
 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/Composition.2.png" width="640" height="742" />
+<img src="/Netflix/RxJava/wiki/images/rx-operators/Composition.2.v3.png" width="640" height="742" />
 
 The following example, in Groovy, comes from [Ben Christensen’s QCon presentation on the evolution of the Netflix API](https://speakerdeck.com/benjchristensen/evolution-of-the-netflix-api-qcon-sf-2013). It combines two Observables with the [`merge`](http://reactivex.io/documentation/operators/merge.html) operator, then uses the [`reduce`](http://reactivex.io/documentation/operators/reduce.html) operator to construct a single item out of the resulting sequence, then transforms that item with [`map`](http://reactivex.io/documentation/operators/map.html) before emitting it:
 
@@ -350,7 +350,7 @@ public Observable getVideoSummary(APIVideo video) {
 
 And here is a marble diagram that illustrates how that code uses the [`reduce`](http://reactivex.io/documentation/operators/reduce.html) operator to bring the results from multiple Observables together in one structure:
 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/Composition.3.png" width="640" height="640" />
+<img src="/Netflix/RxJava/wiki/images/rx-operators/Composition.3.v3.png" width="640" height="640" />
 
 ## Error Handling
 
diff --git a/docs/Phantom-Operators.md b/docs/Phantom-Operators.md
index 60da4a1a40..b01ac28ff2 100644
--- a/docs/Phantom-Operators.md
+++ b/docs/Phantom-Operators.md
@@ -19,7 +19,7 @@ These operators have been proposed but are not part of the 1.0 release of RxJava
 
 ## chunkify( )
 #### returns an iterable that periodically returns a list of items emitted by the source Observable since the last list
-<img src="/Netflix/RxJava/wiki/images/rx-operators/B.chunkify.png" width="640" height="490" />
+<img src="/Netflix/RxJava/wiki/images/rx-operators/B.chunkify.v3.png" width="640" height="490" />
 
 The `chunkify( )` operator represents a blocking observable as an Iterable, that, each time you iterate over it, returns a list of items emitted by the source Observable since the previous iteration. These lists may be empty if there have been no such items emitted.
 
@@ -27,7 +27,7 @@ The `chunkify( )` operator represents a blocking observable as an Iterable, th
 
 ## fromFuture( )
 #### convert a Future into an Observable, but do not attempt to get the Future's value until a Subscriber subscribes
-<img src="/Netflix/RxJava/wiki/images/rx-operators/fromFuture.png" width="640" height="335" />
+<img src="/Netflix/RxJava/wiki/images/rx-operators/fromFuture.v3.png" width="640" height="335" />
 
 The `fromFuture( )` method also converts a Future into an Observable, but it obtains this Future indirectly, by means of a function you provide. It creates the Observable immediately, but waits to call the function and to obtain the Future until a Subscriber subscribes to it.
 
@@ -35,7 +35,7 @@ The `fromFuture( )` method also converts a Future into an Observable, but it o
 
 ## forEachFuture( )
 #### create a futureTask that will invoke a specified function on each item emitted by an Observable 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/B.forEachFuture.png" width="640" height="375" />
+<img src="/Netflix/RxJava/wiki/images/rx-operators/B.forEachFuture.v3.png" width="640" height="375" />
 
 The `forEachFuture( )` returns a `FutureTask` for each item emitted by the source Observable (or each item and each notification) that, when executed, will apply a function you specify to each such item (or item and notification).
 
@@ -43,7 +43,7 @@ The `forEachFuture( )` returns a `FutureTask` for each item emitted by the sou
 
 ## forIterable( )
 #### apply a function to the elements of an Iterable to create Observables which are then concatenated
-<img src="/Netflix/RxJava/wiki/images/rx-operators/forIterable.png" width="640" height="310" />
+<img src="/Netflix/RxJava/wiki/images/rx-operators/forIterable.v3.png" width="640" height="310" />
 
 `forIterable( )` is similar to `from(Iterable )` but instead of the resulting Observable emitting the elements of the Iterable as its own emitted items, it applies a specified function to each of these elements to generate one Observable per element, and then concatenates the emissions of these Observables to be its own sequence of emitted items.
 
@@ -58,7 +58,7 @@ If the a subscriber to the Observable that results when a Future is converted to
 
 ## generate( ) and generateAbsoluteTime( )
 #### create an Observable that emits a sequence of items as generated by a function of your choosing
-<img src="/Netflix/RxJava/wiki/images/rx-operators/generate.png" width="640" height="315" />
+<img src="/Netflix/RxJava/wiki/images/rx-operators/generate.v3.png" width="640" height="315" />
 
 The basic form of `generate( )` takes four parameters. These are `initialState` and three functions: `iterate( )`, `condition( )`, and `resultSelector( )`. `generate( )` uses these four parameters to generate an Observable sequence, which is its return value. It does so in the following way.
 
@@ -66,7 +66,7 @@ The basic form of `generate( )` takes four parameters. These are `initialState
 
 There are also versions of `generate( )` that allow you to do the work of generating the sequence on a particular `Scheduler` and that allow you to set the time interval between emissions by applying a function to the current state. The `generateAbsoluteTime( )` allows you to control the time at which an item is emitted by applying a function to the state to get an absolute system clock time (rather than an interval from the previous emission).
 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/generateAbsoluteTime.png" width="640" height="330" />
+<img src="/Netflix/RxJava/wiki/images/rx-operators/generateAbsoluteTime.v3.png" width="640" height="330" />
 
 #### see also:
 * <a href="http://www.introtorx.com/Content/v1.0.10621.0/04_CreatingObservableSequences.html#ObservableGenerate">Introduction to Rx: Generate</a>
@@ -79,7 +79,7 @@ There are also versions of `generate( )` that allow you to do the work of gene
 
 This version of `groupBy` adds another parameter: an Observable that emits duration markers. When a duration marker is emitted by this Observable, any grouped Observables that have been opened are closed, and `groupByUntil( )` will create new grouped Observables for any subsequent emissions by the source Observable.
 
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/groupByUntil.png" width="640" height="375" />​
+<img src="/ReactiveX/RxJava/wiki/images/rx-operators/groupByUntil.v3.png" width="640" height="375" />​
 
 Another variety of `groupByUntil( )` limits the number of groups that can be active at any particular time. If an item is emitted by the source Observable that would cause the number of groups to exceed this maximum, before the new group is emitted, one of the existing groups is closed (that is, the Observable it represents terminates by calling its Subscribers' `onCompleted` methods and then expires).
 
@@ -101,7 +101,7 @@ To represent an Observable as a Connectable Observable, use the `multicast( )`
 
 ## onErrorFlatMap( )
 #### instructs an Observable to emit a sequence of items whenever it encounters an error
-<img src="/Netflix/RxJava/wiki/images/rx-operators/onErrorFlatMap.png" width="640" height="310" />​
+<img src="/Netflix/RxJava/wiki/images/rx-operators/onErrorFlatMap.v3.png" width="640" height="310" />​
 
 The `onErrorFlatMap( )` method is similar to `onErrorResumeNext( )` except that it does not assume the source Observable will correctly terminate when it issues an error. Because of this, after emitting its backup sequence of items, `onErrorFlatMap( )` relinquishes control of the emitted sequence back to the source Observable. If that Observable again issues an error, `onErrorFlatMap( )` will again emit its backup sequence.
 
@@ -111,13 +111,13 @@ Because `onErrorFlatMap( )` is designed to work with pathological source Obser
 
 Note that you should apply `onErrorFlatMap( )` directly to the pathological source Observable, and not to that Observable after it has been modified by additional operators, as such operators may effectively renormalize the source Observable by unsubscribing from it immediately after it issues an error. Below, for example, is an illustration showing how `onErrorFlatMap( )` will respond to two error-generating Observables that have been merged by the `merge( )` operator. Note that it will *not* react to both errors generated by both Observables, but only to the single error passed along by `merge( )`:
 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/onErrorFlatMap.withMerge.png" width="640" height="630" />​
+<img src="/Netflix/RxJava/wiki/images/rx-operators/onErrorFlatMap.withMerge.v3.png" width="640" height="630" />​
 
 ***
 
 ## parallel( )
 #### split the work done on the emissions from an Observable into multiple Observables each operating on its own parallel thread
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/parallel.png" width="640" height="475" />​
+<img src="/ReactiveX/RxJava/wiki/images/rx-operators/parallel.v3.png" width="640" height="475" />​
 
 The `parallel( )` method splits an Observable into as many Observables as there are available processors, and does work in parallel on each of these Observables. `parallel( )` then merges the results of these parallel computations back into a single, well-behaved Observable sequence.
 
@@ -136,7 +136,7 @@ Kick off your work for each item inside [`flatMap`](Transforming-Observables#fla
 
 ## parallelMerge( )
 #### combine multiple Observables into a smaller number of Observables, to facilitate parallelism
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/parallelMerge.png" width="640" height="535" />​
+<img src="/ReactiveX/RxJava/wiki/images/rx-operators/parallelMerge.v3.png" width="640" height="535" />​
 
 Use the `parallelMerge( )` method to take an Observable that emits a large number of Observables and to reduce it to an Observable that emits a particular, smaller number of Observables that emit the same set of items as the original larger set of Observables: for instance a number of Observables that matches the number of parallel processes that you want to use when processing the emissions from the complete set of Observables.
 
@@ -144,7 +144,7 @@ Use the `parallelMerge( )` method to take an Observable that emits a large num
 
 ## pivot( )
 #### combine multiple sets of grouped observables so that they are arranged primarily by group rather than by set
-<img src="/Netflix/RxJava/wiki/images/rx-operators/pivot.png" width="640" height="580" />​
+<img src="/Netflix/RxJava/wiki/images/rx-operators/pivot.v3.png" width="640" height="580" />​
 
 If you combine multiple sets of grouped observables, such as those created by [`groupBy( )` and `groupByUntil( )`](Transforming-Observables#wiki-groupby-and-groupbyuntil), then even if those grouped observables have been grouped by a similar differentiation function, the resulting grouping will be primarily based on which set the observable came from, not on which group the observable belonged to.
 
@@ -152,13 +152,13 @@ An example may make this clearer. Imagine you use `groupBy( )` to group the em
 
 The result will be a grouped observable that emits two groups: the grouped observable resulting from transforming Observable1, and the grouped observable resulting from transforming Observable2. Each of those grouped observables emit observables that in turn emit the odds and evens from the source observables. You can use `pivot( )` to change this around: by applying `pivot( )` to this grouped observable it will transform into one that emits two different groups: the odds group and the evens group, with each of these groups emitting a separate observable corresponding to which source observable its set of integers came from. Here is an illustration:
 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/pivot.ex.png" width="640" height="1140" />​
+<img src="/Netflix/RxJava/wiki/images/rx-operators/pivot.ex.v3.png" width="640" height="1140" />​
 
 ***
 
 ## publishLast( )
 #### represent an Observable as a Connectable Observable that emits only the last item emitted by the source Observable
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/publishLast.png" width="640" height="310" />
+<img src="/ReactiveX/RxJava/wiki/images/rx-operators/publishLast.v3.png" width="640" height="310" />
 
 #### see also:
 * RxJS: <a href="https://github.com/Reactive-Extensions/RxJS/blob/master/doc/api/core/observable.md#rxobservableprototypepublishlatestselector">`publishLast`</a>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 6662dceb0c..f261d1a782 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2172,7 +2172,7 @@ public final Completable lift(@NonNull CompletableOperator onLift) {
      * Maps the signal types of this {@code Completable} into a {@link Notification} of the same kind
      * and emits it as a single success value to downstream.
      * <p>
-     * <img width="640" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
+     * <img width="640" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 33c89e1343..2843a2909a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -53,7 +53,7 @@
  * <p>
  * The documentation for this class makes use of marble diagrams. The following legend explains these diagrams:
  * <p>
- * <img width="640" height="317" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/legend.png" alt="">
+ * <img width="640" height="317" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/legend.v3.png" alt="">
  * <p>
  * The {@code Flowable} follows the protocol
  * <pre><code>
@@ -163,7 +163,7 @@ public abstract class Flowable<@NonNull T> implements Publisher<T> {
      * Mirrors the one {@link Publisher} in an {@link Iterable} of several {@code Publisher}s that first either emits an item or sends
      * a termination notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with backpressure which is determined by the winning
@@ -193,7 +193,7 @@ public static <T> Flowable<T> amb(@NonNull Iterable<@NonNull ? extends Publisher
      * Mirrors the one {@link Publisher} in an array of several {@code Publisher}s that first either emits an item or sends
      * a termination notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with backpressure which is determined by the winning
@@ -646,7 +646,7 @@ public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<@NonN
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
@@ -692,7 +692,7 @@ public static <T1, T2, R> Flowable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
@@ -743,7 +743,7 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
@@ -799,7 +799,7 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
@@ -860,7 +860,7 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
@@ -925,7 +925,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
@@ -996,7 +996,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
@@ -1071,7 +1071,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated until that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Publisher} honors backpressure from downstream. The source {@code Publisher}s
@@ -1147,7 +1147,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
      * Concatenates elements of each {@link Publisher} provided via an {@link Iterable} sequence into a single sequence
      * of elements without interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
@@ -1177,7 +1177,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends Publis
      * Returns a {@code Flowable} that emits the items emitted by each of the {@link Publisher}s emitted by the source
      * {@code Publisher}, one after the other, without interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}
@@ -1207,7 +1207,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publi
      * Returns a {@code Flowable} that emits the items emitted by each of the {@link Publisher}s emitted by the source
      * {@code Publisher}, one after the other, without interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both the outer and inner {@code Publisher}
@@ -1241,7 +1241,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publi
      * Returns a {@code Flowable} that emits the items emitted by two {@link Publisher}s, one after the other, without
      * interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
@@ -1275,7 +1275,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends T> so
      * Returns a {@code Flowable} that emits the items emitted by three {@link Publisher}s, one after the other, without
      * interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
@@ -1314,7 +1314,7 @@ public static <T> Flowable<T> concat(
      * Returns a {@code Flowable} that emits the items emitted by four {@link Publisher}s, one after the other, without
      * interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
@@ -1357,7 +1357,7 @@ public static <T> Flowable<T> concat(
      * <p>
      * Note: named this way because of overload conflict with {@code concat(Publisher<Publisher<T>>}).
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
@@ -1392,7 +1392,7 @@ public static <T> Flowable<T> concatArray(@NonNull Publisher<@NonNull ? extends
      * Concatenates a variable number of {@link Publisher} sources and delays errors from any of them
      * till all terminate.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
@@ -1997,7 +1997,7 @@ public static <T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @No
      * that subscribes. That is, for each subscriber, the actual {@code Publisher} that subscriber observes is
      * determined by the factory function.
      * <p>
-     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defer.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defer.v3.png" alt="">
      * <p>
      * The defer {@code Subscriber} allows you to defer or delay emitting items from a {@code Publisher} until such time as a
      * {@code Subscriber} subscribes to the {@code Publisher}. This allows a {@code Subscriber} to easily obtain updates or a
@@ -2032,7 +2032,7 @@ public static <T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<@NonNu
      * Returns a {@code Flowable} that emits no items to the {@link Subscriber} and immediately invokes its
      * {@link Subscriber#onComplete onComplete} method.
      * <p>
-     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/empty.png" alt="">
+     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/empty.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This source doesn't produce any elements and effectively ignores downstream backpressure.</dd>
@@ -2058,7 +2058,7 @@ public static <T> Flowable<T> empty() {
      * Returns a {@code Flowable} that invokes a {@link Subscriber}'s {@link Subscriber#onError onError} method when the
      * {@code Subscriber} subscribes to it.
      * <p>
-     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.png" alt="">
+     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This source doesn't produce any elements and effectively ignores downstream backpressure.</dd>
@@ -2087,7 +2087,7 @@ public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> suppl
      * Returns a {@code Flowable} that invokes a {@link Subscriber}'s {@link Subscriber#onError onError} method when the
      * {@code Subscriber} subscribes to it.
      * <p>
-     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.png" alt="">
+     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/error.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This source doesn't produce any elements and effectively ignores downstream backpressure.</dd>
@@ -2148,7 +2148,7 @@ public static <T> Flowable<T> fromAction(@NonNull Action action) {
     /**
      * Converts an array into a {@link Publisher} that emits the items in the array.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and iterates the given {@code array}
@@ -2185,7 +2185,7 @@ public static <T> Flowable<T> fromAction(@NonNull Action action) {
      * Returns a {@code Flowable} that, when a {@link Subscriber} subscribes to it, invokes a function you specify and then
      * emits the value returned from that function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCallable.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCallable.v3.png" alt="">
      * <p>
      * This allows you to defer the execution of the function you specify until a {@code Subscriber} subscribes to the
      * {@link Publisher}. That is to say, it makes the function "lazy."
@@ -2250,7 +2250,7 @@ public static <T> Flowable<T> fromCompletable(@NonNull CompletableSource complet
     /**
      * Converts a {@link Future} into a {@link Publisher}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.v3.png" alt="">
      * <p>
      * The operator calls {@link Future#get()}, which is a blocking method, on the subscription thread.
      * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
@@ -2292,7 +2292,7 @@ public static <T> Flowable<T> fromCompletable(@NonNull CompletableSource complet
     /**
      * Converts a {@link Future} into a {@link Publisher}, with a timeout on the {@code Future}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.Future.v3.png" alt="">
      * <p>
      * The operator calls {@link Future#get(long, TimeUnit)}, which is a blocking method, on the subscription thread.
      * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
@@ -2339,7 +2339,7 @@ public static <T> Flowable<T> fromCompletable(@NonNull CompletableSource complet
     /**
      * Converts an {@link Iterable} sequence into a {@link Publisher} that emits the items in the sequence.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and iterates the given {@code iterable}
@@ -2559,7 +2559,7 @@ public static <T> Flowable<T> fromSingle(@NonNull SingleSource<T> source) {
      * Returns a {@code Flowable} that, when a {@link Subscriber} subscribes to it, invokes a supplier function you specify and then
      * emits the value returned from that function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromSupplier.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromSupplier.v3.png" alt="">
      * <p>
      * This allows you to defer the execution of the function you specify until a {@code Subscriber} subscribes to the
      * {@link Publisher}. That is to say, it makes the function "lazy."
@@ -2775,7 +2775,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
      * Returns a {@code Flowable} that emits a {@code 0L} after the {@code initialDelay} and ever-increasing numbers
      * after each {@code period} of time thereafter.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.p.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.p.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator generates values based on time and ignores downstream backpressure which
@@ -2808,7 +2808,7 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
      * Returns a {@code Flowable} that emits a {@code 0L} after the {@code initialDelay} and ever-increasing numbers
      * after each {@code period} of time thereafter, on a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.ps.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.ps.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator generates values based on time and ignores downstream backpressure which
@@ -2844,7 +2844,7 @@ public static Flowable<Long> interval(long initialDelay, long period, @NonNull T
     /**
      * Returns a {@code Flowable} that emits a sequential number every specified interval of time.
      * <p>
-     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.png" alt="">
+     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator signals a {@link MissingBackpressureException} if the downstream
@@ -2873,7 +2873,7 @@ public static Flowable<Long> interval(long period, @NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that emits a sequential number every specified interval of time, on a
      * specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.s.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator generates values based on time and ignores downstream backpressure which
@@ -2978,7 +2978,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Returns a {@code Flowable} that signals the given (constant reference) item and then completes.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.v3.png" alt="">
      * <p>
      * Note that the item is taken and re-emitted as is and not computed by any means by {@code just}. Use {@link #fromCallable(Callable)}
      * to generate a single item on demand (when {@link Subscriber}s subscribe to it).
@@ -3018,7 +3018,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Converts two items into a {@link Publisher} that emits those items.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals each value on-demand (i.e., when requested).</dd>
@@ -3050,7 +3050,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Converts three items into a {@link Publisher} that emits those items.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals each value on-demand (i.e., when requested).</dd>
@@ -3085,7 +3085,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Converts four items into a {@link Publisher} that emits those items.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals each value on-demand (i.e., when requested).</dd>
@@ -3124,7 +3124,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Converts five items into a {@link Publisher} that emits those items.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals each value on-demand (i.e., when requested).</dd>
@@ -3166,7 +3166,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Converts six items into a {@link Publisher} that emits those items.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals each value on-demand (i.e., when requested).</dd>
@@ -3211,7 +3211,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Converts seven items into a {@link Publisher} that emits those items.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals each value on-demand (i.e., when requested).</dd>
@@ -3260,7 +3260,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Converts eight items into a {@link Publisher} that emits those items.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals each value on-demand (i.e., when requested).</dd>
@@ -3312,7 +3312,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Converts nine items into a {@link Publisher} that emits those items.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals each value on-demand (i.e., when requested).</dd>
@@ -3367,7 +3367,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     /**
      * Converts ten items into a {@link Publisher} that emits those items.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals each value on-demand (i.e., when requested).</dd>
@@ -3427,7 +3427,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
      * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, without any transformation, while limiting the
      * number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3479,7 +3479,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publish
      * Flattens an array of {@link Publisher}s into one {@code Publisher}, without any transformation, while limiting the
      * number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3531,7 +3531,7 @@ public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @No
     /**
      * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3577,7 +3577,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publish
      * Flattens an {@link Iterable} of {@link Publisher}s into one {@code Publisher}, without any transformation, while limiting the
      * number of concurrent subscriptions to these {@code Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3627,7 +3627,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publish
      * Flattens a {@link Publisher} that emits {@code Publisher}s into a single {@code Publisher} that emits the items emitted by
      * thos {@code Publisher}s , without any transformation.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3674,7 +3674,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publis
      * those {@code Publisher}s, without any transformation, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3724,7 +3724,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publis
     /**
      * Flattens an array of {@link Publisher}s into one {@code Publisher}, without any transformation.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.io.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.io.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3770,7 +3770,7 @@ public static <T> Flowable<T> mergeArray(@NonNull Publisher<@NonNull ? extends T
     /**
      * Flattens two {@link Publisher}s into a single {@code Publisher}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3819,7 +3819,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> sou
     /**
      * Flattens three {@link Publisher}s into a single {@code Publisher}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3871,7 +3871,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> sou
     /**
      * Flattens four {@link Publisher}s into a single {@code Publisher}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code merge} method.
@@ -3934,7 +3934,7 @@ public static <T> Flowable<T> merge(
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -3971,7 +3971,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -4013,7 +4013,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -4056,7 +4056,7 @@ public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int buffe
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -4096,7 +4096,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -4134,7 +4134,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -4175,7 +4175,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      * error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -4213,7 +4213,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<@NonNull ?
      * notify of an error via {@link Subscriber#onError onError}, {@code mergeDelayError} will refrain from
      * propagating that error notification until all of the merged {@code Publisher}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if both merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -4255,7 +4255,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      * from propagating that error notification until all of the merged {@code Publisher}s have finished emitting
      * items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -4300,7 +4300,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
      * will refrain from propagating that error notification until all of the merged {@code Publisher}s have finished
      * emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code Publisher}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Subscriber}s once.
@@ -4343,7 +4343,7 @@ public static <T> Flowable<T> mergeDelayError(
     /**
      * Returns a {@code Flowable} that never sends any items or notifications to a {@link Subscriber}.
      * <p>
-     * <img width="640" height="185" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/never.png" alt="">
+     * <img width="640" height="185" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/never.v3.png" alt="">
      * <p>
      * This {@link Publisher} is useful primarily for testing purposes.
      * <dl>
@@ -4370,7 +4370,7 @@ public static <T> Flowable<T> never() {
     /**
      * Returns a {@code Flowable} that emits a sequence of {@link Integer}s within a specified range.
      * <p>
-     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/range.png" alt="">
+     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/range.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals values on-demand (i.e., when requested).</dd>
@@ -4413,7 +4413,7 @@ public static Flowable<Integer> range(int start, int count) {
     /**
      * Returns a {@code Flowable} that emits a sequence of {@link Long}s within a specified range.
      * <p>
-     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/range.png" alt="">
+     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/range.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and signals values on-demand (i.e., when requested).</dd>
@@ -4460,7 +4460,7 @@ public static Flowable<Long> rangeLong(long start, long count) {
      * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link Publisher} sequences are the
      * same by comparing the items emitted by each {@code Publisher} pairwise.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator honors downstream backpressure and expects both of its sources
@@ -4492,7 +4492,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
      * same by comparing the items emitted by each {@code Publisher} pairwise based on the results of a specified
      * equality function.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
@@ -4527,7 +4527,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
      * same by comparing the items emitted by each {@code Publisher} pairwise based on the results of a specified
      * equality function.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The source {@code Publisher}s are expected to honor
@@ -4568,7 +4568,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
      * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link Publisher} sequences are the
      * same by comparing the items emitted by each {@code Publisher} pairwise.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator honors downstream backpressure and expects both of its sources
@@ -4602,7 +4602,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
      * Converts a {@link Publisher} that emits {@code Publisher}s into a {@code Publisher} that emits the items emitted by the
      * most recently emitted of those {@code Publisher}s.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.v3.png" alt="">
      * <p>
      * {@code switchOnNext} subscribes to a {@code Publisher} that emits {@code Publisher}s. Each time it observes one of
      * these emitted {@code Publisher}s, the {@code Publisher} returned by {@code switchOnNext} begins emitting the items
@@ -4644,7 +4644,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends
      * Converts a {@link Publisher} that emits {@code Publisher}s into a {@code Publisher} that emits the items emitted by the
      * most recently emitted of those {@code Publisher}s.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.v3.png" alt="">
      * <p>
      * {@code switchOnNext} subscribes to a {@code Publisher} that emits {@code Publisher}s. Each time it observes one of
      * these emitted {@code Publisher}s, the {@code Publisher} returned by {@code switchOnNext} begins emitting the items
@@ -4683,7 +4683,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends
      * Converts a {@link Publisher} that emits {@code Publisher}s into a {@code Publisher} that emits the items emitted by the
      * most recently emitted of those {@code Publisher}s and delays any exception until all {@code Publisher}s terminate.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.v3.png" alt="">
      * <p>
      * {@code switchOnNext} subscribes to a {@code Publisher} that emits {@code Publisher}s. Each time it observes one of
      * these emitted {@code Publisher}s, the {@code Publisher} returned by {@code switchOnNext} begins emitting the items
@@ -4723,7 +4723,7 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull
      * Converts a {@link Publisher} that emits {@code Publisher}s into a {@code Publisher} that emits the items emitted by the
      * most recently emitted of those {@code Publisher}s and delays any exception until all {@code Publisher}s terminate.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.v3.png" alt="">
      * <p>
      * {@code switchOnNext} subscribes to a {@code Publisher} that emits {@code Publisher}s. Each time it observes one of
      * these emitted {@code Publisher}s, the {@code Publisher} returned by {@code switchOnNext} begins emitting the items
@@ -4765,7 +4765,7 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull
     /**
      * Returns a {@code Flowable} that emits {@code 0L} after a specified delay, and then completes.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. If the downstream needs a slower rate
@@ -4794,7 +4794,7 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that emits {@code 0L} after a specified delay, on a specified {@link Scheduler}, and then
      * completes.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.s.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. If the downstream needs a slower rate
@@ -4860,7 +4860,7 @@ public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
      * that resource and calls the provided {@code resourceDisposer} function if this inner source terminates or the
      * downstream cancels the flow.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and otherwise depends on the
@@ -4897,7 +4897,7 @@ public static <T, D> Flowable<T> using(
      * that resource and calls the provided {@code resourceDisposer} function if this inner source terminates or the
      * downstream disposes the flow; doing it before these end-states have been reached if {@code eager == true}, after otherwise.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator is a pass-through for backpressure and otherwise depends on the
@@ -4963,7 +4963,7 @@ public static <T, D> Flowable<T> using(
      * use {@link #doOnCancel(Action)} as well or use {@code using()} to do cleanup in case of completion
      * or cancellation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
@@ -5018,7 +5018,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publis
      * use {@link #doOnCancel(Action)} as well or use {@code using()} to do cleanup in case of completion
      * or cancellation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
@@ -5062,7 +5062,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publis
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * two items emitted, in sequence, by two other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
@@ -5124,7 +5124,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * two items emitted, in sequence, by two other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
@@ -5187,7 +5187,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * two items emitted, in sequence, by two other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
@@ -5252,7 +5252,7 @@ public static <T1, T2, R> Flowable<R> zip(
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * three items emitted, in sequence, by three other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
@@ -5319,7 +5319,7 @@ public static <T1, T2, T3, R> Flowable<R> zip(
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * four items emitted, in sequence, by four other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
@@ -5392,7 +5392,7 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * five items emitted, in sequence, by five other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
@@ -5469,7 +5469,7 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * six items emitted, in sequence, by six other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by each source {@code Publisher}, the
@@ -5550,7 +5550,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * seven items emitted, in sequence, by seven other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by each source {@code Publisher}, the
@@ -5636,7 +5636,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * eight items emitted, in sequence, by eight other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by each source {@code Publisher}, the
@@ -5726,7 +5726,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
      * Returns a {@code Flowable} that emits the results of a specified combiner function applied to combinations of
      * nine items emitted, in sequence, by nine other {@link Publisher}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the new {@code Publisher}
      * will be the result of the function applied to the first item emitted by each source {@code Publisher}, the
@@ -5843,7 +5843,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
      * use {@link #doOnCancel(Action)} as well or use {@code using()} to do cleanup in case of completion
      * or cancellation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
@@ -5893,7 +5893,7 @@ public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ?
      * Returns a {@link Single} that emits a {@link Boolean} that indicates whether all of the items emitted by the current
      * {@code Flowable} satisfy a condition.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/all.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/all.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -5921,7 +5921,7 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
      * Mirrors the {@link Publisher} (current or provided) that first either emits an item or sends a termination
      * notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with backpressure which is determined by the winning
@@ -5951,7 +5951,7 @@ public final Flowable<T> ambWith(@NonNull Publisher<@NonNull ? extends T> other)
      * specified condition, otherwise {@code false}. <em>Note:</em> this always emits {@code false} if the
      * current {@code Flowable} is empty.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/exists.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/exists.v3.png" alt="">
      * <p>
      * In Rx.Net this is the {@code any} operator but we renamed it in RxJava to better match Java naming
      * idioms.
@@ -6050,7 +6050,7 @@ public final T blockingFirst(@NonNull T defaultItem) {
      * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
-     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.forEach.png" alt="">
+     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.forEach.v3.png" alt="">
      * <p>
      * <em>Note:</em> the method will only return if the upstream terminates or the current
      * thread is interrupted.
@@ -6091,7 +6091,7 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
      * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
-     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.forEach.png" alt="">
+     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.forEach.v3.png" alt="">
      * <p>
      * <em>Note:</em> the method will only return if the upstream terminates or the current
      * thread is interrupted.
@@ -6142,7 +6142,7 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext, int buffe
     /**
      * Converts this {@code Flowable} into an {@link Iterable}.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.toIterable.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.toIterable.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to honor backpressure otherwise the returned
@@ -6165,7 +6165,7 @@ public final Iterable<T> blockingIterable() {
     /**
      * Converts this {@code Flowable} into an {@link Iterable}.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.toIterable.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.toIterable.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to honor backpressure otherwise the returned
@@ -6193,7 +6193,7 @@ public final Iterable<T> blockingIterable(int bufferSize) {
      * Returns the last item emitted by this {@code Flowable}, or throws
      * {@link NoSuchElementException} if this {@code Flowable} emits no items.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.last.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.last.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
@@ -6229,7 +6229,7 @@ public final T blockingLast() {
      * Returns the last item emitted by this {@code Flowable}, or a default value if it emits no
      * items.
      * <p>
-     * <img width="640" height="310" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.lastOrDefault.png" alt="">
+     * <img width="640" height="310" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.lastOrDefault.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
@@ -6292,7 +6292,7 @@ public final Iterable<T> blockingLatest() {
      * Returns an {@link Iterable} that always returns the item most recently emitted by this
      * {@code Flowable}.
      * <p>
-     * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.mostRecent.png" alt="">
+     * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.mostRecent.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
@@ -6321,7 +6321,7 @@ public final Iterable<T> blockingMostRecent(@NonNull T initialItem) {
      * Returns an {@link Iterable} that blocks until this {@code Flowable} emits another item, then
      * returns that item.
      * <p>
-     * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.next.png" alt="">
+     * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.next.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
@@ -6345,7 +6345,7 @@ public final Iterable<T> blockingNext() {
      * If this {@code Flowable} completes after emitting a single item, return that item, otherwise
      * throw a {@link NoSuchElementException}.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.single.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.single.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
@@ -6374,7 +6374,7 @@ public final T blockingSingle() {
      * more than one item, throw an {@link IllegalArgumentException}; if it emits no items, return a default
      * value.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.singleOrDefault.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.singleOrDefault.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner
@@ -6661,7 +6661,7 @@ public final void blockingSubscribe(@NonNull Subscriber<@NonNull ? super T> subs
      * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects the current {@code Flowable} to honor it as
@@ -6692,7 +6692,7 @@ public final Flowable<List<T>> buffer(int count) {
      * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects the current {@code Flowable} to honor it as
@@ -6727,7 +6727,7 @@ public final Flowable<List<T>> buffer(int count, int skip) {
      * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects the current {@code Flowable} to honor it as
@@ -6770,7 +6770,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int
      * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects the current {@code Flowable} to honor it as
@@ -6807,7 +6807,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, @No
      * current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
@@ -6843,7 +6843,7 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
      * notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
@@ -6881,7 +6881,7 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
      * notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
@@ -6926,7 +6926,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan,
      * notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
@@ -6960,7 +6960,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit) {
      * notification from the current {@code Flowable}. Note that if the current {@code Flowable} issues an {@code onError} notification the event
      * is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
@@ -6998,7 +6998,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, int
      * current {@code Flowable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
@@ -7038,7 +7038,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
      * current {@code Flowable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
@@ -7091,7 +7091,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(
      * if the current {@code Flowable} issues an {@code onError} notification the event is passed on immediately without first emitting
      * the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time. It requests {@link Long#MAX_VALUE}
@@ -7126,7 +7126,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
      * {@code PFlowable}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the event is passed
      * on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
+     * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it is instead controlled by the given {@code Publisher}s and
@@ -7163,7 +7163,7 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
      * {@code Flowable}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the event is passed
      * on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
+     * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it is instead controlled by the given {@code Publisher}s and
@@ -7205,7 +7205,7 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
      * Returns a {@code Flowable} that emits non-overlapping buffered items from the current {@code Flowable} each time the
      * specified boundary {@link Publisher} emits an item.
      * <p>
-     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
+     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.v3.png" alt="">
      * <p>
      * Completion of either the source or the boundary {@code Publisher} causes the returned {@code Publisher} to emit the
      * latest buffer and complete. If either the current {@code Flowable} or the boundary {@code Publisher} issues an {@code onError} notification
@@ -7240,7 +7240,7 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
      * Returns a {@code Flowable} that emits non-overlapping buffered items from the current {@code Flowable} each time the
      * specified boundary {@link Publisher} emits an item.
      * <p>
-     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
+     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.v3.png" alt="">
      * <p>
      * Completion of either the source or the boundary {@code Publisher} causes the returned {@code Publisher} to emit the
      * latest buffer and complete. If either the current {@code Flowable} or the boundary {@code Publisher} issues an {@code onError} notification
@@ -7279,7 +7279,7 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
      * Returns a {@code Flowable} that emits non-overlapping buffered items from the current {@code Flowable} each time the
      * specified boundary {@link Publisher} emits an item.
      * <p>
-     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
+     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.v3.png" alt="">
      * <p>
      * Completion of either the source or the boundary {@code Publisher} causes the returned {@code Publisher} to emit the
      * latest buffer and complete. If either the current {@code Flowable} or the boundary {@code Publisher} issues an {@code onError} notification
@@ -7320,7 +7320,7 @@ public final <B, U extends Collection<? super T>> Flowable<U> buffer(@NonNull Pu
      * Returns a {@code Flowable} that subscribes to this {@link Publisher} lazily, caches all of its events
      * and replays them, in the same order as received, to all the downstream subscribers.
      * <p>
-     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.png" alt="">
+     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.v3.png" alt="">
      * <p>
      * This is useful when you want a {@code Publisher} to cache responses and you can't control the
      * subscribe/cancel behavior of all the {@link Subscriber}s.
@@ -7380,7 +7380,7 @@ public final Flowable<T> cache() {
      * Returns a {@code Flowable} that subscribes to this {@link Publisher} lazily, caches all of its events
      * and replays them, in the same order as received, to all the downstream subscribers.
      * <p>
-     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.png" alt="">
+     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.v3.png" alt="">
      * <p>
      * This is useful when you want a {@code Publisher} to cache responses and you can't control the
      * subscribe/cancel behavior of all the {@link Subscriber}s.
@@ -7446,7 +7446,7 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
      * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable}, converted to the specified
      * type.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cast.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cast.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
@@ -7476,7 +7476,7 @@ public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
      * Collects items emitted by the finite source {@link Publisher} into a single mutable data structure and returns
      * a {@link Single} that emits this structure.
      * <p>
-     * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collect.png" alt="">
+     * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collect.v3.png" alt="">
      * <p>
      * This is a simplified version of {@code reduce} that does not need to return the state on each pass.
      * <p>
@@ -7516,7 +7516,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      * Collects items emitted by the finite source {@link Publisher} into a single mutable data structure and returns
      * a {@link Single} that emits this structure.
      * <p>
-     * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collect.png" alt="">
+     * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collect.v3.png" alt="">
      * <p>
      * This is a simplified version of {@code reduce} that does not need to return the state on each pass.
      * <p>
@@ -7587,7 +7587,7 @@ public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? e
      * emitted by the current {@code Flowable}, where that function returns a {@link Publisher}, and then emitting the items
      * that result from concatenating those returned {@code Publisher}s.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <p>
      * Note that there is no guarantee where the given {@code mapper} function will be executed; it could be on the subscribing thread,
      * on the upstream thread signaling the new item to be mapped or on the thread where the inner source terminates. To ensure
@@ -7624,7 +7624,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      * emitted by the current {@code Flowable}, where that function returns a {@link Publisher}, and then emitting the items
      * that result from concatenating those returned {@code Publisher}s.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <p>
      * Note that there is no guarantee where the given {@code mapper} function will be executed; it could be on the subscribing thread,
      * on the upstream thread signaling the new item to be mapped or on the thread where the inner source terminates. To ensure
@@ -7675,7 +7675,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      * that you supply to each item emitted by the current {@code Flowable}, where that function returns a {@link Publisher}, and then emitting the items
      * that result from concatenating those returned {@code Publisher}s.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <p>
      * The difference between {@link #concatMap(Function, int)} and this operator is that this operator guarantees the {@code mapper}
      * function is executed on the specified scheduler.
@@ -7721,7 +7721,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
      * Maps the upstream items into {@link CompletableSource}s and subscribes to them one after the
      * other completes.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
@@ -7750,7 +7750,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * Maps the upstream items into {@link CompletableSource}s and subscribes to them one after the
      * other completes.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
@@ -7787,7 +7787,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * other terminates, delaying all errors till both this {@code Flowable} and all
      * inner {@code CompletableSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
@@ -7817,7 +7817,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, optionally delaying all errors till both this {@code Flowable} and all
      * inner {@code CompletableSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
@@ -7853,7 +7853,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, optionally delaying all errors till both this {@code Flowable} and all
      * inner {@code CompletableSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure. If this {@code Flowable} violates the rule, the operator will
@@ -8233,7 +8233,7 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
      * other succeeds or completes, emits their success value if available or terminates immediately if
      * either this {@code Flowable} or the current inner {@code MaybeSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8266,7 +8266,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      * other succeeds or completes, emits their success value if available or terminates immediately if
      * either this {@code Flowable} or the current inner {@code MaybeSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8306,7 +8306,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
      * other terminates, emits their success value if available and delaying all errors
      * till both this {@code Flowable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8339,7 +8339,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      * other terminates, emits their success value if available and optionally delaying all errors
      * till both this {@code Flowable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8378,7 +8378,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      * other terminates, emits their success value if available and optionally delaying all errors
      * till both this {@code Flowable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8423,7 +8423,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
      * other succeeds, emits their success values or terminates immediately if
      * either this {@code Flowable} or the current inner {@code SingleSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8456,7 +8456,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      * other succeeds, emits their success values or terminates immediately if
      * either this {@code Flowable} or the current inner {@code SingleSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8496,7 +8496,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
      * other succeeds or fails, emits their success values and delays all errors
      * till both this {@code Flowable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8529,7 +8529,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      * other succeeds or fails, emits their success values and optionally delays all errors
      * till both this {@code Flowable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8568,7 +8568,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      * other succeeds or fails, emits their success values and optionally delays errors
      * till both this {@code Flowable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8612,7 +8612,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
      * Returns a {@code Flowable} that emits the items emitted from the current {@code Flowable}, then the next, one after
      * the other, without interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the {@code other} {@link Publisher}s
@@ -8641,7 +8641,7 @@ public final Flowable<T> concatWith(@NonNull Publisher<@NonNull ? extends T> oth
      * Returns a {@code Flowable} that emits the items from this {@code Flowable} followed by the success item or error event
      * of the other {@link SingleSource}.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator supports backpressure and makes sure the success item of the other {@code SingleSource}
@@ -8668,7 +8668,7 @@ public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
      * Returns a {@code Flowable} that emits the items from this {@code Flowable} followed by the success item or terminal events
      * of the other {@link MaybeSource}.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator supports backpressure and makes sure the success item of the other {@code MaybeSource}
@@ -8695,7 +8695,7 @@ public final Flowable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
      * Returns a {@code Flowable} that emits items from this {@code Flowable} and when it completes normally, the
      * other {@link CompletableSource} is subscribed to and the returned {@code Flowable} emits its terminal events.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator does not interfere with backpressure between the current {@code Flowable} and the
@@ -8724,7 +8724,7 @@ public final Flowable<T> concatWith(@NonNull CompletableSource other) {
      * Returns a {@link Single} that emits a {@link Boolean} that indicates whether the current {@code Flowable} emitted a
      * specified item.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/contains.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/contains.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -8752,7 +8752,7 @@ public final Single<Boolean> contains(@NonNull Object item) {
      * Returns a {@link Single} that counts the total number of items emitted by the current {@code Flowable} and emits
      * this count as a 64-bit {@link Long}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/longCount.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/longCount.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -8776,7 +8776,7 @@ public final Single<Long> count() {
      * Returns a {@code Flowable} that mirrors the current {@code Flowable}, except that it drops items emitted by the
      * current {@code Flowable} that are followed by another item within a computed debounce duration.
      * <p>
-     * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.f.png" alt="">
+     * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.f.v3.png" alt="">
      * <p>
      * The delivery of the item happens on the thread of the first {@code onNext} or {@code onComplete}
      * signal of the generated {@link Publisher} sequence,
@@ -8819,7 +8819,7 @@ public final <U> Flowable<T> debounce(@NonNull Function<? super T, ? extends Pub
      * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
      * will be emitted by the resulting {@code Flowable}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.v3.png" alt="">
      * <p>
      * Delivery of the item after the grace period happens on the {@code computation} {@link Scheduler}'s
      * {@code Worker} which if takes too long, a newer item may arrive from the upstream, causing the
@@ -8862,7 +8862,7 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit) {
      * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
      * will be emitted by the resulting {@code Flowable}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.s.v3.png" alt="">
      * <p>
      * Delivery of the item after the grace period happens on the given {@code Scheduler}'s
      * {@code Worker} which if takes too long, a newer item may arrive from the upstream, causing the
@@ -8905,7 +8905,7 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull
      * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} or a specified default item
      * if the current {@code Flowable} is empty.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>If the current {@code Flowable} is empty, this operator is guaranteed to honor backpressure from downstream.
@@ -8935,7 +8935,7 @@ public final Flowable<T> defaultIfEmpty(@NonNull T defaultItem) {
      * Returns a {@code Flowable} that delays the emissions of the current {@code Flowable} via another {@link Publisher} on a
      * per-item basis.
      * <p>
-     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.o.png" alt="">
+     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.o.v3.png" alt="">
      * <p>
      * <em>Note:</em> the resulting {@code Flowable} will immediately propagate any {@code onError} notification
      * from the current {@code Flowable}.
@@ -8971,7 +8971,7 @@ public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publis
      * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} shifted forward in time by a
      * specified delay. The {@code onError} notification from the current {@code Flowable} is not delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
@@ -8999,7 +8999,7 @@ public final Flowable<T> delay(long time, @NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} shifted forward in time by a
      * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
@@ -9030,7 +9030,7 @@ public final Flowable<T> delay(long time, @NonNull TimeUnit unit, boolean delayE
      * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} shifted forward in time by a
      * specified delay. The {@code onError} notification from the current {@code Flowable} is not delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
@@ -9060,7 +9060,7 @@ public final Flowable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Sched
      * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} shifted forward in time by a
      * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
@@ -9096,7 +9096,7 @@ public final Flowable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Sched
      * Returns a {@code Flowable} that delays the subscription to and emissions from the current {@code Flowable} via another
      * {@link Publisher} on a per-item basis.
      * <p>
-     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.oo.png" alt="">
+     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.oo.v3.png" alt="">
      * <p>
      * <em>Note:</em> the resulting {@code Flowable} will immediately propagate any {@code onError} notification
      * from the current {@code Flowable}.
@@ -9163,7 +9163,7 @@ public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptio
     /**
      * Returns a {@code Flowable} that delays the subscription to the current {@code Flowable} by a given amount of time.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
@@ -9191,7 +9191,7 @@ public final Flowable<T> delaySubscription(long time, @NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that delays the subscription to the current {@code Flowable} by a given amount of time,
      * both waiting and subscribing on a given {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with the backpressure behavior which is determined by the current {@code Flowable}.</dd>
@@ -9222,7 +9222,7 @@ public final Flowable<T> delaySubscription(long time, @NonNull TimeUnit unit, @N
      * {@link Notification} objects extracted from the source items via a selector function
      * into their respective {@link Subscriber} signal types.
      * <p>
-     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/dematerialize.png" alt="">
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/dematerialize.v3.png" alt="">
      * <p>
      * The intended use of the {@code selector} function is to perform a
      * type-safe identity mapping (see example) on a source that is already of type
@@ -9280,7 +9280,7 @@ public final <R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T,
      * Returns a {@code Flowable} that emits all items emitted by the current {@code Flowable} that are distinct
      * based on {@link Object#equals(Object)} comparison.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.v3.png" alt="">
      * <p>
      * It is recommended the elements' class {@code T} in the flow overrides the default {@code Object.equals()} and {@link Object#hashCode()} to provide
      * a meaningful comparison between items as the default Java implementation only considers reference equivalence.
@@ -9322,7 +9322,7 @@ public final Flowable<T> distinct() {
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.key.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.key.v3.png" alt="">
      * <p>
      * It is recommended the keys' class {@code K} overrides the default {@code Object.equals()} and {@link Object#hashCode()} to provide
      * a meaningful comparison between the key objects as the default Java implementation only considers reference equivalence.
@@ -9367,7 +9367,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.key.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.key.v3.png" alt="">
      * <p>
      * It is recommended the keys' class {@code K} overrides the default {@code Object.equals()} and {@link Object#hashCode()} to provide
      * a meaningful comparison between the key objects as the default Java implementation only considers reference equivalence.
@@ -9405,7 +9405,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
      * Returns a {@code Flowable} that emits all items emitted by the current {@code Flowable} that are distinct from their
      * immediate predecessors based on {@link Object#equals(Object)} comparison.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.v3.png" alt="">
      * <p>
      * It is recommended the elements' class {@code T} in the flow overrides the default {@code Object.equals()} to provide
      * a meaningful comparison between items as the default Java implementation only considers reference equivalence.
@@ -9447,7 +9447,7 @@ public final Flowable<T> distinctUntilChanged() {
      * immediate predecessors, according to a key selector function and based on {@link Object#equals(Object)} comparison
      * of those objects returned by the key selector function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.key.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.key.v3.png" alt="">
      * <p>
      * It is recommended the keys' class {@code K} overrides the default {@code Object.equals()} to provide
      * a meaningful comparison between the key objects as the default Java implementation only considers reference equivalence.
@@ -9494,7 +9494,7 @@ public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K
      * Returns a {@code Flowable} that emits all items emitted by the current {@code Flowable} that are distinct from their
      * immediate predecessors when compared with each other via the provided comparator function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.v3.png" alt="">
      * <p>
      * Note that the operator always retains the latest item from upstream regardless of the comparison result
      * and uses it in the next comparison with the next upstream item.
@@ -9594,7 +9594,7 @@ public final Flowable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext) {
      * Registers an {@link Action} to be called when this {@link Publisher} invokes either
      * {@link Subscriber#onComplete onComplete} or {@link Subscriber#onError onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/finallyDo.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/finallyDo.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -9622,7 +9622,7 @@ public final Flowable<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
     /**
      * Calls the cancel {@link Action} if the downstream cancels the sequence.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnUnsubscribe.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnUnsubscribe.v3.png" alt="">
      * <p>
      * The action is shared between subscriptions and thus may be called concurrently from multiple
      * threads; the action must be thread-safe.
@@ -9654,7 +9654,7 @@ public final Flowable<T> doOnCancel(@NonNull Action onCancel) {
     /**
      * Invokes an {@link Action} just before the current {@code Flowable} calls {@code onComplete}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
@@ -9682,7 +9682,7 @@ public final Flowable<T> doOnComplete(@NonNull Action onComplete) {
      * Calls the appropriate onXXX consumer (shared between all subscribers) whenever a signal with the same type
      * passes through, before forwarding them to downstream.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
@@ -9712,7 +9712,7 @@ private Flowable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Consu
      * Invokes a {@link Consumer} with a {@link Notification} instances matching the signals emitted by the current {@code Flowable}
      * before they are forwarded to the downstream.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
@@ -9750,7 +9750,7 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
      * {@code onNext} or the {@code onComplete} method of the supplied {@code Subscriber} throws, the downstream will be
      * terminated and will receive this thrown exception.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.o.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
@@ -9786,7 +9786,7 @@ public final Flowable<T> doOnEach(@NonNull Subscriber<@NonNull ? super T> subscr
      * In case the {@code onError} action throws, the downstream will receive a composite exception containing
      * the original exception and the exception thrown by {@code onError}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnError.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnError.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
@@ -9814,7 +9814,7 @@ public final Flowable<T> doOnError(@NonNull Consumer<? super Throwable> onError)
      * Calls the appropriate {@code onXXX} method (shared between all {@link Subscriber}s) for the lifecycle events of
      * the sequence (subscription, cancellation, requesting).
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
@@ -9848,7 +9848,7 @@ public final Flowable<T> doOnLifecycle(@NonNull Consumer<? super Subscription> o
     /**
      * Calls the given {@link Consumer} with the value emitted by the current {@code Flowable} before forwarding it to the downstream.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
@@ -9909,7 +9909,7 @@ public final Flowable<T> doOnRequest(@NonNull LongConsumer onRequest) {
      * subscription from the downstream before forwarding it to the subscriber's
      * {@link Subscriber#onSubscribe(Subscription) onSubscribe} method.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSubscribe.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSubscribe.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s
@@ -9936,7 +9936,7 @@ public final Flowable<T> doOnSubscribe(@NonNull Consumer<? super Subscription> o
      * Calls the given {@link Action} when the current {@code Flowable} completes normally or with an error before those signals
      * are forwarded to the downstream.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.v3.png" alt="">
      * <p>
      * This differs from {@code doAfterTerminate} in that this happens <em>before</em> the {@code onComplete} or
      * {@code onError} notification.
@@ -9968,7 +9968,7 @@ public final Flowable<T> doOnTerminate(@NonNull Action onTerminate) {
      * Returns a {@link Maybe} that emits the single item at a specified index in a sequence of emissions from
      * this {@code Flowable} or completes if this {@code Flowable} sequence has fewer elements than index.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAt.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAt.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
@@ -9997,7 +9997,7 @@ public final Maybe<T> elementAt(long index) {
      * Returns a {@link Single} that emits the item found at a specified index in a sequence of emissions from
      * this {@code Flowable}, or a default item if that index is out of range.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrDefault.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrDefault.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
@@ -10031,7 +10031,7 @@ public final Single<T> elementAt(long index, @NonNull T defaultItem) {
      * Returns a {@link Single} that emits the item found at a specified index in a sequence of emissions from
      * this {@code Flowable} or signals a {@link NoSuchElementException} if this {@code Flowable} has fewer elements than index.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrDefault.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/elementAtOrDefault.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
@@ -10060,7 +10060,7 @@ public final Single<T> elementAtOrError(long index) {
     /**
      * Filters items emitted by the current {@code Flowable} by only emitting those that satisfy a specified predicate.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -10162,7 +10162,7 @@ public final Single<T> firstOrError() {
      * by the current {@code Flowable}, where that function returns a {@link Publisher}, and then merging those resulting
      * {@code Publisher}s and emitting the results of this merger.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10194,7 +10194,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * by the current {@code Flowable}, where that function returns a {@link Publisher}, and then merging those resulting
      * {@code Publisher}s and emitting the results of this merger.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10230,7 +10230,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * {@code Publisher}s and emitting the results of this merger, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
-     * <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt=""> -->
+     * <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.v3.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10267,7 +10267,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * {@code Publisher}s and emitting the results of this merger, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
-     * <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt=""> -->
+     * <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.v3.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10307,7 +10307,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * {@code Publisher}s and emitting the results of this merger, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
-     * <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt=""> -->
+     * <!-- <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.v3.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10359,7 +10359,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
      * Returns a {@code Flowable} that applies a function to each item emitted or notification raised by the current
      * {@code Flowable} and then flattens the {@link Publisher}s returned from these functions and emits the resulting items.
      * <p>
-     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt="">
+     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10403,7 +10403,7 @@ public final <R> Flowable<R> flatMap(
      * {@code Flowable} and then flattens the {@link Publisher}s returned from these functions and emits the resulting items,
      * while limiting the maximum number of concurrent subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
-     * <!-- <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt=""> -->
+     * <!-- <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.v3.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10452,7 +10452,7 @@ public final <R> Flowable<R> flatMap(
      * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
      * current {@code Flowable} and a specified collection {@link Publisher}.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10489,7 +10489,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * Returns a {@code Flowable} that emits the results of a specified function to the pair of values emitted by the
      * current {@code Flowable} and a specified inner {@link Publisher}.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt="">
      * <dl>
      * <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10530,7 +10530,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * current {@code Flowable} and a specified collection {@link Publisher}, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
-     * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt=""> -->
+     * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10575,7 +10575,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * current {@code Flowable} and a specified collection {@link Publisher}, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
-     * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt=""> -->
+     * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -10626,7 +10626,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
      * current {@code Flowable} and a specified collection {@link Publisher}, while limiting the maximum number of concurrent
      * subscriptions to these {@code Publisher}s.
      * <!-- <p> -->
-     * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt=""> -->
+     * <!-- <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt=""> -->
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The upstream {@code Flowable} is consumed
@@ -11104,7 +11104,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      * source terminates, the next emission by the source having the same key will trigger a new
      * {@code GroupedFlowable} emission.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
@@ -11162,7 +11162,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      * source terminates, the next emission by the source having the same key will trigger a new
      * {@code GroupedFlowable} emission.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
@@ -11221,7 +11221,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
      * source terminates, the next emission by the source having the same key will trigger a new
      * {@code GroupedFlowable} emission.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
@@ -11285,7 +11285,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * source terminates, the next emission by the source having the same key will trigger a new
      * {@code GroupedFlowable} emission.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
@@ -11350,7 +11350,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * source terminates, the next emission by the source having the same key will trigger a new
      * {@code GroupedFlowable} emission.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
@@ -11463,7 +11463,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * </code></pre>
      *
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * <em>Note:</em> A {@code GroupedFlowable} will cache the items it is to emit until such time as it
      * is subscribed to. For this reason, in order to avoid memory leaks, you should not simply ignore those
@@ -11544,7 +11544,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
      * There are no guarantees in what order the items get combined when multiple
      * items from one or both source {@code Publisher}s overlap.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupJoin.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupJoin.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure and consumes all participating {@code Publisher}s in
@@ -11616,7 +11616,7 @@ public final Flowable<T> hide() {
     /**
      * Ignores all items emitted by the current {@code Flowable} and only calls {@code onComplete} or {@code onError}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ignoreElements.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ignoreElements.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator ignores backpressure as it doesn't emit any elements and consumes the current {@code Flowable}
@@ -11642,7 +11642,7 @@ public final Completable ignoreElements() {
      * In Rx.Net this is negated as the {@code any} {@link Subscriber} but we renamed this in RxJava to better match Java
      * naming idioms.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -11668,7 +11668,7 @@ public final Single<Boolean> isEmpty() {
      * There are no guarantees in what order the items get combined when multiple
      * items from one or both source {@code Publisher}s overlap.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/join_.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/join_.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure and consumes all participating {@code Publisher}s in
@@ -11717,7 +11717,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
      * Returns a {@link Maybe} that emits the last item emitted by this {@code Flowable} or completes if
      * this {@code Flowable} is empty.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/last.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/last.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -11741,7 +11741,7 @@ public final Maybe<T> lastElement() {
      * Returns a {@link Single} that emits only the last item emitted by this {@code Flowable}, or a default item
      * if this {@code Flowable} completes without emitting any items.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrDefault.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastOrDefault.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -11949,7 +11949,7 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
      * Returns a {@code Flowable} that applies a specified function to each item emitted by the current {@code Flowable} and
      * emits the results of these function applications.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/map.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/map.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -11979,7 +11979,7 @@ public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super
      * Returns a {@code Flowable} that represents all of the emissions <em>and</em> notifications from the current
      * {@code Flowable} into emissions marked with their original types within {@link Notification} objects.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and expects it from the current {@code Flowable}.
@@ -12003,7 +12003,7 @@ public final Flowable<Notification<T>> materialize() {
     /**
      * Flattens this and another {@link Publisher} into a single {@code Publisher}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code Publisher}s so that they appear as a single {@code Publisher}, by
      * using the {@code mergeWith} method.
@@ -12033,7 +12033,7 @@ public final Flowable<T> mergeWith(@NonNull Publisher<@NonNull ? extends T> othe
     /**
      * Merges the sequence of items of this {@code Flowable} with the success value of the other {@link SingleSource}.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * The success value of the other {@code SingleSource} can get interleaved at any point of this
      * {@code Flowable} sequence.
@@ -12063,7 +12063,7 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
      * Merges the sequence of items of this {@code Flowable} with the success value of the other {@link MaybeSource}
      * or waits for both to complete normally if the {@code MaybeSource} is empty.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * The success value of the other {@code MaybeSource} can get interleaved at any point of this
      * {@code Flowable} sequence.
@@ -12093,7 +12093,7 @@ public final Flowable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
      * Relays the items of this {@code Flowable} and completes only when the other {@link CompletableSource} completes
      * as well.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -12123,7 +12123,7 @@ public final Flowable<T> mergeWith(@NonNull CompletableSource other) {
      * <p>Note that {@code onError} notifications will cut ahead of {@code onNext} notifications on the emission thread if {@code Scheduler} is truly
      * asynchronous. If strict event ordering is required, consider using the {@link #observeOn(Scheduler, boolean)} overload.
      * <p>
-     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
+     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.v3.png" alt="">
      * <p>
      * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s Worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
@@ -12171,7 +12171,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler) {
      * Signals the items and terminal signals of the current {@code Flowable} on the specified {@link Scheduler},
      * asynchronously with a bounded buffer and optionally delays {@code onError} notifications.
      * <p>
-     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
+     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.v3.png" alt="">
      * <p>
      * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s Worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
@@ -12223,7 +12223,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
      * Signals the items and terminal signals of the current {@code Flowable} on the specified {@link Scheduler},
      * asynchronously with a bounded buffer of configurable size and optionally delays {@code onError} notifications.
      * <p>
-     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
+     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.v3.png" alt="">
      * <p>
      * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s Worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
@@ -12278,7 +12278,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
     /**
      * Filters the items emitted by the current {@code Flowable}, only emitting those of the specified type.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -12307,7 +12307,7 @@ public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
      * Buffers an unlimited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
      * downstream to consume the items at its own place.
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
      * <p>
      * An error from the current {@code Flowable} will cut ahead of any unconsumed item. Use {@link #onBackpressureBuffer(boolean)}
      * to have the operator keep the original signal order.
@@ -12335,7 +12335,7 @@ public final Flowable<T> onBackpressureBuffer() {
      * Buffers an unlimited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
      * downstream to consume the items at its own place, optionally delaying an error until all buffered items have been consumed.
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12364,7 +12364,7 @@ public final Flowable<T> onBackpressureBuffer(boolean delayError) {
      * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, and canceling the flow.
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
      * <p>
      * An error from the current {@code Flowable} will cut ahead of any unconsumed item. Use {@link #onBackpressureBuffer(int, boolean)}
      * to have the operator keep the original signal order.
@@ -12397,7 +12397,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity) {
      * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, and canceling the flow.
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12431,7 +12431,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
      * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, and canceling the flow.
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12468,7 +12468,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
      * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, canceling the flow and calling the {@code onOverflow} action.
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12508,7 +12508,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
      * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
      * items, canceling the flow and calling the {@code onOverflow} action.
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12549,7 +12549,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
      * </ul>
      *
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.png" alt="">
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
@@ -12581,7 +12581,7 @@ public final Flowable<T> onBackpressureBuffer(long capacity, @Nullable Action on
      * Drops items from the current {@code Flowable} if the downstream is not ready to receive new items (indicated
      * by a lack of {@link Subscription#request(long)} calls from it).
      * <p>
-     * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.drop.png" alt="">
+     * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.drop.v3.png" alt="">
      * <p>
      * If the downstream request count hits 0 then the resulting {@code Flowable} will refrain from calling {@code onNext} until
      * the {@link Subscriber} invokes {@code request(n)} again to increase the request count.
@@ -12609,7 +12609,7 @@ public final Flowable<T> onBackpressureDrop() {
      * by a lack of {@link Subscription#request(long)} calls from it) and calls the given {@link Consumer} with such
      * dropped items.
      * <p>
-     * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.drop.png" alt="">
+     * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.drop.v3.png" alt="">
      * <p>
      * If the downstream request count hits 0 then the resulting {@code Flowable} will refrain from calling {@code onNext} until
      * the {@link Subscriber} invokes {@code request(n)} again to increase the request count.
@@ -12641,7 +12641,7 @@ public final Flowable<T> onBackpressureDrop(@NonNull Consumer<? super T> onDrop)
      * new items (indicated by a lack of {@link Subscription#request(long)} calls from it) and emits this latest
      * item when the downstream becomes ready.
      * <p>
-     * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.latest.png" alt="">
+     * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.latest.v3.png" alt="">
      * <p>
      * Its behavior is logically equivalent to {@code blockingLatest()} with the exception that
      * the downstream is not blocking while requesting more values.
@@ -12725,7 +12725,7 @@ public final Flowable<T> onErrorComplete(@NonNull Predicate<? super Throwable> p
      * Resumes the flow with a {@link Publisher} returned for the failure {@link Throwable} of the current {@code Flowable} by a
      * function instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.v3.png" alt="">
      * <p>
      * By default, when a {@code Publisher} encounters an error that prevents it from emitting the expected item to
      * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
@@ -12770,7 +12770,7 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
      * Resumes the flow with the given {@link Publisher} when the current {@code Flowable} fails instead of
      * signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.v3.png" alt="">
      * <p>
      * By default, when a {@code Publisher} encounters an error that prevents it from emitting the expected item to
      * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
@@ -12815,7 +12815,7 @@ public final Flowable<T> onErrorResumeWith(@NonNull Publisher<@NonNull ? extends
      * Ends the flow with a last item returned by a function for the {@link Throwable} error signaled by the current
      * {@code Flowable} instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.v3.png" alt="">
      * <p>
      * By default, when a {@link Publisher} encounters an error that prevents it from emitting the expected item to
      * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
@@ -12855,7 +12855,7 @@ public final Flowable<T> onErrorReturn(@NonNull Function<? super Throwable, ? ex
     /**
      * Ends the flow with the given last item when the current {@code Flowable} fails instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.v3.png" alt="">
      * <p>
      * By default, when a {@link Publisher} encounters an error that prevents it from emitting the expected item to
      * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
@@ -13015,7 +13015,7 @@ public final ParallelFlowable<T> parallel(int parallelism, int prefetch) {
      * {@link ConnectableFlowable#connect connect} method is called before it begins emitting items to those
      * {@link Subscriber}s that have subscribed to it.
      * <p>
-     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.png" alt="">
+     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code ConnectableFlowable} honors backpressure for each of its {@code Subscriber}s
@@ -13040,7 +13040,7 @@ public final ConnectableFlowable<T> publish() {
      * Returns a {@code Flowable} that emits the results of invoking a specified selector on items emitted by a
      * {@link ConnectableFlowable} that shares a single subscription to the underlying sequence.
      * <p>
-     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.f.png" alt="">
+     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.f.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the current {@code Flowable} to honor backpressure and if this expectation is
@@ -13074,7 +13074,7 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      * Returns a {@code Flowable} that emits the results of invoking a specified selector on items emitted by a
      * {@link ConnectableFlowable} that shares a single subscription to the underlying sequence.
      * <p>
-     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.f.png" alt="">
+     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.f.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the current {@code Flowable} to honor backpressure and if this expectation is
@@ -13114,7 +13114,7 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
      * {@link ConnectableFlowable#connect connect} method is called before it begins emitting items to those
      * {@link Subscriber}s that have subscribed to it.
      * <p>
-     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.png" alt="">
+     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code ConnectableFlowable} honors backpressure for each of its {@code Subscriber}s
@@ -13172,7 +13172,7 @@ public final Flowable<T> rebatchRequests(int n) {
      * {@code Flowable} into the same function, and so on until all items have been emitted by the current and finite {@code Flowable},
      * and emits the final result from the final call to your function as its sole item.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduce.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduce.v3.png" alt="">
      * <p>
      * This technique, which is called "reduce" here, is sometimes called "aggregate," "fold," "accumulate,"
      * "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
@@ -13212,7 +13212,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * emitted by the current {@code Flowable} into the same function, and so on until all items have been emitted by the
      * current and finite {@code Flowable}, emitting the final result from the final call to your function as its sole item.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.png" alt="">
+     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.v3.png" alt="">
      * <p>
      * This technique, which is called "reduce" here, is sometimes called "aggregate," "fold," "accumulate,"
      * "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
@@ -13276,7 +13276,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * all items have been emitted by the current and finite {@code Flowable}, emitting the final result from the final call to your
      * function as its sole item.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.png" alt="">
+     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.v3.png" alt="">
      * <p>
      * This technique, which is called "reduce" here, is sometimes called "aggregate", "fold", "accumulate",
      * "compress", or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
@@ -13317,7 +13317,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     /**
      * Returns a {@code Flowable} that repeats the sequence of items emitted by the current {@code Flowable} indefinitely.
      * <p>
-     * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.o.png" alt="">
+     * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
@@ -13341,7 +13341,7 @@ public final Flowable<T> repeat() {
      * Returns a {@code Flowable} that repeats the sequence of items emitted by the current {@code Flowable} at most
      * {@code count} times.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
@@ -13376,7 +13376,7 @@ public final Flowable<T> repeat(long times) {
      * Returns a {@code Flowable} that repeats the sequence of items emitted by the current {@code Flowable} until
      * the provided stop function returns {@code true}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeat.on.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
@@ -13410,7 +13410,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
      * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
      * resubscribe to the current {@code Flowable}.
      * <p>
-     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.png" alt="">
+     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
@@ -13440,7 +13440,7 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
      * {@code Flowable} resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13465,7 +13465,7 @@ public final ConnectableFlowable<T> replay() {
      * Returns a {@code Flowable} that emits items that are the results of invoking a specified selector on the items
      * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable}.
      * <p>
-     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.f.png" alt="">
+     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.f.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13501,7 +13501,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
      * <p>
-     * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fn.png" alt="">
+     * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fn.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13542,7 +13542,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
      * <p>
-     * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fn.png" alt="">
+     * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fn.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13585,7 +13585,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fnt.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fnt.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13627,7 +13627,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fnts.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fnts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13678,7 +13678,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fnts.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fnts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13728,7 +13728,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying all items that were emitted within a specified time window.
      * <p>
-     * <img width="640" height="435" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ft.png" alt="">
+     * <img width="640" height="435" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ft.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13764,7 +13764,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying all items that were emitted within a specified time window.
      * <p>
-     * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fts.png" alt="">
+     * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13806,7 +13806,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * emitted by a {@link ConnectableFlowable} that shares a single subscription to the current {@code Flowable},
      * replaying all items that were emitted within a specified time window.
      * <p>
-     * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fts.png" alt="">
+     * <img width="640" height="440" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.fts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13856,7 +13856,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
      * To ensure no beyond-bufferSize items are referenced,
      * use the {@link #replay(int, boolean)} overload with {@code eagerTruncate = true}.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.n.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.n.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -13887,7 +13887,7 @@ public final ConnectableFlowable<T> replay(int bufferSize) {
      * an ordinary {@code Flowable}, except that it does not begin emitting items when it is subscribed to, but only
      * when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.n.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.n.v3.png" alt="">
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
@@ -13926,7 +13926,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, boolean eagerTruncate
      * {@code Flowable} resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nt.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nt.v3.png" alt="">
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
@@ -13967,7 +13967,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * connectable {@code Flowable} resembles an ordinary {@code Flowable}, except that it does not begin emitting items
      * when it is subscribed to, but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nts.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nts.v3.png" alt="">
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
@@ -14017,7 +14017,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * {@code bufferSize} source emissions. To ensure no out-of-date or beyond-bufferSize items
      * are referenced, set {@code eagerTruncate = true}.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nts.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.nts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator supports backpressure. Note that the upstream requests are determined by the child
@@ -14061,7 +14061,7 @@ public final ConnectableFlowable<T> replay(int bufferSize, long time, @NonNull T
      * resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.t.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.t.v3.png" alt="">
      * <p>
      * Note that the internal buffer may retain strong references to the oldest item. To ensure no out-of-date items
      * are referenced, use the {@link #replay(long, TimeUnit, Scheduler, boolean)} overload with {@code eagerTruncate = true}.
@@ -14096,7 +14096,7 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit) {
      * resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ts.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ts.v3.png" alt="">
      * <p>
      * Note that the internal buffer may retain strong references to the oldest item. To ensure no out-of-date items
      * are referenced, use the {@link #replay(long, TimeUnit, Scheduler, boolean)} overload with {@code eagerTruncate = true}.
@@ -14136,7 +14136,7 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
      * resembles an ordinary {@code Flowable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ts.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.ts.v3.png" alt="">
      * <p>
      * Note that the internal buffer may retain strong references to the oldest item. To ensure no out-of-date items
      * are referenced, set {@code eagerTruncate = true}.
@@ -14176,7 +14176,7 @@ public final ConnectableFlowable<T> replay(long time, @NonNull TimeUnit unit, @N
      * Returns a {@code Flowable} that mirrors the current {@code Flowable}, resubscribing to it if it calls {@code onError}
      * (infinite retry count).
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.v3.png" alt="">
      * <p>
      * If the current {@code Flowable} calls {@link Subscriber#onError}, this method will resubscribe to the current
      * {@code Flowable} rather than propagating the {@code onError} call.
@@ -14208,7 +14208,7 @@ public final Flowable<T> retry() {
      * Returns a {@code Flowable} that mirrors the current {@code Flowable}, resubscribing to it if it calls {@code onError}
      * and the predicate returns {@code true} for that specific exception and retry count.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
@@ -14239,7 +14239,7 @@ public final Flowable<T> retry(@NonNull BiPredicate<@NonNull ? super Integer, @N
      * Returns a {@code Flowable} that mirrors the current {@code Flowable}, resubscribing to it if it calls {@code onError}
      * up to a specified number of retries.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.v3.png" alt="">
      * <p>
      * If the current {@code Flowable} calls {@link Subscriber#onError}, this method will resubscribe to the current
      * {@code Flowable} for a maximum of {@code count} resubscriptions rather than propagating the
@@ -14352,7 +14352,7 @@ public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
      * {@code onComplete} or {@code onError} on the child subscription. Otherwise, this {@code Publisher} will
      * resubscribe to the current {@code Flowable}.
      * <p>
-     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.png" alt="">
+     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.v3.png" alt="">
      * <p>
      * Example:
      *
@@ -14462,7 +14462,7 @@ public final void safeSubscribe(@NonNull Subscriber<@NonNull ? super T> subscrib
      * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the current {@code Flowable}
      * within periodic time intervals.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -14528,7 +14528,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, boolean emi
      * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the current {@code Flowable}
      * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -14674,7 +14674,7 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitL
      * {@code Floawble} into the same function, and so on until all items have been emitted by the current {@code Flowable},
      * emitting the result of each of these iterations.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.v3.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <dl>
@@ -14708,7 +14708,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * the current {@code Flowable} into the same function, and so on until all items have been emitted by the current
      * {@code Flowable}, emitting the result of each of these iterations.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
@@ -14762,7 +14762,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * the current {@code Flowable} into the same function, and so on until all items have been emitted by the current
      * {@code Flowable}, emitting the result of each of these iterations.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
@@ -14807,7 +14807,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * {@code onNext} from two different threads concurrently. You can force such a {@code Publisher} to be
      * well-behaved and sequential by applying the {@code serialize} method to it.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/synchronize.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/synchronize.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -14834,7 +14834,7 @@ public final Flowable<T> serialize() {
      * <p>
      * This is an alias for {@link #publish()}.{@link ConnectableFlowable#refCount() refCount()}.
      * <p>
-     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishRefCount.png" alt="">
+     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishRefCount.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure and expects the current {@code Flowable} to honor backpressure as well.
@@ -14860,7 +14860,7 @@ public final Flowable<T> share() {
      * signals exactly one item or signals an {@link IllegalArgumentException} if this {@code Flowable} signals
      * more than one item.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/single.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/single.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -14885,7 +14885,7 @@ public final Maybe<T> singleElement() {
      * emits only a single item, or a default item if the current {@code Flowable} emits no items. If the current
      * {@code Flowable} emits more than one item, an {@link IllegalArgumentException} is signaled instead.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrDefault.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/singleOrDefault.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -14939,7 +14939,7 @@ public final Single<T> singleOrError() {
      * Returns a {@code Flowable} that skips the first {@code count} items emitted by the current {@code Flowable} and emits
      * the remainder.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -14972,7 +14972,7 @@ public final Flowable<T> skip(long count) {
      * Returns a {@code Flowable} that skips values emitted by the current {@code Flowable} before a specified time window
      * elapses.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.t.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.t.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
@@ -15002,7 +15002,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that skips values emitted by the current {@code Flowable} before a specified time window
      * on a specified {@link Scheduler} elapses.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.ts.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't support backpressure as it uses time to skip an arbitrary number of elements and
@@ -15033,7 +15033,7 @@ public final Flowable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Schedu
      * Returns a {@code Flowable} that drops a specified number of items from the end of the sequence emitted by the
      * current {@code Flowable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.v3.png" alt="">
      * <p>
      * This {@link Subscriber} accumulates a queue long enough to store the first {@code count} items. As more items are
      * received, items are taken from the front of the queue and emitted by the resulting {@code Flowable}. This causes
@@ -15071,7 +15071,7 @@ public final Flowable<T> skipLast(int count) {
      * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * before the source completes.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -15103,7 +15103,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * before the source completes.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -15138,7 +15138,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, boolean del
      * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
-     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -15171,7 +15171,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
-     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -15207,7 +15207,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * Returns a {@code Flowable} that drops items emitted by the current {@code Flowable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
-     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -15251,7 +15251,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * Returns a {@code Flowable} that skips items emitted by the current {@code Flowable} until a second {@link Publisher} emits
      * an item.
      * <p>
-     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipUntil.png" alt="">
+     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipUntil.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -15281,7 +15281,7 @@ public final <U> Flowable<T> skipUntil(@NonNull Publisher<U> other) {
      * Returns a {@code Flowable} that skips all items emitted by the current {@code Flowable} as long as a specified
      * condition holds {@code true}, but emits all further source items as soon as the condition becomes {@code false}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipWhile.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipWhile.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -15367,7 +15367,7 @@ public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> comparat
      * Returns a {@code Flowable} that emits the items in a specified {@link Iterable} before it begins to emit items
      * emitted by the current {@code Flowable}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The Current {@code Flowable}
@@ -15473,7 +15473,7 @@ public final Flowable<T> startWith(@NonNull MaybeSource<T> other) {
      * Returns a {@code Flowable} that emits the items in a specified {@link Publisher} before it begins to emit
      * items emitted by the current {@code Flowable}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.o.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the {@code other} {@code Publisher}s
@@ -15502,7 +15502,7 @@ public final Flowable<T> startWith(@NonNull Publisher<@NonNull ? extends T> othe
      * Returns a {@code Flowable} that emits a specified item before it begins to emit items emitted by the current
      * {@code Flowable}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}
@@ -15534,7 +15534,7 @@ public final Flowable<T> startWithItem(@NonNull T item) {
      * Returns a {@code Flowable} that emits the specified items before it begins to emit items emitted by the current
      * {@code Flowable}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The current {@code Flowable}
@@ -15815,7 +15815,7 @@ public final void subscribe(@NonNull FlowableSubscriber<@NonNull ? super T> subs
      * chain, it is recommended to use {@code subscribeOn(scheduler, false)} instead
      * to avoid same-pool deadlock because requests may pile up behind an eager/blocking emitter.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -15850,7 +15850,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler) {
      * chain, it is recommended to have {@code requestOn} {@code false} to avoid same-pool deadlock
      * because requests may pile up behind an eager/blocking emitter.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -15919,7 +15919,7 @@ public final Flowable<T> switchIfEmpty(@NonNull Publisher<@NonNull ? extends T>
      * The resulting {@code Flowable} completes if both the current {@code Flowable} and the last inner {@code Publisher}, if any, complete.
      * If the current {@code Flowable} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
@@ -15955,7 +15955,7 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
      * The resulting {@code Flowable} completes if both the current {@code Flowable} and the last inner {@code Publisher}, if any, complete.
      * If the current {@code Flowable} signals an {@code onError}, the inner {@code Publisher} is canceled and the error delivered in-sequence.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
@@ -16090,7 +16090,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
      * If the current {@code Flowable} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
      * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
@@ -16128,7 +16128,7 @@ public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ?
      * If the current {@code Flowable} signals an {@code onError}, the termination of the last inner {@code Publisher} will emit that error as is
      * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code Publisher}s signaled.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The outer {@code Publisher} is consumed in an
@@ -16180,7 +16180,7 @@ <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<@NonNull ? ex
      * available while failing immediately if this {@code Flowable} or any of the
      * active inner {@code MaybeSource}s fail.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The main {@code Flowable} is consumed in an
@@ -16221,7 +16221,7 @@ public final <R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? exten
      * while disposing the older ones  (and ignoring their signals) and emits the latest success value of the current one if
      * available, delaying errors from this {@code Flowable} or the inner {@code MaybeSource}s until all terminate.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The main {@code Flowable} is consumed in an
@@ -16254,7 +16254,7 @@ public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super
      * while failing immediately if this {@code Flowable} or any of the
      * active inner {@code SingleSource}s fail.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The main {@code Flowable} is consumed in an
@@ -16295,7 +16295,7 @@ public final <R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? exte
      * while disposing the older ones  (and ignoring their signals) and emits the latest success value of the current one,
      * delaying errors from this {@code Flowable} or the inner {@code SingleSource}s until all terminate.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The main {@code Flowable} is consumed in an
@@ -16326,7 +16326,7 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
      * Returns a {@code Flowable} that emits only the first {@code count} items emitted by the current {@code Flowable}. If the source emits fewer than
      * {@code count} items then all of its items are emitted.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.v3.png" alt="">
      * <p>
      * This method returns a {@code Flowable} that will invoke a subscribing {@link Subscriber}'s
      * {@link Subscriber#onNext onNext} function a maximum of {@code count} times before invoking
@@ -16380,7 +16380,7 @@ public final Flowable<T> take(long count) {
      * If time runs out before the {@code Flowable} completes normally, the {@code onComplete} event will be
      * signaled on the default {@code computation} {@link Scheduler}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.t.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.t.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -16412,7 +16412,7 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit) {
      * If time runs out before the {@code Flowable} completes normally, the {@code onComplete} event will be
      * signaled on the provided {@code Scheduler}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.ts.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -16443,7 +16443,7 @@ public final Flowable<T> take(long time, @NonNull TimeUnit unit, @NonNull Schedu
      * Returns a {@code Flowable} that emits at most the last {@code count} items emitted by the current {@code Flowable}. If the source emits fewer than
      * {@code count} items then all of its items are emitted.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.n.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.n.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream if the {@code count} is non-zero; ignores
@@ -16481,7 +16481,7 @@ public final Flowable<T> takeLast(int count) {
      * Returns a {@code Flowable} that emits at most a specified number of items from the current {@code Flowable} that were
      * emitted in a specified window of time before the current {@code Flowable} completed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tn.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tn.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -16515,7 +16515,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit)
      * emitted in a specified window of time before the current {@code Flowable} completed, where the timing information is
      * provided by a given {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -16551,7 +16551,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      * emitted in a specified window of time before the current {@code Flowable} completed, where the timing information is
      * provided by a given {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -16597,7 +16597,7 @@ public final Flowable<T> takeLast(long count, long time, @NonNull TimeUnit unit,
      * Returns a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in a specified
      * window of time before the current {@code Flowable} completed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -16628,7 +16628,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that emits the items from the current {@code Flowable} that were emitted in a specified
      * window of time before the current {@code Flowable} completed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -16663,7 +16663,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, boolean del
      * window of time before the current {@code Flowable} completed, where the timing information is provided by a specified
      * {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -16697,7 +16697,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * window of time before the current {@code Flowable} completed, where the timing information is provided by a specified
      * {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -16734,7 +16734,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * window of time before the current {@code Flowable} completed, where the timing information is provided by a specified
      * {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an
@@ -16773,7 +16773,7 @@ public final Flowable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull Sc
      * Returns a {@code Flowable} that emits items emitted by the current {@code Flowable}, checks the specified predicate
      * for each item, and then completes when the condition is satisfied.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.p.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.p.v3.png" alt="">
      * <p>
      * The difference between this operator and {@link #takeWhile(Predicate)} is that here, the condition is
      * evaluated <em>after</em> the item is emitted.
@@ -16807,7 +16807,7 @@ public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate)
      * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} until a second {@link Publisher}
      * emits an item.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -16838,7 +16838,7 @@ public final <U> Flowable<T> takeUntil(@NonNull Publisher<U> other) {
      * Returns a {@code Flowable} that emits items emitted by the current {@code Flowable} so long as each item satisfied a
      * specified condition, and then completes as soon as this condition is not satisfied.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeWhile.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeWhile.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -16870,7 +16870,7 @@ public final Flowable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
      * This differs from {@link #throttleLast} in that this only tracks the passage of time whereas
      * {@link #throttleLast} ticks at scheduled intervals.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -16902,7 +16902,7 @@ public final Flowable<T> throttleFirst(long windowDuration, @NonNull TimeUnit un
      * This differs from {@link #throttleLast} in that this only tracks the passage of time whereas
      * {@link #throttleLast} ticks at scheduled intervals.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -16939,7 +16939,7 @@ public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit
      * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
      * {@link #throttleFirst} does not tick, it just tracks the passage of time.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -16973,7 +16973,7 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      * This differs from {@link #throttleFirst(long, TimeUnit, Scheduler)} in that this ticks along at a scheduled interval whereas
      * {@code throttleFirst} does not tick, it just tracks the passage of time.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -17171,7 +17171,7 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
      * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
      * will be emitted by the resulting {@code Flowable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -17207,7 +17207,7 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
      * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
      * will be emitted by the resulting {@code Flowable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
@@ -17242,7 +17242,7 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
      * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Flowable}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17267,7 +17267,7 @@ public final Flowable<Timed<T>> timeInterval() {
      * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Flowable}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17295,7 +17295,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
      * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Flowable}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17322,7 +17322,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Flowable}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17355,7 +17355,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Sc
      * time after the emission of the previous item, where that period of time is measured by a {@link Publisher} that
      * is a function of the previous item.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout3.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout3.v3.png" alt="">
      * <p>
      * Note: The arrival of the first source item is never timed out.
      * <dl>
@@ -17391,7 +17391,7 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      * previous item, where that period of time is measured by a {@code Publisher} that is a function of the previous
      * item.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout4.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout4.v3.png" alt="">
      * <p>
      * Note: The arrival of the first source item is never timed out.
      * <dl>
@@ -17429,7 +17429,7 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
      * the resulting {@code Flowable} terminates and notifies {@link Subscriber}s of a {@link TimeoutException}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17459,7 +17459,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit) {
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
      * the current {@code Flowable} is disposed and the resulting {@code Flowable} begins instead to mirror a fallback {@link Publisher}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
@@ -17495,7 +17495,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      * starting from its predecessor, the current {@code Flowable} is disposed and the resulting {@code Flowable} begins
      * instead to mirror a fallback {@link Publisher}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
@@ -17533,7 +17533,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      * specified timeout duration starting from its predecessor, the resulting {@code Flowable} terminates and
      * notifies {@link Subscriber}s of a {@link TimeoutException}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17565,7 +17565,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
      * {@link TimeoutException} if either the first item emitted by the current {@code Flowable} or any subsequent item
      * doesn't arrive within time windows defined by other {@link Publisher}s.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout5.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout5.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. Both this and the returned {@code Publisher}s
@@ -17605,7 +17605,7 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
      * the first item emitted by the current {@code Flowable} or any subsequent item doesn't arrive within time windows
      * defined by other {@code Publisher}s.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout6.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout6.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream. The {@code Publisher}
@@ -17665,7 +17665,7 @@ private <U, V> Flowable<T> timeout0(
      * Returns a {@code Flowable} that emits each item emitted by the current {@code Flowable}, wrapped in a
      * {@link Timed} object.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17690,7 +17690,7 @@ public final Flowable<Timed<T>> timestamp() {
      * Returns a {@code Flowable} that emits each item emitted by the current {@code Flowable}, wrapped in a
      * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17718,7 +17718,7 @@ public final Flowable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
      * Returns a {@code Flowable} that emits each item emitted by the current {@code Flowable}, wrapped in a
      * {@link Timed} object.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17745,7 +17745,7 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
      * Returns a {@code Flowable} that emits each item emitted by the current {@code Flowable}, wrapped in a
      * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -17800,7 +17800,7 @@ public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
      * Returns a {@link Single} that emits a single item, a list composed of all the items emitted by the
      * finite upstream source {@link Publisher}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.v3.png" alt="">
      * <p>
      * Normally, a {@code Publisher} that returns multiple items will do so by invoking its {@link Subscriber}'s
      * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior by having the
@@ -17834,7 +17834,7 @@ public final Single<List<T>> toList() {
      * Returns a {@link Single} that emits a single item, a list composed of all the items emitted by the
      * finite source {@link Publisher}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.v3.png" alt="">
      * <p>
      * Normally, a {@code Publisher} that returns multiple items will do so by invoking its {@link Subscriber}'s
      * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior by having the
@@ -17872,7 +17872,7 @@ public final Single<List<T>> toList(int capacityHint) {
      * Returns a {@link Single} that emits a single item, a list composed of all the items emitted by the
      * finite source {@link Publisher}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.v3.png" alt="">
      * <p>
      * Normally, a {@code Publisher} that returns multiple items will do so by invoking its {@link Subscriber}'s
      * {@link Subscriber#onNext onNext} method for each such item. You can change this behavior by having the
@@ -17911,7 +17911,7 @@ public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplie
      * Returns a {@link Single} that emits a single {@link HashMap} containing all items emitted by the finite source {@link Publisher},
      * mapped by the keys returned by a specified {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.v3.png" alt="">
      * <p>
      * If more than one source item maps to the same key, the {@code HashMap} will contain the latest of those items.
      * <p>
@@ -17946,7 +17946,7 @@ public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends
      * Returns a {@link Single} that emits a single {@link HashMap} containing values corresponding to items emitted by the
      * finite source {@link Publisher}, mapped by the keys returned by a specified {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.v3.png" alt="">
      * <p>
      * If more than one source item maps to the same key, the {@code HashMap} will contain a single entry that
      * corresponds to the latest of those items.
@@ -17986,7 +17986,7 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
      * Returns a {@link Single} that emits a single {@link Map}, returned by a specified {@code mapFactory} function, that
      * contains keys and values extracted from the items emitted by the finite source {@link Publisher}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -18027,7 +18027,7 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
      * Returns a {@link Single} that emits a single {@link HashMap} that contains an {@link ArrayList} of items emitted by the
      * finite source {@link Publisher} keyed by a specified {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -18062,7 +18062,7 @@ public final <K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? su
      * specified {@code valueSelector} function from items emitted by the finite source {@link Publisher}, keyed by a
      * specified {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -18100,7 +18100,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<?
      * contains a custom collection of values, extracted by a specified {@code valueSelector} function from
      * items emitted by the finite source {@link Publisher}, and keyed by the {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -18148,7 +18148,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
      * contains an {@link ArrayList} of values, extracted by a specified {@code valueSelector} function from items
      * emitted by the finite source {@link Publisher} and keyed by the {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated map to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -18214,7 +18214,7 @@ public final Observable<T> toObservable() {
      *             all other items emitted by this {@code Flowable}, no items will be emitted and the
      *             sequence is terminated with a {@link ClassCastException}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -18241,7 +18241,7 @@ public final Single<List<T>> toSortedList() {
      * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the finite source {@link Publisher}, in a
      * sorted order based on a specified comparison function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -18274,7 +18274,7 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
      * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the finite source {@link Publisher}, in a
      * sorted order based on a specified comparison function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -18316,7 +18316,7 @@ public final Single<List<T>> toSortedList(@NonNull Comparator<? super T> compara
      *             all other items emitted by this {@code Flowable}, no items will be emitted and the
      *             sequence is terminated with a {@link ClassCastException}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated list to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -18380,7 +18380,7 @@ public final Flowable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      * {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the current window and
      * propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window3.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window3.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window will only contain one element. The behavior is
@@ -18413,7 +18413,7 @@ public final Flowable<Flowable<T>> window(long count) {
      * the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the current window
      * and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
+     * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18450,7 +18450,7 @@ public final Flowable<Flowable<T>> window(long count, long skip) {
      * the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the current window
      * and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
+     * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18493,7 +18493,7 @@ public final Flowable<Flowable<T>> window(long count, long skip, int bufferSize)
      * {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
      * current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.png" alt="">
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18535,7 +18535,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
      * current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18579,7 +18579,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
      * current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18630,7 +18630,7 @@ public final Flowable<Flowable<T>> window(long timespan, long timeskip, @NonNull
      * {@code timespan} argument. When the current {@code Flowable} completes or encounters an error, the resulting
      * {@code Flowable} emits the current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.png" alt="">
+     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18670,7 +18670,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit)
      * reached first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable}
      * emits the current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18714,7 +18714,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * reached first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable}
      * emits the current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18759,7 +18759,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * {@code timespan} argument. When the current {@code Flowable} completes or encounters an error, the resulting
      * {@code Flowable} emits the current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.s.png" alt="">
+     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18803,7 +18803,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
      * current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18849,7 +18849,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
      * current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18897,7 +18897,7 @@ public final Flowable<Flowable<T>> window(long timespan, @NonNull TimeUnit unit,
      * first). When the current {@code Flowable} completes or encounters an error, the resulting {@code Flowable} emits the
      * current window and propagates the notification from the current {@code Flowable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18950,7 +18950,7 @@ public final Flowable<Flowable<T>> window(
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
      * {@link Publisher}.
      * <p>
-     * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
+     * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -18985,7 +18985,7 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
      * {@link Publisher}.
      * <p>
-     * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
+     * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -19026,7 +19026,7 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
      * the {@code windowOpenings} {@link Publisher} emits an item and when the {@code Publisher} returned by
      * {@code closingSelector} emits an item.
      * <p>
-     * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
+     * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -19069,7 +19069,7 @@ public final <U, V> Flowable<Flowable<T>> window(
      * the {@code windowOpenings} {@link Publisher} emits an item and when the {@code Publisher} returned by
      * {@code closingSelector} emits an item.
      * <p>
-     * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
+     * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -19116,7 +19116,7 @@ public final <U, V> Flowable<Flowable<T>> window(
      * Merges the specified {@link Publisher} into the current {@code Flowable} sequence by using the {@code resultSelector}
      * function only when the current {@code Flowable} (this instance) emits an item.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -19357,7 +19357,7 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends
      * Returns a {@code Flowable} that emits items that are the result of applying a specified function to pairs of
      * values, one each from the current {@code Flowable} and a specified {@link Iterable} sequence.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.i.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.i.v3.png" alt="">
      * <p>
      * Note that the {@code other} {@code Iterable} is evaluated as items are observed from the current {@code Flowable}; it is
      * not pre-consumed. This allows you to zip infinite streams on either side.
@@ -19409,7 +19409,7 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends
      * use {@link #doOnCancel(Action)} as well or use {@code using()} to do cleanup in case of completion
      * or cancellation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
@@ -19457,7 +19457,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U>
      * use {@link #doOnCancel(Action)} as well or use {@code using()} to do cleanup in case of completion
      * or cancellation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
@@ -19508,7 +19508,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U>
      * use {@link #doOnCancel(Action)} as well or use {@code using()} to do cleanup in case of completion
      * or cancellation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects backpressure from the sources and honors backpressure from the downstream.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index dba5a15219..f5ff68247a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -898,7 +898,7 @@ public static <T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? exten
      * Returns a (singleton) {@code Maybe} instance that calls {@link MaybeObserver#onComplete onComplete}
      * immediately.
      * <p>
-     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/empty.png" alt="">
+     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/empty.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code empty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1239,7 +1239,7 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
      * subscribes to the  returned {@code Maybe}. In other terms, this source operator evaluates the given
      * {@code Supplier} "lazily".
      * <p>
-     * <img width="640" height="311" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromSupplier.png" alt="">
+     * <img width="640" height="311" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromSupplier.v3.png" alt="">
      * <p>
      * Note that the {@code null} handling of this operator differs from the similar source operators in the other
      * {@link io.reactivex.rxjava3.core base reactive classes}. Those operators signal a {@link NullPointerException} if the value returned by their
@@ -1946,7 +1946,7 @@ public static <T> Flowable<T> mergeDelayError(
     /**
      * Returns a {@code Maybe} that never sends any items or notifications to a {@link MaybeObserver}.
      * <p>
-     * <img width="640" height="185" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/never.png" alt="">
+     * <img width="640" height="185" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/never.v3.png" alt="">
      * <p>
      * This {@code Maybe} is useful primarily for testing purposes.
      * <dl>
@@ -3628,7 +3628,7 @@ public final Maybe<T> doOnDispose(@NonNull Action onDispose) {
     /**
      * Invokes an {@link Action} just before the current {@code Maybe} calls {@code onComplete}.
      * <p>
-     * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.m.png" alt="">
+     * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.m.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnComplete} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3658,7 +3658,7 @@ public final Maybe<T> doOnComplete(@NonNull Action onComplete) {
      * Calls the shared {@link Consumer} with the error sent via {@code onError} for each
      * {@link MaybeObserver} that subscribes to the current {@code Maybe}.
      * <p>
-     * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnError.m.png" alt="">
+     * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnError.m.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3793,7 +3793,7 @@ public final Maybe<T> doOnTerminate(@NonNull Action onTerminate) {
      * Calls the shared {@link Consumer} with the success value sent via {@code onSuccess} for each
      * {@link MaybeObserver} that subscribes to the current {@code Maybe}.
      * <p>
-     * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSuccess.m.png" alt="">
+     * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSuccess.m.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code doOnSuccess} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4345,7 +4345,7 @@ public final <R> Maybe<R> map(@NonNull Function<? super T, ? extends R> mapper)
      * Maps the signal types of this {@code Maybe} into a {@link Notification} of the same kind
      * and emits it as a {@link Single}'s {@code onSuccess} value to downstream.
      * <p>
-     * <img width="640" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
+     * <img width="640" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 9972112585..2e0aff91ba 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -52,7 +52,7 @@
  * <p>
  * The documentation for this class makes use of marble diagrams. The following legend explains these diagrams:
  * <p>
- * <img width="640" height="317" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/legend.png" alt="">
+ * <img width="640" height="317" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/legend.v3.png" alt="">
  * <p>
  * The design of this class was derived from the
  * <a href="https://github.com/reactive-streams/reactive-streams-jvm">Reactive-Streams design and specification</a>
@@ -105,7 +105,7 @@ public abstract class Observable<@NonNull T> implements ObservableSource<T> {
      * Mirrors the one {@link ObservableSource} in an {@link Iterable} of several {@code ObservableSource}s that first either emits an item or sends
      * a termination notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code amb} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -131,7 +131,7 @@ public static <T> Observable<T> amb(@NonNull Iterable<@NonNull ? extends Observa
      * Mirrors the one {@link ObservableSource} in an array of several {@code ObservableSource}s that first either emits an item or sends
      * a termination notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -191,7 +191,7 @@ public static int bufferSize() {
      * any items and without any calls to the combiner function.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -235,7 +235,7 @@ public static <T, R> Observable<R> combineLatest(
      * any items and without any calls to the combiner function.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -288,7 +288,7 @@ public static <T, R> Observable<R> combineLatest(
      * any items and without any calls to the combiner function.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -332,7 +332,7 @@ public static <T, R> Observable<R> combineLatestArray(
      * any items and without any calls to the combiner function.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -380,7 +380,7 @@ public static <T, R> Observable<R> combineLatestArray(
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -421,7 +421,7 @@ public static <T1, T2, R> Observable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -467,7 +467,7 @@ public static <T1, T2, T3, R> Observable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -518,7 +518,7 @@ public static <T1, T2, T3, T4, R> Observable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -574,7 +574,7 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -634,7 +634,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -700,7 +700,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -770,7 +770,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
      * resulting sequence terminates immediately (normally or with all the errors accumulated till that point).
      * If that input source is also synchronous, other sources after it will not be subscribed to.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatest.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatest} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -841,7 +841,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
      * the {@code ObservableSource}s each time an item is received from any of the {@code ObservableSource}s, where this
      * aggregation is defined by a specified function.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.v3.png" alt="">
      * <p>
      * Note on method signature: since Java doesn't allow creating a generic array with {@code new T[]}, the
      * implementation of this operator has to create an {@code Object[]} instead. Unfortunately, a
@@ -898,7 +898,7 @@ public static <T, R> Observable<R> combineLatestArrayDelayError(
      * any items and without any calls to the combiner function.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -953,7 +953,7 @@ public static <T, R> Observable<R> combineLatestArrayDelayError(@NonNull Observa
      * any items and without any calls to the combiner function.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -997,7 +997,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<@No
      * any items and without any calls to the combiner function.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/combineLatestDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code combineLatestDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1036,7 +1036,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<@No
      * Concatenates elements of each {@link ObservableSource} provided via an {@link Iterable} sequence into a single sequence
      * of elements without interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1059,7 +1059,7 @@ public static <T> Observable<T> concat(@NonNull Iterable<@NonNull ? extends Obse
      * Returns an {@code Observable} that emits the items emitted by each of the {@link ObservableSource}s emitted by the
      * {@code ObservableSource}, one after the other, without interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1083,7 +1083,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Obser
      * Returns an {@code Observable} that emits the items emitted by each of the {@link ObservableSource}s emitted by the outer
      * {@code ObservableSource}, one after the other, without interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1113,7 +1113,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Obser
      * Returns an {@code Observable} that emits the items emitted by two {@link ObservableSource}s, one after the other, without
      * interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1141,7 +1141,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends T> so
      * Returns an {@code Observable} that emits the items emitted by three {@link ObservableSource}s, one after the other, without
      * interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1174,7 +1174,7 @@ public static <T> Observable<T> concat(
      * Returns an {@code Observable} that emits the items emitted by four {@link ObservableSource}s, one after the other, without
      * interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1211,7 +1211,7 @@ public static <T> Observable<T> concat(
      * <p>
      * Note: named this way because of overload conflict with {@code concat(ObservableSource<ObservableSource>)}
      * <p>
-     * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArray.png" alt="">
+     * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArray.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1241,7 +1241,7 @@ public static <T> Observable<T> concatArray(@NonNull ObservableSource<? extends
      * Concatenates a variable number of {@link ObservableSource} sources and delays errors from any of them
      * till all terminate.
      * <p>
-     * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArray.png" alt="">
+     * <img width="640" height="290" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatArray.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatArrayDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1389,7 +1389,7 @@ public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, i
      *  by subscribing to each {@code ObservableSource}, one after the other, one at a time and delays any errors till
      *  the all inner {@code ObservableSource}s terminate.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1413,7 +1413,7 @@ public static <T> Observable<T> concatDelayError(@NonNull Iterable<@NonNull ? ex
      * by subscribing to each inner {@code ObservableSource}, one after the other, one at a time and delays any errors till the
      *  all inner and the outer {@code ObservableSource}s terminate.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1435,7 +1435,7 @@ public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? ext
      * Concatenates the {@link ObservableSource} sequence of {@code ObservableSource}s into a single sequence by subscribing to each inner {@code ObservableSource},
      * one after the other, one at a time and delays any errors till the all inner and the outer {@code ObservableSource}s terminate.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1722,7 +1722,7 @@ public static <T> Observable<T> concatEagerDelayError(@NonNull ObservableSource<
      * disposes the flow (making {@link ObservableEmitter#isDisposed} return {@code true}),
      * other observers subscribed to the same returned {@code Observable} are not affected.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/create.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/create.v3.png" alt="">
      * <p>
      * You should call the {@code ObservableEmitter}'s {@code onNext}, {@code onError} and {@code onComplete} methods in a serialized fashion. The
      * rest of its methods are thread-safe.
@@ -1752,7 +1752,7 @@ public static <T> Observable<T> create(@NonNull ObservableOnSubscribe<T> source)
      * that subscribes. That is, for each subscriber, the actual {@code ObservableSource} that subscriber observes is
      * determined by the factory function.
      * <p>
-     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defer.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defer.v3.png" alt="">
      * <p>
      * The {@code defer} operator allows you to defer or delay emitting items from an {@code ObservableSource} until such time as an
      * {@code Observer} subscribes to the {@code ObservableSource}. This allows an {@code Observer} to easily obtain updates or a
@@ -1783,7 +1783,7 @@ public static <T> Observable<T> defer(@NonNull Supplier<? extends ObservableSour
      * Returns an {@code Observable} that emits no items to the {@link Observer} and immediately invokes its
      * {@link Observer#onComplete onComplete} method.
      * <p>
-     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/empty.png" alt="">
+     * <img width="640" height="190" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/empty.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code empty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1887,7 +1887,7 @@ public static <T> Observable<T> fromAction(@NonNull Action action) {
     /**
      * Converts an array into an {@link ObservableSource} that emits the items in the array.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/from.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1920,7 +1920,7 @@ public static <T> Observable<T> fromArray(@NonNull T... items) {
      * Returns an {@code Observable} that, when an observer subscribes to it, invokes a function you specify and then
      * emits the value returned from that function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCallable.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCallable.v3.png" alt="">
      * <p>
      * This allows you to defer the execution of the function you specify until an observer subscribes to the
      * {@code Observable}. That is to say, it makes the function "lazy."
@@ -2059,7 +2059,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
     /**
      * Converts an {@link Iterable} sequence into an {@code Observable} that emits the items in the sequence.
      * <p>
-     * <img width="640" height="187" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromIterable.png" alt="">
+     * <img width="640" height="187" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromIterable.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromIterable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2201,7 +2201,7 @@ public static <T> Observable<T> fromSingle(@NonNull SingleSource<T> source) {
      * Returns an {@code Observable} that, when an observer subscribes to it, invokes a supplier function you specify and then
      * emits the value returned from that function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.fromSupplier.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.fromSupplier.v3.png" alt="">
      * <p>
      * This allows you to defer the execution of the function you specify until an observer subscribes to the
      * {@code Observable}. That is to say, it makes the function "lazy."
@@ -2238,7 +2238,7 @@ public static <T> Observable<T> fromSupplier(@NonNull Supplier<? extends T> supp
     /**
      * Returns a cold, synchronous and stateless generator of values.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.v3.png" alt="">
      * <p>
      * Note that the {@link Emitter#onNext}, {@link Emitter#onError} and
      * {@link Emitter#onComplete} methods provided to the function via the {@link Emitter} instance should be called synchronously,
@@ -2269,7 +2269,7 @@ public static <T> Observable<T> generate(@NonNull Consumer<Emitter<T>> generator
     /**
      * Returns a cold, synchronous and stateful generator of values.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.v3.png" alt="">
      * <p>
      * Note that the {@link Emitter#onNext}, {@link Emitter#onError} and
      * {@link Emitter#onComplete} methods provided to the function via the {@link Emitter} instance should be called synchronously,
@@ -2301,7 +2301,7 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
     /**
      * Returns a cold, synchronous and stateful generator of values.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.v3.png" alt="">
      * <p>
      * Note that the {@link Emitter#onNext}, {@link Emitter#onError} and
      * {@link Emitter#onComplete} methods provided to the function via the {@link Emitter} instance should be called synchronously,
@@ -2338,7 +2338,7 @@ public static <T, S> Observable<T> generate(
     /**
      * Returns a cold, synchronous and stateful generator of values.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.v3.png" alt="">
      * <p>
      * Note that the {@link Emitter#onNext}, {@link Emitter#onError} and
      * {@link Emitter#onComplete} methods provided to the function via the {@link Emitter} instance should be called synchronously,
@@ -2370,7 +2370,7 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
     /**
      * Returns a cold, synchronous and stateful generator of values.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/generate.2.v3.png" alt="">
      * <p>
      * Note that the {@link Emitter#onNext}, {@link Emitter#onError} and
      * {@link Emitter#onComplete} methods provided to the function via the {@link Emitter} instance should be called synchronously,
@@ -2409,7 +2409,7 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
      * Returns an {@code Observable} that emits a {@code 0L} after the {@code initialDelay} and ever increasing numbers
      * after each {@code period} of time thereafter.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.p.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.p.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code interval} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -2437,7 +2437,7 @@ public static Observable<Long> interval(long initialDelay, long period, @NonNull
      * Returns an {@code Observable} that emits a {@code 0L} after the {@code initialDelay} and ever increasing numbers
      * after each {@code period} of time thereafter, on a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.ps.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.ps.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -2469,7 +2469,7 @@ public static Observable<Long> interval(long initialDelay, long period, @NonNull
     /**
      * Returns an {@code Observable} that emits a sequential number every specified interval of time.
      * <p>
-     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.png" alt="">
+     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code interval} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -2494,7 +2494,7 @@ public static Observable<Long> interval(long period, @NonNull TimeUnit unit) {
      * Returns an {@code Observable} that emits a sequential number every specified interval of time, on a
      * specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.s.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/interval.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -2522,7 +2522,7 @@ public static Observable<Long> interval(long period, @NonNull TimeUnit unit, @No
      * <p>
      * The sequence completes immediately after the last value (start + count - 1) has been reached.
      * <p>
-     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/intervalRange.png" alt="">
+     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/intervalRange.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code intervalRange} by default operates on the {@link Schedulers#computation() computation} {@link Scheduler}.</dd>
@@ -2551,7 +2551,7 @@ public static Observable<Long> intervalRange(long start, long count, long initia
      * <p>
      * The sequence completes immediately after the last value (start + count - 1) has been reached.
      * <p>
-     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/intervalRange.s.png" alt="">     * <dl>
+     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/intervalRange.s.v3.png" alt="">     * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>you provide the {@link Scheduler}.</dd>
      * </dl>
@@ -2629,7 +2629,7 @@ public static <T> Observable<T> just(@NonNull T item) {
     /**
      * Converts two items into an {@code Observable} that emits those items.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.2.png" alt="">
+     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2658,7 +2658,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2) {
     /**
      * Converts three items into an {@code Observable} that emits those items.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.3.png" alt="">
+     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.3.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2690,7 +2690,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     /**
      * Converts four items into an {@code Observable} that emits those items.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.4.png" alt="">
+     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.4.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2725,7 +2725,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     /**
      * Converts five items into an {@code Observable} that emits those items.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.5.png" alt="">
+     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.5.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2764,7 +2764,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     /**
      * Converts six items into an {@code Observable} that emits those items.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.6.png" alt="">
+     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.6.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2806,7 +2806,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     /**
      * Converts seven items into an {@code Observable} that emits those items.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.7.png" alt="">
+     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.7.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2852,7 +2852,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     /**
      * Converts eight items into an {@code Observable} that emits those items.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.8.png" alt="">
+     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.8.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2901,7 +2901,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     /**
      * Converts nine items into an {@code Observable} that emits those items.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.9.png" alt="">
+     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.9.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2953,7 +2953,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     /**
      * Converts ten items into an {@code Observable} that emits those items.
      * <p>
-     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.10.png" alt="">
+     * <img width="640" height="186" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/just.10.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code just} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3010,7 +3010,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
      * Flattens an {@link Iterable} of {@link ObservableSource}s into one {@code Observable}, without any transformation, while limiting the
      * number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3058,7 +3058,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
      * Flattens an array of {@link ObservableSource}s into one {@code Observable}, without any transformation, while limiting the
      * number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3106,7 +3106,7 @@ public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @
     /**
      * Flattens an {@link Iterable} of {@link ObservableSource}s into one {@code Observable}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3148,7 +3148,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
      * Flattens an {@link Iterable} of {@link ObservableSource}s into one {@code Observable}, without any transformation, while limiting the
      * number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3194,7 +3194,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
      * Flattens an {@link ObservableSource} that emits {@code ObservableSource}s into a single {@code Observable} that emits the items emitted by
      * those {@code ObservableSource}s, without any transformation.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3238,7 +3238,7 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
      * those {@code ObservableSource}s, without any transformation, while limiting the maximum number of concurrent
      * subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.oo.v3.png" alt="">
      * <p>
      * You can combine the items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3286,7 +3286,7 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
     /**
      * Flattens two {@link ObservableSource}s into a single {@code Observable}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3331,7 +3331,7 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends T> sou
     /**
      * Flattens three {@link ObservableSource}s into a single {@code Observable}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3381,7 +3381,7 @@ public static <T> Observable<T> merge(
     /**
      * Flattens four {@link ObservableSource}s into a single {@code Observable}, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3434,7 +3434,7 @@ public static <T> Observable<T> merge(
     /**
      * Flattens an array of {@link ObservableSource}s into one {@code Observable}, without any transformation.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.io.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.io.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code merge} method.
@@ -3482,7 +3482,7 @@ public static <T> Observable<T> mergeArray(@NonNull ObservableSource<? extends T
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3515,7 +3515,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? ext
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3553,7 +3553,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? ext
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3592,7 +3592,7 @@ public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int buf
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3628,7 +3628,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? ext
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3663,7 +3663,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3702,7 +3702,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
      * notify of an error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from
      * propagating that error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if both merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3741,7 +3741,7 @@ public static <T> Observable<T> mergeDelayError(
      * from propagating that error notification until all of the merged {@code ObservableSource}s have finished emitting
      * items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3784,7 +3784,7 @@ public static <T> Observable<T> mergeDelayError(
      * will refrain from propagating that error notification until all of the merged {@code ObservableSource}s have finished
      * emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3829,7 +3829,7 @@ public static <T> Observable<T> mergeDelayError(
      * error via {@link Observer#onError onError}, {@code mergeDelayError} will refrain from propagating that
      * error notification until all of the merged {@code ObservableSource}s have finished emitting items.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeDelayError.v3.png" alt="">
      * <p>
      * Even if multiple merged {@code ObservableSource}s send {@code onError} notifications, {@code mergeDelayError} will only
      * invoke the {@code onError} method of its {@code Observer}s once.
@@ -3857,7 +3857,7 @@ public static <T> Observable<T> mergeArrayDelayError(@NonNull ObservableSource<?
     /**
      * Returns an {@code Observable} that never sends any items or notifications to an {@link Observer}.
      * <p>
-     * <img width="640" height="185" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/never.png" alt="">
+     * <img width="640" height="185" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/never.v3.png" alt="">
      * <p>
      * The returned {@code Observable} is useful primarily for testing purposes.
      * <dl>
@@ -3881,7 +3881,7 @@ public static <T> Observable<T> never() {
     /**
      * Returns an {@code Observable} that emits a sequence of {@link Integer}s within a specified range.
      * <p>
-     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/range.png" alt="">
+     * <img width="640" height="195" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/range.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code range} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3966,7 +3966,7 @@ public static Observable<Long> rangeLong(long start, long count) {
      * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link ObservableSource} sequences are the
      * same by comparing the items emitted by each {@code ObservableSource} pairwise.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3994,7 +3994,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
      * same by comparing the items emitted by each {@code ObservableSource} pairwise based on the results of a specified
      * equality function.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4026,7 +4026,7 @@ public static <T> Single<Boolean> sequenceEqual(
      * same by comparing the items emitted by each {@code ObservableSource} pairwise based on the results of a specified
      * equality function.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4064,7 +4064,7 @@ public static <T> Single<Boolean> sequenceEqual(
      * Returns a {@link Single} that emits a {@link Boolean} value that indicates whether two {@link ObservableSource} sequences are the
      * same by comparing the items emitted by each {@code ObservableSource} pairwise.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sequenceEqual.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4095,7 +4095,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
      * Converts an {@link ObservableSource} that emits {@code ObservableSource}s into an {@code Observable} that emits the items emitted by the
      * most recently emitted of those {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.v3.png" alt="">
      * <p>
      * {@code switchOnNext} subscribes to an {@code ObservableSource} that emits {@code ObservableSource}s. Each time it observes one of
      * these emitted {@code ObservableSource}s, the {@code ObservableSource} returned by {@code switchOnNext} begins emitting the items
@@ -4133,7 +4133,7 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
      * Converts an {@link ObservableSource} that emits {@code ObservableSource}s into an {@code Observable} that emits the items emitted by the
      * most recently emitted of those {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchDo.v3.png" alt="">
      * <p>
      * {@code switchOnNext} subscribes to an {@code ObservableSource} that emits {@code ObservableSource}s. Each time it observes one of
      * these emitted {@code ObservableSource}s, the {@code ObservableSource} returned by {@code switchOnNext} begins emitting the items
@@ -4165,7 +4165,7 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
      * Converts an {@link ObservableSource} that emits {@code ObservableSource}s into an {@code Observable} that emits the items emitted by the
      * most recently emitted of those {@code ObservableSource}s and delays any exception until all {@code ObservableSource}s terminate.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchOnNextDelayError.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchOnNextDelayError.v3.png" alt="">
      * <p>
      * {@code switchOnNext} subscribes to an {@code ObservableSource} that emits {@code ObservableSource}s. Each time it observes one of
      * these emitted {@code ObservableSource}s, the {@code ObservableSource} returned by {@code switchOnNext} begins emitting the items
@@ -4199,7 +4199,7 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
      * Converts an {@link ObservableSource} that emits {@code ObservableSource}s into an {@code Observable} that emits the items emitted by the
      * most recently emitted of those {@code ObservableSource}s and delays any exception until all {@code ObservableSource}s terminate.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchOnNextDelayError.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchOnNextDelayError.v3.png" alt="">
      * <p>
      * {@code switchOnNext} subscribes to an {@code ObservableSource} that emits {@code ObservableSource}s. Each time it observes one of
      * these emitted {@code ObservableSource}s, the {@code ObservableSource} returned by {@code switchOnNext} begins emitting the items
@@ -4238,7 +4238,7 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
     /**
      * Returns an {@code Observable} that emits {@code 0L} after a specified delay, and then completes.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timer} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -4263,7 +4263,7 @@ public static Observable<Long> timer(long delay, @NonNull TimeUnit unit) {
      * Returns an {@code Observable} that emits {@code 0L} after a specified delay, on a specified {@link Scheduler}, and then
      * completes.
      * <p>
-     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.s.png" alt="">
+     * <img width="640" height="200" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timer.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -4322,7 +4322,7 @@ public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubs
      * that resource and calls the provided {@code resourceDisposer} function if this inner source terminates or the
      * downstream disposes the flow.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4355,7 +4355,7 @@ public static <T, D> Observable<T> using(
      * that resource and calls the provided {@code disposer} function if this inner source terminates or the
      * downstream disposes the flow; doing it before these end-states have been reached if {@code eager == true}, after otherwise.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/using.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4445,7 +4445,7 @@ public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
      * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4500,7 +4500,7 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends Obse
      * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zipIterable.o.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zipIterable.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4539,7 +4539,7 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends Obse
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * two items emitted, in sequence, by two other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
@@ -4596,7 +4596,7 @@ public static <T1, T2, R> Observable<R> zip(
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * two items emitted, in sequence, by two other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
@@ -4654,7 +4654,7 @@ public static <T1, T2, R> Observable<R> zip(
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * two items emitted, in sequence, by two other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1} and the first item
@@ -4714,7 +4714,7 @@ public static <T1, T2, R> Observable<R> zip(
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * three items emitted, in sequence, by three other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
@@ -4777,7 +4777,7 @@ public static <T1, T2, T3, R> Observable<R> zip(
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * four items emitted, in sequence, by four other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
@@ -4845,7 +4845,7 @@ public static <T1, T2, T3, T4, R> Observable<R> zip(
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * five items emitted, in sequence, by five other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by {@code o1}, the first item
@@ -4917,7 +4917,7 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * six items emitted, in sequence, by six other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by each source {@code ObservableSource}, the
@@ -4992,7 +4992,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * seven items emitted, in sequence, by seven other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by each source {@code ObservableSource}, the
@@ -5073,7 +5073,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * eight items emitted, in sequence, by eight other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by each source {@code ObservableSource}, the
@@ -5158,7 +5158,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
      * Returns an {@code Observable} that emits the results of a specified combiner function applied to combinations of
      * nine items emitted, in sequence, by nine other {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * {@code zip} applies this function in strict sequence, so the first item emitted by the resulting {@code Observable}
      * will be the result of the function applied to the first item emitted by each source {@code ObservableSource}, the
@@ -5273,7 +5273,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
      * {@code Function<Integer[], R>} passed to the method would trigger a {@link ClassCastException}.
      *
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zipArray.o.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zipArray.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code zipArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5344,7 +5344,7 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
      * Mirrors the current {@code Observable} or the other {@link ObservableSource} provided of which the first either emits an item or sends a termination
      * notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ambWith.o.png" alt="">
+     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ambWith.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5370,7 +5370,7 @@ public final Observable<T> ambWith(@NonNull ObservableSource<? extends T> other)
      * specified condition, otherwise {@code false}. <em>Note:</em> this always emits {@code false} if the
      * current {@code Observable} is empty.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/any.2.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/any.2.v3.png" alt="">
      * <p>
      * In Rx.Net this is the {@code any} {@link Observer} but we renamed it in RxJava to better match Java naming
      * idioms.
@@ -5462,7 +5462,7 @@ public final T blockingFirst(@NonNull T defaultItem) {
      * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
-     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingForEach.o.png" alt="">
+     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingForEach.o.v3.png" alt="">
      * <p>
      * <em>Note:</em> the method will only return if the upstream terminates or the current
      * thread is interrupted.
@@ -5499,7 +5499,7 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
      * {@link Consumer} with each upstream item on the <em>current thread</em> until the
      * upstream terminates.
      * <p>
-     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingForEach.o.png" alt="">
+     * <img width="640" height="330" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingForEach.o.v3.png" alt="">
      * <p>
      * <em>Note:</em> the method will only return if the upstream terminates or the current
      * thread is interrupted.
@@ -5549,7 +5549,7 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext, int capac
      * subscribes to the current {@code Observable} and blocks
      * until the current {@code Observable} emits items or terminates.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingIterable.o.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingIterable.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingIterable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5570,7 +5570,7 @@ public final Iterable<T> blockingIterable() {
      * subscribes to the current {@code Observable} and blocks
      * until the current {@code Observable} emits items or terminates.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingIterable.o.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingIterable.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingIterable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5593,7 +5593,7 @@ public final Iterable<T> blockingIterable(int capacityHint) {
      * Returns the last item emitted by the current {@code Observable}, or throws
      * {@link NoSuchElementException} if the current {@code Observable} emits no items.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingLast.o.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingLast.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingLast} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5625,7 +5625,7 @@ public final T blockingLast() {
      * Returns the last item emitted by the current {@code Observable}, or a default value if it emits no
      * items.
      * <p>
-     * <img width="640" height="310" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingLastDefault.o.png" alt="">
+     * <img width="640" height="310" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingLastDefault.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingLast} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5683,7 +5683,7 @@ public final Iterable<T> blockingLatest() {
      * Returns an {@link Iterable} that always returns the item most recently emitted by the current
      * {@code Observable}.
      * <p>
-     * <img width="640" height="426" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingMostRecent.o.png" alt="">
+     * <img width="640" height="426" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingMostRecent.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingMostRecent} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5708,7 +5708,7 @@ public final Iterable<T> blockingMostRecent(@NonNull T initialItem) {
      * Returns an {@link Iterable} that blocks until the current {@code Observable} emits another item, then
      * returns that item.
      * <p>
-     * <img width="640" height="427" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingNext.o.png" alt="">
+     * <img width="640" height="427" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingNext.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingNext} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5728,7 +5728,7 @@ public final Iterable<T> blockingNext() {
      * If the current {@code Observable} completes after emitting a single item, return that item, otherwise
      * throw a {@link NoSuchElementException}.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingSingle.o.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingSingle.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5757,7 +5757,7 @@ public final T blockingSingle() {
      * more than one item, throw an {@link IllegalArgumentException}; if it emits no items, return a default
      * value.
      * <p>
-     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingSingleDefault.o.png" alt="">
+     * <img width="640" height="315" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/blockingSingleDefault.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code blockingSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5935,7 +5935,7 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
      * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5961,7 +5961,7 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
      * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5991,7 +5991,7 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
      * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer4.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6029,7 +6029,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer3.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6061,7 +6061,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * from the current {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification
      * the event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -6093,7 +6093,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * {@code Observable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6127,7 +6127,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * {@code Observable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer7.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6167,7 +6167,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * {@code Observable} issues an {@code onError} notification the event is passed on immediately without first emitting the
      * buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -6198,7 +6198,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * {@code onError} notification the event is passed on immediately without first emitting the buffer it is in the process of
      * assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -6232,7 +6232,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * that if the current {@code Observable} issues an {@code onError} notification the event is passed on immediately without
      * first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6268,7 +6268,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * that if the current {@code Observable} issues an {@code onError} notification the event is passed on immediately without
      * first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer6.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6317,7 +6317,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * {@code Observable}. Note that if the current {@code Observable} issues an {@code onError} notification the event is passed on
      * immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.s.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer5.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -6348,7 +6348,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * current {@code Observable}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the
      * event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
+     * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6381,7 +6381,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * current {@code Observable}, {@code openingIndicator} or {@code closingIndicator} issues an {@code onError} notification the
      * event is passed on immediately without first emitting the buffer it is in the process of assembling.
      * <p>
-     * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.png" alt="">
+     * <img width="640" height="470" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code buffer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6419,7 +6419,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * Returns an {@code Observable} that emits non-overlapping buffered items from the current {@code Observable} each time the
      * specified boundary {@link ObservableSource} emits an item.
      * <p>
-     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
+     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.v3.png" alt="">
      * <p>
      * Completion of either the source or the boundary {@code ObservableSource} causes the returned {@code ObservableSource} to emit the
      * latest buffer and complete. If either the current {@code Observable} or the boundary {@code ObservableSource} issues an
@@ -6450,7 +6450,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * Returns an {@code Observable} that emits non-overlapping buffered items from the current {@code Observable} each time the
      * specified boundary {@link ObservableSource} emits an item.
      * <p>
-     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
+     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.v3.png" alt="">
      * <p>
      * Completion of either the source or the boundary {@code ObservableSource} causes the returned {@code ObservableSource} to emit the
      * latest buffer and complete. If either the current {@code Observable} or the boundary {@code ObservableSource} issues an
@@ -6485,7 +6485,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * Returns an {@code Observable} that emits non-overlapping buffered items from the current {@code Observable} each time the
      * specified boundary {@link ObservableSource} emits an item.
      * <p>
-     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.png" alt="">
+     * <img width="640" height="395" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/buffer8.v3.png" alt="">
      * <p>
      * Completion of either the source or the boundary {@code ObservableSource} causes the returned {@code ObservableSource} to emit the
      * latest buffer and complete. If either the current {@code Observable} or the boundary {@code ObservableSource} issues an
@@ -6522,7 +6522,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
      * Returns an {@code Observable} that subscribes to the current {@code Observable} lazily, caches all of its events
      * and replays them, in the same order as received, to all the downstream observers.
      * <p>
-     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.png" alt="">
+     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cache.v3.png" alt="">
      * <p>
      * This is useful when you want an {@code Observable} to cache responses and you can't control the
      * subscribe/dispose behavior of all the {@link Observer}s.
@@ -6578,7 +6578,7 @@ public final Observable<T> cache() {
      * Returns an {@code Observable} that subscribes to the current {@code Observable} lazily, caches all of its events
      * and replays them, in the same order as received, to all the downstream observers.
      * <p>
-     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cacheWithInitialCapacity.o.png" alt="">
+     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cacheWithInitialCapacity.o.v3.png" alt="">
      * <p>
      * This is useful when you want an {@code Observable} to cache responses and you can't control the
      * subscribe/dispose behavior of all the {@link Observer}s.
@@ -6640,7 +6640,7 @@ public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
      * Returns an {@code Observable} that emits the items emitted by the current {@code Observable}, converted to the specified
      * type.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cast.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cast.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code cast} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -6666,7 +6666,7 @@ public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
      * Collects items emitted by the finite source {@code Observable} into a single mutable data structure and returns
      * a {@link Single} that emits this structure.
      * <p>
-     * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collect.2.png" alt="">
+     * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collect.2.v3.png" alt="">
      * <p>
      * This is a simplified version of {@code reduce} that does not need to return the state on each pass.
      * <p>
@@ -6701,7 +6701,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
      * Collects items emitted by the finite source {@code Observable} into a single mutable data structure and returns
      * a {@link Single} that emits this structure.
      * <p>
-     * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collectInto.o.png" alt="">
+     * <img width="640" height="330" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/collectInto.o.v3.png" alt="">
      * <p>
      * This is a simplified version of {@code reduce} that does not need to return the state on each pass.
      * <p>
@@ -6764,7 +6764,7 @@ public final <R> Observable<R> compose(@NonNull ObservableTransformer<? super T,
      * emitted by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then emitting the items
      * that result from concatenating those returned {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <p>
      * Note that there is no guarantee where the given {@code mapper} function will be executed; it could be on the subscribing thread,
      * on the upstream thread signaling the new item to be mapped or on the thread where the inner source terminates. To ensure
@@ -6795,7 +6795,7 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
      * emitted by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then emitting the items
      * that result from concatenating those returned {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <p>
      * Note that there is no guarantee where the given {@code mapper} function will be executed; it could be on the subscribing thread,
      * on the upstream thread signaling the new item to be mapped or on the thread where the inner source terminates. To ensure
@@ -6839,7 +6839,7 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
      * emitted by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then emitting the items
      * that result from concatenating those returned {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <p>
      * The difference between {@link #concatMap(Function, int)} and this operator is that this operator guarantees the {@code mapper}
      * function is executed on the specified scheduler.
@@ -7174,7 +7174,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
      * other terminates, delaying all errors till both the current {@code Observable} and all
      * inner {@code CompletableSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletableDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7200,7 +7200,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, optionally delaying all errors till both the current {@code Observable} and all
      * inner {@code CompletableSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletableDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7232,7 +7232,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, optionally delaying all errors till both the current {@code Observable} and all
      * inner {@code CompletableSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapCompletableDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7297,7 +7297,7 @@ public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ?
      * other succeeds or completes, emits their success value if available or terminates immediately if
      * either the current {@code Observable} or the current inner {@code MaybeSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7325,7 +7325,7 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
      * other succeeds or completes, emits their success value if available or terminates immediately if
      * either the current {@code Observable} or the current inner {@code MaybeSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7358,7 +7358,7 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
      * other terminates, emits their success value if available and delaying all errors
      * till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7386,7 +7386,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
      * other terminates, emits their success value if available and optionally delaying all errors
      * till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7420,7 +7420,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
      * other terminates, emits their success value if available and optionally delaying all errors
      * till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7458,7 +7458,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
      * other succeeds, emits their success values or terminates immediately if
      * either the current {@code Observable} or the current inner {@code SingleSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7486,7 +7486,7 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
      * other succeeds, emits their success values or terminates immediately if
      * either the current {@code Observable} or the current inner {@code SingleSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7519,7 +7519,7 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
      * other succeeds or fails, emits their success values and delays all errors
      * till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7547,7 +7547,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
      * other succeeds or fails, emits their success values and optionally delays all errors
      * till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7581,7 +7581,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
      * other succeeds or fails, emits their success values and optionally delays  errors
      * till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7618,7 +7618,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
      * Returns an {@code Observable} that first emits the items emitted from the current {@code Observable}, then items
      * from the {@code other} {@link ObservableSource} without interleaving them.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7642,7 +7642,7 @@ public final Observable<T> concatWith(@NonNull ObservableSource<? extends T> oth
      * Returns an {@code Observable} that emits the items from the current {@code Observable} followed by the success item or error event
      * of the {@code other} {@link SingleSource}.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7665,7 +7665,7 @@ public final Observable<T> concatWith(@NonNull SingleSource<? extends T> other)
      * Returns an {@code Observable} that emits the items from the current {@code Observable} followed by the success item or terminal events
      * of the other {@link MaybeSource}.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7688,7 +7688,7 @@ public final Observable<T> concatWith(@NonNull MaybeSource<? extends T> other) {
      * Returns an {@code Observable} that emits items from the current {@code Observable} and when it completes normally, the
      * other {@link CompletableSource} is subscribed to and the returned {@code Observable} emits its terminal events.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7711,7 +7711,7 @@ public final Observable<T> concatWith(@NonNull CompletableSource other) {
      * Returns a {@link Single} that emits a {@link Boolean} that indicates whether the current {@code Observable} emitted a
      * specified item.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/contains.2.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/contains.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code contains} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7735,7 +7735,7 @@ public final Single<Boolean> contains(@NonNull Object item) {
      * Returns a {@link Single} that counts the total number of items emitted by the current {@code Observable} and emits
      * this count as a 64-bit {@link Long}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/count.2.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/count.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code count} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7756,7 +7756,7 @@ public final Single<Long> count() {
      * current {@code Observable} that are followed by another item within a computed debounce duration
      * denoted by an item emission or completion from a generated inner {@link ObservableSource} for that original item.
      * <p>
-     * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.f.png" alt="">
+     * <img width="640" height="425" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.f.v3.png" alt="">
      * <p>
      * The delivery of the item happens on the thread of the first {@code onNext} or {@code onComplete}
      * signal of the generated {@code ObservableSource} sequence,
@@ -7794,7 +7794,7 @@ public final <U> Observable<T> debounce(@NonNull Function<? super T, ? extends O
      * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
      * will be emitted by the resulting {@code Observable}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.v3.png" alt="">
      * <p>
      * Delivery of the item after the grace period happens on the {@code computation} {@link Scheduler}'s
      * {@code Worker} which if takes too long, a newer item may arrive from the upstream, causing the
@@ -7833,7 +7833,7 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit) {
      * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
      * will be emitted by the resulting {@code Observable}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.s.v3.png" alt="">
      * <p>
      * Delivery of the item after the grace period happens on the given {@code Scheduler}'s
      * {@code Worker} which if takes too long, a newer item may arrive from the upstream, causing the
@@ -7872,7 +7872,7 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNu
      * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} or a specified default item
      * if the current {@code Observable} is empty.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/defaultIfEmpty.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code defaultIfEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7896,7 +7896,7 @@ public final Observable<T> defaultIfEmpty(@NonNull T defaultItem) {
      * Returns an {@code Observable} that delays the emissions of the current {@code Observable} via
      * a per-item derived {@link ObservableSource}'s item emission or termination, on a per source item basis.
      * <p>
-     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.o.png" alt="">
+     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.o.v3.png" alt="">
      * <p>
      * <em>Note:</em> the resulting {@code Observable} will immediately propagate any {@code onError} notification
      * from the current {@code Observable}.
@@ -7927,7 +7927,7 @@ public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends Obse
      * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} shifted forward in time by a
      * specified delay. An error notification from the current {@code Observable} is not delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -7954,7 +7954,7 @@ public final Observable<T> delay(long time, @NonNull TimeUnit unit) {
      * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} shifted forward in time by a
      * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -7983,7 +7983,7 @@ public final Observable<T> delay(long time, @NonNull TimeUnit unit, boolean dela
      * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} shifted forward in time by a
      * specified delay. An error notification from the current {@code Observable} is not delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -8010,7 +8010,7 @@ public final Observable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Sch
      * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} shifted forward in time by a
      * specified delay. If {@code delayError} is {@code true}, error notifications will also be delayed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -8043,7 +8043,7 @@ public final Observable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Sch
      * Returns an {@code Observable} that delays the subscription to and emissions from the current {@code Observable} via
      * {@link ObservableSource}s for the subscription itself and on a per-item basis.
      * <p>
-     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.oo.png" alt="">
+     * <img width="640" height="450" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delay.oo.v3.png" alt="">
      * <p>
      * <em>Note:</em> the resulting {@code Observable} will immediately propagate any {@code onError} notification
      * from the current {@code Observable}.
@@ -8079,7 +8079,7 @@ public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptio
      * Returns an {@code Observable} that delays the subscription to the current {@code Observable}
      * until the other {@link ObservableSource} emits an element or completes normally.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.o.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This method does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8103,7 +8103,7 @@ public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> su
     /**
      * Returns an {@code Observable} that delays the subscription to the current {@code Observable} by a given amount of time.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code delaySubscription} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -8128,7 +8128,7 @@ public final Observable<T> delaySubscription(long time, @NonNull TimeUnit unit)
      * Returns an {@code Observable} that delays the subscription to the current {@code Observable} by a given amount of time,
      * both waiting and subscribing on a given {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/delaySubscription.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -8156,7 +8156,7 @@ public final Observable<T> delaySubscription(long time, @NonNull TimeUnit unit,
      * {@link Notification} objects extracted from the source items via a selector function
      * into their respective {@link Observer} signal types.
      * <p>
-     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/dematerialize.png" alt="">
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/dematerialize.v3.png" alt="">
      * <p>
      * The intended use of the {@code selector} function is to perform a
      * type-safe identity mapping (see example) on a source that is already of type
@@ -8210,7 +8210,7 @@ public final <R> Observable<R> dematerialize(@NonNull Function<? super T, Notifi
      * Returns an {@code Observable} that emits all items emitted by the current {@code Observable} that are distinct
      * based on {@link Object#equals(Object)} comparison.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.v3.png" alt="">
      * <p>
      * It is recommended the elements' class {@code T} in the flow overrides the default {@code Object.equals()}
      * and {@link Object#hashCode()} to provide meaningful comparison between items as the default Java
@@ -8248,7 +8248,7 @@ public final Observable<T> distinct() {
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.key.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.key.v3.png" alt="">
      * <p>
      * It is recommended the keys' class {@code K} overrides the default {@code Object.equals()}
      * and {@link Object#hashCode()} to provide meaningful comparison between the key objects as the default
@@ -8290,7 +8290,7 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
      * to a key selector function and based on {@link Object#equals(Object)} comparison of the objects
      * returned by the key selector function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.key.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinct.key.v3.png" alt="">
      * <p>
      * It is recommended the keys' class {@code K} overrides the default {@code Object.equals()}
      * and {@link Object#hashCode()}  to provide meaningful comparison between the key objects as
@@ -8324,7 +8324,7 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
      * Returns an {@code Observable} that emits all items emitted by the current {@code Observable} that are distinct from their
      * immediate predecessors based on {@link Object#equals(Object)} comparison.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.v3.png" alt="">
      * <p>
      * It is recommended the elements' class {@code T} in the flow overrides the default {@code Object.equals()} to provide
      * meaningful comparison between items as the default Java implementation only considers reference equivalence.
@@ -8362,7 +8362,7 @@ public final Observable<T> distinctUntilChanged() {
      * immediate predecessors, according to a key selector function and based on {@link Object#equals(Object)} comparison
      * of those objects returned by the key selector function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.key.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.key.v3.png" alt="">
      * <p>
      * It is recommended the keys' class {@code K} overrides the default {@code Object.equals()} to provide
      * meaningful comparison between the key objects as the default Java implementation only considers reference equivalence.
@@ -8405,7 +8405,7 @@ public final <K> Observable<T> distinctUntilChanged(@NonNull Function<? super T,
      * Returns an {@code Observable} that emits all items emitted by the current {@code Observable} that are distinct from their
      * immediate predecessors when compared with each other via the provided comparator function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/distinctUntilChanged.v3.png" alt="">
      * <p>
      * Note that the operator always retains the latest item from upstream regardless of the comparison result
      * and uses it in the next comparison with the next upstream item.
@@ -8442,7 +8442,7 @@ public final Observable<T> distinctUntilChanged(@NonNull BiPredicate<? super T,
      * Note that the {@code onAfterNext} action is shared between subscriptions and as such
      * should be thread-safe.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doAfterNext.o.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doAfterNext.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterNext} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8467,7 +8467,7 @@ public final Observable<T> doAfterNext(@NonNull Consumer<? super T> onAfterNext)
      * Registers an {@link Action} to be called when the current {@code Observable} invokes either
      * {@link Observer#onComplete onComplete} or {@link Observer#onError onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doAfterTerminate.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doAfterTerminate.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doAfterTerminate} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8526,7 +8526,7 @@ public final Observable<T> doFinally(@NonNull Action onFinally) {
      * If the action throws a runtime exception, that exception is rethrown by the {@code dispose()} call,
      * sometimes as a {@link CompositeException} if there were multiple exceptions along the way.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnDispose.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnDispose.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnDispose} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8548,7 +8548,7 @@ public final Observable<T> doOnDispose(@NonNull Action onDispose) {
     /**
      * Returns an {@code Observable} that invokes an {@link Action} when the current {@code Observable} calls {@code onComplete}.
      * <p>
-     * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.o.png" alt="">
+     * <img width="640" height="358" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnComplete.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnComplete} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8571,7 +8571,7 @@ public final Observable<T> doOnComplete(@NonNull Action onComplete) {
      * Calls the appropriate {@code onXXX} consumer (shared between all {@link Observer}s) whenever a signal with the same type
      * passes through, before forwarding them to the downstream.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8596,7 +8596,7 @@ private Observable<T> doOnEach(@NonNull Consumer<? super T> onNext, @NonNull Con
      * Returns an {@code Observable} that invokes a {@link Consumer} with the appropriate {@link Notification}
      * object when the current {@code Observable} signals an item or terminates.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8630,7 +8630,7 @@ public final Observable<T> doOnEach(@NonNull Consumer<? super Notification<T>> o
      * {@code onNext} or the {@code onComplete} method of the supplied observer throws, the downstream will be
      * terminated and will receive this thrown exception.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.o.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnEach.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8662,7 +8662,7 @@ public final Observable<T> doOnEach(@NonNull Observer<? super T> observer) {
      * In case the {@code onError} action throws, the downstream will receive a composite exception containing
      * the original exception and the exception thrown by {@code onError}.
      * <p>
-     * <img width="640" height="355" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnError.o.png" alt="">
+     * <img width="640" height="355" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnError.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8685,7 +8685,7 @@ public final Observable<T> doOnError(@NonNull Consumer<? super Throwable> onErro
      * Calls the appropriate {@code onXXX} method (shared between all {@link Observer}s) for the lifecycle events of
      * the sequence (subscription, disposal).
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnLifecycle.o.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnLifecycle.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnLifecycle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8711,7 +8711,7 @@ public final Observable<T> doOnLifecycle(@NonNull Consumer<? super Disposable> o
     /**
      * Calls the given {@link Consumer} with the value emitted by the current {@code Observable} before forwarding it to the downstream.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.o.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnNext.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnNext} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8736,7 +8736,7 @@ public final Observable<T> doOnNext(@NonNull Consumer<? super T> onNext) {
      * current {@code Observable} is reference counted, in which case the current {@code Observable} will invoke
      * the given action for the first subscription.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSubscribe.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnSubscribe.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnSubscribe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8873,7 +8873,7 @@ public final Single<T> elementAtOrError(long index) {
     /**
      * Filters items emitted by the current {@code Observable} by only emitting those that satisfy a specified {@link Predicate}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/filter.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code filter} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -8962,7 +8962,7 @@ public final Single<T> firstOrError() {
      * by the current {@code Observable}, where that function returns an {@link ObservableSource}, and then merging those returned
      * {@code ObservableSource}s and emitting the results of this merger.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9098,7 +9098,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * Returns an {@code Observable} that applies a function to each item emitted or notification raised by the current
      * {@code Observable} and then flattens the {@link ObservableSource}s returned from these functions and emits the resulting items.
      * <p>
-     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt="">
+     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9136,7 +9136,7 @@ public final <R> Observable<R> flatMap(
      * {@code Observable} and then flattens the {@link ObservableSource}s returned from these functions and emits the resulting items,
      * while limiting the maximum number of concurrent subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.png" alt="">
+     * <img width="640" height="410" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.nce.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9209,7 +9209,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
      * Returns an {@code Observable} that emits the results of a specified function to the pair of values emitted by the
      * current {@code Observable} and the mapped inner {@link ObservableSource}.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9240,7 +9240,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * Returns an {@code Observable} that emits the results of a specified function to the pair of values emitted by the
      * current {@code Observable} and the mapped inner {@link ObservableSource}.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9275,7 +9275,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * current {@code Observable} and the mapped inner {@link ObservableSource}, while limiting the maximum number of concurrent
      * subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9314,7 +9314,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * current {@code Observable} and the mapped inner {@link ObservableSource}, while limiting the maximum number of concurrent
      * subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9357,7 +9357,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
      * current {@code Observable} and the mapped inner {@link ObservableSource}, while limiting the maximum number of concurrent
      * subscriptions to these {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.png" alt="">
+     * <img width="640" height="390" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/mergeMap.r.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9498,7 +9498,7 @@ public final <U, V> Observable<V> flatMapIterable(@NonNull Function<? super T, ?
      * Maps each element of the current {@code Observable} into {@link MaybeSource}s, subscribes to all of them
      * and merges their {@code onSuccess} values, in no particular order, into a single {@code Observable} sequence.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9520,7 +9520,7 @@ public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? exten
      * and merges their {@code onSuccess} values, in no particular order, into a single {@code Observable} sequence,
      * optionally delaying all errors.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9544,7 +9544,7 @@ public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? exten
      * Maps each element of the current {@code Observable} into {@link SingleSource}s, subscribes to all of them
      * and merges their {@code onSuccess} values, in no particular order, into a single {@code Observable} sequence.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapSingle.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapSingle.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9566,7 +9566,7 @@ public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? exte
      * and merges their {@code onSuccess} values, in no particular order, into a single {@code Observable} sequence,
      * optionally delaying all errors.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapSingle.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapSingle.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code flatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -9706,7 +9706,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
      * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedObservable}s.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
      * lifetime and if this {@code Observer} calls {@code dispose()} before the
@@ -9748,7 +9748,7 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
      * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedObservable}s.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
      * lifetime and if this {@code Observer} calls {@code dispose()} before the
@@ -9793,7 +9793,7 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
      * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedObservable}s.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
      * lifetime and if this {@code Observer} calls {@code dispose()} before the
@@ -9839,7 +9839,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedObservable}s.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
      * lifetime and if this {@code Observer} calls {@code dispose()} before the
@@ -9888,7 +9888,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * Groups the items emitted by the current {@code Observable} according to a specified criterion, and emits these
      * grouped items as {@link GroupedObservable}s.
      * <p>
-     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.png" alt="">
+     * <img width="640" height="360" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupBy.v3.png" alt="">
      * <p>
      * Each emitted {@code GroupedObservable} allows only a single {@link Observer} to subscribe to it during its
      * lifetime and if this {@code Observer} calls {@code dispose()} before the
@@ -9947,7 +9947,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
      * There are no guarantees in what order the items get combined when multiple
      * items from one or both source {@code ObservableSource}s overlap.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupJoin.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/groupJoin.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code groupJoin} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10015,7 +10015,7 @@ public final Observable<T> hide() {
     /**
      * Ignores all items emitted by the current {@code Observable} and only calls {@code onComplete} or {@code onError}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ignoreElements.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ignoreElements.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ignoreElements} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10037,7 +10037,7 @@ public final Completable ignoreElements() {
      * In Rx.Net this is negated as the {@code any} {@link Observer} but we renamed this in RxJava to better match Java
      * naming idioms.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.2.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/isEmpty.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code isEmpty} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10059,7 +10059,7 @@ public final Single<Boolean> isEmpty() {
      * There are no guarantees in what order the items get combined when multiple
      * items from one or both source {@code ObservableSource}s overlap.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/join_.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/join_.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code join} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10105,7 +10105,7 @@ public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> join(
      * Returns a {@link Maybe} that emits the last item emitted by the current {@code Observable} or
      * completes if the current {@code Observable} is empty.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastElement.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/lastElement.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code lastElement} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10125,7 +10125,7 @@ public final Maybe<T> lastElement() {
      * Returns a {@link Single} that emits only the last item emitted by the current {@code Observable}, or a default item
      * if the current {@code Observable} completes without emitting any items.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/last.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/last.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code last} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10320,7 +10320,7 @@ public final <R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? s
      * Returns an {@code Observable} that applies a specified function to each item emitted by the current {@code Observable} and
      * emits the results of these function applications.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/map.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/map.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10345,7 +10345,7 @@ public final <R> Observable<R> map(@NonNull Function<? super T, ? extends R> map
      * Returns an {@code Observable} that represents all of the emissions <em>and</em> notifications from the current
      * {@code Observable} into emissions marked with their original types within {@link Notification} objects.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10365,7 +10365,7 @@ public final Observable<Notification<T>> materialize() {
     /**
      * Flattens the current {@code Observable} and another {@link ObservableSource} into a single {@code Observable} sequence, without any transformation.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code ObservableSource}s so that they appear as a single {@code ObservableSource}, by
      * using the {@code mergeWith} method.
@@ -10391,7 +10391,7 @@ public final Observable<T> mergeWith(@NonNull ObservableSource<? extends T> othe
     /**
      * Merges the sequence of items of the current {@code Observable} with the success value of the other {@link SingleSource}.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * The success value of the other {@code SingleSource} can get interleaved at any point of the current
      * {@code Observable} sequence.
@@ -10417,7 +10417,7 @@ public final Observable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
      * Merges the sequence of items of the current {@code Observable} with the success value of the other {@link MaybeSource}
      * or waits both to complete normally if the {@code MaybeSource} is empty.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <p>
      * The success value of the other {@code MaybeSource} can get interleaved at any point of the current
      * {@code Observable} sequence.
@@ -10443,7 +10443,7 @@ public final Observable<T> mergeWith(@NonNull MaybeSource<? extends T> other) {
      * Relays the items of the current {@code Observable} and completes only when the other {@link CompletableSource} completes
      * as well.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/merge.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code mergeWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10469,7 +10469,7 @@ public final Observable<T> mergeWith(@NonNull CompletableSource other) {
      * <p>Note that {@code onError} notifications will cut ahead of {@code onNext} notifications on the emission thread if {@code Scheduler} is truly
      * asynchronous. If strict event ordering is required, consider using the {@link #observeOn(Scheduler, boolean)} overload.
      * <p>
-     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
+     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.v3.png" alt="">
      * <p>
      * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
@@ -10504,7 +10504,7 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler) {
      * Returns an {@code Observable} to perform the current {@code Observable}'s emissions and notifications on a specified {@link Scheduler},
      * asynchronously with an unbounded buffer with {@link Flowable#bufferSize()} "island size" and optionally delays {@code onError} notifications.
      * <p>
-     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
+     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.v3.png" alt="">
      * <p>
      * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
@@ -10543,7 +10543,7 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delay
      * Returns an {@code Observable} to perform the current {@code Observable}'s emissions and notifications on a specified {@link Scheduler},
      * asynchronously with an unbounded buffer of configurable "island size" and optionally delays {@code onError} notifications.
      * <p>
-     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.png" alt="">
+     * <img width="640" height="308" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/observeOn.v3.png" alt="">
      * <p>
      * This operator keeps emitting as many signals as it can on the given {@code Scheduler}'s worker thread,
      * which may result in a longer than expected occupation of this thread. In other terms,
@@ -10585,7 +10585,7 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delay
     /**
      * Filters the items emitted by the current {@code Observable}, only emitting those of the specified type.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ofClass.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ofType} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10653,7 +10653,7 @@ public final Observable<T> onErrorComplete(@NonNull Predicate<? super Throwable>
      * Resumes the flow with an {@link ObservableSource} returned for the failure {@link Throwable} of the current {@code Observable} by a
      * function instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.v3.png" alt="">
      * <p>
      * By default, when an {@code ObservableSource} encounters an error that prevents it from emitting the expected item to
      * its {@link Observer}, the {@code ObservableSource} invokes its {@code Observer}'s {@code onError} method, and then quits
@@ -10691,7 +10691,7 @@ public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable
      * Resumes the flow with the given {@link ObservableSource} when the current {@code Observable} fails instead of
      * signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.v3.png" alt="">
      * <p>
      * By default, when an {@code ObservableSource} encounters an error that prevents it from emitting the expected item to
      * its {@link Observer}, the {@code ObservableSource} invokes its {@code Observer}'s {@code onError} method, and then quits
@@ -10729,7 +10729,7 @@ public final Observable<T> onErrorResumeWith(@NonNull ObservableSource<? extends
      * Ends the flow with a last item returned by a function for the {@link Throwable} error signaled by the current
      * {@code Observable} instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.o.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturn.o.v3.png" alt="">
      * <p>
      * By default, when an {@link ObservableSource} encounters an error that prevents it from emitting the expected item to
      * its {@link Observer}, the {@code ObservableSource} invokes its {@code Observer}'s {@code onError} method, and then quits
@@ -10763,7 +10763,7 @@ public final Observable<T> onErrorReturn(@NonNull Function<? super Throwable, ?
     /**
      * Ends the flow with the given last item when the current {@code Observable} fails instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturnItem.o.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorReturnItem.o.v3.png" alt="">
      * <p>
      * By default, when an {@link ObservableSource} encounters an error that prevents it from emitting the expected item to
      * its {@link Observer}, the {@code ObservableSource} invokes its {@code Observer}'s {@code onError} method, and then quits
@@ -10819,7 +10819,7 @@ public final Observable<T> onTerminateDetach() {
      * {@link ConnectableObservable#connect connect} method is called before it begins emitting items to those
      * {@link Observer}s that have subscribed to it.
      * <p>
-     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.png" alt="">
+     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishConnect.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code publish} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -10869,7 +10869,7 @@ public final <R> Observable<R> publish(@NonNull Function<? super Observable<T>,
      * {@code Observable} into the same function, and so on until all items have been emitted by the current and finite {@code Observable},
      * and emits the final result from the final call to your function as its sole item.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduce.2.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduce.2.v3.png" alt="">
      * <p>
      * This technique, which is called "reduce" here, is sometimes called "aggregate," "fold," "accumulate,"
      * "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
@@ -10905,7 +10905,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * emitted by the current {@code Observable} into the same function, and so on until all items have been emitted by the
      * current and finite {@code Observable}, emitting the final result from the final call to your function as its sole item.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.o.png" alt="">
+     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceSeed.o.v3.png" alt="">
      * <p>
      * This technique, which is called "reduce" here, is sometimes called "aggregate," "fold," "accumulate,"
      * "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
@@ -10965,7 +10965,7 @@ public final Maybe<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
      * and so on until all items have been emitted by the current and finite {@code Observable}, emitting the final result
      * from the final call to your function as its sole item.
      * <p>
-     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceWith.o.png" alt="">
+     * <img width="640" height="325" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/reduceWith.o.v3.png" alt="">
      * <p>
      * This technique, which is called "reduce" here, is sometimes called "aggregate," "fold," "accumulate,"
      * "compress," or "inject" in other programming contexts. Groovy, for instance, has an {@code inject} method
@@ -11084,7 +11084,7 @@ public final Observable<T> repeatUntil(@NonNull BooleanSupplier stop) {
      * call {@code onComplete} or {@code onError} on the child subscription. Otherwise, the current {@code Observable}
      * will be resubscribed.
      * <p>
-     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.png" alt="">
+     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/repeatWhen.f.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code repeatWhen} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11110,7 +11110,7 @@ public final Observable<T> repeatWhen(@NonNull Function<? super Observable<Objec
      * {@code Observable} resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -11472,7 +11472,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
      * an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to, but only
      * when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.n.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.n.v3.png" alt="">
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
@@ -11504,7 +11504,7 @@ public final ConnectableObservable<T> replay(int bufferSize) {
      * an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to, but only
      * when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.n.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.n.v3.png" alt="">
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
@@ -11537,7 +11537,7 @@ public final ConnectableObservable<T> replay(int bufferSize, boolean eagerTrunca
      * {@code Observable} resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is
      * subscribed to, but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nt.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nt.v3.png" alt="">
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
@@ -11578,7 +11578,7 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
      * To ensure no out-of-date or beyond-bufferSize items are referenced,
      * use the {@link #replay(int, long, TimeUnit, Scheduler, boolean)} overload with {@code eagerTruncate = true}.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nts.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nts.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
@@ -11615,7 +11615,7 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
      * connectable {@code Observable} resembles an ordinary {@code Observable}, except that it does not begin emitting items
      * when it is subscribed to, but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nts.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.nts.v3.png" alt="">
      * <p>
      * Note that due to concurrency requirements, {@code replay(bufferSize)} may hold strong references to more than
      * {@code bufferSize} source emissions.
@@ -11659,7 +11659,7 @@ public final ConnectableObservable<T> replay(int bufferSize, long time, @NonNull
      * resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.t.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.t.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code replay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -11686,7 +11686,7 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit)
      * resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ts.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ts.v3.png" alt="">
      * <p>
      * Note that the internal buffer may retain strong references to the oldest item. To ensure no out-of-date items
      * are referenced, use the {@link #replay(long, TimeUnit, Scheduler, boolean)} overload with {@code eagerTruncate = true}.
@@ -11721,7 +11721,7 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit,
      * resembles an ordinary {@code Observable}, except that it does not begin emitting items when it is subscribed to,
      * but only when its {@code connect} method is called.
      * <p>
-     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ts.png" alt="">
+     * <img width="640" height="445" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/replay.o.ts.v3.png" alt="">
      * <p>
      * Note that the internal buffer may retain strong references to the oldest item. To ensure no out-of-date items
      * are referenced, set {@code eagerTruncate = true}.
@@ -11756,7 +11756,7 @@ public final ConnectableObservable<T> replay(long time, @NonNull TimeUnit unit,
      * Returns an {@code Observable} that mirrors the current {@code Observable}, resubscribing to it if it calls {@code onError}
      * (infinite retry count).
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.v3.png" alt="">
      * <p>
      * If the current {@code Observable} calls {@link Observer#onError}, this method will resubscribe to the current
      * {@code Observable} rather than propagating the {@code onError} call.
@@ -11811,7 +11811,7 @@ public final Observable<T> retry(@NonNull BiPredicate<? super Integer, ? super T
      * Returns an {@code Observable} that mirrors the current {@code Observable}, resubscribing to it if it calls {@code onError}
      * up to a specified number of retries.
      * <p>
-     * <img width="640" height="327" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.n.png" alt="">
+     * <img width="640" height="327" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retry.o.n.v3.png" alt="">
      * <p>
      * If the current {@code Observable} calls {@link Observer#onError}, this method will resubscribe to the current
      * {@code Observable} for a maximum of {@code count} resubscriptions rather than propagating the
@@ -11913,7 +11913,7 @@ public final Observable<T> retryUntil(@NonNull BooleanSupplier stop) {
      * {@code onComplete} or {@code onError} on the child subscription. Otherwise, the current {@code Observable}
      * will be resubscribed.
      * <p>
-     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.png" alt="">
+     * <img width="640" height="430" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/retryWhen.f.v3.png" alt="">
      * <p>
      * Example:
      *
@@ -12015,7 +12015,7 @@ public final void safeSubscribe(@NonNull Observer<? super T> observer) {
      * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
      * within periodic time intervals.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code sample} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -12073,7 +12073,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, boolean e
      * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
      * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -12201,7 +12201,7 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler, bool
      * {@code Observable} into the same function, and so on until all items have been emitted by the current {@code Observable},
      * emitting the result of each of these iterations.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.v3.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <dl>
@@ -12231,7 +12231,7 @@ public final Observable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * the current {@code Observable} into the same function, and so on until all items have been emitted by the current
      * {@code Observable}, emitting the result of each of these iterations.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
@@ -12281,7 +12281,7 @@ public final <R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction
      * the current {@code Observable} into the same function, and so on until all items have been emitted by the current
      * {@code Observable}, emitting the result of each of these iterations.
      * <p>
-     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.png" alt="">
+     * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
      * This sort of function is sometimes called an accumulator.
      * <p>
@@ -12322,7 +12322,7 @@ public final <R> Observable<R> scanWith(@NonNull Supplier<R> seedSupplier, @NonN
      * {@code onNext} from two different threads concurrently. You can force such an {@code Observable} to be
      * well-behaved and sequential by applying the {@code serialize} method to it.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/synchronize.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/synchronize.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code serialize} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12345,7 +12345,7 @@ public final Observable<T> serialize() {
      * <p>
      * This is an alias for {@link #publish()}.{@link ConnectableObservable#refCount() refCount()}.
      * <p>
-     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishRefCount.o.png" alt="">
+     * <img width="640" height="510" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/publishRefCount.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code share} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12366,7 +12366,7 @@ public final Observable<T> share() {
      * emitted by the current {@code Observable}, or signals an {@link IllegalArgumentException} if the current
      * {@code Observable} emits more than one item.
      * <p>
-     * <img width="640" height="217" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/singleElement.o.png" alt="">
+     * <img width="640" height="217" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/singleElement.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code singleElement} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12387,7 +12387,7 @@ public final Maybe<T> singleElement() {
      * emits only a single item, or a default item if the current {@code Observable} emits no items. If the current
      * {@code Observable} emits more than one item, an {@link IllegalArgumentException} is signaled instead.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/single.2.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/single.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code single} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12433,7 +12433,7 @@ public final Single<T> singleOrError() {
      * Returns an {@code Observable} that skips the first {@code count} items emitted by the current {@code Observable} and emits
      * the remainder.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code skip} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12462,7 +12462,7 @@ public final Observable<T> skip(long count) {
      * Returns an {@code Observable} that skips values emitted by the current {@code Observable} before a specified time window
      * elapses.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.t.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.t.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code skip} does not operate on any particular scheduler but uses the current time
@@ -12488,7 +12488,7 @@ public final Observable<T> skip(long time, @NonNull TimeUnit unit) {
      * Returns an {@code Observable} that skips values emitted by the current {@code Observable} before a specified time window
      * on a specified {@link Scheduler} elapses.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.ts.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skip.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use for the timed skipping</dd>
@@ -12515,7 +12515,7 @@ public final Observable<T> skip(long time, @NonNull TimeUnit unit, @NonNull Sche
      * Returns an {@code Observable} that drops a specified number of items from the end of the sequence emitted by the
      * current {@code Observable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.v3.png" alt="">
      * <p>
      * This {@link Observer} accumulates a queue long enough to store the first {@code count} items. As more items are
      * received, items are taken from the front of the queue and emitted by the returned {@code Observable}. This causes
@@ -12549,7 +12549,7 @@ public final Observable<T> skipLast(int count) {
      * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * before the source completes.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -12577,7 +12577,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit) {
      * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * before the source completes.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.t.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -12608,7 +12608,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, boolean d
      * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
-     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -12637,7 +12637,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
      * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
-     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -12669,7 +12669,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
      * Returns an {@code Observable} that drops items emitted by the current {@code Observable} during a specified time window
      * (defined on a specified scheduler) before the source completes.
      * <p>
-     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.png" alt="">
+     * <img width="640" height="340" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipLast.ts.v3.png" alt="">
      * <p>
      * Note: this action will cache the latest items arriving in the specified time window.
      * <dl>
@@ -12709,7 +12709,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
      * Returns an {@code Observable} that skips items emitted by the current {@code Observable} until a second {@link ObservableSource} emits
      * an item.
      * <p>
-     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipUntil.png" alt="">
+     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipUntil.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code skipUntil} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12735,7 +12735,7 @@ public final <U> Observable<T> skipUntil(@NonNull ObservableSource<U> other) {
      * Returns an {@code Observable} that skips all items emitted by the current {@code Observable} as long as a specified
      * condition holds {@code true}, but emits all further source items as soon as the condition becomes {@code false}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipWhile.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/skipWhile.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code skipWhile} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12812,7 +12812,7 @@ public final Observable<T> sorted(@NonNull Comparator<? super T> comparator) {
      * Returns an {@code Observable} that emits the items in a specified {@link Iterable} before it begins to emit items
      * emitted by the current {@code Observable}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWithIterable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12904,7 +12904,7 @@ public final Observable<T> startWith(@NonNull MaybeSource<T> other) {
      * Returns an {@code Observable} that emits the items in a specified {@link ObservableSource} before it begins to emit
      * items emitted by the current {@code Observable}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.o.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWith.o.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -12954,7 +12954,7 @@ public final Observable<T> startWithItem(@NonNull T item) {
      * Returns an {@code Observable} that emits the specified items before it begins to emit items emitted by the current
      * {@code Observable}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWithArray.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/startWithArray.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code startWithArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13156,7 +13156,7 @@ public final void subscribe(@NonNull Observer<? super T> observer) {
     /**
      * Asynchronously subscribes {@link Observer}s to the current {@code Observable} on the specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/subscribeOn.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -13210,7 +13210,7 @@ public final Observable<T> switchIfEmpty(@NonNull ObservableSource<? extends T>
      * The resulting {@code Observable} completes if both the current {@code Observable} and the last inner {@code ObservableSource}, if any, complete.
      * If the current {@code Observable} signals an {@code onError}, the inner {@code ObservableSource} is disposed and the error delivered in-sequence.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13240,7 +13240,7 @@ public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends
      * The resulting {@code Observable} completes if both the current {@code Observable} and the last inner {@code ObservableSource}, if any, complete.
      * If the current {@code Observable} signals an {@code onError}, the inner {@code ObservableSource} is disposed and the error delivered in-sequence.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13502,7 +13502,7 @@ public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? sup
      * If the current {@code Observable} signals an {@code onError}, the termination of the last inner {@code ObservableSource} will emit that error as is
      * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code ObservableSource}s signaled.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13534,7 +13534,7 @@ public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T,
      * If the current {@code Observable} signals an {@code onError}, the termination of the last inner {@code ObservableSource} will emit that error as is
      * or wrapped into a {@link CompositeException} along with the other possible errors the former inner {@code ObservableSource}s signaled.
      * <p>
-     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.png" alt="">
+     * <img width="640" height="350" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/switchMap.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code switchMapDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13574,7 +13574,7 @@ public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T,
      * Returns an {@code Observable} that emits only the first {@code count} items emitted by the current {@code Observable}.
      * If the source emits fewer than {@code count} items then all of its items are emitted.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.v3.png" alt="">
      * <p>
      * This method returns an {@code Observable} that will invoke a subscribing {@link Observer}'s
      * {@link Observer#onNext onNext} function a maximum of {@code count} times before invoking
@@ -13611,7 +13611,7 @@ public final Observable<T> take(long count) {
      * If time runs out before the {@code Observable} completes normally, the {@code onComplete} event will be
      * signaled on the default {@code computation} {@link Scheduler}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.t.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.t.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code take} operates by default on the {@code computation} {@code Scheduler}.</dd>
@@ -13639,7 +13639,7 @@ public final Observable<T> take(long time, @NonNull TimeUnit unit) {
      * If time runs out before the {@code Observable} completes normally, the {@code onComplete} event will be
      * signaled on the provided {@code Scheduler}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.ts.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -13666,7 +13666,7 @@ public final Observable<T> take(long time, @NonNull TimeUnit unit, @NonNull Sche
      * Returns an {@code Observable} that emits at most the last {@code count} items emitted by the current {@code Observable}.
      * If the source emits fewer than {@code count} items then all of its items are emitted.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.n.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.n.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code takeLast} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13700,7 +13700,7 @@ public final Observable<T> takeLast(int count) {
      * Returns an {@code Observable} that emits at most a specified number of items from the current {@code Observable} that were
      * emitted in a specified window of time before the current {@code Observable} completed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tn.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tn.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeLast} does not operate on any particular scheduler but uses the current time
@@ -13730,7 +13730,7 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
      * emitted in a specified window of time before the current {@code Observable} completed, where the timing information is
      * provided by a given {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use for tracking the current time</dd>
@@ -13762,7 +13762,7 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
      * emitted in a specified window of time before the current {@code Observable} completed, where the timing information is
      * provided by a given {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.tns.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use for tracking the current time</dd>
@@ -13804,7 +13804,7 @@ public final Observable<T> takeLast(long count, long time, @NonNull TimeUnit uni
      * Returns an {@code Observable} that emits the items from the current {@code Observable} that were emitted in a specified
      * window of time before the current {@code Observable} completed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeLast} does not operate on any particular scheduler but uses the current time
@@ -13830,7 +13830,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit) {
      * Returns an {@code Observable} that emits the items from the current {@code Observable} that were emitted in a specified
      * window of time before the current {@code Observable} completed.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.t.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeLast} does not operate on any particular scheduler but uses the current time
@@ -13861,7 +13861,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, boolean d
      * window of time before the current {@code Observable} completed, where the timing information is provided by a specified
      * {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -13889,7 +13889,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      * window of time before the current {@code Observable} completed, where the timing information is provided by a specified
      * {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -13920,7 +13920,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      * window of time before the current {@code Observable} completed, where the timing information is provided by a specified
      * {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeLast.ts.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -13953,7 +13953,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
      * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} until a second {@link ObservableSource}
      * emits an item.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeUntil} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -13980,7 +13980,7 @@ public final <U> Observable<T> takeUntil(@NonNull ObservableSource<U> other) {
      * Returns an {@code Observable} that emits items emitted by the current {@code Observable}, checks the specified predicate
      * for each item, and then completes when the condition is satisfied.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.p.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.p.v3.png" alt="">
      * <p>
      * The difference between this operator and {@link #takeWhile(Predicate)} is that here, the condition is
      * evaluated <em>after</em> the item is emitted.
@@ -14010,7 +14010,7 @@ public final Observable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate
      * Returns an {@code Observable} that emits items emitted by the current {@code Observable} so long as each item satisfied a
      * specified condition, and then completes as soon as this condition is not satisfied.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeWhile.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeWhile.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeWhile} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -14038,7 +14038,7 @@ public final Observable<T> takeWhile(@NonNull Predicate<? super T> predicate) {
      * This differs from {@link #throttleLast} in that this only tracks passage of time whereas
      * {@code throttleLast} ticks at scheduled intervals.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code throttleFirst} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -14066,7 +14066,7 @@ public final Observable<T> throttleFirst(long windowDuration, @NonNull TimeUnit
      * This differs from {@link #throttleLast} in that this only tracks passage of time whereas
      * {@code throttleLast} ticks at scheduled intervals.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -14099,7 +14099,7 @@ public final Observable<T> throttleFirst(long skipDuration, @NonNull TimeUnit un
      * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
      * {@code throttleFirst} does not tick, it just tracks passage of time.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code throttleLast} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -14129,7 +14129,7 @@ public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit
      * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
      * {@code throttleFirst} does not tick, it just tracks passage of time.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -14299,7 +14299,7 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
      * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
      * will be emitted by the resulting {@code Observable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code throttleWithTimeout} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -14331,7 +14331,7 @@ public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit u
      * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
      * will be emitted by the resulting {@code Observable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -14362,7 +14362,7 @@ public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit u
      * Returns an {@code Observable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Observable}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeInterval} does not operate on any particular scheduler but uses the current time
@@ -14383,7 +14383,7 @@ public final Observable<Timed<T>> timeInterval() {
      * Returns an {@code Observable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Observable}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>The operator does not operate on any particular scheduler but uses the current time
@@ -14407,7 +14407,7 @@ public final Observable<Timed<T>> timeInterval(@NonNull Scheduler scheduler) {
      * Returns an {@code Observable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Observable}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timeInterval} does not operate on any particular scheduler but uses the current time
@@ -14430,7 +14430,7 @@ public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit) {
      * Returns an {@code Observable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Observable}, where this interval is computed on a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeInterval.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>The operator does not operate on any particular scheduler but uses the current time
@@ -14459,7 +14459,7 @@ public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull
      * time after the emission of the previous item, where that period of time is measured by an {@link ObservableSource} that
      * is a function of the previous item.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout3.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout3.v3.png" alt="">
      * <p>
      * Note: The arrival of the first source item is never timed out.
      * <dl>
@@ -14489,7 +14489,7 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
      * previous item, where that period of time is measured by an {@code ObservableSource} that is a function of the previous
      * item.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout4.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout4.v3.png" alt="">
      * <p>
      * Note: The arrival of the first source item is never timed out.
      * <dl>
@@ -14522,7 +14522,7 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
      * item. If the next item isn't emitted within the specified timeout duration starting from its predecessor,
      * the resulting {@code Observable} terminates and notifies observers of a {@link TimeoutException}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -14549,7 +14549,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit) {
      * the current {@code Observable} is disposed and the resulting {@code Observable} begins instead
      * to mirror a fallback {@link ObservableSource}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -14579,7 +14579,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNul
      * starting from its predecessor, the current {@code Observable} is disposed and returned {@code Observable}
      * begins instead to mirror a fallback {@link ObservableSource}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.2s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -14611,7 +14611,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNul
      * specified timeout duration starting from its predecessor, the resulting {@code Observable} terminates and
      * notifies observers of a {@link TimeoutException}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1s.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout.1s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -14639,7 +14639,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNul
      * {@link TimeoutException} if either the first item emitted by the current {@code Observable} or any subsequent item
      * doesn't arrive within time windows defined by indicator {@link ObservableSource}s.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout5.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout5.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code immediate} {@link Scheduler}.</dd>
@@ -14674,7 +14674,7 @@ public final <U, V> Observable<T> timeout(@NonNull ObservableSource<U> firstTime
      * the first item emitted by the current {@code Observable} or any subsequent item doesn't arrive within time windows
      * defined by indicator {@code ObservableSource}s.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout6.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timeout6.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code timeout} operates by default on the {@code immediate} {@link Scheduler}.</dd>
@@ -14732,7 +14732,7 @@ private <U, V> Observable<T> timeout0(
      * Returns an {@code Observable} that emits each item emitted by the current {@code Observable}, wrapped in a
      * {@link Timed} object.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timestamp} does not operate on any particular scheduler but uses the current time
@@ -14753,7 +14753,7 @@ public final Observable<Timed<T>> timestamp() {
      * Returns an {@code Observable} that emits each item emitted by the current {@code Observable}, wrapped in a
      * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate on any particular scheduler but uses the current time
@@ -14777,7 +14777,7 @@ public final Observable<Timed<T>> timestamp(@NonNull Scheduler scheduler) {
      * Returns an {@code Observable} that emits each item emitted by the current {@code Observable}, wrapped in a
      * {@link Timed} object.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code timestamp} does not operate on any particular scheduler but uses the current time
@@ -14800,7 +14800,7 @@ public final Observable<Timed<T>> timestamp(@NonNull TimeUnit unit) {
      * Returns an {@code Observable} that emits each item emitted by the current {@code Observable}, wrapped in a
      * {@link Timed} object whose timestamps are provided by a specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/timestamp.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate on any particular scheduler but uses the current time
@@ -14849,7 +14849,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      * Returns a {@link Single} that emits a single item, a {@link List} composed of all the items emitted by the
      * current and finite {@code Observable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.2.v3.png" alt="">
      * <p>
      * Normally, an {@link ObservableSource} that returns multiple items will do so by invoking its {@link Observer}'s
      * {@link Observer#onNext onNext} method for each such item. You can change this behavior by having the
@@ -14879,7 +14879,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      * Returns a {@link Single} that emits a single item, a {@link List} composed of all the items emitted by the
      * current and finite {@code Observable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toList.2.v3.png" alt="">
      * <p>
      * Normally, an {@link ObservableSource} that returns multiple items will do so by invoking its {@link Observer}'s
      * {@link Observer#onNext onNext} method for each such item. You can change this behavior by having the
@@ -14949,7 +14949,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      * current and finite {@code Observable}, mapped by the keys returned by a specified
      * {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.2.v3.png" alt="">
      * <p>
      * If more than one source item maps to the same key, the {@code HashMap} will contain the latest of those items.
      * <p>
@@ -14980,7 +14980,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
      * Returns a {@link Single} that emits a single {@link HashMap} containing values corresponding to items emitted by the
      * current and finite {@code Observable}, mapped by the keys and values returned by the given selector functions.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.2.v3.png" alt="">
      * <p>
      * If more than one source item maps to the same key, the {@code HashMap} will contain a single entry that
      * corresponds to the latest of those items.
@@ -15018,7 +15018,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      * Returns a {@link Single} that emits a single {@link Map} (subclass), returned by a specified {@code mapFactory} function, that
      * contains keys and values extracted from the items, via selector functions, emitted by the current and finite {@code Observable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMap.2.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code Map} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -15057,7 +15057,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      * Returns a {@link Single} that emits a single {@link HashMap} that contains an {@link ArrayList} of items emitted by the
      * current and finite {@code Observable} keyed by a specified {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code HashMap} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -15089,7 +15089,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      * specified {@code valueSelector} function from items emitted by the current and finite {@code Observable},
      * keyed by a specified {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code HashMap} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -15123,7 +15123,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      * contains a custom {@link Collection} of values, extracted by a specified {@code valueSelector} function from
      * items emitted by the current and finite {@code Observable}, and keyed by the {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code Map} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -15167,7 +15167,7 @@ public final <K, V> Single<Map<K, V>> toMap(
      * contains an {@link ArrayList} of values, extracted by a specified {@code valueSelector} function from items
      * emitted by the current and finite {@code Observable} and keyed by the {@code keySelector} function.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toMultiMap.2.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code Map} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -15268,7 +15268,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
      * all other items emitted by the current {@code Observable}, no items will be emitted and the
      * sequence is terminated with a {@link ClassCastException}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.2.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.2.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code List} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -15293,7 +15293,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
      * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the current and finite {@code Observable}, in a
      * sorted order based on a specified comparison function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.2.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.2.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code List} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -15322,7 +15322,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
      * Returns a {@link Single} that emits a {@link List} that contains the items emitted by the current and finite {@code Observable}, in a
      * sorted order based on a specified comparison function.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.2.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.f.2.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code List} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -15360,7 +15360,7 @@ public final Flowable<T> toFlowable(@NonNull BackpressureStrategy strategy) {
      * all other items emitted by the current {@code Observable}, no items will be emitted and the
      * sequence is terminated with a {@link ClassCastException}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.2.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/toSortedList.2.v3.png" alt="">
      * <p>
      * Note that this operator requires the upstream to signal {@code onComplete} for the accumulated {@code List} to
      * be emitted. Sources that are infinite and never complete will never emit anything through this
@@ -15415,7 +15415,7 @@ public final Observable<T> unsubscribeOn(@NonNull Scheduler scheduler) {
      * {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the current window and
      * propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window3.png" alt="">
+     * <img width="640" height="400" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window3.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -15440,7 +15440,7 @@ public final Observable<Observable<T>> window(long count) {
      * the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the current window
      * and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
+     * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -15468,7 +15468,7 @@ public final Observable<Observable<T>> window(long count, long skip) {
      * the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the current window
      * and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.png" alt="">
+     * <img width="640" height="365" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window4.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This version of {@code window} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -15502,7 +15502,7 @@ public final Observable<Observable<T>> window(long count, long skip, int bufferS
      * {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
      * current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.png" alt="">
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15538,7 +15538,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      * {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
      * current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15576,7 +15576,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      * {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
      * current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.png" alt="">
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window7.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15620,7 +15620,7 @@ public final Observable<Observable<T>> window(long timespan, long timeskip, @Non
      * {@code timespan} argument. When the current {@code Observable} completes or encounters an error, the resulting
      * {@code Observable} emits the current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.png" alt="">
+     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15654,7 +15654,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * reached first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable}
      * emits the current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15692,7 +15692,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * reached first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable}
      * emits the current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15731,7 +15731,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * {@code timespan} argument. When the current {@code Observable} completes or encounters an error, the resulting
      * {@code Observable} emits the current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.s.png" alt="">
+     * <img width="640" height="375" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window5.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15768,7 +15768,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
      * current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15808,7 +15808,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
      * current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15850,7 +15850,7 @@ public final Observable<Observable<T>> window(long timespan, @NonNull TimeUnit u
      * first). When the current {@code Observable} completes or encounters an error, the resulting {@code Observable} emits the
      * current window and propagates the notification from the current {@code Observable}.
      * <p>
-     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.png" alt="">
+     * <img width="640" height="370" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window6.s.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15897,7 +15897,7 @@ public final Observable<Observable<T>> window(
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
      * {@link ObservableSource}.
      * <p>
-     * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
+     * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15928,7 +15928,7 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
      * where the boundary of each window is determined by the items emitted from a specified boundary-governing
      * {@link ObservableSource}.
      * <p>
-     * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.png" alt="">
+     * <img width="640" height="475" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window8.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -15965,7 +15965,7 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
      * the {@code openingIndicator} {@link ObservableSource} emits an item and when the {@code ObservableSource} returned by
      * {@code closingIndicator} emits an item.
      * <p>
-     * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
+     * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -16002,7 +16002,7 @@ public final <U, V> Observable<Observable<T>> window(
      * the {@code openingIndicator} {@link ObservableSource} emits an item and when the {@code ObservableSource} returned by
      * {@code closingIndicator} emits an item.
      * <p>
-     * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.png" alt="">
+     * <img width="640" height="550" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/window2.v3.png" alt="">
      * <p>
      * Note that ignoring windows or subscribing later (i.e., on another thread) will result in
      * so-called window abandonment where a window may not contain any elements. In this case, subsequent
@@ -16043,7 +16043,7 @@ public final <U, V> Observable<Observable<T>> window(
      * Merges the specified {@link ObservableSource} into the current {@code Observable} sequence by using the {@code resultSelector}
      * function only when the current {@code Observable} emits an item.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      *
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -16081,7 +16081,7 @@ public final <U, R> Observable<R> withLatestFrom(@NonNull ObservableSource<? ext
      * not when any of the other sources emit, unlike {@code combineLatest}).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -16119,7 +16119,7 @@ public final <T1, T2, R> Observable<R> withLatestFrom(
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -16161,7 +16161,7 @@ public final <T1, T2, T3, R> Observable<R> withLatestFrom(
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -16207,7 +16207,7 @@ public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -16238,7 +16238,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull ObservableSource<?>[] oth
      * not when any of the other sources emit, unlike {@code combineLatest}).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This operator does not operate by default on a particular {@link Scheduler}.</dd>
@@ -16264,7 +16264,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<@NonNull ? exten
      * Returns an {@code Observable} that emits items that are the result of applying a specified function to pairs of
      * values, one each from the current {@code Observable} and a specified {@link Iterable} sequence.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.i.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.i.v3.png" alt="">
      * <p>
      * Note that the {@code other} {@code Iterable} is evaluated as items are observed from the current {@code Observable}; it is
      * not pre-consumed. This allows you to zip infinite streams on either side.
@@ -16299,7 +16299,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<@NonNull ? exten
      * Returns an {@code Observable} that emits items that are the result of applying a specified function to pairs of
      * values, one each from the current {@code Observable} and another specified {@link ObservableSource}.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while disposing the other sources. Therefore, it
@@ -16343,7 +16343,7 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
      * Returns an {@code Observable} that emits items that are the result of applying a specified function to pairs of
      * values, one each from the current {@code Observable} and another specified {@link ObservableSource}.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while disposing the other sources. Therefore, it
@@ -16389,7 +16389,7 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
      * Returns an {@code Observable} that emits items that are the result of applying a specified function to pairs of
      * values, one each from the current {@code Observable} and another specified {@link ObservableSource}.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/zip.v3.png" alt="">
      * <p>
      * The operator subscribes to its sources in order they are specified and completes eagerly if
      * one of the sources is shorter than the rest while disposing the other sources. Therefore, it
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index e830589e23..b10706a214 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -65,7 +65,7 @@
  * <p>
  * The documentation for this class makes use of marble diagrams. The following legend explains these diagrams:
  * <p>
- * <img width="640" height="301" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.legend.png" alt="">
+ * <img width="640" height="301" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.legend.v3.png" alt="">
  * <p>
  * See {@link Flowable} or {@code Observable} for the
  * implementation of the Reactive Pattern for a stream or vector of values.
@@ -119,7 +119,7 @@ public abstract class Single<@NonNull T> implements SingleSource<T> {
      * Runs multiple {@link SingleSource}s and signals the events of the first one that signals (disposing
      * the rest).
      * <p>
-     * <img width="640" height="516" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.amb.png" alt="">
+     * <img width="640" height="516" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.amb.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code amb} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -143,7 +143,7 @@ public static <T> Single<T> amb(@NonNull Iterable<@NonNull ? extends SingleSourc
      * Runs multiple {@link SingleSource}s and signals the events of the first one that signals (disposing
      * the rest).
      * <p>
-     * <img width="640" height="516" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ambArray.png" alt="">
+     * <img width="640" height="516" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ambArray.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code ambArray} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -176,7 +176,7 @@ public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sourc
      * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided by
      * an {@link Iterable} sequence.
      * <p>
-     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.i.png" alt="">
+     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.i.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -201,7 +201,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends Single
      * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided by
      * an {@link ObservableSource} sequence.
      * <p>
-     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.o.png" alt="">
+     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.o.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code concat} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -224,7 +224,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Singl
      * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided by
      * a {@link Publisher} sequence.
      * <p>
-     * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.p.png" alt="">
+     * <img width="640" height="309" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.p.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer
@@ -250,7 +250,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Singl
      * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided by
      * a {@link Publisher} sequence and prefetched by the specified amount.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.pn.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.pn.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer
@@ -279,7 +279,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Singl
     /**
      * Returns a {@link Flowable} that emits the items emitted by two {@link SingleSource}s, one after the other.
      * <p>
-     * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.png" alt="">
+     * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -311,7 +311,7 @@ public static <T> Flowable<T> concat(
     /**
      * Returns a {@link Flowable} that emits the items emitted by three {@link SingleSource}s, one after the other.
      * <p>
-     * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.o3.png" alt="">
+     * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.o3.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -347,7 +347,7 @@ public static <T> Flowable<T> concat(
     /**
      * Returns a {@link Flowable} that emits the items emitted by four {@link SingleSource}s, one after the other.
      * <p>
-     * <img width="640" height="362" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.o4.png" alt="">
+     * <img width="640" height="362" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concat.o4.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -387,7 +387,7 @@ public static <T> Flowable<T> concat(
      * Concatenate the single values, in a non-overlapping fashion, of the {@link SingleSource}s provided in
      * an array.
      * <p>
-     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatArray.png" alt="">
+     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatArray.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@link Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -581,7 +581,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     /**
      * Concatenates an {@link Iterable} sequence of {@link SingleSource}s eagerly into a single stream of values.
      * <p>
-     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.i.png" alt="">
+     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.i.v3.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * source {@code SingleSource}s. The operator buffers the values emitted by these {@code SingleSource}s and then drains them
@@ -640,7 +640,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends S
     /**
      * Concatenates a {@link Publisher} sequence of {@link SingleSource}s eagerly into a single stream of values.
      * <p>
-     * <img width="640" height="307" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.p.png" alt="">
+     * <img width="640" height="307" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatEager.p.v3.png" alt="">
      * <p>
      * Eager concatenation means that once a subscriber subscribes, this operator subscribes to all of the
      * emitted source {@code SingleSource}s as they are observed. The operator buffers the values emitted by these
@@ -829,7 +829,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull
     /**
      * Provides an API (via a cold {@code Single}) that bridges the reactive world with the callback-style world.
      * <p>
-     * <img width="640" height="454" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.create.png" alt="">
+     * <img width="640" height="454" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.create.v3.png" alt="">
      * <p>
      * Example:
      * <pre><code>
@@ -881,7 +881,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull
      * Calls a {@link Supplier} for each individual {@link SingleObserver} to return the actual {@link SingleSource} to
      * be subscribed to.
      * <p>
-     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.defer.png" alt="">
+     * <img width="640" height="515" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.defer.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code defer} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -903,7 +903,7 @@ public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? ext
     /**
      * Signals a {@link Throwable} returned by the callback function for each individual {@link SingleObserver}.
      * <p>
-     * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.error.c.png" alt="">
+     * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.error.c.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -926,7 +926,7 @@ public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> supplie
      * Returns a {@code Single} that invokes a subscriber's {@link SingleObserver#onError onError} method when the
      * subscriber subscribes to it.
      * <p>
-     * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.error.png" alt="">
+     * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.error.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code error} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -957,7 +957,7 @@ public static <T> Single<T> error(@NonNull Throwable throwable) {
      * It makes passed function "lazy".
      * Result of the function invocation will be emitted by the {@link Single}.
      * <p>
-     * <img width="640" height="467" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromCallable.png" alt="">
+     * <img width="640" height="467" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromCallable.v3.png" alt="">
      * <dl>
      *   <dt><b>Scheduler:</b></dt>
      *   <dd>{@code fromCallable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -990,7 +990,7 @@ public static <T> Single<T> error(@NonNull Throwable throwable) {
     /**
      * Converts a {@link Future} into a {@code Single} and awaits its outcome in a blocking fashion.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.v3.png" alt="">
      * <p>
      * The operator calls {@link Future#get()}, which is a blocking method, on the subscription thread.
      * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
@@ -1026,7 +1026,7 @@ public static <T> Single<T> error(@NonNull Throwable throwable) {
     /**
      * Converts a {@link Future} into a {@code Single} and awaits its outcome, or timeout, in a blocking fashion.
      * <p>
-     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.png" alt="">
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.from.Future.v3.png" alt="">
      * <p>
      * The operator calls {@link Future#get(long, TimeUnit)}, which is a blocking method, on the subscription thread.
      * It is recommended applying {@link #subscribeOn(Scheduler)} to move this blocking wait to a
@@ -1114,7 +1114,7 @@ public static <T> Single<T> fromMaybe(@NonNull MaybeSource<T> maybe, @NonNull T
     /**
      * Wraps a specific {@link Publisher} into a {@code Single} and signals its single element or error.
      * <p>
-     * <img width="640" height="322" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromPublisher.png" alt="">
+     * <img width="640" height="322" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromPublisher.v3.png" alt="">
      * <p>
      * If the source {@code Publisher} is empty, a {@link NoSuchElementException} is signaled. If
      * the source has more than one element, an {@link IndexOutOfBoundsException} is signaled.
@@ -1154,7 +1154,7 @@ public static <T> Single<T> fromPublisher(@NonNull Publisher<@NonNull ? extends
     /**
      * Wraps a specific {@link ObservableSource} into a {@code Single} and signals its single element or error.
      * <p>
-     * <img width="640" height="343" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromObservable.png" alt="">
+     * <img width="640" height="343" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromObservable.v3.png" alt="">
      * <p>
      * If the {@code ObservableSource} is empty, a {@link NoSuchElementException} is signaled.
      * If the source has more than one element, an {@link IndexOutOfBoundsException} is signaled.
@@ -1185,7 +1185,7 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
      * It makes passed function "lazy".
      * Result of the function invocation will be emitted by the {@link Single}.
      * <p>
-     * <img width="640" height="467" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromSupplier.png" alt="">
+     * <img width="640" height="467" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.fromSupplier.v3.png" alt="">
      * <dl>
      *   <dt><b>Scheduler:</b></dt>
      *   <dd>{@code fromSupplier} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1219,7 +1219,7 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
     /**
      * Returns a {@code Single} that emits a specified item.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.just.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.just.v3.png" alt="">
      * <p>
      * To convert any object into a {@code Single} that emits that object, pass that object into the
      * {@code just} method.
@@ -1248,7 +1248,7 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
      * Merges an {@link Iterable} sequence of {@link SingleSource} instances into a single {@link Flowable} sequence,
      * running all {@code SingleSource}s at once.
      * <p>
-     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.i.png" alt="">
+     * <img width="640" height="319" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.i.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -1287,7 +1287,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends SingleS
      * Merges a sequence of {@link SingleSource} instances emitted by a {@link Publisher} into a single {@link Flowable} sequence,
      * running all {@code SingleSource}s at once.
      * <p>
-     * <img width="640" height="307" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.p.png" alt="">
+     * <img width="640" height="307" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.p.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -1327,7 +1327,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Single
      * Flattens a {@link SingleSource} that emits a {@code SingleSingle} into a single {@code Single} that emits the item
      * emitted by the nested {@code SingleSource}, without any transformation.
      * <p>
-     * <img width="640" height="412" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.oo.png" alt="">
+     * <img width="640" height="412" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.oo.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code merge} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1357,7 +1357,7 @@ public static <T> Single<T> merge(@NonNull SingleSource<? extends SingleSource<?
     /**
      * Flattens two {@link SingleSource}s into one {@link Flowable} sequence, without any transformation.
      * <p>
-     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.png" alt="">
+     * <img width="640" height="414" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code SingleSource}s so that they appear as a single {@code Flowable}, by
      * using the {@code merge} method.
@@ -1406,7 +1406,7 @@ public static <T> Flowable<T> merge(
     /**
      * Flattens three {@link SingleSource}s into one {@link Flowable} sequence, without any transformation.
      * <p>
-     * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.o3.png" alt="">
+     * <img width="640" height="366" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.o3.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code SingleSource}s so that they appear as a single {@code Flowable}, by
      * the {@code merge} method.
@@ -1459,7 +1459,7 @@ public static <T> Flowable<T> merge(
     /**
      * Flattens four {@link SingleSource}s into one {@link Flowable} sequence, without any transformation.
      * <p>
-     * <img width="640" height="362" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.o4.png" alt="">
+     * <img width="640" height="362" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.merge.o4.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code SingleSource}s so that they appear as a single {@code Flowable}, by
      * the {@code merge} method.
@@ -1770,7 +1770,7 @@ public static <T> Flowable<T> mergeDelayError(
     /**
      * Returns a singleton instance of a never-signaling {@code Single} (only calls {@code onSubscribe}).
      * <p>
-     * <img width="640" height="244" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.never.png" alt="">
+     * <img width="640" height="244" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.never.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code never} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1790,7 +1790,7 @@ public static <T> Single<T> never() {
     /**
      * Signals success with 0L value after the given delay when a {@link SingleObserver} subscribes.
      * <p>
-     * <img width="640" height="292" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timer.png" alt="">
+     * <img width="640" height="292" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timer.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code timer} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -1812,7 +1812,7 @@ public static Single<Long> timer(long delay, @NonNull TimeUnit unit) {
      * Signals success with 0L value on the specified {@link Scheduler} after the given
      * delay when a {@link SingleObserver} subscribes.
      * <p>
-     * <img width="640" height="292" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timer.s.png" alt="">
+     * <img width="640" height="292" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.timer.s.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>you specify the {@code Scheduler} to signal on.</dd>
@@ -1838,7 +1838,7 @@ public static Single<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Sc
     /**
      * Compares two {@link SingleSource}s and emits {@code true} if they emit the same value (compared via {@link Object#equals(Object)}).
      * <p>
-     * <img width="640" height="465" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.equals.png" alt="">
+     * <img width="640" height="465" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.equals.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code sequenceEqual} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1961,7 +1961,7 @@ public static <T> Single<T> unsafeCreate(@NonNull SingleSource<T> onSubscribe) {
      * Allows using and disposing a resource while running a {@link SingleSource} instance generated from
      * that resource (similar to a try-with-resources).
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.using.png" alt="">
+     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.using.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code using} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2570,7 +2570,7 @@ public static <T, R> Single<R> zipArray(@NonNull Function<? super Object[], ? ex
     /**
      * Signals the event of this or the other {@link SingleSource} whichever signals first.
      * <p>
-     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ambWith.png" alt="">
+     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.ambWith.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code ambWith} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2593,7 +2593,7 @@ public final Single<T> ambWith(@NonNull SingleSource<? extends T> other) {
      * Hides the identity of the current {@code Single}, including the {@link Disposable} that is sent
      * to the downstream via {@code onSubscribe()}.
      * <p>
-     * <img width="640" height="458" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.hide.png" alt="">
+     * <img width="640" height="458" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.hide.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code hide} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -2611,7 +2611,7 @@ public final Single<T> hide() {
     /**
      * Transform a {@code Single} by applying a particular {@link SingleTransformer} function to it.
      * <p>
-     * <img width="640" height="612" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.compose.png" alt="">
+     * <img width="640" height="612" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.compose.v3.png" alt="">
      * <p>
      * This method operates on the {@code Single} itself whereas {@link #lift} operates on {@link SingleObserver}s.
      * <p>
@@ -2767,7 +2767,7 @@ public final <R> Maybe<R> concatMapMaybe(@NonNull Function<? super T, ? extends
      * Returns a {@link Flowable} that emits the item emitted by the current {@code Single}, then the item emitted by the
      * specified {@link SingleSource}.
      * <p>
-     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatWith.png" alt="">
+     * <img width="640" height="335" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.concatWith.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -2794,7 +2794,7 @@ public final Flowable<T> concatWith(@NonNull SingleSource<? extends T> other) {
      * Delays the emission of the success signal from the current {@code Single} by the specified amount.
      * An error signal will not be delayed.
      * <p>
-     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.png" alt="">
+     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -2817,7 +2817,7 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit) {
     /**
      * Delays the emission of the success or error signal from the current {@code Single} by the specified amount.
      * <p>
-     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.e.png" alt="">
+     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.e.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code delay} operates by default on the {@code computation} {@link Scheduler}.</dd>
@@ -2841,7 +2841,7 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit, boolean delayErr
      * Delays the emission of the success signal from the current {@code Single} by the specified amount.
      * An error signal will not be delayed.
      * <p>
-     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.s.png" alt="">
+     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.s.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>you specify the {@link Scheduler} where the non-blocking wait and emission happens</dd>
@@ -2867,7 +2867,7 @@ public final Single<T> delay(long time, @NonNull TimeUnit unit, @NonNull Schedul
     /**
      * Delays the emission of the success or error signal from the current {@code Single} by the specified amount.
      * <p>
-     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.se.png" alt="">
+     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.delay.se.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>you specify the {@link Scheduler} where the non-blocking wait and emission happens</dd>
@@ -3089,7 +3089,7 @@ public final Single<T> delaySubscription(long time, @NonNull TimeUnit unit, @Non
     /**
      * Calls the specified consumer with the success item after this item has been emitted to the downstream.
      * <p>
-     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doAfterSuccess.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doAfterSuccess.v3.png" alt="">
      * <p>
      * Note that the {@code doAfterSuccess} action is shared between subscriptions and as such
      * should be thread-safe.
@@ -3114,7 +3114,7 @@ public final Single<T> doAfterSuccess(@NonNull Consumer<? super T> onAfterSucces
     /**
      * Registers an {@link Action} to be called after this {@code Single} invokes either {@code onSuccess} or {@code onError}.
      * <p>
-     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doAfterTerminate.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doAfterTerminate.v3.png" alt="">
      * <p>
      * Note that the {@code doAfterTerminate} action is shared between subscriptions and as such
      * should be thread-safe.</p>
@@ -3149,7 +3149,7 @@ public final Single<T> doAfterTerminate(@NonNull Action onAfterTerminate) {
      * <p>Note that the {@code onFinally} action is shared between subscriptions and as such
      * should be thread-safe.
      * <p>
-     * <img width="640" height="291" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doFinally.png" alt="">
+     * <img width="640" height="291" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doFinally.v3.png" alt="">
      * </p>
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
@@ -3201,7 +3201,7 @@ public final Single<T> doOnLifecycle(@NonNull Consumer<? super Disposable> onSub
      * Calls the shared consumer with the {@link Disposable} sent through the {@code onSubscribe} for each
      * {@link SingleObserver} that subscribes to the current {@code Single}.
      * <p>
-     * <img width="640" height="347" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnSubscribe.png" alt="">
+     * <img width="640" height="347" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnSubscribe.v3.png" alt="">
      * </p>
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -3224,7 +3224,7 @@ public final Single<T> doOnSubscribe(@NonNull Consumer<? super Disposable> onSub
      * Returns a {@code Single} instance that calls the given {@code onTerminate} callback
      * just before this {@code Single} completes normally or with an exception.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/doOnTerminate.v3.png" alt="">
      * <p>
      * This differs from {@code doAfterTerminate} in that this happens <em>before</em> the {@code onSuccess} or
      * {@code onError} notification.
@@ -3252,7 +3252,7 @@ public final Single<T> doOnTerminate(@NonNull Action onTerminate) {
      * Calls the shared consumer with the success value sent via {@code onSuccess} for each
      * {@link SingleObserver} that subscribes to the current {@code Single}.
      * <p>
-     * <img width="640" height="347" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnSuccess.2.png" alt="">
+     * <img width="640" height="347" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnSuccess.2.v3.png" alt="">
      * </p>
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -3297,7 +3297,7 @@ public final Single<T> doOnEvent(@NonNull BiConsumer<@Nullable ? super T, @Nulla
      * Calls the shared consumer with the error sent via {@code onError} for each
      * {@link SingleObserver} that subscribes to the current {@code Single}.
      * <p>
-     * <img width="640" height="349" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnError.2.png" alt="">
+     * <img width="640" height="349" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnError.2.v3.png" alt="">
      * </p>
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -3320,7 +3320,7 @@ public final Single<T> doOnError(@NonNull Consumer<? super Throwable> onError) {
      * Calls the shared {@link Action} if a {@link SingleObserver} subscribed to the current {@code Single}
      * disposes the common {@link Disposable} it received via {@code onSubscribe}.
      * <p>
-     * <img width="640" height="332" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnDispose.png" alt="">
+     * <img width="640" height="332" src="https://raw.githubusercontent.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.doOnDispose.v3.png" alt="">
      * </p>
      * <dl>
      * <dt><b>Scheduler:</b></dt>
@@ -3343,7 +3343,7 @@ public final Single<T> doOnDispose(@NonNull Action onDispose) {
      * Filters the success item of the {@code Single} via a predicate function and emitting it if the predicate
      * returns {@code true}, completing otherwise.
      * <p>
-     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.filter.png" alt="">
+     * <img width="640" height="457" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.filter.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code filter} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3369,7 +3369,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
      * Returns a {@code Single} that is based on applying a specified function to the item emitted by the current {@code Single},
      * where that function returns a {@link SingleSource}.
      * <p>
-     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMap.png" alt="">
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMap.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMap} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3485,7 +3485,7 @@ public final <R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends Ma
      * Returns a {@link Flowable} that emits items based on applying a specified function to the item emitted by the
      * current {@code Single}, where that function returns a {@link Publisher}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapPublisher.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapPublisher.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer
@@ -3574,7 +3574,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
      * Returns an {@link Observable} that is based on applying a specified function to the item emitted by the current {@code Single},
      * where that function returns an {@link ObservableSource}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapObservable.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapObservable.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code flatMapObservable} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3901,7 +3901,7 @@ public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T>
      * Returns a {@code Single} that applies a specified function to the item emitted by the current {@code Single} and
      * emits the result of this function application.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.map.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.map.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code map} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3926,7 +3926,7 @@ public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T>
      * Maps the signal types of this {@code Single} into a {@link Notification} of the same kind
      * and emits it as a single success value to downstream.
      * <p>
-     * <img width="640" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.png" alt="">
+     * <img width="640" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/materialize.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code materialize} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -3994,7 +3994,7 @@ public final Single<Boolean> contains(@NonNull Object item, @NonNull BiPredicate
     /**
      * Flattens this {@code Single} and another {@link SingleSource} into one {@link Flowable}, without any transformation.
      * <p>
-     * <img width="640" height="416" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeWith.png" alt="">
+     * <img width="640" height="416" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.mergeWith.v3.png" alt="">
      * <p>
      * You can combine items emitted by multiple {@code SingleSource}s so that they appear as one {@code Flowable}, by using
      * the {@code mergeWith} method.
@@ -4048,7 +4048,7 @@ public final <U> Maybe<U> ofType(@NonNull Class<U> clazz) {
      * Signals the success item or the terminal signals of the current {@code Single} on the specified {@link Scheduler},
      * asynchronously.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.observeOn.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.observeOn.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>you specify which {@code Scheduler} this operator will use.</dd>
@@ -4074,7 +4074,7 @@ public final Single<T> observeOn(@NonNull Scheduler scheduler) {
      * Ends the flow with a success item returned by a function for the {@link Throwable} error signaled by the current
      * {@code Single} instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturn.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturn.v3.png" alt="">
      * <p>
      * By default, when a {@code Single} encounters an error that prevents it from emitting the expected item to its
      * subscriber, the {@code Single} invokes its subscriber's {@link SingleObserver#onError} method, and then quits
@@ -4108,7 +4108,7 @@ public final Single<T> onErrorReturn(@NonNull Function<Throwable, ? extends T> i
     /**
      * Signals the specified value as success in case the current {@code Single} signals an error.
      * <p>
-     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturnItem.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorReturnItem.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code onErrorReturnItem} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -4209,7 +4209,7 @@ public final Maybe<T> onErrorComplete(@NonNull Predicate<? super Throwable> pred
      * Resumes the flow with a {@link SingleSource} returned for the failure {@link Throwable} of the current {@code Single} by a
      * function instead of signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeNext.f.png" alt="">
+     * <img width="640" height="461" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.onErrorResumeNext.f.v3.png" alt="">
      * <p>
      * By default, when a {@code Single} encounters an error that prevents it from emitting the expected item to
      * its {@link SingleObserver}, the {@code Single} invokes its {@code SingleObserver}'s {@code onError} method, and then quits
@@ -4267,7 +4267,7 @@ public final Single<T> onTerminateDetach() {
     /**
      * Repeatedly re-subscribes to the current {@code Single} and emits each success value as a {@link Flowable} sequence.
      * <p>
-     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.png" alt="">
+     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -4288,7 +4288,7 @@ public final Flowable<T> repeat() {
     /**
      * Re-subscribes to the current {@code Single} at most the given number of times and emits each success value as a {@link Flowable} sequence.
      * <p>
-     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.n.png" alt="">
+     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeat.n.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -4313,7 +4313,7 @@ public final Flowable<T> repeat(long times) {
      * the {@link Publisher} returned by the handler function signals a value in response to a
      * value signaled through the {@link Flowable} the handler receives.
      * <p>
-     * <img width="640" height="1480" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeatWhen.png" alt="">
+     * <img width="640" height="1480" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeatWhen.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.
@@ -4341,7 +4341,7 @@ public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>,
      * Re-subscribes to the current {@code Single} until the given {@link BooleanSupplier} returns {@code true}
      * and emits the success items as a {@link Flowable} sequence.
      * <p>
-     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeatUntil.png" alt="">
+     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.repeatUntil.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -4867,7 +4867,7 @@ public final void subscribe(@NonNull SingleObserver<? super T> observer) {
     /**
      * Asynchronously subscribes {@link SingleObserver}s to this {@code Single} on the specified {@link Scheduler}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.subscribeOn.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.subscribeOn.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>You specify which {@code Scheduler} this operator will use.</dd>
@@ -5308,7 +5308,7 @@ private Single<T> timeout0(final long timeout, final TimeUnit unit, final Schedu
     /**
      * Calls the specified converter function during assembly time and returns its resulting value.
      * <p>
-     * <img width="640" height="553" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.to.png" alt="">
+     * <img width="640" height="553" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.to.v3.png" alt="">
      * <p>
      * This allows fluent conversion to any other type.
      * <dl>
@@ -5351,7 +5351,7 @@ public final Completable ignoreElement() {
     /**
      * Converts this {@code Single} into a {@link Flowable}.
      * <p>
-     * <img width="640" height="462" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.toFlowable.png" alt="">
+     * <img width="640" height="462" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.toFlowable.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer.</dd>
@@ -5376,7 +5376,7 @@ public final Flowable<T> toFlowable() {
     /**
      * Returns a {@link Future} representing the single value emitted by this {@code Single}.
      * <p>
-     * <img width="640" height="467" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Single.toFuture.png" alt="">
+     * <img width="640" height="467" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Single.toFuture.v3.png" alt="">
      * <p>
      * Cancelling the {@code Future} will cancel the subscription to the current {@code Single}.
      * <dl>
@@ -5397,7 +5397,7 @@ public final Future<T> toFuture() {
     /**
      * Converts this {@code Single} into a {@link Maybe}.
      * <p>
-     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.toMaybe.png" alt="">
+     * <img width="640" height="463" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.toMaybe.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code toMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -5418,7 +5418,7 @@ public final Maybe<T> toMaybe() {
     /**
      * Converts this {@code Single} into an {@link Observable}.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.toObservable.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.toObservable.v3.png" alt="">
      * <dl>
      * <dt><b>Scheduler:</b></dt>
      * <dd>{@code toObservable} does not operate by default on a particular {@link Scheduler}.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
index 3e80c68ced..041fc3bd1b 100644
--- a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
@@ -34,7 +34,7 @@
  * can wait for all intended {@link Subscriber}s to {@link Flowable#subscribe} to the {@code Flowable}
  * before the {@code Flowable} begins emitting items.
  * <p>
- * <img width="640" height="510" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.png" alt="">
+ * <img width="640" height="510" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.v3.png" alt="">
  * <p>
  * When the upstream terminates, the {@code ConnectableFlowable} remains in this terminated state and,
  * depending on the actual underlying implementation, relays cached events to late {@link Subscriber}s.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java
index bfd206eea9..d679dd937f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java
@@ -23,7 +23,7 @@
  * Returns an Iterable that always returns the item most recently emitted by an Observable, or a
  * seed value if no item has yet been emitted.
  * <p>
- * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.mostRecent.png" alt="">
+ * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.mostRecent.v3.png" alt="">
  *
  * @param <T> the value type
  */
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
index 6972bcc777..b8e79eda54 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
@@ -27,7 +27,7 @@
 /**
  * Returns an Iterable that blocks until the Observable emits another item, then returns that item.
  * <p>
- * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.next.png" alt="">
+ * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.next.v3.png" alt="">
  *
  * @param <T> the value type
  */
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java
index 1332351cac..75e8966ca9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java
@@ -23,7 +23,7 @@
  * Returns an Iterable that always returns the item most recently emitted by an Observable, or a
  * seed value if no item has yet been emitted.
  * <p>
- * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.mostRecent.png" alt="">
+ * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.mostRecent.v3.png" alt="">
  * 
  * @param <T> the value type
  */
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java
index 53aed40999..3ebeb0e1f0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java
@@ -25,7 +25,7 @@
 /**
  * Returns an Iterable that blocks until the Observable emits another item, then returns that item.
  * <p>
- * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.next.png" alt="">
+ * <img width="640" height="490" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/B.next.v3.png" alt="">
  * 
  * @param <T> the value type
  */
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
index c89913791d..e453f28b68 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
@@ -28,7 +28,7 @@
  * A Flowable that emits items based on applying a specified function to the item emitted by the
  * source Single, where that function returns a Publisher.
  * <p>
- * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapPublisher.png" alt="">
+ * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Single.flatMapPublisher.v3.png" alt="">
  * <dl>
  *  <dt><b>Backpressure:</b></dt>
  *  <dd>The returned {@code Flowable} honors the backpressure of the downstream consumer
diff --git a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
index 2221ac62b0..107971ca88 100644
--- a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
@@ -32,7 +32,7 @@
  * can wait for all intended {@link Observer}s to {@link Observable#subscribe} to the {@code Observable}
  * before the {@code Observable} begins emitting items.
  * <p>
- * <img width="640" height="510" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.png" alt="">
+ * <img width="640" height="510" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.v3.png" alt="">
  * <p>
  * When the upstream terminates, the {@code ConnectableObservable} remains in this terminated state and,
  * depending on the actual underlying implementation, relays cached events to late {@link Observer}s.
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
index 61cf92cba3..ce89f7b856 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
@@ -28,7 +28,7 @@
  * Subject that emits the most recent item it has observed and all subsequent observed items to each subscribed
  * {@link Observer}.
  * <p>
- * <img width="640" height="415" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/S.BehaviorSubject.png" alt="">
+ * <img width="640" height="415" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/S.BehaviorSubject.v3.png" alt="">
  * <p>
  * This subject does not have a public constructor by design; a new empty instance of this
  * {@code BehaviorSubject} can be created via the {@link #create()} method and

From c4780977c766f301d38b99e304edf492e66c7631 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 4 Apr 2020 11:29:22 +0200
Subject: [PATCH 111/665] 3.x: Fix Observable.flatMap with maxConcurrency hangs
 (#6946)

* 3.x: Fix Observable.flatMap with maxConcurrency hangs

* Verify Flowable
---
 .../observable/ObservableFlatMap.java         | 39 +++++++++++++------
 .../flowable/FlowableFlatMapTest.java         | 24 ++++++++++++
 .../observable/ObservableFlatMapTest.java     | 24 ++++++++++++
 3 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
index d2ca19c31a..6265a5d557 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
@@ -318,6 +318,7 @@ void drainLoop() {
                 if (checkTerminate()) {
                     return;
                 }
+                int innerCompleted = 0;
                 SimplePlainQueue<U> svq = queue;
 
                 if (svq != null) {
@@ -333,9 +334,18 @@ void drainLoop() {
                         }
 
                         child.onNext(o);
+                        innerCompleted++;
                     }
                 }
 
+                if (innerCompleted != 0) {
+                    if (maxConcurrency != Integer.MAX_VALUE) {
+                        subscribeMore(innerCompleted);
+                        innerCompleted = 0;
+                    }
+                    continue;
+                }
+
                 boolean d = done;
                 svq = queue;
                 InnerObserver<?, ?>[] inner = observers.get();
@@ -353,7 +363,6 @@ void drainLoop() {
                     return;
                 }
 
-                int innerCompleted = 0;
                 if (n != 0) {
                     int j = Math.min(n - 1, lastIndex);
 
@@ -415,20 +424,12 @@ void drainLoop() {
 
                 if (innerCompleted != 0) {
                     if (maxConcurrency != Integer.MAX_VALUE) {
-                        while (innerCompleted-- != 0) {
-                            ObservableSource<? extends U> p;
-                            synchronized (this) {
-                                p = sources.poll();
-                                if (p == null) {
-                                    wip--;
-                                    continue;
-                                }
-                            }
-                            subscribeInner(p);
-                        }
+                        subscribeMore(innerCompleted);
+                        innerCompleted = 0;
                     }
                     continue;
                 }
+
                 missed = addAndGet(-missed);
                 if (missed == 0) {
                     break;
@@ -436,6 +437,20 @@ void drainLoop() {
             }
         }
 
+        void subscribeMore(int innerCompleted) {
+            while (innerCompleted-- != 0) {
+                ObservableSource<? extends U> p;
+                synchronized (this) {
+                    p = sources.poll();
+                    if (p == null) {
+                        wip--;
+                        continue;
+                    }
+                }
+                subscribeInner(p);
+            }
+        }
+
         boolean checkTerminate() {
             if (disposed) {
                 return true;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
index 1687c2dd79..935182fd7a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
@@ -1478,4 +1478,28 @@ public void innerCompletesAfterOnNextInDrainThenCancels() {
         .requestMore(1)
         .assertValuesOnly(1);
     }
+
+    @Test(timeout = 5000)
+    public void mixedScalarAsync() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            Flowable
+            .range(0, 20)
+            .flatMap(
+                    integer -> {
+                        if (integer % 5 != 0) {
+                            return Flowable
+                                    .just(integer);
+                        }
+
+                        return Flowable
+                                .just(-integer)
+                                .observeOn(Schedulers.computation());
+                    },
+                    false,
+                    1
+            )
+            .ignoreElements()
+            .blockingAwait();
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
index 165aa9dabf..1e083d217c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
@@ -1240,4 +1240,28 @@ public void fusedInnerCrash2() {
 
         to.assertFailure(TestException.class, 1, 2);
     }
+
+    @Test(timeout = 5000)
+    public void mixedScalarAsync() {
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            Observable
+            .range(0, 20)
+            .flatMap(
+                    integer -> {
+                        if (integer % 5 != 0) {
+                            return Observable
+                                    .just(integer);
+                        }
+
+                        return Observable
+                                .just(-integer)
+                                .observeOn(Schedulers.computation());
+                    },
+                    false,
+                    1
+            )
+            .ignoreElements()
+            .blockingAwait();
+        }
+    }
 }

From c13ba601b1a64075537dbdb6458499b0390f3cd5 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 7 Apr 2020 12:20:53 +0200
Subject: [PATCH 112/665] 3.x: Workaround flakyness of multiThreadedWithNPE*
 tests (#6953)

* 3.x: Workaround flakyness of multiThreadedWithNPE* tests

* Do not run the original test
---
 .../flowable/FlowableSerializeTest.java       | 34 +++++++++++++++++--
 .../observable/ObservableSerializeTest.java   | 34 +++++++++++++++++--
 2 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java
index cd848e683d..9407df90cf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java
@@ -79,7 +79,22 @@ public void multiThreadedBasic() {
     }
 
     @Test
-    public void multiThreadedWithNPE() {
+    public void multiThreadedWithNPEFlaky() throws InterruptedException {
+        int max = 9;
+        for (int i = 0; i <= max; i++) {
+            try {
+                multiThreadedWithNPE();
+                return;
+            } catch (AssertionError ex) {
+                if (i == max) {
+                    throw ex;
+                }
+            }
+            Thread.sleep((long)(1000 * Math.random() + 100));
+        }
+    }
+
+    void multiThreadedWithNPE() {
         TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three", null);
         Flowable<String> w = Flowable.unsafeCreate(onSubscribe);
 
@@ -108,7 +123,22 @@ public void multiThreadedWithNPE() {
     }
 
     @Test
-    public void multiThreadedWithNPEinMiddle() {
+    public void multiThreadedWithNPEinMiddleFlaky() throws InterruptedException {
+        int max = 9;
+        for (int i = 0; i <= max; i++) {
+            try {
+                multiThreadedWithNPEinMiddle();
+                return;
+            } catch (AssertionError ex) {
+                if (i == max) {
+                    throw ex;
+                }
+            }
+            Thread.sleep((long)(1000 * Math.random() + 100));
+        }
+    }
+
+    void multiThreadedWithNPEinMiddle() {
         boolean lessThan9 = false;
         for (int i = 0; i < 3; i++) {
             TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three", null, "four", "five", "six", "seven", "eight", "nine");
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
index 2a2b7dff0d..2457a9a312 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
@@ -78,7 +78,22 @@ public void multiThreadedBasic() {
     }
 
     @Test
-    public void multiThreadedWithNPE() {
+    public void multiThreadedWithNPEFlaky() throws InterruptedException {
+        int max = 9;
+        for (int i = 0; i <= max; i++) {
+            try {
+                multiThreadedWithNPE();
+                return;
+            } catch (AssertionError ex) {
+                if (i == max) {
+                    throw ex;
+                }
+            }
+            Thread.sleep((long)(1000 * Math.random() + 100));
+        }
+    }
+
+    void multiThreadedWithNPE() {
         TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three", null);
         Observable<String> w = Observable.unsafeCreate(onSubscribe);
 
@@ -107,7 +122,22 @@ public void multiThreadedWithNPE() {
     }
 
     @Test
-    public void multiThreadedWithNPEinMiddle() {
+    public void multiThreadedWithNPEinMiddleFlaky() throws InterruptedException {
+        int max = 9;
+        for (int i = 0; i <= max; i++) {
+            try {
+                multiThreadedWithNPEinMiddle();
+                return;
+            } catch (AssertionError ex) {
+                if (i == max) {
+                    throw ex;
+                }
+            }
+            Thread.sleep((long)(1000 * Math.random() + 100));
+        }
+    }
+
+    void multiThreadedWithNPEinMiddle() {
         boolean lessThan9 = false;
         for (int i = 0; i < 3; i++) {
             TestMultiThreadedObservable onSubscribe = new TestMultiThreadedObservable("one", "two", "three", null, "four", "five", "six", "seven", "eight", "nine");

From 51de02143146e38f82a3ee857f72dced73f29020 Mon Sep 17 00:00:00 2001
From: Zachary Trant <zach@graalonline.com>
Date: Tue, 7 Apr 2020 09:44:23 -0500
Subject: [PATCH 113/665] docs: Quick Javadoc fixes. (#6943)

* docs: Quick Javadoc fixes.

Added @code tag wherever < or > were used, also removed a few
self-closing <p> tags. Both of these issues cause errors with the latest
version of Javadoc.

Signed-off-by: Zachary Trant <zach@graalonline.com>

* Update FuseToFlowable.java

* Update FuseToMaybe.java

* Update FuseToObservable.java

* Update SchedulerWhen.java

* Update BlockingFlowableNextTest.java

* Update BlockingObservableNextTest.java

* Update SerializedObserverTest.java

* Update SerializedObserverTest.java

* Update SerializedObserverTest.java

* Update SerializedSubscriberTest.java

* Update BaseTck.java

* Update SchedulerWhen.java

* Update SerializedObserverTest.java
---
 .../rxjava3/internal/fuseable/FuseToFlowable.java          | 6 ++++--
 .../reactivex/rxjava3/internal/fuseable/FuseToMaybe.java   | 6 ++++--
 .../rxjava3/internal/fuseable/FuseToObservable.java        | 6 ++++--
 .../rxjava3/internal/schedulers/SchedulerWhen.java         | 6 ++++++
 .../operators/flowable/BlockingFlowableNextTest.java       | 4 ++--
 .../operators/observable/BlockingObservableNextTest.java   | 4 ++--
 .../rxjava3/observers/SerializedObserverTest.java          | 7 +++----
 .../rxjava3/subscribers/SerializedSubscriberTest.java      | 4 ++--
 src/test/java/io/reactivex/rxjava3/tck/BaseTck.java        | 2 +-
 9 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
index 6ad462c706..a1572b0e53 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
@@ -21,8 +21,10 @@
  * the operator goes from Flowable to some other reactive type and then the sequence calls
  * for toFlowable again:
  * <pre>
- * Single&lt;Integer> single = Flowable.range(1, 10).reduce((a, b) -> a + b);
- * Flowable&lt;Integer> flowable = single.toFlowable();
+ * {@code 
+ * Single<Integer> single = Flowable.range(1, 10).reduce((a, b) -> a + b);
+ * Flowable<Integer> flowable = single.toFlowable();
+ * }
  * </pre>
  *
  * The {@code Single.toFlowable()} will check for this interface and call the {@link #fuseToFlowable()}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
index 572255a7bc..3fa2334be6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
@@ -21,8 +21,10 @@
  * the operator goes from Maybe to some other reactive type and then the sequence calls
  * for toMaybe again:
  * <pre>
- * Single&lt;Integer> single = Maybe.just(1).isEmpty();
- * Maybe&lt;Integer> maybe = single.toMaybe();
+ * {@code 
+ * Single<Integer> single = Maybe.just(1).isEmpty();
+ * Maybe<Integer> maybe = single.toMaybe();
+ * }
  * </pre>
  *
  * The {@code Single.toMaybe()} will check for this interface and call the {@link #fuseToMaybe()}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java
index 567d3c9a7c..c9371ae538 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java
@@ -21,8 +21,10 @@
  * the operator goes from Observable to some other reactive type and then the sequence calls
  * for toObservable again:
  * <pre>
- * Single&lt;Integer> single = Observable.range(1, 10).reduce((a, b) -> a + b);
- * Observable&lt;Integer> observable = single.toObservable();
+ * {@code
+ * Single<Integer> single = Observable.range(1, 10).reduce((a, b) -> a + b);
+ * Observable<Integer> observable = single.toObservable();
+ * }
  * </pre>
  *
  * The {@code Single.toObservable()} will check for this interface and call the {@link #fuseToObservable()}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
index 57033f4563..fe3c624786 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
@@ -53,11 +53,13 @@
  * thread pool:
  *
  * <pre>
+ * {@code 
  * Scheduler limitScheduler = Schedulers.computation().when(workers -> {
  *  // use merge max concurrent to limit the number of concurrent
  *  // callbacks two at a time
  *  return Completable.merge(Observable.merge(workers), 2);
  * });
+ * }
  * </pre>
  * <p>
  * This is a slightly different way to limit the concurrency but it has some
@@ -71,11 +73,13 @@
  * to the second.
  *
  * <pre>
+ * {@code 
  * Scheduler limitScheduler = Schedulers.computation().when(workers -> {
  *  // use merge max concurrent to limit the number of concurrent
  *  // Observables two at a time
  *  return Completable.merge(Observable.merge(workers, 2));
  * });
+ * }
  * </pre>
  *
  * Slowing down the rate to no more than than 1 a second. This suffers from the
@@ -84,6 +88,7 @@
  * algorithm).
  *
  * <pre>
+ * {@code 
  * Scheduler slowScheduler = Schedulers.computation().when(workers -> {
  *  // use concatenate to make each worker happen one at a time.
  *  return Completable.concat(workers.map(actions -> {
@@ -91,6 +96,7 @@
  *      return Completable.merge(actions.delaySubscription(1, TimeUnit.SECONDS));
  *  }));
  * });
+ * }
  * </pre>
  * <p>History 2.0.1 - experimental
  * @since 2.1
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
index 35c1501ae0..714bde2e21 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
@@ -223,8 +223,8 @@ public void nextWithCallingHasNextMultipleTimes() {
 
     /**
      * Confirm that no buffering or blocking of the Observable onNext calls occurs and it just grabs the next emitted value.
-     * <p/>
-     * This results in output such as => a: 1 b: 2 c: 89
+     * <p>
+     * This results in output such as {@code => a: 1 b: 2 c: 89}
      *
      * @throws Throwable some method call is declared throws
      */
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
index 357d512e9b..82397f45dd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
@@ -227,8 +227,8 @@ public void nextWithCallingHasNextMultipleTimes() {
 
     /**
      * Confirm that no buffering or blocking of the Observable onNext calls occurs and it just grabs the next emitted value.
-     * <p/>
-     * This results in output such as => a: 1 b: 2 c: 89
+     * <p>
+     * This results in output such as {@code => a: 1 b: 2 c: 89}
      *
      * @throws Throwable some method call is declared throws
      */
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
index 48bd28aaf8..4c8819937e 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
@@ -340,11 +340,11 @@ public void onNext(String t) {
      *
      * When using SynchronizedSubscriber we get this output:
      *
-     * p1: 18 p2: 68 => should be close to each other unless we have thread starvation
+     * {@code p1: 18 p2: 68 =>} should be close to each other unless we have thread starvation
      *
      * When using SerializedObserver we get:
      *
-     * p1: 1 p2: 2445261 => should be close to each other unless we have thread starvation
+     * {@code p1: 1 p2: 2445261 =>} should be close to each other unless we have thread starvation
      *
      * This demonstrates how SynchronizedSubscriber balances back and forth better, and blocks emission.
      * The real issue in this example is the async buffer-bloat, so we need backpressure.
@@ -1042,8 +1042,7 @@ public void run() {
                 }
             };
 
-            TestHelper.race(r1, r2);
-
+            TestHelper.race(r1, r2);       
             to.awaitDone(5, TimeUnit.SECONDS)
             .assertError(ex)
             .assertNotComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
index ee842fcf02..7391b212ae 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
@@ -341,11 +341,11 @@ public void onNext(String t) {
      *
      * When using SynchronizedSubscriber we get this output:
      *
-     * p1: 18 p2: 68 => should be close to each other unless we have thread starvation
+     * {@code p1: 18 p2: 68 =>} should be close to each other unless we have thread starvation
      *
      * When using SerializedSubscriber we get:
      *
-     * p1: 1 p2: 2445261 => should be close to each other unless we have thread starvation
+     * {@code p1: 1 p2: 2445261 =>} should be close to each other unless we have thread starvation
      *
      * This demonstrates how SynchronizedSubscriber balances back and forth better, and blocks emission.
      * The real issue in this example is the async buffer-bloat, so we need backpressure.
diff --git a/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java b/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
index 82c25e9591..4de830b877 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
@@ -51,7 +51,7 @@ public long maxElementsFromPublisher() {
 
     /**
      * Creates an Iterable with the specified number of elements or an infinite one if
-     * elements > {@link Integer#MAX_VALUE}.
+     * {@code elements >} {@link Integer#MAX_VALUE}.
      * @param elements the number of elements to return, {@link Integer#MAX_VALUE} means an infinite sequence
      * @return the Iterable
      */

From b47783e3186f83be6a87257a2d13c9619bccaa42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Karnok?= <akarnokd@gmail.com>
Date: Tue, 7 Apr 2020 16:46:27 +0200
Subject: [PATCH 114/665] Fix trailing spaces.

---
 .../reactivex/rxjava3/internal/fuseable/FuseToFlowable.java | 2 +-
 .../io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java | 2 +-
 .../rxjava3/internal/schedulers/SchedulerWhen.java          | 6 +++---
 .../reactivex/rxjava3/observers/SerializedObserverTest.java | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
index a1572b0e53..c0359640f1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
@@ -21,7 +21,7 @@
  * the operator goes from Flowable to some other reactive type and then the sequence calls
  * for toFlowable again:
  * <pre>
- * {@code 
+ * {@code
  * Single<Integer> single = Flowable.range(1, 10).reduce((a, b) -> a + b);
  * Flowable<Integer> flowable = single.toFlowable();
  * }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
index 3fa2334be6..d7655bba86 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
@@ -21,7 +21,7 @@
  * the operator goes from Maybe to some other reactive type and then the sequence calls
  * for toMaybe again:
  * <pre>
- * {@code 
+ * {@code
  * Single<Integer> single = Maybe.just(1).isEmpty();
  * Maybe<Integer> maybe = single.toMaybe();
  * }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
index fe3c624786..4da5b161b8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
@@ -53,7 +53,7 @@
  * thread pool:
  *
  * <pre>
- * {@code 
+ * {@code
  * Scheduler limitScheduler = Schedulers.computation().when(workers -> {
  *  // use merge max concurrent to limit the number of concurrent
  *  // callbacks two at a time
@@ -73,7 +73,7 @@
  * to the second.
  *
  * <pre>
- * {@code 
+ * {@code
  * Scheduler limitScheduler = Schedulers.computation().when(workers -> {
  *  // use merge max concurrent to limit the number of concurrent
  *  // Observables two at a time
@@ -88,7 +88,7 @@
  * algorithm).
  *
  * <pre>
- * {@code 
+ * {@code
  * Scheduler slowScheduler = Schedulers.computation().when(workers -> {
  *  // use concatenate to make each worker happen one at a time.
  *  return Completable.concat(workers.map(actions -> {
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
index 4c8819937e..874670bc5f 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
@@ -1042,7 +1042,8 @@ public void run() {
                 }
             };
 
-            TestHelper.race(r1, r2);       
+            TestHelper.race(r1, r2);
+
             to.awaitDone(5, TimeUnit.SECONDS)
             .assertError(ex)
             .assertNotComplete();

From e40916e5fa772af416d0174c0e3aaa49de2f56a9 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 11 Apr 2020 16:33:33 +0200
Subject: [PATCH 115/665] Bump gradle-bintray-plugin from 1.8.4 to 1.8.5
 (#6951)

Bumps gradle-bintray-plugin from 1.8.4 to 1.8.5.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f51d004ee4..69a4276574 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.0"
   ext.licenseVersion = "0.15.0"
-  ext.bintrayVersion = "1.8.4"
+  ext.bintrayVersion = "1.8.5"
   ext.jfrogExtractorVersion = "4.15.1"
   ext.bndVersion = "5.0.1"
   ext.checkstyleVersion = "8.26"

From 81c3ee742233236f5a3a53e3e903e655c8119e30 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 14 Apr 2020 09:31:45 +0200
Subject: [PATCH 116/665] Bump guava from 28.2-jre to 29.0-jre (#6959)

Bumps [guava](https://github.com/google/guava) from 28.2-jre to 29.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 69a4276574..b96ba76139 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
   ext.mockitoVersion = "3.3.3"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
-  ext.guavaVersion = "28.2-jre"
+  ext.guavaVersion = "29.0-jre"
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.0"
   ext.licenseVersion = "0.15.0"

From b6a994f7c5956c69ee267b721806beebd81886e1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 24 Apr 2020 14:33:57 +0200
Subject: [PATCH 117/665] Bump build-info-extractor-gradle from 4.15.1 to
 4.15.2 (#6967)

Bumps build-info-extractor-gradle from 4.15.1 to 4.15.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b96ba76139..c35b696d20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.0"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.15.1"
+  ext.jfrogExtractorVersion = "4.15.2"
   ext.bndVersion = "5.0.1"
   ext.checkstyleVersion = "8.26"
 

From fbee37a052c8c4052614db021cd242de6f710221 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 27 Apr 2020 08:46:51 +0200
Subject: [PATCH 118/665] 3.x: Fix scheduled tasks' fatal exception behavior
 (#6956)

* 3.x: Fix scheduled tasks' fatal exception behavior

* Fix direct periodic tasks not stopping upon crash.

* Fix the mistake introduced in the previous commit.

* Ensure task exception is rethrown so that the parent FutureTask can end

* Update the abstract Scheduler's tasks too

* Adjust some test expectation with DisposeTask
---
 .../io/reactivex/rxjava3/core/Scheduler.java  |  17 ++-
 .../schedulers/ExecutorScheduler.java         |  28 +++-
 .../schedulers/InstantPeriodicTask.java       |   6 +-
 .../ScheduledDirectPeriodicTask.java          |   6 +-
 .../schedulers/ScheduledDirectTask.java       |  16 ++-
 .../schedulers/ScheduledRunnable.java         |   1 +
 .../rxjava3/core/DisposeTaskTest.java         |  50 +++++++
 .../rxjava3/core/PeriodicDirectTaskTest.java  |  57 ++++++++
 .../schedulers/BooleanRunnableTest.java       |  50 +++++++
 .../schedulers/InstantPeriodicTaskTest.java   |   7 +-
 .../schedulers/InterruptibleRunnableTest.java |  50 +++++++
 .../ScheduledDirectPeriodicTaskTest.java      |   9 +-
 .../schedulers/ScheduledRunnableTest.java     |   7 +-
 .../schedulers/ComputationSchedulerTests.java | 127 +++++++++++++++++-
 .../rxjava3/schedulers/SchedulerTest.java     |  30 +++--
 15 files changed, 425 insertions(+), 36 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/core/DisposeTaskTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/core/PeriodicDirectTaskTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/schedulers/BooleanRunnableTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/schedulers/InterruptibleRunnableTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
index 7b96792bbe..069c3d5bfb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
@@ -18,11 +18,9 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
 import io.reactivex.rxjava3.internal.schedulers.*;
-import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.SchedulerRunnableIntrospection;
 
@@ -542,9 +540,10 @@ public void run() {
                 try {
                     run.run();
                 } catch (Throwable ex) {
-                    Exceptions.throwIfFatal(ex);
-                    worker.dispose();
-                    throw ExceptionHelper.wrapOrThrow(ex);
+                    // Exceptions.throwIfFatal(ex); nowhere to go
+                    dispose();
+                    RxJavaPlugins.onError(ex);
+                    throw ex;
                 }
             }
         }
@@ -586,7 +585,13 @@ static final class DisposeTask implements Disposable, Runnable, SchedulerRunnabl
         public void run() {
             runner = Thread.currentThread();
             try {
-                decoratedRun.run();
+                try {
+                    decoratedRun.run();
+                } catch (Throwable ex) {
+                    // Exceptions.throwIfFatal(e); nowhere to go
+                    RxJavaPlugins.onError(ex);
+                    throw ex;
+                }
             } finally {
                 dispose();
                 runner = null;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
index 6387069548..2e76702b1b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
@@ -320,6 +320,10 @@ public void run() {
                 }
                 try {
                     actual.run();
+                } catch (Throwable ex) {
+                    // Exceptions.throwIfFatal(ex); nowhere to go
+                    RxJavaPlugins.onError(ex);
+                    throw ex;
                 } finally {
                     lazySet(true);
                 }
@@ -386,7 +390,13 @@ public void run() {
                     thread = Thread.currentThread();
                     if (compareAndSet(READY, RUNNING)) {
                         try {
-                            run.run();
+                            try {
+                                run.run();
+                            } catch (Throwable ex) {
+                                // Exceptions.throwIfFatal(ex); nowhere to go
+                                RxJavaPlugins.onError(ex);
+                                throw ex;
+                            }
                         } finally {
                             thread = null;
                             if (compareAndSet(RUNNING, FINISHED)) {
@@ -463,11 +473,17 @@ public void run() {
             Runnable r = get();
             if (r != null) {
                 try {
-                    r.run();
-                } finally {
-                    lazySet(null);
-                    timed.lazySet(DisposableHelper.DISPOSED);
-                    direct.lazySet(DisposableHelper.DISPOSED);
+                    try {
+                        r.run();
+                    } finally {
+                        lazySet(null);
+                        timed.lazySet(DisposableHelper.DISPOSED);
+                        direct.lazySet(DisposableHelper.DISPOSED);
+                    }
+                } catch (Throwable ex) {
+                    // Exceptions.throwIfFatal(ex); nowhere to go
+                    RxJavaPlugins.onError(ex);
+                    throw ex;
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
index a855b44683..ad85765ed6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
@@ -20,7 +20,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
@@ -54,12 +53,13 @@ public Void call() {
         runner = Thread.currentThread();
         try {
             task.run();
-            setRest(executor.submit(this));
             runner = null;
+            setRest(executor.submit(this));
         } catch (Throwable ex) {
-            Exceptions.throwIfFatal(ex);
+            // Exceptions.throwIfFatal(ex); nowhere to go
             runner = null;
             RxJavaPlugins.onError(ex);
+            throw ex;
         }
         return null;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
index ac30532e68..4be6e4b558 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
@@ -16,7 +16,6 @@
 
 package io.reactivex.rxjava3.internal.schedulers;
 
-import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
@@ -39,10 +38,11 @@ public void run() {
             runnable.run();
             runner = null;
         } catch (Throwable ex) {
-            Exceptions.throwIfFatal(ex);
+            // Exceptions.throwIfFatal(ex); nowhere to go
             runner = null;
-            lazySet(FINISHED);
+            dispose();
             RxJavaPlugins.onError(ex);
+            throw ex;
         }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
index d48ccf8ab6..4959342d06 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
@@ -18,6 +18,8 @@
 
 import java.util.concurrent.Callable;
 
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
 /**
  * A Callable to be submitted to an ExecutorService that runs a Runnable
  * action and manages completion/cancellation.
@@ -35,10 +37,16 @@ public ScheduledDirectTask(Runnable runnable) {
     public Void call() {
         runner = Thread.currentThread();
         try {
-            runnable.run();
-        } finally {
-            lazySet(FINISHED);
-            runner = null;
+            try {
+                runnable.run();
+            } finally {
+                lazySet(FINISHED);
+                runner = null;
+            }
+        } catch (Throwable ex) {
+            // Exceptions.throwIfFatal(e); nowhere to go
+            RxJavaPlugins.onError(ex);
+            throw ex;
         }
         return null;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
index 45072a2abd..d437985890 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
@@ -66,6 +66,7 @@ public void run() {
             } catch (Throwable e) {
                 // Exceptions.throwIfFatal(e); nowhere to go
                 RxJavaPlugins.onError(e);
+                throw e;
             }
         } finally {
             lazySet(THREAD_INDEX, null);
diff --git a/src/test/java/io/reactivex/rxjava3/core/DisposeTaskTest.java b/src/test/java/io/reactivex/rxjava3/core/DisposeTaskTest.java
new file mode 100644
index 0000000000..64a13fdb6d
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/core/DisposeTaskTest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.core;
+
+import static org.junit.Assert.fail;
+import static org.testng.Assert.assertTrue;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Scheduler.DisposeTask;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class DisposeTaskTest extends RxJavaTest {
+
+    @Test
+    public void runnableThrows() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+
+            Scheduler.Worker worker = Schedulers.single().createWorker();
+
+            DisposeTask task = new DisposeTask(() -> {
+                throw new TestException();
+            }, worker);
+
+            try {
+                task.run();
+                fail("Should have thrown!");
+            } catch (TestException expected) {
+                // expected
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            assertTrue(worker.isDisposed());
+        });
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/core/PeriodicDirectTaskTest.java b/src/test/java/io/reactivex/rxjava3/core/PeriodicDirectTaskTest.java
new file mode 100644
index 0000000000..cd8469ae07
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/core/PeriodicDirectTaskTest.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.core;
+
+import static org.junit.Assert.fail;
+import static org.testng.Assert.assertTrue;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Scheduler.PeriodicDirectTask;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class PeriodicDirectTaskTest extends RxJavaTest {
+
+    @Test
+    public void runnableThrows() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            Scheduler.Worker worker = Schedulers.single().createWorker();
+
+            PeriodicDirectTask task = new PeriodicDirectTask(() -> {
+                throw new TestException();
+            }, worker);
+
+            try {
+                task.run();
+                fail("Should have thrown!");
+            } catch (TestException expected) {
+                // expected
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+
+            assertTrue(worker.isDisposed());
+
+            task.run();
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/BooleanRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/BooleanRunnableTest.java
new file mode 100644
index 0000000000..424d108e8a
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/BooleanRunnableTest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.schedulers;
+
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.schedulers.ExecutorScheduler.ExecutorWorker.BooleanRunnable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class BooleanRunnableTest extends RxJavaTest {
+
+    @Test
+    public void runnableThrows() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            BooleanRunnable task = new BooleanRunnable(() -> {
+                throw new TestException();
+            });
+
+            try {
+                task.run();
+                fail("Should have thrown!");
+            } catch (TestException expected) {
+                // expected
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
index 7b7299f309..2f530f2afa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
@@ -44,7 +44,12 @@ public void run() {
                 }
             }, exec);
 
-            assertNull(task.call());
+            try {
+                task.call();
+                fail("Should have thrown!");
+            } catch (TestException excepted) {
+                // excepted
+            }
 
             TestHelper.assertUndeliverable(errors, 0, TestException.class);
         } finally {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/InterruptibleRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InterruptibleRunnableTest.java
new file mode 100644
index 0000000000..9abc100862
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InterruptibleRunnableTest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.schedulers;
+
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.internal.schedulers.ExecutorScheduler.ExecutorWorker.InterruptibleRunnable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class InterruptibleRunnableTest extends RxJavaTest {
+
+    @Test
+    public void runnableThrows() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            InterruptibleRunnable task = new InterruptibleRunnable(() -> {
+                throw new TestException();
+            }, null);
+
+            try {
+                task.run();
+                fail("Should have thrown!");
+            } catch (TestException expected) {
+                // expected
+            }
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
index 23afeca2ce..7736d5e40b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
@@ -13,6 +13,8 @@
 
 package io.reactivex.rxjava3.internal.schedulers;
 
+import static org.junit.Assert.fail;
+
 import java.util.List;
 
 import org.junit.Test;
@@ -35,7 +37,12 @@ public void run() {
                 }
             });
 
-            task.run();
+            try {
+                task.run();
+                fail("Should have thrown!");
+            } catch (TestException expected) {
+                // expected
+            }
 
             TestHelper.assertUndeliverable(errors, 0, TestException.class);
         } finally {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
index a8920fbd93..f0577e41ca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
@@ -208,7 +208,12 @@ public void run() {
             }, set);
             set.add(run);
 
-            run.run();
+            try {
+                run.run();
+                fail("Should have thrown!");
+            } catch (TestException expected) {
+                // expected
+            }
 
             assertTrue(run.isDisposed());
 
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
index 0e6248cc89..582a419b13 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
@@ -17,14 +17,16 @@
 
 import java.util.HashMap;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.schedulers.ComputationScheduler;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public class ComputationSchedulerTests extends AbstractSchedulerConcurrencyTests {
 
@@ -192,4 +194,127 @@ public void run() {
 
         assertEquals(0, calls[0]);
     }
+
+    @Test
+    public void exceptionFromObservableShouldNotBeSwallowed() throws Exception {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        // #3 thread's uncaught exception handler
+        Scheduler computationScheduler = new ComputationScheduler(new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread t = new Thread(r);
+                t.setUncaughtExceptionHandler((thread, throwable) -> {
+                    latch.countDown();
+                });
+                return t;
+            }
+        });
+
+        // #2 RxJava exception handler
+        RxJavaPlugins.setErrorHandler(h -> {
+            latch.countDown();
+        });
+
+        // Exceptions, fatal or not, should be handled by
+        // #1 observer's onError(), or
+        // #2 RxJava exception handler, or
+        // #3 thread's uncaught exception handler,
+        // and should not be swallowed.
+        try {
+
+            // #1 observer's onError()
+            Observable.create(s -> {
+
+                s.onNext(1);
+                throw new OutOfMemoryError();
+            })
+            .subscribeOn(computationScheduler)
+            .subscribe(v -> { },
+                e -> { latch.countDown(); }
+            );
+
+            assertTrue(latch.await(2, TimeUnit.SECONDS));
+        } finally {
+            RxJavaPlugins.reset();
+            computationScheduler.shutdown();
+        }
+    }
+
+    @Test
+    public void exceptionFromObserverShouldNotBeSwallowed() throws Exception {
+        CountDownLatch latch = new CountDownLatch(1);
+
+        // #3 thread's uncaught exception handler
+        Scheduler computationScheduler = new ComputationScheduler(new ThreadFactory() {
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread t = new Thread(r);
+                t.setUncaughtExceptionHandler((thread, throwable) -> {
+                    latch.countDown();
+                });
+                return t;
+            }
+        });
+
+        // #2 RxJava exception handler
+        RxJavaPlugins.setErrorHandler(h -> {
+            latch.countDown();
+        });
+
+        // Exceptions, fatal or not, should be handled by
+        // #1 observer's onError(), or
+        // #2 RxJava exception handler, or
+        // #3 thread's uncaught exception handler,
+        // and should not be swallowed.
+        try {
+
+            // #1 observer's onError()
+            Flowable.interval(500, TimeUnit.MILLISECONDS, computationScheduler)
+                    .subscribe(v -> {
+                        throw new OutOfMemoryError();
+                    }, e -> {
+                        latch.countDown();
+                    });
+
+            assertTrue(latch.await(2, TimeUnit.SECONDS));
+        } finally {
+            RxJavaPlugins.reset();
+            computationScheduler.shutdown();
+        }
+    }
+
+    @Test
+    public void periodicTaskShouldStopOnError() throws Exception {
+        AtomicInteger repeatCount = new AtomicInteger();
+
+        Schedulers.computation().schedulePeriodicallyDirect(new Runnable() {
+            @Override
+            public void run() {
+                repeatCount.incrementAndGet();
+                throw new OutOfMemoryError();
+            }
+        }, 0, 1, TimeUnit.MILLISECONDS);
+
+        Thread.sleep(200);
+
+        assertEquals(1, repeatCount.get());
+    }
+
+    @Test
+    public void periodicTaskShouldStopOnError2() throws Exception {
+        AtomicInteger repeatCount = new AtomicInteger();
+
+        Schedulers.computation().schedulePeriodicallyDirect(new Runnable() {
+            @Override
+            public void run() {
+                repeatCount.incrementAndGet();
+                throw new OutOfMemoryError();
+            }
+        }, 0, 1, TimeUnit.NANOSECONDS);
+
+        Thread.sleep(200);
+
+        assertEquals(1, repeatCount.get());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java
index fa97b1c0e7..d55578d663 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java
@@ -61,18 +61,28 @@ public void run() {
         assertEquals(2, count[0]);
     }
 
-    @Test(expected = TestException.class)
-    public void periodicDirectThrows() {
-        TestScheduler scheduler = new TestScheduler();
+    @Test
+    public void periodicDirectThrows() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            TestScheduler scheduler = new TestScheduler();
 
-        scheduler.schedulePeriodicallyDirect(new Runnable() {
-            @Override
-            public void run() {
-                throw new TestException();
+            try {
+                scheduler.schedulePeriodicallyDirect(new Runnable() {
+                    @Override
+                    public void run() {
+                        throw new TestException();
+                    }
+                }, 100, 100, TimeUnit.MILLISECONDS);
+
+                scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);
+
+                fail("Should have thrown!");
+            } catch (TestException expected) {
+                // expected
             }
-        }, 100, 100, TimeUnit.MILLISECONDS);
 
-        scheduler.advanceTimeBy(100, TimeUnit.MILLISECONDS);
+            TestHelper.assertUndeliverable(errors, 0, TestException.class);
+        });
     }
 
     @Test
@@ -233,7 +243,7 @@ public void run() {
 
             Thread.sleep(250);
 
-            assertEquals(1, list.size());
+            assertTrue(list.size() >= 1);
             TestHelper.assertUndeliverable(list, 0, TestException.class, null);
 
         } finally {

From 77c2ef1605302e9405467558d6b0e97b4e9d46c7 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 27 Apr 2020 10:46:40 +0200
Subject: [PATCH 119/665] 3.x: Allow setting the drift tolerance timeunit via
 system property (#6969)

---
 .../io/reactivex/rxjava3/core/Scheduler.java  | 43 +++++++++++++++----
 .../reactivex/rxjava3/core/SchedulerTest.java | 37 ++++++++++++++++
 2 files changed, 71 insertions(+), 9 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
index 069c3d5bfb..bd121c06c4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
@@ -73,8 +73,8 @@
  * based on the relative time between it and {@link Worker#now(TimeUnit)}. However, drifts or changes in the
  * system clock could affect this calculation either by scheduling subsequent runs too frequently or too far apart.
  * Therefore, the default implementation uses the {@link #clockDriftTolerance()} value (set via
- * {@code rx3.scheduler.drift-tolerance} in minutes) to detect a drift in {@link Worker#now(TimeUnit)} and
- * re-adjust the absolute/relative time calculation accordingly.
+ * {@code rx3.scheduler.drift-tolerance} and {@code rx3.scheduler.drift-tolerance-unit}) to detect a
+ * drift in {@link Worker#now(TimeUnit)} and re-adjust the absolute/relative time calculation accordingly.
  * <p>
  * The default implementations of {@link #start()} and {@link #shutdown()} do nothing and should be overridden if the
  * underlying task-execution scheme supports stopping and restarting itself.
@@ -91,17 +91,42 @@ public abstract class Scheduler {
     /**
      * The tolerance for a clock drift in nanoseconds where the periodic scheduler will rebase.
      * <p>
-     * The associated system parameter, {@code rx3.scheduler.drift-tolerance}, expects its value in minutes.
+     * Associated system parameters:
+     * <ul>
+     * <li>{@code rx3.scheduler.drift-tolerance}, long, default {@code 15}</li>
+     * <li>{@code rx3.scheduler.drift-tolerance-unit}, string, default {@code minutes},
+     *     supports {@code seconds} and {@code milliseconds}.
+     * </ul>
      */
-    static final long CLOCK_DRIFT_TOLERANCE_NANOSECONDS;
-    static {
-        CLOCK_DRIFT_TOLERANCE_NANOSECONDS = TimeUnit.MINUTES.toNanos(
-                Long.getLong("rx3.scheduler.drift-tolerance", 15));
+    static final long CLOCK_DRIFT_TOLERANCE_NANOSECONDS =
+            computeClockDrift(
+                    Long.getLong("rx3.scheduler.drift-tolerance", 15),
+                    System.getProperty("rx3.scheduler.drift-tolerance-unit", "minutes")
+            );
+
+    /**
+     * Returns the clock drift tolerance in nanoseconds based on the input selection.
+     * @param time the time value
+     * @param timeUnit the time unit string
+     * @return the time amount in nanoseconds
+     */
+    static long computeClockDrift(long time, String timeUnit) {
+        if ("seconds".equalsIgnoreCase(timeUnit)) {
+            return TimeUnit.SECONDS.toNanos(time);
+        } else if ("milliseconds".equalsIgnoreCase(timeUnit)) {
+            return TimeUnit.MILLISECONDS.toNanos(time);
+        }
+        return TimeUnit.MINUTES.toNanos(time);
     }
 
     /**
      * Returns the clock drift tolerance in nanoseconds.
-     * <p>Related system property: {@code rx3.scheduler.drift-tolerance} in minutes.
+     * <p>Related system properties:
+     * <ul>
+     * <li>{@code rx3.scheduler.drift-tolerance}, long, default {@code 15}</li>
+     * <li>{@code rx3.scheduler.drift-tolerance-unit}, string, default {@code minutes},
+     *     supports {@code seconds} and {@code milliseconds}.
+     * </ul>
      * @return the tolerance in nanoseconds
      * @since 2.0
      */
@@ -350,7 +375,7 @@ public <S extends Scheduler & Disposable> S when(@NonNull Function<Flowable<Flow
      * based on the relative time between it and {@link #now(TimeUnit)}. However, drifts or changes in the
      * system clock would affect this calculation either by scheduling subsequent runs too frequently or too far apart.
      * Therefore, the default implementation uses the {@link #clockDriftTolerance()} value (set via
-     * {@code rx3.scheduler.drift-tolerance} in minutes) to detect a drift in {@link #now(TimeUnit)} and
+     * {@code rx3.scheduler.drift-tolerance} and {@code rx3.scheduler.drift-tolerance-unit}) to detect a drift in {@link #now(TimeUnit)} and
      * re-adjust the absolute/relative time calculation accordingly.
      * <p>
      * If the {@code Worker} is disposed, the {@code schedule} methods
diff --git a/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java b/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java
new file mode 100644
index 0000000000..a8e661fe75
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.reactivex.rxjava3.core;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class SchedulerTest {
+
+    @Test
+    public void clockDriftCalculation() {
+        assertEquals(100_000_000L, Scheduler.computeClockDrift(100, "milliseconds"));
+
+        assertEquals(2_000_000_000L, Scheduler.computeClockDrift(2, "seconds"));
+
+        assertEquals(180_000_000_000L, Scheduler.computeClockDrift(3, "minutes"));
+
+        assertEquals(240_000_000_000L, Scheduler.computeClockDrift(4, "random"));
+
+        assertEquals(300_000_000_000L, Scheduler.computeClockDrift(5, null));
+    }
+
+}

From eb58c59160ce5f3749396c7002d4c8fe162663a6 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 10 May 2020 10:52:29 +0200
Subject: [PATCH 120/665] 3.x: Fix Flowable.groupBy eviction logic double
 decrement and hang (#6975)

---
 .../operators/flowable/FlowableGroupBy.java   |  7 +--
 .../flowable/FlowableGroupByTest.java         | 46 +++++++++++++++++++
 2 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
index 9a42e927bc..9e204f1741 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
@@ -270,9 +270,10 @@ private void completeEvictions() {
 
         public void cancel(K key) {
             Object mapKey = key != null ? key : NULL_KEY;
-            groups.remove(mapKey);
-            if (groupCount.decrementAndGet() == 0) {
-                upstream.cancel();
+            if (groups.remove(mapKey) != null) {
+                if (groupCount.decrementAndGet() == 0) {
+                    upstream.cancel();
+                }
             }
         }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index 21b7f8fb24..781a310697 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -2558,4 +2558,50 @@ public void subscribeAbandonRace() throws Throwable {
             ts.assertValueCount(1);
         }
     }
+
+    @Test
+    public void issue6974() {
+
+        FlowableTransformer<Integer, Integer> operation =
+                source -> source.publish(shared ->
+                    shared
+                    .firstElement()
+                    .flatMapPublisher(firstElement ->
+                        Flowable.just(firstElement).concatWith(shared)
+                    )
+                );
+
+        issue6974Run(20, 500_000, 20 - 1, 20 * 2, operation, false);
+
+        issue6974Run(20, 500_000, 20, 20 * 2, operation, false);
+    }
+
+    static void issue6974Run(int groups, int iterations, int sizeCap, int flatMapConcurrency,
+            FlowableTransformer<Integer, Integer> operation, boolean notifyOnExplicitRevoke) {
+        TestSubscriber<Integer> test = Flowable
+                .range(1, groups)
+                .repeat(iterations / groups)
+                .groupBy(i -> i, i -> i, false, 128, sizeCap(sizeCap, notifyOnExplicitRevoke))
+                .flatMap(gf -> gf.compose(operation), flatMapConcurrency)
+                .test();
+        test.awaitDone(5, TimeUnit.SECONDS);
+        test.assertValueCount(iterations);
+    }
+
+    static <T> Function<Consumer<Object>, Map<T, Object>> sizeCap(int maxCapacity, boolean notifyOnExplicit) {
+        return itemEvictConsumer ->
+        CacheBuilder
+        .newBuilder()
+        .maximumSize(maxCapacity)
+        .removalListener(notification -> {
+            if (notification.getCause() != RemovalCause.EXPLICIT || notifyOnExplicit) {
+                try {
+                    itemEvictConsumer.accept(notification.getValue());
+                } catch (Throwable throwable) {
+                    throw new RuntimeException(throwable);
+                }
+            }
+        })
+        .<T, Object>build().asMap();
+    }
 }

From 5c26064196c41437c7410b1687ace4386d19856a Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 13 May 2020 09:52:23 +0200
Subject: [PATCH 121/665] 3.x: Fix Flowable.groupBy
 cancellation/cleanup/eviction race hangs (#6979)

---
 .../operators/flowable/FlowableGroupBy.java   | 102 +++++++++++-------
 .../flowable/FlowableGroupByTest.java         |  89 +++++++++++++++
 2 files changed, 155 insertions(+), 36 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
index 9e204f1741..7ad3d1eed8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
@@ -259,8 +259,9 @@ private void completeEvictions() {
                 int count = 0;
                 GroupedUnicast<K, V> evictedGroup;
                 while ((evictedGroup = evictedGroups.poll()) != null) {
-                    evictedGroup.onComplete();
-                    count++;
+                    if (evictedGroup.state.tryComplete()) {
+                        count++;
+                    }
                 }
                 if (count != 0) {
                     groupCount.addAndGet(-count);
@@ -383,6 +384,8 @@ static final class State<T, K> extends BasicIntQueueSubscription<T> implements P
         static final int ABANDONED = 2;
         static final int ABANDONED_HAS_SUBSCRIBER = ABANDONED | HAS_SUBSCRIBER;
 
+        final AtomicBoolean evictOnce = new AtomicBoolean();
+
         State(int bufferSize, GroupBySubscriber<?, K, T> parent, K key, boolean delayError) {
             this.queue = new SpscLinkedArrayQueue<>(bufferSize);
             this.parent = parent;
@@ -444,9 +447,18 @@ public void onComplete() {
             drain();
         }
 
+        boolean tryComplete() {
+            boolean canEvict = evictOnce.compareAndSet(false, true);
+            done = true;
+            drain();
+            return canEvict;
+        }
+
         void cancelParent() {
             if ((once.get() & ABANDONED) == 0) {
-                parent.cancel(key);
+                if (evictOnce.compareAndSet(false, true)) {
+                    parent.cancel(key);
+                }
             }
         }
 
@@ -518,37 +530,44 @@ void drainNormal() {
             final SpscLinkedArrayQueue<T> q = queue;
             final boolean delayError = this.delayError;
             Subscriber<? super T> a = actual.get();
+            final AtomicBoolean cancelled = this.cancelled;
+
+            outer:
             for (;;) {
-                if (a != null) {
-                    long r = requested.get();
-                    long e = 0;
+                if (cancelled.get()) {
+                    cleanupQueue(0, false);
+                } else {
+                    if (a != null) {
+                        long r = requested.get();
+                        long e = 0;
 
-                    while (e != r) {
-                        boolean d = done;
-                        T v = q.poll();
-                        boolean empty = v == null;
+                        while (e != r) {
+                            boolean d = done;
+                            T v = q.poll();
+                            boolean empty = v == null;
 
-                        if (checkTerminated(d, empty, a, delayError, e)) {
-                            return;
-                        }
+                            if (checkTerminated(d, empty, a, delayError, e, !empty)) {
+                                continue outer;
+                            }
 
-                        if (empty) {
-                            break;
-                        }
+                            if (empty) {
+                                break;
+                            }
 
-                        a.onNext(v);
+                            a.onNext(v);
 
-                        e++;
-                    }
+                            e++;
+                        }
 
-                    if (e == r && checkTerminated(done, q.isEmpty(), a, delayError, e)) {
-                        return;
-                    }
+                        if (e == r && checkTerminated(done, q.isEmpty(), a, delayError, e, false)) {
+                            continue outer;
+                        }
 
-                    if (e != 0L) {
-                        BackpressureHelper.produced(requested, e);
-                        // replenish based on this batch run
-                        requestParent(e);
+                        if (e != 0L) {
+                            BackpressureHelper.produced(requested, e);
+                            // replenish based on this batch run
+                            requestParent(e);
+                        }
                     }
                 }
 
@@ -568,23 +587,32 @@ void requestParent(long e) {
             }
         }
 
-        boolean checkTerminated(boolean d, boolean empty, Subscriber<? super T> a, boolean delayError, long emitted) {
+        void cleanupQueue(long emitted, boolean polled) {
+            // if this group is canceled, all accumulated emissions and
+            // remaining items in the queue should be requested
+            // so that other groups can proceed
+            while (queue.poll() != null) {
+                emitted++;
+            }
+            if (polled) {
+                emitted++;
+            }
+            if (emitted != 0L) {
+                requestParent(emitted);
+            }
+        }
+
+        boolean checkTerminated(boolean d, boolean empty, Subscriber<? super T> a,
+                boolean delayError, long emitted, boolean polled) {
             if (cancelled.get()) {
-                // if this group is canceled, all accumulated emissions and
-                // remaining items in the queue should be requested
-                // so that other groups can proceed
-                while (queue.poll() != null) {
-                    emitted++;
-                }
-                if (emitted != 0L) {
-                    requestParent(emitted);
-                }
+                cleanupQueue(emitted, polled);
                 return true;
             }
 
             if (d) {
                 if (delayError) {
                     if (empty) {
+                        cancelled.lazySet(true);
                         Throwable e = error;
                         if (e != null) {
                             a.onError(e);
@@ -597,10 +625,12 @@ boolean checkTerminated(boolean d, boolean empty, Subscriber<? super T> a, boole
                     Throwable e = error;
                     if (e != null) {
                         queue.clear();
+                        cancelled.lazySet(true);
                         a.onError(e);
                         return true;
                     } else
                     if (empty) {
+                        cancelled.lazySet(true);
                         a.onComplete();
                         return true;
                     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index 781a310697..3b85d583b9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -2604,4 +2604,93 @@ static <T> Function<Consumer<Object>, Map<T, Object>> sizeCap(int maxCapacity, b
         })
         .<T, Object>build().asMap();
     }
+
+    static void issue6974RunPart2(int groupByBufferSize, int flatMapMaxConcurrency, int groups,
+            boolean notifyOnExplicitEviction) {
+        TestSubscriber<Integer> ts = Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .groupBy(i -> i, i -> i, false, groupByBufferSize,
+                // set cap too high
+                sizeCap(groups * 100, notifyOnExplicitEviction))
+        .flatMap(gf -> gf
+                .take(10, TimeUnit.MILLISECONDS)
+                , flatMapMaxConcurrency)
+        .test();
+
+        ts
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void issue6974Part2Case1() {
+        final int groups = 20;
+
+        // Not completed (Timed out), buffer is too small
+        int groupByBufferSize = groups * 2;
+        int flatMapMaxConcurrency = 2 * groups;
+        boolean notifyOnExplicitEviction = false;
+        issue6974RunPart2(groupByBufferSize, flatMapMaxConcurrency, groups, notifyOnExplicitEviction);
+    }
+
+    @Test
+    public void issue6974Part2Case2() {
+        final int groups = 20;
+
+        // Timeout... explicit eviction notification makes difference
+        int groupByBufferSize = groups * 30;
+        int flatMapMaxConcurrency = 2 * groups;
+        boolean notifyOnExplicitEviction = true;
+        issue6974RunPart2(groupByBufferSize, flatMapMaxConcurrency, groups, notifyOnExplicitEviction);
+    }
+
+    /*
+     * Disabled: Takes very long. Run it locally only.
+    @Test
+    public void issue6974Part2Case2Loop() {
+        for (int i = 0; i < 1000; i++) {
+            issue6974Part2Case2();
+        }
+    }
+    */
+
+    static void issue6974RunPart2NoEvict(int groupByBufferSize, int flatMapMaxConcurrency, int groups,
+            boolean notifyOnExplicitEviction) {
+        TestSubscriber<Integer> ts = Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .groupBy(i -> i)
+        .flatMap(gf -> gf
+                .take(10, TimeUnit.MILLISECONDS)
+                , flatMapMaxConcurrency)
+        .test();
+
+        ts
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void issue6974Part2Case1NoEvict() {
+        final int groups = 20;
+
+        // Not completed (Timed out), buffer is too small
+        int groupByBufferSize = groups * 2;
+        int flatMapMaxConcurrency = 2 * groups;
+        boolean notifyOnExplicitEviction = false;
+        issue6974RunPart2NoEvict(groupByBufferSize, flatMapMaxConcurrency, groups, notifyOnExplicitEviction);
+    }
+
+    /*
+     * Disabled: Takes very long. Run it locally only.
+    @Test
+    public void issue6974Part2Case1NoEvictLoop() {
+        for (int i = 0; i < 1000; i++) {
+            issue6974Part2Case1NoEvict();
+        }
+    }
+    */
 }

From 125bd057b1ce20e2c848cdbc5a2f7c42585fb827 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 15 May 2020 12:33:27 +0200
Subject: [PATCH 122/665] 3.x: Disable fusion on the groups of Flowable.groupBy
 (#6983)

---
 .../operators/flowable/FlowableGroupBy.java   |   3 +
 .../flowable/FlowableGroupByTest.java         | 187 +++++++++++++++++-
 2 files changed, 188 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
index 7ad3d1eed8..8dc325fbde 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
@@ -642,10 +642,13 @@ boolean checkTerminated(boolean d, boolean empty, Subscriber<? super T> a,
 
         @Override
         public int requestFusion(int mode) {
+            // FIXME fusion mode causes hangs
+            /*
             if ((mode & ASYNC) != 0) {
                 outputFused = true;
                 return ASYNC;
             }
+            */
             return NONE;
         }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index 3b85d583b9..e606d821f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -22,7 +22,7 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.Test;
+import org.junit.*;
 import org.mockito.Mockito;
 import org.reactivestreams.*;
 
@@ -1671,7 +1671,9 @@ public void accept(GroupedFlowable<Integer, Integer> g) {
         .subscribe(ts2);
 
         ts1
-        .assertFusionMode(QueueFuseable.ASYNC)
+        // FIXME fusion mode causes hangs
+        //.assertFusionMode(QueueFuseable.ASYNC)
+        .assertFusionMode(QueueFuseable.NONE)
         .assertValues(2, 3, 4, 5, 6, 7, 8, 9, 10, 11)
         .assertNoErrors()
         .assertComplete();
@@ -2693,4 +2695,185 @@ public void issue6974Part2Case1NoEvictLoop() {
         }
     }
     */
+
+    @Test
+    public void issue6974Part2Case1ObserveOn() {
+        final int groups = 20;
+
+        // Not completed (Timed out), buffer is too small
+        int groupByBufferSize = groups * 2;
+        int flatMapMaxConcurrency = 2 * groups;
+        boolean notifyOnExplicitEviction = false;
+
+        Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .doOnCancel(() -> {
+            System.out.println("Cancelling upstream");
+        })
+        .groupBy(i -> i, i -> i, false, groupByBufferSize,
+                              sizeCap(groups * 2, notifyOnExplicitEviction))
+        .flatMap(gf -> gf
+                     .observeOn(Schedulers.computation())
+                     // .take(10)
+                     .take(10, TimeUnit.MILLISECONDS)
+            , flatMapMaxConcurrency)
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void issue6974Part2Case1ObserveOnHide() {
+        final int groups = 20;
+
+        // Not completed (Timed out), buffer is too small
+        int groupByBufferSize = groups * 2;
+        int flatMapMaxConcurrency = 2 * groups;
+        boolean notifyOnExplicitEviction = false;
+
+        Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .doOnCancel(() -> System.out.println("Cancelling upstream"))
+        .groupBy(i -> i, i -> i, false, groupByBufferSize,
+                              sizeCap(groups * 2, notifyOnExplicitEviction))
+        .flatMap(gf -> gf
+                     .hide()
+                     .observeOn(Schedulers.computation())
+                     // .take(10)
+                     .take(10, TimeUnit.MILLISECONDS)
+            , flatMapMaxConcurrency)
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void issue6974Part2Case1ObserveOnNoCap() {
+        final int groups = 20;
+
+        // Not completed (Timed out), buffer is too small
+        int flatMapMaxConcurrency = 1_000_000;
+
+        Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .doOnRequest(v -> {
+            System.out.println("Source: " + v);
+        })
+        .groupBy(i -> i)
+        .flatMap(gf -> gf
+                     .observeOn(Schedulers.computation())
+                     // .take(10)
+                     .take(10, TimeUnit.MILLISECONDS)
+            , flatMapMaxConcurrency)
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void issue6974Part2Case1ObserveOnNoCapHide() {
+        final int groups = 20;
+
+        // Not completed (Timed out), buffer is too small
+        int flatMapMaxConcurrency = 1_000_000;
+
+        Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .doOnRequest(v -> {
+            System.out.println("Source: " + v);
+        })
+        .groupBy(i -> i)
+        .flatMap(gf -> gf
+                     .hide()
+                     .observeOn(Schedulers.computation())
+                     // .take(10)
+                     .take(10, TimeUnit.MILLISECONDS)
+            , flatMapMaxConcurrency)
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    /*
+     * Disabled: Takes very long. Run it locally only.
+    @Test
+    public void issue6974Part2Case1ObserveOnNoCapHideLoop() {
+        for (int i = 0; i < 100; i++) {
+            issue6974Part2Case1ObserveOnNoCapHide();
+        }
+    }
+    */
+
+    @Test
+    public void issue6974Part2Case1ObserveOnConditional() {
+        final int groups = 20;
+
+        // Not completed (Timed out), buffer is too small
+        int groupByBufferSize = groups * 2;
+        int flatMapMaxConcurrency = 2 * groups;
+        boolean notifyOnExplicitEviction = false;
+
+        Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .doOnCancel(() -> System.out.println("Cancelling upstream"))
+        .groupBy(i -> i, i -> i, false, groupByBufferSize,
+                              sizeCap(groups * 2, notifyOnExplicitEviction))
+        .flatMap(gf -> gf
+                     .observeOn(Schedulers.computation())
+                     .filter(v -> true)
+                     // .take(10)
+                     .take(10, TimeUnit.MILLISECONDS)
+            , flatMapMaxConcurrency)
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void issue6974Part2Case1ObserveOnConditionalHide() {
+        final int groups = 20;
+
+        // Not completed (Timed out), buffer is too small
+        int groupByBufferSize = groups * 2;
+        int flatMapMaxConcurrency = 2 * groups;
+        boolean notifyOnExplicitEviction = false;
+
+        Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .doOnCancel(() -> System.out.println("Cancelling upstream"))
+        .groupBy(i -> i, i -> i, false, groupByBufferSize,
+                              sizeCap(groups * 2, notifyOnExplicitEviction))
+        .flatMap(gf -> gf
+                     .hide()
+                     .observeOn(Schedulers.computation())
+                     .filter(v -> true)
+                     // .take(10)
+                     .take(10, TimeUnit.MILLISECONDS)
+            , flatMapMaxConcurrency)
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    /*
+     * Disabled: Takes very long. Run it locally only.
+    @Test
+    public void issue6974Part2Case1ObserveOnHideLoop() {
+        for (int i = 0; i < 100; i++) {
+            issue6974Part2Case1ObserveOnHide();
+        }
+    }
+    */
 }

From ca222c2909bd8e1958c1241df4412bea1fbc543d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Brais=20Gab=C3=ADn?= <braisgabin@gmail.com>
Date: Tue, 19 May 2020 21:28:57 +0200
Subject: [PATCH 123/665] Add missing `@Test` annotation (#6990)

---
 .../java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
index eb06a1a0ea..106f85bfc5 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
@@ -797,6 +797,7 @@ public void getValuesUnbounded() {
 
     }
 
+    @Test
     public void createInvalidCapacity() {
         try {
             ReplaySubject.create(-99);

From e2b1d2fc6c2ff7ad5551f6d5a14aafb37c1bb5bc Mon Sep 17 00:00:00 2001
From: Derar Bakr <derar.bakr@gmail.com>
Date: Wed, 20 May 2020 21:55:39 +0300
Subject: [PATCH 124/665] Removed unnecessary upstream.cancel() call for
 casually finished upstream sequences. (#6992)

* no upstream.cancel() in FlowablePublishMulticast when the sequence is finished normally via onComplete/onError from upstream;
minor code cleanup - unnecessary Disposable implementation to avoid method name clash

* cleanup in FlowablePublishFunctionTest: refactored anonymous classes to lambdas

* reduced visibility for dispose() and isDisposed() in the inner MulticastProcessor

Co-authored-by: derar <derar@appsflyer.com>
---
 .../flowable/FlowablePublishMulticast.java    |  21 +-
 .../flowable/FlowablePublishFunctionTest.java | 254 ++++++------------
 2 files changed, 93 insertions(+), 182 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
index 05e0e7a907..26dbaa7f4b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
@@ -22,7 +22,6 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.fuseable.*;
@@ -124,7 +123,7 @@ public void cancel() {
         }
     }
 
-    static final class MulticastProcessor<T> extends Flowable<T> implements FlowableSubscriber<T>, Disposable {
+    static final class MulticastProcessor<T> extends Flowable<T> implements FlowableSubscriber<T> {
 
         @SuppressWarnings("rawtypes")
         static final MulticastSubscription[] EMPTY = new MulticastSubscription[0];
@@ -192,19 +191,19 @@ public void onSubscribe(Subscription s) {
             }
         }
 
-        @Override
-        public void dispose() {
-            SubscriptionHelper.cancel(upstream);
-            if (wip.getAndIncrement() == 0) {
-                SimpleQueue<T> q = queue;
-                if (q != null) {
-                    q.clear();
+        void dispose() {
+            if (!done) {
+                SubscriptionHelper.cancel(upstream);
+                if (wip.getAndIncrement() == 0) {
+                    SimpleQueue<T> q = queue;
+                    if (q != null) {
+                        q.clear();
+                    }
                 }
             }
         }
 
-        @Override
-        public boolean isDisposed() {
+        boolean isDisposed() {
             return upstream.get() == SubscriptionHelper.CANCELLED;
         }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
index 69ed3a4aed..62998eb543 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.*;
 
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.junit.*;
@@ -26,7 +27,6 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.processors.PublishProcessor;
@@ -39,12 +39,9 @@ public class FlowablePublishFunctionTest extends RxJavaTest {
     public void concatTakeFirstLastCompletes() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
 
-        Flowable.range(1, 3).publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
-            @Override
-            public Flowable<Integer> apply(Flowable<Integer> f) {
-                return Flowable.concat(f.take(5), f.takeLast(5));
-            }
-        }).subscribe(ts);
+        Flowable.range(1, 3)
+                .publish(f -> Flowable.concat(f.take(5), f.takeLast(5)))
+                .subscribe(ts);
 
         ts.assertValues(1, 2, 3);
         ts.assertNoErrors();
@@ -55,12 +52,9 @@ public Flowable<Integer> apply(Flowable<Integer> f) {
     public void concatTakeFirstLastBackpressureCompletes() {
         TestSubscriber<Integer> ts = TestSubscriber.create(0L);
 
-        Flowable.range(1, 6).publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
-            @Override
-            public Flowable<Integer> apply(Flowable<Integer> f) {
-                return Flowable.concat(f.take(5), f.takeLast(5));
-            }
-        }).subscribe(ts);
+        Flowable.range(1, 6)
+                .publish(f -> Flowable.concat(f.take(5), f.takeLast(5)))
+                .subscribe(ts);
 
         ts.assertNoValues();
         ts.assertNoErrors();
@@ -86,12 +80,7 @@ public void canBeCancelled() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        pp.publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
-            @Override
-            public Flowable<Integer> apply(Flowable<Integer> f) {
-                return Flowable.concat(f.take(5), f.takeLast(5));
-            }
-        }).subscribe(ts);
+        pp.publish(f -> Flowable.concat(f.take(5), f.takeLast(5))).subscribe(ts);
 
         pp.onNext(1);
         pp.onNext(2);
@@ -108,8 +97,7 @@ public Flowable<Integer> apply(Flowable<Integer> f) {
     @Test
     public void invalidPrefetch() {
         try {
-            Flowable.<Integer>never().publish(
-                    Functions.<Flowable<Integer>>identity(), -99);
+            Flowable.<Integer>never().publish(Functions.identity(), -99);
             fail("Didn't throw IllegalArgumentException");
         } catch (IllegalArgumentException ex) {
             Assert.assertEquals("prefetch > 0 required but it was -99", ex.getMessage());
@@ -122,12 +110,7 @@ public void takeCompletes() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        pp.publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
-            @Override
-            public Flowable<Integer> apply(Flowable<Integer> f) {
-                return f.take(1);
-            }
-        }).subscribe(ts);
+        pp.publish(f -> f.take(1)).subscribe(ts);
 
         pp.onNext(1);
 
@@ -153,12 +136,7 @@ public void onStart() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        pp.publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
-            @Override
-            public Flowable<Integer> apply(Flowable<Integer> f) {
-                return f.take(1);
-            }
-        }).subscribe(ts);
+        pp.publish(f -> f.take(1)).subscribe(ts);
 
         Assert.assertEquals(1, startCount.get());
     }
@@ -169,12 +147,7 @@ public void takeCompletesUnsafe() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        pp.publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
-            @Override
-            public Flowable<Integer> apply(Flowable<Integer> f) {
-                return f.take(1);
-            }
-        }).subscribe(ts);
+        pp.publish(f -> f.take(1)).subscribe(ts);
 
         pp.onNext(1);
 
@@ -191,12 +164,7 @@ public void directCompletesUnsafe() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        pp.publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
-            @Override
-            public Flowable<Integer> apply(Flowable<Integer> f) {
-                return f;
-            }
-        }).subscribe(ts);
+        pp.publish(Functions.identity()).subscribe(ts);
 
         pp.onNext(1);
         pp.onComplete();
@@ -214,12 +182,7 @@ public void overflowMissingBackpressureException() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        pp.publish(new Function<Flowable<Integer>, Flowable<Integer>>() {
-            @Override
-            public Flowable<Integer> apply(Flowable<Integer> f) {
-                return f;
-            }
-        }).subscribe(ts);
+        pp.publish(Functions.identity()).subscribe(ts);
 
         for (int i = 0; i < Flowable.bufferSize() * 2; i++) {
             pp.onNext(i);
@@ -240,12 +203,7 @@ public void overflowMissingBackpressureExceptionDelayed() {
 
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        new FlowablePublishMulticast<>(pp, new Function<Flowable<Integer>, Flowable<Integer>>() {
-            @Override
-            public Flowable<Integer> apply(Flowable<Integer> f) {
-                return f;
-            }
-        }, Flowable.bufferSize(), true).subscribe(ts);
+        new FlowablePublishMulticast<>(pp, Functions.identity(), Flowable.bufferSize(), true).subscribe(ts);
 
         for (int i = 0; i < Flowable.bufferSize() * 2; i++) {
             pp.onNext(i);
@@ -264,22 +222,16 @@ public Flowable<Integer> apply(Flowable<Integer> f) {
     @Test
     public void emptyIdentityMapped() {
         Flowable.empty()
-        .publish(Functions.<Flowable<Object>>identity())
+        .publish(Functions.identity())
         .test()
-        .assertResult()
-        ;
+        .assertResult();
     }
 
     @Test
     public void independentlyMapped() {
         PublishProcessor<Integer> pp = PublishProcessor.create();
 
-        TestSubscriber<Integer> ts = pp.publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Flowable<Integer> v) throws Exception {
-                return Flowable.range(1, 5);
-            }
-        }).test(0);
+        TestSubscriber<Integer> ts = pp.publish(v -> Flowable.range(1, 5)).test(0);
 
         assertTrue("pp has no Subscribers?!", pp.hasSubscribers());
 
@@ -296,12 +248,7 @@ public Publisher<Integer> apply(Flowable<Integer> v) throws Exception {
 
     @Test
     public void badSource() {
-        TestHelper.checkBadSourceFlowable(new Function<Flowable<Integer>, Object>() {
-            @Override
-            public Object apply(Flowable<Integer> f) throws Exception {
-                return f.publish(Functions.<Flowable<Integer>>identity());
-            }
-        }, false, 1, 1, 1);
+        TestHelper.checkBadSourceFlowable(f -> f.publish(Functions.identity()), false, 1, 1, 1);
     }
 
     @Test
@@ -315,7 +262,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
                 }
             }
         }
-        .publish(Functions.<Flowable<Integer>>identity(), 8)
+        .publish(Functions.identity(), 8)
         .test(0)
         .assertFailure(MissingBackpressureException.class);
     }
@@ -323,12 +270,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
     @Test
     public void errorResubscribe() {
         Flowable.error(new TestException())
-        .publish(new Function<Flowable<Object>, Publisher<Object>>() {
-            @Override
-            public Publisher<Object> apply(Flowable<Object> f) throws Exception {
-                return f.onErrorResumeWith(f);
-            }
-        })
+        .publish(f -> f.onErrorResumeWith(f))
         .test()
         .assertFailure(TestException.class);
     }
@@ -336,21 +278,18 @@ public Publisher<Object> apply(Flowable<Object> f) throws Exception {
     @Test
     public void fusedInputCrash() {
         Flowable.just(1)
-        .map(new Function<Integer, Integer>() {
-            @Override
-            public Integer apply(Integer v) throws Exception {
-                throw new TestException();
-            }
+        .map(v -> {
+            throw new TestException();
         })
-        .publish(Functions.<Flowable<Integer>>identity())
+        .publish(Functions.identity())
         .test()
         .assertFailure(TestException.class);
     }
 
     @Test
     public void error() {
-        new FlowablePublishMulticast<>(Flowable.just(1).concatWith(Flowable.<Integer>error(new TestException())),
-                Functions.<Flowable<Integer>>identity(), 16, true)
+        new FlowablePublishMulticast<>(Flowable.just(1).concatWith(Flowable.error(new TestException())),
+                Functions.identity(), 16, true)
         .test()
         .assertFailure(TestException.class, 1);
     }
@@ -358,7 +297,7 @@ public void error() {
     @Test
     public void backpressuredEmpty() {
         Flowable.<Integer>empty()
-        .publish(Functions.<Flowable<Integer>>identity())
+        .publish(Functions.identity())
         .test(0L)
         .assertResult();
     }
@@ -366,7 +305,7 @@ public void backpressuredEmpty() {
     @Test
     public void oneByOne() {
         Flowable.range(1, 10)
-        .publish(Functions.<Flowable<Integer>>identity())
+        .publish(Functions.identity())
         .rebatchRequests(1)
         .test()
         .assertResult(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
@@ -387,7 +326,7 @@ public void onNext(Integer t) {
             }
         };
 
-        pp.publish(Functions.<Flowable<Integer>>identity()).subscribe(ts);
+        pp.publish(Functions.identity()).subscribe(ts);
 
         pp.onNext(1);
 
@@ -399,12 +338,7 @@ public void onNext(Integer t) {
     @Test
     public void inputOutputSubscribeRace() {
         Flowable<Integer> source = Flowable.just(1)
-                .publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
-                    @Override
-                    public Publisher<Integer> apply(Flowable<Integer> f) throws Exception {
-                        return f.subscribeOn(Schedulers.single());
-                    }
-                });
+                .publish(f -> f.subscribeOn(Schedulers.single()));
 
         for (int i = 0; i < 500; i++) {
             source.test()
@@ -416,7 +350,7 @@ public Publisher<Integer> apply(Flowable<Integer> f) throws Exception {
     @Test
     public void inputOutputSubscribeRace2() {
         Flowable<Integer> source = Flowable.just(1).subscribeOn(Schedulers.single())
-                .publish(Functions.<Flowable<Integer>>identity());
+                .publish(Functions.identity());
 
         for (int i = 0; i < 500; i++) {
             source.test()
@@ -431,30 +365,19 @@ public void sourceSubscriptionDelayed() {
             final TestSubscriber<Integer> ts1 = new TestSubscriber<>(0L);
 
             Flowable.just(1)
-            .publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
-                @Override
-                public Publisher<Integer> apply(final Flowable<Integer> f) throws Exception {
-                    Runnable r1 = new Runnable() {
-                        @Override
-                        public void run() {
-                            f.subscribe(ts1);
-                        }
-                    };
-
-                    Runnable r2 = new Runnable() {
-                        @Override
-                        public void run() {
+                    .publish(f -> {
+                        Runnable r1 = () -> f.subscribe(ts1);
+
+                        Runnable r2 = () -> {
                             for (int j = 0; j < 100; j++) {
                                 ts1.request(1);
                             }
-                        }
-                    };
+                        };
 
-                    TestHelper.race(r1, r2);
-                    return f;
-                }
-            }).test()
-            .assertResult(1);
+                        TestHelper.race(r1, r2);
+                        return f;
+                    }).test()
+                    .assertResult(1);
 
             ts1.assertResult(1);
         }
@@ -463,24 +386,9 @@ public void run() {
     @Test
     public void longFlow() {
         Flowable.range(1, 1000000)
-        .publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Flowable<Integer> v) throws Exception {
-                return Flowable.mergeArray(
-                        v.filter(new Predicate<Integer>() {
-                            @Override
-                            public boolean test(Integer w) throws Exception {
-                                return w % 2 == 0;
-                            }
-                        }),
-                        v.filter(new Predicate<Integer>() {
-                            @Override
-                            public boolean test(Integer w) throws Exception {
-                                return w % 2 != 0;
-                            }
-                        }));
-            }
-        })
+        .publish(v -> Flowable.mergeArray(
+                v.filter(w -> w % 2 == 0),
+                v.filter(w -> w % 2 != 0)))
         .takeLast(1)
         .test()
         .assertResult(1000000);
@@ -489,24 +397,9 @@ public boolean test(Integer w) throws Exception {
     @Test
     public void longFlow2() {
         Flowable.range(1, 100000)
-        .publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Flowable<Integer> v) throws Exception {
-                return Flowable.mergeArray(
-                        v.filter(new Predicate<Integer>() {
-                            @Override
-                            public boolean test(Integer w) throws Exception {
-                                return w % 2 == 0;
-                            }
-                        }),
-                        v.filter(new Predicate<Integer>() {
-                            @Override
-                            public boolean test(Integer w) throws Exception {
-                                return w % 2 != 0;
-                            }
-                        }));
-            }
-        })
+        .publish(v -> Flowable.mergeArray(
+                v.filter(w -> w % 2 == 0),
+                v.filter(w -> w % 2 != 0)))
         .test()
         .assertValueCount(100000)
         .assertNoErrors()
@@ -516,26 +409,45 @@ public boolean test(Integer w) throws Exception {
     @Test
     public void longFlowHidden() {
         Flowable.range(1, 1000000).hide()
-        .publish(new Function<Flowable<Integer>, Publisher<Integer>>() {
-            @Override
-            public Publisher<Integer> apply(Flowable<Integer> v) throws Exception {
-                return Flowable.mergeArray(
-                        v.filter(new Predicate<Integer>() {
-                            @Override
-                            public boolean test(Integer w) throws Exception {
-                                return w % 2 == 0;
-                            }
-                        }),
-                        v.filter(new Predicate<Integer>() {
-                            @Override
-                            public boolean test(Integer w) throws Exception {
-                                return w % 2 != 0;
-                            }
-                        }));
-            }
-        })
+        .publish(v -> Flowable.mergeArray(
+                v.filter(w -> w % 2 == 0),
+                v.filter(w -> w % 2 != 0)))
         .takeLast(1)
         .test()
         .assertResult(1000000);
     }
+
+    @Test
+    public void noUpstreamCancelOnCasualChainClose() {
+        AtomicBoolean parentUpstreamCancelled = new AtomicBoolean(false);
+        Flowable.range(1, 10)
+                .doOnCancel(() -> parentUpstreamCancelled.set(true))
+                .publish(Functions.identity())
+                .test()
+                .awaitDone(1, TimeUnit.SECONDS);
+        assertFalse("Unnecessary upstream .cancel() call in FlowablePublishMulticast", parentUpstreamCancelled.get());
+    }
+
+    @Test
+    public void noUpstreamCancelOnCasualChainCloseWithInnerCancels() {
+        AtomicBoolean parentUpstreamCancelled = new AtomicBoolean(false);
+        Flowable.range(1, 10)
+                .doOnCancel(() -> parentUpstreamCancelled.set(true))
+                .publish(v -> Flowable.concat(v.take(1), v.skip(5)))
+                .test()
+                .awaitDone(1, TimeUnit.SECONDS);
+        assertFalse("Unnecessary upstream .cancel() call in FlowablePublishMulticast", parentUpstreamCancelled.get());
+    }
+
+    @Test
+    public void upstreamCancelOnDownstreamCancel() {
+        AtomicBoolean parentUpstreamCancelled = new AtomicBoolean(false);
+        Flowable.range(1, 10)
+                .doOnCancel(() -> parentUpstreamCancelled.set(true))
+                .publish(Functions.identity())
+                .take(1)
+                .test()
+                .awaitDone(1, TimeUnit.SECONDS);
+        assertTrue("Upstream .cancel() not called in FlowablePublishMulticast", parentUpstreamCancelled.get());
+    }
 }

From c693edbb3cd773252185fa5f339a4c7049a3493c Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 20 May 2020 21:34:06 +0200
Subject: [PATCH 125/665] 3.x: Fix Flowable.groupBy
 eviction-completion-replenishment problems (#6988)

---
 .../operators/flowable/FlowableGroupBy.java   | 22 +++--
 .../flowable/FlowableGroupByTest.java         | 81 ++++++++++++++++++-
 2 files changed, 96 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
index 8dc325fbde..f4df324110 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
@@ -214,9 +214,7 @@ public void onError(Throwable t) {
                 g.onError(t);
             }
             groups.clear();
-            if (evictedGroups != null) {
-                evictedGroups.clear();
-            }
+            completeEvictions();
             downstream.onError(t);
         }
 
@@ -226,10 +224,10 @@ public void onComplete() {
                 for (GroupedUnicast<K, V> g : groups.values()) {
                     g.onComplete();
                 }
+
                 groups.clear();
-                if (evictedGroups != null) {
-                    evictedGroups.clear();
-                }
+                completeEvictions();
+
                 done = true;
                 downstream.onComplete();
             }
@@ -594,6 +592,11 @@ void cleanupQueue(long emitted, boolean polled) {
             while (queue.poll() != null) {
                 emitted++;
             }
+
+            replenishParent(emitted, polled);
+        }
+
+        void replenishParent(long emitted, boolean polled) {
             if (polled) {
                 emitted++;
             }
@@ -618,6 +621,9 @@ boolean checkTerminated(boolean d, boolean empty, Subscriber<? super T> a,
                             a.onError(e);
                         } else {
                             a.onComplete();
+                            // completion doesn't mean the parent has completed
+                            // because of evicted groups
+                            replenishParent(emitted, polled);
                         }
                         return true;
                     }
@@ -632,6 +638,10 @@ boolean checkTerminated(boolean d, boolean empty, Subscriber<? super T> a,
                     if (empty) {
                         cancelled.lazySet(true);
                         a.onComplete();
+
+                        // completion doesn't mean the parent has completed
+                        // because of evicted groups
+                        replenishParent(emitted, polled);
                         return true;
                     }
                 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index e606d821f9..bfb467f424 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -18,11 +18,12 @@
 import static org.mockito.Mockito.*;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import org.junit.*;
+import org.junit.Test;
 import org.mockito.Mockito;
 import org.reactivestreams.*;
 
@@ -2876,4 +2877,82 @@ public void issue6974Part2Case1ObserveOnHideLoop() {
         }
     }
     */
+
+    static <T> Function<Consumer<Object>, ConcurrentMap<T, Object>> ttlCapGuava(Duration ttl) {
+        return itemEvictConsumer ->
+            CacheBuilder
+            .newBuilder()
+            .expireAfterWrite(ttl)
+            .removalListener(n -> {
+                if (n.getCause() != com.google.common.cache.RemovalCause.EXPLICIT) {
+                    try {
+                        itemEvictConsumer.accept(n.getValue());
+                    } catch (Throwable throwable) {
+                        throw new RuntimeException(throwable);
+                    }
+                }
+            }).<T, Object>build().asMap();
+    }
+
+    @Test
+    public void issue6982Case1() {
+        final int groups = 20;
+
+        int groupByBufferSize = 2;
+        int flatMapMaxConcurrency = 200 * groups;
+
+        // ~50% of executions - Not completed (latch = 1, values = 500000, errors = 0, completions = 0, timeout!,
+        // disposed!)
+
+        Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .groupBy(i -> i, i -> i, false, groupByBufferSize, ttlCapGuava(Duration.ofMillis(10)))
+        .flatMap(gf -> gf.observeOn(Schedulers.computation()), flatMapMaxConcurrency)
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    /*
+     * Disabled: Takes very long. Run it locally only.
+    @Test
+    public void issue6982Case1Loop() {
+        for (int i = 0; i < 200; i++) {
+            System.out.println("issue6982Case1Loop "  + i);
+            issue6982Case1();
+        }
+    }
+     */
+
+    @Test
+    public void issue6982Case2() {
+        final int groups = 20;
+
+        int groupByBufferSize = groups * 30;
+        int flatMapMaxConcurrency = groups * 500;
+        // Always : Not completed (latch = 1, values = 14100, errors = 0, completions = 0, timeout!, disposed!)
+
+        Flowable
+        .range(1, 500_000)
+        .map(i -> i % groups)
+        .groupBy(i -> i, i -> i, false, groupByBufferSize, ttlCapGuava(Duration.ofMillis(10)))
+        .flatMap(gf -> gf.observeOn(Schedulers.computation()), flatMapMaxConcurrency)
+        .test()
+        .awaitDone(5, TimeUnit.SECONDS)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    /*
+     * Disabled: Takes very long. Run it locally only.
+    @Test
+    public void issue6982Case2Loop() {
+        for (int i = 0; i < 200; i++) {
+            System.out.println("issue6982Case2Loop "  + i);
+            issue6982Case2();
+        }
+    }
+     */
 }

From 3f386be351eb7c62379d124a2f65894a9961e604 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 21 May 2020 10:11:47 +0200
Subject: [PATCH 126/665] 3.x: Fix recent groupBy tests sometimes failing with
 MBE (#6994)

---
 .../flowable/FlowableGroupByTest.java         | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index bfb467f424..947a911446 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -2719,10 +2719,9 @@ public void issue6974Part2Case1ObserveOn() {
                      // .take(10)
                      .take(10, TimeUnit.MILLISECONDS)
             , flatMapMaxConcurrency)
-        .test()
+        .subscribeWith(new TestSubscriberEx<>())
         .awaitDone(5, TimeUnit.SECONDS)
-        .assertNoErrors()
-        .assertComplete();
+        .assertTerminated(); // MBE is possible if the async group closing is slow
     }
 
     @Test
@@ -2746,10 +2745,9 @@ public void issue6974Part2Case1ObserveOnHide() {
                      // .take(10)
                      .take(10, TimeUnit.MILLISECONDS)
             , flatMapMaxConcurrency)
-        .test()
+        .subscribeWith(new TestSubscriberEx<>())
         .awaitDone(5, TimeUnit.SECONDS)
-        .assertNoErrors()
-        .assertComplete();
+        .assertTerminated(); // MBE is possible if the async group closing is slow
     }
 
     @Test
@@ -2834,10 +2832,9 @@ public void issue6974Part2Case1ObserveOnConditional() {
                      // .take(10)
                      .take(10, TimeUnit.MILLISECONDS)
             , flatMapMaxConcurrency)
-        .test()
+        .subscribeWith(new TestSubscriberEx<>())
         .awaitDone(5, TimeUnit.SECONDS)
-        .assertNoErrors()
-        .assertComplete();
+        .assertTerminated(); // MBE is possible if the async group closing is slow
     }
 
     @Test
@@ -2862,10 +2859,9 @@ public void issue6974Part2Case1ObserveOnConditionalHide() {
                      // .take(10)
                      .take(10, TimeUnit.MILLISECONDS)
             , flatMapMaxConcurrency)
-        .test()
+        .subscribeWith(new TestSubscriberEx<>())
         .awaitDone(5, TimeUnit.SECONDS)
-        .assertNoErrors()
-        .assertComplete();
+        .assertTerminated(); // MBE is possible if the async group closing is slow
     }
 
     /*

From 597d2493f9b807580f46277f8102bd874833fba7 Mon Sep 17 00:00:00 2001
From: akluball <35855437+akluball@users.noreply.github.com>
Date: Sun, 24 May 2020 03:37:31 -0400
Subject: [PATCH 127/665] Suppress UndeliverableException handling in tests
 (#6987) (#6996)

* Suppress UndeliverableException handling in tests (#6987)

Use a JUnit TestRule to suppress UndeliverableException handling in test
methods annotated with SuppressUndeliverable.

* Write requested changes (#6996)

* remove changes to RxJavaPlugins

* move @Rule field into RxJavaTest

* use lambda SuppressUndeliverableRule
---
 .../io/reactivex/rxjava3/core/RxJavaTest.java |  4 ++
 .../internal/jdk8/ParallelCollectorTest.java  |  1 +
 .../CompletableFromCallableTest.java          |  4 +-
 .../CompletableFromSupplierTest.java          |  3 +-
 .../flowable/FlowableGroupByTest.java         |  6 ++
 .../FlowableWindowWithFlowableTest.java       |  1 +
 ...lowableWindowWithStartEndFlowableTest.java |  3 +-
 .../flowable/FlowableWindowWithTimeTest.java  |  6 +-
 .../operators/maybe/MaybeUsingTest.java       |  1 +
 .../observable/ObservableCreateTest.java      |  7 +++
 .../observable/ObservableGroupByTest.java     |  5 ++
 .../observable/ObservableGroupJoinTest.java   |  1 +
 .../observable/ObservableLiftTest.java        |  2 +
 .../observable/ObservableRefCountTest.java    |  4 ++
 .../ObservableRetryWithPredicateTest.java     |  3 +
 .../observable/ObservableTakeTest.java        |  3 +-
 .../observable/ObservableTakeWhileTest.java   |  1 +
 .../ObservableTimeoutWithSelectorTest.java    |  2 +
 .../ObservableWindowWithObservableTest.java   |  1 +
 ...vableWindowWithStartEndObservableTest.java |  3 +-
 .../ObservableWindowWithTimeTest.java         | 11 +++-
 .../operators/single/SingleCreateTest.java    |  5 +-
 .../operators/single/SingleUsingTest.java     |  1 +
 .../ExecutorSchedulerDelayedRunnableTest.java |  2 +
 .../schedulers/SingleSchedulerTest.java       |  3 +-
 .../TrampolineSchedulerInternalTest.java      |  4 +-
 .../subscribers/BoundedSubscriberTest.java    |  3 +-
 .../subscribers/FutureSubscriberTest.java     |  8 ++-
 .../subscribers/LambdaSubscriberTest.java     |  3 +-
 .../util/HalfSerializerObserverTest.java      |  2 +
 .../util/HalfSerializerSubscriberTest.java    |  2 +
 .../rxjava3/observers/SafeObserverTest.java   |  1 +
 .../observers/SerializedObserverTest.java     |  1 +
 .../rxjava3/parallel/ParallelPeekTest.java    |  4 +-
 .../processors/AsyncProcessorTest.java        |  3 +
 .../processors/PublishProcessorTest.java      |  5 +-
 .../processors/ReplayProcessorTest.java       |  4 ++
 .../schedulers/CachedThreadSchedulerTest.java |  2 +
 .../schedulers/ComputationSchedulerTests.java |  4 ++
 .../schedulers/NewThreadSchedulerTest.java    |  3 +
 .../rxjava3/subjects/AsyncSubjectTest.java    |  3 +
 .../rxjava3/subjects/PublishSubjectTest.java  |  5 +-
 .../rxjava3/subjects/ReplaySubjectTest.java   |  4 ++
 .../subscribers/SafeSubscriberTest.java       |  2 +
 .../subscribers/SerializedSubscriberTest.java |  1 +
 .../testsupport/SuppressUndeliverable.java    | 23 ++++++++
 .../SuppressUndeliverableRule.java            | 57 +++++++++++++++++++
 47 files changed, 210 insertions(+), 17 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverable.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java

diff --git a/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java b/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java
index d903a87f0c..8eaf638916 100644
--- a/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java
@@ -20,9 +20,13 @@
 import org.junit.*;
 import org.junit.rules.Timeout;
 
+import io.reactivex.rxjava3.testsupport.SuppressUndeliverableRule;
+
 public abstract class RxJavaTest {
     @Rule
     public Timeout globalTimeout = new Timeout(5, TimeUnit.MINUTES);
+    @Rule
+    public final SuppressUndeliverableRule suppressUndeliverableRule = new SuppressUndeliverableRule();
 
     /**
      * Announce creates a log print preventing Travis CI from killing the build.
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java
index 8e558a0048..42f7748a03 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java
@@ -148,6 +148,7 @@ public Set<Characteristics> characteristics() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void collectorCombinerCrash() {
         Flowable.range(1, 5)
         .parallel()
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
index 7bd5011ca7..57c11b8a7b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
@@ -29,9 +29,10 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class CompletableFromCallableTest extends RxJavaTest {
+
     @Test
     public void fromCallable() {
         final AtomicInteger atomicInteger = new AtomicInteger();
@@ -161,6 +162,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
     }
 
     @Test
+    @SuppressUndeliverable
     public void fromActionErrorsDisposed() {
         final AtomicInteger calls = new AtomicInteger();
         Completable.fromCallable(new Callable<Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
index bcad666785..5aca1f7847 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
@@ -30,7 +30,7 @@
 import io.reactivex.rxjava3.functions.Supplier;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class CompletableFromSupplierTest extends RxJavaTest {
 
@@ -163,6 +163,7 @@ public String answer(InvocationOnMock invocation) throws Throwable {
     }
 
     @Test
+    @SuppressUndeliverable
     public void fromActionErrorsDisposed() {
         final AtomicInteger calls = new AtomicInteger();
         Completable.fromSupplier(new Supplier<Object>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index 947a911446..c86e9f260d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -112,6 +112,7 @@ public void empty() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error() {
         Flowable<String> sourceStrings = Flowable.just("one", "two", "three", "four", "five", "six");
         Flowable<String> errorSource = Flowable.error(new TestException("forced failure"));
@@ -1196,6 +1197,7 @@ public void keySelectorThrows() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void valueSelectorThrows() {
         Flowable<Integer> source = Flowable.just(0, 1, 2, 3, 4, 5, 6);
 
@@ -1251,6 +1253,7 @@ public void accept(GroupedFlowable<Integer, Integer> t1) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error2() {
         Flowable<Integer> source = Flowable.concat(Flowable.just(0),
                 Flowable.<Integer> error(new TestException("Forced failure")));
@@ -1686,6 +1689,7 @@ public void accept(GroupedFlowable<Integer, Integer> g) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void keySelectorAndDelayError() {
         Flowable.just(1).concatWith(Flowable.<Integer>error(new TestException()))
         .groupBy(Functions.<Integer>identity(), true)
@@ -1700,6 +1704,7 @@ public Flowable<Integer> apply(GroupedFlowable<Integer, Integer> g) throws Excep
     }
 
     @Test
+    @SuppressUndeliverable
     public void keyAndValueSelectorAndDelayError() {
         Flowable.just(1).concatWith(Flowable.<Integer>error(new TestException()))
         .groupBy(Functions.<Integer>identity(), Functions.<Integer>identity(), true)
@@ -1853,6 +1858,7 @@ public Publisher<Integer> apply(GroupedFlowable<Object, Integer> g) throws Excep
     }
 
     @Test
+    @SuppressUndeliverable
     public void groupError() {
         Flowable.just(1).concatWith(Flowable.<Integer>error(new TestException()))
         .groupBy(Functions.justFunction(1), true)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
index 66273656f9..0d9cd5dd1b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
@@ -623,6 +623,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void disposeMainBoundaryErrorRace() {
         final TestException ex = new TestException();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
index a9a5a7e821..e6ffaed5bd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
@@ -32,7 +32,7 @@
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.TestScheduler;
 import io.reactivex.rxjava3.subscribers.*;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableWindowWithStartEndFlowableTest extends RxJavaTest {
 
@@ -324,6 +324,7 @@ public Flowable<Integer> apply(Integer v) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void endError() {
         PublishProcessor<Integer> source = PublishProcessor.create();
         PublishProcessor<Integer> start = PublishProcessor.create();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
index bf6a271b84..190d10f0af 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
@@ -31,7 +31,7 @@
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subscribers.*;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableWindowWithTimeTest extends RxJavaTest {
 
@@ -556,6 +556,7 @@ public void restartTimer() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void exactBoundaryError() {
         Flowable.error(new TestException())
         .window(1, TimeUnit.DAYS, Schedulers.single(), 2, true)
@@ -973,6 +974,7 @@ public void accept(Flowable<Integer> v) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void exactTimeBoundNoInterruptWindowOutputOnError() throws Exception {
         final AtomicBoolean isInterrupted = new AtomicBoolean();
 
@@ -1053,6 +1055,7 @@ public void accept(Flowable<Integer> v) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void exactTimeAndSizeBoundNoInterruptWindowOutputOnError() throws Exception {
         final AtomicBoolean isInterrupted = new AtomicBoolean();
 
@@ -1133,6 +1136,7 @@ public void accept(Flowable<Integer> v) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void skipTimeAndSizeBoundNoInterruptWindowOutputOnError() throws Exception {
         final AtomicBoolean isInterrupted = new AtomicBoolean();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
index c9ff65e09a..e9621a2f64 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
@@ -481,6 +481,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void errorDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
index 9f25879a60..2998f0a5a8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
@@ -33,6 +33,7 @@
 public class ObservableCreateTest extends RxJavaTest {
 
     @Test
+    @SuppressUndeliverable
     public void basic() {
         final Disposable d = Disposable.empty();
 
@@ -58,6 +59,7 @@ public void subscribe(ObservableEmitter<Integer> e) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void basicWithCancellable() {
         final Disposable d1 = Disposable.empty();
         final Disposable d2 = Disposable.empty();
@@ -91,6 +93,7 @@ public void cancel() throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void basicWithError() {
         final Disposable d = Disposable.empty();
 
@@ -115,6 +118,7 @@ public void subscribe(ObservableEmitter<Integer> e) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void basicSerialized() {
         final Disposable d = Disposable.empty();
 
@@ -142,6 +146,7 @@ public void subscribe(ObservableEmitter<Integer> e) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void basicWithErrorSerialized() {
         final Disposable d = Disposable.empty();
 
@@ -209,6 +214,7 @@ public void unsafeWithObservable() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void createNullValue() {
         final Throwable[] error = { null };
 
@@ -232,6 +238,7 @@ public void subscribe(ObservableEmitter<Integer> e) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void createNullValueSerialized() {
         final Throwable[] error = { null };
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
index 22a56a3356..b9d37ef118 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
@@ -96,6 +96,7 @@ public void empty() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error() {
         Observable<String> sourceStrings = Observable.just("one", "two", "three", "four", "five", "six");
         Observable<String> errorSource = Observable.error(new RuntimeException("forced failure"));
@@ -1178,6 +1179,7 @@ public void keySelectorThrows() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void valueSelectorThrows() {
         Observable<Integer> source = Observable.just(0, 1, 2, 3, 4, 5, 6);
 
@@ -1233,6 +1235,7 @@ public void accept(GroupedObservable<Integer, Integer> t1) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error2() {
         Observable<Integer> source = Observable.concat(Observable.just(0),
                 Observable.<Integer> error(new TestException("Forced failure")));
@@ -1446,6 +1449,7 @@ public Integer apply(Integer i) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void keySelectorAndDelayError() {
         Observable.just(1).concatWith(Observable.<Integer>error(new TestException()))
         .groupBy(Functions.<Integer>identity(), true)
@@ -1460,6 +1464,7 @@ public ObservableSource<Integer> apply(GroupedObservable<Integer, Integer> g) th
     }
 
     @Test
+    @SuppressUndeliverable
     public void keyAndValueSelectorAndDelayError() {
         Observable.just(1).concatWith(Observable.<Integer>error(new TestException()))
         .groupBy(Functions.<Integer>identity(), Functions.<Integer>identity(), true)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
index 3f01c05cb4..2e5af8b72e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
@@ -479,6 +479,7 @@ public Observable<Integer> apply(Integer r, Observable<Integer> l) throws Except
     }
 
     @Test
+    @SuppressUndeliverable
     public void innerErrorRight() {
         Observable.just(1)
         .groupJoin(
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java
index 325fc504ae..64a95db947 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java
@@ -19,10 +19,12 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.testsupport.SuppressUndeliverable;
 
 public class ObservableLiftTest extends RxJavaTest {
 
     @Test
+    @SuppressUndeliverable
     public void callbackCrash() {
         try {
             Observable.just(1)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
index 09b0bf0cfe..442f326e37 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
@@ -855,6 +855,7 @@ protected void subscribeActual(Observer<? super Object> observer) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void badSourceSubscribe() {
         BadObservableSubscribe bo = new BadObservableSubscribe();
 
@@ -881,6 +882,7 @@ public void badSourceDispose() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void badSourceConnect() {
         BadObservableConnect bo = new BadObservableConnect();
 
@@ -922,6 +924,7 @@ protected void subscribeActual(Observer<? super Object> observer) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void badSourceSubscribe2() {
         BadObservableSubscribe2 bo = new BadObservableSubscribe2();
 
@@ -959,6 +962,7 @@ protected void subscribeActual(Observer<? super Object> observer) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void badSourceCompleteDisconnect() {
         BadObservableConnect2 bo = new BadObservableConnect2();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
index 3b57f6c2e1..5bb4fba7d8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
@@ -37,6 +37,7 @@
 import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableRetryWithPredicateTest extends RxJavaTest {
+
     BiPredicate<Integer, Throwable> retryTwice = new BiPredicate<Integer, Throwable>() {
         @Override
         public boolean test(Integer t1, Throwable t2) {
@@ -390,6 +391,7 @@ public void dontRetry() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void retryDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final PublishSubject<Integer> ps = PublishSubject.create();
@@ -438,6 +440,7 @@ public boolean test(Integer n, Throwable e) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void retryBiPredicateDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final PublishSubject<Integer> ps = PublishSubject.create();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
index f83fb8595d..6fb3143410 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
@@ -34,7 +34,7 @@
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.PublishSubject;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableTakeTest extends RxJavaTest {
 
@@ -111,6 +111,7 @@ public Integer apply(Integer t1) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void takeDoesntLeakErrors() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
index 134e1f93f6..1b35f4144f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
@@ -100,6 +100,7 @@ public boolean test(String input) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void takeWhileDoesntLeakErrors() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
index 60cb5a8b92..44712626c3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
@@ -40,6 +40,7 @@
 import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableTimeoutWithSelectorTest extends RxJavaTest {
+
     @Test
     public void timeoutSelectorNormal1() {
         PublishSubject<Integer> source = PublishSubject.create();
@@ -493,6 +494,7 @@ public void withOtherMainError() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void badSourceTimeout() {
         new Observable<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
index bfb972626b..a623e3ded3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
@@ -586,6 +586,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void disposeMainBoundaryErrorRace() {
         final TestException ex = new TestException();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
index ee0c112a25..941ce58f79 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
@@ -33,7 +33,7 @@
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.TestScheduler;
 import io.reactivex.rxjava3.subjects.*;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableWindowWithStartEndObservableTest extends RxJavaTest {
 
@@ -290,6 +290,7 @@ public ObservableSource<Integer> apply(Integer v) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void endError() {
         PublishSubject<Integer> source = PublishSubject.create();
         PublishSubject<Integer> start = PublishSubject.create();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
index 56ee06ff24..527ebc004b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
@@ -19,19 +19,19 @@
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.*;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.observers.*;
 import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subjects.*;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableWindowWithTimeTest extends RxJavaTest {
 
@@ -368,6 +368,7 @@ public void timeskipOverlapping() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void exactOnError() {
         TestScheduler scheduler = new TestScheduler();
 
@@ -383,6 +384,7 @@ public void exactOnError() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void overlappingOnError() {
         TestScheduler scheduler = new TestScheduler();
 
@@ -398,6 +400,7 @@ public void overlappingOnError() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void skipOnError() {
         TestScheduler scheduler = new TestScheduler();
 
@@ -434,6 +437,7 @@ public void restartTimer() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void exactBoundaryError() {
         Observable.error(new TestException())
         .window(1, TimeUnit.DAYS, Schedulers.single(), 2, true)
@@ -751,6 +755,7 @@ public void accept(Observable<Integer> v) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void exactTimeBoundNoInterruptWindowOutputOnError() throws Exception {
         final AtomicBoolean isInterrupted = new AtomicBoolean();
 
@@ -831,6 +836,7 @@ public void accept(Observable<Integer> v) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void exactTimeAndSizeBoundNoInterruptWindowOutputOnError() throws Exception {
         final AtomicBoolean isInterrupted = new AtomicBoolean();
 
@@ -911,6 +917,7 @@ public void accept(Observable<Integer> v) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void skipTimeAndSizeBoundNoInterruptWindowOutputOnError() throws Exception {
         final AtomicBoolean isInterrupted = new AtomicBoolean();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
index 79cb58c63b..8f8519c961 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
@@ -25,11 +25,12 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Cancellable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleCreateTest extends RxJavaTest {
 
     @Test
+    @SuppressUndeliverable
     public void basic() {
         final Disposable d = Disposable.empty();
 
@@ -51,6 +52,7 @@ public void subscribe(SingleEmitter<Integer> e) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void basicWithCancellable() {
         final Disposable d1 = Disposable.empty();
         final Disposable d2 = Disposable.empty();
@@ -80,6 +82,7 @@ public void cancel() throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void basicWithError() {
         final Disposable d = Disposable.empty();
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
index 28f268f423..d11c89ec8d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
@@ -293,6 +293,7 @@ protected void subscribeActual(SingleObserver<? super Integer> observer) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void errorDisposeRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final PublishProcessor<Integer> pp = PublishProcessor.create();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
index 08e06b189e..3dd9c59344 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
@@ -22,10 +22,12 @@
 import io.reactivex.rxjava3.core.RxJavaTest;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.internal.schedulers.ExecutorScheduler.DelayedRunnable;
+import io.reactivex.rxjava3.testsupport.SuppressUndeliverable;
 
 public class ExecutorSchedulerDelayedRunnableTest extends RxJavaTest {
 
     @Test(expected = TestException.class)
+    @SuppressUndeliverable
     public void delayedRunnableCrash() {
         DelayedRunnable dl = new DelayedRunnable(new Runnable() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
index ad568225e6..9ab44b2ff1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
@@ -27,11 +27,12 @@
 import io.reactivex.rxjava3.internal.schedulers.SingleScheduler.ScheduledWorker;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.*;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class SingleSchedulerTest extends AbstractSchedulerTests {
 
     @Test
+    @SuppressUndeliverable
     public void shutdownRejects() {
         final int[] calls = { 0 };
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
index f114623bc4..912d07b215 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
@@ -31,11 +31,12 @@
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class TrampolineSchedulerInternalTest extends RxJavaTest {
 
     @Test
+    @SuppressUndeliverable
     public void scheduleDirectInterrupt() {
         Thread.currentThread().interrupt();
 
@@ -147,6 +148,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void reentrantScheduleInterrupt() {
         final Worker w = Schedulers.trampoline().createWorker();
         try {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
index 19bb7104ab..38abf77e87 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
@@ -27,7 +27,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class BoundedSubscriberTest extends RxJavaTest {
 
@@ -315,6 +315,7 @@ public void accept(Subscription s) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void badSourceEmitAfterDone() {
         Flowable<Integer> source = Flowable.fromPublisher(new Publisher<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
index 5c923949e8..e8cf5c3a47 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
@@ -26,7 +26,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FutureSubscriberTest extends RxJavaTest {
 
@@ -155,6 +155,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final FutureSubscriber<Integer> fs = new FutureSubscriber<>();
@@ -180,6 +181,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onCompleteCancelRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
             final FutureSubscriber<Integer> fs = new FutureSubscriber<>();
@@ -211,6 +213,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorOnComplete() throws Exception {
         fs.onError(new TestException("One"));
         fs.onComplete();
@@ -224,6 +227,7 @@ public void onErrorOnComplete() throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onCompleteOnError() throws Exception {
         fs.onComplete();
         fs.onError(new TestException("One"));
@@ -236,6 +240,7 @@ public void onCompleteOnError() throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void cancelOnError() throws Exception {
         fs.cancel(true);
         fs.onError(new TestException("One"));
@@ -249,6 +254,7 @@ public void cancelOnError() throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void cancelOnComplete() throws Exception {
         fs.cancel(true);
         fs.onComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
index 17e4fb2fc9..a415835a4b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
@@ -28,7 +28,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class LambdaSubscriberTest extends RxJavaTest {
 
@@ -246,6 +246,7 @@ public void accept(Subscription s) throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void badSourceEmitAfterDone() {
         Flowable<Integer> source = Flowable.fromPublisher(new Publisher<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
index cbb66e6425..b948188173 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
@@ -160,6 +160,7 @@ public void onComplete() {
     }
 
     @Test
+    @SuppressUndeliverable
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public void reentrantErrorOnError() {
         final AtomicInteger wip = new AtomicInteger();
@@ -234,6 +235,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorOnCompleteRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
index 44eea4907c..65835788bb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
@@ -166,6 +166,7 @@ public void onComplete() {
     }
 
     @Test
+    @SuppressUndeliverable
     @SuppressWarnings({ "rawtypes", "unchecked" })
     public void reentrantErrorOnError() {
         final AtomicInteger wip = new AtomicInteger();
@@ -240,6 +241,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorOnCompleteRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
index 3afced2d40..adcb092aea 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
@@ -221,6 +221,7 @@ public void dispose() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onNextAfterComplete() {
         TestObserver<Integer> to = new TestObserver<>();
 
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
index 874670bc5f..c631b7b114 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
@@ -1144,6 +1144,7 @@ public void nullOnNext() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorQueuedUp() {
         AtomicReference<SerializedObserver<Integer>> soRef = new AtomicReference<>();
         TestObserverEx<Integer> to = new TestObserverEx<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
index ebdd2fd8cc..b35f0d8a1f 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
@@ -26,7 +26,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ParallelPeekTest extends RxJavaTest {
 
@@ -37,6 +37,7 @@ public void subscriberCount() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onSubscribeCrash() {
         Flowable.range(1, 5)
         .parallel()
@@ -125,6 +126,7 @@ public void run() throws Exception {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onCompleteCrash() {
         Flowable.just(1)
         .parallel()
diff --git a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
index 3fa8554a7d..778cf78496 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
@@ -112,6 +112,7 @@ public void subscribeAfterError() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error() {
         AsyncProcessor<String> processor = AsyncProcessor.create();
 
@@ -424,6 +425,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorCancelRace() {
 
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -481,6 +483,7 @@ public void onNext(Object t) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorCrossCancel() {
         AsyncProcessor<Object> p = AsyncProcessor.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
index 7c413d9dc0..9741796049 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
@@ -30,7 +30,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.*;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class PublishProcessorTest extends FlowableProcessorTest<Object> {
 
@@ -40,6 +40,7 @@ protected FlowableProcessor<Object> create() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void completed() {
         PublishProcessor<String> processor = PublishProcessor.create();
 
@@ -113,6 +114,7 @@ private void assertCompletedSubscriber(Subscriber<String> subscriber) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error() {
         PublishProcessor<String> processor = PublishProcessor.create();
 
@@ -434,6 +436,7 @@ public void onNext(Integer t) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void crossCancelOnError() {
         final TestSubscriber<Integer> ts1 = new TestSubscriber<>();
         TestSubscriber<Integer> ts2 = new TestSubscriber<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
index 74b8fac206..2febfb0629 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
@@ -47,6 +47,7 @@ protected FlowableProcessor<Object> create() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void completed() {
         ReplayProcessor<String> processor = ReplayProcessor.create();
 
@@ -71,6 +72,7 @@ public void completed() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void completedStopsEmittingData() {
         ReplayProcessor<Integer> channel = ReplayProcessor.create();
         Subscriber<Object> observerA = TestHelper.mockSubscriber();
@@ -140,6 +142,7 @@ public void completedStopsEmittingData() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void completedAfterError() {
         ReplayProcessor<String> processor = ReplayProcessor.create();
 
@@ -170,6 +173,7 @@ private void assertCompletedSubscriber(Subscriber<String> subscriber) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error() {
         ReplayProcessor<String> processor = ReplayProcessor.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
index 8782142035..26cec9b53b 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
@@ -24,6 +24,7 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.schedulers.IoScheduler;
+import io.reactivex.rxjava3.testsupport.SuppressUndeliverable;
 
 public class CachedThreadSchedulerTest extends AbstractSchedulerConcurrencyTests {
 
@@ -91,6 +92,7 @@ public void workerDisposed() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void shutdownRejects() {
         final int[] calls = { 0 };
 
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
index 582a419b13..5f5df8d410 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
@@ -27,6 +27,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.schedulers.ComputationScheduler;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.SuppressUndeliverable;
 
 public class ComputationSchedulerTests extends AbstractSchedulerConcurrencyTests {
 
@@ -161,6 +162,7 @@ public void cancelledTaskRetention() throws InterruptedException {
     }
 
     @Test
+    @SuppressUndeliverable
     public void shutdownRejects() {
         final int[] calls = { 0 };
 
@@ -285,6 +287,7 @@ public Thread newThread(Runnable r) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void periodicTaskShouldStopOnError() throws Exception {
         AtomicInteger repeatCount = new AtomicInteger();
 
@@ -302,6 +305,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void periodicTaskShouldStopOnError2() throws Exception {
         AtomicInteger repeatCount = new AtomicInteger();
 
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
index 352e13333c..1476db8b92 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
@@ -23,6 +23,7 @@
 import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.internal.schedulers.NewThreadWorker;
+import io.reactivex.rxjava3.testsupport.SuppressUndeliverable;
 
 public class NewThreadSchedulerTest extends AbstractSchedulerConcurrencyTests {
 
@@ -37,6 +38,7 @@ public final void handledErrorIsNotDeliveredToThreadHandler() throws Interrupted
     }
 
     @Test
+    @SuppressUndeliverable
     public void shutdownRejects() {
         final int[] calls = { 0 };
 
@@ -75,6 +77,7 @@ public void run() {
      * @throws Exception on error
      */
     @Test
+    @SuppressUndeliverable
     public void npeRegression() throws Exception {
         Scheduler s = getScheduler();
         NewThreadWorker w = (NewThreadWorker) s.createWorker();
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
index 96d63b3ab2..17d3a94a62 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
@@ -112,6 +112,7 @@ public void subscribeAfterError() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error() {
         AsyncSubject<String> subject = AsyncSubject.create();
 
@@ -418,6 +419,7 @@ public void run() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorCancelRace() {
 
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
@@ -475,6 +477,7 @@ public void onNext(Object t) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorCrossCancel() {
         AsyncSubject<Object> p = AsyncSubject.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
index 7c2c333a2b..9479951609 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
@@ -29,7 +29,7 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.observers.*;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class PublishSubjectTest extends SubjectTest<Integer> {
 
@@ -39,6 +39,7 @@ protected Subject<Integer> create() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void completed() {
         PublishSubject<String> subject = PublishSubject.create();
 
@@ -112,6 +113,7 @@ private void assertCompletedSubscriber(Observer<String> observer) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error() {
         PublishSubject<String> subject = PublishSubject.create();
 
@@ -414,6 +416,7 @@ public void onNext(Integer t) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void crossCancelOnError() {
         final TestObserver<Integer> to1 = new TestObserver<>();
         TestObserver<Integer> to2 = new TestObserver<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
index 106f85bfc5..3444431824 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
@@ -44,6 +44,7 @@ protected Subject<Integer> create() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void completed() {
         ReplaySubject<String> subject = ReplaySubject.create();
 
@@ -68,6 +69,7 @@ public void completed() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void completedStopsEmittingData() {
         ReplaySubject<Integer> channel = ReplaySubject.create();
         Observer<Object> observerA = TestHelper.mockObserver();
@@ -137,6 +139,7 @@ public void completedStopsEmittingData() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void completedAfterError() {
         ReplaySubject<String> subject = ReplaySubject.create();
 
@@ -167,6 +170,7 @@ private void assertCompletedSubscriber(Observer<String> observer) {
     }
 
     @Test
+    @SuppressUndeliverable
     public void error() {
         ReplaySubject<String> subject = ReplaySubject.create();
 
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
index e2bc1b1bbd..ca61c8565a 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
@@ -98,6 +98,7 @@ public void onNextAfterOnCompleted() {
      * Ensure onError can not be called after onComplete.
      */
     @Test
+    @SuppressUndeliverable
     public void onErrorAfterOnCompleted() {
         TestObservable t = new TestObservable();
         Flowable<String> st = Flowable.unsafeCreate(t);
@@ -364,6 +365,7 @@ public void dispose() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onNextAfterComplete() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
 
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
index 7391b212ae..e4292216d6 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
@@ -1136,6 +1136,7 @@ public void nullOnNext() {
     }
 
     @Test
+    @SuppressUndeliverable
     public void onErrorQueuedUp() {
         AtomicReference<SerializedSubscriber<Integer>> ssRef = new AtomicReference<>();
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>() {
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverable.java b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverable.java
new file mode 100644
index 0000000000..448b896ce0
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverable.java
@@ -0,0 +1,23 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.reactivex.rxjava3.testsupport;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface SuppressUndeliverable {
+}
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
new file mode 100644
index 0000000000..392fbdba33
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
@@ -0,0 +1,57 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.reactivex.rxjava3.testsupport;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import io.reactivex.rxjava3.exceptions.UndeliverableException;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * A rule for suppressing UndeliverableException handling.
+ *
+ * <p>Test classes that use this rule can suppress UndeliverableException
+ * handling by annotating the test method with SuppressUndeliverable.
+ */
+public class SuppressUndeliverableRule implements TestRule {
+
+    @Override
+    public Statement apply(Statement base, Description description) {
+        if (description.getAnnotation(SuppressUndeliverable.class) != null) {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    try {
+                        RxJavaPlugins.setErrorHandler(throwable -> {
+                            if (!(throwable instanceof UndeliverableException)) {
+                                throwable.printStackTrace();
+                                Thread currentThread = Thread.currentThread();
+                                currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, throwable);
+                            }
+                        });
+                        base.evaluate();
+                    } finally {
+                        RxJavaPlugins.setErrorHandler(null);
+                    }
+                }
+            };
+        } else {
+            return base;
+        }
+    }
+}

From 98acac218cdb04d279b5ac49bb1afc65bc6ec4fe Mon Sep 17 00:00:00 2001
From: mrkulli <kullik2@gmail.com>
Date: Tue, 26 May 2020 12:31:33 -0500
Subject: [PATCH 128/665] Fixed image link and added java examples for
 Connectable Observable operators (#6997)

* Fixed image link and added java examples

* 3.x:Update Getting started docs
---
 docs/Connectable-Observable-Operators.md | 47 +++++++++++-------------
 docs/Getting-Started.md                  | 24 ++++++------
 2 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/docs/Connectable-Observable-Operators.md b/docs/Connectable-Observable-Operators.md
index 582f0fac12..157ded821b 100644
--- a/docs/Connectable-Observable-Operators.md
+++ b/docs/Connectable-Observable-Operators.md
@@ -7,25 +7,22 @@ This section explains the [`ConnectableObservable`](http://reactivex.io/RxJava/j
 
 A Connectable Observable resembles an ordinary Observable, except that it does not begin emitting items when it is subscribed to, but only when its `connect()` method is called. In this way you can wait for all intended Subscribers to subscribe to the Observable before the Observable begins emitting items.
 
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.v3.png" width="640" height="510" />
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.v3.png" width="640" height="510" />
 
 The following example code shows two Subscribers subscribing to the same Observable. In the first case, they subscribe to an ordinary Observable; in the second case, they subscribe to a Connectable Observable that only connects after both Subscribers subscribe. Note the difference in the output:
 
 **Example #1:**
-```groovy
-def firstMillion  = Observable.range( 1, 1000000 ).sample(7, java.util.concurrent.TimeUnit.MILLISECONDS);
+```java
+Observable firstMillion = Observable.range(1, 1000000).sample(7, java.util.concurrent.TimeUnit.MILLISECONDS);
 
-firstMillion.subscribe(
-   { println("Subscriber #1:" + it); },       // onNext
-   { println("Error: " + it.getMessage()); }, // onError
-   { println("Sequence #1 complete"); }       // onCompleted
-);
-
-firstMillion.subscribe(
-    { println("Subscriber #2:" + it); },       // onNext
-    { println("Error: " + it.getMessage()); }, // onError
-    { println("Sequence #2 complete"); }       // onCompleted
-);
+firstMillion.subscribe(next -> System.out.println("Subscriber #1: " + next), // onNext
+		throwable -> System.out.println("Error: " + throwable), // onError
+		() -> System.out.println("Sequence #1 complete") // onComplete
+	);
+firstMillion.subscribe(next -> System.out.println("Subscriber #2: " + next), // onNext
+        throwable -> System.out.println("Error: " + throwable), // onError
+		() -> System.out.println("Sequence #2 complete") // onComplete
+    );
 ```
 ```
 Subscriber #1:211128
@@ -40,20 +37,18 @@ Subscriber #2:826996
 Sequence #2 complete
 ```
 **Example #2:**
-```groovy
-def firstMillion  = Observable.range( 1, 1000000 ).sample(7, java.util.concurrent.TimeUnit.MILLISECONDS).publish();
+```java
+ConnectableObservable firstMillion = Observable.range(1, 1000000).sample(7, java.util.concurrent.TimeUnit.MILLISECONDS).publish();
 
-firstMillion.subscribe(
-   { println("Subscriber #1:" + it); },       // onNext
-   { println("Error: " + it.getMessage()); }, // onError
-   { println("Sequence #1 complete"); }       // onCompleted
-);
+firstMillion.subscribe(next -> System.out.println("Subscriber #1: " + next), // onNext
+		throwable -> System.out.println("Error: " + throwable), // onError
+		() -> System.out.println("Sequence #1 complete") // onComplete
+	);
 
-firstMillion.subscribe(
-   { println("Subscriber #2:" + it); },       // onNext
-   { println("Error: " + it.getMessage()); }, // onError
-   { println("Sequence #2 complete"); }       // onCompleted
-);
+firstMillion.subscribe(next -> System.out.println("Subscriber #2: " + next), // onNext
+		throwable -> System.out.println("Error: " + throwable), // onError
+		() -> System.out.println("Sequence #2 complete") // onComplete
+	);
 
 firstMillion.connect();
 ```
diff --git a/docs/Getting-Started.md b/docs/Getting-Started.md
index fb9baa47dd..e3453fbc28 100644
--- a/docs/Getting-Started.md
+++ b/docs/Getting-Started.md
@@ -1,20 +1,20 @@
 ## Getting Binaries
 
-You can find binaries and dependency information for Maven, Ivy, Gradle, SBT, and others at [http://search.maven.org](http://search.maven.org/#search%7Cga%7C1%7Cg%3A"io.reactivex.rxjava2"%20AND%20"rxjava2").
+You can find binaries and dependency information for Maven, Ivy, Gradle, SBT, and others at [http://search.maven.org](https://search.maven.org/search?q=g:io.reactivex.rxjava3%20AND%20rxjava).
 
 Example for Maven:
 
 ```xml
 <dependency>
-    <groupId>io.reactivex.rxjava2</groupId>
+    <groupId>io.reactivex.rxjava3</groupId>
     <artifactId>rxjava</artifactId>
-    <version>2.2.0</version>
+    <version>3.0.4</version>
 </dependency>
 ```
 and for Ivy:
 
 ```xml
-<dependency org="io.reactivex.rxjava2" name="rxjava" rev="2.2.0" />
+<dependency org="io.reactivex.rxjava3" name="rxjava" rev="3.0.4" />
 ```
 
 and for SBT:
@@ -22,12 +22,12 @@ and for SBT:
 ```scala
 libraryDependencies += "io.reactivex" %% "rxscala" % "0.26.5"
 
-libraryDependencies += "io.reactivex.rxjava2" % "rxjava" % "2.2.0"
+libraryDependencies += "io.reactivex.rxjava3" % "rxjava" % "3.0.4"
 ```
 
 and for Gradle:
 ```groovy
-compile 'io.reactivex.rxjava2:rxjava:2.2.0'
+compile 'io.reactivex.rxjava3:rxjava:3.0.4'
 ```
 
 If you need to download the jars instead of using a build system, create a Maven `pom` file like this with the desired version:
@@ -38,17 +38,17 @@ If you need to download the jars instead of using a build system, create a Maven
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
       <modelVersion>4.0.0</modelVersion>
-      <groupId>io.reactivex.rxjava2</groupId>
+      <groupId>io.reactivex.rxjava3</groupId>
       <artifactId>rxjava</artifactId>
-      <version>2.2.0</version>
+      <version>3.0.4</version>
       <name>RxJava</name>
       <description>Reactive Extensions for Java</description>
       <url>https://github.com/ReactiveX/RxJava</url>
       <dependencies>
           <dependency>
-              <groupId>io.reactivex.rxjava2</groupId>
+              <groupId>io.reactivex.rxjava3</groupId>
               <artifactId>rxjava</artifactId>
-              <version>2.2.0</version>
+              <version>3.0.4</version>
           </dependency>
       </dependencies>
 </project>
@@ -66,7 +66,7 @@ You need Java 6 or later.
 
 ### Snapshots
 
-Snapshots are available via [JFrog](https://oss.jfrog.org/libs-snapshot/io/reactivex/rxjava2/rxjava/):
+Snapshots are available via [JFrog](https://oss.jfrog.org/libs-snapshot/io/reactivex/rxjava3/rxjava/):
 
 ```groovy
 repositories {
@@ -74,7 +74,7 @@ repositories {
 }
 
 dependencies {
-    compile 'io.reactivex.rxjava2:rxjava:2.2.0-SNAPSHOT'
+    compile 'io.reactivex.rxjava3:rxjava:3.0.4'
 }
 ```
 

From d3dd133c3fe30610c3f4fa878de8285bf95177de Mon Sep 17 00:00:00 2001
From: Kranthi kulli <kullik2@gmail.com>
Date: Sun, 31 May 2020 08:59:35 -0500
Subject: [PATCH 129/665] 3.x update Conditional-and-Boolean-Operators.md
 (#7000)

* Fixed image link and added java examples

* 3.x:Update Getting started docs

* Conditional-and-Boolean-Operators documentation update
---
 docs/Conditional-and-Boolean-Operators.md | 180 ++++++++++++++++++++--
 1 file changed, 164 insertions(+), 16 deletions(-)

diff --git a/docs/Conditional-and-Boolean-Operators.md b/docs/Conditional-and-Boolean-Operators.md
index f7ed64ce34..e6d1358e31 100644
--- a/docs/Conditional-and-Boolean-Operators.md
+++ b/docs/Conditional-and-Boolean-Operators.md
@@ -1,21 +1,169 @@
 This section explains operators with which you conditionally emit or transform Observables, or can do boolean evaluations of them:
 
 ### Conditional Operators
-* [**`amb( )`**](http://reactivex.io/documentation/operators/amb.html) — given two or more source Observables, emits all of the items from the first of these Observables to emit an item
-* [**`defaultIfEmpty( )`**](http://reactivex.io/documentation/operators/defaultifempty.html) — emit items from the source Observable, or emit a default item if the source Observable completes after emitting no items
-* (`rxjava-computation-expressions`) [**`doWhile( )`**](http://reactivex.io/documentation/operators/repeat.html) — emit the source Observable's sequence, and then repeat the sequence as long as a condition remains true
-* (`rxjava-computation-expressions`) [**`ifThen( )`**](http://reactivex.io/documentation/operators/defer.html) — only emit the source Observable's sequence if a condition is true, otherwise emit an empty or default sequence
-* [**`skipUntil( )`**](http://reactivex.io/documentation/operators/skipuntil.html) — discard items emitted by a source Observable until a second Observable emits an item, then emit the remainder of the source Observable's items
-* [**`skipWhile( )`**](http://reactivex.io/documentation/operators/skipwhile.html) — discard items emitted by an Observable until a specified condition is false, then emit the remainder
-* (`rxjava-computation-expressions`) [**`switchCase( )`**](http://reactivex.io/documentation/operators/defer.html) — emit the sequence from a particular Observable based on the results of an evaluation
-* [**`takeUntil( )`**](http://reactivex.io/documentation/operators/takeuntil.html) — emits the items from the source Observable until a second Observable emits an item or issues a notification
-* [**`takeWhile( )` and `takeWhileWithIndex( )`**](http://reactivex.io/documentation/operators/takewhile.html) — emit items emitted by an Observable as long as a specified condition is true, then skip the remainder
-* (`rxjava-computation-expressions`) [**`whileDo( )`**](http://reactivex.io/documentation/operators/repeat.html) — if a condition is true, emit the source Observable's sequence and then repeat the sequence as long as the condition remains true
-
-> (`rxjava-computation-expressions`) — indicates that this operator is currently part of the optional `rxjava-computation-expressions` package under `rxjava-contrib` and is not included with the standard RxJava set of operators
+
+### Outline
+
+- [`amb`](#all)
+- [`defaultIfEmpty`](#defaultIfEmpty)
+- [`skipUntil`](#skipUntil)
+- [`skipWhile`](#skipWhile)
+- [`takeUntil`](#takeUntil)
+- [`takeWhile`](#takeUntil)
+
+## amb
+
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Completable`
+ 
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/amb.html](http://reactivex.io/documentation/operators/amb.html)
+
+given two or more source Observables, emits all of the items from the first of these Observables to emit an item
+
+```java
+    Observable source1 = Observable.range(1, 5);
+    Observable source2 = Observable.range(6, 5);
+    Observable.amb(new ArrayList(Arrays.asList(source1, source2)))
+        .subscribe(next -> System.out.printf("next: %s\n", next), // onNext
+            throwable -> System.out.printf("error: %s\n", throwable), //onError
+            () -> System.out.println("Completed") //onComplete
+        );
+```
+## defaultIfEmpty
+
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Completable`
+
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/defaultifempty.html](http://reactivex.io/documentation/operators/defaultifempty.html)
+
+emit items from the source Observable, or emit a default item if the source Observable completes after emitting no items
+
+```java
+ Observable.empty().defaultIfEmpty(1).blockingSubscribe(next -> System.out.printf("next: %s\n", next), // onNext
+                throwable -> System.out.printf("error: %s", throwable), //onError
+                () -> System.out.println("Completed") //onComplete
+        );
+```
+
+## skipUntil
+
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Completable`
+ 
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/skipuntil.html](http://reactivex.io/documentation/operators/skipuntil.html)
+
+discard items emitted by a source Observable until a second Observable emits an item, then emit the remainder of the source Observable's items
+
+```java
+Observable observable1 = Observable.range(1, 10).doOnNext(next -> Thread.sleep(1000));
+        
+observable1.skipUntil(Observable.timer(3, TimeUnit.SECONDS))
+    .subscribe(next -> System.out.printf("next: %s\n", next), // onNext
+        throwable -> System.out.printf("error: %s", throwable), //onError
+        () -> System.out.println("Completed") //onComplete
+    );
+```
+## skipWhile
+
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Completable`
+
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/skipwhile.html](http://reactivex.io/documentation/operators/skipwhile.html)
+
+discard items emitted by an Observable until a specified condition is false, then emit the remainder
+
+```java
+Observable.range(1, 10).skipWhile(next -> next < 5)
+    .subscribe(next -> System.out.printf("next: %s\n", next), // onNext
+        throwable -> System.out.printf("error: %s", throwable), //onError
+        () -> System.out.println("Completed") //onComplete
+    );
+```
+
+## takeUntil
+
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Completable`
+
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/takeuntil.html](http://reactivex.io/documentation/operators/takeuntil.html)
+
+emits the items from the source Observable until a second Observable emits an item or issues a notification
+
+```java
+Observable.range(1, 10).takeUntil(value -> value >= 5)
+    .subscribe(next -> System.out.printf("next: %s\n", next), // onNext
+        throwable -> System.out.printf("error: %s", throwable), //onError
+        () -> System.out.println("Completed") //onComplete
+    );
+```
+
+## takeWhile
+
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Completable`
+
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/takewhile.html](http://reactivex.io/documentation/operators/takewhile.html)
+
+emit items emitted by an Observable as long as a specified condition is true, then skip the remainder
+
+```java
+     Observable.range(1, 10).takeWhile(value -> value <= 5)
+                .subscribe(next -> System.out.printf("next: %s\n", next), // onNext
+                        throwable -> System.out.printf("error: %s", throwable), //onError
+                        () -> System.out.println("Completed") //onComplete
+                );
+```
 
 ### Boolean Operators
-* [**`all( )`**](http://reactivex.io/documentation/operators/all.html) — determine whether all items emitted by an Observable meet some criteria
-* [**`contains( )`**](http://reactivex.io/documentation/operators/contains.html) — determine whether an Observable emits a particular item or not
-* [**`exists( )` and `isEmpty( )`**](http://reactivex.io/documentation/operators/contains.html) — determine whether an Observable emits any items or not
-* [**`sequenceEqual( )`**](http://reactivex.io/documentation/operators/sequenceequal.html) — test the equality of the sequences emitted by two Observables
+
+### Outline
+
+- [`all`](#all)
+- [`contains`](#contains)
+- [`isEmpty`](#isEmpty)
+- [`sequenceEqual`](#sequenceEqual)
+
+## all
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Completable`
+
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/all.html](http://reactivex.io/documentation/operators/all.html)
+
+determine whether all items emitted by an Observable meet some criteria
+
+```java
+Flowable.range(0,10).doOnNext(next -> System.out.println(next)).all(integer -> integer<10).
+    blockingSubscribe(success->System.out.println("Success: "+success));
+```
+
+## contains
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Completable`
+
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/contains.html](http://reactivex.io/documentation/operators/contains.html)
+
+determine whether an Observable emits a particular item or not
+
+```java
+Flowable.range(1,10).doOnNext(next->System.out.println(next))
+    .contains(4).blockingSubscribe(contains->System.out.println("contains: "+contains));
+```
+
+## isEmpty
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_off.png) `Completable`
+
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/contains.html](http://reactivex.io/documentation/operators/contains.html)
+
+determine whether the source Publisher is empty
+
+```java
+Flowable.empty().isEmpty().subscribe(isEmpty -> System.out.printf("isEmpty: %s", isEmpty));
+```
+
+## sequenceEqual
+**Available in:** ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Flowable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Observable`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Maybe`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Single`, ![image](https://raw.github.com/wiki/ReactiveX/RxJava/images/checkmark_on.png) `Completable`
+
+**ReactiveX documentation:** [http://reactivex.io/documentation/operators/sequenceequal.html](http://reactivex.io/documentation/operators/sequenceequal.html)
+
+test the equality of the sequences emitted by two Observables
+
+```java
+Flowable<Integer> flowable1 = Flowable.range(1,3).doOnNext(next-> System.out.print("flowable1: "+next + " "));
+
+Flowable<Integer> flowable2 = Flowable.range(1,3).doOnNext(next-> System.out.println("flowable2: "+next));
+
+Flowable.sequenceEqual(Flowable.fromPublisher(flowable1),Flowable.fromPublisher(flowable2))
+    .blockingSubscribe(sequenceEqual->System.out.println("sequenceEqual: "+sequenceEqual));
+```

From da498c5c9b91cceaa37ca8abdaa4f914b3ec6d9c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 2 Jun 2020 09:39:39 +0200
Subject: [PATCH 130/665] Bump biz.aQute.bnd.gradle from 5.0.1 to 5.1.0 (#7003)

Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.0.1 to 5.1.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c35b696d20..0754e86f3a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
   ext.jfrogExtractorVersion = "4.15.2"
-  ext.bndVersion = "5.0.1"
+  ext.bndVersion = "5.1.0"
   ext.checkstyleVersion = "8.26"
 
   // --------------------------------------

From 043dbaabd86f9b54d08a55e3976dffb66d2ee54c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 8 Jun 2020 09:59:43 +0200
Subject: [PATCH 131/665] Bump gradle-animalsniffer-plugin from 1.5.0 to 1.5.1
 (#7007)

Bumps gradle-animalsniffer-plugin from 1.5.0 to 1.5.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0754e86f3a..afb45c7cd1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"
   ext.jacocoVersion = "0.8.4"
-  ext.animalSnifferVersion = "1.5.0"
+  ext.animalSnifferVersion = "1.5.1"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
   ext.jfrogExtractorVersion = "4.15.2"

From 3245db767d99f62af51a86e4c509b16820030611 Mon Sep 17 00:00:00 2001
From: Abhishek <6554853+sh-abhi@users.noreply.github.com>
Date: Mon, 8 Jun 2020 08:21:22 +0000
Subject: [PATCH 132/665] Updating SuppressUndeliverableRule to have a named
 inner class instead of an anonymous inner class. (#7006)

---
 .../SuppressUndeliverableRule.java            | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
index 392fbdba33..ea013daac5 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
@@ -30,26 +30,35 @@
  */
 public class SuppressUndeliverableRule implements TestRule {
 
+    private static class SuppressUndeliverableRuleStatement extends Statement {
+        private Statement base;
+
+        private SuppressUndeliverableRuleStatement(){}
+        public SuppressUndeliverableRuleStatement(Statement base) {
+            this.base = base;
+        }
+
+        @Override
+        public void evaluate() throws Throwable {
+            try {
+                RxJavaPlugins.setErrorHandler(throwable -> {
+                    if (!(throwable instanceof UndeliverableException)) {
+                        throwable.printStackTrace();
+                        Thread currentThread = Thread.currentThread();
+                        currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, throwable);
+                    }
+                });
+                base.evaluate();
+            } finally {
+                RxJavaPlugins.setErrorHandler(null);
+            }
+        }
+    }
+
     @Override
     public Statement apply(Statement base, Description description) {
-        if (description.getAnnotation(SuppressUndeliverable.class) != null) {
-            return new Statement() {
-                @Override
-                public void evaluate() throws Throwable {
-                    try {
-                        RxJavaPlugins.setErrorHandler(throwable -> {
-                            if (!(throwable instanceof UndeliverableException)) {
-                                throwable.printStackTrace();
-                                Thread currentThread = Thread.currentThread();
-                                currentThread.getUncaughtExceptionHandler().uncaughtException(currentThread, throwable);
-                            }
-                        });
-                        base.evaluate();
-                    } finally {
-                        RxJavaPlugins.setErrorHandler(null);
-                    }
-                }
-            };
+        if (description != null && description.getAnnotation(SuppressUndeliverable.class) != null) {
+            return new SuppressUndeliverableRuleStatement(base);
         } else {
             return base;
         }

From 3ac8cfc14a91edc8adf66d47c58a76545e61d18d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Jun 2020 09:56:47 +0200
Subject: [PATCH 133/665] Bump biz.aQute.bnd.gradle from 5.1.0 to 5.1.1 (#7009)

Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.1.0 to 5.1.1.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index afb45c7cd1..22b5601238 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
   ext.jfrogExtractorVersion = "4.15.2"
-  ext.bndVersion = "5.1.0"
+  ext.bndVersion = "5.1.1"
   ext.checkstyleVersion = "8.26"
 
   // --------------------------------------

From d209606e0eaaf87bb5493fd71a8413822f9992f2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 26 Jun 2020 09:22:40 +0200
Subject: [PATCH 134/665] Bump build-info-extractor-gradle from 4.15.2 to
 4.16.0 (#7013)

Bumps build-info-extractor-gradle from 4.15.2 to 4.16.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 22b5601238..6328add6c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.1"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.15.2"
+  ext.jfrogExtractorVersion = "4.16.0"
   ext.bndVersion = "5.1.1"
   ext.checkstyleVersion = "8.26"
 

From 880eed2ac0dc1e3fc234bb652f5e177ce643093c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20K=C3=B6rner?=
 <48256264+timkoerner@users.noreply.github.com>
Date: Mon, 6 Jul 2020 17:47:35 +0200
Subject: [PATCH 135/665] Edit dependency for gradle (#7023)

Since gradle 3.0.x the `compile` keyword is deprecated. [You should](https://developer.android.com/studio/build/dependencies#dependency_configurations) use 'implementation' instead.
---
 docs/Getting-Started.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Getting-Started.md b/docs/Getting-Started.md
index e3453fbc28..d2ac2e4640 100644
--- a/docs/Getting-Started.md
+++ b/docs/Getting-Started.md
@@ -27,7 +27,7 @@ libraryDependencies += "io.reactivex.rxjava3" % "rxjava" % "3.0.4"
 
 and for Gradle:
 ```groovy
-compile 'io.reactivex.rxjava3:rxjava:3.0.4'
+implementation 'io.reactivex.rxjava3:rxjava:3.0.4'
 ```
 
 If you need to download the jars instead of using a build system, create a Maven `pom` file like this with the desired version:

From 9854a83cac6e2c584e22efc231b6db30ddfabcbe Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 9 Jul 2020 08:08:04 +0200
Subject: [PATCH 136/665] Bump build-info-extractor-gradle from 4.16.0 to
 4.16.1 (#7024)

Bumps build-info-extractor-gradle from 4.16.0 to 4.16.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6328add6c0..09753f1214 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.1"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.16.0"
+  ext.jfrogExtractorVersion = "4.16.1"
   ext.bndVersion = "5.1.1"
   ext.checkstyleVersion = "8.26"
 

From b345254d55368c7a129c75441e4a7d0dfbd5871f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 13 Jul 2020 13:54:01 +0200
Subject: [PATCH 137/665] Bump mockito-core from 3.3.3 to 3.4.0 (#7027)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.3.3 to 3.4.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.3.3...v3.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 09753f1214..9adad92847 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.0.0"
-  ext.mockitoVersion = "3.3.3"
+  ext.mockitoVersion = "3.4.0"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"

From 53cde33515ee0d2074dbcd82c6dc0174861aa06c Mon Sep 17 00:00:00 2001
From: Lugduni Desrosiers <36016544+ddunig2@users.noreply.github.com>
Date: Mon, 13 Jul 2020 14:30:45 -0400
Subject: [PATCH 138/665] fixed for issue #7001 (#7028)

---
 .../operators/flowable/FlowableGroupByTest.java        | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index c86e9f260d..1e9ce41786 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -2667,19 +2667,17 @@ public void issue6974Part2Case2Loop() {
 
     static void issue6974RunPart2NoEvict(int groupByBufferSize, int flatMapMaxConcurrency, int groups,
             boolean notifyOnExplicitEviction) {
-        TestSubscriber<Integer> ts = Flowable
+    	
+        Flowable
         .range(1, 500_000)
         .map(i -> i % groups)
         .groupBy(i -> i)
         .flatMap(gf -> gf
                 .take(10, TimeUnit.MILLISECONDS)
                 , flatMapMaxConcurrency)
-        .test();
-
-        ts
+        .subscribeWith(new TestSubscriberEx<>())
         .awaitDone(5, TimeUnit.SECONDS)
-        .assertNoErrors()
-        .assertComplete();
+        .assertTerminated(); // MBE is possible if the async group closing is slow
     }
 
     @Test

From 8e71c100e073dacac6b7a1f910830c0bf7bbaeab Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 17 Jul 2020 10:04:52 +0200
Subject: [PATCH 139/665] Bump mockito-core from 3.4.0 to 3.4.2 (#7031)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.0 to 3.4.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.4.0...v3.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9adad92847..59f271636d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.0.0"
-  ext.mockitoVersion = "3.4.0"
+  ext.mockitoVersion = "3.4.2"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"

From cc48e7746b04651bb614210df83e4c83f66ef816 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 20 Jul 2020 17:40:23 +0200
Subject: [PATCH 140/665] Bump mockito-core from 3.4.2 to 3.4.4 (#7035)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.2 to 3.4.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.4.2...v3.4.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 59f271636d..f73c17c287 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.0.0"
-  ext.mockitoVersion = "3.4.2"
+  ext.mockitoVersion = "3.4.4"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"

From 343be6a3e6fbe38b6c2b441c5f391211caf3602d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 22 Jul 2020 11:36:37 +0200
Subject: [PATCH 141/665] Bump biz.aQute.bnd.gradle from 5.1.1 to 5.1.2 (#7038)

Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.1.1 to 5.1.2.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f73c17c287..59bc72c8f4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
   ext.jfrogExtractorVersion = "4.16.1"
-  ext.bndVersion = "5.1.1"
+  ext.bndVersion = "5.1.2"
   ext.checkstyleVersion = "8.26"
 
   // --------------------------------------

From 3e0977dedb9144663d4145fcb3a79bb379e136e4 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 25 Jul 2020 12:21:26 +0200
Subject: [PATCH 142/665] 3.x: Fix map() conditional chain causing NPE (#7040)

---
 .../operators/flowable/FlowableMap.java       |  7 ++++++-
 .../jdk8/FlowableMapOptionalTest.java         | 19 ++++++++++++++++++-
 .../operators/flowable/FlowableMapTest.java   | 16 ++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
index 208baca0b2..6bae806972 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
@@ -115,7 +115,12 @@ public void onNext(T t) {
         @Override
         public boolean tryOnNext(T t) {
             if (done) {
-                return false;
+                return true;
+            }
+
+            if (sourceMode != NONE) {
+                downstream.tryOnNext(null);
+                return true;
             }
 
             U v;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
index 85fc8d75be..3e3f418790 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
@@ -24,9 +24,10 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.processors.*;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableMapOptionalTest extends RxJavaTest {
 
@@ -467,4 +468,20 @@ public void boundaryFusedMixedConditional() {
         .assertFusionMode(QueueFuseable.NONE)
         .assertResult(2, 4, 6, 8, 10);
     }
+
+    @Test
+    public void conditionalFusionNoNPE() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>()
+        .setInitialFusionMode(QueueFuseable.ANY);
+
+        Flowable.empty()
+        .observeOn(ImmediateThinScheduler.INSTANCE)
+        .filter(v -> true)
+        .mapOptional(Optional::of)
+        .filter(v -> true)
+        .subscribe(ts)
+        ;
+
+        ts.assertResult();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
index 1c0e6c58a3..f7898ac5a9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
@@ -28,6 +28,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.*;
@@ -617,4 +618,19 @@ public Object apply(Flowable<Object> f) throws Exception {
         }, false, 1, 1, 1);
     }
 
+    @Test
+    public void conditionalFusionNoNPE() {
+        TestSubscriberEx<Object> ts = new TestSubscriberEx<>()
+        .setInitialFusionMode(QueueFuseable.ANY);
+
+        Flowable.empty()
+        .observeOn(ImmediateThinScheduler.INSTANCE)
+        .filter(v -> true)
+        .map(v -> v)
+        .filter(v -> true)
+        .subscribe(ts)
+        ;
+
+        ts.assertResult();
+    }
 }

From 5fefe60eed4993c2dd28516e4861ff91ea2de54e Mon Sep 17 00:00:00 2001
From: Jakob van Kruijssen <cardamon@gmail.com>
Date: Tue, 28 Jul 2020 13:05:01 +0200
Subject: [PATCH 143/665] Made the parameter of
 {Flowable,Observable}.collect(Collector) contravariant on T. (#7033)

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java       | 2 +-
 src/main/java/io/reactivex/rxjava3/core/Observable.java     | 2 +-
 .../rxjava3/internal/jdk8/FlowableCollectWithCollector.java | 6 +++---
 .../internal/jdk8/FlowableCollectWithCollectorSingle.java   | 6 +++---
 .../internal/jdk8/ObservableCollectWithCollector.java       | 6 +++---
 .../internal/jdk8/ObservableCollectWithCollectorSingle.java | 6 +++---
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 2843a2909a..01c3c4438e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -19802,7 +19802,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R, A> Single<R> collect(@NonNull Collector<T, A, R> collector) {
+    public final <@NonNull R, A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new FlowableCollectWithCollectorSingle<>(this, collector));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 2e0aff91ba..eabe9012ab 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -16642,7 +16642,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R, A> Single<R> collect(@NonNull Collector<T, A, R> collector) {
+    public final <@NonNull R, A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ObservableCollectWithCollectorSingle<>(this, collector));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
index bc408db304..11a00aadb9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
@@ -36,9 +36,9 @@ public final class FlowableCollectWithCollector<T, A, R> extends Flowable<R> {
 
     final Flowable<T> source;
 
-    final Collector<T, A, R> collector;
+    final Collector<? super T, A, R> collector;
 
-    public FlowableCollectWithCollector(Flowable<T> source, Collector<T, A, R> collector) {
+    public FlowableCollectWithCollector(Flowable<T> source, Collector<? super T, A, R> collector) {
         this.source = source;
         this.collector = collector;
     }
@@ -46,7 +46,7 @@ public FlowableCollectWithCollector(Flowable<T> source, Collector<T, A, R> colle
     @Override
     protected void subscribeActual(@NonNull Subscriber<? super R> s) {
         A container;
-        BiConsumer<A, T> accumulator;
+        BiConsumer<A, ? super T> accumulator;
         Function<A, R> finisher;
 
         try {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
index 134de68415..14c1ebf4a8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
@@ -39,9 +39,9 @@ public final class FlowableCollectWithCollectorSingle<T, A, R> extends Single<R>
 
     final Flowable<T> source;
 
-    final Collector<T, A, R> collector;
+    final Collector<? super T, A, R> collector;
 
-    public FlowableCollectWithCollectorSingle(Flowable<T> source, Collector<T, A, R> collector) {
+    public FlowableCollectWithCollectorSingle(Flowable<T> source, Collector<? super T, A, R> collector) {
         this.source = source;
         this.collector = collector;
     }
@@ -54,7 +54,7 @@ public Flowable<R> fuseToFlowable() {
     @Override
     protected void subscribeActual(@NonNull SingleObserver<? super R> observer) {
         A container;
-        BiConsumer<A, T> accumulator;
+        BiConsumer<A, ? super T> accumulator;
         Function<A, R> finisher;
 
         try {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
index 34132a01b3..63452ce3e9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
@@ -36,9 +36,9 @@ public final class ObservableCollectWithCollector<T, A, R> extends Observable<R>
 
     final Observable<T> source;
 
-    final Collector<T, A, R> collector;
+    final Collector<? super T, A, R> collector;
 
-    public ObservableCollectWithCollector(Observable<T> source, Collector<T, A, R> collector) {
+    public ObservableCollectWithCollector(Observable<T> source, Collector<? super T, A, R> collector) {
         this.source = source;
         this.collector = collector;
     }
@@ -46,7 +46,7 @@ public ObservableCollectWithCollector(Observable<T> source, Collector<T, A, R> c
     @Override
     protected void subscribeActual(@NonNull Observer<? super R> observer) {
         A container;
-        BiConsumer<A, T> accumulator;
+        BiConsumer<A, ? super T> accumulator;
         Function<A, R> finisher;
 
         try {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
index a919b02ab9..9f990a77a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
@@ -36,9 +36,9 @@ public final class ObservableCollectWithCollectorSingle<T, A, R> extends Single<
 
     final Observable<T> source;
 
-    final Collector<T, A, R> collector;
+    final Collector<? super T, A, R> collector;
 
-    public ObservableCollectWithCollectorSingle(Observable<T> source, Collector<T, A, R> collector) {
+    public ObservableCollectWithCollectorSingle(Observable<T> source, Collector<? super T, A, R> collector) {
         this.source = source;
         this.collector = collector;
     }
@@ -51,7 +51,7 @@ public Observable<R> fuseToObservable() {
     @Override
     protected void subscribeActual(@NonNull SingleObserver<? super R> observer) {
         A container;
-        BiConsumer<A, T> accumulator;
+        BiConsumer<A, ? super T> accumulator;
         Function<A, R> finisher;
 
         try {

From 2eba6f1c35c4396e8ccfa9fef5744dfd897650df Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2020 09:23:35 +0200
Subject: [PATCH 144/665] Bump mockito-core from 3.4.4 to 3.4.6 (#7043)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.4 to 3.4.6.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.4.4...v3.4.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 59bc72c8f4..ad0148f254 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.0.0"
-  ext.mockitoVersion = "3.4.4"
+  ext.mockitoVersion = "3.4.6"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"

From a8fcaf0bcde19b9ec3b335bfd696cbf3b8beb81c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 3 Aug 2020 10:04:59 +0200
Subject: [PATCH 145/665] Bump testng from 7.0.0 to 7.3.0 (#7047)

Bumps [testng](https://github.com/cbeust/testng) from 7.0.0 to 7.3.0.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ad0148f254..08ce0cf788 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
   
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
-  ext.testNgVersion = "7.0.0"
+  ext.testNgVersion = "7.3.0"
   ext.mockitoVersion = "3.4.6"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"

From 7ed8e1a8931f5fd730805fd8e6299d1357863a47 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 6 Aug 2020 08:09:46 +0200
Subject: [PATCH 146/665] 3.x: Fix Observable.window (size, skip, overlap)
 dispose behavior (#7049)

---
 .../observable/ObservableWindow.java          | 52 ++++++-----
 .../flowable/FlowableWindowWithSizeTest.java  | 91 +++++++++++++++++++
 .../ObservableWindowWithSizeTest.java         | 90 ++++++++++++++++++
 3 files changed, 208 insertions(+), 25 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
index 3ada9cd93c..1bd0e2f32e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
@@ -51,18 +51,20 @@ static final class WindowExactObserver<T>
         final long count;
         final int capacityHint;
 
+        final AtomicBoolean cancelled;
+
         long size;
 
         Disposable upstream;
 
         UnicastSubject<T> window;
 
-        volatile boolean cancelled;
-
         WindowExactObserver(Observer<? super Observable<T>> actual, long count, int capacityHint) {
             this.downstream = actual;
             this.count = count;
             this.capacityHint = capacityHint;
+            this.cancelled = new AtomicBoolean();
+            this.lazySet(1);
         }
 
         @Override
@@ -78,7 +80,9 @@ public void onSubscribe(Disposable d) {
         public void onNext(T t) {
             UnicastSubject<T> w = window;
             ObservableWindowSubscribeIntercept<T> intercept = null;
-            if (w == null && !cancelled) {
+            if (w == null && !cancelled.get()) {
+                getAndIncrement();
+
                 w = UnicastSubject.create(capacityHint, this);
                 window = w;
                 intercept = new ObservableWindowSubscribeIntercept<>(w);
@@ -92,15 +96,12 @@ public void onNext(T t) {
                     size = 0;
                     window = null;
                     w.onComplete();
-                    if (cancelled) {
-                        upstream.dispose();
-                    }
                 }
 
                 if (intercept != null && intercept.tryAbandon()) {
+                    window = null;
                     w.onComplete();
                     w = null;
-                    window = null;
                 }
             }
         }
@@ -127,23 +128,25 @@ public void onComplete() {
 
         @Override
         public void dispose() {
-            cancelled = true;
+            if (cancelled.compareAndSet(false, true)) {
+                run();
+            }
         }
 
         @Override
         public boolean isDisposed() {
-            return cancelled;
+            return cancelled.get();
         }
 
         @Override
         public void run() {
-            if (cancelled) {
+            if (decrementAndGet() == 0) {
                 upstream.dispose();
             }
         }
     }
 
-    static final class WindowSkipObserver<T> extends AtomicBoolean
+    static final class WindowSkipObserver<T> extends AtomicInteger
     implements Observer<T>, Disposable, Runnable {
 
         private static final long serialVersionUID = 3366976432059579510L;
@@ -153,23 +156,23 @@ static final class WindowSkipObserver<T> extends AtomicBoolean
         final int capacityHint;
         final ArrayDeque<UnicastSubject<T>> windows;
 
-        long index;
+        final AtomicBoolean cancelled;
 
-        volatile boolean cancelled;
+        long index;
 
         /** Counts how many elements were emitted to the very first window in windows. */
         long firstEmission;
 
         Disposable upstream;
 
-        final AtomicInteger wip = new AtomicInteger();
-
         WindowSkipObserver(Observer<? super Observable<T>> actual, long count, long skip, int capacityHint) {
             this.downstream = actual;
             this.count = count;
             this.skip = skip;
             this.capacityHint = capacityHint;
             this.windows = new ArrayDeque<>();
+            this.cancelled = new AtomicBoolean();
+            this.lazySet(1);
         }
 
         @Override
@@ -191,8 +194,8 @@ public void onNext(T t) {
 
             ObservableWindowSubscribeIntercept<T> intercept = null;
 
-            if (i % s == 0 && !cancelled) {
-                wip.getAndIncrement();
+            if (i % s == 0 && !cancelled.get()) {
+                getAndIncrement();
                 UnicastSubject<T> w = UnicastSubject.create(capacityHint, this);
                 intercept = new ObservableWindowSubscribeIntercept<>(w);
                 ws.offer(w);
@@ -207,8 +210,7 @@ public void onNext(T t) {
 
             if (c >= count) {
                 ws.poll().onComplete();
-                if (ws.isEmpty() && cancelled) {
-                    this.upstream.dispose();
+                if (ws.isEmpty() && cancelled.get()) {
                     return;
                 }
                 firstEmission = c - s;
@@ -243,20 +245,20 @@ public void onComplete() {
 
         @Override
         public void dispose() {
-            cancelled = true;
+            if (cancelled.compareAndSet(false, true)) {
+                run();
+            }
         }
 
         @Override
         public boolean isDisposed() {
-            return cancelled;
+            return cancelled.get();
         }
 
         @Override
         public void run() {
-            if (wip.decrementAndGet() == 0) {
-                if (cancelled) {
-                    upstream.dispose();
-                }
+            if (decrementAndGet() == 0) {
+                upstream.dispose();
             }
         }
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
index b8ae0b35c9..ab38a160e8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
@@ -25,6 +25,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
@@ -721,4 +722,94 @@ public void moreQueuedClean() {
         .test(3)
         .cancel();
     }
+
+    @Test
+    public void cancelWithoutWindowSize() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Flowable<Integer>> ts = pp.window(10)
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.cancel();
+
+        assertFalse("Subject still has subscribers!", pp.hasSubscribers());
+    }
+
+    @Test
+    public void cancelAfterAbandonmentSize() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Flowable<Integer>> ts = pp.window(10)
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        pp.onNext(1);
+
+        ts.cancel();
+
+        assertFalse("Subject still has subscribers!", pp.hasSubscribers());
+    }
+
+    @Test
+    public void cancelWithoutWindowSkip() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Flowable<Integer>> ts = pp.window(10, 15)
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.cancel();
+
+        assertFalse("Subject still has subscribers!", pp.hasSubscribers());
+    }
+
+    @Test
+    public void cancelAfterAbandonmentSkip() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Flowable<Integer>> ts = pp.window(10, 15)
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        pp.onNext(1);
+
+        ts.cancel();
+
+        assertFalse("Subject still has subscribers!", pp.hasSubscribers());
+    }
+
+    @Test
+    public void cancelWithoutWindowOverlap() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Flowable<Integer>> ts = pp.window(10, 5)
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        ts.cancel();
+
+        assertFalse("Subject still has subscribers!", pp.hasSubscribers());
+    }
+
+    @Test
+    public void cancelAfterAbandonmentOverlap() {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        TestSubscriber<Flowable<Integer>> ts = pp.window(10, 5)
+        .test();
+
+        assertTrue(pp.hasSubscribers());
+
+        pp.onNext(1);
+
+        ts.cancel();
+
+        assertFalse("Subject still has subscribers!", pp.hasSubscribers());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
index 04099c31cb..6c253eb52c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
@@ -535,4 +535,94 @@ public void accept(Observable<Integer> v) throws Throwable {
 
         inner.get().test().assertResult(1);
     }
+
+    @Test
+    public void cancelWithoutWindowSize() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Observable<Integer>> to = ps.window(10)
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        to.dispose();
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+    }
+
+    @Test
+    public void cancelAfterAbandonmentSize() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Observable<Integer>> to = ps.window(10)
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to.dispose();
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+    }
+
+    @Test
+    public void cancelWithoutWindowSkip() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Observable<Integer>> to = ps.window(10, 15)
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        to.dispose();
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+    }
+
+    @Test
+    public void cancelAfterAbandonmentSkip() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Observable<Integer>> to = ps.window(10, 15)
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to.dispose();
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+    }
+
+    @Test
+    public void cancelWithoutWindowOverlap() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Observable<Integer>> to = ps.window(10, 5)
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        to.dispose();
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+    }
+
+    @Test
+    public void cancelAfterAbandonmentOverlap() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestObserver<Observable<Integer>> to = ps.window(10, 5)
+        .test();
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        to.dispose();
+
+        assertFalse("Subject still has observers!", ps.hasObservers());
+    }
 }

From 5cbb6070a2bb53ce2c7185dae4ad69b3b87bc8e8 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 6 Aug 2020 09:25:54 +0200
Subject: [PATCH 147/665] 3.x: Update marbles of onErrorResume(Next|With) +
 cleanup (#7051)

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java        | 2 +-
 src/main/java/io/reactivex/rxjava3/core/Observable.java      | 2 +-
 .../internal/operators/flowable/FlowableGroupByTest.java     | 2 +-
 .../internal/operators/flowable/FlowableGroupJoinTest.java   | 2 +-
 .../internal/operators/flowable/FlowableJoinTest.java        | 2 +-
 .../operators/observable/ObservableGroupJoinTest.java        | 2 +-
 .../internal/operators/observable/ObservableJoinTest.java    | 2 +-
 .../rxjava3/testsupport/SuppressUndeliverableRule.java       | 5 ++---
 8 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 01c3c4438e..f836f4ba54 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -12770,7 +12770,7 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
      * Resumes the flow with the given {@link Publisher} when the current {@code Flowable} fails instead of
      * signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeWith.v3.png" alt="">
      * <p>
      * By default, when a {@code Publisher} encounters an error that prevents it from emitting the expected item to
      * its {@link Subscriber}, the {@code Publisher} invokes its {@code Subscriber}'s {@code onError} method, and then quits
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index eabe9012ab..6332eaf793 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -10691,7 +10691,7 @@ public final Observable<T> onErrorResumeNext(@NonNull Function<? super Throwable
      * Resumes the flow with the given {@link ObservableSource} when the current {@code Observable} fails instead of
      * signaling the error via {@code onError}.
      * <p>
-     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeNext.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/onErrorResumeWith.v3.png" alt="">
      * <p>
      * By default, when an {@code ObservableSource} encounters an error that prevents it from emitting the expected item to
      * its {@link Observer}, the {@code ObservableSource} invokes its {@code Observer}'s {@code onError} method, and then quits
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index 1e9ce41786..9512cab905 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -2667,7 +2667,7 @@ public void issue6974Part2Case2Loop() {
 
     static void issue6974RunPart2NoEvict(int groupByBufferSize, int flatMapMaxConcurrency, int groups,
             boolean notifyOnExplicitEviction) {
-    	
+
         Flowable
         .range(1, 500_000)
         .map(i -> i % groups)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
index 2e7eba8d1a..40539769e9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
@@ -79,7 +79,7 @@ public Integer apply(Integer rightValue) throws Throwable {
 
     @Before
     public void before() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
index 080be1bb59..b74fa0752f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
@@ -55,7 +55,7 @@ public Flowable<T> apply(Integer t1) {
 
     @Before
     public void before() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
index 2e5af8b72e..67f8eda0b7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
@@ -81,7 +81,7 @@ public Integer apply(Integer rightValue) throws Throwable {
 
     @Before
     public void before() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
index 54c2822395..a674d0680e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
@@ -54,7 +54,7 @@ public Observable<T> apply(Integer t1) {
 
     @Before
     public void before() {
-        MockitoAnnotations.initMocks(this);
+        MockitoAnnotations.openMocks(this);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
index ea013daac5..fa78a23410 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
@@ -30,11 +30,10 @@
  */
 public class SuppressUndeliverableRule implements TestRule {
 
-    private static class SuppressUndeliverableRuleStatement extends Statement {
+    static final class SuppressUndeliverableRuleStatement extends Statement {
         private Statement base;
 
-        private SuppressUndeliverableRuleStatement(){}
-        public SuppressUndeliverableRuleStatement(Statement base) {
+        SuppressUndeliverableRuleStatement(Statement base) {
             this.base = base;
         }
 

From e1bd35ad4d51f91bf9e8eb82c72937b863eef897 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 13 Aug 2020 09:56:46 +0200
Subject: [PATCH 148/665] Bump build-info-extractor-gradle from 4.16.1 to
 4.17.0 (#7053)

Bumps build-info-extractor-gradle from 4.16.1 to 4.17.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 08ce0cf788..8ced056461 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.1"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.16.1"
+  ext.jfrogExtractorVersion = "4.17.0"
   ext.bndVersion = "5.1.2"
   ext.checkstyleVersion = "8.26"
 

From 6c64e863b08d3fe0213240ae55ed239708210654 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 17 Aug 2020 10:19:22 +0200
Subject: [PATCH 149/665] Bump mockito-core from 3.4.6 to 3.5.0 (#7057)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.4.6 to 3.5.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.4.6...v3.5.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8ced056461..c1c36f5f6c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.4.6"
+  ext.mockitoVersion = "3.5.0"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"

From 298a56fca684abeac86ab12895126bfbf5049260 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 18 Aug 2020 10:25:39 +0200
Subject: [PATCH 150/665] Bump build-info-extractor-gradle from 4.17.0 to
 4.17.1 (#7059)

Bumps build-info-extractor-gradle from 4.17.0 to 4.17.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c1c36f5f6c..e70f030c7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.1"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.17.0"
+  ext.jfrogExtractorVersion = "4.17.1"
   ext.bndVersion = "5.1.2"
   ext.checkstyleVersion = "8.26"
 

From 493c71d2f83ee81895598d52a26f133132504888 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 19 Aug 2020 10:55:25 +0200
Subject: [PATCH 151/665] Bump mockito-core from 3.5.0 to 3.5.2 (#7060)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.0 to 3.5.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.0...v3.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e70f030c7c..8d87d80c75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.0"
+  ext.mockitoVersion = "3.5.2"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"

From 12e5ee4340f08595978d1684adc91def1cfedc5b Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2020 09:48:55 +0200
Subject: [PATCH 152/665] Bump mockito-core from 3.5.2 to 3.5.5 (#7062)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.2 to 3.5.5.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.2...v3.5.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8d87d80c75..f2c66ed513 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.2"
+  ext.mockitoVersion = "3.5.5"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"

From e3b12fd97c30c08b833bd65fa0c5ed6855c8d3da Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 25 Aug 2020 09:05:53 +0200
Subject: [PATCH 153/665] Bump mockito-core from 3.5.5 to 3.5.6 (#7063)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.5 to 3.5.6.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.5...v3.5.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f2c66ed513..d94627f336 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.5"
+  ext.mockitoVersion = "3.5.6"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"

From c76ad8ce837810c1b3696129953aedc6edb2fc8f Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 26 Aug 2020 08:26:45 +0200
Subject: [PATCH 154/665] Bump mockito-core from 3.5.6 to 3.5.7 (#7064)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.6 to 3.5.7.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.6...v3.5.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d94627f336..0b1b1b420e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.6"
+  ext.mockitoVersion = "3.5.7"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.0"
   ext.guavaVersion = "29.0-jre"

From da56e9bb31ff8cb4df81db02046c5269243aa284 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 27 Aug 2020 08:41:55 +0200
Subject: [PATCH 155/665] Bump jmh-gradle-plugin from 0.5.0 to 0.5.1 (#7066)

Bumps jmh-gradle-plugin from 0.5.0 to 0.5.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0b1b1b420e..d3c0c5a982 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
   ext.testNgVersion = "7.3.0"
   ext.mockitoVersion = "3.5.7"
   ext.jmhLibVersion = "1.21"
-  ext.jmhGradleVersion = "0.5.0"
+  ext.jmhGradleVersion = "0.5.1"
   ext.guavaVersion = "29.0-jre"
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.1"

From c15b5a535d146aa2bfe684226f52fc42eb5559f5 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 28 Aug 2020 08:36:18 +0200
Subject: [PATCH 156/665] Bump build-info-extractor-gradle from 4.17.1 to
 4.17.2 (#7067)

Bumps build-info-extractor-gradle from 4.17.1 to 4.17.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d3c0c5a982..ed8d5d84d9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.1"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.17.1"
+  ext.jfrogExtractorVersion = "4.17.2"
   ext.bndVersion = "5.1.2"
   ext.checkstyleVersion = "8.26"
 

From 1ff3cd62091db049b39a2eda0443240e75d6c321 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 2 Sep 2020 08:37:35 +0200
Subject: [PATCH 157/665] Bump mockito-core from 3.5.7 to 3.5.9 (#7069)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.7 to 3.5.9.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.7...v3.5.9)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ed8d5d84d9..905846f41b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.7"
+  ext.mockitoVersion = "3.5.9"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.1"
   ext.guavaVersion = "29.0-jre"

From 7693126377ac78618dfc8aa232670a692edd37f4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 12 Sep 2020 11:08:25 +0200
Subject: [PATCH 158/665] Bump mockito-core from 3.5.9 to 3.5.10 (#7070)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.9 to 3.5.10.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.9...v3.5.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 905846f41b..43b8e208e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.9"
+  ext.mockitoVersion = "3.5.10"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.1"
   ext.guavaVersion = "29.0-jre"

From 0f21ba82666e65a54e980638cfb8a0ffe3dfe506 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 12 Sep 2020 11:44:42 +0200
Subject: [PATCH 159/665] 3.x: fromRunnable/fromAction javadoc improvements
 (#7071)

---
 .../reactivex/rxjava3/core/Completable.java   | 16 +++++++++----
 .../io/reactivex/rxjava3/core/Flowable.java   | 18 ++++++++++-----
 .../java/io/reactivex/rxjava3/core/Maybe.java | 23 +++++++++++++++----
 .../io/reactivex/rxjava3/core/Observable.java | 20 ++++++++++------
 4 files changed, 54 insertions(+), 23 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index f261d1a782..c411cae489 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -528,8 +528,8 @@ public static Completable error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Returns a {@code Completable} instance that runs the given {@link Action} for each subscriber and
-     * emits either an unchecked exception or simply completes.
+     * Returns a {@code Completable} instance that runs the given {@link Action} for each {@link CompletableObserver} and
+     * emits either an exception or simply completes.
      * <p>
      * <img width="640" height="297" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromAction.png" alt="">
      * <dl>
@@ -543,7 +543,7 @@ public static Completable error(@NonNull Throwable throwable) {
      *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
      *  </dd>
      * </dl>
-     * @param action the {@code Action} to run for each subscribing {@link CompletableObserver}
+     * @param action the {@code Action} to run for each subscribing {@code CompletableObserver}
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code action} is {@code null}
      */
@@ -636,14 +636,19 @@ public static <T> Completable fromMaybe(@NonNull MaybeSource<T> maybe) {
 
     /**
      * Returns a {@code Completable} instance that runs the given {@link Runnable} for each {@link CompletableObserver} and
-     * emits either its exception or simply completes.
+     * emits either its unchecked exception or simply completes.
      * <p>
      * <img width="640" height="297" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Completable.fromRunnable.png" alt="">
+     * <p>
+     * If the code to be wrapped needs to throw a checked or more broader {@link Throwable} exception, that
+     * exception has to be converted to an unchecked exception by the wrapped code itself. Alternatively,
+     * use the {@link #fromAction(Action)} method which allows the wrapped code to throw any {@code Throwable}
+     * exception and will signal it to observers as-is.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd> If the {@code Runnable} throws an exception, the respective {@link Throwable} is
+     *  <dd> If the {@code Runnable} throws an exception, the respective {@code Throwable} is
      *  delivered to the downstream via {@link CompletableObserver#onError(Throwable)},
      *  except when the downstream has disposed this {@code Completable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
@@ -653,6 +658,7 @@ public static <T> Completable fromMaybe(@NonNull MaybeSource<T> maybe) {
      * @param run the {@code Runnable} to run for each {@code CompletableObserver}
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code run} is {@code null}
+     * @see #fromAction(Action)
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index f836f4ba54..4da8b6fd53 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -2113,7 +2113,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Returns a {@code Flowable} instance that runs the given {@link Action} for each subscriber and
+     * Returns a {@code Flowable} instance that runs the given {@link Action} for each {@link Subscriber} and
      * emits either its exception or simply completes.
      * <p>
      * <img width="640" height="285" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromAction.png" alt="">
@@ -2131,7 +2131,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
      *  </dd>
      * </dl>
      * @param <T> the target type
-     * @param action the {@code Action} to run for each subscriber
+     * @param action the {@code Action} to run for each {@code Subscriber}
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code action} is {@code null}
      * @since 3.0.0
@@ -2497,17 +2497,22 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<@NonNull ? extend
     }
 
     /**
-     * Returns a {@code Flowable} instance that runs the given {@link Runnable} for each subscriber and
-     * emits either its exception or simply completes.
+     * Returns a {@code Flowable} instance that runs the given {@link Runnable} for each {@link Subscriber} and
+     * emits either its unchecked exception or simply completes.
      * <p>
      * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.fromRunnable.png" alt="">
+     * <p>
+     * If the code to be wrapped needs to throw a checked or more broader {@link Throwable} exception, that
+     * exception has to be converted to an unchecked exception by the wrapped code itself. Alternatively,
+     * use the {@link #fromAction(Action)} method which allows the wrapped code to throw any {@code Throwable}
+     * exception and will signal it to observers as-is.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>This source doesn't produce any elements and effectively ignores downstream backpressure.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd> If the {@code Runnable} throws an exception, the respective {@link Throwable} is
+     *  <dd> If the {@code Runnable} throws an exception, the respective {@code Throwable} is
      *  delivered to the downstream via {@link Subscriber#onError(Throwable)},
      *  except when the downstream has canceled the resulting {@code Flowable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
@@ -2515,10 +2520,11 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<@NonNull ? extend
      *  </dd>
      * </dl>
      * @param <T> the target type
-     * @param run the {@code Runnable} to run for each subscriber
+     * @param run the {@code Runnable} to run for each {@code Subscriber}
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code run} is {@code null}
      * @since 3.0.0
+     * @see #fromAction(Action)
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index f5ff68247a..161f7a69d1 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -967,7 +967,7 @@ public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier
     }
 
     /**
-     * Returns a {@code Maybe} instance that runs the given {@link Action} for each observer and
+     * Returns a {@code Maybe} instance that runs the given {@link Action} for each {@link MaybeObserver} and
      * emits either its exception or simply completes.
      * <p>
      * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromAction.png" alt="">
@@ -983,7 +983,7 @@ public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier
      *  </dd>
      * </dl>
      * @param <T> the target type
-     * @param action the {@code Action} to run for each observer
+     * @param action the {@code Action} to run for each {@code MaybeObserver}
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code action} is {@code null}
      */
@@ -1208,18 +1208,31 @@ public static <T> Maybe<T> fromPublisher(@NonNull Publisher<T> source) {
     }
 
     /**
-     * Returns a {@code Maybe} instance that runs the given {@link Runnable} for each observer and
-     * emits either its exception or simply completes.
+     * Returns a {@code Maybe} instance that runs the given {@link Runnable} for each {@link MaybeObserver} and
+     * emits either its unchecked exception or simply completes.
      * <p>
      * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromRunnable.png" alt="">
+     * <p>
+     * If the code to be wrapped needs to throw a checked or more broader {@link Throwable} exception, that
+     * exception has to be converted to an unchecked exception by the wrapped code itself. Alternatively,
+     * use the {@link #fromAction(Action)} method which allows the wrapped code to throw any {@code Throwable}
+     * exception and will signal it to observers as-is.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd> If the {@code Runnable} throws an exception, the respective {@code Throwable} is
+     *  delivered to the downstream via {@link MaybeObserver#onError(Throwable)},
+     *  except when the downstream has disposed this {@code Maybe} source.
+     *  In this latter case, the {@code Throwable} is delivered to the global error handler via
+     *  {@link RxJavaPlugins#onError(Throwable)} as an {@link io.reactivex.rxjava3.exceptions.UndeliverableException UndeliverableException}.
+     *  </dd>
      * </dl>
      * @param <T> the target type
-     * @param run the {@code Runnable} to run for each observer
+     * @param run the {@code Runnable} to run for each {@code MaybeObserver}
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code run} is {@code null}
+     * @see #fromAction(Action)
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 6332eaf793..366e2bdd51 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -1855,10 +1855,10 @@ public static <T> Observable<T> error(@NonNull Throwable throwable) {
     }
 
     /**
-     * Returns an {@code Observable} instance that runs the given {@link Action} for each subscriber and
+     * Returns an {@code Observable} instance that runs the given {@link Action} for each {@link Observer} and
      * emits either its exception or simply completes.
      * <p>
-     * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Maybe.fromAction.png" alt="">
+     * <img width="640" height="287" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.fromAction.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromAction} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -1871,7 +1871,7 @@ public static <T> Observable<T> error(@NonNull Throwable throwable) {
      *  </dd>
      * </dl>
      * @param <T> the target type
-     * @param action the {@code Action} to run for each subscriber
+     * @param action the {@code Action} to run for each {@code Observer}
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code action} is {@code null}
      * @since 3.0.0
@@ -2145,15 +2145,20 @@ public static <T> Observable<T> fromPublisher(@NonNull Publisher<@NonNull ? exte
     }
 
     /**
-     * Returns an {@code Observable} instance that runs the given {@link Runnable} for each observer and
-     * emits either its exception or simply completes.
+     * Returns an {@code Observable} instance that runs the given {@link Runnable} for each {@link Observer} and
+     * emits either its unchecked exception or simply completes.
      * <p>
      * <img width="640" height="286" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.fromRunnable.png" alt="">
+     * <p>
+     * If the code to be wrapped needs to throw a checked or more broader {@link Throwable} exception, that
+     * exception has to be converted to an unchecked exception by the wrapped code itself. Alternatively,
+     * use the {@link #fromAction(Action)} method which allows the wrapped code to throw any {@code Throwable}
+     * exception and will signal it to observers as-is.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code fromRunnable} does not operate by default on a particular {@link Scheduler}.</dd>
      *  <dt><b>Error handling:</b></dt>
-     *  <dd> If the {@code Runnable} throws an exception, the respective {@link Throwable} is
+     *  <dd> If the {@code Runnable} throws an exception, the respective {@code Throwable} is
      *  delivered to the downstream via {@link Observer#onError(Throwable)},
      *  except when the downstream has canceled the resulting {@code Observable} source.
      *  In this latter case, the {@code Throwable} is delivered to the global error handler via
@@ -2161,10 +2166,11 @@ public static <T> Observable<T> fromPublisher(@NonNull Publisher<@NonNull ? exte
      *  </dd>
      * </dl>
      * @param <T> the target type
-     * @param run the {@code Runnable} to run for each observer
+     * @param run the {@code Runnable} to run for each {@code Observer}
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code run} is {@code null}
      * @since 3.0.0
+     * @see #fromAction(Action)
      */
     @CheckReturnValue
     @NonNull

From ffe2fccfd696a64e3d085ab70cd2992e9e6046df Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 12 Sep 2020 12:13:57 +0200
Subject: [PATCH 160/665] 3.x: Patch out duplicate @NonNull annotation in
 generated javadocs (#7073)

* 3.x: Patch out duplicate @NonNull annotation in generated javadocs

* Replace different pattern for Javadocs 8
---
 gradle/javadoc_cleanup.gradle | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index 12216464a7..64f6437288 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -29,6 +29,31 @@ def fixJavadocFile(file) {
     // lots of spaces after the @Nullable annotations
     fileContents = fileContents.replaceAll("@Nullable</a>\\s{4,}", "@Nullable</a> ");
 
+    // javadoc bug: duplicates the link to @NonNull for some reason
+    def nonNullText1 = "<a href=\"../annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
+    
+    fileContents = fileContents.replace(nonNullText1 + " " + nonNullText1, nonNullText1);
+    fileContents = fileContents.replace(nonNullText1 + "\n " + nonNullText1, nonNullText1);
+    fileContents = fileContents.replace(nonNullText1 + "\r\n " + nonNullText1, nonNullText1);
+
+    def nonNullText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
+    fileContents = fileContents.replace(nonNullText2 + " " + nonNullText2, nonNullText2);
+    fileContents = fileContents.replace(nonNullText2 + "\n " + nonNullText2, nonNullText2);
+    fileContents = fileContents.replace(nonNullText2 + "\r\n " + nonNullText2, nonNullText2);
+
+    // javadoc bug: duplicates the link to @Nullable for some reason
+    def nullableText1 = "<a href=\"../annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
+    
+    fileContents = fileContents.replace(nullableText1 + " " + nullableText1, nullableText1);
+    fileContents = fileContents.replace(nullableText1 + "\n " + nullableText1, nullableText1);
+    fileContents = fileContents.replace(nullableText1 + "\r\n " + nullableText1, nullableText1);
+
+    def nullableText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
+    
+    fileContents = fileContents.replace(nullableText2 + " " + nullableText2, nullableText2);
+    fileContents = fileContents.replace(nullableText2 + "\n " + nullableText2, nullableText2);
+    fileContents = fileContents.replace(nullableText2 + "\r\n " + nullableText2, nullableText2);
+
     file.setText(fileContents, 'UTF-8');
 }
 

From 6b48855b1fdcefeca9ed9e0c112140c23bd42f6e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 18 Sep 2020 08:20:52 +0200
Subject: [PATCH 161/665] Bump mockito-core from 3.5.10 to 3.5.11 (#7077)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.10 to 3.5.11.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.10...v3.5.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 43b8e208e5..998b5eb1c7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.10"
+  ext.mockitoVersion = "3.5.11"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.1"
   ext.guavaVersion = "29.0-jre"

From fe71f6a22847429163704e076e8447c674ee7571 Mon Sep 17 00:00:00 2001
From: Tasuku Nakagawa <38446259+T45K@users.noreply.github.com>
Date: Mon, 21 Sep 2020 23:50:32 +0900
Subject: [PATCH 162/665] s/error/fail/ (#7080)

---
 .../operators/observable/ObservableZipIterable.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
index d775c58515..c1881bdca3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
@@ -112,7 +112,7 @@ public void onNext(T t) {
                 u = Objects.requireNonNull(iterator.next(), "The iterator returned a null value");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
-                error(e);
+                fail(e);
                 return;
             }
 
@@ -121,7 +121,7 @@ public void onNext(T t) {
                 v = Objects.requireNonNull(zipper.apply(t, u), "The zipper function returned a null value");
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
-                error(e);
+                fail(e);
                 return;
             }
 
@@ -133,7 +133,7 @@ public void onNext(T t) {
                 b = iterator.hasNext();
             } catch (Throwable e) {
                 Exceptions.throwIfFatal(e);
-                error(e);
+                fail(e);
                 return;
             }
 
@@ -144,7 +144,7 @@ public void onNext(T t) {
             }
         }
 
-        void error(Throwable e) {
+        void fail(Throwable e) {
             done = true;
             upstream.dispose();
             downstream.onError(e);

From 0690c7cc26bc08fbd54336b20dcd2e3d7b3d8fcf Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 23 Sep 2020 10:47:29 +0200
Subject: [PATCH 163/665] 3.x: Fix toFlowable(ERROR) not cancelling on MBE
 (#7083)

---
 .../flowable/FlowableOnBackpressureError.java |  1 +
 .../FlowableOnBackpressureErrorTest.java      | 21 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
index b85e1281fb..ea0a92af52 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
@@ -65,6 +65,7 @@ public void onNext(T t) {
                 downstream.onNext(t);
                 BackpressureHelper.produced(this, 1);
             } else {
+                upstream.cancel();
                 onError(new MissingBackpressureException("could not emit value due to lack of requests"));
             }
         }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
index 76fad7bf49..ef65662586 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
@@ -13,11 +13,16 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import static org.junit.Assert.*;
+
 import org.junit.Test;
 import org.reactivestreams.Publisher;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
 import io.reactivex.rxjava3.functions.Function;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableOnBackpressureErrorTest extends RxJavaTest {
@@ -51,4 +56,20 @@ public Object apply(Flowable<Integer> f) throws Exception {
             }
         }, false, 1, 1, 1);
     }
+
+    @Test
+    public void overflowCancels() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestSubscriber<Integer> ts = ps.toFlowable(BackpressureStrategy.ERROR)
+        .test(0L);
+
+        assertTrue(ps.hasObservers());
+
+        ps.onNext(1);
+
+        assertFalse(ps.hasObservers());
+
+        ts.assertFailure(MissingBackpressureException.class);
+    }
 }

From 88697a4fa769aa4a81ba5ed14b3be6dad93441ed Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 25 Sep 2020 08:30:32 +0200
Subject: [PATCH 164/665] Bump mockito-core from 3.5.11 to 3.5.13 (#7086)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.11 to 3.5.13.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.11...v3.5.13)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 998b5eb1c7..d05812fc8d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.11"
+  ext.mockitoVersion = "3.5.13"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.1"
   ext.guavaVersion = "29.0-jre"

From 0668d042b47d3585f856af831bd3b1e1742c080f Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 5 Oct 2020 14:07:15 +0200
Subject: [PATCH 165/665] 3.x: Fix Flowable.concatMap backpressure w/ scalars
 (#7089)

---
 .../operators/flowable/FlowableConcatMap.java | 18 +++---
 .../flowable/FlowableConcatMapScheduler.java  |  4 +-
 .../FlowableConcatMapSchedulerTest.java       | 50 ++++++++++++++++
 .../flowable/FlowableConcatMapTest.java       | 58 +++++++++++++++++--
 4 files changed, 116 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
index aea261f5aa..9409bc7a2e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
@@ -13,7 +13,7 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.*;
 
 import org.reactivestreams.*;
 
@@ -308,7 +308,7 @@ void drain() {
                                     continue;
                                 } else {
                                     active = true;
-                                    inner.setSubscription(new WeakScalarSubscription<>(vr, inner));
+                                    inner.setSubscription(new SimpleScalarSubscription<>(vr, inner));
                                 }
 
                             } else {
@@ -325,20 +325,22 @@ void drain() {
         }
     }
 
-    static final class WeakScalarSubscription<T> implements Subscription {
+    static final class SimpleScalarSubscription<T>
+    extends AtomicBoolean
+    implements Subscription {
+        private static final long serialVersionUID = -7606889335172043256L;
+
         final Subscriber<? super T> downstream;
         final T value;
-        boolean once;
 
-        WeakScalarSubscription(T value, Subscriber<? super T> downstream) {
+        SimpleScalarSubscription(T value, Subscriber<? super T> downstream) {
             this.value = value;
             this.downstream = downstream;
         }
 
         @Override
         public void request(long n) {
-            if (n > 0 && !once) {
-                once = true;
+            if (n > 0L && compareAndSet(false, true)) {
                 Subscriber<? super T> a = downstream;
                 a.onNext(value);
                 a.onComplete();
@@ -507,7 +509,7 @@ void drain() {
                                     continue;
                                 } else {
                                     active = true;
-                                    inner.setSubscription(new WeakScalarSubscription<>(vr, inner));
+                                    inner.setSubscription(new SimpleScalarSubscription<>(vr, inner));
                                 }
                             } else {
                                 active = true;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
index 3dfcd38b9d..fba627c7ed 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
@@ -345,7 +345,7 @@ public void run() {
                                 continue;
                             } else {
                                 active = true;
-                                inner.setSubscription(new WeakScalarSubscription<>(vr, inner));
+                                inner.setSubscription(new SimpleScalarSubscription<>(vr, inner));
                             }
 
                         } else {
@@ -528,7 +528,7 @@ public void run() {
                                 continue;
                             } else {
                                 active = true;
-                                inner.setSubscription(new WeakScalarSubscription<>(vr, inner));
+                                inner.setSubscription(new SimpleScalarSubscription<>(vr, inner));
                             }
                         } else {
                             active = true;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
index bb01b50a20..adb92ef08f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
@@ -66,6 +66,56 @@ public Publisher<? extends Object> apply(String v)
         .assertResult("RxSingleScheduler");
     }
 
+    @Test
+    public void innerScalarRequestRace() {
+        Flowable<Integer> just = Flowable.just(1);
+        int n = 1000;
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishProcessor<Flowable<Integer>> source = PublishProcessor.create();
+
+            TestSubscriber<Integer> ts = source
+                    .concatMap(v -> v, n + 1, ImmediateThinScheduler.INSTANCE)
+                    .test(1L);
+
+            TestHelper.race(() -> {
+                for (int j = 0; j < n; j++) {
+                    source.onNext(just);
+                }
+            }, () -> {
+                for (int j = 0; j < n; j++) {
+                    ts.request(1);
+                }
+            });
+
+            ts.assertValueCount(n);
+        }
+    }
+
+    @Test
+    public void innerScalarRequestRaceDelayError() {
+        Flowable<Integer> just = Flowable.just(1);
+        int n = 1000;
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishProcessor<Flowable<Integer>> source = PublishProcessor.create();
+
+            TestSubscriber<Integer> ts = source
+                    .concatMapDelayError(v -> v, true, n + 1, ImmediateThinScheduler.INSTANCE)
+                    .test(1L);
+
+            TestHelper.race(() -> {
+                for (int j = 0; j < n; j++) {
+                    source.onNext(just);
+                }
+            }, () -> {
+                for (int j = 0; j < n; j++) {
+                    ts.request(1);
+                }
+            });
+
+            ts.assertValueCount(n);
+        }
+    }
+
     @Test
     public void boundaryFusionDelayError() {
         Flowable.range(1, 10000)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
index 4ff32a9eb4..d195c054e1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
@@ -24,8 +24,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.WeakScalarSubscription;
-import io.reactivex.rxjava3.processors.UnicastProcessor;
+import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.SimpleScalarSubscription;
+import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
@@ -33,9 +33,9 @@
 public class FlowableConcatMapTest extends RxJavaTest {
 
     @Test
-    public void weakSubscriptionRequest() {
+    public void simpleSubscriptionRequest() {
         TestSubscriber<Integer> ts = new TestSubscriber<>(0);
-        WeakScalarSubscription<Integer> ws = new WeakScalarSubscription<>(1, ts);
+        SimpleScalarSubscription<Integer> ws = new SimpleScalarSubscription<>(1, ts);
         ts.onSubscribe(ws);
 
         ws.request(0);
@@ -79,6 +79,56 @@ public Publisher<? extends Object> apply(String v)
         .assertResult("RxSingleScheduler");
     }
 
+    @Test
+    public void innerScalarRequestRace() {
+        Flowable<Integer> just = Flowable.just(1);
+        int n = 1000;
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishProcessor<Flowable<Integer>> source = PublishProcessor.create();
+
+            TestSubscriber<Integer> ts = source
+                    .concatMap(v -> v, n + 1)
+                    .test(1L);
+
+            TestHelper.race(() -> {
+                for (int j = 0; j < n; j++) {
+                    source.onNext(just);
+                }
+            }, () -> {
+                for (int j = 0; j < n; j++) {
+                    ts.request(1);
+                }
+            });
+
+            ts.assertValueCount(n);
+        }
+    }
+
+    @Test
+    public void innerScalarRequestRaceDelayError() {
+        Flowable<Integer> just = Flowable.just(1);
+        int n = 1000;
+        for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
+            PublishProcessor<Flowable<Integer>> source = PublishProcessor.create();
+
+            TestSubscriber<Integer> ts = source
+                    .concatMapDelayError(v -> v, true, n + 1)
+                    .test(1L);
+
+            TestHelper.race(() -> {
+                for (int j = 0; j < n; j++) {
+                    source.onNext(just);
+                }
+            }, () -> {
+                for (int j = 0; j < n; j++) {
+                    ts.request(1);
+                }
+            });
+
+            ts.assertValueCount(n);
+        }
+    }
+
     @Test
     public void boundaryFusionDelayError() {
         Flowable.range(1, 10000)

From 35702ec5e64e8adc2ce6f9828f9af8f5fde42bbc Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 5 Oct 2020 14:45:00 +0200
Subject: [PATCH 166/665] Bump jmh-gradle-plugin from 0.5.1 to 0.5.2 (#7082)

Bumps jmh-gradle-plugin from 0.5.1 to 0.5.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d05812fc8d..7b31012f8e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
   ext.testNgVersion = "7.3.0"
   ext.mockitoVersion = "3.5.13"
   ext.jmhLibVersion = "1.21"
-  ext.jmhGradleVersion = "0.5.1"
+  ext.jmhGradleVersion = "0.5.2"
   ext.guavaVersion = "29.0-jre"
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.1"

From 82a218a5e0bb7f8788e4e6b0b54e4de9cd28e9ea Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 6 Oct 2020 22:58:22 +0200
Subject: [PATCH 167/665] Clarify the documentation for scan operators (#7093)

* Clarify the documentation for scan operators

* Fix typo

Co-authored-by: David Andrews <dta@duolingo.com>
---
 .../io/reactivex/rxjava3/core/Flowable.java   | 21 ++++++++-----------
 .../io/reactivex/rxjava3/core/Observable.java | 21 ++++++++-----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 4da8b6fd53..b5c52c2583 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -14675,10 +14675,9 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitL
     }
 
     /**
-     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by the current
-     * {@code Flowable}, then feeds the result of that function along with the second item emitted by the current
-     * {@code Floawble} into the same function, and so on until all items have been emitted by the current {@code Flowable},
-     * emitting the result of each of these iterations.
+     * Returns a {@code Flowable} that emits the first value emitted by the current {@code Flowable}, then emits one value
+     * for each subsequent value emitted by the current {@code Flowable}. Each emission after the first is the result of
+     * applying the specified accumulator function to the previous emission and the corresponding value from the current @{code Flowable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.v3.png" alt="">
      * <p>
@@ -14709,10 +14708,9 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by the current
-     * {@code Flowable} and a seed value, then feeds the result of that function along with the second item emitted by
-     * the current {@code Flowable} into the same function, and so on until all items have been emitted by the current
-     * {@code Flowable}, emitting the result of each of these iterations.
+     * Returns a {@code Flowable} that emits the provided initial (seed) value, then emits one value for each value emitted
+     * by the current {@code Flowable}. Each emission after the first is the result of applying the specified accumulator
+     * function to the previous emission and the corresponding value from the current @{code Flowable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
@@ -14763,10 +14761,9 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Returns a {@code Flowable} that applies a specified accumulator function to the first item emitted by the current
-     * {@code Flowable} and a seed value, then feeds the result of that function along with the second item emitted by
-     * the current {@code Flowable} into the same function, and so on until all items have been emitted by the current
-     * {@code Flowable}, emitting the result of each of these iterations.
+     * Returns a {@code Flowable} that emits the provided initial (seed) value, then emits one value for each value emitted
+     * by the current {@code Flowable}. Each emission after the first is the result of applying the specified accumulator
+     * function to the previous emission and the corresponding value from the current @{code Flowable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 366e2bdd51..3332b624b2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -12202,10 +12202,9 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler, bool
     }
 
     /**
-     * Returns an {@code Observable} that applies a specified accumulator function to the first item emitted by the current
-     * {@code Observable}, then feeds the result of that function along with the second item emitted by the current
-     * {@code Observable} into the same function, and so on until all items have been emitted by the current {@code Observable},
-     * emitting the result of each of these iterations.
+     * Returns an {@code Observable} that emits the first value emitted by the current {@code Observable}, then emits one value
+     * for each subsequent value emitted by the current {@code Observable}. Each emission after the first is the result of
+     * applying the specified accumulator function to the previous emission and the corresponding value from the current @{code Observable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.v3.png" alt="">
      * <p>
@@ -12232,10 +12231,9 @@ public final Observable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     }
 
     /**
-     * Returns an {@code Observable} that applies a specified accumulator function to the first item emitted by the current
-     * {@code Observable} and a seed value, then feeds the result of that function along with the second item emitted by
-     * the current {@code Observable} into the same function, and so on until all items have been emitted by the current
-     * {@code Observable}, emitting the result of each of these iterations.
+     * Returns an {@code Observable} that emits the provided initial (seed) value, then emits one value for each value emitted
+     * by the current {@code Observable}. Each emission after the first is the result of applying the specified accumulator
+     * function to the previous emission and the corresponding value from the current @{code Observable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
@@ -12282,10 +12280,9 @@ public final <R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction
     }
 
     /**
-     * Returns an {@code Observable} that applies a specified accumulator function to the first item emitted by the current
-     * {@code Observable} and a seed value, then feeds the result of that function along with the second item emitted by
-     * the current {@code Observable} into the same function, and so on until all items have been emitted by the current
-     * {@code Observable}, emitting the result of each of these iterations.
+     * Returns an {@code Observable} that emits the provided initial (seed) value, then emits one value for each value emitted
+     * by the current {@code Observable}. Each emission after the first is the result of applying the specified accumulator
+     * function to the previous emission and the corresponding value from the current @{code Observable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>

From fb45ce83c4e08d46b754d5a86efcc5ae38f84e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Karnok?= <akarnokd@gmail.com>
Date: Tue, 6 Oct 2020 23:00:02 +0200
Subject: [PATCH 168/665] Fix minor typos of @{code

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java   | 6 +++---
 src/main/java/io/reactivex/rxjava3/core/Observable.java | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index b5c52c2583..a8c873bbc4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -14677,7 +14677,7 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitL
     /**
      * Returns a {@code Flowable} that emits the first value emitted by the current {@code Flowable}, then emits one value
      * for each subsequent value emitted by the current {@code Flowable}. Each emission after the first is the result of
-     * applying the specified accumulator function to the previous emission and the corresponding value from the current @{code Flowable}.
+     * applying the specified accumulator function to the previous emission and the corresponding value from the current {@code Flowable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.v3.png" alt="">
      * <p>
@@ -14710,7 +14710,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     /**
      * Returns a {@code Flowable} that emits the provided initial (seed) value, then emits one value for each value emitted
      * by the current {@code Flowable}. Each emission after the first is the result of applying the specified accumulator
-     * function to the previous emission and the corresponding value from the current @{code Flowable}.
+     * function to the previous emission and the corresponding value from the current {@code Flowable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
@@ -14763,7 +14763,7 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     /**
      * Returns a {@code Flowable} that emits the provided initial (seed) value, then emits one value for each value emitted
      * by the current {@code Flowable}. Each emission after the first is the result of applying the specified accumulator
-     * function to the previous emission and the corresponding value from the current @{code Flowable}.
+     * function to the previous emission and the corresponding value from the current {@code Flowable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 3332b624b2..a1e34e9309 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -12204,7 +12204,7 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler, bool
     /**
      * Returns an {@code Observable} that emits the first value emitted by the current {@code Observable}, then emits one value
      * for each subsequent value emitted by the current {@code Observable}. Each emission after the first is the result of
-     * applying the specified accumulator function to the previous emission and the corresponding value from the current @{code Observable}.
+     * applying the specified accumulator function to the previous emission and the corresponding value from the current {@code Observable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scan.v3.png" alt="">
      * <p>
@@ -12233,7 +12233,7 @@ public final Observable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     /**
      * Returns an {@code Observable} that emits the provided initial (seed) value, then emits one value for each value emitted
      * by the current {@code Observable}. Each emission after the first is the result of applying the specified accumulator
-     * function to the previous emission and the corresponding value from the current @{code Observable}.
+     * function to the previous emission and the corresponding value from the current {@code Observable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>
@@ -12282,7 +12282,7 @@ public final <R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction
     /**
      * Returns an {@code Observable} that emits the provided initial (seed) value, then emits one value for each value emitted
      * by the current {@code Observable}. Each emission after the first is the result of applying the specified accumulator
-     * function to the previous emission and the corresponding value from the current @{code Observable}.
+     * function to the previous emission and the corresponding value from the current {@code Observable}.
      * <p>
      * <img width="640" height="320" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/scanSeed.v3.png" alt="">
      * <p>

From 4394f5016fcd7b37049ea727dca91755054d090a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 12:12:03 +0200
Subject: [PATCH 169/665] Bump junit from 4.13 to 4.13.1 (#7094)

Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7b31012f8e..64af614706 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
   // ---------------------------------------
   
   ext.reactiveStreamsVersion = "1.0.3"
-  ext.junitVersion = "4.13"
+  ext.junitVersion = "4.13.1"
   ext.testNgVersion = "7.3.0"
   ext.mockitoVersion = "3.5.13"
   ext.jmhLibVersion = "1.21"

From 7106980947ce9b2e8d1a17b6081d474f39d0f1c2 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 16 Oct 2020 09:45:01 +0200
Subject: [PATCH 170/665] Bump biz.aQute.bnd.gradle from 5.1.2 to 5.2.0 (#7097)

Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.1.2 to 5.2.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 64af614706..d782a3089f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
   ext.jfrogExtractorVersion = "4.17.2"
-  ext.bndVersion = "5.1.2"
+  ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
 
   // --------------------------------------

From 8511da4e0130d67a7b2ae369349868004e153262 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 19 Oct 2020 09:26:10 +0200
Subject: [PATCH 171/665] Bump guava from 29.0-jre to 30.0-jre (#7098)

Bumps [guava](https://github.com/google/guava) from 29.0-jre to 30.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index d782a3089f..6776c5fb24 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
   ext.mockitoVersion = "3.5.13"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.2"
-  ext.guavaVersion = "29.0-jre"
+  ext.guavaVersion = "30.0-jre"
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.1"
   ext.licenseVersion = "0.15.0"

From d4ab2532d5914ccbb075fd540c7640578ab54044 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 20 Oct 2020 10:25:55 +0200
Subject: [PATCH 172/665] Bump mockito-core from 3.5.13 to 3.5.15 (#7099)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.13 to 3.5.15.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.13...v3.5.15)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6776c5fb24..1c5e189116 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13.1"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.13"
+  ext.mockitoVersion = "3.5.15"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.2"
   ext.guavaVersion = "30.0-jre"

From d0aa30d5f7a070c5a499ac89028d53f14e9adb74 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 27 Oct 2020 08:27:33 +0100
Subject: [PATCH 173/665] Bump mockito-core from 3.5.15 to 3.6.0 (#7103)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.5.15 to 3.6.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.5.15...v3.6.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1c5e189116..2119a0951f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13.1"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.5.15"
+  ext.mockitoVersion = "3.6.0"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.2"
   ext.guavaVersion = "30.0-jre"

From 10aedf056ab4be2363b56855ac198bf2be3f83d1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 27 Oct 2020 08:28:08 +0100
Subject: [PATCH 174/665] Bump build-info-extractor-gradle from 4.17.2 to
 4.18.0 (#7102)

Bumps build-info-extractor-gradle from 4.17.2 to 4.18.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2119a0951f..257fd8748d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.1"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.17.2"
+  ext.jfrogExtractorVersion = "4.18.0"
   ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
 

From ca3a21ae2e79ead471def5dd4c4211ff4fbe1298 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 30 Oct 2020 08:31:42 +0100
Subject: [PATCH 175/665] Switch to travis-ci.com as the org goes away (#7104)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ed7ad4a5de..bd1b51f5fa 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # RxJava: Reactive Extensions for the JVM
 
-<a href='https://travis-ci.org/ReactiveX/RxJava/builds'><img src='https://travis-ci.org/ReactiveX/RxJava.svg?branch=3.x'></a>
+<a href='https://travis-ci.com/ReactiveX/RxJava/builds'><img src='https://travis-ci.com/ReactiveX/RxJava.svg?branch=3.x'></a>
 [![codecov.io](http://codecov.io/github/ReactiveX/RxJava/coverage.svg?branch=3.x)](https://codecov.io/gh/ReactiveX/RxJava/branch/3.x)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava)
 

From 57fd72ee683eb1baaed1196bc8feac07850f7146 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 5 Nov 2020 08:49:07 +0100
Subject: [PATCH 176/665] Bump gradle-animalsniffer-plugin from 1.5.1 to 1.5.2
 (#7106)

Bumps gradle-animalsniffer-plugin from 1.5.1 to 1.5.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 257fd8748d..0b72b82524 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
   ext.jmhGradleVersion = "0.5.2"
   ext.guavaVersion = "30.0-jre"
   ext.jacocoVersion = "0.8.4"
-  ext.animalSnifferVersion = "1.5.1"
+  ext.animalSnifferVersion = "1.5.2"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
   ext.jfrogExtractorVersion = "4.18.0"

From 78b29f7967cd7589c3e53a4a8a73ad2aadb30eff Mon Sep 17 00:00:00 2001
From: Fabio Barata <fixedlight@gmail.com>
Date: Thu, 12 Nov 2020 10:13:13 +0000
Subject: [PATCH 177/665] 3.x: Flowable scan/scanWith backpressure
 documentation update (#7110)

* 3.x: Flowable scan/scanWith backpressure documentation update

Documented Flowable initial value scan variants upstream consumption pattern as it is different from the variant with no initial value.

* 3.x: Flowable scan/scanWith backpressure documentation merge <dd> sections
---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index a8c873bbc4..364e83fd58 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -14735,7 +14735,9 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
-     *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
+     *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.
+     *  The downstream request pattern is not preserved across this operator.
+     *  The upstream is requested {@link #bufferSize()} - 1 upfront and 75% of {@link #bufferSize()} thereafter.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code scan} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
@@ -14774,7 +14776,9 @@ public final Flowable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors downstream backpressure and expects the current {@code Flowable} to honor backpressure as well.
-     *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.</dd>
+     *  Violating this expectation, a {@link MissingBackpressureException} <em>may</em> get signaled somewhere downstream.
+     *  The downstream request pattern is not preserved across this operator.
+     *  The upstream is requested {@link #bufferSize()} - 1 upfront and 75% of {@link #bufferSize()} thereafter.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code scanWith} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>

From 5b408f6a09a2f72761005b72f2c06c70eef32fbb Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 20 Nov 2020 16:35:16 +0100
Subject: [PATCH 178/665] 3.x: Fix source locator code to support GitHub
 Actions folder layout (#7113)

---
 .../rxjava3/testsupport/TestHelper.java       | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index dfaccd6ac5..1963a38459 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -3503,18 +3503,26 @@ public static File findSource(String baseClassName, String parentPackage) throws
         parentPackage = parentPackage.replace(".", "/");
 //        System.out.println(path);
 
-        int i = path.toLowerCase().indexOf("/rxjava");
-        if (i < 0) {
-            System.out.println("Can't find the base RxJava directory");
-            return null;
-        }
-
-        // find end of any potential postfix to /RxJava
-        int j = path.indexOf("/", i + 6);
+        // Locate the src/main/java directory
+        String p = null;
+        while (true) {
+            int idx = path.lastIndexOf("/");
+            if (idx < 0) {
+                break;
+            }
+            path = path.substring(0, idx);
+            String check = path + "/src/main/java";
 
-        String basePackage = path.substring(0, j + 1) + "src/main/java";
+            if (new File(check).exists()) {
+                p = check + "/" + parentPackage + "/" + baseClassName + ".java";
+                break;
+            }
+        }
 
-        String p = basePackage + "/" + parentPackage + "/" + baseClassName + ".java";
+        if (p == null) {
+            System.err.println("Unable to locate the RxJava sources");
+            return null;
+        }
 
         File f = new File(p);
 

From c816e6f5f4dfd18743ee6ff1ad7e42c9beb2cf01 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 20 Nov 2020 18:28:22 +0100
Subject: [PATCH 179/665] 3.x Switch from Travis CI to GitHub Actions (#7114)

* 3.x: Switch to GitHub Actions

* Update action names
---
 .github/workflows/gradle_branch.yml   | 31 +++++++++++++++++
 .github/workflows/gradle_pr.yml       | 31 +++++++++++++++++
 .github/workflows/gradle_release.yml  | 49 +++++++++++++++++++++++++++
 .github/workflows/gradle_snapshot.yml | 45 ++++++++++++++++++++++++
 .travis.yml                           | 29 ----------------
 build.gradle                          |  2 +-
 gradle/buildViaTravis.sh              | 29 ----------------
 gradle/push_javadoc.sh                | 28 +++++----------
 8 files changed, 165 insertions(+), 79 deletions(-)
 create mode 100644 .github/workflows/gradle_branch.yml
 create mode 100644 .github/workflows/gradle_pr.yml
 create mode 100644 .github/workflows/gradle_release.yml
 create mode 100644 .github/workflows/gradle_snapshot.yml
 delete mode 100644 .travis.yml
 delete mode 100755 gradle/buildViaTravis.sh

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
new file mode 100644
index 0000000000..85594b3549
--- /dev/null
+++ b/.github/workflows/gradle_branch.yml
@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Branch
+
+on:
+  push:
+    branches-ignore: [ '3.x' ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Cache Gradle packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build branch without snapshot
+      run: ./gradlew -PreleaseMode=pr build --stacktrace
+    - name: Upload to Codecov  
+      uses: codecov/codecov-action@v1
\ No newline at end of file
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
new file mode 100644
index 0000000000..bb10853960
--- /dev/null
+++ b/.github/workflows/gradle_pr.yml
@@ -0,0 +1,31 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: PR
+
+on:
+  pull_request:
+    branches: [ 3.x, 3.x_GHA ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Cache Gradle packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build PR
+      run: ./gradlew -PreleaseMode=pr build --stacktrace
+    - name: Upload to Codecov  
+      uses: codecov/codecov-action@v1
\ No newline at end of file
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
new file mode 100644
index 0000000000..6e4457a883
--- /dev/null
+++ b/.github/workflows/gradle_release.yml
@@ -0,0 +1,49 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Release
+
+on:
+  release:
+    branches: [ '3.x' ]
+    tags:
+      - 'v3.*.*'
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    env:
+      # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
+      # ------------------------------------------------------------------------------ 
+      bintrayUser: ${{ secrets.BINTRAY_USER }}
+      bintrayKey: ${{ secrets.BINTRAY_KEY }}
+      sonatypeUsername: ${{ secrets.SONATYPE_USER }}
+      sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+      JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
+      # ------------------------------------------------------------------------------ 
+      CI_BUILD_NUMBER: ${{ github.run_number }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Cache Gradle packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Grant execute permission for push
+      run: chmod +x push_javadoc.sh
+    - name: Extract version tag
+      run: echo "BUILD_TAG=${GITHUB_REF:10}" >> $GITHUB_ENV
+    - name: Build and Release
+      run: ./gradlew -PreleaseMode=full -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
+    - name: Upload to Codecov  
+      uses: codecov/codecov-action@v1
+    - name: Push Javadocs
+      run: ./push_javadoc.sh
\ No newline at end of file
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
new file mode 100644
index 0000000000..a6042fe8ec
--- /dev/null
+++ b/.github/workflows/gradle_snapshot.yml
@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Snapshot
+
+on:
+  push:
+    branches: [ '3.x' ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    env:
+      # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
+      # ------------------------------------------------------------------------------ 
+      bintrayUser: ${{ secrets.BINTRAY_USER }}
+      bintrayKey: ${{ secrets.BINTRAY_KEY }}
+      sonatypeUsername: ${{ secrets.SONATYPE_USER }}
+      sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+      JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
+      # ------------------------------------------------------------------------------ 
+      CI_BUILD_NUMBER: ${{ github.run_number }}
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Cache Gradle packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Grant execute permission for push
+      run: chmod +x push_javadoc.sh
+    - name: Build and Snapshot branch
+      run: ./gradlew -PreleaseMode=branch -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
+    - name: Upload to Codecov  
+      uses: codecov/codecov-action@v1
+    - name: Push Javadocs
+      run: ./push_javadoc.sh
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 6e595b4e93..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: java
-jdk:
-- openjdk8
-
-# prevent travis running gradle assemble; let the build script do it anyway
-install: true
-
-# running in container causes test failures and 2x-3x longer build, use standalone instances
-sudo: required
-
-# script for build and release via Travis to Bintray
-script: gradle/buildViaTravis.sh
-
-# Code coverage
-after_success:
-  - bash <(curl -s --retry 10 https://codecov.io/bash)
-  - bash gradle/push_javadoc.sh
-
-# cache between builds
-cache:
-  directories:
-  - $HOME/.m2
-  - $HOME/.gradle
-env:
-  global:
-  - secure: YcLpYfNc/dyDON+oDvnJK5pFNhpPeJHxlAHV8JBt42e51prAl6njqrg1Qlfdp0pvBiskTPQHUxbFy9DOB1Z+43lPj5vlqz6qBgtS3vtBnsrczr+5Xx7NTdVKq6oZGl45VjfNPT7zdM6GQ5ifdzOid6kJIFu34g9JZkCzOY3BWGM=
-  - secure: WVmfSeW1UMNdem7+X4cVDjkEkqdeNavYH4udn3bFN1IFaWdliWFp4FYVBVi+p1T/IgkRSqzoW9Bm43DABe1UMFoErFCbfd7B0Ofgb4NZAsxFgokHGVLCe6k5+rQyASseiO7k0itSj3Kq9TrDueKPhv+g+IG0w1A8yZTnXdhXHvY=
-  - secure: Xt8E09nmSr+5r7ly95hG/EiBitZbhFGPRGp8oqPkNn1A2fzG9+hnvlNLgQhVPsISZGzJwkWa3LGBxAVGmuysVOz7eCwkoqlDZaaSLYAPfWXqkr+cmYGPkErgHSp+n/hnQG4TylX0YxzqX8flr6db21zWyNduiyHmo+xFydI5LeM=
-  - secure: RmpIsmYa5BdLLWR6DILjhEE/dx2q3O0NIkvnMx5G1cyRCNCrOf1B7fYFHnsTDwpvRA+6H6dZinmeyf6D3G+czOG5q/TW2jcu5nh+YOLhBb6jPIqRDfq/WHAa5Lkdssxs5g9RdWlEDVFMoE62lGc4cnfJz5F5puH29dy2SvXxIQw=
diff --git a/build.gradle b/build.gradle
index 0b72b82524..c13005541b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ ext.githubProjectName = "rxjava"
 
 version = project.properties["release.version"]
 
-def releaseTag = System.getenv("TRAVIS_TAG");
+def releaseTag = System.getenv("BUILD_TAG");
 if (releaseTag != null && !releaseTag.isEmpty()) {
     if (releaseTag.startsWith("v")) {
         releaseTag = releaseTag.substring(1);
diff --git a/gradle/buildViaTravis.sh b/gradle/buildViaTravis.sh
deleted file mode 100755
index ea385c3e92..0000000000
--- a/gradle/buildViaTravis.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# This script will build the project.
-
-buildTag="$TRAVIS_TAG"
-
-if [ "$buildTag" != "" ] && [ "${buildTag:0:3}" != "v3." ]; then
-   echo -e "Wrong tag on the 3.x brach: $buildTag : build stopped"
-   exit 1
-fi
-
-export GRADLE_OPTS=-Xmx1024m
-
-if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-  echo -e "Build Pull Request #$TRAVIS_PULL_REQUEST => Branch [$TRAVIS_BRANCH]"
-  ./gradlew -PreleaseMode=pr build --stacktrace
-elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" == "" ]; then
-  if [ "$TRAVIS_BRANCH" != "3.x" ]; then
-     echo -e 'Build secondary Branch (no snapshot) => Branch ['$TRAVIS_BRANCH']'
-     ./gradlew -PreleaseMode=pr build --stacktrace
-  else
-     echo -e 'Build Branch with Snapshot => Branch ['$TRAVIS_BRANCH']'
-     ./gradlew -PreleaseMode=branch -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
-  fi
-elif [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_TAG" != "" ]; then
-  echo -e 'Build Branch for Release => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']'
-  ./gradlew -PreleaseMode=full -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
-else
-  echo -e 'WARN: Should not be here => Branch ['$TRAVIS_BRANCH']  Tag ['$TRAVIS_TAG']  Pull Request ['$TRAVIS_PULL_REQUEST']'
-fi
diff --git a/gradle/push_javadoc.sh b/gradle/push_javadoc.sh
index c8f648258e..28ce74f1db 100644
--- a/gradle/push_javadoc.sh
+++ b/gradle/push_javadoc.sh
@@ -8,21 +8,9 @@
 targetRepo=github.com/ReactiveX/RxJava.git
 # =======================================================================
 
-# only for main pushes, for now
-if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
-	echo -e "Pull request detected, skipping JavaDocs pushback."
-	exit 0
-fi
-
-# only when on the 3.x branch and not tagged
-if [ "$TRAVIS_BRANCH" != "3.x" ] && [ "$TRAVIS_TAG" == "" ]; then
-    echo -e "On a secondary branch '$TRAVIS_BRANCH', skipping JavaDocs pushback."
-    exit 0
-fi
-
 # get the current build tag if any
-buildTag="$TRAVIS_TAG"
-echo -e "Travis tag: '$buildTag'"
+buildTag="$BUILD_TAG"
+echo -e "Build tag: '$buildTag'"
 
 if [ "$buildTag" == "" ]; then
    buildTag="snapshot"
@@ -33,18 +21,18 @@ fi
 echo -e "JavaDocs pushback for tag: $buildTag"
 
 # check if the token is actually there
-if [ "$GITHUB_TOKEN" == "" ]; then
+if [ "$JAVADOCS_TOKEN" == "" ]; then
 	echo -e "No access to GitHub, skipping JavaDocs pushback."
 	exit 0
 fi
 
 # prepare the git information
-git config --global user.email "travis@travis-ci.org"
-git config --global user.name "Travis CI"
+git config --global user.email "akarnokd+ci@gmail.com"
+git config --global user.name "akarnokd+ci"
 
 # setup the remote
 echo -e "Adding the target repository to git"
-git remote add origin-pages https://${GITHUB_TOKEN}@${targetRepo} > /dev/null 2>&1
+git remote add origin-pages https://${JAVADOCS_TOKEN}@${targetRepo} > /dev/null 2>&1
 
 # stash changes due to chmod
 echo -e "Stashing any local non-ignored changes"
@@ -119,8 +107,8 @@ echo -e "Removing deleted files"
 git add -u
 
 # commit all
-echo -e "commit Travis build: $TRAVIS_BUILD_NUMBER for $buildTag"
-git commit --message "Travis build: $TRAVIS_BUILD_NUMBER for $buildTag"
+echo -e "commit CI build: $CI_BUILD_NUMBER for $buildTag"
+git commit --message "CI build: $CI_BUILD_NUMBER for $buildTag"
 
 # debug file list
 #find -name "*.html"

From e4ad465fa663f0d80a9017d9149f8e6093e818a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20Karnok?= <akarnokd@gmail.com>
Date: Fri, 20 Nov 2020 18:30:05 +0100
Subject: [PATCH 180/665] Fix push_javadoc.sh

---
 .github/workflows/gradle_pr.yml           | 2 +-
 gradle/push_javadoc.sh => push_javadoc.sh | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename gradle/push_javadoc.sh => push_javadoc.sh (100%)

diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index bb10853960..40ee972118 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -5,7 +5,7 @@ name: PR
 
 on:
   pull_request:
-    branches: [ 3.x, 3.x_GHA ]
+    branches: [ 3.x ]
 
 jobs:
   build:
diff --git a/gradle/push_javadoc.sh b/push_javadoc.sh
similarity index 100%
rename from gradle/push_javadoc.sh
rename to push_javadoc.sh

From 3d1669da006bd494f7fce7f3b3d6274fa5ba6921 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 20 Nov 2020 19:10:39 +0100
Subject: [PATCH 181/665] 3.x: Update badge in README.md (#7115)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bd1b51f5fa..806ff8561b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # RxJava: Reactive Extensions for the JVM
 
-<a href='https://travis-ci.com/ReactiveX/RxJava/builds'><img src='https://travis-ci.com/ReactiveX/RxJava.svg?branch=3.x'></a>
+<a href='https://github.com/ReactiveX/RxJava/actions?query=workflow%3ASnapshot'><img src='https://github.com/ReactiveX/RxJava/workflows/Snapshot/badge.svg'></a>
 [![codecov.io](http://codecov.io/github/ReactiveX/RxJava/coverage.svg?branch=3.x)](https://codecov.io/gh/ReactiveX/RxJava/branch/3.x)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava)
 

From 3d5feceb3b103062eaea2a4e22d64dbd926f5769 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 25 Nov 2020 09:24:14 +0100
Subject: [PATCH 182/665] Bump mockito-core from 3.6.0 to 3.6.28 (#7116)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.6.0 to 3.6.28.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.6.0...v3.6.28)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c13005541b..c879ded04f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13.1"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.6.0"
+  ext.mockitoVersion = "3.6.28"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.2"
   ext.guavaVersion = "30.0-jre"

From cdc75108b70c4bfaf2b7c994c3e45e5634e7720a Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 26 Nov 2020 09:36:19 +0100
Subject: [PATCH 183/665] Bump build-info-extractor-gradle from 4.18.0 to
 4.18.1 (#7118)

Bumps build-info-extractor-gradle from 4.18.0 to 4.18.1.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c879ded04f..a53907c864 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.2"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.18.0"
+  ext.jfrogExtractorVersion = "4.18.1"
   ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
 

From bfd242da5de53bd16f8c7d52c83e0968010bba2c Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 30 Nov 2020 20:21:14 +0100
Subject: [PATCH 184/665] 3.x: Remove unnecessary cancel/dispose calls from
 terminating using (#7121)

---
 .../java/io/reactivex/rxjava3/core/FlowableSubscriber.java  | 6 ++++--
 .../rxjava3/internal/operators/flowable/FlowableUsing.java  | 4 ----
 .../internal/operators/observable/ObservableUsing.java      | 4 ----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
index 38b5bf3459..e07662b16b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
@@ -18,8 +18,10 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Represents a Reactive-Streams inspired {@link Subscriber} that is RxJava 2 only
- * and weakens rules §1.3 and §3.9 of the specification for gaining performance.
+ * Represents a Reactive-Streams inspired {@link Subscriber} that is RxJava 3 only
+ * and weakens the Reactive Streams rules <a href='https://github.com/reactive-streams/reactive-streams-jvm#1.3'>§1.3</a>
+ * and <a href='https://github.com/reactive-streams/reactive-streams-jvm#3.9'>§3.9</a> of the specification
+ * for gaining performance.
  *
  * <p>History: 2.0.7 - experimental; 2.1 - beta
  * @param <T> the value type
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
index 5a5b177d35..49fe0b8fb4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
@@ -117,7 +117,6 @@ public void onError(Throwable t) {
                     }
                 }
 
-                upstream.cancel();
                 if (innerError != null) {
                     downstream.onError(new CompositeException(t, innerError));
                 } else {
@@ -125,7 +124,6 @@ public void onError(Throwable t) {
                 }
             } else {
                 downstream.onError(t);
-                upstream.cancel();
                 disposeResource();
             }
         }
@@ -143,11 +141,9 @@ public void onComplete() {
                     }
                 }
 
-                upstream.cancel();
                 downstream.onComplete();
             } else {
                 downstream.onComplete();
-                upstream.cancel();
                 disposeResource();
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
index dec3da5ebe..90954d41d8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
@@ -115,11 +115,9 @@ public void onError(Throwable t) {
                     }
                 }
 
-                upstream.dispose();
                 downstream.onError(t);
             } else {
                 downstream.onError(t);
-                upstream.dispose();
                 disposeResource();
             }
         }
@@ -137,11 +135,9 @@ public void onComplete() {
                     }
                 }
 
-                upstream.dispose();
                 downstream.onComplete();
             } else {
                 downstream.onComplete();
-                upstream.dispose();
                 disposeResource();
             }
         }

From a315c55663f6c80c420ccce2cec11298abff5651 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 1 Dec 2020 09:26:46 +0100
Subject: [PATCH 185/665] Bump build-info-extractor-gradle from 4.18.1 to
 4.18.2 (#7123)

Bumps build-info-extractor-gradle from 4.18.1 to 4.18.2.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a53907c864..b371aea34f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.2"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.18.1"
+  ext.jfrogExtractorVersion = "4.18.2"
   ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
 

From 20fc2ba5a0c793796bca7416fdcc90da629a5b10 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 2 Dec 2020 12:09:46 +0100
Subject: [PATCH 186/665] Limit to released event types

---
 .github/workflows/gradle_release.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 6e4457a883..f5c40ce37e 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -5,9 +5,10 @@ name: Release
 
 on:
   release:
+    types: [ released ]
     branches: [ '3.x' ]
     tags:
-      - 'v3.*.*'
+      - 'v3.*.*'   
 
 jobs:
   build:
@@ -46,4 +47,4 @@ jobs:
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
     - name: Push Javadocs
-      run: ./push_javadoc.sh
\ No newline at end of file
+      run: ./push_javadoc.sh

From 67c1a367397f1167f9ad5639dd5071b6608e4230 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 2 Dec 2020 13:44:29 +0100
Subject: [PATCH 187/665] Trigger on prereleases too

---
 .github/workflows/gradle_release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index f5c40ce37e..6e5af8f48f 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -5,7 +5,7 @@ name: Release
 
 on:
   release:
-    types: [ released ]
+    types: [ released, prereleased ]
     branches: [ '3.x' ]
     tags:
       - 'v3.*.*'   

From 7e7b223ccf4af4ef594677f04e731998914190b9 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 6 Dec 2020 22:32:52 +0100
Subject: [PATCH 188/665] 3.x: Improve error messages in the test consumers
 (#7126)

* 3.x: Improve error reporting in the test consumers

* Verify assertValueAt with negative index
---
 .../rxjava3/observers/BaseTestConsumer.java   | 38 +++++++++-----
 .../rxjava3/observers/TestObserverTest.java   | 49 +++++++++++++----
 .../subscribers/TestSubscriberTest.java       | 52 +++++++++++++++++--
 3 files changed, 112 insertions(+), 27 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
index 458325c280..9c6947c5aa 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
@@ -228,7 +228,7 @@ public final U assertNoErrors() {
      */
     @NonNull
     public final U assertError(@NonNull Throwable error) {
-        return assertError(Functions.equalsWith(error));
+        return assertError(Functions.equalsWith(error), true);
     }
 
     /**
@@ -240,7 +240,7 @@ public final U assertError(@NonNull Throwable error) {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @NonNull
     public final U assertError(@NonNull Class<? extends Throwable> errorClass) {
-        return (U)assertError((Predicate)Functions.isInstanceOf(errorClass));
+        return (U)assertError((Predicate)Functions.isInstanceOf(errorClass), true);
     }
 
     /**
@@ -251,9 +251,14 @@ public final U assertError(@NonNull Class<? extends Throwable> errorClass) {
      *            and should return {@code true} for expected errors.
      * @return this
      */
-    @SuppressWarnings("unchecked")
     @NonNull
     public final U assertError(@NonNull Predicate<Throwable> errorPredicate) {
+        return assertError(errorPredicate, false);
+    }
+
+    @SuppressWarnings("unchecked")
+    @NonNull
+    private U assertError(@NonNull Predicate<Throwable> errorPredicate, boolean exact) {
         int s = errors.size();
         if (s == 0) {
             throw fail("No errors");
@@ -274,10 +279,16 @@ public final U assertError(@NonNull Predicate<Throwable> errorPredicate) {
 
         if (found) {
             if (s != 1) {
-                throw fail("Error present but other errors as well");
+                if (exact) {
+                    throw fail("Error present but other errors as well");
+                }
+                throw fail("One error passed the predicate but other errors are present as well");
             }
         } else {
-            throw fail("Error not present");
+            if (exact) {
+                throw fail("Error not present");
+            }
+            throw fail("No error(s) passed the predicate");
         }
         return (U)this;
     }
@@ -316,7 +327,7 @@ public final U assertValue(@NonNull Predicate<T> valuePredicate) {
         assertValueAt(0, valuePredicate);
 
         if (values.size() > 1) {
-            throw fail("Value present but other values as well");
+            throw fail("The first value passed the predicate but this consumer received more than one value");
         }
 
         return (U)this;
@@ -339,13 +350,13 @@ public final U assertValueAt(int index, @NonNull T value) {
             throw fail("No values");
         }
 
-        if (index >= s) {
-            throw fail("Invalid index: " + index);
+        if (index < 0 || index >= s) {
+            throw fail("Index " + index + " is out of range [0, " + s + ")");
         }
 
         T v = values.get(index);
         if (!Objects.equals(value, v)) {
-            throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v));
+            throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v) + " at position " + index);
         }
         return (U)this;
     }
@@ -367,14 +378,15 @@ public final U assertValueAt(int index, @NonNull Predicate<T> valuePredicate) {
             throw fail("No values");
         }
 
-        if (index >= values.size()) {
-            throw fail("Invalid index: " + index);
+        if (index < 0 || index >= s) {
+            throw fail("Index " + index + " is out of range [0, " + s + ")");
         }
 
         boolean found = false;
 
+        T v = values.get(index);
         try {
-            if (valuePredicate.test(values.get(index))) {
+            if (valuePredicate.test(v)) {
                 found = true;
             }
         } catch (Throwable ex) {
@@ -382,7 +394,7 @@ public final U assertValueAt(int index, @NonNull Predicate<T> valuePredicate) {
         }
 
         if (!found) {
-            throw fail("Value not present");
+            throw fail("Value " + valueAndClass(v) + " at position " + index + " did not pass the predicate");
         }
         return (U)this;
     }
diff --git a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
index 31e66d808b..56ed09ac44 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
 
@@ -39,6 +40,10 @@
 
 public class TestObserverTest extends RxJavaTest {
 
+    static void assertThrowsWithMessage(String message, Class<? extends Throwable> clazz, ThrowingRunnable run) {
+        assertEquals(message, assertThrows(clazz, run).getMessage());
+    }
+
     @Test
     public void assertTestObserver() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
@@ -843,7 +848,7 @@ public void errorMeansDisposed() {
 
     @Test
     public void assertValuePredicateEmpty() {
-        assertThrows("No values", AssertionError.class, () -> {
+        assertThrowsWithMessage("No values (latch = 0, values = 0, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<Object> to = new TestObserver<>();
 
             Observable.empty().subscribe(to);
@@ -871,7 +876,7 @@ public void assertValuePredicateMatch() {
 
     @Test
     public void assertValuePredicateNoMatch() {
-        assertThrows("Value not present", AssertionError.class, () -> {
+        assertThrowsWithMessage("Value 1 (class: Integer) at position 0 did not pass the predicate (latch = 0, values = 1, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<Integer> to = new TestObserver<>();
 
             Observable.just(1).subscribe(to);
@@ -886,7 +891,7 @@ public void assertValuePredicateNoMatch() {
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        assertThrows("Value present but other values as well", AssertionError.class, () -> {
+        assertThrowsWithMessage("The first value passed the predicate but this consumer received more than one value (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<Integer> to = new TestObserver<>();
 
             Observable.just(1, 2).subscribe(to);
@@ -901,7 +906,7 @@ public void assertValuePredicateMatchButMore() {
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        assertThrows("No values", AssertionError.class, () -> {
+        assertThrowsWithMessage("No values (latch = 0, values = 0, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<Object> to = new TestObserver<>();
 
             Observable.empty().subscribe(to);
@@ -929,7 +934,7 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        assertThrows("Value not present", AssertionError.class, () -> {
+        assertThrowsWithMessage("Value 3 (class: Integer) at position 2 did not pass the predicate (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<Integer> to = new TestObserver<>();
 
             Observable.just(1, 2, 3).subscribe(to);
@@ -944,7 +949,7 @@ public void assertValueAtPredicateNoMatch() {
 
     @Test
     public void assertValueAtInvalidIndex() {
-        assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+        assertThrowsWithMessage("Index 2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<Integer> to = new TestObserver<>();
 
             Observable.just(1, 2).subscribe(to);
@@ -957,9 +962,24 @@ public void assertValueAtInvalidIndex() {
         });
     }
 
+    @Test
+    public void assertValueAtInvalidIndexNegative() {
+        assertThrowsWithMessage("Index -2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserver<Integer> to = new TestObserver<>();
+
+            Observable.just(1, 2).subscribe(to);
+
+            to.assertValueAt(-2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
+        });
+    }
+
     @Test
     public void assertValueAtIndexEmpty() {
-        assertThrows("No values", AssertionError.class, () -> {
+        assertThrowsWithMessage("No values (latch = 0, values = 0, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<Object> to = new TestObserver<>();
 
             Observable.empty().subscribe(to);
@@ -979,7 +999,7 @@ public void assertValueAtIndexMatch() {
 
     @Test
     public void assertValueAtIndexNoMatch() {
-        assertThrows("expected: b (class: String) but was: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+        assertThrowsWithMessage("expected: b (class: String) but was: c (class: String) at position 2 (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<String> to = new TestObserver<>();
 
             Observable.just("a", "b", "c").subscribe(to);
@@ -990,7 +1010,7 @@ public void assertValueAtIndexNoMatch() {
 
     @Test
     public void assertValueAtIndexInvalidIndex() {
-        assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+        assertThrowsWithMessage("Index 2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<String> to = new TestObserver<>();
 
             Observable.just("a", "b").subscribe(to);
@@ -999,6 +1019,17 @@ public void assertValueAtIndexInvalidIndex() {
         });
     }
 
+    @Test
+    public void assertValueAtIndexInvalidIndexNegative() {
+        assertThrowsWithMessage("Index -2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b").subscribe(to);
+
+            to.assertValueAt(-2, "c");
+        });
+    }
+
     @Test
     public void withTag() {
         try {
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
index 48bb722585..67e397b4bd 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
 
@@ -1391,9 +1392,13 @@ public void assertValuePredicateMatch() {
         });
     }
 
+    static void assertThrowsWithMessage(String message, Class<? extends Throwable> clazz, ThrowingRunnable run) {
+        assertEquals(message, assertThrows(clazz, run).getMessage());
+    }
+
     @Test
     public void assertValuePredicateNoMatch() {
-        assertThrows("Value not present", AssertionError.class, () -> {
+        assertThrowsWithMessage("Value 1 (class: Integer) at position 0 did not pass the predicate (latch = 0, values = 1, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Flowable.just(1).subscribe(ts);
@@ -1408,7 +1413,7 @@ public void assertValuePredicateNoMatch() {
 
     @Test
     public void assertValuePredicateMatchButMore() {
-        assertThrows("Value present but other values as well", AssertionError.class, () -> {
+        assertThrowsWithMessage("The first value passed the predicate but this consumer received more than one value (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Flowable.just(1, 2).subscribe(ts);
@@ -1423,7 +1428,7 @@ public void assertValuePredicateMatchButMore() {
 
     @Test
     public void assertValueAtPredicateEmpty() {
-        assertThrows("No values", AssertionError.class, () -> {
+        assertThrowsWithMessage("No values (latch = 0, values = 0, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestSubscriber<Object> ts = new TestSubscriber<>();
 
             Flowable.empty().subscribe(ts);
@@ -1451,7 +1456,7 @@ public void assertValueAtPredicateMatch() {
 
     @Test
     public void assertValueAtPredicateNoMatch() {
-        assertThrows("Value not present", AssertionError.class, () -> {
+        assertThrowsWithMessage("Value 3 (class: Integer) at position 2 did not pass the predicate (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Flowable.just(1, 2, 3).subscribe(ts);
@@ -1466,7 +1471,7 @@ public void assertValueAtPredicateNoMatch() {
 
     @Test
     public void assertValueAtInvalidIndex() {
-        assertThrows("Invalid index: 2 (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+        assertThrowsWithMessage("Index 2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestSubscriber<Integer> ts = new TestSubscriber<>();
 
             Flowable.just(1, 2).subscribe(ts);
@@ -1479,6 +1484,43 @@ public void assertValueAtInvalidIndex() {
         });
     }
 
+    @Test
+    public void assertValueAtIndexInvalidIndex() {
+        assertThrowsWithMessage("Index 2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+            Flowable.just(1, 2).subscribe(ts);
+
+            ts.assertValueAt(2, 3);
+        });
+    }
+
+    @Test
+    public void assertValueAtIndexInvalidIndexNegative() {
+        assertThrowsWithMessage("Index -2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+            Flowable.just(1, 2).subscribe(ts);
+
+            ts.assertValueAt(-2, 3);
+        });
+    }
+
+    @Test
+    public void assertValueAtInvalidIndexNegative() {
+        assertThrowsWithMessage("Index -2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestSubscriber<Integer> ts = new TestSubscriber<>();
+
+            Flowable.just(1, 2).subscribe(ts);
+
+            ts.assertValueAt(-2, new Predicate<Integer>() {
+                @Override public boolean test(final Integer o) throws Exception {
+                    return o == 1;
+                }
+            });
+        });
+    }
+
     @Test
     public void requestMore() {
         Flowable.range(1, 5)

From c573219f520c30583f8a62f9c996c6c17b2de447 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 7 Dec 2020 13:31:41 +0100
Subject: [PATCH 189/665] 3.x: Improve Javadocs of Connectable sources (#7127)

---
 .../flowables/ConnectableFlowable.java        |  83 +++++------
 .../observables/ConnectableObservable.java    | 135 +++++++++---------
 .../validators/JavadocCodesAndLinks.java      |  10 ++
 3 files changed, 120 insertions(+), 108 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
index 041fc3bd1b..a46371f545 100644
--- a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
@@ -16,7 +16,7 @@
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
-import org.reactivestreams.Subscriber;
+import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.*;
@@ -37,9 +37,9 @@
  * <img width="640" height="510" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.v3.png" alt="">
  * <p>
  * When the upstream terminates, the {@code ConnectableFlowable} remains in this terminated state and,
- * depending on the actual underlying implementation, relays cached events to late {@link Subscriber}s.
+ * depending on the actual underlying implementation, relays cached events to late {@code Subscriber}s.
  * In order to reuse and restart this {@code ConnectableFlowable}, the {@link #reset()} method has to be called.
- * When called, this {@code ConnectableFlowable} will appear as fresh, unconnected source to new {@link Subscriber}s.
+ * When called, this {@code ConnectableFlowable} will appear as fresh, unconnected source to new {@code Subscriber}s.
  * Disposing the connection will reset the {@code ConnectableFlowable} to its fresh state and there is no need to call
  * {@code reset()} in this case.
  * <p>
@@ -48,8 +48,7 @@
  * there is no unwanted signal loss due to early {@code connect()} or {@code reset()} calls while {@code Subscriber}s are
  * still being subscribed to to this {@code ConnectableFlowable} to receive signals from the get go.
  * <p>
- * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Connectable-Observable-Operators">RxJava Wiki:
- *      Connectable Observable Operators</a>
+ * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Connectable-Observable-Operators">RxJava Wiki: Connectable Observable Operators</a>
  * @param <T>
  *          the type of items emitted by the {@code ConnectableFlowable}
  * @since 2.0.0
@@ -74,7 +73,7 @@ public abstract class ConnectableFlowable<T> extends Flowable<T> {
     public abstract void connect(@NonNull Consumer<? super Disposable> connection);
 
     /**
-     * Resets this ConnectableFlowable into its fresh state if it has terminated.
+     * Resets this {@code ConnectableFlowable} into its fresh state if it has terminated.
      * <p>
      * Calling this method on a fresh or active {@code ConnectableFlowable} has no effect.
      * <dl>
@@ -108,7 +107,7 @@ public final Disposable connect() {
     }
 
     /**
-     * Returns a {@code Flowable} that stays connected to this {@code ConnectableFlowable} as long as there
+     * Returns a {@link Flowable} that stays connected to this {@code ConnectableFlowable} as long as there
      * is at least one subscription to this {@code ConnectableFlowable}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -117,7 +116,7 @@ public final Disposable connect() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This {@code refCount} overload does not operate on any particular {@link Scheduler}.</dd>
      * </dl>
-     * @return a {@link Flowable}
+     * @return the new {@code Flowable} instance
      * @see <a href="http://reactivex.io/documentation/operators/refcount.html">ReactiveX documentation: RefCount</a>
      * @see #refCount(int)
      * @see #refCount(long, TimeUnit)
@@ -143,7 +142,8 @@ public Flowable<T> refCount() {
      * </dl>
      * <p>History: 2.1.14 - experimental
      * @param subscriberCount the number of subscribers required to connect to the upstream
-     * @return the new Flowable instance
+     * @return the new {@link Flowable} instance
+     * @throws IllegalArgumentException if {@code subscriberCount} is non-positive
      * @since 2.2
      */
     @CheckReturnValue
@@ -168,7 +168,7 @@ public final Flowable<T> refCount(int subscriberCount) {
      * <p>History: 2.1.14 - experimental
      * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
      * @param unit the time unit of the timeout
-     * @return the new Flowable instance
+     * @return the new {@link Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see #refCount(long, TimeUnit, Scheduler)
      * @since 2.2
@@ -196,7 +196,7 @@ public final Flowable<T> refCount(long timeout, @NonNull TimeUnit unit) {
      * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
      * @param unit the time unit of the timeout
      * @param scheduler the target scheduler to wait on before disconnecting
-     * @return the new Flowable instance
+     * @return the new {@link Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 2.2
      */
@@ -223,8 +223,9 @@ public final Flowable<T> refCount(long timeout, @NonNull TimeUnit unit, @NonNull
      * @param subscriberCount the number of subscribers required to connect to the upstream
      * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
      * @param unit the time unit of the timeout
-     * @return the new Flowable instance
+     * @return the new {@link Flowable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
+     * @throws IllegalArgumentException if {@code subscriberCount} is non-positive
      * @see #refCount(int, long, TimeUnit, Scheduler)
      * @since 2.2
      */
@@ -252,7 +253,7 @@ public final Flowable<T> refCount(int subscriberCount, long timeout, @NonNull Ti
      * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
      * @param unit the time unit of the timeout
      * @param scheduler the target scheduler to wait on before disconnecting
-     * @return the new Flowable instance
+     * @return the new {@link Flowable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @throws IllegalArgumentException if {@code subscriberCount} is non-positive
      * @since 2.2
@@ -269,20 +270,20 @@ public final Flowable<T> refCount(int subscriberCount, long timeout, @NonNull Ti
     }
 
     /**
-     * Returns a Flowable that automatically connects (at most once) to this ConnectableFlowable
-     * when the first Subscriber subscribes.
+     * Returns a {@link Flowable} that automatically connects (at most once) to this {@code ConnectableFlowable}
+     * when the first {@link Subscriber} subscribes.
      * <p>
      * <img width="640" height="392" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/autoConnect.f.png" alt="">
      * <p>
      * The connection happens after the first subscription and happens at most once
-     * during the lifetime of the returned Flowable. If this ConnectableFlowable
-     * terminates, the connection is never renewed, no matter how Subscribers come
+     * during the lifetime of the returned {@code Flowable}. If this {@code ConnectableFlowable}
+     * terminates, the connection is never renewed, no matter how {@code Subscriber}s come
      * and go. Use {@link #refCount()} to renew a connection or dispose an active
-     * connection when all {@code Subscriber}s have cancelled their {@code Subscription}s.
+     * connection when all {@code Subscriber}s have cancelled their {@link Subscription}s.
      * <p>
      * This overload does not allow disconnecting the connection established via
      * {@link #connect(Consumer)}. Use the {@link #autoConnect(int, Consumer)} overload
-     * to gain access to the {@code Disposable} representing the only connection.
+     * to gain access to the {@link Disposable} representing the only connection.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with backpressure which is determined by
@@ -291,8 +292,8 @@ public final Flowable<T> refCount(int subscriberCount, long timeout, @NonNull Ti
      *  <dd>{@code autoConnect} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return a Flowable that automatically connects to this ConnectableFlowable
-     *         when the first Subscriber subscribes
+     * @return a new {@code Flowable} instance that automatically connects to this {@code ConnectableFlowable}
+     *         when the first {@code Subscriber} subscribes
      * @see #refCount()
      * @see #autoConnect(int, Consumer)
      */
@@ -304,20 +305,20 @@ public Flowable<T> autoConnect() {
         return autoConnect(1);
     }
     /**
-     * Returns a Flowable that automatically connects (at most once) to this ConnectableFlowable
-     * when the specified number of Subscribers subscribe to it.
+     * Returns a {@link Flowable} that automatically connects (at most once) to this {@code ConnectableFlowable}
+     * when the specified number of {@link Subscriber}s subscribe to it.
      * <p>
      * <img width="640" height="392" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/autoConnect.f.png" alt="">
      * <p>
      * The connection happens after the given number of subscriptions and happens at most once
-     * during the lifetime of the returned Flowable. If this ConnectableFlowable
-     * terminates, the connection is never renewed, no matter how Subscribers come
+     * during the lifetime of the returned {@code Flowable}. If this {@code ConnectableFlowable}
+     * terminates, the connection is never renewed, no matter how {@code Subscriber}s come
      * and go. Use {@link #refCount()} to renew a connection or dispose an active
-     * connection when all {@code Subscriber}s have cancelled their {@code Subscription}s.
+     * connection when all {@code Subscriber}s have cancelled their {@link Subscription}s.
      * <p>
      * This overload does not allow disconnecting the connection established via
      * {@link #connect(Consumer)}. Use the {@link #autoConnect(int, Consumer)} overload
-     * to gain access to the {@code Disposable} representing the only connection.
+     * to gain access to the {@link Disposable} representing the only connection.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with backpressure which is determined by
@@ -327,10 +328,10 @@ public Flowable<T> autoConnect() {
      * </dl>
      *
      * @param numberOfSubscribers the number of subscribers to await before calling connect
-     *                            on the ConnectableFlowable. A non-positive value indicates
+     *                            on the {@code ConnectableFlowable}. A non-positive value indicates
      *                            an immediate connection.
-     * @return a Flowable that automatically connects to this ConnectableFlowable
-     *         when the specified number of Subscribers subscribe to it
+     * @return a new {@code Flowable} instance that automatically connects to this {@code ConnectableFlowable}
+     *         when the specified number of {@code Subscriber}s subscribe to it
      */
     @NonNull
     @CheckReturnValue
@@ -341,17 +342,17 @@ public Flowable<T> autoConnect(int numberOfSubscribers) {
     }
 
     /**
-     * Returns a Flowable that automatically connects (at most once) to this ConnectableFlowable
-     * when the specified number of Subscribers subscribe to it and calls the
-     * specified callback with the Subscription associated with the established connection.
+     * Returns a {@link Flowable} that automatically connects (at most once) to this {@code ConnectableFlowable}
+     * when the specified number of {@link Subscriber}s subscribe to it and calls the
+     * specified callback with the {@link Disposable} associated with the established connection.
      * <p>
      * <img width="640" height="392" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/autoConnect.f.png" alt="">
      * <p>
      * The connection happens after the given number of subscriptions and happens at most once
-     * during the lifetime of the returned Flowable. If this ConnectableFlowable
-     * terminates, the connection is never renewed, no matter how Subscribers come
+     * during the lifetime of the returned {@code Flowable}. If this {@code ConnectableFlowable}
+     * terminates, the connection is never renewed, no matter how {@code Subscriber}s come
      * and go. Use {@link #refCount()} to renew a connection or dispose an active
-     * connection when all {@code Subscriber}s have cancelled their {@code Subscription}s.
+     * connection when all {@code Subscriber}s have cancelled their {@link Subscription}s.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with backpressure which is determined by
@@ -361,13 +362,13 @@ public Flowable<T> autoConnect(int numberOfSubscribers) {
      * </dl>
      *
      * @param numberOfSubscribers the number of subscribers to await before calling connect
-     *                            on the ConnectableFlowable. A non-positive value indicates
+     *                            on the {@code ConnectableFlowable}. A non-positive value indicates
      *                            an immediate connection.
-     * @param connection the callback Consumer that will receive the Subscription representing the
+     * @param connection the callback {@link Consumer} that will receive the {@code Disposable} representing the
      *                   established connection
-     * @return a Flowable that automatically connects to this ConnectableFlowable
-     *         when the specified number of Subscribers subscribe to it and calls the
-     *         specified callback with the Subscription associated with the established connection
+     * @return a new {@code Flowable} instance that automatically connects to this {@code ConnectableFlowable}
+     *         when the specified number of {@code Subscriber}s subscribe to it and calls the
+     *         specified callback with the {@code Disposable} associated with the established connection
      * @throws NullPointerException if {@code connection} is {@code null}
      */
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
index 107971ca88..9a0b54c2cf 100644
--- a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
@@ -35,19 +35,18 @@
  * <img width="640" height="510" src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/publishConnect.v3.png" alt="">
  * <p>
  * When the upstream terminates, the {@code ConnectableObservable} remains in this terminated state and,
- * depending on the actual underlying implementation, relays cached events to late {@link Observer}s.
+ * depending on the actual underlying implementation, relays cached events to late {@code Observer}s.
  * In order to reuse and restart this {@code ConnectableObservable}, the {@link #reset()} method has to be called.
- * When called, this {@code ConnectableObservable} will appear as fresh, unconnected source to new {@link Observer}s.
- * Disposing the connection will reset the {@code ConnectableFlowable} to its fresh state and there is no need to call
- * {@code reset()} in this case.
+ * When called, this {@code ConnectableObservable} will appear as fresh, unconnected source to new {@code Observer}s.
+ * Disposing the connection will reset the {@code ConnectableObservable} to its fresh state and there is no need to call
+ * {@link #reset()} in this case.
  * <p>
  * Note that although {@link #connect()} and {@link #reset()} are safe to call from multiple threads, it is recommended
  * a dedicated thread or business logic manages the connection or resetting of a {@code ConnectableObservable} so that
  * there is no unwanted signal loss due to early {@code connect()} or {@code reset()} calls while {@code Observer}s are
  * still being subscribed to to this {@code ConnectableObservable} to receive signals from the get go.
  *
- * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Connectable-Observable-Operators">RxJava Wiki:
- *      Connectable Observable Operators</a>
+ * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Connectable-Observable-Operators">RxJava Wiki: Connectable Observable Operators</a>
  * @param <T>
  *          the type of items emitted by the {@code ConnectableObservable}
  */
@@ -71,7 +70,7 @@ public abstract class ConnectableObservable<T> extends Observable<T> {
     public abstract void connect(@NonNull Consumer<? super Disposable> connection);
 
     /**
-     * Resets this ConnectableObservable into its fresh state if it has terminated
+     * Resets this {@code ConnectableObservable} into its fresh state if it has terminated
      * or has been disposed.
      * <p>
      * Calling this method on a fresh or active {@code ConnectableObservable} has no effect.
@@ -94,7 +93,7 @@ public abstract class ConnectableObservable<T> extends Observable<T> {
      *  <dd>The behavior is determined by the implementor of this abstract class.</dd>
      * </dl>
      *
-     * @return the subscription representing the connection
+     * @return the {@link Disposable} representing the connection
      * @see <a href="http://reactivex.io/documentation/operators/connect.html">ReactiveX documentation: Connect</a>
      */
     @NonNull
@@ -106,13 +105,13 @@ public final Disposable connect() {
     }
 
     /**
-     * Returns an {@code Observable} that stays connected to this {@code ConnectableObservable} as long as there
+     * Returns an {@link Observable} that stays connected to this {@code ConnectableObservable} as long as there
      * is at least one subscription to this {@code ConnectableObservable}.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This {@code refCount} overload does not operate on any particular {@link Scheduler}.</dd>
      * </dl>
-     * @return an {@link Observable}
+     * @return a new {@code Observable} instance
      * @see <a href="http://reactivex.io/documentation/operators/refcount.html">ReactiveX documentation: RefCount</a>
      * @see #refCount(int)
      * @see #refCount(long, TimeUnit)
@@ -127,35 +126,36 @@ public Observable<T> refCount() {
 
     /**
      * Connects to the upstream {@code ConnectableObservable} if the number of subscribed
-     * observers reaches the specified count and disconnect if all subscribers have unsubscribed.
+     * observers reaches the specified count and disconnect if all {@link Observer}s have unsubscribed.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This {@code refCount} overload does not operate on any particular {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.14 - experimental
-     * @param subscriberCount the number of subscribers required to connect to the upstream
-     * @return the new Observable instance
+     * @param observerCount the number of {@code Observer}s required to connect to the upstream
+     * @return the new {@link Observable} instance
+     * @throws IllegalArgumentException if {@code observerCount} is non-positive
      * @since 2.2
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Observable<T> refCount(int subscriberCount) {
-        return refCount(subscriberCount, 0, TimeUnit.NANOSECONDS, Schedulers.trampoline());
+    public final Observable<T> refCount(int observerCount) {
+        return refCount(observerCount, 0, TimeUnit.NANOSECONDS, Schedulers.trampoline());
     }
 
     /**
      * Connects to the upstream {@code ConnectableObservable} if the number of subscribed
      * observers reaches 1 and disconnect after the specified
-     * timeout if all subscribers have unsubscribed.
+     * timeout if all {@link Observer}s have unsubscribed.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This {@code refCount} overload operates on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.14 - experimental
-     * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
+     * @param timeout the time to wait before disconnecting after all {@code Observer}s unsubscribed
      * @param unit the time unit of the timeout
-     * @return the new Observable instance
+     * @return the new {@link Observable} instance
      * @throws NullPointerException if {@code unit} is {@code null}
      * @see #refCount(long, TimeUnit, Scheduler)
      * @since 2.2
@@ -170,16 +170,16 @@ public final Observable<T> refCount(long timeout, @NonNull TimeUnit unit) {
     /**
      * Connects to the upstream {@code ConnectableObservable} if the number of subscribed
      * observers reaches 1 and disconnect after the specified
-     * timeout if all subscribers have unsubscribed.
+     * timeout if all {@link Observer}s have unsubscribed.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This {@code refCount} overload operates on the specified {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.14 - experimental
-     * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
+     * @param timeout the time to wait before disconnecting after all {@code Observer}s unsubscribed
      * @param unit the time unit of the timeout
      * @param scheduler the target scheduler to wait on before disconnecting
-     * @return the new Observable instance
+     * @return the new {@link Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @since 2.2
      */
@@ -193,66 +193,67 @@ public final Observable<T> refCount(long timeout, @NonNull TimeUnit unit, @NonNu
     /**
      * Connects to the upstream {@code ConnectableObservable} if the number of subscribed
      * observers reaches the specified count and disconnect after the specified
-     * timeout if all subscribers have unsubscribed.
+     * timeout if all {@link Observer}s have unsubscribed.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This {@code refCount} overload operates on the {@code computation} {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.14 - experimental
-     * @param subscriberCount the number of subscribers required to connect to the upstream
-     * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
+     * @param observerCount the number of {@code Observer}s required to connect to the upstream
+     * @param timeout the time to wait before disconnecting after all {@code Observer}s unsubscribed
      * @param unit the time unit of the timeout
-     * @return the new Observable instance
+     * @return the new {@link Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws IllegalArgumentException if {@code observerCount} is non-positive
      * @see #refCount(int, long, TimeUnit, Scheduler)
      * @since 2.2
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final Observable<T> refCount(int subscriberCount, long timeout, @NonNull TimeUnit unit) {
-        return refCount(subscriberCount, timeout, unit, Schedulers.computation());
+    public final Observable<T> refCount(int observerCount, long timeout, @NonNull TimeUnit unit) {
+        return refCount(observerCount, timeout, unit, Schedulers.computation());
     }
 
     /**
      * Connects to the upstream {@code ConnectableObservable} if the number of subscribed
      * observers reaches the specified count and disconnect after the specified
-     * timeout if all subscribers have unsubscribed.
+     * timeout if all {@link Observer}s have unsubscribed.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>This {@code refCount} overload operates on the specified {@link Scheduler}.</dd>
      * </dl>
      * <p>History: 2.1.14 - experimental
-     * @param subscriberCount the number of subscribers required to connect to the upstream
-     * @param timeout the time to wait before disconnecting after all subscribers unsubscribed
+     * @param observerCount the number of {@code Observer}s required to connect to the upstream
+     * @param timeout the time to wait before disconnecting after all {@code Observer}s unsubscribed
      * @param unit the time unit of the timeout
      * @param scheduler the target scheduler to wait on before disconnecting
-     * @return the new Observable instance
+     * @return the new {@link Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
-     * @throws IllegalArgumentException if {@code subscriberCount} is non-positive
+     * @throws IllegalArgumentException if {@code observerCount} is non-positive
      * @since 2.2
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> refCount(int subscriberCount, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
-        ObjectHelper.verifyPositive(subscriberCount, "subscriberCount");
+    public final Observable<T> refCount(int observerCount, long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+        ObjectHelper.verifyPositive(observerCount, "observerCount");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableRefCount<>(this, subscriberCount, timeout, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableRefCount<>(this, observerCount, timeout, unit, scheduler));
     }
 
     /**
-     * Returns an Observable that automatically connects (at most once) to this ConnectableObservable
-     * when the first Observer subscribes.
+     * Returns an {@link Observable} that automatically connects (at most once) to this {@code ConnectableObservable}
+     * when the first {@link Observer} subscribes.
      * <p>
      * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/autoConnect.o.png" alt="">
      * <p>
      * The connection happens after the first subscription and happens at most once
-     * during the lifetime of the returned Observable. If this ConnectableObservable
-     * terminates, the connection is never renewed, no matter how Observers come
+     * during the lifetime of the returned {@code Observable}. If this {@code ConnectableObservable}
+     * terminates, the connection is never renewed, no matter how {@code Observer}s come
      * and go. Use {@link #refCount()} to renew a connection or dispose an active
-     * connection when all {@code Observer}s have disposed their {@code Disposable}s.
+     * connection when all {@code Observer}s have disposed their {@link Disposable}s.
      * <p>
      * This overload does not allow disconnecting the connection established via
      * {@link #connect(Consumer)}. Use the {@link #autoConnect(int, Consumer)} overload
@@ -262,8 +263,8 @@ public final Observable<T> refCount(int subscriberCount, long timeout, @NonNull
      *  <dd>{@code autoConnect} overload does not operate on any particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @return an Observable that automatically connects to this ConnectableObservable
-     *         when the first Observer subscribes
+     * @return a new {@code Observable} instance that automatically connects to this {@code ConnectableObservable}
+     *         when the first {@code Observer} subscribes
      */
     @NonNull
     @CheckReturnValue
@@ -273,16 +274,16 @@ public Observable<T> autoConnect() {
     }
 
     /**
-     * Returns an Observable that automatically connects (at most once) to this ConnectableObservable
-     * when the specified number of Observers subscribe to it.
+     * Returns an {@link Observable} that automatically connects (at most once) to this {@code ConnectableObservable}
+     * when the specified number of {@link Observer}s subscribe to it.
      * <p>
      * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/autoConnect.o.png" alt="">
      * <p>
      * The connection happens after the given number of subscriptions and happens at most once
-     * during the lifetime of the returned Observable. If this ConnectableObservable
-     * terminates, the connection is never renewed, no matter how Observers come
+     * during the lifetime of the returned {@code Observable}. If this {@code ConnectableObservable}
+     * terminates, the connection is never renewed, no matter how {@code Observer}s come
      * and go. Use {@link #refCount()} to renew a connection or dispose an active
-     * connection when all {@code Observer}s have disposed their {@code Disposable}s.
+     * connection when all {@code Observer}s have disposed their {@link Disposable}s.
      * <p>
      * This overload does not allow disconnecting the connection established via
      * {@link #connect(Consumer)}. Use the {@link #autoConnect(int, Consumer)} overload
@@ -292,29 +293,29 @@ public Observable<T> autoConnect() {
      *  <dd>{@code autoConnect} overload does not operate on any particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param numberOfSubscribers the number of subscribers to await before calling connect
-     *                            on the ConnectableObservable. A non-positive value indicates
+     * @param numberOfObservers the number of subscribers to await before calling connect
+     *                            on the {@code ConnectableObservable}. A non-positive value indicates
      *                            an immediate connection.
-     * @return an Observable that automatically connects to this ConnectableObservable
-     *         when the specified number of Subscribers subscribe to it
+     * @return a new {@code Observable} instance that automatically connects to this {@code ConnectableObservable}
+     *         when the specified number of {@code Observer}s subscribe to it
      */
     @NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public Observable<T> autoConnect(int numberOfSubscribers) {
-        return autoConnect(numberOfSubscribers, Functions.emptyConsumer());
+    public Observable<T> autoConnect(int numberOfObservers) {
+        return autoConnect(numberOfObservers, Functions.emptyConsumer());
     }
 
     /**
-     * Returns an Observable that automatically connects (at most once) to this ConnectableObservable
-     * when the specified number of Subscribers subscribe to it and calls the
-     * specified callback with the Subscription associated with the established connection.
+     * Returns an {@link Observable} that automatically connects (at most once) to this {@code ConnectableObservable}
+     * when the specified number of {@link Observer}s subscribe to it and calls the
+     * specified callback with the {@link Disposable} associated with the established connection.
      * <p>
      * <img width="640" height="348" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/autoConnect.o.png" alt="">
      * <p>
      * The connection happens after the given number of subscriptions and happens at most once
-     * during the lifetime of the returned Observable. If this ConnectableObservable
-     * terminates, the connection is never renewed, no matter how Observers come
+     * during the lifetime of the returned {@code Observable}. If this {@code ConnectableObservable}
+     * terminates, the connection is never renewed, no matter how {@code Observer}s come
      * and go. Use {@link #refCount()} to renew a connection or dispose an active
      * connection when all {@code Observer}s have disposed their {@code Disposable}s.
      * <dl>
@@ -322,25 +323,25 @@ public Observable<T> autoConnect(int numberOfSubscribers) {
      *  <dd>{@code autoConnect} overload does not operate on any particular {@link Scheduler}.</dd>
      * </dl>
      *
-     * @param numberOfSubscribers the number of subscribers to await before calling connect
-     *                            on the ConnectableObservable. A non-positive value indicates
+     * @param numberOfObservers the number of subscribers to await before calling connect
+     *                            on the {@code ConnectableObservable}. A non-positive value indicates
      *                            an immediate connection.
-     * @param connection the callback Consumer that will receive the Subscription representing the
+     * @param connection the callback {@link Consumer} that will receive the {@code Disposable} representing the
      *                   established connection
-     * @return an Observable that automatically connects to this ConnectableObservable
-     *         when the specified number of Subscribers subscribe to it and calls the
-     *         specified callback with the Subscription associated with the established connection
+     * @return a new {@code Observable} instance that automatically connects to this {@code ConnectableObservable}
+     *         when the specified number of {@code Observer}s subscribe to it and calls the
+     *         specified callback with the {@code Disposable} associated with the established connection
      * @throws NullPointerException if {@code connection} is {@code null}
      */
     @NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
-    public Observable<T> autoConnect(int numberOfSubscribers, @NonNull Consumer<? super Disposable> connection) {
+    public Observable<T> autoConnect(int numberOfObservers, @NonNull Consumer<? super Disposable> connection) {
         Objects.requireNonNull(connection, "connection is null");
-        if (numberOfSubscribers <= 0) {
+        if (numberOfObservers <= 0) {
             this.connect(connection);
             return RxJavaPlugins.onAssembly(this);
         }
-        return RxJavaPlugins.onAssembly(new ObservableAutoConnect<>(this, numberOfSubscribers, connection));
+        return RxJavaPlugins.onAssembly(new ObservableAutoConnect<>(this, numberOfObservers, connection));
     }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
index 55cecb6097..5b90072306 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
@@ -65,6 +65,16 @@ public void checkCompositeDisposable() throws Exception {
         checkSource("CompositeDisposable", "io.reactivex.rxjava3.disposables");
     }
 
+    @Test
+    public void checkConnectableFlowable() throws Exception {
+        checkSource("ConnectableFlowable", "io.reactivex.rxjava3.flowables");
+    }
+
+    @Test
+    public void checkConnectableObservable() throws Exception {
+        checkSource("ConnectableObservable", "io.reactivex.rxjava3.observables");
+    }
+
     static void checkSource(String baseClassName, String packageName) throws Exception {
         File f = TestHelper.findSource(baseClassName, packageName);
         if (f == null) {

From 7741c59fd05196d40b5a6214314842552290c156 Mon Sep 17 00:00:00 2001
From: Andrey <andy.imsg@gmail.com>
Date: Wed, 9 Dec 2020 13:15:51 +0300
Subject: [PATCH 190/665] 3.x: Add onBackpressureReduce operator (#7124)

* onBackpressureReduce operator added

* onBackpressureReduce operator added

* onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator

* 3.x: onBackpressureReduce operator

* 3.x: onBackpressureReduce operator

* 3.x: onBackpressureReduce operator
---
 .../io/reactivex/rxjava3/core/Flowable.java   |  34 +++
 ...tractBackpressureThrottlingSubscriber.java | 163 ++++++++++++
 .../FlowableOnBackpressureLatest.java         | 135 +---------
 .../FlowableOnBackpressureReduce.java         |  68 +++++
 .../FlowableOnBackpressureLatestTest.java     |   6 +
 .../FlowableOnBackpressureReduceTest.java     | 238 ++++++++++++++++++
 6 files changed, 513 insertions(+), 131 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 364e83fd58..7aa9c277a8 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -12676,6 +12676,40 @@ public final Flowable<T> onBackpressureLatest() {
         return RxJavaPlugins.onAssembly(new FlowableOnBackpressureLatest<>(this));
     }
 
+    /**
+     * Reduces a sequence of two not emitted values via a function into a single value if the downstream is not ready to receive
+     * new items (indicated by a lack of {@link Subscription#request(long)} calls from it) and emits this latest
+     * item when the downstream becomes ready.
+     * <p>
+     * <img width="640" height="354" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.onBackpressureReduce.png" alt="">
+     * <p>
+     * Note that if the current {@code Flowable} does support backpressure, this operator ignores that capability
+     * and doesn't propagate any backpressure requests from downstream.
+     * <p>
+     * Note that due to the nature of how backpressure requests are propagated through subscribeOn/observeOn,
+     * requesting more than 1 from downstream doesn't guarantee a continuous delivery of {@code onNext} events.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
+     *  manner (i.e., not applying backpressure to it).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onBackpressureReduce} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param reducer the bi-function to call when there is more than one non-emitted value to downstream,
+     * the first argument of the bi-function is previous item and the second one is currently emitting from upstream
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code reducer} is {@code null}
+     * @since 3.0.9 - experimental
+     */
+    @Experimental
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Flowable<T> onBackpressureReduce(@NonNull BiFunction<T, T, T> reducer) {
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureReduce<>(this, reducer));
+    }
+
     /**
      * Returns a {@code Flowable} instance that if the current {@code Flowable} emits an error, it will emit an {@code onComplete}
      * and swallow the throwable.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
new file mode 100644
index 0000000000..e51d870828
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
@@ -0,0 +1,163 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Abstract base class for operators that throttle excessive updates from upstream in case if
+ * downstream {@link Subscriber} is not ready to receive updates
+ *
+ * @param <T> the upstream and downstream value type
+ */
+abstract class AbstractBackpressureThrottlingSubscriber<T> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
+
+    final Subscriber<? super T> downstream;
+
+    Subscription upstream;
+
+    volatile boolean done;
+    Throwable error;
+
+    volatile boolean cancelled;
+
+    final AtomicLong requested = new AtomicLong();
+
+    final AtomicReference<T> current = new AtomicReference<>();
+
+    AbstractBackpressureThrottlingSubscriber(Subscriber<? super T> downstream) {
+        this.downstream = downstream;
+    }
+
+    @Override
+    public void onSubscribe(Subscription s) {
+        if (SubscriptionHelper.validate(this.upstream, s)) {
+            this.upstream = s;
+            downstream.onSubscribe(this);
+            s.request(Long.MAX_VALUE);
+        }
+    }
+
+    @Override
+    abstract public void onNext(T t);
+
+    @Override
+    public void onError(Throwable t) {
+        error = t;
+        done = true;
+        drain();
+    }
+
+    @Override
+    public void onComplete() {
+        done = true;
+        drain();
+    }
+
+    @Override
+    public void request(long n) {
+        if (SubscriptionHelper.validate(n)) {
+            BackpressureHelper.add(requested, n);
+            drain();
+        }
+    }
+
+    @Override
+    public void cancel() {
+        if (!cancelled) {
+            cancelled = true;
+            upstream.cancel();
+
+            if (getAndIncrement() == 0) {
+                current.lazySet(null);
+            }
+        }
+    }
+
+    void drain() {
+        if (getAndIncrement() != 0) {
+            return;
+        }
+        final Subscriber<? super T> a = downstream;
+        int missed = 1;
+        final AtomicLong r = requested;
+        final AtomicReference<T> q = current;
+
+        for (;;) {
+            long e = 0L;
+
+            while (e != r.get()) {
+                boolean d = done;
+                T v = q.getAndSet(null);
+                boolean empty = v == null;
+
+                if (checkTerminated(d, empty, a, q)) {
+                    return;
+                }
+
+                if (empty) {
+                    break;
+                }
+
+                a.onNext(v);
+
+                e++;
+            }
+
+            if (e == r.get() && checkTerminated(done, q.get() == null, a, q)) {
+                return;
+            }
+
+            if (e != 0L) {
+                BackpressureHelper.produced(r, e);
+            }
+
+            missed = addAndGet(-missed);
+            if (missed == 0) {
+                break;
+            }
+        }
+    }
+
+    boolean checkTerminated(boolean d, boolean empty, Subscriber<?> a, AtomicReference<T> q) {
+        if (cancelled) {
+            q.lazySet(null);
+            return true;
+        }
+
+        if (d) {
+            Throwable e = error;
+            if (e != null) {
+                q.lazySet(null);
+                a.onError(e);
+                return true;
+            } else
+            if (empty) {
+                a.onComplete();
+                return true;
+            }
+        }
+
+        return false;
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
index 6123475ef0..c28aa4c9b1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
@@ -13,13 +13,8 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
-import java.util.concurrent.atomic.*;
-
-import org.reactivestreams.*;
-
-import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
-import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.core.Flowable;
+import org.reactivestreams.Subscriber;
 
 public final class FlowableOnBackpressureLatest<T> extends AbstractFlowableWithUpstream<T, T> {
 
@@ -32,34 +27,12 @@ protected void subscribeActual(Subscriber<? super T> s) {
         source.subscribe(new BackpressureLatestSubscriber<>(s));
     }
 
-    static final class BackpressureLatestSubscriber<T> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
+    static final class BackpressureLatestSubscriber<T> extends AbstractBackpressureThrottlingSubscriber<T> {
 
         private static final long serialVersionUID = 163080509307634843L;
 
-        final Subscriber<? super T> downstream;
-
-        Subscription upstream;
-
-        volatile boolean done;
-        Throwable error;
-
-        volatile boolean cancelled;
-
-        final AtomicLong requested = new AtomicLong();
-
-        final AtomicReference<T> current = new AtomicReference<>();
-
         BackpressureLatestSubscriber(Subscriber<? super T> downstream) {
-            this.downstream = downstream;
-        }
-
-        @Override
-        public void onSubscribe(Subscription s) {
-            if (SubscriptionHelper.validate(this.upstream, s)) {
-                this.upstream = s;
-                downstream.onSubscribe(this);
-                s.request(Long.MAX_VALUE);
-            }
+            super(downstream);
         }
 
         @Override
@@ -67,105 +40,5 @@ public void onNext(T t) {
             current.lazySet(t);
             drain();
         }
-
-        @Override
-        public void onError(Throwable t) {
-            error = t;
-            done = true;
-            drain();
-        }
-
-        @Override
-        public void onComplete() {
-            done = true;
-            drain();
-        }
-
-        @Override
-        public void request(long n) {
-            if (SubscriptionHelper.validate(n)) {
-                BackpressureHelper.add(requested, n);
-                drain();
-            }
-        }
-
-        @Override
-        public void cancel() {
-            if (!cancelled) {
-                cancelled = true;
-                upstream.cancel();
-
-                if (getAndIncrement() == 0) {
-                    current.lazySet(null);
-                }
-            }
-        }
-
-        void drain() {
-            if (getAndIncrement() != 0) {
-                return;
-            }
-            final Subscriber<? super T> a = downstream;
-            int missed = 1;
-            final AtomicLong r = requested;
-            final AtomicReference<T> q = current;
-
-            for (;;) {
-                long e = 0L;
-
-                while (e != r.get()) {
-                    boolean d = done;
-                    T v = q.getAndSet(null);
-                    boolean empty = v == null;
-
-                    if (checkTerminated(d, empty, a, q)) {
-                        return;
-                    }
-
-                    if (empty) {
-                        break;
-                    }
-
-                    a.onNext(v);
-
-                    e++;
-                }
-
-                if (e == r.get() && checkTerminated(done, q.get() == null, a, q)) {
-                    return;
-                }
-
-                if (e != 0L) {
-                    BackpressureHelper.produced(r, e);
-                }
-
-                missed = addAndGet(-missed);
-                if (missed == 0) {
-                    break;
-                }
-            }
-        }
-
-        boolean checkTerminated(boolean d, boolean empty, Subscriber<?> a, AtomicReference<T> q) {
-            if (cancelled) {
-                q.lazySet(null);
-                return true;
-            }
-
-            if (d) {
-                Throwable e = error;
-                if (e != null) {
-                    q.lazySet(null);
-                    a.onError(e);
-                    return true;
-                } else
-                if (empty) {
-                    a.onComplete();
-                    return true;
-                }
-            }
-
-            return false;
-        }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
new file mode 100644
index 0000000000..e4db04b83f
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.BiFunction;
+import org.reactivestreams.Subscriber;
+
+import java.util.Objects;
+
+public final class FlowableOnBackpressureReduce<T> extends AbstractFlowableWithUpstream<T, T> {
+
+    final BiFunction<T, T, T> reducer;
+
+    public FlowableOnBackpressureReduce(Flowable<T> source, BiFunction<T, T, T> reducer) {
+        super(source);
+        this.reducer = Objects.requireNonNull(reducer, "reducer is null");
+    }
+
+    @Override
+    protected void subscribeActual(Subscriber<? super T> s) {
+        source.subscribe(new BackpressureReduceSubscriber<>(s, reducer));
+    }
+
+    static final class BackpressureReduceSubscriber<T> extends AbstractBackpressureThrottlingSubscriber<T> {
+
+        private static final long serialVersionUID = 821363947659780367L;
+
+        final BiFunction<T, T, T> reducer;
+
+        BackpressureReduceSubscriber(Subscriber<? super T> downstream, BiFunction<T, T, T> reducer) {
+            super(downstream);
+            this.reducer = reducer;
+        }
+
+        @Override
+        public void onNext(T t) {
+            T v = current.get();
+            if (v == null) {
+                current.lazySet(t);
+            } else if ((v = current.getAndSet(null)) != null) {
+                try {
+                    current.lazySet(Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"));
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    onError(ex);
+                    cancel();
+                    return;
+                }
+            } else {
+                current.lazySet(t);
+            }
+            drain();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
index 438ebb1415..2b4f490bca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
@@ -133,6 +133,12 @@ public void onNext(Integer t) {
         int n = ts.values().size();
         System.out.println("testAsynchronousDrop -> " + n);
         Assert.assertTrue("All events received?", n < m);
+        int previous = 0;
+        for (Integer current : ts.values()) {
+            Assert.assertTrue("The sequence must be increasing [current value=" + previous +
+                    ", previous value=" + current + "]", previous <= current);
+            previous = current;
+        }
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
new file mode 100644
index 0000000000..53d258db9e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
@@ -0,0 +1,238 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
+
+public class FlowableOnBackpressureReduceTest extends RxJavaTest {
+
+    static final BiFunction<Integer, Integer, Integer> TEST_INT_REDUCER = (previous, current) -> previous + current + 50;
+
+    static final BiFunction<Object, Object, Object> TEST_OBJECT_REDUCER = (previous, current) -> current;
+
+    @Test
+    public void simple() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+
+        Flowable.range(1, 5).onBackpressureReduce(TEST_INT_REDUCER).subscribe(ts);
+
+        ts.assertNoErrors();
+        ts.assertTerminated();
+        ts.assertValues(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void simpleError() {
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>();
+
+        Flowable.range(1, 5).concatWith(Flowable.error(new TestException()))
+                .onBackpressureReduce(TEST_INT_REDUCER).subscribe(ts);
+
+        ts.assertTerminated();
+        ts.assertError(TestException.class);
+        ts.assertValues(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void simpleBackpressure() {
+        TestSubscriber<Integer> ts = new TestSubscriber<>(2L);
+
+        Flowable.range(1, 5).onBackpressureReduce(TEST_INT_REDUCER).subscribe(ts);
+
+        ts.assertNoErrors();
+        ts.assertValues(1, 2);
+        ts.assertNotComplete();
+    }
+
+    @Test
+    public void synchronousDrop() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
+
+        source.onBackpressureReduce(TEST_INT_REDUCER).subscribe(ts);
+
+        ts.assertNoValues();
+
+        source.onNext(1);
+        ts.request(2);
+
+        ts.assertValue(1);
+
+        source.onNext(2);
+
+        ts.assertValues(1, 2);
+
+        source.onNext(3);
+        source.onNext(4);//3 + 4 + 50 == 57
+        source.onNext(5);//57 + 5 + 50 == 112
+        source.onNext(6);//112 + 6 + 50 == 168
+
+        ts.request(2);
+
+        ts.assertValues(1, 2, 168);
+
+        source.onNext(7);
+
+        ts.assertValues(1, 2, 168, 7);
+
+        source.onNext(8);
+        source.onNext(9);//8 + 9 + 50 == 67
+        source.onComplete();
+
+        ts.request(1);
+
+        ts.assertValues(1, 2, 168, 7, 67);
+        ts.assertNoErrors();
+        ts.assertTerminated();
+    }
+
+    private <T> TestSubscriberEx<T> createDelayedSubscriber() {
+        return new TestSubscriberEx<T>(1L) {
+            final Random rnd = new Random();
+
+            @Override
+            public void onNext(T t) {
+                super.onNext(t);
+                if (rnd.nextDouble() < 0.001) {
+                    try {
+                        Thread.sleep(1);
+                    } catch (InterruptedException ex) {
+                        ex.printStackTrace();
+                    }
+                }
+                request(1);
+            }
+        };
+    }
+
+    private <T> void assertValuesDropped(TestSubscriberEx<T> ts, int totalValues) {
+        int n = ts.values().size();
+        System.out.println("testAsynchronousDrop -> " + n);
+        Assert.assertTrue("All events received?", n < totalValues);
+    }
+
+    private void assertIncreasingSequence(TestSubscriberEx<Integer> ts) {
+        int previous = 0;
+        for (Integer current : ts.values()) {
+            Assert.assertTrue("The sequence must be increasing [current value=" + previous +
+                    ", previous value=" + current + "]", previous <= current);
+            previous = current;
+        }
+    }
+
+    @Test
+    public void asynchronousDrop() {
+        TestSubscriberEx<Integer> ts = createDelayedSubscriber();
+        int m = 100000;
+        Flowable.range(1, m)
+                .subscribeOn(Schedulers.computation())
+                .onBackpressureReduce((previous, current) -> {
+                    //in that case it works like onBackpressureLatest
+                    //the output sequence of number must be increasing
+                    return current;
+                })
+                .observeOn(Schedulers.io())
+                .subscribe(ts);
+
+        ts.awaitDone(2, TimeUnit.SECONDS);
+        ts.assertTerminated();
+        assertValuesDropped(ts, m);
+        assertIncreasingSequence(ts);
+    }
+
+    @Test
+    public void asynchronousDrop2() {
+        TestSubscriberEx<Long> ts = createDelayedSubscriber();
+        int m = 100000;
+        Flowable.rangeLong(1, m)
+                .subscribeOn(Schedulers.computation())
+                .onBackpressureReduce(Long::sum)
+                .observeOn(Schedulers.io())
+                .subscribe(ts);
+
+        ts.awaitDone(2, TimeUnit.SECONDS);
+        ts.assertTerminated();
+        assertValuesDropped(ts, m);
+        long sum = 0;
+        for (Long i : ts.values()) {
+            sum += i;
+        }
+        //sum = (A1 + An) * n / 2 = 100_001 * 50_000 = 50_000_00000 + 50_000 = 50_000_50_000
+        Assert.assertEquals("Wrong sum: " + sum, 5000050000L, sum);
+    }
+
+    @Test
+    public void nullPointerFromReducer() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0);
+        source.onBackpressureReduce((l, r) -> null).subscribe(ts);
+
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(ts.errors(), 0, NullPointerException.class, "The reducer returned a null value");
+    }
+
+    @Test
+    public void exceptionFromReducer() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0);
+        source.onBackpressureReduce((l, r) -> {
+            throw new IOException("Test exception");
+        }).subscribe(ts);
+
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(ts.errors(), 0, IOException.class, "Test exception");
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.onBackpressureReduce(TEST_OBJECT_REDUCER));
+    }
+
+    @Test
+    public void take() {
+        Flowable.just(1, 2)
+                .onBackpressureReduce(TEST_INT_REDUCER)
+                .take(1)
+                .test()
+                .assertResult(1);
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Flowable.never().onBackpressureReduce(TEST_OBJECT_REDUCER));
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().onBackpressureReduce(TEST_OBJECT_REDUCER));
+    }
+}

From e0122a4c264761ae9eaf969740acf17a0678ad7b Mon Sep 17 00:00:00 2001
From: Andrey <andy.imsg@gmail.com>
Date: Thu, 10 Dec 2020 00:52:30 +0300
Subject: [PATCH 191/665] 3.x: Add onBackpressureReduce operator (#7129)

* onBackpressureReduce operator added

* onBackpressureReduce operator added

* onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator added

* 3.x: onBackpressureReduce operator

* 3.x: onBackpressureReduce operator

* 3.x: onBackpressureReduce operator

* 3.x: onBackpressureReduce operator

* 3.x: add onBackpressureReduce operator

* 3.x: add onBackpressureReduce operator

* 3.x: add onBackpressureReduce operator
---
 .../io/reactivex/rxjava3/core/Flowable.java   |  43 +++
 ...tractBackpressureThrottlingSubscriber.java |  19 +-
 .../FlowableOnBackpressureLatest.java         |   2 +-
 .../FlowableOnBackpressureReduce.java         |  11 +-
 .../FlowableOnBackpressureReduceWith.java     |  83 +++++
 .../FlowableOnBackpressureReduceTest.java     |   5 +-
 .../FlowableOnBackpressureReduceWithTest.java | 307 ++++++++++++++++++
 7 files changed, 452 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 7aa9c277a8..62879af477 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -12707,9 +12707,52 @@ public final Flowable<T> onBackpressureLatest() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Flowable<T> onBackpressureReduce(@NonNull BiFunction<T, T, T> reducer) {
+        Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new FlowableOnBackpressureReduce<>(this, reducer));
     }
 
+    /**
+     * Reduces upstream values into an aggregate value, provided by a supplier and combined via a reducer function,
+     * while the downstream is not ready to receive items, then emits this aggregate value when the downstream becomes ready.
+     * <p>
+     * <img width="640" height="315" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.onBackpressureReduce.ff.png" alt="">
+     * <p>
+     * Note that even if the downstream is ready to receive an item, the upstream item will always be aggregated into the output type,
+     * calling both the supplier and the reducer to produce the output value.
+     * <p>
+     * Note that if the current {@code Flowable} does support backpressure, this operator ignores that capability
+     * and doesn't propagate any backpressure requests from downstream.
+     * <p>
+     * Note that due to the nature of how backpressure requests are propagated through subscribeOn/observeOn,
+     * requesting more than 1 from downstream doesn't guarantee a continuous delivery of {@code onNext} events.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
+     *  manner (i.e., not applying backpressure to it).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onBackpressureReduce} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param supplier the factory to call to create new item of type R to pass it as the first argument to {@code reducer}.
+     * It is called when previous returned value by {@code reducer} already sent to downstream or the very first update from upstream received.
+     * @param reducer the bi-function to call to reduce excessive updates which downstream is not ready to receive.
+     * The first argument of type R is the object returned by {@code supplier} or result of previous {@code reducer} invocation.
+     * The second argument of type T is the current update from upstream.
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code supplier} or {@code reducer} is {@code null}
+     * @see #onBackpressureReduce(BiFunction)
+     * @since 3.0.9 - experimental
+     */
+    @Experimental
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final <R> Flowable<R> onBackpressureReduce(@NonNull Supplier<R> supplier, @NonNull BiFunction<R, ? super T, R> reducer) {
+        Objects.requireNonNull(supplier, "supplier is null");
+        Objects.requireNonNull(reducer, "reducer is null");
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureReduceWith<>(this, supplier, reducer));
+    }
+
     /**
      * Returns a {@code Flowable} instance that if the current {@code Flowable} emits an error, it will emit an {@code onComplete}
      * and swallow the throwable.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
index e51d870828..f04c0183ce 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
@@ -28,11 +28,12 @@
  * Abstract base class for operators that throttle excessive updates from upstream in case if
  * downstream {@link Subscriber} is not ready to receive updates
  *
- * @param <T> the upstream and downstream value type
+ * @param <T> the upstream value type
+ * @param <R> the downstream value type
  */
-abstract class AbstractBackpressureThrottlingSubscriber<T> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
+abstract class AbstractBackpressureThrottlingSubscriber<T, R> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
 
-    final Subscriber<? super T> downstream;
+    final Subscriber<? super R> downstream;
 
     Subscription upstream;
 
@@ -43,9 +44,9 @@ abstract class AbstractBackpressureThrottlingSubscriber<T> extends AtomicInteger
 
     final AtomicLong requested = new AtomicLong();
 
-    final AtomicReference<T> current = new AtomicReference<>();
+    final AtomicReference<R> current = new AtomicReference<>();
 
-    AbstractBackpressureThrottlingSubscriber(Subscriber<? super T> downstream) {
+    AbstractBackpressureThrottlingSubscriber(Subscriber<? super R> downstream) {
         this.downstream = downstream;
     }
 
@@ -98,17 +99,17 @@ void drain() {
         if (getAndIncrement() != 0) {
             return;
         }
-        final Subscriber<? super T> a = downstream;
+        final Subscriber<? super R> a = downstream;
         int missed = 1;
         final AtomicLong r = requested;
-        final AtomicReference<T> q = current;
+        final AtomicReference<R> q = current;
 
         for (;;) {
             long e = 0L;
 
             while (e != r.get()) {
                 boolean d = done;
-                T v = q.getAndSet(null);
+                R v = q.getAndSet(null);
                 boolean empty = v == null;
 
                 if (checkTerminated(d, empty, a, q)) {
@@ -139,7 +140,7 @@ void drain() {
         }
     }
 
-    boolean checkTerminated(boolean d, boolean empty, Subscriber<?> a, AtomicReference<T> q) {
+    boolean checkTerminated(boolean d, boolean empty, Subscriber<?> a, AtomicReference<R> q) {
         if (cancelled) {
             q.lazySet(null);
             return true;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
index c28aa4c9b1..cbbca5c9f2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
@@ -27,7 +27,7 @@ protected void subscribeActual(Subscriber<? super T> s) {
         source.subscribe(new BackpressureLatestSubscriber<>(s));
     }
 
-    static final class BackpressureLatestSubscriber<T> extends AbstractBackpressureThrottlingSubscriber<T> {
+    static final class BackpressureLatestSubscriber<T> extends AbstractBackpressureThrottlingSubscriber<T, T> {
 
         private static final long serialVersionUID = 163080509307634843L;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
index e4db04b83f..708070f60c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.flowable;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
@@ -24,23 +25,23 @@ public final class FlowableOnBackpressureReduce<T> extends AbstractFlowableWithU
 
     final BiFunction<T, T, T> reducer;
 
-    public FlowableOnBackpressureReduce(Flowable<T> source, BiFunction<T, T, T> reducer) {
+    public FlowableOnBackpressureReduce(@NonNull Flowable<T> source, @NonNull  BiFunction<T, T, T> reducer) {
         super(source);
-        this.reducer = Objects.requireNonNull(reducer, "reducer is null");
+        this.reducer = reducer;
     }
 
     @Override
-    protected void subscribeActual(Subscriber<? super T> s) {
+    protected void subscribeActual(@NonNull Subscriber<? super T> s) {
         source.subscribe(new BackpressureReduceSubscriber<>(s, reducer));
     }
 
-    static final class BackpressureReduceSubscriber<T> extends AbstractBackpressureThrottlingSubscriber<T> {
+    static final class BackpressureReduceSubscriber<T> extends AbstractBackpressureThrottlingSubscriber<T, T> {
 
         private static final long serialVersionUID = 821363947659780367L;
 
         final BiFunction<T, T, T> reducer;
 
-        BackpressureReduceSubscriber(Subscriber<? super T> downstream, BiFunction<T, T, T> reducer) {
+        BackpressureReduceSubscriber(@NonNull Subscriber<? super T> downstream, @NonNull BiFunction<T, T, T> reducer) {
             super(downstream);
             this.reducer = reducer;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java
new file mode 100644
index 0000000000..064b952377
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.functions.Supplier;
+import org.reactivestreams.Subscriber;
+
+import java.util.Objects;
+
+public final class FlowableOnBackpressureReduceWith<T, R> extends AbstractFlowableWithUpstream<T, R> {
+
+    final BiFunction<R, ? super T, R> reducer;
+    final Supplier<R> supplier;
+
+    public FlowableOnBackpressureReduceWith(@NonNull Flowable<T> source,
+                                            @NonNull Supplier<R> supplier,
+                                            @NonNull BiFunction<R, ? super T, R> reducer) {
+        super(source);
+        this.reducer = reducer;
+        this.supplier = supplier;
+    }
+
+    @Override
+    protected void subscribeActual(@NonNull Subscriber<? super R> s) {
+        source.subscribe(new BackpressureReduceWithSubscriber<>(s, supplier, reducer));
+    }
+
+    static final class BackpressureReduceWithSubscriber<T, R> extends AbstractBackpressureThrottlingSubscriber<T, R> {
+
+        private static final long serialVersionUID = 8255923705960622424L;
+
+        final BiFunction<R, ? super T, R> reducer;
+        final Supplier<R> supplier;
+
+        BackpressureReduceWithSubscriber(@NonNull Subscriber<? super R> downstream,
+                                         @NonNull Supplier<R> supplier,
+                                         @NonNull BiFunction<R, ? super T, R> reducer) {
+            super(downstream);
+            this.reducer = reducer;
+            this.supplier = supplier;
+        }
+
+        @Override
+        public void onNext(T t) {
+            R v = current.get();
+            try {
+                if (v == null) {
+                    current.lazySet(Objects.requireNonNull(
+                            reducer.apply(Objects.requireNonNull(supplier.get(), "The supplier returned a null value"), t),
+                            "The reducer returned a null value"
+                    ));
+                } else if ((v = current.getAndSet(null)) != null) {
+                    current.lazySet(Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"));
+                } else {
+                    current.lazySet(Objects.requireNonNull(
+                            reducer.apply(Objects.requireNonNull(supplier.get(), "The supplier returned a null value"), t),
+                            "The reducer returned a null value"
+                    ));
+                }
+            } catch (Throwable ex) {
+                Exceptions.throwIfFatal(ex);
+                onError(ex);
+                cancel();
+            }
+            drain();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
index 53d258db9e..67436322ef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
@@ -25,7 +25,6 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
 
@@ -203,13 +202,13 @@ public void exceptionFromReducer() {
         PublishProcessor<Integer> source = PublishProcessor.create();
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0);
         source.onBackpressureReduce((l, r) -> {
-            throw new IOException("Test exception");
+            throw new TestException("Test exception");
         }).subscribe(ts);
 
         source.onNext(1);
         source.onNext(2);
 
-        TestHelper.assertError(ts.errors(), 0, IOException.class, "Test exception");
+        TestHelper.assertError(ts.errors(), 0, TestException.class, "Test exception");
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java
new file mode 100644
index 0000000000..4dec546044
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java
@@ -0,0 +1,307 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.flowable;
+
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.BiFunction;
+import io.reactivex.rxjava3.functions.Supplier;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+
+public class FlowableOnBackpressureReduceWithTest extends RxJavaTest {
+
+    private static <T> BiFunction<List<T>, T, List<T>> createTestReducer() {
+        return (list, number) -> {
+            list.add(number);
+            return list;
+        };
+    }
+
+    private static <T> Supplier<List<T>> createTestSupplier() {
+        return ArrayList::new;
+    }
+
+    @Test
+    public void simple() {
+        TestSubscriberEx<List<Integer>> ts = new TestSubscriberEx<>();
+
+        Flowable.range(1, 5).onBackpressureReduce(createTestSupplier(), createTestReducer()).subscribe(ts);
+
+        ts.assertNoErrors();
+        ts.assertTerminated();
+        ts.assertValues(
+                Collections.singletonList(1),
+                Collections.singletonList(2),
+                Collections.singletonList(3),
+                Collections.singletonList(4),
+                Collections.singletonList(5)
+        );
+    }
+
+    @Test
+    public void simpleError() {
+        TestSubscriberEx<List<Integer>> ts = new TestSubscriberEx<>();
+
+        Flowable.range(1, 5).concatWith(Flowable.error(new TestException()))
+                .onBackpressureReduce(createTestSupplier(), createTestReducer()).subscribe(ts);
+
+        ts.assertTerminated();
+        ts.assertError(TestException.class);
+        ts.assertValues(
+                Collections.singletonList(1),
+                Collections.singletonList(2),
+                Collections.singletonList(3),
+                Collections.singletonList(4),
+                Collections.singletonList(5)
+        );
+    }
+
+    @Test
+    public void simpleBackpressure() {
+        TestSubscriberEx<List<Integer>> ts = new TestSubscriberEx<>(2L);
+
+        Flowable.range(1, 5).onBackpressureReduce(createTestSupplier(), createTestReducer()).subscribe(ts);
+
+        ts.assertNoErrors();
+        ts.assertValues(
+                Collections.singletonList(1),
+                Collections.singletonList(2)
+        );
+        ts.assertNotComplete();
+    }
+
+    @Test
+    public void synchronousDrop() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<List<Integer>> ts = new TestSubscriberEx<>(0L);
+
+        source.onBackpressureReduce(createTestSupplier(), createTestReducer()).subscribe(ts);
+
+        ts.assertNoValues();
+
+        source.onNext(1);
+        ts.request(2);
+
+        ts.assertValues(Collections.singletonList(1));
+
+        source.onNext(2);
+
+        ts.assertValues(
+                Collections.singletonList(1),
+                Collections.singletonList(2)
+        );
+
+        source.onNext(3);
+        source.onNext(4);
+        source.onNext(5);
+        source.onNext(6);
+
+        ts.request(2);
+
+        ts.assertValues(
+                Collections.singletonList(1),
+                Collections.singletonList(2),
+                Arrays.asList(3, 4, 5, 6)
+        );
+
+        source.onNext(7);
+
+        ts.assertValues(
+                Collections.singletonList(1),
+                Collections.singletonList(2),
+                Arrays.asList(3, 4, 5, 6),
+                Collections.singletonList(7)
+        );
+
+        source.onNext(8);
+        source.onNext(9);
+        source.onComplete();
+
+        ts.request(1);
+
+        ts.assertValues(
+                Collections.singletonList(1),
+                Collections.singletonList(2),
+                Arrays.asList(3, 4, 5, 6),
+                Collections.singletonList(7),
+                Arrays.asList(8, 9)
+        );
+        ts.assertNoErrors();
+        ts.assertTerminated();
+    }
+
+    private <T> TestSubscriberEx<T> createDelayedSubscriber() {
+        return new TestSubscriberEx<T>(1L) {
+            final Random rnd = new Random();
+
+            @Override
+            public void onNext(T t) {
+                super.onNext(t);
+                if (rnd.nextDouble() < 0.001) {
+                    try {
+                        Thread.sleep(1);
+                    } catch (InterruptedException ex) {
+                        ex.printStackTrace();
+                    }
+                }
+                request(1);
+            }
+        };
+    }
+
+    private <T> void assertValuesDropped(TestSubscriberEx<T> ts, int totalValues) {
+        int n = ts.values().size();
+        System.out.println("testAsynchronousDrop -> " + n);
+        Assert.assertTrue("All events received?", n < totalValues);
+    }
+
+    private void assertIncreasingSequence(TestSubscriberEx<Integer> ts) {
+        int previous = 0;
+        for (Integer current : ts.values()) {
+            Assert.assertTrue("The sequence must be increasing [current value=" + previous +
+                    ", previous value=" + current + "]", previous <= current);
+            previous = current;
+        }
+    }
+
+    @Test
+    public void asynchronousDrop() {
+        TestSubscriberEx<Integer> ts = createDelayedSubscriber();
+        int m = 100000;
+        Flowable.range(1, m)
+                .subscribeOn(Schedulers.computation())
+                .onBackpressureReduce((Supplier<List<Integer>>) Collections::emptyList, (list, current) -> {
+                    //in that case it works like onBackpressureLatest
+                    //the output sequence of number must be increasing
+                    return Collections.singletonList(current);
+                })
+                .observeOn(Schedulers.io())
+                .concatMap(Flowable::fromIterable)
+                .subscribe(ts);
+
+        ts.awaitDone(2, TimeUnit.SECONDS);
+        ts.assertTerminated();
+        assertValuesDropped(ts, m);
+        assertIncreasingSequence(ts);
+    }
+
+    @Test
+    public void asynchronousDrop2() {
+        TestSubscriberEx<Long> ts = createDelayedSubscriber();
+        int m = 100000;
+        Flowable.rangeLong(1, m)
+                .subscribeOn(Schedulers.computation())
+                .onBackpressureReduce(createTestSupplier(), createTestReducer())
+                .observeOn(Schedulers.io())
+                .concatMap(list -> Flowable.just(list.stream().reduce(Long::sum).orElseThrow(() -> {
+                    throw new IllegalArgumentException("No value in list");
+                })))
+                .subscribe(ts);
+
+        ts.awaitDone(2, TimeUnit.SECONDS);
+        ts.assertTerminated();
+        assertValuesDropped(ts, m);
+        long sum = 0;
+        for (Long i : ts.values()) {
+            sum += i;
+        }
+        //sum = (A1 + An) * n / 2 = 100_001 * 50_000 = 50_000_00000 + 50_000 = 50_000_50_000
+        Assert.assertEquals("Wrong sum: " + sum, 5000050000L, sum);
+    }
+
+    @Test
+    public void nullPointerFromReducer() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<List<Integer>> ts = new TestSubscriberEx<>(0L);
+        source.onBackpressureReduce(createTestSupplier(), (BiFunction<List<Integer>, ? super Integer, List<Integer>>) (list, number) -> null).subscribe(ts);
+
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(ts.errors(), 0, NullPointerException.class, "The reducer returned a null value");
+    }
+
+    @Test
+    public void nullPointerFromSupplier() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<List<Integer>> ts = new TestSubscriberEx<>(0L);
+        source.onBackpressureReduce(() -> null, createTestReducer()).subscribe(ts);
+
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(ts.errors(), 0, NullPointerException.class, "The supplier returned a null value");
+    }
+
+    @Test
+    public void exceptionFromReducer() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<List<Integer>> ts = new TestSubscriberEx<>(0L);
+        source.onBackpressureReduce(createTestSupplier(), (BiFunction<List<Integer>, ? super Integer, List<Integer>>) (l, r) -> {
+            throw new TestException("Test exception");
+        }).subscribe(ts);
+
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(ts.errors(), 0, TestException.class, "Test exception");
+    }
+
+    @Test
+    public void exceptionFromSupplier() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<List<Integer>> ts = new TestSubscriberEx<>(0L);
+        source.onBackpressureReduce(() -> {
+            throw new TestException("Test exception");
+        }, createTestReducer()).subscribe(ts);
+
+        source.onNext(1);
+        source.onNext(2);
+
+        TestHelper.assertError(ts.errors(), 0, TestException.class, "Test exception");
+    }
+
+    @Test
+    public void doubleOnSubscribe() {
+        TestHelper.checkDoubleOnSubscribeFlowable(f -> f.onBackpressureReduce(createTestSupplier(), createTestReducer()));
+    }
+
+    @Test
+    public void take() {
+        Flowable.just(1, 2)
+                .onBackpressureReduce(createTestSupplier(), createTestReducer())
+                .take(1)
+                .test()
+                .assertResult(Collections.singletonList(1));
+    }
+
+    @Test
+    public void dispose() {
+        TestHelper.checkDisposed(Flowable.never().onBackpressureReduce(createTestSupplier(), createTestReducer()));
+    }
+
+    @Test
+    public void badRequest() {
+        TestHelper.assertBadRequestReported(Flowable.never().onBackpressureReduce(createTestSupplier(), createTestReducer()));
+    }
+}

From dde2c0e7b0435b4195d02699ef4c8f8d666480e2 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Thu, 10 Dec 2020 11:41:30 +0100
Subject: [PATCH 192/665] Fix code style

---
 .../java/io/reactivex/rxjava3/core/Flowable.java     | 12 ++++++++----
 .../AbstractBackpressureThrottlingSubscriber.java    |  7 ++++---
 .../flowable/FlowableOnBackpressureReduceTest.java   |  8 ++++----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 62879af477..13a7e52b51 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -12696,10 +12696,12 @@ public final Flowable<T> onBackpressureLatest() {
      *  <dd>{@code onBackpressureReduce} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @param reducer the bi-function to call when there is more than one non-emitted value to downstream,
-     * the first argument of the bi-function is previous item and the second one is currently emitting from upstream
+     *                 the first argument of the bi-function is previous item and the second one is currently
+     *                 emitting from upstream
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code reducer} is {@code null}
      * @since 3.0.9 - experimental
+     * @see #onBackpressureReduce(Supplier, BiFunction)
      */
     @Experimental
     @CheckReturnValue
@@ -12732,11 +12734,13 @@ public final Flowable<T> onBackpressureReduce(@NonNull BiFunction<T, T, T> reduc
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureReduce} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
+     * @param <R> the aggregate type emitted when the downstream requests more items
      * @param supplier the factory to call to create new item of type R to pass it as the first argument to {@code reducer}.
-     * It is called when previous returned value by {@code reducer} already sent to downstream or the very first update from upstream received.
+     *                 It is called when previous returned value by {@code reducer} already sent to
+     *                 downstream or the very first update from upstream received.
      * @param reducer the bi-function to call to reduce excessive updates which downstream is not ready to receive.
-     * The first argument of type R is the object returned by {@code supplier} or result of previous {@code reducer} invocation.
-     * The second argument of type T is the current update from upstream.
+     *                The first argument of type R is the object returned by {@code supplier} or result of previous
+     *                {@code reducer} invocation. The second argument of type T is the current update from upstream.
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code supplier} or {@code reducer} is {@code null}
      * @see #onBackpressureReduce(BiFunction)
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
index f04c0183ce..36ba2992cf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
@@ -16,7 +16,6 @@
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
-import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
@@ -26,13 +25,15 @@
 
 /**
  * Abstract base class for operators that throttle excessive updates from upstream in case if
- * downstream {@link Subscriber} is not ready to receive updates
+ * downstream {@link Subscriber} is not ready to receive updates.
  *
  * @param <T> the upstream value type
  * @param <R> the downstream value type
  */
 abstract class AbstractBackpressureThrottlingSubscriber<T, R> extends AtomicInteger implements FlowableSubscriber<T>, Subscription {
 
+    private static final long serialVersionUID = -5050301752721603566L;
+
     final Subscriber<? super R> downstream;
 
     Subscription upstream;
@@ -60,7 +61,7 @@ public void onSubscribe(Subscription s) {
     }
 
     @Override
-    abstract public void onNext(T t);
+    public abstract void onNext(T t);
 
     @Override
     public void onError(Throwable t) {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
index 67436322ef..e74b6af8af 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
@@ -87,9 +87,9 @@ public void synchronousDrop() {
         ts.assertValues(1, 2);
 
         source.onNext(3);
-        source.onNext(4);//3 + 4 + 50 == 57
-        source.onNext(5);//57 + 5 + 50 == 112
-        source.onNext(6);//112 + 6 + 50 == 168
+        source.onNext(4); //3 + 4 + 50 == 57
+        source.onNext(5); //57 + 5 + 50 == 112
+        source.onNext(6); //112 + 6 + 50 == 168
 
         ts.request(2);
 
@@ -100,7 +100,7 @@ public void synchronousDrop() {
         ts.assertValues(1, 2, 168, 7);
 
         source.onNext(8);
-        source.onNext(9);//8 + 9 + 50 == 67
+        source.onNext(9); //8 + 9 + 50 == 67
         source.onComplete();
 
         ts.request(1);

From 17ba82c4ab9f9d4cc66f8dfd90b6930d1ac9aaeb Mon Sep 17 00:00:00 2001
From: Jean Lecordier <47030586+jlecordier@users.noreply.github.com>
Date: Mon, 14 Dec 2020 07:22:05 +0100
Subject: [PATCH 193/665] adding 1.x 2.x 3.x javadoc to wiki sidebar (#7133)

* fix javadoc url from 2.x to 3.x

* using suggested fix by reviewer
---
 docs/_Sidebar.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/_Sidebar.md b/docs/_Sidebar.md
index 32e201fc46..22961acec3 100644
--- a/docs/_Sidebar.md
+++ b/docs/_Sidebar.md
@@ -27,6 +27,6 @@
 * [Writing operators](https://github.com/ReactiveX/RxJava/wiki/Writing-operators-for-2.0)
 * [Backpressure](https://github.com/ReactiveX/RxJava/wiki/Backpressure-(2.0))
   * [another explanation](https://github.com/ReactiveX/RxJava/wiki/Backpressure)
-* [JavaDoc](http://reactivex.io/RxJava/2.x/javadoc)
+* JavaDoc: [1.x](http://reactivex.io/RxJava/1.x/javadoc), [2.x](http://reactivex.io/RxJava/2.x/javadoc), [3.x](http://reactivex.io/RxJava/3.x/javadoc)
 * [Coming from RxJava 1](https://github.com/ReactiveX/RxJava/wiki/What's-different-in-2.0)
 * [Additional Reading](https://github.com/ReactiveX/RxJava/wiki/Additional-Reading)

From 0811a65aabbf40ef2bc2392c38193507a0eb9801 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 15 Dec 2020 08:58:55 +0100
Subject: [PATCH 194/665] Bump guava from 30.0-jre to 30.1-jre (#7134)

Bumps [guava](https://github.com/google/guava) from 30.0-jre to 30.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b371aea34f..894364b0f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
   ext.mockitoVersion = "3.6.28"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.2"
-  ext.guavaVersion = "30.0-jre"
+  ext.guavaVersion = "30.1-jre"
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.2"
   ext.licenseVersion = "0.15.0"

From ad50bcda192a2e73ad1fc3532ac27362d50dc898 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Wed, 30 Dec 2020 19:39:43 +0100
Subject: [PATCH 195/665] Bump build-info-extractor-gradle from 4.18.2 to
 4.18.3 (#7140)

Bumps build-info-extractor-gradle from 4.18.2 to 4.18.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 894364b0f0..09a68fa151 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.2"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.18.2"
+  ext.jfrogExtractorVersion = "4.18.3"
   ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
 

From b75c1858b7c223a06b20c090ae86bf4976867e90 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 5 Jan 2021 08:21:51 +0100
Subject: [PATCH 196/665] Bump mockito-core from 3.6.28 to 3.7.0 (#7141)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.6.28 to 3.7.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.6.28...v3.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 09a68fa151..9379b48d8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13.1"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.6.28"
+  ext.mockitoVersion = "3.7.0"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.2"
   ext.guavaVersion = "30.1-jre"

From a55f43e9f3d82091cb0266179afead151361b00d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 8 Jan 2021 11:05:10 +0100
Subject: [PATCH 197/665] 3.x: Update marbles of amb(), ambArray() and
 ambWith() (#7144)

* 3.x: Update marbles of amb(), ambArray() and ambWith()

* Fix image size
---
 .../io/reactivex/rxjava3/core/Flowable.java   | 31 +++++++++++++++++--
 .../io/reactivex/rxjava3/core/Observable.java | 31 +++++++++++++++++--
 2 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 13a7e52b51..89de8993ae 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -163,13 +163,21 @@ public abstract class Flowable<@NonNull T> implements Publisher<T> {
      * Mirrors the one {@link Publisher} in an {@link Iterable} of several {@code Publisher}s that first either emits an item or sends
      * a termination notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
+     * <img width="640" height="417" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.amb.png" alt="">
+     * <p>
+     * When one of the {@code Publisher}s signal an item or terminates first, all subscriptions to the other
+     * {@code Publisher}s are canceled.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with backpressure which is determined by the winning
      *  {@code Publisher}'s backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code amb} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>
+     *     If any of the losing {@code Publisher}s signals an error, the error is routed to the global
+     *     error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  </dd>
      * </dl>
      *
      * @param <T> the common element type
@@ -193,13 +201,21 @@ public static <T> Flowable<T> amb(@NonNull Iterable<@NonNull ? extends Publisher
      * Mirrors the one {@link Publisher} in an array of several {@code Publisher}s that first either emits an item or sends
      * a termination notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
+     * <img width="640" height="417" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.ambArray.png" alt="">
+     * <p>
+     * When one of the {@code Publisher}s signal an item or terminates first, all subscriptions to the other
+     * {@code Publisher}s are canceled.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with backpressure which is determined by the winning
      *  {@code Publisher}'s backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambArray} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>
+     *     If any of the losing {@code Publisher}s signals an error, the error is routed to the global
+     *     error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  </dd>
      * </dl>
      *
      * @param <T> the common element type
@@ -5927,13 +5943,22 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
      * Mirrors the {@link Publisher} (current or provided) that first either emits an item or sends a termination
      * notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
+     * <img width="640" height="376" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.ambWith.png" alt="">
+     * <p>
+     * When the current {@code Flowable} signals an item or terminates first, the subscription to the other
+     * {@code Publisher} is canceled. If the other {@code Publisher} signals an item or terminates first,
+     * the subscription to the current {@code Flowable} is canceled.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator itself doesn't interfere with backpressure which is determined by the winning
      *  {@code Publisher}'s backpressure behavior.</dd>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>
+     *     If the losing {@code Publisher} signals an error, the error is routed to the global
+     *     error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  </dd>
      * </dl>
      *
      * @param other
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index a1e34e9309..7fe071a5b2 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -105,10 +105,18 @@ public abstract class Observable<@NonNull T> implements ObservableSource<T> {
      * Mirrors the one {@link ObservableSource} in an {@link Iterable} of several {@code ObservableSource}s that first either emits an item or sends
      * a termination notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
+     * <img width="640" height="505" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.amb.png" alt="">
+     * <p>
+     * When one of the {@code ObservableSource}s signal an item or terminates first, all subscriptions to the other
+     * {@code ObservableSource}s are disposed.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code amb} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>
+     *     If any of the losing {@code ObservableSource}s signals an error, the error is routed to the global
+     *     error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  </dd>
      * </dl>
      *
      * @param <T> the common element type
@@ -131,10 +139,18 @@ public static <T> Observable<T> amb(@NonNull Iterable<@NonNull ? extends Observa
      * Mirrors the one {@link ObservableSource} in an array of several {@code ObservableSource}s that first either emits an item or sends
      * a termination notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/amb.v3.png" alt="">
+     * <img width="640" height="505" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.ambArray.png" alt="">
+     * <p>
+     * When one of the {@code ObservableSource}s signal an item or terminates first, all subscriptions to the other
+     * {@code ObservableSource}s are disposed.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambArray} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>
+     *     If any of the losing {@code ObservableSource}s signals an error, the error is routed to the global
+     *     error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  </dd>
      * </dl>
      *
      * @param <T> the common element type
@@ -5350,10 +5366,19 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
      * Mirrors the current {@code Observable} or the other {@link ObservableSource} provided of which the first either emits an item or sends a termination
      * notification.
      * <p>
-     * <img width="640" height="385" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/ambWith.o.v3.png" alt="">
+     * <img width="640" height="448" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.ambWith.png" alt="">
+     * <p>
+     * When the current {@code Observable} signals an item or terminates first, the subscription to the other
+     * {@code ObservableSource} is disposed. If the other {@code ObservableSource} signals an item or terminates first,
+     * the subscription to the current {@code Observable} is disposed.
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code ambWith} does not operate by default on a particular {@link Scheduler}.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>
+     *     If the losing {@code ObservableSource} signals an error, the error is routed to the global
+     *     error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  </dd>
      * </dl>
      *
      * @param other

From 54850d0d344434022070fb034cdb7bda59b17b2b Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 8 Jan 2021 11:23:02 +0100
Subject: [PATCH 198/665] 3.x: Fix take() mentioning the old limit() operator
 (#7145)

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 89de8993ae..4d6afb2249 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -16436,8 +16436,8 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
     }
 
     /**
-     * Returns a {@code Flowable} that emits only the first {@code count} items emitted by the current {@code Flowable}. If the source emits fewer than
-     * {@code count} items then all of its items are emitted.
+     * Returns a {@code Flowable} that emits only the first {@code count} items emitted by the current {@code Flowable}.
+     * If the source emits fewer than {@code count} items then all of its items are emitted.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/take.v3.png" alt="">
      * <p>
@@ -16450,15 +16450,15 @@ public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super
      * possibly prevent the creation of excess items by the upstream.
      * <p>
      * The operator requests at most the given {@code count} of items from upstream even
-     * if the downstream requests more than that. For example, given a {@code limit(5)},
+     * if the downstream requests more than that. For example, given a {@code take(5)},
      * if the downstream requests 1, a request of 1 is submitted to the upstream
      * and the operator remembers that only 4 items can be requested now on. A request
      * of 5 at this point will request 4 from the upstream and any subsequent requests will
      * be ignored.
      * <p>
-     * Note that requests are negotiated on an operator boundary and {@code limit}'s amount
+     * Note that requests are negotiated on an operator boundary and {@code take}'s amount
      * may not be preserved further upstream. For example,
-     * {@code source.observeOn(Schedulers.computation()).limit(5)} will still request the
+     * {@code source.observeOn(Schedulers.computation()).take(5)} will still request the
      * default (128) elements from the given {@code source}.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>

From e3a0302161155090b637a13d9bbce1fc6dd638fe Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 18 Jan 2021 09:44:58 +0100
Subject: [PATCH 199/665] Bump mockito-core from 3.7.0 to 3.7.7 (#7152)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.7.0 to 3.7.7.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.7.0...v3.7.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9379b48d8f..3a8cb8ddaa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13.1"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.7.0"
+  ext.mockitoVersion = "3.7.7"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.2"
   ext.guavaVersion = "30.1-jre"

From b77aa1ed55d9fc4879d25f26d128d1b6b322b265 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 19 Jan 2021 17:41:36 +0100
Subject: [PATCH 200/665] 3.x: onReduceBackpressure internals cleanup (#7151)

* 3.x: onReduceBackpressure internals cleanup

* Update FlowableOnBackpressureReduceTest.java

* Update FlowableOnBackpressureReduceWithTest.java
---
 .../FlowableOnBackpressureReduce.java         |  9 +++----
 .../FlowableOnBackpressureReduceWith.java     | 13 +++++-----
 .../FlowableOnBackpressureReduceTest.java     | 24 +++++++++++++++++++
 .../FlowableOnBackpressureReduceWithTest.java | 24 +++++++++++++++++++
 4 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
index 708070f60c..8d38e9822a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
@@ -49,19 +49,20 @@ static final class BackpressureReduceSubscriber<T> extends AbstractBackpressureT
         @Override
         public void onNext(T t) {
             T v = current.get();
+            if (v != null) {
+                v = current.getAndSet(null);
+            }
             if (v == null) {
                 current.lazySet(t);
-            } else if ((v = current.getAndSet(null)) != null) {
+            } else {
                 try {
                     current.lazySet(Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"));
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
+                    upstream.cancel();
                     onError(ex);
-                    cancel();
                     return;
                 }
-            } else {
-                current.lazySet(t);
             }
             drain();
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java
index 064b952377..904be881ec 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java
@@ -58,24 +58,23 @@ static final class BackpressureReduceWithSubscriber<T, R> extends AbstractBackpr
         @Override
         public void onNext(T t) {
             R v = current.get();
+            if (v != null) {
+                v = current.getAndSet(null);
+            }
             try {
                 if (v == null) {
                     current.lazySet(Objects.requireNonNull(
                             reducer.apply(Objects.requireNonNull(supplier.get(), "The supplier returned a null value"), t),
                             "The reducer returned a null value"
                     ));
-                } else if ((v = current.getAndSet(null)) != null) {
-                    current.lazySet(Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"));
                 } else {
-                    current.lazySet(Objects.requireNonNull(
-                            reducer.apply(Objects.requireNonNull(supplier.get(), "The supplier returned a null value"), t),
-                            "The reducer returned a null value"
-                    ));
+                    current.lazySet(Objects.requireNonNull(reducer.apply(v, t), "The reducer returned a null value"));
                 }
             } catch (Throwable ex) {
                 Exceptions.throwIfFatal(ex);
+                upstream.cancel();
                 onError(ex);
-                cancel();
+                return;
             }
             drain();
         }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
index e74b6af8af..ac1950630a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
@@ -110,6 +110,30 @@ public void synchronousDrop() {
         ts.assertTerminated();
     }
 
+    @Test
+    public void reduceBackpressuredSync() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
+
+        source.onBackpressureReduce(Integer::sum).subscribe(ts);
+
+        source.onNext(1);
+        source.onNext(2);
+        source.onNext(3);
+
+        ts.request(1);
+
+        ts.assertValuesOnly(6);
+
+        source.onNext(4);
+        source.onComplete();
+
+        ts.assertValuesOnly(6);
+
+        ts.request(1);
+        ts.assertResult(6, 4);
+    }
+
     private <T> TestSubscriberEx<T> createDelayedSubscriber() {
         return new TestSubscriberEx<T>(1L) {
             final Random rnd = new Random();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java
index 4dec546044..e0a77692ec 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java
@@ -90,6 +90,30 @@ public void simpleBackpressure() {
         ts.assertNotComplete();
     }
 
+    @Test
+    public void reduceBackpressuredSync() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
+
+        source.onBackpressureReduce(() -> 0, Integer::sum).subscribe(ts);
+
+        source.onNext(1);
+        source.onNext(2);
+        source.onNext(3);
+
+        ts.request(1);
+
+        ts.assertValuesOnly(6);
+
+        source.onNext(4);
+        source.onComplete();
+
+        ts.assertValuesOnly(6);
+
+        ts.request(1);
+        ts.assertResult(6, 4);
+    }
+
     @Test
     public void synchronousDrop() {
         PublishProcessor<Integer> source = PublishProcessor.create();

From af297c444dd54af6b335275dac2149bc514acc8e Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 19 Jan 2021 18:23:31 +0100
Subject: [PATCH 201/665] 3.x: Schedulers.from vs. RejectedExecutionException
 (#7150)

---
 .../rxjava3/schedulers/Schedulers.java        | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 4d4c3517a5..ad7ff69bc7 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -340,6 +340,16 @@ public static Scheduler single() {
      * }
      * </code></pre>
      * <p>
+     * Note that the provided {@code Executor} should avoid throwing a {@link RejectedExecutionException}
+     * (for example, by shutting it down prematurely or using a bounded-queue {@code ExecutorService})
+     * because such circumstances prevent RxJava from progressing flow-related activities correctly.
+     * If the {@link Executor#execute(Runnable)} or {@link ExecutorService#submit(Callable)} throws,
+     * the {@code RejectedExecutionException} is routed to the global error handler via
+     * {@link RxJavaPlugins#onError(Throwable)}. To avoid shutdown-reladed problems, it is recommended
+     * all flows using the returned {@code Scheduler} to be canceled/disposed before the underlying
+     * {@code Executor} is shut down. To avoid problems due to the {@code Executor} having a bounded-queue,
+     * it is recommended to rephrase the flow to utilize backpressure as the means to limit outstanding work.
+     * <p>
      * This type of scheduler is less sensitive to leaking {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} instances, although
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
@@ -404,6 +414,16 @@ public static Scheduler from(@NonNull Executor executor) {
      * }
      * </code></pre>
      * <p>
+     * Note that the provided {@code Executor} should avoid throwing a {@link RejectedExecutionException}
+     * (for example, by shutting it down prematurely or using a bounded-queue {@code ExecutorService})
+     * because such circumstances prevent RxJava from progressing flow-related activities correctly.
+     * If the {@link Executor#execute(Runnable)} or {@link ExecutorService#submit(Callable)} throws,
+     * the {@code RejectedExecutionException} is routed to the global error handler via
+     * {@link RxJavaPlugins#onError(Throwable)}. To avoid shutdown-reladed problems, it is recommended
+     * all flows using the returned {@code Scheduler} to be canceled/disposed before the underlying
+     * {@code Executor} is shut down. To avoid problems due to the {@code Executor} having a bounded-queue,
+     * it is recommended to rephrase the flow to utilize backpressure as the means to limit outstanding work.
+     * <p>
      * This type of scheduler is less sensitive to leaking {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} instances, although
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
@@ -474,6 +494,16 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
      * }
      * </code></pre>
      * <p>
+     * Note that the provided {@code Executor} should avoid throwing a {@link RejectedExecutionException}
+     * (for example, by shutting it down prematurely or using a bounded-queue {@code ExecutorService})
+     * because such circumstances prevent RxJava from progressing flow-related activities correctly.
+     * If the {@link Executor#execute(Runnable)} or {@link ExecutorService#submit(Callable)} throws,
+     * the {@code RejectedExecutionException} is routed to the global error handler via
+     * {@link RxJavaPlugins#onError(Throwable)}. To avoid shutdown-reladed problems, it is recommended
+     * all flows using the returned {@code Scheduler} to be canceled/disposed before the underlying
+     * {@code Executor} is shut down. To avoid problems due to the {@code Executor} having a bounded-queue,
+     * it is recommended to rephrase the flow to utilize backpressure as the means to limit outstanding work.
+     * <p>
      * This type of scheduler is less sensitive to leaking {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} instances, although
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".

From e46ce76b95653006a709f230a71768a731c7d830 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 25 Jan 2021 08:42:07 +0100
Subject: [PATCH 202/665] Bump build-info-extractor-gradle from 4.18.3 to
 4.19.0 (#7159)

Bumps build-info-extractor-gradle from 4.18.3 to 4.19.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 3a8cb8ddaa..1fb259d600 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.2"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.18.3"
+  ext.jfrogExtractorVersion = "4.19.0"
   ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
 

From e65763506e6641c4672337e0311407640f7f188d Mon Sep 17 00:00:00 2001
From: Sergio Garcia <elphake@gmail.com>
Date: Mon, 25 Jan 2021 20:09:18 +0000
Subject: [PATCH 203/665] Io Scheduler, Scheduled worker release. (#7160)

* Support for scheduled release of threads in Io Scheduler

* Test for rx3.io-scheduled-release

* Fix tests, addressed Javadoc feedback
---
 .../internal/schedulers/IoScheduler.java      | 21 ++++++--
 .../rxjava3/schedulers/Schedulers.java        | 19 +++++++
 .../schedulers/IoScheduledReleaseTest.java    | 51 +++++++++++++++++++
 3 files changed, 88 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/schedulers/IoScheduledReleaseTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
index 6d63715770..13c62fcb10 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
@@ -48,6 +48,10 @@ public final class IoScheduler extends Scheduler {
     /** The name of the system property for setting the thread priority for this Scheduler. */
     private static final String KEY_IO_PRIORITY = "rx3.io-priority";
 
+    /** The name of the system property for setting the release behaviour for this Scheduler. */
+    private static final String KEY_SCHEDULED_RELEASE = "rx3.io-scheduled-release";
+    static boolean USE_SCHEDULED_RELEASE;
+
     static final CachedWorkerPool NONE;
 
     static {
@@ -63,6 +67,8 @@ public final class IoScheduler extends Scheduler {
 
         EVICTOR_THREAD_FACTORY = new RxThreadFactory(EVICTOR_THREAD_NAME_PREFIX, priority);
 
+        USE_SCHEDULED_RELEASE = Boolean.getBoolean(KEY_SCHEDULED_RELEASE);
+
         NONE = new CachedWorkerPool(0, null, WORKER_THREAD_FACTORY);
         NONE.shutdown();
     }
@@ -194,7 +200,7 @@ public int size() {
         return pool.get().allWorkers.size();
     }
 
-    static final class EventLoopWorker extends Scheduler.Worker {
+    static final class EventLoopWorker extends Scheduler.Worker implements Runnable {
         private final CompositeDisposable tasks;
         private final CachedWorkerPool pool;
         private final ThreadWorker threadWorker;
@@ -212,11 +218,20 @@ public void dispose() {
             if (once.compareAndSet(false, true)) {
                 tasks.dispose();
 
-                // releasing the pool should be the last action
-                pool.release(threadWorker);
+                if (USE_SCHEDULED_RELEASE) {
+                    threadWorker.scheduleActual(this, 0, TimeUnit.NANOSECONDS, null);
+                } else {
+                    // releasing the pool should be the last action
+                    pool.release(threadWorker);
+                }
             }
         }
 
+        @Override
+        public void run() {
+            pool.release(threadWorker);
+        }
+
         @Override
         public boolean isDisposed() {
             return once.get();
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index ad7ff69bc7..6711be2645 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -32,6 +32,8 @@
  * <ul>
  * <li>{@code rx3.io-keep-alive-time} (long): sets the keep-alive time of the {@link #io()} Scheduler workers, default is {@link IoScheduler#KEEP_ALIVE_TIME_DEFAULT}</li>
  * <li>{@code rx3.io-priority} (int): sets the thread priority of the {@link #io()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+ * <li>{@code rx3.io-scheduled-release} (boolean): {@code true} sets the worker release mode of the
+ * {@link #io()} Scheduler to <em>scheduled</em>, default is {@code false} for <em>eager</em> mode.</li>
  * <li>{@code rx3.computation-threads} (int): sets the number of threads in the {@link #computation()} Scheduler, default is the number of available CPUs</li>
  * <li>{@code rx3.computation-priority} (int): sets the thread priority of the {@link #computation()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
  * <li>{@code rx3.newthread-priority} (int): sets the thread priority of the {@link #newThread()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
@@ -159,6 +161,8 @@ public static Scheduler computation() {
      * <ul>
      * <li>{@code rx3.io-keep-alive-time} (long): sets the keep-alive time of the {@code io()} Scheduler workers, default is {@link IoScheduler#KEEP_ALIVE_TIME_DEFAULT}</li>
      * <li>{@code rx3.io-priority} (int): sets the thread priority of the {@code io()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+     * <li>{@code rx3.io-scheduled-release} (boolean): {@code true} sets the worker release mode of the
+     * {@code #io()} Scheduler to <em>scheduled</em>, default is {@code false} for <em>eager</em> mode.</li>
      * </ul>
      * <p>
      * The default value of this scheduler can be overridden at initialization time via the
@@ -175,6 +179,21 @@ public static Scheduler computation() {
      * <p>Operators on the base reactive classes that use this scheduler are marked with the
      * &#64;{@link io.reactivex.rxjava3.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.rxjava3.annotations.SchedulerSupport#IO IO})
      * annotation.
+     * <p>
+     * When the {@link Scheduler.Worker} is disposed, the underlying worker can be released to the cached worker pool in two modes:
+     * <ul>
+     * <li>In <em>eager</em> mode (default), the underlying worker is returned immediately to the cached worker pool
+     *  and can be reused much quicker by operators. The drawback is that if the currently running task doesn't
+     * respond to interruption in time or at all, this may lead to delays or deadlock with the reuse use of the
+     * underlying worker.
+     * </li>
+     * <li>In <em>scheduled</em> mode (enabled via the system parameter {@code rx3.io-scheduled-release}
+     * set to {@code true}), the underlying worker is returned to the cached worker pool only after the currently running task
+     * has finished. This can help prevent premature reuse of the underlying worker and likely won't lead to delays or
+     * deadlock with such reuses. The drawback is that the delay in release may lead to an excess amount of underlying
+     * workers being created.
+     * </li>
+     * </ul>
      * @return a {@link Scheduler} meant for IO-bound work
      */
     @NonNull
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoScheduledReleaseTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoScheduledReleaseTest.java
new file mode 100644
index 0000000000..b845c08ae2
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoScheduledReleaseTest.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.schedulers;
+
+import io.reactivex.rxjava3.core.Completable;
+import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.schedulers.Schedulers;
+import org.junit.Test;
+
+import java.util.concurrent.TimeUnit;
+
+public class IoScheduledReleaseTest extends RxJavaTest {
+
+    /* This test will be stuck in a deadlock if IoScheduler.USE_SCHEDULED_RELEASE is not set */
+    @Test
+    public void scheduledRelease() {
+        boolean savedScheduledRelease = IoScheduler.USE_SCHEDULED_RELEASE;
+        IoScheduler.USE_SCHEDULED_RELEASE = true;
+        try {
+            Flowable.just("item")
+                    .observeOn(Schedulers.io())
+                    .firstOrError()
+                    .map(item -> {
+                        for (int i = 0; i < 50; i++) {
+                            Completable.complete()
+                                    .observeOn(Schedulers.io())
+                                    .blockingAwait();
+                        }
+                        return "Done";
+                    })
+                    .ignoreElement()
+                    .test()
+                    .awaitDone(5, TimeUnit.SECONDS)
+                    .assertComplete();
+        } finally {
+            IoScheduler.USE_SCHEDULED_RELEASE = savedScheduledRelease;
+        }
+    }
+}

From 80a4842a7603da2d1c96fc2bb16249605cde5bbd Mon Sep 17 00:00:00 2001
From: Archish Thakkar <archishthakkar@gmail.com>
Date: Tue, 26 Jan 2021 22:53:17 +0530
Subject: [PATCH 204/665] Updating documentation for scheduleActual method
 (#7164)

---
 .../rxjava3/internal/schedulers/NewThreadWorker.java          | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
index d811c8e782..a342b246b8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
@@ -116,10 +116,8 @@ public Disposable schedulePeriodicallyDirect(Runnable run, long initialDelay, lo
     }
 
     /**
-     * Wraps the given runnable into a ScheduledRunnable and schedules it
+     * Wraps and returns the given runnable into a ScheduledRunnable and schedules it
      * on the underlying ScheduledExecutorService.
-     * <p>If the schedule has been rejected, the ScheduledRunnable.wasScheduled will return
-     * false.
      * @param run the runnable instance
      * @param delayTime the time to delay the execution
      * @param unit the time unit

From 1a745a14ab4dc9c9dbdb7e11345377ef464fc432 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 27 Jan 2021 10:22:03 +0100
Subject: [PATCH 205/665] 3.x: TestScheduler option to use onSchedule hook
 (#7163)

---
 .../rxjava3/schedulers/Schedulers.java        |  3 +-
 .../rxjava3/schedulers/TestScheduler.java     | 76 +++++++++++++--
 .../rxjava3/schedulers/TestSchedulerTest.java | 92 +++++++++++++++++++
 3 files changed, 160 insertions(+), 11 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 6711be2645..72a3990af4 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -180,7 +180,8 @@ public static Scheduler computation() {
      * &#64;{@link io.reactivex.rxjava3.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.rxjava3.annotations.SchedulerSupport#IO IO})
      * annotation.
      * <p>
-     * When the {@link Scheduler.Worker} is disposed, the underlying worker can be released to the cached worker pool in two modes:
+     * When the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} is disposed,
+     * the underlying worker can be released to the cached worker pool in two modes:
      * <ul>
      * <li>In <em>eager</em> mode (default), the underlying worker is returned immediately to the cached worker pool
      *  and can be reused much quicker by operators. The drawback is that if the currently running task doesn't
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
index 3e05665283..f016beca18 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
@@ -15,20 +15,28 @@
 
 import java.util.Queue;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.Scheduler;
-import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * A special, non thread-safe scheduler for testing operators that require
  * a scheduler without introducing real concurrency and allows manually advancing
  * a virtual time.
+ * <p>
+ * By default, the tasks submitted via the various {@code schedule} methods are not
+ * wrapped by the {@link RxJavaPlugins#onSchedule(Runnable)} hook. To enable this behavior,
+ * create a {@code TestScheduler} via {@link #TestScheduler(boolean)} or {@link #TestScheduler(long, TimeUnit, boolean)}.
  */
 public final class TestScheduler extends Scheduler {
     /** The ordered queue for the runnable tasks. */
     final Queue<TimedRunnable> queue = new PriorityBlockingQueue<>(11);
+    /** Use the {@link RxJavaPlugins#onSchedule(Runnable)} hook when scheduling tasks. */
+    final boolean useOnScheduleHook;
     /** The per-scheduler global order counter. */
     long counter;
     // Storing time in nanoseconds internally.
@@ -38,7 +46,20 @@ public final class TestScheduler extends Scheduler {
      * Creates a new TestScheduler with initial virtual time of zero.
      */
     public TestScheduler() {
-        // No-op.
+        this(false);
+    }
+
+    /**
+     * Creates a new TestScheduler with the option to use the
+     * {@link RxJavaPlugins#onSchedule(Runnable)} hook when scheduling tasks.
+     * @param useOnScheduleHook if {@code true}, the tasks submitted to this
+     *                          TestScheduler is wrapped via the
+     *                          {@link RxJavaPlugins#onSchedule(Runnable)} hook
+     * @since 3.0.10 - experimental
+     */
+    @Experimental
+    public TestScheduler(boolean useOnScheduleHook) {
+        this.useOnScheduleHook = useOnScheduleHook;
     }
 
     /**
@@ -50,7 +71,27 @@ public TestScheduler() {
      *          the units of time that {@code delayTime} is expressed in
      */
     public TestScheduler(long delayTime, TimeUnit unit) {
+        this(delayTime, unit, false);
+    }
+
+    /**
+     * Creates a new TestScheduler with the specified initial virtual time
+     * and with the option to use the
+     * {@link RxJavaPlugins#onSchedule(Runnable)} hook when scheduling tasks.
+     *
+     * @param delayTime
+     *          the point in time to move the Scheduler's clock to
+     * @param unit
+     *          the units of time that {@code delayTime} is expressed in
+     * @param useOnScheduleHook if {@code true}, the tasks submitted to this
+     *                          TestScheduler is wrapped via the
+     *                          {@link RxJavaPlugins#onSchedule(Runnable)} hook
+     * @since 3.0.10 - experimental
+     */
+    @Experimental
+    public TestScheduler(long delayTime, TimeUnit unit, boolean useOnScheduleHook) {
         time = unit.toNanos(delayTime);
+        this.useOnScheduleHook = useOnScheduleHook;
     }
 
     static final class TimedRunnable implements Comparable<TimedRunnable> {
@@ -163,10 +204,13 @@ public Disposable schedule(@NonNull Runnable run, long delayTime, @NonNull TimeU
             if (disposed) {
                 return EmptyDisposable.INSTANCE;
             }
+            if (useOnScheduleHook) {
+                run = RxJavaPlugins.onSchedule(run);
+            }
             final TimedRunnable timedAction = new TimedRunnable(this, time + unit.toNanos(delayTime), run, counter++);
             queue.add(timedAction);
 
-            return Disposable.fromRunnable(new QueueRemove(timedAction));
+            return new QueueRemove(timedAction);
         }
 
         @NonNull
@@ -175,9 +219,12 @@ public Disposable schedule(@NonNull Runnable run) {
             if (disposed) {
                 return EmptyDisposable.INSTANCE;
             }
+            if (useOnScheduleHook) {
+                run = RxJavaPlugins.onSchedule(run);
+            }
             final TimedRunnable timedAction = new TimedRunnable(this, 0, run, counter++);
             queue.add(timedAction);
-            return Disposable.fromRunnable(new QueueRemove(timedAction));
+            return new QueueRemove(timedAction);
         }
 
         @Override
@@ -185,16 +232,25 @@ public long now(@NonNull TimeUnit unit) {
             return TestScheduler.this.now(unit);
         }
 
-        final class QueueRemove implements Runnable {
-            final TimedRunnable timedAction;
+        final class QueueRemove extends AtomicReference<TimedRunnable> implements Disposable {
+
+            private static final long serialVersionUID = -7874968252110604360L;
 
             QueueRemove(TimedRunnable timedAction) {
-                this.timedAction = timedAction;
+                this.lazySet(timedAction);
+            }
+
+            @Override
+            public void dispose() {
+                TimedRunnable tr = getAndSet(null);
+                if (tr != null) {
+                    queue.remove(tr);
+                }
             }
 
             @Override
-            public void run() {
-                queue.remove(timedAction);
+            public boolean isDisposed() {
+                return get() == null;
             }
         }
     }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java
index 8bcb177053..010b271359 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java
@@ -30,6 +30,7 @@
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.TestScheduler.*;
 
 public class TestSchedulerTest extends RxJavaTest {
@@ -260,4 +261,95 @@ public void constructorTimeSetsTime() {
         assertEquals(5, ts.now(TimeUnit.SECONDS));
         assertEquals(5000, ts.now(TimeUnit.MILLISECONDS));
     }
+
+    @Test
+    public void withOnScheduleHook() {
+        AtomicInteger run = new AtomicInteger();
+        AtomicInteger counter = new AtomicInteger();
+        RxJavaPlugins.setScheduleHandler(r -> {
+            counter.getAndIncrement();
+            return r;
+        });
+        try {
+            Runnable r = () -> run.getAndIncrement();
+            TestScheduler ts = new TestScheduler(true);
+
+            ts.createWorker().schedule(r);
+            ts.createWorker().schedule(r, 1, TimeUnit.SECONDS);
+
+            ts.advanceTimeBy(1, TimeUnit.SECONDS);
+
+            assertEquals(2, run.get());
+            assertEquals(2, counter.get());
+
+            ts = new TestScheduler();
+
+            ts.createWorker().schedule(r);
+            ts.createWorker().schedule(r, 1, TimeUnit.SECONDS);
+
+            ts.advanceTimeBy(1, TimeUnit.SECONDS);
+
+            assertEquals(4, run.get());
+            assertEquals(2, counter.get());
+        } finally {
+            RxJavaPlugins.setScheduleHandler(null);
+        }
+    }
+
+    @Test
+    public void withOnScheduleHookInitialTime() {
+        AtomicInteger run = new AtomicInteger();
+        AtomicInteger counter = new AtomicInteger();
+        RxJavaPlugins.setScheduleHandler(r -> {
+            counter.getAndIncrement();
+            return r;
+        });
+        try {
+            Runnable r = () -> run.getAndIncrement();
+            TestScheduler ts = new TestScheduler(1, TimeUnit.HOURS, true);
+
+            ts.createWorker().schedule(r);
+            ts.createWorker().schedule(r, 1, TimeUnit.SECONDS);
+
+            ts.advanceTimeBy(1, TimeUnit.SECONDS);
+
+            assertEquals(2, run.get());
+            assertEquals(2, counter.get());
+
+            ts = new TestScheduler(1, TimeUnit.HOURS);
+
+            ts.createWorker().schedule(r);
+            ts.createWorker().schedule(r, 1, TimeUnit.SECONDS);
+
+            ts.advanceTimeBy(1, TimeUnit.SECONDS);
+
+            assertEquals(4, run.get());
+            assertEquals(2, counter.get());
+        } finally {
+            RxJavaPlugins.setScheduleHandler(null);
+        }
+    }
+
+    @Test
+    public void disposeWork() {
+        AtomicInteger run = new AtomicInteger();
+        Runnable r = () -> run.getAndIncrement();
+        TestScheduler ts = new TestScheduler(1, TimeUnit.HOURS, true);
+
+        Disposable d = ts.createWorker().schedule(r);
+
+        assertFalse(d.isDisposed());
+
+        d.dispose();
+
+        assertTrue(d.isDisposed());
+
+        d.dispose();
+
+        assertTrue(d.isDisposed());
+
+        ts.advanceTimeBy(1, TimeUnit.SECONDS);
+
+        assertEquals(0, run.get());
+    }
 }

From 005f1553f3089c9c81ff00087e7708185084aa7a Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 27 Jan 2021 11:46:56 +0100
Subject: [PATCH 206/665] 3.x: Improve Javadocs style of Schedulers (#7168)

---
 .../rxjava3/schedulers/Schedulers.java        | 140 +++++++++---------
 .../validators/JavadocCodesAndLinks.java      |   9 +-
 2 files changed, 78 insertions(+), 71 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 72a3990af4..5456ea1924 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -22,7 +22,7 @@
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
- * Static factory methods for returning standard Scheduler instances.
+ * Static factory methods for returning standard {@link Scheduler} instances.
  * <p>
  * The initial and runtime values of the various scheduler types can be overridden via the
  * {@code RxJavaPlugins.setInit(scheduler name)SchedulerHandler()} and
@@ -30,16 +30,16 @@
  * <p>
  * <strong>Supported system properties ({@code System.getProperty()}):</strong>
  * <ul>
- * <li>{@code rx3.io-keep-alive-time} (long): sets the keep-alive time of the {@link #io()} Scheduler workers, default is {@link IoScheduler#KEEP_ALIVE_TIME_DEFAULT}</li>
- * <li>{@code rx3.io-priority} (int): sets the thread priority of the {@link #io()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+ * <li>{@code rx3.io-keep-alive-time} (long): sets the keep-alive time of the {@link #io()} {@code Scheduler} workers, default is {@link IoScheduler#KEEP_ALIVE_TIME_DEFAULT}</li>
+ * <li>{@code rx3.io-priority} (int): sets the thread priority of the {@link #io()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
  * <li>{@code rx3.io-scheduled-release} (boolean): {@code true} sets the worker release mode of the
- * {@link #io()} Scheduler to <em>scheduled</em>, default is {@code false} for <em>eager</em> mode.</li>
- * <li>{@code rx3.computation-threads} (int): sets the number of threads in the {@link #computation()} Scheduler, default is the number of available CPUs</li>
- * <li>{@code rx3.computation-priority} (int): sets the thread priority of the {@link #computation()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
- * <li>{@code rx3.newthread-priority} (int): sets the thread priority of the {@link #newThread()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
- * <li>{@code rx3.single-priority} (int): sets the thread priority of the {@link #single()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
- * <li>{@code rx3.purge-enabled} (boolean): enables periodic purging of all Scheduler's backing thread pools, default is false</li>
- * <li>{@code rx3.purge-period-seconds} (int): specifies the periodic purge interval of all Scheduler's backing thread pools, default is 1 second</li>
+ * {@link #io()} {@code Scheduler} to <em>scheduled</em>, default is {@code false} for <em>eager</em> mode.</li>
+ * <li>{@code rx3.computation-threads} (int): sets the number of threads in the {@link #computation()} {@code Scheduler}, default is the number of available CPUs</li>
+ * <li>{@code rx3.computation-priority} (int): sets the thread priority of the {@link #computation()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
+ * <li>{@code rx3.newthread-priority} (int): sets the thread priority of the {@link #newThread()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
+ * <li>{@code rx3.single-priority} (int): sets the thread priority of the {@link #single()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
+ * <li>{@code rx3.purge-enabled} (boolean): enables periodic purging of all {@code Scheduler}'s backing thread pools, default is {@code false}</li>
+ * <li>{@code rx3.purge-period-seconds} (int): specifies the periodic purge interval of all {@code Scheduler}'s backing thread pools, default is 1 second</li>
  * </ul>
  */
 public final class Schedulers {
@@ -107,32 +107,32 @@ private Schedulers() {
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
      * <p>
-     * If the {@link RxJavaPlugins#setFailOnNonBlockingScheduler(boolean)} is set to true, attempting to execute
+     * If the {@link RxJavaPlugins#setFailOnNonBlockingScheduler(boolean)} is set to {@code true}, attempting to execute
      * operators that block while running on this scheduler will throw an {@link IllegalStateException}.
      * <p>
      * You can control certain properties of this standard scheduler via system properties that have to be set
-     * before the {@link Schedulers} class is referenced in your code.
+     * before the {@code Schedulers} class is referenced in your code.
      * <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
      * <ul>
-     * <li>{@code rx3.computation-threads} (int): sets the number of threads in the {@code computation()} Scheduler, default is the number of available CPUs</li>
-     * <li>{@code rx3.computation-priority} (int): sets the thread priority of the {@code computation()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+     * <li>{@code rx3.computation-threads} (int): sets the number of threads in the {@code computation()} {@code Scheduler}, default is the number of available CPUs</li>
+     * <li>{@code rx3.computation-priority} (int): sets the thread priority of the {@code computation()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
      * </ul>
      * <p>
      * The default value of this scheduler can be overridden at initialization time via the
      * {@link RxJavaPlugins#setInitComputationSchedulerHandler(io.reactivex.rxjava3.functions.Function)} plugin method.
      * Note that due to possible initialization cycles, using any of the other scheduler-returning methods will
-     * result in a {@code NullPointerException}.
-     * Once the {@link Schedulers} class has been initialized, you can override the returned {@link Scheduler} instance
+     * result in a {@link NullPointerException}.
+     * Once the {@code Schedulers} class has been initialized, you can override the returned {@code Scheduler} instance
      * via the {@link RxJavaPlugins#setComputationSchedulerHandler(io.reactivex.rxjava3.functions.Function)} method.
      * <p>
-     * It is possible to create a fresh instance of this scheduler with a custom ThreadFactory, via the
+     * It is possible to create a fresh instance of this scheduler with a custom {@link ThreadFactory}, via the
      * {@link RxJavaPlugins#createComputationScheduler(ThreadFactory)} method. Note that such custom
      * instances require a manual call to {@link Scheduler#shutdown()} to allow the JVM to exit or the
      * (J2EE) container to unload properly.
      * <p>Operators on the base reactive classes that use this scheduler are marked with the
      * &#64;{@link io.reactivex.rxjava3.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.rxjava3.annotations.SchedulerSupport#COMPUTATION COMPUTATION})
      * annotation.
-     * @return a {@link Scheduler} meant for computation-bound work
+     * @return a {@code Scheduler} meant for computation-bound work
      */
     @NonNull
     public static Scheduler computation() {
@@ -148,7 +148,7 @@ public static Scheduler computation() {
      * that will try to reuse previously started instances used by the worker
      * returned by {@link io.reactivex.rxjava3.core.Scheduler#createWorker()} but otherwise will start a new backing
      * {@link ScheduledExecutorService} instance. Note that this scheduler may create an unbounded number
-     * of worker threads that can result in system slowdowns or {@code OutOfMemoryError}. Therefore, for casual uses
+     * of worker threads that can result in system slowdowns or {@link OutOfMemoryError}. Therefore, for casual uses
      * or when implementing an operator, the Worker instances must be disposed via {@link io.reactivex.rxjava3.core.Scheduler.Worker#dispose()}.
      * <p>
      * It is not recommended to perform computational work on this scheduler. Use {@link #computation()} instead.
@@ -156,23 +156,23 @@ public static Scheduler computation() {
      * Unhandled errors will be delivered to the scheduler Thread's {@link java.lang.Thread.UncaughtExceptionHandler}.
      * <p>
      * You can control certain properties of this standard scheduler via system properties that have to be set
-     * before the {@link Schedulers} class is referenced in your code.
+     * before the {@code Schedulers} class is referenced in your code.
      * <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
      * <ul>
-     * <li>{@code rx3.io-keep-alive-time} (long): sets the keep-alive time of the {@code io()} Scheduler workers, default is {@link IoScheduler#KEEP_ALIVE_TIME_DEFAULT}</li>
-     * <li>{@code rx3.io-priority} (int): sets the thread priority of the {@code io()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+     * <li>{@code rx3.io-keep-alive-time} (long): sets the keep-alive time of the {@code io()} {@code Scheduler} workers, default is {@link IoScheduler#KEEP_ALIVE_TIME_DEFAULT}</li>
+     * <li>{@code rx3.io-priority} (int): sets the thread priority of the {@code io()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
      * <li>{@code rx3.io-scheduled-release} (boolean): {@code true} sets the worker release mode of the
-     * {@code #io()} Scheduler to <em>scheduled</em>, default is {@code false} for <em>eager</em> mode.</li>
+     * {@code #io()} {@code Scheduler} to <em>scheduled</em>, default is {@code false} for <em>eager</em> mode.</li>
      * </ul>
      * <p>
      * The default value of this scheduler can be overridden at initialization time via the
      * {@link RxJavaPlugins#setInitIoSchedulerHandler(io.reactivex.rxjava3.functions.Function)} plugin method.
      * Note that due to possible initialization cycles, using any of the other scheduler-returning methods will
-     * result in a {@code NullPointerException}.
-     * Once the {@link Schedulers} class has been initialized, you can override the returned {@link Scheduler} instance
+     * result in a {@link NullPointerException}.
+     * Once the {@code Schedulers} class has been initialized, you can override the returned {@code Scheduler} instance
      * via the {@link RxJavaPlugins#setIoSchedulerHandler(io.reactivex.rxjava3.functions.Function)} method.
      * <p>
-     * It is possible to create a fresh instance of this scheduler with a custom ThreadFactory, via the
+     * It is possible to create a fresh instance of this scheduler with a custom {@link ThreadFactory}, via the
      * {@link RxJavaPlugins#createIoScheduler(ThreadFactory)} method. Note that such custom
      * instances require a manual call to {@link Scheduler#shutdown()} to allow the JVM to exit or the
      * (J2EE) container to unload properly.
@@ -195,7 +195,7 @@ public static Scheduler computation() {
      * workers being created.
      * </li>
      * </ul>
-     * @return a {@link Scheduler} meant for IO-bound work
+     * @return a {@code Scheduler} meant for IO-bound work
      */
     @NonNull
     public static Scheduler io() {
@@ -214,7 +214,7 @@ public static Scheduler io() {
      * by RxJava itself but may be found in external libraries.
      * <p>
      * This scheduler can't be overridden via an {@link RxJavaPlugins} method.
-     * @return a {@link Scheduler} that queues work on the current thread
+     * @return a {@code Scheduler} that queues work on the current thread
      */
     @NonNull
     public static Scheduler trampoline() {
@@ -227,33 +227,33 @@ public static Scheduler trampoline() {
      * The default implementation of this scheduler creates a new, single-threaded {@link ScheduledExecutorService} for
      * each invocation of the {@link Scheduler#scheduleDirect(Runnable)} (plus its overloads) and {@link Scheduler#createWorker()}
      * methods, thus an unbounded number of worker threads may be created that can
-     * result in system slowdowns or {@code OutOfMemoryError}. Therefore, for casual uses or when implementing an operator,
+     * result in system slowdowns or {@link OutOfMemoryError}. Therefore, for casual uses or when implementing an operator,
      * the Worker instances must be disposed via {@link io.reactivex.rxjava3.core.Scheduler.Worker#dispose()}.
      * <p>
      * Unhandled errors will be delivered to the scheduler Thread's {@link java.lang.Thread.UncaughtExceptionHandler}.
      * <p>
      * You can control certain properties of this standard scheduler via system properties that have to be set
-     * before the {@link Schedulers} class is referenced in your code.
+     * before the {@code Schedulers} class is referenced in your code.
      * <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
      * <ul>
-     * <li>{@code rx3.newthread-priority} (int): sets the thread priority of the {@code newThread()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+     * <li>{@code rx3.newthread-priority} (int): sets the thread priority of the {@code newThread()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
      * </ul>
      * <p>
      * The default value of this scheduler can be overridden at initialization time via the
      * {@link RxJavaPlugins#setInitNewThreadSchedulerHandler(io.reactivex.rxjava3.functions.Function)} plugin method.
      * Note that due to possible initialization cycles, using any of the other scheduler-returning methods will
-     * result in a {@code NullPointerException}.
-     * Once the {@link Schedulers} class has been initialized, you can override the returned {@link Scheduler} instance
+     * result in a {@link NullPointerException}.
+     * Once the {@code Schedulers} class has been initialized, you can override the returned {@code Scheduler} instance
      * via the {@link RxJavaPlugins#setNewThreadSchedulerHandler(io.reactivex.rxjava3.functions.Function)} method.
      * <p>
-     * It is possible to create a fresh instance of this scheduler with a custom ThreadFactory, via the
+     * It is possible to create a fresh instance of this scheduler with a custom {@link ThreadFactory}, via the
      * {@link RxJavaPlugins#createNewThreadScheduler(ThreadFactory)} method. Note that such custom
      * instances require a manual call to {@link Scheduler#shutdown()} to allow the JVM to exit or the
      * (J2EE) container to unload properly.
      * <p>Operators on the base reactive classes that use this scheduler are marked with the
      * &#64;{@link io.reactivex.rxjava3.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.rxjava3.annotations.SchedulerSupport#NEW_THREAD NEW_TRHEAD})
      * annotation.
-     * @return a {@link Scheduler} that creates new threads
+     * @return a {@code Scheduler} that creates new threads
      */
     @NonNull
     public static Scheduler newThread() {
@@ -267,7 +267,7 @@ public static Scheduler newThread() {
      * Uses:
      * <ul>
      * <li>event loop</li>
-     * <li>support Schedulers.from(Executor) and from(ExecutorService) with delayed scheduling</li>
+     * <li>support {@code Schedulers.from(}{@link Executor}{@code )} and {@code from(}{@link ExecutorService}{@code )} with delayed scheduling</li>
      * <li>support benchmarks that pipeline data from some thread to another thread and
      * avoid core-bashing of computation's round-robin nature</li>
      * </ul>
@@ -278,31 +278,31 @@ public static Scheduler newThread() {
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
      * <p>
-     * If the {@link RxJavaPlugins#setFailOnNonBlockingScheduler(boolean)} is set to true, attempting to execute
+     * If the {@link RxJavaPlugins#setFailOnNonBlockingScheduler(boolean)} is set to {@code true}, attempting to execute
      * operators that block while running on this scheduler will throw an {@link IllegalStateException}.
      * <p>
      * You can control certain properties of this standard scheduler via system properties that have to be set
-     * before the {@link Schedulers} class is referenced in your code.
+     * before the {@code Schedulers} class is referenced in your code.
      * <p><strong>Supported system properties ({@code System.getProperty()}):</strong>
      * <ul>
-     * <li>{@code rx3.single-priority} (int): sets the thread priority of the {@code single()} Scheduler, default is {@link Thread#NORM_PRIORITY}</li>
+     * <li>{@code rx3.single-priority} (int): sets the thread priority of the {@code single()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
      * </ul>
      * <p>
      * The default value of this scheduler can be overridden at initialization time via the
      * {@link RxJavaPlugins#setInitSingleSchedulerHandler(io.reactivex.rxjava3.functions.Function)} plugin method.
      * Note that due to possible initialization cycles, using any of the other scheduler-returning methods will
-     * result in a {@code NullPointerException}.
-     * Once the {@link Schedulers} class has been initialized, you can override the returned {@link Scheduler} instance
+     * result in a {@link NullPointerException}.
+     * Once the {@code Schedulers} class has been initialized, you can override the returned {@code Scheduler} instance
      * via the {@link RxJavaPlugins#setSingleSchedulerHandler(io.reactivex.rxjava3.functions.Function)} method.
      * <p>
-     * It is possible to create a fresh instance of this scheduler with a custom ThreadFactory, via the
+     * It is possible to create a fresh instance of this scheduler with a custom {@link ThreadFactory}, via the
      * {@link RxJavaPlugins#createSingleScheduler(ThreadFactory)} method. Note that such custom
      * instances require a manual call to {@link Scheduler#shutdown()} to allow the JVM to exit or the
      * (J2EE) container to unload properly.
      * <p>Operators on the base reactive classes that use this scheduler are marked with the
      * &#64;{@link io.reactivex.rxjava3.annotations.SchedulerSupport SchedulerSupport}({@link io.reactivex.rxjava3.annotations.SchedulerSupport#SINGLE SINGLE})
      * annotation.
-     * @return a {@link Scheduler} that shares a single backing thread.
+     * @return a {@code Scheduler} that shares a single backing thread.
      * @since 2.0
      */
     @NonNull
@@ -311,7 +311,7 @@ public static Scheduler single() {
     }
 
     /**
-     * Wraps an {@link Executor} into a new Scheduler instance and delegates {@code schedule()}
+     * Wraps an {@link Executor} into a new {@link Scheduler} instance and delegates {@code schedule()}
      * calls to it.
      * <p>
      * If the provided executor doesn't support any of the more specific standard Java executor
@@ -337,11 +337,11 @@ public static Scheduler single() {
      * with a time delay close to each other may end up executing in different order than
      * the original schedule() call was issued. This limitation may be lifted in a future patch.
      * <p>
-     * The implementation of the Worker of this wrapper Scheduler is eager and will execute as many
+     * The implementation of the Worker of this wrapper {@code Scheduler} is eager and will execute as many
      * non-delayed tasks as it can, which may result in a longer than expected occupation of a
-     * thread of the given backing Executor. In other terms, it does not allow per-Runnable fairness
-     * in case the worker runs on a shared underlying thread of the Executor.
-     * See {@link #from(Executor, boolean, boolean)} to create a wrapper that uses the underlying Executor
+     * thread of the given backing {@code Executor}. In other terms, it does not allow per-{@link Runnable} fairness
+     * in case the worker runs on a shared underlying thread of the {@code Executor}.
+     * See {@link #from(Executor, boolean, boolean)} to create a wrapper that uses the underlying {@code Executor}
      * more fairly.
      * <p>
      * Starting, stopping and restarting this scheduler is not supported (no-op) and the provided
@@ -374,10 +374,10 @@ public static Scheduler single() {
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
      * <p>
-     * Note that this method returns a new {@link Scheduler} instance, even for the same {@link Executor} instance.
+     * Note that this method returns a new {@code Scheduler} instance, even for the same {@code Executor} instance.
      * @param executor
      *          the executor to wrap
-     * @return the new Scheduler wrapping the Executor
+     * @return the new {@code Scheduler} wrapping the {@code Executor}
      * @see #from(Executor, boolean, boolean)
      */
     @NonNull
@@ -386,10 +386,10 @@ public static Scheduler from(@NonNull Executor executor) {
     }
 
     /**
-     * Wraps an {@link Executor} into a new Scheduler instance and delegates {@code schedule()}
+     * Wraps an {@link Executor} into a new {@link Scheduler} instance and delegates {@code schedule()}
      * calls to it.
      * <p>
-     * The tasks scheduled by the returned {@link Scheduler} and its {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker}
+     * The tasks scheduled by the returned {@code Scheduler} and its {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker}
      * can be optionally interrupted.
      * <p>
      * If the provided executor doesn't support any of the more specific standard Java executor
@@ -411,11 +411,11 @@ public static Scheduler from(@NonNull Executor executor) {
      * with a time delay close to each other may end up executing in different order than
      * the original schedule() call was issued. This limitation may be lifted in a future patch.
      * <p>
-     * The implementation of the Worker of this wrapper Scheduler is eager and will execute as many
+     * The implementation of the {@code Worker} of this wrapper {@code Scheduler} is eager and will execute as many
      * non-delayed tasks as it can, which may result in a longer than expected occupation of a
-     * thread of the given backing Executor. In other terms, it does not allow per-Runnable fairness
-     * in case the worker runs on a shared underlying thread of the Executor.
-     * See {@link #from(Executor, boolean, boolean)} to create a wrapper that uses the underlying Executor
+     * thread of the given backing {@code Executor}. In other terms, it does not allow per-{@link Runnable} fairness
+     * in case the worker runs on a shared underlying thread of the {@code Executor}.
+     * See {@link #from(Executor, boolean, boolean)} to create a wrapper that uses the underlying {@code Executor}
      * more fairly.
      * <p>
      * Starting, stopping and restarting this scheduler is not supported (no-op) and the provided
@@ -448,13 +448,13 @@ public static Scheduler from(@NonNull Executor executor) {
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
      * <p>
-     * Note that this method returns a new {@link Scheduler} instance, even for the same {@link Executor} instance.
+     * Note that this method returns a new {@code Scheduler} instance, even for the same {@code Executor} instance.
      * <p>History: 2.2.6 - experimental
      * @param executor
      *          the executor to wrap
      * @param interruptibleWorker if {@code true} the tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} will
      * be interrupted when the task is disposed.
-     * @return the new Scheduler wrapping the Executor
+     * @return the new {@code Scheduler} wrapping the {@code Executor}
      * @since 3.0.0
      * @see #from(Executor, boolean, boolean)
      */
@@ -464,10 +464,10 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
     }
 
     /**
-     * Wraps an {@link Executor} into a new Scheduler instance and delegates {@code schedule()}
+     * Wraps an {@link Executor} into a new {@link Scheduler} instance and delegates {@code schedule()}
      * calls to it.
      * <p>
-     * The tasks scheduled by the returned {@link Scheduler} and its {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker}
+     * The tasks scheduled by the returned {@code Scheduler} and its {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker}
      * can be optionally interrupted.
      * <p>
      * If the provided executor doesn't support any of the more specific standard Java executor
@@ -489,14 +489,14 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
      * with a time delay close to each other may end up executing in different order than
      * the original schedule() call was issued. This limitation may be lifted in a future patch.
      * <p>
-     * The implementation of the Worker of this wrapper Scheduler can operate in both eager (non-fair) and
+     * The implementation of the Worker of this wrapper {@code Scheduler} can operate in both eager (non-fair) and
      * fair modes depending on the specified parameter. In <em>eager</em> mode, it will execute as many
      * non-delayed tasks as it can, which may result in a longer than expected occupation of a
-     * thread of the given backing Executor. In other terms, it does not allow per-Runnable fairness
-     * in case the worker runs on a shared underlying thread of the Executor. In <em>fair</em> mode,
+     * thread of the given backing {@code Executor}. In other terms, it does not allow per-{@link Runnable} fairness
+     * in case the worker runs on a shared underlying thread of the {@code Executor}. In <em>fair</em> mode,
      * non-delayed tasks will still be executed in a FIFO and non-overlapping manner, but after each task,
-     * the execution for the next task is rescheduled with the same underlying Executor, allowing interleaving
-     * from both the same Scheduler or other external usages of the underlying Executor.
+     * the execution for the next task is rescheduled with the same underlying {@code Executor}, allowing interleaving
+     * from both the same {@code Scheduler} or other external usages of the underlying {@code Executor}.
      * <p>
      * Starting, stopping and restarting this scheduler is not supported (no-op) and the provided
      * executor's lifecycle must be managed externally:
@@ -528,15 +528,15 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
      * not disposing a worker that has timed/delayed tasks not cancelled by other means may leak resources and/or
      * execute those tasks "unexpectedly".
      * <p>
-     * Note that this method returns a new {@link Scheduler} instance, even for the same {@link Executor} instance.
+     * Note that this method returns a new {@code Scheduler} instance, even for the same {@code Executor} instance.
      * @param executor
      *          the executor to wrap
      * @param interruptibleWorker if {@code true} the tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} will
      * be interrupted when the task is disposed.
-     * @param fair if {@code true} tasks submitted to the will be executed by the underlying {@link Executor} one after the other, still
+     * @param fair if {@code true} tasks submitted to the will be executed by the underlying {@code Executor} one after the other, still
      * in a FIFO and non-overlapping manner, but allows interleaving with other tasks submitted to the underlying {@code Executor}.
      * If {@code false}, the underlying FIFO scheme will execute as many tasks as it can before giving up the underlying {@code Executor} thread.
-     * @return the new Scheduler wrapping the Executor
+     * @return the new {@code Scheduler} wrapping the {@code Executor}
      * @since 3.0.0
      */
     @NonNull
@@ -545,7 +545,7 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
     }
 
     /**
-     * Shuts down the standard Schedulers.
+     * Shuts down the standard {@link Scheduler}s.
      * <p>The operation is idempotent and thread-safe.
      */
     public static void shutdown() {
@@ -558,7 +558,7 @@ public static void shutdown() {
     }
 
     /**
-     * Starts the standard Schedulers.
+     * Starts the standard {@link Scheduler}s.
      * <p>The operation is idempotent and thread-safe.
      */
     public static void start() {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
index 5b90072306..8f80a9b2be 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
@@ -75,6 +75,11 @@ public void checkConnectableObservable() throws Exception {
         checkSource("ConnectableObservable", "io.reactivex.rxjava3.observables");
     }
 
+    @Test
+    public void checkSchedulers() throws Exception {
+        checkSource("Schedulers", "io.reactivex.rxjava3.schedulers");
+    }
+
     static void checkSource(String baseClassName, String packageName) throws Exception {
         File f = TestHelper.findSource(baseClassName, packageName);
         if (f == null) {
@@ -418,7 +423,9 @@ static void blankRange(StringBuilder builder, int start, int end) {
 
             "List", "ArrayList", "HashMap", "HashSet", "CharSequence",
 
-            "TestSubscriber", "TestObserver", "Class"
+            "TestSubscriber", "TestObserver", "Class",
+
+            "ThreadFactory", "Runnable", "Executor", "ExecutorService", "Executors", "RejectedExecutionException"
     );
 
     static final Set<String> ALWAYS_CODE = new HashSet<>(Arrays.asList(

From a99b2e0a01d85f3f792a56c68ac1df9afa3a75c7 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 27 Jan 2021 16:46:33 +0100
Subject: [PATCH 207/665] 3.x: Add fusion support to
 concatMap{Maybe|Single|Completable} (#7165)

---
 .../mixed/ConcatMapXMainObserver.java         | 150 +++++++++++++++++
 .../mixed/ConcatMapXMainSubscriber.java       | 155 ++++++++++++++++++
 .../mixed/FlowableConcatMapCompletable.java   | 133 ++++++---------
 .../mixed/FlowableConcatMapMaybe.java         | 111 +++++--------
 .../mixed/FlowableConcatMapSingle.java        | 103 ++++--------
 .../mixed/ObservableConcatMapCompletable.java | 129 +++------------
 .../mixed/ObservableConcatMapMaybe.java       |  93 ++++-------
 .../mixed/ObservableConcatMapSingle.java      | 103 ++++--------
 .../DeferredScalarSubscription.java           |   2 +-
 .../FlowableConcatMapCompletableTest.java     |  60 ++++++-
 .../mixed/FlowableConcatMapMaybeTest.java     |  74 +++++++--
 .../mixed/FlowableConcatMapSingleTest.java    |  72 +++++++-
 .../ObservableConcatMapCompletableTest.java   |  50 ++++++
 .../mixed/ObservableConcatMapMaybeTest.java   |  50 ++++++
 .../mixed/ObservableConcatMapSingleTest.java  |  50 ++++++
 .../rxjava3/testsupport/TestHelper.java       |  12 ++
 16 files changed, 856 insertions(+), 491 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java
new file mode 100644
index 0000000000..f4e95e8a9d
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java
@@ -0,0 +1,150 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.mixed;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.internal.util.*;
+
+/**
+ * Base class for implementing concatMapX main observers.
+ *
+ * @param <T> the upstream value type
+ * @since 3.0.10
+ */
+public abstract class ConcatMapXMainObserver<T> extends AtomicInteger
+implements Observer<T>, Disposable {
+
+    private static final long serialVersionUID = -3214213361171757852L;
+
+    final AtomicThrowable errors;
+
+    final int prefetch;
+
+    final ErrorMode errorMode;
+
+    SimpleQueue<T> queue;
+
+    Disposable upstream;
+
+    volatile boolean done;
+
+    volatile boolean disposed;
+
+    public ConcatMapXMainObserver(int prefetch, ErrorMode errorMode) {
+        this.errorMode = errorMode;
+        this.errors = new AtomicThrowable();
+        this.prefetch = prefetch;
+    }
+
+    @Override
+    public final void onSubscribe(Disposable d) {
+        if (DisposableHelper.validate(upstream, d)) {
+            upstream = d;
+            if (d instanceof QueueDisposable) {
+                @SuppressWarnings("unchecked")
+                QueueDisposable<T> qd = (QueueDisposable<T>)d;
+                int mode = qd.requestFusion(QueueFuseable.ANY | QueueFuseable.BOUNDARY);
+                if (mode == QueueFuseable.SYNC) {
+                    queue = qd;
+                    done = true;
+
+                    onSubscribeDownstream();
+
+                    drain();
+                    return;
+                }
+                else if (mode == QueueFuseable.ASYNC) {
+                    queue = qd;
+
+                    onSubscribeDownstream();
+
+                    return;
+                }
+            }
+
+            queue = new SpscLinkedArrayQueue<>(prefetch);
+            onSubscribeDownstream();
+        }
+    }
+
+    @Override
+    public final void onNext(T t) {
+        // In async fusion mode, t is a drain indicator
+        if (t != null) {
+            queue.offer(t);
+        }
+        drain();
+    }
+
+    @Override
+    public final void onError(Throwable t) {
+        if (errors.tryAddThrowableOrReport(t)) {
+            if (errorMode == ErrorMode.IMMEDIATE) {
+                disposeInner();
+            }
+            done = true;
+            drain();
+        }
+    }
+
+    @Override
+    public final void onComplete() {
+        done = true;
+        drain();
+    }
+
+    @Override
+    public final void dispose() {
+        disposed = true;
+        upstream.dispose();
+        disposeInner();
+        errors.tryTerminateAndReport();
+        if (getAndIncrement() == 0) {
+            queue.clear();
+            clearValue();
+        }
+    }
+
+    @Override
+    public final boolean isDisposed() {
+        return disposed;
+    }
+
+    /**
+     * Override this to clear values when the downstream disposes.
+     */
+    void clearValue() {
+    }
+
+    /**
+     * Typically, this should be {@code downstream.onSubscribe(this)}.
+     */
+    abstract void onSubscribeDownstream();
+
+    /**
+     * Typically, this should be {@code inner.dispose()}.
+     */
+    abstract void disposeInner();
+
+    /**
+     * Implement the serialized inner subscribing and value emission here.
+     */
+    abstract void drain();
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
new file mode 100644
index 0000000000..398e4fb015
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
@@ -0,0 +1,155 @@
+/**
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.operators.mixed;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.reactivestreams.Subscription;
+
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.util.*;
+
+/**
+ * Base class for implementing concatMapX main subscribers.
+ *
+ * @param <T> the upstream value type
+ * @since 3.0.10
+ */
+public abstract class ConcatMapXMainSubscriber<T> extends AtomicInteger
+implements FlowableSubscriber<T> {
+
+    private static final long serialVersionUID = -3214213361171757852L;
+
+    final AtomicThrowable errors;
+
+    final int prefetch;
+
+    final ErrorMode errorMode;
+
+    SimpleQueue<T> queue;
+
+    Subscription upstream;
+
+    volatile boolean done;
+
+    volatile boolean cancelled;
+
+    boolean syncFused;
+
+    public ConcatMapXMainSubscriber(int prefetch, ErrorMode errorMode) {
+        this.errorMode = errorMode;
+        this.errors = new AtomicThrowable();
+        this.prefetch = prefetch;
+    }
+
+    @Override
+    public final void onSubscribe(Subscription s) {
+        if (SubscriptionHelper.validate(upstream, s)) {
+            upstream = s;
+            if (s instanceof QueueSubscription) {
+                @SuppressWarnings("unchecked")
+                QueueSubscription<T> qs = (QueueSubscription<T>)s;
+                int mode = qs.requestFusion(QueueFuseable.ANY | QueueFuseable.BOUNDARY);
+                if (mode == QueueFuseable.SYNC) {
+                    queue = qs;
+                    syncFused = true;
+                    done = true;
+
+                    onSubscribeDownstream();
+
+                    drain();
+                    return;
+                }
+                else if (mode == QueueFuseable.ASYNC) {
+                    queue = qs;
+
+                    onSubscribeDownstream();
+
+                    upstream.request(prefetch);
+                    return;
+                }
+            }
+
+            queue = new SpscArrayQueue<>(prefetch);
+            onSubscribeDownstream();
+            upstream.request(prefetch);
+        }
+    }
+
+    @Override
+    public final void onNext(T t) {
+        // In async fusion mode, t is a drain indicator
+        if (t != null) {
+            if (!queue.offer(t)) {
+                upstream.cancel();
+                onError(new MissingBackpressureException("queue full?!"));
+                return;
+            }
+        }
+        drain();
+    }
+
+    @Override
+    public final void onError(Throwable t) {
+        if (errors.tryAddThrowableOrReport(t)) {
+            if (errorMode == ErrorMode.IMMEDIATE) {
+                disposeInner();
+            }
+            done = true;
+            drain();
+        }
+    }
+
+    @Override
+    public final void onComplete() {
+        done = true;
+        drain();
+    }
+
+    final void stop() {
+        cancelled = true;
+        upstream.cancel();
+        disposeInner();
+        errors.tryTerminateAndReport();
+        if (getAndIncrement() == 0) {
+            queue.clear();
+            clearValue();
+        }
+    }
+
+    /**
+     * Override this to clear values when the downstream disposes.
+     */
+    void clearValue() {
+    }
+
+    /**
+     * Typically, this should be {@code downstream.onSubscribe(this);}.
+     */
+    abstract void onSubscribeDownstream();
+
+    /**
+     * Typically, this should be {@code inner.dispose()}.
+     */
+    abstract void disposeInner();
+
+    /**
+     * Implement the serialized inner subscribing and value emission here.
+     */
+    abstract void drain();
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
index e4a3f36c05..2838138a09 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
@@ -14,18 +14,14 @@
 package io.reactivex.rxjava3.internal.operators.mixed;
 
 import java.util.Objects;
-import java.util.concurrent.atomic.*;
-
-import org.reactivestreams.Subscription;
+import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
-import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
 
 /**
@@ -61,8 +57,8 @@ protected void subscribeActual(CompletableObserver observer) {
     }
 
     static final class ConcatMapCompletableObserver<T>
-    extends AtomicInteger
-    implements FlowableSubscriber<T>, Disposable {
+    extends ConcatMapXMainSubscriber<T>
+    implements Disposable {
 
         private static final long serialVersionUID = 3610901111000061034L;
 
@@ -70,93 +66,39 @@ static final class ConcatMapCompletableObserver<T>
 
         final Function<? super T, ? extends CompletableSource> mapper;
 
-        final ErrorMode errorMode;
-
-        final AtomicThrowable errors;
-
         final ConcatMapInnerObserver inner;
 
-        final int prefetch;
-
-        final SimplePlainQueue<T> queue;
-
-        Subscription upstream;
-
         volatile boolean active;
 
-        volatile boolean done;
-
-        volatile boolean disposed;
-
         int consumed;
 
         ConcatMapCompletableObserver(CompletableObserver downstream,
                 Function<? super T, ? extends CompletableSource> mapper,
                 ErrorMode errorMode, int prefetch) {
+            super(prefetch, errorMode);
             this.downstream = downstream;
             this.mapper = mapper;
-            this.errorMode = errorMode;
-            this.prefetch = prefetch;
-            this.errors = new AtomicThrowable();
             this.inner = new ConcatMapInnerObserver(this);
-            this.queue = new SpscArrayQueue<>(prefetch);
-        }
-
-        @Override
-        public void onSubscribe(Subscription s) {
-            if (SubscriptionHelper.validate(upstream, s)) {
-                this.upstream = s;
-                downstream.onSubscribe(this);
-                s.request(prefetch);
-            }
         }
 
         @Override
-        public void onNext(T t) {
-            if (queue.offer(t)) {
-                drain();
-            } else {
-                upstream.cancel();
-                onError(new MissingBackpressureException("Queue full?!"));
-            }
+        void onSubscribeDownstream() {
+            downstream.onSubscribe(this);
         }
 
         @Override
-        public void onError(Throwable t) {
-            if (errors.tryAddThrowableOrReport(t)) {
-                if (errorMode == ErrorMode.IMMEDIATE) {
-                    inner.dispose();
-                    errors.tryTerminateConsumer(downstream);
-                    if (getAndIncrement() == 0) {
-                        queue.clear();
-                    }
-                } else {
-                    done = true;
-                    drain();
-                }
-            }
-        }
-
-        @Override
-        public void onComplete() {
-            done = true;
-            drain();
+        void disposeInner() {
+            inner.dispose();
         }
 
         @Override
         public void dispose() {
-            disposed = true;
-            upstream.cancel();
-            inner.dispose();
-            errors.tryTerminateAndReport();
-            if (getAndIncrement() == 0) {
-                queue.clear();
-            }
+            stop();
         }
 
         @Override
         public boolean isDisposed() {
-            return disposed;
+            return cancelled;
         }
 
         void innerError(Throwable ex) {
@@ -179,29 +121,45 @@ void innerComplete() {
             drain();
         }
 
+        @Override
         void drain() {
             if (getAndIncrement() != 0) {
                 return;
             }
 
+            ErrorMode errorMode = this.errorMode;
+            SimpleQueue<T> queue = this.queue;
+            AtomicThrowable errors = this.errors;
+            boolean syncFused = this.syncFused;
+
             do {
-                if (disposed) {
+                if (cancelled) {
                     queue.clear();
                     return;
                 }
 
-                if (!active) {
-
-                    if (errorMode == ErrorMode.BOUNDARY) {
-                        if (errors.get() != null) {
-                            queue.clear();
-                            errors.tryTerminateConsumer(downstream);
-                            return;
-                        }
+                if (errors.get() != null) {
+                    if (errorMode == ErrorMode.IMMEDIATE
+                            || (errorMode == ErrorMode.BOUNDARY && !active)) {
+                        queue.clear();
+                        errors.tryTerminateConsumer(downstream);
+                        return;
                     }
+                }
+
+                if (!active) {
 
                     boolean d = done;
-                    T v = queue.poll();
+                    T v;
+                    try {
+                        v = queue.poll();
+                    } catch (Throwable ex) {
+                        Exceptions.throwIfFatal(ex);
+                        upstream.cancel();
+                        errors.tryAddThrowableOrReport(ex);
+                        errors.tryTerminateConsumer(downstream);
+                        return;
+                    }
                     boolean empty = v == null;
 
                     if (d && empty) {
@@ -212,12 +170,15 @@ void drain() {
                     if (!empty) {
 
                         int limit = prefetch - (prefetch >> 1);
-                        int c = consumed + 1;
-                        if (c == limit) {
-                            consumed = 0;
-                            upstream.request(limit);
-                        } else {
-                            consumed = c;
+
+                        if (!syncFused) {
+                            int c = consumed + 1;
+                            if (c == limit) {
+                                consumed = 0;
+                                upstream.request(limit);
+                            } else {
+                                consumed = c;
+                            }
                         }
 
                         CompletableSource cs;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
index 5f71148e0d..c0d151e6fd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
@@ -20,12 +20,10 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
-import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
 
 /**
@@ -62,8 +60,7 @@ protected void subscribeActual(Subscriber<? super R> s) {
     }
 
     static final class ConcatMapMaybeSubscriber<T, R>
-    extends AtomicInteger
-    implements FlowableSubscriber<T>, Subscription {
+    extends ConcatMapXMainSubscriber<T> implements Subscription {
 
         private static final long serialVersionUID = -9140123220065488293L;
 
@@ -71,24 +68,10 @@ static final class ConcatMapMaybeSubscriber<T, R>
 
         final Function<? super T, ? extends MaybeSource<? extends R>> mapper;
 
-        final int prefetch;
-
         final AtomicLong requested;
 
-        final AtomicThrowable errors;
-
         final ConcatMapMaybeObserver<R> inner;
 
-        final SimplePlainQueue<T> queue;
-
-        final ErrorMode errorMode;
-
-        Subscription upstream;
-
-        volatile boolean done;
-
-        volatile boolean cancelled;
-
         long emitted;
 
         int consumed;
@@ -107,50 +90,16 @@ static final class ConcatMapMaybeSubscriber<T, R>
         ConcatMapMaybeSubscriber(Subscriber<? super R> downstream,
                 Function<? super T, ? extends MaybeSource<? extends R>> mapper,
                         int prefetch, ErrorMode errorMode) {
+            super(prefetch, errorMode);
             this.downstream = downstream;
             this.mapper = mapper;
-            this.prefetch = prefetch;
-            this.errorMode = errorMode;
             this.requested = new AtomicLong();
-            this.errors = new AtomicThrowable();
             this.inner = new ConcatMapMaybeObserver<>(this);
-            this.queue = new SpscArrayQueue<>(prefetch);
-        }
-
-        @Override
-        public void onSubscribe(Subscription s) {
-            if (SubscriptionHelper.validate(upstream, s)) {
-                upstream = s;
-                downstream.onSubscribe(this);
-                s.request(prefetch);
-            }
         }
 
         @Override
-        public void onNext(T t) {
-            if (!queue.offer(t)) {
-                upstream.cancel();
-                onError(new MissingBackpressureException("queue full?!"));
-                return;
-            }
-            drain();
-        }
-
-        @Override
-        public void onError(Throwable t) {
-            if (errors.tryAddThrowableOrReport(t)) {
-                if (errorMode == ErrorMode.IMMEDIATE) {
-                    inner.dispose();
-                }
-                done = true;
-                drain();
-            }
-        }
-
-        @Override
-        public void onComplete() {
-            done = true;
-            drain();
+        void onSubscribeDownstream() {
+            downstream.onSubscribe(this);
         }
 
         @Override
@@ -161,14 +110,7 @@ public void request(long n) {
 
         @Override
         public void cancel() {
-            cancelled = true;
-            upstream.cancel();
-            inner.dispose();
-            errors.tryTerminateAndReport();
-            if (getAndIncrement() == 0) {
-                queue.clear();
-                item = null;
-            }
+            stop();
         }
 
         void innerSuccess(R item) {
@@ -192,6 +134,17 @@ void innerError(Throwable ex) {
             }
         }
 
+        @Override
+        void clearValue() {
+            item = null;
+        }
+
+        @Override
+        void disposeInner() {
+            inner.dispose();
+        }
+
+        @Override
         void drain() {
             if (getAndIncrement() != 0) {
                 return;
@@ -200,10 +153,11 @@ void drain() {
             int missed = 1;
             Subscriber<? super R> downstream = this.downstream;
             ErrorMode errorMode = this.errorMode;
-            SimplePlainQueue<T> queue = this.queue;
+            SimpleQueue<T> queue = this.queue;
             AtomicThrowable errors = this.errors;
             AtomicLong requested = this.requested;
             int limit = prefetch - (prefetch >> 1);
+            boolean syncFused = this.syncFused;
 
             for (;;) {
 
@@ -228,7 +182,16 @@ void drain() {
 
                     if (s == STATE_INACTIVE) {
                         boolean d = done;
-                        T v = queue.poll();
+                        T v;
+                        try {
+                            v = queue.poll();
+                        } catch (Throwable ex) {
+                            Exceptions.throwIfFatal(ex);
+                            upstream.cancel();
+                            errors.tryAddThrowableOrReport(ex);
+                            errors.tryTerminateConsumer(downstream);
+                            return;
+                        }
                         boolean empty = v == null;
 
                         if (d && empty) {
@@ -240,12 +203,14 @@ void drain() {
                             break;
                         }
 
-                        int c = consumed + 1;
-                        if (c == limit) {
-                            consumed = 0;
-                            upstream.request(limit);
-                        } else {
-                            consumed = c;
+                        if (!syncFused) {
+                            int c = consumed + 1;
+                            if (c == limit) {
+                                consumed = 0;
+                                upstream.request(limit);
+                            } else {
+                                consumed = c;
+                            }
                         }
 
                         MaybeSource<? extends R> ms;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
index f6cd939546..49009a722e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
@@ -20,12 +20,10 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
-import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
 
 /**
@@ -62,8 +60,7 @@ protected void subscribeActual(Subscriber<? super R> s) {
     }
 
     static final class ConcatMapSingleSubscriber<T, R>
-    extends AtomicInteger
-    implements FlowableSubscriber<T>, Subscription {
+    extends ConcatMapXMainSubscriber<T> implements Subscription {
 
         private static final long serialVersionUID = -9140123220065488293L;
 
@@ -71,24 +68,10 @@ static final class ConcatMapSingleSubscriber<T, R>
 
         final Function<? super T, ? extends SingleSource<? extends R>> mapper;
 
-        final int prefetch;
-
         final AtomicLong requested;
 
-        final AtomicThrowable errors;
-
         final ConcatMapSingleObserver<R> inner;
 
-        final SimplePlainQueue<T> queue;
-
-        final ErrorMode errorMode;
-
-        Subscription upstream;
-
-        volatile boolean done;
-
-        volatile boolean cancelled;
-
         long emitted;
 
         int consumed;
@@ -107,68 +90,37 @@ static final class ConcatMapSingleSubscriber<T, R>
         ConcatMapSingleSubscriber(Subscriber<? super R> downstream,
                 Function<? super T, ? extends SingleSource<? extends R>> mapper,
                         int prefetch, ErrorMode errorMode) {
+            super(prefetch, errorMode);
             this.downstream = downstream;
             this.mapper = mapper;
-            this.prefetch = prefetch;
-            this.errorMode = errorMode;
             this.requested = new AtomicLong();
-            this.errors = new AtomicThrowable();
             this.inner = new ConcatMapSingleObserver<>(this);
-            this.queue = new SpscArrayQueue<>(prefetch);
         }
 
         @Override
-        public void onSubscribe(Subscription s) {
-            if (SubscriptionHelper.validate(upstream, s)) {
-                upstream = s;
-                downstream.onSubscribe(this);
-                s.request(prefetch);
-            }
+        void onSubscribeDownstream() {
+            downstream.onSubscribe(this);
         }
 
         @Override
-        public void onNext(T t) {
-            if (!queue.offer(t)) {
-                upstream.cancel();
-                onError(new MissingBackpressureException("queue full?!"));
-                return;
-            }
+        public void request(long n) {
+            BackpressureHelper.add(requested, n);
             drain();
         }
 
         @Override
-        public void onError(Throwable t) {
-            if (errors.tryAddThrowableOrReport(t)) {
-                if (errorMode == ErrorMode.IMMEDIATE) {
-                    inner.dispose();
-                }
-                done = true;
-                drain();
-            }
-        }
-
-        @Override
-        public void onComplete() {
-            done = true;
-            drain();
+        public void cancel() {
+            stop();
         }
 
         @Override
-        public void request(long n) {
-            BackpressureHelper.add(requested, n);
-            drain();
+        void clearValue() {
+            item = null;
         }
 
         @Override
-        public void cancel() {
-            cancelled = true;
-            upstream.cancel();
+        void disposeInner() {
             inner.dispose();
-            errors.tryTerminateAndReport();
-            if (getAndIncrement() == 0) {
-                queue.clear();
-                item = null;
-            }
         }
 
         void innerSuccess(R item) {
@@ -187,6 +139,7 @@ void innerError(Throwable ex) {
             }
         }
 
+        @Override
         void drain() {
             if (getAndIncrement() != 0) {
                 return;
@@ -195,10 +148,11 @@ void drain() {
             int missed = 1;
             Subscriber<? super R> downstream = this.downstream;
             ErrorMode errorMode = this.errorMode;
-            SimplePlainQueue<T> queue = this.queue;
+            SimpleQueue<T> queue = this.queue;
             AtomicThrowable errors = this.errors;
             AtomicLong requested = this.requested;
             int limit = prefetch - (prefetch >> 1);
+            boolean syncFused = this.syncFused;
 
             for (;;) {
 
@@ -223,7 +177,16 @@ void drain() {
 
                     if (s == STATE_INACTIVE) {
                         boolean d = done;
-                        T v = queue.poll();
+                        T v;
+                        try {
+                            v = queue.poll();
+                        } catch (Throwable ex) {
+                            Exceptions.throwIfFatal(ex);
+                            upstream.cancel();
+                            errors.tryAddThrowableOrReport(ex);
+                            errors.tryTerminateConsumer(downstream);
+                            return;
+                        }
                         boolean empty = v == null;
 
                         if (d && empty) {
@@ -235,12 +198,14 @@ void drain() {
                             break;
                         }
 
-                        int c = consumed + 1;
-                        if (c == limit) {
-                            consumed = 0;
-                            upstream.request(limit);
-                        } else {
-                            consumed = c;
+                        if (!syncFused) {
+                            int c = consumed + 1;
+                            if (c == limit) {
+                                consumed = 0;
+                                upstream.request(limit);
+                            } else {
+                                consumed = c;
+                            }
                         }
 
                         SingleSource<? extends R> ss;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
index 2295f4397e..49fcbcff83 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
@@ -14,15 +14,14 @@
 package io.reactivex.rxjava3.internal.operators.mixed;
 
 import java.util.Objects;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
 
 /**
@@ -60,8 +59,7 @@ protected void subscribeActual(CompletableObserver observer) {
     }
 
     static final class ConcatMapCompletableObserver<T>
-    extends AtomicInteger
-    implements Observer<T>, Disposable {
+    extends ConcatMapXMainObserver<T> {
 
         private static final long serialVersionUID = 3610901111000061034L;
 
@@ -69,122 +67,36 @@ static final class ConcatMapCompletableObserver<T>
 
         final Function<? super T, ? extends CompletableSource> mapper;
 
-        final ErrorMode errorMode;
-
-        final AtomicThrowable errors;
-
         final ConcatMapInnerObserver inner;
 
-        final int prefetch;
-
-        SimpleQueue<T> queue;
-
-        Disposable upstream;
-
         volatile boolean active;
 
-        volatile boolean done;
-
-        volatile boolean disposed;
-
         ConcatMapCompletableObserver(CompletableObserver downstream,
                 Function<? super T, ? extends CompletableSource> mapper,
                 ErrorMode errorMode, int prefetch) {
+            super(prefetch, errorMode);
             this.downstream = downstream;
             this.mapper = mapper;
-            this.errorMode = errorMode;
-            this.prefetch = prefetch;
-            this.errors = new AtomicThrowable();
             this.inner = new ConcatMapInnerObserver(this);
         }
 
         @Override
-        public void onSubscribe(Disposable d) {
-            if (DisposableHelper.validate(upstream, d)) {
-                this.upstream = d;
-                if (d instanceof QueueDisposable) {
-                    @SuppressWarnings("unchecked")
-                    QueueDisposable<T> qd = (QueueDisposable<T>) d;
-
-                    int m = qd.requestFusion(QueueDisposable.ANY);
-                    if (m == QueueDisposable.SYNC) {
-                        queue = qd;
-                        done = true;
-                        downstream.onSubscribe(this);
-                        drain();
-                        return;
-                    }
-                    if (m == QueueDisposable.ASYNC) {
-                        queue = qd;
-                        downstream.onSubscribe(this);
-                        return;
-                    }
-                }
-                queue = new SpscLinkedArrayQueue<>(prefetch);
-                downstream.onSubscribe(this);
-            }
-        }
-
-        @Override
-        public void onNext(T t) {
-            if (t != null) {
-                queue.offer(t);
-            }
-            drain();
-        }
-
-        @Override
-        public void onError(Throwable t) {
-            if (errors.tryAddThrowableOrReport(t)) {
-                if (errorMode == ErrorMode.IMMEDIATE) {
-                    disposed = true;
-                    inner.dispose();
-                    errors.tryTerminateConsumer(downstream);
-                    if (getAndIncrement() == 0) {
-                        queue.clear();
-                    }
-                } else {
-                    done = true;
-                    drain();
-                }
-            }
-        }
-
-        @Override
-        public void onComplete() {
-            done = true;
-            drain();
+        void onSubscribeDownstream() {
+            downstream.onSubscribe(this);
         }
 
         @Override
-        public void dispose() {
-            disposed = true;
-            upstream.dispose();
+        void disposeInner() {
             inner.dispose();
-            errors.tryTerminateAndReport();
-            if (getAndIncrement() == 0) {
-                queue.clear();
-            }
-        }
-
-        @Override
-        public boolean isDisposed() {
-            return disposed;
         }
 
         void innerError(Throwable ex) {
             if (errors.tryAddThrowableOrReport(ex)) {
-                if (errorMode == ErrorMode.IMMEDIATE) {
-                    disposed = true;
+                if (errorMode != ErrorMode.END) {
                     upstream.dispose();
-                    errors.tryTerminateConsumer(downstream);
-                    if (getAndIncrement() == 0) {
-                        queue.clear();
-                    }
-                } else {
-                    active = false;
-                    drain();
                 }
+                active = false;
+                drain();
             }
         }
 
@@ -193,6 +105,7 @@ void innerComplete() {
             drain();
         }
 
+        @Override
         void drain() {
             if (getAndIncrement() != 0) {
                 return;
@@ -200,6 +113,7 @@ void drain() {
 
             AtomicThrowable errors = this.errors;
             ErrorMode errorMode = this.errorMode;
+            SimpleQueue<T> queue = this.queue;
 
             do {
                 if (disposed) {
@@ -207,16 +121,17 @@ void drain() {
                     return;
                 }
 
-                if (!active) {
-
-                    if (errorMode == ErrorMode.BOUNDARY) {
-                        if (errors.get() != null) {
-                            disposed = true;
-                            queue.clear();
-                            errors.tryTerminateConsumer(downstream);
-                            return;
-                        }
+                if (errors.get() != null) {
+                    if (errorMode == ErrorMode.IMMEDIATE
+                            || (errorMode == ErrorMode.BOUNDARY && !active)) {
+                        disposed = true;
+                        queue.clear();
+                        errors.tryTerminateConsumer(downstream);
+                        return;
                     }
+                }
+
+                if (!active) {
 
                     boolean d = done;
                     boolean empty = true;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
index 1177d5a06e..1e7090ee7d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
@@ -14,15 +14,14 @@
 package io.reactivex.rxjava3.internal.operators.mixed;
 
 import java.util.Objects;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.*;
 
 /**
@@ -61,8 +60,7 @@ protected void subscribeActual(Observer<? super R> observer) {
     }
 
     static final class ConcatMapMaybeMainObserver<T, R>
-    extends AtomicInteger
-    implements Observer<T>, Disposable {
+    extends ConcatMapXMainObserver<T> {
 
         private static final long serialVersionUID = -9140123220065488293L;
 
@@ -70,20 +68,8 @@ static final class ConcatMapMaybeMainObserver<T, R>
 
         final Function<? super T, ? extends MaybeSource<? extends R>> mapper;
 
-        final AtomicThrowable errors;
-
         final ConcatMapMaybeObserver<R> inner;
 
-        final SimplePlainQueue<T> queue;
-
-        final ErrorMode errorMode;
-
-        Disposable upstream;
-
-        volatile boolean done;
-
-        volatile boolean cancelled;
-
         R item;
 
         volatile int state;
@@ -98,60 +84,20 @@ static final class ConcatMapMaybeMainObserver<T, R>
         ConcatMapMaybeMainObserver(Observer<? super R> downstream,
                 Function<? super T, ? extends MaybeSource<? extends R>> mapper,
                         int prefetch, ErrorMode errorMode) {
+            super(prefetch, errorMode);
             this.downstream = downstream;
             this.mapper = mapper;
-            this.errorMode = errorMode;
-            this.errors = new AtomicThrowable();
             this.inner = new ConcatMapMaybeObserver<>(this);
-            this.queue = new SpscLinkedArrayQueue<>(prefetch);
-        }
-
-        @Override
-        public void onSubscribe(Disposable d) {
-            if (DisposableHelper.validate(upstream, d)) {
-                upstream = d;
-                downstream.onSubscribe(this);
-            }
-        }
-
-        @Override
-        public void onNext(T t) {
-            queue.offer(t);
-            drain();
-        }
-
-        @Override
-        public void onError(Throwable t) {
-            if (errors.tryAddThrowableOrReport(t)) {
-                if (errorMode == ErrorMode.IMMEDIATE) {
-                    inner.dispose();
-                }
-                done = true;
-                drain();
-            }
         }
 
         @Override
-        public void onComplete() {
-            done = true;
-            drain();
-        }
-
-        @Override
-        public void dispose() {
-            cancelled = true;
-            upstream.dispose();
-            inner.dispose();
-            errors.tryTerminateAndReport();
-            if (getAndIncrement() == 0) {
-                queue.clear();
-                item = null;
-            }
+        void onSubscribeDownstream() {
+            downstream.onSubscribe(this);
         }
 
         @Override
-        public boolean isDisposed() {
-            return cancelled;
+        void clearValue() {
+            item = null;
         }
 
         void innerSuccess(R item) {
@@ -175,6 +121,12 @@ void innerError(Throwable ex) {
             }
         }
 
+        @Override
+        void disposeInner() {
+            inner.dispose();
+        }
+
+        @Override
         void drain() {
             if (getAndIncrement() != 0) {
                 return;
@@ -183,13 +135,13 @@ void drain() {
             int missed = 1;
             Observer<? super R> downstream = this.downstream;
             ErrorMode errorMode = this.errorMode;
-            SimplePlainQueue<T> queue = this.queue;
+            SimpleQueue<T> queue = this.queue;
             AtomicThrowable errors = this.errors;
 
             for (;;) {
 
                 for (;;) {
-                    if (cancelled) {
+                    if (disposed) {
                         queue.clear();
                         item = null;
                         break;
@@ -209,7 +161,18 @@ void drain() {
 
                     if (s == STATE_INACTIVE) {
                         boolean d = done;
-                        T v = queue.poll();
+                        T v;
+
+                        try {
+                            v = queue.poll();
+                        } catch (Throwable ex) {
+                            Exceptions.throwIfFatal(ex);
+                            disposed = true;
+                            upstream.dispose();
+                            errors.tryAddThrowableOrReport(ex);
+                            errors.tryTerminateConsumer(downstream);
+                            return;
+                        }
                         boolean empty = v == null;
 
                         if (d && empty) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
index 70d913cd42..3ad2b53cbc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
@@ -14,15 +14,14 @@
 package io.reactivex.rxjava3.internal.operators.mixed;
 
 import java.util.Objects;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
 
 /**
@@ -61,8 +60,7 @@ protected void subscribeActual(Observer<? super R> observer) {
     }
 
     static final class ConcatMapSingleMainObserver<T, R>
-    extends AtomicInteger
-    implements Observer<T>, Disposable {
+    extends ConcatMapXMainObserver<T> {
 
         private static final long serialVersionUID = -9140123220065488293L;
 
@@ -70,20 +68,8 @@ static final class ConcatMapSingleMainObserver<T, R>
 
         final Function<? super T, ? extends SingleSource<? extends R>> mapper;
 
-        final AtomicThrowable errors;
-
         final ConcatMapSingleObserver<R> inner;
 
-        final SimplePlainQueue<T> queue;
-
-        final ErrorMode errorMode;
-
-        Disposable upstream;
-
-        volatile boolean done;
-
-        volatile boolean cancelled;
-
         R item;
 
         volatile int state;
@@ -98,78 +84,44 @@ static final class ConcatMapSingleMainObserver<T, R>
         ConcatMapSingleMainObserver(Observer<? super R> downstream,
                 Function<? super T, ? extends SingleSource<? extends R>> mapper,
                         int prefetch, ErrorMode errorMode) {
+            super(prefetch, errorMode);
             this.downstream = downstream;
             this.mapper = mapper;
-            this.errorMode = errorMode;
-            this.errors = new AtomicThrowable();
             this.inner = new ConcatMapSingleObserver<>(this);
-            this.queue = new SpscLinkedArrayQueue<>(prefetch);
         }
 
-        @Override
-        public void onSubscribe(Disposable d) {
-            if (DisposableHelper.validate(upstream, d)) {
-                upstream = d;
-                downstream.onSubscribe(this);
-            }
-        }
-
-        @Override
-        public void onNext(T t) {
-            queue.offer(t);
+        void innerSuccess(R item) {
+            this.item = item;
+            this.state = STATE_RESULT_VALUE;
             drain();
         }
 
-        @Override
-        public void onError(Throwable t) {
-            if (errors.tryAddThrowableOrReport(t)) {
-                if (errorMode == ErrorMode.IMMEDIATE) {
-                    inner.dispose();
+        void innerError(Throwable ex) {
+            if (errors.tryAddThrowableOrReport(ex)) {
+                if (errorMode != ErrorMode.END) {
+                    upstream.dispose();
                 }
-                done = true;
+                this.state = STATE_INACTIVE;
                 drain();
             }
         }
 
         @Override
-        public void onComplete() {
-            done = true;
-            drain();
-        }
-
-        @Override
-        public void dispose() {
-            cancelled = true;
-            upstream.dispose();
+        void disposeInner() {
             inner.dispose();
-            errors.tryTerminateAndReport();
-            if (getAndIncrement() == 0) {
-                queue.clear();
-                item = null;
-            }
         }
 
         @Override
-        public boolean isDisposed() {
-            return cancelled;
+        void onSubscribeDownstream() {
+            downstream.onSubscribe(this);
         }
 
-        void innerSuccess(R item) {
-            this.item = item;
-            this.state = STATE_RESULT_VALUE;
-            drain();
-        }
-
-        void innerError(Throwable ex) {
-            if (errors.tryAddThrowableOrReport(ex)) {
-                if (errorMode != ErrorMode.END) {
-                    upstream.dispose();
-                }
-                this.state = STATE_INACTIVE;
-                drain();
-            }
+        @Override
+        void clearValue() {
+            item = null;
         }
 
+        @Override
         void drain() {
             if (getAndIncrement() != 0) {
                 return;
@@ -178,13 +130,13 @@ void drain() {
             int missed = 1;
             Observer<? super R> downstream = this.downstream;
             ErrorMode errorMode = this.errorMode;
-            SimplePlainQueue<T> queue = this.queue;
+            SimpleQueue<T> queue = this.queue;
             AtomicThrowable errors = this.errors;
 
             for (;;) {
 
                 for (;;) {
-                    if (cancelled) {
+                    if (disposed) {
                         queue.clear();
                         item = null;
                         break;
@@ -204,7 +156,18 @@ void drain() {
 
                     if (s == STATE_INACTIVE) {
                         boolean d = done;
-                        T v = queue.poll();
+                        T v;
+
+                        try {
+                            v = queue.poll();
+                        } catch (Throwable ex) {
+                            Exceptions.throwIfFatal(ex);
+                            disposed = true;
+                            upstream.dispose();
+                            errors.tryAddThrowableOrReport(ex);
+                            errors.tryTerminateConsumer(downstream);
+                            return;
+                        }
                         boolean empty = v == null;
 
                         if (d && empty) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java
index b50b4e13f9..155f9ebb48 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java
@@ -115,7 +115,7 @@ public final void complete(T v) {
                 lazySet(FUSED_READY);
 
                 Subscriber<? super T> a = downstream;
-                a.onNext(v);
+                a.onNext(null);
                 if (get() != CANCELLED) {
                     a.onComplete();
                 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
index 28c90619bb..6a67cb9fee 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
@@ -28,7 +28,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.subjects.CompletableSubject;
 import io.reactivex.rxjava3.testsupport.*;
 
@@ -66,6 +66,14 @@ public void simpleLongPrefetch() {
         .assertResult();
     }
 
+    @Test
+    public void simpleLongPrefetchHidden() {
+        Flowable.range(1, 1024).hide()
+        .concatMapCompletable(Functions.justFunction(Completable.complete()), 32)
+        .test()
+        .assertResult();
+    }
+
     @Test
     public void mainError() {
         Flowable.<Integer>error(new TestException())
@@ -431,4 +439,54 @@ public Completable apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void basicNonFused() {
+        Flowable.range(1, 5).hide()
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void basicSyncFused() {
+        Flowable.range(1, 5)
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void basicAsyncFused() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void basicFusionRejected() {
+        TestHelper.<Integer>rejectFlowableFusion()
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertEmpty();
+    }
+
+    @Test
+    public void fusedPollCrash() {
+        Flowable.range(1, 5)
+        .map(v -> {
+            if (v == 3) {
+                throw new TestException();
+            }
+            return v;
+        })
+        .compose(TestHelper.flowableStripBoundary())
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertFailure(TestException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
index 8a60f6c367..595740a452 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
@@ -19,11 +19,11 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import io.reactivex.rxjava3.disposables.Disposable;
 import org.junit.Test;
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -31,7 +31,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.internal.util.ErrorMode;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
@@ -54,15 +54,19 @@ public MaybeSource<Integer> apply(Integer v)
     }
 
     @Test
-    public void simpleLong() {
+    public void simpleLongPrefetch() {
         Flowable.range(1, 1024)
-        .concatMapMaybe(new Function<Integer, MaybeSource<Integer>>() {
-            @Override
-            public MaybeSource<Integer> apply(Integer v)
-                    throws Exception {
-                return Maybe.just(v);
-            }
-        }, 32)
+        .concatMapMaybe(Maybe::just, 32)
+        .test()
+        .assertValueCount(1024)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void simpleLongPrefetchHidden() {
+        Flowable.range(1, 1024).hide()
+        .concatMapMaybe(Maybe::just, 32)
         .test()
         .assertValueCount(1024)
         .assertNoErrors()
@@ -464,4 +468,54 @@ public Maybe<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void basicNonFused() {
+        Flowable.range(1, 5).hide()
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicSyncFused() {
+        Flowable.range(1, 5)
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicAsyncFused() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicFusionRejected() {
+        TestHelper.<Integer>rejectFlowableFusion()
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertEmpty();
+    }
+
+    @Test
+    public void fusedPollCrash() {
+        Flowable.range(1, 5)
+        .map(v -> {
+            if (v == 3) {
+                throw new TestException();
+            }
+            return v;
+        })
+        .compose(TestHelper.flowableStripBoundary())
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
index a2e5d73c09..73426eda72 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
@@ -30,7 +30,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.internal.util.ErrorMode;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.subjects.SingleSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
@@ -52,15 +52,19 @@ public SingleSource<Integer> apply(Integer v)
     }
 
     @Test
-    public void simpleLong() {
+    public void simpleLongPrefetch() {
         Flowable.range(1, 1024)
-        .concatMapSingle(new Function<Integer, SingleSource<Integer>>() {
-            @Override
-            public SingleSource<Integer> apply(Integer v)
-                    throws Exception {
-                return Single.just(v);
-            }
-        }, 32)
+        .concatMapSingle(Single::just, 32)
+        .test()
+        .assertValueCount(1024)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
+    @Test
+    public void simpleLongPrefetchHidden() {
+        Flowable.range(1, 1024).hide()
+        .concatMapSingle(Single::just, 32)
         .test()
         .assertValueCount(1024)
         .assertNoErrors()
@@ -382,4 +386,54 @@ public Single<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void basicNonFused() {
+        Flowable.range(1, 5).hide()
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicSyncFused() {
+        Flowable.range(1, 5)
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicAsyncFused() {
+        UnicastProcessor<Integer> up = UnicastProcessor.create();
+        TestHelper.emit(up, 1, 2, 3, 4, 5);
+
+        up
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicFusionRejected() {
+        TestHelper.<Integer>rejectFlowableFusion()
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertEmpty();
+    }
+
+    @Test
+    public void fusedPollCrash() {
+        Flowable.range(1, 5)
+        .map(v -> {
+            if (v == 3) {
+                throw new TestException();
+            }
+            return v;
+        })
+        .compose(TestHelper.flowableStripBoundary())
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java
index 540e0828af..ae0ce25d91 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java
@@ -474,4 +474,54 @@ public Completable apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void basicNonFused() {
+        Observable.range(1, 5).hide()
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void basicSyncFused() {
+        Observable.range(1, 5)
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void basicAsyncFused() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertResult();
+    }
+
+    @Test
+    public void basicFusionRejected() {
+        TestHelper.<Integer>rejectObservableFusion()
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertEmpty();
+    }
+
+    @Test
+    public void fusedPollCrash() {
+        Observable.range(1, 5)
+        .map(v -> {
+            if (v == 3) {
+                throw new TestException();
+            }
+            return v;
+        })
+        .compose(TestHelper.observableStripBoundary())
+        .concatMapCompletable(v -> Completable.complete().hide())
+        .test()
+        .assertFailure(TestException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
index 323cbc3270..120e027538 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
@@ -485,4 +485,54 @@ public Maybe<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void basicNonFused() {
+        Observable.range(1, 5).hide()
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicSyncFused() {
+        Observable.range(1, 5)
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicAsyncFused() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicFusionRejected() {
+        TestHelper.<Integer>rejectObservableFusion()
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertEmpty();
+    }
+
+    @Test
+    public void fusedPollCrash() {
+        Observable.range(1, 5)
+        .map(v -> {
+            if (v == 3) {
+                throw new TestException();
+            }
+            return v;
+        })
+        .compose(TestHelper.observableStripBoundary())
+        .concatMapMaybe(v -> Maybe.just(v).hide())
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
index 90f15ac250..76bf708e55 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
@@ -425,4 +425,54 @@ public Single<Integer> apply(Integer v) throws Throwable {
             }
         });
     }
+
+    @Test
+    public void basicNonFused() {
+        Observable.range(1, 5).hide()
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicSyncFused() {
+        Observable.range(1, 5)
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicAsyncFused() {
+        UnicastSubject<Integer> us = UnicastSubject.create();
+        TestHelper.emit(us, 1, 2, 3, 4, 5);
+
+        us
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertResult(1, 2, 3, 4, 5);
+    }
+
+    @Test
+    public void basicFusionRejected() {
+        TestHelper.<Integer>rejectObservableFusion()
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertEmpty();
+    }
+
+    @Test
+    public void fusedPollCrash() {
+        Observable.range(1, 5)
+        .map(v -> {
+            if (v == 3) {
+                throw new TestException();
+            }
+            return v;
+        })
+        .compose(TestHelper.observableStripBoundary())
+        .concatMapSingle(v -> Single.just(v).hide())
+        .test()
+        .assertFailure(TestException.class, 1, 2);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 1963a38459..9a19f84a7a 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -3018,6 +3018,12 @@ public static <T> void checkInvalidParallelSubscribers(ParallelFlowable<T> sourc
         }
     }
 
+    /**
+     * Creates a fuseable Observable that does not emit anything but rejects
+     * fusion requests.
+     * @param <T> the element type
+     * @return the new Observable
+     */
     public static <T> Observable<T> rejectObservableFusion() {
         return new Observable<T>() {
             @Override
@@ -3066,6 +3072,12 @@ public boolean isDisposed() {
         };
     }
 
+    /**
+     * Creates a fuseable Flowable that does not emit anything but rejects
+     * fusion requests.
+     * @param <T> the element type
+     * @return the new Observable
+     */
     public static <T> Flowable<T> rejectFlowableFusion() {
         return new Flowable<T>() {
             @Override

From 171c84677739d63ef778b8893db845ac7abc81e6 Mon Sep 17 00:00:00 2001
From: SergejIsbrecht <4427685+SergejIsbrecht@users.noreply.github.com>
Date: Thu, 28 Jan 2021 16:29:04 +0100
Subject: [PATCH 208/665] 3.x: Introduce property rx3.scheduler.use-nanotime
 (#7169)

Issue-Id: #7154

Co-authored-by: Sergej Isbrecht <sergej.isbrecht@gmail.com>
---
 .../io/reactivex/rxjava3/core/Scheduler.java  | 42 ++++++++++++++++---
 .../rxjava3/schedulers/Schedulers.java        |  2 +
 .../reactivex/rxjava3/core/SchedulerTest.java | 38 +++++++++++++++++
 3 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
index bd121c06c4..3c6a6ad751 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
@@ -60,8 +60,9 @@
  * interface which can grant access to the original or hooked {@code Runnable}, thus, a repeated {@code RxJavaPlugins.onSchedule}
  * can detect the earlier hook and not apply a new one over again.
  * <p>
- * The default implementation of {@link #now(TimeUnit)} and {@link Worker#now(TimeUnit)} methods to return current
- * {@link System#currentTimeMillis()} value in the desired time unit. Custom {@code Scheduler} implementations can override this
+ * The default implementation of {@link #now(TimeUnit)} and {@link Worker#now(TimeUnit)} methods to return current {@link System#currentTimeMillis()}
+ * value in the desired time unit, unless {@code rx3.scheduler.use-nanotime} (boolean) is set. When the property is set to
+ * {@code true}, the method uses {@link System#nanoTime()} as its basis instead. Custom {@code Scheduler} implementations can override this
  * to provide specialized time accounting (such as virtual time to be advanced programmatically).
  * Note that operators requiring a {@code Scheduler} may rely on either of the {@code now()} calls provided by
  * {@code Scheduler} or {@code Worker} respectively, therefore, it is recommended they represent a logically
@@ -88,6 +89,34 @@
  * All methods on the {@code Scheduler} and {@code Worker} classes should be thread safe.
  */
 public abstract class Scheduler {
+    /**
+     * Value representing whether to use {@link System#nanoTime()}, or default as clock for {@link #now(TimeUnit)}
+     * and {@link Scheduler.Worker#now(TimeUnit)}
+     * <p>
+     * Associated system parameter:
+     * <ul>
+     *   <li>{@code rx3.scheduler.use-nanotime}, boolean, default {@code false}
+     * </ul>
+     */
+    static boolean IS_DRIFT_USE_NANOTIME = Boolean.getBoolean("rx3.scheduler.use-nanotime");
+
+    /**
+     * Returns the current clock time depending on state of {@link Scheduler#IS_DRIFT_USE_NANOTIME} in given {@code unit}
+     * <p>
+     * By default {@link System#currentTimeMillis()} will be used as the clock. When the property is set
+     * {@link System#nanoTime()} will be used.
+     * <p>
+     * @param unit the time unit
+     * @return the 'current time' in given unit
+     * @throws NullPointerException if {@code unit} is {@code null}
+     */
+    static long computeNow(TimeUnit unit) {
+        if(!IS_DRIFT_USE_NANOTIME) {
+            return unit.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+        }
+        return unit.convert(System.nanoTime(), TimeUnit.NANOSECONDS);
+    }
+
     /**
      * The tolerance for a clock drift in nanoseconds where the periodic scheduler will rebase.
      * <p>
@@ -156,7 +185,7 @@ public static long clockDriftTolerance() {
      * @since 2.0
      */
     public long now(@NonNull TimeUnit unit) {
-        return unit.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+        return computeNow(unit);
     }
 
     /**
@@ -362,8 +391,9 @@ public <S extends Scheduler & Disposable> S when(@NonNull Function<Flowable<Flow
      * track the individual {@code Runnable} tasks while they are waiting to be executed (with or without delay) so that
      * {@link #dispose()} can prevent their execution or potentially interrupt them if they are currently running.
      * <p>
-     * The default implementation of the {@link #now(TimeUnit)} method returns current
-     * {@link System#currentTimeMillis()} value in the desired time unit. Custom {@code Worker} implementations can override this
+     * The default implementation of the {@link #now(TimeUnit)} method returns current {@link System#currentTimeMillis()}
+     * value in the desired time unit, unless {@code rx3.scheduler.use-nanotime} (boolean) is set. When the property is set to
+     * {@code true}, the method uses {@link System#nanoTime()} as its basis instead. Custom {@code Worker} implementations can override this
      * to provide specialized time accounting (such as virtual time to be advanced programmatically).
      * Note that operators requiring a scheduler may rely on either of the {@code now()} calls provided by
      * {@code Scheduler} or {@code Worker} respectively, therefore, it is recommended they represent a logically
@@ -482,7 +512,7 @@ public Disposable schedulePeriodically(@NonNull Runnable run, final long initial
          * @since 2.0
          */
         public long now(@NonNull TimeUnit unit) {
-            return unit.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
+            return computeNow(unit);
         }
 
         /**
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 5456ea1924..9e6e92295e 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -40,6 +40,8 @@
  * <li>{@code rx3.single-priority} (int): sets the thread priority of the {@link #single()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
  * <li>{@code rx3.purge-enabled} (boolean): enables periodic purging of all {@code Scheduler}'s backing thread pools, default is {@code false}</li>
  * <li>{@code rx3.purge-period-seconds} (int): specifies the periodic purge interval of all {@code Scheduler}'s backing thread pools, default is 1 second</li>
+ * <li>{@code rx3.scheduler.use-nanotime} (boolean): {@code true} instructs {@code Scheduler} to use {@link System#nanoTime()} for {@link Scheduler#now(TimeUnit)},
+ * instead of default {@link System#currentTimeMillis()} ({@code false})</li>
  * </ul>
  */
 public final class Schedulers {
diff --git a/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java b/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java
index a8e661fe75..e7c095f152 100644
--- a/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java
@@ -16,10 +16,48 @@
 package io.reactivex.rxjava3.core;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
+import org.junit.After;
 import org.junit.Test;
 
+import java.util.concurrent.TimeUnit;
+
 public class SchedulerTest {
+    private static final String DRIFT_USE_NANOTIME = "rx3.scheduler.use-nanotime";
+
+    @After
+    public void cleanup() {
+      // reset value to default in order to not influence other tests
+      Scheduler.IS_DRIFT_USE_NANOTIME = false;
+    }
+
+    @Test
+    public void driftUseNanoTimeNotSetByDefault() {
+      assertFalse(Scheduler.IS_DRIFT_USE_NANOTIME);
+      assertFalse(Boolean.getBoolean(DRIFT_USE_NANOTIME));
+    }
+
+    @Test
+    public void computeNow_currentTimeMillis() {
+      TimeUnit unit = TimeUnit.MILLISECONDS;
+      assertTrue(isInRange(System.currentTimeMillis(), Scheduler.computeNow(unit), unit, 250, TimeUnit.MILLISECONDS));
+    }
+
+    @Test
+    public void computeNow_nanoTime() {
+      TimeUnit unit = TimeUnit.NANOSECONDS;
+      Scheduler.IS_DRIFT_USE_NANOTIME = true;
+
+      assertFalse(isInRange(System.currentTimeMillis(), Scheduler.computeNow(unit), unit, 250, TimeUnit.MILLISECONDS));
+      assertTrue(isInRange(System.nanoTime(), Scheduler.computeNow(unit), TimeUnit.NANOSECONDS, 250, TimeUnit.MILLISECONDS));
+    }
+
+    private boolean isInRange(long start, long stop, TimeUnit source, long maxDiff, TimeUnit diffUnit) {
+      long diff = Math.abs(stop - start);
+      return diffUnit.convert(diff, source) <= maxDiff;
+    }
 
     @Test
     public void clockDriftCalculation() {

From 8dd6f21fbe7fde96b62e29d7b035fa4e7f55e52e Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 29 Jan 2021 08:56:24 +0100
Subject: [PATCH 209/665] Bump build-info-extractor-gradle from 4.19.0 to
 4.20.0 (#7171)

Bumps build-info-extractor-gradle from 4.19.0 to 4.20.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1fb259d600..a9caec8d0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.2"
   ext.licenseVersion = "0.15.0"
   ext.bintrayVersion = "1.8.5"
-  ext.jfrogExtractorVersion = "4.19.0"
+  ext.jfrogExtractorVersion = "4.20.0"
   ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
 

From 4d325c6b73a47908d268bb3d79c40195ff7dcd82 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 1 Feb 2021 09:47:57 +0100
Subject: [PATCH 210/665] 3.x: Workaround for FutureTask.toString + JDK 11
 build (#7173)

---
 .github/workflows/gradle_jdk11.yml            | 33 +++++++++++++
 .../schedulers/AbstractDirectTask.java        | 20 ++++++++
 .../ScheduledDirectPeriodicTask.java          |  2 +-
 .../schedulers/ScheduledRunnable.java         | 24 +++++++++-
 .../schedulers/AbstractDirectTaskTest.java    | 27 +++++++++++
 .../schedulers/ScheduledRunnableTest.java     | 25 ++++++++++
 .../schedulers/AbstractSchedulerTests.java    | 48 +++++++++++++++++++
 7 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/gradle_jdk11.yml

diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
new file mode 100644
index 0000000000..f81dc9de27
--- /dev/null
+++ b/.github/workflows/gradle_jdk11.yml
@@ -0,0 +1,33 @@
+# This workflow will build a Java project with Gradle
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: JDK 11
+
+on:
+  push:
+    branches: [ 3.x ]
+  pull_request:
+    branches: [ 3.x ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 11
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - name: Cache Gradle packages
+      uses: actions/cache@v2
+      with:
+        path: ~/.gradle/caches
+        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+    - name: Build PR
+      run: ./gradlew -PreleaseMode=pr build --stacktrace
+    #- name: Upload to Codecov  
+    #  uses: codecov/codecov-action@v1
\ No newline at end of file
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
index a1c4bc2ce1..7ae69a3ea5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
@@ -83,4 +83,24 @@ public final void setFuture(Future<?> future) {
     public Runnable getWrappedRunnable() {
         return runnable;
     }
+
+    @Override
+    public String toString() {
+        String status;
+        Future<?> f = get();
+        if (f == FINISHED) {
+            status = "Finished";
+        } else if (f == DISPOSED) {
+            status = "Disposed";
+        } else {
+            Thread r = runner;
+            if (r != null) {
+                status = "Running on " + runner;
+            } else {
+                status = "Waiting";
+            }
+        }
+
+        return getClass().getSimpleName() + "[" + status + "]";
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
index 4be6e4b558..a3b90bdf76 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
@@ -39,8 +39,8 @@ public void run() {
             runner = null;
         } catch (Throwable ex) {
             // Exceptions.throwIfFatal(ex); nowhere to go
-            runner = null;
             dispose();
+            runner = null;
             RxJavaPlugins.onError(ex);
             throw ex;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
index d437985890..063c48163b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
@@ -69,7 +69,6 @@ public void run() {
                 throw e;
             }
         } finally {
-            lazySet(THREAD_INDEX, null);
             Object o = get(PARENT_INDEX);
             if (o != PARENT_DISPOSED && compareAndSet(PARENT_INDEX, o, DONE) && o != null) {
                 ((DisposableContainer)o).delete(this);
@@ -81,6 +80,7 @@ public void run() {
                     break;
                 }
             }
+            lazySet(THREAD_INDEX, null);
         }
     }
 
@@ -137,4 +137,26 @@ public boolean isDisposed() {
         Object o = get(PARENT_INDEX);
         return o == PARENT_DISPOSED || o == DONE;
     }
+
+    @Override
+    public String toString() {
+        String state;
+        Object o = get(FUTURE_INDEX);
+        if (o == DONE) {
+            state = "Finished";
+        } else if (o == SYNC_DISPOSED) {
+            state = "Disposed(Sync)";
+        } else if (o == ASYNC_DISPOSED) {
+            state = "Disposed(Async)";
+        } else {
+            o = get(THREAD_INDEX);
+            if (o == null) {
+                state = "Waiting";
+            } else {
+                state = "Running on " + o;
+            }
+        }
+
+        return getClass().getSimpleName() + "[" + state + "]";
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
index 85507fb7f1..dfd3ffeae9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
@@ -241,4 +241,31 @@ public void run() {
             TestHelper.race(r1, r2);
         }
     }
+
+    static class TestDirectTask extends AbstractDirectTask {
+        private static final long serialVersionUID = 587679821055711738L;
+
+        TestDirectTask() {
+            super(Functions.EMPTY_RUNNABLE);
+        }
+    }
+
+    @Test
+    public void toStringStates() {
+        TestDirectTask task = new TestDirectTask();
+
+        assertEquals("TestDirectTask[Waiting]", task.toString());
+
+        task.runner = Thread.currentThread();
+
+        assertEquals("TestDirectTask[Running on " + Thread.currentThread() + "]", task.toString());
+
+        task.dispose();
+
+        assertEquals("TestDirectTask[Disposed]", task.toString());
+
+        task.set(AbstractDirectTask.FINISHED);
+
+        assertEquals("TestDirectTask[Finished]", task.toString());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
index f0577e41ca..4225a71c05 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
@@ -399,4 +399,29 @@ public void withParentIsDisposed() {
 
         assertFalse(set.remove(run));
     }
+
+    @Test
+    public void toStringStates() {
+        CompositeDisposable set = new CompositeDisposable();
+        ScheduledRunnable task = new ScheduledRunnable(Functions.EMPTY_RUNNABLE, set);
+
+        assertEquals("ScheduledRunnable[Waiting]", task.toString());
+
+        task.set(ScheduledRunnable.THREAD_INDEX, Thread.currentThread());
+
+        assertEquals("ScheduledRunnable[Running on " + Thread.currentThread() + "]", task.toString());
+
+        task.dispose();
+
+        assertEquals("ScheduledRunnable[Disposed(Sync)]", task.toString());
+
+        task.set(ScheduledRunnable.FUTURE_INDEX, ScheduledRunnable.DONE);
+
+        assertEquals("ScheduledRunnable[Finished]", task.toString());
+
+        task = new ScheduledRunnable(Functions.EMPTY_RUNNABLE, set);
+        task.dispose();
+
+        assertEquals("ScheduledRunnable[Disposed(Async)]", task.toString());
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
index 34d8ac1b39..6c32a09898 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
@@ -27,6 +27,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.SequentialDisposable;
@@ -771,4 +772,51 @@ public void schedulePeriodicallyDirectNullRunnable() {
             assertEquals("run is null", npe.getMessage());
         }
     }
+
+    void schedulePrint(Function<Runnable, Disposable> onSchedule) {
+        CountDownLatch waitForBody = new CountDownLatch(1);
+        CountDownLatch waitForPrint = new CountDownLatch(1);
+
+        try {
+            Disposable d = onSchedule.apply(() -> {
+                waitForBody.countDown();
+                try {
+                    waitForPrint.await();
+                } catch (InterruptedException ex) {
+                    ex.printStackTrace();
+                }
+            });
+
+            waitForBody.await();
+
+            assertNotEquals("", d.toString());
+        } catch (Throwable ex) {
+            throw new AssertionError(ex);
+        } finally {
+            waitForPrint.countDown();
+        }
+    }
+
+    @Test
+    public void scheduleDirectPrint() {
+        if (getScheduler() instanceof TrampolineScheduler) {
+            // no concurrency with Trampoline
+            return;
+        }
+        schedulePrint(r -> getScheduler().scheduleDirect(r));
+    }
+
+    @Test
+    public void schedulePrint() {
+        if (getScheduler() instanceof TrampolineScheduler) {
+            // no concurrency with Trampoline
+            return;
+        }
+        Worker worker = getScheduler().createWorker();
+        try {
+            schedulePrint(worker::schedule);
+        } finally {
+            worker.dispose();
+        }
+    }
 }

From d7805f867589addbfbbad497806934c6fe347266 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 2 Feb 2021 12:36:35 +0100
Subject: [PATCH 211/665] 3.x: Allow reruns of release actions by enabling
 bintray.override (#7176)

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index a9caec8d0c..5708d4d1be 100644
--- a/build.gradle
+++ b/build.gradle
@@ -349,6 +349,7 @@ if (rootProject.hasProperty("releaseMode")) {
          key = rootProject.bintrayKey
          configurations = ["archives"]
          publish = true
+         override = true // Allows re-running the GHA upon release hangs
          pkg {
            repo = "RxJava"
            name = "RxJava"

From 0cb8978c1d21363eac53299272295567efb13a55 Mon Sep 17 00:00:00 2001
From: Wayne Yang <ShengChangYang@users.noreply.github.com>
Date: Wed, 3 Feb 2021 02:02:29 +0800
Subject: [PATCH 212/665] Fix the typos (#7178)

Co-authored-by: Wayne_Yang <wayne_yang@perfectcorp.com>
---
 .../java/io/reactivex/rxjava3/schedulers/Schedulers.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 9e6e92295e..83fee3be34 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -367,7 +367,7 @@ public static Scheduler single() {
      * because such circumstances prevent RxJava from progressing flow-related activities correctly.
      * If the {@link Executor#execute(Runnable)} or {@link ExecutorService#submit(Callable)} throws,
      * the {@code RejectedExecutionException} is routed to the global error handler via
-     * {@link RxJavaPlugins#onError(Throwable)}. To avoid shutdown-reladed problems, it is recommended
+     * {@link RxJavaPlugins#onError(Throwable)}. To avoid shutdown-related problems, it is recommended
      * all flows using the returned {@code Scheduler} to be canceled/disposed before the underlying
      * {@code Executor} is shut down. To avoid problems due to the {@code Executor} having a bounded-queue,
      * it is recommended to rephrase the flow to utilize backpressure as the means to limit outstanding work.
@@ -441,7 +441,7 @@ public static Scheduler from(@NonNull Executor executor) {
      * because such circumstances prevent RxJava from progressing flow-related activities correctly.
      * If the {@link Executor#execute(Runnable)} or {@link ExecutorService#submit(Callable)} throws,
      * the {@code RejectedExecutionException} is routed to the global error handler via
-     * {@link RxJavaPlugins#onError(Throwable)}. To avoid shutdown-reladed problems, it is recommended
+     * {@link RxJavaPlugins#onError(Throwable)}. To avoid shutdown-related problems, it is recommended
      * all flows using the returned {@code Scheduler} to be canceled/disposed before the underlying
      * {@code Executor} is shut down. To avoid problems due to the {@code Executor} having a bounded-queue,
      * it is recommended to rephrase the flow to utilize backpressure as the means to limit outstanding work.
@@ -521,7 +521,7 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
      * because such circumstances prevent RxJava from progressing flow-related activities correctly.
      * If the {@link Executor#execute(Runnable)} or {@link ExecutorService#submit(Callable)} throws,
      * the {@code RejectedExecutionException} is routed to the global error handler via
-     * {@link RxJavaPlugins#onError(Throwable)}. To avoid shutdown-reladed problems, it is recommended
+     * {@link RxJavaPlugins#onError(Throwable)}. To avoid shutdown-related problems, it is recommended
      * all flows using the returned {@code Scheduler} to be canceled/disposed before the underlying
      * {@code Executor} is shut down. To avoid problems due to the {@code Executor} having a bounded-queue,
      * it is recommended to rephrase the flow to utilize backpressure as the means to limit outstanding work.

From 5fb0ace5f6af6b20cb7f7fcb83c502002b438d10 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 5 Feb 2021 17:48:08 +0100
Subject: [PATCH 213/665] 3.x: Release to Sonatype directly (#7181)

* 3.x: Release to Sonatype directly

* Update build.gradle

* Update gradle.properties

* Turn RS into compile dependency in POM

* Fix the POM of the snapshot/artifactory upload
---
 .github/workflows/gradle_release.yml |  14 ++-
 build.gradle                         | 149 ++++++---------------------
 gradle.properties                    |  24 ++++-
 gradle/javadoc_cleanup.gradle        |   1 -
 4 files changed, 66 insertions(+), 122 deletions(-)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 6e5af8f48f..6641017cc9 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -17,11 +17,11 @@ jobs:
     env:
       # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
       # ------------------------------------------------------------------------------ 
-      bintrayUser: ${{ secrets.BINTRAY_USER }}
-      bintrayKey: ${{ secrets.BINTRAY_KEY }}
-      sonatypeUsername: ${{ secrets.SONATYPE_USER }}
-      sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
       JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
+      ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_USER }}
+      ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+      ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
+      ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
@@ -43,8 +43,12 @@ jobs:
     - name: Extract version tag
       run: echo "BUILD_TAG=${GITHUB_REF:10}" >> $GITHUB_ENV
     - name: Build and Release
-      run: ./gradlew -PreleaseMode=full -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
+      run: ./gradlew -PreleaseMode=full build --stacktrace --no-daemon
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
+    - name: Upload release
+      run: ./gradlew -PreleaseMode=full javadocCleanup uploadArchives --no-daemon --no-parallel
+    - name: Publish release
+      run: ./gradlew -PreleaseMode=full closeAndReleaseRepository --no-daemon --no-parallel
     - name: Push Javadocs
       run: ./push_javadoc.sh
diff --git a/build.gradle b/build.gradle
index 5708d4d1be..6c256f24ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,15 +13,14 @@ buildscript {
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.2"
   ext.licenseVersion = "0.15.0"
-  ext.bintrayVersion = "1.8.5"
   ext.jfrogExtractorVersion = "4.20.0"
   ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
+  ext.vanniktechPublishPlugin = "0.13.0"
 
   // --------------------------------------
 
   repositories { 
-    jcenter()
     mavenCentral()
     maven {
         url "https://plugins.gradle.org/m2/"
@@ -31,28 +30,27 @@ buildscript {
     classpath "ru.vyarus:gradle-animalsniffer-plugin:$animalSnifferVersion"
     classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:$licenseVersion"
     classpath "me.champeau.gradle:jmh-gradle-plugin:$jmhGradleVersion"
-    classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintrayVersion"
     classpath "org.jfrog.buildinfo:build-info-extractor-gradle:$jfrogExtractorVersion"
     classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:$bndVersion"
+    classpath "com.vanniktech:gradle-maven-publish-plugin:$vanniktechPublishPlugin"
   }
 }
 
 group = "io.reactivex.rxjava3"
 ext.githubProjectName = "rxjava"
 
-version = project.properties["release.version"]
-
 def releaseTag = System.getenv("BUILD_TAG");
 if (releaseTag != null && !releaseTag.isEmpty()) {
     if (releaseTag.startsWith("v")) {
         releaseTag = releaseTag.substring(1);
     }
-    version = releaseTag;
-    project.properties.put("release.version", releaseTag);
+    project.setProperty("VERSION_NAME" , releaseTag);
 
     println("Releasing with version " + version);
 }
 
+version = project.properties["VERSION_NAME"]
+
 description = "RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM."
 
 apply plugin: "java-library"
@@ -62,7 +60,6 @@ apply plugin: "ru.vyarus.animalsniffer"
 apply plugin: "maven"
 apply plugin: "me.champeau.gradle.jmh"
 apply plugin: "com.github.hierynomus.license"
-apply plugin: "com.jfrog.bintray"
 apply plugin: "com.jfrog.artifactory"
 apply plugin: "eclipse"
 
@@ -116,21 +113,7 @@ animalsniffer {
     annotation = "io.reactivex.rxjava3.internal.util.SuppressAnimalSniffer"
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = "javadoc"
-    from javadoc.destinationDir
-}
-
-artifacts {
-    archives jar
-    archives sourcesJar
-    archives javadocJar
-}
+apply plugin: 'maven'
 
 apply plugin: 'biz.aQute.bnd.builder'
 
@@ -154,61 +137,6 @@ license {
     excludes(["**/*.md", "**/*.txt"])
 }
 
-apply plugin: "maven-publish"
-
-install {
-    repositories.mavenInstaller.pom.project {
-        name "RxJava"
-        description "Reactive Extensions for Java"
-        url "https://github.com/ReactiveX/RxJava"
-        licenses {
-            license {
-                name "The Apache Software License, Version 2.0"
-                url "http://www.apache.org/licenses/LICENSE-2.0.txt"
-                distribution "repo"
-            }
-        }
-        developers {
-            developer {
-                id "akarnokd"
-                name "David Karnok"
-                email "akarnokd@gmail.com"
-            }
-        }
-        scm {
-            connection "scm:git:git@github.com:ReactiveX/RxJava.git"
-            url "scm:git:git@github.com:ReactiveX/RxJava.git"
-            developerConnection "scm:git:git@github.com:ReactiveX/RxJava.git"
-        }
-        issueManagement {
-            system "github"
-            url "https://github.com/ReactiveX/RxJava/issues"
-        }
-    }
-}
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            from components.java
-            artifact (sourcesJar) { 
-                classifier = "sources"
-            }
-        }
-    }
-}
-
-// Reactive-Streams as compile dependency
-publishing.publications.all {
-  pom.withXml {
-    asNode().dependencies."*".findAll() {
-      it.scope.text() == "runtime" && project.configurations.compile.allDependencies.find { dep ->
-        dep.name == it.artifactId.text()
-      }
-    }.each { it.scope*.value = "compile"}
-  }
-}
-
 jmh {
     jmhVersion = jmhLibVersion
     humanOutputFile = null
@@ -312,12 +240,28 @@ checkstyle {
     toolVersion = checkstyleVersion
 }
 
+apply from: file("gradle/javadoc_cleanup.gradle")
+
+def fixPom() {
+    // Reactive-Streams as compile dependency
+    publishing.publications.all {
+      pom.withXml {
+        asNode().dependencies."*".findAll() {
+          it.scope.text() == "runtime" && project.configurations.compile.allDependencies.find { dep ->
+            dep.name == it.artifactId.text()
+          }
+        }.each { it.scope*.value = "compile"}
+      }
+    }
+}
+
 if (rootProject.hasProperty("releaseMode")) {
 
   if ("branch".equals(rootProject.releaseMode)) {
     // From https://github.com/ReactiveX/RxAndroid/blob/2.x/rxandroid/build.gradle#L94
   
     println("ReleaseMode: " + rootProject.releaseMode);
+
     artifactory {
         contextUrl = "https://oss.jfrog.org"
     
@@ -332,48 +276,23 @@ if (rootProject.hasProperty("releaseMode")) {
             defaults {
                 publishConfigs("archives")
             }
+
+            fixPom()
         }
     }
     
     build.finalizedBy(artifactoryPublish)
   }
 
-   if ("full".equals(rootProject.releaseMode)) {
-      // based on https://github.com/bintray/gradle-bintray-plugin
-      def rver = version;
-
-      println("ReleaseMode: " + rootProject.releaseMode + " version " + rver);
-
-      bintray {
-         user = rootProject.bintrayUser
-         key = rootProject.bintrayKey
-         configurations = ["archives"]
-         publish = true
-         override = true // Allows re-running the GHA upon release hangs
-         pkg {
-           repo = "RxJava"
-           name = "RxJava"
-           userOrg = "reactivex"
-           labels = ["rxjava", "reactivex"]
-           licenses = ["Apache-2.0"]
-           vcsUrl = "https://github.com/ReactiveX/RxJava.git"
-           version {
-             name = rver
-             gpg {
-                sign = true
-             }
-             mavenCentralSync {
-               sync = true 
-               user = rootProject.sonatypeUsername
-               password = rootProject.sonatypePassword
-               close = "1"
-             }
-           }
-         }
+  if ("full".equals(rootProject.releaseMode)) {
+    apply plugin: "com.vanniktech.maven.publish"
+
+    fixPom()
+
+    signing {
+      if (project.hasProperty('SIGNING_PRIVATE_KEY') && project.hasProperty('SIGNING_PASSWORD')) {
+         useInMemoryPgpKeys(project.getProperty('SIGNING_PRIVATE_KEY'), project.getProperty('SIGNING_PASSWORD'))
       }
-      
-      build.finalizedBy(bintrayUpload)
-   }
+    }
+  }
 }
-
-apply from: file("gradle/javadoc_cleanup.gradle")
diff --git a/gradle.properties b/gradle.properties
index 820b2a5bc1..be63fe3d85 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,24 @@
 release.scope=patch
-release.version=3.0.0-SNAPSHOT
+VERSION_NAME=3.0.0-SNAPSHOT
+
+GROUP=io.reactivex.rxjava3
+POM_ARTIFACT_ID=rxjava
+POM_NAME=RxJava
+POM_PACKAGING=jar
+
+POM_DESCRIPTION=Reactive Extensions for Java
+POM_INCEPTION_YEAR=2013
+
+POM_URL=https://github.com/akarnokd/RxJavaExtensions
+POM_SCM_URL=https://github.com/ReactiveX/RxJava
+POM_SCM_CONNECTION=scm:git:git://github.com/ReactiveX/RxJava.git
+POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/ReactiveX/RxJava.git
+
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=akarnokd
+POM_DEVELOPER_NAME=David Karnok
+POM_DEVELOPER_URL=https://github.com/akarnokd/
+POM_DEVELOPER_EMAIL=akarnokd@gmail.com
diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index 64f6437288..f6811fdcaf 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -57,5 +57,4 @@ def fixJavadocFile(file) {
     file.setText(fileContents, 'UTF-8');
 }
 
-javadocJar.dependsOn javadocCleanup
 build.dependsOn javadocCleanup 
\ No newline at end of file

From 27cd0f7e86ffde69689fd857abb6258322f37869 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 5 Feb 2021 20:00:22 +0100
Subject: [PATCH 214/665] Update build.gradle

---
 build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.gradle b/build.gradle
index 6c256f24ae..4a2b4949e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -294,5 +294,10 @@ if (rootProject.hasProperty("releaseMode")) {
          useInMemoryPgpKeys(project.getProperty('SIGNING_PRIVATE_KEY'), project.getProperty('SIGNING_PASSWORD'))
       }
     }
+    mavenPublish {
+      nexus {
+        stagingProfile = "io.reactivex"
+      }
+    }
   }
 }

From 4e86963d9710d4f8fcbba0451e250237f4db15f8 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 5 Feb 2021 20:27:48 +0100
Subject: [PATCH 215/665] Update gradle_release.yml

---
 .github/workflows/gradle_release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 6641017cc9..9bca1fb9ec 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -47,8 +47,8 @@ jobs:
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
     - name: Upload release
-      run: ./gradlew -PreleaseMode=full javadocCleanup uploadArchives --no-daemon --no-parallel
+      run: ./gradlew -PreleaseMode=full javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
     - name: Publish release
-      run: ./gradlew -PreleaseMode=full closeAndReleaseRepository --no-daemon --no-parallel
+      run: ./gradlew -PreleaseMode=full closeAndReleaseRepository --no-daemon --no-parallel --stacktrace
     - name: Push Javadocs
       run: ./push_javadoc.sh

From adc3a5be7ab276297a2907f3e2f1581fb5b4179f Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 13 Feb 2021 09:20:06 +0100
Subject: [PATCH 216/665] 3.x: Upgrade to Gradle 6.8.2 (#7184)

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 55616 -> 58702 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |  29 ++++++++++-------------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf016b3885f6930543d57b744ea8c220a1a..cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b 100644
GIT binary patch
delta 16535
zcmZ9zbyyr-lRgZCTOhc*ySoH;cXxO94DJ#b+}+(FxVr{|dypU*+~LbU`|kes`Fj57
zyY8yfeVy*U&eSRCZ-Sbgglb@bL`kJuD(i%VfWU)-fM5ZAqre6!L1F?a*_h28Ox@k%
z)ux=5zF-P1b$GIsh22W}rhGA$wY4AMj)Kul`ohep<{7-Ia88yvi6?!4@QO*mP1?8%
z^+-G1h=Bla=)vYr;y%0F`7k?YyaR;riRpp3>1dAn4tcrPo2W>F8o&vIoo8FT<sPh8
z9mu>(bX<wvfoEU59Ty1{vYfMEF)#ak96dc-x@;+^=;u^`6bw#fn<TbwqQx8<b9H)A
z-I?T6U!Y--rm!r=@x4SG+tsjJ@?7M%Y|r<g{X!j$&lg;)6+k93DRaCapIbRgIazWl
zZD`$k>b?GlmSb7V<kXlp6_>9@<6RmZzUyg~x=I4k!GQX(!lDs)h5@qh6<w)x3l+S(
zVjZS%2nRRPHVE6EvVzP($SFdC>p<nQyG9~2xbJ`q1|DXWkK$X$KVnol{p&l5sVEER
zOby;6T@HJp+_r*Pk9zFQd>kwH=O@3LDKNm1i;WQ8o$Fl=C^mx!!2RpT&LbaQ5~-gj
zk}V-#Uq1+j(|;TD?e?fpp}ORH^Fq!uFQ{?+R=-AAXl>dQHNRxA%eOvJm2_4jRrfpH
z5-aw5XpBp(8nzoT7~-#u+*s{L@q<(~8X0g_k%xjtgn)pDhk$?(g|LNWtR{hhfS~+K
zG5zN~69PBXF|=_%h}_p27^B$eqeB|SWFatETD2Oq;%Vn$m>?Zn)|n^BYMi`It%~RE
z{?zseJ_NVFBivK1vbQd!dzAq}2e$&>Wo6B}`={5MckUhxc|L^S-q?bQA7!N=FxZWT
zU=VP`Gg4To%<=zBf<;qVDNMDbkkc&;M*Z23z5%huy5rEWEer-UUAsxdlvL`%T?_}|
z(AC(<JIKrld8h(bqm2S6MUhNZS0`hONk1{0%8q`8B#kHvvxK#r<m}94YjMj=#|tU<
zQ1@2ictoFIKz@(Y+(q8d+&XMdT_kTmZj}tBHC>*xAH|wk8S#%l@lNw>O44BZp257X
zHvrr{{odBrG<b2#H{~|@sb|`zE7Oy6WAC0<ynwL|87lhhH`7Hz8aHQi#w>rE6ZV);
zj8iGg2`q{Cm5o=D;JE|EG^sx`O)a|Vsgst~3Ake^OY!6;?G&szhN9ov0-!PbvBcU5
zGRjaV&=KpDs4zqyN`T#AmhHfP#k*wGhXF?Dga*x|Bj<T95+_o6^UydsmgaTKRIjNI
zmCN?Vx~29B71wr{p?kP-H)b6(BsgVSBD7cV%XjIjw8mr_AGHw}1B<9UYbR9Vm|PKU
zU+%17Zbxpq6z7@z;|;88V{(r}WTWl0r&3r8OdvuLl@5p|2eo+Jv6dF(UxBO07(l#g
zGtB+6U&APqkwXWw?1{!644C!ivC8?mv1eAf2J;i;y*i(<_r*hh6=I6drGeyQ+u>`&
zHV~0hpwX|JkNK!dAqe;o8Ea%7b%IeQD~k(41Q0J{%pt1LS1<!Yl(9C40w<YUy(iDg
zG>Ggcq3F<yb~yr+YU%Yt)Hc*KVSvWF@-W7G_P<N~7C9m`kBWK`dk0L23~KQ?V>OT=
z5A|Vo_JTwHTm_Y#V?{dbMum`oDTd}5=vi-t>w&h{Z8|8w&TVt0^eE-i3>R&hl&SM_
zmq)Meerq`|97S(0OKH~x2bnWXD<<toG`ZT8k7l3oYl1ZLlQhDw(k6chPyp2qmAq=t
z!D=^tGL-r>9`-`tCM{=<s7JDEoSVAJk8PrP@vpi29Ngp4H&g3Z2UXsL77tg75y6(1
z7VC_SI{Pq}{K#ED+g44!|7crtAaC)zn(Hn}$y2(PJY%WI_O99JE@iS40w=dsBvn-S
zvauk;>8}{PSRq_%t`k~5fPh}{h3YIkjBTGneZ+JF+OuXd^<)_ZuX5$u&ZP+pP<<fw
z=isQ*h;!?g^t1Bf@`CqJ8jMeyP{ci84b3nS__35BWRaIZrqIQdl9T7ql+SRNiNb?z
zYvLaT-Wa_GtA9SAf^(cXU*HE&WPncODHLkbv)&bmoiR#gw3;4{1wjAl5BQDZcY42~
zcW?szpn0$jX*Z~Zg3s7TyDetRe8A?LFShha;M{V>2g_}pc)~MKJVi9<{(FJ?Nr^j)
z=vL&X+rs>>ym1r>$ddJHuRN}3R53kb3p*4jpEpZzzA*8+3P^Zm_{$%#!r=GQC(O@C
zx6Lk~7MUL^QcV)@DgnE*4-XV`3c`9c<x|H5WV_jlBpNOdo~efO_9Mc+g+)ntDRpMx
zZI|Us++I{J?^_o=o%jY|G;X^1{DHl%q|m&rH4h?wJ3Ap*8-Cw}-Pa_{z<VPwEKYpu
z`+|Q*6gW=YRf=UB^%+-%H&>&QcG>RRmvV%AHUPa?0%()8%asP!noiK|7#1;^qznQT
z0~b;d`W|`=o_E4xvzJ%-6v|@%kGFdG2L#9-_6miL%AA`Q8UkV!?(cf~&k72JLx7X8
zv@-Q{@Bp3R5(7&$x6}zVF+a8(xRIt{)nsT>+Jf4+pyjHxT1sjigKcbRQ&rGv`O^=%
z9loFMTS2`MJnyO-KNl${u=ILJh5e4pedY`0;4eN1B{>+214bTnrh^ygc0ClRkGF-6
z^KM>p6MJ-DjzMz}f}!mS!&hQLdM<J?qIB%k(Mz7Z=D>YMBZn`5<C3H9Xe3;_epV@D
z3zTjP@|bjrW2*vTYB$`}{i0wtsC48w4hh0~18iY&>Ft}T)22E31R0j608`P&({6Sv
z+~0D8pDl^uBMt<J2=CJj#turSdbRH*OOx9ff?ZP2-eHUx*Ns}6e5D>G_h6A3r60>3
ze}0-}HvlSJitaX&`j_DjiW^0DaQ|}DHmI7NLj)$z@t4@n`b%CaxbCFQaar<aG&3OQ
z4(;RD^A9*B;nn2GpM4u*z!LpreZTK{C{m<qi(Z;liv}*x!^=8w(oMnDOMW^FNGdn{
zTvD%a$X;B`P7|6g#||NWFk}^Bv*1o=^9{#|F9TRSnZTYwFkm@MONQwjcNMNTiZHRf
zWdp+!8<PGjr6A8>%#KMbFrP8;UV*=UXv2t~N7${I78|hP9xX|r*{0)ZBS-A2?pnEp
z5{%<w9ctweyB{&h=%aZ(v7T({L7~(K-Qt3l&eUSo7tY<H&l~g!X>38c<{72i%oG5F
zBn@<(E_yi9g#uyMnN0S#v~<f^ZUu7>L6&+}+@3~P5v<;rEzy3qM((!S^E7A$!`9*Z
zfXHq{x|C#{_u}V_a3rgg{+P${gr=ns+3nmp7N*<vd`G6S3oV(q>3$9I`A)xCG=A&A
zk)vJy%fy1XNE<$2gK24($*r7zv|jZX)Cs&uID;Ff>s4pn&mdgKDt8oUo#5NiSA)&e
zJ4iE)n<|_?dQ#*Q@65>|bKEX#^E_AO@K|ufg}Vxmu;OF$c;lKXEaaj*j#yz`L)}N4
z7`o+@_lsZgv4de;{vM}N<&38%r!Vzbcm11k4Keo+>iUiF?hz3GnEb7mTyS3bsTfEg
z{lk+$yF=lE(k<$qGn=dX;d3Di>#8R3#qeA{5c+~3qq1%VjOdZv{)bd<QpNqy9CvB)
zmCMZSl<Gj}ha{=4ZOpPMF6GaYrjN9S-s1CKni7)vND@~>5jroreFdBBbJ#1)<d`i|
zzj1uE??#?=iTC_1J~iP#Zoe+m)-MBTt<9~fn*Cw!*p@O0<}sd$2q~=g!rqBL$<87K
zVo@(75cNbxpp~g3<W@aGX2ISmf6lf2sXg!WQ3oI)4bftXr%{o<wx<8h@*~6870{RT
zrp$jO!2SqD@hD&FmORdd{=`XD1sW*<DOZnL@GMPLm1L|>lyIhM5VZs&!Pcn5PR2S#
z=^0_9q~0cs$>}}R&gvTxD)MaWj`V7B0z1~8qhjtKm}`Y~#bXcn!m-JZ7H@n7E8l%j
zuSN6NIX__j?Xk_ZA`0VxOyNX<7f$G+m_p4e*zNKonge<-rut`Usij{fL)mOusi|$U
zG_o_^vj(A89K0u3WqcXp5zrI^AV?;CtmPSO5tiQ?Io$v79p?$~+?+i;<U<heSBC2{
z>NYf5nDND9A+<MVjq2f_`T36x!d~jh^m8@Z?h}ju4kvm3O(j0abk0TzWKcC^HK=<o
z^!dprh;}U`0#CcIQH+mz-*J2Ai>Xjmwo|s55SQS$L9~oncx`VWnLO|nBSK6Iu<e92
zm{OJG;Da)877Xr6Zr2m@t1oiGmFVvMYE&@Ix`SpHd9o$5GUoOblf9-h{5Q>erhlQz
zwuQ>taA1U{x7}WC)8#rZke-dv7{a2#t2m)1`e*N@kb5${9SJvk21PuQAlo!osvVYo
z*AA*9nWA8WYM6BTBaiE#Wsp*ug2Ni;mUP#+IfgQB%!hX-a;LhvHF~Uiw$=FPa8M+Q
zbNf%N{comPbCObF8bT2$?fkH+i>L&@2A|M|ni2YeC028z<6$xMKt<;E(nAaKQ|x;N
z<R=8Gdj`KjB=z-S#2$QtXZim5Q0N{Ae&3cwWY%WBpsQ4F*rr?Mzy5azKqwy<0`8}+
zB6;L%)N5K1fBHx8urv+da2&{Onrt!90Kfm)js6%7<pgvdG%KEbk|=weSc;G_@GA4n
zS35e6lYP$Mjg0%mx%fR>C(5?n?3KK3q!h)jC#br?MSQ5~ROH_ujB;*1$-pNF2n=Ef
z2(thDLBRw6dm~q?i{N9R?fIT)<*Qs=K4PwazZ%VvU@pCaFOWbq6^$`<wt6kIqQl;F
zz^l9n;=H$!%JenY*A4ozg>8cv-V*)=9!(~wffqAT0h85(jmhvt3`g!XYq7_pu(SpG
zuFo4gz9bs{%})Pe%lop^TI8cg`F#@A=oJtIti85@I0G|4O1So9HM3OjX)lBAVSCYo
zNc!rGzKXlPl|}C$?p8lKLiJ$;h3}y3K7d;xwj+16he&AiL^Os-U>abIdB9_^y`TH#
zUS%N|z%vlSK_Z${z_JJto+}*4ZW3T+L?1i2$?x40Lis=+@)hM>3k9gH=m>P)CjkH-
zrC&k8K<=vx2<|=O02Ls95dJH}J5x|O_z!h2Mn7;@BsJ_0{iHX_YkJdxzuluV*J~nv
zZ+(RJ4=@zh^dfdJ9r~Aijm&+v5&I~Xpsfz4n0#e6%-Bk+Wn>UEAW9~lP78vslB;y~
zo1df|t7RsgDAXTT3*RqV<8tcwsXu_45jEVD7L)kuEBJ1qbUd)Eq-P496DbYJ-}BPO
zXUZH{e_^Y0XEjZv=quW?TQ;N5JIKV6)dCoj75Gnk5ClN3>>=6re8pbedzbQtGSq7K
zGS2*5X<qD^mp-GO<FxR}9<FxED@5MOP64Z4>Xa)F(uorON)mI(=YL`){fdAVXTtXR
z?E>gtZZ#A~Wd{?Dh9T=cl@_C|pv$1#asILv1iP+hRKnFAZ)$A5PGi!~sPoXGhR()w
z1HEsJtC>BKv>V0f6kr-PbMwil)~(80oiUwtVp(1yoW=XY642$zO00%CSjbM9Hw3~O
zN{JssnF<C46q{pPO?kW=P!6>CFubzZ++sSh(;EyKsbeW~AV%|fD3h|W2=o>_m1xEg
zS9<OcN^#Kus||UX^(&1n`v;$RjvY+T$IE9bV5rOM-4}Pf=xueF@}?5TCt5De4ld4{
zK5){Nt!LPy<_p*<V|TMjBiiY@EBbcIj$NGmiN$OgRwshnN07E>JqIRzw!}X(6J|KG
z9-ip9vJlnYdhKBhdc%p#m2DlLL6OW&Dmg0wd4-HxE=9wreebMg&URh&AI%XfWxo<%
zTTs<x(=6|@QDzrdIHujO-%PQm>B>FK5HKq1$D>O=WW_LG?Cz<oS)4Xtx8U@?6YOzF
zDB-AaD22(>Si#~<dj+0Obb)l!RlUy<n6*bb11)X2l5_MqOSZm!5_jUTh$YiU>CA<-
zK36RlA;PKAM?0TEf|`sPMp={ELiS6~jYefrI5~=W(mM~EG%)G7oz1DPkV-D58=U=?
z>)PhLkx#h7)KFO|W~(XoErM-q##xTUbMp#Qy`e0Q<sy!{q83QeC-rq|VOr9N;v*|B
zQCUdbx>L5)aN+Vq_D}m#bjQA)?x<!}3Hd<+yHwvSKTY+dmyO273exl>QHbUF?>&b>
zuiSSvN~gM<Z%<BV<5XNFnIKF*veYu30pER(PDCwE%@j117DyVtqTMd)54HXgOLuvy
zERoa+3L8&)btT{?h}cRM&aBeGZ&g)jbe0()^F7(z6wz5@D4Wq@S8sejC;Wz&X0;Xi
zar0VymPjt;0-JfaD0~b|ZDq3QNwYzNwM%=9vSvDw>ti(Eo02wSosQnU^i4_LYr-&X
zlj%ECr}SkjnA@NUOeSbPL2Np;qvFuYi~>C?<15|-ngY6(2gpwBR7V7+ou@-#=Z&~y
zTY=GwE0CR+Y?}`Y2%9L2=FKk9Kk2whbTRSKtBU(Eo~D|o-O}0bFtL?!)y-4o=6d9Q
z7EjP$WN{eyMfL53F13MF0~4>;#Cp(@U?a5=Dk7)h(39O}LY9vzi0nbvO%Il_(^ztc
zo<&!Fb{9w`PplGJJ58Y0Y|0hqQouVl$XSONKyQmDFJ-CVayp#XYeVVBx|wep9f3+D
zvQ4n!gOP{IyZ6JFhNun1$$o%*lY%g3Dz~Z_9-BdMR0b9$Y6rtlQ4^6&(&yc~I1iGo
zS2$+!`m^OQ(Z#hke@*Su;D1+v+}2_`&#Q9~ECl**<nzoWyGH9j^5(T4)?8obP%>ts
zd5);~Z&Y$GY?ngLCZ{N{FS|F49GF0g>0B3-AW>=bKBO%sbO|~TDgQ#DKcRzT5vLtZ
zWi;OezJA%rP0L9~x_OMzPuKp!DXOE&(q^0^(}FqzqPTc*_~}(nO*F_?Tt8Q13Buex
zQUspuM`!1e-_IhP9V}qyyG&Z-F{fq3c!dvJ4C3rxKB7k_S`SX75X@T8(5SbVQYx%t
zCeZ}=>{c)@#SZrel(*pUOSWPr);$ex1I((16?Lz_*$JZrUmPO^*<fuWe$mbc=4KS*
zRx0=t1EF$eC^qoXe>zQjI829Sb6a_x0)g36Wod$piD+W<oL&~jr}!QRYW=O@Jkc95
zf!aZMW`U&}kX!Wur0L?KO>sTlnct7G#;>kCev7^LwzYL1n5)bF?A1y8or;AjG?4Vs
zK2_1BkfMEqdD_ww5ie=v<XL{J+hu{)n$mf~_!xy?LD=qsys*<`?n|7Xrds`D-4=*`
z6Kz9F+~v-r{4v~_<ilV5r;lbW%}GwWeVEUC&0wYFag@NWD&R)l-qV9eH*bXt$zt}q
z4D6|9{*6i6&%@3yTY7uFnon-V(#pr0Q&sHRQ}ww|-|;j#jGeCT<##B$FUsx=*M53b
z$@g$iGqCn($Qx)cF!s*%4IftieqjUVMNj8y{KDBa3Rk3(Ptzt<?}KH%tnyeZsb&%p
z6H=4A+T4qb&z?CaD(AFZx`uh^9EwbJ*a`R8v@FDp6QwNTc&&;bXt)wc_m9A+jOz+v
zt83hIl`c#icq-Hwotg7Phz-xI9dvZ_Vmza@(292@bxc$|k>5MCpL{TrJNy8)DLx%r
z&#XmHhq&O>tyfXJP99TItlVcYe}t>+7)ER@@>LM71QqZ1`tB|JYxf2mld0LT>F-6%
zeyR4r9(H^slfuHPIK=E@zN~FH{!t|KOAR})zUFHy*C<1tU_SpC{;DonK{@?!$0AMw
zqR!8h>aWX7Iuqh|o*UgBjVYgi;jd%BrR`F;(n*&~{V|a&Ipx($01mxGRR|IcbIlmP
z1euEoX;?Gwm@nW97Ig!xY>C_-Pyn#uTqwTanQ~9CqF3(rCSY#@6-gNCFn3U#kmN{T
zBmjJ^yR}JP>$vm{rzJz0(;RC|E5l}}IEU*P@5--R^aH<9j{#jsy{Za$t3Y>SgXPRv
z;RB~xVJzrmmnWs^K859zwNcl<L3nKxT<;6}K9IIzi>qytT<E9t!OxHCp>pP!@*T!=
zH3q9AcVI0dzC(PYg^8upVyP@yF}vlvreE4JcV%YNtUSF)J>trpjeRiIK)>b>1L-Z~
z8qrLt3(X&N`hx3e{5>B)rBO4QH1qTo$6pUv9(}qulWyoh<n#)162ru8ot-T4z)vVN
zS*g`iM*-7QTZ)|zE??`@2xgt>o-`6k#*}Rg?;d5l!v%IGJJVBekDVFlZ#etwfuSd$
z3Xf;KI`WL6Yo!llE#z5~U!+((O6HoJhjXT$<?WqRhq+QwWX4NC+pz9|Rx*l60<mpE
zr}JAT`$2iD^2%+eb>fO`RrQ`??n9(ZzA(6UZEYcxWBQe2mmB|vYmQa4ZmP(5j#W<F
zZclv0pZNA#TE<P@KR8!@TRWOxAUfn#eBGzhF+eo%+n23b;Ix)@ys<WI`?jKU!`Je-
zfXyz%Q0;CL=yY!gG`NP|aI-;usvAOnayzm4o?xZs<o}6)|BRuYz)na5cmV@D5_#s6
zS?Gtivp5$(55y<ny*zk^bR#rdrC@9wVyvWKym!K0Q>EsOVNR2R9-EI9hUJfdBpie1
z;2+S%rpd?wDNNCI6O~^fUyj}IhT^bE<bLXnQ4K&bf8^f>K2pCtST6P|u6xV85Zl)8
z)-;%p$lE5`W&eJBp#O@P$Pul71x<IX^ZvQ6Hy6cXAM)}Y@7|Z|f-lkA4ZA=QuRFGz
ztHlOgWJ;H*rz0YNXs%id%eXO&mmvks`U$-X9d$eYp`W7a+qFP|g%A24OAQS+AVRP%
zVjWk*Y(F*>@DB$#CHR5BXT2W|`4%q@<Wp&lttjsneY8H$D=+>Q`xK?n>|wQyh-ru%
z;F9*X++b7s7>P`1b*d!UX&Go%wd01Fbqya{(PjIF+=k43+@Q(3Ih*hJ+8HXc@ziXN
z?`_1~T50UeYrJxQc4aE%p)?{r{=}HaQ1NI1sp-uFY*#S1Zn>BO_oAIU6xI=X2_eY;
zyfm!YTG`#=SQX-p_YZkEYADZy-yE_2<i8f@4hBUIM%s)GAum%PAD%VFbfRF4Us9*c
z4BT9zJDf8Qj5-CRJXwB&Hz8S4d9*@V*4&XsQEw?a9HwT!iWNzWOD<3o(I&R$z5mtl
zVPg*le)$9!8Y!4BO&K|~u(JF4Zu{cbO971!r<7TFyJ83NOkw#F&UHk9LEI-ly^tP0
zLJILYoCWVpfyC<Ew;S(>Znfy|O9G+61G@;}+V$V1Fck0m*{EBUU+@`*D>9RUFH^nE
zxL%5K-x@%Mu5rs-V|pakt$o3FZ@3HwBWJ==Koc%L;Q<HV@gB(h{b~70y8!(3%mLR?
zUS<C{T_9xsUQOaE7%7J?>T5UV*_fw+?+qy~5L?@(IK~C3%Bpg^*dCPoO`VD;`<Lr)
zrX-np4W~?Mh{L%Ony0elPAcAUj#C>j<(SQx=cYuEzJ3Kx9<4t<zdP@8T7CLdP2CGK
zFrB_kl_ZYD0w5x>k#9;6m~nFNpj+xdr`sp_liiuQ<<b3_v^|P~C5^rm_8L*IwI|RZ
zXFwiCpih*lid7j-d1>%+_icThV{&~Licp|OR9`4yfb0$o7fGOyYqHYE!+r8=2#3HT
za~SrGY&Pzj2)9k!Ff74qEn!^Ss%G4@ji+fZlCY9MetCHQZu}9bn<y~G5Nx|S8ArGC
z>92F~ctoQFG_oEwBkwH;L_&wCv)vIBgz2qdfj0G8Nawv#o%MPpxBlw(p1krpHS7RR
z`$Yz*{t)EqY)fb@e5dgyY7_+b{ntJi^k)LUc@;Md3x&@Cb6@Lk)++)X0)qU%_rc6)
zKpo!zOmD1@_ogvM5agnY7>-T0o`XBf9(~x5m>8QQIw@HgbV=^{r);ujj<a*dU_TYd
zTIrs%RKI*3$<kE^v4zo>FZMmo3tF|(LT4oR>XL!ZRy=E4jC5@IbMLd>Z`&`u4=;+d
zZ^wm^kTruMN2XAWPRX0y-w3j^F?kZ=fY>Eegh`(Vqr!^WElPad;-uRn!Q_|5(+n(o
zN2QyD$48&=5V{qlc#LLea&KI4j0TFoTXv(@n<Z;c`Jh}P?6oR9ccB^0HEoj~#QR{>
zcXtv#>@z7mYUTCT5~_Ch5VCcLW-p*!9{lp2^ugI?GXGX9vn#aOtv&c6<^zN$0mAQv
zk_E^}VF*tXkeJ%iPzGp>@^7*%A&5}#9iS`8J%)W5`Mj)Ss-wD$I}hSHji7EQIB4*b
zh(FN^J0^gc%%m<W&*9#})=9};dp22LU~2x!U6!FR6MgH|j<IB^fZaMR?kDJ2tw5u)
zVY+rDv#DhsfsNO=Y@yan5oolN1yq)M-817768~M*dgix?5G<#hS(tStgZeqc)eN3r
z+|O=AF8EhzOG`GLG#7H&MoD&8v*d1F)*3ugu8Linz!?>ZUD<N0Kg?^bR$O;)gE&uX
zorjr9^Fu`_VdUhePg6$AE53P#w>NY!DPBvIR}ooqwwyh7X`mXLGVvE#bf9EqQCS;r
zN6ckX>nGa<Q-pjEOXYe4N*lhlrxHp9FZ2mI!Y4Ci9MR$tb-4|1ClUPR<TczWgk|Ct
zhs1#1O4~+_Y%VkWG<=Ft$U!|hp^{cCb4Ax0i%2gC4){cmM?_`*3xcFiMN|Wt;dKIO
z)1CEQQC{kW0&Qr2UWujSKLNd~WYZ-F%PDh`!4SFvmVR=Bw!u^GvmO*(?%)P&%dH!~
z+m1?p+w32Xxw7A^AuOdi9XGO0CG;kuYwE&;+!9mUinESO3>>mD;=VL*#o=qk6#S^<
z6W3B0EXNXzVuRUm1%)WC)|epi%nijOwwYyzXtmI-1|v^QYL}W2eg{IQVTya`>+zUn
z)tUgTF$Ke#F@I9q>kL@?^g`upf?27t0ur+4Zq{+Yk}$@D=~w|U#;IT~7~?TMn4Nwe
zD#4;%eIJd1b~d^_0mR<eKM2rS$yFD$kHTNSNd1EN(p9ayhf4J-Gmw~hM)O!1mQVM{
z_qA|W@N4C+wvWQV!6UFWWT)YMhg>Pcb_sdL)N7E$ce5!mselG7fY7H6hI>^V06l_2
zL=IRa3;-En6<Q3A!&Qn?l}g#|XA^dE1$JXaN}LE`U0ht2nM{;-^#Qwmdw&q~221)E
zZU1<dD@rTdsEe&>dxYhlAO32lVz6Zyjq6Ws4w2e@mRDFXm<KkO#!h;f@~bRl8rgVr
z(i^1Z-Xz<r=B1|@8PFAS+u2tg9M$zlB&W7n#OJ8y2XGls9*=QZr%#sOUw<j`P0yN-
zX?A($Hd&)iO&ZNYxAY!W!#*0ubz^jv-CfU8v+V2mntoQ<MmTTaUg-pLmtuV^*5rO>
zGReM}&?fI0F%D$2<E$z@DbkbG)(n`{R@q}aQps$#%hq)qa<D_<d*bBV)|}SoPb>9}
zHP4JZ&oif!F0S4zU-Np0X^d4mnt$TtO0vGQTj}<l%|aq;tO)xgrj~3CyXWglSE3RW
z%EnBKIc-VxLwQFVeMhsWO{v{gaSy7n?a?tsU?t1i(*}5o>#cLufwTf}v1Z9w>nG~1
zV2ueg9Vu7TpDJ_A`fhu{7wOO~lbh|OL(9$8{WoeF-oHm0M*Bdw^PqFv#3(lv5LM^z
z)f}5)Ele!-tg%;JHL){?B~g?V@k1lsE5$B*$K!hrBu@imygQpofyWcGCQ*-H@(1yx
z|Kd#8Pd{Lr<pb4fa^j;roi85@fzH6_#|z#?Oc9i4G9#A~f|jsh$<c4gUW#spa(RM1
zDvhOdC8Tj-Xa@R6I%t(Xs*R=4@rzT%!~0uCH-A5#1)ieBuL9tJeW&sTh)GgaprPR#
zu7u$b?&NR$vE6E<m$BV?B)Czu3M9BOv>JlQTL_?P+MbnN=rC%{Fw+mM1$@~ra9t4I
z!&xVy1ImDP3ZY*8&n7~a*ScZPXT%b^us5?}mn71iJnHNj#+^Y~$k+)>-_x}M@eH_Q
z?(Xn35{fdhp;`P0VyRtxt%sno6UikEmn)Za#NM#*!lJ+0=F_xX3(LG?fM2+mHbsIh
z4X1$8Y=YGYQ{@UaSCMbJs%8LfD_Mqm@{m#FI_e_is-78poq$y!?A#UE`9q1}MtZXk
zfI)9_>lm>GdN7!yL&*d)+t;I~;MlT)N~feGA|));Lt!qfrpUzw&>BedE|8f@I9|XU
z>bD{-vhFbMl;UegpuF3b_9f{AKKho?Vh@<g&{N4G;K;0!G1eBtL>^vU4nG*2LnM4H
zEd&#WdK_U<Y0ng2P2CW&-`F;no5LUL`6k$9M#!Te78OcPmVC?h$D7TQr_S{wQZ;lr
z><?F1dFx3b>PsLe0cH0X!VX2)^+DJl0fa3Ygq?DPtwi)*5{hXd*^00D7iI`f*k?f3
z*wu(njYNj~q+YSm_sL~Wrp3~mi9-8?ej^mCG_%FVg29kinD?>3{h*E@eM1G35QXP-
zQ=WUY5M?!`yJRnsiMlZ(d>GlqueV8#kW!x5FI@Ysw@Y>XQ61@S_99orI1jrJy5~bn
zMd&R3qRDQ=D0PPrwosTw5BE+K$`!!B@%bmfy)3-!$yZpUqa7J9KC!`F7{)ZTR5X9s
z+DIzSHzc_Ccz9J&3T_buevQV|Mdr&=B627E5I5e?yK*_J`u)!q%B)lo>tyLhW2WsS
z5qp<ZCPg5r)Rs2LZDXF=`!DY#{|?B*)FWL60RGli!9qYl{&&$0kQp8*>*VfX>fj)5
zV`*;x-_iNhlr7~Y72MJMW={qNqFo8eUg*pwl#&B+j3Qi$=mqFoGb@B`qDfQCu7sA{
zXA<9`aBB2;Y9qfr63c)&+qKb*V9PcC*^Rv82Vv(q+mF|`E2MrzVmz5*$|13c!6IZ-
zi>{Jl#xYAMyqXgope3uF@Q(Y)l$0SWvLn&;!=@Yl3ep%>;_0BU_huPOn<N?-zjj=b
z!QgVaM(#wwC|>LIiXQeR6(?-dlLs{{utZJyF`F3`@R`*ClesEZAEnPqlDY;}SVS1R
z7fby*m$Rzak^8=49GrF#{d4BI4!m=1sNHF|x>@VCljIu!RISg?TnR06R3B_G;@vS7
zSzb~moI}WGpY{~><J6>T-U}ATdZ{$w71ey4?WMTKO%C4|h;X1fykFoJNyujJ_)Xbo
zz|6sjU5A`rGd$)-&_E7(76{RmIErVZ8N&Sxn=2w3YVBCrtCz`ctAVe$gWcrt62v4M
z6`kE-X$JojsE{$9#mZ`9hOW-Pf_qedGCqv!GzI=<T5@qQb6MCR9&z<y{)1YRP25={
z!l)bCZ4q+DZShk)-sA+)Ntjw2Y`j&_6~-x%)-&u|vzlRfMw<63t(2{kRJDsZ8}gb3
zi&*p>X<ROagcEwxKt_YOZt|!py@-k)Z@8A8pyahY5D8R_Zh|qtO3ChkDDI#~W=)Pa
z$_81H8OFf{nxQ_CRu*Qy$&vD9(SJs~;PJS?XgNeMl=1S(y#Qy$4=mj(ld(O<#Ut;2
z(v0`fnwC$x_#vx3H$;?!X+;$|?9Jvas$kVcqT}pJ{NNV_(#F_vzVOk1C5oOJ)}_jG
zcJwM|&M>4-xbG}5`%Gc?a0-${Tdx5A`@3y^MQbR*gn;<M1OY+%9|s!l|0R+FG?te|
zXqvkxz^ec<<g*}XG3>zv=n^q_bYw^bG$>79N|uRn#;X~E<ciuhNmpA#m5mV3+888F
zRoQ;pb-kZe%T=wl`ZyPLty<MuoI4-gJRF&nsE|P8uM<6gw*3F*kDl_~=f3+M#loSY
zFDSfED<8WgZ~}))@R$|rI4PPI4rMvijG(^K@2VmudVTJDt;l~BlsX!f<CvX0;G>;^
z7EwMtcx{QLkp<O*Eksa`>BNi+z#1et&!=CR)jC#{i#vvuQNf&ebg5QdgB-7%dD2h5
z)N|MBd~<0(`4*>Bt+pZf$H!iLdIv4pd-|1+uf^~L2Y_R-B_CP&%7-JuM&um7$RE|n
zYQXBmEH_uOi!5_Taz=Z9Q}C0C<*A6;FSf#7Bb)TLTJr8O4f+&>b^+a5QY&=bMtgcB
z`M(eN@m6=ssk&9O>R(Phg%$Ufu!O~ld7e%!R$f~|co+=+lxq$K!tgxmq^C>S9?@+c
zmV0j2xB$oJtgo?c2ftROCPn3QU(=FEmnO<`%*`<cq$Q#x@#W1>(?~Se3Ol9tDni?7
zKRSqT#TsTm<v`w&<ulCiV7`~-lLy3b9wY2MAp+(1oL?r;)|(#%noP23{e$y`_mO_x
ziTSQG6L+cX#bWkm$kxV<Dl!o=JFlFz>(r}m(E?HJuR4gW5gBWB+I$R`*E!O(R%#5@
zJ1w@>CpDL?YmB<R_|%n_GuO3hIcp@d<?IzGFdg;!IU5A2UyF|Xm~!R=0}wzwg!Xoe
zC}j(pY{iu=6Z80kezw(xtt}@~wy9jvsl5?8_MC)E_!*;opS743XQ!B%vevqB$)&g>
z!+|#v<uKJ8whcBZ+gc<_!{YjPmW2(y9lb`0W7>AAGs(3-qQyr{ae{KaO=<DjaoBQ=
zz*K&Loz&9U{=faGy?tv$t?>=8Vty}2k6Uf&RGX>^qE-JKJmaFE{4*iizD5{wJj#3N
z@Pfbia)x5aaaUT{F~PZ`8mjj_Qk+0s5dkR9A>McrQrWg7-l*0X-BBd$o@e`8^{<DC
zvbqiLs5Jh<Pch9oZbh;@v*>A0FPfY!tF}}#lf%(Y{n->BAA337N`XFrE~5JR6UU5j
zQ7X-yet0g{ny>A+4AOFOvz=ov*$?tR4OA{g?c+@ygFE5+th)K|L)~})WyX^k%POGy
zZAaD}H}$8zdh|SpmQ`y>G<0*v>kgxQRxvC8Q#q5*Ukvc=77xm595Bm|%N{D?+9(yk
z%dPNMcvfI1B~EU{AI;p%qAiY2kq=zz=98mkZO{r7FS4z}dQ=H@Y^~2s46WEm)`&pm
zy(!GDY};Y2EqJar>nvwQMp&KPO=;k-cYJ{mDuhMZ%xHv{V@q<=O5%DRF{ZZAEfg}S
zNz}$Cb72ELtfrd%c3qZ4Nt3b9J;kLxR9I{S!bmvx*!~NEaF#!+9C+W;bX>2_b3)!@
zh*Vv}TG1N=;Zbewti+J?c_$La(4~5uB!?h+Y9;G=?qKalaoQjeG(%@iCN+Rt6uXe8
zyYW4;Sbm7vKf<z#vNBm4o^C0?zpYUUDC@GZ9D|DJU=3;sl2inl!O{@-zhEVsp|dEK
z4!DbMBe=R&Osp3>*3jfLY#;UXSz_@%&u}sUym2#81N68lVy$uATR($xx+y;+ZsfS+
zEH=DDvll<aBxs&~GyHbn*IEQ*k70_JK#I$gWuJ#t^JPR|D1w*9l3=623qv%91V!w(
z7ShhLp8TfI=z_Ex*<a3rVEHbJdX{XD0{0T65=~Rn45PL`qrHRdiA>Z_+_u0b3vr3q
z1BF9VWF1*><uk@RbsHp|m?h=Ej*u4I*n&w{BW6WeJ^*!^LN<_W)<h39H&`rcKtyP|
zX3x-+!1yeb`_nK@=MvWN6V9)5jlAizzV9fqy=r?zh{iB2D`R@=9Bw#EEr79{BgVXV
zZk<`ny$LLAhG(v+E>M|r{_KxKpC6^OBOh}Csmt7kS$K=n=SgO5GJ65LWhE|~RE9LA
zxHF%nkP>rMt%y?hxgN%W-3b{kYTZW&^~vUYt%cTCS51#8#X12s6WrB~T64@dmgz8K
zabeR@_}?tJ%%9n+W0&9Y874MNldAg55i;fG7TxLJQs2uKDQ+v|`pQKrZh3_Y7hyaK
z<#q}k={;4-<<hU0S06K~v~)e<<#3j$=pAW(eC%jH!M%#7dS5dG!|PMiNh$+~jO(va
z0)*_wSwvruO}&aId9G$u$kfHd0%op9sAvN;-r06SI_7d_;LTiu>H-*c%C4Py4Sxwd
zDp?R8BTDRj*VrBsQGIgimHy@LThIAW86fgU?FrHkWV<ArRxvOwM#f7eB22Z4wsbIH
zGmTuN!_}(7Ss}Rr6t&uQiI-*1#;%dcYZ2wZc90-O{q4w`GITM3XWMmeTfycRrr-Lc
zfLz_3D4=n9_(o5%>z|<{P=hwnbFfN|9T&ibpz-zFcg(LczapPVmtrXF8I6{ZO|w>n
zP8tw%NKE@LtezVuMSkU1zTzrO&YYE=AS~-=3gOy&=;1s30Pg;bKzLeswIOo3kil43
z51m=p66(<XSuCm^+aiO2=75qpvvgg&5*hp%A!{ZpS_)OkmGPw<T0agKJL^L9WP#a#
z?SxUb$X(Bk7#2nD4Fh?ku#Idbbc(=2R)vF9j~xbJxZ*YOYe0$uJ2+5*;xmr&YUwJc
zDr1K3HmquHDiG%8;AugF8AZ;KPW|3xJ^gNizH#~*aTOXzztpG?Ar;8X_SiA03<e>J
zlwL2r#!dF^TC2j|9<Gl>6t>C_YCiG#ssB2DN~iB5Rc0BqzKsYA2D;N`#py*a81Jo$
z7)<;?ny++*P!4pbjKCk`a-JnjH5T&;o|>ZX8|>410%{IC!XK+8(CxZtY`D{ZL;xA$
zzS7Lt_oT?B`_cE!eplg*LZE8cmPxu}UeoxhK0X@gyIcm=r~k<ND7Yq}Qa`#=W{}0e
zOdCVrgJsZB`AL4R7Vg+kTHb`hJsQ_kP?94;_u4l32h1_<-uT!;D<_!xF%49Gtf&8o
z|ERkb0Y2tu*tb@TrtbWD(0Iq`O9cFAd{;dcdT*a3iNg69A}O2RsFzWHqLB6cz#>UJ
zJqy<CscKKk#N%<7i~DGN+{Z{2E>qTcPpSVqmjD68vmqM)GCFD9hXOSvMS19Axg6hf
zk{!Bw{aLveknL@H0Kl4@syTr0$9E-B$ZZyEpx+Z!@i$BSOAU+rWGBbw&-Sf-<f^yw
zrG_fHbUmPf94AqgYwlAk=Zi>8g$sWa_9j%-(UCzgV5~Z9H|c!VW3<uWC7@IwB}dpy
zKmUvEogcHtYk|CRxx>q3xUO?GQLEc5R<XAH*AynN*Y2kI5DF}l;r1+Dy-$14@IB04
zz;k>^#7{vXX|M}^HoQZ7qb9#UGy81z8-?!LA0$_%eq&x(EXY)|H|>weX(z)&xD2Uu
z8{ug2{@PN<2ba<KOQ>C_6DBob^=kin<%B~UE0cfp%we^+ho~>``4&d?YOmFe{2{Y3
zg;0*x=(8=`Rq$`emRZ0VQYA@q{2S95E%0j>cRpF`6GDO+(VKUU05QM*AOZ2Ybz=)K
zcQ8<v(F*XaHzlWG$W>;Qu^&93wxMYoO-m199v+e8I*Y?9w2-u7ZFRlTi2Af}w!b_l
zc14C)-#?J%W^HP$xvFb>b>zdC!|EA*vz;m?FiBBDjPq%0+CFue)oD&~fHl(e5!fZU
zJ-8suZULRA?~J5N+ol@Nb4EImc2;kBU%H|~+MS;&c2!!*k5^=i0&(st-5WfNEnZ;X
zi5)MgdK}?sDUHc%(4+Gt#GHV+$Kg8fK3CFWM}`4|qD0Ja$dM4=9oPNy#m}qchA8r!
zr^cGz*O<CkSQb`urF3=B95LmqHqbuVSG(+zjKd%<bY_wV3iQNuxBb%6D2+3Ip<M-N
z7LG`yM=fE#07Uj&d?U!w0p$v5(=Y(bCZtDzqH;tp=jlVTb!b1AOFmpv*&6#N<1`z!
z2vPJ5{;W}eMqN>17HZmS?F5l?7;2}cI#6)OHoCuvmf8F56r(t;>@%200F6GcP=FzW
zL`bXJGbeub&dShGz#KI>6Za%B-Ea96z)8I^Ps?$5UU)M2@OJzC9%5@uF2|BiRl+zS
zq$edug*g%A&(G)$Z)bew{xu#5ljnYTJ@~tQNm2{QW*G7n*M_C^PthCk_ADG6&$DcJ
zZi?Zm<a<{Rr1)v2lG?*UKX9-pumltP4~4VogfM=~&-Fd_mg4bPFLEtdTV5hKJn9AB
z$+0DiE<%oQZso3!I?ARz3F@{yi7Li3*+Vx|4>-f{&q-DyPqLzY6&0bd^%5K<U0_K3
zu*gEo%b@R}Zj*wGC=54d0Ve$$l0#>RP}@P}9Tg=YHvyaB;uLRZ5+Gl>*qE3Lb3_dl
zXI7c$^=Vqp)Wz1K8*@?hDZb2M;nQv4Gi1l3E%zImmYb;~*+mJ7X!FAS4SyH028J#2
zRuB!#R@AanO*eu)SjhQo=-6yJF%!v6>ax6lk{Mr9`-g0CwW0f#c;vizFS~M`z!@yQ
zIy%^6KBM!};NfoT4-f}Vu+D&%&&&H^V}yva4p}du{;b3#b3f~B>JFwG&bjPVyi#Cy
z=5FTs=xdfr8qxS=LG&eo?Uyfj>^-3g)hM*=oRwbLiQe8KBr5#0#?$*v(@k*^MUG*s
zikul)knv~+KGgB$Oq}6^tQuhn<=7cR1t3}_`|%RR6o_Rleqii+1(EqNWKg=k!D|N6
zJQJ%LcWnWm2g8<>uqwaf3X%;^T-bbn)yC;3Tx(X|Em?2TJVNk#D3%i#eo6VnDZ}%#
zR}Y-B(QWLB(K-^(7Mw8E;VEpUcA-1wr25I%aAK42`_J(&Arbqcg;xPl)C?N$bSUS)
zK%agqnAH#v_y8rqVjY9(hHgRB9E1Xb)-f-p^cC({KhMi6Un;>y)0kwbn?aTPz3O#P
z8p)FVS^aJzivH*lrGZfvX3sro$Y!?_tck<fI7$4tuJ{rXn1h^1XfQNn+}dRPJY>ux
z70r$aORx?t;L(+(ui$Y&x}rxAaTug>$VM0ISy?1&Jy6dotuvC1Mv6e8P8?I?WVb?`
z6T#}tGEKT5)G-aGp%hwPasorcNM}=)V{(%U-JZjHfwA93%W>9WM6IEsY&JfakIOSJ
zIg8)9p9wMD_p-P%WZ!rG`LV~g0!#0)4?u8P02y_&7u5h^=D<#w7yj-O<xVc4iwI%p
zBw2uC4y1qkF{uEB7AZ0WvH-=jaM7QzF&s>QB#hJUZrvH={xrLh17RaF{e+d2OSbYY
z3*9AgW~5b8Wz%#UK-fk4Iw)J#sZsK%vv(awe(pV;dD*sN{kdnkx@9tGxecHn`$29&
z*p{jn+$?5iGyA>F+bHktL+9RK)&y)RRfM77f%&KoECV-gQ5kMm$isya5rE0HTS_4q
z7*bum1uWV2mj<<*+*Gedp=(wti9K>RPYN2k$`0O&`K3q844a((t<*e-D-JEMSD5#_
z(&KY=2-sV_B9RF7U3-Cvp7z-5-!X1V=OrTyon5hMKYU5buKBfR)gFb*0eNr`Y0Dmq
zKv^$6ql6aZ9qr2!OT(6;x>%(;&_k7y-kR)ka=+HVO0}uDGhD8k_K|<cH9&3_U%(8|
zoAs%xQnCvJqrP@q(cGc!>?&%wFJI}R;O`cklo*lxj=`|yGhttzyB=IFvx&q{QEQL+
zvYvTr98=HFwaw4f72F6TD4YOCxSA~l;0sZ|=p!jDF#wsQj6K5&p{Nl1ssZ8K1|TXI
z?uP*cg(38u0bs`<__+GSHs~I&3mdi@;pls69^4&LnzTN|Pd!5Bxh0lbwCS<O*wxz1
z(ZzZQB@!<^ah8RtFY<V~3ib2#d)e||Ug+Oo&42bc*DpFVHHf5*_M2<D6w^u)17CAt
z?hPzPe=eHTljheGygaK3k2-gX$z%E%7GfbTA`%t3;$o0?a74>Qtpt~NnV>oB6!3t!
zL^-x8%cOqUyx86ZYV3%jXiD<=!Esq_i4i{#|IG6UIM&(kg<dd@@HK|qG;WP!8$9}^
zAzmtan}*d)-jw*QL^=jq_qsmq5LowO3P0g@6H~*Q9Z_dnYQL~*mg9wi$n*s}F&9C?
zD_LJ@((usrV(mx_z87XuSBPA(W&eds=iM{;Y;8}4kz@nMtl6x4u0*7qf|W!ASRx`C
zElMkM_;+odvGB{@Zp6$;zaJ8;=@PE&|Kb*?6pHzbl=z0J&~#`lJ%RBd33OmiYAKG*
z`c;FvCL^pqo5|!h8wN(R>Sr_?Q}Ceq740^1jUMVp^dm&Yr!sa{j1bSW=ZK$fTb4Q|
zKS)0U9nzV`F*U<(OA+eg#14fv@%*w^kJ}L>ntz807HYzg%Zm`-4)TEg<Z=22@#J;8
z;ri~NOwfRDLh%e|wNpxV3uHMwdoayGHR=ACN4O=sz8l-UrSl1tVk?;XvXk&`@J#sH
zWlMlG=G2A!mMSA=cFxr>MaiG~{;8L^hFJLn+MDIEebIka9DOIDrP13&`lWkA^rP(y
zkZRk3Uj%RsC9~gVP?&VhhoX8SKD<UouSvTY-%@3<YhcA%GcO&c2i)t+SM$>1>AsW&
z>5$Q@Z-H~l=j0rc_@!4w;}TCnhkR~CqtJCv;;!K5s#rOd{^c1@WBJe+`I_t6K<|g|
z5Jzj{O0`1Ag_=oC+1;xyv@bTus0F0eoY8PrIj>K)@`ppS-nwby<sSoPZr6$Jlax55
z*>F=kX)R%Lx{)QEz;*8^w@&F3GGU*io054f9jY`f#8{WX7e7SH`qmK}`LF^-F=I+e
zm0h_FJVcOYK#B4SnXuKY9IOkSU*WaPS1+sDb!cvTMz6*V)5eDrZ2#441A{aL9i!?J
zcOyp{N@qQW`dX|<T9;5Ll7~F=L(t57Nv8G?e=>F;D~GVWx`96t-x`T*FDDHN@0w*i
zYP{jfBLwQiZ6>xhBo>Xg6`%9Xugh-Xq1=8%)cpaaQ4{O!NH$o@E40Gn!dpe88|K3Z
z_Y;Dstv!p6^ZjUEiKh>UW&^n|U;lqC(3Ru7Al3<7!hbc){%xWCpQ9w00t%Ewf%Ugf
z8Xpw1iU#t9MMM67%6RyHlz&^pKx`8@g#T(9`yZ>n=aOI-g#R)8zddB2%1JcBe>y+@
z<_#47cAIhjYY^P0{|q7nWlf+F{;T5uUxqGd|1pFIl}%xTo+j`CE+qd;-QZ&X*Ns3r
zllTA=(tqd;Jkq}uJ;0jguSfs_PYMGV=>I}Skiir^0H5<8quePH!hcm){Og|3T>lsW
znNdNnQ)q<$H~aB7ko><#NpP0Xe+=P~|8Fh?v^S1T_^;UW|Bm^u2WI-^KcnD464R^z
zam|0kcsb;MrcyqQ5BQ_~4<$T<0+Le11-(tv1739hLkR&iP5*)UT124w8G3-F)juM5
zMgm}B`yU7gQk&%ke0KwZt*JopbA+Io*-rohcaVw=!(WjeVBrqpoD%?m+(E8$h5%x(
zzb8D9gFPh(Wu6`|=LcGdBm|MV;D8+dik1QYi03w_f3;|!rFneFk-vo}L?EOEZU9o)
zUnK>|YJm-K|KCu_4<B?qjs`kfzz5_;{iCH?6a;*W{Rf@|5&WZVT*L>QCH_N!7nK1y
z$so}sTfj@^Kg`^cB;Yv*B$`DB68Z53@R1J+{$UP4E&hi=T^0Z!m;QxZ|6C|(86N;&
z@mFL4Z7%Zz9;*Jif^xxUP|y+@$Y2E@AYc0rmAxVZ2ygfc$w6>GSphqPAhLdPkp5qI
zKKU0i|D7uuXzC|E0Bsg@{L>0>I0sT*wFI;;fX+wB{_7c{QT^*JA}oT0$7rxs<YE3M
U#ULQK|Neget<zCj{4eSM0|LcRF8}}l

delta 13615
zcmY*=V{j%>w{>jWwr$(CHL*R>GqL%^nPg(yp4hf0w(Z=x^S!sedb_%6ueJ8>bGpu-
zK4<UUQ)A#g_29Mipm61@mMh?pARwo(Kmau^Pze+Rz+`T3>gE=!rLT>yjqw?mVPQf5
zX)Y2R70ivs6xp<-Rof`nMFPqQYA>;lG)fwyWH~oFAb*AJ`vKkkSfp%N;Sbwby|%dg
z8T}b8Wb>3UDuNbN!LXFU{&v3pbm9NFe`WPs7}6O|m?mO3C<s(x%v*j)60)ncaGR}~
zCcRG+P^Ul-Lt0=0)nL}P6nG|f>j`~mVeu`7=D4pj1`^V$j%II2Y2Z38#sJz8&P(2`
zjWTte&|ACL*V{O3EAU(0Bt1_^5W*A+ua!<1e=mw01vYM>Y=_8Pb&ToFs;x~1|J`f7
zY?AfR)Y)PFCC+XaQ}TvpL0`heiV~}#`+d+TVE&1)%ivJyHOQd@GtJ1-y??B|eb3eE
zC#eCdewcY=(FEZ~P7aqxMfy~GoGIq8f23&%GcFbJ)9q|FndHj4REFq{xKW*a^7y5t
zd6?4Iefg!z<M(yf7jUn+1^SejDr_Fuz3$M#&HFxs;vE^BG#WeQf!Y$%W@@y&!50KC
zfc6ELxN&e$zqUe-*Ze20%_A53Q!POPww;Hsqjk`|7pnG42fNRzI<QWxmq}>kuHJ4%
zOHwMayunN-G{&guwqoPv`hi-n)Q(bIk2R!0(>1lJLMaEHS9PXZj@Gnd7bdQpCwv+A
z(V-tbc+ES%uZIxVOEaBjv{qw<rs7!yz#zRnQd;V)s_BCKMEmVDBiT4VS$8<8{k$vM
zKtrHMd`$mZAws`Y?S@py?05^qSif7mvEmu$m&zd6J+RntCrBFe*RFMfQ#RJ=_jw(x
zHvi&XH^01Hc|S?(k3y;7LMe6emI$=5uf(XD8^lFl_H%<p*I2YaG${RpvK_Wq0FH4_
zP9WWt>!jg9Cb9y&pRM-vv`rXh1U%GYk4`ll^4j*zn2FqA%d=A9qhSB`SEnJuTg#bv
zyJ(g);;1KM6PMgd6ZT<o#F|9?jgLYsH@0tib;fFb2I*u@sw?CL8oev`TkY<x+MOhV
zK%<^_OM1t$N4P!*ds6QN44H#DfD%et+-{<V&wv`v^PnQm8KZMJv+q?c(J!<E=rAN{
zybHO*r?|F!G<Y+xWZDF2La3*b!@a)3;7}*qZ9OA_aF*kr*8XZ=!2D&z@lqb0q%Wzl
z(Amn0AgvE2hc7{7Yir=bRBS=kR+M2O##0e}vN7>61aak<lBg)_brO{T7|!t&*rLd#
zZx)wh6j@JLf;yJkZ=S+F0SbuxvAn?sLnlvIGQUqPrY^AZwnjYHUOVq`(Id}s7FL=m
ze}%)52+CQg!Xaa1vji`s2F4)AR+<i<qldW85hu9j&EoZOO4Oev*d6PLAEh@UQ8F#o
zvNK68;(5k~?(G~q&RvcHLi0CQ@g8F&cTuH+teH3zu6&&aihiT`GE4-BBL~YU-6rt|
zD(St^JcIVRp!DC*3daT*^qDe<^gHzF<)SCPV+!~B+?sL6pdzCT)2KmEi2cT&YlKf6
zg#0-mk8!|JRdUT1h$W=FhdIZmUeYJ*n=)lYE-Sp^21hlHlQ7E&C|G_&9z9Mvd4gv-
z{5Hv=lz5z_ZuMa`Mkh9XLVY}mDE(Ar3P8NcNGw6mV^@oJKb9sSI!RQ5O|m_XCMw<8
zHka7lF(#5dFFE=W=*=@|6yCNa3}4RuI7!i(nU^nvP2vC(l&e*q`$Xu)a<?ul$iqj6
z(6Lr@LSes{?G;c#??CklOON5k;lE}+ndN-s+j|E9V_|L}hYv2x@PT+pq5wl>bWse!
z21a|sW*uz@$$fE=jeO5&<JpDu1UxjLt&9p<|NM;78t1qYd$!(dyuyrxaftOU^0hSX
zRdNs_hvbu~)!~-gl%SX6;quj$FzCjxIW&5@$F|whkOABslA{@E=paVw#A9mkw++vP
zA5P|jLxf>BR;C1}M+mUOzX5{@4C9$5tvaygH|<>=<O}%S=&A!1BXsf2t#FfV#0sZU
zEBPB?Nxqv+&5jW|;hNP&X3oY#bt(rDEqXyLgHaj}xz*l`Xrj_Lmg=S3q2~jM`%Og+
zV3c8H?KAiiS2CLTBcW`TI`?-ePw(K!W_iIoxk<4d2=JdHeHE1RO@JnCi*$bIk!}02
z=JKeAnfn|eCCnIPY#W87A>JGuDttX|c*Xgv^;8wE%QhO4T>1Abo<p`CifAq^!^}%?
z_5Hk9X@t<P4u!Du$U61Nj6_9t3!j0A;Rln3^*OUN)4mBwS+P^5{(58FAJ&*d4{D$G
z5j&$O+rnz>CFT}l;{ey-3eF;)44K!L3pQ~_naGR!jO+UdE>`85q0kq!+6fX-<{wI+
zRUF_kRRle+a`^DLuklYo#4fOwLV_Ry21T5a46gpS^ii1xm(XZeo%^Iioi5Wt5~uh~
z1U)aVWJjooE7YsX?w<;1Z{Txn<ThZ%tcz&@authDgJExDL_DCc-4mC5#lDUBg6{~`
z_j39RK169d+nIsi)BqqV^576~ARsU>ARr*3Ae_wtSv^P~AU_E~KuCekrdYtZMI=DB
zF07xyu<jRN?y|dNaen8at-D_7TxZFKKaOxb5?#LAVmzrbWq-_bS3p*IZmq)b;6i_0
zPEK47v4}FHfMasDP-I<%cDwOmEOw0w;#4HiRXz8BMrBIn63bfeNw^{0v#3hu%$URJ
zFw5z%<BPrFWuwLD72!wr?Gnk--ZCKQxYw#;r6VtMS>x`k`~{KojTikl?ts%y3!<M;
z1W5pO#Gk<{$Qy(JV@^P>_ooUc0Am2@y)KX$=NU+nx~Cirvojs!O=PSwZ>%=?E9*I$
zWGnu+#-uUsbN%b52g>x0Q_!=%pCl(hTha#Lv`ZZHEd34)1aRH>pk&=J2LMU|4?iMn
zpl)iOTWsI?KglDkZhldH%Bz0rU)*y_zGMd0(EEQ%bADB1eyLA#Yuts|c9&&3(Plel
ziZ#4SDwMGl&7l~hyxr)kzrV}<U@$Aqk>!@vL@`9;DB_E-Gs{pjm#HFK%usV0V*^*l
zL4zA})ioWHYdWJ7*TSzKN(R)@+9B#%jlGhDSp?JKE4E2q;O9}*k0$FYwoN8a7TdEP
zc&ayN&gF8gSjrTTDuPweCpvFTwPwrl(u$T&D;nkSCOlGQhhXD3brsT=;-B+w&HI)g
zZOr6-T5CHYueMLGV_!74W~W<6`#3VN)+wvZXDAd3@b4h5-ZYxaH2`v(Ykoh;eC1i+
z8yu-Rk|k8j9oUI_3~%rBhrdosb|?{-L*U844FJ*6kq)ZPl-ki9(5nTpyw;f79`76X
znmx{BqgZ(^>q-b-)4E896$g`GML!y|emZAsl=G+F{tQ_wDcTT%2Bx9i6bdf2{K)2q
zzKo+Z+X@hs?nlF8-~#xwep^rIS<WCRNb=aM3z-Mz;JIvo`chod98pSNJSSWXE$~R+
ze+RO@0{YeH)Cc#IGX1#^yLH)@;;GR0>LMG@7!(jM9><^tHP9c<XW^;OPkwS9>L^ui
zr-q$(!w%cwpI?p1MpCXL4e!RKnyi?c%W)RV)6zFsOvrw(lK?1bIh^QG_2i8gOf_ci
z@4j|UREHe3!tyH}%sKk?R&N?;WhwDq2EtOOl_9*#`1l!oQy9!ZIt9uoKk&;v;jJk-
zecx0v>&voWxZ_>QP@pHBI5OWS18hwqX}`2atyR;aj<3n^6v%1Psbnbl25CaN`OI&*
zuNBM_`bN!TvI3Zlb<;28CY15!%w#G^9m4FnEy79p%bdoDyr4GIP4>Wyo%D~D`6w($
z2$L0md99SK9QS!U(&JYTN|p9NO2eCn8SpmIv*u6~$E?s=JynZGsv3f}a3_yex`L<)
z?|83DUcwG%Da@tWML!!@2`Je(tn%LK$5~F@;jQNB!vU1L$dB4&Bn@XT&pnV=9R-S8
zwXj?;(P*bzOCnfv$;YQo^D*(*IvyYj>g8)=Bn30$)^pf(t_P|Pz}0M<9}UFFGkGT!
znJEqR(CJo{tSU?-#a9V~qPX@chA{NBt)O{z47h|fb0L$;7=CC`st*o;U(x^ta1@I-
zRi#sK+yMN)R;p}?;nQwPZHXGT$-edWe}}hOG#H?S{}Vra+$}qu<(REylE=ZluO#oe
zM;^39xovZ|>lW^65l`x+Td%#wxJvD%?;3yJa?RA)->1B1#n7gGNiK45Rw#~L$F60d
z$k1;#L6f8QMy#S3PMPgG(-(ei3eRjB$D|U~Vh#AE?<#|&?<x^@YoON$BHzBBPB~n(
zo`9ZuFH=M5FSky8Kw*xi?z~f6B4{;{5Fnq=MxtX>dc7s~3ETI=NS=1CQD|*ip_V$X
z@qw(zMp1(BJ({xLbuEeARSQJ^G7VIoNX4`^3Vk}sExlo1ba6#)8g&t0a}o#t@=RyM
zL<_L3Ju9!v#)KY3UxIZ1<o-YqiBOzwomc=4?vEOam#DT9LBY)DIH07mp3FX0K*ko2
zfXa+JO70dCO(xw4PHrv`v9Thfche~Kx{Jgr&L}^qqnhY0YSNgZTRK3wxzf*@px0Fk
z#Wz>iT0JA8C3ui63ojfWuY;zpm6HaaIsgcLQK?yKR<rMH67Nr@gf%ULI_eD<`JFq(
zn2{Rp+NROz>1HbFfaM33q#Nq$8bvySvYeD$8}$(k9<HChY}2OGmuB4FiNFL)7Uk3S
zaI4YjL6M4MCur^4%*}p*l6>OtkH?sG2xX+zghZ5eiGb=J&=5eRS4Uf7J^gmqRt)Gg
zq+%%>DN5&Vlh`&dlOa2iR6992q42<oPT&%Mk08M3%e#9(OJvYzt7=P9Z5jkGO<qas
z7sPBGPn{^GTM$|DVTHESa!d}cXg_zh%`u};uhPXptk)K6=B%w+PqJN4isG=By_o-U
zpg+~StrZYspjF>7gogLZK$It4K>}zUKKgAQT!%#%UdEKX9K<i0Dac^dVPm^_$p#@P
zw2#WK$}hL?M#WE22)wzfmTIR8w#(f)g?Wj~RanxZ#M@+Z7fjbuPA+K&e)q-dBn+Y*
z=0A>EKjA?K7|y!r^p!l7s+u{Z4OE_;-i2?zhcdHxm@*s|-#6WHz>mt?0st61M_1nC
zcv!|9{fGxn2Da6yhg4DEb)LOBl-R8(Ri|D=a(AA5SEW_oE_n~G7MdCxDY`476&SlO
zzg<aW7qzIYZ4K%dSJae#hOrac>KG@XwXNH&X>Lu#%QGYEmisghsu|veE8Gk=DCfzF
z0uR28B-fCJSBx3nCQtv~a|49VYV<=$Ix-t=@Y-~!9;^?Ps=J!<<+f>7t7jEo?N*6j
z+)|_bp*7-@M2&>~c6JN-)L=fGJoPE>IAIQkckiH`malPZBll`8kfF9rHAKP3cS2Li
zx+0vZ@O{;YSd?YCL9<lhQK^_Pw7<L*spD}VxqC$McbS2%!pZAaDlGsX?7oapnGr_w
z(x<Y#>_BmI-c7oyy~QWAUum^WRkF=}y-)wP+kPmmN6DL2|B_Adt6b)wdHwc_CIvg!
zEC~R!p=~*tA!!%orF-9~bC-R1Jgl>8b_*u{yCsHrI@!gcZ8*YJXE>%Lz*SdsO6&p2
z!GKR1ZseDLF}FJtCOsg<|86>|$9pcjz6+8n`9=d5-PK?v<l#85Coqu3jA!~25(G2C
zoUu58CI(2Lj2%lXCeuZ<f?Nh2@>%R=EJXf{nDoSExgs<%OY(kwqrbR9G0E7Ffc?M~
zZ#@LpoMp1B)tS;Y#6aGS>@+WYrfDOZ?<=PfdP!@VqBl^$iwd~fk9j3^Hs52Q!^^79
ztFJr2^NTh8!}*M#RYTeXYi@KYg@<Tg+{n0b<+)%+uaz4Zw-Sc9Aa+tu-(fDA77J;}
zWy?<QK0V)Fnlm>hO-HQCTjkS~+7p%Voluiog+F||b|U|kkD*AuXsJl6#wib3ua027
z$)3K0iTdp#QyY*9d<OT1mbB>7E5lymv{C_zUX%?LAL=eluBUH4AzgMvfABwaC!Qw-
zDSEU95iiuAUW>0q3r}>%C)2!LjloxJg#7qitqDUe@C3|zELhc63bKUHToa@st6xXy
zR-VH`v*|2e+S$XsS=MDT8P7Y0_~$vVjF>pAr1iFYegW#C{Ko9L7p?m*O%`)b%LO@2
z0V@+Gd)JrcQAeyEge?{*-{I(m!xZ!M*;^fuvckpnEnVKmD{Qs24C|g2D$AGtoN6x8
z*Lswn3Qp&h-Jq8uIE?4sBvbMEmdnC!h{*V7YC+XhmcLMBf?306rO;QfSqJPKc06RJ
zBIxyh;saRvKM~gS9CH(sFPOKRAKP#5!ZMMUyWaDa+NbwC+Rr`wGyx5y{><}mE8{Qz
z`>o-Zf2JYY(iYxkV!&4-k*3`11tXXUq=@5YcBEMcW^v-`UgOxa+cUNV5#*V3NQUQm
zB9Zfni7AhUS$}A|MAa+r!Se(&?=W=7Kwo42EC67Y+<44w_2{AskOce$(yf@8N|f}(
zt7YkR26^pC<1A!*W5u((Aj)<3wNa-tA=fVfVgQ=SuUzjuzM^A(5W<1KBse`fW1ecY
z#qEsxm1nhn$;J4|)uqYPKGxG}k}i6qU5OW!HcnMvM@N=e1C6PlDoWc&W9<+sxoi7-
z*a1*EoYw*1)41MSBEJLCQHT#VEMl1kDKpRTk6UFG!J~0uRk>{xM-ea#5&X8P;Hv{>
z6+Ve^S2hX-zdbS15vYH(CRWVt-RINQD7vk%Zlw1rnYuxLdEQ(peO?^?$<f{LXi{kb
z?b;SYMY8Xko-4W|6Ox%i-s$H>{hc1X`~iqnY*<;Jzs2)o4qMBjp%3;~?w^zO;|8|!
zx=#~4B2Vvb&G_RISW{qlU1y0>SGW<y*RP}(63x3Wio09DRYba>=5GlObbbH1W!#ha
z0ZFhLkBwu(2kW(S#KF~VXzn?PUuqeng%Pu&K-GQKphD{chv<Ch(!OT`6|Te)js&oB
zrf_e(oj)Gi)=_plZpHI@;~}a>$c{)_xwJ!_da{^VzeIlP3s8DQ(B=w#W#f?z+tQu^
zq|iezjP=f?nEp!Mb9|aKwdQe`16|QKDvqLx-lhm%Q<f(_;65vm@_}kxwTP-QO=_8|
z>>3ycGE@X$El|jxsAA2VGf*7VGyv{<@Lb=)##@p$T3Bs~i|`+lUge*^NjWD8P0bOR
zFVyTxKEA@D5t}QUKJGyp3s--P(Zd`72!7?pjrA**w#we5@Nw(HEo;b0JKY-GV9HQf
z)1_IkWbqf~9LhktNn59fFGSARGz(60JHsbB8ZsGs4-k|(O>Zm6a~W5&bpWP}7%e8~
z{MEYCK>d>1f5(5j$1uIj$X8fZoe2n^`etNWdgI}ruMd%=jKx-jcdN)@=l{n0f_CWY
z6ObsTVYWrw{tM4DoM>h(M|~}f$YT8xe)V(@Ikr@pghS8i6omcDf7X;(`16=$o`R16
zrok!%eAcvqmd}9L+S0sHqQ=nNz8kJV^IG8H9b};<g*4SYy<J+zUtiaMthwOtj-we8
zX5`mgVjWI|vfa8E#E)s~^}dkTv<F1eK02RJLE)#>SYuOWktyw_edEE9ZYfO@gD+!6
z^wTd%C9-FS24~`YOhjjqod<Jh5D-`t5D>C|2jARfWI(p|3xMDoVZhco>-=O$aUfJ$
zGfL6SWU7Vl%u+Elqbz-*qFxeJULFl_^TaZ9bb^n69UNKUS_^|2ri5Bjl6J*jz5GXh
zX$0I@%_m`i5ZLM6)VU*9mV^C=>7P4afvY$F?mu3SO@QCmWIq(W?QrqMxum}Vfs=*y
z3abRsrU3S03?0_ebS;x%l>X$OJg&*wH>j%}u0<sH%3PAG1o5Q7=&U~nXfdD0QsV#K
zWzVe|FA@k(J3!Y1^~q-rA#%vewE1bSJr<$m7#BYyE@PD&$+q_*obH&K0p}9;)L!jx
zcRzw^%AVV!pf&x(2f59U2U_-rT8f&k2E2cS126<CO{99s!K#Km?5Ykd-0e0duDBV+
zx1;V^KU#CxvXg&ap;)J~={9UXWK{R0q-5ABVF=FGNgGs@Ti_enT9p2hqc7AMs*BHT
z%de2<4V-G+J5=M<p4O8(4XHS~3(LZTf8EkkJsm#VL{L7>YPKh2Qi5-UoMPCVDhi`D
z0UVX0JWx&cts#O{;D0}9fzNT&RdXz{$=Y%Zd_$LqW$Fx(Y8caHeo={5^@@WF@y%v%
z^8dcp7~8vhAF@L<M{Pl{Hpj+L&~7*O{W~jzGHvd|I@hGWPo9ah&jlK_ZbxD`(mYzh
zLgsNLvg1V7l(snW*cc3aoR-$XEAlyi27vYUpmw0x!)weL{03{Cr9M>XD8zx+CpBuX
zP+C;j_I`0*{O+gU8jqt+A<9iN)KZ&M(Ohy0jN$MN#2Plyt46o$bsS$xHav2D7L{I@
zpddSE?vXzxWIUa>Lhl}gp`fT}FFKgEW_54;U|^)Vl$4kbm;IsrCVjhmi&vcpA^_x;
zPu<<H|52^0Q|F`_G-st&-JM;^SzC{nU{ft-XUocpp+p1?0cWcasCiu&cD3t^=edW4
zs9&qu&$Ze~yv})V5+0VlQe=wUt*qZv&G8QM0j9kSJX^}Q`G%<7k9<RpsJz3`zkZ=$
z<E=OKv^|U$5cJE|TZ&5<XeT_}0Dzma_C}h9muSChKeKrb-4Ke_^{Il$9O5q=ObT+t
zJ9IYchi}c@PQwcb#pdh`N#lIS`#pON7f`X|HP=_snzeDv&d?7$-N&t2a8aI}xw?Ud
z1T0+ReHQL`yzBNGUu(m0laOT0pJ7zlhhKOTO1>Gf{}DZO_eSEMWz0pw1^D#V`C309
ze$VH=;YI|ceL4ZX8hy$b@-AKz;45|64pU^3=|L;D#p2k)kFZ|_gFSj&=&A2M7Ji;*
zMhBCpuvO>z1{lHGJL$CIrT&yWA(9)(oKIr!3~m>Y7f}km6ZKy!RgQhxrE^$UxT%&1
zrfaq?n-HWc&p~H^HTY$%0gyZ!H*L^8u1M$)AJ0VNga@5E7-;j#-`0_w<|*|BcH#&E
zS>Y<*@O571(+p?v3CusMwK!S0jL$K2kEINNi`;eBqQ{j0_yXNgUvr`hsmNv*9C~Z~
z?i3s9w7VJ)QJk>{n=+OGX4@Dqd)}C-F{wbp?C?%mv90ef32*e=faX227j8g-Z8KkI
z^`#tknAEP?s1e&^Lcek>pPB5KhKbYXpW3rzY+=Q6UB%5uiHiWrBH99l(@@bpiUxN3
zH$%vtNi>n=0}zr|kF@kZqEZXp&74l}0$+4G%`yyL24JarXa;g~S_JkfNS^P1{%Cg7
z5?TLfzBf?pw(mHX2P8`}m1YDF!M24U1-v+h^-M-IH;+MMnf$KWxXXC(?QRU19$vb7
z!MkG?jrc9NB7dRJizkha@yJcJJS|4ylqsoRZ-<p<As`U#%tn+UNr4+bMV2W5eZVWn
zm6zs_{MrL`U*~Xy$7n(<1oBLN5?Pb(SJo;mtms5e_7Ty-1P~GYDG*(ZmTD++e$C4P
z&0ZCf+DyNaT>DNST;7UDXF7<mRLPv@0Ci!2;>x<x>WZYD4a>1k6o@7i>uimEw8L9T
zU?3P=M)}dG{c#_%w}Vzq1YA10&Z)Q7{|RPDX&|15rUjW*QS{>dEU*-Uf(*S>O<2*B
z+3z9v$@J?g2OuNhN_2&p-pj=6^Q&iE#W&wWsk#K{oood=lT0{R;HJax`6|qu!YD1*
znm6z~Lk!q3(B86!+n`d~%gK?+KA}*Af+@Obe(2@U$k}S_F^$zrlaL7C)C}}43?d(x
z#Q%O4SmSMhM4P$Ef))QW5T(mZCg%D|cf~3^R`c`MGyp=kJ)1!hm?b?j&cMqnt0g3(
zBqX7gL#b{=sl7!a{V6)>HAB5*@=GWDgDi4gg4q#UoJVHdhBXZI1_Wxbfrlh#IKdmT
zf7gQm&B<)RY6q2}U{n8E)KWA(b!pEtE`OmT`V)FYxV~m$HpCk$cmtD%OlcPcDXB;|
zahOm7A3&A_FoWrbnIDED$Txr>UznpIK98O2$I*8D@rpDDw~#8hYv?W3n|)<g6x0tl
z^cA{g4#)S0s<wj$FLg@qiH-6SNezrvShDAx&U7y$ETae#?AwASyS?!KH~{DAxhoD9
zz}%0&HLV(>mi2Bh008~(Y&4=qDFc8J0|dmK9t4EsKVN0&|5SYcHz}>LxF}5B&^da&
z0!E5(76DNoP6!(jLLtKeE29&GvGeVa5;uc#s*@D9$(B*euBl3&QE$22x=2$6jU>u$
zQE#KXYE7}Cd8zzY^9R;PRPoo{)`Ue80@yA2Q<qno+w`sQc-P$qHZ(HoEWzi9;`;Yi
z4)Q`=0PQ4=jg(cvXrg6|Uz~?J=@Fg4l+^pFxudIFPE2gt(B2`efNG|!W6p&7hC8@&
z%236%tRvp|yv64zoU)focNWn$F5I;HJOq>TJP}iJ4w+39CX>s&#*~K}ZCYDd()fW}
zDn~<6273(BtwHEfn|F5~yv2|h_vF5MAs{gtK)>InvtmeQUeZn*pVt1&@ttY>P|oP`
zkgnQuuS#kM(@`&?i^a2@gTAN?6V3`Il-<yPTJQmmo2GMYu)@$U)xFYXp3O1YvMS4H
z&jYST+dH^3=b~88(RE%<NO~vMu^ju9{>6@Ii-Pz_j$L|Z($RLG5zfxh(ef8Z0CyD-
zK(wi-`15QR>wB{t`|zX#f%DCGrY$;q=my>aQ&gtiUC-}1%mR{_acyOq7;9rgEU)Q%
zbN1@3{feU1DaGnkp0u5YJ2f3Aei`di*dsws5uMoWC+OWWLd;1m(Ssb=wC{>kO<V*^
z1)8Faf49I2Ij5PJDQBlkj@8u;1|7wofS2~BrV2c+nrefNB-)Zo0f#ItqJ_SygIFmJ
z6i34ej!rtXI9$CIof^o!_Go5PS19tTDxYK<Gee3sy)C@OchRm+^75vZv)NldHxzoq
zPZ?<*oY{8;bvDJyDy5ilri;v3Em$n^Nzpt3#`&Pd6SrFHpsf@5A@e|o*C-JcK+XNj
zy-uYOyd9O(K?cnNfd}XaZyH1&s5$L?8>BJWa+<uWeKY(r`)UPQK(>vAAxS0ofcT`3
zdsUcdoyb55<g(rD4?k+Y3n_h&)U0F|t2#v%n9I%X(rR2E4-!ij#xa^+s598$W(d7K
z)kzqMzG!&H0%)>>e00`OX8)gMfa_LSQ8MA?c&N<1+b$+N3p~?A<TI(4cFv~sq%5JL
zI>jt@fT+2^00$pUzIF*B-8-ZEGUBCWrk4VvGI2c|KYhKM2T7(`xv}Nq#`{l^4nOg<
zp2#hxaWlB9AG$2Z(a?EY9APDx2!(3tqrUbIKGf*Y*V^#%&FT9MV$PAHfTjEN%V=qE
zDedoqwJ;=F(0UK)r1bg&$8BYTw*40_;O-ubA*x|`KPPWeu>yUTh7PWq51Dj~**S{s
z?QLCpI09g_$0s$-j-|x!9IBSr6o1nCmG%A6Iu;_S(&VP=|9tS_n3+qd9^g!b>EX0X
z*cLw^3M%V#FVH??HRhOc1gy?oB1@1S(bz!_1s`~Ts)O!9y^3l3&JlM8A2Q*#uFnm^
z8HXLLGd!Z_=q?t&H4hCq-ob~l`6&c$H_DCFquf`##I#~@s3s6b4-^P(4!p8-H5fkO
zw*Mh;fn;nI<#Vzuy_c`JJ|J1du|~9$5-3MryxGPSw+JgTZ&#g%1@PeJ7ccs7U_=Z;
z^f~AEE|4gt_SpHA{}BtlG%m0UpvN0R08ls<l2|)-k)a{lgqbSULZfzxlyu=H@+f|*
zC_s&@7~c!bm5f}^7(&P<A%6u4sgY~j+)YlI#B4IP$Bk_fZ#q%m(1Ovyg$<l?J}aO@
zgR?PxPK&}!wC=0G0DL0d<3~8agd`@Dv{vO_6O7<Qa$48(tk*z$z~;;%jP*%SVsQf@
zb%xT$m!Vek`L_8j&82FfOEG<-M^TZTkVW3ha1E(836KQsB|6lwSes&t4kBbZ*~moU
z4rK;GZsI8tHEll7jzTm<lKhSE>N1@L3QNG6CN0J<mnrpW0PDa&W~bvzs&F{tylXGa
zZZy&@Y?~`NcqxT%khsAbmX8d_qHbL12F<zFvsD>u*+O<p48`p+ZS)z(N<8-#9#ct{
z%^Ys8Et!n^-;{u(Rcut<8XiCj4rv%hUKg>GMdhTW4fA<EDUy>CPG#$q9GEJ%SM2Gu
zK`X-HU3A2JfNr+io0l$02ZNBQTS<pv(n244sumV^X5D&FcV@aa)x3sJW{&C!p^tWv
zk&jN%pLt>ppPxA@Cupy!a@h0Snm!3cYA3GUaQMGe%4nmzOXgZm*it-E>Mx%(KS7PF
zZaMv``j$tBALzakoK#+<{lMpLW<xWD^dl}bUZlEV0c3^pFfEP-y1G%ek_W_hlh+sb
zvmDZpkRxL)*Hv_XhFU88puZqyDcx3cue0g?40=^`MqjDE7=4y;Je753)o8w0-9x#G
zevNV7)S|+il%-EL9=NL`Ir#`~XJ-&+ojge2r*jjqcG3tVGNL@%?l37tljTWKWTt$#
zLt9<614wi-!t5J$p-1wp9Asx_E^CIV<paJnCy(;<4}RT!<d;BeZ1q2}IPlS-M|PR7
zknJM+b0TSMjU$)4({C2vigzj>I9i9UPuS9JvxC=i&+SeQh(|-sKP!(RABAUuOvbp0
z>7}(Ot{3}ec?h0!HmY<KIyg!9SksRqXF-1F0PJ(Fae&8OW@prG<eWIfOV!RC--^u}
z)~7+%&O!8yq3xlp(@R!xqXfI=laV9rrBNC&!Y!eRB7m^A$TK`OOOTV+9CGI0q#uvd
zC5=h2IQfX4NN#HEOvWFC17~OGHGd)KZqmlSp*`q_+R!B2Xk|*SB!H&)4#YlI`29ep
z18h{>_M1IRKcm!p02(V}q?(vuGw6inoJ!wugsX4SZyzb_rE1`lHYWp}`)(kFlu7xC
zt0r(kIxH?OuA4&1Xe907kEXR>u&+^6zUv)WJ?o|bXk`e}+TQzE1;wSBhBN}=0F)s}
z@^|kbd1?n4W6al0BUkxifnU+1HsIq7fE42-8};taIko3+DS*kE()V(Rj?TP9(!8Mj
zav6bR?rfYUnxEvlF+S^W6{=416nZ-;r8oGYfQnnYcM!Cj)7<Jo2qh!l^Qg1lX6H(g
zXxJtsM*E2QK~`y#ROc9vrfV-sG<x`gDD@YQ0P&qaW$(V9!DE1ZVbjWfx@V050Pv66
z%k(=J+*Ax@oZQtNKizM7m}mGePMb_pkMyxC*}}K1ZSy&kvno85+*oDg))R5F)~CTZ
zfcD9+d*&43?Fx<01Sjch0iR0g$gFeJUsB(>j|Sp<WeL&`<)g>ZfA6zo#%15PI}P-#
zffwxz^$so{lYX*^eA#f)&aWsu0CqtFmYXHX372qD9y%~4A)A_Re}4bTjbVZ+y&m|A
zqp8C49A);ND{B+}SqF(5|FUJS8)S1AX)x+n^cMS5)IO^uBiZ{y%EjF1wA_4Ho9Q={
z?L}+oxB)g_)4)qP+n(&G1bh<vcBFZlsuAQN1PnNnVWmAXXt=0|dQdGg8enS5d5c+K
z=pdSK<qp1^i;1}s((A_ax2241C=$G@5}=R!95U4PgU!bTfwP7r95*rLgPXMtvI)0t
zZveG)(VCr=(Km8xAB4Xy*Y@~*;XrY8wrGrF^P5DHA5EZ+V(Dg&?)<9RA^aTyN65-h
zUgqRTfFqUEejGd23R4`MJ^&$6@EdJOfY7d=Jxa>Hr>j^C(qZbJ7S}LYZ);vOJ%U23
zVJX{oHrIajJ$~rocJY^i0F^lR!Yq@qXj{}AKX|byBlzBUO#P~BJh=`Bvl?9ZK&xq>
zjz|47ID95?Gyltqw#AAWhDG^YUn0v`UoPcBYY+l9oMkEa&w^sAc>v}rASK`38WjA6
z*mP9_pa(H24-X3NggR^`)HWVq{u+*^EjD+C_Pdn*%0Kldie=aakt|BNvQcSK1{&*@
zd)E%EwsHV6LZ{Z1S=+oU7Q^AqRjUEncjg1$(;K5pO0p^~65VW?<P1v!?2kcNm&ySe
z7d^+(CC=giV_AG1djM2qy9{(b#p$n4!MP)g4RKM^0<UUY-YD>;%qKTicoy8NQUS=5
zVq9;2j(WxDMd^GWMHS>;D3H(E+ASLjA!vN^gGsoBZ<{5&;`&v-hRVV*VFutSCF6YC
z)o0e;9?wCjvq=Tus`@2BYko|$#9#q;Q2*d`rU7j%LkV72F~G2I9KrG=HPYH4dWoaJ
zu*v1YJz=Bv_L-SV?H+GeX?T6K&*)|{yFG{Cy7;LOo{>gpd~$x0|2_lVrZo9uI=>(G
z1%zvUc36rLo;-DM_z6eo?G0CO^?*#GB(OUF3N^#24?WANPc!v}%5Qb%&HokDCnW1*
zp9*riXmFFG9zZl%8kQe!4Phjuy(0MNI9BF7Vy+O1{?RWuWrVk`vG3wTKsi_>n7ppI
zM^w-W4RxangBvZ<2GN;1CqV~()Sw`wt=CcXY#^sS&$&G!8hxzSj-;`{5nml1;Gm-~
zAzYZ9U{AK+ndsP8X~Pj25W`Kq8MEkF*$HXq{NA*`1Aw178X76$-FpI-bf-~qU_Q+Z
zK&^wl9jo5gR`ey>O}D2|rT7qRa@Yh4E(gf}p{67XXT%m$+FE>al;u_|`;n}k<ujt6
zw}RE`YDjdH$8Wu4eR{{^X6VMep-io5;alHfllj4gcc>~gd0GtQ_Qp8L>^2RL_Il{r
zR&A#>1}vDdFV+W16>LH@PZuRN;?Asqq1$q#WZF=@<kARdi&d#e|4=Hqvqp3nj3Mb3
za~F~<h4;r+UC=Ovhe%#*5tm(chng(mKc?PC%Tu@QO1=z9+Q!rIz}`eWh$(bvjJ^aF
z=EW%Rt?NU=6Md!Kgl=LQtnRou9B`xkhzUSq2W%qq740AQbCig!V~(jGgN8oViupzs
z`-v9Z<j-gbiLqmpzsH0j*Nz6?tALsR24fYq5=T|ov8E9eVaKr~{3Fkv<qCHmuVM<U
zDs&O<C5<8;w1({)t%}^4>+Np_*GQFwomib`Sq^MQH}eENGKSt|%BAzR{_Vt3m^^P{
z28f(&@mDd!(yA_WJPmYxEYRk}q!xspA-5eVt|aF$%nMeBidd0Hrk3!7<-?$|mHSm(
zo}WZSS5uo7^=G0z@eoX{fqQ>KRY5iiKkNKBeSKx0#=+jz=bTJ8)SP(|U1F-`ssz$k
zt(KOp&JUJrL$u#yp)P`kXdoH)`cIp84gl<rF4XU`uwMo?K0tJTIzg~90-d@Dq#eb=
z8d+Im@%YSH`K<w9{Y1;KLVU-c7^in96os@q7auaxqYCdRaP7xAF`f}xG*+yO!ZvRW
zj$|S|lNLtj{l39V5+|E#bEVMvz4PKhep$vF9^{!MhPB#$&?oPP!aqLh3PJp!+W>si
zuB=iJgUP<f=<5JHk(@>oP=jNo`MWxQxy-Q;M#FSwtO+^YnN!{$M2WU!tFJSKKm1hk
zsBz`e-)SKN#t@8u_xzc^kHIW%2s1CRzbA$|SCT|no0tEtILIsSd)(;bcwF>NaZ0+h
zel)d#0BW)<h}U%Sbcm?DZubywKoNj*f1ll$pQgq2pymMd`!y?W^{A39k?uoNn<s{f
zSY=!8EU5UMh|;Pl)GNNCE^BJ-hc`u_g<?NbrbVJ*w6?_IM`L#um(1`g;tvB-vxYf&
z#awTtsUgSLOcI26$F&8;qcM{y%g*z_khUMQ2Mg9hHANn<x!LmHt*?S;FT()4m!f0s
z*zA|!BcAGzyS=UwA&4sbSZl!}jo7LOq?K2YMUK`L(9Y+OO&>5D&?a%gEbINbk1)<|
zFqdEHHUpj@uHXcBy04V(9gw4EyzCr}vle^^&uz8qcs@BsKkDd@6?|sz%jsF3zP)n3
zR)^~v7i%l<5G#Rhv#`*D-~<D*0p@+Y*zfOLkVkl~ZLhU8^fuq$Yc#Ag#A;|8)$)Au
z$vGhX{gcw>sZklVOK%WDmk^mDR+mp=C7_)8)4V4`elotvuFFqu?pM%H-FN|WJg9lk
zI~+RHiGG^bzftG_qJ}`t_CQ%whj^mJ#1K-XX08-!Fj5Ue68MaGMv?%(z|cA_!^sG|
znHabP%Ms#Jeb(njDMu8kF*A-CG6bNn&q+J>oA5_X*Sq?uw!+F9-gGl958-CtP3_+W
zg2v!$2cw<q(-OjSN_b~-YI%^?56qW{Pn1#2Ao|Mpaq*WXa=A|!)qjN2@-q|)XL+K4
zh5;|!@bYHX1zy-uM*q&wh4%9D&7R58Ly@^j&eE~LgfOAfImaRt#Hg8#1ig`frV)56
z(Tes0Bi`v4)x&IbQsl|A_@W3t<U_M2&YDa|)ZvaxWQ9C9*xP)Ozmr<wa7Pn=dD@}G
zb&;Ty_HyVV*bXh`D3%!;)Io!LIFFbs59x(l-ZHKRXAiOhlL~MV=PbyDLr!MR-U_?j
z%2OvjVe>&w-h!?|PG}c~C_+w15t5L4g}E1!V)%ks5DMEB5`DNsR$sNtO*?Vt`Uw4m
zi**n)y(aoV#3Byud=&a1<QKQ1{bmdvr3KXi<qmnTy*HkD6s8^^@dar!fPqK*Yn~=l
zNUQV#CWRj3ya2FTSh!;#HB<Ei*WwZ2C$*~UU)xU32}xXas6xzegwu$oPr)upzVb}{
zL7zzLDD|s{6VOQbO<UZBcC4xx@-fR=LbgoT-sAH04W{Q@taNSZ*G;9t=O61Y<eN`*
z4c{-R!RUSYUnL^2`Lv4r=9hxSRJSL9T-MRQHKqI^s1d;7>{n*!)JJhVX*l`km7rML
z#`HZ6w&yEHuREevWN}Kq*}k(jK=+KJCEdDyyQz4_3Kk3F^(%xGgN6P;g3c@G8I{G6
z*O@nmZJhLmhuvl|(<E_dm${U=-|WbRamY`Jp;`ulp+xt`HzNl~3M)Cf5=zWti#kSh
z!naHGLUUs)X|c(QJVMxLrc&H+nDv~P<jVTVl>B`#$_i%}(P^!nU9%G0lX;FQxDK{V
zcKSOmW5=nixe3@xXRZ!*+F<s1p(r+*=<rcLE!8r)xDhdw=FiO@;ED9W*T4KD&}an@
z=w^xz%veEa_@N0NfcXFaIspM;1SZV$04Wz(!0e!aE~c2kZWt7x-vY}2>$gr?!~|1<
z{*Mj|<Xog7_^+1QzfHFPcNGS9!2S!2TjT+2$NA4QFu*ogEa2NB9auT;KS^Lo4y=yk
zAIx5o0P`UK2My@3fym2rU>1!3sLC=i!GBdS|8J7NwlGkM>0eOp-=P0WsQy>b4d;J?
zpn+;DEMNw5|7gYv7Z{8paCXH43`6;^Ap`2JvVb{i{dKYdyH@GI0`!4_mdrr-RTLo2
z8Xnkpqra2@XtKrwwqOO!TvG<)um+y3X@dD%1I5<)!78nRfOSJKZaZL&8!qr^T?y>i
z2^i={0EG6%{x?X}1|C>|%U_8eNWXvr-1$qlT!B0OH2=J~At(s{_tu4h6yJfWn;Kxq
zK7S24aBNcotl9q`+=xH}wk)9lHMj7<%6<S{wyeP*LjQR_x0Jz}!vDebBm!XEA389M
z_<wZsk0cm+(myDa3k4L;{@eQe2L<T1jR%I4@*f!s__~7vT=^@}r2mtY3b27pJ9J=_
zng8h44gxT8hXsr@`#)3)3?=s;l-=bAv&jDkqpFDhjl8^z2bNO=%&VmV;_uOcJ+}bg
z`e=Yoe<5TKFl$c-jJ6-hFeUJB8ASK-z&-|&X88ZH(!XqG2sp4W4@Nc&L_J_eVh3Rd
O=|=?tu^Rs0)%hQKQa~60

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 94920145f3..2a563242c1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 83f2acfdc3..2fe81a7d95 100755
--- a/gradlew
+++ b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

From 3e1c24a4e9afdf8a3df405bdf33a7b48f3aece7c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Sat, 13 Feb 2021 10:10:37 +0100
Subject: [PATCH 217/665] Bump gradle-maven-publish-plugin from 0.13.0 to
 0.14.1 (#7186)

Bumps [gradle-maven-publish-plugin](https://github.com/vanniktech/gradle-maven-publish-plugin) from 0.13.0 to 0.14.1.
- [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases)
- [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.13.0...0.14.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4a2b4949e2..0c33158410 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
   ext.jfrogExtractorVersion = "4.20.0"
   ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
-  ext.vanniktechPublishPlugin = "0.13.0"
+  ext.vanniktechPublishPlugin = "0.14.1"
 
   // --------------------------------------
 

From 25dbe1a398add5036b593f295e1b148a110af805 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Feb 2021 09:27:39 +0100
Subject: [PATCH 218/665] Bump gradle-maven-publish-plugin from 0.14.1 to
 0.14.2 (#7189)

Bumps [gradle-maven-publish-plugin](https://github.com/vanniktech/gradle-maven-publish-plugin) from 0.14.1 to 0.14.2.
- [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases)
- [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.14.1...0.14.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0c33158410..fd0cf75d09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
   ext.jfrogExtractorVersion = "4.20.0"
   ext.bndVersion = "5.2.0"
   ext.checkstyleVersion = "8.26"
-  ext.vanniktechPublishPlugin = "0.14.1"
+  ext.vanniktechPublishPlugin = "0.14.2"
 
   // --------------------------------------
 

From 73e4b87de44a764596258ec9b38a05e77136ae24 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Feb 2021 09:42:16 +0100
Subject: [PATCH 219/665] Bump junit from 4.13.1 to 4.13.2 (#7188)

Bumps [junit](https://github.com/junit-team/junit4) from 4.13.1 to 4.13.2.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13.1...r4.13.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index fd0cf75d09..ca036a77bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
   // ---------------------------------------
   
   ext.reactiveStreamsVersion = "1.0.3"
-  ext.junitVersion = "4.13.1"
+  ext.junitVersion = "4.13.2"
   ext.testNgVersion = "7.3.0"
   ext.mockitoVersion = "3.7.7"
   ext.jmhLibVersion = "1.21"

From abecb9aa882dbeffa08e9d7b42040ff6d2fbdebb Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 16 Feb 2021 09:40:53 +0100
Subject: [PATCH 220/665] Bump jmh-gradle-plugin from 0.5.2 to 0.5.3 (#7182)

Bumps jmh-gradle-plugin from 0.5.2 to 0.5.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ca036a77bb..6322ef9f05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
   ext.testNgVersion = "7.3.0"
   ext.mockitoVersion = "3.7.7"
   ext.jmhLibVersion = "1.21"
-  ext.jmhGradleVersion = "0.5.2"
+  ext.jmhGradleVersion = "0.5.3"
   ext.guavaVersion = "30.1-jre"
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.2"

From f1ed2ede94728c0b33a477948be7c506ce1fdbb6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 18 Feb 2021 07:43:41 +0100
Subject: [PATCH 221/665] Bump gradle-animalsniffer-plugin from 1.5.2 to 1.5.3
 (#7192)

Bumps gradle-animalsniffer-plugin from 1.5.2 to 1.5.3.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6322ef9f05..09b22acfcd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
   ext.jmhGradleVersion = "0.5.3"
   ext.guavaVersion = "30.1-jre"
   ext.jacocoVersion = "0.8.4"
-  ext.animalSnifferVersion = "1.5.2"
+  ext.animalSnifferVersion = "1.5.3"
   ext.licenseVersion = "0.15.0"
   ext.jfrogExtractorVersion = "4.20.0"
   ext.bndVersion = "5.2.0"

From 6f7bbb69056a27aaa64cb0e4f80253a5d4064102 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Feb 2021 08:51:41 +0100
Subject: [PATCH 222/665] Bump biz.aQute.bnd.gradle from 5.2.0 to 5.3.0 (#7194)

Bumps [biz.aQute.bnd.gradle](https://github.com/bndtools/bnd) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 09b22acfcd..c50b569982 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
   ext.animalSnifferVersion = "1.5.3"
   ext.licenseVersion = "0.15.0"
   ext.jfrogExtractorVersion = "4.20.0"
-  ext.bndVersion = "5.2.0"
+  ext.bndVersion = "5.3.0"
   ext.checkstyleVersion = "8.26"
   ext.vanniktechPublishPlugin = "0.14.2"
 

From 09b2b1b4c9428616b2634a67bea0ee5a09201007 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 23 Feb 2021 17:15:09 +0100
Subject: [PATCH 223/665] Bump mockito-core from 3.7.7 to 3.8.0 (#7193)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.7.7 to 3.8.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.7.7...v3.8.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c50b569982..444d81b60a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
   ext.reactiveStreamsVersion = "1.0.3"
   ext.junitVersion = "4.13.2"
   ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.7.7"
+  ext.mockitoVersion = "3.8.0"
   ext.jmhLibVersion = "1.21"
   ext.jmhGradleVersion = "0.5.3"
   ext.guavaVersion = "30.1-jre"

From 22c5e0bfe0ca9a68cd726d23fb696fe56a059a84 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 24 Feb 2021 17:40:46 +0100
Subject: [PATCH 224/665] 3.x: Add onSubscribe hook to ParallelFlowable
 operators (#7191)

---
 .../io/reactivex/rxjava3/core/Scheduler.java  |  4 +-
 .../operators/parallel/ParallelCollect.java   |  2 +
 .../operators/parallel/ParallelConcatMap.java |  3 +
 .../parallel/ParallelDoOnNextTry.java         |  2 +
 .../operators/parallel/ParallelFilter.java    |  2 +
 .../operators/parallel/ParallelFilterTry.java |  2 +
 .../operators/parallel/ParallelFlatMap.java   |  3 +
 .../parallel/ParallelFlatMapIterable.java     |  3 +
 .../operators/parallel/ParallelFromArray.java |  3 +
 .../parallel/ParallelFromPublisher.java       |  3 +
 .../operators/parallel/ParallelMap.java       |  2 +
 .../operators/parallel/ParallelMapTry.java    |  2 +
 .../operators/parallel/ParallelPeek.java      |  2 +
 .../operators/parallel/ParallelReduce.java    |  2 +
 .../operators/parallel/ParallelRunOn.java     |  4 +-
 .../rxjava3/plugins/RxJavaPlugins.java        | 48 +++++++++++++++
 .../rxjava3/plugins/RxJavaPluginsTest.java    | 60 +++++++++++++++++++
 17 files changed, 144 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
index 3c6a6ad751..d4c6a39ce4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
@@ -91,7 +91,7 @@
 public abstract class Scheduler {
     /**
      * Value representing whether to use {@link System#nanoTime()}, or default as clock for {@link #now(TimeUnit)}
-     * and {@link Scheduler.Worker#now(TimeUnit)}
+     * and {@link Scheduler.Worker#now(TimeUnit)}.
      * <p>
      * Associated system parameter:
      * <ul>
@@ -111,7 +111,7 @@ public abstract class Scheduler {
      * @throws NullPointerException if {@code unit} is {@code null}
      */
     static long computeNow(TimeUnit unit) {
-        if(!IS_DRIFT_USE_NANOTIME) {
+        if (!IS_DRIFT_USE_NANOTIME) {
             return unit.convert(System.currentTimeMillis(), TimeUnit.MILLISECONDS);
         }
         return unit.convert(System.nanoTime(), TimeUnit.NANOSECONDS);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
index 29f9d91674..895fc5cf86 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
@@ -47,6 +47,8 @@ public ParallelCollect(ParallelFlowable<? extends T> source,
 
     @Override
     public void subscribe(Subscriber<? super C>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java
index 1ff745ecba..c3500812a2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java
@@ -19,6 +19,7 @@
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap;
 import io.reactivex.rxjava3.internal.util.ErrorMode;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 import java.util.Objects;
 
@@ -55,6 +56,8 @@ public int parallelism() {
 
     @Override
     public void subscribe(Subscriber<? super R>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
index 6b3f69ff97..4ef002df03 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
@@ -48,6 +48,8 @@ public ParallelDoOnNextTry(ParallelFlowable<T> source, Consumer<? super T> onNex
 
     @Override
     public void subscribe(Subscriber<? super T>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
index 14f414dce3..8fd4348916 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
@@ -40,6 +40,8 @@ public ParallelFilter(ParallelFlowable<T> source, Predicate<? super T> predicate
 
     @Override
     public void subscribe(Subscriber<? super T>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
index bfd22ec5a8..a6166b18c6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
@@ -46,6 +46,8 @@ public ParallelFilterTry(ParallelFlowable<T> source, Predicate<? super T> predic
 
     @Override
     public void subscribe(Subscriber<? super T>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java
index 1e0c9f5738..372c3cf70a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java
@@ -18,6 +18,7 @@
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableFlatMap;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Flattens the generated Publishers on each rail.
@@ -57,6 +58,8 @@ public int parallelism() {
 
     @Override
     public void subscribe(Subscriber<? super R>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java
index 1bb127233f..e83ac76715 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java
@@ -18,6 +18,7 @@
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableFlattenIterable;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Flattens the generated {@link Iterable}s on each rail.
@@ -50,6 +51,8 @@ public int parallelism() {
 
     @Override
     public void subscribe(Subscriber<? super R>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java
index cb40caaad5..e3918fe37c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java
@@ -16,6 +16,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Wraps multiple Publishers into a ParallelFlowable which runs them
@@ -37,6 +38,8 @@ public int parallelism() {
 
     @Override
     public void subscribe(Subscriber<? super T>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
index 1d9bab143b..9a380d8ff9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
@@ -24,6 +24,7 @@
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Dispatches the values from upstream in a round robin fashion to subscribers which are
@@ -51,6 +52,8 @@ public int parallelism() {
 
     @Override
     public void subscribe(Subscriber<? super T>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
index c941887853..3787a52f05 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
@@ -44,6 +44,8 @@ public ParallelMap(ParallelFlowable<T> source, Function<? super T, ? extends R>
 
     @Override
     public void subscribe(Subscriber<? super R>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
index 30250f2e60..d203e2e742 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
@@ -49,6 +49,8 @@ public ParallelMapTry(ParallelFlowable<T> source, Function<? super T, ? extends
 
     @Override
     public void subscribe(Subscriber<? super R>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
index 206a2dd472..20c28ef581 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
@@ -66,6 +66,8 @@ public ParallelPeek(ParallelFlowable<T> source,
 
     @Override
     public void subscribe(Subscriber<? super T>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
index 53fa2b3899..c80d0b7216 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
@@ -46,6 +46,8 @@ public ParallelReduce(ParallelFlowable<? extends T> source, Supplier<R> initialS
 
     @Override
     public void subscribe(Subscriber<? super R>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
index 46d3bcdc1a..dc05a6a4aa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
@@ -49,7 +49,9 @@ public ParallelRunOn(ParallelFlowable<? extends T> parent,
     }
 
     @Override
-    public void subscribe(final Subscriber<? super T>[] subscribers) {
+    public void subscribe(Subscriber<? super T>[] subscribers) {
+        subscribers = RxJavaPlugins.onSubscribe(this, subscribers);
+
         if (!validate(subscribers)) {
             return;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
index 408eae8d36..ce4cee031b 100644
--- a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
@@ -112,6 +112,10 @@ public final class RxJavaPlugins {
     @Nullable
     static volatile BiFunction<? super Completable, ? super CompletableObserver, ? extends CompletableObserver> onCompletableSubscribe;
 
+    @SuppressWarnings("rawtypes")
+    @Nullable
+    static volatile BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> onParallelSubscribe;
+
     @Nullable
     static volatile BooleanSupplier onBeforeBlocking;
 
@@ -525,6 +529,7 @@ public static void reset() {
         setOnMaybeSubscribe(null);
 
         setOnParallelAssembly(null);
+        setOnParallelSubscribe(null);
 
         setFailOnNonBlockingScheduler(false);
         setOnBeforeBlocking(null);
@@ -992,6 +997,23 @@ public static <T> MaybeObserver<? super T> onSubscribe(@NonNull Maybe<T> source,
         return observer;
     }
 
+    /**
+     * Calls the associated hook function.
+     * @param <T> the value type
+     * @param source the hook's input value
+     * @param subscribers the array of subscribers
+     * @return the value returned by the hook
+     */
+    @SuppressWarnings({ "rawtypes" })
+    @NonNull
+    public static <T> Subscriber<@NonNull ? super T>[] onSubscribe(@NonNull ParallelFlowable<T> source, @NonNull Subscriber<@NonNull ? super T>[] subscribers) {
+        BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> f = onParallelSubscribe;
+        if (f != null) {
+            return apply(f, source, subscribers);
+        }
+        return subscribers;
+    }
+
     /**
      * Calls the associated hook function.
      * @param <T> the value type
@@ -1128,6 +1150,32 @@ public static void setOnParallelAssembly(@Nullable Function<? super ParallelFlow
         return onParallelAssembly;
     }
 
+    /**
+     * Sets the specific hook function.
+     * @param handler the hook function to set, null allowed
+     * @since 3.0.11 - experimental
+     */
+    @SuppressWarnings("rawtypes")
+    @Experimental
+    public static void setOnParallelSubscribe(@Nullable BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> handler) {
+        if (lockdown) {
+            throw new IllegalStateException("Plugins can't be changed anymore");
+        }
+        onParallelSubscribe = handler;
+    }
+
+    /**
+     * Returns the current hook function.
+     * @return the hook function, may be null
+     * @since 3.0.11 - experimental
+     */
+    @SuppressWarnings("rawtypes")
+    @Experimental
+    @Nullable
+    public static BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> getOnParallelSubscribe() {
+        return onParallelSubscribe;
+    }
+
     /**
      * Calls the associated hook function.
      * <p>History: 2.0.6 - experimental; 2.1 - beta
diff --git a/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
index defc141800..ed0ea74f2e 100644
--- a/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
@@ -592,6 +592,61 @@ public void onComplete() {
         .assertComplete();
     }
 
+    @SuppressWarnings("rawtypes")
+    @Test
+    public void parallelFlowableStart() {
+        try {
+            RxJavaPlugins.setOnParallelSubscribe(new BiFunction<ParallelFlowable, Subscriber[], Subscriber[]>() {
+                @Override
+                public Subscriber[] apply(ParallelFlowable f, final Subscriber[] t) {
+                    return new Subscriber[] { new Subscriber() {
+
+                            @Override
+                            public void onSubscribe(Subscription s) {
+                                t[0].onSubscribe(s);
+                            }
+
+                            @SuppressWarnings("unchecked")
+                            @Override
+                            public void onNext(Object value) {
+                                t[0].onNext((Integer)value - 9);
+                            }
+
+                            @Override
+                            public void onError(Throwable e) {
+                                t[0].onError(e);
+                            }
+
+                            @Override
+                            public void onComplete() {
+                                t[0].onComplete();
+                            }
+
+                        }
+                    };
+                }
+            });
+
+            Flowable.range(10, 3)
+            .parallel(1)
+            .sequential()
+            .test()
+            .assertValues(1, 2, 3)
+            .assertNoErrors()
+            .assertComplete();
+        } finally {
+            RxJavaPlugins.reset();
+        }
+        // make sure the reset worked
+        Flowable.range(10, 3)
+        .parallel(1)
+        .sequential()
+        .test()
+        .assertValues(10, 11, 12)
+        .assertNoErrors()
+        .assertComplete();
+    }
+
     @SuppressWarnings("rawtypes")
     @Test
     public void singleCreate() {
@@ -1176,6 +1231,7 @@ public void onComplete() {
             }
 
             AllSubscriber all = new AllSubscriber();
+            Subscriber[] allArray = { all };
 
             assertNull(RxJavaPlugins.onSubscribe(Observable.never(), null));
 
@@ -1197,6 +1253,10 @@ public void onComplete() {
 
             assertSame(all, RxJavaPlugins.onSubscribe(Maybe.never(), all));
 
+            assertNull(RxJavaPlugins.onSubscribe(Flowable.never().parallel(), null));
+
+            assertSame(allArray, RxJavaPlugins.onSubscribe(Flowable.never().parallel(), allArray));
+
             final Scheduler s = ImmediateThinScheduler.INSTANCE;
             Supplier<Scheduler> c = new Supplier<Scheduler>() {
                 @Override

From 55941d9984f128b32581740d694b1255c1707b3d Mon Sep 17 00:00:00 2001
From: LinkiPinki <alexkilian96@gmail.com>
Date: Thu, 25 Feb 2021 08:02:58 +0100
Subject: [PATCH 225/665] 3.x: Allow Single.zip and Maybe.zip result to be
 garbage collected (#7196)

* #7195 Allow zip result to be garbage collected

* Also `null` collected values on error and complete

* Update MaybeZipArray.java

* Update SingleZipArray.java

* Update MaybeZipArray.java

* Update SingleZipArray.java

* Update MaybeZipArray.java

* Update MaybeZipArray.java

Co-authored-by: Alex <alex@xenonlightz.de>
Co-authored-by: David Karnok <akarnokd@gmail.com>
---
 .../internal/operators/maybe/MaybeZipArray.java    | 14 ++++++++++++--
 .../internal/operators/single/SingleZipArray.java  | 13 +++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
index b155e019fc..1e3db0a808 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
@@ -73,7 +74,7 @@ static final class ZipCoordinator<T, R> extends AtomicInteger implements Disposa
 
         final ZipMaybeObserver<T>[] observers;
 
-        final Object[] values;
+        Object[] values;
 
         @SuppressWarnings("unchecked")
         ZipCoordinator(MaybeObserver<? super R> observer, int n, Function<? super Object[], ? extends R> zipper) {
@@ -99,11 +100,16 @@ public void dispose() {
                 for (ZipMaybeObserver<?> d : observers) {
                     d.dispose();
                 }
+
+                values = null;
             }
         }
 
         void innerSuccess(T value, int index) {
-            values[index] = value;
+            Object[] values = this.values;
+            if (values != null) {
+                values[index] = value;
+            }
             if (decrementAndGet() == 0) {
                 R v;
 
@@ -111,10 +117,12 @@ void innerSuccess(T value, int index) {
                     v = Objects.requireNonNull(zipper.apply(values), "The zipper returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
+                    this.values = null;
                     downstream.onError(ex);
                     return;
                 }
 
+                this.values = null;
                 downstream.onSuccess(v);
             }
         }
@@ -133,6 +141,7 @@ void disposeExcept(int index) {
         void innerError(Throwable ex, int index) {
             if (getAndSet(0) > 0) {
                 disposeExcept(index);
+                values = null;
                 downstream.onError(ex);
             } else {
                 RxJavaPlugins.onError(ex);
@@ -142,6 +151,7 @@ void innerError(Throwable ex, int index) {
         void innerComplete(int index) {
             if (getAndSet(0) > 0) {
                 disposeExcept(index);
+                values = null;
                 downstream.onComplete();
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
index 9130a2bf35..57ec56ce6a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
@@ -13,6 +13,7 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
+import java.util.Arrays;
 import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
@@ -74,7 +75,7 @@ static final class ZipCoordinator<T, R> extends AtomicInteger implements Disposa
 
         final ZipSingleObserver<T>[] observers;
 
-        final Object[] values;
+        Object[] values;
 
         @SuppressWarnings("unchecked")
         ZipCoordinator(SingleObserver<? super R> observer, int n, Function<? super Object[], ? extends R> zipper) {
@@ -100,11 +101,16 @@ public void dispose() {
                 for (ZipSingleObserver<?> d : observers) {
                     d.dispose();
                 }
+
+                values = null;
             }
         }
 
         void innerSuccess(T value, int index) {
-            values[index] = value;
+            Object[] values = this.values;
+            if (values != null) {
+                values[index] = value;
+            }
             if (decrementAndGet() == 0) {
                 R v;
 
@@ -112,10 +118,12 @@ void innerSuccess(T value, int index) {
                     v = Objects.requireNonNull(zipper.apply(values), "The zipper returned a null value");
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
+                    this.values = null;
                     downstream.onError(ex);
                     return;
                 }
 
+                this.values = null;
                 downstream.onSuccess(v);
             }
         }
@@ -134,6 +142,7 @@ void disposeExcept(int index) {
         void innerError(Throwable ex, int index) {
             if (getAndSet(0) > 0) {
                 disposeExcept(index);
+                values = null;
                 downstream.onError(ex);
             } else {
                 RxJavaPlugins.onError(ex);

From 819c377313e1b509cec5183f4c6685a6675b45f6 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Thu, 25 Feb 2021 08:17:24 +0100
Subject: [PATCH 226/665] 3.x: Cover changes of #7196

---
 .../operators/maybe/MaybeZipArray.java        |  1 -
 .../operators/single/SingleZipArray.java      |  1 -
 .../operators/maybe/MaybeZipArrayTest.java    | 17 +++++++++++++++++
 .../operators/single/SingleZipArrayTest.java  | 19 +++++++++++++++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
index 1e3db0a808..85f05236b5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
@@ -13,7 +13,6 @@
 
 package io.reactivex.rxjava3.internal.operators.maybe;
 
-import java.util.Arrays;
 import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
index 57ec56ce6a..6b865dcda1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
@@ -13,7 +13,6 @@
 
 package io.reactivex.rxjava3.internal.operators.single;
 
-import java.util.Arrays;
 import java.util.Objects;
 import java.util.concurrent.atomic.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
index 1407886997..098258ed68 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
@@ -221,4 +221,21 @@ public void oneSourceOnly() {
         .test()
         .assertResult(Arrays.asList(1));
     }
+
+    @Test
+    public void onSuccessAfterDispose() {
+        AtomicReference<MaybeObserver<? super Integer>> emitter = new AtomicReference<>();
+
+        TestObserver<List<Object>> to = Maybe.zipArray(Arrays::asList,
+                (MaybeSource<Integer>)o -> emitter.set(o), Maybe.<Integer>never())
+        .test();
+
+        emitter.get().onSubscribe(Disposable.empty());
+
+        to.dispose();
+
+        emitter.get().onSuccess(1);
+
+        to.assertEmpty();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
index 2720cd4559..6769d6b43d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
@@ -16,10 +16,12 @@
 import static org.junit.Assert.*;
 
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -213,4 +215,21 @@ public void bothSucceed() {
         .test()
         .assertResult(Arrays.asList(1, 2));
     }
+
+    @Test
+    public void onSuccessAfterDispose() {
+        AtomicReference<SingleObserver<? super Integer>> emitter = new AtomicReference<>();
+
+        TestObserver<List<Object>> to = Single.zipArray(Arrays::asList,
+                (SingleSource<Integer>)o -> emitter.set(o), Single.<Integer>never())
+        .test();
+
+        emitter.get().onSubscribe(Disposable.empty());
+
+        to.dispose();
+
+        emitter.get().onSuccess(1);
+
+        to.assertEmpty();
+    }
 }

From 24bad9cc3e160674f182b9b8f587703c01d94ef6 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Fri, 26 Feb 2021 08:02:57 +0100
Subject: [PATCH 227/665] Bump build-info-extractor-gradle from 4.20.0 to
 4.21.0 (#7198)

Bumps build-info-extractor-gradle from 4.20.0 to 4.21.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 444d81b60a..be36a633d1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
   ext.jacocoVersion = "0.8.4"
   ext.animalSnifferVersion = "1.5.3"
   ext.licenseVersion = "0.15.0"
-  ext.jfrogExtractorVersion = "4.20.0"
+  ext.jfrogExtractorVersion = "4.21.0"
   ext.bndVersion = "5.3.0"
   ext.checkstyleVersion = "8.26"
   ext.vanniktechPublishPlugin = "0.14.2"

From a4e087d980e2356f9aec6fbf6be65d0edb42315b Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 2 Mar 2021 12:58:57 +0100
Subject: [PATCH 228/665] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 806ff8561b..b14ae42f84 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Learn more about RxJava in general on the <a href="https://github.com/ReactiveX/
 
 #### Version 2.x
 
-The [2.x version](https://github.com/ReactiveX/RxJava/tree/2.x) is in maintenance mode and will be supported only through bugfixes until **February 28, 2021**. No new features, behavior changes or documentation adjustments will be accepted or applied to 2.x.
+The [2.x version](https://github.com/ReactiveX/RxJava/tree/2.x) is end-of-life as of **February 28, 2021**. No further development, support, maintenance, PRs and updates will happen. The [Javadoc]([Javadoc](http://reactivex.io/RxJava/2.x/javadoc/)) of the very last version, **2.2.21**, will remain accessible.
 
 #### Version 1.x
 

From 1c3594c214db82e4e85c33af7ad6bb315fa477a5 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Fri, 5 Mar 2021 01:23:17 -0800
Subject: [PATCH 229/665] Standardize java source headers (#7205)

* Create and validate standardized java source header

Update Checkstyle to validate all java source files have a standard
header. Remove FixLiscenseHeaders.java unit test as it duplicates
Checkstyle functionality. Standard header is block java comment, instead
of dangling Javadoc comment. Create standard header template
(HEADER_JAVA) in project root. Reference header template in
build.gradle. Update CONTRIBUTING.md to exact text of header template.

* Convert Licenses from dangling Javadoc to block comment

Standardize License based off of HEADER_JAVA file. All headers are block
Java comments.

* Restoring FixLicenseHeaders.java and updating CONTRIBUTING date

* Updated License dates to 2016

Several files had 2017 dates for License. Checkstyle now specifically
looks for 2016 date in License comments.

* Fix bad logic for header check in FixLicenseHeaders test
---
 CONTRIBUTING.md                               | 21 ++++----
 HEADER_JAVA                                   | 12 +++++
 build.gradle                                  |  8 +--
 checkstyle.xml                                | 53 ++++++-------------
 .../rxjava3/core/BinaryFlatMapPerf.java       |  2 +-
 .../rxjava3/core/BlockingGetPerf.java         |  2 +-
 .../reactivex/rxjava3/core/BlockingPerf.java  |  2 +-
 .../rxjava3/core/CallableAsyncPerf.java       |  2 +-
 .../rxjava3/core/EachTypeFlatMapPerf.java     |  2 +-
 .../rxjava3/core/FlatMapJustPerf.java         |  2 +-
 .../rxjava3/core/FlattenCrossMapPerf.java     |  2 +-
 .../rxjava3/core/FlattenJustPerf.java         |  2 +-
 .../rxjava3/core/FlattenRangePerf.java        |  2 +-
 .../FlowableFlatMapCompletableAsyncPerf.java  |  2 +-
 .../FlowableFlatMapCompletableSyncPerf.java   |  2 +-
 .../core/InputWithIncrementingInteger.java    |  2 +-
 .../reactivex/rxjava3/core/JustAsyncPerf.java |  2 +-
 .../rxjava3/core/LatchedSingleObserver.java   |  2 +-
 .../io/reactivex/rxjava3/core/MemoryPerf.java |  2 +-
 .../rxjava3/core/ObservableFlatMapPerf.java   |  2 +-
 .../rxjava3/core/OperatorFlatMapPerf.java     |  2 +-
 .../rxjava3/core/OperatorMergePerf.java       |  2 +-
 .../rxjava3/core/PerfAsyncConsumer.java       |  2 +-
 .../rxjava3/core/PerfBoundedSubscriber.java   |  2 +-
 .../reactivex/rxjava3/core/PerfConsumer.java  |  2 +-
 .../rxjava3/core/PerfInteropConsumer.java     |  2 +-
 .../reactivex/rxjava3/core/PerfObserver.java  |  2 +-
 .../rxjava3/core/PerfSubscriber.java          |  2 +-
 .../rxjava3/core/PublishProcessorPerf.java    |  2 +-
 .../io/reactivex/rxjava3/core/RangePerf.java  |  2 +-
 .../io/reactivex/rxjava3/core/ReducePerf.java |  2 +-
 .../rxjava3/core/RxVsStreamPerf.java          |  2 +-
 .../io/reactivex/rxjava3/core/StrictPerf.java |  2 +-
 .../reactivex/rxjava3/core/TakeUntilPerf.java |  2 +-
 .../rxjava3/core/ToFlowablePerf.java          |  2 +-
 .../io/reactivex/rxjava3/core/XMapYPerf.java  |  2 +-
 .../rxjava3/parallel/ParallelPerf.java        |  4 +-
 .../FlowableConcatMapCompletablePerf.java     |  2 +-
 .../FlowableConcatMapMaybeEmptyPerf.java      |  2 +-
 .../xmapz/FlowableConcatMapMaybePerf.java     |  2 +-
 .../xmapz/FlowableConcatMapSinglePerf.java    |  2 +-
 .../xmapz/FlowableFlatMapCompletablePerf.java |  2 +-
 .../xmapz/FlowableFlatMapMaybeEmptyPerf.java  |  2 +-
 .../xmapz/FlowableFlatMapMaybePerf.java       |  2 +-
 .../xmapz/FlowableFlatMapSinglePerf.java      |  2 +-
 .../FlowableSwitchMapCompletablePerf.java     |  2 +-
 .../FlowableSwitchMapMaybeEmptyPerf.java      |  2 +-
 .../xmapz/FlowableSwitchMapMaybePerf.java     |  2 +-
 .../xmapz/FlowableSwitchMapSinglePerf.java    |  2 +-
 .../ObservableConcatMapCompletablePerf.java   |  2 +-
 .../ObservableConcatMapMaybeEmptyPerf.java    |  2 +-
 .../xmapz/ObservableConcatMapMaybePerf.java   |  2 +-
 .../xmapz/ObservableConcatMapSinglePerf.java  |  2 +-
 .../ObservableFlatMapCompletablePerf.java     |  2 +-
 .../ObservableFlatMapMaybeEmptyPerf.java      |  2 +-
 .../xmapz/ObservableFlatMapMaybePerf.java     |  2 +-
 .../xmapz/ObservableFlatMapSinglePerf.java    |  2 +-
 .../ObservableSwitchMapCompletablePerf.java   |  2 +-
 .../ObservableSwitchMapMaybeEmptyPerf.java    |  2 +-
 .../xmapz/ObservableSwitchMapMaybePerf.java   |  2 +-
 .../xmapz/ObservableSwitchMapSinglePerf.java  |  2 +-
 .../rxjava3/annotations/BackpressureKind.java |  2 +-
 .../annotations/BackpressureSupport.java      |  2 +-
 .../reactivex/rxjava3/annotations/Beta.java   |  2 +-
 .../rxjava3/annotations/CheckReturnValue.java |  2 +-
 .../rxjava3/annotations/Experimental.java     |  2 +-
 .../rxjava3/annotations/NonNull.java          |  2 +-
 .../rxjava3/annotations/Nullable.java         |  2 +-
 .../rxjava3/annotations/SchedulerSupport.java |  2 +-
 .../rxjava3/annotations/package-info.java     | 15 +++---
 .../core/BackpressureOverflowStrategy.java    | 16 +++---
 .../rxjava3/core/BackpressureStrategy.java    |  2 +-
 .../reactivex/rxjava3/core/Completable.java   |  3 +-
 .../rxjava3/core/CompletableConverter.java    |  2 +-
 .../rxjava3/core/CompletableEmitter.java      |  2 +-
 .../rxjava3/core/CompletableObserver.java     |  2 +-
 .../rxjava3/core/CompletableOnSubscribe.java  |  3 +-
 .../rxjava3/core/CompletableOperator.java     |  2 +-
 .../rxjava3/core/CompletableSource.java       |  3 +-
 .../rxjava3/core/CompletableTransformer.java  |  2 +-
 .../io/reactivex/rxjava3/core/Emitter.java    |  3 +-
 .../io/reactivex/rxjava3/core/Flowable.java   |  3 +-
 .../rxjava3/core/FlowableConverter.java       |  2 +-
 .../rxjava3/core/FlowableEmitter.java         |  2 +-
 .../rxjava3/core/FlowableOnSubscribe.java     |  3 +-
 .../rxjava3/core/FlowableOperator.java        |  2 +-
 .../rxjava3/core/FlowableSubscriber.java      |  2 +-
 .../rxjava3/core/FlowableTransformer.java     |  2 +-
 .../java/io/reactivex/rxjava3/core/Maybe.java |  2 +-
 .../rxjava3/core/MaybeConverter.java          |  2 +-
 .../reactivex/rxjava3/core/MaybeEmitter.java  |  2 +-
 .../reactivex/rxjava3/core/MaybeObserver.java |  2 +-
 .../rxjava3/core/MaybeOnSubscribe.java        |  3 +-
 .../reactivex/rxjava3/core/MaybeOperator.java |  3 +-
 .../reactivex/rxjava3/core/MaybeSource.java   |  3 +-
 .../rxjava3/core/MaybeTransformer.java        |  2 +-
 .../reactivex/rxjava3/core/Notification.java  |  2 +-
 .../io/reactivex/rxjava3/core/Observable.java |  2 +-
 .../rxjava3/core/ObservableConverter.java     |  2 +-
 .../rxjava3/core/ObservableEmitter.java       |  2 +-
 .../rxjava3/core/ObservableOnSubscribe.java   |  3 +-
 .../rxjava3/core/ObservableOperator.java      |  2 +-
 .../rxjava3/core/ObservableSource.java        |  3 +-
 .../rxjava3/core/ObservableTransformer.java   |  2 +-
 .../io/reactivex/rxjava3/core/Observer.java   |  2 +-
 .../io/reactivex/rxjava3/core/Scheduler.java  |  2 +-
 .../io/reactivex/rxjava3/core/Single.java     |  2 +-
 .../rxjava3/core/SingleConverter.java         |  2 +-
 .../reactivex/rxjava3/core/SingleEmitter.java |  2 +-
 .../rxjava3/core/SingleObserver.java          |  2 +-
 .../rxjava3/core/SingleOnSubscribe.java       |  3 +-
 .../rxjava3/core/SingleOperator.java          |  2 +-
 .../reactivex/rxjava3/core/SingleSource.java  |  3 +-
 .../rxjava3/core/SingleTransformer.java       |  2 +-
 .../reactivex/rxjava3/core/package-info.java  | 16 +++---
 .../rxjava3/disposables/ActionDisposable.java |  3 +-
 .../disposables/AutoCloseableDisposable.java  |  2 +-
 .../disposables/CompositeDisposable.java      |  3 +-
 .../rxjava3/disposables/Disposable.java       |  3 +-
 .../disposables/DisposableContainer.java      |  2 +-
 .../rxjava3/disposables/FutureDisposable.java |  3 +-
 .../disposables/ReferenceDisposable.java      |  2 +-
 .../disposables/RunnableDisposable.java       |  3 +-
 .../rxjava3/disposables/SerialDisposable.java |  2 +-
 .../disposables/SubscriptionDisposable.java   |  3 +-
 .../rxjava3/disposables/package-info.java     | 15 +++---
 .../exceptions/CompositeException.java        | 16 +++---
 .../rxjava3/exceptions/Exceptions.java        |  2 +-
 .../MissingBackpressureException.java         |  2 +-
 .../OnErrorNotImplementedException.java       |  4 +-
 .../ProtocolViolationException.java           |  2 +-
 .../exceptions/UndeliverableException.java    |  2 +-
 .../rxjava3/exceptions/package-info.java      | 15 +++---
 .../flowables/ConnectableFlowable.java        |  2 +-
 .../rxjava3/flowables/GroupedFlowable.java    |  3 +-
 .../rxjava3/flowables/package-info.java       | 15 +++---
 .../reactivex/rxjava3/functions/Action.java   |  2 +-
 .../rxjava3/functions/BiConsumer.java         |  2 +-
 .../rxjava3/functions/BiFunction.java         |  2 +-
 .../rxjava3/functions/BiPredicate.java        |  2 +-
 .../rxjava3/functions/BooleanSupplier.java    |  2 +-
 .../rxjava3/functions/Cancellable.java        |  2 +-
 .../reactivex/rxjava3/functions/Consumer.java |  2 +-
 .../reactivex/rxjava3/functions/Function.java |  2 +-
 .../rxjava3/functions/Function3.java          |  2 +-
 .../rxjava3/functions/Function4.java          |  2 +-
 .../rxjava3/functions/Function5.java          |  2 +-
 .../rxjava3/functions/Function6.java          |  2 +-
 .../rxjava3/functions/Function7.java          |  2 +-
 .../rxjava3/functions/Function8.java          |  2 +-
 .../rxjava3/functions/Function9.java          |  2 +-
 .../rxjava3/functions/IntFunction.java        |  3 +-
 .../rxjava3/functions/LongConsumer.java       |  3 +-
 .../rxjava3/functions/Predicate.java          |  2 +-
 .../reactivex/rxjava3/functions/Supplier.java |  2 +-
 .../rxjava3/functions/package-info.java       | 15 +++---
 .../disposables/ArrayCompositeDisposable.java |  2 +-
 .../disposables/CancellableDisposable.java    |  2 +-
 .../disposables/DisposableHelper.java         |  2 +-
 .../internal/disposables/EmptyDisposable.java |  2 +-
 .../disposables/ListCompositeDisposable.java  |  3 +-
 .../disposables/SequentialDisposable.java     |  2 +-
 .../rxjava3/internal/functions/Functions.java |  3 +-
 .../internal/functions/ObjectHelper.java      |  3 +-
 .../fuseable/AbstractEmptyQueueFuseable.java  |  4 +-
 .../fuseable/CancellableQueueFuseable.java    |  4 +-
 .../fuseable/ConditionalSubscriber.java       |  2 +-
 .../internal/fuseable/FuseToFlowable.java     |  2 +-
 .../internal/fuseable/FuseToMaybe.java        |  2 +-
 .../internal/fuseable/FuseToObservable.java   |  2 +-
 .../HasUpstreamCompletableSource.java         |  2 +-
 .../fuseable/HasUpstreamMaybeSource.java      |  2 +-
 .../fuseable/HasUpstreamObservableSource.java |  2 +-
 .../fuseable/HasUpstreamPublisher.java        |  2 +-
 .../fuseable/HasUpstreamSingleSource.java     |  2 +-
 .../internal/fuseable/QueueDisposable.java    |  3 +-
 .../internal/fuseable/QueueFuseable.java      |  2 +-
 .../internal/fuseable/QueueSubscription.java  |  3 +-
 .../internal/fuseable/ScalarSupplier.java     |  3 +-
 .../internal/fuseable/SimplePlainQueue.java   |  2 +-
 .../internal/fuseable/SimpleQueue.java        |  2 +-
 .../internal/fuseable/package-info.java       |  2 +-
 .../jdk8/CompletableFromCompletionStage.java  |  3 +-
 .../jdk8/CompletionStageConsumer.java         |  3 +-
 .../jdk8/FlowableCollectWithCollector.java    |  3 +-
 .../FlowableCollectWithCollectorSingle.java   |  3 +-
 .../jdk8/FlowableFirstStageSubscriber.java    |  3 +-
 .../internal/jdk8/FlowableFlatMapStream.java  |  2 +-
 .../jdk8/FlowableFromCompletionStage.java     |  3 +-
 .../internal/jdk8/FlowableFromStream.java     |  3 +-
 .../jdk8/FlowableLastStageSubscriber.java     |  3 +-
 .../internal/jdk8/FlowableMapOptional.java    |  3 +-
 .../jdk8/FlowableSingleStageSubscriber.java   |  3 +-
 .../jdk8/FlowableStageSubscriber.java         |  3 +-
 .../jdk8/MaybeFlattenStreamAsFlowable.java    |  2 +-
 .../jdk8/MaybeFlattenStreamAsObservable.java  |  2 +-
 .../jdk8/MaybeFromCompletionStage.java        |  3 +-
 .../internal/jdk8/MaybeMapOptional.java       |  2 +-
 .../jdk8/ObservableCollectWithCollector.java  |  3 +-
 .../ObservableCollectWithCollectorSingle.java |  3 +-
 .../jdk8/ObservableFirstStageObserver.java    |  3 +-
 .../jdk8/ObservableFlatMapStream.java         |  2 +-
 .../jdk8/ObservableFromCompletionStage.java   |  3 +-
 .../internal/jdk8/ObservableFromStream.java   |  3 +-
 .../jdk8/ObservableLastStageObserver.java     |  3 +-
 .../internal/jdk8/ObservableMapOptional.java  |  3 +-
 .../jdk8/ObservableSingleStageObserver.java   |  3 +-
 .../jdk8/ObservableStageObserver.java         |  3 +-
 .../internal/jdk8/ParallelCollector.java      |  2 +-
 .../internal/jdk8/ParallelFlatMapStream.java  |  2 +-
 .../internal/jdk8/ParallelMapOptional.java    |  2 +-
 .../internal/jdk8/ParallelMapTryOptional.java |  2 +-
 .../jdk8/SingleFlattenStreamAsFlowable.java   |  2 +-
 .../jdk8/SingleFlattenStreamAsObservable.java |  2 +-
 .../jdk8/SingleFromCompletionStage.java       |  3 +-
 .../internal/jdk8/SingleMapOptional.java      |  2 +-
 .../observers/BasicFuseableObserver.java      |  2 +-
 .../observers/BasicIntQueueDisposable.java    |  2 +-
 .../observers/BasicQueueDisposable.java       |  2 +-
 .../observers/BiConsumerSingleObserver.java   |  2 +-
 .../observers/BlockingBaseObserver.java       |  3 +-
 .../BlockingDisposableMultiObserver.java      |  2 +-
 .../observers/BlockingFirstObserver.java      |  2 +-
 .../observers/BlockingLastObserver.java       |  2 +-
 .../observers/BlockingMultiObserver.java      |  2 +-
 .../internal/observers/BlockingObserver.java  |  2 +-
 .../CallbackCompletableObserver.java          |  2 +-
 .../observers/ConsumerSingleObserver.java     |  2 +-
 .../observers/DeferredScalarDisposable.java   |  2 +-
 .../observers/DeferredScalarObserver.java     |  2 +-
 .../observers/DisposableLambdaObserver.java   |  2 +-
 .../observers/EmptyCompletableObserver.java   |  2 +-
 .../observers/ForEachWhileObserver.java       |  2 +-
 .../observers/FutureMultiObserver.java        |  2 +-
 .../internal/observers/FutureObserver.java    |  2 +-
 .../observers/InnerQueuedObserver.java        |  2 +-
 .../observers/InnerQueuedObserverSupport.java |  2 +-
 .../internal/observers/LambdaObserver.java    |  2 +-
 .../observers/QueueDrainObserver.java         |  2 +-
 .../observers/ResumeSingleObserver.java       |  2 +-
 .../observers/SafeCompletableObserver.java    |  2 +-
 .../internal/observers/SafeMaybeObserver.java |  2 +-
 .../observers/SafeSingleObserver.java         |  2 +-
 .../operators/completable/CompletableAmb.java |  2 +-
 .../CompletableAndThenCompletable.java        |  2 +-
 .../completable/CompletableCache.java         |  2 +-
 .../completable/CompletableConcat.java        |  2 +-
 .../completable/CompletableConcatArray.java   |  2 +-
 .../CompletableConcatIterable.java            |  2 +-
 .../completable/CompletableCreate.java        |  2 +-
 .../completable/CompletableDefer.java         |  2 +-
 .../completable/CompletableDelay.java         |  2 +-
 .../completable/CompletableDetach.java        |  2 +-
 .../completable/CompletableDisposeOn.java     |  2 +-
 .../completable/CompletableDoFinally.java     |  2 +-
 .../completable/CompletableDoOnEvent.java     |  2 +-
 .../completable/CompletableEmpty.java         |  2 +-
 .../completable/CompletableError.java         |  2 +-
 .../completable/CompletableErrorSupplier.java |  2 +-
 .../completable/CompletableFromAction.java    |  2 +-
 .../completable/CompletableFromCallable.java  |  2 +-
 .../CompletableFromObservable.java            |  2 +-
 .../completable/CompletableFromPublisher.java |  2 +-
 .../completable/CompletableFromRunnable.java  |  2 +-
 .../completable/CompletableFromSingle.java    |  2 +-
 .../completable/CompletableFromSupplier.java  |  2 +-
 .../CompletableFromUnsafeSource.java          |  2 +-
 .../completable/CompletableHide.java          |  2 +-
 .../completable/CompletableLift.java          |  2 +-
 .../completable/CompletableMaterialize.java   |  2 +-
 .../completable/CompletableMerge.java         |  2 +-
 .../completable/CompletableMergeArray.java    |  2 +-
 .../CompletableMergeArrayDelayError.java      |  2 +-
 .../CompletableMergeDelayErrorIterable.java   |  2 +-
 .../completable/CompletableMergeIterable.java |  2 +-
 .../completable/CompletableNever.java         |  2 +-
 .../completable/CompletableObserveOn.java     |  2 +-
 .../CompletableOnErrorComplete.java           |  2 +-
 .../completable/CompletableOnErrorReturn.java |  2 +-
 .../completable/CompletablePeek.java          |  2 +-
 .../completable/CompletableResumeNext.java    |  2 +-
 .../completable/CompletableSubscribeOn.java   |  2 +-
 .../CompletableTakeUntilCompletable.java      |  2 +-
 .../completable/CompletableTimeout.java       |  2 +-
 .../completable/CompletableTimer.java         |  2 +-
 .../completable/CompletableToFlowable.java    |  2 +-
 .../completable/CompletableToObservable.java  |  2 +-
 .../completable/CompletableToSingle.java      |  2 +-
 .../completable/CompletableUsing.java         |  2 +-
 ...tractBackpressureThrottlingSubscriber.java |  2 +-
 .../AbstractFlowableWithUpstream.java         |  2 +-
 .../flowable/BlockingFlowableIterable.java    |  2 +-
 .../flowable/BlockingFlowableLatest.java      |  2 +-
 .../flowable/BlockingFlowableMostRecent.java  |  2 +-
 .../flowable/BlockingFlowableNext.java        |  2 +-
 .../operators/flowable/FlowableAll.java       |  3 +-
 .../operators/flowable/FlowableAllSingle.java |  3 +-
 .../operators/flowable/FlowableAmb.java       |  2 +-
 .../operators/flowable/FlowableAny.java       |  3 +-
 .../operators/flowable/FlowableAnySingle.java |  3 +-
 .../flowable/FlowableAutoConnect.java         |  2 +-
 .../flowable/FlowableBlockingSubscribe.java   |  2 +-
 .../operators/flowable/FlowableBuffer.java    |  2 +-
 .../flowable/FlowableBufferBoundary.java      |  2 +-
 .../flowable/FlowableBufferExactBoundary.java |  2 +-
 .../flowable/FlowableBufferTimed.java         |  2 +-
 .../operators/flowable/FlowableCache.java     |  2 +-
 .../operators/flowable/FlowableCollect.java   |  3 +-
 .../flowable/FlowableCollectSingle.java       |  3 +-
 .../flowable/FlowableCombineLatest.java       |  2 +-
 .../flowable/FlowableConcatArray.java         |  3 +-
 .../operators/flowable/FlowableConcatMap.java |  3 +-
 .../flowable/FlowableConcatMapEager.java      |  2 +-
 .../FlowableConcatMapEagerPublisher.java      |  2 +-
 .../flowable/FlowableConcatMapScheduler.java  |  3 +-
 .../FlowableConcatWithCompletable.java        |  2 +-
 .../flowable/FlowableConcatWithMaybe.java     |  2 +-
 .../flowable/FlowableConcatWithSingle.java    |  2 +-
 .../operators/flowable/FlowableCount.java     |  2 +-
 .../flowable/FlowableCountSingle.java         |  2 +-
 .../operators/flowable/FlowableCreate.java    |  2 +-
 .../operators/flowable/FlowableDebounce.java  |  2 +-
 .../flowable/FlowableDebounceTimed.java       |  2 +-
 .../operators/flowable/FlowableDefer.java     |  2 +-
 .../operators/flowable/FlowableDelay.java     |  2 +-
 .../FlowableDelaySubscriptionOther.java       |  3 +-
 .../flowable/FlowableDematerialize.java       |  2 +-
 .../operators/flowable/FlowableDetach.java    |  2 +-
 .../operators/flowable/FlowableDistinct.java  |  2 +-
 .../FlowableDistinctUntilChanged.java         |  2 +-
 .../flowable/FlowableDoAfterNext.java         |  2 +-
 .../operators/flowable/FlowableDoFinally.java |  2 +-
 .../operators/flowable/FlowableDoOnEach.java  |  2 +-
 .../flowable/FlowableDoOnLifecycle.java       |  3 +-
 .../operators/flowable/FlowableElementAt.java |  2 +-
 .../flowable/FlowableElementAtMaybe.java      |  2 +-
 .../FlowableElementAtMaybePublisher.java      |  2 +-
 .../flowable/FlowableElementAtSingle.java     |  2 +-
 .../operators/flowable/FlowableEmpty.java     |  2 +-
 .../operators/flowable/FlowableError.java     |  2 +-
 .../operators/flowable/FlowableFilter.java    |  2 +-
 .../operators/flowable/FlowableFlatMap.java   |  2 +-
 .../flowable/FlowableFlatMapCompletable.java  |  2 +-
 ...FlowableFlatMapCompletableCompletable.java |  2 +-
 .../flowable/FlowableFlatMapMaybe.java        |  2 +-
 .../FlowableFlatMapMaybePublisher.java        |  2 +-
 .../flowable/FlowableFlatMapSingle.java       |  2 +-
 .../FlowableFlatMapSinglePublisher.java       |  2 +-
 .../flowable/FlowableFlattenIterable.java     |  2 +-
 .../flowable/FlowableFromAction.java          |  2 +-
 .../operators/flowable/FlowableFromArray.java |  2 +-
 .../flowable/FlowableFromCallable.java        |  2 +-
 .../flowable/FlowableFromCompletable.java     |  2 +-
 .../flowable/FlowableFromFuture.java          |  2 +-
 .../flowable/FlowableFromIterable.java        |  2 +-
 .../flowable/FlowableFromObservable.java      |  3 +-
 .../flowable/FlowableFromPublisher.java       |  2 +-
 .../flowable/FlowableFromRunnable.java        |  2 +-
 .../flowable/FlowableFromSupplier.java        |  2 +-
 .../operators/flowable/FlowableGenerate.java  |  2 +-
 .../operators/flowable/FlowableGroupBy.java   |  2 +-
 .../operators/flowable/FlowableGroupJoin.java | 15 +++---
 .../operators/flowable/FlowableHide.java      |  2 +-
 .../flowable/FlowableIgnoreElements.java      |  2 +-
 .../FlowableIgnoreElementsCompletable.java    |  2 +-
 .../flowable/FlowableInternalHelper.java      |  3 +-
 .../operators/flowable/FlowableInterval.java  |  2 +-
 .../flowable/FlowableIntervalRange.java       |  2 +-
 .../operators/flowable/FlowableJoin.java      |  2 +-
 .../operators/flowable/FlowableJust.java      |  2 +-
 .../operators/flowable/FlowableLastMaybe.java |  2 +-
 .../flowable/FlowableLastSingle.java          |  2 +-
 .../operators/flowable/FlowableLift.java      |  2 +-
 .../operators/flowable/FlowableMap.java       |  2 +-
 .../flowable/FlowableMapNotification.java     |  2 +-
 .../flowable/FlowableMapPublisher.java        |  2 +-
 .../flowable/FlowableMaterialize.java         |  2 +-
 .../FlowableMergeWithCompletable.java         |  2 +-
 .../flowable/FlowableMergeWithMaybe.java      |  2 +-
 .../flowable/FlowableMergeWithSingle.java     |  2 +-
 .../operators/flowable/FlowableNever.java     |  3 +-
 .../operators/flowable/FlowableObserveOn.java |  2 +-
 .../FlowableOnBackpressureBuffer.java         |  2 +-
 .../FlowableOnBackpressureBufferStrategy.java |  2 +-
 .../flowable/FlowableOnBackpressureDrop.java  |  2 +-
 .../flowable/FlowableOnBackpressureError.java |  8 +--
 .../FlowableOnBackpressureLatest.java         |  2 +-
 .../FlowableOnBackpressureReduce.java         |  8 +--
 .../FlowableOnBackpressureReduceWith.java     |  8 +--
 .../flowable/FlowableOnErrorComplete.java     |  2 +-
 .../flowable/FlowableOnErrorNext.java         |  2 +-
 .../flowable/FlowableOnErrorReturn.java       |  2 +-
 .../operators/flowable/FlowablePublish.java   |  2 +-
 .../flowable/FlowablePublishMulticast.java    | 15 +++---
 .../operators/flowable/FlowableRange.java     |  2 +-
 .../operators/flowable/FlowableRangeLong.java |  2 +-
 .../operators/flowable/FlowableReduce.java    |  2 +-
 .../flowable/FlowableReduceMaybe.java         |  2 +-
 .../flowable/FlowableReduceSeedSingle.java    |  2 +-
 .../flowable/FlowableReduceWithSingle.java    |  2 +-
 .../operators/flowable/FlowableRefCount.java  |  2 +-
 .../operators/flowable/FlowableRepeat.java    |  2 +-
 .../flowable/FlowableRepeatUntil.java         |  2 +-
 .../flowable/FlowableRepeatWhen.java          |  2 +-
 .../operators/flowable/FlowableReplay.java    |  2 +-
 .../flowable/FlowableRetryBiPredicate.java    |  2 +-
 .../flowable/FlowableRetryPredicate.java      |  2 +-
 .../operators/flowable/FlowableRetryWhen.java |  2 +-
 .../flowable/FlowableSamplePublisher.java     |  2 +-
 .../flowable/FlowableSampleTimed.java         |  2 +-
 .../flowable/FlowableScalarXMap.java          |  2 +-
 .../operators/flowable/FlowableScan.java      |  2 +-
 .../operators/flowable/FlowableScanSeed.java  |  3 +-
 .../flowable/FlowableSequenceEqual.java       |  2 +-
 .../flowable/FlowableSequenceEqualSingle.java |  2 +-
 .../flowable/FlowableSerialized.java          |  3 +-
 .../operators/flowable/FlowableSingle.java    |  2 +-
 .../flowable/FlowableSingleMaybe.java         |  2 +-
 .../flowable/FlowableSingleSingle.java        |  2 +-
 .../operators/flowable/FlowableSkip.java      |  2 +-
 .../operators/flowable/FlowableSkipLast.java  |  2 +-
 .../flowable/FlowableSkipLastTimed.java       |  2 +-
 .../operators/flowable/FlowableSkipUntil.java |  2 +-
 .../operators/flowable/FlowableSkipWhile.java |  2 +-
 .../flowable/FlowableSubscribeOn.java         |  2 +-
 .../flowable/FlowableSwitchIfEmpty.java       |  2 +-
 .../operators/flowable/FlowableSwitchMap.java |  2 +-
 .../operators/flowable/FlowableTake.java      |  2 +-
 .../operators/flowable/FlowableTakeLast.java  |  2 +-
 .../flowable/FlowableTakeLastOne.java         |  3 +-
 .../flowable/FlowableTakeLastTimed.java       |  2 +-
 .../flowable/FlowableTakePublisher.java       |  2 +-
 .../operators/flowable/FlowableTakeUntil.java |  2 +-
 .../flowable/FlowableTakeUntilPredicate.java  |  2 +-
 .../operators/flowable/FlowableTakeWhile.java |  2 +-
 .../flowable/FlowableThrottleFirstTimed.java  |  2 +-
 .../flowable/FlowableThrottleLatest.java      |  2 +-
 .../flowable/FlowableTimeInterval.java        |  2 +-
 .../operators/flowable/FlowableTimeout.java   |  2 +-
 .../flowable/FlowableTimeoutTimed.java        |  2 +-
 .../operators/flowable/FlowableTimer.java     |  2 +-
 .../operators/flowable/FlowableToList.java    |  2 +-
 .../flowable/FlowableToListSingle.java        |  2 +-
 .../flowable/FlowableUnsubscribeOn.java       |  2 +-
 .../operators/flowable/FlowableUsing.java     |  2 +-
 .../operators/flowable/FlowableWindow.java    |  2 +-
 .../flowable/FlowableWindowBoundary.java      |  2 +-
 .../FlowableWindowBoundarySelector.java       |  2 +-
 .../FlowableWindowSubscribeIntercept.java     |  4 +-
 .../flowable/FlowableWindowTimed.java         |  2 +-
 .../flowable/FlowableWithLatestFrom.java      |  2 +-
 .../flowable/FlowableWithLatestFromMany.java  |  3 +-
 .../operators/flowable/FlowableZip.java       |  2 +-
 .../flowable/FlowableZipIterable.java         |  2 +-
 .../maybe/AbstractMaybeWithUpstream.java      |  2 +-
 .../internal/operators/maybe/MaybeAmb.java    |  2 +-
 .../internal/operators/maybe/MaybeCache.java  |  2 +-
 .../maybe/MaybeCallbackObserver.java          |  2 +-
 .../operators/maybe/MaybeConcatArray.java     |  2 +-
 .../maybe/MaybeConcatArrayDelayError.java     |  2 +-
 .../operators/maybe/MaybeConcatIterable.java  |  2 +-
 .../operators/maybe/MaybeContains.java        |  2 +-
 .../internal/operators/maybe/MaybeCount.java  |  2 +-
 .../internal/operators/maybe/MaybeCreate.java |  2 +-
 .../internal/operators/maybe/MaybeDefer.java  |  2 +-
 .../internal/operators/maybe/MaybeDelay.java  |  2 +-
 .../maybe/MaybeDelayOtherPublisher.java       |  2 +-
 .../MaybeDelaySubscriptionOtherPublisher.java |  2 +-
 .../maybe/MaybeDelayWithCompletable.java      |  2 +-
 .../operators/maybe/MaybeDematerialize.java   |  2 +-
 .../internal/operators/maybe/MaybeDetach.java |  2 +-
 .../operators/maybe/MaybeDoAfterSuccess.java  |  2 +-
 .../operators/maybe/MaybeDoFinally.java       |  2 +-
 .../operators/maybe/MaybeDoOnEvent.java       |  2 +-
 .../operators/maybe/MaybeDoOnLifecycle.java   |  3 +-
 .../operators/maybe/MaybeDoOnTerminate.java   |  2 +-
 .../internal/operators/maybe/MaybeEmpty.java  |  2 +-
 .../operators/maybe/MaybeEqualSingle.java     |  2 +-
 .../internal/operators/maybe/MaybeError.java  |  2 +-
 .../operators/maybe/MaybeErrorCallable.java   |  2 +-
 .../internal/operators/maybe/MaybeFilter.java |  2 +-
 .../operators/maybe/MaybeFilterSingle.java    |  2 +-
 .../maybe/MaybeFlatMapBiSelector.java         |  2 +-
 .../maybe/MaybeFlatMapCompletable.java        |  2 +-
 .../maybe/MaybeFlatMapIterableFlowable.java   |  2 +-
 .../maybe/MaybeFlatMapIterableObservable.java |  2 +-
 .../maybe/MaybeFlatMapNotification.java       |  2 +-
 .../operators/maybe/MaybeFlatMapSingle.java   |  2 +-
 .../operators/maybe/MaybeFlatten.java         |  2 +-
 .../operators/maybe/MaybeFromAction.java      |  2 +-
 .../operators/maybe/MaybeFromCallable.java    |  2 +-
 .../operators/maybe/MaybeFromCompletable.java |  2 +-
 .../operators/maybe/MaybeFromFuture.java      |  2 +-
 .../operators/maybe/MaybeFromRunnable.java    |  2 +-
 .../operators/maybe/MaybeFromSingle.java      |  2 +-
 .../operators/maybe/MaybeFromSupplier.java    |  2 +-
 .../internal/operators/maybe/MaybeHide.java   |  2 +-
 .../operators/maybe/MaybeIgnoreElement.java   |  2 +-
 .../maybe/MaybeIgnoreElementCompletable.java  |  2 +-
 .../operators/maybe/MaybeIsEmpty.java         |  2 +-
 .../operators/maybe/MaybeIsEmptySingle.java   |  2 +-
 .../internal/operators/maybe/MaybeJust.java   |  2 +-
 .../internal/operators/maybe/MaybeLift.java   |  2 +-
 .../internal/operators/maybe/MaybeMap.java    |  2 +-
 .../operators/maybe/MaybeMaterialize.java     |  2 +-
 .../operators/maybe/MaybeMergeArray.java      |  2 +-
 .../internal/operators/maybe/MaybeNever.java  |  2 +-
 .../operators/maybe/MaybeObserveOn.java       |  2 +-
 .../operators/maybe/MaybeOnErrorComplete.java |  2 +-
 .../operators/maybe/MaybeOnErrorNext.java     |  2 +-
 .../operators/maybe/MaybeOnErrorReturn.java   |  2 +-
 .../internal/operators/maybe/MaybePeek.java   |  2 +-
 .../operators/maybe/MaybeSubscribeOn.java     |  2 +-
 .../operators/maybe/MaybeSwitchIfEmpty.java   |  2 +-
 .../maybe/MaybeSwitchIfEmptySingle.java       |  4 +-
 .../operators/maybe/MaybeTakeUntilMaybe.java  |  2 +-
 .../maybe/MaybeTakeUntilPublisher.java        |  2 +-
 .../operators/maybe/MaybeTimeInterval.java    |  2 +-
 .../operators/maybe/MaybeTimeoutMaybe.java    |  2 +-
 .../maybe/MaybeTimeoutPublisher.java          |  2 +-
 .../internal/operators/maybe/MaybeTimer.java  |  2 +-
 .../operators/maybe/MaybeToFlowable.java      |  2 +-
 .../operators/maybe/MaybeToObservable.java    |  2 +-
 .../operators/maybe/MaybeToPublisher.java     |  2 +-
 .../operators/maybe/MaybeToSingle.java        |  2 +-
 .../operators/maybe/MaybeUnsafeCreate.java    |  2 +-
 .../operators/maybe/MaybeUnsubscribeOn.java   |  2 +-
 .../internal/operators/maybe/MaybeUsing.java  |  2 +-
 .../operators/maybe/MaybeZipArray.java        |  2 +-
 .../operators/maybe/MaybeZipIterable.java     |  2 +-
 .../mixed/CompletableAndThenObservable.java   |  2 +-
 .../mixed/CompletableAndThenPublisher.java    |  2 +-
 .../mixed/ConcatMapXMainObserver.java         |  2 +-
 .../mixed/ConcatMapXMainSubscriber.java       |  2 +-
 .../mixed/FlowableConcatMapCompletable.java   |  2 +-
 .../mixed/FlowableConcatMapMaybe.java         |  2 +-
 .../FlowableConcatMapMaybePublisher.java      |  2 +-
 .../mixed/FlowableConcatMapSingle.java        |  2 +-
 .../FlowableConcatMapSinglePublisher.java     |  2 +-
 .../mixed/FlowableSwitchMapCompletable.java   |  2 +-
 ...FlowableSwitchMapCompletablePublisher.java |  2 +-
 .../mixed/FlowableSwitchMapMaybe.java         |  2 +-
 .../FlowableSwitchMapMaybePublisher.java      |  2 +-
 .../mixed/FlowableSwitchMapSingle.java        |  2 +-
 .../FlowableSwitchMapSinglePublisher.java     |  2 +-
 .../mixed/MaterializeSingleObserver.java      |  2 +-
 .../mixed/MaybeFlatMapObservable.java         |  2 +-
 .../mixed/MaybeFlatMapPublisher.java          |  2 +-
 .../mixed/ObservableConcatMapCompletable.java |  2 +-
 .../mixed/ObservableConcatMapMaybe.java       |  2 +-
 .../mixed/ObservableConcatMapSingle.java      |  2 +-
 .../mixed/ObservableSwitchMapCompletable.java |  2 +-
 .../mixed/ObservableSwitchMapMaybe.java       |  2 +-
 .../mixed/ObservableSwitchMapSingle.java      |  2 +-
 .../operators/mixed/ScalarXMapZHelper.java    |  2 +-
 .../mixed/SingleFlatMapObservable.java        |  2 +-
 .../AbstractObservableWithUpstream.java       |  2 +-
 .../BlockingObservableIterable.java           |  2 +-
 .../observable/BlockingObservableLatest.java  |  2 +-
 .../BlockingObservableMostRecent.java         |  2 +-
 .../observable/BlockingObservableNext.java    |  2 +-
 .../operators/observable/ObservableAll.java   |  3 +-
 .../observable/ObservableAllSingle.java       |  3 +-
 .../operators/observable/ObservableAmb.java   |  2 +-
 .../operators/observable/ObservableAny.java   |  3 +-
 .../observable/ObservableAnySingle.java       |  3 +-
 .../observable/ObservableAutoConnect.java     |  2 +-
 .../ObservableBlockingSubscribe.java          |  2 +-
 .../observable/ObservableBuffer.java          |  2 +-
 .../observable/ObservableBufferBoundary.java  |  2 +-
 .../ObservableBufferExactBoundary.java        |  2 +-
 .../observable/ObservableBufferTimed.java     |  2 +-
 .../operators/observable/ObservableCache.java |  2 +-
 .../observable/ObservableCollect.java         |  3 +-
 .../observable/ObservableCollectSingle.java   |  3 +-
 .../observable/ObservableCombineLatest.java   |  2 +-
 .../observable/ObservableConcatMap.java       |  3 +-
 .../observable/ObservableConcatMapEager.java  |  2 +-
 .../ObservableConcatMapScheduler.java         |  3 +-
 .../ObservableConcatWithCompletable.java      |  2 +-
 .../observable/ObservableConcatWithMaybe.java |  2 +-
 .../ObservableConcatWithSingle.java           |  2 +-
 .../operators/observable/ObservableCount.java |  2 +-
 .../observable/ObservableCountSingle.java     |  2 +-
 .../observable/ObservableCreate.java          |  3 +-
 .../observable/ObservableDebounce.java        |  2 +-
 .../observable/ObservableDebounceTimed.java   |  2 +-
 .../operators/observable/ObservableDefer.java |  2 +-
 .../operators/observable/ObservableDelay.java |  2 +-
 .../ObservableDelaySubscriptionOther.java     |  2 +-
 .../observable/ObservableDematerialize.java   |  2 +-
 .../observable/ObservableDetach.java          |  2 +-
 .../observable/ObservableDistinct.java        |  2 +-
 .../ObservableDistinctUntilChanged.java       |  2 +-
 .../observable/ObservableDoAfterNext.java     |  2 +-
 .../observable/ObservableDoFinally.java       |  2 +-
 .../observable/ObservableDoOnEach.java        |  2 +-
 .../observable/ObservableDoOnLifecycle.java   |  3 +-
 .../observable/ObservableElementAt.java       |  2 +-
 .../observable/ObservableElementAtMaybe.java  |  2 +-
 .../observable/ObservableElementAtSingle.java |  2 +-
 .../operators/observable/ObservableEmpty.java |  3 +-
 .../operators/observable/ObservableError.java |  2 +-
 .../observable/ObservableFilter.java          |  2 +-
 .../observable/ObservableFlatMap.java         |  2 +-
 .../ObservableFlatMapCompletable.java         |  2 +-
 ...servableFlatMapCompletableCompletable.java |  2 +-
 .../observable/ObservableFlatMapMaybe.java    |  2 +-
 .../observable/ObservableFlatMapSingle.java   |  2 +-
 .../observable/ObservableFlattenIterable.java |  2 +-
 .../observable/ObservableFromAction.java      |  2 +-
 .../observable/ObservableFromArray.java       |  2 +-
 .../observable/ObservableFromCallable.java    |  2 +-
 .../observable/ObservableFromCompletable.java |  2 +-
 .../observable/ObservableFromFuture.java      |  2 +-
 .../observable/ObservableFromIterable.java    |  2 +-
 .../observable/ObservableFromPublisher.java   |  3 +-
 .../observable/ObservableFromRunnable.java    |  2 +-
 .../observable/ObservableFromSupplier.java    |  2 +-
 .../ObservableFromUnsafeSource.java           |  2 +-
 .../observable/ObservableGenerate.java        |  2 +-
 .../observable/ObservableGroupBy.java         |  2 +-
 .../observable/ObservableGroupJoin.java       | 15 +++---
 .../operators/observable/ObservableHide.java  |  2 +-
 .../observable/ObservableIgnoreElements.java  |  2 +-
 .../ObservableIgnoreElementsCompletable.java  |  2 +-
 .../observable/ObservableInternalHelper.java  |  3 +-
 .../observable/ObservableInterval.java        |  2 +-
 .../observable/ObservableIntervalRange.java   |  2 +-
 .../operators/observable/ObservableJoin.java  | 15 +++---
 .../operators/observable/ObservableJust.java  |  2 +-
 .../observable/ObservableLastMaybe.java       |  2 +-
 .../observable/ObservableLastSingle.java      |  2 +-
 .../operators/observable/ObservableLift.java  |  2 +-
 .../operators/observable/ObservableMap.java   |  2 +-
 .../observable/ObservableMapNotification.java |  2 +-
 .../observable/ObservableMaterialize.java     |  2 +-
 .../ObservableMergeWithCompletable.java       |  2 +-
 .../observable/ObservableMergeWithMaybe.java  |  2 +-
 .../observable/ObservableMergeWithSingle.java |  2 +-
 .../operators/observable/ObservableNever.java |  3 +-
 .../observable/ObservableObserveOn.java       |  2 +-
 .../observable/ObservableOnErrorComplete.java |  2 +-
 .../observable/ObservableOnErrorNext.java     |  2 +-
 .../observable/ObservableOnErrorReturn.java   |  2 +-
 .../observable/ObservablePublish.java         |  2 +-
 .../observable/ObservablePublishSelector.java |  2 +-
 .../operators/observable/ObservableRange.java |  3 +-
 .../observable/ObservableRangeLong.java       |  3 +-
 .../observable/ObservableReduceMaybe.java     |  2 +-
 .../ObservableReduceSeedSingle.java           |  2 +-
 .../ObservableReduceWithSingle.java           |  2 +-
 .../observable/ObservableRefCount.java        |  2 +-
 .../observable/ObservableRepeat.java          |  2 +-
 .../observable/ObservableRepeatUntil.java     |  2 +-
 .../observable/ObservableRepeatWhen.java      |  2 +-
 .../observable/ObservableReplay.java          |  2 +-
 .../ObservableRetryBiPredicate.java           |  2 +-
 .../observable/ObservableRetryPredicate.java  |  2 +-
 .../observable/ObservableRetryWhen.java       |  2 +-
 .../observable/ObservableSampleTimed.java     |  2 +-
 .../ObservableSampleWithObservable.java       |  2 +-
 .../observable/ObservableScalarXMap.java      |  2 +-
 .../operators/observable/ObservableScan.java  |  2 +-
 .../observable/ObservableScanSeed.java        |  3 +-
 .../observable/ObservableSequenceEqual.java   |  2 +-
 .../ObservableSequenceEqualSingle.java        |  2 +-
 .../observable/ObservableSerialized.java      |  3 +-
 .../observable/ObservableSingleMaybe.java     |  2 +-
 .../observable/ObservableSingleSingle.java    |  2 +-
 .../operators/observable/ObservableSkip.java  |  2 +-
 .../observable/ObservableSkipLast.java        |  2 +-
 .../observable/ObservableSkipLastTimed.java   |  2 +-
 .../observable/ObservableSkipUntil.java       |  2 +-
 .../observable/ObservableSkipWhile.java       |  2 +-
 .../observable/ObservableSubscribeOn.java     |  2 +-
 .../observable/ObservableSwitchIfEmpty.java   |  2 +-
 .../observable/ObservableSwitchMap.java       |  2 +-
 .../operators/observable/ObservableTake.java  |  2 +-
 .../observable/ObservableTakeLast.java        |  2 +-
 .../observable/ObservableTakeLastOne.java     |  3 +-
 .../observable/ObservableTakeLastTimed.java   |  2 +-
 .../observable/ObservableTakeUntil.java       |  2 +-
 .../ObservableTakeUntilPredicate.java         |  2 +-
 .../observable/ObservableTakeWhile.java       |  2 +-
 .../ObservableThrottleFirstTimed.java         |  2 +-
 .../observable/ObservableThrottleLatest.java  |  2 +-
 .../observable/ObservableTimeInterval.java    |  2 +-
 .../observable/ObservableTimeout.java         |  2 +-
 .../observable/ObservableTimeoutTimed.java    |  2 +-
 .../operators/observable/ObservableTimer.java |  2 +-
 .../observable/ObservableToList.java          |  2 +-
 .../observable/ObservableToListSingle.java    |  2 +-
 .../observable/ObservableUnsubscribeOn.java   |  2 +-
 .../operators/observable/ObservableUsing.java |  2 +-
 .../observable/ObservableWindow.java          |  2 +-
 .../observable/ObservableWindowBoundary.java  |  2 +-
 .../ObservableWindowBoundarySelector.java     |  2 +-
 .../ObservableWindowSubscribeIntercept.java   |  4 +-
 .../observable/ObservableWindowTimed.java     |  2 +-
 .../observable/ObservableWithLatestFrom.java  |  2 +-
 .../ObservableWithLatestFromMany.java         |  3 +-
 .../operators/observable/ObservableZip.java   |  2 +-
 .../observable/ObservableZipIterable.java     |  2 +-
 .../observable/ObserverResourceWrapper.java   |  2 +-
 .../operators/parallel/ParallelCollect.java   |  2 +-
 .../operators/parallel/ParallelConcatMap.java |  2 +-
 .../parallel/ParallelDoOnNextTry.java         |  2 +-
 .../operators/parallel/ParallelFilter.java    |  2 +-
 .../operators/parallel/ParallelFilterTry.java |  2 +-
 .../operators/parallel/ParallelFlatMap.java   |  2 +-
 .../parallel/ParallelFlatMapIterable.java     |  2 +-
 .../operators/parallel/ParallelFromArray.java |  2 +-
 .../parallel/ParallelFromPublisher.java       |  2 +-
 .../operators/parallel/ParallelJoin.java      |  2 +-
 .../operators/parallel/ParallelMap.java       |  2 +-
 .../operators/parallel/ParallelMapTry.java    |  2 +-
 .../operators/parallel/ParallelPeek.java      |  2 +-
 .../operators/parallel/ParallelReduce.java    |  2 +-
 .../parallel/ParallelReduceFull.java          |  2 +-
 .../operators/parallel/ParallelRunOn.java     |  2 +-
 .../parallel/ParallelSortedJoin.java          |  2 +-
 .../internal/operators/single/SingleAmb.java  |  2 +-
 .../operators/single/SingleCache.java         |  2 +-
 .../operators/single/SingleContains.java      |  2 +-
 .../operators/single/SingleCreate.java        |  2 +-
 .../operators/single/SingleDefer.java         |  2 +-
 .../operators/single/SingleDelay.java         |  2 +-
 .../single/SingleDelayWithCompletable.java    |  2 +-
 .../single/SingleDelayWithObservable.java     |  2 +-
 .../single/SingleDelayWithPublisher.java      |  2 +-
 .../single/SingleDelayWithSingle.java         |  2 +-
 .../operators/single/SingleDematerialize.java |  2 +-
 .../operators/single/SingleDetach.java        |  2 +-
 .../single/SingleDoAfterSuccess.java          |  2 +-
 .../single/SingleDoAfterTerminate.java        |  2 +-
 .../operators/single/SingleDoFinally.java     |  2 +-
 .../operators/single/SingleDoOnDispose.java   |  2 +-
 .../operators/single/SingleDoOnError.java     |  2 +-
 .../operators/single/SingleDoOnEvent.java     |  2 +-
 .../operators/single/SingleDoOnLifecycle.java |  3 +-
 .../operators/single/SingleDoOnSubscribe.java |  2 +-
 .../operators/single/SingleDoOnSuccess.java   |  2 +-
 .../operators/single/SingleDoOnTerminate.java |  2 +-
 .../operators/single/SingleEquals.java        |  2 +-
 .../operators/single/SingleError.java         |  2 +-
 .../operators/single/SingleFlatMap.java       |  2 +-
 .../single/SingleFlatMapBiSelector.java       |  2 +-
 .../single/SingleFlatMapCompletable.java      |  2 +-
 .../single/SingleFlatMapIterableFlowable.java |  2 +-
 .../SingleFlatMapIterableObservable.java      |  2 +-
 .../operators/single/SingleFlatMapMaybe.java  |  2 +-
 .../single/SingleFlatMapNotification.java     |  2 +-
 .../single/SingleFlatMapPublisher.java        |  2 +-
 .../operators/single/SingleFromCallable.java  |  2 +-
 .../operators/single/SingleFromPublisher.java |  2 +-
 .../operators/single/SingleFromSupplier.java  |  2 +-
 .../single/SingleFromUnsafeSource.java        |  2 +-
 .../internal/operators/single/SingleHide.java |  2 +-
 .../single/SingleInternalHelper.java          |  2 +-
 .../internal/operators/single/SingleJust.java |  2 +-
 .../internal/operators/single/SingleLift.java |  2 +-
 .../internal/operators/single/SingleMap.java  |  2 +-
 .../operators/single/SingleMaterialize.java   |  2 +-
 .../operators/single/SingleNever.java         |  2 +-
 .../operators/single/SingleObserveOn.java     |  2 +-
 .../single/SingleOnErrorComplete.java         |  2 +-
 .../operators/single/SingleOnErrorReturn.java |  2 +-
 .../operators/single/SingleResumeNext.java    |  2 +-
 .../operators/single/SingleSubscribeOn.java   |  2 +-
 .../operators/single/SingleTakeUntil.java     |  2 +-
 .../operators/single/SingleTimeInterval.java  |  2 +-
 .../operators/single/SingleTimeout.java       |  2 +-
 .../operators/single/SingleTimer.java         |  2 +-
 .../operators/single/SingleToFlowable.java    |  3 +-
 .../operators/single/SingleToObservable.java  |  3 +-
 .../operators/single/SingleUnsubscribeOn.java |  2 +-
 .../operators/single/SingleUsing.java         |  2 +-
 .../operators/single/SingleZipArray.java      |  2 +-
 .../operators/single/SingleZipIterable.java   |  2 +-
 .../internal/queue/MpscLinkedQueue.java       |  2 +-
 .../internal/queue/SpscArrayQueue.java        |  2 +-
 .../internal/queue/SpscLinkedArrayQueue.java  |  2 +-
 .../schedulers/AbstractDirectTask.java        | 21 ++++----
 .../schedulers/ComputationScheduler.java      | 16 +++---
 .../internal/schedulers/DisposeOnCancel.java  |  2 +-
 .../schedulers/ExecutorScheduler.java         |  2 +-
 .../schedulers/ImmediateThinScheduler.java    |  2 +-
 .../schedulers/InstantPeriodicTask.java       | 21 ++++----
 .../internal/schedulers/IoScheduler.java      | 15 +++---
 .../schedulers/NewThreadScheduler.java        | 15 +++---
 .../internal/schedulers/NewThreadWorker.java  |  2 +-
 .../schedulers/NonBlockingThread.java         |  2 +-
 .../internal/schedulers/RxThreadFactory.java  |  2 +-
 .../ScheduledDirectPeriodicTask.java          | 21 ++++----
 .../schedulers/ScheduledDirectTask.java       | 21 ++++----
 .../schedulers/ScheduledRunnable.java         |  2 +-
 .../SchedulerMultiWorkerSupport.java          |  2 +-
 .../schedulers/SchedulerPoolFactory.java      | 15 +++---
 .../internal/schedulers/SchedulerWhen.java    | 16 +++---
 .../internal/schedulers/SingleScheduler.java  |  3 +-
 .../schedulers/TrampolineScheduler.java       | 15 +++---
 .../BasicFuseableConditionalSubscriber.java   |  2 +-
 .../subscribers/BasicFuseableSubscriber.java  |  2 +-
 .../subscribers/BlockingBaseSubscriber.java   |  3 +-
 .../subscribers/BlockingFirstSubscriber.java  |  2 +-
 .../subscribers/BlockingLastSubscriber.java   |  2 +-
 .../subscribers/BlockingSubscriber.java       |  2 +-
 .../subscribers/BoundedSubscriber.java        |  4 +-
 .../subscribers/DeferredScalarSubscriber.java |  2 +-
 .../subscribers/ForEachWhileSubscriber.java   |  2 +-
 .../subscribers/FutureSubscriber.java         |  2 +-
 .../subscribers/InnerQueuedSubscriber.java    |  2 +-
 .../InnerQueuedSubscriberSupport.java         |  2 +-
 .../subscribers/LambdaSubscriber.java         |  2 +-
 .../subscribers/QueueDrainSubscriber.java     |  2 +-
 .../SinglePostCompleteSubscriber.java         |  2 +-
 .../subscribers/StrictSubscriber.java         |  2 +-
 .../SubscriberResourceWrapper.java            |  2 +-
 .../ArrayCompositeSubscription.java           |  2 +-
 .../subscriptions/AsyncSubscription.java      |  2 +-
 .../BasicIntQueueSubscription.java            |  2 +-
 .../subscriptions/BasicQueueSubscription.java |  2 +-
 .../subscriptions/BooleanSubscription.java    |  3 +-
 .../DeferredScalarSubscription.java           |  2 +-
 .../subscriptions/EmptySubscription.java      |  2 +-
 .../subscriptions/ScalarSubscription.java     |  2 +-
 .../subscriptions/SubscriptionArbiter.java    | 14 +----
 .../subscriptions/SubscriptionHelper.java     |  2 +-
 .../util/AppendOnlyLinkedArrayList.java       |  2 +-
 .../internal/util/ArrayListSupplier.java      |  2 +-
 .../internal/util/AtomicThrowable.java        |  2 +-
 .../internal/util/BackpressureHelper.java     |  3 +-
 .../rxjava3/internal/util/BlockingHelper.java |  2 +-
 .../util/BlockingIgnoringReceiver.java        |  2 +-
 .../internal/util/ConnectConsumer.java        |  2 +-
 .../rxjava3/internal/util/EmptyComponent.java |  2 +-
 .../internal/util/EndConsumerHelper.java      |  2 +-
 .../rxjava3/internal/util/ErrorMode.java      |  2 +-
 .../internal/util/ExceptionHelper.java        |  2 +-
 .../rxjava3/internal/util/HalfSerializer.java |  3 +-
 .../internal/util/HashMapSupplier.java        |  2 +-
 .../internal/util/LinkedArrayList.java        |  3 +-
 .../internal/util/ListAddBiConsumer.java      |  2 +-
 .../internal/util/MergerBiFunction.java       |  2 +-
 .../internal/util/NotificationLite.java       |  3 +-
 .../internal/util/ObservableQueueDrain.java   |  2 +-
 .../rxjava3/internal/util/OpenHashSet.java    |  2 +-
 .../reactivex/rxjava3/internal/util/Pow2.java |  3 +-
 .../rxjava3/internal/util/QueueDrain.java     |  2 +-
 .../internal/util/QueueDrainHelper.java       |  3 +-
 .../rxjava3/internal/util/SorterFunction.java |  2 +-
 .../internal/util/SuppressAnimalSniffer.java  |  2 +-
 .../internal/util/VolatileSizeArrayList.java  |  2 +-
 .../observables/ConnectableObservable.java    |  2 +-
 .../observables/GroupedObservable.java        |  3 +-
 .../rxjava3/observables/package-info.java     | 15 +++---
 .../rxjava3/observers/BaseTestConsumer.java   |  2 +-
 .../rxjava3/observers/DefaultObserver.java    |  2 +-
 .../DisposableCompletableObserver.java        |  2 +-
 .../observers/DisposableMaybeObserver.java    |  2 +-
 .../rxjava3/observers/DisposableObserver.java |  2 +-
 .../observers/DisposableSingleObserver.java   |  2 +-
 .../LambdaConsumerIntrospection.java          |  2 +-
 .../ResourceCompletableObserver.java          |  2 +-
 .../observers/ResourceMaybeObserver.java      |  2 +-
 .../rxjava3/observers/ResourceObserver.java   |  2 +-
 .../observers/ResourceSingleObserver.java     |  2 +-
 .../rxjava3/observers/SafeObserver.java       |  3 +-
 .../rxjava3/observers/SerializedObserver.java |  3 +-
 .../rxjava3/observers/TestObserver.java       |  3 +-
 .../rxjava3/observers/package-info.java       | 15 +++---
 .../parallel/ParallelFailureHandling.java     |  2 +-
 .../rxjava3/parallel/ParallelFlowable.java    |  2 +-
 .../parallel/ParallelFlowableConverter.java   |  2 +-
 .../rxjava3/parallel/ParallelTransformer.java |  4 +-
 .../rxjava3/parallel/package-info.java        | 17 +++---
 .../rxjava3/plugins/RxJavaPlugins.java        |  3 +-
 .../rxjava3/plugins/package-info.java         | 15 +++---
 .../rxjava3/processors/AsyncProcessor.java    |  3 +-
 .../rxjava3/processors/BehaviorProcessor.java |  2 +-
 .../rxjava3/processors/FlowableProcessor.java |  2 +-
 .../processors/MulticastProcessor.java        |  2 +-
 .../rxjava3/processors/PublishProcessor.java  |  3 +-
 .../rxjava3/processors/ReplayProcessor.java   |  2 +-
 .../processors/SerializedProcessor.java       |  2 +-
 .../rxjava3/processors/UnicastProcessor.java  |  2 +-
 .../rxjava3/processors/package-info.java      | 15 +++---
 .../SchedulerRunnableIntrospection.java       |  5 +-
 .../rxjava3/schedulers/Schedulers.java        |  2 +-
 .../rxjava3/schedulers/TestScheduler.java     |  2 +-
 .../reactivex/rxjava3/schedulers/Timed.java   |  2 +-
 .../rxjava3/schedulers/package-info.java      | 16 +++---
 .../rxjava3/subjects/AsyncSubject.java        |  2 +-
 .../rxjava3/subjects/BehaviorSubject.java     |  2 +-
 .../rxjava3/subjects/CompletableSubject.java  |  2 +-
 .../rxjava3/subjects/MaybeSubject.java        |  2 +-
 .../rxjava3/subjects/PublishSubject.java      |  2 +-
 .../rxjava3/subjects/ReplaySubject.java       |  2 +-
 .../rxjava3/subjects/SerializedSubject.java   |  2 +-
 .../rxjava3/subjects/SingleSubject.java       |  2 +-
 .../reactivex/rxjava3/subjects/Subject.java   |  2 +-
 .../rxjava3/subjects/UnicastSubject.java      |  2 +-
 .../rxjava3/subjects/package-info.java        | 15 +++---
 .../subscribers/DefaultSubscriber.java        |  2 +-
 .../subscribers/DisposableSubscriber.java     |  2 +-
 .../subscribers/ResourceSubscriber.java       |  2 +-
 .../rxjava3/subscribers/SafeSubscriber.java   |  3 +-
 .../subscribers/SerializedSubscriber.java     |  3 +-
 .../rxjava3/subscribers/TestSubscriber.java   |  3 +-
 .../rxjava3/subscribers/package-info.java     | 15 +++---
 .../CapturingUncaughtExceptionHandler.java    | 15 +++---
 .../completable/CompletableRetryTest.java     |  4 +-
 .../rxjava3/completable/CompletableTest.java  |  2 +-
 .../completable/CompletableTimerTest.java     |  2 +-
 .../rxjava3/core/BackpressureEnumTest.java    | 16 +++---
 .../reactivex/rxjava3/core/ConverterTest.java |  2 +-
 .../rxjava3/core/DisposeTaskTest.java         |  2 +-
 .../rxjava3/core/NotificationTest.java        |  2 +-
 .../rxjava3/core/PeriodicDirectTaskTest.java  |  2 +-
 .../java/io/reactivex/rxjava3/core/Retry.java |  4 +-
 .../io/reactivex/rxjava3/core/RxJavaTest.java | 16 +++---
 .../reactivex/rxjava3/core/SchedulerTest.java | 16 +++---
 .../rxjava3/core/TransformerTest.java         |  2 +-
 .../reactivex/rxjava3/core/XFlatMapTest.java  |  2 +-
 .../disposables/CompositeDisposableTest.java  |  2 +-
 .../rxjava3/disposables/DisposableTest.java   |  2 +-
 .../disposables/FutureDisposableTest.java     |  2 +-
 .../disposables/SequentialDisposableTest.java |  2 +-
 .../disposables/SerialDisposableTests.java    |  2 +-
 .../exceptions/CompositeExceptionTest.java    | 16 +++---
 .../rxjava3/exceptions/ExceptionsTest.java    | 16 +++---
 .../OnErrorNotImplementedExceptionTest.java   |  2 +-
 .../rxjava3/exceptions/TestException.java     |  2 +-
 .../io/reactivex/rxjava3/flowable/Burst.java  |  3 +-
 .../flowable/FlowableBackpressureTests.java   |  2 +-
 .../rxjava3/flowable/FlowableCollectTest.java |  2 +-
 .../flowable/FlowableCombineLatestTests.java  | 16 +++---
 .../rxjava3/flowable/FlowableConcatTests.java |  3 +-
 .../flowable/FlowableConversionTest.java      |  2 +-
 .../flowable/FlowableCovarianceTest.java      | 15 +++---
 .../flowable/FlowableDoAfterNextTest.java     | 16 +++---
 .../rxjava3/flowable/FlowableDoOnTest.java    |  2 +-
 .../flowable/FlowableErrorHandlingTests.java  |  2 +-
 .../rxjava3/flowable/FlowableEventStream.java |  2 +-
 .../flowable/FlowableEventStreamTest.java     | 15 +++---
 .../flowable/FlowableFuseableTest.java        |  3 +-
 .../flowable/FlowableGroupByTests.java        |  2 +-
 .../rxjava3/flowable/FlowableMergeTests.java  |  2 +-
 .../flowable/FlowableNotificationTest.java    |  2 +-
 .../rxjava3/flowable/FlowableNullTests.java   |  2 +-
 .../rxjava3/flowable/FlowableReduceTests.java |  2 +-
 .../flowable/FlowableStartWithTests.java      |  2 +-
 .../flowable/FlowableSubscriberTest.java      |  2 +-
 .../rxjava3/flowable/FlowableTests.java       |  2 +-
 .../flowable/FlowableThrottleLastTests.java   |  2 +-
 .../FlowableThrottleWithTimeoutTests.java     |  2 +-
 .../rxjava3/flowable/FlowableWindowTests.java |  2 +-
 .../rxjava3/flowable/FlowableZipTests.java    |  2 +-
 .../rxjava3/internal/SubscribeWithTest.java   |  2 +-
 .../ArrayCompositeDisposableTest.java         |  2 +-
 .../CancellableDisposableTest.java            |  2 +-
 .../disposables/DisposableHelperTest.java     |  2 +-
 .../disposables/EmptyDisposableTest.java      |  2 +-
 .../ListCompositeDisposableTest.java          |  2 +-
 .../internal/functions/FunctionsTest.java     |  2 +-
 .../internal/functions/ObjectHelperTest.java  |  2 +-
 .../CancellableQueueFuseableTest.java         |  2 +-
 .../jdk8/CollectWithCollectorTckTest.java     |  2 +-
 .../CompletableFromCompletionStageTest.java   |  2 +-
 .../CompletableToCompletionStageTest.java     |  2 +-
 .../internal/jdk8/FlatMapStream0HTckTest.java |  2 +-
 .../internal/jdk8/FlatMapStream0TckTest.java  |  2 +-
 .../internal/jdk8/FlatMapStream1HTckTest.java |  2 +-
 .../internal/jdk8/FlatMapStream1TckTest.java  |  2 +-
 .../internal/jdk8/FlatMapStream2HTckTest.java |  2 +-
 .../internal/jdk8/FlatMapStream2TckTest.java  |  2 +-
 .../jdk8/FlowableBlockingStreamTest.java      |  2 +-
 .../FlowableCollectWithCollectorTest.java     |  2 +-
 .../jdk8/FlowableFlatMapStreamTest.java       |  2 +-
 .../jdk8/FlowableFromCompletionStageTest.java |  2 +-
 .../jdk8/FlowableFromOptionalTest.java        |  2 +-
 .../internal/jdk8/FlowableFromStreamTest.java |  2 +-
 .../jdk8/FlowableMapOptionalTest.java         |  2 +-
 .../FlowableStageSubscriberOrDefaultTest.java |  2 +-
 .../FlowableStageSubscriberOrErrorTest.java   |  2 +-
 .../jdk8/FromCompletionStageTckTest.java      |  2 +-
 .../internal/jdk8/FromOptional0TckTest.java   |  2 +-
 .../internal/jdk8/FromOptional1TckTest.java   |  2 +-
 .../internal/jdk8/FromStreamTckTest.java      |  2 +-
 .../internal/jdk8/MapOptionalTckTest.java     |  2 +-
 .../MaybeFlattenStreamAsFlowableTckTest.java  |  2 +-
 .../MaybeFlattenStreamAsFlowableTest.java     |  2 +-
 .../MaybeFlattenStreamAsObservableTest.java   |  2 +-
 .../jdk8/MaybeFromCompletionStageTest.java    |  2 +-
 .../internal/jdk8/MaybeFromOptionalTest.java  |  2 +-
 .../internal/jdk8/MaybeMapOptionalTest.java   |  2 +-
 .../jdk8/MaybeToCompletionStageTest.java      |  2 +-
 .../jdk8/ObservableBlockingStreamTest.java    |  2 +-
 .../ObservableCollectWithCollectorTest.java   |  2 +-
 .../jdk8/ObservableFlatMapStreamTest.java     |  2 +-
 .../ObservableFromCompletionStageTest.java    |  2 +-
 .../jdk8/ObservableFromOptionalTest.java      |  2 +-
 .../jdk8/ObservableFromStreamTest.java        |  2 +-
 .../jdk8/ObservableMapOptionalTest.java       |  2 +-
 ...bservableStageSubscriberOrDefaultTest.java |  2 +-
 .../ObservableStageSubscriberOrErrorTest.java |  2 +-
 .../internal/jdk8/ParallelCollectorTest.java  |  2 +-
 .../jdk8/ParallelFlatMapStreamTest.java       |  2 +-
 .../jdk8/ParallelMapOptionalTest.java         |  2 +-
 .../jdk8/ParallelMapTryOptionalTest.java      |  2 +-
 .../SingleFlattenStreamAsFlowableTckTest.java |  2 +-
 .../SingleFlattenStreamAsFlowableTest.java    |  2 +-
 .../SingleFlattenStreamAsObservableTest.java  |  2 +-
 .../jdk8/SingleFromCompletionStageTest.java   |  2 +-
 .../internal/jdk8/SingleMapOptionalTest.java  |  2 +-
 .../jdk8/SingleToCompletionStageTest.java     |  2 +-
 .../observers/BasicFuseableObserverTest.java  |  2 +-
 .../observers/BasicQueueDisposableTest.java   |  2 +-
 .../observers/BlockingFirstObserverTest.java  |  2 +-
 .../observers/BlockingMultiObserverTest.java  |  2 +-
 .../observers/BlockingObserverTest.java       |  2 +-
 .../CallbackCompletableObserverTest.java      |  2 +-
 .../observers/ConsumerSingleObserverTest.java |  2 +-
 .../DeferredScalarDisposableTest.java         |  2 +-
 .../observers/DeferredScalarObserverTest.java |  2 +-
 .../DisposableLambdaObserverTest.java         |  2 +-
 .../EmptyCompletableObserverTest.java         |  2 +-
 .../observers/FutureMultiObserverTest.java    |  2 +-
 .../observers/FutureObserverTest.java         |  2 +-
 .../observers/FutureSingleObserverTest.java   |  2 +-
 .../observers/InnerQueuedObserverTest.java    |  2 +-
 .../observers/LambdaObserverTest.java         |  2 +-
 .../observers/QueueDrainObserverTest.java     |  2 +-
 .../completable/CompletableAmbTest.java       |  2 +-
 .../CompletableAndThenCompletableTest.java    |  2 +-
 .../completable/CompletableAndThenTest.java   |  2 +-
 .../completable/CompletableAwaitTest.java     |  2 +-
 .../CompletableBlockingSubscribeTest.java     |  2 +-
 .../completable/CompletableCacheTest.java     |  2 +-
 .../CompletableConcatArrayDelayErrorTest.java |  2 +-
 .../CompletableConcatDelayErrorTest.java      |  2 +-
 .../completable/CompletableConcatTest.java    |  2 +-
 .../completable/CompletableCreateTest.java    |  2 +-
 .../CompletableDelaySubscriptionTest.java     |  2 +-
 .../completable/CompletableDelayTest.java     |  2 +-
 .../completable/CompletableDetachTest.java    |  2 +-
 .../completable/CompletableDisposeOnTest.java |  2 +-
 .../completable/CompletableDoFinallyTest.java |  2 +-
 .../CompletableDoOnLifecycleTest.java         |  2 +-
 .../completable/CompletableDoOnTest.java      |  2 +-
 .../CompletableFromActionTest.java            |  2 +-
 .../CompletableFromCallableTest.java          |  2 +-
 .../completable/CompletableFromMaybeTest.java |  2 +-
 .../CompletableFromObservableTest.java        |  2 +-
 .../CompletableFromPublisherTest.java         |  2 +-
 .../CompletableFromRunnableTest.java          |  2 +-
 .../CompletableFromSingleTest.java            |  2 +-
 .../CompletableFromSupplierTest.java          |  2 +-
 .../completable/CompletableHideTest.java      |  2 +-
 .../completable/CompletableLiftTest.java      |  2 +-
 .../CompletableMaterializeTest.java           |  2 +-
 .../CompletableMergeIterableTest.java         |  2 +-
 .../completable/CompletableMergeTest.java     |  2 +-
 .../completable/CompletableObserveOnTest.java |  2 +-
 .../completable/CompletableOnErrorXTest.java  |  2 +-
 .../completable/CompletablePeekTest.java      |  2 +-
 .../CompletableRepeatWhenTest.java            |  2 +-
 .../CompletableResumeNextTest.java            |  2 +-
 .../CompletableSafeSubscribeTest.java         |  2 +-
 .../CompletableSequenceEqualTest.java         |  2 +-
 .../completable/CompletableStartWithTest.java |  2 +-
 .../CompletableSubscribeOnTest.java           |  2 +-
 .../completable/CompletableSubscribeTest.java |  2 +-
 .../CompletableSwitchOnNextTest.java          |  2 +-
 .../completable/CompletableTakeUntilTest.java |  2 +-
 .../completable/CompletableTimeoutTest.java   |  2 +-
 .../completable/CompletableTimerTest.java     |  2 +-
 .../CompletableToFlowableTest.java            |  2 +-
 .../completable/CompletableToFutureTest.java  |  2 +-
 .../CompletableToObservableTest.java          |  2 +-
 .../completable/CompletableUnsafeTest.java    |  2 +-
 .../completable/CompletableUsingTest.java     |  2 +-
 .../AbstractFlowableWithUpstreamTest.java     |  2 +-
 .../flowable/BlockingFlowableLatestTest.java  |  2 +-
 .../BlockingFlowableMostRecentTest.java       |  2 +-
 .../flowable/BlockingFlowableNextTest.java    |  2 +-
 .../BlockingFlowableToFutureTest.java         | 16 +++---
 .../BlockingFlowableToIteratorTest.java       |  2 +-
 .../flowable/BufferUntilSubscriberTest.java   |  2 +-
 .../operators/flowable/FlowableAllTest.java   |  2 +-
 .../operators/flowable/FlowableAmbTest.java   |  2 +-
 .../operators/flowable/FlowableAnyTest.java   |  2 +-
 .../flowable/FlowableAsObservableTest.java    |  2 +-
 .../flowable/FlowableAutoConnectTest.java     |  2 +-
 .../flowable/FlowableBlockingTest.java        |  2 +-
 .../flowable/FlowableBufferTest.java          |  2 +-
 .../operators/flowable/FlowableCacheTest.java |  2 +-
 .../operators/flowable/FlowableCastTest.java  |  2 +-
 .../flowable/FlowableCombineLatestTest.java   |  2 +-
 .../FlowableConcatDelayErrorTest.java         |  2 +-
 .../flowable/FlowableConcatMapEagerTest.java  |  2 +-
 .../FlowableConcatMapSchedulerTest.java       |  2 +-
 .../flowable/FlowableConcatMapTest.java       |  2 +-
 .../flowable/FlowableConcatTest.java          |  2 +-
 .../FlowableConcatWithCompletableTest.java    |  2 +-
 .../flowable/FlowableConcatWithMaybeTest.java |  2 +-
 .../FlowableConcatWithSingleTest.java         |  2 +-
 .../operators/flowable/FlowableCountTest.java |  2 +-
 .../flowable/FlowableCreateTest.java          |  2 +-
 .../flowable/FlowableDebounceTest.java        |  2 +-
 .../flowable/FlowableDefaultIfEmptyTest.java  |  2 +-
 .../operators/flowable/FlowableDeferTest.java |  2 +-
 .../FlowableDelaySubscriptionOtherTest.java   |  3 +-
 .../operators/flowable/FlowableDelayTest.java |  2 +-
 .../flowable/FlowableDematerializeTest.java   |  2 +-
 .../flowable/FlowableDetachTest.java          | 16 +++---
 .../flowable/FlowableDistinctTest.java        |  2 +-
 .../FlowableDistinctUntilChangedTest.java     |  2 +-
 .../flowable/FlowableDoAfterNextTest.java     |  2 +-
 .../FlowableDoAfterTerminateTest.java         | 16 +++---
 .../flowable/FlowableDoFinallyTest.java       |  2 +-
 .../flowable/FlowableDoOnEachTest.java        |  2 +-
 .../flowable/FlowableDoOnLifecycleTest.java   |  2 +-
 .../flowable/FlowableDoOnRequestTest.java     |  2 +-
 .../flowable/FlowableDoOnSubscribeTest.java   |  2 +-
 .../flowable/FlowableDoOnUnsubscribeTest.java |  2 +-
 .../flowable/FlowableElementAtTest.java       |  2 +-
 .../flowable/FlowableFilterTest.java          |  2 +-
 .../operators/flowable/FlowableFirstTest.java |  2 +-
 .../FlowableFlatMapCompletableTest.java       |  2 +-
 .../flowable/FlowableFlatMapMaybeTest.java    |  2 +-
 .../flowable/FlowableFlatMapSingleTest.java   |  2 +-
 .../flowable/FlowableFlatMapTest.java         |  2 +-
 .../flowable/FlowableFlattenIterableTest.java |  2 +-
 .../flowable/FlowableForEachTest.java         |  2 +-
 .../flowable/FlowableFromActionTest.java      |  2 +-
 .../flowable/FlowableFromArrayTest.java       | 15 +++---
 .../flowable/FlowableFromCallableTest.java    | 15 +++---
 .../flowable/FlowableFromCompletableTest.java |  2 +-
 .../flowable/FlowableFromIterableTest.java    |  2 +-
 .../flowable/FlowableFromMaybeTest.java       |  2 +-
 .../flowable/FlowableFromObservableTest.java  |  2 +-
 .../flowable/FlowableFromRunnableTest.java    |  2 +-
 .../flowable/FlowableFromSingleTest.java      |  2 +-
 .../flowable/FlowableFromSourceTest.java      |  2 +-
 .../flowable/FlowableFromSupplierTest.java    | 15 +++---
 .../flowable/FlowableGenerateTest.java        |  2 +-
 .../flowable/FlowableGroupByTest.java         |  2 +-
 .../flowable/FlowableGroupJoinTest.java       | 16 +++---
 .../operators/flowable/FlowableHideTest.java  |  2 +-
 .../flowable/FlowableIgnoreElementsTest.java  |  2 +-
 .../flowable/FlowableInternalHelperTest.java  |  3 +-
 .../flowable/FlowableIntervalRangeTest.java   | 15 +++---
 .../flowable/FlowableIntervalTest.java        |  2 +-
 .../operators/flowable/FlowableJoinTest.java  | 16 +++---
 .../operators/flowable/FlowableLastTest.java  |  2 +-
 .../operators/flowable/FlowableLiftTest.java  |  2 +-
 .../flowable/FlowableMapNotificationTest.java |  2 +-
 .../operators/flowable/FlowableMapTest.java   |  2 +-
 .../flowable/FlowableMaterializeTest.java     |  2 +-
 .../flowable/FlowableMergeDelayErrorTest.java |  2 +-
 .../FlowableMergeMaxConcurrentTest.java       |  2 +-
 .../operators/flowable/FlowableMergeTest.java |  2 +-
 .../FlowableMergeWithCompletableTest.java     |  2 +-
 .../flowable/FlowableMergeWithMaybeTest.java  |  2 +-
 .../flowable/FlowableMergeWithSingleTest.java |  2 +-
 .../flowable/FlowableObserveOnTest.java       |  2 +-
 ...wableOnBackpressureBufferStrategyTest.java |  2 +-
 .../FlowableOnBackpressureBufferTest.java     |  2 +-
 .../FlowableOnBackpressureDropTest.java       |  2 +-
 .../FlowableOnBackpressureErrorTest.java      |  8 +--
 .../FlowableOnBackpressureLatestTest.java     |  2 +-
 .../FlowableOnBackpressureReduceTest.java     |  8 +--
 .../FlowableOnBackpressureReduceWithTest.java |  8 +--
 .../flowable/FlowableOnErrorCompleteTest.java |  2 +-
 ...wableOnErrorResumeNextViaFlowableTest.java |  2 +-
 ...wableOnErrorResumeNextViaFunctionTest.java |  2 +-
 .../flowable/FlowableOnErrorReturnTest.java   |  2 +-
 .../flowable/FlowablePublishFunctionTest.java | 15 +++---
 .../FlowablePublishMulticastTest.java         |  2 +-
 .../flowable/FlowablePublishTest.java         |  2 +-
 .../flowable/FlowableRangeLongTest.java       |  2 +-
 .../operators/flowable/FlowableRangeTest.java |  2 +-
 .../flowable/FlowableReduceTest.java          |  2 +-
 .../FlowableReduceWithSingleTest.java         |  2 +-
 .../flowable/FlowableRefCountTest.java        |  2 +-
 .../flowable/FlowableRepeatTest.java          |  2 +-
 .../FlowableReplayEagerTruncateTest.java      |  2 +-
 .../flowable/FlowableReplayTest.java          |  2 +-
 .../operators/flowable/FlowableRetryTest.java |  2 +-
 .../FlowableRetryWithPredicateTest.java       |  2 +-
 .../flowable/FlowableSampleTest.java          |  2 +-
 .../flowable/FlowableScalarXMapTest.java      |  2 +-
 .../operators/flowable/FlowableScanTest.java  |  2 +-
 .../flowable/FlowableSequenceEqualTest.java   |  2 +-
 .../flowable/FlowableSerializeTest.java       |  2 +-
 .../flowable/FlowableSingleTest.java          |  2 +-
 .../flowable/FlowableSkipLastTest.java        |  2 +-
 .../flowable/FlowableSkipLastTimedTest.java   |  2 +-
 .../operators/flowable/FlowableSkipTest.java  |  2 +-
 .../flowable/FlowableSkipTimedTest.java       |  2 +-
 .../flowable/FlowableSkipUntilTest.java       |  2 +-
 .../flowable/FlowableSkipWhileTest.java       |  2 +-
 .../flowable/FlowableStartWithTest.java       |  2 +-
 .../flowable/FlowableSubscribeOnTest.java     |  2 +-
 .../flowable/FlowableSwitchIfEmptyTest.java   |  2 +-
 .../flowable/FlowableSwitchTest.java          |  2 +-
 .../flowable/FlowableTakeLastOneTest.java     |  2 +-
 .../flowable/FlowableTakeLastTest.java        |  2 +-
 .../flowable/FlowableTakeLastTimedTest.java   |  2 +-
 .../operators/flowable/FlowableTakeTest.java  |  2 +-
 .../operators/flowable/FlowableTakeTest2.java |  2 +-
 .../flowable/FlowableTakeTimedTest.java       |  2 +-
 .../FlowableTakeUntilPredicateTest.java       |  2 +-
 .../flowable/FlowableTakeUntilTest.java       |  2 +-
 .../flowable/FlowableTakeWhileTest.java       |  2 +-
 .../flowable/FlowableThrottleFirstTest.java   |  2 +-
 .../flowable/FlowableThrottleLatestTest.java  |  2 +-
 .../flowable/FlowableTimeIntervalTest.java    |  2 +-
 .../flowable/FlowableTimeoutTests.java        |  2 +-
 .../FlowableTimeoutWithSelectorTest.java      |  2 +-
 .../operators/flowable/FlowableTimerTest.java |  2 +-
 .../flowable/FlowableTimestampTest.java       |  2 +-
 .../flowable/FlowableToCompletableTest.java   | 16 +++---
 .../flowable/FlowableToFutureTest.java        |  2 +-
 .../flowable/FlowableToListTest.java          |  2 +-
 .../operators/flowable/FlowableToMapTest.java |  2 +-
 .../flowable/FlowableToMultimapTest.java      |  2 +-
 .../flowable/FlowableToSingleTest.java        |  2 +-
 .../flowable/FlowableToSortedListTest.java    |  2 +-
 .../flowable/FlowableUnsubscribeOnTest.java   |  2 +-
 .../operators/flowable/FlowableUsingTest.java |  2 +-
 .../FlowableWindowWithFlowableTest.java       |  2 +-
 .../flowable/FlowableWindowWithSizeTest.java  |  2 +-
 ...lowableWindowWithStartEndFlowableTest.java |  2 +-
 .../flowable/FlowableWindowWithTimeTest.java  |  2 +-
 .../flowable/FlowableWithLatestFromTest.java  |  2 +-
 .../flowable/FlowableZipCompletionTest.java   |  2 +-
 .../flowable/FlowableZipIterableTest.java     |  2 +-
 .../operators/flowable/FlowableZipTest.java   |  2 +-
 .../flowable/NotificationLiteTest.java        |  2 +-
 .../maybe/AbstractMaybeWithUpstreamTest.java  |  2 +-
 .../operators/maybe/MaybeAmbTest.java         |  2 +-
 .../maybe/MaybeBlockingSubscribeTest.java     |  2 +-
 .../operators/maybe/MaybeCacheTest.java       |  2 +-
 .../maybe/MaybeCallbackObserverTest.java      |  2 +-
 .../MaybeConcatArrayEagerDelayErrorTest.java  |  2 +-
 .../operators/maybe/MaybeConcatArrayTest.java |  2 +-
 .../operators/maybe/MaybeConcatEagerTest.java |  2 +-
 .../maybe/MaybeConcatIterableTest.java        |  2 +-
 .../maybe/MaybeConcatMapCompletableTest.java  |  2 +-
 .../maybe/MaybeConcatMapSingleTest.java       |  2 +-
 .../operators/maybe/MaybeConcatMapTest.java   |  2 +-
 .../maybe/MaybeConcatPublisherTest.java       |  3 +-
 .../operators/maybe/MaybeContainsTest.java    |  2 +-
 .../operators/maybe/MaybeCountTest.java       |  2 +-
 .../operators/maybe/MaybeCreateTest.java      |  2 +-
 .../operators/maybe/MaybeDelayOtherTest.java  |  2 +-
 .../maybe/MaybeDelaySubscriptionTest.java     |  2 +-
 .../operators/maybe/MaybeDelayTest.java       |  2 +-
 .../maybe/MaybeDematerializeTest.java         |  2 +-
 .../operators/maybe/MaybeDetachTest.java      |  2 +-
 .../maybe/MaybeDoAfterSuccessTest.java        |  2 +-
 .../operators/maybe/MaybeDoFinallyTest.java   |  2 +-
 .../operators/maybe/MaybeDoOnEventTest.java   |  2 +-
 .../maybe/MaybeDoOnLifecycleTest.java         |  2 +-
 .../maybe/MaybeDoOnTerminateTest.java         |  2 +-
 .../operators/maybe/MaybeEmptyTest.java       |  2 +-
 .../operators/maybe/MaybeEqualTest.java       |  2 +-
 .../operators/maybe/MaybeErrorTest.java       |  2 +-
 .../maybe/MaybeFilterSingleTest.java          |  2 +-
 .../maybe/MaybeFlatMapBiSelectorTest.java     |  2 +-
 .../maybe/MaybeFlatMapCompletableTest.java    |  2 +-
 .../MaybeFlatMapIterableFlowableTest.java     |  2 +-
 .../MaybeFlatMapIterableObservableTest.java   |  2 +-
 .../maybe/MaybeFlatMapNotificationTest.java   |  2 +-
 .../maybe/MaybeFlatMapSingleElementTest.java  |  2 +-
 .../maybe/MaybeFlatMapSingleTest.java         |  2 +-
 .../operators/maybe/MaybeFlattenTest.java     |  2 +-
 .../operators/maybe/MaybeFromActionTest.java  |  2 +-
 .../maybe/MaybeFromCallableTest.java          |  2 +-
 .../maybe/MaybeFromCompletableTest.java       |  2 +-
 .../operators/maybe/MaybeFromFutureTest.java  |  2 +-
 .../maybe/MaybeFromObservableTest.java        |  2 +-
 .../maybe/MaybeFromPubisherTest.java          |  2 +-
 .../maybe/MaybeFromRunnableTest.java          |  2 +-
 .../operators/maybe/MaybeFromSingleTest.java  |  2 +-
 .../maybe/MaybeFromSupplierTest.java          |  2 +-
 .../operators/maybe/MaybeHideTest.java        |  2 +-
 .../maybe/MaybeIgnoreElementTest.java         |  2 +-
 .../maybe/MaybeIsEmptySingleTest.java         |  2 +-
 .../operators/maybe/MaybeIsEmptyTest.java     |  2 +-
 .../operators/maybe/MaybeJustTest.java        |  2 +-
 .../operators/maybe/MaybeMapTest.java         |  2 +-
 .../operators/maybe/MaybeMaterializeTest.java |  2 +-
 .../operators/maybe/MaybeMergeArrayTest.java  |  2 +-
 .../operators/maybe/MaybeMergeTest.java       |  2 +-
 .../operators/maybe/MaybeMergeWithTest.java   |  2 +-
 .../operators/maybe/MaybeOfTypeTest.java      |  2 +-
 .../operators/maybe/MaybeOnErrorXTest.java    |  2 +-
 .../operators/maybe/MaybePeekTest.java        |  2 +-
 .../maybe/MaybeSafeSubscribeTest.java         |  2 +-
 .../operators/maybe/MaybeStartWithTest.java   |  2 +-
 .../operators/maybe/MaybeSubscribeOnTest.java |  2 +-
 .../maybe/MaybeSwitchIfEmptySingleTest.java   |  2 +-
 .../maybe/MaybeSwitchIfEmptyTest.java         |  2 +-
 .../maybe/MaybeSwitchOnNextTest.java          |  2 +-
 .../maybe/MaybeTakeUntilPublisherTest.java    |  2 +-
 .../operators/maybe/MaybeTakeUntilTest.java   |  2 +-
 .../maybe/MaybeTimeIntervalTest.java          |  2 +-
 .../maybe/MaybeTimeoutPublisherTest.java      |  2 +-
 .../operators/maybe/MaybeTimeoutTest.java     |  2 +-
 .../operators/maybe/MaybeTimerTest.java       |  2 +-
 .../operators/maybe/MaybeTimestampTest.java   |  2 +-
 .../maybe/MaybeToCompletableTest.java         |  2 +-
 .../operators/maybe/MaybeToFlowableTest.java  |  2 +-
 .../operators/maybe/MaybeToFutureTest.java    |  2 +-
 .../maybe/MaybeToObservableTest.java          |  2 +-
 .../operators/maybe/MaybeToSingleTest.java    |  2 +-
 .../maybe/MaybeUnsubscribeOnTest.java         |  2 +-
 .../operators/maybe/MaybeUsingTest.java       |  2 +-
 .../operators/maybe/MaybeZipArrayTest.java    |  2 +-
 .../operators/maybe/MaybeZipIterableTest.java |  2 +-
 .../CompletableAndThenObservableTest.java     |  2 +-
 .../CompletableAndThenPublisherTest.java      |  2 +-
 .../FlowableConcatMapCompletableTest.java     |  2 +-
 .../mixed/FlowableConcatMapMaybeTest.java     |  2 +-
 .../mixed/FlowableConcatMapSingleTest.java    |  2 +-
 .../FlowableSwitchMapCompletableTest.java     |  2 +-
 .../mixed/FlowableSwitchMapMaybeTest.java     |  2 +-
 .../mixed/FlowableSwitchMapSingleTest.java    |  2 +-
 .../mixed/MaybeFlatMapObservableTest.java     |  2 +-
 .../mixed/MaybeFlatMapPublisherTest.java      |  2 +-
 .../ObservableConcatMapCompletableTest.java   |  2 +-
 .../mixed/ObservableConcatMapMaybeTest.java   |  2 +-
 .../mixed/ObservableConcatMapSingleTest.java  |  2 +-
 .../ObservableSwitchMapCompletableTest.java   |  2 +-
 .../mixed/ObservableSwitchMapMaybeTest.java   |  2 +-
 .../mixed/ObservableSwitchMapSingleTest.java  |  2 +-
 .../mixed/ScalarXMapZHelperTest.java          |  2 +-
 .../mixed/SingleFlatMapObservableTest.java    |  2 +-
 .../AbstractObservableWithUpstreamTest.java   |  2 +-
 .../BlockingObservableLatestTest.java         |  2 +-
 .../BlockingObservableMostRecentTest.java     |  2 +-
 .../BlockingObservableNextTest.java           |  2 +-
 .../BlockingObservableToFutureTest.java       | 16 +++---
 .../BlockingObservableToIteratorTest.java     |  2 +-
 .../internal/operators/observable/Burst.java  |  3 +-
 .../observable/ObservableAllTest.java         |  2 +-
 .../observable/ObservableAmbTest.java         |  2 +-
 .../observable/ObservableAnyTest.java         |  2 +-
 .../observable/ObservableAutoConnectTest.java |  2 +-
 .../observable/ObservableBlockingTest.java    |  2 +-
 .../observable/ObservableBufferTest.java      |  2 +-
 .../ObservableBufferUntilSubscriberTest.java  |  2 +-
 .../observable/ObservableCacheTest.java       |  2 +-
 .../observable/ObservableCastTest.java        |  2 +-
 .../observable/ObservableCollectTest.java     |  2 +-
 .../ObservableCombineLatestTest.java          |  2 +-
 .../ObservableConcatMapCompletableTest.java   |  9 ++--
 .../ObservableConcatMapEagerTest.java         |  2 +-
 .../ObservableConcatMapSchedulerTest.java     |  2 +-
 .../observable/ObservableConcatMapTest.java   |  2 +-
 .../observable/ObservableConcatTest.java      |  2 +-
 .../ObservableConcatWithCompletableTest.java  |  2 +-
 .../ObservableConcatWithMaybeTest.java        |  2 +-
 .../ObservableConcatWithSingleTest.java       |  2 +-
 .../observable/ObservableCountTest.java       |  2 +-
 .../observable/ObservableCreateTest.java      |  2 +-
 .../observable/ObservableDebounceTest.java    |  2 +-
 .../ObservableDefaultIfEmptyTest.java         |  2 +-
 .../observable/ObservableDeferTest.java       |  2 +-
 .../ObservableDelaySubscriptionOtherTest.java |  2 +-
 .../observable/ObservableDelayTest.java       |  2 +-
 .../ObservableDematerializeTest.java          |  2 +-
 .../observable/ObservableDetachTest.java      | 16 +++---
 .../observable/ObservableDistinctTest.java    |  2 +-
 .../ObservableDistinctUntilChangedTest.java   |  2 +-
 .../observable/ObservableDoAfterNextTest.java |  2 +-
 .../observable/ObservableDoFinallyTest.java   |  2 +-
 .../observable/ObservableDoOnEachTest.java    |  2 +-
 .../ObservableDoOnSubscribeTest.java          |  2 +-
 .../ObservableDoOnUnsubscribeTest.java        |  2 +-
 .../observable/ObservableElementAtTest.java   |  2 +-
 .../observable/ObservableFilterTest.java      |  2 +-
 .../observable/ObservableFinallyTest.java     |  2 +-
 .../observable/ObservableFirstTest.java       |  2 +-
 .../ObservableFlatMapCompletableTest.java     |  2 +-
 .../ObservableFlatMapMaybeTest.java           |  2 +-
 .../ObservableFlatMapSingleTest.java          |  2 +-
 .../observable/ObservableFlatMapTest.java     |  2 +-
 .../ObservableFlattenIterableTest.java        |  2 +-
 .../observable/ObservableForEachTest.java     |  2 +-
 .../observable/ObservableFromActionTest.java  |  2 +-
 .../ObservableFromCallableTest.java           | 15 +++---
 .../ObservableFromCompletableTest.java        |  2 +-
 .../ObservableFromIterableTest.java           |  2 +-
 .../observable/ObservableFromMaybeTest.java   |  2 +-
 .../ObservableFromRunnableTest.java           |  2 +-
 .../observable/ObservableFromSingleTest.java  |  2 +-
 .../ObservableFromSupplierTest.java           | 15 +++---
 .../observable/ObservableFromTest.java        |  2 +-
 .../observable/ObservableGenerateTest.java    |  2 +-
 .../observable/ObservableGroupByTest.java     |  2 +-
 .../observable/ObservableGroupJoinTest.java   | 16 +++---
 .../observable/ObservableHideTest.java        |  2 +-
 .../ObservableIgnoreElementsTest.java         |  2 +-
 .../ObservableInternalHelperTest.java         |  3 +-
 .../ObservableIntervalRangeTest.java          |  2 +-
 .../observable/ObservableIntervalTest.java    |  2 +-
 .../observable/ObservableJoinTest.java        | 16 +++---
 .../observable/ObservableLastTest.java        |  2 +-
 .../observable/ObservableLiftTest.java        |  2 +-
 .../ObservableMapNotificationTest.java        |  2 +-
 .../observable/ObservableMapTest.java         |  2 +-
 .../observable/ObservableMaterializeTest.java |  2 +-
 .../ObservableMergeDelayErrorTest.java        |  2 +-
 .../ObservableMergeMaxConcurrentTest.java     |  2 +-
 .../observable/ObservableMergeTest.java       |  2 +-
 .../ObservableMergeWithCompletableTest.java   |  2 +-
 .../ObservableMergeWithMaybeTest.java         |  2 +-
 .../ObservableMergeWithSingleTest.java        |  2 +-
 .../observable/ObservableObserveOnTest.java   |  2 +-
 .../ObservableOnErrorCompleteTest.java        |  2 +-
 .../ObservableOnErrorResumeNextTest.java      |  2 +-
 .../ObservableOnErrorResumeWithTest.java      |  2 +-
 .../ObservableOnErrorReturnTest.java          |  2 +-
 .../observable/ObservablePublishTest.java     |  2 +-
 .../observable/ObservableRangeLongTest.java   |  2 +-
 .../observable/ObservableRangeTest.java       |  2 +-
 .../observable/ObservableRedoTest.java        |  2 +-
 .../observable/ObservableReduceTest.java      |  2 +-
 .../observable/ObservableRefCountTest.java    |  2 +-
 .../observable/ObservableRepeatTest.java      |  2 +-
 .../ObservableReplayEagerTruncateTest.java    |  2 +-
 .../observable/ObservableReplayTest.java      |  2 +-
 .../ObservableResourceWrapperTest.java        |  2 +-
 .../observable/ObservableRetryTest.java       |  2 +-
 .../ObservableRetryWithPredicateTest.java     |  2 +-
 .../observable/ObservableSampleTest.java      |  2 +-
 .../observable/ObservableScalarXMapTest.java  |  2 +-
 .../observable/ObservableScanTest.java        |  2 +-
 .../ObservableSequenceEqualTest.java          |  2 +-
 .../observable/ObservableSerializeTest.java   |  2 +-
 .../observable/ObservableSingleTest.java      |  2 +-
 .../observable/ObservableSkipLastTest.java    |  2 +-
 .../ObservableSkipLastTimedTest.java          |  2 +-
 .../observable/ObservableSkipTest.java        |  2 +-
 .../observable/ObservableSkipTimedTest.java   |  2 +-
 .../observable/ObservableSkipUntilTest.java   |  2 +-
 .../observable/ObservableSkipWhileTest.java   |  2 +-
 .../observable/ObservableStartWithTest.java   |  2 +-
 .../observable/ObservableSubscribeOnTest.java |  2 +-
 .../ObservableSwitchIfEmptyTest.java          |  2 +-
 .../observable/ObservableSwitchTest.java      |  2 +-
 .../observable/ObservableTakeLastOneTest.java |  2 +-
 .../observable/ObservableTakeLastTest.java    |  2 +-
 .../ObservableTakeLastTimedTest.java          |  2 +-
 .../observable/ObservableTakeTest.java        |  2 +-
 .../observable/ObservableTakeTimedTest.java   |  2 +-
 .../ObservableTakeUntilPredicateTest.java     |  2 +-
 .../observable/ObservableTakeUntilTest.java   |  2 +-
 .../observable/ObservableTakeWhileTest.java   |  2 +-
 .../ObservableThrottleFirstTest.java          |  2 +-
 .../ObservableThrottleLatestTest.java         |  2 +-
 .../ObservableTimeIntervalTest.java           |  2 +-
 .../observable/ObservableTimeoutTests.java    |  2 +-
 .../ObservableTimeoutWithSelectorTest.java    |  2 +-
 .../observable/ObservableTimerTest.java       |  2 +-
 .../observable/ObservableTimestampTest.java   |  2 +-
 .../observable/ObservableToFutureTest.java    |  2 +-
 .../observable/ObservableToListTest.java      |  2 +-
 .../observable/ObservableToMapTest.java       |  2 +-
 .../observable/ObservableToMultimapTest.java  |  2 +-
 .../ObservableToSortedListTest.java           |  2 +-
 .../observable/ObservableToXTest.java         |  2 +-
 .../ObservableUnsubscribeOnTest.java          |  2 +-
 .../observable/ObservableUsingTest.java       |  2 +-
 .../ObservableWindowWithObservableTest.java   |  2 +-
 .../ObservableWindowWithSizeTest.java         |  2 +-
 ...vableWindowWithStartEndObservableTest.java |  4 +-
 .../ObservableWindowWithTimeTest.java         |  2 +-
 .../ObservableWithLatestFromTest.java         |  2 +-
 .../ObservableZipCompletionTest.java          |  2 +-
 .../observable/ObservableZipIterableTest.java |  2 +-
 .../observable/ObservableZipTest.java         |  2 +-
 .../operators/single/SingleAmbTest.java       |  2 +-
 .../single/SingleBlockingSubscribeTest.java   |  2 +-
 .../operators/single/SingleCacheTest.java     |  2 +-
 .../SingleConcatArrayDelayErrorTest.java      |  2 +-
 .../SingleConcatArrayEagerDelayErrorTest.java |  2 +-
 .../single/SingleConcatDelayErrorTest.java    |  2 +-
 .../single/SingleConcatEagerTest.java         |  2 +-
 .../SingleConcatMapCompletableTest.java       |  2 +-
 .../single/SingleConcatMapMaybeTest.java      |  2 +-
 .../operators/single/SingleConcatMapTest.java |  2 +-
 .../single/SingleConcatPublisherTest.java     |  3 +-
 .../operators/single/SingleConcatTest.java    |  2 +-
 .../operators/single/SingleContainstTest.java |  2 +-
 .../operators/single/SingleCreateTest.java    |  2 +-
 .../operators/single/SingleDeferTest.java     |  2 +-
 .../operators/single/SingleDelayTest.java     |  2 +-
 .../single/SingleDematerializeTest.java       |  2 +-
 .../operators/single/SingleDetachTest.java    |  2 +-
 .../single/SingleDoAfterSuccessTest.java      |  2 +-
 .../single/SingleDoAfterTerminateTest.java    |  2 +-
 .../operators/single/SingleDoFinallyTest.java |  2 +-
 .../single/SingleDoOnLifecycleTest.java       |  2 +-
 .../single/SingleDoOnTerminateTest.java       |  2 +-
 .../operators/single/SingleDoOnTest.java      |  2 +-
 .../operators/single/SingleEqualsTest.java    |  2 +-
 .../operators/single/SingleErrorTest.java     |  2 +-
 .../single/SingleFlatMapBiSelectorTest.java   |  2 +-
 .../single/SingleFlatMapCompletableTest.java  |  2 +-
 .../SingleFlatMapIterableFlowableTest.java    |  2 +-
 .../SingleFlatMapIterableObservableTest.java  |  2 +-
 .../single/SingleFlatMapMaybeTest.java        |  2 +-
 .../single/SingleFlatMapNotificationTest.java |  2 +-
 .../operators/single/SingleFlatMapTest.java   |  2 +-
 .../single/SingleFromCallableTest.java        |  2 +-
 .../operators/single/SingleFromMaybeTest.java |  2 +-
 .../single/SingleFromPublisherTest.java       |  2 +-
 .../single/SingleFromSupplierTest.java        |  2 +-
 .../operators/single/SingleFromTest.java      |  2 +-
 .../operators/single/SingleHideTest.java      |  2 +-
 .../single/SingleInternalHelperTest.java      |  2 +-
 .../operators/single/SingleLiftTest.java      |  2 +-
 .../operators/single/SingleMapTest.java       |  2 +-
 .../single/SingleMaterializeTest.java         |  2 +-
 .../single/SingleMergeArrayTest.java          |  2 +-
 .../operators/single/SingleMergeTest.java     |  2 +-
 .../operators/single/SingleMiscTest.java      |  2 +-
 .../operators/single/SingleObserveOnTest.java |  2 +-
 .../operators/single/SingleOfTypeTest.java    |  2 +-
 .../single/SingleOnErrorCompleteTest.java     |  2 +-
 .../operators/single/SingleOnErrorXTest.java  |  2 +-
 .../single/SingleSafeSubscribeTest.java       |  2 +-
 .../operators/single/SingleStartWithTest.java |  2 +-
 .../single/SingleSubscribeOnTest.java         |  2 +-
 .../single/SingleSwitchOnNextTest.java        |  2 +-
 .../operators/single/SingleTakeUntilTest.java |  2 +-
 .../single/SingleTimeIntervalTest.java        |  2 +-
 .../operators/single/SingleTimeoutTest.java   |  2 +-
 .../operators/single/SingleTimerTest.java     |  2 +-
 .../operators/single/SingleTimestampTest.java |  2 +-
 .../single/SingleToFlowableTest.java          |  2 +-
 .../single/SingleToObservableTest.java        |  2 +-
 .../single/SingleUnsubscribeOnTest.java       |  2 +-
 .../operators/single/SingleUsingTest.java     |  2 +-
 .../operators/single/SingleZipArrayTest.java  |  2 +-
 .../single/SingleZipIterableTest.java         |  2 +-
 .../operators/single/SingleZipTest.java       |  2 +-
 .../internal/queue/SimpleQueueTest.java       |  2 +-
 .../schedulers/AbstractDirectTaskTest.java    |  2 +-
 .../schedulers/BooleanRunnableTest.java       |  2 +-
 .../ComputationSchedulerInternalTest.java     | 16 +++---
 .../schedulers/DisposeOnCancelTest.java       |  2 +-
 .../ExecutorSchedulerDelayedRunnableTest.java |  2 +-
 .../ImmediateThinSchedulerTest.java           |  2 +-
 .../schedulers/InstantPeriodicTaskTest.java   | 21 ++++----
 .../schedulers/InterruptibleRunnableTest.java |  2 +-
 .../schedulers/IoScheduledReleaseTest.java    |  2 +-
 .../schedulers/IoSchedulerInternalTest.java   |  2 +-
 .../schedulers/RxThreadFactoryTest.java       |  2 +-
 .../ScheduledDirectPeriodicTaskTest.java      |  2 +-
 .../schedulers/ScheduledRunnableTest.java     |  2 +-
 .../SchedulerMultiWorkerSupportTest.java      |  2 +-
 .../schedulers/SchedulerPoolFactoryTest.java  | 15 +++---
 .../schedulers/SchedulerWhenTest.java         |  2 +-
 .../schedulers/SingleSchedulerTest.java       |  2 +-
 .../TrampolineSchedulerInternalTest.java      | 15 +++---
 ...asicFuseableConditionalSubscriberTest.java |  2 +-
 .../BasicFuseableSubscriberTest.java          |  2 +-
 .../subscribers/BlockingSubscriberTest.java   |  2 +-
 .../subscribers/BoundedSubscriberTest.java    |  2 +-
 .../DeferredScalarSubscriberTest.java         | 15 +++---
 .../subscribers/EmptyComponentTest.java       |  2 +-
 .../subscribers/FutureSubscriberTest.java     |  2 +-
 .../InnerQueuedSubscriberTest.java            |  2 +-
 .../subscribers/LambdaSubscriberTest.java     |  2 +-
 .../subscribers/QueueDrainSubscriberTest.java |  2 +-
 .../SinglePostCompleteSubscriberTest.java     |  2 +-
 .../subscribers/StrictSubscriberTest.java     |  2 +-
 .../SubscriberResourceWrapperTest.java        |  2 +-
 .../ArrayCompositeSubscriptionTest.java       |  2 +-
 .../subscriptions/AsyncSubscriptionTest.java  |  2 +-
 .../DeferredScalarSubscriptionTest.java       |  2 +-
 .../subscriptions/QueueSubscriptionTest.java  |  2 +-
 .../subscriptions/ScalarSubscriptionTest.java |  2 +-
 .../SubscriptionArbiterTest.java              |  2 +-
 .../subscriptions/SubscriptionHelperTest.java |  2 +-
 .../internal/util/AtomicThrowableTest.java    |  2 +-
 .../internal/util/BackpressureHelperTest.java | 16 +++---
 .../internal/util/BlockingHelperTest.java     |  2 +-
 .../internal/util/CrashingIterable.java       |  2 +-
 .../internal/util/CrashingMappedIterable.java |  2 +-
 .../internal/util/EndConsumerHelperTest.java  |  2 +-
 .../internal/util/ExceptionHelperTest.java    |  2 +-
 .../util/HalfSerializerObserverTest.java      |  3 +-
 .../util/HalfSerializerSubscriberTest.java    |  3 +-
 .../internal/util/JavadocNoThrows.java        |  3 +-
 .../internal/util/MarbleDimensions.java       |  3 +-
 .../internal/util/MergerBiFunctionTest.java   |  2 +-
 .../rxjava3/internal/util/MiscUtilTest.java   |  2 +-
 .../internal/util/NotificationLiteTest.java   |  2 +-
 .../util/ObservableToFlowabeTestSync.java     |  2 +-
 .../internal/util/OpenHashSetTest.java        |  2 +-
 .../internal/util/OperatorArgumentNaming.java |  2 +-
 .../util/OperatorMatrixGenerator.java         |  2 +-
 .../internal/util/QueueDrainHelperTest.java   |  2 +-
 .../rxjava3/internal/util/TestingHelper.java  | 16 +++---
 .../util/VolatileSizeArrayListTest.java       |  2 +-
 .../rxjava3/maybe/MaybeCreateTest.java        |  2 +-
 .../rxjava3/maybe/MaybeRetryTest.java         |  4 +-
 .../io/reactivex/rxjava3/maybe/MaybeTest.java |  2 +-
 .../rxjava3/maybe/MaybeTimerTest.java         |  2 +-
 .../ObservableCombineLatestTests.java         | 16 +++---
 .../observable/ObservableConcatTests.java     |  3 +-
 .../observable/ObservableCovarianceTest.java  | 15 +++---
 .../observable/ObservableDoOnTest.java        |  2 +-
 .../ObservableErrorHandlingTests.java         |  2 +-
 .../observable/ObservableEventStream.java     |  2 +-
 .../observable/ObservableFuseableTest.java    |  3 +-
 .../observable/ObservableGroupByTests.java    |  2 +-
 .../observable/ObservableMergeTests.java      |  2 +-
 .../observable/ObservableNullTests.java       |  2 +-
 .../observable/ObservableReduceTests.java     |  2 +-
 .../observable/ObservableScanTests.java       |  2 +-
 .../observable/ObservableStartWithTests.java  |  2 +-
 .../observable/ObservableSubscriberTest.java  |  2 +-
 .../rxjava3/observable/ObservableTest.java    |  2 +-
 .../ObservableThrottleLastTests.java          |  2 +-
 .../ObservableThrottleWithTimeoutTests.java   |  2 +-
 .../observable/ObservableWindowTests.java     |  2 +-
 .../observable/ObservableZipTests.java        |  2 +-
 .../DisposableCompletableObserverTest.java    |  2 +-
 .../DisposableMaybeObserverTest.java          |  2 +-
 .../observers/DisposableObserverTest.java     |  2 +-
 .../DisposableSingleObserverTest.java         |  2 +-
 .../ResourceCompletableObserverTest.java      |  2 +-
 .../observers/ResourceMaybeObserverTest.java  |  2 +-
 .../observers/ResourceObserverTest.java       |  2 +-
 .../observers/ResourceSingleObserverTest.java |  2 +-
 .../rxjava3/observers/SafeObserverTest.java   |  2 +-
 .../observers/SerializedObserverTest.java     |  2 +-
 .../rxjava3/observers/TestObserverTest.java   |  2 +-
 .../rxjava3/parallel/ParallelCollectTest.java |  2 +-
 .../parallel/ParallelDoOnNextTryTest.java     |  2 +-
 .../rxjava3/parallel/ParallelFilterTest.java  |  2 +-
 .../parallel/ParallelFilterTryTest.java       |  2 +-
 .../parallel/ParallelFlatMapIterableTest.java |  2 +-
 .../parallel/ParallelFlowableTest.java        |  2 +-
 .../parallel/ParallelFromPublisherTest.java   |  2 +-
 .../rxjava3/parallel/ParallelInvalid.java     |  2 +-
 .../rxjava3/parallel/ParallelJoinTest.java    |  2 +-
 .../rxjava3/parallel/ParallelMapTest.java     |  2 +-
 .../rxjava3/parallel/ParallelMapTryTest.java  |  2 +-
 .../rxjava3/parallel/ParallelPeekTest.java    |  2 +-
 .../parallel/ParallelReduceFullTest.java      |  2 +-
 .../rxjava3/parallel/ParallelReduceTest.java  |  2 +-
 .../rxjava3/parallel/ParallelRunOnTest.java   |  2 +-
 .../parallel/ParallelSortedJoinTest.java      |  2 +-
 .../rxjava3/plugins/RxJavaPluginsTest.java    | 15 +++---
 .../processors/AsyncProcessorTest.java        |  2 +-
 .../processors/BehaviorProcessorTest.java     |  2 +-
 .../processors/FlowableProcessorTest.java     |  2 +-
 .../processors/MulticastProcessorTest.java    |  2 +-
 .../processors/PublishProcessorTest.java      |  2 +-
 ...ReplayProcessorBoundedConcurrencyTest.java |  2 +-
 .../ReplayProcessorConcurrencyTest.java       |  2 +-
 .../processors/ReplayProcessorTest.java       |  2 +-
 .../processors/SerializedProcessorTest.java   |  2 +-
 .../processors/UnicastProcessorTest.java      |  2 +-
 .../AbstractSchedulerConcurrencyTests.java    |  2 +-
 .../schedulers/AbstractSchedulerTests.java    |  2 +-
 .../schedulers/CachedThreadSchedulerTest.java |  2 +-
 .../schedulers/ComputationSchedulerTests.java |  2 +-
 .../schedulers/ExecutorSchedulerFairTest.java |  2 +-
 .../ExecutorSchedulerInterruptibleTest.java   |  2 +-
 .../schedulers/ExecutorSchedulerTest.java     |  2 +-
 .../schedulers/FailOnBlockingTest.java        |  2 +-
 .../schedulers/NewThreadSchedulerTest.java    |  2 +-
 .../schedulers/SchedulerLifecycleTest.java    |  2 +-
 .../rxjava3/schedulers/SchedulerTest.java     |  2 +-
 .../schedulers/SchedulerTestHelper.java       |  2 +-
 .../schedulers/SchedulerWorkerTest.java       |  2 +-
 .../rxjava3/schedulers/TestSchedulerTest.java |  2 +-
 .../rxjava3/schedulers/TimedTest.java         |  2 +-
 .../schedulers/TrampolineSchedulerTest.java   |  2 +-
 .../rxjava3/single/SingleCacheTest.java       |  2 +-
 .../rxjava3/single/SingleNullTests.java       |  2 +-
 .../rxjava3/single/SingleRetryTest.java       |  4 +-
 .../rxjava3/single/SingleSubscribeTest.java   |  2 +-
 .../reactivex/rxjava3/single/SingleTest.java  |  2 +-
 .../rxjava3/single/SingleTimerTest.java       |  2 +-
 .../rxjava3/subjects/AsyncSubjectTest.java    |  2 +-
 .../rxjava3/subjects/BehaviorSubjectTest.java |  2 +-
 .../subjects/CompletableSubjectTest.java      |  2 +-
 .../rxjava3/subjects/MaybeSubjectTest.java    |  2 +-
 .../rxjava3/subjects/PublishSubjectTest.java  |  2 +-
 .../ReplaySubjectBoundedConcurrencyTest.java  |  2 +-
 .../ReplaySubjectConcurrencyTest.java         |  2 +-
 .../rxjava3/subjects/ReplaySubjectTest.java   |  2 +-
 .../subjects/SerializedSubjectTest.java       |  2 +-
 .../rxjava3/subjects/SingleSubjectTest.java   |  2 +-
 .../rxjava3/subjects/SubjectTest.java         |  2 +-
 .../rxjava3/subjects/UnicastSubjectTest.java  |  2 +-
 .../subscribers/DefaultSubscriberTest.java    |  2 +-
 .../subscribers/DisposableSubscriberTest.java |  2 +-
 .../subscribers/ResourceSubscriberTest.java   |  2 +-
 .../subscribers/SafeSubscriberTest.java       |  2 +-
 .../subscribers/SerializedSubscriberTest.java |  2 +-
 .../subscribers/TestSubscriberTest.java       |  2 +-
 .../io/reactivex/rxjava3/tck/AllTckTest.java  |  2 +-
 .../rxjava3/tck/AmbArrayTckTest.java          |  2 +-
 .../io/reactivex/rxjava3/tck/AmbTckTest.java  |  2 +-
 .../io/reactivex/rxjava3/tck/AnyTckTest.java  |  2 +-
 .../tck/AsyncProcessorAsPublisherTckTest.java |  2 +-
 .../io/reactivex/rxjava3/tck/BaseTck.java     |  2 +-
 .../BehaviorProcessorAsPublisherTckTest.java  |  2 +-
 .../rxjava3/tck/BufferBoundaryTckTest.java    |  2 +-
 .../rxjava3/tck/BufferExactSizeTckTest.java   |  2 +-
 .../reactivex/rxjava3/tck/CacheTckTest.java   |  2 +-
 .../reactivex/rxjava3/tck/CollectTckTest.java |  2 +-
 .../CombineLatestArrayDelayErrorTckTest.java  |  2 +-
 .../tck/CombineLatestArrayTckTest.java        |  2 +-
 ...ombineLatestIterableDelayErrorTckTest.java |  2 +-
 .../tck/CombineLatestIterableTckTest.java     |  2 +-
 .../CompletableAndThenPublisherTckTest.java   |  2 +-
 .../rxjava3/tck/ConcatArrayEagerTckTest.java  |  2 +-
 .../tck/ConcatIterableEagerTckTest.java       |  2 +-
 .../rxjava3/tck/ConcatMapIterableTckTest.java |  2 +-
 .../rxjava3/tck/ConcatMapMaybeTckTest.java    |  2 +-
 .../rxjava3/tck/ConcatMapSingleTckTest.java   |  2 +-
 .../rxjava3/tck/ConcatMapTckTest.java         |  2 +-
 .../tck/ConcatPublisherEagerTckTest.java      |  2 +-
 .../rxjava3/tck/ConcatPublisherTckTest.java   |  2 +-
 .../reactivex/rxjava3/tck/ConcatTckTest.java  |  2 +-
 .../tck/ConcatWithCompletableTckTest.java     |  2 +-
 .../tck/ConcatWithMaybeEmptyTckTest.java      |  2 +-
 .../rxjava3/tck/ConcatWithMaybeTckTest.java   |  2 +-
 .../rxjava3/tck/ConcatWithSingleTckTest.java  |  2 +-
 .../reactivex/rxjava3/tck/CreateTckTest.java  |  2 +-
 .../rxjava3/tck/DefaultIfEmptyTckTest.java    |  2 +-
 .../reactivex/rxjava3/tck/DeferTckTest.java   |  2 +-
 .../rxjava3/tck/DelaySubscriptionTckTest.java |  2 +-
 .../reactivex/rxjava3/tck/DelayTckTest.java   |  2 +-
 .../rxjava3/tck/DistinctTckTest.java          |  2 +-
 .../tck/DistinctUntilChangedTckTest.java      |  2 +-
 .../rxjava3/tck/DoAfterNextTckTest.java       |  2 +-
 .../rxjava3/tck/DoFinallyTckTest.java         |  2 +-
 .../rxjava3/tck/DoOnNextTckTest.java          |  2 +-
 .../rxjava3/tck/ElementAtTckTest.java         |  2 +-
 .../reactivex/rxjava3/tck/EmptyTckTest.java   |  2 +-
 .../reactivex/rxjava3/tck/FilterTckTest.java  |  2 +-
 .../reactivex/rxjava3/tck/FirstTckTest.java   |  2 +-
 .../reactivex/rxjava3/tck/FlatMapTckTest.java |  2 +-
 .../rxjava3/tck/FromArrayTckTest.java         |  2 +-
 .../rxjava3/tck/FromCallableTckTest.java      |  2 +-
 .../rxjava3/tck/FromFutureTckTest.java        |  2 +-
 .../rxjava3/tck/FromIterableTckTest.java      |  2 +-
 .../rxjava3/tck/FromSupplierTckTest.java      |  2 +-
 .../rxjava3/tck/GenerateTckTest.java          |  2 +-
 .../reactivex/rxjava3/tck/GroupByTckTest.java |  2 +-
 .../io/reactivex/rxjava3/tck/HideTckTest.java |  2 +-
 .../rxjava3/tck/IgnoreElementsTckTest.java    |  2 +-
 .../rxjava3/tck/IntervalRangeTckTest.java     |  2 +-
 .../rxjava3/tck/IntervalTckTest.java          |  2 +-
 .../reactivex/rxjava3/tck/IsEmptyTckTest.java |  2 +-
 .../io/reactivex/rxjava3/tck/JustTckTest.java |  2 +-
 .../io/reactivex/rxjava3/tck/LastTckTest.java |  2 +-
 .../reactivex/rxjava3/tck/LimitTckTest.java   |  2 +-
 .../io/reactivex/rxjava3/tck/MapTckTest.java  |  2 +-
 .../tck/MaybeFlatMapPublisherTckTest.java     |  2 +-
 .../rxjava3/tck/MergeIterableTckTest.java     |  2 +-
 .../rxjava3/tck/MergePublisherTckTest.java    |  2 +-
 .../reactivex/rxjava3/tck/MergeTckTest.java   |  2 +-
 .../tck/MergeWithCompletableTckTest.java      |  2 +-
 .../tck/MergeWithMaybeEmptyTckTest.java       |  2 +-
 .../rxjava3/tck/MergeWithMaybeTckTest.java    |  2 +-
 .../rxjava3/tck/MergeWithSingleTckTest.java   |  2 +-
 .../MulticastProcessorAsPublisherTckTest.java |  2 +-
 .../MulticastProcessorRefCountedTckTest.java  |  2 +-
 .../tck/MulticastProcessorTckTest.java        |  2 +-
 .../rxjava3/tck/ObserveOnTckTest.java         |  2 +-
 .../tck/OnBackpressureBufferTckTest.java      |  2 +-
 .../rxjava3/tck/OnErrorResumeWithTckTest.java |  2 +-
 .../rxjava3/tck/OnErrorReturnItemTckTest.java |  2 +-
 .../PublishProcessorAsPublisherTckTest.java   |  2 +-
 .../rxjava3/tck/PublishSelectorTckTest.java   |  2 +-
 .../reactivex/rxjava3/tck/PublishTckTest.java |  2 +-
 .../reactivex/rxjava3/tck/RangeTckTest.java   |  2 +-
 .../rxjava3/tck/RebatchRequestsTckTest.java   |  2 +-
 .../reactivex/rxjava3/tck/ReduceTckTest.java  |  2 +-
 .../rxjava3/tck/ReduceWithTckTest.java        |  2 +-
 .../rxjava3/tck/RefCountProcessor.java        |  2 +-
 .../reactivex/rxjava3/tck/RepeatTckTest.java  |  2 +-
 ...yProcessorSizeBoundAsPublisherTckTest.java |  2 +-
 ...yProcessorTimeBoundAsPublisherTckTest.java |  2 +-
 ...yProcessorUnboundedAsPublisherTckTest.java |  2 +-
 .../rxjava3/tck/ReplaySelectorTckTest.java    |  2 +-
 .../reactivex/rxjava3/tck/ReplayTckTest.java  |  2 +-
 .../reactivex/rxjava3/tck/RetryTckTest.java   |  2 +-
 .../io/reactivex/rxjava3/tck/ScanTckTest.java |  2 +-
 .../rxjava3/tck/SequenceEqualTckTest.java     |  2 +-
 .../reactivex/rxjava3/tck/ShareTckTest.java   |  2 +-
 .../tck/SingleFlatMapFlowableTckTest.java     |  2 +-
 .../reactivex/rxjava3/tck/SingleTckTest.java  |  2 +-
 .../rxjava3/tck/SkipLastTckTest.java          |  2 +-
 .../io/reactivex/rxjava3/tck/SkipTckTest.java |  2 +-
 .../rxjava3/tck/SkipUntilTckTest.java         |  2 +-
 .../rxjava3/tck/SkipWhileTckTest.java         |  2 +-
 .../reactivex/rxjava3/tck/SortedTckTest.java  |  2 +-
 .../rxjava3/tck/SubscribeOnTckTest.java       |  2 +-
 .../rxjava3/tck/SwitchIfEmptyTckTest.java     |  2 +-
 .../tck/SwitchMapDelayErrorTckTest.java       |  2 +-
 .../rxjava3/tck/SwitchMapTckTest.java         |  2 +-
 .../rxjava3/tck/SwitchOnNextTckTest.java      |  2 +-
 .../rxjava3/tck/TakeLastTckTest.java          |  2 +-
 .../io/reactivex/rxjava3/tck/TakeTckTest.java |  2 +-
 .../rxjava3/tck/TakeUntilTckTest.java         |  2 +-
 .../rxjava3/tck/TakeWhileTckTest.java         |  2 +-
 .../rxjava3/tck/TimeIntervalTckTest.java      |  2 +-
 .../reactivex/rxjava3/tck/TimeoutTckTest.java |  2 +-
 .../reactivex/rxjava3/tck/TimerTckTest.java   |  2 +-
 .../rxjava3/tck/TimestampTckTest.java         |  2 +-
 .../reactivex/rxjava3/tck/ToListTckTest.java  |  2 +-
 .../reactivex/rxjava3/tck/ToMapTckTest.java   |  2 +-
 .../rxjava3/tck/ToMultimapTckTest.java        |  2 +-
 .../rxjava3/tck/ToSortedListTckTest.java      |  2 +-
 .../UnicastProcessorAsPublisherTckTest.java   |  2 +-
 .../rxjava3/tck/UnicastProcessorTckTest.java  |  2 +-
 .../rxjava3/tck/UnsubscribeOnTckTest.java     |  2 +-
 .../reactivex/rxjava3/tck/UsingTckTest.java   |  2 +-
 .../rxjava3/tck/WindowBoundaryTckTest.java    |  2 +-
 .../rxjava3/tck/WindowExactSizeTckTest.java   |  2 +-
 .../rxjava3/tck/WithLatestFromTckTest.java    |  2 +-
 .../rxjava3/tck/ZipIterableTckTest.java       |  2 +-
 .../io/reactivex/rxjava3/tck/ZipTckTest.java  |  2 +-
 .../rxjava3/tck/ZipWithIterableTckTest.java   |  2 +-
 .../reactivex/rxjava3/tck/ZipWithTckTest.java |  2 +-
 .../testsupport/BaseTestConsumerEx.java       |  2 +-
 .../testsupport/SuppressUndeliverable.java    | 16 +++---
 .../SuppressUndeliverableRule.java            | 16 +++---
 .../rxjava3/testsupport/TestHelper.java       |  2 +-
 .../rxjava3/testsupport/TestObserverEx.java   |  3 +-
 .../testsupport/TestObserverExTest.java       |  2 +-
 .../rxjava3/testsupport/TestSubscriberEx.java |  3 +-
 .../testsupport/TestSubscriberExTest.java     |  2 +-
 .../testsupport/TimesteppingScheduler.java    |  2 +-
 .../validators/BaseTypeAnnotations.java       |  2 +-
 .../rxjava3/validators/BaseTypeParser.java    |  2 +-
 .../validators/CatchThrowIfFatalCheck.java    |  2 +-
 .../CheckLocalVariablesInTests.java           |  2 +-
 .../rxjava3/validators/FixLicenseHeaders.java |  6 +--
 .../validators/InternalWrongNaming.java       |  2 +-
 .../validators/JavadocCodesAndLinks.java      |  2 +-
 .../JavadocFindUnescapedAngleBrackets.java    |  3 +-
 .../validators/JavadocForAnnotations.java     |  2 +-
 .../rxjava3/validators/JavadocWording.java    |  2 +-
 .../rxjava3/validators/MaybeNo2Dot0Since.java |  2 +-
 .../validators/NewLinesBeforeAnnotation.java  |  2 +-
 .../NoAnonymousInnerClassesTest.java          |  2 +-
 .../rxjava3/validators/OperatorsAreFinal.java |  2 +-
 .../validators/OperatorsUseInterfaces.java    |  2 +-
 .../ParamValidationCheckerTest.java           |  2 +-
 .../validators/ParamValidationNaming.java     |  2 +-
 .../ParameterNamesInClassesTest.java          |  2 +-
 .../validators/PublicFinalMethods.java        |  2 +-
 .../validators/SourceAnnotationCheck.java     |  2 +-
 .../validators/TestPrefixInMethodName.java    |  2 +-
 .../rxjava3/validators/TextualAorAn.java      |  2 +-
 .../validators/TooManyEmptyNewLines.java      |  2 +-
 1874 files changed, 2473 insertions(+), 2539 deletions(-)
 create mode 100644 HEADER_JAVA

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4547f563a8..98ae7225f3 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,19 +13,16 @@ All files are released with the Apache 2.0 license.
 If you are adding a new file it should have a header like this:
 
 ```
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
  ```
diff --git a/HEADER_JAVA b/HEADER_JAVA
new file mode 100644
index 0000000000..d95b44938b
--- /dev/null
+++ b/HEADER_JAVA
@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
diff --git a/build.gradle b/build.gradle
index be36a633d1..d8edc53550 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ buildscript {
   ext.licenseVersion = "0.15.0"
   ext.jfrogExtractorVersion = "4.21.0"
   ext.bndVersion = "5.3.0"
-  ext.checkstyleVersion = "8.26"
+  ext.checkstyleVersion = "8.41"
   ext.vanniktechPublishPlugin = "0.14.2"
 
   // --------------------------------------
@@ -235,9 +235,11 @@ jacocoTestReport.dependsOn GCandMem
 build.dependsOn jacocoTestReport
 
 checkstyle {
-    configFile file("checkstyle.xml")
-    ignoreFailures = true
+    configFile = file("checkstyle.xml")
     toolVersion = checkstyleVersion
+    configProperties = [
+            "checkstyle.header.file": file("HEADER_JAVA")
+    ]
 }
 
 apply from: file("gradle/javadoc_cleanup.gradle")
diff --git a/checkstyle.xml b/checkstyle.xml
index 3e7ba879da..f4b8fd158e 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -1,43 +1,22 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+        "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
+        "https://checkstyle.org/dtds/configuration_1_3.dtd">
+
 <module name="Checker">
-<property name="severity" value="warning"/>
-  <module name="TreeWalker">
-    <module name="RegexpSinglelineJava">
-      <property name="severity" value="warning"/>
-      <property name="format" value="^(?!\s+\* $).*?\s+$"/>
-      <property name="message" value="Line has trailing spaces."/>
+
+    <!-- Headers -->
+    <module name="Header">
+        <property name="headerFile" value="${checkstyle.header.file}"/>
+        <property name="fileExtensions" value="java"/>
     </module>
-    <!-- 
-    <module name="ExplicitInitialization"/>
-    <module name="SummaryJavadoc"/>
-    <module name="ModifierOrder"/>
-    <module name="RedundantModifier"/>
-    <module name="NeedBraces"/>
-    <module name="EqualsHashCode"/>
-    <module name="FallThrough"/>
-    <module name="MultipleVariableDeclarations">
-      <property name="severity" value="ignore"/>
-      <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
+
+    <module name="TreeWalker">
+        <module name="RegexpSinglelineJava">
+            <property name="severity" value="warning"/>
+            <property name="format" value="^(?!\s+\* $).*?\s+$"/>
+            <property name="message" value="Line has trailing spaces."/>
+        </module>
     </module>
-    <module name="PackageDeclaration"/>
-    <module name="FinalClass"/>
-    <module name="HideUtilityClassConstructor"/>
-    <module name="WhitespaceAround">
-      <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,DO_WHILE,EQUAL,GE,GT,LAMBDA,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,TYPE_EXTENSION_AND"/>
-    </module>
-     -->
-  </module>
-  <!-- 
-  <module name="JavadocPackage">
-    <property name="severity" value="ignore"/>
-    <metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
-  </module>
-  <module name="FileTabCharacter">
-    <property name="eachLine" value="true"/>
-    <property name="fileExtensions" value=".java"/>
-  </module>
-   -->
+
 </module>
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java
index 836957192e..c4a0a385a5 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/BlockingGetPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/BlockingGetPerf.java
index f40a8ca55b..7f3711788a 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/BlockingGetPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/BlockingGetPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/BlockingPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/BlockingPerf.java
index 020befc21a..5fb2825b3e 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/BlockingPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/BlockingPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java
index 8098b1aaf4..1bae28f9f9 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/CallableAsyncPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java
index 37a4f196e8..14aa8c3605 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/EachTypeFlatMapPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java
index 2a1fd7539c..597fae480d 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlatMapJustPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java
index 866fe5de77..c5d516423f 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlattenCrossMapPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java
index d2ac9aa5b7..3bb1ad1473 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlattenJustPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java
index a3195b760d..0339f345c3 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlattenRangePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java
index e9494e97df..0ebb2d4458 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableAsyncPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableSyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableSyncPerf.java
index 34f53a954a..400e0609a8 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableSyncPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/FlowableFlatMapCompletableSyncPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java b/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java
index 772d202dca..44d109fb4d 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/InputWithIncrementingInteger.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java
index f60204c88b..6906470aea 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/JustAsyncPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/LatchedSingleObserver.java b/src/jmh/java/io/reactivex/rxjava3/core/LatchedSingleObserver.java
index 1b908ac6b2..6bcdba465e 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/LatchedSingleObserver.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/LatchedSingleObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java
index c7c407de15..7cd45de74e 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/MemoryPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/ObservableFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/ObservableFlatMapPerf.java
index d0d75e78d4..65145b07b4 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/ObservableFlatMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/ObservableFlatMapPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java
index 0eb7f03aa9..777fc9e1a6 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/OperatorFlatMapPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java
index 560736c86c..24605fc02a 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/OperatorMergePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/PerfAsyncConsumer.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfAsyncConsumer.java
index 7c222fddab..ccaaf75573 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/PerfAsyncConsumer.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfAsyncConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/PerfBoundedSubscriber.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfBoundedSubscriber.java
index 8ec19a833a..68083976be 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/PerfBoundedSubscriber.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfBoundedSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/PerfConsumer.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfConsumer.java
index 6025438218..60f93f089a 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/PerfConsumer.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/PerfInteropConsumer.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfInteropConsumer.java
index 6dfbac7a31..fc7f0b04b0 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/PerfInteropConsumer.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfInteropConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/PerfObserver.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfObserver.java
index 5f09b97ffe..a62a1e68f6 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/PerfObserver.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java b/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java
index 51da5a5c53..8c0f30cffa 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/PerfSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/PublishProcessorPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/PublishProcessorPerf.java
index c64e1f794d..1278bfd641 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/PublishProcessorPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/PublishProcessorPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/RangePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/RangePerf.java
index c9723b086d..0773cd4f72 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/RangePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/RangePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java
index faf0423760..3d2bb476c8 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/ReducePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/RxVsStreamPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/RxVsStreamPerf.java
index 74c8952c7a..8861a6cdf5 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/RxVsStreamPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/RxVsStreamPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/StrictPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/StrictPerf.java
index 59d17f4d60..23315ef617 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/StrictPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/StrictPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java
index b2f89a39ca..a6a3949605 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/TakeUntilPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java b/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java
index 9c86e83678..7b7f0dc36d 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/ToFlowablePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java
index 6205efa25d..b95d76ffe4 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/XMapYPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java b/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java
index 4eaac7b0da..c6fd16ffb6 100644
--- a/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/parallel/ParallelPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -109,4 +109,4 @@ public void groupBy(Blackhole bh) {
     public void parallel(Blackhole bh) {
         subscribe(parallel, bh);
     }
-}
\ No newline at end of file
+}
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java
index 9e1096ab74..f1124f7a81 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapCompletablePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java
index a211fbe829..7eabfcfbde 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybeEmptyPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java
index 059a0b162b..87ee5a07e4 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java
index e812708a15..cbeac5ada9 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapSinglePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java
index 1960735cfa..b46725986f 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapCompletablePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java
index 96e6fcf672..8ab19a00c6 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java
index 2f71d5793e..d0f3730b42 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java
index 2bbdf9bf95..4f50938647 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java
index 033d35c429..4e419a5d2e 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapCompletablePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java
index adc6060189..83ad00e0f9 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java
index d5d8cb9443..e36b49c4d3 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java
index a997f27b53..0da6941895 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
index ca6174a006..48b20dc005 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
index b194580fa8..4528c90b50 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
index 5c7d6ad7a0..204020abfe 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
index 1785b59135..e2e34b24f5 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
index 64247ac219..b6daa57eb6 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
index 5e38b30061..5d0327fa46 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
index ffc5b15e56..e2a7c43bea 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
index 6356ad8ace..add0cd310c 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
index 1fc6eef9b3..69b8e71f18 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
index 4737493420..3930534eb8 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
index b8dca2d95b..30158d012d 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
index 682e2712f0..75aeb504f9 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java
index fd53c196b3..3b979a045d 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureKind.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/BackpressureSupport.java b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureSupport.java
index 9deafa22f5..b73a477fec 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/BackpressureSupport.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/BackpressureSupport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/Beta.java b/src/main/java/io/reactivex/rxjava3/annotations/Beta.java
index 123842b773..ca75ea0b3b 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/Beta.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/Beta.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/CheckReturnValue.java b/src/main/java/io/reactivex/rxjava3/annotations/CheckReturnValue.java
index 3091d2647f..02c7f2e0d9 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/CheckReturnValue.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/CheckReturnValue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/Experimental.java b/src/main/java/io/reactivex/rxjava3/annotations/Experimental.java
index 32d60e1442..061361f9b4 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/Experimental.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/Experimental.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java b/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java
index 03e5180588..4495092fc7 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/NonNull.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java b/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java
index c95ef4a35c..a6af9eb1b5 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/Nullable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/SchedulerSupport.java b/src/main/java/io/reactivex/rxjava3/annotations/SchedulerSupport.java
index 53b395f06b..0132b6a33d 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/SchedulerSupport.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/SchedulerSupport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/annotations/package-info.java b/src/main/java/io/reactivex/rxjava3/annotations/package-info.java
index 8fa44fd553..a4daca2a32 100644
--- a/src/main/java/io/reactivex/rxjava3/annotations/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/annotations/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java b/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java
index 750a1308f2..144dbb6807 100644
--- a/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java
+++ b/src/main/java/io/reactivex/rxjava3/core/BackpressureOverflowStrategy.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java b/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java
index 4a26072650..f2bf8d01ae 100644
--- a/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java
+++ b/src/main/java/io/reactivex/rxjava3/core/BackpressureStrategy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index c411cae489..c6cfb7866b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java b/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java
index 83e8f693eb..a213c6f5ab 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java
index 5ebb4e1877..2c5a9811c4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableEmitter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java b/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java
index 7c01ebfee1..9339307047 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
index 70d79e62b6..0ac107e64b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java b/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java
index e9b1df83cb..f06a94f36a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java b/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java
index 58edf9471c..90d3853b8a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java
index 98a9e2aa19..2887c4717c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableTransformer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/Emitter.java b/src/main/java/io/reactivex/rxjava3/core/Emitter.java
index e9ea2a1827..83410f056e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Emitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Emitter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 4d6afb2249..98a72b6302 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
index d0b1814fb8..1db19b9144 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java
index 8304edca71..5ad6850389 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableEmitter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
index 129c6ac7b6..c289a9e30b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
index aed58cff89..aa2d5ff0e7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
index e07662b16b..f97eadbd37 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
index 8aa444afcc..fe51a2d5d7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableTransformer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 161f7a69d1..c0b8421fb1 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
index 221e8a671a..6ef529de7e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java b/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java
index eb7f1f7241..57d7f5a219 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeEmitter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java b/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java
index b0974fa97c..f6567dc94e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
index f02756199e..6c235bac84 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
index 4ddb18d1f7..7cea758dd9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
index da9dbf0658..a15ea2c89d 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
index 620076d722..770497fe3c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeTransformer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/Notification.java b/src/main/java/io/reactivex/rxjava3/core/Notification.java
index 086ffafc8e..c376403314 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Notification.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Notification.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 7fe071a5b2..2b3288ee99 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
index 7ab3a30a74..24cb2c9fad 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java b/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java
index 1ce0b93687..0658c4ba81 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableEmitter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
index de98fe0817..587ab9372c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
index 749bfa1a70..fd697fa626 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
index 89603f8e9c..c00bfc2170 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
index e6686e2e97..57b32bdc71 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableTransformer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observer.java b/src/main/java/io/reactivex/rxjava3/core/Observer.java
index dd4fb58711..6b911f51e5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
index d4c6a39ce4..580e2739cb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index b10706a214..06781c7f9a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
index ce3a446452..960a17d9d5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java b/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java
index c8d0a79ec3..4b18a81644 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleEmitter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java b/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java
index 281c15e531..a110d4bcff 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
index 14ff5e1f97..9372cb5bdf 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
index f3975b3a7f..3b9c4a53c5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleOperator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleSource.java b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
index bbeeaac40b..16147fd55b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
index f3edca3430..3ece315f97 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleTransformer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/core/package-info.java b/src/main/java/io/reactivex/rxjava3/core/package-info.java
index 91717d0178..ee76f76a64 100644
--- a/src/main/java/io/reactivex/rxjava3/core/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/core/package-info.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 /**
  * Base reactive classes: {@link io.reactivex.rxjava3.core.Flowable},  {@link io.reactivex.rxjava3.core.Observable},
  * {@link io.reactivex.rxjava3.core.Single},  {@link io.reactivex.rxjava3.core.Maybe} and
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java
index 32ad478656..4caad11d79 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/ActionDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.disposables;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java
index 08cbe9cd99..34cdaed0eb 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/AutoCloseableDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
index f877dc1381..bcf28ec148 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/CompositeDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.disposables;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
index d71a452cb1..67fd235086 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.disposables;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/DisposableContainer.java b/src/main/java/io/reactivex/rxjava3/disposables/DisposableContainer.java
index d7099fbadc..49311e4082 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/DisposableContainer.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/DisposableContainer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java
index 9649bcd7d3..d8f70ff655 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/FutureDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.disposables;
 
 import java.util.concurrent.Future;
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java
index eea584ab0b..55bb24a268 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/ReferenceDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java
index 34203e86a9..390a7912b4 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/RunnableDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.disposables;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java
index 1f408f8c94..7b1f6463a8 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/SerialDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/SubscriptionDisposable.java b/src/main/java/io/reactivex/rxjava3/disposables/SubscriptionDisposable.java
index f6756b58de..48c5c7ab3d 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/SubscriptionDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/SubscriptionDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.disposables;
 
 import org.reactivestreams.Subscription;
diff --git a/src/main/java/io/reactivex/rxjava3/disposables/package-info.java b/src/main/java/io/reactivex/rxjava3/disposables/package-info.java
index 29812d0ab7..00ff5dd6ff 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
index d7a3457fe4..2af6e522bd 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.exceptions;
 
 import java.io.*;
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/Exceptions.java b/src/main/java/io/reactivex/rxjava3/exceptions/Exceptions.java
index 41ddbd4fed..155a2801d2 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/Exceptions.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/Exceptions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java b/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java
index f7b19a2fc2..a817e6fb93 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedException.java b/src/main/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedException.java
index d70769af39..072b889a57 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -50,4 +50,4 @@ public OnErrorNotImplementedException(String message, @NonNull Throwable e) {
     public OnErrorNotImplementedException(@NonNull Throwable e) {
         this("The exception was not handled due to missing onError handler in the subscribe() method call. Further reading: https://github.com/ReactiveX/RxJava/wiki/Error-Handling | " + e, e);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/ProtocolViolationException.java b/src/main/java/io/reactivex/rxjava3/exceptions/ProtocolViolationException.java
index 9df2ed9762..66fab7f911 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/ProtocolViolationException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/ProtocolViolationException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java b/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java
index 08f926e9b3..11a4c07f8a 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/UndeliverableException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java b/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java
index 05ebb5bfb3..91de82962f 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
index a46371f545..133d0186c8 100644
--- a/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/flowables/ConnectableFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/flowables/GroupedFlowable.java b/src/main/java/io/reactivex/rxjava3/flowables/GroupedFlowable.java
index d9564c3e6e..609fc7808f 100644
--- a/src/main/java/io/reactivex/rxjava3/flowables/GroupedFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/flowables/GroupedFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.flowables;
 
 import io.reactivex.rxjava3.annotations.Nullable;
diff --git a/src/main/java/io/reactivex/rxjava3/flowables/package-info.java b/src/main/java/io/reactivex/rxjava3/flowables/package-info.java
index 75a6dec4e9..06475a34ea 100644
--- a/src/main/java/io/reactivex/rxjava3/flowables/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/flowables/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Action.java b/src/main/java/io/reactivex/rxjava3/functions/Action.java
index da0e76e0a6..509e5fcb64 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Action.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Action.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java b/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java
index 85ce3dbd17..09fec68cbf 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BiConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java b/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java
index 0724ef5bd1..27aa9ee016 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BiFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java b/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java
index 393ec86ab7..e45397aab7 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BiPredicate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java b/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java
index b30087fbd7..4e3b447b6e 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/BooleanSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java b/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java
index b9f3420c1b..574c832268 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Cancellable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Consumer.java b/src/main/java/io/reactivex/rxjava3/functions/Consumer.java
index bf245bdcb7..3ac1806438 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Consumer.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Consumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function.java b/src/main/java/io/reactivex/rxjava3/functions/Function.java
index 0f8b2fe39a..40e11ca3ba 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function3.java b/src/main/java/io/reactivex/rxjava3/functions/Function3.java
index fb1fe5aa76..377cceaeaf 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function3.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function3.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function4.java b/src/main/java/io/reactivex/rxjava3/functions/Function4.java
index 9c0af4737d..36db385819 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function4.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function4.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function5.java b/src/main/java/io/reactivex/rxjava3/functions/Function5.java
index fddaa28152..d3fc1504c4 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function5.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function5.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function6.java b/src/main/java/io/reactivex/rxjava3/functions/Function6.java
index 1f6ad10d20..2969a39f82 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function6.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function6.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function7.java b/src/main/java/io/reactivex/rxjava3/functions/Function7.java
index 39a6b26916..091b203296 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function7.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function7.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function8.java b/src/main/java/io/reactivex/rxjava3/functions/Function8.java
index 907c68cdfe..c8e21acf9d 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function8.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function8.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Function9.java b/src/main/java/io/reactivex/rxjava3/functions/Function9.java
index a7f7518456..0b182eb5f3 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Function9.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Function9.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java b/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java
index 9859bfd3c6..3a405aac26 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/IntFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.functions;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java b/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java
index 9af7de4f47..5b12752c1d 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/LongConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.functions;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Predicate.java b/src/main/java/io/reactivex/rxjava3/functions/Predicate.java
index 550a365e60..1bce2d6bff 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Predicate.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Predicate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Supplier.java b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
index 5a6245f05d..fe43f0d8c8 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/functions/package-info.java b/src/main/java/io/reactivex/rxjava3/functions/package-info.java
index a7d92ce8fb..ab9dad0426 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposable.java
index 5ebcdde15b..c9a6bc9bc4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposable.java
index 314464e156..863f52e91b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java
index 1f2d2122d1..79dbd855ac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/DisposableHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java
index 51acc86c75..f2fe41e6d3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
index 8a6d4dd992..4c4b1f8a73 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.disposables;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/SequentialDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/SequentialDisposable.java
index d9922ebec8..f6aef6bdd3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/SequentialDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/SequentialDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
index 659bcbcb2e..e0d3dead3c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/Functions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.functions;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
index 05bceafa1d..5bbdf22ad3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/functions/ObjectHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.functions;
 
 import io.reactivex.rxjava3.functions.BiPredicate;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java
index 071db9fff8..e04dcbd983 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -73,4 +73,4 @@ public void dispose() {
     public boolean isDisposed() {
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java
index 8f9e12d3cb..61d038460d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -39,4 +39,4 @@ public void dispose() {
     public boolean isDisposed() {
         return disposed;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java
index 9db35aed02..c597304388 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
index c0359640f1..fe70b40a01 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
index d7655bba86..13ccd6be75 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java
index c9371ae538..d7ae761e37 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/FuseToObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java
index cb6c18edd5..fddb14ef0b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamCompletableSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java
index 6f4fcd9085..121e2937e4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamMaybeSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java
index 8bd340a6c0..1a1e878b65 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamObservableSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java
index a412b37e1d..5a46f38555 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java
index dfab10fd9e..ef833ae2ff 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/HasUpstreamSingleSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java
index 74124d918c..3b90d364a2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.fuseable;
 
 import java.util.Queue;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java
index 71b93a75ad..cec2d5cf8e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java
index 923589377c..36723ca427 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.fuseable;
 
 import java.util.Queue;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
index eda6086f87..1c8599bfe9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.fuseable;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java
index c3122038c1..10baadfedf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java
index 49d893031b..efa09dee8f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/package-info.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/package-info.java
index b4ee869076..339eabbfd2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStage.java
index 44f539bf4b..639516d005 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStage.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.concurrent.CompletionStage;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletionStageConsumer.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletionStageConsumer.java
index d92e56041e..2410290734 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletionStageConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/CompletionStageConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.NoSuchElementException;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
index 11a00aadb9..63ca949295 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
index 14c1ebf4a8..aba390e1da 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFirstStageSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFirstStageSubscriber.java
index 5af6cc5aac..19bfcbff6d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFirstStageSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFirstStageSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.NoSuchElementException;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
index b01b24748a..abd8eaeb08 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStage.java
index f864cdd96d..1ee0f7786e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStage.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.concurrent.CompletionStage;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
index 55ec854ddf..a9f14d0d6a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.Iterator;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableLastStageSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableLastStageSubscriber.java
index c9a93eeb0e..0bdf3e9304 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableLastStageSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableLastStageSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.NoSuchElementException;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java
index 3fdcd40a4f..273a17b90c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableSingleStageSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableSingleStageSubscriber.java
index 8040ec6f5d..8206a9a8ac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableSingleStageSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableSingleStageSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.NoSuchElementException;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriber.java
index 6594b7ba5c..66e4fddde7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowable.java
index 0ac724bdf4..653642426e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservable.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservable.java
index e7a74f0593..404fcb8106 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStage.java
index d8523b8ead..45af605e96 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStage.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.concurrent.CompletionStage;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptional.java
index 8330d5249a..760456f2ee 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptional.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptional.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
index 63452ce3e9..980317750e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
index 9f990a77a5..fa1ccd9c8f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFirstStageObserver.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFirstStageObserver.java
index cda0073067..6ac5ae51f1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFirstStageObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFirstStageObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.NoSuchElementException;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
index 210d920aad..72bbea2a3f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStage.java
index 262da56026..11a5a6307c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStage.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.concurrent.CompletionStage;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java
index 90d7681303..8a8873ce22 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableLastStageObserver.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableLastStageObserver.java
index e2f9dc2225..b35ab3dba9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableLastStageObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableLastStageObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.NoSuchElementException;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptional.java
index eb134482be..a51ef1af28 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptional.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptional.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableSingleStageObserver.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableSingleStageObserver.java
index fa8714397a..c506fc36d4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableSingleStageObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableSingleStageObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.NoSuchElementException;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageObserver.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageObserver.java
index 54acae086f..4025890f17 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.concurrent.CompletableFuture;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java
index c8802de3f6..7fefa11e80 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStream.java
index 3f38d1fec3..beae3fee36 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java
index 350f59f2b2..b7446a38a0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java
index a2d454c994..d6f1fd8217 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowable.java
index d7286d5932..8ed45d40b9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservable.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservable.java
index 81b2d5fd7b..4733474f13 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStage.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStage.java
index f1be64375e..126a096a26 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStage.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStage.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.jdk8;
 
 import java.util.concurrent.CompletionStage;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptional.java
index 9ee9a6f803..ad54068d34 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptional.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptional.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java
index 0beef61824..45d3be7841 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java
index 84a5c017b5..f0a6d6f31f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java
index fb6fc08366..1bb3ff3d38 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BiConsumerSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BiConsumerSingleObserver.java
index 2fb0221f64..1e9696cb15 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BiConsumerSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BiConsumerSingleObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingBaseObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingBaseObserver.java
index 9a128799d5..93ce06eedf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingBaseObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingBaseObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.observers;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingDisposableMultiObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingDisposableMultiObserver.java
index da7e289e27..a2334c21ba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingDisposableMultiObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingDisposableMultiObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserver.java
index 276848afe4..570000a55a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingLastObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingLastObserver.java
index bf745d3ed1..c8e979cc31 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingLastObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingLastObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java
index 4945730ab5..458e6db5a1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingObserver.java
index da38180751..ff84f2a4c6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BlockingObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java
index f6e7fed1cd..f0e0610ead 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserver.java
index b29a74e4bb..eff6e4a0c1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java
index 57d5f8c5c7..084ad68571 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserver.java
index a99fb49a57..4453e0ffa8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserver.java
index 2e935140ca..529d651c67 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserver.java
index 36a08269c8..e92893b9bd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/ForEachWhileObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/ForEachWhileObserver.java
index 7017239ae0..bed185523f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/ForEachWhileObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/ForEachWhileObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserver.java
index e2f2aeea5a..f109aaa5a3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java
index 5c25e3f59c..13fd2dc9bf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/FutureObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java
index f7ad3e3350..4a1e3436a9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverSupport.java b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverSupport.java
index ff28bd092c..01bebaf007 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverSupport.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverSupport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/LambdaObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/LambdaObserver.java
index c52017fa4d..6bd5dece94 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/LambdaObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/LambdaObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java
index 6f1cad3c34..b61397a208 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/ResumeSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/ResumeSingleObserver.java
index 90a29bef1c..acaa71257c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/ResumeSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/ResumeSingleObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/SafeCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeCompletableObserver.java
index d9e929c234..18e16383af 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/SafeCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeCompletableObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/SafeMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeMaybeObserver.java
index a6e794b1fd..320ac53427 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/SafeMaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeMaybeObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/SafeSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeSingleObserver.java
index 6757350756..3e73d1e639 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/SafeSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/SafeSingleObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmb.java
index 14e8ae464b..60fa3ce4c6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmb.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmb.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletable.java
index d006329aea..13e582e764 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java
index da002c0dd6..c5fd3279d6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
index c3458e4cd3..ebfe155c3c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArray.java
index c423c37587..e87968e774 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java
index ef801a1646..73510018ff 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreate.java
index 4004630756..b721cbb351 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java
index c451413f49..2a7763bb52 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDefer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelay.java
index 49c25bf6e1..c21134569b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelay.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetach.java
index efd28228fa..d01d297495 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetach.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOn.java
index 16f9fa159c..bd213b5fc4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinally.java
index 425ed4caea..02fa08cdb0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinally.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnEvent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnEvent.java
index 63a408efc4..dfa24b000f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnEvent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableEmpty.java
index e18ccc9421..7c18a4ddc9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableEmpty.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableError.java
index 70d4e41006..8d2cb2fcc2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java
index bd4250c447..80c95806b8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableErrorSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java
index 82bec67c92..53cfc2615b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromAction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java
index 57764950df..90f9266934 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java
index d91133e502..25dffbbebf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java
index 6baeb7a87e..4205d1141c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java
index 60332d8db2..79f2efb470 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java
index b035f142d9..d55fc30339 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java
index e3e29188a0..8b45e6b5f0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromUnsafeSource.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromUnsafeSource.java
index 02857d4692..dfc0356bf7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromUnsafeSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromUnsafeSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHide.java
index 16708ee90e..536855a7b7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHide.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHide.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLift.java
index 58356a73dd..6749689bcc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLift.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLift.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java
index 15dd320cad..198ba94b1a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterialize.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMerge.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMerge.java
index 9d916d84b6..2528fe2f3b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMerge.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMerge.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java
index 49037b4c65..56095221cc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArrayDelayError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArrayDelayError.java
index b939396c9f..85b4c61225 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArrayDelayError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeArrayDelayError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java
index f7f4c068a6..cb62974753 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeDelayErrorIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java
index 728b372a30..3f2dce90e1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableNever.java
index 8c11621a7c..17bc2cc140 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableNever.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableNever.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOn.java
index 8bccc8ced0..b48ade189f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
index 6d87a4275e..bebb401e48 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorReturn.java
index c8fa43499f..9cd91262a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorReturn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeek.java
index 04955c6931..aeba5381b5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeek.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeek.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java
index 1d3bd7a3a0..785501511a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOn.java
index f76ac93595..748602f978 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilCompletable.java
index bd7e519a17..364484ab10 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeout.java
index 1a38bb383a..80f40dfd72 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeout.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimer.java
index 4e271af773..b50fd5db2e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java
index 9a6c0326a1..346267ce13 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java
index 84eea97c8d..ccf1a9e504 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToSingle.java
index c35d909796..58e47247df 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java
index 3476a65b25..648e6529e2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsing.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
index 36ba2992cf..62c7d07a88 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractBackpressureThrottlingSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java
index d83f65c347..4a9484f743 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
index 51015ce918..acb72324f8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java
index 1cc469a1b9..7628776ae0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java
index d679dd937f..7c41634c55 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
index b8e79eda54..9704d2d210 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java
index 84ea50cbf7..7f8271733d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAll.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java
index 8d1bf998ef..03d269e738 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.Subscription;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java
index ff650b5719..5646fdb993 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmb.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java
index d0adcb6dbe..b09dce4c03 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAny.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java
index 7ca8a6b428..1b210b82d4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnySingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.Subscription;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnect.java
index c8bb4a7d1a..8d4b428c2b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnect.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
index 26287a0ccc..22cede1410 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingSubscribe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
index 3fe2fb1a96..a1cb792f08 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBuffer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
index 251144a1d2..2a9ec53d68 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
index 8d23e3c7bc..e543272a39 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java
index 854e0460ed..89749acaef 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java
index 25d5fb71a3..ee52769e69 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
index b8751a23f9..8f45d62404 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollect.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
index f159911fba..714bc92eea 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCollectSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.Subscription;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
index 8a1fea8346..69ab7a71c5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java
index 81834bba61..34d4248514 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
index 9409bc7a2e..6d68ab9455 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
index ead625a829..cd4e6f6936 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java
index 36d465d190..218f90c2a6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
index fba627c7ed..9dfb9f59b7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java
index 31729e450f..81ac13776a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java
index b7db7fd093..e82076533a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java
index c93ee51ba8..bfe900ab2e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCount.java
index 7858180b09..2c32dd4d76 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCount.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCount.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java
index 928f36209c..750f722dbc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
index b7091c31f9..02c49bc01c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
index 16c666b283..b1066c0133 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
index 82ae29d497..35bfaec397 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java
index 6c3d8f9008..b3ea3f1ecc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java
index e66acd39e9..469d0dd48b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java
index c4e199c7e2..2f12cc6e4e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOther.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.concurrent.atomic.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java
index dc2de8e389..10806f5776 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerialize.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java
index e03ee6094b..8d755b8ad3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetach.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
index bc62429611..588ebd8aa1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java
index 6eb323625d..b73c8b494b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java
index 7aa451e1f6..92819ec8b0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java
index 9373819291..d43173e144 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
index 2e6d45d5e7..69ecac86c0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java
index a75881d2ba..8b56c38c70 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java
index 91c9c0bee7..eecd3d1c17 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAt.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java
index fc30483fd2..f62439c577 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybePublisher.java
index a474b03280..b6b16a3e40 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtMaybePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java
index b743b6a3b7..95b32bde6d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java
index 4a9bbe7d32..a5757c29f0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableError.java
index f65410ff11..190eb53c6b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java
index 790881a160..3a58f13023 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
index 184efcc203..58f0b23c02 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
index 2960cfc510..b69a6e2895 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
index 6032dcdd33..2d604e5157 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
index ffb5763f14..74bcf80a15 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybePublisher.java
index f300607052..acc527215c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
index f733eb7fa5..f1340c6cae 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSinglePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSinglePublisher.java
index 457a728523..570ef96f78 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSinglePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSinglePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
index 06f0b650e6..07c3c2e61a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromAction.java
index 2d683e7601..693f40ddb4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromAction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromAction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
index 9b9a4c66f4..a192ec92fc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java
index 603f09abae..e2a331d2f0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletable.java
index 78b37325ca..c4b15b947d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java
index 57dc02774f..0fef368287 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromFuture.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
index 5c0642021d..a20a3cfdab 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java
index 459228f549..664dbf4acf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromPublisher.java
index df575a0274..a021846388 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnable.java
index b163f1b7ee..0d503d4668 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java
index 84fbae7eec..ca2a331396 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java
index 2feda7ad97..3639d64eeb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
index f4df324110..febc10e76a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
index e832cf8950..7060e60733 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.flowable;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java
index 17d84f178a..bc9b47011b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHide.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java
index 9afee2e50d..c380f88750 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java
index 4eaced342e..19d8546d2d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java
index 41dc08d920..781d475872 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java
index 9ef04ea11c..536e36c2ea 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java
index e9580f40c6..7c556acdac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
index 3406b7411d..18bd95b33f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java
index d17c9644fa..0ed022fc9a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java
index 936e68c211..056dfe9201 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java
index 70346f3555..ef4fb1a015 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLift.java
index 5f92e95652..99e4075bc4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLift.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLift.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
index 6bae806972..f840159b8f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java
index b01d6dc5a0..be2d78062e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotification.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapPublisher.java
index 159efcea6c..cc8ccb8fe8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java
index 2b361427b1..7a806b8d5d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterialize.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java
index a0725a1d64..ccd48a78fa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java
index 7d3be91bea..4309ebe91c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java
index 997ad3fa2e..75d44b195d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableNever.java
index 9dc0611920..83aeb1533d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableNever.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableNever.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.Subscriber;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
index 1ec41a6374..efdc68c789 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
index 19d28291ba..665a67d2e1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
index 6e458356b6..9b0b8a7b20 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java
index 0db3cd3cc2..799c5dbca1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDrop.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
index ea0a92af52..03e668b2ba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
@@ -1,11 +1,11 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
index cbbca5c9f2..1a98831bd2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
index 8d38e9822a..9a6abab89c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduce.java
@@ -1,11 +1,11 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java
index 904be881ec..faed723240 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWith.java
@@ -1,11 +1,11 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorComplete.java
index c477917f35..a0999f25c4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorComplete.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java
index 7c9de4a748..cb33b81a2f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorNext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java
index 4fe88985a4..85a375fac9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
index c1d5675cf1..d6d90c11bf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
index 26dbaa7f4b..508dcb623c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.flowable;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java
index 9c14349eb9..417e39350b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java
index 8ae2f333ae..41c8b985e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java
index 2aa1d71db0..99bc861519 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduce.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java
index aded7967b8..6541fee6bb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java
index 715cb49c0a..a5a8cc40cb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceSeedSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java
index b2aaf836d7..9d27a19668 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java
index 1bce5a4dd7..0c9f17b0bd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCount.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java
index 3acb03fb76..ffc90b8f4b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java
index 70df0e949d..1d527fa59c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatUntil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java
index 5371930b5f..a2bfa250e5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatWhen.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
index 4423747632..69c7c0ce8a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java
index 62b4852849..8c8a0e960e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryBiPredicate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java
index 75350871c4..a954a09300 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryPredicate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java
index f4129d7be8..9babc65472 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWhen.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java
index 4a20a2b95f..778f3faf21 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
index 17e1644749..e17ad04a66 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
index 4abae183b4..cb6471b878 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java
index 0199189204..84c348adfb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScan.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
index 21c88ab7bf..f001937512 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
index cc65e1d37e..30e21b0ebd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java
index 05d99e4e49..a13f5c3634 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java
index 2cd7df3369..4c43ff9c6f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerialized.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.Subscriber;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java
index 068385289a..02077e5444 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java
index fac74c9cd8..51beeff27c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java
index c24b45a760..8a4f7fe339 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java
index 2aecef3e10..d9c2f49d1e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkip.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java
index 5908d6d0b0..9f19ee86ba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLast.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java
index b56224cbdf..4f5f045150 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java
index 8de843142c..c0cc0688e1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java
index 62ee5ebdbe..be88184f38 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java
index b7fdd91e9f..7d4a51f0f2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java
index b2ad9db0d0..1d45216f14 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmpty.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
index f7e2764460..9c2a0fe78d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java
index 15d06f087f..ea5ca1c4e1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTake.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java
index 5098b589fd..ad26f45124 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLast.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java
index e4b674704d..43d3bf4446 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOne.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.reactivestreams.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java
index a7c2ab3343..5ee80e5144 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java
index 9a30bda905..b105b34ca2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java
index 9c927cca5d..6ea62f6975 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java
index a8ec19c22a..a57bb14c0a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java
index 5bcd8157d3..ea8d4f13eb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
index 918e2ea6d7..c12399e1d1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
index 989eaaf4b2..e6cb5ffdcc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java
index eb9ec1fbd9..1601814c98 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeInterval.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java
index 976ab10a05..506132f595 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeout.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java
index 351099500e..67d612011d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java
index 6c172320de..dd33daea0f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
index 18d8a86de4..2b7c19e269 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java
index aea4eb3270..5e65b48e08 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java
index ee9d8f3cc7..dd8c4ce4cf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
index 49fe0b8fb4..8f34a6e414 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsing.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
index 1f139bad1c..51e50a98a1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
index c86d3faab1..1dcfd4e529 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
index f6248b3355..3a1390e0fa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowSubscribeIntercept.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowSubscribeIntercept.java
index 8f6cf0a2da..8ef2204c97 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowSubscribeIntercept.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowSubscribeIntercept.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -45,4 +45,4 @@ protected void subscribeActual(Subscriber<? super T> s) {
     boolean tryAbandon() {
         return !once.get() && once.compareAndSet(false, true);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
index 89b49e857a..5df3cdc0d3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
index 81d3544dd0..56d7bb93fd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
index be9166a16d..959212b381 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.Arrays;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
index d3da152716..12f5ef8ddc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java
index 1fb9777a50..25d4df529d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstream.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstream.java
index ed559c96dc..348bb48227 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmb.java
index b87390e847..802075b2ab 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmb.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmb.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java
index 05c1593707..f9080a1282 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserver.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserver.java
index 774511f291..c94c7d4929 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java
index f77a59c364..889e229b64 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java
index e889adfe1a..3b4b87399a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayDelayError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java
index ee6e87cbe0..b777f4c751 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java
index 8737c6ae37..c1154067f5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContains.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCount.java
index d687e6ac1e..cd2bececf1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCount.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCount.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java
index 24293b895b..1a6bc60d31 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java
index ccba4e0041..a1ffacef74 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDefer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java
index 3e6922a339..5f13010781 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelay.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java
index 7797a968a5..eebddc3c87 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java
index 7de18c70a5..7cd54da714 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionOtherPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java
index 6bdc5d1a98..ecbd84a274 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayWithCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerialize.java
index d5d3ed25cd..80b76d3171 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerialize.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java
index 595c362917..7dad3b0cf2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetach.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java
index 28943223f0..c8f4799789 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccess.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java
index 0078cf88b1..0d8dfe8de2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinally.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java
index eccc36c606..a2771dcb8c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycle.java
index 3355c79014..0399329362 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminate.java
index 7443b147a0..6c3494ac96 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java
index 4b3361998e..32e8a7abdc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java
index ddcfc7b3c5..bf940b8223 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java
index fc2f50066e..ed9c391f02 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java
index 20bb1e03a8..360b729933 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorCallable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java
index 2ddf5fff27..833edb75f3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java
index 0535447881..aa3cae5e5c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java
index da5cfe56b8..c57caee8f7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java
index 10fc003bf8..1611fddfff 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java
index 40ca98c351..322a73177f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java
index c5c24995b1..2018274b1a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
index ffe6ee5e20..d91bd46da6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotification.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
index 999b22f836..e88dd6fc3d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java
index 21d306095c..485cf69ea1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatten.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java
index 5bdf86f904..3d9cf428cf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromAction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java
index 088f2e14f0..592b02fad2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java
index 5cb73e821c..f6ad406e35 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java
index acc93b3ea6..e506a32265 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFuture.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java
index 4c83bbeee7..a102e4b945 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java
index c74a73ee25..8fe691b767 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java
index 38f0afdb62..6eaf31ee64 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java
index 4dcddd0c27..2f87b5fddd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHide.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java
index 1c9242548d..dcdbd2cd73 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElement.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java
index 6e9c1e9d67..42f40c92f1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java
index 64fb3046ba..a9642b92fe 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmpty.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java
index a7fa1882b8..b4795a2985 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java
index 54dacb3c7d..a1af7c0bc7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java
index 8e40bbd45d..a5a6d76877 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeLift.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java
index 167e21d7fb..2d637fdd43 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java
index 2690bc4797..022d92bbe8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterialize.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
index e550b16fba..754173682b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeNever.java
index 9690c28359..a9c35c9b67 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeNever.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeNever.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java
index 7bf03b080e..5afb4beaf3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeObserveOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java
index 277e207eaf..46c15bcb2a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorComplete.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
index 97fdd7b537..a3e975570d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorNext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
index 190856d5c7..6d14b2c8cd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorReturn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java
index 3b5427ba0f..58c69839a1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeek.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java
index 543b7c2b6a..7ec1a6ad71 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java
index 3be260441c..c432b3c674 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmpty.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java
index 142e39f1f6..29e77a3e56 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -124,4 +124,4 @@ public void onError(Throwable e) {
         }
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java
index 6c9498c065..e99011e509 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java
index e86cc7c324..8e57a5ee84 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeInterval.java
index af30ee3a1d..9580976d89 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeInterval.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java
index 03783489a3..2a2581c5f3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java
index 76545730f3..e89a8d0bc9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimer.java
index a374c44ced..2b9033c66b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java
index c31ad262ab..5ce9f66103 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java
index 4b27918621..65ef0ced1b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java
index 914021c914..8f1f10d28d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java
index 807b9cac51..48ab0134e3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsafeCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsafeCreate.java
index 35621c1bbf..462a2525b1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsafeCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsafeCreate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java
index 2f07161dc9..b1d8cb6f65 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java
index 0e490d6f40..74e4250e5f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsing.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
index 85f05236b5..ac7514fb68 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java
index 839b373920..b247ca4ded 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java
index 2a3263a50a..9f46c097f6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisher.java
index c9017d0af6..7004181bcc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java
index f4e95e8a9d..a196c9dbe4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
index 398e4fb015..da6e2eaac7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
index 2838138a09..2aed83e44e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
index c0d151e6fd..987a4c11d0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybePublisher.java
index 8651cdcb60..42c1f732c2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
index 49009a722e..93f313b137 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSinglePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSinglePublisher.java
index 5b34314d81..0e1986180a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSinglePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSinglePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java
index 1bc0fb709e..9ca61ab15a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletablePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletablePublisher.java
index 5752027c23..9eae52029e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletablePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletablePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java
index 7933b4ec13..3eab4e0d62 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybePublisher.java
index 41696133e9..319247c295 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java
index 4fe83126e5..59c9cb7f8f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSinglePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSinglePublisher.java
index e64f839046..31ace1bf2d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSinglePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSinglePublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java
index d9cb5592ac..3f1c540d7d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaterializeSingleObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
index ef1dc5f023..09e634f944 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
index 82a6d5da7d..b6d2afeb2d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
index 49fcbcff83..7f2648d09b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
index 1e7090ee7d..58e7258e0c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
index 3ad2b53cbc..de30e27765 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java
index bb6ec70f85..b751afdbb0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java
index f4c9bf6c0c..fe394df1e8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java
index f5db39d5d5..ca0e2953e0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java
index d7fe0e3445..9b9cd1e285 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
index b2562d8dba..5db7515890 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstream.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstream.java
index 2225cb2d2a..dcad29a5d8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java
index dce3e2bc21..1d57eeb085 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java
index e431db42a7..4aca95b210 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java
index 75e8966ca9..0b2ea5bd34 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java
index 3ebeb0e1f0..2bbfe2b036 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java
index 3f62b4732c..0f365414c6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAll.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java
index 8c167d4c47..89e4e38a16 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java
index ffab752652..f8841956c6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmb.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java
index bda497f7ed..fad20eb6e2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAny.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java
index 6e263a0d48..ff7875fb54 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnySingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnect.java
index 393a9a3f94..d00a2fc291 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnect.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
index fe06c2099f..e173785760 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingSubscribe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
index 2688212575..6f94a97cc6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBuffer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
index 4b0027f4fe..ead3bb0171 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
index 849222505e..5892e092b9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
index e5e4383956..7628a8f685 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
index c3e7447e6e..daa9edd533 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
index 6bddb34aac..6b700addd7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollect.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
index 82f8923de3..88137432ac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
index 646ab80690..217af8877c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
index 9b03b9fc35..63a46d0f00 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
index 792940b5e0..1363292116 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
index b4cd8352b5..492547d165 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java
index 4ffc8f5490..8d97074a8c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java
index 19af4e5641..e198a0412a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java
index b2e1860110..3d69ae83ac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCount.java
index f7ab3b012f..366c4bb3db 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCount.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCount.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java
index 5796519f74..be73420542 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
index f05faf7eda..b159d1c9b3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.concurrent.atomic.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java
index 16f882d6c5..862227e305 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounce.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
index b0b19ef0dc..248d00ea23 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java
index 15b3394af7..0b3388c84c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java
index 93cbb00389..1801cce1f2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOther.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOther.java
index c594c68b00..978e4d2f32 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOther.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOther.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java
index 37f5fdadd8..2016451986 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerialize.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java
index 763fcdde97..b9c6f2bade 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetach.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java
index cd766ef559..ff377833a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinct.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java
index f18e47030d..7604db7c8f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChanged.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java
index 91051e7562..6382e6b822 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java
index 8c7ee32d09..0f087d24e8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java
index ff884192fa..f4869d19a8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEach.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java
index 835cd886b2..f185231246 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnLifecycle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java
index b8d042a532..8d8a535bcf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAt.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java
index 53b1312092..14bb368a23 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java
index bb006ca2dd..c779f9eec2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java
index d4869b70ea..38d40e62ad 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableError.java
index 7481373e7a..f25af956e0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java
index 51fec2cc68..ed7068f6a0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
index 6265a5d557..662c2410d4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
index 1db5b140e5..ae7c6f98ac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
index 039be4ffb7..62ea03a54d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
index 3547769267..323522f021 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
index e93051fd0c..5e1cae2b1e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java
index 732eb50dd3..47dbde9a1e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromAction.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromAction.java
index cccb5b5d38..cd0970f0d0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromAction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromAction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java
index 97ebfe0d4f..f84c118346 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java
index 0285b83ff2..ab4b7aa7b8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletable.java
index 4748e6a625..83bf51f7e0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java
index 5459429f4d..d6f21ad133 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromFuture.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java
index 187d0cecc3..d5f402d193 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromPublisher.java
index 14efd74eba..ade1eeb870 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import org.reactivestreams.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnable.java
index 0dc37a8993..eeda8e4832 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java
index e46cf8fe8f..7d3cd41480 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromUnsafeSource.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromUnsafeSource.java
index d34423bcd4..1f7c7bcccd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromUnsafeSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromUnsafeSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java
index 2bd9a866a1..fee8dfe26e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
index 8e259db47c..b00cca4fa1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
index 2a553fd1b1..b6a6537534 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.observable;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java
index 5b216cd44c..8d6c7a7b60 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHide.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java
index ec4a07e92a..6afab8124d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElements.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java
index 14b3a77684..10e4880b55 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java
index 5f9dce646d..89822c3e9b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Objects;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInterval.java
index 93fee0973d..c61645bdd9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInterval.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java
index 54576298a7..68d303b6ab 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRange.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
index 70f62aec03..cea80bc624 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.observable;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java
index d3448d0b41..4cc0036dde 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java
index 73e26a3972..b20119d430 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java
index 7c5433e105..049e9341c1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java
index 4aa45683ff..67dd7a0649 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLift.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java
index 4361016ec6..8f4502ba19 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java
index 1622b504d4..51883e7519 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotification.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java
index e55430c378..866ced7dd9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterialize.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java
index 1f086f7175..e1a79180d8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java
index f462075a50..1b95d8e7be 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java
index 08940cf645..6b0ebf6a45 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableNever.java
index dd476d5993..1d237491cc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableNever.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableNever.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java
index af5e78df3f..6585937626 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorComplete.java
index 6854a5ce6d..70266c14d3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorComplete.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java
index 3cf1849011..9bcc3b8dd6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorNext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java
index 54efdc62e5..24c9af4700 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java
index 8589ee3c8a..f2d4c8f0f4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublish.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java
index 687bee9548..d025a5487d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishSelector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java
index 56e277dc32..53855a46c2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRange.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.annotations.Nullable;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java
index f92decb11e..39a36e72f2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLong.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.annotations.Nullable;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java
index f5421a666e..3f66614ef0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java
index 67347debb8..f2382f6f9d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceSeedSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java
index 1de6cb1e6c..22dbaa6a1d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceWithSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java
index a806a537c6..1a5d9f55cc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCount.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java
index 2816dac708..b14549f65f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeat.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java
index 51c8b9dd65..d89fd17b83 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatUntil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java
index d3fcdf5971..87d30330ba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatWhen.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
index 3b7bff1673..102e2831b2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java
index 56de8606be..1340a5ad9f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryBiPredicate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java
index 9c4d5c748a..5c40dc6d97 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryPredicate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java
index 2a3f0b6b07..bae50456e4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWhen.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
index 3f516e8cca..f439339e15 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java
index cae3259d12..53b9aec31f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleWithObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
index c62c23c0c5..900a470c48 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java
index bd0ba2b12a..59a74661cc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScan.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java
index 89eb4046f0..f0e197db7e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanSeed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java
index 11eb694696..69867e0dd3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java
index 9169cb6465..6b79bc4638 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java
index 98f757e6f7..c57d0d9a24 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerialized.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java
index 83a8569f05..b4068e834d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java
index de4729f5e5..dd8032a400 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java
index e0000dc7a5..0fe5787c1b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkip.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java
index 3e45e38a79..68fabb3ac7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLast.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java
index f70620b5c0..78f9df81bb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java
index 457158200d..87535fabf2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java
index d6dad232b5..1614b0b472 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java
index 8eac3ae04e..5eaeaa5035 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java
index b697afc1c9..6aa1d84ecf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmpty.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
index dbbb3da35a..8603598688 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java
index 63f37db46e..8cc73b1b56 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTake.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java
index 80f408de32..b0b04c141d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLast.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java
index f2766db765..cb243dd3bd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOne.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java
index be6f83db79..c457be723f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java
index f1d5d00a0d..c32f3a6f65 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java
index 1727a24fb4..5183a6026e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java
index 5c251c969e..1b56e6cf34 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhile.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
index 138cb3f869..889c203dd7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java
index 253f5d3501..8f0b2cc250 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java
index 7dd47ec03b..4a4e6a787f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeInterval.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java
index dfef0e74e6..1922251d54 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeout.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java
index 29b1772930..d0f5695143 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimer.java
index 778388f39b..3c9500996e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java
index ed64de962a..e75986c77c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java
index 0ac41b12d6..de4db3ecf1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java
index 2c5f748477..d06d64f34c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
index 90954d41d8..1ffdef32d6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsing.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
index 1bd0e2f32e..c742ad6288 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindow.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java
index 503a5cbd29..a1ecb8e869 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundary.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
index 367ddf2d02..9f2f085c7c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowSubscribeIntercept.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowSubscribeIntercept.java
index da6f96f2a3..4cc879662d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowSubscribeIntercept.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowSubscribeIntercept.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -43,4 +43,4 @@ protected void subscribeActual(Observer<? super T> s) {
     boolean tryAbandon() {
         return !once.get() && once.compareAndSet(false, true);
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
index 5c295f4608..64ecce85a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java
index b7e283c515..95b21187a7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFrom.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java
index c9f2a6b57a..f8327b8284 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromMany.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.Arrays;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
index ace2d748e5..f47028efd7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
index c1881bdca3..7c8f5e6d0e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java
index 4245417ce7..a3c797fee6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObserverResourceWrapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
index 895fc5cf86..60e36beed4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelCollect.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java
index c3500812a2..ebdcf0bdf3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelConcatMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
index 4ef002df03..b8fa314970 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
index 8fd4348916..b775db0ab9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
index a6166b18c6..d27b6801cd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java
index 372c3cf70a..227521143a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java
index e83ac76715..9e6c45a9ca 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFlatMapIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java
index e3918fe37c..d2512ccd7f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
index 9a380d8ff9..16f67af730 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
index 57f82230a0..c0dc9df522 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
index 3787a52f05..fa48833ca5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
index d203e2e742..c48ad17dda 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
index 20c28ef581..42f65567ca 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelPeek.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
index c80d0b7216..b955ca711a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduce.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java
index a47bc5b898..2e24b9e256 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelReduceFull.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
index dc05a6a4aa..dbc66f37f8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java
index 3d4347d283..fb20bb65b9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelSortedJoin.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleAmb.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleAmb.java
index 7fd1dba29f..24ff7eabed 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleAmb.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleAmb.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java
index a8cb63f0ed..7f0848e4c1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCache.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleContains.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleContains.java
index aaa249a6e8..2497fb2047 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleContains.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleContains.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java
index 8c5331c87b..c0f6c4b1d0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleCreate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java
index 24a35fbdee..ddf2b2c347 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDefer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelay.java
index 12da3821fc..1a92d389fa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelay.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java
index c3f7458459..164a502992 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java
index 44dbc50ecf..58ed261e71 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java
index 1d8a601a02..12eeb7fd13 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java
index d8e11665c8..1f2ffb21dd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayWithSingle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java
index 6d072f4cea..e573560e76 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerialize.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java
index 72e1f3def3..2a9acc8a19 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDetach.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java
index d7ab5e4c79..51b73f0216 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccess.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java
index eca7ebff15..651c9ee60d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java
index 0ba60a6493..a64060cc97 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinally.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java
index 262f4f7d43..8c9fd1cb1b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnDispose.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnError.java
index 87061fdafe..dd24ac210c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnEvent.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnEvent.java
index 9aa9fccd8a..de53462380 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnEvent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnEvent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycle.java
index 288e8970cd..2d4e15f27c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycle.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.single;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java
index 24a24caac9..567f95404b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSubscribe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSuccess.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSuccess.java
index 2efec6acdd..855dc7e388 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSuccess.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnSuccess.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminate.java
index 1bb0ca2dec..d6f5dea7fa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminate.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
index 5d56487570..d11f938a2e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleEquals.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleError.java
index 89b9bc3baa..f016d2c9a9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleError.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java
index d622f83fae..ff38538b09 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelector.java
index d1051f3357..7f6f58de84 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelector.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java
index d914799640..a06241c56c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
index cd16312620..6d69726588 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java
index add137d7cb..c07131da8c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java
index d810f8f5c3..c58e6aeeae 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybe.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotification.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotification.java
index 1ba9796b7c..bb592a74a9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotification.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotification.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
index e453f28b68..59a067832f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java
index a78dde3e36..d1a6b73384 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisher.java
index e18394eb1a..860e47f904 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java
index e6fd32603f..83e2dc4780 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromUnsafeSource.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromUnsafeSource.java
index 328ab873b6..e09e38c833 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromUnsafeSource.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleFromUnsafeSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleHide.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleHide.java
index 34f5dc4aed..01a4e36d6e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleHide.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleHide.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
index 30d1192a17..5df3dae35d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java
index 4fd2387f96..ceb94b93a1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleJust.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java
index 8382b2f1b8..5b127e58cb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleLift.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java
index 534b41495c..3fb20516ce 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMap.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java
index 1ffbfe073a..c09d28ffd1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterialize.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleNever.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleNever.java
index ea76fac50d..0feefe196d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleNever.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleNever.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java
index 168a88ee8e..e513e16fa2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorComplete.java
index 7be9bd817c..bd083cddb1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorComplete.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorReturn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorReturn.java
index 1a606d2750..d1f8b66fd9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorReturn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorReturn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java
index 070b244747..554a2a254b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleResumeNext.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java
index 3347fc1989..56cf684e9f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java
index 50e8b89763..fb5d0989f6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntil.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeInterval.java
index 2eac3bbc3a..f6d65f7c14 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeInterval.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java
index f529d02446..609747d1d8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimer.java
index 5188f3a2c9..07748952c8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowable.java
index 890f6b0569..e692dea5b9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.single;
 
 import org.reactivestreams.Subscriber;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java
index 810adaea3f..4586317740 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.single;
 
 import io.reactivex.rxjava3.core.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java
index 9a78d61bb7..4b18599c84 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java
index 57f9daf263..55ab6c31ff 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleUsing.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
index 6b865dcda1..b53d2f2184 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArray.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java
index ad393987be..935550ab47 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
index 31fe6eca9b..57ecbfc289 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java
index c86a109f81..b33d060b66 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java
index 2bd61dcc15..b199627a08 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
index 7ae69a3ea5..deed734eff 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java
index cdbdda3d83..f6845e660e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ComputationScheduler.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.schedulers;
 
 import java.util.concurrent.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java
index 370fb5d8a2..72ac8ef525 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancel.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
index 2e76702b1b..534513448a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java
index 21fbbead83..e2430e74cb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
index ad85765ed6..1fd37f5d93 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTask.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
index 13c62fcb10..cfe9520685 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/IoScheduler.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadScheduler.java
index 1cd48ce1e0..1c29efddc5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadScheduler.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
index a342b246b8..5945ac6c38 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NonBlockingThread.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NonBlockingThread.java
index f800f1ac4e..ff6dd5c706 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NonBlockingThread.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NonBlockingThread.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java
index 5bd0614b89..9b3a7968c3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
index a3b90bdf76..8a7d0ebe03 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
index 4959342d06..c0d10ac126 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
index 063c48163b..14c197bccc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupport.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupport.java
index d42fa32cfb..b1e186adc9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupport.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
index 333d4ded9e..043569334c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
index 4da5b161b8..0780aea610 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.schedulers;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
index 2f42acbf35..5de8e44f05 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.schedulers;
 
 import java.util.concurrent.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
index 5ddd867783..7ed777f08f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java
index ae1e72c3f8..21728b69f1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java
index b0944cacec..3a24967ba9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingBaseSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingBaseSubscriber.java
index cf93064c6a..68fa0df3eb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingBaseSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingBaseSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.subscribers;
 
 import java.util.concurrent.CountDownLatch;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingFirstSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingFirstSubscriber.java
index 228023b3d9..1226eca845 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingFirstSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingFirstSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingLastSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingLastSubscriber.java
index 1889193770..05be9d79fa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingLastSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingLastSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriber.java
index 9ddba51e3c..4617833fc4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriber.java
index 7ea697a3ab..a55f4ae4fa 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -136,4 +136,4 @@ public void cancel() {
     public boolean hasCustomOnError() {
         return onError != Functions.ON_ERROR_MISSING;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriber.java
index 5fca99286a..11123962f2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/ForEachWhileSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/ForEachWhileSubscriber.java
index 34d00eef9d..cb5ff01a13 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/ForEachWhileSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/ForEachWhileSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java
index d44e4a0dd0..145195e2cc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java
index 955f9d87b1..dfc3029c22 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberSupport.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberSupport.java
index e7deb5c411..3844c5b981 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberSupport.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberSupport.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriber.java
index daa76fdfbf..f137237e97 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java
index c66505a071..0fa4273ad2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriber.java
index ab9f9ba799..ceec9f6b90 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java
index f351126044..265acd60a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java
index 4c9b6b4930..df85e95324 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscription.java
index 628891a7e6..ce4b2b5ac8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java
index 62973e7440..d33d05c8d1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java
index 862fb51b4b..1922562340 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java
index 54d33f26cb..a6bde92632 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BooleanSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BooleanSubscription.java
index 117b09b60c..2d7f01ef05 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BooleanSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BooleanSubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.subscriptions;
 
 import java.util.concurrent.atomic.AtomicBoolean;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java
index 155f9ebb48..e941867b99 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java
index 2da5f529a1..75ebe2da30 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java
index e854c11f92..c3aa99c7d1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java
index 44c5fe5845..7d964224eb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -12,18 +12,6 @@
  */
 
 package io.reactivex.rxjava3.internal.subscriptions;
-/**
- * Copyright (c) 2016-present, RxJava Contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is
- * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
- * the License for the specific language governing permissions and limitations under the License.
- */
 
 import java.util.Objects;
 import java.util.concurrent.atomic.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java
index 8cfc3f5a7c..922ac9c3c9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList.java b/src/main/java/io/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList.java
index a2a78e7b7e..3c17b88009 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/AppendOnlyLinkedArrayList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java
index 7338c99040..6379cfcab8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ArrayListSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/AtomicThrowable.java b/src/main/java/io/reactivex/rxjava3/internal/util/AtomicThrowable.java
index 222008e216..3ef92cb77a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/AtomicThrowable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/AtomicThrowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java
index 4ccfe67845..73b15382c8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/BackpressureHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import java.util.concurrent.atomic.AtomicLong;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/BlockingHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/BlockingHelper.java
index 57d9f863b3..84acadee6f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/BlockingHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/BlockingHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/BlockingIgnoringReceiver.java b/src/main/java/io/reactivex/rxjava3/internal/util/BlockingIgnoringReceiver.java
index f0d90e4708..8d4c1fb76e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/BlockingIgnoringReceiver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/BlockingIgnoringReceiver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java b/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java
index 63fd12dc99..5d5246719d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ConnectConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/EmptyComponent.java b/src/main/java/io/reactivex/rxjava3/internal/util/EmptyComponent.java
index 1ffc9c51d4..47390f57cb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/EmptyComponent.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/EmptyComponent.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java
index 01b95a0a11..0e72353800 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/EndConsumerHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ErrorMode.java b/src/main/java/io/reactivex/rxjava3/internal/util/ErrorMode.java
index e3ff3d5fdb..02389f0b7a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ErrorMode.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ErrorMode.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java
index 8b9d62317a..1ddbb8aca1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ExceptionHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java b/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java
index 378327ea4c..e1bf5596e2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/HalfSerializer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java b/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java
index 46236ff293..15c2884266 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/HashMapSupplier.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java b/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java
index 08d675a4af..92ff9d30a6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/LinkedArrayList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import java.util.*;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java b/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java
index cd6c8e9750..fb643fcff3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ListAddBiConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java b/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java
index 64d9faff71..a736309019 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/MergerBiFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java b/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java
index c37aa71da2..c27486d9cf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/NotificationLite.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import java.io.Serializable;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/ObservableQueueDrain.java b/src/main/java/io/reactivex/rxjava3/internal/util/ObservableQueueDrain.java
index c0187e9cc2..6d69b375d4 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/ObservableQueueDrain.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/ObservableQueueDrain.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/OpenHashSet.java b/src/main/java/io/reactivex/rxjava3/internal/util/OpenHashSet.java
index c5bf3bb676..9967ca831d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/OpenHashSet.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/OpenHashSet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/Pow2.java b/src/main/java/io/reactivex/rxjava3/internal/util/Pow2.java
index dd6df01d9e..fd30ee04fb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/Pow2.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/Pow2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -15,6 +15,7 @@
  * Original License: https://github.com/JCTools/JCTools/blob/master/LICENSE
  * Original location: https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/util/Pow2.java
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 public final class Pow2 {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrain.java b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrain.java
index 4a84e5e6ed..481cbe0012 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrain.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrain.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
index 9808e2fe0d..64178c3ee1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import java.util.Queue;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java b/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java
index a62efd154f..b74f1bccf6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/SorterFunction.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/SuppressAnimalSniffer.java b/src/main/java/io/reactivex/rxjava3/internal/util/SuppressAnimalSniffer.java
index e57d883036..b55fb0673b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/SuppressAnimalSniffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/SuppressAnimalSniffer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java b/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java
index 33e1e18a56..798a05a6dc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayList.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
index 9a0b54c2cf..231d0357fe 100644
--- a/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/observables/ConnectableObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observables/GroupedObservable.java b/src/main/java/io/reactivex/rxjava3/observables/GroupedObservable.java
index 489ee1d716..baa35ce48d 100644
--- a/src/main/java/io/reactivex/rxjava3/observables/GroupedObservable.java
+++ b/src/main/java/io/reactivex/rxjava3/observables/GroupedObservable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.observables;
 
 import io.reactivex.rxjava3.annotations.Nullable;
diff --git a/src/main/java/io/reactivex/rxjava3/observables/package-info.java b/src/main/java/io/reactivex/rxjava3/observables/package-info.java
index 7fb2fc1454..93c6ad0c40 100644
--- a/src/main/java/io/reactivex/rxjava3/observables/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/observables/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
index 9c6947c5aa..458ff01ebe 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/DefaultObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DefaultObserver.java
index 42cd69e79c..29d1f16d00 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/DefaultObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DefaultObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java
index 940654b622..20bf6d59d5 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableCompletableObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java
index 092994e818..6ea1d26e97 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableMaybeObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java
index ff2eba7758..d4e6d5f5d8 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java b/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java
index 56e5c543b7..9126332b21 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/DisposableSingleObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java b/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java
index e3f5c46cfe..293847979e 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/LambdaConsumerIntrospection.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
index df05fe0169..339692d756 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceCompletableObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
index 22345e60ce..e9df1c3edc 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceMaybeObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
index f0810f4c5e..0238dd5a17 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
index efebfaa85c..b1b9049524 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/ResourceSingleObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java b/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java
index c3935e79dc..4a72e5b80e 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/SafeObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.observers;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java b/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java
index e0d32fbd7a..062a3b6abf 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/SerializedObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.observers;
 
 import io.reactivex.rxjava3.annotations.NonNull;
diff --git a/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java b/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java
index 44b129fdab..8142747ec1 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/TestObserver.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.observers;
 
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/src/main/java/io/reactivex/rxjava3/observers/package-info.java b/src/main/java/io/reactivex/rxjava3/observers/package-info.java
index dbf39cbef2..ca7ea67c0c 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFailureHandling.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFailureHandling.java
index 9e78d698e8..ce0496651e 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFailureHandling.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFailureHandling.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index 58152e2400..4a02e8416d 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java
index 7033261e65..47510faf37 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowableConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
index a10a73ead4..f35f71567c 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelTransformer.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -32,4 +32,4 @@ public interface ParallelTransformer<@NonNull Upstream, @NonNull Downstream> {
      */
     @NonNull
     ParallelFlowable<Downstream> apply(@NonNull ParallelFlowable<Upstream> upstream);
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/package-info.java b/src/main/java/io/reactivex/rxjava3/parallel/package-info.java
index 7c9cc785ad..09605021f0 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/package-info.java
@@ -1,21 +1,18 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
  * Contains the base type {@link io.reactivex.rxjava3.parallel.ParallelFlowable},
  * a sub-DSL for working with {@link io.reactivex.rxjava3.core.Flowable} sequences in parallel.
  */
-package io.reactivex.rxjava3.parallel;
\ No newline at end of file
+package io.reactivex.rxjava3.parallel;
diff --git a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
index ce4cee031b..c5b0797ba3 100644
--- a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.plugins;
 
 import java.lang.Thread.UncaughtExceptionHandler;
diff --git a/src/main/java/io/reactivex/rxjava3/plugins/package-info.java b/src/main/java/io/reactivex/rxjava3/plugins/package-info.java
index a3105506a4..49390584df 100644
--- a/src/main/java/io/reactivex/rxjava3/plugins/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
index 8037c67ffe..12a96ad5ae 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.processors;
 
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index 54f16af80d..681d605228 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
index 86622298f6..2bfbb33bd0 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/FlowableProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index c1e47500a1..55e19f7d1e 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
index b507a2225b..c02a0e937e 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.processors;
 
 import java.util.concurrent.atomic.*;
diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index 1c92e9d0ef..1a0fdfebfb 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java
index e7740b6523..e40d935c51 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/SerializedProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
index 7d7e20a075..6ba938e9e4 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/processors/package-info.java b/src/main/java/io/reactivex/rxjava3/processors/package-info.java
index be2bb7c954..f4119c9ba8 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/SchedulerRunnableIntrospection.java b/src/main/java/io/reactivex/rxjava3/schedulers/SchedulerRunnableIntrospection.java
index aec3170138..97f8efcc9d 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/SchedulerRunnableIntrospection.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/SchedulerRunnableIntrospection.java
@@ -1,8 +1,11 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 83fee3be34..0c0ecbdbe5 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
index f016beca18..a9aa3285f5 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
index a7b6cc46e7..3ef1940984 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Timed.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/package-info.java b/src/main/java/io/reactivex/rxjava3/schedulers/package-info.java
index 4bbd9e0da2..1f96d0fd2a 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/package-info.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 /**
  * Contains notably the factory class of {@link io.reactivex.rxjava3.schedulers.Schedulers Schedulers} providing methods for
  * retrieving the standard scheduler instances, the {@link io.reactivex.rxjava3.schedulers.TestScheduler TestScheduler} for testing flows
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java
index cfeafcd4a8..dd4957fd39 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/AsyncSubject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
index ce89f7b856..465ddcbebc 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java
index 9753d276a1..57be7dbced 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/CompletableSubject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java
index f06d8c1aae..39dbb78d9c 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/MaybeSubject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java
index 2c3a847832..6c2d5ac033 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/PublishSubject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
index dfa3032ad3..4d5eb3335f 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java
index 137cefc895..09a45b1da2 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/SerializedSubject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java
index 6f8f8b6f35..7559f0329d 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/SingleSubject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/Subject.java b/src/main/java/io/reactivex/rxjava3/subjects/Subject.java
index 35d26d49b5..b76a15da33 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/Subject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/Subject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
index 63afa9c335..988f51640e 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/package-info.java b/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
index 88fde8391d..60c09e10c0 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java
index 6a936eb8d9..9f8385b586 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/DefaultSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java
index 566b0097f7..a321283018 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/DisposableSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
index 7d9411048a..95dccfd2b1 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/ResourceSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
index 0db19796fa..8556d847ba 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.subscribers;
 
 import org.reactivestreams.*;
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java
index 9698d97e21..1ea8b4021a 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/SerializedSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.subscribers;
 
 import org.reactivestreams.*;
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
index b3a67a89fe..1d96e7cfd3 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/TestSubscriber.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.subscribers;
 
 import java.util.concurrent.atomic.*;
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java b/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java
index 348792062a..592aea185b 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/package-info.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 /**
diff --git a/src/test/java/io/reactivex/rxjava3/completable/CapturingUncaughtExceptionHandler.java b/src/test/java/io/reactivex/rxjava3/completable/CapturingUncaughtExceptionHandler.java
index 66738a5513..8379925bee 100644
--- a/src/test/java/io/reactivex/rxjava3/completable/CapturingUncaughtExceptionHandler.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CapturingUncaughtExceptionHandler.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.completable;
diff --git a/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java
index c805f68c6f..3d3ad65968 100644
--- a/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableRetryTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2017-present, RxJava Contributors.
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
diff --git a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
index 904a31701a..9f64b81d12 100644
--- a/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/completable/CompletableTimerTest.java b/src/test/java/io/reactivex/rxjava3/completable/CompletableTimerTest.java
index 17f1e7beae..cad1780eb6 100644
--- a/src/test/java/io/reactivex/rxjava3/completable/CompletableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/completable/CompletableTimerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/core/BackpressureEnumTest.java b/src/test/java/io/reactivex/rxjava3/core/BackpressureEnumTest.java
index 583899167d..e007bfe8ef 100644
--- a/src/test/java/io/reactivex/rxjava3/core/BackpressureEnumTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/BackpressureEnumTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java b/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java
index 68006e3c64..1d0ddd5e40 100644
--- a/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/ConverterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/core/DisposeTaskTest.java b/src/test/java/io/reactivex/rxjava3/core/DisposeTaskTest.java
index 64a13fdb6d..d429b588f7 100644
--- a/src/test/java/io/reactivex/rxjava3/core/DisposeTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/DisposeTaskTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java b/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java
index 1cebd84f0d..b26262c15c 100644
--- a/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/NotificationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/core/PeriodicDirectTaskTest.java b/src/test/java/io/reactivex/rxjava3/core/PeriodicDirectTaskTest.java
index cd8469ae07..077171acdb 100644
--- a/src/test/java/io/reactivex/rxjava3/core/PeriodicDirectTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/PeriodicDirectTaskTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/core/Retry.java b/src/test/java/io/reactivex/rxjava3/core/Retry.java
index a738e0e3c7..5d543afb1c 100644
--- a/src/test/java/io/reactivex/rxjava3/core/Retry.java
+++ b/src/test/java/io/reactivex/rxjava3/core/Retry.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -75,4 +75,4 @@ public Statement apply(Statement base, Description description) {
     private Statement statement(final Statement base, final Description description) {
         return new RetryStatement(base, description);
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java b/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java
index 8eaf638916..1e6d9fd33d 100644
--- a/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/RxJavaTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import java.util.concurrent.TimeUnit;
diff --git a/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java b/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java
index e7c095f152..bbb36f1594 100644
--- a/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/SchedulerTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.core;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java b/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java
index 20725c80fa..c672196b60 100644
--- a/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/TransformerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
index 06394de7ab..16ebfcb9a3 100644
--- a/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/core/XFlatMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
index 73d605c2cc..a8ee27b307 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
index b966a1db0f..e541d404da 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/DisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
index 3ae97dd306..544e39ad1b 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/FutureDisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
index 62248db45e..3066343301 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/SequentialDisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
index aa53f2ecb0..3a2e73582b 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/SerialDisposableTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java b/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
index 331a7dce9c..3c0735ae78 100644
--- a/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.exceptions;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/io/reactivex/rxjava3/exceptions/ExceptionsTest.java b/src/test/java/io/reactivex/rxjava3/exceptions/ExceptionsTest.java
index 3d2e1eeec4..b6aa069010 100644
--- a/src/test/java/io/reactivex/rxjava3/exceptions/ExceptionsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/ExceptionsTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.exceptions;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedExceptionTest.java b/src/test/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedExceptionTest.java
index b8a78de7dc..70ba775bc1 100644
--- a/src/test/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedExceptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/OnErrorNotImplementedExceptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java b/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java
index 8618c7df5e..efd568b120 100644
--- a/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/Burst.java b/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
index 791ec79a2f..efa0993042 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/Burst.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.flowable;
 
 import java.util.*;
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
index 7d0687dd72..07ae9c0f27 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
index ea93877cdc..7077995982 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCollectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCombineLatestTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCombineLatestTests.java
index 3adac790ae..107c5e583f 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCombineLatestTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCombineLatestTests.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.flowable;
 
 import org.junit.Test;
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java
index 5d54f9df5f..5efb4195e6 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConcatTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
index a579a82ae7..7079f833f2 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableConversionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java
index ae50092ce9..9d7ca31319 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableCovarianceTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.flowable;
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoAfterNextTest.java
index 58f21b10d3..eb6878edbd 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoAfterNextTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.flowable;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java
index b1b12c5577..f4ff588d53 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableDoOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java
index df123ee304..e15c7a1dec 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableErrorHandlingTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java
index 861d67c68d..2428d6cb04 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStreamTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStreamTest.java
index 8965376b8a..dd38b88afc 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableEventStreamTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.flowable;
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java
index 02fa0e5be7..678fbd93e3 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.flowable;
 
 import java.util.Arrays;
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableGroupByTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableGroupByTests.java
index b7e4edcab4..e37934eadd 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableGroupByTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableGroupByTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableMergeTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableMergeTests.java
index e200cd0f12..d549c3fbb4 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableMergeTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableMergeTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNotificationTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNotificationTest.java
index 2e2b95bbd8..08d1994fcb 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNotificationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
index b08d6824e5..748a12d3c3 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableNullTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableReduceTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableReduceTests.java
index 1e6abe83c9..5dd3c28cb2 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableReduceTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableReduceTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java
index 7ac13a4bd6..28549b1a90 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableStartWithTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
index 2a27aaada0..b1eb9ce600 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
index 7662f3ebdf..1fa80701be 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java
index c6db747cf1..0d2dc343fc 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleWithTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleWithTimeoutTests.java
index f84d27a00d..be94bf9d38 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleWithTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleWithTimeoutTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java
index f96a010728..2ba648282f 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableWindowTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java
index e1b2e2809b..7f77992bfe 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableZipTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java
index e1b858507a..a24562a854 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/SubscribeWithTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java
index 8871cc4e50..c0319dfd3a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/ArrayCompositeDisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposableTest.java
index 03f54c9218..ab40e7c03c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/CancellableDisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
index 0332b02556..a3102ea44f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/DisposableHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java
index b66f27036e..5851b79f88 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java
index 0325d00500..1a0070e22d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/ListCompositeDisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java b/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
index d919e8dfc8..635fcc4472 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/functions/FunctionsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
index 16c182061d..fb7e912da4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/functions/ObjectHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java b/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
index abc3332381..67144abea2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/CollectWithCollectorTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CollectWithCollectorTckTest.java
index 99fb2dcff9..4745b9c809 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/CollectWithCollectorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CollectWithCollectorTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStageTest.java
index 3519cc5454..6e9bf78e1d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStageTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableFromCompletionStageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableToCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableToCompletionStageTest.java
index 91fdfb9cde..8917b1c675 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableToCompletionStageTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/CompletableToCompletionStageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0HTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0HTckTest.java
index 57365f5857..e499ac1b9a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0HTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0HTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0TckTest.java
index 232ded7321..fa33b67ebf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0TckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream0TckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1HTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1HTckTest.java
index aa65a19ca7..ee1a27b548 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1HTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1HTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1TckTest.java
index 20e99b1ec1..21492d61b8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1TckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream1TckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2HTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2HTckTest.java
index 0c06e4de40..14e44d69ee 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2HTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2HTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2TckTest.java
index d799a720c9..c42e6f7a80 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2TckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlatMapStream2TckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableBlockingStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableBlockingStreamTest.java
index 2cf932f40e..be49e2ed11 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableBlockingStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableBlockingStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorTest.java
index ecef7665e0..3a8a1d5b19 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableCollectWithCollectorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java
index 548a66a709..31e326a3a2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStageTest.java
index 8a71bbd9b3..aebeea58b6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStageTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromCompletionStageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromOptionalTest.java
index 6676bcee61..743dc0f573 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromOptionalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
index 7d5f7a0a74..edf5a3e546 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
index 3e3f418790..04d9bf7e5b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java
index 882fd83dfb..d63a81c8ef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrDefaultTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrErrorTest.java
index c34e4739fa..763a1e0444 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableStageSubscriberOrErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromCompletionStageTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromCompletionStageTckTest.java
index 2c48611cd9..6d2e9d2155 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromCompletionStageTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromCompletionStageTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional0TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional0TckTest.java
index 76c1246eb3..ff30aa4b2d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional0TckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional0TckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional1TckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional1TckTest.java
index 27e596d708..f6b56a582d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional1TckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromOptional1TckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromStreamTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromStreamTckTest.java
index 06f3b02b97..a0995dad39 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromStreamTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FromStreamTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MapOptionalTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MapOptionalTckTest.java
index b7cb4d9725..345159da4a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MapOptionalTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MapOptionalTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTckTest.java
index 94906fdd2f..55e6778d3f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java
index 8e1e75b8e0..a4c31bc1dc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java
index dd0fb5c2ed..47e78b08b4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStageTest.java
index 90ad2bc626..552a4afc10 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStageTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromCompletionStageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromOptionalTest.java
index 4e09fea0b1..8af5faf5d7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFromOptionalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptionalTest.java
index e8b9f2aac3..a8adbcb6f8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeMapOptionalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeToCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeToCompletionStageTest.java
index c6c83e68a3..12e4ca5f1e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeToCompletionStageTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeToCompletionStageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableBlockingStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableBlockingStreamTest.java
index b62bedb6f8..275b38a57b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableBlockingStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableBlockingStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorTest.java
index 923a7dbaa3..f18f42a3d0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableCollectWithCollectorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStreamTest.java
index 8341aa03dd..5afcfa33ff 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFlatMapStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStageTest.java
index 612ab0724b..2be5ecf510 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStageTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromCompletionStageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromOptionalTest.java
index e2e4059e70..5fbeb1f2ff 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromOptionalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java
index 6074e54689..c73190c219 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java
index ba38417b12..379477c377 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java
index 9b02622c9b..f652c9b327 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrDefaultTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrErrorTest.java
index d8e6fbe918..5646fc3d59 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableStageSubscriberOrErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java
index 42f7748a03..9d0fc09f62 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelCollectorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStreamTest.java
index 0f39d4c842..f1d34491d5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelFlatMapStreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptionalTest.java
index 67cab4087e..ca7385b7f6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptionalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptionalTest.java
index b7cae91568..459b3f884a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptionalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTckTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTckTest.java
index 509429d4af..53c4206510 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java
index 72dc8fb239..66e68accad 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java
index 2b3a624d50..6d3bdd8cc5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStageTest.java
index 7adb3664be..c62996e586 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStageTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFromCompletionStageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptionalTest.java
index b8ab17a17c..56bc5dbae5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleMapOptionalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleToCompletionStageTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleToCompletionStageTest.java
index 2560c68ed8..2709b6ee40 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleToCompletionStageTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleToCompletionStageTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
index 1764ea6a47..f48d0a574e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposableTest.java
index e5ed0fb605..d9bf994746 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
index 0b33e6ddff..3a65016574 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingFirstObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
index b9ec5d276b..0ea5b468ac 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingMultiObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java
index 1a07bdf907..cbf8b7ce7c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/BlockingObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java
index e52ab8c023..ee95b5a13e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java
index 5e264bc4d7..f6ebdb498f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/ConsumerSingleObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposableTest.java
index 5604005992..19c5b7db27 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarDisposableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
index e9668c81ce..7e60355601 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
index 964301f6e4..294892507b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DisposableLambdaObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserverTest.java
index e873326375..c58de8f0f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/EmptyCompletableObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserverTest.java
index 69b4524123..7499b99ca1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureMultiObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
index e74efba8bd..8c475eb038 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserverTest.java
index eb11be24c3..db8b414347 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/FutureSingleObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverTest.java
index 84b9d14360..549c72534a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
index c19b6ff2db..7ce4307419 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/LambdaObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
index 9afd31e95f..84f43989bb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
index 60c69b5f20..0c9971017b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAmbTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableTest.java
index f32196364d..070fa8cb4d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java
index b72fda422c..943d44b9f2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAndThenTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAwaitTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAwaitTest.java
index b7d6d61ea3..b614e2d79e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAwaitTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableAwaitTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableBlockingSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableBlockingSubscribeTest.java
index e70aac7157..a84f78ad73 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableBlockingSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableBlockingSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java
index fd286681c8..3e6193a2e9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCacheTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java
index 229d00acc6..418afc70cc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatArrayDelayErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatDelayErrorTest.java
index fd3124a96c..8a9f9477d8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatDelayErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
index aaf925df78..f13cb91558 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
index d0323011fb..bda1166ef9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableCreateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelaySubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelaySubscriptionTest.java
index d467d8e2cf..6e524eff27 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelaySubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelaySubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java
index 94e34fe728..c84972863d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDelayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
index b5b52b67c2..5373499d30 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDetachTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java
index 3ef469b121..73a4e58c77 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDisposeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java
index 815482b02f..14bd307b37 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoFinallyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnLifecycleTest.java
index 3e85e1e027..1f66038f19 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnLifecycleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnLifecycleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java
index c2bf494837..6f9698afbf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableDoOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
index 7c979d4881..e697a91d34 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromActionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
index 57c11b8a7b..940444f7a9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromCallableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java
index 2651f04f2c..db201e07a7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java
index ab72061437..5fc8ba08c6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java
index c6d37d738d..177dc4e156 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromPublisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
index a1a7298e03..2b3e9a6514 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromRunnableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java
index e8595f299e..14e5a29ac9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
index 5aca1f7847..453fc4c2c0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableFromSupplierTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHideTest.java
index 59352d76a5..16afcaa075 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableHideTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLiftTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLiftTest.java
index 4f0ba23ce8..21cf3fb305 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLiftTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableLiftTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java
index aa77e6a975..8c301f50fa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMaterializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
index 1f392a9f7c..cf3dc03c69 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
index 80f43a7a35..38166ea659 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableMergeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOnTest.java
index 6d5cc21064..f4613f5c59 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableObserveOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java
index 531f13b8cc..d7b1cae653 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorXTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeekTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeekTest.java
index ddc5a16056..827599e353 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeekTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletablePeekTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableRepeatWhenTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableRepeatWhenTest.java
index 6a80eda644..d9a262b317 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableRepeatWhenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableRepeatWhenTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java
index fb5390cdcc..a8f0390c63 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableResumeNextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSafeSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSafeSubscribeTest.java
index 234fb0290c..40c618ac0a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSafeSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSafeSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSequenceEqualTest.java
index b7b68ad321..9e3fd56b99 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSequenceEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSequenceEqualTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableStartWithTest.java
index 065a600a0e..4b2ed6d588 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableStartWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableStartWithTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOnTest.java
index 22d826fc70..3c20a12588 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeTest.java
index 7c140db31d..f0fded5996 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSwitchOnNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSwitchOnNextTest.java
index ad6147fef5..312f9653ed 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSwitchOnNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableSwitchOnNextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
index 3458ef9772..1eefff1956 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTakeUntilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
index a2f0771ab4..86f2f2890a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimeoutTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java
index 7f6b339961..323b6b4f9b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowableTest.java
index d1fdb548fa..8c10ea5225 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFutureTest.java
index 7501a2fe85..c857e95ebb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToFutureTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
index 96404e8167..7ad93e9bef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableToObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java
index 4581a8944d..72b28edea0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUnsafeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java
index 6a7ddd564b..72e4d16491 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableUsingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java
index e109a0a544..65f593211c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/AbstractFlowableWithUpstreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatestTest.java
index 825c74e321..a842c39c2b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableLatestTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java
index 82ae58730f..92513b3072 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableMostRecentTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
index 714bde2e21..718a7ba6a1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableNextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToFutureTest.java
index cf8ad48a5f..6da74eea03 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToFutureTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
index 64b22b1785..a815f738fa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BufferUntilSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BufferUntilSubscriberTest.java
index 69abd706eb..6cdc17d210 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BufferUntilSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BufferUntilSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java
index 387a2017dd..2b66a48bd0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAllTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
index bae0033d30..ba86c69719 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java
index e121cbc924..2f18a90c64 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAnyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAsObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAsObservableTest.java
index 15cd39ea0a..d922ef48c3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAsObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAsObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnectTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnectTest.java
index d2213dd911..07d1e66214 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAutoConnectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java
index db560e0327..a1facf4046 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBlockingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
index 5abdd7bf9d..c1b08990bb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
index b736b48122..e71315351d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCacheTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCastTest.java
index c39b1972f0..dc26fdccaa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCastTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
index 06b29eadbe..78e776f41e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
index 22e23a4391..39d6cf6ff5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatDelayErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
index 7d6392b318..3711aecec4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
index adb92ef08f..825bb5565f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
index d195c054e1..10df043ba5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
index 282179b9fe..1a8b6f4c4d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java
index fcf199dfd0..845c814dbc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java
index a855c09c26..5b45eafc7f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java
index 4301746a86..8a7ed3cd65 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatWithSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountTest.java
index 158a3232f0..608138e357 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCountTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
index 8ca745dc0b..4c3b735476 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
index bfb33f0e8e..69027d5bd7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
index dadec04fbe..fc2c7e15a8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDefaultIfEmptyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDeferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDeferTest.java
index 8a1b48d4e9..caec2443fc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDeferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDeferTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
index fba8aedbac..57a8af4586 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelaySubscriptionOtherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.util.concurrent.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
index 79740ee44c..3160f61173 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
index 2571dc481e..89a1454614 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDematerializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java
index 3c87bfeb9a..23d895ca08 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDetachTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import java.lang.ref.WeakReference;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
index 87d5cda476..b05941b678 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
index 9d9aa55fd8..7ad389ec8f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
index 2ef5d0e082..3c70726096 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java
index cee677cf41..ab1a3bd8ab 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterTerminateTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
index 3610593751..0dd123e7e3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
index fc346086b6..aae4a0b370 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycleTest.java
index 524a0b5acb..e1df09d7ee 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnLifecycleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java
index b07470a398..3e123089dc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnRequestTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java
index c9ea4359d1..6dff7a5321 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
index eab0324ba8..d060928dee 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnUnsubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
index 56297cbe05..0e36e075a8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableElementAtTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
index 586a7b56c2..a3c69d1984 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFirstTest.java
index efcdb290c0..b6100ddeb3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFirstTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
index 3d14dd0eb2..f212607396 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
index 14a0418d15..a377761f0c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
index cd34417ea9..b13e8316af 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
index 935182fd7a..b7f574b725 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
index c65cf4b5b4..867c71afb7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
index 0064f61c3f..e74d5caf26 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableForEachTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java
index b19a03159c..baee7ea696 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
index d4dda81754..bfdf0edef1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.flowable;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java
index f8f3ed670c..b603fd2d9b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCallableTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.flowable;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
index 5e05936816..3b789d878f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
index 1880d2be43..b73a3f3d77 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java
index 5eca34f9cb..eb6932b07a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java
index 0ef64d192c..f9f666d7fd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java
index f133c8fb99..c376e23adb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java
index 01f6b1661f..492e4851bb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
index fefbf1533e..03275dd2e9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java
index 5753e8ff66..423b1409c1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSupplierTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.flowable;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java
index 23989c717b..9274685118 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGenerateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index 9512cab905..ea906310d5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
index 40539769e9..fe83ad9fff 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoinTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHideTest.java
index c2162b2872..f95775ebda 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableHideTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
index 2558b4a433..db7c46fb06 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelperTest.java
index e570842c98..1549f01d63 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInternalHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import org.junit.Test;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java
index 70156bcd81..f8bc3355e9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRangeTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.flowable;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java
index 68b8bd59fd..7fde08d47f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
index b74fa0752f..fe28a93320 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoinTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastTest.java
index 1897d236d6..3164802ab6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLastTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLiftTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLiftTest.java
index c208b8370b..68227e8dfc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLiftTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableLiftTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java
index 0deec9376b..905cda5548 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapNotificationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
index f7898ac5a9..7bad2decb8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java
index 1d798e6272..0f9c3df225 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMaterializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
index 64a2206e84..1959921168 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeDelayErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
index b2582430bb..25b9cd825a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeMaxConcurrentTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
index 3a1d65fc33..a40f7debb0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java
index c074796be6..8eab622ccf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
index 655d75fe08..aeef5bb09b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
index c187880426..23612f5754 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
index a2bf5505ce..59f38eefdd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
index 000d504211..4fc8ba3c25 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
index 588127bae4..bea1022e3b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java
index 811e27f766..0dfec9422c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureDropTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
index ef65662586..2693bf3014 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureErrorTest.java
@@ -1,11 +1,11 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
index 2b4f490bca..eb4cfaf288 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
index ac1950630a..5f7b7ad957 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceTest.java
@@ -1,11 +1,11 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java
index e0a77692ec..32cee35603 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureReduceWithTest.java
@@ -1,11 +1,11 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorCompleteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorCompleteTest.java
index c1c89cbe27..0a6f137ce2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorCompleteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorCompleteTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
index b8829893fa..8b94b0d6f0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
index 51de11ae7b..982ffecd1d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorResumeNextViaFunctionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java
index ecde026f95..15007f0228 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnErrorReturnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
index 62998eb543..e27d5dffcd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.flowable;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
index 0fb61a84c5..625e14770f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
index a3fb489e9f..ab94d5b2e6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
index d22cecfe5b..ace5fe8179 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
index 628edd30c0..f34e8f8a0b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java
index 170b826bd7..16b491a352 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingleTest.java
index d3da48ffe5..3de991aa2e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReduceWithSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
index 02a730b610..48fbb633ae 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRefCountTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java
index 29959688ad..9086c32a87 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRepeatTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
index 62612f886b..d2a4ba56da 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayEagerTruncateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
index 2a799af71f..b644629a6d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
index 607801bd19..adfc4431a8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java
index b70b742201..2180ac8873 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryWithPredicateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java
index 3c47d264ca..1bc6456695 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
index 5a47a46d9b..fab387470e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScalarXMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
index 6ebac502b0..5c6e4fa901 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
index a3e997d882..c73b57777b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java
index 9407df90cf..913c598126 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSerializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
index 0eb0853c0a..85fbfbc00d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
index 7b1fb2a45f..69eac72c54 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java
index 66d9aa86b6..f2f1ff2598 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
index cb902082c3..eac3c94df8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTimedTest.java
index 74532ad63c..82012097e7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipTimedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntilTest.java
index b579f0e5d6..d5bbdf969a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhileTest.java
index 3ab4f9af64..3fd42350d2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipWhileTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableStartWithTest.java
index 68f4ee6272..6aa442c00b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableStartWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableStartWithTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
index 1554345f61..9cb263e23d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
index de348ee6a0..d38a657b99 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchIfEmptyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
index e7cd7c3db0..9d3d16872e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java
index 373fe4fbe4..1e51a40249 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastOneTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
index 9c413985aa..6008461ed5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
index 836700d2aa..83814dd797 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java
index fa9ea0725d..50728f6206 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest2.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest2.java
index 089c148099..da2aa5657e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest2.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTest2.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTimedTest.java
index 34d39b125a..776236a7cd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeTimedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
index 4019ec4fd9..f88b7e27ae 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilPredicateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java
index 150143ba6f..a1f7fe9d42 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeUntilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java
index f2c964cf28..805420f094 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeWhileTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
index 4c26b2a9f8..9b71893c63 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java
index 45457f5577..fe19765b20 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
index 4153c92a22..e2e9550388 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeIntervalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
index de0dcec14c..070bb620b0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
index db09c48872..538a8e566a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimeoutWithSelectorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
index 4e299dcbd1..99bf23fa72 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java
index 05274da619..6d98c0c414 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimestampTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java
index cac1fa61b7..dff5a7462b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToCompletableTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
index 4241dc8be9..8501a22e74 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToFutureTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
index cad29e3fc8..208f371bb7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToListTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java
index 149a3f893c..736cf4caa5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java
index 06e71d6beb..63db446ee6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToMultimapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSingleTest.java
index b88824b583..d064589b1d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
index 5c7278da54..cadcb572b6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToSortedListTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
index 281b74e463..2a8efa4593 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUnsubscribeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
index f32b599df4..d744c32747 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableUsingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
index 0d9cd5dd1b..5f5d97af1e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
index ab38a160e8..bd50a20a2a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithSizeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
index e6ffaed5bd..f2431eb8db 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithStartEndFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
index 190d10f0af..6982b00cea 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowWithTimeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
index 655452057b..df325cd2c8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipCompletionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipCompletionTest.java
index 3de4aa1e39..fe69ea6be5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipCompletionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipCompletionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterableTest.java
index 871b603383..aee49596d9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
index bc012f9713..4c038dd8c8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
index 3a5ff0dc57..2c4b42aa9c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/NotificationLiteTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java
index 0e953b262f..dca854d3c1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/AbstractMaybeWithUpstreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
index fb3a6aff5b..5475010163 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeAmbTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeBlockingSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeBlockingSubscribeTest.java
index 647d385eef..e11548cdc9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeBlockingSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeBlockingSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java
index a8d42ef603..80f61f5931 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCacheTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
index e65b01e070..1758a1116b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCallbackObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java
index 6608fbc424..94e77bf55a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayEagerDelayErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
index 681748c39d..c2d6fcc0ae 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatArrayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatEagerTest.java
index 5a1b42bb15..4c53fcddf3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatEagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
index 7b9c33db99..c8b9045263 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapCompletableTest.java
index e902bbf4df..dedd03a02e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapSingleTest.java
index 2626b18e26..93695b5293 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapTest.java
index 7504117df4..04e5abfafd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatPublisherTest.java
index 527de9734b..ad334cac7b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeConcatPublisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.maybe;
 
 import java.util.concurrent.Callable;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContainsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContainsTest.java
index 07a7abc77b..ca019517d8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContainsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeContainsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCountTest.java
index 669cb4e28c..b223358ef2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCountTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java
index b0857c432f..6bd42bce44 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeCreateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherTest.java
index 8ca50837ec..f482834e29 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayOtherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java
index cc7a981050..dae5d6f68c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelaySubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
index 14448c3f2c..4485f58f5e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDelayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerializeTest.java
index 5c75a92a10..4f78295f76 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDematerializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
index 2c96cbfe88..6498e98371 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDetachTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
index 045f23de64..a961f0b11c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoAfterSuccessTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java
index fe54a5a299..f98c3cf810 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoFinallyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java
index abe91714e7..37614ec793 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnEventTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycleTest.java
index b8921b7eb9..39d71105ca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnLifecycleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java
index cfcb6a548f..4471db0ee1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeDoOnTerminateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java
index c477416241..2bf3ee5ee2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualTest.java
index 8a42f12d5b..e7b6ea4302 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEqualTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorTest.java
index b75eea1906..f67dc7884b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingleTest.java
index 2647f760ce..52682cc208 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFilterSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
index f0db482a62..67227bb422 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapBiSelectorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletableTest.java
index a76af597b2..053f1e3e40 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
index aed3f49199..c4db76e6f4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
index 601da820a7..64b7a55325 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotificationTest.java
index 6faec2ab9a..1d4d4f0d5e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapNotificationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
index cc92e023ab..2f5cf42426 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleElementTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
index 4904678a61..cdf7f36f1f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlattenTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlattenTest.java
index bcdaa3f061..30c0cfdeb8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlattenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlattenTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
index 4f1cc27355..32f37c1cd7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromActionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
index 28284b0a78..dec0d8e33e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCallableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java
index c891714b69..40f00e371a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java
index 98ea62255e..fb88c60a72 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromFutureTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromObservableTest.java
index de2039a4d0..311f33e4d4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromPubisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromPubisherTest.java
index bcbef3dc9f..c51c23bae4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromPubisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromPubisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
index 37325c69c8..5d1db4ad4d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromRunnableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java
index 108c38d30f..27c13626f6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
index a9a74f46a5..bcbe0783cc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFromSupplierTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java
index 4428b57699..af5005e4ec 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementTest.java
index c41def19d3..a7ab2f2024 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIgnoreElementTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingleTest.java
index 5a6021a48b..23ead59639 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptySingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptyTest.java
index a7c208d2b5..a3a4a893c9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeIsEmptyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java
index 6e61427a15..f84cd69f65 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMapTest.java
index 5259886976..b58b78b26f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java
index 57a478d112..0c7f570434 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMaterializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
index 0ddc2eefe1..09da6295f3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeTest.java
index 8ce37cb7be..0bf38ccc0f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeWithTest.java
index ab4a0b8955..dd4d0817a8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeWithTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOfTypeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOfTypeTest.java
index 0e459ffffb..5d58b9ff90 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOfTypeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOfTypeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
index 403d73db66..2cbc2fe427 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeOnErrorXTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java
index cbf4d60b34..ade9039eca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybePeekTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSafeSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSafeSubscribeTest.java
index 5083c20f2c..85919751d4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSafeSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSafeSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeStartWithTest.java
index 87969974d4..31b0314158 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeStartWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeStartWithTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOnTest.java
index 1043a848b8..3f5a29bc23 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSubscribeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java
index ceed4345d3..153b183287 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptySingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptyTest.java
index 423d6ad1ac..f15f5ae8be 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchIfEmptyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchOnNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchOnNextTest.java
index 6b217aa680..7a502faa28 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchOnNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeSwitchOnNextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisherTest.java
index e615c733e8..f5ce249514 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilPublisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilTest.java
index 5c7d8f956d..20ce1cfa41 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTakeUntilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeIntervalTest.java
index 30b770aed4..bd50202ae4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeIntervalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java
index 22e99bf9aa..efa2ce6ff6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutPublisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java
index ba806c5a32..b5b61a6ffc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimeoutTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java
index 06a54ad90c..7daba77969 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimestampTest.java
index 1ce230f8d0..935147a906 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimestampTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimestampTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToCompletableTest.java
index 52b44e5f98..4bae2cc98f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowableTest.java
index 77d098c0ce..66e94da8d0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFutureTest.java
index 37723dc656..b36a299cd4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToFutureTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservableTest.java
index c201bf20f8..6747203723 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingleTest.java
index 9d641c9505..1ee84470f2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeToSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOnTest.java
index 1e2d700136..3159fb411e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUnsubscribeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
index e9621a2f64..0f083c93d2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeUsingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
index 098258ed68..2cbf8e4263 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipArrayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
index 4f6e07f00a..2d60c22157 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeZipIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservableTest.java
index 9c8dfa8754..a1e087bdf2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisherTest.java
index 9c0a498db5..bd9c9aa2d9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/CompletableAndThenPublisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
index 6a67cb9fee..048e993b1d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
index 595740a452..b2cfdc76d2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
index 73426eda72..6dd081b4ed 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
index bf18f90b05..cf2065cc72 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
index 8fd4b55d6f..1ace07440f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
index a28413ab42..cd4d64a9eb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableSwitchMapSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservableTest.java
index 0b268e8d88..f91b5c6582 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisherTest.java
index b7853ccac0..96948b05dc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/MaybeFlatMapPublisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java
index ae0ce25d91..e69e3e0ee5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
index 120e027538..0dcbd27408 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
index 76bf708e55..9f70b4addf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
index 33ce7c27da..0efeb6f676 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
index 865544b22a..b2eabdd96f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
index d5de085a1e..a98afae4de 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableSwitchMapSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelperTest.java
index 8a8e745c8b..2ac6eed7d3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservableTest.java
index 3f9fcb74de..a002620b6a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/SingleFlatMapObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstreamTest.java
index b578dcb8f6..5d49cd8b66 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/AbstractObservableWithUpstreamTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatestTest.java
index ef8e23ba21..feac576be7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableLatestTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java
index cc04638ee7..ccf611bbd4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableMostRecentTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
index 82397f45dd..8274e9f9e3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableNextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java
index bca24503c1..dacf971596 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToFutureTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
index 2eb25e0dab..684eefbf61 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableToIteratorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
index 2bed435879..46b5df42f3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/Burst.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.util.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
index 9883764f28..fba37cb9f9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAllTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
index 4948f1a13d..0a349cd417 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
index 35faf30c19..cb85603fa1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAnyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnectTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnectTest.java
index 5ed5b3124e..16128ff195 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAutoConnectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
index a2d9854569..05fbb5a94c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBlockingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
index 30c9efd221..8264a66494 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferUntilSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferUntilSubscriberTest.java
index 6d49272de2..eb67fee441 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferUntilSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferUntilSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
index 3ad0f0ef67..7f47ec95d8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCastTest.java
index 52576fb9b9..83fdb4b1e5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCastTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
index 0568b0d474..92867c2d79 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCollectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
index d8f35d38d1..2b966ec29c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatestTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java
index 55b880a9f9..931fcd403f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapCompletableTest.java
@@ -1,15 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * <p>
+ *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
- * <p>
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
index 079a8c8a47..1e75ff9aef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
index 48ab5a2fc1..e6a50b9afa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
index f8aa2cf42b..8fb29f2eb4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
index 90e3dc112b..4b1462e302 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
index fc2a8b8531..5e0d878a34 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
index 16ba059b8b..6c70e75a9d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
index 2d05b58c2d..8ac2519c3c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatWithSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountTest.java
index 4207fee66f..1390502816 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCountTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
index 2998f0a5a8..0b96fae6aa 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
index 4b3a64def7..b43b1d2d27 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefaultIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefaultIfEmptyTest.java
index 1ca00cf1b4..7a1d66e908 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefaultIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDefaultIfEmptyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDeferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDeferTest.java
index 50ded2e55a..cb919f02ff 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDeferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDeferTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
index 93b09456dd..02d988c2e8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelaySubscriptionOtherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
index 82b60d4701..ea8d51d996 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
index bc041cb1be..e28b71a629 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDematerializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java
index 95cbf96f76..5e4e3d5fce 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDetachTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import java.lang.ref.WeakReference;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
index 1f2614f284..7e4e0dbdb2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
index 190506aed2..1ae097579c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
index 9c750bba88..d75da532c2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
index d3a11c186d..b72bf1112d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
index 6b8627b02b..f7eec912e2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
index 5a16beda68..f001d28ac0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
index a95f372d18..5ac217725b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnUnsubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java
index 679915dc51..8ce5cb047c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableElementAtTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
index 6bbb838da5..1d3ad049f0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFinallyTest.java
index 7767ddb9fc..9f20203ed2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFinallyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFirstTest.java
index e022144ce2..9129f1d0cd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFirstTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
index 169186da49..2cde8014e2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
index 6bb2b40dc3..0c0d29c8e7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
index 5eefbacb4a..1fa219111b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
index 1e083d217c..4622888628 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java
index 8a2de4cf48..15d6aae37b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlattenIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java
index 677b78414f..ac8312a893 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableForEachTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java
index 2b6d80896a..3c1eb5d9bb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java
index 43b1d96fef..c701f60c47 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCallableTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.observable;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
index 68c9f10292..b309796b7e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
index ec6b70e31b..856de7afe7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java
index 185b363d57..c82dd5d5a7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java
index 834abbd978..aebb9da751 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java
index d77498cea8..b6ff7774d8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java
index 2b181a56fe..56e31ddfb7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSupplierTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.operators.observable;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
index e3f6f91954..017d8b4960 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java
index f6beca1800..90a3d60eaf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGenerateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
index b9d37ef118..32c1abc2e2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupByTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
index 67f8eda0b7..7959f90a05 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoinTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHideTest.java
index 45361b1aed..0b624621ec 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableHideTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java
index 43af8631e9..c7597c3a9f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIgnoreElementsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelperTest.java
index 9c02f95ebb..87fc866f74 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableInternalHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.junit.Assert.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java
index db42957fa5..637d9164be 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalRangeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java
index 4f188093c5..e8126962de 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableIntervalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
index a674d0680e..c6f439cdcb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoinTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import static org.mockito.ArgumentMatchers.any;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastTest.java
index 0bd5868332..cabed665f4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLastTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java
index 64a95db947..b761a6ad02 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableLiftTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
index 81b470ff99..0672f528c9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapNotificationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
index 538feaaa7f..dca27d4cef 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
index 0e1df287bc..02b16ad6ce 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMaterializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
index fefce52867..da92bc0338 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeDelayErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
index 9ab92edc12..e1388f39ad 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeMaxConcurrentTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
index d5b9a45a6f..02ddf09fd0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
index e561eaac1e..4b9ee5a9d2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
index 43f0a7fff7..3140c5c118 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
index c6b083f41d..9d6171ba06 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
index 2b8c2e0274..afbd79afe1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorCompleteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorCompleteTest.java
index 4c37745834..a4671dd535 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorCompleteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorCompleteTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
index 386b6c96a1..ed3e8dc571 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeNextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java
index f60ea43a25..7b659c9444 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorResumeWithTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
index 69c6c6889c..da7acf2b47 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableOnErrorReturnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
index a83372c03e..edec6a517d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservablePublishTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
index 7a58572d2f..6954ec4f3e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
index e789b55093..7e24222444 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java
index 2dc15f230e..adb2caf4a3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRedoTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java
index d997e9899f..0feab233d3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReduceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
index 442f326e37..638f694a88 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRefCountTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
index 78c793f1b4..8f3287e7e0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRepeatTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
index cf473d6e78..aa1bcb4359 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayEagerTruncateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
index 94a7a6087f..8b4ef97d02 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
index 228725c0a0..42d557e091 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableResourceWrapperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
index 94009c5b86..285299b83d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
index 5bb4fba7d8..bce6e9f659 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryWithPredicateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
index 3e842e67ed..7da1bfcbda 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
index 4bfee7eb01..6fe9616dd9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
index c482d121be..9a1765ceb3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScanTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java
index da75e3ee94..645fafbb62 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
index 2457a9a312..9aa31211b5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSerializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java
index 2290c645ca..c511f28baf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
index 712da24ea9..1a10af31d2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java
index 650575e7f3..a4171ea2df 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
index 93c4694616..c1fe2bf2bc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTimedTest.java
index 1c3fc30e14..83edc3201b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipTimedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntilTest.java
index 290fc2c1f0..bb2c3ef127 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipUntilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhileTest.java
index ab1abdfa49..b6a0749088 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipWhileTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableStartWithTest.java
index 47cf4dc962..267f5be42a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableStartWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableStartWithTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
index 53ccf2b3a6..ab3890dcc6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSubscribeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java
index 34e24d81cb..5dd3703c67 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchIfEmptyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
index 3587c58aec..ffa4049a44 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java
index 92536eb95e..1bd19d6bc9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastOneTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
index b9ed392381..f0a342e2e1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
index 3c671695ff..4e2bd6a5c0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
index 6fb3143410..0ecff80446 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTimedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTimedTest.java
index 32f6049afb..7edbfbcf20 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeTimedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
index 143fe9d3ca..04d0ab5537 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilPredicateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java
index 5e831b03b3..4bbf042acc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeUntilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
index 1b35f4144f..0a9fc27136 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeWhileTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
index 4aa693978e..64c0a8dae0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java
index 5399f63fce..c36d04babe 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
index 5f935791b1..ce418200d8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeIntervalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
index fe7b2cd370..570eb3de5e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
index 44712626c3..2c6710cc89 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimeoutWithSelectorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
index 8eddbce491..bb8860e4dd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java
index 597333ea66..084db67473 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimestampTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
index 2631dfac4e..0ac13be46a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToFutureTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java
index 020183f9fa..2d4185407d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToListTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java
index 8838ff4b5a..72b39d0025 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java
index 0853b0acad..10bda16080 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToMultimapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java
index 19c10c6622..0ea0be21b9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToSortedListTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToXTest.java
index 1afbba0225..c7cc6f3151 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableToXTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
index 59b1a16da2..23f6d7256b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUnsubscribeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
index 143524319d..de8d73fa36 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableUsingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
index a623e3ded3..edfca3989d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
index 6c253eb52c..81d076e718 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithSizeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
index 941ce58f79..659daaf7d1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithStartEndObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -702,4 +702,4 @@ public void mainIgnoresCancelBeforeOnError() throws Throwable {
             TestHelper.assertUndeliverable(errors, 0, IOException.class);
         });
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
index 527ebc004b..ca8f90d04f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowWithTimeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
index c23c41fde1..cfe093ed6b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWithLatestFromTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipCompletionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipCompletionTest.java
index 76d14495db..89dde2cdc5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipCompletionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipCompletionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java
index a4ce20c33c..ce4ee90939 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
index d481c16662..ae7de66d6f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
index acfa6528a6..083ee46238 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleBlockingSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleBlockingSubscribeTest.java
index 50eceede5c..a29c10975f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleBlockingSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleBlockingSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCacheTest.java
index 28eb94110b..ca46a92f12 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCacheTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayDelayErrorTest.java
index 10fec20410..00ff0d5ad1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayDelayErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java
index ce0df373bb..bfd96ad3a9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatArrayEagerDelayErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatDelayErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatDelayErrorTest.java
index 83ae9cbf9e..18dc2c83d2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatDelayErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatDelayErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatEagerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatEagerTest.java
index c21c5347d4..892ed8dd4d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatEagerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatEagerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapCompletableTest.java
index 1a160f6465..3c603b26b9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapMaybeTest.java
index dd25e7a53f..24710d824a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapTest.java
index b0b5af17a6..1fa2ebaf0b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatPublisherTest.java
index bd31e28430..883903e1d9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatPublisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.operators.single;
 
 import java.util.concurrent.Callable;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
index bf8c534f46..fb94277e43 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleConcatTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleContainstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleContainstTest.java
index 4a991c4cbf..2f5baa4ed0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleContainstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleContainstTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
index 8f8519c961..862757560a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleCreateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDeferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDeferTest.java
index 962a3694c2..7fed907ab4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDeferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDeferTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
index 619a6c1241..bc137d1612 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDelayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerializeTest.java
index 5bf1409498..6cd05b7128 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDematerializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
index ae13a0d9c0..17812c8957 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDetachTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
index 8c2070f736..de83cecb1a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterSuccessTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
index f4c3adb720..6b98da8c66 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoAfterTerminateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java
index 365b34f185..64afc620ac 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoFinallyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycleTest.java
index 9208ab2be8..f14d03cc8d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnLifecycleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java
index 584c976d41..814a38bded 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTerminateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java
index cf67202641..92ce91b65a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleDoOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
index 14bd931d76..9526299231 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleEqualsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleErrorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleErrorTest.java
index b3619b5992..835ad2ad09 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleErrorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleErrorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelectorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelectorTest.java
index 84a2a650c4..78705fe166 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelectorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapBiSelectorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletableTest.java
index 6e663394e5..c4af049aec 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapCompletableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
index d308998e6e..c408387bff 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
index 5d2bafc9c9..a170d8c6c3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java
index c11780324f..6081a621e8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotificationTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotificationTest.java
index 266acc93f2..00f1337b2c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotificationTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapNotificationTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java
index ea02529556..08d3d24c5a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java
index 8a97b8a2d6..3352029989 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromCallableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromMaybeTest.java
index 50eed426a7..293cedf574 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromMaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisherTest.java
index 74261bc7dd..080870b228 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromPublisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java
index dd259f209b..927ec7f837 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromSupplierTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java
index 5c7bdfd5d2..a322d8852e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFromTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleHideTest.java
index 9c5609b571..d13218bc84 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleHideTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
index 7756ef5783..478a03d9ff 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleInternalHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleLiftTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleLiftTest.java
index 1638cb993f..6fdd626bd3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleLiftTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleLiftTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java
index 625c4f1f5b..eb220e0580 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java
index 4bc05ea67d..46625b80ab 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMaterializeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeArrayTest.java
index 9434a4fcc1..b2bda3a7d7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeArrayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java
index 7aba476c86..dd4844da5b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMergeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
index dad1322b22..93eebfe7ec 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleMiscTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOnTest.java
index afb4494bef..4abc87e51f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleObserveOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOfTypeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOfTypeTest.java
index 3ce3a0d15e..9569e9a35d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOfTypeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOfTypeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorCompleteTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorCompleteTest.java
index 189759d6c6..9b184ae7f8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorCompleteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorCompleteTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorXTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorXTest.java
index 990a0fdec6..42e36eaba8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorXTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleOnErrorXTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSafeSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSafeSubscribeTest.java
index 80abb4cb1a..d9711c67c0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSafeSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSafeSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleStartWithTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleStartWithTest.java
index a3f7e7225a..3d01226d9a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleStartWithTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleStartWithTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOnTest.java
index 0c22190691..bec9782b0e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSubscribeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSwitchOnNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSwitchOnNextTest.java
index 63c97f14ec..f3c119222d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSwitchOnNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleSwitchOnNextTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntilTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntilTest.java
index 0a2d27340a..c5389b0bbd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTakeUntilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeIntervalTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeIntervalTest.java
index 09dd26eeba..ade198db50 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeIntervalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeIntervalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
index c544fd3ae9..dcc526c4f6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java
index 2924364459..0b03b7ef00 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimestampTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimestampTest.java
index a282c0345e..206da8f428 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimestampTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimestampTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowableTest.java
index f4c344c801..1c9cf06385 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservableTest.java
index 35d38d49c7..f72bd4ac60 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleToObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOnTest.java
index d28c47ad08..fa07de729c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUnsubscribeOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
index d11c89ec8d..28c6b34ef7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleUsingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
index 6769d6b43d..df41235e38 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipArrayTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
index 6fd6744479..c2293a2b89 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java
index 79380cfa5f..14f2e68267 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleZipTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java b/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
index e5673b49bc..d712aebfab 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
index dfd3ffeae9..dfdef0a546 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/BooleanRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/BooleanRunnableTest.java
index 424d108e8a..237bb233eb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/BooleanRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/BooleanRunnableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ComputationSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ComputationSchedulerInternalTest.java
index 59ad5d1dfc..5c8aa1a65f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ComputationSchedulerInternalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ComputationSchedulerInternalTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.schedulers;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java
index 8018806a37..224e33ae7d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/DisposeOnCancelTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
index 3dd9c59344..31c3112255 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerDelayedRunnableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinSchedulerTest.java
index cacb8fabeb..75710644d9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ImmediateThinSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
index 2f530f2afa..4a57e86781 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InstantPeriodicTaskTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/InterruptibleRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InterruptibleRunnableTest.java
index 9abc100862..e040b37419 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/InterruptibleRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/InterruptibleRunnableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoScheduledReleaseTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoScheduledReleaseTest.java
index b845c08ae2..e3f55b75fb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoScheduledReleaseTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoScheduledReleaseTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoSchedulerInternalTest.java
index 77f638a2be..9a4b6f3be0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoSchedulerInternalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/IoSchedulerInternalTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactoryTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactoryTest.java
index 83a65e65ac..d0cbb6a476 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactoryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/RxThreadFactoryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
index 7736d5e40b..5d0f486ff4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
index 4225a71c05..8d2fc1f7cc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java
index 21b4514be1..3d16867a1a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerMultiWorkerSupportTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
index 1fcbf105b4..dd5667ffbb 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java
index d48228d20c..03e6a9300f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhenTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
index 9ab44b2ff1..c9f9cc5476 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SingleSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
index 912d07b215..b25620e2bf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/TrampolineSchedulerInternalTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.schedulers;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
index f8d40aaa14..7124405e00 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
index afc79d2b2d..d6f85acc46 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java
index 563a52a984..a97f4ee93e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BlockingSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
index 38abf77e87..68e955097d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BoundedSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java
index 698fcc18ac..dcfcb82377 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/DeferredScalarSubscriberTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.internal.subscribers;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java
index 60da2b7a29..c5cf3c88ca 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/EmptyComponentTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
index e8cf5c3a47..56de26e5d6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FutureSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java
index e6533166ce..7856ce5d3e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
index a415835a4b..e7f3931096 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/LambdaSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
index 6d09484d55..f914d46e73 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java
index 1a9bb1310b..8616e6ba3b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SinglePostCompleteSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java
index 1b36462c47..ba4548d02e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/StrictSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
index bafc579b63..65f2817354 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/SubscriberResourceWrapperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscriptionTest.java
index 9dd0cab6a5..fc54cfe357 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ArrayCompositeSubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscriptionTest.java
index 30d93a22ae..0375d72ba5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/AsyncSubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
index dfe9e83f89..046205e79a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/QueueSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/QueueSubscriptionTest.java
index fb3f66397f..92c37e0e52 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/QueueSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/QueueSubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java
index 55a564280c..377691e0a2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscriptionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiterTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiterTest.java
index 4651b2e3b8..7bc7eb937a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionArbiterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java
index 13a2dc61aa..9bb222fbb8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/SubscriptionHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
index efe3b5c7b2..152039fac3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/AtomicThrowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/BackpressureHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/BackpressureHelperTest.java
index ca0b0e2668..d13cde57be 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/BackpressureHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/BackpressureHelperTest.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java
index 419febcaee..0218185f08 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/BlockingHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/CrashingIterable.java b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingIterable.java
index bb053c23b0..6bdbea27b1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/CrashingIterable.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java
index caf09b372e..d6b9491e2b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/CrashingMappedIterable.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java
index 1cb96e732f..8ad1942946 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/EndConsumerHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java
index 70b70aea1f..130cf5767b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/ExceptionHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
index b948188173..ea8c405849 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
index 65835788bb..1919864648 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/HalfSerializerSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/JavadocNoThrows.java b/src/test/java/io/reactivex/rxjava3/internal/util/JavadocNoThrows.java
index 985ac202c3..1a55807dd0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/JavadocNoThrows.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/JavadocNoThrows.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import java.io.File;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java b/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java
index aa388a684a..2fdc7fe2d6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MarbleDimensions.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import java.awt.image.BufferedImage;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java
index dce15c4b28..b8a5f8b843 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MergerBiFunctionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
index 0ea0868e24..adc779a302 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/MiscUtilTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
index 7e701ff5b9..7638a98ead 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/NotificationLiteTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java b/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java
index fbe13a185e..7bf668e2f1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/ObservableToFlowabeTestSync.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java
index c87bd13192..f8c1bdf04d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OpenHashSetTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorArgumentNaming.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorArgumentNaming.java
index 727b522d05..1814a26bbc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorArgumentNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorArgumentNaming.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
index 714a6809f9..9c5f058ff4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/OperatorMatrixGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
index 5fac86182a..0f78a2b9e7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java b/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java
index 976757acd7..207c85236d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/TestingHelper.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.internal.util;
 
 import java.util.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java
index c59537c988..3ce08aa3dc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/VolatileSizeArrayListTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
index 152a297e8d..e3bbfb4bfc 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeCreateTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java
index 6c88f8501c..731dd03e23 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeRetryTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2017-present, RxJava Contributors.
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index 401bdcc918..c1e6ada1d7 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTimerTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTimerTest.java
index 03f229483b..286639042d 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTimerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableCombineLatestTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableCombineLatestTests.java
index b4b11420d1..957268ecf1 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableCombineLatestTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableCombineLatestTests.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.observable;
 
 import org.junit.Test;
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java
index f867a165d2..53c4f99029 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableConcatTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.observable;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java
index e7e3302fd8..54cf0f9908 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableCovarianceTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.observable;
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java
index 6c3b5f54ab..0e7ed9ef88 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableDoOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java
index c524261032..9ec13895b0 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableErrorHandlingTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java
index 6b161dcb0a..48e637f5c3 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableEventStream.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java
index 1d01a790ab..1d18ee74a6 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.observable;
 
 import java.util.Arrays;
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableGroupByTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableGroupByTests.java
index e5de6cdc85..1db6ebb908 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableGroupByTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableGroupByTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableMergeTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableMergeTests.java
index 902bcd7ba1..25a3317b7f 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableMergeTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableMergeTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
index 4189438e32..178adb6230 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableNullTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableReduceTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableReduceTests.java
index 8dec71b98e..01c2106aff 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableReduceTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableReduceTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java
index bc73a886b2..8bc33ac19f 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableScanTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java
index 9c9261273c..8e0fe35add 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableStartWithTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java
index 60e8470ca4..c8a1047fe3 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
index 030687e989..87e6463d3c 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java
index e93f9409e0..735bc4a312 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleWithTimeoutTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleWithTimeoutTests.java
index bcacab5513..80f82fb5f4 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleWithTimeoutTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleWithTimeoutTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java
index 9e1076017a..4bc561bd1b 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableWindowTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java
index 1f67113348..b2b26719bb 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableZipTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
index 19ee3e7f06..fde1dc75de 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableCompletableObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
index 36dc6a6d3b..7bd2f20a95 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableMaybeObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
index c2b766e761..1b5b477552 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
index b6239d65ee..8dac144591 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/DisposableSingleObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
index f007940592..e2d1fa34ba 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceCompletableObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
index 08d06044e7..257a5785f8 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceMaybeObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
index 94934d82df..543095582b 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
index b720931088..10f17e18d6 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/ResourceSingleObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
index adcb092aea..77b3d7b9b9 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SafeObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
index c631b7b114..689908f59f 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/SerializedObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
index 56ed09ac44..576dd4bfb1 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
index a9509a46a5..f582966cf9 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelCollectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
index 14f585d9d0..ba76f69cfb 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelDoOnNextTryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java
index 93e3fb33c7..31e9b9a7c4 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
index 37377bab52..6940062989 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFilterTryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java
index 4b5aeb0c78..8c18de1b0b 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlatMapIterableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
index 1d1f97163f..c97bc5cf56 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFlowableTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
index 981781cd9f..44210442ee 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelInvalid.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelInvalid.java
index 39e8ac21cf..6b54ca6847 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelInvalid.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelInvalid.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
index 8741eb1168..f51b3519e7 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
index 5432c10a76..0f9e7ebe87 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
index d56669d755..a6d0de2d92 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTryTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
index b35f0d8a1f..93d72ef9f6 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelPeekTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
index 625fb8a42e..d9a43a247c 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceFullTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
index 3e906ef01b..9c32f6afc8 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelReduceTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
index 44ce7960d1..6868e03875 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
index 1f3950c112..9ba23c30c2 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelSortedJoinTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
index ed0ea74f2e..6aa166d118 100644
--- a/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/plugins/RxJavaPluginsTest.java
@@ -1,17 +1,14 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
 
 package io.reactivex.rxjava3.plugins;
diff --git a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
index 778cf78496..363b211836 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
index 0d0acb2796..991a599b82 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/BehaviorProcessorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/processors/FlowableProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/FlowableProcessorTest.java
index ae659623e0..1575a5669c 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/FlowableProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/FlowableProcessorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
index afa14b8deb..0ac22cf1b2 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/MulticastProcessorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
index 9741796049..380f644518 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/PublishProcessorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java
index 4590a6dec9..f080ce5e1d 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorBoundedConcurrencyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java
index 3cacc0d67a..3afe66dd25 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorConcurrencyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
index 2febfb0629..aa7026a9ff 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
index b2bd9bac19..515b8d1430 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/SerializedProcessorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
index 002d6a17d3..d55f58e5c7 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerConcurrencyTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerConcurrencyTests.java
index 399a765305..ae7d1b24b0 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerConcurrencyTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerConcurrencyTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
index 6c32a09898..2419fe557c 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/AbstractSchedulerTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
index 26cec9b53b..b4576ebb53 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/CachedThreadSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
index 5f5df8d410..c88415209d 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ComputationSchedulerTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerFairTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerFairTest.java
index 128a3bd5b5..c01f0f9f1f 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerFairTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerFairTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
index e9c953b049..4f55e7e8b2 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
index 9910c03148..c4ba94189c 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/FailOnBlockingTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/FailOnBlockingTest.java
index d8891ddc0c..7cb4c15e07 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/FailOnBlockingTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/FailOnBlockingTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
index 1476db8b92..37c7b85f87 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/NewThreadSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java
index c378448220..58b51254d8 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerLifecycleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java
index d55578d663..a9ec2205a7 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
index 05dda6a058..38e94f4536 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java
index 87ad3698ad..17b7fa5dd7 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerWorkerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java
index 010b271359..4c2e776e0d 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TestSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
index ce117c2fb7..7d82af675e 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TimedTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java
index b409aa143a..d98c93a435 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/TrampolineSchedulerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java
index 1851c15e1f..3fe2da558c 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleCacheTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
index a6133bd720..058ecdc6b0 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleNullTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java
index 2fe5fa9f49..e38322a4ab 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleRetryTest.java
@@ -1,5 +1,5 @@
-/**
- * Copyright (c) 2017-present, RxJava Contributors.
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License at
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleSubscribeTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleSubscribeTest.java
index 68484d63c1..df363bee83 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleSubscribeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleSubscribeTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
index 1f7cba7e2d..7b51c97471 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/single/SingleTimerTest.java b/src/test/java/io/reactivex/rxjava3/single/SingleTimerTest.java
index c8624b710a..7fefa15467 100644
--- a/src/test/java/io/reactivex/rxjava3/single/SingleTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/single/SingleTimerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
index 17d3a94a62..f01a7c3ca8 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
index 25e239e378..8871ee8e7e 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/BehaviorSubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java
index 02ac92b064..6b5a7a6085 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/CompletableSubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java
index 31742e10a9..c741f02508 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/MaybeSubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
index 9479951609..a4b464c512 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/PublishSubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
index 369fcfc59f..419e5c92a9 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectBoundedConcurrencyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
index 767553dc59..454b56e515 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectConcurrencyTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
index 3444431824..e752278b2f 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
index 86589cd25d..18ff503339 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SerializedSubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java
index 521fb77fe4..751f0c72d4 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SingleSubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/SubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/SubjectTest.java
index ab22d10a0c..ce7177a58d 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/SubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/SubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
index 0c05dbbf9f..cf1f5d4a75 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java
index 562759247c..b68a6fe695 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/DefaultSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java
index b58b231467..6aa5c1ff51 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/DisposableSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
index 5b135a6ed2..6bbc127cda 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/ResourceSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
index ca61c8565a..cd97fa11a3 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SafeSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
index e4292216d6..2402762d93 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/SerializedSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
index 67e397b4bd..40bdcb95cc 100644
--- a/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subscribers/TestSubscriberTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/AllTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AllTckTest.java
index 5d2ce5eed9..4b8060fba9 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/AllTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AllTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java
index 88b24a00ab..1260dd2d58 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AmbArrayTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java
index a0d4a63764..6c687b7461 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AmbTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/AnyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AnyTckTest.java
index 5d93dd5462..34e9fe5517 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/AnyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AnyTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/AsyncProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/AsyncProcessorAsPublisherTckTest.java
index 87dd4afb33..87a75f0052 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/AsyncProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/AsyncProcessorAsPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java b/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
index 4de830b877..aa42bcc03a 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BaseTck.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/BehaviorProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/BehaviorProcessorAsPublisherTckTest.java
index 219a8ab1a2..94c5e15c14 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/BehaviorProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BehaviorProcessorAsPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/BufferBoundaryTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/BufferBoundaryTckTest.java
index 18a6fe4a21..cf79b210d6 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/BufferBoundaryTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BufferBoundaryTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/BufferExactSizeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/BufferExactSizeTckTest.java
index 5af053e052..d4b7a7abf5 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/BufferExactSizeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/BufferExactSizeTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CacheTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CacheTckTest.java
index 460fb80e70..ec9c481fdc 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CacheTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CacheTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CollectTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CollectTckTest.java
index fe09c2f061..76c359f327 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CollectTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CollectTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
index ec7005ea41..80bccac273 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayDelayErrorTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java
index 2cebfe655b..c5a040dc25 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestArrayTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java
index 5581b9551e..41883ab6c1 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableDelayErrorTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java
index 744d909949..a7b9279a56 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CombineLatestIterableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CompletableAndThenPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CompletableAndThenPublisherTckTest.java
index 9e9eae893d..22c1d4ceef 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CompletableAndThenPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CompletableAndThenPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java
index 9885f3b939..25afb45060 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatArrayEagerTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java
index e365418449..491f211cc2 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatIterableEagerTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatMapIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapIterableTckTest.java
index 43dcb2cf20..1a5ab46193 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatMapIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapIterableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatMapMaybeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapMaybeTckTest.java
index f01d8ec511..5216b6a50f 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatMapMaybeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapMaybeTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatMapSingleTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapSingleTckTest.java
index 9259f0dcd9..5d41ff6775 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatMapSingleTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapSingleTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatMapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapTckTest.java
index 7629d88742..83a3774193 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatMapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatMapTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherEagerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherEagerTckTest.java
index 126fe4f01a..194d7e79de 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherEagerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherEagerTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherTckTest.java
index 4bbfe152f7..ad61abd029 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatTckTest.java
index 1ad7d79412..c5eb360c73 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatWithCompletableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithCompletableTckTest.java
index a1431efbf8..a5734952f5 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatWithCompletableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithCompletableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeEmptyTckTest.java
index 81611f79e4..e333457b82 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeEmptyTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeTckTest.java
index 08ecaee5ac..b56ac86eac 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithMaybeTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ConcatWithSingleTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithSingleTckTest.java
index 234ebdf419..56746e24fc 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ConcatWithSingleTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ConcatWithSingleTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/CreateTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/CreateTckTest.java
index 45a2d86ad7..ff4b0597d8 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/CreateTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/CreateTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/DefaultIfEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DefaultIfEmptyTckTest.java
index d8692cfc36..c9d9078bf5 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/DefaultIfEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DefaultIfEmptyTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/DeferTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DeferTckTest.java
index cb75dbb290..f834c1e637 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/DeferTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DeferTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/DelaySubscriptionTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DelaySubscriptionTckTest.java
index 28cc3243d7..5db6d0b877 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/DelaySubscriptionTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DelaySubscriptionTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/DelayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DelayTckTest.java
index d2d4c08de9..87ccaa37d2 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/DelayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DelayTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/DistinctTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DistinctTckTest.java
index 35fe953720..629d96fee6 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/DistinctTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DistinctTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/DistinctUntilChangedTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DistinctUntilChangedTckTest.java
index 4c08351e46..ba69771a4f 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/DistinctUntilChangedTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DistinctUntilChangedTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/DoAfterNextTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DoAfterNextTckTest.java
index 1f988ee9f0..3b8fbebecb 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/DoAfterNextTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DoAfterNextTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/DoFinallyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DoFinallyTckTest.java
index e59dc8ba7d..029892f440 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/DoFinallyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DoFinallyTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/DoOnNextTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/DoOnNextTckTest.java
index 418535f8e4..f7e343803b 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/DoOnNextTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/DoOnNextTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ElementAtTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ElementAtTckTest.java
index 1563beb090..58e18778d0 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ElementAtTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ElementAtTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/EmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/EmptyTckTest.java
index 0b960f51b0..da65d54fe4 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/EmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/EmptyTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/FilterTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FilterTckTest.java
index fc3cf46588..6c975dabfc 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/FilterTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FilterTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/FirstTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FirstTckTest.java
index 5dac1a42f1..29082117dd 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/FirstTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FirstTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/FlatMapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FlatMapTckTest.java
index 39b9afc454..88e937f282 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/FlatMapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FlatMapTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/FromArrayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromArrayTckTest.java
index d8d88a1e68..84bcb0b70d 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/FromArrayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromArrayTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/FromCallableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromCallableTckTest.java
index e235109619..d786060933 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/FromCallableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromCallableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java
index 7b47ac3192..edff3c277b 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromFutureTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/FromIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromIterableTckTest.java
index 0418584039..94dc77c555 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/FromIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromIterableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/FromSupplierTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/FromSupplierTckTest.java
index a19028deb8..acbe1df8b0 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/FromSupplierTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/FromSupplierTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/GenerateTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/GenerateTckTest.java
index 97cbb4a811..b5c5ef30f6 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/GenerateTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/GenerateTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/GroupByTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/GroupByTckTest.java
index 7d5f0503da..ebaedb86ae 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/GroupByTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/GroupByTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/HideTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/HideTckTest.java
index 6fa26977c1..62c3e76c4e 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/HideTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/HideTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/IgnoreElementsTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/IgnoreElementsTckTest.java
index 6a1848e88a..289e2e90eb 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/IgnoreElementsTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/IgnoreElementsTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/IntervalRangeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/IntervalRangeTckTest.java
index 181823e981..b6c09d3d21 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/IntervalRangeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/IntervalRangeTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/IntervalTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/IntervalTckTest.java
index 05a25f6774..b9a01afc32 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/IntervalTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/IntervalTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/IsEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/IsEmptyTckTest.java
index 73cfb28550..a9ffce0294 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/IsEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/IsEmptyTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/JustTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/JustTckTest.java
index 02805e5125..668b32a31a 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/JustTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/JustTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/LastTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/LastTckTest.java
index facdb09c32..eb75e0342a 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/LastTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/LastTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/LimitTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/LimitTckTest.java
index 3fe61b627a..08c526af03 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/LimitTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/LimitTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MapTckTest.java
index 6c27b381d2..9875c412ac 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MapTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MaybeFlatMapPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MaybeFlatMapPublisherTckTest.java
index 7b582b97c5..d23521b8ab 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MaybeFlatMapPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MaybeFlatMapPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java
index 79d781d848..38a105e2be 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeIterableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MergePublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergePublisherTckTest.java
index 71241d03b1..42baefbf64 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MergePublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergePublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MergeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeTckTest.java
index aaefe13fee..d0280ca83d 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MergeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MergeWithCompletableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeWithCompletableTckTest.java
index 7345c157da..e7cd1a2aac 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MergeWithCompletableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeWithCompletableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeEmptyTckTest.java
index cb7e919577..cd8bec5079 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeEmptyTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeTckTest.java
index d064babcdf..1da618c609 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeWithMaybeTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MergeWithSingleTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MergeWithSingleTckTest.java
index cf0c894eae..0933253418 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MergeWithSingleTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MergeWithSingleTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorAsPublisherTckTest.java
index 0c78050212..b4479181d3 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorAsPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorRefCountedTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorRefCountedTckTest.java
index 53b150ef5e..907d3e3f3f 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorRefCountedTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorRefCountedTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java
index ed6de68012..ac82f963f7 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/MulticastProcessorTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ObserveOnTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ObserveOnTckTest.java
index 4b897c82be..d6e555be9c 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ObserveOnTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ObserveOnTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/OnBackpressureBufferTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/OnBackpressureBufferTckTest.java
index 86839c926f..58053819aa 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/OnBackpressureBufferTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/OnBackpressureBufferTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/OnErrorResumeWithTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/OnErrorResumeWithTckTest.java
index d70e27bcf2..4d239c9f4d 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/OnErrorResumeWithTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/OnErrorResumeWithTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/OnErrorReturnItemTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/OnErrorReturnItemTckTest.java
index 708fe26829..abd7b28a4f 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/OnErrorReturnItemTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/OnErrorReturnItemTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/PublishProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/PublishProcessorAsPublisherTckTest.java
index 6154fd4b11..8e596b1995 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/PublishProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/PublishProcessorAsPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/PublishSelectorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/PublishSelectorTckTest.java
index 85cc653825..f996fabe36 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/PublishSelectorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/PublishSelectorTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/PublishTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/PublishTckTest.java
index 8d436c2a06..b85684d1da 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/PublishTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/PublishTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/RangeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/RangeTckTest.java
index 3cba4e0566..53f3ca180e 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/RangeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RangeTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/RebatchRequestsTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/RebatchRequestsTckTest.java
index cca0025f76..c08682d237 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/RebatchRequestsTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RebatchRequestsTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ReduceTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReduceTckTest.java
index 70253dcafb..9495021488 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ReduceTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReduceTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ReduceWithTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReduceWithTckTest.java
index ba56f602c7..9a4f404982 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ReduceWithTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReduceWithTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java b/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
index c65a0bd58f..f7c62cf752 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RefCountProcessor.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/RepeatTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/RepeatTckTest.java
index 1af7ffa8ff..32f5832afd 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/RepeatTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RepeatTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java
index 9608b57358..a32e49c6b9 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorSizeBoundAsPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java
index 41e5529796..f53df02ae6 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorTimeBoundAsPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorUnboundedAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorUnboundedAsPublisherTckTest.java
index 3bc7682284..6f286d68de 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorUnboundedAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplayProcessorUnboundedAsPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ReplaySelectorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplaySelectorTckTest.java
index e944e57955..84b1a86d45 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ReplaySelectorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplaySelectorTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ReplayTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ReplayTckTest.java
index 4380e95746..f62ffb08f3 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ReplayTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ReplayTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/RetryTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/RetryTckTest.java
index d2608c2dce..ba0a0f4b1f 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/RetryTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/RetryTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ScanTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ScanTckTest.java
index 231e9a2590..8a43120c02 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ScanTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ScanTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SequenceEqualTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SequenceEqualTckTest.java
index 6c01635403..a4af22ed7e 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SequenceEqualTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SequenceEqualTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ShareTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ShareTckTest.java
index 6e6b57e1b5..35c9b08e4b 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ShareTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ShareTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SingleFlatMapFlowableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SingleFlatMapFlowableTckTest.java
index 653ad462c1..62565e6470 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SingleFlatMapFlowableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SingleFlatMapFlowableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SingleTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SingleTckTest.java
index 10de09fba7..96af86f6bb 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SingleTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SingleTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SkipLastTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SkipLastTckTest.java
index 9583bbe646..953986813f 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SkipLastTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SkipLastTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SkipTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SkipTckTest.java
index fcd248374e..4f29940485 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SkipTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SkipTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SkipUntilTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SkipUntilTckTest.java
index 762ca1256b..976c4983f1 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SkipUntilTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SkipUntilTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SkipWhileTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SkipWhileTckTest.java
index b560bb4694..e4995aedd8 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SkipWhileTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SkipWhileTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SortedTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SortedTckTest.java
index c8132593e2..51ff134a9c 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SortedTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SortedTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SubscribeOnTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SubscribeOnTckTest.java
index c38720d6d0..f4303d5605 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SubscribeOnTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SubscribeOnTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SwitchIfEmptyTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SwitchIfEmptyTckTest.java
index 9ba97747ff..eb792e45f0 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SwitchIfEmptyTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SwitchIfEmptyTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SwitchMapDelayErrorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SwitchMapDelayErrorTckTest.java
index cb27667aec..d9086e275d 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SwitchMapDelayErrorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SwitchMapDelayErrorTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SwitchMapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SwitchMapTckTest.java
index 1d8ec8f800..1d41a6d11b 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SwitchMapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SwitchMapTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/SwitchOnNextTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/SwitchOnNextTckTest.java
index d275ca6766..196bf4f825 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/SwitchOnNextTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/SwitchOnNextTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/TakeLastTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TakeLastTckTest.java
index 594db93c9f..c737554363 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/TakeLastTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TakeLastTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/TakeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TakeTckTest.java
index 1b2529c914..50fe18caf1 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/TakeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TakeTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/TakeUntilTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TakeUntilTckTest.java
index 256c01cc00..9695560615 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/TakeUntilTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TakeUntilTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/TakeWhileTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TakeWhileTckTest.java
index aa2d32939b..24f6bd4d0d 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/TakeWhileTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TakeWhileTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/TimeIntervalTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TimeIntervalTckTest.java
index d0c7cd52f4..3daebf143a 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/TimeIntervalTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TimeIntervalTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/TimeoutTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TimeoutTckTest.java
index 52ad8d01aa..447a60e951 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/TimeoutTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TimeoutTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/TimerTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TimerTckTest.java
index 5e280bd520..4a6eb00005 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/TimerTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TimerTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/TimestampTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/TimestampTckTest.java
index acdef0b9ee..48d34c8751 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/TimestampTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/TimestampTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ToListTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ToListTckTest.java
index 7d7c11bf8c..e9d17f370f 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ToListTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ToListTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ToMapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ToMapTckTest.java
index 8fe4361189..ae27183ca0 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ToMapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ToMapTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ToMultimapTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ToMultimapTckTest.java
index 925f147a7e..c0d65cbd33 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ToMultimapTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ToMultimapTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ToSortedListTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ToSortedListTckTest.java
index fed8ec3669..11d1029fc2 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ToSortedListTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ToSortedListTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorAsPublisherTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorAsPublisherTckTest.java
index 142ffbd4a7..a888ce35fa 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorAsPublisherTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorAsPublisherTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java
index 079c349245..44bcc5a142 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/UnicastProcessorTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/UnsubscribeOnTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/UnsubscribeOnTckTest.java
index c3a386f387..1ab8398b74 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/UnsubscribeOnTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/UnsubscribeOnTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/UsingTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/UsingTckTest.java
index 9c0e41f3d9..03460fdaba 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/UsingTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/UsingTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/WindowBoundaryTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/WindowBoundaryTckTest.java
index bee09d0eb5..5b01ad696c 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/WindowBoundaryTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/WindowBoundaryTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/WindowExactSizeTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/WindowExactSizeTckTest.java
index 5ee3500379..dae3bf0c45 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/WindowExactSizeTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/WindowExactSizeTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/WithLatestFromTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/WithLatestFromTckTest.java
index 3d91048c37..ae7cddb7f9 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/WithLatestFromTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/WithLatestFromTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java
index 8ef456e609..9dae4bcd9a 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ZipIterableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ZipTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ZipTckTest.java
index 4c94e97ed7..c9427876d8 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ZipTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ZipTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ZipWithIterableTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ZipWithIterableTckTest.java
index 2d9eae43ea..6a4cde43f5 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ZipWithIterableTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ZipWithIterableTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/tck/ZipWithTckTest.java b/src/test/java/io/reactivex/rxjava3/tck/ZipWithTckTest.java
index f71dd6b98d..6992605ad8 100644
--- a/src/test/java/io/reactivex/rxjava3/tck/ZipWithTckTest.java
+++ b/src/test/java/io/reactivex/rxjava3/tck/ZipWithTckTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
index 8eb1d9f906..212e10a039 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverable.java b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverable.java
index 448b896ce0..4e701137ab 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverable.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverable.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.testsupport;
 
 import java.lang.annotation.*;
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
index fa78a23410..28f6d2f89e 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/SuppressUndeliverableRule.java
@@ -1,18 +1,16 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.testsupport;
 
 import org.junit.rules.TestRule;
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 9a19f84a7a..3f72c43976 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
index ff7df2d8b3..ce2b050baf 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.testsupport;
 
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
index 6026501a1d..278969b37b 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
index 43d4087c3e..b7f157c777 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -10,6 +10,7 @@
  * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
  * the License for the specific language governing permissions and limitations under the License.
  */
+
 package io.reactivex.rxjava3.testsupport;
 
 import java.util.concurrent.atomic.*;
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
index 0918c08e11..26644dbc22 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java b/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java
index 2615a3fbe5..06804fa282 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TimesteppingScheduler.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
index 504232be2e..d03c0dcade 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java
index 39704aba14..528ee6de97 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeParser.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/CatchThrowIfFatalCheck.java b/src/test/java/io/reactivex/rxjava3/validators/CatchThrowIfFatalCheck.java
index 5b78a2da0a..45594fe17b 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/CatchThrowIfFatalCheck.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/CatchThrowIfFatalCheck.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java b/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
index df6f0a378a..0ec5952f8b 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/CheckLocalVariablesInTests.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java b/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java
index c5e601d017..5d7223cbd1 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/FixLicenseHeaders.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -26,7 +26,7 @@
 public class FixLicenseHeaders {
 
     String[] header = {
-    "/**",
+    "/*",
     " * Copyright (c) 2016-present, RxJava Contributors.",
     " *",
     " * Licensed under the Apache License, Version 2.0 (the \"License\"); you may not use this file except in",
@@ -88,7 +88,7 @@ public void checkAndUpdateLicenses() throws Exception {
                                 in.close();
                             }
 
-                            if (!lines.get(0).equals(header[0]) && !lines.get(1).equals(header[1])) {
+                            if (!lines.get(0).equals(header[0]) || !lines.get(1).equals(header[1])) {
                                 fail.append("java.lang.RuntimeException: missing header added, refresh and re-run tests!\r\n")
                                 .append(" at ")
                                 ;
diff --git a/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java b/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
index a1ad772f05..bbf86c4188 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/InternalWrongNaming.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
index 8f80a9b2be..698fdf7e83 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocCodesAndLinks.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java
index 083da2902c..016e1b02a2 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocFindUnescapedAngleBrackets.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
@@ -12,6 +12,7 @@
  */
 
 package io.reactivex.rxjava3.validators;
+
 import java.io.*;
 import java.util.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
index 9a63ea2b0d..c3c814f9ff 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index e22fdd9521..b09303643c 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/MaybeNo2Dot0Since.java b/src/test/java/io/reactivex/rxjava3/validators/MaybeNo2Dot0Since.java
index f8b9e63164..b894492894 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/MaybeNo2Dot0Since.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/MaybeNo2Dot0Since.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java b/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java
index 36a0297a43..2c27fc6fd4 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/NewLinesBeforeAnnotation.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java b/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java
index 47e5d1dfd6..61db410b5b 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/NoAnonymousInnerClassesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/OperatorsAreFinal.java b/src/test/java/io/reactivex/rxjava3/validators/OperatorsAreFinal.java
index 6343a6e02b..a59e3aefa2 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/OperatorsAreFinal.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/OperatorsAreFinal.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java b/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java
index a603a589fc..76d4a836f9 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/OperatorsUseInterfaces.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 7eff55d15e..84f99707f2 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
index 0445bfbe71..1928fbee60 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationNaming.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParameterNamesInClassesTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParameterNamesInClassesTest.java
index 11e376a653..2284e32f6a 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParameterNamesInClassesTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParameterNamesInClassesTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/PublicFinalMethods.java b/src/test/java/io/reactivex/rxjava3/validators/PublicFinalMethods.java
index f7f59d630d..ad7df44964 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/PublicFinalMethods.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/PublicFinalMethods.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
index ed1080023f..ee04efa28c 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java b/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java
index 2fb3460a73..7a75611b10 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TestPrefixInMethodName.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java b/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java
index 6aff9cc10e..654b4884b4 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TextualAorAn.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
diff --git a/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java b/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
index 581e78301b..c79c879337 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/TooManyEmptyNewLines.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2016-present, RxJava Contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in

From 2591862643d29106b8aff85c64fecbd6cb509faa Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Fri, 5 Mar 2021 10:29:47 +0100
Subject: [PATCH 230/665] Ignore .checkstyle (local property config for the
 header file)

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 428d55b2fb..47c637dd8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -73,4 +73,7 @@ bin/
 # PMD files
 .pmd
 .ruleset
-test-output/
\ No newline at end of file
+test-output/
+
+# Checkstyle local config
+.checkstyle
\ No newline at end of file

From 26dddf51efedf547b3f77f1231130ea59e235d10 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 5 Mar 2021 10:30:00 +0100
Subject: [PATCH 231/665] 3.x: Fix Schedulers.from to honor interruptibleWorker
 across methods (#7203)

---
 .../schedulers/AbstractDirectTask.java        |  17 +-
 .../schedulers/ExecutorScheduler.java         |   6 +-
 .../internal/schedulers/NewThreadWorker.java  |   4 +-
 .../ScheduledDirectPeriodicTask.java          |   4 +-
 .../schedulers/ScheduledDirectTask.java       |   4 +-
 .../internal/schedulers/SingleScheduler.java  |   4 +-
 .../completable/CompletableTimerTest.java     |   2 +-
 .../operators/flowable/FlowableTimerTest.java |   2 +-
 .../operators/maybe/MaybeTimerTest.java       |   2 +-
 .../observable/ObservableTimerTest.java       |   2 +-
 .../operators/single/SingleTimerTest.java     |   2 +-
 .../schedulers/AbstractDirectTaskTest.java    |  16 +-
 .../ScheduledDirectPeriodicTaskTest.java      |   2 +-
 .../ExecutorSchedulerInterruptibleTest.java   | 460 ++++++++++++++++++
 14 files changed, 499 insertions(+), 28 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
index deed734eff..556fcd23c7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTask.java
@@ -32,14 +32,17 @@ abstract class AbstractDirectTask
 
     protected final Runnable runnable;
 
+    protected final boolean interruptOnCancel;
+
     protected Thread runner;
 
     protected static final FutureTask<Void> FINISHED = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
 
     protected static final FutureTask<Void> DISPOSED = new FutureTask<>(Functions.EMPTY_RUNNABLE, null);
 
-    AbstractDirectTask(Runnable runnable) {
+    AbstractDirectTask(Runnable runnable, boolean interruptOnCancel) {
         this.runnable = runnable;
+        this.interruptOnCancel = interruptOnCancel;
     }
 
     @Override
@@ -48,7 +51,7 @@ public final void dispose() {
         if (f != FINISHED && f != DISPOSED) {
             if (compareAndSet(f, DISPOSED)) {
                 if (f != null) {
-                    f.cancel(runner != Thread.currentThread());
+                    cancelFuture(f);
                 }
             }
         }
@@ -67,7 +70,7 @@ public final void setFuture(Future<?> future) {
                 break;
             }
             if (f == DISPOSED) {
-                future.cancel(runner != Thread.currentThread());
+                cancelFuture(future);
                 break;
             }
             if (compareAndSet(f, future)) {
@@ -76,6 +79,14 @@ public final void setFuture(Future<?> future) {
         }
     }
 
+    private void cancelFuture(Future<?> future) {
+        if (runner == Thread.currentThread()) {
+            future.cancel(false);
+        } else {
+            future.cancel(interruptOnCancel);
+        }
+    }
+
     @Override
     public Runnable getWrappedRunnable() {
         return runnable;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
index 534513448a..c3957fa400 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
@@ -58,7 +58,7 @@ public Disposable scheduleDirect(@NonNull Runnable run) {
         Runnable decoratedRun = RxJavaPlugins.onSchedule(run);
         try {
             if (executor instanceof ExecutorService) {
-                ScheduledDirectTask task = new ScheduledDirectTask(decoratedRun);
+                ScheduledDirectTask task = new ScheduledDirectTask(decoratedRun, interruptibleWorker);
                 Future<?> f = ((ExecutorService)executor).submit(task);
                 task.setFuture(f);
                 return task;
@@ -85,7 +85,7 @@ public Disposable scheduleDirect(@NonNull Runnable run, final long delay, final
         final Runnable decoratedRun = RxJavaPlugins.onSchedule(run);
         if (executor instanceof ScheduledExecutorService) {
             try {
-                ScheduledDirectTask task = new ScheduledDirectTask(decoratedRun);
+                ScheduledDirectTask task = new ScheduledDirectTask(decoratedRun, interruptibleWorker);
                 Future<?> f = ((ScheduledExecutorService)executor).schedule(task, delay, unit);
                 task.setFuture(f);
                 return task;
@@ -110,7 +110,7 @@ public Disposable schedulePeriodicallyDirect(@NonNull Runnable run, long initial
         if (executor instanceof ScheduledExecutorService) {
             Runnable decoratedRun = RxJavaPlugins.onSchedule(run);
             try {
-                ScheduledDirectPeriodicTask task = new ScheduledDirectPeriodicTask(decoratedRun);
+                ScheduledDirectPeriodicTask task = new ScheduledDirectPeriodicTask(decoratedRun, interruptibleWorker);
                 Future<?> f = ((ScheduledExecutorService)executor).scheduleAtFixedRate(task, initialDelay, period, unit);
                 task.setFuture(f);
                 return task;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
index 5945ac6c38..deba4948ba 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
@@ -59,7 +59,7 @@ public Disposable schedule(@NonNull final Runnable action, long delayTime, @NonN
      * @return the ScheduledRunnable instance
      */
     public Disposable scheduleDirect(final Runnable run, long delayTime, TimeUnit unit) {
-        ScheduledDirectTask task = new ScheduledDirectTask(RxJavaPlugins.onSchedule(run));
+        ScheduledDirectTask task = new ScheduledDirectTask(RxJavaPlugins.onSchedule(run), true);
         try {
             Future<?> f;
             if (delayTime <= 0L) {
@@ -104,7 +104,7 @@ public Disposable schedulePeriodicallyDirect(Runnable run, long initialDelay, lo
 
             return periodicWrapper;
         }
-        ScheduledDirectPeriodicTask task = new ScheduledDirectPeriodicTask(decoratedRun);
+        ScheduledDirectPeriodicTask task = new ScheduledDirectPeriodicTask(decoratedRun, true);
         try {
             Future<?> f = executor.scheduleAtFixedRate(task, initialDelay, period, unit);
             task.setFuture(f);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
index 8a7d0ebe03..1862035dde 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTask.java
@@ -24,8 +24,8 @@ public final class ScheduledDirectPeriodicTask extends AbstractDirectTask implem
 
     private static final long serialVersionUID = 1811839108042568751L;
 
-    public ScheduledDirectPeriodicTask(Runnable runnable) {
-        super(runnable);
+    public ScheduledDirectPeriodicTask(Runnable runnable, boolean interruptOnCancel) {
+        super(runnable, interruptOnCancel);
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
index c0d10ac126..6ca8992971 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectTask.java
@@ -26,8 +26,8 @@ public final class ScheduledDirectTask extends AbstractDirectTask implements Cal
 
     private static final long serialVersionUID = 1811839108042568751L;
 
-    public ScheduledDirectTask(Runnable runnable) {
-        super(runnable);
+    public ScheduledDirectTask(Runnable runnable, boolean interruptOnCancel) {
+        super(runnable, interruptOnCancel);
     }
 
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
index 5de8e44f05..98d3b04626 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SingleScheduler.java
@@ -106,7 +106,7 @@ public Worker createWorker() {
     @NonNull
     @Override
     public Disposable scheduleDirect(@NonNull Runnable run, long delay, TimeUnit unit) {
-        ScheduledDirectTask task = new ScheduledDirectTask(RxJavaPlugins.onSchedule(run));
+        ScheduledDirectTask task = new ScheduledDirectTask(RxJavaPlugins.onSchedule(run), true);
         try {
             Future<?> f;
             if (delay <= 0L) {
@@ -146,7 +146,7 @@ public Disposable schedulePeriodicallyDirect(@NonNull Runnable run, long initial
 
             return periodicWrapper;
         }
-        ScheduledDirectPeriodicTask task = new ScheduledDirectPeriodicTask(decoratedRun);
+        ScheduledDirectPeriodicTask task = new ScheduledDirectPeriodicTask(decoratedRun, true);
         try {
             Future<?> f = executor.get().scheduleAtFixedRate(task, initialDelay, period, unit);
             task.setFuture(f);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java
index 323b6b4f9b..bfd87a1af6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableTimerTest.java
@@ -37,7 +37,7 @@ public void dispose() {
     public void timerInterruptible() throws Exception {
         ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
         try {
-            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec) }) {
+            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec, true) }) {
                 final AtomicBoolean interrupted = new AtomicBoolean();
                 TestObserver<Void> to = Completable.timer(1, TimeUnit.MILLISECONDS, s)
                 .doOnComplete(new Action() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
index 99bf23fa72..4f0216e612 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimerTest.java
@@ -352,7 +352,7 @@ public void timerDelayZero() {
     public void timerInterruptible() throws Exception {
         ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
         try {
-            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec) }) {
+            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec, true) }) {
                 final AtomicBoolean interrupted = new AtomicBoolean();
                 TestSubscriber<Long> ts = Flowable.timer(1, TimeUnit.MILLISECONDS, s)
                 .map(new Function<Long, Long>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java
index 7daba77969..05ffdf0562 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeTimerTest.java
@@ -37,7 +37,7 @@ public void dispose() {
     public void timerInterruptible() throws Exception {
         ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
         try {
-            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec) }) {
+            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec, true) }) {
                 final AtomicBoolean interrupted = new AtomicBoolean();
                 TestObserver<Long> to = Maybe.timer(1, TimeUnit.MILLISECONDS, s)
                 .map(new Function<Long, Long>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
index bb8860e4dd..9229d24fe3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTimerTest.java
@@ -317,7 +317,7 @@ public void timerDelayZero() {
     public void timerInterruptible() throws Exception {
         ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
         try {
-            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec) }) {
+            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec, true) }) {
                 final AtomicBoolean interrupted = new AtomicBoolean();
                 TestObserver<Long> to = Observable.timer(1, TimeUnit.MILLISECONDS, s)
                 .map(new Function<Long, Long>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java
index 0b03b7ef00..3b5797f498 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimerTest.java
@@ -37,7 +37,7 @@ public void disposed() {
     public void timerInterruptible() throws Exception {
         ScheduledExecutorService exec = Executors.newSingleThreadScheduledExecutor();
         try {
-            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec) }) {
+            for (Scheduler s : new Scheduler[] { Schedulers.single(), Schedulers.computation(), Schedulers.newThread(), Schedulers.io(), Schedulers.from(exec, true) }) {
                 final AtomicBoolean interrupted = new AtomicBoolean();
                 TestObserver<Long> to = Single.timer(1, TimeUnit.MILLISECONDS, s)
                 .map(new Function<Long, Long>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
index dfdef0a546..cd10a10443 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/AbstractDirectTaskTest.java
@@ -27,7 +27,7 @@ public class AbstractDirectTaskTest extends RxJavaTest {
 
     @Test
     public void cancelSetFuture() {
-        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE) {
+        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE, true) {
             private static final long serialVersionUID = 208585707945686116L;
         };
         final Boolean[] interrupted = { null };
@@ -58,7 +58,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
 
     @Test
     public void cancelSetFutureCurrentThread() {
-        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE) {
+        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE, true) {
             private static final long serialVersionUID = 208585707945686116L;
         };
         final Boolean[] interrupted = { null };
@@ -91,7 +91,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
 
     @Test
     public void setFutureCancel() {
-        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE) {
+        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE, true) {
             private static final long serialVersionUID = 208585707945686116L;
         };
         final Boolean[] interrupted = { null };
@@ -119,7 +119,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
 
     @Test
     public void setFutureCancelSameThread() {
-        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE) {
+        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE, true) {
             private static final long serialVersionUID = 208585707945686116L;
         };
         final Boolean[] interrupted = { null };
@@ -148,7 +148,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
 
     @Test
     public void finished() {
-        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE) {
+        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE, true) {
             private static final long serialVersionUID = 208585707945686116L;
         };
         final Boolean[] interrupted = { null };
@@ -177,7 +177,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
 
     @Test
     public void finishedCancel() {
-        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE) {
+        AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE, true) {
             private static final long serialVersionUID = 208585707945686116L;
         };
         final Boolean[] interrupted = { null };
@@ -211,7 +211,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
     @Test
     public void disposeSetFutureRace() {
         for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-            final AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE) {
+            final AbstractDirectTask task = new AbstractDirectTask(Functions.EMPTY_RUNNABLE, true) {
                 private static final long serialVersionUID = 208585707945686116L;
             };
 
@@ -246,7 +246,7 @@ static class TestDirectTask extends AbstractDirectTask {
         private static final long serialVersionUID = 587679821055711738L;
 
         TestDirectTask() {
-            super(Functions.EMPTY_RUNNABLE);
+            super(Functions.EMPTY_RUNNABLE, true);
         }
     }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
index 5d0f486ff4..d41906b13a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ScheduledDirectPeriodicTaskTest.java
@@ -35,7 +35,7 @@ public void runnableThrows() {
                 public void run() {
                     throw new TestException();
                 }
-            });
+            }, true);
 
             try {
                 task.run();
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
index 4f55e7e8b2..f4b5f82ec4 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
@@ -505,4 +505,464 @@ public void run() {
             worker.dispose();
         }
     }
+
+    @Test
+    public void interruptibleDirectTaskScheduledExecutor() throws Exception {
+        ScheduledExecutorService exec = Executors.newScheduledThreadPool(1);
+        try {
+            Scheduler scheduler = Schedulers.from(exec, true);
+
+            final AtomicInteger sync = new AtomicInteger(2);
+
+            final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+            Disposable d = scheduler.scheduleDirect(new Runnable() {
+                @Override
+                public void run() {
+                    if (sync.decrementAndGet() != 0) {
+                        while (sync.get() != 0) { }
+                    }
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException ex) {
+                        isInterrupted.set(true);
+                    }
+                }
+            });
+
+            if (sync.decrementAndGet() != 0) {
+                while (sync.get() != 0) { }
+            }
+
+            Thread.sleep(500);
+
+            d.dispose();
+
+            int i = 20;
+            while (i-- > 0 && !isInterrupted.get()) {
+                Thread.sleep(50);
+            }
+
+            assertTrue("Interruption did not propagate", isInterrupted.get());
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void interruptibleWorkerTaskScheduledExecutor() throws Exception {
+        ScheduledExecutorService exec = Executors.newScheduledThreadPool(1);
+        try {
+            Scheduler scheduler = Schedulers.from(exec, true);
+
+            Worker worker = scheduler.createWorker();
+
+            try {
+                final AtomicInteger sync = new AtomicInteger(2);
+
+                final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+                Disposable d = worker.schedule(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (sync.decrementAndGet() != 0) {
+                            while (sync.get() != 0) { }
+                        }
+                        try {
+                            Thread.sleep(1000);
+                        } catch (InterruptedException ex) {
+                            isInterrupted.set(true);
+                        }
+                    }
+                });
+
+                if (sync.decrementAndGet() != 0) {
+                    while (sync.get() != 0) { }
+                }
+
+                Thread.sleep(500);
+
+                d.dispose();
+
+                int i = 20;
+                while (i-- > 0 && !isInterrupted.get()) {
+                    Thread.sleep(50);
+                }
+
+                assertTrue("Interruption did not propagate", isInterrupted.get());
+            } finally {
+                worker.dispose();
+            }
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void nonInterruptibleDirectTask() throws Exception {
+        ExecutorService exec = Executors.newSingleThreadExecutor();
+        try {
+            Scheduler scheduler = Schedulers.from(exec, false);
+
+            final AtomicInteger sync = new AtomicInteger(2);
+
+            final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+            Disposable d = scheduler.scheduleDirect(new Runnable() {
+                @Override
+                public void run() {
+                    if (sync.decrementAndGet() != 0) {
+                        while (sync.get() != 0) { }
+                    }
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException ex) {
+                        isInterrupted.set(true);
+                    }
+                }
+            });
+
+            if (sync.decrementAndGet() != 0) {
+                while (sync.get() != 0) { }
+            }
+
+            Thread.sleep(500);
+
+            d.dispose();
+
+            int i = 20;
+            while (i-- > 0 && !isInterrupted.get()) {
+                Thread.sleep(50);
+            }
+
+            assertFalse("Interruption happened", isInterrupted.get());
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void nonInterruptibleWorkerTask() throws Exception {
+        ExecutorService exec = Executors.newSingleThreadExecutor();
+        try {
+            Scheduler scheduler = Schedulers.from(exec, false);
+
+            Worker worker = scheduler.createWorker();
+
+            try {
+                final AtomicInteger sync = new AtomicInteger(2);
+
+                final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+                Disposable d = worker.schedule(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (sync.decrementAndGet() != 0) {
+                            while (sync.get() != 0) { }
+                        }
+                        try {
+                            Thread.sleep(1000);
+                        } catch (InterruptedException ex) {
+                            isInterrupted.set(true);
+                        }
+                    }
+                });
+
+                if (sync.decrementAndGet() != 0) {
+                    while (sync.get() != 0) { }
+                }
+
+                Thread.sleep(500);
+
+                d.dispose();
+
+                int i = 20;
+                while (i-- > 0 && !isInterrupted.get()) {
+                    Thread.sleep(50);
+                }
+
+                assertFalse("Interruption happened", isInterrupted.get());
+            } finally {
+                worker.dispose();
+            }
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void nonInterruptibleDirectTaskScheduledExecutor() throws Exception {
+        ScheduledExecutorService exec = Executors.newScheduledThreadPool(1);
+        try {
+            Scheduler scheduler = Schedulers.from(exec, false);
+
+            final AtomicInteger sync = new AtomicInteger(2);
+
+            final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+            Disposable d = scheduler.scheduleDirect(new Runnable() {
+                @Override
+                public void run() {
+                    if (sync.decrementAndGet() != 0) {
+                        while (sync.get() != 0) { }
+                    }
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException ex) {
+                        isInterrupted.set(true);
+                    }
+                }
+            });
+
+            if (sync.decrementAndGet() != 0) {
+                while (sync.get() != 0) { }
+            }
+
+            Thread.sleep(500);
+
+            d.dispose();
+
+            int i = 20;
+            while (i-- > 0 && !isInterrupted.get()) {
+                Thread.sleep(50);
+            }
+
+            assertFalse("Interruption happened", isInterrupted.get());
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void nonInterruptibleWorkerTaskScheduledExecutor() throws Exception {
+        ScheduledExecutorService exec = Executors.newScheduledThreadPool(1);
+        try {
+            Scheduler scheduler = Schedulers.from(exec, false);
+
+            Worker worker = scheduler.createWorker();
+
+            try {
+                final AtomicInteger sync = new AtomicInteger(2);
+
+                final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+                Disposable d = worker.schedule(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (sync.decrementAndGet() != 0) {
+                            while (sync.get() != 0) { }
+                        }
+                        try {
+                            Thread.sleep(1000);
+                        } catch (InterruptedException ex) {
+                            isInterrupted.set(true);
+                        }
+                    }
+                });
+
+                if (sync.decrementAndGet() != 0) {
+                    while (sync.get() != 0) { }
+                }
+
+                Thread.sleep(500);
+
+                d.dispose();
+
+                int i = 20;
+                while (i-- > 0 && !isInterrupted.get()) {
+                    Thread.sleep(50);
+                }
+
+                assertFalse("Interruption happened", isInterrupted.get());
+            } finally {
+                worker.dispose();
+            }
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void nonInterruptibleDirectTaskTimed() throws Exception {
+        ExecutorService exec = Executors.newSingleThreadExecutor();
+        try {
+            Scheduler scheduler = Schedulers.from(exec, false);
+
+            final AtomicInteger sync = new AtomicInteger(2);
+
+            final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+            Disposable d = scheduler.scheduleDirect(new Runnable() {
+                @Override
+                public void run() {
+                    if (sync.decrementAndGet() != 0) {
+                        while (sync.get() != 0) { }
+                    }
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException ex) {
+                        isInterrupted.set(true);
+                    }
+                }
+            }, 1, TimeUnit.MILLISECONDS);
+
+            if (sync.decrementAndGet() != 0) {
+                while (sync.get() != 0) { }
+            }
+
+            Thread.sleep(500);
+
+            d.dispose();
+
+            int i = 20;
+            while (i-- > 0 && !isInterrupted.get()) {
+                Thread.sleep(50);
+            }
+
+            assertFalse("Interruption happened", isInterrupted.get());
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void nonInterruptibleWorkerTaskTimed() throws Exception {
+        ExecutorService exec = Executors.newSingleThreadExecutor();
+        try {
+            Scheduler scheduler = Schedulers.from(exec, false);
+
+            Worker worker = scheduler.createWorker();
+
+            try {
+                final AtomicInteger sync = new AtomicInteger(2);
+
+                final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+                Disposable d = worker.schedule(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (sync.decrementAndGet() != 0) {
+                            while (sync.get() != 0) { }
+                        }
+                        try {
+                            Thread.sleep(1000);
+                        } catch (InterruptedException ex) {
+                            isInterrupted.set(true);
+                        }
+                    }
+                }, 1, TimeUnit.MILLISECONDS);
+
+                if (sync.decrementAndGet() != 0) {
+                    while (sync.get() != 0) { }
+                }
+
+                Thread.sleep(500);
+
+                d.dispose();
+
+                int i = 20;
+                while (i-- > 0 && !isInterrupted.get()) {
+                    Thread.sleep(50);
+                }
+
+                assertFalse("Interruption happened", isInterrupted.get());
+            } finally {
+                worker.dispose();
+            }
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void nonInterruptibleDirectTaskScheduledExecutorTimed() throws Exception {
+        ScheduledExecutorService exec = Executors.newScheduledThreadPool(1);
+        try {
+            Scheduler scheduler = Schedulers.from(exec, false);
+
+            final AtomicInteger sync = new AtomicInteger(2);
+
+            final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+            Disposable d = scheduler.scheduleDirect(new Runnable() {
+                @Override
+                public void run() {
+                    if (sync.decrementAndGet() != 0) {
+                        while (sync.get() != 0) { }
+                    }
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException ex) {
+                        isInterrupted.set(true);
+                    }
+                }
+            }, 1, TimeUnit.MILLISECONDS);
+
+            if (sync.decrementAndGet() != 0) {
+                while (sync.get() != 0) { }
+            }
+
+            Thread.sleep(500);
+
+            d.dispose();
+
+            int i = 20;
+            while (i-- > 0 && !isInterrupted.get()) {
+                Thread.sleep(50);
+            }
+
+            assertFalse("Interruption happened", isInterrupted.get());
+        } finally {
+            exec.shutdown();
+        }
+    }
+
+    @Test
+    public void nonInterruptibleWorkerTaskScheduledExecutorTimed() throws Exception {
+        ScheduledExecutorService exec = Executors.newScheduledThreadPool(1);
+        try {
+            Scheduler scheduler = Schedulers.from(exec, false);
+
+            Worker worker = scheduler.createWorker();
+
+            try {
+                final AtomicInteger sync = new AtomicInteger(2);
+
+                final AtomicBoolean isInterrupted = new AtomicBoolean();
+
+                Disposable d = worker.schedule(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (sync.decrementAndGet() != 0) {
+                            while (sync.get() != 0) { }
+                        }
+                        try {
+                            Thread.sleep(1000);
+                        } catch (InterruptedException ex) {
+                            isInterrupted.set(true);
+                        }
+                    }
+                }, 1, TimeUnit.MILLISECONDS);
+
+                if (sync.decrementAndGet() != 0) {
+                    while (sync.get() != 0) { }
+                }
+
+                Thread.sleep(500);
+
+                d.dispose();
+
+                int i = 20;
+                while (i-- > 0 && !isInterrupted.get()) {
+                    Thread.sleep(50);
+                }
+
+                assertFalse("Interruption happened", isInterrupted.get());
+            } finally {
+                worker.dispose();
+            }
+        } finally {
+            exec.shutdown();
+        }
+    }
 }

From f75498c8bc35eb8c00f470dd10c45c47604701ca Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 8 Mar 2021 09:37:38 +0100
Subject: [PATCH 232/665] 3.x: Fix wrong reference in
 Single.flattenStreamAsObservable javadoc (#7206)

---
 src/main/java/io/reactivex/rxjava3/core/Single.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 06781c7f9a..dbe3694913 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -5687,7 +5687,7 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
      * <p>
      * The operator closes the {@code Stream} upon cancellation and when it terminates. The exceptions raised when
      * closing a {@code Stream} are routed to the global error handler ({@link RxJavaPlugins#onError(Throwable)}.
-     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsFlowable(Function)}:
+     * If a {@code Stream} should not be closed, turn it into an {@link Iterable} and use {@link #flattenAsObservable(Function)}:
      * <pre><code>
      * source.flattenAsObservable(item -&gt; createStream(item)::iterator);
      * </code></pre>

From 1a1285529abcc7b6a2c3d1a97ca34d20d2e9bfca Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 10 Mar 2021 09:06:31 +0100
Subject: [PATCH 233/665] 3.x: Upgrade Gradle to 6.8.3 (#7208)

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 58702 -> 59203 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 ++
 gradlew.bat                              |  25 +++++++----------------
 4 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index cc4fdc293d0e50b0ad9b65c16e7ddd1db2f6025b..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f 100644
GIT binary patch
delta 18978
zcmY&fV{@PlkPJ5)+qP}nwr$&ZV%xTD+uGRNVB>7e4eq`Bc2)Barh0m&r+aQ1d}I#1
zF#sCA44g!o7Xk!i0}2F0IK{~rBc=Z*bV@a}0ia;$cOLt5HS1a4@*VT_shE|g<S2yj
zXd;$1{?uStvLbMqIV;!qCD(WE##7+=WJr*3AN&?>j|F)G_Q`4pn)*lCWG0!y+Cgg6
zvR4x*bZ%013&osqCFlqib0Yg~auk(8d~R0Id*-CETJ*z@aX39Dra2_%UKj0GIDGGU
zMxbIwfRUS|@Ax4M@}S~jI@7q47FsgZn+Pl3!P99&*9AWzgW=s^6EjU_uO4Dpz1|no
zugS`Hb$T5805c4isS)p>pjDrj>z9*27i`c(@Ku({PegC>!>!Z~edi(`LD~;#fy=~l
z?i=(j)-iuwf%Vh_qq%w}H-s44-U|p`aloR{g`rLqp+OCTJ9jH?z34kqqD(r~rd?z(
z#KznzzQ<hI#7g?4;a)u7Lp-scEomk;emWP<fMyB=E)FpVyI6d_tWemX^N&$H4ezv3
zJyZsANvKjU$2g`9HYJ&+XCHbm9gIP`YOs$Bd`+9ylYcYc7VCNM4@ckgo!7~yVnFMs
z-8?ylz1pV9Y7w>fsQg%&2PcHVV4iz+lYI0gP0MffDN0+}^u;HxPn3n>0KL|Q=st|C
z1qWk79y&a6!KMq&+vqT8G&;O-<e0r2OL#e*&QNOb<)wR?G<V!BxPPf@MN1Ww)ec7U
zG4Lf~xy-lOVe8JD!?>MxzvaVczkxFz^1die0bg~rDxSUs<~=wa6^}~)iH<OX>bAcu
zcs20JA|-eCu!q;xPBA3QEn`j^dFdfZ-jN2xxAq-!Asv%>)mQ@}d5S0PJoWfQ6|Wvc
zk)|$IlDX}5D-@@Gj?&m>HgP%O%nT7CIj8G?;QqL{gtvO<Y^^oP{#p?4Fb42OF>$j0
zj4nK_(?x`@CFbJljF{~wfRiCEEz_N|>l{^~H>%yRh*b5PTT$C%AMj4sq?pmVB^RXJ
zU{+3KSdD6iKC&MK1xyp}a+TI^cMhA|P$r4CR&3TD^d<cC4;rd}&$%&Cyb!f27?N{u
z3)d`6>Gg(HRte80B^=63KLHexQ)C&jZ;BbfresuW5r&E0;Ps#PQPw<DcV9vu!QXF5
z6@F8WF^K0v+lTBD<%_5^;ff(@i`uN$%snj{L|`PeC1&q6;QWDNpWe*Oy0|hB_Mde-
z`SBPU04o`(%~doI0iNtCVi+dfY8r7<OdNWyCQ?DOC$U`k1zpT~{SLt3-0Um=1{YhX
zF1v%ckouAn{|v)<pp8G^Z2p#}43PW*7(oD4YVoLD5+nuXV(!hEZui!!nO71%+G%L2
zyjiK`$<-koPIG~)Lf(t;$}_gX&B=RrTGE&Oi{2wKCFfhbH5)C_Cx{$6gvyIwdqt}g
zwpPx36$>JxdOiXPlq9QyjQRqTs^KRCO0wV(Fd!g5e}eosBS03r6|U&OK|lt7q!1$T
z0_wY}D9UKx`eK;t;!#Sf52WniYD)i>*i@OPMaY$wugt^ncZT(K(pP{=%S+I_-1DMx
zM&C0;oAUD=bZjxnxCq}l{!`Dn&%BmX1B9=D4+x{5jN)Dkl*Rds1dp1efkf*+#NbS%
z2IY~#UZ6Yw4B9i?M0Um)LrLIuPOK_}0;VK?P4z-y5xuIRK~=#-;M7g4%d?N*&<*xc
zLikH5(ZjnVtEpYP;@HQu64#f^oFyMaa}AQ=({5lTdb;W@rZCwb>#nDAyXvjVvlHca
zjS?-`<e5dRxpUNivLY?UsWF*PPPL-!upP@uFb6Ncm#44&F?*SUD1now9*b3Z1<D=B
zWc{k^ncckolQi#jxhttHZrzZ~oh-ceNI4mYqorqbXs|fp)n$<<g^5%Z&#c33U<WeQ
zBL`R=rlZzdT*j-_2iZg`US>&tNP0ur>w?2wpMqeIcILC9$Y}lXcO&Qm%Pk1~!6xGs
zDG5d(n>mCEt%!`wL~D%j02lX19gzF8;-<n(CUzIA0u^m86=`fBq&EzPfo%hB4iD;y
zbpGt>L;bre)V$WohLNnbM0Aiw^!Il^wW#P_E{o)4)~AWnBHd^zCpWq5ZP+!Oqt51@
zE)UAYk|&|4%0mxhuxVxN_(_H)mJdUAM<}^}+L%_TTv_d;2vwEaywb=-FTfR?Px^63
zTz5#ncoy^ItJtk5f%YR<v7?GGJ5mPPhS!z`cdVsq`-EfFyJ#oX?G^1eq^SNM4ie*w
zBKOTqHn=RQjlO<$p9~yDZWH!VMy(m_l3)ZM%*!DFz46W$BAm7rHo4SUvJAj%e<|Hq
z5VK7)|A@7?tuX>!2<Axk00fT1elxbVr06}LD&K)VdqyT|WJ#)<5e`o?;PrW{^@!`-
zS8j%|ZNI?xt7JSZ{Hfm+-Q5w;qxJvv*4qm6jd<1DYdUiguz&OdHzYpf-FXEi3@9dq
z`gw$T_-cRmh?>Ea+ZnD9?P7|eU&=iEz9^p^$4al}yjvalDZB%DAvYc;B1}qVALh`w
z+_UKPlj`^&J44~OaRBUoj7IXW(LqtTdXysq1Xu2}{VIZksB+-{qlpY;D&Pna1VoDn
z1cdni_&0tP0jSe~_QIWT4@iJ$l6CSHMj<~7HOEIoTu63LPPa=cCX?zFOH8HKPSzYu
z4uv#17!yIu<BGqYjJl@su%mR&EqBQIueg$Of2N9W%Op(J?Q)zWzesIAN+q<)E3Wq?
zH-5um5DAI2E;qb~Zf0>h?)g5%0~VS-N0OR`q{Z~WM{R`0@{RWymVXUiUx(Pkzv4IW
zu&)JChj&uu*Y@A<rfFZJqJYf4^7%a4yDOsllA+fb<9QFkJJ@HM)t64=XPnj7nrP3t
zFU)722yj!x^A3ebUv%SpHuIQZ@?IeJFi-Ot6JbyasGseRKG-jQ^jPg7{{p<uWFHF%
z-Wh>+$HfmtZnbZrGD4p-NwyNEs#$`qQF3##uN5S9C+Z%)M{x$#&1>T@b*bMj!ql1@
zB~D=x?Ta01Yq!TTi)vMR^!e-}Ds{sKnZIJhTC~_?#Z)P?%Zjxra0-TJ&<%?2We~4V
zb?iblt9rLYDZS&S1JWE-yz2`0;41EU5aEG)pEORdv&&xPKR#ic&?+I*aWtINkJw>3
z{CK}H(j1XlIB0vt4|LV{s_!|{I%;}F|Ktsi>x=l-Oxx4!m)|?2y;S=3OnX-LYSP(h
zc8VVO%jqx?aMs3W=F8zom$UziMdn9udC5Y(%dC=or*mClNuH{=TH+X-Jcc~qIo<<O
z`7K7Tt+YDik!qlP5ndh%uDRJ)HVI*#p9AYI2|jE0P?nEM=!v(Z$0fHjX?SP7me!7*
z6A5IoX*^lfTM_^6?{5M$Xnf(wP_j`MQB~Cq11~~=C6!zC5s_I&bmUNX{9b<kTs){1
z7dz6`-z$7Pu2uZ23z%>o<`%}#F<ihl)9*9S_XXYD$Yo-7QMoArUB8@ti^b+VDRYs<
z_&h4qxXo=!TC3V<rz8Paj^HsIjuxB!NRB<q`^$=f;#A^qh}nz%qSwma$cn*0Aml?I
zXF;=d<kYIMgprxMCY!@!>9`{9T3`T=#n0~?V}6cOU1esENCscJXrcz4Ni!hRiot3#
zp=I}_J1)(bRR9HFUVD7!D%pXt4pT0TSQoM2d<}KZVI{HzBTBg-377LKedw#Ogxse6
zDq$S1N_deJ*%(KqCJ~()i#geY?eAGNjb04I86PGGiU~@LZ8J}Z^LFE*4;-wD^vD*k
z4VQM@&jN+G*vJ(s?mdLDyA{A|fH=0cQC>H}9s5q%mrgMmc`Er8i6rY+BLXYA8j;m4
z{FP3+qX#AowL@r_a${oAWBKNJBDR3(2Kb`$h}<Uk(U4{|v#P#BNFOzCQZw=oQNjr~
zX*8SkV~dcx4{7qM1gsDZyZG<!EwsIcThK5>8a%bv#Ni0nS>^IoS1_Q(y8b~E9Z4j`
zSyxcg$W<n?O7wB-$&8JUla&J<{=<(l3hg%3)s!qDQin;v1Pn~^Qrh(2+MJix+EVyC
z3AYa1FB=JX-j>M=jw@zVVuSn%OKehRE8D5rAVXF%*L2M(xH^&AD}H}OjG!Kwh4v?%
zyl(Uun0j(=y*Gm7SYF^BYnP>FK|8xcgv2i+S7@?3(*_jrKuxYAZYY;>4I@G0puOz$
z5CwM?B2*z0!{dk^iE<{$+Sy+jnm`zr<q+A~P0j2F!r<DR!XGOK)~ujI7uGDr9osNv
zw*17b=HYNE4Iwd%C@_(DiG&5nMZTg%sB_^sg5p#OMAhgjdr$yP_l3cdh|Hx!g0T1j
z$3He-2x8oh7g_4(F-neRr{s}AceDux>eME7`Jjl;X+f=sdcm+H+uzf~ad5uMJ0!x@
zGi@K464}S(anF0ETUOoHYZRYYsQ_zm-g{ztKxR^qBKrtue~gl?Th2OeuaNUV)7Ys6
zu5_I84NYMd(hgXEby#B;pwDJ9wYrTQFX1b9Qakc}jU8t;emTWHQ4@n~)~*V*7ekA;
zwQ~u!Rz~phaXpV~;j0-EETa7Mh6NwK3LSp2v2#{2%|X^sd958s&0ToSjhxN)1QlPI
z-1)Fm6gO@5v1!Q`eoW9h=`=i&?pI{H5xx5->BhynbOCg*vakmT_EFn)6Q<=GisJwv
zs2_n=0#v>Cg=hR^*%7R?0ucKQfx&@k+NA%SX@rdTj*CB+kOu7EQM=RFK13+>E7r57
z&AzPt@(GQ305?ZKvGFtzV50VLb22KNXJlSA{8=6FP;315#Fd-JHq4d$+0sd!YBo<V
zi1CIv3Ao)#D&c56y2;!^eE2hiN7AH|mpGLPrm14V6iS5gEJyF13U%_DhDtCltH%k>
z5-z?f2fz_v<RA!{(Je55>KskHl}OEMZ-|He66T6yyq(Amoj2@Z=qRQE?*X@<*on{g
zyH$UMjw?7$7y&}S|K)hve4q*H4`%3hSN<en1>PW^^nUMn(K+$pBtSf$w>v0Oz~M>W
z*77aeq9Pet%Gpk=j%1thBo#P{e`G%@id{EB9%9J9AC+G#mZLzU+K>b+P=LmNiHh#t
z_He3pgI2h)dZ}qjUAf-sk-f3v03skk5NCthQ1$GV$AeDp7F+_d%Clxft~_1~v_zLE
zK%-`@VtcLP`{g?2_VK>Fw|<=9Q~_8nx^VXI{vCVARS}|Y?3W_lX7V#30)=7|PXfDv
zS9fB<*hBBDH}_q2q^}_6ncPV|*$gy(w=9J3f!*pca|%IRN@2{#=wT4X^sSV8I>QBd
zmFcUm)7}N|<nU{}kVvh)w!%Qg=}I&kz#Vopw#K$O;_C{1i$8z@r7iiM1b{O)&shSv
z=dSco!juKSFaFjr2AHC|s&6>(2|CT3PSSN!`8L%A9POd~{nrw|rFGn|`9WWXF@x_t
zCmg)(?XR>&On#Y!*9T)jJ(*YL?LghD6XQ!ZO49D}EDsU@BhpU3k2`&l&=F${$P0H*
zRmuErx%KnV^E#MT8uRsJ!_MXBeqem_2a9k?r=t-G4}jLtQok~Z?c@By>Vl=-d;oWJ
z^`O~g{$V{_F7Em_KLP=I(;QV}MM8!8R#?er%X5Szc>C5Rf&Cye3+=|(gau*o*Uh=a
z4c>>n>uVnDo5)9X9<Lk@hC(?WASX4EMtWOxn@K#VBK%#L)ymo@0Mfa<EG|%ahA)kM
zn2Ds`zrQ3o@duvwE<f2*fczEErKt5N34GLYQ4lcOb)z$_6%#;S@f(mf(JkkIDO}_%
z_~or0lp<Eob+|SlOVk1rYTDAE?TM!C>bIBeNBv;1lfG+(Fc&#KpKXZ*4CssJI{O{4
zP4`_uN3<z!9sbkRZ^DnB|4Dnviy<SNgx+%F{1<r{XZ@O61AX%YKBXtlp?K9THdBs<
zl5jIs<eLsTZ2^M5!j&xxcR%9p-~IT_#Oqh@9TZbQq0tq3gXx*?7;cuIz!l$}N>~L{
zZ^A;vVgN*mFbyeY{vY@_U}uF-+)p~%Ta6{X(4IKWp=e^kc9Lo7=u!DCuS1W<WD~Vo
z#!QilHjRdXizYu5=FZ$pbObGpjm@BZDg0#S*ygs2K~;N%tt$dIr(CK_js|Pm@~MGB
z+z&HiO_$h{R(+8}M{fI|7r!;%Lnf!)g6!08E3w5oWXB=uil59LK;bvegH`L*;aS_I
zt|Qkuf6^<8UauOiIq=S_F0XRQtf;(zQHRZuDU(-MQNUeYaL^I%ki~7C^_d8#ybB4(
zIXFpJR$WMQcCFIW-c2pfW?Ln&NAi81bKoHD#Gm^s1QeiM&C^ZU*JtOKTb4H4yhHe-
z&<c{LG3SYVZ`L*gOD)Ig1#Y@s5xO%t4GYC=^bYQd%gG1U)wtn@WvZ>U6Q>F(4XdjQ
zXRh*#F0TRNHHWU=n(wJ>b@yF1oWl$3bIUibW#{E<&09V`;`ZueR@WYiZ}HLh_-Xwt
z1=-~}5gi#Be2U}fIvM3p1?A+7i$8A0*;W;o%Z(XJISp!n8ZDIogMDRXP3nR)_q3QQ
z>)wy7`Q&iw`8Uh_l0V57SCw|JG*xkhtLnXSpq%XgR+h;BSlf6TpIFPK`8Y~1TNrM-
ztN5E+Z!P)d`Q$9SUBbFGsw2ZxSa08=*}wdiT2^S9*Wc54Tv|C%EkA3wty>)nqY{a1
zc;6!T>W|(7iaX4=`o;ua-|P*D3$nysrMDuViTDD3QhQ<P?MiJ3kXZ<_EC00S4P?U>
zV~b$&MO)#u#$pFJ@hg~i#Yx@3+yRs}KNxEt&L!qpD~U7jS-&s|>+JC}cph+Elt=vT
zjDA@Re?;2;1c-o~@pJs>k!*;D5?^mrZ9Jl!4y9<IV;SNGEI9JR8^gOfEFfJVjvc0T
zUvYlXGSL|N>=oKbg8MPQY`*w3=$Y*Kkx$)-L0B-%fc*I${@wZ=+iZi^jny9^87)bD
z(@$)EO7fBAO>3C<{Nd464F-2ZTX%f>4D#LEt13F@4D$>#DX&<nUmBfNNuz4PCd`BO
z5i$(uuUv?M@s}=Qq;*r#nq?50gIi^s9811D>Bh!tK>Gv!`pYN*GUZsVNko?vMn4y{
zeFe?b=_?TO7aWH-DZck=W%Rrx!r%^~AS{+me);YQy!F<ImBYjh!pHOBdc5HT+I7zc
zyZpb1J}8`uv)}C6CjmzKmZ0~15Yr>A7#kD-m>$%SZPVpEu{i|5>W>aOWt5nsrP<gm
z=I7y}bS4gU^};43*;w)B?xKHBU=u2D&GUh0-AvW3geJfD*ADWj&;iGZ>Cxf>YJn*x
z96K}st(zdkmoS1H(~7!r6%p10{L?})j-MN8I|aOnpDhf6dgvn0O`PO0<sO3i4OAT<
zYL0RJ+JPv~IJX%uzzb2~v|t#t_qXO*+C9EjRGs8idZ&Rex2~+1@>PqyaWm%AyTC^X
z+PJW>m?e~5zFT7{n9&TMG94+4+v{0!1B06wkf3BV`Lk<MX3)8GdT6p!$ADeG491V#
zfCAB%5Kr{_$rVaC$a+-r!z)}#fo2*o#(u^XYV{~ejW1MsSH?1>ii1+ZKrCho9rzmz
zl^$f8Z4eX+0&}DOs8>i=vVMj`!u5mD(hBkL>J8@;#pe?w$52A?crq-vfl+GU5CJ0c
z4gFnxgNkoQikwx+kY*VR^3h!xyuu=pza9@7Li)ePK6a-}%^Q;icWvU1BX0uNafR2`
z-3qpWxwN@{LvQUZKeTMwEbsr2G}|7VFqmE(d;24U_CjnMiv042bn@nAROL9W-KT58
z#$?d?u)Pl`0!<F!&!9#h6)dH&zLA#e7k1?F2*8yQGs(Y=A0B47$!z7IseRfDX<z-r
zPfB3Em+95ncf?)|$8^7sj^hCwC}ZGAWQT_D3Ou3}@Uqo%gooSi$XlhJETBgl=DI3+
zV|y5cg)Mhl^##lB)>H<sJ4xxK`0{2lPj2SmLJd1kPFnpOb)4?=c9#1{-^oFo_~tz3
zA4{Nlr|>aPY{?72<>%xAByGO*@nAw{45@$Xe3bM=cdc@fjebLF!83usd@!~+5poeg
zY``UxrPT8C0{V)m!f4_9)*brYyCU=fM8$rxx-_~l*+^qp(y<icj7;*k4qD;Ojh~Ya
zHD9EToeN^ci=(oPAIjsbEwZ{Y@NDw)vzvJ@+&7z9yMh4l0j4xe3hsPtuBD(vHF+yk
zPRkSRqQ{;nBt3x>qWtvQPiw$o6Kve-H@fdSW39yq;A!%e!$R#iZ|84d^v~C{lAzW)
zdH2~|xAIjOl&Sl4Mi2R^zv%9`cOZoM*DiJ6w(I@<H*C2vYoK;I4c}k`Nl}YP;K&hX
z8I~GmfU~;Tj`L5=toCYU?9#(t(aZ5IzebPU?ypAY=_Fro<@%i5Wx#ejweiMe{*6=S
z#T}&ruxrh4o_P}jXH_j?p&Nmqj#nOh@QQxG4Hds(8EN5qgQdbt??CAIV6l-pq)rK2
zGe#mx>}%d>CN6-{6POHP2M2m4h+|pE4!wnk<MstXKEI{n@6KYrv|-)KuRGbi3*Jsb
zOyO{t9;K|uYD{82EVML=_V+@|Qmea|6cx1-pdS$pcU#}i=_57nz@qq0P|i^sg6mU;
z_PHaOl!9WLk>X{eprZ6FM3vd(Vao;`R~+@!{=$8nmtj|6X1HmD)~o2kt{sLSV=_w#
z`RUCO$mAZ6)EPDTLv)zITp4Gg@<S@%4Na%tDf%n}fkKpgu)L@Vn{0zlVl!7{4uVAv
zI7BG4K$%;S<G?K<<bP|Nb;bG9r}jnLy1&q-xKK>#M!a?8-ZWuL1F>HMz$G2CrV|XY
zsl$6|OvWT#Z%7-?AMxj6S&&DJx@Ha#QLug@+BJHC#(<A5)<oTSdi2tM#ZQ_arlK&q
zbM$D=GN3~J%T;HNXx;LEH$x8PxFA%*`F|4du?Lt_2^t6p13d@`(f^57h3il$SwhHw
zu@_xbD3cw66cMelB$!DG5*Zd4IUW4Uh3tKD>@3QDFEg}$YaM!9U7e22qDGzmS#Vt?
znH9~}mX2<QjlFGM&n{+<|5iXinf&)@f7TS4_s`dVuVMf8dR}&1=kEni^L<YvzPoO)
zkm(NwpsX2BWmSoOVK2!gl{?{OS1q9dQ>U#&X)aPn=LClZd|0JK^NCGaOS3Tdb^@x|
zPKl?tJ4E=uTS~JkoShTPZ~cl43!S9{WkcLBGpzLpO3(F>OMALhd@!bU(|YNbyqpt<
z@nG&z3~)+$3@8d_%Cw1pP2ai2&LiB?#MPL4xhL+;*p@!zf;6O^b_oYStwVGI8WI;`
z@9rX6gry_~gufq-yM&LziRzBya0&=Z)wK}v;+E`^%cWoK(yMgAJ`~P3tDRfMx50Y(
z2YE|PEfa0t^p{#8&b{}_?i}Lw=^HR1&iw)u6FKg~a17B(e+~PS;(|J)C2&}4*z6FL
zUfbF1ARjCIO{PF8&0BJHPV{gEs0MwHvC}Nf6HW0Dok%8k{ie9uxu|J2K^3MRRFEqr
zkM@Y%qttsk9r^m^e9OEW#&2L%VslEp2ap1Uj%L{U`J~bp42B6)p$SpU1@THbN8$CC
zdWSTvK9J)Y%$9HurMDv`F1u&j`7c-<bljCmv)EGPirk+rZQD5=dYtqD(TDar__pm1
zb~}e|C)r=^@N$rGn7A1@>dK^h+N*ZDNnWQm<<RcX2bdk6Sc|FHzy0ODtcqKfTQe=#
zC~D`b6=tjwveo(17kBM-)Z=WBSi!HO^1axMTUmd3klJZw5M-!#!}rwuAQ{&w8TPK<
z4yEs6%VgWVvX3cGPLllvJSA0XFRxipq~yeQ7Maz!94P_A&_<_*s8NzvZE`o%-mrap
zIw>hJ`rRQ@x*1lSSrqINhZd?dYc@LDaB$I3DE1O=5ys-jyu0UZJtVg~a_edMhNACA
zIp#R+T@1;sSsGn7jmzG{Mfgc`spcC=Vt(#bM~_m)GIk{ORx|j3B@Ms1#zH0jjBe6e
zs-I&=u^cM?v-5KOR(~5PSy&g@Fa7c4KeXAZ%;g`ImHiBsN=G#dyIkEl)|=9Ge2%kp
zwY5{zmn0e*mBxAQZLjrG9eyL}gHfCG%gH!~@Et~t^yp#Ut`PaUEXlG}x{pkwe|{L%
zu&*u>H_mSB&m5lvEWV3`L5{pD!QRXeQ*;r+OLnr_$UO}<s0+|m^)YVQ(zv~R_+TN!
zSJm)$e^cYq<VYzN*S4T;aNCF25U%i{Gt1+Wsx_oZ;vL%K+WB*09l}`S8WvwmaQwB8
z5}4)tR$58${kt%BvZX+@PZO4WYM1K0q>tPT92|mwigy_ST9y>swNf2NrjEX&!R;yd
zUswqm>=LQi!3dY|QCM)C?q-9J?v}w6d^U&KNhS^Yb$1gHt8x(yD74gb`UWf-O(`_-
zlWQjN%fBH?ekoupL#8=TiA~$Estd((`u6<d*tXLo4XO;0uEg<}P_4fZ5Qdeaye5#Y
zUL@5j<zB)DIImK}#xV0j*RgCtsHB(cZy=xTn15p|M~f#*M}ds~wsKHnQ*7j--@XZ)
zw%fPCxmIA2-@1-U%^R!H@$nyy#%{0s*{e(@czf<3PBPDYf<a4c-Nk_(#gp3@wS;X7
zZ8nOBjF8i!+{1GTu$K_Wlh>(n#^%ei41ucXlVGp{hmnH#V$ihs?l^|9DH6%Nq|SDx
z3#+Os-LN*~$@1YKj(R=V?Bu&T49}oN>2g)qkSd3?3u}<>bf|*@rX9NZw;+FUK5-Zn
z#$F@}@3QKh(=R~_usiDdYf)2!nA>2qYYimG>W08K@rZ|#jhneE3|UGVqklF>yJW6T
zs4}wxIa~ZPbdEjL|6<xXQ)ptw>;DQR3l`l`g08lUc^WE|o9JjAW)JO{yB7Xv@kYz!
zQ)V_^P%6*suv#Q3S6HuOXkq*UC~A85#FyyOEv6dLX2f7#;5kXdE@?J-s7I{2m~>p<
zV_hyQ;Tq5>Pu-X7QV!Zwywvj%8uUj}=F_Ku8@{lqiX7_)pA3YCW*H4_|1GIW_=-Dg
zjTp?l_U=r4I}Pl;s3<weex*q_pICzRbI(WLJc2?fcb_bS#dF`sMg`3UNw;?-f31oD
zoP~3oegxP8ja8bI`t@^~Zk-BR>w<C4vk&UMhKGtbi8w)0LMXTXD95$87C%;-$qpgl
zpNa7^cb?;cZjnfRc;w3oJbN0IpId*NU_#+M{x4_~r@(qYUO@Pi@jk=ti^Z_wLHG;C
zCBYZF_)gRP3kT3Y74?gl+yCt-<61En@g|XXQ;eC#z@s>YJ4cT`3>%#SJA4hziXBgR
z#YCgA9XUE8(Tiw?(Y_v9+7fo~{%8Q;wxb>(nB6yS#@KUjVH)I?UFt^Cm}+(Ys>3YN
zJ?(iT$V+e<m;?8NT85-VBkA)%ktG{$>YxmolYBFXyIJ;592jf8JI0B*gp<v*a7XN!
z1v~xsmZ?xsvF#oZNVxL0%|z{ao!CsdRPN%-wRph6zGFPtb?q8`G<Js(xSa-2SUiUH
z#LE71s<9p)X-B?HCn4HFZR)|mm{>g@j1IeI7?Cgy$Lw7Df*sz~07Jd*XL>wKX~T=u
zC@1b_;ztMxF9U;-Ojg=Pxg7d)%|dRcg+!kR6~xe{=i}2kA~R}4xGh6IhN{5au7n1A
ziqUDjV!3*7Xy(k9qBNqSKb;6H=RKM0b}Q6s7=Y$D#nC*E!<~KL_ai_3V(M=%KlC88
zu((8m?v7AGhqK(rnPGV+gS`CE_fbB*xf|gD4EG3vz|SG0qKs_G^5ad7Z^6|-DXR-5
z3VB^=Zrj|)P^i55Xfqhs-y$N}oxIgfC$J9wg@OcB`<hRnxor04G3Noms3J^BMd{n!
z&$8yUf;q()@m>?fsOAE*NeK-no^Q2Divf4!io1EYfN-Gxp(U9&X8a_x6?*ytrOK)&
z8ZWgga!4)@_b&m1+Xy~%4G-PhDJG6!#lyoP7JZT)mgHE)9W2klB%}35^IXGi4bOKn
z5OzRNA+Ykc{(+kZ%m4$T(ib|&=Z}_OeRBYk<X6&nYSV3Iv;65g+0&=?4xei)Dn~-)
zY5AY>gB{|gZ^Kc1VD+5vQ8Dj(+z<>#G4~@2Bi95!w3(ZgZYVa{dFq^SoK--xe%dF+
zdR!MT(A7CvSK-8IYt5Y8C--Q7G-(yi=8^f1d03gdjbRzB15i=R11Y^?u(nF9$Qjyk
z5LW{8%zl=-rp!o<@5jjEh^9I%HkOIHTorjW^RVo`b*m5BTg#IfqH0?8rmESyg_K2d
z+q_Jp-Sa5oShA_8&Gm&m=Uk#}#aVAjABObM3`B<F?5Rc=hVGQmd*u29hK7d-nfBw3
z!>V)R&wJq`8L-Z4P*|&f+t$;r<`Ap0dmT>ShRK6B`L<OYMdtHyeI9w6o;vNW@-<0U
zRWCTP9R)wqArwXqUypTv#J6hgNo_ZiZNke9Gf!28D_hXVRn67p;cyJfo0KFPLw0Gp
z%b`&Bh0sP?nX-&!(KDg5q5fg_t6$6J*;Q|h=jkDj6Tsetz4ZA##f&lYzDa*&iwccP
zY~<!BLcC^&n@&%VN%qH}Bq_Rts*wZdEbBUemKBd&+dsW@KDA_0Q6F=_8~Ory%9)&@
zJv9dI^lNxZfxT`@jLkd;<))<kcsyqF((J?8#ky^;D|#9VVxkgRx_)M*y|H2uK`hVx
z-dB{48NeQ1!M+p2YqMTSvapGo35$vjFV)f+{pG%Ld!4vuDrUEWzX7LacVc#5oD0Ez
zkKvyE?@ws0=lHGCd%CO-I7(aG1&!@5Yhv%&u*}j)`K;}c+-&%sY#BJzr6{TgeivOQ
zAI+IO^>QVZiVanmm05M&v(R-km#5@2JZ;(MA|N}SJIhhFJJ2#4kddvQb8_*p+SEE`
zaPoD1maNPTTBXThr|?N!gP#Jj*j=pk))$b1EN)KXQH{EVcSR`h;kpcF!em_f*zZN`
zR5FrwQX6OAE3rd#kzkLGEE@8@@U9E&z!r@dPGJ@aw~zE(BEpl{Pws1IG}n>WeJO(*
zfd;7U7-?54#x#_q1d&J3?$}I*2~7h3M400_&>Kh>(4u_JC4r~j==$*oxCH}ILh*mh
ze)<Rq27IS!@C%*I!Z7V<vGWy@KcoajP^YI85;ZiOLqE*ZB&`mO+lD6=6(|L_x-zlL
zsogNlG9_E8upA%Gbz)Pw`OZ-vrAeMB0G1{n)T;ZHoXJ1JH|}oyK4RG=Xk_s7ZGS%5
ztWmS4<jr3e#Cnf4eMR>IXeytlj$&;D-zh^sLfFd6=#CNJXr^hQDjN&R1*F71<C9y^
zc+!JhA<gPav0IUn8C6^yoHS;pyV4yB6@^I%>xw@gt(~BkSh|s)pNt%^{lgu?0Snf`
zQ_FML!faXAbBx}%bB)<&lN0;QkfY8L#QnH_5Q%3@IbN9}`4G0gGQU6zHg65D2g>CR
zu+@GM$GtkX7MA17iY(gRusz-IFCFB2Z<wOv+7Qu!>Z^)PDCvgh8QIBiA#uSx?Q8r}
zrx}o6RnOiUudtuQH%;5t$^!6VKyTPr86lU9YfW3?nxdt*W62%y{;~Kco1^6<rT!Ri
z!|lUR5v5tzo2SU6v>QhrEa-e0&eJ1R%XOhhE51?<DjKrTsY$07VxF|Jju0~zOT0Hm
zT@jguwpzmJ4;f|Drv-(JGL4H82awi;Jy@ZB!p6(6C`L_+n?Pw;kQBxR0Mj@Z$txhL
zA5PWd=#vPpZjnJp!EmUu(*amx|94))#5N4WZ&=bmyV+1G>IP-zQ2cO)`}=V0!uCAJ
zjq(**D<g>mqCFt)*+#8&Q6Fdb7tXHeBgHR+hQ*{ofQoP*C+v;u*Lvk&`D~`)v`@Cg
z@Dn7jcd;)PuZ49rZ$^3}fJaCbMyB^g)jFo4_>C$JzwDluStV%Jl{TD464Co_S(rCO
zBusXK%Ib@7s}))j99_Ta6j6Vs;?Y6?gpVO~+zavV`X5LQMXOl+h#0$YzIvfZ-5TdL
zWV2hfqC=^x+sYdph<XggzUKlPSA1FlNF@gE7~}5d+SomWrY1eoz%jRiaa_E-pu&Su
zAF_ov2oIOV8*w_C<f^)W9J@I>cx&mFE;VuYBZUrJE5o*Sqn;{EI%kL1VpDO~nC9jV
z*h=*9YQM0~Cdxhh!X_f#+~NG9w_tit(m3f^`QQR^w{(#Ob-pDyYun&t8;#lLE5cGo
zQ32u#?K!Vk%A;xq&?bt{U#e2tE8Tfg)p1kZC{UYB^$iQ>%KkyXpX=_IAAJxP(h8%j
zNpEfa1gaA<kxgOM*Q%21Z5M_b8`i&V9S?DcLiux^TgXRTswZRZBnj1zQ6tvl@A}X;
z5?lZj+UE~>@IXxP;Tj?x`aMpNQ0!BNazFGRI8+&nFXzZq0LWBxw1XTkUtreZNpG!d
zUjDyDQkaYs%b(J6GZ5p<aRGsX;ZYW_3;dg)e@vt+5)QvjA3Iy@2Ll7h-$ge#=J<v7
zMncq9R19w8L8~`M<wMlA4+jb^bod}Ie?JBLyyDdx?(+$qa(nxM-*dSrjezP1O5y7M
zIRC(SbHFQ<2f$a<;(GhB+xNh5-~XNG(XR$YR8f_p+qs*Nqgnl}ILVt#FgdiBhq5jo
z@qjXDQpGFtd{T{ZyFx(>Ytpm|X~o6c*LM;Y?2|N#loZt8P{hO!=Lq}RSYy@WvlmEq
zIOv2aFYZfN%m4G=ZbIGz78L;m#DM&2pf<fx8!A)xPe5xE+)+<LaPWh2=v*1%%=C6D
z<@YmJ;0MHW9HFtH7tG)%v&EN~cPp;bZq)7>bgc9(ddL@b?V5OtkURF8o{a9fwUTes
z-rJ+<JGP%Iyj4L_L5ZUv-#<A1n!zt63~<D%MhRh9xKELwKBP(?2H0mG7>Mvj2cjd>
zk5y~68es7O$9^SI>5S`_L;=W9j;z>!uqNZB3>|ug^kLQ)b32eVvGECVPSv?7ZV#|=
zq+?|IS4DagbNoPXk2gK;5rp!B9r@*&`Jz4e$!#86g%Ht-!y{jsp*9;m2`b`~Pl0kg
zbwhiuo-mA*e4~+G!=xK2c}g+ArH#IUaGFXj1Zd3afQca_YPPTCOrCPPg+UR&qDW=H
z$FOORy~s9x%xJx$kFM3+jxi=#0AY21(RD<CNeLt7N`tXXOt3lC?Nlh&laTv$nV>Xn
z!P?S&D#1uF)X4|O?8-$)@3kDGWXb`|GTG3I#!j)Nr;ru$G2v0+`?2Pct0a7i;0!8o
zz=N66;t;A*Dzzpt0b=E{!Xb2cIm8Y6aMA{wnL}s_v{{)xtam95<_+phC8{bvgl#CQ
zK0on!aHvRes<>|nTgkBq<i06`VQ|h-m?y^W32vBDMegqiLo1{0AVpx@86(ywu6+5o
zaD4#&_#0I0iy}|NSH_<3H&_J_vW`R!Xm!FPBcMJCkmb&7h-x-wJRf+|=dU*@V*Aow
zu_Ww4E`K9q^nmoN7M!tr`LWo<3YyYO`>k8X`SX9W_buxqVnaNxAIucNk`R3(RP|1y
z|FHfppTg;j=i*gR#~BMx)M&%Yo%z|#?h~R!hv%I#{s(^OvY##rMj0C?_|&fiurP_5
z6==pc`2eSIdPd%~fvg{U+i(Gw|5JHp(O!GICx=Q)qu#gf>2$^p;>yviI)7_WDWipu
zSTLa~aLJZJS)`LC_rN7+InOw!Q;hZ8FRERPr9NkCGw*3bhe)I=_FZvNKSDEpA1`a~
zHt$SxY+OVM^}FuKy6BQwmaZ-hNHcXrgwtFLXd8ti7ug^V3c*Kadsp1T#=)aEm-MjA
z!!rtA&I73@(NGhZn*Uqt9x-SfH|2fhoOLDGHf10*lckrZpcSA#+cocjk}O!0w!aAD
z_i@_?OL$YXe2n_r*_zcc$eoP-hml3DDPM#>H+My~P`WBeZf-LL2rsX>xO`v;&GM;^
zAD_|D$sFH{`QBDu!HhFy<1ngMaSroF-V1cBu(uHVS<vMR?X0hp%ZBWY=#>KT={{(F
z$h6}Q0Q$e~ycB~CoD^4M)Re3ZxRyY5e=r0YnFh)@P!NzCFc1(fkd(y@9w1G5TV_NE
zi9e?_uI>)w#uJjz1|58iQ#=tvn2LrfxZi%e%pp#CvpgCoGeY*e1^=LO_Rt-zChDJ^
z&B|hRwRpMy{DUq8I-_06lou3&ZEvAJ+oNUVWZRskH%&3()HUSjO?32IDBPq%lSX<h
zaW5@N?inlH^;7=S>N9tU8W?9EVp2&@;<DLS3*|XVOJoV)uD`#{rLA&iJSWp^9%Hhw
zA=jxeE6bbYGPy-4k*YMA)TI}u-~OYu8q$5(rUc;`&6y(tNy*o>Rq+lFuWBn8z5pMf
zPiClklDoL`{-WEmBH2)g9JJh7S6vMI(NC_MeM%f6jtK6=UwY831(;BM7!p7;(})nP
zh8)R=s-gbituS={(_pPtrYN^KuXEe>BifHXvKL<Bz1a*3T3;zbK7i~SE`9%OaN5zs
zND!ym(h5Oax?Q-{7LIfj$y}qGZP+w0>e0)Bq;H{kW5UZ(UdUiw<&9Dcv0!AGqH0#C
zVS530lIf0i^Gl)sn=Z`Gcxi(=HhH~*CzDh^3-SNkDqBz8yg2`hG$bK_fKdEz!$<%I
zQ#)f<*EEfD0CyFg-&7XIo6n$l1DeA_DObo$x;-02J|{DEgC%OPS>JKxzZd6{SiV>`
za|@Y=wXF5B$V+;?^|^><cML`;T1V+j$Co_)z#cDax*aj*YvIdZ-|m|o*9_0o&wtmP
z`(REm-^osbYrIS_^26$SDN;0dN+*CYrt$6b55|0CW0}OpIbIA|4=jZFb@Is0q3s+#
zyQtUB&=4<;Vai)+=mL{4Wj@UD3Ua=Ld8x^R7P?)uJMMfzM&qB1x3|TSjFGP<Scb_?
zXod(!w6!1V1pVVehL-2JBnB`?IdlQEv5paU_|W@fFPWotO#Ou8h_AQw$cz9i7nA96
znu<<~o$3sCyTuvUacq6fiJEj1-71RH>+tZ~<Lu+s{o&*A)>zlo<JRGlh{bbo;N-0O
zpYCKDY9Hn{DG;B#+Q52h(GEND4$ai$5}31m!%SZ{ADgOx>K-eau;gyLsuS^&Ssa2`
zi&BC`85-eG3O4<gd1$MIxO(8{PdRKzmCLL}H}^H_Q#DuVsWi3r`D0Bq)uXln?8bF=
z6Mh!c%&}BU8ut-34h}U|_J)ni)2SL3>uj?#A-e|a_BB<t>%Kd!n6_b`ot&v{TAf8^
z^fi9o_j-+l0n*=iEgueOp!CK%IA}<7)ag7mPDCS+!B3+K%S@B-%ep|+2UMNkd2&0k
z5ySJ`RUe|Du9<<`?2`DH4rP?dne<Cr<I=s8rgj@$S!H=!vCSq}I6t}UFWzzs$Fk<0
zZ;DSNhnbTLyB<DjAtJ(mo<$0dC#&#+0>m@y!WbC#<N$q*-D}vAX|?%LH&35+P4}O0
z{=%L`6e=E(aFa95U`${Hc^_53O?3t~%U@*hK%YbQsd#UZ;uf9;99a;J2>CA=`7im&
z$uCeFy-1MLOaum;_$*EDlxRRvJMIA*8`Vo{96J~NjuhMaLu)+6OJ<zr#GEghZufe3
zk|iKm)9hHeP<L<EWNA?bay9i%b?ps1KtWh~>J_qq;#L-Wzyvr~?<M)Y@{iGH{IxA|
zfAW<+fb#H#<%CHQQy?cmX_V0H0~sB=;Xsk)D|Q|7vFmC&G%I^08hckGM(!G3BU32N
zdKCiCP8k&J2W}5+yo0T|`+9+>YPc$mnEOb4z3PwzyZ=a2iNRDX>$AN}PUygIdF<`i
zn%IG+?QJ`TcL%@$_RRio9?RY^el_X<^-`XDC1N}#o9gJk`9}yUdk~<q=@OP3rGhTO
zPJ3~-?soL!?%JM<HKV8c<eFbMCZMXoE8!&*VL~DY_Q^;UJlD;(fpM+*cTU<SKr&zM
zR$bln;`aHea%5qF%PW9qd-01tP@}g;?0WX-jFAuFr4`^C=vm(1C6Td?c9~L&?6#uT
zTrpQgbt--O<tQe%*GIAQz1-DXpX@x4=w0mR@(psm{XV=S*!veVGS1~2mKzsxjH1)%
z>Yl6zgXVQjq$##znQ*36&Zu|QvaqS8)d7dI)36))vXm1viLo-rRTHZj((`^`#KnbI
z{zZvyc?)0wNIp!I3!GDvS3^(LUp5zIePR7(npc}KN4=K|V>fmGA!!$J&QbC21$w~!
z4&j0aB`j9QJ#78Dt#?ljSYee$SSDyw!kJ&Z2*`%a4!Oe#UDsPpSfE;jgCh+j^~xmM
zR2}w~Tbcz?6&NHfo$5vbA4PR6tP5I_Zw;g>!UM#iB=kx}^V<_fQI<_mtmXb?I;M~(
zo#fn!p<lB@G~b!Q4{g3`6^Acm4RVaCf6?lRPH>d2;_z6LYc8Unmm3oaiK6qfKjuUK
zJtNpC!QCvml$jbYTHrvaM}UA5VSiM=*n=YxGllz5`db7-C=pzoI7%_DH_zacdzrsm
zx&i1BCGgzReR^gq`TQmlRpHH}U+%bI6Ss(dBrN#}0WCQWCr!LmdXq^A8>0c5tvDKG
z^w0iL)44Kyqy^rP@7<K(Q$`g=F?msyp|2B4wZe0_jHD9<)!fI^c&%)G+>oYVu*NN3
zF<$a-cU%x1HeRlLa$8Rab1M#!$_P8&IX_@9#-Db@5nnGML8UqIw{udG`doR~HuQ!s
zF6E4@!<YJiH1*!pEbon9i1_E?!*_`m(Z4*jVsW~~O;a*P)3GOu-njt0gq|xw374ND
z3S_+YA3tuj4a-vW{QRSSD)+n;6=fjHsi9nps_$qz-@v*?cjog;MCB0EYP%)vBlZB~
zm-%(Nmm}os*-|(ecM#h5*I!Wjk9<c^k&Z9kJX4t=XcefNWECfSt|MlA+R_M6`Sm1g
zjRBE-KfJNY1kL~3N_%6GTu608+<$~<jVzmyMg~whFi*MlWy<!<lz|Te$jC{iJdYc9
z=e=S~c%5z}C=Ddeum`V~RyAZK(w?%bGaaNX9=J#Br8K$x1GOZCg)T0(m&bE$T<#T7
zuc&7K2`G1HWj62=Q5r`96_=ySN|#Y247;C?-{>7uF<uMws_%nKaXujU-{39k#to#<
zWat*Yvi}8v22$X|WC3daMtUVBq?<_eBKlTH<i<dev=}rPVd>lbcKu6{P4aDVKgfb%
z%|Wpc8IzBSyR2B}Ifoz<-F7UL@7$T$T*rQHURK|LudjRbK_U$@Hqs?2Q8f`*5)>1x
zN0Xl~T;be*VSiOZ#52c3;T@s$W~LGy5KoZCQ~yYKlc9$wh68q`cPGVN!gGJoCdnDZ
zkv-PYYtK-q%WJ2{1)Gdc`RJ{xxh5O8uWx=h!pi2-H^scvF?XW+Xc$`|2bbm5wVLpy
zEPE%nl0U`f8m7RjU&V-Y6wWv~UzAm0u~sWHX?iY+Oa0jIEvJ?sVZ?-i(T?MCfm0hU
z;_AyXoq^F*B><pBQ|jxon~lrc<<-}@P~hsGw>-pUQW^~&DL9YUUC0=1yC$oxD|HwQ
z7|vZS48rB{F3d<N8S3E@`g0vNQLB;{RKz!}_xIY7L6b9PPl|i({bAxK;BrorA?KRL
zYvr8#qN0f@!iB?y=ufdq)%_<XsaUI}3gTIEK%F%OT7iRL#DG>8zB}U|EqJa1vq#jT
z8Oy6ovD_%$_4YRZQ6w=TPfe9yXS8kb1_^m{Nk|yYE&eLnCp$%Eo{*YOnXa&{G#qvK
z0Z`qfW75p8a6KLF!cuM%J=B5;|EJ#-BQG1G9r;gI?i5v+h!LBNHjkR9@#Cg>w`uj;
zPxZ9QMgSFz<}}xY<uTPGR?SCrDl@`TRvd3;r9&a~xm~4!JHmy|o~I4tMnvAfL8Fy$
z?!}h`Py}b-==^qPK4>W{jtMxUf4sB|7_ic8tqzfOV_Z;7@^Ec!DA~k>^ADxPg1IUA
z%YUtJRneq<wn2BXiPvjKfKPTwgui)&QV+5g4ZI^vVb!N_;y&T`5$&)kLI@5%LI1tA
zT<N)m&oBGBvEl_WL`*6to_t>H^aQc~1lfC1%53ld5*1(07uQ&@LN&5OuCs%_rV9hn
zZK{N@r<7EqaDv?x6Rvewo)!m<Kpw;&J}0&Y-(ZB`;tL4c)FsOysT(}dc)a5BNeDDy
zl_IZyO`?q#0JB`9u^MC4Aa<er+p#~4HE5n)F=fxn-@+s95^|E`0PP7GIuN8V$^>@T
zA5DyKw-Jr(e#a7HymdVc_Dj0s5vnCG5)>RhHbx%x<3DV<!-9bDr67lqrOd|=0502V
zNMG@F$DPefJmu23M8AJjNc%;(+U9In%O)E{;bQLm$aP6UU#)B^i>F)e2TK^#O~uYc
zV_EnLIl%Wq!+Mr-Fj-ePX39I5@4DJ-`FCBxU-S7;U>E?-6cNFqV0s4uFUu0%IGL0}
zY^*JTkulO4T!Tj#{R?KITB(OZ6c~4p$0go5?j%3r5J+YYbdT?irQ+a%!Slp^&vT6R
z@e4PmbKFdm8`J2h@sX&($zre3Q2lk?Ykc9U-c!HLy=1^4H_|oi<ho?|=?<^iyIY)*
zvt^dJR%@Skkcwo-W@EnFUy)uz7Ii`|U*}NWPW&uiME08nuI>VnUU$HF18}d{pyIS=
zq3V!V?O3n2>8nrKDrTJY(iBCr*5XyV7E!RIg9A_3c2nD?=JSA?IerZ_UeNXJKU*Ny
z)lGSmyy&ngug*@BTWo@FNxn>#dlS8Bl*bCL)<<4(-zagk?0OeV?zly;(zV*Q@Nw^T
z^lA*N7FnK9-aJ14IsCJ&9dMQOzY5TcCmET;oud6lve?~$<;z1Jsl__MI_%pqO^neP
zS);NP6G8AilY{+>o;wy9Y@B=0Igu!UQE_<h51I3tdc+DzZpS?O@v3$UQou_0=F{!?
zH**cOMb;vp|4M3zI~H2akeLk8v(ZEohke(rUU2o%f*{v6JC@y*4A3X<%ghLDin@Cr
zWfMIn(uVyb*?r>VS0^N{?X`l%@D|=0ASE=iix{d;gMs<2>wE^8c<S;e%I5Mq5P>(7
z_sh0I@}!_%k|Mrhv~f>W{NhP@s=ECA$;Zz*oM7D#@y2`lVbv+tCOkTb3eFy^+6H~s
zm}?(qc_vlUQ&$}7Cy)*id}n}U=ZsWvz~M1)IX;a`#a{>6qp3jJKw9LYP^GOJm0rfc
zMTqxnCE%Rk!bS7--$+60^FScb^*vB2i$6hQvcmgc6m^UQS-IC5T})`jg{fD*N4FJm
zsg^8RkT_AQ+ynU|=oz$E^hnxy{A6(g1IYsOmSHOVJob@U253L1uS`#lJpj*j)cJ(P
z^JlB^O_Z5J+ZNxKIFy9QFA;oV^#Wl;o|Yk9y2*SRrR<k<Lv*2*-gXLpOtbXGq7qk>
z88}p<&SVgfG{X#Gd`6-#lPuNLapZReM^V}*%`lRMV2x2uAHmX<h}M^g*Dq^#S`F*}
z9kdluZvvJA0ch8jTcHbO2B<)nPM%QJ6USNG$gnyj1`Q+~C31;WkP?Ae<`iK_X%=Vo
z>@<P@eGfC{IOS3BqWKrk-8N{cH-Y!S;A_$r2>W-v>ujqt^u^jhJhI;?eHfNV;h~f4
z{g^I!1!4ZDY7&xILGO=6NK0p^;)1zDQ|drQt1p%0Z&1jV%Y*?i7{4o(xrHD99k$3R
zM3s~&+sSyqFRgP=RCToPK8|0d%b>DJG~&);XUT3s!Mqx_;<c^fbr`e^a8rp0rL682
zOToB*dm^Kyl$}JKG5J(#fBWnpeutmFa(Z!H^s%Ot+JjlY9cR4k?RdUCkpmwOPaPmS
zcVV$UJLDyxp0b^i64V^2sA5Ovq>Ro6D7|N~|5L@4heP$faa~OqVKB%vipVgQA|Y#{
zB))dpMWy&k$d)YANV284lA*DL>`dl|k`fKd&e)e>ELpOq5|ZyVPs`8w=X^fz`JDGT
z_dd^k?m6#y&#BZqg_956#TFiOx=%V2u>GD8<wyd=rO%+^O`-$WsEMPEx%HmAMddH{
zVK41p7*E-79*SYvw_L+|;Ntsl@S)Iq0RcL-nL(TTE@(R7F(mt1&|p0w3|jt*rdw$j
zI}u(NyC><fwQ*mb-_08Am;CIyf0jZ+hY&tdw#l$u%v~m~6K6XnnVJ0#h3;zBdF(W+
z<XWCN7>((?Ac^>Pm{nSZBhN^?k8c@GVv58ZlEXhd+laRG_GN41Eh{;7gn4&z^e2^F
zX%<2~rmp3srEX-!!m=!T(e6%XW!d3Jt0+A)Z>pl4gWBY+>@8wv^JRTU|NUfJ*QD@4
zanJOSa0jV{Jlt3;fw0UG3}kRhY4s56B-CeW?pFpEl*^rdm@g|;oV~6vIJ(HR?*_}>
z8x~(tRFqtBk$Aw?=P@`^{BYZc#Qy6T>Yd6NxSeg<A}yQ{uK3h>&0><wn{+y2S!Q^^
z*m3w;?A<G`)Ys2HHs`jo(Y!<;gO!1IK2AtW7J0mQcMKORanDpGFt1tvM5A4kQ2TtD
zR-S~mgYvPofEiF=URX-3O4#XMm;fwfV{6LJYtGrhA@Q1hW0SmtO@MW46TJAHtEce2
zRU22;;tL+0js+{8$tQ%6c9D;&=8#D#1q*(IJ>_1JE8Y5V**a(VQ<wAYq1o`n42zl@
zc27so6msJth&Dt6p27iC@10y(uHqC^pOSTZ(<0lkt~@q<e{<>$3(LW$1<83=;wuO?
zX0idj*M|xl^vI8w;RO}?H3fY#q|#yYuQek6wuuHp9cbV8<>B|kQjL|Y%Tbzlr?0S;
zNcP<^f!R-+lLXw5Rk6o;XoweCxfQQC8ZzuYuiV8MaN5*Vg?jb`9Q2xh-l}5)+gN@U
zR)MU#?~kmC9)@#{s>2q&#Re*=lD+Aurc%Ey?%|%CmLI|z#!Di$TihC{6Ta1U$e>!z
zEo7SBce|4^=hfhxbkf`Gt9`sMn;h#FFybTf_VJcn8CHeXtY@%)b9(c0Ii~Upsom}^
zW!G@1?{(}pP}X-*%ObkV)0M-lkmdMn^<#k~u}`m_@gq4N1I!m4G9)R@W|agV7By>P
z*9xY3FKgjp9<$tI7hU+xJ0e_+vJ2zp64K+ag00x%5$dx?9yxE<U02tRxxVJJQ7cw$
z9dnjSH04@InlX@^{*ZTO(wSAg{Jkqd?d2=n?eXZg{3@s5{5U->!G;$PoJ}RxLsu_Y
z1Z)3fCyDPbFz_ZI$PsZZ^jSR$VMu&W=k1S6fuTCdG(W#!?GPIhl{a!IQ%mG|fxDFY
z|5`^CQjSFimbC6Bi|>k{^sp4suVu@eu<w)qIeX_^wK8hD!9XzoCZ!`UD(6WBHGRbo
zm+VV3^hTH)`N-Dru~N^CgTj{Fmob~)B{N?uVq>3*-P)VIsmrYrTIw>#TH8@C`ta#L
zx`@bDjN_Wq1Ks^a>>|4^9%-Z;Fpuh$GpfR)o^uIAY+4<nQM$v(wNo)}o-(6ED>FLL
zs+VVxGLU!+)1#!bD)d6OeL*I^)=IqtC-*+^`RG3EdO<?FQd0K?C<~oVD>=F$(Yh|H
z7~a_Y^~n!6mB)4UCKjQ-6qf~&F{@c?6K&e<n*#C5CzGom*mxn_$FzN-9;mVB2hUiu
z-y*?#!RrMx=u;nH>@z{kD$MRmHwT#Y&!#GblXd0N4nF|Bk49NH7!S8OXiT+V#vQ&w
zUK{f^kJdJ>6G(NeyNYCWn5V-Z-TvakmQ~i-dN%Il0H(h$Owcg&M$DmIqBUHwGzXW7
zK}3xq$wSvfNy}m+Zi?SWESeoRX?@1jtum+-_9YedE`a8wJ$<qsHgz?$l;mk#|KZd0
zbu{Lc-kh3>oy3wl|5r+Ky=O-a4!8BWU;04KlSVo*rKSKn7tLC>Fj|f4e6BXtb-olm
zru;F=1Hn6DW{!KSKBgNJkw()05o5B<{yIM7o!7Ez2oG-5(yMmGG9jom`g3{8m|fKP
z#LEMX=B;hKc&<SbvzwRMLl`?EmN<dwZNZqx(i5vqym_Mhm8*HoT`Km_?FV!WB>RPR
zFWvuVMO#;d(}=B4Div_oIIlQ)d59l*Kjuxk%jH7$s5ABR4joH*2mK$$@D#3or$vgl
zaX3*%)8iH_+e5q}w(>pO4M$!#zmY$sw;;^%Q;AYT7Fp9IZxE9BIS`rZEc`r7OxGl#
zKOZzD7A3zU&2sZ?%6?NnK&&FZh^cNMS3lY0o2%CPK(4KA<c2ZswgKb1{zd=2vx139
z0lLNFcge!TIYBQcKE|at$GauaJC5W3RzY<ZK7yMejO|ti@<o32VFh2Z@q-)PSRnZj
z!=%=84#<#XKw^&$;4IC6c31(Bs}~EHD>A5Y?+HLdi2>7l52CkI{DYu<1wrVK4&_t-
zDOva~O@?Tx7mMDJas5ZKJ+2h!kTCQB+X>jFeMf;HO9mzMq0u`xE&g`O!b{jd5%F{A
zok8;d7qHuHhs;6i{-Z$nCCH&X__`kpB)Wk3D@Q=~egr5nfCA#&Ac_VZ2b6(1A24~q
z2r%#kKMhy_k9@&XgQ@_<7sL(P14cK&5^q6pb<hxC3I_2(XpkjPfZ-%+2n8gDKqe_r
zstW<qA^Hsm(t{-!t%6~Qy}!qlg;xs)O@>v_e_{@7OiZf3TcJ7&kGTg4M8U>k9iS<S
z0f!=Zz=|FOddFI7N1r$MK`)vMfQ)D8f6|Vl|4yx#nACS@>k=3uXtD*yj$nbM6b2n0
zISnkPGN4BK9#E6W549pd?@<)+CF7TwA6%y+z&^;dJDXuL%oG4+=~!S_4ujI@d%;Nh
zQD8Ig7d->a6*8dSm@06xgaM<94s3fy@AwLK4DePdm_d>N_m5+NE(*9&D*<{yklqZY
uj9US)c2K%ijq#ebCQv|sM|`^~gXKc3kP1>J^nssLkb6>Tk9OC#+y4Mph6Viq

delta 18570
zcmY(K18*e^)U9iGYTLGL+qP}v)b^=u+qR9Vt!X>O)W&_ko12?_$^HpDPxgAU_Q*W=
z{4{uDAS@ycg&8L|1PI6mGzf?Yu*eJ(*bf5>>{+7#F2M2t5}5kkCBy#4<-PNSvhkK2
zhY}r6!~r6YyE1N<Xb#-vDbMx<&hj5V@)G-WKF)v(ApD^n@}qa60=mw!F(Ndql+i05
z+-67ghW5f>XQh97qv5e_2bm=i%n^IdNn<j|&MXTBDP6JCj*5d>z%vly*u?Q0^f3j+
zr1l<WE}9nratYE*Z~i7CuNS?nme_w~hfypDVIq$C2=JfN^(T(YX8N_BCCXAd=z^Wo
zF25m-=(h~pntdc+B@Uqw=%rpO9M*r$v+B#=h#WK#`;}u4iy20Da-KS9=~vG$zyVSg
zcuQ^O{UmPWUG~!#I4rm`Tj&t-MvibBc!wO5acXk`a+gUXbQmJPte%fNPK1h8Y*5Rx
z>yU2?b#bzf9d%N%byMCh{gW#UP)Zx*PgqMzSgArYWLZJPjz=sbte4zqtdp=Dc`{3;
z6Ie6xhAc*@Nzk3*?!tA)VW(Dits$9WLo!ZN3-k3SY#B5I3g{D`<#`)Mwhei?1YKLG
zF~PP0ZqX8W8tvL1*0O{yYA#i~h{0ISR-u;mu}2Zp^xhixQ(Gw(?qrGs5UtM084Rta
z1L2&ldfY+3;3t-pYTpriO-;Zc;iX(=i(mfefCDk>ji(1&TYF_Kc7r)bK+8NTA1|V-
z@irbzSEx~}5PB^SJ@ngdq3UtHfg}$?-HI{*r^EOKLoA7E#eZgTT%qZy1h)H64n-NZ
zeLV<NwxOkq*1ex0-aWKC#gmWrY`Iz$r^e=l#ab}_+YBoQ46YTl;|(fjz^?0rOXx|O
zel_N!O#Cg33J1QnDV}{jRj4f8<8+g_nWDu%ZwfqOUAeg=4twS89#<-C?n@5X(0Ad0
z2umIo_b-l_q9P9Rvxqh3O{62_sgXx^Ip6p-Z(B(E)t)%zY9}0BSv|?u`uo4+n{at2
z;P+qnPp@F{uPI6Wr2LCYZzXtAzdi7@I_0m)U8A1ab2xfmP>PtCH#7hr23K+c5Z8E_
zRrPDPaPBD`|A=L$mEBIvuveBpIZRyv7Zk?=za@xuY+_bTu*uiYn}5<9`%A9+sY;0!
zBZ*w#glIfzj^wR#uAuJFQ(|_BeJ62Mdkj756Q6loy=%jNKL)N+H>^@ynORo1_(49g
ztYqOWqP-K~lUW{yeG~qYnTHL)pj=8I=!=X%E?0xit9}K|hI&#$$+KD4TJ-(_)PoTb
zhiEdyQz=W`Thaby`kiUy0ydERrNn#3$NCCR_9|EAnlj0O`o>OC4IC>4D%FgebFIu&
zmu7BFm9nR)6SM}yL)Ah}$2vyo8lt79Jtj=Z>b}&?>lxxJaP8@g^=q&LIyc{=VxC_Z
z>jZVgVvl*kF-iX{Klt!hefwOH-ize3vj0FT%Yj3{fq=lkfcysukcBolK`by35c&VG
z!T$e|LA#C(NK?CZL={07Xi>)OkQ>t&()}>eyHrgp3zP_Dv0<j9w9Zz~$^6b9hFG)r
znqrprp^Jw_R`3TQn)bGmqqBis{c2)!`^R&Z&&Ty}`SMZ#LU>dau0yZW*ko?X6ORGk
z(Ud)|i+kzoH!%!#qbohg(PVQ(DE2p;=>0E+*f7HtfQ6h+#eiAA{=LY1orfR!UO)(j
z`bfP57wNh4@yQ2WzPfzBd?z6;!FQWr6}{-*PG2HrC=e||R1<8^5q>zeI@#VEaq2So
zwmYRmSJbzm*b!U2w?ELZaF%%=**5ZgS9)#2H4vS(wk!NE)pwR(k@B9o^5$qjgoc;x
zVO{eLV2hiUh299nywS5Hp*DKG|3<(qh1QmclQokp9-g0NmLts;L$7-u$$><HzfmPj
zD&v*QW!NG}F<st%lYLjJd(sR|2|MP;D+{4Z&CCilRxQVJa(px>649w+UGpf(L~}tx
zGE7|{0<nV^N@W=d?{xSLd87q)5KwBlFg_Uuh@n+r>?k`iC%wRYrbBpxrFf?E9fnui
z8inh_#e0_<TnvTi1L5^)T}EJT;R(7+<AiE{R2my{>I4%gzy^U{w^1OC{EYfcFXqko
z2_BWA;u(zty3Ud;2k7GtzPr+%AtRmxuY%^qQqB`)&JxRDGlxE<-+AiBC$Vy_=)4fv
zu-}$@a<rptI!r%F>&MCvZTo_18lA;PnlFU@_X;WH6%Y;m0s%oI1Qw!D19V`$^|d^{
z6D@s|N-D<8^qx1O*%Hj8)^Pa}2xg+uW-d4GrPs7sn~%AbmVxZg){<F1W_mh7!n>H(
zaN(`t!Z66vL5<w#iSp>o?ko%j=b~7$7um~w?nPy-5KjYMnDM32FkiNMFS}khT~<Or
zeM;ZcNQR$aL3Q`mAeXmv08nw4zU&sJnnSJCTRW(J)F7gPdc#05m#^~ZeYk^~R|oI`
zw4m^P#DkaHHjur@eXS89>U<&f5hBP&NF%P>38;RQLD^3k5W3qr5WyfJjTu0Bgb>#q
z7HBUKpeka3^|smf+XF=DSP%3Q@mmuSprzmda5^FadzJbG1_L+&ch?}CherO&0Nfzl
zPr7f0po-gnl>KOffCHhluz$4EUWlI=&BuPWuTC7FiMag@5n8`*!8vA^F@tGPg$vZP
zj#$R*qL_kqI~`*RlvvPXt1MR$fDm9&((yE!AUstZW%EhC61L11Su`Tx|Cr5vgf%B+
z)o{~(Yedv?lABKhaMjjuT|;TOpqPm-<-4X*8&i7n(<kT3?U_$8)i|@8r&9G4Y*;N?
zP#5i`V@c}3=u+f)FZy8lfG(^dInO*Lo}7m_at6|rs?X9+yd3GCtXVhS;~taLFe&aX
zwn}RRUMY_L8=h+9YcEoX;(m(a3kX;LVkLZw%`XM*3Oe`zsGhF1WPi$!r<x2xw)(2f
z$J>B6L3xwB<*l%`-S0^F8~a|Am^@uZ#3)FM5F!RnMhipzUrifXeUa4LC8%V#RH|lX
z(@|}^Rgc;e+FOJ&+yq$5&nKn8oAb3;b+cOmTP5xg5G!y+UNj{NNJL<4u1yX3*{Xkq
z`H#V!`OYqY;oMetIApAzsob6r+54qj(%L-0i~mBr1x-xxy;C67S^ZXZ#M5+8abndk
z_}pXScy=*fE=wLwO-}c@r1L{}x6_0>4L?57Vr71KdC}yBou+&%(+;VC&sGVumqiNB
zR>w`jr%Pty`utxkdh4hf0rU~9lpXU`GKvN6rKuo*?$T;>s`JiVL~Hl6k3Q%ND>6@}
zZE_A#A}_i0vJ~hUGH$UF4XN7GRmYg)vg|jWD_X{SC$_nyqQRn3(QU27%C~ezy=}LX
zYDd+bcaq6xSU!kDlXAk0rcdA7S5><_tIulA?)AjqXP;2YR%>4dnXkTv!JhtkG1U#!
z$xs1!UBNPHjdcZB*l?ue>amyZCjAm~WHXN?(L?OYgR;6(sSqN-s?|fjnu7<Qjv7VW
zl-xz|&B%*JVv;}q6Z58f6*jGJ-1#`4TT>~SQbIF4pOoj)?zCNizsAs5RV8YpA(|Ay
zGBM{QOXRV0hpyIG9>;VYM_E}%HXs=|vos5kFeLlQ&QDYl5VPu%DKl8QIhXm@u@c>R
zq^mQoQC&)UoWLqMFwaX>Gwo@ue!T`iJ53N`arO7me%LebTb10gJ~!#j@p6)aqcjVM
z?n{zZ&Nbw7<lY6R$*z%#tlSDp#Z!FHP5GlbIA-A{N0BX*HbrLbL93>?10=Lmfi?wH
z+52v&2#n7&f=TzJn3=#isgLB)n;+;-9_5BVa8qrxLA>tVi_H_rre0$*9u$X9+)`Q^
z?|4vcQ(+uXpCN9VOyzkSF7~IUk6C4)_O2u;%6U#1r0+2FFmy@XwB2&*H{X)*n@tg#
z%<L=Mw=p6@%uD--H3Mf{D*R=p_G<tU0qIv6;F$SiZkU$0s3nyMPAfJoCx!UU<i(4o
z*Qmd=UB$Z@cxY9`eCaRJ%+eoe?DiR0$~o#6Df05%^H9VR^p=_IhfXPy&S}ybiPh0@
z`i-rIE%3I}n!qD+8&5n~t*2yoD1t~{bX;|z=(~(0_Gy`P<mL}3<Or2R>t+FXsx2lQ
zan6O@6T|HFaQ?J5IC7E}^3E5d`Tf@9zRWuXCeaZ{1VVdwYu;%2NZg0NeW(c9f$Xfu
z2oI^S3nsD~3gNMtcz?=oMF=`>VP+@^h^A@tpPikCNwz8-vbg<Nav5mi+FAnBy488V
zl|lD38Lsl{?fHxRwhOoxQd|JhdavC19VfN-_qpWsS;!t^%6{8boJ)IUpz|rI@~o?F
zjbq2gprYFMg{ANm>isY2%L(25_5@0&h_vT4&`e^~<7xC}JAhB&?Y#8d4ETrF7`+TF
zVRjL16{dEhT<KP%F(BFXhyA)|1tq~SPf5c<tpyPM;E%%PQFKl|=`&y+_VRcMv%q=U
zJfAT=GsZJ~)O;B0=;jqQI?-x)Div?uoQg`V)r4Gr3q6_2-}|7FaV2(i(7&P;i&vrz
zJ+c06bPvq5dQ?H@KFL-PG5GonKFAtl4^CLC0Fakif?Xx=M+gAVog>@EMO}BCb+?}l
z%i*;2ya43Pl&AC4CjyW~Y1uu^jV^HAk5vcT!nvZiV*<2-a7+Wrwn29r{E0KfM4IFJ
zdb4`YFedNr-2aMx_qVtA9-FDjtoLiD|4qX{5*SMU>6oePmQU4sK)-11i-?ynbo8ir
z)af=yZcFVtr+<xtHOKF8Mp)W!HuE7YNLQ)(y=8;?5N%CO*bQ*wQu-O~O7`Y0`8Pnd
zneHen)iKKBwW+_>`Z|thTkZd#X6NC~rIWwL0dGFvBMo(-QSe}#zJAgrysLZIukq$;
zB&BqwF;mT|HPevy)`O$LX5@JHEVobAdtLryu(|GDE!W36OUK-&E~l@xMBl$KFnUt;
z_k$%rdNxn}6bo=*7_LAem##&uHUPzZQ|-Q4TEieDDxfNRw{sX7pEGwwP{D4oau4~^
zH4>R-zaQ?tV^M@1CqiD#_E{Z2)Og32;TM5c71tfYQr~pwB2|<)^j4%kKDXct8ylWg
zH|*f*Nq<Rgt{Lw_?2xE%E_ZlhH~nHNd-Bt+@OEZ3w+V=z4ROY*->N42oIWEbTYJuC
z{0UdnHi+0==BdPA3o1G4_c>hk)9Uv>BT=<x(L0Qo7p`%~9Ci34k;K5LJV75|ys2wE
z`&}$>s)`xVP#f6BF;17yU%)$oyP-o;SV245xr~(nr@fw96S%sfJtg+!vEA$5l=>_D
za{{okR|aq`n|8j@n-I#DRob`#!=e?h4uOYctexN$Cvi3=4r}3_@BtIXplpPaDV6;P
z^anIv3B(t^lOOU|_RBs#_#aLo!3%<)<PD4A6aCQ>^1r>;+1(+nb682jYR!~lH^Z3F
z%(NaU$>li1x%2H6`N3_{r9%}^tFC^Or+Ki(a01X*dP8ee8u2^Y=1Xe0&0u(EZ`TiQ
z<KG(wH~2t(52df!U~3tt6!|Lt@bV(LD_=UK_CR`U#9(yh4Q)omcZzMdGB9<Suau`K
z<h1r^_@=LNR%JEM%h3uoz^y%5+XZ6`4Ql+>m)b?B70Hsk*7!}M$G?@%+xMe5Zc3GI
zmH}9EIDNrzAJBQ2c0~msWK@z886@s$?`Mkz{6eJ4POF*u<3BsItI+l09N3VKH}6FA
zrk+SNp=53F^eWRE&bL3^m63{l=0r#Pz&_Xj2t5Z@y1(nzlV*<GEB+v8BFr0~5@T>F
znrX0~ESPvybaYXi<Vi-67_HcZ^$xX>kO3m`MECF=uO1ofhUF|Ps`ebW2rKtg)cQ&|
zPvEn7!k{~}v;+{(XxGl1AN(5c**1`SDI(+9HrTOyJ#ZD)aqToUjhelFv#<TNaxlAw
zv(K*#JfhLohtu~xlBr!{w~}&rurg^+TGM{uX?<P7WEG&RakCC^d^XU(huC(tMgqLm
zk089co?G`MSgJbu{leqDq-(&l6;KCULqd&3UV3L0`Qq#^FZj~}aPhcrj^9CD@l7|#
z=-Wo<tH|h|9WggmD7j-8(<LD$7GnjWcq2gZCt%okhjcKhGIN3QGc>&f6?X_X6A#>>
zSS;dszxrcT{1MGwd5>NxKVB@B`vD4DUeX_gHVp^0jb>wVHi@=5e_vl{1K|?cqV?_|
zXwJ01QR@5i5Y3N3Z@zJ!eK@Xp61`k83l(sBV|zJTtx<($bQt<NBML?qYBVv7n!>p0
zQjx9RP^(dq_Tpa#$*Pm?`TWhjQU6(}tFr)LgLUBQIU45&F~R?_-KGY=-~qh12B8ri
zapHj9RaTe^a<0*TwidbN#J*zRqU2lLE%)Hi4G{dD)4x_5t;=2`5%4W96eYSW0!*v-
zUD31eVL~grZN3oN5jf8pHMn=?3miVXLWQ>9TFh|03>n+1jGVZQ)}Al#OeEbE$D}6T
z==13+U(G=^ytq2#&8%9lX8^bT$XE77_4u9wuyX4+2DQ6u2fJ(=0^IR_AuoR#E3#mA
z#;kt%ZN|CX0waebttUnhR>=@fE}LSy5YZ-YC{yQ#9&S+WuNa5M9sN_^ERtZ1iB^<f
zEfH5W_N5TjT8mFcDOvAgg%aaZ3RQ))2(7rEPaA)%?QVsCL5D{27XYNlBS)6j4p5%<
zu1`M-sl3@GO)EMSItk~BDps)WBmDK_e);N#^zq=6i7j9)d1dh>*5rLXct!N8M)$1n
zg$55Dz=mrz^hly9JP)!^wkdt!(v4PTB?sT6d6{y26z6?40u5Z^R(B_KiLBZNf}g&y
z>Ga1g1tpC+cm#*+eE^evpan;>a?`f{xEWbPF5}!vesMYg(1OF-#Eo0{T$-rBUi8Ze
z4}G5pVr&4WmUT&tGkmpW)n17mFfU1sf*|MA<u60B^rE_B7A45ZLMhc-c}f=r_axhe
z^)2~?^`*y-c#xi6C00JQA1<#O_iB1W#!PMf2V(|pxe8Gn5x^WwNPN4%1TP@-{MlZo
z%$`PPKw_QMiLv$7?VY$Iii|0pwhZbXPPeTuKtFd#4w7#`grb^R30i4o_~zhiYm04q
z>i`^|uTMlzz<-G3=@vQ?Pd?9hZGemO{B#5h&pc}s>WgGPE=h>fx_uN1@3Rg+u6;uz
zZq~!3A6`(A&!C_pyx<`I53rXYAjaU<W@kE%X8+fJ$HnU(Dn)>y)wn5Xe_;STDoDM}
zz9>Ire<c%yiRV%V_k+s3=O?LEpzC+a+ULxu{cZXw30Tb!KSx)4LR--{l@~!1|Ls6a
zH3>H%B4h*njsJhr1P2NPgyH{66X7jrAc8OkU{`5H8GF2-#e<HH;6PlWA0n$6vGiCB
ztr(judI{pu)Dm`&VA=$|JE1l2oycb-oDwyj($M#i$ijcYW^+6<*kaRfemno{MbK%%
z=I8V44t@}h5J$R%d_**2xEKM+yt}l7e!>DAr}kXig4tGZ-)(G0(tsJkf#CjS#}#)C
z06&3|crh&KwNuX2E`fZDTQ?~|r+>3rD|^mo7_WJ8M+^0kh84Es!G#nSP^zl*n!|_$
zhQe%*&R89*hd5v<L0O9=C?ts4kD+#-$6j6H!1-J`d7FM5y*~F|f4hHgpw(r&u~X-|
zpX}qW(om4K7FzD0Hr!~)y>BA4x}t;+Sb!~Ho%Im$W!Io+ISdxV_^2}G7SVW}?<af4
zP6<Eai?F9Sd0yfaO2}dD{7XKd&&WoPS&xuWJ38Tt*GLL_8359qIF4hj5yJTnl_w+;
zYUNPXubahcqmHYvkJ)Vh5yT)96`j**VG6S@pE;S$%xrCns>Zv9{ior4aunMUFmsz^
zQhI$ocT?0T7IF7u_M1|JMa)S(!mt;@bs2Qdb@^93&h!+)d6;TDRJ>)-9ohwf<~!6^
zi>g6IX1dn~wWN)sWR0^J3&N&3lW6o4aa<mmxFc%wP-df;PRh6mt&p-Vceti5zr?*9
zJg@}S7;SNboYfvq%wCtoiWFxYzyeyC6~@K^oTEIKQW9i*$d&YA(tC%y=5oJAYdwKA
zkoNS>yS~kiA6j`-B4K%ri$^&4r4jF~IV+cZ{aZ$BVT2$T-I5}5)QiPSMBcKSNZZMU
z@WnR@sD-xgbnUJ8Nf13VszZ_Q<ltG6X+W9q+*N3bLT3AN0hB=Asst$G{x7%J@`>D7
ziVgxI%m4yH{QuSz5x6M|516{$03$)T41y5F98Q2J6@@`X0EI;c*YF`{nwq4)o5M?~
ztZSEWu`y8I4)Lgqf!9!x8KmCQU9VoPZmZM7x~^~2tkGoO|LNso%OXbt1sDZR_5IuR
z`%lQc6}T<*`22~5MnYYZ|DIJkb539%DaBz_sAnf@UOJIsQ#Aw+1kfI+z$JR34187=
zeDX{F8JA_7UpVHWo`VolIywGqjir(SHr$#EA)e8Q8WrBE6Jfny1Tw02ZYY&>jw&JD
zvg6RCS#}SzeX{3Ez4=fs+^g{{q_6WV&!$=Kf$&aFe0cW{Td?*GDxKYn;_wem#FqYK
z7bu;K2^x~Joszz)0!V6a)d-m$?qrsk7XHW@9{%UGrxPpE;Iuw$1U<)gXl*p*++rH_
z$nb6bdo?B3XnG9~b%_f89`oXC98^&Bs$@5OTzCj79IjvpiV<?XU6`+ZwuW%g>Hn+H
z7!H8sdezRzkhJ+jvvX46u~X|jxnOmVX)_#Hot7L`z<Ezi1du9Alwn&~VDL{*L`>$%
zpQEG_Z>bY>OzT&Gu+@6C7vhLD$a%{JeIzNMo8v<NE-xVUk6}N9J$!=$$Q?R;Od)Tz
zyz(_0=TQ3v7YH7~pFWBDY%vmcD<8(9_h-t~#f>X4;4?a{U3O?UsO(ZB+1+&#TEWrR
zX}5bDtZuQT12ora4b-~KcekcBR;_9cdp&v76j!shH0#)FC30l#<jK$-bO+fR`6)k(
z|M)WGE(Z9+0=e+*Y?l$smo!*Ps#>QOaff|vYKq!g&n0crIHJ?~Bed<<@mFv&$9YgR
z85QPd7#XrRd$CC+IU~a##48|c*lZfDQ};B96i3DM08bW0js2bdhKUnewkmTeb-$y<
z#!Rq+^1Mu_aaplg@(gb&d;_{Dr7->e`ciuN)QVW)>SM(GU5%c!+|{lzQRPRjSs%XS
zAS3@bCDO5pA96O%ePjQDyZmv9Xu$SVR@6DgzONFh+Y>2<C#C=^#wONu9#Yl5BG#nZ
z6x~@Y2yn}{`K!_rB8j-M2jieP`N2yz%RXsIv^ux!VMi;Hk|U$KQahK+)<KD4f{Tl}
znqetV>rWF=^Ztu%POvzQ>Pas=4`b8EW>Ok{wWP(?p`YY8>Ayw_=i-jZ=FZ{$a6M+7
z0+^9r955yN^Er!Zwa3ovCr-*=hYhIt_N^OM5&&dWGl%<5!vbbeOTP<QV-#V1T-)X2
z@>+ZJinH>U%D8rN`P<bt7)u<>TSrB9PPpGKoQxu^4vvv89BO9M<K^uT@?;+}ZKJvr
z3H2;(?+kQpnDAC`0Hwnj^zIy+QO#W#j&`eTCk1*a?YteS({Eh95DM63nXG8ok24EW
z6F?PV1D7a6d+07A3HUTp)0>%~zAi>{?NNsgQ=)|N1WI2?Ssw)k%a9;E)-$Hx5?DCX
zKNU8do^)-OyQ|!g?-&9Vm#{X}rT`cu>nBT5cs=f^gb7s1K1YcWkiI&J2CgS4yK$^`
zP*{!7dE;sIU9tnvi-Y(+84O>zoZn&D#enQA=Ek>2vfIB_h=t_!IT#K>#WYa*b$H3j
z{EW9!AkU{z5-kwfWGly<#g7pj-D}2H%blCZa+x--x_V5pI4E=M3}9Z^SxEl6oMf?9
z*lukoz}#MP6u9kN=iKGSZwS_smzV^NizI`j=Yh6j))<C(arn4=8P-K8RUdlPB|tHZ
z6oxnp8BQ3S5hyU?sI7>4p85PQZDu#9?by+3HV9LX2-0PW9U}Bcka9FtZ40F8(VW&k
zf(HV@AYuCwiwwvOTpu_VRk2lM;hpyc_snCERARQI-xh3oa8oNfO|7UUdBqU;MJmZq
zifJ>gnf`KdBOGk=J!__hI2wvT9$?)dUHb;g;1|~Em3sc{<v<UjOuy<O0h|$J>)M3w
z7Mm;9N-Nkz?jQR6cuwtki^C}lOuBcDnQmaYQo;Q16Yt+;^J6~?{%Nb62H7~vvscNc
z?b3(-2j!*CI}`>~W!Q5llJJRnDwYIkM;tGcy$PAls=a?;8&b>;+ls92?f}iNsU_O}
zwNsom4w?&$4;C4a6LDd)QMgIw9A@t<HL<JTxO7w7Cdt)<6|h;d3(Ib_Uuoav%Vdw0
zvI7-Dm5<y4Maz)xMY8)v4zwQ16|x!ks~fMG)tWl)@v>Me6toUhzkl|%-k?9l(!A~&
z!yD2vh^qVvj2i9{{RM0%nE)am2qvB-(_D9R$|P!HVg7UXV-(c>>fbE;A)O1kb1<gP
zLG}K0`{nnJ{RXFeuZre`XK><&J?eWSLMm^L{ZglXJ`L<IRsKT%RNp{-fi^2L>6JsX
zq9oiDLV^?<$ScP~*0Tu3+8k}l?3EJRB9;fv@iMGAn6=XRts-og_5g80q`wZ_sUz1z
zI5yqSHkB;CVR~(E@(4A(iG1oeCttKg2Y#7~e6`3^ea9Q5m~s9bu<C(HJ?Mebr;%^O
zD=}nt^oA=4CfREO=Z$c=L?(mRmhVl|LZ<~)pV;!#bC+f3u&a7m0@!x$y14eg57r}K
z-<CeD37oH`(U!JC=Kx!p0-ZYRB_e9Et<tc__J~<?EB7U9k-;di*>l;^l1Pd!^dA)v
zdU4p8+1DcHON@S-=kzkgZo007P>8Z$Xb59P?IdfVGkE4Q%522CtdL*^Yo1f5Ly}~e
z!2$AQC|F7xWgF}&^qD$)P%3$8kPpXiOX`e>vJNzA&(2#JPk<@frrCSA4G1i~GQ$Db
zGyo&ZYv;7mEf7wq?0)4lZhGLrN(JiiWNR#<s7-EI<Bi8x?ey#|gLZ&eiD}sCF(ND&
z;6|MtryIRwbhsg;KlK}avC0WVDZq_90(XMLX&yh#NYp!cW`=fPctG<_W9Sv;Of`Y#
zz*&9UjrJ!30HBKtq?)tqOO?&=r5%{>QRa?<rD)ufPJUwCR1Z{}91rkWEx*;H{mK6+
zyeFbi`}3qkCxeEbK7o1&MW?O2PI{#p?$B6P(TvDB9@ku0nkz)}**^X6mTl6l>9v(w
zmOt%h7NGLlK>HK_Q-3e?T99eiRwI(OfBK^SjWv)62Ke3dt#Tpo-7!rRh4nK+R6e`i
zAg%UBCgbsgL6mrL8LZJ)-I1Jy!{sI$_tW%xgq9{)uB85*+MxLc@aKcO9HH_nr;*Zm
zDO6Qdkb@|Z&Goq=+NWvIo0t6n+B|0XgISSMwD{xy?okv0-DAS^eWNHzvcSDjH-AoX
zbZ9}b1GEj0syxb-87S+}^Z|!*9YvJyIWH`ot|QUqul*2Nn~_w;$A)jgCThYClCS37
z$D8y&{LA=Ka|KQH3WRN*d>Pe03+0R|>_4W%b)0Gl+Fa)`O0?txQyDxzdz%+S$S{mY
zJF<0je;q==^f7u~;ex{b3JOVwTJp8#9yuI02K+@~^xhdX3_Y+rPN_;uVq97-%u=;8
z8H~v7Ai;sX38``&V{7#aY^~>k&TKjr=n&|FOiS3fJL;*LvTtW*@Qa>1squ0b@d3O)
zLaN*ywz-nNWHqJY%TgPn*s$CM|8;1c2fKu?B5H~MVz{IZ?B*;WX?ufBFeUi%%H<>E
z1?Uaq5nfp}wF2^n17zqe!QOReWYrBg$}KaGf`?SMHEg1(X+g}wBa&U_v6uyxlGm&(
z@3)(f-j*(pRu@F?NN^ekhtgfGOpG)(bZqYac+=-Hdqh9%rHS%Qla&%;{o0+iOIu}j
zTu>Ndjx>4gme?C!5@a=p$k%g%*P(7#0mO4%5>KUHHds8Dttk`t7Nm*Zl~wWL6x$$z
zT)9Z~2ajTk720)S#!IN2ML1YUp>yl^X}<|DCZHd(xh%RZl(yQEpg|%k64ITpCB*l}
z^{#*TdX_#AL|$>#TG9F#QI-hGKxwR%Z48^ir3Px*rTA!--;l8B$A!*KbAbcj01Qui
zAFWMNSd-UU)nF}x5s9=&rHt2Lk$u-mc)8lZJOM2#Izai9)EGcSmf+(mV??GNd409?
z$0d!WX>dADqe&AVQCI)pCK+(t1qpJgwxiCLA0d~nZf2$v5qo00S6HOn&Ue2A(Q)mF
z&Md+ZWsU3>G)RcJx+809y?<UBKt%@mr`d_HFPY(a*Sio}@{4g+md)eZgU*|~*Z1!T
zOH)b(hE$p&+BrTgF)0${IX`bfW`B4G{X6IBWB_Eo+sXa#-;NatO#q8QNFcT~Q`x`b
zFT%ZfXlSl?nee<+gAIxA?p#o@iz-Fcm!-ks;($_g%ztD~CR2jAt?OHd0M^!$$yiTP
zO(+{~0%#n{CGP2o74vR<ws20R?vQ%&=6rF=_I&Yb`b(J;R}*(=gK(5&OQAOzk%7v}
zP^boRw$kofP~5P{B8!`#o>13m{$)hE2UCCJ!EK3=OE~bopo-4QQlKlJ^=L_|mlF|B
zh3JH+Gh;+81$%b6$o)k+Aa~|^ciEM(xaI;^`lRUXG2k7v^VNp)3t7|E#DV0xlt`py
zY4L%#n@}Ci24OddifK1$)v>l0*6voo>2l=EbT%;y-c|CZVsM%fS3~Q!Oi7J_+pbvT
zqF6txQa#@#6s{WTt@~nT*Ny(m)9ybkX#RSAY93Fom+dhE_Id<eKtjW1sd3g(_T|hI
zWG}Q+`Gr^&-@)9|-20!vY~^%<$(zFH8$26fVI0=J(1aR9YF73t&zwXrFCijjUTUM+
zqvqM>xQJqhunh(F%xutjWPNYS_zDL0@L^{4u!IWC%#lJMwW8f*sX{8qswQvjRwaSi
z8E8<3p8jVh{2~K0K$WwukjI^FS5i=g*I^Cbnkz1Baj<&(;up3RGxx5Hmq<ST?N%s;
z<1NgJ(z#=%2a0DOw36Xt?786<Jl8I?AjQcARF+ne8~U``d0;r9ariSz{6|Q{kx0><
ze-tI1`Zo>Y)hY1TUwPA7JUnmlThY#8H3QcmN;Z5xeyf-dfC+7-8^-!oMb$^ut>G*>
zN!m_O)lt7%J-B*`#9;QItB`^ps(4vIl)349Upj*6;}mn^Xbx5~FSZM=xH$SSJ3KNZ
z6$z&n2`?83<5*>j1MCWvee3P`+DhQ<Bv^)mdk|q5s8YywH}hqABy)qVWqMa63za0E
ze7zXD`uRa6K#U#M^3oz*sxZ_c9jmbnLQY}|P2Es?M}}>BhXU1(&1;E%&{@-A-hNEA
zv9f$VKA4BYBR?gZ*J+ReF2m=hq$}jeXYu{D&!!SX_jLda@1_tm>ftb|5yaG<l{`QE
z+dImQR9puR#K2La5X+4A>-V%gIC7-W2+$lD)5<{$IA@_do&t&+r9VBo(aHX6aU}&n
zMP&I3Dk_!k7FZOyNnp)MDW}P#>ofu}i}kb-cdgQ*<dEi{I{)~(^>yXv*oY41UFPYO
zOC#qs0)HO`xdvfcs9bY0nO@Ev^)v1ves_#qc?oaw*^ny>g2NOb*)t72xJG5V-XV+@
ziAR6|rZ*qS1t1}bb##|7WI8??Rde&wJevgWnI**!NnJh2sA#G>xhoe}UM(`Ma|d_R
z@<Hy{G(A5dzw^t^uGB!F9(9X_BGeA-_@??gV(<UPxGG+ij?r~>$EN@GAu7M;)tXm*
z6|4ZuhXzSsbzhe8)HO_KMcCK6DYY<YEv}CRDAogCsuguNWmZ!LHHX$}OvId^^HjC|
z_=Vhq$<E{QnS%9a|EjK%=te_psM}L8vv0q=iy9p$P`obuFM<;j!jV4F8MLC{59GV)
zLgz6Wi?54Vxi6OYEmC5cc%am^yw_B6!j2)bgE>Ig?!tZ$42rxGQxk$A5S6oLTEZ3s
ziZJgQVUxDOqVk}B>w}OPKrHBk?du1h)tuV|J>zs^LiNJ_=}F6neu7Vz(gRu7#b;bt
zVX8x(op_DisLL8(ZU9jv^3)Y$TAC4-!^x9xSZp}VkrV!){em)EA8ct@c4BB0N*^CI
z({wJOmLUAhgM8LEA75WKZXhmb!25Uys0xldb&1NM`x+Esz%9cO6uV%f5qGjhOGm8*
zmwFl_+wT{00Xan2_Q=a6Ppv;}9s<<&MG!S4czmHbEO$i-UkKOp-TlwBkNP2&j3RuD
zKzEGV;#h|NB&my)i9Dubw2(F@CY4IXK<L~zq@UD(n7~Z=KE%{A=S0-ol-Vr-HcWFp
z(cl<_F%$D(#XVE>6sHYNT&_3&h{E(kF6#)8DzqMbaA<#fq+D(uD$^5fW0|&?_AZnP
zRgf_gsRK%dM50BgrBD82^PIVF&R!FGX2$afe{Hv5)u6CzfMO{6JAC37x_tAAk<=90
zkAyvAa%)L!_GvBBrnI2id=>-1bw2DC*>aHHbVA;p>NMJQ>>f4Lm*97ZvUgSNyeK}7
zN8cY_nmrlHn1Ud^2vkrfDu=X8+g%0l>vLN~>cp#?eqBxnph&?J`mI1SmTZ26*j|u3
z)GzmoFOWCS$8DEydnLR^Tw}6#Xv_UFl1HYK%NLVeB;($nMc7A@`=<%O!6S`#fFw)d
zjPQQKxBff+XSWR={DfmS!dIHKsOc3);|w`(+V`)1!dgP59|$j|*N$bs4KdXHgw`f6
zW2ukcZIPdLVF1ORJ+BbhJ-GByyM9sfJrAPFx!C9?39Sb8a(rvG`GLMAbM2y3nC{^~
zfvTq_SMQAsP@9BSZTA+CTd^Q(pUf+@CK8u;0X*SxB^ZaOe-m@LeXov{RUTZO^DvSN
zjghOpuM6;c=>hq(IjLADa8{&|+?><9;Y|Hujet~0T*Dp>ZJGP|W+QhpGVi66K3VZI
zWa@gK*fC9xMVtdYv!C7?CaV)!%D&|l<=Q26P9o_2=b>~FLz@DSt_c_GJpADcXVK6$
zW-S+1s32-YE}?uNyNv?})bKA=S|bs(oR@`irtvMhmk#u_tlNU%w4?WI+BRu=Imh(d
z$kEqNm)AC|DRnb+pdxqDrE93ec%^m@1t)sRH#-5&eV1lwjqs*m1~9V;%IW(N@N5#v
z^s`eDac^40BgKmvti6IDO+98|YJp-<d0Fx}J)GY33XbFr!XX_EDUKUk?M1RcS==EP
zofSPQz&|jaM7W*fMeQD%|6CnKbBn+IfVB8)b%Vh<IpUzSgMxq<g9C+ig#fC0a(E)>
z-}9C&H5Z!4)qR_C#e$<x%@XfxsxUFiFzt&+V*8X+N%Hz$BjzQq4d@7>MDO75C9(_h
zqAZ#)0hw%P&w2lHMn2!aj;VqI>}N}&uqeE>+4khj4BxzuOGIzCZIb|60mGstRPz$G
z&9BlF_g|&%mFz<^J+_T+>43()Nq4Fn>m@~V|00P2CXY{vlihb?;)U$!-*FFumFlNN
zuuof8&o;{!)|X)igys%1+V+*|gh&h7ssJ<u^04??iWIb>v}h`sbr=fz%`K9d^=h73
zjdauyB^%l&5z@?Ty}h~A_O}J(K)sFRx7}0&rLJ}lfEUHhab0#)D4=0ex#NTzrb7A|
zfl(MX5e%XdDsw^~gvd>B4ff-wA$e7sCR&>B?#xoD-Bq;6Qd1|315x7}hwvv0Otd7p
zZxIG;+JbCJ(;MhL>ls|ah~MeoAihne><&-0g;Rulop502wl`FqXX1;l^q1u?`i!*l
zA9?n1(`ckxEAC0(2({Iw{3R1@tvmB!+y{s5m?cCwEr1Pw&Tmh5X2;ApO8x-kt37BV
zK@iW|*{!o$yxOGB`|N#j0LcID6B5X79AW;~VAuPvQ%L!LwKcy!2EfJ)PYXl9Ob%Cv
za3aB!s?7{*jHQl#6BCwQcn7MNL&a`$NY7<?jX)302i2!EK{6WAf+i_FfJT`*wOMS_
zz`9f!{A=FHl+VkOezRVF8_D-yf5pcQkC)HOoY2q1xDZJ0*ghG)D?^l-02tajS*qh?
zQih3GIK?)k4!Q<E0YC(TXR}FyHvDi>KS6j*VY8oNq&%h$CgBhb#b5P1_Be}K5M!v~
zE(^xpU$fLo!(Z{wf|N6=QPN?1%$Yhr(Kr@a)S;Y-zfS4^>4?_Y;=1^IcZ^fmodU`L
z#yGr*KVQhdgPxEdQ|x{C;}6$Y2@ED0Ze9cJl?R~ZRMXsQGr$a!9#VI!8NrXVAwyPD
zW+*z=%?!ArMi={_=0=xc$)-m40Pl8@6$@9qvi_9gOWUB=^_w42yGsSq0S&U|<UGBl
z^lT;~ge>FCk|--%yE2bArRB+fPn#a+xokMX+S_tg^sfn<)1vsf$O>y7JY4p1s2m&^
zS~&gcR)xY$CV<AN7WX-%Kbs4}Xp-rooyHEpc2JvRzAI$V=thG?>oKzyD>0&Iu$K44
z;@c*okRvR0{80p1Ct$_>aomLJWPZuwRNk>ZtG~G>;pKkopaQ*z>KwhfWk?5yn{5MA
zN!(kV5r<;{hBLohOVz#=4z}CamqrV4K9$p&Ee_dy1?aWBFn-!6`Lx-eF<q2-$i@{>
z?XH8A9UitLmZ&egjhAMz$tHvdDpi@+ra7!^%33^sD|{XNO($F3bobB?7A5L=*3R3~
zXNw8+7p1@ofq6*i_arO9`VzJ2h>ssuFtc4@sZGIq4my>TGjUI4H#^q~!5RtNN1Jh0
zjdi;a1BenI8niyN74NN<-;vG;k0GIpTYKfoxS=fryo3H?krMO#8F~}lG-NXejtw-_
zN}hy8sPI=Fj&L^|MdDK4Hb+d{g+(NqX^P>l^ltkx*uA0{E;Yt*?A?dbkIz^N+HK$l
z((?)pDdD81Miflhq6@9x!Y2ntYoX@`yht!{0s_m9)^RPFXJYfS{DsGAa05g4ZC?oj
z8xE0POF|SgR-qiq#^?06T;p<;-+|O|rh4bS<p<iKvvlWG|K`&eCU%&gKR5YQsLxth
zY7R!%bSha^Xw&mDwP?vqKNj3GhK+8!Bls$<D`R@RAQ+!LZ)nfCH`q9K#*B1`0@+Rs
z01PcZ@#YG8V|cip<RT@ncrzNb$Nq7vSZs1l%^oAPJEZ#w-E1v2>+u{``)j>MM=t{-
zA2TC&L!pqqSHj15UUv0tdyR`ow6Q<rOv;*?L$`e0&w<f0Xl`&lg1Lf=Ks;>S`y1r#
z%!wr<Z~Spw&&#j80hHlAF5zuFTu7=PfD+yPmiSh{{o3T|>|s99*39rSa<3<56q2kM
zd|Ir|Zc&%<=ig3dIE#Q*W&Z1H_pud3HlX$I^-DhZOV7h}cH#9UO~HHe0uD~AhUh7%
zoeO|mRd4sUMB>Csyi3{HhlVk~!P-L^_;YVF0YPu`fNO_rLenASU9*94b#9#)Ad3DF
zeIRB2KDHKT*Bj)l@E}y5!zAev=~{>C%?zy+{|})b=|p6wuaH%^8?#FIeRhp+uvr+}
zVkF4Tm=v{5KB{00%e<-a4%aO+hXfZX6zUY8b+sOksP2K6Mi9H+;y+#98=H@Gaa3JV
zQ!rrv+z+bEsXt$GZDCi8FeQsRK*E`lCAXH;U9b_{L+2Y#YpFSO(iNjl-v*;qBGLK$
zmvd!dUrfTokil-rhx>nHU{e`L-5P2(6MbXsRT(pXoy{iz;}W-$Celh4j28D7BBC+c
zWW7y}@FLr;gJtZtQS%mokrhjU-vg+7hMkVq`1+n}W=)AbErlIIeBBB-RFNgIy|=gz
zRXL#@^dT0Bn8R?_aPcp{iIxi7AR7oE4z|kdY+>vOvnm;P7(6ZNTu#jqM|>eZcC|}^
zo|FQlot>OWKaLvg07;BrW|5bCJ)K>7geChl9z77$o&R}SLN}eB(^yvjD6HSplz$4e
zY9;PsPq?%$pZ%ijDVPLQL^FH}3jc_mk6HM~z1GDo;Q#S?W<Q0b@7|01y^&}<W$}Z3
zikzyE#;tH)`cd2PP?~CJ#p>G~5*+DkB+1;BXMa<7(6@c#fTF0f-XfLNW>ajA{iTy3
zH_N9db~)M{TdsNxSC2Y1@rAYZ+D5UDCV11rPs8blUGc#xmXZw!h7W)s+9Lc5&#y7`
z<?(p@i2cYS{lo6NAyQEMSd?Fvj~hzJAB|xOu@qjhBfIR~6(-j*QwBLbfTB?ZPY~Gi
z>TXzw1G{6+%BwAML=lG8P-4S}qtIRRs|#<bs0X{=)LgImEJK5R%+=NIGN32pXf_8r
zN=R{$O8Q8q+%}w4qV!+aE|B90IJt%@!6?=JI&g@2!BMV1o%)Zm0eyS%zmq7!tbq(R
zYjM0z5gY{M6et)e2hiiT&?{6I=_S()YhQ#XC62;OjYWqOk-6P(uJtIoO1UQO4_P>b
zH!c>TVEJadQ}Kr~%Wcss)Ha4Exm)0Iv;5=lwwbm0@UXD%1hSl&u^1#yz#sz~FD)%i
zLLkg^<MQaTgOvgbiyw-Q#2rBa!AvSLOqMW#j}xJL*`^ss4#3%JiO5nqQSd1%q)ZJ-
z$7Wkww+Nu9x%iuFkE!7n)f&lR&?1RV$-BGyv)Z^xXW=Vm5R1^yVkTi>jUKl-_hhl^
z&&Y%og*J~HqpzK+ppYvkU*Mc^X!<9uEc-ZHrxlYkLoNwnh{ix`t|>&HzPfbv-(Ry6
zYWx_sLVRn&WI*<`H1=P_fT0uxx(*YYh<TRr#goMZ8dTk|r)IVu+JR&=NSy^LOnSAI
z2eGtVMz00B#wq9q`#%y#w72IoIPHQw8koBEqkI?Je7vN>&Be8IlX%Y+2j0Vto{Sm?
zgm%;Q=nLDW+N!29Y~s~j6T}SIIpxI(cE$d>wC=v*^?(qVV^L%hb{Bp`Q+zahposh-
zj#!SKEjE+^flpDx#dvz4xIil*72FYRJ?w;KWs(7+JQ4W5Yi?oBG?*J)ly1!@^-ea1
zTtd-5c>zrY`Gm3Abo=T^GhW3c!GIOz>mIG8Xo&-AmAt8#V$9g&U~&x`Cye-|)7Fdf
zG7Qw;8i3-FUo4e*57lFfDuOJoGd0zw*Sic>F0)HJyy#m!C6;qMt!8hFRqZ|%HQ9cv
z#b3N52RvQFN~%opgFk8AuQtj{k^`TTzW9yG(g^Iuy|+<sQ11@QHYxLlTcJxERNlo+
zufKYU&aXt+>JUZ8DV0YkQH<5BNetnqq=_<|Apwmv+47@ior-Jtzh7=gr2Ht~QSujV
z#|8?=L;qFgU4IAPGQO(Dk$+Qfi|jr#mQoaT#15*`E7lsn<TnOxdun&0Vg}hmDcEDq
z(MQ7MbnHg+Mm+CM9bj%vA&Tr$PK$|9p$riWUl7+5U2&1(w~+*I>bP=CsRoZ+BQ%C0
z{FZ~G<}|d7`ImEaPU>u_rosmu5<}v6*10`?K4h^aHDwPjFs>Wz7W$kc2<rtYKB>f|
zdLHQ=UdAkb4|0t}vgbq-_s*YLE^rC_25Xs#0R=}aotQWP{qI*Q2Ob23AJ`N~05m>?
z27bj80#vsp(ZAO)Ysq3qJ2S)DOMh{I`VZ}-80U~fX6v~)>r%B+_DzYpVA%7J%_tZa
zB`$VITWyihtd#!nu5_I5_lxlf(D4|XhRRd2eU<DAd|c!@3FQg!0=_>k;X&NIiOpbQ
zsm_y=QHDsR6eGeYaCG#49l_PR`jcbM;M0LU1DX(U*17AUokNey<Mdv|$3fP(?^%bn
z&#0YuOwKz7*l?S0BAWbnt4rz9yERr<bXTPt*6cV|cc$^m1Etz<yVJ-XQ%rE5F(UAQ
zd$;Q-2|hK5897_VNt%~>ydyLw+D>cJ-5y#DT2rX=>l|&}MY<8%9shOUW{`E3h<-DC
z0lG~%u1s5Y?xzZOSQU14>#E};6dNU!Qkv=$&Pzoch_)nh=UbQ&e$N%x>3SX}JN#Bi
zSipwb?ZS)YbhvNh$pTacHk8*?>&Rd^%rMh+DbA#FJ^k7r9cs|UATfv(diV5zRwC^}
z^9oH52cL0o2!6pwYM0Tl9^<CX(T_up18CcAcdSayPn=S-+7G1l-U|-b0{!}_*p67}
z2;C5x4EM~EVxP*(ROX|?@NWj?;jb}rhoVAEa{qMBB=M$~AD#Naao+MwV8O|5m`C|u
zR2>NRn@@U6c3U~-JWW_;%<{W!q=&d+qt*7CNaGV4Z&tJ0b=w&E6<^fxbFaJN031%G
zt7SVYbApzl@5V>j#jJ&N;7=pFE#3TUge7#ue`7QH5ZYWPfg^hDBL`M#>-)DHEy9y<
zo!pzPE+e7x+MC_HcH}W;d36(JaWh7l)K$d%zAQ`8P*}l>-#9`rsDC58c}T^pvB6tq
z#{gHs{)Jsxt>K<?=+CFXrDoW-4RGADN<u*x_cLjn67hvXs{9b+(%2KduwmNhv&Hqz
zgH3ajoy(SOHt)Xe1+=RAmGLc~8le39$3;Ct_yhZoX!wW1@t)fdrR;`QQ~?J*T->K3
zi%3xAdgzw1&T)B5sRUK&6U>M|c_;XXO84WIP(Ue0fHP6BJ&3p`=w*si9^e-?LH!oN
zR$?p18G+=|fBM7(u_#s24_}ok-AwRUHvx$Fhw~0x7z%hL2(D!({R-Au_dk*f^CHPW
zZABP|ZQ$P>6Q=Q3eMhX2{Z_xj5#_`7?}~Mn=}pE>HYC~i`HL^RC;+eM&L++gtCBu~
zttXmdAemrL_Qz$cXy5>K8&J|<1_l(@n=QBgBZiz4MJ6LCC6kX{Uge>{2mSOFiXS<O
zf(;iep6fu+A*>xOd2>GT{B((xu$ha-eIxn|=4P9!#23u-hX8WS9uzB=$$jb01(s;B
zQ`GjCN{4?sJqzvx#gc+ma$&iTWG5UXarcErlp#;-c3AA<Yt_k!794vZ!_*Jx|3q0}
z^#LxhH4yiI(9oim5(I__b<PS4@n57JLID90_<z(O1MF&lc%iQn{Op(mH|?Qdf+5h*
zB^9KbeNb<MO}8>bAUNSUv2pK)8u=WdIN4k*Ibr*^bsa80RBS<lF;i`AAnj093pEnk
z>LLLpXOE9c=ZBU1|7NcoQw%mniM~$fUjqNVcnmD`e5|emzVLz+<s%m%+Tzl`NWxHn
z$Ven0fOwX~yOaZqD6G5;aCv~TC~K4ntRzgwFoMW9j94PHN!m!nh<Ft;F7xy@3v8sQ
zb~sh2H*FXuKfy4Yce+wOya`v}beItQ(OH~NKR(g{R&Ouyp@iT!1<_A6{=oPHs-fvx
z21PIFp$6zCzKi?HxflJew6u2~GoO`-^|l>0AbS<4?x5EKxkXl<X04=c%U{(tk>cx@
z$irWYdl%(s-J?FUR@=S#=>?zaiwoh{^{Zw=?DuICJu6ad4XI#kvbL<flm|Pk6LN=@
zs1O;%7Th*(Y`y}429T!TLgFNdx4OLoUtp7P$suxn`u!=ah?gc7VttNp@9G*@ooxLA
z__sTDluNQ(f7$sxCjg)6+v0exm@$|UA3lYJ6F!{Jbag()(_$k`yl6H)r8kpFo{hWL
zpwqMZB{QrpIh&b{ugsA5BFH+phg!L3l4%xUwVG?~NNX<~sCn-&$=+QjZmZ3PAMA(c
zHnQ5fp$=P(<CE5P1d)zxa%Eh=d$jKepqUVD%dO<RNumKGh>u<CVlU#^R_F5r9*vhn
z@6Mo{NvoPMrFGKCry28#Ww)&`3HXd6TKVPxjd_-yTSSL*Q1?=9+XsL8k#ux2efx5{
zB#sGsYtPDn8Hm01C#Rf@Kaf#HosT&*bmb1KJm0H4><+mctlhWZI5{pzVgo1u?c{6v
z-SjfTqvv6%NQ<3l1=j2(#uD&L3tWCYbNf*O)^}tK>;86yi?B`B|5L@8$5WO5aa>P!
z;#e=om0hy55OI+ui4-A&B1^K2rsT>t=_WB=$kp#b;aVE&gsi!;L_)<_GG)2wy0#_}
zEhA%{+xf}NJ^wu4@8@}c&vRbSIp_5{=Q-#5-TB8V|KOMmRr#IEM?!Vq$x8=SF56d$
zJq;2)YFM=U{=Gbr##=N`otGgWjB?tZSJKC&buO8<3*p5EM}AVFEyNO4o)#qhR-@^e
zmK*L8uSQNw6(-fk%;@ku^J<8n&<vKBpJ4x0(^_7Y5dx^Vps?(V!^sY3r+ZV@YHU+*
zJvtj%dFEa7o<#}vx*7~a$@z(d1f#K{1i^)S2}Xg6b<1{^M+?J$kF81B-_<9szN)^i
zIMH);g&c4(aiFo~_T?<;_5JJe43Ta5CnaCpZB1^LrdN<iyg_@)AH3bC(G%tGdMXO>
zbv}NDujGu=ncURO(#o?(t4=+u_C1Ds@MC05%TK-Ya<3?U8u?Cw#jlDFPNflkR`|>p
z$7!48VV82rvtl97TahB?=(xA*mq%s7ro|tZ3_et&=~5{Ntm~j9QC-W{clB6ZWAyv4
zb$(N$_U`k5Lb|P=h?{8+)E58aLjA?Hc7d68L%#kL$#-D}dK-3nlBR-&fu{*JJ6}vJ
zwb-lql)L#i^yNP5&vwrgjoY>{=R7o+ys})<)v7w`;@zfR<P%sME<hwuEw3NQqpdE=
zro^m#Lo&o?zl0jBG$&ckMWm*oL%GCsjckQRw{tNhB_h)5>GyQnx1evP3|CX##F^7u
zmbq^&UG<0(S@(u&SjQtbH0Z+}@645aJ?_YQ?maD|VqyjcuHEuk`9Yr!)1=M!dt6Tq
z_^cS$;)%8~;<@>)bG?M~8L5^QjDAb@r`nO0$<hAYQiS<qvjtanC>rBUEE=LzFN;1L
zm*|fph1l**%yp(TH=0!mDXGgC4uV=_*mctMLRbY~#oRWW=X<N?b)~gE)Q^gO9?QO=
zyi-TZm*pp)bSOo3IuV@k>+E(L9O@b7ZS;)7a)St$w4aX$_<iR8LDWN#=X6-2qIf;E
z=)7R8eNwAm<$6Skh)=K5A>*>8-bRy$g@(i^l1k0JI~Rtn1K5uE4<HTOh3K@1n<8II
zcSSteed<I`jCN1XX?I|?$Mdyp{ogS};w`6+L_|jDwVulOIme1wo=;+zLj0mlEyABK
z(FpH4%}m^ehmK!3CTSB_dE>@o*(W`mWVfQpGm9%?i*xL#ciN0zrE-}<XDDgg!>s<-
zLS)jMdAREdhB9str<)o4Bt7V4|FmESzpF%qhE{Fb>mP&y;+qR=wP_=S=sGR>>VSy7
z(c#-K`bLuq{9`Lk%xIz085@X12jL;SC~%oat@V7zGn?J_vl+G@_1ar;UrudsDYxFy
zRbG#_8mBLrUX3QjsXb_FnS|8cd?B`!cxI-aK}b{fZ;n@Gf*B605^LAQOA3Cki<1@(
zb~}=GlWUz!D^7A9E8tarGx1C3ujLl_qyVCo|B0LeFLZphA*pdHy}T>8Q!z6k`{due
zIP?pjMSIj^XU)ZB4#f#M>UD{533Bb!dQq{549(?Evfb@lxngo7=Jet1t6Uwr*UUtP
zx0e*j$2wG#z^Y7_?peN@k2$IqGVY4Ad!5dBRh3XFE-Xf=AN(2`^eK2;vzzQg(pym*
zBt^ZiqPBJjabUGhU`+pyc$N|d%%TS0x4cL$0T`(+h800k9Z<plo2bslCik6Uwt0~O
z$R@}Q;|KPE0GTb9Hed|gWihu?UKXa)5a=<80-s$>NebQ_JOtEKnWj1{97Uk$5DL%(
z7<^<%53p-v=C|Ac%8&$}C2N3X_;kZ9aCS%m&+^|k3+Q3I2_6K89WXPIhR6T=6@-mV
zmxZ5q#2^Eg9q><@3Z7+UodsNR-ULOU1OtIy!zgg@z$EH9X-vxVMfksm<VBwM#yYJ>
zxL~)h2;4EE3f%oRB_mKD2+1QhK#B;*MjU__5gr`X2axGq(Spbu1X4#)urrwHO2XMu
zYtR!88OeC)^u`37zlxdN*90-J{|yS-A}~pSt^@dPGED{ON5|o}mN|IX*z~_27qiWa
zT>L-OL^lJOu^8V(=YWFoJ0M{U!Lz)-vBV|CWANH7DL6z&VD%UZ-jgxu^O!cC<q3`@
zj`BYyWCU#{5eOM5SV_ZT_EMza977c>Q!v-KkP{xr7RM;xaTIK1Z^@<O1R$8Z<yz(o
zVU*Sc3i$IkWnt{{;=BLfQ@~xc*~t&-69n+}KIR^p)CX3jm`N(z`E5_w?F4%##X)pA
zQ<sOlQ~LnD1unFzK&Np822G)0wgV<jIRT^_%JmvxGynGGf5)2afq%W!$2u~nQ9ykO
XA5B{Uo<4}a+66V<BAnKJ-{#~Wix6zU

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a563242c1..442d9132ea 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 2fe81a7d95..4f906e0c81 100755
--- a/gradlew
+++ b/gradlew
@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
diff --git a/gradlew.bat b/gradlew.bat
index 9618d8d960..107acd32c4 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

From ea8c1831be786e9907a2bca5be4dcbee9b902ee2 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 10 Mar 2021 16:32:08 +0800
Subject: [PATCH 234/665] Bump gradle to 6.8.3 & optimize gradle config (#7207)

* Bump gradle to 6.8.3

* Modify root build.gradle
---
 build.gradle | 37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/build.gradle b/build.gradle
index d8edc53550..3e64542975 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,29 +2,28 @@ buildscript {
 
   // Dependency versions
   // ---------------------------------------
-  
-  ext.reactiveStreamsVersion = "1.0.3"
-  ext.junitVersion = "4.13.2"
-  ext.testNgVersion = "7.3.0"
-  ext.mockitoVersion = "3.8.0"
-  ext.jmhLibVersion = "1.21"
-  ext.jmhGradleVersion = "0.5.3"
-  ext.guavaVersion = "30.1-jre"
-  ext.jacocoVersion = "0.8.4"
-  ext.animalSnifferVersion = "1.5.3"
-  ext.licenseVersion = "0.15.0"
-  ext.jfrogExtractorVersion = "4.21.0"
-  ext.bndVersion = "5.3.0"
-  ext.checkstyleVersion = "8.41"
-  ext.vanniktechPublishPlugin = "0.14.2"
+  ext {
+    reactiveStreamsVersion = "1.0.3"
+    junitVersion = "4.13.2"
+    testNgVersion = "7.3.0"
+    mockitoVersion = "3.8.0"
+    jmhLibVersion = "1.21"
+    jmhGradleVersion = "0.5.3"
+    guavaVersion = "30.1-jre"
+    jacocoVersion = "0.8.4"
+    animalSnifferVersion = "1.5.3"
+    licenseVersion = "0.15.0"
+    jfrogExtractorVersion = "4.21.0"
+    bndVersion = "5.3.0"
+    checkstyleVersion = "8.41"
+    vanniktechPublishPlugin = "0.14.2"
+  }
 
   // --------------------------------------
 
-  repositories { 
+  repositories {
     mavenCentral()
-    maven {
-        url "https://plugins.gradle.org/m2/"
-    }
+    gradlePluginPortal()
   }
   dependencies {
     classpath "ru.vyarus:gradle-animalsniffer-plugin:$animalSnifferVersion"

From 5c0ca03592620d9a9aa0c279e378e2490121b43e Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Thu, 11 Mar 2021 23:41:35 -0800
Subject: [PATCH 235/665] Added Javadoc checks to Checkstyle. Fix violating
 Javadoc. (#7210)

Add JavadocMethod and MissingJavadocMethod checks to Checkstyle.
Checks ensure there are no missing Javadoc comments for public methods,
 and that each of the Javadoc comments describe all method parameters.

Add suppressions.xml Checkstyle configuration file to exclude Jmh, Test,
and Internal from MissingJavadocMethod check.

Move Checkstyle configuration files and License headers into config directory.

Fix Javadoc comments that violate the added checks.
---
 build.gradle                                        |  7 ++++---
 checkstyle.xml => config/checkstyle/checkstyle.xml  |  6 ++++++
 config/checkstyle/suppressions.xml                  | 13 +++++++++++++
 HEADER => config/license/HEADER                     |  0
 HEADER_JAVA => config/license/HEADER_JAVA           |  0
 .../java/io/reactivex/rxjava3/core/Completable.java | 11 ++++++-----
 .../java/io/reactivex/rxjava3/core/Flowable.java    |  4 ++++
 .../io/reactivex/rxjava3/core/Notification.java     |  4 +++-
 .../java/io/reactivex/rxjava3/core/Observable.java  |  4 ++++
 .../rxjava3/exceptions/CompositeException.java      |  4 +++-
 .../internal/operators/flowable/FlowableReplay.java | 10 ++++++----
 .../internal/operators/mixed/ScalarXMapZHelper.java |  2 ++
 .../operators/observable/ObservableReplay.java      |  2 ++
 .../rxjava3/internal/util/QueueDrainHelper.java     |  1 +
 .../rxjava3/observers/BaseTestConsumer.java         |  3 +++
 .../rxjava3/exceptions/CompositeExceptionTest.java  |  2 +-
 .../rxjava3/schedulers/SchedulerTestHelper.java     |  2 ++
 17 files changed, 60 insertions(+), 15 deletions(-)
 rename checkstyle.xml => config/checkstyle/checkstyle.xml (76%)
 create mode 100644 config/checkstyle/suppressions.xml
 rename HEADER => config/license/HEADER (100%)
 rename HEADER_JAVA => config/license/HEADER_JAVA (100%)

diff --git a/build.gradle b/build.gradle
index 3e64542975..6420190cca 100644
--- a/build.gradle
+++ b/build.gradle
@@ -129,7 +129,7 @@ jar {
 }
 
 license {
-    header rootProject.file("HEADER")
+    header rootProject.file("config/license/HEADER")
     ext.year = Calendar.getInstance().get(Calendar.YEAR)
     skipExistingHeaders true
     ignoreFailures true
@@ -234,10 +234,11 @@ jacocoTestReport.dependsOn GCandMem
 build.dependsOn jacocoTestReport
 
 checkstyle {
-    configFile = file("checkstyle.xml")
+    configFile = rootProject.file("config/checkstyle/checkstyle.xml")
     toolVersion = checkstyleVersion
     configProperties = [
-            "checkstyle.header.file": file("HEADER_JAVA")
+            "checkstyle.suppressions.file": rootProject.file("config/checkstyle/suppressions.xml"),
+            "checkstyle.header.file": rootProject.file("config/license/HEADER_JAVA")
     ]
 }
 
diff --git a/checkstyle.xml b/config/checkstyle/checkstyle.xml
similarity index 76%
rename from checkstyle.xml
rename to config/checkstyle/checkstyle.xml
index f4b8fd158e..05896aee12 100644
--- a/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -4,6 +4,9 @@
         "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
 <module name="Checker">
+    <module name="SuppressionFilter">
+        <property name="file" value="${checkstyle.suppressions.file}"/>
+    </module>
 
     <!-- Headers -->
     <module name="Header">
@@ -12,6 +15,9 @@
     </module>
 
     <module name="TreeWalker">
+        <module name="JavadocMethod"/>
+        <module name="MissingJavadocMethod"/>
+
         <module name="RegexpSinglelineJava">
             <property name="severity" value="warning"/>
             <property name="format" value="^(?!\s+\* $).*?\s+$"/>
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
new file mode 100644
index 0000000000..cf580e45e6
--- /dev/null
+++ b/config/checkstyle/suppressions.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+    "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+
+<suppressions>
+
+  <suppress checks="MissingJavadocMethod" files="[\\/]main[\\/]java[\\/]io[\\/]reactivex[\\/]rxjava3[\\/]internal[\\/]"/>
+  <suppress checks="MissingJavadocMethod" files="[\\/]jmh[\\/]java[\\/]io[\\/]reactivex[\\/]rxjava3[\\/]"/>
+  <suppress checks="MissingJavadocMethod" files="[\\/]test[\\/]java[\\/]io[\\/]reactivex[\\/]rxjava3[\\/]"/>
+
+</suppressions>
diff --git a/HEADER b/config/license/HEADER
similarity index 100%
rename from HEADER
rename to config/license/HEADER
diff --git a/HEADER_JAVA b/config/license/HEADER_JAVA
similarity index 100%
rename from HEADER_JAVA
rename to config/license/HEADER_JAVA
diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index c6cfb7866b..805cd8f63f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -1908,11 +1908,12 @@ public final Completable doOnLifecycle(@NonNull Consumer<? super Disposable> onS
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code doOnLifecycle} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
-     * @param onSubscribe the consumer called when a {@link CompletableObserver} subscribes.
-     * @param onError the consumer called when this emits an {@code onError} event
-     * @param onComplete the runnable called just before when the current {@code Completable} completes normally
-     * @param onAfterTerminate the runnable called after this {@code Completable} completes normally
-     * @param onDispose the {@link Runnable} called when the downstream disposes the subscription
+     * @param onSubscribe the {@link Consumer} called when a {@link CompletableObserver} subscribes.
+     * @param onError the {@code Consumer} called when this emits an {@code onError} event
+     * @param onComplete the {@link Action} called just before when the current {@code Completable} completes normally
+     * @param onTerminate the {@code Action} called just before this {@code Completable} terminates
+     * @param onAfterTerminate the {@code Action} called after this {@code Completable} completes normally
+     * @param onDispose the {@code Action} called when the downstream disposes the subscription
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code onSubscribe}, {@code onError}, {@code onComplete}
      * {@code onTerminate}, {@code onAfterTerminate} or {@code onDispose} is {@code null}
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 98a72b6302..5a6579fb34 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -9723,6 +9723,10 @@ public final Flowable<T> doOnComplete(@NonNull Action onComplete) {
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
+     * @param onNext the {@link Consumer} to invoke when the current {@code Flowable} calls {@code onNext}
+     * @param onError the {@code Consumer} to invoke when the current {@code Flowable} calls {@code onError}
+     * @param onComplete the {@link Action} to invoke when the current {@code Flowable} calls {@code onComplete}
+     * @param onAfterTerminate the {@code Action} to invoke when the current {@code Flowable} calls {@code onAfterTerminate}
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code onNext}, {@code onError}, {@code onComplete} or {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Notification.java b/src/main/java/io/reactivex/rxjava3/core/Notification.java
index c376403314..7f5896209f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Notification.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Notification.java
@@ -26,7 +26,9 @@ public final class Notification<T> {
 
     final Object value;
 
-    /** Not meant to be implemented externally. */
+    /** Not meant to be implemented externally.
+     * @param value the value to carry around in the notification, not {@code null}
+     */
     private Notification(@Nullable Object value) {
         this.value = value;
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 2b3288ee99..3e343bf248 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -8608,6 +8608,10 @@ public final Observable<T> doOnComplete(@NonNull Action onComplete) {
      *  <dd>{@code doOnEach} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
+     * @param onNext the {@link Consumer} to invoke when the current {@code Observable} calls {@code onNext}
+     * @param onError the {@code Consumer} to invoke when the current {@code Observable} calls {@code onError}
+     * @param onComplete the {@link Action} to invoke when the current {@code Observable} calls {@code onComplete}
+     * @param onAfterTerminate the {@code Action} to invoke when the current {@code Observable} calls {@code onAfterTerminate}
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code onNext}, {@code onError}, {@code onComplete} or {@code onAfterTerminate} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/do.html">ReactiveX operators documentation: Do</a>
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
index 2af6e522bd..bb68236e79 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
@@ -229,7 +229,9 @@ private void appendStackTrace(StringBuilder b, Throwable ex, String prefix) {
     }
 
     abstract static class PrintStreamOrWriter {
-        /** Prints the specified string as a line on this StreamOrWriter. */
+        /** Prints the specified string as a line on this StreamOrWriter.
+         * @param o string to print
+         */
         abstract void println(Object o);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
index 69c7c0ce8a..11489490c7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableReplay.java
@@ -118,10 +118,11 @@ public static <T> ConnectableFlowable<T> create(Flowable<T> source,
     }
 
     /**
-     * Creates a OperatorReplay instance to replay values of the given source observable.
-     * @param source the source observable
-     * @param bufferFactory the factory to instantiate the appropriate buffer when the observable becomes active
-     * @return the connectable observable
+     * Creates a OperatorReplay instance to replay values of the given source {@code Flowable}.
+     * @param <T> the value type
+     * @param source the source {@code Flowable} to use
+     * @param bufferFactory the factory to instantiate the appropriate buffer when the {@code Flowable} becomes active
+     * @return the {@code ConnectableFlowable} instance
      */
     static <T> ConnectableFlowable<T> create(Flowable<T> source,
             final Supplier<? extends ReplayBuffer<T>> bufferFactory) {
@@ -544,6 +545,7 @@ public void dispose() {
         }
         /**
          * Convenience method to auto-cast the index object.
+         * @param <U> type to cast index object
          * @return the current index object
          */
         @SuppressWarnings("unchecked")
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java
index 9b9cd1e285..2ed6301e42 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ScalarXMapZHelper.java
@@ -78,6 +78,7 @@ static <T> boolean tryAsCompletable(Object source,
      * Try subscribing to a {@link MaybeSource} mapped from
      * a scalar source (which implements {@link Supplier}).
      * @param <T> the upstream value type
+     * @param <R> the downstream value type
      * @param source the source reactive type ({@code Flowable} or {@code Observable})
      *               possibly implementing {@link Supplier}.
      * @param mapper the function that turns the scalar upstream value into a
@@ -117,6 +118,7 @@ static <T, R> boolean tryAsMaybe(Object source,
      * Try subscribing to a {@link SingleSource} mapped from
      * a scalar source (which implements {@link Supplier}).
      * @param <T> the upstream value type
+     * @param <R> the downstream value type
      * @param source the source reactive type ({@code Flowable} or {@code Observable})
      *               possibly implementing {@link Supplier}.
      * @param mapper the function that turns the scalar upstream value into a
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
index 102e2831b2..0e8c122d62 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableReplay.java
@@ -122,6 +122,7 @@ public static <T> ConnectableObservable<T> create(ObservableSource<T> source,
 
     /**
      * Creates a OperatorReplay instance to replay values of the given source observable.
+     * @param <T> the value type
      * @param source the source observable
      * @param bufferFactory the factory to instantiate the appropriate buffer when the observable becomes active
      * @return the connectable observable
@@ -453,6 +454,7 @@ public void dispose() {
         }
         /**
          * Convenience method to auto-cast the index object.
+         * @param <U> type index to be casted to
          * @return the index Object or null
          */
         @SuppressWarnings("unchecked")
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
index 64178c3ee1..0204dfa371 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
@@ -291,6 +291,7 @@ static boolean isCancelled(BooleanSupplier cancelled) {
     /**
      * Drains the queue based on the outstanding requests in post-completed mode (only!).
      *
+     * @param <T> the value type
      * @param n the current request amount
      * @param actual the target Subscriber to send events to
      * @param queue the queue to drain if in the post-complete state
diff --git a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
index 458ff01ebe..265ea894a5 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
@@ -54,6 +54,9 @@ public abstract class BaseTestConsumer<T, U extends BaseTestConsumer<T, U>> {
      */
     protected boolean timeout;
 
+    /**
+     * Constructs a {@code BaseTestConsumer} with {@code CountDownLatch} set to 1.
+     */
     public BaseTestConsumer() {
         this.values = new VolatileSizeArrayList<>();
         this.errors = new VolatileSizeArrayList<>();
diff --git a/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java b/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
index 3c0735ae78..cc34f62b89 100644
--- a/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/CompositeExceptionTest.java
@@ -148,7 +148,7 @@ public void compositeExceptionFromTwoDuplicateComposites() {
         cex.getCause().printStackTrace();
     }
 
-    /**
+    /*
      * This hijacks the Throwable.printStackTrace() output and puts it in a string, where we can look for
      * "CIRCULAR REFERENCE" (a String added by Throwable.printEnclosedStackTrace)
      */
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
index 38e94f4536..3c899f262e 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/SchedulerTestHelper.java
@@ -28,6 +28,8 @@ private SchedulerTestHelper() {
     /**
      * Verifies that the given Scheduler does not deliver handled errors to its executing Thread's
      * {@link java.lang.Thread.UncaughtExceptionHandler}.
+     *
+     * @param scheduler {@link Scheduler} to verify.
      */
     static void handledErrorIsNotDeliveredToThreadHandler(Scheduler scheduler) throws InterruptedException {
         Thread.UncaughtExceptionHandler originalHandler = Thread.getDefaultUncaughtExceptionHandler();

From e600b532b5a8eddf36b2d5464c327aea09862dab Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 12 Mar 2021 16:13:11 +0100
Subject: [PATCH 236/665] 3.x: CompositeException.printStackTrace to write
 directly into PS/PW (#7212)

---
 .../exceptions/CompositeException.java        | 46 +++++++++++--------
 1 file changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
index bb68236e79..5d2928b28f 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/CompositeException.java
@@ -199,40 +199,41 @@ public void printStackTrace(PrintWriter s) {
      * Special handling for printing out a {@code CompositeException}.
      * Loops through all inner exceptions and prints them out.
      *
-     * @param s
+     * @param output
      *            stream to print to
      */
-    private void printStackTrace(PrintStreamOrWriter s) {
-        StringBuilder b = new StringBuilder(128);
-        b.append(this).append('\n');
+    private void printStackTrace(PrintStreamOrWriter output) {
+        output.append(this).append("\n");
         for (StackTraceElement myStackElement : getStackTrace()) {
-            b.append("\tat ").append(myStackElement).append('\n');
+            output.append("\tat ").append(myStackElement).append("\n");
         }
         int i = 1;
         for (Throwable ex : exceptions) {
-            b.append("  ComposedException ").append(i).append(" :\n");
-            appendStackTrace(b, ex, "\t");
+            output.append("  ComposedException ").append(i).append(" :\n");
+            appendStackTrace(output, ex, "\t");
             i++;
         }
-        s.println(b.toString());
+        output.append("\n");
     }
 
-    private void appendStackTrace(StringBuilder b, Throwable ex, String prefix) {
-        b.append(prefix).append(ex).append('\n');
+    private void appendStackTrace(PrintStreamOrWriter output, Throwable ex, String prefix) {
+        output.append(prefix).append(ex).append('\n');
         for (StackTraceElement stackElement : ex.getStackTrace()) {
-            b.append("\t\tat ").append(stackElement).append('\n');
+            output.append("\t\tat ").append(stackElement).append('\n');
         }
         if (ex.getCause() != null) {
-            b.append("\tCaused by: ");
-            appendStackTrace(b, ex.getCause(), "");
+            output.append("\tCaused by: ");
+            appendStackTrace(output, ex.getCause(), "");
         }
     }
 
     abstract static class PrintStreamOrWriter {
-        /** Prints the specified string as a line on this StreamOrWriter.
-         * @param o string to print
+        /**
+         * Prints the object's string representation via the underlying PrintStream or PrintWriter.
+         * @param o the object to print
+         * @return this
          */
-        abstract void println(Object o);
+        abstract PrintStreamOrWriter append(Object o);
     }
 
     /**
@@ -246,11 +247,15 @@ static final class WrappedPrintStream extends PrintStreamOrWriter {
         }
 
         @Override
-        void println(Object o) {
-            printStream.println(o);
+        WrappedPrintStream append(Object o) {
+            printStream.print(o);
+            return this;
         }
     }
 
+    /**
+     * Same abstraction and implementation as in JDK to allow PrintStream and PrintWriter to share implementation.
+     */
     static final class WrappedPrintWriter extends PrintStreamOrWriter {
         private final PrintWriter printWriter;
 
@@ -259,8 +264,9 @@ static final class WrappedPrintWriter extends PrintStreamOrWriter {
         }
 
         @Override
-        void println(Object o) {
-            printWriter.println(o);
+        WrappedPrintWriter append(Object o) {
+            printWriter.print(o);
+            return this;
         }
     }
 

From bdf13a1fdb54b79e0ece299535de75c653abc827 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Sat, 13 Mar 2021 23:50:44 -0800
Subject: [PATCH 237/665] Fix intermittently failing unit tests (#7213)

* Fix intermittently failing tests, mostly increasing timeout

Fix several unit tests that are intermittently failing. All fixes
involve increasing timeouts. Adjusted formatting in several areas within
updated tests.

* Remove formatting/refactoring from previous commit

Superfluous formatting and refactoring was making review impossible.
---
 .../FlowableConcatMapSchedulerTest.java       |  8 +++-
 .../flowable/FlowableConcatTest.java          |  8 +++-
 .../operators/flowable/FlowableMergeTest.java | 40 +++++++++----------
 .../flowable/FlowableSubscribeOnTest.java     | 12 +++---
 .../ObservableConcatMapSchedulerTest.java     |  8 +++-
 .../observable/ObservableConcatTest.java      |  8 +++-
 .../rxjava3/subjects/UnicastSubjectTest.java  |  4 +-
 7 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
index 825bb5565f..0f7c772566 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
@@ -355,7 +355,7 @@ public Flowable<String> apply(Integer t) throws Throwable {
     }
 
     @Test
-    public void issue2890NoStackoverflow() throws InterruptedException {
+    public void issue2890NoStackoverflow() throws InterruptedException, TimeoutException {
         final ExecutorService executor = Executors.newFixedThreadPool(2);
         final Scheduler sch = Schedulers.from(executor);
 
@@ -400,7 +400,11 @@ public void onError(Throwable e) {
             }
         });
 
-        executor.awaitTermination(20000, TimeUnit.MILLISECONDS);
+        long awaitTerminationTimeoutMillis = 100_000;
+        if (!executor.awaitTermination(awaitTerminationTimeoutMillis, TimeUnit.MILLISECONDS)) {
+            throw new TimeoutException("Completed " + counter.get() + "/" + n + " before timed out after "
+                    + awaitTerminationTimeoutMillis + " milliseconds.");
+        }
 
         assertEquals(n, counter.get());
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
index 1a8b6f4c4d..986dddad01 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
@@ -729,7 +729,7 @@ public void subscribe(Subscriber<? super String> s) {
     }
 
     @Test
-    public void issue2890NoStackoverflow() throws InterruptedException {
+    public void issue2890NoStackoverflow() throws InterruptedException, TimeoutException {
         final ExecutorService executor = Executors.newFixedThreadPool(2);
         final Scheduler sch = Schedulers.from(executor);
 
@@ -774,7 +774,11 @@ public void onError(Throwable e) {
             }
         });
 
-        executor.awaitTermination(20000, TimeUnit.MILLISECONDS);
+        long awaitTerminationTimeoutMillis = 100_000;
+        if (!executor.awaitTermination(awaitTerminationTimeoutMillis, TimeUnit.MILLISECONDS)) {
+            throw new TimeoutException("Completed " + counter.get() + "/" + n + " before timed out after "
+                + awaitTerminationTimeoutMillis + " milliseconds.");
+        }
 
         assertEquals(n, counter.get());
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
index a40f7debb0..57b7a4a667 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeTest.java
@@ -204,7 +204,7 @@ public void mergeArrayWithThreading() {
         TestSubscriber<String> ts = new TestSubscriber<>(stringSubscriber);
         m.subscribe(ts);
 
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
 
         verify(stringSubscriber, never()).onError(any(Throwable.class));
@@ -598,7 +598,7 @@ public void run() {
             TestSubscriber<Integer> ts = new TestSubscriber<>();
             merge.subscribe(ts);
 
-            ts.awaitDone(5, TimeUnit.SECONDS);
+            ts.awaitDone(10, TimeUnit.SECONDS);
             ts.assertComplete();
             List<Integer> onNextEvents = ts.values();
             assertEquals(300, onNextEvents.size());
@@ -645,7 +645,7 @@ public void run() {
             TestSubscriber<Integer> ts = new TestSubscriber<>();
             merge.subscribe(ts);
 
-            ts.awaitDone(5, TimeUnit.SECONDS);
+            ts.awaitDone(10, TimeUnit.SECONDS);
             ts.assertNoErrors();
             ts.assertComplete();
             List<Integer> onNextEvents = ts.values();
@@ -706,7 +706,7 @@ public void onNext(Integer t) {
         };
 
         Flowable.merge(f1.take(Flowable.bufferSize() * 2), Flowable.just(-99)).subscribe(testSubscriber);
-        testSubscriber.awaitDone(5, TimeUnit.SECONDS);
+        testSubscriber.awaitDone(10, TimeUnit.SECONDS);
 
         List<Integer> onNextEvents = testSubscriber.values();
 
@@ -752,7 +752,7 @@ public void onNext(Integer t) {
         };
 
         Flowable.merge(f1.take(Flowable.bufferSize() * 2), f2.take(Flowable.bufferSize() * 2)).observeOn(Schedulers.computation()).subscribe(testSubscriber);
-        testSubscriber.awaitDone(5, TimeUnit.SECONDS);
+        testSubscriber.awaitDone(10, TimeUnit.SECONDS);
         if (testSubscriber.errors().size() > 0) {
             testSubscriber.errors().get(0).printStackTrace();
         }
@@ -795,7 +795,7 @@ public void onNext(Integer t) {
         };
 
         Flowable.merge(f1).observeOn(Schedulers.computation()).take(Flowable.bufferSize() * 2).subscribe(testSubscriber);
-        testSubscriber.awaitDone(5, TimeUnit.SECONDS);
+        testSubscriber.awaitDone(10, TimeUnit.SECONDS);
         if (testSubscriber.errors().size() > 0) {
             testSubscriber.errors().get(0).printStackTrace();
         }
@@ -850,7 +850,7 @@ public void onNext(Integer t) {
         };
 
         Flowable.merge(f1).observeOn(Schedulers.computation()).take(Flowable.bufferSize() * 2).subscribe(testSubscriber);
-        testSubscriber.awaitDone(5, TimeUnit.SECONDS);
+        testSubscriber.awaitDone(10, TimeUnit.SECONDS);
         if (testSubscriber.errors().size() > 0) {
             testSubscriber.errors().get(0).printStackTrace();
         }
@@ -868,7 +868,7 @@ public void onNext(Integer t) {
     public void merge1AsyncStreamOf1() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(1, 1).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(1, ts.values().size());
     }
@@ -877,7 +877,7 @@ public void merge1AsyncStreamOf1() {
     public void merge1AsyncStreamOf1000() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(1, 1000).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(1000, ts.values().size());
     }
@@ -886,7 +886,7 @@ public void merge1AsyncStreamOf1000() {
     public void merge10AsyncStreamOf1000() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(10, 1000).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(10000, ts.values().size());
     }
@@ -895,7 +895,7 @@ public void merge10AsyncStreamOf1000() {
     public void merge1000AsyncStreamOf1000() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(1000, 1000).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(1000000, ts.values().size());
     }
@@ -904,7 +904,7 @@ public void merge1000AsyncStreamOf1000() {
     public void merge2000AsyncStreamOf100() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(2000, 100).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(200000, ts.values().size());
     }
@@ -913,7 +913,7 @@ public void merge2000AsyncStreamOf100() {
     public void merge100AsyncStreamOf1() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNAsyncStreamsOfN(100, 1).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(100, ts.values().size());
     }
@@ -935,7 +935,7 @@ public Flowable<Integer> apply(Integer i) {
     public void merge1SyncStreamOf1() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(1, 1).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(1, ts.values().size());
     }
@@ -944,7 +944,7 @@ public void merge1SyncStreamOf1() {
     public void merge1SyncStreamOf1000000() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(1, 1000000).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(1000000, ts.values().size());
     }
@@ -953,7 +953,7 @@ public void merge1SyncStreamOf1000000() {
     public void merge1000SyncStreamOf1000() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(1000, 1000).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(1000000, ts.values().size());
     }
@@ -962,7 +962,7 @@ public void merge1000SyncStreamOf1000() {
     public void merge10000SyncStreamOf10() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(10000, 10).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(100000, ts.values().size());
     }
@@ -971,7 +971,7 @@ public void merge10000SyncStreamOf10() {
     public void merge1000000SyncStreamOf1() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         mergeNSyncStreamsOfN(1000000, 1).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(1000000, ts.values().size());
     }
@@ -1043,7 +1043,7 @@ public void subscribe(Subscriber<? super Integer> s) {
 
         });
         Flowable.merge(os).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(10, TimeUnit.SECONDS);
         ts.assertNoErrors();
         assertEquals(10000, ts.values().size());
     }
@@ -1196,7 +1196,7 @@ public void run() {
                                 latch.countDown();
                         }
                     }).subscribe();
-            boolean a = latch.await(2, TimeUnit.SECONDS);
+            boolean a = latch.await(10, TimeUnit.SECONDS);
             if (!a) {
                 for (String s : messages) {
                     System.out.println("DEBUG => " + s);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
index 9cb263e23d..01ee614fd5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSubscribeOnTest.java
@@ -202,7 +202,7 @@ public void onNext(Integer t) {
         System.out.println("First schedule: " + t);
         assertTrue(t.getName().startsWith("Rx"));
         ts.request(10);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(20, TimeUnit.SECONDS);
         System.out.println("After reschedule: " + ts.lastThread());
         assertEquals(t, ts.lastThread());
     }
@@ -254,7 +254,7 @@ public void onNext(Integer t) {
             }
 
         }).subscribeOn(Schedulers.newThread()).subscribe(ts);
-        ts.awaitDone(5, TimeUnit.SECONDS);
+        ts.awaitDone(20, TimeUnit.SECONDS);
         ts.assertNoErrors();
     }
 
@@ -330,7 +330,7 @@ public void subscribe(FlowableEmitter<Object> s) throws Exception {
         .subscribeOn(Schedulers.single())
         .observeOn(Schedulers.computation())
         .test()
-        .awaitDone(5, TimeUnit.SECONDS)
+        .awaitDone(20, TimeUnit.SECONDS)
         .assertNoErrors()
         .assertComplete();
 
@@ -355,7 +355,7 @@ public void subscribe(FlowableEmitter<Object> s) throws Exception {
         .subscribeOn(Schedulers.single())
         .observeOn(Schedulers.computation())
         .test()
-        .awaitDone(5, TimeUnit.SECONDS)
+        .awaitDone(20, TimeUnit.SECONDS)
         .assertValueCount(Flowable.bufferSize())
         .assertNoErrors()
         .assertComplete();
@@ -377,7 +377,7 @@ public void subscribe(FlowableEmitter<Object> s) throws Exception {
         .subscribeOn(Schedulers.single(), false)
         .observeOn(Schedulers.computation())
         .test()
-        .awaitDone(5, TimeUnit.SECONDS)
+        .awaitDone(20, TimeUnit.SECONDS)
         .assertNoErrors()
         .assertComplete();
 
@@ -402,7 +402,7 @@ public void subscribe(FlowableEmitter<Object> s) throws Exception {
         .subscribeOn(Schedulers.single(), true)
         .observeOn(Schedulers.computation())
         .test()
-        .awaitDone(5, TimeUnit.SECONDS)
+        .awaitDone(20, TimeUnit.SECONDS)
         .assertValueCount(Flowable.bufferSize())
         .assertNoErrors()
         .assertComplete();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
index e6a50b9afa..f2a6ede314 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapSchedulerTest.java
@@ -307,7 +307,7 @@ public Observable<String> apply(Integer t) throws Throwable {
     }
 
     @Test
-    public void issue2890NoStackoverflow() throws InterruptedException {
+    public void issue2890NoStackoverflow() throws InterruptedException, TimeoutException {
         final ExecutorService executor = Executors.newFixedThreadPool(2);
         final Scheduler sch = Schedulers.from(executor);
 
@@ -352,7 +352,11 @@ public void onError(Throwable e) {
             }
         });
 
-        executor.awaitTermination(20000, TimeUnit.MILLISECONDS);
+        long awaitTerminationTimeout = 100_000;
+        if (!executor.awaitTermination(awaitTerminationTimeout, TimeUnit.MILLISECONDS)) {
+            throw new TimeoutException("Completed " + counter.get() + "/" + n + " before timed out after "
+                + awaitTerminationTimeout + " milliseconds.");
+        }
 
         assertEquals(n, counter.get());
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
index 4b1462e302..d14f803ee9 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatTest.java
@@ -683,7 +683,7 @@ public void subscribe(Observer<? super String> observer) {
     }
 
     @Test
-    public void issue2890NoStackoverflow() throws InterruptedException {
+    public void issue2890NoStackoverflow() throws InterruptedException, TimeoutException {
         final ExecutorService executor = Executors.newFixedThreadPool(2);
         final Scheduler sch = Schedulers.from(executor);
 
@@ -728,7 +728,11 @@ public void onError(Throwable e) {
             }
         });
 
-        executor.awaitTermination(20000, TimeUnit.MILLISECONDS);
+        long awaitTerminationTimeout = 100_000;
+        if (!executor.awaitTermination(awaitTerminationTimeout, TimeUnit.MILLISECONDS)) {
+            throw new TimeoutException("Completed " + counter.get() + "/" + n + " before timed out after "
+                + awaitTerminationTimeout + " milliseconds.");
+        }
 
         assertEquals(n, counter.get());
     }
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
index cf1f5d4a75..85cb20b48c 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
@@ -481,9 +481,7 @@ public void fusedNoConcurrentCleanDueToCancel() {
                     us.onNext(i);
                 }
 
-                to
-                .awaitDone(5, TimeUnit.SECONDS)
-                ;
+                to.awaitDone(10, TimeUnit.SECONDS);
 
                 if (!errors.isEmpty()) {
                     throw new CompositeException(errors);

From 269bb0f1e2cb37b2211caabbc1ef1f331864e6f8 Mon Sep 17 00:00:00 2001
From: Zac Sweers <pandanomic@gmail.com>
Date: Tue, 16 Mar 2021 02:06:55 -0400
Subject: [PATCH 238/665] Fix POM_URL (#7214)

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index be63fe3d85..8da73143fa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ POM_PACKAGING=jar
 POM_DESCRIPTION=Reactive Extensions for Java
 POM_INCEPTION_YEAR=2013
 
-POM_URL=https://github.com/akarnokd/RxJavaExtensions
+POM_URL=https://github.com/ReactiveX/RxJava
 POM_SCM_URL=https://github.com/ReactiveX/RxJava
 POM_SCM_CONNECTION=scm:git:git://github.com/ReactiveX/RxJava.git
 POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/ReactiveX/RxJava.git

From c38ea99eee667dcf6cee427a880507e256807813 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 22 Mar 2021 08:56:33 +0100
Subject: [PATCH 239/665] Bump guava from 30.1-jre to 30.1.1-jre (#7216)

Bumps [guava](https://github.com/google/guava) from 30.1-jre to 30.1.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6420190cca..6e815f7a29 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     mockitoVersion = "3.8.0"
     jmhLibVersion = "1.21"
     jmhGradleVersion = "0.5.3"
-    guavaVersion = "30.1-jre"
+    guavaVersion = "30.1.1-jre"
     jacocoVersion = "0.8.4"
     animalSnifferVersion = "1.5.3"
     licenseVersion = "0.15.0"

From 11b50a5ee28369a7004c1240cfaf7ea081febced Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Fri, 26 Mar 2021 15:07:08 -0700
Subject: [PATCH 240/665] Modernize gradle plugin block, change maven to
 maven-publish (#7219)

* Modernize gradle plugin block, change maven to maven-publish

Move gradle plugins to block at top of file per gradle recommendations.
Change deprecated maven plugin to maven-publish as in Gradle 7.0 it will
be removed. Several other minor updates to gradle file including, removing
semi-colons, changing println to use built-in logger.

* Updated gauva to correct version
---
 build.gradle | 121 ++++++++++++++++++---------------------------------
 1 file changed, 42 insertions(+), 79 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6e815f7a29..6d260864c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,72 +1,47 @@
-buildscript {
+plugins {
+    id("java-library")
+    id("checkstyle")
+    id("eclipse")
+    id("jacoco")
+    id("maven-publish")
+    id("ru.vyarus.animalsniffer") version "1.5.3"
+    id("me.champeau.gradle.jmh") version "0.5.3"
+    id("com.github.hierynomus.license") version "0.15.0"
+    id("com.jfrog.artifactory") version "4.21.0"
+    id("biz.aQute.bnd.builder") version "5.3.0"
+    id("com.vanniktech.maven.publish") version "0.14.2"
+}
 
-  // Dependency versions
-  // ---------------------------------------
-  ext {
+ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.3.0"
     mockitoVersion = "3.8.0"
     jmhLibVersion = "1.21"
-    jmhGradleVersion = "0.5.3"
     guavaVersion = "30.1.1-jre"
     jacocoVersion = "0.8.4"
-    animalSnifferVersion = "1.5.3"
-    licenseVersion = "0.15.0"
-    jfrogExtractorVersion = "4.21.0"
-    bndVersion = "5.3.0"
     checkstyleVersion = "8.41"
-    vanniktechPublishPlugin = "0.14.2"
-  }
-
-  // --------------------------------------
-
-  repositories {
-    mavenCentral()
-    gradlePluginPortal()
-  }
-  dependencies {
-    classpath "ru.vyarus:gradle-animalsniffer-plugin:$animalSnifferVersion"
-    classpath "gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:$licenseVersion"
-    classpath "me.champeau.gradle:jmh-gradle-plugin:$jmhGradleVersion"
-    classpath "org.jfrog.buildinfo:build-info-extractor-gradle:$jfrogExtractorVersion"
-    classpath "biz.aQute.bnd:biz.aQute.bnd.gradle:$bndVersion"
-    classpath "com.vanniktech:gradle-maven-publish-plugin:$vanniktechPublishPlugin"
-  }
 }
 
-group = "io.reactivex.rxjava3"
-ext.githubProjectName = "rxjava"
-
-def releaseTag = System.getenv("BUILD_TAG");
+def releaseTag = System.getenv("BUILD_TAG")
 if (releaseTag != null && !releaseTag.isEmpty()) {
     if (releaseTag.startsWith("v")) {
-        releaseTag = releaseTag.substring(1);
+        releaseTag = releaseTag.substring(1)
     }
-    project.setProperty("VERSION_NAME" , releaseTag);
+    project.setProperty("VERSION_NAME" , releaseTag)
 
-    println("Releasing with version " + version);
+    logger.info("Releasing with version: {}", version)
 }
 
+group = "io.reactivex.rxjava3"
 version = project.properties["VERSION_NAME"]
-
 description = "RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM."
 
-apply plugin: "java-library"
-apply plugin: "checkstyle"
-apply plugin: "jacoco"
-apply plugin: "ru.vyarus.animalsniffer"
-apply plugin: "maven"
-apply plugin: "me.champeau.gradle.jmh"
-apply plugin: "com.github.hierynomus.license"
-apply plugin: "com.jfrog.artifactory"
-apply plugin: "eclipse"
-
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
-  mavenCentral()
+    mavenCentral()
 }
 
 dependencies {
@@ -84,7 +59,7 @@ dependencies {
 }
 
 tasks.withType(JavaCompile) {
-    options.compilerArgs << "-parameters";
+    options.compilerArgs << "-parameters"
 }
 
 javadoc {
@@ -100,7 +75,7 @@ javadoc {
     options.addStringOption("top").value = ""
     options.addStringOption("doctitle").value = ""
     options.addStringOption("header").value = ""
-    options.stylesheetFile = new File(projectDir, "gradle/stylesheet.css");
+    options.stylesheetFile = rootProject.file("gradle/stylesheet.css")
 
     options.links(
         "https://docs.oracle.com/javase/8/docs/api/",
@@ -112,19 +87,16 @@ animalsniffer {
     annotation = "io.reactivex.rxjava3.internal.util.SuppressAnimalSniffer"
 }
 
-apply plugin: 'maven'
-
-apply plugin: 'biz.aQute.bnd.builder'
-
 jar {
-    bnd ('Bundle-Name': 'rxjava',
-            'Bundle-Vendor': 'RxJava Contributors',
-            'Bundle-Description': 'Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM.',
-            'Import-Package': '!org.junit,!junit.framework,!org.mockito.*,!org.testng.*,*',
-            'Bundle-DocURL': 'https://github.com/ReactiveX/RxJava',
-            'Eclipse-ExtensibleAPI': 'true',
-            'Automatic-Module-Name': 'io.reactivex.rxjava3',
-            'Export-Package': '!io.reactivex.rxjava3.internal.*, io.reactivex.rxjava3.*'
+    bnd (
+            "Bundle-Name": "rxjava",
+            "Bundle-Vendor": "RxJava Contributors",
+            "Bundle-Description": "Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM.",
+            "Import-Package": "!org.junit,!junit.framework,!org.mockito.*,!org.testng.*,*",
+            "Bundle-DocURL": "https://github.com/ReactiveX/RxJava",
+            "Eclipse-ExtensibleAPI": "true",
+            "Automatic-Module-Name": "io.reactivex.rxjava3",
+            "Export-Package": "!io.reactivex.rxjava3.internal.*, io.reactivex.rxjava3.*"
     )
 }
 
@@ -144,14 +116,13 @@ jmh {
     jvmArgsAppend = ["-Djmh.separateClasspathJAR=true"]
 
     if (project.hasProperty("jmh")) {
-        include = ".*" + project.jmh + ".*"
-        println("JMH: " + include);
+        include = [".*" + project.jmh + ".*"]
+        logger.info("JMH: {}", include)
     }
-
 }
 
 plugins.withType(EclipsePlugin) {
-    project.eclipse.classpath.plusConfigurations += [ configurations.jmh ]
+    project.eclipse.classpath.plusConfigurations += [configurations.jmh]
 }
 
 test {
@@ -199,25 +170,21 @@ task testng(type: Test) {
 check.dependsOn testng 
 
 jacoco {
-    toolVersion = jacocoVersion // See http://www.eclemma.org/jacoco/.
+    toolVersion = jacocoVersion
 }
 
 task GCandMem(dependsOn: "check") doLast {
-    print("Memory usage before: ")
-    println(java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
+    logger.lifecycle("Memory usage before: {}", java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
     System.gc()
     Thread.sleep(200)
-    print("Memory usage: ")
-    println(java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
+    logger.lifecycle("Memory usage: {}", java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
 }
 
 task GCandMem2(dependsOn: "test") doLast {
-    print("Memory usage before: ")
-    println(java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
+    logger.lifecycle("Memory usage before: {}", java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
     System.gc()
     Thread.sleep(200)
-    print("Memory usage: ")
-    println(java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
+    logger.lifecycle("Memory usage: {}", java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
 }
 
 testng.dependsOn GCandMem2
@@ -258,12 +225,10 @@ def fixPom() {
 }
 
 if (rootProject.hasProperty("releaseMode")) {
+    logger.lifecycle("ReleaseMode: {}", rootProject.releaseMode)
 
   if ("branch".equals(rootProject.releaseMode)) {
     // From https://github.com/ReactiveX/RxAndroid/blob/2.x/rxandroid/build.gradle#L94
-  
-    println("ReleaseMode: " + rootProject.releaseMode);
-
     artifactory {
         contextUrl = "https://oss.jfrog.org"
     
@@ -287,13 +252,11 @@ if (rootProject.hasProperty("releaseMode")) {
   }
 
   if ("full".equals(rootProject.releaseMode)) {
-    apply plugin: "com.vanniktech.maven.publish"
-
     fixPom()
 
     signing {
-      if (project.hasProperty('SIGNING_PRIVATE_KEY') && project.hasProperty('SIGNING_PASSWORD')) {
-         useInMemoryPgpKeys(project.getProperty('SIGNING_PRIVATE_KEY'), project.getProperty('SIGNING_PASSWORD'))
+      if (project.hasProperty("SIGNING_PRIVATE_KEY") && project.hasProperty("SIGNING_PASSWORD")) {
+         useInMemoryPgpKeys(project.getProperty("SIGNING_PRIVATE_KEY"), project.getProperty("SIGNING_PASSWORD"))
       }
     }
     mavenPublish {

From cea706672d5f44f9be36c6e3914528ce9be86ced Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Thu, 8 Apr 2021 16:45:06 +0900
Subject: [PATCH 241/665] 3.x: fix typo in FlowableRetryTest.java (#7223)

seperate -> separate
---
 .../rxjava3/internal/operators/flowable/FlowableRetryTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
index adfc4431a8..224ae32d40 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRetryTest.java
@@ -621,7 +621,7 @@ public void run() {
         }
     }
 
-    /** Observer for listener on seperate thread. */
+    /** Observer for listener on separate thread. */
     static final class AsyncSubscriber<T> extends DefaultSubscriber<T> {
 
         protected CountDownLatch latch = new CountDownLatch(1);

From 5a678bbebc18d1b32551615bfdf8b37bf8c2aa1c Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Thu, 8 Apr 2021 09:45:54 +0200
Subject: [PATCH 242/665] Bump mockito-core from 3.8.0 to 3.9.0 (#7224)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.8.0 to 3.9.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.8.0...v3.9.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6d260864c1..07b570bb3b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.3.0"
-    mockitoVersion = "3.8.0"
+    mockitoVersion = "3.9.0"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"
     jacocoVersion = "0.8.4"

From 82f489e1d3ca71ebf0aedc9daf087f4e403db2cb Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Thu, 8 Apr 2021 13:30:57 -0700
Subject: [PATCH 243/665] Remove custom Gradle garbage collection tasks (#7225)

Garbage collection between Gradle tasks should no longer be needed now
that tasks are run on Github servers.
---
 build.gradle | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index 07b570bb3b..6ce59f39b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -88,7 +88,7 @@ animalsniffer {
 }
 
 jar {
-    bnd (
+    bnd(
             "Bundle-Name": "rxjava",
             "Bundle-Vendor": "RxJava Contributors",
             "Bundle-Description": "Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM.",
@@ -126,7 +126,6 @@ plugins.withType(EclipsePlugin) {
 }
 
 test {
-    
     testLogging  {
         // showing skipped occasionally should prevent CI timeout due to lack of standard output
         events=["skipped", "failed"] // "started", "passed"
@@ -173,22 +172,6 @@ jacoco {
     toolVersion = jacocoVersion
 }
 
-task GCandMem(dependsOn: "check") doLast {
-    logger.lifecycle("Memory usage before: {}", java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
-    System.gc()
-    Thread.sleep(200)
-    logger.lifecycle("Memory usage: {}", java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
-}
-
-task GCandMem2(dependsOn: "test") doLast {
-    logger.lifecycle("Memory usage before: {}", java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
-    System.gc()
-    Thread.sleep(200)
-    logger.lifecycle("Memory usage: {}", java.lang.management.ManagementFactory.getMemoryMXBean().getHeapMemoryUsage().getUsed() / 1024.0 / 1024.0)
-}
-
-testng.dependsOn GCandMem2
-
 jacocoTestReport {
     reports {
         xml.enabled = true
@@ -196,8 +179,6 @@ jacocoTestReport {
     }
 }
 
-jacocoTestReport.dependsOn GCandMem
-
 build.dependsOn jacocoTestReport
 
 checkstyle {

From e51dbd2c56a150a4d22ea8f431ebaad09b22daa0 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Thu, 8 Apr 2021 23:33:39 -0700
Subject: [PATCH 244/665] Initial commit for dependabot.yml config file (#7227)

---
 .github/dependabot.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..def5ba5d90
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "daily"

From 2d873459e32f595f1e8bcccd770f5beb20682de1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 10:42:15 +0200
Subject: [PATCH 245/665] Bump actions/cache from v2 to v2.1.4 (#7230)

Bumps [actions/cache](https://github.com/actions/cache) from v2 to v2.1.4.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2...26968a09c0ea4f3e233fdddbafd1166051a095f6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 85594b3549..3352f24532 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -18,7 +18,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Cache Gradle packages
-      uses: actions/cache@v2
+      uses: actions/cache@v2.1.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index f81dc9de27..76db130e5d 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -20,7 +20,7 @@ jobs:
       with:
         java-version: 11
     - name: Cache Gradle packages
-      uses: actions/cache@v2
+      uses: actions/cache@v2.1.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 40ee972118..c8d61bedde 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -18,7 +18,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Cache Gradle packages
-      uses: actions/cache@v2
+      uses: actions/cache@v2.1.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 9bca1fb9ec..0bee780f33 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -31,7 +31,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Cache Gradle packages
-      uses: actions/cache@v2
+      uses: actions/cache@v2.1.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index a6042fe8ec..6a0d64bf38 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Cache Gradle packages
-      uses: actions/cache@v2
+      uses: actions/cache@v2.1.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

From 3dbf37e3da505c3e665a4eb7eda2ec7888aad686 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Apr 2021 10:44:28 +0200
Subject: [PATCH 246/665] Bump testng from 7.3.0 to 7.4.0 (#7231)

Bumps [testng](https://github.com/cbeust/testng) from 7.3.0 to 7.4.0.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/compare/7.3.0...7.4.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 6ce59f39b6..7358b2609b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ plugins {
 ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
-    testNgVersion = "7.3.0"
+    testNgVersion = "7.4.0"
     mockitoVersion = "3.9.0"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"

From c1420ea41159f3011ec88df638e576bc76e23a3e Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Fri, 9 Apr 2021 11:31:26 -0700
Subject: [PATCH 247/665] Upgrade setup-java GitHub actions to v2 (#7232)

There are two breaking changes between v1 and v2. v2 requires a
java distribution be specified. 'adopt' for AdoptOpenJDK has been
selected. v2 has also dropped support for legacy Java version syntax, so
'1.8' must be become '8'.
---
 .github/workflows/gradle_branch.yml   | 9 +++++----
 .github/workflows/gradle_jdk11.yml    | 7 ++++---
 .github/workflows/gradle_pr.yml       | 9 +++++----
 .github/workflows/gradle_release.yml  | 7 ++++---
 .github/workflows/gradle_snapshot.yml | 9 +++++----
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 3352f24532..8b7142aac6 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -13,10 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.4
       with:
@@ -28,4 +29,4 @@ jobs:
     - name: Build branch without snapshot
       run: ./gradlew -PreleaseMode=pr build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1
\ No newline at end of file
+      uses: codecov/codecov-action@v1
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 76db130e5d..c3a5ef5261 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -16,9 +16,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 11
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
-        java-version: 11
+        distribution: 'adopt'
+        java-version: '11'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.4
       with:
@@ -30,4 +31,4 @@ jobs:
     - name: Build PR
       run: ./gradlew -PreleaseMode=pr build --stacktrace
     #- name: Upload to Codecov  
-    #  uses: codecov/codecov-action@v1
\ No newline at end of file
+    #  uses: codecov/codecov-action@v1
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index c8d61bedde..66392e1c2d 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -13,10 +13,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.4
       with:
@@ -28,4 +29,4 @@ jobs:
     - name: Build PR
       run: ./gradlew -PreleaseMode=pr build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1
\ No newline at end of file
+      uses: codecov/codecov-action@v1
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 0bee780f33..b34cd2fb64 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -26,10 +26,11 @@ jobs:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.4
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 6a0d64bf38..a876b0a648 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,10 +23,11 @@ jobs:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: '8'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.4
       with:
@@ -42,4 +43,4 @@ jobs:
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
     - name: Push Javadocs
-      run: ./push_javadoc.sh
\ No newline at end of file
+      run: ./push_javadoc.sh

From 5bb119b1489afe4fbc5bb51b828be95971ee8f1d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 10:34:33 +0200
Subject: [PATCH 248/665] Bump actions/cache from v2.1.4 to v2.1.5 (#7234)

Bumps [actions/cache](https://github.com/actions/cache) from v2.1.4 to v2.1.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.4...1a9e2138d905efd099035b49d8b7a3888c653ca8)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 8b7142aac6..5b96684b3b 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'adopt'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index c3a5ef5261..641de38ae1 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -21,7 +21,7 @@ jobs:
         distribution: 'adopt'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 66392e1c2d..a3c44c9ac1 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'adopt'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index b34cd2fb64..f7fdc49ff8 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -32,7 +32,7 @@ jobs:
         distribution: 'adopt'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index a876b0a648..926de34c1f 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'adopt'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.4
+      uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}

From bb03bcf43989a2ad863245f43fa9f48c4f733a17 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 16 Apr 2021 08:32:51 +0200
Subject: [PATCH 249/665] 3.x: Action cache clear, limit environmental
 variables (#7238)

* 3.x: Action cache clear, limit environmental variables

* No secrets for PRs
---
 .github/workflows/gradle_branch.yml   |  4 ++--
 .github/workflows/gradle_jdk11.yml    |  4 ++--
 .github/workflows/gradle_pr.yml       |  4 ++--
 .github/workflows/gradle_release.yml  | 23 +++++++++++++----------
 .github/workflows/gradle_snapshot.yml | 23 ++++++++++++++---------
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 5b96684b3b..214939c0d9 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,8 +22,8 @@ jobs:
       uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
+        key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build branch without snapshot
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 641de38ae1..9bbafd6615 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,8 +24,8 @@ jobs:
       uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
+        key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle-1-
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build PR
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index a3c44c9ac1..5b8310c635 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,8 +22,8 @@ jobs:
       uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
+        key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle-1-
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build PR
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index f7fdc49ff8..144e20cd27 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -15,14 +15,6 @@ jobs:
 
     runs-on: ubuntu-latest
     env:
-      # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
-      # ------------------------------------------------------------------------------ 
-      JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
-      ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_USER }}
-      ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-      ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
-      ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
-      # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
     - uses: actions/checkout@v2
@@ -35,8 +27,8 @@ jobs:
       uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
+        key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Grant execute permission for push
@@ -49,7 +41,18 @@ jobs:
       uses: codecov/codecov-action@v1
     - name: Upload release
       run: ./gradlew -PreleaseMode=full javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
+      env:
+        # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
+        # ------------------------------------------------------------------------------ 
+        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_USER }}
+        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
+        ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     - name: Publish release
       run: ./gradlew -PreleaseMode=full closeAndReleaseRepository --no-daemon --no-parallel --stacktrace
     - name: Push Javadocs
       run: ./push_javadoc.sh
+      env:
+        # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
+        # ------------------------------------------------------------------------------ 
+        JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 926de34c1f..099f5e9e91 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -12,13 +12,6 @@ jobs:
 
     runs-on: ubuntu-latest
     env:
-      # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
-      # ------------------------------------------------------------------------------ 
-      bintrayUser: ${{ secrets.BINTRAY_USER }}
-      bintrayKey: ${{ secrets.BINTRAY_KEY }}
-      sonatypeUsername: ${{ secrets.SONATYPE_USER }}
-      sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
-      JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
@@ -32,15 +25,27 @@ jobs:
       uses: actions/cache@v2.1.5
       with:
         path: ~/.gradle/caches
-        key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-        restore-keys: ${{ runner.os }}-gradle
+        key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
+        restore-keys: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Grant execute permission for push
       run: chmod +x push_javadoc.sh
     - name: Build and Snapshot branch
       run: ./gradlew -PreleaseMode=branch -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
+      env:
+        # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
+        # ------------------------------------------------------------------------------ 
+        bintrayUser: ${{ secrets.BINTRAY_USER }}
+        bintrayKey: ${{ secrets.BINTRAY_KEY }}
+        sonatypeUsername: ${{ secrets.SONATYPE_USER }}
+        sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
     - name: Push Javadocs
       run: ./push_javadoc.sh
+        # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
+        # ------------------------------------------------------------------------------
+      env:
+        JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
+ 

From 24113ad45f21e5b422e0cc51973ca5b9abe534c5 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 17 Apr 2021 18:00:37 +0200
Subject: [PATCH 250/665] Update gradle_release.yml

Forgot to add env to the close repo step
---
 .github/workflows/gradle_release.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 144e20cd27..432d4d3eef 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -50,6 +50,11 @@ jobs:
         ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     - name: Publish release
       run: ./gradlew -PreleaseMode=full closeAndReleaseRepository --no-daemon --no-parallel --stacktrace
+      env:
+        # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
+        # ------------------------------------------------------------------------------ 
+        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_USER }}
+        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Push Javadocs
       run: ./push_javadoc.sh
       env:

From 28a559483b991fe094141cc99e54dd8b9adb8f8d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Apr 2021 12:05:02 +0200
Subject: [PATCH 251/665] Bump com.vanniktech.maven.publish from 0.14.2 to
 0.15.0 (#7246)

Bumps [com.vanniktech.maven.publish](https://github.com/vanniktech/gradle-maven-publish-plugin) from 0.14.2 to 0.15.0.
- [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases)
- [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.14.2...0.15.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7358b2609b..061e15d08b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ plugins {
     id("com.github.hierynomus.license") version "0.15.0"
     id("com.jfrog.artifactory") version "4.21.0"
     id("biz.aQute.bnd.builder") version "5.3.0"
-    id("com.vanniktech.maven.publish") version "0.14.2"
+    id("com.vanniktech.maven.publish") version "0.15.0"
 }
 
 ext {

From 0792e059237ec804f2992ebd665fd0a65020698c Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 26 Apr 2021 12:28:44 +0200
Subject: [PATCH 252/665] Update env names for release plugin v0.15 (#7247)

#7246
---
 .github/workflows/gradle_release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 432d4d3eef..9683482ad2 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -44,8 +44,8 @@ jobs:
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 
-        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_USER }}
-        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        ORG_GRADLE_PROJECT_mavenCentralRepositoryUsername: ${{ secrets.SONATYPE_USER }}
+        ORG_GRADLE_PROJECT_mavenCentralRepositoryPassword: ${{ secrets.SONATYPE_PASSWORD }}
         ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
         ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     - name: Publish release
@@ -53,8 +53,8 @@ jobs:
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 
-        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_USER }}
-        ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
+        ORG_GRADLE_PROJECT_mavenCentralRepositoryUsername: ${{ secrets.SONATYPE_USER }}
+        ORG_GRADLE_PROJECT_mavenCentralRepositoryPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Push Javadocs
       run: ./push_javadoc.sh
       env:

From 3ad6bc105bc74aaa9f04026d207755f9cc40ae28 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 3 May 2021 11:51:05 +0200
Subject: [PATCH 253/665] Update gradle_release.yml

Rename maven central credential properties
---
 .github/workflows/gradle_release.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 9683482ad2..891fa0859a 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -44,8 +44,8 @@ jobs:
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 
-        ORG_GRADLE_PROJECT_mavenCentralRepositoryUsername: ${{ secrets.SONATYPE_USER }}
-        ORG_GRADLE_PROJECT_mavenCentralRepositoryPassword: ${{ secrets.SONATYPE_PASSWORD }}
+        ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
+        ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
         ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
         ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     - name: Publish release
@@ -53,8 +53,8 @@ jobs:
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 
-        ORG_GRADLE_PROJECT_mavenCentralRepositoryUsername: ${{ secrets.SONATYPE_USER }}
-        ORG_GRADLE_PROJECT_mavenCentralRepositoryPassword: ${{ secrets.SONATYPE_PASSWORD }}
+        ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
+        ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Push Javadocs
       run: ./push_javadoc.sh
       env:

From 94ed352d49ed102086b466ae268afbd6ae17951b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 May 2021 12:08:09 +0200
Subject: [PATCH 254/665] Bump com.vanniktech.maven.publish from 0.15.0 to
 0.15.1 (#7250)

Bumps [com.vanniktech.maven.publish](https://github.com/vanniktech/gradle-maven-publish-plugin) from 0.15.0 to 0.15.1.
- [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases)
- [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.15.0...0.15.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 061e15d08b..9c0aa000f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ plugins {
     id("com.github.hierynomus.license") version "0.15.0"
     id("com.jfrog.artifactory") version "4.21.0"
     id("biz.aQute.bnd.builder") version "5.3.0"
-    id("com.vanniktech.maven.publish") version "0.15.0"
+    id("com.vanniktech.maven.publish") version "0.15.1"
 }
 
 ext {

From 56cd564f67a263923500ec590965548644d1bd93 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 3 May 2021 14:15:38 +0200
Subject: [PATCH 255/665] Try fixing snapshot releases, attempt 1

---
 .github/workflows/gradle_snapshot.yml | 10 ++++----
 build.gradle                          | 36 ++++++++++++---------------
 2 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 099f5e9e91..ddd72b67bb 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -32,14 +32,14 @@ jobs:
     - name: Grant execute permission for push
       run: chmod +x push_javadoc.sh
     - name: Build and Snapshot branch
-      run: ./gradlew -PreleaseMode=branch -PbintrayUser="${bintrayUser}" -PbintrayKey="${bintrayKey}" -PsonatypeUsername="${sonatypeUsername}" -PsonatypePassword="${sonatypePassword}" build --stacktrace
+      run: ./gradlew -PreleaseMode=branch build --stacktrace --no-daemon
+    - name: Upload Snapshot
+      run: ./gradlew -PreleaseMode=branch javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 
-        bintrayUser: ${{ secrets.BINTRAY_USER }}
-        bintrayKey: ${{ secrets.BINTRAY_KEY }}
-        sonatypeUsername: ${{ secrets.SONATYPE_USER }}
-        sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
+        ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
+        ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
     - name: Push Javadocs
diff --git a/build.gradle b/build.gradle
index 9c0aa000f5..da06dfbc85 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@ plugins {
     id("ru.vyarus.animalsniffer") version "1.5.3"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.15.0"
-    id("com.jfrog.artifactory") version "4.21.0"
     id("biz.aQute.bnd.builder") version "5.3.0"
     id("com.vanniktech.maven.publish") version "0.15.1"
 }
@@ -209,27 +208,24 @@ if (rootProject.hasProperty("releaseMode")) {
     logger.lifecycle("ReleaseMode: {}", rootProject.releaseMode)
 
   if ("branch".equals(rootProject.releaseMode)) {
-    // From https://github.com/ReactiveX/RxAndroid/blob/2.x/rxandroid/build.gradle#L94
-    artifactory {
-        contextUrl = "https://oss.jfrog.org"
-    
-        publish {
-            repository {
-                repoKey = "oss-snapshot-local"
-    
-                username = rootProject.bintrayUser
-                password = rootProject.bintrayKey
-            }
-    
-            defaults {
-                publishConfigs("archives")
-            }
-
-            fixPom()
+  
+    if (version.endsWith("-SNAPSHOT")) {
+      fixPom()
+      
+      publishing {
+        repositories {
+          maven {
+             url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
+          }
         }
+      }
+
+      mavenPublish {
+        nexus {
+          stagingProfile = "io.reactivex"
+        }
+      }
     }
-    
-    build.finalizedBy(artifactoryPublish)
   }
 
   if ("full".equals(rootProject.releaseMode)) {

From c4163c96549c18c21595ff30bc647c805ef103a9 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 3 May 2021 14:17:40 +0200
Subject: [PATCH 256/665] Don't do full build yet, saves time with trying the
 new snapshot push

---
 .github/workflows/gradle_snapshot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index ddd72b67bb..4db8fbfb8f 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Grant execute permission for push
       run: chmod +x push_javadoc.sh
     - name: Build and Snapshot branch
-      run: ./gradlew -PreleaseMode=branch build --stacktrace --no-daemon
+      run: ./gradlew -PreleaseMode=branch assemble --stacktrace --no-daemon
     - name: Upload Snapshot
       run: ./gradlew -PreleaseMode=branch javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
       env:

From 4aa1c43b0b620eecb65e91f19c8e56ee5d9bf46a Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 3 May 2021 14:29:37 +0200
Subject: [PATCH 257/665] Re-enable snapshot full build, update README

---
 .github/workflows/gradle_snapshot.yml |  2 +-
 README.md                             | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 4db8fbfb8f..ddd72b67bb 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Grant execute permission for push
       run: chmod +x push_javadoc.sh
     - name: Build and Snapshot branch
-      run: ./gradlew -PreleaseMode=branch assemble --stacktrace --no-daemon
+      run: ./gradlew -PreleaseMode=branch build --stacktrace --no-daemon
     - name: Upload Snapshot
       run: ./gradlew -PreleaseMode=branch javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
       env:
diff --git a/README.md b/README.md
index b14ae42f84..8e894869f7 100644
--- a/README.md
+++ b/README.md
@@ -565,7 +565,20 @@ and for Ivy:
 
 ### Snapshots
 
-Snapshots are available via https://oss.jfrog.org/libs-snapshot/io/reactivex/rxjava3/rxjava/
+Snapshots after May 1st, 2021 are available via https://oss.sonatype.org/content/repositories/snapshots/io/reactivex/rxjava3/rxjava/
+
+```groovy
+repositories {
+  maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+}
+
+dependencies {
+  implementation 'io.reactivex.rxjava3:rxjava:3.0.0-SNAPSHOT'
+}
+```
+
+Snapshots before May 1st, 2021 are available via https://oss.jfrog.org/libs-snapshot/io/reactivex/rxjava3/rxjava/
+(Note that due to the Sunset of Bintray, our jfrog access has been severed, hence the new snapshot repo above.)
 
 ```groovy
 repositories {
@@ -573,7 +586,7 @@ repositories {
 }
 
 dependencies {
-    compile 'io.reactivex.rxjava3:rxjava:3.0.0-SNAPSHOT'
+    implementation 'io.reactivex.rxjava3:rxjava:3.0.0-SNAPSHOT'
 }
 ```
 

From 93e5216ac1f352aea78eda14f933d2bf536a6a50 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Tue, 4 May 2021 23:28:55 -0700
Subject: [PATCH 258/665] Remove fixPom method from build.gradle (#7253)

The pom is generated with the reactive-streams scope set to 'compile' by default.

To test that this works, the below gradle tasks were run:
./gradlew -PreleaseMode=full cleanGeneratePomFileForMavenPublication generatePomFileForMavenPublication
./gradlew -PreleaseMode=branch cleanGeneratePomFileForMavenPublication generatePomFileForMavenPublication

Both tasks generated a pom file with the reactive-streams set to
'compile' scope.
---
 build.gradle | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/build.gradle b/build.gradle
index da06dfbc85..5d66ba9bfd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -191,27 +191,12 @@ checkstyle {
 
 apply from: file("gradle/javadoc_cleanup.gradle")
 
-def fixPom() {
-    // Reactive-Streams as compile dependency
-    publishing.publications.all {
-      pom.withXml {
-        asNode().dependencies."*".findAll() {
-          it.scope.text() == "runtime" && project.configurations.compile.allDependencies.find { dep ->
-            dep.name == it.artifactId.text()
-          }
-        }.each { it.scope*.value = "compile"}
-      }
-    }
-}
-
 if (rootProject.hasProperty("releaseMode")) {
     logger.lifecycle("ReleaseMode: {}", rootProject.releaseMode)
 
   if ("branch".equals(rootProject.releaseMode)) {
   
     if (version.endsWith("-SNAPSHOT")) {
-      fixPom()
-      
       publishing {
         repositories {
           maven {
@@ -229,8 +214,6 @@ if (rootProject.hasProperty("releaseMode")) {
   }
 
   if ("full".equals(rootProject.releaseMode)) {
-    fixPom()
-
     signing {
       if (project.hasProperty("SIGNING_PRIVATE_KEY") && project.hasProperty("SIGNING_PASSWORD")) {
          useInMemoryPgpKeys(project.getProperty("SIGNING_PRIVATE_KEY"), project.getProperty("SIGNING_PASSWORD"))

From 06294de92d5f6ebb4870e64a84055460163630cc Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Wed, 5 May 2021 10:47:48 -0700
Subject: [PATCH 259/665] Update Gradle task dependencies to remove dependsOn
 'build' task (#7255)

It is generally discouraged to add dependencies on 'build', so 'javadocCleanup'
and 'jacocoTestReport' have been removed and put on better tasks. Also,
'jacocoTestReport' needs input from the test results.

Updated task dependencies:
- Gradle 'javadoc' task is finalized by 'javadocCleanup', and 'javadocCleanup'
  no longer directly invoked by 'build'
- Gradle 'jacocoTestReport' task run by 'check' instead of 'build', and
  'jacocoTestReport' depends on 'test' and 'testng'

Changes due to dependency updates:
- Add 'javadoc' generation task on Github actions that only 'build'
- Remove 'javadocCleanup' task from Github action as 'publish...' tasks
  already dependent on 'javadoc'

Miscellaneous tangential cleanup:
- Remove "pr" parameter on command line in Github workflow as parameter
  is no longer functional
- Enclose source/target compatibility in Gradle java block
---
 .github/workflows/gradle_branch.yml   |  4 +++-
 .github/workflows/gradle_jdk11.yml    |  6 +++---
 .github/workflows/gradle_pr.yml       |  6 ++++--
 .github/workflows/gradle_release.yml  |  2 +-
 .github/workflows/gradle_snapshot.yml |  3 +--
 build.gradle                          | 19 +++++++++++++------
 gradle/javadoc_cleanup.gradle         |  1 -
 7 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 214939c0d9..96acfc3a9d 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -27,6 +27,8 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build branch without snapshot
-      run: ./gradlew -PreleaseMode=pr build --stacktrace
+      run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
+    - name: Generate Javadocs
+      run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 9bbafd6615..697bcca364 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build PR
-      run: ./gradlew -PreleaseMode=pr build --stacktrace
-    #- name: Upload to Codecov  
-    #  uses: codecov/codecov-action@v1
+      run: ./gradlew build --stacktrace
+    - name: Generate Javadocs
+      run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 5b8310c635..9d3b33d517 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Gradle
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
 
-name: PR
+name: Pull Request
 
 on:
   pull_request:
@@ -27,6 +27,8 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build PR
-      run: ./gradlew -PreleaseMode=pr build --stacktrace
+      run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
+    - name: Generate Javadocs
+      run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 891fa0859a..2050936863 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
     - name: Upload release
-      run: ./gradlew -PreleaseMode=full javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
+      run: ./gradlew -PreleaseMode=full uploadArchives --no-daemon --no-parallel --stacktrace
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index ddd72b67bb..8d4457a497 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Build and Snapshot branch
       run: ./gradlew -PreleaseMode=branch build --stacktrace --no-daemon
     - name: Upload Snapshot
-      run: ./gradlew -PreleaseMode=branch javadocCleanup uploadArchives --no-daemon --no-parallel --stacktrace
+      run: ./gradlew -PreleaseMode=branch uploadArchives --no-daemon --no-parallel --stacktrace
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 
@@ -48,4 +48,3 @@ jobs:
         # ------------------------------------------------------------------------------
       env:
         JAVADOCS_TOKEN: ${{ secrets.JAVADOCS_TOKEN }}
- 
diff --git a/build.gradle b/build.gradle
index 5d66ba9bfd..9a2c3de5cd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -36,9 +36,6 @@ group = "io.reactivex.rxjava3"
 version = project.properties["VERSION_NAME"]
 description = "RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM."
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
-
 repositories {
     mavenCentral()
 }
@@ -57,10 +54,17 @@ dependencies {
     testImplementation "com.google.guava:guava:$guavaVersion"
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
 tasks.withType(JavaCompile) {
     options.compilerArgs << "-parameters"
 }
 
+apply from: file("gradle/javadoc_cleanup.gradle")
+
 javadoc {
     failOnError = false
     exclude "**/internal/**"
@@ -80,6 +84,8 @@ javadoc {
         "https://docs.oracle.com/javase/8/docs/api/",
         "http://www.reactive-streams.org/reactive-streams-${reactiveStreamsVersion}-javadoc/"
     )
+
+    finalizedBy javadocCleanup
 }
 
 animalsniffer {
@@ -172,13 +178,16 @@ jacoco {
 }
 
 jacocoTestReport {
+    dependsOn test
+    dependsOn testng
+
     reports {
         xml.enabled = true
         html.enabled = true
     }
 }
 
-build.dependsOn jacocoTestReport
+check.dependsOn jacocoTestReport
 
 checkstyle {
     configFile = rootProject.file("config/checkstyle/checkstyle.xml")
@@ -189,8 +198,6 @@ checkstyle {
     ]
 }
 
-apply from: file("gradle/javadoc_cleanup.gradle")
-
 if (rootProject.hasProperty("releaseMode")) {
     logger.lifecycle("ReleaseMode: {}", rootProject.releaseMode)
 
diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index f6811fdcaf..f9f365f4a3 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -57,4 +57,3 @@ def fixJavadocFile(file) {
     file.setText(fileContents, 'UTF-8');
 }
 
-build.dependsOn javadocCleanup 
\ No newline at end of file

From 8fb4640688a1229ed2e09d6618bce10fcb622cf2 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Wed, 5 May 2021 13:54:51 -0700
Subject: [PATCH 260/665] Remove redundant addition of JMH to classpath (#7257)

Remove manual addition of JMH classpath in build file. Gradle adds classpath
for all sourceSets to Eclipse by default as fixed in Gradle 6.8 by PR
14534. The JMH sourceSet is added by the JMH Plugin.

Tested by running 'eclipse' task in Eclipse 2021-03 (4.19.0). Then refreshing,
and JMH still on classpath and viewable in Eclipse. Then removed project from
Eclipse, ran 'cleanEclipse', and re-imported project to Eclipse. All successful.
---
 build.gradle | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9a2c3de5cd..1a4e6ace04 100644
--- a/build.gradle
+++ b/build.gradle
@@ -126,10 +126,6 @@ jmh {
     }
 }
 
-plugins.withType(EclipsePlugin) {
-    project.eclipse.classpath.plusConfigurations += [configurations.jmh]
-}
-
 test {
     testLogging  {
         // showing skipped occasionally should prevent CI timeout due to lack of standard output

From ac5e569072dee77402f3bb85fa60ce94f5581987 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Wed, 5 May 2021 23:51:16 -0700
Subject: [PATCH 261/665] Remove Javadoc not failing on error (#7258)

The 'javadoc' task should fail when there is an error. The
'javadocCleanup' task failed for PR 7239 due to a plugin issue 242,
while it should have been the 'javadoc' task that failed the build.
Also, publishing when javadocs fail is not desired.
---
 build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1a4e6ace04..d39a630675 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,7 +66,6 @@ tasks.withType(JavaCompile) {
 apply from: file("gradle/javadoc_cleanup.gradle")
 
 javadoc {
-    failOnError = false
     exclude "**/internal/**"
     exclude "**/test/**"
     exclude "**/perf/**"

From 0a9b09e62511174edd13194c9e3b2e43c906b1a6 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Thu, 6 May 2021 22:02:29 -0700
Subject: [PATCH 262/665] 3.x: Gradle wrapper 7 0 (#7259)

* Update Gradle Wrapper to 7.0

* Update com.github.hierynomus.license from 0.15.0 to 0.16.1
---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index d39a630675..b1b07a7e5a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ plugins {
     id("maven-publish")
     id("ru.vyarus.animalsniffer") version "1.5.3"
     id("me.champeau.gradle.jmh") version "0.5.3"
-    id("com.github.hierynomus.license") version "0.15.0"
+    id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "5.3.0"
     id("com.vanniktech.maven.publish") version "0.15.1"
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 442d9132ea..f371643eed 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 2f4815d79287d50589a226db5395ab7525bfbcc6 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Thu, 6 May 2021 22:21:45 -0700
Subject: [PATCH 263/665] 3.x: Move Gradle properties into gradle.properties
 file (#7260)

* Move Gradle properties into gradle.properties file

Moved version, group, and description into gradle.properties file.
Removed POM_ARTIFACT property as the 'name' property in the settings file
is used when building the POM. Removed 'release.scope' property as it
does not appear to be used. Removed VERSION_NAME property and references
to it, in favor of 'version' property.

* Replace POM_ARTIFACT_ID in gradle.properties

Added POM_ARTIFACT_ID=rxjava in gradle.properties file
---
 build.gradle      | 8 ++------
 gradle.properties | 6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index b1b07a7e5a..b2fd3f888b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,15 +27,11 @@ if (releaseTag != null && !releaseTag.isEmpty()) {
     if (releaseTag.startsWith("v")) {
         releaseTag = releaseTag.substring(1)
     }
-    project.setProperty("VERSION_NAME" , releaseTag)
+    project.version = releaseTag
 
-    logger.info("Releasing with version: {}", version)
+    logger.lifecycle("Releasing with version: " + project.version)
 }
 
-group = "io.reactivex.rxjava3"
-version = project.properties["VERSION_NAME"]
-description = "RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM."
-
 repositories {
     mavenCentral()
 }
diff --git a/gradle.properties b/gradle.properties
index 8da73143fa..e685b8103a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
-release.scope=patch
-VERSION_NAME=3.0.0-SNAPSHOT
+group=io.reactivex.rxjava3
+version=3.0.0-SNAPSHOT
+description=RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM.
 
-GROUP=io.reactivex.rxjava3
 POM_ARTIFACT_ID=rxjava
 POM_NAME=RxJava
 POM_PACKAGING=jar

From 177256eecde749dbf120a51e19f8af4555cae3f1 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Fri, 7 May 2021 01:24:27 -0700
Subject: [PATCH 264/665] Remove toolVersion for jacoco and checkstyle (#7261)

Remove versioning of Jacoco and Checkstyle. Instead they will be updated
by Gradle when it is updated. Dependabot does not update tool versions.
If issues come up, they can be corrected when Gradle is updated.
---
 build.gradle | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/build.gradle b/build.gradle
index b2fd3f888b..329e8347fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,8 +18,6 @@ ext {
     mockitoVersion = "3.9.0"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"
-    jacocoVersion = "0.8.4"
-    checkstyleVersion = "8.41"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")
@@ -164,10 +162,6 @@ task testng(type: Test) {
 
 check.dependsOn testng 
 
-jacoco {
-    toolVersion = jacocoVersion
-}
-
 jacocoTestReport {
     dependsOn test
     dependsOn testng
@@ -182,7 +176,6 @@ check.dependsOn jacocoTestReport
 
 checkstyle {
     configFile = rootProject.file("config/checkstyle/checkstyle.xml")
-    toolVersion = checkstyleVersion
     configProperties = [
             "checkstyle.suppressions.file": rootProject.file("config/checkstyle/suppressions.xml"),
             "checkstyle.header.file": rootProject.file("config/license/HEADER_JAVA")

From 74ab2485b9b44b541fffad557d106a41b4ff39f5 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Fri, 7 May 2021 02:12:30 -0700
Subject: [PATCH 265/665] Rename workflow tasks (#7262)

Change 'build' tasks name to Build RxJava. Update Javadoc task names.
---
 .github/workflows/gradle_branch.yml   | 4 ++--
 .github/workflows/gradle_jdk11.yml    | 4 ++--
 .github/workflows/gradle_pr.yml       | 4 ++--
 .github/workflows/gradle_release.yml  | 6 +++---
 .github/workflows/gradle_snapshot.yml | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 96acfc3a9d..f0454433b3 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -26,9 +26,9 @@ jobs:
         restore-keys: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    - name: Build branch without snapshot
+    - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
-    - name: Generate Javadocs
+    - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 697bcca364..13a89abd91 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -28,7 +28,7 @@ jobs:
         restore-keys: ${{ runner.os }}-gradle-1-
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    - name: Build PR
+    - name: Build RxJava
       run: ./gradlew build --stacktrace
-    - name: Generate Javadocs
+    - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 9d3b33d517..dbf3d6f1ca 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -26,9 +26,9 @@ jobs:
         restore-keys: ${{ runner.os }}-gradle-1-
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
-    - name: Build PR
+    - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
-    - name: Generate Javadocs
+    - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 2050936863..bbce6f6b43 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -35,8 +35,8 @@ jobs:
       run: chmod +x push_javadoc.sh
     - name: Extract version tag
       run: echo "BUILD_TAG=${GITHUB_REF:10}" >> $GITHUB_ENV
-    - name: Build and Release
-      run: ./gradlew -PreleaseMode=full build --stacktrace --no-daemon
+    - name: Build RxJava
+      run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
     - name: Upload release
@@ -55,7 +55,7 @@ jobs:
         # ------------------------------------------------------------------------------ 
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
-    - name: Push Javadocs
+    - name: Push Javadoc
       run: ./push_javadoc.sh
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 8d4457a497..d0d0ddea2c 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -31,8 +31,8 @@ jobs:
       run: chmod +x gradlew
     - name: Grant execute permission for push
       run: chmod +x push_javadoc.sh
-    - name: Build and Snapshot branch
-      run: ./gradlew -PreleaseMode=branch build --stacktrace --no-daemon
+    - name: Build RxJava
+      run: ./gradlew build --stacktrace --no-daemon
     - name: Upload Snapshot
       run: ./gradlew -PreleaseMode=branch uploadArchives --no-daemon --no-parallel --stacktrace
       env:
@@ -42,7 +42,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1
-    - name: Push Javadocs
+    - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------

From 63fcf838988f33fbad10dc67072c8d6e4a517ac5 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Fri, 7 May 2021 04:10:20 -0700
Subject: [PATCH 266/665] Updated javadocCleanup to use logger and remove
 semi-colons (#7264)

---
 gradle/javadoc_cleanup.gradle | 75 +++++++++++++++++------------------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index f9f365f4a3..a391375af4 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -1,59 +1,58 @@
 // remove the excessive whitespaces between method arguments in the javadocs
 task javadocCleanup(dependsOn: "javadoc") doLast {
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Flowable.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Observable.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Single.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Maybe.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Completable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Flowable.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Observable.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Single.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Maybe.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/core/Completable.html'))
 
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/flowables/ConnectableFlowable.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/observables/ConnectableObservable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/flowables/ConnectableFlowable.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/observables/ConnectableObservable.html'))
 
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subjects/ReplaySubject.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/ReplayProcessor.html'));
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/plugins/RxJavaPlugins.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subjects/ReplaySubject.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/ReplayProcessor.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/plugins/RxJavaPlugins.html'))
 
-    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/parallel/ParallelFlowable.html'));
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/parallel/ParallelFlowable.html'))
 }
 
 def fixJavadocFile(file) {
-    println("Cleaning up: " + file);
+    logger.lifecycle("Cleaning up: " + file)
     String fileContents = file.getText('UTF-8')
 
     // lots of spaces after the previous method argument
-    fileContents = fileContents.replaceAll(",\\s{4,}", ",\n        ");
+    fileContents = fileContents.replaceAll(",\\s{4,}", ",\n        ")
 
     // lots of spaces after the @NonNull annotations
-    fileContents = fileContents.replaceAll("@NonNull</a>\\s{4,}", "@NonNull</a> ");
+    fileContents = fileContents.replaceAll("@NonNull</a>\\s{4,}", "@NonNull</a> ")
 
     // lots of spaces after the @Nullable annotations
-    fileContents = fileContents.replaceAll("@Nullable</a>\\s{4,}", "@Nullable</a> ");
+    fileContents = fileContents.replaceAll("@Nullable</a>\\s{4,}", "@Nullable</a> ")
 
     // javadoc bug: duplicates the link to @NonNull for some reason
-    def nonNullText1 = "<a href=\"../annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
-    
-    fileContents = fileContents.replace(nonNullText1 + " " + nonNullText1, nonNullText1);
-    fileContents = fileContents.replace(nonNullText1 + "\n " + nonNullText1, nonNullText1);
-    fileContents = fileContents.replace(nonNullText1 + "\r\n " + nonNullText1, nonNullText1);
+    def nonNullText1 = "<a href=\"../annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>"
 
-    def nonNullText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>";
-    fileContents = fileContents.replace(nonNullText2 + " " + nonNullText2, nonNullText2);
-    fileContents = fileContents.replace(nonNullText2 + "\n " + nonNullText2, nonNullText2);
-    fileContents = fileContents.replace(nonNullText2 + "\r\n " + nonNullText2, nonNullText2);
+    fileContents = fileContents.replace(nonNullText1 + " " + nonNullText1, nonNullText1)
+    fileContents = fileContents.replace(nonNullText1 + "\n " + nonNullText1, nonNullText1)
+    fileContents = fileContents.replace(nonNullText1 + "\r\n " + nonNullText1, nonNullText1)
+
+    def nonNullText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/NonNull.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@NonNull</a>"
+    fileContents = fileContents.replace(nonNullText2 + " " + nonNullText2, nonNullText2)
+    fileContents = fileContents.replace(nonNullText2 + "\n " + nonNullText2, nonNullText2)
+    fileContents = fileContents.replace(nonNullText2 + "\r\n " + nonNullText2, nonNullText2)
 
     // javadoc bug: duplicates the link to @Nullable for some reason
-    def nullableText1 = "<a href=\"../annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
-    
-    fileContents = fileContents.replace(nullableText1 + " " + nullableText1, nullableText1);
-    fileContents = fileContents.replace(nullableText1 + "\n " + nullableText1, nullableText1);
-    fileContents = fileContents.replace(nullableText1 + "\r\n " + nullableText1, nullableText1);
-
-    def nullableText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>";
-    
-    fileContents = fileContents.replace(nullableText2 + " " + nullableText2, nullableText2);
-    fileContents = fileContents.replace(nullableText2 + "\n " + nullableText2, nullableText2);
-    fileContents = fileContents.replace(nullableText2 + "\r\n " + nullableText2, nullableText2);
-
-    file.setText(fileContents, 'UTF-8');
-}
+    def nullableText1 = "<a href=\"../annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>"
+
+    fileContents = fileContents.replace(nullableText1 + " " + nullableText1, nullableText1)
+    fileContents = fileContents.replace(nullableText1 + "\n " + nullableText1, nullableText1)
+    fileContents = fileContents.replace(nullableText1 + "\r\n " + nullableText1, nullableText1)
 
+    def nullableText2 = "<a href=\"../../../../io/reactivex/rxjava3/annotations/Nullable.html\" title=\"annotation in io.reactivex.rxjava3.annotations\">@Nullable</a>"
+
+    fileContents = fileContents.replace(nullableText2 + " " + nullableText2, nullableText2)
+    fileContents = fileContents.replace(nullableText2 + "\n " + nullableText2, nullableText2)
+    fileContents = fileContents.replace(nullableText2 + "\r\n " + nullableText2, nullableText2)
+
+    file.setText(fileContents, 'UTF-8')
+}

From a5dad0c66a9fab7685efbcc504d64b3c6d80330f Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Fri, 7 May 2021 06:10:41 -0700
Subject: [PATCH 267/665] 3.x: Consolidate test logging (#7263)

* Consolidate test logging

Move test logging to consolidated block. Change all 'rootProject' to
'project'.

* Only do parallel testing on non-CI machines
---
 build.gradle | 67 +++++++++++++++++++++-------------------------------
 1 file changed, 27 insertions(+), 40 deletions(-)

diff --git a/build.gradle b/build.gradle
index 329e8347fe..535aefc268 100644
--- a/build.gradle
+++ b/build.gradle
@@ -71,7 +71,7 @@ javadoc {
     options.addStringOption("top").value = ""
     options.addStringOption("doctitle").value = ""
     options.addStringOption("header").value = ""
-    options.stylesheetFile = rootProject.file("gradle/stylesheet.css")
+    options.stylesheetFile = project.file("gradle/stylesheet.css")
 
     options.links(
         "https://docs.oracle.com/javase/8/docs/api/",
@@ -99,7 +99,7 @@ jar {
 }
 
 license {
-    header rootProject.file("config/license/HEADER")
+    header project.file("config/license/HEADER")
     ext.year = Calendar.getInstance().get(Calendar.YEAR)
     skipExistingHeaders true
     ignoreFailures true
@@ -120,51 +120,38 @@ jmh {
 }
 
 test {
+    maxHeapSize = "1200m"
+}
+
+task testNG(type: Test) {
+     useTestNG()
+}
+
+check.dependsOn testNG
+
+tasks.withType(Test) {
     testLogging  {
-        // showing skipped occasionally should prevent CI timeout due to lack of standard output
-        events=["skipped", "failed"] // "started", "passed"
-        // showStandardStreams = true
-        exceptionFormat="full"
+        events = ["skipped", "failed"]
+        exceptionFormat = "full"
 
         debug.events = ["skipped", "failed"]
-        debug.exceptionFormat="full"
+        debug.exceptionFormat = "full"
 
         info.events = ["failed", "skipped"]
-        info.exceptionFormat="full"
-        
+        info.exceptionFormat = "full"
+
         warn.events = ["failed", "skipped"]
-        warn.exceptionFormat="full"
+        warn.exceptionFormat = "full"
     }
 
-    maxHeapSize = "1200m"
-
     if (System.getenv("CI") == null) {
         maxParallelForks = Runtime.runtime.availableProcessors().intdiv(2) ?: 1
     }
 }
 
-task testng(type: Test) { 
-     useTestNG()
-     testLogging  {
-        events=["skipped", "failed"]
-        exceptionFormat="full"
-
-        debug.events = ["skipped", "failed"]
-        debug.exceptionFormat="full"
-
-        info.events = ["failed", "skipped"]
-        info.exceptionFormat="full"
-        
-        warn.events = ["failed", "skipped"]
-        warn.exceptionFormat="full"
-     }
-} 
-
-check.dependsOn testng 
-
 jacocoTestReport {
     dependsOn test
-    dependsOn testng
+    dependsOn testNG
 
     reports {
         xml.enabled = true
@@ -175,18 +162,18 @@ jacocoTestReport {
 check.dependsOn jacocoTestReport
 
 checkstyle {
-    configFile = rootProject.file("config/checkstyle/checkstyle.xml")
+    configFile = project.file("config/checkstyle/checkstyle.xml")
     configProperties = [
-            "checkstyle.suppressions.file": rootProject.file("config/checkstyle/suppressions.xml"),
-            "checkstyle.header.file": rootProject.file("config/license/HEADER_JAVA")
+            "checkstyle.suppressions.file": project.file("config/checkstyle/suppressions.xml"),
+            "checkstyle.header.file":       project.file("config/license/HEADER_JAVA")
     ]
 }
 
-if (rootProject.hasProperty("releaseMode")) {
-    logger.lifecycle("ReleaseMode: {}", rootProject.releaseMode)
+if (project.hasProperty("releaseMode")) {
+    logger.lifecycle("ReleaseMode: {}", project.releaseMode)
+
+  if ("branch" == project.releaseMode) {
 
-  if ("branch".equals(rootProject.releaseMode)) {
-  
     if (version.endsWith("-SNAPSHOT")) {
       publishing {
         repositories {
@@ -204,7 +191,7 @@ if (rootProject.hasProperty("releaseMode")) {
     }
   }
 
-  if ("full".equals(rootProject.releaseMode)) {
+  if ("full" == project.releaseMode) {
     signing {
       if (project.hasProperty("SIGNING_PRIVATE_KEY") && project.hasProperty("SIGNING_PASSWORD")) {
          useInMemoryPgpKeys(project.getProperty("SIGNING_PRIVATE_KEY"), project.getProperty("SIGNING_PASSWORD"))

From aeb5e683b6474482ce540f03cea73d22c3af25f8 Mon Sep 17 00:00:00 2001
From: benjamintboyle <benjamin.t.boyle@gmail.com>
Date: Sat, 8 May 2021 14:06:32 -0700
Subject: [PATCH 268/665] Fix minor formatting issues in build.gradle (#7265)

---
 build.gradle | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 535aefc268..c47fbdd8f7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -74,8 +74,8 @@ javadoc {
     options.stylesheetFile = project.file("gradle/stylesheet.css")
 
     options.links(
-        "https://docs.oracle.com/javase/8/docs/api/",
-        "http://www.reactive-streams.org/reactive-streams-${reactiveStreamsVersion}-javadoc/"
+            "https://docs.oracle.com/javase/8/docs/api/",
+            "http://www.reactive-streams.org/reactive-streams-${reactiveStreamsVersion}-javadoc/"
     )
 
     finalizedBy javadocCleanup
@@ -124,13 +124,13 @@ test {
 }
 
 task testNG(type: Test) {
-     useTestNG()
+    useTestNG()
 }
 
 check.dependsOn testNG
 
 tasks.withType(Test) {
-    testLogging  {
+    testLogging {
         events = ["skipped", "failed"]
         exceptionFormat = "full"
 
@@ -165,7 +165,7 @@ checkstyle {
     configFile = project.file("config/checkstyle/checkstyle.xml")
     configProperties = [
             "checkstyle.suppressions.file": project.file("config/checkstyle/suppressions.xml"),
-            "checkstyle.header.file":       project.file("config/license/HEADER_JAVA")
+            "checkstyle.header.file"      : project.file("config/license/HEADER_JAVA")
     ]
 }
 

From f92590088decda924da7dd2922059b8825c3cb09 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 09:14:33 +0200
Subject: [PATCH 269/665] Bump gradle/wrapper-validation-action from 1 to 1.0.3
 (#7268)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1 to 1.0.3.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1...v1.0.3)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 405a2b3065..b7256f2ec9 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: gradle/wrapper-validation-action@v1.0.3

From c3f5e3999512e6455c1a8ede6434793f9c56de9d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 09:41:06 +0200
Subject: [PATCH 270/665] Bump codecov/codecov-action from 1 to 1.5.0 (#7270)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 1 to 1.5.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1...v1.5.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index f0454433b3..952a2b89c0 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v1.5.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index dbf3d6f1ca..962203d3df 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v1.5.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index bbce6f6b43..15503e17b6 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v1.5.0
     - name: Upload release
       run: ./gradlew -PreleaseMode=full uploadArchives --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index d0d0ddea2c..6ca347425f 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -41,7 +41,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v1.5.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From fc11bd33a7a9dd722750f7998e5c94edf292a238 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 09:56:29 +0200
Subject: [PATCH 271/665] Bump actions/checkout from 2 to 2.3.4 (#7269)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 2.3.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v2.3.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index b7256f2ec9..792b87079d 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v2.3.4
       - uses: gradle/wrapper-validation-action@v1.0.3
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 952a2b89c0..3824624722 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 13a89abd91..14c6951714 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -14,7 +14,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 962203d3df..583b09dab4 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 15503e17b6..10242b730f 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -17,7 +17,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 6ca347425f..934f3bde83 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -15,7 +15,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v2.3.4
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:

From b7e2f19378dd7e07ae254ed5ce0ede3f9646ce99 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 12 May 2021 14:21:01 +0200
Subject: [PATCH 272/665] 3.x: Fix copy-paste error in Completable javadoc
 (#7272)

---
 src/main/java/io/reactivex/rxjava3/core/Completable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 805cd8f63f..05b3f8b240 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -52,7 +52,7 @@
  * Note that as with the {@code Observable} protocol, {@code onError} and {@code onComplete} are mutually exclusive events.
  * <p>
  * Like {@code Observable}, a running {@code Completable} can be stopped through the {@link Disposable} instance
- * provided to consumers through {@link SingleObserver#onSubscribe}.
+ * provided to consumers through {@link CompletableObserver#onSubscribe}.
  * <p>
  * Like an {@code Observable}, a {@code Completable} is lazy, can be either "hot" or "cold", synchronous or
  * asynchronous. {@code Completable} instances returned by the methods of this class are <em>cold</em>

From 3ba64ceb023614836f09961c8a0f3f94cbfcc2ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 May 2021 09:10:10 +0200
Subject: [PATCH 273/665] Bump mockito-core from 3.9.0 to 3.10.0 (#7273)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.9.0 to 3.10.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.9.0...v3.10.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c47fbdd8f7..a7d5418d75 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "3.9.0"
+    mockitoVersion = "3.10.0"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"
 }

From 771616c401061f989bed17ce441e60791b3cf7ea Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 14 May 2021 22:08:20 +0200
Subject: [PATCH 274/665] 3.x: Javadoc: Fix wording of *OnSubscribe interfaces
 (#7274)

---
 .../java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java  | 2 +-
 .../java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java     | 2 +-
 src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java   | 2 +-
 .../java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java   | 2 +-
 src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
index 0ac107e64b..e73fae2d5c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/CompletableOnSubscribe.java
@@ -17,7 +17,7 @@
 
 /**
  * A functional interface that has a {@code subscribe()} method that receives
- * an instance of a {@link CompletableEmitter} instance that allows pushing
+ * a {@link CompletableEmitter} instance that allows pushing
  * an event in a cancellation-safe manner.
  */
 @FunctionalInterface
diff --git a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
index c289a9e30b..6c5263b779 100644
--- a/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/FlowableOnSubscribe.java
@@ -17,7 +17,7 @@
 
 /**
  * A functional interface that has a {@code subscribe()} method that receives
- * an instance of a {@link FlowableEmitter} instance that allows pushing
+ * a {@link FlowableEmitter} instance that allows pushing
  * events in a backpressure-safe and cancellation-safe manner.
  *
  * @param <T> the value type pushed
diff --git a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
index 6c235bac84..67994d3d40 100644
--- a/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/MaybeOnSubscribe.java
@@ -17,7 +17,7 @@
 
 /**
  * A functional interface that has a {@code subscribe()} method that receives
- * an instance of a {@link MaybeEmitter} instance that allows pushing
+ * a {@link MaybeEmitter} instance that allows pushing
  * an event in a cancellation-safe manner.
  *
  * @param <T> the value type pushed
diff --git a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
index 587ab9372c..056441620a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/ObservableOnSubscribe.java
@@ -17,7 +17,7 @@
 
 /**
  * A functional interface that has a {@code subscribe()} method that receives
- * an instance of an {@link ObservableEmitter} instance that allows pushing
+ * an {@link ObservableEmitter} instance that allows pushing
  * events in a cancellation-safe manner.
  *
  * @param <T> the value type pushed
diff --git a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
index 9372cb5bdf..e8b9e89f8b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/SingleOnSubscribe.java
@@ -17,7 +17,7 @@
 
 /**
  * A functional interface that has a {@code subscribe()} method that receives
- * an instance of a {@link SingleEmitter} instance that allows pushing
+ * a {@link SingleEmitter} instance that allows pushing
  * an event in a cancellation-safe manner.
  *
  * @param <T> the value type pushed

From 1d7e8acb3e1fa035a30248a9195a35c7537200b7 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Thu, 27 May 2021 15:38:19 +0900
Subject: [PATCH 275/665] 3.x: fix typo in ObservableRetryTest.java (#7277)

seperate -> separate
---
 .../internal/operators/observable/ObservableRetryTest.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
index 285299b83d..13f19fb547 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRetryTest.java
@@ -572,7 +572,7 @@ public void run() {
         }
     }
 
-    /** Observer for listener on seperate thread. */
+    /** Observer for listener on separate thread. */
     static final class AsyncObserver<T> extends DefaultObserver<T> {
 
         protected CountDownLatch latch = new CountDownLatch(1);

From 327fa44fc7bc93e87057bf14f7be37b7a3e496ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 May 2021 09:08:49 +0200
Subject: [PATCH 276/665] Bump actions/cache from 2.1.5 to 2.1.6 (#7278)

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.5 to 2.1.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.5...v2.1.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 3824624722..a0d99b4ade 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'adopt'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.5
+      uses: actions/cache@v2.1.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 14c6951714..9b30f8da56 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -21,7 +21,7 @@ jobs:
         distribution: 'adopt'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.5
+      uses: actions/cache@v2.1.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 583b09dab4..7490665ca4 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'adopt'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.5
+      uses: actions/cache@v2.1.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 10242b730f..9b15018c13 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'adopt'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.5
+      uses: actions/cache@v2.1.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 934f3bde83..ca58fa2e5f 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'adopt'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.5
+      uses: actions/cache@v2.1.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 47c599cb7f976f147b53a32482fb853ecf875da7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 31 May 2021 10:58:59 +0200
Subject: [PATCH 277/665] Bump gradle/wrapper-validation-action from 1.0.3 to
 1.0.4 (#7279)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1.0.3...v1.0.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 792b87079d..184acdb502 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -7,4 +7,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2.3.4
-      - uses: gradle/wrapper-validation-action@v1.0.3
+      - uses: gradle/wrapper-validation-action@v1.0.4

From 0df952e007814da9f2d4566097676590b977c708 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Jun 2021 09:37:53 +0200
Subject: [PATCH 278/665] Bump mockito-core from 3.10.0 to 3.11.0 (#7280)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.10.0 to 3.11.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.10.0...v3.11.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a7d5418d75..1fb0f2ee22 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "3.10.0"
+    mockitoVersion = "3.11.0"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"
 }

From e38337779936d053b86001a0d5a98bccb83341f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Jun 2021 08:47:43 +0200
Subject: [PATCH 279/665] Bump codecov/codecov-action from 1.5.0 to 1.5.2
 (#7282)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 1.5.0 to 1.5.2.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1.5.0...v1.5.2)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index a0d99b4ade..27a45e5ccc 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1.5.0
+      uses: codecov/codecov-action@v1.5.2
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 7490665ca4..dbc5418a92 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1.5.0
+      uses: codecov/codecov-action@v1.5.2
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 9b15018c13..d25da22464 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1.5.0
+      uses: codecov/codecov-action@v1.5.2
     - name: Upload release
       run: ./gradlew -PreleaseMode=full uploadArchives --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index ca58fa2e5f..76b402cf15 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -41,7 +41,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1.5.0
+      uses: codecov/codecov-action@v1.5.2
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 17366435ba5df7f37b97ad50e38748bf3917ff9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 14 Jun 2021 10:13:32 +0200
Subject: [PATCH 280/665] Bump mockito-core from 3.11.0 to 3.11.1 (#7283)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.0 to 3.11.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.11.0...v3.11.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1fb0f2ee22..bd5035b4a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "3.11.0"
+    mockitoVersion = "3.11.1"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"
 }

From df0dd4c9cf5955ae8519545482a36b45519609cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 21 Jun 2021 10:28:30 +0200
Subject: [PATCH 281/665] Bump com.vanniktech.maven.publish from 0.15.1 to
 0.16.0 (#7285)

Bumps [com.vanniktech.maven.publish](https://github.com/vanniktech/gradle-maven-publish-plugin) from 0.15.1 to 0.16.0.
- [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases)
- [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.15.1...0.16.0)

---
updated-dependencies:
- dependency-name: com.vanniktech.maven.publish
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bd5035b4a5..9fd4473214 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "5.3.0"
-    id("com.vanniktech.maven.publish") version "0.15.1"
+    id("com.vanniktech.maven.publish") version "0.16.0"
 }
 
 ext {

From 578b4f880abd64400a5c64914ef668d20d580983 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 21 Jun 2021 10:55:45 +0200
Subject: [PATCH 282/665] Rollback the publish plugin

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9fd4473214..bd5035b4a5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "5.3.0"
-    id("com.vanniktech.maven.publish") version "0.16.0"
+    id("com.vanniktech.maven.publish") version "0.15.1"
 }
 
 ext {

From 91a10d46ff993aba749c393035d402d607bd7424 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Jun 2021 08:08:53 +0200
Subject: [PATCH 283/665] Bump mockito-core from 3.11.1 to 3.11.2 (#7287)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.1 to 3.11.2.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.11.1...v3.11.2)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index bd5035b4a5..dcc510846b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "3.11.1"
+    mockitoVersion = "3.11.2"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"
 }

From 4749ab3879dcfb4afcf84edcade6141a7221c194 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 5 Jul 2021 13:27:48 +0200
Subject: [PATCH 284/665] 3.x: Update withLatestFrom doc about upstream early
 complete (#7289)

* 3.x: Update withLatestFrom doc about upstream early complete

* Fix singular wording
---
 .../io/reactivex/rxjava3/core/Flowable.java     | 17 +++++++++++++++++
 .../io/reactivex/rxjava3/core/Observable.java   | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 5a6579fb34..a9f7b0a3b6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -19233,6 +19233,13 @@ public final <U, V> Flowable<Flowable<T>> window(
     /**
      * Merges the specified {@link Publisher} into the current {@code Flowable} sequence by using the {@code resultSelector}
      * function only when the current {@code Flowable} (this instance) emits an item.
+     *
+     * <p>Note that this operator doesn't emit anything until the other source has produced at
+     * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
+     * not when the other source emits, unlike combineLatest).
+     * If the other source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before the other source has produced at least one value, the sequence completes
+     * without emission.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      *
@@ -19277,6 +19284,8 @@ public final <U, V> Flowable<Flowable<T>> window(
      * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -19317,6 +19326,8 @@ public final <U, V> Flowable<Flowable<T>> window(
      * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -19362,6 +19373,8 @@ public final <U, V> Flowable<Flowable<T>> window(
      * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -19411,6 +19424,8 @@ public final <U, V> Flowable<Flowable<T>> window(
      * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
@@ -19445,6 +19460,8 @@ public final <U, V> Flowable<Flowable<T>> window(
      * least one value. The resulting emission only happens when the current {@code Flowable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      *
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 3e343bf248..27d46ad8c5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -16074,6 +16074,13 @@ public final <U, V> Observable<Observable<T>> window(
     /**
      * Merges the specified {@link ObservableSource} into the current {@code Observable} sequence by using the {@code resultSelector}
      * function only when the current {@code Observable} emits an item.
+     *
+     * <p>Note that this operator doesn't emit anything until the other source has produced at
+     * least one value. The resulting emission only happens when the current {@code Observable} emits (and
+     * not when the other source emits, unlike combineLatest).
+     * If the other source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before the other source has produced at least one value, the sequence completes
+     * without emission.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      *
@@ -16112,6 +16119,8 @@ public final <U, R> Observable<R> withLatestFrom(@NonNull ObservableSource<? ext
      * least one value. The resulting emission only happens when the current {@code Observable} emits (and
      * not when any of the other sources emit, unlike {@code combineLatest}).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>
@@ -16150,6 +16159,8 @@ public final <T1, T2, R> Observable<R> withLatestFrom(
      * least one value. The resulting emission only happens when the current {@code Observable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>
@@ -16192,6 +16203,8 @@ public final <T1, T2, T3, R> Observable<R> withLatestFrom(
      * least one value. The resulting emission only happens when the current {@code Observable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>
@@ -16238,6 +16251,8 @@ public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
      * least one value. The resulting emission only happens when the current {@code Observable} emits (and
      * not when any of the other sources emit, unlike combineLatest).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>
@@ -16269,6 +16284,8 @@ public final <R> Observable<R> withLatestFrom(@NonNull ObservableSource<?>[] oth
      * least one value. The resulting emission only happens when the current {@code Observable} emits (and
      * not when any of the other sources emit, unlike {@code combineLatest}).
      * If a source doesn't produce any value and just completes, the sequence is completed immediately.
+     * If the upstream completes before all other sources have produced at least one value, the sequence completes
+     * without emission.
      * <p>
      * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/withLatestFrom.v3.png" alt="">
      * <dl>

From 3ba0ce4779717c41de563a8c655091813d6dc423 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Jul 2021 08:36:50 +0200
Subject: [PATCH 285/665] Bump com.vanniktech.maven.publish from 0.15.1 to
 0.17.0 (#7290)

Bumps [com.vanniktech.maven.publish](https://github.com/vanniktech/gradle-maven-publish-plugin) from 0.15.1 to 0.17.0.
- [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases)
- [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.15.1...0.17.0)

---
updated-dependencies:
- dependency-name: com.vanniktech.maven.publish
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dcc510846b..af6102f1c9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "5.3.0"
-    id("com.vanniktech.maven.publish") version "0.15.1"
+    id("com.vanniktech.maven.publish") version "0.17.0"
 }
 
 ext {

From 828afc786bde58b3d26d8064baaa40b1d2025491 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 7 Jul 2021 08:56:59 +0200
Subject: [PATCH 286/665] Fix 0.17.0 plugin config

https://github.com/vanniktech/gradle-maven-publish-plugin/issues/275#issuecomment-864967048
---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index af6102f1c9..367a9b3678 100644
--- a/build.gradle
+++ b/build.gradle
@@ -172,6 +172,7 @@ checkstyle {
 if (project.hasProperty("releaseMode")) {
     logger.lifecycle("ReleaseMode: {}", project.releaseMode)
 
+  /*
   if ("branch" == project.releaseMode) {
 
     if (version.endsWith("-SNAPSHOT")) {
@@ -190,6 +191,7 @@ if (project.hasProperty("releaseMode")) {
       }
     }
   }
+  */
 
   if ("full" == project.releaseMode) {
     signing {
@@ -197,10 +199,12 @@ if (project.hasProperty("releaseMode")) {
          useInMemoryPgpKeys(project.getProperty("SIGNING_PRIVATE_KEY"), project.getProperty("SIGNING_PASSWORD"))
       }
     }
+    /*
     mavenPublish {
       nexus {
         stagingProfile = "io.reactivex"
       }
     }
+    */
   }
 }

From 9ecf8ab36362f2e664f31ed7b9938e028b860140 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 7 Jul 2021 09:17:25 +0200
Subject: [PATCH 287/665] Update gradle_snapshot.yml

release plugin now uses the "publish" command
---
 .github/workflows/gradle_snapshot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 76b402cf15..ed101d8536 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload Snapshot
-      run: ./gradlew -PreleaseMode=branch uploadArchives --no-daemon --no-parallel --stacktrace
+      run: ./gradlew -PreleaseMode=branch publish --no-daemon --no-parallel --stacktrace
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 

From c5883dcb390ebb17a484871038e37078e210052a Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 7 Jul 2021 09:23:29 +0200
Subject: [PATCH 288/665] Update gradle_release.yml

Release plugin 0.17.0 uses "publish"
---
 .github/workflows/gradle_release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index d25da22464..81962b6028 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -40,7 +40,7 @@ jobs:
     - name: Upload to Codecov  
       uses: codecov/codecov-action@v1.5.2
     - name: Upload release
-      run: ./gradlew -PreleaseMode=full uploadArchives --no-daemon --no-parallel --stacktrace
+      run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 

From 333094355a19a6fb1b9f88d30bb68534504fac3c Mon Sep 17 00:00:00 2001
From: Christos Gkekas <chris.gekas@gmail.com>
Date: Fri, 16 Jul 2021 07:32:35 +0100
Subject: [PATCH 289/665] Removes the purge thread in favor of standard
 ScheduledThreadPoolExecutor APIs (#7293)

The RXSchedulerPurge thread is currently enabled by default and runs every second
to call purge() on each executor in the pool. This is causing significant issues
for low powered devices (e.g. mobile phones), because it needs to periodically
wake up the CPU to perform purging. The RXSchedulerPurge thread could be completely
removed in favor of using the standard setRemoveOnCancelPolicy() API on the
ScheduledThreadPoolExecutor which became available in Java 7 and offers removal
of cancelled tasks at the moment they are cancelled in O(1).
---
 .../schedulers/SchedulerPoolFactory.java      | 99 +------------------
 .../rxjava3/schedulers/Schedulers.java        |  5 +-
 .../schedulers/SchedulerPoolFactoryTest.java  | 86 ----------------
 .../schedulers/ExecutorSchedulerTest.java     |  2 +-
 4 files changed, 4 insertions(+), 188 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
index 043569334c..515c2f2061 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
@@ -31,86 +31,11 @@ private SchedulerPoolFactory() {
 
     static final String PURGE_ENABLED_KEY = "rx3.purge-enabled";
 
-    /**
-     * Indicates the periodic purging of the ScheduledExecutorService is enabled.
-     */
     public static final boolean PURGE_ENABLED;
 
-    static final String PURGE_PERIOD_SECONDS_KEY = "rx3.purge-period-seconds";
-
-    /**
-     * Indicates the purge period of the ScheduledExecutorServices created by create().
-     */
-    public static final int PURGE_PERIOD_SECONDS;
-
-    static final AtomicReference<ScheduledExecutorService> PURGE_THREAD =
-            new AtomicReference<>();
-
-    // Upcast to the Map interface here to avoid 8.x compatibility issues.
-    // See http://stackoverflow.com/a/32955708/61158
-    static final Map<ScheduledThreadPoolExecutor, Object> POOLS =
-            new ConcurrentHashMap<>();
-
-    /**
-     * Starts the purge thread if not already started.
-     */
-    public static void start() {
-        tryStart(PURGE_ENABLED);
-    }
-
-    static void tryStart(boolean purgeEnabled) {
-        if (purgeEnabled) {
-            for (;;) {
-                ScheduledExecutorService curr = PURGE_THREAD.get();
-                if (curr != null) {
-                    return;
-                }
-                ScheduledExecutorService next = Executors.newScheduledThreadPool(1, new RxThreadFactory("RxSchedulerPurge"));
-                if (PURGE_THREAD.compareAndSet(curr, next)) {
-
-                    next.scheduleAtFixedRate(new ScheduledTask(), PURGE_PERIOD_SECONDS, PURGE_PERIOD_SECONDS, TimeUnit.SECONDS);
-
-                    return;
-                } else {
-                    next.shutdownNow();
-                }
-            }
-        }
-    }
-
-    /**
-     * Stops the purge thread.
-     */
-    public static void shutdown() {
-        ScheduledExecutorService exec = PURGE_THREAD.getAndSet(null);
-        if (exec != null) {
-            exec.shutdownNow();
-        }
-        POOLS.clear();
-    }
-
     static {
         SystemPropertyAccessor propertyAccessor = new SystemPropertyAccessor();
         PURGE_ENABLED = getBooleanProperty(true, PURGE_ENABLED_KEY, true, true, propertyAccessor);
-        PURGE_PERIOD_SECONDS = getIntProperty(PURGE_ENABLED, PURGE_PERIOD_SECONDS_KEY, 1, 1, propertyAccessor);
-
-        start();
-    }
-
-    static int getIntProperty(boolean enabled, String key, int defaultNotFound, int defaultNotEnabled, Function<String, String> propertyAccessor) {
-        if (enabled) {
-            try {
-                String value = propertyAccessor.apply(key);
-                if (value == null) {
-                    return defaultNotFound;
-                }
-                return Integer.parseInt(value);
-            } catch (Throwable ex) {
-                Exceptions.throwIfFatal(ex);
-                return defaultNotFound;
-            }
-        }
-        return defaultNotEnabled;
     }
 
     static boolean getBooleanProperty(boolean enabled, String key, boolean defaultNotFound, boolean defaultNotEnabled, Function<String, String> propertyAccessor) {
@@ -142,28 +67,8 @@ public String apply(String t) {
      * @return the ScheduledExecutorService
      */
     public static ScheduledExecutorService create(ThreadFactory factory) {
-        final ScheduledExecutorService exec = Executors.newScheduledThreadPool(1, factory);
-        tryPutIntoPool(PURGE_ENABLED, exec);
+        final ScheduledThreadPoolExecutor exec = new ScheduledThreadPoolExecutor(1, factory);
+        exec.setRemoveOnCancelPolicy(PURGE_ENABLED);
         return exec;
     }
-
-    static void tryPutIntoPool(boolean purgeEnabled, ScheduledExecutorService exec) {
-        if (purgeEnabled && exec instanceof ScheduledThreadPoolExecutor) {
-            ScheduledThreadPoolExecutor e = (ScheduledThreadPoolExecutor) exec;
-            POOLS.put(e, exec);
-        }
-    }
-
-    static final class ScheduledTask implements Runnable {
-        @Override
-        public void run() {
-            for (ScheduledThreadPoolExecutor e : new ArrayList<>(POOLS.keySet())) {
-                if (e.isShutdown()) {
-                    POOLS.remove(e);
-                } else {
-                    e.purge();
-                }
-            }
-        }
-    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 0c0ecbdbe5..f5dbe6ce7c 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -38,8 +38,7 @@
  * <li>{@code rx3.computation-priority} (int): sets the thread priority of the {@link #computation()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
  * <li>{@code rx3.newthread-priority} (int): sets the thread priority of the {@link #newThread()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
  * <li>{@code rx3.single-priority} (int): sets the thread priority of the {@link #single()} {@code Scheduler}, default is {@link Thread#NORM_PRIORITY}</li>
- * <li>{@code rx3.purge-enabled} (boolean): enables periodic purging of all {@code Scheduler}'s backing thread pools, default is {@code false}</li>
- * <li>{@code rx3.purge-period-seconds} (int): specifies the periodic purge interval of all {@code Scheduler}'s backing thread pools, default is 1 second</li>
+ * <li>{@code rx3.purge-enabled} (boolean): enables purging of all {@code Scheduler}'s backing thread pools, default is {@code true}</li>
  * <li>{@code rx3.scheduler.use-nanotime} (boolean): {@code true} instructs {@code Scheduler} to use {@link System#nanoTime()} for {@link Scheduler#now(TimeUnit)},
  * instead of default {@link System#currentTimeMillis()} ({@code false})</li>
  * </ul>
@@ -556,7 +555,6 @@ public static void shutdown() {
         newThread().shutdown();
         single().shutdown();
         trampoline().shutdown();
-        SchedulerPoolFactory.shutdown();
     }
 
     /**
@@ -569,7 +567,6 @@ public static void start() {
         newThread().start();
         single().start();
         trampoline().start();
-        SchedulerPoolFactory.start();
     }
 
     static final class IOTask implements Supplier<Scheduler> {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
index dd5667ffbb..5d93dabc09 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
@@ -30,50 +30,6 @@ public void utilityClass() {
         TestHelper.checkUtilityClass(SchedulerPoolFactory.class);
     }
 
-    @Test
-    public void multiStartStop() {
-        SchedulerPoolFactory.shutdown();
-
-        SchedulerPoolFactory.shutdown();
-
-        SchedulerPoolFactory.tryStart(false);
-
-        assertNull(SchedulerPoolFactory.PURGE_THREAD.get());
-
-        SchedulerPoolFactory.start();
-
-        // restart schedulers
-        Schedulers.shutdown();
-
-        Schedulers.start();
-    }
-
-    @Test
-    public void startRace() throws InterruptedException {
-        try {
-            for (int i = 0; i < TestHelper.RACE_DEFAULT_LOOPS; i++) {
-                SchedulerPoolFactory.shutdown();
-
-                Runnable r1 = new Runnable() {
-                    @Override
-                    public void run() {
-                        SchedulerPoolFactory.start();
-                    }
-                };
-
-                TestHelper.race(r1, r1);
-            }
-
-        } finally {
-            // restart schedulers
-            Schedulers.shutdown();
-
-            Thread.sleep(200);
-
-            Schedulers.start();
-        }
-    }
-
     @Test
     public void boolPropertiesDisabledReturnsDefaultDisabled() throws Throwable {
         assertTrue(SchedulerPoolFactory.getBooleanProperty(false, "key", false, true, failingPropertiesAccessor));
@@ -98,30 +54,6 @@ public void boolPropertiesReturnsValue() throws Throwable {
         assertFalse(SchedulerPoolFactory.getBooleanProperty(true, "false", false, true, Functions.<String>identity()));
     }
 
-    @Test
-    public void intPropertiesDisabledReturnsDefaultDisabled() throws Throwable {
-        assertEquals(-1, SchedulerPoolFactory.getIntProperty(false, "key", 0, -1, failingPropertiesAccessor));
-        assertEquals(-1, SchedulerPoolFactory.getIntProperty(false, "key", 1, -1, failingPropertiesAccessor));
-    }
-
-    @Test
-    public void intPropertiesEnabledMissingReturnsDefaultMissing() throws Throwable {
-        assertEquals(-1, SchedulerPoolFactory.getIntProperty(true, "key", -1, 0, missingPropertiesAccessor));
-        assertEquals(-1, SchedulerPoolFactory.getIntProperty(true, "key", -1, 1, missingPropertiesAccessor));
-    }
-
-    @Test
-    public void intPropertiesFailureReturnsDefaultMissing() throws Throwable {
-        assertEquals(-1, SchedulerPoolFactory.getIntProperty(true, "key", -1, 0, failingPropertiesAccessor));
-        assertEquals(-1, SchedulerPoolFactory.getIntProperty(true, "key", -1, 1, failingPropertiesAccessor));
-    }
-
-    @Test
-    public void intPropertiesReturnsValue() throws Throwable {
-        assertEquals(1, SchedulerPoolFactory.getIntProperty(true, "1", 0, 4, Functions.<String>identity()));
-        assertEquals(2, SchedulerPoolFactory.getIntProperty(true, "2", 3, 5, Functions.<String>identity()));
-    }
-
     static final Function<String, String> failingPropertiesAccessor = new Function<String, String>() {
         @Override
         public String apply(String v) throws Throwable {
@@ -135,22 +67,4 @@ public String apply(String v) throws Throwable {
             return null;
         }
     };
-
-    @Test
-    public void putIntoPoolNoPurge() {
-        int s = SchedulerPoolFactory.POOLS.size();
-
-        SchedulerPoolFactory.tryPutIntoPool(false, null);
-
-        assertEquals(s, SchedulerPoolFactory.POOLS.size());
-    }
-
-    @Test
-    public void putIntoPoolNonThreadPool() {
-        int s = SchedulerPoolFactory.POOLS.size();
-
-        SchedulerPoolFactory.tryPutIntoPool(true, null);
-
-        assertEquals(s, SchedulerPoolFactory.POOLS.size());
-    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
index c4ba94189c..bb3e759884 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerTest.java
@@ -93,7 +93,7 @@ public void run() {
 
         System.out.println("Wait before second GC");
         System.out.println("JDK 6 purge is N log N because it removes and shifts one by one");
-        int t = (int)(n * Math.log(n) / 100) + SchedulerPoolFactory.PURGE_PERIOD_SECONDS * 1000;
+        int t = (int)(n * Math.log(n) / 100) + 1000;
         int sleepStep = 100;
         while (t > 0) {
             System.out.printf("  >> Waiting for purge: %.2f s remaining%n", t / 1000d);

From a9e0a8ab68ef9e385e4a639bd70769ca42e6f21a Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 17 Jul 2021 09:13:09 +0200
Subject: [PATCH 290/665] 3.x: API promotions for 3.1.0 (#7296)

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java    | 8 ++++----
 .../internal/schedulers/SchedulerPoolFactory.java        | 2 --
 .../java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java | 8 ++++----
 .../io/reactivex/rxjava3/schedulers/TestScheduler.java   | 9 ++++-----
 .../internal/schedulers/SchedulerPoolFactoryTest.java    | 1 -
 5 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index a9f7b0a3b6..804a057533 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -12725,15 +12725,15 @@ public final Flowable<T> onBackpressureLatest() {
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureReduce} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
+     * <p>History: 3.0.9 - experimental
      * @param reducer the bi-function to call when there is more than one non-emitted value to downstream,
      *                 the first argument of the bi-function is previous item and the second one is currently
      *                 emitting from upstream
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code reducer} is {@code null}
-     * @since 3.0.9 - experimental
+     * @since 3.1.0
      * @see #onBackpressureReduce(Supplier, BiFunction)
      */
-    @Experimental
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -12764,6 +12764,7 @@ public final Flowable<T> onBackpressureReduce(@NonNull BiFunction<T, T, T> reduc
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code onBackpressureReduce} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
+     * <p>History: 3.0.9 - experimental
      * @param <R> the aggregate type emitted when the downstream requests more items
      * @param supplier the factory to call to create new item of type R to pass it as the first argument to {@code reducer}.
      *                 It is called when previous returned value by {@code reducer} already sent to
@@ -12774,9 +12775,8 @@ public final Flowable<T> onBackpressureReduce(@NonNull BiFunction<T, T, T> reduc
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code supplier} or {@code reducer} is {@code null}
      * @see #onBackpressureReduce(BiFunction)
-     * @since 3.0.9 - experimental
+     * @since 3.1.0
      */
-    @Experimental
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
index 515c2f2061..44a824a168 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactory.java
@@ -13,9 +13,7 @@
 
 package io.reactivex.rxjava3.internal.schedulers;
 
-import java.util.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
diff --git a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
index c5b0797ba3..58cb730bf6 100644
--- a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
@@ -1153,11 +1153,11 @@ public static void setOnParallelAssembly(@Nullable Function<? super ParallelFlow
 
     /**
      * Sets the specific hook function.
+     * <p>History: 3.0.11 - experimental
      * @param handler the hook function to set, null allowed
-     * @since 3.0.11 - experimental
+     * @since 3.1.0
      */
     @SuppressWarnings("rawtypes")
-    @Experimental
     public static void setOnParallelSubscribe(@Nullable BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> handler) {
         if (lockdown) {
             throw new IllegalStateException("Plugins can't be changed anymore");
@@ -1167,11 +1167,11 @@ public static void setOnParallelSubscribe(@Nullable BiFunction<? super ParallelF
 
     /**
      * Returns the current hook function.
+     * <p>History: 3.0.11 - experimental
      * @return the hook function, may be null
-     * @since 3.0.11 - experimental
+     * @since 3.1.0
      */
     @SuppressWarnings("rawtypes")
-    @Experimental
     @Nullable
     public static BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> getOnParallelSubscribe() {
         return onParallelSubscribe;
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
index a9aa3285f5..33aca58a48 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/TestScheduler.java
@@ -52,12 +52,12 @@ public TestScheduler() {
     /**
      * Creates a new TestScheduler with the option to use the
      * {@link RxJavaPlugins#onSchedule(Runnable)} hook when scheduling tasks.
+     * <p>History: 3.0.10 - experimental
      * @param useOnScheduleHook if {@code true}, the tasks submitted to this
      *                          TestScheduler is wrapped via the
      *                          {@link RxJavaPlugins#onSchedule(Runnable)} hook
-     * @since 3.0.10 - experimental
+     * @since 3.1.0
      */
-    @Experimental
     public TestScheduler(boolean useOnScheduleHook) {
         this.useOnScheduleHook = useOnScheduleHook;
     }
@@ -78,7 +78,7 @@ public TestScheduler(long delayTime, TimeUnit unit) {
      * Creates a new TestScheduler with the specified initial virtual time
      * and with the option to use the
      * {@link RxJavaPlugins#onSchedule(Runnable)} hook when scheduling tasks.
-     *
+     * <p>History: 3.0.10 - experimental
      * @param delayTime
      *          the point in time to move the Scheduler's clock to
      * @param unit
@@ -86,9 +86,8 @@ public TestScheduler(long delayTime, TimeUnit unit) {
      * @param useOnScheduleHook if {@code true}, the tasks submitted to this
      *                          TestScheduler is wrapped via the
      *                          {@link RxJavaPlugins#onSchedule(Runnable)} hook
-     * @since 3.0.10 - experimental
+     * @since 3.1.0
      */
-    @Experimental
     public TestScheduler(long delayTime, TimeUnit unit, boolean useOnScheduleHook) {
         time = unit.toNanos(delayTime);
         this.useOnScheduleHook = useOnScheduleHook;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
index 5d93dabc09..12afa708c4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/SchedulerPoolFactoryTest.java
@@ -20,7 +20,6 @@
 import io.reactivex.rxjava3.core.RxJavaTest;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class SchedulerPoolFactoryTest extends RxJavaTest {

From 66fd701417563fd21c24c177447c332191931dc4 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 17 Jul 2021 12:53:55 +0200
Subject: [PATCH 291/665] 3.x: Add subscribe with disposable container (#7298)

---
 .../reactivex/rxjava3/core/Completable.java   |  45 ++-
 .../io/reactivex/rxjava3/core/Flowable.java   |  53 ++-
 .../java/io/reactivex/rxjava3/core/Maybe.java |  49 ++-
 .../io/reactivex/rxjava3/core/Observable.java |  49 ++-
 .../io/reactivex/rxjava3/core/Single.java     |  48 ++-
 .../AbstractDisposableAutoRelease.java        | 125 +++++++
 .../DisposableAutoReleaseMultiObserver.java   |  78 +++++
 .../DisposableAutoReleaseObserver.java        |  76 ++++
 .../DisposableAutoReleaseSubscriber.java      | 151 ++++++++
 .../observers/CompletableConsumersTest.java   | 221 ++++++++++++
 .../observers/MaybeConsumersTest.java         | 273 +++++++++++++++
 .../observers/ObservableConsumersTest.java    | 324 +++++++++++++++++
 .../observers/SingleConsumersTest.java        | 192 ++++++++++
 .../subscribers/FlowableConsumersTest.java    | 328 ++++++++++++++++++
 .../validators/BaseTypeAnnotations.java       |   4 +-
 .../validators/JavadocForAnnotations.java     |   2 +-
 .../rxjava3/validators/JavadocWording.java    |   1 +
 .../ParamValidationCheckerTest.java           |   4 +-
 18 files changed, 2009 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/observers/AbstractDisposableAutoRelease.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/observers/DisposableAutoReleaseMultiObserver.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/observers/DisposableAutoReleaseObserver.java
 create mode 100644 src/main/java/io/reactivex/rxjava3/internal/subscribers/DisposableAutoReleaseSubscriber.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/observers/CompletableConsumersTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/observers/MaybeConsumersTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/observers/ObservableConsumersTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/observers/SingleConsumersTest.java
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/subscribers/FlowableConsumersTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 05b3f8b240..96eb10c447 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -19,7 +19,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
@@ -29,7 +29,7 @@
 import io.reactivex.rxjava3.internal.operators.completable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.*;
 import io.reactivex.rxjava3.internal.operators.mixed.*;
-import io.reactivex.rxjava3.internal.operators.single.*;
+import io.reactivex.rxjava3.internal.operators.single.SingleDelayWithCompletable;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
@@ -2836,6 +2836,7 @@ public final Completable hide() {
      *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      * @return the new {@code Disposable} that can be used for disposing the subscription at any time
+     * @see #subscribe(Action, Consumer, DisposableContainer)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
@@ -2921,6 +2922,7 @@ public final void subscribe(@NonNull CompletableObserver observer) {
      * @param onError the {@link Consumer} that is called if this {@code Completable} emits an error
      * @return the new {@link Disposable} that can be used for disposing the subscription at any time
      * @throws NullPointerException if {@code onComplete} or {@code onError} is {@code null}
+     * @see #subscribe(Action, Consumer, DisposableContainer)
      */
     @CheckReturnValue
     @NonNull
@@ -2934,6 +2936,44 @@ public final Disposable subscribe(@NonNull Action onComplete, @NonNull Consumer<
         return observer;
     }
 
+    /**
+     * Wraps the given onXXX callbacks into a {@link Disposable} {@link CompletableObserver},
+     * adds it to the given {@link DisposableContainer} and ensures, that if the upstream
+     * terminates or this particular {@code Disposable} is disposed, the {@code CompletableObserver} is removed
+     * from the given composite.
+     * <p>
+     * The {@code CompletableObserver} will be removed after the callback for the terminal event has been invoked.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param onError the callback for an upstream error
+     * @param onComplete the callback for an upstream completion
+     * @param container the {@code DisposableContainer} (such as {@link CompositeDisposable}) to add and remove the
+     *                  created {@code Disposable} {@code CompletableObserver}
+     * @return the {@code Disposable} that allows disposing the particular subscription.
+     * @throws NullPointerException
+     *             if {@code onComplete}, {@code onError}
+     *             or {@code container} is {@code null}
+     * @since 3.1.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Disposable subscribe(
+            @NonNull Action onComplete,
+            @NonNull Consumer<? super Throwable> onError,
+            @NonNull DisposableContainer container) {
+        Objects.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(container, "container is null");
+
+        DisposableAutoReleaseMultiObserver<Void> observer = new DisposableAutoReleaseMultiObserver<>(
+                container, Functions.emptyConsumer(), onError, onComplete);
+        container.add(observer);
+        subscribe(observer);
+        return observer;
+    }
+
     /**
      * Subscribes to this {@code Completable} and calls the given {@link Action} when this {@code Completable}
      * completes normally.
@@ -2950,6 +2990,7 @@ public final Disposable subscribe(@NonNull Action onComplete, @NonNull Consumer<
      * @param onComplete the {@code Action} called when this {@code Completable} completes normally
      * @return the new {@link Disposable} that can be used for disposing the subscription at any time
      * @throws NullPointerException if {@code onComplete} is {@code null}
+     * @see #subscribe(Action, Consumer, DisposableContainer)
      */
     @CheckReturnValue
     @NonNull
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 804a057533..d22d8dc4dc 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -20,7 +20,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.flowables.*;
 import io.reactivex.rxjava3.functions.*;
@@ -15699,6 +15699,7 @@ public final Flowable<T> startWithArray(@NonNull T... items) {
      *
      * @return the new {@link Disposable} instance that allows cancelling the flow
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -15727,6 +15728,7 @@ public final Disposable subscribe() {
      * @throws NullPointerException
      *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -15753,9 +15755,10 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
      *             current {@code Flowable}
      * @return the new {@link Disposable} instance that allows cancelling the flow
-     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onNext} or {@code onError} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -15788,6 +15791,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
      * @throws NullPointerException
      *             if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
@@ -15806,6 +15810,51 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
         return ls;
     }
 
+    /**
+     * Wraps the given onXXX callbacks into a {@link Disposable} {@link Subscriber},
+     * adds it to the given {@link DisposableContainer} and ensures, that if the upstream
+     * terminates or this particular {@code Disposable} is disposed, the {@code Subscriber} is removed
+     * from the given container.
+     * <p>
+     * The {@coded Subscriber} will be removed after the callback for the terminal event has been invoked.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no
+     *  backpressure is applied to it).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param onNext the callback for upstream items
+     * @param onError the callback for an upstream error if any
+     * @param onComplete the callback for the upstream completion if any
+     * @param container the {@code DisposableContainer} (such as {@link CompositeDisposable}) to add and remove the
+     *                  created {@code Disposable} {@code Subscriber}
+     * @return the {@code Disposable} that allows disposing the particular subscription.
+     * @throws NullPointerException
+     *             if {@code onNext}, {@code onError},
+     *             {@code onComplete} or {@code container} is {@code null}
+     * @since 3.1.0
+     */
+    @BackpressureSupport(BackpressureKind.SPECIAL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Disposable subscribe(
+            @NonNull Consumer<? super T> onNext,
+            @NonNull Consumer<? super Throwable> onError,
+            @NonNull Action onComplete,
+            @NonNull DisposableContainer container) {
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(container, "container is null");
+
+        DisposableAutoReleaseSubscriber<T> subscriber = new DisposableAutoReleaseSubscriber<>(
+                container, onNext, onError, onComplete);
+        container.add(subscriber);
+        subscribe(subscriber);
+        return subscriber;
+    }
+
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index c0b8421fb1..917a9838a4 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -20,7 +20,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
@@ -5226,6 +5226,7 @@ public final Flowable<T> startWith(@NonNull Publisher<T> other) {
      *
      * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
@@ -5250,6 +5251,7 @@ public final Disposable subscribe() {
      * @throws NullPointerException
      *             if {@code onSuccess} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -5272,10 +5274,11 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the
      *             {@code Maybe}
      * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
-     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onSuccess} is {@code null}, or
      *             if {@code onError} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -5305,6 +5308,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNu
      *             if {@code onSuccess}, {@code onError} or
      *             {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @CheckReturnValue
     @NonNull
@@ -5317,6 +5321,47 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNu
         return subscribeWith(new MaybeCallbackObserver<>(onSuccess, onError, onComplete));
     }
 
+    /**
+     * Wraps the given onXXX callbacks into a {@link Disposable} {@link MaybeObserver},
+     * adds it to the given {@link DisposableContainer} and ensures, that if the upstream
+     * terminates or this particular {@code Disposable} is disposed, the {@code MaybeObserver} is removed
+     * from the given composite.
+     * <p>
+     * The {@code MaybeObserver} will be removed after the callback for the terminal event has been invoked.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param onSuccess the callback for upstream items
+     * @param onError the callback for an upstream error
+     * @param onComplete the callback for an upstream completion without any value or error
+     * @param container the {@code DisposableContainer} (such as {@link CompositeDisposable}) to add and remove the
+     *                  created {@code Disposable} {@code MaybeObserver}
+     * @return the {@code Disposable} that allows disposing the particular subscription.
+     * @throws NullPointerException
+     *             if {@code onSuccess}, {@code onError},
+     *             {@code onComplete} or {@code container} is {@code null}
+     * @since 3.1.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Disposable subscribe(
+            @NonNull Consumer<? super T> onSuccess,
+            @NonNull Consumer<? super Throwable> onError,
+            @NonNull Action onComplete,
+            @NonNull DisposableContainer container) {
+        Objects.requireNonNull(onSuccess, "onSuccess is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(container, "container is null");
+
+        DisposableAutoReleaseMultiObserver<T> observer = new DisposableAutoReleaseMultiObserver<>(
+                container, onSuccess, onError, onComplete);
+        container.add(observer);
+        subscribe(observer);
+        return observer;
+    }
+
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
     public final void subscribe(@NonNull MaybeObserver<? super T> observer) {
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 27d46ad8c5..18534eecc7 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -20,7 +20,7 @@
 import org.reactivestreams.Publisher;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
@@ -13025,6 +13025,7 @@ public final Observable<T> startWithArray(@NonNull T... items) {
      *
      * @return the new {@link Disposable} instance that can be used to dispose the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
@@ -13049,6 +13050,7 @@ public final Disposable subscribe() {
      * @throws NullPointerException
      *             if {@code onNext} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -13071,9 +13073,10 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext) {
      *             the {@code Consumer<Throwable>} you have designed to accept any error notification from the current
      *             {@code Observable}
      * @return the new {@link Disposable} instance that can be used to dispose the subscription at any time
-     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onNext} or {@code onError} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -13102,6 +13105,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
      * @throws NullPointerException
      *             if {@code onNext}, {@code onError} or {@code onComplete} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, Action, DisposableContainer)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -13119,6 +13123,47 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
         return ls;
     }
 
+    /**
+     * Wraps the given onXXX callbacks into a {@link Disposable} {@link Observer},
+     * adds it to the given {@code DisposableContainer} and ensures, that if the upstream
+     * terminates or this particular {@code Disposable} is disposed, the {@code Observer} is removed
+     * from the given container.
+     * <p>
+     * The {@code Observer} will be removed after the callback for the terminal event has been invoked.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param onNext the callback for upstream items
+     * @param onError the callback for an upstream error if any
+     * @param onComplete the callback for the upstream completion if any
+     * @param container the {@code DisposableContainer} (such as {@link CompositeDisposable}) to add and remove the
+     *                  created {@code Disposable} {@code Observer}
+     * @return the {@code Disposable} that allows disposing the particular subscription.
+     * @throws NullPointerException
+     *             if {@code onNext}, {@code onError},
+     *             {@code onComplete} or {@code container} is {@code null}
+     * @since 3.1.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Disposable subscribe(
+            @NonNull Consumer<? super T> onNext,
+            @NonNull Consumer<? super Throwable> onError,
+            @NonNull Action onComplete,
+            @NonNull DisposableContainer container) {
+        Objects.requireNonNull(onNext, "onNext is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(onComplete, "onComplete is null");
+        Objects.requireNonNull(container, "container is null");
+
+        DisposableAutoReleaseObserver<T> observer = new DisposableAutoReleaseObserver<>(
+                container, onNext, onError, onComplete);
+        container.add(observer);
+        subscribe(observer);
+        return observer;
+    }
+
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
     public final void subscribe(@NonNull Observer<? super T> observer) {
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index dbe3694913..66e1ffd3d5 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -20,7 +20,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.annotations.*;
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
@@ -4705,6 +4705,7 @@ public final Flowable<T> startWith(@NonNull Publisher<T> other) {
      *
      * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, DisposableContainer)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
@@ -4726,9 +4727,10 @@ public final Disposable subscribe() {
      *            the callback that receives either the success value or the failure {@link Throwable}
      *            (whichever is not {@code null})
      * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
-     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onCallback} is {@code null}
+     * @see #subscribe(Consumer, Consumer, DisposableContainer)
+     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      */
     @CheckReturnValue
     @NonNull
@@ -4760,6 +4762,7 @@ public final Disposable subscribe(@NonNull BiConsumer<? super T, ? super Throwab
      * @throws NullPointerException
      *             if {@code onSuccess} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, DisposableContainer)
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
@@ -4784,9 +4787,10 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess) {
      *            the {@code Consumer<Throwable>} you have designed to accept any error notification from the
      *            {@code Single}
      * @return the new {@link Disposable} instance that can be used for disposing the subscription at any time
-     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
      * @throws NullPointerException
      *             if {@code onSuccess} or {@code onError} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/subscribe.html">ReactiveX operators documentation: Subscribe</a>
+     * @see #subscribe(Consumer, Consumer, DisposableContainer)
      */
     @CheckReturnValue
     @NonNull
@@ -4800,6 +4804,44 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onSuccess, @NonNu
         return observer;
     }
 
+    /**
+     * Wraps the given onXXX callbacks into a {@link Disposable} {@link SingleObserver},
+     * adds it to the given {@link DisposableContainer} and ensures, that if the upstream
+     * terminates or this particular {@code Disposable} is disposed, the {@code SingleObserver} is removed
+     * from the given container.
+     * <p>
+     * The {@code SingleObserver} will be removed after the callback for the terminal event has been invoked.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code subscribe} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     * @param onSuccess the callback for upstream items
+     * @param onError the callback for an upstream error if any
+     * @param container the {@code DisposableContainer} (such as {@link CompositeDisposable}) to add and remove the
+     *                  created {@code Disposable} {@code SingleObserver}
+     * @return the {@code Disposable} that allows disposing the particular subscription.
+     * @throws NullPointerException
+     *             if {@code onSuccess}, {@code onError}
+     *             or {@code container} is {@code null}
+     * @since 3.1.0
+     */
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    public final Disposable subscribe(
+            @NonNull Consumer<? super T> onSuccess,
+            @NonNull Consumer<? super Throwable> onError,
+            @NonNull DisposableContainer container) {
+        Objects.requireNonNull(onSuccess, "onSuccess is null");
+        Objects.requireNonNull(onError, "onError is null");
+        Objects.requireNonNull(container, "container is null");
+
+        DisposableAutoReleaseMultiObserver<T> observer = new DisposableAutoReleaseMultiObserver<>(
+                container, onSuccess, onError, Functions.EMPTY_ACTION);
+        container.add(observer);
+        subscribe(observer);
+        return observer;
+    }
+
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
     public final void subscribe(@NonNull SingleObserver<? super T> observer) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/AbstractDisposableAutoRelease.java b/src/main/java/io/reactivex/rxjava3/internal/observers/AbstractDisposableAutoRelease.java
new file mode 100644
index 0000000000..e5d89a4502
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/AbstractDisposableAutoRelease.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/*
+ * Copyright 2016-2019 David Karnok
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Wraps lambda callbacks and when the upstream terminates or the observer gets disposed,
+ * removes itself from a {@link io.reactivex.rxjava3.disposables.CompositeDisposable}.
+ * <p>History: 0.18.0 @ RxJavaExtensions
+ * @since 3.1.0
+ */
+abstract class AbstractDisposableAutoRelease
+extends AtomicReference<Disposable>
+implements Disposable, LambdaConsumerIntrospection {
+
+    private static final long serialVersionUID = 8924480688481408726L;
+
+    final AtomicReference<DisposableContainer> composite;
+
+    final Consumer<? super Throwable> onError;
+
+    final Action onComplete;
+
+    AbstractDisposableAutoRelease(
+            DisposableContainer composite,
+            Consumer<? super Throwable> onError,
+            Action onComplete
+    ) {
+        this.onError = onError;
+        this.onComplete = onComplete;
+        this.composite = new AtomicReference<>(composite);
+    }
+
+    public final void onError(Throwable t) {
+        if (get() != DisposableHelper.DISPOSED) {
+            lazySet(DisposableHelper.DISPOSED);
+            try {
+                onError.accept(t);
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                RxJavaPlugins.onError(new CompositeException(t, e));
+            }
+        } else {
+            RxJavaPlugins.onError(t);
+        }
+        removeSelf();
+    }
+
+    public final void onComplete() {
+        if (get() != DisposableHelper.DISPOSED) {
+            lazySet(DisposableHelper.DISPOSED);
+            try {
+                onComplete.run();
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                RxJavaPlugins.onError(e);
+            }
+        }
+        removeSelf();
+    }
+
+    @Override
+    public final void dispose() {
+        DisposableHelper.dispose(this);
+        removeSelf();
+    }
+
+    final void removeSelf() {
+        DisposableContainer c = composite.getAndSet(null);
+        if (c != null) {
+            c.delete(this);
+        }
+    }
+
+    @Override
+    public final boolean isDisposed() {
+        return DisposableHelper.isDisposed(get());
+    }
+
+    public final void onSubscribe(Disposable d) {
+        DisposableHelper.setOnce(this, d);
+    }
+
+    @Override
+    public final boolean hasCustomOnError() {
+        return onError != Functions.ON_ERROR_MISSING;
+    }
+
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableAutoReleaseMultiObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableAutoReleaseMultiObserver.java
new file mode 100644
index 0000000000..4779ff5723
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableAutoReleaseMultiObserver.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/*
+ * Copyright 2016-2019 David Karnok
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.DisposableContainer;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Wraps lambda callbacks and when the upstream terminates or this (Single | Maybe | Completable)
+ * observer gets disposed, removes itself from a {@link io.reactivex.rxjava3.disposables.CompositeDisposable}.
+ * <p>History: 0.18.0 @ RxJavaExtensions
+ * @param <T> the element type consumed
+ * @since 3.1.0
+ */
+public final class DisposableAutoReleaseMultiObserver<T>
+extends AbstractDisposableAutoRelease
+implements SingleObserver<T>, MaybeObserver<T>, CompletableObserver {
+
+    private static final long serialVersionUID = 8924480688481408726L;
+
+    final Consumer<? super T> onSuccess;
+
+    public DisposableAutoReleaseMultiObserver(
+            DisposableContainer composite,
+            Consumer<? super T> onSuccess,
+            Consumer<? super Throwable> onError,
+            Action onComplete
+    ) {
+        super(composite, onError, onComplete);
+        this.onSuccess = onSuccess;
+    }
+
+    @Override
+    public void onSuccess(T t) {
+        if (get() != DisposableHelper.DISPOSED) {
+            lazySet(DisposableHelper.DISPOSED);
+            try {
+                onSuccess.accept(t);
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                RxJavaPlugins.onError(e);
+            }
+        }
+        removeSelf();
+    }
+
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableAutoReleaseObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableAutoReleaseObserver.java
new file mode 100644
index 0000000000..89435c96ed
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/DisposableAutoReleaseObserver.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/*
+ * Copyright 2016-2019 David Karnok
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.DisposableContainer;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+
+/**
+ * Wraps lambda callbacks and when the upstream terminates or this observer gets disposed,
+ * removes itself from a {@link io.reactivex.rxjava3.disposables.CompositeDisposable}.
+ * <p>History: 0.18.0 @ RxJavaExtensions
+ * @param <T> the element type consumed
+ * @since 3.1.0
+ */
+public final class DisposableAutoReleaseObserver<T>
+extends AbstractDisposableAutoRelease
+implements Observer<T> {
+
+    private static final long serialVersionUID = 8924480688481408726L;
+
+    final Consumer<? super T> onNext;
+
+    public DisposableAutoReleaseObserver(
+            DisposableContainer composite,
+            Consumer<? super T> onNext,
+            Consumer<? super Throwable> onError,
+            Action onComplete
+    ) {
+        super(composite, onError, onComplete);
+        this.onNext = onNext;
+    }
+
+    @Override
+    public void onNext(T t) {
+        if (get() != DisposableHelper.DISPOSED) {
+            try {
+                onNext.accept(t);
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                get().dispose();
+                onError(e);
+            }
+        }
+    }
+
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/DisposableAutoReleaseSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/DisposableAutoReleaseSubscriber.java
new file mode 100644
index 0000000000..3b9d2d99b3
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/DisposableAutoReleaseSubscriber.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/*
+ * Copyright 2016-2019 David Karnok
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.subscribers;
+
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.reactivestreams.Subscription;
+
+import io.reactivex.rxjava3.core.FlowableSubscriber;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+
+/**
+ * Wraps lambda callbacks and when the upstream terminates or this subscriber gets disposed,
+ * removes itself from a {@link io.reactivex.rxjava3.disposables.CompositeDisposable}.
+ * <p>History: 0.18.0 @ RxJavaExtensions
+ * @param <T> the element type consumed
+ * @since 3.1.0
+ */
+public final class DisposableAutoReleaseSubscriber<T>
+extends AtomicReference<Subscription>
+implements FlowableSubscriber<T>, Disposable, LambdaConsumerIntrospection {
+
+    private static final long serialVersionUID = 8924480688481408726L;
+
+    final AtomicReference<DisposableContainer> composite;
+
+    final Consumer<? super T> onNext;
+
+    final Consumer<? super Throwable> onError;
+
+    final Action onComplete;
+
+    public DisposableAutoReleaseSubscriber(
+            DisposableContainer composite,
+            Consumer<? super T> onNext,
+            Consumer<? super Throwable> onError,
+            Action onComplete
+    ) {
+        this.onNext = onNext;
+        this.onError = onError;
+        this.onComplete = onComplete;
+        this.composite = new AtomicReference<>(composite);
+    }
+
+    @Override
+    public void onNext(T t) {
+        if (get() != SubscriptionHelper.CANCELLED) {
+            try {
+                onNext.accept(t);
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                get().cancel();
+                onError(e);
+            }
+        }
+    }
+
+    @Override
+    public void onError(Throwable t) {
+        if (get() != SubscriptionHelper.CANCELLED) {
+            lazySet(SubscriptionHelper.CANCELLED);
+            try {
+                onError.accept(t);
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                RxJavaPlugins.onError(new CompositeException(t, e));
+            }
+        } else {
+            RxJavaPlugins.onError(t);
+        }
+        removeSelf();
+    }
+
+    @Override
+    public void onComplete() {
+        if (get() != SubscriptionHelper.CANCELLED) {
+            lazySet(SubscriptionHelper.CANCELLED);
+            try {
+                onComplete.run();
+            } catch (Throwable e) {
+                Exceptions.throwIfFatal(e);
+                RxJavaPlugins.onError(e);
+            }
+        }
+        removeSelf();
+    }
+
+    @Override
+    public void dispose() {
+        SubscriptionHelper.cancel(this);
+        removeSelf();
+    }
+
+    void removeSelf() {
+        DisposableContainer c = composite.getAndSet(null);
+        if (c != null) {
+            c.delete(this);
+        }
+    }
+
+    @Override
+    public boolean isDisposed() {
+        return SubscriptionHelper.CANCELLED == get();
+    }
+
+    @Override
+    public void onSubscribe(Subscription s) {
+        if (SubscriptionHelper.setOnce(this, s)) {
+            s.request(Long.MAX_VALUE);
+        }
+    }
+
+    @Override
+    public boolean hasCustomOnError() {
+        return onError != Functions.ON_ERROR_MISSING;
+    }
+
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/CompletableConsumersTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/CompletableConsumersTest.java
new file mode 100644
index 0000000000..eb17ead3db
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/CompletableConsumersTest.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/*
+ * Copyright 2016-2019 David Karnok
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.CompositeException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.CompletableSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class CompletableConsumersTest implements Consumer<Object>, Action {
+
+    final CompositeDisposable composite = new CompositeDisposable();
+
+    final CompletableSubject processor = CompletableSubject.create();
+
+    final List<Object> events = new ArrayList<>();
+
+    @Override
+    public void run() throws Exception {
+        events.add("OnComplete");
+    }
+
+    @Override
+    public void accept(Object t) throws Exception {
+        events.add(t);
+    }
+
+    @Test
+    public void onErrorNormal() {
+
+        processor.subscribe(this, this, composite);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onComplete();
+
+        assertEquals(0, composite.size());
+
+        assertEquals(Arrays.<Object>asList("OnComplete"), events);
+
+    }
+
+    @Test
+    public void onErrorError() {
+
+        Disposable d = processor.subscribe(this, this, composite);
+
+        assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError());
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onError(new IOException());
+
+        assertTrue(events.toString(), events.get(0) instanceof IOException);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteNormal() {
+
+        processor.subscribe(this, this, composite);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onComplete();
+
+        assertEquals(0, composite.size());
+
+        assertEquals(Arrays.<Object>asList("OnComplete"), events);
+
+    }
+
+    @Test
+    public void onCompleteError() {
+
+        processor.subscribe(this, this, composite);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onError(new IOException());
+
+        assertTrue(events.toString(), events.get(0) instanceof IOException);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteDispose() {
+
+        Disposable d = processor.subscribe(this, this, composite);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        assertFalse(d.isDisposed());
+
+        d.dispose();
+        d.dispose();
+
+        assertTrue(d.isDisposed());
+
+        assertEquals(0, composite.size());
+
+        assertFalse(processor.hasObservers());
+    }
+
+    @Test
+    public void onErrorCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            processor.subscribe(this, t -> {
+                throw new IOException(t);
+            }, composite);
+
+            processor.onError(new IllegalArgumentException());
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertError(errors, 0, CompositeException.class);
+            List<Throwable> inners = TestHelper.compositeList(errors.get(0));
+            TestHelper.assertError(inners, 0, IllegalArgumentException.class);
+            TestHelper.assertError(inners, 1, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onCompleteCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            processor.subscribe(new Action() {
+                @Override
+                public void run() throws Exception {
+                    throw new IOException();
+                }
+            }, this, composite);
+
+            processor.onComplete();
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void badSource() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            new Completable() {
+                @Override
+                protected void subscribeActual(
+                        CompletableObserver observer) {
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onComplete();
+
+                    observer.onSubscribe(Disposable.empty());
+                    observer.onComplete();
+                    observer.onError(new IOException());
+                }
+            }.subscribe(this, this, composite);
+
+            assertEquals(Arrays.<Object>asList("OnComplete"), events);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/MaybeConsumersTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/MaybeConsumersTest.java
new file mode 100644
index 0000000000..92b32c000e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/MaybeConsumersTest.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/*
+ * Copyright 2016-2019 David Karnok
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.CompositeException;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.MaybeSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class MaybeConsumersTest implements Consumer<Object>, Action {
+
+    final CompositeDisposable composite = new CompositeDisposable();
+
+    final MaybeSubject<Integer> processor = MaybeSubject.create();
+
+    final List<Object> events = new ArrayList<>();
+
+    @Override
+    public void run() throws Exception {
+        events.add("OnComplete");
+    }
+
+    @Override
+    public void accept(Object t) throws Exception {
+        events.add(t);
+    }
+
+    static <T> Disposable subscribeAutoDispose(Maybe<T> source, CompositeDisposable composite,
+            Consumer<? super T> onSuccess, Consumer<? super Throwable> onError, Action onComplete) {
+        return source.subscribe(onSuccess, onError, onComplete, composite);
+    }
+
+    @Test
+    public void onSuccessNormal() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, Functions.ON_ERROR_MISSING, () -> { });
+
+        assertFalse(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError());
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onSuccess(1);
+
+        assertEquals(0, composite.size());
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+    }
+
+    @Test
+    public void onErrorNormal() {
+
+        subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onSuccess(1);
+
+        assertEquals(0, composite.size());
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+    }
+
+    @Test
+    public void onErrorError() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError());
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onError(new IOException());
+
+        assertTrue(events.toString(), events.get(0) instanceof IOException);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteNormal() {
+
+        subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onComplete();
+
+        assertEquals(0, composite.size());
+
+        assertEquals(Arrays.<Object>asList("OnComplete"), events);
+
+    }
+
+    @Test
+    public void onCompleteError() {
+
+        subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onError(new IOException());
+
+        assertTrue(events.toString(), events.get(0) instanceof IOException);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteDispose() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        assertFalse(d.isDisposed());
+
+        d.dispose();
+        d.dispose();
+
+        assertTrue(d.isDisposed());
+
+        assertEquals(0, composite.size());
+
+        assertFalse(processor.hasObservers());
+    }
+
+    @Test
+    public void onSuccessCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, new Consumer<Object>() {
+                @Override
+                public void accept(Object t) throws Exception {
+                    throw new IOException();
+                }
+            }, this, this);
+
+            processor.onSuccess(1);
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onErrorCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, this, new Consumer<Throwable>() {
+                @Override
+                public void accept(Throwable t) throws Exception {
+                    throw new IOException(t);
+                }
+            }, this);
+
+            processor.onError(new IllegalArgumentException());
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertError(errors, 0, CompositeException.class);
+            List<Throwable> inners = TestHelper.compositeList(errors.get(0));
+            TestHelper.assertError(inners, 0, IllegalArgumentException.class);
+            TestHelper.assertError(inners, 1, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onCompleteCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, this, this, new Action() {
+                @Override
+                public void run() throws Exception {
+                    throw new IOException();
+                }
+            });
+
+            processor.onComplete();
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void badSource() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(
+                    new Maybe<Integer>() {
+                        @Override
+                        protected void subscribeActual(
+                                MaybeObserver<? super Integer> observer) {
+                            observer.onSubscribe(Disposable.empty());
+                            observer.onComplete();
+
+                            observer.onSubscribe(Disposable.empty());
+                            observer.onSuccess(2);
+                            observer.onComplete();
+                            observer.onError(new IOException());
+                        }
+                    }, composite, this, this, this
+                );
+
+            assertEquals(Arrays.<Object>asList("OnComplete"), events);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/ObservableConsumersTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/ObservableConsumersTest.java
new file mode 100644
index 0000000000..b5d26340e7
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/ObservableConsumersTest.java
@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/*
+ * Copyright 2016-2019 David Karnok
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.PublishSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class ObservableConsumersTest implements Consumer<Object>, Action {
+
+    final CompositeDisposable composite = new CompositeDisposable();
+
+    final PublishSubject<Integer> processor = PublishSubject.create();
+
+    final List<Object> events = new ArrayList<>();
+
+    @Override
+    public void run() throws Exception {
+        events.add("OnComplete");
+    }
+
+    @Override
+    public void accept(Object t) throws Exception {
+        events.add(t);
+    }
+
+    static <T> Disposable subscribeAutoDispose(Observable<T> source, CompositeDisposable composite,
+            Consumer<? super T> onNext, Consumer<? super Throwable> onError, Action onComplete) {
+        return source.subscribe(onNext, onError, onComplete, composite);
+    }
+
+    @Test
+    public void onNextNormal() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, Functions.ON_ERROR_MISSING, () -> { });
+
+        assertFalse(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError());
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onComplete();
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onErrorNormal() {
+
+        subscribeAutoDispose(processor, composite, this, Functions.ON_ERROR_MISSING, () -> { });
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onComplete();
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onErrorError() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError());
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onError(new IOException());
+
+        assertEquals(events.toString(), 1, events.get(0));
+        assertTrue(events.toString(), events.get(1) instanceof IOException);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteNormal() {
+
+        subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onComplete();
+
+        assertEquals(Arrays.<Object>asList(1, "OnComplete"), events);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteError() {
+
+        subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onError(new IOException());
+
+        assertEquals(events.toString(), 1, events.get(0));
+        assertTrue(events.toString(), events.get(1) instanceof IOException);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteDispose() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        assertFalse(d.isDisposed());
+
+        d.dispose();
+        d.dispose();
+
+        assertTrue(d.isDisposed());
+
+        assertEquals(0, composite.size());
+
+        assertFalse(processor.hasObservers());
+    }
+
+    @Test
+    public void onNextCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, new Consumer<Object>() {
+                @Override
+                public void accept(Object t) throws Exception {
+                    throw new IOException();
+                }
+            }, this, this);
+
+            processor.onNext(1);
+
+            assertTrue(errors.toString(), errors.isEmpty());
+
+            assertTrue(events.toString(), events.get(0) instanceof IOException);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onNextCrashOnError() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, this, new Consumer<Throwable>() {
+                @Override
+                public void accept(Throwable t) throws Exception {
+                    throw new IOException(t);
+                }
+            }, this);
+
+            processor.onError(new IllegalArgumentException());
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertError(errors, 0, CompositeException.class);
+            List<Throwable> inners = TestHelper.compositeList(errors.get(0));
+            TestHelper.assertError(inners, 0, IllegalArgumentException.class);
+            TestHelper.assertError(inners, 1, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onNextCrashNoError() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, t -> {
+                throw new IOException();
+            }, Functions.ON_ERROR_MISSING, () -> { });
+
+            processor.onNext(1);
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class);
+            assertTrue(errors.get(0).getCause() instanceof IOException);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onCompleteCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, this, this, new Action() {
+                @Override
+                public void run() throws Exception {
+                    throw new IOException();
+                }
+            });
+
+            processor.onNext(1);
+            processor.onComplete();
+
+            assertEquals(Arrays.asList(1), events);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void badSource() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(
+                    new Observable<Integer>() {
+                        @Override
+                        protected void subscribeActual(
+                                Observer<? super Integer> observer) {
+                            observer.onSubscribe(Disposable.empty());
+                            observer.onNext(1);
+                            observer.onComplete();
+
+                            observer.onSubscribe(Disposable.empty());
+                            observer.onNext(2);
+                            observer.onComplete();
+                            observer.onError(new IOException());
+                        }
+                    }, composite, this, this, this
+                );
+
+            assertEquals(Arrays.<Object>asList(1, "OnComplete"), events);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/SingleConsumersTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/SingleConsumersTest.java
new file mode 100644
index 0000000000..a840d8f71a
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/SingleConsumersTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/*
+ * Copyright 2016-2019 David Karnok
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.observers;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.CompositeException;
+import io.reactivex.rxjava3.functions.Consumer;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.subjects.SingleSubject;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class SingleConsumersTest implements Consumer<Object> {
+
+    final CompositeDisposable composite = new CompositeDisposable();
+
+    final SingleSubject<Integer> processor = SingleSubject.create();
+
+    final List<Object> events = new ArrayList<>();
+
+    @Override
+    public void accept(Object t) throws Exception {
+        events.add(t);
+    }
+
+    static <T> Disposable subscribeAutoDispose(Single<T> source, CompositeDisposable composite,
+            Consumer<? super T> onSuccess, Consumer<? super Throwable> onError) {
+        return source.subscribe(onSuccess, onError, composite);
+    }
+
+    @Test
+    public void onSuccessNormal() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, Functions.ON_ERROR_MISSING);
+
+        assertFalse(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError());
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onSuccess(1);
+
+        assertEquals(0, composite.size());
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+    }
+
+    @Test
+    public void onErrorNormal() {
+
+        subscribeAutoDispose(processor, composite, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onSuccess(1);
+
+        assertEquals(0, composite.size());
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+    }
+
+    @Test
+    public void onErrorError() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, this);
+
+        assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError());
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onError(new IOException());
+
+        assertTrue(events.toString(), events.get(0) instanceof IOException);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onSuccessCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, new Consumer<Object>() {
+                @Override
+                public void accept(Object t) throws Exception {
+                    throw new IOException();
+                }
+            }, this);
+
+            processor.onSuccess(1);
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onErrorCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, this, new Consumer<Throwable>() {
+                @Override
+                public void accept(Throwable t) throws Exception {
+                    throw new IOException(t);
+                }
+            });
+
+            processor.onError(new IllegalArgumentException());
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertError(errors, 0, CompositeException.class);
+            List<Throwable> inners = TestHelper.compositeList(errors.get(0));
+            TestHelper.assertError(inners, 0, IllegalArgumentException.class);
+            TestHelper.assertError(inners, 1, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void badSource() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(
+                    new Single<Integer>() {
+                        @Override
+                        protected void subscribeActual(
+                                SingleObserver<? super Integer> observer) {
+                            observer.onSubscribe(Disposable.empty());
+                            observer.onSuccess(1);
+
+                            observer.onSubscribe(Disposable.empty());
+                            observer.onSuccess(2);
+                            observer.onError(new IOException());
+                        }
+                    }, composite, this, this
+                );
+
+            assertEquals(Arrays.<Object>asList(1), events);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/FlowableConsumersTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FlowableConsumersTest.java
new file mode 100644
index 0000000000..cc7083cde7
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/FlowableConsumersTest.java
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/*
+ * Copyright 2016-2019 David Karnok
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.subscribers;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.*;
+
+import org.junit.Test;
+import org.reactivestreams.Subscriber;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.*;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.functions.Functions;
+import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.processors.PublishProcessor;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+public class FlowableConsumersTest implements Consumer<Object>, Action {
+
+    final CompositeDisposable composite = new CompositeDisposable();
+
+    final PublishProcessor<Integer> processor = PublishProcessor.create();
+
+    final List<Object> events = new ArrayList<>();
+
+    @Override
+    public void run() throws Exception {
+        events.add("OnComplete");
+    }
+
+    @Override
+    public void accept(Object t) throws Exception {
+        events.add(t);
+    }
+
+    static <T> Disposable subscribeAutoDispose(Flowable<T> source, CompositeDisposable composite,
+            Consumer<? super T> onNext, Consumer<? super Throwable> onError, Action onComplete) {
+        return source.subscribe(onNext, onError, onComplete, composite);
+    }
+
+    @Test
+    public void onNextNormal() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, Functions.ON_ERROR_MISSING, () -> { });
+
+        assertFalse(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError());
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onComplete();
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onErrorNormal() {
+
+        subscribeAutoDispose(processor, composite, this, this, () -> { });
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onComplete();
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onErrorError() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(d.getClass().toString(), ((LambdaConsumerIntrospection)d).hasCustomOnError());
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onError(new IOException());
+
+        assertEquals(events.toString(), 1, events.get(0));
+        assertTrue(events.toString(), events.get(1) instanceof IOException);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteNormal() {
+
+        subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onComplete();
+
+        assertEquals(Arrays.<Object>asList(1, "OnComplete"), events);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteError() {
+
+        subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        processor.onNext(1);
+
+        assertTrue(composite.size() > 0);
+
+        assertEquals(Arrays.<Object>asList(1), events);
+
+        processor.onError(new IOException());
+
+        assertEquals(events.toString(), 1, events.get(0));
+        assertTrue(events.toString(), events.get(1) instanceof IOException);
+
+        assertEquals(0, composite.size());
+    }
+
+    @Test
+    public void onCompleteDispose() {
+
+        Disposable d = subscribeAutoDispose(processor, composite, this, this, this);
+
+        assertTrue(composite.size() > 0);
+
+        assertTrue(events.toString(), events.isEmpty());
+
+        assertFalse(d.isDisposed());
+
+        d.dispose();
+        d.dispose();
+
+        assertTrue(d.isDisposed());
+
+        assertEquals(0, composite.size());
+
+        assertFalse(processor.hasSubscribers());
+    }
+
+    @Test
+    public void onNextCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, new Consumer<Object>() {
+                @Override
+                public void accept(Object t) throws Exception {
+                    throw new IOException();
+                }
+            }, this, this);
+
+            processor.onNext(1);
+
+            assertTrue(errors.toString(), errors.isEmpty());
+
+            assertTrue(events.toString(), events.get(0) instanceof IOException);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onNextCrashOnError() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, this, new Consumer<Throwable>() {
+                @Override
+                public void accept(Throwable t) throws Exception {
+                    throw new IOException(t);
+                }
+            }, this);
+
+            processor.onError(new IllegalArgumentException());
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertError(errors, 0, CompositeException.class);
+            List<Throwable> inners = TestHelper.compositeList(errors.get(0));
+            TestHelper.assertError(inners, 0, IllegalArgumentException.class);
+            TestHelper.assertError(inners, 1, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onNextCrashNoError() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, new Consumer<Object>() {
+                @Override
+                public void accept(Object t) throws Exception {
+                    throw new IOException();
+                }
+            }, Functions.ON_ERROR_MISSING, () -> { });
+
+            processor.onNext(1);
+
+            assertTrue(events.toString(), events.isEmpty());
+
+            TestHelper.assertError(errors, 0, OnErrorNotImplementedException.class);
+            assertTrue(errors.get(0).getCause() instanceof IOException);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void onCompleteCrash() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(processor, composite, this, this, new Action() {
+                @Override
+                public void run() throws Exception {
+                    throw new IOException();
+                }
+            });
+
+            processor.onNext(1);
+            processor.onComplete();
+
+            assertEquals(Arrays.asList(1), events);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+
+    @Test
+    public void badSource() {
+        List<Throwable> errors = TestHelper.trackPluginErrors();
+        try {
+            subscribeAutoDispose(
+                    new Flowable<Integer>() {
+                        @Override
+                        protected void subscribeActual(
+                                Subscriber<? super Integer> s) {
+                            s.onSubscribe(new BooleanSubscription());
+                            s.onNext(1);
+                            s.onComplete();
+
+                            s.onSubscribe(new BooleanSubscription());
+                            s.onNext(2);
+                            s.onComplete();
+                            s.onError(new IOException());
+                        }
+                    }, composite, this, this, this
+                );
+
+            assertEquals(Arrays.<Object>asList(1, "OnComplete"), events);
+
+            TestHelper.assertUndeliverable(errors, 0, IOException.class);
+        } finally {
+            RxJavaPlugins.reset();
+        }
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
index d03c0dcade..582df0fa71 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/BaseTypeAnnotations.java
@@ -22,6 +22,7 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.disposables.DisposableContainer;
 import io.reactivex.rxjava3.flowables.ConnectableFlowable;
 import io.reactivex.rxjava3.observables.ConnectableObservable;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
@@ -44,7 +45,8 @@ static void checkCheckReturnValueSupport(Class<?> clazz) {
 
         for (Method m : clazz.getMethods()) {
             if (m.getDeclaringClass() == clazz) {
-                boolean isSubscribeMethod = "subscribe".equals(m.getName()) && m.getParameterTypes().length == 0;
+                boolean isSubscribeMethod = "subscribe".equals(m.getName()) &&
+                        (m.getParameterTypes().length == 0 || m.getParameterTypes()[m.getParameterCount() - 1] == DisposableContainer.class);
                 boolean isConnectMethod = "connect".equals(m.getName()) && m.getParameterTypes().length == 0;
                 boolean isAnnotationPresent = m.isAnnotationPresent(CheckReturnValue.class);
 
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
index c3c814f9ff..1c683783d6 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocForAnnotations.java
@@ -95,7 +95,7 @@ static final void scanFor(StringBuilder sourceCode, String annotation, String in
                     ;
                     int lc = lineNumber(sourceCode, idx);
 
-                    e.append(" at io.reactivex.").append(baseClassName)
+                    e.append(" at io.reactivex.rxjava3.core.").append(baseClassName)
                     .append(" (").append(baseClassName).append(".java:")
                     .append(lc).append(")").append("\r\n\r\n");
                 }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
index b09303643c..3ab41589a3 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/JavadocWording.java
@@ -309,6 +309,7 @@ public void flowableDocRefersToFlowableTypes() throws Exception {
                                 && !m.signature.contains("Maybe")
                                 && !m.signature.contains("MaybeSource")
                                 && !m.signature.contains("Disposable")
+                                && !m.signature.contains("void subscribe")
                         ) {
                             CharSequence subSequence = m.javadoc.subSequence(idx - 6, idx + 11);
                             if (idx < 6 || !subSequence.equals("{@link Disposable")) {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 84f99707f2..51c7626ed5 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -25,7 +25,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.core.Observer;
-import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
@@ -580,6 +580,8 @@ public void checkParallelFlowable() {
 
         defaultValues.put(ParallelFailureHandling.class, ParallelFailureHandling.ERROR);
 
+        defaultValues.put(DisposableContainer.class, new CompositeDisposable());
+
         // JDK 8 types
 
         defaultValues.put(Optional.class, Optional.of(1));

From a463d248145d55fc0d0833d192ee11b254012855 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Jul 2021 08:13:45 +0200
Subject: [PATCH 292/665] Bump codecov/codecov-action from 1.5.2 to 2.0.1
 (#7299)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 1.5.2 to 2.0.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1.5.2...v2.0.1)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 27a45e5ccc..2d64e82a80 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1.5.2
+      uses: codecov/codecov-action@v2.0.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index dbc5418a92..4a5a0c4ba8 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1.5.2
+      uses: codecov/codecov-action@v2.0.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 81962b6028..092dd9f659 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1.5.2
+      uses: codecov/codecov-action@v2.0.1
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index ed101d8536..391feb08a5 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -41,7 +41,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v1.5.2
+      uses: codecov/codecov-action@v2.0.1
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From bb814d2064e061d27cbdcd1ac64528d96f97feea Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 22 Jul 2021 17:44:45 +0200
Subject: [PATCH 293/665] 3.x: Javadocs fix some wording in Schedulers.java
 (#7301)

---
 .../java/io/reactivex/rxjava3/schedulers/Schedulers.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index f5dbe6ce7c..cc7e693b3d 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -27,6 +27,8 @@
  * The initial and runtime values of the various scheduler types can be overridden via the
  * {@code RxJavaPlugins.setInit(scheduler name)SchedulerHandler()} and
  * {@code RxJavaPlugins.set(scheduler name)SchedulerHandler()} respectively.
+ * Note that overriding any initial {@code Scheduler} via the {@link RxJavaPlugins}
+ * has to happen before the {@code Schedulers} class is accessed.
  * <p>
  * <strong>Supported system properties ({@code System.getProperty()}):</strong>
  * <ul>
@@ -453,7 +455,7 @@ public static Scheduler from(@NonNull Executor executor) {
      * <p>History: 2.2.6 - experimental
      * @param executor
      *          the executor to wrap
-     * @param interruptibleWorker if {@code true} the tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} will
+     * @param interruptibleWorker if {@code true}, the tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} will
      * be interrupted when the task is disposed.
      * @return the new {@code Scheduler} wrapping the {@code Executor}
      * @since 3.0.0
@@ -532,9 +534,9 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
      * Note that this method returns a new {@code Scheduler} instance, even for the same {@code Executor} instance.
      * @param executor
      *          the executor to wrap
-     * @param interruptibleWorker if {@code true} the tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} will
+     * @param interruptibleWorker if {@code true}, the tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} will
      * be interrupted when the task is disposed.
-     * @param fair if {@code true} tasks submitted to the will be executed by the underlying {@code Executor} one after the other, still
+     * @param fair if {@code true}, tasks submitted to the {@code Scheduler} or {@code Worker} will be executed by the underlying {@code Executor} one after the other, still
      * in a FIFO and non-overlapping manner, but allows interleaving with other tasks submitted to the underlying {@code Executor}.
      * If {@code false}, the underlying FIFO scheme will execute as many tasks as it can before giving up the underlying {@code Executor} thread.
      * @return the new {@code Scheduler} wrapping the {@code Executor}

From 75e7e5010279b535de2b957961d3da561255ebaa Mon Sep 17 00:00:00 2001
From: Zac Sweers <pandanomic@gmail.com>
Date: Fri, 23 Jul 2021 02:42:13 -0400
Subject: [PATCH 294/665] Fix missing NonNull on Observable.map (#7302)

* Fix missing NonNull on Observable.map

I noticed this while testing the upcoming Kotlin 1.5.30-M1 (which has improved support for type-use nullability annotations) https://youtrack.jetbrains.com/issue/KT-47833. This makes `at least match Single, but `Maybe.map` is also missing this. I suspect there are others too.

* Update src/main/java/io/reactivex/rxjava3/core/Observable.java
---
 src/main/java/io/reactivex/rxjava3/core/Observable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 18534eecc7..9869276b12 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -10371,7 +10371,7 @@ public final <R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? s
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
+    public final <@NonNull R> Observable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableMap<>(this, mapper));
     }

From 40ca8eff4a0d6559258489cf282471f5e3b1a229 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 24 Jul 2021 18:35:45 +0200
Subject: [PATCH 295/665] 3.x: Move nullability annotations into the type
 argument declaration (#7303)

* 3.x: Move nullability annotations into the type argument declaration

* Reinforce Function<T, R> return argument type where R is non-trivial
---
 .../reactivex/rxjava3/core/Completable.java   |  38 +-
 .../io/reactivex/rxjava3/core/Flowable.java   | 676 +++++++++---------
 .../java/io/reactivex/rxjava3/core/Maybe.java | 196 ++---
 .../io/reactivex/rxjava3/core/Observable.java | 484 ++++++-------
 .../io/reactivex/rxjava3/core/Single.java     | 172 ++---
 .../BasicIntQueueSubscription.java            |   3 +-
 .../DeferredScalarSubscription.java           |   4 +-
 .../rxjava3/parallel/ParallelFlowable.java    |  66 +-
 .../rxjava3/plugins/RxJavaPlugins.java        |  76 +-
 .../rxjava3/processors/AsyncProcessor.java    |   8 +-
 .../rxjava3/processors/BehaviorProcessor.java |   8 +-
 .../processors/MulticastProcessor.java        |  10 +-
 .../rxjava3/processors/PublishProcessor.java  |   8 +-
 .../rxjava3/processors/ReplayProcessor.java   |  20 +-
 .../rxjava3/processors/UnicastProcessor.java  |  14 +-
 .../rxjava3/subscribers/SafeSubscriber.java   |   2 +-
 .../NonNullMethodTypeArgumentCheck.java       | 147 ++++
 .../validators/SourceAnnotationCheck.java     |  55 +-
 18 files changed, 1093 insertions(+), 894 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/validators/NonNullMethodTypeArgumentCheck.java

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 96eb10c447..2f424fd405 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -630,7 +630,7 @@ public static Completable fromFuture(@NonNull Future<?> future) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Completable fromMaybe(@NonNull MaybeSource<T> maybe) {
+    public static <@NonNull T> Completable fromMaybe(@NonNull MaybeSource<T> maybe) {
         Objects.requireNonNull(maybe, "maybe is null");
         return RxJavaPlugins.onAssembly(new MaybeIgnoreElementCompletable<>(maybe));
     }
@@ -686,7 +686,7 @@ public static Completable fromRunnable(@NonNull Runnable run) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Completable fromObservable(@NonNull ObservableSource<T> observable) {
+    public static <@NonNull T> Completable fromObservable(@NonNull ObservableSource<T> observable) {
         Objects.requireNonNull(observable, "observable is null");
         return RxJavaPlugins.onAssembly(new CompletableFromObservable<>(observable));
     }
@@ -724,7 +724,7 @@ public static <T> Completable fromObservable(@NonNull ObservableSource<T> observ
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Completable fromPublisher(@NonNull Publisher<T> publisher) {
+    public static <@NonNull T> Completable fromPublisher(@NonNull Publisher<T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new CompletableFromPublisher<>(publisher));
     }
@@ -746,7 +746,7 @@ public static <T> Completable fromPublisher(@NonNull Publisher<T> publisher) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Completable fromSingle(@NonNull SingleSource<T> single) {
+    public static <@NonNull T> Completable fromSingle(@NonNull SingleSource<T> single) {
         Objects.requireNonNull(single, "single is null");
         return RxJavaPlugins.onAssembly(new CompletableFromSingle<>(single));
     }
@@ -1225,7 +1225,7 @@ public static Completable switchOnNextDelayError(@NonNull Publisher<@NonNull ? e
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <R> Completable using(@NonNull Supplier<R> resourceSupplier,
+    public static <@NonNull R> Completable using(@NonNull Supplier<R> resourceSupplier,
             @NonNull Function<? super R, ? extends CompletableSource> sourceSupplier,
             @NonNull Consumer<? super R> resourceCleanup) {
         return using(resourceSupplier, sourceSupplier, resourceCleanup, true);
@@ -1261,7 +1261,7 @@ public static <R> Completable using(@NonNull Supplier<R> resourceSupplier,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <R> Completable using(
+    public static <@NonNull R> Completable using(
             @NonNull Supplier<R> resourceSupplier,
             @NonNull Function<? super R, ? extends CompletableSource> sourceSupplier,
             @NonNull Consumer<? super R> resourceCleanup,
@@ -2194,7 +2194,7 @@ public final Completable lift(@NonNull CompletableOperator onLift) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <T> Single<Notification<T>> materialize() {
+    public final <@NonNull T> Single<Notification<T>> materialize() {
         return RxJavaPlugins.onAssembly(new CompletableMaterialize<>(this));
     }
 
@@ -2356,7 +2356,7 @@ public final Completable onErrorResumeWith(@NonNull CompletableSource fallback)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> itemSupplier) {
+    public final <@NonNull T> Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? extends T> itemSupplier) {
         Objects.requireNonNull(itemSupplier, "itemSupplier is null");
         return RxJavaPlugins.onAssembly(new CompletableOnErrorReturn<>(this, itemSupplier));
     }
@@ -2384,7 +2384,7 @@ public final <T> Maybe<T> onErrorReturn(@NonNull Function<? super Throwable, ? e
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Maybe<T> onErrorReturnItem(@NonNull T item) {
+    public final <@NonNull T> Maybe<T> onErrorReturnItem(@NonNull T item) {
         Objects.requireNonNull(item, "item is null");
         return onErrorReturn(Functions.justFunction(item));
     }
@@ -2483,7 +2483,7 @@ public final Completable repeatUntil(@NonNull BooleanSupplier stop) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Completable repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
+    public final Completable repeatWhen(@NonNull Function<? super Flowable<Object>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
         return fromPublisher(toFlowable().repeatWhen(handler));
     }
 
@@ -2655,7 +2655,7 @@ public final Completable retryUntil(@NonNull BooleanSupplier stop) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
+    public final Completable retryWhen(@NonNull Function<? super Flowable<Throwable>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
         return fromPublisher(toFlowable().retryWhen(handler));
     }
 
@@ -2726,7 +2726,7 @@ public final Completable startWith(@NonNull CompletableSource other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public final <T> Flowable<T> startWith(@NonNull SingleSource<T> other) {
+    public final <@NonNull T> Flowable<T> startWith(@NonNull SingleSource<T> other) {
         Objects.requireNonNull(other, "other is null");
         return Flowable.concat(Single.wrap(other).toFlowable(), toFlowable());
     }
@@ -2752,7 +2752,7 @@ public final <T> Flowable<T> startWith(@NonNull SingleSource<T> other) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public final <T> Flowable<T> startWith(@NonNull MaybeSource<T> other) {
+    public final <@NonNull T> Flowable<T> startWith(@NonNull MaybeSource<T> other) {
         Objects.requireNonNull(other, "other is null");
         return Flowable.concat(Maybe.wrap(other).toFlowable(), toFlowable());
     }
@@ -2774,7 +2774,7 @@ public final <T> Flowable<T> startWith(@NonNull MaybeSource<T> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Observable<T> startWith(@NonNull ObservableSource<T> other) {
+    public final <@NonNull T> Observable<T> startWith(@NonNull ObservableSource<T> other) {
         Objects.requireNonNull(other, "other is null");
         return Observable.wrap(other).concatWith(this.toObservable());
     }
@@ -2800,7 +2800,7 @@ public final <T> Observable<T> startWith(@NonNull ObservableSource<T> other) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T> Flowable<T> startWith(@NonNull Publisher<T> other) {
+    public final <@NonNull T> Flowable<T> startWith(@NonNull Publisher<T> other) {
         Objects.requireNonNull(other, "other is null");
         return this.<T>toFlowable().startWith(other);
     }
@@ -3214,7 +3214,7 @@ public final <R> R to(@NonNull CompletableConverter<? extends R> converter) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <T> Flowable<T> toFlowable() {
+    public final <@NonNull T> Flowable<T> toFlowable() {
         if (this instanceof FuseToFlowable) {
             return ((FuseToFlowable<T>)this).fuseToFlowable();
         }
@@ -3259,7 +3259,7 @@ public final Future<Void> toFuture() {
     @SuppressWarnings("unchecked")
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <T> Maybe<T> toMaybe() {
+    public final <@NonNull T> Maybe<T> toMaybe() {
         if (this instanceof FuseToMaybe) {
             return ((FuseToMaybe<T>)this).fuseToMaybe();
         }
@@ -3282,7 +3282,7 @@ public final <T> Maybe<T> toMaybe() {
     @SuppressWarnings("unchecked")
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <T> Observable<T> toObservable() {
+    public final <@NonNull T> Observable<T> toObservable() {
         if (this instanceof FuseToObservable) {
             return ((FuseToObservable<T>)this).fuseToObservable();
         }
@@ -3469,7 +3469,7 @@ public static Completable fromCompletionStage(@NonNull CompletionStage<?> stage)
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <T> CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
+    public final <@Nullable T> CompletionStage<T> toCompletionStage(T defaultItem) {
         return subscribeWith(new CompletionStageConsumer<>(true, defaultItem));
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index d22d8dc4dc..31827d9e1c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -193,7 +193,7 @@ public abstract class Flowable<@NonNull T> implements Publisher<T> {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> amb(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> amb(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableAmb<>(null, sources));
     }
@@ -232,7 +232,7 @@ public static <T> Flowable<T> amb(@NonNull Iterable<@NonNull ? extends Publisher
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> ambArray(@NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> ambArray(@NonNull Publisher<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         int len = sources.length;
         if (len == 0) {
@@ -296,7 +296,7 @@ public static int bufferSize() {
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, @NonNull R> Flowable<R> combineLatestArray(@NonNull Publisher<@NonNull ? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner) {
+    public static <@NonNull T, @NonNull R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestArray(sources, combiner, bufferSize());
     }
 
@@ -344,7 +344,7 @@ public static int bufferSize() {
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<@NonNull ? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
+    public static <@NonNull T, @NonNull R> Flowable<R> combineLatestArray(@NonNull Publisher<? extends T>[] sources, @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -395,7 +395,7 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<@NonNull
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, @NonNull R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
+    public static <@NonNull T, @NonNull R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatest(sources, combiner, bufferSize());
     }
@@ -444,7 +444,7 @@ public static <T, R> Flowable<R> combineLatestArray(@NonNull Publisher<@NonNull
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
+    public static <@NonNull T, @NonNull R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -493,7 +493,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? exte
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<@NonNull ? extends T>[] sources,
+    public static <@NonNull T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestArrayDelayError(sources, combiner, bufferSize());
     }
@@ -543,7 +543,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? exte
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<@NonNull ? extends T>[] sources,
+    public static <@NonNull T, @NonNull R> Flowable<R> combineLatestArrayDelayError(@NonNull Publisher<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -596,7 +596,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? exte
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
+    public static <@NonNull T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestDelayError(sources, combiner, bufferSize());
     }
@@ -646,7 +646,7 @@ public static <T, R> Flowable<R> combineLatest(@NonNull Iterable<@NonNull ? exte
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
+    public static <@NonNull T, @NonNull R> Flowable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -691,8 +691,8 @@ public static <T, R> Flowable<R> combineLatestDelayError(@NonNull Iterable<@NonN
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, R> Flowable<R> combineLatest(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Flowable<R> combineLatest(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -740,9 +740,9 @@ public static <T1, T2, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, R> Flowable<R> combineLatest(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
-            @NonNull Publisher<@NonNull ? extends T3> source3,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull R> Flowable<R> combineLatest(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3,
             @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -795,9 +795,9 @@ public static <T1, T2, T3, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
-            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull R> Flowable<R> combineLatest(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
             @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -854,10 +854,10 @@ public static <T1, T2, T3, T4, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
-            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
-            @NonNull Publisher<@NonNull ? extends T5> source5,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull R> Flowable<R> combineLatest(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5,
             @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -918,10 +918,10 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
-            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
-            @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull R> Flowable<R> combineLatest(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
             @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -987,11 +987,11 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
-            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
-            @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
-            @NonNull Publisher<@NonNull ? extends T7> source7,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull R> Flowable<R> combineLatest(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7,
             @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1061,11 +1061,11 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
-            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
-            @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
-            @NonNull Publisher<@NonNull ? extends T7> source7, @NonNull Publisher<@NonNull ? extends T8> source8,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull R> Flowable<R> combineLatest(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8,
             @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1140,12 +1140,12 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
-            @NonNull Publisher<@NonNull ? extends T3> source3, @NonNull Publisher<@NonNull ? extends T4> source4,
-            @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
-            @NonNull Publisher<@NonNull ? extends T7> source7, @NonNull Publisher<@NonNull ? extends T8> source8,
-            @NonNull Publisher<@NonNull ? extends T9> source9,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull T9, @NonNull R> Flowable<R> combineLatest(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
+            @NonNull Publisher<? extends T3> source3, @NonNull Publisher<? extends T4> source4,
+            @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8,
+            @NonNull Publisher<? extends T9> source9,
             @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1184,7 +1184,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> combineLatest(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         // unlike general sources, fromIterable can only throw on a boundary because it is consumed only there
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, 2);
@@ -1216,7 +1216,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends Publis
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources) {
         return concat(sources, bufferSize());
     }
 
@@ -1250,7 +1250,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publi
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int prefetch) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources, int prefetch) {
         return fromPublisher(sources).concatMap((Function)Functions.identity(), prefetch);
     }
 
@@ -1282,7 +1282,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Publi
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
@@ -1318,9 +1318,9 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends T> so
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(
-            @NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
-            @NonNull Publisher<@NonNull ? extends T> source3) {
+    public static <@NonNull T> Flowable<T> concat(
+            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull Publisher<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1359,9 +1359,9 @@ public static <T> Flowable<T> concat(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(
-            @NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
-            @NonNull Publisher<@NonNull ? extends T> source3, @NonNull Publisher<@NonNull ? extends T> source4) {
+    public static <@NonNull T> Flowable<T> concat(
+            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull Publisher<? extends T> source3, @NonNull Publisher<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -1394,7 +1394,7 @@ public static <T> Flowable<T> concat(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArray(@NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArray(@NonNull Publisher<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -1429,7 +1429,7 @@ public static <T> Flowable<T> concatArray(@NonNull Publisher<@NonNull ? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArrayDelayError(@NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayDelayError(@NonNull Publisher<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -1468,7 +1468,7 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull Publisher<@NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArrayEager(@NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayEager(@NonNull Publisher<? extends T>... sources) {
         return concatArrayEager(bufferSize(), bufferSize(), sources);
     }
 
@@ -1505,7 +1505,7 @@ public static <T> Flowable<T> concatArrayEager(@NonNull Publisher<@NonNull ? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch, @NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch, @NonNull Publisher<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1541,7 +1541,7 @@ public static <T> Flowable<T> concatArrayEager(int maxConcurrency, int prefetch,
     @BackpressureSupport(BackpressureKind.FULL)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<? extends T>... sources) {
         return concatArrayEagerDelayError(bufferSize(), bufferSize(), sources);
     }
 
@@ -1579,7 +1579,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull Publisher<@Non
     @BackpressureSupport(BackpressureKind.FULL)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int prefetch, @NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int prefetch, @NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, prefetch);
     }
 
@@ -1607,7 +1607,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(int maxConcurrency, int
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity());
     }
@@ -1632,7 +1632,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? exte
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources) {
         return concatDelayError(sources, bufferSize(), true);
     }
 
@@ -1661,7 +1661,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int prefetch, boolean tillTheEnd) {
+    public static <@NonNull T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources, int prefetch, boolean tillTheEnd) {
         return fromPublisher(sources).concatMapDelayError((Function)Functions.identity(), tillTheEnd, prefetch);
     }
 
@@ -1691,7 +1691,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1727,7 +1727,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends P
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1760,7 +1760,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends P
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1796,7 +1796,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1830,7 +1830,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources) {
         return concatEagerDelayError(sources, bufferSize(), bufferSize());
     }
 
@@ -1867,7 +1867,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1901,7 +1901,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources) {
         return concatEagerDelayError(sources, bufferSize(), bufferSize());
     }
 
@@ -1938,7 +1938,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "rawtypes", "unchecked" })
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int prefetch) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -2003,7 +2003,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @NonNull BackpressureStrategy mode) {
+    public static <@NonNull T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @NonNull BackpressureStrategy mode) {
         Objects.requireNonNull(source, "source is null");
         Objects.requireNonNull(mode, "mode is null");
         return RxJavaPlugins.onAssembly(new FlowableCreate<>(source, mode));
@@ -2040,7 +2040,7 @@ public static <T> Flowable<T> create(@NonNull FlowableOnSubscribe<T> source, @No
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<@NonNull ? extends T>> supplier) {
+    public static <@NonNull T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableDefer<>(supplier));
     }
@@ -2067,7 +2067,7 @@ public static <T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<@NonNu
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     @NonNull
-    public static <T> Flowable<T> empty() {
+    public static <@NonNull T> Flowable<T> empty() {
         return RxJavaPlugins.onAssembly((Flowable<T>) FlowableEmpty.INSTANCE);
     }
 
@@ -2095,7 +2095,7 @@ public static <T> Flowable<T> empty() {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+    public static <@NonNull T> Flowable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableError<>(supplier));
     }
@@ -2124,7 +2124,7 @@ public static <T> Flowable<T> error(@NonNull Supplier<? extends Throwable> suppl
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> error(@NonNull Throwable throwable) {
+    public static <@NonNull T> Flowable<T> error(@NonNull Throwable throwable) {
         Objects.requireNonNull(throwable, "throwable is null");
         return error(Functions.justSupplier(throwable));
     }
@@ -2157,7 +2157,7 @@ public static <T> Flowable<T> error(@NonNull Throwable throwable) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public static <T> Flowable<T> fromAction(@NonNull Action action) {
+    public static <@NonNull T> Flowable<T> fromAction(@NonNull Action action) {
         Objects.requireNonNull(action, "action is null");
         return RxJavaPlugins.onAssembly(new FlowableFromAction<>(action));
     }
@@ -2259,7 +2259,7 @@ public static <T> Flowable<T> fromAction(@NonNull Action action) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public static <T> Flowable<T> fromCompletable(@NonNull CompletableSource completableSource) {
+    public static <@NonNull T> Flowable<T> fromCompletable(@NonNull CompletableSource completableSource) {
         Objects.requireNonNull(completableSource, "completableSource is null");
         return RxJavaPlugins.onAssembly(new FlowableFromCompletable<>(completableSource));
     }
@@ -2379,7 +2379,7 @@ public static <T> Flowable<T> fromCompletable(@NonNull CompletableSource complet
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Flowable<T> fromIterable(@NonNull Iterable<@NonNull ? extends T> source) {
+    public static <@NonNull T> Flowable<T> fromIterable(@NonNull Iterable<? extends T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new FlowableFromIterable<>(source));
     }
@@ -2406,7 +2406,7 @@ public static <T> Flowable<T> fromCompletable(@NonNull CompletableSource complet
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T> Flowable<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
+    public static <@NonNull T> Flowable<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
         Objects.requireNonNull(maybe, "maybe is null");
         return RxJavaPlugins.onAssembly(new MaybeToFlowable<>(maybe));
     }
@@ -2454,7 +2454,7 @@ public static <T> Flowable<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> fromObservable(@NonNull ObservableSource<T> source, @NonNull BackpressureStrategy strategy) {
+    public static <@NonNull T> Flowable<T> fromObservable(@NonNull ObservableSource<T> source, @NonNull BackpressureStrategy strategy) {
         Objects.requireNonNull(source, "source is null");
         Objects.requireNonNull(strategy, "strategy is null");
         Flowable<T> f = new FlowableFromObservable<>(source);
@@ -2504,7 +2504,7 @@ public static <T> Flowable<T> fromObservable(@NonNull ObservableSource<T> source
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
-    public static <T> Flowable<T> fromPublisher(@NonNull Publisher<@NonNull ? extends T> publisher) {
+    public static <@NonNull T> Flowable<T> fromPublisher(@NonNull Publisher<? extends T> publisher) {
         if (publisher instanceof Flowable) {
             return RxJavaPlugins.onAssembly((Flowable<T>)publisher);
         }
@@ -2547,7 +2547,7 @@ public static <T> Flowable<T> fromPublisher(@NonNull Publisher<@NonNull ? extend
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public static <T> Flowable<T> fromRunnable(@NonNull Runnable run) {
+    public static <@NonNull T> Flowable<T> fromRunnable(@NonNull Runnable run) {
         Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new FlowableFromRunnable<>(run));
     }
@@ -2573,7 +2573,7 @@ public static <T> Flowable<T> fromRunnable(@NonNull Runnable run) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T> Flowable<T> fromSingle(@NonNull SingleSource<T> source) {
+    public static <@NonNull T> Flowable<T> fromSingle(@NonNull SingleSource<T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new SingleToFlowable<>(source));
     }
@@ -2646,7 +2646,7 @@ public static <T> Flowable<T> fromSingle(@NonNull SingleSource<T> source) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> generate(@NonNull Consumer<@NonNull Emitter<T>> generator) {
+    public static <@NonNull T> Flowable<T> generate(@NonNull Consumer<@NonNull Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(Functions.nullSupplier(),
                 FlowableInternalHelper.simpleGenerator(generator),
@@ -2681,7 +2681,7 @@ public static <T> Flowable<T> generate(@NonNull Consumer<@NonNull Emitter<T>> ge
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, Emitter<T>> generator) {
+    public static <@NonNull T, @NonNull S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, FlowableInternalHelper.simpleBiGenerator(generator),
                 Functions.emptyConsumer());
@@ -2717,7 +2717,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, Emitter<T>> generator,
+    public static <@NonNull T, @NonNull S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, Emitter<T>> generator,
             @NonNull Consumer<? super S> disposeState) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, FlowableInternalHelper.simpleBiGenerator(generator), disposeState);
@@ -2752,7 +2752,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, @NonNull Emitter<T>, S> generator) {
+    public static <@NonNull T, @NonNull S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, @NonNull Emitter<T>, S> generator) {
         return generate(initialState, generator, Functions.emptyConsumer());
     }
 
@@ -2787,7 +2787,7 @@ public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @No
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, @NonNull Emitter<T>, S> generator, @NonNull Consumer<? super S> disposeState) {
+    public static <@NonNull T, @NonNull S> Flowable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, @NonNull Emitter<T>, S> generator, @NonNull Consumer<? super S> disposeState) {
         Objects.requireNonNull(initialState, "initialState is null");
         Objects.requireNonNull(generator, "generator is null");
         Objects.requireNonNull(disposeState, "disposeState is null");
@@ -3494,7 +3494,7 @@ public static Flowable<Long> intervalRange(long start, long count, long initialD
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -3547,7 +3547,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publish
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -3592,7 +3592,7 @@ public static <T> Flowable<T> mergeArray(int maxConcurrency, int bufferSize, @No
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity());
     }
 
@@ -3642,7 +3642,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publish
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), maxConcurrency);
     }
 
@@ -3688,7 +3688,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends Publish
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources) {
         return merge(sources, bufferSize());
     }
 
@@ -3740,7 +3740,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publis
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency) {
         return fromPublisher(sources).flatMap((Function)Functions.identity(), maxConcurrency);
     }
 
@@ -3786,7 +3786,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Publis
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArray(@NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> mergeArray(@NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), sources.length);
     }
 
@@ -3833,7 +3833,7 @@ public static <T> Flowable<T> mergeArray(@NonNull Publisher<@NonNull ? extends T
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), false, 2);
@@ -3884,7 +3884,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> sou
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2, @NonNull Publisher<@NonNull ? extends T> source3) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2, @NonNull Publisher<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3938,9 +3938,9 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends T> sou
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(
-            @NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
-            @NonNull Publisher<@NonNull ? extends T> source3, @NonNull Publisher<@NonNull ? extends T> source4) {
+    public static <@NonNull T> Flowable<T> merge(
+            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull Publisher<? extends T> source3, @NonNull Publisher<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -3981,7 +3981,7 @@ public static <T> Flowable<T> merge(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true);
     }
 
@@ -4023,7 +4023,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -4066,7 +4066,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, @NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, @NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -4106,7 +4106,7 @@ public static <T> Flowable<T> mergeArrayDelayError(int maxConcurrency, int buffe
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency);
     }
 
@@ -4143,7 +4143,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources) {
         return mergeDelayError(sources, bufferSize());
     }
 
@@ -4185,7 +4185,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources, int maxConcurrency) {
         return fromPublisher(sources).flatMap((Function)Functions.identity(), true, maxConcurrency);
     }
 
@@ -4223,7 +4223,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, sources.length);
     }
 
@@ -4262,7 +4262,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull Publisher<@NonNull ?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), true, 2);
@@ -4306,7 +4306,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2, @NonNull Publisher<@NonNull ? extends T> source3) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2, @NonNull Publisher<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -4353,9 +4353,9 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(
-            @NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
-            @NonNull Publisher<@NonNull ? extends T> source3, @NonNull Publisher<@NonNull ? extends T> source4) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(
+            @NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
+            @NonNull Publisher<? extends T> source3, @NonNull Publisher<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         Objects.requireNonNull(source3, "source3 is null");
@@ -4386,7 +4386,7 @@ public static <T> Flowable<T> mergeDelayError(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     @NonNull
-    public static <T> Flowable<T> never() {
+    public static <@NonNull T> Flowable<T> never() {
         return RxJavaPlugins.onAssembly((Flowable<T>) FlowableNever.INSTANCE);
     }
 
@@ -4506,7 +4506,7 @@ public static Flowable<Long> rangeLong(long start, long count) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2) {
+    public static <@NonNull T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize());
     }
 
@@ -4540,7 +4540,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
+    public static <@NonNull T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
             @NonNull BiPredicate<? super T, ? super T> isEqual) {
         return sequenceEqual(source1, source2, isEqual, bufferSize());
     }
@@ -4578,7 +4578,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2,
+    public static <@NonNull T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2,
             @NonNull BiPredicate<? super T, ? super T> isEqual, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -4617,7 +4617,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? extends T> source1, @NonNull Publisher<@NonNull ? extends T> source2, int bufferSize) {
+    public static <@NonNull T> Single<Boolean> sequenceEqual(@NonNull Publisher<? extends T> source1, @NonNull Publisher<? extends T> source2, int bufferSize) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize);
     }
 
@@ -4659,7 +4659,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull Publisher<@NonNull ? ex
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int bufferSize) {
+    public static <@NonNull T> Flowable<T> switchOnNext(@NonNull Publisher<? extends Publisher<? extends T>> sources, int bufferSize) {
         return fromPublisher(sources).switchMap((Function)Functions.identity(), bufferSize);
     }
 
@@ -4698,7 +4698,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources) {
         return fromPublisher(sources).switchMap((Function)Functions.identity());
     }
 
@@ -4738,7 +4738,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources) {
         return switchOnNextDelayError(sources, bufferSize());
     }
 
@@ -4781,8 +4781,8 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, int prefetch) {
-        return fromPublisher(sources).switchMapDelayError(Functions.<Publisher<@NonNull ? extends T>>identity(), prefetch);
+    public static <@NonNull T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends Publisher<? extends T>> sources, int prefetch) {
+        return fromPublisher(sources).switchMapDelayError(Functions.<Publisher<? extends T>>identity(), prefetch);
     }
 
     /**
@@ -4870,7 +4870,7 @@ public static Flowable<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull
     @NonNull
     @BackpressureSupport(BackpressureKind.NONE)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
+    public static <@NonNull T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         if (onSubscribe instanceof Flowable) {
             throw new IllegalArgumentException("unsafeCreate(Flowable) should be upgraded");
@@ -4908,9 +4908,9 @@ public static <T> Flowable<T> unsafeCreate(@NonNull Publisher<T> onSubscribe) {
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, D> Flowable<T> using(
+    public static <@NonNull T, @NonNull D> Flowable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
-            @NonNull Function<? super D, ? extends Publisher<@NonNull ? extends T>> sourceSupplier,
+            @NonNull Function<? super D, @NonNull ? extends Publisher<? extends T>> sourceSupplier,
             @NonNull Consumer<? super D> resourceCleanup) {
         return using(resourceSupplier, sourceSupplier, resourceCleanup, true);
     }
@@ -4951,9 +4951,9 @@ public static <T, D> Flowable<T> using(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, D> Flowable<T> using(
+    public static <@NonNull T, @NonNull D> Flowable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
-            @NonNull Function<? super D, ? extends Publisher<@NonNull ? extends T>> sourceSupplier,
+            @NonNull Function<? super D, @NonNull ? extends Publisher<? extends T>> sourceSupplier,
             @NonNull Consumer<? super D> resourceCleanup,
             boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
@@ -5011,7 +5011,7 @@ public static <T, D> Flowable<T> using(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
+    public static <@NonNull T, @NonNull R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableZip<>(null, sources, zipper, bufferSize(), false));
@@ -5072,7 +5072,7 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publis
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ? extends T>> sources,
+    public static <@NonNull T, @NonNull R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publisher<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> zipper, boolean delayError,
             int bufferSize) {
         Objects.requireNonNull(zipper, "zipper is null");
@@ -5134,8 +5134,8 @@ public static <T, R> Flowable<R> zip(@NonNull Iterable<@NonNull ? extends Publis
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5197,8 +5197,8 @@ public static <T1, T2, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5262,8 +5262,8 @@ public static <T1, T2, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2,
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5328,8 +5328,8 @@ public static <T1, T2, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
             @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5399,9 +5399,9 @@ public static <T1, T2, T3, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
-            @NonNull Publisher<@NonNull ? extends T4> source4,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4,
             @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5475,9 +5475,9 @@ public static <T1, T2, T3, T4, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
-            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5,
             @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5555,9 +5555,9 @@ public static <T1, T2, T3, T4, T5, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
-            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
             @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5639,10 +5639,10 @@ public static <T1, T2, T3, T4, T5, T6, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
-            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
-            @NonNull Publisher<@NonNull ? extends T7> source7,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7,
             @NonNull Function7<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5728,10 +5728,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
-            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
-            @NonNull Publisher<@NonNull ? extends T7> source7, @NonNull Publisher<@NonNull ? extends T8> source8,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8,
             @NonNull Function8<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -5822,10 +5822,10 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Flowable<R> zip(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
-            @NonNull Publisher<@NonNull ? extends T1> source1, @NonNull Publisher<@NonNull ? extends T2> source2, @NonNull Publisher<@NonNull ? extends T3> source3,
-            @NonNull Publisher<@NonNull ? extends T4> source4, @NonNull Publisher<@NonNull ? extends T5> source5, @NonNull Publisher<@NonNull ? extends T6> source6,
-            @NonNull Publisher<@NonNull ? extends T7> source7, @NonNull Publisher<@NonNull ? extends T8> source8, @NonNull Publisher<@NonNull ? extends T9> source9,
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull T9, @NonNull R> Flowable<R> zip(
+            @NonNull Publisher<? extends T1> source1, @NonNull Publisher<? extends T2> source2, @NonNull Publisher<? extends T3> source3,
+            @NonNull Publisher<? extends T4> source4, @NonNull Publisher<? extends T5> source5, @NonNull Publisher<? extends T6> source6,
+            @NonNull Publisher<? extends T7> source7, @NonNull Publisher<? extends T8> source8, @NonNull Publisher<? extends T9> source9,
             @NonNull Function9<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? super T7, ? super T8, ? super T9, ? extends R> zipper) {
 
         Objects.requireNonNull(source1, "source1 is null");
@@ -5897,8 +5897,8 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Flowable<R> zip(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T, R> Flowable<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper,
-            boolean delayError, int bufferSize, @NonNull Publisher<@NonNull ? extends T>... sources) {
+    public static <@NonNull T, @NonNull R> Flowable<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper,
+            boolean delayError, int bufferSize, @NonNull Publisher<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -5973,7 +5973,7 @@ public final Single<Boolean> all(@NonNull Predicate<? super T> predicate) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> ambWith(@NonNull Publisher<@NonNull ? extends T> other) {
+    public final Flowable<T> ambWith(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return ambArray(this, other);
     }
@@ -6681,7 +6681,7 @@ public final void blockingSubscribe(@NonNull Consumer<? super T> onNext, @NonNul
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void blockingSubscribe(@NonNull Subscriber<@NonNull ? super T> subscriber) {
+    public final void blockingSubscribe(@NonNull Subscriber<? super T> subscriber) {
         Objects.requireNonNull(subscriber, "subscriber is null");
         FlowableBlockingSubscribe.subscribe(this, subscriber);
     }
@@ -6788,7 +6788,7 @@ public final Flowable<List<T>> buffer(int count, int skip) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int skip, @NonNull Supplier<U> bufferSupplier) {
+    public final <@NonNull U extends Collection<? super T>> Flowable<U> buffer(int count, int skip, @NonNull Supplier<U> bufferSupplier) {
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(skip, "skip");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
@@ -6827,7 +6827,7 @@ public final <U extends Collection<? super T>> Flowable<U> buffer(int count, int
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U extends Collection<? super T>> Flowable<U> buffer(int count, @NonNull Supplier<U> bufferSupplier) {
+    public final <@NonNull U extends Collection<? super T>> Flowable<U> buffer(int count, @NonNull Supplier<U> bufferSupplier) {
         return buffer(count, count, bufferSupplier);
     }
 
@@ -6942,7 +6942,7 @@ public final Flowable<List<T>> buffer(long timespan, long timeskip, @NonNull Tim
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <U extends Collection<? super T>> Flowable<U> buffer(long timespan, long timeskip, @NonNull TimeUnit unit,
+    public final <@NonNull U extends Collection<? super T>> Flowable<U> buffer(long timespan, long timeskip, @NonNull TimeUnit unit,
             @NonNull Scheduler scheduler, @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -7103,7 +7103,7 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final <U extends Collection<? super T>> Flowable<U> buffer(
+    public final <@NonNull U extends Collection<? super T>> Flowable<U> buffer(
             long timespan, @NonNull TimeUnit unit,
             @NonNull Scheduler scheduler, int count,
             @NonNull Supplier<U> bufferSupplier,
@@ -7182,9 +7182,9 @@ public final Flowable<List<T>> buffer(long timespan, @NonNull TimeUnit unit, @No
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <TOpening, TClosing> Flowable<List<T>> buffer(
-            @NonNull Publisher<@NonNull ? extends TOpening> openingIndicator,
-            @NonNull Function<? super TOpening, ? extends Publisher<@NonNull ? extends TClosing>> closingIndicator) {
+    public final <@NonNull TOpening, @NonNull TClosing> Flowable<List<T>> buffer(
+            @NonNull Publisher<? extends TOpening> openingIndicator,
+            @NonNull Function<? super TOpening, @NonNull ? extends Publisher<? extends TClosing>> closingIndicator) {
         return buffer(openingIndicator, closingIndicator, ArrayListSupplier.asSupplier());
     }
 
@@ -7223,9 +7223,9 @@ public final <TOpening, TClosing> Flowable<List<T>> buffer(
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> buffer(
-            @NonNull Publisher<@NonNull ? extends TOpening> openingIndicator,
-            @NonNull Function<? super TOpening, ? extends Publisher<@NonNull ? extends TClosing>> closingIndicator,
+    public final <@NonNull TOpening, @NonNull TClosing, @NonNull U extends Collection<? super T>> Flowable<U> buffer(
+            @NonNull Publisher<? extends TOpening> openingIndicator,
+            @NonNull Function<? super TOpening, @NonNull ? extends Publisher<? extends TClosing>> closingIndicator,
             @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
         Objects.requireNonNull(closingIndicator, "closingIndicator is null");
@@ -7264,7 +7264,7 @@ public final <TOpening, TClosing, U extends Collection<? super T>> Flowable<U> b
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator) {
+    public final <@NonNull B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator) {
         return buffer(boundaryIndicator, ArrayListSupplier.asSupplier());
     }
 
@@ -7302,7 +7302,7 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator, int initialCapacity) {
+    public final <@NonNull B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicator, int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
         return buffer(boundaryIndicator, Functions.createArrayList(initialCapacity));
     }
@@ -7342,7 +7342,7 @@ public final <B> Flowable<List<T>> buffer(@NonNull Publisher<B> boundaryIndicato
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B, U extends Collection<? super T>> Flowable<U> buffer(@NonNull Publisher<B> boundaryIndicator, @NonNull Supplier<U> bufferSupplier) {
+    public final <@NonNull B, @NonNull U extends Collection<? super T>> Flowable<U> buffer(@NonNull Publisher<B> boundaryIndicator, @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableBufferExactBoundary<>(this, boundaryIndicator, bufferSupplier));
@@ -7499,7 +7499,7 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
+    public final <@NonNull U> Flowable<U> cast(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
@@ -7538,7 +7538,7 @@ public final <U> Flowable<U> cast(@NonNull Class<U> clazz) {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
+    public final <@NonNull U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
         Objects.requireNonNull(initialItemSupplier, "initialItemSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new FlowableCollectSingle<>(this, initialItemSupplier, collector));
@@ -7610,7 +7610,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? extends R> composer) {
+    public final <@NonNull R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? extends R> composer) {
         return fromPublisher(((FlowableTransformer<T, R>) Objects.requireNonNull(composer, "composer is null")).apply(this));
     }
 
@@ -7647,7 +7647,7 @@ public final <R> Flowable<R> compose(@NonNull FlowableTransformer<? super T, ? e
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> concatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         return concatMap(mapper, 2);
     }
 
@@ -7688,7 +7688,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int prefetch) {
+    public final <@NonNull R> Flowable<R> concatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         if (this instanceof ScalarSupplier) {
@@ -7742,7 +7742,7 @@ public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Pu
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> concatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int prefetch, @NonNull Scheduler scheduler) {
+    public final <@NonNull R> Flowable<R> concatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, int prefetch, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -7953,7 +7953,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         return concatMapDelayError(mapper, true, 2);
     }
 
@@ -7994,7 +7994,7 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -8048,7 +8048,7 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd, int prefetch, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -8081,7 +8081,7 @@ public final <R> Flowable<R> concatMapDelayError(@NonNull Function<? super T, ?
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> concatMapEager(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         return concatMapEager(mapper, bufferSize(), bufferSize());
     }
 
@@ -8113,7 +8113,7 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> Flowable<R> concatMapEager(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
             int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -8149,7 +8149,7 @@ public final <R> Flowable<R> concatMapEager(@NonNull Function<? super T, ? exten
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd) {
         return concatMapEagerDelayError(mapper, tillTheEnd, bufferSize(), bufferSize());
     }
@@ -8187,7 +8187,7 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
             boolean tillTheEnd, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -8221,7 +8221,7 @@ public final <R> Flowable<R> concatMapEagerDelayError(@NonNull Function<? super
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
+    public final <@NonNull U> Flowable<U> concatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         return concatMapIterable(mapper, 2);
     }
 
@@ -8254,7 +8254,7 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper, int prefetch) {
+    public final <@NonNull U> Flowable<U> concatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<>(this, mapper, prefetch));
@@ -8289,7 +8289,7 @@ public final <U> Flowable<U> concatMapIterable(@NonNull Function<? super T, ? ex
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return concatMapMaybe(mapper, 2);
     }
 
@@ -8327,7 +8327,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
+    public final <@NonNull R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
@@ -8362,7 +8362,7 @@ public final <R> Flowable<R> concatMapMaybe(@NonNull Function<? super T, ? exten
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return concatMapMaybeDelayError(mapper, true, 2);
     }
 
@@ -8401,7 +8401,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd) {
+    public final <@NonNull R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd) {
         return concatMapMaybeDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -8444,7 +8444,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
+    public final <@NonNull R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybe<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
@@ -8479,7 +8479,7 @@ public final <R> Flowable<R> concatMapMaybeDelayError(@NonNull Function<? super
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return concatMapSingle(mapper, 2);
     }
 
@@ -8517,7 +8517,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
+    public final <@NonNull R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle<>(this, mapper, ErrorMode.IMMEDIATE, prefetch));
@@ -8552,7 +8552,7 @@ public final <R> Flowable<R> concatMapSingle(@NonNull Function<? super T, ? exte
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return concatMapSingleDelayError(mapper, true, 2);
     }
 
@@ -8591,7 +8591,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd) {
+    public final <@NonNull R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd) {
         return concatMapSingleDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -8634,7 +8634,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
+    public final <@NonNull R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapSingle<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, prefetch));
@@ -8664,7 +8664,7 @@ public final <R> Flowable<R> concatMapSingleDelayError(@NonNull Function<? super
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> concatWith(@NonNull Publisher<@NonNull ? extends T> other) {
+    public final Flowable<T> concatWith(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return concat(this, other);
     }
@@ -8838,7 +8838,7 @@ public final Single<Long> count() {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> debounce(@NonNull Function<? super T, ? extends Publisher<U>> debounceIndicator) {
+    public final <@NonNull U> Flowable<T> debounce(@NonNull Function<? super T, @NonNull ? extends Publisher<U>> debounceIndicator) {
         Objects.requireNonNull(debounceIndicator, "debounceIndicator is null");
         return RxJavaPlugins.onAssembly(new FlowableDebounce<>(this, debounceIndicator));
     }
@@ -8994,7 +8994,7 @@ public final Flowable<T> defaultIfEmpty(@NonNull T defaultItem) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> delay(@NonNull Function<? super T, ? extends Publisher<U>> itemDelayIndicator) {
+    public final <@NonNull U> Flowable<T> delay(@NonNull Function<? super T, @NonNull ? extends Publisher<U>> itemDelayIndicator) {
         Objects.requireNonNull(itemDelayIndicator, "itemDelayIndicator is null");
         return flatMap(FlowableInternalHelper.itemDelay(itemDelayIndicator));
     }
@@ -9160,8 +9160,8 @@ public final Flowable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Sched
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Flowable<T> delay(@NonNull Publisher<U> subscriptionIndicator,
-            @NonNull Function<? super T, ? extends Publisher<V>> itemDelayIndicator) {
+    public final <@NonNull U, @NonNull V> Flowable<T> delay(@NonNull Publisher<U> subscriptionIndicator,
+            @NonNull Function<? super T, @NonNull ? extends Publisher<V>> itemDelayIndicator) {
         return delaySubscription(subscriptionIndicator).delay(itemDelayIndicator);
     }
 
@@ -9187,7 +9187,7 @@ public final <U, V> Flowable<T> delay(@NonNull Publisher<U> subscriptionIndicato
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptionIndicator) {
+    public final <@NonNull U> Flowable<T> delaySubscription(@NonNull Publisher<U> subscriptionIndicator) {
         Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
         return RxJavaPlugins.onAssembly(new FlowableDelaySubscriptionOther<>(this, subscriptionIndicator));
     }
@@ -9303,7 +9303,7 @@ public final Flowable<T> delaySubscription(long time, @NonNull TimeUnit unit, @N
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T, @NonNull Notification<R>> selector) {
+    public final <@NonNull R> Flowable<R> dematerialize(@NonNull Function<@NonNull ? super T, @NonNull Notification<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
         return RxJavaPlugins.onAssembly(new FlowableDematerialize<>(this, selector));
     }
@@ -9390,7 +9390,7 @@ public final Flowable<T> distinct() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelector) {
+    public final <@NonNull K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelector) {
         return distinct(keySelector, Functions.createHashSet());
     }
 
@@ -9426,7 +9426,7 @@ public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelecto
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelector,
+    public final <@NonNull K> Flowable<T> distinct(@NonNull Function<? super T, K> keySelector,
             @NonNull Supplier<? extends Collection<? super K>> collectionSupplier) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
@@ -9517,7 +9517,7 @@ public final Flowable<T> distinctUntilChanged() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K> keySelector) {
+    public final <@NonNull K> Flowable<T> distinctUntilChanged(@NonNull Function<? super T, K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         return RxJavaPlugins.onAssembly(new FlowableDistinctUntilChanged<>(this, keySelector, ObjectHelper.equalsPredicate()));
     }
@@ -9806,7 +9806,7 @@ public final Flowable<T> doOnEach(@NonNull Consumer<@NonNull ? super Notificatio
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> doOnEach(@NonNull Subscriber<@NonNull ? super T> subscriber) {
+    public final Flowable<T> doOnEach(@NonNull Subscriber<? super T> subscriber) {
         Objects.requireNonNull(subscriber, "subscriber is null");
         return doOnEach(
                 FlowableInternalHelper.subscriberOnNext(subscriber),
@@ -10221,7 +10221,7 @@ public final Single<T> firstOrError() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         return flatMap(mapper, false, bufferSize(), bufferSize());
     }
 
@@ -10256,7 +10256,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, boolean delayErrors) {
+    public final <@NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, boolean delayErrors) {
         return flatMap(mapper, delayErrors, bufferSize(), bufferSize());
     }
 
@@ -10293,7 +10293,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int maxConcurrency) {
+    public final <@NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, int maxConcurrency) {
         return flatMap(mapper, false, maxConcurrency, bufferSize());
     }
 
@@ -10333,7 +10333,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
+    public final <@NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, delayErrors, maxConcurrency, bufferSize());
     }
 
@@ -10375,7 +10375,7 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
             boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -10424,10 +10424,10 @@ public final <R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> onNextMapper,
-            @NonNull Function<? super Throwable, ? extends Publisher<@NonNull ? extends R>> onErrorMapper,
-            @NonNull Supplier<? extends Publisher<@NonNull ? extends R>> onCompleteSupplier) {
+    public final <@NonNull R> Flowable<R> flatMap(
+            @NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> onNextMapper,
+            @NonNull Function<? super Throwable, @NonNull ? extends Publisher<? extends R>> onErrorMapper,
+            @NonNull Supplier<? extends Publisher<? extends R>> onCompleteSupplier) {
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
         Objects.requireNonNull(onCompleteSupplier, "onCompleteSupplier is null");
@@ -10472,10 +10472,10 @@ public final <R> Flowable<R> flatMap(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> onNextMapper,
-            @NonNull Function<Throwable, ? extends Publisher<@NonNull ? extends R>> onErrorMapper,
-            @NonNull Supplier<? extends Publisher<@NonNull ? extends R>> onCompleteSupplier,
+    public final <@NonNull R> Flowable<R> flatMap(
+            @NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> onNextMapper,
+            @NonNull Function<Throwable, @NonNull ? extends Publisher<? extends R>> onErrorMapper,
+            @NonNull Supplier<? extends Publisher<? extends R>> onCompleteSupplier,
             int maxConcurrency) {
         Objects.requireNonNull(onNextMapper, "onNextMapper is null");
         Objects.requireNonNull(onErrorMapper, "onErrorMapper is null");
@@ -10516,7 +10516,7 @@ public final <R> Flowable<R> flatMap(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         return flatMap(mapper, combiner, false, bufferSize(), bufferSize());
     }
@@ -10556,7 +10556,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors) {
         return flatMap(mapper, combiner, delayErrors, bufferSize(), bufferSize());
     }
@@ -10601,7 +10601,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, combiner, delayErrors, maxConcurrency, bufferSize());
     }
@@ -10648,7 +10648,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -10694,7 +10694,7 @@ public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends P
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Flowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, int maxConcurrency) {
         return flatMap(mapper, combiner, false, maxConcurrency, bufferSize());
     }
@@ -10776,7 +10776,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
+    public final <@NonNull U> Flowable<U> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         return flatMapIterable(mapper, bufferSize());
     }
 
@@ -10810,7 +10810,7 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper, int bufferSize) {
+    public final <@NonNull U> Flowable<U> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableFlattenIterable<>(this, mapper, bufferSize));
@@ -10849,7 +10849,7 @@ public final <U> Flowable<U> flatMapIterable(@NonNull Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper,
+    public final <@NonNull U, @NonNull V> Flowable<V> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends V> combiner) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -10894,7 +10894,7 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper,
+    public final <@NonNull U, @NonNull V> Flowable<V> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends V> combiner, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -10919,7 +10919,7 @@ public final <U, V> Flowable<V> flatMapIterable(@NonNull Function<? super T, ? e
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return flatMapMaybe(mapper, false, Integer.MAX_VALUE);
     }
 
@@ -10948,7 +10948,7 @@ public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
+    public final <@NonNull R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapMaybe<>(this, mapper, delayErrors, maxConcurrency));
@@ -10972,7 +10972,7 @@ public final <R> Flowable<R> flatMapMaybe(@NonNull Function<? super T, ? extends
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return flatMapSingle(mapper, false, Integer.MAX_VALUE);
     }
 
@@ -11001,7 +11001,7 @@ public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extend
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
+    public final <@NonNull R> Flowable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapSingle<>(this, mapper, delayErrors, maxConcurrency));
@@ -11187,7 +11187,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector) {
+    public final <@NonNull K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector) {
         return groupBy(keySelector, Functions.identity(), false, bufferSize());
     }
 
@@ -11246,7 +11246,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector, boolean delayError) {
+    public final <@NonNull K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector, boolean delayError) {
         return groupBy(keySelector, Functions.identity(), delayError, bufferSize());
     }
 
@@ -11309,7 +11309,7 @@ public final <K> Flowable<GroupedFlowable<K, T>> groupBy(@NonNull Function<? sup
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+    public final <@NonNull K, @NonNull V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector) {
         return groupBy(keySelector, valueSelector, false, bufferSize());
     }
@@ -11374,7 +11374,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+    public final <@NonNull K, @NonNull V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector, boolean delayError) {
         return groupBy(keySelector, valueSelector, delayError, bufferSize());
     }
@@ -11441,7 +11441,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+    public final <@NonNull K, @NonNull V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector,
             boolean delayError, int bufferSize) {
         Objects.requireNonNull(keySelector, "keySelector is null");
@@ -11562,7 +11562,7 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+    public final <@NonNull K, @NonNull V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector,
             boolean delayError, int bufferSize,
             @NonNull Function<? super Consumer<Object>, ? extends Map<K, Object>> evictingMapFactory) {
@@ -11612,10 +11612,10 @@ public final <K, V> Flowable<GroupedFlowable<K, V>> groupBy(@NonNull Function<?
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> groupJoin(
-            @NonNull Publisher<@NonNull ? extends TRight> other,
-            @NonNull Function<? super T, ? extends Publisher<@NonNull TLeftEnd>> leftEnd,
-            @NonNull Function<? super TRight, ? extends Publisher<@NonNull TRightEnd>> rightEnd,
+    public final <@NonNull TRight, @NonNull TLeftEnd, @NonNull TRightEnd, @NonNull R> Flowable<R> groupJoin(
+            @NonNull Publisher<? extends TRight> other,
+            @NonNull Function<? super T, @NonNull ? extends Publisher<TLeftEnd>> leftEnd,
+            @NonNull Function<? super TRight, @NonNull ? extends Publisher<TRightEnd>> rightEnd,
             @NonNull BiFunction<? super T, ? super Flowable<TRight>, ? extends R> resultSelector) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(leftEnd, "leftEnd is null");
@@ -11736,10 +11736,10 @@ public final Single<Boolean> isEmpty() {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <TRight, TLeftEnd, TRightEnd, R> Flowable<R> join(
-            @NonNull Publisher<@NonNull ? extends TRight> other,
-            @NonNull Function<? super T, ? extends Publisher<@NonNull TLeftEnd>> leftEnd,
-            @NonNull Function<? super TRight, ? extends Publisher<@NonNull TRightEnd>> rightEnd,
+    public final <@NonNull TRight, @NonNull TLeftEnd, @NonNull TRightEnd, @NonNull R> Flowable<R> join(
+            @NonNull Publisher<? extends TRight> other,
+            @NonNull Function<? super T, @NonNull ? extends Publisher<TLeftEnd>> leftEnd,
+            @NonNull Function<? super TRight, @NonNull ? extends Publisher<TRightEnd>> rightEnd,
             @NonNull BiFunction<? super T, ? super TRight, ? extends R> resultSelector) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(leftEnd, "leftEnd is null");
@@ -11976,7 +11976,7 @@ public final Single<T> lastOrError() {
     @NonNull
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super T> lifter) {
+    public final <@NonNull R> Flowable<R> lift(@NonNull FlowableOperator<? extends R, ? super T> lifter) {
         Objects.requireNonNull(lifter, "lifter is null");
         return RxJavaPlugins.onAssembly(new FlowableLift<>(this, lifter));
     }
@@ -12061,7 +12061,7 @@ public final Flowable<Notification<T>> materialize() {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> mergeWith(@NonNull Publisher<@NonNull ? extends T> other) {
+    public final Flowable<T> mergeWith(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return merge(this, other);
     }
@@ -12334,7 +12334,7 @@ public final Flowable<T> observeOn(@NonNull Scheduler scheduler, boolean delayEr
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> ofType(@NonNull Class<U> clazz) {
+    public final <@NonNull U> Flowable<U> ofType(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
@@ -12781,7 +12781,7 @@ public final Flowable<T> onBackpressureReduce(@NonNull BiFunction<T, T, T> reduc
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> onBackpressureReduce(@NonNull Supplier<R> supplier, @NonNull BiFunction<R, ? super T, R> reducer) {
+    public final <@NonNull R> Flowable<R> onBackpressureReduce(@NonNull Supplier<R> supplier, @NonNull BiFunction<R, ? super T, R> reducer) {
         Objects.requireNonNull(supplier, "supplier is null");
         Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new FlowableOnBackpressureReduceWith<>(this, supplier, reducer));
@@ -12878,7 +12878,7 @@ public final Flowable<T> onErrorComplete(@NonNull Predicate<? super Throwable> p
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable, ? extends Publisher<@NonNull ? extends T>> fallbackSupplier) {
+    public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable, @NonNull ? extends Publisher<? extends T>> fallbackSupplier) {
         Objects.requireNonNull(fallbackSupplier, "fallbackSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableOnErrorNext<>(this, fallbackSupplier));
     }
@@ -12923,7 +12923,7 @@ public final Flowable<T> onErrorResumeNext(@NonNull Function<? super Throwable,
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> onErrorResumeWith(@NonNull Publisher<@NonNull ? extends T> fallback) {
+    public final Flowable<T> onErrorResumeWith(@NonNull Publisher<? extends T> fallback) {
         Objects.requireNonNull(fallback, "fallback is null");
         return onErrorResumeNext(Functions.justFunction(fallback));
     }
@@ -13183,7 +13183,7 @@ public final ConnectableFlowable<T> publish() {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector) {
+    public final <@NonNull R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector) {
         return publish(selector, bufferSize());
     }
 
@@ -13220,7 +13220,7 @@ public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? ex
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, ? extends Publisher<@NonNull ? extends R>> selector, int prefetch) {
+    public final <@NonNull R> Flowable<R> publish(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<? extends R>> selector, int prefetch) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowablePublishMulticast<>(this, selector, prefetch, false));
@@ -13546,7 +13546,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
+    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
         return RxJavaPlugins.onAssembly(new FlowableRepeatWhen<>(this, handler));
     }
@@ -13605,7 +13605,7 @@ public final ConnectableFlowable<T> replay() {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector) {
+    public final <@NonNull R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this), selector);
     }
@@ -13645,7 +13645,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize) {
+    public final <@NonNull R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector, int bufferSize) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, false), selector);
@@ -13688,7 +13688,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize, boolean eagerTruncate) {
+    public final <@NonNull R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector, int bufferSize, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return FlowableReplay.multicastSelector(FlowableInternalHelper.replaySupplier(this, bufferSize, eagerTruncate), selector);
@@ -13732,7 +13732,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit) {
+    public final <@NonNull R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit) {
         return replay(selector, bufferSize, time, unit, Schedulers.computation());
     }
 
@@ -13778,7 +13778,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+    public final <@NonNull R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -13831,7 +13831,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
+    public final <@NonNull R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -13872,7 +13872,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, long time, @NonNull TimeUnit unit) {
+    public final <@NonNull R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector, long time, @NonNull TimeUnit unit) {
         return replay(selector, time, unit, Schedulers.computation());
     }
 
@@ -13911,7 +13911,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+    public final <@NonNull R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -13955,7 +13955,7 @@ public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? ext
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final <R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, ? extends Publisher<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
+    public final <@NonNull R> Flowable<R> replay(@NonNull Function<? super Flowable<T>, @NonNull ? extends Publisher<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -14544,7 +14544,7 @@ public final Flowable<T> retryUntil(@NonNull BooleanSupplier stop) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Flowable<T> retryWhen(
-            @NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
+            @NonNull Function<? super Flowable<Throwable>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
         Objects.requireNonNull(handler, "handler is null");
 
         return RxJavaPlugins.onAssembly(new FlowableRetryWhen<>(this, handler));
@@ -14566,10 +14566,10 @@ public final Flowable<T> retryWhen(
      */
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void safeSubscribe(@NonNull Subscriber<@NonNull ? super T> subscriber) {
+    public final void safeSubscribe(@NonNull Subscriber<? super T> subscriber) {
         Objects.requireNonNull(subscriber, "subscriber is null");
         if (subscriber instanceof SafeSubscriber) {
-            subscribe((SafeSubscriber<@NonNull ? super T>)subscriber);
+            subscribe((SafeSubscriber<? super T>)subscriber);
         } else {
             subscribe(new SafeSubscriber<>(subscriber));
         }
@@ -14742,7 +14742,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler) {
+    public final <@NonNull U> Flowable<T> sample(@NonNull Publisher<U> sampler) {
         Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new FlowableSamplePublisher<>(this, sampler, false));
     }
@@ -14780,7 +14780,7 @@ public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler) {
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitLast) {
+    public final <@NonNull U> Flowable<T> sample(@NonNull Publisher<U> sampler, boolean emitLast) {
         Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new FlowableSamplePublisher<>(this, sampler, emitLast));
     }
@@ -15390,7 +15390,7 @@ public final Flowable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull Sc
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> skipUntil(@NonNull Publisher<U> other) {
+    public final <@NonNull U> Flowable<T> skipUntil(@NonNull Publisher<U> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableSkipUntil<>(this, other));
     }
@@ -15508,7 +15508,7 @@ public final Flowable<T> sorted(@NonNull Comparator<@NonNull ? super T> comparat
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Flowable<T> startWithIterable(@NonNull Iterable<@NonNull ? extends T> items) {
+    public final Flowable<T> startWithIterable(@NonNull Iterable<? extends T> items) {
         return concatArray(fromIterable(items), this);
     }
 
@@ -15611,7 +15611,7 @@ public final Flowable<T> startWith(@NonNull MaybeSource<T> other) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> startWith(@NonNull Publisher<@NonNull ? extends T> other) {
+    public final Flowable<T> startWith(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return concatArray(other, this);
     }
@@ -15858,9 +15858,9 @@ public final Disposable subscribe(
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @Override
-    public final void subscribe(@NonNull Subscriber<@NonNull ? super T> subscriber) {
+    public final void subscribe(@NonNull Subscriber<? super T> subscriber) {
         if (subscriber instanceof FlowableSubscriber) {
-            subscribe((FlowableSubscriber<@NonNull ? super T>)subscriber);
+            subscribe((FlowableSubscriber<? super T>)subscriber);
         } else {
             Objects.requireNonNull(subscriber, "subscriber is null");
             subscribe(new StrictSubscriber<>(subscriber));
@@ -15907,10 +15907,10 @@ public final void subscribe(@NonNull Subscriber<@NonNull ? super T> subscriber)
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final void subscribe(@NonNull FlowableSubscriber<@NonNull ? super T> subscriber) {
+    public final void subscribe(@NonNull FlowableSubscriber<? super T> subscriber) {
         Objects.requireNonNull(subscriber, "subscriber is null");
         try {
-            Subscriber<@NonNull ? super T> flowableSubscriber = RxJavaPlugins.onSubscribe(this, subscriber);
+            Subscriber<? super T> flowableSubscriber = RxJavaPlugins.onSubscribe(this, subscriber);
 
             Objects.requireNonNull(flowableSubscriber, "The RxJavaPlugins.onSubscribe hook returned a null FlowableSubscriber. Please check the handler provided to RxJavaPlugins.setOnFlowableSubscribe for invalid null returns. Further reading: https://github.com/ReactiveX/RxJava/wiki/Plugins");
 
@@ -15937,7 +15937,7 @@ public final void subscribe(@NonNull FlowableSubscriber<@NonNull ? super T> subs
      * applied by {@link #subscribe(Subscriber)} before this method gets called.
      * @param subscriber the incoming {@code Subscriber}, never {@code null}
      */
-    protected abstract void subscribeActual(@NonNull Subscriber<@NonNull ? super T> subscriber);
+    protected abstract void subscribeActual(@NonNull Subscriber<? super T> subscriber);
 
     /**
      * Subscribes a given {@link Subscriber} (subclass) to this {@code Flowable} and returns the given
@@ -15970,7 +15970,7 @@ public final void subscribe(@NonNull FlowableSubscriber<@NonNull ? super T> subs
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull E extends Subscriber<@NonNull ? super T>> E subscribeWith(E subscriber) {
+    public final <@NonNull E extends Subscriber<? super T>> E subscribeWith(E subscriber) {
         subscribe(subscriber);
         return subscriber;
     }
@@ -16073,7 +16073,7 @@ public final Flowable<T> subscribeOn(@NonNull Scheduler scheduler, boolean reque
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Flowable<T> switchIfEmpty(@NonNull Publisher<@NonNull ? extends T> other) {
+    public final Flowable<T> switchIfEmpty(@NonNull Publisher<? extends T> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchIfEmpty<>(this, other));
     }
@@ -16110,7 +16110,7 @@ public final Flowable<T> switchIfEmpty(@NonNull Publisher<@NonNull ? extends T>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> switchMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         return switchMap(mapper, bufferSize());
     }
 
@@ -16149,7 +16149,7 @@ public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Pu
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> switchMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int bufferSize) {
+    public final <@NonNull R> Flowable<R> switchMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, int bufferSize) {
         return switchMap0(mapper, bufferSize, false);
     }
 
@@ -16282,7 +16282,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         return switchMapDelayError(mapper, bufferSize());
     }
 
@@ -16323,11 +16323,11 @@ public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ?
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int bufferSize) {
+    public final <@NonNull R> Flowable<R> switchMapDelayError(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, int bufferSize) {
         return switchMap0(mapper, bufferSize, true);
     }
 
-    <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, int bufferSize, boolean delayError) {
+    <R> Flowable<R> switchMap0(Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, int bufferSize, boolean delayError) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
@@ -16378,7 +16378,7 @@ <R> Flowable<R> switchMap0(Function<? super T, ? extends Publisher<@NonNull ? ex
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe<>(this, mapper, false));
     }
@@ -16410,7 +16410,7 @@ public final <R> Flowable<R> switchMapMaybe(@NonNull Function<? super T, ? exten
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybe<>(this, mapper, true));
     }
@@ -16452,7 +16452,7 @@ public final <R> Flowable<R> switchMapMaybeDelayError(@NonNull Function<? super
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle<>(this, mapper, false));
     }
@@ -16484,7 +16484,7 @@ public final <R> Flowable<R> switchMapSingle(@NonNull Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> switchMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapSingle<>(this, mapper, true));
     }
@@ -16996,7 +16996,7 @@ public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate)
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<T> takeUntil(@NonNull Publisher<U> other) {
+    public final <@NonNull U> Flowable<T> takeUntil(@NonNull Publisher<U> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new FlowableTakeUntil<>(this, other));
     }
@@ -17548,7 +17548,7 @@ public final Flowable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull Sc
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator) {
+    public final <@NonNull V> Flowable<T> timeout(@NonNull Function<? super T, @NonNull ? extends Publisher<V>> itemTimeoutIndicator) {
         return timeout0(null, itemTimeoutIndicator, null);
     }
 
@@ -17586,7 +17586,7 @@ public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publ
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <V> Flowable<T> timeout(@NonNull Function<? super T, ? extends Publisher<@NonNull V>> itemTimeoutIndicator, @NonNull Publisher<@NonNull ? extends T> fallback) {
+    public final <@NonNull V> Flowable<T> timeout(@NonNull Function<? super T, @NonNull ? extends Publisher<V>> itemTimeoutIndicator, @NonNull Publisher<? extends T> fallback) {
         Objects.requireNonNull(fallback, "fallback is null");
         return timeout0(null, itemTimeoutIndicator, fallback);
     }
@@ -17651,7 +17651,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit) {
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Publisher<@NonNull ? extends T> fallback) {
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Publisher<? extends T> fallback) {
         Objects.requireNonNull(fallback, "fallback is null");
         return timeout0(timeout, unit, fallback, Schedulers.computation());
     }
@@ -17689,7 +17689,7 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Publisher<@NonNull ? extends T> fallback) {
+    public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Publisher<? extends T> fallback) {
         Objects.requireNonNull(fallback, "fallback is null");
         return timeout0(timeout, unit, fallback, scheduler);
     }
@@ -17761,8 +17761,8 @@ public final Flowable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndicator,
-            @NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator) {
+    public final <@NonNull U, @NonNull V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndicator,
+            @NonNull Function<? super T, @NonNull ? extends Publisher<V>> itemTimeoutIndicator) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, null);
     }
@@ -17804,26 +17804,26 @@ public final <U, V> Flowable<T> timeout(@NonNull Publisher<U> firstTimeoutIndica
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<T> timeout(
+    public final <@NonNull U, @NonNull V> Flowable<T> timeout(
             @NonNull Publisher<U> firstTimeoutIndicator,
-            @NonNull Function<? super T, ? extends Publisher<V>> itemTimeoutIndicator,
-            @NonNull Publisher<@NonNull ? extends T> fallback) {
+            @NonNull Function<? super T, @NonNull ? extends Publisher<V>> itemTimeoutIndicator,
+            @NonNull Publisher<? extends T> fallback) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         Objects.requireNonNull(fallback, "fallback is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, fallback);
     }
 
-    private Flowable<T> timeout0(long timeout, TimeUnit unit, Publisher<@NonNull ? extends T> fallback,
+    private Flowable<T> timeout0(long timeout, TimeUnit unit, Publisher<? extends T> fallback,
             Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         return RxJavaPlugins.onAssembly(new FlowableTimeoutTimed<>(this, timeout, unit, scheduler, fallback));
     }
 
-    private <U, V> Flowable<T> timeout0(
+    private <@NonNull U, @NonNull V> Flowable<T> timeout0(
             Publisher<U> firstTimeoutIndicator,
-            Function<? super T, ? extends Publisher<@NonNull V>> itemTimeoutIndicator,
-                    Publisher<@NonNull ? extends T> fallback) {
+            Function<? super T, @NonNull ? extends Publisher<V>> itemTimeoutIndicator,
+                    Publisher<? extends T> fallback) {
         Objects.requireNonNull(itemTimeoutIndicator, "itemTimeoutIndicator is null");
         return RxJavaPlugins.onAssembly(new FlowableTimeout<>(this, firstTimeoutIndicator, itemTimeoutIndicator, fallback));
     }
@@ -17959,7 +17959,7 @@ public final Flowable<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Sched
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
+    public final <@NonNull R> R to(@NonNull FlowableConverter<T, ? extends R> converter) {
         return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
 
@@ -18069,7 +18069,7 @@ public final Single<List<T>> toList(int capacityHint) {
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplier<U> collectionSupplier) {
+    public final <@NonNull U extends Collection<? super T>> Single<U> toList(@NonNull Supplier<U> collectionSupplier) {
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         return RxJavaPlugins.onAssembly(new FlowableToListSingle<>(this, collectionSupplier));
     }
@@ -18104,7 +18104,7 @@ public final <U extends Collection<? super T>> Single<U> toList(@NonNull Supplie
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends K> keySelector) {
+    public final <@NonNull K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         return collect(HashMapSupplier.asSupplier(), Functions.toMapKeySelector(keySelector));
     }
@@ -18143,7 +18143,7 @@ public final <K> Single<Map<K, T>> toMap(@NonNull Function<? super T, ? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? extends K> keySelector, @NonNull Function<? super T, ? extends V> valueSelector) {
+    public final <@NonNull K, @NonNull V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? extends K> keySelector, @NonNull Function<? super T, ? extends V> valueSelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(valueSelector, "valueSelector is null");
         return collect(HashMapSupplier.asSupplier(), Functions.toMapKeyValueSelector(keySelector, valueSelector));
@@ -18182,7 +18182,7 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? extends K> keySelector,
+    public final <@NonNull K, @NonNull V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector,
             @NonNull Supplier<? extends Map<K, V>> mapSupplier) {
         Objects.requireNonNull(keySelector, "keySelector is null");
@@ -18217,7 +18217,7 @@ public final <K, V> Single<Map<K, V>> toMap(@NonNull Function<? super T, ? exten
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector) {
+    public final <@NonNull K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector) {
         Function<T, T> valueSelector = Functions.identity();
         Supplier<Map<K, Collection<T>>> mapSupplier = HashMapSupplier.asSupplier();
         Function<K, List<T>> collectionFactory = ArrayListSupplier.asFunction();
@@ -18256,7 +18256,7 @@ public final <K> Single<Map<K, Collection<T>>> toMultimap(@NonNull Function<? su
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector, @NonNull Function<? super T, ? extends V> valueSelector) {
+    public final <@NonNull K, @NonNull V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector, @NonNull Function<? super T, ? extends V> valueSelector) {
         Supplier<Map<K, Collection<V>>> mapSupplier = HashMapSupplier.asSupplier();
         Function<K, List<V>> collectionFactory = ArrayListSupplier.asFunction();
         return toMultimap(keySelector, valueSelector, mapSupplier, collectionFactory);
@@ -18298,7 +18298,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(@NonNull Function<?
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
+    public final <@NonNull K, @NonNull V> Single<Map<K, Collection<V>>> toMultimap(
             @NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector,
             @NonNull Supplier<? extends Map<K, Collection<V>>> mapSupplier,
@@ -18344,7 +18344,7 @@ public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Single<Map<K, Collection<V>>> toMultimap(
+    public final <@NonNull K, @NonNull V> Single<Map<K, Collection<V>>> toMultimap(
             @NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector,
             @NonNull Supplier<Map<K, Collection<V>>> mapSupplier
@@ -19143,7 +19143,7 @@ public final Flowable<Flowable<T>> window(
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndicator) {
+    public final <@NonNull B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndicator) {
         return window(boundaryIndicator, bufferSize());
     }
 
@@ -19181,7 +19181,7 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndicator, int bufferSize) {
+    public final <@NonNull B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndicator, int bufferSize) {
         Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new FlowableWindowBoundary<>(this, boundaryIndicator, bufferSize));
@@ -19224,9 +19224,9 @@ public final <B> Flowable<Flowable<T>> window(@NonNull Publisher<B> boundaryIndi
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Flowable<Flowable<T>> window(
+    public final <@NonNull U, @NonNull V> Flowable<Flowable<T>> window(
             @NonNull Publisher<U> openingIndicator,
-            @NonNull Function<? super U, ? extends Publisher<V>> closingIndicator) {
+            @NonNull Function<? super U, @NonNull ? extends Publisher<V>> closingIndicator) {
         return window(openingIndicator, closingIndicator, bufferSize());
     }
 
@@ -19270,9 +19270,9 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, V> Flowable<Flowable<T>> window(
+    public final <@NonNull U, @NonNull V> Flowable<Flowable<T>> window(
             @NonNull Publisher<U> openingIndicator,
-            @NonNull Function<? super U, ? extends Publisher<V>> closingIndicator, int bufferSize) {
+            @NonNull Function<? super U, @NonNull ? extends Publisher<V>> closingIndicator, int bufferSize) {
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
         Objects.requireNonNull(closingIndicator, "closingIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -19317,7 +19317,7 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, @NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<@NonNull ? extends U> other,
+    public final <@NonNull U, @NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<? extends U> other,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -19358,7 +19358,7 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T1, T2, @NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<T1> source1, @NonNull Publisher<T2> source2,
+    public final <@NonNull T1, @NonNull T2, @NonNull R> Flowable<R> withLatestFrom(@NonNull Publisher<T1> source1, @NonNull Publisher<T2> source2,
             @NonNull Function3<? super T, ? super T1, ? super T2, R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -19402,7 +19402,7 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T1, T2, T3, @NonNull R> Flowable<R> withLatestFrom(
+    public final <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull R> Flowable<R> withLatestFrom(
             @NonNull Publisher<T1> source1, @NonNull Publisher<T2> source2,
             @NonNull Publisher<T3> source3,
             @NonNull Function4<? super T, ? super T1, ? super T2, ? super T3, R> combiner) {
@@ -19452,7 +19452,7 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <T1, T2, T3, T4, @NonNull R> Flowable<R> withLatestFrom(
+    public final <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull R> Flowable<R> withLatestFrom(
             @NonNull Publisher<T1> source1, @NonNull Publisher<T2> source2,
             @NonNull Publisher<T3> source3, @NonNull Publisher<T4> source4,
             @NonNull Function5<? super T, ? super T1, ? super T2, ? super T3, ? super T4, R> combiner) {
@@ -19531,7 +19531,7 @@ public final <U, V> Flowable<Flowable<T>> window(
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ?>> others, @NonNull Function<? super Object[], R> combiner) {
+    public final <@NonNull R> Flowable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends Publisher<@NonNull ?>> others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new FlowableWithLatestFromMany<>(this, others, combiner));
@@ -19571,7 +19571,7 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <@NonNull U, R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <@NonNull U, @NonNull R> Flowable<R> zipWith(@NonNull Iterable<U> other,  @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(zipper, "zipper is null");
         return RxJavaPlugins.onAssembly(new FlowableZipIterable<>(this, other, zipper));
@@ -19620,7 +19620,7 @@ public final <R> Flowable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <@NonNull U, @NonNull R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
     }
@@ -19671,7 +19671,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U> other,
+    public final <@NonNull U, @NonNull R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
             @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError) {
         return zip(this, other, zipper, delayError);
     }
@@ -19725,7 +19725,7 @@ public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U>
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Flowable<R> zipWith(@NonNull Publisher<@NonNull ? extends U> other,
+    public final <@NonNull U, @NonNull R> Flowable<R> zipWith(@NonNull Publisher<? extends U> other,
             @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError, int bufferSize) {
         return zip(this, other, zipper, delayError, bufferSize);
     }
@@ -19840,7 +19840,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
+    public static <@NonNull T> Flowable<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
         Objects.requireNonNull(optional, "optional is null");
         return optional.map(Flowable::just).orElseGet(Flowable::empty);
     }
@@ -19878,7 +19878,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
+    public static <@NonNull T> Flowable<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
         Objects.requireNonNull(stage, "stage is null");
         return RxJavaPlugins.onAssembly(new FlowableFromCompletionStage<>(stage));
     }
@@ -19925,7 +19925,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<@NonNull T> fromStream(@NonNull Stream<T> stream) {
+    public static <@NonNull T> Flowable<@NonNull T> fromStream(@NonNull Stream<T> stream) {
         Objects.requireNonNull(stream, "stream is null");
         return RxJavaPlugins.onAssembly(new FlowableFromStream<>(stream));
     }
@@ -19986,7 +19986,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R, A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
+    public final <@NonNull R, @NonNull A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new FlowableCollectWithCollectorSingle<>(this, collector));
     }
@@ -20312,7 +20312,7 @@ public final Stream<T> blockingStream(int prefetch) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
         return flatMapStream(mapper, bufferSize());
     }
 
@@ -20367,7 +20367,7 @@ public final Stream<T> blockingStream(int prefetch) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper, int prefetch) {
+    public final <@NonNull R> Flowable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapStream<>(this, mapper, prefetch));
@@ -20423,7 +20423,7 @@ public final Stream<T> blockingStream(int prefetch) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
         return flatMapStream(mapper, bufferSize());
     }
 
@@ -20478,7 +20478,7 @@ public final Stream<T> blockingStream(int prefetch) {
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper, int prefetch) {
+    public final <@NonNull R> Flowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapStream<>(this, mapper, prefetch));
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 917a9838a4..bbb3a10d4b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -130,7 +130,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> amb(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Maybe<T> amb(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeAmb<>(null, sources));
     }
@@ -154,7 +154,7 @@ public static <T> Maybe<T> amb(@NonNull Iterable<@NonNull ? extends MaybeSource<
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Maybe<T> ambArray(@NonNull MaybeSource<? extends T>... sources) {
+    public static <@NonNull T> Maybe<T> ambArray(@NonNull MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -187,7 +187,7 @@ public static <T> Maybe<T> ambArray(@NonNull MaybeSource<? extends T>... sources
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeConcatIterable<>(sources));
     }
@@ -216,7 +216,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends MaybeS
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
@@ -248,7 +248,7 @@ public static <T> Flowable<T> concat(@NonNull MaybeSource<? extends T> source1,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(
+    public static <@NonNull T> Flowable<T> concat(
             @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2, @NonNull MaybeSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -284,7 +284,7 @@ public static <T> Flowable<T> concat(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(
+    public static <@NonNull T> Flowable<T> concat(
             @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2, @NonNull MaybeSource<? extends T> source3, @NonNull MaybeSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -315,7 +315,7 @@ public static <T> Flowable<T> concat(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return concat(sources, 2);
     }
 
@@ -343,7 +343,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Maybe
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int prefetch) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapMaybePublisher<>(sources, Functions.identity(), ErrorMode.IMMEDIATE, prefetch));
@@ -370,7 +370,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Maybe
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> concatArray(@NonNull MaybeSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArray(@NonNull MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return Flowable.empty();
@@ -404,7 +404,7 @@ public static <T> Flowable<T> concatArray(@NonNull MaybeSource<? extends T>... s
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return Flowable.empty();
@@ -442,7 +442,7 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull MaybeSource<? exten
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>... sources) {
         return Flowable.fromArray(sources).concatMapEager((Function)MaybeToPublisher.instance());
     }
     /**
@@ -471,7 +471,7 @@ public static <T> Flowable<T> concatArrayEager(@NonNull MaybeSource<? extends T>
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull MaybeSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayEagerDelayError(@NonNull MaybeSource<? extends T>... sources) {
         return Flowable.fromArray(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true);
     }
 
@@ -497,7 +497,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull MaybeSource<?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapMaybeDelayError(Functions.identity());
     }
 
@@ -523,7 +523,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? exte
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapMaybeDelayError(Functions.identity());
     }
     /**
@@ -554,7 +554,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int prefetch) {
+    public static <@NonNull T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int prefetch) {
         return Flowable.fromPublisher(sources).concatMapMaybeDelayError(Functions.identity(), true, prefetch);
     }
 
@@ -582,7 +582,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), false);
     }
 
@@ -615,7 +615,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends M
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         return Flowable.fromIterable(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), false, maxConcurrency, 1);
     }
 
@@ -645,7 +645,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends M
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapEager((Function)MaybeToPublisher.instance());
     }
 
@@ -680,7 +680,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         return Flowable.fromPublisher(sources).concatMapEager((Function)MaybeToPublisher.instance(), maxConcurrency, 1);
     }
 
@@ -710,7 +710,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true);
     }
 
@@ -744,7 +744,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         return Flowable.fromIterable(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true, maxConcurrency, 1);
     }
 
@@ -776,7 +776,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true);
     }
 
@@ -812,7 +812,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         return Flowable.fromPublisher(sources).concatMapEagerDelayError((Function)MaybeToPublisher.instance(), true, maxConcurrency, 1);
     }
 
@@ -866,7 +866,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> create(@NonNull MaybeOnSubscribe<T> onSubscribe) {
+    public static <@NonNull T> Maybe<T> create(@NonNull MaybeOnSubscribe<T> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         return RxJavaPlugins.onAssembly(new MaybeCreate<>(onSubscribe));
     }
@@ -889,7 +889,7 @@ public static <T> Maybe<T> create(@NonNull MaybeOnSubscribe<T> onSubscribe) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? extends T>> supplier) {
+    public static <@NonNull T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new MaybeDefer<>(supplier));
     }
@@ -910,7 +910,7 @@ public static <T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? exten
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     @NonNull
-    public static <T> Maybe<T> empty() {
+    public static <@NonNull T> Maybe<T> empty() {
         return RxJavaPlugins.onAssembly((Maybe<T>)MaybeEmpty.INSTANCE);
     }
 
@@ -935,7 +935,7 @@ public static <T> Maybe<T> empty() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> error(@NonNull Throwable throwable) {
+    public static <@NonNull T> Maybe<T> error(@NonNull Throwable throwable) {
         Objects.requireNonNull(throwable, "throwable is null");
         return RxJavaPlugins.onAssembly(new MaybeError<>(throwable));
     }
@@ -961,7 +961,7 @@ public static <T> Maybe<T> error(@NonNull Throwable throwable) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+    public static <@NonNull T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new MaybeErrorCallable<>(supplier));
     }
@@ -990,7 +990,7 @@ public static <T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromAction(@NonNull Action action) {
+    public static <@NonNull T> Maybe<T> fromAction(@NonNull Action action) {
         Objects.requireNonNull(action, "action is null");
         return RxJavaPlugins.onAssembly(new MaybeFromAction<>(action));
     }
@@ -1011,7 +1011,7 @@ public static <T> Maybe<T> fromAction(@NonNull Action action) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromCompletable(@NonNull CompletableSource completableSource) {
+    public static <@NonNull T> Maybe<T> fromCompletable(@NonNull CompletableSource completableSource) {
         Objects.requireNonNull(completableSource, "completableSource is null");
         return RxJavaPlugins.onAssembly(new MaybeFromCompletable<>(completableSource));
     }
@@ -1032,7 +1032,7 @@ public static <T> Maybe<T> fromCompletable(@NonNull CompletableSource completabl
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
+    public static <@NonNull T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
         Objects.requireNonNull(single, "single is null");
         return RxJavaPlugins.onAssembly(new MaybeFromSingle<>(single));
     }
@@ -1175,7 +1175,7 @@ public static <T> Maybe<T> fromSingle(@NonNull SingleSource<T> single) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromObservable(@NonNull ObservableSource<T> source) {
+    public static <@NonNull T> Maybe<T> fromObservable(@NonNull ObservableSource<T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new ObservableElementAtMaybe<>(source, 0L));
     }
@@ -1202,7 +1202,7 @@ public static <T> Maybe<T> fromObservable(@NonNull ObservableSource<T> source) {
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
-    public static <T> Maybe<T> fromPublisher(@NonNull Publisher<T> source) {
+    public static <@NonNull T> Maybe<T> fromPublisher(@NonNull Publisher<T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new FlowableElementAtMaybePublisher<>(source, 0L));
     }
@@ -1237,7 +1237,7 @@ public static <T> Maybe<T> fromPublisher(@NonNull Publisher<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
+    public static <@NonNull T> Maybe<T> fromRunnable(@NonNull Runnable run) {
         Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new MaybeFromRunnable<>(run));
     }
@@ -1352,7 +1352,7 @@ public static <T> Maybe<T> fromRunnable(@NonNull Runnable run) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).flatMapMaybe(Functions.identity(), false, Integer.MAX_VALUE);
     }
 
@@ -1390,7 +1390,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends MaybeSo
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return merge(sources, Integer.MAX_VALUE);
     }
 
@@ -1430,7 +1430,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeS
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapMaybePublisher<>(sources, Functions.identity(), false, maxConcurrency));
@@ -1463,7 +1463,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends MaybeS
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static <T> Maybe<T> merge(@NonNull MaybeSource<? extends MaybeSource<? extends T>> source) {
+    public static <@NonNull T> Maybe<T> merge(@NonNull MaybeSource<? extends MaybeSource<? extends T>> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatten(source, Functions.identity()));
     }
@@ -1509,7 +1509,7 @@ public static <T> Maybe<T> merge(@NonNull MaybeSource<? extends MaybeSource<? ex
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(
+    public static <@NonNull T> Flowable<T> merge(
             @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2
      ) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -1560,7 +1560,7 @@ public static <T> Flowable<T> merge(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(
+    public static <@NonNull T> Flowable<T> merge(
             @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2,
             @NonNull MaybeSource<? extends T> source3
      ) {
@@ -1615,7 +1615,7 @@ public static <T> Flowable<T> merge(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(
+    public static <@NonNull T> Flowable<T> merge(
             @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2,
             @NonNull MaybeSource<? extends T> source3, @NonNull MaybeSource<? extends T> source4
      ) {
@@ -1661,7 +1661,7 @@ public static <T> Flowable<T> merge(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return Flowable.empty();
@@ -1706,7 +1706,7 @@ public static <T> Flowable<T> mergeArray(MaybeSource<? extends T>... sources) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         return Flowable.fromArray(sources).flatMapMaybe(Functions.identity(), true, Math.max(1, sources.length));
     }
@@ -1744,7 +1744,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull MaybeSource<? extend
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).flatMapMaybe(Functions.identity(), true, Integer.MAX_VALUE);
     }
 
@@ -1780,7 +1780,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         return mergeDelayError(sources, Integer.MAX_VALUE);
     }
 
@@ -1819,7 +1819,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapMaybePublisher<>(sources, Functions.identity(), true, maxConcurrency));
@@ -1858,7 +1858,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return mergeArrayDelayError(source1, source2);
@@ -1900,7 +1900,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T> source1,
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T> source1,
             @NonNull MaybeSource<? extends T> source2, @NonNull MaybeSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -1946,7 +1946,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull MaybeSource<? extends T>
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(
+    public static <@NonNull T> Flowable<T> mergeDelayError(
             @NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2,
             @NonNull MaybeSource<? extends T> source3, @NonNull MaybeSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -1976,7 +1976,7 @@ public static <T> Flowable<T> mergeDelayError(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     @NonNull
-    public static <T> Maybe<T> never() {
+    public static <@NonNull T> Maybe<T> never() {
         return RxJavaPlugins.onAssembly((Maybe<T>)MaybeNever.INSTANCE);
     }
 
@@ -2003,7 +2003,7 @@ public static <T> Maybe<T> never() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2) {
+    public static <@NonNull T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate());
     }
 
@@ -2033,7 +2033,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2,
+    public static <@NonNull T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T> source1, @NonNull MaybeSource<? extends T> source2,
             @NonNull BiPredicate<? super T, ? super T> isEqual) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -2070,7 +2070,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull MaybeSource<? extends T
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybePublisher<>(sources, Functions.identity(), false));
     }
@@ -2105,7 +2105,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends MaybeSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapMaybePublisher<>(sources, Functions.identity(), true));
     }
@@ -2181,7 +2181,7 @@ public static Maybe<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Sch
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
+    public static <@NonNull T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
         if (onSubscribe instanceof Maybe) {
             throw new IllegalArgumentException("unsafeCreate(Maybe) should be upgraded");
         }
@@ -2214,7 +2214,7 @@ public static <T> Maybe<T> unsafeCreate(@NonNull MaybeSource<T> onSubscribe) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSupplier,
+    public static <@NonNull T, @NonNull D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends MaybeSource<? extends T>> sourceSupplier,
             @NonNull Consumer<? super D> resourceCleanup) {
         return using(resourceSupplier, sourceSupplier, resourceCleanup, true);
@@ -2253,7 +2253,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSupplier,
+    public static <@NonNull T, @NonNull D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends MaybeSource<? extends T>> sourceSupplier,
             @NonNull Consumer<? super D> resourceCleanup, boolean eager) {
         Objects.requireNonNull(resourceSupplier, "resourceSupplier is null");
@@ -2279,7 +2279,7 @@ public static <T, D> Maybe<T> using(@NonNull Supplier<? extends D> resourceSuppl
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
+    public static <@NonNull T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
         if (source instanceof Maybe) {
             return RxJavaPlugins.onAssembly((Maybe<T>)source);
         }
@@ -2318,7 +2318,7 @@ public static <T> Maybe<T> wrap(@NonNull MaybeSource<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Maybe<R> zip(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
+    public static <@NonNull T, @NonNull R> Maybe<R> zip(@NonNull Iterable<@NonNull ? extends MaybeSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new MaybeZipIterable<>(sources, zipper));
@@ -2354,7 +2354,7 @@ public static <T, R> Maybe<R> zip(@NonNull Iterable<@NonNull ? extends MaybeSour
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, R> Maybe<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Maybe<R> zip(
             @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -2396,7 +2396,7 @@ public static <T1, T2, R> Maybe<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, R> Maybe<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull R> Maybe<R> zip(
             @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
             @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -2443,7 +2443,7 @@ public static <T1, T2, T3, R> Maybe<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, R> Maybe<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull R> Maybe<R> zip(
             @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
             @NonNull MaybeSource<? extends T4> source4,
             @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
@@ -2495,7 +2495,7 @@ public static <T1, T2, T3, T4, R> Maybe<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, R> Maybe<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull R> Maybe<R> zip(
             @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
             @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5,
             @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
@@ -2551,7 +2551,7 @@ public static <T1, T2, T3, T4, T5, R> Maybe<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, R> Maybe<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull R> Maybe<R> zip(
             @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
             @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5, @NonNull MaybeSource<? extends T6> source6,
             @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
@@ -2612,7 +2612,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Maybe<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, R> Maybe<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull R> Maybe<R> zip(
             @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
             @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5, @NonNull MaybeSource<? extends T6> source6,
             @NonNull MaybeSource<? extends T7> source7,
@@ -2678,7 +2678,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Maybe<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Maybe<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull R> Maybe<R> zip(
             @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
             @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5, @NonNull MaybeSource<? extends T6> source6,
             @NonNull MaybeSource<? extends T7> source7, @NonNull MaybeSource<? extends T8> source8,
@@ -2747,7 +2747,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Maybe<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull T9, @NonNull R> Maybe<R> zip(
             @NonNull MaybeSource<? extends T1> source1, @NonNull MaybeSource<? extends T2> source2, @NonNull MaybeSource<? extends T3> source3,
             @NonNull MaybeSource<? extends T4> source4, @NonNull MaybeSource<? extends T5> source5, @NonNull MaybeSource<? extends T6> source6,
             @NonNull MaybeSource<? extends T7> source7, @NonNull MaybeSource<? extends T8> source8, @NonNull MaybeSource<? extends T9> source9,
@@ -2798,7 +2798,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Maybe<R> zip(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T, R> Maybe<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper,
+    public static <@NonNull T, @NonNull R> Maybe<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper,
             @NonNull MaybeSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
@@ -3058,7 +3058,7 @@ public final Maybe<T> cache() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<U> cast(@NonNull Class<? extends U> clazz) {
+    public final <@NonNull U> Maybe<U> cast(@NonNull Class<? extends U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
@@ -3088,7 +3088,7 @@ public final <U> Maybe<U> cast(@NonNull Class<? extends U> clazz) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends R> transformer) {
+    public final <@NonNull R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends R> transformer) {
         return wrap(((MaybeTransformer<T, R>) Objects.requireNonNull(transformer, "transformer is null")).apply(this));
     }
 
@@ -3113,7 +3113,7 @@ public final <R> Maybe<R> compose(@NonNull MaybeTransformer<? super T, ? extends
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> concatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Maybe<R> concatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return flatMap(mapper);
     }
 
@@ -3169,7 +3169,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Maybe<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return flatMapSingle(mapper);
     }
 
@@ -3444,7 +3444,7 @@ public final Maybe<T> delay(long time, @NonNull TimeUnit unit, @NonNull Schedule
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
-    public final <U> Maybe<T> delay(@NonNull Publisher<U> delayIndicator) {
+    public final <@NonNull U> Maybe<T> delay(@NonNull Publisher<U> delayIndicator) {
         Objects.requireNonNull(delayIndicator, "delayIndicator is null");
         return RxJavaPlugins.onAssembly(new MaybeDelayOtherPublisher<>(this, delayIndicator));
     }
@@ -3471,7 +3471,7 @@ public final <U> Maybe<T> delay(@NonNull Publisher<U> delayIndicator) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIndicator) {
+    public final <@NonNull U> Maybe<T> delaySubscription(@NonNull Publisher<U> subscriptionIndicator) {
         Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
         return RxJavaPlugins.onAssembly(new MaybeDelaySubscriptionOtherPublisher<>(this, subscriptionIndicator));
     }
@@ -3875,7 +3875,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatten<>(this, mapper));
     }
@@ -3905,7 +3905,7 @@ public final <R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSo
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> flatMap(
+    public final <@NonNull R> Maybe<R> flatMap(
             @NonNull Function<? super T, ? extends MaybeSource<? extends R>> onSuccessMapper,
             @NonNull Function<? super Throwable, ? extends MaybeSource<? extends R>> onErrorMapper,
             @NonNull Supplier<? extends MaybeSource<? extends R>> onCompleteSupplier) {
@@ -3941,7 +3941,7 @@ public final <R> Maybe<R> flatMap(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends MaybeSource<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -3974,7 +3974,7 @@ public final <U, R> Maybe<R> flatMap(@NonNull Function<? super T, ? extends Mayb
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
+    public final <@NonNull U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableFlowable<>(this, mapper));
     }
@@ -4001,7 +4001,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
+    public final <@NonNull U> Observable<U> flattenAsObservable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapIterableObservable<>(this, mapper));
     }
@@ -4026,7 +4026,7 @@ public final <U> Observable<U> flattenAsObservable(@NonNull Function<? super T,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> flatMapObservable(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapObservable<>(this, mapper));
     }
@@ -4055,7 +4055,7 @@ public final <R> Observable<R> flatMapObservable(@NonNull Function<? super T, ?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapPublisher<>(this, mapper));
     }
@@ -4084,7 +4084,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Maybe<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlatMapSingle<>(this, mapper));
     }
@@ -4324,7 +4324,7 @@ public final Single<Boolean> isEmpty() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> lift) {
+    public final <@NonNull R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> lift) {
         Objects.requireNonNull(lift, "lift is null");
         return RxJavaPlugins.onAssembly(new MaybeLift<>(this, lift));
     }
@@ -4349,7 +4349,7 @@ public final <R> Maybe<R> lift(@NonNull MaybeOperator<? extends R, ? super T> li
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> map(@NonNull Function<? super T, ? extends R> mapper) {
+    public final <@NonNull R> Maybe<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeMap<>(this, mapper));
     }
@@ -4451,7 +4451,7 @@ public final Maybe<T> observeOn(@NonNull Scheduler scheduler) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<U> ofType(@NonNull Class<U> clazz) {
+    public final <@NonNull U> Maybe<U> ofType(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
@@ -4843,7 +4843,7 @@ public final Flowable<T> repeatUntil(@NonNull BooleanSupplier stop) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
+    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
         return toFlowable().repeatWhen(handler);
     }
 
@@ -5061,7 +5061,7 @@ public final Maybe<T> retryUntil(@NonNull BooleanSupplier stop) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Maybe<T> retryWhen(
-            @NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
+            @NonNull Function<? super Flowable<Throwable>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
         return toFlowable().retryWhen(handler).singleElement();
     }
 
@@ -5517,7 +5517,7 @@ public final Single<T> switchIfEmpty(@NonNull SingleSource<? extends T> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
+    public final <@NonNull U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new MaybeTakeUntilMaybe<>(this, other));
     }
@@ -5548,7 +5548,7 @@ public final <U> Maybe<T> takeUntil(@NonNull MaybeSource<U> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> takeUntil(@NonNull Publisher<U> other) {
+    public final <@NonNull U> Maybe<T> takeUntil(@NonNull Publisher<U> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new MaybeTakeUntilPublisher<>(this, other));
     }
@@ -5913,7 +5913,7 @@ public final Maybe<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNull Sch
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator) {
+    public final <@NonNull U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator) {
         Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
         return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe<>(this, timeoutIndicator, null));
     }
@@ -5938,7 +5938,7 @@ public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator, @NonNull MaybeSource<? extends T> fallback) {
+    public final <@NonNull U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator, @NonNull MaybeSource<? extends T> fallback) {
         Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
         Objects.requireNonNull(fallback, "fallback is null");
         return RxJavaPlugins.onAssembly(new MaybeTimeoutMaybe<>(this, timeoutIndicator, fallback));
@@ -5966,7 +5966,7 @@ public final <U> Maybe<T> timeout(@NonNull MaybeSource<U> timeoutIndicator, @Non
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator) {
+    public final <@NonNull U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator) {
         Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
         return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher<>(this, timeoutIndicator, null));
     }
@@ -5995,7 +5995,7 @@ public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator, @NonNull MaybeSource<? extends T> fallback) {
+    public final <@NonNull U> Maybe<T> timeout(@NonNull Publisher<U> timeoutIndicator, @NonNull MaybeSource<? extends T> fallback) {
         Objects.requireNonNull(timeoutIndicator, "timeoutIndicator is null");
         Objects.requireNonNull(fallback, "fallback is null");
         return RxJavaPlugins.onAssembly(new MaybeTimeoutPublisher<>(this, timeoutIndicator, fallback));
@@ -6052,7 +6052,7 @@ public final Maybe<T> unsubscribeOn(@NonNull Scheduler scheduler) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Maybe<R> zipWith(@NonNull MaybeSource<? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <@NonNull U, @NonNull R> Maybe<R> zipWith(@NonNull MaybeSource<? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
     }
@@ -6134,7 +6134,7 @@ public final TestObserver<T> test(boolean dispose) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Maybe<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
+    public static <@NonNull T> Maybe<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
         Objects.requireNonNull(optional, "optional is null");
         return optional.map(Maybe::just).orElseGet(Maybe::empty);
     }
@@ -6168,7 +6168,7 @@ public final TestObserver<T> test(boolean dispose) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Maybe<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
+    public static <@NonNull T> Maybe<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
         Objects.requireNonNull(stage, "stage is null");
         return RxJavaPlugins.onAssembly(new MaybeFromCompletionStage<>(stage));
     }
@@ -6304,7 +6304,7 @@ public final CompletionStage<T> toCompletionStage(@Nullable T defaultItem) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlattenStreamAsFlowable<>(this, mapper));
     }
@@ -6344,7 +6344,7 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new MaybeFlattenStreamAsObservable<>(this, mapper));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 9869276b12..be33a95e3f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -130,7 +130,7 @@ public abstract class Observable<@NonNull T> implements ObservableSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> amb(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> amb(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableAmb<>(null, sources));
     }
@@ -166,7 +166,7 @@ public static <T> Observable<T> amb(@NonNull Iterable<@NonNull ? extends Observa
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Observable<T> ambArray(@NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> ambArray(@NonNull ObservableSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         int len = sources.length;
         if (len == 0) {
@@ -228,7 +228,7 @@ public static int bufferSize() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> combineLatest(
+    public static <@NonNull T, @NonNull R> Observable<R> combineLatest(
             @NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatest(sources, combiner, bufferSize());
@@ -275,7 +275,7 @@ public static <T, R> Observable<R> combineLatest(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatest(
+    public static <@NonNull T, @NonNull R> Observable<R> combineLatest(
             @NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
@@ -325,7 +325,7 @@ public static <T, R> Observable<R> combineLatest(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> combineLatestArray(
+    public static <@NonNull T, @NonNull R> Observable<R> combineLatestArray(
             @NonNull ObservableSource<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestArray(sources, combiner, bufferSize());
@@ -372,7 +372,7 @@ public static <T, R> Observable<R> combineLatestArray(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestArray(
+    public static <@NonNull T, @NonNull R> Observable<R> combineLatestArray(
             @NonNull ObservableSource<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
@@ -419,7 +419,7 @@ public static <T, R> Observable<R> combineLatestArray(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, R> Observable<R> combineLatest(
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Observable<R> combineLatest(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -463,7 +463,7 @@ public static <T1, T2, R> Observable<R> combineLatest(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, R> Observable<R> combineLatest(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull R> Observable<R> combineLatest(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull ObservableSource<? extends T3> source3,
             @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> combiner) {
@@ -513,7 +513,7 @@ public static <T1, T2, T3, R> Observable<R> combineLatest(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, R> Observable<R> combineLatest(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull R> Observable<R> combineLatest(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
             @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> combiner) {
@@ -567,7 +567,7 @@ public static <T1, T2, T3, T4, R> Observable<R> combineLatest(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull R> Observable<R> combineLatest(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
             @NonNull ObservableSource<? extends T5> source5,
@@ -626,7 +626,7 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> combineLatest(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull R> Observable<R> combineLatest(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
             @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
@@ -690,7 +690,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> combineLatest(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull R> Observable<R> combineLatest(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
             @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
@@ -759,7 +759,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> combineLatest(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull R> Observable<R> combineLatest(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
             @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
@@ -832,7 +832,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> combineLatest(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLatest(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull T9, @NonNull R> Observable<R> combineLatest(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
             @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
@@ -890,7 +890,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> combineLates
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> combineLatestArrayDelayError(
+    public static <@NonNull T, @NonNull R> Observable<R> combineLatestArrayDelayError(
             @NonNull ObservableSource<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestArrayDelayError(sources, combiner, bufferSize());
@@ -938,7 +938,7 @@ public static <T, R> Observable<R> combineLatestArrayDelayError(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestArrayDelayError(@NonNull ObservableSource<? extends T>[] sources,
+    public static <@NonNull T, @NonNull R> Observable<R> combineLatestArrayDelayError(@NonNull ObservableSource<? extends T>[] sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -990,7 +990,7 @@ public static <T, R> Observable<R> combineLatestArrayDelayError(@NonNull Observa
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
+    public static <@NonNull T, @NonNull R> Observable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner) {
         return combineLatestDelayError(sources, combiner, bufferSize());
     }
@@ -1037,7 +1037,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<@No
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
+    public static <@NonNull T, @NonNull R> Observable<R> combineLatestDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> combiner, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -1066,7 +1066,7 @@ public static <T, R> Observable<R> combineLatestDelayError(@NonNull Iterable<@No
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> concat(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return fromIterable(sources).concatMapDelayError((Function)Functions.identity(), false, bufferSize());
     }
@@ -1091,7 +1091,7 @@ public static <T> Observable<T> concat(@NonNull Iterable<@NonNull ? extends Obse
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> concat(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return concat(sources, bufferSize());
     }
 
@@ -1119,7 +1119,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Obser
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
+    public static <@NonNull T> Observable<T> concat(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), bufferSize, ErrorMode.IMMEDIATE));
@@ -1147,7 +1147,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Obser
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
+    public static <@NonNull T> Observable<T> concat(@NonNull ObservableSource<? extends T> source1, ObservableSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return concatArray(source1, source2);
@@ -1177,7 +1177,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends T> so
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(
+    public static <@NonNull T> Observable<T> concat(
             @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             @NonNull ObservableSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -1212,7 +1212,7 @@ public static <T> Observable<T> concat(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(
+    public static <@NonNull T> Observable<T> concat(
             @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             @NonNull ObservableSource<? extends T> source3, @NonNull ObservableSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -1242,7 +1242,7 @@ public static <T> Observable<T> concat(
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> concatArray(@NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> concatArray(@NonNull ObservableSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -1271,7 +1271,7 @@ public static <T> Observable<T> concatArray(@NonNull ObservableSource<? extends
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> concatArrayDelayError(@NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> concatArrayDelayError(@NonNull ObservableSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return empty();
@@ -1306,7 +1306,7 @@ public static <T> Observable<T> concatArrayDelayError(@NonNull ObservableSource<
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Observable<T> concatArrayEager(@NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> concatArrayEager(@NonNull ObservableSource<? extends T>... sources) {
         return concatArrayEager(bufferSize(), bufferSize(), sources);
     }
 
@@ -1337,7 +1337,7 @@ public static <T> Observable<T> concatArrayEager(@NonNull ObservableSource<? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> concatArrayEager(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> concatArrayEager(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -1364,7 +1364,7 @@ public static <T> Observable<T> concatArrayEager(int maxConcurrency, int bufferS
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Observable<T> concatArrayEagerDelayError(@NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> concatArrayEagerDelayError(@NonNull ObservableSource<? extends T>... sources) {
         return concatArrayEagerDelayError(bufferSize(), bufferSize(), sources);
     }
 
@@ -1396,7 +1396,7 @@ public static <T> Observable<T> concatArrayEagerDelayError(@NonNull ObservableSo
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -1419,7 +1419,7 @@ public static <T> Observable<T> concatArrayEagerDelayError(int maxConcurrency, i
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return concatDelayError(fromIterable(sources));
     }
@@ -1443,7 +1443,7 @@ public static <T> Observable<T> concatDelayError(@NonNull Iterable<@NonNull ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> concatDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return concatDelayError(sources, bufferSize(), true);
     }
 
@@ -1470,7 +1470,7 @@ public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize, boolean tillTheEnd) {
+    public static <@NonNull T> Observable<T> concatDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize, boolean tillTheEnd) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatMap(sources, Functions.identity(), bufferSize, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY));
@@ -1497,7 +1497,7 @@ public static <T> Observable<T> concatDelayError(@NonNull ObservableSource<? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1528,7 +1528,7 @@ public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <@NonNull T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).concatMapEagerDelayError((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -1553,7 +1553,7 @@ public static <T> Observable<T> concatEager(@NonNull Iterable<@NonNull ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> concatEager(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return concatEager(sources, bufferSize(), bufferSize());
     }
 
@@ -1585,7 +1585,7 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <@NonNull T> Observable<T> concatEager(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return wrap(sources).concatMapEager((Function)Functions.identity(), maxConcurrency, bufferSize);
     }
 
@@ -1611,7 +1611,7 @@ public static <T> Observable<T> concatEager(@NonNull ObservableSource<? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         return concatEagerDelayError(sources, bufferSize(), bufferSize());
     }
 
@@ -1643,7 +1643,7 @@ public static <T> Observable<T> concatEagerDelayError(@NonNull Iterable<@NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <@NonNull T> Observable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -1669,7 +1669,7 @@ public static <T> Observable<T> concatEagerDelayError(@NonNull Iterable<@NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEagerDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> concatEagerDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return concatEagerDelayError(sources, bufferSize(), bufferSize());
     }
 
@@ -1700,7 +1700,7 @@ public static <T> Observable<T> concatEagerDelayError(@NonNull ObservableSource<
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> concatEagerDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <@NonNull T> Observable<T> concatEagerDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return wrap(sources).concatMapEagerDelayError((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -1758,7 +1758,7 @@ public static <T> Observable<T> concatEagerDelayError(@NonNull ObservableSource<
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> create(@NonNull ObservableOnSubscribe<T> source) {
+    public static <@NonNull T> Observable<T> create(@NonNull ObservableOnSubscribe<T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new ObservableCreate<>(source));
     }
@@ -1790,7 +1790,7 @@ public static <T> Observable<T> create(@NonNull ObservableOnSubscribe<T> source)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> defer(@NonNull Supplier<? extends ObservableSource<? extends T>> supplier) {
+    public static <@NonNull T> Observable<T> defer(@NonNull Supplier<? extends ObservableSource<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableDefer<>(supplier));
     }
@@ -1814,7 +1814,7 @@ public static <T> Observable<T> defer(@NonNull Supplier<? extends ObservableSour
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     @NonNull
-    public static <T> Observable<T> empty() {
+    public static <@NonNull T> Observable<T> empty() {
         return RxJavaPlugins.onAssembly((Observable<T>) ObservableEmpty.INSTANCE);
     }
 
@@ -1839,7 +1839,7 @@ public static <T> Observable<T> empty() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+    public static <@NonNull T> Observable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableError<>(supplier));
     }
@@ -1865,7 +1865,7 @@ public static <T> Observable<T> error(@NonNull Supplier<? extends Throwable> sup
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> error(@NonNull Throwable throwable) {
+    public static <@NonNull T> Observable<T> error(@NonNull Throwable throwable) {
         Objects.requireNonNull(throwable, "throwable is null");
         return error(Functions.justSupplier(throwable));
     }
@@ -1895,7 +1895,7 @@ public static <T> Observable<T> error(@NonNull Throwable throwable) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromAction(@NonNull Action action) {
+    public static <@NonNull T> Observable<T> fromAction(@NonNull Action action) {
         Objects.requireNonNull(action, "action is null");
         return RxJavaPlugins.onAssembly(new ObservableFromAction<>(action));
     }
@@ -1921,7 +1921,7 @@ public static <T> Observable<T> fromAction(@NonNull Action action) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> fromArray(@NonNull T... items) {
+    public static <@NonNull T> Observable<T> fromArray(@NonNull T... items) {
         Objects.requireNonNull(items, "items is null");
         if (items.length == 0) {
             return empty();
@@ -1965,7 +1965,7 @@ public static <T> Observable<T> fromArray(@NonNull T... items) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromCallable(@NonNull Callable<? extends T> callable) {
+    public static <@NonNull T> Observable<T> fromCallable(@NonNull Callable<? extends T> callable) {
         Objects.requireNonNull(callable, "callable is null");
         return RxJavaPlugins.onAssembly(new ObservableFromCallable<>(callable));
     }
@@ -1986,7 +1986,7 @@ public static <T> Observable<T> fromCallable(@NonNull Callable<? extends T> call
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromCompletable(@NonNull CompletableSource completableSource) {
+    public static <@NonNull T> Observable<T> fromCompletable(@NonNull CompletableSource completableSource) {
         Objects.requireNonNull(completableSource, "completableSource is null");
         return RxJavaPlugins.onAssembly(new ObservableFromCompletable<>(completableSource));
     }
@@ -2024,7 +2024,7 @@ public static <T> Observable<T> fromCompletable(@NonNull CompletableSource compl
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future) {
+    public static <@NonNull T> Observable<T> fromFuture(@NonNull Future<? extends T> future) {
         Objects.requireNonNull(future, "future is null");
         return RxJavaPlugins.onAssembly(new ObservableFromFuture<>(future, 0L, null));
     }
@@ -2066,7 +2066,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
+    public static <@NonNull T> Observable<T> fromFuture(@NonNull Future<? extends T> future, long timeout, @NonNull TimeUnit unit) {
         Objects.requireNonNull(future, "future is null");
         Objects.requireNonNull(unit, "unit is null");
         return RxJavaPlugins.onAssembly(new ObservableFromFuture<>(future, timeout, unit));
@@ -2094,7 +2094,7 @@ public static <T> Observable<T> fromFuture(@NonNull Future<? extends T> future,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromIterable(@NonNull Iterable<@NonNull ? extends T> source) {
+    public static <@NonNull T> Observable<T> fromIterable(@NonNull Iterable<? extends T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new ObservableFromIterable<>(source));
     }
@@ -2118,7 +2118,7 @@ public static <T> Observable<T> fromIterable(@NonNull Iterable<@NonNull ? extend
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
+    public static <@NonNull T> Observable<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
         Objects.requireNonNull(maybe, "maybe is null");
         return RxJavaPlugins.onAssembly(new MaybeToObservable<>(maybe));
     }
@@ -2155,7 +2155,7 @@ public static <T> Observable<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromPublisher(@NonNull Publisher<@NonNull ? extends T> publisher) {
+    public static <@NonNull T> Observable<T> fromPublisher(@NonNull Publisher<? extends T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new ObservableFromPublisher<>(publisher));
     }
@@ -2191,7 +2191,7 @@ public static <T> Observable<T> fromPublisher(@NonNull Publisher<@NonNull ? exte
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromRunnable(@NonNull Runnable run) {
+    public static <@NonNull T> Observable<T> fromRunnable(@NonNull Runnable run) {
         Objects.requireNonNull(run, "run is null");
         return RxJavaPlugins.onAssembly(new ObservableFromRunnable<>(run));
     }
@@ -2214,7 +2214,7 @@ public static <T> Observable<T> fromRunnable(@NonNull Runnable run) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromSingle(@NonNull SingleSource<T> source) {
+    public static <@NonNull T> Observable<T> fromSingle(@NonNull SingleSource<T> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new SingleToObservable<>(source));
     }
@@ -2252,7 +2252,7 @@ public static <T> Observable<T> fromSingle(@NonNull SingleSource<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
+    public static <@NonNull T> Observable<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableFromSupplier<>(supplier));
     }
@@ -2282,7 +2282,7 @@ public static <T> Observable<T> fromSupplier(@NonNull Supplier<? extends T> supp
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> generate(@NonNull Consumer<Emitter<T>> generator) {
+    public static <@NonNull T> Observable<T> generate(@NonNull Consumer<Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(Functions.nullSupplier(),
                 ObservableInternalHelper.simpleGenerator(generator), Functions.emptyConsumer());
@@ -2315,7 +2315,7 @@ public static <T> Observable<T> generate(@NonNull Consumer<Emitter<T>> generator
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, Emitter<T>> generator) {
+    public static <@NonNull T, @NonNull S> Observable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiConsumer<S, Emitter<T>> generator) {
         Objects.requireNonNull(generator, "generator is null");
         return generate(initialState, ObservableInternalHelper.simpleBiGenerator(generator), Functions.emptyConsumer());
     }
@@ -2349,7 +2349,7 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Observable<T> generate(
+    public static <@NonNull T, @NonNull S> Observable<T> generate(
             @NonNull Supplier<S> initialState,
             @NonNull BiConsumer<S, Emitter<T>> generator,
             @NonNull Consumer<? super S> disposeState) {
@@ -2385,7 +2385,7 @@ public static <T, S> Observable<T> generate(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, Emitter<T>, S> generator) {
+    public static <@NonNull T, @NonNull S> Observable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, Emitter<T>, S> generator) {
         return generate(initialState, generator, Functions.emptyConsumer());
     }
 
@@ -2419,7 +2419,7 @@ public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, S> Observable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, Emitter<T>, S> generator,
+    public static <@NonNull T, @NonNull S> Observable<T> generate(@NonNull Supplier<S> initialState, @NonNull BiFunction<S, Emitter<T>, S> generator,
             @NonNull Consumer<? super S> disposeState) {
         Objects.requireNonNull(initialState, "initialState is null");
         Objects.requireNonNull(generator, "generator is null");
@@ -2643,7 +2643,7 @@ public static Observable<Long> intervalRange(long start, long count, long initia
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item) {
         Objects.requireNonNull(item, "item is null");
         return RxJavaPlugins.onAssembly(new ObservableJust<>(item));
     }
@@ -2670,7 +2670,7 @@ public static <T> Observable<T> just(@NonNull T item) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item1, @NonNull T item2) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
 
@@ -2701,7 +2701,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2735,7 +2735,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2773,7 +2773,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2814,7 +2814,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2859,7 +2859,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2907,7 +2907,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -2958,7 +2958,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8, @NonNull T item9) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8, @NonNull T item9) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -3013,7 +3013,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8, @NonNull T item9, @NonNull T item10) {
+    public static <@NonNull T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNull T item3, @NonNull T item4, @NonNull T item5, @NonNull T item6, @NonNull T item7, @NonNull T item8, @NonNull T item9, @NonNull T item10) {
         Objects.requireNonNull(item1, "item1 is null");
         Objects.requireNonNull(item2, "item2 is null");
         Objects.requireNonNull(item3, "item3 is null");
@@ -3072,7 +3072,7 @@ public static <T> Observable<T> just(@NonNull T item1, @NonNull T item2, @NonNul
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <@NonNull T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -3121,7 +3121,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), false, maxConcurrency, bufferSize);
     }
 
@@ -3162,7 +3162,7 @@ public static <T> Observable<T> mergeArray(int maxConcurrency, int bufferSize, @
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity());
     }
 
@@ -3208,7 +3208,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), maxConcurrency);
     }
 
@@ -3250,7 +3250,7 @@ public static <T> Observable<T> merge(@NonNull Iterable<@NonNull ? extends Obser
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @NonNull
-    public static <T> Observable<T> merge(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> merge(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), false, Integer.MAX_VALUE, bufferSize()));
     }
@@ -3299,7 +3299,7 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Observable<T> merge(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), false, maxConcurrency, bufferSize()));
@@ -3344,7 +3344,7 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends Observ
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(@NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2) {
+    public static <@NonNull T> Observable<T> merge(@NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return fromArray(source1, source2).flatMap((Function)Functions.identity(), false, 2);
@@ -3391,7 +3391,7 @@ public static <T> Observable<T> merge(@NonNull ObservableSource<? extends T> sou
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(
+    public static <@NonNull T> Observable<T> merge(
             @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             @NonNull ObservableSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -3443,7 +3443,7 @@ public static <T> Observable<T> merge(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> merge(
+    public static <@NonNull T> Observable<T> merge(
             @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             @NonNull ObservableSource<? extends T> source3, @NonNull ObservableSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -3491,7 +3491,7 @@ public static <T> Observable<T> merge(
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> mergeArray(@NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> mergeArray(@NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), sources.length);
     }
 
@@ -3524,7 +3524,7 @@ public static <T> Observable<T> mergeArray(@NonNull ObservableSource<? extends T
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true);
     }
 
@@ -3562,7 +3562,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
+    public static <@NonNull T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency, int bufferSize) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -3601,7 +3601,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> mergeArrayDelayError(int maxConcurrency, int bufferSize, @NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, maxConcurrency, bufferSize);
     }
 
@@ -3637,7 +3637,7 @@ public static <T> Observable<T> mergeArrayDelayError(int maxConcurrency, int buf
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         return fromIterable(sources).flatMap((Function)Functions.identity(), true, maxConcurrency);
     }
 
@@ -3670,7 +3670,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull Iterable<@NonNull ? ext
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings({ "unchecked", "rawtypes" })
     @NonNull
-    public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> mergeDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), true, Integer.MAX_VALUE, bufferSize()));
     }
@@ -3709,7 +3709,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Observable<T> mergeDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int maxConcurrency) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
         return RxJavaPlugins.onAssembly(new ObservableFlatMap(sources, Functions.identity(), true, maxConcurrency, bufferSize()));
@@ -3746,7 +3746,7 @@ public static <T> Observable<T> mergeDelayError(@NonNull ObservableSource<? exte
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(
+    public static <@NonNull T> Observable<T> mergeDelayError(
             @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2) {
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
@@ -3787,7 +3787,7 @@ public static <T> Observable<T> mergeDelayError(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(
+    public static <@NonNull T> Observable<T> mergeDelayError(
             @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             @NonNull ObservableSource<? extends T> source3) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -3832,7 +3832,7 @@ public static <T> Observable<T> mergeDelayError(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> mergeDelayError(
+    public static <@NonNull T> Observable<T> mergeDelayError(
             @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             @NonNull ObservableSource<? extends T> source3, @NonNull ObservableSource<? extends T> source4) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -3872,7 +3872,7 @@ public static <T> Observable<T> mergeDelayError(
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     @SafeVarargs
-    public static <T> Observable<T> mergeArrayDelayError(@NonNull ObservableSource<? extends T>... sources) {
+    public static <@NonNull T> Observable<T> mergeArrayDelayError(@NonNull ObservableSource<? extends T>... sources) {
         return fromArray(sources).flatMap((Function)Functions.identity(), true, sources.length);
     }
 
@@ -3896,7 +3896,7 @@ public static <T> Observable<T> mergeArrayDelayError(@NonNull ObservableSource<?
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     @NonNull
-    public static <T> Observable<T> never() {
+    public static <@NonNull T> Observable<T> never() {
         return RxJavaPlugins.onAssembly((Observable<T>) ObservableNever.INSTANCE);
     }
 
@@ -4007,7 +4007,7 @@ public static Observable<Long> rangeLong(long start, long count) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2) {
+    public static <@NonNull T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize());
     }
 
@@ -4037,7 +4037,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(
+    public static <@NonNull T> Single<Boolean> sequenceEqual(
             @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             @NonNull BiPredicate<? super T, ? super T> isEqual) {
         return sequenceEqual(source1, source2, isEqual, bufferSize());
@@ -4072,7 +4072,7 @@ public static <T> Single<Boolean> sequenceEqual(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(
+    public static <@NonNull T> Single<Boolean> sequenceEqual(
             @NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             @NonNull BiPredicate<? super T, ? super T> isEqual, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -4108,7 +4108,7 @@ public static <T> Single<Boolean> sequenceEqual(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
+    public static <@NonNull T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? extends T> source1, @NonNull ObservableSource<? extends T> source2,
             int bufferSize) {
         return sequenceEqual(source1, source2, ObjectHelper.equalsPredicate(), bufferSize);
     }
@@ -4145,7 +4145,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull ObservableSource<? exte
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
+    public static <@NonNull T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), bufferSize, false));
@@ -4179,7 +4179,7 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return switchOnNext(sources, bufferSize());
     }
 
@@ -4213,7 +4213,7 @@ public static <T> Observable<T> switchOnNext(@NonNull ObservableSource<? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources) {
         return switchOnNextDelayError(sources, bufferSize());
     }
 
@@ -4251,7 +4251,7 @@ public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
+    public static <@NonNull T> Observable<T> switchOnNextDelayError(@NonNull ObservableSource<? extends ObservableSource<? extends T>> sources, int bufferSize) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMap(sources, Functions.identity(), bufferSize, true));
@@ -4331,7 +4331,7 @@ public static Observable<Long> timer(long delay, @NonNull TimeUnit unit, @NonNul
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubscribe) {
+    public static <@NonNull T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         if (onSubscribe instanceof Observable) {
             throw new IllegalArgumentException("unsafeCreate(Observable) should be upgraded");
@@ -4365,7 +4365,7 @@ public static <T> Observable<T> unsafeCreate(@NonNull ObservableSource<T> onSubs
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, D> Observable<T> using(
+    public static <@NonNull T, @NonNull D> Observable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier,
             @NonNull Consumer<? super D> resourceCleanup) {
@@ -4404,7 +4404,7 @@ public static <T, D> Observable<T> using(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, D> Observable<T> using(
+    public static <@NonNull T, @NonNull D> Observable<T> using(
             @NonNull Supplier<? extends D> resourceSupplier,
             @NonNull Function<? super D, ? extends ObservableSource<? extends T>> sourceSupplier,
             @NonNull Consumer<? super D> resourceCleanup, boolean eager) {
@@ -4430,7 +4430,7 @@ public static <T, D> Observable<T> using(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
+    public static <@NonNull T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
         Objects.requireNonNull(source, "source is null");
         if (source instanceof Observable) {
             return RxJavaPlugins.onAssembly((Observable<T>)source);
@@ -4487,7 +4487,7 @@ public static <T> Observable<T> wrap(@NonNull ObservableSource<T> source) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
+    public static <@NonNull T, @NonNull R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources, @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableZip<>(null, sources, zipper, bufferSize(), false));
@@ -4548,7 +4548,7 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends Obse
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
+    public static <@NonNull T, @NonNull R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends ObservableSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> zipper, boolean delayError,
             int bufferSize) {
         Objects.requireNonNull(zipper, "zipper is null");
@@ -4605,7 +4605,7 @@ public static <T, R> Observable<R> zip(@NonNull Iterable<@NonNull ? extends Obse
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -4663,7 +4663,7 @@ public static <T1, T2, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -4723,7 +4723,7 @@ public static <T1, T2, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper, boolean delayError, int bufferSize) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -4784,7 +4784,7 @@ public static <T1, T2, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, T3, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull ObservableSource<? extends T3> source3,
             @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper) {
@@ -4851,7 +4851,7 @@ public static <T1, T2, T3, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, T3, T4, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2,
             @NonNull ObservableSource<? extends T3> source3, @NonNull ObservableSource<? extends T4> source4,
             @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper) {
@@ -4922,7 +4922,7 @@ public static <T1, T2, T3, T4, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
             @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5,
             @NonNull Function5<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? extends R> zipper) {
@@ -4996,7 +4996,7 @@ public static <T1, T2, T3, T4, T5, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
             @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
             @NonNull Function6<? super T1, ? super T2, ? super T3, ? super T4, ? super T5, ? super T6, ? extends R> zipper) {
@@ -5075,7 +5075,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
             @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
             @NonNull ObservableSource<? extends T7> source7,
@@ -5159,7 +5159,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
             @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
             @NonNull ObservableSource<? extends T7> source7, @NonNull ObservableSource<? extends T8> source8,
@@ -5247,7 +5247,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Observable<R> zip(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull T9, @NonNull R> Observable<R> zip(
             @NonNull ObservableSource<? extends T1> source1, @NonNull ObservableSource<? extends T2> source2, @NonNull ObservableSource<? extends T3> source3,
             @NonNull ObservableSource<? extends T4> source4, @NonNull ObservableSource<? extends T5> source5, @NonNull ObservableSource<? extends T6> source6,
             @NonNull ObservableSource<? extends T7> source7, @NonNull ObservableSource<? extends T8> source8, @NonNull ObservableSource<? extends T9> source9,
@@ -5321,7 +5321,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Observable<R> zip(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T, R> Observable<R> zipArray(
+    public static <@NonNull T, @NonNull R> Observable<R> zipArray(
             @NonNull Function<? super Object[], ? extends R> zipper,
             boolean delayError, int bufferSize,
             @NonNull ObservableSource<? extends T>... sources) {
@@ -6046,7 +6046,7 @@ public final void blockingSubscribe(@NonNull Observer<? super T> observer) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U extends Collection<? super T>> Observable<U> buffer(int count, int skip, @NonNull Supplier<U> bufferSupplier) {
+    public final <@NonNull U extends Collection<? super T>> Observable<U> buffer(int count, int skip, @NonNull Supplier<U> bufferSupplier) {
         ObjectHelper.verifyPositive(count, "count");
         ObjectHelper.verifyPositive(skip, "skip");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
@@ -6399,7 +6399,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <TOpening, TClosing> Observable<@NonNull List<T>> buffer(
+    public final <@NonNull TOpening, @NonNull TClosing> Observable<@NonNull List<T>> buffer(
             @NonNull ObservableSource<? extends TOpening> openingIndicator,
             @NonNull Function<? super TOpening, ? extends ObservableSource<? extends TClosing>> closingIndicator) {
         return buffer(openingIndicator, closingIndicator, ArrayListSupplier.asSupplier());
@@ -6436,7 +6436,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <TOpening, TClosing, @NonNull U extends Collection<? super T>> Observable<U> buffer(
+    public final <@NonNull TOpening, @NonNull TClosing, @NonNull U extends Collection<? super T>> Observable<U> buffer(
             @NonNull ObservableSource<? extends TOpening> openingIndicator,
             @NonNull Function<? super TOpening, ? extends ObservableSource<? extends TClosing>> closingIndicator,
             @NonNull Supplier<U> bufferSupplier) {
@@ -6473,7 +6473,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundaryIndicator) {
+    public final <@NonNull B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundaryIndicator) {
         return buffer(boundaryIndicator, ArrayListSupplier.asSupplier());
     }
 
@@ -6507,7 +6507,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundaryIndicator, int initialCapacity) {
+    public final <@NonNull B> Observable<@NonNull List<T>> buffer(@NonNull ObservableSource<B> boundaryIndicator, int initialCapacity) {
         ObjectHelper.verifyPositive(initialCapacity, "initialCapacity");
         return buffer(boundaryIndicator, Functions.createArrayList(initialCapacity));
     }
@@ -6543,7 +6543,7 @@ public final <U extends Collection<? super T>> Observable<U> buffer(int count, i
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B, @NonNull U extends Collection<? super T>> Observable<U> buffer(@NonNull ObservableSource<B> boundaryIndicator, @NonNull Supplier<U> bufferSupplier) {
+    public final <@NonNull B, @NonNull U extends Collection<? super T>> Observable<U> buffer(@NonNull ObservableSource<B> boundaryIndicator, @NonNull Supplier<U> bufferSupplier) {
         Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
         Objects.requireNonNull(bufferSupplier, "bufferSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableBufferExactBoundary<>(this, boundaryIndicator, bufferSupplier));
@@ -6688,7 +6688,7 @@ public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
+    public final <@NonNull U> Observable<U> cast(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
@@ -6722,7 +6722,7 @@ public final <U> Observable<U> cast(@NonNull Class<U> clazz) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
+    public final <@NonNull U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSupplier, @NonNull BiConsumer<? super U, ? super T> collector) {
         Objects.requireNonNull(initialItemSupplier, "initialItemSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ObservableCollectSingle<>(this, initialItemSupplier, collector));
@@ -6757,7 +6757,7 @@ public final <U> Single<U> collect(@NonNull Supplier<? extends U> initialItemSup
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Single<U> collectInto(@NonNull U initialItem, @NonNull BiConsumer<? super U, ? super T> collector) {
+    public final <@NonNull U> Single<U> collectInto(@NonNull U initialItem, @NonNull BiConsumer<? super U, ? super T> collector) {
         Objects.requireNonNull(initialItem, "initialItem is null");
         return collect(Functions.justSupplier(initialItem), collector);
     }
@@ -6786,7 +6786,7 @@ public final <U> Single<U> collectInto(@NonNull U initialItem, @NonNull BiConsum
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> compose(@NonNull ObservableTransformer<? super T, ? extends R> composer) {
+    public final <@NonNull R> Observable<R> compose(@NonNull ObservableTransformer<? super T, ? extends R> composer) {
         return wrap(((ObservableTransformer<T, R>) Objects.requireNonNull(composer, "composer is null")).apply(this));
     }
 
@@ -6817,7 +6817,7 @@ public final <R> Observable<R> compose(@NonNull ObservableTransformer<? super T,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return concatMap(mapper, 2);
     }
 
@@ -6851,7 +6851,7 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
+    public final <@NonNull R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
@@ -6896,7 +6896,7 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize, @NonNull Scheduler scheduler) {
+    public final <@NonNull R> Observable<R> concatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -6928,7 +6928,7 @@ public final <R> Observable<R> concatMap(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return concatMapDelayError(mapper, true, bufferSize());
     }
 
@@ -6963,7 +6963,7 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    public final <@NonNull R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -7008,7 +7008,7 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    public final <@NonNull R> Observable<R> concatMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd, int bufferSize, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
@@ -7039,7 +7039,7 @@ public final <R> Observable<R> concatMapDelayError(@NonNull Function<? super T,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> concatMapEager(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return concatMapEager(mapper, Integer.MAX_VALUE, bufferSize());
     }
 
@@ -7069,7 +7069,7 @@ public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    public final <@NonNull R> Observable<R> concatMapEager(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -7103,7 +7103,7 @@ public final <R> Observable<R> concatMapEager(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    public final <@NonNull R> Observable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd) {
         return concatMapEagerDelayError(mapper, tillTheEnd, Integer.MAX_VALUE, bufferSize());
     }
@@ -7139,7 +7139,7 @@ public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    public final <@NonNull R> Observable<R> concatMapEagerDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean tillTheEnd, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -7318,7 +7318,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
+    public final <@NonNull U> Observable<U> concatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
     }
@@ -7347,7 +7347,7 @@ public final <U> Observable<U> concatMapIterable(@NonNull Function<? super T, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return concatMapMaybe(mapper, 2);
     }
 
@@ -7378,7 +7378,7 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, int bufferSize) {
+    public final <@NonNull R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, ErrorMode.IMMEDIATE, bufferSize));
@@ -7408,7 +7408,7 @@ public final <R> Observable<R> concatMapMaybe(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return concatMapMaybeDelayError(mapper, true, 2);
     }
 
@@ -7442,7 +7442,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd) {
+    public final <@NonNull R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd) {
         return concatMapMaybeDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -7478,7 +7478,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int bufferSize) {
+    public final <@NonNull R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean tillTheEnd, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapMaybe<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, bufferSize));
@@ -7508,7 +7508,7 @@ public final <R> Observable<R> concatMapMaybeDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return concatMapSingle(mapper, 2);
     }
 
@@ -7539,7 +7539,7 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, int bufferSize) {
+    public final <@NonNull R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, ErrorMode.IMMEDIATE, bufferSize));
@@ -7569,7 +7569,7 @@ public final <R> Observable<R> concatMapSingle(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return concatMapSingleDelayError(mapper, true, 2);
     }
 
@@ -7603,7 +7603,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd) {
+    public final <@NonNull R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd) {
         return concatMapSingleDelayError(mapper, tillTheEnd, 2);
     }
 
@@ -7639,7 +7639,7 @@ public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? sup
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int bufferSize) {
+    public final <@NonNull R> Observable<R> concatMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean tillTheEnd, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(this, mapper, tillTheEnd ? ErrorMode.END : ErrorMode.BOUNDARY, bufferSize));
@@ -7812,7 +7812,7 @@ public final Single<Long> count() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> debounce(@NonNull Function<? super T, ? extends ObservableSource<U>> debounceIndicator) {
+    public final <@NonNull U> Observable<T> debounce(@NonNull Function<? super T, ? extends ObservableSource<U>> debounceIndicator) {
         Objects.requireNonNull(debounceIndicator, "debounceIndicator is null");
         return RxJavaPlugins.onAssembly(new ObservableDebounce<>(this, debounceIndicator));
     }
@@ -7949,7 +7949,7 @@ public final Observable<T> defaultIfEmpty(@NonNull T defaultItem) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> delay(@NonNull Function<? super T, ? extends ObservableSource<U>> itemDelayIndicator) {
+    public final <@NonNull U> Observable<T> delay(@NonNull Function<? super T, ? extends ObservableSource<U>> itemDelayIndicator) {
         Objects.requireNonNull(itemDelayIndicator, "itemDelayIndicator is null");
         return flatMap(ObservableInternalHelper.itemDelay(itemDelayIndicator));
     }
@@ -8101,7 +8101,7 @@ public final Observable<T> delay(long time, @NonNull TimeUnit unit, @NonNull Sch
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptionIndicator,
+    public final <@NonNull U, @NonNull V> Observable<T> delay(@NonNull ObservableSource<U> subscriptionIndicator,
             @NonNull Function<? super T, ? extends ObservableSource<V>> itemDelayIndicator) {
         return delaySubscription(subscriptionIndicator).delay(itemDelayIndicator);
     }
@@ -8126,7 +8126,7 @@ public final <U, V> Observable<T> delay(@NonNull ObservableSource<U> subscriptio
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> delaySubscription(@NonNull ObservableSource<U> subscriptionIndicator) {
+    public final <@NonNull U> Observable<T> delaySubscription(@NonNull ObservableSource<U> subscriptionIndicator) {
         Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
         return RxJavaPlugins.onAssembly(new ObservableDelaySubscriptionOther<>(this, subscriptionIndicator));
     }
@@ -8232,7 +8232,7 @@ public final Observable<T> delaySubscription(long time, @NonNull TimeUnit unit,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> dematerialize(@NonNull Function<? super T, Notification<R>> selector) {
+    public final <@NonNull R> Observable<R> dematerialize(@NonNull Function<? super T, Notification<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
         return RxJavaPlugins.onAssembly(new ObservableDematerialize<>(this, selector));
     }
@@ -8312,7 +8312,7 @@ public final Observable<T> distinct() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelector) {
+    public final <@NonNull K> Observable<T> distinct(@NonNull Function<? super T, K> keySelector) {
         return distinct(keySelector, Functions.createHashSet());
     }
 
@@ -8345,7 +8345,7 @@ public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelec
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Observable<T> distinct(@NonNull Function<? super T, K> keySelector, @NonNull Supplier<? extends Collection<? super K>> collectionSupplier) {
+    public final <@NonNull K> Observable<T> distinct(@NonNull Function<? super T, K> keySelector, @NonNull Supplier<? extends Collection<? super K>> collectionSupplier) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         return RxJavaPlugins.onAssembly(new ObservableDistinct<>(this, keySelector, collectionSupplier));
@@ -8427,7 +8427,7 @@ public final Observable<T> distinctUntilChanged() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Observable<T> distinctUntilChanged(@NonNull Function<? super T, K> keySelector) {
+    public final <@NonNull K> Observable<T> distinctUntilChanged(@NonNull Function<? super T, K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         return RxJavaPlugins.onAssembly(new ObservableDistinctUntilChanged<>(this, keySelector, ObjectHelper.equalsPredicate()));
     }
@@ -9014,7 +9014,7 @@ public final Single<T> firstOrError() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return flatMap(mapper, false);
     }
 
@@ -9043,7 +9043,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, boolean delayErrors) {
+    public final <@NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, boolean delayErrors) {
         return flatMap(mapper, delayErrors, Integer.MAX_VALUE);
     }
 
@@ -9077,7 +9077,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
+    public final <@NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, delayErrors, maxConcurrency, bufferSize());
     }
 
@@ -9113,7 +9113,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
+    public final <@NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper,
             boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -9156,7 +9156,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMap(
+    public final <@NonNull R> Observable<R> flatMap(
             @NonNull Function<? super T, ? extends ObservableSource<? extends R>> onNextMapper,
             @NonNull Function<? super Throwable, ? extends ObservableSource<? extends R>> onErrorMapper,
             @NonNull Supplier<? extends ObservableSource<? extends R>> onCompleteSupplier) {
@@ -9198,7 +9198,7 @@ public final <R> Observable<R> flatMap(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMap(
+    public final <@NonNull R> Observable<R> flatMap(
             @NonNull Function<? super T, ? extends ObservableSource<? extends R>> onNextMapper,
             @NonNull Function<Throwable, ? extends ObservableSource<? extends R>> onErrorMapper,
             @NonNull Supplier<? extends ObservableSource<? extends R>> onCompleteSupplier,
@@ -9236,7 +9236,7 @@ public final <R> Observable<R> flatMap(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int maxConcurrency) {
+    public final <@NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int maxConcurrency) {
         return flatMap(mapper, false, maxConcurrency, bufferSize());
     }
 
@@ -9266,7 +9266,7 @@ public final <R> Observable<R> flatMap(@NonNull Function<? super T, ? extends Ob
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         return flatMap(mapper, combiner, false, bufferSize(), bufferSize());
     }
@@ -9300,7 +9300,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors) {
         return flatMap(mapper, combiner, delayErrors, bufferSize(), bufferSize());
     }
@@ -9339,7 +9339,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency) {
         return flatMap(mapper, combiner, delayErrors, maxConcurrency, bufferSize());
     }
@@ -9380,7 +9380,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, boolean delayErrors, int maxConcurrency, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -9418,7 +9418,7 @@ public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Observable<R> flatMap(@NonNull Function<? super T, ? extends ObservableSource<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner, int maxConcurrency) {
         return flatMap(mapper, combiner, false, maxConcurrency, bufferSize());
     }
@@ -9488,7 +9488,7 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
+    public final <@NonNull U> Observable<U> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlattenIterable<>(this, mapper));
     }
@@ -9522,7 +9522,7 @@ public final <U> Observable<U> flatMapIterable(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Observable<V> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper,
+    public final <@NonNull U, @NonNull V> Observable<V> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends V> combiner) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -9546,7 +9546,7 @@ public final <U, V> Observable<V> flatMapIterable(@NonNull Function<? super T, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return flatMapMaybe(mapper, false);
     }
 
@@ -9570,7 +9570,7 @@ public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? exten
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors) {
+    public final <@NonNull R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper, boolean delayErrors) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapMaybe<>(this, mapper, delayErrors));
     }
@@ -9592,7 +9592,7 @@ public final <R> Observable<R> flatMapMaybe(@NonNull Function<? super T, ? exten
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         return flatMapSingle(mapper, false);
     }
 
@@ -9616,7 +9616,7 @@ public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? exte
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors) {
+    public final <@NonNull R> Observable<R> flatMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper, boolean delayErrors) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapSingle<>(this, mapper, delayErrors));
     }
@@ -9775,7 +9775,7 @@ public final Disposable forEachWhile(@NonNull Predicate<? super T> onNext, @NonN
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector) {
+    public final <@NonNull K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector) {
         return groupBy(keySelector, (Function)Functions.identity(), false, bufferSize());
     }
 
@@ -9820,7 +9820,7 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector, boolean delayError) {
+    public final <@NonNull K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<? super T, ? extends K> keySelector, boolean delayError) {
         return groupBy(keySelector, (Function)Functions.identity(), delayError, bufferSize());
     }
 
@@ -9865,7 +9865,7 @@ public final <K> Observable<GroupedObservable<K, T>> groupBy(@NonNull Function<?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+    public final <@NonNull K, @NonNull V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
             Function<? super T, ? extends V> valueSelector) {
         return groupBy(keySelector, valueSelector, false, bufferSize());
     }
@@ -9914,7 +9914,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+    public final <@NonNull K, @NonNull V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector, boolean delayError) {
         return groupBy(keySelector, valueSelector, delayError, bufferSize());
     }
@@ -9966,7 +9966,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
+    public final <@NonNull K, @NonNull V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector,
             boolean delayError, int bufferSize) {
         Objects.requireNonNull(keySelector, "keySelector is null");
@@ -10010,7 +10010,7 @@ public final <K, V> Observable<GroupedObservable<K, V>> groupBy(@NonNull Functio
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> groupJoin(
+    public final <@NonNull TRight, @NonNull TLeftEnd, @NonNull TRightEnd, @NonNull R> Observable<R> groupJoin(
             @NonNull ObservableSource<? extends TRight> other,
             @NonNull Function<? super T, ? extends ObservableSource<TLeftEnd>> leftEnd,
             @NonNull Function<? super TRight, ? extends ObservableSource<TRightEnd>> rightEnd,
@@ -10122,7 +10122,7 @@ public final Single<Boolean> isEmpty() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <TRight, TLeftEnd, TRightEnd, R> Observable<R> join(
+    public final <@NonNull TRight, @NonNull TLeftEnd, @NonNull TRightEnd, @NonNull R> Observable<R> join(
             @NonNull ObservableSource<? extends TRight> other,
             @NonNull Function<? super T, ? extends ObservableSource<TLeftEnd>> leftEnd,
             @NonNull Function<? super TRight, ? extends ObservableSource<TRightEnd>> rightEnd,
@@ -10346,7 +10346,7 @@ public final Single<T> lastOrError() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? super T> lifter) {
+    public final <@NonNull R> Observable<R> lift(@NonNull ObservableOperator<? extends R, ? super T> lifter) {
         Objects.requireNonNull(lifter, "lifter is null");
         return RxJavaPlugins.onAssembly(new ObservableLift<>(this, lifter));
     }
@@ -10636,7 +10636,7 @@ public final Observable<T> observeOn(@NonNull Scheduler scheduler, boolean delay
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<U> ofType(@NonNull Class<U> clazz) {
+    public final <@NonNull U> Observable<U> ofType(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
@@ -10893,7 +10893,7 @@ public final ConnectableObservable<T> publish() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> publish(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
+    public final <@NonNull R> Observable<R> publish(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
         return RxJavaPlugins.onAssembly(new ObservablePublishSelector<>(this, selector));
     }
@@ -11183,7 +11183,7 @@ public final ConnectableObservable<T> replay() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
+    public final <@NonNull R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector) {
         Objects.requireNonNull(selector, "selector is null");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this), selector);
     }
@@ -11218,7 +11218,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize) {
+    public final <@NonNull R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, bufferSize, false), selector);
@@ -11256,7 +11256,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, boolean eagerTruncate) {
+    public final <@NonNull R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return ObservableReplay.multicastSelector(ObservableInternalHelper.replaySupplier(this, bufferSize, eagerTruncate), selector);
@@ -11295,7 +11295,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit) {
+    public final <@NonNull R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit) {
         return replay(selector, bufferSize, time, unit, Schedulers.computation());
     }
 
@@ -11337,7 +11337,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+    public final <@NonNull R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
@@ -11385,7 +11385,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
+    public final <@NonNull R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, int bufferSize, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         Objects.requireNonNull(unit, "unit is null");
@@ -11421,7 +11421,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.COMPUTATION)
     @NonNull
-    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, @NonNull TimeUnit unit) {
+    public final <@NonNull R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, @NonNull TimeUnit unit) {
         return replay(selector, time, unit, Schedulers.computation());
     }
 
@@ -11455,7 +11455,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
+    public final <@NonNull R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -11494,7 +11494,7 @@ public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ?
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final <R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
+    public final <@NonNull R> Observable<R> replay(@NonNull Function<? super Observable<T>, ? extends ObservableSource<R>> selector, long time, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean eagerTruncate) {
         Objects.requireNonNull(selector, "selector is null");
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -12192,7 +12192,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler) {
+    public final <@NonNull U> Observable<T> sample(@NonNull ObservableSource<U> sampler) {
         Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<>(this, sampler, false));
     }
@@ -12225,7 +12225,7 @@ public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> sample(@NonNull ObservableSource<U> sampler, boolean emitLast) {
+    public final <@NonNull U> Observable<T> sample(@NonNull ObservableSource<U> sampler, boolean emitLast) {
         Objects.requireNonNull(sampler, "sampler is null");
         return RxJavaPlugins.onAssembly(new ObservableSampleWithObservable<>(this, sampler, emitLast));
     }
@@ -12303,7 +12303,7 @@ public final Observable<T> scan(@NonNull BiFunction<T, T, T> accumulator) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction<R, ? super T, R> accumulator) {
+    public final <@NonNull R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction<R, ? super T, R> accumulator) {
         Objects.requireNonNull(initialValue, "initialValue is null");
         return scanWith(Functions.justSupplier(initialValue), accumulator);
     }
@@ -12338,7 +12338,7 @@ public final <R> Observable<R> scan(@NonNull R initialValue, @NonNull BiFunction
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> scanWith(@NonNull Supplier<R> seedSupplier, @NonNull BiFunction<R, ? super T, R> accumulator) {
+    public final <@NonNull R> Observable<R> scanWith(@NonNull Supplier<R> seedSupplier, @NonNull BiFunction<R, ? super T, R> accumulator) {
         Objects.requireNonNull(seedSupplier, "seedSupplier is null");
         Objects.requireNonNull(accumulator, "accumulator is null");
         return RxJavaPlugins.onAssembly(new ObservableScanSeed<>(this, seedSupplier, accumulator));
@@ -12758,7 +12758,7 @@ public final Observable<T> skipLast(long time, @NonNull TimeUnit unit, @NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> skipUntil(@NonNull ObservableSource<U> other) {
+    public final <@NonNull U> Observable<T> skipUntil(@NonNull ObservableSource<U> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableSkipUntil<>(this, other));
     }
@@ -12862,7 +12862,7 @@ public final Observable<T> sorted(@NonNull Comparator<? super T> comparator) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Observable<T> startWithIterable(@NonNull Iterable<@NonNull ? extends T> items) {
+    public final Observable<T> startWithIterable(@NonNull Iterable<? extends T> items) {
         return concatArray(fromIterable(items), this);
     }
 
@@ -13305,7 +13305,7 @@ public final Observable<T> switchIfEmpty(@NonNull ObservableSource<? extends T>
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> switchMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return switchMap(mapper, bufferSize());
     }
 
@@ -13338,7 +13338,7 @@ public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> switchMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
+    public final <@NonNull R> Observable<R> switchMap(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
@@ -13472,7 +13472,7 @@ public final Completable switchMapCompletableDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<>(this, mapper, false));
     }
@@ -13500,7 +13500,7 @@ public final <R> Observable<R> switchMapMaybe(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapMaybe<>(this, mapper, true));
     }
@@ -13532,7 +13532,7 @@ public final <R> Observable<R> switchMapMaybeDelayError(@NonNull Function<? supe
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle<>(this, mapper, false));
     }
@@ -13565,7 +13565,7 @@ public final <R> Observable<R> switchMapSingle(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> switchMapSingleDelayError(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableSwitchMapSingle<>(this, mapper, true));
     }
@@ -13598,7 +13598,7 @@ public final <R> Observable<R> switchMapSingleDelayError(@NonNull Function<? sup
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> switchMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper) {
         return switchMapDelayError(mapper, bufferSize());
     }
 
@@ -13633,7 +13633,7 @@ public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T,
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> switchMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
+    public final <@NonNull R> Observable<R> switchMapDelayError(@NonNull Function<? super T, ? extends ObservableSource<? extends R>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         if (this instanceof ScalarSupplier) {
@@ -14048,7 +14048,7 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> Observable<T> takeUntil(@NonNull ObservableSource<U> other) {
+    public final <@NonNull U> Observable<T> takeUntil(@NonNull ObservableSource<U> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new ObservableTakeUntil<>(this, other));
     }
@@ -14556,7 +14556,7 @@ public final Observable<Timed<T>> timeInterval(@NonNull TimeUnit unit, @NonNull
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator) {
+    public final <@NonNull V> Observable<T> timeout(@NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator) {
         return timeout0(null, itemTimeoutIndicator, null);
     }
 
@@ -14588,7 +14588,7 @@ public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends Ob
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <V> Observable<T> timeout(@NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
+    public final <@NonNull V> Observable<T> timeout(@NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
             @NonNull ObservableSource<? extends T> fallback) {
         Objects.requireNonNull(fallback, "fallback is null");
         return timeout0(null, itemTimeoutIndicator, fallback);
@@ -14740,7 +14740,7 @@ public final Observable<T> timeout(long timeout, @NonNull TimeUnit unit, @NonNul
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Observable<T> timeout(@NonNull ObservableSource<U> firstTimeoutIndicator,
+    public final <@NonNull U, @NonNull V> Observable<T> timeout(@NonNull ObservableSource<U> firstTimeoutIndicator,
             @NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator) {
         Objects.requireNonNull(firstTimeoutIndicator, "firstTimeoutIndicator is null");
         return timeout0(firstTimeoutIndicator, itemTimeoutIndicator, null);
@@ -14778,7 +14778,7 @@ public final <U, V> Observable<T> timeout(@NonNull ObservableSource<U> firstTime
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Observable<T> timeout(
+    public final <@NonNull U, @NonNull V> Observable<T> timeout(
             @NonNull ObservableSource<U> firstTimeoutIndicator,
             @NonNull Function<? super T, ? extends ObservableSource<V>> itemTimeoutIndicator,
             @NonNull ObservableSource<? extends T> fallback) {
@@ -14918,7 +14918,7 @@ public final Observable<Timed<T>> timestamp(@NonNull TimeUnit unit, @NonNull Sch
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
+    public final <@NonNull R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
         return Objects.requireNonNull(converter, "converter is null").apply(this);
     }
 
@@ -15048,7 +15048,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Single<@NonNull Map<K, T>> toMap(@NonNull Function<? super T, ? extends K> keySelector) {
+    public final <@NonNull K> Single<@NonNull Map<K, T>> toMap(@NonNull Function<? super T, ? extends K> keySelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
         return collect(HashMapSupplier.asSupplier(), Functions.toMapKeySelector(keySelector));
     }
@@ -15083,7 +15083,7 @@ public final <R> R to(@NonNull ObservableConverter<T, ? extends R> converter) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Single<Map<K, V>> toMap(
+    public final <@NonNull K, @NonNull V> Single<Map<K, V>> toMap(
             @NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector) {
         Objects.requireNonNull(keySelector, "keySelector is null");
@@ -15120,7 +15120,7 @@ public final <K, V> Single<Map<K, V>> toMap(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Single<Map<K, V>> toMap(
+    public final <@NonNull K, @NonNull V> Single<Map<K, V>> toMap(
             @NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector,
             @NonNull Supplier<? extends Map<K, V>> mapSupplier) {
@@ -15154,7 +15154,7 @@ public final <K, V> Single<Map<K, V>> toMap(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K> Single<@NonNull Map<K, Collection<T>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector) {
+    public final <@NonNull K> Single<@NonNull Map<K, Collection<T>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector) {
         Function<? super T, ? extends T> valueSelector = Functions.identity();
         Supplier<Map<K, Collection<T>>> mapSupplier = HashMapSupplier.asSupplier();
         Function<K, List<T>> collectionFactory = ArrayListSupplier.asFunction();
@@ -15189,7 +15189,7 @@ public final <K, V> Single<Map<K, V>> toMap(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Single<@NonNull Map<K, Collection<V>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector, Function<? super T, ? extends V> valueSelector) {
+    public final <@NonNull K, @NonNull V> Single<@NonNull Map<K, Collection<V>>> toMultimap(@NonNull Function<? super T, ? extends K> keySelector, Function<? super T, ? extends V> valueSelector) {
         Supplier<Map<K, Collection<V>>> mapSupplier = HashMapSupplier.asSupplier();
         Function<K, List<V>> collectionFactory = ArrayListSupplier.asFunction();
         return toMultimap(keySelector, valueSelector, mapSupplier, collectionFactory);
@@ -15227,7 +15227,7 @@ public final <K, V> Single<Map<K, V>> toMap(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Single<@NonNull Map<K, Collection<V>>> toMultimap(
+    public final <@NonNull K, @NonNull V> Single<@NonNull Map<K, Collection<V>>> toMultimap(
             @NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector,
             @NonNull Supplier<? extends Map<K, Collection<V>>> mapSupplier,
@@ -15269,7 +15269,7 @@ public final <K, V> Single<Map<K, V>> toMap(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <K, V> Single<@NonNull Map<K, Collection<V>>> toMultimap(
+    public final <@NonNull K, @NonNull V> Single<@NonNull Map<K, Collection<V>>> toMultimap(
             @NonNull Function<? super T, ? extends K> keySelector,
             @NonNull Function<? super T, ? extends V> valueSelector,
             @NonNull Supplier<Map<K, Collection<V>>> mapSupplier
@@ -15996,7 +15996,7 @@ public final Observable<Observable<T>> window(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundaryIndicator) {
+    public final <@NonNull B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundaryIndicator) {
         return window(boundaryIndicator, bufferSize());
     }
 
@@ -16030,7 +16030,7 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundaryIndicator, int bufferSize) {
+    public final <@NonNull B> Observable<Observable<T>> window(@NonNull ObservableSource<B> boundaryIndicator, int bufferSize) {
         Objects.requireNonNull(boundaryIndicator, "boundaryIndicator is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ObservableWindowBoundary<>(this, boundaryIndicator, bufferSize));
@@ -16067,7 +16067,7 @@ public final <B> Observable<Observable<T>> window(@NonNull ObservableSource<B> b
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Observable<Observable<T>> window(
+    public final <@NonNull U, @NonNull V> Observable<Observable<T>> window(
             @NonNull ObservableSource<U> openingIndicator,
             @NonNull Function<? super U, ? extends ObservableSource<V>> closingIndicator) {
         return window(openingIndicator, closingIndicator, bufferSize());
@@ -16107,7 +16107,7 @@ public final <U, V> Observable<Observable<T>> window(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, V> Observable<Observable<T>> window(
+    public final <@NonNull U, @NonNull V> Observable<Observable<T>> window(
             @NonNull ObservableSource<U> openingIndicator,
             @NonNull Function<? super U, ? extends ObservableSource<V>> closingIndicator, int bufferSize) {
         Objects.requireNonNull(openingIndicator, "openingIndicator is null");
@@ -16149,7 +16149,7 @@ public final <U, V> Observable<Observable<T>> window(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> withLatestFrom(@NonNull ObservableSource<? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
+    public final <@NonNull U, @NonNull R> Observable<R> withLatestFrom(@NonNull ObservableSource<? extends U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(combiner, "combiner is null");
 
@@ -16186,7 +16186,7 @@ public final <U, R> Observable<R> withLatestFrom(@NonNull ObservableSource<? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <T1, T2, R> Observable<R> withLatestFrom(
+    public final <@NonNull T1, @NonNull T2, @NonNull R> Observable<R> withLatestFrom(
             @NonNull ObservableSource<T1> source1, @NonNull ObservableSource<T2> source2,
             @NonNull Function3<? super T, ? super T1, ? super T2, R> combiner) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -16228,7 +16228,7 @@ public final <T1, T2, R> Observable<R> withLatestFrom(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <T1, T2, T3, R> Observable<R> withLatestFrom(
+    public final <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull R> Observable<R> withLatestFrom(
             @NonNull ObservableSource<T1> source1, @NonNull ObservableSource<T2> source2,
             @NonNull ObservableSource<T3> source3,
             @NonNull Function4<? super T, ? super T1, ? super T2, ? super T3, R> combiner) {
@@ -16275,7 +16275,7 @@ public final <T1, T2, T3, R> Observable<R> withLatestFrom(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
+    public final <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull R> Observable<R> withLatestFrom(
             @NonNull ObservableSource<T1> source1, @NonNull ObservableSource<T2> source2,
             @NonNull ObservableSource<T3> source3, @NonNull ObservableSource<T4> source4,
             @NonNull Function5<? super T, ? super T1, ? super T2, ? super T3, ? super T4, R> combiner) {
@@ -16315,7 +16315,7 @@ public final <T1, T2, T3, T4, R> Observable<R> withLatestFrom(
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> withLatestFrom(@NonNull ObservableSource<?>[] others, @NonNull Function<? super Object[], R> combiner) {
+    public final <@NonNull R> Observable<R> withLatestFrom(@NonNull ObservableSource<?>[] others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<>(this, others, combiner));
@@ -16348,7 +16348,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull ObservableSource<?>[] oth
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends ObservableSource<?>> others, @NonNull Function<? super Object[], R> combiner) {
+    public final <@NonNull R> Observable<R> withLatestFrom(@NonNull Iterable<@NonNull ? extends ObservableSource<?>> others, @NonNull Function<? super Object[], R> combiner) {
         Objects.requireNonNull(others, "others is null");
         Objects.requireNonNull(combiner, "combiner is null");
         return RxJavaPlugins.onAssembly(new ObservableWithLatestFromMany<>(this, others, combiner));
@@ -16383,7 +16383,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<@NonNull ? exten
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull U, R> Observable<R> zipWith(@NonNull Iterable<U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <@NonNull U, @NonNull R> Observable<R> zipWith(@NonNull Iterable<U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         Objects.requireNonNull(zipper, "zipper is null");
         return RxJavaPlugins.onAssembly(new ObservableZipIterable<>(this, other, zipper));
@@ -16427,7 +16427,7 @@ public final <R> Observable<R> withLatestFrom(@NonNull Iterable<@NonNull ? exten
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U> other,
+    public final <@NonNull U, @NonNull R> Observable<R> zipWith(@NonNull ObservableSource<? extends U> other,
             @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         Objects.requireNonNull(other, "other is null");
         return zip(this, other, zipper);
@@ -16474,7 +16474,7 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U> other,
+    public final <@NonNull U, @NonNull R> Observable<R> zipWith(@NonNull ObservableSource<? extends U> other,
             @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError) {
         return zip(this, other, zipper, delayError);
     }
@@ -16523,7 +16523,7 @@ public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U>
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Observable<R> zipWith(@NonNull ObservableSource<? extends U> other,
+    public final <@NonNull U, @NonNull R> Observable<R> zipWith(@NonNull ObservableSource<? extends U> other,
             @NonNull BiFunction<? super T, ? super U, ? extends R> zipper, boolean delayError, int bufferSize) {
         return zip(this, other, zipper, delayError, bufferSize);
     }
@@ -16605,7 +16605,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
+    public static <@NonNull T> Observable<@NonNull T> fromOptional(@NonNull Optional<T> optional) {
         Objects.requireNonNull(optional, "optional is null");
         return optional.map(Observable::just).orElseGet(Observable::empty);
     }
@@ -16639,7 +16639,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
+    public static <@NonNull T> Observable<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
         Objects.requireNonNull(stage, "stage is null");
         return RxJavaPlugins.onAssembly(new ObservableFromCompletionStage<>(stage));
     }
@@ -16682,7 +16682,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Observable<@NonNull T> fromStream(@NonNull Stream<T> stream) {
+    public static <@NonNull T> Observable<@NonNull T> fromStream(@NonNull Stream<T> stream) {
         Objects.requireNonNull(stream, "stream is null");
         return RxJavaPlugins.onAssembly(new ObservableFromStream<>(stream));
     }
@@ -16736,7 +16736,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R, A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
+    public final <@NonNull R, @NonNull A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ObservableCollectWithCollectorSingle<>(this, collector));
     }
@@ -17034,7 +17034,7 @@ public final Stream<T> blockingStream(int capacityHint) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Observable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> concatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
         return flatMapStream(mapper);
     }
 
@@ -17081,7 +17081,7 @@ public final Stream<T> blockingStream(int capacityHint) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> Observable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ObservableFlatMapStream<>(this, mapper));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index 66e1ffd3d5..eb590aa428 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -134,7 +134,7 @@ public abstract class Single<@NonNull T> implements SingleSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> amb(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Single<T> amb(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new SingleAmb<>(null, sources));
     }
@@ -159,7 +159,7 @@ public static <T> Single<T> amb(@NonNull Iterable<@NonNull ? extends SingleSourc
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sources) {
+    public static <@NonNull T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sources) {
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
             return error(SingleInternalHelper.emptyThrower());
@@ -193,7 +193,7 @@ public static <T> Single<T> ambArray(@NonNull SingleSource<? extends T>... sourc
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapSingleDelayError(Functions.identity(), false);
     }
 
@@ -215,7 +215,7 @@ public static <T> Flowable<T> concat(@NonNull Iterable<@NonNull ? extends Single
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Observable<T> concat(@NonNull ObservableSource<? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Observable<T> concat(@NonNull ObservableSource<? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new ObservableConcatMapSingle<>(sources, Functions.identity(), ErrorMode.IMMEDIATE, 2));
     }
@@ -242,7 +242,7 @@ public static <T> Observable<T> concat(@NonNull ObservableSource<? extends Singl
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         return concat(sources, 2);
     }
 
@@ -270,7 +270,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Singl
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int prefetch) {
+    public static <@NonNull T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int prefetch) {
         Objects.requireNonNull(sources, "sources is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new FlowableConcatMapSinglePublisher<>(sources, Functions.identity(), ErrorMode.IMMEDIATE, prefetch));
@@ -300,7 +300,7 @@ public static <T> Flowable<T> concat(@NonNull Publisher<@NonNull ? extends Singl
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(
+    public static <@NonNull T> Flowable<T> concat(
             @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2
      ) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -334,7 +334,7 @@ public static <T> Flowable<T> concat(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(
+    public static <@NonNull T> Flowable<T> concat(
             @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
             @NonNull SingleSource<? extends T> source3
      ) {
@@ -372,7 +372,7 @@ public static <T> Flowable<T> concat(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concat(
+    public static <@NonNull T> Flowable<T> concat(
             @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
             @NonNull SingleSource<? extends T> source3, @NonNull SingleSource<? extends T> source4
      ) {
@@ -405,7 +405,7 @@ public static <T> Flowable<T> concat(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>... sources) {
         return Flowable.fromArray(sources).concatMapSingleDelayError(Functions.identity(), false);
     }
 
@@ -431,7 +431,7 @@ public static <T> Flowable<T> concatArray(@NonNull SingleSource<? extends T>...
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayDelayError(@NonNull SingleSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayDelayError(@NonNull SingleSource<? extends T>... sources) {
         return Flowable.fromArray(sources).concatMapSingleDelayError(Functions.identity(), true);
     }
 
@@ -459,7 +459,7 @@ public static <T> Flowable<T> concatArrayDelayError(@NonNull SingleSource<? exte
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T>... sources) {
         return Flowable.fromArray(sources).concatMapEager(SingleInternalHelper.toFlowable());
     }
 
@@ -488,7 +488,7 @@ public static <T> Flowable<T> concatArrayEager(@NonNull SingleSource<? extends T
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull SingleSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> concatArrayEagerDelayError(@NonNull SingleSource<? extends T>... sources) {
         return Flowable.fromArray(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true);
     }
 
@@ -515,7 +515,7 @@ public static <T> Flowable<T> concatArrayEagerDelayError(@NonNull SingleSource<?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapSingleDelayError(Functions.identity());
     }
 
@@ -542,7 +542,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Iterable<@NonNull ? exte
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapSingleDelayError(Functions.identity());
     }
 
@@ -574,7 +574,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int prefetch) {
+    public static <@NonNull T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int prefetch) {
         return Flowable.fromPublisher(sources).concatMapSingleDelayError(Functions.identity(), true, prefetch);
     }
 
@@ -601,7 +601,7 @@ public static <T> Flowable<T> concatDelayError(@NonNull Publisher<@NonNull ? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), false);
     }
 
@@ -633,7 +633,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends S
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
         return Flowable.fromIterable(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), false, maxConcurrency, 1);
     }
 
@@ -662,7 +662,7 @@ public static <T> Flowable<T> concatEager(@NonNull Iterable<@NonNull ? extends S
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.toFlowable());
     }
 
@@ -696,7 +696,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
         return Flowable.fromPublisher(sources).concatMapEager(SingleInternalHelper.toFlowable(), maxConcurrency, 1);
     }
 
@@ -725,7 +725,7 @@ public static <T> Flowable<T> concatEager(@NonNull Publisher<@NonNull ? extends
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true);
     }
 
@@ -757,7 +757,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
         return Flowable.fromIterable(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true, maxConcurrency, 1);
     }
 
@@ -788,7 +788,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Iterable<@NonNull ?
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromPublisher(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true);
     }
 
@@ -822,7 +822,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
+    public static <@NonNull T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources, int maxConcurrency) {
         return Flowable.fromPublisher(sources).concatMapEagerDelayError(SingleInternalHelper.toFlowable(), true, maxConcurrency, 1);
     }
 
@@ -895,7 +895,7 @@ public static <T> Flowable<T> concatEagerDelayError(@NonNull Publisher<@NonNull
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? extends T>> supplier) {
+    public static <@NonNull T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new SingleDefer<>(supplier));
     }
@@ -917,7 +917,7 @@ public static <T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+    public static <@NonNull T> Single<T> error(@NonNull Supplier<? extends Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new SingleError<>(supplier));
     }
@@ -944,7 +944,7 @@ public static <T> Single<T> error(@NonNull Supplier<? extends Throwable> supplie
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> error(@NonNull Throwable throwable) {
+    public static <@NonNull T> Single<T> error(@NonNull Throwable throwable) {
         Objects.requireNonNull(throwable, "throwable is null");
         return error(Functions.justSupplier(throwable));
     }
@@ -1080,7 +1080,7 @@ public static <T> Single<T> error(@NonNull Throwable throwable) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
+    public static <@NonNull T> Single<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
         Objects.requireNonNull(maybe, "maybe is null");
         return RxJavaPlugins.onAssembly(new MaybeToSingle<>(maybe, null));
     }
@@ -1105,7 +1105,7 @@ public static <T> Single<T> fromMaybe(@NonNull MaybeSource<T> maybe) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromMaybe(@NonNull MaybeSource<T> maybe, @NonNull T defaultItem) {
+    public static <@NonNull T> Single<T> fromMaybe(@NonNull MaybeSource<T> maybe, @NonNull T defaultItem) {
         Objects.requireNonNull(maybe, "maybe is null");
         Objects.requireNonNull(defaultItem, "defaultItem is null");
         return RxJavaPlugins.onAssembly(new MaybeToSingle<>(maybe, defaultItem));
@@ -1146,7 +1146,7 @@ public static <T> Single<T> fromMaybe(@NonNull MaybeSource<T> maybe, @NonNull T
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromPublisher(@NonNull Publisher<@NonNull ? extends T> publisher) {
+    public static <@NonNull T> Single<T> fromPublisher(@NonNull Publisher<? extends T> publisher) {
         Objects.requireNonNull(publisher, "publisher is null");
         return RxJavaPlugins.onAssembly(new SingleFromPublisher<>(publisher));
     }
@@ -1172,7 +1172,7 @@ public static <T> Single<T> fromPublisher(@NonNull Publisher<@NonNull ? extends
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T> observable) {
+    public static <@NonNull T> Single<T> fromObservable(@NonNull ObservableSource<? extends T> observable) {
         Objects.requireNonNull(observable, "observable is null");
         return RxJavaPlugins.onAssembly(new ObservableSingleSingle<>(observable, null));
     }
@@ -1279,7 +1279,7 @@ public static <T> Single<T> fromObservable(@NonNull ObservableSource<? extends T
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).flatMapSingle(Functions.identity());
     }
 
@@ -1318,7 +1318,7 @@ public static <T> Flowable<T> merge(@NonNull Iterable<@NonNull ? extends SingleS
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapSinglePublisher<>(sources, Functions.identity(), false, Integer.MAX_VALUE));
     }
@@ -1349,7 +1349,7 @@ public static <T> Flowable<T> merge(@NonNull Publisher<@NonNull ? extends Single
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> merge(@NonNull SingleSource<? extends SingleSource<? extends T>> source) {
+    public static <@NonNull T> Single<T> merge(@NonNull SingleSource<? extends SingleSource<? extends T>> source) {
         Objects.requireNonNull(source, "source is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMap<SingleSource<? extends T>, T>(source, Functions.identity()));
     }
@@ -1395,7 +1395,7 @@ public static <T> Single<T> merge(@NonNull SingleSource<? extends SingleSource<?
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(
+    public static <@NonNull T> Flowable<T> merge(
             @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2
      ) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -1446,7 +1446,7 @@ public static <T> Flowable<T> merge(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(
+    public static <@NonNull T> Flowable<T> merge(
             @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
             @NonNull SingleSource<? extends T> source3
      ) {
@@ -1501,7 +1501,7 @@ public static <T> Flowable<T> merge(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> merge(
+    public static <@NonNull T> Flowable<T> merge(
             @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
             @NonNull SingleSource<? extends T> source3, @NonNull SingleSource<? extends T> source4
      ) {
@@ -1547,7 +1547,7 @@ public static <T> Flowable<T> merge(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T> Flowable<T> mergeArray(SingleSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> mergeArray(SingleSource<? extends T>... sources) {
         return Flowable.fromArray(sources).flatMapSingle(Functions.identity(), false, Math.max(1, sources.length));
     }
 
@@ -1583,7 +1583,7 @@ public static <T> Flowable<T> mergeArray(SingleSource<? extends T>... sources) {
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
     @NonNull
-    public static <T> Flowable<T> mergeArrayDelayError(@NonNull SingleSource<? extends T>... sources) {
+    public static <@NonNull T> Flowable<T> mergeArrayDelayError(@NonNull SingleSource<? extends T>... sources) {
         return Flowable.fromArray(sources).flatMapSingle(Functions.identity(), true, Math.max(1, sources.length));
     }
 
@@ -1610,7 +1610,7 @@ public static <T> Flowable<T> mergeArrayDelayError(@NonNull SingleSource<? exten
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources) {
         return Flowable.fromIterable(sources).flatMapSingle(Functions.identity(), true, Integer.MAX_VALUE);
     }
 
@@ -1637,7 +1637,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Iterable<@NonNull ? exten
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableFlatMapSinglePublisher<>(sources, Functions.identity(), true, Integer.MAX_VALUE));
     }
@@ -1672,7 +1672,7 @@ public static <T> Flowable<T> mergeDelayError(@NonNull Publisher<@NonNull ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(
+    public static <@NonNull T> Flowable<T> mergeDelayError(
             @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2
      ) {
         Objects.requireNonNull(source1, "source1 is null");
@@ -1712,7 +1712,7 @@ public static <T> Flowable<T> mergeDelayError(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(
+    public static <@NonNull T> Flowable<T> mergeDelayError(
             @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
             @NonNull SingleSource<? extends T> source3
      ) {
@@ -1756,7 +1756,7 @@ public static <T> Flowable<T> mergeDelayError(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> mergeDelayError(
+    public static <@NonNull T> Flowable<T> mergeDelayError(
             @NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2,
             @NonNull SingleSource<? extends T> source3, @NonNull SingleSource<? extends T> source4
      ) {
@@ -1783,7 +1783,7 @@ public static <T> Flowable<T> mergeDelayError(
     @SchedulerSupport(SchedulerSupport.NONE)
     @SuppressWarnings("unchecked")
     @NonNull
-    public static <T> Single<T> never() {
+    public static <@NonNull T> Single<T> never() {
         return RxJavaPlugins.onAssembly((Single<T>) SingleNever.INSTANCE);
     }
 
@@ -1853,7 +1853,7 @@ public static Single<Long> timer(long delay, @NonNull TimeUnit unit, @NonNull Sc
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<Boolean> sequenceEqual(@NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2) { // NOPMD
+    public static <@NonNull T> Single<Boolean> sequenceEqual(@NonNull SingleSource<? extends T> source1, @NonNull SingleSource<? extends T> source2) { // NOPMD
         Objects.requireNonNull(source1, "source1 is null");
         Objects.requireNonNull(source2, "source2 is null");
         return RxJavaPlugins.onAssembly(new SingleEquals<>(source1, source2));
@@ -1888,7 +1888,7 @@ public static <T> Single<Boolean> sequenceEqual(@NonNull SingleSource<? extends
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapSinglePublisher<>(sources, Functions.identity(), false));
     }
@@ -1923,7 +1923,7 @@ public static <T> Flowable<T> switchOnNext(@NonNull Publisher<@NonNull ? extends
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
+    public static <@NonNull T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull ? extends SingleSource<? extends T>> sources) {
         Objects.requireNonNull(sources, "sources is null");
         return RxJavaPlugins.onAssembly(new FlowableSwitchMapSinglePublisher<>(sources, Functions.identity(), true));
     }
@@ -1949,7 +1949,7 @@ public static <T> Flowable<T> switchOnNextDelayError(@NonNull Publisher<@NonNull
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> unsafeCreate(@NonNull SingleSource<T> onSubscribe) {
+    public static <@NonNull T> Single<T> unsafeCreate(@NonNull SingleSource<T> onSubscribe) {
         Objects.requireNonNull(onSubscribe, "onSubscribe is null");
         if (onSubscribe instanceof Single) {
             throw new IllegalArgumentException("unsafeCreate(Single) should be upgraded");
@@ -1982,7 +1982,7 @@ public static <T> Single<T> unsafeCreate(@NonNull SingleSource<T> onSubscribe) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T, U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
+    public static <@NonNull T, @NonNull U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
             @NonNull Function<? super U, ? extends SingleSource<? extends T>> sourceSupplier,
             @NonNull Consumer<? super U> resourceCleanup) {
         return using(resourceSupplier, sourceSupplier, resourceCleanup, true);
@@ -2018,7 +2018,7 @@ public static <T, U> Single<T> using(@NonNull Supplier<U> resourceSupplier,
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, U> Single<T> using(
+    public static <@NonNull T, @NonNull U> Single<T> using(
             @NonNull Supplier<U> resourceSupplier,
             @NonNull Function<? super U, ? extends SingleSource<? extends T>> sourceSupplier,
             @NonNull Consumer<? super U> resourceCleanup,
@@ -2047,7 +2047,7 @@ public static <T, U> Single<T> using(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T> Single<T> wrap(@NonNull SingleSource<T> source) {
+    public static <@NonNull T> Single<T> wrap(@NonNull SingleSource<T> source) {
         Objects.requireNonNull(source, "source is null");
         if (source instanceof Single) {
             return RxJavaPlugins.onAssembly((Single<T>)source);
@@ -2088,7 +2088,7 @@ public static <T> Single<T> wrap(@NonNull SingleSource<T> source) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T, R> Single<R> zip(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources,
+    public static <@NonNull T, @NonNull R> Single<R> zip(@NonNull Iterable<@NonNull ? extends SingleSource<? extends T>> sources,
             @NonNull Function<? super Object[], ? extends R> zipper) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
@@ -2122,7 +2122,7 @@ public static <T, R> Single<R> zip(@NonNull Iterable<@NonNull ? extends SingleSo
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, R> Single<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull R> Single<R> zip(
             @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
             @NonNull BiFunction<? super T1, ? super T2, ? extends R> zipper
      ) {
@@ -2162,7 +2162,7 @@ public static <T1, T2, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, R> Single<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull R> Single<R> zip(
             @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
             @NonNull SingleSource<? extends T3> source3,
             @NonNull Function3<? super T1, ? super T2, ? super T3, ? extends R> zipper
@@ -2207,7 +2207,7 @@ public static <T1, T2, T3, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, R> Single<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull R> Single<R> zip(
             @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
             @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
             @NonNull Function4<? super T1, ? super T2, ? super T3, ? super T4, ? extends R> zipper
@@ -2257,7 +2257,7 @@ public static <T1, T2, T3, T4, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, R> Single<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull R> Single<R> zip(
             @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
             @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
             @NonNull SingleSource<? extends T5> source5,
@@ -2312,7 +2312,7 @@ public static <T1, T2, T3, T4, T5, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull R> Single<R> zip(
             @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
             @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
             @NonNull SingleSource<? extends T5> source5, @NonNull SingleSource<? extends T6> source6,
@@ -2371,7 +2371,7 @@ public static <T1, T2, T3, T4, T5, T6, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull R> Single<R> zip(
             @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
             @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
             @NonNull SingleSource<? extends T5> source5, @NonNull SingleSource<? extends T6> source6,
@@ -2435,7 +2435,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull R> Single<R> zip(
             @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
             @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
             @NonNull SingleSource<? extends T5> source5, @NonNull SingleSource<? extends T6> source6,
@@ -2504,7 +2504,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, R> Single<R> zip(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(
+    public static <@NonNull T1, @NonNull T2, @NonNull T3, @NonNull T4, @NonNull T5, @NonNull T6, @NonNull T7, @NonNull T8, @NonNull T9, @NonNull R> Single<R> zip(
             @NonNull SingleSource<? extends T1> source1, @NonNull SingleSource<? extends T2> source2,
             @NonNull SingleSource<? extends T3> source3, @NonNull SingleSource<? extends T4> source4,
             @NonNull SingleSource<? extends T5> source5, @NonNull SingleSource<? extends T6> source6,
@@ -2558,7 +2558,7 @@ public static <T1, T2, T3, T4, T5, T6, T7, T8, T9, R> Single<R> zip(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @SafeVarargs
-    public static <T, R> Single<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper, @NonNull SingleSource<? extends T>... sources) {
+    public static <@NonNull T, @NonNull R> Single<R> zipArray(@NonNull Function<? super Object[], ? extends R> zipper, @NonNull SingleSource<? extends T>... sources) {
         Objects.requireNonNull(zipper, "zipper is null");
         Objects.requireNonNull(sources, "sources is null");
         if (sources.length == 0) {
@@ -2633,7 +2633,7 @@ public final Single<T> hide() {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Single<R> compose(@NonNull SingleTransformer<? super T, ? extends R> transformer) {
+    public final <@NonNull R> Single<R> compose(@NonNull SingleTransformer<? super T, ? extends R> transformer) {
         return wrap(((SingleTransformer<T, R>) Objects.requireNonNull(transformer, "transformer is null")).apply(this));
     }
 
@@ -2676,7 +2676,7 @@ public final Single<T> cache() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<U> cast(@NonNull Class<? extends U> clazz) {
+    public final <@NonNull U> Single<U> cast(@NonNull Class<? extends U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return map(Functions.castFunction(clazz));
     }
@@ -2704,7 +2704,7 @@ public final <U> Single<U> cast(@NonNull Class<? extends U> clazz) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> concatMap(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Single<R> concatMap(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMap<>(this, mapper));
     }
@@ -2759,7 +2759,7 @@ public final Completable concatMapCompletable(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Maybe<R> concatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         return flatMapMaybe(mapper);
     }
 
@@ -2938,7 +2938,7 @@ public final Single<T> delaySubscription(@NonNull CompletableSource subscription
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<T> delaySubscription(@NonNull SingleSource<U> subscriptionIndicator) {
+    public final <@NonNull U> Single<T> delaySubscription(@NonNull SingleSource<U> subscriptionIndicator) {
         Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
         return RxJavaPlugins.onAssembly(new SingleDelayWithSingle<>(this, subscriptionIndicator));
     }
@@ -2964,7 +2964,7 @@ public final <U> Single<T> delaySubscription(@NonNull SingleSource<U> subscripti
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<T> delaySubscription(@NonNull ObservableSource<U> subscriptionIndicator) {
+    public final <@NonNull U> Single<T> delaySubscription(@NonNull ObservableSource<U> subscriptionIndicator) {
         Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
         return RxJavaPlugins.onAssembly(new SingleDelayWithObservable<>(this, subscriptionIndicator));
     }
@@ -2995,7 +2995,7 @@ public final <U> Single<T> delaySubscription(@NonNull ObservableSource<U> subscr
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Single<T> delaySubscription(@NonNull Publisher<U> subscriptionIndicator) {
+    public final <@NonNull U> Single<T> delaySubscription(@NonNull Publisher<U> subscriptionIndicator) {
         Objects.requireNonNull(subscriptionIndicator, "subscriptionIndicator is null");
         return RxJavaPlugins.onAssembly(new SingleDelayWithPublisher<>(this, subscriptionIndicator));
     }
@@ -3385,7 +3385,7 @@ public final Maybe<T> filter(@NonNull Predicate<? super T> predicate) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> flatMap(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
+    public final <@NonNull R> Single<R> flatMap(@NonNull Function<? super T, ? extends SingleSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMap<>(this, mapper));
     }
@@ -3417,7 +3417,7 @@ public final <R> Single<R> flatMap(@NonNull Function<? super T, ? extends Single
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U, R> Single<R> flatMap(@NonNull Function<? super T, ? extends SingleSource<? extends U>> mapper,
+    public final <@NonNull U, @NonNull R> Single<R> flatMap(@NonNull Function<? super T, ? extends SingleSource<? extends U>> mapper,
             @NonNull BiFunction<? super T, ? super U, ? extends R> combiner) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(combiner, "combiner is null");
@@ -3448,7 +3448,7 @@ public final <U, R> Single<R> flatMap(@NonNull Function<? super T, ? extends Sin
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> flatMap(
+    public final <@NonNull R> Single<R> flatMap(
             @NonNull Function<? super T, ? extends SingleSource<? extends R>> onSuccessMapper,
             @NonNull Function<? super Throwable, ? extends SingleSource<? extends R>> onErrorMapper) {
         Objects.requireNonNull(onSuccessMapper, "onSuccessMapper is null");
@@ -3476,7 +3476,7 @@ public final <R> Single<R> flatMap(
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
+    public final <@NonNull R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends MaybeSource<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapMaybe<>(this, mapper));
     }
@@ -3506,7 +3506,7 @@ public final <R> Maybe<R> flatMapMaybe(@NonNull Function<? super T, ? extends Ma
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapPublisher<>(this, mapper));
     }
@@ -3537,7 +3537,7 @@ public final <R> Flowable<R> flatMapPublisher(@NonNull Function<? super T, ? ext
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
+    public final <@NonNull U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapIterableFlowable<>(this, mapper));
     }
@@ -3565,7 +3565,7 @@ public final <U> Flowable<U> flattenAsFlowable(@NonNull Function<? super T, ? ex
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <@NonNull U> Observable<U> flattenAsObservable(@NonNull Function<@NonNull ? super T, @NonNull ? extends Iterable<@NonNull ? extends U>> mapper) {
+    public final <@NonNull U> Observable<U> flattenAsObservable(@NonNull Function<@NonNull ? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlatMapIterableObservable<>(this, mapper));
     }
@@ -3892,7 +3892,7 @@ public final void blockingSubscribe(@NonNull SingleObserver<? super T> observer)
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T> lift) {
+    public final <@NonNull R> Single<R> lift(@NonNull SingleOperator<? extends R, ? super T> lift) {
         Objects.requireNonNull(lift, "lift is null");
         return RxJavaPlugins.onAssembly(new SingleLift<>(this, lift));
     }
@@ -4039,7 +4039,7 @@ public final Flowable<T> mergeWith(@NonNull SingleSource<? extends T> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> Maybe<U> ofType(@NonNull Class<U> clazz) {
+    public final <@NonNull U> Maybe<U> ofType(@NonNull Class<U> clazz) {
         Objects.requireNonNull(clazz, "clazz is null");
         return filter(Functions.isInstanceOf(clazz)).cast(clazz);
     }
@@ -4333,7 +4333,7 @@ public final Flowable<T> repeat(long times) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, ? extends Publisher<@NonNull ?>> handler) {
+    public final Flowable<T> repeatWhen(@NonNull Function<? super Flowable<Object>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
         return toFlowable().repeatWhen(handler);
     }
 
@@ -4538,7 +4538,7 @@ public final Single<T> retryUntil(@NonNull BooleanSupplier stop) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>, ? extends Publisher<@NonNull ?>> handler) {
+    public final Single<T> retryWhen(@NonNull Function<? super Flowable<Throwable>, @NonNull ? extends Publisher<@NonNull ?>> handler) {
         return toSingle(toFlowable().retryWhen(handler));
     }
 
@@ -5211,7 +5211,7 @@ public final Single<T> takeUntil(@NonNull CompletableSource other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <E> Single<T> takeUntil(@NonNull Publisher<E> other) {
+    public final <@NonNull E> Single<T> takeUntil(@NonNull Publisher<E> other) {
         Objects.requireNonNull(other, "other is null");
         return RxJavaPlugins.onAssembly(new SingleTakeUntil<>(this, other));
     }
@@ -5239,7 +5239,7 @@ public final <E> Single<T> takeUntil(@NonNull Publisher<E> other) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <E> Single<T> takeUntil(@NonNull SingleSource<? extends E> other) {
+    public final <@NonNull E> Single<T> takeUntil(@NonNull SingleSource<? extends E> other) {
         Objects.requireNonNull(other, "other is null");
         return takeUntil(new SingleToFlowable<E>(other));
     }
@@ -5529,7 +5529,7 @@ public final Single<T> unsubscribeOn(@NonNull Scheduler scheduler) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U, R> Single<R> zipWith(@NonNull SingleSource<U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
+    public final <@NonNull U, @NonNull R> Single<R> zipWith(@NonNull SingleSource<U> other, @NonNull BiFunction<? super T, ? super U, ? extends R> zipper) {
         return zip(this, other, zipper);
     }
 
@@ -5622,7 +5622,7 @@ private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public static <T> Single<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
+    public static <@NonNull T> Single<@NonNull T> fromCompletionStage(@NonNull CompletionStage<T> stage) {
         Objects.requireNonNull(stage, "stage is null");
         return RxJavaPlugins.onAssembly(new SingleFromCompletionStage<>(stage));
     }
@@ -5716,7 +5716,7 @@ public final CompletionStage<T> toCompletionStage() {
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
     @NonNull
-    public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlattenStreamAsFlowable<>(this, mapper));
     }
@@ -5757,7 +5757,7 @@ public final <R> Flowable<R> flattenStreamAsFlowable(@NonNull Function<? super T
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> Observable<R> flattenStreamAsObservable(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new SingleFlattenStreamAsObservable<>(this, mapper));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java
index 1922562340..ab4a6e749b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java
@@ -15,6 +15,7 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
 
 /**
@@ -22,7 +23,7 @@
  *
  * @param <T> the value type
  */
-public abstract class BasicIntQueueSubscription<T> extends AtomicInteger implements QueueSubscription<T> {
+public abstract class BasicIntQueueSubscription<@NonNull T> extends AtomicInteger implements QueueSubscription<T> {
 
     private static final long serialVersionUID = -6671519529404341862L;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java
index e941867b99..544fac8b58 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscription.java
@@ -15,7 +15,7 @@
 
 import org.reactivestreams.Subscriber;
 
-import io.reactivex.rxjava3.annotations.Nullable;
+import io.reactivex.rxjava3.annotations.*;
 
 /**
  * A subscription that signals a single value eventually.
@@ -33,7 +33,7 @@
  * Where exclusively set means any other bits are 0 when that bit is set.
  * @param <T> the value type
  */
-public class DeferredScalarSubscription<T> extends BasicIntQueueSubscription<T> {
+public class DeferredScalarSubscription<@NonNull T> extends BasicIntQueueSubscription<T> {
 
     private static final long serialVersionUID = -2151279923272604993L;
 
diff --git a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
index 4a02e8416d..8d5414d27c 100644
--- a/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
+++ b/src/main/java/io/reactivex/rxjava3/parallel/ParallelFlowable.java
@@ -59,7 +59,7 @@ public abstract class ParallelFlowable<@NonNull T> {
      */
     @BackpressureSupport(BackpressureKind.SPECIAL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public abstract void subscribe(@NonNull Subscriber<@NonNull ? super T>[] subscribers);
+    public abstract void subscribe(@NonNull Subscriber<? super T>[] subscribers);
 
     /**
      * Returns the number of expected parallel {@link Subscriber}s.
@@ -110,7 +110,7 @@ protected final boolean validate(@NonNull Subscriber<@NonNull ?>[] subscribers)
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<@NonNull ? extends T> source) {
+    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source) {
         return from(source, Runtime.getRuntime().availableProcessors(), Flowable.bufferSize());
     }
 
@@ -135,7 +135,7 @@ protected final boolean validate(@NonNull Subscriber<@NonNull ?>[] subscribers)
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<@NonNull ? extends T> source, int parallelism) {
+    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source, int parallelism) {
         return from(source, parallelism, Flowable.bufferSize());
     }
 
@@ -164,7 +164,7 @@ protected final boolean validate(@NonNull Subscriber<@NonNull ?>[] subscribers)
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.FULL)
-    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<@NonNull ? extends T> source,
+    public static <@NonNull T> ParallelFlowable<T> from(@NonNull Publisher<? extends T> source,
             int parallelism, int prefetch) {
         Objects.requireNonNull(source, "source is null");
         ObjectHelper.verifyPositive(parallelism, "parallelism");
@@ -193,7 +193,7 @@ protected final boolean validate(@NonNull Subscriber<@NonNull ?>[] subscribers)
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
+    public final <@NonNull R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ParallelMap<>(this, mapper));
     }
@@ -223,7 +223,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull ParallelFailureHandling errorHandler) {
+    public final <@NonNull R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull ParallelFailureHandling errorHandler) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTry<>(this, mapper, errorHandler));
@@ -255,7 +255,7 @@ public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
+    public final <@NonNull R> ParallelFlowable<R> map(@NonNull Function<? super T, ? extends R> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTry<>(this, mapper, errorHandler));
@@ -473,7 +473,7 @@ public final Flowable<T> reduce(@NonNull BiFunction<T, T, T> reducer) {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> reduce(@NonNull Supplier<R> initialSupplier, @NonNull BiFunction<R, ? super T, R> reducer) {
+    public final <@NonNull R> ParallelFlowable<R> reduce(@NonNull Supplier<R> initialSupplier, @NonNull BiFunction<R, ? super T, R> reducer) {
         Objects.requireNonNull(initialSupplier, "initialSupplier is null");
         Objects.requireNonNull(reducer, "reducer is null");
         return RxJavaPlugins.onAssembly(new ParallelReduce<>(this, initialSupplier, reducer));
@@ -1044,7 +1044,7 @@ public final ParallelFlowable<T> doOnCancel(@NonNull Action onCancel) {
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> collectionSupplier, @NonNull BiConsumer<? super C, ? super T> collector) {
+    public final <@NonNull C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> collectionSupplier, @NonNull BiConsumer<? super C, ? super T> collector) {
         Objects.requireNonNull(collectionSupplier, "collectionSupplier is null");
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ParallelCollect<>(this, collectionSupplier, collector));
@@ -1126,7 +1126,7 @@ public final <C> ParallelFlowable<C> collect(@NonNull Supplier<? extends C> coll
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U> composer) {
+    public final <@NonNull U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U> composer) {
         return RxJavaPlugins.onAssembly(Objects.requireNonNull(composer, "composer is null").apply(this));
     }
 
@@ -1154,7 +1154,7 @@ public final <U> ParallelFlowable<U> compose(@NonNull ParallelTransformer<T, U>
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         return flatMap(mapper, false, Flowable.bufferSize(), Flowable.bufferSize());
     }
 
@@ -1184,8 +1184,8 @@ public final <R> ParallelFlowable<R> flatMap(@NonNull Function<? super T, ? exte
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, boolean delayError) {
+    public final <@NonNull R> ParallelFlowable<R> flatMap(
+            @NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, boolean delayError) {
         return flatMap(mapper, delayError, Flowable.bufferSize(), Flowable.bufferSize());
     }
 
@@ -1218,8 +1218,8 @@ public final <R> ParallelFlowable<R> flatMap(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper, boolean delayError, int maxConcurrency) {
+    public final <@NonNull R> ParallelFlowable<R> flatMap(
+            @NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper, boolean delayError, int maxConcurrency) {
         return flatMap(mapper, delayError, maxConcurrency, Flowable.bufferSize());
     }
 
@@ -1252,8 +1252,8 @@ public final <R> ParallelFlowable<R> flatMap(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> flatMap(
-            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> ParallelFlowable<R> flatMap(
+            @NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
             boolean delayError, int maxConcurrency, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(maxConcurrency, "maxConcurrency");
@@ -1284,8 +1284,8 @@ public final <R> ParallelFlowable<R> flatMap(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> concatMap(
-            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> ParallelFlowable<R> concatMap(
+            @NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper) {
         return concatMap(mapper, 2);
     }
 
@@ -1315,8 +1315,8 @@ public final <R> ParallelFlowable<R> concatMap(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> concatMap(
-            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> ParallelFlowable<R> concatMap(
+            @NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
             int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1348,8 +1348,8 @@ public final <R> ParallelFlowable<R> concatMap(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> concatMapDelayError(
-            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> ParallelFlowable<R> concatMapDelayError(
+            @NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
                     boolean tillTheEnd) {
         return concatMapDelayError(mapper, 2, tillTheEnd);
     }
@@ -1381,8 +1381,8 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <R> ParallelFlowable<R> concatMapDelayError(
-            @NonNull Function<? super T, ? extends Publisher<@NonNull ? extends R>> mapper,
+    public final <@NonNull R> ParallelFlowable<R> concatMapDelayError(
+            @NonNull Function<? super T, @NonNull ? extends Publisher<? extends R>> mapper,
                     int prefetch, boolean tillTheEnd) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
@@ -1419,7 +1419,7 @@ public final <R> ParallelFlowable<R> concatMapDelayError(
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper) {
+    public final <@NonNull U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper) {
         return flatMapIterable(mapper, Flowable.bufferSize());
     }
 
@@ -1455,7 +1455,7 @@ public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T
     @NonNull
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, ? extends Iterable<@NonNull ? extends U>> mapper, int bufferSize) {
+    public final <@NonNull U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T, @NonNull ? extends Iterable<? extends U>> mapper, int bufferSize) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(bufferSize, "bufferSize");
         return RxJavaPlugins.onAssembly(new ParallelFlatMapIterable<>(this, mapper, bufferSize));
@@ -1486,7 +1486,7 @@ public final <U> ParallelFlowable<U> flatMapIterable(@NonNull Function<? super T
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, @NonNull Optional<? extends R>> mapper) {
         Objects.requireNonNull(mapper, "mapper is null");
         return RxJavaPlugins.onAssembly(new ParallelMapOptional<>(this, mapper));
     }
@@ -1516,7 +1516,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<@NonNull ? extends R>> mapper, @NonNull ParallelFailureHandling errorHandler) {
+    public final <@NonNull R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, @NonNull Optional<? extends R>> mapper, @NonNull ParallelFailureHandling errorHandler) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTryOptional<>(this, mapper, errorHandler));
@@ -1548,7 +1548,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
-    public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Optional<@NonNull ? extends R>> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
+    public final <@NonNull R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, @NonNull Optional<? extends R>> mapper, @NonNull BiFunction<? super Long, ? super Throwable, ParallelFailureHandling> errorHandler) {
         Objects.requireNonNull(mapper, "mapper is null");
         Objects.requireNonNull(errorHandler, "errorHandler is null");
         return RxJavaPlugins.onAssembly(new ParallelMapTryOptional<>(this, mapper, errorHandler));
@@ -1604,7 +1604,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper) {
+    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper) {
         return flatMapStream(mapper, Flowable.bufferSize());
     }
 
@@ -1658,7 +1658,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @BackpressureSupport(BackpressureKind.FULL)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, ? extends Stream<@NonNull ? extends R>> mapper, int prefetch) {
+    public final <@NonNull R> ParallelFlowable<R> flatMapStream(@NonNull Function<? super T, @NonNull ? extends Stream<? extends R>> mapper, int prefetch) {
         Objects.requireNonNull(mapper, "mapper is null");
         ObjectHelper.verifyPositive(prefetch, "prefetch");
         return RxJavaPlugins.onAssembly(new ParallelFlatMapStream<>(this, mapper, prefetch));
@@ -1688,7 +1688,7 @@ public final <R> ParallelFlowable<R> mapOptional(@NonNull Function<? super T, Op
     @NonNull
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final <A, @NonNull R> Flowable<R> collect(@NonNull Collector<T, A, R> collector) {
+    public final <@NonNull A, @NonNull R> Flowable<R> collect(@NonNull Collector<T, A, R> collector) {
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ParallelCollector<>(this, collector));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
index 58cb730bf6..506fb65c67 100644
--- a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
@@ -96,26 +96,26 @@ public final class RxJavaPlugins {
 
     @SuppressWarnings("rawtypes")
     @Nullable
-    static volatile BiFunction<? super Flowable, ? super Subscriber, ? extends Subscriber> onFlowableSubscribe;
+    static volatile BiFunction<? super Flowable, @NonNull ? super Subscriber, @NonNull ? extends Subscriber> onFlowableSubscribe;
 
     @SuppressWarnings("rawtypes")
     @Nullable
-    static volatile BiFunction<? super Maybe, ? super MaybeObserver, ? extends MaybeObserver> onMaybeSubscribe;
+    static volatile BiFunction<? super Maybe, @NonNull ? super MaybeObserver, @NonNull ? extends MaybeObserver> onMaybeSubscribe;
 
     @SuppressWarnings("rawtypes")
     @Nullable
-    static volatile BiFunction<? super Observable, ? super Observer, ? extends Observer> onObservableSubscribe;
+    static volatile BiFunction<? super Observable, @NonNull ? super Observer, @NonNull ? extends Observer> onObservableSubscribe;
 
     @SuppressWarnings("rawtypes")
     @Nullable
-    static volatile BiFunction<? super Single, ? super SingleObserver, ? extends SingleObserver> onSingleSubscribe;
+    static volatile BiFunction<? super Single, @NonNull ? super SingleObserver, @NonNull ? extends SingleObserver> onSingleSubscribe;
 
     @Nullable
-    static volatile BiFunction<? super Completable, ? super CompletableObserver, ? extends CompletableObserver> onCompletableSubscribe;
+    static volatile BiFunction<? super Completable, @NonNull ? super CompletableObserver, @NonNull ? extends CompletableObserver> onCompletableSubscribe;
 
     @SuppressWarnings("rawtypes")
     @Nullable
-    static volatile BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> onParallelSubscribe;
+    static volatile BiFunction<? super ParallelFlowable, @NonNull ? super Subscriber[], @NonNull ? extends Subscriber[]> onParallelSubscribe;
 
     @Nullable
     static volatile BooleanSupplier onBeforeBlocking;
@@ -667,7 +667,7 @@ public static void setSingleSchedulerHandler(@Nullable Function<? super Schedule
      * @return the hook function, may be null
      */
     @Nullable
-    public static BiFunction<? super Completable, ? super CompletableObserver, ? extends CompletableObserver> getOnCompletableSubscribe() {
+    public static BiFunction<? super Completable, @NonNull ? super CompletableObserver, @NonNull ? extends CompletableObserver> getOnCompletableSubscribe() {
         return onCompletableSubscribe;
     }
 
@@ -697,7 +697,7 @@ public static void setSingleSchedulerHandler(@Nullable Function<? super Schedule
      */
     @Nullable
     @SuppressWarnings("rawtypes")
-    public static BiFunction<? super Flowable, ? super Subscriber, ? extends Subscriber> getOnFlowableSubscribe() {
+    public static BiFunction<? super Flowable, @NonNull ? super Subscriber, @NonNull ? extends Subscriber> getOnFlowableSubscribe() {
         return onFlowableSubscribe;
     }
 
@@ -707,7 +707,7 @@ public static void setSingleSchedulerHandler(@Nullable Function<? super Schedule
      */
     @Nullable
     @SuppressWarnings("rawtypes")
-    public static BiFunction<? super Maybe, ? super MaybeObserver, ? extends MaybeObserver> getOnMaybeSubscribe() {
+    public static BiFunction<? super Maybe, @NonNull ? super MaybeObserver, @NonNull ? extends MaybeObserver> getOnMaybeSubscribe() {
         return onMaybeSubscribe;
     }
 
@@ -737,7 +737,7 @@ public static void setSingleSchedulerHandler(@Nullable Function<? super Schedule
      */
     @Nullable
     @SuppressWarnings("rawtypes")
-    public static BiFunction<? super Single, ? super SingleObserver, ? extends SingleObserver> getOnSingleSubscribe() {
+    public static BiFunction<? super Single, @NonNull ? super SingleObserver, @NonNull ? extends SingleObserver> getOnSingleSubscribe() {
         return onSingleSubscribe;
     }
 
@@ -767,7 +767,7 @@ public static void setSingleSchedulerHandler(@Nullable Function<? super Schedule
      */
     @Nullable
     @SuppressWarnings("rawtypes")
-    public static BiFunction<? super Observable, ? super Observer, ? extends Observer> getOnObservableSubscribe() {
+    public static BiFunction<? super Observable, @NonNull ? super Observer, @NonNull ? extends Observer> getOnObservableSubscribe() {
         return onObservableSubscribe;
     }
 
@@ -787,7 +787,7 @@ public static void setOnCompletableAssembly(@Nullable Function<? super Completab
      * @param onCompletableSubscribe the hook function to set, null allowed
      */
     public static void setOnCompletableSubscribe(
-            @Nullable BiFunction<? super Completable, ? super CompletableObserver, ? extends CompletableObserver> onCompletableSubscribe) {
+            @Nullable BiFunction<? super Completable, @NonNull ? super CompletableObserver, @NonNull ? extends CompletableObserver> onCompletableSubscribe) {
         if (lockdown) {
             throw new IllegalStateException("Plugins can't be changed anymore");
         }
@@ -835,7 +835,7 @@ public static void setOnConnectableFlowableAssembly(@Nullable Function<? super C
      * @param onFlowableSubscribe the hook function to set, null allowed
      */
     @SuppressWarnings("rawtypes")
-    public static void setOnFlowableSubscribe(@Nullable BiFunction<? super Flowable, ? super Subscriber, ? extends Subscriber> onFlowableSubscribe) {
+    public static void setOnFlowableSubscribe(@Nullable BiFunction<? super Flowable, @NonNull ? super Subscriber, @NonNull ? extends Subscriber> onFlowableSubscribe) {
         if (lockdown) {
             throw new IllegalStateException("Plugins can't be changed anymore");
         }
@@ -847,7 +847,7 @@ public static void setOnFlowableSubscribe(@Nullable BiFunction<? super Flowable,
      * @param onMaybeSubscribe the hook function to set, null allowed
      */
     @SuppressWarnings("rawtypes")
-    public static void setOnMaybeSubscribe(@Nullable BiFunction<? super Maybe, MaybeObserver, ? extends MaybeObserver> onMaybeSubscribe) {
+    public static void setOnMaybeSubscribe(@Nullable BiFunction<? super Maybe, @NonNull MaybeObserver, @NonNull ? extends MaybeObserver> onMaybeSubscribe) {
         if (lockdown) {
             throw new IllegalStateException("Plugins can't be changed anymore");
         }
@@ -884,7 +884,7 @@ public static void setOnConnectableObservableAssembly(@Nullable Function<? super
      */
     @SuppressWarnings("rawtypes")
     public static void setOnObservableSubscribe(
-            @Nullable BiFunction<? super Observable, ? super Observer, ? extends Observer> onObservableSubscribe) {
+            @Nullable BiFunction<? super Observable, @NonNull ? super Observer, @NonNull ? extends Observer> onObservableSubscribe) {
         if (lockdown) {
             throw new IllegalStateException("Plugins can't be changed anymore");
         }
@@ -908,7 +908,7 @@ public static void setOnSingleAssembly(@Nullable Function<? super Single, ? exte
      * @param onSingleSubscribe the hook function to set, null allowed
      */
     @SuppressWarnings("rawtypes")
-    public static void setOnSingleSubscribe(@Nullable BiFunction<? super Single, ? super SingleObserver, ? extends SingleObserver> onSingleSubscribe) {
+    public static void setOnSingleSubscribe(@Nullable BiFunction<? super Single, @NonNull ? super SingleObserver, @NonNull ? extends SingleObserver> onSingleSubscribe) {
         if (lockdown) {
             throw new IllegalStateException("Plugins can't be changed anymore");
         }
@@ -924,8 +924,8 @@ public static void setOnSingleSubscribe(@Nullable BiFunction<? super Single, ? s
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> Subscriber<@NonNull ? super T> onSubscribe(@NonNull Flowable<T> source, @NonNull Subscriber<@NonNull ? super T> subscriber) {
-        BiFunction<? super Flowable, ? super Subscriber, ? extends Subscriber> f = onFlowableSubscribe;
+    public static <@NonNull T> Subscriber<? super T> onSubscribe(@NonNull Flowable<T> source, @NonNull Subscriber<? super T> subscriber) {
+        BiFunction<? super Flowable, @NonNull ? super Subscriber, @NonNull ? extends Subscriber> f = onFlowableSubscribe;
         if (f != null) {
             return apply(f, source, subscriber);
         }
@@ -941,8 +941,8 @@ public static void setOnSingleSubscribe(@Nullable BiFunction<? super Single, ? s
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> Observer<? super T> onSubscribe(@NonNull Observable<T> source, @NonNull Observer<? super T> observer) {
-        BiFunction<? super Observable, ? super Observer, ? extends Observer> f = onObservableSubscribe;
+    public static <@NonNull T> Observer<? super T> onSubscribe(@NonNull Observable<T> source, @NonNull Observer<? super T> observer) {
+        BiFunction<? super Observable, @NonNull ? super Observer, @NonNull ? extends Observer> f = onObservableSubscribe;
         if (f != null) {
             return apply(f, source, observer);
         }
@@ -958,8 +958,8 @@ public static <T> Observer<? super T> onSubscribe(@NonNull Observable<T> source,
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> SingleObserver<? super T> onSubscribe(@NonNull Single<T> source, @NonNull SingleObserver<? super T> observer) {
-        BiFunction<? super Single, ? super SingleObserver, ? extends SingleObserver> f = onSingleSubscribe;
+    public static <@NonNull T> SingleObserver<? super T> onSubscribe(@NonNull Single<T> source, @NonNull SingleObserver<? super T> observer) {
+        BiFunction<? super Single, @NonNull ? super SingleObserver, @NonNull ? extends SingleObserver> f = onSingleSubscribe;
         if (f != null) {
             return apply(f, source, observer);
         }
@@ -974,7 +974,7 @@ public static <T> SingleObserver<? super T> onSubscribe(@NonNull Single<T> sourc
      */
     @NonNull
     public static CompletableObserver onSubscribe(@NonNull Completable source, @NonNull CompletableObserver observer) {
-        BiFunction<? super Completable, ? super CompletableObserver, ? extends CompletableObserver> f = onCompletableSubscribe;
+        BiFunction<? super Completable, @NonNull ? super CompletableObserver, @NonNull ? extends CompletableObserver> f = onCompletableSubscribe;
         if (f != null) {
             return apply(f, source, observer);
         }
@@ -990,8 +990,8 @@ public static CompletableObserver onSubscribe(@NonNull Completable source, @NonN
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> MaybeObserver<? super T> onSubscribe(@NonNull Maybe<T> source, @NonNull MaybeObserver<? super T> observer) {
-        BiFunction<? super Maybe, ? super MaybeObserver, ? extends MaybeObserver> f = onMaybeSubscribe;
+    public static <@NonNull T> MaybeObserver<? super T> onSubscribe(@NonNull Maybe<T> source, @NonNull MaybeObserver<? super T> observer) {
+        BiFunction<? super Maybe, @NonNull ? super MaybeObserver, @NonNull ? extends MaybeObserver> f = onMaybeSubscribe;
         if (f != null) {
             return apply(f, source, observer);
         }
@@ -1007,8 +1007,8 @@ public static <T> MaybeObserver<? super T> onSubscribe(@NonNull Maybe<T> source,
      */
     @SuppressWarnings({ "rawtypes" })
     @NonNull
-    public static <T> Subscriber<@NonNull ? super T>[] onSubscribe(@NonNull ParallelFlowable<T> source, @NonNull Subscriber<@NonNull ? super T>[] subscribers) {
-        BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> f = onParallelSubscribe;
+    public static <@NonNull T> Subscriber<? super T>[] onSubscribe(@NonNull ParallelFlowable<T> source, @NonNull Subscriber<? super T>[] subscribers) {
+        BiFunction<? super ParallelFlowable, @NonNull ? super Subscriber[], @NonNull ? extends Subscriber[]> f = onParallelSubscribe;
         if (f != null) {
             return apply(f, source, subscribers);
         }
@@ -1023,7 +1023,7 @@ public static <T> MaybeObserver<? super T> onSubscribe(@NonNull Maybe<T> source,
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> Maybe<T> onAssembly(@NonNull Maybe<T> source) {
+    public static <@NonNull T> Maybe<T> onAssembly(@NonNull Maybe<T> source) {
         Function<? super Maybe, ? extends Maybe> f = onMaybeAssembly;
         if (f != null) {
             return apply(f, source);
@@ -1039,7 +1039,7 @@ public static <T> Maybe<T> onAssembly(@NonNull Maybe<T> source) {
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> Flowable<T> onAssembly(@NonNull Flowable<T> source) {
+    public static <@NonNull T> Flowable<T> onAssembly(@NonNull Flowable<T> source) {
         Function<? super Flowable, ? extends Flowable> f = onFlowableAssembly;
         if (f != null) {
             return apply(f, source);
@@ -1055,7 +1055,7 @@ public static <T> Flowable<T> onAssembly(@NonNull Flowable<T> source) {
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> ConnectableFlowable<T> onAssembly(@NonNull ConnectableFlowable<T> source) {
+    public static <@NonNull T> ConnectableFlowable<T> onAssembly(@NonNull ConnectableFlowable<T> source) {
         Function<? super ConnectableFlowable, ? extends ConnectableFlowable> f = onConnectableFlowableAssembly;
         if (f != null) {
             return apply(f, source);
@@ -1071,7 +1071,7 @@ public static <T> ConnectableFlowable<T> onAssembly(@NonNull ConnectableFlowable
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> Observable<T> onAssembly(@NonNull Observable<T> source) {
+    public static <@NonNull T> Observable<T> onAssembly(@NonNull Observable<T> source) {
         Function<? super Observable, ? extends Observable> f = onObservableAssembly;
         if (f != null) {
             return apply(f, source);
@@ -1087,7 +1087,7 @@ public static <T> Observable<T> onAssembly(@NonNull Observable<T> source) {
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> ConnectableObservable<T> onAssembly(@NonNull ConnectableObservable<T> source) {
+    public static <@NonNull T> ConnectableObservable<T> onAssembly(@NonNull ConnectableObservable<T> source) {
         Function<? super ConnectableObservable, ? extends ConnectableObservable> f = onConnectableObservableAssembly;
         if (f != null) {
             return apply(f, source);
@@ -1103,7 +1103,7 @@ public static <T> ConnectableObservable<T> onAssembly(@NonNull ConnectableObserv
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> Single<T> onAssembly(@NonNull Single<T> source) {
+    public static <@NonNull T> Single<T> onAssembly(@NonNull Single<T> source) {
         Function<? super Single, ? extends Single> f = onSingleAssembly;
         if (f != null) {
             return apply(f, source);
@@ -1158,7 +1158,7 @@ public static void setOnParallelAssembly(@Nullable Function<? super ParallelFlow
      * @since 3.1.0
      */
     @SuppressWarnings("rawtypes")
-    public static void setOnParallelSubscribe(@Nullable BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> handler) {
+    public static void setOnParallelSubscribe(@Nullable BiFunction<? super ParallelFlowable, @NonNull ? super Subscriber[], @NonNull ? extends Subscriber[]> handler) {
         if (lockdown) {
             throw new IllegalStateException("Plugins can't be changed anymore");
         }
@@ -1173,7 +1173,7 @@ public static void setOnParallelSubscribe(@Nullable BiFunction<? super ParallelF
      */
     @SuppressWarnings("rawtypes")
     @Nullable
-    public static BiFunction<? super ParallelFlowable, ? super Subscriber[], ? extends Subscriber[]> getOnParallelSubscribe() {
+    public static BiFunction<? super ParallelFlowable, @NonNull ? super Subscriber[], @NonNull ? extends Subscriber[]> getOnParallelSubscribe() {
         return onParallelSubscribe;
     }
 
@@ -1187,7 +1187,7 @@ public static void setOnParallelSubscribe(@Nullable BiFunction<? super ParallelF
      */
     @SuppressWarnings({ "rawtypes", "unchecked" })
     @NonNull
-    public static <T> ParallelFlowable<T> onAssembly(@NonNull ParallelFlowable<T> source) {
+    public static <@NonNull T> ParallelFlowable<T> onAssembly(@NonNull ParallelFlowable<T> source) {
         Function<? super ParallelFlowable, ? extends ParallelFlowable> f = onParallelAssembly;
         if (f != null) {
             return apply(f, source);
@@ -1312,7 +1312,7 @@ public static Scheduler createSingleScheduler(@NonNull ThreadFactory threadFacto
      * @return the result of the function call
      */
     @NonNull
-    static <T, R> R apply(@NonNull Function<T, R> f, @NonNull T t) {
+    static <@NonNull T, @NonNull R> R apply(@NonNull Function<T, R> f, @NonNull T t) {
         try {
             return f.apply(t);
         } catch (Throwable ex) {
@@ -1332,7 +1332,7 @@ static <T, R> R apply(@NonNull Function<T, R> f, @NonNull T t) {
      * @return the result of the function call
      */
     @NonNull
-    static <T, U, R> R apply(@NonNull BiFunction<T, U, R> f, @NonNull T t, @NonNull U u) {
+    static <@NonNull T, @NonNull U, @NonNull R> R apply(@NonNull BiFunction<T, U, R> f, @NonNull T t, @NonNull U u) {
         try {
             return f.apply(t, u);
         } catch (Throwable ex) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
index 12a96ad5ae..b20c8b23ae 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/AsyncProcessor.java
@@ -114,7 +114,7 @@
  * </code></pre>
  * @param <T> the value type
  */
-public final class AsyncProcessor<T> extends FlowableProcessor<T> {
+public final class AsyncProcessor<@NonNull T> extends FlowableProcessor<T> {
 
     @SuppressWarnings("rawtypes")
     static final AsyncSubscription[] EMPTY = new AsyncSubscription[0];
@@ -229,7 +229,7 @@ public Throwable getThrowable() {
     }
 
     @Override
-    protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> s) {
+    protected void subscribeActual(@NonNull Subscriber<? super T> s) {
         AsyncSubscription<T> as = new AsyncSubscription<>(s, this);
         s.onSubscribe(as);
         if (add(as)) {
@@ -337,12 +337,12 @@ public T getValue() {
         return subscribers.get() == TERMINATED ? value : null;
     }
 
-    static final class AsyncSubscription<T> extends DeferredScalarSubscription<T> {
+    static final class AsyncSubscription<@NonNull T> extends DeferredScalarSubscription<T> {
         private static final long serialVersionUID = 5629876084736248016L;
 
         final AsyncProcessor<T> parent;
 
-        AsyncSubscription(Subscriber<@NonNull ? super T> actual, AsyncProcessor<T> parent) {
+        AsyncSubscription(Subscriber<? super T> actual, AsyncProcessor<T> parent) {
             super(actual);
             this.parent = parent;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index 681d605228..56c9d881f0 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -160,7 +160,7 @@
  * @param <T>
  *          the type of item expected to be observed and emitted by the Processor
  */
-public final class BehaviorProcessor<T> extends FlowableProcessor<T> {
+public final class BehaviorProcessor<@NonNull T> extends FlowableProcessor<T> {
     final AtomicReference<BehaviorSubscription<T>[]> subscribers;
 
     static final Object[] EMPTY_ARRAY = new Object[0];
@@ -239,7 +239,7 @@ public static <T> BehaviorProcessor<T> create() {
     }
 
     @Override
-    protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> s) {
+    protected void subscribeActual(@NonNull Subscriber<? super T> s) {
         BehaviorSubscription<T> bs = new BehaviorSubscription<>(s, this);
         s.onSubscribe(bs);
         if (add(bs)) {
@@ -472,7 +472,7 @@ static final class BehaviorSubscription<@NonNull T> extends AtomicLong implement
 
         private static final long serialVersionUID = 3293175281126227086L;
 
-        final Subscriber<@NonNull ? super T> downstream;
+        final Subscriber<? super T> downstream;
         final BehaviorProcessor<T> state;
 
         boolean next;
@@ -485,7 +485,7 @@ static final class BehaviorSubscription<@NonNull T> extends AtomicLong implement
 
         long index;
 
-        BehaviorSubscription(Subscriber<@NonNull ? super T> actual, BehaviorProcessor<T> state) {
+        BehaviorSubscription(Subscriber<? super T> actual, BehaviorProcessor<T> state) {
             this.downstream = actual;
             this.state = state;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index 55e19f7d1e..a3200346d3 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -130,7 +130,7 @@
  */
 @BackpressureSupport(BackpressureKind.FULL)
 @SchedulerSupport(SchedulerSupport.NONE)
-public final class MulticastProcessor<T> extends FlowableProcessor<T> {
+public final class MulticastProcessor<@NonNull T> extends FlowableProcessor<T> {
 
     final AtomicInteger wip;
 
@@ -370,7 +370,7 @@ public Throwable getThrowable() {
     }
 
     @Override
-    protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> s) {
+    protected void subscribeActual(@NonNull Subscriber<? super T> s) {
         MulticastSubscription<T> ms = new MulticastSubscription<>(s, this);
         s.onSubscribe(ms);
         if (add(ms)) {
@@ -584,17 +584,17 @@ void drain() {
         }
     }
 
-    static final class MulticastSubscription<T> extends AtomicLong implements Subscription {
+    static final class MulticastSubscription<@NonNull T> extends AtomicLong implements Subscription {
 
         private static final long serialVersionUID = -363282618957264509L;
 
-        final Subscriber<@NonNull ? super T> downstream;
+        final Subscriber<? super T> downstream;
 
         final MulticastProcessor<T> parent;
 
         long emitted;
 
-        MulticastSubscription(Subscriber<@NonNull ? super T> actual, MulticastProcessor<T> parent) {
+        MulticastSubscription(Subscriber<? super T> actual, MulticastProcessor<T> parent) {
             this.downstream = actual;
             this.parent = parent;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
index c02a0e937e..79f38a06ec 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
@@ -107,7 +107,7 @@
  * @param <T> the value type multicasted to Subscribers.
  * @see MulticastProcessor
  */
-public final class PublishProcessor<T> extends FlowableProcessor<T> {
+public final class PublishProcessor<@NonNull T> extends FlowableProcessor<T> {
     /** The terminated indicator for the subscribers array. */
     @SuppressWarnings("rawtypes")
     static final PublishSubscription[] TERMINATED = new PublishSubscription[0];
@@ -142,7 +142,7 @@ public static <T> PublishProcessor<T> create() {
     }
 
     @Override
-    protected void subscribeActual(@NonNull Subscriber<@NonNull ? super T> t) {
+    protected void subscribeActual(@NonNull Subscriber<? super T> t) {
         PublishSubscription<T> ps = new PublishSubscription<>(t, this);
         t.onSubscribe(ps);
         if (add(ps)) {
@@ -341,7 +341,7 @@ static final class PublishSubscription<@NonNull T> extends AtomicLong implements
 
         private static final long serialVersionUID = 3562861878281475070L;
         /** The actual subscriber. */
-        final Subscriber<@NonNull ? super T> downstream;
+        final Subscriber<? super T> downstream;
         /** The parent processor servicing this subscriber. */
         final PublishProcessor<T> parent;
 
@@ -350,7 +350,7 @@ static final class PublishSubscription<@NonNull T> extends AtomicLong implements
          * @param actual the actual subscriber
          * @param parent the parent PublishProcessor
          */
-        PublishSubscription(Subscriber<@NonNull ? super T> actual, PublishProcessor<T> parent) {
+        PublishSubscription(Subscriber<? super T> actual, PublishProcessor<T> parent) {
             this.downstream = actual;
             this.parent = parent;
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
index 1a0fdfebfb..ae6a7d3960 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/ReplayProcessor.java
@@ -141,7 +141,7 @@
  *
  * @param <T> the value type
  */
-public final class ReplayProcessor<T> extends FlowableProcessor<T> {
+public final class ReplayProcessor<@NonNull T> extends FlowableProcessor<T> {
     /** An empty array to avoid allocation in getValues(). */
     private static final Object[] EMPTY_ARRAY = new Object[0];
 
@@ -345,7 +345,7 @@ public static <T> ReplayProcessor<T> createWithTimeAndSize(long maxAge, @NonNull
     }
 
     @Override
-    protected void subscribeActual(Subscriber<@NonNull ? super T> s) {
+    protected void subscribeActual(Subscriber<? super T> s) {
         ReplaySubscription<T> rs = new ReplaySubscription<>(s, this);
         s.onSubscribe(rs);
 
@@ -584,7 +584,7 @@ void remove(ReplaySubscription<T> rs) {
      *
      * @param <T> the value type
      */
-    interface ReplayBuffer<T> {
+    interface ReplayBuffer<@NonNull T> {
 
         void next(T value);
 
@@ -612,10 +612,10 @@ interface ReplayBuffer<T> {
         void trimHead();
     }
 
-    static final class ReplaySubscription<T> extends AtomicInteger implements Subscription {
+    static final class ReplaySubscription<@NonNull T> extends AtomicInteger implements Subscription {
 
         private static final long serialVersionUID = 466549804534799122L;
-        final Subscriber<@NonNull ? super T> downstream;
+        final Subscriber<? super T> downstream;
         final ReplayProcessor<T> state;
 
         Object index;
@@ -626,7 +626,7 @@ static final class ReplaySubscription<T> extends AtomicInteger implements Subscr
 
         long emitted;
 
-        ReplaySubscription(Subscriber<@NonNull ? super T> actual, ReplayProcessor<T> state) {
+        ReplaySubscription(Subscriber<? super T> actual, ReplayProcessor<T> state) {
             this.downstream = actual;
             this.state = state;
             this.requested = new AtomicLong();
@@ -728,7 +728,7 @@ public void replay(ReplaySubscription<T> rs) {
 
             int missed = 1;
             final List<T> b = buffer;
-            final Subscriber<@NonNull ? super T> a = rs.downstream;
+            final Subscriber<? super T> a = rs.downstream;
 
             Integer indexObject = (Integer)rs.index;
             int index;
@@ -846,7 +846,7 @@ static final class TimedNode<T> extends AtomicReference<TimedNode<T>> {
         }
     }
 
-    static final class SizeBoundReplayBuffer<T>
+    static final class SizeBoundReplayBuffer<@NonNull T>
     implements ReplayBuffer<T> {
 
         final int maxSize;
@@ -967,7 +967,7 @@ public void replay(ReplaySubscription<T> rs) {
             }
 
             int missed = 1;
-            final Subscriber<@NonNull ? super T> a = rs.downstream;
+            final Subscriber<? super T> a = rs.downstream;
 
             Node<T> index = (Node<T>)rs.index;
             if (index == null) {
@@ -1253,7 +1253,7 @@ public void replay(ReplaySubscription<T> rs) {
             }
 
             int missed = 1;
-            final Subscriber<@NonNull ? super T> a = rs.downstream;
+            final Subscriber<? super T> a = rs.downstream;
 
             TimedNode<T> index = (TimedNode<T>)rs.index;
             if (index == null) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
index 6ba938e9e4..60cc033bd6 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
@@ -147,7 +147,7 @@
  * @param <T> the value type received and emitted by this Processor subclass
  * @since 2.0
  */
-public final class UnicastProcessor<T> extends FlowableProcessor<T> {
+public final class UnicastProcessor<@NonNull T> extends FlowableProcessor<T> {
 
     final SpscLinkedArrayQueue<T> queue;
 
@@ -159,7 +159,7 @@ public final class UnicastProcessor<T> extends FlowableProcessor<T> {
 
     Throwable error;
 
-    final AtomicReference<Subscriber<@NonNull ? super T>> downstream;
+    final AtomicReference<Subscriber<? super T>> downstream;
 
     volatile boolean cancelled;
 
@@ -282,7 +282,7 @@ void doTerminate() {
         }
     }
 
-    void drainRegular(Subscriber<@NonNull ? super T> a) {
+    void drainRegular(Subscriber<? super T> a) {
         int missed = 1;
 
         final SpscLinkedArrayQueue<T> q = queue;
@@ -326,7 +326,7 @@ void drainRegular(Subscriber<@NonNull ? super T> a) {
         }
     }
 
-    void drainFused(Subscriber<@NonNull ? super T> a) {
+    void drainFused(Subscriber<? super T> a) {
         int missed = 1;
 
         final SpscLinkedArrayQueue<T> q = queue;
@@ -374,7 +374,7 @@ void drain() {
 
         int missed = 1;
 
-        Subscriber<@NonNull ? super T> a = downstream.get();
+        Subscriber<? super T> a = downstream.get();
         for (;;) {
             if (a != null) {
 
@@ -394,7 +394,7 @@ void drain() {
         }
     }
 
-    boolean checkTerminated(boolean failFast, boolean d, boolean empty, Subscriber<@NonNull ? super T> a, SpscLinkedArrayQueue<T> q) {
+    boolean checkTerminated(boolean failFast, boolean d, boolean empty, Subscriber<? super T> a, SpscLinkedArrayQueue<T> q) {
         if (cancelled) {
             q.clear();
             downstream.lazySet(null);
@@ -475,7 +475,7 @@ public void onComplete() {
     }
 
     @Override
-    protected void subscribeActual(Subscriber<@NonNull ? super T> s) {
+    protected void subscribeActual(Subscriber<? super T> s) {
         if (!once.get() && once.compareAndSet(false, true)) {
 
             s.onSubscribe(wip);
diff --git a/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java b/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
index 8556d847ba..f66c34b9b9 100644
--- a/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/subscribers/SafeSubscriber.java
@@ -28,7 +28,7 @@
  *
  * @param <T> the value type
  */
-public final class SafeSubscriber<T> implements FlowableSubscriber<T>, Subscription {
+public final class SafeSubscriber<@NonNull T> implements FlowableSubscriber<T>, Subscription {
     /** The actual Subscriber. */
     final Subscriber<? super T> downstream;
     /** The subscription. */
diff --git a/src/test/java/io/reactivex/rxjava3/validators/NonNullMethodTypeArgumentCheck.java b/src/test/java/io/reactivex/rxjava3/validators/NonNullMethodTypeArgumentCheck.java
new file mode 100644
index 0000000000..f0abb5b23e
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/validators/NonNullMethodTypeArgumentCheck.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.validators;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.*;
+import java.nio.file.Files;
+import java.util.*;
+
+import org.junit.Test;
+
+import io.reactivex.rxjava3.core.*;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.parallel.ParallelFlowable;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
+import io.reactivex.rxjava3.testsupport.TestHelper;
+
+/**
+ * Verify static methods and final methods declaring type arguments
+ * declare {@code @NonNull} for said argument.
+ *
+ */
+public class NonNullMethodTypeArgumentCheck {
+
+    static void process(Class<?> clazz) {
+
+        String className = clazz.getSimpleName();
+        String parentPackage = clazz.getPackage().getName();
+
+        StringBuilder result = new StringBuilder();
+        int count = 0;
+
+        try {
+            File f = TestHelper.findSource(className, parentPackage);
+
+            try (BufferedReader in = Files.newBufferedReader(f.toPath())) {
+                int lineCount = 1;
+                String line = null;
+
+                while ((line = in.readLine()) != null) {
+                    line = line.trim();
+
+                    if (!line.contains(" to(")) {
+                        if (line.startsWith("public static <") || line.startsWith("public final <")) {
+
+                            for (String ta : parseTypeArguments(line)) {
+                                if (!ta.startsWith("@NonNull") && !ta.startsWith("@Nullable")) {
+                                    result.append("Missing annotation on argument ").append(ta).append("\r\nat ")
+                                    .append(parentPackage).append(".").append(className).append(".method(")
+                                    .append(className).append(".java:").append(lineCount).append(")\r\n");
+                                    count++;
+                                }
+                            }
+                        }
+                    }
+                    lineCount++;
+                }
+            }
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+
+        if (count != 0) {
+            throw new IllegalArgumentException("Found " + count + " cases\r\n" + result.toString());
+        }
+    }
+
+    static List<String> parseTypeArguments(String line) {
+        List<String> result = new ArrayList<>();
+        int offset = line.indexOf("<");
+        int c = 1;
+        int i = offset + 1;
+        int j = i;
+        for (; i < line.length(); i++) {
+            if (line.charAt(i) == '<') {
+                c++;
+            } else
+            if (line.charAt(i) == '>') {
+                c--;
+                if (c == 0) {
+                    break;
+                }
+            } else
+            if (line.charAt(i) == ',' && c == 1) {
+                result.add(line.substring(j, i).trim());
+                j = i + 1;
+            }
+        }
+        result.add(line.substring(j, i).trim());
+        return result;
+    }
+
+    @Test
+    public void parseTypeArguments() {
+        assertEquals(new ArrayList<>(Arrays.asList("T")), parseTypeArguments("<T>"));
+        assertEquals(new ArrayList<>(Arrays.asList("T", "U")), parseTypeArguments("<T, U>"));
+        assertEquals(new ArrayList<>(Arrays.asList("T", "Flowable<U>")), parseTypeArguments("<T, Flowable<U>>"));
+        assertEquals(new ArrayList<>(Arrays.asList("T", "Flowable<U, V>")), parseTypeArguments("<T, Flowable<U, V>>"));
+    }
+
+    @Test
+    public void flowable() {
+        process(Flowable.class);
+    }
+
+    @Test
+    public void observable() {
+        process(Observable.class);
+    }
+
+    @Test
+    public void maybe() {
+        process(Maybe.class);
+    }
+
+    @Test
+    public void single() {
+        process(Single.class);
+    }
+
+    @Test
+    public void completable() {
+        process(Completable.class);
+    }
+
+    @Test
+    public void parallel() {
+        process(ParallelFlowable.class);
+    }
+
+    @Test
+    public void plugins() {
+        process(RxJavaPlugins.class);
+    }
+}
diff --git a/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
index ee04efa28c..dfa4aea548 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/SourceAnnotationCheck.java
@@ -385,7 +385,9 @@ else if (skippingDepth == 0) {
 
             for (String typeName : TYPES_REQUIRING_NONNULL_TYPEARG) {
                 String pattern = typeName + "<?";
-                if (line.contains(pattern)) {
+                String patternRegex = ".*" + typeName + "\\<\\? (extends|super) " + COMMON_TYPE_ARG_NAMES + "\\>.*";
+                if (line.contains(pattern) && !line.matches(patternRegex)) {
+
                     errorCount++;
                     errors.append("L")
                     .append(j)
@@ -402,6 +404,45 @@ else if (skippingDepth == 0) {
                     ;
                 }
             }
+            for (String typeName : TYPES_FORBIDDEN_NONNULL_TYPEARG) {
+                String patternRegex = ".*" + typeName + "\\<@NonNull (\\? (extends|super) )?" + COMMON_TYPE_ARG_NAMES + "\\>.*";
+
+                if (line.matches(patternRegex)) {
+                    errorCount++;
+                    errors.append("L")
+                    .append(j)
+                    .append(" : @NonNull type argument should be on the arg declaration ")
+                    .append(typeName)
+                    .append("\r\n")
+                    .append(" at ")
+                    .append(fullClassName)
+                    .append(".method(")
+                    .append(f.getName())
+                    .append(":")
+                    .append(j + 1)
+                    .append(")\r\n")
+                    ;
+                }
+            }
+
+            for (String typeName : TYPES_REQUIRING_NONNULL_TYPEARG_ON_FUNC) {
+                if (line.matches(".*Function[\\d]?\\<.*, (\\? (extends|super) )?" + typeName + ".*")) {
+                    errorCount++;
+                    errors.append("L")
+                    .append(j)
+                    .append(" : Missing @NonNull type argument annotation on Function argument ")
+                    .append(typeName)
+                    .append("\r\n")
+                    .append(" at ")
+                    .append(fullClassName)
+                    .append(".method(")
+                    .append(f.getName())
+                    .append(":")
+                    .append(j + 1)
+                    .append(")\r\n")
+                    ;
+                }
+            }
         }
 
         if (errorCount != 0) {
@@ -445,6 +486,16 @@ else if (skippingDepth == 0) {
     );
 
     static final List<String> TYPES_REQUIRING_NONNULL_TYPEARG = Arrays.asList(
-            "Iterable", "Stream", "Publisher", "Subscriber", "Processor"
+            "Iterable", "Stream", "Publisher", "Processor", "Subscriber", "Optional"
     );
+    static final List<String> TYPES_FORBIDDEN_NONNULL_TYPEARG = Arrays.asList(
+            "Iterable", "Stream", "Publisher", "Processor", "Subscriber", "Optional"
+    );
+
+    static final List<String> TYPES_REQUIRING_NONNULL_TYPEARG_ON_FUNC = Arrays.asList(
+            "Iterable", "Stream", "Publisher", "Processor", "Subscriber", "Optional",
+            "Observer", "SingleObserver", "MaybeObserver", "CompletableObserver"
+    );
+
+    static final String COMMON_TYPE_ARG_NAMES = "([A-Z][0-9]?|TOpening|TClosing|TLeft|TLeftEnd|TRight|TRightEnd)";
 }

From e24e725c1888be636b5d9dd875df84fdfaa05ca8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Jul 2021 09:05:18 +0200
Subject: [PATCH 296/665] Bump codecov/codecov-action from 2.0.1 to 2.0.2
 (#7304)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2.0.1 to 2.0.2.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v2.0.1...v2.0.2)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 2d64e82a80..c7a6186f7c 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.1
+      uses: codecov/codecov-action@v2.0.2
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 4a5a0c4ba8..c923c33b5f 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.1
+      uses: codecov/codecov-action@v2.0.2
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 092dd9f659..bc8b325ceb 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.1
+      uses: codecov/codecov-action@v2.0.2
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 391feb08a5..595de5809d 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -41,7 +41,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.1
+      uses: codecov/codecov-action@v2.0.2
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 5b0dd58a8580939754d51c5d132e3978d99ce04c Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 2 Aug 2021 12:55:00 +0200
Subject: [PATCH 297/665] 3.x: Add RxJavaPlugins.createExecutorScheduler
 (#7306)

* 3.x: Add RxJavaPlugins.createExecutorScheduler

* Fix newline
---
 .../rxjava3/plugins/RxJavaPlugins.java        | 22 ++++++++++++++++++-
 .../rxjava3/schedulers/Schedulers.java        | 19 +++++++++++++---
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
index 506fb65c67..c1115bb478 100644
--- a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
@@ -15,7 +15,7 @@
 
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.Objects;
-import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.*;
 
 import org.reactivestreams.Subscriber;
 
@@ -1302,6 +1302,26 @@ public static Scheduler createSingleScheduler(@NonNull ThreadFactory threadFacto
         return new SingleScheduler(Objects.requireNonNull(threadFactory, "threadFactory is null"));
     }
 
+    /**
+     * Create an instance of a {@link Scheduler} by wrapping an existing {@link Executor}.
+     * <p>
+     * This method allows creating an {@code Executor}-backed {@code Scheduler} before the {@link Schedulers} class
+     * would initialize the standard {@code Scheduler}s.
+     *
+     * @param executor the {@code Executor} to wrap and turn into a {@code Scheduler}.
+     * @param interruptibleWorker if {@code true}, the tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} will
+     * be interrupted when the task is disposed.
+     * @param fair if {@code true}, tasks submitted to the {@code Scheduler} or {@code Worker} will be executed by the underlying {@code Executor} one after the other, still
+     * in a FIFO and non-overlapping manner, but allows interleaving with other tasks submitted to the underlying {@code Executor}.
+     * If {@code false}, the underlying FIFO scheme will execute as many tasks as it can before giving up the underlying {@code Executor} thread.
+     * @return the new {@code Scheduler} wrapping the {@code Executor}
+     * @since 3.1.0
+     */
+    @NonNull
+    public static Scheduler createExecutorScheduler(@NonNull Executor executor, boolean interruptibleWorker, boolean fair) {
+        return new ExecutorScheduler(executor, interruptibleWorker, fair);
+    }
+
     /**
      * Wraps the call to the function in try-catch and propagates thrown
      * checked exceptions as RuntimeException.
diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index cc7e693b3d..112c2559b0 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -378,6 +378,10 @@ public static Scheduler single() {
      * execute those tasks "unexpectedly".
      * <p>
      * Note that this method returns a new {@code Scheduler} instance, even for the same {@code Executor} instance.
+     * <p>
+     * It is possible to wrap an {@code Executor} into a {@code Scheduler} without triggering the initialization of all the
+     * standard schedulers by using the {@link RxJavaPlugins#createExecutorScheduler(Executor, boolean, boolean)} method
+     * before the {@code Schedulers} class itself is accessed.
      * @param executor
      *          the executor to wrap
      * @return the new {@code Scheduler} wrapping the {@code Executor}
@@ -385,7 +389,7 @@ public static Scheduler single() {
      */
     @NonNull
     public static Scheduler from(@NonNull Executor executor) {
-        return new ExecutorScheduler(executor, false, false);
+        return from(executor, false, false);
     }
 
     /**
@@ -452,6 +456,10 @@ public static Scheduler from(@NonNull Executor executor) {
      * execute those tasks "unexpectedly".
      * <p>
      * Note that this method returns a new {@code Scheduler} instance, even for the same {@code Executor} instance.
+     * <p>
+     * It is possible to wrap an {@code Executor} into a {@code Scheduler} without triggering the initialization of all the
+     * standard schedulers by using the {@link RxJavaPlugins#createExecutorScheduler(Executor, boolean, boolean)} method
+     * before the {@code Schedulers} class itself is accessed.
      * <p>History: 2.2.6 - experimental
      * @param executor
      *          the executor to wrap
@@ -463,7 +471,7 @@ public static Scheduler from(@NonNull Executor executor) {
      */
     @NonNull
     public static Scheduler from(@NonNull Executor executor, boolean interruptibleWorker) {
-        return new ExecutorScheduler(executor, interruptibleWorker, false);
+        return from(executor, interruptibleWorker, false);
     }
 
     /**
@@ -532,6 +540,11 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
      * execute those tasks "unexpectedly".
      * <p>
      * Note that this method returns a new {@code Scheduler} instance, even for the same {@code Executor} instance.
+     * <p>
+     * It is possible to wrap an {@code Executor} into a {@code Scheduler} without triggering the initialization of all the
+     * standard schedulers by using the {@link RxJavaPlugins#createExecutorScheduler(Executor, boolean, boolean)} method
+     * before the {@code Schedulers} class itself is accessed.
+     *
      * @param executor
      *          the executor to wrap
      * @param interruptibleWorker if {@code true}, the tasks submitted to the {@link io.reactivex.rxjava3.core.Scheduler.Worker Scheduler.Worker} will
@@ -544,7 +557,7 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
      */
     @NonNull
     public static Scheduler from(@NonNull Executor executor, boolean interruptibleWorker, boolean fair) {
-        return new ExecutorScheduler(executor, interruptibleWorker, fair);
+        return RxJavaPlugins.createExecutorScheduler(executor, interruptibleWorker, fair);
     }
 
     /**

From 38341b5fa322d0d6a1f76cf065831978dba0e0a5 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Wed, 4 Aug 2021 17:10:47 +0800
Subject: [PATCH 298/665] Bump gradle to 7.1.1 (#7307)

* Bump gradle to 7.1.1

* Execute `gradlew wrapper`
---
 gradle/wrapper/gradle-wrapper.jar        | Bin 59203 -> 59536 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644
GIT binary patch
delta 18435
zcmY&<19zBR)MXm8v2EM7ZQHi-#I|kQZfv7Tn#Q)%81v4zX3d)U4d<S{&&C~|14~>4
zYYc!v@NU%|U;_sM`2z(4BAilWijmR>4U^KdN)D8%@2KLcqkTDW<b;`{sz_0x=?HD$
zfRd}z!dlzv65-&;kfVv!%#n8?Y%uh6t_yvK3%vZ!=sQhW#x&$16>%^3U(Wg>{qkAF
z&RcYr;D1I5aD(N-PnqoEeBN~JyXiT(+@b`4Pv`;KmkBXYN48@0;iXuq6!ytn`vGp$
z6X4DQHMx^WlOek^bde&~cvEO@K$oJ}i`T`N;M|lX0mhmEH<Qh2bO23s<c<b?kJSx>
zuRpo!rS~#&rg}ajBdma$$}+vEhz?JAFUW|iZEcL%amAg_pzqul-B7Itq6Y_BGmOCC
zX*Bw3rFz3R)DXpCVBkI!SoOHt<r_Zw4g3Jlhii6BC+0g(i?Vec^cYS1yA*tD`4TKj
zOApa7lBa#WaS!-2<I(+955H!14q3}J>Ystv*e-May|+?b80ZRh$MZ$FerlC`)ZKt}
zTd0Arf9N2dimjs>mg5&@sfTP<FMra4imH+_IBlL4Nc_~AL#%VJCxe3)stbd02AEM|
z&D0&Tn5H7hbWpsy=sT;pxOd15(iWc{al!mn&C#+i%f3lDS<jx_mG|11KCBpX%ouSo
z@?~hUsz{+<!8=d398xo&@l@S~*jz8h-YM#AGsF0WGkRz@$<m!>sRXKXI;0L~&t+GH
zkB<>wxI9D+k5VHHcB7Rku{Z>i3$&hgd9Mt_hS_GaGg0#2EHzyV=j=u5xSyV~F0*qs
zW{k9}lFZ?H%@4hII_!bzao!S(J^^ZZVmG_;^qXkpJb7OyR*sPL<g~w=Zk9z5S1jDI
z71nU2i<Es|#qXTuJIRx-HjX+gJ*LMd1jHM#UfOkw#&q`-<mI*srz-Ay05DEYB_)#v
zvk_+YZbpT72OHLyzK&`<6&<^A=1Fr^E7_0s%OXF6r^I$M)pZ_3F4o5d`%I9#uyBlZ
zX1C9_iSi<5viI;Yrq>>))Jx{K4xtO2xTr@St!@CJ=y3q2wY5F`77Tqwz8!&Q{f7Dp
zifvzV<QA3qQ_icfAX<_Uh_AWeD00fmmOez9t>V1!Dj*dxG%BsQyRP6${X+Tc$+XOG
zzvq5xcC#&-iXlp$)L=9t{oD~bT~v^ZxQG;FRz|HcZj|^L#_(<kbHS<d%uD<k^y4GS
z_@nGkSrluLeGBfOtQ55e=_#qB)a=_z-;eBz1(Z7to$`|!g;(i3z=gq~yvKKK5sNc#
zl$gJ2XIR<<L*cw&uktYWH>VNG)k{=_6|6Bs-tRNCn-XuaZ^*^hpZ@qw<A`W4NXV_{
zECxbg>i`m|BxcF6IWc?_bhtK_cDZRTw#*bZ2`1@1HcB<A>`mLUmo_>@2R&nj7&CiH
zF&laHkG~7#U>c}rn#H)q^|sk+lc!?6wg0xy`VPn!{4P=u@cs%-V{VisOxVqAR{XX+
zw}R;{Ux@6A_QPka=48|tph^^ZFjSHS1BV3xfrbY84^=?&gX=bmz(7C({=*oy|BEp+
zYgj;<`j)GzINJA>{HeSHC)<cjl~xrBv-Ad;_(!35VQHb!n{j_(E9gc}-sAqiZ7)~T
zGr>bvp6ucoE`c+6#2KzY9)TClmtEB1^^Mk)(mXWYvup02e%Ghm9qyjz#fO3bNGBX}
zFiB>dvc1+If!><mtjfI+&uNcAL5R+)16aVAdoC-IdLWfR^loo9quT)qg_~Y<A<|%J
z{4}JG)2I+AA+2M<X=n8Tj%Y@|gL;a0cu?_0nya~Ds$JH`tyme!ug%h)y+8F-aj3Vs
zM_OOr;e%?DW<F8GdQP&*MHN=uF5OQ@*^d|_+48he#kR1%(q8FHxG~1)pjWd#*S~<-
zsO)|Q{2i9C8z1<O>I10;qZk`?6pEd*(?bI&G*3YLt;MWw&!?=Mf7%^Op?qnyXWur-
zwX|S^P>jF?{m9c&mmK-epCRg#WB+-VDe!2d2~YVoi%7_q(dyC{(}zB${!ElKB2D}P
z7QNFM!*O^?FrPMGZ}wQ0TrQAVqZy!weLhu_Zq&`rlD39r*9&2sJHE(JT0EY5<}~x@
z1>P0!L2IFDqAB!($H9s2fI`&J_c+5QT|b#%99HA3@zUWOuYh(~7q7!Pf_U3u!ij5R
zjFzeZta^~RvAmd_TY+RU@e}wQaB_PNZI26zmtzT4iGJg9U(Wrgrl>J%Z3MKHOWV(?
zj>~Ph$<~8Q_sI+)$DOP^9FE6WhO09EZJ?1W|KidtEjzBX3RCLUwmj9qH1CM=^}MaK
z59kGxRRfH(n|0*lkE?`Rpn6d^u5J6wPfi0WF(rucTv(I;`aW)3;nY=J=igkjsn?ED
ztH&ji>}TW8)o!Jg@9Z}=i2-;o4#xUksQHu}XT~yRny|kg-$Pqeq!^78xAz2mYP9+4
z9gwAot<F`HDf<=vVlS~}$IUDtF0klA`^#pB|G?>i2ICvUWxE&RZ~}E)#M8*zy1iwz
zHqN%q;u+f6Ti|SzI<FRGwCIa?0!fO9WN;kBsxILjw5}w5BK>Lm0s-)=4)>eb5o-0K
zbMW8ecB4p^6OuIX@u`f{>Yn~m9PINEl#+t*jqalwxIx=TeGB9(b6jA}9VOHnE$9sC
zH`;epyH!k-3kNk2XWXW!K`L_G!%xOqk0ljPCMjK&VweAxEaZ=<DzSWjCiKD^*;5J$
zl4gOX?qd<vHF|&G>=cT#;!<B?QV)Sxf^HT@cL_2la1`-IR6ZJ;P$+RaV<afLePi-(
z`iA)b_c_5yafTWN1f-H8r4X4C7}bXH(p^at7}wcudBoe0*%y<B25sgtkcNi&V-$%G
zMSGX5<q?c3;?<OIPu@&cT0xgeo?7m!1=~tj=2jG1wy=Q0Jt$O25951g=k|2gnn%q#
z)8}Dz@%7wCsofkVeUfvN<9Fx(obP+xb&~&3;CkI=_&w{&h_XoYrA)m7ECODqf@l4F
zr=J~G0aXj%UK8SkUZ>7)X&C|X{dY^IY(e4D#!tx^vV3NZqK~--JW~wtXJ8X19ad<I
zm9QB;RzH152H*y3tMn*3EvxkEox&n8T*@N+`8Grw?(i08(CyTVvrdYB<~KAN?m-af
z48ifc{b0Ob(DjSYG@#1{T-ASiogxS*?mdh?gD%n`&#ElaJuKw(ZVs>Xim<W6u2t)u
z6s_ppklZx{7yd_UKBw+|N=In~2BVl!;x!QFZ9|x}y<?)9OHecoqZy3Ivt=}#Q4OL}
zHX1K1MQ2CF*2uHy#a$|F7h=ma*&JbOw43$!kcjqs7DeysG@f1n)sS!+XLYaik%I6Q
zipAB_g8OF4y#?ZDYDeW}jgwU3o7%OecZ~=o`u6c&jknOzmB`r7um)wXimA2gUfH7y
zwN>?PdN(|@o(OdgH3AiHts~?#QkolO?*=U_buYC&tQ3sc(O5HGHN~=6wB@dgIAVT$
z_O<cn@nUEGUT$oFPywe(&63O<$H?qH$ZdDGyOrByWM-n!VN96r=4Si%R!g1l+UnD`
zQey?KU7qiwzmKU}0s?3Fj2Rin=8W1ZMnah!zlFm}iM17m<$e2;<DZ4?9$K``?YR+Q
zC}no$*}t0`uIi4yRIN32V9oeLrVI6T6+Jz_>JWJ^&*40Pw&%y^t8-Wn4@l9gOl`uU
z{Uda_uk9!Iix?KBu9CYwW9Rs=yt_lE11A+k$+)pkY5pXp<hVQ+lx!L-&x;bs6sTWy
z5-jLZ!#e0u)=!m;6eq(oP?P9YA*Tr@kg*nGSid%#)&Itd;r2X&XUd2s?PWTYrzq|2
z53Ns^<9hG_We_Zz8R90$En!t{KH(+#ajodOS-JLijl^nkBeB<yrw*j+6*uuXLyLF9
z{N3t`5+i>ocxIEJe|pTxwFgB%Kpr&tH;PzgOQ&m|<oUQ1dylfIc7Y5Z3j1x;-E4})
zlPALqD3U1psXL!B;q*ehz{Llf;>(#Otm?@H^r`v)9yiR8v&Uy>d#TNdRfyN4Jk;`g
zp+jr5@L2A7TS4=G-#O<`A9o;{En5!I8lVUG?!PMsv~{E_yP%QqqTxxG%8%KxZ{uwS
zOT+EA5`*moN8wwV`Z=wp<3?~f#frmID^K?t7YL<m6VWFb>`G^(X43g<oal-E1{f_!
zMM~2F^%K|Fu~`x<<&sTAc`V5n;Rw6{XkE{;s3-|c+NIU#Skt3b199qOwzF!22Tqf*
zE16<4@?5ePsR(z@^xu8!CWvB;_CSM&hm~uwsrVnilwfgKIQSi1c+dzpZ8QColu7eB
zT&F_jgPa+roCfk+v!rsEdW#ZFy2((cA!saskfsl5@-js1&&gA?clYAmax@Nf1=?Q4
zy-!%e31-Pm3`OUe=&CWnia;bDEY^Qu5IhxOnKWJv>Wbo!6(q*u%HxWh$$^2EOq`Hj
zp=-fS#Av+s9r-M)wGIggQ)b<@-BR`R8l1G@2+KODmn<_$Tzb7k35?e8;!V0G>`(!~
zY~qZz!6*&|TupOcnvsQYPbcMiJ!J{<AUkIQ?T$#YvpqqHZZT}0w>RyfezB^;fceBk
znpA1XS)~KcC%0^_;ihibczSxwBuy;^ksH7lwfq7*GU;TLt*WmUEV<B*)702m>Qxt{
zKSfJf;lk$0XO8~4<V91^$-vD;;s6SSgg|GI(=zrZRux(KOs}+`xmO>8Xn2d<xw$ML
z-Nox99yuWO;%tc<D!o9)3662vJevDRmH3`X>nh8tMC9WHu`%DZj&a`2!tNB`5%;Md
zBs|#T0Ktf?vkWQ)Y+q!At1qgL`C|nbzvgc(+28Q|4N6Geq)Il<kZ3mGp>%+I<Y$q}
zk%HyZpWUh@6{prl<|AyV2rx<i=^VB%K0@I+<ln!^usw3Em(Miio93@zcZ%-v{4&N2
zcYE0Tpd>5c@t02{9^=QJ?=h2BTe`~BEu=_u3xX2&?^zwcQWL+)7dI>JK0g8_`W1n~
zMaEP97X>Ok#=G*nkPmY`VoP8_{~+Rp7DtdSyWxI~?TZHxJ&=6KffcO2Qx1?j7=LZA
z?GQt`oD9QpXw+s7`t+eeLO$cpQpl9(6h3_l9a6OUpbwBasCeCw^UB6we!&h9Ik<t|
zD0oMP!MWpM*U(u`s*F9Hx|}0|3{SpW3>@1zvJ`j4i=tvG9X8o34+N|y(ay~ho$f=l
z514~mP>Z>#6+UxM<6@4z*|hFJ?KnkQBs_9{H(-v!_#Vm6Z4<deXWj{kD3-?t{z(at
z5F960+Lt}Rd_`N{v%m1^3E9$wcvIbH!uR*j0b^-{f_3#Jis!WwN*J7@HbvqL8Zdjq
z$T6F?1c?FFl=g%g8UXxRntAEHa6ofPAW?d>(xV5WgWMd3mB9A(>@XE292#k(HdI7P
zJkQ2)`bQXTKlr}{VrhSF5rK9TsjtGs0Rs&nUMcH@$ZX_`Hh$Uje*)(Wd&oLW($hZQ
z_tPt`{O@f8hZ<}?aQc6~|9iHt>=!%We3=F9yIfiqhXqp=QUVa!@UY@IF5^dr5H8$R
zIh{=%S{$BHG+>~a=vQ={!B9B=<-ID=nyjfA0V8->gN{jRL>Qc4Rc<86;~aY+R!~Vs
zV7MI~gVzGIY`B*Tt@rZk#Lg}H8sL39OE31wr_Bm%mn}8n773R&N)8B;l+-eOD@N$l
zh&~Wz`m1qavVdxwtZLACS(U{rAa0;}KzPq9r76xL?c{&G<UJ=R?LuB}PDO7HVNF<3
zfCse)dXXnk@duX_x6gxT#znrXeb8;xk?)n8E`2<|0F?)>aG5hX_NK!?)iq`t7q*F#
zFoKI{h{*8lb>&sOeHXoAiqm*vV6?C~5U%tXR8^XQ9Y|(XQvcz*>a?%HQ(Vy<2UhNf
zVmGeOO#v159KV@1g`m%gJ<w@$Jfr|I+t<O1vhU+3{qM1CnOgkF@lDWIFY2P&R7=ZP
z8`(YDAz*YyvmlEiqc#;+fy8?1CW()FxYZFSGN+f<<VQg&@m?XNaI27R(!Y^I-zolX
zPCRK)8i0Y7fjRSFQh*v<puB(gBc(MsA|^8jB6IY9u-_<pCipoS@#KuXUh!bv66|sJ
z@P<R+ErTIV%VE03mMc&bKh;NS(uYg30Kyk-WT%%e1g)=e#1+)!2MFss5qM=tVqWUJ
zq~^bP4dz-ZXl-uw@HZ;Ee0<FPo#JTdn9|^s3;-k4yD8(Rg7Q1B5V}fp8dvCBvO-&&
zP<En#@06*@fduhJn_yI@#Nj@hur=#<#27q0QXHv-e#oMi3}5Z28GP}@{CSkcPJVX9
zEhbEH)dxGPDRBmMS)0sW$HHzTu}xfXfFz%}&ac@@z(W!98m-Gh_Aiq9YRq+bsQ@3%
z4j>)XGPLa`a|?9HSzSSX{j;)xg>G(Ncc7+C>AyAWYa(k}5B3mtzg4tsA<Sh;28pD1
zIFs~Z><MDBdusACPh#gSuba$Zxq9XQ9zHgTm9jJRWBl;6MmD|7#OCb+r-NVhSxD`l
zpz{#9n=TYzv1i>=C^Wfezb1&LlyrBE1~kNfeiubLls{C)!<%#m@f}v^o+7<<peV!m
z=VC0_KSpi7FpU+=-~zA*iYIY`A$OK=V*+<-;yaWEHTS+fpQ9nF0e2pd-&@Jw1WOD3
z8GVsYvW1sKoZNTx4OK_oZ>VZ6!FZ;JeiAG@5vw7Li{flC8q1%jD_WP2ApBI{fQ}kN
zhvhmdZ0bb5(qK@VS5-)G+@GK(tuF6eJuuV5>)Odgmt?i_`tB69DWpC~e8gqh!>jr_
zL1~<WJ)Q75x^h;pF?{k_oIs!CDg4%}(~+#drio{%*&0bN?<+bgXDB){8A}v4#SS*<
zI#7-8DmoH|MGeJJ^ryCu?tbd$K%t}510M-_>L0xw@C<fO#AAX{JzQ=;ULY)<=J5}B
z9Z`iyf-Y%TuNp~D5)2(pu9Ft(%eU-|wt$z2&#v?|6IUFZ08w=fc1d*h-vc#mRUp@o
zJ>bMSTmQflpRyjif*Y*O-IVQ_OFhUw-zh<q;LT5p+$IR7zEGtb#X(0BaIHkAvMxDl
z&9|x2$0;2BOM24Yox5>PrXXW>6X}+73IoMsu2?uuK3lT>;W<df@J_cgG_U&D8b<+U
z3qBv6Z5ieNpqShbUSE@10^#D8JvDB<Cxnnc7^ASjodT6b&UsxZ-kMZhrAlLO-#Mi5
zrhImmEN-CGFF$Vg@GnIasHba~Uf74v>#38#qG5tDl66A7Y{mYh=jK8Se!+f=N7%nv
zYSHr6a~Nxd`jqov9VgII{%EpC_jFCEc>>SND0;}*Ja8Kv;G)MK7?T~h((c&FEBcQq
zvUU1hW2^TX(dDCeU@~a1LF-(+#lz3997A@pipD53&Dr@III2tlw>=!iGabjXzbyUJ
z4Hi~M1KCT-5!NR#I%!2Q*A>mqI{dpmUa_mW)%SDs{Iw1LG}0y=wbj@0ba-`q=0!`5
zr(9q1p{#;Rv2CY!L#uTbs(UHVR5+hB@m*zEf4jNu3(Kj$WwW|v?YL*F_0x)GtQC~!
zzrnZRmBmwt+i@uXnk05>uR5&1Ddsx1*WwMrIbPD3yU*2By`71pk@gt{|H0D<#B7&8
z2dVmXp*;B)SWY)U1VSNs4ds!yBAj;P=xtatUx^7_gC5tHsF#vvdV;NmKwmNa1GNWZ
zi_Jn-B4GnJ%xcYWD5h$*z^haku#_Irh818x^KB)3-;ufjf)D0TE#6>|zFf@~pU;Rs
zNw+}c9S+6aPzxkEA6R%s*xhJ37wmgc)-{Zd1&mD5QT}4BQvczWr-Xim>(P^)52`@R
z9<jpXM|@nDonMBF{3f<~Ch;-n8pq}dJ3Jn7z+9MKkVKZ6GC|_U4LQ}uqT7Qzdw&FT
z5rS%8>+Z}44203T5}`AM_G^Snp<_KKc!OrA(5h7{MT^$ZeDsSr(R@^kI?O;}QF)OU
zQ9-`t^ys=6DzgLcWt0U{Q(<zOjFK;@HBO@&MI050VARn}8^41fX2E~H8v7oK7t#cH
zT3cr37+EIOoR3$Tf{>F<SaIxIq6Ub`pA9KKWBtPeF7PVo!TPrUGQ;L27vT$GZ|f!6
zJ3t-%EM4F&3lV=3B&-O?3LtyEID6hjqP^*ia)+pq9l7DVnt4FWB~meyMR+>Bs22=r
zKD%fLQ^5ZF24c-Z)J{xv?x$&4VhO^mswyb4QTIofCvzq+27*WlYm;h@;Bq%i;{hZA
zM97mHI6pP}XFo|^pRTuWQzQs3B-8kY@<y697Pif_+Ask(KR3DV%AUDhMyUIANX3Dk
zwg)}aPAa<Qw({y>ajLV!Fb?OYAO3jFv*W-_;AX<NdmAQ7#KC=m{U8w@o~;*9u@fe3
zI-q=kJGTIh6>d;G!CbpZt04iW`Ie^_+cQZGY_Zd@P<*J9EdRsc>c=edf$K|;voXRJ
zk*aC@@=MKwR120(%I_HX`3pJ+8GMeO>%30t?~uXT0O-Tu-S{JA;zHoSyXs?Z;fy58
zi>sFtI7hoxNAdOt#3#AWFDW)4EPr4kDYq^`s%JkuO7^efX+u#-qZ56aoRM!tC^P6O
zP(cFuBnQGjhX(^LJ(^rVe4-_Vk*3PkBCj!?SsULdmVr0cGJM^=?8b0^DuOFq>0*yA
zk1g|C7n%pMS0A8@Aintd$fvRbH?SNdRaFrfoAJ=NoX)G5Gr}3-$^IGF+eI&t{I-GT
zp=1fj)2|*ur1Td)+s&w%p#E6tDXX3YYOC{HGHLiCvv?!%%3DO$B$>A}aC;8D0Ef#b
z{7NNqC8j+%1n95zq8|hFY`afAB4E)w_&7?oqG0IPJZv)lr{MT}>9p?}Y`=n+^CZ6E
zKkjIXPub5!82(B-O2xQojW^P(#Q*;ETpEr^+Wa=qDJ9_k=Wm@fZB6?b(u?LUzX(}+
zE6Oyapd<Pnn%^T*29yI$_#2T8ky75p(qWs)ooqKI2gN`dZpK3Y<kOCF-bmb>G$HC&
z&;oa*ALoyIxVvB2cm_N&h&{3ZTuU|aBrJlGOLtZc3<wB41_%hv|2W21e=t+(=n#Nn
zm*Oar0&(6b5;<nAAtYiLGCv|A6tP{9nAYT<*AAoG1mp_)ZWYNA(fAdZl+LgUxhajH
zBMP2AH!EkqQueuCEuY=Gn~D5i1=u<sj%R7VeIK^r69n!S%t35NNg(Fcnjq#?iuTuC
zyyEflYj(Y9WXQU}=QW)&f-zt2L<9i?G8jgUJCxqv39bRXa)Z<AYSLpgy&?>KDx)<{
z27@)~GtQF@%6B@w3emrGe?Cv_{iC@a#YO8~OyGRIvp@%RRKC?fclXMP*6GzB<W-|f
z1HB&QMc+Ib?@<fAbwIxv{Jg*T<>FO<w|z4X_0d^ajD|Sz3Z?D`jadD{q(TEoFqiL>
z5U4QK?~>AR>?KF@I;|(rx(rKxdT9-k-anYS+#S#e1SzKPslK!Z&r8iomPsWG#>`Ld
zJ<#+8GFHE!^wsXt(s=CGfVz5K+FHYP5T0E*?0A-z*lNBf)${Y`>Gwc@?j5{Q|6;Bl
zkHG1%r$r&O!N^><8AEL+=y(P$7E6hd=>BZ4ZZ9ukJ2*~HR4KGvUR~MUOe$d>E5UK3
z*~O2LK4AnED}4t1Fs$JgvPa*O+WeCji_cn1@Tv7XQ6l@($F1K%{E$!naeX)`bfCG>
z8iD<%_M6aeD?a-(Qqu61&fzQqC(E8ksa%CulMnPvR35d{<`VsmaH<C2uc@|>yzF+B
zF6a@1<cQrSK@^T2Jz<j^!(U`lVrtN6^K1{@&|Y%V?lh(s<qUgEfNklI&6tUgpAb*a
z_+C-rQUGf}bnsy~!Ygj~JcS);J7o!ttkA^>$CT0xGVjofcct4SyxA40uQ`b#9kI)&
z?B67-12X-$v#Im4CVUGZHXvPWwuspJ610ITG*A4xMoRVXJl5xbk;OL(;}=+$9?H`b
z>u2~yd~gFZ*V}-Q0K6E@p}mtsri&%Zep?ZrPJmv`Qo1>94Lo||Yl)nqwHXEbe)!g(
zo`w|LU@H14VvmBjjkl~=(?b{w^G$~q_G(HL`>|aQR%}A64mv0xGHa`S8!*Wb*eB}`
zZh)&rkjLK!Rqar)UH)fM<&h&@v*YyOr!Xk2OOMV%$S2mCRdJxKO1RL7xP_Assw)bb
z9$sQ30bapFfYTS`i1PihJZYA#0AWNmp>x(;C!?}kZG7Aq?zp!B+gGyJ^FrXQ0E<>2
zCjqZ(wDs-$#pVYP3NGA=en<@_uz!FjFvn1&w1_Igvqs_sL>ExMbcGx4X5f%`Wrri@
z{&vDs)V!rd=pS<gKlbfhp}ufon^L`I$St3=B`fTo6?X~-5*!da$WSC=wN0h_b|&|p
zL8tjMJDRM>?G(ri<ha&~1a}iabvy_b$vscbC%Y*}zodb|0`?CGVC9w*d$a$bIvm)g
zxfr>cfwPSg(w<8P_6=Qj`qBC7_XNE}1_5>+GBjpURPmvTNE7)~r)Y>ZZecMS7Ro2`
z0}nC_GYo3O7j|Wux?6-LFZs%1IV0H`f`l9or-8y0=5VGzjPqO2cd$RRHJIY06Cnh-
ztg@Pn1OeY=W`1Mv3`Ti6!@QIT{qcC*&vptnX4Pt1O|dWv8u2s|(CkV`)vBjAC_U5`
zCw1f&c4o;LbBSp0=*q<rKWROphY%8*dT*+-xv<)}6rSe7#pa+C2sRvc#pf}_5pS#>
z3Y^horBAnR)u=3t?!}e}14%K>^562K!)Vy6r~v({5{t#iRh8WIL|U9H6H97qX09xp
zjb0IJ^9Lqxop<-P*VA0By@In*5dq8Pr3bTPu|ArID*4tWM7w+mjit0PgmwLV4&2PW
z3MnIzbdR`3tPqtUICEuAH^MR$K_u8~-U2=N1)R=l>zhygus44>6V^6nJFbW-`^)f}
zI&h$FK<SfuVxz$9jz$%JfEvVgm?oA_vk80Mb*vtU&mY6DKMPelC~6k4d~PHleiT=i
z9i`)yHZ|VLG@A>)Mo*x?2`0npTD~jRd}5G~-h8=w<geTkn^ei*h^P_#kt4Dk-Ig(P
zw7emsMnh4haOAFEvCI*}Q6rgiCIEj<0mLdYm1>L#Y-G+a^C?d>OzsVl7BFAaM==(H
zR;ARWa^C3J)`p~_&FRsxt|@e+M&!84`eq)@aO9yBj8iifJv0xVW4F&N-(#E=k`AwJ
z3EFXWcpsRlB%l<ouYWjr+SUt7L1F}F&JAqs2YnGI@EauMTs3Lx>_0Vdu`0G(11F7(
zsl~*@XP{jS@?M#<a*IJCG;!^-k0mpcYSL3TA`mO-osDqvZe)rvFyj`CZ>ec~%Pr~h
z2`M*lIQaolzWN&;hkR2*<=!ORL(>YUMxOzj(60rQfr#wTrkLO!t{h<Ixt`{;>~qg%
zv$R}0IqVIg1v|YRu9w7RN&Uh7z$ijV=3U_M(sa`ZF=SIg$uY|=NdC-@%HtkUSEqJv
zg|c}mKTCM=Z8Y<XhcneSe|&PEGL?KEjv?$97<=EoEY%e)Y^wY7E2xeqEUPM20hy+h
zOBop<mL$3-WOlS|^wIV?j-e=QOSa4yQ;&3&vJ^e`I9~INys-f+JG)*Muyc444Xj{c
zOq>msFQu7k{VrXtL^!Cts-eb@*v0B3M#3A7JE*)MeW1cfFqz~^S6OXFOIP&iL;Vpy
z4dWKsw_1Wn%Y;eW1YOfeP_r1s4*p1C(iDG_hrr~-I%kA>ErxnMWRYu{IcG{sAW;*t
z9T|i4bI*g)FXPpKM@~!@a7LDVVGqF}C@mePD$ai|I>73B+9!Ks7W$pw;$W1B%-rb;
zJ*-q&ljb=&41dJ^*A0)7>Wa@khGZ;q1fL(2qW=|38j43mTl_;`PEEw07VKY%71l6p
z@F|jp88XEnm1p~<5c*cVXvKlj0{THF=n3sU7g>Ki&(ErR;!KSmfH=?49R5(|c_*xw
z4$jhCJ1gWT6-g5EV)Ahg?Nw=}`iCyQ6@0DqUb%AZEM^C#?B-@Hmw?LhJ^^VU>&phJ
zlB!n5&>I>@sndh~v$2I2Ue23F?0!0}+9H~jg7E`?CS_ERu75^jSwm%!FTAegT`6s7
z^$|%sj2?8wtPQR>@D3sA0-<U}>M-g-vL@47YCnxdvd|1mPymvk!j5W1jHnVB<xFe8
zIcRoD<goMv8Qu{5p3F6>&F-0R5e-vs`@u8a5GKdv`LF7uCfKncI4+??Z4iG@AxuX7
z6+@nP^TZ5HX#<H$*7$uZ^GJ)1l2_$4(ITNpbx11}-7Un19g4X?I6t&yby7^z8u_JG
z`AC$r&O%j3{*}u^#Roz?ZomEGRIFtrtzs00Z+Nf!0r=n1VG8UzPD-gMYD*Z0J`6&L
zrB#|AC<q8P<bMa={~UKhf1y&~g@^z<xK%_nv}iSIi1qs-80FZc5i6BP&}HzO@{J-o
zI{J0{72ps7Gh2!++v_Y$aLUWV<6RoTK080Fh4;pFyM?s}`1*Q*Fv3rOA4$qE<`y;<
z4~JsWUr|mx$PNNub+==}Qcuv-yK4?0!BQC|{mR!>*z(!y+-KJ3+Ku0M90BTY{SC^{
z&y2#RZPjfX_PE<<>XwGp;g4&wcXsQ0T&XTi(^f+}4qSFH1%^GYi+!rJo~t#ChTeAX
zmR0w(iODzQOL+b&{1OqTh*psAb;wT*drr^LKdN?c?HJ*gJl+%kEH&48&S{s28P=%p
z7*?(xFW_RYxJxxILS!kdLIJYu@p#mnQ(?moGD1)AxQd66X6b*KN?o&e`u9#N4wu8%
z^Gw#G!@|>c740RXziOR=tdbkqf(v~wS_N^CS^1hN-N4{Dww1lvSWcBTX*&9}Cz|s@
z*{O@jZ4RVHq19(HC9xSBZI0M)E;daza+Q*zayrX~N5H4xJ33BD4gn5Ka^Hj{995z4
zzm#Eo?ntC$q1a?)dD$qaC_M{NW!5R!vVZ(XQqS67xR3KP?rA1^+s3M$60WRTVHeTH
z6BJO$_jVx0<q=4oQ4^4&LjvZ?IFywiS^=+kIsr#`i;VVi*)oB%BBriVjqoaV2E?pE
z@XMJ$e#;GIWlvg=J_03_gz4T2CA}FlK-d#*_Y;iHV=RMMPp?H!FNNqW-KS|}te|O%
zX=X|Fk9k;c=4O1}iwo|p(I{gB7b!nXILr~V^6wx73`=LnKrWu#mjK^!-u;_MJqiVy
zI}_iQp3zGd=f-(%^bDpdj{*U0@S?aksQ)+FMid4y$fG+bLIVL2r3V2a`af?IA!S_z
z4w$_CLqZInLy9sX^Cv^7Ng5gjJ_scpQs*DJx3q-C!z^yfg19bvM*HgOQnbEZU0QoF
zdK$RAc-@Ll$Et(J%3uFw2SZF<oj1YfSviVH(Se<D#?ANbUnlv#>EGPXy}XK_&x597
zt(o6ArN8vZX0?~(lFGHRtHP{gO0y^$iU6Xt2e&v&ugLxfsl;GD)nf~3R^ACqSFLQ<
zV7`cXgry((wDMJB55a6<Cvg5*V@E&gp_hK?RXM9Cmb<zqULQcPsE{hc9a$%h#e|?8
zp9vcb$%gzMm_BsxVxuk9=8liQs|H!K>D4J;13$z6pupC{-F+wpToW%k1qKjUS^$Mo
zN3@}T!ZdpiV7<a`6mgu8))0n;&aR0X#=P(j$>rkNvqP3KbpEn|9aB;@V;gMS1iSb@
zwyD7!5mfj)q+4jE1dq3H`sEKgrVqk|y8{_vmn8bMOi873!rmnu5S=1=-DFx+Oj)Hi
zx?~ToiJqOrvSou?RVALltvMADodC7BOg7pOyc4m&6yd(qIuV5?dYUpYzpTe!BuWKi
zpTg(JHBYzO&X1e{5o|ZVU-X5e?<}mh=|eMY{ldm>V3NsOGwyxO2h)l#)rH@BI*TN;
z`yW<tZkAtgD1K4rH^*7E7L8y2DKR)GUqND5p=KRL(^>26bMSp=k6C4Ja{xB}s`dNp
zE+41IwEwo>7*PA|7v-F#jLN>h#a`Er9_86!fwPl{6yWR|fh?c%qc44uP~Ocm2V*(*
zICMpS*&aJjxutxKC0Tm8+FBz;3;R^=ajXQUB*nTN*Lb;mruQ<L?J}Py63aFL_JrF3
zuKjS?Xwj{ufizn|oPl*svKX+?myF1gv1i#2Pp%t_6Frc|49o-M$q1U(SoF1?czk~K
zQB+{`_(7#~5HDJ@$p0t9X4Bnjw_4k=Gtm&qcw$d~4o6S;S}fQ;i|ux0)${W9g+C7d
zoMy9g)h9D&t#es1s#qQ_(oec>HUE<&=I7pZ@F-O*VMkJbI#FOrBM8`QEL5Uy=q5e2
z_BwVH%c0^uIWO0*_qD;0jlPoA@sI7BPwOr-mrp7y`|EF)j;$GYdOtEPFRAKyUuUZS
z(N4)*6R*ux8s@pMdC*TP?Hx`Zh{{Ser;clg&}CXriXZCr2A!wIoh;j=_eq3_%n7V}
za?{KhXg2cXPpKHc90t6=`>s@QF-DNcTJRvLTS)E2FTb+og(wTV7?$kI?QZYgVBn)&
zdpJf@tZ{j>B;<<gei3eS+J#ghUE;%Jmd7Pk8%UGHJG8~c^XJ5t4rPt~H~LSUt)e@q
z%yI(@ouv9NKR5?@vcOt632S~0Yt3FWCmv2gPT|mGKc-q%RRCXu?Cj;w26j{76<LJf
zaS8h@vUzynu#YGS<gh$GHq+;%-9o4&y&kK|Wm^q<pRv}g+zU;U%KoOgxhXnt*?y!Q
z{V^AU0u#?=E3&#0wH*19Mnn~;N$z?E8?Rl9>MVHiPl_U&KlqBT)$ic+M0uUQWK|N1
zCMl~@o|}!!7yyT%7p#G4?T^Azxt=D(KP{tyx^lD_(q&|zNFgO%!i%7T`>mUuU^FeR
zHP&uClWgXm6iXgI8*DEA!O&X#X(zdrNctF{T#pyax16EZ5Lt5Z=RtAja!x+0Z31U8
zjfaky?W)wzd+66$L>o`n;DISQNs09g{GAv%8q2k>2n8q)O^M}=5r#^WR^=se#WSCt
zQ`7E1w4qdChz4r@v6hgR?nsaE7pg2<I`;}n^@4MI6vCedZ=C;ol}^bQ*dx&&8nb-&
z3)#xA-8T2gcffMYzDDo_+}wz+P8h>B6<gZ&R)|4Ts?jXVZVoqNhN_k%xHg&3BJR#@
zW~R&|0R@=eu%3D?zM3tcN^a`0bU8Qi)Uc&dq-Yp9jKcw-U#_Ld-XE55mxGO64=eaR
z!|?ouRtds{6xA*X*ir?L8T2|6t2X}m%@CA-7hu;HIu^0Tlxp+QjjALKeWuRI>~+i5
zcTTbBQ2ghUbC-PV(@xvIR(a>Kh?{%YAsMV#4gt1nxBF?$FZ2~nFLKMS!aK=(`WllA
zHS<_7ugqKw!#0aUtQwd#A$8|kPN3Af?Tkn)dHF?_?r#X68Wj;|$aw)Wj2Dkw{6)*^
zZfy!TWwh=%g~ECDCy1s8tTgWCi}F1BvTJ9p3H6IFq&zn#3FjZoecA_L_bxGWgeQup
zAAs~1IPCnI@H>g|6Lp^Bk)mjrA3_qD4(D(65}l=2RzF-8@h>|Aq!2K-qxt(Q9w7c^
z;gtx`I+=gKOl;h=#f<B(e8}^YI_Y_F$m<_@mU7iP@qM+(yD7oUVh}K##GPwk9D0yd
zeHhMzVMULpykwfv+lU+)mgprk!<ah^1r7%w_Qqy@;J2ghF_eBcu1B=+{UtO=Ex9lZ
zTr$(@oW060(mHv6jhqAHt9(%I%Q?HEL?>zSgw-V*YT~2_nnSz|!9hIxFb{~dKB!{H
zSi??dnmr@%(1w^Be=*Jz5bZeofEKKN&@@uHUMFr-DHS!pb1I&;x9*${bmg6=2I4Zt
zHb5LSvojY7ubCNGhp)=95jQ00sMAC{IZdAFsN!lAVQDeiec^HAu=8);2AKqNTT!&E
zo+FAR`!A1#T6w@0A+o%&*yzkvxsrqbrfVTG+@z8l4+mRi@j<&)U9n6L>uZoezW>qS
zA<uWB>4YfO;_9dQSyEYpkWnsk0IY}Nr2m(q<?iJ&^0JJY*WJVZ3B6DY<FXJr8Go@r
z6CZy0n;pNAl$k|qKz7;}tzyFUzN($R$VjbqGJYnWSFqb~_EE~`kN>l@KuQjLgY-@g
z4=$uai6^)A5+~^TvLdvhgfd+y?@+tRE^AJabamheJFnpA#O*5_B%s=t8<;?I;qJ}j
z&g-9?hbwWEez-!GIhqpB>nFvyi{>Yv>dPU=)qXnr;3v-cd`l}BV?6!v{|cHDOx@IG
z;TSiQQ(8=vlH^rCEaZ@Yw}?4#a_Qvx=}BJuxACxm(E7tP4<LzOM5%&sPL0AD{=s;s
z$R415QgAo#{smDow(OHv45*wK-Zi*?A$()F*V<y2E!TYT<^hcHA7K5-ZMT_!rB5`;
z|9vWN^0~I6awJfJRvcCAeNZ=j7mVNot7n9dih18do*-eAieGXMiY-4y>hki^jU@8A
zUS|4tTLd)gr@T|F$1eQXPY%fXb7u}(>&9gsd3It^B{W#6F2_g40cgo1^)@-xO&R5X
z>qKon+Nvp!4v?-rGQu#M_J2v+3e+?N-WbgPQWf`ZL{Xd9KO^s{uIHT<vv%?Nh+;B}
zmyBo-Ds%q}cQg+!oZgz$`xg$^mZZUJf3!&})t~fQTjTmEq}n-f2FtW>J6~@d=mc7i
z+##ya1p+ZHEL<ks3xMG;xOBNv36AC^Vp3h8`CZjBX4sayH7_@oJq-ndaT`jqB@IRP
zv!WtzH@kF&Wb?7eR`V`9dzcL0t|&Wer_hFfyyTy^`=Yg*D>mi%3C>g5V#yZt*jMv(
zc{m*Y;7v*sjVZ-3mBuaT{$g+^sbs8Rp7BU%Ypi+c%JxtC4O}|9pkF-p-}F{Z7-+45
zDaJQx&CNR)8x~0Yf&M|-1rw%KW3ScjWmKH%J1fBxUp(;F%E+w!U470e_3%+U_q7~P
zJm9VSWmZ->K`NfswW(|~fGdMQ!K2z%k-XS?Bh`zrjZDyBMu74Fb4q^A=j6+Vg@{Wc
zPRd5Vy*-RS4p1OE-&8f^Fo}^yDj$rb+^>``iDy%t)^pHSV=En5B5~*|32#VkH6S%9
zxgIbsG+|{-$v7mhOww#v-ejaS>u(9KV9_*X!AY#N*LXIxor9h<byy@5cbGEZK3=io
zT2V8>Dv%aie@+??X6@Et=xz>6ev9U>6Pn$g4^!}w2Z%Kpqpp+M%mk~?GE-jL&0xLC
zy(`*|&gm#mLeoRU8IU?Ujsv=;a<uB2wOxxbt+x_CGPXzy#@rDRkgcBVuX$j~bAGRw
zPYots=o?hh?dXy^E>b*URmsCl+r?%xcS1BVF*rP}XRR%MO_C!a9J^fOe>U;Y&3aj3
zX`3?i12*^W_|D@VEYR;h&b^s#Kd;JMNbZ#*x8*ZXm(jgw3!jyeHo14Zq!@_Q`V;Dv
zKik~!-&%xx`F|l^z2A92aCt4x*I|_oMH9oeqsQgQDgI0j2p!W@BOtCTK8Jp#txi}7
z9kz);EX-2~XmxF5kyAa@n_$YYP^Hd4UPQ>O0-U^-pw1*n{*kdX`Jhz6{!W=V8a$0S
z9mYboj#o)!d$gs6vf8I$OVOdZu7L5%)Vo0NhN`SwrQFhP3y4iXe2uV@(G{N{yjNG(
zKvcN{k@pXkxyB~9<aVnCIiZ=*k!Q8~L1tKaxVd|op5jWsB}Nz|CZHq!epa%JQd;)N
z4E$LOX+w8o^~cMe4a_enR1CKHIa{i@H>ucR(uPSZ7{~sC=lQtz&V(^A^HppuN!@B4
zS>B=kb14>M-sR>{`teApuHlca6YXs6&sRvRV;9G!XI08CHS~M$=%T~g5Xt~$exVk`
zWP^*0h{W%`>K{BktGr@+?ZP}2t0&smjKEVw@3=!rSjw5$gzlx`{dEajg$A58m|Okx
zG8@BTPODSk@iqLbS*6>FdVqk}KKHuAHb0UJNnPm!(XO{zg--&@#!niF4T!dGVdNif
z3_&r^3+rfQuV^8}2U?bkI5Ng*;&G>(O4&M<86GNxZK{IgKNbRfpg>+32I>(h`T&uv
zUN{PRP&onFj$tn1+Yh|0AF330en{b~R+#i9^QIbl9fBv>pN|k&IL2W~j7xbkPyTL^
z*TFONZUS2f3<j5d>3w3)fdzr?)Yg;(s|||=aWZV(nkDaACGSxNCF>XLJSZ=W@?$*`
z#sUftY&KqTV+l@2AP5$P-k^N`Bme-xcWPS|5O~arUq~%(z8z87JFB|llS&h>a>Som
zC34(_uDViE!H2jI3<@d+F)LYhY)hoW6)i=9u~lM*WH?hI(yA$X<G=8N1HS1Fvj49Y
zr{!e0ILA0423drY%0DfXJI9?mv)P9Sb^{}Ddi1|;33N^#;xwZ1s;uEy?|&@^T31A4
z1v}0pzH#c>#ip}yYld3RAv#1+sBt<)V_9c4(SN9Fn#$}_F}A-}P>N+8io}I3mh!}>
z*~*N}ZF4Zergb;`R_g49>ZtTCaEsCHiFb(V{9c@X0`YV2O<Utuc)<>^@c6~LXg2AE
zhA=a~!ALnP6aO9XOC^X15(1T)3!1lNXBEVj5s*G|Wm4YBPV`EOhU&)tTI9-KoLI-U
zFI@adu6{w$dvT(zu*#aW*4F=i=!7`P!?hZy(9iL;Z^De3?AW`-gYTPALhrZ*K2|3_
zfz;6xQN9?|;#_U=4t^uS2VkQ8$|?Ub5CgKOj#Ni5j|(zX>x#K(h7LgDP-QHwok~-I
zOu9rn%y97qrtKdG=ep)4MKF=TY9^n6CugQ3#G2yx;{))hvlxZGE~rzZ$qEHy-<GG^
zCw~Hee9AnIJK5!W2KGioRF>8?pU#G;bwufgSN6?*BeA!7N3RZEh{xS>>-G1!C(e1^
zzd#;39~PE_wFX3Tv;zo>5cc=md{Q}(Rb?37{;YPtAUGZo7j*yHfGH|TOVR#4ACaM2
z;1R0hO(Gl}+0gm9Bo}e@lW)J2OU4nukOTV<IRWfJ?LxQ}Cs$wH=@pn;(E!pGh(4PT
zCSf?oD0HK(b<eq@2#T{&XH0pqKhi2e@F&60q&GZT0!VOz3O!(?fv9x_9?Jl!@ic&&
zvAovwm9zWE2KtEoa+tIGL>KshHy7u)tLH^9@QI-jAnDBp(|J8&{fKu=_97$v&F67Z
zq+QsJ=gUx3_h_%=+q47msQ*Ub=gMzoSa@S<C&>2>`Y9Cj*@Op4plTc!jDhu51nSGI
z^sfZ(4=yzlR}kP2rcHRzAY9@T7f`z>fdCU0zibx^gVg&fMkcl)-0bRyWe12bT0}<@
z^h(RgGqS|1y#M;mER;8!CVmX!j=rfNa6>#_^j{^C+SxGhbSJ_a0O|ae!ZxiQCN2qA
zKs_Z#Zy|9BOw6x{0*APNm$6tYVG2F$K~JNZ!6>}gJ_NLRYhcIsxY1z~)mt#Yl0pvC
zO8#Nod;iow5{B*rUn(0WnN_~~M4|guwfkT(xv;z)olmj=f=aH<b>#Y|#f_*d1H!o(
z!E<ZksS#Iaz>XNxKxth9w1oRr0+1laQceWfgi8z`YS#uzg#s9-QlTT7y2O^^M1PZx
z3YS7iegfp6Cs0-ixlG93(JW4wuE7)mfihw}G~Uue{Xb+#F!BkDWs#*cHX^%(We}3%
zT%^;m&Juw{hLp^6eyM}J({luCL_$7iRFA6^8B!v|B9P{$42F>|M`4Z_yA{kK()WcM
zu#xAZWG%QtiANfX?@+QQOtbU;Avr*_>Yu0C2>=u}zhH9VLp6M>fS&yp*-7}yo8ZWB
z{h>ce@HgV?^HgwRThCYnHt{Py0MS=Ja{nIj5%z;0S@?nGQ`z`*EVs&WWNwbzlk`(t
zxDSc)$dD+4G6N(p?K>iEKXIk>GlGKTH{08Wvreh<CAf?TJ>nHhh%tgpp&8db4*FLN
zETA@<$V=I7S^_KxvYv$Em4S{gO>(J#(Wf;Y%(NeECoG3n+o;d~Bjme-4dldKukd`S
zRVAnKxOGjWc;L#OL{*BDEA8T=zL8^`J=2N)d&E#?OMUqk&9j_`GX*A<zR<6(@2+L7
z@1$o_@SdQ`j0ne14Py8~N$N(bF^OEP4yf&4{)E?@3uqgKCl~oc9JGOl%*Hj(+(E%G
z61_ReO+5gw$@3rF7*zTt16$e`KZAyGV)!rJwJ!yKjS4(jVys!9BpagJUf1M>9?V-G
zdA5QQ#(_Eb^+wDkDiZ6RXL`fck|rVy%)BVv;dvY#`msZ}<bv)Vrqcf?ms>{x5fmd!
zInmWSxvRgXbJ{unxAi*7=Lt&7_e0B#8M5a=Ad0yX#0rvMacnKnXgh>4<kzFZZ+q2=
zSI@wc!e-hJ!WKWxZcvCb6r;@e6kZ)gU~$!}pY}zm1`BBiO&Cp>iiRq<&wit93n!&p
zeq~-o37qf)L{KJo3!{l9l9AQb;&>)^-QO4RhG>j`rBlJ09~cbfNMR_~pJD1$UzcGp
zOEGTzz01j$=-kLC+O$r8B|VzBotz}sj(rUGOa7PDYwX~9Tum^sW^xjjoncxSz;kqz
z$Pz$Ze|sBCTjk7oM&`b5g2mFtuTx>xl{dj<a{IGbs&Xr_Lnl~=L#C-3f_=262-*SN
zks}N?-dkm-=nWk~RaP*30U<!1%uw|>*U$L%y-xeQL~|i>KzdUHeep-Yd@}p&L*ig<
zgg__3l9T=nbM3bw0Sq&Z2*FA)P~sx0h634BXz0AxV69cED7QGTbK3?P?MENkiy-mV
zZ1xV5ry3zIpy>xmThBL0Q!g+Wz@#?6fY<EaoNR>vzmEczs(rcujrfCN=^!iWQ6$EM
zaCnRThqt~gI-&6v@KZ78unqgv9j6-%TOxpbV`tK{KaoBbhc}$h+rK)5h<YjQ73BXl
zpM^mR_u6^E|NA0I`x69&;(xqnK0Q2uo^<*EVpO`Z33U{viEa`@8YY#iRIEJ;osRdP
zL>|bT6wY*t6st-4$e99+Egb#3ip+ERbve08G@Ref&hP)qB&?>B94<kOj@Q1fJNzg4
zo+oqf&lQ9L@Vi_Bum@NgI>?eq5i3k;dOuU#!y-@+&5>~!FZik=z4&4|YHy=~!F254
zQAOTZr26}Nc7jzgJ;V~+9ry#?7Z0o*;|Q)k+@a^87lC}}1C)S))f5tk+lMNqw>vh(
z`A9E~5m#b9!ZDBltf7QIuMh+VheCoD7nCFhuzThlhA?|8NCt3w?oWW|NDin&&eDU6
zwH`aY=<IrWwJm6AY&rFqmNW+-KZ@4)eR-L6R~2;>))lpWG?{fda=-auXYp1WIPu&3
zwK|t(Qiqvc@<;1_W#ALDJ}bR;3&v4$9rP)eAg`-~iCte`O^MY+SaP!w%~+{{1tMo`
zbp?T%ENs|mHP)Lsxno=nWL&qizR+!Ib=9i%4=B@(Umf$|7!WVxkD%hfRjvxV`Co<;
zG*g4QG_>;RE{3V_DOblu$GYm&!+}%>G*yO{-|V9GYG|bH2JIU2iO}ZvY>}Fl%1!OE
zZFsirH^$G>BDIy`8;R?lZl|uu@qWj2T5}((RG``6*05AWsVVa2Iu>!F5U>~7_Tlv{
zt=Dpgm~0QVa5mxta+fUt)I0gToeEm9eJX{yYZ~3sLR&nCuyuFWuiDIVJ+-lwViO(E
zH+@Rg$&GLueMR$*K8kOl>+aF84Hss5p+dZ8hbW$=bWNIk0paB!qEK$xIm5{*^ad&(
zgtA&gb&6FwaaR2G&+L+Pp>t^LrG*-B&Hv;-s(h0QTuYWdnUObu8LRSZoAVd7SJ;%$
zh%V?58mD~3G2X<$H7I)@x?lmbeeSY7X~QiE`dfQ5&K^FB#9e!6!@d9vrSt!);@ZQZ
zO#84N5yH$kjm9X4iY#f+U`FKhg=x*FiDoUeu1O5LcC2w&$~5hKB9ZnH+8BpbTGh5T
zi_nfmyQY$v<uZ;l&g@c%q;+Vgch$G^zJI*;eLwf}d#~$x|9P(K{XKVada<9+sIfYB
zKAm@-U=yZ;64wg$H}Z;yL)GoR=u$~I;@cnfU5TMi>Qh%ildbR7T;7TKPxS<Ob4E3(
znTaa+H!rSqa0vbx%SAld=m88TC+A_c(usssUb>s#vhKR|u<i0Ko**prU~S9yhY2+1
zPX%J@>up`qi1PufMa(tNCjRbllakshQgn1)a8OO-j8W&aBc_#q1hKDF5-X$h`!CeT
z+c#Ial~fDsGAenv7~f@!icm(~)a3OKi((=^zcOb^<lLk;-tgW3Xq;u|w+kECe)CSK
zcriMg^rmc3Yr@_+rl3D>qH$#DVciGXslUwTd$gt{7)<evvuvMrg(Ti)md>&#a`&Lp
ze%AnL0#U?lAl8vUkv$n>bxH*`qOujO0HZkPWZnE0;}0DSEu1O!hg-d9#{&#B1Dm)L
zvN%r^hdEt1vR<4zwshg*0_BNrDWjo65be1&_82SW8#iKWs7>TCjUT;-K~*NxpG2P%
zovXUo@S|fMGudVSRQrP}J3-Wxq;4xIxJJC|Y#TQBr>pwfy*%=`EUNE*dr-Y?9y9xK
zmh1zS@z{^|UL}v**LNYY!?1<k__7o+p+4(1NBmVoECA0-KiaC}AV_?C+7J`NK6$84
zBBqrmc2Of6i%(I;M!$`SXjC=j*Jb1-z1V$vmVAv$?q7A-UNUbIjPc&$&dCZYdrovY
zYk!tOxHv@D?D9y!F}6RcP($xyne%TppYSv>qIRPTvr!gNXzE{%=-`oKclPrfMKwn`
zUwPeIvLcxkIV>(SZ<gIk>-SeBo-yw~{p!<&_}eELG?wxp<p7ueiB^ha`u<BZpHY)>
zee-V59%@<kWnQ!o$=ScYaN1eg<h0xJ+n{>BtB+Z&Xs=O(@P$}v_qy1m=+`!~r^aT>
zY+l?+6(L-=<Qwd6r+5D1gjtj||7^9yk+4?S=Ggr8A1DHM$HUa2z2LxvD6=8#&qY;Z
zt8)xOz>P%m4ScfAYR8;f<Dr$LNuTmbgXDXglYV1=E&7Wn5{y|K*%IZ{6JLH|Dmg(}
znR2;>9dyVw)@(;v{|nO#lAPI1xDHXMYt~-BGiP&9y2OQsYdh7-Q1(vL<<EACIT8XT
z1qBbB|I*^xWzq`9+Gz$W)b?o0;B_{07?)m#_X&4NiqZ!@dMI95k-D2y@#kI!654RD
zYjUTZNp<Jd!Zn^%3j)3$jIWM4-Qun*WT<1+ge_~RzCUVOk8MJ|QtuNIQhY1uMB$;h
zMYbE)LIT&;DS?{%MXv&WEx~h?bBn#UB?S0m9+k!hKZsX-kfe7B^B<*@su?}#wF4VB
z?;H|rx{AeM@(Z*>$u6W0nxVn-qh=nwuRk}{d!uACozccRGx6~xZQ;=#JCE?OuA@;4
zadp$sm}jfgW4?La(pb!3f0B=HUI{5A4b$2rsB|ZGb?3@CTA{|zBf07pYpQ$NM<dsE
z+)HCvvfx}7?%s(mGoXS5m%y~{D7-?vfIM*E-Br$2)`nbbeI(JuN@9us|G8x)CDV5<
z`Lmq6gxN5v!A!|MaD3-`+9x>({C6Srv6%_{rVkCndT=1nS}qyEf}Wjtg<e&Ks@rVk
zCTmzRh=zK-IH2i_l=1F$2220Iw|x(Vy@q&&jtGSk7d?<UZ;dm(=6HqQ(+WnK_lD6C
z*aagnyAQvy-@DtV52PW8=n|p@r}`}M3VRKOLe0lFjJnWp7!6O#BVRO5AyO^F7?H{&
z(VFk3lyh;>$e{ng7Wgz$7itYy0sWW_$qld);iUm85GBH)fk3b=2|5mvflm?~inoVo
zDH_%e;y`DzoNj|NgZ`U%a9(N*=~8!q<HF%wJbappLVVp)97sNgNZK+YXiAqubI6nt
zz^x1f3S?e@nzaE{ASzP}l7_5+M-C#bWf{R<85&j(;XpwyA}tJ2fp5MXx<Tp~8p2^5
zVDpg?+d?DwY}g9Kl_K<Dg(`F?Hb7jFBRG&${$9Q_LIUX(@2T%~4C1mM#ex5Qw;}5w
z-+yc6zt@a=dt*=&%0@|mbr+$oV`R`;g+R{T?MS63V>qy0Etkxo#`r!!{|(NyT0;5=
z8nVZ6AiM+SjMG8J@6c4_f-KXd_}{My?Se1GWP|@wROFpD^5_lu?I%CBzpwi(`x~xh
B8dv}T

delta 17845
zcmV)CK*GO}(F4QI1F(Jx4W$DjNjn4p0N4ir06~)x5+0MO2`GQvQyWzj|J`gh3(E#l
zNGO!HfVMRRN~%`0q^)g%XlN*vP!O#;m*h5VyX@j-1N|HN;8S1vqEAj=eCdn`)tUB9
zXZjcT^`bL6qvL}g<Hw9Mj^|#&N2h?(F`1lu_ndpq?{_}-=D|N7-vjUr-ZBx#3-xHh
z2`L7p$e1Kf*5QAYiPLzo0STOunzJU(VW<Ja7%`AF@RErrUXGlZf%=%pVN{Cq2F46r
zFfh&#alCR__zWF+&o8ITJ})^Uz2x(S1>vXj%9vrOD+x!Gc_0{$Zg+6lTXG$bmoEBV
z*%y^c-mV0~Rjzv%e6eVI)yl>h;TMG)Ft8lqpR`>&IL&`>KDi5l$AavcVh9g;CF0tY
zw_S0eIzKD?Nj~e4raA8wxiiImTRzv6;b6|LFmw)!E4=CiJ4I%&axSey4zE-MIh@*!
z*P;K2Mx{xVYPLeagKA}Hj=N=1VrWU`ukuBnc14iBG?B}Uj>?=2UMk4|42=()8KOnc
zrJzAxxaEIfjw(CKV6F$35u=1qyf(%cY8fXaS9iS?yetY{mQ#Xyat*7sSoM9fJlZqq
zyasQ3>D>6p^`ck^Y|kYYZB*G})uAbQ#7)Jeb~glGz@2rPu}zBWDzo5K$tP<|meKV%
z{Swf^eq6NBioF)v&~9NLIxHMTKe6gJ@QQ^A6fA!n#u1C&n`aG7TDXKM1Jly-DwTB`
z+6?=Y)}hj;C#r5>&x;MCM4U13nuXVK*}@yRY~W3X%>U>*CB2C^K6_OZsXD!nG2RSX
zQg*0)$G3%Es<rMi9IFkILZk8W3*zmnaEl_-v&C>$otA@<d5B&i@NKtDgSW_?su;gQ
zolk$}wmPmIAgB0t!H8pWXh)p3t<)yxd~Zn^WNM9@hA}ROLYwE;<qYL=a)z{do7&c~
zOU=+lw_zN_7aE%7#L)HEEQf~HkenM@!(`u&10)a9(=6#VTH~n|uvG6dLaDxGXen(O
z;XBH!lVmG&lAn|B7pTXVXv9~9^flpue#(Cz-8iJK+qlAIYA2CHw5Qpu;k}OteSyKQ
z`kU`!PwGQxpTSIZwT4%qle~EgQBsDQBOk$-mgY|plS?ld@1iaO$x2hK4#FV$4PEx%
z64rN=-S>p_1N!hIPT(iSE=8OPZG+t)o<dTw8$=ITLu%Kn&h^n=hZc{ukec4F8s&cn
zHOkqTnd<CbL4C}0<_7eHehWv4SvaA;hXayxLSKbRv}1?wq9KIoR6?gJ-bT}){t2Qp
z?fMED@841214PiOrSSynNd8Pk{e>FyD~{nevj0gZen$p>U<7}uRE`t5Mk1f4M0K*5
zbn<D{nCwP+S(Ox1JDHTGlB$C?aL!zS)j)aC4N=Q$g0hm{@mNXgzR`KZi=*k<JFD2U
zislbCS|3r-{@$V0$7^VDJg3k?#9Vqlk0;eXFI_&!Q-<chP)h>@3IG5I2mk;8K>*RZ
zPV6iL006)S001<T5fUDgJPsUxQxZ`W|6N2E*F}j?Q}ZJ=15{A^(lk>s%0eYj)9hu1
z9o)iQT9(v*sAuZ|ot){RrZ0Qw4{E0A+!Yx_M~#Pj&OPUM&i$RU=Uxu}e*6Sr2ror=
z&?lmvFCO$)BY+^+21E>ENWe`I0{02H<-lz&?})gIVFyMWxX0B|0b?S6?qghp3lDgz
z2?0|ALJU=7s-~Lb3>9AA5`#UYCl!Xeh^i@bxs5f&SdiD!WN}CIgq&WI4VCW;M!UJL
zX2};d^sVj5oVl)OrkapV-C&SrG)*x=X*ru!2s04TjZ`pY$jP)4+%)7&MlpiZ`lgoF
z<z)BC1fvX1DaDLZ_@-`uBujj%t}%3ZeUVr4TREsHX7F?nWpHMA-Xk|J!iq`DS}GVf
z4OL4K$Uz`ePv~ieY74)ZRfxYcZpw+*vvS6&Rlqbur}xYv21j`ZZCe8j?dJd)#JHX_
z5=vO*eRLkV0-T?O1~f`|h(`h*OPIkE2~QCbFe_mW^9+sURZQi7)O1oYBt-FyQU{7<
zNQhxxKwQEC78z;-Weov$5b5@FdMV(!gk`L7YA+<TqeH+dL*W0uDMLf?oH9r2nf+pL
z(JaK2H#sFs@P+LRZ(7;jTRIZQ(sv(2QuDhnf@7$R#^#q-7<w+6w}d5qmBm<uOr@;I
zLMW+p&rrk1yf}h?o+JG6A+6#q(ddiydr!JgMid5uPq(QbnutmXYCCHx8^yD!+vYaa
zd7<2tbodnD1w&osHX>o_p>^4qGz^(Y*uB10dY2kcIbt=$FIdYNqk;~47wf@)6|nJp
z1cocL3zDR9N2Pxkw)dpi&_rvMW&Dh0@T*_}(1JFSc0S~Ph2Sr=vy)u*=TY$i_IHSo
zR+&dtWFNxHE*!miRJ%o5@~GK^G~4$LzEYR-(B-b(L*3jyTq}M3d0g6sdx!X3-m&O%
zK5g`P179KHJKXpIAAX`A2MFUA;`nXx^b?mboVbQgigIHTU8FI>`q53AjWaD&aowtj
z{XyIX>c)*nLO~-WZG~>I)4S1d2q@&?nwL)CVSWqWi&m1&#K1!gt`g%O4s$u^->Dwq
ziKc&0O9KQ7000OG0000%03-m(e&Y`S09YWC4iYDSty&3q8^?8ij|8zxaCt!zCFq1@
z9TX4Hl68`nY>}cQNW4Ullqp$~SHO~l1!CdFLKK}ij_t^a?I?C^CvlvnZkwiVn>dl2
z2$V(JN{`5`-8ShF_ek6HNRPBlPuIPYu>TAeAV5O2)35r3*_k(Q-h1<oe`Z&D<40Ft
zBcd&T{H%vo)9-oc7=5c8y|+a3`=a>+h5pb(Zu%oJ__pBsW0n5ILw`!&QR&YV`g0Fe
z(qDM!FX_7;`U3rxX#QHT{f%h;)<e7LdkX!XLVxd}I{F6>Eursw=*#qvV)~y%^Uo^%
zi-%sMe^uz;#Pe;@{JUu05zT*i=u7mU9{MkT`ft(vPdQZoK&2mg=tnf8FsaNQ+QcPg
zB>vP8Rd6Z0JoH5_Q`zldg;hx4azQCq*rRZThqlqTRMzn1O3_rQTrHk8LQ<{5UYN~`
zM6*~lOGHyAnx&#yCK{i@%N1Us@=6cw=UQxpSE;<(LnnES%6^q^QhBYQ-VCSmIu8wh
z@_Lmwc<AfAQRRAtHwjXM%8e>FDfAhIn>`%h7L{)iGBzu`Md4dj-m3C8mA9+BL*<>q
z#$7^ttIBOE-=^|zmG`K8yUKT{yjLu2SGYsreN0*~9yhFxn4U};Nv1XXj1fH*v-g=3
z@tCPc`YdzQGLp%zXwo*o$m9j-+~nSWls#s|?PyrHO%SUGdk**X9_=|b)Y%^j_V$3S
z>mL2A-V)Q}qb(uZipEFVm?}HWc+%G6_K+S+87g-&RkRQ8-{0APDil115eG|&>WQhU
zufO*|e`hFks^cJJmx_qNx{ltSp3aT|XgD<x?C$Ix95~e-?CJ`JIx({^gvA?wYnXif
zoqP8cWngm0%+XP?j}={}HQF+2>5-VxGGXb7gkiOG$w^qMVBDjR8%!Sbh72niHRDV*
ziFy8LE+*$j?t^6aZP9qt-ow;hzkmhvy*Hn-X^6?yVMbtNbyqZQ^rXg58`gk+I%Wv}
zn_)dRq+3xjc8D%}EQ%nnTF7L7m}o9&*^jf`_qvUhVKY7w9Zgxr-0YHWFRd3$l_6UX
zpXt^U&TiC*qZWx#pOG6k?3Tg)pra*fw(O6_45>lUBN1U5Qmc>^DHt)5b~Ntjsw!NI
z1n4{$HWFeIi)*qvgK^ui;(81VQc1(wJ8C#tjR>Dkjf{xYC^_B^#qrdCc)uZxtgua6
zk98UGQF|;;k`c+0_z)tQ&9DwLB~&12@D1!*mTz_!3Mp=cg;B7Oq4cKN>5v&dW7q@H
zal=g6Ipe`siZN4NZiBrkJCU*x216gmbV(FymgHuG@%%|8sgD?gR&0*{y4n=pukZnd
z4=Nl~_>jVfbIehu)pG)WvuUpLR}~OKlW|)=S738Wh^a&L+Vx~KJU25o6%G7+Cy5mB
zgmYsgkBC|@K4Jm_PwPoz`_|5QSk}^p`XV`649#jr4Lh^Q>Ne~#6Cqxn$7dNMF=%Va
z%z<AsBy*Nm$qcPRtn58~4;F#DO3=3TTAjKTiwdqKd0hD(l8ifl@)+GRtI%1Rw?ZO(
zmz+Szx|nJK58+fyw~fJ^C)O5^R^hg#=i(9@)dYl2m=<>9Ef6QmfoXAlQ3)PF8#3Y%
zadcE<1`fd1&Q9fMZZnyI;&L;YPuy#TQ8b>AnX<x$C{{p37Ks8vjz*8r1<^dA(Ff^4
zjUJ+uMh{bpsciv&6kGQ$XCNeUw?-eL^BR4Oo<Ib~Y&#K12;>r*SGY&xUb>2678A+Y
z8K%HOdgq_4LRFu_M>Ou|kj4W%sPPaV)#zDzN~25klE!!PFz_>5wCxglj7WZI13U5|
zEq_YLKPH;v8sEhyG`dV_jozR);a6dBvkauhC;1dk%mr+J*Z6MMH9jqxFk@)&h{mHl
zrf^i_d-#mTF=6-T8Rk?(1+rPGgl$9=j%#dkf@x6>czSc`jk7$f!9SrV{do%m!t8{?
z_iAi$Qe&GDR#Nz^#uJ>-_?(E$ns)(3)X3cYY)?gFvU+N>nnCoBSmwB2<4L|xH19+4
z`$u#*Gt%mRw=*&|em}h_Y`Pzno?k^8e*hEwfM`A_yz-#vJtUfkGb=s>-!6cHfR$Mz
z`*A8jVcz7T{n8M>ZTb_sl{EZ9Ctau4naX7TX?&g^VLE?wZ+}m)=YW4ODRy*lV4%-0
zG1XrPs($mVVfpnqoSihnIFkLdxG9um&n-U|`47l{bnr(|8dmglO7H~yeK7-wDwZXq
zaHT($Qy2=MMuj@lir(iyxI1HnMlaJ<jX%sE(fCn*3?3Gn4nSlq&@KU5<Hz}<NX%K-
zMTN~lIE^px$DD-EU%M{1qACNs17;@Nj-Gt*Rrm>wpX86je}e=2n|Esb6hB?SmtDH3
z2qH6o`33b{;M{mDa5@@~1or8+Zcio*97pi1Jkx6v5MXCaYsb~Ynq)eWpKnF{n)FXZ
z?Xd;o7ESu&rtMFr5(yJ(B7V>&0gnDdL*4MZH&eO+r*t!TR98ssbMRaw`7;`SLI8mT
z=)hSAt~F=mz;JbDI6g~J%w!;QI(X14AnOu;uve^4wyaP3>(?jS<ljwsU5!7<p8}i}
zL7L#c+-+~wLLj;s_n}*|CFnpNPNHIW9&Eq(bs-;&;(6@(b=_4E{(&*eoXA{DmlQp8
znGXNI-Kxc9CO;b|K^L%!!T>Lp+LQ7uU(iib%IyB<ywG`)hV2}Kh*;jWpny-xs1#~{
zbqmCdt821{{_GXnJ$@z<wUY88e+*@1o6>(d&g@+hg;78M>h7yAeq$ALRoHGkKXA+E
z$Sk-hd$Fs2<K7hR`?HSPSmeG}{4J#x%N=>nL4w<PeNfsVCF_wKy$W6_$epEmZYjK4
zi+d!*BDQw+O#prhLbfH}8_MdBw~JwaO+mWJsY>9p@O*Y$c;U)W#d~)&8Js;i^Dp^*
z0*7*zEGj~VehF4sRqSGny*K_CxeF=T^8;^lb}HF125G{kMRV?+hYktZWfNA^Mp7y8
zK~Q?ycf%rr+wgLaHQ|_<6z^eTG7izr@99SG9Q<u__?-*+Lj0<oJ4_lDPNp1xOi0I-
zBk-Z{m?6MYLI0qcv@^Xv0JziBMLwwL9Z4DDm=IOI-_l3N<qbRWo|1PyCHQ|^CaiX&
zfb>{$PCjJabSz`6L_QJJe7{LzTc$P&pwTy<&3RRUlSHmK;?}=QAhQaDW3#VWcNAH3
zeBPRTDf3?3mfdI$&WOg(nr9Gyzg<O~aeU!4%Dw6dhqX`I;`>`&u^o!f2rKJ57D_>p
z6|?Vg?h(@(*X=o071{g^le>*>qSbVam`o}sAK8>b|11%e&;%`~b2OP7--q%0^2YDS
z`2M`{2QYr1VC)sIW9WOu8<~7Q>^$*Og{KF+kI;wFegvaIDkB%3<qeI0+|)cpd`XIV
zR5F&JZ6TFzp~ui`$S~65^ilbpw_GY>*%PWtWKSq7l`1YcDxQQ2@nv{J!xWV?G+w6C
zhUUxUYVf%(Q(40_xrZB@rbxL=Dj3RV^{*yHd>4n-TOoHVRnazDOxxkS9kiZyN}IN3
zB<F0}kh5un+-`~NJtS>^5<Ov^3sk&XI@aAOttDFN^<1Hf*Qvs*;dz~^rm1q6r>N=*
zRSTO+rA<{*P8-$GZdyUNOB=MzddG$*@q>mM;pUIiQ_z)hbE#Ze-IS)9G}Rt$5PSB{
zZZ;#h9nS7Rf1ecW&n(Gpu9}{vXQZ-f`UHIvD?cTbF`YvH*{rgE(zE22pLAQfhg-`U
zuh612EpByB(~{w7svCylrBk%5$LCIyuhrGi=yOfca`=8ltKxHcSNfDRt@62QH^R_0
z&eQL6rRk>Dvf6rjMQv5ZXzg}S`HqV69hJT^pPHtdhqsrPJWs|IT9>BvpQa@*(FX6v
zG}TYjreQCnH(slMt5{NgUf)qsS1F&Bb(M>$X}tWI&yt2I&-rJbqveuj?5J$`Dyfa2
z)m6Mq0XH@K)Y2v8X=-_4=4niodT&Y7W?$KLQhjA<+R}WTdYjX9>kD+SRS^oOY1{A=
zZTId-(@wF^UEWso($wZtrs%e7t<}YaC_;#@`r0LUzKY&|qPJz*y~RHG`E6bypP5AX
zN!p0^AUu8uDR>xM-ALFzBxXM~Q3z=}fHWCIG>0&I6x2Iu7&U)49j7qeMI&?qb$=4I
zd<toLH_|bTXh!IH%zTALX`0694LSoG67(Iqm%d9DeGe<Xj|6_3#_1i3!<q!IqkDN1
zSsWmnw@`|Ix6=gg0)mMAc@}xHg?^SkjWr6i-%rocXOLkD==cd>MmhAJrO%@0f%YW!
z^gLByE<rzqUM2SO4f<*N8D!WybTfSpk`$3u*?dIL$w%}u`B=g`>GSk+R0<o|SzE^2
z=mq+Dc&Un;=ojc0k)5JQzDX4`P*$nXYK3+y^aX`~zNpZP3VlhTFDrCXSj;X!&J5Kr
z$i<TD=DHaeuN372_|0IC1(W1Vu|iuT3SFE5w$v13aQ=V=%?vhqBOQ6wsEW@=4#3<G
zKMNRYo~GTy4QblLXl}>v4*d4w*N$Ju6z#j%HBI}6y$2en=-@S3=6+yZX94m&1j@s-
z7T6|#0$c~dYq9IkA!P)AGkp~S$zYJ1SXZ#RM0|E~Q0PSm?DsT4N3f^)b#h(u9%_V5
zX*&EIX|gD~P!vtx?ra71pl%v)F!W~X2hcE!h8cu@6uKURdmo1-7icN4)ej4H1N~-C
zjXgOK+mi#aJv4;`DZ%QUbVVZclkx;9`2kgbAhL^d{@etnm+5N8pB#fyH)bxtZGCAv
z(%t0kPgBS{Q2HtjrfI0B$$M0c?{r~2T<RSTf!OM5X3QT;)A80apUYQ<$z#K%jo!P`
zbOH>=zeXo7V&&aprCzww=i*}Atu7g^(*ivauMz~kkB%Vt{Wydlz%%2c26%>0PAbZO
zVHx%tK(uzDl#ZZK`cW8TD2)eD77wB@gum{B2bO_jnqGl~01EF_^jx4Uqu1yfA~*&g
zXJ`-N?D-n~5_<grn_osx<j94buP;cy;tm9e`4#$A*eE>QNF_5+Un<iW1@v`M1E*$?
zJ+2%H1WCn`>-4&l$<JXVg1Oln#u3?n?Tw)AX}V5pfSfCwe8Ks)vj$jeG-vYVBC>1b
zVlHFq<avD&0lWm;Uqa1&1#o#eFH<(>tluoN85b^C{A==lp#hS9J(npJ#6P4aY41r)
zzCmv~c77X5L}H%sj>5t&@0heUDy;S1gSOS>JtH1v-k5l}z2h~i3^4NF6&iMb;ZYVE
zMw*0%-9GdbpF1?HHim|4+)Zed=Fk<2Uz~GKc^P(Ig@x0&XuX0<-K(gA*KkN&lY2Xu
zG054Q8wbK~$jE32#Ba*Id2vkqmfV{U$Nx9vJ;jeI`X+j1kh7hB8$CBTe@ANmT^tI8
z%U>zrTKuECin-M|B*gy(SPd`(_xvxjUL?s137KOyH>U{z01cBcFFt=Fp%d+BK4U;9
zQG_W5i)JASNpK)Q0wQpL<+Ml#cei41kCHe&P9?>p+KJN>I~`I^vK1h`IKB7k^xi`f
z$H_mtr_+@M>C5+_xt%v}{#WO{86J83;VS@Ei3JLtp<*+hsY1oG<nU}c+^yg_Dk>zo
z0?$?OJO$79;{|@aP!fO6t9TJ!?8i&|c&UPWRMbkwT3nEeFH`Yyyh6b%Rm^nBuTt@9
z+$&-4lf!G|@LCo3<8=yN@5dYbc%uq|Hz|0tiiLQKiUoM9g14zyECKGv0}3AW<LxTK
zc!!F2;$8CV-Ew%39Nz24ML#a7sKoo^{QW9EfDfw3U|7Wn9#VhtFh&)8NWo<l>v2WJ
zUAXGUhvkNk`0-H%ACsRSmy4fJ@kxBD3ZKSj6g(n1KPw?g{v19phcBr3BEF>J%lL|d
zud3LNuL;cR*xS+;X+N^Br+x2{&hDM<N4j_Sc6IL(2t-ckr}d_|o*ZcEv8`BgV1vNa
zRx_Eh^`yODkEeePfl$fzw)WnZu1I@Z4yP{5vS(jcdvA_9uYg*zsbXU+8M8MFl!Y7i
z3;0^ieoCu}#FECYbmEv{_3FpshE&pw>hb-$6_fKU(Pt0FQUXgNrZvzsVCnsFqv?#L
z4-FYsQ-?D>;LdjHu_TT1CHN~aGkmDjWJkJg4G^!+V_APd%_48tErDv6BW5;ji^UDD
zRu5Sw7wwplk`w{OGEKWJM&61c-AWn!SeUP8G#+beH4_Ov*)NUV?eGw&GHNDI6G(1Y
zTfCv?T*@{QyK|!Q09wbk5koPD>=@(cA<~i4pSO?f(^5sSbdhUc+K$DW#_7^d7i%At
z?KBg#vm$?P4h%?T=XymU;w*AsO_tJr)`+HUll+Uk_zx6vNw>G3jT){w3ck+Z=>7f0
zZV<RBTo{nTnT)OKN^+H6P{iI)9M0OTLisYLg-h7{ab~5|Ete5V!*1HQw~K3na^@Eh
zd(I_o{cO%2@`UmdZI{^^*HfuB<M=i+o$PP7EXRNTsXewHJ-JgKa&lh5Hw0FNCyr`~
zs#_+t=|&+`d(5;IHQe-`S#rKsNP$cP4~RDNOfqij{TlY7N5d15)?g#0;V9_W&_t&~
z!#D9Q`oH*4GKVH}@EHoSPIK9orwO=xkXfMN+xU)x?`rrSzE7T00_CUDF~b&E{eK)g
z4L^Ut4>kM<KUVM)4Ugid%%br_)TyTi8AJ^~!_O7`Lc=fdD-AI`MZ*wIX*hwWD)_aA
z-{7|bb3DxIlI1ua=izo2&QRr*(xJaA^xzo(ZrvViNu`Vgv&NEqzn8-w1nNDQx3X5H
zY)+)Vm~gH^f5e{zwER4xN$$=S<K<4m{#k#)Uo`v`f79@H8Qg#1nudSk8q33-%nNIg
zKvlt(f8pP9-(w2?qv3J<SD_#w#1uu8X~HMU6;YuHMfjOdH#kA`)Ob$pO(*SG!pJQW
zUsP&Bm0I|YQ+Z8P2~A*gtDa1ncBtQ=kqL${6qV<0i2e#4H?2_CCn47P&~eL5gra|J
zNyqe*5vpIDs$Wr%huz0c7*SgjQ$@8DSEGn&ny3{4Mbv3xI?}8(H$LE+n1O4Gn5l_b
zVm32U1Qjty6LTeTp3DzI1h0E2rOf#(iQ_WzT%+YXPS(wM+&r@{c{0hv*ge)C7KIxo
z)08UAEa*DV)_DVn?p&#xh=(aMsHcBgtbugGNZJ#rmcy0(@_1|@Z813)m(;jYV`MKV
zcRKQ9t?_J`dE1=gz(PG>*!k^Z_E@_pZK6uH#|vzoL{-j1VFlUHP&5~q?j=UvJJNQG
ztQdiCF$8_EaN_Pu8+afN6n8?m5UeR_p_6Log$5V(n9^W)-_vS~Ws`RJhQNPb1$C?|
zd9D_ePe*`aI9AZ~Ltbg)DZ;JUo@-tu*O7CJ=T)ZI1&tn%#cisS85EaSvpS~c#CN9B
z#Bx$vw|E@gm{;cJOuDi3F1#fxWZ9+5JC<e{LvdZ+7pxTd*M}z+T`$b~$!(=qYR0Kf
zt#wVO(KgF8>qVRCz5o`EDW890NUfNCuBn)3!&vFQE{E$L`Cf7FMSSX%ppLH+Z}#=p
zSow$)$z3IL7frW#M>Z4|^9T!=Z8}B0h*MrWXXiVschEA=$a|yX9T~o!=%C?T+l^Cc
zJx&MB$me(a*@lLLWZ=<H=nUNL9^OCXvBxWNGd%W6P27%^Wai1n>>PhKs!}#!ICa0!
zq%jNgnF$>zrBZ3z%)Y*yOqHbKzEe_P=@<5$u^!~9G2OAzi#}oP&UL9JljG!zf{JIK
z++G*8j)K=$#57N)hj_gSA8go<n<4*~1n?n<2zEkX7iUvY#d&w$T;qIq-n@qMJ$dtK
z@bjBDb&kEHH1SvPx4eIG7*j4eEc-ZCIK&Y4bJSc09KaL!TZuj#Bo{Y}d#F?uX;(*3
z7Fjw1-%bwYyGBvbHw>lO7xZP|KM?elUq)qLS)i(?&lk{oGMJh{^*FgklBY@Xfl<_Q
zXP~(}ST6V01$~VfOmD6j!Hi}lsE}GQikW1YmBH)`f<dm#Y4(2y{mVx%S5D?NS1udD
z{AM+%HjZLJU$Al%f@9#OKxh~@k78k8&_9e@hOuZAiwU$OgZgo^w<Ex@o?Z^q&<0dv
zDQ00A=3_b5U<Ep{lHR<Pj#$m-%~}|^4QH_)PeU{A#zvfHj4ogcuAtR%-H_`Z9KxMW
z>_+)KI!t#~B7=V;{F*`umxy#2Wt8(EbQ~ks9wZS(KV5#5Tn3Ia90r{}fI%pfbqBAG
zhZ)E7)ZzqA672%@izC5sBpo>dCcpXi$VNFztSQnmI&u`@zQ#bqFd9d&ls?RomgbSh
z9a2rjfNiKl2bR!$Y1B*?3Ko@s^L5lQN|i6ZtiZL|w5oq%{Fb@@E*2%%j=bcma{K~9
z*g1%nEZ;0g;S84ZZ$+Rfurh;Nhq0;{t~(EIRt}D@(Jb7fbe+_@H=t&)I)gPCtj*xI
z9S>k?WEAWBmJZ|gs}#{3*pR`-`!HJ)1Dkx8vAM6Tv1bHZhH=MLI;iC#Y!$c|$*R>h
zjP{ETat(izXB{@tTOAC4nWNhh1_%7AVaf!kVI5D=Jf5I1!?}stbx_Yv23hLf$iUTb
z-)WrTtd2X+;vBW_q*Z6}B!10fs=2FA=3gy*dljsE43!G*3Uw(Is>(-a*5E!T4}b-Y
zfvOC)-HYjN<T>fcpi`<nf-dRCvb<3DQ>=kG%(X3XcP?;p&=pz+F^6LKqRom~pA}O*
zitR+Np{QZ(D2~p_Jh<vCoM0+TuBZPGvkW<o2?W>-k|dL!LPmexLM?tEqI^qRDq9Mg
z5XBftj3z}dFir4oScbB&{m5>s{v&U=&_trq#7i&yQN}Z~OIu0}G)>RU*`4<}@7bB%
zKYxGx0#L#u199YKSWZwV$nZd>D>{mDTs4qDNyi$4QT6z~D_%Bgf?>3L#NTtvX;?2D
zS3IT*2i$Snp4fjDzR#<)A``4|dA(}wv^=L?rB!;kiotwU_gma`w+@AUtkSyhwp{M}
z!e`jbUR3AG4X<hiCae!0Z#IQzg_MO}8r9LZ8v9gatnAdq>vnBVcyIZht6Vi~?pC<x
z$UMBL*Un7qe%rPwVc5u??{Jvv@h48*X+33_?}H3zszQHeTZax+9HxTd_!Z$f2aech
zh-P!|7*abeZXa*+X4sU$RVNFp#Ueu?du6y}MLrh0fRY4k3<2mr8fTz23ECVQbp8Y-
z&)QObbuwkr*lDyqTgbBA1GXX|CT`-EiBViLVIpP1K+?n%?&?@)Sh}Jk6BD>C!$XF2
z*V~)DBVm8H7$*OZQJYl3482hadhsI2NCz~_NINtpC?|KI6H3`SG@1d%PsDdw{u}hq
zN;OU~F7L1jT&KAitilb&Fl3X12zfSuFm;X)xQWOHL&7d)Q5wgn{78QJ6k5J;is+XP
zCPO8_rlGMJB-kuQ*_=Yo1TswG4xnZd&eTjc8=-$6J^8TAa~kEnRQ@Zp-_W&B(4r@F
zA==}0vBzsF1mB~743XqBmL9=0RSkGn$cvHf*hyc{<2{@hW+jKjbC|y%CNupHY_NC%
zivz^btBLP-cDyV8j>u)=loBs>HoI5ME)xg)oK-Q0wAy|8WD$fm>K{-`0|W{H00;;G
z000j`0OWQ8aHA9e04^;603eeQIvtaXMG=2tcr1y8Fl-J;AS+=<0%DU8Bp3oEEDhA^
zOY)M8%o5+cF$rC?trfMcty*f)R;^v=f~}||Xe!#;T3eTDZELN&-50xk+J1heP5<Y<
znaL!12>AQ>h5O#S_uO;O@;~REd*_G$x$hVeE#bchX)otXQy|S5(oB)2a2%Sc(iDHm
z=d>V|a!BLp9^#)o7^EQ2kg=K4%nI^sK2w@-kmvB+ARXYdq?xC2age6)e4$^UaY=wn
zgLD^{X<Qzp>0A+{ySY+&7Rp<dye-mragf3s3i1+O8l*a2CZEftSs~5J@pO#O4)7|C
zt7Uj~klxE{r1P8rua)PyL4F6<1h{`zM(RZRbwXGlq#|A);Pd3ULF0xXt>ldwpC6=E
zSPq?y(rl8ZN%(A*sapd4PU+dIakIwT0=zxIJEUW0kZSo|(zFEWdETY*ZjIk9uNMUA
ze11=mHu8lUUlgRx!hItf0dAF#HfdIB+#aOuY--#Q<WBCACK9Bb(sOZ;c5{Cyz<cBw
zm1bp-V;m1~BFNo*$vCz+DJt0kPRa995vWJw-XL{}RlB%vJiX3)rFpN$?+a3lo1}Ta
z5Pm@8%QU_`NS4rE!XK0g9};Ch9HckI4PDZ_!B=Sf5sj~8(i`GQ+lWT%y3Dpc>N9Ry
zbx|XkG?PrBb@l6Owl{9Oa9w{x^R}%GwcEEfY;L-6OU<?oOa+Y>8<!eYQ6t`2)ofdl
zc;{-S33UnK7q@p9(UckBeN6snqO;Sqm}WF4tj?-V%V>|9RXvu`-ECS`jcO1x1MP{P
zcr;<OGtG7*Y*?2bmsPqAyQ>Bw##*Dod9K@pEx9z9G~MiNi>8v1OU-}vk*HbI)@CM?
zn~b=jWUF%HP=CS+VCP>GiAU_UOz$aq3%%Z2laq^Gx`WAEmuNScCN)OlW>YHGYFgV2
z42lO5ZANs5VMXLS-RZTvBJkWy*OeV#L;7HwWg51*E|RpFR=H}h(|N+79g)tIW!RBK
ze08bg^hlygY$C2`%N>7bDm`UZ(5M~DTanh3d~dg+OcNdUanr8azO?})g}EfnUB;5-
zE1FX=ru?X=zAk4_<Ezl!IJ%o@*-5QDZ_F&LtjWsjB34$YVV!lg_^wE|e8ZN&iP<gF
zk{VwPw_va>6@__o1fE+ml1r&u^f1Kb24Jf-)zKla%-dbd<mrDhd(j_(Z#&e2c`*dZ
zEQdkTY)e@YyRT{!&<SX+i*%Yv8@xOn0)xWrstxh(l#P{4BPP+-+6V6&w!t(G>>UZ1
zrj3!RR!Jg`ZnllKJ)4Yfg)@z>(fFepeOcp=F-^VHv?3jSxfa}-NB~*qkJ5Uq(yn+(
z<8)qbZh{C!xnO@-XC~XMNVnr-Z+paowv!$H7>`ypMwA(X4(knx7z{UcWWe-wXM!d?
zYT}xaVy|7T@yCbNOoy)$D=E%hUNTm(lPZqL)?$v+-~^-1P8m@Jm2t^L%4#!JK#Vtg
zyUjM+Y*!<JsDnwU8g|E1uIfHP3rHvJ9!aXvBUq$4(iwj@?39JY7oCLH7;6A1Nz<<H
z1@>$);1<)0MUqL00L0*EZcsE&usAK-?|{l|-)b7|PBKl}?TM6~#j9F+eZq<vwyg-f
zQ6xX`>25_L&oSl}D<NsQHWi6FoUn<~8Dj}##2gV0o3l~7I_rNmqaltZtyDLRo=Y;p
z0a9He7Bhe1h(8@f2`e3S8ea>OMv^-tacpDI)l*Ws3u+~jO@;t(T)P=HCEZ#s_5q=m
zOsVY!QsOJn)&+Ge6Tm)Ww_Bd@0PY(78ZJ)7_eP-cnXYk`>j9q`x2?Xc6O@55wF+6R
zUPdIX!2{VGA;FSivN@+;GNZ7H2(pTDnAOKqF*ARg+C54vZ@Ve`i?%nDDvQRh?m&`1
zq46gH)wV=;UrwfCT3F(m!Q5qYpa!#f6qr0wF=5b9rk%HF(ITc!*R3wIFaCcftGwPt
z(kzx{$*>g5L<;u}HzS4XD%m<I!)UoMT66l0a_guJuN5cfb<%8;;k8nDRh|y7UBi>l
zmdStbJcY@pn`!fUmkzJ8N>*8Y+DOO^r}1f4ix-`?x|khoRvF%jiA)8)P{?$8j2_qN
zcl3Lm9-s$xdYN9)>3j6BPFK)Jbovl|Sf_p((CHe!4hx@F)hd&&*Xb&{TBj>%pT;-n
z{3+hA^QZYnjXxtF2XwxPZ`S#<d^2juw?KdUVqx|<op0e=p+c^Pi1+3VHI*oQbiR#0
zkD$*T%?V;~fUbNye?jLj@|Se}GGC|jLH-JIk9!%S@mF>J8h>5qLwtwM-{5abbEnRS
z`9_`Zq8FJiI#0<P&Mg(f3yPBq!tDt&8IC9HFe+Bth{VH2yboj+w%3HDvxVXM^j?1(
zwiDqFWb&}ti)}gD7hasD>syE_V_3M&trw$P=ezkHosV$8&I5c0(*-9KBE5DJOC-Xv
zw<m$lNBLfj@6&mZzs0oi<Qj|X3`>}1bq~AD0_Xerm`<Ok+jV|`AJqBVFe!KKkg_Mz
zrgD2Y(cv~V++o1E?Q@Fb#qkz^+m(MNX7q)-j7!aMt7*o=wh`-=A|TuovAY%)$JOb;
ziiPbi!$xC<7r55`3&P!20u$}NF!bn?wH%06rXjj8Jr0A0r2+~^l2F?c>%ryiG9_$S
z5G|btfiAUNdV09SO2l9v+e#(H6HYO<P!tR27Pw*5XVu~2WN|!`P{UGP%8-B4o%Ll~
zx=yTCUICkMjVkuW4CwqFz7h4!Fut~?;&vovX6q0Mx`$8|3}@dO%QE^T1?&7>dQs=^
z@xwZQU)~;p1L*~ciC}9ao{nQ-@B>r<C#s-EpgVIa@U?Zt5-52*E0-_V`G<%#aCubc
z#~9)JgaCf3du7KIa@o9{F`a*Z#7_#Nr=<Du2&J->pUzK<MZ989iL#$$$VOIhI{#G2
zX1{e2r}58peujUp^RtpWi^k@dv<b@U5~*mriX4==h`~&q8}1%1bi*A9t2!+C=NB43
zr}OjT7%h=p7)QmY@e4Y?$S-O9vd*vYt2+OZe}&;5r#{sA*Zdouf6ITrLrLmd5$W`2
z{=LqB5J&!z|CF)tn6gdh*Ch4*S=>Bxv=cUusOP5Trs3QnvHxGh9e>s7AM{V1|HfYe
z3QwH;nHHR49fYzuGc3W3l5xrDAI392SFXx>lWE3V9Ds9il3PyZaN5>oC3>9W-^7vC
z3~KZ-@iD?tIkhg+6t{m;RGk2%>@I0&kf)o$+-^ls0(YABNbM(=l#ad@nKp_j=b~Xs
ziR;xu_+)lxy6|+af!@}gO2H_x)p;nZ-tYxW5Omq=l`GzMp*GTLr>vZN1?e}^C$t*Z
zvzEdIc2|HA2RFN_4#EkzMqKnb<pLBO4+WJ5@iu6<*yZ}5^dx`RJ6@oyUGTNLwp4D6
zQr+!_EwvXq9LV|FqKPDW{O#$8@RpRybyEJwEUB(P$J>bw!?!?%B@M0^^5Z<!X?H1X
z%bH?4ISS7xsT)h5y*R2kv373c0XvbALyIKqW8F4Rt^N+RBdC+p7-qZ2TG&<mY|Xw{
zYW8zn#X9x#oi~3O*$eA>;K?x-%lg?Z>}wMV8zEqHZ$cr~Y#Wv>9+)KMUZatUqbRU8
z8t9qrek(H^C0Tuzq|cP2$WL7tzj+Dj5y^2SF1D154CnsB$xbz`$wV||n-cG%rsT$p
z+3RHdadK(3-noj(2L#8c5lODg)V8pv(GEnNb@F>dEHQr>!qge@L>#qg)RAUtiOYqF
ziiV_ETExwD)bQ<))?-9$)E(FiRBYyC@}issHS!j9n)~I1tarxnQ2LfjdIJ)*jp{0E
z&1oTd%!Qbw$W58s!<?E8yP8T26Viz&^F4A~aC%qEomHk#Qm5Ec3e?P1Tj+$>6ms>F
z=p0!~_Mv~8jyaicOS*t(ntw`5uFi0Bc4*mH<SuY~bM{B5oPpIUn>8kSkk$>!f0;FM
zX<XOP5P@dz=8h9!x<TDSCLIj9Udx3_a=kV3LTpl(k=&H9%=)MqgIf>_<Kt$po&Fr{
zpKJorU@qqh(I4C6Tylqoku~P>t14I55!ZVsg0O$D2iuEDb7(J>5|NKW^Z~kzm@dax
z9(|As<jw)_1#$tQo>$U7^}LF%#`6r&UPB*6`!Rf74h~*C=ami6xUxYCwiJxdr$+`z
zKSC4A%8!s%R&j*<WtB&0;$gMI$I(tFKiavN8Kx<87G#)5v#A(w^XXcQlsP=<6ZA<U
z^(KEZv3e7!^3<Ei<w5UtbUk`RnxhmX4bQdZ{WNJ4n#oON_s~SV<X3w`-hL{m_Q~Un
zYCrlXg#3dvrKK$75BVy}D+j2spQb)YMR$&pvlKd(fpZ09t)v;W5Rxxaa&B-|%gVWy
zZlF&=A|I`y{q$*Y3DPpU5%%?9ZW(=sZiatmGoa^Z>2si(OEc*fy!q)?%=TjDZJ2}O
zxT6o>jlKXz_7_Y$N})}IG`*#KfMzs#R(SI#)3*ZEzCv%_tu(VT<m;!IE4+o?TZaBx
z5%PHoq2#QCL%*u*r`ZQdulCDJ$p1h^Kb=|a9i(u}0L`iPc~<xf{UPtM+i6ig4TXQa
zh5n@<I7)M?wUE|NXL)a<@gd*jMg25yXUHdA#XGO?^TDAfWV!iwLdZ#UHk}Ir&!rmm
z^eD6KphC1AP^%LZ5kTi+xOfkpNl{urF&HwAc^0jqBxYGukLLzTQ4{shPU@vr>Z5J|
zw2$5kK)xTa>xGFgS0?X(NecjzFVKG%VVn?neu=&eQ+DJ1APlY1E?Q1s!Kk=yf7Uho
z>8mg_!U{cKqpvI3ucSkC2V`!d^XMDk;>GG~>6>&X_z75-kv0UjevS5ORHV^e8r{tr
z-9z*y&0eq3k-&c_AKw~<`8dtjsP0XgFv6AnG?0eo5P14T{xW#b*Hn2gEnt5-KvN1z
zy!TUSi>IRbD3u+h@;fn7fy{F&hAKx7dG4i!c?5_GnvYV|_d&F16p;)pzEjB{zL-zr
z(0&AZUkQ!(A>ghC5U-)t7(EXb-3)tNgb=z`>8m8n+N?vtl-1i&*ftMbE~0zsKG^I$
zSbh+rUiucsb!Ax@yB}j>yGeiKIZk1Xj!i#K^I*LZW_bWQIA-}FmJ~<TRX$8LWfcRo
zq}p34A-eP?S`4%<+gY$&Qwo+hw|LR9qPfLa+1vuuio(^tL0Z`o@(s}04;;?o&(V25
zmb;P0Bj~2U&>^}>p=K$bX9F{}z{s^KWc~OK(zl_X57aB^J9v}yQ<s0WLmfS&Qlz{|
zxaO(1@2apqtdc1I3k-8L{2o1=b$p(R;f;f|3Q<=rX=(KVT7$=$CTP91Qk;2gg%ga0
zzT0Vz1mY4W2+uh{dPPXPm)7Qy6MQdLjCStV!T%5peg_o&22BHi7X!kpAX+WnHvohg
z=Pssv6$Tn8m(lm>5h#BE$+C)WOglV)nd0WWtaF{7`_Ur`my>4*NleQG#xae4fIo(b
zW(&|g*#YHZNvDtE|6}yHvu(hDekJ-t*f!2RK;FZHRMb*l@Qwkh*~CqQRNLaepXypX
z1?%ATf_nHIu3z6gK<7Dmd;{`0a!|toT0ck|TL$U;7Wr-*piO@R)KrbUz8SXO0vr1K
z>76arfrqImq!ny+VkH!4?x*IR$d6*;ZA}Mhro(mzUa?agrFZpHi*)P~4~4N;XoIvH
z9N%4VK|j4mV2DRQUD!_-9fmfA2(YVYyL#S$B;vqu7fnTbAFMqH``wS7^B5=|1O&fL
z)qq(oV6_u4x(I(**#mD}MnAy(C&B4a1n6V%$&=vrIDq^F_KhE5Uw8_@{V`_#M0vCu
zaNUXB=n0HT@D+ppDXi8-vp{tj)?7+k>1j}VvEKRgQ~DWva}8*pp`W8~KRo*kJ*&X}
zP!<CZsjx;t3k>~2fxQr@dM*q0dI|)Fux=pZWBk==RI7i{^BQf`kWlD2%|@R9!JA7&
zLbM$uJ12y}_62$|T|{)@OJZtzfpL^t@1nMTYHutrF#D+^?~CN~9`YQ@#&&@c_Zf)(
zbC~y8!2LO8jHwQXv>G~1q?c68ipT*%dY&c{<jL<V=~a)y5R&g!ma8yZh)3rp&)QiP
z*be8EDL{W#%vu6O4v<&2)|<%ZIdp{wA@~wVmko<FSH<^Bu>8wd_!Y#~tMJ7yk!F8|
zt?m_CLVw6cU@@p(#h4cY&Qsfz2Xp3w^4Cg%m03Tmq~9n%hyoMH^KY7{(QkRyn_!YB
zzZa!Tgr~5$MAG$x)Fs71#6j}Kvcv3=9VUX8C<A|XF(+o?2dGGttB{Wb)a$2igu>H<
zbP3|fY8f#$K*<5JQ7whM(v=GN2k26Xsh)#0!HKS(koLgAp-;)8z0w&_Z=nG4v6n8u
z&Tm0Fi){4_!Y5Kp?!zv$FKfUifQ{%c82uYfrvE{%ejUd72aNYmI*0z3-a-EYr+<Uj
z5G8+DxD62w6ZAeLoXgllSFo4%;dw2d*Rf9-dn@cRkKP5-{}C3u0K3(n=rwqJGHQ%J
zV=YO1*Jq7=J^eMk(_If41oYS8%b^P*ApZ`jyvh{@Y5%6l8oiD<J5E&^#fFepwH%zw
z2)Z?TgHS9Sd6UNF4Z-WaEQtzH85)A;e4~G6Vu{Q?vK?al1150x5!q@5uEqJ-asy4}
zsOV<4tnl7U6DulJz1Mee=rsUyHnLOC@Ls4&SPqb%$5TG*G?OQxTA57qI6r64FV0$`
z81}wHS)v$K&TDGVcWNvTAX`NLr|Pc5D#r4TOKo(|aVq3tp(h96t>bB->oH3#t(AY3
zV{Z=(SJr;D#0(`u*dc*~9T7D8Pudw894%!>c4wU&V1m<~0InidR6fbi?yPl(z+sKa
zdF*kS>_4^1UO>y4T%Ar>epSr5&vp`$KdY7B(F%P0@VyHk@1fJ=6X0=aGjD-)BrOJD
zW}IU@hg~^2r>a1fQvjTtvL*mKJ7q;pfP*U2=URL`VB_Y_JojbZ+MS=vaVN0C6L_MV
zG1#5=35-E`KsD%r>-Q_ndvJ2tOYcMMP9f*t0iJ`(Z`^+YP)h>@lR(@Wvrt-`0tHG+
zuP2R@@mx=T@fPoQ1s`e^1I0H*kQPBGDky@!ZQG@8jY-+2ihreG5q$6i{3vmDTg0j$
zzRb*-nKN@{_wD`V6+i*YS)?$XfrA-sW?js?SYU8#vXxxQCc|*K!EbpW<KRGsVy9Os
zNyU)fm61&L7?yMWP5o&7oWUu^HNh}amXSDW-&BNuI^&g)GJZL(^6;E1sc|pqBv-P<
zFlK5cTBl^Coya(1@D8I$sA9-lEkP~Y<yh5&y5hA^1b2!zn?eOAJh|GZ`V9?JYd?n2
z4SroDUsL9s(cJp?TeH+hub>fu)3~jwq6_@KC0m;3A%jH^18_a0;ksC2DEwa@2{9@{
z9@T??<4QwR69zk{UvcHHX;`ICOwrF;@U;etd@YE)4MzI1WCsadP=`%^B>xPS-{`=~
zZ+2im8meb#4p~XIL9}ZOBg7D8R=PC8V}ObDcxEEK(4yGKcyCQWUe{9jCs+@k!_y|I
z%s{W(&>P4w@hjQ>PQL$zY+=&aDU6cWr#hG)BVCyfP)h>@3IG5I2mk;8K>)Ppba*!h
z005B=001VF5fT=Y4_ytCUk`sv8hJckqSy&Gc2Jx^WJ$J~08N{il-M$fz_ML$)Cpil
z(nOv_nlZB^c4<p#(?a)_u4(B)SGtQ9q!hQL%eVebEx+D7GnQ;27x<v}?t8lL+;f+A
z=l%QbH{Swq3jdODKh`@i3QfXQT$4yD@lfVL7h&-B1}~lwVM>s&&O3h=OLiCz&(|f0
zxWU_-JZy>hxP*gvR>CLnNeQ1~g;6{g#-}AbkIzWR;j=8=6!AHpKQCbjFYxf9h%bov
zVi;eNa1>t-<14KERUW>^KwoF+8zNo`<C`pgD~xZ4@f``@#rK%RtuVeH#t-=LEfFsZ
zI51=6l~P)>Y*WiQwq}3m0_2RYtL9Wmu`JaRaQMQ)`Si^6+VbM`!rH~T?DX2=(n4nT
zf`G`(Rpq*pDk*v~wMYPZ@vMNZDMPnxMYmU!lA{Xfo?n=Ibb4y3eyY1@Dut4|Y^ml&
zqs$r}jAo=B(Ml>ogeEjyv(E`=kBzPf2uv9TQtO$~bamD#=Tv`lNy(K|w$J2O6jS51
zzZtOCHDWz7W0=L1XDW5WR5mtLGc~W+>*vX<GHIG*=s;|*X|~o=RPDX-Sc|p7dfc1I
z+bdepF%{N5JNm9xkG~_}9JBmx6ag(^S{f7(&MB5Ut8gI01%ma&PSY^R4bxkR{0FUk
z>5{e~U@rE~?7e>vKU-v8bj;F4#abtcV(3ZtwXo9ia93HiETyQXwW4a-0){;$OU*l`
zW^bjkyZ<KrU~bFi>TJ6_DL^0}`*)#EZ|2nvKRzMLH9-~@Z6$v#t8Dm%(qpP+<GMP%
zX{);BhCQIW(Gn;+LWW}KSArMA5#JMCwNuLrnSDaQ;az_=OZB4O(I)T>DgzNe6d)1q
zBqhyF$jJTyYFvl_=a>#I8jhJ)d6SBNPg#xg2^kZ3NX8kQ74ah(Y5Z8mlXyzTD&}Q8
ziY(pj-N-V2f>&hZQJ`Di%wp2fN(I%F@l)3M8GcSdNy+#HuO{$I8NXubRlFkL)cY@b
z#`v{}-^hRXEq*8B_cG=%PZvI$eo(|8Wc(2o8L#0_GX9L$1@yV>%7mGk)QTD1R*OvS
z4OW;ym1)%k9Bfem0tOqq3yyAUWp&q|LsN!RDnxa|j;>R|Mm2rIv7=tej5GFaa+`#|
z;7u9Z_^XV+vD@2hF8Xe63+Qd`oig6S9jX(*DbjzPb*K-H7c^7E-(~!R6E%T<QrU8a
zoQYBuMl~zy=+|`P2J!7}I5U^Ks^;xITZ?|FpLmb=m=4EAn+x?|Qv;lIYp*ZXvf!JQ
z*?%I>rgW;RvG;WS{Ziv*W*a*`9Bb;$Er3?MyF~5G<LECu4)?S?zq`}l-6Be9igL+N
zh`N7hDOc2GQxkBc_04ZYOy0dF-2c<LysnaQzmR#Nd~*K)?c4go+&{eT7l@5={|h-A
z1;r+~VC?cFyA~?=)<Ut2x6>cXv`k>U)n}lwv$Sp+H@IKA5$mKk0g*4Ln{!tfvITeY
zzr%8JJ5BdcEYsR9e<J*1QJ-;?lGTLgRri0{(Mx*^e9N-cvKPd8)1ZvmTl)}Mp*PMb
zJ>GzJ4B&$}4FMmbRU6{8{_w7Kl77@PNe<H<wNM(*(dvGh1)78L8idze)sN69(F_bD
zfFpRAB-vBKc}&vG08>7|Bc#c?5(C5&Z=kJ#(oM90D4`rh2S!|^L!P#e#1hkD5@~--
z`<QQ&C6VTv@kABvH3YKpWDUXD_*kNb(3!wC#8v()Ttmk;q}3WaX(d<D73rp7AV5PE
zJvH>63GV0~*rOZSqw7k^#-Y$Q4z3Oa2SPRURqEahB1B^h{7~+p03SwzqL9QU#$3-X
zdYtQ?-K5xDAdfomEd6(yP<r4XU0e%L6Gs?6mZyM_@USHu0!gS4d3Fj?NQ4o2RTLE!
zsZeABR7EXMsfc7!I><w4;nzxeSu{*)rP3*7pbb=qhn4}Y2n9kR0m4&2#L{A=NS7O+
zq<gb--~a#L?(KhfJM+)&{^xa2;9hFiS^M-I@96A#^P5^~n|$x<`ddB`%@&&L<Q!2c
z3T)0gzIbLnIPU9=rs~b%+*kaqOYa3~2NrY$**DZ_28oj!E0}c#hEXZW5#1F%_rp2Y
z@7+$!3(WI<_EWCV)`TqCTTmmZb^3u}aj?mmoaBAb!n-={l6S|)$2$1IvpT^qzBZEw
z8e=}4<>tZ!yY_<35bMedeq`z2JWorljz5-f9<^93HM-$#+acw%9r!JOM%O<|BR`W&
zd-%j_?b^q7Kl6{q^N{cg2u;11rFB5EP+oqG9&pHD#_Mo@aNMj;LUvsl&nK(ca(hT(
zzFc2oHC6WQv8g7jo+3ZSwK+9G$cvfRnql)?g=XeQ3+LTh3)79nhEle8OqS3T$qn(>
z(=5Bg?EWq-ldEywgzXW9<IVcZw0PFB^dyb+qfMQWtjsj)vresv4TXCoZ567G0y;gP
z?>65%H(9^ik*rH(8dNdkbcS9|ow&_r`X~R^R?B+(oT<WD#3|w3t>iMzzlx8KnHqUi
z<C-MSdTAJmKaI>8Rh-)VAnS-CO+3}yxqm8)X+N+uzieFVm-F#syP#M1p5&$wX3MJ8
z+R@grZ*5G^Uh4I@VT=>C4RJNc^~3mx$kS1F{L?3)BzdduD2MZKdu#jNno&f2&d{?`
zW(>$oktzY@GO{|Ln~Bt^A4)(%?<rC#>l-&(D<Yw`9>m!iL#$K_xOyhwAf=K2<+Bom
z<r)*8MZ!$_D%ll%W4Ye$$4y&cK*~WyOiCrNvVfg^98_+DMF;q@k4CQVgxx|A9Hkzk
zY%$3c2K(I6As4DS?_GUJlhQ!Vji$Rs6$y9lpo|T>w7|hl6E5}B$d%n0sfZv<a3(um
z6<;qRVVB1$nE}(k(@3SY^L5&aKgBpn4?AzyzXPQPQ}9ARNm5~`3PH@`&Rv!G*6&j!
z{V*$-!6Q(LiIj*sp{qn3B5ACQ7T%2B=uQTovb#r{!Sw+S`r-sQoh4y>fQRy9Fyz2~
z83#=#LaHnf1th^k*<o}w3D|OX)SLtn@-US^I4);^RK5=p7oq$X3H5?EAaoFSl}3p%
z6LeUX>p|ux8!!8pfHE!)x*%=_hAddl)P%4h4%&8!5-W#xqqb}c=H(i|wqcIS&oDQ{
zhI7N-$f$ra3=RjPmMh?-IEkJYQ<}R9Z!}wmp$#~Uc%u1oh#TP}wF*kJJmQX2#27kL
z_dz(yKufo<=m71bZfLp^Ll#t3(IHkrgMcvx@~om%Ib(h(<$Da7urTI`x|%`wD--sN
zJEEa>4DGSEG?0ulkosfj8IMNN4)B=ZtvGG{|4Fp=Xhg!wPNgYzS>{Bp%%Qa+624X@
X49Luk)baa85H9$5YCsTPT`SVRWMtMW

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f371643eed..05679dc3c1 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c81..744e882ed5 100755
--- a/gradlew
+++ b/gradlew
@@ -72,7 +72,7 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MINGW* )
+  MSYS* | MINGW* )
     msys=true
     ;;
   NONSTOP* )

From b7f66c8aff0e6f1328c7c7e3d445279197d056b3 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 9 Aug 2021 09:34:56 +0200
Subject: [PATCH 299/665] Update README.md

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e894869f7..aaec7ece62 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,9 @@ It extends the [observer pattern](http://en.wikipedia.org/wiki/Observer_pattern)
 #### Version 3.x ([Javadoc](http://reactivex.io/RxJava/3.x/javadoc/))
 
 - single dependency: [Reactive-Streams](https://github.com/reactive-streams/reactive-streams-jvm)  
-- Java 8+ ([Android](https://github.com/ReactiveX/RxAndroid) desugar friendly)
+- Java 8+ or Android API 21+ required
 - Java 8 lambda-friendly API
+- [Android](https://github.com/ReactiveX/RxAndroid) desugar friendly
 - fixed API mistakes and many limits of RxJava 2
 - intended to be a replacement for RxJava 2 with relatively few binary incompatible changes
 - non-opinionated about the source of concurrency (threads, pools, event loops, fibers, actors, etc.)

From 94743c1d07d576af87a899a0c0af0cdf036aa26b Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 14 Aug 2021 11:46:48 +0200
Subject: [PATCH 300/665] Add .editorconfig to .gitignore

---
 .gitignore | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 47c637dd8e..b60171cf2d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,4 +76,7 @@ bin/
 test-output/
 
 # Checkstyle local config
-.checkstyle
\ No newline at end of file
+.checkstyle
+
+# Some editor's config
+.editorconfig

From 839917a60982e30bf5ad8d1cb1f2e77b470c1614 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Sat, 14 Aug 2021 18:04:48 +0800
Subject: [PATCH 301/665] Disable publish action in forked repository (#7313)

---
 .github/workflows/gradle_snapshot.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 595de5809d..9bf638ef9e 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -11,6 +11,7 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    if: github.repository == 'ReactiveX/RxJava'
     env:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}

From 1d81a9036ffa960df6190fbdfb30a9db88eb3316 Mon Sep 17 00:00:00 2001
From: Goooler <wangzongler@gmail.com>
Date: Tue, 17 Aug 2021 20:35:17 +0800
Subject: [PATCH 302/665] Update gradle 7.2 (#7314)

---
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  | 257 ++++++++++++++---------
 2 files changed, 154 insertions(+), 105 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 05679dc3c1..ffed3a254e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 744e882ed5..1b6c787337 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

From 3e77f5c68e71e580f85009c48b5f1afdbbcbc606 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 09:27:59 +0200
Subject: [PATCH 303/665] Bump mockito-core from 3.11.2 to 3.12.1 (#7316)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.11.2 to 3.12.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.11.2...v3.12.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 367a9b3678..7c8a718417 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "3.11.2"
+    mockitoVersion = "3.12.1"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"
 }

From 001ea40a9f67863898a8651e21d046cab3e49e99 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Aug 2021 08:29:27 +0200
Subject: [PATCH 304/665] Bump codecov/codecov-action from 2.0.2 to 2.0.3
 (#7321)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2.0.2 to 2.0.3.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v2.0.2...v2.0.3)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index c7a6186f7c..5d58c3d508 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.2
+      uses: codecov/codecov-action@v2.0.3
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index c923c33b5f..8c1c961ad7 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.2
+      uses: codecov/codecov-action@v2.0.3
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index bc8b325ceb..55ae0858c0 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.2
+      uses: codecov/codecov-action@v2.0.3
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 9bf638ef9e..f13777798a 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -42,7 +42,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.2
+      uses: codecov/codecov-action@v2.0.3
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 804b8ef36b83b7a1645307e1edf2bc15800b7090 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Aug 2021 08:30:28 +0200
Subject: [PATCH 305/665] Bump mockito-core from 3.12.1 to 3.12.3 (#7322)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.1 to 3.12.3.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.1...v3.12.3)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7c8a718417..41e03a78cb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "3.12.1"
+    mockitoVersion = "3.12.3"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"
 }

From 80c83a4e000f0d054ea88a3bd500d36c2c041b05 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 25 Aug 2021 20:14:25 +0200
Subject: [PATCH 306/665] 3.x: Standardize many of the operator fusion
 interfaces & queues (#7320)

---
 .../io/reactivex/rxjava3/core/Flowable.java   |  2 +-
 .../io/reactivex/rxjava3/core/Observable.java |  2 +-
 .../internal/disposables/EmptyDisposable.java |  2 +-
 .../fuseable/AbstractEmptyQueueFuseable.java  |  3 +++
 .../fuseable/CancellableQueueFuseable.java    |  2 ++
 .../internal/jdk8/FlowableFlatMapStream.java  |  6 +++--
 .../internal/jdk8/FlowableFromStream.java     |  3 ++-
 .../internal/jdk8/FlowableMapOptional.java    |  2 +-
 .../internal/jdk8/ObservableFromStream.java   |  2 +-
 .../internal/jdk8/ParallelMapOptional.java    |  2 +-
 .../internal/jdk8/ParallelMapTryOptional.java |  2 +-
 .../observers/BasicFuseableObserver.java      |  2 +-
 .../observers/BasicIntQueueDisposable.java    |  2 +-
 .../observers/BasicQueueDisposable.java       |  2 +-
 .../observers/InnerQueuedObserver.java        |  4 +++-
 .../observers/QueueDrainObserver.java         |  2 +-
 .../completable/CompletableConcat.java        |  3 +--
 .../flowable/BlockingFlowableIterable.java    |  2 +-
 .../flowable/FlowableBufferBoundary.java      |  2 +-
 .../flowable/FlowableCombineLatest.java       |  2 +-
 .../operators/flowable/FlowableConcatMap.java |  5 ++--
 .../flowable/FlowableConcatMapEager.java      |  4 ++--
 .../flowable/FlowableConcatMapScheduler.java  |  5 ++--
 .../operators/flowable/FlowableCreate.java    |  4 ++--
 .../operators/flowable/FlowableDistinct.java  |  2 +-
 .../FlowableDistinctUntilChanged.java         |  2 +-
 .../flowable/FlowableDoAfterNext.java         |  2 +-
 .../operators/flowable/FlowableDoFinally.java |  3 ++-
 .../operators/flowable/FlowableDoOnEach.java  |  2 +-
 .../operators/flowable/FlowableEmpty.java     |  2 +-
 .../operators/flowable/FlowableFilter.java    |  3 ++-
 .../operators/flowable/FlowableFlatMap.java   |  3 +--
 .../flowable/FlowableFlatMapMaybe.java        |  2 +-
 .../flowable/FlowableFlatMapSingle.java       |  2 +-
 .../flowable/FlowableFlattenIterable.java     |  5 ++--
 .../operators/flowable/FlowableFromArray.java |  2 +-
 .../flowable/FlowableFromIterable.java        |  2 +-
 .../operators/flowable/FlowableGroupBy.java   |  2 +-
 .../operators/flowable/FlowableGroupJoin.java |  4 ++--
 .../flowable/FlowableIgnoreElements.java      |  2 +-
 .../operators/flowable/FlowableJoin.java      |  4 ++--
 .../operators/flowable/FlowableJust.java      |  2 +-
 .../operators/flowable/FlowableMap.java       |  2 +-
 .../flowable/FlowableMergeWithMaybe.java      |  4 ++--
 .../flowable/FlowableMergeWithSingle.java     |  4 ++--
 .../operators/flowable/FlowableObserveOn.java |  6 +++--
 .../FlowableOnBackpressureBuffer.java         |  3 +--
 .../operators/flowable/FlowablePublish.java   |  4 +++-
 .../flowable/FlowablePublishMulticast.java    |  3 ++-
 .../operators/flowable/FlowableRange.java     |  2 +-
 .../operators/flowable/FlowableRangeLong.java |  2 +-
 .../operators/flowable/FlowableScanSeed.java  |  4 ++--
 .../flowable/FlowableSequenceEqual.java       |  5 ++--
 .../flowable/FlowableSequenceEqualSingle.java |  1 +
 .../flowable/FlowableSkipLastTimed.java       |  2 +-
 .../operators/flowable/FlowableSkipUntil.java |  2 +-
 .../operators/flowable/FlowableSwitchMap.java |  5 ++--
 .../flowable/FlowableTakeLastTimed.java       |  2 +-
 .../operators/flowable/FlowableWindow.java    |  2 +-
 .../FlowableWindowBoundarySelector.java       |  2 +-
 .../flowable/FlowableWindowTimed.java         |  2 +-
 .../flowable/FlowableWithLatestFrom.java      |  2 +-
 .../flowable/FlowableWithLatestFromMany.java  |  2 +-
 .../operators/flowable/FlowableZip.java       |  5 ++--
 .../internal/operators/maybe/MaybeEmpty.java  |  2 +-
 .../internal/operators/maybe/MaybeJust.java   |  2 +-
 .../operators/maybe/MaybeMergeArray.java      |  2 +-
 .../mixed/ConcatMapXMainObserver.java         |  6 +++--
 .../mixed/ConcatMapXMainSubscriber.java       |  6 +++--
 .../mixed/FlowableConcatMapCompletable.java   |  2 +-
 .../mixed/FlowableConcatMapMaybe.java         |  2 +-
 .../mixed/FlowableConcatMapSingle.java        |  2 +-
 .../mixed/ObservableConcatMapCompletable.java |  2 +-
 .../mixed/ObservableConcatMapMaybe.java       |  2 +-
 .../mixed/ObservableConcatMapSingle.java      |  2 +-
 .../BlockingObservableIterable.java           |  2 +-
 .../observable/ObservableBufferBoundary.java  |  2 +-
 .../observable/ObservableCombineLatest.java   |  2 +-
 .../observable/ObservableConcatMap.java       |  5 ++--
 .../observable/ObservableConcatMapEager.java  |  5 ++--
 .../ObservableConcatMapScheduler.java         |  5 ++--
 .../observable/ObservableCreate.java          |  4 ++--
 .../observable/ObservableDoFinally.java       |  2 +-
 .../operators/observable/ObservableEmpty.java |  2 +-
 .../observable/ObservableFlatMap.java         |  3 +--
 .../observable/ObservableFlatMapMaybe.java    |  2 +-
 .../observable/ObservableFlatMapSingle.java   |  2 +-
 .../observable/ObservableGroupBy.java         |  2 +-
 .../observable/ObservableGroupJoin.java       |  2 +-
 .../operators/observable/ObservableJoin.java  |  2 +-
 .../operators/observable/ObservableJust.java  |  2 +-
 .../observable/ObservableMergeWithMaybe.java  |  4 ++--
 .../observable/ObservableMergeWithSingle.java |  4 ++--
 .../observable/ObservableObserveOn.java       |  5 ++--
 .../observable/ObservableScalarXMap.java      |  2 +-
 .../observable/ObservableSequenceEqual.java   |  2 +-
 .../ObservableSequenceEqualSingle.java        |  2 +-
 .../observable/ObservableSkipLastTimed.java   |  2 +-
 .../observable/ObservableSwitchMap.java       |  5 ++--
 .../observable/ObservableTakeLastTimed.java   |  2 +-
 .../ObservableWindowBoundarySelector.java     |  2 +-
 .../observable/ObservableWindowTimed.java     |  2 +-
 .../operators/observable/ObservableZip.java   |  2 +-
 .../parallel/ParallelDoOnNextTry.java         |  2 +-
 .../operators/parallel/ParallelFilter.java    |  2 +-
 .../operators/parallel/ParallelFilterTry.java |  2 +-
 .../parallel/ParallelFromPublisher.java       |  5 ++--
 .../operators/parallel/ParallelJoin.java      |  5 ++--
 .../operators/parallel/ParallelMap.java       |  2 +-
 .../operators/parallel/ParallelMapTry.java    |  2 +-
 .../operators/parallel/ParallelRunOn.java     |  4 ++--
 .../internal/queue/MpscLinkedQueue.java       |  2 +-
 .../BasicFuseableConditionalSubscriber.java   |  3 ++-
 .../subscribers/BasicFuseableSubscriber.java  |  2 +-
 .../subscribers/InnerQueuedSubscriber.java    |  3 ++-
 .../subscribers/QueueDrainSubscriber.java     |  2 +-
 .../BasicIntQueueSubscription.java            |  2 +-
 .../subscriptions/BasicQueueSubscription.java |  2 +-
 .../subscriptions/EmptySubscription.java      |  2 +-
 .../subscriptions/ScalarSubscription.java     |  2 +-
 .../internal/util/QueueDrainHelper.java       |  3 +--
 .../ConditionalSubscriber.java                |  8 +++----
 .../QueueDisposable.java                      | 24 +++++++++----------
 .../fuseable => operators}/QueueFuseable.java |  5 ++--
 .../QueueSubscription.java                    | 23 +++++++++---------
 .../ScalarSupplier.java                       |  3 ++-
 .../SimplePlainQueue.java                     |  5 ++--
 .../fuseable => operators}/SimpleQueue.java   | 11 ++++++---
 .../queue => operators}/SpscArrayQueue.java   | 10 ++++++--
 .../SpscLinkedArrayQueue.java                 | 19 +++++++++++++--
 .../rxjava3/operators/package-info.java       | 18 ++++++++++++++
 .../processors/MulticastProcessor.java        |  3 +--
 .../rxjava3/processors/UnicastProcessor.java  |  4 ++--
 .../rxjava3/subjects/UnicastSubject.java      |  4 ++--
 .../flowable/FlowableFuseableTest.java        |  2 +-
 .../disposables/EmptyDisposableTest.java      |  2 +-
 .../internal/jdk8/FlowableFromStreamTest.java |  4 +++-
 .../jdk8/FlowableMapOptionalTest.java         |  2 +-
 .../MaybeFlattenStreamAsFlowableTest.java     |  3 ++-
 .../MaybeFlattenStreamAsObservableTest.java   |  3 ++-
 .../jdk8/ObservableFromStreamTest.java        |  4 +++-
 .../jdk8/ObservableMapOptionalTest.java       |  2 +-
 .../SingleFlattenStreamAsFlowableTest.java    |  3 ++-
 .../SingleFlattenStreamAsObservableTest.java  |  3 ++-
 .../observers/DeferredScalarObserverTest.java |  3 ++-
 .../observers/QueueDrainObserverTest.java     |  2 +-
 .../flowable/FlowableCombineLatestTest.java   |  2 +-
 .../flowable/FlowableDistinctTest.java        |  3 ++-
 .../FlowableDistinctUntilChangedTest.java     |  2 +-
 .../flowable/FlowableDoAfterNextTest.java     |  2 +-
 .../flowable/FlowableDoFinallyTest.java       |  3 ++-
 .../flowable/FlowableDoOnEachTest.java        |  3 ++-
 .../flowable/FlowableFilterTest.java          |  3 ++-
 .../FlowableFlatMapCompletableTest.java       |  3 ++-
 .../flowable/FlowableFlattenIterableTest.java |  3 ++-
 .../flowable/FlowableFromActionTest.java      |  2 +-
 .../flowable/FlowableFromArrayTest.java       |  2 +-
 .../flowable/FlowableFromCompletableTest.java |  1 +
 .../flowable/FlowableFromIterableTest.java    |  4 +++-
 .../flowable/FlowableFromMaybeTest.java       |  2 +-
 .../flowable/FlowableFromRunnableTest.java    |  2 +-
 .../flowable/FlowableFromSingleTest.java      |  2 +-
 .../flowable/FlowableGroupByTest.java         |  2 +-
 .../flowable/FlowableIgnoreElementsTest.java  |  3 ++-
 .../operators/flowable/FlowableMapTest.java   |  3 ++-
 .../flowable/FlowableObserveOnTest.java       |  4 +++-
 .../FlowableOnBackpressureBufferTest.java     |  2 +-
 .../FlowablePublishMulticastTest.java         |  2 +-
 .../flowable/FlowableRangeLongTest.java       |  2 +-
 .../operators/flowable/FlowableRangeTest.java |  2 +-
 .../operators/flowable/FlowableZipTest.java   |  2 +-
 .../operators/maybe/MaybeEmptyTest.java       |  2 +-
 .../MaybeFlatMapIterableFlowableTest.java     |  3 ++-
 .../MaybeFlatMapIterableObservableTest.java   |  3 ++-
 .../operators/maybe/MaybeHideTest.java        |  2 +-
 .../operators/maybe/MaybeJustTest.java        |  2 +-
 .../operators/maybe/MaybeMergeArrayTest.java  |  3 ++-
 .../observable/ObservableDistinctTest.java    |  3 ++-
 .../ObservableDistinctUntilChangedTest.java   |  2 +-
 .../observable/ObservableDoAfterNextTest.java |  2 +-
 .../observable/ObservableDoFinallyTest.java   |  3 ++-
 .../observable/ObservableDoOnEachTest.java    |  2 +-
 .../observable/ObservableFilterTest.java      |  2 +-
 .../ObservableFlatMapCompletableTest.java     |  3 ++-
 .../observable/ObservableFromActionTest.java  |  2 +-
 .../ObservableFromCompletableTest.java        |  1 +
 .../ObservableFromIterableTest.java           |  3 ++-
 .../observable/ObservableFromMaybeTest.java   |  2 +-
 .../ObservableFromRunnableTest.java           |  2 +-
 .../observable/ObservableFromSingleTest.java  |  2 +-
 .../observable/ObservableFromTest.java        |  3 ++-
 .../observable/ObservableMapTest.java         |  2 +-
 .../observable/ObservableObserveOnTest.java   |  4 +++-
 .../observable/ObservableRangeLongTest.java   |  2 +-
 .../observable/ObservableRangeTest.java       |  2 +-
 .../observable/ObservableScalarXMapTest.java  |  2 +-
 .../SingleFlatMapIterableFlowableTest.java    |  3 ++-
 .../SingleFlatMapIterableObservableTest.java  |  3 ++-
 ...asicFuseableConditionalSubscriberTest.java |  3 ++-
 .../subscribers/QueueDrainSubscriberTest.java |  2 +-
 .../DeferredScalarSubscriptionTest.java       |  2 +-
 .../internal/util/QueueDrainHelperTest.java   |  2 +-
 .../io/reactivex/rxjava3/maybe/MaybeTest.java |  2 +-
 .../observable/ObservableFuseableTest.java    |  2 +-
 .../queue => operators}/SimpleQueueTest.java  |  3 ++-
 .../parallel/ParallelFromPublisherTest.java   |  3 ++-
 .../rxjava3/parallel/ParallelMapTest.java     |  2 +-
 .../processors/AsyncProcessorTest.java        |  2 +-
 .../processors/UnicastProcessorTest.java      |  2 +-
 .../rxjava3/subjects/AsyncSubjectTest.java    |  2 +-
 .../rxjava3/subjects/UnicastSubjectTest.java  |  2 +-
 .../testsupport/BaseTestConsumerEx.java       |  3 ++-
 .../rxjava3/testsupport/TestHelper.java       |  6 ++++-
 .../rxjava3/testsupport/TestObserverEx.java   |  3 ++-
 .../testsupport/TestObserverExTest.java       |  2 +-
 .../rxjava3/testsupport/TestSubscriberEx.java |  3 ++-
 .../testsupport/TestSubscriberExTest.java     |  2 +-
 217 files changed, 401 insertions(+), 277 deletions(-)
 rename src/main/java/io/reactivex/rxjava3/{internal/fuseable => operators}/ConditionalSubscriber.java (85%)
 rename src/main/java/io/reactivex/rxjava3/{internal/fuseable => operators}/QueueDisposable.java (71%)
 rename src/main/java/io/reactivex/rxjava3/{internal/fuseable => operators}/QueueFuseable.java (95%)
 rename src/main/java/io/reactivex/rxjava3/{internal/fuseable => operators}/QueueSubscription.java (71%)
 rename src/main/java/io/reactivex/rxjava3/{internal/fuseable => operators}/ScalarSupplier.java (96%)
 rename src/main/java/io/reactivex/rxjava3/{internal/fuseable => operators}/SimplePlainQueue.java (84%)
 rename src/main/java/io/reactivex/rxjava3/{internal/fuseable => operators}/SimpleQueue.java (85%)
 rename src/main/java/io/reactivex/rxjava3/{internal/queue => operators}/SpscArrayQueue.java (93%)
 rename src/main/java/io/reactivex/rxjava3/{internal/queue => operators}/SpscLinkedArrayQueue.java (95%)
 create mode 100644 src/main/java/io/reactivex/rxjava3/operators/package-info.java
 rename src/test/java/io/reactivex/rxjava3/{internal/queue => operators}/SimpleQueueTest.java (97%)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 31827d9e1c..096486bd7b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -25,7 +25,6 @@
 import io.reactivex.rxjava3.flowables.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
 import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable;
@@ -35,6 +34,7 @@
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscribers.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.*;
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index be33a95e3f..37641d438e 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -24,7 +24,6 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
 import io.reactivex.rxjava3.internal.jdk8.*;
 import io.reactivex.rxjava3.internal.observers.*;
 import io.reactivex.rxjava3.internal.operators.flowable.*;
@@ -35,6 +34,7 @@
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.observables.*;
 import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.*;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java
index f2fe41e6d3..fdb30932ed 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposable.java
@@ -15,7 +15,7 @@
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
 
 /**
  * Represents a stateless empty Disposable that reports being always
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java
index e04dcbd983..13732bd426 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/AbstractEmptyQueueFuseable.java
@@ -14,6 +14,9 @@
 package io.reactivex.rxjava3.internal.fuseable;
 
 import io.reactivex.rxjava3.annotations.NonNull;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * Represents an empty, async-only {@link QueueFuseable} instance.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java b/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java
index 61d038460d..71f993e226 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/fuseable/CancellableQueueFuseable.java
@@ -13,6 +13,8 @@
 
 package io.reactivex.rxjava3.internal.fuseable;
 
+import io.reactivex.rxjava3.operators.QueueFuseable;
+
 /**
  * Represents an empty, async-only {@link QueueFuseable} instance that tracks and exposes a
  * canceled/disposed state.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
index abd8eaeb08..35292bb17c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
@@ -23,10 +23,12 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
index a9f14d0d6a..4fd3b4eb00 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStream.java
@@ -23,9 +23,10 @@
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java
index 273a17b90c..cc4ff8bdf5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptional.java
@@ -19,8 +19,8 @@
 
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscribers.*;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 
 /**
  * Map the upstream values into an Optional and emit its value if any.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java
index 8a8873ce22..169eeb0bcc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStream.java
@@ -21,7 +21,7 @@
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java
index b7446a38a0..a31be9a75e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapOptional.java
@@ -19,8 +19,8 @@
 
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java
index d6f1fd8217..d463c7bbab 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/ParallelMapTryOptional.java
@@ -19,8 +19,8 @@
 
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.parallel.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java
index 45d3be7841..6bd12f3940 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicFuseableObserver.java
@@ -17,7 +17,7 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java
index f0a6d6f31f..726db3ae96 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicIntQueueDisposable.java
@@ -15,7 +15,7 @@
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
 
 /**
  * An abstract QueueDisposable implementation, extending an AtomicInteger,
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java
index 1bb3ff3d38..0daaf520a5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/BasicQueueDisposable.java
@@ -13,7 +13,7 @@
 
 package io.reactivex.rxjava3.internal.observers;
 
-import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
 
 /**
  * An abstract QueueDisposable implementation that defaults all
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java
index 4a1e3436a9..9d6417c0e8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/InnerQueuedObserver.java
@@ -18,8 +18,10 @@
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.QueueDrainHelper;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 
 /**
  * Subscriber that can fuse with the upstream and calls a support interface
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java
index b61397a208..aa25f4286c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserver.java
@@ -17,8 +17,8 @@
 
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
 
 /**
  * Abstract base class for subscribers that hold another subscriber, a queue
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
index ebfe155c3c..d83ce2d398 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
@@ -21,9 +21,8 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class CompletableConcat extends Completable {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
index acb72324f8..a25032e33b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
@@ -22,9 +22,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 public final class BlockingFlowableIterable<T> implements Iterable<T> {
     final Flowable<T> source;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
index 2a9ec53d68..b009b1bc25 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferBoundary.java
@@ -22,9 +22,9 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableBufferBoundary<T, U extends Collection<? super T>, Open, Close>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
index 69ab7a71c5..ac947b9541 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatest.java
@@ -23,9 +23,9 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableMap.MapSubscriber;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
index 6d68ab9455..bf0f0ff163 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
@@ -21,10 +21,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 public final class FlowableConcatMap<T, R> extends AbstractFlowableWithUpstream<T, R> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
index cd4e6f6936..af33ec9281 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
@@ -21,11 +21,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscribers.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class FlowableConcatMapEager<T, R> extends AbstractFlowableWithUpstream<T, R> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
index 9dfb9f59b7..c53ebe0867 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
@@ -21,11 +21,12 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 public final class FlowableConcatMapScheduler<T, R> extends AbstractFlowableWithUpstream<T, R> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
index 02c49bc01c..673fc4bc22 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
@@ -22,10 +22,10 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Cancellable;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableCreate<T> extends Flowable<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
index 588ebd8aa1..7c3c777c26 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinct.java
@@ -22,10 +22,10 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableDistinct<T, K> extends AbstractFlowableWithUpstream<T, T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java
index b73c8b494b..2c597556ec 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChanged.java
@@ -18,8 +18,8 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscribers.*;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 
 public final class FlowableDistinctUntilChanged<T, K> extends AbstractFlowableWithUpstream<T, T> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java
index 92819ec8b0..763e93a54a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNext.java
@@ -18,8 +18,8 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscribers.*;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 
 /**
  * Calls a consumer after pushing the current item to the downstream.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java
index d43173e144..71da853227 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinally.java
@@ -19,8 +19,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Action;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
index 69ecac86c0..3284a2e507 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEach.java
@@ -19,9 +19,9 @@
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscribers.*;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableDoOnEach<T> extends AbstractFlowableWithUpstream<T, T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java
index a5757c29f0..3606ac57d6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableEmpty.java
@@ -16,8 +16,8 @@
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
 import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 
 /**
  * A source Flowable that signals an onSubscribe() + onComplete() only.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java
index 3a58f13023..74a4413e36 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilter.java
@@ -18,8 +18,9 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.functions.Predicate;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscribers.*;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 public final class FlowableFilter<T> extends AbstractFlowableWithUpstream<T, T> {
     final Predicate<? super T> predicate;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
index 58f0b23c02..78c9a9e542 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
@@ -22,10 +22,9 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableFlatMap<T, U> extends AbstractFlowableWithUpstream<T, U> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
index 74bcf80a15..2936fa9066 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapMaybe.java
@@ -23,9 +23,9 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 /**
  * Maps upstream values into MaybeSources and merges their signals into one sequence.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
index f1340c6cae..f5277d603a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapSingle.java
@@ -23,9 +23,9 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 /**
  * Maps upstream values into SingleSources and merges their signals into one sequence.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
index 07c3c2e61a..019a132329 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
@@ -22,10 +22,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableFlattenIterable<T, R> extends AbstractFlowableWithUpstream<T, R> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
index a192ec92fc..1b13bcff3b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArray.java
@@ -17,9 +17,9 @@
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 
 import java.util.Objects;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
index a20a3cfdab..314f0f2f54 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterable.java
@@ -21,9 +21,9 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 
 public final class FlowableFromIterable<T> extends Flowable<T> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
index febc10e76a..344b029018 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
@@ -24,9 +24,9 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.flowables.GroupedFlowable;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableGroupBy<T, K, V> extends AbstractFlowableWithUpstream<T, GroupedFlowable<K, V>> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
index 7060e60733..3021b9ddc5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
@@ -22,10 +22,10 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java
index c380f88750..20f546feee 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElements.java
@@ -17,8 +17,8 @@
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 public final class FlowableIgnoreElements<T> extends AbstractFlowableWithUpstream<T, T> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
index 18bd95b33f..2c269cee4d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
@@ -22,11 +22,11 @@
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableGroupJoin.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends AbstractFlowableWithUpstream<TLeft, R> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java
index 0ed022fc9a..2926d49509 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJust.java
@@ -16,8 +16,8 @@
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
 import io.reactivex.rxjava3.internal.subscriptions.ScalarSubscription;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 
 /**
  * Represents a constant scalar value.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
index f840159b8f..90ad6c2883 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMap.java
@@ -18,8 +18,8 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscribers.*;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 
 import java.util.Objects;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java
index 4309ebe91c..e7581bcaed 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithMaybe.java
@@ -20,10 +20,10 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 /**
  * Merges an Observable and a Maybe by emitting the items of the Observable and the success
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java
index 75d44b195d..b0f3e8b3ed 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMergeWithSingle.java
@@ -20,10 +20,10 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 /**
  * Merges an Observable and a Maybe by emitting the items of the Observable and the success
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
index efdc68c789..4e9f83e41e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
@@ -21,10 +21,12 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableObserveOn<T> extends AbstractFlowableWithUpstream<T, T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
index 665a67d2e1..8261df29dc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
@@ -21,10 +21,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Action;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.*;
 
 public final class FlowableOnBackpressureBuffer<T> extends AbstractFlowableWithUpstream<T, T> {
     final int bufferSize;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
index d6d90c11bf..87f43b762b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
@@ -23,9 +23,11 @@
 import io.reactivex.rxjava3.flowables.ConnectableFlowable;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
index 508dcb623c..c97b8b6bbf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
@@ -21,9 +21,10 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java
index 417e39350b..e2e3b9a6fb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRange.java
@@ -17,9 +17,9 @@
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 
 /**
  * Emits a range of integer values.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java
index 41c8b985e5..3be56da6ef 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLong.java
@@ -17,9 +17,9 @@
 
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.Flowable;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 
 /**
  * Emits a range of long values.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
index f001937512..2ffbc6c8e2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableScanSeed.java
@@ -21,10 +21,10 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableScanSeed<T, R> extends AbstractFlowableWithUpstream<T, R> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
index 30e21b0ebd..0ba38698d6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
@@ -20,10 +20,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.BiPredicate;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 public final class FlowableSequenceEqual<T> extends Flowable<Boolean> {
     final Publisher<? extends T> first;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java
index a13f5c3634..5ede5990f9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqualSingle.java
@@ -25,6 +25,7 @@
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableSequenceEqual.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableSequenceEqualSingle<T> extends Single<Boolean> implements FuseToFlowable<Boolean> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java
index 4f5f045150..66f7d240f5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipLastTimed.java
@@ -19,9 +19,9 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class FlowableSkipLastTimed<T> extends AbstractFlowableWithUpstream<T, T> {
     final long time;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java
index c0cc0688e1..a7c51f9941 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSkipUntil.java
@@ -18,9 +18,9 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 
 public final class FlowableSkipUntil<T, U> extends AbstractFlowableWithUpstream<T, T> {
     final Publisher<U> other;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
index 9c2a0fe78d..1c820570dc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
@@ -21,10 +21,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class FlowableSwitchMap<T, R> extends AbstractFlowableWithUpstream<T, R> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java
index 5ee80e5144..b42b5717ce 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTakeLastTimed.java
@@ -19,9 +19,9 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class FlowableTakeLastTimed<T> extends AbstractFlowableWithUpstream<T, T> {
     final long count;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
index 51e50a98a1..85ab5a5e0b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindow.java
@@ -19,9 +19,9 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
 
 public final class FlowableWindow<T> extends AbstractFlowableWithUpstream<T, Flowable<T>> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
index 3a1390e0fa..394315cd9b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
@@ -22,10 +22,10 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
index 5df3cdc0d3..23ef916fef 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
@@ -23,10 +23,10 @@
 import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
 import io.reactivex.rxjava3.internal.disposables.SequentialDisposable;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
 
 public final class FlowableWindowTimed<T> extends AbstractFlowableWithUpstream<T, Flowable<T>> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
index 56d7bb93fd..cad9f3c0ca 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFrom.java
@@ -21,8 +21,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiFunction;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.subscribers.SerializedSubscriber;
 
 public final class FlowableWithLatestFrom<T, U, R> extends AbstractFlowableWithUpstream<T, R> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
index 959212b381..77d0527729 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWithLatestFromMany.java
@@ -23,9 +23,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
index 12f5ef8ddc..de680b19af 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZip.java
@@ -22,10 +22,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 public final class FlowableZip<T, R> extends Flowable<R> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java
index 32e8a7abdc..a803b84fa9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmpty.java
@@ -15,7 +15,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 
 /**
  * Signals an onComplete.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java
index a1af7c0bc7..7e6fc6dfa6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJust.java
@@ -15,7 +15,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 
 /**
  * Signals a constant value.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
index 754173682b..82f6d62ddf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArray.java
@@ -22,9 +22,9 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.*;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 
 /**
  * Run all MaybeSources of an array at once and signal their values as they become available.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java
index a196c9dbe4..d2d29b1213 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainObserver.java
@@ -18,9 +18,11 @@
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 /**
  * Base class for implementing concatMapX main observers.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
index da6e2eaac7..bd701de40c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
@@ -19,10 +19,12 @@
 
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 
 /**
  * Base class for implementing concatMapX main subscribers.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
index 2aed83e44e..ab93e4c27f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletable.java
@@ -21,8 +21,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 
 /**
  * Maps the upstream items into {@link CompletableSource}s and subscribes to them one after the
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
index 987a4c11d0..944ac69311 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybe.java
@@ -23,8 +23,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 
 /**
  * Maps each upstream item into a {@link MaybeSource}, subscribes to them one after the other terminates
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
index 93f313b137..5c18b6b258 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingle.java
@@ -23,8 +23,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 
 /**
  * Maps each upstream item into a {@link SingleSource}, subscribes to them one after the other terminates
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
index 7f2648d09b..f9d91b170a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapCompletable.java
@@ -21,8 +21,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 
 /**
  * Maps the upstream items into {@link CompletableSource}s and subscribes to them one after the
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
index 58e7258e0c..7e85104dd7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapMaybe.java
@@ -21,8 +21,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 
 /**
  * Maps each upstream item into a {@link MaybeSource}, subscribes to them one after the other terminates
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
index de30e27765..b57940a5e7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ObservableConcatMapSingle.java
@@ -21,8 +21,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 
 /**
  * Maps each upstream item into a {@link SingleSource}, subscribes to them one after the other terminates
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java
index 1d57eeb085..561571febf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/BlockingObservableIterable.java
@@ -20,8 +20,8 @@
 import io.reactivex.rxjava3.core.ObservableSource;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class BlockingObservableIterable<T> implements Iterable<T> {
     final ObservableSource<? extends T> source;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
index ead3bb0171..4b0fafb188 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferBoundary.java
@@ -22,8 +22,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableBufferBoundary<T, U extends Collection<? super T>, Open, Close>
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
index 217af8877c..fded0d0ef5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCombineLatest.java
@@ -21,8 +21,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class ObservableCombineLatest<T, R> extends Observable<R> {
     final ObservableSource<? extends T>[] sources;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
index 63a46d0f00..b8f34df3d7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMap.java
@@ -21,10 +21,11 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.observers.SerializedObserver;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableConcatMap<T, U> extends AbstractObservableWithUpstream<T, U> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
index 1363292116..5a4b1c3a47 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapEager.java
@@ -22,10 +22,11 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.observers.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class ObservableConcatMapEager<T, R> extends AbstractObservableWithUpstream<T, R> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
index 492547d165..1ea59c83c3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableConcatMapScheduler.java
@@ -21,10 +21,11 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.observers.SerializedObserver;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableConcatMapScheduler<T, U> extends AbstractObservableWithUpstream<T, U> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
index b159d1c9b3..1e2e910f0f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCreate.java
@@ -20,9 +20,9 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Cancellable;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableCreate<T> extends Observable<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java
index 0f087d24e8..e6d9031f72 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinally.java
@@ -19,8 +19,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Action;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
 import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java
index 38d40e62ad..7ff9e8b955 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableEmpty.java
@@ -15,7 +15,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 
 public final class ObservableEmpty extends Observable<Object> implements ScalarSupplier<Object> {
     public static final Observable<Object> INSTANCE = new ObservableEmpty();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
index 662c2410d4..d19b505999 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMap.java
@@ -22,9 +22,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.*;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableFlatMap<T, U> extends AbstractObservableWithUpstream<T, U> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
index 323522f021..b8d223d4ac 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapMaybe.java
@@ -21,8 +21,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 /**
  * Maps upstream values into MaybeSources and merges their signals into one sequence.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
index 5e1cae2b1e..985e4fa2d9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapSingle.java
@@ -21,8 +21,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 /**
  * Maps upstream values into SingleSources and merges their signals into one sequence.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
index b00cca4fa1..e1af50378e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupBy.java
@@ -23,8 +23,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.observables.GroupedObservable;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class ObservableGroupBy<T, K, V> extends AbstractObservableWithUpstream<T, GroupedObservable<K, V>> {
     final Function<? super T, ? extends K> keySelector;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
index b6a6537534..4df7fc7bd8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableGroupJoin.java
@@ -23,8 +23,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
index cea80bc624..4a0f95695e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJoin.java
@@ -22,8 +22,8 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableGroupJoin.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableJoin<TLeft, TRight, TLeftEnd, TRightEnd, R> extends AbstractObservableWithUpstream<TLeft, R> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java
index 4cc0036dde..af01eb09bb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableJust.java
@@ -14,8 +14,8 @@
 package io.reactivex.rxjava3.internal.operators.observable;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 
 /**
  * Represents a constant scalar value.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java
index 1b95d8e7be..4e940a74f5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithMaybe.java
@@ -18,9 +18,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 /**
  * Merges an Observable and a Maybe by emitting the items of the Observable and the success
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java
index 6b0ebf6a45..014df98cc2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMergeWithSingle.java
@@ -18,9 +18,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 /**
  * Merges an Observable and a Single by emitting the items of the Observable and the success
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java
index 6585937626..05a0064f41 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOn.java
@@ -18,10 +18,11 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.schedulers.TrampolineScheduler;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableObserveOn<T> extends AbstractObservableWithUpstream<T, T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
index 900a470c48..7ce5bb82f0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMap.java
@@ -21,7 +21,7 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.fuseable.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java
index 69867e0dd3..e79f992243 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqual.java
@@ -20,7 +20,7 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.BiPredicate;
 import io.reactivex.rxjava3.internal.disposables.ArrayCompositeDisposable;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class ObservableSequenceEqual<T> extends Observable<Boolean> {
     final ObservableSource<? extends T> first;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java
index 6b79bc4638..9b51815ce0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSequenceEqualSingle.java
@@ -21,7 +21,7 @@
 import io.reactivex.rxjava3.functions.BiPredicate;
 import io.reactivex.rxjava3.internal.disposables.ArrayCompositeDisposable;
 import io.reactivex.rxjava3.internal.fuseable.FuseToObservable;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableSequenceEqualSingle<T> extends Single<Boolean> implements FuseToObservable<Boolean> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java
index 78f9df81bb..7cc6f34f24 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSkipLastTimed.java
@@ -19,7 +19,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class ObservableSkipLastTimed<T> extends AbstractObservableWithUpstream<T, T> {
     final long time;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
index 8603598688..e213352a05 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
@@ -21,9 +21,10 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.AtomicThrowable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableSwitchMap<T, R> extends AbstractObservableWithUpstream<T, R> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java
index c457be723f..33066f374b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableTakeLastTimed.java
@@ -19,7 +19,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class ObservableTakeLastTimed<T> extends AbstractObservableWithUpstream<T, T> {
     final long count;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
index 9f2f085c7c..cec435839e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowBoundarySelector.java
@@ -23,9 +23,9 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
index 64ecce85a5..2cc96a61a9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableWindowTimed.java
@@ -23,8 +23,8 @@
 import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 
 public final class ObservableWindowTimed<T> extends AbstractObservableWithUpstream<T, Observable<T>> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
index f47028efd7..e1626b4865 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZip.java
@@ -22,7 +22,7 @@
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.disposables.*;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 
 public final class ObservableZip<T, R> extends Observable<R> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
index b8fa314970..b8ff388535 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelDoOnNextTry.java
@@ -17,8 +17,8 @@
 
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.parallel.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
index b775db0ab9..28987a6fc9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilter.java
@@ -17,8 +17,8 @@
 
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Predicate;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
index d27b6801cd..563937e1a6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFilterTry.java
@@ -17,8 +17,8 @@
 
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.parallel.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
index 16f67af730..67c2ed4852 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
@@ -19,10 +19,11 @@
 
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
index c0dc9df522..3152aaeab8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
@@ -19,10 +19,11 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
index fa48833ca5..81d70a01d9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMap.java
@@ -18,8 +18,8 @@
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.exceptions.Exceptions;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
index c48ad17dda..cac64f3711 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelMapTry.java
@@ -17,8 +17,8 @@
 
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.parallel.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
index dbc66f37f8..e9c92a0c24 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
@@ -20,12 +20,12 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.schedulers.SchedulerMultiWorkerSupport;
 import io.reactivex.rxjava3.internal.schedulers.SchedulerMultiWorkerSupport.WorkerCallback;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
index 57ecbfc289..d735ff43c0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
@@ -21,7 +21,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import io.reactivex.rxjava3.annotations.Nullable;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
 
 /**
  * A multi-producer single consumer unbounded queue.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java
index 21728b69f1..645a3171f2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriber.java
@@ -16,8 +16,9 @@
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java
index 3a24967ba9..162a9dbe55 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableSubscriber.java
@@ -17,8 +17,8 @@
 
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.exceptions.Exceptions;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java
index dfc3029c22..f946ec7deb 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/InnerQueuedSubscriber.java
@@ -18,9 +18,10 @@
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.core.FlowableSubscriber;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.QueueDrainHelper;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 
 /**
  * Subscriber that can fuse with the upstream and calls a support interface
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java
index 0fa4273ad2..145882e418 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java
@@ -20,9 +20,9 @@
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.SimplePlainQueue;
 
 /**
  * Abstract base class for subscribers that hold another subscriber, a queue
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java
index ab4a6e749b..46b420354b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicIntQueueSubscription.java
@@ -16,7 +16,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.reactivex.rxjava3.annotations.NonNull;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * Base class extending AtomicInteger (wip or request accounting) and QueueSubscription (fusion).
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java
index a6bde92632..684bdf4e80 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/BasicQueueSubscription.java
@@ -15,7 +15,7 @@
 
 import java.util.concurrent.atomic.AtomicLong;
 
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * Base class extending AtomicLong (wip or request accounting) and QueueSubscription (fusion).
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java
index 75ebe2da30..6b2c033d5e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/EmptySubscription.java
@@ -16,7 +16,7 @@
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.annotations.Nullable;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * An empty subscription that does nothing other than validates the request amount.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java
index c3aa99c7d1..ef1e35e753 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscriptions/ScalarSubscription.java
@@ -18,7 +18,7 @@
 import org.reactivestreams.Subscriber;
 
 import io.reactivex.rxjava3.annotations.Nullable;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * A Subscription that holds a constant value and emits it only when requested.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
index 0204dfa371..a9a2ab4901 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
@@ -22,8 +22,7 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.BooleanSupplier;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.*;
+import io.reactivex.rxjava3.operators.*;
 
 /**
  * Utility class to help with the queue-drain serialization idiom.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java b/src/main/java/io/reactivex/rxjava3/operators/ConditionalSubscriber.java
similarity index 85%
rename from src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java
rename to src/main/java/io/reactivex/rxjava3/operators/ConditionalSubscriber.java
index c597304388..0880d12544 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ConditionalSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/ConditionalSubscriber.java
@@ -11,20 +11,20 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.internal.fuseable;
+package io.reactivex.rxjava3.operators;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.FlowableSubscriber;
 
 /**
- * A Subscriber with an additional {@link #tryOnNext(Object)} method that
- * tells the caller the specified value has been accepted or
- * not.
+ * A {@link FlowableSubscriber} with an additional {@link #tryOnNext(Object)} method that
+ * tells the caller the specified value has been accepted or not.
  *
  * <p>This allows certain queue-drain or source-drain operators
  * to avoid requesting 1 on behalf of a dropped value.
  *
  * @param <T> the value type
+ * @since 3.1.1
  */
 public interface ConditionalSubscriber<@NonNull T> extends FlowableSubscriber<T> {
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java b/src/main/java/io/reactivex/rxjava3/operators/QueueDisposable.java
similarity index 71%
rename from src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java
rename to src/main/java/io/reactivex/rxjava3/operators/QueueDisposable.java
index 3b90d364a2..f293e6e9e7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/QueueDisposable.java
@@ -11,16 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.internal.fuseable;
-
-import java.util.Queue;
+package io.reactivex.rxjava3.operators;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.disposables.Disposable;
 
 /**
- * An interface extending Queue and Disposable and allows negotiating
- * the fusion mode between subsequent operators of the {@code Observable} base reactive type.
+ * An interface extending {@link SimpleQueue} and {@link Disposable} and allows negotiating
+ * the fusion mode between subsequent operators of the {@link Observable} base reactive type.
  * <p>
  * The negotiation happens in subscription time when the upstream
  * calls the {@code onSubscribe} with an instance of this interface. The
@@ -28,30 +26,32 @@
  * with the appropriate mode before calling {@code request()}.
  * <p>
  * In <b>synchronous fusion</b>, all upstream values are either already available or is generated
- * when {@link #poll()} is called synchronously. When the {@link #poll()} returns null,
+ * when {@link #poll()} is called synchronously. When the {@link #poll()} returns {@code null},
  * that is the indication if a terminated stream. In this mode, the upstream won't call the onXXX methods.
  * <p>
  * In <b>asynchronous fusion</b>, upstream values may become available to {@link #poll()} eventually.
- * Upstream signals onError() and onComplete() as usual but onNext may not actually contain
- * the upstream value but have {@code null} instead. Downstream should treat such onNext as indication
- * that {@link #poll()} can be called.
+ * Upstream signals {@code onError()} and {@code onComplete()} as usual, however,
+ * {@code onNext} will be called with {@code null} instead of the actual value.
+ * Downstream should treat such onNext as indication that {@link #poll()} can be called.
  * <p>
- * The general rules for consuming the {@link Queue} interface:
+ * The general rules for consuming the {@link SimpleQueue} interface:
  * <ul>
- * <li> {@link #poll()} has to be called sequentially (from within a serializing drain-loop).</li>
+ * <li> {@link #poll()} and {@link #clear()} has to be called sequentially (from within a serializing drain-loop).</li>
  * <li>In addition, callers of {@link #poll()} should be prepared to catch exceptions.</li>
  * <li>Due to how computation attaches to the {@link #poll()}, {@link #poll()} may return
  * {@code null} even if a preceding {@link #isEmpty()} returned false.</li>
  * </ul>
  * <p>
  * Implementations should only allow calling the following methods and the rest of the
- * {@link Queue} interface methods should throw {@link UnsupportedOperationException}:
+ * {@link SimpleQueue} interface methods should throw {@link UnsupportedOperationException}:
  * <ul>
  * <li>{@link #poll()}</li>
  * <li>{@link #isEmpty()}</li>
  * <li>{@link #clear()}</li>
  * </ul>
  * @param <T> the value type transmitted through the queue
+ * @see QueueSubscription
+ * @since 3.1.1
  */
 public interface QueueDisposable<@NonNull T> extends QueueFuseable<T>, Disposable {
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java b/src/main/java/io/reactivex/rxjava3/operators/QueueFuseable.java
similarity index 95%
rename from src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java
rename to src/main/java/io/reactivex/rxjava3/operators/QueueFuseable.java
index cec2d5cf8e..d295d12f0d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueFuseable.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/QueueFuseable.java
@@ -11,13 +11,14 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.internal.fuseable;
+package io.reactivex.rxjava3.operators;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * Represents a SimpleQueue plus the means and constants for requesting a fusion mode.
+ * Represents a {@link SimpleQueue} plus the means and constants for requesting a fusion mode.
  * @param <T> the value type returned by the SimpleQueue.poll()
+ * @since 3.1.1
  */
 public interface QueueFuseable<@NonNull T> extends SimpleQueue<T> {
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java b/src/main/java/io/reactivex/rxjava3/operators/QueueSubscription.java
similarity index 71%
rename from src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java
rename to src/main/java/io/reactivex/rxjava3/operators/QueueSubscription.java
index 36723ca427..f799dcd014 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/QueueSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/QueueSubscription.java
@@ -11,17 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.internal.fuseable;
-
-import java.util.Queue;
+package io.reactivex.rxjava3.operators;
 
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 
 /**
- * An interface extending Queue and Subscription and allows negotiating
- * the fusion mode between subsequent operators  of the {@code Flowable} base reactive type.
+ * An interface extending {@link SimpleQueue} and {@link Subscription} and allows negotiating
+ * the fusion mode between subsequent operators of the {@link Flowable} base reactive type.
  * <p>
  * The negotiation happens in subscription time when the upstream
  * calls the {@code onSubscribe} with an instance of this interface. The
@@ -34,27 +32,30 @@
  * in this mode. In this mode, the upstream won't call the onXXX methods.
  * <p>
  * In <b>asynchronous fusion</b>, upstream values may become available to {@link #poll()} eventually.
- * Upstream signals onError() and onComplete() as usual but onNext may not actually contain
- * the upstream value but have {@code null} instead. Downstream should treat such onNext as indication
- * that {@link #poll()} can be called. In this mode, the downstream still has to call {@link #request(long)}
+ * Upstream signals {@code onError()} and {@code onComplete()} as usual, however,
+ * {@code onNext} will be called with {@code null} instead of the actual value.
+ * Downstream should treat such onNext as indication that {@link #poll()} can be called.
+ * In this mode, the downstream still has to call {@link #request(long)}
  * to indicate it is prepared to receive more values.
  * <p>
- * The general rules for consuming the {@link Queue} interface:
+ * The general rules for consuming the {@link SimpleQueue} interface:
  * <ul>
- * <li> {@link #poll()} has to be called sequentially (from within a serializing drain-loop).</li>
+ * <li> {@link #poll()} and {@link #clear()} has to be called sequentially (from within a serializing drain-loop).</li>
  * <li>In addition, callers of {@link #poll()} should be prepared to catch exceptions.</li>
  * <li>Due to how computation attaches to the {@link #poll()}, {@link #poll()} may return
  * {@code null} even if a preceding {@link #isEmpty()} returned false.</li>
  * </ul>
  * <p>
  * Implementations should only allow calling the following methods and the rest of the
- * {@link Queue} interface methods should throw {@link UnsupportedOperationException}:
+ * {@link SimpleQueue} interface methods should throw {@link UnsupportedOperationException}:
  * <ul>
  * <li>{@link #poll()}</li>
  * <li>{@link #isEmpty()}</li>
  * <li>{@link #clear()}</li>
  * </ul>
  * @param <T> the value type transmitted through the queue
+ * @see QueueDisposable
+ * @since 3.1.1
  */
 public interface QueueSubscription<@NonNull T> extends QueueFuseable<T>, Subscription {
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java b/src/main/java/io/reactivex/rxjava3/operators/ScalarSupplier.java
similarity index 96%
rename from src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
rename to src/main/java/io/reactivex/rxjava3/operators/ScalarSupplier.java
index 1c8599bfe9..9b79c5c102 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/ScalarSupplier.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/ScalarSupplier.java
@@ -11,7 +11,7 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.internal.fuseable;
+package io.reactivex.rxjava3.operators;
 
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.functions.Supplier;
@@ -30,6 +30,7 @@
  * single-element sources uniformly.
  * <p>
  * @param <T> the scalar value type held by the implementing reactive type
+ * @since 3.1.1
  */
 @FunctionalInterface
 public interface ScalarSupplier<@NonNull T> extends Supplier<T> {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java b/src/main/java/io/reactivex/rxjava3/operators/SimplePlainQueue.java
similarity index 84%
rename from src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java
rename to src/main/java/io/reactivex/rxjava3/operators/SimplePlainQueue.java
index 10baadfedf..7e0cac21f3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimplePlainQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/SimplePlainQueue.java
@@ -11,14 +11,15 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.internal.fuseable;
+package io.reactivex.rxjava3.operators;
 
 import io.reactivex.rxjava3.annotations.*;
 
 /**
- * Override of the SimpleQueue interface with no throws Exception on poll().
+ * Override of the {@link SimpleQueue} interface with no {@code throws Throwable} on {@code poll()}.
  *
  * @param <T> the value type to offer and poll, not null
+ * @since 3.1.1
  */
 public interface SimplePlainQueue<@NonNull T> extends SimpleQueue<T> {
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java b/src/main/java/io/reactivex/rxjava3/operators/SimpleQueue.java
similarity index 85%
rename from src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java
rename to src/main/java/io/reactivex/rxjava3/operators/SimpleQueue.java
index efa09dee8f..a10b7f9a43 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/fuseable/SimpleQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/SimpleQueue.java
@@ -11,19 +11,24 @@
  * the License for the specific language governing permissions and limitations under the License.
  */
 
-package io.reactivex.rxjava3.internal.fuseable;
+package io.reactivex.rxjava3.operators;
 
 import io.reactivex.rxjava3.annotations.*;
 
 /**
- * A minimalist queue interface without the method bloat of java.util.Collection and java.util.Queue.
+ * A simplified interface for offering, polling and clearing a queue.
+ * <p>
+ * This interface does not define most of the {@link java.util.Collection}
+ * or {@link java.util.Queue} methods as the intended usage of {@code SimpleQueue}
+ * does not require support for iteration or introspection.
  *
  * @param <T> the value type to offer and poll, not null
+ * @since 3.1.1
  */
 public interface SimpleQueue<@NonNull T> {
 
     /**
-     * Atomically enqueue a single.
+     * Atomically enqueue a single value.
      * @param value the value to enqueue, not null
      * @return true if successful, false if the value was not enqueued
      * likely due to reaching the queue capacity)
diff --git a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java b/src/main/java/io/reactivex/rxjava3/operators/SpscArrayQueue.java
similarity index 93%
rename from src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java
rename to src/main/java/io/reactivex/rxjava3/operators/SpscArrayQueue.java
index b33d060b66..1e4c2d4f11 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscArrayQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/SpscArrayQueue.java
@@ -16,12 +16,11 @@
  * https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/queues/atomic
  */
 
-package io.reactivex.rxjava3.internal.queue;
+package io.reactivex.rxjava3.operators;
 
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.annotations.Nullable;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.util.Pow2;
 
 /**
@@ -37,6 +36,7 @@
  * </i> This implementation is wait free.
  *
  * @param <E> the element type of the queue
+ * @since 3.1.1
  */
 public final class SpscArrayQueue<E> extends AtomicReferenceArray<E> implements SimplePlainQueue<E> {
     private static final long serialVersionUID = -1296597691183856449L;
@@ -47,6 +47,12 @@ public final class SpscArrayQueue<E> extends AtomicReferenceArray<E> implements
     final AtomicLong consumerIndex;
     final int lookAheadStep;
 
+    /**
+     * Constructs an array-backed queue with the given capacity rounded
+     * up to the next power of 2 size.
+     * @param capacity the maximum number of elements the queue would hold,
+     *                 rounded up to the next power of 2
+     */
     public SpscArrayQueue(int capacity) {
         super(Pow2.roundToPowerOfTwo(capacity));
         this.mask = length() - 1;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java b/src/main/java/io/reactivex/rxjava3/operators/SpscLinkedArrayQueue.java
similarity index 95%
rename from src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java
rename to src/main/java/io/reactivex/rxjava3/operators/SpscLinkedArrayQueue.java
index b199627a08..97fac2253a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/queue/SpscLinkedArrayQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/SpscLinkedArrayQueue.java
@@ -16,18 +16,18 @@
  * https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/queues/atomic
  */
 
-package io.reactivex.rxjava3.internal.queue;
+package io.reactivex.rxjava3.operators;
 
 import java.util.concurrent.atomic.*;
 
 import io.reactivex.rxjava3.annotations.Nullable;
-import io.reactivex.rxjava3.internal.fuseable.SimplePlainQueue;
 import io.reactivex.rxjava3.internal.util.Pow2;
 
 /**
  * A single-producer single-consumer array-backed queue which can allocate new arrays in case the consumer is slower
  * than the producer.
  * @param <T> the contained value type
+ * @since 3.1.1
  */
 public final class SpscLinkedArrayQueue<T> implements SimplePlainQueue<T> {
     static final int MAX_LOOK_AHEAD_STEP = Integer.getInteger("jctools.spsc.max.lookahead.step", 4096);
@@ -45,6 +45,11 @@ public final class SpscLinkedArrayQueue<T> implements SimplePlainQueue<T> {
 
     private static final Object HAS_NEXT = new Object();
 
+    /**
+     * Constructs a linked array-based queue instance with the given
+     * island size rounded up to the next power of 2.
+     * @param bufferSize the maximum number of elements per island
+     */
     public SpscLinkedArrayQueue(final int bufferSize) {
         int p2capacity = Pow2.roundToPowerOfTwo(Math.max(8, bufferSize));
         int mask = p2capacity - 1;
@@ -160,7 +165,13 @@ private T newBufferPoll(AtomicReferenceArray<Object> nextBuffer, final long inde
         return n;
     }
 
+    /**
+     * Returns the next element in this queue without removing it or {@code null}
+     * if this queue is empty
+     * @return the next element or {@code null}
+     */
     @SuppressWarnings("unchecked")
+    @Nullable
     public T peek() {
         final AtomicReferenceArray<Object> buffer = consumerBuffer;
         final long index = lpConsumerIndex();
@@ -186,6 +197,10 @@ public void clear() {
         while (poll() != null || !isEmpty()) { } // NOPMD
     }
 
+    /**
+     * Returns the number of elements in the queue.
+     * @return the number of elements in the queue
+     */
     public int size() {
         /*
          * It is possible for a thread to be interrupted or reschedule between the read of the producer and
diff --git a/src/main/java/io/reactivex/rxjava3/operators/package-info.java b/src/main/java/io/reactivex/rxjava3/operators/package-info.java
new file mode 100644
index 0000000000..93e1ca05be
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/operators/package-info.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+/**
+ * Classes and interfaces for writing advanced operators within and outside RxJava.
+ */
+
+package io.reactivex.rxjava3.operators;
\ No newline at end of file
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index a3200346d3..766e75145d 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -20,10 +20,9 @@
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.functions.ObjectHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
-import io.reactivex.rxjava3.internal.queue.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.*;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
index 60cc033bd6..ad7e7f66b6 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/UnicastProcessor.java
@@ -20,10 +20,10 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.internal.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
index 988f51640e..3092dc73c0 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/UnicastSubject.java
@@ -21,10 +21,10 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
 import io.reactivex.rxjava3.internal.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.SimpleQueue;
 import io.reactivex.rxjava3.internal.observers.BasicIntQueueDisposable;
-import io.reactivex.rxjava3.internal.queue.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.operators.SimpleQueue;
+import io.reactivex.rxjava3.operators.SpscLinkedArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java
index 678fbd93e3..7bf54e8aba 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableFuseableTest.java
@@ -18,7 +18,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class FlowableFuseableTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java b/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java
index 5851b79f88..1f0d370dcd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/disposables/EmptyDisposableTest.java
@@ -18,7 +18,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class EmptyDisposableTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
index edf5a3e546..57a8caf6bf 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFromStreamTest.java
@@ -26,7 +26,9 @@
 import io.reactivex.rxjava3.annotations.NonNull;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
index 04d9bf7e5b..fbffd79001 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableMapOptionalTest.java
@@ -23,9 +23,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java
index a4c31bc1dc..d8377eac60 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsFlowableTest.java
@@ -28,8 +28,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java
index 47e78b08b4..145112987d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/MaybeFlattenStreamAsObservableTest.java
@@ -27,8 +27,9 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java
index c73190c219..2b943e5338 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableFromStreamTest.java
@@ -26,8 +26,10 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFromStreamTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java
index 379477c377..1b0a7f0a7d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/ObservableMapOptionalTest.java
@@ -23,7 +23,7 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java
index 66e68accad..6e74b42370 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsFlowableTest.java
@@ -28,8 +28,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.subjects.SingleSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java
index 6d3bdd8cc5..2c50634823 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/SingleFlattenStreamAsObservableTest.java
@@ -27,8 +27,9 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subjects.SingleSubject;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
index 7e60355601..165de9b467 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/DeferredScalarObserverTest.java
@@ -22,8 +22,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
index 84f43989bb..eb2523a466 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/QueueDrainObserverTest.java
@@ -17,8 +17,8 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.*;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class QueueDrainObserverTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
index 78e776f41e..0f07148179 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCombineLatestTest.java
@@ -30,9 +30,9 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableZipTest.ArgsToString;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
index b05941b678..362283c719 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctTest.java
@@ -27,9 +27,10 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
index 7ad389ec8f..00525b562b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDistinctUntilChangedTest.java
@@ -28,8 +28,8 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
index 3c70726096..1e36eee49f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoAfterNextTest.java
@@ -23,7 +23,7 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
index 0dd123e7e3..79cba18b3d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoFinallyTest.java
@@ -24,7 +24,8 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
index aae4a0b370..484d62c19e 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDoOnEachTest.java
@@ -29,8 +29,9 @@
 import io.reactivex.rxjava3.flowables.ConnectableFlowable;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
index a3c69d1984..4b62f1e2a4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFilterTest.java
@@ -28,8 +28,9 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
index f212607396..5e4e5c8f77 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapCompletableTest.java
@@ -26,8 +26,9 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
index 867c71afb7..27e4ca128d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
@@ -26,10 +26,11 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableFlattenIterable.FlattenIterableSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java
index baee7ea696..5395ae3068 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromActionTest.java
@@ -24,7 +24,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
index bfdf0edef1..d3195ad8b2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromArrayTest.java
@@ -18,7 +18,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.Predicate;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
index 3b789d878f..fc8e4ec977 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromCompletableTest.java
@@ -25,6 +25,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
index b73a3f3d77..5fe804a310 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromIterableTest.java
@@ -30,8 +30,10 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java
index eb6932b07a..d33b9f1e40 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromMaybeTest.java
@@ -19,7 +19,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java
index c376e23adb..19ef5eb018 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromRunnableTest.java
@@ -25,7 +25,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Supplier;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java
index 492e4851bb..1aa1503299 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSingleTest.java
@@ -19,7 +19,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subjects.SingleSubject;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestSubscriberEx;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
index ea906310d5..d0d7dbea44 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupByTest.java
@@ -35,9 +35,9 @@
 import io.reactivex.rxjava3.flowables.GroupedFlowable;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.PublishSubject;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
index db7c46fb06..dfc0e11680 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIgnoreElementsTest.java
@@ -23,8 +23,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.DisposableCompletableObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.subscribers.*;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
index 7bad2decb8..3d77fe5d46 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableMapTest.java
@@ -27,9 +27,10 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
index 59f38eefdd..a4839b4616 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
@@ -31,11 +31,13 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableObserveOn.BaseObserveOnSubscriber;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
index bea1022e3b..5a02218423 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
@@ -26,9 +26,9 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.Schedulers;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
index 625e14770f..0e1bdbbdc0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticastTest.java
@@ -20,9 +20,9 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowablePublishMulticast.*;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.UnicastProcessor;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
index ace5fe8179..bc24ab787c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeLongTest.java
@@ -26,7 +26,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subscribers.*;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
index f34e8f8a0b..53264bddc0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableRangeTest.java
@@ -26,7 +26,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subscribers.*;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
index 4c038dd8c8..47bbd491bd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
@@ -30,8 +30,8 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueSubscription;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.Schedulers;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java
index 2bf3ee5ee2..a219718936 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeEmptyTest.java
@@ -18,7 +18,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 
 public class MaybeEmptyTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
index c4db76e6f4..e4bcaa9f77 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableFlowableTest.java
@@ -24,8 +24,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
index 64b7a55325..d06f626119 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeFlatMapIterableObservableTest.java
@@ -25,8 +25,9 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java
index af5005e4ec..11a1cbb145 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeHideTest.java
@@ -20,7 +20,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java
index f84cd69f65..a49ac11a41 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeJustTest.java
@@ -18,7 +18,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.fuseable.ScalarSupplier;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 
 public class MaybeJustTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
index 09da6295f3..bf4f7313dc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/maybe/MaybeMergeArrayTest.java
@@ -23,8 +23,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeMergeArray.MergeMaybeObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
index 7e4e0dbdb2..178f700db5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctTest.java
@@ -29,8 +29,9 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
index 1ae097579c..7f58ab2f89 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDistinctUntilChangedTest.java
@@ -26,8 +26,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
index d75da532c2..8338d2c9ec 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoAfterNextTest.java
@@ -24,8 +24,8 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
index b72bf1112d..3753b41127 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoFinallyTest.java
@@ -26,7 +26,8 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
index f7eec912e2..1f71d2b0a3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDoOnEachTest.java
@@ -28,8 +28,8 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
index 1d3ad049f0..71585b1c33 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFilterTest.java
@@ -23,7 +23,7 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
index 2cde8014e2..facfb084d1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFlatMapCompletableTest.java
@@ -24,8 +24,9 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.PublishSubject;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java
index 3c1eb5d9bb..eb20166507 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromActionTest.java
@@ -24,8 +24,8 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
index b309796b7e..6cfd2eb0ad 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromCompletableTest.java
@@ -26,6 +26,7 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
index 856de7afe7..b816baf4b0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromIterableTest.java
@@ -29,9 +29,10 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.CrashingIterable;
 import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableFromIterableTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java
index c82dd5d5a7..e0175b4a59 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromMaybeTest.java
@@ -19,8 +19,8 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subjects.MaybeSubject;
 import io.reactivex.rxjava3.testsupport.TestObserverEx;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java
index aebb9da751..b566f66775 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromRunnableTest.java
@@ -25,8 +25,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Supplier;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java
index b6ff7774d8..aaabb513b3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromSingleTest.java
@@ -19,8 +19,8 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subjects.SingleSubject;
 import io.reactivex.rxjava3.testsupport.TestObserverEx;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
index 017d8b4960..639d3c4d14 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableFromTest.java
@@ -21,7 +21,8 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.ScalarSupplier;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
index dca27d4cef..4919a74f0d 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableMapTest.java
@@ -26,7 +26,7 @@
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.UnicastSubject;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
index afbd79afe1..5f41470db0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableObserveOnTest.java
@@ -31,11 +31,13 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableObserveOnTest.DisposeTrackingScheduler;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableObserveOn.ObserveOnObserver;
 import io.reactivex.rxjava3.internal.schedulers.ImmediateThinScheduler;
 import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subjects.*;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
index 6954ec4f3e..c19219cdea 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeLongTest.java
@@ -24,8 +24,8 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableRangeLongTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
index 7e24222444..0f461a7154 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableRangeTest.java
@@ -24,8 +24,8 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.*;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableRangeTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
index 6fe9616dd9..c27b2e17c0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableScalarXMapTest.java
@@ -21,9 +21,9 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.EmptyDisposable;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableScalarXMapTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
index c408387bff..277b9aa13b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableFlowableTest.java
@@ -25,8 +25,9 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
index a170d8c6c3..82448746b8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleFlatMapIterableObservableTest.java
@@ -25,8 +25,9 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Function;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.util.CrashingIterable;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
index 7124405e00..c58d015abc 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/BasicFuseableConditionalSubscriberTest.java
@@ -22,8 +22,9 @@
 
 import io.reactivex.rxjava3.annotations.*;
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class BasicFuseableConditionalSubscriberTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
index f914d46e73..985705b0e7 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriberTest.java
@@ -23,8 +23,8 @@
 import io.reactivex.rxjava3.core.RxJavaTest;
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
diff --git a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
index 046205e79a..7ea8d58c3f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/subscriptions/DeferredScalarSubscriptionTest.java
@@ -18,7 +18,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.RxJavaTest;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
index 0f78a2b9e7..7929ea8782 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/util/QueueDrainHelperTest.java
@@ -27,9 +27,9 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.BooleanSupplier;
-import io.reactivex.rxjava3.internal.queue.SpscArrayQueue;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.SpscArrayQueue;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
diff --git a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
index c1e6ada1d7..acc7066c29 100644
--- a/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/maybe/MaybeTest.java
@@ -30,10 +30,10 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableZipTest.ArgsToString;
 import io.reactivex.rxjava3.internal.operators.maybe.*;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.Schedulers;
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java
index 1d18ee74a6..8de9b9bc0b 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableFuseableTest.java
@@ -18,7 +18,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
 public class ObservableFuseableTest extends RxJavaTest {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java b/src/test/java/io/reactivex/rxjava3/operators/SimpleQueueTest.java
similarity index 97%
rename from src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
rename to src/test/java/io/reactivex/rxjava3/operators/SimpleQueueTest.java
index d712aebfab..b9f998c1de 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/queue/SimpleQueueTest.java
+++ b/src/test/java/io/reactivex/rxjava3/operators/SimpleQueueTest.java
@@ -16,7 +16,7 @@
  * https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/queues/atomic
  */
 
-package io.reactivex.rxjava3.internal.queue;
+package io.reactivex.rxjava3.operators;
 
 import static org.junit.Assert.*;
 
@@ -25,6 +25,7 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.RxJavaTest;
+import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;
 
 public class SimpleQueueTest extends RxJavaTest {
 
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
index 44210442ee..c0aafdd6a6 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
@@ -26,9 +26,10 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscribers.BasicFuseableSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
index 0f9e7ebe87..493b74d34e 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelMapTest.java
@@ -26,8 +26,8 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.ConditionalSubscriber;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.TestHelper;
diff --git a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
index 363b211836..81afc972dc 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/AsyncProcessorTest.java
@@ -26,8 +26,8 @@
 
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
index d55f58e5c7..f65cc46a5e 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/UnicastProcessorTest.java
@@ -25,9 +25,9 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
index f01a7c3ca8..8228b74b5d 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/AsyncSubjectTest.java
@@ -27,8 +27,8 @@
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.Consumer;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.testsupport.*;
 
 public class AsyncSubjectTest extends SubjectTest<Integer> {
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
index 85cb20b48c..8ae618319b 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/UnicastSubjectTest.java
@@ -26,8 +26,8 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.testsupport.*;
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
index 212e10a039..05004dae2e 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
@@ -16,9 +16,10 @@
 import java.util.List;
 
 import io.reactivex.rxjava3.functions.Predicate;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.observers.BaseTestConsumer;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+
 import java.util.Objects;
 
 /**
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 3f72c43976..362b1d165a 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -37,13 +37,17 @@
 import io.reactivex.rxjava3.disposables.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.operators.completable.CompletableToFlowable;
 import io.reactivex.rxjava3.internal.operators.maybe.MaybeToFlowable;
 import io.reactivex.rxjava3.internal.operators.single.SingleToFlowable;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.ExceptionHelper;
 import io.reactivex.rxjava3.observers.BaseTestConsumer;
+import io.reactivex.rxjava3.operators.ConditionalSubscriber;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
+import io.reactivex.rxjava3.operators.SimpleQueue;
 import io.reactivex.rxjava3.parallel.ParallelFlowable;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 import io.reactivex.rxjava3.processors.PublishProcessor;
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
index ce2b050baf..8b09c4e588 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
@@ -18,7 +18,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
-import io.reactivex.rxjava3.internal.fuseable.*;
+import io.reactivex.rxjava3.operators.QueueDisposable;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 
 /**
  * An  extended test Observer that records events and allows making assertions about them.
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
index 278969b37b..127435b515 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
@@ -30,9 +30,9 @@
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.operators.observable.ObservableScalarXMap.ScalarDisposable;
 import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 import io.reactivex.rxjava3.subjects.*;
 
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
index b7f157c777..46b41b3562 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
@@ -18,8 +18,9 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.FlowableSubscriber;
-import io.reactivex.rxjava3.internal.fuseable.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
+import io.reactivex.rxjava3.operators.QueueFuseable;
+import io.reactivex.rxjava3.operators.QueueSubscription;
 
 /**
  * An extended test subscriber that records events and allows making assertions about them.
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
index 26644dbc22..f3d19f9cc7 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberExTest.java
@@ -30,8 +30,8 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
-import io.reactivex.rxjava3.internal.fuseable.QueueFuseable;
 import io.reactivex.rxjava3.internal.subscriptions.*;
+import io.reactivex.rxjava3.operators.QueueFuseable;
 import io.reactivex.rxjava3.processors.*;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 

From 9de33ea8314303d092e70635bbaefcfc6e26639e Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 25 Aug 2021 20:28:52 +0200
Subject: [PATCH 307/665] 3.x: Specify proper OSGi unique bundle symbolic name
 (#7319)

---
 build.gradle | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 41e03a78cb..2a3a2d997c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -89,12 +89,13 @@ jar {
     bnd(
             "Bundle-Name": "rxjava",
             "Bundle-Vendor": "RxJava Contributors",
-            "Bundle-Description": "Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM.",
+            "Bundle-Description": "Reactive Extensions for the JVM - a library for composing asynchronous and event-based programs using observable sequences for the Java VM.",
             "Import-Package": "!org.junit,!junit.framework,!org.mockito.*,!org.testng.*,*",
             "Bundle-DocURL": "https://github.com/ReactiveX/RxJava",
             "Eclipse-ExtensibleAPI": "true",
             "Automatic-Module-Name": "io.reactivex.rxjava3",
-            "Export-Package": "!io.reactivex.rxjava3.internal.*, io.reactivex.rxjava3.*"
+            "Export-Package": "!io.reactivex.rxjava3.internal.*, io.reactivex.rxjava3.*",
+            "Bundle-SymbolicName": "io.reactivex.rxjava3.rxjava"
     )
 }
 

From f3d8583243e81c0b2b3da1870b9430fc85e95f99 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 25 Aug 2021 20:29:09 +0200
Subject: [PATCH 308/665] 3.x: Fix ExecutorScheduler initializing Schedulers
 prematurely (#7323)

* 3.x: Fix ExecutorScheduler initializing Schedulers prematurely

* Add coverage of the holder class
---
 .../schedulers/ExecutorScheduler.java         |  8 +++---
 .../ExecutorSchedulerInternalTest.java        | 27 +++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerInternalTest.java

diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
index c3957fa400..7c7b017988 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
@@ -38,7 +38,9 @@ public final class ExecutorScheduler extends Scheduler {
     @NonNull
     final Executor executor;
 
-    static final Scheduler HELPER = Schedulers.single();
+    static final class SingleHolder {
+        static final Scheduler HELPER = Schedulers.single();
+    }
 
     public ExecutorScheduler(@NonNull Executor executor, boolean interruptibleWorker, boolean fair) {
         this.executor = executor;
@@ -97,7 +99,7 @@ public Disposable scheduleDirect(@NonNull Runnable run, final long delay, final
 
         final DelayedRunnable dr = new DelayedRunnable(decoratedRun);
 
-        Disposable delayed = HELPER.scheduleDirect(new DelayedDispose(dr), delay, unit);
+        Disposable delayed = SingleHolder.HELPER.scheduleDirect(new DelayedDispose(dr), delay, unit);
 
         dr.timed.replace(delayed);
 
@@ -215,7 +217,7 @@ public Disposable schedule(@NonNull Runnable run, long delay, @NonNull TimeUnit
                     return EmptyDisposable.INSTANCE;
                 }
             } else {
-                final Disposable d = HELPER.scheduleDirect(sr, delay, unit);
+                final Disposable d = SingleHolder.HELPER.scheduleDirect(sr, delay, unit);
                 sr.setFuture(new DisposeOnCancel(d));
             }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerInternalTest.java b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerInternalTest.java
new file mode 100644
index 0000000000..64d4d1861c
--- /dev/null
+++ b/src/test/java/io/reactivex/rxjava3/internal/schedulers/ExecutorSchedulerInternalTest.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.internal.schedulers;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.junit.Test;
+
+public class ExecutorSchedulerInternalTest {
+
+    @Test
+    public void helperHolder() {
+        assertNotNull(new ExecutorScheduler.SingleHolder());
+    }
+
+}

From f5ff589fa82d93891f0bdda0a7769063d8fe02e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Aug 2021 08:41:52 +0200
Subject: [PATCH 309/665] Bump mockito-core from 3.12.3 to 3.12.4 (#7325)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.3 to 3.12.4.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.3...v3.12.4)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2a3a2d997c..3a87a423e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "3.12.3"
+    mockitoVersion = "3.12.4"
     jmhLibVersion = "1.21"
     guavaVersion = "30.1.1-jre"
 }

From 939b5ce0bb17dfd1660a5750abe46b9be473d8eb Mon Sep 17 00:00:00 2001
From: hqzxzwb <hqzxzwb@users.noreply.github.com>
Date: Thu, 26 Aug 2021 18:09:37 +0800
Subject: [PATCH 310/665] Align hasCustomOnError behavior of
 CallbackCompletableObserver with LambdaObserver, ConsumerSingleObserver and
 so on (#7326)

Co-authored-by: zhuwenbo <zhuwenbo@bilibili.com>
---
 .../io/reactivex/rxjava3/core/Completable.java    |  6 +-----
 .../observers/CallbackCompletableObserver.java    | 15 +++------------
 .../CallbackCompletableObserverTest.java          |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 2f424fd405..910c7a2fc9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -2996,11 +2996,7 @@ public final Disposable subscribe(
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
     public final Disposable subscribe(@NonNull Action onComplete) {
-        Objects.requireNonNull(onComplete, "onComplete is null");
-
-        CallbackCompletableObserver observer = new CallbackCompletableObserver(onComplete);
-        subscribe(observer);
-        return observer;
+        return subscribe(onComplete, Functions.ON_ERROR_MISSING);
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java b/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java
index f0e0610ead..be2da69160 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserver.java
@@ -20,33 +20,24 @@
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.observers.LambdaConsumerIntrospection;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class CallbackCompletableObserver
 extends AtomicReference<Disposable>
-        implements CompletableObserver, Disposable, Consumer<Throwable>, LambdaConsumerIntrospection {
+        implements CompletableObserver, Disposable, LambdaConsumerIntrospection {
 
     private static final long serialVersionUID = -4361286194466301354L;
 
     final Consumer<? super Throwable> onError;
     final Action onComplete;
 
-    public CallbackCompletableObserver(Action onComplete) {
-        this.onError = this;
-        this.onComplete = onComplete;
-    }
-
     public CallbackCompletableObserver(Consumer<? super Throwable> onError, Action onComplete) {
         this.onError = onError;
         this.onComplete = onComplete;
     }
 
-    @Override
-    public void accept(Throwable e) {
-        RxJavaPlugins.onError(new OnErrorNotImplementedException(e));
-    }
-
     @Override
     public void onComplete() {
         try {
@@ -86,6 +77,6 @@ public boolean isDisposed() {
 
     @Override
     public boolean hasCustomOnError() {
-        return onError != this;
+        return onError != Functions.ON_ERROR_MISSING;
     }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java b/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java
index ee95b5a13e..46c4cc4463 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/observers/CallbackCompletableObserverTest.java
@@ -24,7 +24,7 @@ public final class CallbackCompletableObserverTest extends RxJavaTest {
 
     @Test
     public void emptyActionShouldReportNoCustomOnError() {
-        CallbackCompletableObserver o = new CallbackCompletableObserver(Functions.EMPTY_ACTION);
+        CallbackCompletableObserver o = new CallbackCompletableObserver(Functions.ON_ERROR_MISSING, Functions.EMPTY_ACTION);
 
         assertFalse(o.hasCustomOnError());
     }

From b4769141435295fea36449998cffe6730ef24b56 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 30 Aug 2021 22:24:15 +0200
Subject: [PATCH 311/665] 3.x: Fix javadoc wording of
 {Publish|Behavior}Processor::offer() (#7328)

* 3.x: Fix javadoc wording of {Publish|Behavior}Processor::offer()

* Add subjects and processors to javadoc cleanup
---
 gradle/javadoc_cleanup.gradle                     | 10 ++++++++++
 .../rxjava3/processors/BehaviorProcessor.java     | 15 ++++++---------
 .../rxjava3/processors/PublishProcessor.java      | 15 ++++++---------
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index a391375af4..5f120656e0 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -11,6 +11,16 @@ task javadocCleanup(dependsOn: "javadoc") doLast {
 
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subjects/ReplaySubject.html'))
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/ReplayProcessor.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subjects/PublishSubject.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/PublishProcessor.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subjects/AsyncSubject.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/AsyncProcessor.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subjects/BehaviorSubject.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/BehaviorProcessor.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/MulticastProcessor.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subjects/UnicastSubject.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/processors/UnicastProcessor.html'))
+
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/plugins/RxJavaPlugins.html'))
 
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/parallel/ParallelFlowable.html'))
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index 56c9d881f0..eac40a8a75 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -306,17 +306,14 @@ public void onComplete() {
     }
 
     /**
-     * Tries to emit the item to all currently subscribed Subscribers if all of them
-     * has requested some value, returns false otherwise.
+     * Tries to emit the item to all currently subscribed {@link Subscriber}s if all of them
+     * has requested some value, returns {@code false} otherwise.
      * <p>
-     * This method should be called in a sequential manner just like the onXXX methods
-     * of the PublishProcessor.
-     * <p>
-     * Calling with a null value will terminate the PublishProcessor and a NullPointerException
-     * is signaled to the Subscribers.
+     * This method should be called in a sequential manner just like the {@code onXXX} methods
+     * of this {@code BehaviorProcessor}.
      * <p>History: 2.0.8 - experimental
-     * @param t the item to emit, not null
-     * @return true if the item was emitted to all Subscribers
+     * @param t the item to emit, not {@code null}
+     * @return {@code true} if the item was emitted to all {@code Subscriber}s
      * @throws NullPointerException if {@code t} is {@code null}
      * @since 2.2
      */
diff --git a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
index 79f38a06ec..db6787880f 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
@@ -271,17 +271,14 @@ public void onComplete() {
     }
 
     /**
-     * Tries to emit the item to all currently subscribed Subscribers if all of them
-     * has requested some value, returns false otherwise.
+     * Tries to emit the item to all currently subscribed {@link Subscriber}s if all of them
+     * has requested some value, returns {@code false} otherwise.
      * <p>
-     * This method should be called in a sequential manner just like the onXXX methods
-     * of the PublishProcessor.
-     * <p>
-     * Calling with a null value will terminate the PublishProcessor and a NullPointerException
-     * is signaled to the Subscribers.
+     * This method should be called in a sequential manner just like the {@code onXXX} methods
+     * of this {@code PublishProcessor}.
      * <p>History: 2.0.8 - experimental
-     * @param t the item to emit, not null
-     * @return true if the item was emitted to all Subscribers
+     * @param t the item to emit, not {@code null}
+     * @return {@code true} if the item was emitted to all {@code Subscriber}s
      * @throws NullPointerException if {@code t} is {@code null}
      * @since 2.2
      */

From ce45fc2eec103af5876723b167fb660da6af3a58 Mon Sep 17 00:00:00 2001
From: Zac Sweers <pandanomic@gmail.com>
Date: Mon, 6 Sep 2021 04:17:47 -0400
Subject: [PATCH 312/665] Fix missing nullability on
 Single.subscribe(BiConsumer) (#7331)

---
 src/main/java/io/reactivex/rxjava3/core/Single.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index eb590aa428..ea6a610feb 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -4735,7 +4735,7 @@ public final Disposable subscribe() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public final Disposable subscribe(@NonNull BiConsumer<? super T, ? super Throwable> onCallback) {
+    public final Disposable subscribe(@NonNull BiConsumer<@Nullable ? super T, @Nullable ? super Throwable> onCallback) {
         Objects.requireNonNull(onCallback, "onCallback is null");
 
         BiConsumerSingleObserver<T> observer = new BiConsumerSingleObserver<>(onCallback);

From 476aa5c8667795c686a4212996733840d01a7037 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 6 Sep 2021 14:38:41 +0200
Subject: [PATCH 313/665] 3.x: Add step to JDK 11 build to verify generated
 module-info (#7334)

---
 .github/workflows/gradle_jdk11.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 9b30f8da56..1c49e9ea3c 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -28,6 +28,8 @@ jobs:
         restore-keys: ${{ runner.os }}-gradle-1-
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
+    - name: Verify generated module-info
+      run: ./gradlew -PjavaCompatibility=9 jar
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Generate Javadoc

From abeab97a31980cb9df143c0eabd38908ee225172 Mon Sep 17 00:00:00 2001
From: Andres Almiray <aalmiray@yahoo.com>
Date: Mon, 6 Sep 2021 16:31:14 +0200
Subject: [PATCH 314/665] Add full Java module descriptor (#7241)

---
 build.gradle                     | 14 ++++++++++++--
 src/main/module/module-info.java | 30 ++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 src/main/module/module-info.java

diff --git a/build.gradle b/build.gradle
index 3a87a423e1..d10f73558a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,6 +9,7 @@ plugins {
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "5.3.0"
     id("com.vanniktech.maven.publish") version "0.17.0"
+    id("org.beryx.jar") version "1.2.0"
 }
 
 ext {
@@ -30,6 +31,10 @@ if (releaseTag != null && !releaseTag.isEmpty()) {
     logger.lifecycle("Releasing with version: " + project.version)
 }
 
+group = "io.reactivex.rxjava3"
+version = project.properties["VERSION_NAME"]
+description = "RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM."
+
 repositories {
     mavenCentral()
 }
@@ -52,6 +57,7 @@ java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
+ext.javaCompatibility = JavaVersion.VERSION_1_8
 
 tasks.withType(JavaCompile) {
     options.compilerArgs << "-parameters"
@@ -86,6 +92,8 @@ animalsniffer {
 }
 
 jar {
+    // Cover for bnd still not supporting MR Jars: https://github.com/bndtools/bnd/issues/2227
+    bnd('-fixupmessages': '^Classes found in the wrong directory: \\\\{META-INF/versions/9/module-info\\\\.class=module-info}$')
     bnd(
             "Bundle-Name": "rxjava",
             "Bundle-Vendor": "RxJava Contributors",
@@ -93,10 +101,12 @@ jar {
             "Import-Package": "!org.junit,!junit.framework,!org.mockito.*,!org.testng.*,*",
             "Bundle-DocURL": "https://github.com/ReactiveX/RxJava",
             "Eclipse-ExtensibleAPI": "true",
-            "Automatic-Module-Name": "io.reactivex.rxjava3",
             "Export-Package": "!io.reactivex.rxjava3.internal.*, io.reactivex.rxjava3.*",
-            "Bundle-SymbolicName": "io.reactivex.rxjava3.rxjava"
+            "Bundle-SymbolicName": "io.reactivex.rxjava3.rxjava",
+            "Multi-Release": "true"
     )
+
+    moduleInfoPath = 'src/main/module/module-info.java'
 }
 
 license {
diff --git a/src/main/module/module-info.java b/src/main/module/module-info.java
new file mode 100644
index 0000000000..19b89790d3
--- /dev/null
+++ b/src/main/module/module-info.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+module io.reactivex.rxjava3 {
+    exports io.reactivex.rxjava3.annotations;
+    exports io.reactivex.rxjava3.core;
+    exports io.reactivex.rxjava3.disposables;
+    exports io.reactivex.rxjava3.exceptions;
+    exports io.reactivex.rxjava3.functions;
+    exports io.reactivex.rxjava3.observables;
+    exports io.reactivex.rxjava3.observers;
+    exports io.reactivex.rxjava3.parallel;
+    exports io.reactivex.rxjava3.plugins;
+    exports io.reactivex.rxjava3.processors;
+    exports io.reactivex.rxjava3.schedulers;
+    exports io.reactivex.rxjava3.subjects;
+    exports io.reactivex.rxjava3.subscribers;
+
+    requires org.reactivestreams;
+}
\ No newline at end of file

From 30d45272c11ec96b7f0dbe376e4721c7c39ebf77 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 6 Sep 2021 17:16:54 +0200
Subject: [PATCH 315/665] 3.x: Add missing exports packages, fix param
 overrides (#7336)

---
 build.gradle                     | 5 -----
 src/main/module/module-info.java | 4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index d10f73558a..21459aee74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,10 +31,6 @@ if (releaseTag != null && !releaseTag.isEmpty()) {
     logger.lifecycle("Releasing with version: " + project.version)
 }
 
-group = "io.reactivex.rxjava3"
-version = project.properties["VERSION_NAME"]
-description = "RxJava: Reactive Extensions for the JVM – a library for composing asynchronous and event-based programs using observable sequences for the Java VM."
-
 repositories {
     mavenCentral()
 }
@@ -57,7 +53,6 @@ java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
-ext.javaCompatibility = JavaVersion.VERSION_1_8
 
 tasks.withType(JavaCompile) {
     options.compilerArgs << "-parameters"
diff --git a/src/main/module/module-info.java b/src/main/module/module-info.java
index 19b89790d3..4bed327f1a 100644
--- a/src/main/module/module-info.java
+++ b/src/main/module/module-info.java
@@ -16,9 +16,11 @@
     exports io.reactivex.rxjava3.core;
     exports io.reactivex.rxjava3.disposables;
     exports io.reactivex.rxjava3.exceptions;
+    exports io.reactivex.rxjava3.flowables;
     exports io.reactivex.rxjava3.functions;
     exports io.reactivex.rxjava3.observables;
     exports io.reactivex.rxjava3.observers;
+    exports io.reactivex.rxjava3.operators;
     exports io.reactivex.rxjava3.parallel;
     exports io.reactivex.rxjava3.plugins;
     exports io.reactivex.rxjava3.processors;
@@ -26,5 +28,5 @@
     exports io.reactivex.rxjava3.subjects;
     exports io.reactivex.rxjava3.subscribers;
 
-    requires org.reactivestreams;
+    requires transitive org.reactivestreams;
 }
\ No newline at end of file

From 31ebec676ba10aa44de23643fe263fc8c0544781 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Sep 2021 08:36:36 +0200
Subject: [PATCH 316/665] Bump codecov/codecov-action from 2.0.3 to 2.1.0
 (#7338)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2.0.3 to 2.1.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v2.0.3...v2.1.0)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 5d58c3d508..875051e2c9 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.3
+      uses: codecov/codecov-action@v2.1.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 8c1c961ad7..cba63a5dd5 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.3
+      uses: codecov/codecov-action@v2.1.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 55ae0858c0..4f49eb210e 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.3
+      uses: codecov/codecov-action@v2.1.0
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index f13777798a..963e481866 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -42,7 +42,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.0.3
+      uses: codecov/codecov-action@v2.1.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 03e8ced54ee1b42450ec6a703a06c38ce0ebbd4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Sep 2021 08:36:51 +0200
Subject: [PATCH 317/665] Bump com.vanniktech.maven.publish from 0.17.0 to
 0.18.0 (#7337)

Bumps [com.vanniktech.maven.publish](https://github.com/vanniktech/gradle-maven-publish-plugin) from 0.17.0 to 0.18.0.
- [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases)
- [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.17.0...0.18.0)

---
updated-dependencies:
- dependency-name: com.vanniktech.maven.publish
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 21459aee74..f1f6a223f5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "5.3.0"
-    id("com.vanniktech.maven.publish") version "0.17.0"
+    id("com.vanniktech.maven.publish") version "0.18.0"
     id("org.beryx.jar") version "1.2.0"
 }
 

From 54114b936037071b2874ac21e559506b1a2f99a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Sep 2021 08:33:47 +0200
Subject: [PATCH 318/665] Bump guava from 30.1.1-jre to 31.0-jre (#7340)

Bumps [guava](https://github.com/google/guava) from 30.1.1-jre to 31.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index f1f6a223f5..79fb154882 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.4.0"
     mockitoVersion = "3.12.4"
     jmhLibVersion = "1.21"
-    guavaVersion = "30.1.1-jre"
+    guavaVersion = "31.0-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 15ac5ad778503ffdd31ef17f61889c201d37ddb2 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 27 Sep 2021 14:26:00 +0200
Subject: [PATCH 319/665] 3.x: Javadocs: indicate takeUntil stops on completion
 of other (#7341)

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java       | 6 +++---
 src/main/java/io/reactivex/rxjava3/core/Observable.java     | 6 +++---
 .../io/reactivex/rxjava3/operators/QueueDisposable.java     | 2 +-
 .../io/reactivex/rxjava3/operators/QueueSubscription.java   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 096486bd7b..6cbdf0a412 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -16972,9 +16972,9 @@ public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate)
 
     /**
      * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable} until a second {@link Publisher}
-     * emits an item.
+     * emits an item or completes.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.v3.png" alt="">
+     * <img width="640" height="188" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.takeUntil.p.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator doesn't interfere with backpressure which is determined by the current {@code Flowable}'s backpressure
@@ -16984,7 +16984,7 @@ public final Flowable<T> takeUntil(@NonNull Predicate<? super T> stopPredicate)
      * </dl>
      *
      * @param other
-     *            the {@code Publisher} whose first emitted item will cause {@code takeUntil} to stop emitting items
+     *            the {@code Publisher} whose first emitted item or completion will cause {@code takeUntil} to stop emitting items
      *            from the current {@code Flowable}
      * @param <U>
      *            the type of items emitted by {@code other}
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 37641d438e..2206319b18 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -14028,16 +14028,16 @@ public final Observable<T> takeLast(long time, @NonNull TimeUnit unit, @NonNull
 
     /**
      * Returns an {@code Observable} that emits the items emitted by the current {@code Observable} until a second {@link ObservableSource}
-     * emits an item.
+     * emits an item or completes.
      * <p>
-     * <img width="640" height="380" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/takeUntil.v3.png" alt="">
+     * <img width="640" height="213" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Observable.takeUntil.o.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code takeUntil} does not operate by default on a particular {@link Scheduler}.</dd>
      * </dl>
      *
      * @param other
-     *            the {@code ObservableSource} whose first emitted item will cause {@code takeUntil} to stop emitting items
+     *            the {@code ObservableSource} whose first emitted item or completion will cause {@code takeUntil} to stop emitting items
      *            from the current {@code Observable}
      * @param <U>
      *            the type of items emitted by {@code other}
diff --git a/src/main/java/io/reactivex/rxjava3/operators/QueueDisposable.java b/src/main/java/io/reactivex/rxjava3/operators/QueueDisposable.java
index f293e6e9e7..97096064d9 100644
--- a/src/main/java/io/reactivex/rxjava3/operators/QueueDisposable.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/QueueDisposable.java
@@ -18,7 +18,7 @@
 
 /**
  * An interface extending {@link SimpleQueue} and {@link Disposable} and allows negotiating
- * the fusion mode between subsequent operators of the {@link Observable} base reactive type.
+ * the fusion mode between subsequent operators of the {@link io.reactivex.rxjava3.core.Observable Observable} base reactive type.
  * <p>
  * The negotiation happens in subscription time when the upstream
  * calls the {@code onSubscribe} with an instance of this interface. The
diff --git a/src/main/java/io/reactivex/rxjava3/operators/QueueSubscription.java b/src/main/java/io/reactivex/rxjava3/operators/QueueSubscription.java
index f799dcd014..eae8922992 100644
--- a/src/main/java/io/reactivex/rxjava3/operators/QueueSubscription.java
+++ b/src/main/java/io/reactivex/rxjava3/operators/QueueSubscription.java
@@ -19,7 +19,7 @@
 
 /**
  * An interface extending {@link SimpleQueue} and {@link Subscription} and allows negotiating
- * the fusion mode between subsequent operators of the {@link Flowable} base reactive type.
+ * the fusion mode between subsequent operators of the {@link io.reactivex.rxjava3.core.Flowable Flowable} base reactive type.
  * <p>
  * The negotiation happens in subscription time when the upstream
  * calls the {@code onSubscribe} with an instance of this interface. The

From 6cc3a3be2dcf56988f55ca97bac41d69da02a13a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Sep 2021 08:26:09 +0200
Subject: [PATCH 320/665] Bump guava from 31.0-jre to 31.0.1-jre (#7343)

Bumps [guava](https://github.com/google/guava) from 31.0-jre to 31.0.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 79fb154882..c5fb65afbc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.4.0"
     mockitoVersion = "3.12.4"
     jmhLibVersion = "1.21"
-    guavaVersion = "31.0-jre"
+    guavaVersion = "31.0.1-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 17e71ab4e6dc432ac536bf5bf193055b32b3fb17 Mon Sep 17 00:00:00 2001
From: Jordan Gout <5838406+keytronic@users.noreply.github.com>
Date: Thu, 30 Sep 2021 07:52:02 +0200
Subject: [PATCH 321/665] Update assert messages format to be compliant with
 GradleRunner and JUnitRunner (#7345)

---
 .../rxjava3/observers/BaseTestConsumer.java      | 16 ++++++++--------
 .../rxjava3/observers/TestObserverTest.java      |  2 +-
 .../rxjava3/testsupport/BaseTestConsumerEx.java  |  2 +-
 .../rxjava3/testsupport/TestObserverEx.java      |  4 ++--
 .../rxjava3/testsupport/TestObserverExTest.java  |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
index 265ea894a5..5807e598ff 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
@@ -307,11 +307,11 @@ private U assertError(@NonNull Predicate<Throwable> errorPredicate, boolean exac
     public final U assertValue(@NonNull T value) {
         int s = values.size();
         if (s != 1) {
-            throw fail("expected: " + valueAndClass(value) + " but was: " + values);
+            throw fail("\nexpected: " + valueAndClass(value) + "\ngot: " + values);
         }
         T v = values.get(0);
         if (!Objects.equals(value, v)) {
-            throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v));
+            throw fail("\nexpected: " + valueAndClass(value) + "\ngot: " + valueAndClass(v));
         }
         return (U)this;
     }
@@ -359,7 +359,7 @@ public final U assertValueAt(int index, @NonNull T value) {
 
         T v = values.get(index);
         if (!Objects.equals(value, v)) {
-            throw fail("expected: " + valueAndClass(value) + " but was: " + valueAndClass(v) + " at position " + index);
+            throw fail("Values at position " + index + " differ;\nexpected: " + valueAndClass(value) + "\ngot: " + valueAndClass(v));
         }
         return (U)this;
     }
@@ -425,7 +425,7 @@ public static String valueAndClass(@Nullable Object o) {
     public final U assertValueCount(int count) {
         int s = values.size();
         if (s != count) {
-            throw fail("Value counts differ; expected: " + count + " but was: " + s);
+            throw fail("Value counts differ;\nexpected: " + count + "\ngot: " + s);
         }
         return (U)this;
     }
@@ -450,14 +450,14 @@ public final U assertNoValues() {
     public final U assertValues(@NonNull T... values) {
         int s = this.values.size();
         if (s != values.length) {
-            throw fail("Value count differs; expected: " + values.length + " " + Arrays.toString(values)
-            + " but was: " + s + " " + this.values);
+            throw fail("Value count differs;\nexpected: " + values.length + " " + Arrays.toString(values)
+            + "\ngot: " + s + " " + this.values);
         }
         for (int i = 0; i < s; i++) {
             T v = this.values.get(i);
             T u = values[i];
             if (!Objects.equals(u, v)) {
-                throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));
+                throw fail("Values at position " + i + " differ;\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v));
             }
         }
         return (U)this;
@@ -504,7 +504,7 @@ public final U assertValueSequence(@NonNull Iterable<? extends T> sequence) {
             T v = actualIterator.next();
 
             if (!Objects.equals(u, v)) {
-                throw fail("Values at position " + i + " differ; expected: " + valueAndClass(u) + " but was: " + valueAndClass(v));
+                throw fail("Values at position " + i + " differ;\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v));
             }
             i++;
         }
diff --git a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
index 576dd4bfb1..cd83664014 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
@@ -999,7 +999,7 @@ public void assertValueAtIndexMatch() {
 
     @Test
     public void assertValueAtIndexNoMatch() {
-        assertThrowsWithMessage("expected: b (class: String) but was: c (class: String) at position 2 (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+        assertThrowsWithMessage("Values at position 2 differ;\nexpected: b (class: String)\ngot: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<String> to = new TestObserver<>();
 
             Observable.just("a", "b", "c").subscribe(to);
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
index 05004dae2e..c06c1afcad 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
@@ -160,7 +160,7 @@ public final U assertErrorMessage(String message) {
             Throwable e = errors.get(0);
             String errorMessage = e.getMessage();
             if (!Objects.equals(message, errorMessage)) {
-                throw fail("Error message differs; exptected: " + message + " but was: " + errorMessage);
+                throw fail("Error message differs;\nexpected: " + message + "\ngot: " + errorMessage);
             }
         } else {
             throw fail("Multiple errors");
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
index 8b09c4e588..b7812c21a8 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
@@ -254,8 +254,8 @@ public final TestObserverEx<T> assertFusionMode(int mode) {
         int m = establishedFusionMode;
         if (m != mode) {
             if (qd != null) {
-                throw new AssertionError("Fusion mode different. Expected: " + fusionModeToString(mode)
-                + ", actual: " + fusionModeToString(m));
+                throw new AssertionError("Fusion mode different.\nexpected: " + fusionModeToString(mode)
+                + "\ngot: " + fusionModeToString(m));
             } else {
                 throw fail("Upstream is not fuseable");
             }
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
index 127435b515..2296ceb757 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverExTest.java
@@ -1274,7 +1274,7 @@ public void assertValueAtIndexMatch() {
 
     @Test
     public void assertValueAtIndexNoMatch() {
-        assertThrows("expected: b (class: String) but was: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+        assertThrows("\nexpected: b (class: String)\ngot: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserverEx<String> to = new TestObserverEx<>();
 
             Observable.just("a", "b", "c").subscribe(to);

From 767c5329c631266ab14266f102d96f74dee2028b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Oct 2021 08:42:07 +0200
Subject: [PATCH 322/665] Bump biz.aQute.bnd.builder from 5.3.0 to 6.0.0
 (#7348)

Bumps [biz.aQute.bnd.builder](https://github.com/bndtools/bnd) from 5.3.0 to 6.0.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/commits/6.0.0)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd.builder
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c5fb65afbc..a59273872f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id("ru.vyarus.animalsniffer") version "1.5.3"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
-    id("biz.aQute.bnd.builder") version "5.3.0"
+    id("biz.aQute.bnd.builder") version "6.0.0"
     id("com.vanniktech.maven.publish") version "0.18.0"
     id("org.beryx.jar") version "1.2.0"
 }

From 49ae9f8c407e93c19457f249f0c5dac45c39e034 Mon Sep 17 00:00:00 2001
From: Anton Pokhyla <57772059+flameshine@users.noreply.github.com>
Date: Tue, 5 Oct 2021 23:37:42 +0300
Subject: [PATCH 323/665] Added required comma to README.md (#7349)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aaec7ece62..7449fa7f8b 100644
--- a/README.md
+++ b/README.md
@@ -526,7 +526,7 @@ APIs marked with the [`@Experimental`][experimental source link] annotation at t
 
 #### @Deprecated
 
-APIs marked with the `@Deprecated` annotation at the class or method level will remain supported until the next major release but it is recommended to stop using them. 
+APIs marked with the `@Deprecated` annotation at the class or method level will remain supported until the next major release, but it is recommended to stop using them. 
 
 #### io.reactivex.rxjava3.internal.*
 

From 1f87a43e3fb19b8b8d6602329c82c9f8de0f8f3a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Oct 2021 08:25:08 +0200
Subject: [PATCH 324/665] Bump mockito-core from 3.12.4 to 4.0.0 (#7350)

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.12.4 to 4.0.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v3.12.4...v4.0.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a59273872f..779328eb66 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "3.12.4"
+    mockitoVersion = "4.0.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.0.1-jre"
 }

From c2bf5148d8cb094a984677813c000c762f0daf50 Mon Sep 17 00:00:00 2001
From: Jordan Gout <5838406+keytronic@users.noreply.github.com>
Date: Thu, 14 Oct 2021 19:30:35 +0200
Subject: [PATCH 325/665] Fix assert message format (#7351)

* Fix assert message format

* Test error messages against regex
---
 .../rxjava3/observers/BaseTestConsumer.java   |  15 ++-
 .../rxjava3/observers/TestObserverTest.java   | 107 +++++++++++++++++-
 .../testsupport/BaseTestConsumerEx.java       |   3 +-
 .../rxjava3/testsupport/TestObserverEx.java   |   4 +-
 .../rxjava3/testsupport/TestSubscriberEx.java |   4 +-
 5 files changed, 121 insertions(+), 12 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
index 5807e598ff..6b3a72fadb 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/BaseTestConsumer.java
@@ -359,7 +359,8 @@ public final U assertValueAt(int index, @NonNull T value) {
 
         T v = values.get(index);
         if (!Objects.equals(value, v)) {
-            throw fail("Values at position " + index + " differ;\nexpected: " + valueAndClass(value) + "\ngot: " + valueAndClass(v));
+            throw fail("\nexpected: " + valueAndClass(value) + "\ngot: " + valueAndClass(v)
+                    + "; Value at position " + index + " differ");
         }
         return (U)this;
     }
@@ -425,7 +426,7 @@ public static String valueAndClass(@Nullable Object o) {
     public final U assertValueCount(int count) {
         int s = values.size();
         if (s != count) {
-            throw fail("Value counts differ;\nexpected: " + count + "\ngot: " + s);
+            throw fail("\nexpected: " + count + "\ngot: " + s + "; Value counts differ");
         }
         return (U)this;
     }
@@ -450,14 +451,15 @@ public final U assertNoValues() {
     public final U assertValues(@NonNull T... values) {
         int s = this.values.size();
         if (s != values.length) {
-            throw fail("Value count differs;\nexpected: " + values.length + " " + Arrays.toString(values)
-            + "\ngot: " + s + " " + this.values);
+            throw fail("\nexpected: " + values.length + " " + Arrays.toString(values)
+                    + "\ngot: " + s + " " + this.values + "; Value count differs");
         }
         for (int i = 0; i < s; i++) {
             T v = this.values.get(i);
             T u = values[i];
             if (!Objects.equals(u, v)) {
-                throw fail("Values at position " + i + " differ;\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v));
+                throw fail("\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v)
+                        + "; Value at position " + i + " differ");
             }
         }
         return (U)this;
@@ -504,7 +506,8 @@ public final U assertValueSequence(@NonNull Iterable<? extends T> sequence) {
             T v = actualIterator.next();
 
             if (!Objects.equals(u, v)) {
-                throw fail("Values at position " + i + " differ;\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v));
+                throw fail("\nexpected: " + valueAndClass(u) + "\ngot: " + valueAndClass(v)
+                + "; Value at position " + i + " differ");
             }
             i++;
         }
diff --git a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
index cd83664014..f2d5f206c3 100644
--- a/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
+++ b/src/test/java/io/reactivex/rxjava3/observers/TestObserverTest.java
@@ -44,6 +44,12 @@ static void assertThrowsWithMessage(String message, Class<? extends Throwable> c
         assertEquals(message, assertThrows(clazz, run).getMessage());
     }
 
+    static void assertThrowsWithMessageMatchRegex(String regex, Class<? extends Throwable> clazz, ThrowingRunnable run) {
+        assertTrue(assertThrows(clazz, run).getMessage().matches(regex));
+    }
+
+    private static final String ASSERT_MESSAGE_REGEX  = "\nexpected: (.*)\n\\s*got: (.*)";
+
     @Test
     public void assertTestObserver() {
         Flowable<Integer> oi = Flowable.fromIterable(Arrays.asList(1, 2));
@@ -999,7 +1005,7 @@ public void assertValueAtIndexMatch() {
 
     @Test
     public void assertValueAtIndexNoMatch() {
-        assertThrowsWithMessage("Values at position 2 differ;\nexpected: b (class: String)\ngot: c (class: String) (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+        assertThrowsWithMessage("\nexpected: b (class: String)\ngot: c (class: String); Value at position 2 differ (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
             TestObserver<String> to = new TestObserver<>();
 
             Observable.just("a", "b", "c").subscribe(to);
@@ -1008,6 +1014,105 @@ public void assertValueAtIndexNoMatch() {
         });
     }
 
+    @Test
+    public void assertValueAtIndexThrowsMessageMatchRegex() {
+        assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b", "c").subscribe(to);
+
+            to.assertValueAt(2, "b");
+        });
+    }
+
+    @Test
+    public void assertValuesCountNoMatch() {
+        assertThrowsWithMessage("\nexpected: 2 [a, b]\ngot: 3 [a, b, c]; Value count differs (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b", "c").subscribe(to);
+
+            to.assertValues("a", "b");
+        });
+    }
+
+    @Test
+    public void assertValuesCountThrowsMessageMatchRegex() {
+        assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b", "c").subscribe(to);
+
+            to.assertValues("a", "b");
+        });
+    }
+
+    @Test
+    public void assertValuesNoMatch() {
+        assertThrowsWithMessage("\nexpected: d (class: String)\ngot: c (class: String); Value at position 2 differ (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b", "c").subscribe(to);
+
+            to.assertValues("a", "b", "d");
+        });
+    }
+
+    @Test
+    public void assertValuesThrowsMessageMatchRegex() {
+        assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b", "c").subscribe(to);
+
+            to.assertValues("a", "b", "d");
+        });
+    }
+
+    @Test
+    public void assertValueCountNoMatch() {
+        assertThrowsWithMessage("\nexpected: 2\ngot: 3; Value counts differ (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b", "c").subscribe(to);
+
+            to.assertValueCount(2);
+        });
+    }
+
+    @Test
+    public void assertValueCountThrowsMessageMatchRegex() {
+        assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b", "c").subscribe(to);
+
+            to.assertValueCount(2);
+        });
+    }
+
+    @Test
+    public void assertValueSequenceNoMatch() {
+        assertThrowsWithMessage("\nexpected: d (class: String)\ngot: c (class: String); Value at position 2 differ (latch = 0, values = 3, errors = 0, completions = 1)", AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b", "c").subscribe(to);
+
+            to.assertValueSequence(Arrays.asList("a", "b", "d"));
+        });
+    }
+
+    @Test
+    public void assertValueSequenceThrowsMessageMatchRegex() {
+        assertThrowsWithMessageMatchRegex(ASSERT_MESSAGE_REGEX, AssertionError.class, () -> {
+            TestObserver<String> to = new TestObserver<>();
+
+            Observable.just("a", "b", "c").subscribe(to);
+
+            to.assertValueSequence(Arrays.asList("a", "b", "d"));
+        });
+    }
+
     @Test
     public void assertValueAtIndexInvalidIndex() {
         assertThrowsWithMessage("Index 2 is out of range [0, 2) (latch = 0, values = 2, errors = 0, completions = 1)", AssertionError.class, () -> {
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
index c06c1afcad..47016f1fa5 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/BaseTestConsumerEx.java
@@ -160,7 +160,8 @@ public final U assertErrorMessage(String message) {
             Throwable e = errors.get(0);
             String errorMessage = e.getMessage();
             if (!Objects.equals(message, errorMessage)) {
-                throw fail("Error message differs;\nexpected: " + message + "\ngot: " + errorMessage);
+                throw fail("\nexpected: " + message + "\ngot: " + errorMessage
+                + "; Error message differs");
             }
         } else {
             throw fail("Multiple errors");
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
index b7812c21a8..f029ce5457 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestObserverEx.java
@@ -254,8 +254,8 @@ public final TestObserverEx<T> assertFusionMode(int mode) {
         int m = establishedFusionMode;
         if (m != mode) {
             if (qd != null) {
-                throw new AssertionError("Fusion mode different.\nexpected: " + fusionModeToString(mode)
-                + "\ngot: " + fusionModeToString(m));
+                throw new AssertionError("\nexpected: " + fusionModeToString(mode)
+                + "\ngot: " + fusionModeToString(m) + "; Fusion mode different");
             } else {
                 throw fail("Upstream is not fuseable");
             }
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
index 46b41b3562..c3d9837c2b 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestSubscriberEx.java
@@ -317,8 +317,8 @@ public final TestSubscriberEx<T> assertFusionMode(int mode) {
         int m = establishedFusionMode;
         if (m != mode) {
             if (qs != null) {
-                throw new AssertionError("Fusion mode different. Expected: " + fusionModeToString(mode)
-                + ", actual: " + fusionModeToString(m));
+                throw new AssertionError("\nexpected: " + fusionModeToString(mode)
+                + "\ngot: " + fusionModeToString(m) + "; Fusion mode different");
             } else {
                 throw fail("Upstream is not fuseable");
             }

From 9b9bcc1d871fe1bccb72d6b0e444759a3a955cee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Oct 2021 09:57:15 +0200
Subject: [PATCH 326/665] Bump actions/checkout from 2.3.4 to 2.3.5 (#7352)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.4 to 2.3.5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.3.4...v2.3.5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 184acdb502..0227e8b78a 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v2.3.5
       - uses: gradle/wrapper-validation-action@v1.0.4
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 875051e2c9..c44d60da1d 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 1c49e9ea3c..115c31c658 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -14,7 +14,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index cba63a5dd5..32b1bbe21d 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 4f49eb210e..ab09ca9951 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -17,7 +17,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 963e481866..d2c3815ba9 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -16,7 +16,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v2.3.5
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:

From f8a8bba675f26ffcae88939daecbac0de46f0003 Mon Sep 17 00:00:00 2001
From: Carl Dea <carl.dea@gmail.com>
Date: Wed, 20 Oct 2021 02:50:06 -0400
Subject: [PATCH 327/665] Using TCK Tested JDK builds of OpenJDK (#7354)

* Using the latest LTS and fixed (major) versions of the OpenJDK. Zulu builds are used b/c it supports archived JDK, LTS, and Non-LTS versions.

Signed-off-by: Carl Dea <carldea@gmail.com>

* Remove matrix and fixed versions of JDK that was used in setup-java GH actions.

Signed-off-by: Carl Dea <carldea@gmail.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index c44d60da1d..fce5e6a9c5 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.6
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 115c31c658..f25f28e417 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -18,7 +18,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.6
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 32b1bbe21d..4c8d78af2e 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.6
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index ab09ca9951..e8f7f222cf 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.6
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index d2c3815ba9..f2fab5fabe 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
-        distribution: 'adopt'
+        distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
       uses: actions/cache@v2.1.6

From 391a89d99ca3de47ad8c58cc6ab44d864a5c0507 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Nov 2021 08:18:53 +0100
Subject: [PATCH 328/665] Bump actions/checkout from 2.3.5 to 2.4.0 (#7356)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2.3.5 to 2.4.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.3.5...v2.4.0)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 0227e8b78a..66ecaec87f 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.5
+      - uses: actions/checkout@v2.4.0
       - uses: gradle/wrapper-validation-action@v1.0.4
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index fce5e6a9c5..9cece4b4c0 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index f25f28e417..a54a513dbd 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -14,7 +14,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 4c8d78af2e..32e5d67e92 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index e8f7f222cf..607e1be145 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -17,7 +17,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index f2fab5fabe..b74812a145 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -16,7 +16,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v2.3.5
+    - uses: actions/checkout@v2.4.0
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:

From c8200dd85925d7c93bcb6bc5bd30ef8667b3ad36 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Nov 2021 10:11:13 +0100
Subject: [PATCH 329/665] Bump ru.vyarus.animalsniffer from 1.5.3 to 1.5.4
 (#7357)

Bumps ru.vyarus.animalsniffer from 1.5.3 to 1.5.4.

---
updated-dependencies:
- dependency-name: ru.vyarus.animalsniffer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 779328eb66..152f502d88 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id("eclipse")
     id("jacoco")
     id("maven-publish")
-    id("ru.vyarus.animalsniffer") version "1.5.3"
+    id("ru.vyarus.animalsniffer") version "1.5.4"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.0.0"

From e1e35b05030ee0b8bc5e7b1b5c7e47b8d7617019 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 10 Nov 2021 11:24:27 +0100
Subject: [PATCH 330/665] Upgrade to Gradle 7.3 (#7359)

---
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew                                  | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ffed3a254e..e750102e09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337..c53aefaa5f 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #

From 223667b37dcd5e33b41d45bc8482c5eabeac8235 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Nov 2021 09:25:15 +0100
Subject: [PATCH 331/665] Bump mockito-core from 4.0.0 to 4.1.0 (#7363)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.0.0...v4.1.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 152f502d88..e8bc3e4984 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "4.0.0"
+    mockitoVersion = "4.1.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.0.1-jre"
 }

From 2540e89f639ee76b04d3b85e075119977bfeb22b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Nov 2021 09:08:54 +0100
Subject: [PATCH 332/665] Bump biz.aQute.bnd.builder from 6.0.0 to 6.1.0
 (#7366)

Bumps [biz.aQute.bnd.builder](https://github.com/bndtools/bnd) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/compare/6.0.0...6.1.0)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd.builder
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e8bc3e4984..90b20f186d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id("ru.vyarus.animalsniffer") version "1.5.4"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
-    id("biz.aQute.bnd.builder") version "6.0.0"
+    id("biz.aQute.bnd.builder") version "6.1.0"
     id("com.vanniktech.maven.publish") version "0.18.0"
     id("org.beryx.jar") version "1.2.0"
 }

From 8ee7799a630ea3bae3ddbebc3c54668a49723e73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Nov 2021 10:58:53 +0100
Subject: [PATCH 333/665] Bump actions/cache from 2.1.6 to 2.1.7 (#7367)

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.6 to 2.1.7.
- [Release notes](https://github.com/actions/cache/releases)
- [Commits](https://github.com/actions/cache/compare/v2.1.6...v2.1.7)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 9cece4b4c0..500e984ff6 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index a54a513dbd..849edb55f8 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -21,7 +21,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 32e5d67e92..d5f4f11194 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 607e1be145..c7ac3316d7 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index b74812a145..fba3058d81 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.6
+      uses: actions/cache@v2.1.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 238ece24b8f1c39c59763bbd16def56a406d505e Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 15 Dec 2021 15:50:47 +0100
Subject: [PATCH 334/665] 3.x: Upgrade to Gradle 7.3.2 (#7374)

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e750102e09..d2880ba800 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 0e065e7a9386f37b57f6a3166c9cffeb8d3ed43b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 Dec 2021 09:53:14 +0100
Subject: [PATCH 335/665] Bump mockito-core from 4.1.0 to 4.2.0 (#7377)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.1.0...v4.2.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 90b20f186d..0bc1327989 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.4.0"
-    mockitoVersion = "4.1.0"
+    mockitoVersion = "4.2.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.0.1-jre"
 }

From 0b58ee5edef5d7d9be67604a4fef66b0d9418deb Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 22 Dec 2021 16:49:31 +0100
Subject: [PATCH 336/665] 3.x: Upgrade to Gradle 7.3.3 (#7379)

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index d2880ba800..2e6e5897b5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 3ed1bfb76b86d10e1fc3a6d51b48f7380743cbef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Jan 2022 09:35:42 +0100
Subject: [PATCH 337/665] Bump testng from 7.4.0 to 7.5 (#7381)

Bumps [testng](https://github.com/cbeust/testng) from 7.4.0 to 7.5.
- [Release notes](https://github.com/cbeust/testng/releases)
- [Changelog](https://github.com/cbeust/testng/blob/master/CHANGES.txt)
- [Commits](https://github.com/cbeust/testng/compare/7.4.0...7.5)

---
updated-dependencies:
- dependency-name: org.testng:testng
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 0bc1327989..993b0eac31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@ plugins {
 ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
-    testNgVersion = "7.4.0"
+    testNgVersion = "7.5"
     mockitoVersion = "4.2.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.0.1-jre"

From 32f8bb0806212da2f4ef2113944b039694be7a33 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Jan 2022 09:53:39 +0100
Subject: [PATCH 338/665] Bump mockito-core from 4.2.0 to 4.3.0 (#7387)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.2.0...v4.3.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 993b0eac31..730a212c7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.2.0"
+    mockitoVersion = "4.3.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.0.1-jre"
 }

From 9d362626e9147308b1d54902bffe9e5088add2af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Jan 2022 09:21:18 +0100
Subject: [PATCH 339/665] Bump mockito-core from 4.3.0 to 4.3.1 (#7388)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.3.0...v4.3.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 730a212c7c..5624237830 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.3.0"
+    mockitoVersion = "4.3.1"
     jmhLibVersion = "1.21"
     guavaVersion = "31.0.1-jre"
 }

From 47189ac2ffb71304ca2e44c3d5f51eb9a0ea4e86 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 3 Feb 2022 21:48:17 +0100
Subject: [PATCH 340/665] 3.x: Move nullness annotation to use sites of
 Supplier (#7385)

---
 .../java/io/reactivex/rxjava3/core/Completable.java    |  4 ++--
 src/main/java/io/reactivex/rxjava3/core/Flowable.java  |  4 ++--
 src/main/java/io/reactivex/rxjava3/core/Maybe.java     |  8 ++++----
 .../java/io/reactivex/rxjava3/core/Observable.java     |  4 ++--
 src/main/java/io/reactivex/rxjava3/core/Single.java    |  4 ++--
 .../java/io/reactivex/rxjava3/functions/Supplier.java  |  4 +---
 .../validators/NonNullMethodTypeArgumentCheck.java     | 10 ++++++----
 7 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index 910c7a2fc9..d16dd4dc85 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -479,7 +479,7 @@ public static Completable unsafeCreate(@NonNull CompletableSource onSubscribe) {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable defer(@NonNull Supplier<? extends CompletableSource> supplier) {
+    public static Completable defer(@NonNull Supplier<? extends @NonNull CompletableSource> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new CompletableDefer(supplier));
     }
@@ -503,7 +503,7 @@ public static Completable defer(@NonNull Supplier<? extends CompletableSource> s
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static Completable error(@NonNull Supplier<? extends Throwable> supplier) {
+    public static Completable error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new CompletableErrorSupplier(supplier));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 6cbdf0a412..da3a941317 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -2040,7 +2040,7 @@ public static int bufferSize() {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Flowable<T> defer(@NonNull Supplier<? extends Publisher<? extends T>> supplier) {
+    public static <@NonNull T> Flowable<T> defer(@NonNull Supplier<? extends @NonNull Publisher<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableDefer<>(supplier));
     }
@@ -2095,7 +2095,7 @@ public static int bufferSize() {
     @NonNull
     @BackpressureSupport(BackpressureKind.PASS_THROUGH)
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Flowable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+    public static <@NonNull T> Flowable<T> error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new FlowableError<>(supplier));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index bbb3a10d4b..83bcd68144 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -889,7 +889,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Maybe<T> defer(@NonNull Supplier<? extends MaybeSource<? extends T>> supplier) {
+    public static <@NonNull T> Maybe<T> defer(@NonNull Supplier<? extends @NonNull MaybeSource<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new MaybeDefer<>(supplier));
     }
@@ -961,7 +961,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Maybe<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+    public static <@NonNull T> Maybe<T> error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new MaybeErrorCallable<>(supplier));
     }
@@ -1079,7 +1079,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Maybe<T> fromCallable(@NonNull Callable<? extends T> callable) {
+    public static <T> Maybe<@NonNull T> fromCallable(@NonNull Callable<? extends @Nullable T> callable) {
         Objects.requireNonNull(callable, "callable is null");
         return RxJavaPlugins.onAssembly(new MaybeFromCallable<>(callable));
     }
@@ -1285,7 +1285,7 @@ public abstract class Maybe<T> implements MaybeSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Maybe<T> fromSupplier(@NonNull Supplier<? extends T> supplier) {
+    public static <T> Maybe<@NonNull T> fromSupplier(@NonNull Supplier<? extends @Nullable T> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new MaybeFromSupplier<>(supplier));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 2206319b18..de0fdca2f8 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -1790,7 +1790,7 @@ public static int bufferSize() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Observable<T> defer(@NonNull Supplier<? extends ObservableSource<? extends T>> supplier) {
+    public static <@NonNull T> Observable<T> defer(@NonNull Supplier<? extends @NonNull ObservableSource<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableDefer<>(supplier));
     }
@@ -1839,7 +1839,7 @@ public static int bufferSize() {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Observable<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+    public static <@NonNull T> Observable<T> error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new ObservableError<>(supplier));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index ea6a610feb..ac7ecd48b6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -895,7 +895,7 @@ public abstract class Single<@NonNull T> implements SingleSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Single<T> defer(@NonNull Supplier<? extends SingleSource<? extends T>> supplier) {
+    public static <@NonNull T> Single<T> defer(@NonNull Supplier<? extends @NonNull SingleSource<? extends T>> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new SingleDefer<>(supplier));
     }
@@ -917,7 +917,7 @@ public abstract class Single<@NonNull T> implements SingleSource<T> {
     @CheckReturnValue
     @NonNull
     @SchedulerSupport(SchedulerSupport.NONE)
-    public static <@NonNull T> Single<T> error(@NonNull Supplier<? extends Throwable> supplier) {
+    public static <@NonNull T> Single<T> error(@NonNull Supplier<? extends @NonNull Throwable> supplier) {
         Objects.requireNonNull(supplier, "supplier is null");
         return RxJavaPlugins.onAssembly(new SingleError<>(supplier));
     }
diff --git a/src/main/java/io/reactivex/rxjava3/functions/Supplier.java b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
index fe43f0d8c8..ebf7fdda6d 100644
--- a/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
+++ b/src/main/java/io/reactivex/rxjava3/functions/Supplier.java
@@ -13,8 +13,6 @@
 
 package io.reactivex.rxjava3.functions;
 
-import io.reactivex.rxjava3.annotations.NonNull;
-
 /**
  * A functional interface (callback) that provides a single value or
  * throws an exception.
@@ -25,7 +23,7 @@
  * @since 3.0.0
  */
 @FunctionalInterface
-public interface Supplier<@NonNull T> {
+public interface Supplier<T> {
 
     /**
      * Produces a value or throws an exception.
diff --git a/src/test/java/io/reactivex/rxjava3/validators/NonNullMethodTypeArgumentCheck.java b/src/test/java/io/reactivex/rxjava3/validators/NonNullMethodTypeArgumentCheck.java
index f0abb5b23e..e8c4b81715 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/NonNullMethodTypeArgumentCheck.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/NonNullMethodTypeArgumentCheck.java
@@ -57,10 +57,12 @@ static void process(Class<?> clazz) {
 
                             for (String ta : parseTypeArguments(line)) {
                                 if (!ta.startsWith("@NonNull") && !ta.startsWith("@Nullable")) {
-                                    result.append("Missing annotation on argument ").append(ta).append("\r\nat ")
-                                    .append(parentPackage).append(".").append(className).append(".method(")
-                                    .append(className).append(".java:").append(lineCount).append(")\r\n");
-                                    count++;
+                                    if (!("Maybe".equals(clazz.getSimpleName()) && (line.contains("fromCallable(") || line.contains("fromSupplier(")))) {
+                                        result.append("Missing annotation on argument ").append(ta).append("\r\nat ")
+                                        .append(parentPackage).append(".").append(className).append(".method(")
+                                        .append(className).append(".java:").append(lineCount).append(")\r\n");
+                                        count++;
+                                    }
                                 }
                             }
                         }

From 97f1702437d662425bd51d85e39ce3abf6cb0552 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 8 Feb 2022 12:55:28 +0100
Subject: [PATCH 341/665] Upgrade to Gradle 7.4 (#7392)

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2e6e5897b5..41dfb87909 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From ca6293e5c721fb8bb8fa559ce7219f6fd54993a7 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 10 Feb 2022 09:25:42 +0100
Subject: [PATCH 342/665] 3.x: Apply the Javadoc format cleanup to
 Disposable.html (#7393)

---
 gradle/javadoc_cleanup.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index 5f120656e0..4c3386a6ef 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -24,6 +24,8 @@ task javadocCleanup(dependsOn: "javadoc") doLast {
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/plugins/RxJavaPlugins.html'))
 
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/parallel/ParallelFlowable.html'))
+
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/disposables/Disposable.html'))
 }
 
 def fixJavadocFile(file) {

From e8855b224a9de8bf429d09c91dc12fdf6c86fdbf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Feb 2022 10:55:40 +0100
Subject: [PATCH 343/665] Bump biz.aQute.bnd.builder from 6.1.0 to 6.2.0
 (#7397)

Bumps [biz.aQute.bnd.builder](https://github.com/bndtools/bnd) from 6.1.0 to 6.2.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/compare/6.1.0...6.2.0)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd.builder
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 5624237830..a8ae79355a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id("ru.vyarus.animalsniffer") version "1.5.4"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
-    id("biz.aQute.bnd.builder") version "6.1.0"
+    id("biz.aQute.bnd.builder") version "6.2.0"
     id("com.vanniktech.maven.publish") version "0.18.0"
     id("org.beryx.jar") version "1.2.0"
 }

From db96a1f08d14a03c45608729f7c0e6ebfab2bba5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Feb 2022 11:16:22 +0100
Subject: [PATCH 344/665] Bump com.vanniktech.maven.publish from 0.18.0 to
 0.19.0 (#7396)

Bumps [com.vanniktech.maven.publish](https://github.com/vanniktech/gradle-maven-publish-plugin) from 0.18.0 to 0.19.0.
- [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases)
- [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.18.0...0.19.0)

---
updated-dependencies:
- dependency-name: com.vanniktech.maven.publish
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a8ae79355a..1d122a10ea 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.2.0"
-    id("com.vanniktech.maven.publish") version "0.18.0"
+    id("com.vanniktech.maven.publish") version "0.19.0"
     id("org.beryx.jar") version "1.2.0"
 }
 

From e22f925e5f78731c13566f14f93e43856bf1abf3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 08:51:59 +0100
Subject: [PATCH 345/665] Bump guava from 31.0.1-jre to 31.1-jre (#7398)

Bumps [guava](https://github.com/google/guava) from 31.0.1-jre to 31.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1d122a10ea..2191bdd163 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.3.1"
     jmhLibVersion = "1.21"
-    guavaVersion = "31.0.1-jre"
+    guavaVersion = "31.1-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 9f918394206cad433fdffde5cf81073f96618971 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 08:28:35 +0100
Subject: [PATCH 346/665] Bump actions/checkout from 2.4.0 to 3 (#7399)

Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 66ecaec87f..ca7a9d263c 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -6,5 +6,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.4.0
+      - uses: actions/checkout@v3
       - uses: gradle/wrapper-validation-action@v1.0.4
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 500e984ff6..2c93bf07d6 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 849edb55f8..15a0dfdee4 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -14,7 +14,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
     - name: Set up JDK 11
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index d5f4f11194..a4fca56106 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index c7ac3316d7..9708e19f24 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -17,7 +17,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index fba3058d81..91818f7081 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -16,7 +16,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v2.4.0
+    - uses: actions/checkout@v3
     - name: Set up JDK 8
       uses: actions/setup-java@v2
       with:

From 2cab59dba496c81695cd965d42b4d237dcdcd224 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Mar 2022 08:07:38 +0100
Subject: [PATCH 347/665] Bump mockito-core from 4.3.1 to 4.4.0 (#7401)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.3.1...v4.4.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2191bdd163..80f9c11413 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.3.1"
+    mockitoVersion = "4.4.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.1-jre"
 }

From 72f24e2d1603a4b210d3331911b242ce84c5b0a7 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 10 Mar 2022 09:41:22 +0100
Subject: [PATCH 348/665] 3.x: Fix marbles of first(T) (#7400)

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java   | 2 +-
 src/main/java/io/reactivex/rxjava3/core/Observable.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index da3a941317..b06164d1ae 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -10148,7 +10148,7 @@ public final Maybe<T> firstElement() {
      * Returns a {@link Single} that emits only the very first item emitted by this {@code Flowable}, or a default
      * item if this {@code Flowable} completes without emitting anything.
      * <p>
-     * <img width="640" height="285" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
+     * <img width="640" height="298" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/Flowable.first.s.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in a bounded manner.</dd>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index de0fdca2f8..c86972a7ad 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -8953,7 +8953,7 @@ public final Maybe<T> firstElement() {
      * Returns a {@link Single} that emits only the very first item emitted by the current {@code Observable}, or a default item
      * if the current {@code Observable} completes without emitting any items.
      * <p>
-     * <img width="640" height="285" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
+     * <img width="640" height="283" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/first.s.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code first} does not operate by default on a particular {@link Scheduler}.</dd>

From becde831e3b1363218ee7259c719bb8f1dae9ca1 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 10 Mar 2022 10:13:38 +0100
Subject: [PATCH 349/665] Upgrade to Gradle 7.4.1 (#7402)

via

```
gradlew wrapper --gradle-version=7.4.1
```
---
 gradle/wrapper/gradle-wrapper.jar        | Bin 59536 -> 59821 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |  10 +++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..41d9927a4d4fb3f96a785543079b8df6723c946b 100644
GIT binary patch
delta 8958
zcmY+KWl$VIlZIh&f(Hri?gR<$?iyT!TL`X;1^2~W7YVSq1qtqM!JWlDxLm%}UESUM
zndj}Uny%^UnjhVhFb!8V3s(a#fIy>`VW15{5nuy;_V&a5O#0S&!a4dSkUMz_VHu3S
zGA@p9Q$T|Sj}tYGWdjH;Mpp8m&yu&YURcrt{K;R|kM~(*{v%QwrBJIUF+K1kX5ZmF
zty3i{d`y0;DgE+d<pEk7Pr|u=*zNE>e>vN@yYqFPe1Ud{!&G*Q?iUc^V=|H%4~2|N
zW+DM)W!`b&V2mQ0Y4u<ea&fhP8Zl}9enFLMGA78rwN)ZSva{tuDBrFm!)H9vOM3m4
z-niSubJ&a4xSs}+dP%fO+GC$_<4)P0YuO<_KzvEJ?(Ir@)@_h}QPu8eKx^*hOS|ob
zglR#!I=XV6e96{sFaTqa*yroz1qr?Te(?&#62a<0lDtodq4P_}6zQ3XQ@k&Wac@zj
z!xW|4+QCtgyAKtcH=EZr)8(8$Sk&Y@4x_8dchwcHlyPSsIYtMhD7{~tRr%@kj%5Vm
z;7_r0klH%P3r<%Wk32g(qX3Vlvsh(>_)uB=P@-2`v|Wm{>CxE<!zXQ=*HWl2>R1P^
z>c}ZPZ)xxdOCDu59{X^~2id7+6l6x)U}C4Em?H~F`uOxS1?}xMxTV|5@}PlN%Cg$(
z<u@mW976lW8Jb6)e1=uV8`_*8fnDQKnsWpmN8p7Nc?_FdC-=Z>wY6c}r60=z5ZA1L
zTMe;84rLtYvcm?M(H~ZqU;6F7Evo{P7!<V=+h%r|+GH1ai~D70{AN;wJ6scs_bdsL
zk~o&+!QijE(H{-r{aJH0mTO&C64O&h_H<P$ZX>LGcdwO|qf1w+)MsnvK5^c@Uzj<{
zUoej1>95tuSvDJ|5K6k%&UF*uE6kBn47QJw^yE&#G;u^Z9oYWrK(+oL97hBsUMc_^
z;-lmxebwlB`Er_kXp2$`&o+rPJAN<`WX3ws2K{q@qUp}XTfV{t%KrsZ5vM!Q#4{V&
zq>iO$MCiLq#%wXj%`W$_%FRg_WR*quv65TdHhdpV&jlq<=K^K`&!Kl5mA6p4n~p3u
zWE{20^hYpn1M}}VmSHBXl1*-)2MP=0_k)EPr#>EoZukiXFDz?Di1I>2@Z^P$pvaF+
zN+qUy63jek2m59;YG)`r^F3-O)0RDIXPhf)XOOdkmu`3SMMSW(g+`Ajt{=h1dt~ks
ztrhhP|L4G%5x79N#kwAHh5N){@{fzE7n&%dnisCm65Za<8r_hKvfx4Bg*`%-*-Mvn
zFvn~)VP@}1sAyD+B{{8l{EjD10Av&Mz9^Xff*t`lU=q=S#(|>ls520;n3<}X#pyh&
z*{CJf7$*&~!9jMnw_D~ikUKJ2+UnXmN6qak{xx%W;BKuXt7@ky!LPI1qk?gDwG@@o
zkY+BkIie>{{q==5)kXw(*t#I?__Kwi>`=+s?Gq6X+vtSsaAO&Tf+Bl$vKnzc&%BHM
z=loWOQq~n}>l=EL(5&6((ESsQC3^@4jlO5Od{qN#sWV)vqXw}aA>*uvwZopNN(|-T
zRTF%5Y_k1R$;(d-)n;hWex{;7b6KgdAVE@&0pd(*qDzBO#YZV%kh%pYt1`hnQ(Fa&
zYiDrOTDqk5M7hzp9kI2h!PxNnuJ<B`^Mhe3ly%$^w$3*WOd4DLEzfG@J3$}Y)fnX)
zH;<m_AN0yr_leAC%G$CR3<-^>&xl*zF8sx6!67bA49R1bmUF5bpK&&{eI0U~cH}PM
z3aW1$lRb|ItkG<M4<w%Yk)iJvsJ=qk(wBabc9wCBgqqQUl?_J0j@dtLNgo0oTIBMw
zFmxG2{&>5~_eBNu$|I|vYIdAA9a!pVq<+UTx*M}f<Cydl3cV>G`23zxXp&E=FfnY-
zEzKj;Cu_s4v>leO7M2-mE(UzKHL4c$c`3dS*19OpLV^4NI*hWWnJQ9lvzP4c;c?do
zqrcsKT*i~eIHl0D3r4N{)+RsB6XhrC^;sp2cf_Eq#6*CV;t8v=V!ISe>>9kPgh}NI
z=1UZutslxcT$Ad;_P^;Oouoa(cs!Ctpvi>%aQ+Zp=1d|h{W9Wmf7JWxa(~<#<N|-x
z+wB5>tSZ?C%wu4_5F!fc!<@PIBeJ)Nr^$bB6!_Gic_7}c3J{<c?hHY$$whr&k?{Y6
znNJn%ZB2QXBU93>QI~Gg5g5jTp9}V6KYgrgaX>pJt}7$!wOht&KO|+z{Iw@YL|@~D
zMww}+lG}rm2^peNx>58ME||ZQxFQeVSX8iogHLq_vXb`>RnoEKaTWBF-$JD#Q4BMv
zt2(2Qb*x-?ur1Y(NsW8AdtX0#rDB?O(Vs4_xA(u-o!-tBG03OI!pQD+2UytbL5>lG
z*(F)KacHqMa4?dxa(Vcrw>IIAeB$3cx#;;5r2X;HE8|}eYdAgCw#tpXNy7C3w1q`9
zGxZ6;@1G%8shz9e+!K2MO*{_RjO}Jo6eL3{TSZ>nY7)Qs`Dhi5><@oh0r)gT7H-?3
zLDsd^@m<xQVzcNd`(P7s86P>%JvrS8sta5`QiZNs^*GT}Hiy^zjK2^Ni%`Z|ma)D2
zuyumbvw$M8$haCTI~6M%d4+P)uX%u{Sfg4Al+F7c6;O-*)DKI7E8izSOKB#FcV{M+
zEvY0FBkq!$J0EW$Cxl}3{JwV^ki-T?q6C30Y5e&p@8Rd?$ST-Ghn*-`tB{k54W<>F
z5I)TFpUC!E9298=sk>m#FI4sUDy_!8?51F<M%uN*Ajyq*bGIeIeUdXoo%Xd3XTV_s
zo>qqW!9LN1(zuDnB3$!<jN%eFzQRV+_R;j^$*k0bf`MjlUD&itHhuf_;vw1w4BRM?
z6D;>pEUjL>N>RNgAG~-9Xm|1lqHseW(%v&6K(DZ3Pano(1-Qe?3%J&>0`~w^Q-p&@
zg@HjvhJk?*hpF7$9P|gkzz`zBz_5Z!C4_-%fCcAgiSilzFQef!@amHDrW!YZS@?7C
zs2Y9~>yqO<a2K5*Q;s{+>+rkih?kXztzvnB^6W=f52*iyuZPv$<OX>c42$WK7>PHb
z6%MYIr5D32KPdwL1hJf{_#jn?`k(taW?mwmZVvrr=y~fNcV$`}v(8};o9AjOJumS4
z`889O91^pkF+|@$d9wVoZ3<bnIfu#o3!UfMc5V%(mOg>;^j;^sUs&Ubo_qD&MTL%O
z&*SE0ujG~<CGD(ok$`?}t)%pTf{IbQ(>zm;?<jNixA~e@gZ*6U>x)8TLC&ft))nyI
zcg44@*Q{cYT+qGrA=In_X{NNCD+B0w#;@g)jvBU;_8od6U>;7HIo@F*=g8CQUo(u^
z3r4FJ7#<@)MXO&5+DgKE&^>^`r!loe7CWE*1k0*0wLFzSOV8jvlX~<chY>WOQ?$1v
zk$Or}!;ix0g78^6W;+<=J>z@CBs!<<)HvF(Ls-&`mat<kA@dLCUcQ=31Rg+;+4kFq
zMtMu68RC?D0`}krH?jJL21$$HZ{Lsv3X)mHiwI4hrTnt?y2RfqwFnpo_DGwe6uJ3A
zv|B1aggMlaQ%*i&<>pesJ5kkjC)6nGB@b{ii6-Uoho$BT%iJgugTOeZ$5Xo4D7Pd<
zC*LJh5V@2#5%aBZCgzlQi3@<_!VfiL0<l-dOmBG0&Iil%Hq+E?Sf^KQ(|bI4!OpXy
zVRBc5#N^$i6+{=62?W$DwMDtPX+J-4uBMRSZ1m0%a%LR*o4)iDuAWoJVbBFktzX97
z3sONNH5G)`)=!)`1yxB-Ty^?M2IkLZ>7ywc)ZbwKPfcR|ElQoS(8x|a7#IR}7#Io=
zwg4$8S{egr-NffD)Fg&X9bJSoM25pF&%hf>(T&9bI}=#dPQyNYz;ZZ7EZ<P2*spI-
zU~l_wK|f7_K)-tdJ_gn9c)@?Z$)mZdsj<<w(WdjQ)!B+m9x>=u1n701<vS^S$MWWS
z*2<^a_4=z<N^2*xa+XX)H4|Y5SH4~?Q`*}ms)P}km{%f@@-<^%&uN>SWKkZ9n(-qU
ztN`sdWL1uxQ1mKS@x11;O|@^AD9!NeoPx}?EKIr!2>1Qq4gjfGU)tr6?Z5l7JAS3j
zZeq{vG{rb%DFE4%$szK}d2UzB{4>L?Tv+NAlE*&Nq6g+XauaSI+N2Y8PJLw+aNg1p
zbxr|hI8wcMP&&+(Cu|%+Jq|r>+BHk@{AvfBXKiVldN)@}TBS0LdIpnANCVE26WL-}
zV}HJ^?m&$Rkq;Zf*i-hoasnpJVyTH__dbGWrB_R55d*>pTyl6(?$EO@>RCmTX1Hzr
zT2)rOng?D4FfZ_C49hjMV*UonG2DlG$^+k=Y%|?Dqae4}JOU=8=fgY4Uh!pa9eEqf
zFX&WLPu!jArN*^(>|H>dj~g`ONZhaaD%h_HHrHkk%d~TR_RrX{&eM#P@3x=S^%_6h
zh=A)A{id16$zEFq@-D7La;kTuE!oopx^9{uA3y<}<CA$fk1IT{4FjGWgv!&Qj=->9
z^bQ@U<&pJV6kq7LRF47&!UAvgkBx=)KS_<sRR+!6RZC5cwwj}~S;x)Q)+5fHbM32@
zs9Dpw6*_`sQMYrP%1#j|U1c3>X!NY28^gQr27P=gKh0+E>$aCx&^vj2uc}ycsfSEP
zedhTgUwPx%?;+dESs!g1z}5q9EC+fol}tAH9#fhZQ?q1GjyIaR@}lGCSpM-014T~l
zEwriqt~ftwz=@2tn$xP&-rJt?nn5sy8sJ5Roy;pavj@O+tm}d_qmAlvhG(&k>(arz
z;e|SiTr+0<&6(-An0*4{7akwUk~Yf4<JX9Tq5J!*OP4&wi-J3;wg&c+D8MXROBM9x
zY%+{fj6XCxVA3e*V+E4ZaC2?*_b$@bw?dl3w)Md>M!!YKj^swp9WOa%al`%R>V7mi
z+5+UodFAaPdi4(8_FO&O!Ymb#@yxk<HZ;C?aw~lw1!ng28dO31y6a^%A?mrZiLhlq
z*)r9D-qc@_^Yo)QL>uVMrog(7gkj$G@FLA#ENMxG)4f<}S%Fn?Up$+C%{02AgMKa^
z4SFGWp6U>{Q6VRJV}yjxXT*e`1XaX}(dW1F&RNhpTzvC<hla}alUMpFiPxiUEJDg)
z5T@OEnNE}Jw;&G3crL{}5pCqBws~Gb_7$63#%$YX!r1fagPH-PbSt2dQ@`XI+!FpO
zPBg3@LF}wg;SB#}QqN)V$tpZHYJGRjf`Z$Cq<>tzuu;LMhMfJ2LBEy?{^GHG!OF!!
zDvs64TG)?MX&9NCE#H3(M0K>O>`ca0WT2YR>PTe&tn?~0FV!MRtdb@v?MAUG&Ef7v
zW%7>H<yyBb4^02^=S~lp(==aV^=yU&QsYS{R$Z#_MPQ}KX>(;Mm)RJkt18GXv!&np
z?RUxOrCfs;m{fBz5MVlq59idhov21di5>WXWD-594L-X5;|@kyWi@N+(jLuh=o+5l
zGGTi~)nflP_G}Yg5Pi%pl88U4+^*ihDoMP&zA*^xJE_X*Ah!jODrijCqQ^{=&hD7&
z^)qv3;cu?olaT3pc{)Kcy9jA2E8I)#Kn8qO>70SQ5P8YSCN<o_4{q)RX(xgDwNlZH
zzebPidQyv5yfB^u)f8#wF9D2~qZ>=_+_&)qg)OYBg|-k^d3*@jRAeB?;yd-O1A0wJ
z?K*RDm|wE<(PBz~+C%2CTtzCTUohxP2*1kE8Of~{KRAvMrO_}NN&@P7SUO{;zx0iK
z@or9<q8_W=jB;CG$!3sa>R8ydYOFZ<QmE(^V7$Xl0ZTLH#4LQ49$*&tdo06GSY2B5
zWAbnOoFOm;0r9<^opq%%1#>f(cHASCAatL%;62IL27~SmASr(7F&NMr+#gNw@z1VM
z_ALFwo3)SoANEwRerBdRV`>y`t72#aF2ConmWQp(Xy|msN9$yxhZ1jAQ67lq{vbC5
zujj|MlGo`6Bfn0TfKgi(k=gq0`K~W+X(@GzYlPI4g0M;owH3yG14rhK>lG8lS{`!K
z+Nc@glT-DGz?Ym?v#Hq|_mEdPAlHH5jZuh*6glq!+>Lk$S%ED2@+ea6CE@&1-9a?s
znglt|fmIK}fg<9@XgHe4*q!aO<-;Xj$T?IzB-{&2`<ytxLqDCA^PWKz2Ct4sO5e`N
z#3V>#eA6rdtCi80mpP&vw(Uytxu$#YzNI_<LOg^VxHp(U<w~GJ1f1W5T<#!>cB>LS
z<BGD5FQUI9ZdhON9ZG|Z2$;M>mim>ys;ir;*Dzbr22ZDxO2s;671&J0U<9(n1yj)J
zHFNz=ufPcQVEG+ePjB<5C;=H0{>Mi*xD>hQq8`Vi7TjJ$V04$`h3EZGL|}a07oQdR
z?{cR(z+d>arn^AUug&voOzzi$ZqaS)blz-z3zr;10x;oP2)|Cyb^WtN2*wNn`YX!Y
z+$Pji<7|!XyMCEw4so}xXLU)p)BA~2fl>y2Tt}o9*BPm?AXA8UE8a;>rOgyCwZBFa
zyl42y`bc3}+hiZL_|L_LY29vVerM+BVE@YxK>TGm@dHi@Uw*7AIq?QA9?THL603J%
zIBJ4y3n8OFzsOI;NH%DZ!MDwMl<#$)d9eVVeqVl(5ZX$PPbt*p_(_9VSXhaUPa9Qu
z7)q4vqYKX7ieVSjOmVEbLj4VYtnDpe*0Y&+>0dS^bJ<8s*eHq3tjRAw^+Mu4W^-E=
z4;&namG4G;3pVDyPkUw#0kWEO1;HI6M51(1<0|*pa(I!sj}F^)avrE`ShVMKBz}nE
zzKgOPMSEp6M>h<xzBqqC2r<F^H92Aw&4uudWPKvL8@MToS|loeJ@cW2tFfXRh#&3M
zmy2Twln2FD@uLUm4efWiER|oHpuZBo0oOKxa%U{r=@uGv42}`By+%ym)Y7RDXH&du
zoEx|?JqEWM#fL@T=I%`p-wa5K`f*Y;?romQLrl!#2OvbxCL(4R_Rj)fPeHt@ZfZ6z
z!;^0XxFdQkgf|tVjx9o8i${;IN?3&o^gkMA7K`xtqNSPm346BF^Tw77TU$f7fhUZg
zx>JzyTHHcjV%W*;Tdb}1xJjCP#=iQuBk_Eho6yCRVp<B-D5qnXH^$;Z)Q%;=b)~TV
zma>&e!}4IBJ&?ksVc&u#g3+G$oNlJ?mWfADjeBS-Ph3`DKk-~Z70XugH8sq2eba@4
zIC1H_J$`9b$K`J)sGX3d!&>OmC@@rx1TL~NinQOYy72Q_+^&Mg>Ku(fTgaXdr$p_V
z#gav1o{k~c>#)u3r@~6v^o)Lf=C{rAlL@!s457pq)pO;Cojx7U{urO4cvXP|E>+dV
zmr2?!-5)tk-&*ap^D^2x7NG6nOop2zNFQ9v8-EZ{WCz-h36C)<<!{n3lmWRTJS2LL
zKqeb1k2ia;BW>^|f{V#R_WE^@(T0+d-at5hXX{U?zak*ac-XnyINo+yBD~~3O1I=a
z99|CI>502&s-Qi5bv>^2#cQ%ut<4d7KgQ^kE|=%6#VlGiY8$rdJUH{sra;P~cyb_i
zeX(kS%w0C?mjhJl9TZp8RS;N~y3(EXEz13oPhOSE4WaTljGkVXWd~|#)<uV3j}5Te
zkV*EdY9egzhtn*nao`21CzD^I)5+{Z18Rw4lVU`8%2$p*UCl1`TX(>vsG6_76I)Kb
z8ro?;{j^lxNsaxE-cfP;g(e;mhh3)&ba}li?woV2#7ByioiD>s%L_D;?#;C#z;a(N
z-_WY<=SH42m9bFQ>Nb<j)a&Ob18H&7^vzH?H5JL2Of;-n4as~D=@sj@(xGD?Q&6)o
zNw<auASS+8#i*1R!&uI-tFKh%KIr6NC(#SxD@3iP2k4DgV7OG2_i^y2M9g#zlD(U-
z$!Uj{C~~=*h*XIwivlGPRURp*;)QB+YqgJIj&37B54@$-sI~y;X3Dihu4r?k)$3U*
zk9uj6ma79_U1P?O&-Dm+nDF-X=2Qho8(&-!Lg<We!MbaT@J&@W=LLZ<CT{ON!^Ca>
z@4K$@4l8pD7AKxCR>t0%`Qoy9=hA?<<^Vcj8;-E+oBe3ReW1`el8np8E$k{LgFQ}2
z2t8a`wOXFdJ9!5$&mEfD1CnJ)TB+R<n2vZS8t~mtTC`K4pZCx&&(3zcvRA9eh$H8M
z_(FD=Q{%@E%kevl^P8LEUHNViR|?_s&XalEIk_ZMI{}%7`W~XTC3|-uNW*qO<~QBb
z3zP=yM9fq3N?>Jih88-Zos9@<!L<$JX|GawFX(o*O6o}Qi}@c~jn=uep}m0v`a|BB
z2yR(9di0m0I`Pal?D2-w8ORi_pAzH`yiiE8$#II4Ocmx12(HsCbIF+K0-=4+5>HZ#
zL#{qfbF0ARTXkR@G{lwlOH~nnL)1jcyu!qv2`57S&%oKz0}r{~l9U_UHaJ5!8#nrs
z<AG(3w&=4UE7yD|>?2FrL`mxnzu&{bweD&62)ilz*?pYIvt`T!XFVVA78})p1YEy7
z8fK#s?b~Yo$n7&_a?E<s;#As-2YXI2Zgj?Y;b*tIcNMs31ValY{ovhcp0H0&QM5o$
z4!co%1r!(fx$se``<7Cmbm7?ejQIjV2y;U|x^!0Vm*%Fy)fu&$Qx*Oc;-S!FsjbE@
zLB~r9R-1QTmStt90_5Z$9#S2eFR((hQF{$xVA=D1=6|LvHNnwH@y;m(oAc$*ViI6Z
zEx94E7BZJ-uSdFn?oC)Uou8kJ2oUZF*FO-jg9CC19{3y;-I@2Jr?+Cmtid${#WLE7
z>BdXH-_W)Z44?!;DFx6pZ?~RArtBI*Qm4~6nX6Z_T*i$bQPE;Qz?DAPstpGSqr-AJ
zo%m9cA`oDDm?&dTaoh_>@F>a?!y4qt_;NGN9Z<%SS;fX-cSu|>+Pba22`CRb#|HZa
z;{)yHE>M-pc1C0mrnT~80!u&dvVTYFV8xTQ#g;6{c<9d!FDqU%TK5T6h*w*p980D~
zUyCb`y3{-?(mJFP)0*-Nt;mI$-gc4VQumh|rs&j_^R{sgTPF`1Xja2YWstsKFuQ(d
zmZMxV$p$|qQUXchu&8%J(9|)B?`~rIx&)LqDS>ob5%gTeTP#Sbny#y*rnJ&?(l=!(
zoV~}LJ1DPLnF8oyM(2ScrQ0{Q4m4-BWnS4wilgCW-~~;}pw=&<+HggRD_3c@3RQIr
z9+-%!%}u_{`YS=&>h%kPO3ce}>y!d-zqiniNR-b5r97u;+K6HA2tS>Z#cV{+eFI`*
zd8RMGAUtX1KWfPV;q<-5JAykS+2sY$2~UX+4461a(%{P#{rwFPu0xpIuYlbgD{C7C
z=U{FUarVTYX6ZUq3wE@G^QT4H2Re;n$Fz9cJ>hABl)9T8pozqbA1)H-%1=WKm^QMu
zjnUZ&Pu>q+X&6Co*y#@pxc-4waKMInEPGmE_>3@Ym3S*dedSradmc5mlJn`i0vMW6
zhBnGQD^Z;&S0lnS0curqDO@({J7kTtRE+Ra?nl^HP9<)W&C>~`!258f$XDbyQOQXG
zP8hhy<b(LFnif-XZwyRLGhe;etnjh`>SnarOpgu8xv8@WlXnm(Uk~)_3$Sg0vTbU3
z{W!5B(L3{Yy3K5PN<@jEarAtja`}@KYva&<mg(_$O@VX5`i${0FdG$4{}rEJ0`R&Z
zZs#begZtjukzdS}v}xrs@_Gxo!#!cy(lp$QA>zFRF*s+_%jI<i@$eKN=@#NPOmQlJ
z=7^e*>Xh$T(S=an8?=Ry3H*NRqWgsM`<yWowt)b~MiHh~U(61jVh*wRB$%EpguObr
z{C3K9^9C*d4~t4O^w;Si@@(EOQBj0^AR@&Z$?J2;l@0mka+vG&V0u~tGhp2HcU9Vc
z(3Q+dYiLv8D}k6It5K+SSFp1a{3+y+@59Qw$=A%>&!#|@kf1>=4q%bFw7^Rhz!z5I
z<ebaYnWhT}|MWO3GSGz>yI^zU8_R1WN9`88Z=n>pIZQ`Ixr~_9G%Q}@A7rd#*%y7G
zXl^Id=^ZL?Rx}}gWXCqzj9C6;x(~mAH|$JteXa1MH<6UQig@!Hf~t}B%tP0I|H&;y
zO6N0}svOa1a^PyP9N5?4W6VF%=Bj{qHUgc8@siw4bafT=UPFSoQqKgyUX>sXTBZ=x
zOh^Ad!{kOM9v{%5y}`-8u*T&C7Vq6mD%GR}UeU(*epO&qgC-CkD;%=l)ZuinSzHM`
z{@`j&_vC6dDe{Yb9k@1zeV_K6!l(@=6ucoI=R^cH=6{i71%4W3$J-?<8Qn#$-DMtA
z6Qqi)t?4ifrt%3jSA#6ji#{f(($KBL-iQh-xrC||3U3lq`9>r)>X%oLvtimuHW-)}
zy}>9~|M>w4eES`g7;iBM%Se5-OP%1U6gNWp3AZqT8C6OlFFfQ$|7LL;tBV)(qlp4K
z<dPx#CSC1=4n%oyXOigA4XSj3{aKc{){yJp5b`oNF2J2BrG6uS^Wrd-BJ{m_yWEZS
zk$9>ruar^K8FnJN3@_}B;G`a~H`t|3+6d>q3#`ctTkE-D^1#d9NalQ04lH*qUW2!V
zhk7#z8OwHhSl8w14;KctfO8ubZJ4$dEdpXE78wABz<AT^6SV|+Ync#@d!bkI5#JQU
z3b`Q?>=n5*=q9ex3S}`e7x~~V-jmHOhtX2*n+pBslo3uosdE7xABK=V#-t{1Hd~?i
z{i~%Bw6NYF+F$aK$M`r#xe=NxhA5=p%i7!$);sd>Q}#`G<UXGdHa#qs#Rtzk+he;v
z4Ks`bftVt<iTnIwWOp`bWnAf#a4QJhA<;EY5}#bKSqFZX;m+%6+z%P;2Yl?&Agk1r
z-FB=A3bmYe`>?Q~fygrMXmZw?0#5#17W}6Tj+&kFexG{!mYl5FoA99}3G9l;3lVQ^
z48^~gsVppE*x91WheqI(A%F0Z#$#1UJP1R12Mj9r)y(A?a+iquX+d8WD4WAQJ_!oq
z9rTISr7bPd(GTP57xm$}C}&kjMivi;zi^Y9g3&<wLZq73hQe~~EfZyl=aX?g0t?D2
zuuy~aVnthj6OZffoHY=Ney162uSvLAYB#m|BM1I?^kCc74K{CyWT=18^#bi7yWdqK
z!tys-h@#h{nW16VYPjpSZ)_p2X!N3=_}w$e7u=7yM8();wZR{HMXtR9?DA?=-1gS@
zV{;f*zEJNvVC-`tLihb~EGUE~uzf@bO1mi5Vws1@4E@|vc=oz}2Hi}mt-rzkrwa@c
zTP3Pj(}xZE?_Uu*D~crlZ$|NVYVkj-I4D{I<idgn>X0A;ovdJ?{%_wHgt%%9P&N4H
z^<Cu!JQ@8%Oe0#*=_(Uo!{omudXfnuD0~$Q^uY=X?SIduxBllBv?2xNtuX=k96+2-
zBp~RTFo4VXFEWAD)|mjYULe19RluniXnb88!0Qd7*$@O+dV|b1i~twDe>XzV(uNA4
zAP`hgP6BEN5`YXh|DF~6Pud?~gWfhUKoP<JH*Q+UKj+gXFJLY5FH(cvB9K5vTTFnV
zsDH9@OA6o+_YdP@aX|FjOaPO_f6`-H8qk>X4>z|}0aocC&K+AoV%|SX*N!wGq3|y<
zg4lP(04XIPmt6}$N!dTk+pZv>u;MTB{L4hp9uXk7>aS!6jqM2lVr%{)H3$O127TSZ
z0x9hi0k-P?nWFdQ0K`pykqUIT&jD~B0tHP{ffS(}fZ(aW$oBWTSfHO!A^><6v<S5V
R_{@Vu|29OF7ypyz{{qB}Ob!45

delta 8722
zcmY*;Wn2_c*XJ;R(j_4+E#1=H-QC^YIm8gsFf@+D&?(ZAlF}t5odeR+{krb6yU*TF
z|2X&D{M`@d*32TNOe20l5=0ho#^2I~pbD~q^aFzN{Rm#3zYeiL5N6aRiR|+XoxRvM
znZSLLlAJDh@2J2?#n2<HJgNrn!y}gPKy{ZIxz59kz<hm~l0|39>A?qar%tzN-5NQO
zL&|F{nGiQyzNJ+bM$Y`n=Lx^3wTG^o2bGB@cwr1eb+6c-1tN=U+Db<XX<i;aUs3{y
zu$Yc46}LAQ4CAsc4)9EnYl%6dJ~10(X5ZW^Ss{b(VG*NtD9iGhPK-k@+=)!T!`f{+
z@ainn^hW(LPf$0Tl<&Xcm`;9Od$*nF|E8{^jqGNNRryx;b5{+SMn@+ZXGdh-G|tKP
zuHT41(Hg5&N{#%6$V!J^?}Ma22!#@avKdJgEHC>;bc~eJ!hwM{SbI=#g?$!PjDB+)
zPgU_2EIxocr*EOJG52-~!gml&|D|C2OQ3Y(zAhL}iae4-Ut0F*!z!VEdfw8#`LAi#
zhJ_EM*~;S|FMV6y%-SduHjPOI3cFM(GpH|HES<}*=vqY+64%dJYc|k?n6Br7)D#~#
zEqO(xepfaf2F{>{E2`xb=AO%A<7RtUq6kU_Iu0m?@0K(+<}u3gVw5fy=Y4CC*{IE3
zLP3YBJ7x+U(os5=&NT%gKi23bbaZ`@;%ln)wp4GpDUT$J8NtFDHJzIe_-t}{!HAsh
zJ4<^WovY};)9IKAskSebdQiXv$y5}THuJZ}ouoElIZRui=6l<y)fv;;3oP9g(<=Mo
z4KtG6Sz-`Lzy`Dwm;GGDNaoU(-j1TqQOr9h2X|FC)NAMQT9Rav&<rB<8Y+quHxXE=
zcvM@*_)2r5BzxbYsR<sFreYP*eb<Sq70MiItNRw~t5qn}jC1-(A(w~+@~c$HlIbm@
z{gieFFc7i{RP1#KAN88>rupV|_Jz=9^&;@HwL;J#@23k?A;k`0Bgf;ioO>W`IQ+4?
z7A)eKoY4%+g%=w;=Vm8}H>@U*=*AWNtPqgWRqib#5RT<UUiN@Qs4P~Sqw`JnC89N3
z=0)f>GA@Q=43FrQn3J`GkTUV5yp0U`EOTqjfp+-9;0F8!dMEwwcK%(6`8sDD^aR04
zd6O5vh|Xk?&3dy4f|1QK&Ulf{h6Iq;d-&*ti#Ck>wZFG;GHwc?b;X~eBITx49>2d8
z4HcK&1&DvEGT6kXdzAm4oO8%<TLI2zycGy7+z<|}*wFJ={=R(+YKmC@^1M#1n(Z))
zF>c}8OBt~8H956_;Y<j%Tkq`kqsDj0EhIv0n_b!%m<=x1Wp?SWR2i*M&1*Rvc2q2I
z94b=fK?Q%~<+aISrM;>P-ss*uMf==a+%w~F>Qkm7r)IAuxuoX}h92$gHqbFUun#8m
zWHdy`Zrm#=Pa98x8cO0vd@Tgkr*lm0{dky+Gocr0P8y%HGEI#c3qLqIRc`Oq_C%*;
zG+QTr(#Q|yHKv6R@!DmLlwJQ3FAB)Yor-I4zyDyqM4yp5n2TrQH>gRt*Z<a&#Z6)3
zSFWZ_cWY?YVMR09l(AQZEAmyk9bEFO*P;0c*Gy8gl27yx5T_$gWyyY#p@N=H@PwZF
zCg+}dPJ?5fflHsWBf7vHkHDJFn2}&+NkF_+PR!9~D@Hk3)k@it?=y0Jyz1W69S?7+
z-Ie2fN5DibI#qo+7)w$!&F<A^fCpo-dRQbU+k5;m8@iur>w0+WI-Sj`EgmYHh=t9!
zF6lz^xpqGGpo6!5`sc0a^FVhy_Uxq|@~(1@IIzV)nTpY9sY`CV!?8e&bB8=M&sYEb
z2i}fvKdhp9Hs68Y-!QJ<=wE(iQ5+49tqt;Rh|jhYrI5VW-mIz|UY{h8E=rC5sh#DU
z?wGgk-Tn!I?+Zer7pHlF_Z^!Kd1qkS3&lv#%s6-<5Y%jQL${cge5=G5Ab?D&|9$Y~
zf%rJC2+=2vg;y0-SJb3<@3%}BO$T$C66q$L_H33a`VUbgW~N(4B=v5(<=My|#|J7q
z*Ox4wL4kbJd_~EjLTABSu4U7Jk#`y(6O*U6(k6XxM}CtGZB(H@3~kh*zaGRXM}Iwp
zQ%xFk2>@wiZrVCV_G4G~v;NebCQ%T7{SDyPpSv&dT@Cn)Mx@IK*IdNrj{*4pkV4wv
z)y0J538h>cpB7iPSzA~x24T`{dzNkpvGIqvt1Dvdq@o-`B=$hkczX8$yFMhsWNK-X
zxr$kR$tMD0@W)Vxe1^t9qVmsg&K^F@u84)(n2dttIEAZFN6VD$&tskpG%SI7whGL3
z)DeRiwe&?8m7U{G`oW8!SCi*dM>oYL%UKQnKxV_0RXAEBQg1kStExGEUVwLJ0o<mX
zPQSP~IvpJ8tvs1qUF7Z#Yzkp`7Rt#W`%%Ca88|N|_RIN)YkGhqsoF+!rg-W;%EwC<
z>rGGwb7uv+kPDl7_E2*iD|J*=8A@;XCvwq0aw5oJY<RSFg%fLH75$g!t@`Fk=qJH=
zpC{pOmSlX&lChE0RB4x-r+%D1e6=1gF&dF`;8R|3S<`+Y_Cp8{DQ(9P>N*Yh&o=l}
z2z8YKb-fIAH5spql4eXqp*)o2*b>#1@DSt?zZi{GPj0gH&Nm+EI<3^z0w%YTEV4xw
zI6$+=Faa|Y4o5i0zm5lOg|&tmnJ806DBovU@Ll6XsA;NRrTK~t*AAJIAS=v-UZ%Pr
z$oddI@NRir&erzCwq|)ciJemr-E061j{0Vc@Ys7K(mW|JYj*$+i1<Y}*RC{b<)FqH
zj62}90*b<Z=qvQSb$MR_$=(fQmQ0)soS;`VF?2jn=&zp>Q8XlIK8T?TYS(AXu$`2U
zQ@fHxc=AVHl_}cRZQ)w0anMEoqRKKIvS^`<-aMf*FM`NsG&Uowneo+Ji$7DUD<LAG
z0RSi{002M&5NT(h5ex(Xh+hE!kP=Bz3TO0rY<&DUZARp!KZU3o390?|nwP*?q|?&n
zLKc=ZDSXg_0;Wsu=bQ$iQ?IoK?sm}g^DVMDc``<SYL<n7goRA>Yc7*Hjg;-&aHM%3
zXO6cz$$G};Uqh+iY7Wpme>PHG4cu(q;xyskNLs$^uRRMfEg?8Cj~aE-ajM%CXkx0F
z>C?g3tIA#9sBQOpe`J+04{q7^TqhFk^F1jFtk4JDRO*`d-fx`GYHb=&(JiaM1b?Y^
zO3Kj3sj76ieol|N$;>j@t#tKj=@*gP+mv}KwlTcPYgR$+)2(gk)2JNE=jSauPq!$<
z<|?Sb%W)wS)b>b6i{8!x!^!xIdU3{CJFVnTcw0j{M%DUCF=_>eYYEUWnA-|B(+KYL
z_W_`JI&&u^@t0})@DH^1LDuT0s3dMpCHIbYBgOT4Zh_4yHbSqRbtIKndeT4Q*Jg91
z@>rO!^t-G~*AIW;FQ$3J=b;oGg8?CTa~qNCb>&cgp@e;?0AqA&paz~(%PYO+QBo4(
zp?}ZdSMWx0iJm7HVNk9A#^9Osa#GPJ!_pYEW}($8>&2}fbr@&ygZ?${A7_9?X$(&5
z#~-hxdPQwCNEpf=^+WH-3`2LxrrBMTa}~qJC9S;VzhG!On^JLyW6WkF{8aAE$sM+(
zxr8xLW(KIjI<m$<QP-s3u2Bsy6WFBNJ8auK=%vnBo~&XM#H=7z*|184NwfgYujE3;
zhlc{I10O9+J>`Rm(24r3OJBk<3GF=G!uSP0-G&AY32mLm8q=#Xom&Pqv=1C{d3>1^
zAjsmV@XZ%BKq^eUfBpa8KvO8ob|F3hAjJv*yo2Bhl0)KUus{qA9m8jf)KnOGG<ZK0
z7qi6c6;SXn!tpX+8D7x^D9GAgjFUp9WQ+*1n&;<d;!K=tGMbABGLTecYUT`E=3RZ~
zeud1snh_Zp-izIgE7K24^{fxEuRN@E!aoOPz6jiO2&p~Ye7BNr%zhy$?lh(yH<(dQ
zE!EGhh_Y8K&H>Ta6~4>3@J_VzkL|vYPl*uL+Ot*Q7W!f5rJw5+AsjP_IfL+-S*2p|
zB7!FhjvkUTxQkGWGSg{X;h~dK>gAJivW?88Nu!3o>ySDaABn$rAYt086#27fbjPQS
zhq>55ASvm*60qRdVOY9=bU^+{Pi#!OaZwENN;zy5?EztOHK-Q5;rCuiFl}BSc1YaQ
zC-S{=KsGDz@Ji9O5W;XxE0xI|@3o6(2~i4b8Ii9VT;^G$*dRw(V?=br)D&q^XkeBX
z+gl~+R@rVD-Hwv@7RHV?Bip5KMI)aV^&snt?H<$Nt=OPx#Vx<wrnG(X?#5j@S1F=V
zOZFPcfe)mH?XG>F&BGi?2A2+lNOYywNUGMeGL;|(=UjGDtLG0sN&LpGx;|U;xa13s
z;W_<zYa$VMZtJkd3eIv0jv72gO`~hf`V(aHJ)`JIN8-M{wNNg%`(lpdboQ2nzLW9u
z*F^iq!l9!@nCW)u91gE0BliHl;X-SdYtTh={5*)a$#wacc6W%;>|SPk^G}!M9_^pO
zA3bt3-tca%^42sHeDtfcC0S3w3H1ny!Bxpa=*k?XRPpx9Bb-gx1J9Yvx)4J(8cG+q
z(iCPZ9dsf3#QVyZgD_MW#G#qgV)olu$59&3(PzQfw@%4uZ~<5J=ABvdY43(Qnp{;G
zHg3>@T#>DbTuhFl3)fb3TFqdh)V2aq7!;&JOHseTWukvA7}(iGUq;v-{2J0iHSNHq
z;+)h!p6Ok^+Sp8-jgL($n6Qu47xyE`cFO5SdZR6;R!FET`tm#0D37z339Suxjpv+s
z*=%2-N$N?X&0?x_uut3erF@aBGj;9$k9?3FlbDO{RQa1_qtxrh4!4#f<u_#49<#Me
zT}`O819!AFB7<8tqeiowrNbH;Atr0Zg9{d|0hb)JGg^iLC)qlS1`z0iO!X)AKEXrB
z3zO91j=s#Ek2&c!jEQwIMjT72NxdBbz)42Z;gS{Bz!cQjys(;UZ@sLZujYOtkTTHF
zQJ+6j*RdukVLuLS1KBIa1{xQcqvu=|afX66wi%aF=d(ZFs2Fix?H>jp4x~akvdTp@
zos?^Q&XE;3N93s4rHQGPrV7+au1$$aB6$hLy*Yz_kN$~dweb9PcB!eYVQTGjFuJP>
zZCEwBtb>TIgI<TVyC9z!p9DB9m;+SJtwpX&dvLqBOk7`ZOdBJ%2jd;bwTUk13zVXM
z)u%#E%<(krJO!3xHRjelYO3Pxvd|w_zGbS{+*+}*u_6#E*@|^$-Q&kp<q$k-#MMz}
zRHmEJji~@yep<@n5pr(O8b>O^qAzq@Bv-qud_ZD-2W<_at&ml-gv`tPt$@DF5`HlA
zM>DmmMkpv&Zm-8)Y#0bLQf4MpD4_-7M8eu6rh(tL8dq8onHs#R9J~dGd2IaXXMC~h
z91pKhnQa%Fsn29nAA1;<lB7S|jj`%V&Ul6h;`#7<q#ab(BXL<Jp~Q^0m772>x(%oC
zhca~qQDJaMf?wFrl-Pj;e$bZMYmMF!Y3Lv&Sb?Sjn#!NVx&NDyc^$b4uYyo2OmERa
zRz;yDGd@JTykzFLe|Wk-y7#3x`6$wt$zR8r48mdUvfbeL+4D|Z``~7$PrE@qc7rZe
zVsIoIbCwzjLZ@_M1*bD{HaYn();Z1-q*-I{tEnTZ(}Zmk&%MXSN<hBJc%#b>BX>o|
z<E0~M_3d_^zb*ZAotV_<>-u*RNkAyKC-Srp7c-=@5f)xMWg>o2WWl}j6j9=8+D8;T
z>0*0q#;qw8%U8i;6s0fu#I*%(g*@@a2Er@@nyI}{=@W{Z-;`=wN4N~>6Xrh&z#g}l
zN1g5}0-#(nHUTv_rl2{yUZ;h#t&Fd?tY!7L%ClY)>uH-Ny2ET$lW$S)IQiN79H)D^
zb&0AXYkupy0~w8)*>Sj_p9}4L?lGTq%VG|2p`nWGhnM^!g|j-|O{%9Q%swOq63|*W
zw$(N_laI}`ilB+o!a-wl?er~;;3+)$_akSQ!8YO_&-e*SI7n^(QQ;X0ZE`{4f!gAl
z5$d+9CKVNonM!NO_frREICIAxOv)wm>}-k?iRisM`R7;=lyo|E_YR~FpS&PS`Lg0f
zl-ON<0S%Uix8J%#yZdkCz4YNhcec<|7*P(JsM#>-L>+tYg_71q9~70FAc^6KW5jql
zw!crdgVLH1G_eET=|SEc977;)ezVC|{PJZfra|}@rD;0s&@61mTEBJtILllg{%{vN
zfhb&lq0yChaLhnJ-Qb62MB7`>M;|_ceHKZAeeh@#8tbrK!ArP6oXIhMK;dhEJTY`@
z0Tq>MIe0`7tGv)N*F0IGYSJv0vN?Az8g+4K9S!pW2~9F4W(_U_T=jCZrzuZ3*|__T
zONp_UWmy<Aq+0nbZ&=<ZR;i&e6E+87kR}p;KE40WA@->ePv8C~rckc?Xji;Z5OEqg
zC*Um)i;Wh4TEwqReQdVVbUKT^2>Tpi6z_^-uF*adUFug4i@JhzpWT^Sk&E>CyP2?H
z<yDwjpi;%{B``^5ns(`@%}?w?Tmv>Wf6x}ehuTs6wvzCnTU&gYzT029Nz19(In1WC
z`(1IGmi!O%2AR|BjQa4Q0~u)kM%}?<v2X}ER&l<(GSV{5xiT4gWSP3)r|Kh;@ROr5
za2<>xQyjWuQ16^Gp++;`vr7!k--UZWM*~7Zl|ceO@I3`OpaRhD;YoCuo5IC0uHx>9
z478hu@H|e0Zlo)Zj@01#;8BDs@991xe~^9uG2}UXLM(m7fa}AMwX*tjioBeV&Q8Gx
zSq$6wZFkRBK`cMI>R(@W@+lo2t)L+4q-negWRLWZBz*|%=W4v62JrmzNuOtA*x)QE
z5L%=OH#@KMdB%Jp^r?0tE}5-*6oP`-lO7Sf)0)n*e<{HA=&qhLR)oD8-+V}Z4=md)
z+k9lKf64DB2hAT)UaCP~di?-V3~JBH7itYyk~L6hrnxM%?RKntqd`=!b|e7eFnAcu
z3*V;g{xr7TSTm$}DY%~SMpl>m{Sj!We+WfxSEor?YeiAxYUy25pn(?T()E>ByP^c@
zipwvWrhIK((R((VU+;@LmOnDu)ZXB3YArzzin!Z^0;PyJWnlfflo|q8(QY;o1*5CO
z##hnkO{uy<F1stt^4+O-)m2_k;##de2WT8yPLs6`VeY_M+!iU-HURRFgaoKWq63kH
z&9lwxz1RRWh3Neue(-TEdzMqF_t)7kCD*-ShyrGEJgL30-P~_**S>nTMdk`~DOC#1
zdiYxQoy}=@7(ke#A8$YZZVtk4wo$8x28&I;cY3Ro-|kW=*yiiHgCLZeAr)UtVx>Tu
z|LvL0hq|1-jC0I4x#>&QZCfrVB=zT!n<v5HW%p@E#Sc^c1w^%^di{w>R|~Uz`9%~2
znl{uZ{VEszW`Fad^q_HB!K9*|U-stK%?~;g?&&+12A}Rq$z($Bzuk^2X(Y=hF?-dQ
ztc3DsQK<S>I;qhWIV`99Q#R3xnU0AvY!i*BECj-z9l74|%O=V@nlv|qqC^r^-~C?E
zGW%c|uYgnfJ(gjsTm_cIqcv*mYM{+i+&@F@+69ZQOK&u#v4oxUSQJ=tvqQ3W=*m;|
z>SkBi8LYb-qRY7Sthh*0%3XAC%$z1rhOJzuX=PkTOa=DlocZUpE#KxVNH5)_4n=T(
zGi3YrH7e~sPNYVBd~Grcq#CF~rN{p9Zza-Ntnwfma@TB)=3g36*0lSZg#ixEjFe%+
zX=&LDZ5zqculZ`=RYc^ln(~;nN|Qh6gN=!6f9-N2h+3NWbIxYud&;4SX*tWf5slk4
z{q@@l71UAZgj~*6<a!P^*XyO6h3V&EIvmVB&lB>edXb57fBUxvAS<?R$3H&g9z(ud
zC=Y=i9ogPk$0eTBe>7s(RI=X868JM0+^DCn2yC>;v%S;qPOjB>YVsz(Zx9a>>BK&M
zIQK>7_n)4ud0X5YM}^i*keH{ehLsiy9@NvOpsFeQjdI6anLGvVbBw_*fU1TzdVS$i
z*4j7z!I5RF#rSz|8ibi$;qE{4`aqWYik7QB5U&F5C*;TO_x+gtzPGpzNt!7<mrl&D
z?YHQ8AcjmQWvKqy#)p^zuglBl8CDINLKBj)?_%r~jbwgM{?XCV#nwCrsDywOPl)O4
z1iY&OaHb!ID%|!6v}WZyD;r0d5HHqMY07YEQA3%B1K0*$F{tE{b8#WEiNKpXge-SF
z>~nsBT7)Ckc(K~%uv&{{6A`mmBJVAk-{s~52Vu|HbCH7_W1~ZCX^RflOakGg=jo2Z
z<*s;5-J+2@^LRDZ-7EV&Pq+FTErw@pf<FOqg*(-e451n#;tkkoriWQEDKDFq2!ieN
zLeiVf5`ty(aFD?X`*lpmkSi<-av=S~=*aBP35=&q7u^BTyY^<5hixaX(LHSM1mn)S
z+#9YFD(b%_u;jWXg5ybDQ+)AmBS5<>Fqvx^i%E7Fx#^n(E`m2(c>K-O5`M`Yek9el
zzTGs5qD6*G;y#~xu3>qWuO?-amKYtvRA}I9z#UspEeM;wOERYeot_n_EUMJf$4_<k
zNVbZgMSmWQ6FqNF#0s0V(lu@ogXcb7BEKcEh)QLjfht~yc*mYZjInx)u41y89(84Q
zN#BI!hxsr%F!apVO`9ev@_f^SJ?O(8KAOUo4tWLfZrN1^+hr|8RWEoP{Syb1-FE?)
zwgmw|kZ=e!2w8aFsUkFNkDI)JQO0I1ro3ZZYc4RIDM@ozB)dX#uZ=)!4pt_NJrw~2
zN+XZURqQ#vGvtqxrzc#6S>u?E!6X~?q)tPoZb^_<d;nWljU)~5zM?#f<ak_3zV{&+
zV1Yaz#_X?wf@sTxVWR_=01=ctDE26}#k>;8Y_Ox2h1m<+Le-fsRd|T8db<8#$bqez
zua^Z|>h%zdnuU^ww$#-dZ9NTM`FN+!IlLkz*FqWb!x^Z|C{KyGjZ+>G;;7Mb@LY|H
zc+Gp`L((Dw7pnDlHNm&;SfHedhx*kad$I^uGz{`0BYelq0yEUHpNKSk<tbO&BJ#-~
zNioWDy(zsj+JiDGyO>vj$|dpvY3{7*YGyhXA^LP0&wOw9oNoC=QoVx1<2Dne8qqZL
zm>nFh5DX(-RnQwvHCZQwn^#Z=E!SPVlaRJ78Bo@}!!9dRt^qZy?-*`Pt4WSmgucJv
zV1yFkcjlEM^uz-;b#Q7ZCP@Lk)m}uPX={R4B=56k7WNh11BN~0T*vr@!!ow^B0hOR
zQ)4)&(e%>bNNL%bm<d)SA><&8H{*l_L7s0$2GUgX2Vd;=4d9Dm2v3TaL+;L>{K7h7
zV#<qazV44lYPWneiZ1UOf5G8x42YZmekhZ8CScs%<&!eu_viN2j>k?xDPm(NDE31$
z<}|X)pEY6myjK+^gaIMk&Yj2~F0rSKemNqlsVm4c|N7mp_<l-IyhbRMa-e_N5Nk#`
z<`_$OtC(NWjlAFk@gf}s+IIC+v^^hxSIz!0qIY2r&MLr!N1TW<`ojRq7bl1I-)@q4
z9_Fp_r9~k)^Ar(J6urX%82HJ62vD*ntGO<={xMPl+biAc9@4DYh5F~bjY}TjCGqV}
z-o`ac*dy6QqT7bCKSj?Ip>C*L01s;GNx#D-*&gk!qQr}^?_r@q!8fuXw!)fA7xkd}
zb>vHvdx~H$5qq<OQ!8gN;RoQ8c=%I2*((Yyi^K@RxA%p>AWrow7}+8zBM65-JOt5z
za=T6f7MK`XJuQog8kIEboPdhcaVJeHy)5z7EBLK5NRr()E|#K0L0N^JD@pUA^Czb`
zbUZ_558y+vqAGeyHCbrvOvLD67Ph}06959VzQ_|>RrXQAqE+AQ(-AaKdxoWaF8hdt
z{O3W@b^*o#-f1VuU>YMV03ELF7zkCN4Q&b#prz<E5F(~V?qtBO2>%3Nne0lSbRo@@
z^ihv%oIl~Qyl6Q;a#<eQoefN;+JeGiCpL!4-J>$*jOC%x0_;eis*)J7=f@Ct*)xF5
zo}u~@-I}2|$b%5L7>@+Z?4o+1r&v6ceIy+vroK&jCQ<4q&45HP2wCol4hVm3pZtjf
zHz1D7oyaSKJ~T{Gx}7ONLA)D5k(%%`WswrDyzX*rn}i}}TB4^y#@mAwPzoC)`?rYv
zHgx|trUN#mu*VzUV~8TnJM2Qh*ZM5B{x&y>5An`(M7=Z*Q>TdiH@j*2=moNuOtvpz
z+G`@~-`%~+AgPKgke@XiRPgndh@bp*-HRsh;HTtz@-y_uhb%7ylVOTqG0#u?Vn5c5
zEp*XRo|8hcgG^$#{$O9CJ&NE;TrfRpSnLmes&MO{m=N%zc`}gb!eQ7odl$oy1%PI}
z#AIxx%oRVy&{O~9xnK4$EY>(eQj}!HKIV$Fz*H=-=Kn)N0D6u`(;iO|VraI4fu_W`
z;b5{7;Lyx4za}DU#+U7}=H0dAS#YJJ&g2!P@Htu-AL&w=-)*%P9h2{wR|@?Ff9~)b
z^+e_3Hetq7W%ls{!?<6&Y$Z;NNB41pvrv)|MET6AZXFXJeFqbFW5@i5WGzl?bP+~?
z*&_puH;wKv2)9T_d+P`bLvJFqX#j&xa*-;0nGBbQf0DC>o~=J_Wmtf*2SZQr?{i~X
z9-IbRH8{iy?<0v9Ir1?$66+igy|yD<u*FL=BXByYf`Ydv9d`X1fs~1euE8BK6Dev`
z#=o-z(5q=uFnh*sRnN(McXxt$kv%^FH+Irl5lWRMm+%16v=F$FG5oytgvEV*?`rjK
zSlAE9ER3M<&H1YRLi8hNIl%svh}z&nnE6^Hdt~RO>Q5J~A9sFX@Pe<*kCY8+MwH?I
z`P}zfQ6l^AO8ehZ=l^ZR;R%uu4;BK*=?W9t|0{+<XjV;uT!#OgFe40z-YO0R)f5Ng
z|MV*kUo-w^;+SJX1WeyT(AJoMy{7+>-at(MQZ(CtG=EJFNaFMlKCMXu30(gJUqj5+
z`GM|!keqcj;FKTa_qq;{*dHRXAq157hlB@kL#8%yAm2AgfU|*rDKX@FLlp=HL8ddv
zAWLCHe@DcDeB2}fl7#=0+#<05c3=VqM*O3bkr@9X4nO|)q<dojnluovElyz7$A55m
zOB$$__zzYk;r&~u_BIJnGUcE2Ih7PryUhg5PX9~gA$NN?5bx~&PN<OeFRmn;43fCR
z1oZy=k51*2LJZ(Ikk`8;K(9hbeF-B(c~>0hU;Gye{L8ZN*NH8Id@mP-u<kJdqbmLd
zMeKb5hFAZC+k4_b_qu=C#=hYGO^yR`fRh0G>;Fmb8YuorjLrW&ndip8CN%_qp982r
w1WEnz9^$&s1hkp_3#lPJQ~!HI7WYYjA7>z!`?f%npAh2%rB@vD|Lau$2O)#1n*aa+

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb87909..00e33edef6 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index c53aefaa5f..1b6c787337 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #

From 0b385c5b7e3ed0bc5a11a9089f061d78c1ececb5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Apr 2022 09:24:45 +0200
Subject: [PATCH 350/665] Bump actions/cache from 2.1.7 to 3.0.1 (#7408)

Bumps [actions/cache](https://github.com/actions/cache) from 2.1.7 to 3.0.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2.1.7...v3.0.1)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 2c93bf07d6..241655ad6a 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 15a0dfdee4..304ae0f563 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -21,7 +21,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index a4fca56106..bd572ef980 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 9708e19f24..da4186e05b 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 91818f7081..d1757cbccf 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v2.1.7
+      uses: actions/cache@v3.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 6bdacb446e073a5a4a4f55bc76aca18c51aad76f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 6 Apr 2022 09:07:30 +0200
Subject: [PATCH 351/665] Bump codecov/codecov-action from 2.1.0 to 3 (#7409)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 2.1.0 to 3.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v2.1.0...v3)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 241655ad6a..f4735e9c82 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.1.0
+      uses: codecov/codecov-action@v3
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index bd572ef980..f20667834e 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -29,6 +29,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.1.0
+      uses: codecov/codecov-action@v3
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index da4186e05b..150a5dfefa 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -38,7 +38,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.1.0
+      uses: codecov/codecov-action@v3
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index d1757cbccf..906dcefe4e 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -42,7 +42,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v2.1.0
+      uses: codecov/codecov-action@v3
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 24a1fb074368b787cb407a6a6020d1ada9a0dc62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Apr 2022 09:00:18 +0200
Subject: [PATCH 352/665] Bump actions/setup-java from 2 to 3 (#7411)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 2 to 3.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index f4735e9c82..3f59de0b6e 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 8
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 304ae0f563..96dc981f0b 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -16,7 +16,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index f20667834e..050297877a 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 8
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 150a5dfefa..a853b8ab4b 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 8
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 906dcefe4e..3ca4078d0a 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 8
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
         java-version: '8'

From 31ec3f406686e741a502c03850ff1a4213ba4846 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Apr 2022 08:59:22 +0200
Subject: [PATCH 353/665] Bump actions/cache from 3.0.1 to 3.0.2 (#7412)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.1 to 3.0.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.1...v3.0.2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 3f59de0b6e..0f469efbfe 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.1
+      uses: actions/cache@v3.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 96dc981f0b..47e27f16e8 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -21,7 +21,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.1
+      uses: actions/cache@v3.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 050297877a..826b753bb7 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -19,7 +19,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.1
+      uses: actions/cache@v3.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index a853b8ab4b..f64aee5155 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.1
+      uses: actions/cache@v3.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 3ca4078d0a..7769176779 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.1
+      uses: actions/cache@v3.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 64d35d33ffaa6a3e6565de748486633653bed233 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Apr 2022 08:47:43 +0200
Subject: [PATCH 354/665] Bump mockito-core from 4.4.0 to 4.5.0 (#7413)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.4.0...v4.5.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 80f9c11413..511603b27a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.4.0"
+    mockitoVersion = "4.5.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.1-jre"
 }

From e24bc6071bbd3437f5178a83dfd8514832a54f60 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Apr 2022 08:45:44 +0200
Subject: [PATCH 355/665] Bump mockito-core from 4.5.0 to 4.5.1 (#7414)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.5.0...v4.5.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 511603b27a..7f5003fb5e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.3"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.5.0"
+    mockitoVersion = "4.5.1"
     jmhLibVersion = "1.21"
     guavaVersion = "31.1-jre"
 }

From cc6d9a7b4c0cc4539400bb006e4c60dae0bf85e1 Mon Sep 17 00:00:00 2001
From: neilnaveen <42328488+neilnaveen@users.noreply.github.com>
Date: Wed, 18 May 2022 01:47:17 -0500
Subject: [PATCH 356/665] Set permissions for GitHub actions (#7410)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

 Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

Signed-off-by: neilnaveen <42328488+neilnaveen@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 3 +++
 .github/workflows/gradle_branch.yml             | 3 +++
 .github/workflows/gradle_jdk11.yml              | 3 +++
 .github/workflows/gradle_pr.yml                 | 3 +++
 .github/workflows/gradle_release.yml            | 3 +++
 .github/workflows/gradle_snapshot.yml           | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index ca7a9d263c..bf412cff23 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -1,6 +1,9 @@
 name: "Validate Gradle Wrapper"
 on: [push, pull_request]
 
+permissions:
+  contents: read
+
 jobs:
   validation:
     name: "Validation"
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 0f469efbfe..1dca46c832 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -7,6 +7,9 @@ on:
   push:
     branches-ignore: [ '3.x' ]
 
+permissions:
+  contents: read
+
 jobs:
   build:
 
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 47e27f16e8..4eda1a7de3 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -9,6 +9,9 @@ on:
   pull_request:
     branches: [ 3.x ]
 
+permissions:
+  contents: read
+
 jobs:
   build:
 
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 826b753bb7..be8657f042 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -7,6 +7,9 @@ on:
   pull_request:
     branches: [ 3.x ]
 
+permissions:
+  contents: read
+
 jobs:
   build:
 
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index f64aee5155..33112f78b0 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -10,6 +10,9 @@ on:
     tags:
       - 'v3.*.*'   
 
+permissions:
+  contents: read
+
 jobs:
   build:
 
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 7769176779..8011a11d9e 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -7,6 +7,9 @@ on:
   push:
     branches: [ '3.x' ]
 
+permissions:
+  contents: read
+
 jobs:
   build:
 

From 23c9f4d0ea0db6d35d58ac920f8714a3b36f1bb5 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Wed, 18 May 2022 10:28:45 +0200
Subject: [PATCH 357/665] Undo permissions on snapshot and release GHA

---
 .github/workflows/gradle_release.yml  | 3 ---
 .github/workflows/gradle_snapshot.yml | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 33112f78b0..f64aee5155 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -10,9 +10,6 @@ on:
     tags:
       - 'v3.*.*'   
 
-permissions:
-  contents: read
-
 jobs:
   build:
 
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 8011a11d9e..7769176779 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -7,9 +7,6 @@ on:
   push:
     branches: [ '3.x' ]
 
-permissions:
-  contents: read
-
 jobs:
   build:
 

From 4a665c91c68e33fa2907cccccdf7fc3cf053c7c9 Mon Sep 17 00:00:00 2001
From: Ptaha <pahakorolev@gmail.com>
Date: Fri, 27 May 2022 17:36:40 +0200
Subject: [PATCH 358/665] Remove @NonNull annotations for functions with void
 return type (#7425)

Co-authored-by: Pavel Korolev <pavel.korolev@onde.app>
---
 src/main/java/io/reactivex/rxjava3/core/Observable.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index c86972a7ad..f355bedf13 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -5520,7 +5520,6 @@ public final T blockingFirst(@NonNull T defaultItem) {
      * @see #blockingForEach(Consumer, int)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    @NonNull
     public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
         blockingForEach(onNext, bufferSize());
     }
@@ -5560,7 +5559,6 @@ public final void blockingForEach(@NonNull Consumer<? super T> onNext) {
      * @see #subscribe(Consumer)
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    @NonNull
     public final void blockingForEach(@NonNull Consumer<? super T> onNext, int capacityHint) {
         Objects.requireNonNull(onNext, "onNext is null");
         Iterator<T> it = blockingIterable(capacityHint).iterator();
@@ -12036,7 +12034,6 @@ public final Observable<T> retryWhen(
      * @throws NullPointerException if {@code observer} is {@code null}
      */
     @SchedulerSupport(SchedulerSupport.NONE)
-    @NonNull
     public final void safeSubscribe(@NonNull Observer<? super T> observer) {
         Objects.requireNonNull(observer, "observer is null");
         if (observer instanceof SafeObserver) {

From ebdccf45b0c21ac341dae7c5032392c6b6864b5b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 27 May 2022 20:29:24 +0200
Subject: [PATCH 359/665] Bump reactiveStreamsVersion from 1.0.3 to 1.0.4
 (#7424)

Bumps `reactiveStreamsVersion` from 1.0.3 to 1.0.4.

Updates `reactive-streams` from 1.0.3 to 1.0.4
- [Release notes](https://github.com/reactive-streams/reactive-streams/releases)
- [Changelog](https://github.com/reactive-streams/reactive-streams-jvm/blob/master/RELEASE-NOTES.md)
- [Commits](https://github.com/reactive-streams/reactive-streams/compare/v1.0.3...v1.0.4)

Updates `reactive-streams-tck` from 1.0.3 to 1.0.4
- [Release notes](https://github.com/reactive-streams/reactive-streams/releases)
- [Changelog](https://github.com/reactive-streams/reactive-streams-jvm/blob/master/RELEASE-NOTES.md)
- [Commits](https://github.com/reactive-streams/reactive-streams/compare/v1.0.3...v1.0.4)

---
updated-dependencies:
- dependency-name: org.reactivestreams:reactive-streams
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.reactivestreams:reactive-streams-tck
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 7f5003fb5e..042f5767d6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ plugins {
 }
 
 ext {
-    reactiveStreamsVersion = "1.0.3"
+    reactiveStreamsVersion = "1.0.4"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
     mockitoVersion = "4.5.1"

From 88453711ec1b0e03eb7ba02d42b51fe1330b3a73 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 May 2022 08:49:23 +0200
Subject: [PATCH 360/665] Bump mockito-core from 4.5.1 to 4.6.0 (#7426)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.5.1 to 4.6.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.5.1...v4.6.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 042f5767d6..2339c0df09 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.4"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.5.1"
+    mockitoVersion = "4.6.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.1-jre"
 }

From bec9a932653ea8dbfd7845a0bfbb3a9a01da99f3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 Jun 2022 08:41:56 +0200
Subject: [PATCH 361/665] Bump biz.aQute.bnd.builder from 6.2.0 to 6.3.0
 (#7432)

Bumps [biz.aQute.bnd.builder](https://github.com/bndtools/bnd) from 6.2.0 to 6.3.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/compare/6.2.0...6.3.0)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd.builder
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2339c0df09..728914465a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id("ru.vyarus.animalsniffer") version "1.5.4"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
-    id("biz.aQute.bnd.builder") version "6.2.0"
+    id("biz.aQute.bnd.builder") version "6.3.0"
     id("com.vanniktech.maven.publish") version "0.19.0"
     id("org.beryx.jar") version "1.2.0"
 }

From 8e6bc11b141093af619a8f423dca01a32a80e2a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 Jun 2022 09:25:10 +0200
Subject: [PATCH 362/665] Bump mockito-core from 4.6.0 to 4.6.1 (#7434)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.6.0...v4.6.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 728914465a..71320e73a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.4"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.6.0"
+    mockitoVersion = "4.6.1"
     jmhLibVersion = "1.21"
     guavaVersion = "31.1-jre"
 }

From a61ae642cdbebd3f7cc35803f8e0bac91d1fc175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klemen=20Ko=C5=A1ir?= <klemen.kosir@kream.io>
Date: Sat, 4 Jun 2022 15:40:30 +0900
Subject: [PATCH 363/665] 3.x: Add missing `@NonNull` annotation to `Maybe`
 type argument (#7436)

---
 src/main/java/io/reactivex/rxjava3/core/Maybe.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 83bcd68144..24f5d8bab0 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -110,7 +110,7 @@
  * @since 2.0
  * @see io.reactivex.rxjava3.observers.DisposableMaybeObserver
  */
-public abstract class Maybe<T> implements MaybeSource<T> {
+public abstract class Maybe<@NonNull T> implements MaybeSource<T> {
 
     /**
      * Runs multiple {@link MaybeSource}s provided by an {@link Iterable} sequence and

From 2e0033d3ac9d1816d548544b8fde5547dc158869 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 4 Jun 2022 08:41:08 +0200
Subject: [PATCH 364/665] Bump actions/cache from 3.0.2 to 3.0.3 (#7430)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.2...v3.0.3)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 1dca46c832..1668c79db3 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.2
+      uses: actions/cache@v3.0.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 4eda1a7de3..68d0c01923 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.2
+      uses: actions/cache@v3.0.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index be8657f042..c8600a6570 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.2
+      uses: actions/cache@v3.0.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index f64aee5155..fd7df4a532 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.2
+      uses: actions/cache@v3.0.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 7769176779..75b967fe31 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.2
+      uses: actions/cache@v3.0.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From f359ca1f5ba94b0439cf3e6d8339acdd33b54563 Mon Sep 17 00:00:00 2001
From: Siddhant Khare <siddhant@gitpod.io>
Date: Mon, 6 Jun 2022 14:30:41 +0530
Subject: [PATCH 365/665] Enable software development from any device via
 https://gitpod.io (#7437)

Learn more about this file at 'https://www.gitpod.io/docs/references/gitpod-yml'
---
 .gitpod.yml | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md   |   1 +
 2 files changed, 140 insertions(+)
 create mode 100644 .gitpod.yml

diff --git a/.gitpod.yml b/.gitpod.yml
new file mode 100644
index 0000000000..954870bba6
--- /dev/null
+++ b/.gitpod.yml
@@ -0,0 +1,139 @@
+## Learn more about this file at 'https://www.gitpod.io/docs/references/gitpod-yml'
+##
+## This '.gitpod.yml' file when placed at the root of a project instructs
+## Gitpod how to prepare & build the project, start development environments
+## and configure continuous prebuilds. Prebuilds when enabled builds a project
+## like a CI server so you can start coding right away - no more waiting for
+## dependencies to download and builds to finish when reviewing pull-requests
+## or hacking on something new.
+##
+## With Gitpod you can develop software from any device (even iPads) via 
+## desktop or browser based versions of VS Code or any JetBrains IDE and
+## customise it to your individual needs - from themes to extensions, you
+## have full control.
+##
+## The easiest way to try out Gitpod is install the browser extenion:
+## 'https://www.gitpod.io/docs/browser-extension' or by prefixing
+## 'https://gitpod.io#' to the source control URL of any project.
+##
+## For example: 'https://gitpod.io#https://github.com/gitpod-io/gitpod'
+
+
+## The 'image' section defines which Docker image Gitpod should use. 
+## By default, Gitpod uses a standard Docker Image called 'workspace-full'
+## which can be found at 'https://github.com/gitpod-io/workspace-images'
+##
+## Workspaces started based on this default image come pre-installed with
+## Docker, Go, Java, Node.js, C/C++, Python, Ruby, Rust, PHP as well as
+## tools such as Homebrew, Tailscale, Nginx and several more.
+##
+## If this image does not include the tools needed for your project then
+## a public Docker image or your own Docker file can be configured.
+## 
+## Learn more about images at 'https://www.gitpod.io/docs/config-docker'
+
+#image: node:buster                        # use 'https://hub.docker.com/_/node'
+#
+#image:                                    # leave image undefined if using a Dockerfile
+#  file: .gitpod.Dockerfile                # relative path to the Dockerfile from the
+#                                          # root of the project
+
+## The 'tasks' section defines how Gitpod prepares and builds this project
+## or how Gitpod can start development servers. With Gitpod, there are three
+## types of tasks:
+##
+## - before: Use this for tasks that need to run before init and before command. 
+## - init: Use this to configure prebuilds of heavy-lifting tasks such as
+##         downloading dependencies or compiling source code.
+## - command: Use this to start your database or application when the workspace starts.
+##
+## Learn more about these tasks at 'https://www.gitpod.io/docs/config-start-tasks'
+
+#tasks:
+#  - before: |
+#      # commands to execute...
+#
+#  - init: |
+#      # sudo apt-get install python3     # can be used to install operating system 
+#                                         # dependencies but these are not kept after the
+#                                         # prebuild completes thus Gitpod recommends moving
+#                                         # operating system dependency installation steps
+#                                         # to a custom Dockerfile to make prebuilds faster
+#                                         # and to keep your codebase DRY.  
+#                                         # 'https://www.gitpod.io/docs/config-docker'
+#
+#      # pip install -r requirements.txt  # install codebase dependencies
+#      # cmake                            # precompile codebase
+#
+#  - name: Web Server
+#    openMode: split-left
+#    env:
+#      WEBSERVER_PORT: 8080
+#    command: |
+#     python3 -m http.server $WEBSERVER_PORT
+#
+#  - name: Web Browser
+#    openMode: split-right
+#    env:
+#      WEBSERVER_PORT: 8080
+#    command: |
+#     gp await-port $WEBSERVER_PORT
+#     lynx `gp url`
+
+tasks:
+  - command: ./gradlew build
+
+## The 'ports' section defines various ports your may listen on are 
+## configured in Gitpod on an authenticated URL. By default, all ports
+## are in private visibility state.
+##
+## Learn more about ports at 'https://www.gitpod.io/docs/config-ports'
+
+#ports:
+#  - port: 8080 # alternatively configure entire ranges via '8080-8090'
+#    visibility: private # either 'public' or 'private' (default)
+#    onOpen: open-browser # either 'open-browser', 'open-preview' or 'ignore'
+
+
+## The 'vscode' section defines a list of Visual Studio Code extensions from
+## the OpenVSX.org registry to be installed upon workspace startup. OpenVSX
+## is an open alternative to the proprietary Visual Studio Code Marketplace
+## and extensions can be added by sending a pull-request with the extension
+## identifier to https://github.com/open-vsx/publish-extensions
+##
+## The identifier of an extension is always ${publisher}.${name}.
+##
+## For example: 'vscodevim.vim'
+##
+## Learn more at 'https://www.gitpod.io/docs/ides-and-editors/vscode'
+
+#vscode:
+#  extensions: 
+#    - vscodevim.vim
+#    - esbenp.prettier-vscode@9.5.0
+#    - https://example.com/abc/releases/extension-0.26.0.vsix
+
+
+## The 'github' section defines configuration of continuous prebuilds
+## for GitHub repositories when the GitHub application
+## 'https://github.com/apps/gitpod-io' is installed in GitHub and granted
+## permissions to access the repository.
+##
+## Learn more at 'https://www.gitpod.io/docs/prebuilds'
+
+github: 
+  prebuilds:
+    # enable for the default branch
+    master: true
+    # enable for all branches in this repo
+    branches: true
+    # enable for pull requests coming from this repo
+    pullRequests: true
+    # enable for pull requests coming from forks
+    pullRequestsFromForks: true
+    # add a check to pull requests
+    addCheck: true
+    # add a "Review in Gitpod" button as a comment to pull requests
+    addComment: false
+    # add a "Review in Gitpod" button to the pull request's description
+    addBadge: true
diff --git a/README.md b/README.md
index 7449fa7f8b..53a42ee983 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,7 @@
 <a href='https://github.com/ReactiveX/RxJava/actions?query=workflow%3ASnapshot'><img src='https://github.com/ReactiveX/RxJava/workflows/Snapshot/badge.svg'></a>
 [![codecov.io](http://codecov.io/github/ReactiveX/RxJava/coverage.svg?branch=3.x)](https://codecov.io/gh/ReactiveX/RxJava/branch/3.x)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava)
+[![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/ReactiveX/RxJava)
 
 RxJava is a Java VM implementation of [Reactive Extensions](http://reactivex.io): a library for composing asynchronous and event-based programs by using observable sequences.
 

From 73a57dd1064bbfc44a7af7a7461f5613fc52393c Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 6 Jun 2022 12:19:04 +0200
Subject: [PATCH 366/665] 3.x: Remove redundant interface declarations (#7438)

* 3.x: Remove redundant interface declarations

* Fix paramvalidator
---
 .../operators/flowable/FlowableBufferExactBoundary.java        | 2 +-
 .../rxjava3/internal/operators/flowable/FlowableObserveOn.java | 3 +--
 .../rxjava3/internal/operators/flowable/FlowableToList.java    | 2 +-
 .../operators/observable/ObservableBufferExactBoundary.java    | 2 +-
 .../reactivex/rxjava3/internal/schedulers/NewThreadWorker.java | 2 +-
 .../rxjava3/internal/schedulers/TrampolineScheduler.java       | 2 +-
 .../rxjava3/validators/ParamValidationCheckerTest.java         | 3 ++-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
index e543272a39..3e2abefdd9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableBufferExactBoundary.java
@@ -45,7 +45,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
     }
 
     static final class BufferExactBoundarySubscriber<T, U extends Collection<? super T>, B>
-    extends QueueDrainSubscriber<T, U, U> implements FlowableSubscriber<T>, Subscription, Disposable {
+    extends QueueDrainSubscriber<T, U, U> implements Subscription, Disposable {
 
         final Supplier<U> bufferSupplier;
         final Publisher<B> boundary;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
index 4e9f83e41e..05dd11b816 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
@@ -244,8 +244,7 @@ public final boolean isEmpty() {
         }
     }
 
-    static final class ObserveOnSubscriber<T> extends BaseObserveOnSubscriber<T>
-    implements FlowableSubscriber<T> {
+    static final class ObserveOnSubscriber<T> extends BaseObserveOnSubscriber<T> {
 
         private static final long serialVersionUID = -4547113800637756442L;
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
index 2b7c19e269..3f03d93112 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableToList.java
@@ -46,7 +46,7 @@ protected void subscribeActual(Subscriber<? super U> s) {
 
     static final class ToListSubscriber<T, U extends Collection<? super T>>
     extends DeferredScalarSubscription<U>
-    implements FlowableSubscriber<T>, Subscription {
+    implements FlowableSubscriber<T> {
 
         private static final long serialVersionUID = -8134157938864266736L;
         Subscription upstream;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
index 5892e092b9..bb65058908 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferExactBoundary.java
@@ -43,7 +43,7 @@ protected void subscribeActual(Observer<? super U> t) {
     }
 
     static final class BufferExactBoundaryObserver<T, U extends Collection<? super T>, B>
-    extends QueueDrainObserver<T, U, U> implements Observer<T>, Disposable {
+    extends QueueDrainObserver<T, U, U> implements Disposable {
 
         final Supplier<U> bufferSupplier;
         final ObservableSource<B> boundary;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
index deba4948ba..764241e76e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/NewThreadWorker.java
@@ -26,7 +26,7 @@
  * worker but doesn't perform task-tracking operations.
  *
  */
-public class NewThreadWorker extends Scheduler.Worker implements Disposable {
+public class NewThreadWorker extends Scheduler.Worker {
     private final ScheduledExecutorService executor;
 
     volatile boolean disposed;
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
index 7ed777f08f..04496482b0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/TrampolineScheduler.java
@@ -62,7 +62,7 @@ public Disposable scheduleDirect(@NonNull Runnable run, long delay, TimeUnit uni
         return EmptyDisposable.INSTANCE;
     }
 
-    static final class TrampolineWorker extends Scheduler.Worker implements Disposable {
+    static final class TrampolineWorker extends Scheduler.Worker {
         final PriorityBlockingQueue<TimedRunnable> queue = new PriorityBlockingQueue<>();
 
         private final AtomicInteger wip = new AtomicInteger();
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 51c7626ed5..8b5fb4380d 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -560,6 +560,7 @@ public void checkParallelFlowable() {
         for (Class<?> interfaces : AllFunctionals.class.getInterfaces()) {
             defaultValues.put(interfaces, af);
         }
+        defaultValues.put(Subscriber.class, af);
         defaultValues.put(TimeUnit.class, TimeUnit.SECONDS);
         defaultValues.put(Scheduler.class, Schedulers.single());
         defaultValues.put(BackpressureStrategy.class, BackpressureStrategy.MISSING);
@@ -926,7 +927,7 @@ static final class AllFunctionals
     Function3, Function4, Function5, Function6, Function7, Function8, Function9,
     FlowableOnSubscribe, ObservableOnSubscribe, SingleOnSubscribe, MaybeOnSubscribe, CompletableOnSubscribe,
     FlowableTransformer, ObservableTransformer, SingleTransformer, MaybeTransformer, CompletableTransformer,
-    Subscriber, FlowableSubscriber, Observer, SingleObserver, MaybeObserver, CompletableObserver,
+    FlowableSubscriber, Observer, SingleObserver, MaybeObserver, CompletableObserver,
     FlowableOperator, ObservableOperator, SingleOperator, MaybeOperator, CompletableOperator,
     Comparator, ParallelTransformer
     {

From e338cc591de4ba393f823d125289ea69bed10e2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Jun 2022 08:37:04 +0200
Subject: [PATCH 367/665] Bump actions/cache from 3.0.3 to 3.0.4 (#7439)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.3 to 3.0.4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.3...v3.0.4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 1668c79db3..bcd144ab88 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.3
+      uses: actions/cache@v3.0.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 68d0c01923..4ca82909f7 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.3
+      uses: actions/cache@v3.0.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index c8600a6570..a0abf601a6 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.3
+      uses: actions/cache@v3.0.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index fd7df4a532..3d474c5d52 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.3
+      uses: actions/cache@v3.0.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 75b967fe31..2cb7a43527 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.3
+      uses: actions/cache@v3.0.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From c982fbacc148a520fe5117e77439895ec6792155 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Jun 2022 08:37:22 +0200
Subject: [PATCH 368/665] Bump biz.aQute.bnd.builder from 6.3.0 to 6.3.1
 (#7440)

Bumps [biz.aQute.bnd.builder](https://github.com/bndtools/bnd) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/compare/6.3.0...6.3.1)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd.builder
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 71320e73a1..8cf9e5997d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id("ru.vyarus.animalsniffer") version "1.5.4"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
-    id("biz.aQute.bnd.builder") version "6.3.0"
+    id("biz.aQute.bnd.builder") version "6.3.1"
     id("com.vanniktech.maven.publish") version "0.19.0"
     id("org.beryx.jar") version "1.2.0"
 }

From 753f630f36f3271b0087f69569295878572f8683 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 12 Jun 2022 15:08:09 +0200
Subject: [PATCH 369/665] 3.x: Fix formatting in
 TestObserver/Consumer/Subscriber javadoc html (#7442)

---
 gradle/javadoc_cleanup.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/gradle/javadoc_cleanup.gradle b/gradle/javadoc_cleanup.gradle
index 4c3386a6ef..63b4f7f045 100644
--- a/gradle/javadoc_cleanup.gradle
+++ b/gradle/javadoc_cleanup.gradle
@@ -26,6 +26,10 @@ task javadocCleanup(dependsOn: "javadoc") doLast {
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/parallel/ParallelFlowable.html'))
 
     fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/disposables/Disposable.html'))
+    
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/observers/TestObserver.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/observers/BaseTestConsumer.html'))
+    fixJavadocFile(rootProject.file('build/docs/javadoc/io/reactivex/rxjava3/subscribers/TestSubscriber.html'))
 }
 
 def fixJavadocFile(file) {

From e26f95d105f5369ea58df95422c02d10461b6219 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Jul 2022 08:38:16 +0200
Subject: [PATCH 370/665] Bump actions/cache from 3.0.4 to 3.0.5 (#7449)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.4 to 3.0.5.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.4...v3.0.5)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index bcd144ab88..4872bce0ad 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.4
+      uses: actions/cache@v3.0.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 4ca82909f7..b3059cba76 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.4
+      uses: actions/cache@v3.0.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index a0abf601a6..2235ff7d87 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.4
+      uses: actions/cache@v3.0.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 3d474c5d52..2d22a6c8b0 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.4
+      uses: actions/cache@v3.0.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 2cb7a43527..f6c1f93d91 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.4
+      uses: actions/cache@v3.0.5
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From f9809600b332ea9c1c34d47256549bc5c8d2b1b3 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Thu, 14 Jul 2022 22:04:29 +0200
Subject: [PATCH 371/665] Upgrade to Gradle 7.5 (#7451)

* Upgrade to Gradle 7.5

* Previous run didn't change these files for some reason
---
 gradle/wrapper/gradle-wrapper.jar        | Bin 59821 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  |   6 ++++++
 gradlew.bat                              |  14 ++++++++------
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 41d9927a4d4fb3f96a785543079b8df6723c946b..249e5832f090a2944b7473328c07c9755baa3196 100644
GIT binary patch
delta 10197
zcmaKS1ymhDwk=#NxVyW%y9U<)A-Dv)xI0|j{UX8L-JRg>5ZnnKAh;%chM6~S-g^K4
z>eZ{yK4;gd>gwvXs=Id8Jk-J}R4pT911;+{Jp9@aiz6!p1Oz9z&_kGLA%J5%3Ih@0
zQ<O^-Cq~pK_0~xFYk3Z5b=x+Gc!CBvPg#Qm03Ht7TLpV33sws!V^bS5R#z9G4J*_e
z0fhg52>|U}%$)3u|G`jIfPzMVfcWs?jV2BO^*3+q2><~>3j+Z`^Z%=;19VWg0XndJ
zwJ~;f4$;t6pBKaWn}UNO-wLCFHBd^1)^v%$P)fJk1PbK5<;Z1K&>k~MUod6d%@Bq9
z>(44uiaK&sdhwTTxFJvC$JDnl;f}*Q-^01T508(8{+!<?bJ6?pfAxk#E)6(B(Q@!b
z*uc_zJh_bx0GX%1@mcR?c4zalmrD*Q>WyquuyB7R!d!J)8Ni0p!cV6$CHsLLy6}7C
zYv_$eD;)@L)tLj0GkGpBoa727hs%wH$>EhfuFy{_8Q8@1HI%ZAjlpX$ob{=%g6`Ox
zLzM!d^<r||X)|@-F*NoYE4-I79D`2A4mE-(Pp0k;Yun*<?$N#`RnYFk$ajW5cnnZS
zb`^Jx$Ihd#LABFK%4NZ}VWseG?E!we*^3lx)DFlhv(cX`&F4!5!fx@xN~IN~HnEK{
z>zy`VV1dT9U9(^}YvlTO9Bf8v^wMK37`4wFNFzW?HWDY(U(k6@tp(crHD)X5>8S-#
zW1qgdaZa*Sh6i%60e1+hty}34dD%vKgb?QmQiZ=-j+isA4={V_*R$oGN#j|#ia@n6
zuZx4e2Xx?^lUwYFn2&Tmbx0qA3Z8;y+zKoeQu;~<u=@uEY<<$7I|857D+K|o{E|cS
zMfExbi^GvJk+AtG_!AO%bSzL58@h!2O%ny39%|^~;#8EC`yDupY9^NS2)ASi;}mni
z7UD!JFmrJmkI>k~FZGy!FU_TFxYd!Ck;5QvMx9gj5<a40Lv6~NRM>fI2@BLNp~Ps@
zf@k<&Q2GS5Ia9?_D?v~$I%_CLA4x~eiKIZ>9w^c#r|vB?wXxZ(vXd*vH(Fd%Me8p(
z=_0)k=iRh%8i`FYRF<SjNS~_n(trKogAV(-Gmv_Vj%4eIeSn-Wr~LJtW&%0W<?P_A
zk|__{_A2ve(Na^DQlnju+Zj)LWq~W=*(uwceS&h=TCb>>E97uOFTBfajv{IOz(7CU
zv0Gd84+o&ciHlVtY)wn6yhZTQQO*4Mvc#dxa>h}82mEKKy7arOqU$enb9sgh#E=Lq
zU;_RVm{)30{bw+|056%jMVcZRGEBSJ+JZ@jH#~DvaDQm92^TyUq=bY*+AkEakpK>8
zB{)CkK48&nE5AzTqT;WysOG|!y}5fshxR8Ek(^H6i>|Fd&wu?c&Q@N9ZrJ=?ABHI!
z`*z8D`w=~AJ!P-9M=T}f`;76$qZRllB&8#9WgbuO$P7lVqdX1=g*t=7z6!0AQ^ux_
z9rcfUv^t}o_l-ZE+TqvqFsA*~<S>W<c?WtRgS&acm+C5)#yy}mM+EK5d%8S0F}p)j
z?W@F~?JLBv><^78!k;~!i8(eS+(+@u8FxK+Q7;mHZ<1}|4m<}vh@p`t%|@eM_J(P%
zI>M7C)Ir{l|J;$G_EGGEhbP4?6{sYzMq<n-ko4N6*_eUGagQqx`%!Bb;@Kq!$_)hO
zd(9m$*aj4>Bv+x95N&YWFH6UcE@b}B?q)G*4<4mR@sy1#vPnLMK51tb#ED(8TA1nE
zYfhK7bo1!R5WJF$5Y?zG21)6+_(_5oSX9sGIW;(O&S?Rh(nydNQYzKjjJ54aDJ-1F
zrJ=np8LsN?%?Rt7f~3aAX!2E{`fh_pb?2(;HOB3W+I*~A>W%iY+v45+^e$cE10fA}
zXPvw9=Bd+(;+!rl)pkYj0HGB}+3Z!Mr;zr%gz~c-hFMv8b2VRE<avT?v}FQ2e2#<J
z^tm1xP<!REkV?^QH-aeEM=dlex5kXWNMEppG{Q1MF?PSzDh}8zV*mtM>2R$8V=_XE
zq$3=|Yg05(fmwrJ)QK2ptB4no`Y8Dg_vK2QDc6-6sXRQ5k78-+cPi-fH}vpgs|Ive
zE=m*XNVs?EWgiNI!5AcD*3QMW)R`EqT!f0e1%hERO&?AT7HWnSf5@#AR{OGuXG3Zb
zCnVWg7h|61lGV3k+>L<#d>)InG>ETn1DbOHCfztqzQ_fBiaUt@q6VMy={Fe-w#~2-
z0?*f|z$zgjI9>+JVICObBaK=pU}AEOd@q(8d?j7zQFD@=6t`|KmolTr2MfBI$;EGh
zD%W0cA_d#V6Lb$us5yIG(|d>r-QleC4;<YTI~54sp$!P#vG%ec52;?>%hEu5W9hyY
zY#+ESY&v`8(&mC~?*|e5WEhC!YU2>m_}`K+q9)a(d$bsS<=YkyZGp}YA%TXw>@abA
zS_poVPoN+?<6?DAuCNt&5SHV(h<spnk3IE^a__|@91Lh62kQkNM81pBLnY<<g`QI9
ztB$hLSf{?qf+{5F2Oo}7zBbu%NtxWZ4P_a~EbKM(JEI2%CxFqSU@4V@Sh#vW*r{?P
zB#Y?hk85m3AnQ<c&;E6w^!92L)2z)LXI0dyn=!xYeA>p56PJ}<N>)swwVFZFXM->F
zc|0c8<$H_OV%DR|y7e+s$12@Ac8SUClPg8_O9sTUjpv%6Jsn5vsZCg>wL+db4c+{+
zsg<#wOuV4jeOq`veckdi-1`dz;gvL)bZeH|D*x=8UwRU5&8W1@l>3$)8WzET0%;1J
zM3(X<7tKK&9~kWRI{&FmwY5Gg!b5f4k<m?4&n0&IW4)9E<|#9h`sX+r;+Sfu9P_nD
z+yR!W3G!DE7k9SBt!t&{cpx{fgb5IyIJgkH2C475{*!DTG+h3=DqUKId}&Ts4OMr=
z-Lk;OP*VtMaQkkH+G5pd4ts8q^SbSz3CkD6o~$;b11R^Sz&<+6Q0xqDTj7jm&z)jd
zGpPDwfUg~oQLp9s^;mv5HXsa)R=8T?wPiayUSA4gx+ZVmNt<Lb$$s|uaMCu^(#i8G
zw1yTTO`rzuT17vx^_$PChh6W1<zgQ2&zn2z&~U$blKbmTcOl1%Ye2Y?lEK=S;xk~V
zI6lr`X$F(=_rju)F_P$nT-z!dq0*#Tj+racN5(@-xrS#-w=~aCz?SS8t+af%1WoLE
zaY7M<O5tA2n;<yfFp_n=A@v>I_vSm)H1#>l6M+OiReDXC{kPy!`%Ecq-+3yZTk=<`
zm)pE6xum5q0Qkd#iny0Q-S}@I0;mDhxf>sX)Oiv)F<vjo`zY?&puikx7ilk_mb}c{
zq)`hrqDl~&8IVZ;%F_V>dsAMnpx%oe8OQ`m%Xeozdzx!C1rQR>m1c_}+J4x)K}k{G
zo68;oGG&Ox7w^-m7{g4a7NJu-B|~M;oIH~~#`RyUNm##feZH;E?pf}nshmoiIY52n
z%pc%lnU4Q#C=RUz)RU6}E_j4#)jh<&a%JyJj$Fufc#&COaxFHtl}zJUGNLBu3~_@1
zn9F^JO9);Duxo&i@>X(kbYga1i>6p1fca8FzQ0>((Lb-aPUbC*d~a03V$y;*RBY!R
ziEJ2IF^FjrvO}0Uy{cMn%u<+P5U!UO>pm9#ZYL5i6|xSC+np7IH$GfXs&uI;y4as@
z&AzJh>(S2?3PKKgab3Z(`xbx(C#46XIvVcW8eG_DjT~}Yz_8PWZ`uf6^Xr=vkvL_`
zqmvfgJL+Zc`;iq~iP?%@G7}~fal-zqxa0yNyHBJJ5M)9bI>7S_cg?Ya&p(I)C5Ef4
zZ>YAF6x|U=?ec?g*|f2g5Tw3PgxaM_bi_5Az9MO$;_Byw(2d}2%-|bg4ShdQ;)Z|M
z4K|tFv)q<QA9tQW&>x*kKG<UoBfWKnrluT^xCn0tM9o4}l?bc#NGPg(A_D!<{nnUP
zto-{aluuL|tH1ysl4mMt>Koyh!DQY<{n&UmAChq@DJrQP>EY7g1JF(ih*D8wCVWyQ
z5Jj^|-NVFSh5T0vd1>hUvPV6?=`90^_)t(L9)XOW7jeP45NyA2lzOn&QAPTl&d#6P
zSv%36uaN(9i9WlpcH#}rmiP#=L0q(dfhdxvFVaOwM;pY;KvNQ9wMyUKs6{d}29DZQ
z{H3&Sosr6)9Z+C>Q5)iHSW~gGoWGgK-0;k~&dyr-bA3O|3PCNzgC?UKS_B=^i8Ri^
zd_*_qI4B07Cayq|p4{`U_E_P=K`N_~{F|+-+`sCgcNxs`%X!$=(?l2aAW}0M=~COb
zf19oe^iuAUuDEf)4tgv<=WRPpK@IjToNNC*#&Ykw!)aqWU4h#|U@(cG_=Qx+&xt~a
zvCz~Ds3F71dsjNLkfM%TqdVNu=RNMOzh7?b+%hICbFlOAPphrYy>7D-e7{%o_kPFn
z;T!?ilE-LcKM0P(GKMseEeW57V<tlAo>s`=FF}(y@^pQl;rL3fHs8icmA+!6YJt&8
ztSF?%Un35qkv>drkks&BNTJv~xK?vD;aBkp7eIkDYqn+G0%;sT4FcwAoO+vke{8CO
z0d76sgg$CannW5T#q`z~L4id)9BCKRU0A!Z-{HpXr)QJrd9@iJB+l32Ql)Z}*v(St
zE)Vp=BB=DDB4Pr}B(UHNe31<@!6d{U?XDoxJ@S)9QM)2L%SA0x^~^fb=bdsBy!uh&
zU?M_^kvnt%FZzm+>~bEH{2o?v&Iogs`1t-b+Ml`J!ZPS(46YQJKxWE81O$HE5w;**
z|8zM%b<P!=V80vC&wdV8%cT3nwwf6~$t4l-sO-5A%ebXvlA2L8pVYtXQZzXY$M6%M
ze)wC2bmFbVW}(~&t@TIjWdDqR5ILBR7@gRLB4nA`?nQHS;kxXfigh2{LT{7J)YuJ~
zGQW>p`M7J8)4;%DqH`wVTmM0V@D}xd%tRE3_6>ioMJxyi5Hkb>85muF81&EY!73ei
zA3e<<qO_c8yq=yLbH&FqA&}`j*7IF1pCW<jb4gsxO1Sf5SBafePz?iVytV)a)dYPt
z^aNk@DhdXe^hRj9@Op&vNV@GnLcnfl?x4@B^VWoEV&~lA){>#ug||EZJ=1GLXNJ)A
z791&ge#lF;GVX6IU?iw0jX^1bYaU?+x{zPlpyX6zijyn*nEdZ$fxxkl!a-~*P3bkf
zPd*pzu~3GBYkR_>ET`5UM^>>zTV>5m>)f=az{d0sg6a8VzUtXy$ZS?h#Gk-CA?7)c
zI%V<fylV`Da&=)=@DjL4n?<QK9>u9DN6XSDQn6;?n9`>l$q&>s?K)R8*OsmI+$L_m
z_~E`}w694Z*`Xk3Ne<LLq$I$+cT2!~+DJ5P>=497Si~=RWRqCM?6=88smrxle#s*W
znwhTRsMRmg?37GLJ-)%nDZA7r$YG8<JaQ4p5UASYiCJ@9C0kf>49j8mJWir1bWBy&
zZPneYojSbooC8U@tkO`bWx4%E5*;p#Q^1^S3lsfy7(6A{jL0`A__0vm?>xC%1y8_m
z57FfWr^@YG2I1K7MGYuYd>JC}@sT2n^<d-5CA9Ky>rkrY3w%~$J$Y~HSoOHn?zpR$
zjLj_bq@Yj8kd~DXHh30KVbz@K)0S;hPKm+S&-o%IG+@x@MEcrxW2KFh;z^4dJDZix
zGRGe&lQD$p)0<yfJek$i=GzXG8)!_1+O2ecN%1Xej&oIuu-us3edbK8fAQf4vtnGF
z)MF^lXY58)r&kBBpx0TsQBP!(FsjWL($vjwp>JVF4NRgGYuh0bYLy)BCy~sbS3^b3
zHixT<%-Vwbht|25T{3^Hk;qZ^3s!OOgljHs+EIf~C%=_>R5%vQI4mQR9qOXThMXlU
zS|oSH>0PjnCakb*js2{ObN`}<ncl}<!H;d*fRUl37zwj`W^P)M_F>%HYsT6=%(xA|
znpUtG_TJ08kHgm5l@G|t?4E3tG2fq?wNtIp*Vqrb{9@bo^~Rx7+J&OnayrX`LDcF~
zd@0m0ZJ#Z@=T>4kTa5e2FjI&5c(F7S{gnRPoGpu9eIqrtSvnT_tk$8T)r%YwZw!gK
zj*k@cG)V&@t+mtDi37#>LhVGTfRA^p%x0d#_P|Mktz3*KOoLIqFm`~KGoDDD4OOxe
z?}ag_c08u%vu=5Vx=~uoS8Q;}+R2~?Uh|m-+`-2kDo$d6T!nD*hc#dB(*R{LXV=zo
z`PJP0V=O!@3l-bw+d`X6(=@fq=4O#ETa8M^fOvO4qja9o3e8ANc9$sI=A4$zUut~w
z4+JryRkI{9qWxU1CCMM$@Aj=6)P+z?vqa=UCv_4XyVNoBD{Xb~Oi4cjjhm8fRD!*U
z2)zaS;AI78^Wq+5mDInKiMz|z#K`2emQfNH*U;{9^{NqSMVoq?RSo43<8YpJM^+W$
zxy!A5>5Zl16Vi<mkPbqha1%6>#?nAYywu3w_=KWnd3*QetocWt`3pK67>)ZVwnT3h
zbPdD&MZkD?q=-N`MpCCwpM74L+Tr1aa)zJ)8G;(Pg51@U&5W>aNu9rA`bh{vgfE={
zdJ>aKc|2Ayw_bop+dK?Y5$q--WM*+$9&3Q9BBiwU8L<-`T6E?ZC`mT0b}%HR*LPK}
z!MCd_Azd{36?Y_>yN{U1w5yrN8q`z(Vh^RnEF+;4b|2+~lfAvPT!`*{MPiDioiix8
zY*GdCwJ{S(5(HId*I%8XF=pHFz<9tAe;!D5$Z(iN#jzSql4sq<u>X5!7Y?q4_%$lH
zz8ehZuyl0K=E&gYhlfFWabnSiGty$>md|PpU1VfaC5~kskDnZX&Yu}?-h;OSav=8u
z=e3Yq=mi$4A|sB-J00;1d{Sd1+!v0NtU((Nz2;PFFlC}V{@p&4wGcVhU&nI($RAS!
zwXn7)?8~1J3*4+VccRSg5JS<(bBhBM&{ELMD4C_NTpvzboH!{Zr*%HP;{UqxI#g&7
zOAqPSW5Qus$8-xtTvD%h{Tw<2!XR(lU54LZG{)Cah*LZbpJkA=PMawg!O>X@<IQ2p
znC6R|9408c_QFNZsn=636E>&%+5XiyeIf91n2E*hl$k-Y(3iW*E}Mz-h~H~7S9I1I
zR#-j`|Hk?$MqFhE4C@=n!hN*o5+M%NxRqP+aLxDdt=wS6rAu6ECK*;AB%Nyg0uyAv
zO^DnbVZZo*<JtCOd+ot3=wf?KEvOrH7577(Ao5>|Ef{nsYN>cjZC$OHzR_*g%T#oF
zCky9HJS;NCi=7(07tQXq?V8I&<nFNVvHtr8LzXYdLElI32|80RI3N7{#L|6X@2@9e
zQD+zx4>OA&kPlJ_dfSRdL2bRUt;tA3yKZRMHMXH&#W@$l%-{<TTL*ePdqZ8SQC2UF
zXgS1ZPCn|y-N4|QF5ON_CUZ=zhc-L2+x+$uG5Q@OWcgdthjczI%#6a<4MS!iX!bP*
zDv0zzhD*fqcfkwZd^@EAQ!yu|1Q(<Cj2SK+D2kN#NckzhckAE+5A*`9F}9&wWP{LB
zK}Qnp-foNRmd<833|~|?_l2?NtewW{4yI!=>vQd7y@~i*^qnj^`Z{)V$6@l&!qP_y
zg2oOd!Wit#)2A~w-eqw3*Mbe)U?N|q6sXw~E~&$!!@QYX4b@%;3=>)@Z#K^`8~Aki
z+LYKJu~Y$;F5%_0aF9$MsbGS9Bz2~VUG@i@3Fi2q(hG^+Ia44LrfSfqtg$4{%qBDM
z_9-O#3V+2~W$dW0G)R7l_R_vw(KSkC--u&%Rs^Io&*?R=`)6BN64>6>)`TxyT_(Rd
zUn+aIl1mPa#Jse9B<vA~=lqzUvt_UyTM=xa+c^!fAI~;s`9ShC)AiH}NPkIukTtsP
zf1^Hx!M@5ui2mr}FhyvkvbUJpCcRb(o>3`!T=|e!pIp$(8ZO<LuX0(RW04Y534!dV
zmNMz}N};-Ei1(u4H@cll?UoW9!w$sOSQu7MK-uS~1MdW-3Ggp->e0ao?nS7o?oKlj
zypC-fMj1DHIDrh1unUI1vp=-Fln;I9e7Jvs3wj*^_1&<PbaOp$|83~4xhA9o>W|X}
zZSL|S|Bb@CV*YC_-T&2!Ht3b6?)d`tHOP?rA;;t#zaXa0Sc;vGnV0BLIf8f-r{QHh
z*Zp`4_ItlOR7{u(K+!p_o<!m?D-EYax~uK?vgiqCvlfVETqha$^z0*hxJ%tqIg!`c
zCWyYZ?;{;cs{JE(@$DZ9B~ps|28WU(quh_w;G_$)n3%Z^`iV0)m?DQ%v$!Nb6Ya;N
z(_~-)&c5CkMSAD1{0}5@7m607<F0eBF1+eok+!$`$=LP}`O?Gfzqlu<U!8k-K3U5!
zXL?f~bIyYdy<DreY!Glq>LDmaAkNag*l4#29F2b_A*0oz0T|#-&f*;c#<`^)(W@gm
z#k9k=t%u8<+C1fNUA{Fh7~wgPrEZZ#(6aBI%6bR4RO(e1(ZocjoDek4#MTgZD>1NG
zy9~yoZfWYfwe&S-(zk<EPL9oPzb;v@=9Z(dX03soz7tRX&I<t}&yo-te(zRJ#$Ui)
zz%vmXvRY35V{_ImW_7Qww<7R#A!N_tBhq*pKs{{9WNpFQVu&5L<^b7XA&gLuv!=Lg
z5&-|{jytUkFEVIA0F$y|-QGR4i;8i&@1|wHbYF%wYWj)o1S7)HjHNvZ5&e*4AVS&I
zcGLqzWv07(QPBMJDeA|m)C-{PMQ2YBs04r>4o6q6o?2*~DOrJ(%5wSnEJMVOKCzHd
z=Yhm+HLzoDl{P*Ybro7@sk1!Ez3`hE+&qr7Rw^2glw^M(b(NS2!F|Q!mi|l~lF94o
z!QiV)Q{Z>GO5;l1y!$O)=)got;^)%@v#B!ZEVQy1(BJApHr5%Zh&W|gweD+%Ky%CO
ztr45vR*y(@*Dg_Qw5v~PJtm^@Lyh*zRuT6~(K+^HWEF{;R#L$vL2!_ndBxCtUvZ(_
zauI7Qq}ERUWjr&XW9SwMbU>*@p)(cuWXCxRK&?ZoOy>2VESII53iPDP64S1pl{NsC
zD;@EGPxs&}$W1;P6BB9THF%xfoLX|4?S;cu@$)9OdFst-!A7T{(<AFrIGORX1Ko7e
zBxYCkqp}az8{tBY`43>LXtdNQSx!*GUSIS_lyI`da8>!y_tpJb3Zuf0O*;2y?HCfH
z5QT6@nL|%l3&u4;F!~XG9E%1YwF*Fgs5V&uFsx52*iag(?6O|gYCBY3R{qhxT-Etb
zq(E%V=MgQnuDGEKO<Es>GsmBj9T0-nmI%zys8N<U%*9|!c>SO>gfJT4bP>tI>|ol@
zDt(&SUKrg%cz>AmqtJKEMUM;f47FEOFc%Bbmh~<nVut$*<9WBwO7c~^UBDnok?1(Y
z2UwuI^~WCEk(%;KlH6Ut^e4LHb-~DKF!`R7YBfv^qoqKW1npc|<aE;%P+LT6?(j&!
zf$CILWhp2UrK}r**|WAK&@MNFe8pwN6LBL_lXecN9a%-Bow%cG*%R(=J7Y5;>|*#E
zDd!Tl(wa)ZZIFwe^*)4>{T+zuRykc3^-=P1aI<sGQrea5dyYBNEsnQ6u~!8{`~`hz
zJm)=9m(GSt!(BZ3)u?2Tdu@46EUG6Q{jz`<ZSa+_g709r|9yfW@Glhsf=85Zlt^=q
zG7=E7Do6QhQ#mByCF1%Sc-Jh}jg)NHF)-{Mnw`3Lu#QMWE5=_E*b7oGQ@$lBYOd0V
z=7FhmGx^AxI}eAMqcRNT;(Sc0@sV_}J1TEtW7(CRJJ%2qinqUY&1jS7TQl6y8Prb}
z*yZY;W$s)ihKpeNC`*)$kA{IxfZRv3RVdB7?MFt{M(H)k{2G(bithT0TuZYXs$A;`
z8r{<ObepV2HS@eZ&YYku=`Cn%R%JuE`#FP|4peU(Fb{OSNDRwNsZ_x;x0gTns?5Vd
zdXsd4-zx}+vB`~aMV?-u_NRl(E|?w;LT*?sRE*Q`p~fHPI->%0Mh}*x7%SP6wD{_?
zisraq`Las#y-6{`<q40XW?c3aQLd*abT~r#z4|2h3m0gCA`SG#p=MXyhCK{n#t+BI
z5HUhjMjWC6FjHAXNPer-2pKN~m)<5lTERDQQmNjX^kW|KhzC_;Di02bCLoBM4*Jkw
z;DvV`I#)R%9LPVr0ewZ3pDPU)Cn(jBCydces_=Zw$tOFZZukfKho%PdOkaG94w3V0
zOd|xIerJ_sL@{Wf+y;1SVgyvM_H$KWtYt6>y@CU3Ta$tOl|@>4qXcB;1bb)oH9kD6
zKym<TPl&#_pg)0oml*Ia2=+@wI!|wyv3n4J_`<QY@B+8m$EU|@3~XayK47-jQ>@d$
zv&PZSSAV1Gwwzqrc?^_1+-ZGY+3_7~a(L+`-WdcJMo>EWZN3%z4y6JyF4NR^urk`c
z?osO|J#V}k_6*9*n2?j+`F{B<%?9cdT<!rJ`4O2?5Iar}*0{01riTGy00)h}7#Qn;
zyHZb4Wp*A7BGU{;Kb5C}RB*7>QyVNm8D}H~T}?HOCXt%r7#2hz97Gx#X%62hyaLbU
z_ZepP0<`<;eABrHrJAc!_m?kmu#7j}{empH@iUIEk^jk}^EFwO)vd7NZB=&uk6JG^
zC>xad8X$h|eCAOX&MaX<$tA1~r|hW?-0{t4PkVygTc`yh39c;&efwY(-#;$W)+4Xb
z$<U4YO0i+kFU)@y>XFsdG&<WnQ70Wn>;@^X`aynAMxsq)J#KZXX!sI@g~YiJdHI~r
z$4mj_?S29sIa4c$z)19JmJ;Uj?>Kq=0XuH#k#};I&-6zZ_&>)j>UR0XetRO!-sjF<
zd_6<mW)jW6J{lhB79ISXDs~L>b1A2vfi++?>cf}s{@#BvTD|a%{9si7G}T+8ZnwuA
z1k8c%lgE<-7f~H`cqgF;qZ|$>R-xNPA$25N1WI3#n%gj}4Ix}vj|e=x)B^roGQpB)
zO+^#nO<f_v+?fOq8JhQQiut{wP2F19MCW+Ld<NbmN}qBCqYFqiu+fP9K478HZiG>2
zjzJ9kHI6nI5ni&V<YVQO(3Z1$UU27kVp$Gis(&iG&bEPF{E?{Ddwr2~qn^bK>_#5>
z!?<7Qd9{|xwIf4b0bRc;zb}V4>snRg6*wl$Xz`hRDN8laL5tg&+@Dv>U^IjGQ}<!E
zg3#|qty-T;;e!0J9ETZezVm6W1cR`Ku7KTRCA=M0F47By<Fm?!<gfeoy|uX7R?TA|
zNs?a`5YOMWDwoVP4HQ7C47j(kl+)fCg|nod2OVUIwBI%5mmuPH^oJ8G;L3FCL9O_0
zFM8tVkOC^7!l_lzLzmUyqp7Pjcd_dJV1;>*=XBnXWrwTy;2nX?<1rkvOs#u(#qJ=A
zBy>W`N!?%@Ay=upXFI}%LS9bjw?$h)7Dry0%d}=v0YcCSXf9nnp0tBKT1eqZ-4LU`
zyiXglKRX)gtT0VbX1}w0f2ce8{$WH?BQm@$`ua%YP8G@<$n13D#*(Yd5-bHfI8!on
zf5q4CPdgJLl;BqIo#>CIkX)G;rh|bzGuz1N%rr+5seP${mEg$;uQ3jC$;TsR&{IX<
z;}7j3LnV+xNn^$F1;QarDf6rNYj7He+VsjJk6R@0MAkcwrsq4?(~`GKy|mgkfkd<e
zOqz>1msc2>%B!HpZ~HOzj}kl|ZF(IqB=D6ZTVcKe=I7)LlAI=!XU?J*i#9VXeKeaG
zwx_l@Z(w`)5Cclw`6kQKlS<;_Knj)^Dh2pL`hQo!=GPOMR0iqEtx12ORLpN(KBOm5
zontAH5X5!9WHS_=tJfbACz@Dnkuw|^7t=l&x8yb2a~q|aqE_W&0M|tI7@il<u_Hrr
z8=#?35DAdZ>GXqE)MONI8p67OiQGqKEQWw;LGga=ZM1;{pSw1jJK_y<P|Tm>$vhY6
ztFrV7-xf><A8l=)Sf*U{o_0dw3*lke5;RqJv^sPI+}5W&J)c;QyY^2`BC#*p@_wpL
zCs?A5rwjCct+B!9(dZXF{ChhRo-EQ6&Y}l@V(5l{k_FTDvFa!Fo;RWvAdT%&XitNW
zzakuy_%P}D$HC}-M1ORrgq@cD%=94IprR{A4CY)WXaFwZLxO2p(ZGqz<Y0MLTrkQy
z8qvS?J#PXV%D3~sN?`yRA~<bJ1>lbeKH1U)j3R=?w*>(Yh~NNEPVmeQ8n}0x01$-o
z2Jyjn+sXhgOz><n5qQNP7mTop29DSv0E}V1yX*r|-zqQw7;xU<bP&=z<1_*d>AzcZ
zAbJZ@f}MBS0lLKR=IE{z;Fav%tcb+`Yi*!`HTDPqSCsFr>;yt^^&SI2mhKJ8f*%ji
zz%JkZGvOn{JFn;)5jf^21AvO-9nRzsg0&CPz;OEn07`CfT@gK4abFBT$M<IPzh_x`
zi|`48drJkt%m)krZsB)Q-~kVSUF_Z5I}ihqNxo;Bs6~HEjs^xE5&&F2zPrd8NZwua
z&Hve%YT36S1sLmy4e&u1oG?NMwmV_~V1IoxDZo85{~VCzBLV=wIr!$t9Dr;I);ksk
zGp(S2r?!yD|DmV)XF-EF6W<2@FLf1|ZJGF8T=m~9G^_u`V*R(&N>u?8fCcscmRkK+
zbA<tN|GzZ<LwNQ6gcu?J^R~lm!H!JWV6+u1@bEGRAjbY*PzrGG@@~daeE>VJZ~#_a
z{|(FFX}~8d3;<iNf4hWG@WG0!3;-j)f4f*QV8I6KXyA%f0>DW8zuY9?r#Dt>!aD>}
zlYw>D7y#eDy+PLZ&XKIY&Df0hsLDDi(Yrq8O==d30RchrUw8a=Eex>Dd?)3+k=}Q>
z-b85lun-V$I}86Vg#l1S@1%=$2BQD5_waAZKQfJ${3{b2SZ#w1u+jMr{dJMvI|Og=
zpQ9D={XK|ggbe04z<YZ~-UgxfUoK3r!5eHE`DeCG8NlG=yZL8R3eYq2FB1-IxP^uV
V^VU-c2;R4Y5)%S~aP=SP{{YK41APDh

delta 9308
zcmY*<WmFu&)-4R~5+u006C}91Yj6#2A-E0}+y{3Z+?^o7-7UB?xQF08UcM*ycK@io
zckQavtLv;<z53Mr3QW};Of3^MsNw*#q1fS+rGW|h1__jqc??Ibny#+}3drIGa*TZq
z;7Xc?TLI&(PKe=I=Tl?CVn@zkS_49g5Eb3&GUY6-7MFDafAUuJ;=Grb{s`Aa%Gc?N
z&kR0^+I2e3XjjPyosivWNWHvRx`Wmy60vU{_By>TUd}iF{`GO1dV%zWK~?sM9OM(=
zVK9&y4F^w1WFW{$qi|xQk0F`@HG8oLI5|5$j~ci9xTMT69v5KS-Yym--raU5kn2#C
z<~5q^Bf0rTXVhctG2%&MG(cUGaz(gC(rcG~>qgO$W6>!#NOVQJ;pIYe-lLy(S=HgI
zPh;lkL$l+FfMHItHnw_^bj8}CKM19t(C_2vSrhX2$K@-gFlH};#C?1;kk&U1L%4S~
zR^h%h+O1WE7DI$~dly?-_C7>(!E`~#REJ~Xa7lyrB$T!`&qYV5QreAa^aKr%toUJR
zPWh)J3iD`<y&w7RVM^N&4>(P6BI5k$oE$us#%!4$>`iH2p-88?WV0M$-K)JDibvA4
zpef%_*txN$Ei3=Lt<Eh3lsL|4I`QU|3$#^9&(Dak#=uHLGDGB-@b(^H4BX#ubWO97
z;YJ0omS(m$$Zbsy+lLH@(YK5~d5<VhG`2g|1awbCYRu!iAA=W@<<PC~9NhwLRM$sr
zmMd2HYg{t@@6<()*p;xIN{<?)$0{tZz7E)aUr|Y<SI|mmpWR~ww#zK?6b(pI`_3i{
zb-E-J?OWg{CbBQffx+MQqCOeG`myAwuhhA$CZwf|?&~O*--TQH?A<6SMU|{psm;~S
zf9AORusD01w`df}Jy55fy<$2+E|_?umE+3KTaYcO5M&oA;lY)RVeEi(Hn{W6o^s<s
zD3*|DIUj6*hm@NL{HEUf^7Sm~$OfqdmURkYZsKq<(3EAc9rEW8NyCkkr)-rIl=lm&
zJXUA0nR_mxSq)Rykich;l*xREi%s@njf;aI&@z+YQze&}P1pgdt}{}u_9fIHu6^GG
zGEae44=rg<@C0(RNktG(Bh&9#<`G8C;w>(BBxZ&mhl|mUz<zH19@t5GPfRO@8l}bX
zps7o50pW@*3Pr|yVvJl!C)-vOa#si&(>-z*<F*}gSF8(iSD=%;r%q4HWq6R2xq7b$
zjxYY^2Sl!7%~iEazvqDHQJ4VNrTShn`TK+*vQJAYml{YS8ka85;yqr^>OD1=r9nfN
zc5vOMFWpi>K=!$6f{eb?5Ru4M3o;t9xLpry|C%j~`@$f)OFB5<pmBIBDm#*zgZ5zf
zQbvkKCWq6UMw6y!Q>+xo8XM8g&US@UU-sB|dAoc20y(F@=-2Ggp_`SWjEb#>IG^@j
zuQK}e^>So#W2%|-)~K!+)wdU#6l>w5wnZt2pRL5Dz#~N`*UyC9tYechBTc2`@(OI#
zNvcE*+zZZjU-H`QOITK^tZwOyLo)ZCLk>>Wm+flMsr5X{<f<BxOPpX*9Mp+)2^i+w
zt?c(rl%pwzuA5=2W0LHiieG-JtF%A@4>A<|m`Y281n?8H_2Fkz5}X?i%Rfm5s+n`J
zDB&->=U+LtOIJ|jdYXjQWSQZFEs>Rm{`knop4Sq)(}O_@gk{14y51)iOcGQ5J=b#e
z2Yx^6^*F^F7q_m-AGFFgx5<nsin`KhbaC~_FYw!5&U{6xLBY<B^hx6u7V|2bU$8f|
zeC)FwcV(|&@~dwhk~~fZtx&BWh&}WoLQobdf!`pkY0JMzx=PtcLriJFO8R49hpeAA
zBo6`ht+Kh9=sNVmf4tn}`XdAT<Pg=)G&(Pu4=r@nQ+{9?{vEeWWuNjD47n{E{PKZ8
zaEe#5AR%<#HPt=DJ9E>uqyw6_4w?yKCJKDGGprWyekr;X(!4CnM5_5?KgN=3qCm03
z##6k%kIU5%g!cCL(+aK>`Wd;dZ4h$h_jb7n?nqx5&o9cUJfr%h#m4+B<WHED<vS&q
zqBr0*kZA!9kYtMH9R2ZF297$Tro!oCSg8}SjMU4h^Zjw(tMmOyU!XJWabJ%!?1_p*
zdoDfGr66H&KgR66FQJ`v9Ch9Y!+@uOj6<;=6#ze#P**TwZ4UASv$)?Mj6BLHFDr__
z+0w-=>h)>HodKcDcsXDXwzJ3jR(sSFqWV(OKHC*cV8;;&bH=ZI0YbW3PgIHwTjiWy
z?2MXWO2u0RAEEq(zv9<qVVg_xc5kpLZY*Sd!<Dqmxt#d}WOoqB2qc4as;aI?L~ToF
zZY&G66B47ooxayko+%in-E?Ow8yy25bY^yPg!S`iFwwJm+yLg*`!y$ULTnN&J=io@
z>e%Rsz|0(OKB?_3*kkXwHxEuazIZ7=JhaNV*P~hv57q55LoebmJpfHXA@yuS{Esg+
z*C}0V-`x^=0nOa@SPUJek>td~tJ{U1T&m)~`FLp*4DF77S^{|0g%|JIqd-=5)p6a`
zpJOs<Df*!ka2OsrE<8Bg@T>EkKT(FPS@t^80V!I-YJbLE@{5KmVXjEq{QbCnir%}3
zB)-J379=wrBNK6rbUL7Mh^tVmQYn-BJJP=n?P&m-7)P#OZjQoK0{5?}XqJScV6>QX
zPR>G{xvU_P;q!;S9Y7*07=Z!=wxIUorMQP(m?te~6&Z0PXQ@I=EYhD*XomZ^z;`Os
z4>Uh4)Cg2_##mUa>i1Dxi+R~g#!!i{?SMj%9rfaBPlWj_Yk)lCV--e^&3INB>I?lu
z9YXCY5(9U`3o?w2Xa5ErMbl5+pDVpu8v+KJzI9{KFk1H?(1`_W>C<x|)tq9wjbUo`
z=~jy9Hhbg7kwbctJ`#o*c$4&<3j+Ftm=${a(I3mfotB=!^~P102cW6~3@kDf6e1!N
z6qFcL<<{1a9{>u903Hg81vEX32l{nP2vROa1Fi!Wou0+ZX7Rp`g;B$*Ni3MC-vZ`f
zFTi7}c+D)!4hz6NH2e%%t_;tkA0nfkmhLtRW%){TpIqD_ev>}#mVc)<$-1GKO_oK8
zy$CF^aV#x7>F4-J;P@tqWKG0|D1+7h+{ZHU5OVjh>#aa8+V;6BQ)8L5k9t`>)>7zr
zfIlv77^`Fvm<)_+^z@ac%D&hnlUAFt8!x=jdaUo{)M9Ar;Tz5Dcd_|~Hl6CaRnK3R
zYn${wZe8_BZ0l0c%qbP}>($jsNDay>8+JG@F!uV4F;#zGsBP0f$f3HqEHDz_sCr^q
z1;1}7KJ9&`<wIlwZY2*PrsW8;C1srHK!<ZaP3JV^(B0G@kW+rMFp7+cPIFlY?l!;L
z5sW@CYBm4JI6g9J!*bwuBJP9EArv09i3OtQ#mr}D7WwIw>AX2Qdav1(<BDts(4cnV
z{<3(=8F4Ki5{EO~7p3T(AfyirAK(*d9d}Y<X+n>nNzz+GPdEk5K3;hGXe{Hq13{)c
zZy%fFEEH#nlJoG{f*M^#8yXuW%!9svN8ry-Vi7AOFnN~r&D`%6d#lvMXBgZkX^vFj
z;tkent^62jUr$Cc^@y31Lka6hS>F?1tE8JW$iXO*n9CQMk}D*At3U(-W1E~z>tG?>
z5f`5R5LbrhRNR8kv&5d9SL7ke2a*Xr)Q<DVTpKaI;jTCxuFzS}P_<*8UANEdbK?d%
z&54A{UK0?J^^lYkURK8AQ?1q&=H#UQ{LHbIOpLwRH&4Kke&lEJGC;6)K^2Qm>p#75
z6?-p035n2<7hK;sb>t9GAwG4{9v~iEIG>}7B5zcCgZhu$M0-z8?eUO^E?g)md^XT_
z2^~-u$yak>LBy(=*GsTj6p<>b5PO&un@5hGCxpBQlOB3DpsItKZRC*oXq-r{u}Wb;
z&ko<t24zt%RUTijXAw3U+4f}7Z=u<}rK-89$*0M>>#fbnl2Z;o@KqS-d6DTeCG?m1
z&E>p}SEc*)SD&QjZbs!Csjx~0+$@e<gDNmX%F8;km?0szm_PYj`ry9f4jJ*190WPN
zA_*)H88Bc`ikVdKEK~Nl;j~Gy>kuzV_wAalnQvX3a^n~3ui)|rDO+9HW|JPEeBGP4
z)?zcZ<8qv47`EWA*_X~H^vr(lP|f%=%cWFM;u)OFHruKT<~?>5Y8l?56>&;=WdZU#
zZEK4-C8s-3zPMA^&y~e*9z)!ZJghr3N^pJa2A$??Xqx-BR*TytGYor&l8Q<E&yx~Z
zV_0H-zO3y+j0g~q8bjHV4>+^^r%Yq02xay^f#;;wO6K7G!v>wRd6531WnDI~h$PN(
z+4#08uX?r&zVKsQ;?5eBX=FxsXaGyH4Gth4a&L|{8LnNCHFr1M{KjJ!BfBS_aiy-E
zxtmNcXq3}WTwQ7<Ms>Dq-9YS5o758sT(5b`Sg-NcH>M9OH1oW6&sZ@|GYk|cJI`vm
zO<$~q!3_$&GfWetudRc*mp8)M)q7DEY-#@8w=ItkApfq3sa)*GRqofuL7)dafznKf
zLuembr#8gm*lIqKH)KMxSDqbik*B(1bFt%3Vv|ypehXLCa&wc7#u!cJNlUfWs8iQ`
z$66(F=1fkxwg745-8_eqV>nWGY3DjB9gE23$R5g&w|C{|xvT@7j*@aZNB199<?GH3
zHB*saxGUr;Z#@RwW%@W8qJTF3ti9l-GOy+0sYag@3bP_A=B%lSCKDGPG`wt!KOUi=
zi0S>scGchI7pINb5iyqYn)O=yJJX)Ca3&Ca+{n<=1w|(|f0)h<9gs$pVSV<<9Og-V
z8ki@nKwE)x)^wmHBMk?mpMT=g{S#^8W|>&rI#Ceh;9za}io0k@0JxiCqi-jHlxbt3
zjJA?RihhRvhk6%G5-D{ePh1jare*fQS<328P-DcVAxPTrw=n6k?C6EV75f}cnBRPT
zMYDqqKu(ND&aOtc!QRV`vzJSVxx8i~WB#5Ml{b#eQqNnSi7l-bS-`ITW<^zyYQA(b
zbj4SuRK>q9<yXW49dHbra1*V?r2Z2@s8<85aEm8%YNEkRA7*N1KvnElkCtDvO)hAl
zpG(I>o`_v%+C=S?h>2e4!66Ij(P5{7<uRgkd2KxN<}~(~-#t)JkvV_zNIfO;xYv(|
zOX?3nbvUiiYLNaGz-FJwAzvV*iTK>Uz$3u6YJJC$W%EoBa{-(=tQ|y1vov%ZkXVOV
z##_UVg4V^4ne#4~<-1DkJqkKqgT+E_=&4<lcO8`Qi;WX9%>Ue&eQ-JC+gi?7G@d6=
zximz{zE)WW{b@QCJ!7l&N5x=dXS?$5RBU-VvN4Uec-GHK&jPa&P2z+qDdLhIB+HU)
zu0CW&uLvE^4I5xtK-$+oe|58)7m6*PO%Xt<+-XEA%jG_BEachkF3e@pn?tl!`8lOF
zbi2QOuNXX)YT*MCYflILO{VZ*9GiC%R4FO20zMK?p+&aCMm2oeMK7(aW=UDzr=AO0
z$5mJ%=qRsR8rZ>_YsL+vi{3*J_9Kzq(;ZwRj+4_f0-*wbkSMPWahX#Fj_a8BnrhJ6
zo^ZZ?Vah1@&6#r=JkuaYD<EncE=6gHb7d7kkEbG)J(wFTClS%CiZk@l)eS%OG(fLT
zGK%5X*hzhFO3|t(`cr_a0`<ZbfZ=Lva~Z{L2QNU#+^Sk|8-9)3n}AhWx&~2fx4~sl
zw;7>Bdp;J3@ii+CHM&@9*er&#P}$@wI$bfrH)&c!*|nkvhf%^*Y6b%dKz%QBSIo@U
z{?V^qEs4`q<8@n+u8YiB^s<bdi+h$$<)>c@6g>TncG<|GsmC3egwE6aO=EwLr~3-2
zNr`+)`i+-83?|1Xy0^8ps&pb}YT?w1eWVnC9Ps1=KM;Rw)bH6O!7Did1NwpnqVPZc
z*%Qo~qkDL>@^<^fmIBtx$WUWQiNtAB2x-LO^BB=|w~-zTnJNEdm1Ou(?8PF&U88X@
z#8rdaTd||)dG^uJw~N_-%!XNbuAyh4`>Shea=pSj0TqP+w4!`nxsmVSv02kb`DBr%
zyX=e>5IJ3JYPtdbCHvKMdhXUO_*E9jc_?se7%VJF#&ZaBD;7+eFN3x+hER7!u&`Wz
z7zMvBPR4y`*$a250KYjFhAKS%*XG&c;R-kS0wNY1=836wL6q02mqx;IPcH(6ThA@2
zXKQF|9H>6AW$KUF#^A%l6y5{fel77_+cR_zZ0(7=6bmNXABv}R!B-{(E^O6Y?ZS)n
zs1QEmh_Fm7p}oRyT3zxUNr4UV8NGs+2b8|4shO$OGFj3D&7_e?#yDi=TTe%$2QbG5
zk<;q7aQ;p!M-Osm{vFdmXZ@!z9uWh!;*%>(vTRggufuUGP9Hols@vhx<NhZ+FfR8i
z(0f(xhwNGQFT6UFJs{}U*2N75*K2-{$c|MSPnMp!b2b4!m|#7aPdo6Y;n_SGeHI_>
z73pn$3u2;vzRvnXuT&$Os7J@6y12*j!{ix%3B4YU1466ItmJs0NsU(<?rCkM^)wHa
zpL#Q_N7(7cXhCWFR6mv2&!xs0ogOJZpc7M6kl)ouycHO+Lk@BuKFlgvu|`gAj9~a;
zOO#M-RRPw;;IW@y<)))08Z}8_+vnZO_Iu7fnE_9~ufB>4ZYRYh7wEA6q{b*Hs6@k~
zi7Yq@Ax!et0cUMTvk7P<J5*gG|Asx$^5Qq`-O9c4D;<`;YN8=%lE7lp;FFtv0TR27
zTi;d14NXAH^}xRc8FAgGJ~IUaS&X{_VUFM;kUFVwlm_b9JxSfhMr^w{4wW~}JF+_y
zK1Oo=jkFj;ePuC2Gw`>%ym){MHpcliHEI~e3HP0NV=}7;xFv#IC?a<=`>~j_sk{e>
z7v<TXgKYtn1I1MFq510$A9On}1Iw<A(O!w(*0+GN=ge7Y=IXTc4&gL?hK%1;)2QI*
zlD%r38o4mshjyC8MnvA`?~UQ#^oa`xu#?sAt)Iz)jZNbQYY3l>g-tK*p83HZ0=QK@
zRIHo^r{D8&Ms-^WZp+6US_Quqjh$Q<vk2zveKN=>66W<mO*Qrv^5}T~B9AE(va*8g
zoHBgwNk+(Rbq#)rW+Ss}wX)LXB5w8`|K`_$!2NZ8QU_O(aXCc2jFx`E2$K_DD~1@y
zh1}+Q@^%I_^MhH|U^1t=T`Q_EdPnYanyH>^1}=Uz&XJ8AQE9&2<a0h{3~TYXlu(zA
zEoX9~gykQ0cqLVxSHB%0wm?A(`}L5gu@G5en25?qk^$H1f-mc_d-CdQ^VEK<!Ta7E
z;&toh%jQkF+6J7jBi47H3o2#O(g*mM-nPn4CtXL<1ruIWE|ea2`?Wm=qP+{_RQL}$
zRaBN<rf9ZxDzclux7lgsrnh%4LOQ}24Yr68K022*RS=SA1=x)XjRP4J^R}qzOS!_`
z#ruvy#+%BIxBJke?XboIOG(3adi6D9jm4vV0Wf?{R-aRTh1W3QV&&{$d)a0R^N>}P
zY|FXZzZ|0IiaBd2qdt6dIjQr(ZMIOU%NG1F&fu6Po9m^?BvLhI6T0R!H2d8;U(&p2
zYA|MFscMqcO(ye~Jp?F;0>Ke+5hzVr?aBNe>GsGgr$XrpS9uajN2kNQ3o$V5rp0T(
z0$6TJC;3)26SNG#XcX7l^MKTn$ga?6r4Jzfb%ZgA(Zbwit0$kY=avSnI$@Gk%+^pu
zS5mHrcRS8LFPC*uVWH4DDD1pY$H8N>X?KIJZuZ2SvTqc5Nr0GHdD8TCJcd$zIhOdC
zZX0ErnsozQh;t^==4zTfrZO421AL?)O)l#GSxU#|LTTg4#&yeK=^w#;q63!Nv~1(@
zs^-RNRuF&qgcr+b<zgc!i+MJ+)ykX)?QE<>Izc@7$h9<o-HCE^=kl_CcE05B+3q1y
zlu7IC4oI;AC(zAUxJpz>L;_y<k(@G4ur8-g>jdifE*$j0Q&Np=1AuHL--zdkv@}`1
zo~LlDl_YAq*z?vmr4M`GjDkl9?p|-tl(Dt&#3X76oZv25_DtZutLS9Ez!5~p?th@4
zyc_uax4W#<(#)LMkvo)yp|5tKsC2=p#6PyhpH|449T<9Zdk|%CAb5cw?fhvQtBO&7
zpQ9$24yLqPHP;$N&fe2wm%8qdctwIna<3SwGtQA3{C77s%CW%LYxtK(SBGustL0<(
zu~U9r0UOkr(c{OJxZS0Ntu3+cJlF7R`7k-Bsa&q?9Ae5{{|o~?cM+T7{lB1^#vT8R
z?>c9fNWey`1dKDY%F3d2O*8^qYhjlB8*7HMKE<*=(A`{><gvn6vp+QIZS$$a`-6vc
zM?BHtTr#qBXfMb0Vj1mN6OAdeHPbl0iZy>=1%s1}Pm&#_t1xy!FkPk@%SMEka2@*=
zxDuM|vJJ5s+xgDls{>*o!7eOcs|xuVBPWX&<bjiaCLIa*zRZ;zy36hrC*Rt%!x*?)
zyV9MW46dlRN1X>+y5vEiADK%hi`#Dbd>;;Pbk2H4*-X&R?_-6ZEutSd8hC+sSjhIo
z;D(j4P;2EVpEj#UF7IjM6PC+X$C5T&=nL`*!*hm9U)#O?>wqOgC>jXKN3Slk_yaQX
zLf|4D8T4k|wHW`;#ZQVocNF|3izi0sOqXzi7@KlYC3CXBG`94w&#7D;tMI1bj|8Vm
zY}9`VI9!plSfhAal$M_HlaYOVNU?9Z#0<$o?lXXbX3O(l_?f)i3_~r+GcO-x#+x^X
zfsZl0><Y(Hz*LsC5#jcwFMi2nVPQVpUkKP4rgzA13&SpO=zU!H*K7bStqlum9i{~+
zn%+S~J5loEmZlwl5Gepc!H=qOxBVnMZQB@}GLy=|RK1$%JYn>Rj2iP1rsT;+b;Mr?
z4Vu&O)Q5ru4j;qaSP5gA{az@XTS1NpT0d9Xhl_FkkRpcEGA0(QQ~YMh#&zwDUkNzm
z6cgkdgl9W{iL6ArJ1TQHqnQ^SQ1WGu?FT|93$Ba}mPCH~!$3}0Y0<jjhIfd3oa!>g
zcoG%bdTd$bmBx9Y<`Jc+=Cp4}c@EUfj<Y1EnxE_ld6$l?m$g&q23g=>iz;Rcz101p
z=?#i$wo>gBE9|szaZMt-d4nUIhBnYRuBVyx+p?5#aZQgUe(!ah`J#l1$%bl5avL27
zU2~@V`3Ic&!?FhDX@Cw!R4%xtWark#p8DLT)HCZ?VJxf^yr@AD*!ERK3#L$E^*Yr?
zzN&uF9Roh4rP+r`Z#7U$tzl6>k!b~HgM$C<_crP=vC>6=q{j?(I}!9>g3rJU(&){o
z`R^E*9%+kEa8H_fkD9VT7(Fks&Y-RcHaUJYf-|B+eMXMaRM;{FKR<oAn_xz_YhVxi
z>iTB>1(=Iij4k1(X__|WqAd-<!dao#p>~t#2@UQ}Z&<1Th0azdXfoll!dd)6>1miA
z!&=6sDJm=e$?L&06+Q3`D-HNSkK-3$3DdZMX-6Xjn;wd#9A{~ur!<Fq&#lT@d@=Jk
zABuX6zMW#<Qbaq_#gHJCpGw6{5{H%QFQR&C3VK)x*CX^Rha#8p*4d<Dz<n5F#4F;P
zh{O~>2NcX>(qY_oZL0~H7dnQ9sgLe!W>~2|RSW7|hWn<({Pg*xF$%B-!rKe^_R_vc
z(LO!0agxxP;FWPV({8#lEv$&&G<I=7vGQ4xrD^ye)8u5LHs2|JW7g;dn1u|Z_lid+
z4tQM@vvrWr#`)mnz$fZL(!6>VakGus=@!3YVG`y^AO1m{2%Np;>HNA1e{=?ra1C}H
zAwT0sbwG|!am;fl?*_t^^#yLDXZ*Nx)_FqueZi0c-G~omtpHW0Cu)mEJ`Z1X8brq$
z%vK##b~o*^b&Hz!hgrD=^6P8}aW40lhzMLB5T5*v`1QH?+L~-@CDi3+C@nRf2{7UE
zyDIe{@LKw`Eu=Z%6<<_=#V|yxJIKiq_N?ZJ_v0$c)N4l07ZV_mIXG}glfBSPivOhw
z-~+9GdckSpMBNR9eR`Y|9_)sXS+u_OiQ%!9rE(2AFjoxN8lk16Sb<M$9ucec3p7%+
z=#RQoFte5J@(STUFPs!Rwq+e_fiHV9Ie=Zn9dRPRxsiX;olHzxgTH+ZMpjRK=B6FE
z|LmG9sr>~^Sq6kRoEp3yD(mm`HsYIXcag_EAB8MHc}nahxVVUTts~U9P|f;7Ul$_`
zStR4v&P4q_$KXOEni$lkxy8=9w8G&47VY0oDb^+jT+>ARe3NHUg~St`$RDxY)?;_F
znqTujR&chZd2qHF7y8D$4&E3+e@J~!X3&BW4BF(Ebp#TEjrd+9SU!)j;qH+ZkL@AW
z?J<q33Q$JW)pi;LQF@1%sn#sgi9E)uP}6Qe---w+I)^A12yGEj`h+Jo>6Mj}v0_+D
zH0qlbzCkHf|EZ`6c>5ig5NAFF%|La%M-}g(7&}Vx8K)qg30YD;H!S!??{;YivzrH0
z(M%2*b_S-)yh&Aiqai)GF^c!<1Xemj|13>dZ_M#)41SrP;OEMaRJ)bCeX*ZT7W`4Y
zQ|8L@NHpD@Tf(5>1U(s5iW~Zdf7$@pAL`a3X@YUv1J>q-uJ_(Dy5nYTCUHC}1(dlI
zt;5>DLcHh&jbysqt?G01MhXI3!8wgf){Hv}=0N|L$t8M#L7d6WscO8Om2|NBz2Ga^
zs86y%x$H18)~akOWD7@em7)ldlWgb?_sRN>-EcYQO_}aX@+b$d<ORRBH+^tFLt?WR
ztBqjX!S(VeYG_{|%`dr#6Fh9goN$d*10<3krR}cq8=bj$$p^;VvR^KSnje-*<AP?N
z?SNP=Pb2gbKn&r#gabZN(!bWIrJQL~FspD}!BMqO;-8(dSO$NW;w<Q@-wzue_<!nE
zC#}?w*>R{146&GT{kXWP4$nN{V0_+|3{Lt|8uX_fhKh~i{(x%cj*PU$i{PO(5$uA?
zQzO>a6oPj-TUk&{zq?JD2MNb6Mf~V3g$ra+PB;ujLJ2JM(a7N*b`y{MX--!fAd}5C
zF$D_b8S;+Np(!cW)(hnv5b@@|EMt*RLKF*wy>ykFhEhlPN~n_Bj>LT9B^_yj>z#fx
z3JuE4H&?Cc!;G@}E*3k`HK#8ag`yE<r$Mk(VmrN7kqvt?cDUo>3Z1)5JUlSua%qkF
zkTu|<9{w9OSi$qr)WD#7EzITnch=xnR63E*d~WGvi*Co9BBE?ETHud;!Z)7&wz+l6
zuKODYG1>I1U#a%&(GNJ`AqRfg=H!BtSl+_;CEeufF-#+*2EMMz-22@>18=8PH{PHd
z);mN=aR0MPF>eutLiS#-AOX>#2%+pTGEOj!j4L(m0~&xR=0+g#HNpno6@veLhJp}e
zyNVC$a>4;!9&iGvU_dj&xbKt@^t6r%f^)+}eV^suRTLP52+BVs0kOLwg6<D6L5Kg<
z`3>n`=NUv50E7My8XQUh?y%mW62OT1pMrKI3Q(r`7vU&@93=G~A?b(^pvC-8x=bSk
zZ60BQR96WB1Z@9Df(M1IQh+YrU8sEjB=Tc2;(zBn-pete*icZE|M&Uc+oHg`|1o`g
zH~m+k=D$o);{Rs)b<9Zo|9_Z6L6QHLNki(N>Dw^^i1LITprZeeqIaT#+)fw)PlllU
zldphH<M)OV#Bj<EptE{6aDrk^83DZZpzR4Z(CP^$=>C)t!0Gf(i9zgVm>`*TbmITF
zH1FZ4{wrjRCx{t^26VK_2srZuWuY*EMAsMrJYFFCH35Ky7bq8<0K|ey2wHnrFMZyr
z&^yEgX{{3i@&iE5>xKZ{Ads36G3a!i50D!C4?^~cLB<<|fc1!XN(HJRM)<dOHYESK
zu)~p{nGGv|ee8Qf4>H^21sEs%vv+Mu0h*HkLHaEffMwc0n6)JhNXY#M5w@iO@dfXY
z0c6dM2a4Hd1SA*#qYj@jK}uVgAZdaBj8t6uuhUNe>)ne9vfd#C6qLV9+@Q7{MnF#0
zJ7fd-ivG_~u3bVvOzpcw1u~ZSp8-kl(sunnX>L~*K-ByWDM2E8>;Si6kn^58AZQxI
xVa^It*?521mj4+UJO?7%w*+`EfEcU=@KhDx-s^WzP+ae~{CgHDE&XryzW}Nww%-5%

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 00e33edef6..8049c684f0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337..a69d9cb6c2 100755
--- a/gradlew
+++ b/gradlew
@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c4..f127cfd49d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

From 84736107209babc762ddd4394115afbe65a961c8 Mon Sep 17 00:00:00 2001
From: Harry Gao <109098176+harrygaoos@users.noreply.github.com>
Date: Tue, 19 Jul 2022 23:23:39 +0800
Subject: [PATCH 372/665] 3.x: fix typo in BehaviorSubject.java (#7452)

---
 .../java/io/reactivex/rxjava3/subjects/BehaviorSubject.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
index 465ddcbebc..2b19ecdd26 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/BehaviorSubject.java
@@ -59,9 +59,9 @@
  *
  * TestObserver&lt;Integer&gt; to1 = observable.test();
  *
- * observable.onNext(1);
+ * subject.onNext(1);
  * // this will "clear" the cache
- * observable.onNext(EMPTY);
+ * subject.onNext(EMPTY);
  *
  * TestObserver&lt;Integer&gt; to2 = observable.test();
  *

From 624c4fb55bcbf0489a00db370154738c7d89408b Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 22 Jul 2022 07:57:41 +0200
Subject: [PATCH 373/665] Update Schedulers.java (#7453)

Fix wording about cancellation
---
 .../reactivex/rxjava3/schedulers/Schedulers.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
index 112c2559b0..cb25652404 100644
--- a/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
+++ b/src/main/java/io/reactivex/rxjava3/schedulers/Schedulers.java
@@ -318,7 +318,7 @@ public static Scheduler single() {
      * calls to it.
      * <p>
      * If the provided executor doesn't support any of the more specific standard Java executor
-     * APIs, cancelling tasks scheduled by this scheduler can't be interrupted when they are
+     * APIs, tasks scheduled by this scheduler can't be interrupted when they are
      * executing but only prevented from running prior to that. In addition, tasks scheduled with
      * a time delay or periodically will use the {@link #single()} scheduler for the timed waiting
      * before posting the actual task to the given executor.
@@ -327,13 +327,13 @@ public static Scheduler single() {
      * {@link #from(Executor, boolean)} overload to enable task interruption via this wrapper.
      * <p>
      * If the provided executor supports the standard Java {@link ExecutorService} API,
-     * cancelling tasks scheduled by this scheduler can be cancelled/interrupted by calling
+     * tasks scheduled by this scheduler can be cancelled/interrupted by calling
      * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the {@link #single()} scheduler for the timed waiting
      * before posting the actual task to the given executor.
      * <p>
      * If the provided executor supports the standard Java {@link ScheduledExecutorService} API,
-     * cancelling tasks scheduled by this scheduler can be cancelled/interrupted by calling
+     * tasks scheduled by this scheduler can be cancelled/interrupted by calling
      * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the provided executor. Note, however, if the provided
      * {@code ScheduledExecutorService} instance is not single threaded, tasks scheduled
@@ -405,13 +405,13 @@ public static Scheduler from(@NonNull Executor executor) {
      * before posting the actual task to the given executor.
      * <p>
      * If the provided executor supports the standard Java {@link ExecutorService} API,
-     * canceling tasks scheduled by this scheduler can be cancelled/interrupted by calling
+     * tasks scheduled by this scheduler can be cancelled/interrupted by calling
      * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the {@link #single()} scheduler for the timed waiting
      * before posting the actual task to the given executor.
      * <p>
      * If the provided executor supports the standard Java {@link ScheduledExecutorService} API,
-     * canceling tasks scheduled by this scheduler can be cancelled/interrupted by calling
+     * tasks scheduled by this scheduler can be cancelled/interrupted by calling
      * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the provided executor. Note, however, if the provided
      * {@code ScheduledExecutorService} instance is not single threaded, tasks scheduled
@@ -487,13 +487,13 @@ public static Scheduler from(@NonNull Executor executor, boolean interruptibleWo
      * before posting the actual task to the given executor.
      * <p>
      * If the provided executor supports the standard Java {@link ExecutorService} API,
-     * canceling tasks scheduled by this scheduler can be cancelled/interrupted by calling
+     * tasks scheduled by this scheduler can be cancelled/interrupted by calling
      * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the {@link #single()} scheduler for the timed waiting
      * before posting the actual task to the given executor.
      * <p>
      * If the provided executor supports the standard Java {@link ScheduledExecutorService} API,
-     * canceling tasks scheduled by this scheduler can be cancelled/interrupted by calling
+     * tasks scheduled by this scheduler can be cancelled/interrupted by calling
      * {@link io.reactivex.rxjava3.disposables.Disposable#dispose()}. In addition, tasks scheduled with
      * a time delay or periodically will use the provided executor. Note, however, if the provided
      * {@code ScheduledExecutorService} instance is not single threaded, tasks scheduled

From 05c85219a7c5913e8efae85843d60bde8909a9a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Aug 2022 09:40:46 +0200
Subject: [PATCH 374/665] Bump actions/cache from 3.0.5 to 3.0.6 (#7455)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.5 to 3.0.6.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.5...v3.0.6)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 4872bce0ad..ffe6f8fc30 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.5
+      uses: actions/cache@v3.0.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index b3059cba76..be4c6e8191 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.5
+      uses: actions/cache@v3.0.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 2235ff7d87..fe03b0b6b8 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.5
+      uses: actions/cache@v3.0.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 2d22a6c8b0..c83f3a5d52 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.5
+      uses: actions/cache@v3.0.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index f6c1f93d91..9ef3e7cbbf 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.5
+      uses: actions/cache@v3.0.6
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From ef51a90ab224507e11432562e0196d346035a3c3 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 8 Aug 2022 10:11:05 +0200
Subject: [PATCH 375/665] 3.x: Upgrade to Gradle 7.5.1 (#7456)

via

`gradlew wrapper --gradle-version=7.5.1`
---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c684f0..ae04661ee7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 2edba23b8a87de4d2304ff465279dc6ce6a70a31 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 8 Aug 2022 20:45:23 +0200
Subject: [PATCH 376/665] 3.x: Standardize MissingBackpressureException
 message, introduce QueueOverflowException (#7459)

* 3.x: Standardize MissingBackpressureException messages

* Use the correct message.

* Fix tests

* Add QueueOverflowException, fix tests

* Update CompletableConcatTest.java
---
 .../MissingBackpressureException.java         | 18 +++++++
 .../exceptions/QueueOverflowException.java    | 49 +++++++++++++++++++
 .../internal/jdk8/FlowableFlatMapStream.java  |  2 +-
 .../completable/CompletableConcat.java        |  2 +-
 .../flowable/BlockingFlowableIterable.java    |  2 +-
 .../operators/flowable/FlowableConcatMap.java |  4 +-
 .../flowable/FlowableConcatMapEager.java      |  2 +-
 .../flowable/FlowableConcatMapScheduler.java  |  4 +-
 .../operators/flowable/FlowableCreate.java    |  2 +-
 .../operators/flowable/FlowableDebounce.java  |  2 +-
 .../flowable/FlowableDebounceTimed.java       |  2 +-
 .../operators/flowable/FlowableFlatMap.java   |  8 +--
 .../flowable/FlowableFlattenIterable.java     |  2 +-
 .../operators/flowable/FlowableGroupBy.java   |  8 +--
 .../operators/flowable/FlowableGroupJoin.java |  2 +-
 .../operators/flowable/FlowableInterval.java  |  2 +-
 .../flowable/FlowableIntervalRange.java       |  2 +-
 .../operators/flowable/FlowableJoin.java      |  4 +-
 .../operators/flowable/FlowableObserveOn.java |  2 +-
 .../FlowableOnBackpressureBufferStrategy.java |  2 +-
 .../flowable/FlowableOnBackpressureError.java |  2 +-
 .../operators/flowable/FlowablePublish.java   |  2 +-
 .../flowable/FlowablePublishMulticast.java    |  2 +-
 .../flowable/FlowableSamplePublisher.java     |  2 +-
 .../flowable/FlowableSampleTimed.java         |  2 +-
 .../flowable/FlowableSequenceEqual.java       |  2 +-
 .../operators/flowable/FlowableSwitchMap.java |  2 +-
 .../flowable/FlowableThrottleFirstTimed.java  |  2 +-
 .../operators/flowable/FlowableTimer.java     |  2 +-
 .../flowable/FlowableWindowBoundary.java      |  2 +-
 .../FlowableWindowBoundarySelector.java       |  2 +-
 .../flowable/FlowableWindowTimed.java         | 16 +++---
 .../mixed/ConcatMapXMainSubscriber.java       |  4 +-
 .../parallel/ParallelFromPublisher.java       |  2 +-
 .../operators/parallel/ParallelJoin.java      | 10 ++--
 .../operators/parallel/ParallelRunOn.java     |  4 +-
 .../subscribers/QueueDrainSubscriber.java     |  4 +-
 .../internal/util/QueueDrainHelper.java       |  2 +-
 .../rxjava3/plugins/RxJavaPlugins.java        |  5 +-
 .../rxjava3/processors/BehaviorProcessor.java |  2 +-
 .../processors/MulticastProcessor.java        |  2 +-
 .../rxjava3/processors/PublishProcessor.java  |  2 +-
 .../flowable/FlowableBackpressureTests.java   |  4 +-
 .../jdk8/FlowableFlatMapStreamTest.java       |  2 +-
 .../completable/CompletableConcatTest.java    |  4 +-
 .../BlockingFlowableToIteratorTest.java       |  2 +-
 .../FlowableConcatMapSchedulerTest.java       |  2 +-
 .../flowable/FlowableConcatTest.java          |  2 +-
 .../flowable/FlowableFlatMapTest.java         |  6 +--
 .../flowable/FlowableFlattenIterableTest.java |  2 +-
 .../flowable/FlowableFromSourceTest.java      |  2 +-
 .../flowable/FlowableObserveOnTest.java       |  6 +--
 .../flowable/FlowablePublishFunctionTest.java |  4 +-
 .../flowable/FlowablePublishTest.java         |  6 +--
 .../flowable/FlowableSwitchTest.java          |  2 +-
 .../FlowableConcatMapCompletableTest.java     |  2 +-
 .../mixed/FlowableConcatMapMaybeTest.java     |  2 +-
 .../mixed/FlowableConcatMapSingleTest.java    |  2 +-
 .../parallel/ParallelFromPublisherTest.java   |  2 +-
 .../rxjava3/parallel/ParallelJoinTest.java    |  8 +--
 .../rxjava3/parallel/ParallelRunOnTest.java   |  2 +-
 61 files changed, 164 insertions(+), 94 deletions(-)
 create mode 100644 src/main/java/io/reactivex/rxjava3/exceptions/QueueOverflowException.java

diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java b/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java
index a817e6fb93..f0a173ba59 100644
--- a/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/MissingBackpressureException.java
@@ -20,6 +20,15 @@ public final class MissingBackpressureException extends RuntimeException {
 
     private static final long serialVersionUID = 8517344746016032542L;
 
+    /**
+     * The default error message.
+     * <p>
+     * This can happen if the downstream doesn't call {@link org.reactivestreams.Subscription#request(long)}
+     * in time or at all.
+     * @since 3.1.6
+     */
+    public static final String DEFAULT_MESSAGE = "Could not emit value due to lack of requests";
+
     /**
      * Constructs a MissingBackpressureException without message or cause.
      */
@@ -35,4 +44,13 @@ public MissingBackpressureException(String message) {
         super(message);
     }
 
+    /**
+     * Constructs a new {@code MissingBackpressureException} with the
+     * default message {@value #DEFAULT_MESSAGE}.
+     * @return the new {@code MissingBackpressureException} instance.
+     * @since 3.1.6
+     */
+    public static MissingBackpressureException createDefault() {
+        return new MissingBackpressureException(DEFAULT_MESSAGE);
+    }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/exceptions/QueueOverflowException.java b/src/main/java/io/reactivex/rxjava3/exceptions/QueueOverflowException.java
new file mode 100644
index 0000000000..bdd8a25e6f
--- /dev/null
+++ b/src/main/java/io/reactivex/rxjava3/exceptions/QueueOverflowException.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016-present, RxJava Contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is
+ * distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See
+ * the License for the specific language governing permissions and limitations under the License.
+ */
+
+package io.reactivex.rxjava3.exceptions;
+
+/**
+ * Indicates an overflow happened because the upstream disregarded backpressure completely or
+ * {@link org.reactivestreams.Subscriber#onNext(Object)} was called concurrently from multiple threads
+ * without synchronization. Rarely, it is an indication of bugs inside an operator.
+ * @since 3.1.6
+ */
+public final class QueueOverflowException extends RuntimeException {
+
+    private static final long serialVersionUID = 8517344746016032542L;
+
+    /**
+     * The message for queue overflows.
+     * <p>
+     * This can happen if the upstream disregards backpressure completely or calls
+     * {@link org.reactivestreams.Subscriber#onNext(Object)} concurrently from multiple threads
+     * without synchronization. Rarely, it is an indication of bugs inside an operator.
+     */
+    private static final String DEFAULT_MESSAGE = "Queue overflow due to illegal concurrent onNext calls or a bug in an operator";
+
+    /**
+     * Constructs a QueueOverflowException with the default message.
+     */
+    public QueueOverflowException() {
+        this(DEFAULT_MESSAGE);
+    }
+
+    /**
+     * Constructs a QueueOverflowException with the given message but no cause.
+     * @param message the error message
+     */
+    public QueueOverflowException(String message) {
+        super(message);
+    }
+}
diff --git a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
index 35292bb17c..48ea8b6e5f 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStream.java
@@ -174,7 +174,7 @@ public void onNext(T t) {
             if (sourceMode != QueueFuseable.ASYNC) {
                 if (!queue.offer(t)) {
                     upstream.cancel();
-                    onError(new MissingBackpressureException("Queue full?!"));
+                    onError(new QueueOverflowException());
                     return;
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
index d83ce2d398..00a53f3ad7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcat.java
@@ -120,7 +120,7 @@ public void onSubscribe(Subscription s) {
         public void onNext(CompletableSource t) {
             if (sourceFused == QueueSubscription.NONE) {
                 if (!queue.offer(t)) {
-                    onError(new MissingBackpressureException());
+                    onError(new QueueOverflowException());
                     return;
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
index a25032e33b..36436d1370 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
@@ -140,7 +140,7 @@ public void onNext(T t) {
             if (!queue.offer(t)) {
                 SubscriptionHelper.cancel(this);
 
-                onError(new MissingBackpressureException("Queue full?!"));
+                onError(new QueueOverflowException());
             } else {
                 signalConsumer();
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
index bf0f0ff163..5d1b6e4c33 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMap.java
@@ -19,7 +19,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.*;
@@ -152,7 +152,7 @@ public final void onNext(T t) {
             if (sourceMode != QueueSubscription.ASYNC) {
                 if (!queue.offer(t)) {
                     upstream.cancel();
-                    onError(new IllegalStateException("Queue full?!"));
+                    onError(new QueueOverflowException());
                     return;
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
index af33ec9281..dc423d89fc 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapEager.java
@@ -200,7 +200,7 @@ public void innerNext(InnerQueuedSubscriber<R> inner, R value) {
                 drain();
             } else {
                 inner.cancel();
-                innerError(inner, new MissingBackpressureException());
+                innerError(inner, MissingBackpressureException.createDefault());
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
index c53ebe0867..707d10a19e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapScheduler.java
@@ -19,7 +19,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.operators.flowable.FlowableConcatMap.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
@@ -151,7 +151,7 @@ public final void onNext(T t) {
             if (sourceMode != QueueSubscription.ASYNC) {
                 if (!queue.offer(t)) {
                     upstream.cancel();
-                    onError(new IllegalStateException("Queue full?!"));
+                    onError(new QueueOverflowException());
                     return;
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
index 673fc4bc22..1e87c4b7e6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableCreate.java
@@ -442,7 +442,7 @@ static final class ErrorAsyncEmitter<T> extends NoOverflowBaseAsyncEmitter<T> {
 
         @Override
         void onOverflow() {
-            onError(new MissingBackpressureException("create: could not emit value due to lack of requests"));
+            onError(new MissingBackpressureException("create: " + MissingBackpressureException.DEFAULT_MESSAGE));
         }
 
     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
index b1066c0133..51838a1864 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounce.java
@@ -148,7 +148,7 @@ void emit(long idx, T value) {
                     BackpressureHelper.produced(this, 1);
                 } else {
                     cancel();
-                    downstream.onError(new MissingBackpressureException("Could not deliver value due to lack of requests"));
+                    downstream.onError(MissingBackpressureException.createDefault());
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
index 35bfaec397..30b398ab7b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
@@ -159,7 +159,7 @@ void emit(long idx, T t, DebounceEmitter<T> emitter) {
                     emitter.dispose();
                 } else {
                     cancel();
-                    downstream.onError(new MissingBackpressureException("Could not deliver value due to lack of requests"));
+                    downstream.onError(MissingBackpressureException.createDefault());
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
index 78c9a9e542..c250d3b165 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMap.java
@@ -243,7 +243,7 @@ void tryEmitScalar(U value) {
                         q = getMainQueue();
                     }
                     if (!q.offer(value)) {
-                        onError(new MissingBackpressureException("Scalar queue full?!"));
+                        onError(new QueueOverflowException());
                     }
                 }
                 if (decrementAndGet() == 0) {
@@ -252,7 +252,7 @@ void tryEmitScalar(U value) {
             } else {
                 SimpleQueue<U> q = getMainQueue();
                 if (!q.offer(value)) {
-                    onError(new MissingBackpressureException("Scalar queue full?!"));
+                    onError(new QueueOverflowException());
                     return;
                 }
                 if (getAndIncrement() != 0) {
@@ -278,7 +278,7 @@ void tryEmit(U value, InnerSubscriber<T, U> inner) {
                         inner.queue = q;
                     }
                     if (!q.offer(value)) {
-                        onError(new MissingBackpressureException("Inner queue full?!"));
+                        onError(new QueueOverflowException());
                     }
                 }
                 if (decrementAndGet() == 0) {
@@ -291,7 +291,7 @@ void tryEmit(U value, InnerSubscriber<T, U> inner) {
                     inner.queue = q;
                 }
                 if (!q.offer(value)) {
-                    onError(new MissingBackpressureException("Inner queue full?!"));
+                    onError(new QueueOverflowException());
                     return;
                 }
                 if (getAndIncrement() != 0) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
index 019a132329..0b9164e0cd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterable.java
@@ -180,7 +180,7 @@ public void onNext(T t) {
                 return;
             }
             if (fusionMode == NONE && !queue.offer(t)) {
-                onError(new MissingBackpressureException("Queue is full?!"));
+                onError(new QueueOverflowException());
                 return;
             }
             drain();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
index 344b029018..50e641ffc1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupBy.java
@@ -168,7 +168,7 @@ public void onNext(T t) {
                     if (emittedGroups != get()) {
                         downstream.onNext(group);
                     } else {
-                        MissingBackpressureException mbe = new MissingBackpressureException(groupHangWarning(emittedGroups));
+                        MissingBackpressureException mbe = groupHangWarning(emittedGroups);
                         mbe.initCause(ex);
                         onError(mbe);
                         return;
@@ -194,13 +194,13 @@ public void onNext(T t) {
                     }
                 } else {
                     upstream.cancel();
-                    onError(new MissingBackpressureException(groupHangWarning(emittedGroups)));
+                    onError(groupHangWarning(emittedGroups));
                 }
             }
         }
 
-        static String groupHangWarning(long n) {
-            return "Unable to emit a new group (#" + n + ") due to lack of requests. Please make sure the downstream can always accept a new group as well as each group is consumed in order for the whole operator to be able to proceed.";
+        static MissingBackpressureException groupHangWarning(long n) {
+            return new MissingBackpressureException("Unable to emit a new group (#" + n + ") due to lack of requests. Please make sure the downstream can always accept a new group as well as each group is consumed in order for the whole operator to be able to proceed.");
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
index 3021b9ddc5..c9619c48b7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableGroupJoin.java
@@ -276,7 +276,7 @@ void drain() {
                             a.onNext(w);
                             BackpressureHelper.produced(requested, 1);
                         } else {
-                            fail(new MissingBackpressureException("Could not emit value due to lack of requests"), a, q);
+                            fail(MissingBackpressureException.createDefault(), a, q);
                             return;
                         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java
index 536e36c2ea..98fbe6dee1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableInterval.java
@@ -93,7 +93,7 @@ public void run() {
                     downstream.onNext(count++);
                     BackpressureHelper.produced(this, 1);
                 } else {
-                    downstream.onError(new MissingBackpressureException("Can't deliver value " + count + " due to lack of requests"));
+                    downstream.onError(new MissingBackpressureException("Could not emit value " + count + " due to lack of requests"));
                     DisposableHelper.dispose(resource);
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java
index 7c556acdac..cfa605882d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableIntervalRange.java
@@ -114,7 +114,7 @@ public void run() {
                         decrementAndGet();
                     }
                 } else {
-                    downstream.onError(new MissingBackpressureException("Can't deliver value " + count + " due to lack of requests"));
+                    downstream.onError(new MissingBackpressureException("Could not emit value " + count + " due to lack of requests"));
                     DisposableHelper.dispose(resource);
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
index 2c269cee4d..9cda3d457d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableJoin.java
@@ -260,7 +260,7 @@ void drain() {
 
                                 e++;
                             } else {
-                                ExceptionHelper.addThrowable(error, new MissingBackpressureException("Could not emit value due to lack of requests"));
+                                ExceptionHelper.addThrowable(error, MissingBackpressureException.createDefault());
                                 q.clear();
                                 cancelAll();
                                 errorAll(a);
@@ -321,7 +321,7 @@ else if (mode == RIGHT_VALUE) {
 
                                 e++;
                             } else {
-                                ExceptionHelper.addThrowable(error, new MissingBackpressureException("Could not emit value due to lack of requests"));
+                                ExceptionHelper.addThrowable(error, MissingBackpressureException.createDefault());
                                 q.clear();
                                 cancelAll();
                                 errorAll(a);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
index 05dd11b816..576debbf2b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOn.java
@@ -113,7 +113,7 @@ public final void onNext(T t) {
             if (!queue.offer(t)) {
                 upstream.cancel();
 
-                error = new MissingBackpressureException("Queue is full?!");
+                error = new QueueOverflowException();
                 done = true;
             }
             trySchedule();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
index 9b0b8a7b20..29a207fba5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
@@ -140,7 +140,7 @@ public void onNext(T t) {
                 }
             } else if (callError) {
                 upstream.cancel();
-                onError(new MissingBackpressureException());
+                onError(MissingBackpressureException.createDefault());
             } else {
                 drain();
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
index 03e668b2ba..acaf165069 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureError.java
@@ -66,7 +66,7 @@ public void onNext(T t) {
                 BackpressureHelper.produced(this, 1);
             } else {
                 upstream.cancel();
-                onError(new MissingBackpressureException("could not emit value due to lack of requests"));
+                onError(MissingBackpressureException.createDefault());
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
index 87f43b762b..b05bc8b748 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublish.java
@@ -226,7 +226,7 @@ public void onSubscribe(Subscription s) {
         public void onNext(T t) {
             // we expect upstream to honor backpressure requests
             if (sourceMode == QueueSubscription.NONE && !queue.offer(t)) {
-                onError(new MissingBackpressureException("Prefetch queue is full?!"));
+                onError(new QueueOverflowException());
                 return;
             }
             // since many things can happen concurrently, we have a common dispatch
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
index c97b8b6bbf..08d0e40058 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishMulticast.java
@@ -212,7 +212,7 @@ public void onNext(T t) {
             }
             if (sourceMode == QueueSubscription.NONE && !queue.offer(t)) {
                 upstream.get().cancel();
-                onError(new MissingBackpressureException());
+                onError(MissingBackpressureException.createDefault());
                 return;
             }
             drain();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java
index 778f3faf21..19474d2cc0 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSamplePublisher.java
@@ -129,7 +129,7 @@ void emit() {
                     BackpressureHelper.produced(requested, 1);
                 } else {
                     cancel();
-                    downstream.onError(new MissingBackpressureException("Couldn't emit value due to lack of requests!"));
+                    downstream.onError(MissingBackpressureException.createDefault());
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
index e17ad04a66..67a0412c02 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
@@ -125,7 +125,7 @@ void emit() {
                     BackpressureHelper.produced(requested, 1);
                 } else {
                     cancel();
-                    downstream.onError(new MissingBackpressureException("Couldn't emit value due to lack of requests!"));
+                    downstream.onError(MissingBackpressureException.createDefault());
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
index 0ba38698d6..8dadbe0161 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSequenceEqual.java
@@ -300,7 +300,7 @@ public void onSubscribe(Subscription s) {
         public void onNext(T t) {
             if (sourceMode == QueueSubscription.NONE) {
                 if (!queue.offer(t)) {
-                    onError(new MissingBackpressureException());
+                    onError(MissingBackpressureException.createDefault());
                     return;
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
index 1c820570dc..4d4521c655 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchMap.java
@@ -381,7 +381,7 @@ public void onNext(R t) {
             SwitchMapSubscriber<T, R> p = parent;
             if (index == p.unique) {
                 if (fusionMode == QueueSubscription.NONE && !queue.offer(t)) {
-                    onError(new MissingBackpressureException("Queue full?!"));
+                    onError(new QueueOverflowException());
                     return;
                 }
                 p.drain();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
index c12399e1d1..7ddcbf792a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
@@ -96,7 +96,7 @@ public void onNext(T t) {
                 } else {
                     done = true;
                     cancel();
-                    downstream.onError(new MissingBackpressureException("Could not deliver value due to lack of requests"));
+                    downstream.onError(MissingBackpressureException.createDefault());
                     return;
                 }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java
index dd33daea0f..db45fe2e98 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableTimer.java
@@ -78,7 +78,7 @@ public void run() {
                     downstream.onComplete();
                 } else {
                     lazySet(EmptyDisposable.INSTANCE);
-                    downstream.onError(new MissingBackpressureException("Can't deliver value due to lack of requests"));
+                    downstream.onError(MissingBackpressureException.createDefault());
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
index 1dcfd4e529..2aad69dcb5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundary.java
@@ -248,7 +248,7 @@ void drain() {
                         } else {
                             SubscriptionHelper.cancel(upstream);
                             boundarySubscriber.dispose();
-                            errors.tryAddThrowableOrReport(new MissingBackpressureException("Could not deliver a window due to lack of requests"));
+                            errors.tryAddThrowableOrReport(MissingBackpressureException.createDefault());
                             done = true;
                         }
                     }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
index 394315cd9b..d6bffae2e1 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowBoundarySelector.java
@@ -272,7 +272,7 @@ void drain() {
                                     upstream.cancel();
                                     startSubscriber.cancel();
                                     resources.dispose();
-                                    error.tryAddThrowableOrReport(new MissingBackpressureException(FlowableWindowTimed.missingBackpressureMessage(emitted)));
+                                    error.tryAddThrowableOrReport(FlowableWindowTimed.missingBackpressureMessage(emitted));
                                     upstreamDone = true;
                                 }
                             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
index 23ef916fef..39e7de59ad 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableWindowTimed.java
@@ -213,7 +213,7 @@ void createFirstWindow() {
                     upstream.request(Long.MAX_VALUE);
                 } else {
                     upstream.cancel();
-                    downstream.onError(new MissingBackpressureException(missingBackpressureMessage(emitted)));
+                    downstream.onError(missingBackpressureMessage(emitted));
 
                     cleanupResources();
                     upstreamCancelled = true;
@@ -282,7 +282,7 @@ else if (!isEmpty) {
                                     cleanupResources();
                                     upstreamCancelled = true;
 
-                                    downstream.onError(new MissingBackpressureException(missingBackpressureMessage(emitted)));
+                                    downstream.onError(missingBackpressureMessage(emitted));
                                 } else {
                                     emitted++;
 
@@ -386,7 +386,7 @@ void createFirstWindow() {
                     upstream.request(Long.MAX_VALUE);
                 } else {
                     upstream.cancel();
-                    downstream.onError(new MissingBackpressureException(missingBackpressureMessage(emitted)));
+                    downstream.onError(missingBackpressureMessage(emitted));
 
                     cleanupResources();
                     upstreamCancelled = true;
@@ -499,7 +499,7 @@ UnicastProcessor<T> createNewWindow(UnicastProcessor<T> window) {
                     cleanupResources();
                     upstreamCancelled = true;
 
-                    downstream.onError(new MissingBackpressureException(missingBackpressureMessage(emitted)));
+                    downstream.onError(missingBackpressureMessage(emitted));
                 } else {
                     this.emitted = ++emitted;
 
@@ -584,7 +584,7 @@ void createFirstWindow() {
                     upstream.request(Long.MAX_VALUE);
                 } else {
                     upstream.cancel();
-                    downstream.onError(new MissingBackpressureException(missingBackpressureMessage(emitted)));
+                    downstream.onError(missingBackpressureMessage(emitted));
 
                     cleanupResources();
                     upstreamCancelled = true;
@@ -654,7 +654,7 @@ void drain() {
                                     }
                                 } else {
                                     upstream.cancel();
-                                    Throwable ex = new MissingBackpressureException(missingBackpressureMessage(emitted));
+                                    Throwable ex = missingBackpressureMessage(emitted);
                                     for (UnicastProcessor<T> window : windows) {
                                         window.onError(ex);
                                     }
@@ -717,8 +717,8 @@ public void run() {
         }
     }
 
-    static String missingBackpressureMessage(long index) {
-        return "Unable to emit the next window (#" + index + ") due to lack of requests. Please make sure the downstream is ready to consume windows.";
+    static MissingBackpressureException missingBackpressureMessage(long index) {
+        return new MissingBackpressureException("Unable to emit the next window (#" + index + ") due to lack of requests. Please make sure the downstream is ready to consume windows.");
     }
 
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
index bd701de40c..03e4c568d6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/mixed/ConcatMapXMainSubscriber.java
@@ -18,7 +18,7 @@
 import org.reactivestreams.Subscription;
 
 import io.reactivex.rxjava3.core.FlowableSubscriber;
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.operators.QueueFuseable;
@@ -99,7 +99,7 @@ public final void onNext(T t) {
         if (t != null) {
             if (!queue.offer(t)) {
                 upstream.cancel();
-                onError(new MissingBackpressureException("queue full?!"));
+                onError(new QueueOverflowException());
                 return;
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
index 67c2ed4852..eb57bccea5 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelFromPublisher.java
@@ -204,7 +204,7 @@ public void onNext(T t) {
             if (sourceMode == QueueSubscription.NONE) {
                 if (!queue.offer(t)) {
                     upstream.cancel();
-                    onError(new MissingBackpressureException("Queue is full?"));
+                    onError(new QueueOverflowException());
                     return;
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
index 3152aaeab8..2852fda8c7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelJoin.java
@@ -18,7 +18,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.*;
 import io.reactivex.rxjava3.operators.SimplePlainQueue;
@@ -153,7 +153,7 @@ public void onNext(JoinInnerSubscriber<T> inner, T value) {
 
                     if (!q.offer(value)) {
                         cancelAll();
-                        Throwable mbe = new MissingBackpressureException("Queue full?!");
+                        Throwable mbe = new QueueOverflowException();
                         if (errors.compareAndSet(null, mbe)) {
                             downstream.onError(mbe);
                         } else {
@@ -170,7 +170,7 @@ public void onNext(JoinInnerSubscriber<T> inner, T value) {
 
                 if (!q.offer(value)) {
                     cancelAll();
-                    onError(new MissingBackpressureException("Queue full?!"));
+                    onError(new QueueOverflowException());
                     return;
                 }
 
@@ -333,7 +333,7 @@ void onNext(JoinInnerSubscriber<T> inner, T value) {
 
                     if (!q.offer(value)) {
                         inner.cancel();
-                        errors.tryAddThrowableOrReport(new MissingBackpressureException("Queue full?!"));
+                        errors.tryAddThrowableOrReport(new QueueOverflowException());
                         done.decrementAndGet();
                         drainLoop();
                         return;
@@ -347,7 +347,7 @@ void onNext(JoinInnerSubscriber<T> inner, T value) {
 
                 if (!q.offer(value)) {
                     inner.cancel();
-                    errors.tryAddThrowableOrReport(new MissingBackpressureException("Queue full?!"));
+                    errors.tryAddThrowableOrReport(new QueueOverflowException());
                     done.decrementAndGet();
                 }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
index e9c92a0c24..22f822db34 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/parallel/ParallelRunOn.java
@@ -19,7 +19,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.internal.schedulers.SchedulerMultiWorkerSupport;
 import io.reactivex.rxjava3.internal.schedulers.SchedulerMultiWorkerSupport.WorkerCallback;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
@@ -148,7 +148,7 @@ public final void onNext(T t) {
             }
             if (!queue.offer(t)) {
                 upstream.cancel();
-                onError(new MissingBackpressureException("Queue is full?!"));
+                onError(new QueueOverflowException());
                 return;
             }
             schedule();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java b/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java
index 145882e418..8fb7f55295 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/subscribers/QueueDrainSubscriber.java
@@ -84,7 +84,7 @@ protected final void fastPathEmitMax(U value, boolean delayError, Disposable dis
                 }
             } else {
                 dispose.dispose();
-                s.onError(new MissingBackpressureException("Could not emit buffer due to lack of requests"));
+                s.onError(MissingBackpressureException.createDefault());
                 return;
             }
         } else {
@@ -118,7 +118,7 @@ protected final void fastPathOrderedEmitMax(U value, boolean delayError, Disposa
             } else {
                 cancelled = true;
                 dispose.dispose();
-                s.onError(new MissingBackpressureException("Could not emit buffer due to lack of requests"));
+                s.onError(MissingBackpressureException.createDefault());
                 return;
             }
         } else {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
index a9a2ab4901..fa0c500892 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/util/QueueDrainHelper.java
@@ -78,7 +78,7 @@ public static <T, U> void drainMaxLoop(SimplePlainQueue<T> q, Subscriber<? super
                     if (dispose != null) {
                         dispose.dispose();
                     }
-                    a.onError(new MissingBackpressureException("Could not emit value due to lack of requests."));
+                    a.onError(MissingBackpressureException.createDefault());
                     return;
                 }
             }
diff --git a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
index c1115bb478..2949253b31 100644
--- a/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
+++ b/src/main/java/io/reactivex/rxjava3/plugins/RxJavaPlugins.java
@@ -402,10 +402,13 @@ static boolean isBug(Throwable error) {
             return true;
         }
         // the sender didn't honor the request amount
-        // it's either due to an operator bug or concurrent onNext
         if (error instanceof MissingBackpressureException) {
             return true;
         }
+        // it's either due to an operator bug or concurrent onNext
+        if (error instanceof QueueOverflowException) {
+            return true;
+        }
         // general protocol violations
         // it's either due to an operator bug or concurrent onNext
         if (error instanceof IllegalStateException) {
diff --git a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
index eac40a8a75..2e5117ca56 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/BehaviorProcessor.java
@@ -590,7 +590,7 @@ public boolean test(Object o) {
                 return false;
             }
             cancel();
-            downstream.onError(new MissingBackpressureException("Could not deliver value due to lack of requests"));
+            downstream.onError(MissingBackpressureException.createDefault());
             return true;
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
index 766e75145d..14a7a55ee2 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/MulticastProcessor.java
@@ -295,7 +295,7 @@ public void onNext(@NonNull T t) {
             ExceptionHelper.nullCheck(t, "onNext called with a null value.");
             if (!queue.offer(t)) {
                 SubscriptionHelper.cancel(upstream);
-                onError(new MissingBackpressureException());
+                onError(MissingBackpressureException.createDefault());
                 return;
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
index db6787880f..73507844d2 100644
--- a/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
+++ b/src/main/java/io/reactivex/rxjava3/processors/PublishProcessor.java
@@ -362,7 +362,7 @@ public void onNext(T t) {
                 BackpressureHelper.producedCancel(this, 1);
             } else {
                 cancel();
-                downstream.onError(new MissingBackpressureException("Could not emit value due to lack of requests"));
+                downstream.onError(MissingBackpressureException.createDefault());
             }
         }
 
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
index 07ae9c0f27..975ef5c149 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
@@ -24,7 +24,7 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.QueueOverflowException;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
@@ -475,7 +475,7 @@ public Integer apply(Integer v) {
         int vc = ts.values().size();
         assertTrue("10 < " + vc, vc <= 10);
 
-        ts.assertError(MissingBackpressureException.class);
+        ts.assertError(QueueOverflowException.class);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java
index 31e326a3a2..c865d35a52 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/jdk8/FlowableFlatMapStreamTest.java
@@ -274,7 +274,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
             }
             .flatMapStream(v -> Stream.of(1, 2), 1)
             .test(0)
-            .assertFailure(MissingBackpressureException.class);
+            .assertFailure(QueueOverflowException.class);
 
             TestHelper.assertUndeliverable(errors, 0, TestException.class);
         });
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
index f13cb91558..11bc1a9b06 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/completable/CompletableConcatTest.java
@@ -52,9 +52,9 @@ public void subscribe(Subscriber<? super Completable> s) {
                 }), 1
             )
             .test()
-            .assertFailure(MissingBackpressureException.class);
+            .assertFailure(QueueOverflowException.class);
 
-            TestHelper.assertError(errors, 0, MissingBackpressureException.class);
+            TestHelper.assertError(errors, 0, QueueOverflowException.class);
         } finally {
             RxJavaPlugins.reset();
         }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
index a815f738fa..e5ad7806d3 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableToIteratorTest.java
@@ -152,7 +152,7 @@ public void emptyThrowsNoSuch() {
         it.next();
     }
 
-    @Test(expected = MissingBackpressureException.class)
+    @Test(expected = QueueOverflowException.class)
     public void overflowQueue() {
         Iterator<Integer> it = new Flowable<Integer>() {
             @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
index 0f7c772566..027157ce02 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatMapSchedulerTest.java
@@ -624,7 +624,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
         }
         .concatMap(Functions.justFunction(Flowable.just(2)), 8, ImmediateThinScheduler.INSTANCE)
         .test(0L)
-        .assertFailure(IllegalStateException.class);
+        .assertFailure(QueueOverflowException.class);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
index 986dddad01..5a0634ffb6 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableConcatTest.java
@@ -1291,7 +1291,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
         }
         .concatMap(Functions.justFunction(Flowable.just(2)), 8)
         .test(0L)
-        .assertFailure(IllegalStateException.class);
+        .assertFailure(QueueOverflowException.class);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
index b7f574b725..be94c5e57c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlatMapTest.java
@@ -1391,7 +1391,7 @@ protected void subscribeActual(@NonNull Subscriber<@NonNull ? super @NonNull Int
         }
         .flatMap(v -> Flowable.just(v), 1)
         .test(0L)
-        .assertFailure(MissingBackpressureException.class);
+        .assertFailure(QueueOverflowException.class);
     }
 
     @Test
@@ -1413,7 +1413,7 @@ protected void subscribeActual(@NonNull Subscriber<@NonNull ? super @NonNull Int
             }
         })
         .test()
-        .assertFailure(MissingBackpressureException.class, 1);
+        .assertFailure(QueueOverflowException.class, 1);
     }
 
     @Test
@@ -1430,7 +1430,7 @@ protected void subscribeActual(@NonNull Subscriber<@NonNull ? super @NonNull Int
             }
         }, false, 1, 1)
         .test(0L)
-        .assertFailure(MissingBackpressureException.class);
+        .assertFailure(QueueOverflowException.class);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
index 27e4ca128d..2cb9392e19 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFlattenIterableTest.java
@@ -814,7 +814,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
         }
         .flatMapIterable(Functions.justFunction(Arrays.asList(1)), 1)
         .test(0L)
-        .assertFailure(MissingBackpressureException.class);
+        .assertFailure(QueueOverflowException.class);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
index 03275dd2e9..6506c010ea 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableFromSourceTest.java
@@ -137,7 +137,7 @@ public void normalError() {
         ts.assertError(MissingBackpressureException.class);
         ts.assertNotComplete();
 
-        Assert.assertEquals("create: could not emit value due to lack of requests", ts.errors().get(0).getMessage());
+        Assert.assertEquals("create: " + MissingBackpressureException.DEFAULT_MESSAGE, ts.errors().get(0).getMessage());
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
index a4839b4616..e4e3d6f3fe 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableObserveOnTest.java
@@ -579,13 +579,13 @@ public void onNext(Integer t) {
         assertEquals(1, errors.size());
         System.out.println("Errors: " + errors);
         Throwable t = errors.get(0);
-        if (t instanceof MissingBackpressureException) {
+        if (t instanceof QueueOverflowException) {
             // success, we expect this
         } else {
-            if (t.getCause() instanceof MissingBackpressureException) {
+            if (t.getCause() instanceof QueueOverflowException) {
                 // this is also okay
             } else {
-                fail("Expecting MissingBackpressureException");
+                fail("Expecting QueueOverflowException");
             }
         }
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
index e27d5dffcd..5511fd0123 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishFunctionTest.java
@@ -189,7 +189,7 @@ public void overflowMissingBackpressureException() {
         ts.assertError(MissingBackpressureException.class);
         ts.assertNotComplete();
 
-        Assert.assertEquals("Could not emit value due to lack of requests",
+        Assert.assertEquals(MissingBackpressureException.DEFAULT_MESSAGE,
                 ts.errors().get(0).getMessage());
         Assert.assertFalse("Source has subscribers?", pp.hasSubscribers());
     }
@@ -212,7 +212,7 @@ public void overflowMissingBackpressureExceptionDelayed() {
         ts.assertError(MissingBackpressureException.class);
         ts.assertNotComplete();
 
-        Assert.assertEquals("Could not emit value due to lack of requests", ts.errors().get(0).getMessage());
+        Assert.assertEquals(MissingBackpressureException.DEFAULT_MESSAGE, ts.errors().get(0).getMessage());
         Assert.assertFalse("Source has subscribers?", pp.hasSubscribers());
     }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
index ab94d5b2e6..c3355e9a38 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowablePublishTest.java
@@ -905,9 +905,9 @@ public void subscribe(FlowableEmitter<Object> s) throws Exception {
             .test(0L)
             // 3.x emits errors last, even the full queue errors
             .requestMore(10)
-            .assertFailure(MissingBackpressureException.class, 0, 1, 2, 3, 4, 5, 6, 7);
+            .assertFailure(QueueOverflowException.class, 0, 1, 2, 3, 4, 5, 6, 7);
 
-            TestHelper.assertError(errors, 0, MissingBackpressureException.class);
+            TestHelper.assertError(errors, 0, QueueOverflowException.class);
         } finally {
             RxJavaPlugins.reset();
         }
@@ -1596,7 +1596,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
         .refCount()
         .test(0)
         .requestMore(1)
-        .assertFailure(MissingBackpressureException.class, 1);
+        .assertFailure(QueueOverflowException.class, 1);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
index 9d3d16872e..2bb5a05808 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
@@ -1076,7 +1076,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
             }
         }), 8)
         .test(1L)
-        .assertFailure(MissingBackpressureException.class, 0);
+        .assertFailure(QueueOverflowException.class, 0);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
index 048e993b1d..44acad42b1 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapCompletableTest.java
@@ -285,7 +285,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
                     Functions.justFunction(Completable.never()), 1
             )
             .test()
-            .assertFailure(MissingBackpressureException.class);
+            .assertFailure(QueueOverflowException.class);
 
             TestHelper.assertUndeliverable(errors, 0, TestException.class);
         } finally {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
index b2cfdc76d2..12b61a5e8c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapMaybeTest.java
@@ -249,7 +249,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
                     Functions.justFunction(Maybe.never()), 1
             )
             .test()
-            .assertFailure(MissingBackpressureException.class);
+            .assertFailure(QueueOverflowException.class);
 
             TestHelper.assertUndeliverable(errors, 0, TestException.class);
         } finally {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
index 6dd081b4ed..60cb2f5de0 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/mixed/FlowableConcatMapSingleTest.java
@@ -167,7 +167,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
                     Functions.justFunction(Single.never()), 1
             )
             .test()
-            .assertFailure(MissingBackpressureException.class);
+            .assertFailure(QueueOverflowException.class);
 
             TestHelper.assertUndeliverable(errors, 0, TestException.class);
         } finally {
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
index c0aafdd6a6..7d4e684bb6 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelFromPublisherTest.java
@@ -50,7 +50,7 @@ protected void subscribeActual(Subscriber<? super Integer> s) {
         .parallel(1, 1)
         .sequential(1)
         .test(0)
-        .assertFailure(MissingBackpressureException.class);
+        .assertFailure(QueueOverflowException.class);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
index f51b3519e7..8ee41cb973 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelJoinTest.java
@@ -48,7 +48,7 @@ public int parallelism() {
         }
         .sequential(1)
         .test(0)
-        .assertFailure(MissingBackpressureException.class);
+        .assertFailure(QueueOverflowException.class);
     }
 
     @Test
@@ -81,7 +81,7 @@ public int parallelism() {
         .sequential(1)
         .subscribe(ts);
 
-        ts.assertFailure(MissingBackpressureException.class, 1);
+        ts.assertFailure(QueueOverflowException.class, 1);
     }
 
     @Test
@@ -111,7 +111,7 @@ public int parallelism() {
         .sequentialDelayError(1)
         .test(0)
         .requestMore(1)
-        .assertFailure(MissingBackpressureException.class, 1);
+        .assertFailure(QueueOverflowException.class, 1);
     }
 
     @Test
@@ -148,7 +148,7 @@ public int parallelism() {
 
         ts.request(1);
 
-        ts.assertFailure(MissingBackpressureException.class, 1, 2);
+        ts.assertFailure(QueueOverflowException.class, 1, 2);
     }
 
     @Test
diff --git a/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
index 6868e03875..44a860263a 100644
--- a/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
+++ b/src/test/java/io/reactivex/rxjava3/parallel/ParallelRunOnTest.java
@@ -98,7 +98,7 @@ public void subscribe(Subscriber<? super Integer>[] subscribers) {
         .runOn(ImmediateThinScheduler.INSTANCE, 1)
         .sequential(1)
         .test(0)
-        .assertFailure(MissingBackpressureException.class);
+        .assertFailure(QueueOverflowException.class);
     }
 
     @Test

From 9d4631b93c425c077ab93e2b55662a5398d3efac Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 9 Aug 2022 08:31:36 +0200
Subject: [PATCH 377/665] 3.x: Add onDropped callback to throttleLatest
 operator (#7457)

* 3.x: Add onDropped callback to throttleLatest operator

* Reorganize imports
---
 .../io/reactivex/rxjava3/core/Flowable.java   |  56 +-
 .../io/reactivex/rxjava3/core/Observable.java |  50 +-
 .../flowable/FlowableThrottleLatest.java      | 116 ++++-
 .../observable/ObservableThrottleLatest.java  |  87 +++-
 .../flowable/FlowableThrottleLatestTest.java  | 479 +++++++++++++++++-
 .../ObservableThrottleLatestTest.java         | 425 +++++++++++++++-
 .../rxjava3/testsupport/TestHelper.java       |  31 +-
 .../ParamValidationCheckerTest.java           |   2 +
 8 files changed, 1193 insertions(+), 53 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index b06164d1ae..ddcb8126d9 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -17327,7 +17327,61 @@ public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @N
     public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableThrottleLatest<>(this, timeout, unit, scheduler, emitLast));
+        return RxJavaPlugins.onAssembly(new FlowableThrottleLatest<>(this, timeout, unit, scheduler, emitLast, null));
+    }
+
+    /**
+     * Throttles items from the upstream {@code Flowable} by first emitting the next
+     * item from upstream, then periodically emitting the latest item (if any) when
+     * the specified timeout elapses between them, invoking the consumer for any dropped item.
+     * <p>
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.se.png" alt="">
+     * <p>
+     * If no items were emitted from the upstream during this timeout phase, the next
+     * upstream item is emitted immediately and the timeout window starts from then.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>This operator does not support backpressure as it uses time to control data flow.
+     *  If the downstream is not ready to receive items, a
+     *  {@link io.reactivex.rxjava3.exceptions.MissingBackpressureException MissingBackpressureException}
+     *  will be signaled.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>
+     *  If the upstream signals an {@code onError} or {@code onDropped} callback crashes,
+     *  the error is delivered immediately to the downstream. If both happen, a {@link CompositeException}
+     *  is created, containing both the upstream and the callback error.
+     *  If the {@code onDropped} callback crashes during cancellation, the exception is forwarded
+     *  to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  </dd>
+     * </dl>
+     * @param timeout the time to wait after an item emission towards the downstream
+     *                before trying to emit the latest item from upstream again
+     * @param unit    the time unit
+     * @param scheduler the {@code Scheduler} where the timed wait and latest item
+     *                  emission will be performed
+     * @param emitLast If {@code true}, the very last item from the upstream will be emitted
+     *                 immediately when the upstream completes, regardless if there is
+     *                 a timeout window active or not. If {@code false}, the very last
+     *                 upstream item is ignored and the flow terminates.
+     * @param onDropped called when an item is replaced by a newer item that doesn't get delivered
+     *                 to the downstream, including the very last item if {@code emitLast} is {@code false}
+     *                 and the current undelivered item when the sequence gets canceled.
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code onDropped} is {@code null}
+     * @since 3.1.6 - Experimental
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.ERROR)
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @Experimental
+    public final Flowable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast, @NonNull Consumer<? super T> onDropped) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new FlowableThrottleLatest<>(this, timeout, unit, scheduler, emitLast, onDropped));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index f355bedf13..32cedef3b8 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -14362,7 +14362,55 @@ public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit,
     public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableThrottleLatest<>(this, timeout, unit, scheduler, emitLast));
+        return RxJavaPlugins.onAssembly(new ObservableThrottleLatest<>(this, timeout, unit, scheduler, emitLast, null));
+    }
+
+    /**
+     * Throttles items from the current {@code Observable} by first emitting the next
+     * item from upstream, then periodically emitting the latest item (if any) when
+     * the specified timeout elapses between them, invoking the consumer for any dropped item.
+     * <p>
+     * <img width="640" height="326" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLatest.se.png" alt="">
+     * <p>
+     * If no items were emitted from the upstream during this timeout phase, the next
+     * upstream item is emitted immediately and the timeout window starts from then.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@link Scheduler} this operator will use.</dd>
+     *  <dt><b>Error handling:</b></dt>
+     *  <dd>
+     *  If the upstream signals an {@code onError} or {@code onDropped} callback crashes,
+     *  the error is delivered immediately to the downstream. If both happen, a {@link CompositeException}
+     *  is created, containing both the upstream and the callback error.
+     *  If the {@code onDropped} callback crashes when the sequence gets disposed, the exception is forwarded
+     *  to the global error handler via {@link RxJavaPlugins#onError(Throwable)}.
+     *  </dd>
+     * </dl>
+     * @param timeout the time to wait after an item emission towards the downstream
+     *                before trying to emit the latest item from upstream again
+     * @param unit    the time unit
+     * @param scheduler the {@code Scheduler} where the timed wait and latest item
+     *                  emission will be performed
+     * @param emitLast If {@code true}, the very last item from the upstream will be emitted
+     *                 immediately when the upstream completes, regardless if there is
+     *                 a timeout window active or not. If {@code false}, the very last
+     *                 upstream item is ignored and the flow terminates.
+     * @param onDropped called when an item is replaced by a newer item that doesn't get delivered
+     *                 to the downstream, including the very last item if {@code emitLast} is {@code false}
+     *                 and the current undelivered item when the sequence gets disposed.
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit}, {@code scheduler} or {@code onDropped} is {@code null}
+     * @since 3.1.6 - Experimental
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
+    @Experimental
+    public final Observable<T> throttleLatest(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast, @NonNull Consumer<? super T> onDropped) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new ObservableThrottleLatest<>(this, timeout, unit, scheduler, emitLast, onDropped));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
index e6cb5ffdcc..b81fb3df03 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
@@ -19,9 +19,11 @@
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.exceptions.MissingBackpressureException;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Emits the next or latest item when the given time elapses.
@@ -44,19 +46,24 @@ public final class FlowableThrottleLatest<T> extends AbstractFlowableWithUpstrea
 
     final boolean emitLast;
 
+    final Consumer<? super T> onDropped;
+
     public FlowableThrottleLatest(Flowable<T> source,
-            long timeout, TimeUnit unit, Scheduler scheduler,
-            boolean emitLast) {
+            long timeout, TimeUnit unit,
+            Scheduler scheduler,
+            boolean emitLast,
+            Consumer<? super T> onDropped) {
         super(source);
         this.timeout = timeout;
         this.unit = unit;
         this.scheduler = scheduler;
         this.emitLast = emitLast;
+        this.onDropped = onDropped;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new ThrottleLatestSubscriber<>(s, timeout, unit, scheduler.createWorker(), emitLast));
+        source.subscribe(new ThrottleLatestSubscriber<>(s, timeout, unit, scheduler.createWorker(), emitLast, onDropped));
     }
 
     static final class ThrottleLatestSubscriber<T>
@@ -79,6 +86,8 @@ static final class ThrottleLatestSubscriber<T>
 
         final AtomicLong requested;
 
+        final Consumer<? super T> onDropped;
+
         Subscription upstream;
 
         volatile boolean done;
@@ -93,8 +102,10 @@ static final class ThrottleLatestSubscriber<T>
         boolean timerRunning;
 
         ThrottleLatestSubscriber(Subscriber<? super T> downstream,
-                long timeout, TimeUnit unit, Scheduler.Worker worker,
-                boolean emitLast) {
+                long timeout, TimeUnit unit,
+                Scheduler.Worker worker,
+                boolean emitLast,
+                Consumer<? super T> onDropped) {
             this.downstream = downstream;
             this.timeout = timeout;
             this.unit = unit;
@@ -102,6 +113,7 @@ static final class ThrottleLatestSubscriber<T>
             this.emitLast = emitLast;
             this.latest = new AtomicReference<>();
             this.requested = new AtomicLong();
+            this.onDropped = onDropped;
         }
 
         @Override
@@ -115,7 +127,17 @@ public void onSubscribe(Subscription s) {
 
         @Override
         public void onNext(T t) {
-            latest.set(t);
+            T old = latest.getAndSet(t);
+            if (onDropped != null && old != null) {
+                try {
+                    onDropped.accept(old);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    upstream.cancel();
+                    error = ex;
+                    done = true;
+                }
+            }
             drain();
         }
 
@@ -145,6 +167,22 @@ public void cancel() {
             upstream.cancel();
             worker.dispose();
             if (getAndIncrement() == 0) {
+                clear();
+            }
+        }
+
+        void clear() {
+            if (onDropped != null) {
+                T v = latest.getAndSet(null);
+                if (v != null) {
+                    try {
+                        onDropped.accept(v);
+                    } catch (Throwable ex) {
+                        Exceptions.throwIfFatal(ex);
+                        RxJavaPlugins.onError(ex);
+                    }
+                }
+            } else {
                 latest.lazySet(null);
             }
         }
@@ -170,14 +208,27 @@ void drain() {
 
                 for (;;) {
                     if (cancelled) {
-                        latest.lazySet(null);
+                        clear();
                         return;
                     }
 
                     boolean d = done;
+                    Throwable error = this.error;
 
                     if (d && error != null) {
-                        latest.lazySet(null);
+                        if (onDropped != null) {
+                            T v = latest.getAndSet(null);
+                            if (v != null) {
+                                try {
+                                    onDropped.accept(v);
+                                } catch (Throwable ex) {
+                                    Exceptions.throwIfFatal(ex);
+                                    error = new CompositeException(error, ex);
+                                }
+                            }
+                        } else {
+                            latest.lazySet(null);
+                        }
                         downstream.onError(error);
                         worker.dispose();
                         return;
@@ -187,19 +238,31 @@ void drain() {
                     boolean empty = v == null;
 
                     if (d) {
-                        if (!empty && emitLast) {
+                        if (!empty) {
                             v = latest.getAndSet(null);
-                            long e = emitted;
-                            if (e != requested.get()) {
-                                emitted = e + 1;
-                                downstream.onNext(v);
-                                downstream.onComplete();
+                            if (emitLast) {
+                                long e = emitted;
+                                if (e != requested.get()) {
+                                    emitted = e + 1;
+                                    downstream.onNext(v);
+                                    downstream.onComplete();
+                                } else {
+                                    tryDropAndSignalMBE(v);
+                                }
                             } else {
-                                downstream.onError(new MissingBackpressureException(
-                                        "Could not emit final value due to lack of requests"));
+                                if (onDropped != null) {
+                                    try {
+                                        onDropped.accept(v);
+                                    } catch (Throwable ex) {
+                                        Exceptions.throwIfFatal(ex);
+                                        downstream.onError(ex);
+                                        worker.dispose();
+                                        return;
+                                    }
+                                }
+                                downstream.onComplete();
                             }
                         } else {
-                            latest.lazySet(null);
                             downstream.onComplete();
                         }
                         worker.dispose();
@@ -222,8 +285,7 @@ void drain() {
                             emitted = e + 1;
                         } else {
                             upstream.cancel();
-                            downstream.onError(new MissingBackpressureException(
-                                    "Could not emit value due to lack of requests"));
+                            tryDropAndSignalMBE(v);
                             worker.dispose();
                             return;
                         }
@@ -242,5 +304,19 @@ void drain() {
                 }
             }
         }
+
+        void tryDropAndSignalMBE(T valueToDrop) {
+            Throwable errorToSignal = new MissingBackpressureException(
+                    "Could not emit value due to lack of requests");
+            if (onDropped != null) {
+                try {
+                    onDropped.accept(valueToDrop);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    errorToSignal = new CompositeException(errorToSignal, ex);
+                }
+            }
+            downstream.onError(errorToSignal);
+        }
     }
 }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java
index 8f0b2cc250..caf14d3a5e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatest.java
@@ -18,7 +18,10 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
+import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 /**
  * Emits the next or latest item when the given time elapses.
@@ -41,19 +44,24 @@ public final class ObservableThrottleLatest<T> extends AbstractObservableWithUps
 
     final boolean emitLast;
 
+    final Consumer<? super T> onDropped;
+
     public ObservableThrottleLatest(Observable<T> source,
-            long timeout, TimeUnit unit, Scheduler scheduler,
-            boolean emitLast) {
+            long timeout, TimeUnit unit,
+            Scheduler scheduler,
+            boolean emitLast,
+            Consumer<? super T> onDropped) {
         super(source);
         this.timeout = timeout;
         this.unit = unit;
         this.scheduler = scheduler;
         this.emitLast = emitLast;
+        this.onDropped = onDropped;
     }
 
     @Override
     protected void subscribeActual(Observer<? super T> observer) {
-        source.subscribe(new ThrottleLatestObserver<>(observer, timeout, unit, scheduler.createWorker(), emitLast));
+        source.subscribe(new ThrottleLatestObserver<>(observer, timeout, unit, scheduler.createWorker(), emitLast, onDropped));
     }
 
     static final class ThrottleLatestObserver<T>
@@ -74,6 +82,8 @@ static final class ThrottleLatestObserver<T>
 
         final AtomicReference<T> latest;
 
+        final Consumer<? super T> onDropped;
+
         Disposable upstream;
 
         volatile boolean done;
@@ -86,14 +96,17 @@ static final class ThrottleLatestObserver<T>
         boolean timerRunning;
 
         ThrottleLatestObserver(Observer<? super T> downstream,
-                long timeout, TimeUnit unit, Scheduler.Worker worker,
-                boolean emitLast) {
+                long timeout, TimeUnit unit,
+                Scheduler.Worker worker,
+                boolean emitLast,
+                Consumer<? super T> onDropped) {
             this.downstream = downstream;
             this.timeout = timeout;
             this.unit = unit;
             this.worker = worker;
             this.emitLast = emitLast;
             this.latest = new AtomicReference<>();
+            this.onDropped = onDropped;
         }
 
         @Override
@@ -106,7 +119,17 @@ public void onSubscribe(Disposable d) {
 
         @Override
         public void onNext(T t) {
-            latest.set(t);
+            T old = latest.getAndSet(t);
+            if (onDropped != null && old != null) {
+                try {
+                    onDropped.accept(old);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    upstream.dispose();
+                    error = ex;
+                    done = true;
+                }
+            }
             drain();
         }
 
@@ -129,6 +152,22 @@ public void dispose() {
             upstream.dispose();
             worker.dispose();
             if (getAndIncrement() == 0) {
+                clear();
+            }
+        }
+
+        void clear() {
+            if (onDropped != null) {
+                T v = latest.getAndSet(null);
+                if (v != null) {
+                    try {
+                        onDropped.accept(v);
+                    } catch (Throwable ex) {
+                        Exceptions.throwIfFatal(ex);
+                        RxJavaPlugins.onError(ex);
+                    }
+                }
+            } else {
                 latest.lazySet(null);
             }
         }
@@ -158,14 +197,27 @@ void drain() {
 
                 for (;;) {
                     if (cancelled) {
-                        latest.lazySet(null);
+                        clear();
                         return;
                     }
 
                     boolean d = done;
+                    Throwable error = this.error;
 
                     if (d && error != null) {
-                        latest.lazySet(null);
+                        if (onDropped != null) {
+                            T v = latest.getAndSet(null);
+                            if (v != null) {
+                                try {
+                                    onDropped.accept(v);
+                                } catch (Throwable ex) {
+                                    Exceptions.throwIfFatal(ex);
+                                    error = new CompositeException(error, ex);
+                                }
+                            }
+                        } else {
+                            latest.lazySet(null);
+                        }
                         downstream.onError(error);
                         worker.dispose();
                         return;
@@ -175,9 +227,22 @@ void drain() {
                     boolean empty = v == null;
 
                     if (d) {
-                        v = latest.getAndSet(null);
-                        if (!empty && emitLast) {
-                            downstream.onNext(v);
+                        if (!empty) {
+                            v = latest.getAndSet(null);
+                            if (emitLast) {
+                                downstream.onNext(v);
+                            } else {
+                                if (onDropped != null) {
+                                    try {
+                                        onDropped.accept(v);
+                                    } catch (Throwable ex) {
+                                        Exceptions.throwIfFatal(ex);
+                                        downstream.onError(ex);
+                                        worker.dispose();
+                                        return;
+                                    }
+                                }
+                            }
                         }
                         downstream.onComplete();
                         worker.dispose();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java
index fe19765b20..2b26ec98d4 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatestTest.java
@@ -23,10 +23,11 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.subscriptions.EmptySubscription;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.TestScheduler;
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableThrottleLatestTest extends RxJavaTest {
 
@@ -278,4 +279,480 @@ public void onNext(Integer t) {
 
         ts.assertResult(1, 2);
     }
+
+    /** Emit 1, 2, 3, then advance time by a second; 1 and 3 should end up in downstream, 2 should be dropped. */
+    @Test
+    public void onDroppedBasicNoEmitLast() {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestSubscriber<Object> drops = new TestSubscriber<>();
+        drops.onSubscribe(EmptySubscription.INSTANCE);
+
+        TestSubscriber<Integer> ts = pp.throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .test();
+
+        ts.assertEmpty();
+        drops.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        pp.onNext(3);
+
+        ts.assertValuesOnly(1);
+        drops.assertValuesOnly(2);
+
+        sch.advanceTimeBy(1, TimeUnit.SECONDS);
+
+        ts.assertValuesOnly(1, 3);
+        drops.assertValuesOnly(2);
+
+        pp.onComplete();
+
+        ts.assertResult(1, 3);
+
+        drops.assertValuesOnly(2);
+    }
+
+    /** Emit 1, 2, 3; 1 should end up in downstream, 2, 3 should be dropped. */
+    @Test
+    public void onDroppedBasicNoEmitLastDropLast() {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestSubscriber<Object> drops = new TestSubscriber<>();
+        drops.onSubscribe(EmptySubscription.INSTANCE);
+
+        TestSubscriber<Integer> ts = pp.throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .test();
+
+        ts.assertEmpty();
+        drops.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        pp.onNext(3);
+
+        ts.assertValuesOnly(1);
+        drops.assertValuesOnly(2);
+
+        pp.onComplete();
+
+        ts.assertResult(1);
+
+        drops.assertValuesOnly(2, 3);
+    }
+
+    /** Emit 1, 2, 3; 1 and 3 should end up in downstream, 2 should be dropped. */
+    @Test
+    public void onDroppedBasicEmitLast() {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestSubscriber<Object> drops = new TestSubscriber<>();
+        drops.onSubscribe(EmptySubscription.INSTANCE);
+
+        TestSubscriber<Integer> ts = pp.throttleLatest(1, TimeUnit.SECONDS, sch, true, drops::onNext)
+        .test();
+
+        ts.assertEmpty();
+        drops.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        pp.onNext(3);
+
+        ts.assertValuesOnly(1);
+        drops.assertValuesOnly(2);
+
+        pp.onComplete();
+
+        ts.assertResult(1, 3);
+
+        drops.assertValuesOnly(2);
+    }
+
+    /** Emit 1, 2, 3; 3 should trigger an error to the downstream because 2 is dropped and the callback crashes. */
+    @Test
+    public void onDroppedBasicNoEmitLastFirstDropCrash() throws Throwable {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestSubscriber<Integer> ts = pp
+        .doOnCancel(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, d -> {
+            if (d == 2) {
+                throw new TestException("forced");
+            }
+        })
+        .test();
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(1);
+
+        pp.onNext(3);
+
+        ts.assertFailure(TestException.class, 1);
+
+        verify(whenDisposed).run();
+    }
+
+    /**
+     * Emit 1, 2, Error; the error should trigger the drop callback and crash it too,
+     * downstream gets 1, composite(source, drop-crash).
+     */
+    @Test
+    public void onDroppedBasicNoEmitLastOnErrorDropCrash() throws Throwable {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestSubscriberEx<Integer> ts = pp
+        .doOnCancel(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, d -> { throw new TestException("forced " + d); })
+        .subscribeWith(new TestSubscriberEx<>());
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(1);
+
+        pp.onError(new TestException("source"));
+
+        ts.assertFailure(CompositeException.class, 1);
+
+        TestHelper.assertCompositeExceptions(ts, TestException.class, "source", TestException.class, "forced 2");
+
+        verify(whenDisposed, never()).run();
+    }
+
+    /**
+     * Emit 1, 2, 3; 3 should trigger a drop-crash for 2, which then would trigger the error path and drop-crash for 3,
+     * the last item not delivered, downstream gets 1, composite(drop-crash 2, drop-crash 3).
+     */
+    @Test
+    public void onDroppedBasicEmitLastOnErrorDropCrash() throws Throwable {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestSubscriberEx<Integer> ts = pp
+        .doOnCancel(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, true, d -> { throw new TestException("forced " + d); })
+        .subscribeWith(new TestSubscriberEx<>());
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(1);
+
+        pp.onNext(3);
+
+        ts.assertFailure(CompositeException.class, 1);
+
+        TestHelper.assertCompositeExceptions(ts, TestException.class, "forced 2", TestException.class, "forced 3");
+
+        verify(whenDisposed).run();
+    }
+
+    /** Emit 1, complete; Downstream gets 1, complete, no drops. */
+    @Test
+    public void onDroppedBasicNoEmitLastNoLastToDrop() {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestSubscriber<Object> drops = new TestSubscriber<>();
+        drops.onSubscribe(EmptySubscription.INSTANCE);
+
+        TestSubscriber<Integer> ts = pp.throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .test();
+
+        ts.assertEmpty();
+        drops.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        pp.onComplete();
+
+        ts.assertResult(1);
+        drops.assertEmpty();
+    }
+
+    /** Emit 1, error; Downstream gets 1, error, no drops. */
+    @Test
+    public void onDroppedErrorNoEmitLastNoLastToDrop() {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestSubscriber<Object> drops = new TestSubscriber<>();
+        drops.onSubscribe(EmptySubscription.INSTANCE);
+
+        TestSubscriber<Integer> ts = pp.throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .test();
+
+        ts.assertEmpty();
+        drops.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        pp.onError(new TestException());
+
+        ts.assertFailure(TestException.class, 1);
+        drops.assertEmpty();
+    }
+
+    /**
+     * Emit 1, 2, complete; complete should crash drop, downstream gets 1, drop-crash 2.
+     */
+    @Test
+    public void onDroppedHasLastNoEmitLastDropCrash() throws Throwable {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestSubscriberEx<Integer> ts = pp
+        .doOnCancel(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, d -> { throw new TestException("forced " + d); })
+        .subscribeWith(new TestSubscriberEx<>());
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(1);
+
+        pp.onComplete();
+
+        ts.assertFailureAndMessage(TestException.class, "forced 2", 1);
+
+        verify(whenDisposed, never()).run();
+    }
+
+    /**
+     * Emit 1, 2 then dispose the sequence; downstream gets 1, drop should get for 2.
+     */
+    @Test
+    public void onDroppedDisposeDrops() throws Throwable {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestSubscriber<Object> drops = new TestSubscriber<>();
+        drops.onSubscribe(EmptySubscription.INSTANCE);
+
+        TestSubscriberEx<Integer> ts = pp
+        .doOnCancel(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .subscribeWith(new TestSubscriberEx<>());
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+
+        pp.onNext(2);
+
+        ts.assertValuesOnly(1);
+
+        ts.cancel();
+
+        ts.assertValuesOnly(1);
+        drops.assertValuesOnly(2);
+
+        verify(whenDisposed).run();
+    }
+
+    /**
+     * Emit 1 then dispose the sequence; downstream gets 1, drop should not get called.
+     */
+    @Test
+    public void onDroppedDisposeNoDrops() throws Throwable {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestSubscriber<Object> drops = new TestSubscriber<>();
+        drops.onSubscribe(EmptySubscription.INSTANCE);
+
+        TestSubscriberEx<Integer> ts = pp
+        .doOnCancel(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .subscribeWith(new TestSubscriberEx<>());
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertValuesOnly(1);
+
+        ts.cancel();
+
+        ts.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        verify(whenDisposed).run();
+    }
+
+    /**
+     * Emit 1, 2 then dispose the sequence; downstream gets 1, global error handler should get drop-crash 2.
+     */
+    @Test
+    public void onDroppedDisposeCrashesDrop() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            PublishProcessor<Integer> pp =PublishProcessor.create();
+
+            TestScheduler sch = new TestScheduler();
+
+            Action whenDisposed = mock(Action.class);
+
+            TestSubscriberEx<Integer> ts = pp
+            .doOnCancel(whenDisposed)
+            .throttleLatest(1, TimeUnit.SECONDS, sch, false, d -> { throw new TestException("forced " + d); })
+            .subscribeWith(new TestSubscriberEx<>());
+
+            ts.assertEmpty();
+
+            pp.onNext(1);
+
+            ts.assertValuesOnly(1);
+
+            pp.onNext(2);
+
+            ts.assertValuesOnly(1);
+
+            ts.cancel();
+
+            ts.assertValuesOnly(1);
+
+            verify(whenDisposed).run();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class, "forced 2");
+        });
+    }
+
+    /** Emit 1 but downstream is backpressured; downstream gets MBE, drops gets 1. */
+    @Test
+    public void onDroppedBackpressured() throws Throwable {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestSubscriber<Object> drops = new TestSubscriber<>();
+        drops.onSubscribe(EmptySubscription.INSTANCE);
+
+        Action whenDisposed = mock(Action.class);
+
+        TestSubscriber<Integer> ts = pp
+        .doOnCancel(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .test(0L);
+
+        ts.assertEmpty();
+        drops.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertFailure(MissingBackpressureException.class);
+
+        drops.assertValuesOnly(1);
+
+        verify(whenDisposed).run();
+    }
+
+    /** Emit 1 but downstream is backpressured; drop crashes, downstream gets composite(MBE, drop-crash 1). */
+    @Test
+    public void onDroppedBackpressuredDropCrash() throws Throwable {
+        PublishProcessor<Integer> pp =PublishProcessor.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestSubscriberEx<Integer> ts = pp
+        .doOnCancel(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, d -> { throw new TestException("forced " + d); })
+        .subscribeWith(new TestSubscriberEx<>(0L));
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertFailure(CompositeException.class);
+
+        TestHelper.assertCompositeExceptions(ts,
+                MissingBackpressureException.class, "Could not emit value due to lack of requests",
+                TestException.class, "forced 1");
+
+        verify(whenDisposed).run();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java
index c36d04babe..e1c15f3b1a 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleLatestTest.java
@@ -20,12 +20,13 @@
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
-import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.*;
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.schedulers.TestScheduler;
 import io.reactivex.rxjava3.subjects.PublishSubject;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class ObservableThrottleLatestTest extends RxJavaTest {
 
@@ -221,4 +222,424 @@ public void onNext(Integer t) {
 
         to.assertResult(1, 2);
     }
+
+    /** Emit 1, 2, 3, then advance time by a second; 1 and 3 should end up in downstream, 2 should be dropped. */
+    @Test
+    public void onDroppedBasicNoEmitLast() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestObserver<Object> drops = new TestObserver<>();
+        drops.onSubscribe(Disposable.empty());
+
+        TestObserver<Integer> to = ps.throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .test();
+
+        to.assertEmpty();
+        drops.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        ps.onNext(3);
+
+        to.assertValuesOnly(1);
+        drops.assertValuesOnly(2);
+
+        sch.advanceTimeBy(1, TimeUnit.SECONDS);
+
+        to.assertValuesOnly(1, 3);
+        drops.assertValuesOnly(2);
+
+        ps.onComplete();
+
+        to.assertResult(1, 3);
+
+        drops.assertValuesOnly(2);
+    }
+
+    /** Emit 1, 2, 3; 1 should end up in downstream, 2, 3 should be dropped. */
+    @Test
+    public void onDroppedBasicNoEmitLastDropLast() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestObserver<Object> drops = new TestObserver<>();
+        drops.onSubscribe(Disposable.empty());
+
+        TestObserver<Integer> to = ps.throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .test();
+
+        to.assertEmpty();
+        drops.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        ps.onNext(3);
+
+        to.assertValuesOnly(1);
+        drops.assertValuesOnly(2);
+
+        ps.onComplete();
+
+        to.assertResult(1);
+
+        drops.assertValuesOnly(2, 3);
+    }
+
+    /** Emit 1, 2, 3; 1 and 3 should end up in downstream, 2 should be dropped. */
+    @Test
+    public void onDroppedBasicEmitLast() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestObserver<Object> drops = new TestObserver<>();
+        drops.onSubscribe(Disposable.empty());
+
+        TestObserver<Integer> to = ps.throttleLatest(1, TimeUnit.SECONDS, sch, true, drops::onNext)
+        .test();
+
+        to.assertEmpty();
+        drops.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        ps.onNext(3);
+
+        to.assertValuesOnly(1);
+        drops.assertValuesOnly(2);
+
+        ps.onComplete();
+
+        to.assertResult(1, 3);
+
+        drops.assertValuesOnly(2);
+    }
+
+    /** Emit 1, 2, 3; 3 should trigger an error to the downstream because 2 is dropped and the callback crashes. */
+    @Test
+    public void onDroppedBasicNoEmitLastFirstDropCrash() throws Throwable {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestObserver<Integer> to = ps
+        .doOnDispose(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, d -> {
+            if (d == 2) {
+                throw new TestException("forced");
+            }
+        })
+        .test();
+
+        to.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(1);
+
+        ps.onNext(3);
+
+        to.assertFailure(TestException.class, 1);
+
+        verify(whenDisposed).run();
+    }
+
+    /**
+     * Emit 1, 2, Error; the error should trigger the drop callback and crash it too,
+     * downstream gets 1, composite(source, drop-crash).
+     */
+    @Test
+    public void onDroppedBasicNoEmitLastOnErrorDropCrash() throws Throwable {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestObserverEx<Integer> to = ps
+        .doOnDispose(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, d -> { throw new TestException("forced " + d); })
+        .subscribeWith(new TestObserverEx<>());
+
+        to.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(1);
+
+        ps.onError(new TestException("source"));
+
+        to.assertFailure(CompositeException.class, 1);
+
+        TestHelper.assertCompositeExceptions(to, TestException.class, "source", TestException.class, "forced 2");
+
+        verify(whenDisposed, never()).run();
+    }
+
+    /**
+     * Emit 1, 2, 3; 3 should trigger a drop-crash for 2, which then would trigger the error path and drop-crash for 3,
+     * the last item not delivered, downstream gets 1, composite(drop-crash 2, drop-crash 3).
+     */
+    @Test
+    public void onDroppedBasicEmitLastOnErrorDropCrash() throws Throwable {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestObserverEx<Integer> to = ps
+        .doOnDispose(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, true, d -> { throw new TestException("forced " + d); })
+        .subscribeWith(new TestObserverEx<>());
+
+        to.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(1);
+
+        ps.onNext(3);
+
+        to.assertFailure(CompositeException.class, 1);
+
+        TestHelper.assertCompositeExceptions(to, TestException.class, "forced 2", TestException.class, "forced 3");
+
+        verify(whenDisposed).run();
+    }
+
+    /** Emit 1, complete; Downstream gets 1, complete, no drops. */
+    @Test
+    public void onDroppedBasicNoEmitLastNoLastToDrop() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestObserver<Object> drops = new TestObserver<>();
+        drops.onSubscribe(Disposable.empty());
+
+        TestObserver<Integer> to = ps.throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .test();
+
+        to.assertEmpty();
+        drops.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        ps.onComplete();
+
+        to.assertResult(1);
+        drops.assertEmpty();
+    }
+
+    /** Emit 1, error; Downstream gets 1, error, no drops. */
+    @Test
+    public void onDroppedErrorNoEmitLastNoLastToDrop() {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        TestObserver<Object> drops = new TestObserver<>();
+        drops.onSubscribe(Disposable.empty());
+
+        TestObserver<Integer> to = ps.throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .test();
+
+        to.assertEmpty();
+        drops.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        ps.onError(new TestException());
+
+        to.assertFailure(TestException.class, 1);
+        drops.assertEmpty();
+    }
+
+    /**
+     * Emit 1, 2, complete; complete should crash drop, downstream gets 1, drop-crash 2.
+     */
+    @Test
+    public void onDroppedHasLastNoEmitLastDropCrash() throws Throwable {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestObserverEx<Integer> to = ps
+        .doOnDispose(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, d -> { throw new TestException("forced " + d); })
+        .subscribeWith(new TestObserverEx<>());
+
+        to.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(1);
+
+        ps.onComplete();
+
+        to.assertFailureAndMessage(TestException.class, "forced 2", 1);
+
+        verify(whenDisposed, never()).run();
+    }
+
+    /**
+     * Emit 1, 2 then dispose the sequence; downstream gets 1, drop should get for 2.
+     */
+    @Test
+    public void onDroppedDisposeDrops() throws Throwable {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestObserver<Object> drops = new TestObserver<>();
+        drops.onSubscribe(Disposable.empty());
+
+        TestObserverEx<Integer> to = ps
+        .doOnDispose(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .subscribeWith(new TestObserverEx<>());
+
+        to.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+
+        ps.onNext(2);
+
+        to.assertValuesOnly(1);
+
+        to.dispose();
+
+        to.assertValuesOnly(1);
+        drops.assertValuesOnly(2);
+
+        verify(whenDisposed).run();
+    }
+
+    /**
+     * Emit 1 then dispose the sequence; downstream gets 1, drop should not get called.
+     */
+    @Test
+    public void onDroppedDisposeNoDrops() throws Throwable {
+        PublishSubject<Integer> ps = PublishSubject.create();
+
+        TestScheduler sch = new TestScheduler();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestObserver<Object> drops = new TestObserver<>();
+        drops.onSubscribe(Disposable.empty());
+
+        TestObserverEx<Integer> to = ps
+        .doOnDispose(whenDisposed)
+        .throttleLatest(1, TimeUnit.SECONDS, sch, false, drops::onNext)
+        .subscribeWith(new TestObserverEx<>());
+
+        to.assertEmpty();
+
+        ps.onNext(1);
+
+        to.assertValuesOnly(1);
+
+        to.dispose();
+
+        to.assertValuesOnly(1);
+        drops.assertEmpty();
+
+        verify(whenDisposed).run();
+    }
+
+    /**
+     * Emit 1, 2 then dispose the sequence; downstream gets 1, global error handler should get drop-crash 2.
+     */
+    @Test
+    public void onDroppedDisposeCrashesDrop() throws Throwable {
+        TestHelper.withErrorTracking(errors -> {
+            PublishSubject<Integer> ps = PublishSubject.create();
+
+            TestScheduler sch = new TestScheduler();
+
+            Action whenDisposed = mock(Action.class);
+
+            TestObserverEx<Integer> to = ps
+            .doOnDispose(whenDisposed)
+            .throttleLatest(1, TimeUnit.SECONDS, sch, false, d -> { throw new TestException("forced " + d); })
+            .subscribeWith(new TestObserverEx<>());
+
+            to.assertEmpty();
+
+            ps.onNext(1);
+
+            to.assertValuesOnly(1);
+
+            ps.onNext(2);
+
+            to.assertValuesOnly(1);
+
+            to.dispose();
+
+            to.assertValuesOnly(1);
+
+            verify(whenDisposed).run();
+
+            TestHelper.assertUndeliverable(errors, 0, TestException.class, "forced 2");
+        });
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
index 362b1d165a..d38ad8f998 100644
--- a/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
+++ b/src/test/java/io/reactivex/rxjava3/testsupport/TestHelper.java
@@ -2440,23 +2440,16 @@ public static void assertCompositeExceptions(TestSubscriberEx<?> ts, Class<? ext
      * Check if the TestSubscriber has a CompositeException with the specified class
      * of Throwables in the given order.
      * @param ts the TestSubscriber instance
-     * @param classes the array of subsequent Class and String instances representing the
+     * @param classesAndMessages the array of subsequent Class and String instances representing the
      * expected Throwable class and the expected error message
      */
-    @SuppressWarnings("unchecked")
-    public static void assertCompositeExceptions(TestSubscriberEx<?> ts, Object... classes) {
+    public static void assertCompositeExceptions(TestSubscriberEx<?> ts, Object... classesAndMessages) {
         ts
         .assertSubscribed()
         .assertError(CompositeException.class)
         .assertNotComplete();
 
-        List<Throwable> list = compositeList(ts.errors().get(0));
-
-        assertEquals(classes.length, list.size());
-
-        for (int i = 0; i < classes.length; i += 2) {
-            assertError(list, i, (Class<Throwable>)classes[i], (String)classes[i + 1]);
-        }
+        assertCompositeExceptionListOf(ts.errors().get(0), classesAndMessages);
     }
 
     /**
@@ -2485,22 +2478,26 @@ public static void assertCompositeExceptions(TestObserverEx<?> to, Class<? exten
      * Check if the TestSubscriber has a CompositeException with the specified class
      * of Throwables in the given order.
      * @param to the TestSubscriber instance
-     * @param classes the array of subsequent Class and String instances representing the
+     * @param classesAndMessages the array of subsequent Class and String instances representing the
      * expected Throwable class and the expected error message
      */
-    @SuppressWarnings("unchecked")
-    public static void assertCompositeExceptions(TestObserverEx<?> to, Object... classes) {
+    public static void assertCompositeExceptions(TestObserverEx<?> to, Object... classesAndMessages) {
         to
         .assertSubscribed()
         .assertError(CompositeException.class)
         .assertNotComplete();
 
-        List<Throwable> list = compositeList(to.errors().get(0));
+        assertCompositeExceptionListOf(to.errors().get(0), classesAndMessages);
+    }
 
-        assertEquals(classes.length, list.size());
+    @SuppressWarnings("unchecked")
+    static void assertCompositeExceptionListOf(Throwable ex, Object... classesAndMessages) {
+        List<Throwable> list = compositeList(ex);
+
+        assertEquals(classesAndMessages.length, 2 * list.size());
 
-        for (int i = 0; i < classes.length; i += 2) {
-            assertError(list, i, (Class<Throwable>)classes[i], (String)classes[i + 1]);
+        for (int i = 0; i < list.size(); i++) {
+            assertError(list, i, (Class<Throwable>)classesAndMessages[2 * i], (String)classesAndMessages[2 * i + 1]);
         }
     }
 
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 8b5fb4380d..a0e75f34ff 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -230,6 +230,7 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class, Scheduler.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class, Boolean.TYPE));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE));
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE, Consumer.class));
 
         // negative buffer time is considered as zero buffer time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "window", Long.TYPE, TimeUnit.class));
@@ -474,6 +475,7 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class, Scheduler.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class, Boolean.TYPE));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE, Consumer.class));
 
         // negative buffer time is considered as zero buffer time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "window", Long.TYPE, TimeUnit.class));

From d53de235975a41b3c32d1e9989037aae696bf157 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 9 Aug 2022 12:31:29 +0200
Subject: [PATCH 378/665] 3.x: Update Flowable.throttleLatest
 MissingBackpressureException message (#7460)

---
 .../internal/operators/flowable/FlowableThrottleLatest.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
index b81fb3df03..e28e5f09df 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleLatest.java
@@ -306,8 +306,7 @@ void drain() {
         }
 
         void tryDropAndSignalMBE(T valueToDrop) {
-            Throwable errorToSignal = new MissingBackpressureException(
-                    "Could not emit value due to lack of requests");
+            Throwable errorToSignal = MissingBackpressureException.createDefault();
             if (onDropped != null) {
                 try {
                     onDropped.accept(valueToDrop);

From 219a1f0dedf7de346d476a1523b197fa73614e38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Aug 2022 07:59:44 +0200
Subject: [PATCH 379/665] Bump actions/cache from 3.0.6 to 3.0.7 (#7461)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.6 to 3.0.7.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.6...v3.0.7)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index ffe6f8fc30..9ee417ff5a 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.6
+      uses: actions/cache@v3.0.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index be4c6e8191..4258410c7b 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.6
+      uses: actions/cache@v3.0.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index fe03b0b6b8..0c4b649601 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.6
+      uses: actions/cache@v3.0.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index c83f3a5d52..235b29681c 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.6
+      uses: actions/cache@v3.0.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 9ef3e7cbbf..8301229d43 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.6
+      uses: actions/cache@v3.0.7
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From fb5b694dccedb51465becdc6d1a2567859a986b5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Aug 2022 08:42:33 +0200
Subject: [PATCH 380/665] Bump mockito-core from 4.6.1 to 4.7.0 (#7462)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.6.1 to 4.7.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.6.1...v4.7.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8cf9e5997d..a1582dae96 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.4"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.6.1"
+    mockitoVersion = "4.7.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.1-jre"
 }

From be81b70ba7434cfb1af3d855d0b6c9b600c0c4ac Mon Sep 17 00:00:00 2001
From: Ruben Novelli <31356779+rdnovell@users.noreply.github.com>
Date: Wed, 17 Aug 2022 10:20:13 +0200
Subject: [PATCH 381/665] Change @coded tag to @code tag (#7463)

Co-authored-by: Ruben Novelli <rnovelli@redhat.com>
---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index ddcb8126d9..6944611a89 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -15816,7 +15816,7 @@ public final Disposable subscribe(@NonNull Consumer<? super T> onNext, @NonNull
      * terminates or this particular {@code Disposable} is disposed, the {@code Subscriber} is removed
      * from the given container.
      * <p>
-     * The {@coded Subscriber} will be removed after the callback for the terminal event has been invoked.
+     * The {@code Subscriber} will be removed after the callback for the terminal event has been invoked.
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the current {@code Flowable} in an unbounded manner (i.e., no

From ceee82ebcaa8fa12887f2b4f8bd404964211c09d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Aug 2022 09:15:19 +0200
Subject: [PATCH 382/665] Bump actions/cache from 3.0.7 to 3.0.8 (#7466)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.7 to 3.0.8.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.7...v3.0.8)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 9ee417ff5a..3b23cafeda 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.7
+      uses: actions/cache@v3.0.8
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 4258410c7b..38278c3cb3 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.7
+      uses: actions/cache@v3.0.8
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 0c4b649601..a68d273fee 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.7
+      uses: actions/cache@v3.0.8
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 235b29681c..2311027904 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.7
+      uses: actions/cache@v3.0.8
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 8301229d43..546f0b438f 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.7
+      uses: actions/cache@v3.0.8
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 0efeb09e0722df38feae5dc2b4808a1f5b1d869a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Sep 2022 10:09:03 +0200
Subject: [PATCH 383/665] Bump ru.vyarus.animalsniffer from 1.5.4 to 1.6.0
 (#7465)

Bumps ru.vyarus.animalsniffer from 1.5.4 to 1.6.0.

---
updated-dependencies:
- dependency-name: ru.vyarus.animalsniffer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a1582dae96..2cf968a164 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id("eclipse")
     id("jacoco")
     id("maven-publish")
-    id("ru.vyarus.animalsniffer") version "1.5.4"
+    id("ru.vyarus.animalsniffer") version "1.6.0"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.3.1"

From 8e53e0ee1637791923a81fdb9d17dfe8c1569250 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Sep 2022 08:46:24 +0200
Subject: [PATCH 384/665] Bump mockito-core from 4.7.0 to 4.8.0 (#7468)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.7.0 to 4.8.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.7.0...v4.8.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2cf968a164..e103e1ff9c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.4"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.7.0"
+    mockitoVersion = "4.8.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.1-jre"
 }

From 2858f93feb82eb77d8a2caaec431a6baa16a0417 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 11:09:48 +0200
Subject: [PATCH 385/665] Bump actions/cache from 3.0.8 to 3.0.9 (#7473)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.8 to 3.0.9.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.8...v3.0.9)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 3b23cafeda..f32683e40c 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.8
+      uses: actions/cache@v3.0.9
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 38278c3cb3..885e12c86a 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.8
+      uses: actions/cache@v3.0.9
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index a68d273fee..850e4d64c4 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.8
+      uses: actions/cache@v3.0.9
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 2311027904..83406d09ab 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.8
+      uses: actions/cache@v3.0.9
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 546f0b438f..f5f3924560 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.8
+      uses: actions/cache@v3.0.9
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 040ddcad1e0d0ac96969adf804e49758cb24833d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 14:33:33 +0200
Subject: [PATCH 386/665] Bump actions/cache from 3.0.9 to 3.0.10 (#7474)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.9 to 3.0.10.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.9...v3.0.10)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index f32683e40c..ebe7b5785e 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.9
+      uses: actions/cache@v3.0.10
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 885e12c86a..d08a09377f 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.9
+      uses: actions/cache@v3.0.10
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 850e4d64c4..888fdb37f4 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.9
+      uses: actions/cache@v3.0.10
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 83406d09ab..a71dbfca2f 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.9
+      uses: actions/cache@v3.0.10
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index f5f3924560..2e9389e34b 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.9
+      uses: actions/cache@v3.0.10
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From b02a9d549a8c3b660c38660812f5dc062ebc15e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Oct 2022 08:36:11 +0200
Subject: [PATCH 387/665] Bump actions/cache from 3.0.10 to 3.0.11 (#7477)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.10 to 3.0.11.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.10...v3.0.11)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index ebe7b5785e..7651fade8e 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.10
+      uses: actions/cache@v3.0.11
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index d08a09377f..814540148b 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.10
+      uses: actions/cache@v3.0.11
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 888fdb37f4..c240adbd8e 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.10
+      uses: actions/cache@v3.0.11
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index a71dbfca2f..da5931624c 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.10
+      uses: actions/cache@v3.0.11
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 2e9389e34b..c241705126 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.10
+      uses: actions/cache@v3.0.11
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 861bae0c842fe5016d4962c3d771fd938e31e40c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 11:41:07 +0200
Subject: [PATCH 388/665] Bump mockito-core from 4.8.0 to 4.8.1 (#7478)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.0 to 4.8.1.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.0...v4.8.1)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index e103e1ff9c..ec0e5b9dde 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.4"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.8.0"
+    mockitoVersion = "4.8.1"
     jmhLibVersion = "1.21"
     guavaVersion = "31.1-jre"
 }

From 159ae3b00b93e42c37a74e9635190d9cbcde99ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Oct 2022 08:41:16 +0200
Subject: [PATCH 389/665] Bump gradle/wrapper-validation-action from 1.0.4 to
 1.0.5 (#7479)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.4 to 1.0.5.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1.0.4...v1.0.5)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index bf412cff23..ba8bcb2bdb 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1.0.4
+      - uses: gradle/wrapper-validation-action@v1.0.5

From 3b0d948d14ae8cc216154c301eebcdfef95bdf38 Mon Sep 17 00:00:00 2001
From: Des Petrov <desislavpetrov@gmail.com>
Date: Mon, 7 Nov 2022 21:45:46 +0000
Subject: [PATCH 390/665] Add onDropped callback for throttleFirst - addresses
 #7458 (#7482)

---
 .../io/reactivex/rxjava3/core/Flowable.java   | 43 ++++++++++-
 .../io/reactivex/rxjava3/core/Observable.java | 39 +++++++++-
 .../flowable/FlowableThrottleFirstTimed.java  | 37 +++++++---
 .../ObservableThrottleFirstTimed.java         | 37 ++++++++--
 .../flowable/FlowableThrottleFirstTest.java   | 72 +++++++++++++++++++
 .../ObservableThrottleFirstTest.java          | 71 ++++++++++++++++++
 .../ParamValidationCheckerTest.java           |  2 +
 7 files changed, 284 insertions(+), 17 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 6944611a89..c391ef9500 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -17096,7 +17096,48 @@ public final Flowable<T> throttleFirst(long windowDuration, @NonNull TimeUnit un
     public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableThrottleFirstTimed<>(this, skipDuration, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new FlowableThrottleFirstTimed<>(this, skipDuration, unit, scheduler, null));
+    }
+
+    /**
+     * Returns a {@code Flowable} that emits only the first item emitted by the current {@code Flowable} during sequential
+     * time windows of a specified duration, where the windows are managed by a specified {@link Scheduler}.
+     * <p>
+     * This differs from {@link #throttleLast} in that this only tracks the passage of time whereas
+     * {@link #throttleLast} ticks at scheduled intervals.
+     * <p>
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.s.v3.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * @param skipDuration
+     *            time to wait before emitting another item after emitting the last item
+     * @param unit
+     *            the unit of time of {@code skipDuration}
+     * @param scheduler
+     *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
+     *            event
+     * @param onDropped
+     *            called when an item doesn't get delivered to the downstream
+     *
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
+     * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.ERROR)
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new FlowableThrottleFirstTimed<>(this, skipDuration, unit, scheduler, onDropped));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 32cedef3b8..7492f6f636 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -14163,7 +14163,44 @@ public final Observable<T> throttleFirst(long windowDuration, @NonNull TimeUnit
     public final Observable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableThrottleFirstTimed<>(this, skipDuration, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableThrottleFirstTimed<>(this, skipDuration, unit, scheduler, null));
+    }
+
+    /**
+     * Returns an {@code Observable} that emits only the first item emitted by the current {@code Observable} during sequential
+     * time windows of a specified duration, where the windows are managed by a specified {@link Scheduler}.
+     * <p>
+     * This differs from {@link #throttleLast} in that this only tracks passage of time whereas
+     * {@code throttleLast} ticks at scheduled intervals.
+     * <p>
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleFirst.s.v3.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * @param skipDuration
+     *            time to wait before emitting another item after emitting the last item
+     * @param unit
+     *            the unit of time of {@code skipDuration}
+     * @param scheduler
+     *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
+     *            event
+     * @param onDropped
+     *            called when an item doesn't get delivered to the downstream
+     *
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
+    public final Observable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new ObservableThrottleFirstTimed<>(this, skipDuration, unit, scheduler, onDropped));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
index 7ddcbf792a..223076dfc7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
@@ -16,6 +16,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Consumer;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -32,44 +34,53 @@ public final class FlowableThrottleFirstTimed<T> extends AbstractFlowableWithUps
     final long timeout;
     final TimeUnit unit;
     final Scheduler scheduler;
+    final Consumer<? super T> onDropped;
 
-    public FlowableThrottleFirstTimed(Flowable<T> source, long timeout, TimeUnit unit, Scheduler scheduler) {
+    public FlowableThrottleFirstTimed(Flowable<T> source,
+                                      long timeout,
+                                      TimeUnit unit,
+                                      Scheduler scheduler,
+                                      Consumer<? super T> onDropped) {
         super(source);
         this.timeout = timeout;
         this.unit = unit;
         this.scheduler = scheduler;
+        this.onDropped = onDropped;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
         source.subscribe(new DebounceTimedSubscriber<>(
                 new SerializedSubscriber<>(s),
-                timeout, unit, scheduler.createWorker()));
+                timeout, unit, scheduler.createWorker(),
+                onDropped));
     }
 
     static final class DebounceTimedSubscriber<T>
     extends AtomicLong
     implements FlowableSubscriber<T>, Subscription, Runnable {
-
         private static final long serialVersionUID = -9102637559663639004L;
+
         final Subscriber<? super T> downstream;
         final long timeout;
         final TimeUnit unit;
         final Scheduler.Worker worker;
-
+        final Consumer<? super T> onDropped;
         Subscription upstream;
-
         final SequentialDisposable timer = new SequentialDisposable();
-
         volatile boolean gate;
-
         boolean done;
 
-        DebounceTimedSubscriber(Subscriber<? super T> actual, long timeout, TimeUnit unit, Worker worker) {
+        DebounceTimedSubscriber(Subscriber<? super T> actual,
+                                long timeout,
+                                TimeUnit unit,
+                                Worker worker,
+                                Consumer<? super T> onDropped) {
             this.downstream = actual;
             this.timeout = timeout;
             this.unit = unit;
             this.worker = worker;
+            this.onDropped = onDropped;
         }
 
         @Override
@@ -106,6 +117,16 @@ public void onNext(T t) {
                 }
 
                 timer.replace(worker.schedule(this, timeout, unit));
+            } else if (onDropped != null) {
+                try {
+                    onDropped.accept(t);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    downstream.onError(ex);
+                    worker.dispose();
+                    upstream.cancel();
+                    done = true;
+                }
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
index 889c203dd7..aa0f5058fd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
@@ -19,6 +19,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 import io.reactivex.rxjava3.observers.SerializedObserver;
 
@@ -26,20 +28,27 @@ public final class ObservableThrottleFirstTimed<T> extends AbstractObservableWit
     final long timeout;
     final TimeUnit unit;
     final Scheduler scheduler;
-
-    public ObservableThrottleFirstTimed(ObservableSource<T> source,
-            long timeout, TimeUnit unit, Scheduler scheduler) {
+    final Consumer<? super T> onDropped;
+
+    public ObservableThrottleFirstTimed(
+            ObservableSource<T> source,
+            long timeout, 
+            TimeUnit unit,
+            Scheduler scheduler,
+            Consumer<? super T> onDropped) {
         super(source);
         this.timeout = timeout;
         this.unit = unit;
         this.scheduler = scheduler;
+        this.onDropped = onDropped;
     }
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
         source.subscribe(new DebounceTimedObserver<>(
                 new SerializedObserver<>(t),
-                timeout, unit, scheduler.createWorker()));
+                timeout, unit, scheduler.createWorker(),
+                onDropped));
     }
 
     static final class DebounceTimedObserver<T>
@@ -51,16 +60,21 @@ static final class DebounceTimedObserver<T>
         final long timeout;
         final TimeUnit unit;
         final Scheduler.Worker worker;
-
+        final Consumer<? super T> onDropped;
         Disposable upstream;
-
         volatile boolean gate;
 
-        DebounceTimedObserver(Observer<? super T> actual, long timeout, TimeUnit unit, Worker worker) {
+        DebounceTimedObserver(
+                Observer<? super T> actual,
+                long timeout,
+                TimeUnit unit,
+                Worker worker,
+                Consumer<? super T> onDropped) {
             this.downstream = actual;
             this.timeout = timeout;
             this.unit = unit;
             this.worker = worker;
+            this.onDropped = onDropped;
         }
 
         @Override
@@ -83,6 +97,15 @@ public void onNext(T t) {
                     d.dispose();
                 }
                 DisposableHelper.replace(this, worker.schedule(this, timeout, unit));
+            } else if (onDropped != null) {
+                try {
+                    onDropped.accept(t);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    downstream.onError(ex);
+                    worker.dispose();
+                    upstream.dispose();
+                }
             }
         }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
index 9b71893c63..68a559e3cd 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTest.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.rxjava3.functions.Action;
 import org.junit.*;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
@@ -44,6 +45,77 @@ public void before() {
         subscriber = TestHelper.mockSubscriber();
     }
 
+    @Test
+    public void throttlingWithDropCallbackCrashes() throws Throwable {
+        Flowable<String> source = Flowable.unsafeCreate(new Publisher<String>() {
+            @Override
+            public void subscribe(Subscriber<? super String> subscriber) {
+                subscriber.onSubscribe(new BooleanSubscription());
+                publishNext(subscriber, 100, "one");    // publish as it's first
+                publishNext(subscriber, 300, "two");    // skip as it's last within the first 400
+                publishNext(subscriber, 900, "three");   // publish
+                publishNext(subscriber, 905, "four");   // skip
+                publishCompleted(subscriber, 1000);     // Should be published as soon as the timeout expires.
+            }
+        });
+
+        Action whenDisposed = mock(Action.class);
+
+        Flowable<String> sampled = source
+                .doOnCancel(whenDisposed)
+                .throttleFirst(400, TimeUnit.MILLISECONDS, scheduler, e ->  {
+            if ("two".equals(e)) {
+                throw new TestException("forced");
+            }
+        });
+        sampled.subscribe(subscriber);
+
+        InOrder inOrder = inOrder(subscriber);
+
+        scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
+        inOrder.verify(subscriber, times(1)).onNext("one");
+        inOrder.verify(subscriber, times(1)).onError(any(TestException.class));
+        inOrder.verify(subscriber, times(0)).onNext("two");
+        inOrder.verify(subscriber, times(0)).onNext("three");
+        inOrder.verify(subscriber, times(0)).onNext("four");
+        inOrder.verify(subscriber, times(0)).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        verify(whenDisposed).run();
+    }
+
+    @Test
+    public void throttlingWithDropCallback() {
+        Flowable<String> source = Flowable.unsafeCreate(new Publisher<String>() {
+            @Override
+            public void subscribe(Subscriber<? super String> subscriber) {
+                subscriber.onSubscribe(new BooleanSubscription());
+                publishNext(subscriber, 100, "one");    // publish as it's first
+                publishNext(subscriber, 300, "two");    // skip as it's last within the first 400
+                publishNext(subscriber, 900, "three");   // publish
+                publishNext(subscriber, 905, "four");   // skip
+                publishCompleted(subscriber, 1000);     // Should be published as soon as the timeout expires.
+            }
+        });
+
+        Observer<Object> dropCallbackObserver = TestHelper.mockObserver();
+        Flowable<String> sampled = source.throttleFirst(400, TimeUnit.MILLISECONDS, scheduler, dropCallbackObserver::onNext);
+        sampled.subscribe(subscriber);
+
+        InOrder inOrder = inOrder(subscriber);
+        InOrder dropCallbackOrder = inOrder(dropCallbackObserver);
+
+        scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
+        inOrder.verify(subscriber, times(1)).onNext("one");
+        inOrder.verify(subscriber, times(0)).onNext("two");
+        dropCallbackOrder.verify(dropCallbackObserver, times(1)).onNext("two");
+        inOrder.verify(subscriber, times(1)).onNext("three");
+        inOrder.verify(subscriber, times(0)).onNext("four");
+        dropCallbackOrder.verify(dropCallbackObserver, times(1)).onNext("four");
+        inOrder.verify(subscriber, times(1)).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        dropCallbackOrder.verifyNoMoreInteractions();
+    }
+
     @Test
     public void throttlingWithCompleted() {
         Flowable<String> source = Flowable.unsafeCreate(new Publisher<String>() {
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
index 64c0a8dae0..fe296d572b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTest.java
@@ -18,6 +18,7 @@
 
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.rxjava3.functions.Action;
 import org.junit.*;
 import org.mockito.InOrder;
 
@@ -41,6 +42,76 @@ public void before() {
         observer = TestHelper.mockObserver();
     }
 
+    @Test
+    public void throttlingWithDropCallbackCrashes() throws Throwable {
+        Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
+            @Override
+            public void subscribe(Observer<? super String> innerObserver) {
+                innerObserver.onSubscribe(Disposable.empty());
+                publishNext(innerObserver, 100, "one");    // publish as it's first
+                publishNext(innerObserver, 300, "two");    // skip as it's last within the first 400
+                publishNext(innerObserver, 900, "three");   // publish
+                publishNext(innerObserver, 905, "four");   // skip
+                publishCompleted(innerObserver, 1000);     // Should be published as soon as the timeout expires.
+            }
+        });
+
+        Action whenDisposed = mock(Action.class);
+        Observable<String> sampled = source
+                .doOnDispose(whenDisposed)
+                .throttleFirst(400, TimeUnit.MILLISECONDS, scheduler, e -> {
+                    if ("two".equals(e)) {
+                        throw new TestException("forced");
+                    }
+                });
+        sampled.subscribe(observer);
+
+        InOrder inOrder = inOrder(observer);
+
+        scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
+        inOrder.verify(observer, times(1)).onNext("one");
+        inOrder.verify(observer, times(1)).onError(any(TestException.class));
+        inOrder.verify(observer, times(0)).onNext("two");
+        inOrder.verify(observer, times(0)).onNext("three");
+        inOrder.verify(observer, times(0)).onNext("four");
+        inOrder.verify(observer, times(0)).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        verify(whenDisposed).run();
+    }
+
+    @Test
+    public void throttlingWithDropCallback() {
+        Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
+            @Override
+            public void subscribe(Observer<? super String> innerObserver) {
+                innerObserver.onSubscribe(Disposable.empty());
+                publishNext(innerObserver, 100, "one");    // publish as it's first
+                publishNext(innerObserver, 300, "two");    // skip as it's last within the first 400
+                publishNext(innerObserver, 900, "three");   // publish
+                publishNext(innerObserver, 905, "four");   // skip
+                publishCompleted(innerObserver, 1000);     // Should be published as soon as the timeout expires.
+            }
+        });
+
+        Observer<Object> dropCallbackObserver = TestHelper.mockObserver();
+        Observable<String> sampled = source.throttleFirst(400, TimeUnit.MILLISECONDS, scheduler, dropCallbackObserver::onNext);
+        sampled.subscribe(observer);
+
+        InOrder inOrder = inOrder(observer);
+        InOrder dropCallbackOrder = inOrder(dropCallbackObserver);
+
+        scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
+        inOrder.verify(observer, times(1)).onNext("one");
+        inOrder.verify(observer, times(0)).onNext("two");
+        dropCallbackOrder.verify(dropCallbackObserver, times(1)).onNext("two");
+        inOrder.verify(observer, times(1)).onNext("three");
+        inOrder.verify(observer, times(0)).onNext("four");
+        dropCallbackOrder.verify(dropCallbackObserver, times(1)).onNext("four");
+        inOrder.verify(observer, times(1)).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        dropCallbackOrder.verifyNoMoreInteractions();
+    }
+
     @Test
     public void throttlingWithCompleted() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index a0e75f34ff..4fa3dfb39a 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -220,6 +220,7 @@ public void checkParallelFlowable() {
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleFirst", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleFirst", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleFirst", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
 
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleLast", Long.TYPE, TimeUnit.class));
@@ -465,6 +466,7 @@ public void checkParallelFlowable() {
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleFirst", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleFirst", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleFirst", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
 
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleLast", Long.TYPE, TimeUnit.class));

From d6d8869c9f4d3bf6fb7b4b2126a4ee25cc3d0b49 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 8 Nov 2022 14:39:15 +0100
Subject: [PATCH 391/665] Fix cancellation order in ThrottleFirst (#7484)

* Fix cancellation order in ThrottleFirst

* Bump vanniktech maven publish

* Undo bump, seems to be gradle issue
---
 .../operators/flowable/FlowableThrottleFirstTimed.java     | 7 ++++---
 .../operators/observable/ObservableThrottleFirstTimed.java | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
index 223076dfc7..44499ec255 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableThrottleFirstTimed.java
@@ -105,9 +105,10 @@ public void onNext(T t) {
                     downstream.onNext(t);
                     BackpressureHelper.produced(this, 1);
                 } else {
+                    upstream.cancel();
                     done = true;
-                    cancel();
                     downstream.onError(MissingBackpressureException.createDefault());
+                    worker.dispose();
                     return;
                 }
 
@@ -122,10 +123,10 @@ public void onNext(T t) {
                     onDropped.accept(t);
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
-                    downstream.onError(ex);
-                    worker.dispose();
                     upstream.cancel();
                     done = true;
+                    downstream.onError(ex);
+                    worker.dispose();
                 }
             }
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
index aa0f5058fd..6bf3b9f119 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableThrottleFirstTimed.java
@@ -32,7 +32,7 @@ public final class ObservableThrottleFirstTimed<T> extends AbstractObservableWit
 
     public ObservableThrottleFirstTimed(
             ObservableSource<T> source,
-            long timeout, 
+            long timeout,
             TimeUnit unit,
             Scheduler scheduler,
             Consumer<? super T> onDropped) {
@@ -102,9 +102,9 @@ public void onNext(T t) {
                     onDropped.accept(t);
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
+                    upstream.dispose();
                     downstream.onError(ex);
                     worker.dispose();
-                    upstream.dispose();
                 }
             }
         }

From 506413f4f473200aaba1ea48561adb6f75ee53f0 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 25 Nov 2022 19:47:07 +0100
Subject: [PATCH 392/665] Upgrade to Gradle 7.6 (#7486)

* Upgrade to Gradle 7.6

* Rerun gradle wrapper upgrade
---
 gradle/wrapper/gradle-wrapper.jar        | Bin 60756 -> 61574 bytes
 gradle/wrapper/gradle-wrapper.properties |   3 ++-
 gradlew                                  |  12 ++++++++----
 gradlew.bat                              |   1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e5832f090a2944b7473328c07c9755baa3196..943f0cbfa754578e88a3dae77fce6e3dea56edbf 100644
GIT binary patch
delta 36524
zcmZ6yQ*<R<6Rw+%ZQHh;j&0kvofX@*ZD+-{?T$OPlTNa~v&T6X|GAx`E}!{U)mv37
zTVUY_V2yOY5W>&aJ*i+pKn$=zKxk7ICNNX(G9gnUwow3iT2Ov?s|4Q$^q<F%qoQ*v
zm@>H|&1~>6K_f6Q@z)!W6o~05E1}7HS1}Bv=ef%?3Rc##Sb1)XzucCDxr#(Nfxotv
ze%V_W`66|_=BK{+dN$WOZ#V$@kI(=7e7*Y3BMEum`h#%BJi{7P9=hz5ij2k_KbUm(
zhz-iBt4RTzAPma)PhcHhjxYjxR6q^N4p+V6h&tZxbs!p4m8noJ?|i)9ATc@)IUzb~
zw2p)KDi7toTFgE%JA2d_9aWv7{xD{EzTGPb{V6+C=+O-u@I~*@9Q;(P9sE>h-v@&g
ztSnY;?gI0q;XWPTrOm!4!5|uwJYJVPNluyu5}^SCc1ns-U#GrGqZ1B#qCcJbqoMAc
zF$xB#F!(F?RcUqZtueR`*#i7DQ2CF?hhYV&goK!o`U?+H{F-15he}`xQ!)+H>0!QM
z`)D&7s@{0}iVkz$(t{mqBKP?~W4b@KcuDglktFy&<2_z)F8Q~73;QcP`+pO=<OS$B
zMqL6X57H~`N0W#7!2fpSOs3XRU5ong+e3%SOz`o3Zu^kt5%35;Yp2#AzPP=d7EZ$z
zQix&jnNDW*$`;b^xJeDHJ0L3S$djkDzf_=&Bh(lQ5ptC#|1BgGD%EA_oCo!Pk)o$)
zWHiwkW*ANvMCZ~OqxW}PY1HY;y*BpjP)q<&Sf?@#8U~3Ukd;yLExFrf{<{!}hghLM
zrE`-l+!~F{V(>L}4yjlzNuLzuvnVAO``skBd=rV%VWQTd0x6_%ddY*G(AJt06`GHq
zJVxl`G*RiYAeT=`Cf(SUN$kUEju!>SqwEd8RWUIk$|8A<eRN8)l*E=QDfzUehN27T
znrLIPA3tPRcCxORz9de&=0t04A$34Rk~Pop7AHBxPp+qgJLflrFSk#5v+cP<!ZMi@
zD-}{0313cUlt;D74yqL(N^AWlaiz!MdL{`<GcXe%*mTADGshMZe#r^3XO4O%Dmr>&
zAvW|Uo<=TWC~u}V?SNFv`Fq9OeF_VpfyXHPIIay@Pu5J6$$pg{;xE9D7CROVYV>5c
zv^IYXPo_Z4)bg5h?JSUX!K`q_u{>F%FzrG>*!Db_^7*7(F@f%<Xyoek!cME~{+b(U
zF@?inQ(h-LTvs7Z0nsZBYxc*xF*CX*JOF>i34Ps`JBAH6{s=ygSr^CVO)voP`v=SO
z7v;4cFM_D>iVl{&X*N7pe4_^YKV%`5J774`5!DC}g;D@50h?VA!;fU1?Hf%%`N8R1
zSg@hZ8%Dq^eYV1!g8;`6vCSJoK+V1<Za{*N6?fFB4R;(1f-}G3AQ8tu7{J;c*1t6U
zVRfU}YW>Q6N8ImtfE3iXs!<g{^M2wTIRUH7_2MqjA)&QQMIxBSOq%j1c^VBgj&Q<v
zgGQB;Ysq^?aJ>s~B>js)sLHB9w$r+6Q>Oh#Ig&awvm%OBLg!7alaf}9Cuf;M4%Ig9
zx4K}IQfPr&u?k8xWp!wI<a>4{CP#GTs#qR0b+G{&+=vL}I{b-Pha43^%8=K3997~*
z>A|oxYE%Vo4~DiOih`87u|{8!Ql5|9Y+(ZY2nRP+oLdGErjV&YeVKw>A$JyPPAL+C
zA36S<iejUeW3!`{nA$tuzy@hAPmeKO3OtF{DvC-w1QicuZ-QNKxt`Ix&emd>!dNVf
z;xJ)YR;^VPE1?`h-5>{~gwY2pY8R<ku;HDw#`3RQy~n5QvJ-NRBT_0-YG?JTE?dh3
ztr^LhhGtlMS6rRu2a37YUoD1>qhrsiIBmJ}n3G@Zs!!fD6y&KWPq&i8HEm*ZAx`G}
zjq2CD5U==ID^we8k?=geue4Y>_+%u3$-TzVS6QMlb4NoS%_V>;E2hQ)+1Q@v(reC5
zLeK*f%%{PNO-mtrBVl|-!WaiKAkZv-?wnOwmZ=Tv57k=4PX=C?=I4V*THRFRE8a_{
zb>5YwDf4o>>$o{XYlLN{PZ^Ff?0FJl4>A9C-q9A$$&44l122Qsc|6Fd6aTam{=JO3
zBFfFe9seUPSUeyXQc*RA>2{WoKIYVltA&@5spdIW;rzOOqoQo`CN;~UNgU{{m9^c1
zTrN|8w_7+Nws4}Z-4eS9WMpF3h<@81a)oK9njh;-TB74vR;u{vE?>6FDG7<%GVXFL
zUR9l{z*eEND6pp)+hpNT$VVM^Pw*S;#NrbCmH{dhBm?%6D|k)0C@Z9H>T|kby1^)#
zOPmJ8Hq`8waoEK(9}IfP_q4yr(s?ME+T%UV-ikxW!XFb^6w02t30j$n_VSwevg;{9
zx0OXK_uGBFej=gbG><WT7G&giXtK@zPEH4_+NqV<Z8%vd7fGvP{v}IsFGQCqvuFDx
zbZ1o$js{p7OV3vra>G^pEv^`I8&_a@t9>Nr;#r?XNKquD&Ho|`)qK6C^-7SCdo=S&
z)vUi;m5*qIePEIbL=wJ|WCBNY;zCm2F-+@N2i{I^uR9UVZm$o`I|@<&2}w)C`h)vV
zW{)yGJ3?GCZNtFe53Kb#uzrC7v-{JygKZ<lO#t^GY1xV!rfAeLwFQBWL>UiXDV5mR
z5la_vAFOvoh#yn)B`$^ZN*Dxp5Uo~_k8G9skn2)Tb>Kw#Vgxi`bti)^(z--X9F~oR
zZ6=^_x@m<XR-@#YDCW+PvaHaM-p#G6^JqU~F!U+gCv|Cfl#Rve2-P^Xc6HgI*w7k~
zi~#7+V0D~Y-0=$yhDuJw;-LLP&L|Era>DT~=h_@GGVcgBtLzssB1|Xy(xc(lUYJ#_
zgwc&ajE%^cCYW7d;xAxi{#LN*1}s>{K79MZrq!tYMpRA{T!#^tgXP=J5FvkbZ@gx~
ztq-E&c$<P2(ZTW!wt#+AMB$??A%(z%B;XHAs`4LlNEWf$8YeP}TqE}Q!69Y|Y#K0_
z5hnulsn~~d-&m4990ET~iivB?Da9ePQit&}>`|KX8GS2a_voZHf=y8C{6~f~`DpC-
zjQfrt2OGi-WGx}Y4>vM`8<4frU*!bq*NJ*Tyn0cqk=zpDdYth-PJIfz5>pLF@qnai
zzj2FEhuOa-7$JR=U!L{UWWJBA%~SW-6Nh&3;<}iQO)DvOI&VKi1L8rmICePWqoY^F
z-dC8X8~1T}=C9m&yb1kZzbKd2;29_Pm*Cs=y{Z06QZDlT7P<l!ka|EeP8+S;Ymo*8
z?e;wa{R(S&c!S!VuR8m^L9bs6MFIPI<TY!5oZa$Vxz~vUuYs}Bi(v{rvKQ^~#$eNR
z;bE9Yi>oci>1@hFa%t0<`1()UTxcQ}e`fAh6K`<5C_SG`dw$IqzwEYNKvIH3VWlhz
z_#^(T53W}jeWF#WIhj^U7AdI<mbE}4ac_du+9Cdz`W;6>B~3feC--5iUiiT4Qyu81
z;Xa^8#~M@p%6B`LCKWWTa7I+35BLP=EOa&Gp2<m%4MdfXHZ<`G*b?;J)ANiDq-wGL
zVYMK`X`_Oly;=9C*b^uLbh#TDl&XpUpwNjhr3OQ5Dg8Rpp@vT0?=RE86xpQM7WacF
z7}6XN3z0GTS8<;e>pbTWw5HOIjrx;2J(KI$$HT|w8}R-8fbp9sot&LiLs7ILlyZc8
zWbss7=*Ah|X$LEt1O|T?ABkIn-0NN`I8+ipfoBZcW>(WiaASG_khBtKM{hfkm5VBS
zy0Q`4*G6HRRa#9G)10Ik3$C3|nQbFzmU-dA`LjKQY8icnx?2OE4<k^*%nma+G`H4e
zQaf?UlMJ5hqcc}G6;AsCQ6#xw4&;7WQj3*doyeKyyM&N}+>0%z852{OJH=?mbvwr9
zhlx0RDo<cg1ZF<~q_A<_>^D;p*xKx?yT(`s7wj7BHA~rHF2yxnL<1PcU7FM57;?g^
z&CyPh9W4KvZ;T8w;AuNMn|nQ-xJ~CvVT7gAPAGi7w8udw_LOp+p4eZiI`JEC@Mq9F
z#dA2AM_<Y}U>};CnL=y0#tZALdB(P~Rz*KqGqjwec%Fy?K(PGoO0tfskWw-aGhd7$
zTi~x1G>4h5q>ek=tIoT(VBQxrq)&#`_0UHC(j*ZO%%}%C)|EzTWEpvYDqCYXLexR9
zlww1ESB+IiO}=oq)8WZj%cY_FTQcEJ`JdABa=_S;O|kLhX*|5|D>0c{12DoC?K95f
ztNxm(sTU6cWWd$tv`5X(=x?yAo)IYQ3G*2+o#|EfXko6erF;M4Pc;G0)pUDY)t`H9
z76Z8V9HqbWA@!`BelAT&ErrGTz7}%M*605PEY@3{gv+`yEhr{=EVp_tU%`b54Pn4a
zz8nN7`eNx=*`f1t#^7>7G07IEnbnn&`RWZ}4Cp8W_DFDs-5)GU`bw}uBmOQfKmi2@
z(cWWmvHFTUNInRH!0y_ZtuI9Eh@O3+64wy-_2DF~E@KF3abM`0gC%|kHi@&hP_#B$
zLN{Z?$V_;+h?%2zEC{2ITyWOup*w*K?~vpwB(DX1i6oY+F)??;nyHpzaPLIt6G$4;
z6>iAsB+&&NN0;ObWVOL+-^ZwD?nHgY>0k>0<sP{^?Mp2+@T46U{FccM>I3iA7o)f#
zN&aX$lM@r_Iu|n<SUAV}>SdPjoF{#QD9M6>|JSNPLxX^T2!jCKjS5mwNaO+SmBfOY
z;6ZdwfzhO6Vs|9u81f4e%7*mU%8K>A7QWO0;QcX7<jT_Q_h4^Du`TN@xvj?onUvjZ
zEiL_7n|a&c|DLa*0&#Yj3r$CU<Cg4_$DLE-N|_7|kkb>W@|NSUVl)_>7VEf#&N6E~
zn9Wv88@Suo9P+M_G2(f+JFf#Q^GV#7QQ`qH#$N1y{A*_t^`5H1=V^u?Ec|EF6W+6B
z(@Q8ChIUyq;+I5CmjEa1*v%d5{<?yGM|}B87s<%&dT!n&#wj+}arjX<<RlTrpEQ?#
zdHsehntqI5<w-@3txwtgC+XATvpV->WHyhcHSjQuwzQq?;^BmfV#okq3v8bp7dBdk
z54B+%D3=JWd-2w$)puXxZyZH>-$O-?tbSIlGc{em9xHN!44iaCr}6uZ^FpN7IvNh8
zbp!%4xR9np`>AOEd1e2_y}xW#v@@h3wYc?WiwL6Q>fxPQA81V^J)XtGs|Z&er6w~M
z!1Ph~85TMG>R&ixNUnevc(w>fgb%+X#Wds6Yl+wH29aE%;RuDeZz5dEt%#p&2VK1n
zKkqgl&*_YwnO%9`0<6MVP=O3<AJKCZB>{02EcR7PvvZPbL2KMuoRsU|Y%zw38<gt9
zD7Xp4!h8iKF};C<2Bebh-{pJ{+>qeOL#!YFp#_~+rtNJVl>lJSh_*B0A6n3XkE5po
z9RpE_h=pnmDJFX*n6wmsWJ9GLu2=L8y!_R;;Aa2Jl|)I}Qff&`Fy@iOhop8>Y2{F}
zbVk3rNMi$XX(q1JrgcIhC08@d5Zc>wLUL3wYm}hzS^!5d&Mec$Sp^$DUS1lD1>KAt
z|Efof3nJ4^k(WKL_t-u8ud4L(t>q#9ECj?v#W~W#2zTt>|MCh&*H8Wh1_I&^2Li&M
zq9j0`(zk~P7}dB`+15b*j%VPGr$;@4MBQ5AT>-y?0Fxfr2nC1kM2D(y7qMN+p-0yo
zOlND}ImY;a_K$HZCrD=P{byToyC7*@;Y$v6wL!c*DfeH#$QS6|3)pJe68d>R#{zNn
zB0r*Es<6^ZWeH`M)Cdoyz`@Z&Fu_^pu8*089j{gbbd!jV@s7`eI5_X5J3|poVGlq`
zDo9}G;CsjW!hgN2O9=1|GpE;RpQvrBc+&dF)L>V&>9kd6^YIL?+*WDmcQlvwnq`Lf
z&N$gF>3+E*NcJojXXI^}B(B-;@ebpVY}l#EcDWles7s;Ft+KZ@m+6FWaD^oYPBXVw
z3sq|aKIDh1x5Ff=tW$(LO|!e&G?Xvh^H!GfiA(emluL!LmD=EV@|u|8S7w6ibUePJ
z>{sOC6L27R+b&}e?VH;KvV3a;O3G=gwG}YzrkSTV6(&=;o)EV~2OD(Eh4mu@K0G)i
z3#44IZhqN6+Hb2h#3R8YwJW7LesDA9=n)75u#46_ZmSh@6Q-4oHvGxFPY8x;Q+)d@
z*-SDqhVeyPGkoD)iq;z0r*M)IhY5I>gMA@RS&EIYPq}Z{$Q4Jbfd76EVhSF-sR^TO
z!=o?>V(^bx!pG$26J~Z>Tvu&Uu+0;>m+pg(fmbu(97^(OHBH4;J8WIfv-f5}VP#VS
z$Y$}SHKdphDUHlbdIVW!k$L6T{LY)|H}MT=l$22kIl>|46FK9dt$?3Fjk2RA-~AX7
z1|Xe`n)%h~e-O_qLpoFXJ$%gmocq`v0%hRw1k_6nh|+3pvJDy}m)V|xjL&!Z6?%pU
z+m)r2*pWjEl!etAYxdzWb<DeR-tHX$b+<?(Wn%1Gh(S)MdmKB{*KLQ|o}i^=okrgi
z_9tFc+SAl*^)xH(tKi3jdpUyCn<7TfuzsN)Y1<z-uZ+*1n644&T2hhTW#l$JdUVv$
z9F2fCF$SpN?bdF2U!hqU`foD7CNC4D?_2BJVLtYJOiMdLf4g78>0{mGc;#$>rE%)b
z@Rnj78P;$lrzY!XCa0&x+8a^YF*G|Q|C}bGeczz(5m_gq08wJHIH`WqHH?A}!~_3{
zQEvMXmL<*nThl^pL58nbHgQ1n9cYmN{C8J^6AKS%?~>1DCt70Q2Vp0;E@`GF%Tzkc
zSUt&LJ=wHI6@#8<p`nK`!Ea3fOOSLhy@qP*1BsMS6*j7wD>_%=2s=j^4VBd1-h_)3
zeozYua!|{x(qk#z;tavf28rj_5Oen-cYG%;R6I}Hz$yMXeg^)_$OUUXx1r^qrl!DG
zYXkAXKBMrVM-rJwAo<5J{NW1XJhW;Nh*&`n<RXNn6IOA-+&<Z4#Jn~3w@C62#QzG#
zo&6oEY>F<mHlXE8t5UZLqPiHGRHomoh-s|VdWDiw{z6h^=(CmJV!wHN#vuwY`m=y#
z$b3KecI8NVmbWX9fLRxXl*i|Ky5oAwllK*He?k|CYlD-yF=r&qM8m%_O@_wDtIw{?
zsm!8mF2z+!7eXmoti@|4)!q|iq;(;s*+W?H6w13V0El3Hk6%BXBhgeTI5K1PqVf-q
z!+aIreh#~w{+%D~P*}=m=S@Xc@3l_@S##Yb(uRNY84PRS#?R3j5sidz{7PVr_7d6+
zw)@PW*{8JaN_`1$A;iCk%{My7B6QL|yjw&-a@mrll4H}OOf2AOc$xJ}uEDm{jyNG6
z8++BP8}RG4A22G}bSAs|=P6!XsB+#y#vUy}^iHqp)BU>V-Z;Vd({KSkMxV#cn|bXJ
z50GtvFE##sqGhV#lv2s6?^yeBShlhR%XaPIo)iXOue}jwZ;Zq#dgDn8H?74Y+$Z?C
z2Y5mCC66>dp%sVMecUzCir<?IS|{wvN9__C23%k`O7tg=(qtRE5(;!0FJVcjKh07Y
zTNRv{El!qCP?t{?82c5+1<}`8=b4=X6@2MHjbOZ^<#e&J=tQV!{?e_ok!N2LCFvBL
z`MZd0icO@hLwf|Ve+I=0+l8Yvr<Y7+s^4lTL-U<Dr+7fl8XaIdpv~*BFY?f*`zn0h
z>Wq99Ea(TDwClZxtEB~4N-2JmlH#>Z2jOcaNaw4tn?P->BBGNHxUHez7>C@TZNT5Z
zHerlG0a4~06L%>tn!~$s^L5`~{ueLZ5?`$46nHvwKxM0V9VQ(k{A40xDVw{+Qt)RV
zQ)T2Df)cp0nv!lUFt3D=i~k!V|7dUjpz?K2ZiynO)$d{2*YT$N^CQ{t=luZ>WcE!>
zg25p}If9RTho%G@PZp;5zBwv`n+e9iO=6dx1V^|4Ty%`oE=f7O&QC^s!4MJ+lMG>^
za!mgpz*^SHT+M_zm;{H#E~SaU^Kn*y)nTAF*2@t5mF+l)bte+a+goaA*zXJ4P)H|y
z{4OwbJnIPtMp4E~=64gM-Y{#o{x)+8YCg$C7Yy=;9hdyBgRFIY2_L9DL3*B@%$5#m
z8P}+)glf*}UPD$C;_yntx}9VPmSSnY9`Thd09nfoR;3`kar*FRfS)`+as*t2l*U<a
zc9nu(cBKz?7arM)zV;H_Ps3eFwrq3iA)aBYa4pp%PE9r90O+Q<Wlt_YE5AMBb)R~f
z_U$RdmLeat%P`|mW{m3)Gtjq%<5SmI0n2A$F}D5;9lBKuuI&j~;#T&_b^ap1RgNwU
zpyjOvre7@Dh4h0NO<c20sHfS=+fF>SWgmaZ!qFubr1DegTGZspy<V2nIl0@{`(9e$
zZbhb_XeLc77-5o(b$Hl-1-ZBIU}j%?oNw!?h#Og7$C}S6T-^LuM|G3}+ix`Hxr_0o
z&acW)nNFx(89Ed@)*;G@;k^!K{Qi~#6ct)SY7_5rLr*Dsi0>YMgic{inI0dSt+rJR
z((jjMrd<p)oCp*`z<7GLWwxEabV9&%vqF|9&I|WlYLCq$26pZ*9NO&d`7*c-dn@-%
z^ooh2B_QOrs*P~6G3dv|Ve5x=f;J{sC&>q^?VSZ8FCO;0NW@>O_b67gDHP%W*^O?J
z91NQ7ZFODMSvHj3cvT#6RJUF7x=-BJFQ^6<&mOd15Z&M!?b+3Tg!UcgldD9tOAt5K
z3X>MlE-a=sj;K&}sSng48jQ7sp|&u3;@e>V4Cuf(!s@9lZ0Cg^DKWmki%>$<85tOG
zU;e{%zHU~KREBUg?FbcseK{lmK-`*S1p9j_4hF=F$y)NB;HsHwuf_A0Zhy395e<C8
zA~ru0?GH;EyiSV`l6bsHzG)3nf!Y)uDm!6If-?%v=2I{5&)VdRu~Q+{8cWy<7Y0yr
zFenN1YKYr=^-OK)@2=@hmj@XF3n6UE7q|Y+2_s~zF^_f`mVEnK=Sw#OicD>U7o8^A
zi2t7Ch|KVp<w$qTr>rUn03N0T2XshT!g$HTErcQBBG=TWaHkYtaI2CJY7ajI%yr&9
zVC^zJ3WW03bjwGNx{l}#+D&Ml_uI4PQhV}qZPXOP7ffSv(<f8@E13K4YNv44sPM9$
z5}jkawJF1jsl0yFSJqAdeIPZ>O;hX{Ff1|HoA~v)V!4y{CdALyi2YPjrRVmRYilRv
z5PSkj*Z_8Fa*sCqGN?7YTnkr9=i9X`qcw7nqz#{bj?B7NiV9fWF+%~Rb1X@MuS^<Y
zhy-q4^}EzZ4_voD3N3Tn)`-CuQFG!zcw-%FKh$H`;HyF+A&ORjrsSwHx_Ckn@ReGG
zj5=ye0y%yy;deA=EHP@H;=mFaVFIQOmI&yGE;Wi{p<Yj%w+UDE2w^VOi%FChlqTvN
zYyn&S&}yKkiF}x+iGEBEnyv0tp4J}nZpT6P?`{F|u%@o!l0?JtU{mVLIwcW9Qw>Mw
zC)d#K{(-9!?xStM2K5x%x~ogWxgIK>s5r_RT1jU_lxdTtIEFWvi4eJSAiGec&HXQ(
z5t7!J1b#SL|8s4)u147PWQUq_e33<Oxbq&!>!5Z#f$Ja&az)(Htl`Z0<naj}?6F$Y
z$}4lG0(Y-w)Rs-Zdm7qNOQq3BDy@4Qh+s`$pa=!AfIcX|dbX8Kg*?%N8ZU==cr*hI
zTO3p(m<U#|cVVJ~B$&W*53$4|xVn#Qe(q8V6YG1ZCAL(<{ml&SOn@WWwP$#2p)VG0
zZWi3!_`5JRX?;;!NWvp!!`qG9aG#I<BAO%iFc|FT`=mviUxJ4t-qQoJp(_T1bS3-0
zN9pk;=L!I4$_etGN&Ool%e{d3Gt>@Ez)0d74BzNHHfH|<-8q*ZMf?%eJzoGS!0S6Y
zS<yq~kB3Tb%sqy8eGF^b<D=L9FeZP3J5X>U7y^1+;V$Je9F027>1eN#_tz+2t}Y^N
zYfi9}J!N^SU1CYoNBDbD39@84xLroY@0f%%c^(5CE+}!b5-Mt3oXe2nB<C1ScE5|!
zI`R@|JpR6pqCr<tY!>dyicgGIL+rzTTKv`}Pp%fG1f^s?sgNH8=Q}s4Z>0ZCZ8ZYF
z4og8nK%OA~zZMJX01uFtrmwhcgg*XbiMP9kfkPYFASbp7*Bk^5ZBzV)dL)JhPwDkM
zkgdHeKw)orJcj4^)a^wQC2|->G=OBzuc-SskRrrf+H-E%HQ==Ex}d*504#GbIUXIB
zcZs@Oo0i61MG}&0bu%@2N?MMJMRXyTVb8@3wF5eY3G6-1NdT~{{~YFs8f&SNebdaq
zKmP>XqCQ@iaamuvY2m%xJ~gdSLSj~DBhB`NCj_c}NbSjB{r(E`_-+6a#vx*|S>-GU
zHsw^dxxu`<ZZiBgWm(-)b;EY3EtQaf@}DPW1>e)q1HbH==rLFap?cebKumnTo=iJQ
zJD1#=o>0%Y@&jP?^)Q5bTV!pzrf=FoHq2c_59pq@my{D4AW8VU*7LVp;LF-qESV;L
zClRfyQ6CcD$sd84K@e@p_ALH%j(Pz@Em@QFyY`AG&(|!(cG8!oV#ejr`y(LolX}Iu
zL$)G)8^y4sUAY<?JUnp?V+X<+x497_8RXw4qkU3F93UWMksK4owU+_K_<{V3VkWmI
zD75M3nph6sl-syOHNB(%w-56*!?v0+?K_%d3}I{WCUcqMguAOm{GNezK*N1XY58Ds
zcxE<o0etgIY8&>CWprzVR?`#OJ%NU)9U^B!OGSj>Ly;<)<(nNh`?z*GvJ|ZBKfZ`0
z=q_yGHWPp~R+J+{{@APVwmp8`=%N!L7AT^l^oaM|JrCFu7J#@frf=z(vGq2>sQ^@u
zk=^d#gDf}ME!~9PaLfw44~rsG!)T7h8~dY^VcZQa+u<a0comw1=nN&=)$g(2zsse9
zNosK&#4<FTgb^-(s15odlHtgB_~kcWMDnIhO`~wH@saRRni~OEa5N?8JpVd;EXm+-
z)qqqblNN-i(q02>eWPGG$mWXB|H2$$0BT(QAIu|=DJXPQDNes3Q>-|Mh=I<BK=M>h
zy{WR)QmhL5rQbBYPBa+e7)8Vo;<S!ABPkUe41j@N>_aKrg`}izmN>#ATuSDu!QUFA
zsgM|Kv@W<Nnd-_)&UqvT?%DDV>(S}<tg)B`%JZub4IDFiZN?}0E(h6dt3sI+;gPRP
zF3azPXNY>Ag^6e8)9pQc@JLj_2ZIkO=8)#ARm#mU=NncWbmd-SbO;ad=y|k`shy3b
z*8o0@EJo3b$#zSgmnlT7KAp)U!qI2<ZO&1fknVbEVAufta&Oj|ev15eyGb%dk3anI
zg4jI<VAd7EVcnHNQOm>M`hiC@Gp0)pNGHYMe1$MBNE}Hd{Sv^`wI7>MzNwgVv1ZzL
zttmyv!=TKuPH$b>r7$lgP5?vho;#Ks4+zLzaz-1b{p-Fn6dWy1Agg7O2{&VQ5@s3A
zAqzC9QokRD59!@ex#k>xy61kq6h~O$lb;lB;Q|chv&wzR+N<xFV<Y81KH2%km!$hH
zoFo+vR@C3?To2+Y-myBi&h*P^bmmmc=HbrOs4u%OyLxwxW|{8D@-*rGoO}~@05~u8
zZKzIh5yoi9o;p{~MRA7;a~+AZQqdIinbC2Je=+Bh)JR1#*GZFg!&x*oK;x)(LjxY>
zgXdIo%?q1Y$TzsdCo+n$^NODN7yd}cAv+rkG|u-(wTp?zUSUxaA-<EMLrr_!i6MHE
z0wZP7ErGEp1(s0$_G*J~vCPWPfW@gkk_W^pfy$hvWRxlX55g#c5l(;A&y4`xsw!#7
zbjj3Nk26d}ceuVA^{pCcbHXaM9%PAaX~SV29RwLNh4~hlNE66<>W3dwqikdrokwz)
z68)Gn$Nwc1zB$F9`#(af|C3v;|2$bo7fU8f7h^NK6h&@xi2m`)g4mW$?l@5JEc*VV
z6d67@Fl2w6mO;MYUl2U>R996gQUX$d>$D>)TNGq*arz}f21yh^uvIM!3u$H{_CH5!
zrjt9L^&J8UqEV_lLn&}nc|Q=MDei6t=vL_>X-i8B%f5FDi)|qQ;2V-T!qOi*uqq{U
zElET<vy9xrZ6~nISR*357}=cUZ!(b1<dkD){VtGXEQD9o!#fA?H+{Ods|^zX5wB@z
zB=t5saW9~PNiZLkj$Qtc=bV>6#2cb>Z_6p_vw44&mN!;T&~ubi&p`XGepCNAfa0-T
zC84V@VN^R6%z({m=$%iXrbiggxvMiBpww~ktD&=9-JPK3kPCOGCJNQj8+l9k#!QeS
zv3h$Ej>@j<-zBW0Qr`5tNQVRfYK_$3>nWUzf&c*tCpl@aYwa%b;JNeTX10OevcxY7
zqnLgKU-X9G8~&?Dr)`*7GryqhN#;9v`D_c=_xBcD{j-cLop~pSnM?&<Ph{*jW{3zs
zXQD)SW`+zTX5$323+C&4{L$LgzyKOO4ls%ZQetqOx%_}e^jxF|hxG?=ugTSMZR0lO
zj?S^@8~(KRX!6eo`<@t9h<g!pSSe!`Q*bHebhi9@HPWFY5K*(+68GGTi4?n{z%V+X
z3pOsrLRv>7HggX6gb++ftBq$idM1|>5t+68sWf{ixREbMkZesmpjJsAFPQ#2+8Uek
z$BPbu3<xVFpK7dv7KRR3vc|h+Eou!Ce}r1G`v(%`i2Vs+e}pV;{E}3#=nV43Cy~JT
zp{ReQ5+LUy15IBpODF-?F?+=8&q1AX%kg1qa;V=5qvaMo0Q3eieFb)7s(gT}^n|6N
z<n7r|HK^#T6Xz_Cic<SpE|DzHYE0b!W|wP)Dn4k(k6duc6r<-)86l8!XD(5gXC0=o
zKtt6LHkbmHI0-=4c^1$MQs666q<sJXRT-f_%Fb#3VebX;{|Yk|pllkGRz$ruSgWXP
zLghC!4N2mEHcfTrO5&M4bxt$zDtVXT-Y_VIi>cQuNDQq+^M}&ZuSHjxUgxOjF<^%4
z*8lc$CgA<$n=DYg_DsrHB7zYM0Ro|gS8ZnUq$u3GQ+{owv9RdB$wG%d-;R+I>?i?b
z+r_mu{IL6WTYftdz?0#pbHkmQP31LvXcMK6;mAP+;q^L@q}v~TD}Ni>f7@QYcbM!T
zX5kShHv3X1U=>B!2*si9=AEJCBt~GIH7DL4^+gHj+q}tk0F_?Q-=z{JY%77nkw>$F
zG}6ROaL_)3t$jX=ZtFG{Q=LZfNjNb2LK=m9<r^Ty{qi6Q_`T^yhCZvQIHK&iB^%e_
ziBxN$_5Xz9Vv;%S8Bb%-@Bn%T5`VDRMXQZF^ibN%5HA5H%ZT>l|7iaB++N|S$vAr1
z_gf3JpIB|?dptfQ{sOZGlhyj~D;T#hjaNh0X5(o&7)87^t@@Hteh{0DOM{tCu$l#&
z&NhA&V4VR}nzZP{7i(5bGB17<7bu+RJ1}k}=ffSg%=+213Oy@Aj1vv2U>U>8tRhKM
z=*e<21)u<uh~xhWaMrQ3*#wsfNWF0?eaeFy5+Gc}+o;A3QrsU*-XBhVGxL)}N7<EX
zVSGiE+>6SSb{CC&We%#6X@duqLWGJ>O)Ls`uM98``34g11<O-!nvGOEuuT0(LVqtO
zX2s*MMM2(+2gFI*8De<gPSPFXc2J$ge*lW+%MhNqEp3<?8aH~avgxwV?cQ+LglbNd
zTgny`&Mw}<gXQ&GCCAg4nelHjG)ts=LYQm9Wyk%(`iBOLpxM%N5*j+aCvIK_DtP2R
z(9oi@i2Ml+wS=_FCY8bdLHu8tu7w}Nhxm_IAUFsJ>;D}*7>c3+^c|Os&;t}`(BWMD
zfbyr~$j%{6%DZ`kR-}s~p?0#&-5a}b?6tDqwtqY%ep0ypSRIB54G@|0J5E#LkxQk#
z_&xE=d(U}q?*Rh7L7f8A<JhY?St~8>M<fsw8LqS{(O8)T&cz#`t9*_^jXZ*jWVNn+
zmIQjRU-h4bpZw<lsa=D=->5{qdGpC<&t~9YI!%j2G@nUPoLPSiWHjCVP{JAe?cBjQ
zTqI=R{nv5c@|R)8Oi3cTL{&6%XdTgDP4CNYT}q2f5|Xf_hID#;83kd+v0RRyNKYn}
zyPahwd=4ncDORLvatBc~KzT+jiiD{tzd3d*T(f7ayS;J&I1X!xaL2~POrw2ST=Pr5
zu*c}fb@)0P6jv))kNl38C7gmnWGmlL@{PWOVYt9se*cS0w#@W=N+dY#V08ci=Zmg9
z+${f#Qfs5)hOPxC;q{(J{Kx4HF)2QMzlVtXz0-O&h2$VxtT;ROvZ13nN{IG>Asv{%
zHuDqgZ{R2(X*hkO+!HYHHWvRYrvN9fl-1?x6b)oseZY)@dQ6O>9Y#8*23~%bzN~Nf
zpHGMdS-G|%F^v3Gnlsc$s4Wl=ZEu+J6y~*Ih2tpmHfO56JXKjldm$BxDvW6ZH>JrU
zdRo<INz-S^E3^(+i+V(K#JMeB`Zmj{A(unf-ZV)15)_Wr4EXiGsBEYG1nvHZiY*if
zh|vE<rA1s5rVh^#j>}=^466lAq6!qY_@nQ}5ETUEoF;`>7b8W910_Z17!r`D?QNvC
z+WF%@IkPi43n4;0Ks`M{x*0-^GK7oCAp?pFK1`~RoMSe@jAlV8vQruCUNyQ_7wk?`
zSKe*|!4ar@VSA}!ThlIB*Qa5){pu&HS!a)-{lWL2@o1486ZK_!!}FSZ>vyUPIOX#+
z5d3~J24Op?!f!oNytub~egnkB`}h?eh!QyX6&^LbNuA#9vH#N_7IL|#6kIDhLL=be
zE<R8t7<OjI8h7Hy`g96L3Zg7FjWF}3&>g3Cwmw{A(cm{&T<O*na6u2NFOhZWHK|N8
zzF^Udi@lQ}G*3!0m|QnYjkkUa<eRpVhjl|g1Z#*jrZZhN&DA+jO#rB(hp1xg-CwW>
zPg>XIWX24$Mj_#^k2I91C@h;b$8WNVr&MLjEwgAUtSeJ2W0)6Fit}PF!K&1j=*+6g
zL{XOUrqhNyPLemIF4C&hThR8fie9^fYg$yl$m!1|YgcPlO>TB-(X{lkN~X}R=GA!Q
zou<9ZJV6*}SN_4WRsqzRGI&p$;9DxDFTlyPw6Q9rlo@E3tMN&Wo4eFs{1=RCUij$V
z`8)kmh0fhTTiEyvRl90B%q2<lV)d9-o)Ht9<Dd~o9~E}Q#6phQLR^v`8)kjHWYFm{
zdE#&UZ+7GaF%E5p%vN$_HrpW<Hhj3Tkc^zKC~)tWizjzmaKI5GVn+m-?(oa;)NghR
ziOZuPVAUkW&V6vo3<tCXFMI<A`U<2ei-Y~VhNNyC&4tP?Dp$#im0XH@@Z#D8&!82(
z!QQ4+Cnwa<tXboRU6j~tz)^OsB2J-?EwPQoRkv_r4vP~Fmt04>(Moh$jg7{NeQiy>
ze!H{zbG7<3BcK}XE&V_1kFfGA7D^ODxn*@nqlp!{LhYb47zIUlV^m+7kZh^a7L1^D
zvI?m^9PECMnnN$0hi^Ur0b-~QgEORanrv|`dd;ek$4rAgEEof3HyvuYoZ)H*;+TgO
z8CJY~4YDI^7RD7O)m&2h2<Q87rm~8bw|H%P$%uXd8^CHUHs52!jcrIg!ANi7222;r
zmZuQ%tiIgYv69fF5fT1=kWwXX<wZuQejO>K`-4e-I$1zcZ*K>Cd7~sSxEXc{d7-;f
z5Ykr56Nkie%=z4_LIA}H>c81e$%ey=2hjqzTxoO0MDe!J&PE@EmX49jQJJg?HNw;B
zHRHr)3do7CGDa3lPAZ4LAnpT)spnk8(ZiFz$|F$1m*A@!qCPug>Isp|MPI24i>jp~
z((9EQ9W#Rz)0AYT&ZWOWKBNtdNYYm2QytK$o-_|W5j7Abr&73(MG+Ar4K!Ij=nKu#
z;SNkveY?Oc!I<e!FB)q^%Sn>|Vta2{rb@c50#p_byn|_tu>Pv}6YDydl|}X#4oZW2
zvq)Y@8iG5@6c3?uu4vdLS<T0bz2Je0!Wb(B=@uU^mNRR`YI&thp(nXw*QA$-KPijm
z;LTiqJnO*K9f_I&C6c$ZVjq5_{M<L=0LMz=TFp_bA<lb5i%CFXHgq4jVRzt08RMEf
z3@F9PCt(kBjj%#%-^>Bq23P&qUSvtGcu_qgH*?KfaT)@QueLx6apA97FI7sXP=foe
zmrEu7;%Z=yTTGUsHsjR(wU54xNPI$hLFZUOwh=uhZ&rLammOQ?w*)}?Ah#%&K~OZc
zl#Owj1OCEeXt!ALV7LgJ=MVbCo}<%92WX$wCS~Ins}%5+sb*C{WoOT5*<IA)uz@eb
zLP-XZ5-w_QTRhd})@kJPq^5yQMU%(yM2C42W^7h;8W5ewayD_QMDkmJRJe?e57cd#
z?^EvB?N3*~s_#gIUTh!s{H~4Lwlcw8BCUhG8S@AIF>2%sgjya;<b-j7+AJl!1_VzD
zC*X}=DAXZZH*Y33iou^JGK7nXlgI#0aZoc9aJ&B7Oqn*XDYRQ4ScX$<LuoOjqto>~
z|A#;k?j~J9qB)Tku1BGX=MrZ}<%Z4}i$OvCHv<dr0isg_Mc;A)aZ}o>_3vtH_NZoK
zjJljjt(~Yh%aI@gFnM*e*@_*N190p^@w5?SjRMb66N_^3EZ#Yoh<8FM>Yx$+mTbp$
zjQQS7(rs2j^54CJXdkH|$1&$<b^jjZNHa;tGy#1rzLCo4m@7_zJ_d*Uhq}`k@^o?E
zWhm=)-i31piD622iVS5V+l~V#6=;GskJ#TYCYJE4bOD@dHOZ17#;_UqD1b_Tkl~@d
z=uJ`%IP>wPOGDvm^@1o1pl9~!5&B+I=U-f_M-M&r3zfp2%TH%Ib3lz-^t)+Z9E+<g
z6%ri>>W1Bt1`B}rZ$hZ3{<jzL+ML76MX46HOTpFRaR6AuBv`m#NkL(i>0n|nZKM9O
z$?_1+y}fB2$zEzE$zC#46=0E_4x7-VXY5}<+d!g2+Kg$gvU-Xm-A9DBZz+bZ*zDTx
z$Wfb93))oLQf;wKi5JBJ%$yq}m42lacy`bC9PjFg*}pCnqn@dv{k9WiwCC07;6n#e
zJ499v3YGQ^WyYY=x*s`q*;@R_ai1NKNA}<6=F8IvJArr{-YbdY#{l1K{(4l$7^7We
zo~>}l=+L8IJ`BhgR&b$J3hW!ljy5F`+4NA06g$&4oC-`oGb@e5aw-1dSDL}GOnUuy
z)z1W)8W9t(7w%OCn_~#0;^F)xic6It5)3h);vuLAKFS4b)G;Z$n-R&{b6h@yGxGo>
zT-cq0W7~n+qN10;1OS+*c>H$(G<aFTDJgrZDaGTX$mHZXfeKSU5_au$;>oKq4hGG%
zL&XJG$PDQ6K^BD#s_MsnlGPE+$W^B`&a+Z+4;`*nyKil99^E(wW?t>#V_xYWHLl2}
zIV`uiR-__g+<&m#Z*4E|wjKY1R2mCm%k2ayMSDw`Rz_<XkO4Jp9iw$j)U{W7#+T-9
z#!0H)xg9(UtCcr9i(U^Ono4I%UiIpRi0y6<+!vCGPv9^%kl1I2nubR_dn@JtGE3%K
z#cDCp*SImKht;?%sv6gX!vH72S8ovJUM6hjW|y*4u_QYipZ>KA!3P$uIbB`dl`3&A
zmT@gMT@ZpAxBys8zRtgoH+ebSaVA)maP?G1=G4x^Nw3mV0?qehWL35vMI~p$y0hGL
z6@vHf-50P~uoe6yY&*D)Ekmi06LF!Jqz9#7kMvWexYMbAn{}`{3ZBsd6$5jBCujDp
z<0N?b*1%T<-_Nxh`lKtla|FFqs7RZMtjHAwZ0Ck&s{x`#^S?36BNQN1JU^0f&TRoC
z$}c)LW7)-n$CmAg&n(96AycC4!4<n#&B)$fduH~(afa&-<1Aiv_BiNqnK}&Z0oQkp
zwvrKFy~VfD`8Nl`AUt0=V_p>_*D(~HvXyLW>HORuI0;ny$f9h{!Ud0=X0x%{l6NH$
z?lttWn}DQL521;-r~Kf$N_YPo)7H>3gI@Ivt}GnR=8W~Nn7_PE_3{sRNn`R~bs`g1
zoTh`7o4H*TRp7VBp=%>&t&Cd*Ny~@;{C)P;62d^dipuJYUV3-Dh<#a&AIxtrmX42(
zYEH-8F3|^nY-=yw(?^d!hTojNxr~A!n$Ao+2mq*kZ&>Zm+BDC*sul=~!LUtWiokIB
zxc(dNwyk&5o;>WRt)Q-Wj;fvuvJO&DLPe%mt@t!Oq^VsoIN0iTh%fh#`-{Ha?a8gf
zj^yA3`=_NEONO0Z?}YVP*dL{T<jsgAnob~Nzu;@GNAJQ9Rd@nX+$kaw$MHg^PkBR=
zf&se^(HAFh`NNg8o>}v|A&cE7$_0G=g;1s*WDQuRcq>cJ?z=8b5&i<)=3ELSW%Kff
zs=my9Q%8?aMxZeDq=RBHg*&HnIeQ_}X@oh=f#?C^HSg?1dwLn#wu(o^uANrRZD;H;
zYbOec$#wJB(u?w22{gV+zb~pv|Ag!q$N@^|6n+FV5-X=lR$jajjeRh$1tjht$URz1
zhw)(ksAr2;QBXH9T#A$6V4PsR7K)){JQb?79o6&*IwDPZknNqySIa6pwcs)~xN81I
zKc-GmzZ$i(8RaU==$Dx{tD@4nph-V*=W{Ln97*VEN^F+u0!F<%$l=K`ikIp#<^Yt}
z{rx1gk>;rVccPIo6hD=xPQ$PxVwl6Cl;YI6iLf3!aevhsyXXZovK#TOv0|*T+^ii5
z+YO`u(SO3@ybv-DG)w)E;@+ULoj_+<;mc#iW8{9<ye(3SZ;)G-=wF~DyKm6vASWTZ
zO{{K^a*@#@kx(YwebLyZSuRj8?E_%FG1ez;oAd<-5Z|HKrz?QM@kiyg^yTHzUy{tp
zF5XT;g!_*Qazk8=8NE;}L%7S-S;q4!m^lhZ4k`EYesEnQjft(kNupJ_b=pj?v(it|
zcc_G<c@j8RZ3Z?kBwajzh1>Y!99vE`HdAK=Utac&Eq1uy!TLgOS-C1E90Am)B{Tiw
z$>$Er{s{snLEaO5@u&zqxE@v;p6D&?u@40t{#VNA&7SZael};kGEwnHgD4V5RNM@g
z(EL~B=A8&?pPPW-fTja0Oi6SVtI_(3ME!qWLg-uK2afWhBn(C2PAmUyu^2h?Y402i
z9P03g5$1#etGdUUo?#skjQ|$*()ybRGMXM`-2?jjThnTcPV==7sg$k{GxYdF+S*zz
z%d<d0#}l#z%*B))^3X;zIHWqQ8SVAp<}TGArkj|P$tP4REGB!_Bp_FaJ%zs~iK!`q
ze{Xu9=0m>tBo(R9!7SW6Utq|wFpsKMSAH-x{WB|Cz62A8!p8!kHz1tM=9I=M&xqQG
zz17xBW7t?Q?C%@4YC`p*za(>hOrK&ELyDQu{5ACOg9noZS1SGh{-FcLy_W;nf$N`N
zGYxdIzy7mL3K@Kw65DmvPH0<Zl*R94v5zrUWwl03TdFkdFjL|nibA6)q$y=5&2UJB
zTRM;5Tu}8iY79WP-2q{O81+!ho2Txe6{6e`GhHlIj$KCkPf-zmfBv~59rE9ZpxB^q
zV<p<&{{dt8@k0dq@d$n)GfrqcvH8{i3;uWVLRTW1$Jr(Wps11*52rX6Ta}fn#sFeW
zsN;+2m*q4Sr`KWwOUc^I%9<xg^sE><z<Ju(e@NF`Djg>@&;T{y&jP^AsaYENi}q|A
z3}l}5V?z_VvpHf%CkpN@IK`czOuLPY=yBUf8Q3b9$X|kEiYROV$`T8T7ZjFPvKhbK
zDYxzz99JRNzsx0f1Y>IrIQq9o+W(TsB(ZtN@4*)DMGr3?4~Jt|37IBI|7oQknQI3X
zAWs`45xiCHga9;8+<O=u_fH>W{|!Yy>tic?%SNq=3EX@z2Mk!P0dKG0NCHNz0*F-a
z`7K?6d*D4ri*=>wyQyQt{_t=t95*gB1|tdTg45fR{KmKD|3ZuM$QlkX{-tUkq@3Qd
z-6X|jEyZa@tuxB}qrdlJdc0{8``%3M$xl8$9pUzkFa$Ww{Jocp9>;5~oNC8o`3GK&
zy7_X8YoQDCO1TU_a%#Q+rC?Rr`r)W8CdpEe=>uMYDx6^46V_1DthgX`6CnF*E+%bY
z=GYih(DizXEVFDuQ<JCx?PN>RPQY&dc2p;Pwo7L{I2r3;QV8IEPg1McP{PchEUDf}
zbtSAoBMPt?&Q@{fG_3a7gzHl58O7e(h_F6^rKgU=a&(^WpgH3U%`tpj3CMVRA-uol
z(hA)(VF{4@`k@PREUQJ_8w6CcMW4Pm06{fw^*>aMH%#ik6lD{{j~nT}Vw=wZ(;Ct&
zi1nt}RmOGrVHP++5;Z@eE*lkdw~?>AJL_Yg!~p*adS_s1`_o<Um5gSP?T~>T1B26S
zt&1-4twO45pMl<5B9T;SLH9Q?E>dBXcy@5k-{YQ5K!A`=YMYMlLOYc(+LdC<@@UIZ
zxq%vI<;6P)=W4nRb7nxQ9KGzXsOjWs_3V-2*V+r}?dAZA7{7f*>^PxEw|6+WS0wAs
zen2zj2cFKIr`~Ai<sHnmXQ=l#&EhF_$&1z$T*;zE9;?F~V#|Y69&3bZ#mvD7O-oFl
z+Iu>`YU|OR4%DQw8uM=|g2B{;1Ho`mx@??e)rX!p$MSlA70pKVcvZ@|fYLpEV~s7G
z>#?88yv{ekJpeJL<-?FY7wf10XpS{B4}jy{uc)7esm&J1)ZYt5LI_{)0BkN8Nc}ep
zg%SYD0Cub3?KXLY*-dYn<aCFGIZ3oQ_yW5YfHIm$s?p-IJ4C0SY9D*8*Y4b&XU9a<
zU1!(PbZz1rCOe*H*Kqi$)vnpn8-DHKLOAyVXV+lvn@0!7w{b)M^=#K~MRJnk1wNVb
zsMrFntB3^K(~V&j@ZY92He`yi4I@C-b6EoYo3fc~RKp8eWvHYImrxo#QHMB;oE<{M
z%39tlGnBG4CW?())O<2+tn|D*=R4{R$!)mU&Ddp2wd*$F;+$X;9BW26CaW`{bI+5g
z1n~WJL=pJ-Rv*Y83>trghE|}%?RY5i3yVcPFlheiJUMLIr=Xp=<jaCVZxQfts*~Ar
z7Zz5d(`Rwe73K}cMNg0Jgl34iPq(vF-oW5zT0F7<5SLJyWx+l|n}+Xv_Y!5kVw#kq
z=d`&b^&VIkUE(eS4h@^<OEGw+^0d*YhA*n*s)g7LafzU?r^18b&?JfR!)uuL;!l0h
z4+o_RVUjb7(QX<Xb94n*^Z=ehg-(PgN^F!gqGGFC&>U-^siywr8MF^JAEw<pKKeu~
z8)q?!JDMUq59ye58$^+fny3CrjH;~E`V>l2uQ$VIfuDFPisd}4W2ZxY$C`2`tBTA~
zG2P62@*~(9gYmO6#Ya<1TG#3rQd0BwVyNP@Ayt7B(h%z<@N>Iz;|2VkT8T3`anW@3
z03^F>TCLS9Y*sY)#=BX5!LYD9Z;z4QSOL2^Zw~0e;OutRfp)Xu83Yz~srLh8rR}fp
z=#yHH{&=!mHgDg!b;9K@Ux9<Ms)l6QTJ87$oxA$knnKiY5(eqb)@iCc?X6$@C_7+f
zmtQ&Ot^iFkZx+KP%K%)iR{{_Mx>9VmQ*K2Xn%gV6YWHHw(<_uA&($p}$2U2TIs7y+
zM7X5Yk#^wpDE4kQZmN3<X_YMKH6pw6hh0+aBHJXg{JzNS;Qq2Fy^B|@$OpyIviIpy
zf4#Rju6G3m9!AEWA|DqF3FYR|>&VC<TG{HJ4FUx!M2Q58+W<nUh{I*84tz?H%3DxQ
zs1>{!nno7wD2`bEeAwS;W6>$oUt#~E57Imre?b54{c$`tHdB6GMC`IZWLL(%j20Bh
zW@}9_@4EsYT$u1Q3ZPWkvYxUX{6AcsV{;{1w60^@wv!dJW7}rOw!LE8wrwXJr(>&Q
z+xFe(e7mP=RLy@dYSfEoS{pC8K<Uu1vz+scTso%QUQrRu;@TSRAVGOF0-?>XH4kGf
zd``z`=z(*mSdLiXj&Y{>&akI{IMzo@tD>a^<(r*Ssf6Nz;ZsaLra9mcD`MN8$2`!w
zj#+BZCrV}b_c=qEqt7{oF$>wI5*0B0kP{DNQ5_-V9dZ<9u;vm!(L2I_#p*nprX%tU
z!{;Gb7IuVBg7pdB2!{X!ZgHqp5+?drImJ(UE6~P2|C?+`E<DC-F0~Vdfh3v4NM%jF
za?=DNX3I;7iWJU)=~%<06lh>9th5QSv!}?=L}=tvcFMQuyE`=pek1zbRx<g`Q<pRK
zx&9}H$bFQtec60I6|uSVy`cHK!f_KOk9TstY`XN_be~*qS<C``!FB<@h2)VhI&)zx
zMx&wQXQngZPQqj2J;cIr>BAFdgqqB#0~EkA_CpTe0`e$i(eyMD!C!D0SjSaixQMIl
zQ>-Dj?K($9qMGwhRqIt28n$`*FH_6v*JjZRnI<rr9n;liv$!)vElvyi9=5ABdM}$*
zV;4_F>Mxz-qVe_KzSGY5Ph0$(^e$r-hLD4T4m@eV#69bG7_fQ>o`!yu97p=$)>fb;
z&!>)wS*Fj!ag#iKWRWiC735;`@XxXFT)nniSe~^1r0v?bQ6_Fokmx~(-O5D{7$d>R
z#Us$PxL8^}t1rpnJ@#E}+O?`@a4wB;n{#!lX6WlOwo}C3TgP%?N=BT*FrxR=JR(g$
zJn3EhTI~xj_mVxhFImqt22JE`CI;B~Pb~*cFE>{uL*2mnfeKb_aYO6sDC{Kh<R~k0
z*Uoct8q2)=I_<5>p%ba`v>+M4WqY2KK4@w{=P~Tzx42!1yHniJT#~*CHF5|TVC_n_
z&;r3b9d!f0;<hgU&xKMbnC#a^K(97JB*x7U9TyUu!Fk;5sWsZ}M`W<n!T{#QpJ^c%
zOgoCy{d0X>?+iQ8rT1N>MM-D(HQrU-WWU9=w|>nbeG#luD0;ayPj`4=&7Ik$Z{Z3~
z!oob~d$cMHx9;vjAfJ{<vRpDShy<?hDrBBOJ@YV5ZWXaOGtJSz<sGS2-mS=W4_G)T
zA1#J{1#aNe(0D1a?q}q2V*txd1Y6&-PU>XC6R<X1rZS3XQ!pRuP76hZ9}}94mDjuC
zxY-^T>@pzkLW4q1ak{?IimWUVBKithq`vKQD14&60gGKCCale{X}Ft0By269l*P6r
zuTm0E33lN!&zezRh=5l@mQP_RAR5sr^}&4j;(eFAj2@K*7>|(4IdGb4yB%g88|TKZ
z^M@nOtS|f?{!z}s#}S=w{R0`LbVP{k5xhlw?;F>N1tIByWsnp`Bg)hb4sZR>Y12=3
z!#Anh?EEZFm==f$1I@Zw1Y6-%6aE;!l&t#!4vB-%4AfB{X;!sT(jBKx*-5qZn|89Z
zK%Is6JLf#w>eauBET9VUE&>aD*^+~!ilaiM?p&mM&kqY3D1*5QUGBbUOI)=eY1dMv
zJ=ybPA_VaWPE1+MDhiYq4$DfAeVIv!IP-*#v<L<d)(}RtEbU2zUd&$$>53?V-c^a)
zG6p$+O#_1{V`nNcS`{^%iBn8Oi4fO$#Q7x-$tp2dRs-etYmui-mt@P{hh?ldJJP!?
z`!i88d>h`9rIRd6=^pZVuo5}3zUbAX>~uzA4C%servKlplCW0(Ta+B&Eey1CQ5DDV
zf2Mk*YRAVjE>){hi_9poOCsx=BU4gQV)kovP|^v!npW_>^LFUzY<xt1!zGkgHYX4~
zLjVTgLMx3Se}f9XM($nO{gYl$h{|<+$=N!|;XmQAcoFdaUYrF{C^p@tktk-*;hYQi
zNcE<Qdb#aO5@5b1ox#Hy>Hx;MKo!BEj7Xy9Xg-A6>kWs*$)aMAWh^<Z3nACxNbQ;&
zU7-_dy6Ksm-mlhLv(7Rrx%N8OT}CDWT=4TM)JoE`UAYK0FiV}l@|p=I1!tKv&LiZQ
zSVG|KrCA>_0Fnx;eR|2;L0ZjLl*+F1Moh4?D&8h6H6jJQ+OxgwJV51#)zSmqvRnQ5
zz~62JXPCCiwK9W;yo9-%7Xka%OtQeVDK5SGr51}$q@i)OE>BHgfOFiV%SZ5E(VC*q
zYujoHFnnF^qs^WhZG}uBRIs<YvwsNlAb+${F@Uz)*vHtaMQDdr2dZK4xo;O4dzM1=
z?o9Pz%3<ix1-LO@?ZD&A`>4{4xGP&Tbtr=RJ?=4<NBYXYETOoB%>?;IaVA9Yzp!}H
z9QDT#<IFZqPi<yDRi>L{7Y?)r=m^uc<Z};P%sitHIIo$9HxO}=EH*qLk6eT}xFJ^5
zTBydPDR7&9>WOjUuJh*FSmqL?!<1x{iOcP?l7BCorp91#(gUNGIQf@1)d1lXx(RAI
zhm*TFNYgXZn_A}FPfh;WMHE%oCs8d+1emobQCt@YTjxcWoK81LeXY~+9)^+UOmeCk
z)#LMg9G1`jWr;WZrrR$Gwve9&X+lKpB~*OkxAEnRpO&^BwsOm&TDeQBlvTv^nuju5
zyB8jH2{_Xtz=1n}8hD4nhhZvyxynbGz%2iKM-8|$N`wX8O-Toi=&@x087+joKHd4@
zsx+@?mPB(R?mMWCIeejm^dhs63ARzdm}jsA(O)QqT|m}QRWm-(Hzh#M1)wVV%1iJL
zg(a=;b~-ZkGDk#mk1~G*z!7zGrRGL-8}=VILi|%;0knSAjJX1jZXYa@^cU6K|NAIP
zkrpm_?r8?!`$D^>c>@hwX{b1l4f&cY;wwU&Q2vPM9oGB`Uj2&haf>bY84LFfn>4P}
zUwt~VVTwui2<Q<-BhPj!kx~g+!mBJh`+;dWVRn18{rLuu59TJYW@eU#A|25*w}iL-
zFL~9DDvDSxgI8wVAcQB(Ss}vMFm)hLb3<CSiL-8n!T2>oj$uGt#`OH>|MYjm8`R#n
z{<Dz-XhA?oL6Qqk$$`^4u)hCeA@@x=J5X_v;*u~&Fw@CC!;l$*DWjpmm=4H+L8<jn
zaE<qyQq61{In~13t5+|t)YdI8tdv@sfk})o7PZ#yFUaeDJol|WYwvu&8`!-Io@}ot
zu`Im2f3$v1b)NX1@Sbd>C%^u?$@fW&NV}iCuMF`&DU3gT0TNA(vM@&mV$M7yWD^p3
zN996Z8he29k4NFCg+9PbnZ$<&>5-W0fbtK7!ePTkfP37tvtUFQiW$|1%XoEZO`#0Q
z2^XjxY40!DruxCn-p%m|j1RfInIaROco}Cf&3zhkkBHj&Rt=WZ_VkNJdliOb-H{>p
z4n>c+XW~q#1M6<*boFS%=vdUE3ndU*iM+EFUvAM1=)%}A49e~^iF9Tr^(nqF(J^n~
z49*I<-WXCZ`1EG0hYOd%nsoM{LT8_q$a&QSBz;#S3YCwj?)0mjn_saa@O3c^sMqwF
z!ZcWHQHCT~S|SVe5eVTt=z64&T=<uU03rd5so+F-z+?MVAGPh8dn{0XMaz~|(XSr$
zBRisZ%KZ9!NVwlLLL2IRQfB&v=@{F4dji**>nI)wG<+4e2@}Gp9#uWEM+p-{L1PUC
zM9N-bN73qWRRpT*YCLuK_D+uRgFcwsV<oL&LlP~tC1b`CF;?F?CPMMyQ>}^odrD$A
zI~cJDK#5qb8UPL(A_=P(=)Z0U`Aq`WLGuPhE^-isi?g-0`OZ?4kK^MyAsY+mxqt5G
z-B14#h=^(sGv*CF8}cd}Xwl*_z1KEt!uP`_(wPBT8=FmK<+VOOk}fZ4Gj*{W-MSmu
zygps+?d@%?tx#Fn|0(KF86C^QEgcz^1&!sUz|u||p8_`<HX*ZNwU)|i7ky0^l7?O@
z{#QpBdbUo{!~x-fTWPz*Q^PAmwHsvIR-dBxzY(alcFEa>(gR(h#GELI8FrjSjfNCc
zYJ9BHx955<zBzf0E>5<@$3ttNMYtIMa?NQe?V&_luijx2?!gBJ8tg}l4R@z5x73q4
zfZVtX0lZOzVV%@yTg!w5oMcYuMfGrD!RFwqChHhY`G22|vNLn!6a7VRi4gD!@Ae2K
zT6A|%SwkYp{k$!ki4db&5nZ!Hg{8dj)h57Z<$r$9=s?;uzmx54DcKt)m0_ow(XjO@
z{}vbrW9)Fk2;8-9>tkzX!IEOW<s-*k1*RYO5mtqxllVeNq&YvwQedj(Uwq5ydR(tr
zJ!U>7lMb$gf~wwZgu2{whBB$YvW7BQSPQZQDy~)5Wh@8*<tTDsMqo8i+x#A9|MtUL
zOE-8O<*O>P!VrB-YNi~zFb27ia7U<dH3t2Sxu8Lpvi>toAd`4C|JS~iU%&Qw1UMjN
zC(CRqwMFj@{DT5Q%Z!g{R<sk5Indzeq5P~3;qtI8U?OI_@930dZnMT-WW*l=ewTr&
z&t|!n3g^^IF2GDuCA8fpfr2y^-i<I|8i>pCq?C<H#2(IS&-$KBvK_FL$v`Ea*g+D=
z0IMHRzn*E^UdSDWdSVDiz#5U41l&dvdw0hz%iU9*0-q&i^S6@epXuO1<0|wLB_4G*
zV9t@TTC+p6u%~13>pzVQqdKjxHQ1xa=u_EKr1ec5)TH;7hvWIn?hs@&K~48_$RK3+
zdu{2({Eh&7HD%B{)|+9CYaV^V1<$`JDFoj0UB!kwzCp*vlO(9kJe-Iv4aj7J^fJER
zTEQS`H@RGhfs9w?M)S`;LliZ`Qvu3g2?r)nr?wT^cRJy(wBCr0MDqtRFHm$E%-!6g
zMLRw$2+YPDN~0`{Vm}H&to@Nr&fF{~L0>m}Ghn>Vj81s`EIQnE@l@Jse`#}N0!!DL
zkzs?x4I;fLH-LS+=E9Vl88}Td=@l&5&xyb1KaYf^1>c=cC+$#bcr7(`-gQsjD7Tws
zxszZy^8Sv(2%nbY|4UVV<}>Y_l1lTjr<eN(R&0M>Ky;Y5${ej*V%OT0+D~Ec3-9;X
zs?8%af6+X@s}jQO+NREG?W&1rhl(x1!Yfpt@?JLkH~UV_9l*DG6qvuakx_O+bAq=s
z({A;t{jPMtJAA3|O@KE~J3M!)@g5`5KHrMBrNC_Vh4B|&pimlm=+i4!K-R<3m20bD
zzS$K<fWtJ4oP(U~1<u9V7kejmlcJ!J9p^nS>i+QfH%hnUo)1S~{GWomug`!{WD(v+
zuvqIy(f7nr<hvoMAK*B_5)E7Be12wS0vsEg>v3AgZ=8rf6?es-84@=OK6qbY0wJ-G
zL(2<H9N%cfbFY)1n6ZE8!p7cUWAhKo*}w6K)n2V)^Y`j)J{fkh*fXWVb1Mr>?kPhb
zZ{|(D3#69jUn8s@S7FY>F%&HMCc-%c24`6k2Tkw<XB}g(LxAolK#?kmLxq^EQBP(H
zlP(HrT%jK!cGk<)S8)NluymBrZ&1QtXY~)+E4kmSjSq;2^LtvIyI0wNMKf9I?%G36
z{B#kR;4ul%n>B}T>7a66k$Rk>2x3dp&D-EP;6vCr%iE>GKFx;(izH3Le$SQsp0A%5
zm-Se9<@jb?{00JSx_;^KuDtmei!?oLZDoJ59(**b_6Y`2ZP$kvK4#2^Lk;B5oCirY
zRlPg?{iEPr_J_ES2=O`sJ_qloEFsXBDQ+Z4sZubH45vc)72Y|~@)oVTzXL$U?w#*n
zclYx8f%j*|f#eOo&_;}Am3`vA@XpB}-9L>H4kiQkO%r&~{%W@YWSeD_%B5+F67d*j
z?Utu*W~cd#8x`Co76I~a0hZ}GzEOX;;hDT#z2m$G4zcHYIefxJIe3HizO!1pDziPE
z*|lfM&rHZW`dhSY#7rpieqo!w>m&7!e)<F*&tbU3kACh&oW+kwN|2E(-ay+D-`4?$
zj@?hUY=CBoc)ZbCXQk};9piPJgQdWtyKb^Nv$u+MJ8bl6gLQG^tX2XA(G;ng(JFnS
zsiyue25M?R%raxl+a%WL`4R94S2cF$AfJr)NXom`Mz!~JT=i&}@^nSX39cCqv_!F9
z*9hzao083$e<5kl#^MjfN{BsD)#Mh88C8oT6wupT!E(|$_qx#1H2#SoH?ukS?=$~f
zS6Bc{uw0o%y4lKhjYR_;@iHj*mxweLme7-SRT8%~b7{c>!(++5So5!vv0pL0Wxlkw
z;_!rN(U<NN%T}EO7ZTtCby<}Ss-VpqUSkobS(<6`0>5yR9=>CNO_J%S#)QEl@X^i<
z$-v~-byW{BRXav4GT1VHt3jrFK9-@DZunt&iHnR->YIe?0!h%8oHlN&$VawG{+?<<
zoY3lysffn`42Anr(od87p_%kBvtEl~1Jq51oU>0Cs?E%&n0t{t#)ExsgW$H{YuO*?
z(`4X_deFhMU*%36&*Y&?o78sAOZl$&98gl@b9zEa>Ul`Eht&~4&@b1AzPD7{!Ati$
zwXVr7)>u0Sv&p#{<w^OJuXE-Z2v0}GfMX-?!3^`DhfE@+{3h8!XD_X>4{|Qcx56H>
zF?_X1-NV9Zi{jD!EQY!op(nLS=XU(DmJtXhf;wDL&4dvd`O>zAaBzN(?%law3sn1p
z_#_Z!M+Gw0@Qk>REY&5+l&ECBG20Y4{6#618u0a_FxP38r-^@-!(PFvJl*UdjdBDn
z11S4BYW3AgDE#Gc`TX_x<1XiTCE<BmxCTKiU1eWAQd5ICIF~t*)bBm{&>R)+z?$_X
z7n&6Ev$hKOggBsrg&CpBUpqPE1~%I*WKQW)@&B^`ZW5)SBHYAX27S#;6vo)8c5BcH
z!iREPvmG%-xk%IahqAZVSke7KH%Rm!>V_tpH`>bSS4Y|tT-m!g!=Ni9VbK>Rx}WE8
z1ss1w(!|#dy?b|&w)Q0+&&lInD4O`WjJ{*tN3GHw8{8SD?rdB!ZRgxa1F<=81)1({
z2JvQ<rlLW*!>>m?i8VI<$}9MmtE)MyKN(H%%Ec)=3jmP)K#QS&7qL0o;%>!jhlVO3
z&jsJtdo5DnGgt&A^6{Y8a8ne9+lmC2B)oq7mWC?KoKbd`r)Uj|vMQx$o%)qPrk?b_
zW1Nh}Mw*Y_&L<adhzt~44<sD8E@N?iiA!40NF;fJIbv(oBqWXBb>N|blw(R<QP%bg
zfy+cw3mIoG)4c8D6Uu4@d4$2_wVVvR)1*V*S13R1RJ+$wq^m6oZOP(P0e72QPXY>7
zFqMcuihIjBcSQDyLEoxd@%w52JEp%6<HNtG?r(a&9^5`yvjLKwNFJ)6!iMG%lsh}q
zJ*Kp(NEP$(5E6|QULuCK2LAX*^G|~IQPn!lsUYY>+H?S#HPt_I1T@F@jW@935OmoG
zE^SH~5V5=!n&E+yvOEFgM<8j%Fift}(j53d3V%<U*1dI_o?@m~Yy#-_9gZ-I4{Iy<
z#1`qRkmqCI@_`R1(>1r9NT`}I%2p0$%QVx!#G2{NyO0x+|GF&XFcta601En$nx7I1
zQqAX}hG!*o<m}YsuUa5D(Nt>ND@sdrvXZQ=WU5MOE7QtKbgX45%?B?waqj`sNjDd-
zUTH|{!iKvo{j~L-X=^?Us9D+2O!SG>$w%in^7zGGy+BMpnFr)#L4Zc0>7HJeEGS(u
z(RiPD!>0L<(^-m_3%r!)MMdobk+T+6rOX^H>@PRjP^E3Fvx;U$0pz%a=(m-W6LZ}U
zX2QnW7lPQm!-pgsRh$Rxq+tS|LfE_T9hZ*a3%%5EE8!rlmCi9s<r^HpHRN8CGTqH>
zC%T&Q39zQ(krY&I&{y3pYWA%5nHIL{j;9dmcaU{*@}l1i1fbF-HD&(6I+spEHr?l5
z6XUR+=CRY)I%wupKQI4<MBgzZjq-HLr@}EN?ZsO&W?`bZ6q4=X<$@kg2L7nM;lCA|
z%aH>-`6@A*Z2p<?v5E`9rH2!?cc(Ngg_Nw=2FfoBEVHl)3Rfe=?1a~zZ7;)G-*(0&
zp1V+<UY?t@)cz7aAt<>1C5}Q+EOD4Yb@LB`10Ghl=YqM}RO`lWgijdXcY?-_PlpTe
z5*pPp$8~kOI0r-}EJwDCeZBX!`~Vja_Xl`%VEZe$l0N#Q`pQFV5Kk9_nkJD}iNtEl
z0C^Kr-ATPgZ(oeg!%ExcVXg|I_d=BoM=ZHAT`5PDZJr04Ur3RdN~zCSJui+P?cOm?
zZ_4uvSbO6q9^3ohA?X&NT{--uRs)j1^n_QP0Q$3&rxFIzTz7O`nX?jRXhg1DeB#5)
z(GfV1DF?0?JQ|Qk@MriD8NQBaWe&#2Kv2Q%Q{4hBkh-u_vne>zF%J~@`u;J25*=?$
zdhu8F1#*^Vel)g8@`n!4w}b9O5M<kYHz$6-_&#Jr%sUnD-0c8h6f=(k<N=9#g;J!5
z9UP(NseI_R%BfxGc4DSW#9E{ju_TRL=m^?H%YqYg{o$}EDN%TgcDAWQqlk?J5aWG-
z8%@oL5#obbi8)5}Z+vkgYJAnJUwy6vV|bo8QZ-R=o550_`{-O?zQU*N;B4pX8D44s
zKpV^X*^_-8K`B7etl(q5#?|5|uN$N@TOl-i(;>Z9mGr6l(IoOWq9%{A1u0kLk75}<
z&VTouJCQe<1WILdAsGA2MManwFz@+UBd8q0t~Z?>7i9wlMSc4rIngyRBL7^uYc7hA
zBHUFVhg$Uoyx@ss=>vt^E5y7o;$7KRvv{t|CpAnB&qk`W5$c_mfC9N(b79uh8{1b@
z`%f{Lmb-*Z{$${zz}Myib@*kI7yMEizc6;Irq>h1)$KEnLBTf!E}{B15VVoV)p+aT
z76}rh#zlkeIT-ez_6b@mR`!5_WT}T{kciOQ8yX_<@OT6_Pm<rl$)Vnwn}StcwD@;O
z@4expd<CM>xrmJyWnWqxT>-Aho3b*pIl1(z(06k|pbILiK8h1e<%dkjsXB~8Vf{m4
z;ClZn{kzSkl4$w-j^Qx`(3BIce`g>_bgmJy8*cgJ=8Ty6LZs*o(tJ?TUi$1Et5WlE
zPm1hE>IZ@-G>o3sf#8sEAr@8W4+aYgQTPkDDhUV$hNQpvpEmwC*qRWQY}4A92_0DZ
zmPs>)&dZ8l5)X-zicS159QB<YjKb!vN5as14tK${#7$Z4>4{Zwz=3=NVHv+vF*NB9
z1yz|ms<R!0O|!?@rnj7MiYMU-4<$FjBB<(%!DEMnc7}Y~MxQKRit6s<nzr$yJX_)C
zGKj=Uzj3o%)jB5WT773fE9<Lg1C1IP$$`-rq5A%O+|$r*NbfBH%>vE4PVio9vx4?D
z{ZQdbB!aR@<gzRfAbplWxT}MqKf$vny7D8I%-Du2D4JZCcGu9#Uv{Z)riH<Wgv}py
z>k>T3)149tjYac!k9CIDV$2WZDZLI0o-b<iYva`K=<f|qTR<NfS*e&+*d|&BbMds(
zyaVMP-#anSHxnHODJ0L{;A^<7>>X4G9HSuePIX}6fDMrw_{k4w^WTJKctikHje-7u
zn7gF^^f9vkrII_IBPZA9zyVn%O~I^a3h^!RY1?E;v_(46kl<lQEMeF|MGC~Jx`)h@
z)-&DQ(}egd+N^aQE>c%M2I=TV%+aGbx1n_|{GwNit$QzspH)ZRKc+9Ky0a-Mj~~W;
z9=1QW{@mQWZ0CL4h$4e)g#u@U;Tecj_<Ay+v%}eu<6<;SDF_l#2Z0SC#jK{Lo=!1;
z>=E}U`TnGM7>o{0dU4MT*|8>hhQ`?UB!zFB>>~9<{V@O>aC9U~Une<n8Q>3IWIR5R
z_5_;sDvxI0ns0l_QeF?}X5QNM`1(*9drDI7dr~8llWtCKyo`HdZv%?+Yo+%2`Fb=5
zKSVr%FvKu>!KA)Y5<ql;DQIFND{2Z~wNaf-rsQzq<Xb0LYD!;`g7*k(29BBx>&sPD
zuJbS|=5`k){vruC`iTofuv9tp)kTGFd-$o@dfQ&XgVVImF;1#Xx#`I3vul#F$qWYb
z%<w0%QH@LmL+x@i>LOU(SbQDVH4RnT>9}Wa7hO`?yKvd%M<7B)^-9gvI0d9NpIMkS
zRT00KAyowFDZ=SlDLo`s`r?978R0T>hJCU9`HXoWFBuyu7Ifhz-OU9hFUQuonGfWr
zokmWPK)otgYn@!v?`Dtcubl8K1%*k2<rS~ojmPG6Fqv?xBu`QKat<8>j$mrp>~SkW
z=^_So$+T1|P2fC#QyVCNlVUHq?y@pBngYPoosbeTuE5F>N&Y)$kL=WDpkyH~cO!1J
zMU8RHS*10ceS^H7l>?Ax-ySAEq;fFak>8M}foyYCs-;Rmzg$T;k1$Bi^ZQD=+=cv~
zbPGjC8@KD2%G>R7`kXxj(wO;v?YYy^+8h$cQIphb3NS<!jfljCT3%6>8{p_AkYO+3
z@r-QEvcg|3shClf+$g=3b_M|nrQ|lu+E$yX&=MQ;_k3cF{6!0wx6Dg;;-oBc9EN>k
zD#NH0R)&||qCZOZwIv9erOFWBUabK&8^iW^&#Oat0LxZ=F3cTrBau=&v<f4}D7}AB
zCBlCC6eywBj2Uwf6BO>4cK^>5k@gj#zWtyXj%YL_X!h>bYx@JNuVPpBwJE56w;HXl
zZ1;k@d>8+<EJPB+7e1cum6M9XS8~APjz3UHRi>2?a%T+rZv`KSlm|ckXJH62?JJAR
z7ldHyEgPiZ7!yX$7!&3vTs-Y7hkx;Id(DrB6cEMyABU(*M((X7YWt-L#i`S$!5}fl
zC#oXNEBbfMF4HSLYC0$tY1Q-u&Ykz7^Eumbt#?%(T*Y>yC7L`~p}oAkt~tH*7e4Q&
z$EWB(at2C8c9em~sOw`1CvA#}IOF9Z2~%FBmb4G8IYeC!Dm&P!zH#Jna-NO;Qd{(7
zATVoYNg}*h`Jn02H$^WRu1L+psWjwYMr~!BZZ{afjMr|Rh^JQYjck*m8ZE0?)~vqw
zSAykMDOKwNT}~IGR-3e435!bEmBPlvKn{**+>sru9y;ynv+RdQX`cNo_%uiQyM~gY
zkNXTcZ~J38fc(I+Tg@T>ta#K|CyTKv73iu?Y3>J!+07C?lcTyZWvw|?(w33jJN{5-
zynWxvFsqw231<32Aj^xVe<U#72G10sf0!xyZDrlme}19;P^N9e7&iRL`U^&y)&Mu;
z1o9|B1Quzuvrvf@J5^cG?YFeA=2fFxS1kDma)?=}LvfF8bv{SIk;|qPB^skvG_XIn
z+t3`$<F#mz20bh_gVhc(yUppj%<T}oX^+g$p3boF_3&hw5|thbiJDZbRq?5BqbS`>
zS{qBm^{P2re~|C%4rPHF|F>PqE#D4Gqy(PQqW(YSb36aV+<T}R6L35Wlm74ft8P7y
z$9L&HpNd^+E<%Hg^|Wlpfi#if-$0qkNqS2oNc`^`ix&DQf`7tIOAwe^M{3Dgb{KDQ
zw{<y;b{XwTiho>ngr7;Z^rsa`1CFOVGl|5m<s8U7$}AFj7rP_<$=^?bym^Y7gpaMn
zm<g7BZANc2Vnb2NYV7QBgR3ad@q;@kNHJt{C`fT+Ys^q*phY$P@RkT@f<UQ7c&nOH
z{-gi}SI}#0n<8jPLD<un$Ja0vLw-yS3)FKPPZUh;DIWMv2ZYpZnen13b4En%Dg0s&
zrmOd+4qJ$ebPHv+AoG7HJ!gbd#A8Ri8ZjmVFe2>BdB0*q*?%XBXPjPm^A~cwh}`D~
z?6gO&d^<6m>+l5?;>v6BSph|=1uthK(GEITC3RddQQ6I%I8e=$ZwLj#N5a1>8ivCg
zc9PxY9k%zK80_2>^XcdCV4!Dqbplas_v<ep_?bj&2hb={RnU-<vhz52#P@c&)1LA?
z&B>^F62wKZCbfyb7Wbkyg+t5R?jVp_p=87)rAsVG;p?@}0DhfjF2KY=ur_sDRN5Z@
zBoczZ8+*l`4CNsWF7`5M9V-hSSKJz^0xO62%BvUldB37t{XX4Ba8~4nB7(_iRUV7C
zZ;UVO848`?$wGFpL>#F1+QXS!<CQiPEoJ6rnB8}|_b%K;)}%K>7Eecu#h!577tuSg
z6^-(>A_N+VK1MVMP=Fhb(cBTDWU#U9m4gz0I*3`Ekeu#d_-kiPg!qv3`67kym=Gc@
z4AmeEJ6{D5GT9l)0Nt?D)UZ!J6$_sfK%VCX&4dy{lH3oNgOFQ2La|}=(_+;?BPZhJ
zb<ll&#_NG;wOj!{%5z6}q@<Jwtt%O%UGd>klwJ?_h@!#;1t8lY{2DbWMd63lRBe~A
zUI018<L`bjSQgm3@_A00!n2)@H$g2)wYi9C#ULb2he8y}9yGBffV2|7MdP>Hx{L;2
zP!4pmu_b}ynHxga0}8?m18nj=$kLnve9s^Ie^-H@{|7@7h%5N$^Is(t_dm!303><-
zFJ^N8IbO0tDI&&}NbSz6da0ByoGx4z$_S2h1eJKQLn#puSq70^es*d-_l4(XJ#*_n
zK*J}P(truL6NXuaq7uz`1IeN|p&1V&u2eyhN#=m1r|%dhlWusBQB&9Kj?1K#Hhvs^
z-dw2ubqArME!@rtqD~^LMn}(jgSFkP6{lq?QJpdKZ;mfckF6(uBjSn{+8(#`kG@;n
zm3xcjQ0qycjaDG+MetaBT!=+z$|gzdx#dMIAswr_Th_kYiKDKk!&_UmUaRf(O6SR6
zzMcwVclitdu{K&Gt?B%0$DH%Ka)m`JL6Z#Jpcu<41@jFbBz1!FpuJbOJ)Z8kHKT}Q
z_!}IRR?c>0&Nt<?lmT_>&Qj;h!jwPEdQD`+lYT-#aWIWB5Cq~_MoaCWl~Jf%0pW3b
z-Ku(nGC90fjj`rXh7Cc(Xf)$}yt?d+VM=r=6)FS@`OQ&6LV5%jY**8LDEo=q2-2;W
zXLFz5Yj$C0KPF35%Za62bizyq5V&Un=D1ejqYy`jNUkEZx`7gG{jZU)SoHqE-`bUo
zsxgy5URx|pOM9qlM|Bp2^+Otw#8?sx1ynFD)OACtwIT+Y1B}#snwfkd`ZNWUuZ1Dg
z3J5J&JYAt6fN_#GTqdGv#wb8&nj)t%)0R_2(EHvf6Pta)r*dD@@=u{net~%WnTTt@
zjak199mId#cZ9@4m$bZo{wloNngnd}jm87j!n|hi9Gq)eq)1}J<Cu&o1i^;+eFAgI
zh+=GX!OJVp-=Bnu55u&Sc^7ui1sS>2NY6a=#-LWMACKc?Fn0eJgkvFVwzHPJS<V2|
z{vUgIS&+K9XZ&^z3^Z(78P=5YauTAD6aqFZAfz;~tA~PV{4aykF(Spnzo?bo*4kFU
z%2u0eV{HY6VU=ZThpvrB?V65_?!}6_oqFF-r-M1GG!fXhfYi0$4Wq?ZzRPU4*JrTL
z4RsOEXI;Mgy_OYRDK7Q2rxn#<F)UDuP1%6@tuln#hHpgtGaCBy@T8K}BZ*yDFn_9C
z%B3p5+$k}??&NG?YOZ5V(WFysCEZ%@_`q3kYZ?=8_Hj|H?s1WyPgcTwa*@C*tNM;l
z5YnqD|KtHoaQRlmOP^xe*h*yRltlB*Gjg<i{82^FFDZR|cg$B0@Z~JHdJBXjUY(ed
zN&I%z?wC+K=$sj=E)^6#@D>Cda^P{jTCuDdIo7gYl<=sY)}+_Q3T%^*<8y46+?f*t
zH^<~z8%7i-y{g&sZx`Wx(?%_9eB=1?F3Q=~ZWpcXS2{)%Z9?Cz?VlQHnd}xq*zI2y
zC9dbVFHaskv)NGv?a~q}@_}vlro>|<@v`XmF4Xxq2O;^%wnr{e?a?y4zMGVO?J%x^
zqr6{Bq#9Sdib%!nZ>kG=6?f%d7)P_OZ)Dq)iWU>+(HwnZ2ea?AwD@Sgm6u&|?0uVx
zHxW#~O1#4B=U!!E>x~yKjHM?d#H@c!rP-Zxm{VDkNw8W`WrERLYXUVKYIYoFqPj*A
zFD}v?HkI1j_Hx{o@ika5m+~!ax#-9xYI>XIWkO7@)a8b3_C=V??O4fZ7soW&yvXmK
z-Ps1%D+Tf_>unWrYEhe=B?nJ0+0j#<tkHP=YVQaer8X_ivd&u??8UteI$ZHIBss)l
zI3+{wX%+BSj_L-=B7x?bvJ|NZ4qTdH<mPU&(V22}EXH9;wF{9VSIS%gIUds7SZ!&n
zx%!`^-hLfaV_4m$=*itw+t#eHHOOOAVQMYwa<<IOv_ui@IEnHSWDGZF!tKkbVJB3)
z&TW2(XI}u=#fB-&y^@iZHRa%GcjWN4&<$1CA-FLUb;`EIA>f@%V`N7WrAJ=nVTZJE
zu||VpNVe*I9}B7xo>6jqrpD3elbe=GMt4c$PzD=N*o1C^{TEqP{ol-`R~MW*V!kQ%
zn+%OSPE%}dn?Wye?nKP0-xm5TJ80J_9&2daEWBpADhIPefDBt{al>tbKt)<2snTIu
zZ=8K+!iMD>YoHCf*0G)b%;7n6H#1R~!v@As4^5D1lst)5TM3#`b+<F(9IRy>OnbI8
ze2bnPSnwdjYL}M91Q_*VgiH&E$IwTZ8S_za4*+yAgj5BfnG{is4=6U<z$;eWlRL0s
z{|=JyVgDvu?6@)~+g!=D8F;$mPH-C~sST&Qib!Wy0G1yeQ$;WfU?b2^naYxFT79f-
z;VB4hD0BKvNzz>mO(6JZKUR5SgyC~B8+P%s38NFVIE@Q6rfXPzmilun?o|)VM7f+`
zBdcF#M3FbOR$Q@j4_G#;NQenj3gRkK>d0ZD3{BN3G>@?AF2^t#o1j%e<=&-KcS+6#
zm6Eq30rjfpO$--s?Bj7Y=s=H~<AiM@I6zWLtd`wDebR6ob2B5tlBFX-hIb9EmDm*<
zxJh~KgC}hD9q?-1S><(V?^04ns*QVD^CIxlO0hb~rThyP*JH%;Os3o-J4%j@DjkQ*
zLeNu35%fvejsqOEvSa^M)%+~Sb>V1HspK+y1Fw_zI1{Y*=POV}KhLx<6ibQ~4s47T
z9GzXb!%Psmx}s#;glavT22gg7+Otqq7wiTH1hgtBRnI*GQ#>D9U4?Q(U=8Ef&r_)N
z0=gyY`$sC*AdM`2lT31sy!%Z?Ys5TOU?=+5bRrov=-JL8B#s+Yvyd!I7ej~T!?yqB
z0G*_hL^v2o@bg96In$!D)){V8(7HmoIrS38vkt=Hk`(G)a-;#YyjiDcdB0a)e+l(c
zZm;JipJkXo>r!!n|Drb)#WeSzW$q%|2m4c~$7Z)uqb+w8Cuw%9_w^&^?xo*ck_nj3
z@uxkG#F&A0mw=OGT>nKcYT1XP<Gdf@47_MSsD&IWbDOeFEo@b?RL_B_1$<>=j~}ze
zn><9CpZC;te(7Psr&pm%h}d%@$tGv<UxX}=*aM4ykuEf58E~nlojqdk*Dn4(Q_m$T
zfOdNa?=4v*^%g6iT`2vfFPDD0B>Umk74-*flv?d+qOAVh6;i))(ag1T^!K6{7w~ue
z!|EGUtV7CwfxW&=hxs>+K1hz!@B+U!ly3QxjW>KHQcY2c$WirWOqv|mZz>>sCYc8(
zb%Zcz*FDj9+sw}1&G{$)chro>?Mq@q&LmDOu;2mtO(FN?UjNt5^ovxp;t5fo@QHzU
z;@Re6YR|x?3ORQ%4G;Mm9#`^!7H|`;Xumbak->7ftC1n_fQOOC(Y%4vPXoHvvjLG>
zc<yqrk?0I*W~S~UFOshGcSq~=iILXHm#@%?Pp9Gu@twY$1)+Kb`wfNGaPWLQRp89a
z-4`D5(i^CMg4I(a2i7VsENRv<|7in!3UCVf%oTsD?qTQ?Jr{YPWV2Cv0$Ao4J+VLF
znZ3ATm<@W;mZyh7AH@N>8D~=@;n6U(W)GDu&xX|!V_A-YIzVVtZDOu0=ci9mBwRhz
zFqbia8@GeR7L*&w&8f2`d^!*4v5n9uA^pY1j~onD8Uz=Xti(&Y5<IDECOao3)Z$76
z(S_0d_-v?4MilB-BSuG?2W*J$%q-GkZWlr->Vt=jP7-gF6G4=5qf>o$TuBF<{bDQW
z0b?DoR%bxUoO?s<1AS5!>{}@}*5I}_zrca*l2lfIwAeWp8$3<JsCh7XESiabK>sC3
ztEe~-=&EHrxI++EdY}cv7fZKqiMa;iYSBl>2Oym1mZ4f5e0y;F2GSZMs^!hUS$x*a
z2x9lgyVN0Mf+2;s^Orv`y{3ztYA$?w2dJ!1D4*;^h;JGzMmFu3ry<sWxcMuj$$#CF
zDIJ`+eG~pEcrY5zJqSO}Xn~cn*{_tUjv`1Ij~I~4CAhp~N(r{R6QiMdI}wis);|yr
zv*_^gu!Th_AEdi}1Iho?+~vFahyK(&{C=&^*fv^C|Mh1AxcJ85Pe@s7f?K+%`x!Rl
z5JkST|Hp!Xuf%=fjX0_Mr}E*?t6A<3;5v_Q4c7)5BN*Lz(djznbx&|Vt=-K#{k!^s
z_fx;%?lc@^G3KBqT*=>}jIu)6VTR`}{ypX<b+XC8EbEb!7`V{sIS!zAp|Lxa8unPr
zPb7!Z;HY>CA07t@KT>O#Gs%@vd7>me@^RA7eN=#Q>CzXb-L%&MZzWdOV}12D8!Qm#
z!NxL)Cak9k8f)TR<e_%XeN4PIhl7f&?W=A&fBL=j+Q{f5?=mjQxCW(j)sgB_N6{<s
zE?fWaE?a&N3|P+4AAu}X-2^oV+X1DAvu*~CK>!7r3e|{Z$-S|MS9FN8DrR3$qkh}!
z<`ucgSNcmAQP!FnVJ+dIMQmR>##46@b&ruT(WY`9yt%YXg3x?K^J#|)6Kj>n_;2)0
zm3y_Qk*;Ud)nT%?iqrJm(>i>`eX-3+%cjK$o3rJfDbTKEad5T1T|O7#9NrqHu~rmt
zN#oz<o)2jKu!=J#{PD=+#q9%GaT`b$Wk`E!R$XI?9|MF0%y&XTY8RVPFx>S^(SDrA
zsv(RB8@C1~R?f8Zekms{TPVD5IM3Z5td7{^#dnE0>oo=gjzot0pc|W2-CS6Sq_xY2
zKMDYyz&m62bzH&UjDIx#Y3dY%4v<=hB-68UFkV`<fGL*~eSD)bNC;=(kz>UdO2n=$
z#L&BUcq-2)V8}*ybjF?kF<WrQF@k@BMgqso=E?N+RS3fK#OED&OA>jFJ<FHbNgJ<F
zENU~*j|A|LQXqF~C1Z3_xxi<tcJHaFMjCnk0-~C2LleP2Tc&RMnZZ##aro#3W_32f
z6FhZ^)EVwyf!j>jt1T<@KGe!$-^(q=N1LgKCHaX=4v=|7;o~<0rzSEhRMu+*`oOKW
z5<b)S61zte!<ilusc-=n!t&vXmSQ0pQY&<Lo2cp(80G_f2?_<=t5)Dl%M$K5;~aM(
zKy7@M;#(vw#OO?Yjd!<(>?SX<;N?sF@l6-Kc}=7kTvS>_d~#<qE;_50%uJE_?W0)x
zW`}>^UkwD#!5W!16`<H|l0$zipl7I(70PneM8t^T=E~35hFwv&?=7)0|BgWB!5?CY
zKBdneRs9L76BC58sV}OY_eXNb2ZiK%2U?Z(ru_aV`CS%dRD3pXu<$Z}yU^rUlA3ly
z?qD?{fY+$$^vd@y@=%-?pO@Z>VLA}O#fomaSk+2EKlne)J(XWzpHxYn7?p-1nR=c#
zTBjb)7n*)FYNEN|o3!YkmYQ&hI$^e|!bc*!!0>rekNz!DNYZ#$6A^<LWMt0|OQ5Z)
zRX_f1O1k=^iV<?GPr&F7kJOC#oD&O;rtk_Sd!$0Ks%2)9OX@U${zT=SRUbOi^h@)!
zx?n$C<9BeX-kPpV_ZgHWC#?6j6qnI5EqkW@XmYy!fIXM{b`<|>S^LvoH_P$Rlp7@a
zv#OyyvAiwaMX5Am9pv?V@u_5A0<e58*Mm*I4#v~l@*d2i@S}{}Ar+dhPK1WXY&J2S
z-rMq=XhGD#3&s;U?PX4y)Poo@+xzS=VXU=Z_Y|??=1;77Y#BMIN1?}c=*L+~0@j@O
zsoD#GonaT3qdL6I4$0HB!t#OAVB6);%82Vr0fq-{R2vF3UAgsKf5JAq0*G?uUeO9p
z-vycrzq_C7isqMOK386m!#Lch&wM<x)*5X+Ums+Gzx!|6(T0s+1Gd8r+z}hpTGQ|n
z?<v0mkqS_7_K5gS6@v~k?J!T2(S$y`6IRIa4-CZ*x_Q6rqN%Pkt`A<6yhiBA$2C0Z
zOXXeQ3xt(x?(9)i$tn0l1=yAR9JH;!#unc~PI9qqSuSzF(e)orU#r+J#G$T|p5y$^
zPpJ5=PB~$x_zZ8kM|KFhqX|2q1^fuc(p&6X#dB^^$tl2``Ifn@V9k#>mA!KU|3&r8
zpROC7?dY#2mr0fJZOR46^c1;}+FVaQ9q~Ysb}-iX@Fj05!hZBw3NZdz=k&|W(w7ht
zbW%mADXI^t)}f#^V80V&k3;4+rO}GH9b8#W9#VgsSAjF*maJdH`dPzgJo81_2Xj6B
z<izGz2Kq)U#i|d+(&_H-izQx-B-u;w8Mhxn%rHL(W_U$cOHcZ7$R;LQhD&|<djDz9
zG~@$EsfM;mGCnvw9x$5^GgiL8ssi`^aelBYpgbLma5GyxxAyER;WV2ap#ld!9*(MP
zDBoqCsi@nE=ZQu>J?M*!<ZO&C5V1J)5hah}Y{|5>zA#+fIE5N^f$!-N9dpW~a%ubr
zd_d2GxJYsVk4Ts)vAZiCi+n{SDW=MO5zSQ=ui$AD&S~!p9(aku@VF^KE&Dp%D0<Vf
zRgw<f0^Y(Nf0@9mC$LruE%alMflG@JmjS{x6?TWcDE!xzc<^kmM%H4{64D=${$#%R
z5eFl{R9js0KMKZ>f|I?$O6l|8FC5g+$-iz8m9mo|L&C8{W5`2ds*u}tmk?Njg-NH$
zuYOT^Z6+X4k3hP4;z6TETdvNR=lR#Nrl9yIl_xy=)8Zrf?T?DGarFi;1Ez}5*}eDF
z*k0GJ++IymAM%H#tFlzTmafY98Ox-XcLSY8SwvFPht`ItUu$z4q86N?zTuX>LiAb=
zlK=f#yCxc&orpOyjF0y`XPSLU#kcRfrbv8KNQJvbMg)Z051D(nq^I#O+N~k_rE3^b
z7d~@V=<*_xEmBf5X;pk)FMi%&)Db#b=!dc5kMQgRc5;-gb;nNfstPyH)^Ix8@L!5{
zlF1VP3$6U7zVU~d<_qiWn#c2qxq?4l>5EY05pwrj9OV5a;9Pd1I5*(JJPX!(wjzNZ
ztk+_oHW*koHw&sj%v}q8^&1R8`YYHU@|{TOdBLH70I};=UY@EUkS01XT#dOHO5)we
zAg~vu^3FrMVKr&i1H#u2m-wJuqWB1}w_x5H(JExSxDp4Qq{9U}k>OtiWp+5U@H6vL
zBilZ%XL1Ifs^Mk%ad$;&xX#5S+!T>@H@Oek$1*TUQ21Cg<@w+eVAbh%`sIUJ;&s28
z&b|j-P)*TP#fmBIGS^y9D=0=;SE@SUw34e=<)|rOh7_<WYtO?~PaS^|C#x6Hg5Bu5
zO&HuXQEm9h)!-8=F@FKm#-+s93rpQ2-hA5^uss8%3#;*+Xb|QFuT=Dx=Wwu3rQ$XU
ztrtjVb5Hl)%-WgZ!QHuC4i@`8sJacA$oE#Q(go#-a^ug?*%klm@DZ77mqAc5!6%??
z9MyP2HKfp84ej8y%o#Rn%|A-CH$l_jSE3>X)eQ7I@l7#=2=zL~?Q_zyY-NH*)p__8
zXl=T?l&$Mk;T~zeH{2`IHP5}e<7FBv*>4~b*qc<B{ccaJaRNP*m`r{=xIgy0e#Mfz
znai^GAwkiP(X-znT~3)4mUxaN{JQw$ntbbJq55Sp;If=^rEuOcs!*};W*@aBS#rMI
zi~ULj$n##^A(ZLO?`R+v>o{T4Fe{QmTwndm8vgt**DfC7CYj^x4(3e#4BnUZyCm>k
zsypku(lIZ7|KRtdLkDg0(`D|@fP#}ehZPFpUFrPB%_3QBQU4Pv^DH7{W{U;8ceoPy
zV~^<DPbr@|g=u_5tl<me7nh&dW&}&1)x0H_OlKJDn!EEN*vqPwm{%y>F5{ZZp<93x
z9h#!%4@<eV3L^!RV!=E?!8jl8(HIaTYgE+*>8_||RJ`FEIb~EFW}a)A)E--&5iii?
z%}-rwtJHPYM=>hb??##Q1)hIGlDOZ+-FDeHJ%>og3OCN~H?Z<jok1oQM%V`y$`+NK
z0JUwNql3t8n1;A}Etg6=(%_gc$uSr9{245pgwtp3qG8>~H=Cn>dYeGTf&^G!HJ;<K
z0XvqxJYsVJ_UkR62AuGPkXp(DXV;$Gm=J-{@oAvrmB8uBt;7^a@Ya;#TVT3ME1<Pn
zr|JtsEWL$Gy$vTo?rEAeD@1+F)BNU04VO(2a!WH@7R<7i`K%lx>=j{ObHef}gi_Ld
zJJ5hmjNqRtez^0*hgfd>{R0Zxyw&rJ0*4)#u8s9yzg-C?d25;-n4+(`D1;F<D`NEz
z?bPE90~O<6ftauoX!IObt%jpcKdwVY$|#yGI+e89=+0s2%$n0EJTO3T;?5SWV9Va3
zhsUD%q~}IpeerR2=l35_L&#?llrU;AKE(cJl9<6TkZjPkqRA6>Q>!(sUC3!(_REC?
zbP^_^zyPg9hK;2vAV8PR6|A__<*1qLq6$Eq8l4S6miweXq5?a-nHN^HdIY!f_-o@u
zp>Y<5g14Q{Vq)T-cj+<(iSIn49(9+qkL2C3?9iuc1&4aE89IqL*f&6a^^zfQ!1XvI
zfXQM>34_t9t82$vL;XRil9PbsK+TGPzDy#&S3cjbOdEm~NI6t9>84uAq4u_*#>l9q
z>VI>bQwUr-2dEYXydv#&S)X**ktfYGV57CIm05Omhc}Jl(!cnjYr1cFV7GftkGncB
z&Hn2ZS{d3RwD9IFW43<+gepDlSxb;sKMd4%92<=IMHrjqXOhMtmgBT~)AzY1_Q_Nj
zw@j(JDHekRvv=jqG7SP@l9|N~)7YfFU*pUw<#ReCAH21<$J61cB~wM-4wnZuf?!x8
z&@&FDqPxuKW1#{Qs|nwITE(P<^g=KYP1JZt=8t1#dyQx~P)ChKLSV$ir527yem+}C
z&!-)ct4_`<5j}3Z5e_5){UC0`%OIs5&V!TEOyxa5zGJiDegY_wdbk620d=Q*!#?^i
z2(l5VjooD9Z%&w*U%NHIDy}RGVS6`mlYp4y-LVW1;yhH5ADCa|jvjb^77b)wd5-wz
zEa)Y94>QRui~kZH!G|4I!~88=%0&5G0eO<-nmHrap#K1XR^grjSe|Z|icAjz75nrP
zA<ai%)#<>CVIcUvi7-|NNp!+-;Hwr2EQhS0&}q%-04`%he-ML<FonQ>Z%u)DE3(ue
zxb}WfOasY<Uc!fO0xFg%I7hahP!iE!a7L*B$Z==kv^Nq^EK_WbP5}~HWU=EQ2<-%Z
z#=oKhQVEb=u~}SxLZf^MlHC0U348Sje+4+PO)-gH0_5EMh8d-BIZ_2k9+88IdX6nu
ze*O>Lv|TI5YXcSpqy`fNgeG}+nlPF93JI91>1Bv<g!v=il)a9SY{*H00@G!jV&*{_
zrHq1d1Y^db*$m5Wn61E>Y--xvJTv2LSv#U(gM20pcy6m*!qT-REi98kj;igw`RKd(
zC~Lj(W4oNOhm!qSdy9MN+v(nUxk~==dUOJzzjMH4O1xV@F(@m5V@h|b4<bRLNdVr$
zZF`l*XolWe<JK!XVjEN!U_oO}4S?d-t1@FlTSq<!eD~xDhQIE9eR_eb?%)h&d-}57
z^n_YCAnw`m3H0Z;hu<O*?TjBnd%1Imc-+0B0JjMTeLVRF^TS0wnc{Cuwu||E#6~|v
zUqPx}W4Pk!wL)n%yt6E*J)Z|qh=69n<{5jUtV9P+VdKzde07G13aoEKaPE8L2=B^}
z#6z@@#A8;RudtB${nVnKDk77|rq%_5olgI+t22*>a{J?WriGBkzCCt>v1AD;OO~ud
zS+hiL*0B>p#vMeuS<-!EH+B=*GRP8IgoH@h#@K0WF;|rG%kOEr_vJO6f6jBx^PclP
zbLRXpXXg8SK7qpH#M2sM(~zwCG;wtNyn?vMWGJEWiqBj0IAtfzk9VBXz_y~AHU6~9
zecjKYtN>+acdRx@uVVO?`NcJ&LhT1VM{@&HtRG3?=|2^Z60B~K*p@boc23}r-TbaD
z!>XBP(u5m`S#SH_8J3gct?H5V^cvy_&#begx)Yl6h2xK*oRO@Z_Bk#4%g%EXE^a;b
zkdlQ0F~ST`@j9*Ukp#&{yF1LU&!?+q4-voEIiw6U1cY^&#p3_)YP{yLY(Agqbw4*}
z8(ZHtUQ70I_%0rD;mz}WmdC+0xKo3QFeYCmLt{d-lfmT;q-hFyBwF=F%k9>_`t<QK
z`(rgEvqs_r)DIC&$7k(~daIU==~Ex77AJ#MR+B2P)nwGx>!PruazqK8B3CmUW_dDa
zB)FO$wiBn55}<ybJqP;3Y*;pma37z`k3}l<6u28T3AgmIrhZu8dHzG3UOa%SG6ZRj
zxNB)GEI)7MR#fU!40{LED}@NVdKX9G>KS<LdxM;EWG8eCBni#2>%KJ)C|<nz_bK+*
z_nZ79KZudgc-c+1xuJbYl$%p{wCOl6>1^w#z0|)Q6S9)z{ffONO7hcJN5)R|W9vdu
zoyY?Fc{jh}d(4(E0)-LvT6x;Xw+t|wZ!NgmE6k&T#;PUpagBt@kH>C#&)1QC7t?o_
zAGL6{))=~`ebD+i!0lx%G|ZSqFsmA;M>fkEdtL1C89?>1IG+_kb(Cs5{gGC1!-(ON
zM}(4=p|PQTfWwU^_usPnyyi7ADZw^bJ=~J+bw8SzTDySd=E@>hxg8&3{L`~}(y3Z%
zTbEOv62Z1^`_1$_4C`-6(Z~G7_vh=SAG#x|65B2UCPq!?^i5{&D_Tm_eSWw1uIHig
zn@TUk&u!KYG7rm4?ApX8yR0$1&ey!0O9w)5rKNLOWZR)+LC!X^mE!XjZypOQMFo==
zmvnO_yf}T-26K4YI!MOfmLivK-8F<CXP0j82d1yNfEk(DgXCi<P6->#=<~6fxyZh<
zDenbKj-#aen^9$u0nf~#{nX><U34`Y>NLw5e4-uETs@zK<|UKD6Yl2Ed0Icys!G>*
z`dZe_AfCIqLx1P1+N6?X{7YMGtt7VEB{zz~#I=XoGkH}LvBRHap207-`iz$gn{&4{
zh&b+cohV1@otped*^G;Fg|p-3hRt5gX+$C`FV>nOxo6+yY`w>cwW2^NMP27@_Lw}y
zeaVVqMbe^?%#osXsOgU-hFW-hvZ9_)GLOA;>wpBC`+#W8jq)h_D@5#SkY(|uF!^Be
zvpDxpLH;k;0&3`IV|#nk1OM7EvmXh2`2Dis?iDd54f*u<N4&`{xc9#MU32Th7dgM4
zsg>w}jI5THWNIpIqj#NNJ0^2-^Wl*XFz;=xU8n9fv&FLCRIMSj7Q{ZWQ@hZc50(s;
z3m6Qr;uqSO66T^?IXs83+G)5t6Sk}PG{2s=Wk-sPcMR5+`7w%`ajV|Oy3(43TSu+C
zM<HwUy2fGGMEUf0>~-Zmxa(}^%;=3m237SDD%R~xy8}xO5~CNQrV)Ltrk<uZI$s1&
zPb_3AQ;2g;i0kVZAxVPo=4#uYPc)VvJc$qWYY)h_zujB38QHCd%>&z;N6jZt9)3}|
z@p0saOnkL#elg?UO_@Ig`wP$CW^}0K&8wf#eIy++_>C90jd2LruH+s%w`}ihw92os
zil}cNBDANCIN?G$uC+&?1()6!CWQzL*<HeJSn>!D=s5W4p6HKG=QYwh{gCf&{3AST
zrcNN5Ph~ju9%GXq_H!sthKqWX%||#6QQ)I!eFR95MgKL%q5H-4IkR`d3zHeeKHiFy
z(u>-81|;aIADIjbIk)%244uctVlG#1_LwwztihjJ%A5%KqOMyC2rvu|l#eN|91lN5
z=Nt%}c-$Ej=SrDJCxNO7n}28o!M0qw?<gggA(a!o!nICXVeJ%>(~+_vJ6vZYt6Tye
z6T%7!VXP5SO7V$#{fL1jMC{}K@z(d_t)^>op*uwbQ*~aco^uJ0YYm$`n&-3CT0M4^
zFXv+7eDBVP03x6O-dE>vRE;nbk$iI7r0?Z}g>Ni#E!lJJj2W&fiz6x=Nh+D04r|@#
zfX;@vAkD%`Z1>BilpnVOI0lkfdtaiv2ozv;#fqmZm`>4^9_7-NWrc7gB~{=VO0r|6
zi%rTpc9bR18A3{*7gMjq+3UOVpKWMM)QH+;&%Km}>K;^!mqB|X7T<GJYw*d(pOY0G
zF}`y}s`Co6H~`M4s%}?(RmU+-*}zzSMB>OYb9#>(mT>XWq4gBjFX0woPN(1n^o!XP
zq~rFHG`l8OKHGr&=M^G~PMXO+(x<C4tjT&}oJPp`Q#Wh^Pgf6#S<ODlmD$n~twSVw
z)_UC0sBKioWxhD~%_)+{<mA0K`sO~ym#r*5#i!L3*vrLN;oRboc{ylDBUhOif*@-l
z(dEom1hy;YT1kXLAmPjfGe9)uUXl|~WNKzXGX6F+-(B_gfpT4_h@`-%?Z}rq-G@a+
z53`vrOm3}z+7-^P(eMptp-)T*C}a-8JP^4R3w)0g`(KMn%p!%WH)&M}DSDPJOI*kk
zxnUMFHk&KG<joT?rfb4;bd8Iby-RSdl)zZtb`J}1Nu3kc3AuT`<yd7fK?RcXpp#xO
z;g`L{b^9)xUO0|iodoI9)yJn+2$aMLz4N~W_Y|Y7?J7TF%M5GEJi~ToYxLDzm1J!U
zU(a!04NE%ABl@Ol21nZ?)nYT;P0zkN&CsJcIrL3RbvPqFWNV{ll)W8bhU|D&Q@{zs
z(BS`A&8F9)+*$x-WDL*NWgI~CDSQ$ieF|p^<aS>sUFhg$FK8?}<)`m7;V2eyLo#pS
zkX&aXT3)!$R%e?x&V7=z5>efncx|Ql+l*CJ5z3#j#p$}#Gqc4tP0QJgNX<eYxs`V-
zE26WnV)t?TFi?9EAe@=trDMEJ9u1R(?8L8fgAPPAEQtw}WkP_<L}}O_6PU{+1Ci1&
zeP+;iQXLk;4Cb@&f^y7!;3U+$&jK|yp-VVuL*k>W1p`S}VFsL_g(d*5k<P-(xTu#O
z7XZ+CiVwC1Kus~Q2A~JOF2VW9U%fg|(DAJU`YNgp+2;ILN@7OA!KsVDPh;~UDC0^3
z65&7n-%Y44iHQ^eho+=JmuUfj#!Z?A@)xH@YoC?@s7|ubNE?vzg8>cnN{R|e&8PrW
zKTs&SOM>;#Ax#=6M1~6G&d35Z&T2GJkrEZ6pOpa)9IJjGsXzsSkdS{BB;hy<Kl0N!
z2rQiCf|aUK`~B45pxF!@_~{dbr#p107+M`QnkWtGR4_`N_2&Qp)jkM%V~t0DU!poq
z2vh-^=itDBPs{Jqsnmubc@U%hD=dvc22I#pJqQ#7o%Mc&rLjk#0V(=aaCrU{aA1!B
zttky8V+=u}kXeEP-2fQ4U<D((f{L!Ez)Mqb(9i=8`GWr{B{BP;;G!pN7!4xP>eOv!
zKFJJDEwaGMyunY48gwI|%#ti{pmX<oq?10NtT#Ux?R^5wS(1hg`BU@u+5<Si%_Sw+
zXyCt1KJYsU4jv7KGarQ3xdBOWKqsS6hM$`iplWqN+h+{gj5_~OP+bxu9!3S%KdJ&$
zB_8NA`xAncX`qHkD&$B;0<?M`2UJN+ITnJ<V6XnBvL}|cVGSU4hRgSbL49b3Y0G@D
zr`go5%}hRUdRZD4okwj7uLuD&4@(@33r*1*M}-0*h&GM!fGUZh$5WwaE7C`QWtwfQ
zaKie_|9vGrD7vZun{TH!S=yMv&{b*Jz2{)zsv9i$B~*!m$TbC6YcB*Sfyrxd;NaJp
qp9zx(r6lIfTX42t9we^90h*)e0Rzohb{K*H=wvE*%#8H&&i?^nK}2Ez

delta 35766
zcmZ6TQ*>rs)Mit$ZQHhO+qP}J;Tzko*tRRSU9oMal2ljs=<)aX`hJabHP3$5o@<>0
z+y`6!4c0*S13}rfE2|m?1cU(-1cWwa-VZZH@dqxz8+{Dp8!E4*e5J^>D2lW|f-j0x
zo<(~QnFNO1pI8`Gd=Dh1B^mL?ab$;(Lh-=8JXtcDpd5?J1y(UPr2%wU(aZOC<-9lL
zfcxF*)xE2UIN)87z5VfIhVHN5;|_d+;QhP>h}{S&#GHB~#GGp3!G^1MJbr%lo)4`o
zc_%nvPRltX1nccyRLGDVhDq}twP!iOEwD#^U`j(>W|X!^l(A2Bq}thVpju<vWuji?
zUbjavx>pbJb$tJs_GSbRy=NhT>;2vm1Jp_7P7}k!J11JV$6$a@ojwipW`qx8>vXJJ
zJ?zdA<96Wd;j-7&y8wUZb`0vX<7W{%()c?7O2Z!-sp^ecl~$6a?0}R|mAP(@jFxjh
zIhxOTBZ1C!Nb1X5dw}fW(aiP!kXA5QDScn<ttDhmdRD4bI$0=YZestDwl9dO>J7E8
zW{-~6^Pn2k&Fjj}2Ckjx{MvEXtEAXY>rYahfIyx>Hw5VZ;Rj7GOVwBeZnpy+Dv>P!
zGjqds6s?W0{q=I8gany>eP?xNX%WZKX==PuvH9xy+WvMz8S6wDjx)_Zewge9Gq_0k
zEAWR=HIJ|Z#=i8{dR{C6TMglt_Hv?R_Lr}FzoWzvzrxeTP*T{hrUn}X4n&;~;bm)n
zhjTJA;7Z3(7NN6M_mgz4;=Ac5MkX47SN*K1*q|LqUH{umM_55_r&15}m{Drjev2>)
zSD%5XQJ(QP3K<CvXtYJPr(ReO1zA@b^P5VBgB5^%aou**)Yo5_w|i{A@aJM6TVQm^
z5fI@WuWOFdo~(_km{v~sa+q^cc^ZXp@Xe>f{R!Uun#|9FREeI%^-Jz|lJy~g+~DJU
z@}jhnz%n*4U3{jH#O4aLo;oZ~;-*?!?e`q^m&_*lUsR@Vuugr{mlw7#;AMPBJq!28
zFJVD=aoQsXXU9xeE7pV7LVn#q{p!VZ3%Y7}jE47Oc_kZjN{$2I_Ih`Hid_gb!z77k
zLEPp?R;<|(jHShvV>3q;6{-VZbkCCwhse5}9x5_xyKM(xnjv^V-XBsASA(EHumh^r
zu4uRPY+C7=BU8QW{OGSZAfm^B!Ait0-jY>*sG>$R-+;7@n-8id2AU2mHkJf0=Ox7L
z3wA>N`?)k>o~;OBOg*l9-c&2Ax>sd#(g1YY--PWe-tT@R^ihOGFOUaF!s{7t|8@Ch
z_a_pXzZ3hE9!TK$1W#azp-gEOQ-WuU#0`utpn2;A8trA^l6q$YQF51^@s+gh=n(ox
zoxo50I#y^dUD+qqZWwdRChW+6_RmN-hX4{Bk=n^oC1Z8WWcqd|_FqA#1Txzjttspk
z$qnVX*9wL95<qo52^RnqUZ)omT~s6AG6Mx1pAdkRJ1(59{=+IDV2}24_<9=7E=pKu
zHXU$a<ht9B!C$v8<SjY?;NT@kXAwh_7%Y!8RY-M?hFIef5w~TfdZ9S<B)2rjq%nHq
zP@%28Ls;}ys3?**ma8UA$nkXk^)rP9$h^)pw+(#{i<qs+90!m|gb?Dk&T2Fk@>^mN
zFaghCQlK}=ONlTTi^uzFqhx1MtD@5q52vJ+NFxQ!u7FgleEERVM{9Q0KxyV+k(#!U
zjP{AHSQz$~(I<WkCAF>dp)Q>buZc_HZTh*;6r2LVj?1C+I;u46gWXMuJCdyY<=&+h
zm4(^0&>UeXB@WOkTUHnuLdRJ}V^~#YwH&^#l%E<;i*sXUO>N1{m4ma@FJx=_#Nw;<
z>DuvrnXPe9bTKX@WWBobWN|7oK=)Lm*uH{jQz)jjk}-j>shi7zn|@FwV<ML6me7n9
zrZxg+smSR<Sb`#q1bfe$X8^y1(>-hX@U0v25h!EE-T`2>;fbnoybY~s9BLR+`KF%Q
zDzbQ>Qv(mtg1L{<#PeylU~f84G=c~OVgw9kph^bB%mbG$j0Gi*<7%^`biLCi$6A<Y
za>3Ua2o<@&WZB%x_Qab`4f8RYu2zo&RGMRxDj1!RG($dfM3<slGp3K1Hf7amDJvC^
zJq*g1H~}%7)lxa<g76oVu}aJ(n!|#dnR840D&zGN`-5Z!EH?~MOg}*@Q>s(BZguTy
zLQ~Oa_37Ex6x&lHa@^$nGLNS@^H2-MXqXBgn+7g$+NPHtFwcLI4Xtep*>ku19Ga^p
zp#I$0_;mELs}quj#0<%t{k44%{7sS|V3?G1-3ZXqJ$R|-W>adjIc-=-Eg~5@2km53
z@Xnl(UkDbZjcc2EDxRKDmzlg3g;+`NXn<32Cs&Gr8M9>iNKNBkYED;3NV$c>%@2(7
zGuZSz;-4HW^C9IKoKie9{tDcJelMU3LgIin!vgno;{>zF^|F}Zn0+;$q2u1o;iwNQ
z*ah^oyIql#CiRE(k02Ch-UkgWPBjjbKsFW>pRn$M<WKLaKJ62CcIf1mt5}o>umX$j
zqFLTNU8r{i;*<MSs1^EfjbOjQIQkCcsITc@Q$1eaL3O=g+0>{D$hD+hOUa3_r7*l8
zv!m^zk9RI`jl^J^vt>t_yJad>q#1C=@BvNJ3MPiI931*tyGN(dfE8@a@$<p5#WXYR
z<&xD3gu{yKY8rxwJ?st=Wc-o1!-`9?M{3Lj(+Tc$)zv2SbS2+Dv>)+PFz%6ktHt<q
z%vf}d(A5ou)eFHK;7^pMjq$g62+YoGv&LvQ;%GO6mbqq`vu1RJlGUL*kuk`K`v6ZW
z|BQD-UU_jj7Zj;Cj!;~}l9D0nqWnLFhuEDj2jm|t!pjM+j>d^7EFEspL&_D^X<idU
z@W(vA-SMfYulXHfNJk@w2?RhX``@u;pm;@fBt8w~)kOp7z@Ce(v4>zo&X6_DQ78wf
zz1psXF}CZ($`6(2F%C09Pw5W0$pQWGyoi+#B$=AsBzZ;_@JF(*yWu_ba8?#NS)qv3
zq)8|X$tO8<*Cm-6pLzt=@HH~~Whyl@SnX7DTU)W*f~rdggk(W%Z<}b!YT6ltALyJV
z&W{eSCYIj#IUky_2kCU`3+UF0CXWJ{R8hft0T~UY^%aGF@Oo1BC3Im`#{kkc7=7sS
z8CyJwKM+!`5Ng(Bjw7C=YqBjR4pZ2q^G&dX1t1Bk9B9@gNUD)hE_4oC1LkMMj*Bml
z!1|Cs$=oA49A5dB(J*y(pS)A`;qu&G&y}CmAx;G$aS6rh0|Wz#;j$X<m<oJbr{-YF
zo5<91CV#dwkG1Kk_*BmlE%_1()dsawG2BCKp;!t;^23@}C&aaEP~K`(j>WiYE!A`t
z-nl(heIYdB4%$A?#G8lH%12=MhxWT30nM>+I;h~}7?yr1=LE_C8i57|Wo6{sNQ^>;
z76_DvAknlKbXXCYyWKW}OVJIAO$mR9f<dic;-RvppXK*iu`aWY!KQj`*r<PVr>1kA
z`gr)*`~ttfA25CqYm&2*ElP{2i^7qjnqohhLcekYd2ZllD!}7e;-T;lQF}5|iT6py
z$l_@r6W(PRz>DAk+cMkZ60X498M-8S!#MJ%S_YjdN(}{_^tcey;R#>;6?L~{leV>u
zPbWCJT!zM&*IJeiG+#{<Ym|`EyxJC1{*)!3<Q9tO*j%F&1dXd0(e|HH&Mp_FmDp@m
zD$H75ixSe1yFFzzlB7&nu&_FD+^+EIgN59^S!PqPT55y<7_pSP+UzEivNi>cHEvY+
z+Lzy+60#``hEJ4SM{BO+Om>~)RW=p6jE0QoZkC2X1^f$hGAhP8_=LV(#|^Z~<at$z
z4V&GaHk2R98Pg|4Jq`h|@ni5gr^yhrjiWX4F1=CFB$PlApfJNJc8Ny7*f=#?m2^Qo
zYt9cBEx{JReh5-vi!1-V31l<Ao8a^zjabIg3Ue$Es!yGR?MIy^2@!8~rGH1XUC25q
zMN@HTIPD$53i=lZWoDkRx^AhSh@A{P4R9Y&)u?OQB%pXb33O#GvyC2T#zHvmbHmKb
z25&<-&dQyj4i`0Mm(}4_7c+U<u;?<YdWY6Xt7rhAfzqDlnzBBndd8~zicMrjSjkD?
zPc64AhP||@*7HQT(mU|BV%~}>1k`J`5Y4{&kph&!7&$xsda&#_|163LJY#sev<mFE
z)@rE=m2+pBS4#49YpE~Zz=975qr-;1Exr-BHn1*l)Hz$Hzu3U<u_q)Tza%EuI7F=j
zS&asKAWmS{rEuXr6Z8^qu`7WK{d$JExwBgCzC*|_{l2y412IBMDkB+xS?KTrvH1eo
zc~;JB>-!dySjv~soVP|ZwnwS8hq<N?2hnS+0C%90Qm1r=+ZGq8aa@{|_z{8fi(v4a
z#0G4g37nfhFnB|cJcqRQ*S_Y{6}N9fkSUukMcrExUA!Qu)hey^2$Lp>E7eW=?jZIr
zi|q0V2R4CbUK!WWlN?7FFNm=IV8vl((EGk<62$xUXcUio))<rD*Mp!lGVM=L%5q@f
zupl7N&>$cnA|RzW;>9U(Bnp6*3SvPm@L)RUplH%j@jDW74248VZ<D4LE1uq)tn0!z
zluyRKL~)9RVWhnX)>*?j*TrNov+S$c>Dg~fOE1Sik8ABjAeJthLGdbJHnAQl>~+P~
z#8EO}Y7Or4mzgHx>OH=BF}4#ZoI}bJDIC?5J}a%Y(U;mvo%ZW1r2&8f2;ee-6!*6Q
zFsae|^`2GCb)p)TzZ{-!^I1Vp@Gyr_M=`Yr)@w?iR~9Kw1~6sAY<}DO<nVqJck3-$
zIVHO8I&mBaRH*V`b|tq=48xDVDX)3-_zqk$eC~Y8kpzA>F4BFc>oH<+*sWy5S1`mn
zF_U-HR381t#PQ`v5doZKTAbNU&Q!FVsUhGIj1!oSU@eSlp5BJPTk$s@L<y~!e@_}W
zsyW=>7bUstn`sLU5{#Kyg$T}jmaPaIaQUY)z>ik7Gtj+=Nj;AU=gg&6F~`6+*>>bh
zaKRIBVV{_t+a0vt?L;AJae1#NN3)b4T4J^{&oTSdK$>TA&jL2srV0Bw&K~20G=K|j
zcmh{_ur7h{M7$gy0P9R^qHnt{2bc55<CTk00;303ul8#(!ys1JC;hT>gi<NtXLK2Z
zdG&&%(ufwR5*v0a`8KE-`aluW40VKF_7_qSzJlVI+96}S@g#?z=kffCpur^#v4Q3D
zM53qGnufXuW`LM9QoQvTXfZn$_NH7!>`-njR>CF3==d!!^0k-~D{^(9K>;EN-H(QO
zcZVNtB+4?UGK<oEL2@L%EHxX-%LiH|(*ae5n(LU0(@`b1E#s0Yxmw{yh(50qQX@)P
zBLWTEU^sOWtn#hgH1H5(WhHdjh^)9Uo`$74pz>W*dGw=#54>WJ8zmpFY%WPBA)rS~
zPf*sTprcOz<ux`&0qrv-m|Pa%x~Y!*9bbFY(X_~0CWA-32U#xTALVA3vu-1oY#4=y
zwFQ~$nu4)X(O4Q!ztjhs@JlZhClj4@{yTJ^z#AR=McUDHP4S31Z-1`yYNPqjb-6(G
z*JFWEAQ*E*1goOiJvf3KE3jcaDTTyDM-nq*s3W8rpD20;cC1Rdn^Fug>Jg7evUSu!
zamXo{%o5}g-xEvC$qkF|h4Yc;6zl5`G@*CeNRuDYY_Il}tj5jasMb`Qx$ZH!@Y3k6
z+vHg^<dh%k9CUVDH2U&D(CXPP%E<X`p14}$khh<TY|n0MvE5gmUQHf#!k|#=Sk*@I
zqEJY_#|mG2fyAKKZ?X>XC|{@Ma$u!yS5RwTtFrB_OZi>IH14e>hHj(Hr+h7{XhjbX
zmagNjzDdLH2|so87G^T9=ht^OPok%n@-B7JZd+EBohHA~h|rvTnJWJ-cH5wU9a3e0
zvh1;5>}1vXA)efRhiI*5y=m#|(c|RZ5MCv^G^Vm~bPhcT-P#6llM1*B)Q=|}n#G%-
z`-^P3y#>dghcZ-yeS&?^yJeObqdBxnZ6z*>=yfI!cY~2T5*cEWyWcUED2Q2p@DKoz
z^OkzZ20>xZGW_|beg{&(M*r^H<#dy|iq<S=nJ;i9J-`zSqi)1Pj^x!~s)ft3?OrFe
z@?=SvYnL6%;YJQHpy<ua2x^SF{}^T$J0jMBJC^D?arUnjmeBED#%6p6wggHG4{alb
z8PH;4{nc|hgGfAeJ&v-yybeO-%jEmEE0;PcsFR|MFCT8$QIoiMR+*?OJAd}|cL5Tv
z`6J!>Og^qS$Jzp;gQ?*iK&xyqwoSNqVV9;-wY>Bspr8Ti;34;h$o4MC1^b+y{g<PY
zc+>*55ZzjeWc6f)u8Ng9YEkK>jNC-{Gs}VJgcq(_Z-0ggT3-5t0G)sPE93~qXib;-
z5LBi{NKsUJY%s)ymtC2A6uR|VkQQsmlZ8kUrOP}~K7(I=^oSkGxQw1GjA0^MV%;%L
z0MBEeSY!ch`*juR$+7!jxlX!YaQFf2)qaVx6X=@~yOIY|;Q7Tu&urcxOemAGWQ(_%
z&%;!GQtn8uG%}mcAx~*me%RC!O0xY2>NJ^*f>P#Kp-eBx45d;fTDndGZeXa&yJQ*0
za^P$+D(OSmdXmuwlJN$mZO$v<eS5*bBkD{+Q@{Z_HD%Tq!kK}pFeT$B)O93rHny^C
zj)}qjNr#EtqUB`7pjJ7Bn9^EBS>0QWU^gG(CY-0dir%z;;(1zsS?Q1AKQj86wg$o7
ztaYCK?g)FeF_ehxGfp3bBUXIuApba`PhLixgH}sI7BA?5T!650fhsDPJussQVzT~L
zP5z4y@!x}?g|=E(0Tcw}790dbGQ|XgAO(pKDn<8@0#K@EpoAuZF5va2QMp}pDk7RR
zQo~vV)0?F%tU^IPdpV&b?6r{KV$U;U+A#_+^7mH^Q|6no{|gb${o(8lWT=GQf!OKn
z7SHRJpQ4oz;O`yEFG^0h1{E6PX?mV5jwt~=Im%x9VoS4;QCgDzQhy8wG}fsV1JO1V
zcM6lDQh@)v|NL%>uhf-KE=_w#{GDgG=1DGP^8y_P>Ioics)A5zU<IiM`DT)4U_Htc
zQaGl{PZ-6e*HTAsQg{k1ejA9c)0dVr-^FY1Neg?UH-n|;()q&WG?Y}2knJcX{?SF(
zOJRJNHMGDvg~aE5`PK=J0h1C?z|a{EXs&@%6QHT?_bwIk8v16^Sx+D(qT0e~SMNGs
zVqS${ZY8I~R>A;TspE3o<7$qF=&{j!*nQi@J1H*qy&fRj5}9W1>v(;&Vb7tAwk0(9
zX1sh-ItRzL-7*><-FadFS0C!q8K!i%5?|hQ67tW-8Q|}R+f@|t;Ic$CbWHI!seIY3
zIe^Og<x^O0sen0PAcuv?{1aY58(U(|as4yg1q0xwqdiI`$m8$IgF2>vEl}gt)2MvJ
z;gtLYk>PVo4kG_^Iw>~XrqR+p-OR`089eK{vweJqASd7@vpFlX(jNH<!-rQQxNo44
zh{cYfQeJ1q5tq%SoVD&@_5cT8f5_t`%U*$!_xNDZ>;^z~{Ws{A6+fmmO=-OL;THV;
zus@QT@><py>O?g;0>5_oN7s6A7PvE~9pb-ae#N05e%sWJJtWYNI&ELSq4mldQ2=9#
z`vU(jc>Y(av-6N3Ae1N|AOimb-s~ZM${Za5pr%El7L$$<ej*XEgw4ZpF$C|XJ2F~Y
z#aYY+i(j>7&vy&yFYxq@%bWY6mo25l0o3OGDC2c!%j@--0`U3x+zz69A0F$wMN$02
zORhsol7=%CP5jV;jLF3iwdX9hOGcD6<Od8eR$`sL7*y{qHQKlVl#*T&H(4dd?|ms9
zus2yT>I_cCYPwEqhIezA^T%Q<77F`*0GiNr`~`L^B*Mo>e6ZO63)@J@Fqo>rU@%4g
zBQ>m?f}iZCwpg7>R&Sj{rVPv+iupA-bbx1enWI+;``7|Oa603ZVjH;wL(-z&0Znn~
z5H9}mw0MTe1(!`*@n#Iwq7e=93k5VifES@sNo*bC9=`!3ii(saI8k~MU(3w{W)7{j
zUX%$8JUix+_eX&S!K$iFTT_!=GiOa}i2>Qlq6IhOcG@ehjGEgLCyOEfv2W?$yv1pA
zIb$!pW<8rs;3lQ>&p@Cd-A&~|d{)*yLI7wXBAv);-Uzk8`9NG(Ky@37L}C>qfUd6e
zgMD-F76jWB3f@)Y8FvYnC7_nl=kLP-EIK8{+(i0@Bh^x9*Ey`dUcv1SFbl|8Wbv+X
z+>Dkf5qZzB{ae|1+de+rvRmLoGeaFkTUW>|t2w31FZASyo~G8RV~8!DIzpA#uX0+B
zXHtKPVE(#Qq>@_9kejW*=R5@qa7|1{-a~8>5rzd3_~-AbzRQ(`p<%kc!Q>RHp{|e4
z>=bO>kc~5O#H+3iU!9SYvvKvKb2bkFx_(qz&lP%RPW6rF=4zWu)Z>aAEaQj;Y>~C*
zd`Ky5dZEUEtA5d*WDQDWo^GBzYRzxlwa^Miq`Dkc_xcY5)mpuS<w_VifS3A`tA^HQ
zQFV5uWpaC#t{S7yn&Vc@m`roVJ#2Nm+(7j@LqpTH`ttyZmtML&!2-U=cpES-EMJ*R
zrwvyq{LB)jo@PB%1;XG=y#dP(y(gXnbqBelq@ukWVXRR9;W1nuQFovx#Cg?+$mP0m
zR$K+*&wW`~J9<x?7kW<&U>g>3PXOZ9jr@1l63yCA+^HtdWt8pJ@|jO!LFGFVy}u}e
z`9~i8`sn_Hh=0)wWZv|J88rD}5%(K@m0GQ%LFkt2%%nt~pa*fxR4_oZ&z6)y*p{zV
zRUn*J)hw+z%(U9$zKy`?{&d8xow>zdcD6xKtAXOU=+D5)B){w~17M;fWPpO18Wz$F
zPpfrhxkK^m<Sjo^^}|EgP@t++u$fw8sxL%ZE0xwHU8Vj^qQ#k|t=nBHOLHp!^<ne+
z&Suk#q03*#H+x_~m#&I*lX)&rb2d>ad29hK&^B(9#oyT-bQm*N)ngJ+l_Z0NGuDw{
zp-TM`@@k|JAodN{0HDOHmUqiSZjMZv*}sq(&f21cTnsw7^9vEr-tqJd5DV08SVD{1
zDi$GWtahLiXqnw(&tZ%5tDgmLru-2(yb4vjZ(qv5W3bNpeGw|#&y9OFCXZ9)J-kpE
zU7p*%^z+d(+ha%34Ov~uopAsIdP(*$g;)#4oa*b1rnr}r77$-V?h9Y~C56Hp(qw%F
zJ-9GRmRO`9g&Z|YW&CcEAca>8NAkmzX>yoQJ$j8rsV5k>5eX~uOPh3OcqOcP@HE!W
znPD$aTWvp2dkyt=_;<Q5)hd_xD?tb2{0&3$ptisQ%eY_T9yaYqb?Q7<=86&S7wY~_
zJ@X&x*$+leAYgL(Irr0!H)CW}MI*#x*!qU#K>I>RMQkU?8!MSxIJ-YV*9F<(K+HWl
zfgi3a;9LjJw*hu7#j*MvUvvTj?%W@Y7tDdn`!|@JbUr(<S&F5AA|b_%Ia+5-d3(-K
z@O0js!m|1Oz)d|yOnC$=-+06d9oq1EA2u!M$sMMo6|gufoh1C5YGXYNM=``Tmh=bN
z01`xjq4m)w@_=H4lavaVh{kTxDW*Gl3>@HCM^e?U%fAWYDIa&pXU9bBOn4OH)GDN@
z!C859;_}Q9pQ>Btil0}X`c44zc{qF2d0_zX_hEycusnBiKQCvX`r0HMy7gwSAF$ZS
zf4Z#M1i(MwK8bchM%z_W2mBH^kcy2gXpsAiRk?@jO%5D#x#tT+1?*|L3_fb5`ZvWq
zwB;P=M;{(_5>Bem&Y=Y(Z8m_}xu_*Vz#+%y9Z{{#P^mEPr}wM4p+<Xg_oJ#?w?pp#
z7MG{lAeJ(VQ+O1UB0*GwS*Obfbr96#JT~9L)I*Pp?fYqMUIP~`IeKlla92s>l^Ba!
z^ZK?EMLCCHGQ9UQ=|*cl&?WM3mGivfZtrv-tEkKkF~T?3@IW)kyU>5Lj(oVUsPtcx
z_4F_A`2Q#Cc#iM@d1($xOUmeDf4%UwS21vCBNODsH^7<@l1M6GW+SkvvW=Msw6IpE
zvu`k+_=@i1oSv56L{Y<su>wJaQt!9grhmvmP9@*uZn_1YHeMI>_XmPyjwHu}yYeQF
zQ_0X$d+18Ra;<E{CP%xZ9%fq1=Q7N>isQFq1C8Du<QNSAYIVL_Y&fyyqM1#$ZfhI{
zz|L$kyb<7$$0ohwZ_UOF_8k3XyL4u-{t2=~ifGq0)O4?c!sKhHL_M=ejXd6Cwi0+P
z-5CV6z5_hYyxcmToGrt{MO9yK?8hD5)SGd)DG!DP=)|ce6wTIozL>gvb=j^7A;-)T
z8Kw>?m8MpJmwyhH10(K;hEnpTs$(9>q=neA*AeB=PclT})o$W0;XjvwlPGlY>qu$5
z%)3zAuD1jy#z8G)yz+!myes)LwIeKJcV+cauP-!z^ibZFRWn$Jj$HJypESxTxMs%E
ze<v@Hak5q6KmrprGd3aJb6J@aSimsou{$E=Aa9HT{P7aN_wV#blMnJQi%bC@FdRzX
z_E3`x>>(K3yoRkWh{Z1(r;RdLwaI*MJ@<Z$+A<n`pgfb6`Pp?^$t$jaj4dv?O=Jbk
z!UVI8l61^GfOhT$c>*htv`fr3Y+B?*<zZ_O#1AP?CbzJ8;TOJ@Ob8PVeeo_&Z20^L
z@;}cE*Bu#P_sHIb)V4ja@EafD)MemwK0Peg3cY~!m+?1LQ8zZV{H^GpK<L+rF$>Tk
zPDkcp8W}1Y(Fcpzh&?}(5E+Ov{KJUC0zOyyw!#U|cpQBM6$~RJmDIz_zt>A?e1Af~
z|6Cl#{$l=BDx%hbDN2}Z!EU`yxISBGo=t!u;mK*g=+u*3cL+3ENWIM}%?^ecw&te5
zW_gC7GXcN&qcMoFNQF+E_xAt!FLiJ^!K!~m5C0?j|8;M>92CSQE(aatshs+g6eTnY
z+j75!X?mS$FeESvi6JCto$$s|$T=AR!@b<7<CXKwv|elKzOj|#X8PgrFc2xU=<;;b
z6_I9|A}RwOz_5MxoUOVv`c3okbbJ-2Wr%u?>5zp6Sfx(qnco*g)2L$0em0$*S%hbZ
z`hR{Vo>@$__3*(XJr3L%zu&`(nXgo;G|8N=TXR&Gd5=~jJiw>ohjP*CYcIY4@=&rE
z#Xct5tax4~5wZGoHx3C$T0J&7M{Gm8>ts5@f6=@3W}O+RDSWrtCR6kTzz-?+Jw^AQ
zghRGphBr~sclWV>=aNiI7*K9ul%#XN0L_Sy$>YiW`mqe0N2Qjo%HtZJGoAims7@)$
zVV`7E#JR7X+f-JNM5O|kGMDB732L~GrrHBNKs{~ch6)pyDR{TwteT!X`9@2aHM;hy
zz)X{d485vt%S>Lv)4<+}VBK;W9_yDArFAvn1fa4uq#NFBz%4(=Va{dR6{#y12G{=r
zw|<4N=N`QNPIBsV%3PzXvTM0=e~VduZDwX>o`Fzcv^N#4``PH`*2NCcyi@AwT4&G9
zm|QqlDoM1640-GiR+*aX{SbyyNP-J8gwrG&2ECNMNaZ=;{(?ag;EJ`c^sO_m6WvU&
z&KW{JWfJLc6TN_=I|p{1w+xMP3IYFTI>ua1UA^EfWIRHwk9uU_fq;KOET5Y30Cfb1
zk?ipC>Sui%?L`3!WtAX6cY{lOm!ucULQR)dG;3^!tTW=R%&CfK(}|8lW8zmCve^<r
z*NE75QN3T<3#@2y0y?cB^oHjm8Mjomq7C_(4<~9-W;`9r``-l?iAe5RHgeZugP8UI
zPkLoi>`iz7gS6@&q+I{Bt&^)2la;H9xqXTQ2Fm}r=k9Vqrd)7KLHr%9Fp6vD<cR}C
zII<MWEdK!lQVa$H!u>yI_5UvX;1dCZ4Zv>}<PZ6QP&E1~QT^}PZ4e+JZ2u_}K7ma6
z5<mtVPr9V)f{Ux5#I#6FsSFno<J!r`LQ_&h{?)6?aP{uByFn~YI6!-2A_tA46b!m8
zaq-kcwoegFnZ22w^?#h1zWMri{Gtlt;XjuUlFu7%iD!=%WhiAXKE$O*Xy#={52uD>
z$ryCl=d0hZ1Ny<k5Uyf3O>KUXwe#Ps)wBY*-M@Z=iYd)UZvQHuDZ1>wM;%h{+pgbM
z)wWWm6In6A*7gjrvMBF64|94eJB^eNp6T@<>=JdtS@E8V!;aO+YJd^DfZO#Nj2<f<
zFI2PRfwt3RIMSGFw4ZCG73rP*s*=9Xjz~f~Q5;qKah{DP<W>wE6RN-CJ?_k8a;F8f
z02oeQBD8u)&aFG<5~D*;8i7#oOmpg9UV#=Hc*jdM$QC3g*sfMlW@m?O*WxO5{6cd3
zX`ejZ3ysbJ4C^osr=4^_<}DyInJB!z@Tf3ms3<=>a}YcWQyM(IagxaqV5^+3PRm0S
zETO@Ck9QOso5yG%6F3H6>UM8A{s|Z|+TQZKdP_YYw=42PI<GsG`14GCVuIi6cE|uM
zL`-4mDW{vmLl~<^-Bv_&DASx-Uc7e{XI7kJQc%(=^i*ZC$-rPJ<DhW}{TU<s8`1_w
z7iwCJeEK|~!qSDvUI~ae!Hi-2<eM2{m@b@MiB0*(n+=|<1AaVDdgw@zToqugv}9cx
zRf0&Lz5CNL1?ucQq>*Tz6EO+ZmT3cr0cyVA^y%#9?eYNQ2o-rbVekn1#E|tto40;x
zKcvM&tt1g8<&8v4kVLh!d^QxbXF|0dDGpU)vO-C0#it~lciKZ0=teFhq38x5LHsW3
zmVFmKm-vu)H3_ccBrwtdF@;CkT(u*-lG9TC+)?U`%n}V%SHy4<RPxv#9ru|)KSYtO
z(1`LG>%WbPm557IYD&Mb8X(*P4x^A(SGZ<g)trVnEEQQAEtyh7-d6gFGgU!H-*e(7
z{jL7jL{5fbk8n}cLNy?TrEjB-8ngC(-bd&p=e6(E!?NGs?=Q+PQcd?KGsy@>ECio_
z*s4!Y947&NIu%xz8-5lJC+fEw@NF3@KZF}VwjNyT!HaQhw&u6R177I=cCNcov*|zL
z4sKxdF&uJN0--#AC2sH_I?UBZ^j&k(?JP9jNu0gIORjh@^dCeLH$b;*K7N*MJdO03
zWg(1l!uXMI1#Dbp-GNQb85mVg|Kuo&%$_~6i#QO^jCanlgwna0MXz!njj2i_|HJs}
z_=PkI8Q(iln)~HJ3Lw0pE`T1Vr8Mlqf1NhU=NF+#M(<?>tAP-M(s9~Q+LW5xZ)iOJ
z1(#je@5p6<(pG|a2{2uPbr}1k+3|h7!c&*6_haZcaoBWik=N?>@fi;aP7S7@xAUHE
z*hn#x0M}eWpyz53`!jsehk_=6+;mtHtYVJ6*#Bs${WS;Y4k*=@q6a2jE}Ldvd@0RS
zxX`!b5Q@(M9e<nGvuXeIDi1XYGOUDU3@^1#Bu$|w%gO8o0Z1W^A=k=e9l<Uh;Sqp1
z8i&!RJPbz&i52oUXz)iA^#zypg;&{6f8o|vY^a?TU*Mqj<O!tQ(4gA>0b9np0*xXq
zOmUzs5|0}@2Q>f4|3$1sI>jOXD0tKvk4p3lRY@W&oln6`bg?^p6J>&7izET9lOlGX
zab=n`!tbc^C|HpyPT>Uu^0LO)H)a$kVN8djN0gI8?-Sf1KJfI+?yp3OdW5L%Xo^b`
zM-xA0ssWRA8Cb_r!LI=Mg}x9d6v2pyq`XmuCbQIADUu&UM+(y3T?u70KO-A&|4XT{
zLZAkCO1+p6VAp9;8U0(41|7~VXmgnd1BDA4Z>1L}mJ(G#e%vx-V`ztQzJc+0b<0!o
zFO`x1!Z6fdkiXQ2oeVkK#3I=(r&9fodAGTn-`|gqSV3Sd4(2M&Nn#8MW1JV>rY2*e
zp^1L`GEBZQ<LudE;LUik`h&J}DL4D?=6h90rh9H>fJHdqpb+Nd(mlJ4WVxX<bq^M;
zyM_=d3RTQ)iMz%cmdV+}lqZw2nN`j3xL01`Ezh<wD~f9gAGyb~x=)01b|e#61{nrH
zKx~gN>MC9@+r12TU!qw#5sgwj-wc}Q4jdCPPT{ETF?@Uj>Nt8%IAvk(o0faQv<++d
z^?{2ephHKDBrzhm2l<ch4!_(jO(M-W9#2z)+`0|@iO=eSl!JeuY{g%sY~$BZHxBn*
z-;ZT3OJ)ZF1r*E&@alV7`<r$>OkIhqLVJ^fhW2TD{@?xA_z1IGCgR-Mf!ATb5BBTW
z<>EuEG9#_MtNM2?NFkdi`!x|invBmdf}BIi01*t0GdJHs_i+SZoI-BAG8E|ROq3vP
z)j<=o%JEUO_Grn7S~%HV8Wa8z@6Wh1y7J9Q!l>En-QgU_Xmy8*^8Q#kxl~)->TA(v
zef4ykvNXkEO(it9N^k|u9A#!R=ozZMO&PvT-a!#AIvk@yg9>dq<99g@HJO}R_J^FC
zBn${l$A3ZpONaA}Hp2G5WVV9>0TKG2WM-Dsf=R<Og5z@BI%8^1l&l0rKrR-5!bAlD
zv8VZGA^&e7B!JP(-o(u<Pshese<bN!Ham;U*SF1Lqe;Nnejn^Iou#eeSWOTFM~*YS
zF$rl}+c#N~a4s?nrHxy(V-O`CIo=ozG}t%-JfzbcE_g$sV-R)x26cU=$z&r`AP9lP
z9%O7R@M|Y$VfqXw>QmWE$xFjS!((M_MX8>^?*%zX2k@Xy$a~*t`>n;%zt)IZVEq<~
z$RxOMPxD>j_Q8hmw|rme{S85It?&?zz~@bM$b^9G{?s3TV8Q=tjAaFXEeu^N=8ZyX
z40~c_xY(@6`|CihpJU|>Ln1%kpy&^U(F}GKPNAjbhXuMv5@>(yYKiigyZ>OGMJ%P6
zN9rD0KLEWk!=(zRo}03Q@+Ww1$x(hyc9g7A%x$VaKU2#3UIk@}$Fg)IW%)%Wof>;q
z)dV}iqeWM|E{}rB?0kv%n5nObtjBU?8ZOOJiT;=?#hpXeQ3kB91nr7!no-pXBb$a>
z7i04gJV$ozM6Q2LI&Ob%<%B**Zh2eH^OS$-D*&{gUcDd7rb%0h4Ppuv|5*CM8+@|H
z5~qGbwVz(ilVPn<L$hK*Cy+<a=M>-I!lIP%bdt88T^TJug8iaNclGU<zqLa%g)&%$
zC@QnjV&9nGaTMZE(~ClML0XLzGrEN-=H?7`G$hJeKE)$sVk*R?SrC<r>|UAFJt|9q
z96;UBx%57ZCC@F?B!Ie&(}=YOZsx+anhH%RudwPi=BCupCc^yN;saDfMU0y8boIs7
zpk`aQh{3}FhRt$rl*0xyw$*YLcH|(c?8af)PKtR^_J`a|oAvZ`_L{lb<PQ(NP!=|`
zU4@X(*r=H;=54(Ymg=>dYNPFr*2X%M5x^>k$K`6R_9iuS%>}$6YR!#e*x(9F^Y)fT
zFJ<OW&7}7b6&1aWQUMv9;>8NQ5QCBlJJ?pKkf<AM2K}VYu3z6ch?2jn9ezA&Ntj))
zTsIoqt=BlhL{t%MYKD`R)n0u{r1J1$BT9L3hIwYy#&?5Hez2_ikNUV+OtWJUumCRC
z9+dez80;6L`XCCWsT-ve^;9R_p6FxRvSk4`%j>;nIXHUd&=BF(MGOOXAI9`0fqW_X
z;!=^x<^JJaZOxT6?Q(J8R_XS*_D(i!;4!rv3WyX(?eL!^JdCE1GIXA;nG^FHq?vlj
zk{WZ5s?kVJd_$`1_cg{ZiIR$V=z!DI12(eSSO-FRfl%V?SoULOtY-@HdHbTJ2|SON
zSp-@bvu$}3baxB7TUSy?$P3Kk6b}utoD7@wj_IJYb6LpnoG}AYeTX|~Si6l`^agE?
zPUQyM^{XM?;R!Gr(MV@dYC|j>=}a4nQ1H(1dPf-DnNK@BNBHh2obBYi34l?apkiBj
zQ3xy+A}Y!pcrGQI2#}4{3KJemmHleLygC|QH<eq6(Eij1a#5+It~%z20~N~tV5Ft+
z>AH2zN-TxjXuigz$H+A2C3G?ygw13v>_}Q)=jIGy(J;k;GZ)u$c9OXKm!Zk4L{=it
zOtz-}!cADTgcd@Ua}TknHh?>i=Ah>2U!GV}D;)Qje1rwu#P2Z<EZYlpNj|jDhbjtl
z?#{q-eR>_|vpx0h50+0zWP@{TNcP;s0<oRpWEa61Vt_-IF&H3@EZ3l_hDCk6*Y4nY
zy|pQ#=sP+w_sd!4w*zcZIhCqI?X}&t3IwxZB6tj~n#-OJ7a?;!fM6(aMryTuoh!#A
zUHmc?Bfe6#tV$?7-Dz+C-?>?A5KD4E$zWB(1)gq8MCVzJTr2npH)Wk9bQYzkJ0{|s
zfSgN(g&S=+JF@WcLr9q_Raf|}Xg&C?AUuSv8p+*(Yw?O;hFO?VzK%Fb24G9H&7NO}
zk}^N~6=L#03rmRt;CE-Jdj+sve<pD)&d#H}gO6jwQCiy*8#Sqd#K4sWh2qa0d=$(O
zb9vKZVwgJ|ZNwH!@0~iHf#`Z|&6fNAAj2{6Dz$^8yJRd;?wD1KF@p}8fFkCw6mev*
zidC$SM2oh_3D-4EU%|U&b)`vn#GxZxBbH68v$QJKr2tYNFmYioL5~@S;~J;x`?=Qw
z9j>P_3Vq$BS;uyy=h{ocMJ=^Ot%dEH;=h@gb8IW-IB*TzqHV`{AfTZAvjsWQMAAOx
zrK8>Xt0X!Oi*?q+V4B^hE@UY}2NQvxD%I{*c_t6IMd3vi=ib29v~BMJnxMlYzrT@y
zE!Ic%YM!YIz>0zJLuX|pr;SGF2?a2lx9c+nk@y`MiuEzQTDukma~(qgw+cq`LG8o{
zmG@7w2nz@&B6;zCAiNjq+mDAnAirig5-cQOOWYrrju?**(T<FEn&naYVSEW{g4<9a
zH`WMXTf%JghI*M+^;p=L<rwmt`T9$`P#faIk4+l`?37&SZhuE^=$5v;HM%~M0YAk{
zMX#HT$x#*1q4e}(ifwvC9wd|57&sO9QDP~gy@03$BW$!*>Nszhb!$iEKz`Z;n+LWu
zM3sRu6IuFr$w7e;h6QO->}chMx_INTlVMSY5e5SOMoge~?tSG;Q&%lpRUfPI_0Zap
zi`WZ*PJ%Ms-q8R3q;BeBFx79QY`MbqGQCMvEI*Oze3`^7isChyBns#+IESY?9A&sT
z6y^2m)n>f92FQbl3RAk1EMViOCwMX^aul=@+Je9^I`v`2Z<zCc$|%U(p?HRc3L5Y&
z(moX=EmkyVxzbFrOw>W<Vr_Q*H;M(ZW^n@q40QBz3KYw_MAt12jI_+r7EkaLmOP1j
zXzzh*{H(eh>lVuCYzn}(n4CvyE+on+*XzbWTn({Mq&|Lh!8xIr6BWqd4Y`+e(;ED!
z8}OY%YYdEKpz)y7h4TdWYpcv~rcd%u#YpQ&4aHmW`#!ia=FXQ$<cC3BMsl4ua_j?)
zZnl?-<(V1w_~~s$trR8uuAzE{!Je|Cadu_iW$^16^xMU{bE+w}^*K%BkMi+eqJ{hm
zwe0TY(BEPy7b`BS-8p4?duFAD#+923{@cBed7IRMb-tb-A(}u`E`5uFpU}nF0McyV
z&-9Ke!KQ8bhI|}lqjtN(hDzs2EY5$^-Y7&m`SYMp>k<}R8A9V=i7a-r@I|I}1Cc2k
z$Hr64_0FCw9RBM@Yp*q6;_q^1fy<Q)Pz)<JprS1mX|phy&!vu?pra-hA^@U^S->4P
z(bpznR@&%Kclg7aE87k#9EDJzM<vy_K2}P^Iry$;^O)#S5?Bm^$T56<G#8+2+bO`I
z!TNJ6u=fjLaIBDk;6*DeIKu4%2I<H6xe+d97sZV*z0c<0_I>=(NYXL?PS6m%!s!P8
zt=)MxPIKMf7}{!W6SJd~s_shuy$C;q9?PW)AF(x#TrcHdIgSkro4<K8*Sh?p0XY}>
zahz;Q+4qLXxHZRNVdh4*uK=JD{PrYdb?~euzuzcniLv0(g_gGwGYE^SvMQq(|5*~a
zM``!z@O|HDALpbIFaZACba;zWvX7U2?e%Vl;>vU2y79w%@?+mY5M-Ba+-LBhC$x5!
zFcS>v<UlbVK8Mh2-|<E3zB2%cCbcH~3d6xr=Uv3Q_wH5+=3Ymhjvnyi(4JH(2={uF
zux@v%G2-j>eT<7Aqj-Lc%i2_M#QP&@Z40Tl^UCJviNwemWb{X@_1W0?NfRtjkV@Qf
z0QDZ+AlluNNsDoNPn~3VNdI7_u9L;D&6vjS<Hn%&h6=1h&*Gm%hdCIRVWR=AMCD+;
z+%{Z_q!z#A4pRJB8dm{Wch3jtsQQW_GMFM7zw{a!uu|;&IW16VqA_YQ=RrS@JI4<M
z(&VjDY@$cpt0XS(c}vjo?mkrAQwoNc1*l1%*;Q{v0)@&RsTKW#>B*~}X_~?M1gFOf
zyGLns1g)gx_<D}V>sIJxX9|0&nusXS)pfO3V_YTlcVb{ylxhIaP@laOTXBOyLN<&V
z0}8fXRSSA4TB+swnqR~xi?rXWo)~KvS)?9PCHbg2E8Y(ISA5?Gg7jsK$#r$jeMn0Y
zi*hLEt4TBVTVD2-7EFru>rN7p(dASs126pY#;EcVXcrBLbS{FM&(Nk|ZHJ&wKXJ57
z$(D@K%pBMVM==5Xad7u*>(NGsq&;$zuMG$V#Smi)v}DGU-YpX}))}Vm(lors^7a{&
zVHRkf(o{u@;f$T2SW^m-6NbabD&K*Se8)Ub<5L~#JHuQ@V)`_IUmOoObtyuJzC1uY
zH`mN`+83e`>x<(dBxj+`Zf2Z+YoYi8u_~*%k~8prX<dMIcU-TW5U6`(_b4-#K=F8f
z+twM~XSZE`EA?nCnsX9Y|FgRfn~n1IDITJWBb}?m@#-d;tN{G$(S$4)v?DV9kOF3|
z^2tAMG#oP{W)tr16@jA*hq*dIA!gKTiRJsY2!9fc<AE$A%~r8OA*k{3MftTr1F4Dy
z6MEih>rVh``3XKSVW@?^J@^79zF=4l5r1YsRur~&`VroB>cy&XzE=IajU9avpDm28
zj?_Fcl8^d85er3&g)_fVA~K`RE_bu$?gYe=Bb7^&u<HJ3)jOs~A|EPiQesD^wJ+LS
zF+V9(aC&wCXxAJ2XIJCNB>rdPA|y#{y*qP-Bnd!Gf@yZk>oc?|SUZ1E4fJcD>O|q7
za>m?fsDnG<v?utqFUhLxDNkXBs&JlX=J9P!4*rQ+Kux;~2a19InGNmZj-Ej=zffRl
z4#xwiw$C%G{A6>se3uJ6-GJS`hbSXZY5s#`Mw*4V53xznIp@qb*zj3J<d!pqWK8JN
zo(}Nl@6WpH+ylYn)GQ0?M2b0!38XK(O<(q<W$;=?{lt&>_g=+I`L|{AQdrWAXd}y3
zXs4q$<%((|qq6JC8WPVXH5ta?+pl4KsQVHAN)6gY$o+7}48I;a3O+6xm>PS9{0z4u
z8s^ywr(LFNWFp&5?uF9bmsRuz_4(0@bP713{r52%w8v15Dkt5wKP@i(HDzT|ah~Rp
z#xKnPWCRYw(Fju;{OQFsQ=QtL`3Mfo?$-ASjPO&R{ITCB`mOWi))ynZxa{?$HgoUn
zrIFU1ea@i{sa&Bw8;8;@I0?Jc+&z0y>hOk><Em$=W8N^#OL90A%?(6$nFS&zR$+ki
z))X99F1Mq=(QT5^4JRC<zp<xxKk~=Ma(SkWd4L5m@kYpUMya4Z<jwa@^aFHF@b$8M
zfi!&g*;~N1V~QS<`U3@@Ja4b^v~@BXKb~ufNtZFH$i+EUC@<CSf<vs>9VBK1CRdIG
zzr2tP`Yw)=jVb&)7os6i>9}tF$P7SKXg2JsxuNruT+gWTYzo#rmv^2Ha$@;C-NUJA
z`c@2=Hm^^`{iAn^&S`6t<Z({zM7>(}Cj-mO&i*a8)zq2N#G9Y5n#CFdwhw-*qGxZZ
zNnM(8zlm<JcMs^t9s~l%>YGE%88jxU7}B9R>4}Pb%bmOYjSKHY&Il~N#SFlVf}YJQ
zEPU+9AOPD9{rANMT9aCS!066cpoLI24l5oWf6Sy&aJ}<!Rg<8-Y<&*%c4dxjZ~2vo
zA;gf)BM{aD%SokpOX5#_|Ik~fGssXCI`@2_(9S`=liGq8G*kaE!<W)<vsaW={}Ad<
zo7_E9%ik~be2oU&PpL(pG($j1z?x`dT5NR${j{!Z-zz;|dg5dH6W>G;prH5R4ct54
zv;}C%13Kdhn%DLscVV*2`d8L}HwNH#CotTsmd~xeqwHd>;uu#x?lu{^uA_34rE%FR
zynUIf6dY*pz}Pb`BjB_o0*+*i7sCp{#4z!^di6|YLhID}TojNXwggC0aI1~*8j1U=
zu+dz3_z{LnOTRAH&r7LMCOm9*eq1SSI_Ia!k!t7D50ntNBN;s)+o2?CR{kp>@Csx1
zQ)vMxbl_TN5GTYkC1@275IK5J_VMHPfHhk%*`_tDi*I<4-lmOEZJ#7L)$B~Os(fJZ
ziLf5qYiEontFR1G6a>Up8vXJ^m(XNqBQM8%yT5%yI<>5`tVdMr<bGYKX&=aK;oF$9
zKb<xIR{G3<b5nd78q9m|H}Fa~xtbpTQ?QI?6V(a|4$J4)n1>Z?Ma18!WMXUbM(oKC
z;dZB286@@4LBTktO`7{TPx=n60%s?MqGVF3J!YkkRp5-(oFLp-Fef-GIMA1Kz-ZE+
z^2PWfK$zE)*Ad%4*4&@_g>ls{GC{UsH1VBtRsV2w*TUz5a9(c#AUM}VqcOZc{t{}Q
z)l))30Q)YS{P-uKsQ!(IC{ylj@l$@CBLKqH_0*Px(ZAC%QDr+I)X|44h>=_GVQDL<
z4_ZUmo>_k~$>~g*W-pu59pngseFrfKRv?X^Ros44k2M#HuFPge2y~ym1e`8@zrDZX
z1+it${6rbTxf+Q4u{P`iM#ah<We-W?{oy$|Y{M{@$!&L#+n3M9QYAJjuRp#=$_U^v
z!$<q=x-pCa_Rq>uniH>J0GIE^&45qp9n{#r-B^*?(iTG^2_GN|*gYBPo&T~Vlmu#}
z*|gG|0m(X<X?;f`nLY-qsn7jbl}TYcZfB-kcQTG$fbp43FusaVw7NO_6tF^^xqACd
zou`jK&yF?7Ll54@`)LPZPyyZfwE&KK@BQ}x!#dZC^!wsHqZ)zdh7+7@i%)ULn0?#a
zmLT>lf9)vPgR<p~8rvT_1okFOFFM>I#p;iaZG3%9(OdnP7<3dU73W$IDw?eD<2KgJ
zgs$dS;DxRo#X3Co78@wp8O1S^s%D;SGmJHnA*{?c`?z&>9W-!U%;UfK;Q&jx83Jb3
z<CY9t!wkL#P0T;9C9$nM1i{)FwnX}ayD@J_to8*h$9q1yB~JmxAEEP}#ny7^gB8OV
zLnFKn{@H)JLq61M_&|U2h>b3lHt80xjzvpFLl&juOp9VuGlG$B>*4XVP8auhtDuO8
zkdxIMcVp72m|D}oJ`=-EkpdQN+6j_vQy9uRIr%4Vuhim#wc9F~vFf6&qsKVtbT8G)
zx$(=4bjY4EAeZb!t&n>8lVi<`|G-><8Q?Y)%$A97go3&2ZX%vZ5KUO(ivu{k5hYD8
zz1rs+;`5oLXEx5CwAg1$w>~km1qa@4`lu4rlUw7+t%=~_RqG0~uK-`%;1Ngr!x_&g
z@D45*CkRQ4ie@*I(+Iil*Cz_*oXmT_874~CT5A<r9DjLUb9U7fd%#^^GA}wMDfVs-
z2nl=q7)u&}abGBqCu$lV9-=<??2KJ;wh_H>w@rquZ|{(`3OhTiU%FWrJ(XI|Icw^M
z(FAMEe#t9+)LvXHG-_UOG=WC&Y0>+|{%_lO{hyx|`S-&Cq7>rGf7`|yyJ~nE=--Z<
zIpG#)s?yZxy26{dpcEQ(ur_vj#JIS!6zJmBvlN{On~dEZ8^V8qf^W+ieP=04SVp{L
zq8?=dOIhD!-@Xetc?&L*0<Wln?y%ehDHEMsuUl^ai>q^L4>Q`fa2m6*Z6}RwJ85h*
zww-*jZQE93+qTWdR&%;9&c)vUVLi`WbBr<H(S6-<@@I<@06w96X<tS~LG4%z&<EzD
zBoo=jvTS;}P)~qcQ`Cf3B6Wt0)}T3xD8o&`>0WJ$0(TxqLxS^PB(X3S47h2m_CvjB
zB7?Uy=zA>A7`#0R<u9Fo!X_(bQd5I-sj19T^7HBNl=l1$IDfAUGubV<@alD+d!g&A
zR6=y%K&uB6=sgWZTrO2?cm?UB*!K3`1p&*hm%F?JM~lEW@Eo`XyA)#H^W<<Vr#{!A
z<n{T08?%=H5n6hP+QDqitBpIrhY62vT{Yy2$suqh%b;fxUTwSBVR3J%BG1nW>X!R2
z;o7Nr!cluI)=i!ozV4x|SQ56Da&V@1u$d0BagE$bBP#08#J&lWbU)&!rc7e3I~{2p
zv><I5j5ENP5^J*hkoi{<l5`8jtD~;NPe+#)=|0+m(<4rpMdeHlo8pY?#FMp*v0XX$
zjfun3VY}2pM*}a0dh^mm`X#*c1hak>JsLOVU5L%K0_>gq*5Ae$T{uIB)?>`=$!3b6
zTBrT0a5kLQ{}wuon7oC4YIu}NA+T$WH1WB9m@J^_w9R9wH!9dFjqL{|-}QX`l~Cqh
zn3l`wDa!&IM_uY*vogsvuKP^?d#mjpm=4Dc@jtCVC0q1*SB`!Yjhs9C?}@n`Bt1Fp
zV*T}kFyfM_3%2|Uu2jB~*Q?mAgIp_l{N=_`YnkiB@F>4nE!Io3cK)#Tp1hpwR^E8&
zT?YWh!J(*VRBJrQ#MaIz|88r^64~8Sf%j9(dW31rMA=;Cqxnz1x874+v$66THzFs?
z!>mmj$Zc>4#u}6J=kL*yd?vE@kl`P%9rj6onBH0hFL0v6AGkHz0fhXAUYw?;=8zjO
z^d-4w1n#wK>L)1HeTl&vRN_xr_q^N)2}U5M@`63zK0QO~5NWEM<H9|cR9N4jsPy)#
zlr!ls%DUT+1wNZSms8{GZIL7l5&HOAgGs69mavKZ+$_X7B!A;#YPAuAxX)mQcYT-(
zj-Ssw#Gn4(KEe$@idT!nS@LZfar<N>sa;7=N$n)3-j=$*Wn9dn+^T7noK(ucN@W9%
z47Md5UMq809N9y}eC0a>Qbri^=ec`jhgpjp1}K*=;i2ZRh78$@XK2@j9-?26bFbfh
z@asnq(O!^{o6ec_1i{t-BvJ{?!ebL+_<HCNO)SllUs>4F<Jcsaq<7dT6{IrPzZcv!
z(J5N!8B0Z(*b)m^$t%9C&ys_wp`Ixe;1<+aWvGmuigs2#Zl84@kk5KwBqHFg3r=8e
z6vvKQPi~ejnw^`&be7D9wMBU2Ggfdg>he>?3E%7gxBrt9P`#0#IO-(?Y&j{5p?zJ-
zoyysAuntO>Ym}of{o_W6edLMd73CSc8TRBgfo^1GKkPqlyF2|l6F6ky&M27V<UfN)
zoaFT5=6_Lt*+m^#+h|HG%0}ZkyW;BTaeB(y;p%vvyU+E7w8tR_lVHLr-fQyb@2p&8
zQR)nRPJZzBM|4>3#Ts@2vRIH*{iygOb~`f|oexMToOL4dkot;ZCLlfShXg?hY3*`P
zTPqH5L{fWfRTDiz{0lCUolF#xtkXAcM2ktfHj6s;R%@uDQE#%2H2!*o^r=V~dxjJ1
z*vlm3mzr}qwm%(ZJYWoF$kB!uSiyQpxu?wIMjE1nUQT&lbxnl>89fa6JIuk?p70+P
z2a>f0k(R0`6gy|9hk8(GZh+=nqjC41XK@MNgbS8@$^1~qzE!+aQSJtzD1j0Bk(-$|
zIr8diKlRD6&y3?Zcm&d@o7{?N805=PMbXQz`|ck-X(-7=>iD_LI;WHRBk&Snp1-|3
z*rJ%TI6<ZiCOg=GnIv_(A!lnd+DhhKcZ3nHn0$RHu^8&f)3l=(cqhDjjoJFq`k)JL
zTYI_#3K4y;<5bHO-2{RWShcgdKep$1xwHe?cr6a0#M`!`_M98Tv{boZ6@A2YB?W9;
z@+4z%pTK9Yz4LQWbF_bqEOXG$h&N7`g{+SXib~_AI!z^@sQIk?xWtl+Y%QQ@pG+Te
z#NOQ1_IQ|ipgi?)1C3m%i&MR*__)kGSg}*n>{JcYq$S+T?WWqsw-Zc81u)EL(2|Qe
zE*ENq>O|eRvg$TDIrS~W6eq@WWJy@}de}C{sV=?BxxQjmts0_MjZPrh&%mFq+Db0j
z*{`b?#d`s44Rzg7b12!*45f?JVHY3XgBpKIG8)Eh@9}$9YVy|DB1;jQpZ`>%?2%u`
zo@dR7o}5LTW!8rFk;w@8hSLEJ#ygD5dMC(k4{A4ur<T2SbHiw1m|>O9-M_Op%TXtJ
zULnG0+8z1?5+54IVAqFLQOMJ0QAYYi`rYaUf=?M3=rOV;)aXQK=exsgN0BHYB&p}+
z{W(IbecGka*X=1FDGA{f(M{ERjkb^a=EqxXH_MVWM5r;8+Zxzouy3bwqYx(>0;(s*
zxJ^-slyA3(pMbR%MJkp+QnW0|Cif+g#}`^&X!ib0=#DqIrx@rj#SBf|%`BpA@P5zH
z8g0(csXG5dH4tJRx<Lrt(cgr?PS^uc>1cRVzR>=Rks$x(?T1hO*Z<rj#o8-OQvWk$
z|M`r403|S_3FEH4l*~V(wcYrDw;{bRDg_PNz^Nw%4YO(xh7U!1o1ozufGX@>pJPMb
zKvq;rmqeaa;-vxGL|5#bA5=U$i^A0>m`4xeb!P4Sbk>wj%`(~TYJTzextmh6Az11p
z^E%V}*5^6L>#FS}=RViz>bL&aloKP$9L--P>Lp+fa6c6|>)}29Y%%vOpZ#(l6(e*%
zb$Clo^_A<no&Uw^A0lP=l#nXJYg{Mtkfp~x&H#S~Hfq#jjy6{Yo9b!)-D|KHuCJ<G
zhoaT2T&Ko9I26ONIMj!CL!|Z=Z*CIZTD2hkB>#I(ZJque1c6pR9G~+y#=BW<@0c__
zx(vWc^}G8i0>8rE{m?V$93Ar1&pEpL+04$(fu&AiRyNp`3Z0YuC7o-M+uDG<e?!dk
z)TLYTD49TS2s2!)62jznKPGMGu!#CR6iw|=DkJh#F%3s}t%#(h+6#03*-?Q7@)UYO
z+fUXD(FK|e_TUxT&6+z%M4LU+{C8CvH+O)lUnrTQqEqTfUg#3V^zv!eWwY?k6!9~u
zrEIg(UNY`Y<x1V7QkW8b`*^R?L-6QQc=&s8t&)4`_)0~m%+ZC)vg$UyGagz;s4BY(
z!A}p3BjjXKnrkJGS`92!ca=S?M2x7RC}V9Eh2ki*g|>@mVm^Gfm67L>0tdcME^L5M
z9;aNzjLZbb!1&JJd3U$HiOXnkax~9&ScvZWdV6uJvD#~8`Dt6Rt`yfg+v~x{^Os62
z0!PTCF&X>jq{=czY_Tk#sqIpsg*k@VUGtOO>g;w0E!yVx^q>%w5*yRh`sRj{s+|{A
zQ)M++1AhOn*_!Ioj*hNsM4mtAaIV1b=ZELZb68hbNRi7lO~U^DBXrrn+fObRk<35Z
z3UBue9b$sBZx8Jc?0+IkL=S&T@x}j0h|YFI$)Le<yC{TAgzBmmXGRYn&_WNlcq(J0
zI2o9P8bdD+JdHJij4~C)>e_5jU5^sQ?RWrBlNO2JOS3IWRNUR~Uz;ewb>#+%A(%H)
z#f*>}gUf$=h7{&RH=%2%XW87=5vxQGMqNFe+LEr7UdQ0{&)o{~wW}(K53W*hPsKxj
zcb%4P_K&!SJgE1n6E@F~N>M+__H-=p7-Cg!0~t6J^4_Sv-V}}@Pk`rFAW`sEbvXNh
z(+Tkc7ZdOcU)DHwSx45lTiFwEy=H=(IzB_&OKONKN4y&1rk2|a>R+LS$8yQu@}F6M
z=a@Nt*nwy;Ydk=!h3@6O`zq_z)RHP|gGR!OfG3?VIcCGYiLvY}3bEOW3$PX#f^V$v
z;V_?w9>nDkEeJ^}JKd|BC6ua)Lmy+XE}E2_OyR4vrzcwXHJFtQlcED^Mz64=(#4re
zB<hK>nG-HT5O@I4>W&2w5fYf>KjuTj^$+H?#7Pes4$85vIQ523WC{t$(+TdR!d#gX
z>-!e<5Cs^`etP%!OIM=fG2glrVR4w*`Rp9I(FixK(tP5TNORc#=_E7$4h-Y=y*W+k
zl9@j`^J9(L$xtRBXiR~?`VT4cVnpoEu~W2nmxA3AG<I}(+D?VNPgufHCW$l*1&7Iq
z@?n8eKO}A}mParM?$Y2i8uwaN1u@7{5<@Yi5e1F}KR>e{9FXooD*^SyXgoG8In2vd
zwy_A~#_d(@k~Q>d9JC<_3tCBkm?z^obvlV+87<(&>a`2mpnQR;xJgaDAsh<0%7*M@
z15=@nR?4*+%0lEmHjY@@9pMBA8-haZ0@!R1586ZB0%iGLlhM&+$)dosGFzNaE}1O-
zP3_>3l$6LZnkot+XMi_+;RSYZ%-$eFSyv@MVzwElzOJ>%z1m-QoR+fGk=2dY1pRZ~
zohG-Hfs2#G78D2!gia-=W$cVA&o}p+SZY3VsW=2t^ANsucAQ1JjnRrbvPJ5|*%H%N
ze1VJ>80N5iF!7Wu^g5H$R+9M{nuFud%5>W_%yByfyHjvW+^u>LdvAjS1R(xf(0}H#
z{v{(^eo=nN8P3J%nz=D!d&Be5D<pN6EZjIlqS=6l(gN;~pM}c?a~Dp(w<{Nxo>~}~
z46>pkz{LOCYFPjB5(-TtFD{Z{yJlG|oT<yz&s@Up<lkm{rw;4ycCd9rNtD9lFPw%x
z#0)>*Va6{vwiT<IN|I*f`p50xvDp1hiu)p;+bq5P{O}X+Q2_Gh7*F|L<f(KRZ%b|i
zKTLFp&45|mgU}aR909tF+Pf9jzubVxfy7HDtU$%BlCSK+$ZK;|izv#Uv0xnAI!z}3
zPfr>o<TI{x`84rXq0^_Jeg(@9dSB^-($@`H_YC}n7i?eQgKOxG+;?OcoLg=-HLZpC
zvZ%xHKhs2zAqls0e#1LQW@1iw;Z#4028{Mf`~ZtFv~%M)`@2BR11A4Q)B-MQ`OmD=
z=*VLaR*hRwYYq`+ao5bnTFfCBuOqqXZ6X)wv|B-8g_0=0)kI%$fe~`WeVGHySG0va
zn+wm5z%6x%H|6~w_&z?FV9dXvV4b{(VtC92WBaD5e<5-B_Zq)pWExMHfkc9;OSwVy
z_X0l54LtPjIG~w@kSHA*DG|L9{?4`oieURX)|d+7wso}O8$X2$-OfgEdIlM-KKTCf
zN6~)YA_8s6S6zmQ26}5j+!NObky**-EWI;kR{f^+JIGp$Qj$O4_ftwQeeSIM`fDve
zaC*MKKR(-(^@tvDyi9?1|CwJCg9TF-R0I%N@vx%V|HKUTBV4#Bb2$96ZM1zxQG<d0
zLBFKs0EWWxnEk3qYqX+b01V=#_u0j(5MgkDl{=FlkFf87m_x-IfZ?{d_FeJQvf}=k
zZMu_FC3a}kRRizdnSZfCK5dX^{nJ<(VjBC$QqdMcf|6RAcgX;q8qpKNSa&%(SO!pz
zmQnWq2b(c{1;q5!4+!sgB-O>3rR;sK<~^omr5wp?OsMEhAS?(=bMc_|KrgcSOILA8
zal2i)CmrS5n){rG?08?f=u$><a#6YA@)kG}qOM!?l$|2CabfEz2}3!F`ib<<UYB0Q
zns?Dl$2kl~dx!EG{NRd?L6xNl*nk8UMb&R!%l7+f+y$lW(O@OsDApsoToh2j&oP_H
z;|RJO*uAZm$NlmUQ{62*DEpq?QjZVC3)Esqc5eb+I^h=;zce%qHIZE+Y<-6&)pOG+
zQmc}1<w-2Yuj6^C2b%0~!ZJH~jK1Y25%1+u3N;C8$3G4pdX4k7bKpsV(f|xB3`}VU
zWBk<M{3SiRABjx?p^<5s5NShqeLV&dlL5~Oh$m-kH3|o7W?&Dyhu7@<Z>bE)8nzRS
zR-At7_(`6UW1gH6x&I;!gFBtPfoR=zgHE7E-#}R2iNMPO<Fb=xB-9^c)R?NMpf$Nv
zL*A&YbMP_ucMAU9K^FxirUDp29`&i;<(1xf1krysBy$G6CCLAd7R-p__Zt6YbRbT=
z@mnCgRs3+DRmg(nD|8qh9x0ksTsLseU7ELQ$QZuhV&**DbSEdH^ac~Ap!|c4<ri@(
zb@6ZMy_VVCFk;K-0AC4S6RobPGQd><^9rraRAwDXbvg1Xq==uFW(SZ8Z|vW8mc9X6
zWX&%j|2~>q!a_GRuh~-5CidJIch{5EuLZaYx!fq2H4<k1NB{|=w>^_^XYBC*Vf|F^
zZ4%GMQ&K&a%6$3C_cd^A5G84?@6Gt(W`X?cPZ~B)8#o>Ovgd44&nTU%@a;sN*pdy)
zo_wCs9orQ_1f_(FQv{$U_WdhA%(mpdEC$}F-JkccRQnX^tp!C1#wQD7*5)C6^X12I
z?j$Y%d!TR<Ef9EX1~<%qt0J~TsaJXD)$utLsO)>|3i-8_@I^2`+mqTI_9T<{hlqpg
zmcF+9sQnF9#W4Wy*P*vK^G@h;Amf}EYoyx3=joEhp9c^=sxLrGg`vf44HY(NG)J+|
z|F?U2U_kV$f4xSVN0tuQufwaVu{g&Bm6DqFM3r%*Zb*E@1)0OknrZ<loP#~BkZHOS
z7WZL%@+llY&xCROrpwd8^z~nHXGs}q@h|U7T0hTFw4_t#DJ%<YEmO3h>fV29iR<Ur
z7C_OTT0OXUtDXaSc9QqJB;-k}Iy>O0Y;K6h1VcKwT!0*Za171EDtI+fsc@_|X>g|s
zNk=>k9Zi<K2I|X~%%mp2yRhf3)Wi?YXgGeNic0Llh>Z0E6-{Lz%bU&j#34iXzzv_W
z2D_9C?6=D=)@M#tf14cpSP_CZZ%J}Xf0&xQpY15NS`vU$89J3k;ZakLWw|a+-q1Sf
zNppMF#yOe1wDEPAbLJ@w6t{^&-U#_r;o65=9~Hwp-A@0E@<UTJ1(+51OhkrRxX-;p
zLJxRNWl|x8qjSdih{c{DLQY?#{47@@R604wRi0Q=d_}o3jg3ufzuKG9*;#^^o??&O
zi1qzrq6kn!S35Dg51-vpEsjO=1I9qc9`R2T_9s0TCtAP@_FD|X{`GvLhKG*ra1+$0
ztSie1fripYy$!mXQ)1;4cy?<3edgwYb6+nfJ$CP~%!s*W%T9Lwze$my)#DUZu~&yK
z7qJ7AN`nnr?dTyEa(-zSxRahgOrdVV##hT;ZUi{*;V7JG*`2L3_e|89njiIM%qN6e
zoWN)$=SN<ZHaKYU?RL0FEoW8SP1EyL)jp~vkJ)LeuHk9%XnD?v6d8^?z2rcd`xjwb
zP3#6$Xw6o1Ql9<fcv8oAl3`hNcHS3~Rej4~aZcZH$x!K`6-iymEy;O<|BY81Lm_6(
zDG#WVSg*Wlu`E(dw`{M(=!LMqBr~<2t0;Ro5Jw>GGYUMy)A2`cmpuC`d$*xH`Q(~S
z)I#_{A-VTwlQ$upw&Un*STJ3R3SNO8*A%K2k*2wUtpq|}{&)nn0b`9yM^+?Z1=mk+
zO0_MZYB0qslkYW?8q|d4XFKz1B7EPGyaoaeW=>7tV37Vg8P7eR5q*+wfymh&iaDd^
zN^smWa}TmP({jw(bfT=O865K){6a@r$6BUd<&vX>eueAMk(u!?Mavj8$KykMSd*Dq
zfD8K~Hh(7ZG~pb<<_<nQ9<;@rotTwCmK--i;=>I*)x@IPgFAbF0CN<CYF=q?%>nd;
z(AwglQw8@c1&g4g+(vo)r^eALl*>f&SI|6l^EuEwmGfJSL19sOkmpcAzGQXi+8D|*
z{O+Wc_>+=gvg!>I{!pu(M$`%0DG<S^qW!A-@`soL|Nd&|btslc<LhQ&mX>K?7GHTj
zQvM5soNUybecue#S5)q-U*Q?+5f8Y)E2RhP-d<;d%}&V27sTGyiL<eVI{IET%TpXE
z_9Q@9>YMIM_Ih#lyo*G8-5Tx!Q7JQc&3id{kCsLB(^v-K>GYyTAh6-=qBd9_d;JZ>
zf|;n9nCRSF-K@|Igh^RhKzyTmRfs!n(k~K%ND*t3YMS8BZm`-tNGyn;8y9eXYW!$3
zMqZPmvu~L%04^w9_lELDnm!!7{bRXy6mDjEY|V)+ZM&FI`{|I19X)vuda{{RWW{;u
z)z$P=YlmS3&RI9);fj05mWjaGh<EoUScHh3>jL{;JR~GT$G3DRSn5}=(gp7HEHqY#
zUco3+)h4Z)IGp-hwoX*X7&WlPM#D_;p-Qswh{4%|nePeLof2(nfGsRpS@+jFDH~EH
zKqfw?rT2RmbS5(RG(G2ewd8ug-byd%ec$cK17+N-U+=r}Lss6T1j>t(yFEC2vw2Iw
z_6Ni#xo4LoD-fL1I~t!=9V^+f9}+IJu5enLUsz{PpDb(O6&l0@dJ2@1Kt9QW@J-{v
zfJ+S}<Px7~NMa-_b2iGUjign@)QP6z4L1&4wJ$g`+?@*J3Y9t9pvz%PFKR<`Lw4!{
zbfLr--ye8?F2VIKL`s&I`bDMQ*Da**C}a+D1iG<(Mt8Q+izmEo;JGTA0dn-qM-YiU
zdC%69Dn_W^mO6?n#(=7dY{xVj-mr9@FuamR5furh?Nr>3LwCUT&l7%`BDvy^JvapD
zziav5dg)nrpE`uWB6jd`6s<(S(66{zrF~Ap@p)5d-_=;V0v58xzu-S^X$nr+&V?D)
zrR*dloi#@4=zqp6e!9&MM8<D^>1h=aa6S51#7|hzeg<};xhTy+7Tt*a=$F?L`3lPE
z5H1EvfO`Cmu-Y(5j{>RS&4gCgYomh#AQ?AxwrA{VM=5(SdRmGQ^{@XdSD81*w>!Ao
zE^Iu#f9$gk8367-I&tF11y18ZLNXl87dg<N_K)TklIWkq0+^bm%Mu|#v<q%58fALH
z&?f~AgajF}!mxf57M4l>^F33_)NFZ86ZA1}T`Sgeh4zuZK0>;FEvO*+*?-w{r=VKv
zy7I4~fa>CoovB-6hvrWs{@hNE>#m*8_rJc^mup|V4?p}|UPefo`uB<Z2H@Q5JS6XS
zN6kf~`wg*$q5v6A5)ttTOo`WvCnCMk`$+ebA>PiQ&|kcp#H2B)<EH}??yXM9SN#*O
z7q-~7y|n3vs?2)PUIFe1iQVjBEA>??6YgN!qdayMy<P4ssNKP-cGZI5c9nu?b|;1;
zVejtm_{`hkZev)cwEONHh}ZEq+eF)#gYSVaf=Gl(b3hd0ZC|M7x&sVheEqlQiNie!
za&Osw7#Kp#GVUrID|p%h91+ibimh3247b>d(4{)tV2>`Tya0;=&-t@O8~@_9<Z8rH
zye;PERq>dy#jKm0ZU&?FpfQpZ56ReK>*O==^LBb3jF>gc#o7LY<_t-5SNGmbo;#^<
z0hOu}01(w}@f87R7!)t5SyWgst|&oS#Nof0i7M1+($=*nr7*CZm4);<XSyi6HN$SI
z@(>ytB1u;_bn7)KJ5|?g(C%K>6`(zmZ?%^{mh2B?bZO%s^QyQxX+2dmPhU)y<aVJc
zw#z0C;#xA7&)r3M@M<my%fCyZn3PvE*KoE)09WxYQReYXFuC?7Ggmr97Mg3XMP#zB
z`{8&o-bx{nd9@~7#kxE#gyH7lvN1=kma!Ji5_%SvTC8gp(U~E|;^7Wqbtx){7TH4@
z%6PPM)%eTs{iIy_M^dFuq?>Y0WbPh@r!f=_dzI7$TRK=V)q~n=*Jbhb1Z;Z^k}pL;
zKq3kOk(E;kC3zM~D=V%nM<GwB#Bb;ey~WxQ*(Is9q8c9tp`33j`0+_LRwbxcc|;BE
zC{LrGYU45HdT|YH7N*RgQ?4vV8d3p2V~?XWlwfjy-VjlsTaU=Wvj2(<sOIH`;-E1f
zVTZu~2P6TrNJy@g?n85hsiF!wZBDZNXC-U*vC7lBLz_|6PA#VeDBOEO@fYqIPEx(l
zA?6-*%^bkNc84)izc6=`>{Y^chcv==$Jj}_i}rEcmIc@uiubpmdqeG@Q`yOvH5cxB
zz3^ivLx7ys7zPW(-H1R47}XFSP@?!&?3%r_1vtF~2k7rJLBt-Y!}?CW0fAVCK#4L7
zYv>vbfaWm4FCCE6Ye)Ve-*<fr1py4^qJ3Zk#QP|{WdB0A)TCO!wB+T+J9QNn6~8TU
zV#pO}60Me&OHEjlmIEfCUm-oT?kFsvv}T1Xsm%C%HAg{?RinY#c!x{(=(HA$!%@9Q
z_W|O&>ydPG*7GdYk?XF8T#5@o`qrr<tEEm#c65T3l3tRUo(6S3yOCAJ!E%kD)tJ0?
zgT(ZiLbsM}LNe3TT5-dQ9=>GLmFj_(1N!tfB;7_4`@D*F!R7SYcyAU~V9b#XjE=5$
z#U<wRH7ws+Iz)yQ!(+8y&ch!aVb^9vN_x^G^9~iWAkac_60HP=ir>zF>JWxE1bTbD
z-*lGJM!zNQiL&<S*tW693X|QLPRcR;v<X4Odn^Thbd6)K>BcMOAj91x@fRywj@hG2
zmB&N?8>X<41q^;r5qK?p|9!(x$$W6Af=xxL^h)Wn+^$-(?#icC?yce9!H7Za`z=b#
z)fc%;dBskfHbX`X8gRWpcALR5nA>SUKNV^SdM29<UuLt%UWtndSi>2pk1e}FpZV4O
zctIFCXlNo*(R!)pj?LUeLmAyYar<8S6oXODyF2uG+i*)K`xoy9Qn)ydQexLS^0|%g
zLUse>W-lZw{h(j|{AGuV+ryjGUoWa_DGp3M+_jWU#{LxVL48?ZVuHrp1S0eAwOJEw
z1l~EZrezdtl~J=4J!^!wguA+YE&H@~S-w8E4beMNS;c-SlHmRFq%0zdTM0)z&qCv9
z_Su$b53<ig57-R(6~h~jFg966ZMj`qP?=qpsHV>XnfD{{7um;S{+(3PN+@U|^rC{0
zryteC4KEJZAmTjm;Ej{IKp-W^;rZ=3l5H+9AQ#+O+|#=yKkG4R%nS*y3P3WkpyLMf
zu!lw8mX<1P@MJ=;pi3`sW4wHuZ#4$R#how95rngW-hTL=B7ZQSGi*VZDHvCBM5$m1
zF_l`3O!AftmNR?)PV^c(aJ?aH^~I|8Sd-Jc+DTD0ojwa3Bfhc}46-uJ#Hr~Efy-Iw
zNQqi3x`(RQzr=m9<{XKPUQ2a&5?S4{E;qH6&S03+A|~e!vw@<n_Uo^}dg?)LfQm_5
zN=Z=(+IlV<qXmO5l;Lvz-ARu+ykk9IFgNgdPza4q4`f!bS#ZF!re#FIr-;u9rt9>q
zZh0_Cp@#rq?^l=W#fom)@r25FtwLk>=LBI4Pd1aPoU4nkj}}^U?&^Jeb+dQ_5duG4
z*3fLz{E?tUb;wRfI(LQ^w^}2HT^CVowPAj51#S5D&+`jk{K%&g=Q%j-W9nbZ4yr<J
z#V(x<l?Xp)`cqPR4U*H(Uk@5+L>e;4{s(izp^_8u3ncj-&05|+T-Qp7?0}(k3(Z$P
zV<^h|O_w)Z=~f{s{QifoEMb7`x>|h5R?seL&;y@}u5ZGYU)KXVk<`1?4u3yeK6l`!
z)-5OGnTmnVrp)i(x$d#yUiNURMTiRFmYWe^WJh>7x?@MJ(XD6&&(q(3lBuj)_<Iw)
zlYx^14}8%>$s7r~F>yb<2`0!y$wYI-N6LbZfxQ%fR90m+Y)T>EyXtRccO$(u;y)?G
zWg!cz?hVF|Gz3D!fmv8M5;~svg;%_g1ALLnL7u0T8Bbb!pO1640*7DU{@b6PJ5oCL
z`WFqu{zoOC|9>h$B26h9U=6oy_W@EYO<k-Fn}IZhm5C%L$Y`0dyHy8oVrVgDTltsN
zu60(lU~W)`@k42trEx>S(tP1zGHc5t_dX|k?eqS5gb{?CmmNt$KBO2txD$SYnf{b&
z+~J?uOpad(FFtkPRpY+Ki2+|;E%G-<TYg~OS?4y0;g8dZjfaso@WNj^7vWsjfApB4
zYT+s0C0_Ypj~@71amCSgk%AcHQ#9XxGtThrv&Uj>JX49;f}=MDE2}}s>+49uOIu{@
zX`v!P%kfk;x|pJjS*tzL(eE|krh8Oj=+rXKCvm(d_StHq^{m}22Q%Q=+%w=%F_O#e
zQu-QY=nKMJR8Er)*bs24IAp<w9H<AM{NXW*CC<?G9*L`BZS!fGQs^&%ui+l6LW_id
z{WEGm7U50j`i&e$gAnY8JL`I$D$F_-?jjICv0+o*&7IC{p@Ks{gVA99?1xS^ILM~M
z5#LXaN|8VTFPqUC&BMKng(2>2ybozReiLTcesMW<m0y<$z_Wafl*v^X#cY>>cex`M
z6@z6I7vtlgCMELB!W3I0;7oxWQ10{4JtMrC6}QVWF<jTd*UWChtL;@7VKs~y2I1if
zk3J!Tav-l6NUrA7Ngtpk=Z?~63r!r&AbrmF6_tapqOhh&1kjTX!NPK3j{XSL_REms
zRAyPT4)T2f4hNVS&6A!J+G=NgMOOHQB6H@0&0|-R32MiXyi@-&iBjY?p21B1T=Fvu
z?!;P)$^Q4Z-xvtr%Q=jD;Xj@UADi3-!)2J>?L%^KX1yJlj&U2>L2i@GQrQolHhqp*
z6Wce)ZKPo^(z@jLX@C~SeMJ1Pmk9~dzU9ZdoVZ&~2WY`~>!>aXP_m?RczA5hmz>Q8
zf6HLETIh2A8DWtzpTtTphq*9*m(WQD);O5XVFOB|7_X~@9Pfi%O+o{a(F9Hv)&P4I
zLA4uz3%VbYH{|{0v@>a(&^f=nv!d^L?d8VxO!w8;naO*<14T$&5d2Xik9mV;5mB5@
zBNxuP0Km?I7jen!m0qY!v#{oz5&yj{<UZq-IgUxCD7%O8E?}iR<IR+DX^%gVWKln0
z&MvWUtE!!Cou5(V-kMp$nOQjFteHFemcvL2cW9B%OF!>kFE5mne~+S9q0GmaxRO|`
z$sku2_ua8NSKZt@Lbi7CjMTdV-nVzgWxjU44aiY{Zxb?IhJG#`>;KK2Y+snWA_cS$
z%W=~mJmPR%G~taH+6S`Y7ITT5S|?P~`)<>bYO`)v+_DP*voqDqb-Jahogx{CXAda3
z<+qwRx%9Cor_S7&+|>u{(Hk!7M2jm9p}F)PXGs)A4yp3mt=b25(<gTx^P<k{6r@Vo
zfa?vsz(`T74C;JasKB3-plPXQIL;v+u_9gHtK@D4EN=Y+IOlVWYS()S*faePB@6zN
z+hA_7SCVYT<E=aAkgC6}!>Q&UFxd$W#C@sbH4~!y6E2<-)^qezJl?^>>XzQ<iE~&o
z>!xHscWi#=mg@adE8sVxNK{Lpu4^}x1GZ91rp#(>t=Brs9hOq2qH!~3wl!Kj=#`Zg
z+K%NLDU62OEw%oLaxSY*u-5Q1JQzKxu_QEnc(WxkqFkRhpvW#{?uXZ8)C8>|*IT-h
zPv#KNDlHUI)GzEH@1RExPJJ)Yw1vY}FFiR*B3QVp0gIe#4pZcxvl$rPWLtI40+u!i
zq{s(&s@e9!R9Cib$rCT8(#qW{9SUddR}qL#w2@<iFaI5(BzMK?Tr-ZvuQBY5A6Cb@
zX~?2x^fOg*q1!Z~WXj1#K<r<d8ds)6Pk4FGTDgT9wqe&$@-#y}dwTUV+gQ19TCmW&
zB^zWe4CH0+)u{A04cuzjwEcRp2Rg-_NlMITvdw4&EPuw8fsIi1+faM#B!vBlb{id`
z>oA=t5vQY`)}5cXVbE!4B1bpLKtrBWKasWkkb>ukCNS0V7NwsdXoRD*a=bgYCz)8R
zn+)Oh_G*>b&X?I8Jdd}LiWY!qG-%*M_xE(d;;*+ROLpYAHmsY7?p4#S02-AI(p!F^
zCzfuU54mGCU#dVIi|vuI;Dbt4@+CuW_^@60%L_WWv`$E`=N+A)VWF8R*hD=RS!Wri
zE8R9X^K0xh$(4Y{xp5j~u!mHtMxZh|N7^*!wru}V;#_#ai594yBZw9lV09@?hIV^8
zvb0y`{cfDiFMVDw+_6s{4J@p+)x*#w9R?WwPPSGE^1{RQ;^~Kx<eAHleU+3`)+iTp
zldO%F$Zstt#V@I)JYelp!c~tl_A;p+&c(-Ix$KUpF2Zt?TGQx@q2lD#j^q{(M4oiz
zF%d^oflatoDcJh?UCI3MN#nA4Dc|%187dKp?KGxTXYL+?UW40k1Q;#G;fog0>eppj
zkSDi)`5>LeDMSDvw^&2y>dm2t-83gJ*fajg3&PKtfdf8;N+&-N!;{y*&8}%0iYlAv
z`cKn0yRC@PLsbx!+fak+L<Sd_J+lxYno&9)7S-v$t5D(GR}>a69{Ytk8pYO+&u-k+
z%x(qzE@TQJMJ*?w0{Gm<IH4pTZ_O8@`o7@lA}HteN^gHFT5z_}<B8w|R^>F@T_Vxu
zShGX8L*T0oCfH}%&mm%1jwMMm?xNWJeX<QptONNo#<RH}1ZBT+`uxLz#?==Kh4A{^
ztPNwd#mKdQ(F(lSz`9xp%_<H%*&mrJE6%hRYt5e6H!;737%<ZbC{jd#8<loEWgq;h
zM2maG7a>xMG!k;pqSR<iM|yVCKAXK5F+NbwaP`U+T?@9jalq%p6(3`<U1#b@n%5!t
zT_xW&7POF(gko0CBxCLVWX9~=Q7$>X^X&`!&z<LqOru~%@PG~-2E!(*YY5zma)XOn
z$SewR)BY;V5wL8CttAsHdl5EABVv_4TfvW^wGqmZOP4vr88J12Q-1G>iICf%BVW#E
zN_N=(%P?ax;B|zK!S#ZkMx@Axt;;rtj^&igb30F9&I*!GIu`rE>MdGGVKx!cCxC(N
z^uRe>2&`!*ukz)d^Chi9Z_T+&NPRXLQdd0H>H{Ls4%o#-=nl7Ae!=i)TiV@taSgoQ
z-B1ebMqI~)uIEAcOR@uj>_{#eXRfKO9^F5-%XpiLOzmjql!b*xM0>qgi}j(}y|G(+
zdxFp%+7sh<q&IB-fe_d;_Kee+dd>3U>noVy1NnSE1&KIID|?bv@`7-jg45SlJl571
z)0zxF4D7oiq1W1k{1ReW4mE)(I%ys3_2>(6uKB)xYe2~?G<z<l75e~zX}t0{C6dfM
zxf#;z#AJQr%WrTK$ZLKh;!U`a9%@43<BB3N7&!M84HigvEWyfeepC2?wa`u~^UoJS
z6=tRNnl-_s0wM`HPUYVU`gV@5u|B|6#<#SK0c+TnN-BaVw{{x@*Nh*wBQVAF^BT0h
zm+cgmPY@kb*=luD4Msv6QBRV{$eZZR9Vf}diz{LzI87aLxY6iY7jKt8I93zGeid$E
z2I2WQrhv_zvx=S+pXATxsVMf@qZm<&dj0SSwT8)nsY{6o6inr2=;B*V50l6z<cXJ#
z0LZh9Y;&M7Ch6k>%dUm{=8Y}rP!$7zW{)SaWc@brYM+LuuJn_wlShyIMFH=dU?=Xw
z8dWP-o`xTzwZ<);bw#a$J}}q95dY)f=Nk8ewae&+<)f-^C%N>*K+sduTi6b6WZst!
zJVyfEp%vB|yq!fK{q=Hdj#HXqrh!}r9{5Y(jiAzPcZ2v63i%}oBCyoOYz*5<W@k3N
zOL(skG^<ejx(1!!kX+cu7$)9Xpm5ueYnBpS1%lwKlrrV{MWT41kM$wrJGPrj?wS%6
z&18YDvN)m~|NV%IDse9`ottZwMTZKC=OA2Baesyu=WBddKhm(t-BAx7y>PgP33zGw
zs2J{Hd3pYT3j7)c`X3ldyIEh@{x<g2-s4hP=uS`tZtrs-{EfuAqyK9qKJd$uGVqI{
z{{0&AD^Q>9CD-T*yD+-mP?U+2o&)bhJ{*4=qw!-R&+TjnvS+{zEIL#HRMsiBfk5~*
zI~}7`ysPbIRp6YZS)F1+E7{`h9q^Vs*(YzQn#^x%<3Zjz@)nOF)LhD2{wJc4!lx*2
zG0Qp7N-d=ZC0(0DN6&XqPhPr06x*ko#3uO~X}+FbBwG|>9O-DtQag1OKodw^%bF2R
zxXgb!b11V$*gWbcquad{h>x`YVVffVa_VFMX(d6Q<wbtRvY_wjQnO<X3t)~mfROTo
zTxNLwpxniAFg#2`K&nFmrGYWJjI;NjU=w{st_klH)C}FV8mVw>^N@aYPHSE?z_KSw
z-6064WZJ)w^a^UJ(y1w?h>l7*$N4=QQ;Xj%N5f#{JQRnxqpIuL(%+m#-JYm$erEFc
zYsHK)ui`sn_J(5*{>)8&Fp!8aM}Vu}(=DHjy@<JpWyCXVxtjcGec3H&`K+w7#{G89
zYsc)(-*n+mK4MO1WyaB>j~=^W|E<xC54HhgLw423ALi#1TY5QGMBpGdDrw`Uom)s3
z8SPB}L(5UwkpyGp%-fH1lyC<VhV~>l<P(CyaCsM-F?TW(?fvV*X5jEGa_K_!1GMc!
z>p;gs4itPO3|YQrda-r3bnTmHw)5e;1RfLe<YH#MJ3O1^;GU^v`ovJ=T}Y9+*6I}7
z;thRb^91}xnLr$TlHIZBT|yQJ+a0@W#yfd%7KevBjgK}(q3`WFg$sG}ep(#wv5}nc
z;oBs=vHWF7RSD=oE8t8t-We+kH*H?M>0<&*@yO<-5|h!^0EhR~E?i@<uS;q*&abkh
zM0sZ;i+LyO6mveh4o^-gB4ZTKGel3nrf+&AyI5hqjJ6Y8XDj_Nkrm%D{0I*mlgg23
zO$WT$vdn=Z)+1FVbGVaMNK#D)c#vfaYSzq&>s82|vL{{~05FxrMq-Bec&b>9o|g|7
z<}4-$VUX2a90_e6I&<of|Ex1=1Z@&W6AmT|SFLp6xwWInoRiHas1QT0W5{X>btO`U
z^Y5WwAG)J*7}<iDid@J?%6<$*kzr>>okw%FGzpP#yqIJ3A?J*R6RH4&Zn!V=vYwcF
z;V0QP11JO|@V15yrlQCs>1n03N9Jki7v;lRQ{YHwfv);Ks;<-(JAAE5=?#17a46CN
z!eeC)OAn41X^uf(l4uU28<-9oO5u~iFH)2fM5(6GubShD(#?zYNv9i$yk{zKR+O)=
zxu$@+T$sM9a|;qZGEfx9v3prspxEu4D8e5V3-<yESV&um^<s|JR#Xw>?fYiDQ6+Ek
zM9d@-A2=%3K-AKjb7u=v&X-5b{GPVZ<X4|RIpww|yAV)V35@t&-VH+UQP&b+o0mzv
z<~-^Fw-upEIS=2Cpupdb-_f<|0rj+-xg8&RJ(5PqvVtzRq2T`*=&WOP1R`hmME5A4
zA&K}3h`bJMcW#)AyAbu{n$kUDc-i55R?@^>Q-{Q{Ji~WsZ7DQ9#UbB~iS)YFRpiDX
zdO%UHatl%h-SNrz40ZcG$MabHCBuPrkMxP;Z_bs6xA<0_D}T2wAMF1Te*bRq)GXKy
zpKRMPIN}wOlX`Hx2}eOG$W<E9r(7=oNKo7iRI5a>L)5z(i81CaK%wR;jDR^iosp`D
z5e{`n=1*>|x-hZj>BE6>476?-Y_q2|Lk(Yo9Wp?!*7UBj<<Zex2T4bofBzQ?3vdL@
zdo@`HQ+?WfrB!Sa-}qKgYosRYrn}6#GPkA3x(Tb&E&fck%~)K!z|rf(k}bXij?O3#
z=u17%>&<o`{;MNp2XEkyW|%D#EqrJ5^kZ9>csb7aEnevR1z4bLv%%gGXA~-ZcCgw8
zQA2@9jVOf(vgp6m`a#@hRwB;oKoXRoC3_H-+^H$3PWV==DkMJ}mB8Mfv&*W+=G@`s
zd3b<_!Dc)wPbF%w0*fT+8uqpOLe@+`DD12+hNC`QxPXKZNF(TMRWUB{qg>OsI9{lX
zHu14a&dKvC<-Vk)g>R?qh$_?hP!>qsJO~*8bfcap)_ur))g)g4*W4EP9bQ46I8-c;
zXk$JfN;jd*`xy(T<fO9xC-{=83c_rET#FW-(_C~D2$pVVwRw2SV1>2Cqmcn%A!Ft1
zB12n8V-#`+Wua+B1pK>=Y~_gLmYC=1o6}W+epmR$3|e=Nr{RqJme{vKgLRE_RL0+V
z@j#E>3u}SR7efid{iu0%akfG8V?2@5BFFPB#_{-F<@E5&&!DC)H;-}w<$FHnj4p@d
z#GVx~jQDSkSy*S<4C2QEOQt=5R0bcDZn`H?9_d;8v~`=BBTfl@_WSHOucOY@QN<j^
z7UCOJ-Z2#MDUn<t6GkuEgrT3RyB?fBGli~TBH9aEm5!{!+yW9vmI;JzDtjX#&rqv}
zW+FFftbr(a4cQEmaB7M}Xdn(>AYn*^DNHBd8VsGU8pPc7{+H83=K&a?n5R(xmos6g
zoFmTdnkczR4a3L4?|j+mo~YXLkx%xqI;UW%&Ql4@`ujqy1$N#-)@c{U9BzE+Eu<EU
z<b@X0*@K#g9ZudO*dm@V>kf#nUC?)*PiJwf(J%01@TLN}m{9N!`p?A%1SKVv&NdIk
zDf>~|A=0}6-!}t+-{ZZ2YrP^8wlHoHe%?!d0n7Utoj-BAFLy`o^ctK+1ab{SDSbr`
zM*e{Ro@++Lla%>8_31VC;e=WJK9}H)2khK)-rV)COT=9|fr9&gc!q9)p}(nuXAp-g
zxdSwe{_By@8a;kqe^FXJu?>776hD7Am?Q4CM<4soKPOKl2P`834q6;j;6su2$0Y0E
z?E>Glgq^v|zTlhNP^|PpTo_Mr+&z{2KX2(E3Dl>faImKD;2@rif`;`?`?dvrzmTRM
z&8(wxJ)_ku9umYaSc8zcMH_!m2;LkskZ3kR$TUa81^k&n8VV09J&^OZbc}DyUB4=P
z@;x`Nplf(5zt6D-AeWaC)cfwQlOB|_=`FeuMn7qfiahQ%Qd##Th%3Px)}@c6;O1Pa
zYdr(T`Do45h*z=|^X=8yoQVB61og%;IevDZ<jC;eG^y8l-|`g}jOW_VT5(>@u*U0!
zHg@^%pUGkEF|ra~%bZ<SH75T$vg@nE)U<3K7a{ml3G&_ps8_9+s_MxAiZqyyF{CqI
zDn)aI9>*O-36wpm(kmdbd%7bDl~Co{4L~b)+lP+O)i-X1pJC(*$RVprFj3^ys{3g5
zpJ<`(#JQahL^)v!-dLxAX&j1uwy{+&hu{-Pv9MNf1)(cs)3<f<?zxW8;oy&R>Ro|W
zvs2HkRZ0^;)Snj|7RkA**MoAXR~<eqsT*X>hvRKa^01?^-V)X5`&<u`7j*r35A>*r
zN<>(F)cvW-lOmXx1-;|BD?^?<Ly#!s&}`}K^BrfqALVQ?Z@g<^58kILuT;4ws=b~x
z{g2U$*%{^}Lc20<OP=#l4nqutQn6F|x61z4CCy?$Uk;EdZK^!GhCP8OqyG~63QA{I
znpt~gca5+(m-LFI=<Q*BTk&#k5Lep85stElNOv}6^$aCa_~KEyu^U$w6J{5)?sK>n
z#+Hw0h4=-!FfXN-<T#Z)dl|J{yq#(8t@@j0cY25A0kW49&cD=+bE-TesWdKD#vDbV
z5Stg!{kxuMdOw*(rkC*#Rr422!SvA?IwPL!3QdjxC${q=ho<OCx#0vq!N_cfnC959
zg!0X>CBMmz%^=knvAO`oVnaZO=6w+vJt8=-5ghD091i>ym2Tjgl7#F-V`!H}0^6wx
zgFa{tkI;bTF4Ew!_fwno6aJQI^yk@BzB4#*SDrEH(}HU6t*Pl9Lzk!A+m4HW%{L-h
zilpd<RF4dc+4`2R;~nGv)c(_vKjuSI+E>x>98I9<Vv*XnH74jP3i-O1>tIjVgF$@K
zN#OW1nrh^bD2TG3Q8%gYstK_We*Az$b0+cZ7wj2<H=T}OEQGEY@~a!^jJO)zi-027
zf06<QS2&3aUZ{zgSMZHQJ#9#^6@2B0b^nxm0jR`ld+dZ893VQ;=3hq+(ui69!}@`=
zOfI-LD7ppWUJ)!T35=wwEV>8;%1#`8){$geLPsTqFO3`-MfVNZOMVoK8(fk}W*P-c
zBg=j6=jGMo%#MD~w>;1Z?xNoLT|?001Oq{_KnWOk**)HL2xf&*Uh>AWz68h_EG(!P
zLU;K>R8E`JK0xs@3^-1)f?9rBhFoUZdStuWfNxMzi0qK7jA3h`e(pNyBMuaHtMDDA
zy@z|8W&*pcbV89UpgNCc<f%ce`f<vb?1nX{*MwM?Q^QsBS>v=>*M-<Q2m5S$eZTzu
z8BZ(Hn2yug8}dkN!%9momaxhCB637Q-g;&|`XjRW9T>B4<&~!k%d}nZdn-;flQwz%
zW1(-0!=QUbyqv{K!>#q#dh^I?{I%j(_{_4_(%D)4E{ckW<k404C2Xg$sPOz?&FR$l
znWRE=KunD8{4%D+uE+WGN<tNrSEiIH4|)YFik2YwxazIjCu-(oZ>eWpOSe|_x%pzL
zx@#rV4yc4QHc0DB6K>yo`)2nWt7w|}A^8>3*l^X4Hyt#cSQ0m`kXrfcRh4LDh}4=r
z=FcYx#Z7HO|Cc)6n>mTNPY}ji)eYC)eLtpfE~xm41W!Pv?j*|t$5d|br1jUo>I>@+
zw5A{OK@N9bRD@#MLEoA@!VHTJ;^0jqe}o7K<^lFdI-$6y*y1gN6d0Zr2x$U>U#|Rg
z4B(ji{!X_xSeX0hf36B`o!-zM;L!Lc<@1i^IrFhx!eP+nx@Lz_R~^vFC<0|^gs%Ge
z&?RLdsSAhyd=o|#!BwCUV#PKVhjG+LC>SGhDl2~g8H0_ZCLhg%XRZaOE*F9{i4$9-
zdsGA&gNbWEAtMgtRS!tBj0=Kqh{*U&K;-d_xf)z*oJf^?6pT&sC*+#oR3-rt#5ZPC
zOVj_gqa;4c5YhkjzvH2SfKdIX|2^RbD$#fW33vujPq4po=wA;HG?*c+;gN^^;;iAp
zp=pa&)ApA|ep`nTS98gjy$dc=m!j^XWz5Yx7tz{e#9cYhrl(<8<8b7ot~+0My_+2_
zJb7&M6eV&}eF|NB<~+auIpOQNyT;Uqtb_PUxDAVv5OJ3kLf@u2uz?NWEEVkEcs+E$
z2Ckv^vYEGwcj33I^Dq>s(n6h>w+ju3r<YJpygb|q5wA}o33vCTN_>9=A>MwV<$9;7
zD}>&_&zyL;vj@fAd?-->QR;+<d#JoXLa0LU4c<)d@g55^KW_hthCkfoUk?bk1GuVv
zOpix$Js+;1+Pb$HmH{~C5)a>;F@@1qpv-`$d;GALTJiuTP*3egpeBU+%_EXt(rjH1
z4;Sa`78C30)(!_V>nuwG)~SLs0{nLw=x4kYdCN;|dY<i^CVEnyZteaLd6vwU-&H=6
z6KKvb(Iz1H?+LmDL5@a7JG(-N4j$M{9`-w<DK;At2_ju6DfnmdQDji>Q0+9x0ACU;
zC%IWV*H!}pAERM;p=TdE^JVxxS9wp~piA#)++R36`2p(_K8MAk$v<gK42B}H7SS!S
z+FIO&Ex8R%cw1Hie<rg7N)0TU4NcE}ZlzhoXB~KsZ`*0GW-KQKRnIxzY!JI<FDpZ|
ziyQdMv&d!8|6ywI)HifgX@UH$^bbV2`KzR9l6Z>Q{hFX*t48OJ`fLxBf(AZ2x9Rs{
zxE}q<cIDbHV+60-phtAAw+`C@Vi*+N%4agMm9wNACqAS)N_a=_iR|=NR<kp%srhGI
z59z8o&_H<2kRY)+gc!dn+ZIFwXD7is(?02BVbuaEF^D_n<55wWm3h$le-+5g&cweg
z&w?oFg~d})G*>7hUE}7q)^z$@W85ZQLZVWQJ7up3S8QrMi*U1(AoPTJ-@c5)tKbmh
zs3i&|>=+mXifkF0WrtIj4Kvu!N{>9*nq?ZTw@@5l&6hbfwNFR`lYZby!pOCtQW=hw
zA^xQw?^j2MjT>;C%_7S@i3i^QVX1AZBDbqHAq9L?TZ~HISjE@&oUY~L=ik!QMmJA&
zc&?$(!WdOX=LzW)^GnOAVkDt+j3u$vscWg~<tDD!?mUd>*DA@xFnE5q78Q`NH$cNo
zeRa5w!rIkKhpFB0Y_Pj^)GuDC!0%`NUsqQi4rTX-^V+vDVaE0*W*TWi6Jabxk;qa+
ziI6QMvX+!4Av<x}Z24?WAyXmJGD%}E<V(MZu`gpU$ydtnHPzQO-}}#bp7Y%2Ip;dp
z`QyCr`&{?Ep_^8dv8XD4$@ZKaGq2w1!5PY5mn)Oap4uN5cW}zV5#}1DH%T0(YteV4
zYx!hpPRE_kEcU`*wG=F&T+zFlFgtiwWm;A<SFcnaL#vy#gP;4_!NyfW$)VdX77)vZ
zzHQhrz3DAVl~%IE<!qhSV1_a9F!O{3U)|h4j~`vyDlz%=<#4pg7V8J3JA)fh^*$Ji
zfv47IMf~+b<?)p0+^wI-JbCz+q%4*Q60CDIgfsU#RXpCjF#nK`qn?A0XMh)Za_<k&
zZ32`0zH4%?@X_t&^_;)U@3~`L)RO6a38S<=Hzopq_(O^rjjDZGKO%Ma@=nJ3`HdLL
zsD*TcwG732{?M{zJ=1QPd*#YKT3b>a#W*!veJZ|DFrqm=YzLK^wAE<eo}^ORChef8
zbk~?edBe6{T~=q8ZN@r5%Q-UHHG`V{rQ~JL>`r^z!=>U~OV3Vv_FfD>7J8*YHm%~!
z{i2$(ys;3Q^6zJ3svhgcPcu)kzU!`Qa=1Y|cNDv)#f3atToQJP{ONW=!LxkU$Mcld
ztLW?k?N7SYmd#;_m4=1Os%ApHx^Ba8;NHH+fy$_A^FXcpJylG%!WgOJf=U^g?f>xJ
zXqy#?(DU%4a$^l-_A&!L?_MkfS(|DMT}8TY-Hu{hU4LxZJBW~e)tV{BJt}ZZU8(2q
zut_g)!eT95b;k+g?hh01YAv;vLQUutuWJj<Juhmo%+v%Sqx+dZ6k7`@yDGh(JAc^o
z_+5LMP?k5nt=z@r8>;O*@3h|bZ*~>T+4tI=&sxe|5=m9Q4zZ8i6EnieuRfWb5(|$n
zPd$}$I}g)N;`a$d+11?-_^bj23!vKak6}MnT$rSGxE_h+NiGf+Jc(|vlvajPC`Q<d
zuK$VbYIFMsJ|0`Qx1Z1|SC&Gc8RjsSOH@=2suegi+8b)1@k!*&_R+MrtjsjYCpHq6
z3rBT#6@8o7b;0VEd%3;gb78@-4o{VoN@o)?mY!5Y_6e5XSMNwWYBnWqeazY*s>n^o
zxxQ26T3fy=U-IksLSv<7*>^);AEfAbolc9zY1mK0T6(d*Jno6X54&_6H@@z2F?7!j
zsN-u84LoJkqvCdGOZtzs`Y~SU&~@#RySMq{e7o9L7_aPitz^iJi+S?&DBtRd4-#WU
z@Xs_@S-45bGyH4l*U^jp`ZEk+$(85;*9(j0fda8H=G2LLlET3$Q?pXCQ86Xj{CYmi
zfXBwN7FZKH=?60lLYis%$;h3ERO0QgIL0{JSaA29&Pio2wLE`5zmNxML0){*o%1%P
zbvX5$=<4;$f*lqgB~py*gFXuls_9?QPIoS~6nInOeXVImyF<;8ihmhVdb^2xPz1*_
zFn3Gl#4{8D+qW%IHFhlE%RP#{e-7heb1RF0`MQ6P&=qyx%94v&hePEvgec?H>bXid
z#|J^Ep4cYtFAMdKUiYHT>uoWd7<y#MQ*q7Xt<*?a{@=s4cZ>F`D44mX+wBX+zp@-Y
z(uK!`I8GcR)5xTx3Z4SfGe)*;iU>uIX>i;^W`2$PLctdPDpXZ_YgY^<+xCOq;f4l%
zd4Wgrmq}c8Pnk1)VjsUZw+!8EsT~{{A`g5e8u9V!EZ$97=zR?N&GR)UZI?<kwKBB2
zoT_1O@u)S<F~^Z{L{!4h##9h5e89s(T1VgXG{&X}7t5P~iWAS-@$3lqV)c931V+&s
z%!wjVoqgC#3F1b|aca$`l#Nb>+|jnv3YA|K-``Z|OL|#yprTm(2Gyx`%v(yb(pbhK
zru@vIzZ3&RHAN#Qx_kv5TG8}VyX~{Z!ySl(Kn>SOlB9+8>99CNnN)?GI1+XvePV6C
z!RWlZx%KsH`D&_VYELq8Jd5u5J_|3dG!LO-m)-XD8AnwEb5z4Mb`pGAt1^x8kG03O
z9t^B`_aphC^T73n?ehLa)|+7#Zb0?o%D@T)w)Vm0KD{zrLi>YiGD?tplqwb^^?5^R
zVQ^cR0OXiN=z=hi7TJuLFi2sdpeA8(lc@(S34_Zb8UWQ#grZQ0DFe2NZ9rT!i0zk!
zwn=~iWf;)=cS6mQY*T(f2O?tGW*=4r$j+g`R~RjV6cDkW!pHy^3F1NffE2tc{%(%w
zm(Y>*=>0|@ZDFM2IyNYEkQZzoB*3dO*7?XAjS|Aeqrm}OQTPSK!EEhdBwMI3qF%)T
z`iN(P<_0(OvUNm(!Vm^BMgFiTn*z!Z8s^Y=<QVx6kv;PDkP0tb91E-<BR8nCJ9UOP
z!yNiT93%0Xpq9J|+!<Da|Eurv8&?>qOh!OD>@{%cx%@^TZDAx?4|M410{SqTm#yXk
zaz`+b=5}`aRS}nw5iBoT5F>pQ18p_@)vqMSmLEVitr{UQQs>C103t_s%W)9UbHqcy
zz^Dz(!8^|pFEd3p00#ocNRWUdU^yy-mN6oPaYsxXkQvwF(gFL&y&zF<fas>P&x%v8
z2tZGupne~qFrm+d22K+yavbDi921x!@l`4^Z79|cbezQi6w3rkKKaX(1QZqt`Vs=}
zvov82nkJ4U-Ju9x9${_LgxOpx$k8~DoS$tRAir=BIB5d^p>tTXMv((>^gNPf9hjRW
zL5-KeK)MDvjhubYDOspG4Ma}4K=d2zWm$0{aynBxpr|aiYcstb{<m@;;fcU;B=yT?
zgMQrM2Y05W;s2J}{l*qXau@vzG@wcVkr_1a&*CS=84T1!{S_1i4l_ik_X*q0n$d#d
z>1^|PEdhwm5+T3ZU#=){oFze(jcj+Sc^#n7qTxTE3w{>*{h6KdY89A1M}#@vzJ3Fc
VwlMN}`%er%aGR6olj~j${vQ;P=LY})

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661ee7..f398c33c4b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index a69d9cb6c2..65dcd68d65 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
diff --git a/gradlew.bat b/gradlew.bat
index f127cfd49d..93e3f59f13 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 

From 80f7caad62ab536ce7fb3e742ebe00d95ba548e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Dec 2022 09:29:28 +0100
Subject: [PATCH 393/665] Bump biz.aQute.bnd.builder from 6.3.1 to 6.4.0
 (#7489)

Bumps [biz.aQute.bnd.builder](https://github.com/bndtools/bnd) from 6.3.1 to 6.4.0.
- [Release notes](https://github.com/bndtools/bnd/releases)
- [Changelog](https://github.com/bndtools/bnd/blob/master/docs/ADDING_RELEASE_DOCS.md)
- [Commits](https://github.com/bndtools/bnd/compare/6.3.1...6.4.0)

---
updated-dependencies:
- dependency-name: biz.aQute.bnd.builder
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ec0e5b9dde..1ba2011a05 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ plugins {
     id("ru.vyarus.animalsniffer") version "1.6.0"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
-    id("biz.aQute.bnd.builder") version "6.3.1"
+    id("biz.aQute.bnd.builder") version "6.4.0"
     id("com.vanniktech.maven.publish") version "0.19.0"
     id("org.beryx.jar") version "1.2.0"
 }

From 1104c09ca970cd89f04f3653291bd4d9ba2da8f3 Mon Sep 17 00:00:00 2001
From: Des Petrov <desislavpetrov@gmail.com>
Date: Sat, 3 Dec 2022 13:21:33 +0000
Subject: [PATCH 394/665] Adding onDropped callback to throttleLast as a part
 of #7458 (#7488)

---
 .../io/reactivex/rxjava3/core/Flowable.java   | 87 ++++++++++++++++++-
 .../io/reactivex/rxjava3/core/Observable.java | 72 ++++++++++++++-
 .../flowable/FlowableSampleTimed.java         | 35 +++++---
 .../observable/ObservableSampleTimed.java     | 41 ++++++---
 .../flowable/FlowableThrottleLastTests.java   | 72 ++++++++++++++-
 .../ObservableThrottleLastTests.java          | 74 +++++++++++++++-
 .../ParamValidationCheckerTest.java           |  6 +-
 7 files changed, 359 insertions(+), 28 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index c391ef9500..4c4236f29f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -14672,7 +14672,7 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, boolean emi
     public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableSampleTimed<>(this, period, unit, scheduler, false));
+        return RxJavaPlugins.onAssembly(new FlowableSampleTimed<>(this, period, unit, scheduler, false, null));
     }
 
     /**
@@ -14713,7 +14713,51 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
     public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableSampleTimed<>(this, period, unit, scheduler, emitLast));
+        return RxJavaPlugins.onAssembly(new FlowableSampleTimed<>(this, period, unit, scheduler, emitLast, null));
+    }
+
+    /**
+     * Returns a {@code Flowable} that emits the most recently emitted item (if any) emitted by the current {@code Flowable}
+     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}
+     * and optionally emit the very last upstream item when the upstream completes.
+     * <p>
+     * <img width="640" height="277" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.emitlast.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * <p>History: 2.0.5 - experimental
+     * @param period
+     *            the sampling rate
+     * @param unit
+     *            the {@link TimeUnit} in which {@code period} is defined
+     * @param scheduler
+     *            the {@code Scheduler} to use when sampling
+     * @param emitLast
+     *            if {@code true} and the upstream completes while there is still an unsampled item available,
+     *            that item is emitted to downstream before completion
+     *            if {@code false}, an unsampled last item is ignored.
+     * @param onDropped
+     *            called with the current entry when it has been replaced by a new one
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
+     * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
+     * @see #throttleLast(long, TimeUnit, Scheduler)
+     * @since 2.1
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.ERROR)
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast, @NonNull Consumer<T> onDropped) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new FlowableSampleTimed<>(this, period, unit, scheduler, emitLast, onDropped));
     }
 
     /**
@@ -17211,6 +17255,45 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
         return sample(intervalDuration, unit, scheduler);
     }
 
+    /**
+     * Returns a {@code Flowable} that emits only the last item emitted by the current {@code Flowable} during sequential
+     * time windows of a specified duration, where the duration is governed by a specified {@link Scheduler}.
+     * <p>
+     * This differs from {@link #throttleFirst(long, TimeUnit, Scheduler)} in that this ticks along at a scheduled interval whereas
+     * {@code throttleFirst} does not tick, it just tracks the passage of time.
+     * <p>
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.s.v3.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * @param intervalDuration
+     *            duration of windows within which the last item emitted by the current {@code Flowable} will be
+     *            emitted
+     * @param unit
+     *            the unit of time of {@code intervalDuration}
+     * @param scheduler
+     *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
+     *            event
+     * @param onDropped
+     *          called with the current entry when it has been replaced by a new one
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
+     * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
+     * @see #sample(long, TimeUnit, Scheduler)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.ERROR)
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
+    public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+        return sample(intervalDuration, unit, scheduler, false, onDropped);
+    }
+
     /**
      * Throttles items from the upstream {@code Flowable} by first emitting the next
      * item from upstream, then periodically emitting the latest item (if any) when
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 7492f6f636..f371fda259 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -12128,7 +12128,40 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, boolean e
     public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, false));
+        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, false, null));
+    }
+
+    /**
+     * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
+     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}.
+     * <p>
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.v3.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * @param period
+     *            the sampling rate
+     * @param unit
+     *            the {@link TimeUnit} in which {@code period} is defined
+     * @param scheduler
+     *            the {@code Scheduler} to use when sampling
+     * @param onDropped
+     *          called with the current entry when it has been replaced by a new one
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
+     * @see #throttleLast(long, TimeUnit, Scheduler)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
+    public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, false, onDropped));
     }
 
     /**
@@ -12165,7 +12198,7 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
     public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, emitLast));
+        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, emitLast, null));
     }
 
     /**
@@ -14233,6 +14266,41 @@ public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit
         return sample(intervalDuration, unit);
     }
 
+    /**
+     * Returns an {@code Observable} that emits only the last item emitted by the current {@code Observable} during sequential
+     * time windows of a specified duration, where the duration is governed by a specified {@link Scheduler}.
+     * <p>
+     * This differs from {@link #throttleFirst} in that this ticks along at a scheduled interval whereas
+     * {@code throttleFirst} does not tick, it just tracks passage of time.
+     * <p>
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleLast.s.v3.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * @param intervalDuration
+     *            duration of windows within which the last item emitted by the current {@code Observable} will be
+     *            emitted
+     * @param unit
+     *            the unit of time of {@code intervalDuration}
+     * @param scheduler
+     *            the {@code Scheduler} to use internally to manage the timers that handle timeout for each
+     *            event
+     * @param onDropped
+     *          called with the current entry when it has been replaced by a new one
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
+     * @see #sample(long, TimeUnit, Scheduler)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
+    public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+        return sample(intervalDuration, unit, scheduler, onDropped);
+    }
+
     /**
      * Returns an {@code Observable} that emits only the last item emitted by the current {@code Observable} during sequential
      * time windows of a specified duration, where the duration is governed by a specified {@link Scheduler}.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
index 67a0412c02..59dce50201 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
@@ -16,6 +16,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
 
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Consumer;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -29,24 +31,25 @@ public final class FlowableSampleTimed<T> extends AbstractFlowableWithUpstream<T
     final long period;
     final TimeUnit unit;
     final Scheduler scheduler;
-
     final boolean emitLast;
+    final Consumer<T> onDropped;
 
-    public FlowableSampleTimed(Flowable<T> source, long period, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
+    public FlowableSampleTimed(Flowable<T> source, long period, TimeUnit unit, Scheduler scheduler, boolean emitLast, Consumer<T> onDropped) {
         super(source);
         this.period = period;
         this.unit = unit;
         this.scheduler = scheduler;
         this.emitLast = emitLast;
+        this.onDropped = onDropped;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
         SerializedSubscriber<T> serial = new SerializedSubscriber<>(s);
         if (emitLast) {
-            source.subscribe(new SampleTimedEmitLast<>(serial, period, unit, scheduler));
+            source.subscribe(new SampleTimedEmitLast<>(serial, period, unit, scheduler, onDropped));
         } else {
-            source.subscribe(new SampleTimedNoLast<>(serial, period, unit, scheduler));
+            source.subscribe(new SampleTimedNoLast<>(serial, period, unit, scheduler, onDropped));
         }
     }
 
@@ -58,6 +61,7 @@ abstract static class SampleTimedSubscriber<T> extends AtomicReference<T> implem
         final long period;
         final TimeUnit unit;
         final Scheduler scheduler;
+        final Consumer<T> onDropped;
 
         final AtomicLong requested = new AtomicLong();
 
@@ -65,11 +69,12 @@ abstract static class SampleTimedSubscriber<T> extends AtomicReference<T> implem
 
         Subscription upstream;
 
-        SampleTimedSubscriber(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler) {
+        SampleTimedSubscriber(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
             this.downstream = actual;
             this.period = period;
             this.unit = unit;
             this.scheduler = scheduler;
+            this.onDropped = onDropped;
         }
 
         @Override
@@ -84,7 +89,17 @@ public void onSubscribe(Subscription s) {
 
         @Override
         public void onNext(T t) {
-            lazySet(t);
+            T oldValue = getAndSet(t);
+            if (oldValue != null && onDropped != null) {
+              try {
+                  onDropped.accept(oldValue);
+              } catch (Throwable throwable) {
+                  Exceptions.throwIfFatal(throwable);
+                  cancelTimer();
+                  upstream.cancel();
+                  downstream.onError(throwable);
+              }
+            }
         }
 
         @Override
@@ -137,8 +152,8 @@ static final class SampleTimedNoLast<T> extends SampleTimedSubscriber<T> {
 
         private static final long serialVersionUID = -7139995637533111443L;
 
-        SampleTimedNoLast(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler) {
-            super(actual, period, unit, scheduler);
+        SampleTimedNoLast(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+            super(actual, period, unit, scheduler, onDropped);
         }
 
         @Override
@@ -158,8 +173,8 @@ static final class SampleTimedEmitLast<T> extends SampleTimedSubscriber<T> {
 
         final AtomicInteger wip;
 
-        SampleTimedEmitLast(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler) {
-            super(actual, period, unit, scheduler);
+        SampleTimedEmitLast(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+            super(actual, period, unit, scheduler, onDropped);
             this.wip = new AtomicInteger(1);
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
index f439339e15..b2025060b9 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
@@ -18,31 +18,40 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 import io.reactivex.rxjava3.observers.SerializedObserver;
+import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableSampleTimed<T> extends AbstractObservableWithUpstream<T, T> {
     final long period;
     final TimeUnit unit;
     final Scheduler scheduler;
-
+    final Consumer<T> onDropped;
     final boolean emitLast;
 
-    public ObservableSampleTimed(ObservableSource<T> source, long period, TimeUnit unit, Scheduler scheduler, boolean emitLast) {
+    public ObservableSampleTimed(ObservableSource<T> source,
+                                 long period,
+                                 TimeUnit unit,
+                                 Scheduler scheduler,
+                                 boolean emitLast,
+                                 Consumer<T> onDropped) {
         super(source);
         this.period = period;
         this.unit = unit;
         this.scheduler = scheduler;
         this.emitLast = emitLast;
+        this.onDropped = onDropped;
     }
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
         SerializedObserver<T> serial = new SerializedObserver<>(t);
         if (emitLast) {
-            source.subscribe(new SampleTimedEmitLast<>(serial, period, unit, scheduler));
+            source.subscribe(new SampleTimedEmitLast<>(serial, period, unit, scheduler, onDropped));
         } else {
-            source.subscribe(new SampleTimedNoLast<>(serial, period, unit, scheduler));
+            source.subscribe(new SampleTimedNoLast<>(serial, period, unit, scheduler, onDropped));
         }
     }
 
@@ -54,16 +63,18 @@ abstract static class SampleTimedObserver<T> extends AtomicReference<T> implemen
         final long period;
         final TimeUnit unit;
         final Scheduler scheduler;
+        final Consumer<T> onDropped;
 
         final AtomicReference<Disposable> timer = new AtomicReference<>();
 
         Disposable upstream;
 
-        SampleTimedObserver(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler) {
+        SampleTimedObserver(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
             this.downstream = actual;
             this.period = period;
             this.unit = unit;
             this.scheduler = scheduler;
+            this.onDropped = onDropped;
         }
 
         @Override
@@ -79,7 +90,17 @@ public void onSubscribe(Disposable d) {
 
         @Override
         public void onNext(T t) {
-            lazySet(t);
+            T oldValue = getAndSet(t);
+            if (oldValue != null && onDropped != null) {
+                try {
+                    onDropped.accept(oldValue);
+                } catch (Throwable throwable) {
+                    Exceptions.throwIfFatal(throwable);
+                    cancelTimer();
+                    upstream.dispose();
+                    downstream.onError(throwable);
+                }
+            }
         }
 
         @Override
@@ -123,8 +144,8 @@ static final class SampleTimedNoLast<T> extends SampleTimedObserver<T> {
 
         private static final long serialVersionUID = -7139995637533111443L;
 
-        SampleTimedNoLast(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler) {
-            super(actual, period, unit, scheduler);
+        SampleTimedNoLast(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+            super(actual, period, unit, scheduler, onDropped);
         }
 
         @Override
@@ -144,8 +165,8 @@ static final class SampleTimedEmitLast<T> extends SampleTimedObserver<T> {
 
         final AtomicInteger wip;
 
-        SampleTimedEmitLast(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler) {
-            super(actual, period, unit, scheduler);
+        SampleTimedEmitLast(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+            super(actual, period, unit, scheduler, onDropped);
             this.wip = new AtomicInteger(1);
         }
 
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java
index 0d2dc343fc..c5c858c430 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableThrottleLastTests.java
@@ -13,10 +13,14 @@
 
 package io.reactivex.rxjava3.flowable;
 
-import static org.mockito.Mockito.inOrder;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.rxjava3.core.Observer;
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
 import org.junit.Test;
 import org.mockito.InOrder;
 import org.reactivestreams.Subscriber;
@@ -28,6 +32,72 @@
 
 public class FlowableThrottleLastTests extends RxJavaTest {
 
+    @Test
+    public void throttleWithDroppedCallbackException() throws Throwable {
+        Subscriber<Integer> subscriber = TestHelper.mockSubscriber();
+        Action whenDisposed = mock(Action.class);
+
+        TestScheduler s = new TestScheduler();
+        PublishProcessor<Integer> o = PublishProcessor.create();
+        o.doOnCancel(whenDisposed)
+         .throttleLast(500, TimeUnit.MILLISECONDS, s, e-> {
+                    if (e == 1) {
+                        throw new TestException("forced");
+                    }
+                })
+               .subscribe(subscriber);
+
+        // send events with simulated time increments
+        s.advanceTimeTo(0, TimeUnit.MILLISECONDS);
+        o.onNext(1); // skip
+        o.onNext(2); // deliver
+        s.advanceTimeTo(501, TimeUnit.MILLISECONDS);
+
+        InOrder inOrder = inOrder(subscriber);
+        inOrder.verify(subscriber).onError(any(TestException.class));
+        inOrder.verifyNoMoreInteractions();
+        verify(whenDisposed).run();
+    }
+
+    @Test
+    public void throttleWithDroppedCallback() {
+        Subscriber<Integer> subscriber = TestHelper.mockSubscriber();
+        Observer<Object> dropCallbackObserver = TestHelper.mockObserver();
+
+        TestScheduler s = new TestScheduler();
+        PublishProcessor<Integer> o = PublishProcessor.create();
+        o.throttleLast(500, TimeUnit.MILLISECONDS, s, dropCallbackObserver::onNext).subscribe(subscriber);
+
+        // send events with simulated time increments
+        s.advanceTimeTo(0, TimeUnit.MILLISECONDS);
+        o.onNext(1); // skip
+        o.onNext(2); // deliver
+        s.advanceTimeTo(501, TimeUnit.MILLISECONDS);
+        o.onNext(3); // skip
+        s.advanceTimeTo(600, TimeUnit.MILLISECONDS);
+        o.onNext(4); // skip
+        s.advanceTimeTo(700, TimeUnit.MILLISECONDS);
+        o.onNext(5); // skip
+        o.onNext(6); // deliver
+        s.advanceTimeTo(1001, TimeUnit.MILLISECONDS);
+        o.onNext(7); // deliver
+        s.advanceTimeTo(1501, TimeUnit.MILLISECONDS);
+        o.onComplete();
+
+        InOrder inOrder = inOrder(subscriber);
+        InOrder dropCallbackOrder = inOrder(dropCallbackObserver);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(1);
+        inOrder.verify(subscriber).onNext(2);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(3);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(4);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(5);
+        inOrder.verify(subscriber).onNext(6);
+        inOrder.verify(subscriber).onNext(7);
+        inOrder.verify(subscriber).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        dropCallbackOrder.verifyNoMoreInteractions();
+    }
+
     @Test
     public void throttle() {
         Subscriber<Integer> subscriber = TestHelper.mockSubscriber();
diff --git a/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java
index 735bc4a312..d8107cc434 100644
--- a/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java
+++ b/src/test/java/io/reactivex/rxjava3/observable/ObservableThrottleLastTests.java
@@ -13,10 +13,10 @@
 
 package io.reactivex.rxjava3.observable;
 
-import static org.mockito.Mockito.inOrder;
-
 import java.util.concurrent.TimeUnit;
 
+import io.reactivex.rxjava3.exceptions.TestException;
+import io.reactivex.rxjava3.functions.Action;
 import org.junit.Test;
 import org.mockito.InOrder;
 
@@ -25,8 +25,78 @@
 import io.reactivex.rxjava3.subjects.PublishSubject;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
+import static org.mockito.Mockito.*;
+
 public class ObservableThrottleLastTests extends RxJavaTest {
 
+    @Test
+    public void throttleLastWithDropCallbackException() throws Throwable {
+        Observer<Integer> observer = TestHelper.mockObserver();
+
+        Action whenDisposed = mock(Action.class);
+
+        TestScheduler s = new TestScheduler();
+        PublishSubject<Integer> o = PublishSubject.create();
+        o.doOnDispose(whenDisposed)
+                .throttleLast(500, TimeUnit.MILLISECONDS, s, e -> {
+                    if (e == 1) {
+                        throw new TestException("Forced");
+                    }
+                })
+                .subscribe(observer);
+
+        // send events with simulated time increments
+        s.advanceTimeTo(0, TimeUnit.MILLISECONDS);
+        o.onNext(1); // skip
+        o.onNext(2); // try to deliver
+        s.advanceTimeTo(501, TimeUnit.MILLISECONDS);
+
+        InOrder inOrder = inOrder(observer);
+        inOrder.verify(observer).onError(any(TestException.class));
+        inOrder.verifyNoMoreInteractions();
+        verify(whenDisposed).run();
+    }
+
+    @Test
+    public void throttleLastWithDropCallback() {
+        Observer<Integer> observer = TestHelper.mockObserver();
+
+        Observer<Object> dropCallbackObserver = TestHelper.mockObserver();
+
+        TestScheduler s = new TestScheduler();
+        PublishSubject<Integer> o = PublishSubject.create();
+        o.throttleLast(500, TimeUnit.MILLISECONDS, s, dropCallbackObserver::onNext).subscribe(observer);
+
+        // send events with simulated time increments
+        s.advanceTimeTo(0, TimeUnit.MILLISECONDS);
+        o.onNext(1); // skip
+        o.onNext(2); // deliver
+        s.advanceTimeTo(501, TimeUnit.MILLISECONDS);
+        o.onNext(3); // skip
+        s.advanceTimeTo(600, TimeUnit.MILLISECONDS);
+        o.onNext(4); // skip
+        s.advanceTimeTo(700, TimeUnit.MILLISECONDS);
+        o.onNext(5); // skip
+        o.onNext(6); // deliver
+        s.advanceTimeTo(1001, TimeUnit.MILLISECONDS);
+        o.onNext(7); // deliver
+        s.advanceTimeTo(1501, TimeUnit.MILLISECONDS);
+        o.onComplete();
+
+        InOrder inOrder = inOrder(observer);
+        InOrder dropCallbackOrder = inOrder(dropCallbackObserver);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(1);
+        inOrder.verify(observer).onNext(2);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(3);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(4);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(5);
+        inOrder.verify(observer).onNext(6);
+        inOrder.verify(observer).onNext(7);
+        inOrder.verify(observer).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        dropCallbackOrder.verifyNoMoreInteractions();
+    }
+
     @Test
     public void throttle() {
         Observer<Integer> observer = TestHelper.mockObserver();
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 4fa3dfb39a..21d8905ded 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -190,6 +190,7 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Boolean.TYPE));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE));
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE, Consumer.class));
 
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "takeLast", Long.TYPE, TimeUnit.class));
@@ -225,6 +226,7 @@ public void checkParallelFlowable() {
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleLast", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleLast", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleLast", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
 
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class));
@@ -435,6 +437,7 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Boolean.TYPE));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE));
 
         // negative time is considered as zero time
@@ -471,6 +474,7 @@ public void checkParallelFlowable() {
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleLast", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleLast", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleLast", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
 
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleLatest", Long.TYPE, TimeUnit.class));
@@ -1216,4 +1220,4 @@ public String toString() {
             return "NeverCompletable";
         }
     }
-}
+}
\ No newline at end of file

From 5b3510bc925947230f6c1a7e66d30694e0f304b3 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sun, 4 Dec 2022 10:55:28 +0100
Subject: [PATCH 395/665] 3.x: Fix experimental, signatures of throttleLast
 (#7490)

* 3.x: Fix experimental, signatures.

* Fix Observable.sample overload

* Fix validator signature override
---
 .../io/reactivex/rxjava3/core/Flowable.java   | 12 +++--
 .../io/reactivex/rxjava3/core/Observable.java | 46 +++++++++++--------
 .../flowable/FlowableSampleTimed.java         | 12 ++---
 .../observable/ObservableSampleTimed.java     | 13 +++---
 .../ParamValidationCheckerTest.java           |  2 +-
 5 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 4c4236f29f..f866ed5302 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -14729,7 +14729,6 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * <p>History: 2.0.5 - experimental
      * @param period
      *            the sampling rate
      * @param unit
@@ -14747,13 +14746,14 @@ public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Sc
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #throttleLast(long, TimeUnit, Scheduler)
-     * @since 2.1
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast, @NonNull Consumer<T> onDropped) {
+    @Experimental
+    public final Flowable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast, @NonNull Consumer<? super T> onDropped) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(onDropped, "onDropped is null");
@@ -17172,11 +17172,13 @@ public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit
      * @throws NullPointerException if {@code unit} or {@code scheduler} or {@code onDropped} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @Experimental
     public final Flowable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -17285,12 +17287,14 @@ public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit u
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
      * @see #sample(long, TimeUnit, Scheduler)
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+    @Experimental
+    public final Flowable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
         return sample(intervalDuration, unit, scheduler, false, onDropped);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index f371fda259..4216d1c770 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -12133,49 +12133,51 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
 
     /**
      * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
-     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}.
+     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}
+     *  and optionally emit the very last upstream item when the upstream completes.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.v3.png" alt="">
+     * <img width="640" height="277" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.emitlast.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
+     * <p>History: 2.0.5 - experimental
      * @param period
      *            the sampling rate
      * @param unit
      *            the {@link TimeUnit} in which {@code period} is defined
      * @param scheduler
      *            the {@code Scheduler} to use when sampling
-     * @param onDropped
-     *          called with the current entry when it has been replaced by a new one
+     * @param emitLast
+     *            if {@code true} and the upstream completes while there is still an unsampled item available,
+     *            that item is emitted to downstream before completion
+     *            if {@code false}, an unsampled last item is ignored.
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit, Scheduler)
+     * @since 2.1
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+    public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        Objects.requireNonNull(onDropped, "onDropped is null");
-        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, false, onDropped));
+        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, emitLast, null));
     }
 
     /**
      * Returns an {@code Observable} that emits the most recently emitted item (if any) emitted by the current {@code Observable}
-     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}
-     *  and optionally emit the very last upstream item when the upstream completes.
+     * within periodic time intervals, where the intervals are defined on a particular {@link Scheduler}.
      * <p>
-     * <img width="640" height="277" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.emitlast.png" alt="">
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/sample.s.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
      * </dl>
      *
-     * <p>History: 2.0.5 - experimental
      * @param period
      *            the sampling rate
      * @param unit
@@ -12186,19 +12188,23 @@ public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull
      *            if {@code true} and the upstream completes while there is still an unsampled item available,
      *            that item is emitted to downstream before completion
      *            if {@code false}, an unsampled last item is ignored.
+     * @param onDropped
+     *          called with the current entry when it has been replaced by a new one
      * @return the new {@code Observable} instance
-     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null}
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #throttleLast(long, TimeUnit, Scheduler)
-     * @since 2.1
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast) {
+    @Experimental
+    public final Observable<T> sample(long period, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, boolean emitLast, @NonNull Consumer<? super T> onDropped) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, emitLast, null));
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new ObservableSampleTimed<>(this, period, unit, scheduler, emitLast, onDropped));
     }
 
     /**
@@ -14225,10 +14231,12 @@ public final Observable<T> throttleFirst(long skipDuration, @NonNull TimeUnit un
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} or {@code onDropped} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
+    @Experimental
     public final Observable<T> throttleFirst(long skipDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
@@ -14293,12 +14301,14 @@ public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/sample.html">ReactiveX operators documentation: Sample</a>
      * @see #sample(long, TimeUnit, Scheduler)
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
-        return sample(intervalDuration, unit, scheduler, onDropped);
+    @Experimental
+    public final Observable<T> throttleLast(long intervalDuration, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
+        return sample(intervalDuration, unit, scheduler, false, onDropped);
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
index 59dce50201..40551f4a8e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSampleTimed.java
@@ -32,9 +32,9 @@ public final class FlowableSampleTimed<T> extends AbstractFlowableWithUpstream<T
     final TimeUnit unit;
     final Scheduler scheduler;
     final boolean emitLast;
-    final Consumer<T> onDropped;
+    final Consumer<? super T> onDropped;
 
-    public FlowableSampleTimed(Flowable<T> source, long period, TimeUnit unit, Scheduler scheduler, boolean emitLast, Consumer<T> onDropped) {
+    public FlowableSampleTimed(Flowable<T> source, long period, TimeUnit unit, Scheduler scheduler, boolean emitLast, Consumer<? super T> onDropped) {
         super(source);
         this.period = period;
         this.unit = unit;
@@ -61,7 +61,7 @@ abstract static class SampleTimedSubscriber<T> extends AtomicReference<T> implem
         final long period;
         final TimeUnit unit;
         final Scheduler scheduler;
-        final Consumer<T> onDropped;
+        final Consumer<? super T> onDropped;
 
         final AtomicLong requested = new AtomicLong();
 
@@ -69,7 +69,7 @@ abstract static class SampleTimedSubscriber<T> extends AtomicReference<T> implem
 
         Subscription upstream;
 
-        SampleTimedSubscriber(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+        SampleTimedSubscriber(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<? super T> onDropped) {
             this.downstream = actual;
             this.period = period;
             this.unit = unit;
@@ -152,7 +152,7 @@ static final class SampleTimedNoLast<T> extends SampleTimedSubscriber<T> {
 
         private static final long serialVersionUID = -7139995637533111443L;
 
-        SampleTimedNoLast(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+        SampleTimedNoLast(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<? super T> onDropped) {
             super(actual, period, unit, scheduler, onDropped);
         }
 
@@ -173,7 +173,7 @@ static final class SampleTimedEmitLast<T> extends SampleTimedSubscriber<T> {
 
         final AtomicInteger wip;
 
-        SampleTimedEmitLast(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+        SampleTimedEmitLast(Subscriber<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<? super T> onDropped) {
             super(actual, period, unit, scheduler, onDropped);
             this.wip = new AtomicInteger(1);
         }
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
index b2025060b9..f264b8e76d 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSampleTimed.java
@@ -22,13 +22,12 @@
 import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 import io.reactivex.rxjava3.observers.SerializedObserver;
-import io.reactivex.rxjava3.plugins.RxJavaPlugins;
 
 public final class ObservableSampleTimed<T> extends AbstractObservableWithUpstream<T, T> {
     final long period;
     final TimeUnit unit;
     final Scheduler scheduler;
-    final Consumer<T> onDropped;
+    final Consumer<? super T> onDropped;
     final boolean emitLast;
 
     public ObservableSampleTimed(ObservableSource<T> source,
@@ -36,7 +35,7 @@ public ObservableSampleTimed(ObservableSource<T> source,
                                  TimeUnit unit,
                                  Scheduler scheduler,
                                  boolean emitLast,
-                                 Consumer<T> onDropped) {
+                                 Consumer<? super T> onDropped) {
         super(source);
         this.period = period;
         this.unit = unit;
@@ -63,13 +62,13 @@ abstract static class SampleTimedObserver<T> extends AtomicReference<T> implemen
         final long period;
         final TimeUnit unit;
         final Scheduler scheduler;
-        final Consumer<T> onDropped;
+        final Consumer<? super T> onDropped;
 
         final AtomicReference<Disposable> timer = new AtomicReference<>();
 
         Disposable upstream;
 
-        SampleTimedObserver(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+        SampleTimedObserver(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<? super T> onDropped) {
             this.downstream = actual;
             this.period = period;
             this.unit = unit;
@@ -144,7 +143,7 @@ static final class SampleTimedNoLast<T> extends SampleTimedObserver<T> {
 
         private static final long serialVersionUID = -7139995637533111443L;
 
-        SampleTimedNoLast(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+        SampleTimedNoLast(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<? super T> onDropped) {
             super(actual, period, unit, scheduler, onDropped);
         }
 
@@ -165,7 +164,7 @@ static final class SampleTimedEmitLast<T> extends SampleTimedObserver<T> {
 
         final AtomicInteger wip;
 
-        SampleTimedEmitLast(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+        SampleTimedEmitLast(Observer<? super T> actual, long period, TimeUnit unit, Scheduler scheduler, Consumer<? super T> onDropped) {
             super(actual, period, unit, scheduler, onDropped);
             this.wip = new AtomicInteger(1);
         }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 21d8905ded..ba377dbf63 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -437,8 +437,8 @@ public void checkParallelFlowable() {
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Boolean.TYPE));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class));
-        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "sample", Long.TYPE, TimeUnit.class, Scheduler.class, Boolean.TYPE, Consumer.class));
 
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "takeLast", Long.TYPE, TimeUnit.class));

From 47d413d50cdd13763bdc8667c4e604539c147827 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Dec 2022 08:16:50 +0100
Subject: [PATCH 396/665] Bump mockito-core from 4.8.1 to 4.11.0 (#7505)

Bumps [mockito-core](https://github.com/mockito/mockito) from 4.8.1 to 4.11.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v4.8.1...v4.11.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1ba2011a05..69d41f1dfd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ ext {
     reactiveStreamsVersion = "1.0.4"
     junitVersion = "4.13.2"
     testNgVersion = "7.5"
-    mockitoVersion = "4.8.1"
+    mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
     guavaVersion = "31.1-jre"
 }

From 65d073962c787511ae39d2186bee8726cef4d08f Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 4 Jan 2023 22:04:09 +0100
Subject: [PATCH 397/665] 3.x: Fix fromCompletionStage javadoc (#7508)

---
 src/main/java/io/reactivex/rxjava3/core/Completable.java | 3 ++-
 src/main/java/io/reactivex/rxjava3/core/Flowable.java    | 2 +-
 src/main/java/io/reactivex/rxjava3/core/Maybe.java       | 4 +++-
 src/main/java/io/reactivex/rxjava3/core/Observable.java  | 4 +++-
 src/main/java/io/reactivex/rxjava3/core/Single.java      | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Completable.java b/src/main/java/io/reactivex/rxjava3/core/Completable.java
index d16dd4dc85..e31a44c32c 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Completable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Completable.java
@@ -601,6 +601,7 @@ public static Completable fromCallable(@NonNull Callable<?> callable) {
      * @param future the {@code Future} to react to
      * @return the new {@code Completable} instance
      * @throws NullPointerException if {@code future} is {@code null}
+     * @see #fromCompletionStage(CompletionStage)
      */
     @CheckReturnValue
     @NonNull
@@ -3410,7 +3411,7 @@ public final TestObserver<Void> test(boolean dispose) {
      * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.c.png" alt="">
      * <p>
      * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
-     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * If the {@code CompletionStage} is to be created per consumer upon subscription, use {@link #defer(Supplier)}
      * around {@code fromCompletionStage}:
      * <pre><code>
      * Maybe.defer(() -&gt; Completable.fromCompletionStage(createCompletionStage()));
diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index f866ed5302..4873837033 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -20033,7 +20033,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
      * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.f.png" alt="">
      * <p>
      * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
-     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * If the {@code CompletionStage} is to be created per consumer upon subscription, use {@link #defer(Supplier)}
      * around {@code fromCompletionStage}:
      * <pre><code>
      * Flowable.defer(() -&gt; Flowable.fromCompletionStage(createCompletionStage()));
diff --git a/src/main/java/io/reactivex/rxjava3/core/Maybe.java b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
index 24f5d8bab0..8ae4137c83 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Maybe.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Maybe.java
@@ -1109,6 +1109,7 @@ public abstract class Maybe<@NonNull T> implements MaybeSource<T> {
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code future} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromCompletionStage(CompletionStage)
      */
     @CheckReturnValue
     @NonNull
@@ -1147,6 +1148,7 @@ public abstract class Maybe<@NonNull T> implements MaybeSource<T> {
      * @return the new {@code Maybe} instance
      * @throws NullPointerException if {@code future} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromCompletionStage(CompletionStage)
      */
     @CheckReturnValue
     @NonNull
@@ -6145,7 +6147,7 @@ public final TestObserver<T> test(boolean dispose) {
      * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.s.png" alt="">
      * <p>
      * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
-     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * If the {@code CompletionStage} is to be created per consumer upon subscription, use {@link #defer(Supplier)}
      * around {@code fromCompletionStage}:
      * <pre><code>
      * Maybe.defer(() -&gt; Maybe.fromCompletionStage(createCompletionStage()));
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 4216d1c770..b6fdb534ec 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -2020,6 +2020,7 @@ public static int bufferSize() {
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code future} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromCompletionStage(CompletionStage)
      */
     @CheckReturnValue
     @NonNull
@@ -2062,6 +2063,7 @@ public static int bufferSize() {
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code future} or {@code unit} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/from.html">ReactiveX operators documentation: From</a>
+     * @see #fromCompletionStage(CompletionStage)
      */
     @CheckReturnValue
     @NonNull
@@ -16776,7 +16778,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
      * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.o.png" alt="">
      * <p>
      * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
-     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * If the {@code CompletionStage} is to be created per consumer upon subscription, use {@link #defer(Supplier)}
      * around {@code fromCompletionStage}:
      * <pre><code>
      * Observable.defer(() -&gt; Observable.fromCompletionStage(createCompletionStage()));
diff --git a/src/main/java/io/reactivex/rxjava3/core/Single.java b/src/main/java/io/reactivex/rxjava3/core/Single.java
index ac7ecd48b6..6cf5a3f789 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Single.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Single.java
@@ -5598,7 +5598,7 @@ private static <T> Single<T> toSingle(@NonNull Flowable<T> source) {
      * <img width="640" height="262" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/fromCompletionStage.s.png" alt="">
      * <p>
      * Note that the operator takes an already instantiated, running or terminated {@code CompletionStage}.
-     * If the optional is to be created per consumer upon subscription, use {@link #defer(Supplier)}
+     * If the {@code CompletionStage} is to be created per consumer upon subscription, use {@link #defer(Supplier)}
      * around {@code fromCompletionStage}:
      * <pre><code>
      * Single.defer(() -&gt; Single.fromCompletionStage(createCompletionStage()));

From bf8da158a9b9e73b618bd5dd079dc2814c46a2fe Mon Sep 17 00:00:00 2001
From: Des Petrov <desislavpetrov@gmail.com>
Date: Mon, 9 Jan 2023 18:48:44 +0000
Subject: [PATCH 398/665] Add onDropped callback for throttleWithTimeout -
 #7458 (#7510)

---
 .../io/reactivex/rxjava3/core/Flowable.java   |  93 +++++++++++++++-
 .../io/reactivex/rxjava3/core/Observable.java |  85 ++++++++++++++-
 .../flowable/FlowableDebounceTimed.java       |  35 ++++--
 .../observable/ObservableDebounceTimed.java   |  34 ++++--
 .../flowable/FlowableDebounceTest.java        | 101 +++++++++++++++---
 .../observable/ObservableDebounceTest.java    |  73 ++++++++++++-
 .../ParamValidationCheckerTest.java           |   4 +
 7 files changed, 387 insertions(+), 38 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 4873837033..b7781c57f8 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -8930,7 +8930,57 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit) {
     public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new FlowableDebounceTimed<>(this, timeout, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new FlowableDebounceTimed<>(this, timeout, unit, scheduler, null));
+    }
+
+    /**
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, except that it drops items emitted by the
+     * current {@code Flowable} that are followed by newer items before a timeout value expires on a specified
+     * {@link Scheduler}. The timer resets on each emission.
+     * <p>
+     * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Flowable}.
+     * <p>
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.s.v3.png" alt="">
+     * <p>
+     * Delivery of the item after the grace period happens on the given {@code Scheduler}'s
+     * {@code Worker} which if takes too long, a newer item may arrive from the upstream, causing the
+     * {@code Worker}'s task to get disposed, which may also interrupt any downstream blocking operation
+     * (yielding an {@code InterruptedException}). It is recommended processing items
+     * that may take long time to be moved to another thread via {@link #observeOn} applied after
+     * {@code debounce} itself.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * @param timeout
+     *            the time each item has to be "the most recent" of those emitted by the current {@code Flowable} to
+     *            ensure that it's not dropped
+     * @param unit
+     *            the unit of time for the specified {@code timeout}
+     * @param scheduler
+     *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
+     *            item
+     * @param onDropped
+     *            called with the current entry when it has been replaced by a new one
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
+     * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
+     * @see #throttleWithTimeout(long, TimeUnit, Scheduler)
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.ERROR)
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new FlowableDebounceTimed<>(this, timeout, unit, scheduler, onDropped));
     }
 
     /**
@@ -17587,6 +17637,47 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
         return debounce(timeout, unit, scheduler);
     }
 
+    /**
+     * Returns a {@code Flowable} that mirrors the current {@code Flowable}, except that it drops items emitted by the
+     * current {@code Flowable} that are followed by newer items before a timeout value expires on a specified
+     * {@link Scheduler}. The timer resets on each emission (alias to {@link #debounce(long, TimeUnit, Scheduler)}).
+     * <p>
+     * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Flowable}.
+     * <p>
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.s.v3.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>This operator does not support backpressure as it uses time to control data flow.</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * @param timeout
+     *            the length of the window of time that must pass after the emission of an item from the current
+     *            {@code Flowable} in which it emits no items in order for the item to be emitted by the
+     *            resulting {@code Flowable}
+     * @param unit
+     *            the unit of time for the specified {@code timeout}
+     * @param scheduler
+     *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
+     *            item
+     * @param onDropped
+     *            called with the current entry when it has been replaced by a new one
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
+     * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
+     * @see #debounce(long, TimeUnit, Scheduler)
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.ERROR)
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
+    public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+        return debounce(timeout, unit, scheduler, onDropped);
+    }
+
     /**
      * Returns a {@code Flowable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Flowable}.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index b6fdb534ec..5bb6508994 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -7896,7 +7896,53 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit) {
     public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
-        return RxJavaPlugins.onAssembly(new ObservableDebounceTimed<>(this, timeout, unit, scheduler));
+        return RxJavaPlugins.onAssembly(new ObservableDebounceTimed<>(this, timeout, unit, scheduler, null));
+    }
+
+    /**
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, except that it drops items emitted by the
+     * current {@code Observable} that are followed by newer items before a timeout value expires on a specified
+     * {@link Scheduler}. The timer resets on each emission.
+     * <p>
+     * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Observable}.
+     * <p>
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/debounce.s.v3.png" alt="">
+     * <p>
+     * Delivery of the item after the grace period happens on the given {@code Scheduler}'s
+     * {@code Worker} which if takes too long, a newer item may arrive from the upstream, causing the
+     * {@code Worker}'s task to get disposed, which may also interrupt any downstream blocking operation
+     * (yielding an {@code InterruptedException}). It is recommended processing items
+     * that may take long time to be moved to another thread via {@link #observeOn} applied after
+     * {@code debounce} itself.
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * @param timeout
+     *            the time each item has to be "the most recent" of those emitted by the current {@code Observable} to
+     *            ensure that it's not dropped
+     * @param unit
+     *            the unit of time for the specified {@code timeout}
+     * @param scheduler
+     *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
+     *            item
+     * @param onDropped
+     *          called with the current entry when it has been replaced by a new one
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} } or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
+     * @see #throttleWithTimeout(long, TimeUnit, Scheduler)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
+    public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+        Objects.requireNonNull(unit, "unit is null");
+        Objects.requireNonNull(scheduler, "scheduler is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new ObservableDebounceTimed<>(this, timeout, unit, scheduler, onDropped));
     }
 
     /**
@@ -14597,6 +14643,43 @@ public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit u
         return debounce(timeout, unit, scheduler);
     }
 
+    /**
+     * Returns an {@code Observable} that mirrors the current {@code Observable}, except that it drops items emitted by the
+     * current {@code Observable} that are followed by newer items before a timeout value expires on a specified
+     * {@link Scheduler}. The timer resets on each emission (Alias to {@link #debounce(long, TimeUnit, Scheduler)}).
+     * <p>
+     * <em>Note:</em> If items keep being emitted by the current {@code Observable} faster than the timeout then no items
+     * will be emitted by the resulting {@code Observable}.
+     * <p>
+     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/throttleWithTimeout.s.v3.png" alt="">
+     * <dl>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>You specify which {@code Scheduler} this operator will use.</dd>
+     * </dl>
+     *
+     * @param timeout
+     *            the length of the window of time that must pass after the emission of an item from the current
+     *            {@code Observable}, in which the current {@code Observable} emits no items, in order for the item to be emitted by the
+     *            resulting {@code Observable}
+     * @param unit
+     *            the unit of time for the specified {@code timeout}
+     * @param scheduler
+     *            the {@code Scheduler} to use internally to manage the timers that handle the timeout for each
+     *            item
+     * @param onDropped
+     *          called with the current entry when it has been replaced by a new one
+     * @return the new {@code Observable} instance
+     * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
+     * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
+     * @see #debounce(long, TimeUnit, Scheduler)
+     */
+    @CheckReturnValue
+    @SchedulerSupport(SchedulerSupport.CUSTOM)
+    @NonNull
+    public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+        return debounce(timeout, unit, scheduler, onDropped);
+    }
+
     /**
      * Returns an {@code Observable} that emits records of the time interval between consecutive items emitted by the
      * current {@code Observable}.
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
index 30b398ab7b..086dd6c1fd 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
@@ -16,6 +16,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.*;
 
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Consumer;
 import org.reactivestreams.*;
 
 import io.reactivex.rxjava3.core.*;
@@ -32,19 +34,20 @@ public final class FlowableDebounceTimed<T> extends AbstractFlowableWithUpstream
     final long timeout;
     final TimeUnit unit;
     final Scheduler scheduler;
+    final Consumer<T> onDropped;
 
-    public FlowableDebounceTimed(Flowable<T> source, long timeout, TimeUnit unit, Scheduler scheduler) {
+    public FlowableDebounceTimed(Flowable<T> source, long timeout, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
         super(source);
         this.timeout = timeout;
         this.unit = unit;
         this.scheduler = scheduler;
+        this.onDropped = onDropped;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
         source.subscribe(new DebounceTimedSubscriber<>(
-                new SerializedSubscriber<>(s),
-                timeout, unit, scheduler.createWorker()));
+                new SerializedSubscriber<>(s), timeout, unit, scheduler.createWorker(), onDropped));
     }
 
     static final class DebounceTimedSubscriber<T> extends AtomicLong
@@ -55,20 +58,22 @@ static final class DebounceTimedSubscriber<T> extends AtomicLong
         final long timeout;
         final TimeUnit unit;
         final Scheduler.Worker worker;
+        final Consumer<T> onDropped;
 
         Subscription upstream;
 
-        Disposable timer;
+        DebounceEmitter<T> timer;
 
         volatile long index;
 
         boolean done;
 
-        DebounceTimedSubscriber(Subscriber<? super T> actual, long timeout, TimeUnit unit, Worker worker) {
+        DebounceTimedSubscriber(Subscriber<? super T> actual, long timeout, TimeUnit unit, Worker worker, Consumer<T> onDropped) {
             this.downstream = actual;
             this.timeout = timeout;
             this.unit = unit;
             this.worker = worker;
+            this.onDropped = onDropped;
         }
 
         @Override
@@ -93,6 +98,18 @@ public void onNext(T t) {
                 d.dispose();
             }
 
+            if (onDropped != null && timer != null) {
+                try {
+                    onDropped.accept(timer.value);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    upstream.cancel();
+                    done = true;
+                    downstream.onError(ex);
+                    worker.dispose();
+                }
+            }
+
             DebounceEmitter<T> de = new DebounceEmitter<>(t, idx, this);
             timer = de;
             d = worker.schedule(de, timeout, unit);
@@ -121,15 +138,13 @@ public void onComplete() {
             }
             done = true;
 
-            Disposable d = timer;
+            DebounceEmitter<T> d = timer;
             if (d != null) {
                 d.dispose();
             }
 
-            @SuppressWarnings("unchecked")
-            DebounceEmitter<T> de = (DebounceEmitter<T>)d;
-            if (de != null) {
-                de.emit();
+            if (d != null) {
+                d.emit();
             }
 
             downstream.onComplete();
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
index 248d00ea23..48861a778e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
@@ -19,6 +19,8 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.core.Scheduler.Worker;
 import io.reactivex.rxjava3.disposables.Disposable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Consumer;
 import io.reactivex.rxjava3.internal.disposables.DisposableHelper;
 import io.reactivex.rxjava3.observers.SerializedObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -27,19 +29,20 @@ public final class ObservableDebounceTimed<T> extends AbstractObservableWithUpst
     final long timeout;
     final TimeUnit unit;
     final Scheduler scheduler;
+    final Consumer<T> onDropped;
 
-    public ObservableDebounceTimed(ObservableSource<T> source, long timeout, TimeUnit unit, Scheduler scheduler) {
+    public ObservableDebounceTimed(ObservableSource<T> source, long timeout, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
         super(source);
         this.timeout = timeout;
         this.unit = unit;
         this.scheduler = scheduler;
+        this.onDropped = onDropped;
     }
 
     @Override
     public void subscribeActual(Observer<? super T> t) {
         source.subscribe(new DebounceTimedObserver<>(
-                new SerializedObserver<>(t),
-                timeout, unit, scheduler.createWorker()));
+                new SerializedObserver<>(t), timeout, unit, scheduler.createWorker(), onDropped));
     }
 
     static final class DebounceTimedObserver<T>
@@ -48,20 +51,22 @@ static final class DebounceTimedObserver<T>
         final long timeout;
         final TimeUnit unit;
         final Scheduler.Worker worker;
+        final Consumer<T> onDropped;
 
         Disposable upstream;
 
-        Disposable timer;
+        DebounceEmitter<T> timer;
 
         volatile long index;
 
         boolean done;
 
-        DebounceTimedObserver(Observer<? super T> actual, long timeout, TimeUnit unit, Worker worker) {
+        DebounceTimedObserver(Observer<? super T> actual, long timeout, TimeUnit unit, Worker worker, Consumer<T> onDropped) {
             this.downstream = actual;
             this.timeout = timeout;
             this.unit = unit;
             this.worker = worker;
+            this.onDropped = onDropped;
         }
 
         @Override
@@ -85,6 +90,17 @@ public void onNext(T t) {
                 d.dispose();
             }
 
+            if (onDropped != null && timer != null) {
+                try {
+                    onDropped.accept(timer.value);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    upstream.dispose();
+                    downstream.onError(ex);
+                    done = true;
+                }
+            }
+
             DebounceEmitter<T> de = new DebounceEmitter<>(t, idx, this);
             timer = de;
             d = worker.schedule(de, timeout, unit);
@@ -113,15 +129,13 @@ public void onComplete() {
             }
             done = true;
 
-            Disposable d = timer;
+            DebounceEmitter<T> d = timer;
             if (d != null) {
                 d.dispose();
             }
 
-            @SuppressWarnings("unchecked")
-            DebounceEmitter<T> de = (DebounceEmitter<T>)d;
-            if (de != null) {
-                de.run();
+            if (d != null) {
+                d.run();
             }
             downstream.onComplete();
             worker.dispose();
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
index 69027d5bd7..01122106c8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTest.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.functions.Action;
 import org.junit.*;
 import org.mockito.InOrder;
 import org.reactivestreams.*;
@@ -41,16 +42,86 @@
 public class FlowableDebounceTest extends RxJavaTest {
 
     private TestScheduler scheduler;
-    private Subscriber<String> Subscriber;
+    private Subscriber<String> subscriber;
     private Scheduler.Worker innerScheduler;
 
     @Before
     public void before() {
         scheduler = new TestScheduler();
-        Subscriber = TestHelper.mockSubscriber();
+        subscriber = TestHelper.mockSubscriber();
         innerScheduler = scheduler.createWorker();
     }
 
+    @Test
+    public void debounceWithOnDroppedCallbackWithEx() throws Throwable {
+        Flowable<String> source = Flowable.unsafeCreate(new Publisher<String>() {
+            @Override
+            public void subscribe(Subscriber<? super String> subscriber) {
+                subscriber.onSubscribe(new BooleanSubscription());
+                publishNext(subscriber, 100, "one");    // Should be skipped since "two" will arrive before the timeout expires.
+                publishNext(subscriber, 400, "two");    // Should be published since "three" will arrive after the timeout expires.
+                publishNext(subscriber, 900, "three");   // Should be skipped since "four" will arrive before the timout expires.
+                publishNext(subscriber, 999, "four");   // Should be skipped since onComplete will arrive before the timeout expires.
+                publishCompleted(subscriber, 1000);     // Should be published as soon as the timeout expires.
+            }
+        });
+
+        Action whenDisposed = mock(Action.class);
+
+        Flowable<String> sampled = source
+                .doOnCancel(whenDisposed)
+                .debounce(400, TimeUnit.MILLISECONDS, scheduler, e ->  {
+                    if ("three".equals(e)) {
+                        throw new TestException("forced");
+                    }
+                });
+        sampled.subscribe(subscriber);
+
+        InOrder inOrder = inOrder(subscriber);
+
+        scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
+        inOrder.verify(subscriber, times(1)).onNext("two");
+        inOrder.verify(subscriber, times(1)).onError(any(TestException.class));
+        inOrder.verify(subscriber, times(0)).onNext("three");
+        inOrder.verify(subscriber, times(0)).onNext("four");
+        inOrder.verify(subscriber, times(0)).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        verify(whenDisposed).run();
+    }
+
+    @Test
+    public void debounceWithOnDroppedCallback() {
+        Flowable<String> source = Flowable.unsafeCreate(new Publisher<String>() {
+            @Override
+            public void subscribe(Subscriber<? super String> subscriber) {
+                subscriber.onSubscribe(new BooleanSubscription());
+                publishNext(subscriber, 100, "one");    // Should be skipped since "two" will arrive before the timeout expires.
+                publishNext(subscriber, 400, "two");    // Should be published since "three" will arrive after the timeout expires.
+                publishNext(subscriber, 900, "three");   // Should be skipped since "four" will arrive before the timout expires.
+                publishNext(subscriber, 999, "four");   // Should be skipped since onComplete will arrive before the timeout expires.
+                publishCompleted(subscriber, 1000);     // Should be published as soon as the timeout expires.
+            }
+        });
+
+        Observer<Object> dropCallbackObserver = TestHelper.mockObserver();
+        Flowable<String> sampled = source.debounce(400, TimeUnit.MILLISECONDS, scheduler, dropCallbackObserver::onNext);
+        sampled.subscribe(subscriber);
+
+        scheduler.advanceTimeTo(0, TimeUnit.MILLISECONDS);
+        InOrder inOrder = inOrder(subscriber);
+        InOrder dropCallbackOrder = inOrder(dropCallbackObserver);
+
+        // must go to 800 since it must be 400 after when two is sent, which is at 400
+        scheduler.advanceTimeTo(800, TimeUnit.MILLISECONDS);
+        inOrder.verify(subscriber, times(1)).onNext("two");
+        dropCallbackOrder.verify(dropCallbackObserver, times(1)).onNext("one");
+        scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
+        dropCallbackOrder.verify(dropCallbackObserver, times(1)).onNext("three");
+        inOrder.verify(subscriber, times(1)).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        dropCallbackOrder.verifyNoMoreInteractions();
+    }
+
     @Test
     public void debounceWithCompleted() {
         Flowable<String> source = Flowable.unsafeCreate(new Publisher<String>() {
@@ -65,15 +136,15 @@ public void subscribe(Subscriber<? super String> subscriber) {
         });
 
         Flowable<String> sampled = source.debounce(400, TimeUnit.MILLISECONDS, scheduler);
-        sampled.subscribe(Subscriber);
+        sampled.subscribe(subscriber);
 
         scheduler.advanceTimeTo(0, TimeUnit.MILLISECONDS);
-        InOrder inOrder = inOrder(Subscriber);
+        InOrder inOrder = inOrder(subscriber);
         // must go to 800 since it must be 400 after when two is sent, which is at 400
         scheduler.advanceTimeTo(800, TimeUnit.MILLISECONDS);
-        inOrder.verify(Subscriber, times(1)).onNext("two");
+        inOrder.verify(subscriber, times(1)).onNext("two");
         scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
-        inOrder.verify(Subscriber, times(1)).onComplete();
+        inOrder.verify(subscriber, times(1)).onComplete();
         inOrder.verifyNoMoreInteractions();
     }
 
@@ -97,13 +168,13 @@ public void subscribe(Subscriber<? super String> subscriber) {
         });
 
         Flowable<String> sampled = source.debounce(200, TimeUnit.MILLISECONDS, scheduler);
-        sampled.subscribe(Subscriber);
+        sampled.subscribe(subscriber);
 
         scheduler.advanceTimeTo(0, TimeUnit.MILLISECONDS);
-        InOrder inOrder = inOrder(Subscriber);
-        inOrder.verify(Subscriber, times(0)).onNext(anyString());
+        InOrder inOrder = inOrder(subscriber);
+        inOrder.verify(subscriber, times(0)).onNext(anyString());
         scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
-        inOrder.verify(Subscriber, times(1)).onComplete();
+        inOrder.verify(subscriber, times(1)).onComplete();
         inOrder.verifyNoMoreInteractions();
     }
 
@@ -121,15 +192,15 @@ public void subscribe(Subscriber<? super String> subscriber) {
         });
 
         Flowable<String> sampled = source.debounce(400, TimeUnit.MILLISECONDS, scheduler);
-        sampled.subscribe(Subscriber);
+        sampled.subscribe(subscriber);
 
         scheduler.advanceTimeTo(0, TimeUnit.MILLISECONDS);
-        InOrder inOrder = inOrder(Subscriber);
+        InOrder inOrder = inOrder(subscriber);
         // 100 + 400 means it triggers at 500
         scheduler.advanceTimeTo(500, TimeUnit.MILLISECONDS);
-        inOrder.verify(Subscriber).onNext("one");
+        inOrder.verify(subscriber).onNext("one");
         scheduler.advanceTimeTo(701, TimeUnit.MILLISECONDS);
-        inOrder.verify(Subscriber).onError(any(TestException.class));
+        inOrder.verify(subscriber).onError(any(TestException.class));
         inOrder.verifyNoMoreInteractions();
     }
 
@@ -530,7 +601,7 @@ public void timedBadRequest() {
     public void timedLateEmit() {
         TestSubscriber<Integer> ts = new TestSubscriber<>();
         DebounceTimedSubscriber<Integer> sub = new DebounceTimedSubscriber<>(
-                ts, 1, TimeUnit.SECONDS, new TestScheduler().createWorker());
+                ts, 1, TimeUnit.SECONDS, new TestScheduler().createWorker(), null);
 
         sub.onSubscribe(new BooleanSubscription());
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
index b43b1d2d27..fc4e7d8478 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTest.java
@@ -21,6 +21,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
+import io.reactivex.rxjava3.functions.Action;
 import org.junit.*;
 import org.mockito.InOrder;
 import org.reactivestreams.Publisher;
@@ -50,6 +51,76 @@ public void before() {
         innerScheduler = scheduler.createWorker();
     }
 
+    @Test
+    public void debounceWithOnDroppedCallbackWithEx() throws Throwable {
+        Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
+            @Override
+            public void subscribe(Observer<? super String> observer) {
+                observer.onSubscribe(Disposable.empty());
+                publishNext(observer, 100, "one");    // Should be skipped since "two" will arrive before the timeout expires.
+                publishNext(observer, 400, "two");    // Should be published since "three" will arrive after the timeout expires.
+                publishNext(observer, 900, "three");   // Should be skipped since onComplete will arrive before the timeout expires.
+                publishNext(observer, 999, "four");   // Should be skipped since onComplete will arrive before the timeout expires.
+                publishCompleted(observer, 1000);     // Should be published as soon as the timeout expires.
+            }
+        });
+
+        Action whenDisposed = mock(Action.class);
+        Observable<String> sampled = source
+                .doOnDispose(whenDisposed)
+                .debounce(400, TimeUnit.MILLISECONDS, scheduler, e -> {
+            if ("three".equals(e)) {
+                throw new TestException("forced");
+            }
+        });
+        sampled.subscribe(observer);
+
+        scheduler.advanceTimeTo(0, TimeUnit.MILLISECONDS);
+        InOrder inOrder = inOrder(observer);
+        // must go to 800 since it must be 400 after when two is sent, which is at 400
+        scheduler.advanceTimeTo(800, TimeUnit.MILLISECONDS);
+        inOrder.verify(observer, times(1)).onNext("two");
+        scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
+        inOrder.verify(observer, times(1)).onError(any(TestException.class));
+        inOrder.verify(observer, never()).onNext("three");
+        inOrder.verify(observer, never()).onNext("four");
+        inOrder.verify(observer, never()).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        verify(whenDisposed).run();
+    }
+
+    @Test
+    public void debounceWithOnDroppedCallback() {
+        Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
+            @Override
+            public void subscribe(Observer<? super String> observer) {
+                observer.onSubscribe(Disposable.empty());
+                publishNext(observer, 100, "one");    // Should be skipped since "two" will arrive before the timeout expires.
+                publishNext(observer, 400, "two");    // Should be published since "three" will arrive after the timeout expires.
+                publishNext(observer, 900, "three");   // Should be skipped since onComplete will arrive before the timeout expires.
+                publishNext(observer, 999, "four");   // Should be skipped since onComplete will arrive before the timeout expires.
+                publishCompleted(observer, 1000);     // Should be published as soon as the timeout expires.
+            }
+        });
+
+        Observer<Object> drops = TestHelper.mockObserver();
+        InOrder inOrderDrops = inOrder(drops);
+        Observable<String> sampled = source.debounce(400, TimeUnit.MILLISECONDS, scheduler, drops::onNext);
+        sampled.subscribe(observer);
+
+        scheduler.advanceTimeTo(0, TimeUnit.MILLISECONDS);
+        InOrder inOrder = inOrder(observer);
+        // must go to 800 since it must be 400 after when two is sent, which is at 400
+        scheduler.advanceTimeTo(800, TimeUnit.MILLISECONDS);
+        inOrderDrops.verify(drops, times(1)).onNext("one");
+        inOrder.verify(observer, times(1)).onNext("two");
+        scheduler.advanceTimeTo(1000, TimeUnit.MILLISECONDS);
+        inOrderDrops.verify(drops, times(1)).onNext("three");
+        inOrder.verify(observer, times(1)).onComplete();
+        inOrder.verifyNoMoreInteractions();
+        inOrderDrops.verifyNoMoreInteractions();
+    }
+
     @Test
     public void debounceWithCompleted() {
         Observable<String> source = Observable.unsafeCreate(new ObservableSource<String>() {
@@ -489,7 +560,7 @@ protected void subscribeActual(
     public void timedLateEmit() {
         TestObserver<Integer> to = new TestObserver<>();
         DebounceTimedObserver<Integer> sub = new DebounceTimedObserver<>(
-                to, 1, TimeUnit.SECONDS, new TestScheduler().createWorker());
+                to, 1, TimeUnit.SECONDS, new TestScheduler().createWorker(), null);
 
         sub.onSubscribe(Disposable.empty());
 
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index ba377dbf63..8dd240119b 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -149,6 +149,7 @@ public void checkParallelFlowable() {
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
 
         // null Action allowed
         addOverride(new ParamOverride(Flowable.class, 1, ParamMode.ANY, "onBackpressureBuffer", Long.TYPE, Action.class, BackpressureOverflowStrategy.class));
@@ -177,6 +178,7 @@ public void checkParallelFlowable() {
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleWithTimeout", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleWithTimeout", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "throttleWithTimeout", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
 
         // negative time is considered as zero time
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.ANY, "take", Long.TYPE, TimeUnit.class));
@@ -400,6 +402,7 @@ public void checkParallelFlowable() {
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "debounce", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
 
         // zero repeat is allowed
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.NON_NEGATIVE, "repeat", Long.TYPE));
@@ -425,6 +428,7 @@ public void checkParallelFlowable() {
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleWithTimeout", Long.TYPE, TimeUnit.class));
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleWithTimeout", Long.TYPE, TimeUnit.class, Scheduler.class));
+        addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "throttleWithTimeout", Long.TYPE, TimeUnit.class, Scheduler.class, Consumer.class));
 
         // negative time is considered as zero time
         addOverride(new ParamOverride(Observable.class, 0, ParamMode.ANY, "take", Long.TYPE, TimeUnit.class));

From e1b6cb4204cbefff0e51c19aa9f5a843b2da6a40 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 9 Jan 2023 20:31:42 +0100
Subject: [PATCH 399/665] 3.x: ThrottleWithTimeout+Consumer cleanup (#7511)

---
 .../io/reactivex/rxjava3/core/Flowable.java   | 14 +++++++----
 .../io/reactivex/rxjava3/core/Observable.java | 12 ++++++---
 .../flowable/FlowableDebounceTimed.java       | 25 +++++++++----------
 .../observable/ObservableDebounceTimed.java   | 23 ++++++++---------
 4 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index b7781c57f8..d9cea6954f 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -8970,13 +8970,15 @@ public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
-     * @see #throttleWithTimeout(long, TimeUnit, Scheduler)
+     * @see #throttleWithTimeout(long, TimeUnit, Scheduler, Consumer)
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @NonNull
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
-    public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+    @Experimental
+    public final Flowable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(onDropped, "onDropped is null");
@@ -17640,7 +17642,7 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
     /**
      * Returns a {@code Flowable} that mirrors the current {@code Flowable}, except that it drops items emitted by the
      * current {@code Flowable} that are followed by newer items before a timeout value expires on a specified
-     * {@link Scheduler}. The timer resets on each emission (alias to {@link #debounce(long, TimeUnit, Scheduler)}).
+     * {@link Scheduler}. The timer resets on each emission (alias to {@link #debounce(long, TimeUnit, Scheduler, Consumer)}).
      * <p>
      * <em>Note:</em> If items keep being emitted by the current {@code Flowable} faster than the timeout then no items
      * will be emitted by the resulting {@code Flowable}.
@@ -17668,13 +17670,15 @@ public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit uni
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
      * @see <a href="https://github.com/ReactiveX/RxJava/wiki/Backpressure">RxJava wiki: Backpressure</a>
-     * @see #debounce(long, TimeUnit, Scheduler)
+     * @see #debounce(long, TimeUnit, Scheduler, Consumer)
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @BackpressureSupport(BackpressureKind.ERROR)
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+    @Experimental
+    public final Flowable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
         return debounce(timeout, unit, scheduler, onDropped);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 5bb6508994..792b740104 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -7933,12 +7933,14 @@ public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNu
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} } or {@code onDropped} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
-     * @see #throttleWithTimeout(long, TimeUnit, Scheduler)
+     * @see #throttleWithTimeout(long, TimeUnit, Scheduler, Consumer)
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+    @Experimental
+    public final Observable<T> debounce(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
         Objects.requireNonNull(unit, "unit is null");
         Objects.requireNonNull(scheduler, "scheduler is null");
         Objects.requireNonNull(onDropped, "onDropped is null");
@@ -14671,12 +14673,14 @@ public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit u
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code unit} or {@code scheduler} is {@code null} or {@code onDropped} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/debounce.html">ReactiveX operators documentation: Debounce</a>
-     * @see #debounce(long, TimeUnit, Scheduler)
+     * @see #debounce(long, TimeUnit, Scheduler, Consumer)
+     * @since 3.1.6 - Experimental
      */
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.CUSTOM)
     @NonNull
-    public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<T> onDropped) {
+    @Experimental
+    public final Observable<T> throttleWithTimeout(long timeout, @NonNull TimeUnit unit, @NonNull Scheduler scheduler, @NonNull Consumer<? super T> onDropped) {
         return debounce(timeout, unit, scheduler, onDropped);
     }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
index 086dd6c1fd..b9e5dff7f3 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDebounceTimed.java
@@ -34,9 +34,9 @@ public final class FlowableDebounceTimed<T> extends AbstractFlowableWithUpstream
     final long timeout;
     final TimeUnit unit;
     final Scheduler scheduler;
-    final Consumer<T> onDropped;
+    final Consumer<? super T> onDropped;
 
-    public FlowableDebounceTimed(Flowable<T> source, long timeout, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+    public FlowableDebounceTimed(Flowable<T> source, long timeout, TimeUnit unit, Scheduler scheduler, Consumer<? super T> onDropped) {
         super(source);
         this.timeout = timeout;
         this.unit = unit;
@@ -58,7 +58,7 @@ static final class DebounceTimedSubscriber<T> extends AtomicLong
         final long timeout;
         final TimeUnit unit;
         final Scheduler.Worker worker;
-        final Consumer<T> onDropped;
+        final Consumer<? super T> onDropped;
 
         Subscription upstream;
 
@@ -68,7 +68,7 @@ static final class DebounceTimedSubscriber<T> extends AtomicLong
 
         boolean done;
 
-        DebounceTimedSubscriber(Subscriber<? super T> actual, long timeout, TimeUnit unit, Worker worker, Consumer<T> onDropped) {
+        DebounceTimedSubscriber(Subscriber<? super T> actual, long timeout, TimeUnit unit, Worker worker, Consumer<? super T> onDropped) {
             this.downstream = actual;
             this.timeout = timeout;
             this.unit = unit;
@@ -93,14 +93,14 @@ public void onNext(T t) {
             long idx = index + 1;
             index = idx;
 
-            Disposable d = timer;
-            if (d != null) {
-                d.dispose();
+            DebounceEmitter<T> currentEmitter = timer;
+            if (currentEmitter != null) {
+                currentEmitter.dispose();
             }
 
-            if (onDropped != null && timer != null) {
+            if (onDropped != null && currentEmitter != null) {
                 try {
-                    onDropped.accept(timer.value);
+                    onDropped.accept(currentEmitter.value);
                 } catch (Throwable ex) {
                     Exceptions.throwIfFatal(ex);
                     upstream.cancel();
@@ -110,10 +110,9 @@ public void onNext(T t) {
                 }
             }
 
-            DebounceEmitter<T> de = new DebounceEmitter<>(t, idx, this);
-            timer = de;
-            d = worker.schedule(de, timeout, unit);
-            de.setResource(d);
+            DebounceEmitter<T> newEmitter = new DebounceEmitter<>(t, idx, this);
+            timer = newEmitter;
+            newEmitter.setResource(worker.schedule(newEmitter, timeout, unit));
         }
 
         @Override
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
index 48861a778e..f2db191229 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDebounceTimed.java
@@ -29,9 +29,9 @@ public final class ObservableDebounceTimed<T> extends AbstractObservableWithUpst
     final long timeout;
     final TimeUnit unit;
     final Scheduler scheduler;
-    final Consumer<T> onDropped;
+    final Consumer<? super T> onDropped;
 
-    public ObservableDebounceTimed(ObservableSource<T> source, long timeout, TimeUnit unit, Scheduler scheduler, Consumer<T> onDropped) {
+    public ObservableDebounceTimed(ObservableSource<T> source, long timeout, TimeUnit unit, Scheduler scheduler, Consumer<? super T> onDropped) {
         super(source);
         this.timeout = timeout;
         this.unit = unit;
@@ -51,7 +51,7 @@ static final class DebounceTimedObserver<T>
         final long timeout;
         final TimeUnit unit;
         final Scheduler.Worker worker;
-        final Consumer<T> onDropped;
+        final Consumer<? super T> onDropped;
 
         Disposable upstream;
 
@@ -61,7 +61,7 @@ static final class DebounceTimedObserver<T>
 
         boolean done;
 
-        DebounceTimedObserver(Observer<? super T> actual, long timeout, TimeUnit unit, Worker worker, Consumer<T> onDropped) {
+        DebounceTimedObserver(Observer<? super T> actual, long timeout, TimeUnit unit, Worker worker, Consumer<? super T> onDropped) {
             this.downstream = actual;
             this.timeout = timeout;
             this.unit = unit;
@@ -85,12 +85,12 @@ public void onNext(T t) {
             long idx = index + 1;
             index = idx;
 
-            Disposable d = timer;
-            if (d != null) {
-                d.dispose();
+            DebounceEmitter<T> currentEmitter = timer;
+            if (currentEmitter != null) {
+                currentEmitter.dispose();
             }
 
-            if (onDropped != null && timer != null) {
+            if (onDropped != null && currentEmitter != null) {
                 try {
                     onDropped.accept(timer.value);
                 } catch (Throwable ex) {
@@ -101,10 +101,9 @@ public void onNext(T t) {
                 }
             }
 
-            DebounceEmitter<T> de = new DebounceEmitter<>(t, idx, this);
-            timer = de;
-            d = worker.schedule(de, timeout, unit);
-            de.setResource(d);
+            DebounceEmitter<T> newEmitter = new DebounceEmitter<>(t, idx, this);
+            timer = newEmitter;
+            newEmitter.setResource(worker.schedule(newEmitter, timeout, unit));
         }
 
         @Override

From baad33135cb41685d08d480e043191c957f6012b Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 17 Jan 2023 09:23:43 +0100
Subject: [PATCH 400/665] 3.x: Fix Single.timeout race condition (#7515)

---
 .../operators/single/SingleTimeout.java       |  6 +----
 .../operators/single/SingleTimeoutTest.java   | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java
index 609747d1d8..cc5b923727 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeout.java
@@ -113,11 +113,7 @@ public void onError(Throwable e) {
 
         @Override
         public void run() {
-            Disposable d = get();
-            if (d != DisposableHelper.DISPOSED && compareAndSet(d, DisposableHelper.DISPOSED)) {
-                if (d != null) {
-                    d.dispose();
-                }
+            if (DisposableHelper.dispose(this)) {
                 SingleSource<? extends T> other = this.other;
                 if (other == null) {
                     downstream.onError(new TimeoutException(timeoutMessage(timeout, unit)));
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
index dcc526c4f6..e54fc11207 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleTimeoutTest.java
@@ -28,7 +28,7 @@
 import io.reactivex.rxjava3.functions.Action;
 import io.reactivex.rxjava3.observers.TestObserver;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
-import io.reactivex.rxjava3.schedulers.TestScheduler;
+import io.reactivex.rxjava3.schedulers.*;
 import io.reactivex.rxjava3.subjects.*;
 import io.reactivex.rxjava3.testsupport.TestHelper;
 
@@ -255,4 +255,24 @@ protected void subscribeActual(@NonNull SingleObserver<? super @NonNull Integer>
 
         assertTrue(d.isDisposed());
     }
+
+    @Test
+    public void timeoutWithZero() throws InterruptedException {
+        int n = 10_000;
+        Scheduler sch = Schedulers.single();
+        for (int i = 0; i < n; i++) {
+            final int y = i;
+            final CountDownLatch latch = new CountDownLatch(1);
+            Disposable d = Single.never()
+                    .timeout(0, TimeUnit.NANOSECONDS, sch)
+                    .subscribe(v -> {}, e -> {
+                        //System.out.println("timeout " + y);
+                        latch.countDown();
+                    });
+            if (!latch.await(2, TimeUnit.SECONDS)) {
+                System.out.println(d + " " + sch);
+                throw new IllegalStateException("Timeout did not work at y = " + y);
+            }
+        }
+    }
 }

From 6da9df3d96b90e4c10f862b9309e2830a4741140 Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Mon, 23 Jan 2023 20:37:06 +0900
Subject: [PATCH 401/665] Remove obsolete JFrog references in README.md (#7519)

---
 README.md | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/README.md b/README.md
index 53a42ee983..3d86f2fe93 100644
--- a/README.md
+++ b/README.md
@@ -579,19 +579,6 @@ dependencies {
 }
 ```
 
-Snapshots before May 1st, 2021 are available via https://oss.jfrog.org/libs-snapshot/io/reactivex/rxjava3/rxjava/
-(Note that due to the Sunset of Bintray, our jfrog access has been severed, hence the new snapshot repo above.)
-
-```groovy
-repositories {
-    maven { url 'https://oss.jfrog.org/libs-snapshot' }
-}
-
-dependencies {
-    implementation 'io.reactivex.rxjava3:rxjava:3.0.0-SNAPSHOT'
-}
-```
-
 JavaDoc snapshots are available at http://reactivex.io/RxJava/3.x/javadoc/snapshot
 
 ## Build

From 0eea996dc8afde11f7cd89a032f5a38e0d3affc4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Feb 2023 14:17:28 +0100
Subject: [PATCH 402/665] Bump gradle/wrapper-validation-action from 1.0.5 to
 1.0.6 (#7530)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1.0.5...v1.0.6)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index ba8bcb2bdb..64eb5bdee0 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1.0.5
+      - uses: gradle/wrapper-validation-action@v1.0.6

From 3468c8bfa1be6e12396c3b594d95f6c7f60eab77 Mon Sep 17 00:00:00 2001
From: Ruben Novelli <31356779+rdnovell@users.noreply.github.com>
Date: Tue, 7 Mar 2023 14:12:01 +0100
Subject: [PATCH 403/665] Change summary to caption, because summary is
 obsolete in HTML5 (#7534)

Co-authored-by: Ruben Novelli <rnovelli@redhat.com>
---
 src/main/java/io/reactivex/rxjava3/observers/package-info.java | 3 ++-
 src/main/java/io/reactivex/rxjava3/subjects/package-info.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/observers/package-info.java b/src/main/java/io/reactivex/rxjava3/observers/package-info.java
index ca7ea67c0c..09f56f3eb0 100644
--- a/src/main/java/io/reactivex/rxjava3/observers/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/observers/package-info.java
@@ -20,7 +20,8 @@
  * <p>
  * Available observer variants
  * <br>
- * <table border="1" style="border-collapse: collapse;" summary="The available observer types.">
+ * <table border="1" style="border-collapse: collapse;">
+ * <caption>The available observer types.</caption>
  * <tr><td><b>Reactive type</b></td><td><b>Base interface</b></td><td><b>Simple</b></td><td><b>Disposable</b></td><td><b>Resource</b></td></tr>
  * <tr>
  *     <td>{@link io.reactivex.rxjava3.core.Observable Observable}</td>
diff --git a/src/main/java/io/reactivex/rxjava3/subjects/package-info.java b/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
index 60c09e10c0..a2736d7eee 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/package-info.java
@@ -18,7 +18,8 @@
  * <p>
  * Available subject classes with their respective base classes and consumer interfaces:
  * <br>
- * <table border="1" style="border-collapse: collapse;" summary="The available subject classes with their respective base classes and consumer interfaces.">
+ * <table border="1" style="border-collapse: collapse;">
+ * <caption>The available subject classes with their respective base classes and consumer interfaces.</caption>
  * <tr><td><b>Subject type</b></td><td><b>Base class</b></td><td><b>Consumer interface</b></td></tr>
  * <tr>
  *     <td>{@link io.reactivex.rxjava3.subjects.Subject Subject}

From ed674be204210fe0804d64e28fdd356745915048 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 7 Mar 2023 14:53:41 +0100
Subject: [PATCH 404/665] 3.x: Try using https to access the reactive streams
 javadoc (#7535)

* Update build.gradle

* Self-hosting the Reactive Streams Javadoc

It was build with JDK 9 and lacks the `package-list` file that is required by JDK 8 Javadoc.

I had to unpack the official `-javadoc.jar` from maven and copy-pasted the `elements-list` as `package-list`. Let's hope it works.
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 69d41f1dfd..db0bb1db45 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,7 @@ javadoc {
 
     options.links(
             "https://docs.oracle.com/javase/8/docs/api/",
-            "http://www.reactive-streams.org/reactive-streams-${reactiveStreamsVersion}-javadoc/"
+            "https://reactivex.io/RxJava/org.reactivestreams.javadoc/${reactiveStreamsVersion}/"
     )
 
     finalizedBy javadocCleanup

From bfe4aba423d03c28394831bfee8eb964f586d730 Mon Sep 17 00:00:00 2001
From: Joyce <joycebrumu.u@gmail.com>
Date: Tue, 14 Mar 2023 17:36:31 -0300
Subject: [PATCH 405/665] Add minimum GitHub token permissions for workflows
 (#7541)

* Update gradle_release.yml to contents write

* Update gradle_snapshot.yml to contents write
---
 .github/workflows/gradle_release.yml  | 5 +++++
 .github/workflows/gradle_snapshot.yml | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index da5931624c..1a32ddb249 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -10,10 +10,15 @@ on:
     tags:
       - 'v3.*.*'   
 
+permissions:
+  contents: read
+
 jobs:
   build:
 
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index c241705126..8d1be2f111 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -6,12 +6,17 @@ name: Snapshot
 on:
   push:
     branches: [ '3.x' ]
+    
+permissions:
+  contents: read
 
 jobs:
   build:
 
     runs-on: ubuntu-latest
     if: github.repository == 'ReactiveX/RxJava'
+    permissions:
+      contents: write
     env:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}

From 329e8c91c2999826d7e689be754857cd6f9e1f14 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 14 Mar 2023 22:04:03 +0100
Subject: [PATCH 406/665] Update Disposable.java

Trigger a snapshot javadoc update
---
 .../rxjava3/disposables/Disposable.java       | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
index 67fd235086..845d603171 100644
--- a/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
+++ b/src/main/java/io/reactivex/rxjava3/disposables/Disposable.java
@@ -40,8 +40,8 @@ public interface Disposable {
     /**
      * Construct a {@code Disposable} by wrapping a {@link Runnable} that is
      * executed exactly once when the {@code Disposable} is disposed.
-     * @param run the Runnable to wrap
-     * @return the new Disposable instance
+     * @param run the {@code Runnable} to wrap
+     * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code run} is {@code null}
      * @since 3.0.0
      */
@@ -54,8 +54,8 @@ static Disposable fromRunnable(@NonNull Runnable run) {
     /**
      * Construct a {@code Disposable} by wrapping a {@link Action} that is
      * executed exactly once when the {@code Disposable} is disposed.
-     * @param action the Action to wrap
-     * @return the new Disposable instance
+     * @param action the {@code Action} to wrap
+     * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code action} is {@code null}
      * @since 3.0.0
      */
@@ -70,8 +70,8 @@ static Disposable fromAction(@NonNull Action action) {
      * cancelled exactly once when the {@code Disposable} is disposed.
      * <p>
      * The {@code Future} is cancelled with {@code mayInterruptIfRunning == true}.
-     * @param future the Future to wrap
-     * @return the new Disposable instance
+     * @param future the {@code Future} to wrap
+     * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code future} is {@code null}
      * @see #fromFuture(Future, boolean)
      * @since 3.0.0
@@ -85,9 +85,9 @@ static Disposable fromFuture(@NonNull Future<?> future) {
     /**
      * Construct a {@code Disposable} by wrapping a {@link Future} that is
      * cancelled exactly once when the {@code Disposable} is disposed.
-     * @param future the Future to wrap
+     * @param future the {@code Future} to wrap
      * @param allowInterrupt if true, the future cancel happens via {@code Future.cancel(true)}
-     * @return the new Disposable instance
+     * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code future} is {@code null}
      * @since 3.0.0
      */
@@ -100,8 +100,8 @@ static Disposable fromFuture(@NonNull Future<?> future, boolean allowInterrupt)
     /**
      * Construct a {@code Disposable} by wrapping a {@link Subscription} that is
      * cancelled exactly once when the {@code Disposable} is disposed.
-     * @param subscription the Runnable to wrap
-     * @return the new Disposable instance
+     * @param subscription the {@code Runnable} to wrap
+     * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code subscription} is {@code null}
      * @since 3.0.0
      */
@@ -114,8 +114,8 @@ static Disposable fromSubscription(@NonNull Subscription subscription) {
     /**
      * Construct a {@code Disposable} by wrapping an {@link AutoCloseable} that is
      * closed exactly once when the {@code Disposable} is disposed.
-     * @param autoCloseable the AutoCloseable to wrap
-     * @return the new Disposable instance
+     * @param autoCloseable the {@code AutoCloseable} to wrap
+     * @return the new {@code Disposable} instance
      * @throws NullPointerException if {@code autoCloseable} is {@code null}
      * @since 3.0.0
      */
@@ -128,8 +128,8 @@ static Disposable fromAutoCloseable(@NonNull AutoCloseable autoCloseable) {
     /**
      * Construct an {@link AutoCloseable} by wrapping a {@code Disposable} that is
      * disposed when the returned {@code AutoCloseable} is closed.
-     * @param disposable the Disposable instance
-     * @return the new AutoCloseable instance
+     * @param disposable the {@code Disposable} instance
+     * @return the new {@code AutoCloseable} instance
      * @throws NullPointerException if {@code disposable} is {@code null}
      * @since 3.0.0
      */

From 4e2e9a285ecad85b37d4e0091fff318bae1831aa Mon Sep 17 00:00:00 2001
From: Des Petrov <desislavpetrov@gmail.com>
Date: Tue, 21 Mar 2023 19:18:33 +0000
Subject: [PATCH 407/665] Add onDropped callback for onBackpressureLatest -
 #7458 (#7542)

---
 .../io/reactivex/rxjava3/core/Flowable.java   | 41 +++++++++++-
 .../FlowableOnBackpressureLatest.java         | 26 +++++--
 .../FlowableOnBackpressureLatestTest.java     | 67 ++++++++++++++++++-
 3 files changed, 128 insertions(+), 6 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index d9cea6954f..55465fa042 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -12755,7 +12755,46 @@ public final Flowable<T> onBackpressureDrop(@NonNull Consumer<? super T> onDrop)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
     public final Flowable<T> onBackpressureLatest() {
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureLatest<>(this));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureLatest<>(this, null));
+    }
+
+    /**
+     * Drops all but the latest item emitted by the current {@code Flowable} if the downstream is not ready to receive
+     * new items (indicated by a lack of {@link Subscription#request(long)} calls from it) and emits this latest
+     * item when the downstream becomes ready.
+     * <p>
+     * <img width="640" height="245" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.latest.v3.png" alt="">
+     * <p>
+     * Its behavior is logically equivalent to {@code blockingLatest()} with the exception that
+     * the downstream is not blocking while requesting more values.
+     * <p>
+     * Note that if the current {@code Flowable} does support backpressure, this operator ignores that capability
+     * and doesn't propagate any backpressure requests from downstream.
+     * <p>
+     * Note that due to the nature of how backpressure requests are propagated through subscribeOn/observeOn,
+     * requesting more than 1 from downstream doesn't guarantee a continuous delivery of {@code onNext} events.
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
+     *  manner (i.e., not applying backpressure to it).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onBackpressureLatest} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param onDropped
+     *        called with the current entry when it has been replaced by a new one
+     * @throws NullPointerException if {@code onDropped} is {@code null}
+     * @return the new {@code Flowable} instance
+     * @since 3.1.7
+     */
+    @CheckReturnValue
+    @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @NonNull
+    @Experimental
+     public final Flowable<T> onBackpressureLatest(@NonNull Consumer<? super T> onDropped) {
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureLatest<>(this, onDropped));
     }
 
     /**
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
index 1a98831bd2..155e284e93 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatest.java
@@ -14,30 +14,48 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import io.reactivex.rxjava3.core.Flowable;
+import io.reactivex.rxjava3.exceptions.Exceptions;
+import io.reactivex.rxjava3.functions.Consumer;
 import org.reactivestreams.Subscriber;
 
 public final class FlowableOnBackpressureLatest<T> extends AbstractFlowableWithUpstream<T, T> {
 
-    public FlowableOnBackpressureLatest(Flowable<T> source) {
+    final Consumer<? super T> onDropped;
+
+    public FlowableOnBackpressureLatest(Flowable<T> source, Consumer<? super T> onDropped) {
         super(source);
+        this.onDropped = onDropped;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new BackpressureLatestSubscriber<>(s));
+        source.subscribe(new BackpressureLatestSubscriber<>(s, onDropped));
     }
 
     static final class BackpressureLatestSubscriber<T> extends AbstractBackpressureThrottlingSubscriber<T, T> {
 
         private static final long serialVersionUID = 163080509307634843L;
 
-        BackpressureLatestSubscriber(Subscriber<? super T> downstream) {
+        final Consumer<? super T> onDropped;
+
+        BackpressureLatestSubscriber(Subscriber<? super T> downstream,
+                                     Consumer<? super T> onDropped) {
             super(downstream);
+            this.onDropped = onDropped;
         }
 
         @Override
         public void onNext(T t) {
-            current.lazySet(t);
+            T oldValue = current.getAndSet(t);
+            if (onDropped != null && oldValue != null) {
+                try {
+                    onDropped.accept(oldValue);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    upstream.cancel();
+                    downstream.onError(ex);
+                }
+            }
             drain();
         }
     }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
index eb4cfaf288..f0d50994ed 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureLatestTest.java
@@ -17,6 +17,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.junit.*;
+import org.mockito.InOrder;
 import org.reactivestreams.Publisher;
 
 import io.reactivex.rxjava3.core.*;
@@ -27,6 +28,8 @@
 import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import io.reactivex.rxjava3.testsupport.*;
 
+import static org.mockito.Mockito.inOrder;
+
 public class FlowableOnBackpressureLatestTest extends RxJavaTest {
     @Test
     public void simple() {
@@ -62,6 +65,68 @@ public void simpleBackpressure() {
         ts.assertNotComplete();
     }
 
+    @Test
+    public void simpleBackpressureWithOnDroppedCallback() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
+
+        Observer<Object> dropCallbackObserver = TestHelper.mockObserver();
+
+        source.onBackpressureLatest(dropCallbackObserver::onNext)
+                .subscribe(ts);
+
+        ts.assertNoValues();
+
+        source.onNext(1);
+        source.onNext(2);
+        source.onNext(3);
+
+        ts.request(1);
+
+        ts.assertValues(3);
+
+        source.onNext(4);
+        source.onNext(5);
+
+        ts.request(2);
+
+        ts.assertValues(3,5);
+
+        InOrder dropCallbackOrder = inOrder(dropCallbackObserver);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(1);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(2);
+        dropCallbackOrder.verify(dropCallbackObserver).onNext(4);
+        dropCallbackOrder.verifyNoMoreInteractions();
+    }
+
+    @Test
+    public void simpleBackpressureWithOnDroppedCallbackEx() {
+        PublishProcessor<Integer> source = PublishProcessor.create();
+        TestSubscriberEx<Integer> ts = new TestSubscriberEx<>(0L);
+
+        source.onBackpressureLatest(e -> {
+                    if (e == 3) {
+                        throw new TestException("forced");
+                    }
+                })
+                .subscribe(ts);
+
+        ts.assertNoValues();
+
+        source.onNext(1);
+        source.onNext(2);
+
+        ts.request(1);
+
+        ts.assertValues(2);
+
+        source.onNext(3);
+        source.onNext(4);
+
+        ts.assertError(TestException.class);
+        ts.assertValues(2);
+    }
+
     @Test
     public void synchronousDrop() {
         PublishProcessor<Integer> source = PublishProcessor.create();
@@ -105,7 +170,7 @@ public void synchronousDrop() {
     }
 
     @Test
-    public void asynchronousDrop() throws InterruptedException {
+    public void asynchronousDrop() {
         TestSubscriberEx<Integer> ts = new TestSubscriberEx<Integer>(1L) {
             final Random rnd = new Random();
             @Override

From 06e52db5356c7cda93480e5019959ff5c651938e Mon Sep 17 00:00:00 2001
From: Joyce <joycebrum@google.com>
Date: Tue, 21 Mar 2023 16:31:12 -0300
Subject: [PATCH 408/665] Create SECURITY.md (#7546)

Signed-off-by: Joyce <joycebrum@google.com>
---
 SECURITY.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..1003574331
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+If you have discovered a security vulnerability in this project, please report it privately. **Do not disclose it as a public issue.** This gives us time to work with you to fix the issue before public exposure, reducing the chance that the exploit will be used before a patch is released.
+
+Please disclose it at [security advisory](https://github.com/ReactiveX/RxJava/security/advisories/new).
+
+This project is maintained by a team of volunteers on a reasonable-effort basis. As such, please give us at least 90 days to work on a fix before public exposure.

From 9cd59f173cb5fbef9fdbb8cea17b8189eef86273 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 11:42:14 +0200
Subject: [PATCH 409/665] Bump actions/cache from 3.0.11 to 3.3.1 (#7539)

Bumps [actions/cache](https://github.com/actions/cache) from 3.0.11 to 3.3.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3.0.11...v3.3.1)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 7651fade8e..a28d422afe 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.11
+      uses: actions/cache@v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 814540148b..b02da5c18c 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.11
+      uses: actions/cache@v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index c240adbd8e..71b63a227b 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.11
+      uses: actions/cache@v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 1a32ddb249..067050c4fa 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.11
+      uses: actions/cache@v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 8d1be2f111..b6a481ab16 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.0.11
+      uses: actions/cache@v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From df3c2b9b63ccd18944c62fc41bf812000a7d2a4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 May 2023 11:42:44 +0200
Subject: [PATCH 410/665] Bump ru.vyarus.animalsniffer from 1.6.0 to 1.7.0
 (#7525)

Bumps ru.vyarus.animalsniffer from 1.6.0 to 1.7.0.

---
updated-dependencies:
- dependency-name: ru.vyarus.animalsniffer
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index db0bb1db45..6bc9998725 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id("eclipse")
     id("jacoco")
     id("maven-publish")
-    id("ru.vyarus.animalsniffer") version "1.6.0"
+    id("ru.vyarus.animalsniffer") version "1.7.0"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.4.0"

From 067f3cb9ac26a4661ecbeb11f5b5d04adcb47e82 Mon Sep 17 00:00:00 2001
From: tobi5775 <50146675+tobi5775@users.noreply.github.com>
Date: Mon, 22 May 2023 11:44:46 +0200
Subject: [PATCH 411/665] add copyright and license to jar (#7520)

* add copyright and license to jar

* add copyright and license to META-INF
---
 COPYRIGHT    | 13 +++++++++++++
 build.gradle |  6 ++++++
 2 files changed, 19 insertions(+)
 create mode 100644 COPYRIGHT

diff --git a/COPYRIGHT b/COPYRIGHT
new file mode 100644
index 0000000000..5d2c6e53f3
--- /dev/null
+++ b/COPYRIGHT
@@ -0,0 +1,13 @@
+Copyright (c) 2016-present, RxJava Contributors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 6bc9998725..ad48b5a6e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -87,6 +87,12 @@ animalsniffer {
 }
 
 jar {
+    from('.') {
+        include 'LICENSE'
+        include 'COPYRIGHT'
+        into('META-INF/')
+    }
+
     // Cover for bnd still not supporting MR Jars: https://github.com/bndtools/bnd/issues/2227
     bnd('-fixupmessages': '^Classes found in the wrong directory: \\\\{META-INF/versions/9/module-info\\\\.class=module-info}$')
     bnd(

From 919d310ac1f73959ddea7a0e8e1d1c773b33bc01 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 23 May 2023 10:08:58 +0200
Subject: [PATCH 412/665] 3.x: Add onDropped callback to onBackpressureBuffer
 (#7567)

* 3.x: Add onDropped callback to onBackpressureBuffer

Related #7458

* MBE is expected

* Annotate with experimental
---
 .../io/reactivex/rxjava3/core/Flowable.java   |  98 ++++++++++++++++-
 .../FlowableOnBackpressureBuffer.java         |  13 ++-
 .../FlowableOnBackpressureBufferStrategy.java |  58 +++++++---
 ...wableOnBackpressureBufferStrategyTest.java | 101 +++++++++++++++++-
 .../FlowableOnBackpressureBufferTest.java     |  48 +++++++++
 .../ParamValidationCheckerTest.java           |   1 +
 6 files changed, 293 insertions(+), 26 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 55465fa042..4d277ab08b 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -12546,7 +12546,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError)
     @NonNull
     public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError, boolean unbounded) {
         ObjectHelper.verifyPositive(capacity, "capacity");
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<>(this, capacity, unbounded, delayError, Functions.EMPTY_ACTION));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<>(this, capacity, unbounded, delayError, Functions.EMPTY_ACTION, Functions.emptyConsumer()));
     }
 
     /**
@@ -12577,6 +12577,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
      * @throws NullPointerException if {@code onOverflow} is {@code null}
      * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
+     * @see #onBackpressureBuffer(int, boolean, boolean, Action, Consumer)
      * @since 1.1.0
      */
     @CheckReturnValue
@@ -12587,7 +12588,51 @@ public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError,
             @NonNull Action onOverflow) {
         Objects.requireNonNull(onOverflow, "onOverflow is null");
         ObjectHelper.verifyPositive(capacity, "capacity");
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<>(this, capacity, unbounded, delayError, onOverflow));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<>(this, capacity, unbounded, delayError, onOverflow, Functions.emptyConsumer()));
+    }
+
+    /**
+     * Buffers an optionally unlimited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place.
+     * If {@code unbounded} is {@code true}, the resulting {@code Flowable} will signal a
+     * {@link MissingBackpressureException} via {@code onError} as soon as the buffer's capacity is exceeded, dropping all undelivered
+     * items, canceling the flow and calling the {@code onOverflow} action.
+     * <p>
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
+     *  manner (i.e., not applying backpressure to it).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param capacity number of slots available in the buffer.
+     * @param delayError
+     *                if {@code true}, an exception from the current {@code Flowable} is delayed until all buffered elements have been
+     *                consumed by the downstream; if {@code false}, an exception is immediately signaled to the downstream, skipping
+     *                any buffered element
+     * @param unbounded
+     *                if {@code true}, the capacity value is interpreted as the internal "island" size of the unbounded buffer
+     * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots.
+     * @param onDropped the {@link Consumer} to be called with the item that could not be buffered due to capacity constraints.
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code onOverflow} or {@code onDropped} is {@code null}
+     * @throws IllegalArgumentException if {@code capacity} is non-positive
+     * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
+     * @since 3.1.7
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.SPECIAL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @Experimental
+    public final Flowable<T> onBackpressureBuffer(int capacity, boolean delayError, boolean unbounded,
+            @NonNull Action onOverflow, @NonNull Consumer<? super T> onDropped) {
+        Objects.requireNonNull(onOverflow, "onOverflow is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        ObjectHelper.verifyPositive(capacity, "capacity");
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBuffer<>(this, capacity, unbounded, delayError, onOverflow, onDropped));
     }
 
     /**
@@ -12653,6 +12698,7 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
      * @throws NullPointerException if {@code onOverflow} or {@code overflowStrategy} is {@code null}
      * @throws IllegalArgumentException if {@code capacity} is non-positive
      * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
+     * @see #onBackpressureBuffer(long, Action, BackpressureOverflowStrategy)
      * @since 2.0
      */
     @CheckReturnValue
@@ -12662,9 +12708,55 @@ public final Flowable<T> onBackpressureBuffer(int capacity, @NonNull Action onOv
     public final Flowable<T> onBackpressureBuffer(long capacity, @Nullable Action onOverflow, @NonNull BackpressureOverflowStrategy overflowStrategy) {
         Objects.requireNonNull(overflowStrategy, "overflowStrategy is null");
         ObjectHelper.verifyPositive(capacity, "capacity");
-        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBufferStrategy<>(this, capacity, onOverflow, overflowStrategy));
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBufferStrategy<>(this, capacity, onOverflow, overflowStrategy, null));
     }
 
+    /**
+     * Buffers an optionally unlimited number of items from the current {@code Flowable} and allows it to emit as fast it can while allowing the
+     * downstream to consume the items at its own place.
+     * The resulting {@code Flowable} will behave as determined by {@code overflowStrategy} if the buffer capacity is exceeded:
+     * <ul>
+     *     <li>{@link BackpressureOverflowStrategy#ERROR} (default) will call {@code onError} dropping all undelivered items,
+     *     canceling the source, and notifying the producer with {@code onOverflow}. </li>
+     *     <li>{@link BackpressureOverflowStrategy#DROP_LATEST} will drop any new items emitted by the producer while
+     *     the buffer is full, without generating any {@code onError}.  Each drop will, however, invoke {@code onOverflow}
+     *     to signal the overflow to the producer.</li>
+     *     <li>{@link BackpressureOverflowStrategy#DROP_OLDEST} will drop the oldest items in the buffer in order to make
+     *     room for newly emitted ones. Overflow will not generate an {@code onError}, but each drop will invoke
+     *     {@code onOverflow} to signal the overflow to the producer.</li>
+     * </ul>
+     *
+     * <p>
+     * <img width="640" height="300" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/bp.obp.buffer.v3.png" alt="">
+     * <dl>
+     *  <dt><b>Backpressure:</b></dt>
+     *  <dd>The operator honors backpressure from downstream and consumes the current {@code Flowable} in an unbounded
+     *  manner (i.e., not applying backpressure to it).</dd>
+     *  <dt><b>Scheduler:</b></dt>
+     *  <dd>{@code onBackpressureBuffer} does not operate by default on a particular {@link Scheduler}.</dd>
+     * </dl>
+     *
+     * @param capacity number of slots available in the buffer.
+     * @param onOverflow action to execute if an item needs to be buffered, but there are no available slots, {@code null} is allowed.
+     * @param overflowStrategy how should the resulting {@code Flowable} react to buffer overflows, {@code null} is not allowed.
+     * @param onDropped the {@link Consumer} to be called with the item that could not be buffered due to capacity constraints.
+     * @return the new {@code Flowable} instance
+     * @throws NullPointerException if {@code onOverflow}, {@code overflowStrategy} or {@code onDropped} is {@code null}
+     * @throws IllegalArgumentException if {@code capacity} is non-positive
+     * @see <a href="http://reactivex.io/documentation/operators/backpressure.html">ReactiveX operators documentation: backpressure operators</a>
+     * @since 3.1.7
+     */
+    @CheckReturnValue
+    @NonNull
+    @BackpressureSupport(BackpressureKind.SPECIAL)
+    @SchedulerSupport(SchedulerSupport.NONE)
+    @Experimental
+    public final Flowable<T> onBackpressureBuffer(long capacity, @Nullable Action onOverflow, @NonNull BackpressureOverflowStrategy overflowStrategy, @NonNull Consumer<? super T> onDropped) {
+        Objects.requireNonNull(overflowStrategy, "overflowStrategy is null");
+        Objects.requireNonNull(onDropped, "onDropped is null");
+        ObjectHelper.verifyPositive(capacity, "capacity");
+        return RxJavaPlugins.onAssembly(new FlowableOnBackpressureBufferStrategy<>(this, capacity, onOverflow, overflowStrategy, onDropped));
+    }
     /**
      * Drops items from the current {@code Flowable} if the downstream is not ready to receive new items (indicated
      * by a lack of {@link Subscription#request(long)} calls from it).
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
index 8261df29dc..db58b68a10 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBuffer.java
@@ -20,7 +20,7 @@
 import io.reactivex.rxjava3.annotations.Nullable;
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.subscriptions.*;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 import io.reactivex.rxjava3.operators.*;
@@ -30,19 +30,21 @@ public final class FlowableOnBackpressureBuffer<T> extends AbstractFlowableWithU
     final boolean unbounded;
     final boolean delayError;
     final Action onOverflow;
+    final Consumer<? super T> onDropped;
 
     public FlowableOnBackpressureBuffer(Flowable<T> source, int bufferSize, boolean unbounded,
-            boolean delayError, Action onOverflow) {
+            boolean delayError, Action onOverflow, Consumer<? super T> onDropped) {
         super(source);
         this.bufferSize = bufferSize;
         this.unbounded = unbounded;
         this.delayError = delayError;
         this.onOverflow = onOverflow;
+        this.onDropped = onDropped;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new BackpressureBufferSubscriber<>(s, bufferSize, unbounded, delayError, onOverflow));
+        source.subscribe(new BackpressureBufferSubscriber<>(s, bufferSize, unbounded, delayError, onOverflow, onDropped));
     }
 
     static final class BackpressureBufferSubscriber<T> extends BasicIntQueueSubscription<T> implements FlowableSubscriber<T> {
@@ -53,6 +55,7 @@ static final class BackpressureBufferSubscriber<T> extends BasicIntQueueSubscrip
         final SimplePlainQueue<T> queue;
         final boolean delayError;
         final Action onOverflow;
+        final Consumer<? super T> onDropped;
 
         Subscription upstream;
 
@@ -66,10 +69,11 @@ static final class BackpressureBufferSubscriber<T> extends BasicIntQueueSubscrip
         boolean outputFused;
 
         BackpressureBufferSubscriber(Subscriber<? super T> actual, int bufferSize,
-                boolean unbounded, boolean delayError, Action onOverflow) {
+                boolean unbounded, boolean delayError, Action onOverflow, Consumer<? super T> onDropped) {
             this.downstream = actual;
             this.onOverflow = onOverflow;
             this.delayError = delayError;
+            this.onDropped = onDropped;
 
             SimplePlainQueue<T> q;
 
@@ -98,6 +102,7 @@ public void onNext(T t) {
                 MissingBackpressureException ex = new MissingBackpressureException("Buffer is full");
                 try {
                     onOverflow.run();
+                    onDropped.accept(t);
                 } catch (Throwable e) {
                     Exceptions.throwIfFatal(e);
                     ex.initCause(e);
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
index 29a207fba5..7963fb7d40 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategy.java
@@ -20,7 +20,7 @@
 
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.*;
-import io.reactivex.rxjava3.functions.Action;
+import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.subscriptions.SubscriptionHelper;
 import io.reactivex.rxjava3.internal.util.BackpressureHelper;
 import io.reactivex.rxjava3.plugins.RxJavaPlugins;
@@ -38,17 +38,21 @@ public final class FlowableOnBackpressureBufferStrategy<T> extends AbstractFlowa
 
     final BackpressureOverflowStrategy strategy;
 
+    final Consumer<? super T> onDropped;
+
     public FlowableOnBackpressureBufferStrategy(Flowable<T> source,
-            long bufferSize, Action onOverflow, BackpressureOverflowStrategy strategy) {
+            long bufferSize, Action onOverflow, BackpressureOverflowStrategy strategy,
+            Consumer<? super T> onDropped) {
         super(source);
         this.bufferSize = bufferSize;
         this.onOverflow = onOverflow;
         this.strategy = strategy;
+        this.onDropped = onDropped;
     }
 
     @Override
     protected void subscribeActual(Subscriber<? super T> s) {
-        source.subscribe(new OnBackpressureBufferStrategySubscriber<>(s, onOverflow, strategy, bufferSize));
+        source.subscribe(new OnBackpressureBufferStrategySubscriber<>(s, onOverflow, strategy, bufferSize, onDropped));
     }
 
     static final class OnBackpressureBufferStrategySubscriber<T>
@@ -61,6 +65,8 @@ static final class OnBackpressureBufferStrategySubscriber<T>
 
         final Action onOverflow;
 
+        final Consumer<? super T> onDropped;
+
         final BackpressureOverflowStrategy strategy;
 
         final long bufferSize;
@@ -77,13 +83,15 @@ static final class OnBackpressureBufferStrategySubscriber<T>
         Throwable error;
 
         OnBackpressureBufferStrategySubscriber(Subscriber<? super T> actual, Action onOverflow,
-                BackpressureOverflowStrategy strategy, long bufferSize) {
+                BackpressureOverflowStrategy strategy, long bufferSize,
+                Consumer<? super T> onDropped) {
             this.downstream = actual;
             this.onOverflow = onOverflow;
             this.strategy = strategy;
             this.bufferSize = bufferSize;
             this.requested = new AtomicLong();
             this.deque = new ArrayDeque<>();
+            this.onDropped = onDropped;
         }
 
         @Override
@@ -104,44 +112,60 @@ public void onNext(T t) {
             }
             boolean callOnOverflow = false;
             boolean callError = false;
+            boolean callDrain = false;
             Deque<T> dq = deque;
+            T toDrop = null;
             synchronized (dq) {
                if (dq.size() == bufferSize) {
                    switch (strategy) {
                    case DROP_LATEST:
-                       dq.pollLast();
+                       toDrop = dq.pollLast();
                        dq.offer(t);
                        callOnOverflow = true;
                        break;
                    case DROP_OLDEST:
-                       dq.poll();
+                       toDrop = dq.poll();
                        dq.offer(t);
                        callOnOverflow = true;
                        break;
                    default:
                        // signal error
+                       toDrop = t;
                        callError = true;
                        break;
                    }
                } else {
                    dq.offer(t);
+                   callDrain = true;
                }
             }
 
-            if (callOnOverflow) {
-                if (onOverflow != null) {
-                    try {
-                        onOverflow.run();
-                    } catch (Throwable ex) {
-                        Exceptions.throwIfFatal(ex);
-                        upstream.cancel();
-                        onError(ex);
-                    }
+            if (callOnOverflow && onOverflow != null) {
+                try {
+                    onOverflow.run();
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    upstream.cancel();
+                    onError(ex);
+                }
+            }
+
+            if (onDropped != null && toDrop != null) {
+                try {
+                    onDropped.accept(toDrop);
+                } catch (Throwable ex) {
+                    Exceptions.throwIfFatal(ex);
+                    upstream.cancel();
+                    onError(ex);
                 }
-            } else if (callError) {
+            }
+
+            if (callError) {
                 upstream.cancel();
                 onError(MissingBackpressureException.createDefault());
-            } else {
+            }
+
+            if (callDrain) {
                 drain();
             }
         }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
index 4fc8ba3c25..217162c206 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferStrategyTest.java
@@ -15,7 +15,9 @@
 
 import static io.reactivex.rxjava3.core.BackpressureOverflowStrategy.*;
 import static io.reactivex.rxjava3.internal.functions.Functions.EMPTY_ACTION;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
 
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -28,8 +30,9 @@
 import io.reactivex.rxjava3.functions.*;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.internal.subscriptions.BooleanSubscription;
+import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.subscribers.*;
-import io.reactivex.rxjava3.testsupport.TestHelper;
+import io.reactivex.rxjava3.testsupport.*;
 
 public class FlowableOnBackpressureBufferStrategyTest extends RxJavaTest {
 
@@ -225,4 +228,98 @@ public void cancelOnDrain() {
         .requestMore(10)
         .assertResult(1);
     }
+
+    @Test
+    public void onDroppedNormalDropOldest() throws Throwable {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> onDropped = mock(Consumer.class);
+
+        TestSubscriber<Integer> ts = pp.onBackpressureBuffer(1, null, BackpressureOverflowStrategy.DROP_OLDEST, onDropped)
+        .test(0L);
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertEmpty();
+        verify(onDropped, never()).accept(any());
+
+        pp.onNext(2);
+
+        ts.assertEmpty();
+
+        verify(onDropped).accept(1);
+    }
+
+    @Test
+    public void onDroppedNormalDropLatest() throws Throwable {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> onDropped = mock(Consumer.class);
+
+        TestSubscriber<Integer> ts = pp.onBackpressureBuffer(2, null, BackpressureOverflowStrategy.DROP_LATEST, onDropped)
+        .test(0L);
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        pp.onNext(2);
+
+        ts.assertEmpty();
+        verify(onDropped, never()).accept(any());
+
+        pp.onNext(3);
+
+        ts.assertEmpty();
+
+        verify(onDropped).accept(2);
+    }
+
+    @Test
+    public void onDroppedNormalError() throws Throwable {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> onDropped = mock(Consumer.class);
+
+        TestSubscriber<Integer> ts = pp.onBackpressureBuffer(1, null, BackpressureOverflowStrategy.ERROR, onDropped)
+        .test(0L);
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertEmpty();
+        verify(onDropped, never()).accept(any());
+
+        pp.onNext(2);
+
+        ts.assertFailure(MissingBackpressureException.class);
+
+        verify(onDropped).accept(2);
+    }
+
+    @Test
+    public void onDroppedCrash() throws Throwable {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        Consumer<Integer> onDropped = v -> { throw new TestException(); };
+
+        TestSubscriberEx<Integer> ts = pp.onBackpressureBuffer(1, null, BackpressureOverflowStrategy.DROP_OLDEST, onDropped)
+        .subscribeWith(new TestSubscriberEx<Integer>(0L));
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertFailure(TestException.class);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
index 5a02218423..657ce36f1b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableOnBackpressureBufferTest.java
@@ -14,6 +14,8 @@
 package io.reactivex.rxjava3.internal.operators.flowable;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
 
 import java.util.List;
 import java.util.concurrent.*;
@@ -350,4 +352,50 @@ public void doubleOnSubscribe() {
     public void badRequest() {
         TestHelper.assertBadRequestReported(Flowable.never().onBackpressureBuffer());
     }
+
+    @Test
+    public void onDroppedNormal() throws Throwable {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        @SuppressWarnings("unchecked")
+        Consumer<Integer> onDropped = mock(Consumer.class);
+
+        TestSubscriber<Integer> ts = pp.onBackpressureBuffer(1, false, false, () -> { }, onDropped)
+                .test(0L);
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertEmpty();
+        verify(onDropped, never()).accept(any());
+
+        pp.onNext(2);
+
+        ts.assertFailure(MissingBackpressureException.class);
+
+        verify(onDropped).accept(2);
+    }
+
+    @Test
+    public void onDroppedCrash() throws Throwable {
+        PublishProcessor<Integer> pp = PublishProcessor.create();
+
+        Consumer<Integer> onDropped = v -> { throw new TestException(); };
+
+        TestSubscriberEx<Integer> ts = pp.onBackpressureBuffer(1, false, false, () -> { }, onDropped)
+        .subscribeWith(new TestSubscriberEx<Integer>(0L));
+
+        ts.assertEmpty();
+
+        pp.onNext(1);
+
+        ts.assertEmpty();
+
+        pp.onNext(2);
+
+        ts.assertFailure(MissingBackpressureException.class);
+
+        assertTrue(ts.errors().get(0).getCause() instanceof TestException);
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
index 8dd240119b..c2ca87d4d2 100644
--- a/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
+++ b/src/test/java/io/reactivex/rxjava3/validators/ParamValidationCheckerTest.java
@@ -153,6 +153,7 @@ public void checkParallelFlowable() {
 
         // null Action allowed
         addOverride(new ParamOverride(Flowable.class, 1, ParamMode.ANY, "onBackpressureBuffer", Long.TYPE, Action.class, BackpressureOverflowStrategy.class));
+        addOverride(new ParamOverride(Flowable.class, 1, ParamMode.ANY, "onBackpressureBuffer", Long.TYPE, Action.class, BackpressureOverflowStrategy.class, Consumer.class));
 
         // zero repeat is allowed
         addOverride(new ParamOverride(Flowable.class, 0, ParamMode.NON_NEGATIVE, "repeat", Long.TYPE));

From 408f6d8c629a63eb5db12cb2191fbcf284c5df75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 30 May 2023 11:49:42 +0200
Subject: [PATCH 413/665] Bump com.google.guava:guava from 31.1-jre to
 32.0.0-jre (#7568)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 31.1-jre to 32.0.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ad48b5a6e2..a1553ed22d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "31.1-jre"
+    guavaVersion = "32.0.0-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From e7eedba9192a6a60e42dda0bc78ecc1f72a15211 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 9 Jun 2023 08:17:30 +0200
Subject: [PATCH 414/665] Bump com.google.guava:guava from 32.0.0-jre to
 32.0.1-jre (#7570)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.0.0-jre to 32.0.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index a1553ed22d..ca31799156 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "32.0.0-jre"
+    guavaVersion = "32.0.1-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From b5ad3d93a16874a80555812450ed965e7fe9f5a2 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 9 Jun 2023 12:59:05 +0200
Subject: [PATCH 415/665] Update README.md

Link to JDK 9 and JDK 21 interop libraries
---
 README.md | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 3d86f2fe93..85b49a6b22 100644
--- a/README.md
+++ b/README.md
@@ -11,16 +11,19 @@ It extends the [observer pattern](http://en.wikipedia.org/wiki/Observer_pattern)
 
 #### Version 3.x ([Javadoc](http://reactivex.io/RxJava/3.x/javadoc/))
 
-- single dependency: [Reactive-Streams](https://github.com/reactive-streams/reactive-streams-jvm)  
-- Java 8+ or Android API 21+ required
-- Java 8 lambda-friendly API
-- [Android](https://github.com/ReactiveX/RxAndroid) desugar friendly
-- fixed API mistakes and many limits of RxJava 2
-- intended to be a replacement for RxJava 2 with relatively few binary incompatible changes
-- non-opinionated about the source of concurrency (threads, pools, event loops, fibers, actors, etc.)
-- async or synchronous execution
-- virtual time and schedulers for parameterized concurrency
-- test and diagnostic support via test schedulers, test consumers and plugin hooks
+- Single dependency: [Reactive-Streams](https://github.com/reactive-streams/reactive-streams-jvm).
+- Java 8+ or Android API 21+ required.
+- Java 8 lambda-friendly API.
+- [Android](https://github.com/ReactiveX/RxAndroid) desugar friendly.
+- Fixed API mistakes and many limits of RxJava 2.
+- Intended to be a replacement for RxJava 2 with relatively few binary incompatible changes.
+- Non-opinionated about the source of concurrency (threads, pools, event loops, fibers, actors, etc.).
+- Async or synchronous execution.
+- Virtual time and schedulers for parameterized concurrency.
+- Test and diagnostic support via test schedulers, test consumers and plugin hooks.
+- Interop with newer JDK versions via 3rd party libraries, such as
+  - [Java 9 Flow API](https://github.com/akarnokd/RxJavaJdk9Interop)
+  - [Java 21 Virtual Threads](https://github.com/akarnokd/RxJavaFiberInterop#rxjavafiberinterop)
 
 Learn more about RxJava in general on the <a href="https://github.com/ReactiveX/RxJava/wiki">Wiki Home</a>.
 

From 806ec1ca7d5ea50026f9019fc5b49ac70f7b1678 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 9 Jun 2023 13:00:11 +0200
Subject: [PATCH 416/665] Update README.md

Fix link
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 85b49a6b22..fe21176c1f 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ It extends the [observer pattern](http://en.wikipedia.org/wiki/Observer_pattern)
 - Virtual time and schedulers for parameterized concurrency.
 - Test and diagnostic support via test schedulers, test consumers and plugin hooks.
 - Interop with newer JDK versions via 3rd party libraries, such as
-  - [Java 9 Flow API](https://github.com/akarnokd/RxJavaJdk9Interop)
+  - [Java 9 Flow API](https://github.com/akarnokd/RxJavaJdk9Interop#rxjavajdk9interop)
   - [Java 21 Virtual Threads](https://github.com/akarnokd/RxJavaFiberInterop#rxjavafiberinterop)
 
 Learn more about RxJava in general on the <a href="https://github.com/ReactiveX/RxJava/wiki">Wiki Home</a>.

From da341886591352773838615b28c8f46c27dc5adc Mon Sep 17 00:00:00 2001
From: chintando <cdexte_004@yahoo.com>
Date: Fri, 23 Jun 2023 11:18:30 -0700
Subject: [PATCH 417/665] Convert CompletableOnErrorComplete$onError inner
 class to static  (#7575)

* pass predicate to avoid holding reference

* static

* fix compile error

---------

Co-authored-by: Chintan Doshi <chintan.doshi@snap.com>
---
 .../completable/CompletableOnErrorComplete.java          | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
index bebb401e48..c4252e7f3b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
@@ -32,15 +32,18 @@ public CompletableOnErrorComplete(CompletableSource source, Predicate<? super Th
     @Override
     protected void subscribeActual(final CompletableObserver observer) {
 
-        source.subscribe(new OnError(observer));
+        source.subscribe(new OnError(observer, predicate));
     }
 
-    final class OnError implements CompletableObserver {
+    static final class OnError implements CompletableObserver {
 
         private final CompletableObserver downstream;
+        private final Predicate<? super Throwable> predicate;
 
-        OnError(CompletableObserver observer) {
+        OnError(CompletableObserver observer,
+                Predicate<? super Throwable> predicate) {
             this.downstream = observer;
+            this.predicate = predicate;
         }
 
         @Override

From b903147adc2778a57be9103d4823bb401e6d06d9 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 30 Jun 2023 20:58:50 +0200
Subject: [PATCH 418/665] Update to Gradle 7.6.2 (#7579)

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 61574 -> 61624 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa754578e88a3dae77fce6e3dea56edbf..afba109285af78dbd2a1d187e33ac4f87c76e392 100644
GIT binary patch
delta 6679
zcmZXZbx<4Jv-cr5MOqw+YY9b)ySuwfaYAtdlp?{QxE2T&+^tY3#S6tH5TsZs8YH;4
z$bIhf{^ot>y?1AJ=KI;*GiPS^pEGA;HZZ<!U^LOaBc!njSxvz}LsP&;Llek2bESpo
z+JapSeQf<5eSB@*6kHtb-#Pm5*t^;K`eqqw1g$8NNs%t4xp9S5MX`hMm_t~NKh9C;
zk3^<#R_J;m!ZI>jZQpoTw3(anvxqTq3EzLbC2raWn0~$cjd6YdO8R)j<A9<?HX(2|
z2wCWB^XKry<_XP<Zhbo~I(t~ma^4#<+2==hvU4WAdk*(fD3InmEnY?vzJArIgrRZp
znD%W|@U%JH(XZF>Hz@`iMmu5Mwl_}E?kV*#a2|=>1J`q+vOZUk=@^Agl8I3Bm%Eto
z<-h)0Z0auLA7zP@Kv%2tG2H2A&+hql6O~(bJWOCMmM+xDe&@m1WxR<~$iNPfkC8lG
zc&~4h9jr5wgH!&kN}Aj!tv~V3z8GBFB^Sywomq4$b&Mrh7nr5^$JV|1*7F5=Om(-A
zs))YY`>TDaU#K*Ro#B@owW6hwUiAF=waT{NANYEXH1xEX1DnQf?rC)HUpb82ongqV
zCS7j{YB&@%Dsr2V2Lwk8NWW5sm~7;TrnGBLz()A4NNzoz$I%dbjGEUneRtUDta0&A
zTiw?<YdsqFr(zRsClAaUcU@a26*e2gkVyB>`0bX3lWiBgfAu&;TGFsp_|a(91pbb_
zXRwoCLf|ZGv#(7{bl<jL5$lk>;nhQ`Mq#V_qEK^jEA-F<aZqlzctv#ydF4-DlB`8a
z?4>un$li7eA7n|b?s;OCYI&-CVZE`=jU%+Zr7HaXJD&{9G-a$2NAjx<HU)Iq;$|yL
zSwIX%GK80nM=o3~K*f8YQxAXoY>52K+~fYS2{^0#M)B)P5JKmHQCl&xSeJAZnh2E#
zMm5Mmqrv`FMlr&`;mH+9CFA#KR-npX`A_dxMTj4SF*XM!1W(MWc%M~3lNQvz1-1&X
z`4vV!XvQ*iX&rh2X(P32mxLH84O)?2=#)Vz?Xb#kYDip#SgOB-%b&7F?~_rVb`6vH
z?rHxNP3brkms{(=i7YEj5Q@b=ks&16szm8r7XF2AT_`^At&?&>90if!x2@hkntkZD
zS8{yn<Udex1h){5H!F*addH=)<V!{s-o2ncT6*&bQweK=nV8b~)hV83xoN`;uSZ+T
zs3k*&t*g6xuDI-^e98pzutS{z=7O?u(5`8vMALF6&Y>porC*(h{>OdOQqJ<lQB8dk
zGE*WE-9E`FyKvRld?XX;f2^KxnCNo9NAs{ihv`e1-{`M{4kuaiAF%A{5-muhYT%|e
zV%eYqEe+HoM$3!`z67DT-I&cf85&v~HyRpa20Vx&<FWb$#L{S9hNGox^wLiwuT6mx
z+hw^<>&8((9t54u6y(;TMAV$7cd=r$M2UDVM*&@xu;lcX9Q2<505a>t)HK2(7$xGq
zMust$Fz0c>WP6`FJe~N}tU-q-?=t@W>Kr$FLazFH(uX`v1;x2Y_mY-bN$NrEK<sJ)
zW>C&(7x`HTEk}_-q~Q=ku<)4a@vd7A|D1qY!W!z8s`Hz)T#R!>po3M_<l;5R>76A_
z*+)zEi*ca_TrbB|4<s-NiMcP@Kr~AyY4TxrbR{^@0(SPDF*?vZmGW$pasG_t&JsAu
z4`MFeV_d|1-!a57ej3jhlCP6CMU3^;xR5K-a<~=(u;gW_Rr+J#xCv#{+KoYL%tC@_
zM6f}4jfk(Ds^fh`1&8HJjFbEF&ZV#2iB8$~m+H<alG?Fv2hcszlHKLZM_0=4R8tGL
zQe5xfBu%F-3PgfwUdow|*VD9Pfx2~V#*fg2cS;qYaYF@i%M(^KDv`kyMci7iRV~Un
z=*u8SlH7fGf$ZfUF+1|6@tVlD$yTECcj-!Ir_gRjT1+s-O}4D$4oGVK&xTcIEbj3@
zQ;6FPx%i99h<ng4ZqLeb)U-=*&rlJezB+~Jy_nfm;LL3VV>frtUiz+kkM0()OYn<~
zU#Y4~%CC(V9oq`(rAaG{C<XL61%8m38}&lI`TK5F2p9_qdM^KL^0}ypxzciWt6FP~
zsjfPEZ6B*gCqPm#KiNjE1zzAwYS6&%j_UpqS3ZemGqIh*CLy7f0CKgTJ*YcwO}x%A
z>qhW@>(r|KrblS!2$Sj%c%eaaq$#k<E?hU3_$=FF;J79_?rb4PS9-?1KjvP{6r2xP
zLQrT_mPky@&*Ye`EI3u@A0|c>JJkA@>Oy{EF(Pf~wG@xYH5s@b(7L5fGguO=+M-7-
zvfV^-hlG_$oeac(xtiw@5X9r8yDPgT*edNvAojm>mYl8%noK1(GKDlv@)NFDl4~t#
zj#~=-JdoUgC%ZT=^P^n&^$d1JrJ#^Hio7_k<@4d(v1BNjpes%g*E00e$)s^2C{aP$
zc6mNeMEI?`_haTRkNsoGkI8*e#BEMh576_U&X#m~zZXG#XE6`ljWhaPhle!M<Kmcu
zO?|WL;a=umZ({SZ^B@15Ib;)I!T0l1a(`DKpvY7_Q$5$>l5cPa`)#ez+6;uL>GjW^
z^ihQ4HB1J7-Tze#mN(`oI97JdO~XR3v;6}d9M7d8-XF^OvQ?4}5V=Xa7^4`ljLm_F
z(`fy2{rzu@J0E#O7YjNf^M!uBVR~F?o_pyL%1^odd+t!S%e`aLwaYzug_?vW*YZrB
zXMfTtYpUNeU%d+OC_bA&+ZnQpWRK$$V<4!VFw7%A@()J2r<lY2^A#Ajnh%Dm_!Zzx
z-R#t{8|;LHIlqqG;8C&MmePhOav>UspYEjQEwEXCb5*IFg<PU!GtQ0sSd>tkZyDA4
z!a$c(lMP{<R}HYsTtc|FEje}4;0@Ah%Fj1R6rLO1;F<IJp{|P!AVME7HKC;icmvuN
zZ>4W=Ta`^QWYu#0Lx`K46VOF+j3uG!YM6}Ju?CSPSP?%sJ3?^`o&G8#TmsTTV;(vc
zN3_=Dhx2M&9zWZlzmu5m!nFgqNCFGrh?uIWjdLMpauo0+fLc^ya>^4-8%@%bUxdV-
zYRL)lnp$Vq_&z*lLS~3k57N)Rrpey#=VZ3>>s6kW^MM4v2toUVv8|-a9amt+{PPaD
zr}!(AIh^|oKF!4JuGOu}){JaD0Cy|hVSaQJ-pbl}6pq*8p5s^10#OnCq?CZ9mSE!B
zi75B0-Fz59V)^`t-4%a{|62zlj`DpkWgaWlRfqlh>BDSR2&Z8w;PYr8_>gq}Ywq|t
zJzKF!oPB@CQk_^}8Ds9H_<F(IdHldfo{hkN=819OK6?DCOLJJz8P0!44Yy*#sp0EX
z37;V)rNkuMf#&)mryLK!YrvMj2T#tQx%P6oCM7|;#OlquWnSw|E&5-5M(54U<P)Oc
z=k^?#HnENn5VtgcJ&RNA>v}f%+5=M;_m`Gkh7?7iWC<xk29%etskT3Bex0KgAUPlK
zHjJ6;>KLx$F~-T8CrbM`KhY(|uT{yhr&jPN-?#_nU8_W#>?;+}m&JnrybjT>oQB_t
zUm-#Zcs9BEZgXm^&A{c_l(UrJKay6kvqf-EeB%P-j;6<Wt8si-1l*I{xOkTrEaeI(
zmi;Tq<R3Y;zUiqD9ZZ<U3SFEtF7}$eQ+_1kS9)}@ejW(`??~NS74!~^?B9p<$RqRa
za8yl?9TSJz_wE&XjF8>Ic~k8dbh9W#M@r*-N0Ieg@e4yXPto2v+-V-QNuqX+Nkh@J
z)&WS>dv_Kn?#qwXnk`LI9BepKc#F>02TcV80dF~Q^Q3+**mrLPb_90&>XsAWxA$DV
z1|N165$^?a{Nt4CLzgoH_-PvjfCLB8$6htq#aeL65RP9@_KCfDkVDcBzZf<}-*2&2
z#^L8Fx1j|dFwgyav?o&}j;;RjGP9#WD@4oj%<J=jJLu~`nD2_tE455kb2N`dG4E25
zRYw%xKz&6n?uv4kMSR@pRMnbLC2O%ZrLm-20JSiUfaJ;*icezIovj&uOsJ4zy|E+P
z3dEQZ%k`!bd`)gB3XNF)WJ=8AnayT95aE(5i3{fR&)wM|;-ZcXapNi=(GmTz3Zd0|
zoo~Y!tGBN7ovk`uQMfp!Ts(`ZQUW>NrddF(XN{igRS%?4A=tZrZj<oG<+;sE1fB$q
zh_7EF=Gs6N5WB^*-jTXHJ;E<E${K#B7pjRI-Z{b(O)bpM!EI9}%@w5p=#<2ZT4D)f
zt}PivH`a3%DvoZOeRfHkl98(mhm0ABKV=pz+&Keo)sC~63`QI;{D;7gVo&n85Bg9W
zLOq~~*unj~<~S1+r`~lQs<oILHZ?ucO3h%2>3Ux`)w_cPhg$m}x6{Pf?IX^=IfySb
zFylD#+woa&#CGC5+woGFjgMk`>Vln}fFHX>l{G4MS#{sI-j_^4erF3p9!sZqFN(mA
z0#8^25(R(sktVl|;=N;y#btinrQi=4Hj8(J-rITi?RC*AbK2rhRz5c};75+$vWwoq
zHAIYr{X?pqmwKr96a$IOy~XPJC+!nB1RR>@37{eF#p9cl9{Yg16X0(eL36cxZ!a_F
z9MWj{=>mwDBNkOfZm~gn>n2KDtH;%k!O3a%F~&kwS1N;}&trFt+BHen)b;(+Q_s6w
zi{%PEuzfqN<TzJB%L-o@Ow5JvKRAvxsRdF}kZM>pzWT26Spq>l>{D<lvo=XaNNQ0~
z>vKS8J%{;*H$cnx@yW7@@XN9u7t&hoPtt^1<HFTMg;%&0#oIv$I=rDF(hJbQM5(O3
zgodReCs!_4LP#^^+Y$3h;=529<*Rp;!R|I@>>@h*$NmGKXb9+twu9Z99q^?duQe6l
zYm9H3yWYdysvGoFmPUml+tq%Q6E;wtZ&}WR0yy2C=`<J6R#$#nNXjqj46Bjs^7lYs
z`15ncQfSQ&ce>|8LLcZ{opm{?UJSOSv^Le=b}WY!&K+}f#`|3&B|U*3c<K(rIaEwv
zBc0ouY;rZ1anVbI=<q)~tu(ov^_g=1rAYz<euRHnkew#DSt;m$HM%b#<J(3n{IKVD
zmWPD#q|urj*lBb;_db@(M;Wd_)rV%=IM1Zr)Iz&*q_l@1yqV*T^HW(1?`6HBXlCYW
z+>)LJ(HzOnsj2ipFcZ9=S4^q0l2+;2Cktk%Tk%*M3YHDdGJEutVteMc7AVgtKZH-p
z{&2EpFUrq`#rzu5_U<iv9!iQG%ir!e`!co4-O$8tJOyu*g=c|PsbTz={O-KR&v`>T
zssc5|rIX?nNCd)yCBSAWLao3l1*qF%;$J*qZ8Acx`PtV+Ybl{d{Mey~Fju}1w4m2q
zH>&UB@3LgNt?ljWdz@kxh#>^b6Jifwu78>S^jY#8`Sl#vff$rNbIv~JM{O*?JgE5D
zc;<IfHFL2j&TcVSzWh%6<%eqFwsF;Z4RfcEiNpa3$Xg+x?e)*x=?#yuofm}0z8<U>
zI*;)^K5xIrRUZXpMB9JL;?EzUP}$=wRZyyFS!Iw}>F^;Y-1HqZGWYBG5wrS}j^}x>
zM6+5h7;sd=&wQ>IC#_b*T%og78|H72w)*yWw`zmH+{Fbr{DZZsO`k7d*IJRX^ntlY
z8VlcA65{;n#=!Ot4a*{4IjJ)CuiCmw={VPQnz409%KeVfUzZ8%9~&AjDJ(L}fu?3!
zq#$VrQ&|BQrUJ!;J(9#s3BmpGOLFEbcK+rMq}BLyc_TY=Cno#)mvMrBIaO&2xqyFM
zP~w7H(6JNPoA=ZVXE9wNhGb`>_VR-%k26e9Xb>$oPU1U-p0W6vP~dT?+Rf~?MeJw?
znK%!|4$a87{EFF8Fmpl4w&j-B_-IE2Pw6;Q+C*<e17;Ru>mQoB?fzw-Z}AP$P6oxu
z#r>B#e#}~>ho`%hht10gS?hx|w8wNIxBiz{d_I9QnGa;<BC^9@3@;IL?9+B9x87hA
zM#v`DHHD=LqDH<)8rt^L0`)LdEW)KAt@9=`zXu7|FbWa0C*FV2+ZA<>!}WLXHZCCS
zJNE-veh_Jf;=PXTx>=R=9Yz$Vw*Tz?-Sq&rQ+x&r0jJ-5pdmj`%3DzpXpae=HTrxN
zEOR1uS=N;2#}!5UY%3ptu2XD&b@{5r9a3!9Dgj&2p4h_zPemsL%$!|%L$!)v>f*$Q
z{sTEh{WWWbDM%X8HoS&4{Pwo*&1+#6yl6Kd*(3Q&tCB}jzrHdh!Gs<yk?*2R@Oz@8
zaL&%NM=L7xQg^hO8$Mt|rz8?OzRylYV~Yh`uguFr6_ql;xl=nnYL_!a#8a+9OyKpc
zl$Ra@(C9KcfLX6{ry#U$=7?skpXP{#w#TV%p^EoZI%&9F*)}xW31oOfltjNd7AiZ7
zm#F~TC%qfrkh3wEM~6=K4Gfm(pR5@!Y*xGd(%Jc2y=k0i$n0$uTU@iDP>3N|8HT1O
zcM)0>ikq=Zl*fv3;bFud$Lj>qV_McIzHx-#`ru=H+6i+Yw8E%wEWZld%thN^Q@3HW
zopPeXuc-S))Ypau^I>08!)RKnZo0Rkx|&_1TFi2EMA0XHJQ_+zTH(I~pMDJhvDc|E
z--P6fhL9x=O8FTP>$?X!%1oxbuVv+<wA8u?n~Anapa7}Y$L~_`ic>&D+HY&17GXwu
z0-G;kY}`yXGTc&MMPkKO5T0@+FF|CwZ(h)oYfePSQ2y@7^r+05s}!_Czt#vZW2nXy
zj{gLIc%M;bkd5d`rq}(b_ls5a+1yHs5#M@+KF1R!=Ed3rqg3Y1>GML8j(0dN)OOs=
zqgA^=^W@=kc9(9Ly5)Pwv>gX#LWl?)k0kV>04{L{oaItjMmN`!)gF<u5nC<Ck$uw6
zq2?q=&H;!_M4n~O$c=zSzVC<UYanOdV}%k5P|glq;*y0qh$$^Pt<v_Xdwa-Dm1|E+
z?Y)TR8u7)g))<c&kV~TfK|G)+fcdL%6^&h{B7JY`HYB1DY=;KHzT}!Y8Fum>GumF0
zkj=0F#!JuXd^!9I3NvoIJ*oIcp)&(~-(5v79eZdZa)YSWzP64;B~2i_$m{80U$`;A
z<_W<f*NAVSuJMd{jj{D2eKC*H;@xZ{?^D@hTT7C(qoM$lA#+{iW_p@k)gWRm-w}^~
zuIt!`%MEGQv}B0;W-*^Xu6tNp<fclz^s)*ADb?nTiu2`6Zcwq-8~p{WRx>GHr30_G
zUz6C2L#P%)F|UIN{_bq$oUt<AlE%Xgn)Y<w+<-90r}y3dVEM1x*gjmqE?<^)I{(f>
z${m?S9eBPdnMOC^MT7TZ7}^-pA7NXz&(i7!sYhGl?MXohJ*)%^Lb1KD`#>x%PXL#X
zaL}a&{3iT!Q79piHGKZ;IuY>qL5yIvF@pLB-|Tt|KI(^RQtxDVcOf8L;rGjtKU6Y)
zH1%_PVo3|Gsw|g0ld?r<{dqDU9cG<0m&C;hK2Iyqaj+D|@P4euQyL0&?M_<$Q`OyE
zGJ+~i&hv#xc<E~0u{ea9fn-L_($g$rfAt#3nKMFSMxXakep6?zt=3HwWJsCv%Ocj#
zb^dXwj`HKk<XSb-E+YPYm0@x{Sv!jCxC<s`KEl$pd4JJVcaBf>K#sC5_r9cwIPxRY
z@$AF%oV5(*t!Ve@H;&1Lz_Q=|V$OW^nK-bifffkqs#9zn&FzYLEYsxKrPC_BsZuSK
zxws6FEt7rh%B)5|9te1Dz(Wt?S$Zhd`Z+#LvP}<baeVe>hkHm@g6E^Rk48DBlAR1&
zvGpJ?!`cW32`LioA%!S48m{&w>i)su#z4FztM-qrit1ry0m)0LAQvzz?3a9aWDt=R
zUUD}?Uzu!7qw2ZZ;<Nk!U4Rc;m}($}UF3Qa(!<cT)3?Kw#fNAH^5ze{54pbqYXS)m
zj15(6@KfUoRVqXabEhpMS}2}zQU9Gg)Dk-k=b=|A+CFQ2IsNRkD=s0kS_FV(n<J>~
z!vFhP?(Pg)Q`%OX98A|R)5nc{bFZ~=znKr2;jQR(Zfi~0XTV2Bzmk4bdy2^WY&LCn
z=UGR#IG2t+^TLLv`-+}>{uPlW1K{FbH&xDAv9ujeNPd0A@Rk9nt0eD{@RPv*pI0Zp
z#o*!$2Ol@}i4y0cA^M8;J2O;w%#fjRHQ;zvD%Ki<%9-)(lEA~ahJDBG{DO>Tnh6RS
zLg<ESR_02wc#`stf-C`t>m`Cba&bMy!rqlG=Wr_2_(`?=fpB?Hf2TeQ6_gzxsJrKl
z{(+&;*RGbn*5L*|#?|DGgRSA%Yp2(sh$~?L--v_RCU_+_^j}r63}O8o_(d@4D(N`E
zfwx!yJJ$5VwQEj!;7NE;X*b1K&4>I*)5Jcng-(Qg$?&=tv${{_ff?YAe1o6;3Qhzo
zqaPD73-|p7ETSbQY{fY@a<L)3$VT+=!_o~ZG2dEMYU42mv-&v~+-jXt57-L?$A~xg
z6-?qt=>6PgiW+7Two2?jZY8!S0Lp^xrFHty<x-FP!)+;v2;{Pqw%6w+NijO@Hd;1%
zs(}Av&GBg;Nb<ke92uU!sWR5~X#gi488boT8AJ!lfGe;6NU{vb0Ux?eM$>^Vx_k!u
zp$9r5!|Tu%Fbw&pfG*?okPm$;g9&B*PdE(q7JWHm17!{<Eco}d{*f3UuJB*^SdEiW
zeZ&u7tNgzxQ%RaZaQvM1|NFs3`+rszepvmVV!{mbV;}&x_g~CA76!ET|110Y*)j-E
zfPkEV{~%$8#R(ta_t?LP8l%hT{U>`m{oj~=stC|S{2zsrVRuS{&qs=e=Ck(S7ycKd
Cn(^uY

delta 6711
zcmZ9RWmFVy)a_vqknS$&?k?#TkVd*0Lb_`}x+I3~?k-^nX`~s3R0Qc7x>4Zuy8iE7
z>)z+f^V|EJz0UV@IyaG`Hj$dBoUnSjiGU$U2neJo2nbBz3r9+jk%OC#vx6I#wX>zC
zXQZy0FHDi}nW=?-MBneV_F!o>IkgI5veBDJ1_5MQpo6+!Rs>U7d@R3+ob7n}XxU*!
z?sM!tj@M9$m!-#d9mrYI(IM69E0QUh`0TEvt_@$BQqc3$He=}3eM6|kC&1@z0)j##
z5!WqQL=s-T(6Cw1^<iq{WI$mDPwA5#rwR0O-zcl~JTkJ@sLyT_66ud2%)vqEMqrNp
zi+ydrqLDMmx@33`q@buh%}csXFp1gq;3vle=N?z)5OO@G^Y34ln-?kX92~MOQ0DYa
z6K!YJiGph9>4rNF3d`aNq+ueFv8KpNVCviUQcgT_426Nxq=*@~<k?oub_5|Ic0Jb-
zQoAzWN*&+p$0pRY61djBW}f(yZ`Lu;vXy@3dKC~2v&`mFaJ9y|88osLF^i=iu}xb~
zj;*RP{4JHP*I+}*i}~%kI6-KuUVt6<fn>s+zB(pX+j=$sI*97~C|VHEnvy^_W!dn{
z;Co$vKhA29kRzQohLpa1FIA8i+)He4Vj<CL*TcZm2bAh<09<O&Sgma7{p@A`gvKl2
z{$rHx6xi7<bh^obgyFol-03_Wl}TmioOaPaTGny*KsauA6-=S_-SPgJyk4f__9=8A
zLC2gv$FSo9xAI+(lQnX!5OtWzbiIL|+s5+Ii<S$BB&P!Ip106xm30b@QYshrgi9hz
z8Y}ZVO?VaS8~j+v)4h<_np|KCzo}_m*g4I;%9UV^ry-}SiE)0#f%nnt)JtbWBfW~3
zuvYe``W8f4K=uc%nnWP3z^h=j-Cii14|lU9PVFK?dC&j5;K|Rol9$6{*D+Uf=G5<I
z3G3-W49IQ#^*3grl9h5aZ%f*xbg+lY7hS~P$7p>=b;GX|%QUdC>%em*2^J@PCK!za
zPd-KdiQ7!~g}wmxHr8EtEN!&zpxBU)TLN07$8m3EbNJhmZ2RD^2Iju`T7)oZe|MO0
z8gR6l_e3#b5#T)%9f7;0ou4pK&XPG>ZeXK;e49b2cBckA3HE^pV=U}*2gGi~(Qcn@
z3O&#cz6!36*wn<UNU68Fr!z?>fug6l18wq<UM<P5`|XLM8oTA_qVB)1pt#H%${xMV
zD^8ftwNb2k-H$wRMHkl@LErg~p#sfL@g;sk=9_$jU(0k%fkia*74Q6p%zn5j<pb3a
zJ}0I3XS^CkYtxgw(i@W{s~4%(GZ%DmEPFNEjTJ%!1P~_z!W(edIx!e@iUq3wfEJ{?
zxG2Tk+B1H>0zizK)<UykgipRIrhSDL6&g_<2I*no9{<MSzK6vy|2=N0x4pidbLnS?
zS95(8gGCLnz0=sqw|>RQ$@q9l@1tJdOP8x1p9(eL`K|J4@EMo=Q=#W<xBs8;z%%9&
z(LW7^K9`0L=;dV0(|!(2JEb5rWqvI)=7;JCW+#aeg+KAAe|Gk(`Fv9aWTXnGDwREJ
z3M<`H3LEwh=cnd6S2V4=<d-rXP4>1uq<&5lk<VVk<QuMGk`ii)c9Sql|D4(j2`Oa%
zmcsojfYjo-tiLJ4w3UPG(7_vn2fx_S%JFM$so>Pi@n2&>CY(<mQp=!obeiRfDb<u`
zuMeFQn%iA7W3}Z{a@zq?oI8T#!uJlmE0%8c0>@>dItO)`^@(rS-_TPCu9scd(SX**
z)cKl5G$;LQ1q#n$7(p4M_D(^cB?^u!`B%<ijxI}`BbrW;kB%-k&8*xX=OYAM?qG_i
zb0YBlE5BR;JgJWvDOI4tj!PSwv9csJf=f^4!n5s&La_6$XWW-~Rq>!T#^5iny~0Mt
zpB8BKPkw1)mwtKBnK!ArsC**aoxOjcTW8d?pE!ya?33S~ePm^&zz?d1L*5DWt!bXc
zaEq1sM>o#ht0p#D%^zE-OvcDNicMvFJQB2Ha->t_b70B_usebb^j+&V+-Bk+qgcns
z8Ln&ZzjSQoc`s7v^Aar-+B*xg(JR*Vwm?-QtWWgb4LNPea@&36qhp1Q8SwklU)=ie
z4+vDhEdVw;Ym(OEwR$KG9>4_%(r+B`#e?fFsG616fVMeDZA~r;0cM?E<oZg2@(Dsp
z5tpnQ6id4e0~MfHI|DU_bWB%agD84CZ?*XBcMZH&QK|Lwv9c#x!l8M-Dk8)k8GQMs
ze`o`OJDJ9ayKM---AwC_e2H~9V^dMOZL9B`d3ac<W4@54s4LQOoE^%1S;ULlXA<}5
z2*x^m;zWZrO%ZLDjkK+3g-`q7M0Z5~&_NqQAG6kD?0|uWE>xRiJ4+aS3#xZIRb)!_
zn=~VGbuRmO@hr(L!AaTryQ4SWhT2)(Wz9ob{2&=?wg~|-x|+ss*$elcqzyC@QvzpM
z`UOHZBqC0O{t6-~L^bC2ro0>Yr)j<`_#(XGw#M4qvqPL&&MFEP>y%-dtklZo!>j?M
zTOL$Ri+LbNCj!I0kESy_M?Bp;)KRWK2#0!DKH0>nzj5d&!?&#M_Q0A$12(+=lB<Hz
zX7UjbKFF~QF|?lmFvDV0+XQ`wen;8z?1uMnBElkQwK)w^V@fGFOKpFUm+EZ3+jbIo
z{-hWv@Jt8mJh7u&TgrDDxVaEX_8xsxAI)|WlPLhwsNCISis5-ng2_H*qei#p@O$Ma
zxrX!)Eur8kCAQ<C3Cxh(>l#18C<<X73y3(s3;|`E`?z#-roO|U@(@ATX6>+Qoaa6X
zjvhQKj=rV6>O??f0NAXpC@;e(MW)GU^o|I3XsSV@b%f7&F@f948ovf5|01mxqBQrZ
zoc;?4+oT3+Z81;kl0>G@hPc=IS;i?w5FxG1VbKRMFoV=BKRYH0tP+bb{L8}ey?|zu
z2(7qF_=K~mD|x*SpSn@~MOykutyM2yK@53DIdLbwa!3(uH9@|>ddfStvut;_+HJTZ
zf*^eq)ASAhUZ|U4ZsPZvx|hYz5K==X?R*|kz-j8HP_p9|v<gq|&!HiqW?8Amwv*+&
zn}?@Jlr<&<5~tQ7UGLX2fctCrOAemS{Kvt8w}w@WI!AtCX?|DjUefsyXckGUM`_F^
zq1}p&{Ug;Y$d<sMRO`ImfPU-II(gqEw2A%|qgW1ocK)MRihE5uIoS3#u*hNcsP*rl
zJa?5;SwW6B6oqnMgfilCRyoeJ@gb2SLMF-MIor|bsTz%*c`BT&;yDNS1?EflV$!{g
z>#O<T!z{a7V<urFF?Jg{B0FDJ9thnQ;A^o7|Hq}e5ARMsE7|UuJiWa0@i%QP%jTTU
z3t`=hC7eO^QAAhbS`}lL1NPw>d2B_1JdT?%>ygJQyr-Pgi`(A=_3~cVb3WygjPLO$
zSzpE49rZMHJ(&<=WY!QU%DRYPtATSQk0TaGTtKB_wDZk5X2Lodhu4IX^)T~8y?p8-
zRPRTm-ZB_%fPCfbe7TtEyUc?Hwcp;5xUYawX5E{KipC=^WYcPxtykBmIm{m<Y~Faa
z{D6|^nwFXC)tBuGebDbi7CeY93huz|R^R{eK=Gc|K#n1HRBw@pCC}@b351bN=PSe<
zBZCOJq<-$0+1NZg`Xl)qH{*MLm(r9sNty^My25$T$iKTZ72BA;Q*PDVr|y&4Hw#EP
zT!W?e46JF>i<Gj6(yx#Ug9ku{Yv?6g?Fnuiz+p%;N7%L~m#CXvlTffeYQ0|*7PHJ8
ze6X4N5PN2(;kY1{t=zn`eR|*0aQ`VtdOxsBbD!qI^qoDGUW~vQgW+&EG>Iu}=I-K&
zoMzzxF(ldHrdg19nGB6KXHoK?2_p?Og>&dd@w4G-=np|Y&Oq5(vkGXU!YzJcYrroT
zwq%iuxZhD=LdYH`h`9FIsYKDYX=ud-C0CuFxGe!#Nr*Q<Wm#)&r}Zw_l%YhXcBpAC
zYk=(Y1~&hv{8$koqn|PdP|hCb82vI@F@8y$aFp^-=uzPJ;<QWQlg74cbIQ_fUevE3
zgx%M-7RGeck->HHY^<PyrueSx5<{LZ(%2<^7|8Ld3eE3iu~fa;bZ*_2GC2>$_{(|#
zd;^Yp9N5`&4|siuH(FACOO;moB93;)q-YQ&Exl{|jU)NNgABsDE9>i$nWQTMF)3C}
z&4Dm4L#x3J%FpH7hOZ?O*|va0D+pfpeQXk(R8SFBrscthD{s&<s}+`R0rbKCPu+|Z
zNq>@O17<b=JNk=c<rVjRrtE>i{GWhO?bQjb{f!ufH7m{7mJPcMtU3hm5RDA=r*pdZ
z+xy<nR9}m(EXVV=qxZ7f&{Unas+DWwDAUGc2HxdU!r|O$;U6#LSy&$S6%s*>S2V-C
zMiQd@QE^(^nO>l0`mc2tg<c_%FLhVu_l;TWmdlx9UnfAY2f+|3#(HbAa+vX-s2SHd
z`i-rx_8byrKJyPWsogKtS6}aK^Item3nW&^oKOkF2|Qr#r)l?_Qd=2cyaO_yYp=xr
zm=;|eL?gfww(FwbhuBvzR%yA;h+ZT;CY+^DwwT%GT+@PR=DYmHIoUl~J{~9!`>qtG
z(4*)JR^3Dok0V6y>VA1=ov*5W!$`Xu=x&;St%2eRF_mFmb1_0{r_nRvyAQA(EK(39
zA-0aEYGnB|)*=oQW%kIwPC2zhM~SWPt8F>DF<-cE<_c8z99QC6K`}b%O!sVH=v91F
zYy5tZtG)>WRC4sk;7HfDpbVmQqL`4b+9DBBq9CWEG!p|wer%GL?2s<YyA;*wows}Y
z$F50~iy337Ir3nxBww}3Z>c2s8N={4xwulCs-Z}&<q$<GyAgw%4JIPuWl^hd@n<zY
zwQ`omesL!|-~es+>A9O#jH=60r~S4y`w@N*;3mlCV;gL6x$%p7KIRdI<Ll;nIZilB
zNQX}$XZvr5&sJ0~z6IiBeF#h517JChjGI=S74D=l&WKQG7Yg!+Qd<U&i+*L+-$#kM
zm?JV)?O`d^Ghf7?v{D!CH6DL>%w29Tk2n=1LF7G5n!`DFWrzDvn_G3fJ^83rK2!|<
zF5(1rU0C_7l1Z6!ebxVNU{s1YK<gL*X6F;+f;+SUv?{58KjU#I%4Ct#6DJibCa%mU
zu={lSX+e_-)#5w5J|BIxo%bQN#JEAlMk2};%?=9E_(bkUAwKYsDtn)JSg5*@F<zxv
z(qU#A%PC6BfYW6NChTJJ#K_j^-qh8Jwe$mt;n}XEQe)f#)7OG+(V1=p15Ltmx>_(O
zZy>S_7F#DsP7^M=i(2AW^=c%S?_f#swt7*i!LpMBbiQ#E6s@4CiR>!v)w;KRNDe=f
z|732abdRP)b6=$}k#X9~s7I#&<s-6`m)OYH@bnl6?FJ;0HHt)*9gw&e6@5s@1usAm
zA1HWB&#?`$;<HWlAHAD$Tm0q27vU7+Yn~=h1MCDcJXS0UdJkJ+Hix$CY+2~~ZlX)8
z>vyE5CQ6TR{cNWyL=tbMp|AF+GfZHOihNyJd1~~z%0vEPFTC|jAPLd85#$1l9b&ng
zOz3XS*G~=dQYcQ1CAH8HY}Z0WWMR;wLwRqS`FEw~icglMhfuTmJLvg*OK@3w#u>e<
z!^m6mW&`(oiSMyH3gQ&v><%2$VVIr{Y}2JW4sT7vv$b=Xg2Vch%L?R~^fl@93Ig!E
zOh}*bP2=%W?4%x4<i57mMJqPQ@YfVyQ<H~9Luq~cf65`#CV5%QnkC@i`27X}opl`g
zDbCX}^{%xoaS{VVM>j;3XB6h#d07l(mKX(MHA;1W*{PoC)12)4+K+susIfLr1_!l8
zThaRF;prwT#;V<iC_o{!fOTbI%SBd!Y?o1Rrpthfu+Ms&<bB1Lo6T<Cy`d>@WP)2A
z3w0WGXSU;V6|4s2Q)uadQXeR}axUMOU%lbAUjXnD;9LB=g5EV9RiZ(bMbvgSC6he>
zctkxfXXgLf4=3YpPKDN&201t2a3^`Jz2Eo%tMlw@qFrJIJ)&>1?`h=k!?a}Lxqt)R
zJ5B+PUu1%{(G?%D{cNg$SBz%so;wbf!cQ8nMe#>Jpde;ywI7*IIOl?@a8G=y+L72H
zi1`@5w(`C3gH!G1Dy#CihWku;_C{9P;~k-mpR6f<eV=x7;-~z9*6EGpMuO;QU;!t;
zDXhX`;w(D6#(HE*AV8RQg;Hm=5X^2w6$^d`;0B|%Zb6P)8oECBVaU<fN$&=FMW;S#
zKfZlJ;1ixZyq0_K9{wAo4FTVNS~p$cPimuobG!(wRNNMX7?%bbmIg<-HdM0<9$f@W
zmtHhzC2y1-k}vkC4WV|nkR-Pu?Y;&E$UkfQ&B5NghuZO+^K=xg1k<DobWKp)=^Tcz
zbrbOKelrlZuCY2#J4TqEqL<d4>nUWT87TP>PCPyg7f;9Bia!LUCEXewJlO(+sE`pS
zwWV9)`mpO=i`qlCx)3%6Rm~YKm+U^GSJV|?_jmXgd2szy3vOCHZ2FVLb6oM8r;&Yf
zV(lr5;720Eav<Tt!LQ*vAbFh<-Cg*hNHAr>u%sYSbQPqnCvz`ijR-%>v$1lu|Db0Y
z`AV={|ARG{0to{|o-09=sNP>wMRs`&9jpkg%p|5-%T>s)KRii3$Q8h>BE?8TXQ~(~
z^n`MkbUTRNu&8H#dZK%CIK~!+RT_DXTflI*VAI}M9Ia=S#*8*EadS;TH04{pF#dux
zVB$+tqBKuVEyJDC4M`%VUy@BtsPTc}d#RBZ-K?RzZ$5!A;J6&uYl_Tj_tVXCXKg>r
zGEv)*+60o|$>Jt&SISYPU(B+|STR3mAqY=JU68<JzIo9M9&XmD*~5UyAz1AD(9&yC
z!cdzJ3I>%w;X@kkE@n&Rx8I&f@ggU`dB3Vwn~WHeNu(ab8IspQUT=WEB9<ynJpkVa
z#}#x~BcOn;*`PFomd(z>U3a(8`-+xNNjKUz<SqxLyXxz|t18CzngC|pRgtrskLiiM
zUXc7=1KL3PtA&$_^x!r~b<zwl_3qKk2&RTbYjf4!bR)Jh_e0KJC^9G-7$nVZ=&GdL
zzq}%sn43a0GE6~!J7<#%XOh?oTG6CAD`p~Fp#xE)Z$->K0@+zYN`BQ*iy2$QG(^uF
z7JJ^w=E|1UO*)hwH7Xo6S$0N_76%h9g<#$W0`_;oh8F^F?sd?i{7nb5O}8IjO>zS%
zp71Nr8k=8uSe}RvPeuK9d8#Cn-ak>vUL*fHQb2gT3q4YsD9sN&w#z|toUKY`2lUzx
z)Puq+=4KH!XhiB!Ps{<Fv|`~Q$dA<TZ|7b62e2Sw1qC`5AeQ*BXkDIC6vf9tv#?&=
z>I>fwP0OjXzORCU$!NAK6-#%?dyAlsSPl{ErPZVaZ#q3mQaHZHFy=<1%G~lSH1ltf
z`GK>@bu8eOd)-y#(MHFU=u^~=-SmNg-=M`*DVaTkwA*bsr$d+b!BZenng8W-robj@
zQ7uDD4Ihz;=UjUutCT!rL%Gg``%=D1jhn$+TkOzfH5XCgM&_jB&uS(yZ6wV>>r~+_
z6SWrC!cBpRiqPZN9m4M=deNAB6k5;wLf2<djM4O;Q_Q0LG2WMa6Wtl?)2=#?!w2=U
zIbE_nw(@ml`HFO{R{|2B2X)qwQzRa0wIL{exMv|8U63TPoogK7UmQ}J$$_CA<9JpR
zIuXS_y7=4o6&`4DD<N@my~ze<Vkw#oOf#sDG-su+WSLh9&u>!~)vA;AYmTB%5bHC2
zl%2g!iZ^Ks1JLiWPem{F+~65}bRctTz=JZx<yTLlRWdt@ylP<*QV7YTY1M*{t><FE
z4rR%U<!$f|TV91Su|l2_#;U^Pih4V|SPx#x39l4dDu%kn6>AosZQ-?nm7taW0w=N{
z(Z||O>FfYWH#7M}w+W}FS=lt2##%8)jH7SDzsRxH=-g&Eh-MmR$e$b^K}wIx-8s+I
zZUsqO+veA<ovh#+c>c?PhP%3;11{A?IrPUFj4rXH{|1j|77IDM&0ZiN`aS)1kKDsc
zxr82rO;Svv#U0m^aIpMZ3~!hN6ez6P6~(vW;{gNQEj!5jN3#9mTJhZR4s~b4*ED$H
zt#s7pV&K*+f>IWZOOWk?#t3spbv&^zO6o=xnx1jeMipK|g%@dENYuH=!#p2?^^|{>
zd(8%F#^nc}Y0=(cNKPox^n3a^FIr{hQ5!jseg0?;s)p-vsHVS`2}DD2#uK2#>wpS&
zQhN`x&~&flGku6P+mlFj%SSu91?0XF3S2pES`7@!73`m0r&P5Ey=kl&&-49(HkP|M
z;&coUdkC#VqPnAER<<Yo<w9>og~{c1GthZY>3-r}W&@&pXh{nyvRP(*Yq;E?6ZD!!
z<tG{QI{I6BKbxFcY34oA)(1Cc^jyk_bC%(XaNd>dTdf2c{}`9LecpR%+_LWTfhGbP
z%#d`2osAm_tV*lrR+O(*Z2#X8qx+Bz^}izqxcP_}jB`W|fVzP3+*!f8M|^-~x4*~@
zCOgChkNvI4`23Yb;A9_M@atnX0E6#;5)B;W%lNM=`j{Nh9{7K4tRPZw;2tjc@ULAB
z`p<ry8j1pDfwKWdQvcThQ-X>A<ul=b^WcB>H@GUGC+8n(AfkY|Pu>DT^T9He#NfGn
z?7w+ja7F<xCc=NOEX=XsZ;=YTcESrlt^AAJ;J2r^l>g5r_<x)K{$*j))qk5P!BM9?
zfbG72W2R4q07(P?F!T%y%zP#b@ErP2N&>nk{^7!z5@2%nA10oof<@0I0UWUZBrQ5U
N0Rn>h&;K*$e*kC({~`bY

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c4b..4e86b92707 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 8244748ce57b1318b9b11b9e09331747264ce740 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jul 2023 10:07:41 +0200
Subject: [PATCH 419/665] Bump com.google.guava:guava from 32.0.1-jre to
 32.1.1-jre (#7580)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.0.1-jre to 32.1.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ca31799156..43d35a008d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "32.0.1-jre"
+    guavaVersion = "32.1.1-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 216f509083efdd01b4a36108df3a3a7ac45f0d0c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 09:11:49 +0200
Subject: [PATCH 420/665] Bump ru.vyarus.animalsniffer from 1.7.0 to 1.7.1
 (#7582)

Bumps ru.vyarus.animalsniffer from 1.7.0 to 1.7.1.

---
updated-dependencies:
- dependency-name: ru.vyarus.animalsniffer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 43d35a008d..350e386523 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id("eclipse")
     id("jacoco")
     id("maven-publish")
-    id("ru.vyarus.animalsniffer") version "1.7.0"
+    id("ru.vyarus.animalsniffer") version "1.7.1"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.4.0"

From 49357c4e4c042a59014d5ae17929e239854d105a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Jul 2023 08:50:57 +0200
Subject: [PATCH 421/665] Bump gradle/wrapper-validation-action from 1.0.6 to
 1.1.0 (#7586)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.0.6 to 1.1.0.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/v1.0.6...v1.1.0)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 64eb5bdee0..279654d26d 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1.0.6
+      - uses: gradle/wrapper-validation-action@v1.1.0

From 9975460e46116d1cac36e4a8b7ff9bb34df7c24a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Aug 2023 07:54:50 +0200
Subject: [PATCH 422/665] Bump com.google.guava:guava from 32.1.1-jre to
 32.1.2-jre (#7589)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.1-jre to 32.1.2-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 350e386523..dbc4b89050 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "32.1.1-jre"
+    guavaVersion = "32.1.2-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 9ebf2218f1f79ab84a347e288155e7dae12cf416 Mon Sep 17 00:00:00 2001
From: Chris Povirk <cpovirk@google.com>
Date: Wed, 23 Aug 2023 06:42:32 -0400
Subject: [PATCH 423/665] Remove `@NonNull` annotation from `Collector`
 container type parameter. (#7590)

`collect` delegates to `FlowableCollectWithCollectorSingle`, which does
is not annotated to require a non-nullable type for its corresponding
type parameter and whose implementation works fine with a null
container.

This PR lets Kotlin code pass a `Collector<T, A, R>`, where `A` is
declared as `<A: Any?>`.
---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 4d277ab08b..8bb6156659 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -20394,7 +20394,7 @@ public final TestSubscriber<T> test(long initialRequest, boolean cancel) { // No
     @BackpressureSupport(BackpressureKind.UNBOUNDED_IN)
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R, @NonNull A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
+    public final <@NonNull R, @Nullable A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new FlowableCollectWithCollectorSingle<>(this, collector));
     }

From a57ad01c044bc64c7aba87eea2960965405fa0bb Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Wed, 23 Aug 2023 12:47:36 +0200
Subject: [PATCH 424/665] Allow nullable acc. type on Observable.collect too
 (supplement #7590)

---
 src/main/java/io/reactivex/rxjava3/core/Observable.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 792b740104..ac5bf8f0ae 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -16985,7 +16985,7 @@ public final TestObserver<T> test(boolean dispose) { // NoPMD
     @CheckReturnValue
     @SchedulerSupport(SchedulerSupport.NONE)
     @NonNull
-    public final <@NonNull R, @NonNull A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
+    public final <@NonNull R, @Nullable A> Single<R> collect(@NonNull Collector<? super T, A, R> collector) {
         Objects.requireNonNull(collector, "collector is null");
         return RxJavaPlugins.onAssembly(new ObservableCollectWithCollectorSingle<>(this, collector));
     }

From 13a8d83656940dce0c18e8e0a2a17ac157dd1ddb Mon Sep 17 00:00:00 2001
From: Pedro Nacht <pedro.k.night@gmail.com>
Date: Thu, 24 Aug 2023 16:16:05 -0300
Subject: [PATCH 425/665] Hash-pin GitHub Actions (#7594)

Signed-off-by: Pedro Kaj Kjellerup Nacht <pnacht@google.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 4 ++--
 .github/workflows/gradle_branch.yml             | 8 ++++----
 .github/workflows/gradle_jdk11.yml              | 6 +++---
 .github/workflows/gradle_pr.yml                 | 8 ++++----
 .github/workflows/gradle_release.yml            | 8 ++++----
 .github/workflows/gradle_snapshot.yml           | 8 ++++----
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 279654d26d..97f3457985 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1.1.0
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index a28d422afe..3e1c86b3a6 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,14 +15,14 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
     - name: Set up JDK 8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index b02da5c18c..4d6a783321 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,14 +17,14 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 71b63a227b..a338441114 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,14 +15,14 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
     - name: Set up JDK 8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 067050c4fa..39b1c67c4b 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,14 +22,14 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
     - name: Set up JDK 8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index b6a481ab16..a65399815c 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,14 +21,14 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
     - name: Set up JDK 8
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@v3.3.1
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 542374c80d0df9886384433bd0a25b1358136eda Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 30 Aug 2023 00:16:58 +0200
Subject: [PATCH 426/665] 3.x: Fix ObservableSwitchMap NPE due to cancel race
 (#7597)

---
 .../operators/observable/ObservableSwitchMap.java |  5 +++--
 .../operators/flowable/FlowableSwitchTest.java    | 15 +++++++++++++++
 .../observable/ObservableSwitchTest.java          | 15 +++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
index e213352a05..3e0558aacf 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchMap.java
@@ -349,9 +349,10 @@ public void onSubscribe(Disposable d) {
 
         @Override
         public void onNext(R t) {
-            if (index == parent.unique) {
+            SimpleQueue<R> q = queue;
+            if (index == parent.unique && q != null) {
                 if (t != null) {
-                    queue.offer(t);
+                    q.offer(t);
                 }
                 parent.drain();
             }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
index 2bb5a05808..9f200e3c56 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableSwitchTest.java
@@ -1377,4 +1377,19 @@ Flowable<Integer> createFlowable(AtomicInteger inner) {
             inner.incrementAndGet();
         });
     }
+
+    @Test
+    public void innerOnSubscribeOuterCancelRace() {
+        TestSubscriber<Integer> ts = new TestSubscriber<Integer>();
+
+        Flowable.just(1)
+        .hide()
+        .switchMap(v -> Flowable.just(1)
+                .doOnSubscribe(d -> ts.cancel())
+                .scan(1, (a, b) -> a)
+        )
+        .subscribe(ts);
+
+        ts.assertEmpty();
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
index ffa4049a44..72e6c93bb8 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableSwitchTest.java
@@ -1438,4 +1438,19 @@ Observable<Integer> createObservable(AtomicInteger inner) {
             inner.incrementAndGet();
         });
     }
+
+    @Test
+    public void innerOnSubscribeOuterCancelRace() {
+        TestObserver<Integer> to = new TestObserver<Integer>();
+
+        Observable.just(1)
+        .hide()
+        .switchMap(v -> Observable.just(1)
+                .doOnSubscribe(d -> to.dispose())
+                .scan(1, (a, b) -> a)
+        )
+        .subscribe(to);
+
+        to.assertEmpty();
+    }
 }

From f4bb3bd34e2be7be3eacedd942c17835142f1c62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 5 Sep 2023 09:33:27 +0200
Subject: [PATCH 427/665] Bump actions/checkout from 3.6.0 to 4.0.0 (#7598)

Bumps [actions/checkout](https://github.com/actions/checkout) from 3.6.0 to 4.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/f43a0e5ff2bd294095638e18286ca9a3d1956744...3df4ab11eba7bda6032a0b82a6bb43b11571feac)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 97f3457985..16890d4c6d 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 3e1c86b3a6..171f258113 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 8
       uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 4d6a783321..24b3f244d4 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index a338441114..b4ed94e404 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 8
       uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 39b1c67c4b..6c3f3378dd 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 8
       uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index a65399815c..2bea780f54 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 8
       uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:

From dd1b5adf61539f698f66666f23adbe8866cbc7c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Sep 2023 08:51:54 +0200
Subject: [PATCH 428/665] Bump actions/cache from 3.3.1 to 3.3.2 (#7599)

Bumps [actions/cache](https://github.com/actions/cache) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8...704facf57e6136b1bc63b828d79edcd491f0ee84)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 171f258113..dbdc6cd4de 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 24b3f244d4..fbb89562f9 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index b4ed94e404..3ad1f84ead 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 6c3f3378dd..cad0a03e83 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 2bea780f54..d79c559378 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 8ad3095a58a1fc0afcecfb40b2260d24190cedca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 10:29:29 +0200
Subject: [PATCH 429/665] Bump actions/setup-java from 3.12.0 to 3.13.0 (#7600)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.12.0 to 3.13.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/cd89f46ac9d01407894225f350157564c9c7cee2...0ab4596768b603586c0de567f2430c30f5b0d2b0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index dbdc6cd4de..ec7bdf9dac 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 8
-      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index fbb89562f9..0c70a9f45d 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 11
-      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 3ad1f84ead..49a6a7691e 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 8
-      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index cad0a03e83..ca2bce612f 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 8
-      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index d79c559378..90ce2fb7b1 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Set up JDK 8
-      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
         distribution: 'zulu'
         java-version: '8'

From e6f152df7e2f2061435ee8ac3f6ed82cf34e3c58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 10:00:08 +0200
Subject: [PATCH 430/665] Bump actions/checkout from 4.0.0 to 4.1.0 (#7601)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/3df4ab11eba7bda6032a0b82a6bb43b11571feac...8ade135a41bc03ea155e62e844d188df1ea18608)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 16890d4c6d..1fa916340b 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index ec7bdf9dac..16a9e16ac8 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
     - name: Set up JDK 8
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 0c70a9f45d..41b94589a6 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
     - name: Set up JDK 11
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 49a6a7691e..2325fbb2af 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
     - name: Set up JDK 8
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index ca2bce612f..c7fcc0238f 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
     - name: Set up JDK 8
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 90ce2fb7b1..863d697dea 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
+    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
     - name: Set up JDK 8
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:

From 4c59fa66e1bd2c2be54f956ac6da31b2f4613db1 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 4 Oct 2023 23:22:57 +0200
Subject: [PATCH 431/665] 3.x: Update the javadoc description of cast() (#7606)

---
 src/main/java/io/reactivex/rxjava3/core/Flowable.java   | 9 +++++----
 src/main/java/io/reactivex/rxjava3/core/Observable.java | 9 +++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index 8bb6156659..fe27086f37 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -7475,8 +7475,10 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
     }
 
     /**
-     * Returns a {@code Flowable} that emits the items emitted by the current {@code Flowable}, converted to the specified
-     * type.
+     * Returns a {@code Flowable} that emits the upstream items while
+     * they can be cast via {@link Class#cast(Object)} until the upstream terminates,
+     * or until the upstream signals an item which can't be cast,
+     * resulting in a {@link ClassCastException} to be signaled to the downstream.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cast.v3.png" alt="">
      * <dl>
@@ -7489,8 +7491,7 @@ public final Flowable<T> cacheWithInitialCapacity(int initialCapacity) {
      *
      * @param <U> the output value type cast to
      * @param clazz
-     *            the target class type that {@code cast} will cast the items emitted by the current {@code Flowable}
-     *            into before emitting them from the resulting {@code Flowable}
+     *            the target class to use to try and cast the upstream items into
      * @return the new {@code Flowable} instance
      * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index ac5bf8f0ae..14b2795715 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -6668,8 +6668,10 @@ public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
     }
 
     /**
-     * Returns an {@code Observable} that emits the items emitted by the current {@code Observable}, converted to the specified
-     * type.
+     * Returns an {@code Observable} that emits the upstream items while
+     * they can be cast via {@link Class#cast(Object)} until the upstream terminates,
+     * or until the upstream signals an item which can't be cast,
+     * resulting in a {@link ClassCastException} to be signaled to the downstream.
      * <p>
      * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/cast.v3.png" alt="">
      * <dl>
@@ -6679,8 +6681,7 @@ public final Observable<T> cacheWithInitialCapacity(int initialCapacity) {
      *
      * @param <U> the output value type cast to
      * @param clazz
-     *            the target class type that {@code cast} will cast the items emitted by the current {@code Observable}
-     *            into before emitting them from the resulting {@code Observable}
+     *            the target class to use to try and cast the upstream items into
      * @return the new {@code Observable} instance
      * @throws NullPointerException if {@code clazz} is {@code null}
      * @see <a href="http://reactivex.io/documentation/operators/map.html">ReactiveX operators documentation: Map</a>

From 21c2d0d2177a712861855bd336c6cb587fdd6704 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Oct 2023 08:32:07 +0200
Subject: [PATCH 432/665] Bump com.google.guava:guava from 32.1.2-jre to
 32.1.3-jre (#7610)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.2-jre to 32.1.3-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index dbc4b89050..8362b5469a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "32.1.2-jre"
+    guavaVersion = "32.1.3-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From d0038c98af7bf052253c89cbe07f0df62e2d4b83 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 16 Oct 2023 13:15:56 +0200
Subject: [PATCH 433/665] Update How-To-Use-RxJava.md

Fix image links?
---
 docs/How-To-Use-RxJava.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/How-To-Use-RxJava.md b/docs/How-To-Use-RxJava.md
index 2d091bdce4..ac4f4e8f9e 100644
--- a/docs/How-To-Use-RxJava.md
+++ b/docs/How-To-Use-RxJava.md
@@ -285,7 +285,7 @@ onNext => value_14_xform
 
 Here is a marble diagram that illustrates this transformation:
 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/Composition.1.v3.png" width="640" height="536" />
+<img src="/ReactiveX/RxJava/wiki/images/rx-operators/Composition.1.v3.png" width="640" height="536" />
 
 This next example, in Clojure, consumes three asynchronous Observables, including a dependency from one to another, and emits a single response item by combining the items emitted by each of the three Observables with the [`zip`](http://reactivex.io/documentation/operators/zip.html) operator and then transforming the result with [`map`](http://reactivex.io/documentation/operators/map.html):
 
@@ -333,7 +333,7 @@ The response looks like this:
 
 And here is a marble diagram that illustrates how that code produces that response:
 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/Composition.2.v3.png" width="640" height="742" />
+<img src="/ReactiveX/RxJava/wiki/images/rx-operators/Composition.2.v3.png" width="640" height="742" />
 
 The following example, in Groovy, comes from [Ben Christensen’s QCon presentation on the evolution of the Netflix API](https://speakerdeck.com/benjchristensen/evolution-of-the-netflix-api-qcon-sf-2013). It combines two Observables with the [`merge`](http://reactivex.io/documentation/operators/merge.html) operator, then uses the [`reduce`](http://reactivex.io/documentation/operators/reduce.html) operator to construct a single item out of the resulting sequence, then transforms that item with [`map`](http://reactivex.io/documentation/operators/map.html) before emitting it:
 
@@ -350,7 +350,7 @@ public Observable getVideoSummary(APIVideo video) {
 
 And here is a marble diagram that illustrates how that code uses the [`reduce`](http://reactivex.io/documentation/operators/reduce.html) operator to bring the results from multiple Observables together in one structure:
 
-<img src="/Netflix/RxJava/wiki/images/rx-operators/Composition.3.v3.png" width="640" height="640" />
+<img src="/ReactiveX/RxJava/wiki/images/rx-operators/Composition.3.v3.png" width="640" height="640" />
 
 ## Error Handling
 

From 6d63111bde472e94ff8dbfa4288c6964c7363a15 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 16 Oct 2023 13:19:17 +0200
Subject: [PATCH 434/665] Update How-To-Use-RxJava.md

Fix images v2?
---
 docs/How-To-Use-RxJava.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/How-To-Use-RxJava.md b/docs/How-To-Use-RxJava.md
index ac4f4e8f9e..41a46bb75d 100644
--- a/docs/How-To-Use-RxJava.md
+++ b/docs/How-To-Use-RxJava.md
@@ -285,7 +285,7 @@ onNext => value_14_xform
 
 Here is a marble diagram that illustrates this transformation:
 
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/Composition.1.v3.png" width="640" height="536" />
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Composition.1.v3.png" width="640" height="536" />
 
 This next example, in Clojure, consumes three asynchronous Observables, including a dependency from one to another, and emits a single response item by combining the items emitted by each of the three Observables with the [`zip`](http://reactivex.io/documentation/operators/zip.html) operator and then transforming the result with [`map`](http://reactivex.io/documentation/operators/map.html):
 
@@ -333,7 +333,7 @@ The response looks like this:
 
 And here is a marble diagram that illustrates how that code produces that response:
 
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/Composition.2.v3.png" width="640" height="742" />
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Composition.2.v3.png" width="640" height="742" />
 
 The following example, in Groovy, comes from [Ben Christensen’s QCon presentation on the evolution of the Netflix API](https://speakerdeck.com/benjchristensen/evolution-of-the-netflix-api-qcon-sf-2013). It combines two Observables with the [`merge`](http://reactivex.io/documentation/operators/merge.html) operator, then uses the [`reduce`](http://reactivex.io/documentation/operators/reduce.html) operator to construct a single item out of the resulting sequence, then transforms that item with [`map`](http://reactivex.io/documentation/operators/map.html) before emitting it:
 
@@ -350,7 +350,7 @@ public Observable getVideoSummary(APIVideo video) {
 
 And here is a marble diagram that illustrates how that code uses the [`reduce`](http://reactivex.io/documentation/operators/reduce.html) operator to bring the results from multiple Observables together in one structure:
 
-<img src="/ReactiveX/RxJava/wiki/images/rx-operators/Composition.3.v3.png" width="640" height="640" />
+<img src="https://github.com/ReactiveX/RxJava/wiki/images/rx-operators/Composition.3.v3.png" width="640" height="640" />
 
 ## Error Handling
 

From e9a422f84aea151169272505f9e7141c40b19ccb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 22 Oct 2023 11:22:14 +0200
Subject: [PATCH 435/665] Bump actions/checkout from 4.1.0 to 4.1.1 (#7612)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/8ade135a41bc03ea155e62e844d188df1ea18608...b4ffde65f46336ab88eb53be808477a3936bae11)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 1fa916340b..25cafa543b 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 16a9e16ac8..0cb987357b 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 41b94589a6..4f8f39e2aa 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 11
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 2325fbb2af..f3d8c9d5eb 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index c7fcc0238f..cb298df4ab 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 863d697dea..db2150654d 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:

From c1c9eb009a94599c2dc773ca03cff903b2460b87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Nov 2023 08:13:11 +0100
Subject: [PATCH 436/665] Bump actions/setup-java from 3.13.0 to 4.0.0 (#7619)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.13.0 to 4.0.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/0ab4596768b603586c0de567f2430c30f5b0d2b0...387ac29b308b003ca37ba93a6cab5eb57c8f5f93)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 0cb987357b..0702a8de90 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 4f8f39e2aa..d019589806 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 11
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index f3d8c9d5eb..e0f03e68c4 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index cb298df4ab..b240e12f98 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index db2150654d..b50829cf01 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         distribution: 'zulu'
         java-version: '8'

From c14dbe29cfd9244868f69e924f937f8d1c506de2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Dec 2023 19:36:01 +0100
Subject: [PATCH 437/665] Bump com.google.guava:guava from 32.1.3-jre to
 33.0.0-jre (#7623)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.3-jre to 33.0.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8362b5469a..ac76e52151 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "32.1.3-jre"
+    guavaVersion = "33.0.0-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From eff525cd4224236263b9219bc3054cff3fc15d56 Mon Sep 17 00:00:00 2001
From: Pedro Kaj Kjellerup Nacht <pnacht@google.com>
Date: Thu, 21 Dec 2023 15:36:49 -0300
Subject: [PATCH 438/665] Add the Scorecard Action (#7626)

* Create scorecard.yml

* Add badge

Signed-off-by: Pedro Kaj Kjellerup Nacht <pnacht@google.com>

---------

Signed-off-by: Pedro Kaj Kjellerup Nacht <pnacht@google.com>
---
 .github/workflows/scorecard.yml | 59 +++++++++++++++++++++++++++++++++
 README.md                       |  1 +
 2 files changed, 60 insertions(+)
 create mode 100644 .github/workflows/scorecard.yml

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
new file mode 100644
index 0000000000..88e268e8b2
--- /dev/null
+++ b/.github/workflows/scorecard.yml
@@ -0,0 +1,59 @@
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '43 12 * * 4'
+  push:
+    branches: [ "3.x" ]
+
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # (Optional) "write" PAT token. Uncomment the `repo_token` line below if
+          # you want to enable the Branch-Protection check on a *public* repository
+          # To create the PAT, follow the steps in https://github.com/ossf/scorecard-action#authentication-with-fine-grained-pat-optional.
+          # repo_token: ${{ secrets.SCORECARD_TOKEN }}
+
+          # - Publish results to OpenSSF REST API for easy access by consumers
+          # - Allows the repository to include the Scorecard badge.
+          # - See https://github.com/ossf/scorecard-action#publishing-results.
+          publish_results: true
+
+      # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
+      # format to the repository Actions tab.
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@03e7845b7bfcd5e7fb63d1ae8c61b0e791134fab # v2.22.11
+        with:
+          sarif_file: results.sarif
diff --git a/README.md b/README.md
index fe21176c1f..f6b0339559 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,7 @@
 [![codecov.io](http://codecov.io/github/ReactiveX/RxJava/coverage.svg?branch=3.x)](https://codecov.io/gh/ReactiveX/RxJava/branch/3.x)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava)
 [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/ReactiveX/RxJava)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/ReactiveX/RxJava/badge)](https://securityscorecards.dev/viewer/?uri=github.com/ReactiveX/RxJava)
 
 RxJava is a Java VM implementation of [Reactive Extensions](http://reactivex.io): a library for composing asynchronous and event-based programs by using observable sequences.
 

From f822ffbc48de4de9273120aaf58ac0a591bc7e99 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Wed, 3 Jan 2024 17:22:13 +0100
Subject: [PATCH 439/665] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f6b0339559..a62a861dc4 100644
--- a/README.md
+++ b/README.md
@@ -201,7 +201,7 @@ RxJava operators don't work with `Thread`s or `ExecutorService`s directly but wi
 - `Schedulers.single()`: Run work on a single thread in a sequential and FIFO manner.
 - `Schedulers.trampoline()`: Run work in a sequential and FIFO manner in one of the participating threads, usually for testing purposes.
 
-These are available on all JVM platforms but some specific platforms, such as Android, have their own typical `Scheduler`s defined: `AndroidSchedulers.mainThread()`, `SwingScheduler.instance()` or `JavaFXSchedulers.gui()`.
+These are available on all JVM platforms but some specific platforms, such as Android, have their own typical `Scheduler`s defined: `AndroidSchedulers.mainThread()`, `SwingScheduler.instance()` or `JavaFXScheduler.platform()`.
 
 In addition, there is an option to wrap an existing `Executor` (and its subtypes such as `ExecutorService`) into a `Scheduler` via `Schedulers.from(Executor)`. This can be used, for example, to have a larger but still fixed pool of threads (unlike `computation()` and `io()` respectively).
 

From 988e5ba778f2839ba29e5359f662b1fea5d263f4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 9 Jan 2024 08:35:00 +0100
Subject: [PATCH 440/665] Bump github/codeql-action from 2.22.11 to 3.23.0
 (#7632)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2.22.11 to 3.23.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/03e7845b7bfcd5e7fb63d1ae8c61b0e791134fab...e5f05b81d5b6ff8cfa111c80c22c5fd02a384118)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 88e268e8b2..f2c9b4070e 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@03e7845b7bfcd5e7fb63d1ae8c61b0e791134fab # v2.22.11
+        uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
         with:
           sarif_file: results.sarif

From 517aed8d6851ebf4fc0a93bde5f4cbf40f825409 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Jan 2024 08:49:05 +0100
Subject: [PATCH 441/665] Bump actions/cache from 3.3.2 to 3.3.3 (#7633)

Bumps [actions/cache](https://github.com/actions/cache) from 3.3.2 to 3.3.3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/704facf57e6136b1bc63b828d79edcd491f0ee84...e12d46a63a90f2fae62d114769bbf2a179198b5c)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 0702a8de90..73bd4df0d8 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index d019589806..e8324cab84 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index e0f03e68c4..b659ee6335 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index b240e12f98..dd277755de 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index b50829cf01..534720dba0 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3.3.2
+      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From c4bd78769e192548933188398a50affd64c666d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jan 2024 12:01:02 +0100
Subject: [PATCH 442/665] Bump actions/upload-artifact from 4.0.0 to 4.1.0
 (#7635)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/c7d193f32edcb7bfad88892161225aeda64e9392...1eb3cb2b3e0f29609092a73eb033bb759a334595)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f2c9b4070e..2dd6c55edd 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
+        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
         with:
           name: SARIF file
           path: results.sarif

From 43f05e0eb3636ece5bf9774bd269b44d501c252d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 08:20:56 +0100
Subject: [PATCH 443/665] Bump actions/cache from 3.3.3 to 4.0.0 (#7636)

Bumps [actions/cache](https://github.com/actions/cache) from 3.3.3 to 4.0.0.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/e12d46a63a90f2fae62d114769bbf2a179198b5c...13aacd865c20de90d75de3b17ebe84f7a17d57d2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 73bd4df0d8..fa1facd4ed 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index e8324cab84..0b5ef4b1cb 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index b659ee6335..8f9703419e 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index dd277755de..86ba5c472f 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 534720dba0..24465730c7 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3.3.3
+      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 093abde113d07b9c2988750eabe480d50bb43cde Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Jan 2024 08:57:56 +0100
Subject: [PATCH 444/665] Bump github/codeql-action from 3.23.0 to 3.23.1
 (#7637)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.0 to 3.23.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e5f05b81d5b6ff8cfa111c80c22c5fd02a384118...0b21cf2492b6b02c465a3e5d7c473717ad7721ba)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2dd6c55edd..94066434d3 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e5f05b81d5b6ff8cfa111c80c22c5fd02a384118 # v3.23.0
+        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
         with:
           sarif_file: results.sarif

From e201de6fcc06b6e964e868815928ca8489741f94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 09:05:21 +0100
Subject: [PATCH 445/665] Bump actions/upload-artifact from 4.1.0 to 4.2.0
 (#7638)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/1eb3cb2b3e0f29609092a73eb033bb759a334595...694cdabd8bdb0f10b2cea11669e1bf5453eed0a6)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 94066434d3..a317cceb8b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@1eb3cb2b3e0f29609092a73eb033bb759a334595 # v4.1.0
+        uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
         with:
           name: SARIF file
           path: results.sarif

From 3df54a3084497bcbefc87455e3e1bd65c0a461c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 18:57:49 +0100
Subject: [PATCH 446/665] Bump codecov/codecov-action from 3.1.4 to 3.1.5
 (#7641)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.4 to 3.1.5.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/eaaf4bedf32dbdc6b720b63067d99c4d77d6047d...4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index fa1facd4ed..06ff21478c 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+      uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 8f9703419e..be852ea677 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+      uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 86ba5c472f..5e174567b8 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+      uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 24465730c7..e7e1000d72 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
+      uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From a728b086223bac40c92bb0f1c4740955568e0b49 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jan 2024 18:58:05 +0100
Subject: [PATCH 447/665] Bump actions/upload-artifact from 4.2.0 to 4.3.0
 (#7639)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/694cdabd8bdb0f10b2cea11669e1bf5453eed0a6...26f96dfa697d77e81fd5907df203aa23a56210a8)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a317cceb8b..935f7b9e20 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@694cdabd8bdb0f10b2cea11669e1bf5453eed0a6 # v4.2.0
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
         with:
           name: SARIF file
           path: results.sarif

From 322316f116d422752c2a9045ecdc31d647f1bd87 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:50:06 +0100
Subject: [PATCH 448/665] Bump github/codeql-action from 3.23.1 to 3.23.2
 (#7642)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.1 to 3.23.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/0b21cf2492b6b02c465a3e5d7c473717ad7721ba...b7bf0a3ed3ecfa44160715d7c442788f65f0f923)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 935f7b9e20..d485ced186 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+        uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
         with:
           sarif_file: results.sarif

From 9b55d01f207283bf5518f8c2d0f810e83e61508b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 31 Jan 2024 08:34:20 +0100
Subject: [PATCH 449/665] Bump codecov/codecov-action from 3.1.5 to 3.1.6
 (#7643)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.5 to 3.1.6.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0...ab904c41d6ece82784817410c45d8b8c02684457)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 06ff21478c..a3a1d6096a 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
+      uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index be852ea677..a78f9df953 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
+      uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 5e174567b8..6dc8c6c7ab 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
+      uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index e7e1000d72..cd10374db2 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@4fe8c5f003fae66aa5ebb77cfd3e7bfbbda0b6b0 # v3.1.5
+      uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 167a1c494d926e9f69150c4b2bb7985af76e9ecd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Feb 2024 16:29:57 +0100
Subject: [PATCH 450/665] Bump codecov/codecov-action from 3.1.6 to 4.0.0
 (#7644)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 3.1.6 to 4.0.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/ab904c41d6ece82784817410c45d8b8c02684457...f30e4959ba63075080d4f7f90cacc18d9f3fafd7)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index a3a1d6096a..4e75e1f177 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
+      uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index a78f9df953..27872bfbd7 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
+      uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 6dc8c6c7ab..c03ad1b1ce 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
+      uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index cd10374db2..68dcbf33df 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@ab904c41d6ece82784817410c45d8b8c02684457 # v3.1.6
+      uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From ca0fa5dc3d02bc015ae2c4f8d75a3b0cae241e7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 08:35:24 +0100
Subject: [PATCH 451/665] Bump gradle/wrapper-validation-action from 1.1.0 to
 2.0.0 (#7646)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 1.1.0 to 2.0.0.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/56b90f209b02bf6d1deae490e9ef18b21a389cd4...27152f6fa06a6b8062ef7195c795692e51fc2c81)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 25cafa543b..74caa65a59 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
+      - uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2.0.0

From 7c2bb36a8292b5fea967fc2039a48724d7fe2678 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 2 Feb 2024 08:35:45 +0100
Subject: [PATCH 452/665] Bump codecov/codecov-action from 4.0.0 to 4.0.1
 (#7647)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/f30e4959ba63075080d4f7f90cacc18d9f3fafd7...e0b68c6749509c5f83f984dd99a76a1c1a231044)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 4e75e1f177..c7a980a260 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
+      uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 27872bfbd7..6445a73932 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
+      uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index c03ad1b1ce..b0e8ae79f1 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
+      uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 68dcbf33df..3bf744d296 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@f30e4959ba63075080d4f7f90cacc18d9f3fafd7 # v4.0.0
+      uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From daf69bfcf1b012ad1a05ed9a5f8d59da48e37016 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Feb 2024 10:02:44 +0100
Subject: [PATCH 453/665] Bump github/codeql-action from 3.23.2 to 3.24.0
 (#7648)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.23.2 to 3.24.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b7bf0a3ed3ecfa44160715d7c442788f65f0f923...e8893c57a1f3a2b659b6b55564fdfdbbd2982911)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index d485ced186..339761a574 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b7bf0a3ed3ecfa44160715d7c442788f65f0f923 # v3.23.2
+        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
         with:
           sarif_file: results.sarif

From 675898f9533d2ddddc75c9acba82a6456954d1c1 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 5 Feb 2024 22:25:33 +0100
Subject: [PATCH 454/665] Update Getting-Started.md

Resolves #7651
---
 docs/Getting-Started.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/Getting-Started.md b/docs/Getting-Started.md
index d2ac2e4640..69b69a8ca6 100644
--- a/docs/Getting-Started.md
+++ b/docs/Getting-Started.md
@@ -66,18 +66,21 @@ You need Java 6 or later.
 
 ### Snapshots
 
-Snapshots are available via [JFrog](https://oss.jfrog.org/libs-snapshot/io/reactivex/rxjava3/rxjava/):
+Snapshots after May 1st, 2021 are available via https://oss.sonatype.org/content/repositories/snapshots/io/reactivex/rxjava3/rxjava/
 
 ```groovy
 repositories {
-    maven { url 'https://oss.jfrog.org/libs-snapshot' }
+  maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
 }
 
 dependencies {
-    compile 'io.reactivex.rxjava3:rxjava:3.0.4'
+  implementation 'io.reactivex.rxjava3:rxjava:3.0.0-SNAPSHOT'
 }
 ```
 
+JavaDoc snapshots are available at http://reactivex.io/RxJava/3.x/javadoc/snapshot
+
+
 ## Building
 
 To check out and build the RxJava source, issue the following commands:

From 7ed1c195fe598b080516dc0aea4f28c272caf621 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 5 Feb 2024 22:31:14 +0100
Subject: [PATCH 455/665] Update to Gradle 7.6.4 (#7650)

---
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4e86b92707..c7d437bbb4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 4da2c696356cfec42a9d14c7927ee17755ed3095 Mon Sep 17 00:00:00 2001
From: Justin Dhillon <justin.singh.dhillon@gmail.com>
Date: Mon, 5 Feb 2024 13:54:02 -0800
Subject: [PATCH 456/665] Fix Broken Links (#7652)

* https://github.com/ReactiveX/RxJava/blob/3.x/src/main/java/io/reactivex/rxjava3/annotations/Beta.java

* https://github.com/ReactiveX/RxJava/blob/3.x/src/main/java/io/reactivex/rxjava3/annotations/Experimental.java
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a62a861dc4..1456d2b68c 100644
--- a/README.md
+++ b/README.md
@@ -618,5 +618,5 @@ For bugs, questions and discussions please use the [Github Issues](https://githu
     See the License for the specific language governing permissions and
     limitations under the License.
 
-[beta source link]: https://github.com/ReactiveX/RxJava/blob/3.x/src/main/java/io/reactivex/annotations/Beta.java
-[experimental source link]: https://github.com/ReactiveX/RxJava/blob/3.x/src/main/java/io/reactivex/annotations/Experimental.java
+[beta source link]: https://github.com/ReactiveX/RxJava/blob/3.x/src/main/java/io/reactivex/rxjava3/annotations/Beta.java
+[experimental source link]: https://github.com/ReactiveX/RxJava/blob/3.x/src/main/java/io/reactivex/rxjava3/annotations/Experimental.java

From e202105c1df0a51c289affa7f5e2a8491e6db3c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Feb 2024 09:43:44 +0100
Subject: [PATCH 457/665] Bump actions/upload-artifact from 4.3.0 to 4.3.1
 (#7653)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/26f96dfa697d77e81fd5907df203aa23a56210a8...5d5d22a31266ced268874388b861e4b58bb5c2f3)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 339761a574..e87e502acc 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
           name: SARIF file
           path: results.sarif

From 37fdbaf410709426f6269050b67a762fd7d232f6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Feb 2024 11:59:16 +0100
Subject: [PATCH 458/665] Bump gradle/wrapper-validation-action from 2.0.0 to
 2.0.1 (#7654)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.0.0 to 2.0.1.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/27152f6fa06a6b8062ef7195c795692e51fc2c81...a494d935f4b56874c4a5a87d19af7afcf3a163d0)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 74caa65a59..5e551e1e53 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: gradle/wrapper-validation-action@27152f6fa06a6b8062ef7195c795692e51fc2c81 # v2.0.0
+      - uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2.0.1

From d49d9634c909fd4630bbc802c472b782e2e4c3eb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Feb 2024 09:06:01 +0100
Subject: [PATCH 459/665] Bump gradle/wrapper-validation-action from 2.0.1 to
 2.1.0 (#7655)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.0.1 to 2.1.0.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/a494d935f4b56874c4a5a87d19af7afcf3a163d0...85cde3f5a1033b2adc2442631c24b530f1183a1a)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 5e551e1e53..83c589ce6c 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: gradle/wrapper-validation-action@a494d935f4b56874c4a5a87d19af7afcf3a163d0 # v2.0.1
+      - uses: gradle/wrapper-validation-action@85cde3f5a1033b2adc2442631c24b530f1183a1a # v2.1.0

From 205534f2fac98a3862b422a530c8398bbc90c067 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Feb 2024 09:36:02 +0100
Subject: [PATCH 460/665] Bump gradle/wrapper-validation-action from 2.1.0 to
 2.1.1 (#7656)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/85cde3f5a1033b2adc2442631c24b530f1183a1a...699bb18358f12c5b78b37bb0111d3a0e2276e0e2)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 83c589ce6c..317c184351 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-      - uses: gradle/wrapper-validation-action@85cde3f5a1033b2adc2442631c24b530f1183a1a # v2.1.0
+      - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1

From 8e50f348e7714d4be178d6efaac573a5e1b01645 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Feb 2024 09:14:16 +0100
Subject: [PATCH 461/665] Bump github/codeql-action from 3.24.0 to 3.24.1
 (#7657)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.0 to 3.24.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e8893c57a1f3a2b659b6b55564fdfdbbd2982911...e675ced7a7522a761fc9c8eb26682c8b27c42b2b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index e87e502acc..3ea8f0e149 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
+        uses: github/codeql-action/upload-sarif@e675ced7a7522a761fc9c8eb26682c8b27c42b2b # v3.24.1
         with:
           sarif_file: results.sarif

From 6fabdd6936d3ca6a38418157b1d78a42be6ceeaa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 16 Feb 2024 08:38:47 +0100
Subject: [PATCH 462/665] Bump github/codeql-action from 3.24.1 to 3.24.3
 (#7658)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.1 to 3.24.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e675ced7a7522a761fc9c8eb26682c8b27c42b2b...379614612a29c9e28f31f39a59013eb8012a51f0)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 3ea8f0e149..dff2c20368 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e675ced7a7522a761fc9c8eb26682c8b27c42b2b # v3.24.1
+        uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
         with:
           sarif_file: results.sarif

From 56c193097e09cb701bcf502f0c1b3a2e02e87f98 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Feb 2024 08:46:29 +0100
Subject: [PATCH 463/665] Bump github/codeql-action from 3.24.3 to 3.24.4
 (#7659)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.3 to 3.24.4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/379614612a29c9e28f31f39a59013eb8012a51f0...e2e140ad1441662206e8f97754b166877dfa1c73)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index dff2c20368..8704e7896c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@379614612a29c9e28f31f39a59013eb8012a51f0 # v3.24.3
+        uses: github/codeql-action/upload-sarif@e2e140ad1441662206e8f97754b166877dfa1c73 # v3.24.4
         with:
           sarif_file: results.sarif

From 3825e1cc4f49db4b2e962367b5e7bd183e8eca8a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:32:13 +0100
Subject: [PATCH 464/665] Bump codecov/codecov-action from 4.0.1 to 4.0.2
 (#7662)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/e0b68c6749509c5f83f984dd99a76a1c1a231044...0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index c7a980a260..76acf86435 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
+      uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 6445a73932..64123a98d5 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
+      uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index b0e8ae79f1..291bedf10c 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
+      uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 3bf744d296..7ec37cb693 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@e0b68c6749509c5f83f984dd99a76a1c1a231044 # v4.0.1
+      uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From e0a04e4a8db9db26c81e988792272087520970a3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:32:24 +0100
Subject: [PATCH 465/665] Bump github/codeql-action from 3.24.4 to 3.24.5
 (#7661)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.4 to 3.24.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e2e140ad1441662206e8f97754b166877dfa1c73...47b3d888fe66b639e431abf22ebca059152f1eea)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 8704e7896c..1e1d1a7a62 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e2e140ad1441662206e8f97754b166877dfa1c73 # v3.24.4
+        uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
         with:
           sarif_file: results.sarif

From 26949695506e72dfd54b0aa8450d8c9d0a058085 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Feb 2024 08:31:17 +0100
Subject: [PATCH 466/665] Bump codecov/codecov-action from 4.0.2 to 4.1.0
 (#7663)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1...54bcd8715eee62d40e33596ef5e8f0f48dbbccab)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 76acf86435..3aa6c22ee1 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
+      uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 64123a98d5..62f7fef5f4 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
+      uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 291bedf10c..450da823f2 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
+      uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 7ec37cb693..d457b8d3d6 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@0cfda1dd0a4ad9efc75517f399d859cd1ea4ced1 # v4.0.2
+      uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 4edeab23f6fe612ea5653752b58bb9457bb35fa2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 29 Feb 2024 08:40:53 +0100
Subject: [PATCH 467/665] Bump actions/setup-java from 4.0.0 to 4.1.0 (#7665)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.0.0 to 4.1.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/387ac29b308b003ca37ba93a6cab5eb57c8f5f93...9704b39bf258b59bc04b50fa2dd55e9ed76b47a8)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 3aa6c22ee1..da3c677f77 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 0b5ef4b1cb..d3cc957b39 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 11
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 62f7fef5f4..cca038bd8f 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 450da823f2..11a2e8abc1 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index d457b8d3d6..3fa2f300f0 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK 8
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
         distribution: 'zulu'
         java-version: '8'

From 70d3c3306b6ce36594e2283b2ce29125b95573c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 09:00:45 +0100
Subject: [PATCH 468/665] Bump actions/cache from 4.0.0 to 4.0.1 (#7666)

Bumps [actions/cache](https://github.com/actions/cache) from 4.0.0 to 4.0.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/13aacd865c20de90d75de3b17ebe84f7a17d57d2...ab5e6d0c87105b4c9c2047343972218f562e4319)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index da3c677f77..1298ed7b9f 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index d3cc957b39..f81a3b4c6e 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index cca038bd8f..2ffa126f53 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 11a2e8abc1..76887e1402 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 3fa2f300f0..ab87668e86 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
+      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 25096b6a03ece4414e4ee994eba6cac802e89ce3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Mar 2024 09:01:02 +0100
Subject: [PATCH 469/665] Bump github/codeql-action from 3.24.5 to 3.24.6
 (#7667)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.5 to 3.24.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/47b3d888fe66b639e431abf22ebca059152f1eea...8a470fddafa5cbb6266ee11b37ef4d8aae19c571)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 1e1d1a7a62..602eb1a0d2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@47b3d888fe66b639e431abf22ebca059152f1eea # v3.24.5
+        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
         with:
           sarif_file: results.sarif

From 23664bba6e51df10ee2fb4e674e22b6b1bad1be4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 07:44:00 +0100
Subject: [PATCH 470/665] Bump github/codeql-action from 3.24.6 to 3.24.7
 (#7671)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.6 to 3.24.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/8a470fddafa5cbb6266ee11b37ef4d8aae19c571...3ab4101902695724f9365a384f86c1074d94e18c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 602eb1a0d2..1f633f8317 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
+        uses: github/codeql-action/upload-sarif@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
         with:
           sarif_file: results.sarif

From 74beaa9b8eaa743e08bf7970e9a83c91a6b75723 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 07:44:29 +0100
Subject: [PATCH 471/665] Bump actions/checkout from 4.1.1 to 4.1.2 (#7670)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/b4ffde65f46336ab88eb53be808477a3936bae11...9bb56186c3b09b4f86b1c65136769dd318469633)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 317c184351..d08048c14e 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 1298ed7b9f..d04f0b7aec 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
       uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index f81a3b4c6e..bcb43220f1 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 11
       uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 2ffa126f53..ea4d350343 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
       uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 76887e1402..ab6134420e 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
       uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index ab87668e86..c6902d73c8 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
       uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 1f633f8317..c962a5eed7 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           persist-credentials: false
 

From e5d826ef5dead2e6f475bcebd798f4f26c1a626f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Mar 2024 08:56:11 +0100
Subject: [PATCH 472/665] Bump actions/setup-java from 4.1.0 to 4.2.0 (#7672)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/9704b39bf258b59bc04b50fa2dd55e9ed76b47a8...5896cecc08fd8a1fbdfaf517e29b571164b031f7)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index d04f0b7aec..09bcc163e9 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index bcb43220f1..e5c62ed2f3 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 11
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index ea4d350343..aa85970f8c 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index ab6134420e..b8d1a533b6 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index c6902d73c8..a2dcda96c6 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
+      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
       with:
         distribution: 'zulu'
         java-version: '8'

From 2e28c7beaff90e955d174fd848e0f12149232474 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Mar 2024 08:56:30 +0100
Subject: [PATCH 473/665] Bump com.google.guava:guava from 33.0.0-jre to
 33.1.0-jre (#7673)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.0.0-jre to 33.1.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ac76e52151..4562402383 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.0.0-jre"
+    guavaVersion = "33.1.0-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 56e90a61d28e62b8ec652cd395a58576b648096a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Mar 2024 08:34:22 +0100
Subject: [PATCH 474/665] Bump actions/setup-java from 4.2.0 to 4.2.1 (#7674)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/5896cecc08fd8a1fbdfaf517e29b571164b031f7...99b8673ff64fbf99d8d325f52d9a5bdedb8483e9)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 09bcc163e9..3bcb3798ab 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
-      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index e5c62ed2f3..9df1482d9d 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 11
-      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index aa85970f8c..b6e4499255 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
-      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index b8d1a533b6..1d37dc971f 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
-      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index a2dcda96c6..d8d975cd0a 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
     - name: Set up JDK 8
-      uses: actions/setup-java@5896cecc08fd8a1fbdfaf517e29b571164b031f7 # v4.2.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: 'zulu'
         java-version: '8'

From 58affa37842153bdbe2eed9c5e9424dc8bee7130 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 09:22:08 +0100
Subject: [PATCH 475/665] Bump github/codeql-action from 3.24.7 to 3.24.8
 (#7675)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.7 to 3.24.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/3ab4101902695724f9365a384f86c1074d94e18c...05963f47d870e2cb19a537396c1f668a348c7d8f)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c962a5eed7..016f982200 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
+        uses: github/codeql-action/upload-sarif@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
         with:
           sarif_file: results.sarif

From 573761b1f77f9b713afa53a8abb48c1c84d0a80b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 20 Mar 2024 08:43:01 +0100
Subject: [PATCH 476/665] Bump actions/cache from 4.0.1 to 4.0.2 (#7676)

Bumps [actions/cache](https://github.com/actions/cache) from 4.0.1 to 4.0.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/ab5e6d0c87105b4c9c2047343972218f562e4319...0c45773b623bea8c8e75f6c82b208c3cf94ea4f9)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 3bcb3798ab..df83145b48 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 9df1482d9d..5a465c47c2 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index b6e4499255..755c3b98c7 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 1d37dc971f..9bdb1719c0 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index d8d975cd0a..1dc08629ba 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@ab5e6d0c87105b4c9c2047343972218f562e4319 # v4.0.1
+      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From df5b278b2787d554c2e978b1baa61695c8f917de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 09:00:24 +0100
Subject: [PATCH 477/665] Bump gradle/wrapper-validation-action from 2.1.1 to
 2.1.2 (#7677)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/699bb18358f12c5b78b37bb0111d3a0e2276e0e2...b231772637bb498f11fdbc86052b6e8a8dc9fc92)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index d08048c14e..20ae51297c 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - uses: gradle/wrapper-validation-action@699bb18358f12c5b78b37bb0111d3a0e2276e0e2 # v2.1.1
+      - uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92 # v2.1.2

From affdad2fe03bf4afa37e6f37c348440a10fcd55b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 08:53:19 +0100
Subject: [PATCH 478/665] Bump github/codeql-action from 3.24.8 to 3.24.9
 (#7678)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.8 to 3.24.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/05963f47d870e2cb19a537396c1f668a348c7d8f...1b1aada464948af03b950897e5eb522f92603cc2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 016f982200..66b2a62c17 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@05963f47d870e2cb19a537396c1f668a348c7d8f # v3.24.8
+        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
         with:
           sarif_file: results.sarif

From 1eca072ba9980f3cbc5cfae68490cb5c3508f632 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 13:48:44 +0100
Subject: [PATCH 479/665] Bump codecov/codecov-action from 4.1.0 to 4.1.1
 (#7679)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/54bcd8715eee62d40e33596ef5e8f0f48dbbccab...c16abc29c95fcf9174b58eb7e1abf4c866893bc8)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index df83145b48..767966e13a 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
+      uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 755c3b98c7..3ddda5d143 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
+      uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 9bdb1719c0..260a78eda5 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
+      uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 1dc08629ba..5e4d8782f1 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@54bcd8715eee62d40e33596ef5e8f0f48dbbccab # v4.1.0
+      uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From d6db6af04c410eb835046171b78880eb336474a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Apr 2024 08:47:39 +0200
Subject: [PATCH 480/665] Bump codecov/codecov-action from 4.1.1 to 4.2.0
 (#7680)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.1.1 to 4.2.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/c16abc29c95fcf9174b58eb7e1abf4c866893bc8...7afa10ed9b269c561c2336fd862446844e0cbf71)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 767966e13a..f010f290e4 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
+      uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 3ddda5d143..26098df3ee 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
+      uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 260a78eda5..b16fafc3d1 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
+      uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 5e4d8782f1..11f7e26cea 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@c16abc29c95fcf9174b58eb7e1abf4c866893bc8 # v4.1.1
+      uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 2040be9e94fc40a2045f581ec29abfee8a19521d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 08:50:31 +0200
Subject: [PATCH 481/665] Bump github/codeql-action from 3.24.9 to 3.24.10
 (#7681)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.9 to 3.24.10.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/1b1aada464948af03b950897e5eb522f92603cc2...4355270be187e1b672a7a1c7c7bae5afdc1ab94a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 66b2a62c17..899836d763 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
+        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
         with:
           sarif_file: results.sarif

From db261fe95f9e67b91eacf15ab104f563684f19ca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2024 18:16:23 +0200
Subject: [PATCH 482/665] Bump codecov/codecov-action from 4.2.0 to 4.3.0
 (#7685)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/7afa10ed9b269c561c2336fd862446844e0cbf71...84508663e988701840491b86de86b666e8a86bed)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index f010f290e4..c4881544e0 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
+      uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 26098df3ee..a72402e329 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
+      uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index b16fafc3d1..e3695da4bb 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
+      uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 11f7e26cea..098b606d69 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@7afa10ed9b269c561c2336fd862446844e0cbf71 # v4.2.0
+      uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 41011b46990faf094d66d810320333cabb6bc5cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Apr 2024 18:16:39 +0200
Subject: [PATCH 483/665] Bump gradle/wrapper-validation-action from 2.1.2 to
 2.1.3 (#7686)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/b231772637bb498f11fdbc86052b6e8a8dc9fc92...b5418f5a58f5fd2eb486dd7efb368fe7be7eae45)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 20ae51297c..2d2d5245d3 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - uses: gradle/wrapper-validation-action@b231772637bb498f11fdbc86052b6e8a8dc9fc92 # v2.1.2
+      - uses: gradle/wrapper-validation-action@b5418f5a58f5fd2eb486dd7efb368fe7be7eae45 # v2.1.3

From b8f61d31e83e9b839add0e7ea176ee55906626ef Mon Sep 17 00:00:00 2001
From: laterlaugh <166613655+laterlaugh@users.noreply.github.com>
Date: Fri, 12 Apr 2024 21:04:34 +0800
Subject: [PATCH 484/665] chore: fix some typos in comments (#7689)

Signed-off-by: laterlaugh <manziwenzhai@sina.cn>
---
 docs/Phantom-Operators.md                                   | 2 +-
 .../rxjava3/disposables/CompositeDisposableTest.java        | 2 +-
 .../java/io/reactivex/rxjava3/exceptions/TestException.java | 2 +-
 .../rxjava3/flowable/FlowableBackpressureTests.java         | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/Phantom-Operators.md b/docs/Phantom-Operators.md
index b01ac28ff2..5193147a22 100644
--- a/docs/Phantom-Operators.md
+++ b/docs/Phantom-Operators.md
@@ -127,7 +127,7 @@ streamOfItems.flatMap(item -> {
    itemToObservable(item).subscribeOn(Schedulers.io());
 });
 ```
-Kick off your work for each item inside [`flatMap`](Transforming-Observables#flatmap-concatmap-and-flatmapiterable) using [`subscribeOn`](Observable-Utility-Operators#subscribeon) to make it asynchronous, or by using a function that already makes asychronous calls.
+Kick off your work for each item inside [`flatMap`](Transforming-Observables#flatmap-concatmap-and-flatmapiterable) using [`subscribeOn`](Observable-Utility-Operators#subscribeon) to make it asynchronous, or by using a function that already makes asynchronous calls.
 
 #### see also:
 * <a href="http://www.grahamlea.com/2014/07/rxjava-threading-examples/">RxJava Threading Examples</a> by Graham Lea
diff --git a/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
index a8ee27b307..3f76d283d7 100644
--- a/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
+++ b/src/test/java/io/reactivex/rxjava3/disposables/CompositeDisposableTest.java
@@ -290,7 +290,7 @@ public void tryRemoveIfNotIn() {
         cd.remove(cd1);
         cd.add(cd2);
 
-        cd.remove(cd1); // try removing agian
+        cd.remove(cd1); // try removing again
     }
 
     @Test(expected = NullPointerException.class)
diff --git a/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java b/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java
index efd568b120..7bcdd318fd 100644
--- a/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java
+++ b/src/test/java/io/reactivex/rxjava3/exceptions/TestException.java
@@ -14,7 +14,7 @@
 package io.reactivex.rxjava3.exceptions;
 
 /**
- * Exception for testing if unchecked expections propagate as-is without confusing with
+ * Exception for testing if unchecked exceptions propagate as-is without confusing with
  * other type of common exceptions.
  */
 public final class TestException extends RuntimeException {
diff --git a/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
index 975ef5c149..e6b3a02c68 100644
--- a/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
+++ b/src/test/java/io/reactivex/rxjava3/flowable/FlowableBackpressureTests.java
@@ -132,7 +132,7 @@ public void mergeSync() {
         assertEquals(num, ts.values().size());
         // either one can starve the other, but neither should be capable of doing more than 5 batches (taking 4.1)
         // TODO is it possible to make this deterministic rather than one possibly starving the other?
-        // benjchristensen => In general I'd say it's not worth trying to make it so, as "fair" algoritms generally take a performance hit
+        // benjchristensen => In general I'd say it's not worth trying to make it so, as "fair" algorithms generally take a performance hit
         assertTrue(c1.get() < Flowable.bufferSize() * 5);
         assertTrue(c2.get() < Flowable.bufferSize() * 5);
     }
@@ -154,7 +154,7 @@ public void mergeAsync() {
         assertEquals(num, ts.values().size());
         // either one can starve the other, but neither should be capable of doing more than 5 batches (taking 4.1)
         // TODO is it possible to make this deterministic rather than one possibly starving the other?
-        // benjchristensen => In general I'd say it's not worth trying to make it so, as "fair" algoritms generally take a performance hit
+        // benjchristensen => In general I'd say it's not worth trying to make it so, as "fair" algorithms generally take a performance hit
         int max = Flowable.bufferSize() * 7;
         assertTrue("" + c1.get() + " >= " + max, c1.get() < max);
         assertTrue("" + c2.get() + " >= " + max, c2.get() < max);
@@ -206,7 +206,7 @@ public void mergeAsyncThenObserveOn() {
         assertEquals(num, ts.values().size());
         // either one can starve the other, but neither should be capable of doing more than 5 batches (taking 4.1)
         // TODO is it possible to make this deterministic rather than one possibly starving the other?
-        // benjchristensen => In general I'd say it's not worth trying to make it so, as "fair" algoritms generally take a performance hit
+        // benjchristensen => In general I'd say it's not worth trying to make it so, as "fair" algorithms generally take a performance hit
         // akarnokd => run this in a loop over 10k times and never saw values get as high as 7*SIZE, but since observeOn delays the unsubscription non-deterministically, the test will remain unreliable
         assertTrue(c1.get() < Flowable.bufferSize() * 7);
         assertTrue(c2.get() < Flowable.bufferSize() * 7);

From 376b4ea2817112132cfadb41176d079dbeedad70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 09:55:19 +0200
Subject: [PATCH 485/665] Bump gradle/wrapper-validation-action from 2.1.3 to
 3.3.0 (#7690)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 2.1.3 to 3.3.0.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/b5418f5a58f5fd2eb486dd7efb368fe7be7eae45...460a3ca55fc5d559238a0efc7fa9f7465df8585d)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 2d2d5245d3..b460247fe7 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - uses: gradle/wrapper-validation-action@b5418f5a58f5fd2eb486dd7efb368fe7be7eae45 # v2.1.3
+      - uses: gradle/wrapper-validation-action@460a3ca55fc5d559238a0efc7fa9f7465df8585d # v3.3.0

From 3e17369296e73dee8d6694a8967f53fed2574d1f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Apr 2024 07:43:16 +0200
Subject: [PATCH 486/665] Bump github/codeql-action from 3.24.10 to 3.25.1
 (#7692)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.24.10 to 3.25.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4355270be187e1b672a7a1c7c7bae5afdc1ab94a...c7f9125735019aa87cfc361530512d50ea439c71)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 899836d763..e4efe1afa1 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
+        uses: github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1
         with:
           sarif_file: results.sarif

From 0920996834fa66bdff5cbeb64737b0677850d3af Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Apr 2024 09:14:28 +0200
Subject: [PATCH 487/665] Bump gradle/wrapper-validation-action from 3.3.0 to
 3.3.1 (#7694)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 3.3.0 to 3.3.1.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/460a3ca55fc5d559238a0efc7fa9f7465df8585d...5188e9b5527a0a094cee21e2fe9a8ca44b4629af)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index b460247fe7..da979d6759 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
-      - uses: gradle/wrapper-validation-action@460a3ca55fc5d559238a0efc7fa9f7465df8585d # v3.3.0
+      - uses: gradle/wrapper-validation-action@5188e9b5527a0a094cee21e2fe9a8ca44b4629af # v3.3.1

From 10e2da710f2cfff9035c6cbbbb857fe70f752a9f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 19 Apr 2024 09:14:44 +0200
Subject: [PATCH 488/665] Bump actions/upload-artifact from 4.3.1 to 4.3.2
 (#7693)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.1 to 4.3.2.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/5d5d22a31266ced268874388b861e4b58bb5c2f3...1746f4ab65b179e0ea60a494b83293b640dd5bba)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index e4efe1afa1..5023479b66 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
         with:
           name: SARIF file
           path: results.sarif

From 27aee12693bb4c1256e4b8f8ae5da08c880ea83c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Apr 2024 08:46:19 +0200
Subject: [PATCH 489/665] Bump actions/checkout from 4.1.2 to 4.1.3 (#7695)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/9bb56186c3b09b4f86b1c65136769dd318469633...1d96c772d19495a3b5c517cd2bc0cb401ea0529f)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index da979d6759..2040c9143d 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
       - uses: gradle/wrapper-validation-action@5188e9b5527a0a094cee21e2fe9a8ca44b4629af # v3.3.1
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index c4881544e0..1e113f370f 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 5a465c47c2..d96ed7a17f 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
     - name: Set up JDK 11
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index a72402e329..00062ec69c 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index e3695da4bb..8905d7d953 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 098b606d69..5bddb6761c 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 5023479b66..e49ccf2334 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
         with:
           persist-credentials: false
 

From dbec7dfc907a5a93620fb87427e3383e31122435 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 09:28:06 +0200
Subject: [PATCH 490/665] Bump github/codeql-action from 3.25.1 to 3.25.2
 (#7696)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.1 to 3.25.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/c7f9125735019aa87cfc361530512d50ea439c71...8f596b4ae3cb3c588a5c46780b86dd53fef16c52)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index e49ccf2334..b305c3e77c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c7f9125735019aa87cfc361530512d50ea439c71 # v3.25.1
+        uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
         with:
           sarif_file: results.sarif

From c7f4a4027601cfdee3c0e9a95b38bdf71b589176 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 Apr 2024 09:28:18 +0200
Subject: [PATCH 491/665] Bump actions/upload-artifact from 4.3.2 to 4.3.3
 (#7697)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.2 to 4.3.3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/1746f4ab65b179e0ea60a494b83293b640dd5bba...65462800fd760344b1a7b4382951275a0abb4808)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b305c3e77c..f05e03817c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v4.3.2
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
         with:
           name: SARIF file
           path: results.sarif

From 6300b1558c265cf80571acd882edace6a0be361f Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Tue, 23 Apr 2024 16:47:13 +0200
Subject: [PATCH 492/665] 3.x: Update marbles for
 concatMap{Single|Maybe}[DelayError] (#7698)

* 3.x: Update marbles for concatMap{Single|Maybe}[DelayError]

* Missed one diagram link change.
---
 .../io/reactivex/rxjava3/core/Flowable.java   | 24 +++++++++++--------
 .../io/reactivex/rxjava3/core/Observable.java | 20 ++++++++--------
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/core/Flowable.java b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
index fe27086f37..39f3c63b43 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Flowable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Flowable.java
@@ -8266,7 +8266,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or completes, emits their success value if available or terminates immediately if
      * either this {@code Flowable} or the current inner {@code MaybeSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybe.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8299,7 +8299,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or completes, emits their success value if available or terminates immediately if
      * either this {@code Flowable} or the current inner {@code MaybeSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybe.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8339,7 +8339,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, emits their success value if available and delaying all errors
      * till both this {@code Flowable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8372,7 +8372,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, emits their success value if available and optionally delaying all errors
      * till both this {@code Flowable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8411,7 +8411,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, emits their success value if available and optionally delaying all errors
      * till both this {@code Flowable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8456,7 +8456,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds, emits their success values or terminates immediately if
      * either this {@code Flowable} or the current inner {@code SingleSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingle.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8489,7 +8489,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds, emits their success values or terminates immediately if
      * either this {@code Flowable} or the current inner {@code SingleSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingle.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8529,7 +8529,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or fails, emits their success values and delays all errors
      * till both this {@code Flowable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8562,7 +8562,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or fails, emits their success values and optionally delays all errors
      * till both this {@code Flowable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -8601,7 +8601,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or fails, emits their success values and optionally delays errors
      * till both this {@code Flowable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator expects the upstream to support backpressure and honors
@@ -10957,6 +10957,8 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
     /**
      * Maps each element of the upstream {@code Flowable} into {@link MaybeSource}s, subscribes to all of them
      * and merges their {@code onSuccess} values, in no particular order, into a single {@code Flowable} sequence.
+     * <p>
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>The operator consumes the upstream in an unbounded manner.</dd>
@@ -10980,6 +10982,8 @@ public final Completable flatMapCompletable(@NonNull Function<? super T, ? exten
      * Maps each element of the upstream {@code Flowable} into {@link MaybeSource}s, subscribes to at most
      * {@code maxConcurrency} {@code MaybeSource}s at a time and merges their {@code onSuccess} values,
      * in no particular order, into a single {@code Flowable} sequence, optionally delaying all errors.
+     * <p>
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/flatMapMaybe.v3.png" alt="">
      * <dl>
      *  <dt><b>Backpressure:</b></dt>
      *  <dd>If {@code maxConcurrency == }{@link Integer#MAX_VALUE} the operator consumes the upstream in an unbounded manner.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Observable.java b/src/main/java/io/reactivex/rxjava3/core/Observable.java
index 14b2795715..fcf809cdf6 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Observable.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Observable.java
@@ -7329,7 +7329,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or completes, emits their success value if available or terminates immediately if
      * either the current {@code Observable} or the current inner {@code MaybeSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybe.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7357,7 +7357,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or completes, emits their success value if available or terminates immediately if
      * either the current {@code Observable} or the current inner {@code MaybeSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybe.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybe} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7390,7 +7390,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, emits their success value if available and delaying all errors
      * till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7418,7 +7418,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, emits their success value if available and optionally delaying all errors
      * till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7452,7 +7452,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other terminates, emits their success value if available and optionally delaying all errors
      * till both the current {@code Observable} and all inner {@code MaybeSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapMaybeDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapMaybeDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7490,7 +7490,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds, emits their success values or terminates immediately if
      * either the current {@code Observable} or the current inner {@code SingleSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingle.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7518,7 +7518,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds, emits their success values or terminates immediately if
      * either the current {@code Observable} or the current inner {@code SingleSource} fail.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingle.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingle} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7551,7 +7551,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or fails, emits their success values and delays all errors
      * till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7579,7 +7579,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or fails, emits their success values and optionally delays all errors
      * till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>
@@ -7613,7 +7613,7 @@ public final Completable concatMapCompletableDelayError(@NonNull Function<? supe
      * other succeeds or fails, emits their success values and optionally delays  errors
      * till both the current {@code Observable} and all inner {@code SingleSource}s terminate.
      * <p>
-     * <img width="640" height="305" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMap.v3.png" alt="">
+     * <img width="640" height="310" src="https://raw.github.com/wiki/ReactiveX/RxJava/images/rx-operators/concatMapSingleDelayError.v3.png" alt="">
      * <dl>
      *  <dt><b>Scheduler:</b></dt>
      *  <dd>{@code concatMapSingleDelayError} does not operate by default on a particular {@link Scheduler}.</dd>

From 148423ceee4346f5db58b2c354a0adc14e154efd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Apr 2024 08:53:44 +0200
Subject: [PATCH 493/665] Bump actions/checkout from 4.1.3 to 4.1.4 (#7699)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.3 to 4.1.4.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/1d96c772d19495a3b5c517cd2bc0cb401ea0529f...0ad4b8fadaa221de15dcec353f45205ec38ea70b)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 2040c9143d..6b0e4d3c56 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
       - uses: gradle/wrapper-validation-action@5188e9b5527a0a094cee21e2fe9a8ca44b4629af # v3.3.1
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 1e113f370f..b77a710074 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index d96ed7a17f..35662f98fd 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
     - name: Set up JDK 11
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 00062ec69c..78c4aa9d07 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 8905d7d953..b41dbbb627 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 5bddb6761c..5ed847c80d 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f05e03817c..4e6fd09861 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
         with:
           persist-credentials: false
 

From 6c2a2495edcfb34cdde11cab9312622c5eb2031c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 08:43:28 +0200
Subject: [PATCH 494/665] Bump gradle/wrapper-validation-action from 3.3.1 to
 3.3.2 (#7700)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 3.3.1 to 3.3.2.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/5188e9b5527a0a094cee21e2fe9a8ca44b4629af...216d1ad2b3710bf005dc39237337b9673fd8fcd5)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 6b0e4d3c56..7670aac2cc 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
-      - uses: gradle/wrapper-validation-action@5188e9b5527a0a094cee21e2fe9a8ca44b4629af # v3.3.1
+      - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2

From 2707b191c8b829e6bed41cd1ec7bcc9125e02af5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Apr 2024 08:43:45 +0200
Subject: [PATCH 495/665] Bump github/codeql-action from 3.25.2 to 3.25.3
 (#7701)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.2 to 3.25.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/8f596b4ae3cb3c588a5c46780b86dd53fef16c52...d39d31e687223d841ef683f52467bd88e9b21c14)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 4e6fd09861..cda54841fc 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
+        uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
         with:
           sarif_file: results.sarif

From cb62e79435635c0f10fedf5c6d8a230c89d62c61 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 2 May 2024 08:37:30 +0200
Subject: [PATCH 496/665] Bump codecov/codecov-action from 4.3.0 to 4.3.1
 (#7703)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.0 to 4.3.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/84508663e988701840491b86de86b666e8a86bed...5ecb98a3c6b747ed38dc09f787459979aebb39be)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index b77a710074..faa001caa3 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
+      uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 78c4aa9d07..cee0577e1b 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
+      uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index b41dbbb627..e88f569b5e 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
+      uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 5ed847c80d..9191774f51 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@84508663e988701840491b86de86b666e8a86bed # v4.3.0
+      uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 024d58b7cd09f8f8f2de4952e1b301efda5eabf7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 3 May 2024 09:44:30 +0200
Subject: [PATCH 497/665] Bump com.google.guava:guava from 33.1.0-jre to
 33.2.0-jre (#7704)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.1.0-jre to 33.2.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4562402383..4189040f9b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.1.0-jre"
+    guavaVersion = "33.2.0-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 98176a99f6de6a699be30d5e9ee8aa95fdb16a30 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 May 2024 08:36:24 +0200
Subject: [PATCH 498/665] Bump actions/checkout from 4.1.4 to 4.1.5 (#7705)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.4 to 4.1.5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/0ad4b8fadaa221de15dcec353f45205ec38ea70b...44c2b7a8a4ea60a981eaca3cf939b5f4305c123b)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 7670aac2cc..82663664fc 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
       - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index faa001caa3..183b8a7b66 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 35662f98fd..dc3cd0f9da 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - name: Set up JDK 11
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index cee0577e1b..c0c4df310c 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index e88f569b5e..385dc26649 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 9191774f51..48150d718a 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index cda54841fc..b2905d64b8 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
+        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
         with:
           persist-credentials: false
 

From 8bb5c89c631c25ab565b427093268cd3e9ed606c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 May 2024 13:00:35 +0200
Subject: [PATCH 499/665] Bump github/codeql-action from 3.25.3 to 3.25.4
 (#7706)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.3 to 3.25.4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/d39d31e687223d841ef683f52467bd88e9b21c14...ccf74c947955fd1cf117aef6a0e4e66191ef6f61)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b2905d64b8..5e18ab03ad 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
+        uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
         with:
           sarif_file: results.sarif

From a2a3bb956cbe2b48ffc7b1dcf9c78e00614e63a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 May 2024 12:57:02 +0200
Subject: [PATCH 500/665] Bump ossf/scorecard-action from 2.3.1 to 2.3.3
 (#7707)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.1 to 2.3.3.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/0864cf19026789058feabb7e87baa5f140aac736...dc50aa9510b46c811795eb24b2f1ba02a914e534)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 5e18ab03ad..74e0ac3a04 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
         with:
           results_file: results.sarif
           results_format: sarif

From a763b6c19ccfccbfab835fb05e30656b477041ae Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 May 2024 07:25:02 +0200
Subject: [PATCH 501/665] Bump github/codeql-action from 3.25.4 to 3.25.5
 (#7710)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.4 to 3.25.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/ccf74c947955fd1cf117aef6a0e4e66191ef6f61...b7cec7526559c32f1616476ff32d17ba4c59b2d6)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 74e0ac3a04..2445b8d2b5 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ccf74c947955fd1cf117aef6a0e4e66191ef6f61 # v3.25.4
+        uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
         with:
           sarif_file: results.sarif

From 1bb0070115cba3873e4377228e4942700618c8c1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 15 May 2024 08:47:25 +0200
Subject: [PATCH 502/665] Bump codecov/codecov-action from 4.3.1 to 4.4.0
 (#7711)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.3.1 to 4.4.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/5ecb98a3c6b747ed38dc09f787459979aebb39be...6d798873df2b1b8e5846dba6fb86631229fbcb17)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 183b8a7b66..39ce63d9e4 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
+      uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index c0c4df310c..cffcc3764e 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
+      uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 385dc26649..e5792afb9f 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
+      uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 48150d718a..19a9882086 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be # v4.3.1
+      uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 8727f6d0ab06364b00f00cdba6595fb532c27fa3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 17 May 2024 09:59:35 +0200
Subject: [PATCH 503/665] Bump actions/checkout from 4.1.5 to 4.1.6 (#7712)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.5 to 4.1.6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/44c2b7a8a4ea60a981eaca3cf939b5f4305c123b...a5ac7e51b41094c92402da3b24376905380afc29)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 82663664fc..30ea21fa4a 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
       - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 39ce63d9e4..5c16bf0ed4 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index dc3cd0f9da..08c7b969fd 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
     - name: Set up JDK 11
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index cffcc3764e..16f0045aff 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index e5792afb9f..b6f8445673 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 19a9882086..51e485c6b9 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2445b8d2b5..b4107f8eb0 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
         with:
           persist-credentials: false
 

From 67920a106df0a87fa4baaad513f4d7aa990622f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 09:00:08 +0200
Subject: [PATCH 504/665] --- (#7715)

updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 5c16bf0ed4..1c74d5c2e8 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
+      uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 16f0045aff..0719881429 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
+      uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index b6f8445673..edf039056a 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
+      uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 51e485c6b9..9f153b3f38 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@6d798873df2b1b8e5846dba6fb86631229fbcb17 # v4.4.0
+      uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From bc140f69a0ffebebfff988a0b1ef65c11150d69f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 21 May 2024 09:00:56 +0200
Subject: [PATCH 505/665] --- (#7714)

updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b4107f8eb0..aadbf51573 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b7cec7526559c32f1616476ff32d17ba4c59b2d6 # v3.25.5
+        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
         with:
           sarif_file: results.sarif

From 1ad352f3049cff1f79fe242bf05bc5a66b43edc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:35:35 +0200
Subject: [PATCH 506/665] Bump com.google.guava:guava from 33.2.0-jre to
 33.2.1-jre (#7717)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.0-jre to 33.2.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4189040f9b..c948453034 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.2.0-jre"
+    guavaVersion = "33.2.1-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 9629eaef1e6f9d96bb9e5bb2a4ee07f24b298b03 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 09:35:55 +0200
Subject: [PATCH 507/665] Bump github/codeql-action from 3.25.6 to 3.25.7
 (#7718)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.6 to 3.25.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/9fdb3e49720b44c48891d036bb502feb25684276...f079b8493333aace61c81488f8bd40919487bd9f)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index aadbf51573..8418f08677 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9fdb3e49720b44c48891d036bb502feb25684276 # v3.25.6
+        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
         with:
           sarif_file: results.sarif

From 28679a3a047f46af3027a99041c77e45b7058106 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Jun 2024 10:55:12 +0200
Subject: [PATCH 508/665] Bump github/codeql-action from 3.25.7 to 3.25.8
 (#7719)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.7 to 3.25.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f079b8493333aace61c81488f8bd40919487bd9f...2e230e8fe0ad3a14a340ad0815ddb96d599d2aff)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 8418f08677..ec04169cfe 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
+        uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
         with:
           sarif_file: results.sarif

From 65b54cb4068813976c1efcf087c6f1520c7813ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 07:58:15 +0200
Subject: [PATCH 509/665] Bump actions/checkout from 4.1.6 to 4.1.7 (#7722)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.6 to 4.1.7.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/a5ac7e51b41094c92402da3b24376905380afc29...692973e3d937129bcbf40652eb9f2f61becf3332)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 30ea21fa4a..25371a3fcd 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 1c74d5c2e8..3fe29d922f 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 08c7b969fd..885702338f 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 11
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 0719881429..8d678d67a1 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index edf039056a..305f3add8d 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 9f153b3f38..2a8a86197b 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
       uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ec04169cfe..98d1b75986 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
 

From a09e2d430b222d8311a121e291d4e6cafd804fc2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 07:58:31 +0200
Subject: [PATCH 510/665] Bump github/codeql-action from 3.25.8 to 3.25.9
 (#7723)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.8 to 3.25.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/2e230e8fe0ad3a14a340ad0815ddb96d599d2aff...530d4feaa9c62aaab2d250371e2061eb7a172363)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 98d1b75986..63ae6c5f2c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+        uses: github/codeql-action/upload-sarif@530d4feaa9c62aaab2d250371e2061eb7a172363 # v3.25.9
         with:
           sarif_file: results.sarif

From 107be5714974306a7a1e00549669d55e5b5e764c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 09:47:54 +0200
Subject: [PATCH 511/665] Bump gradle/wrapper-validation-action from 3.3.2 to
 3.4.0 (#7725)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 3.3.2 to 3.4.0.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/216d1ad2b3710bf005dc39237337b9673fd8fcd5...26ffd686eccbbcbf168186b5363c8ee8edbe39f6)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 25371a3fcd..74f75b2ec9 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2
+      - uses: gradle/wrapper-validation-action@26ffd686eccbbcbf168186b5363c8ee8edbe39f6 # v3.4.0

From 4e7f97496daf0a4301b7886826dac2f5e70ec2c2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Jun 2024 09:48:21 +0200
Subject: [PATCH 512/665] Bump codecov/codecov-action from 4.4.1 to 4.5.0
 (#7726)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.4.1 to 4.5.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/125fc84a9a348dbcf27191600683ec096ec9021c...e28ff129e5465c2c0dcc6f003fc735cb6ae0c673)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 3fe29d922f..bafe1b5b16 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 8d678d67a1..008e0c6050 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 305f3add8d..91d06e6468 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 2a8a86197b..e4dbf3a921 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@125fc84a9a348dbcf27191600683ec096ec9021c # v4.4.1
+      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 99f6cc07b288ae101be847e294c65c21356d8ba2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Jun 2024 07:25:50 +0200
Subject: [PATCH 513/665] Bump gradle/wrapper-validation-action from 3.4.0 to
 3.4.2 (#7728)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 3.4.0 to 3.4.2.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/26ffd686eccbbcbf168186b5363c8ee8edbe39f6...88425854a36845f9c881450d9660b5fd46bee142)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 74f75b2ec9..7945f5a1e7 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - uses: gradle/wrapper-validation-action@26ffd686eccbbcbf168186b5363c8ee8edbe39f6 # v3.4.0
+      - uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # v3.4.2

From 1ccd01848e674bd9474b8b44ab46b38e3a8fec96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 09:22:19 +0200
Subject: [PATCH 514/665] Bump github/codeql-action from 3.25.9 to 3.25.11
 (#7730)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.9 to 3.25.11.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/530d4feaa9c62aaab2d250371e2061eb7a172363...b611370bb5703a7efb587f9d136a52ea24c5c38c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 63ae6c5f2c..dabf3fa330 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@530d4feaa9c62aaab2d250371e2061eb7a172363 # v3.25.9
+        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
         with:
           sarif_file: results.sarif

From 1bcffa8ba089014020940568d98e6d6a8dd84e41 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Jul 2024 09:09:07 +0200
Subject: [PATCH 515/665] Bump actions/upload-artifact from 4.3.3 to 4.3.4
 (#7731)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.3 to 4.3.4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/65462800fd760344b1a7b4382951275a0abb4808...0b2256b8c012f0828dc542b3febcab082c67f72b)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index dabf3fa330..f5ae3b117c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
         with:
           name: SARIF file
           path: results.sarif

From 6c20e7fb88e52eb2ed105fbb2c400ad380d84c63 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Jul 2024 10:31:36 +0200
Subject: [PATCH 516/665] Bump github/codeql-action from 3.25.11 to 3.25.12
 (#7733)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.11 to 3.25.12.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b611370bb5703a7efb587f9d136a52ea24c5c38c...4fa2a7953630fd2f3fb380f21be14ede0169dd4f)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f5ae3b117c..f5cf08ef1e 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b611370bb5703a7efb587f9d136a52ea24c5c38c # v3.25.11
+        uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
         with:
           sarif_file: results.sarif

From 953c11fabd2a12924ce9fe582373f0b6e8acfc28 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 08:06:30 +0200
Subject: [PATCH 517/665] Bump gradle/wrapper-validation-action from 3.4.2 to
 3.5.0 (#7734)

Bumps [gradle/wrapper-validation-action](https://github.com/gradle/wrapper-validation-action) from 3.4.2 to 3.5.0.
- [Release notes](https://github.com/gradle/wrapper-validation-action/releases)
- [Commits](https://github.com/gradle/wrapper-validation-action/compare/88425854a36845f9c881450d9660b5fd46bee142...f9c9c575b8b21b6485636a91ffecd10e558c62f6)

---
updated-dependencies:
- dependency-name: gradle/wrapper-validation-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 7945f5a1e7..5e850d7975 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -10,4 +10,4 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # v3.4.2
+      - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0

From 4bdfee9adeb43a56aa61a21150939a4586d8cc19 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 10:17:15 +0200
Subject: [PATCH 518/665] Bump github/codeql-action from 3.25.12 to 3.25.13
 (#7735)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.12 to 3.25.13.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4fa2a7953630fd2f3fb380f21be14ede0169dd4f...2d790406f505036ef40ecba973cc774a50395aac)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f5cf08ef1e..770c855d38 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3.25.12
+        uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
         with:
           sarif_file: results.sarif

From b46732c168e196e0f89d665c972613bafed5829e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Jul 2024 09:22:14 +0200
Subject: [PATCH 519/665] Bump github/codeql-action from 3.25.13 to 3.25.14
 (#7736)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.13 to 3.25.14.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/2d790406f505036ef40ecba973cc774a50395aac...5cf07d8b700b67e235fbb65cbc84f69c0cf10464)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 770c855d38..e2c00887e3 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2d790406f505036ef40ecba973cc774a50395aac # v3.25.13
+        uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
         with:
           sarif_file: results.sarif

From d52b93700393e25d2a7cc4ea943a069dd6b2cbd2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 09:45:35 +0200
Subject: [PATCH 520/665] Bump ossf/scorecard-action from 2.3.3 to 2.4.0
 (#7737)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.3.3 to 2.4.0.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/dc50aa9510b46c811795eb24b2f1ba02a914e534...62b2cac7ed8198b15735ed49ab1e5cf35480ba46)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index e2c00887e3..b1ae987241 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif

From c9b201c178ec3eaceee782c3729cb5cab5d29447 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jul 2024 09:45:52 +0200
Subject: [PATCH 521/665] Bump github/codeql-action from 3.25.14 to 3.25.15
 (#7738)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.14 to 3.25.15.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/5cf07d8b700b67e235fbb65cbc84f69c0cf10464...afb54ba388a7dca6ecae48f608c4ff05ff4cc77a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b1ae987241..f6941dc6bf 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3.25.14
+        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
         with:
           sarif_file: results.sarif

From 8ed3edfe7459f06b72f048569d0c3c187a107e51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Aug 2024 08:42:49 +0200
Subject: [PATCH 522/665] Bump actions/upload-artifact from 4.3.4 to 4.3.5
 (#7740)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.4 to 4.3.5.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/0b2256b8c012f0828dc542b3febcab082c67f72b...89ef406dd8d7e03cfd12d9e0a4a378f454709029)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f6941dc6bf..f69f90efae 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
         with:
           name: SARIF file
           path: results.sarif

From 27173012ef87bb5ac7faf4b2d957f436c42f9f40 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Aug 2024 08:35:33 +0200
Subject: [PATCH 523/665] Bump actions/setup-java from 4.2.1 to 4.2.2 (#7741)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/99b8673ff64fbf99d8d325f52d9a5bdedb8483e9...6a0805fcefea3d4657a47ac4c165951e33482018)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index bafe1b5b16..e34ef65e00 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 885702338f..9549026590 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 11
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 008e0c6050..d1c17aa766 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 91d06e6468..62a36633e1 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index e4dbf3a921..57a7bea53e 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
       with:
         distribution: 'zulu'
         java-version: '8'

From 788010f625fce0b0418d05d28a4ea4c11edf062d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 08:26:42 +0200
Subject: [PATCH 524/665] Bump github/codeql-action from 3.25.15 to 3.26.0
 (#7742)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.25.15 to 3.26.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/afb54ba388a7dca6ecae48f608c4ff05ff4cc77a...eb055d739abdc2e8de2e5f4ba1a8b246daa779aa)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f69f90efae..ab9124939c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+        uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
         with:
           sarif_file: results.sarif

From dc9764e9b1d43828f80c26197919e409fc5de179 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 7 Aug 2024 08:26:55 +0200
Subject: [PATCH 525/665] Bump actions/upload-artifact from 4.3.5 to 4.3.6
 (#7743)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.5 to 4.3.6.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/89ef406dd8d7e03cfd12d9e0a4a378f454709029...834a144ee995460fba8ed112a2fc961b36a5ec5a)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ab9124939c..0663af59e7 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@89ef406dd8d7e03cfd12d9e0a4a378f454709029 # v4.3.5
+        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
         with:
           name: SARIF file
           path: results.sarif

From 148378c5fa8079e3495998f56ade42a4fd925021 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Sat, 10 Aug 2024 22:58:12 +0200
Subject: [PATCH 526/665] ScheduledRunnable to honor interrupt settings from
 Schedulers.from usage (#7745)

---
 .../schedulers/ExecutorScheduler.java         |   2 +-
 .../schedulers/ScheduledRunnable.java         |  19 ++-
 .../ExecutorSchedulerInterruptibleTest.java   | 145 ++++++++++++++++++
 3 files changed, 163 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
index 7c7b017988..fa0bcab7f8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ExecutorScheduler.java
@@ -204,7 +204,7 @@ public Disposable schedule(@NonNull Runnable run, long delay, @NonNull TimeUnit
 
             final Runnable decoratedRun = RxJavaPlugins.onSchedule(run);
 
-            ScheduledRunnable sr = new ScheduledRunnable(new SequentialDispose(mar, decoratedRun), tasks);
+            ScheduledRunnable sr = new ScheduledRunnable(new SequentialDispose(mar, decoratedRun), tasks, interruptibleWorker);
             tasks.add(sr);
 
             if (executor instanceof ScheduledExecutorService) {
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
index 14c197bccc..2a1baa641a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/ScheduledRunnable.java
@@ -24,6 +24,7 @@ public final class ScheduledRunnable extends AtomicReferenceArray<Object>
 
     private static final long serialVersionUID = -6120223772001106981L;
     final Runnable actual;
+    final boolean interruptOnCancel;
 
     /** Indicates that the parent tracking this task has been notified about its completion. */
     static final Object PARENT_DISPOSED = new Object();
@@ -41,12 +42,26 @@ public final class ScheduledRunnable extends AtomicReferenceArray<Object>
     /**
      * Creates a ScheduledRunnable by wrapping the given action and setting
      * up the optional parent.
+     * The underlying future will be interrupted if the task is disposed asynchronously.
      * @param actual the runnable to wrap, not-null (not verified)
      * @param parent the parent tracking container or null if none
      */
     public ScheduledRunnable(Runnable actual, DisposableContainer parent) {
+        this(actual, parent, true);
+    }
+
+    /**
+     * Creates a ScheduledRunnable by wrapping the given action and setting
+     * up the optional parent.
+     * @param actual the runnable to wrap, not-null (not verified)
+     * @param parent the parent tracking container or null if none
+     * @param interruptOnCancel if true, the underlying future will be interrupted when disposing
+     *                          this task from a different thread than it is running on.
+     */
+    public ScheduledRunnable(Runnable actual, DisposableContainer parent, boolean interruptOnCancel) {
         super(3);
         this.actual = actual;
+        this.interruptOnCancel = interruptOnCancel;
         this.lazySet(0, parent);
     }
 
@@ -95,7 +110,7 @@ public void setFuture(Future<?> f) {
                 return;
             }
             if (o == ASYNC_DISPOSED) {
-                f.cancel(true);
+                f.cancel(interruptOnCancel);
                 return;
             }
             if (compareAndSet(FUTURE_INDEX, o, f)) {
@@ -114,7 +129,7 @@ public void dispose() {
             boolean async = get(THREAD_INDEX) != Thread.currentThread();
             if (compareAndSet(FUTURE_INDEX, o, async ? ASYNC_DISPOSED : SYNC_DISPOSED)) {
                 if (o != null) {
-                    ((Future<?>)o).cancel(async);
+                    ((Future<?>)o).cancel(async && interruptOnCancel);
                 }
                 break;
             }
diff --git a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
index f4b5f82ec4..074ac8039a 100644
--- a/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
+++ b/src/test/java/io/reactivex/rxjava3/schedulers/ExecutorSchedulerInterruptibleTest.java
@@ -965,4 +965,149 @@ public void run() {
             exec.shutdown();
         }
     }
+
+    public static class TrackInterruptScheduledExecutor extends ScheduledThreadPoolExecutor {
+
+        public final AtomicBoolean interruptReceived = new AtomicBoolean();
+
+        public TrackInterruptScheduledExecutor() {
+            super(10);
+        }
+
+        @Override
+        public <V> ScheduledFuture<V> schedule(Callable<V> callable, long delay, TimeUnit unit) {
+            return new TrackingScheduledFuture<V>(super.schedule(callable, delay, unit));
+        }
+
+        class TrackingScheduledFuture<V> implements ScheduledFuture<V> {
+
+            ScheduledFuture<V> original;
+
+            TrackingScheduledFuture(ScheduledFuture<V> original) {
+                this.original = original;
+            }
+
+            @Override
+            public long getDelay(TimeUnit unit) {
+                return original.getDelay(unit);
+            }
+
+            @Override
+            public int compareTo(Delayed o) {
+                return original.compareTo(o);
+            }
+
+            @Override
+            public boolean cancel(boolean mayInterruptIfRunning) {
+                if (mayInterruptIfRunning) {
+                    interruptReceived.set(true);
+                }
+                return original.cancel(mayInterruptIfRunning);
+            }
+
+            @Override
+            public boolean isCancelled() {
+                return original.isCancelled();
+            }
+
+            @Override
+            public boolean isDone() {
+                return original.isDone();
+            }
+
+            @Override
+            public V get() throws InterruptedException, ExecutionException {
+                return original.get();
+            }
+
+            @Override
+            public V get(long timeout, TimeUnit unit)
+                    throws InterruptedException, ExecutionException, TimeoutException {
+                return get(timeout, unit);
+            }
+        }
+    }
+
+    @Test
+    public void noInterruptBeforeRunningDelayedWorker() throws Throwable {
+        TrackInterruptScheduledExecutor exec = new TrackInterruptScheduledExecutor();
+
+        try {
+            Scheduler sch = Schedulers.from(exec, false);
+
+            Worker worker = sch.createWorker();
+
+            Disposable d = worker.schedule(() -> { }, 1, TimeUnit.SECONDS);
+
+            d.dispose();
+
+            int i = 150;
+
+            while (i-- > 0) {
+                assertFalse("Task interrupt detected", exec.interruptReceived.get());
+                Thread.sleep(10);
+            }
+
+        } finally {
+            exec.shutdownNow();
+        }
+    }
+
+    @Test
+    public void hasInterruptBeforeRunningDelayedWorker() throws Throwable {
+        TrackInterruptScheduledExecutor exec = new TrackInterruptScheduledExecutor();
+
+        try {
+            Scheduler sch = Schedulers.from(exec, true);
+
+            Worker worker = sch.createWorker();
+
+            Disposable d = worker.schedule(() -> { }, 1, TimeUnit.SECONDS);
+
+            d.dispose();
+
+            Thread.sleep(100);
+            assertTrue("Task interrupt detected", exec.interruptReceived.get());
+
+        } finally {
+            exec.shutdownNow();
+        }
+    }
+
+    @Test
+    public void noInterruptAfterRunningDelayedWorker() throws Throwable {
+        TrackInterruptScheduledExecutor exec = new TrackInterruptScheduledExecutor();
+
+        try {
+            Scheduler sch = Schedulers.from(exec, false);
+
+            Worker worker = sch.createWorker();
+            AtomicBoolean taskRun = new AtomicBoolean();
+
+            Disposable d = worker.schedule(() -> {
+                taskRun.set(true);
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException ex) {
+                    exec.interruptReceived.set(true);
+                }
+            }, 100, TimeUnit.MILLISECONDS);
+
+            Thread.sleep(150);
+            ;
+            d.dispose();
+
+            int i = 50;
+
+            while (i-- > 0) {
+                assertFalse("Task interrupt detected", exec.interruptReceived.get());
+                Thread.sleep(10);
+            }
+
+            assertTrue("Task run at all", taskRun.get());
+
+        } finally {
+            exec.shutdownNow();
+        }
+    }
 }

From 49bc6504d30ac67cbe9f316ad4c75c37430ff359 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Tue, 13 Aug 2024 16:25:58 +0200
Subject: [PATCH 527/665] Manually fix typos to avoid bot-trust farming

---
 docs/Backpressure-(2.0).md                                    | 4 ++--
 docs/Filtering-Observables.md                                 | 2 +-
 docs/What's-different-in-2.0.md                               | 4 ++--
 docs/Writing-operators-for-2.0.md                             | 2 +-
 src/main/java/io/reactivex/rxjava3/core/Scheduler.java        | 2 +-
 .../reactivex/rxjava3/internal/schedulers/SchedulerWhen.java  | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/Backpressure-(2.0).md b/docs/Backpressure-(2.0).md
index 61361d21c4..6b2f2860af 100644
--- a/docs/Backpressure-(2.0).md
+++ b/docs/Backpressure-(2.0).md
@@ -172,7 +172,7 @@ If some of the values can be safely ignored, one can use the sampling (with time
     }
 ```
 
-Note hovewer that these operators only reduce the rate of value reception by the downstream and thus they may still lead to `MissingBackpressureException`.
+Note however that these operators only reduce the rate of value reception by the downstream and thus they may still lead to `MissingBackpressureException`.
 
 ## onBackpressureBuffer()
 
@@ -229,7 +229,7 @@ Note that the last two strategies cause discontinuity in the stream as they drop
 
 ## onBackpressureDrop()
 
-Whenever the downstream is not ready to receive values, this operator will drop that elemenet from the sequence. One can think of it as a 0 capacity `onBackpressureBuffer` with strategy `ON_OVERFLOW_DROP_LATEST`.
+Whenever the downstream is not ready to receive values, this operator will drop that element from the sequence. One can think of it as a 0 capacity `onBackpressureBuffer` with strategy `ON_OVERFLOW_DROP_LATEST`.
 
 This operator is useful when one can safely ignore values from a source (such as mouse moves or current GPS location signals) as there will be more up-to-date values later on.
 
diff --git a/docs/Filtering-Observables.md b/docs/Filtering-Observables.md
index 620800dc8c..512b69ba8a 100644
--- a/docs/Filtering-Observables.md
+++ b/docs/Filtering-Observables.md
@@ -259,7 +259,7 @@ firstOrError.subscribe(
 
 **ReactiveX documentation:** [http://reactivex.io/documentation/operators/ignoreelements.html](http://reactivex.io/documentation/operators/ignoreelements.html)
 
-Ignores the single item emitted by a `Single` or `Maybe` source, and returns a `Completable` that signals only the error or completion event from the the source.
+Ignores the single item emitted by a `Single` or `Maybe` source, and returns a `Completable` that signals only the error or completion event from the source.
 
 ### ignoreElement example
 
diff --git a/docs/What's-different-in-2.0.md b/docs/What's-different-in-2.0.md
index fac50df56d..edc681fa7f 100644
--- a/docs/What's-different-in-2.0.md
+++ b/docs/What's-different-in-2.0.md
@@ -450,12 +450,12 @@ Before 2.0.7, the operator `strict()` had to be applied in order to achieve the
 
 As one of the primary goals of RxJava 2, the design focuses on performance and in order enable it, RxJava 2.0.7 adds a custom `io.reactivex.FlowableSubscriber` interface (extends `org.reactivestreams.Subscriber`) but adds no new methods to it. The new interface is **constrained to RxJava 2** and represents a consumer to `Flowable` that is able to work in a mode that relaxes the Reactive-Streams version 1.0.0 specification in rules §1.3, §2.3, §2.12 and §3.9:
 
-  - §1.3 relaxation: `onSubscribe` may run concurrently with `onNext` in case the `FlowableSubscriber` calls `request()` from inside `onSubscribe` and it is the resposibility of `FlowableSubscriber` to ensure thread-safety between the remaining instructions in `onSubscribe` and `onNext`.
+  - §1.3 relaxation: `onSubscribe` may run concurrently with `onNext` in case the `FlowableSubscriber` calls `request()` from inside `onSubscribe` and it is the responsibility of `FlowableSubscriber` to ensure thread-safety between the remaining instructions in `onSubscribe` and `onNext`.
   - §2.3 relaxation: calling `Subscription.cancel` and `Subscription.request` from `FlowableSubscriber.onComplete()` or `FlowableSubscriber.onError()` is considered a no-operation.
   - §2.12 relaxation: if the same `FlowableSubscriber` instance is subscribed to multiple sources, it must ensure its `onXXX` methods remain thread safe.
   - §3.9 relaxation: issuing a non-positive `request()` will not stop the current stream but signal an error via `RxJavaPlugins.onError`.
 
-From a user's perspective, if one was using the the `subscribe` methods other than `Flowable.subscribe(Subscriber<? super T>)`, there is no need to do anything regarding this change and there is no extra penalty for it.
+From a user's perspective, if one was using the `subscribe` methods other than `Flowable.subscribe(Subscriber<? super T>)`, there is no need to do anything regarding this change and there is no extra penalty for it.
 
 If one was using `Flowable.subscribe(Subscriber<? super T>)` with the built-in RxJava `Subscriber` implementations such as `DisposableSubscriber`, `TestSubscriber` and `ResourceSubscriber`, there is a small runtime overhead (one `instanceof` check) associated when the code is not recompiled against 2.0.7.
 
diff --git a/docs/Writing-operators-for-2.0.md b/docs/Writing-operators-for-2.0.md
index e8486564b1..1a51664880 100644
--- a/docs/Writing-operators-for-2.0.md
+++ b/docs/Writing-operators-for-2.0.md
@@ -565,7 +565,7 @@ Version 2.0.7 introduced a new interface, `FlowableSubscriber` that extends `Sub
 
 The rule relaxations are as follows:
 
-- §1.3 relaxation: `onSubscribe` may run concurrently with onNext in case the `FlowableSubscriber` calls `request()` from inside `onSubscribe` and it is the resposibility of `FlowableSubscriber` to ensure thread-safety between the remaining instructions in `onSubscribe` and `onNext`.
+- §1.3 relaxation: `onSubscribe` may run concurrently with onNext in case the `FlowableSubscriber` calls `request()` from inside `onSubscribe` and it is the responsibility of `FlowableSubscriber` to ensure thread-safety between the remaining instructions in `onSubscribe` and `onNext`.
 - §2.3 relaxation: calling `Subscription.cancel` and `Subscription.request` from `FlowableSubscriber.onComplete()` or `FlowableSubscriber.onError()` is considered a no-operation.
 - §2.12 relaxation: if the same `FlowableSubscriber` instance is subscribed to multiple sources, it must ensure its `onXXX` methods remain thread safe.
 - §3.9 relaxation: issuing a non-positive `request()` will not stop the current stream but signal an error via `RxJavaPlugins.onError`.
diff --git a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
index 580e2739cb..3aa001127a 100644
--- a/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
+++ b/src/main/java/io/reactivex/rxjava3/core/Scheduler.java
@@ -350,7 +350,7 @@ public Disposable schedulePeriodicallyDirect(@NonNull Runnable run, long initial
      * });
      * </pre>
      *
-     * Slowing down the rate to no more than than 1 a second. This suffers from
+     * Slowing down the rate to no more than 1 a second. This suffers from
      * the same problem as the one above I could find an {@link Flowable}
      * operator that limits the rate without dropping the values (aka leaky
      * bucket algorithm).
diff --git a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
index 0780aea610..814c971f1c 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/schedulers/SchedulerWhen.java
@@ -80,7 +80,7 @@
  * }
  * </pre>
  *
- * Slowing down the rate to no more than than 1 a second. This suffers from the
+ * Slowing down the rate to no more than 1 a second. This suffers from the
  * same problem as the one above I could find an {@link Observable} operator
  * that limits the rate without dropping the values (aka leaky bucket
  * algorithm).

From 312223b4f9a4bcc8301181e916857cd88a9a5ca3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Aug 2024 09:58:45 +0200
Subject: [PATCH 528/665] Bump github/codeql-action from 3.26.0 to 3.26.1
 (#7750)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.0 to 3.26.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/eb055d739abdc2e8de2e5f4ba1a8b246daa779aa...29d86d22a34ea372b1bbf3b2dced2e25ca6b3384)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 0663af59e7..4f9ba38a68 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
+        uses: github/codeql-action/upload-sarif@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1
         with:
           sarif_file: results.sarif

From 936e166180cf10a66cc12bc4841616341ce318dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 15 Aug 2024 09:14:04 +0200
Subject: [PATCH 529/665] Bump github/codeql-action from 3.26.1 to 3.26.2
 (#7752)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.1 to 3.26.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/29d86d22a34ea372b1bbf3b2dced2e25ca6b3384...429e1977040da7a23b6822b13c129cd1ba93dbb2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 4f9ba38a68..2ce1b91afb 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@29d86d22a34ea372b1bbf3b2dced2e25ca6b3384 # v3.26.1
+        uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
         with:
           sarif_file: results.sarif

From 7eec8c5c05cbc7b1264dcb1da401fa95ec64fb62 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 Aug 2024 09:27:14 +0200
Subject: [PATCH 530/665] Bump com.google.guava:guava from 33.2.1-jre to
 33.3.0-jre (#7753)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.2.1-jre to 33.3.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index c948453034..cbad8caaa4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.2.1-jre"
+    guavaVersion = "33.3.0-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 51c6c0f5c2055b78a90918a78ccdefc9da3c8526 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Aug 2024 09:00:03 +0200
Subject: [PATCH 531/665] Bump github/codeql-action from 3.26.2 to 3.26.3
 (#7754)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.2 to 3.26.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/429e1977040da7a23b6822b13c129cd1ba93dbb2...883d8588e56d1753a8a58c1c86e88976f0c23449)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2ce1b91afb..26d5e1a377 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
+        uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
         with:
           sarif_file: results.sarif

From 61e4922fade90cfc856d2c31429f9fd7bb4cf766 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 23 Aug 2024 08:54:35 +0200
Subject: [PATCH 532/665] Bump github/codeql-action from 3.26.3 to 3.26.4
 (#7755)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.3 to 3.26.4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/883d8588e56d1753a8a58c1c86e88976f0c23449...f0f3afee809481da311ca3a6ff1ff51d81dbeb24)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 26d5e1a377..c83be9db7e 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@883d8588e56d1753a8a58c1c86e88976f0c23449 # v3.26.3
+        uses: github/codeql-action/upload-sarif@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4
         with:
           sarif_file: results.sarif

From f37c5d0941ff05b12abadc56a607b7c17143bb20 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Aug 2024 10:52:09 +0200
Subject: [PATCH 533/665] Bump github/codeql-action from 3.26.4 to 3.26.5
 (#7756)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.4 to 3.26.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f0f3afee809481da311ca3a6ff1ff51d81dbeb24...2c779ab0d087cd7fe7b826087247c2c81f27bfa6)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c83be9db7e..2b978d2cc2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f0f3afee809481da311ca3a6ff1ff51d81dbeb24 # v3.26.4
+        uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
         with:
           sarif_file: results.sarif

From 1bc2894374a4ce35eac80f9e9080af74e5e1e727 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 30 Aug 2024 09:25:41 +0200
Subject: [PATCH 534/665] Bump github/codeql-action from 3.26.5 to 3.26.6
 (#7758)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.5 to 3.26.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/2c779ab0d087cd7fe7b826087247c2c81f27bfa6...4dd16135b69a43b6c8efb853346f8437d92d3c93)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2b978d2cc2..1c21af1f5b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2c779ab0d087cd7fe7b826087247c2c81f27bfa6 # v3.26.5
+        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
         with:
           sarif_file: results.sarif

From 8a2476eff4ce3333a2e477776306d4d414a8bfb0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Sep 2024 08:51:48 +0200
Subject: [PATCH 535/665] Bump actions/upload-artifact from 4.3.6 to 4.4.0
 (#7759)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.6 to 4.4.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/834a144ee995460fba8ed112a2fc961b36a5ec5a...50769540e7f4bd5e21e526ee35c689e35e0d6874)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 1c21af1f5b..aff218a9c3 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
+        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
         with:
           name: SARIF file
           path: results.sarif

From 0d344adadb7e5f58a2a89cb3b02ebb414c08c827 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 16 Sep 2024 10:04:49 +0200
Subject: [PATCH 536/665] Bump github/codeql-action from 3.26.6 to 3.26.7
 (#7764)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.6 to 3.26.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4dd16135b69a43b6c8efb853346f8437d92d3c93...8214744c546c1e5c8f03dde8fab3a7353211988d)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index aff218a9c3..8b64e01322 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
+        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
         with:
           sarif_file: results.sarif

From 02b32b831e867042aea913c03bba07b36fbc02d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Sep 2024 08:13:34 +0200
Subject: [PATCH 537/665] Bump github/codeql-action from 3.26.7 to 3.26.8
 (#7765)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.7 to 3.26.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/8214744c546c1e5c8f03dde8fab3a7353211988d...294a9d92911152fe08befb9ec03e240add280cb3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 8b64e01322..31165777ff 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
+        uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
         with:
           sarif_file: results.sarif

From 3c934e935a2939198ab2ac86df8a845c07280dca Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Sep 2024 08:56:30 +0200
Subject: [PATCH 538/665] Bump com.google.guava:guava from 33.3.0-jre to
 33.3.1-jre (#7766)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.3.0-jre to 33.3.1-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index cbad8caaa4..06d7d21082 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.3.0-jre"
+    guavaVersion = "33.3.1-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From def2a4d8ff809c327ee92211edbddbe590f89fe9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2024 08:48:44 +0200
Subject: [PATCH 539/665] Bump github/codeql-action from 3.26.8 to 3.26.9
 (#7767)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.8 to 3.26.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/294a9d92911152fe08befb9ec03e240add280cb3...461ef6c76dfe95d5c364de2f431ddbd31a417628)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 31165777ff..b01ff6fe3c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3.26.8
+        uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         with:
           sarif_file: results.sarif

From e9959e54290a67869566d7a3ebee8b4021bf1188 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Sep 2024 08:49:04 +0200
Subject: [PATCH 540/665] Bump actions/setup-java from 4.2.2 to 4.4.0 (#7768)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.2.2 to 4.4.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/6a0805fcefea3d4657a47ac4c165951e33482018...b36c23c0d998641eff861008f374ee103c25ac73)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index e34ef65e00..567d978b0c 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
-      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 9549026590..816bff5d4d 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 11
-      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index d1c17aa766..cc5a05ab41 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
-      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 62a36633e1..f8779987c1 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
-      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 57a7bea53e..1aa8844ec8 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK 8
-      uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         distribution: 'zulu'
         java-version: '8'

From 4f6f459c419c972d28b796320fd39556709b6ce2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 26 Sep 2024 08:42:07 +0200
Subject: [PATCH 541/665] Bump actions/checkout from 4.1.7 to 4.2.0 (#7769)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 5e850d7975..4bf47665f9 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 567d978b0c..aaa2a1df6f 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 816bff5d4d..b0fdcfba84 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK 11
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index cc5a05ab41..630c3c5ad4 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index f8779987c1..6fd82d8bbe 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 1aa8844ec8..90f5300363 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b01ff6fe3c..6b2382a4f5 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           persist-credentials: false
 

From 65661838332ba70666014b95182aaa71b27b05b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 08:27:49 +0200
Subject: [PATCH 542/665] Bump github/codeql-action from 3.26.9 to 3.26.10
 (#7772)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.9 to 3.26.10.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/461ef6c76dfe95d5c364de2f431ddbd31a417628...e2b3eafc8d227b0241d48be5f425d47c2d750a13)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6b2382a4f5..ffa1a3d13d 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
+        uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
         with:
           sarif_file: results.sarif

From bf5b6f1626e3aff288b67395cd69d328c2b6f16f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Oct 2024 08:18:14 +0200
Subject: [PATCH 543/665] Bump codecov/codecov-action from 4.5.0 to 4.6.0
 (#7773)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/e28ff129e5465c2c0dcc6f003fc735cb6ae0c673...b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index aaa2a1df6f..692ee96751 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 630c3c5ad4..d2331ad640 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 6fd82d8bbe..4fc6e5f105 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
     - name: Upload release
       run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
       env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 90f5300363..775a619e03 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0
+      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 95a2bb9625209f846f30fa7e9251b787ffc8b901 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2024 08:32:25 +0200
Subject: [PATCH 544/665] Bump github/codeql-action from 3.26.10 to 3.26.11
 (#7774)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.10 to 3.26.11.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e2b3eafc8d227b0241d48be5f425d47c2d750a13...6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ffa1a3d13d..6a937c21f1 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e2b3eafc8d227b0241d48be5f425d47c2d750a13 # v3.26.10
+        uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
         with:
           sarif_file: results.sarif

From 8518ba93c989d4baf9f11c215fc7f2757f307a45 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Oct 2024 13:09:45 +0200
Subject: [PATCH 545/665] Bump actions/cache from 4.0.2 to 4.1.0 (#7775)

Bumps [actions/cache](https://github.com/actions/cache) from 4.0.2 to 4.1.0.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/0c45773b623bea8c8e75f6c82b208c3cf94ea4f9...2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 692ee96751..0c4d4e0b36 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index b0fdcfba84..dd46496962 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index d2331ad640..5b6628df83 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 4fc6e5f105..c3a5c9a993 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 775a619e03..115519a7db 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
+      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From ba8e7e1b38bac8bf7c21db8fe31693c5ff2f029a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2024 08:43:54 +0200
Subject: [PATCH 546/665] Bump github/codeql-action from 3.26.11 to 3.26.12
 (#7776)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.11 to 3.26.12.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea...c36620d31ac7c881962c3d9dd939c40ec9434f2b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6a937c21f1..6221d8bd9e 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6db8d6351fd0be61f9ed8ebd12ccd35dcec51fea # v3.26.11
+        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
         with:
           sarif_file: results.sarif

From 86cc876dbe9701b6e10bb5ef345d04b8a147a9fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2024 08:44:09 +0200
Subject: [PATCH 547/665] Bump actions/checkout from 4.2.0 to 4.2.1 (#7777)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/d632683dd7b4114ad314bca15554477dd762a938...eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 4bf47665f9..5358c065d9 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
       - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 0c4d4e0b36..820e795e4d 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index dd46496962..ddc9157942 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - name: Set up JDK 11
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 5b6628df83..1b977f3c59 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index c3a5c9a993..db1cc76972 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 115519a7db..ba486bdb13 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6221d8bd9e..f57b673c08 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
         with:
           persist-credentials: false
 

From 47d0706ab77ba19df8514f533cc26dc02c849e6a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Oct 2024 08:44:23 +0200
Subject: [PATCH 548/665] Bump actions/upload-artifact from 4.4.0 to 4.4.1
 (#7778)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.0 to 4.4.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/50769540e7f4bd5e21e526ee35c689e35e0d6874...604373da6381bf24206979c74d06a550515601b9)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f57b673c08..19d685732b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
+        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
         with:
           name: SARIF file
           path: results.sarif

From 4437355bbfd3c3d88ecc1d9a00eb9e88a8e17a2d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2024 08:20:01 +0200
Subject: [PATCH 549/665] Bump actions/upload-artifact from 4.4.1 to 4.4.2
 (#7779)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.1 to 4.4.2.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/604373da6381bf24206979c74d06a550515601b9...84480863f228bb9747b473957fcc9e309aa96097)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 19d685732b..c2b66f9969 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4.4.1
+        uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2
         with:
           name: SARIF file
           path: results.sarif

From 486d50a0271c2cb3bb065a9c82c1dfa8c5c7745a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Oct 2024 08:20:18 +0200
Subject: [PATCH 550/665] Bump actions/cache from 4.1.0 to 4.1.1 (#7780)

Bumps [actions/cache](https://github.com/actions/cache) from 4.1.0 to 4.1.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2...3624ceb22c1c5a301c8db4169662070a689d9ea8)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 820e795e4d..3fee9b3806 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
+      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index ddc9157942..8f80c1c4c3 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
+      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 1b977f3c59..f2bff1a15f 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
+      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index db1cc76972..6a8c21f7d2 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
+      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index ba486bdb13..ac475bf200 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@2cdf405574d6ef1f33a1d12acccd3ae82f47b3f2 # v4.1.0
+      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 3109608a2353f05a93a5d4e951e4ed4653030950 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 10 Oct 2024 07:24:52 +0200
Subject: [PATCH 551/665] Bump actions/upload-artifact from 4.4.2 to 4.4.3
 (#7781)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.2 to 4.4.3.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/84480863f228bb9747b473957fcc9e309aa96097...b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c2b66f9969..d70ca75a28 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@84480863f228bb9747b473957fcc9e309aa96097 # v4.4.2
+        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
         with:
           name: SARIF file
           path: results.sarif

From 66c8ed31478d6afe12984485d79502d2706c7684 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Oct 2024 08:54:00 +0200
Subject: [PATCH 552/665] Bump github/codeql-action from 3.26.12 to 3.26.13
 (#7783)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.12 to 3.26.13.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/c36620d31ac7c881962c3d9dd939c40ec9434f2b...f779452ac5af1c261dce0346a8f964149f49322b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index d70ca75a28..26327f9674 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3.26.12
+        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
         with:
           sarif_file: results.sarif

From 748998f9c2b430b3abd6025ee269117d48f4f8b2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 08:40:42 +0200
Subject: [PATCH 553/665] Bump actions/cache from 4.1.1 to 4.1.2 (#7785)

Bumps [actions/cache](https://github.com/actions/cache) from 4.1.1 to 4.1.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/3624ceb22c1c5a301c8db4169662070a689d9ea8...6849a6489940f00c2f30c0fb92c6274307ccb58a)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 3fee9b3806..af3803f111 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 8f80c1c4c3..2926e751c8 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index f2bff1a15f..fee73dac54 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 6a8c21f7d2..c257cfca89 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index ac475bf200..54ebc5227b 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@3624ceb22c1c5a301c8db4169662070a689d9ea8 # v4.1.1
+      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From bcf369d8c736945f9458c5ed00d27ecf54eb4016 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Oct 2024 08:41:02 +0200
Subject: [PATCH 554/665] Bump github/codeql-action from 3.26.13 to 3.27.0
 (#7786)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.26.13 to 3.27.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f779452ac5af1c261dce0346a8f964149f49322b...662472033e021d55d94146f66f6058822b0b39fd)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 26327f9674..2ccf972f5d 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
+        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
         with:
           sarif_file: results.sarif

From b117a0d9c9b7bf381e2f465f0942767338fa5c3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Oct 2024 11:03:58 +0200
Subject: [PATCH 555/665] Bump actions/checkout from 4.2.1 to 4.2.2 (#7787)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871...11bd71901bbe5b1630ceea73d27597364c9af683)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 5358c065d9..44e5c1a692 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index af3803f111..667ebe84c0 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 2926e751c8..6e11ea33e4 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -17,7 +17,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 11
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index fee73dac54..87255a2eb6 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index c257cfca89..28d68c863e 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 54ebc5227b..4f0571261f 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
       uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2ccf972f5d..a12c12cff3 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 

From dbfa803b8cdc432e8757e111f529cb55d9208213 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Oct 2024 09:18:11 +0200
Subject: [PATCH 556/665] Bump actions/setup-java from 4.4.0 to 4.5.0 (#7788)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/b36c23c0d998641eff861008f374ee103c25ac73...8df1039502a15bceb9433410b1a100fbe190c53b)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 667ebe84c0..dc2948a66e 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 6e11ea33e4..059c576980 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 11
-      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 87255a2eb6..42dee29c0c 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 28d68c863e..da44ac23a6 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 4f0571261f..baf49569f5 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
         distribution: 'zulu'
         java-version: '8'

From 255116e827677e57e81737082ac8c8063d1b8fa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Nov 2024 18:07:41 +0100
Subject: [PATCH 557/665] Bump github/codeql-action from 3.27.0 to 3.27.3
 (#7791)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.0 to 3.27.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/662472033e021d55d94146f66f6058822b0b39fd...396bb3e45325a47dd9ef434068033c6d5bb0d11a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a12c12cff3..475c26f1b5 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
+        uses: github/codeql-action/upload-sarif@396bb3e45325a47dd9ef434068033c6d5bb0d11a # v3.27.3
         with:
           sarif_file: results.sarif

From 9601a25eba28ee371e29094e02c641be97959dcf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 15 Nov 2024 11:59:14 +0100
Subject: [PATCH 558/665] Bump github/codeql-action from 3.27.3 to 3.27.4
 (#7793)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.3 to 3.27.4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/396bb3e45325a47dd9ef434068033c6d5bb0d11a...ea9e4e37992a54ee68a9622e985e60c8e8f12d9f)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 475c26f1b5..8d6b1a041f 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@396bb3e45325a47dd9ef434068033c6d5bb0d11a # v3.27.3
+        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           sarif_file: results.sarif

From 130f67cbd944e6ca9227ae0acd6cafe2be1d843f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 07:47:13 +0100
Subject: [PATCH 559/665] Bump github/codeql-action from 3.27.4 to 3.27.5
 (#7797)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.4 to 3.27.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/ea9e4e37992a54ee68a9622e985e60c8e8f12d9f...f09c1c0a94de965c15400f5634aa42fac8fb8f88)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 8d6b1a041f..c84b436e89 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
         with:
           sarif_file: results.sarif

From e46ea36e0743b04601a9e8763820da81293dd3b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 07:47:28 +0100
Subject: [PATCH 560/665] Bump ru.vyarus.animalsniffer from 1.7.1 to 1.7.2
 (#7795)

Bumps ru.vyarus.animalsniffer from 1.7.1 to 1.7.2.

---
updated-dependencies:
- dependency-name: ru.vyarus.animalsniffer
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 06d7d21082..ba03eec98c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id("eclipse")
     id("jacoco")
     id("maven-publish")
-    id("ru.vyarus.animalsniffer") version "1.7.1"
+    id("ru.vyarus.animalsniffer") version "1.7.2"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.4.0"

From 338f2a11350480cef409f64eff4a2d307be7e05a Mon Sep 17 00:00:00 2001
From: kaioni17 <huazhang@outlook.com>
Date: Thu, 21 Nov 2024 09:10:11 -0800
Subject: [PATCH 561/665] Update BlockingFlowableIterable.onNext() to set error
 before cancel (#7789)

To avoid race with hasNext(), which checks for cancel first before checking for error. For example, in the following case, hasNext() may return false to the caller, making the caller assume the iterable finished successfully.
1. onNext() called cancel
2. hasNext() found the iterable is cancelled
3. hasNext() found that error is null thus returned false to the caller, without throwing the error
4. onNext() set error
---
 .../operators/flowable/BlockingFlowableIterable.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
index 36436d1370..11239d04a7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/BlockingFlowableIterable.java
@@ -138,9 +138,12 @@ public void onSubscribe(Subscription s) {
         @Override
         public void onNext(T t) {
             if (!queue.offer(t)) {
+                // Error must be set first before calling cancel to avoid race
+                // with hasNext(), which checks for cancel first before checking
+                // for error.
+                error = new QueueOverflowException();
                 SubscriptionHelper.cancel(this);
-
-                onError(new QueueOverflowException());
+                onComplete();
             } else {
                 signalConsumer();
             }

From ede5cfcb41a6a1c8f955d77d80883d5d08e843d9 Mon Sep 17 00:00:00 2001
From: olivergillespie <62296743+olivergillespie@users.noreply.github.com>
Date: Fri, 22 Nov 2024 14:34:21 +0000
Subject: [PATCH 562/665] Fix MpscLinkedQueue GC issues (#7799)

* Refactor MpscLinkedQueue.poll

Handle empty queue first, then share most of the
implementation for non-empty scenarios (spin and
non-spin).

* Unlink dead nodes in MpscLinkedQueue

Similar to
https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/queues/MpscLinkedQueue.java#L120,
null out the next pointer in the discarded consumer node
when polling from the queue. If not, we leave behind a (potentially long)
chain of connected garbage nodes. If we're unlucky (for example one of
the early nodes is promoted to old generation, triggering nepotism),
this can cause GC issues as now we have a long linked list which must be
marked by young collections.

Reproducer:

```
import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;

public class MpscLinkedQueueGC {
    public static void main(String[] args) {
        MpscLinkedQueue<Integer> queue = new MpscLinkedQueue<>();
        for (int i = 0; i < 10; i++) System.gc(); // tenure consumer node
        while (true) {
            queue.offer(123);
            queue.poll();
        }
    }
}
```

```
Before fix:

$ java -Xlog:gc -Xmx1G -cp build/classes/java/main MpscLinkedQueueGC.java
...
[1.261s] GC(20) Pause Young (Normal) (G1 Preventive Collection) 115M->115M(204M) 209.335ms
[1.385s] GC(23) Pause Young (Normal) (G1 Evacuation Pause) 148M->149M(204M) 31.491ms
[1.417s] GC(24) Pause Young (Normal) (G1 Evacuation Pause) 157M->158M(204M) 19.333ms
[1.453s] GC(25) Pause Young (Normal) (G1 Evacuation Pause) 166M->167M(599M) 22.678ms
[1.966s] GC(26) Pause Young (Normal) (G1 Evacuation Pause) 249M->249M(497M) 305.238ms
...

After fix:
$ java -Xlog:gc -Xmx1G -cp build/classes/java/main MpscLinkedQueueGC.java
...
[1.169s] GC(14) Pause Young (Normal) (G1 Evacuation Pause) 304M->2M(506M) 0.755ms
[1.558s] GC(15) Pause Young (Normal) (G1 Evacuation Pause) 304M->2M(506M) 0.689ms
[1.948s] GC(16) Pause Young (Normal) (G1 Evacuation Pause) 304M->2M(506M) 0.800ms
[2.337s] GC(17) Pause Young (Normal) (G1 Evacuation Pause) 304M->2M(506M) 0.714ms
...
```

* Revert "Unlink dead nodes in MpscLinkedQueue"

This reverts commit 4c6c6fabd2ef04faae27964dcaf78bcd23c41a74.

* Revert "Refactor MpscLinkedQueue.poll"

This reverts commit b8582b93f8509c846693215b6a23b15272b9d72c.

* Unlink dead nodes in MpscLinkedQueue

Similar to
https://github.com/JCTools/JCTools/blob/master/jctools-core/src/main/java/org/jctools/queues/MpscLinkedQueue.java#L120,
null out the next pointer in the discarded consumer node
when polling from the queue. If not, we leave behind a (potentially long)
chain of connected garbage nodes. If we're unlucky (for example one of
the early nodes is promoted to old generation, triggering nepotism),
this can cause GC issues as now we have a long linked list which must be
marked by young collections.

Reproducer:

```
import io.reactivex.rxjava3.internal.queue.MpscLinkedQueue;

public class MpscLinkedQueueGC {
    public static void main(String[] args) {
        MpscLinkedQueue<Integer> queue = new MpscLinkedQueue<>();
        for (int i = 0; i < 10; i++) System.gc(); // tenure consumer node
        while (true) {
            queue.offer(123);
            queue.poll();
        }
    }
}
```

```
Before fix:

$ java -Xlog:gc -Xmx1G -cp build/classes/java/main MpscLinkedQueueGC.java
...
[1.261s] GC(20) Pause Young (Normal) (G1 Preventive Collection) 115M->115M(204M) 209.335ms
[1.385s] GC(23) Pause Young (Normal) (G1 Evacuation Pause) 148M->149M(204M) 31.491ms
[1.417s] GC(24) Pause Young (Normal) (G1 Evacuation Pause) 157M->158M(204M) 19.333ms
[1.453s] GC(25) Pause Young (Normal) (G1 Evacuation Pause) 166M->167M(599M) 22.678ms
[1.966s] GC(26) Pause Young (Normal) (G1 Evacuation Pause) 249M->249M(497M) 305.238ms
...

After fix:
$ java -Xlog:gc -Xmx1G -cp build/classes/java/main MpscLinkedQueueGC.java
...
[1.169s] GC(14) Pause Young (Normal) (G1 Evacuation Pause) 304M->2M(506M) 0.755ms
[1.558s] GC(15) Pause Young (Normal) (G1 Evacuation Pause) 304M->2M(506M) 0.689ms
[1.948s] GC(16) Pause Young (Normal) (G1 Evacuation Pause) 304M->2M(506M) 0.800ms
[2.337s] GC(17) Pause Young (Normal) (G1 Evacuation Pause) 304M->2M(506M) 0.714ms
...
```
---
 .../io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
index d735ff43c0..e8d19c633e 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/queue/MpscLinkedQueue.java
@@ -91,6 +91,8 @@ public T poll() {
             // we have to null out the value because we are going to hang on to the node
             final T nextValue = nextNode.getAndNullValue();
             spConsumerNode(nextNode);
+            // unlink previous consumer to help gc
+            currConsumerNode.soNext(null);
             return nextValue;
         }
         else if (currConsumerNode != lvProducerNode()) {
@@ -101,6 +103,8 @@ else if (currConsumerNode != lvProducerNode()) {
             // we have to null out the value because we are going to hang on to the node
             final T nextValue = nextNode.getAndNullValue();
             spConsumerNode(nextNode);
+            // unlink previous consumer to help gc
+            currConsumerNode.soNext(null);
             return nextValue;
         }
         return null;

From 32cdaaacb782ab0ff7496fa5e3628c29f800f5dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Dec 2024 09:26:25 +0100
Subject: [PATCH 563/665] chore(deps): bump github/codeql-action from 3.27.5 to
 3.27.6 (#7804)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.5 to 3.27.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f09c1c0a94de965c15400f5634aa42fac8fb8f88...aa578102511db1f4524ed59b8cc2bae4f6e88195)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c84b436e89..7b6aa7575c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5
+        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
         with:
           sarif_file: results.sarif

From 19135058eb15d97dcfbb8fc1a99dbdceabb7680b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Dec 2024 08:41:32 +0100
Subject: [PATCH 564/665] chore(deps): bump actions/cache from 4.1.2 to 4.2.0
 (#7807)

Bumps [actions/cache](https://github.com/actions/cache) from 4.1.2 to 4.2.0.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/6849a6489940f00c2f30c0fb92c6274307ccb58a...1bd1e32a3bdc45362d1e726936510720a7c30a57)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index dc2948a66e..b9f7f8b4c6 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 059c576980..af2c403c1f 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 42dee29c0c..58fb3c9263 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index da44ac23a6..bf61766bde 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index baf49569f5..4fa06617e0 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
+      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From e26c58d9b9a38dc544fedf7bd9481ff62f1be0e9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Dec 2024 08:43:50 +0100
Subject: [PATCH 565/665] chore(deps): bump github/codeql-action from 3.27.6 to
 3.27.7 (#7808)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.6 to 3.27.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/aa578102511db1f4524ed59b8cc2bae4f6e88195...babb554ede22fd5605947329c4d04d8e7a0b8155)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 7b6aa7575c..281af70903 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6
+        uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
         with:
           sarif_file: results.sarif

From a8634d0bce3415af27efdf8eb9d9c7ed5cfbea3b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 13 Dec 2024 10:35:44 +0100
Subject: [PATCH 566/665] chore(deps): bump github/codeql-action from 3.27.7 to
 3.27.9 (#7809)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.7 to 3.27.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/babb554ede22fd5605947329c4d04d8e7a0b8155...df409f7d9260372bd5f19e5b04e83cb3c43714ae)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 281af70903..38a17b34cf 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@babb554ede22fd5605947329c4d04d8e7a0b8155 # v3.27.7
+        uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
         with:
           sarif_file: results.sarif

From cc04f5b88cc030600d20af495c49a691e4933848 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Dec 2024 08:44:07 +0100
Subject: [PATCH 567/665] chore(deps): bump com.google.guava:guava from
 33.3.1-jre to 33.4.0-jre (#7810)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.3.1-jre to 33.4.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index ba03eec98c..60fd78db78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.3.1-jre"
+    guavaVersion = "33.4.0-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From d09f0adf5fb47a9739bc0dd8ea7882695ba45f3f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 08:16:01 +0100
Subject: [PATCH 568/665] chore(deps): bump actions/upload-artifact from 4.4.3
 to 4.5.0 (#7811)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882...6f51ac03b9356f520e9adb1b1b7802705f340c2b)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 38a17b34cf..06fb58f713 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: SARIF file
           path: results.sarif

From 015294cbe03e60e274bb904229bc7aa3f6f3c461 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 08:16:20 +0100
Subject: [PATCH 569/665] chore(deps): bump actions/setup-java from 4.5.0 to
 4.6.0 (#7812)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/8df1039502a15bceb9433410b1a100fbe190c53b...7a6d8a8234af8eb26422e24e3006232cccaa061b)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index b9f7f8b4c6..50b0a72761 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index af2c403c1f..f1ae7c549c 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 11
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 58fb3c9263..8642fac575 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index bf61766bde..055af94aa5 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 4fa06617e0..eeb1961831 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
       with:
         distribution: 'zulu'
         java-version: '8'

From f9f1cf19342a9a40180b8dcee59a750306a2b75e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 09:07:14 +0100
Subject: [PATCH 570/665] chore(deps): bump github/codeql-action from 3.27.9 to
 3.28.0 (#7814)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.27.9 to 3.28.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/df409f7d9260372bd5f19e5b04e83cb3c43714ae...48ab28a6f5dbc2a99bf1e0131198dd8f1df78169)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 06fb58f713..7ba9ed7f42 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@df409f7d9260372bd5f19e5b04e83cb3c43714ae # v3.27.9
+        uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
         with:
           sarif_file: results.sarif

From d0cea708b4d6b82d44f82f7264116e5c9240cf5d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 10 Jan 2025 11:07:47 +0100
Subject: [PATCH 571/665] chore(deps): bump actions/upload-artifact from 4.5.0
 to 4.6.0 (#7816)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/6f51ac03b9356f520e9adb1b1b7802705f340c2b...65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 7ba9ed7f42..03ac267263 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: SARIF file
           path: results.sarif

From 5c8ddcba3f40f37a24808c17d2cb26d08c370db7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Jan 2025 09:21:52 +0100
Subject: [PATCH 572/665] chore(deps): bump github/codeql-action from 3.28.0 to
 3.28.1 (#7818)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.0 to 3.28.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/48ab28a6f5dbc2a99bf1e0131198dd8f1df78169...b6a472f63d85b9c78a3ac5e89422239fc15e9b3c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 03ac267263..22e7aab441 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
+        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
         with:
           sarif_file: results.sarif

From 9863a6448fbf7c51edfeee6f581cdae0859d37d6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 22 Jan 2025 08:36:14 +0100
Subject: [PATCH 573/665] chore(deps): bump github/codeql-action from 3.28.1 to
 3.28.2 (#7819)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.1 to 3.28.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b6a472f63d85b9c78a3ac5e89422239fc15e9b3c...d68b2d4edb4189fd2a5366ac14e72027bd4b37dd)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 22e7aab441..61674f5d50 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b6a472f63d85b9c78a3ac5e89422239fc15e9b3c # v3.28.1
+        uses: github/codeql-action/upload-sarif@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
         with:
           sarif_file: results.sarif

From 75dedd0f58bf08a136afc44c08cb5928e2f7a2ff Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 08:15:50 +0100
Subject: [PATCH 574/665] chore(deps): bump github/codeql-action from 3.28.2 to
 3.28.3 (#7821)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.2 to 3.28.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/d68b2d4edb4189fd2a5366ac14e72027bd4b37dd...dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 61674f5d50..4ab2ce73d2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d68b2d4edb4189fd2a5366ac14e72027bd4b37dd # v3.28.2
+        uses: github/codeql-action/upload-sarif@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3.28.3
         with:
           sarif_file: results.sarif

From 55c35f7d9c197f73dc91a1a62cbb7a3cbecb5724 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 09:12:21 +0100
Subject: [PATCH 575/665] chore(deps): bump github/codeql-action from 3.28.3 to
 3.28.4 (#7823)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.3 to 3.28.4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7...ee117c905ab18f32fa0f66c2fe40ecc8013f3e04)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 4ab2ce73d2..f608a1c96c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@dd196fa9ce80b6bacc74ca1c32bd5b0ba22efca7 # v3.28.3
+        uses: github/codeql-action/upload-sarif@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
         with:
           sarif_file: results.sarif

From 8f51c27eb799f88cba710e0b5f316217e99e3cb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 10:04:04 +0100
Subject: [PATCH 576/665] chore(deps): bump ru.vyarus.animalsniffer from 1.7.2
 to 2.0.0 (#7826)

Bumps ru.vyarus.animalsniffer from 1.7.2 to 2.0.0.

---
updated-dependencies:
- dependency-name: ru.vyarus.animalsniffer
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 60fd78db78..8e4eedfb68 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id("eclipse")
     id("jacoco")
     id("maven-publish")
-    id("ru.vyarus.animalsniffer") version "1.7.2"
+    id("ru.vyarus.animalsniffer") version "2.0.0"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.4.0"

From ae483776a5ead61ccf9131911dd28eba850cdf4d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 10:05:13 +0100
Subject: [PATCH 577/665] chore(deps): bump github/codeql-action from 3.28.4 to
 3.28.5 (#7825)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.4 to 3.28.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/ee117c905ab18f32fa0f66c2fe40ecc8013f3e04...f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f608a1c96c..535086ad30 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ee117c905ab18f32fa0f66c2fe40ecc8013f3e04 # v3.28.4
+        uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
         with:
           sarif_file: results.sarif

From d394260a36a8c31c4a48031a43ae2c4800baa8f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jan 2025 08:36:49 +0100
Subject: [PATCH 578/665] chore(deps): bump github/codeql-action from 3.28.5 to
 3.28.6 (#7827)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.5 to 3.28.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4...17a820bf2e43b47be2c72b39cc905417bc1ab6d0)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 535086ad30..12867808cb 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f6091c0113d1dcf9b98e269ee48e8a7e51b7bdd4 # v3.28.5
+        uses: github/codeql-action/upload-sarif@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
         with:
           sarif_file: results.sarif

From 541fe9b56bdf323c64c60ba3e1c2d1305da47dfb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 29 Jan 2025 08:17:56 +0100
Subject: [PATCH 579/665] chore(deps): bump actions/setup-java from 4.6.0 to
 4.7.0 (#7828)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/7a6d8a8234af8eb26422e24e3006232cccaa061b...3a4f6e1af504cf6a31855fa899c6aa5355ba6c12)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 50b0a72761..69a91581c9 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index f1ae7c549c..d68ba6edf1 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 11
-      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 8642fac575..2b4e2623c4 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 055af94aa5..d9afd373d1 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index eeb1961831..6997be7f99 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4.6.0
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
         distribution: 'zulu'
         java-version: '8'

From f896725b40ba22b24f119b911b7f7ab08fd5f4da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 30 Jan 2025 11:41:08 +0100
Subject: [PATCH 580/665] chore(deps): bump github/codeql-action from 3.28.6 to
 3.28.8 (#7829)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.6 to 3.28.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/17a820bf2e43b47be2c72b39cc905417bc1ab6d0...dd746615b3b9d728a6a37ca2045b68ca76d4841a)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 12867808cb..670a2f266a 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@17a820bf2e43b47be2c72b39cc905417bc1ab6d0 # v3.28.6
+        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
         with:
           sarif_file: results.sarif

From 51cf3f4de0791fd1b0a7bd14bb6884d94c879612 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Feb 2025 09:14:25 +0100
Subject: [PATCH 581/665] chore(deps): bump github/codeql-action from 3.28.8 to
 3.28.9 (#7831)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.8 to 3.28.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/dd746615b3b9d728a6a37ca2045b68ca76d4841a...9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 670a2f266a..80d9cb58d6 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
+        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
         with:
           sarif_file: results.sarif

From 6cdc750d93e4b0c1fd368462e10f8956f9ebaecd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Feb 2025 08:09:51 +0100
Subject: [PATCH 582/665] chore(deps): bump actions/cache from 4.2.0 to 4.2.1
 (#7837)

Bumps [actions/cache](https://github.com/actions/cache) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/1bd1e32a3bdc45362d1e726936510720a7c30a57...0c907a75c2c80ebcb7f088228285e798b750cf8f)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 69a91581c9..536130efc5 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index d68ba6edf1..79b4c8e60a 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 2b4e2623c4..b80b1dd3fd 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index d9afd373d1..7132ba12e2 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 6997be7f99..9ba8d9cb5c 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 7b19d8904551a5903dca148d8d4b00b096c6bbed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 09:21:12 +0100
Subject: [PATCH 583/665] chore(deps): bump actions/upload-artifact from 4.6.0
 to 4.6.1 (#7839)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.0 to 4.6.1.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08...4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 80d9cb58d6..d8b91755ca 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
         with:
           name: SARIF file
           path: results.sarif

From 85c7bf7a11a18c0eca77f8b0dd0e4d38df015d85 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 09:21:48 +0100
Subject: [PATCH 584/665] chore(deps): bump ossf/scorecard-action from 2.4.0 to
 2.4.1 (#7838)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.0 to 2.4.1.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/62b2cac7ed8198b15735ed49ab1e5cf35480ba46...f49aabe0b5af0936a0987cfb85d86b75731b0186)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index d8b91755ca..5cce7c569a 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
         with:
           results_file: results.sarif
           results_format: sarif

From e0b2a69fec9f06ae1af1aa99547cbd1158b10c6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Feb 2025 18:02:56 +0100
Subject: [PATCH 585/665] chore(deps): bump github/codeql-action from 3.28.9 to
 3.28.10 (#7840)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.9 to 3.28.10.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0...b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 5cce7c569a..83e3cde6a6 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@9e8d0789d4a0fa9ceb6b1738f7e269594bdd67f0 # v3.28.9
+        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
         with:
           sarif_file: results.sarif

From 0fe87b8add2147f7b09fe83d611be51edfdd27da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Feb 2025 09:12:54 +0100
Subject: [PATCH 586/665] chore(deps): bump actions/cache from 4.2.1 to 4.2.2
 (#7842)

Bumps [actions/cache](https://github.com/actions/cache) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/0c907a75c2c80ebcb7f088228285e798b750cf8f...d4323d4df104b026a6aa633fdb11d772146be0bf)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 536130efc5..0660410b67 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 79b4c8e60a..0f35639fbb 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index b80b1dd3fd..23c35d79bc 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 7132ba12e2..8e0e4b4707 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 9ba8d9cb5c..72053cec07 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
+      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 4ee1d357a7b4e4d75e478e57af61b123195b5891 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 10 Mar 2025 09:34:07 +0100
Subject: [PATCH 587/665] chore(deps): bump github/codeql-action from 3.28.10
 to 3.28.11 (#7844)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.10 to 3.28.11.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d...6bb031afdd8eb862ea3fc1848194185e076637e5)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 83e3cde6a6..aef606e3fa 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
         with:
           sarif_file: results.sarif

From 6c73c5c162f9aef426900a66724099cd520d55c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Mar 2025 08:35:41 +0100
Subject: [PATCH 588/665] chore(deps): bump actions/cache from 4.2.2 to 4.2.3
 (#7845)

Bumps [actions/cache](https://github.com/actions/cache) from 4.2.2 to 4.2.3.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/d4323d4df104b026a6aa633fdb11d772146be0bf...5a3ec84eff668545956fd18022155c47e93e2684)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 0660410b67..eb6909809f 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 0f35639fbb..781b4f1e0a 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -24,7 +24,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 23c35d79bc..ce8f2f7c5c 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 8e0e4b4707..16c61a2585 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 72053cec07..3bdd8697e6 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '8'
     - name: Cache Gradle packages
-      uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
+      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 2c592c03d5436d8d20b35a2fa55f5013075250e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Mar 2025 08:35:56 +0100
Subject: [PATCH 589/665] chore(deps): bump actions/upload-artifact from 4.6.1
 to 4.6.2 (#7846)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.1 to 4.6.2.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1...ea165f8d65b6e75b540449e92b4886f43607fa02)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index aef606e3fa..1e70509f6f 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
+        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: SARIF file
           path: results.sarif

From a4c85c28d9cb4670f4c0b6b64650852c6c510bb8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Mar 2025 08:36:10 +0100
Subject: [PATCH 590/665] chore(deps): bump github/codeql-action from 3.28.11
 to 3.28.12 (#7847)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.11 to 3.28.12.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/6bb031afdd8eb862ea3fc1848194185e076637e5...5f8171a638ada777af81d42b55959a643bb29017)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 1e70509f6f..4818d71878 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6bb031afdd8eb862ea3fc1848194185e076637e5 # v3.28.11
+        uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
         with:
           sarif_file: results.sarif

From 439717ff10ff5ad400560ed8efe7e3e21818e976 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 20 Mar 2025 08:36:24 +0100
Subject: [PATCH 591/665] chore(deps): bump com.google.guava:guava from
 33.4.0-jre to 33.4.5-jre (#7848)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.0-jre to 33.4.5-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 8e4eedfb68..b18b15781e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.4.0-jre"
+    guavaVersion = "33.4.5-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From e487055b721eb75408795779415384205ae29f0b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Mar 2025 08:38:38 +0100
Subject: [PATCH 592/665] chore(deps): bump github/codeql-action from 3.28.12
 to 3.28.13 (#7849)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.12 to 3.28.13.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/5f8171a638ada777af81d42b55959a643bb29017...1b549b9259bda1cb5ddde3b41741a82a2d15a841)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 4818d71878..079999951c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5f8171a638ada777af81d42b55959a643bb29017 # v3.28.12
+        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
         with:
           sarif_file: results.sarif

From c7313319b74055f3957abae1910e75570cdfaaab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Mar 2025 08:45:01 +0100
Subject: [PATCH 593/665] chore(deps): bump com.google.guava:guava from
 33.4.5-jre to 33.4.6-jre (#7850)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.5-jre to 33.4.6-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b18b15781e..45d212dd43 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.4.5-jre"
+    guavaVersion = "33.4.6-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 4f4745971a38e4092833837e6bdfc28f33916cb9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 8 Apr 2025 08:17:43 +0200
Subject: [PATCH 594/665] chore(deps): bump github/codeql-action from 3.28.13
 to 3.28.15 (#7852)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.13 to 3.28.15.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/1b549b9259bda1cb5ddde3b41741a82a2d15a841...45775bd8235c68ba998cffa5171334d58593da47)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.15
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 079999951c..2fe557cec1 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b549b9259bda1cb5ddde3b41741a82a2d15a841 # v3.28.13
+        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
         with:
           sarif_file: results.sarif

From 511d1eda3744511b74d0d7978b4ae3fe7009e567 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 08:18:52 +0200
Subject: [PATCH 595/665] chore(deps): bump actions/setup-java from 4.7.0 to
 4.7.1 (#7853)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.7.0 to 4.7.1.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/3a4f6e1af504cf6a31855fa899c6aa5355ba6c12...c5195efecf7bdfc987ee8bae7a71cb8b11521c00)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: 4.7.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index eb6909809f..650cbe7c05 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 781b4f1e0a..33c781fca9 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 11
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index ce8f2f7c5c..712139379f 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 16c61a2585..a341c27ffc 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'zulu'
         java-version: '8'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 3bdd8697e6..5a66712f73 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK 8
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'zulu'
         java-version: '8'

From 1fa602d2923485f7ef5482143bcdf893c09bad2c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Apr 2025 08:19:31 +0200
Subject: [PATCH 596/665] chore(deps): bump com.google.guava:guava from
 33.4.6-jre to 33.4.7-jre (#7854)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.6-jre to 33.4.7-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-version: 33.4.7-jre
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 45d212dd43..18ebf00562 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.4.6-jre"
+    guavaVersion = "33.4.7-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From c6a065fa3d1078862089b54c7a4c580d754a8b4f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 15 Apr 2025 08:15:00 +0200
Subject: [PATCH 597/665] chore(deps): bump com.google.guava:guava from
 33.4.7-jre to 33.4.8-jre (#7857)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.7-jre to 33.4.8-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-version: 33.4.8-jre
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 18ebf00562..39703ec95e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.4.7-jre"
+    guavaVersion = "33.4.8-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 67e949dbbcd2cad03836e3f605abfb2a67b2e35c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Apr 2025 07:54:18 +0200
Subject: [PATCH 598/665] chore(deps): bump github/codeql-action from 3.28.15
 to 3.28.16 (#7859)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.15 to 3.28.16.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/45775bd8235c68ba998cffa5171334d58593da47...28deaeda66b76a05916b6923827895f2b14ab387)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.16
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2fe557cec1..0a391366bd 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@45775bd8235c68ba998cffa5171334d58593da47 # v3.28.15
+        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
         with:
           sarif_file: results.sarif

From 93aa12c1ec55ed287b7042d977366ea745757864 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 29 Apr 2025 07:52:42 +0200
Subject: [PATCH 599/665] chore(deps): bump ru.vyarus.animalsniffer from 2.0.0
 to 2.0.1 (#7860)

Bumps ru.vyarus.animalsniffer from 2.0.0 to 2.0.1.

---
updated-dependencies:
- dependency-name: ru.vyarus.animalsniffer
  dependency-version: 2.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 39703ec95e..afc9c0c593 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
     id("eclipse")
     id("jacoco")
     id("maven-publish")
-    id("ru.vyarus.animalsniffer") version "2.0.0"
+    id("ru.vyarus.animalsniffer") version "2.0.1"
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.4.0"

From 5a15d407e52885465243d4111682eb2fb859bc21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 09:55:39 +0200
Subject: [PATCH 600/665] chore(deps): bump github/codeql-action from 3.28.16
 to 3.28.17 (#7861)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.16 to 3.28.17.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/28deaeda66b76a05916b6923827895f2b14ab387...60168efe1c415ce0f5521ea06d5c2062adbeed1b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.17
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 0a391366bd..06bb057ff7 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@28deaeda66b76a05916b6923827895f2b14ab387 # v3.28.16
+        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
         with:
           sarif_file: results.sarif

From 8b4eece463e179c6d1a68bc99fc960c7c7341c9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 19 May 2025 09:17:14 +0200
Subject: [PATCH 601/665] chore(deps): bump github/codeql-action from 3.28.17
 to 3.28.18 (#7867)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.17 to 3.28.18.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/60168efe1c415ce0f5521ea06d5c2062adbeed1b...ff0a06e83cb2de871e5a09832bc6a81e7276941f)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.18
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 06bb057ff7..b4e5670e82 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@60168efe1c415ce0f5521ea06d5c2062adbeed1b # v3.28.17
+        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
         with:
           sarif_file: results.sarif

From a1b96559fdda04b0a0e61c01ba89c13902a55c8d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 19 May 2025 09:17:56 +0200
Subject: [PATCH 602/665] 3.x: Fix delay-cancellation race producing random
 subsequent emissions (#7855)

---
 .../operators/flowable/FlowableDelay.java     |  4 +-
 .../operators/observable/ObservableDelay.java |  4 +-
 .../operators/flowable/FlowableDelayTest.java | 36 ++++++++++++++++++
 .../observable/ObservableDelayTest.java       | 37 ++++++++++++++++++-
 4 files changed, 78 insertions(+), 3 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java
index 469d0dd48b..a7de73213a 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelay.java
@@ -111,7 +111,9 @@ final class OnNext implements Runnable {
 
             @Override
             public void run() {
-                downstream.onNext(t);
+                if (!w.isDisposed()) {
+                    downstream.onNext(t);
+                }
             }
         }
 
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java
index 1801cce1f2..7c01c23f90 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelay.java
@@ -111,7 +111,9 @@ final class OnNext implements Runnable {
 
             @Override
             public void run() {
-                downstream.onNext(t);
+                if (!w.isDisposed()) {
+                    downstream.onNext(t);
+                }
             }
         }
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
index 3160f61173..4d67594a17 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableDelayTest.java
@@ -20,6 +20,7 @@
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
+import java.util.concurrent.locks.LockSupport;
 
 import org.junit.*;
 import org.mockito.InOrder;
@@ -28,6 +29,7 @@
 import io.reactivex.rxjava3.core.*;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.SequentialDisposable;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.processors.PublishProcessor;
 import io.reactivex.rxjava3.schedulers.*;
@@ -1030,4 +1032,38 @@ public Publisher<Object> apply(Integer t) throws Exception {
         .to(TestHelper.<Integer>testConsumer())
         .assertFailureAndMessage(NullPointerException.class, "The itemDelay returned a null Publisher");
     }
+
+    @Test
+    public void cancelShouldPreventRandomSubsequentEmissions() {
+        for (int attempt = 1; attempt < 100; attempt ++) {
+
+            SequentialDisposable disposable = new SequentialDisposable();
+            ConcurrentLinkedQueue<Integer> sink = new ConcurrentLinkedQueue<>();
+
+            disposable.replace(
+                Flowable.range(1, 10)
+                .delay(1, TimeUnit.MICROSECONDS, Schedulers.computation(), true)
+                .doOnNext(v -> {
+                    if (v == 1) {
+                        Schedulers.computation().scheduleDirect(disposable::dispose);
+                    }
+                    sink.offer(v);
+                })
+            .subscribe());
+
+            LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(1));
+
+            Integer last = null;
+
+            while (!sink.isEmpty()) {
+                Integer current = sink.poll();
+
+                if (last != null && last + 1 != current) {
+                    fail("Emission hole: " + last + " -> " + current);
+                }
+
+                last = current;
+            }
+        }
+    }
 }
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
index ea8d51d996..778d2d4e64 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableDelayTest.java
@@ -20,6 +20,7 @@
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.LockSupport;
 
 import org.junit.*;
 import org.mockito.InOrder;
@@ -29,6 +30,7 @@
 import io.reactivex.rxjava3.core.Observer;
 import io.reactivex.rxjava3.exceptions.TestException;
 import io.reactivex.rxjava3.functions.*;
+import io.reactivex.rxjava3.internal.disposables.SequentialDisposable;
 import io.reactivex.rxjava3.internal.functions.Functions;
 import io.reactivex.rxjava3.observers.*;
 import io.reactivex.rxjava3.schedulers.*;
@@ -978,4 +980,37 @@ public Observable<Object> apply(Integer t) throws Exception {
         .to(TestHelper.<Integer>testConsumer())
         .assertFailureAndMessage(NullPointerException.class, "The itemDelay returned a null ObservableSource");
     }
-}
+
+    @Test
+    public void cancelShouldPreventRandomSubsequentEmissions() {
+        for (int attempt = 1; attempt < 100; attempt ++) {
+
+            SequentialDisposable disposable = new SequentialDisposable();
+            ConcurrentLinkedQueue<Integer> sink = new ConcurrentLinkedQueue<>();
+
+            disposable.replace(
+                Observable.range(1, 10)
+                .delay(1, TimeUnit.MICROSECONDS, Schedulers.computation(), true)
+                .doOnNext(v -> {
+                    if (v == 1) {
+                        Schedulers.computation().scheduleDirect(disposable::dispose);
+                    }
+                    sink.offer(v);
+                })
+            .subscribe());
+
+            LockSupport.parkNanos(TimeUnit.MILLISECONDS.toNanos(1));
+
+            Integer last = null;
+
+            while (!sink.isEmpty()) {
+                Integer current = sink.poll();
+
+                if (last != null && last + 1 != current) {
+                    fail("Emission hole: " + last + " -> " + current);
+                }
+
+                last = current;
+            }
+        }
+    }}

From 1d95451ebf75e1dba544b5de4378873a7e672cd6 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 19 May 2025 21:02:04 +0200
Subject: [PATCH 603/665] 3.x: Upgrade to Gradle 8.14, toolchains, Central
 release (#7868)

* 3.x: Upgrade to Gradle 8.14, toolchains, Central release

* Fix checkstyle problem with module-info.java under 11

* javadoc error: try force compat settings

* Just disable javadoc for build-11
---
 .github/workflows/gradle_branch.yml      |  4 +-
 .github/workflows/gradle_jdk11.yml       |  7 ++-
 .github/workflows/gradle_pr.yml          |  4 +-
 .github/workflows/gradle_release.yml     |  6 +--
 .github/workflows/gradle_snapshot.yml    |  6 +--
 build.gradle                             | 54 +++++++++---------------
 gradle.properties                        |  2 +
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 8 files changed, 39 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 650cbe7c05..f791da3db8 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'zulu'
-        java-version: '8'
+        java-version: '11'
     - name: Cache Gradle packages
       uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 33c781fca9..829b45be6a 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -12,6 +12,9 @@ on:
 permissions:
   contents: read
 
+env:
+  BUILD_WITH_11: true
+
 jobs:
   build:
 
@@ -35,5 +38,5 @@ jobs:
       run: ./gradlew -PjavaCompatibility=9 jar
     - name: Build RxJava
       run: ./gradlew build --stacktrace
-    - name: Generate Javadoc
-      run: ./gradlew javadoc --stacktrace
+#    - name: Generate Javadoc
+#      run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 712139379f..b0198af0a1 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -16,11 +16,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'zulu'
-        java-version: '8'
+        java-version: '11'
     - name: Cache Gradle packages
       uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index a341c27ffc..45717adf44 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -23,11 +23,11 @@ jobs:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'zulu'
-        java-version: '8'
+        java-version: '11'
     - name: Cache Gradle packages
       uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
@@ -54,7 +54,7 @@ jobs:
         ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
         ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     - name: Publish release
-      run: ./gradlew -PreleaseMode=full closeAndReleaseRepository --no-daemon --no-parallel --stacktrace
+      run: ./gradlew -PreleaseMode=full publishAndReleaseToMavenCentral --no-configuration-cache --no-daemon --no-parallel --stacktrace
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 5a66712f73..168e213955 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -22,11 +22,11 @@ jobs:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: Set up JDK 8
+    - name: Set up JDK 11
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         distribution: 'zulu'
-        java-version: '8'
+        java-version: '11'
     - name: Cache Gradle packages
       uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
       with:
@@ -40,7 +40,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload Snapshot
-      run: ./gradlew -PreleaseMode=branch publish --no-daemon --no-parallel --stacktrace
+      run: ./gradlew -PreleaseMode=branch publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel --stacktrace
       env:
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
         # ------------------------------------------------------------------------------ 
diff --git a/build.gradle b/build.gradle
index afc9c0c593..cc02d2842f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,8 @@ plugins {
     id("me.champeau.gradle.jmh") version "0.5.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.4.0"
-    id("com.vanniktech.maven.publish") version "0.19.0"
-    id("org.beryx.jar") version "1.2.0"
+    id("com.vanniktech.maven.publish") version "0.32.0"
+    id("org.beryx.jar") version "2.0.0"
 }
 
 ext {
@@ -49,7 +49,16 @@ dependencies {
     testImplementation "com.google.guava:guava:$guavaVersion"
 }
 
+def buildWith11 = System.getenv("BUILD_WITH_11")
 java {
+    toolchain {
+        vendor = JvmVendorSpec.ADOPTIUM
+        if ("true".equals(buildWith11)) {
+            languageVersion = JavaLanguageVersion.of(11)
+        } else {
+            languageVersion = JavaLanguageVersion.of(8)
+        }
+    }
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
@@ -86,12 +95,18 @@ animalsniffer {
     annotation = "io.reactivex.rxjava3.internal.util.SuppressAnimalSniffer"
 }
 
+moduleConfig {
+    moduleInfoPath = 'src/main/module/module-info.java'
+    multiReleaseVersion = 9
+}
+
 jar {
     from('.') {
         include 'LICENSE'
         include 'COPYRIGHT'
         into('META-INF/')
     }
+    exclude("module-info.class")
 
     // Cover for bnd still not supporting MR Jars: https://github.com/bndtools/bnd/issues/2227
     bnd('-fixupmessages': '^Classes found in the wrong directory: \\\\{META-INF/versions/9/module-info\\\\.class=module-info}$')
@@ -106,8 +121,6 @@ jar {
             "Bundle-SymbolicName": "io.reactivex.rxjava3.rxjava",
             "Multi-Release": "true"
     )
-
-    moduleInfoPath = 'src/main/module/module-info.java'
 }
 
 license {
@@ -166,8 +179,9 @@ jacocoTestReport {
     dependsOn testNG
 
     reports {
-        xml.enabled = true
-        html.enabled = true
+            xml.required.set(true)
+	    csv.required.set(false)
+            html.required.set(true)
     }
 }
 
@@ -179,31 +193,12 @@ checkstyle {
             "checkstyle.suppressions.file": project.file("config/checkstyle/suppressions.xml"),
             "checkstyle.header.file"      : project.file("config/license/HEADER_JAVA")
     ]
+    checkstyleMain.exclude '**/module-info.java'
 }
 
 if (project.hasProperty("releaseMode")) {
     logger.lifecycle("ReleaseMode: {}", project.releaseMode)
 
-  /*
-  if ("branch" == project.releaseMode) {
-
-    if (version.endsWith("-SNAPSHOT")) {
-      publishing {
-        repositories {
-          maven {
-             url = "https://s01.oss.sonatype.org/content/repositories/snapshots/"
-          }
-        }
-      }
-
-      mavenPublish {
-        nexus {
-          stagingProfile = "io.reactivex"
-        }
-      }
-    }
-  }
-  */
 
   if ("full" == project.releaseMode) {
     signing {
@@ -211,12 +206,5 @@ if (project.hasProperty("releaseMode")) {
          useInMemoryPgpKeys(project.getProperty("SIGNING_PRIVATE_KEY"), project.getProperty("SIGNING_PASSWORD"))
       }
     }
-    /*
-    mavenPublish {
-      nexus {
-        stagingProfile = "io.reactivex"
-      }
-    }
-    */
   }
 }
diff --git a/gradle.properties b/gradle.properties
index e685b8103a..7f10deed11 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,3 +22,5 @@ POM_DEVELOPER_ID=akarnokd
 POM_DEVELOPER_NAME=David Karnok
 POM_DEVELOPER_URL=https://github.com/akarnokd/
 POM_DEVELOPER_EMAIL=akarnokd@gmail.com
+
+SONATYPE_HOST=CENTRAL_PORTAL
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index c7d437bbb4..3c44eb1b6f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 1c4143492a76f8c45aac02f90092737d97e995f0 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 19 May 2025 21:30:18 +0200
Subject: [PATCH 604/665] Update snapshot coordinates

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1456d2b68c..9963ffee46 100644
--- a/README.md
+++ b/README.md
@@ -510,7 +510,7 @@ For further details, consult the [wiki](https://github.com/ReactiveX/RxJava/wiki
 - Google Group: [RxJava](http://groups.google.com/d/forum/rxjava)
 - Twitter: [@RxJava](http://twitter.com/RxJava)
 - [GitHub Issues](https://github.com/ReactiveX/RxJava/issues)
-- StackOverflow: [rx-java](http://stackoverflow.com/questions/tagged/rx-java) and [rx-java2](http://stackoverflow.com/questions/tagged/rx-java2)
+- StackOverflow: [rx-java](http://stackoverflow.com/questions/tagged/rx-java), [rx-java2](http://stackoverflow.com/questions/tagged/rx-java2) and  [rx-java3](http://stackoverflow.com/questions/tagged/rx-java3)
 - [Gitter.im](https://gitter.im/ReactiveX/RxJava)
 
 ## Versioning
@@ -571,11 +571,11 @@ and for Ivy:
 
 ### Snapshots
 
-Snapshots after May 1st, 2021 are available via https://oss.sonatype.org/content/repositories/snapshots/io/reactivex/rxjava3/rxjava/
+Snapshots after May 19st, 2025 are available via https://central.sonatype.com/repository/maven-snapshots/io/reactivex/rxjava3/rxjava/
 
 ```groovy
 repositories {
-  maven { url 'https://oss.sonatype.org/content/repositories/snapshots' }
+  maven { url 'https://central.sonatype.com/repository/maven-snapshots' }
 }
 
 dependencies {
@@ -583,7 +583,7 @@ dependencies {
 }
 ```
 
-JavaDoc snapshots are available at http://reactivex.io/RxJava/3.x/javadoc/snapshot
+JavaDoc snapshots are available at https://reactivex.io/RxJava/3.x/javadoc/snapshot
 
 ## Build
 

From 809af457fd9b9ec8e5445379b2d421f755a7c303 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 19 May 2025 21:56:16 +0200
Subject: [PATCH 605/665] Add signing plugin

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index cc02d2842f..7fbcfbb89c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,6 +10,7 @@ plugins {
     id("biz.aQute.bnd.builder") version "6.4.0"
     id("com.vanniktech.maven.publish") version "0.32.0"
     id("org.beryx.jar") version "2.0.0"
+    id("signing")
 }
 
 ext {

From 3833dd23978a8525738f0ea42ee0f530d830e732 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 19 May 2025 22:03:40 +0200
Subject: [PATCH 606/665] Also have to call sign

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 7fbcfbb89c..631e2af242 100644
--- a/build.gradle
+++ b/build.gradle
@@ -205,6 +205,7 @@ if (project.hasProperty("releaseMode")) {
     signing {
       if (project.hasProperty("SIGNING_PRIVATE_KEY") && project.hasProperty("SIGNING_PASSWORD")) {
          useInMemoryPgpKeys(project.getProperty("SIGNING_PRIVATE_KEY"), project.getProperty("SIGNING_PASSWORD"))
+         sign(publishing.publications)
       }
     }
   }

From a1948139b0d8cd1034815dc5801b59f171de3556 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 19 May 2025 22:22:34 +0200
Subject: [PATCH 607/665] Remove the old publish command

---
 .github/workflows/gradle_release.yml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 45717adf44..6b1337d6d1 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -44,15 +44,15 @@ jobs:
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
       uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
-    - name: Upload release
-      run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
-      env:
-        # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
-        # ------------------------------------------------------------------------------ 
-        ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
-        ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
-        ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
-        ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+#    - name: Upload release
+#      run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
+#      env:
+#       # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions
+#       # ------------------------------------------------------------------------------ 
+#        ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
+#        ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
+#        ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
+#        ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     - name: Publish release
       run: ./gradlew -PreleaseMode=full publishAndReleaseToMavenCentral --no-configuration-cache --no-daemon --no-parallel --stacktrace
       env:
@@ -60,6 +60,8 @@ jobs:
         # ------------------------------------------------------------------------------ 
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
+        ORG_GRADLE_PROJECT_SIGNING_PRIVATE_KEY: ${{ secrets.SIGNING_PRIVATE_KEY }}
+        ORG_GRADLE_PROJECT_SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
     - name: Push Javadoc
       run: ./push_javadoc.sh
       env:

From 5081ce20f9bd88889e679fc7b448a0a98c5f8c81 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 19 May 2025 22:52:01 +0200
Subject: [PATCH 608/665] Try another way for sonatype central portal

---
 build.gradle      | 9 +++++++++
 gradle.properties | 2 --
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 631e2af242..9423a3d5ce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -208,5 +208,14 @@ if (project.hasProperty("releaseMode")) {
          sign(publishing.publications)
       }
     }
+    
+    import com.vanniktech.maven.publish.SonatypeHost
+
+    mavenPublishing {
+      // or when publishing to https://central.sonatype.com/
+      publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+
+      // signAllPublications()
+    }
   }
 }
diff --git a/gradle.properties b/gradle.properties
index 7f10deed11..e685b8103a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,5 +22,3 @@ POM_DEVELOPER_ID=akarnokd
 POM_DEVELOPER_NAME=David Karnok
 POM_DEVELOPER_URL=https://github.com/akarnokd/
 POM_DEVELOPER_EMAIL=akarnokd@gmail.com
-
-SONATYPE_HOST=CENTRAL_PORTAL
\ No newline at end of file

From 6bc940dbea283e3258d33217074a7b56e551ad76 Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 19 May 2025 22:53:32 +0200
Subject: [PATCH 609/665] Fix syntax error

---
 build.gradle | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9423a3d5ce..60319bf70d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -209,11 +209,9 @@ if (project.hasProperty("releaseMode")) {
       }
     }
     
-    import com.vanniktech.maven.publish.SonatypeHost
-
     mavenPublishing {
       // or when publishing to https://central.sonatype.com/
-      publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
+      publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
 
       // signAllPublications()
     }

From 5a0ef13e3caaeff0a524f5d76a8a6c64bc6de6d8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Jun 2025 09:48:09 +0200
Subject: [PATCH 610/665] chore(deps): bump ossf/scorecard-action from 2.4.1 to
 2.4.2 (#7870)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/f49aabe0b5af0936a0987cfb85d86b75731b0186...05b42c624433fc40578a4040d5cf5e36ddca8cde)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.4.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b4e5670e82..c2084cc6c0 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif

From bf452a71a24f7b2b6dd2470d3b4c56ac5eac0f1e Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 2 Jun 2025 11:40:20 +0200
Subject: [PATCH 611/665] Fix snapshot publishing

---
 build.gradle | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 60319bf70d..7a0e6d58c5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -208,12 +208,11 @@ if (project.hasProperty("releaseMode")) {
          sign(publishing.publications)
       }
     }
-    
-    mavenPublishing {
+  }
+  mavenPublishing {
       // or when publishing to https://central.sonatype.com/
       publishToMavenCentral(com.vanniktech.maven.publish.SonatypeHost.CENTRAL_PORTAL)
 
       // signAllPublications()
-    }
   }
 }

From c8c5399bf62b7186b49c04792691c3fc341bfc6c Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 2 Jun 2025 12:48:25 +0200
Subject: [PATCH 612/665] Bump JMH Plugin to 0.7.3 & adjust build.gradle
 (#7869)

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 7a0e6d58c5..37dbd5320e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ plugins {
     id("jacoco")
     id("maven-publish")
     id("ru.vyarus.animalsniffer") version "2.0.1"
-    id("me.champeau.gradle.jmh") version "0.5.3"
+    id("me.champeau.jmh") version "0.7.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.4.0"
     id("com.vanniktech.maven.publish") version "0.32.0"
@@ -140,8 +140,8 @@ jmh {
     jvmArgsAppend = ["-Djmh.separateClasspathJAR=true"]
 
     if (project.hasProperty("jmh")) {
-        include = [".*" + project.jmh + ".*"]
-        logger.info("JMH: {}", include)
+        includes = [".*" + project.jmh + ".*"]
+        logger.info("JMH: {}", includes)
     }
 }
 

From 19412e631d30e04c08e67eccf2f53779fe534f78 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Jun 2025 08:56:41 +0200
Subject: [PATCH 613/665] chore(deps): bump github/codeql-action from 3.28.18
 to 3.28.19 (#7871)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.18 to 3.28.19.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/ff0a06e83cb2de871e5a09832bc6a81e7276941f...fca7ace96b7d713c7035871441bd52efbe39e27e)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.28.19
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c2084cc6c0..c6b1e82325 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
+        uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
         with:
           sarif_file: results.sarif

From c9516be3ea58bd00d50712669522e57647dfb5d4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 12 Jun 2025 08:19:19 +0200
Subject: [PATCH 614/665] chore(deps): bump github/codeql-action from 3.28.19
 to 3.29.0 (#7873)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.28.19 to 3.29.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/fca7ace96b7d713c7035871441bd52efbe39e27e...ce28f5bb42b7a9f2c824e633a3f6ee835bab6858)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c6b1e82325..2f8aa387df 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
+        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
         with:
           sarif_file: results.sarif

From a206350dd37fa167f0a8058b4407c08dbad5296d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Jul 2025 09:50:48 +0200
Subject: [PATCH 615/665] chore(deps): bump github/codeql-action from 3.29.0 to
 3.29.2 (#7877)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.0 to 3.29.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/ce28f5bb42b7a9f2c824e633a3f6ee835bab6858...181d5eefc20863364f96762470ba6f862bdef56b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2f8aa387df..99129a1948 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ce28f5bb42b7a9f2c824e633a3f6ee835bab6858 # v3.29.0
+        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
         with:
           sarif_file: results.sarif

From be0bd27e626becec8070adce55909592b33a4392 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Jul 2025 15:15:59 +0200
Subject: [PATCH 616/665] chore(deps): bump com.vanniktech.maven.publish from
 0.32.0 to 0.33.0 (#7875)

Bumps [com.vanniktech.maven.publish](https://github.com/vanniktech/gradle-maven-publish-plugin) from 0.32.0 to 0.33.0.
- [Release notes](https://github.com/vanniktech/gradle-maven-publish-plugin/releases)
- [Changelog](https://github.com/vanniktech/gradle-maven-publish-plugin/blob/main/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/gradle-maven-publish-plugin/compare/0.32.0...0.33.0)

---
updated-dependencies:
- dependency-name: com.vanniktech.maven.publish
  dependency-version: 0.33.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 37dbd5320e..4067abf168 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ plugins {
     id("me.champeau.jmh") version "0.7.3"
     id("com.github.hierynomus.license") version "0.16.1"
     id("biz.aQute.bnd.builder") version "6.4.0"
-    id("com.vanniktech.maven.publish") version "0.32.0"
+    id("com.vanniktech.maven.publish") version "0.33.0"
     id("org.beryx.jar") version "2.0.0"
     id("signing")
 }

From df73d036ff509d5828c59b3838a763d792819f25 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 7 Jul 2025 08:55:40 +0200
Subject: [PATCH 617/665] 3.x: Fix ReplaySubject termination-subscription race
 emitting wrongly (#7879)

---
 .../rxjava3/subjects/ReplaySubject.java       | 81 ++++++++-----------
 .../operators/flowable/FlowableAmbTest.java   |  3 +-
 .../observable/ObservableAmbTest.java         |  3 +-
 .../operators/single/SingleAmbTest.java       |  3 +-
 .../processors/ReplayProcessorTest.java       | 67 ++++++++++++++-
 .../rxjava3/subjects/ReplaySubjectTest.java   | 66 +++++++++++++++
 6 files changed, 171 insertions(+), 52 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
index 4d5eb3335f..e103594ba5 100644
--- a/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
+++ b/src/main/java/io/reactivex/rxjava3/subjects/ReplaySubject.java
@@ -652,8 +652,6 @@ static final class UnboundedReplayBuffer<T>
 
         final List<Object> buffer;
 
-        volatile boolean done;
-
         volatile int size;
 
         UnboundedReplayBuffer(int capacityHint) {
@@ -671,7 +669,6 @@ public void addFinal(Object notificationLite) {
             buffer.add(notificationLite);
             trimHead();
             size++;
-            done = true;
         }
 
         @Override
@@ -772,20 +769,17 @@ public void replay(ReplayDisposable<T> rs) {
 
                     Object o = b.get(index);
 
-                    if (done) {
-                        if (index + 1 == s) {
-                            s = size;
-                            if (index + 1 == s) {
-                                if (NotificationLite.isComplete(o)) {
-                                    a.onComplete();
-                                } else {
-                                    a.onError(NotificationLite.getError(o));
-                                }
-                                rs.index = null;
-                                rs.cancelled = true;
-                                return;
-                            }
-                        }
+                    if (NotificationLite.isComplete(o)) {
+                        a.onComplete();
+                        rs.index = null;
+                        rs.cancelled = true;
+                        return;
+                    } else
+                    if (NotificationLite.isError(o)) {
+                        a.onError(NotificationLite.getError(o));
+                        rs.index = null;
+                        rs.cancelled = true;
+                        return;
                     }
 
                     a.onNext((T)o);
@@ -856,8 +850,6 @@ static final class SizeBoundReplayBuffer<T>
 
         Node<Object> tail;
 
-        volatile boolean done;
-
         SizeBoundReplayBuffer(int maxSize) {
             this.maxSize = maxSize;
             Node<Object> h = new Node<>(null);
@@ -895,7 +887,6 @@ public void addFinal(Object notificationLite) {
             t.lazySet(n); // releases both the tail and size
 
             trimHead();
-            done = true;
         }
 
         /**
@@ -1000,18 +991,17 @@ public void replay(ReplayDisposable<T> rs) {
 
                     Object o = n.value;
 
-                    if (done) {
-                        if (n.get() == null) {
-
-                            if (NotificationLite.isComplete(o)) {
-                                a.onComplete();
-                            } else {
-                                a.onError(NotificationLite.getError(o));
-                            }
-                            rs.index = null;
-                            rs.cancelled = true;
-                            return;
-                        }
+                    if (NotificationLite.isComplete(o)) {
+                        a.onComplete();
+                        rs.index = null;
+                        rs.cancelled = true;
+                        return;
+                    } else
+                    if (NotificationLite.isError(o)) {
+                        a.onError(NotificationLite.getError(o));
+                        rs.index = null;
+                        rs.cancelled = true;
+                        return;
                     }
 
                     a.onNext((T)o);
@@ -1069,8 +1059,6 @@ static final class SizeAndTimeBoundReplayBuffer<T>
 
         TimedNode<Object> tail;
 
-        volatile boolean done;
-
         SizeAndTimeBoundReplayBuffer(int maxSize, long maxAge, TimeUnit unit, Scheduler scheduler) {
             this.maxSize = maxSize;
             this.maxAge = maxAge;
@@ -1163,8 +1151,6 @@ public void addFinal(Object notificationLite) {
             size++;
             t.lazySet(n); // releases both the tail and size
             trimFinal();
-
-            done = true;
         }
 
         /**
@@ -1290,18 +1276,17 @@ public void replay(ReplayDisposable<T> rs) {
 
                     Object o = n.value;
 
-                    if (done) {
-                        if (n.get() == null) {
-
-                            if (NotificationLite.isComplete(o)) {
-                                a.onComplete();
-                            } else {
-                                a.onError(NotificationLite.getError(o));
-                            }
-                            rs.index = null;
-                            rs.cancelled = true;
-                            return;
-                        }
+                    if (NotificationLite.isComplete(o)) {
+                        a.onComplete();
+                        rs.index = null;
+                        rs.cancelled = true;
+                        return;
+                    } else
+                    if (NotificationLite.isError(o)) {
+                        a.onError(NotificationLite.getError(o));
+                        rs.index = null;
+                        rs.cancelled = true;
+                        return;
                     }
 
                     a.onNext((T)o);
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
index ba86c69719..1a1ceca926 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableAmbTest.java
@@ -402,7 +402,8 @@ public void disposed() {
 
     @Test
     public void manySources() {
-        Flowable<?>[] a = new Flowable[32];
+        @SuppressWarnings("unchecked")
+        Flowable<Object>[] a = new Flowable[32];
         Arrays.fill(a, Flowable.never());
         a[31] = Flowable.just(1);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
index 0a349cd417..5ec9129d9f 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableAmbTest.java
@@ -235,7 +235,8 @@ public void ambArraySingleElement() {
 
     @Test
     public void manySources() {
-        Observable<?>[] a = new Observable[32];
+        @SuppressWarnings("unchecked")
+        Observable<Object>[] a = new Observable[32];
         Arrays.fill(a, Observable.never());
         a[31] = Observable.just(1);
 
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
index 083ee46238..8086aa7c1c 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/single/SingleAmbTest.java
@@ -249,7 +249,8 @@ public void run() {
 
     @Test
     public void manySources() {
-        Single<?>[] sources = new Single[32];
+        @SuppressWarnings("unchecked")
+        Single<Object>[] sources = new Single[32];
         Arrays.fill(sources, Single.never());
         sources[31] = Single.just(31);
 
diff --git a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
index aa7026a9ff..35a877911b 100644
--- a/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
+++ b/src/test/java/io/reactivex/rxjava3/processors/ReplayProcessorTest.java
@@ -1832,4 +1832,69 @@ public void timeAndSizeRemoveCorrectNumberOfOld() {
 
         rp.test().assertValuesOnly(4, 5);
     }
-}
+
+    @Test
+    public void terminationSubscriptionRaceUnbounded() throws Throwable {
+        for (int i = 1; i <= 10000; i++) {
+            ReplayProcessor<String> source = ReplayProcessor.create();
+            PublishProcessor<String> sink = PublishProcessor.create();
+            TestSubscriber<String> subscriber = sink.test();
+            Schedulers.computation().scheduleDirect(() -> {
+                // issue signals to the source in adherence to the reactive streams specification
+                source.onSubscribe(new BooleanSubscription());
+                source.onNext("hello");
+                source.onNext("world");
+                source.onComplete();
+            });
+            Schedulers.computation().scheduleDirect(() -> {
+                // connect the source to the sink in parallel with the signals issued to the source
+                // note the cast() operator, which is here to detect non-String escapees
+                source.cast(String.class).subscribe(sink);
+            });
+            subscriber.await().assertValues("hello", "world").assertComplete();
+        }
+    }
+
+    @Test
+    public void terminationSubscriptionRaceSizeBound() throws Throwable {
+        for (int i = 1; i <= 10000; i++) {
+            ReplayProcessor<String> source = ReplayProcessor.createWithSize(20);
+            PublishProcessor<String> sink = PublishProcessor.create();
+            TestSubscriber<String> subscriber = sink.test();
+            Schedulers.computation().scheduleDirect(() -> {
+                // issue signals to the source in adherence to the reactive streams specification
+                source.onSubscribe(new BooleanSubscription());
+                source.onNext("hello");
+                source.onNext("world");
+                source.onComplete();
+            });
+            Schedulers.computation().scheduleDirect(() -> {
+                // connect the source to the sink in parallel with the signals issued to the source
+                // note the cast() operator, which is here to detect non-String escapees
+                source.cast(String.class).subscribe(sink);
+            });
+            subscriber.await().assertValues("hello", "world").assertComplete();
+        }
+    }
+
+    @Test
+    public void terminationSubscriptionRaceTimeBound() throws Throwable {
+        for (int i = 1; i <= 10000; i++) {
+            ReplayProcessor<String> source = ReplayProcessor.createWithTime(20, TimeUnit.MINUTES, Schedulers.computation());
+            PublishProcessor<String> sink = PublishProcessor.create();
+            TestSubscriber<String> subscriber = sink.test();
+            Schedulers.computation().scheduleDirect(() -> {
+                // issue signals to the source in adherence to the reactive streams specification
+                source.onSubscribe(new BooleanSubscription());
+                source.onNext("hello");
+                source.onNext("world");
+                source.onComplete();
+            });
+            Schedulers.computation().scheduleDirect(() -> {
+                // connect the source to the sink in parallel with the signals issued to the source
+                // note the cast() operator, which is here to detect non-String escapees
+                source.cast(String.class).subscribe(sink);
+            });
+            subscriber.await().assertValues("hello", "world").assertComplete();
+        }
+    }}
diff --git a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
index e752278b2f..8417b53081 100644
--- a/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
+++ b/src/test/java/io/reactivex/rxjava3/subjects/ReplaySubjectTest.java
@@ -1378,4 +1378,70 @@ public void timeAndSizeRemoveCorrectNumberOfOld() {
 
         rs.test().assertValuesOnly(4, 5);
     }
+
+    @Test
+    public void terminationSubscriptionRaceUnbounded() throws Throwable {
+        for (int i = 1; i <= 10000; i++) {
+            Subject<String> source = ReplaySubject.create();
+            Subject<String> sink = PublishSubject.create();
+            TestObserver<String> observer = sink.test();
+            Schedulers.computation().scheduleDirect(() -> {
+                // issue signals to the source in adherence to the reactive streams specification
+                source.onSubscribe(Disposable.empty());
+                source.onNext("hello");
+                source.onNext("world");
+                source.onComplete();
+            });
+            Schedulers.computation().scheduleDirect(() -> {
+                // connect the source to the sink in parallel with the signals issued to the source
+                // note the cast() operator, which is here to detect non-String escapees
+                source.cast(String.class).subscribe(sink);
+            });
+            observer.await().assertValues("hello", "world").assertComplete();
+        }
+    }
+
+    @Test
+    public void terminationSubscriptionRaceSizeBound() throws Throwable {
+        for (int i = 1; i <= 10000; i++) {
+            Subject<String> source = ReplaySubject.createWithSize(20);
+            Subject<String> sink = PublishSubject.create();
+            TestObserver<String> observer = sink.test();
+            Schedulers.computation().scheduleDirect(() -> {
+                // issue signals to the source in adherence to the reactive streams specification
+                source.onSubscribe(Disposable.empty());
+                source.onNext("hello");
+                source.onNext("world");
+                source.onComplete();
+            });
+            Schedulers.computation().scheduleDirect(() -> {
+                // connect the source to the sink in parallel with the signals issued to the source
+                // note the cast() operator, which is here to detect non-String escapees
+                source.cast(String.class).subscribe(sink);
+            });
+            observer.await().assertValues("hello", "world").assertComplete();
+        }
+    }
+
+    @Test
+    public void terminationSubscriptionRaceTimeBound() throws Throwable {
+        for (int i = 1; i <= 10000; i++) {
+            Subject<String> source = ReplaySubject.createWithTime(20, TimeUnit.MINUTES, Schedulers.computation());
+            Subject<String> sink = PublishSubject.create();
+            TestObserver<String> observer = sink.test();
+            Schedulers.computation().scheduleDirect(() -> {
+                // issue signals to the source in adherence to the reactive streams specification
+                source.onSubscribe(Disposable.empty());
+                source.onNext("hello");
+                source.onNext("world");
+                source.onComplete();
+            });
+            Schedulers.computation().scheduleDirect(() -> {
+                // connect the source to the sink in parallel with the signals issued to the source
+                // note the cast() operator, which is here to detect non-String escapees
+                source.cast(String.class).subscribe(sink);
+            });
+            observer.await().assertValues("hello", "world").assertComplete();
+        }
+    }
 }

From 0437b3746c32e367e1ebecb68e629ce18842020c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 08:04:08 +0200
Subject: [PATCH 618/665] chore(deps): bump github/codeql-action from 3.29.2 to
 3.29.3 (#7882)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.2 to 3.29.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/181d5eefc20863364f96762470ba6f862bdef56b...d6bbdef45e766d081b84a2def353b0055f728d3e)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 99129a1948..91c0865429 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@181d5eefc20863364f96762470ba6f862bdef56b # v3.29.2
+        uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
         with:
           sarif_file: results.sarif

From c06bb26ffd0eaffe4f87985665e08436c8e1c420 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 24 Jul 2025 08:36:32 +0200
Subject: [PATCH 619/665] chore(deps): bump github/codeql-action from 3.29.3 to
 3.29.4 (#7883)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.3 to 3.29.4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/d6bbdef45e766d081b84a2def353b0055f728d3e...4e828ff8d448a8a6e532957b1811f387a63867e8)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 91c0865429..0062fb8415 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
+        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
         with:
           sarif_file: results.sarif

From d5d1e3587fd829b8dfc7d0f1c8cca377edb5cc3c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 31 Jul 2025 10:11:15 +0200
Subject: [PATCH 620/665] chore(deps): bump github/codeql-action from 3.29.4 to
 3.29.5 (#7885)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.4 to 3.29.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4e828ff8d448a8a6e532957b1811f387a63867e8...51f77329afa6477de8c49fc9c7046c15b9a4e79d)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 0062fb8415..2a4d09a629 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4e828ff8d448a8a6e532957b1811f387a63867e8 # v3.29.4
+        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
         with:
           sarif_file: results.sarif

From 1bb2dbecbf06af3dbbbe713a5d24d9609b0a074b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 8 Aug 2025 07:06:13 +0200
Subject: [PATCH 621/665] chore(deps): bump actions/cache from 4.2.3 to 4.2.4
 (#7886)

Bumps [actions/cache](https://github.com/actions/cache) from 4.2.3 to 4.2.4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/5a3ec84eff668545956fd18022155c47e93e2684...0400d5f644dc74513175e3cd8d07132dd4860809)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: 4.2.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index f791da3db8..9b0170d76d 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 829b45be6a..a52eb5d805 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -27,7 +27,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index b0198af0a1..ab3ff3b106 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 6b1337d6d1..cedb3d7bb7 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 168e213955..87de32b79e 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
+      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From f591cf800092ef75dcc12c00b5f0d39b1bfc2cc0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 11 Aug 2025 09:45:43 +0200
Subject: [PATCH 622/665] chore(deps): bump github/codeql-action from 3.29.7 to
 3.29.8 (#7887)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.7 to 3.29.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/51f77329afa6477de8c49fc9c7046c15b9a4e79d...76621b61decf072c1cee8dd1ce2d2a82d33c17ed)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2a4d09a629..b4bfd792a2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
+        uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
         with:
           sarif_file: results.sarif

From e24e47d2b433ec4321d190c70dd0d83772b28165 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 12 Aug 2025 13:53:45 +0200
Subject: [PATCH 623/665] chore(deps): bump actions/checkout from 4.2.2 to
 5.0.0 (#7889)

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.2 to 5.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/11bd71901bbe5b1630ceea73d27597364c9af683...08c6903cd8c0fde910a37f88322edcfb5dd907a8)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 44e5c1a692..3bb843889a 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
       - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 9b0170d76d..eb2e27ff3f 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index a52eb5d805..f75b15f375 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -20,7 +20,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index ab3ff3b106..d913ce00f3 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index cedb3d7bb7..a4157ac2c2 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 87de32b79e..670fa12dce 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b4bfd792a2..2b96bda79a 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

From e71e4c08df50d8d0111d6386161df184fca0f362 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Aug 2025 08:05:43 +0200
Subject: [PATCH 624/665] chore(deps): bump github/codeql-action from 3.29.8 to
 3.29.9 (#7892)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.8 to 3.29.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/76621b61decf072c1cee8dd1ce2d2a82d33c17ed...df559355d593797519d70b90fc8edd5db049e7a2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2b96bda79a..3198f8cc4a 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@76621b61decf072c1cee8dd1ce2d2a82d33c17ed # v3.29.5
+        uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.5
         with:
           sarif_file: results.sarif

From 1b359adf0133c7a9f04fecaaceaa076f9f225567 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 17:11:41 +0200
Subject: [PATCH 625/665] chore(deps): bump github/codeql-action from 3.29.9 to
 3.29.10 (#7894)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.9 to 3.29.10.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/df559355d593797519d70b90fc8edd5db049e7a2...96f518a34f7a870018057716cc4d7a5c014bd61c)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.10
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 3198f8cc4a..314f2a4fbc 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@df559355d593797519d70b90fc8edd5db049e7a2 # v3.29.5
+        uses: github/codeql-action/upload-sarif@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.5
         with:
           sarif_file: results.sarif

From 568b8ac4a79267a79775d7478b2fbc713d58364c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Aug 2025 07:05:03 +0200
Subject: [PATCH 626/665] chore(deps): bump actions/setup-java from 4.7.1 to
 5.0.0 (#7896)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 4.7.1 to 5.0.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/c5195efecf7bdfc987ee8bae7a71cb8b11521c00...dded0888837ed1f317902acf8a20df0ad188d165)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index eb2e27ff3f..24dd5c4fbe 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index f75b15f375..2faf86f474 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index d913ce00f3..ae2f62bcec 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index a4157ac2c2..2e044eab61 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 670fa12dce..f8b31f3dc3 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK 11
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         distribution: 'zulu'
         java-version: '11'

From a0dc1946d04db4eb7206f9e54710597b32092ffe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Aug 2025 07:05:11 +0200
Subject: [PATCH 627/665] chore(deps): bump codecov/codecov-action from 4.6.0
 to 5.5.0 (#7895)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 4.6.0 to 5.5.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238...fdcc8476540edceab3de004e990f80d881c6cc00)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: 5.5.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 24dd5c4fbe..6641152e81 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
+      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index ae2f62bcec..425044e7da 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
+      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 2e044eab61..fdf704e71b 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
+      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
 #    - name: Upload release
 #      run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
 #      env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index f8b31f3dc3..eb98215bea 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 # v4.6.0
+      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From d06a16ed81ea58a175024c078e803ea03fe246a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Aug 2025 08:57:27 +0200
Subject: [PATCH 628/665] chore(deps): bump github/codeql-action from 3.29.10
 to 3.29.11 (#7897)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.10 to 3.29.11.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/96f518a34f7a870018057716cc4d7a5c014bd61c...3c3833e0f8c1c83d449a7478aa59c036a9165498)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.29.11
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 314f2a4fbc..8a0ce95acb 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@96f518a34f7a870018057716cc4d7a5c014bd61c # v3.29.5
+        uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
         with:
           sarif_file: results.sarif

From a7c809aaa389cf22a1b3d4dd5f91c243c1e81a68 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Sep 2025 07:29:06 +0200
Subject: [PATCH 629/665] chore(deps): bump github/codeql-action from 3.29.11
 to 3.30.0 (#7899)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.29.11 to 3.30.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/3c3833e0f8c1c83d449a7478aa59c036a9165498...2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.30.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 8a0ce95acb..fc42971603 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@3c3833e0f8c1c83d449a7478aa59c036a9165498 # v3.29.5
+        uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
         with:
           sarif_file: results.sarif

From 599202e07fab34b8a80d1f982b534861cfcc6774 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Sep 2025 07:24:13 +0200
Subject: [PATCH 630/665] chore(deps): bump codecov/codecov-action from 5.5.0
 to 5.5.1 (#7900)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.5.0 to 5.5.1.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/fdcc8476540edceab3de004e990f80d881c6cc00...5a1091511ad55cbe89839c7260b706298ca349f7)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: 5.5.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 6641152e81..9668cf468f 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 425044e7da..2ede4289f9 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index fdf704e71b..2b2140e242 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
 #    - name: Upload release
 #      run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
 #      env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index eb98215bea..dfb2e4df81 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@fdcc8476540edceab3de004e990f80d881c6cc00 # v5.5.0
+      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 7f49c5b3ca441c766e311839eaafa425fafbf2da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Sep 2025 07:19:47 +0200
Subject: [PATCH 631/665] chore(deps): bump github/codeql-action from 3.30.0 to
 3.30.1 (#7901)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.0 to 3.30.1.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d...f1f6e5f6af878fb37288ce1c627459e94dbf7d01)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.30.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index fc42971603..f9c25a7430 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2d92b76c45b91eb80fc44c74ce3fce0ee94e8f9d # v3.29.5
+        uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
         with:
           sarif_file: results.sarif

From 89f1e52d88fca5461f6a6080a5ff64d011498298 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Sep 2025 07:54:21 +0200
Subject: [PATCH 632/665] chore(deps): bump github/codeql-action from 3.30.1 to
 3.30.2 (#7902)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.1 to 3.30.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f1f6e5f6af878fb37288ce1c627459e94dbf7d01...d3678e237b9c32a6c9bffb3315c335f976f3549f)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.30.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f9c25a7430..610852b438 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
+        uses: github/codeql-action/upload-sarif@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.29.5
         with:
           sarif_file: results.sarif

From 6bb25c157e61db39506a70aa95d90f4bec3a8703 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 11 Sep 2025 07:33:34 +0200
Subject: [PATCH 633/665] chore(deps): bump github/codeql-action from 3.30.2 to
 3.30.3 (#7903)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.2 to 3.30.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/d3678e237b9c32a6c9bffb3315c335f976f3549f...192325c86100d080feab897ff886c34abd4c83a3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.30.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 610852b438..1273abd8dc 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@d3678e237b9c32a6c9bffb3315c335f976f3549f # v3.29.5
+        uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
         with:
           sarif_file: results.sarif

From 70e145bc0b96b65243741db7491091662a3ad7a5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 18 Sep 2025 07:55:48 +0200
Subject: [PATCH 634/665] chore(deps): bump com.google.guava:guava from
 33.4.8-jre to 33.5.0-jre (#7904)

Bumps [com.google.guava:guava](https://github.com/google/guava) from 33.4.8-jre to 33.5.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

---
updated-dependencies:
- dependency-name: com.google.guava:guava
  dependency-version: 33.5.0-jre
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4067abf168..813e011299 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ ext {
     testNgVersion = "7.5"
     mockitoVersion = "4.11.0"
     jmhLibVersion = "1.21"
-    guavaVersion = "33.4.8-jre"
+    guavaVersion = "33.5.0-jre"
 }
 
 def releaseTag = System.getenv("BUILD_TAG")

From 9cd6b9ebb458e1ebd713abdec1ae7a76d61c510d Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Fri, 19 Sep 2025 12:50:49 +0200
Subject: [PATCH 635/665] Update Additional-Reading.md

fix dead link
---
 docs/Additional-Reading.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/Additional-Reading.md b/docs/Additional-Reading.md
index 85e7d47077..4badd81308 100644
--- a/docs/Additional-Reading.md
+++ b/docs/Additional-Reading.md
@@ -3,7 +3,7 @@ A more complete and up-to-date list of resources can be found at the [reactivex.
 # Introducing Reactive Programming
 * [Introduction to Rx](http://www.introtorx.com/): a free, on-line book by Lee Campbell **(1.x)**
 * [The introduction to Reactive Programming you've been missing](https://gist.github.com/staltz/868e7e9bc2a7b8c1f754) by Andre Staltz
-* [Mastering Observables](http://docs.couchbase.com/developer/java-2.0/observables.html) from the Couchbase documentation **(1.x)**
+* [Mastering Observables](https://docs.huihoo.com/couchbase/developer-guide/java-2.0/observables.html) from the Couchbase documentation **(1.x)**
 * [Reactive Programming in Java 8 With RxJava](http://pluralsight.com/training/Courses/TableOfContents/reactive-programming-java-8-rxjava), a course designed by Russell Elledge **(1.x)**
 * [33rd Degree Reactive Java](http://www.slideshare.net/tkowalcz/33rd-degree-reactive-java) by Tomasz Kowalczewski **(1.x)**
 * [What Every Hipster Should Know About Functional Reactive Programming](http://www.infoq.com/presentations/game-functional-reactive-programming) - Bodil Stokke demos the creation of interactive game mechanics in RxJS

From 2e066505a104f3326bb31a960047b0c183b3d027 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 22 Sep 2025 18:46:21 +0200
Subject: [PATCH 636/665] Update build.gradle

Add JPMS module version

Related: #7906
---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 813e011299..8bcfddb717 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,6 +99,7 @@ animalsniffer {
 moduleConfig {
     moduleInfoPath = 'src/main/module/module-info.java'
     multiReleaseVersion = 9
+	version = project.version
 }
 
 jar {

From 2bb2f1dd7556fc96dcc27eeb19214ca8fe896e1c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Sep 2025 08:36:47 +0200
Subject: [PATCH 637/665] chore(deps): bump actions/cache from 4.2.4 to 4.3.0
 (#7907)

Bumps [actions/cache](https://github.com/actions/cache) from 4.2.4 to 4.3.0.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/0400d5f644dc74513175e3cd8d07132dd4860809...0057852bfaa89a56745cba8c7296529d2fc39830)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: 4.3.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 9668cf468f..8fd55412ec 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 2faf86f474..5eed0fa3da 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -27,7 +27,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 2ede4289f9..ba0bc523ad 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 2b2140e242..4c65fc24ed 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index dfb2e4df81..4a29e0757a 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From fd65ac59590772385efb06ae200d0cd9d85d028f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 26 Sep 2025 08:54:23 +0200
Subject: [PATCH 638/665] chore(deps): bump github/codeql-action from 3.30.3 to
 3.30.4 (#7908)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.3 to 3.30.4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/192325c86100d080feab897ff886c34abd4c83a3...303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.30.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 1273abd8dc..fa9ad404f0 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
+        uses: github/codeql-action/upload-sarif@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.29.5
         with:
           sarif_file: results.sarif

From c6933da71d0dce9da443ba339ab4bd45503cac11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Sep 2025 06:34:24 +0200
Subject: [PATCH 639/665] chore(deps): bump github/codeql-action from 3.30.4 to
 3.30.5 (#7909)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.4 to 3.30.5.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9...3599b3baa15b485a2e49ef411a7a4bb2452e7f93)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.30.5
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index fa9ad404f0..c3cce41ebb 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@303c0aef88fc2fe5ff6d63d3b1596bfd83dfa1f9 # v3.29.5
+        uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
         with:
           sarif_file: results.sarif

From f07765edac25ccc110802add8a879d77208f09b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 1 Oct 2025 08:40:07 +0200
Subject: [PATCH 640/665] chore(deps): bump ossf/scorecard-action from 2.4.2 to
 2.4.3 (#7910)

Bumps [ossf/scorecard-action](https://github.com/ossf/scorecard-action) from 2.4.2 to 2.4.3.
- [Release notes](https://github.com/ossf/scorecard-action/releases)
- [Changelog](https://github.com/ossf/scorecard-action/blob/main/RELEASE.md)
- [Commits](https://github.com/ossf/scorecard-action/compare/05b42c624433fc40578a4040d5cf5e36ddca8cde...4eaacf0543bb3f2c246792bd56e8cdeffafb205a)

---
updated-dependencies:
- dependency-name: ossf/scorecard-action
  dependency-version: 2.4.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c3cce41ebb..a37cfef227 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif

From 30b1c8022dc1c241e5eb6fc8a1c90ceddefdd18d Mon Sep 17 00:00:00 2001
From: joepembe <joepembe@amazon.com>
Date: Mon, 6 Oct 2025 00:28:33 -0700
Subject: [PATCH 641/665] Fix ObservableCache GC issue (#7911)

* Fix ObservableCache GC issue

`ObservableCache` retains strong references to every event issued by its upstream source via its `head` field. These references remain reachable for the entire duration of the subscription, even if application code does not retain its own reference to the `ObservableCache` instance. This occurs because `ObservableCache` is currently the object that `implements Observer<T>` and is subscribed to the upstream `source`, which means that the source _must_ retain a reference to the `ObservableCache` until the subscription is either disposed of or reaches a terminal state. As a result, every cached `T` value remains reachable for the duration of the subscription to `source`, even if the application no longer retains the ability to issue new subscriptions to the `ObservableCache` instance.

This change fixes this issue by:

1. Splitting the `Observable` and `Observer` surfaces of `ObservableCache` into two distinct objects (`ObservableCache` which extends `Observable`, and `ObservableCache.Multicaster` which implements `Observer`)
2. Having only `ObservableCache` retain a reference to the `head`
3. Having only `ObservableCache.Multicaster` retain a reference to the current `tail`
4. Setting `Multicaster.tail` to `null` upon receipt of the upstream's terminal event

With this change, when `ObservableCache` goes out of scope, the only remaining references to the nodes of the linked list are `Multicaster.tail` and `CacheDisposable.node`. As subscribed `CacheDisposable` instances advance through the linked list, its nodes progressively become reclaimable, and eventually become fully reclaimable once the terminal event has been issued to all subscribers.

* Rewrite unit test to simply inflate heap

* Clean up imports

* Inline AtomicReference, delete unused class
---
 .../operators/observable/ObservableCache.java | 431 +++++++++---------
 .../observable/ObservableCacheTest.java       |  53 +++
 2 files changed, 277 insertions(+), 207 deletions(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
index daa9edd533..d2e74aefb8 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
@@ -24,23 +24,7 @@
  *
  * @param <T> the source element type
  */
-public final class ObservableCache<T> extends AbstractObservableWithUpstream<T, T>
-implements Observer<T> {
-
-    /**
-     * The subscription to the source should happen at most once.
-     */
-    final AtomicBoolean once;
-
-    /**
-     * The number of items per cached nodes.
-     */
-    final int capacityHint;
-
-    /**
-     * The current known array of observer state to notify.
-     */
-    final AtomicReference<CacheDisposable<T>[]> observers;
+public final class ObservableCache<T> extends AbstractObservableWithUpstream<T, T> {
 
     /**
      * A shared instance of an empty array of observers to avoid creating
@@ -56,61 +40,49 @@ public final class ObservableCache<T> extends AbstractObservableWithUpstream<T,
     static final CacheDisposable[] TERMINATED = new CacheDisposable[0];
 
     /**
-     * The total number of elements in the list available for reads.
-     */
-    volatile long size;
-
-    /**
-     * The starting point of the cached items.
-     */
-    final Node<T> head;
-
-    /**
-     * The current tail of the linked structure holding the items.
-     */
-    Node<T> tail;
-
-    /**
-     * How many items have been put into the tail node so far.
+     * The subscription to the source should happen at most once.
      */
-    int tailOffset;
+    final AtomicBoolean once;
 
     /**
-     * If {@link #observers} is {@link #TERMINATED}, this holds the terminal error if not null.
+     * Responsible caching events from the source and multicasting them to each downstream.
      */
-    Throwable error;
+    final Multicaster<T>  multicaster;
 
     /**
-     * True if the source has terminated.
+     * The first node in a singly linked list. Each node has the capacity to hold a specific number of events, and each
+     * points exclusively to the <em>next</em> node (if present). When a new downstream arrives, the subscription is
+     * initialized with a reference to the "head" node, and any events present in the linked list are replayed. As
+     * events are replayed to the new downstream, its 'node' reference advances through the linked list, discarding each
+     * node reference once all events in that node have been replayed. Consequently, once {@code this} instance goes out
+     * of scope, the prefix of nodes up to the first node that is still being replayed becomes unreachable and eligible
+     * for collection.
      */
-    volatile boolean done;
+    final Node<T> head;
 
     /**
      * Constructs an empty, non-connected cache.
      * @param source the source to subscribe to for the first incoming observer
      * @param capacityHint the number of items expected (reduce allocation frequency)
      */
-    @SuppressWarnings("unchecked")
     public ObservableCache(Observable<T> source, int capacityHint) {
         super(source);
-        this.capacityHint = capacityHint;
         this.once = new AtomicBoolean();
         Node<T> n = new Node<>(capacityHint);
         this.head = n;
-        this.tail = n;
-        this.observers = new AtomicReference<>(EMPTY);
+        this.multicaster = new Multicaster<>(capacityHint, n);
     }
 
     @Override
     protected void subscribeActual(Observer<? super T> t) {
-        CacheDisposable<T> consumer = new CacheDisposable<>(t, this);
+        CacheDisposable<T> consumer = new CacheDisposable<>(t, multicaster, head);
         t.onSubscribe(consumer);
-        add(consumer);
+        multicaster.add(consumer);
 
         if (!once.get() && once.compareAndSet(false, true)) {
-            source.subscribe(this);
+            source.subscribe(multicaster);
         } else {
-            replay(consumer);
+            multicaster.replay(consumer);
         }
     }
 
@@ -127,7 +99,7 @@ protected void subscribeActual(Observer<? super T> t) {
      * @return true if the cache has observers
      */
     /* public */ boolean hasObservers() {
-        return observers.get().length != 0;
+        return multicaster.get().length != 0;
     }
 
     /**
@@ -135,194 +107,238 @@ protected void subscribeActual(Observer<? super T> t) {
      * @return the number of currently cached event count
      */
     /* public */ long cachedEventCount() {
-        return size;
+        return multicaster.size;
     }
 
-    /**
-     * Atomically adds the consumer to the {@link #observers} copy-on-write array
-     * if the source has not yet terminated.
-     * @param consumer the consumer to add
-     */
-    void add(CacheDisposable<T> consumer) {
-        for (;;) {
-            CacheDisposable<T>[] current = observers.get();
-            if (current == TERMINATED) {
-                return;
-            }
-            int n = current.length;
+    static final class Multicaster<T> extends AtomicReference<CacheDisposable<T>[]> implements Observer<T> {
 
-            @SuppressWarnings("unchecked")
-            CacheDisposable<T>[] next = new CacheDisposable[n + 1];
-            System.arraycopy(current, 0, next, 0, n);
-            next[n] = consumer;
+        /**
+         * The number of items per cached nodes.
+         */
+        final int capacityHint;
 
-            if (observers.compareAndSet(current, next)) {
-                return;
-            }
-        }
-    }
+        /**
+         * The total number of elements in the list available for reads.
+         */
+        volatile long size;
 
-    /**
-     * Atomically removes the consumer from the {@link #observers} copy-on-write array.
-     * @param consumer the consumer to remove
-     */
-    @SuppressWarnings("unchecked")
-    void remove(CacheDisposable<T> consumer) {
-        for (;;) {
-            CacheDisposable<T>[] current = observers.get();
-            int n = current.length;
-            if (n == 0) {
-                return;
-            }
+        /**
+         * The current tail of the linked structure holding the items.
+         */
+        Node<T> tail;
 
-            int j = -1;
-            for (int i = 0; i < n; i++) {
-                if (current[i] == consumer) {
-                    j = i;
-                    break;
-                }
-            }
+        /**
+         * How many items have been put into the tail node so far.
+         */
+        int tailOffset;
 
-            if (j < 0) {
-                return;
-            }
-            CacheDisposable<T>[] next;
+        /**
+         * If the observers are {@link #TERMINATED}, this holds the terminal error if not null.
+         */
+        Throwable error;
 
-            if (n == 1) {
-                next = EMPTY;
-            } else {
-                next = new CacheDisposable[n - 1];
-                System.arraycopy(current, 0, next, 0, j);
-                System.arraycopy(current, j + 1, next, j, n - j - 1);
-            }
+        /**
+         * True if the source has terminated.
+         */
+        volatile boolean done;
 
-            if (observers.compareAndSet(current, next)) {
-                return;
-            }
+        @SuppressWarnings("unchecked")
+        Multicaster(int capacityHint, final Node<T> head) {
+            super(EMPTY);
+            this.tail = head;
+            this.capacityHint = capacityHint;
         }
-    }
 
-    /**
-     * Replays the contents of this cache to the given consumer based on its
-     * current state and number of items requested by it.
-     * @param consumer the consumer to continue replaying items to
-     */
-    void replay(CacheDisposable<T> consumer) {
-        // make sure there is only one replay going on at a time
-        if (consumer.getAndIncrement() != 0) {
-            return;
-        }
+        /**
+         * Atomically adds the consumer to the observers copy-on-write array
+         * if the source has not yet terminated.
+         * @param consumer the consumer to add
+         */
+        void add(CacheDisposable<T> consumer) {
+            for (;;) {
+                CacheDisposable<T>[] current = get();
+                if (current == TERMINATED) {
+                    return;
+                }
+                int n = current.length;
 
-        // see if there were more replay request in the meantime
-        int missed = 1;
-        // read out state into locals upfront to avoid being re-read due to volatile reads
-        long index = consumer.index;
-        int offset = consumer.offset;
-        Node<T> node = consumer.node;
-        Observer<? super T> downstream = consumer.downstream;
-        int capacity = capacityHint;
-
-        for (;;) {
-            // if the consumer got disposed, clear the node and quit
-            if (consumer.disposed) {
-                consumer.node = null;
-                return;
+                @SuppressWarnings("unchecked")
+                CacheDisposable<T>[] next = new CacheDisposable[n + 1];
+                System.arraycopy(current, 0, next, 0, n);
+                next[n] = consumer;
+
+                if (compareAndSet(current, next)) {
+                    return;
+                }
             }
+        }
+
+        /**
+         * Atomically removes the consumer from the observers copy-on-write array.
+         * @param consumer the consumer to remove
+         */
+        @SuppressWarnings("unchecked")
+        void remove(CacheDisposable<T> consumer) {
+            for (;;) {
+                CacheDisposable<T>[] current = get();
+                int n = current.length;
+                if (n == 0) {
+                    return;
+                }
+
+                int j = -1;
+                for (int i = 0; i < n; i++) {
+                    if (current[i] == consumer) {
+                        j = i;
+                        break;
+                    }
+                }
+
+                if (j < 0) {
+                    return;
+                }
+                CacheDisposable<T>[] next;
 
-            // first see if the source has terminated, read order matters!
-            boolean sourceDone = done;
-            // and if the number of items is the same as this consumer has received
-            boolean empty = size == index;
-
-            // if the source is done and we have all items so far, terminate the consumer
-            if (sourceDone && empty) {
-                // release the node object to avoid leaks through retained consumers
-                consumer.node = null;
-                // if error is not null then the source failed
-                Throwable ex = error;
-                if (ex != null) {
-                    downstream.onError(ex);
+                if (n == 1) {
+                    next = EMPTY;
                 } else {
-                    downstream.onComplete();
+                    next = new CacheDisposable[n - 1];
+                    System.arraycopy(current, 0, next, 0, j);
+                    System.arraycopy(current, j + 1, next, j, n - j - 1);
                 }
+
+                if (compareAndSet(current, next)) {
+                    return;
+                }
+            }
+        }
+
+        /**
+         * Replays the contents of this cache to the given consumer based on its
+         * current state and number of items requested by it.
+         * @param consumer the consumer to continue replaying items to
+         */
+        void replay(CacheDisposable<T> consumer) {
+            // make sure there is only one replay going on at a time
+            if (consumer.getAndIncrement() != 0) {
                 return;
             }
 
-            // there are still items not sent to the consumer
-            if (!empty) {
-             // if the offset in the current node has reached the node capacity
-                if (offset == capacity) {
-                    // switch to the subsequent node
-                    node = node.next;
-                    // reset the in-node offset
-                    offset = 0;
+            // see if there were more replay request in the meantime
+            int missed = 1;
+            // read out state into locals upfront to avoid being re-read due to volatile reads
+            long index = consumer.index;
+            int offset = consumer.offset;
+            Node<T> node = consumer.node;
+            Observer<? super T> downstream = consumer.downstream;
+            int capacity = capacityHint;
+
+            for (;;) {
+                // if the consumer got disposed, clear the node and quit
+                if (consumer.disposed) {
+                    consumer.node = null;
+                    return;
                 }
 
-                // emit the cached item
-                downstream.onNext(node.values[offset]);
-
-                // move the node offset forward
-                offset++;
-                // move the total consumed item count forward
-                index++;
+                // first see if the source has terminated, read order matters!
+                boolean sourceDone = done;
+                // and if the number of items is the same as this consumer has received
+                boolean empty = size == index;
+
+                // if the source is done and we have all items so far, terminate the consumer
+                if (sourceDone && empty) {
+                    // release the node object to avoid leaks through retained consumers
+                    consumer.node = null;
+                    // if error is not null then the source failed
+                    Throwable ex = error;
+                    if (ex != null) {
+                        downstream.onError(ex);
+                    } else {
+                        downstream.onComplete();
+                    }
+                    return;
+                }
 
-                // retry for the next item/terminal event if any
-                continue;
-            }
+                // there are still items not sent to the consumer
+                if (!empty) {
+                 // if the offset in the current node has reached the node capacity
+                    if (offset == capacity) {
+                        // switch to the subsequent node
+                        node = node.next;
+                        // reset the in-node offset
+                        offset = 0;
+                    }
+
+                    // emit the cached item
+                    downstream.onNext(node.values[offset]);
+
+                    // move the node offset forward
+                    offset++;
+                    // move the total consumed item count forward
+                    index++;
+
+                    // retry for the next item/terminal event if any
+                    continue;
+                }
 
-            // commit the changed references back
-            consumer.index = index;
-            consumer.offset = offset;
-            consumer.node = node;
-            // release the changes and see if there were more replay request in the meantime
-            missed = consumer.addAndGet(-missed);
-            if (missed == 0) {
-                break;
+                // commit the changed references back
+                consumer.index = index;
+                consumer.offset = offset;
+                consumer.node = node;
+                // release the changes and see if there were more replay request in the meantime
+                missed = consumer.addAndGet(-missed);
+                if (missed == 0) {
+                    break;
+                }
             }
         }
-    }
 
-    @Override
-    public void onSubscribe(Disposable d) {
-        // we can't do much with the upstream disposable
-    }
-
-    @Override
-    public void onNext(T t) {
-        int tailOffset = this.tailOffset;
-        // if the current tail node is full, create a fresh node
-        if (tailOffset == capacityHint) {
-            Node<T> n = new Node<>(tailOffset);
-            n.values[0] = t;
-            this.tailOffset = 1;
-            tail.next = n;
-            tail = n;
-        } else {
-            tail.values[tailOffset] = t;
-            this.tailOffset = tailOffset + 1;
+        @Override
+        public void onSubscribe(Disposable d) {
+            // we can't do much with the upstream disposable
         }
-        size++;
-        for (CacheDisposable<T> consumer : observers.get()) {
-            replay(consumer);
+
+        @Override
+        public void onNext(T t) {
+            int tailOffset = this.tailOffset;
+            // if the current tail node is full, create a fresh node
+            if (tailOffset == capacityHint) {
+                Node<T> n = new Node<>(tailOffset);
+                n.values[0] = t;
+                this.tailOffset = 1;
+                tail.next = n;
+                tail = n;
+            } else {
+                tail.values[tailOffset] = t;
+                this.tailOffset = tailOffset + 1;
+            }
+            size++;
+            for (CacheDisposable<T> consumer : get()) {
+                replay(consumer);
+            }
         }
-    }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public void onError(Throwable t) {
-        error = t;
-        done = true;
-        for (CacheDisposable<T> consumer : observers.getAndSet(TERMINATED)) {
-            replay(consumer);
+        @SuppressWarnings("unchecked")
+        @Override
+        public void onError(Throwable t) {
+            error = t;
+            done = true;
+            // No additional events will arrive, so now we can clear the 'tail' reference
+            tail = null;
+            for (CacheDisposable<T> consumer : getAndSet(TERMINATED)) {
+                replay(consumer);
+            }
         }
-    }
 
-    @SuppressWarnings("unchecked")
-    @Override
-    public void onComplete() {
-        done = true;
-        for (CacheDisposable<T> consumer : observers.getAndSet(TERMINATED)) {
-            replay(consumer);
+        @SuppressWarnings("unchecked")
+        @Override
+        public void onComplete() {
+            done = true;
+            // No additional events will arrive, so now we can clear the 'tail' reference
+            tail = null;
+            for (CacheDisposable<T> consumer : getAndSet(TERMINATED)) {
+                replay(consumer);
+            }
         }
     }
 
@@ -338,7 +354,7 @@ static final class CacheDisposable<T> extends AtomicInteger
 
         final Observer<? super T> downstream;
 
-        final ObservableCache<T> parent;
+        final Multicaster<T> parent;
 
         Node<T> node;
 
@@ -353,11 +369,12 @@ static final class CacheDisposable<T> extends AtomicInteger
          * the parent cache object.
          * @param downstream the actual consumer
          * @param parent the parent that holds onto the cached items
+         * @param head the first node in the linked list
          */
-        CacheDisposable(Observer<? super T> downstream, ObservableCache<T> parent) {
+        CacheDisposable(Observer<? super T> downstream, Multicaster<T> parent, Node<T> head) {
             this.downstream = downstream;
             this.parent = parent;
-            this.node = parent.head;
+            this.node = head;
         }
 
         @Override
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
index 7f47ec95d8..74d17c062b 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCacheTest.java
@@ -16,10 +16,15 @@
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryMXBean;
+import java.lang.management.MemoryUsage;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
+import io.reactivex.rxjava3.observables.ConnectableObservable;
 import org.junit.Test;
 
 import io.reactivex.rxjava3.core.*;
@@ -355,4 +360,52 @@ public void addRemoveRace() {
             );
         }
     }
+
+    @Test
+    public void valuesAreReclaimable() throws Exception {
+        ConnectableObservable<byte[]> source =
+                Observable.range(0, 200)
+                        .map($ -> new byte[1024 * 1024])
+                        .publish();
+
+        System.out.println("Bounded Replay Leak check: Wait before GC");
+        Thread.sleep(1000);
+
+        System.out.println("Bounded Replay Leak check: GC");
+        System.gc();
+
+        Thread.sleep(500);
+
+        final MemoryMXBean memoryMXBean = ManagementFactory.getMemoryMXBean();
+        MemoryUsage memHeap = memoryMXBean.getHeapMemoryUsage();
+        long initial = memHeap.getUsed();
+
+        System.out.printf("Bounded Replay Leak check: Starting: %.3f MB%n", initial / 1024.0 / 1024.0);
+
+        final AtomicLong after = new AtomicLong();
+
+        source.cache().lastElement().subscribe(new Consumer<byte[]>() {
+            @Override
+            public void accept(byte[] v) throws Exception {
+                System.out.println("Bounded Replay Leak check: Wait before GC 2");
+                Thread.sleep(1000);
+
+                System.out.println("Bounded Replay Leak check:  GC 2");
+                System.gc();
+
+                Thread.sleep(500);
+
+                after.set(memoryMXBean.getHeapMemoryUsage().getUsed());
+            }
+        });
+
+        source.connect();
+
+        System.out.printf("Bounded Replay Leak check: After: %.3f MB%n", after.get() / 1024.0 / 1024.0);
+
+        if (initial + 100 * 1024 * 1024 < after.get()) {
+            fail("Bounded Replay Leak check: Memory leak detected: " + (initial / 1024.0 / 1024.0)
+                    + " -> " + after.get() / 1024.0 / 1024.0);
+        }
+    }
 }

From 449ac8087e9ef975e25f31c2c384ce83aa3b63b1 Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 6 Oct 2025 10:20:44 +0200
Subject: [PATCH 642/665] Eclipse 2025-09 type inference bug workaround (#7914)

It's silly. The first wildcard use breaks other wildcard uses. Fixing
the first occurrence by removing the wildcard often lets the other
wildcard uses compile.

https://github.com/eclipse-jdt/eclipse.jdt.core/issues/4332
https://github.com/eclipse-jdt/eclipse.jdt.core/issues/4402
---
 .../io/reactivex/rxjava3/core/BinaryFlatMapPerf.java | 12 ++++++------
 .../rxjava3/xmapz/FlowableConcatMapMaybePerf.java    |  4 ++--
 .../rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java |  4 ++--
 .../rxjava3/xmapz/FlowableFlatMapMaybePerf.java      |  4 ++--
 .../rxjava3/xmapz/FlowableFlatMapSinglePerf.java     |  4 ++--
 .../xmapz/FlowableSwitchMapMaybeEmptyPerf.java       |  4 ++--
 .../rxjava3/xmapz/FlowableSwitchMapMaybePerf.java    |  4 ++--
 .../rxjava3/xmapz/FlowableSwitchMapSinglePerf.java   |  4 ++--
 .../xmapz/ObservableConcatMapCompletablePerf.java    |  4 ++--
 .../xmapz/ObservableConcatMapMaybeEmptyPerf.java     |  4 ++--
 .../rxjava3/xmapz/ObservableConcatMapMaybePerf.java  |  4 ++--
 .../rxjava3/xmapz/ObservableConcatMapSinglePerf.java |  4 ++--
 .../xmapz/ObservableFlatMapCompletablePerf.java      |  4 ++--
 .../xmapz/ObservableFlatMapMaybeEmptyPerf.java       |  4 ++--
 .../rxjava3/xmapz/ObservableFlatMapMaybePerf.java    |  4 ++--
 .../rxjava3/xmapz/ObservableFlatMapSinglePerf.java   |  4 ++--
 .../xmapz/ObservableSwitchMapCompletablePerf.java    |  4 ++--
 .../xmapz/ObservableSwitchMapMaybeEmptyPerf.java     |  4 ++--
 .../rxjava3/xmapz/ObservableSwitchMapMaybePerf.java  |  4 ++--
 .../rxjava3/xmapz/ObservableSwitchMapSinglePerf.java |  4 ++--
 .../operators/observable/ObservableCache.java        |  3 +++
 .../internal/operators/flowable/FlowableZipTest.java |  2 +-
 .../operators/observable/ObservableBufferTest.java   |  4 ++--
 .../operators/observable/ObservableZipTest.java      |  2 +-
 24 files changed, 51 insertions(+), 48 deletions(-)

diff --git a/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java b/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java
index c4a0a385a5..6e6ae7e3c6 100644
--- a/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/core/BinaryFlatMapPerf.java
@@ -139,9 +139,9 @@ public Observable<? extends Integer> apply(Integer v) {
             }
         });
 
-        singleFlatMapHideObservable = Single.just(1).flatMapObservable(new Function<Integer, Observable<? extends Integer>>() {
+        singleFlatMapHideObservable = Single.just(1).flatMapObservable(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return arrayObservableHide;
             }
         });
@@ -153,16 +153,16 @@ public Iterable<? extends Integer> apply(Integer v) {
             }
         });
 
-        maybeFlatMapObservable = Maybe.just(1).flatMapObservable(new Function<Integer, Observable<? extends Integer>>() {
+        maybeFlatMapObservable = Maybe.just(1).flatMapObservable(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return arrayObservable;
             }
         });
 
-        maybeFlatMapHideObservable = Maybe.just(1).flatMapObservable(new Function<Integer, Observable<? extends Integer>>() {
+        maybeFlatMapHideObservable = Maybe.just(1).flatMapObservable(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return arrayObservableHide;
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java
index 87ee5a07e4..4310ea2e95 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableConcatMapMaybePerf.java
@@ -60,9 +60,9 @@ public Publisher<? extends Integer> apply(Integer v) {
             }
         });
 
-        flowableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        flowableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java
index 8ab19a00c6..699f76c074 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybeEmptyPerf.java
@@ -60,9 +60,9 @@ public Publisher<? extends Integer> apply(Integer v) {
             }
         });
 
-        flowableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        flowableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java
index d0f3730b42..f81ed10ec3 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapMaybePerf.java
@@ -60,9 +60,9 @@ public Publisher<? extends Integer> apply(Integer v) {
             }
         });
 
-        flowableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        flowableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java
index 4f50938647..5a92bf20ff 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableFlatMapSinglePerf.java
@@ -60,9 +60,9 @@ public Publisher<? extends Integer> apply(Integer v) {
             }
         });
 
-        flowableDedicated = source.flatMapSingle(new Function<Integer, Single<? extends Integer>>() {
+        flowableDedicated = source.flatMapSingle(new Function<Integer, Single<Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v) {
+            public Single<Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java
index 83ad00e0f9..46ce694f6d 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybeEmptyPerf.java
@@ -60,9 +60,9 @@ public Publisher<? extends Integer> apply(Integer v) {
             }
         });
 
-        flowableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        flowableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java
index e36b49c4d3..e96bbc3919 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapMaybePerf.java
@@ -60,9 +60,9 @@ public Publisher<? extends Integer> apply(Integer v) {
             }
         });
 
-        flowableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        flowableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java
index 0da6941895..ef06ebfa66 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/FlowableSwitchMapSinglePerf.java
@@ -60,9 +60,9 @@ public Publisher<? extends Integer> apply(Integer v) {
             }
         });
 
-        flowableDedicated = source.switchMapSingle(new Function<Integer, Single<? extends Integer>>() {
+        flowableDedicated = source.switchMapSingle(new Function<Integer, Single<Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v) {
+            public Single<Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
index 48b20dc005..40379c2485 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.concatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
index 4528c90b50..02ed2207bd 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.concatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
index 204020abfe..845b61dba3 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.concatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
index e2e34b24f5..db7c6d9d3c 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
@@ -52,9 +52,9 @@ public Observable<? extends Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.concatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Single.just(v).toObservable();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
index b6daa57eb6..11f9ca3d55 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
index 5d0327fa46..ee19d59270 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
index e2a7c43bea..fe2570ca3f 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
index add0cd310c..5c73cb0e46 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
index 69b8e71f18..35c140c876 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.switchMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
index 3930534eb8..5a17a2e103 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.switchMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
index 30158d012d..73d31e15d5 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.switchMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
index 75aeb504f9..7db08ae8a0 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.switchMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
index d2e74aefb8..99e11259a6 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/observable/ObservableCache.java
@@ -112,6 +112,9 @@ protected void subscribeActual(Observer<? super T> t) {
 
     static final class Multicaster<T> extends AtomicReference<CacheDisposable<T>[]> implements Observer<T> {
 
+        /** */
+        private static final long serialVersionUID = 8514643269016498691L;
+
         /**
          * The number of items per cached nodes.
          */
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
index 47bbd491bd..8d3e10dbd2 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/flowable/FlowableZipTest.java
@@ -1870,7 +1870,7 @@ public Integer apply(Integer a, Integer b) throws Exception {
     public void firstErrorPreventsSecondSubscription() {
         final AtomicInteger counter = new AtomicInteger();
 
-        List<Flowable<?>> flowableList = new ArrayList<>();
+        List<Flowable<Object>> flowableList = new ArrayList<>();
         flowableList.add(Flowable.create(new FlowableOnSubscribe<Object>() {
             @Override
             public void subscribe(FlowableEmitter<Object> e)
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
index 8264a66494..d11bb6a132 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
@@ -1301,9 +1301,9 @@ public Integer apply(Integer integer, Long aLong) {
                             }
                         })
                 .buffer(Observable.interval(0, 100, TimeUnit.MILLISECONDS),
-                        new Function<Long, Observable<?>>() {
+                        new Function<Long, Observable<Long>>() {
                             @Override
-                            public Observable<?> apply(Long a) {
+                            public Observable<Long> apply(Long a) {
                                 return Observable.just(a).delay(200, TimeUnit.MILLISECONDS);
                             }
                         })
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
index ae7de66d6f..faebee3fa5 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableZipTest.java
@@ -1403,7 +1403,7 @@ public Integer apply(Integer t1, Integer t2) throws Exception {
     public void firstErrorPreventsSecondSubscription() {
         final AtomicInteger counter = new AtomicInteger();
 
-        List<Observable<?>> observableList = new ArrayList<>();
+        List<Observable<Object>> observableList = new ArrayList<>();
         observableList.add(Observable.create(new ObservableOnSubscribe<Object>() {
             @Override
             public void subscribe(ObservableEmitter<Object> e)

From c44d9cdb5314ffe6210c8ce5d739e471e3ada257 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 10:20:58 +0200
Subject: [PATCH 643/665] chore(deps): bump github/codeql-action from 3.30.5 to
 3.30.6 (#7913)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.5 to 3.30.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/3599b3baa15b485a2e49ef411a7a4bb2452e7f93...64d10c13136e1c5bce3e5fbde8d4906eeaafc885)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 3.30.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a37cfef227..b19bdb03e6 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.29.5
+        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
         with:
           sarif_file: results.sarif

From 3005edd1dd22bdbfbd29bc758b6dc150cfffe39a Mon Sep 17 00:00:00 2001
From: akarnokd <akarnokd@gmail.com>
Date: Mon, 6 Oct 2025 10:27:33 +0200
Subject: [PATCH 644/665] Full rebuild brought more bug places. Can't trust
 incremental recompile

---
 .../rxjava3/xmapz/ObservableConcatMapCompletablePerf.java | 4 ++--
 .../rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java  | 8 ++++----
 .../rxjava3/xmapz/ObservableConcatMapMaybePerf.java       | 8 ++++----
 .../rxjava3/xmapz/ObservableConcatMapSinglePerf.java      | 8 ++++----
 .../rxjava3/xmapz/ObservableFlatMapCompletablePerf.java   | 4 ++--
 .../rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java    | 8 ++++----
 .../rxjava3/xmapz/ObservableFlatMapMaybePerf.java         | 8 ++++----
 .../rxjava3/xmapz/ObservableFlatMapSinglePerf.java        | 8 ++++----
 .../rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java | 4 ++--
 .../rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java  | 8 ++++----
 .../rxjava3/xmapz/ObservableSwitchMapMaybePerf.java       | 8 ++++----
 .../rxjava3/xmapz/ObservableSwitchMapSinglePerf.java      | 8 ++++----
 .../operators/observable/ObservableBufferTest.java        | 4 ++--
 13 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
index 40379c2485..2229eed77a 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapCompletablePerf.java
@@ -52,9 +52,9 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.concatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Completable.complete().toObservable();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
index 02ed2207bd..cfde5183e5 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybeEmptyPerf.java
@@ -52,16 +52,16 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        concatMapToObservableEmpty = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
+        concatMapToObservableEmpty = source.concatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toObservable();
             }
         });
 
-        observableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        observableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
index 845b61dba3..75e7506724 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapMaybePerf.java
@@ -52,16 +52,16 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.concatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Maybe.just(v).toObservable();
             }
         });
 
-        observableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        observableDedicated = source.concatMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
index db7c6d9d3c..4227791222 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableConcatMapSinglePerf.java
@@ -45,9 +45,9 @@ public void setup() {
 
         Observable<Integer> source = Observable.fromArray(sourceArray);
 
-        observablePlain = source.concatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observablePlain = source.concatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Observable.just(v);
             }
         });
@@ -59,9 +59,9 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableDedicated = source.concatMapSingle(new Function<Integer, Single<? extends Integer>>() {
+        observableDedicated = source.concatMapSingle(new Function<Integer, Single<Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v) {
+            public Single<Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
index 11f9ca3d55..6a916a68f1 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapCompletablePerf.java
@@ -52,9 +52,9 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Completable.complete().toObservable();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
index ee19d59270..377a8bba93 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybeEmptyPerf.java
@@ -52,16 +52,16 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toObservable();
             }
         });
 
-        observableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        observableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
index fe2570ca3f..248ca98112 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapMaybePerf.java
@@ -52,16 +52,16 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Maybe.just(v).toObservable();
             }
         });
 
-        observableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        observableDedicated = source.flatMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
index 5c73cb0e46..880da95f5a 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableFlatMapSinglePerf.java
@@ -52,16 +52,16 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.flatMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.flatMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Single.just(v).toObservable();
             }
         });
 
-        observableDedicated = source.flatMapSingle(new Function<Integer, Single<? extends Integer>>() {
+        observableDedicated = source.flatMapSingle(new Function<Integer, Single<Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v) {
+            public Single<Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
index 35c140c876..41964c3dbd 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapCompletablePerf.java
@@ -52,9 +52,9 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.switchMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Completable.complete().toObservable();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
index 5a17a2e103..6a4ea5c73b 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybeEmptyPerf.java
@@ -52,16 +52,16 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.switchMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Maybe.<Integer>empty().toObservable();
             }
         });
 
-        observableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        observableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.empty();
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
index 73d31e15d5..f0c3285890 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapMaybePerf.java
@@ -52,16 +52,16 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.switchMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Maybe.just(v).toObservable();
             }
         });
 
-        observableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<? extends Integer>>() {
+        observableDedicated = source.switchMapMaybe(new Function<Integer, Maybe<Integer>>() {
             @Override
-            public Maybe<? extends Integer> apply(Integer v) {
+            public Maybe<Integer> apply(Integer v) {
                 return Maybe.just(v);
             }
         });
diff --git a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
index 7db08ae8a0..087f32c8e3 100644
--- a/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
+++ b/src/jmh/java/io/reactivex/rxjava3/xmapz/ObservableSwitchMapSinglePerf.java
@@ -52,16 +52,16 @@ public Observable<Integer> apply(Integer v) {
             }
         });
 
-        observableConvert = source.switchMap(new Function<Integer, Observable<? extends Integer>>() {
+        observableConvert = source.switchMap(new Function<Integer, Observable<Integer>>() {
             @Override
-            public Observable<? extends Integer> apply(Integer v) {
+            public Observable<Integer> apply(Integer v) {
                 return Single.just(v).toObservable();
             }
         });
 
-        observableDedicated = source.switchMapSingle(new Function<Integer, Single<? extends Integer>>() {
+        observableDedicated = source.switchMapSingle(new Function<Integer, Single<Integer>>() {
             @Override
-            public Single<? extends Integer> apply(Integer v) {
+            public Single<Integer> apply(Integer v) {
                 return Single.just(v);
             }
         });
diff --git a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
index d11bb6a132..7085720f01 100644
--- a/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
+++ b/src/test/java/io/reactivex/rxjava3/internal/operators/observable/ObservableBufferTest.java
@@ -1278,9 +1278,9 @@ public Integer apply(Integer integer, Long aLong) {
                             }
                         })
                 .buffer(Observable.interval(0, 200, TimeUnit.MILLISECONDS),
-                        new Function<Long, Observable<?>>() {
+                        new Function<Long, Observable<Long>>() {
                             @Override
-                            public Observable<?> apply(Long a) {
+                            public Observable<Long> apply(Long a) {
                                 return Observable.just(a).delay(100, TimeUnit.MILLISECONDS);
                             }
                         })

From 1bc9362f1baf8d2aba68dd413dfca7e344fb1dda Mon Sep 17 00:00:00 2001
From: David Karnok <akarnokd@gmail.com>
Date: Mon, 6 Oct 2025 13:20:56 +0200
Subject: [PATCH 645/665] Update README.md

Update the version badge.

For some reason, maven-central shows 3.1.10 from November 2024?! Sonatype is up-to-date.
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9963ffee46..5276c0bd37 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 <a href='https://github.com/ReactiveX/RxJava/actions?query=workflow%3ASnapshot'><img src='https://github.com/ReactiveX/RxJava/workflows/Snapshot/badge.svg'></a>
 [![codecov.io](http://codecov.io/github/ReactiveX/RxJava/coverage.svg?branch=3.x)](https://codecov.io/gh/ReactiveX/RxJava/branch/3.x)
-[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava)
+[![Maven Central](https://maven-badges.sml.io/sonatype-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.sml.io/sonatype-central/io.reactivex.rxjava3/rxjava)
 [![Contribute with Gitpod](https://img.shields.io/badge/Contribute%20with-Gitpod-908a85?logo=gitpod)](https://gitpod.io/#https://github.com/ReactiveX/RxJava)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/ReactiveX/RxJava/badge)](https://securityscorecards.dev/viewer/?uri=github.com/ReactiveX/RxJava)
 
@@ -48,7 +48,7 @@ The first step is to include RxJava 3 into your project, for example, as a Gradl
 implementation "io.reactivex.rxjava3:rxjava:3.x.y"
 ```
 
-(Please replace `x` and `y` with the latest version numbers: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.reactivex.rxjava3/rxjava)
+(Please replace `x` and `y` with the latest version numbers: [![Maven Central](https://maven-badges.sml.io/sonatype-central/io.reactivex.rxjava3/rxjava/badge.svg)](https://maven-badges.sml.io/sonatype-central/io.reactivex.rxjava3/rxjava)
 )
 
 ### Hello World

From 07be79e70d9f1e83ed266a7e0bf75d430287e9fa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Oct 2025 09:22:08 +0200
Subject: [PATCH 646/665] chore(deps): bump github/codeql-action from 3.30.6 to
 4.30.7 (#7915)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.6 to 4.30.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/64d10c13136e1c5bce3e5fbde8d4906eeaafc885...e296a935590eb16afc0c0108289f68c87e2a89a5)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.30.7
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b19bdb03e6..6f863729a9 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.29.5
+        uses: github/codeql-action/upload-sarif@e296a935590eb16afc0c0108289f68c87e2a89a5 # v3.29.5
         with:
           sarif_file: results.sarif

From d98857e4d3261b1bc4c2cd43f6eab8815e1cb621 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Oct 2025 09:24:47 +0200
Subject: [PATCH 647/665] chore(deps): bump github/codeql-action from 4.30.7 to
 4.30.8 (#7916)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.30.7 to 4.30.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e296a935590eb16afc0c0108289f68c87e2a89a5...f443b600d91635bebf5b0d9ebc620189c0d6fba5)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.30.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6f863729a9..9bbf3a4af1 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e296a935590eb16afc0c0108289f68c87e2a89a5 # v3.29.5
+        uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
         with:
           sarif_file: results.sarif

From 89d57024c674bf2cab39f6a574007b5f13b33c95 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 07:46:22 +0200
Subject: [PATCH 648/665] chore(deps): bump github/codeql-action from 4.30.8 to
 4.30.9 (#7917)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.30.8 to 4.30.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/f443b600d91635bebf5b0d9ebc620189c0d6fba5...16140ae1a102900babc80a33c44059580f687047)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.30.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 9bbf3a4af1..32926005be 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
+        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
         with:
           sarif_file: results.sarif

From 795b37c2f65f0eed392acf1d69b95face0b6cc94 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 09:42:03 +0100
Subject: [PATCH 649/665] chore(deps): bump actions/upload-artifact from 4.6.2
 to 5.0.0 (#7918)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/ea165f8d65b6e75b540449e92b4886f43607fa02...330a01c490aca151604b8cf639adc76d48f6c5d4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 32926005be..8da446395f 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: SARIF file
           path: results.sarif

From e5518bdd61b5d2786d8664833da82cb498fdc9fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 09:42:27 +0100
Subject: [PATCH 650/665] chore(deps): bump github/codeql-action from 4.30.9 to
 4.31.0 (#7919)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.30.9 to 4.31.0.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/16140ae1a102900babc80a33c44059580f687047...4e94bd11f71e507f7f87df81788dff88d1dacbfb)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 8da446395f..d2e31f8799 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@16140ae1a102900babc80a33c44059580f687047 # v3.29.5
+        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
         with:
           sarif_file: results.sarif

From 161536cdacc0e73c173bf0a5f90e3d1d8174d16e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 31 Oct 2025 07:02:23 +0100
Subject: [PATCH 651/665] chore(deps): bump github/codeql-action from 4.31.0 to
 4.31.2 (#7921)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.0 to 4.31.2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/4e94bd11f71e507f7f87df81788dff88d1dacbfb...0499de31b99561a6d14a36a5f662c2a54f91beee)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index d2e31f8799..0194cfc75b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4e94bd11f71e507f7f87df81788dff88d1dacbfb # v3.29.5
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
         with:
           sarif_file: results.sarif

From 8b33f4251a2db556af3a462635fe7b71ff5f2b32 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Nov 2025 07:39:44 +0100
Subject: [PATCH 652/665] chore(deps): bump github/codeql-action from 4.31.2 to
 4.31.3 (#7924)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.2 to 4.31.3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/0499de31b99561a6d14a36a5f662c2a54f91beee...014f16e7ab1402f30e7c3329d33797e7948572db)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 0194cfc75b..dd23ffe587 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
+        uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v3.29.5
         with:
           sarif_file: results.sarif

From 9b60d5c1bbe3767e524bfad5427e1e0f173c66d1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 18 Nov 2025 08:29:44 +0100
Subject: [PATCH 653/665] chore(deps): bump actions/checkout from 5.0.0 to
 5.0.1 (#7926)

Bumps [actions/checkout](https://github.com/actions/checkout) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/08c6903cd8c0fde910a37f88322edcfb5dd907a8...93cb6efe18208431cddfb8368fd83d5badbf9bfd)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 5.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 3bb843889a..136e06ca18 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
       - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 8fd55412ec..abe9489f67 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 5eed0fa3da..0769dc2a1e 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -20,7 +20,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index ba0bc523ad..af19ed66f1 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 4c65fc24ed..2a5d60ddb3 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 4a29e0757a..be0db04f44 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index dd23ffe587..90fa3563e2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
 

From 3aef13f812f9c459a86874130f2f42e68320ec11 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Nov 2025 08:28:11 +0100
Subject: [PATCH 654/665] chore(deps): bump github/codeql-action from 4.31.3 to
 4.31.4 (#7927)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.3 to 4.31.4.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/014f16e7ab1402f30e7c3329d33797e7948572db...e12f0178983d466f2f6028f5cc7a6d786fd97f4b)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.4
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 90fa3563e2..f19e5cc7d1 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v3.29.5
+        uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
         with:
           sarif_file: results.sarif

From cba8b1a124c9ccdcc906e4fb320fce5e454d3fa8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Nov 2025 09:19:01 +0100
Subject: [PATCH 655/665] chore(deps): bump actions/checkout from 5.0.1 to
 6.0.0 (#7928)

Bumps [actions/checkout](https://github.com/actions/checkout) from 5.0.1 to 6.0.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/93cb6efe18208431cddfb8368fd83d5badbf9bfd...1af3b93b6815bc44a9784bd300feb67ff0d1eeb3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 136e06ca18..44eb658a24 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index abe9489f67..6605516825 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 0769dc2a1e..623b8467a0 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -20,7 +20,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index af19ed66f1..67824960d4 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 2a5d60ddb3..39bf1b6efd 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index be0db04f44..db823bfc47 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f19e5cc7d1..6c65ade76e 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           persist-credentials: false
 

From c1b16fae424af61c241686ca73745c5dc9202b01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 Dec 2025 08:52:36 +0100
Subject: [PATCH 656/665] chore(deps): bump github/codeql-action from 4.31.4 to
 4.31.6 (#7930)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.4 to 4.31.6.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/e12f0178983d466f2f6028f5cc7a6d786fd97f4b...fe4161a26a8629af62121b670040955b330f9af2)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 6c65ade76e..507bc370f6 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
+        uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
         with:
           sarif_file: results.sarif

From 5251d645ed4d81e6570896540c362ca344e82c86 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 3 Dec 2025 08:02:24 +0100
Subject: [PATCH 657/665] chore(deps): bump actions/checkout from 6.0.0 to
 6.0.1 (#7931)

Bumps [actions/checkout](https://github.com/actions/checkout) from 6.0.0 to 6.0.1.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/1af3b93b6815bc44a9784bd300feb67ff0d1eeb3...8e8c483db84b4bee98b60c0593521ed34d9990e8)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle-wrapper-validation.yml | 2 +-
 .github/workflows/gradle_branch.yml             | 2 +-
 .github/workflows/gradle_jdk11.yml              | 2 +-
 .github/workflows/gradle_pr.yml                 | 2 +-
 .github/workflows/gradle_release.yml            | 2 +-
 .github/workflows/gradle_snapshot.yml           | 2 +-
 .github/workflows/scorecard.yml                 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
index 44eb658a24..3e905f1c92 100644
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ b/.github/workflows/gradle-wrapper-validation.yml
@@ -9,5 +9,5 @@ jobs:
     name: "Validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
       - uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 6605516825..383511d82d 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 623b8467a0..f824fc742e 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -20,7 +20,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 67824960d4..8d20106862 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 39bf1b6efd..b12044773b 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -22,7 +22,7 @@ jobs:
     env:
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index db823bfc47..a07da8fa7a 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -21,7 +21,7 @@ jobs:
       # ------------------------------------------------------------------------------ 
       CI_BUILD_NUMBER: ${{ github.run_number }}
     steps:
-    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+    - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
       uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 507bc370f6..b243c99a1a 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         with:
           persist-credentials: false
 

From cf94150bd30d0894c81bf580ce57fbd185ce1b72 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Dec 2025 07:54:16 +0100
Subject: [PATCH 658/665] chore(deps): bump actions/setup-java from 5.0.0 to
 5.1.0 (#7932)

Bumps [actions/setup-java](https://github.com/actions/setup-java) from 5.0.0 to 5.1.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/dded0888837ed1f317902acf8a20df0ad188d165...f2beeb24e141e01a676f977032f5a29d81c9e27e)

---
updated-dependencies:
- dependency-name: actions/setup-java
  dependency-version: 5.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 383511d82d..bb20f5ebdc 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index f824fc742e..89941a83ad 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -22,7 +22,7 @@ jobs:
     steps:
     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 8d20106862..e093f23513 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index b12044773b..8743a26147 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
       with:
         distribution: 'zulu'
         java-version: '11'
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index a07da8fa7a..fc4356d2c2 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
     - name: Set up JDK 11
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
       with:
         distribution: 'zulu'
         java-version: '11'

From 3580b2642ffda52d58c3674aa3f1c3798a7d8e21 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Dec 2025 09:22:22 +0100
Subject: [PATCH 659/665] chore(deps): bump github/codeql-action from 4.31.6 to
 4.31.7 (#7933)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.6 to 4.31.7.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/fe4161a26a8629af62121b670040955b330f9af2...cf1bb45a277cb3c205638b2cd5c984db1c46a412)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.7
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index b243c99a1a..a663d5f7c2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
+        uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v3.29.5
         with:
           sarif_file: results.sarif

From 55b67dd587e73054906f979f2a7fa61c8543c5f5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Dec 2025 11:26:09 +0100
Subject: [PATCH 660/665] chore(deps): bump codecov/codecov-action from 5.5.1
 to 5.5.2 (#7934)

Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 5.5.1 to 5.5.2.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/5a1091511ad55cbe89839c7260b706298ca349f7...671740ac38dd9b0130fbe1cec585b89eea48d3de)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-version: 5.5.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index bb20f5ebdc..76141da5dd 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+      uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index e093f23513..10a3494da9 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -32,6 +32,6 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+      uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
     - name: Generate Javadoc
       run: ./gradlew javadoc --stacktrace
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 8743a26147..96e04460a7 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Build RxJava
       run: ./gradlew build --stacktrace --no-daemon
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+      uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
 #    - name: Upload release
 #      run: ./gradlew -PreleaseMode=full publish --no-daemon --no-parallel --stacktrace
 #      env:
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index fc4356d2c2..af470574a7 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -47,7 +47,7 @@ jobs:
         ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_USER }}
         ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_PASSWORD }}
     - name: Upload to Codecov  
-      uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+      uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
     - name: Push Javadoc
       run: ./push_javadoc.sh
         # Define secrets at https://github.com/ReactiveX/RxJava/settings/secrets/actions

From 6b28009fd08563eed648334d3d030acdd12818d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 12 Dec 2025 09:19:24 +0100
Subject: [PATCH 661/665] chore(deps): bump actions/cache from 4.3.0 to 5.0.0
 (#7935)

Bumps [actions/cache](https://github.com/actions/cache) from 4.3.0 to 5.0.0.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/0057852bfaa89a56745cba8c7296529d2fc39830...a7833574556fa59680c1b7cb190c1735db73ebf0)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 76141da5dd..44ce7a413e 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 89941a83ad..122d06be4c 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -27,7 +27,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 10a3494da9..1efed6a404 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 96e04460a7..59e6f29ee2 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index af470574a7..425fede04e 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
+      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From bff14e6f0dc08f6ee65345e232cf407990896e5f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 09:08:22 +0100
Subject: [PATCH 662/665] chore(deps): bump actions/upload-artifact from 5.0.0
 to 6.0.0 (#7936)

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/330a01c490aca151604b8cf639adc76d48f6c5d4...b7c566a772e6b6bfb58ed0dc250532a479d7789f)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a663d5f7c2..2dbda05909 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -46,7 +46,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: SARIF file
           path: results.sarif

From 0fd1f8a3339bbf0a28564addfb199909f3df0a8f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 09:08:38 +0100
Subject: [PATCH 663/665] chore(deps): bump actions/cache from 5.0.0 to 5.0.1
 (#7937)

Bumps [actions/cache](https://github.com/actions/cache) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/a7833574556fa59680c1b7cb190c1735db73ebf0...9255dc7a253b0ccc959486e2bca901246202afeb)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-version: 5.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/gradle_branch.yml   | 2 +-
 .github/workflows/gradle_jdk11.yml    | 2 +-
 .github/workflows/gradle_pr.yml       | 2 +-
 .github/workflows/gradle_release.yml  | 2 +-
 .github/workflows/gradle_snapshot.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/gradle_branch.yml b/.github/workflows/gradle_branch.yml
index 44ce7a413e..cb7231a7bf 100644
--- a/.github/workflows/gradle_branch.yml
+++ b/.github/workflows/gradle_branch.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
+      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_jdk11.yml b/.github/workflows/gradle_jdk11.yml
index 122d06be4c..771a1afe0f 100644
--- a/.github/workflows/gradle_jdk11.yml
+++ b/.github/workflows/gradle_jdk11.yml
@@ -27,7 +27,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
+      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_pr.yml b/.github/workflows/gradle_pr.yml
index 1efed6a404..f76409cd46 100644
--- a/.github/workflows/gradle_pr.yml
+++ b/.github/workflows/gradle_pr.yml
@@ -22,7 +22,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
+      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-1-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_release.yml b/.github/workflows/gradle_release.yml
index 59e6f29ee2..b08c3fe08e 100644
--- a/.github/workflows/gradle_release.yml
+++ b/.github/workflows/gradle_release.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
+      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}
diff --git a/.github/workflows/gradle_snapshot.yml b/.github/workflows/gradle_snapshot.yml
index 425fede04e..5dca06b523 100644
--- a/.github/workflows/gradle_snapshot.yml
+++ b/.github/workflows/gradle_snapshot.yml
@@ -28,7 +28,7 @@ jobs:
         distribution: 'zulu'
         java-version: '11'
     - name: Cache Gradle packages
-      uses: actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
+      uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ secrets.CACHE_VERSION }}-${{ hashFiles('**/*.gradle') }}

From 5d18eb1cfbf51efcc8ef15e19efa5d4cecdc9e01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Dec 2025 09:08:53 +0100
Subject: [PATCH 664/665] chore(deps): bump github/codeql-action from 4.31.7 to
 4.31.8 (#7938)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.7 to 4.31.8.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/cf1bb45a277cb3c205638b2cd5c984db1c46a412...1b168cd39490f61582a9beae412bb7057a6b2c4e)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.8
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 2dbda05909..a471df2ec9 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v3.29.5
+        uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v3.29.5
         with:
           sarif_file: results.sarif

From 51de3f77f73d4491e1c6350a7bde3853a5a5b6bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 17 Dec 2025 09:02:09 +0100
Subject: [PATCH 665/665] chore(deps): bump github/codeql-action from 4.31.8 to
 4.31.9 (#7939)

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.31.8 to 4.31.9.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/1b168cd39490f61582a9beae412bb7057a6b2c4e...5d4e8d1aca955e8d8589aabd499c5cae939e33c7)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-version: 4.31.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/scorecard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a471df2ec9..1ebd21eb28 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -54,6 +54,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # v3.29.5
+        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
         with:
           sarif_file: results.sarif